From fe73f43734144d94f3b54ae2f93859b4f1cb33e8 Mon Sep 17 00:00:00 2001 From: Gabriele Cosmo Date: Thu, 9 Jun 2016 14:55:03 +0200 Subject: [PATCH] Import Geant4 8.2.0 source tree --- Configure | 178 +- ReleaseNotes/Patch4.8.1-1.txt | 85 + ReleaseNotes/Patch4.8.1-2.txt | 112 + ReleaseNotes/ReleaseNotes4.8.2.html | 1115 ++++ config/History | 33 +- config/architecture.gmk | 24 +- config/binmake.gmk | 15 +- config/liblist.c | 10 +- config/scripts/env.csh.SH | 100 +- config/scripts/env.sh.SH | 129 +- config/scripts/install.sh.SH | 69 +- config/scripts/move.sh.SH | 14 +- config/sys/Darwin-g++.gmk | 1 - config/sys/Linux-icc.gmk | 15 +- config/sys/WIN32-VC.gmk | 25 +- config/sys/WIN32-g++.gmk | 14 +- environments/History | 18 +- .../MOMO/MomoHome/include/MomoEventAction.hh | 2 +- .../MOMO/MomoHome/include/MomoRunAction.hh | 2 +- .../MOMO/MomoHome/src/MomoEventAction.cc | 2 +- .../MOMO/MomoHome/src/MomoRunAction.cc | 2 +- environments/g4py/00README | 14 +- environments/g4py/00README_MACOSX | 97 + environments/g4py/GNUmakefile | 2 +- environments/g4py/History | 38 +- environments/g4py/config/build.gmk | 16 +- environments/g4py/config/g4compile.gmk | 4 +- environments/g4py/config/g4py.gmk | 6 +- environments/g4py/config/sys/linux.gmk | 25 +- .../g4py/config/sys/linuxx8664gcc.gmk | 21 +- environments/g4py/config/sys/macosx.gmk | 53 +- environments/g4py/configure | 44 +- .../demos/water_phantom/g4lib/GNUmakefile | 2 +- .../g4lib/MyDetectorConstruction.cc | 2 +- .../g4lib/MyDetectorConstruction.hh | 2 +- .../demos/water_phantom/g4lib/MyMaterials.cc | 2 +- .../demos/water_phantom/g4lib/MyMaterials.hh | 2 +- .../water_phantom/g4lib/MyPhysicsList.cc | 2 +- .../water_phantom/g4lib/MyPhysicsList.hh | 2 +- .../demos/water_phantom/g4lib/Particles.cc | 2 +- .../water_phantom/g4lib/PhysicsListEMstd.cc | 2 +- .../demos/water_phantom/g4lib/pydemo_wp.cc | 2 +- .../g4py/examples/education/lesson1/History | 5 + .../examples/education/lesson1/Lesson1Wx.py | 555 ++ .../education/lesson1/Lesson1withN03.py | 319 + .../g4py/examples/education/lesson1/README | 18 +- .../examples/education/lesson2/Lesson2Wx.py | 598 ++ .../g4py/examples/education/lesson2/README | 5 + .../EZsim/EZgeom/EzDetectorConstruction.cc | 2 +- .../EZsim/EZgeom/EzDetectorConstruction.hh | 2 +- .../site-modules/EZsim/EZgeom/GNUmakefile | 7 +- .../EZsim/EZgeom/ezgeom/G4EzVolume.cc | 2 +- .../EZsim/EZgeom/ezgeom/G4EzVolume.hh | 2 +- .../ezgeom/G4EzVoxelParameterization.cc | 2 +- .../ezgeom/G4EzVoxelParameterization.hh | 2 +- .../EZsim/EZgeom/ezgeom/G4EzWorld.cc | 6 +- .../EZsim/EZgeom/ezgeom/G4EzWorld.hh | 2 +- .../EZsim/EZgeom/ezgeom/GNUmakefile | 8 +- .../site-modules/EZsim/EZgeom/pyEzgeom.cc | 2 +- .../g4py/site-modules/EZsim/GNUmakefile | 2 +- .../site-modules/EZsim/python/GNUmakefile | 2 +- environments/g4py/site-modules/GNUmakefile | 6 +- .../ExN01geom/ExN01DetectorConstruction.cc | 2 +- .../ExN01geom/ExN01DetectorConstruction.hh | 2 +- .../geometries/ExN01geom/GNUmakefile | 2 +- .../geometries/ExN01geom/pyExN01geom.cc | 2 +- .../ExN03geom/ExN03DetectorConstruction.cc | 475 +- .../ExN03geom/ExN03DetectorConstruction.hh | 205 +- .../ExN03geom/ExN03DetectorMessenger.cc | 150 + .../ExN03geom/ExN03DetectorMessenger.hh | 76 + .../geometries/ExN03geom/GNUmakefile | 2 +- .../geometries/ExN03geom/pyExN03geom.cc | 2 +- .../g4py/site-modules/geometries/GNUmakefile | 2 +- .../site-modules/geometries/Qgeom/GNUmakefile | 2 +- .../geometries/Qgeom/QDetectorConstruction.cc | 2 +- .../geometries/Qgeom/QDetectorConstruction.hh | 2 +- .../site-modules/geometries/Qgeom/pyQgeom.cc | 2 +- .../g4py/site-modules/materials/GNUmakefile | 2 +- .../materials/NISTmaterials/GNUmakefile | 2 +- .../materials/NISTmaterials/NISTmaterials.cc | 2 +- .../NISTmaterials/pyNISTmaterials.cc | 2 +- .../materials/Qmaterials/GNUmakefile | 2 +- .../materials/Qmaterials/Qmaterials.cc | 2 +- .../materials/Qmaterials/pyQmaterials.cc | 2 +- .../physics_lists/EMLowEpl/GNUmakefile | 14 + .../EMLowEpl/PhysicsListEMlowE.cc | 135 + .../EMLowEpl/PhysicsListEMlowE.hh | 49 +- .../physics_lists/EMLowEpl/pyEMLowEpl.cc | 80 +- .../physics_lists/EMSTDpl/GNUmakefile | 2 +- .../physics_lists/EMSTDpl/PhysicsListEMstd.cc | 6 +- .../physics_lists/EMSTDpl/PhysicsListEMstd.hh | 2 +- .../physics_lists/EMSTDpl/pyEMSTDpl.cc | 2 +- .../physics_lists/ExN01pl/ExN01PhysicsList.cc | 2 +- .../physics_lists/ExN01pl/ExN01PhysicsList.hh | 2 +- .../physics_lists/ExN01pl/GNUmakefile | 2 +- .../physics_lists/ExN01pl/pyExN01pl.cc | 2 +- .../physics_lists/ExN03pl/ExN03PhysicsList.cc | 2 +- .../physics_lists/ExN03pl/ExN03PhysicsList.hh | 2 +- .../physics_lists/ExN03pl/GNUmakefile | 2 +- .../physics_lists/ExN03pl/pyExN03pl.cc | 2 +- .../site-modules/physics_lists/GNUmakefile | 6 +- .../g4py/site-modules/primaries/GNUmakefile | 2 +- .../primaries/MedicalBeam/GNUmakefile | 2 +- .../primaries/MedicalBeam/MedicalBeam.cc | 2 +- .../primaries/MedicalBeam/MedicalBeam.hh | 2 +- .../primaries/MedicalBeam/pyMedicalBeam.cc | 2 +- .../primaries/ParticleGun/GNUmakefile | 2 +- .../ParticleGun/ParticleGunAction.cc | 2 +- .../ParticleGun/ParticleGunAction.hh | 2 +- .../primaries/ParticleGun/pyParticleGun.cc | 2 +- .../g4py/site-modules/utils/GNUmakefile | 19 + .../site-modules/utils/MCScore/GNUmakefile | 29 + .../site-modules/utils/MCScore/MCScore.py | 132 + .../utils/MCScore/MCScoreROOTIO.py | 190 + .../site-modules/utils/MCScore/reaction.dat | 1842 +++++ environments/g4py/source/GNUmakefile | 8 +- environments/g4py/source/boost/GNUmakefile | 2 +- .../g4py/source/boost/pyG4indexing.hh | 2 +- .../g4py/source/digits_hits/GNUmakefile | 2 +- .../digits_hits/pyG4VSensitiveDetector.cc | 2 +- .../source/digits_hits/pymodG4digits_hits.cc | 2 +- environments/g4py/source/event/GNUmakefile | 2 +- .../event/pyG4ClassificationOfNewTrack.cc | 2 +- environments/g4py/source/event/pyG4Event.cc | 2 +- .../g4py/source/event/pyG4EventManager.cc | 2 +- .../g4py/source/event/pyG4ParticleGun.cc | 2 +- .../g4py/source/event/pyG4StackManager.cc | 2 +- .../g4py/source/event/pyG4UserEventAction.cc | 2 +- .../source/event/pyG4UserStackingAction.cc | 2 +- .../g4py/source/event/pymodG4event.cc | 2 +- environments/g4py/source/geometry/GNUmakefile | 2 +- environments/g4py/source/geometry/pyG4Box.cc | 2 +- .../g4py/source/geometry/pyG4ChordFinder.cc | 2 +- environments/g4py/source/geometry/pyG4Cons.cc | 2 +- .../g4py/source/geometry/pyG4Field.cc | 2 +- .../g4py/source/geometry/pyG4FieldManager.cc | 2 +- .../g4py/source/geometry/pyG4LogicalVolume.cc | 2 +- .../g4py/source/geometry/pyG4MagneticField.cc | 2 +- environments/g4py/source/geometry/pyG4Orb.cc | 2 +- .../g4py/source/geometry/pyG4PVPlacement.cc | 2 +- .../g4py/source/geometry/pyG4PVReplica.cc | 2 +- environments/g4py/source/geometry/pyG4Para.cc | 2 +- .../g4py/source/geometry/pyG4Region.cc | 2 +- .../g4py/source/geometry/pyG4Sphere.cc | 2 +- .../g4py/source/geometry/pyG4Torus.cc | 2 +- .../source/geometry/pyG4TouchableHistory.cc | 2 +- .../geometry/pyG4TransportationManager.cc | 2 +- environments/g4py/source/geometry/pyG4Trap.cc | 2 +- environments/g4py/source/geometry/pyG4Trd.cc | 2 +- environments/g4py/source/geometry/pyG4Tubs.cc | 2 +- .../source/geometry/pyG4UniformMagField.cc | 2 +- .../source/geometry/pyG4VPhysicalVolume.cc | 6 +- .../g4py/source/geometry/pyG4VSolid.cc | 2 +- .../g4py/source/geometry/pyG4VTouchable.cc | 2 +- .../g4py/source/geometry/pymodG4geometry.cc | 2 +- .../g4py/source/global/G4PyCoutDestination.cc | 2 +- .../g4py/source/global/G4PyCoutDestination.hh | 2 +- environments/g4py/source/global/GNUmakefile | 2 +- .../source/global/pyG4ApplicationState.cc | 6 +- .../g4py/source/global/pyG4Exception.cc | 130 + .../source/global/pyG4ExceptionHandler.cc | 105 + .../source/global/pyG4ExceptionSeverity.cc | 52 +- .../g4py/source/global/pyG4RandomDirection.cc | 2 +- .../g4py/source/global/pyG4RotationMatrix.cc | 2 +- .../g4py/source/global/pyG4StateManager.cc | 2 +- environments/g4py/source/global/pyG4String.cc | 2 +- .../g4py/source/global/pyG4ThreeVector.cc | 2 +- environments/g4py/source/global/pyG4Timer.cc | 2 +- .../g4py/source/global/pyG4Transform3D.cc | 2 +- .../g4py/source/global/pyG4UnitsTable.cc | 2 +- .../g4py/source/global/pyG4UserLimits.cc | 2 +- .../g4py/source/global/pyG4Version.cc | 34 +- .../g4py/source/global/pyRandomEngines.cc | 2 +- .../g4py/source/global/pyRandomize.cc | 2 +- environments/g4py/source/global/pygeomdefs.cc | 2 +- environments/g4py/source/global/pyglobals.cc | 2 +- .../g4py/source/global/pymodG4global.cc | 12 +- .../g4py/source/graphics_reps/GNUmakefile | 2 +- .../g4py/source/graphics_reps/pyG4Colour.cc | 2 +- .../source/graphics_reps/pyG4VisAttributes.cc | 2 +- .../graphics_reps/pymodG4graphics_reps.cc | 2 +- .../g4py/source/intercoms/GNUmakefile | 14 + .../g4py/source/intercoms/pyG4UIcommand.cc | 89 + .../source/intercoms/pyG4UIcommandTree.cc | 121 +- .../{interface => intercoms}/pyG4UImanager.cc | 52 +- .../g4py/source/intercoms/pyG4UIparameter.cc | 82 +- .../g4py/source/intercoms/pymodG4intercoms.cc | 38 +- .../g4py/source/interface/GNUmakefile | 2 +- .../g4py/source/interface/pyG4UIterminal.cc | 2 +- .../g4py/source/interface/pymodG4interface.cc | 8 +- .../g4py/source/materials/GNUmakefile | 2 +- .../g4py/source/materials/pyG4Element.cc | 7 +- .../g4py/source/materials/pyG4ElementTable.cc | 2 +- .../g4py/source/materials/pyG4Material.cc | 8 +- .../source/materials/pyG4MaterialTable.cc | 2 +- .../g4py/source/materials/pyG4NistManager.cc | 2 +- .../g4py/source/materials/pymodG4materials.cc | 2 +- .../g4py/source/particles/GNUmakefile | 2 +- .../g4py/source/particles/pyG4DecayTable.cc | 2 +- .../source/particles/pyG4DynamicParticle.cc | 11 +- .../particles/pyG4ParticleDefinition.cc | 7 +- .../g4py/source/particles/pyG4ParticleList.cc | 2 +- .../source/particles/pyG4ParticleTable.cc | 2 +- .../source/particles/pyG4PrimaryParticle.cc | 2 +- .../source/particles/pyG4PrimaryVertex.cc | 2 +- .../g4py/source/particles/pymodG4particles.cc | 2 +- .../g4py/source/physics_lists/GNUmakefile | 14 + .../source/physics_lists/pyPhysicsLists.cc | 181 + .../physics_lists/pymodG4physicslists.cc | 36 +- .../g4py/source/processes/GNUmakefile | 2 +- .../g4py/source/processes/pyG4EmCalculator.cc | 8 +- .../source/processes/pyG4LossTableManager.cc | 95 + .../g4py/source/processes/pyG4ProcVector.cc | 2 +- .../source/processes/pyG4ProcessManager.cc | 2 +- .../g4py/source/processes/pyG4ProcessTable.cc | 2 +- .../g4py/source/processes/pyG4ProcessType.cc | 2 +- .../processes/pyG4ProductionCutsTable.cc | 78 +- .../g4py/source/processes/pyG4VProcess.cc | 2 +- .../g4py/source/processes/pymodG4processes.cc | 8 +- environments/g4py/source/python/GNUmakefile | 2 +- environments/g4py/source/python/__init__.py | 44 +- environments/g4py/source/run/GNUmakefile | 2 +- environments/g4py/source/run/pyG4Run.cc | 2 +- .../g4py/source/run/pyG4RunManager.cc | 2 +- .../g4py/source/run/pyG4RunManagerKernel.cc | 2 +- .../g4py/source/run/pyG4UserRunAction.cc | 2 +- .../source/run/pyG4VModularPhysicsList.cc | 2 +- .../source/run/pyG4VPhysicsConstructor.cc | 2 +- .../run/pyG4VUserDetectorConstruction.cc | 2 +- .../g4py/source/run/pyG4VUserPhysicsList.cc | 2 +- .../run/pyG4VUserPrimaryGeneratorAction.cc | 2 +- environments/g4py/source/run/pymodG4run.cc | 2 +- environments/g4py/source/track/GNUmakefile | 2 +- environments/g4py/source/track/pyG4Step.cc | 2 +- .../g4py/source/track/pyG4StepPoint.cc | 2 +- .../g4py/source/track/pyG4StepStatus.cc | 2 +- environments/g4py/source/track/pyG4Track.cc | 2 +- .../g4py/source/track/pyG4TrackStatus.cc | 2 +- .../g4py/source/track/pymodG4track.cc | 2 +- environments/g4py/source/tracking/GNUmakefile | 2 +- .../source/tracking/pyG4TrackingManager.cc | 2 +- .../source/tracking/pyG4UserSteppingAction.cc | 2 +- .../source/tracking/pyG4UserTrackingAction.cc | 2 +- .../g4py/source/tracking/pymodG4tracking.cc | 2 +- .../g4py/source/version/G4Version_7.0.hh | 6 +- .../g4py/source/version/G4Version_7.0.p01.hh | 6 +- .../g4py/source/version/G4Version_7.1.hh | 6 +- .../g4py/source/version/G4Version_7.1.p01.hh | 6 +- environments/g4py/source/version/GNUmakefile | 2 +- .../g4py/source/version/pyG4Version.hh | 2 +- .../g4py/source/visualization/GNUmakefile | 2 +- .../source/visualization/pyG4ASCIITree.cc | 2 +- .../g4py/source/visualization/pyG4DAWNFILE.cc | 2 +- .../g4py/source/visualization/pyG4HepRep.cc | 2 +- .../source/visualization/pyG4HepRepFile.cc | 2 +- .../visualization/pyG4OpenGLImmediateX.cc | 2 +- .../visualization/pyG4OpenGLImmediateXm.cc | 2 +- .../source/visualization/pyG4OpenGLStoredX.cc | 2 +- .../visualization/pyG4OpenGLStoredXm.cc | 2 +- .../source/visualization/pyG4RayTracer.cc | 2 +- .../source/visualization/pyG4RayTracerX.cc | 2 +- .../visualization/pyG4VGraphicsSystem.cc | 2 +- .../source/visualization/pyG4VRML1File.cc | 2 +- .../source/visualization/pyG4VRML2File.cc | 2 +- .../source/visualization/pyG4VisManager.cc | 26 +- .../visualization/pymodG4visualization.cc | 2 +- environments/g4py/tests/GNUmakefile | 2 +- environments/g4py/tests/History | 5 +- environments/g4py/tests/README | 3 +- .../g4py/tests/gtest01/g4lib/GNUmakefile | 2 +- .../g4py/tests/gtest01/g4lib/Particles.cc | 2 +- .../tests/gtest01/g4lib/PhysicsListEMstd.cc | 2 +- .../gtest01/g4lib/QDetectorConstruction.cc | 2 +- .../gtest01/g4lib/QDetectorConstruction.hh | 2 +- .../g4py/tests/gtest01/g4lib/QEventAction.cc | 2 +- .../g4py/tests/gtest01/g4lib/QEventAction.hh | 2 +- .../g4py/tests/gtest01/g4lib/QMaterials.cc | 2 +- .../g4py/tests/gtest01/g4lib/QMaterials.hh | 2 +- .../g4py/tests/gtest01/g4lib/QPhysicsList.cc | 2 +- .../g4py/tests/gtest01/g4lib/QPhysicsList.hh | 2 +- .../gtest01/g4lib/QPrimaryGeneratorAction.cc | 2 +- .../gtest01/g4lib/QPrimaryGeneratorAction.hh | 2 +- .../g4py/tests/gtest01/g4lib/gtest01.cc | 2 +- .../g4py/tests/test01/mylib/GNUmakefile | 5 +- .../g4py/tests/test02/mylib/GNUmakefile | 5 +- .../g4py/tests/test03/mylib/GNUmakefile | 5 +- .../g4py/tests/test04/mylib/GNUmakefile | 5 +- .../g4py/tests/test05/mylib/GNUmakefile | 5 +- .../g4py/tests/test06/mylib/GNUmakefile | 5 +- environments/g4py/tests/test06/test06.cc | 2 +- environments/g4py/tests/test07/test07.cc | 2 +- environments/g4py/tests/test08/test08.cc | 2 +- environments/g4py/tests/test09/test09.cc | 2 +- environments/g4py/tests/test10/test10.cc | 2 +- environments/g4py/tests/test11/test11.cc | 2 +- environments/g4py/tests/test12/test12.cc | 2 +- environments/g4py/tests/test13/test13.cc | 2 +- environments/g4py/tools/00README | 101 + environments/g4py/tools/env/env+.csh | 30 + environments/g4py/tools/env/env+.sh | 30 + .../g4py/tools/g4autobuild/g4auto.cfg | 44 + .../g4py/tools/g4autobuild/g4autobuild | 286 + environments/g4py/tools/g4package/g4pack | 242 + examples/History | 51 +- examples/README | 7 +- examples/advanced/Tiara/GNUmakefile | 2 +- examples/advanced/Tiara/History | 8 +- examples/advanced/Tiara/README | 2 +- examples/advanced/Tiara/envCommon.csh | 2 +- examples/advanced/Tiara/run/runSim.py | 2 +- .../advanced/Tiara/run/runSimNoAnalysis.py | 2 +- examples/advanced/Tiara/run/runVisMode.py | 2 +- .../advanced/Tiara/run/runVisNoAnalysis.py | 2 +- examples/advanced/Tiara/run/vis.mac | 2 +- .../Tiara/source/CLHEPWrapper/include/CLHEP.i | 2 +- .../Tiara/source/G4KernelWrapper/G4String.i | 2 +- .../source/G4KernelWrapper/include/G4Kernel.i | 2 +- .../Tiara/source/TiaraWrapper/GNUmakefile | 18 +- .../Tiara/source/TiaraWrapper/include/Tiara.i | 2 +- .../Tiara/source/py_modules/dataAcess.py | 2 +- .../Tiara/source/py_modules/detector.py | 2 +- .../Tiara/source/py_modules/dpsManip.py | 2 +- .../Tiara/source/py_modules/extractShelve.py | 2 +- .../advanced/Tiara/source/py_modules/myPI.py | 2 +- .../Tiara/source/py_modules/myUtils.py | 2 +- .../Tiara/source/py_modules/parallelHall.py | 2 +- .../Tiara/source/py_modules/posLog.py | 2 +- .../Tiara/source/py_modules/runSequence.py | 2 +- .../Tiara/source/py_modules/slabGeometry.py | 2 +- .../Tiara/source/py_modules/tallyData.py | 2 +- .../source/py_modules/tiaraApplication.py | 2 +- .../Tiara/source/py_modules/tiaraDetectors.py | 2 +- .../source/py_modules/tiaraGenerators.py | 2 +- .../source/py_modules/tiaraSpecifications.py | 2 +- .../source/py_modules/variableGeometry.py | 2 +- .../advanced/Tiara/source/tiara/GNUmakefile | 53 +- .../source/tiara}/hadronic_lists.gmk | 32 +- .../source/tiara/include/TiaraCellScorer.hh | 2 +- .../tiara/include/TiaraCellScorerStore.hh | 2 +- .../tiara/include/TiaraConcreteShieldA.hh | 2 +- .../tiara/include/TiaraConcreteShieldB.hh | 2 +- .../tiara/include/TiaraDPSSampledEnergy.hh | 2 +- .../source/tiara/include/TiaraDimensions.hh | 2 +- .../tiara/include/TiaraEnergyCutProcess.hh | 2 +- .../source/tiara/include/TiaraFileAcess.hh | 2 +- .../include/TiaraFixedEnergyGenerator.hh | 2 +- .../source/tiara/include/TiaraGeometry.hh | 2 +- .../source/tiara/include/TiaraIronShieldA.hh | 2 +- .../source/tiara/include/TiaraIronShieldB.hh | 2 +- .../tiara/include/TiaraIsotropicDirections.hh | 2 +- .../source/tiara/include/TiaraMaterials.hh | 2 +- .../source/tiara/include/TiaraMeasure.hh | 2 +- .../Tiara/source/tiara/include/TiaraPart.hh | 2 +- .../source/tiara/include/TiaraPhysicsList.hh | 2 +- .../include/TiaraPrimaryGeneratorAction.hh | 2 +- .../Tiara/source/tiara/include/TiaraRandom.hh | 2 +- .../tiara/include/TiaraSampledEnergy.hh | 2 +- .../Tiara/source/tiara/include/TiaraSim.hh | 2 +- .../Tiara/source/tiara/include/TiaraTally.hh | 2 +- .../tiara/include/TiaraTimedEventAction.hh | 2 +- .../source/tiara/include/TiaraVComponent.hh | 2 +- .../tiara/include/TiaraVDirectionGenerator.hh | 2 +- .../include/TiaraVSourceEnergyGenerator.hh | 2 +- .../tiara/include/TiaraVisEventAction.hh | 2 +- .../source/tiara/include/TiaraVisRunAction.hh | 2 +- .../Tiara/source/tiara/src/TiaraCellScorer.cc | 2 +- .../source/tiara/src/TiaraCellScorerStore.cc | 2 +- .../source/tiara/src/TiaraConcreteShieldA.cc | 2 +- .../source/tiara/src/TiaraConcreteShieldB.cc | 2 +- .../source/tiara/src/TiaraDPSSampledEnergy.cc | 2 +- .../Tiara/source/tiara/src/TiaraDimensions.cc | 2 +- .../source/tiara/src/TiaraEnergyCutProcess.cc | 2 +- .../Tiara/source/tiara/src/TiaraFileAcess.cc | 2 +- .../tiara/src/TiaraFixedEnergyGenerator.cc | 2 +- .../Tiara/source/tiara/src/TiaraGeometry.cc | 2 +- .../source/tiara/src/TiaraIronShieldA.cc | 2 +- .../source/tiara/src/TiaraIronShieldB.cc | 2 +- .../tiara/src/TiaraIsotropicDirections.cc | 2 +- .../Tiara/source/tiara/src/TiaraMaterials.cc | 2 +- .../Tiara/source/tiara/src/TiaraMeasure.cc | 2 +- .../source/tiara/src/TiaraPhysicsList.cc | 2 +- .../tiara/src/TiaraPrimaryGeneratorAction.cc | 2 +- .../Tiara/source/tiara/src/TiaraRandom.cc | 2 +- .../source/tiara/src/TiaraSampledEnergy.cc | 2 +- .../Tiara/source/tiara/src/TiaraSim.cc | 2 +- .../source/tiara/src/TiaraStackingAction.cc | 2 +- .../Tiara/source/tiara/src/TiaraTally.cc | 2 +- .../source/tiara/src/TiaraTimedEventAction.cc | 2 +- .../Tiara/source/tiara/src/TiaraVComponent.cc | 2 +- .../tiara/src/TiaraVDirectionGenerator.cc | 2 +- .../tiara/src/TiaraVSourceEnergyGenerator.cc | 2 +- .../source/tiara/src/TiaraVisEventAction.cc | 2 +- .../source/tiara/src/TiaraVisRunAction.cc | 2 +- examples/advanced/air_shower/History | 6 +- examples/advanced/air_shower/Ultra.cc | 1 - examples/advanced/brachytherapy/Brachy.cc | 2 +- examples/advanced/brachytherapy/History | 8 +- .../brachytherapy/VisualisationMacro.mac | 1 - .../include/BrachyAnalysisManager.hh | 2 +- .../include/BrachyDetectorConstruction.hh | 2 +- .../include/BrachyDetectorConstructionI.hh | 2 +- .../include/BrachyDetectorConstructionIr.hh | 2 +- .../BrachyDetectorConstructionLeipzig.hh | 2 +- .../include/BrachyDetectorMessenger.hh | 2 +- .../include/BrachyEventAction.hh | 2 +- .../brachytherapy/include/BrachyFactory.hh | 2 +- .../brachytherapy/include/BrachyFactoryI.hh | 2 +- .../brachytherapy/include/BrachyFactoryIr.hh | 2 +- .../include/BrachyFactoryLeipzig.hh | 2 +- .../brachytherapy/include/BrachyMaterial.hh | 2 +- .../include/BrachyPhantomROGeometry.hh | 2 +- .../brachytherapy/include/BrachyPhantomSD.hh | 2 +- .../include/BrachyPhysicsList.hh | 50 +- .../include/BrachyPrimaryGeneratorAction.hh | 2 +- .../include/BrachyPrimaryGeneratorActionI.hh | 2 +- .../include/BrachyPrimaryGeneratorActionIr.hh | 2 +- .../BrachyPrimaryGeneratorMessenger.hh | 2 +- .../brachytherapy/include/BrachyRunAction.hh | 2 +- .../src/BrachyAnalysisManager.cc | 2 +- .../src/BrachyDetectorConstruction.cc | 2 +- .../src/BrachyDetectorConstructionI.cc | 2 +- .../src/BrachyDetectorConstructionIr.cc | 2 +- .../src/BrachyDetectorConstructionLeipzig.cc | 2 +- .../src/BrachyDetectorMessenger.cc | 2 +- .../brachytherapy/src/BrachyEventAction.cc | 2 +- .../brachytherapy/src/BrachyFactory.cc | 2 +- .../brachytherapy/src/BrachyFactoryI.cc | 2 +- .../brachytherapy/src/BrachyFactoryIr.cc | 2 +- .../brachytherapy/src/BrachyFactoryLeipzig.cc | 2 +- .../brachytherapy/src/BrachyMaterial.cc | 2 +- .../src/BrachyPhantomROGeometry.cc | 2 +- .../brachytherapy/src/BrachyPhantomSD.cc | 2 +- .../brachytherapy/src/BrachyPhysicsList.cc | 112 +- .../src/BrachyPrimaryGeneratorAction.cc | 2 +- .../src/BrachyPrimaryGeneratorActionI.cc | 2 +- .../src/BrachyPrimaryGeneratorActionIr.cc | 2 +- .../src/BrachyPrimaryGeneratorMessenger.cc | 2 +- .../brachytherapy/src/BrachyRunAction.cc | 2 +- .../composite_calorimeter/GNUmakefile | 4 +- .../advanced/composite_calorimeter/History | 9 +- .../advanced/composite_calorimeter/README | 13 +- .../composite_calorimeter/hadronic_lists.gmk | 60 - .../src/CCalEndOfEventAction.cc | 2 +- .../composite_calorimeter/src/CCalutils.cc | 3 +- .../advanced/gammaray_telescope/GNUmakefile | 21 +- .../gammaray_telescope/GammaRayTel.cc | 2 +- .../include/GammaRayTelAnalysis.hh | 2 +- .../include/GammaRayTelAnalysisMessenger.hh | 2 +- .../include/GammaRayTelAnticoincidenceHit.hh | 2 +- .../include/GammaRayTelAnticoincidenceSD.hh | 2 +- .../include/GammaRayTelCalorimeterHit.hh | 2 +- .../include/GammaRayTelCalorimeterSD.hh | 2 +- .../GammaRayTelDetectorConstruction.hh | 2 +- .../include/GammaRayTelDetectorMessenger.hh | 2 +- .../include/GammaRayTelDigi.hh | 2 +- .../include/GammaRayTelDigitizer.hh | 2 +- .../include/GammaRayTelDigitizerMessenger.hh | 2 +- .../include/GammaRayTelDummySD.hh | 2 +- .../include/GammaRayTelEMPhysics.hh | 2 +- .../include/GammaRayTelEventAction.hh | 2 +- .../include/GammaRayTelGeneralPhysics.hh | 2 +- .../include/GammaRayTelHadronPhysics.hh | 2 +- .../include/GammaRayTelIonPhysics.hh | 2 +- .../include/GammaRayTelMuonPhysics.hh | 2 +- .../GammaRayTelPrimaryGeneratorAction.hh | 2 +- .../GammaRayTelPrimaryGeneratorMessenger.hh | 2 +- .../include/GammaRayTelRunAction.hh | 2 +- .../include/GammaRayTelTrackerHit.hh | 2 +- .../include/GammaRayTelTrackerROGeometry.hh | 2 +- .../include/GammaRayTelTrackerSD.hh | 2 +- .../src/GammaRayTelAnalysis.cc | 2 +- .../src/GammaRayTelAnalysisMessenger.cc | 2 +- .../src/GammaRayTelAnticoincidenceHit.cc | 2 +- .../src/GammaRayTelAnticoincidenceSD.cc | 2 +- .../src/GammaRayTelCalorimeterHit.cc | 2 +- .../src/GammaRayTelCalorimeterSD.cc | 2 +- .../src/GammaRayTelDetectorConstruction.cc | 2 +- .../src/GammaRayTelDetectorMessenger.cc | 2 +- .../gammaray_telescope/src/GammaRayTelDigi.cc | 2 +- .../src/GammaRayTelDigitizer.cc | 2 +- .../src/GammaRayTelDigitizerMessenger.cc | 2 +- .../src/GammaRayTelEMPhysics.cc | 2 +- .../src/GammaRayTelEventAction.cc | 2 +- .../src/GammaRayTelHadronPhysics.cc | 2 +- .../src/GammaRayTelIonPhysics.cc | 2 +- .../src/GammaRayTelMuonPhysics.cc | 2 +- .../src/GammaRayTelPhysicsList.cc | 2 +- .../src/GammaRayTelPrimaryGeneratorAction.cc | 2 +- .../GammaRayTelPrimaryGeneratorMessenger.cc | 2 +- .../src/GammaRayTelRunAction.cc | 2 +- .../src/GammaRayTelTrackerHit.cc | 2 +- .../src/GammaRayTelTrackerROGeometry.cc | 2 +- .../src/GammaRayTelTrackerSD.cc | 2 +- examples/advanced/hadrontherapy/History | 20 +- examples/advanced/hadrontherapy/bertini.mac | 13 +- .../advanced/hadrontherapy/binaryDefault.mac | 45 - .../advanced/hadrontherapy/currentEvent.rndm | 348 +- .../advanced/hadrontherapy/defaultMacro.mac | 1 - .../include/HadrontherapyBeamLine.hh | 2 + .../HadrontherapyDetectorConstruction.hh | 2 +- .../include/HadrontherapyProtonBertini.hh | 80 +- .../include/HadrontherapyProtonBinary.hh | 132 - .../include/HadrontherapyProtonPrecompound.hh | 100 +- .../HadrontherapyProtonPrecompoundFermi.hh | 146 - .../HadrontherapyProtonPrecompoundGEM.hh | 143 - .../HadrontherapyProtonPrecompoundGEMFermi.hh | 145 - .../precompoundDefaultEvaporation.mac | 4 +- .../precompoundDefaultEvaporationFermi.mac | 49 - .../precompoundGEMEvaporation.mac | 48 - .../hadrontherapy/precompoundGEMFermi.mac | 47 - .../src/HadrontherapyAnalysisManager.cc | 41 +- .../src/HadrontherapyBeamLine.cc | 361 +- .../src/HadrontherapyDetectorConstruction.cc | 20 +- .../src/HadrontherapyDetectorMessenger.cc | 26 +- .../src/HadrontherapyPhysicsList.cc | 114 +- .../HadrontherapyPrimaryGeneratorAction.cc | 14 +- .../src/HadrontherapyProtonBertini.cc | 391 +- .../src/HadrontherapyProtonBinary.cc | 272 - .../src/HadrontherapyProtonPrecompound.cc | 205 +- .../HadrontherapyProtonPrecompoundFermi.cc | 302 - .../src/HadrontherapyProtonPrecompoundGEM.cc | 295 - .../HadrontherapyProtonPrecompoundGEMFermi.cc | 308 - .../src/HadrontherapySteppingAction.cc | 2 +- examples/advanced/human_phantom/GNUmakefile | 58 + examples/advanced/human_phantom/History | 60 + examples/advanced/human_phantom/README | 154 + .../advanced/human_phantom/adultFemale.mac | 78 + examples/advanced/human_phantom/adultMale.mac | 71 + .../human_phantom/adultORNLFemale.mac | 78 + .../advanced/human_phantom/adultORNLMale.mac | 78 + examples/advanced/human_phantom/dawnVis.mac | 14 + .../gdmlData/Female/MIRDArmBone.gdml | 79 + .../gdmlData/Female/MIRDBrain.gdml | 127 + .../gdmlData/Female/MIRDBreast.gdml | 140 + .../gdmlData/Female/MIRDHead.gdml | 127 + .../gdmlData/Female/MIRDHeart.gdml | 74 + .../gdmlData/Female/MIRDKidney.gdml | 142 + .../gdmlData/Female/MIRDLegBone.gdml | 134 + .../gdmlData/Female/MIRDLegs.gdml | 127 + .../gdmlData/Female/MIRDLiver.gdml | 77 + .../Female/MIRDLowerLargeIntestine.gdml | 90 + .../gdmlData/Female/MIRDLung.gdml | 139 + .../gdmlData/Female/MIRDMiddleLowerSpine.gdml | 77 + .../gdmlData/Female/MIRDOvary.gdml | 131 + .../gdmlData/Female/MIRDPancreas.gdml | 74 + .../gdmlData/Female/MIRDPelvis.gdml | 90 + .../gdmlData/Female/MIRDSkull.gdml | 104 + .../gdmlData/Female/MIRDSpleen.gdml | 66 + .../gdmlData/Female/MIRDStomach.gdml | 126 + .../gdmlData/Female/MIRDThyroid.gdml | 90 + .../gdmlData/Female/MIRDTrunk.gdml | 122 + .../Female/MIRDUpperLargeIntestine.gdml | 76 + .../gdmlData/Female/MIRDUpperSpine.gdml | 71 + .../gdmlData/Female/MIRDUrinaryBladder.gdml | 124 + .../gdmlData/Female/MIRDUterus.gdml | 120 + .../gdmlData/Female/ORNLArmBone.gdml | 80 + .../gdmlData/Female/ORNLBrain.gdml | 127 + .../gdmlData/Female/ORNLBreast.gdml | 140 + .../gdmlData/Female/ORNLHead.gdml | 127 + .../gdmlData/Female/ORNLHeart.gdml | 74 + .../gdmlData/Female/ORNLKidney.gdml | 142 + .../gdmlData/Female/ORNLLegBone.gdml | 131 + .../gdmlData/Female/ORNLLegs.gdml | 128 + .../gdmlData/Female/ORNLLiver.gdml | 77 + .../Female/ORNLLowerLargeIntestine.gdml | 88 + .../gdmlData/Female/ORNLLung.gdml | 139 + .../gdmlData/Female/ORNLMiddleLowerSpine.gdml | 77 + .../gdmlData/Female/ORNLOvary.gdml | 131 + .../gdmlData/Female/ORNLPancreas.gdml | 74 + .../gdmlData/Female/ORNLPelvis.gdml | 90 + .../gdmlData/Female/ORNLSkull.gdml | 98 + .../gdmlData/Female/ORNLSpleen.gdml | 66 + .../gdmlData/Female/ORNLStomach.gdml | 126 + .../gdmlData/Female/ORNLThyroid.gdml | 90 + .../gdmlData/Female/ORNLTrunk.gdml | 122 + .../Female/ORNLUpperLargeIntestine.gdml | 76 + .../gdmlData/Female/ORNLUpperSpine.gdml | 71 + .../gdmlData/Female/ORNLUrinaryBladder.gdml | 124 + .../gdmlData/Female/ORNLUterus.gdml | 120 + .../gdmlData/Male/MIRDArmBone.gdml | 79 + .../gdmlData/Male/MIRDBrain.gdml | 127 + .../human_phantom/gdmlData/Male/MIRDHead.gdml | 127 + .../gdmlData/Male/MIRDHeart.gdml | 74 + .../gdmlData/Male/MIRDKidney.gdml | 142 + .../gdmlData/Male/MIRDLegBone.gdml | 134 + .../human_phantom/gdmlData/Male/MIRDLegs.gdml | 127 + .../gdmlData/Male/MIRDLiver.gdml | 77 + .../Male/MIRDLowerLargeIntestine.gdml | 88 + .../human_phantom/gdmlData/Male/MIRDLung.gdml | 139 + .../gdmlData/Male/MIRDMiddleLowerSpine.gdml | 77 + .../gdmlData/Male/MIRDPancreas.gdml | 74 + .../gdmlData/Male/MIRDPelvis.gdml | 90 + .../gdmlData/Male/MIRDSkull.gdml | 98 + .../gdmlData/Male/MIRDSpleen.gdml | 66 + .../gdmlData/Male/MIRDStomach.gdml | 126 + .../gdmlData/Male/MIRDThyroid.gdml | 90 + .../gdmlData/Male/MIRDTrunk.gdml | 122 + .../Male/MIRDUpperLargeIntestine.gdml | 76 + .../gdmlData/Male/MIRDUpperSpine.gdml | 71 + .../gdmlData/Male/MIRDUrinaryBladder.gdml | 124 + .../gdmlData/Male/ORNLArmBone.gdml | 79 + .../gdmlData/Male/ORNLBrain.gdml | 127 + .../human_phantom/gdmlData/Male/ORNLHead.gdml | 127 + .../gdmlData/Male/ORNLHeart.gdml | 74 + .../gdmlData/Male/ORNLKidney.gdml | 142 + .../gdmlData/Male/ORNLLegBone.gdml | 131 + .../human_phantom/gdmlData/Male/ORNLLegs.gdml | 128 + .../gdmlData/Male/ORNLLiver.gdml | 77 + .../Male/ORNLLowerLargeIntestine.gdml | 88 + .../human_phantom/gdmlData/Male/ORNLLung.gdml | 139 + .../gdmlData/Male/ORNLMiddleLowerSpine.gdml | 77 + .../gdmlData/Male/ORNLPancreas.gdml | 74 + .../gdmlData/Male/ORNLPelvis.gdml | 90 + .../gdmlData/Male/ORNLSkull.gdml | 98 + .../gdmlData/Male/ORNLSpleen.gdml | 66 + .../gdmlData/Male/ORNLStomach.gdml | 126 + .../gdmlData/Male/ORNLThyroid.gdml | 90 + .../gdmlData/Male/ORNLTrunk.gdml | 122 + .../Male/ORNLUpperLargeIntestine.gdml | 76 + .../gdmlData/Male/ORNLUpperSpine.gdml | 71 + .../gdmlData/Male/ORNLUrinaryBladder.gdml | 124 + .../human_phantom/include/G4FemaleBuilder.hh | 59 + .../human_phantom/include/G4HumanDummySD.hh | 64 + .../include/G4HumanPhantomAnalysisManager.hh} | 96 +- .../include/G4HumanPhantomConstruction.hh | 77 + .../include/G4HumanPhantomEnergyDeposit.hh | 53 + .../include/G4HumanPhantomEventAction.hh} | 45 +- .../include/G4HumanPhantomMaterial.hh} | 76 +- .../include/G4HumanPhantomMessenger.hh} | 67 +- .../include/G4HumanPhantomPhysicsList.hh | 62 + .../G4HumanPhantomPrimaryGeneratorAction.hh | 77 + ...4HumanPhantomPrimaryGeneratorMessenger.hh} | 46 +- .../include/G4HumanPhantomROGeometry.hh | 52 + .../include/G4HumanPhantomRunAction.hh | 56 + .../include/G4HumanPhantomSD.hh} | 42 +- .../include/G4HumanPhantomSDBreast.hh} | 46 +- .../include/G4HumanPhantomSteppingAction.hh} | 24 +- .../human_phantom/include/G4MIRDAdrenal.hh | 58 + .../human_phantom/include/G4MIRDArmBone.hh | 57 + .../include/G4MIRDBodyFactory.hh | 97 + .../human_phantom/include/G4MIRDBrain.hh | 57 + .../human_phantom/include/G4MIRDBreast.hh | 50 + .../human_phantom/include/G4MIRDHead.hh | 59 + .../human_phantom/include/G4MIRDHeart.hh | 50 + .../human_phantom/include/G4MIRDKidney.hh | 50 + .../human_phantom/include/G4MIRDLegBone.hh | 53 + .../human_phantom/include/G4MIRDLegs.hh | 50 + .../human_phantom/include/G4MIRDLiver.hh | 51 + .../include/G4MIRDLowerLargeIntestine.hh | 50 + .../human_phantom/include/G4MIRDLung.hh} | 42 +- .../include/G4MIRDMiddleLowerSpine.hh | 52 + .../human_phantom/include/G4MIRDOvary.hh | 51 + .../human_phantom/include/G4MIRDPancreas.hh | 58 + .../human_phantom/include/G4MIRDPelvis.hh | 50 + .../human_phantom/include/G4MIRDRibCage.hh | 58 + .../human_phantom/include/G4MIRDSkull.hh | 53 + .../human_phantom/include/G4MIRDSpleen.hh | 52 + .../human_phantom/include/G4MIRDStomach.hh} | 37 +- .../human_phantom/include/G4MIRDTestes.hh | 58 + .../human_phantom/include/G4MIRDThyroid.hh | 51 + .../human_phantom/include/G4MIRDTrunk.hh | 58 + .../include/G4MIRDUpperLargeIntestine.hh | 50 + .../human_phantom/include/G4MIRDUpperSpine.hh | 53 + .../include/G4MIRDUrinaryBladder.hh | 51 + .../human_phantom/include/G4MIRDUterus.hh | 50 + .../human_phantom/include/G4MaleBuilder.hh | 54 + .../human_phantom/include/G4ORNLAdrenal.hh | 58 + .../human_phantom/include/G4ORNLArmBone.hh | 58 + .../include/G4ORNLBodyFactory.hh | 96 + .../human_phantom/include/G4ORNLBrain.hh | 58 + .../human_phantom/include/G4ORNLBreast.hh | 58 + .../human_phantom/include/G4ORNLEsophagus.hh | 58 + .../human_phantom/include/G4ORNLHead.hh | 58 + .../human_phantom/include/G4ORNLHeart.hh | 58 + .../human_phantom/include/G4ORNLKidney.hh | 58 + .../human_phantom/include/G4ORNLLegBone.hh | 58 + .../human_phantom/include/G4ORNLLegs.hh | 58 + .../human_phantom/include/G4ORNLLiver.hh | 58 + .../include/G4ORNLLowerLargeIntestine.hh | 58 + .../human_phantom/include/G4ORNLLung.hh | 58 + .../include/G4ORNLMiddleLowerSpine.hh} | 54 +- .../human_phantom/include/G4ORNLOvary.hh | 58 + .../human_phantom/include/G4ORNLPancreas.hh | 58 + .../human_phantom/include/G4ORNLPelvis.hh | 58 + .../human_phantom/include/G4ORNLRibCage.hh | 58 + .../human_phantom/include/G4ORNLSkull.hh | 58 + .../human_phantom/include/G4ORNLSpleen.hh | 58 + .../human_phantom/include/G4ORNLStomach.hh | 58 + .../human_phantom/include/G4ORNLTestes.hh | 58 + .../human_phantom/include/G4ORNLThyroid.hh | 58 + .../human_phantom/include/G4ORNLTrunk.hh | 58 + .../include/G4ORNLUpperLargeIntestine.hh | 58 + .../human_phantom/include/G4ORNLUpperSpine.hh | 58 + .../include/G4ORNLUrinaryBladder.hh | 58 + .../human_phantom/include/G4ORNLUterus.hh | 58 + .../include/G4ParameterisedBreast.hh | 53 + .../human_phantom/include/G4PhantomBuilder.hh | 114 + .../human_phantom/include/G4VBodyFactory.hh | 92 + .../include/G4VPhantomBuilder.hh | 88 + examples/advanced/human_phantom/noVis.mac | 6 + examples/advanced/human_phantom/openGLVis.mac | 15 + examples/advanced/human_phantom/phantom.cc | 133 + examples/advanced/human_phantom/run.mac | 47 + .../human_phantom/src/G4FemaleBuilder.cc} | 77 +- .../src/G4HumanPhantomAnalysisManager.cc | 166 + .../src/G4HumanPhantomConstruction.cc | 178 + .../src/G4HumanPhantomEnergyDeposit.cc | 85 + .../src/G4HumanPhantomEventAction.cc} | 79 +- .../src/G4HumanPhantomMaterial.cc | 215 + .../src/G4HumanPhantomMessenger.cc | 145 + .../src/G4HumanPhantomPhysicsList.cc | 163 + .../G4HumanPhantomPrimaryGeneratorAction.cc | 195 + ...4HumanPhantomPrimaryGeneratorMessenger.cc} | 66 +- .../src/G4HumanPhantomROGeometry.cc | 159 + .../src/G4HumanPhantomRunAction.cc} | 67 +- .../human_phantom/src/G4HumanPhantomSD.cc} | 72 +- .../src/G4HumanPhantomSDBreast.cc} | 98 +- .../src/G4HumanPhantomSteppingAction.cc | 78 + .../human_phantom/src/G4MIRDAdrenal.cc | 93 + .../human_phantom/src/G4MIRDArmBone.cc | 121 + .../human_phantom/src/G4MIRDBodyFactory.cc | 279 + .../advanced/human_phantom/src/G4MIRDBrain.cc | 116 + .../human_phantom/src/G4MIRDBreast.cc | 147 + .../advanced/human_phantom/src/G4MIRDHead.cc | 131 + .../advanced/human_phantom/src/G4MIRDHeart.cc | 135 + .../human_phantom/src/G4MIRDKidney.cc | 142 + .../human_phantom/src/G4MIRDLegBone.cc | 139 + .../advanced/human_phantom/src/G4MIRDLegs.cc | 137 + .../advanced/human_phantom/src/G4MIRDLiver.cc | 143 + .../src/G4MIRDLowerLargeIntestine.cc | 151 + .../advanced/human_phantom/src/G4MIRDLung.cc | 131 + .../src/G4MIRDMiddleLowerSpine.cc | 126 + .../advanced/human_phantom/src/G4MIRDOvary.cc | 130 + .../human_phantom/src/G4MIRDPancreas.cc | 135 + .../human_phantom/src/G4MIRDPelvis.cc | 147 + .../human_phantom/src/G4MIRDRibCage.cc | 90 + .../advanced/human_phantom/src/G4MIRDSkull.cc | 168 + .../human_phantom/src/G4MIRDSpleen.cc | 119 + .../human_phantom/src/G4MIRDStomach.cc | 118 + .../human_phantom/src/G4MIRDTestes.cc | 90 + .../human_phantom/src/G4MIRDThyroid.cc | 158 + .../advanced/human_phantom/src/G4MIRDTrunk.cc | 118 + .../src/G4MIRDUpperLargeIntestine.cc | 131 + .../human_phantom/src/G4MIRDUpperSpine.cc | 115 + .../human_phantom/src/G4MIRDUrinaryBladder.cc | 113 + .../human_phantom/src/G4MIRDUterus.cc | 123 + .../human_phantom/src/G4MaleBuilder.cc | 51 + .../human_phantom/src/G4ORNLAdrenal.cc | 94 + .../human_phantom/src/G4ORNLArmBone.cc | 92 + .../human_phantom/src/G4ORNLBodyFactory.cc | 241 + .../advanced/human_phantom/src/G4ORNLBrain.cc | 91 + .../human_phantom/src/G4ORNLBreast.cc | 91 + .../human_phantom/src/G4ORNLEsophagus.cc | 91 + .../advanced/human_phantom/src/G4ORNLHead.cc | 95 + .../advanced/human_phantom/src/G4ORNLHeart.cc | 93 + .../human_phantom/src/G4ORNLKidney.cc | 93 + .../human_phantom/src/G4ORNLLegBone.cc | 94 + .../advanced/human_phantom/src/G4ORNLLegs.cc | 94 + .../advanced/human_phantom/src/G4ORNLLiver.cc | 94 + .../src/G4ORNLLowerLargeIntestine.cc | 94 + .../advanced/human_phantom/src/G4ORNLLung.cc | 94 + .../src/G4ORNLMiddleLowerSpine.cc | 93 + .../advanced/human_phantom/src/G4ORNLOvary.cc | 92 + .../human_phantom/src/G4ORNLPancreas.cc | 92 + .../human_phantom/src/G4ORNLPelvis.cc | 94 + .../human_phantom/src/G4ORNLRibCage.cc | 91 + .../advanced/human_phantom/src/G4ORNLSkull.cc | 94 + .../human_phantom/src/G4ORNLSpleen.cc | 93 + .../human_phantom/src/G4ORNLStomach.cc | 94 + .../human_phantom/src/G4ORNLTestes.cc | 94 + .../human_phantom/src/G4ORNLThyroid.cc | 94 + .../advanced/human_phantom/src/G4ORNLTrunk.cc | 95 + .../src/G4ORNLUpperLargeIntestine.cc | 93 + .../human_phantom/src/G4ORNLUpperSpine.cc | 94 + .../human_phantom/src/G4ORNLUrinaryBladder.cc | 93 + .../human_phantom/src/G4ORNLUterus.cc | 94 + .../src/G4ParameterisedBreast.cc | 204 + .../human_phantom/src/G4PhantomBuilder.cc | 335 + .../human_phantom/src/G4VBodyFactory.cc} | 35 +- .../human_phantom/src/G4VPhantomBuilder.cc} | 32 +- examples/advanced/human_phantom/vrmlVis.mac | 13 + examples/advanced/lAr_calorimeter/GNUmakefile | 4 +- examples/advanced/lAr_calorimeter/History | 10 +- .../lAr_calorimeter/hadronic_lists.gmk | 60 - .../lAr_calorimeter/include/FCALCalorHit.hh | 2 +- .../lAr_calorimeter/include/FCALEMModuleSD.hh | 2 +- .../include/FCALHadModuleSD.hh | 2 +- .../include/FCALPrimaryGeneratorAction.hh | 2 +- .../lAr_calorimeter/include/FCALRunAction.hh | 2 +- .../include/FCALSteppingAction.hh | 2 +- .../include/FCALSteppingVerbose.hh | 2 +- .../include/FCALTBEventAction.hh | 2 +- .../include/FCALTestbeamSetupSD.hh | 2 +- examples/advanced/lAr_calorimeter/lArCal.cc | 2 +- .../lAr_calorimeter/src/FCALCalorHit.cc | 2 +- .../src/FCALCryostatVolumes.cc | 9 +- .../lAr_calorimeter/src/FCALEMModule.cc | 12 +- .../lAr_calorimeter/src/FCALEMModuleSD.cc | 7 +- .../lAr_calorimeter/src/FCALHadModule.cc | 18 +- .../lAr_calorimeter/src/FCALHadModuleSD.cc | 7 +- .../src/FCALMaterialConsultant.cc | 6 +- .../src/FCALPrimaryGeneratorAction.cc | 6 +- .../lAr_calorimeter/src/FCALRunAction.cc | 2 +- .../lAr_calorimeter/src/FCALSteppingAction.cc | 2 +- .../src/FCALSteppingVerbose.cc | 2 +- .../lAr_calorimeter/src/FCALTBEventAction.cc | 2 +- .../lAr_calorimeter/src/FCALTestbeamSetup.cc | 11 +- .../src/FCALTestbeamSetupSD.cc | 2 +- examples/advanced/microbeam/History | 20 +- examples/advanced/microbeam/README | 14 +- examples/advanced/microbeam/microbeam.mac | 2 +- examples/advanced/microbeam/microbeam.out | 349 + .../microbeam/src/MicrobeamPhysicsList.cc | 6 +- .../microbeam/src/MicrobeamVisManager.cc | 153 - examples/advanced/purging_magnet/PurgMag.cc | 2 +- .../include/PurgMagAnalysisManager.hh | 2 +- .../include/PurgMagDetectorConstruction.hh | 2 +- .../include/PurgMagEventAction.hh | 2 +- .../include/PurgMagPhysicsList.hh | 2 +- .../include/PurgMagPrimaryGeneratorAction.hh | 2 +- .../include/PurgMagRunAction.hh | 2 +- .../include/PurgMagSteppingAction.hh | 2 +- .../include/PurgMagSteppingVerbose.hh | 2 +- .../include/PurgMagTabulatedField3D.hh | 2 +- .../include/PurgMagTrackingAction.hh | 2 +- .../src/PurgMagAnalysisManager.cc | 2 +- .../src/PurgMagDetectorConstruction.cc | 2 +- .../purging_magnet/src/PurgMagEventAction.cc | 2 +- .../purging_magnet/src/PurgMagPhysicsList.cc | 2 +- .../src/PurgMagPrimaryGeneratorAction.cc | 2 +- .../purging_magnet/src/PurgMagRunAction.cc | 2 +- .../src/PurgMagSteppingAction.cc | 2 +- .../src/PurgMagSteppingVerbose.cc | 2 +- .../src/PurgMagTabulatedField3D.cc | 2 +- .../src/PurgMagTrackingAction.cc | 2 +- examples/advanced/radiation_monitor/Radmon.cc | 2 +- .../analysis/include/RadmonAnalysis.hh | 2 +- .../analysis/include/RadmonAnalysisLayout.hh | 2 +- .../include/RadmonAnalysisMessenger.hh | 2 +- ...dmonAnalysisSensitiveDetectorTypeLayout.hh | 2 +- ...monAnalysisSensitiveDetectorTypeLayout.icc | 2 +- .../RadmonDataAnalysisDepositedEnergy.hh | 2 +- .../RadmonDataAnalysisDepositedEnergy.icc | 2 +- .../include/RadmonDataAnalysisLayout.hh | 2 +- .../include/RadmonDataAnalysisLayout.icc | 2 +- .../RadmonDataAnalysisWithLabelFactory.hh | 2 +- .../RadmonDataAnalysisWithLabelFactory.icc | 2 +- .../RadmonDataAnalysisWithLabelMessenger.hh | 2 +- .../analysis/include/RadmonVAnalysisLayout.hh | 2 +- .../include/RadmonVAnalysisLayout.icc | 2 +- .../analysis/include/RadmonVDataAnalysis.hh | 2 +- .../analysis/include/RadmonVDataAnalysis.icc | 2 +- .../include/RadmonVDataAnalysisFactory.hh | 2 +- .../include/RadmonVDataAnalysisFactory.icc | 2 +- .../include/RadmonVDataAnalysisWithLabel.hh | 2 +- .../include/RadmonVDataAnalysisWithLabel.icc | 2 +- .../analysis/src/RadmonAnalysis.cc | 2 +- .../analysis/src/RadmonAnalysisLayout.cc | 2 +- .../analysis/src/RadmonAnalysisMessenger.cc | 2 +- ...dmonAnalysisSensitiveDetectorTypeLayout.cc | 2 +- .../src/RadmonDataAnalysisDepositedEnergy.cc | 2 +- .../analysis/src/RadmonDataAnalysisLayout.cc | 2 +- .../src/RadmonDataAnalysisWithLabelFactory.cc | 2 +- .../RadmonDataAnalysisWithLabelMessenger.cc | 2 +- .../application/include/RadmonApplication.hh | 2 +- .../application/include/RadmonApplication.icc | 2 +- .../include/RadmonApplicationAnalysisSetup.hh | 2 +- .../RadmonApplicationAnalysisSetup.icc | 2 +- .../include/RadmonApplicationDetectorSetup.hh | 2 +- .../RadmonApplicationDetectorSetup.icc | 2 +- .../RadmonApplicationEventNumbering.hh | 2 +- .../RadmonApplicationEventNumbering.icc | 2 +- .../include/RadmonApplicationEventTracks.hh | 2 +- .../include/RadmonApplicationEventTracks.icc | 2 +- .../RadmonApplicationGeneratorSetup.hh | 2 +- .../RadmonApplicationGeneratorSetup.icc | 2 +- .../include/RadmonApplicationMessenger.hh | 2 +- .../include/RadmonApplicationOptions.hh | 2 +- .../include/RadmonApplicationOptions.icc | 2 +- .../include/RadmonApplicationPhysicsSetup.hh | 2 +- .../include/RadmonApplicationPhysicsSetup.icc | 2 +- .../include/RadmonApplicationRunNumbering.hh | 2 +- .../include/RadmonApplicationRunNumbering.icc | 2 +- .../application/src/RadmonApplication.cc | 2 +- .../src/RadmonApplicationAnalysisSetup.cc | 2 +- .../src/RadmonApplicationDetectorSetup.cc | 2 +- .../src/RadmonApplicationEventNumbering.cc | 2 +- .../src/RadmonApplicationEventTracks.cc | 2 +- .../src/RadmonApplicationGeneratorSetup.cc | 2 +- .../src/RadmonApplicationMessenger.cc | 2 +- .../src/RadmonApplicationOptions.cc | 2 +- .../src/RadmonApplicationPhysicsSetup.cc | 2 +- .../src/RadmonApplicationRunNumbering.cc | 2 +- ...dmonDetectorCarvedFlatVolumeConstructor.hh | 2 +- ...monDetectorCarvedFlatVolumeConstructor.icc | 2 +- ...WithGroundAndKeyMarksAndHoleConstructor.hh | 2 +- ...ithGroundAndKeyMarksAndHoleConstructor.icc | 2 +- ...tVolumeWithGroundAndKeyMarksConstructor.hh | 2 +- ...VolumeWithGroundAndKeyMarksConstructor.icc | 2 +- ...orCarvedFlatVolumeWithGroundConstructor.hh | 2 +- ...rCarvedFlatVolumeWithGroundConstructor.icc | 2 +- ...ctorCarvedFlatVolumeWithHoleConstructor.hh | 2 +- ...torCarvedFlatVolumeWithHoleConstructor.icc | 2 +- ...ctorCarvedFlatVolumeWithPinsConstructor.hh | 2 +- ...torCarvedFlatVolumeWithPinsConstructor.icc | 2 +- ...dFlatVolumeWithTracksAndHoleConstructor.hh | 2 +- ...FlatVolumeWithTracksAndHoleConstructor.icc | 2 +- ...orCarvedFlatVolumeWithTracksConstructor.hh | 2 +- ...rCarvedFlatVolumeWithTracksConstructor.icc | 2 +- .../include/RadmonDetectorConstruction.hh | 2 +- .../RadmonDetectorEnvironmentLayout.hh | 2 +- .../RadmonDetectorEnvironmentLayout.icc | 2 +- .../RadmonDetectorFlatVolumeComponent.hh | 2 +- .../RadmonDetectorFlatVolumeComponent.icc | 2 +- .../RadmonDetectorFlatVolumeConstructor.hh | 2 +- .../RadmonDetectorFlatVolumeConstructor.icc | 2 +- ...WithGroundAndKeyMarksAndHoleConstructor.hh | 2 +- ...ithGroundAndKeyMarksAndHoleConstructor.icc | 2 +- ...tVolumeWithGroundAndKeyMarksConstructor.hh | 2 +- ...VolumeWithGroundAndKeyMarksConstructor.icc | 2 +- ...DetectorFlatVolumeWithGroundConstructor.hh | 2 +- ...etectorFlatVolumeWithGroundConstructor.icc | 2 +- ...onDetectorFlatVolumeWithHoleConstructor.hh | 2 +- ...nDetectorFlatVolumeWithHoleConstructor.icc | 2 +- ...onDetectorFlatVolumeWithPadsConstructor.hh | 2 +- ...nDetectorFlatVolumeWithPadsConstructor.icc | 2 +- ...onDetectorFlatVolumeWithPinsConstructor.hh | 2 +- ...nDetectorFlatVolumeWithPinsConstructor.icc | 2 +- ...rFlatVolumeWithTracksAndHoleConstructor.hh | 2 +- ...FlatVolumeWithTracksAndHoleConstructor.icc | 2 +- ...DetectorFlatVolumeWithTracksConstructor.hh | 2 +- ...etectorFlatVolumeWithTracksConstructor.icc | 2 +- ...ctorLabelledEntitiesConstructorsFactory.hh | 2 +- ...torLabelledEntitiesConstructorsFactory.icc | 2 +- ...orLabelledEntitiesConstructorsMessenger.hh | 2 +- .../include/RadmonDetectorLayerLayout.hh | 2 +- .../include/RadmonDetectorLayerLayout.icc | 2 +- .../include/RadmonDetectorLayerVolumeItem.hh | 2 +- .../include/RadmonDetectorLayerVolumeItem.icc | 2 +- ...dmonDetectorLayerVolumeItemIntersection.hh | 2 +- ...monDetectorLayerVolumeItemIntersection.icc | 2 +- ...admonDetectorLayerVolumeItemSubtraction.hh | 2 +- ...dmonDetectorLayerVolumeItemSubtraction.icc | 2 +- .../RadmonDetectorLayerVolumeItemUnion.hh | 2 +- .../RadmonDetectorLayerVolumeItemUnion.icc | 2 +- .../include/RadmonDetectorLayerVolumesList.hh | 2 +- .../RadmonDetectorLayerVolumesList.icc | 2 +- .../detector/include/RadmonDetectorLayout.hh | 2 +- .../include/RadmonDetectorMessenger.hh | 2 +- .../include/RadmonDetectorMultilayerLayout.hh | 2 +- .../RadmonDetectorMultilayerLayout.icc | 2 +- ...RadmonDetectorMultilayerPlacementLayout.hh | 2 +- ...admonDetectorMultilayerPlacementLayout.icc | 2 +- ...torMultilayerPlacementsLayoutCollection.hh | 2 +- ...orMultilayerPlacementsLayoutCollection.icc | 2 +- ...dmonDetectorMultilayersLayoutCollection.hh | 2 +- ...monDetectorMultilayersLayoutCollection.icc | 2 +- .../include/RadmonDetectorPadsData.hh | 2 +- .../include/RadmonDetectorPadsData.icc | 2 +- .../RadmonTDetectorCarvedVolumesDecorator.hh | 2 +- .../RadmonTDetectorCarvedVolumesDecorator.icc | 2 +- .../RadmonTDetectorLayerConstructor.hh | 2 +- .../RadmonTDetectorLayerConstructor.icc | 2 +- ...dmonTDetectorVolumesWithGroundDecorator.hh | 2 +- ...monTDetectorVolumesWithGroundDecorator.icc | 2 +- ...RadmonTDetectorVolumesWithHoleDecorator.hh | 2 +- ...admonTDetectorVolumesWithHoleDecorator.icc | 2 +- ...onTDetectorVolumesWithKeyMarksDecorator.hh | 2 +- ...nTDetectorVolumesWithKeyMarksDecorator.icc | 2 +- ...RadmonTDetectorVolumesWithPadsDecorator.hh | 2 +- ...admonTDetectorVolumesWithPadsDecorator.icc | 2 +- ...RadmonTDetectorVolumesWithPinsDecorator.hh | 2 +- ...admonTDetectorVolumesWithPinsDecorator.icc | 2 +- ...dmonTDetectorVolumesWithTracksDecorator.hh | 2 +- ...monTDetectorVolumesWithTracksDecorator.icc | 2 +- ...monVDetectorEntitiesConstructorsFactory.hh | 2 +- ...onVDetectorEntitiesConstructorsFactory.icc | 2 +- .../RadmonVDetectorEntityConstructor.hh | 2 +- .../RadmonVDetectorEntityConstructor.icc | 2 +- ...admonVDetectorLabelledEntityConstructor.hh | 2 +- ...dmonVDetectorLabelledEntityConstructor.icc | 2 +- ...RadmonVDetectorLayerVolumeItemOperation.hh | 2 +- ...admonVDetectorLayerVolumeItemOperation.icc | 2 +- .../detector/include/RadmonVDetectorLayout.hh | 2 +- .../include/RadmonVDetectorLayout.icc | 2 +- .../src/RadmonDetectorConstruction.cc | 2 +- .../src/RadmonDetectorEnvironmentLayout.cc | 2 +- .../src/RadmonDetectorFlatVolumeComponent.cc | 2 +- ...ctorLabelledEntitiesConstructorsFactory.cc | 2 +- ...orLabelledEntitiesConstructorsMessenger.cc | 2 +- .../detector/src/RadmonDetectorLayerLayout.cc | 2 +- .../src/RadmonDetectorLayerVolumeItem.cc | 2 +- ...dmonDetectorLayerVolumeItemIntersection.cc | 2 +- ...admonDetectorLayerVolumeItemSubtraction.cc | 2 +- .../src/RadmonDetectorLayerVolumeItemUnion.cc | 2 +- .../src/RadmonDetectorLayerVolumesList.cc | 2 +- .../detector/src/RadmonDetectorLayout.cc | 2 +- .../detector/src/RadmonDetectorMessenger.cc | 2 +- .../src/RadmonDetectorMultilayerLayout.cc | 2 +- ...RadmonDetectorMultilayerPlacementLayout.cc | 2 +- ...torMultilayerPlacementsLayoutCollection.cc | 2 +- ...dmonDetectorMultilayersLayoutCollection.cc | 2 +- .../detector/src/RadmonDetectorPadsData.cc | 2 +- ...admonVDetectorLabelledEntityConstructor.cc | 2 +- ...RadmonVDetectorLayerVolumeItemOperation.cc | 2 +- .../generalPurpose/include/RadmonDumpStyle.hh | 2 +- .../RadmonLayoutEntityWithAttributes.hh | 2 +- .../RadmonLayoutEntityWithAttributes.icc | 2 +- .../generalPurpose/include/RadmonMessenger.hh | 2 +- .../include/RadmonMessenger.icc | 2 +- .../include/RadmonMessengersSupport.hh | 2 +- .../include/RadmonTLabelledCollection.hh | 2 +- .../include/RadmonTLabelledCollection.icc | 2 +- .../generalPurpose/include/RadmonTokenizer.hh | 2 +- .../include/RadmonTokenizer.icc | 2 +- .../include/RadmonVLayoutObserver.hh | 2 +- .../include/RadmonVLayoutObserver.icc | 2 +- .../include/RadmonVLayoutSubject.hh | 2 +- .../include/RadmonVLayoutSubject.icc | 2 +- .../src/RadmonLayoutEntityWithAttributes.cc | 2 +- .../generalPurpose/src/RadmonMessenger.cc | 2 +- .../generalPurpose/src/RadmonTokenizer.cc | 2 +- .../src/RadmonVLayoutSubject.cc | 2 +- .../include/RadmonGeneratorFixedDirection.hh | 2 +- .../include/RadmonGeneratorFixedDirection.icc | 2 +- .../include/RadmonGeneratorFixedEnergy.hh | 2 +- .../include/RadmonGeneratorFixedEnergy.icc | 2 +- .../include/RadmonGeneratorFixedParticle.hh | 2 +- .../include/RadmonGeneratorFixedParticle.icc | 2 +- .../include/RadmonGeneratorFixedPosition.hh | 2 +- .../include/RadmonGeneratorFixedPosition.icc | 2 +- .../include/RadmonGeneratorLayout.hh | 2 +- .../include/RadmonGeneratorLayout.icc | 2 +- .../include/RadmonGeneratorMessenger.hh | 2 +- .../RadmonGeneratorSourceAlgorithmLayout.hh | 2 +- .../RadmonGeneratorSourceAlgorithmLayout.icc | 2 +- .../include/RadmonGeneratorSourceLayout.hh | 2 +- .../include/RadmonGeneratorSourceLayout.icc | 2 +- .../include/RadmonGeneratorUniformPlane.hh | 2 +- .../include/RadmonGeneratorUniformPlane.icc | 2 +- .../include/RadmonGeneratorUniformSphere.hh | 2 +- .../include/RadmonGeneratorUniformSphere.icc | 2 +- .../RadmonGeneratorsWithLabelFactory.hh | 2 +- .../RadmonGeneratorsWithLabelMessenger.hh | 2 +- .../include/RadmonPrimaryGeneratorAction.hh | 2 +- .../generator/include/RadmonVGenerator.hh | 2 +- .../generator/include/RadmonVGenerator.icc | 2 +- .../include/RadmonVGeneratorLayout.hh | 2 +- .../include/RadmonVGeneratorLayout.icc | 2 +- .../include/RadmonVGeneratorWithLabel.hh | 2 +- .../include/RadmonVGeneratorWithLabel.icc | 2 +- .../include/RadmonVGeneratorsFactory.hh | 2 +- .../include/RadmonVGeneratorsFactory.icc | 2 +- .../src/RadmonGeneratorFixedDirection.cc | 2 +- .../src/RadmonGeneratorFixedEnergy.cc | 2 +- .../src/RadmonGeneratorFixedParticle.cc | 2 +- .../src/RadmonGeneratorFixedPosition.cc | 2 +- .../generator/src/RadmonGeneratorLayout.cc | 2 +- .../generator/src/RadmonGeneratorMessenger.cc | 2 +- .../RadmonGeneratorSourceAlgorithmLayout.cc | 2 +- .../src/RadmonGeneratorSourceLayout.cc | 2 +- .../src/RadmonGeneratorUniformPlane.cc | 2 +- .../src/RadmonGeneratorUniformSphere.cc | 2 +- .../src/RadmonGeneratorsWithLabelFactory.cc | 2 +- .../src/RadmonGeneratorsWithLabelMessenger.cc | 2 +- .../src/RadmonPrimaryGeneratorAction.cc | 2 +- .../include/RadmonMaterialsDumpStyle.hh | 2 +- .../include/RadmonMaterialsManager.hh | 2 +- .../include/RadmonMaterialsManager.icc | 2 +- .../include/RadmonMaterialsMessenger.hh | 2 +- .../materials/src/RadmonMaterialsManager.cc | 2 +- .../materials/src/RadmonMaterialsMessenger.cc | 2 +- .../physics/include/RadmonPhysicsDecay.hh | 2 +- .../physics/include/RadmonPhysicsDecay.icc | 2 +- .../include/RadmonPhysicsElectronEEDL.hh | 2 +- .../include/RadmonPhysicsElectronEEDL.icc | 2 +- .../include/RadmonPhysicsElectronStandard.hh | 2 +- .../include/RadmonPhysicsElectronStandard.icc | 2 +- .../include/RadmonPhysicsHadronsBertini.hh | 2 +- .../include/RadmonPhysicsHadronsBertini.icc | 2 +- .../include/RadmonPhysicsHadronsBinary.hh | 2 +- .../include/RadmonPhysicsHadronsBinary.icc | 2 +- .../include/RadmonPhysicsICRUIonization.hh | 2 +- .../include/RadmonPhysicsICRUIonization.icc | 2 +- .../physics/include/RadmonPhysicsInfo.hh | 2 +- .../physics/include/RadmonPhysicsInfo.icc | 2 +- .../physics/include/RadmonPhysicsInfoList.hh | 2 +- .../physics/include/RadmonPhysicsInfoList.icc | 2 +- .../physics/include/RadmonPhysicsLayout.hh | 2 +- .../physics/include/RadmonPhysicsList.hh | 2 +- .../physics/include/RadmonPhysicsMessenger.hh | 2 +- .../include/RadmonPhysicsMuonStandard.hh | 2 +- .../include/RadmonPhysicsMuonStandard.icc | 2 +- .../include/RadmonPhysicsNeutronBertini.hh | 2 +- .../include/RadmonPhysicsNeutronBertini.icc | 2 +- .../include/RadmonPhysicsNeutronBinary.hh | 2 +- .../include/RadmonPhysicsNeutronBinary.icc | 2 +- .../physics/include/RadmonPhysicsNuclear.hh | 2 +- .../physics/include/RadmonPhysicsNuclear.icc | 2 +- .../include/RadmonPhysicsPhotonEPDL.hh | 2 +- .../include/RadmonPhysicsPhotonEPDL.icc | 2 +- .../include/RadmonPhysicsPhotonStandard.hh | 2 +- .../include/RadmonPhysicsPhotonStandard.icc | 2 +- .../include/RadmonPhysicsPositronStandard.hh | 2 +- .../include/RadmonPhysicsPositronStandard.icc | 2 +- .../include/RadmonPhysicsProductionCuts.hh | 2 +- .../include/RadmonPhysicsProductionCuts.icc | 2 +- .../include/RadmonPhysicsSteppingAction.hh | 2 +- .../include/RadmonPhysicsSteppingAction.icc | 2 +- .../include/RadmonPhysicsTauStandard.hh | 2 +- .../include/RadmonPhysicsTauStandard.icc | 2 +- .../include/RadmonSubPhysicsListLayout.hh | 2 +- .../include/RadmonSubPhysicsListLayout.icc | 2 +- .../RadmonSubPhysicsListWithLabelFactory.hh | 2 +- .../RadmonSubPhysicsListWithLabelFactory.icc | 2 +- .../RadmonSubPhysicsListWithLabelMessenger.hh | 2 +- .../physics/include/RadmonVPhysicsLayout.hh | 2 +- .../physics/include/RadmonVPhysicsLayout.icc | 2 +- .../physics/include/RadmonVSubPhysicsList.hh | 2 +- .../physics/include/RadmonVSubPhysicsList.icc | 2 +- .../include/RadmonVSubPhysicsListFactory.hh | 2 +- .../include/RadmonVSubPhysicsListFactory.icc | 2 +- .../include/RadmonVSubPhysicsListWithLabel.hh | 2 +- .../RadmonVSubPhysicsListWithLabel.icc | 2 +- .../physics/src/RadmonPhysicsDecay.cc | 2 +- .../physics/src/RadmonPhysicsElectronEEDL.cc | 2 +- .../src/RadmonPhysicsElectronStandard.cc | 2 +- .../src/RadmonPhysicsHadronsBertini.cc | 2 +- .../physics/src/RadmonPhysicsHadronsBinary.cc | 2 +- .../src/RadmonPhysicsICRUIonization.cc | 2 +- .../physics/src/RadmonPhysicsInfo.cc | 2 +- .../physics/src/RadmonPhysicsInfoList.cc | 2 +- .../physics/src/RadmonPhysicsLayout.cc | 2 +- .../physics/src/RadmonPhysicsList.cc | 2 +- .../physics/src/RadmonPhysicsMessenger.cc | 2 +- .../physics/src/RadmonPhysicsMuonStandard.cc | 2 +- .../src/RadmonPhysicsNeutronBertini.cc | 2 +- .../physics/src/RadmonPhysicsNeutronBinary.cc | 2 +- .../physics/src/RadmonPhysicsNuclear.cc | 2 +- .../physics/src/RadmonPhysicsPhotonEPDL.cc | 2 +- .../src/RadmonPhysicsPhotonStandard.cc | 2 +- .../src/RadmonPhysicsPositronStandard.cc | 2 +- .../src/RadmonPhysicsProductionCuts.cc | 2 +- .../src/RadmonPhysicsSteppingAction.cc | 2 +- .../physics/src/RadmonPhysicsTauStandard.cc | 2 +- .../physics/src/RadmonSubPhysicsListLayout.cc | 2 +- .../RadmonSubPhysicsListWithLabelFactory.cc | 2 +- .../RadmonSubPhysicsListWithLabelMessenger.cc | 2 +- .../sensitivity/include/RadmonHit.hh | 2 +- .../sensitivity/include/RadmonHit.icc | 2 +- .../sensitivity/include/RadmonHitsManager.hh | 2 +- .../sensitivity/include/RadmonHitsManager.icc | 2 +- .../include/RadmonSensitiveDetector.hh | 2 +- .../include/RadmonSensitiveDetector.icc | 2 +- .../RadmonSensitiveDetectorDataStorer.hh | 2 +- .../RadmonSensitiveDetectorDataStorer.icc | 2 +- .../sensitivity/src/RadmonHit.cc | 2 +- .../sensitivity/src/RadmonHitsManager.cc | 2 +- .../src/RadmonSensitiveDetector.cc | 2 +- .../userActions/include/RadmonEventAction.hh | 2 +- .../userActions/include/RadmonEventAction.icc | 2 +- .../include/RadmonEventActionObserver.hh | 2 +- .../include/RadmonEventActionObserver.icc | 2 +- .../userActions/include/RadmonRunAction.hh | 2 +- .../userActions/include/RadmonRunAction.icc | 2 +- .../include/RadmonRunActionObserver.hh | 2 +- .../include/RadmonRunActionObserver.icc | 2 +- .../include/RadmonSteppingAction.hh | 2 +- .../include/RadmonSteppingAction.icc | 2 +- .../include/RadmonSteppingActionObserver.hh | 2 +- .../include/RadmonSteppingActionObserver.icc | 2 +- .../userActions/src/RadmonEventAction.cc | 2 +- .../userActions/src/RadmonRunAction.cc | 2 +- .../userActions/src/RadmonSteppingAction.cc | 2 +- examples/advanced/radioprotection/History | 5 +- examples/advanced/radioprotection/README | 9 +- .../radioprotection/include/RemSimDecay.hh | 2 +- .../include/RemSimDecorator.hh | 2 +- .../include/RemSimDetectorConstruction.hh | 2 +- .../include/RemSimDetectorMessenger.hh | 2 +- .../include/RemSimElectronEEDL.hh | 2 +- .../include/RemSimEventAction.hh | 2 +- .../include/RemSimHadronicBertini.hh | 83 +- .../include/RemSimHadronicBinary.hh | 78 +- .../radioprotection/include/RemSimIonICRU.hh | 2 +- .../radioprotection/include/RemSimMaterial.hh | 2 +- .../include/RemSimMoonHabitat.hh | 2 +- .../include/RemSimMuonStandard.hh | 2 +- .../include/RemSimPhotonEPDL.hh | 2 +- .../include/RemSimPhysicsList.hh | 2 +- .../include/RemSimPhysicsListMessenger.hh | 2 +- .../include/RemSimPositronStandard.hh | 2 +- .../include/RemSimPrimaryGeneratorAction.hh | 2 +- .../RemSimPrimaryGeneratorMessenger.hh | 2 +- .../include/RemSimROGeometry.hh | 2 +- .../include/RemSimRoofDecorator.hh | 2 +- .../include/RemSimRunAction.hh | 2 +- .../include/RemSimSensitiveDetector.hh | 2 +- .../include/RemSimShelterSPEDecorator.hh | 2 +- .../include/RemSimShieldingDecorator.hh | 2 +- .../include/RemSimSteppingAction.hh | 2 +- .../include/RemSimSteppingActionMessenger.hh | 2 +- .../include/RemSimVGeometryComponent.hh | 2 +- .../radioprotection/include/RemSimVehicle1.hh | 2 +- examples/advanced/radioprotection/remsim.cc | 5 +- .../radioprotection/src/RemSimDecay.cc | 2 +- .../radioprotection/src/RemSimDecorator.cc | 2 +- .../src/RemSimDetectorConstruction.cc | 2 +- .../src/RemSimDetectorMessenger.cc | 2 +- .../radioprotection/src/RemSimElectronEEDL.cc | 2 +- .../radioprotection/src/RemSimEventAction.cc | 2 +- .../src/RemSimHadronicBertini.cc | 385 +- .../src/RemSimHadronicBinary.cc | 388 +- .../radioprotection/src/RemSimIonICRU.cc | 2 +- .../radioprotection/src/RemSimMaterial.cc | 2 +- .../radioprotection/src/RemSimMoonHabitat.cc | 2 +- .../radioprotection/src/RemSimMuonStandard.cc | 2 +- .../radioprotection/src/RemSimPhotonEPDL.cc | 2 +- .../radioprotection/src/RemSimPhysicsList.cc | 2 +- .../src/RemSimPhysicsListMessenger.cc | 2 +- .../src/RemSimPositronStandard.cc | 2 +- .../src/RemSimPrimaryGeneratorMessenger.cc | 2 +- .../radioprotection/src/RemSimROGeometry.cc | 2 +- .../src/RemSimRoofDecorator.cc | 2 +- .../radioprotection/src/RemSimRunAction.cc | 2 +- .../src/RemSimSensitiveDetector.cc | 2 +- .../src/RemSimShelterSPEDecorator.cc | 2 +- .../src/RemSimShieldingDecorator.cc | 2 +- .../src/RemSimSteppingAction.cc | 2 +- .../src/RemSimSteppingActionMessenger.cc | 2 +- .../src/RemSimVGeometryComponent.cc | 2 +- .../radioprotection/src/RemSimVehicle1.cc | 2 +- .../advanced/radioprotection/vehicle1.mac | 2 + .../advanced/radioprotection/vehicle2.mac | 3 +- .../advanced/raredecay_calorimetry/History | 8 +- .../advanced/raredecay_calorimetry/PhotIn.cc | 8 +- .../advanced/raredecay_calorimetry/PhotIn.out | 168 +- .../include/PhotInCalorHit.hh | 2 +- .../include/PhotInCalorimeterSD.hh | 2 +- .../include/PhotInConstants.hh | 2 +- .../include/PhotInDetectorConstruction.hh | 2 +- .../include/PhotInDetectorMessenger.hh | 2 +- .../include/PhotInEventAction.hh | 2 +- .../include/PhotInGapParameterisation.hh | 14 +- .../include/PhotInLayerParameterisation.hh | 2 +- .../include/PhotInPhysicsList.hh | 2 +- .../include/PhotInPrimaryGeneratorAction.hh | 2 +- .../include/PhotInRun.hh | 2 +- .../include/PhotInRunAction.hh | 2 +- .../include/PhotInVisManager.hh | 100 - .../src/PhotInCalorHit.cc | 2 +- .../src/PhotInCalorimeterSD.cc | 2 +- .../src/PhotInDetectorConstruction.cc | 2 +- .../src/PhotInDetectorMessenger.cc | 2 +- .../src/PhotInEventAction.cc | 2 +- .../src/PhotInGapParameterisation.cc | 2 +- .../src/PhotInLayerParameterisation.cc | 2 +- .../src/PhotInPhysicsList.cc | 2 +- .../src/PhotInPrimaryGeneratorAction.cc | 2 +- .../raredecay_calorimetry/src/PhotInRun.cc | 2 +- .../src/PhotInRunAction.cc | 2 +- .../src/PhotInVisManager.cc | 96 - examples/advanced/underground_physics/History | 5 +- .../include/DMXDetectorConstruction.hh | 2 +- .../include/DMXMinEkineCuts.hh | 2 +- .../src/DMXDetectorConstruction.cc | 3 +- .../src/DMXMinEkineCuts.cc | 2 +- examples/advanced/xray_fluorescence/History | 2 +- .../xray_telescope/include/XrayTelAnalysis.hh | 2 +- .../xray_telescope/src/XrayTelAnalysis.cc | 2 +- examples/advanced/xray_telescope/test.out | 2 +- examples/extended/analysis/A01/A01app.cc | 11 +- examples/extended/analysis/A01/GNUmakefile | 7 +- examples/extended/analysis/A01/History | 15 +- examples/extended/analysis/A01/novis.mac | 4 +- .../analysis/A01/src/A01DriftChamberHit.cc | 31 +- .../analysis/A01/src/A01EmCalorimeterHit.cc | 27 +- .../analysis/A01/src/A01EventAction.cc | 6 +- .../analysis/A01/src/A01HadCalorimeterHit.cc | 27 +- .../analysis/A01/src/A01HodoscopeHit.cc | 27 +- examples/extended/analysis/A01/test.out | 2 +- examples/extended/analysis/A01/vis.mac | 25 +- examples/extended/analysis/AnaEx01/AnaEx01.cc | 2 +- examples/extended/analysis/AnaEx01/History | 5 +- examples/extended/analysis/AnaEx01/README | 21 +- .../AnaEx01/include/AnaEx01AnalysisManager.hh | 2 +- .../AnaEx01/include/AnaEx01CalorHit.hh | 2 +- .../AnaEx01/include/AnaEx01CalorimeterSD.hh | 2 +- .../include/AnaEx01DetectorConstruction.hh | 2 +- .../include/AnaEx01DetectorMessenger.hh | 2 +- .../AnaEx01/include/AnaEx01EventAction.hh | 2 +- .../AnaEx01/include/AnaEx01PhysicsList.hh | 2 +- .../include/AnaEx01PrimaryGeneratorAction.hh | 2 +- .../AnaEx01PrimaryGeneratorMessenger.hh | 2 +- .../AnaEx01/include/AnaEx01RunAction.hh | 2 +- .../AnaEx01/include/AnaEx01SteppingAction.hh | 2 +- .../AnaEx01/include/AnaEx01SteppingVerbose.hh | 2 +- .../AnaEx01/src/AnaEx01AnalysisManager.cc | 2 +- .../analysis/AnaEx01/src/AnaEx01CalorHit.cc | 2 +- .../AnaEx01/src/AnaEx01CalorimeterSD.cc | 2 +- .../src/AnaEx01DetectorConstruction.cc | 2 +- .../AnaEx01/src/AnaEx01DetectorMessenger.cc | 2 +- .../AnaEx01/src/AnaEx01EventAction.cc | 2 +- .../AnaEx01/src/AnaEx01PhysicsList.cc | 2 +- .../src/AnaEx01PrimaryGeneratorAction.cc | 2 +- .../src/AnaEx01PrimaryGeneratorMessenger.cc | 2 +- .../analysis/AnaEx01/src/AnaEx01RunAction.cc | 2 +- .../AnaEx01/src/AnaEx01SteppingAction.cc | 2 +- .../AnaEx01/src/AnaEx01SteppingVerbose.cc | 2 +- examples/extended/biasing/B01/exampleB01.cc | 2 +- examples/extended/biasing/B01/exampleB01.out | 47 +- .../B01/include/B01DetectorConstruction.hh | 2 +- .../B01/src/B01DetectorConstruction.cc | 2 +- .../biasing/B01/src/B01PhysicsList.cc | 2 +- .../B01/src/B01PrimaryGeneratorAction.cc | 2 +- examples/extended/biasing/B02/exampleB02.cc | 2 +- examples/extended/biasing/B02/exampleB02.out | 2 +- .../biasing/B02/include/B02CellScorer.hh | 2 +- .../biasing/B02/include/B02CellScorerStore.hh | 2 +- .../B02/include/B02DetectorConstruction.hh | 2 +- .../B02ImportanceDetectorConstruction.hh | 2 +- .../include/B02ScoringDetectorConstruction.hh | 2 +- .../extended/biasing/B02/src/B02CellScorer.cc | 2 +- .../biasing/B02/src/B02CellScorerStore.cc | 2 +- .../B02/src/B02DetectorConstruction.cc | 2 +- .../src/B02ImportanceDetectorConstruction.cc | 2 +- .../biasing/B02/src/B02PhysicsList.cc | 2 +- .../B02/src/B02PrimaryGeneratorAction.cc | 2 +- .../B02/src/B02ScoringDetectorConstruction.cc | 2 +- examples/extended/biasing/B03/exampleB03.cc | 2 +- examples/extended/biasing/B03/exampleB03.out | 2 +- .../biasing/B03/include/B03AppBase.hh | 2 +- .../B03/include/B03DetectorConstruction.hh | 2 +- .../B03ImportanceDetectorConstruction.hh | 2 +- .../biasing/B03/include/B03PhysicsList.hh | 2 +- .../B03/include/B03PrimaryGeneratorAction.hh | 2 +- examples/extended/biasing/B03/setupPI.csh | 2 +- .../extended/biasing/B03/src/B03AppBase.cc | 2 +- .../B03/src/B03DetectorConstruction.cc | 2 +- .../src/B03ImportanceDetectorConstruction.cc | 2 +- .../biasing/B03/src/B03PhysicsList.cc | 2 +- .../B03/src/B03PrimaryGeneratorAction.cc | 2 +- .../electromagnetic/TestEm0/DirectAccess.cc | 2 +- .../extended/electromagnetic/TestEm0/History | 11 +- .../electromagnetic/TestEm0/TestEm0.cc | 4 +- .../electromagnetic/TestEm0/TestEm0.in | 5 +- .../electromagnetic/TestEm0/TestEm0.out | 9 +- .../TestEm0/include/DetectorConstruction.hh | 2 +- .../TestEm0/include/DetectorMessenger.hh | 2 +- .../TestEm0/include/PhysListEmStandard.hh | 2 +- .../TestEm0/include/PhysicsList.hh | 2 +- .../TestEm0/include/PhysicsListMessenger.hh | 2 +- .../TestEm0/include/PrimaryGeneratorAction.hh | 2 +- .../TestEm0/include/RunAction.hh | 2 +- .../TestEm0/src/DetectorConstruction.cc | 32 +- .../TestEm0/src/DetectorMessenger.cc | 2 +- .../TestEm0/src/PhysListEmStandard.cc | 2 +- .../TestEm0/src/PhysicsList.cc | 4 +- .../TestEm0/src/PhysicsListMessenger.cc | 2 +- .../TestEm0/src/PrimaryGeneratorAction.cc | 2 +- .../electromagnetic/TestEm0/src/RunAction.cc | 7 +- .../electromagnetic/TestEm1/GNUmakefile | 4 +- .../extended/electromagnetic/TestEm1/History | 6 +- .../electromagnetic/TestEm1/TestEm1.cc | 2 +- .../electromagnetic/TestEm1/TestEm1.out | 65 +- .../TestEm1/include/DetectorConstruction.hh | 2 +- .../TestEm1/include/DetectorMessenger.hh | 2 +- .../TestEm1/include/EventAction.hh | 2 +- .../TestEm1/include/EventActionMessenger.hh | 2 +- .../TestEm1/include/HistoManager.hh | 2 +- .../TestEm1/include/HistoMessenger.hh | 2 +- .../TestEm1/include/PhysListEmLivermore.hh | 2 +- .../TestEm1/include/PhysListEmPenelope.hh | 2 +- .../TestEm1/include/PhysListEmStandard.hh | 2 +- .../TestEm1/include/PhysicsList.hh | 2 +- .../TestEm1/include/PhysicsListMessenger.hh | 2 +- .../TestEm1/include/PrimaryGeneratorAction.hh | 2 +- .../include/PrimaryGeneratorMessenger.hh | 2 +- .../TestEm1/include/ProcessesCount.hh | 2 +- .../TestEm1/include/RunAction.hh | 2 +- .../TestEm1/include/StepMax.hh | 2 +- .../TestEm1/include/StepMaxMessenger.hh | 2 +- .../TestEm1/include/SteppingAction.hh | 2 +- .../TestEm1/include/SteppingVerbose.hh | 2 +- .../TestEm1/include/TrackingAction.hh | 2 +- .../electromagnetic/TestEm1/range.mac | 6 +- .../TestEm1/src/DetectorConstruction.cc | 2 +- .../TestEm1/src/DetectorMessenger.cc | 2 +- .../TestEm1/src/EventAction.cc | 4 +- .../TestEm1/src/EventActionMessenger.cc | 2 +- .../TestEm1/src/HistoManager.cc | 2 +- .../TestEm1/src/HistoMessenger.cc | 2 +- .../TestEm1/src/PhysListEmG4v52.cc | 120 - .../TestEm1/src/PhysListEmLivermore.cc | 4 +- .../TestEm1/src/PhysListEmPenelope.cc | 8 +- .../TestEm1/src/PhysListEmStandard.cc | 34 +- .../TestEm1/src/PhysicsList.cc | 21 +- .../TestEm1/src/PhysicsListMessenger.cc | 2 +- .../TestEm1/src/PrimaryGeneratorAction.cc | 2 +- .../TestEm1/src/PrimaryGeneratorMessenger.cc | 2 +- .../electromagnetic/TestEm1/src/RunAction.cc | 2 +- .../electromagnetic/TestEm1/src/StepMax.cc | 2 +- .../TestEm1/src/StepMaxMessenger.cc | 2 +- .../TestEm1/src/SteppingAction.cc | 2 +- .../TestEm1/src/SteppingVerbose.cc | 2 +- .../TestEm1/src/TrackingAction.cc | 2 +- .../electromagnetic/TestEm10/GNUmakefile | 4 +- .../extended/electromagnetic/TestEm10/History | 6 +- .../electromagnetic/TestEm10/TestEm10.cc | 12 +- .../TestEm10/TestEm10.large_N.out | 2 +- .../electromagnetic/TestEm10/TestEm10.out | 155 +- .../electromagnetic/TestEm10/barr90.mac | 4 +- .../TestEm10/include/Em10CalorHit.hh | 2 +- .../TestEm10/include/Em10CalorimeterSD.hh | 2 +- .../include/Em10DetectorConstruction.hh | 2 +- .../TestEm10/include/Em10DetectorMessenger.hh | 2 +- .../TestEm10/include/Em10EventAction.hh | 2 +- .../include/Em10EventActionMessenger.hh | 2 +- .../TestEm10/include/Em10PhysicsList.hh | 2 +- .../include/Em10PhysicsListMessenger.hh | 2 +- .../include/Em10PrimaryGeneratorAction.hh | 2 +- .../include/Em10PrimaryGeneratorMessenger.hh | 2 +- .../TestEm10/include/Em10RunAction.hh | 2 +- .../TestEm10/include/Em10RunMessenger.hh | 2 +- .../TestEm10/include/Em10StepCut.hh | 2 +- .../TestEm10/include/Em10SteppingAction.hh | 2 +- .../TestEm10/include/Em10SteppingMessenger.hh | 2 +- .../TestEm10/include/Em10SteppingVerbose.hh | 2 +- .../TestEm10/include/Em10TrackingAction.hh} | 21 +- .../TestEm10/include/StepMax.hh | 2 +- .../include/TRTDetectorConstruction.hh | 2 +- .../TestEm10/include/TRTMaterials.hh | 2 +- .../TestEm10/src/Em10CalorHit.cc | 2 +- .../TestEm10/src/Em10CalorimeterSD.cc | 2 +- .../TestEm10/src/Em10DetectorConstruction.cc | 2 +- .../TestEm10/src/Em10DetectorMessenger.cc | 2 +- .../TestEm10/src/Em10EventAction.cc | 2 +- .../TestEm10/src/Em10EventActionMessenger.cc | 2 +- .../TestEm10/src/Em10PhysicsList.cc | 2 +- .../TestEm10/src/Em10PhysicsListMessenger.cc | 2 +- .../src/Em10PrimaryGeneratorAction.cc | 2 +- .../src/Em10PrimaryGeneratorMessenger.cc | 2 +- .../TestEm10/src/Em10RunAction.cc | 2 +- .../TestEm10/src/Em10RunMessenger.cc | 2 +- .../TestEm10/src/Em10StepCut.cc | 2 +- .../TestEm10/src/Em10SteppingAction.cc | 2 +- .../TestEm10/src/Em10SteppingMessenger.cc | 2 +- .../TestEm10/src/Em10SteppingVerbose.cc | 2 +- .../TestEm10/src/Em10TrackingAction.cc} | 52 +- .../electromagnetic/TestEm10/src/StepMax.cc | 2 +- .../electromagnetic/TestEm11/GNUmakefile | 4 +- .../extended/electromagnetic/TestEm11/History | 16 +- .../electromagnetic/TestEm11/TestEm11.cc | 2 +- .../electromagnetic/TestEm11/TestEm11.in | 4 +- .../electromagnetic/TestEm11/TestEm11.out | 40 +- .../TestEm11/include/DetectorConstruction.hh | 2 +- .../TestEm11/include/DetectorMessenger.hh | 2 +- .../TestEm11/include/EventAction.hh | 2 +- .../TestEm11/include/EventActionMessenger.hh | 2 +- .../TestEm11/include/HistoManager.hh | 2 +- .../TestEm11/include/HistoMessenger.hh | 2 +- .../TestEm11/include/PhysListEmLivermore.hh | 2 +- .../TestEm11/include/PhysListEmPenelope.hh | 2 +- .../TestEm11/include/PhysListEmStandard.hh | 2 +- .../TestEm11/include/PhysicsList.hh | 2 +- .../TestEm11/include/PhysicsListMessenger.hh | 2 +- .../include/PrimaryGeneratorAction.hh | 2 +- .../include/PrimaryGeneratorMessenger.hh | 2 +- .../TestEm11/include/RunAction.hh | 2 +- .../TestEm11/include/StepMax.hh | 2 +- .../TestEm11/include/StepMaxMessenger.hh | 2 +- .../TestEm11/include/SteppingAction.hh | 2 +- .../TestEm11/include/SteppingVerbose.hh | 2 +- .../TestEm11/include/TrackingAction.hh | 2 +- .../electromagnetic/TestEm11/range.mac | 10 +- .../electromagnetic/TestEm11/run01.mac | 4 +- .../electromagnetic/TestEm11/run02.mac | 4 +- .../TestEm11/src/DetectorConstruction.cc | 19 +- .../TestEm11/src/DetectorMessenger.cc | 2 +- .../TestEm11/src/EventAction.cc | 2 +- .../TestEm11/src/EventActionMessenger.cc | 2 +- .../TestEm11/src/HistoManager.cc | 8 +- .../TestEm11/src/HistoMessenger.cc | 2 +- .../TestEm11/src/PhysListEmG4v52.cc | 120 - .../TestEm11/src/PhysListEmLivermore.cc | 8 +- .../TestEm11/src/PhysListEmPenelope.cc | 4 +- .../TestEm11/src/PhysListEmStandard.cc | 2 +- .../TestEm11/src/PhysicsList.cc | 19 +- .../TestEm11/src/PhysicsListMessenger.cc | 2 +- .../TestEm11/src/PrimaryGeneratorAction.cc | 2 +- .../TestEm11/src/PrimaryGeneratorMessenger.cc | 2 +- .../electromagnetic/TestEm11/src/RunAction.cc | 2 +- .../electromagnetic/TestEm11/src/StepMax.cc | 2 +- .../TestEm11/src/StepMaxMessenger.cc | 2 +- .../TestEm11/src/SteppingAction.cc | 6 +- .../TestEm11/src/SteppingVerbose.cc | 2 +- .../TestEm11/src/TrackingAction.cc | 2 +- .../electromagnetic/TestEm11/water.mac | 4 +- .../electromagnetic/TestEm12/GNUmakefile | 4 +- .../extended/electromagnetic/TestEm12/History | 7 +- .../electromagnetic/TestEm12/TestEm12.cc | 2 +- .../electromagnetic/TestEm12/TestEm12.in | 3 +- .../electromagnetic/TestEm12/TestEm12.out | 30 +- .../TestEm12/include/DetectorConstruction.hh | 2 +- .../TestEm12/include/DetectorMessenger.hh | 2 +- .../TestEm12/include/EventAction.hh | 2 +- .../TestEm12/include/EventActionMessenger.hh | 2 +- .../TestEm12/include/HistoManager.hh | 2 +- .../TestEm12/include/HistoMessenger.hh | 2 +- .../TestEm12/include/PhysListEmG4v52.hh | 67 - .../TestEm12/include/PhysListEmLivermore.hh | 2 +- .../TestEm12/include/PhysListEmPenelope.hh | 2 +- .../TestEm12/include/PhysListEmStandard.hh | 2 +- .../TestEm12/include/PhysicsList.hh | 2 +- .../TestEm12/include/PhysicsListMessenger.hh | 2 +- .../include/PrimaryGeneratorAction.hh | 2 +- .../include/PrimaryGeneratorMessenger.hh | 2 +- .../TestEm12/include/RunAction.hh | 2 +- .../TestEm12/include/StepMax.hh | 2 +- .../TestEm12/include/StepMaxMessenger.hh | 2 +- .../TestEm12/include/SteppingAction.hh | 2 +- .../TestEm12/include/SteppingVerbose.hh | 2 +- .../TestEm12/include/TrackingAction.hh | 2 +- .../electromagnetic/TestEm12/run01.mac | 5 +- .../electromagnetic/TestEm12/run02.mac | 5 +- .../TestEm12/src/DetectorConstruction.cc | 2 +- .../TestEm12/src/DetectorMessenger.cc | 2 +- .../TestEm12/src/EventAction.cc | 2 +- .../TestEm12/src/EventActionMessenger.cc | 2 +- .../TestEm12/src/HistoManager.cc | 2 +- .../TestEm12/src/HistoMessenger.cc | 2 +- .../TestEm12/src/PhysListEmG4v52.cc | 120 - .../TestEm12/src/PhysListEmLivermore.cc | 2 +- .../TestEm12/src/PhysListEmPenelope.cc | 2 +- .../TestEm12/src/PhysListEmStandard.cc | 2 +- .../TestEm12/src/PhysicsList.cc | 19 +- .../TestEm12/src/PhysicsListMessenger.cc | 2 +- .../TestEm12/src/PrimaryGeneratorAction.cc | 2 +- .../TestEm12/src/PrimaryGeneratorMessenger.cc | 2 +- .../electromagnetic/TestEm12/src/RunAction.cc | 2 +- .../electromagnetic/TestEm12/src/StepMax.cc | 2 +- .../TestEm12/src/StepMaxMessenger.cc | 2 +- .../TestEm12/src/SteppingAction.cc | 2 +- .../TestEm12/src/SteppingVerbose.cc | 2 +- .../TestEm12/src/TrackingAction.cc | 2 +- .../electromagnetic/TestEm13/GNUmakefile | 4 +- .../extended/electromagnetic/TestEm13/History | 5 +- .../electromagnetic/TestEm13/TestEm13.cc | 2 +- .../electromagnetic/TestEm13/TestEm13.out | 29 +- .../electromagnetic/TestEm13/anni.mac | 4 +- .../TestEm13/include/DetectorConstruction.hh | 2 +- .../TestEm13/include/DetectorMessenger.hh | 2 +- .../TestEm13/include/EventAction.hh | 2 +- .../TestEm13/include/EventActionMessenger.hh | 2 +- .../TestEm13/include/PhysListEmLivermore.hh | 2 +- .../TestEm13/include/PhysListEmPenelope.hh | 2 +- .../TestEm13/include/PhysListEmStandard.hh | 2 +- .../TestEm13/include/PhysicsList.hh | 2 +- .../TestEm13/include/PhysicsListMessenger.hh | 2 +- .../include/PrimaryGeneratorAction.hh | 2 +- .../TestEm13/include/ProcessesCount.hh | 2 +- .../TestEm13/include/RunAction.hh | 2 +- .../TestEm13/include/SteppingAction.hh | 2 +- .../TestEm13/include/SteppingVerbose.hh | 2 +- .../TestEm13/src/DetectorConstruction.cc | 2 +- .../TestEm13/src/DetectorMessenger.cc | 2 +- .../TestEm13/src/EventAction.cc | 2 +- .../TestEm13/src/EventActionMessenger.cc | 2 +- .../TestEm13/src/PhysListEmLivermore.cc | 2 +- .../TestEm13/src/PhysListEmPenelope.cc | 2 +- .../TestEm13/src/PhysListEmStandard.cc | 2 +- .../TestEm13/src/PhysicsList.cc | 2 +- .../TestEm13/src/PhysicsListMessenger.cc | 2 +- .../TestEm13/src/PrimaryGeneratorAction.cc | 2 +- .../electromagnetic/TestEm13/src/RunAction.cc | 2 +- .../TestEm13/src/SteppingAction.cc | 2 +- .../TestEm13/src/SteppingVerbose.cc | 2 +- .../electromagnetic/TestEm14/GNUmakefile | 4 +- .../extended/electromagnetic/TestEm14/History | 9 +- .../electromagnetic/TestEm14/TestEm14.cc | 2 +- .../electromagnetic/TestEm14/TestEm14.out | 37 +- .../electromagnetic/TestEm14/compton.mac | 9 +- .../electromagnetic/TestEm14/conv.mac | 4 +- .../TestEm14/include/DetectorConstruction.hh | 2 +- .../TestEm14/include/DetectorMessenger.hh | 2 +- .../TestEm14/include/EventAction.hh | 2 +- .../TestEm14/include/EventActionMessenger.hh | 2 +- .../TestEm14/include/HistoManager.hh | 2 +- .../TestEm14/include/HistoMessenger.hh | 2 +- .../TestEm14/include/PhysListEmG4v52.hh | 67 - .../TestEm14/include/PhysListEmLivermore.hh | 2 +- .../TestEm14/include/PhysListEmPenelope.hh | 2 +- .../TestEm14/include/PhysListEmStandard.hh | 2 +- .../TestEm14/include/PhysicsList.hh | 2 +- .../TestEm14/include/PhysicsListMessenger.hh | 2 +- .../include/PrimaryGeneratorAction.hh | 2 +- .../TestEm14/include/ProcessesCount.hh | 2 +- .../TestEm14/include/RunAction.hh | 7 +- .../TestEm14/include/SteppingAction.hh | 6 +- .../TestEm14/include/SteppingMessenger.hh | 2 +- .../TestEm14/include/SteppingVerbose.hh | 2 +- .../electromagnetic/TestEm14/photoelec.mac | 4 +- .../TestEm14/src/DetectorConstruction.cc | 2 +- .../TestEm14/src/DetectorMessenger.cc | 2 +- .../TestEm14/src/EventAction.cc | 2 +- .../TestEm14/src/EventActionMessenger.cc | 2 +- .../TestEm14/src/HistoManager.cc | 2 +- .../TestEm14/src/HistoMessenger.cc | 2 +- .../TestEm14/src/PhysListEmG4v52.cc | 113 - .../TestEm14/src/PhysListEmLivermore.cc | 2 +- .../TestEm14/src/PhysListEmPenelope.cc | 2 +- .../TestEm14/src/PhysListEmStandard.cc | 5 +- .../TestEm14/src/PhysicsList.cc | 12 +- .../TestEm14/src/PhysicsListMessenger.cc | 2 +- .../TestEm14/src/PrimaryGeneratorAction.cc | 2 +- .../electromagnetic/TestEm14/src/RunAction.cc | 18 +- .../TestEm14/src/SteppingAction.cc | 9 +- .../TestEm14/src/SteppingMessenger.cc | 2 +- .../TestEm14/src/SteppingVerbose.cc | 2 +- .../electromagnetic/TestEm15/GNUmakefile | 4 +- .../extended/electromagnetic/TestEm15/History | 5 +- .../electromagnetic/TestEm15/TestEm15.cc | 2 +- .../electromagnetic/TestEm15/TestEm15.out | 57 +- .../TestEm15/include/DetectorConstruction.hh | 2 +- .../TestEm15/include/DetectorMessenger.hh | 2 +- .../TestEm15/include/EventAction.hh | 2 +- .../TestEm15/include/EventActionMessenger.hh | 2 +- .../TestEm15/include/HistoManager.hh | 2 +- .../TestEm15/include/HistoMessenger.hh | 2 +- .../TestEm15/include/PhysListEmStandard.hh | 2 +- .../TestEm15/include/PhysicsList.hh | 2 +- .../TestEm15/include/PhysicsListMessenger.hh | 2 +- .../include/PrimaryGeneratorAction.hh | 2 +- .../TestEm15/include/ProcessesCount.hh | 2 +- .../TestEm15/include/RunAction.hh | 2 +- .../TestEm15/include/StepMax.hh | 2 +- .../TestEm15/include/StepMaxMessenger.hh | 2 +- .../TestEm15/include/SteppingAction.hh | 2 +- .../TestEm15/include/SteppingVerbose.hh | 2 +- .../TestEm15/src/DetectorConstruction.cc | 2 +- .../TestEm15/src/DetectorMessenger.cc | 2 +- .../TestEm15/src/EventAction.cc | 2 +- .../TestEm15/src/EventActionMessenger.cc | 2 +- .../TestEm15/src/HistoManager.cc | 2 +- .../TestEm15/src/HistoMessenger.cc | 2 +- .../TestEm15/src/PhysListEmStandard.cc | 2 +- .../TestEm15/src/PhysicsList.cc | 2 +- .../TestEm15/src/PhysicsListMessenger.cc | 2 +- .../TestEm15/src/PrimaryGeneratorAction.cc | 2 +- .../electromagnetic/TestEm15/src/RunAction.cc | 2 +- .../electromagnetic/TestEm15/src/StepMax.cc | 2 +- .../TestEm15/src/StepMaxMessenger.cc | 2 +- .../TestEm15/src/SteppingAction.cc | 2 +- .../TestEm15/src/SteppingVerbose.cc | 2 +- .../electromagnetic/TestEm16/GNUmakefile | 4 +- .../extended/electromagnetic/TestEm16/History | 5 +- .../electromagnetic/TestEm16/TestEm16.cc | 2 +- .../electromagnetic/TestEm16/TestEm16.out | 19 +- .../TestEm16/include/DetectorConstruction.hh | 2 +- .../TestEm16/include/DetectorMessenger.hh | 2 +- .../TestEm16/include/EventAction.hh | 2 +- .../TestEm16/include/EventActionMessenger.hh | 2 +- .../TestEm16/include/PhysicsList.hh | 2 +- .../TestEm16/include/PhysicsListMessenger.hh | 2 +- .../include/PrimaryGeneratorAction.hh | 2 +- .../TestEm16/include/RunAction.hh | 2 +- .../TestEm16/include/SteppingAction.hh | 2 +- .../TestEm16/include/SteppingVerbose.hh | 2 +- .../TestEm16/src/DetectorConstruction.cc | 2 +- .../TestEm16/src/DetectorMessenger.cc | 2 +- .../TestEm16/src/EventAction.cc | 2 +- .../TestEm16/src/EventActionMessenger.cc | 2 +- .../TestEm16/src/PhysicsList.cc | 2 +- .../TestEm16/src/PhysicsListMessenger.cc | 2 +- .../TestEm16/src/PrimaryGeneratorAction.cc | 2 +- .../electromagnetic/TestEm16/src/RunAction.cc | 2 +- .../TestEm16/src/SteppingAction.cc | 2 +- .../TestEm16/src/SteppingVerbose.cc | 2 +- .../electromagnetic/TestEm17/GNUmakefile | 4 +- .../extended/electromagnetic/TestEm17/History | 9 +- .../electromagnetic/TestEm17/TestEm17.cc | 2 +- .../electromagnetic/TestEm17/TestEm17.out | 14 +- .../TestEm17/include/DetectorConstruction.hh | 2 +- .../TestEm17/include/DetectorMessenger.hh | 2 +- .../TestEm17/include/EventAction.hh | 2 +- .../TestEm17/include/EventActionMessenger.hh | 2 +- .../TestEm17/include/HistoManager.hh | 2 +- .../TestEm17/include/HistoMessenger.hh | 2 +- .../TestEm17/include/MuCrossSections.hh | 2 +- .../TestEm17/include/MuNuclearBuilder.hh | 2 +- .../TestEm17/include/PhysListEmG4v52.hh | 66 - .../TestEm17/include/PhysListEmStandard.hh | 2 +- .../TestEm17/include/PhysicsList.hh | 2 +- .../TestEm17/include/PhysicsListMessenger.hh | 2 +- .../include/PrimaryGeneratorAction.hh | 2 +- .../TestEm17/include/ProcessesCount.hh | 2 +- .../TestEm17/include/RunAction.hh | 2 +- .../TestEm17/include/StackingAction.hh | 2 +- .../TestEm17/include/SteppingAction.hh | 2 +- .../TestEm17/include/SteppingVerbose.hh | 2 +- .../TestEm17/src/DetectorConstruction.cc | 2 +- .../TestEm17/src/DetectorMessenger.cc | 2 +- .../TestEm17/src/EventAction.cc | 2 +- .../TestEm17/src/EventActionMessenger.cc | 2 +- .../TestEm17/src/HistoManager.cc | 2 +- .../TestEm17/src/HistoMessenger.cc | 2 +- .../TestEm17/src/MuCrossSections.cc | 2 +- .../TestEm17/src/MuNuclearBuilder.cc | 2 +- .../TestEm17/src/PhysListEmStandard.cc | 2 +- .../TestEm17/src/PhysicsList.cc | 115 +- .../TestEm17/src/PhysicsListMessenger.cc | 2 +- .../TestEm17/src/PrimaryGeneratorAction.cc | 2 +- .../electromagnetic/TestEm17/src/RunAction.cc | 2 +- .../TestEm17/src/StackingAction.cc | 2 +- .../TestEm17/src/SteppingAction.cc | 2 +- .../TestEm17/src/SteppingVerbose.cc | 2 +- .../electromagnetic/TestEm2/GNUmakefile | 4 +- .../extended/electromagnetic/TestEm2/History | 8 +- .../electromagnetic/TestEm2/TestEm2.cc | 2 +- .../electromagnetic/TestEm2/TestEm2.in | 3 +- .../electromagnetic/TestEm2/TestEm2.out | 44 +- .../TestEm2/geant3/src/ugeom.F | 3 + .../TestEm2/include/DetectorConstruction.hh | 2 +- .../TestEm2/include/DetectorMessenger.hh | 2 +- .../TestEm2/include/EmAcceptance.hh | 2 +- .../TestEm2/include/EventAction.hh | 2 +- .../TestEm2/include/EventActionMessenger.hh | 2 +- .../TestEm2/include/PhysListEmG4v52.hh | 67 - .../TestEm2/include/PhysListEmLivermore.hh | 2 +- .../TestEm2/include/PhysListEmPenelope.hh | 2 +- .../TestEm2/include/PhysListEmStandard.hh | 2 +- .../TestEm2/include/PhysicsList.hh | 2 +- .../TestEm2/include/PhysicsListMessenger.hh | 2 +- .../TestEm2/include/PrimaryGeneratorAction.hh | 2 +- .../TestEm2/include/RunAction.hh | 2 +- .../TestEm2/include/RunActionMessenger.hh | 2 +- .../TestEm2/include/StepMax.hh | 2 +- .../TestEm2/include/StepMaxMessenger.hh | 2 +- .../TestEm2/include/SteppingAction.hh | 2 +- .../TestEm2/include/SteppingVerbose.hh | 2 +- .../TestEm2/include/TrackingAction.hh | 2 +- .../electromagnetic/TestEm2/run01.mac | 3 +- .../electromagnetic/TestEm2/run02.mac | 3 +- .../electromagnetic/TestEm2/run03.mac | 3 +- .../electromagnetic/TestEm2/run04.mac | 3 +- .../electromagnetic/TestEm2/run05.mac | 4 +- .../TestEm2/src/DetectorConstruction.cc | 10 +- .../TestEm2/src/DetectorMessenger.cc | 2 +- .../TestEm2/src/EmAcceptance.cc | 2 +- .../TestEm2/src/EventAction.cc | 2 +- .../TestEm2/src/EventActionMessenger.cc | 2 +- .../TestEm2/src/PhysListEmG4v52.cc | 120 - .../TestEm2/src/PhysListEmLivermore.cc | 2 +- .../TestEm2/src/PhysListEmPenelope.cc | 2 +- .../TestEm2/src/PhysListEmStandard.cc | 2 +- .../TestEm2/src/PhysicsList.cc | 12 +- .../TestEm2/src/PhysicsListMessenger.cc | 2 +- .../TestEm2/src/PrimaryGeneratorAction.cc | 2 +- .../electromagnetic/TestEm2/src/RunAction.cc | 2 +- .../TestEm2/src/RunActionMessenger.cc | 2 +- .../electromagnetic/TestEm2/src/StepMax.cc | 2 +- .../TestEm2/src/StepMaxMessenger.cc | 2 +- .../TestEm2/src/SteppingAction.cc | 2 +- .../TestEm2/src/SteppingVerbose.cc | 2 +- .../TestEm2/src/TrackingAction.cc | 2 +- .../electromagnetic/TestEm3/GNUmakefile | 4 +- .../extended/electromagnetic/TestEm3/History | 9 +- .../extended/electromagnetic/TestEm3/README | 18 +- .../electromagnetic/TestEm3/TestEm3.cc | 2 +- .../electromagnetic/TestEm3/TestEm3.in | 3 +- .../electromagnetic/TestEm3/TestEm3.out | 30 +- .../electromagnetic/TestEm3/atlashec.mac | 3 +- .../electromagnetic/TestEm3/fanoCav.mac | 37 + .../TestEm3/include/DetectorConstruction.hh | 2 +- .../TestEm3/include/DetectorMessenger.hh | 2 +- .../TestEm3/include/EmAcceptance.hh | 2 +- .../TestEm3/include/EventAction.hh | 2 +- .../TestEm3/include/EventActionMessenger.hh | 2 +- .../TestEm3/include/HistoManager.hh | 2 +- .../TestEm3/include/HistoMessenger.hh | 2 +- .../TestEm3/include/PhysListEmG4v52.hh | 66 - .../TestEm3/include/PhysListEmLivermore.hh | 2 +- .../TestEm3/include/PhysListEmPenelope.hh | 2 +- .../TestEm3/include/PhysListEmStandard.hh | 2 +- .../TestEm3/include/PhysicsList.hh | 2 +- .../TestEm3/include/PhysicsListMessenger.hh | 2 +- .../TestEm3/include/PrimaryGeneratorAction.hh | 2 +- .../include/PrimaryGeneratorMessenger.hh | 2 +- .../TestEm3/include/RunAction.hh | 2 +- .../TestEm3/include/RunActionMessenger.hh | 2 +- .../TestEm3/include/StepMax.hh | 2 +- .../TestEm3/include/StepMaxMessenger.hh | 2 +- .../TestEm3/include/SteppingAction.hh | 2 +- .../TestEm3/include/SteppingVerbose.hh | 2 +- .../TestEm3/include/TrackingAction.hh | 2 +- .../electromagnetic/TestEm3/ionC12.mac | 3 +- .../extended/electromagnetic/TestEm3/lhcb.mac | 3 +- .../electromagnetic/TestEm3/linac.mac | 4 +- .../electromagnetic/TestEm3/run01.mac | 6 +- .../electromagnetic/TestEm3/run02.mac | 3 +- .../electromagnetic/TestEm3/run07.mac | 3 +- .../electromagnetic/TestEm3/run08.mac | 3 +- .../electromagnetic/TestEm3/run15.mac | 3 +- .../electromagnetic/TestEm3/sicapo1.mac | 3 +- .../electromagnetic/TestEm3/sicapo2.mac | 3 +- .../electromagnetic/TestEm3/sicapo3.mac | 3 +- .../TestEm3/src/DetectorConstruction.cc | 8 +- .../TestEm3/src/DetectorMessenger.cc | 2 +- .../TestEm3/src/EmAcceptance.cc | 2 +- .../TestEm3/src/EventAction.cc | 2 +- .../TestEm3/src/EventActionMessenger.cc | 2 +- .../TestEm3/src/HistoManager.cc | 2 +- .../TestEm3/src/HistoMessenger.cc | 2 +- .../TestEm3/src/PhysListEmG4v52.cc | 119 - .../TestEm3/src/PhysListEmLivermore.cc | 2 +- .../TestEm3/src/PhysListEmPenelope.cc | 2 +- .../TestEm3/src/PhysListEmStandard.cc | 2 +- .../TestEm3/src/PhysicsList.cc | 17 +- .../TestEm3/src/PhysicsListMessenger.cc | 2 +- .../TestEm3/src/PrimaryGeneratorAction.cc | 2 +- .../TestEm3/src/PrimaryGeneratorMessenger.cc | 2 +- .../electromagnetic/TestEm3/src/RunAction.cc | 2 +- .../TestEm3/src/RunActionMessenger.cc | 2 +- .../electromagnetic/TestEm3/src/StepMax.cc | 2 +- .../TestEm3/src/StepMaxMessenger.cc | 2 +- .../TestEm3/src/SteppingAction.cc | 2 +- .../TestEm3/src/SteppingVerbose.cc | 2 +- .../TestEm3/src/TrackingAction.cc | 2 +- .../electromagnetic/TestEm3/storeTables.mac | 7 +- .../electromagnetic/TestEm4/GNUmakefile | 4 +- .../extended/electromagnetic/TestEm4/History | 5 +- .../electromagnetic/TestEm4/TestEm4.cc | 2 +- .../electromagnetic/TestEm4/TestEm4.out | 21 +- .../TestEm4/include/DetectorConstruction.hh | 2 +- .../TestEm4/include/EventAction.hh | 2 +- .../TestEm4/include/EventActionMessenger.hh | 2 +- .../TestEm4/include/PhysicsList.hh | 2 +- .../TestEm4/include/PrimaryGeneratorAction.hh | 2 +- .../TestEm4/include/RunAction.hh | 2 +- .../TestEm4/include/SteppingAction.hh | 2 +- .../TestEm4/include/SteppingVerbose.hh | 2 +- .../TestEm4/src/DetectorConstruction.cc | 2 +- .../TestEm4/src/EventAction.cc | 2 +- .../TestEm4/src/EventActionMessenger.cc | 2 +- .../TestEm4/src/PhysicsList.cc | 2 +- .../TestEm4/src/PrimaryGeneratorAction.cc | 2 +- .../electromagnetic/TestEm4/src/RunAction.cc | 2 +- .../TestEm4/src/SteppingAction.cc | 2 +- .../TestEm4/src/SteppingVerbose.cc | 2 +- .../electromagnetic/TestEm5/GNUmakefile | 4 +- .../extended/electromagnetic/TestEm5/History | 15 +- .../electromagnetic/TestEm5/TestEm5.cc | 28 +- .../electromagnetic/TestEm5/TestEm5.out | 68 +- .../TestEm5/include/DetectorConstruction.hh | 2 +- .../TestEm5/include/DetectorMessenger.hh | 2 +- .../TestEm5/include/EventAction.hh | 2 +- .../TestEm5/include/EventMessenger.hh | 2 +- .../TestEm5/include/HistoManager.hh | 2 +- .../TestEm5/include/HistoMessenger.hh | 2 +- .../TestEm5/include/PhysListBinaryCascade.hh | 46 +- .../TestEm5/include/PhysListEmG4v52.hh | 66 - .../TestEm5/include/PhysListEmLivermore.hh | 24 +- .../TestEm5/include/PhysListEmPenelope.hh | 24 +- .../TestEm5/include/PhysListEmStandard.hh | 24 +- .../include/PhysListEmStandardSS.hh} | 17 +- .../TestEm5/include/PhysListHadronElastic.hh | 35 +- .../include/PhysListIonBinaryCascade.hh | 45 +- .../TestEm5/include/PhysicsList.hh | 2 +- .../TestEm5/include/PhysicsListMessenger.hh | 2 +- .../TestEm5/include/PrimaryGeneratorAction.hh | 2 +- .../include/PrimaryGeneratorMessenger.hh | 2 +- .../TestEm5/include/RunAction.hh | 2 +- .../TestEm5/include/StackingAction.hh | 8 +- .../TestEm5/include/StackingMessenger.hh | 12 +- .../TestEm5/include/StepMax.hh | 2 +- .../TestEm5/include/StepMaxMessenger.hh | 2 +- .../TestEm5/include/SteppingAction.hh | 2 +- .../TestEm5/include/SteppingVerbose.hh | 2 +- .../TestEm5/include/TrackingAction.hh | 2 +- .../TestEm5/src/DetectorConstruction.cc | 20 +- .../TestEm5/src/DetectorMessenger.cc | 2 +- .../TestEm5/src/EventAction.cc | 2 +- .../TestEm5/src/EventMessenger.cc | 2 +- .../TestEm5/src/HistoManager.cc | 2 +- .../TestEm5/src/HistoMessenger.cc | 2 +- .../TestEm5/src/PhysListBinaryCascade.cc | 36 +- .../TestEm5/src/PhysListEmG4v52.cc | 119 - .../TestEm5/src/PhysListEmLivermore.cc | 2 +- .../TestEm5/src/PhysListEmPenelope.cc | 2 +- .../TestEm5/src/PhysListEmStandard.cc | 17 +- ...ListEmG4v71.cc => PhysListEmStandardSS.cc} | 55 +- .../TestEm5/src/PhysListHadronElastic.cc | 23 +- .../TestEm5/src/PhysListIonBinaryCascade.cc | 76 +- .../TestEm5/src/PhysicsList.cc | 81 +- .../TestEm5/src/PhysicsListMessenger.cc | 2 +- .../TestEm5/src/PrimaryGeneratorAction.cc | 2 +- .../TestEm5/src/PrimaryGeneratorMessenger.cc | 2 +- .../electromagnetic/TestEm5/src/RunAction.cc | 2 +- .../TestEm5/src/StackingAction.cc | 9 +- .../TestEm5/src/StackingMessenger.cc | 15 +- .../electromagnetic/TestEm5/src/StepMax.cc | 2 +- .../TestEm5/src/StepMaxMessenger.cc | 2 +- .../TestEm5/src/SteppingAction.cc | 2 +- .../TestEm5/src/SteppingVerbose.cc | 2 +- .../TestEm5/src/TrackingAction.cc | 2 +- .../electromagnetic/TestEm6/GNUmakefile | 4 +- .../extended/electromagnetic/TestEm6/History | 5 +- .../electromagnetic/TestEm6/TestEm6.cc | 2 +- .../electromagnetic/TestEm6/TestEm6.out | 1501 ++--- .../TestEm6/include/DetectorConstruction.hh | 2 +- .../TestEm6/include/DetectorMessenger.hh | 2 +- .../TestEm6/include/EventAction.hh | 2 +- .../TestEm6/include/EventActionMessenger.hh | 2 +- .../TestEm6/include/PhysicsList.hh | 2 +- .../TestEm6/include/PhysicsListMessenger.hh | 2 +- .../TestEm6/include/PrimaryGeneratorAction.hh | 2 +- .../include/PrimaryGeneratorMessenger.hh | 2 +- .../TestEm6/include/RunAction.hh | 2 +- .../TestEm6/include/SteppingAction.hh | 2 +- .../TestEm6/include/SteppingVerbose.hh | 2 +- .../TestEm6/src/DetectorConstruction.cc | 2 +- .../TestEm6/src/DetectorMessenger.cc | 2 +- .../TestEm6/src/EventAction.cc | 2 +- .../TestEm6/src/EventActionMessenger.cc | 2 +- .../TestEm6/src/PhysicsList.cc | 2 +- .../TestEm6/src/PhysicsListMessenger.cc | 2 +- .../TestEm6/src/PrimaryGeneratorAction.cc | 2 +- .../TestEm6/src/PrimaryGeneratorMessenger.cc | 2 +- .../electromagnetic/TestEm6/src/RunAction.cc | 2 +- .../TestEm6/src/SteppingAction.cc | 2 +- .../TestEm6/src/SteppingVerbose.cc | 2 +- .../electromagnetic/TestEm7/GNUmakefile | 6 +- .../extended/electromagnetic/TestEm7/History | 19 +- .../extended/electromagnetic/TestEm7/README | 16 +- .../electromagnetic/TestEm7/TestEm7.cc | 2 +- .../electromagnetic/TestEm7/TestEm7.out | 115 +- .../TestEm7/include/DetectorConstruction.hh | 2 +- .../TestEm7/include/DetectorMessenger.hh | 2 +- .../TestEm7/include/EventAction.hh | 2 +- .../TestEm7/include/EventActionMessenger.hh | 2 +- .../TestEm7/include/PhysListBinaryCascade.hh | 76 - .../TestEm7/include/PhysListEmG4v52.hh | 67 - .../include/PhysListEmLivermore.hh} | 15 +- .../include/PhysListEmPenelope.hh} | 14 +- .../TestEm7/include/PhysListEmStandard.hh | 2 +- .../include/PhysListEmStandardSS.hh} | 17 +- .../include/PhysListIonBinaryCascade.hh | 74 - .../TestEm7/include/PhysicsList.hh | 50 +- .../TestEm7/include/PhysicsListMessenger.hh | 2 +- .../TestEm7/include/PrimaryGeneratorAction.hh | 2 +- .../include/PrimaryGeneratorMessenger.hh | 2 +- .../TestEm7/include/RunAction.hh | 25 +- .../TestEm7/include/StepMax.hh | 2 +- .../TestEm7/include/StepMaxMessenger.hh | 2 +- .../TestEm7/include/SteppingAction.hh | 2 +- .../TestEm7/include/SteppingVerbose.hh | 2 +- .../TestEm7/include/TrackingAction.hh | 2 +- .../electromagnetic/TestEm7/ionC12.mac | 16 +- .../electromagnetic/TestEm7/proton.mac | 6 +- .../TestEm7/src/DetectorConstruction.cc | 12 +- .../TestEm7/src/DetectorMessenger.cc | 2 +- .../TestEm7/src/EventAction.cc | 2 +- .../TestEm7/src/EventActionMessenger.cc | 2 +- .../TestEm7/src/PhysListBinaryCascade.cc | 95 - .../TestEm7/src/PhysListEmG4v52.cc | 120 - .../src/PhysListEmLivermore.cc} | 65 +- .../TestEm7/src/PhysListEmPenelope.cc | 121 + .../TestEm7/src/PhysListEmStandard.cc | 21 +- .../src/PhysListEmStandardSS.cc} | 64 +- .../TestEm7/src/PhysListIonBinaryCascade.cc | 121 - .../TestEm7/src/PhysicsList.cc | 88 +- .../TestEm7/src/PhysicsListMessenger.cc | 2 +- .../TestEm7/src/PrimaryGeneratorAction.cc | 2 +- .../TestEm7/src/PrimaryGeneratorMessenger.cc | 2 +- .../electromagnetic/TestEm7/src/RunAction.cc | 6 +- .../electromagnetic/TestEm7/src/StepMax.cc | 2 +- .../TestEm7/src/StepMaxMessenger.cc | 2 +- .../TestEm7/src/SteppingAction.cc | 2 +- .../TestEm7/src/SteppingVerbose.cc | 2 +- .../TestEm7/src/TrackingAction.cc | 5 +- .../electromagnetic/TestEm8/GNUmakefile | 4 +- .../extended/electromagnetic/TestEm8/History | 10 +- .../electromagnetic/TestEm8/TestEm8.cc | 2 +- .../electromagnetic/TestEm8/TestEm8.in | 1 - .../TestEm8/TestEm8.large_N.in | 2 - .../electromagnetic/TestEm8/TestEm8.out | 71 +- .../TestEm8/include/Em8CalorHit.hh | 2 +- .../TestEm8/include/Em8CalorimeterSD.hh | 2 +- .../include/Em8DetectorConstruction.hh | 2 +- .../TestEm8/include/Em8DetectorMessenger.hh | 2 +- .../TestEm8/include/Em8EventAction.hh | 2 +- .../include/Em8EventActionMessenger.hh | 2 +- .../include/Em8PrimaryGeneratorAction.hh | 2 +- .../include/Em8PrimaryGeneratorMessenger.hh | 2 +- .../TestEm8/include/Em8RunAction.hh | 2 +- .../TestEm8/include/Em8RunMessenger.hh | 2 +- .../TestEm8/include/Em8SteppingAction.hh | 2 +- .../TestEm8/include/Em8SteppingVerbose.hh | 2 +- .../TestEm8/include/PhysListEmModel.hh | 2 +- .../TestEm8/include/PhysListEmModelPai.hh | 2 +- .../TestEm8/include/PhysListEmPAI.hh | 2 +- .../TestEm8/include/PhysListEmPaiPhoton.hh | 2 +- .../TestEm8/include/PhysListEmStandard.hh | 2 +- .../TestEm8/include/PhysListGeneral.hh | 2 +- .../TestEm8/include/PhysListParticles.hh | 2 +- .../TestEm8/include/PhysicsList.hh | 2 +- .../TestEm8/include/PhysicsListMessenger.hh | 2 +- .../TestEm8/include/StepMax.hh | 2 +- .../TestEm8/include/StepMaxMessenger.hh | 2 +- .../include/TRTDetectorConstruction.hh | 2 +- .../TestEm8/include/TRTMaterials.hh | 2 +- .../electromagnetic/TestEm8/run11.mac | 28 +- .../TestEm8/src/Em8CalorHit.cc | 2 +- .../TestEm8/src/Em8CalorimeterSD.cc | 2 +- .../TestEm8/src/Em8DetectorConstruction.cc | 4 +- .../TestEm8/src/Em8DetectorMessenger.cc | 2 +- .../TestEm8/src/Em8EventAction.cc | 2 +- .../TestEm8/src/Em8EventActionMessenger.cc | 2 +- .../TestEm8/src/Em8PrimaryGeneratorAction.cc | 2 +- .../src/Em8PrimaryGeneratorMessenger.cc | 2 +- .../TestEm8/src/Em8RunAction.cc | 2 +- .../TestEm8/src/Em8RunMessenger.cc | 2 +- .../TestEm8/src/Em8SteppingAction.cc | 2 +- .../TestEm8/src/Em8SteppingVerbose.cc | 2 +- .../TestEm8/src/PhysListEmG4v52.cc | 123 - .../TestEm8/src/PhysListEmModelPai.cc | 4 +- .../TestEm8/src/PhysListEmPAI.cc | 2 +- .../TestEm8/src/PhysListEmPaiPhoton.cc | 2 +- .../TestEm8/src/PhysListEmStandard.cc | 2 +- .../TestEm8/src/PhysListGeneral.cc | 2 +- .../TestEm8/src/PhysListParticles.cc | 2 +- .../TestEm8/src/PhysicsList.cc | 17 +- .../TestEm8/src/PhysicsListMessenger.cc | 2 +- .../electromagnetic/TestEm8/src/StepMax.cc | 2 +- .../TestEm8/src/StepMaxMessenger.cc | 2 +- .../electromagnetic/TestEm9/GNUmakefile | 6 +- .../extended/electromagnetic/TestEm9/History | 15 +- .../extended/electromagnetic/TestEm9/README | 29 +- .../electromagnetic/TestEm9/TestEm9.cc | 17 +- .../electromagnetic/TestEm9/TestEm9.in | 7 +- .../electromagnetic/TestEm9/TestEm9.out | 80 +- .../electromagnetic/TestEm9/cms10gev.mac | 3 +- .../electromagnetic/TestEm9/cms_cal.mac | 3 +- .../extended/electromagnetic/TestEm9/csi.mac | 7 +- .../TestEm9/include/DetectorConstruction.hh | 2 +- .../TestEm9/include/DetectorMessenger.hh | 2 +- .../TestEm9/include/EmAcceptance.hh | 2 +- .../TestEm9/include/EventAction.hh | 2 +- .../TestEm9/include/EventActionMessenger.hh | 2 +- .../electromagnetic/TestEm9/include/Histo.hh | 2 +- .../TestEm9/include/HistoManager.hh | 2 +- .../TestEm9/include/HistoMessenger.hh | 2 +- .../TestEm9/include/PhysListBinaryCascade.hh | 79 - .../TestEm9/include/PhysListEmLivermore.hh | 67 + .../include/PhysListEmPenelope.hh} | 14 +- .../TestEm9/include/PhysListEmStandard.hh | 2 +- .../TestEm9/include/PhysicsList.hh | 24 +- .../TestEm9/include/PhysicsListMessenger.hh | 2 +- .../TestEm9/include/PrimaryGeneratorAction.hh | 2 +- .../TestEm9/include/StepMax.hh | 2 +- .../TestEm9/include/StepMaxMessenger.hh | 2 +- .../TestEm9/include/SteppingAction.hh | 2 +- .../TestEm9/src/DetectorConstruction.cc | 2 +- .../TestEm9/src/DetectorMessenger.cc | 2 +- .../TestEm9/src/EmAcceptance.cc | 2 +- .../TestEm9/src/EventAction.cc | 2 +- .../TestEm9/src/EventActionMessenger.cc | 2 +- .../TestEm9/src/HistoMessenger.cc | 2 +- .../TestEm9/src/PhysListBinaryCascade.cc | 92 - .../TestEm9/src/PhysListEmG4v52.cc | 121 - .../TestEm9/src/PhysListEmG4v71.cc | 123 - .../src/PhysListEmLivermore.cc} | 74 +- .../TestEm9/src/PhysListEmPenelope.cc | 121 + .../TestEm9/src/PhysListEmStandard.cc | 8 +- .../TestEm9/src/PhysListIonBinaryCascade.cc | 121 - .../TestEm9/src/PhysicsList.cc | 128 +- .../TestEm9/src/PhysicsListMessenger.cc | 2 +- .../TestEm9/src/PrimaryGeneratorAction.cc | 2 +- .../electromagnetic/TestEm9/src/StepMax.cc | 2 +- .../TestEm9/src/StepMaxMessenger.cc | 2 +- .../TestEm9/src/SteppingAction.cc | 2 +- .../HepMC/HepMCEx01-clhep/GNUmakefile | 48 - .../HepMC/HepMCEx01-clhep/History | 47 - .../HepMC/HepMCEx01-clhep/README | 51 - .../HepMC/HepMCEx01-clhep/data/GNUmakefile | 20 - .../HepMCEx01-clhep/data/example_MyPythia.cc | 97 - .../HepMCEx01-clhep/data/example_MyPythia.dat | 5901 ----------------- .../HepMC/HepMCEx01-clhep/hepmcEx01-clhep.cc | 113 - .../HepMC/HepMCEx01-clhep/hepmc_ascii.in | 5 - .../HepMC/HepMCEx01-clhep/hepmc_ascii.out | 2073 ------ .../HepMC/HepMCEx01-clhep/hepmc_pygen.in | 7 - .../HepMC/HepMCEx01-clhep/hepmc_pygen.out | 224 - .../include/ExN04CalorimeterHit.hh | 108 - .../ExN04CalorimeterParametrisation.hh | 81 - .../include/ExN04DetectorParameterDef.hh | 72 - .../HepMCEx01-clhep/include/ExN04EMPhysics.hh | 96 - .../include/ExN04GeneralPhysics.hh | 80 - .../include/ExN04HadronPhysics.hh | 347 - .../include/ExN04IonPhysics.hh | 115 - .../include/ExN04MuonPhysics.hh | 96 - .../include/ExN04PrimaryGeneratorAction.hh | 97 - .../include/ExN04TrackerHit.hh | 83 - .../include/ExN04TrackerParametrisation.hh | 81 - .../include/G4HepMCInterface.hh | 82 - .../include/H01PythiaMessenger.hh | 68 - .../HepMC/HepMCEx01-clhep/pyh4mu.mac | 47 - .../HepMC/HepMCEx01-clhep/pyset.mac | 4 - .../src/ExN04CalorimeterHit.cc | 93 - .../src/ExN04CalorimeterROGeometry.cc | 112 - .../HepMCEx01-clhep/src/ExN04CalorimeterSD.cc | 118 - .../src/ExN04DetectorConstruction.cc | 257 - .../src/ExN04DetectorParameterDef.icc | 79 - .../HepMCEx01-clhep/src/ExN04EMPhysics.cc | 104 - .../HepMCEx01-clhep/src/ExN04EventAction.cc | 125 - .../HepMCEx01-clhep/src/ExN04HadronPhysics.cc | 441 -- .../HepMCEx01-clhep/src/ExN04IonPhysics.cc | 129 - .../HepMCEx01-clhep/src/ExN04MuonPhysics.cc | 117 - .../src/ExN04PrimaryGeneratorMessenger.cc | 97 - .../src/ExN04StackingAction.cc | 206 - .../src/ExN04StackingActionMessenger.cc | 96 - .../src/ExN04SteppingAction.cc | 73 - .../src/ExN04SteppingVerbose.cc | 181 - .../HepMCEx01-clhep/src/G4HepMCAsciiReader.cc | 79 - .../src/G4HepMCAsciiReaderMessenger.cc | 105 - .../HepMCEx01-clhep/src/G4HepMCInterface.cc | 131 - .../HepMCEx01-clhep/src/H01PythiaInterface.cc | 191 - .../HepMCEx01-clhep/src/H01PythiaMessenger.cc | 217 - .../HepMC/HepMCEx01-clhep/vis.mac | 31 - .../HepMC/HepMCEx01/GNUmakefile | 88 +- .../eventgenerator/HepMC/HepMCEx01/History | 30 +- .../eventgenerator/HepMC/HepMCEx01/README | 8 +- .../HepMC/HepMCEx01/hepmcEx01.cc | 67 +- .../HepMC/HepMCEx01/hepmc_ascii.out | 1775 ++--- .../HepMC/HepMCEx01/hepmc_pygen.out | 296 +- .../HepMC/HepMCEx01/include/ExN04EMPhysics.hh | 96 - .../HepMCEx01/include/ExN04GeneralPhysics.hh | 80 - .../HepMCEx01/include/ExN04HadronPhysics.hh | 347 - .../HepMCEx01/include/ExN04IonPhysics.hh | 115 - .../HepMCEx01/include/ExN04MuonPhysics.hh | 96 - .../HepMC/HepMCEx01/include/ExN04RunAction.hh | 5 +- .../HepMCEx01/include/ExN04SteppingVerbose.hh | 2 +- .../HepMC/HepMCEx01/src/ExN04CalorimeterSD.cc | 8 +- .../HepMC/HepMCEx01/src/ExN04EMPhysics.cc | 104 - .../HepMC/HepMCEx01/src/ExN04EventAction.cc | 18 - .../HepMC/HepMCEx01/src/ExN04HadronPhysics.cc | 441 -- .../HepMC/HepMCEx01/src/ExN04IonPhysics.cc | 129 - .../HepMC/HepMCEx01/src/ExN04MuonPhysics.cc | 117 - .../src/ExN04PrimaryGeneratorAction.cc | 7 +- .../HepMC/HepMCEx01/src/ExN04RunAction.cc | 20 +- .../HepMCEx01/src/ExN04SteppingVerbose.cc | 2 +- .../HepMCEx01/src/HepMCG4PythiaInterface.cc | 6 +- .../HepMCEx01/src/HepMCG4PythiaMessenger.cc | 6 +- .../eventgenerator/HepMC/HepMCEx01/vis.mac | 14 +- .../HepMC/HepMCEx02-clhep/GNUmakefile | 48 - .../HepMC/HepMCEx02-clhep/History | 43 - .../HepMC/HepMCEx02-clhep/README | 42 - .../HepMC/HepMCEx02-clhep/data/GNUmakefile | 20 - .../HepMCEx02-clhep/data/example_MyPythia.cc | 98 - .../HepMCEx02-clhep/data/example_MyPythia.dat | 5901 ----------------- .../HepMC/HepMCEx02-clhep/hepmc_ascii.in | 5 - .../HepMC/HepMCEx02-clhep/hepmc_ascii.out | 2106 ------ .../HepMC/HepMCEx02-clhep/hepmc_pygen.in | 4 - .../HepMC/HepMCEx02-clhep/hepmc_pygen.out | 415 -- .../include/G4HepMCInterface.hh | 82 - .../HepMCEx02-clhep/include/H02EMPhysics.hh | 96 - .../include/H02HadronPhysics.hh | 341 - .../HepMCEx02-clhep/include/H02IonPhysics.hh | 114 - .../HepMCEx02-clhep/include/H02MuonHit.hh | 117 - .../HepMCEx02-clhep/include/H02MuonPhysics.hh | 96 - .../include/H02PrimaryGeneratorAction.hh | 96 - .../include/H02PythiaInterface.hh | 113 - .../include/H02PythiaMessenger.hh | 68 - .../HepMC/HepMCEx02-clhep/pyh4mu.mac | 47 - .../HepMC/HepMCEx02-clhep/pyset.mac | 4 - .../HepMCEx02-clhep/src/G4HepMCAsciiReader.cc | 79 - .../src/G4HepMCAsciiReaderMessenger.cc | 105 - .../HepMCEx02-clhep/src/G4HepMCInterface.cc | 131 - .../src/H02DetectorConstruction.cc | 257 - .../HepMC/HepMCEx02-clhep/src/H02EMPhysics.cc | 114 - .../HepMCEx02-clhep/src/H02HadronPhysics.cc | 435 -- .../HepMCEx02-clhep/src/H02IonPhysics.cc | 143 - .../HepMC/HepMCEx02-clhep/src/H02MuonHit.cc | 129 - .../HepMCEx02-clhep/src/H02MuonPhysics.cc | 131 - .../HepMC/HepMCEx02-clhep/src/H02MuonSD.cc | 122 - .../src/H02PrimaryGeneratorMessenger.cc | 100 - .../HepMCEx02-clhep/src/H02PythiaInterface.cc | 191 - .../HepMCEx02-clhep/src/H02PythiaMessenger.cc | 217 - .../HepMCEx02-clhep/src/H02SteppingAction.cc | 75 - .../HepMC/HepMCEx02-clhep/vis.mac | 32 - .../HepMC/HepMCEx02/GNUmakefile | 86 +- .../eventgenerator/HepMC/HepMCEx02/History | 34 +- .../HepMC/HepMCEx02/hepmcEx02.cc | 47 +- .../HepMC/HepMCEx02/hepmc_ascii.out | 1877 +++--- .../HepMC/HepMCEx02/hepmc_pygen.out | 722 +- .../HepMC/HepMCEx02/include/H02EMPhysics.hh | 96 - .../HepMCEx02/include/H02GeneralPhysics.hh | 80 - .../HepMCEx02/include/H02HadronPhysics.hh | 341 - .../HepMC/HepMCEx02/include/H02IonPhysics.hh | 114 - .../HepMC/HepMCEx02/include/H02MuonPhysics.hh | 96 - .../HepMC/HepMCEx02/include/H02PhysicsList.hh | 45 +- .../HepMC/HepMCEx02/src/H02EMPhysics.cc | 114 - .../HepMC/HepMCEx02/src/H02HadronPhysics.cc | 435 -- .../HepMC/HepMCEx02/src/H02IonPhysics.cc | 143 - .../HepMC/HepMCEx02/src/H02MuonPhysics.cc | 131 - .../HepMC/HepMCEx02/src/H02MuonSD.cc | 3 +- .../HepMC/HepMCEx02/src/H02PhysicsList.cc | 241 +- .../src/H02PrimaryGeneratorAction.cc | 6 +- .../HepMCEx02/src/HepMCG4PythiaInterface.cc | 6 +- .../HepMCEx02/src/HepMCG4PythiaMessenger.cc | 6 +- .../eventgenerator/HepMC/HepMCEx02/vis.mac | 2 +- .../extended/eventgenerator/HepMC/History | 25 +- .../eventgenerator/HepMC/MCTruth/GNUmakefile | 25 + .../eventgenerator/HepMC/MCTruth/History | 19 + .../eventgenerator/HepMC/MCTruth/README | 167 + .../MCTruth/include/DetectorConstruction.hh | 83 + .../HepMC/MCTruth/include/MCTruthConfig.hh | 77 + .../MCTruth/include/MCTruthEventAction.hh | 58 + .../HepMC/MCTruth/include/MCTruthManager.hh} | 107 +- .../include/MCTruthTrackInformation.hh | 64 + .../MCTruth/include/MCTruthTrackingAction.hh | 63 + .../HepMC/MCTruth/include/PhysicsList.hh | 76 + .../MCTruth/include/PrimaryGeneratorAction.hh | 63 + .../ExN04MuonHit.hh => MCTruth/mctruthex.cc} | 86 +- .../HepMC/MCTruth/src/DetectorConstruction.cc | 238 + .../HepMC/MCTruth/src/MCTruthConfig.cc} | 36 +- .../HepMC/MCTruth/src/MCTruthEventAction.cc | 57 + .../HepMC/MCTruth/src/MCTruthManager.cc | 279 + .../MCTruth/src/MCTruthTrackInformation.cc} | 31 +- .../MCTruth/src/MCTruthTrackingAction.cc | 127 + .../HepMC/MCTruth/src/PhysicsList.cc | 221 + .../src/PrimaryGeneratorAction.cc} | 82 +- examples/extended/eventgenerator/HepMC/README | 90 +- .../include/exGPSEventActionMessenger.hh | 2 +- .../exgps/src/exGPSEventActionMessenger.cc | 2 +- .../BlineTracer/include/G4BlineEquation.hh | 2 +- .../BlineTracer/include/G4BlineEventAction.hh | 2 +- .../include/G4BlinePrimaryGeneratorAction.hh | 2 +- .../include/G4BlineSteppingAction.hh | 2 +- .../BlineTracer/include/G4BlineTracer.hh | 2 +- .../include/G4BlineTracerMessenger.hh | 2 +- .../field/BlineTracer/src/G4BlineEquation.cc | 2 +- .../BlineTracer/src/G4BlineEventAction.cc | 2 +- .../src/G4BlinePrimaryGeneratorAction.cc | 2 +- .../BlineTracer/src/G4BlineSteppingAction.cc | 2 +- .../field/BlineTracer/src/G4BlineTracer.cc | 2 +- .../BlineTracer/src/G4BlineTracerMessenger.cc | 2 +- examples/extended/field/field01/field01.cc | 2 +- examples/extended/field/field01/field01.out | 37 +- .../field/field01/include/F01CalorHit.hh | 2 +- .../field/field01/include/F01CalorimeterSD.hh | 2 +- .../include/F01DetectorConstruction.hh | 2 +- .../field01/include/F01DetectorMessenger.hh | 2 +- .../field/field01/include/F01EventAction.hh | 2 +- .../include/F01EventActionMessenger.hh | 2 +- .../field01/include/F01FieldMessenger.hh | 2 +- .../field/field01/include/F01FieldSetup.hh | 2 +- .../field/field01/include/F01PhysicsList.hh | 2 +- .../include/F01PhysicsListMessenger.hh | 2 +- .../include/F01PrimaryGeneratorAction.hh | 2 +- .../include/F01PrimaryGeneratorMessenger.hh | 2 +- .../field/field01/include/F01RunAction.hh | 2 +- .../field/field01/include/F01RunMessenger.hh | 2 +- .../field/field01/include/F01StepCut.hh | 2 +- .../field01/include/F01SteppingAction.hh | 2 +- .../field01/include/F01SteppingMessenger.hh | 2 +- .../field01/include/F01SteppingVerbose.hh | 2 +- .../extended/field/field01/src/F01CalorHit.cc | 2 +- .../field/field01/src/F01CalorimeterSD.cc | 2 +- .../field01/src/F01DetectorConstruction.cc | 2 +- .../field/field01/src/F01DetectorMessenger.cc | 2 +- .../field/field01/src/F01EventAction.cc | 2 +- .../field01/src/F01EventActionMessenger.cc | 2 +- .../field/field01/src/F01FieldMessenger.cc | 2 +- .../field/field01/src/F01FieldSetup.cc | 2 +- .../field/field01/src/F01PhysicsList.cc | 2 +- .../field01/src/F01PhysicsListMessenger.cc | 2 +- .../field01/src/F01PrimaryGeneratorAction.cc | 2 +- .../src/F01PrimaryGeneratorMessenger.cc | 2 +- .../field/field01/src/F01RunAction.cc | 2 +- .../field/field01/src/F01RunMessenger.cc | 2 +- .../extended/field/field01/src/F01StepCut.cc | 2 +- .../field/field01/src/F01SteppingAction.cc | 2 +- .../field/field01/src/F01SteppingMessenger.cc | 2 +- .../field/field01/src/F01SteppingVerbose.cc | 2 +- examples/extended/field/field02/field02.cc | 2 +- examples/extended/field/field02/field02.out | 25 +- .../field/field02/include/F02CalorHit.hh | 2 +- .../field/field02/include/F02CalorimeterSD.hh | 2 +- .../include/F02DetectorConstruction.hh | 2 +- .../field02/include/F02DetectorMessenger.hh | 2 +- .../field02/include/F02ElectricFieldSetup.hh | 2 +- .../field/field02/include/F02EventAction.hh | 2 +- .../include/F02EventActionMessenger.hh | 2 +- .../field02/include/F02FieldMessenger.hh | 2 +- .../field/field02/include/F02PhysicsList.hh | 2 +- .../include/F02PhysicsListMessenger.hh | 2 +- .../include/F02PrimaryGeneratorAction.hh | 2 +- .../include/F02PrimaryGeneratorMessenger.hh | 2 +- .../field/field02/include/F02RunAction.hh | 2 +- .../field/field02/include/F02RunMessenger.hh | 2 +- .../field/field02/include/F02StepCut.hh | 2 +- .../field02/include/F02SteppingAction.hh | 2 +- .../field02/include/F02SteppingMessenger.hh | 2 +- .../field02/include/F02SteppingVerbose.hh | 2 +- .../extended/field/field02/src/F02CalorHit.cc | 2 +- .../field/field02/src/F02CalorimeterSD.cc | 2 +- .../field02/src/F02DetectorConstruction.cc | 2 +- .../field/field02/src/F02DetectorMessenger.cc | 2 +- .../field02/src/F02ElectricFieldSetup.cc | 2 +- .../field/field02/src/F02EventAction.cc | 2 +- .../field02/src/F02EventActionMessenger.cc | 2 +- .../field/field02/src/F02FieldMessenger.cc | 2 +- .../field/field02/src/F02PhysicsList.cc | 2 +- .../field02/src/F02PhysicsListMessenger.cc | 2 +- .../field02/src/F02PrimaryGeneratorAction.cc | 2 +- .../src/F02PrimaryGeneratorMessenger.cc | 2 +- .../field/field02/src/F02RunAction.cc | 2 +- .../field/field02/src/F02RunMessenger.cc | 2 +- .../extended/field/field02/src/F02StepCut.cc | 2 +- .../field/field02/src/F02SteppingAction.cc | 2 +- .../field/field02/src/F02SteppingMessenger.cc | 2 +- .../field/field02/src/F02SteppingVerbose.cc | 2 +- examples/extended/field/field03/field03.cc | 2 +- examples/extended/field/field03/field03.out | 29 +- .../field/field03/include/F03CalorHit.hh | 2 +- .../field/field03/include/F03CalorimeterSD.hh | 2 +- .../include/F03DetectorConstruction.hh | 2 +- .../field03/include/F03DetectorMessenger.hh | 2 +- .../field/field03/include/F03EventAction.hh | 2 +- .../include/F03EventActionMessenger.hh | 2 +- .../field03/include/F03FieldMessenger.hh | 2 +- .../field/field03/include/F03FieldSetup.hh | 2 +- .../field/field03/include/F03PhysicsList.hh | 2 +- .../include/F03PhysicsListMessenger.hh | 2 +- .../include/F03PrimaryGeneratorAction.hh | 2 +- .../include/F03PrimaryGeneratorMessenger.hh | 2 +- .../field/field03/include/F03RunAction.hh | 2 +- .../field/field03/include/F03RunMessenger.hh | 2 +- .../field/field03/include/F03StepCut.hh | 2 +- .../field03/include/F03SteppingAction.hh | 2 +- .../field03/include/F03SteppingMessenger.hh | 2 +- .../field03/include/F03SteppingVerbose.hh | 2 +- .../extended/field/field03/src/F03CalorHit.cc | 2 +- .../field/field03/src/F03CalorimeterSD.cc | 2 +- .../field03/src/F03DetectorConstruction.cc | 2 +- .../field/field03/src/F03DetectorMessenger.cc | 2 +- .../field/field03/src/F03EventAction.cc | 2 +- .../field03/src/F03EventActionMessenger.cc | 2 +- .../field/field03/src/F03FieldMessenger.cc | 2 +- .../field/field03/src/F03FieldSetup.cc | 2 +- .../field/field03/src/F03PhysicsList.cc | 2 +- .../field03/src/F03PhysicsListMessenger.cc | 2 +- .../field03/src/F03PrimaryGeneratorAction.cc | 2 +- .../src/F03PrimaryGeneratorMessenger.cc | 2 +- .../field/field03/src/F03RunAction.cc | 2 +- .../field/field03/src/F03RunMessenger.cc | 2 +- .../extended/field/field03/src/F03StepCut.cc | 2 +- .../field/field03/src/F03SteppingAction.cc | 2 +- .../field/field03/src/F03SteppingMessenger.cc | 2 +- .../field/field03/src/F03SteppingVerbose.cc | 2 +- .../extended/g3tog4/clGeometry/clGeometry.cc | 2 +- .../extended/g3tog4/clGeometry/clGeometry.out | 41 +- .../include/G3toG4DetectorConstruction.hh | 2 +- .../clGeometry/include/G3toG4EventAction.hh | 2 +- .../include/G3toG4EventActionMessenger.hh | 2 +- .../clGeometry/include/G3toG4PhysicsList.hh | 2 +- .../include/G3toG4PrimaryGeneratorAction.hh | 2 +- .../clGeometry/include/G3toG4RunAction.hh | 2 +- .../src/G3toG4DetectorConstruction.cc | 2 +- .../clGeometry/src/G3toG4EventAction.cc | 2 +- .../src/G3toG4EventActionMessenger.cc | 2 +- .../clGeometry/src/G3toG4PhysicsList.cc | 2 +- .../src/G3toG4PrimaryGeneratorAction.cc | 2 +- .../g3tog4/clGeometry/src/G3toG4RunAction.cc | 2 +- examples/extended/g3tog4/cltog4/cltog4.cc | 2 +- examples/extended/g3tog4/cltog4/cltog4.out | 13 +- .../include/G3toG4DetectorConstruction.hh | 2 +- .../cltog4/include/G3toG4EventAction.hh | 2 +- .../include/G3toG4EventActionMessenger.hh | 2 +- .../cltog4/include/G3toG4PhysicsList.hh | 2 +- .../include/G3toG4PrimaryGeneratorAction.hh | 2 +- .../g3tog4/cltog4/include/G3toG4RunAction.hh | 2 +- .../cltog4/src/G3toG4DetectorConstruction.cc | 2 +- .../g3tog4/cltog4/src/G3toG4EventAction.cc | 2 +- .../cltog4/src/G3toG4EventActionMessenger.cc | 2 +- .../g3tog4/cltog4/src/G3toG4PhysicsList.cc | 2 +- .../src/G3toG4PrimaryGeneratorAction.cc | 2 +- .../g3tog4/cltog4/src/G3toG4RunAction.cc | 2 +- examples/extended/gdml/GNUmakefile | 8 +- examples/extended/gdml/History | 6 +- examples/extended/gdml/README | 19 +- .../include/g4rwPrimaryGeneratorAction.hh | 2 +- .../gdml/src/g4rwDetectorConstruction.cc | 2 +- examples/extended/gdml/src/g4rwPhysicsList.cc | 2 +- .../gdml/src/g4rwPrimaryGeneratorAction.cc | 2 +- examples/extended/gdml/test.gdml | 2 +- .../geometry/olap/include/G4GeoNav.hh | 2 +- .../geometry/olap/include/OlapDetConstr.hh | 2 +- .../geometry/olap/include/OlapEventAction.hh | 2 +- .../geometry/olap/include/OlapGenerator.hh | 2 +- .../geometry/olap/include/OlapLogManager.hh | 2 +- .../geometry/olap/include/OlapManager.hh | 2 +- .../olap/include/OlapManagerMessenger.hh | 2 +- .../geometry/olap/include/OlapNotify.hh | 2 +- .../geometry/olap/include/OlapPhysicsList.hh | 2 +- .../geometry/olap/include/OlapRunAction.hh | 2 +- .../olap/include/OlapSteppingAction.hh | 2 +- .../geometry/olap/include/RandomDetector.hh | 2 +- .../geometry/olap/include/SolidAnalyser.hh | 2 +- .../extended/geometry/olap/include/tree.hh | 2 +- examples/extended/geometry/olap/olapex.cc | 2 +- .../extended/geometry/olap/src/G4GeoNav.cc | 2 +- .../geometry/olap/src/OlapDetConstr.cc | 2 +- .../geometry/olap/src/OlapEventAction.cc | 2 +- .../geometry/olap/src/OlapGenerator.cc | 2 +- .../geometry/olap/src/OlapLogManager.cc | 2 +- .../extended/geometry/olap/src/OlapManager.cc | 2 +- .../geometry/olap/src/OlapManagerMessenger.cc | 2 +- .../extended/geometry/olap/src/OlapNotify.cc | 2 +- .../geometry/olap/src/OlapPhysicsList.cc | 2 +- .../geometry/olap/src/OlapRunAction.cc | 2 +- .../geometry/olap/src/OlapSteppingAction.cc | 2 +- .../geometry/olap/src/RandomDetector.cc | 2 +- .../geometry/olap/src/SolidAnalyser.cc | 2 +- examples/extended/hadronic/Hadr01/GNUmakefile | 29 +- examples/extended/hadronic/Hadr01/History | 17 +- examples/extended/hadronic/Hadr01/README | 19 + examples/extended/hadronic/Hadr01/hadr01.cc | 10 +- examples/extended/hadronic/Hadr01/hadr01.out | 199 +- .../hadronic/Hadr01/include/CheckVolumeSD.hh | 2 +- .../Hadr01/include/DetectorConstruction.hh | 2 +- .../Hadr01/include/DetectorMessenger.hh | 8 +- .../hadronic/Hadr01/include/EventAction.hh | 2 +- .../Hadr01/include/EventActionMessenger.hh | 2 +- .../extended/hadronic/Hadr01/include/Histo.hh | 4 +- .../hadronic/Hadr01/include/HistoManager.hh | 47 +- .../hadronic/Hadr01/include/HistoMessenger.hh | 5 +- .../hadronic/Hadr01/include/PhysicsList.hh | 7 +- .../Hadr01/include/PhysicsListMessenger.hh | 2 +- .../Hadr01/include/PrimaryGeneratorAction.hh | 2 +- .../hadronic/Hadr01/include/StackingAction.hh | 2 +- .../Hadr01/include/StackingMessenger.hh | 2 +- .../hadronic/Hadr01/include/TargetSD.hh | 2 +- examples/extended/hadronic/Hadr01/p_pb.in | 19 +- examples/extended/hadronic/Hadr01/run.csh | 31 + .../hadronic/Hadr01/src/CheckVolumeSD.cc | 2 +- .../Hadr01/src/DetectorConstruction.cc | 5 +- .../hadronic/Hadr01/src/DetectorMessenger.cc | 44 +- .../hadronic/Hadr01/src/EventAction.cc | 2 +- .../Hadr01/src/EventActionMessenger.cc | 2 +- .../extended/hadronic/Hadr01/src/Histo.cc | 12 +- .../hadronic/Hadr01/src/HistoManager.cc | 113 +- .../hadronic/Hadr01/src/HistoMessenger.cc | 2 +- .../hadronic/Hadr01/src/PhysicsList.cc | 116 +- .../Hadr01/src/PhysicsListMessenger.cc | 20 +- .../Hadr01/src/PrimaryGeneratorAction.cc | 11 +- .../extended/hadronic/Hadr01/src/RunAction.cc | 6 +- .../hadronic/Hadr01/src/StackingAction.cc | 7 +- .../hadronic/Hadr01/src/StackingMessenger.cc | 2 +- .../extended/hadronic/Hadr01/src/TargetSD.cc | 2 +- .../extended/medical/GammaTherapy/GNUmakefile | 4 +- .../medical/GammaTherapy/GammaTherapy.cc | 8 +- .../extended/medical/GammaTherapy/History | 6 +- .../include/EventActionMessenger.hh | 2 +- .../GammaTherapy/include/G4EmMuonBuilder52.hh | 66 - .../GammaTherapy/include/G4EmMuonBuilder71.hh | 66 - .../GammaTherapy/include/G4EmQEDBuilder71.hh | 67 - .../include/G4LowEnergyQEDBuilder.hh | 67 - .../include/G4PenelopeQEDBuilder.hh | 67 - .../include/G4StepLimiterBuilder.hh | 2 +- .../include/G4StepLimiterMessenger.hh | 2 +- .../include/G4StepLimiterPerRegion.hh | 2 +- .../GammaTherapy/include/ParticlesBuilder.hh | 2 +- .../include/PhysListEmLivermore.hh | 67 + .../include/PhysListEmPenelope.hh} | 14 +- .../GammaTherapy/include/PhysicsList.hh | 10 +- .../include/PhysicsListMessenger.hh | 2 +- .../src/EmBinaryCascadeBuilder.cc | 99 - .../GammaTherapy/src/EmGammaNucleusBuilder.cc | 79 - .../src/EmHadronElasticBuilder.cc | 76 - .../src/EmIonBinaryCascadeBuilder.cc | 143 - .../GammaTherapy/src/EventActionMessenger.cc | 2 +- .../GammaTherapy/src/G4EmMuonBuilder.cc | 115 - .../GammaTherapy/src/G4EmMuonBuilder71.cc | 108 - .../GammaTherapy/src/G4EmQEDBuilder.cc | 114 - .../GammaTherapy/src/G4EmQEDBuilder52.cc | 114 - .../GammaTherapy/src/G4EmQEDBuilder71.cc | 114 - .../GammaTherapy/src/G4LowEnergyQEDBuilder.cc | 122 - .../GammaTherapy/src/G4PenelopeQEDBuilder.cc | 116 - .../GammaTherapy/src/G4StepLimiterBuilder.cc | 2 +- .../src/G4StepLimiterMessenger.cc | 2 +- .../src/G4StepLimiterPerRegion.cc | 2 +- .../GammaTherapy/src/ParticlesBuilder.cc | 2 +- .../GammaTherapy/src/PhysListEmLivermore.cc} | 71 +- .../GammaTherapy/src/PhysListEmPenelope.cc | 121 + .../medical/GammaTherapy/src/PhysicsList.cc | 122 +- .../GammaTherapy/src/PhysicsListMessenger.cc | 2 +- examples/extended/optical/LXe/History | 6 +- examples/extended/optical/LXe/LXe.out | 2 +- .../LXe/src/LXeDetectorConstruction.cc | 4 +- examples/extended/parallel/ExDiane/Brachy.cc | 2 +- .../ExDiane/include/BrachyAnalysisManager.hh | 2 +- .../include/BrachyDetectorConstruction.hh | 2 +- .../include/BrachyDetectorConstructionI.hh | 2 +- .../include/BrachyDetectorConstructionIr.hh | 2 +- .../BrachyDetectorConstructionLeipzig.hh | 2 +- .../include/BrachyDetectorMessenger.hh | 2 +- .../ExDiane/include/BrachyEventAction.hh | 2 +- .../parallel/ExDiane/include/BrachyFactory.hh | 2 +- .../ExDiane/include/BrachyFactoryI.hh | 2 +- .../ExDiane/include/BrachyFactoryIr.hh | 2 +- .../ExDiane/include/BrachyFactoryLeipzig.hh | 2 +- .../ExDiane/include/BrachyMaterial.hh | 2 +- .../ExDiane/include/BrachyPhantomHit.hh | 2 +- .../include/BrachyPhantomROGeometry.hh | 2 +- .../ExDiane/include/BrachyPhantomSD.hh | 2 +- .../ExDiane/include/BrachyPhysicsList.hh | 2 +- .../include/BrachyPrimaryGeneratorAction.hh | 2 +- .../include/BrachyPrimaryGeneratorActionI.hh | 2 +- .../include/BrachyPrimaryGeneratorActionIr.hh | 2 +- .../ExDiane/include/BrachyRunAction.hh | 2 +- .../ExDiane/include/BrachyRunMessenger.hh | 2 +- .../ExDiane/include/BrachySimulation.hh | 2 +- .../ExDiane/src/BrachyAnalysisManager.cc | 2 +- .../ExDiane/src/BrachyDetectorConstruction.cc | 2 +- .../src/BrachyDetectorConstructionI.cc | 2 +- .../src/BrachyDetectorConstructionIr.cc | 2 +- .../src/BrachyDetectorConstructionLeipzig.cc | 2 +- .../ExDiane/src/BrachyDetectorMessenger.cc | 2 +- .../parallel/ExDiane/src/BrachyEventAction.cc | 2 +- .../parallel/ExDiane/src/BrachyFactory.cc | 2 +- .../parallel/ExDiane/src/BrachyFactoryI.cc | 2 +- .../parallel/ExDiane/src/BrachyFactoryIr.cc | 2 +- .../ExDiane/src/BrachyFactoryLeipzig.cc | 2 +- .../parallel/ExDiane/src/BrachyMaterial.cc | 2 +- .../parallel/ExDiane/src/BrachyPhantomHit.cc | 2 +- .../ExDiane/src/BrachyPhantomROGeometry.cc | 2 +- .../parallel/ExDiane/src/BrachyPhantomSD.cc | 2 +- .../parallel/ExDiane/src/BrachyPhysicsList.cc | 2 +- .../src/BrachyPrimaryGeneratorAction.cc | 2 +- .../src/BrachyPrimaryGeneratorActionI.cc | 2 +- .../src/BrachyPrimaryGeneratorActionIr.cc | 2 +- .../parallel/ExDiane/src/BrachyRunAction.cc | 2 +- .../ExDiane/src/BrachyRunMessenger.cc | 2 +- .../parallel/ExDiane/src/BrachySimulation.cc | 2 +- .../ParN02/AnnotatedFiles/G4HCofThisEvent.hh | 2 +- .../AnnotatedFiles/G4THitsCollection.hh | 2 +- .../AnnotatedFiles/G4VHitsCollection.hh | 2 +- examples/extended/parallel/ParN02/History | 6 +- examples/extended/parallel/ParN02/ParN02.cc | 68 +- examples/extended/parallel/ParN02/ParTopC.icc | 2 +- .../include/ExN02ChamberParameterisation.hh | 2 +- .../include/ExN02DetectorConstruction.hh | 2 +- .../ParN02/include/ExN02DetectorMessenger.hh | 2 +- .../ParN02/include/ExN02EventAction.hh | 2 +- .../ParN02/include/ExN02MagneticField.hh | 2 +- .../ParN02/include/ExN02PhysicsList.hh | 2 +- .../include/ExN02PrimaryGeneratorAction.hh | 2 +- .../parallel/ParN02/include/ExN02RunAction.hh | 5 +- .../ParN02/include/ExN02SteppingAction.hh | 2 +- .../ParN02/include/ExN02SteppingVerbose.hh | 2 +- .../parallel/ParN02/include/ExN02TrackerSD.hh | 2 +- .../parallel/ParN02/include/ParRunManager.hh | 2 +- .../src/ExN02ChamberParameterisation.cc | 2 +- .../ParN02/src/ExN02DetectorConstruction.cc | 2 +- .../ParN02/src/ExN02DetectorMessenger.cc | 2 +- .../parallel/ParN02/src/ExN02EventAction.cc | 2 +- .../parallel/ParN02/src/ExN02MagneticField.cc | 2 +- .../parallel/ParN02/src/ExN02PhysicsList.cc | 2 +- .../ParN02/src/ExN02PrimaryGeneratorAction.cc | 2 +- .../parallel/ParN02/src/ExN02RunAction.cc | 21 +- .../ParN02/src/ExN02SteppingAction.cc | 2 +- .../ParN02/src/ExN02SteppingVerbose.cc | 2 +- .../parallel/ParN02/src/ExN02TrackerHit.cc | 2 +- .../parallel/ParN02/src/ExN02TrackerSD.cc | 2 +- .../ParN04/AnnotatedFiles/G4HCofThisEvent.hh | 2 +- .../AnnotatedFiles/G4THitsCollection.hh | 2 +- .../AnnotatedFiles/G4VHitsCollection.hh | 2 +- examples/extended/parallel/ParN04/GNUmakefile | 19 +- examples/extended/parallel/ParN04/History | 17 +- examples/extended/parallel/ParN04/ParN04.cc | 71 +- examples/extended/parallel/ParN04/ParTopC.icc | 2 +- .../parallel/ParN04}/hadronic_lists.gmk | 0 .../parallel/ParN04/include/ExN04EMPhysics.hh | 2 +- .../ParN04/include/ExN04GeneralPhysics.hh | 80 - .../ParN04/include/ExN04HadronPhysics.hh | 347 - .../ParN04/include/ExN04IonPhysics.hh | 115 - .../ParN04/include/ExN04MuonPhysics.hh | 96 - .../parallel/ParN04/include/ExN04RunAction.hh | 5 +- .../ParN04/include/ExN04SteppingVerbose.hh | 2 +- .../parallel/ParN04/include/ParRunManager.hh | 2 +- .../parallel/ParN04/src/ExN04CalorimeterSD.cc | 8 +- .../parallel/ParN04/src/ExN04EventAction.cc | 18 - .../parallel/ParN04/src/ExN04HadronPhysics.cc | 441 -- .../parallel/ParN04/src/ExN04IonPhysics.cc | 129 - .../parallel/ParN04/src/ExN04MuonPhysics.cc | 117 - .../parallel/ParN04/src/ExN04PhysicsList.cc | 88 - .../parallel/ParN04/src/ExN04RunAction.cc | 23 +- .../ParN04/src/ExN04SteppingVerbose.cc | 2 +- .../extended/persistency/P01/exampleP01.cc | 2 +- .../include/ExP01ChamberParameterisation.hh | 2 +- .../P01/include/ExP01DetectorConstruction.hh | 2 +- .../P01/include/ExP01DetectorMessenger.hh | 2 +- .../P01/include/ExP01EventAction.hh | 2 +- .../P01/include/ExP01MagneticField.hh | 2 +- .../P01/include/ExP01PhysicsList.hh | 2 +- .../include/ExP01PrimaryGeneratorAction.hh | 2 +- .../persistency/P01/include/ExP01RunAction.hh | 2 +- .../P01/include/ExP01SteppingAction.hh | 2 +- .../P01/include/ExP01SteppingVerbose.hh | 2 +- .../P01/include/ExP01TrackerHit.hh | 2 +- .../persistency/P01/include/ExP01TrackerSD.hh | 2 +- .../P01/src/ExP01ChamberParameterisation.cc | 2 +- .../P01/src/ExP01DetectorConstruction.cc | 2 +- .../P01/src/ExP01DetectorMessenger.cc | 2 +- .../persistency/P01/src/ExP01EventAction.cc | 2 +- .../persistency/P01/src/ExP01MagneticField.cc | 2 +- .../persistency/P01/src/ExP01PhysicsList.cc | 2 +- .../P01/src/ExP01PrimaryGeneratorAction.cc | 2 +- .../persistency/P01/src/ExP01RunAction.cc | 2 +- .../P01/src/ExP01SteppingAction.cc | 2 +- .../P01/src/ExP01SteppingVerbose.cc | 2 +- .../persistency/P01/src/ExP01TrackerHit.cc | 2 +- .../persistency/P01/src/ExP01TrackerSD.cc | 2 +- .../extended/polarisation/Pol01/GNUmakefile | 31 + examples/extended/polarisation/Pol01/History | 36 + examples/extended/polarisation/Pol01/README | 136 + .../extended/polarisation/Pol01/heprep2.mac | 40 + .../extended/polarisation/Pol01/histo.mac | 50 + .../extended/polarisation/Pol01/histos.mac | 49 + .../Pol01/include/DetectorConstruction.hh} | 68 +- .../Pol01/include/DetectorMessenger.hh} | 55 +- .../Pol01/include/EventAction.hh} | 49 +- .../Pol01/include/EventActionMessenger.hh} | 51 +- .../Pol01/include/HistoManager.hh | 98 + .../Pol01/include/HistoMessenger.hh} | 48 +- .../Pol01/include/PhysListEmPolarized.hh | 67 + .../Pol01/include/PhysListEmStandard.hh} | 14 +- .../Pol01/include/PhysicsList.hh} | 61 +- .../Pol01/include/PhysicsListMessenger.hh | 70 + .../Pol01/include/PrimaryGeneratorAction.hh} | 46 +- .../Pol01/include/ProcessesCount.hh | 66 + .../polarisation/Pol01/include/RunAction.hh | 98 + .../Pol01/include/StepMax.hh} | 69 +- .../Pol01/include/StepMaxMessenger.hh} | 37 +- .../Pol01/include/SteppingAction.hh} | 48 +- .../polarisation/Pol01/plotResults.class | Bin 0 -> 2096 bytes .../polarisation/Pol01/plotResults.java | 93 + examples/extended/polarisation/Pol01/pol01.cc | 114 + examples/extended/polarisation/Pol01/pol01.in | 28 + .../extended/polarisation/Pol01/pol01.out | 177 + .../Pol01/src/DetectorConstruction.cc | 205 + .../Pol01/src/DetectorMessenger.cc | 106 + .../Pol01/src/EventAction.cc} | 94 +- .../Pol01/src/EventActionMessenger.cc} | 76 +- .../polarisation/Pol01/src/HistoManager.cc | 247 + .../polarisation/Pol01/src/HistoMessenger.cc | 134 + .../Pol01/src/PhysListEmPolarized.cc | 127 + .../Pol01/src/PhysListEmStandard.cc} | 48 +- .../polarisation/Pol01/src/PhysicsList.cc | 204 + .../Pol01/src/PhysicsListMessenger.cc | 119 + .../Pol01/src/PrimaryGeneratorAction.cc} | 74 +- .../polarisation/Pol01/src/RunAction.cc | 236 + .../polarisation/Pol01/src/StepMax.cc | 88 + .../Pol01/src/StepMaxMessenger.cc} | 57 +- .../Pol01/src/SteppingAction.cc} | 99 +- examples/extended/polarisation/Pol01/vis.mac | 35 + .../extended/radioactivedecay/exrdm/exrdm.out | 2 +- .../radioactivedecay/exrdm/macros/runall.log | 26 +- examples/extended/runAndEvent/RE01/History | 23 + examples/extended/runAndEvent/RE01/RE01.cc | 2 +- .../RE01/include/RE01BosonPhysics.hh | 2 +- .../RE01/include/RE01CalorimeterHit.hh | 2 +- .../include/RE01CalorimeterParametrisation.hh | 2 +- .../RE01/include/RE01CalorimeterROGeometry.hh | 2 +- .../RE01/include/RE01CalorimeterSD.hh | 2 +- .../RE01/include/RE01DecayPhysics.hh | 2 +- .../RE01/include/RE01DetectorConstruction.hh | 2 +- .../RE01/include/RE01DetectorParameterDef.hh | 2 +- .../runAndEvent/RE01/include/RE01DummySD.hh | 2 +- .../RE01/include/RE01EventAction.hh | 2 +- .../runAndEvent/RE01/include/RE01Field.hh | 2 +- .../RE01/include/RE01HadronPhysics.hh | 2 +- .../RE01/include/RE01IonPhysics.hh | 2 +- .../RE01/include/RE01LeptonPhysics.hh | 2 +- .../RE01/include/RE01PhysicsList.hh | 2 +- .../include/RE01PrimaryGeneratorAction.hh | 2 +- .../include/RE01PrimaryGeneratorMessenger.hh | 2 +- .../RE01/include/RE01RegionInformation.hh | 2 +- .../runAndEvent/RE01/include/RE01RunAction.hh | 2 +- .../RE01/include/RE01StackingAction.hh | 2 +- .../RE01/include/RE01SteppingAction.hh | 2 +- .../RE01/include/RE01TrackInformation.hh | 2 +- .../RE01/include/RE01TrackerHit.hh | 2 +- .../include/RE01TrackerParametrisation.hh | 2 +- .../runAndEvent/RE01/include/RE01TrackerSD.hh | 2 +- .../RE01/include/RE01TrackingAction.hh | 2 +- .../RE01/include/RE01Trajectory.hh | 2 +- examples/extended/runAndEvent/RE01/sample.out | 2 +- .../runAndEvent/RE01/src/RE01BosonPhysics.cc | 2 +- .../RE01/src/RE01CalorimeterHit.cc | 18 +- .../src/RE01CalorimeterParametrisation.cc | 2 +- .../RE01/src/RE01CalorimeterROGeometry.cc | 2 +- .../runAndEvent/RE01/src/RE01CalorimeterSD.cc | 12 +- .../runAndEvent/RE01/src/RE01DecayPhysics.cc | 2 +- .../RE01/src/RE01DetectorConstruction.cc | 2 +- .../RE01/src/RE01DetectorParameterDef.icc | 2 +- .../runAndEvent/RE01/src/RE01DummySD.cc | 2 +- .../runAndEvent/RE01/src/RE01EventAction.cc | 2 +- .../runAndEvent/RE01/src/RE01Field.cc | 2 +- .../runAndEvent/RE01/src/RE01HadronPhysics.cc | 2 +- .../runAndEvent/RE01/src/RE01IonPhysics.cc | 2 +- .../runAndEvent/RE01/src/RE01LeptonPhysics.cc | 2 +- .../runAndEvent/RE01/src/RE01PhysicsList.cc | 2 +- .../RE01/src/RE01PrimaryGeneratorAction.cc | 2 +- .../RE01/src/RE01PrimaryGeneratorMessenger.cc | 2 +- .../RE01/src/RE01RegionInformation.cc | 2 +- .../runAndEvent/RE01/src/RE01RunAction.cc | 2 +- .../RE01/src/RE01StackingAction.cc | 2 +- .../RE01/src/RE01SteppingAction.cc | 2 +- .../RE01/src/RE01TrackInformation.cc | 2 +- .../runAndEvent/RE01/src/RE01TrackerHit.cc | 26 +- .../RE01/src/RE01TrackerParametrisation.cc | 2 +- .../runAndEvent/RE01/src/RE01TrackerSD.cc | 2 +- .../RE01/src/RE01TrackingAction.cc | 2 +- .../runAndEvent/RE01/src/RE01Trajectory.cc | 2 +- examples/extended/runAndEvent/RE02/History | 8 +- examples/extended/runAndEvent/RE02/README | 77 +- .../extended/runAndEvent/RE02/exampleRE02.cc | 16 +- .../RE02/include/RE02DetectorConstruction.hh | 14 +- .../RE02/include/RE02EventAction.hh | 4 +- .../RE02NestedPhantomParameterisation.hh | 149 + .../RE02/include/RE02PSCellFlux.hh | 65 + .../RE02/include/RE02PSEnergyDeposit.hh | 56 + .../RE02/include/RE02PSFlatSurfaceCurrent.hh | 69 + .../RE02/include/RE02PSFlatSurfaceFlux.hh} | 78 +- .../runAndEvent/RE02/include/RE02PSNofStep.hh | 54 +- .../RE02/include/RE02PSPassageCellFlux.hh | 62 + .../include/RE02PhantomParameterisation.hh | 92 - .../include/RE02PrimaryGeneratorAction.hh | 4 +- .../runAndEvent/RE02/include/RE02Run.hh | 4 +- .../runAndEvent/RE02/include/RE02RunAction.hh | 8 +- examples/extended/runAndEvent/RE02/run.mac | 47 + examples/extended/runAndEvent/RE02/run1.log | 351 +- examples/extended/runAndEvent/RE02/run1.mac | 8 +- .../extended/runAndEvent/RE02/run1water.log | 1663 +++++ examples/extended/runAndEvent/RE02/run2.log | 445 +- examples/extended/runAndEvent/RE02/run2.mac | 6 +- examples/extended/runAndEvent/RE02/run3.log | 505 +- examples/extended/runAndEvent/RE02/run3.mac | 16 +- examples/extended/runAndEvent/RE02/run4.log | 457 +- examples/extended/runAndEvent/RE02/run4.mac | 16 +- .../RE02/src/RE02DetectorConstruction.cc | 147 +- .../runAndEvent/RE02/src/RE02EventAction.cc | 4 +- .../src/RE02NestedPhantomParameterisation.cc | 129 + .../runAndEvent/RE02/src/RE02PSCellFlux.cc | 73 + .../RE02/src/RE02PSEnergyDeposit.cc | 72 + .../RE02/src/RE02PSFlatSurfaceCurrent.cc | 74 + .../RE02/src/RE02PSFlatSurfaceFlux.cc | 74 + .../RE02/src/RE02PSNofStep.cc} | 83 +- .../RE02/src/RE02PSPassageCellFlux.cc | 73 + .../RE02/src/RE02PhantomParameterisation.cc | 75 - .../RE02/src/RE02PrimaryGeneratorAction.cc | 4 +- .../extended/runAndEvent/RE02/src/RE02Run.cc | 4 +- .../runAndEvent/RE02/src/RE02RunAction.cc | 4 +- .../visualization/perspective/History | 5 +- .../include/PerspectiveVisAction.hh | 2 +- .../include/PerspectiveVisActionMessenger.hh | 2 +- .../visualization/perspective/perspective.cc | 2 +- .../perspective/src/PerspectiveVisAction.cc | 2 +- .../src/PerspectiveVisActionMessenger.cc | 7 +- .../standalone/include/StandaloneVisAction.hh | 2 +- .../standalone/src/StandaloneVisAction.cc | 2 +- .../visualization/standalone/standalone.cc | 2 +- .../visualization/userVisAction/History | 5 +- .../include/UVA_ChamberParameterisation.hh | 2 +- .../include/UVA_DetectorConstruction.hh | 2 +- .../include/UVA_DetectorMessenger.hh | 2 +- .../userVisAction/include/UVA_EventAction.hh | 2 +- .../include/UVA_MagneticField.hh | 2 +- .../userVisAction/include/UVA_PhysicsList.hh | 2 +- .../include/UVA_PrimaryGeneratorAction.hh | 2 +- .../userVisAction/include/UVA_RunAction.hh | 2 +- .../include/UVA_SteppingAction.hh | 2 +- .../include/UVA_SteppingVerbose.hh | 2 +- .../userVisAction/include/UVA_TrackerHit.hh | 2 +- .../userVisAction/include/UVA_TrackerSD.hh | 2 +- .../userVisAction/include/UVA_VisAction.hh | 2 +- .../src/UVA_ChamberParameterisation.cc | 2 +- .../src/UVA_DetectorConstruction.cc | 2 +- .../src/UVA_DetectorMessenger.cc | 2 +- .../userVisAction/src/UVA_EventAction.cc | 2 +- .../userVisAction/src/UVA_MagneticField.cc | 2 +- .../userVisAction/src/UVA_PhysicsList.cc | 2 +- .../src/UVA_PrimaryGeneratorAction.cc | 6 +- .../userVisAction/src/UVA_RunAction.cc | 2 +- .../userVisAction/src/UVA_SteppingAction.cc | 2 +- .../userVisAction/src/UVA_SteppingVerbose.cc | 2 +- .../userVisAction/src/UVA_TrackerHit.cc | 2 +- .../userVisAction/src/UVA_TrackerSD.cc | 2 +- .../userVisAction/src/UVA_VisAction.cc | 2 +- .../userVisAction/userVisAction.cc | 2 +- examples/novice/N01/exampleN01.cc | 2 +- examples/novice/N01/exampleN01.out | 4 +- .../N01/include/ExN01DetectorConstruction.hh | 2 +- .../novice/N01/include/ExN01PhysicsList.hh | 2 +- .../include/ExN01PrimaryGeneratorAction.hh | 2 +- .../N01/src/ExN01DetectorConstruction.cc | 2 +- examples/novice/N01/src/ExN01PhysicsList.cc | 2 +- .../N01/src/ExN01PrimaryGeneratorAction.cc | 2 +- examples/novice/N02/History | 8 +- examples/novice/N02/exampleN02.cc | 2 +- examples/novice/N02/exampleN02.out | 3908 +++++------ .../include/ExN02ChamberParameterisation.hh | 2 +- .../N02/include/ExN02DetectorConstruction.hh | 2 +- .../N02/include/ExN02DetectorMessenger.hh | 2 +- .../novice/N02/include/ExN02EventAction.hh | 2 +- .../novice/N02/include/ExN02MagneticField.hh | 2 +- .../novice/N02/include/ExN02PhysicsList.hh | 2 +- .../include/ExN02PrimaryGeneratorAction.hh | 2 +- examples/novice/N02/include/ExN02RunAction.hh | 2 +- .../novice/N02/include/ExN02SteppingAction.hh | 2 +- .../N02/include/ExN02SteppingVerbose.hh | 2 +- .../novice/N02/include/ExN02TrackerHit.hh | 2 +- examples/novice/N02/include/ExN02TrackerSD.hh | 2 +- .../N02/src/ExN02ChamberParameterisation.cc | 2 +- .../N02/src/ExN02DetectorConstruction.cc | 2 +- .../novice/N02/src/ExN02DetectorMessenger.cc | 2 +- examples/novice/N02/src/ExN02EventAction.cc | 2 +- examples/novice/N02/src/ExN02MagneticField.cc | 2 +- examples/novice/N02/src/ExN02PhysicsList.cc | 2 +- .../N02/src/ExN02PrimaryGeneratorAction.cc | 2 +- examples/novice/N02/src/ExN02RunAction.cc | 2 +- .../novice/N02/src/ExN02SteppingAction.cc | 2 +- .../novice/N02/src/ExN02SteppingVerbose.cc | 2 +- examples/novice/N02/src/ExN02TrackerHit.cc | 2 +- examples/novice/N02/src/ExN02TrackerSD.cc | 2 +- examples/novice/N02/vis.mac | 16 +- examples/novice/N03/History | 33 +- examples/novice/N03/exampleN03.cc | 4 +- examples/novice/N03/exampleN03.out | 65 +- .../N03/include/ExN03DetectorConstruction.hh | 2 +- .../N03/include/ExN03DetectorMessenger.hh | 2 +- .../novice/N03/include/ExN03EventAction.hh | 6 +- .../N03/include/ExN03EventActionMessenger.hh | 6 +- .../novice/N03/include/ExN03PhysicsList.hh | 2 +- .../include/ExN03PrimaryGeneratorAction.hh | 2 +- .../include/ExN03PrimaryGeneratorMessenger.hh | 2 +- examples/novice/N03/include/ExN03RunAction.hh | 2 +- .../novice/N03/include/ExN03SteppingAction.hh | 2 +- .../N03/include/ExN03SteppingVerbose.hh | 2 +- .../N03/src/ExN03DetectorConstruction.cc | 2 +- .../novice/N03/src/ExN03DetectorMessenger.cc | 2 +- examples/novice/N03/src/ExN03EventAction.cc | 34 +- .../N03/src/ExN03EventActionMessenger.cc | 17 +- examples/novice/N03/src/ExN03PhysicsList.cc | 2 +- .../N03/src/ExN03PrimaryGeneratorAction.cc | 2 +- .../N03/src/ExN03PrimaryGeneratorMessenger.cc | 2 +- examples/novice/N03/src/ExN03RunAction.cc | 2 +- .../novice/N03/src/ExN03SteppingAction.cc | 2 +- .../novice/N03/src/ExN03SteppingVerbose.cc | 2 +- examples/novice/N03/vis.mac | 22 +- examples/novice/N03/visTutor/exN03Vis10.mac | 4 +- examples/novice/N03/visTutor/exN03Vis12.loop | 4 + examples/novice/N03/visTutor/exN03Vis12.mac | 97 + examples/novice/N03/visTutor/exN03Vis13.loop | 7 + examples/novice/N03/visTutor/exN03Vis13.mac | 70 + examples/novice/N04/GNUmakefile | 12 +- examples/novice/N04/History | 38 +- examples/novice/N04/README | 22 +- examples/novice/N04/exampleN04.EMtest.out | 42 +- examples/novice/N04/exampleN04.cc | 4 +- examples/novice/N04/exampleN04.out | 40 +- .../novice/N04/include/ExN04CalorimeterHit.hh | 5 + examples/novice/N04/include/ExN04MuonHit.hh | 5 + examples/novice/N04/include/ExN04RunAction.hh | 2 +- .../N04/include/ExN04SteppingVerbose.hh | 2 +- .../novice/N04/include/ExN04TrackerHit.hh | 5 + .../novice/N04/src/ExN04CalorimeterHit.cc | 38 +- .../N04/src/ExN04CalorimeterROGeometry.cc | 3 +- examples/novice/N04/src/ExN04CalorimeterSD.cc | 8 +- .../N04/src/ExN04DetectorConstruction.cc | 8 +- examples/novice/N04/src/ExN04MuonHit.cc | 27 +- examples/novice/N04/src/ExN04RunAction.cc | 2 +- .../novice/N04/src/ExN04SteppingVerbose.cc | 2 +- examples/novice/N04/src/ExN04TrackerHit.cc | 27 +- examples/novice/N04/vis.mac | 18 +- examples/novice/N05/History | 19 +- examples/novice/N05/exampleN05.cc | 40 +- examples/novice/N05/exampleN05.in | 22 +- examples/novice/N05/exampleN05.large_N.in | 10 +- examples/novice/N05/exampleN05.out | 4636 ++++++++++++- examples/novice/N05/exampleN05.ref | 5026 ++++++++++++++ .../novice/N05/include/ExN05CalorimeterHit.hh | 2 +- .../novice/N05/include/ExN05CalorimeterSD.hh | 2 +- .../N05/include/ExN05DetectorConstruction.hh | 22 +- .../novice/N05/include/ExN05EMShowerModel.hh | 2 +- .../novice/N05/include/ExN05EnergySpot.hh | 2 +- .../novice/N05/include/ExN05EventAction.hh | 2 +- .../N05/include/ExN05EventActionMessenger.hh | 2 +- .../N05/include/ExN05ParallelWorldForPion.hh} | 25 +- .../novice/N05/include/ExN05PhysicsList.hh | 2 +- examples/novice/N05/include/ExN05PiModel.hh | 2 +- .../N05/include/ExN05PionShowerModel.hh | 2 +- .../include/ExN05PrimaryGeneratorAction.hh | 2 +- examples/novice/N05/include/ExN05RunAction.hh | 2 +- .../novice/N05/include/ExN05SpecialCuts.hh | 102 - .../novice/N05/include/ExN05SteppingAction.hh | 2 +- .../include/ExN05SteppingActionMessenger.hh | 2 +- .../novice/N05/src/ExN05CalorimeterHit.cc | 2 +- examples/novice/N05/src/ExN05CalorimeterSD.cc | 18 +- .../N05/src/ExN05DetectorConstruction.cc | 132 +- .../novice/N05/src/ExN05DetectorMessenger.cc | 128 - examples/novice/N05/src/ExN05EMShowerModel.cc | 6 +- examples/novice/N05/src/ExN05EnergySpot.cc | 2 +- examples/novice/N05/src/ExN05EventAction.cc | 2 +- .../N05/src/ExN05EventActionMessenger.cc | 2 +- examples/novice/N05/src/ExN05MinEkineCuts.cc | 98 - examples/novice/N05/src/ExN05MinRangeCuts.cc | 95 - .../N05/src/ExN05ParallelWorldForPion.cc | 101 + examples/novice/N05/src/ExN05PhysicsList.cc | 62 +- examples/novice/N05/src/ExN05PiModel.cc | 2 +- .../novice/N05/src/ExN05PionShowerModel.cc | 9 +- .../N05/src/ExN05PrimaryGeneratorAction.cc | 2 +- examples/novice/N05/src/ExN05RunAction.cc | 2 +- examples/novice/N05/src/ExN05SpecialCuts.cc | 73 - .../novice/N05/src/ExN05SteppingAction.cc | 2 +- .../N05/src/ExN05SteppingActionMessenger.cc | 2 +- examples/novice/N06/History | 5 +- examples/novice/N06/exampleN06.cc | 2 +- examples/novice/N06/exampleN06.out | 1269 ++-- .../N06/include/ExN06DetectorConstruction.hh | 2 +- .../novice/N06/include/ExN06EventAction.hh | 2 +- .../novice/N06/include/ExN06PhysicsList.hh | 2 +- .../N06/include/ExN06PhysicsListMessenger.hh | 2 +- .../include/ExN06PrimaryGeneratorAction.hh | 2 +- .../include/ExN06PrimaryGeneratorMessenger.hh | 2 +- examples/novice/N06/include/ExN06RunAction.hh | 2 +- .../novice/N06/include/ExN06StackingAction.hh | 2 +- .../N06/include/ExN06SteppingVerbose.hh | 2 +- .../N06/src/ExN06DetectorConstruction.cc | 2 +- examples/novice/N06/src/ExN06EventAction.cc | 2 +- examples/novice/N06/src/ExN06PhysicsList.cc | 2 +- .../N06/src/ExN06PhysicsListMessenger.cc | 2 +- .../N06/src/ExN06PrimaryGeneratorMessenger.cc | 2 +- .../N06/src/ExN06PrimaryGeneratoraction.cc | 2 +- examples/novice/N06/src/ExN06RunAction.cc | 2 +- .../novice/N06/src/ExN06StackingAction.cc | 2 +- .../novice/N06/src/ExN06SteppingVerbose.cc | 2 +- examples/novice/N06/vis.mac | 9 +- examples/novice/N07/History | 5 +- examples/novice/N07/README | 45 +- examples/novice/N07/exampleN07.cc | 11 +- examples/novice/N07/exampleN07.out | 322 +- .../N07/include/ExN07DetectorConstruction.hh | 2 +- .../N07/include/ExN07DetectorMessenger.hh | 2 +- .../novice/N07/include/ExN07PhysicsList.hh | 2 +- .../include/ExN07PrimaryGeneratorAction.hh | 2 +- examples/novice/N07/include/ExN07Run.hh | 2 +- examples/novice/N07/include/ExN07RunAction.hh | 7 +- .../N07/include/ExN07SteppingVerbose.hh | 81 + .../N07/src/ExN07DetectorConstruction.cc | 2 +- .../novice/N07/src/ExN07DetectorMessenger.cc | 2 +- examples/novice/N07/src/ExN07PhysicsList.cc | 2 +- .../N07/src/ExN07PrimaryGeneratorAction.cc | 2 +- examples/novice/N07/src/ExN07Run.cc | 2 +- examples/novice/N07/src/ExN07RunAction.cc | 15 +- .../novice/N07/src/ExN07SteppingVerbose.cc | 150 + physics_lists/hadronic/FTFC/GNUmakefile | 2 - physics_lists/hadronic/FTFP/GNUmakefile | 2 - physics_lists/hadronic/GNUmakefile | 15 - .../hadronic/GNUmakefile.user.code.example | 89 - physics_lists/hadronic/History | 159 - physics_lists/hadronic/LBE/GNUmakefile | 2 - physics_lists/hadronic/LHEP/GNUmakefile | 2 - physics_lists/hadronic/LHEP_BERT/GNUmakefile | 2 - .../hadronic/LHEP_BERT_HP/GNUmakefile | 2 - physics_lists/hadronic/LHEP_BIC/GNUmakefile | 2 - .../hadronic/LHEP_BIC_HP/GNUmakefile | 2 - physics_lists/hadronic/LHEP_EMV/GNUmakefile | 2 - physics_lists/hadronic/LHEP_GN/GNUmakefile | 2 - physics_lists/hadronic/LHEP_HP/GNUmakefile | 2 - physics_lists/hadronic/LHEP_LEAD/GNUmakefile | 2 - .../hadronic/LHEP_LEAD_HP/GNUmakefile | 2 - physics_lists/hadronic/LHEP_PRECO/GNUmakefile | 2 - .../hadronic/LHEP_PRECO_HP/GNUmakefile | 2 - physics_lists/hadronic/Packaging/GNUmakefile | 2 - physics_lists/hadronic/QBBC/GNUmakefile | 2 - physics_lists/hadronic/QGSC/GNUmakefile | 2 - physics_lists/hadronic/QGSC_LEAD/GNUmakefile | 2 - .../hadronic/QGSC_LEAD_HP/GNUmakefile | 2 - physics_lists/hadronic/QGSP/GNUmakefile | 2 - physics_lists/hadronic/QGSP_BERT/GNUmakefile | 2 - .../hadronic/QGSP_BERT_HP/GNUmakefile | 2 - physics_lists/hadronic/QGSP_BIC/GNUmakefile | 2 - physics_lists/hadronic/QGSP_EMV/GNUmakefile | 2 - physics_lists/hadronic/QGSP_EMX/GNUmakefile | 2 - physics_lists/hadronic/QGSP_GN/GNUmakefile | 2 - physics_lists/hadronic/QGSP_HP/GNUmakefile | 2 - physics_lists/hadronic/README | 36 - source/GNUmakefile | 128 +- source/digits_hits/History | 5 +- .../detector/include/G4CellScoreComposer.hh | 2 +- .../detector/include/G4CellScoreValues.hh | 2 +- .../detector/include/G4CellStoreScorer.hh | 2 +- .../include/G4CollectionNameVector.hh | 2 +- .../digits_hits/detector/include/G4HCtable.hh | 2 +- .../include/G4MultiFunctionalDetector.hh | 2 +- .../detector/include/G4SDManager.hh | 2 +- .../detector/include/G4SDStructure.hh | 2 +- .../detector/include/G4SDmessenger.hh | 2 +- .../detector/include/G4SensitiveVolumeList.hh | 2 +- .../include/G4SensitiveVolumeList.icc | 2 +- .../detector/include/G4TrackLogger.hh | 2 +- .../detector/include/G4VPrimitiveScorer.hh | 2 +- .../detector/include/G4VReadOutGeometry.hh | 2 +- .../detector/include/G4VSDFilter.hh | 2 +- .../detector/include/G4VSensitiveDetector.hh | 2 +- .../detector/src/G4CellScoreComposer.cc | 2 +- .../detector/src/G4CellStoreScorer.cc | 2 +- source/digits_hits/detector/src/G4HCtable.cc | 2 +- .../detector/src/G4MultiFunctionalDetector.cc | 2 +- .../digits_hits/detector/src/G4SDManager.cc | 2 +- .../digits_hits/detector/src/G4SDStructure.cc | 2 +- .../digits_hits/detector/src/G4SDmessenger.cc | 2 +- .../detector/src/G4SensitiveVolumeList.cc | 2 +- .../digits_hits/detector/src/G4TrackLogger.cc | 2 +- .../detector/src/G4VPrimitiveScorer.cc | 2 +- .../detector/src/G4VReadOutGeometry.cc | 2 +- .../digits_hits/detector/src/G4VSDFilter.cc | 2 +- .../detector/src/G4VSensitiveDetector.cc | 2 +- .../digits/include/G4DCofThisEvent.hh | 2 +- .../digits/include/G4TDigiCollection.hh | 2 +- source/digits_hits/digits/include/G4VDigi.hh | 2 +- .../digits/include/G4VDigiCollection.hh | 2 +- .../digits_hits/digits/src/G4DCofThisEvent.cc | 2 +- .../digits/src/G4TDigiCollection.cc | 2 +- source/digits_hits/digits/src/G4VDigi.cc | 2 +- .../digits/src/G4VDigiCollection.cc | 2 +- .../hits/include/G4HCofThisEvent.hh | 2 +- .../hits/include/G4THitsCollection.hh | 2 +- source/digits_hits/hits/include/G4THitsMap.hh | 2 +- source/digits_hits/hits/include/G4VHit.hh | 2 +- .../hits/include/G4VHitsCollection.hh | 2 +- .../digits_hits/hits/src/G4HCofThisEvent.cc | 2 +- .../digits_hits/hits/src/G4THitsCollection.cc | 2 +- source/digits_hits/hits/src/G4VHit.cc | 2 +- .../digits_hits/hits/src/G4VHitsCollection.cc | 2 +- source/digits_hits/utils/History | 9 +- .../utils/include/G4PSCellCharge.hh | 62 +- .../digits_hits/utils/include/G4PSCellFlux.hh | 2 +- .../utils/include/G4PSDirectionFlag.hh | 2 +- .../utils/include/G4PSDoseDeposit.hh | 2 +- .../utils/include/G4PSEnergyDeposit.hh | 2 +- .../utils/include/G4PSFlatSurfaceCurrent.hh | 2 +- .../utils/include/G4PSFlatSurfaceFlux.hh | 2 +- .../utils/include/G4PSMinKinEAtGeneration.hh | 2 +- .../utils/include/G4PSNofSecondary.hh | 2 +- .../digits_hits/utils/include/G4PSNofStep.hh | 2 +- .../utils/include/G4PSPassageCellFlux.hh | 2 +- .../utils/include/G4PSPassageCurrent.hh | 2 +- .../utils/include/G4PSPassageTrackLength.hh | 2 +- .../utils/include/G4PSSphereSurfaceCurrent.hh | 2 +- .../utils/include/G4PSTrackLength.hh | 2 +- .../utils/include/G4SDChargedFilter.hh | 2 +- .../utils/include/G4SDKineticEnergyFilter.hh | 2 +- .../utils/include/G4SDNeutralFilter.hh | 2 +- .../utils/include/G4SDParticleFilter.hh | 2 +- .../include/G4SDParticleWithEnergyFilter.hh | 2 +- .../digits_hits/utils/src/G4PSCellCharge.cc | 105 + source/digits_hits/utils/src/G4PSCellFlux.cc | 2 +- .../digits_hits/utils/src/G4PSDoseDeposit.cc | 2 +- .../utils/src/G4PSEnergyDeposit.cc | 2 +- .../utils/src/G4PSFlatSurfaceCurrent.cc | 2 +- .../utils/src/G4PSFlatSurfaceFlux.cc | 2 +- .../utils/src/G4PSMinKinEAtGeneration.cc | 2 +- .../digits_hits/utils/src/G4PSNofSecondary.cc | 2 +- source/digits_hits/utils/src/G4PSNofStep.cc | 2 +- .../utils/src/G4PSPassageCellFlux.cc | 2 +- .../utils/src/G4PSPassageCurrent.cc | 2 +- .../utils/src/G4PSPassageTrackLength.cc | 2 +- .../utils/src/G4PSSphereSurfaceCurrent.cc | 2 +- .../digits_hits/utils/src/G4PSTrackLength.cc | 2 +- .../utils/src/G4SDChargedFilter.cc | 2 +- .../utils/src/G4SDKineticEnergyFilter.cc | 2 +- .../utils/src/G4SDNeutralFilter.cc | 2 +- .../utils/src/G4SDParticleFilter.cc | 2 +- .../utils/src/G4SDParticleWithEnergyFilter.cc | 2 +- source/event/History | 14 +- source/event/include/G4CellScorer.hh | 2 +- source/event/include/G4CellScorerStore.hh | 2 +- .../include/G4ClassificationOfNewTrack.hh | 2 +- source/event/include/G4EvManMessenger.hh | 5 +- source/event/include/G4Event.hh | 29 +- source/event/include/G4EventManager.hh | 8 +- .../event/include/G4GeneralParticleSource.hh | 6 + .../G4GeneralParticleSourceMessenger.hh | 1 + source/event/include/G4HEPEvtInterface.hh | 2 +- source/event/include/G4HEPEvtParticle.hh | 2 +- source/event/include/G4ParticleGun.hh | 2 +- .../event/include/G4ParticleGunMessenger.hh | 2 +- source/event/include/G4PrimaryTransformer.hh | 2 +- source/event/include/G4RayShooter.hh | 2 +- source/event/include/G4SPSRandomGenerator.hh | 6 +- source/event/include/G4ScoreTable.hh | 2 +- source/event/include/G4Scorer.hh | 2 +- source/event/include/G4StackChecker.hh | 2 +- source/event/include/G4StackManager.hh | 2 +- source/event/include/G4StackedTrack.hh | 2 +- source/event/include/G4StackingMessenger.hh | 2 +- source/event/include/G4TrackStack.hh | 2 +- source/event/include/G4TrajectoryContainer.hh | 2 +- source/event/include/G4UserEventAction.hh | 2 +- source/event/include/G4UserStackingAction.hh | 2 +- source/event/include/G4VPrimaryGenerator.hh | 2 +- .../event/include/G4VUserEventInformation.hh | 2 +- source/event/include/eventgendefs.hh | 2 +- source/event/include/evmandefs.hh | 2 +- source/event/include/trajectoryControl.hh | 2 +- source/event/src/G4CellScorer.cc | 2 +- source/event/src/G4CellScorerStore.cc | 2 +- source/event/src/G4EvManMessenger.cc | 14 +- source/event/src/G4Event.cc | 8 +- source/event/src/G4EventManager.cc | 13 +- source/event/src/G4GeneralParticleSource.cc | 32 +- .../src/G4GeneralParticleSourceMessenger.cc | 11 + source/event/src/G4HEPEvtInterface.cc | 2 +- source/event/src/G4HEPEvtParticle.cc | 2 +- source/event/src/G4ParticleGun.cc | 2 +- source/event/src/G4ParticleGunMessenger.cc | 2 +- source/event/src/G4PrimaryTransformer.cc | 2 +- source/event/src/G4RayShooter.cc | 2 +- source/event/src/G4SPSEneDistribution.cc | 1 + source/event/src/G4SPSRandomGenerator.cc | 2 +- source/event/src/G4ScoreTable.cc | 2 +- source/event/src/G4Scorer.cc | 2 +- source/event/src/G4StackChecker.cc | 2 +- source/event/src/G4StackManager.cc | 2 +- source/event/src/G4StackedTrack.cc | 2 +- source/event/src/G4StackingMessenger.cc | 2 +- source/event/src/G4TrackStack.cc | 2 +- source/event/src/G4TrajectoryContainer.cc | 2 +- source/event/src/G4UserEventAction.cc | 2 +- source/event/src/G4UserStackingAction.cc | 2 +- source/event/src/G4VPrimaryGenerator.cc | 2 +- source/g3tog4/include/G3DetTable.hh | 2 +- source/g3tog4/include/G3DetTableEntry.hh | 2 +- source/g3tog4/include/G3Division.hh | 2 +- source/g3tog4/include/G3EleTable.hh | 2 +- source/g3tog4/include/G3G4Interface.hh | 2 +- source/g3tog4/include/G3MatTable.hh | 2 +- source/g3tog4/include/G3MatTableEntry.hh | 2 +- source/g3tog4/include/G3MedTable.hh | 2 +- source/g3tog4/include/G3MedTableEntry.hh | 2 +- source/g3tog4/include/G3PartTable.hh | 2 +- source/g3tog4/include/G3Pos.hh | 2 +- source/g3tog4/include/G3RotTable.hh | 2 +- source/g3tog4/include/G3RotTableEntry.hh | 2 +- source/g3tog4/include/G3SensVolVector.hh | 2 +- source/g3tog4/include/G3VolTable.hh | 2 +- source/g3tog4/include/G3VolTableEntry.hh | 2 +- source/g3tog4/include/G3toG4.hh | 2 +- source/g3tog4/include/G3toG4.inc | 2 +- source/g3tog4/include/G3toG4BuildTree.hh | 2 +- source/g3tog4/include/G3toG4MANY.hh | 2 +- source/g3tog4/include/G3toG4MakeSolid.hh | 2 +- source/g3tog4/include/G3toG4RotationMatrix.hh | 2 +- source/g3tog4/include/gcbank.inc | 2 +- source/g3tog4/src/G3DetTable.cc | 2 +- source/g3tog4/src/G3DetTableEntry.cc | 2 +- source/g3tog4/src/G3Division.cc | 2 +- source/g3tog4/src/G3EleTable.cc | 2 +- source/g3tog4/src/G3MatTable.cc | 2 +- source/g3tog4/src/G3MatTableEntry.cc | 2 +- source/g3tog4/src/G3MedTable.cc | 2 +- source/g3tog4/src/G3MedTableEntry.cc | 2 +- source/g3tog4/src/G3NegVolPars.cc | 2 +- source/g3tog4/src/G3PartTable.cc | 2 +- source/g3tog4/src/G3Pos.cc | 2 +- source/g3tog4/src/G3RotTable.cc | 2 +- source/g3tog4/src/G3RotTableEntry.cc | 2 +- source/g3tog4/src/G3VolTable.cc | 2 +- source/g3tog4/src/G3VolTableEntry.cc | 2 +- source/g3tog4/src/G3fillParams.cc.archive | 2 +- source/g3tog4/src/G3toG4BuildTree.cc | 2 +- source/g3tog4/src/G3toG4MANY.cc | 2 +- source/g3tog4/src/G3toG4MakeSolid.cc | 2 +- source/g3tog4/src/G3toG4RotationMatrix.cc | 2 +- source/g3tog4/src/G4BuildGeom.cc | 2 +- source/g3tog4/src/G4ggclos.cc | 2 +- source/g3tog4/src/G4gsatt.cc | 2 +- source/g3tog4/src/G4gsbool.cc | 2 +- source/g3tog4/src/G4gsdet.cc | 2 +- source/g3tog4/src/G4gsdeta.cc | 2 +- source/g3tog4/src/G4gsdetd.cc | 2 +- source/g3tog4/src/G4gsdeth.cc | 2 +- source/g3tog4/src/G4gsdetu.cc | 2 +- source/g3tog4/src/G4gsdetv.cc | 2 +- source/g3tog4/src/G4gsdk.cc | 2 +- source/g3tog4/src/G4gsdvn.cc | 2 +- source/g3tog4/src/G4gsdvn2.cc | 2 +- source/g3tog4/src/G4gsdvt.cc | 2 +- source/g3tog4/src/G4gsdvt2.cc | 2 +- source/g3tog4/src/G4gsdvx.cc | 2 +- source/g3tog4/src/G4gsmate.cc | 2 +- source/g3tog4/src/G4gsmixt.cc | 2 +- source/g3tog4/src/G4gspart.cc | 2 +- source/g3tog4/src/G4gspos.cc | 2 +- source/g3tog4/src/G4gsposp.cc | 2 +- source/g3tog4/src/G4gsrotm.cc | 2 +- source/g3tog4/src/G4gstmed.cc | 2 +- source/g3tog4/src/G4gstpar.cc | 2 +- source/g3tog4/src/G4gsvolu.cc | 2 +- source/g3tog4/src/clparse.cc | 2 +- source/g3tog4/src/g3routines.F | 2 +- source/g3tog4/src/g3test.F.main | 2 +- source/g3tog4/src/g3tog4.F | 2 +- source/g3tog4/src/g4geom.cc.main | 2 +- source/g3tog4/src/jshape.F | 2 +- source/g3tog4/src/mztog4.F | 2 +- source/g3tog4/src/rztog4.F | 2 +- source/g3tog4/src/tog4.F | 2 +- .../biasing/include/G4GeometryCell.hh | 2 +- .../biasing/include/G4GeometryCellComp.hh | 2 +- .../include/G4GeometryCellImportance.hh | 2 +- .../biasing/include/G4GeometryCellStep.hh | 2 +- .../include/G4GeometryCellStepStream.hh | 2 +- .../biasing/include/G4GeometryCellWeight.hh | 2 +- source/geometry/biasing/include/G4IStore.hh | 2 +- .../biasing/include/G4ImportanceAlgorithm.hh | 2 +- .../include/G4ImportanceSplitExaminer.hh | 2 +- .../biasing/include/G4Nsplit_Weight.hh | 2 +- .../biasing/include/G4ParallelNavigator.hh | 2 +- .../biasing/include/G4ParallelStepper.hh | 2 +- .../biasing/include/G4ParallelWorld.hh | 2 +- .../geometry/biasing/include/G4VCellScorer.hh | 2 +- .../biasing/include/G4VCellScorerStore.hh | 2 +- .../biasing/include/G4VGCellFinder.hh | 2 +- source/geometry/biasing/include/G4VIStore.hh | 2 +- .../biasing/include/G4VImportanceAlgorithm.hh | 2 +- .../include/G4VImportanceSplitExaminer.hh | 2 +- .../geometry/biasing/include/G4VPGeoDriver.hh | 2 +- .../biasing/include/G4VParallelStepper.hh | 2 +- source/geometry/biasing/include/G4VScorer.hh | 2 +- .../include/G4VWeightWindowAlgorithm.hh | 2 +- .../include/G4VWeightWindowExaminer.hh | 2 +- .../biasing/include/G4VWeightWindowStore.hh | 2 +- .../include/G4WeightWindowAlgorithm.hh | 2 +- .../biasing/include/G4WeightWindowExaminer.hh | 2 +- .../biasing/include/G4WeightWindowStore.hh | 2 +- source/geometry/biasing/src/G4GeometryCell.cc | 2 +- .../biasing/src/G4GeometryCellComp.cc | 2 +- .../biasing/src/G4GeometryCellImportance.cc | 2 +- .../biasing/src/G4GeometryCellStep.cc | 2 +- .../biasing/src/G4GeometryCellStepStream.cc | 2 +- source/geometry/biasing/src/G4IStore.cc | 2 +- .../biasing/src/G4ImportanceAlgorithm.cc | 2 +- .../biasing/src/G4ImportanceSplitExaminer.cc | 2 +- .../geometry/biasing/src/G4Nsplit_Weight.cc | 2 +- .../biasing/src/G4ParallelNavigator.cc | 2 +- .../geometry/biasing/src/G4ParallelStepper.cc | 2 +- .../geometry/biasing/src/G4ParallelWorld.cc | 2 +- source/geometry/biasing/src/G4VCellScorer.cc | 2 +- .../biasing/src/G4VCellScorerStore.cc | 2 +- source/geometry/biasing/src/G4VGCellFinder.cc | 2 +- source/geometry/biasing/src/G4VIStore.cc | 2 +- .../biasing/src/G4VImportanceAlgorithm.cc | 2 +- .../biasing/src/G4VImportanceSplitExaminer.cc | 2 +- source/geometry/biasing/src/G4VPGeoDriver.cc | 2 +- .../biasing/src/G4VParallelStepper.cc | 2 +- source/geometry/biasing/src/G4VScorer.cc | 2 +- .../biasing/src/G4VWeightWindowAlgorithm.cc | 2 +- .../biasing/src/G4VWeightWindowExaminer.cc | 2 +- .../biasing/src/G4VWeightWindowStore.cc | 2 +- .../biasing/src/G4WeightWindowAlgorithm.cc | 2 +- .../biasing/src/G4WeightWindowExaminer.cc | 2 +- .../biasing/src/G4WeightWindowStore.cc | 2 +- .../divisions/include/G4PVDivision.hh | 2 +- .../divisions/include/G4PVDivisionFactory.hh | 2 +- .../include/G4ParameterisationBox.hh | 2 +- .../include/G4ParameterisationCons.hh | 2 +- .../include/G4ParameterisationPara.hh | 2 +- .../include/G4ParameterisationPolycone.hh | 2 +- .../include/G4ParameterisationPolyhedra.hh | 2 +- .../include/G4ParameterisationTrd.hh | 2 +- .../include/G4ParameterisationTubs.hh | 2 +- .../include/G4VDivisionParameterisation.hh | 2 +- .../include/G4VDivisionParameterisation.icc | 2 +- source/geometry/divisions/src/G4PVDivision.cc | 2 +- .../divisions/src/G4PVDivisionFactory.cc | 2 +- .../divisions/src/G4ParameterisationBox.cc | 2 +- .../divisions/src/G4ParameterisationCons.cc | 2 +- .../divisions/src/G4ParameterisationPara.cc | 2 +- .../src/G4ParameterisationPolycone.cc | 2 +- .../src/G4ParameterisationPolyhedra.cc | 2 +- .../divisions/src/G4ParameterisationTrd.cc | 2 +- .../divisions/src/G4ParameterisationTubs.cc | 2 +- .../src/G4VDivisionParameterisation.cc | 2 +- source/geometry/magneticfield/History | 16 +- .../magneticfield/include/G4CashKarpRKF45.hh | 2 +- .../magneticfield/include/G4ChordFinder.hh | 2 +- .../magneticfield/include/G4ChordFinder.icc | 2 +- .../magneticfield/include/G4ChordFinderSaf.hh | 2 +- .../magneticfield/include/G4ClassicalRK4.hh | 2 +- .../magneticfield/include/G4DELPHIMagField.hh | 2 +- .../magneticfield/include/G4ElectricField.hh | 2 +- .../include/G4ElectroMagneticField.hh | 2 +- .../include/G4EqMagElectricField.hh | 2 +- .../include/G4EquationOfMotion.hh | 2 +- .../include/G4EquationOfMotion.icc | 2 +- .../include/G4ExactHelixStepper.hh | 2 +- .../magneticfield/include/G4ExplicitEuler.hh | 2 +- .../geometry/magneticfield/include/G4Field.hh | 2 +- .../magneticfield/include/G4FieldManager.hh | 2 +- .../magneticfield/include/G4FieldManager.icc | 2 +- .../magneticfield/include/G4FieldTrack.hh | 103 +- .../magneticfield/include/G4FieldTrack.icc | 10 +- .../include/G4HarmonicPolMagField.hh | 2 +- .../include/G4HelixExplicitEuler.hh | 2 +- .../magneticfield/include/G4HelixHeum.hh | 2 +- .../include/G4HelixImplicitEuler.hh | 2 +- .../include/G4HelixSimpleRunge.hh | 2 +- .../magneticfield/include/G4ImplicitEuler.hh | 2 +- .../include/G4LineCurrentMagField.hh | 2 +- .../magneticfield/include/G4LineSection.hh | 2 +- .../include/G4MagErrorStepper.hh | 2 +- .../include/G4MagErrorStepper.icc | 2 +- .../include/G4MagHelicalStepper.hh | 2 +- .../include/G4MagHelicalStepper.icc | 2 +- .../include/G4MagIntegratorDriver.hh | 2 +- .../include/G4MagIntegratorDriver.icc | 2 +- .../include/G4MagIntegratorStepper.hh | 2 +- .../include/G4MagIntegratorStepper.icc | 2 +- .../magneticfield/include/G4Mag_EqRhs.hh | 2 +- .../magneticfield/include/G4Mag_SpinEqRhs.hh | 2 +- .../magneticfield/include/G4Mag_UsualEqRhs.hh | 2 +- .../magneticfield/include/G4MagneticField.hh | 2 +- .../include/G4QuadrupoleMagField.hh | 2 +- .../magneticfield/include/G4RKG3_Stepper.hh | 2 +- .../magneticfield/include/G4SimpleHeum.hh | 2 +- .../magneticfield/include/G4SimpleRunge.hh | 2 +- .../include/G4UniformElectricField.hh | 2 +- .../include/G4UniformMagField.hh | 2 +- .../magneticfield/src/G4CashKarpRKF45.cc | 2 +- .../magneticfield/src/G4ChordFinder.cc | 2 +- .../magneticfield/src/G4ClassicalRK4.cc | 2 +- .../magneticfield/src/G4DELPHIMagField.cc | 2 +- .../magneticfield/src/G4ElectricField.cc | 2 +- .../src/G4ElectroMagneticField.cc | 2 +- .../magneticfield/src/G4EqMagElectricField.cc | 2 +- .../magneticfield/src/G4EquationOfMotion.cc | 2 +- .../magneticfield/src/G4ExactHelixStepper.cc | 2 +- .../magneticfield/src/G4ExplicitEuler.cc | 2 +- .../magneticfield/src/G4FieldManager.cc | 2 +- .../magneticfield/src/G4FieldTrack.cc | 2 +- .../src/G4HarmonicPolMagField.cc | 2 +- .../magneticfield/src/G4HelixExplicitEuler.cc | 2 +- .../geometry/magneticfield/src/G4HelixHeum.cc | 2 +- .../magneticfield/src/G4HelixImplicitEuler.cc | 2 +- .../magneticfield/src/G4HelixSimpleRunge.cc | 2 +- .../magneticfield/src/G4ImplicitEuler.cc | 2 +- .../src/G4LineCurrentMagField.cc | 2 +- .../magneticfield/src/G4LineSection.cc | 2 +- .../magneticfield/src/G4MagErrorStepper.cc | 2 +- .../magneticfield/src/G4MagHelicalStepper.cc | 2 +- .../src/G4MagIntegratorDriver.cc | 2 +- .../src/G4MagIntegratorStepper.cc | 2 +- .../geometry/magneticfield/src/G4Mag_EqRhs.cc | 2 +- .../magneticfield/src/G4Mag_SpinEqRhs.cc | 2 +- .../magneticfield/src/G4Mag_UsualEqRhs.cc | 2 +- .../magneticfield/src/G4MagneticField.cc | 2 +- .../magneticfield/src/G4QuadrupoleMagField.cc | 2 +- .../magneticfield/src/G4RKG3_Stepper.cc | 2 +- .../magneticfield/src/G4SimpleHeum.cc | 2 +- .../magneticfield/src/G4SimpleRunge.cc | 2 +- .../src/G4UniformElectricField.cc | 2 +- .../magneticfield/src/G4UniformMagField.cc | 2 +- source/geometry/management/History | 40 +- .../management/include/G4AffineTransform.hh | 2 +- .../management/include/G4AffineTransform.icc | 2 +- .../management/include/G4BlockingList.hh | 2 +- .../management/include/G4BlockingList.icc | 2 +- .../management/include/G4GeometryManager.hh | 2 +- .../include/G4IdentityTrajectoryFilter.hh | 2 +- .../management/include/G4LogicalSurface.hh | 2 +- .../management/include/G4LogicalSurface.icc | 2 +- .../management/include/G4LogicalVolume.hh | 2 +- .../management/include/G4LogicalVolume.icc | 2 +- .../include/G4LogicalVolumeStore.hh | 2 +- .../include/G4PhysicalVolumeStore.hh | 2 +- .../management/include/G4ReflectedSolid.hh | 2 +- .../geometry/management/include/G4Region.hh | 2 +- .../geometry/management/include/G4Region.icc | 2 +- .../management/include/G4RegionStore.hh | 10 +- .../management/include/G4SmartVoxelHeader.hh | 2 +- .../management/include/G4SmartVoxelHeader.icc | 2 +- .../management/include/G4SmartVoxelNode.hh | 2 +- .../management/include/G4SmartVoxelNode.icc | 2 +- .../management/include/G4SmartVoxelProxy.hh | 2 +- .../management/include/G4SmartVoxelProxy.icc | 2 +- .../management/include/G4SmartVoxelStat.hh | 2 +- .../management/include/G4SolidStore.hh | 2 +- .../management/include/G4TouchableHandle.hh | 2 +- .../include/G4VCurvedTrajectoryFilter.hh | 2 +- .../include/G4VNestedParameterisation.hh | 2 +- .../include/G4VPVDivisionFactory.hh | 2 +- .../include/G4VPVParameterisation.hh | 2 +- .../management/include/G4VPhysicalVolume.hh | 10 +- .../management/include/G4VPhysicalVolume.icc | 2 +- .../geometry/management/include/G4VSolid.hh | 16 +- .../geometry/management/include/G4VSolid.icc | 2 +- .../management/include/G4VStoreNotifier.hh | 2 +- .../management/include/G4VTouchable.hh | 2 +- .../management/include/G4VTouchable.icc | 2 +- .../include/G4VUserRegionInformation.hh | 2 +- .../include/G4VVolumeMaterialScanner.hh | 2 +- .../management/include/G4VoxelLimits.hh | 2 +- .../management/include/G4VoxelLimits.icc | 2 +- .../geometry/management/include/meshdefs.hh | 2 +- .../geometry/management/include/voxeldefs.hh | 2 +- .../geometry/management/src/G4BlockingList.cc | 2 +- .../management/src/G4GeometryManager.cc | 2 +- .../src/G4IdentityTrajectoryFilter.cc | 7 +- .../management/src/G4LogicalVolume.cc | 10 +- .../management/src/G4LogicalVolumeStore.cc | 16 +- .../management/src/G4PhysicalVolumeStore.cc | 17 +- .../management/src/G4ReflectedSolid.cc | 25 +- source/geometry/management/src/G4Region.cc | 8 +- .../geometry/management/src/G4RegionStore.cc | 42 +- .../management/src/G4SmartVoxelHeader.cc | 2 +- .../management/src/G4SmartVoxelNode.cc | 2 +- .../management/src/G4SmartVoxelProxy.cc | 2 +- .../management/src/G4SmartVoxelStat.cc | 2 +- .../geometry/management/src/G4SolidStore.cc | 18 +- .../src/G4VCurvedTrajectoryFilter.cc | 2 +- .../src/G4VNestedParameterisation.cc | 2 +- .../management/src/G4VPVDivisionFactory.cc | 2 +- .../management/src/G4VPVParameterisation.cc | 2 +- .../management/src/G4VPhysicalVolume.cc | 12 +- source/geometry/management/src/G4VSolid.cc | 83 +- .../geometry/management/src/G4VoxelLimits.cc | 2 +- source/geometry/navigation/History | 158 +- .../include/G4AuxiliaryNavServices.hh | 2 +- .../include/G4AuxiliaryNavServices.icc | 2 +- .../navigation/include/G4DrawVoxels.hh | 2 +- .../navigation/include/G4GeomTestErrorList.hh | 2 +- .../navigation/include/G4GeomTestLogger.hh | 2 +- .../include/G4GeomTestOverlapList.hh | 2 +- .../include/G4GeomTestOvershootList.hh | 2 +- .../navigation/include/G4GeomTestPoint.hh | 2 +- .../navigation/include/G4GeomTestSegment.hh | 2 +- .../include/G4GeomTestStreamLogger.hh | 2 +- .../navigation/include/G4GeomTestVolPoint.hh | 2 +- .../navigation/include/G4GeomTestVolume.hh | 2 +- .../navigation/include/G4GeometryMessenger.hh | 2 +- .../navigation/include/G4MultiNavigator.hh | 183 + .../navigation/include/G4Navigator.hh | 81 +- .../navigation/include/G4Navigator.icc | 55 +- .../navigation/include/G4NormalNavigation.hh | 2 +- .../navigation/include/G4NormalNavigation.icc | 2 +- .../include/G4ParameterisedNavigation.hh | 2 +- .../include/G4ParameterisedNavigation.icc | 2 +- .../navigation/include/G4PathFinder.hh | 240 + .../navigation/include/G4PropagatorInField.hh | 6 +- .../include/G4PropagatorInField.icc | 15 +- .../navigation/include/G4ReplicaNavigation.hh | 2 +- .../include/G4ReplicaNavigation.icc | 2 +- .../navigation/include/G4SafetyHelper.hh | 96 + .../include/G4TransportationManager.hh | 12 +- .../include/G4TransportationManager.icc | 43 +- .../navigation/include/G4VoxelNavigation.hh | 2 +- .../navigation/include/G4VoxelNavigation.icc | 2 +- .../navigation/src/G4AuxiliaryNavServices.cc | 2 +- .../geometry/navigation/src/G4DrawVoxels.cc | 2 +- .../navigation/src/G4GeomTestErrorList.cc | 2 +- .../navigation/src/G4GeomTestOverlapList.cc | 2 +- .../navigation/src/G4GeomTestOvershootList.cc | 2 +- .../navigation/src/G4GeomTestPoint.cc | 2 +- .../navigation/src/G4GeomTestSegment.cc | 2 +- .../navigation/src/G4GeomTestStreamLogger.cc | 2 +- .../navigation/src/G4GeomTestVolPoint.cc | 2 +- .../navigation/src/G4GeomTestVolume.cc | 2 +- .../navigation/src/G4GeometryMessenger.cc | 2 +- .../navigation/src/G4MultiNavigator.cc | 700 ++ source/geometry/navigation/src/G4Navigator.cc | 78 +- .../navigation/src/G4NormalNavigation.cc | 2 +- .../src/G4ParameterisedNavigation.cc | 2 +- .../geometry/navigation/src/G4PathFinder.cc | 1041 +++ .../navigation/src/G4PropagatorInField.cc | 775 ++- .../navigation/src/G4ReplicaNavigation.cc | 2 +- .../geometry/navigation/src/G4SafetyHelper.cc | 153 + .../navigation/src/G4TransportationManager.cc | 2 +- .../navigation/src/G4VoxelNavigation.cc | 2 +- source/geometry/solids/BREPS/History | 6 +- .../solids/BREPS/include/G4Assembly.hh | 2 +- .../solids/BREPS/include/G4Assembly.icc | 2 +- .../BREPS/include/G4Axis2Placement3D.hh | 2 +- .../BREPS/include/G4Axis2Placement3D.icc | 2 +- .../solids/BREPS/include/G4BREPSolid.hh | 20 +- .../solids/BREPS/include/G4BREPSolid.icc | 43 +- .../solids/BREPS/include/G4BREPSolidBox.hh | 2 +- .../solids/BREPS/include/G4BREPSolidCone.hh | 2 +- .../BREPS/include/G4BREPSolidCylinder.hh | 2 +- .../BREPS/include/G4BREPSolidOpenPCone.hh | 2 +- .../solids/BREPS/include/G4BREPSolidPCone.hh | 2 +- .../BREPS/include/G4BREPSolidPolyhedra.hh | 2 +- .../solids/BREPS/include/G4BREPSolidSphere.hh | 2 +- .../solids/BREPS/include/G4BREPSolidTorus.hh | 2 +- .../solids/BREPS/include/G4BSplineCurve.hh | 2 +- .../solids/BREPS/include/G4BSplineCurve.icc | 2 +- .../BREPS/include/G4BSplineCurveWithKnots.hh | 2 +- .../solids/BREPS/include/G4BSplineSurface.hh | 2 +- .../solids/BREPS/include/G4BSplineSurface.icc | 2 +- .../include/G4BSplineSurfaceWithKnots.hh | 2 +- .../solids/BREPS/include/G4BezierSurface.hh | 2 +- .../solids/BREPS/include/G4BezierSurface.icc | 2 +- .../solids/BREPS/include/G4BoundingBox3D.hh | 2 +- .../solids/BREPS/include/G4BoundingBox3D.icc | 2 +- .../solids/BREPS/include/G4CircularCurve.hh | 2 +- .../solids/BREPS/include/G4CircularCurve.icc | 2 +- .../solids/BREPS/include/G4CompositeCurve.hh | 2 +- .../solids/BREPS/include/G4CompositeCurve.icc | 2 +- .../geometry/solids/BREPS/include/G4Conic.hh | 2 +- .../geometry/solids/BREPS/include/G4Conic.icc | 2 +- .../solids/BREPS/include/G4ConicalSurface.hh | 2 +- .../solids/BREPS/include/G4ConicalSurface.icc | 2 +- .../solids/BREPS/include/G4ControlPoints.hh | 2 +- .../solids/BREPS/include/G4ControlPoints.icc | 2 +- .../solids/BREPS/include/G4ConvexHull.hh | 2 +- .../geometry/solids/BREPS/include/G4Curve.hh | 2 +- .../geometry/solids/BREPS/include/G4Curve.icc | 2 +- .../solids/BREPS/include/G4CurvePoint.hh | 2 +- .../solids/BREPS/include/G4CurvePoint.icc | 2 +- .../BREPS/include/G4CurveRayIntersection.hh | 2 +- .../BREPS/include/G4CurveRayIntersection.icc | 2 +- .../solids/BREPS/include/G4CurveVector.hh | 2 +- .../BREPS/include/G4CylindricalSurface.hh | 2 +- .../BREPS/include/G4CylindricalSurface.icc | 2 +- .../solids/BREPS/include/G4Ellipse.hh | 2 +- .../solids/BREPS/include/G4Ellipse.icc | 2 +- .../solids/BREPS/include/G4FConicalSurface.hh | 2 +- .../BREPS/include/G4FConicalSurface.icc | 2 +- .../BREPS/include/G4FCylindricalSurface.hh | 2 +- .../BREPS/include/G4FCylindricalSurface.icc | 2 +- .../geometry/solids/BREPS/include/G4FPlane.hh | 2 +- .../solids/BREPS/include/G4FPlane.icc | 2 +- .../solids/BREPS/include/G4Globals.hh | 2 +- .../solids/BREPS/include/G4Hyperbola.hh | 2 +- .../solids/BREPS/include/G4Hyperbola.icc | 2 +- .../solids/BREPS/include/G4KnotVector.hh | 2 +- .../solids/BREPS/include/G4KnotVector.icc | 2 +- .../geometry/solids/BREPS/include/G4Line.hh | 2 +- .../geometry/solids/BREPS/include/G4Line.icc | 2 +- .../solids/BREPS/include/G4OsloMatrix.hh | 2 +- .../solids/BREPS/include/G4OsloMatrix.icc | 2 +- .../solids/BREPS/include/G4Parabola.hh | 2 +- .../solids/BREPS/include/G4Parabola.icc | 2 +- .../solids/BREPS/include/G4PlacedSolid.hh | 2 +- .../solids/BREPS/include/G4PlacedSolid.icc | 2 +- .../solids/BREPS/include/G4PlacementVector.hh | 2 +- .../geometry/solids/BREPS/include/G4Plane.hh | 2 +- .../solids/BREPS/include/G4Point3DVector.hh | 2 +- .../solids/BREPS/include/G4PointRat.hh | 2 +- .../solids/BREPS/include/G4PointRat.icc | 2 +- .../BREPS/include/G4ProjectedSurface.hh | 2 +- .../BREPS/include/G4ProjectedSurface.icc | 2 +- source/geometry/solids/BREPS/include/G4Ray.hh | 2 +- .../geometry/solids/BREPS/include/G4Ray.icc | 2 +- .../include/G4RectangularTrimmedSurface.hh | 2 +- .../solids/BREPS/include/G4STEPEntity.hh | 2 +- .../geometry/solids/BREPS/include/G4Sort.hh | 2 +- .../BREPS/include/G4SphericalSurface.hh | 2 +- .../BREPS/include/G4SphericalSurface.icc | 2 +- .../solids/BREPS/include/G4Surface.hh | 2 +- .../solids/BREPS/include/G4Surface.icc | 2 +- .../solids/BREPS/include/G4SurfaceBoundary.hh | 2 +- .../BREPS/include/G4SurfaceBoundary.icc | 2 +- .../solids/BREPS/include/G4SurfaceList.hh | 2 +- .../include/G4SurfaceOfLinearExtrusion.hh | 2 +- .../BREPS/include/G4SurfaceOfRevolution.hh | 2 +- .../solids/BREPS/include/G4ThreeMat.hh | 2 +- .../solids/BREPS/include/G4ToroidalSurface.hh | 2 +- .../BREPS/include/G4ToroidalSurface.icc | 2 +- .../geometry/solids/BREPS/include/G4UVHit.hh | 2 +- .../geometry/solids/BREPS/src/G4Assembly.cc | 2 +- .../solids/BREPS/src/G4Axis2Placement3D.cc | 2 +- .../geometry/solids/BREPS/src/G4BREPSolid.cc | 16 +- .../solids/BREPS/src/G4BREPSolidBox.cc | 2 +- .../solids/BREPS/src/G4BREPSolidCone.cc | 2 +- .../solids/BREPS/src/G4BREPSolidCylinder.cc | 2 +- .../solids/BREPS/src/G4BREPSolidOpenPCone.cc | 2 +- .../solids/BREPS/src/G4BREPSolidPCone.cc | 2 +- .../solids/BREPS/src/G4BREPSolidPolyhedra.cc | 2 +- .../solids/BREPS/src/G4BREPSolidSphere.cc | 2 +- .../solids/BREPS/src/G4BREPSolidTorus.cc | 2 +- .../solids/BREPS/src/G4BSplineCurve.cc | 2 +- .../BREPS/src/G4BSplineCurveWithKnots.cc | 2 +- .../solids/BREPS/src/G4BSplineSurface.cc | 2 +- .../BREPS/src/G4BSplineSurfaceWithKnots.cc | 2 +- .../solids/BREPS/src/G4BezierSurface.cc | 2 +- .../solids/BREPS/src/G4BoundingBox3D.cc | 2 +- .../solids/BREPS/src/G4CircularCurve.cc | 2 +- .../solids/BREPS/src/G4CompositeCurve.cc | 2 +- source/geometry/solids/BREPS/src/G4Conic.cc | 2 +- .../solids/BREPS/src/G4ConicalSurface.cc | 2 +- .../solids/BREPS/src/G4ControlPoints.cc | 2 +- source/geometry/solids/BREPS/src/G4Curve.cc | 2 +- .../geometry/solids/BREPS/src/G4CurvePoint.cc | 2 +- .../BREPS/src/G4CurveRayIntersection.cc | 2 +- .../solids/BREPS/src/G4CylindricalSurface.cc | 2 +- source/geometry/solids/BREPS/src/G4Ellipse.cc | 2 +- .../solids/BREPS/src/G4FConicalSurface.cc | 2 +- .../solids/BREPS/src/G4FCylindricalSurface.cc | 2 +- source/geometry/solids/BREPS/src/G4FPlane.cc | 2 +- .../geometry/solids/BREPS/src/G4Hyperbola.cc | 2 +- .../geometry/solids/BREPS/src/G4KnotVector.cc | 2 +- source/geometry/solids/BREPS/src/G4Line.cc | 2 +- .../geometry/solids/BREPS/src/G4OsloMatrix.cc | 2 +- .../geometry/solids/BREPS/src/G4Parabola.cc | 2 +- .../solids/BREPS/src/G4PlacedSolid.cc | 2 +- .../geometry/solids/BREPS/src/G4PointRat.cc | 2 +- .../solids/BREPS/src/G4ProjectedSurface.cc | 2 +- source/geometry/solids/BREPS/src/G4Ray.cc | 2 +- .../BREPS/src/G4RectangularTrimmedSurface.cc | 2 +- source/geometry/solids/BREPS/src/G4Sort.cc | 2 +- .../solids/BREPS/src/G4SphericalSurface.cc | 2 +- source/geometry/solids/BREPS/src/G4Surface.cc | 2 +- .../solids/BREPS/src/G4SurfaceBoundary.cc | 2 +- .../solids/BREPS/src/G4SurfaceList.cc | 2 +- .../BREPS/src/G4SurfaceOfLinearExtrusion.cc | 2 +- .../solids/BREPS/src/G4SurfaceOfRevolution.cc | 2 +- .../geometry/solids/BREPS/src/G4ThreeMat.cc | 2 +- .../solids/BREPS/src/G4ToroidalSurface.cc | 2 +- source/geometry/solids/Boolean/History | 18 +- .../solids/Boolean/include/G4BooleanSolid.hh | 19 +- .../solids/Boolean/include/G4BooleanSolid.icc | 48 +- .../Boolean/include/G4DisplacedSolid.hh | 2 +- .../Boolean/include/G4IntersectionSolid.hh | 2 +- .../Boolean/include/G4SubtractionSolid.hh | 2 +- .../solids/Boolean/include/G4UnionSolid.hh | 2 +- .../solids/Boolean/src/G4BooleanSolid.cc | 24 +- .../solids/Boolean/src/G4DisplacedSolid.cc | 2 +- .../solids/Boolean/src/G4IntersectionSolid.cc | 23 +- .../solids/Boolean/src/G4SubtractionSolid.cc | 23 +- .../solids/Boolean/src/G4UnionSolid.cc | 19 +- source/geometry/solids/CSG/History | 8 +- source/geometry/solids/CSG/include/G4Box.hh | 19 +- source/geometry/solids/CSG/include/G4Box.icc | 12 +- .../geometry/solids/CSG/include/G4CSGSolid.hh | 5 +- source/geometry/solids/CSG/include/G4Cons.hh | 8 +- source/geometry/solids/CSG/include/G4Cons.icc | 40 +- source/geometry/solids/CSG/include/G4Orb.hh | 8 +- source/geometry/solids/CSG/include/G4Orb.icc | 13 +- source/geometry/solids/CSG/include/G4Para.hh | 8 +- source/geometry/solids/CSG/include/G4Para.icc | 33 +- .../geometry/solids/CSG/include/G4Sphere.hh | 8 +- .../geometry/solids/CSG/include/G4Sphere.icc | 61 +- source/geometry/solids/CSG/include/G4Torus.hh | 10 +- .../geometry/solids/CSG/include/G4Torus.icc | 19 +- source/geometry/solids/CSG/include/G4Trap.hh | 8 +- source/geometry/solids/CSG/include/G4Trap.icc | 44 +- source/geometry/solids/CSG/include/G4Trd.hh | 8 +- source/geometry/solids/CSG/include/G4Trd.icc | 29 +- source/geometry/solids/CSG/include/G4Tubs.hh | 9 +- source/geometry/solids/CSG/include/G4Tubs.icc | 24 +- source/geometry/solids/CSG/src/G4Box.cc | 7 +- source/geometry/solids/CSG/src/G4CSGSolid.cc | 8 +- source/geometry/solids/CSG/src/G4Cons.cc | 2 +- source/geometry/solids/CSG/src/G4Orb.cc | 2 +- source/geometry/solids/CSG/src/G4Para.cc | 5 +- source/geometry/solids/CSG/src/G4Sphere.cc | 2 +- source/geometry/solids/CSG/src/G4Torus.cc | 5 +- source/geometry/solids/CSG/src/G4Trap.cc | 5 +- source/geometry/solids/CSG/src/G4Trd.cc | 5 +- source/geometry/solids/CSG/src/G4Tubs.cc | 2 +- source/geometry/solids/History | 9 +- source/geometry/solids/specific/History | 23 +- .../specific/include/G4ClippablePolygon.hh | 2 +- .../specific/include/G4ClippablePolygon.icc | 2 +- .../solids/specific/include/G4Ellipsoid.hh | 6 +- .../solids/specific/include/G4Ellipsoid.icc | 17 +- .../specific/include/G4EllipticalCone.hh | 7 +- .../specific/include/G4EllipticalCone.icc | 16 +- .../specific/include/G4EllipticalTube.hh | 6 +- .../specific/include/G4EllipticalTube.icc | 2 +- .../specific/include/G4EnclosingCylinder.hh | 2 +- .../solids/specific/include/G4Hype.hh | 6 +- .../solids/specific/include/G4Hype.icc | 2 +- .../specific/include/G4IntersectingCone.hh | 2 +- .../solids/specific/include/G4PolyPhiFace.hh | 2 +- .../solids/specific/include/G4PolyPhiFace.icc | 2 +- .../solids/specific/include/G4Polycone.hh | 2 +- .../solids/specific/include/G4Polycone.icc | 2 +- .../solids/specific/include/G4PolyconeSide.hh | 2 +- .../solids/specific/include/G4Polyhedra.hh | 2 +- .../solids/specific/include/G4Polyhedra.icc | 2 +- .../specific/include/G4PolyhedraSide.hh | 2 +- .../specific/include/G4QuadrangularFacet.hh | 2 +- .../specific/include/G4ReduciblePolygon.hh | 2 +- .../specific/include/G4SolidExtentList.hh | 2 +- .../specific/include/G4TessellatedSolid.hh | 16 +- .../geometry/solids/specific/include/G4Tet.hh | 12 +- .../specific/include/G4TriangularFacet.hh | 2 +- .../specific/include/G4TwistTrapFlatSide.hh | 2 +- .../specific/include/G4TwistTubsFlatSide.hh | 2 +- .../specific/include/G4TwistTubsHypeSide.hh | 2 +- .../specific/include/G4TwistTubsSide.hh | 2 +- .../solids/specific/include/G4TwistedBox.hh | 2 +- .../solids/specific/include/G4TwistedTrap.hh | 2 +- .../solids/specific/include/G4TwistedTrd.hh | 2 +- .../solids/specific/include/G4TwistedTubs.hh | 8 +- .../solids/specific/include/G4VCSGface.hh | 2 +- .../solids/specific/include/G4VCSGfaceted.hh | 17 +- .../solids/specific/include/G4VFacet.hh | 2 +- .../solids/specific/include/G4VFacet.icc | 2 +- .../specific/include/G4VTwistSurface.hh | 2 +- .../specific/include/G4VTwistSurface.icc | 2 +- .../specific/include/G4VTwistedFaceted.hh | 18 +- .../solids/specific/src/G4ClippablePolygon.cc | 2 +- .../solids/specific/src/G4Ellipsoid.cc | 8 +- .../solids/specific/src/G4EllipticalCone.cc | 10 +- .../solids/specific/src/G4EllipticalTube.cc | 27 +- .../specific/src/G4EnclosingCylinder.cc | 2 +- source/geometry/solids/specific/src/G4Hype.cc | 23 +- .../solids/specific/src/G4IntersectingCone.cc | 2 +- .../solids/specific/src/G4PolyPhiFace.cc | 2 +- .../solids/specific/src/G4Polycone.cc | 288 +- .../solids/specific/src/G4PolyconeSide.cc | 2 +- .../solids/specific/src/G4Polyhedra.cc | 257 +- .../solids/specific/src/G4PolyhedraSide.cc | 2 +- .../specific/src/G4QuadrangularFacet.cc | 2 +- .../solids/specific/src/G4ReduciblePolygon.cc | 2 +- .../solids/specific/src/G4SolidExtentList.cc | 2 +- .../solids/specific/src/G4TessellatedSolid.cc | 40 +- source/geometry/solids/specific/src/G4Tet.cc | 56 +- .../solids/specific/src/G4TriangularFacet.cc | 2 +- .../solids/specific/src/G4TwistBoxSide.cc | 2 +- .../specific/src/G4TwistTrapAlphaSide.cc | 2 +- .../specific/src/G4TwistTrapFlatSide.cc | 2 +- .../specific/src/G4TwistTrapParallelSide.cc | 2 +- .../specific/src/G4TwistTubsFlatSide.cc | 2 +- .../specific/src/G4TwistTubsHypeSide.cc | 2 +- .../solids/specific/src/G4TwistTubsSide.cc | 2 +- .../solids/specific/src/G4TwistedBox.cc | 2 +- .../solids/specific/src/G4TwistedTrap.cc | 2 +- .../solids/specific/src/G4TwistedTrd.cc | 2 +- .../solids/specific/src/G4TwistedTubs.cc | 24 +- .../solids/specific/src/G4VCSGfaceted.cc | 75 +- .../geometry/solids/specific/src/G4VFacet.cc | 2 +- .../solids/specific/src/G4VTwistSurface.cc | 2 +- .../solids/specific/src/G4VTwistedFaceted.cc | 8 +- source/geometry/volumes/History | 10 +- .../volumes/include/G4AssemblyTriplet.hh | 2 +- .../volumes/include/G4AssemblyTriplet.icc | 2 +- .../volumes/include/G4AssemblyVolume.hh | 2 +- .../volumes/include/G4AssemblyVolume.icc | 2 +- source/geometry/volumes/include/G4GRSSolid.hh | 2 +- .../geometry/volumes/include/G4GRSSolid.icc | 2 +- .../volumes/include/G4GRSSolidHandle.hh | 2 +- .../geometry/volumes/include/G4GRSVolume.hh | 2 +- .../geometry/volumes/include/G4GRSVolume.icc | 2 +- .../volumes/include/G4GRSVolumeHandle.hh | 2 +- .../volumes/include/G4LogicalBorderSurface.hh | 2 +- .../include/G4LogicalBorderSurface.icc | 2 +- .../volumes/include/G4LogicalSkinSurface.hh | 2 +- .../volumes/include/G4LogicalSkinSurface.icc | 2 +- .../volumes/include/G4NavigationHistory.hh | 2 +- .../volumes/include/G4NavigationHistory.icc | 2 +- .../volumes/include/G4NavigationLevel.hh | 2 +- .../volumes/include/G4NavigationLevel.icc | 2 +- .../volumes/include/G4NavigationLevelRep.hh | 2 +- .../volumes/include/G4NavigationLevelRep.icc | 2 +- .../volumes/include/G4PVParameterised.hh | 2 +- .../geometry/volumes/include/G4PVPlacement.hh | 2 +- .../geometry/volumes/include/G4PVReplica.hh | 2 +- .../volumes/include/G4ReflectionFactory.hh | 2 +- .../volumes/include/G4TouchableHistory.hh | 2 +- .../volumes/include/G4TouchableHistory.icc | 2 +- .../include/G4TouchableHistoryHandle.hh | 2 +- .../geometry/volumes/src/G4AssemblyVolume.cc | 2 +- source/geometry/volumes/src/G4GRSSolid.cc | 2 +- source/geometry/volumes/src/G4GRSVolume.cc | 2 +- .../volumes/src/G4LogicalBorderSurface.cc | 2 +- .../volumes/src/G4LogicalSkinSurface.cc | 2 +- .../volumes/src/G4NavigationHistory.cc | 2 +- .../geometry/volumes/src/G4NavigationLevel.cc | 2 +- .../volumes/src/G4NavigationLevelRep.cc | 2 +- .../geometry/volumes/src/G4PVParameterised.cc | 12 +- source/geometry/volumes/src/G4PVPlacement.cc | 14 +- source/geometry/volumes/src/G4PVReplica.cc | 2 +- .../volumes/src/G4ReflectionFactory.cc | 2 +- .../volumes/src/G4TouchableHistory.cc | 2 +- .../HEPGeometry/include/G4LorentzRotation.hh | 2 +- .../HEPGeometry/include/G4LorentzVector.hh | 2 +- .../global/HEPGeometry/include/G4Normal3D.hh | 2 +- .../global/HEPGeometry/include/G4Plane3D.hh | 2 +- .../global/HEPGeometry/include/G4Point3D.hh | 2 +- .../HEPGeometry/include/G4Transform3D.hh | 2 +- .../global/HEPGeometry/include/G4Vector3D.hh | 2 +- source/global/HEPGeometry/include/geomdefs.hh | 2 +- .../include/G4AnalyticalPolSolver.hh | 2 +- .../include/G4ChebyshevApproximation.hh | 2 +- .../include/G4DataInterpolation.hh | 2 +- .../HEPNumerics/include/G4GaussChebyshevQ.hh | 2 +- .../HEPNumerics/include/G4GaussHermiteQ.hh | 2 +- .../HEPNumerics/include/G4GaussJacobiQ.hh | 2 +- .../HEPNumerics/include/G4GaussLaguerreQ.hh | 2 +- .../HEPNumerics/include/G4GaussLegendreQ.hh | 2 +- .../HEPNumerics/include/G4Integrator.hh | 2 +- .../HEPNumerics/include/G4Integrator.icc | 2 +- .../include/G4JTPolynomialSolver.hh | 2 +- .../HEPNumerics/include/G4PolynomialSolver.hh | 2 +- .../include/G4PolynomialSolver.icc | 2 +- .../include/G4SimpleIntegration.hh | 2 +- .../include/G4VGaussianQuadrature.hh | 2 +- .../HEPNumerics/src/G4AnalyticalPolSolver.cc | 2 +- .../src/G4ChebyshevApproximation.cc | 2 +- .../HEPNumerics/src/G4DataInterpolation.cc | 2 +- .../HEPNumerics/src/G4GaussChebyshevQ.cc | 2 +- .../global/HEPNumerics/src/G4GaussHermiteQ.cc | 2 +- .../global/HEPNumerics/src/G4GaussJacobiQ.cc | 2 +- .../HEPNumerics/src/G4GaussLaguerreQ.cc | 2 +- .../HEPNumerics/src/G4GaussLegendreQ.cc | 2 +- .../HEPNumerics/src/G4JTPolynomialSolver.cc | 2 +- .../HEPNumerics/src/G4SimpleIntegration.cc | 2 +- .../HEPNumerics/src/G4VGaussianQuadrature.cc | 2 +- source/global/HEPRandom/include/G4Poisson.hh | 2 +- .../HEPRandom/include/G4RandomDirection.hh | 2 +- source/global/HEPRandom/include/Randomize.hh | 2 +- source/global/History | 42 +- .../global/management/include/G4Allocator.hh | 2 +- .../management/include/G4AllocatorPool.hh | 2 +- .../management/include/G4ApplicationState.hh | 2 +- .../global/management/include/G4DataVector.hh | 2 +- .../management/include/G4DataVector.icc | 2 +- .../management/include/G4ExceptionSeverity.hh | 2 +- .../management/include/G4FPEDetection.hh | 121 + .../global/management/include/G4FastVector.hh | 2 +- .../include/G4LPhysicsFreeVector.hh | 2 +- .../include/G4LPhysicsFreeVector.icc | 2 +- .../management/include/G4OrderedTable.hh | 2 +- .../management/include/G4PhysicalConstants.hh | 2 +- .../management/include/G4PhysicsFreeVector.hh | 2 +- .../include/G4PhysicsLinearVector.hh | 2 +- .../management/include/G4PhysicsLnVector.hh | 2 +- .../management/include/G4PhysicsLogVector.hh | 2 +- .../include/G4PhysicsOrderedFreeVector.hh | 2 +- .../include/G4PhysicsOrderedFreeVector.icc | 2 +- .../management/include/G4PhysicsTable.hh | 2 +- .../management/include/G4PhysicsTable.icc | 2 +- .../management/include/G4PhysicsVector.hh | 2 +- .../management/include/G4PhysicsVector.icc | 2 +- .../management/include/G4PhysicsVectorType.hh | 2 +- .../include/G4ReferenceCountedHandle.hh | 2 +- .../management/include/G4RotationMatrix.hh | 2 +- source/global/management/include/G4SIunits.hh | 6 +- .../global/management/include/G4SliceTimer.hh | 140 + .../management/include/G4SliceTimer.icc | 64 + .../management/include/G4StateManager.hh | 2 +- .../management/include/G4StateManager.icc | 2 +- source/global/management/include/G4String.hh | 2 +- source/global/management/include/G4String.icc | 2 +- .../management/include/G4SystemOfUnits.hh | 2 +- .../management/include/G4ThreeVector.hh | 2 +- source/global/management/include/G4Timer.hh | 2 +- source/global/management/include/G4Timer.icc | 2 +- .../global/management/include/G4Tokenizer.hh | 2 +- source/global/management/include/G4Types.hh | 2 +- .../global/management/include/G4UnitsTable.hh | 5 +- .../management/include/G4UnitsTable.icc | 2 +- .../global/management/include/G4UserLimits.hh | 2 +- .../management/include/G4UserLimits.icc | 2 +- .../management/include/G4VExceptionHandler.hh | 2 +- .../global/management/include/G4VNotifier.hh | 2 +- .../management/include/G4VStateDependent.hh | 2 +- source/global/management/include/G4Version.hh | 12 +- .../management/include/G4coutDestination.hh | 2 +- source/global/management/include/G4ios.hh | 2 +- .../management/include/G4strstreambuf.hh | 2 +- .../management/include/G4strstreambuf.icc | 2 +- source/global/management/include/globals.hh | 2 +- source/global/management/include/templates.hh | 2 +- .../global/management/src/G4AllocatorPool.cc | 2 +- source/global/management/src/G4DataVector.cc | 2 +- source/global/management/src/G4Exception.cc | 2 +- .../management/src/G4LPhysicsFreeVector.cc | 2 +- .../global/management/src/G4OrderedTable.cc | 2 +- .../management/src/G4PhysicsFreeVector.cc | 2 +- .../management/src/G4PhysicsLinearVector.cc | 2 +- .../management/src/G4PhysicsLnVector.cc | 2 +- .../management/src/G4PhysicsLogVector.cc | 2 +- .../src/G4PhysicsOrderedFreeVector.cc | 2 +- .../global/management/src/G4PhysicsTable.cc | 2 +- .../global/management/src/G4PhysicsVector.cc | 2 +- .../global/management/src/G4SliceTimer.cc | 81 +- .../global/management/src/G4StateManager.cc | 12 +- source/global/management/src/G4Timer.cc | 2 +- source/global/management/src/G4UnitsTable.cc | 27 +- .../management/src/G4VExceptionHandler.cc | 2 +- source/global/management/src/G4VNotifier.cc | 2 +- .../management/src/G4VStateDependent.cc | 2 +- .../management/src/G4coutDestination.cc | 2 +- source/global/management/src/G4ios.cc | 2 +- source/graphics_reps/History | 81 +- source/graphics_reps/include/G4AttCheck.hh | 4 +- source/graphics_reps/include/G4AttDef.hh | 27 +- source/graphics_reps/include/G4AttDefStore.hh | 22 +- source/graphics_reps/include/G4AttDefT.hh | 62 + .../graphics_reps/include/G4AttHolder.hh | 85 +- .../graphics_reps/include/G4AttUtils.hh | 88 +- source/graphics_reps/include/G4AttValue.hh | 2 +- source/graphics_reps/include/G4Circle.hh | 2 +- source/graphics_reps/include/G4Color.hh | 2 +- source/graphics_reps/include/G4Colour.hh | 2 +- .../include/G4ConversionFatalError.hh | 51 + .../include/G4ConversionUtils.hh | 194 + .../include/G4CreatorFactoryT.hh | 109 + .../include/G4DimensionedDouble.hh | 31 +- .../include/G4DimensionedThreeVector.hh | 31 +- .../include/G4DimensionedType.hh | 213 + source/graphics_reps/include/G4NURBS.hh | 2 +- source/graphics_reps/include/G4NURBSbox.hh | 2 +- .../graphics_reps/include/G4NURBScylinder.hh | 2 +- .../include/G4NURBShexahedron.hh | 2 +- source/graphics_reps/include/G4NURBStube.hh | 2 +- .../include/G4NURBStubesector.hh | 2 +- .../include/G4PlacedPolyhedron.hh | 2 +- source/graphics_reps/include/G4Point3DList.hh | 2 +- source/graphics_reps/include/G4Polyhedron.hh | 2 +- source/graphics_reps/include/G4Polyline.hh | 2 +- source/graphics_reps/include/G4Polymarker.hh | 2 +- source/graphics_reps/include/G4Polymarker.icc | 2 +- source/graphics_reps/include/G4Scale.hh | 2 +- source/graphics_reps/include/G4Scale.icc | 2 +- source/graphics_reps/include/G4SmartFilter.hh | 14 +- source/graphics_reps/include/G4Square.hh | 2 +- source/graphics_reps/include/G4Square.icc | 2 +- source/graphics_reps/include/G4Text.hh | 2 +- source/graphics_reps/include/G4Text.icc | 2 +- .../graphics_reps/include/G4TypeKey.hh | 68 +- source/graphics_reps/include/G4TypeKeyT.hh | 52 + source/graphics_reps/include/G4VFilter.hh | 6 +- .../graphics_reps/include/G4VGraphicsScene.hh | 15 +- source/graphics_reps/include/G4VMarker.hh | 2 +- source/graphics_reps/include/G4VMarker.icc | 2 +- source/graphics_reps/include/G4VVisManager.hh | 7 +- .../graphics_reps/include/G4VisAttributes.hh | 45 +- .../graphics_reps/include/G4VisAttributes.icc | 100 +- source/graphics_reps/include/G4VisExtent.hh | 2 +- source/graphics_reps/include/G4Visible.hh | 14 +- source/graphics_reps/include/G4Visible.icc | 8 +- source/graphics_reps/include/HepPolyhedron.h | 2 +- source/graphics_reps/src/G4AttCheck.cc | 154 +- .../graphics_reps/src/G4AttDef.cc | 78 +- source/graphics_reps/src/G4AttDefStore.cc | 51 +- .../graphics_reps/src/G4AttHolder.cc | 31 +- source/graphics_reps/src/G4AttUtils.cc | 60 + source/graphics_reps/src/G4Circle.cc | 2 +- source/graphics_reps/src/G4Colour.cc | 2 +- source/graphics_reps/src/G4NURBS.cc | 2 +- source/graphics_reps/src/G4NURBSbox.cc | 2 +- source/graphics_reps/src/G4NURBScylinder.cc | 2 +- source/graphics_reps/src/G4NURBShexahedron.cc | 2 +- source/graphics_reps/src/G4NURBStube.cc | 2 +- source/graphics_reps/src/G4NURBStubesector.cc | 2 +- .../graphics_reps/src/G4PlacedPolyhedron.cc | 2 +- source/graphics_reps/src/G4Point3DList.cc | 2 +- source/graphics_reps/src/G4Polyhedron.cc | 2 +- source/graphics_reps/src/G4Polyline.cc | 2 +- source/graphics_reps/src/G4Polymarker.cc | 2 +- source/graphics_reps/src/G4Scale.cc | 2 +- source/graphics_reps/src/G4Square.cc | 2 +- source/graphics_reps/src/G4Text.cc | 2 +- source/graphics_reps/src/G4VMarker.cc | 2 +- source/graphics_reps/src/G4VVisManager.cc | 2 +- source/graphics_reps/src/G4VisAttributes.cc | 45 +- source/graphics_reps/src/G4VisExtent.cc | 2 +- source/graphics_reps/src/G4Visible.cc | 54 +- source/graphics_reps/src/HepPolyhedron.cc | 18 +- source/intercoms/History | 9 +- source/intercoms/include/G4UIaliasList.hh | 2 +- source/intercoms/include/G4UIbatch.hh | 2 +- .../intercoms/include/G4UIcmdWith3Vector.hh | 2 +- .../include/G4UIcmdWith3VectorAndUnit.hh | 2 +- source/intercoms/include/G4UIcmdWithABool.hh | 2 +- .../intercoms/include/G4UIcmdWithADouble.hh | 2 +- .../include/G4UIcmdWithADoubleAndUnit.hh | 2 +- .../intercoms/include/G4UIcmdWithAString.hh | 2 +- .../intercoms/include/G4UIcmdWithAnInteger.hh | 2 +- .../include/G4UIcmdWithoutParameter.hh | 2 +- source/intercoms/include/G4UIcommand.hh | 2 +- source/intercoms/include/G4UIcommandStatus.hh | 2 +- source/intercoms/include/G4UIcommandTree.hh | 2 +- .../intercoms/include/G4UIcontrolMessenger.hh | 2 +- source/intercoms/include/G4UIdirectory.hh | 2 +- source/intercoms/include/G4UImanager.hh | 2 +- source/intercoms/include/G4UImessenger.hh | 2 +- source/intercoms/include/G4UIparameter.hh | 2 +- source/intercoms/include/G4UIsession.hh | 2 +- source/intercoms/include/G4UItokenNum.hh | 2 +- source/intercoms/include/G4UnitsMessenger.hh | 2 +- .../include/G4VFlavoredParallelWorld.hh | 6 +- .../include/G4VGlobalFastSimulationManager.hh | 2 +- source/intercoms/src/G4UIaliasList.cc | 2 +- source/intercoms/src/G4UIbatch.cc | 2 +- source/intercoms/src/G4UIcmdWith3Vector.cc | 2 +- .../src/G4UIcmdWith3VectorAndUnit.cc | 2 +- source/intercoms/src/G4UIcmdWithABool.cc | 2 +- source/intercoms/src/G4UIcmdWithADouble.cc | 2 +- .../src/G4UIcmdWithADoubleAndUnit.cc | 2 +- source/intercoms/src/G4UIcmdWithAString.cc | 2 +- source/intercoms/src/G4UIcmdWithAnInteger.cc | 2 +- .../intercoms/src/G4UIcmdWithoutParameter.cc | 2 +- source/intercoms/src/G4UIcommand.cc | 2 +- source/intercoms/src/G4UIcommandTree.cc | 2 +- source/intercoms/src/G4UIcontrolMessenger.cc | 2 +- source/intercoms/src/G4UIdirectory.cc | 2 +- source/intercoms/src/G4UImanager.cc | 26 +- source/intercoms/src/G4UImessenger.cc | 2 +- source/intercoms/src/G4UIparameter.cc | 2 +- source/intercoms/src/G4UIsession.cc | 2 +- source/intercoms/src/G4UnitsMessenger.cc | 2 +- .../src/G4VGlobalFastSimulationManager.cc | 2 +- source/interfaces/GAG/include/G4UIGAG.hh | 2 +- .../interfaces/GAG/include/G4UIGainServer.hh | 2 +- source/interfaces/GAG/src/G4UIGAG.cc | 2 +- source/interfaces/GAG/src/G4UIGainServer.cc | 2 +- .../basic/include/G4UIArrayString.hh | 2 +- source/interfaces/basic/include/G4UIWin32.hh | 2 +- source/interfaces/basic/include/G4UIXaw.hh | 2 +- source/interfaces/basic/include/G4UIXm.hh | 2 +- source/interfaces/basic/include/G4UIcsh.hh | 2 +- source/interfaces/basic/include/G4UItcsh.hh | 2 +- .../interfaces/basic/include/G4UIterminal.hh | 2 +- source/interfaces/basic/include/G4VUIshell.hh | 2 +- .../interfaces/basic/src/G4UIArrayString.cc | 2 +- source/interfaces/basic/src/G4UIWin32.cc | 2 +- source/interfaces/basic/src/G4UIXaw.cc | 2 +- source/interfaces/basic/src/G4UIXm.cc | 2 +- source/interfaces/basic/src/G4UIcsh.cc | 2 +- source/interfaces/basic/src/G4UItcsh.cc | 2 +- source/interfaces/basic/src/G4UIterminal.cc | 2 +- source/interfaces/basic/src/G4VUIshell.cc | 2 +- .../common/include/G4VBasicShell.hh | 2 +- .../common/include/G4VInteractorManager.hh | 2 +- source/interfaces/common/include/G4Win32.hh | 2 +- source/interfaces/common/include/G4Xt.hh | 2 +- source/interfaces/common/src/G4VBasicShell.cc | 2 +- .../common/src/G4VInteractorManager.cc | 2 +- source/interfaces/common/src/G4Win32.cc | 2 +- source/interfaces/common/src/G4Xt.cc | 2 +- source/materials/History | 12 +- source/materials/include/G4AtomicShells.hh | 5 +- source/materials/include/G4Element.hh | 19 +- source/materials/include/G4ElementTable.hh | 2 +- source/materials/include/G4ElementVector.hh | 2 +- source/materials/include/G4IonisParamElm.hh | 2 +- source/materials/include/G4IonisParamMat.hh | 2 +- source/materials/include/G4Isotope.hh | 2 +- source/materials/include/G4IsotopeVector.hh | 2 +- source/materials/include/G4MPVEntry.hh | 2 +- source/materials/include/G4Material.hh | 2 +- .../include/G4MaterialPropertiesTable.hh | 2 +- .../include/G4MaterialPropertyVector.hh | 2 +- source/materials/include/G4MaterialTable.hh | 2 +- .../materials/include/G4NistElementBuilder.hh | 37 +- source/materials/include/G4NistManager.hh | 35 +- .../include/G4NistMaterialBuilder.hh | 12 +- source/materials/include/G4NistMessenger.hh | 2 +- source/materials/include/G4OpticalSurface.hh | 2 +- source/materials/include/G4SandiaTable.hh | 2 +- .../materials/include/G4StaticSandiaData.hh | 2 +- source/materials/include/G4SurfaceProperty.hh | 2 +- source/materials/src/G4AtomicShells.cc | 18 +- source/materials/src/G4Element.cc | 7 +- source/materials/src/G4IonisParamElm.cc | 2 +- source/materials/src/G4IonisParamMat.cc | 2 +- source/materials/src/G4Isotope.cc | 20 +- source/materials/src/G4MPVEntry.cc | 2 +- source/materials/src/G4Material.cc | 2 +- .../src/G4MaterialPropertiesTable.cc | 2 +- .../materials/src/G4MaterialPropertyVector.cc | 2 +- source/materials/src/G4NistElementBuilder.cc | 11 +- source/materials/src/G4NistManager.cc | 11 +- source/materials/src/G4NistMaterialBuilder.cc | 2 +- source/materials/src/G4NistMessenger.cc | 2 +- source/materials/src/G4OpticalSurface.cc | 2 +- source/materials/src/G4SandiaTable.cc | 2 +- .../gflash/include/G4GFlashSpot.hh | 2 +- .../include/G4VGFlashSensitiveDetector.hh | 2 +- .../gflash/include/GFlashEnergySpot.hh | 2 +- .../gflash/include/GFlashHitMaker.hh | 2 +- .../GFlashHomoShowerParameterisation.hh | 2 +- .../gflash/include/GFlashParticleBounds.hh | 2 +- .../GFlashSamplingShowerParameterisation.hh | 2 +- .../include/GFlashSamplingShowerTuning.hh | 2 +- .../gflash/include/GFlashShowerModel.hh | 2 +- .../include/GFlashShowerModelMessenger.hh | 2 +- .../gflash/include/GVFlashHomoShowerTuning.hh | 2 +- .../include/GVFlashShowerParameterisation.hh | 2 +- .../parameterisations/gflash/include/Gamma.hh | 2 +- .../gflash/src/GFlashEnergySpot.cc | 2 +- .../gflash/src/GFlashHitMaker.cc | 2 +- .../src/GFlashHomoShowerParameterisation.cc | 2 +- .../gflash/src/GFlashParticleBounds.cc | 2 +- .../GFlashSamplingShowerParameterisation.cc | 2 +- .../gflash/src/GFlashShowerModel.cc | 2 +- .../gflash/src/GFlashShowerModelMessenger.cc | 2 +- .../src/GVFlashShowerParameterisation.cc | 2 +- source/parameterisations/gflash/src/Gamma.cc | 2 +- source/particles/History | 22 +- .../bosons/include/G4BosonConstructor.hh | 2 +- .../bosons/include/G4ChargedGeantino.hh | 2 +- source/particles/bosons/include/G4Gamma.hh | 2 +- source/particles/bosons/include/G4Geantino.hh | 2 +- .../bosons/include/G4OpticalPhoton.hh | 2 +- .../bosons/include/G4UnknownParticle.hh | 2 +- .../bosons/src/G4BosonConstructor.cc | 2 +- .../particles/bosons/src/G4ChargedGeantino.cc | 2 +- source/particles/bosons/src/G4Gamma.cc | 2 +- source/particles/bosons/src/G4Geantino.cc | 2 +- .../particles/bosons/src/G4OpticalPhoton.cc | 2 +- .../particles/bosons/src/G4UnknownParticle.cc | 2 +- .../hadrons/barions/include/G4AntiLambda.hh | 2 +- .../barions/include/G4AntiLambdacPlus.hh | 2 +- .../hadrons/barions/include/G4AntiNeutron.hh | 2 +- .../barions/include/G4AntiOmegaMinus.hh | 2 +- .../barions/include/G4AntiOmegacZero.hh | 2 +- .../hadrons/barions/include/G4AntiProton.hh | 2 +- .../barions/include/G4AntiSigmaMinus.hh | 2 +- .../barions/include/G4AntiSigmaPlus.hh | 2 +- .../barions/include/G4AntiSigmaZero.hh | 2 +- .../barions/include/G4AntiSigmacPlus.hh | 2 +- .../barions/include/G4AntiSigmacPlusPlus.hh | 2 +- .../barions/include/G4AntiSigmacZero.hh | 2 +- .../hadrons/barions/include/G4AntiXiMinus.hh | 2 +- .../hadrons/barions/include/G4AntiXiZero.hh | 2 +- .../hadrons/barions/include/G4AntiXicPlus.hh | 2 +- .../hadrons/barions/include/G4AntiXicZero.hh | 2 +- .../barions/include/G4BaryonConstructor.hh | 2 +- .../hadrons/barions/include/G4Lambda.hh | 2 +- .../hadrons/barions/include/G4LambdacPlus.hh | 2 +- .../hadrons/barions/include/G4Neutron.hh | 2 +- .../hadrons/barions/include/G4OmegaMinus.hh | 2 +- .../hadrons/barions/include/G4OmegacZero.hh | 2 +- .../hadrons/barions/include/G4Proton.hh | 2 +- .../hadrons/barions/include/G4SigmaMinus.hh | 2 +- .../hadrons/barions/include/G4SigmaPlus.hh | 2 +- .../hadrons/barions/include/G4SigmaZero.hh | 2 +- .../hadrons/barions/include/G4SigmacPlus.hh | 2 +- .../barions/include/G4SigmacPlusPlus.hh | 2 +- .../hadrons/barions/include/G4SigmacZero.hh | 2 +- .../hadrons/barions/include/G4XiMinus.hh | 2 +- .../hadrons/barions/include/G4XiZero.hh | 2 +- .../hadrons/barions/include/G4XicPlus.hh | 2 +- .../hadrons/barions/include/G4XicZero.hh | 2 +- .../hadrons/barions/src/G4AntiLambda.cc | 2 +- .../hadrons/barions/src/G4AntiLambdacPlus.cc | 2 +- .../hadrons/barions/src/G4AntiNeutron.cc | 6 +- .../hadrons/barions/src/G4AntiOmegaMinus.cc | 2 +- .../hadrons/barions/src/G4AntiOmegacZero.cc | 6 +- .../hadrons/barions/src/G4AntiProton.cc | 2 +- .../hadrons/barions/src/G4AntiSigmaMinus.cc | 2 +- .../hadrons/barions/src/G4AntiSigmaPlus.cc | 2 +- .../hadrons/barions/src/G4AntiSigmaZero.cc | 2 +- .../hadrons/barions/src/G4AntiSigmacPlus.cc | 2 +- .../barions/src/G4AntiSigmacPlusPlus.cc | 2 +- .../hadrons/barions/src/G4AntiSigmacZero.cc | 2 +- .../hadrons/barions/src/G4AntiXiMinus.cc | 2 +- .../hadrons/barions/src/G4AntiXiZero.cc | 2 +- .../hadrons/barions/src/G4AntiXicPlus.cc | 2 +- .../hadrons/barions/src/G4AntiXicZero.cc | 6 +- .../barions/src/G4BaryonConstructor.cc | 2 +- .../particles/hadrons/barions/src/G4Lambda.cc | 2 +- .../hadrons/barions/src/G4LambdacPlus.cc | 6 +- .../hadrons/barions/src/G4Neutron.cc | 2 +- .../hadrons/barions/src/G4OmegaMinus.cc | 2 +- .../hadrons/barions/src/G4OmegacZero.cc | 6 +- .../particles/hadrons/barions/src/G4Proton.cc | 2 +- .../hadrons/barions/src/G4SigmaMinus.cc | 2 +- .../hadrons/barions/src/G4SigmaPlus.cc | 2 +- .../hadrons/barions/src/G4SigmaZero.cc | 2 +- .../hadrons/barions/src/G4SigmacPlus.cc | 6 +- .../hadrons/barions/src/G4SigmacPlusPlus.cc | 6 +- .../hadrons/barions/src/G4SigmacZero.cc | 6 +- .../hadrons/barions/src/G4XiMinus.cc | 2 +- .../particles/hadrons/barions/src/G4XiZero.cc | 2 +- .../hadrons/barions/src/G4XicPlus.cc | 2 +- .../hadrons/barions/src/G4XicZero.cc | 6 +- .../particles/hadrons/ions/include/G4Alpha.hh | 2 +- .../hadrons/ions/include/G4Deuteron.hh | 2 +- .../hadrons/ions/include/G4GenericIon.hh | 2 +- .../particles/hadrons/ions/include/G4He3.hh | 2 +- .../hadrons/ions/include/G4IonConstructor.hh | 2 +- .../hadrons/ions/include/G4Triton.hh | 2 +- source/particles/hadrons/ions/src/G4Alpha.cc | 10 +- .../particles/hadrons/ions/src/G4Deuteron.cc | 9 +- .../hadrons/ions/src/G4GenericIon.cc | 2 +- source/particles/hadrons/ions/src/G4He3.cc | 9 +- .../hadrons/ions/src/G4IonConstructor.cc | 2 +- source/particles/hadrons/ions/src/G4Triton.cc | 9 +- .../mesons/include/G4AntiBMesonZero.hh | 2 +- .../mesons/include/G4AntiBsMesonZero.hh | 2 +- .../mesons/include/G4AntiDMesonZero.hh | 2 +- .../hadrons/mesons/include/G4AntiKaonZero.hh | 2 +- .../hadrons/mesons/include/G4BMesonMinus.hh | 2 +- .../hadrons/mesons/include/G4BMesonPlus.hh | 2 +- .../hadrons/mesons/include/G4BMesonZero.hh | 2 +- .../hadrons/mesons/include/G4BsMesonZero.hh | 2 +- .../hadrons/mesons/include/G4DMesonMinus.hh | 2 +- .../hadrons/mesons/include/G4DMesonPlus.hh | 2 +- .../hadrons/mesons/include/G4DMesonZero.hh | 2 +- .../hadrons/mesons/include/G4DsMesonMinus.hh | 2 +- .../hadrons/mesons/include/G4DsMesonPlus.hh | 2 +- .../particles/hadrons/mesons/include/G4Eta.hh | 2 +- .../hadrons/mesons/include/G4EtaPrime.hh | 2 +- .../hadrons/mesons/include/G4JPsi.hh | 2 +- .../hadrons/mesons/include/G4KaonMinus.hh | 2 +- .../hadrons/mesons/include/G4KaonPlus.hh | 2 +- .../hadrons/mesons/include/G4KaonZero.hh | 2 +- .../hadrons/mesons/include/G4KaonZeroLong.hh | 2 +- .../hadrons/mesons/include/G4KaonZeroShort.hh | 2 +- .../mesons/include/G4MesonConstructor.hh | 2 +- .../hadrons/mesons/include/G4PionMinus.hh | 2 +- .../hadrons/mesons/include/G4PionPlus.hh | 2 +- .../hadrons/mesons/include/G4PionZero.hh | 2 +- .../hadrons/mesons/src/G4AntiBMesonZero.cc | 6 +- .../hadrons/mesons/src/G4AntiBsMesonZero.cc | 6 +- .../hadrons/mesons/src/G4AntiDMesonZero.cc | 6 +- .../hadrons/mesons/src/G4AntiKaonZero.cc | 2 +- .../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 | 2 +- .../hadrons/mesons/src/G4DMesonPlus.cc | 2 +- .../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 | 8 +- .../hadrons/mesons/src/G4EtaPrime.cc | 8 +- source/particles/hadrons/mesons/src/G4JPsi.cc | 6 +- .../hadrons/mesons/src/G4KaonMinus.cc | 2 +- .../hadrons/mesons/src/G4KaonPlus.cc | 2 +- .../hadrons/mesons/src/G4KaonZero.cc | 2 +- .../hadrons/mesons/src/G4KaonZeroLong.cc | 8 +- .../hadrons/mesons/src/G4KaonZeroShort.cc | 2 +- .../hadrons/mesons/src/G4MesonConstructor.cc | 2 +- .../hadrons/mesons/src/G4PionMinus.cc | 2 +- .../hadrons/mesons/src/G4PionPlus.cc | 2 +- .../hadrons/mesons/src/G4PionZero.cc | 2 +- .../leptons/include/G4AntiNeutrinoE.hh | 2 +- .../leptons/include/G4AntiNeutrinoMu.hh | 2 +- .../leptons/include/G4AntiNeutrinoTau.hh | 2 +- .../particles/leptons/include/G4Electron.hh | 2 +- .../leptons/include/G4LeptonConstructor.hh | 2 +- .../particles/leptons/include/G4MuonMinus.hh | 2 +- .../particles/leptons/include/G4MuonPlus.hh | 2 +- .../particles/leptons/include/G4NeutrinoE.hh | 2 +- .../particles/leptons/include/G4NeutrinoMu.hh | 2 +- .../leptons/include/G4NeutrinoTau.hh | 2 +- .../particles/leptons/include/G4Positron.hh | 2 +- .../particles/leptons/include/G4TauMinus.hh | 2 +- source/particles/leptons/include/G4TauPlus.hh | 2 +- .../particles/leptons/src/G4AntiNeutrinoE.cc | 2 +- .../particles/leptons/src/G4AntiNeutrinoMu.cc | 2 +- .../leptons/src/G4AntiNeutrinoTau.cc | 2 +- source/particles/leptons/src/G4Electron.cc | 2 +- .../leptons/src/G4LeptonConstructor.cc | 2 +- source/particles/leptons/src/G4MuonMinus.cc | 2 +- source/particles/leptons/src/G4MuonPlus.cc | 2 +- source/particles/leptons/src/G4NeutrinoE.cc | 2 +- source/particles/leptons/src/G4NeutrinoMu.cc | 2 +- source/particles/leptons/src/G4NeutrinoTau.cc | 2 +- source/particles/leptons/src/G4Positron.cc | 2 +- source/particles/leptons/src/G4TauMinus.cc | 2 +- source/particles/leptons/src/G4TauPlus.cc | 2 +- .../include/G4DalitzDecayChannel.hh | 2 +- .../management/include/G4DecayProducts.hh | 2 +- .../management/include/G4DecayTable.hh | 2 +- .../include/G4DecayTableMessenger.hh | 2 +- .../management/include/G4DynamicParticle.hh | 2 +- .../management/include/G4DynamicParticle.icc | 2 +- .../include/G4DynamicParticleFastVector.hh | 2 +- .../management/include/G4ElectronOccupancy.hh | 2 +- .../management/include/G4IonTable.hh | 25 +- source/particles/management/include/G4Ions.hh | 2 +- .../management/include/G4IsotopeProperty.hh | 2 +- .../management/include/G4KL3DecayChannel.hh | 2 +- .../management/include/G4MuonDecayChannel.hh | 2 +- .../include/G4NeutronBetaDecayChannel.hh | 2 +- .../management/include/G4NucleiProperties.hh | 2 +- .../include/G4NucleiPropertiesTable.hh | 2 +- .../G4NucleiPropertiesTheoreticalTable.hh | 2 +- .../management/include/G4PDGCodeChecker.hh | 2 +- .../include/G4ParticleDefinition.hh | 2 +- .../include/G4ParticleDefinition.icc | 2 +- .../management/include/G4ParticleMessenger.hh | 2 +- .../management/include/G4ParticleMomentum.hh | 2 +- .../include/G4ParticlePropertyData.hh | 2 +- .../include/G4ParticlePropertyMessenger.hh | 2 +- .../include/G4ParticlePropertyTable.hh | 2 +- .../management/include/G4ParticleTable.hh | 2 +- .../management/include/G4ParticleTable.icc | 2 +- .../include/G4ParticleTableIterator.hh | 2 +- .../management/include/G4ParticleWithCuts.hh | 2 +- .../include/G4PhaseSpaceDecayChannel.hh | 2 +- .../management/include/G4PrimaryParticle.hh | 22 +- .../management/include/G4PrimaryVertex.hh | 19 +- .../management/include/G4ShortLivedTable.hh | 2 +- .../include/G4TauLeptonicDecayChannel.hh | 2 +- .../management/include/G4VDecayChannel.hh | 2 +- .../management/include/G4VIsotopeTable.hh | 2 +- .../G4VUserPrimaryParticleInformation.hh | 2 +- .../G4VUserPrimaryVertexInformation.hh | 2 +- .../management/src/G4DalitzDecayChannel.cc | 2 +- .../management/src/G4DecayProducts.cc | 2 +- .../particles/management/src/G4DecayTable.cc | 2 +- .../management/src/G4DecayTableMessenger.cc | 2 +- .../management/src/G4DynamicParticle.cc | 2 +- .../management/src/G4ElectronOccupancy.cc | 2 +- source/particles/management/src/G4IonTable.cc | 91 +- source/particles/management/src/G4Ions.cc | 2 +- .../management/src/G4IsotopeProperty.cc | 2 +- .../management/src/G4KL3DecayChannel.cc | 2 +- .../management/src/G4MuonDecayChannel.cc | 2 +- .../src/G4NeutronBetaDecayChannel.cc | 2 +- .../management/src/G4NucleiProperties.cc | 2 +- .../src/G4NucleiPropertiesTableA.cc | 2 +- .../src/G4NucleiPropertiesTableB.cc | 2 +- .../G4NucleiPropertiesTheoreticalTableA.cc | 2 +- .../management/src/G4PDGCodeChecker.cc | 2 +- .../management/src/G4ParticleDefinition.cc | 8 +- .../management/src/G4ParticleMessenger.cc | 2 +- .../src/G4ParticlePropertyMessenger.cc | 2 +- .../management/src/G4ParticleTable.cc | 2 +- .../src/G4PhaseSpaceDecayChannel.cc | 48 +- .../management/src/G4PrimaryParticle.cc | 31 +- .../management/src/G4PrimaryVertex.cc | 10 +- .../management/src/G4ShortLivedTable.cc | 2 +- .../src/G4TauLeptonicDecayChannel.cc | 2 +- .../management/src/G4VDecayChannel.cc | 2 +- .../src/G4VUserPrimaryParticleInformation.cc | 2 +- .../src/G4VUserPrimaryVertexInformation.cc | 2 +- .../shortlived/include/G4DiQuarks.hh | 2 +- .../include/G4ExcitedBaryonConstructor.hh | 2 +- .../shortlived/include/G4ExcitedBaryons.hh | 2 +- .../include/G4ExcitedDeltaConstructor.hh | 2 +- .../include/G4ExcitedLambdaConstructor.hh | 2 +- .../include/G4ExcitedMesonConstructor.hh | 2 +- .../shortlived/include/G4ExcitedMesons.hh | 2 +- .../include/G4ExcitedNucleonConstructor.hh | 2 +- .../include/G4ExcitedSigmaConstructor.hh | 2 +- .../include/G4ExcitedXiConstructor.hh | 2 +- .../particles/shortlived/include/G4Gluons.hh | 2 +- .../particles/shortlived/include/G4Quarks.hh | 2 +- .../include/G4ShortLivedConstructor.hh | 2 +- .../include/G4VShortLivedParticle.hh | 2 +- source/particles/shortlived/src/G4DiQuarks.cc | 2 +- .../src/G4ExcitedBaryonConstructor.cc | 2 +- .../shortlived/src/G4ExcitedBaryons.cc | 2 +- .../src/G4ExcitedDeltaConstructor.cc | 6 +- .../src/G4ExcitedLambdaConstructor.cc | 4 +- .../src/G4ExcitedMesonConstructor.cc | 48 +- .../shortlived/src/G4ExcitedMesons.cc | 2 +- .../src/G4ExcitedNucleonConstructor.cc | 2 +- .../src/G4ExcitedSigmaConstructor.cc | 8 +- .../shortlived/src/G4ExcitedXiConstructor.cc | 2 +- source/particles/shortlived/src/G4Gluons.cc | 2 +- source/particles/shortlived/src/G4Quarks.cc | 2 +- .../shortlived/src/G4ShortLivedConstructor.cc | 133 +- .../shortlived/src/G4VShortLivedParticle.cc | 2 +- .../utils/include/G4HtmlPPReporter.hh | 2 +- .../utils/include/G4SimplePPReporter.hh | 2 +- .../utils/include/G4TextPPReporter.hh | 2 +- .../utils/include/G4TextPPRetriever.hh | 2 +- .../include/G4VParticlePropertyReporter.hh | 2 +- .../include/G4VParticlePropertyRetriever.hh | 2 +- .../particles/utils/src/G4HtmlPPReporter.cc | 2 +- .../particles/utils/src/G4SimplePPReporter.cc | 2 +- .../particles/utils/src/G4TextPPReporter.cc | 2 +- .../particles/utils/src/G4TextPPRetriever.cc | 2 +- .../utils/src/G4VParticlePropertyReporter.cc | 2 +- source/persistency/GNUmakefile | 8 +- source/persistency/History | 13 + source/persistency/include/G4MCTEvent.hh | 2 - .../persistency/include/G4MCTGenParticle.hh | 3 - .../include/G4PersistencyManager.hh | 8 + source/persistency/include/G4VPEventIO.hh | 4 + source/persistency/src/G4MCTEvent.cc | 2 + source/persistency/src/G4MCTGenEvent.cc | 3 + .../persistency/src/G4PersistencyManager.cc | 18 +- source/persistency/src/G4Pevent.cc | 2 + source/persistency/src/G4VHepMCIO.cc | 2 + source/persistency/src/G4VMCTruthIO.cc | 2 + source/persistency/tools/README | 3 - source/persistency/tools/g4pmv.sh | 56 - source/persistency/tools/g4psed.sh | 56 - source/persistency/tools/rename.sh | 3 - source/persistency/tools/setup.csh | 8 - source/physics_lists/GNUmakefile | 23 + .../physics_lists}/History | 64 +- source/physics_lists/builders/GNUmakefile | 74 + .../include/CompileTimeConstraints.hh | 0 .../include/G4BertiniNeutronBuilder.hh | 0 .../builders}/include/G4BertiniPiKBuilder.hh | 0 .../include/G4BertiniProtonBuilder.hh | 0 .../include/G4BinaryNeutronBuilder.hh | 0 .../builders}/include/G4BinaryPiKBuilder.hh | 0 .../include/G4BinaryProtonBuilder.hh | 0 .../builders}/include/G4DataQuestionaire.hh | 0 .../builders}/include/G4DecayPhysics.hh | 4 +- .../include/G4ElectroNuclearBuilder.hh | 0 .../builders}/include/G4EmExtraPhysics.hh | 4 +- .../builders}/include/G4EmMessenger.hh | 4 +- .../builders}/include/G4EmStandardPhysics.hh | 9 +- .../include/G4EmStandardPhysics71.hh | 9 +- .../include/G4EmStandardPhysics72.hh | 8 +- .../builders}/include/G4FTFCNeutronBuilder.hh | 0 .../builders}/include/G4FTFCPiKBuilder.hh | 0 .../builders}/include/G4FTFCProtonBuilder.hh | 0 .../builders}/include/G4FTFPNeutronBuilder.hh | 0 .../builders}/include/G4FTFPPiKBuilder.hh | 0 .../builders}/include/G4FTFPProtonBuilder.hh | 0 .../include/G4HadronElasticPhysics.hh | 34 +- .../include/G4HadronHElasticPhysics.hh | 54 +- .../builders}/include/G4HadronProcessStore.hh | 17 +- .../include/G4HadronQElasticPhysics.hh | 52 +- .../include/G4IonBinaryCascadePhysics.hh | 4 +- .../builders}/include/G4IonPhysics.hh | 4 +- .../builders}/include/G4LEADNeutronBuilder.hh | 0 .../builders}/include/G4LEADPiKBuilder.hh | 0 .../builders}/include/G4LEADProtonBuilder.hh | 0 .../builders}/include/G4LEPNeutronBuilder.hh | 2 +- .../builders}/include/G4LEPPiKBuilder.hh | 2 +- .../builders}/include/G4LEPProtonBuilder.hh | 2 +- .../builders}/include/G4LHEPNeutronBuilder.hh | 0 .../builders}/include/G4LHEPPiKBuilder.hh | 0 .../builders}/include/G4LHEPProtonBuilder.hh | 0 .../include/G4LHEPStoppingPhysics.hh | 4 +- .../builders}/include/G4MiscLHEPBuilder.hh | 2 +- .../builders}/include/G4NeutronBuilder.hh | 2 +- .../builders}/include/G4NeutronHPBuilder.hh | 0 .../builders/include/G4NeutronTrackingCut.hh | 47 +- .../builders}/include/G4PiKBuilder.hh | 4 +- .../include/G4PrecoNeutronBuilder.hh | 0 .../builders}/include/G4PrecoProtonBuilder.hh | 0 .../builders}/include/G4ProtonBuilder.hh | 2 +- .../include/G4QGSCEflowNeutronBuilder.hh | 73 + .../builders/include/G4QGSCEflowPiKBuilder.hh | 78 + .../include/G4QGSCEflowProtonBuilder.hh | 72 + .../builders}/include/G4QGSCNeutronBuilder.hh | 4 +- .../builders}/include/G4QGSCPiKBuilder.hh | 4 +- .../builders}/include/G4QGSCProtonBuilder.hh | 4 +- .../builders}/include/G4QGSPNeutronBuilder.hh | 0 .../builders}/include/G4QGSPPiKBuilder.hh | 0 .../builders}/include/G4QGSPProtonBuilder.hh | 0 .../builders}/include/G4QStoppingPhysics.hh | 4 +- .../include/G4StoppingHadronBuilder.hh | 4 +- .../builders}/include/G4VNeutronBuilder.hh | 0 .../builders}/include/G4VPiKBuilder.hh | 4 +- .../builders}/include/G4VProtonBuilder.hh | 4 +- .../builders/include/G4WarnPLStatus.hh | 85 + .../builders}/include/TheoModelFactory.hh | 0 .../builders}/src/G4BertiniNeutronBuilder.cc | 0 .../builders}/src/G4BertiniPiKBuilder.cc | 0 .../builders}/src/G4BertiniProtonBuilder.cc | 0 .../builders}/src/G4BinaryNeutronBuilder.cc | 0 .../builders}/src/G4BinaryPiKBuilder.cc | 0 .../builders}/src/G4BinaryProtonBuilder.cc | 0 .../builders}/src/G4DecayPhysics.cc | 4 +- .../builders}/src/G4ElectroNuclearBuilder.cc | 4 +- .../builders}/src/G4EmExtraPhysics.cc | 4 +- .../builders}/src/G4EmMessenger.cc | 4 +- .../builders}/src/G4EmStandardPhysics.cc | 35 +- .../builders}/src/G4EmStandardPhysics71.cc | 48 +- .../builders}/src/G4EmStandardPhysics72.cc | 59 +- .../builders}/src/G4FTFCNeutronBuilder.cc | 0 .../builders}/src/G4FTFCPiKBuilder.cc | 0 .../builders}/src/G4FTFCProtonBuilder.cc | 0 .../builders}/src/G4FTFPNeutronBuilder.cc | 0 .../builders}/src/G4FTFPPiKBuilder.cc | 0 .../builders}/src/G4FTFPProtonBuilder.cc | 0 .../builders}/src/G4HadronElasticPhysics.cc | 113 +- .../builders/src/G4HadronHElasticPhysics.cc | 185 + .../builders}/src/G4HadronProcessStore.cc | 110 +- .../builders/src/G4HadronQElasticPhysics.cc | 149 + .../src/G4IonBinaryCascadePhysics.cc | 4 +- .../builders}/src/G4IonPhysics.cc | 4 +- .../builders}/src/G4LEADNeutronBuilder.cc | 0 .../builders}/src/G4LEADPiKBuilder.cc | 0 .../builders}/src/G4LEADProtonBuilder.cc | 0 .../builders}/src/G4LEPNeutronBuilder.cc | 2 +- .../builders}/src/G4LEPPiKBuilder.cc | 2 +- .../builders}/src/G4LEPProtonBuilder.cc | 2 +- .../builders}/src/G4LHEPNeutronBuilder.cc | 0 .../builders}/src/G4LHEPPiKBuilder.cc | 0 .../builders}/src/G4LHEPProtonBuilder.cc | 0 .../builders}/src/G4LHEPStoppingPhysics.cc | 4 +- .../builders}/src/G4MiscLHEPBuilder.cc | 16 +- .../builders}/src/G4NeutronBuilder.cc | 2 +- .../builders}/src/G4NeutronHPBuilder.cc | 0 .../builders/src/G4NeutronTrackingCut.cc | 86 + .../builders}/src/G4PiKBuilder.cc | 4 +- .../builders}/src/G4PrecoNeutronBuilder.cc | 0 .../builders}/src/G4PrecoProtonBuilder.cc | 0 .../builders}/src/G4ProtonBuilder.cc | 4 +- .../builders/src/G4QGSCEflowNeutronBuilder.cc | 68 +- .../builders/src/G4QGSCEflowPiKBuilder.cc | 139 +- .../builders/src/G4QGSCEflowProtonBuilder.cc | 60 +- .../builders}/src/G4QGSCNeutronBuilder.cc | 2 +- .../builders}/src/G4QGSCPiKBuilder.cc | 2 +- .../builders}/src/G4QGSCProtonBuilder.cc | 2 +- .../builders}/src/G4QGSPNeutronBuilder.cc | 0 .../builders}/src/G4QGSPPiKBuilder.cc | 0 .../builders}/src/G4QGSPProtonBuilder.cc | 0 .../builders}/src/G4QStoppingPhysics.cc | 4 +- .../builders}/src/G4StoppingHadronBuilder.cc | 4 +- .../physics_lists/lists/GNUmakefile | 44 +- .../physics_lists/lists}/include/FTFC.hh | 4 +- .../physics_lists/lists}/include/FTFC.icc | 6 +- .../physics_lists/lists}/include/FTFP.hh | 4 +- .../physics_lists/lists}/include/FTFP.icc | 12 +- .../lists}/include/G4HadronInelasticQBBC.hh | 15 +- .../lists}/include/G4HadronInelasticQLHEP.hh | 11 +- .../lists}/include/HadronPhysicsFTFC.hh | 4 +- .../lists}/include/HadronPhysicsFTFP.hh | 4 +- .../lists}/include/HadronPhysicsLHEP.hh | 4 +- .../lists}/include/HadronPhysicsLHEP_BERT.hh | 4 +- .../include/HadronPhysicsLHEP_BERT_HP.hh | 4 +- .../lists}/include/HadronPhysicsLHEP_BIC.hh | 4 +- .../include/HadronPhysicsLHEP_BIC_HP.hh | 4 +- .../lists}/include/HadronPhysicsLHEP_EMV.hh | 4 +- .../lists}/include/HadronPhysicsLHEP_HP.hh | 4 +- .../lists}/include/HadronPhysicsLHEP_LEAD.hh | 4 +- .../include/HadronPhysicsLHEP_LEAD_HP.hh | 4 +- .../lists}/include/HadronPhysicsLHEP_PRECO.hh | 4 +- .../include/HadronPhysicsLHEP_PRECO_HP.hh | 4 +- .../lists}/include/HadronPhysicsQGSC.hh | 4 +- .../lists/include/HadronPhysicsQGSC_EFLOW.hh | 41 +- .../lists/include/HadronPhysicsQGSC_EMV.hh | 36 +- .../lists}/include/HadronPhysicsQGSC_LEAD.hh | 4 +- .../include/HadronPhysicsQGSC_LEAD_HP.hh | 4 +- .../lists}/include/HadronPhysicsQGSP.hh | 4 +- .../lists}/include/HadronPhysicsQGSP_BERT.hh | 4 +- .../include/HadronPhysicsQGSP_BERT_HP.hh | 5 +- .../lists}/include/HadronPhysicsQGSP_BIC.hh | 4 +- .../lists/include/HadronPhysicsQGSP_BIC_HP.hh | 97 + .../lists}/include/HadronPhysicsQGSP_EMV.hh | 4 +- .../lists}/include/HadronPhysicsQGSP_EMX.hh | 4 +- .../lists}/include/HadronPhysicsQGSP_HP.hh | 4 +- .../physics_lists/lists}/include/LBE.hh | 12 +- .../physics_lists/lists}/include/LBE.icc | 12 +- .../physics_lists/lists}/include/LHEP.hh | 0 .../physics_lists/lists}/include/LHEP.icc | 6 +- .../physics_lists/lists}/include/LHEP_BERT.hh | 4 +- .../lists}/include/LHEP_BERT.icc | 6 +- .../lists}/include/LHEP_BERT_HP.hh | 0 .../lists}/include/LHEP_BERT_HP.icc | 6 +- .../physics_lists/lists}/include/LHEP_BIC.hh | 4 +- .../physics_lists/lists}/include/LHEP_BIC.icc | 11 +- .../lists}/include/LHEP_BIC_HP.hh | 4 +- .../lists}/include/LHEP_BIC_HP.icc | 11 +- .../physics_lists/lists}/include/LHEP_EMV.hh | 4 +- .../physics_lists/lists}/include/LHEP_EMV.icc | 6 +- .../physics_lists/lists}/include/LHEP_HP.hh | 4 +- .../physics_lists/lists}/include/LHEP_HP.icc | 13 +- .../physics_lists/lists}/include/LHEP_LEAD.hh | 4 +- .../lists}/include/LHEP_LEAD.icc | 6 +- .../lists}/include/LHEP_LEAD_HP.hh | 4 +- .../lists}/include/LHEP_LEAD_HP.icc | 6 +- .../lists}/include/LHEP_PRECO.hh | 4 +- .../lists}/include/LHEP_PRECO.icc | 11 +- .../lists}/include/LHEP_PRECO_HP.hh | 4 +- .../lists}/include/LHEP_PRECO_HP.icc | 8 +- .../lists}/include/MaxTimeCuts.hh | 0 .../lists}/include/MinEkineCuts.hh | 4 +- .../physics_lists/lists}/include/QBBC.hh | 6 +- .../physics_lists/lists}/include/QBBC.icc | 53 +- .../physics_lists/lists}/include/QGSC.hh | 0 .../physics_lists/lists}/include/QGSC.icc | 17 +- .../physics_lists/lists/include/QGSC_EFLOW.hh | 18 +- .../lists/include/QGSC_EFLOW.icc | 85 +- .../physics_lists/lists/include/QGSC_EMV.hh | 14 +- .../physics_lists/lists/include/QGSC_EMV.icc | 83 +- .../physics_lists/lists}/include/QGSC_LEAD.hh | 4 +- .../lists}/include/QGSC_LEAD.icc | 11 +- .../lists}/include/QGSC_LEAD_HP.hh | 4 +- .../lists}/include/QGSC_LEAD_HP.icc | 6 +- .../physics_lists/lists}/include/QGSP.hh | 4 +- .../physics_lists/lists}/include/QGSP.icc | 11 +- .../physics_lists/lists}/include/QGSP_BERT.hh | 4 +- .../lists}/include/QGSP_BERT.icc | 11 +- .../lists}/include/QGSP_BERT_HP.hh | 4 +- .../lists}/include/QGSP_BERT_HP.icc | 6 +- .../physics_lists/lists}/include/QGSP_BIC.hh | 4 +- .../physics_lists/lists}/include/QGSP_BIC.icc | 11 +- .../lists/include/QGSP_BIC_HP.hh | 69 + .../lists/include/QGSP_BIC_HP.icc | 51 +- .../physics_lists/lists}/include/QGSP_EMV.hh | 4 +- .../physics_lists/lists}/include/QGSP_EMV.icc | 11 +- .../physics_lists/lists}/include/QGSP_EMX.hh | 4 +- .../physics_lists/lists}/include/QGSP_EMX.icc | 11 +- .../physics_lists/lists}/include/QGSP_HP.hh | 4 +- .../physics_lists/lists}/include/QGSP_HP.icc | 13 +- .../physics_lists/lists/include/QGSP_QEL.hh | 26 +- .../physics_lists/lists/include/QGSP_QEL.icc | 53 +- .../lists}/include/SpecialCuts.hh | 0 .../lists}/src/G4HadronInelasticQBBC.cc | 47 +- .../lists}/src/G4HadronInelasticQLHEP.cc | 51 +- .../lists}/src/HadronPhysicsFTFC.cc | 4 +- .../lists}/src/HadronPhysicsFTFP.cc | 4 +- .../lists}/src/HadronPhysicsLHEP.cc | 4 +- .../lists}/src/HadronPhysicsLHEP_BERT.cc | 4 +- .../lists}/src/HadronPhysicsLHEP_BERT_HP.cc | 4 +- .../lists}/src/HadronPhysicsLHEP_BIC.cc | 4 +- .../lists}/src/HadronPhysicsLHEP_BIC_HP.cc | 4 +- .../lists}/src/HadronPhysicsLHEP_EMV.cc | 4 +- .../lists}/src/HadronPhysicsLHEP_HP.cc | 4 +- .../lists}/src/HadronPhysicsLHEP_LEAD.cc | 4 +- .../lists}/src/HadronPhysicsLHEP_LEAD_HP.cc | 4 +- .../lists}/src/HadronPhysicsLHEP_PRECO.cc | 4 +- .../lists}/src/HadronPhysicsLHEP_PRECO_HP.cc | 4 +- .../lists}/src/HadronPhysicsQGSC.cc | 4 +- .../lists/src/HadronPhysicsQGSC_EFLOW.cc | 88 +- .../lists/src/HadronPhysicsQGSC_EMV.cc | 42 +- .../lists}/src/HadronPhysicsQGSC_LEAD.cc | 4 +- .../lists}/src/HadronPhysicsQGSC_LEAD_HP.cc | 4 +- .../lists}/src/HadronPhysicsQGSP.cc | 4 +- .../lists}/src/HadronPhysicsQGSP_BERT.cc | 4 +- .../lists}/src/HadronPhysicsQGSP_BERT_HP.cc | 4 +- .../lists}/src/HadronPhysicsQGSP_BIC.cc | 4 +- .../lists/src/HadronPhysicsQGSP_BIC_HP.cc | 127 + .../lists}/src/HadronPhysicsQGSP_EMV.cc | 4 +- .../lists}/src/HadronPhysicsQGSP_EMX.cc | 4 +- .../lists}/src/HadronPhysicsQGSP_HP.cc | 4 +- .../physics_lists/lists}/src/MaxTimeCuts.cc | 0 .../physics_lists/lists}/src/MinEkineCuts.cc | 2 +- .../physics_lists/lists}/src/SpecialCuts.cc | 0 source/processes/GNUmakefile | 10 +- .../cuts/include/G4MCCIndexConversionTable.hh | 2 +- .../cuts/include/G4MaterialCutsCouple.hh | 2 +- .../cuts/include/G4PhysicsTableHelper.hh | 2 +- .../cuts/include/G4ProductionCuts.hh | 2 +- .../cuts/include/G4ProductionCutsTable.hh | 2 +- .../cuts/include/G4RToEConvForAntiNeutron.hh | 2 +- .../cuts/include/G4RToEConvForAntiProton.hh | 2 +- .../cuts/include/G4RToEConvForElectron.hh | 2 +- .../cuts/include/G4RToEConvForGamma.hh | 2 +- .../cuts/include/G4RToEConvForNeutron.hh | 2 +- .../cuts/include/G4RToEConvForPositron.hh | 2 +- .../cuts/include/G4RToEConvForProton.hh | 2 +- .../cuts/include/G4VRangeToEnergyConverter.hh | 2 +- .../cuts/src/G4MCCIndexConversionTable.cc | 2 +- .../cuts/src/G4MaterialCutsCouple.cc | 2 +- .../cuts/src/G4PhysicsTableHelper.cc | 2 +- source/processes/cuts/src/G4ProductionCuts.cc | 2 +- .../cuts/src/G4ProductionCutsTable.cc | 2 +- .../cuts/src/G4RToEConvForAntiNeutron.cc | 2 +- .../cuts/src/G4RToEConvForAntiProton.cc | 2 +- .../cuts/src/G4RToEConvForElectron.cc | 2 +- .../processes/cuts/src/G4RToEConvForGamma.cc | 2 +- .../cuts/src/G4RToEConvForNeutron.cc | 2 +- .../cuts/src/G4RToEConvForPositron.cc | 2 +- .../processes/cuts/src/G4RToEConvForProton.cc | 2 +- .../cuts/src/G4VRangeToEnergyConverter.cc | 2 +- source/processes/decay/include/G4Decay.hh | 2 +- .../processes/decay/include/G4UnknownDecay.hh | 2 +- .../processes/decay/include/G4VExtDecayer.hh | 2 +- source/processes/decay/src/G4Decay.cc | 2 +- source/processes/decay/src/G4UnknownDecay.cc | 2 +- source/processes/electromagnetic/GNUmakefile | 6 +- .../electromagnetic/highenergy/History | 7 +- .../highenergy/include/G4AnnihiToMuPair.hh | 2 +- .../include/G4BetheBlochNoDeltaModel.hh | 2 +- .../highenergy/include/G4BraggNoDeltaModel.hh | 2 +- .../include/G4GammaConversionToMuons.hh | 2 +- .../highenergy/include/G4Vee2hadrons.hh | 2 +- .../highenergy/include/G4eeCrossSections.hh | 2 +- .../highenergy/include/G4eeToHadrons.hh | 2 +- .../highenergy/include/G4eeToHadronsModel.hh | 2 +- .../include/G4eeToHadronsMultiModel.hh | 2 +- .../highenergy/include/G4eeToTwoPiModel.hh | 2 +- .../highenergy/include/G4hhIonisation.hh | 5 +- .../highenergy/include/G4mplIonisation.hh | 123 + .../include/G4mplIonisationModel.hh | 146 + .../highenergy/src/G4AnnihiToMuPair.cc | 2 +- .../src/G4BetheBlochNoDeltaModel.cc | 2 +- .../highenergy/src/G4BraggNoDeltaModel.cc | 2 +- .../src/G4GammaConversionToMuons.cc | 2 +- .../highenergy/src/G4eeCrossSections.cc | 2 +- .../highenergy/src/G4eeToHadrons.cc | 2 +- .../highenergy/src/G4eeToHadronsModel.cc | 2 +- .../highenergy/src/G4eeToHadronsMultiModel.cc | 2 +- .../highenergy/src/G4eeToTwoPiModel.cc | 2 +- .../highenergy/src/G4hhIonisation.cc | 18 +- .../highenergy/src/G4mplIonisation.cc | 141 +- .../highenergy/src/G4mplIonisationModel.cc | 188 + .../electromagnetic/lowenergy/History | 11 +- .../lowenergy/include/G4AtomicDeexcitation.hh | 2 +- .../lowenergy/include/G4AtomicShell.hh | 2 +- .../include/G4AtomicTransitionManager.hh | 2 +- .../lowenergy/include/G4AugerData.hh | 2 +- .../include/G4BremsstrahlungParameters.hh | 2 +- .../lowenergy/include/G4CompositeEMDataSet.hh | 2 +- .../include/G4CrossSectionHandler.hh | 2 +- .../include/G4DNAAlphaPlusChargeDecrease.hh | 2 +- ...phaPlusChargeDecreaseFinalStatesPolicy.icc | 2 +- .../include/G4DNAAlphaPlusChargeIncrease.hh | 2 +- ...phaPlusChargeIncreaseFinalStatesPolicy.icc | 2 +- .../include/G4DNAAlphaPlusExcitation.hh | 2 +- .../G4DNAAlphaPlusPlusChargeDecrease.hh | 2 +- ...lusPlusChargeDecreaseFinalStatesPolicy.icc | 2 +- .../include/G4DNAAlphaPlusPlusExcitation.hh | 2 +- .../G4DNABornExcitationFinalStatesPolicy.icc | 2 +- .../G4DNABrennerAngularDistributionPolicy.hh | 2 +- .../include/G4DNAChargeDecreaseInWater.hh | 2 +- .../include/G4DNAChargeDecreaseInWater.icc | 2 +- .../include/G4DNAChargeIncreaseInWater.hh | 2 +- .../include/G4DNAChargeIncreaseInWater.icc | 2 +- .../include/G4DNACrossSectionDataSet.hh | 2 +- ...lderChargeChangeTotalCrossSectionPolicy.hh | 2 +- ...derChargeChangeTotalCrossSectionPolicy.icc | 2 +- .../include/G4DNAElectronBornExcitation.hh | 2 +- .../include/G4DNAElectronElasticBrenner.hh | 2 +- .../G4DNAElectronElasticEmfietzoglou.hh | 2 +- .../G4DNAElectronElasticScatteringInWater.hh | 54 +- .../G4DNAElectronElasticScatteringInWater.icc | 2 +- .../include/G4DNAElectronExcitation.hh | 2 +- ...NAEmfietzoglouAngularDistributionPolicy.hh | 2 +- ...oglouExcitationTotalCrossSectionPolicy.icc | 2 +- .../include/G4DNAExcitationInWater.hh | 2 +- .../include/G4DNAExcitationInWater.icc | 2 +- .../include/G4DNAGenericIonsManager.hh | 2 +- .../include/G4DNAHeliumChargeIncrease.hh | 2 +- ...AHeliumChargeIncreaseFinalStatesPolicy.icc | 2 +- .../include/G4DNAHeliumExcitation.hh | 2 +- .../include/G4DNAHydrogenChargeIncrease.hh | 2 +- ...ydrogenChargeIncreaseFinalStatesPolicy.icc | 2 +- ...enChargeIncreaseTotalCrossSectionPolicy.hh | 2 +- ...nChargeIncreaseTotalCrossSectionPolicy.icc | 2 +- .../include/G4DNAHydrogenRuddIonization.hh | 2 +- ...ydrogenRuddIonizationFinalStatesPolicy.icc | 2 +- .../include/G4DNAIonizationInWater.hh | 2 +- .../include/G4DNAIonizationInWater.icc | 2 +- ...dGreenExcitationTotalCrossSectionPolicy.hh | 2 +- ...GreenExcitationTotalCrossSectionPolicy.icc | 2 +- .../include/G4DNAProtonBornExcitation.hh | 2 +- .../include/G4DNAProtonChargeDecrease.hh | 2 +- ...AProtonChargeDecreaseFinalStatesPolicy.icc | 2 +- .../include/G4DNAProtonChargeIncrease.hh | 2 +- ...AProtonChargeIncreaseFinalStatesPolicy.icc | 2 +- ...onChargeIncreaseTotalCrossSectionPolicy.hh | 2 +- ...nChargeIncreaseTotalCrossSectionPolicy.icc | 2 +- .../include/G4DNAProtonExcitation.hh | 2 +- .../include/G4DNAProtonRuddIonization.hh | 2 +- .../G4DNARuddIonizationFinalStatesPolicy.icc | 2 +- .../G4DNARutherfordTotalCrossSectionPolicy.hh | 2 +- ...G4DNARutherfordTotalCrossSectionPolicy.icc | 2 +- .../G4DNAStopAndKillBelowEnergyLimitPolicy.hh | 2 +- ...G4DNAStopAndKillBelowEnergyLimitPolicy.icc | 2 +- .../G4DNATotalCrossSectionFromFilePolicy.hh | 2 +- .../G4DNATotalCrossSectionFromFilePolicy.icc | 2 +- .../lowenergy/include/G4EMDataSet.hh | 2 +- .../lowenergy/include/G4FluoTransition.hh | 2 +- .../lowenergy/include/G4LinInterpolation.hh | 2 +- .../include/G4LogLogInterpolation.hh | 2 +- .../include/G4LowEnergyBraggModel.hh | 2 +- .../include/G4LowEnergyBremsstrahlung.hh | 2 +- .../lowenergy/include/G4LowEnergyCompton.hh | 2 +- .../include/G4LowEnergyGammaConversion.hh | 2 +- .../include/G4LowEnergyIonisation.hh | 2 +- .../include/G4LowEnergyPhotoElectric.hh | 2 +- .../include/G4LowEnergyPolarizedCompton.hh | 2 +- .../include/G4LowEnergyPolarizedRayleigh.hh | 2 +- .../lowenergy/include/G4LowEnergyRayleigh.hh | 2 +- .../include/G4PenelopeBremsstrahlung.hh | 2 +- .../G4PenelopeBremsstrahlungAngular.hh | 2 +- .../G4PenelopeBremsstrahlungContinuous.hh | 2 +- .../lowenergy/include/G4PenelopeCompton.hh | 2 +- .../include/G4PenelopeGammaConversion.hh | 2 +- .../lowenergy/include/G4PenelopeIonisation.hh | 2 +- .../include/G4PenelopePhotoElectric.hh | 2 +- .../lowenergy/include/G4PenelopeRayleigh.hh | 2 +- .../lowenergy/include/G4RangeNoTest.hh | 2 +- .../lowenergy/include/G4RangeTest.hh | 2 +- .../include/G4SemiLogInterpolation.hh | 2 +- .../lowenergy/include/G4ShellData.hh | 2 +- .../lowenergy/include/G4ShellEMDataSet.hh | 2 +- .../include/G4VCrossSectionHandler.hh | 2 +- .../lowenergy/include/G4VDNAProcessInWater.hh | 2 +- .../include/G4VDNAProcessInWater.icc | 2 +- .../lowenergy/include/G4VDataSetAlgorithm.hh | 2 +- .../lowenergy/include/G4VEMDataSet.hh | 2 +- .../G4VLowEnergyDiscretePhotonProcess.hh | 2 +- .../G4VLowEnergyTestableDiscreteProcess.hh | 2 +- .../lowenergy/include/G4VRangeTest.hh | 2 +- .../lowenergy/include/G4VeLowEnergyLoss.hh | 2 +- .../include/G4eBremsstrahlungSpectrum.hh | 2 +- .../G4eIonisationCrossSectionHandler.hh | 2 +- .../include/G4eIonisationParameters.hh | 2 +- .../include/G4eIonisationSpectrum.hh | 2 +- .../lowenergy/include/G4eLowEnergyLoss.hh | 2 +- .../lowenergy/include/G4eLowEnergyLoss.icc | 2 +- .../lowenergy/include/G4hLowEnergyLoss.hh | 2 +- .../lowenergy/include/G4hLowEnergyLoss.icc | 2 +- .../include/G4hShellCrossSectionDoubleExp.hh | 2 +- .../G4hShellCrossSectionDoubleExpData.hh | 2 +- .../include/G4hShellCrossSectionExp.hh | 2 +- .../include/G4hShellCrossSectionExpData.hh | 2 +- .../lowenergy/src/G4AtomicDeexcitation.cc | 2 +- .../lowenergy/src/G4AtomicShell.cc | 2 +- .../src/G4AtomicTransitionManager.cc | 4 +- .../lowenergy/src/G4AugerData.cc | 333 +- .../G4BremsstrahlungCrossSectionHandler.cc | 2 +- .../src/G4BremsstrahlungParameters.cc | 2 +- .../lowenergy/src/G4CompositeEMDataSet.cc | 2 +- .../lowenergy/src/G4CrossSectionHandler.cc | 2 +- .../src/G4DNAAlphaPlusChargeDecrease.cc | 2 +- .../src/G4DNAAlphaPlusChargeIncrease.cc | 2 +- .../lowenergy/src/G4DNAAlphaPlusExcitation.cc | 2 +- .../src/G4DNAAlphaPlusPlusChargeDecrease.cc | 2 +- .../src/G4DNAAlphaPlusPlusExcitation.cc | 2 +- .../G4DNABrennerAngularDistributionPolicy.cc | 2 +- .../lowenergy/src/G4DNACrossSectionDataSet.cc | 2 +- .../src/G4DNAElectronBornExcitation.cc | 2 +- .../src/G4DNAElectronElasticBrenner.cc | 2 +- .../src/G4DNAElectronElasticEmfietzoglou.cc | 2 +- .../lowenergy/src/G4DNAElectronExcitation.cc | 2 +- ...NAEmfietzoglouAngularDistributionPolicy.cc | 2 +- .../lowenergy/src/G4DNAGenericIonsManager.cc | 2 +- .../src/G4DNAHeliumChargeIncrease.cc | 2 +- .../lowenergy/src/G4DNAHeliumExcitation.cc | 2 +- .../src/G4DNAHydrogenChargeIncrease.cc | 2 +- .../src/G4DNAHydrogenRuddIonization.cc | 2 +- .../src/G4DNAProtonBornExcitation.cc | 2 +- .../src/G4DNAProtonChargeDecrease.cc | 2 +- .../src/G4DNAProtonChargeIncrease.cc | 2 +- .../lowenergy/src/G4DNAProtonExcitation.cc | 2 +- .../src/G4DNAProtonRuddIonization.cc | 2 +- .../lowenergy/src/G4EMDataSet.cc | 2 +- .../lowenergy/src/G4FluoData.cc | 43 +- .../lowenergy/src/G4FluoTransition.cc | 2 +- .../lowenergy/src/G4LinInterpolation.cc | 2 +- .../lowenergy/src/G4LogLogInterpolation.cc | 2 +- .../lowenergy/src/G4LowEnergyBraggModel.cc | 2 +- .../src/G4LowEnergyBremsstrahlung.cc | 2 +- .../lowenergy/src/G4LowEnergyCompton.cc | 2 +- .../src/G4LowEnergyGammaConversion.cc | 2 +- .../lowenergy/src/G4LowEnergyIonisation.cc | 2 +- .../lowenergy/src/G4LowEnergyPhotoElectric.cc | 2 +- .../src/G4LowEnergyPolarizedCompton.cc | 2 +- .../src/G4LowEnergyPolarizedRayleigh.cc | 2 +- .../lowenergy/src/G4LowEnergyRayleigh.cc | 2 +- .../lowenergy/src/G4PenelopeBremsstrahlung.cc | 2 +- .../src/G4PenelopeBremsstrahlungAngular.cc | 2 +- .../src/G4PenelopeBremsstrahlungContinuous.cc | 2 +- .../lowenergy/src/G4PenelopeCompton.cc | 2 +- .../lowenergy/src/G4PenelopeIonisation.cc | 2 +- .../lowenergy/src/G4PenelopePhotoElectric.cc | 2 +- .../lowenergy/src/G4PenelopeRayleigh.cc | 2 +- .../lowenergy/src/G4RangeTest.cc | 2 +- .../lowenergy/src/G4SemiLogInterpolation.cc | 2 +- .../lowenergy/src/G4ShellData.cc | 2 +- .../lowenergy/src/G4ShellEMDataSet.cc | 2 +- .../lowenergy/src/G4VCrossSectionHandler.cc | 2 +- .../src/G4VLowEnergyDiscretePhotonProcess.cc | 2 +- .../lowenergy/src/G4VeLowEnergyLoss.cc | 2 +- .../src/G4eBremsstrahlungSpectrum.cc | 2 +- .../src/G4eIonisationCrossSectionHandler.cc | 2 +- .../lowenergy/src/G4eIonisationParameters.cc | 2 +- .../lowenergy/src/G4eIonisationSpectrum.cc | 2 +- .../lowenergy/src/G4eLowEnergyLoss.cc | 2 +- .../lowenergy/src/G4hLowEnergyLoss.cc | 2 +- .../src/G4hShellCrossSectionDoubleExp.cc | 2 +- .../src/G4hShellCrossSectionDoubleExpData.cc | 2 +- .../lowenergy/src/G4hShellCrossSectionExp.cc | 2 +- .../src/G4hShellCrossSectionExpData.cc | 2 +- .../processes/electromagnetic/muons/History | 8 +- .../include/G4EnergyLossForExtrapolator.hh | 8 +- .../muons/include/G4MuBetheBlochModel.hh | 2 +- .../muons/include/G4MuBremsstrahlung.hh | 2 +- .../muons/include/G4MuBremsstrahlung52.hh | 2 +- .../muons/include/G4MuBremsstrahlung52.icc | 2 +- .../muons/include/G4MuBremsstrahlungModel.hh | 2 +- .../muons/include/G4MuIonisation.hh | 2 +- .../muons/include/G4MuIonisation52.hh | 2 +- .../muons/include/G4MuIonisation52.icc | 2 +- .../muons/include/G4MuPairProduction.hh | 2 +- .../muons/include/G4MuPairProduction52.hh | 2 +- .../muons/include/G4MuPairProduction52.icc | 2 +- .../muons/include/G4MuPairProductionModel.hh | 2 +- .../muons/include/G4VMuEnergyLoss.hh | 2 +- .../muons/include/G4VMuEnergyLoss.icc | 2 +- .../muons/src/G4EnergyLossForExtrapolator.cc | 2 +- .../muons/src/G4MuBetheBlochModel.cc | 2 +- .../muons/src/G4MuBremsstrahlung.cc | 2 +- .../muons/src/G4MuBremsstrahlung52.cc | 6 +- .../muons/src/G4MuBremsstrahlungModel.cc | 2 +- .../muons/src/G4MuIonisation.cc | 2 +- .../muons/src/G4MuIonisation52.cc | 6 +- .../muons/src/G4MuPairProduction.cc | 2 +- .../muons/src/G4MuPairProduction52.cc | 6 +- .../muons/src/G4MuPairProductionModel.cc | 2 +- .../muons/src/G4VMuEnergyLoss.cc | 2 +- .../electromagnetic/polarisation/GNUmakefile | 37 + .../electromagnetic/polarisation/History | 52 + .../include/G4PolarizationHelper.hh | 60 + .../include/G4PolarizationManager.hh | 133 + .../include/G4PolarizationMessenger.hh | 92 + .../G4PolarizedAnnihilationCrossSection.hh | 99 + .../include/G4PolarizedAnnihilationModel.hh | 139 + .../include/G4PolarizedBhabhaCrossSection.hh | 78 + .../G4PolarizedBremsstrahlungCrossSection.hh | 88 +- .../include/G4PolarizedCompton.hh | 144 + .../include/G4PolarizedComptonCrossSection.hh | 109 + .../include/G4PolarizedComptonModel.hh | 137 + .../include/G4PolarizedGammaConversion.hh | 109 + .../G4PolarizedGammaConversionModel.hh | 94 + .../include/G4PolarizedMollerBhabhaModel.hh | 121 + .../include/G4PolarizedMollerCrossSection.hh | 78 + .../G4PolarizedPairProductionCrossSection.hh | 81 + .../polarisation/include/G4StokesVector.hh | 113 + .../include/G4VPolarizedCrossSection.hh | 80 + .../include/G4ePolarizedBremsstrahlung.hh | 70 +- .../G4ePolarizedBremsstrahlungModel.hh | 93 + .../include/G4ePolarizedIonisation.hh | 152 + .../include/G4eplusPolarizedAnnihilation.hh | 155 + .../polarisation/src/G4PolarizationHelper.cc | 156 + .../polarisation/src/G4PolarizationManager.cc | 114 + .../src/G4PolarizationMessenger.cc | 167 + .../G4PolarizedAnnihilationCrossSection.cc | 315 + .../src/G4PolarizedAnnihilationModel.cc | 375 ++ .../src/G4PolarizedBhabhaCrossSection.cc | 307 + .../G4PolarizedBremsstrahlungCrossSection.cc | 223 + .../polarisation/src/G4PolarizedCompton.cc | 311 + .../src/G4PolarizedComptonCrossSection.cc | 219 + .../src/G4PolarizedComptonModel.cc | 377 ++ .../src/G4PolarizedGammaConversion.cc | 124 +- .../src/G4PolarizedGammaConversionModel.cc | 144 + .../src/G4PolarizedMollerBhabhaModel.cc | 354 + .../src/G4PolarizedMollerCrossSection.cc | 273 + .../G4PolarizedPairProductionCrossSection.cc | 215 + .../polarisation/src/G4StokesVector.cc | 208 + .../src/G4VPolarizedCrossSection.cc | 145 + .../src/G4ePolarizedBremsstrahlung.cc | 95 + .../src/G4ePolarizedBremsstrahlungModel.cc | 135 + .../src/G4ePolarizedIonisation.cc | 298 + .../src/G4eplusPolarizedAnnihilation.cc | 312 + .../electromagnetic/standard/History | 116 +- .../standard/include/G4ASTARStopping.hh | 2 +- .../standard/include/G4BetheBlochModel.hh | 2 +- .../standard/include/G4BetheHeitlerModel.hh | 2 +- .../standard/include/G4BohrFluctuations.hh | 2 +- .../standard/include/G4BraggIonModel.hh | 2 +- .../standard/include/G4BraggModel.hh | 2 +- .../standard/include/G4ComptonScattering.hh | 23 +- .../standard/include/G4ComptonScattering52.hh | 2 +- .../standard/include/G4CoulombScattering.hh | 16 +- .../include/G4CoulombScatteringModel.hh | 65 +- .../standard/include/G4GammaConversion.hh | 12 +- .../standard/include/G4GammaConversion52.hh | 2 +- .../standard/include/G4InitXscPAI.hh | 2 +- .../standard/include/G4IonFluctuations.hh | 2 +- .../standard/include/G4KleinNishinaCompton.hh | 15 +- .../standard/include/G4MollerBhabhaModel.hh | 14 +- .../standard/include/G4MscModel71.hh | 2 +- .../standard/include/G4MultipleScattering.hh | 34 +- .../include/G4MultipleScattering52.hh | 2 +- .../include/G4MultipleScattering52.icc | 2 +- .../include/G4MultipleScattering71.hh | 4 +- .../standard/include/G4PAIModel.hh | 6 +- .../standard/include/G4PAIxSection.hh | 2 +- .../standard/include/G4PEEffectModel.hh | 2 +- .../standard/include/G4PSTARStopping.hh | 2 +- .../standard/include/G4PhotoElectricEffect.hh | 14 +- .../include/G4PhotoElectricEffect52.hh | 2 +- .../include/G4PolarizedComptonScattering.hh | 2 +- .../include/G4UniversalFluctuation.hh | 2 +- .../standard/include/G4UrbanMscModel.hh | 39 +- .../standard/include/G4VeEnergyLoss.hh | 2 +- .../standard/include/G4VeEnergyLoss.icc | 2 +- .../standard/include/G4VhEnergyLoss.hh | 2 +- .../standard/include/G4VhEnergyLoss.icc | 2 +- .../standard/include/G4WaterStopping.hh | 2 +- .../standard/include/G4eBremsstrahlung.hh | 12 +- .../standard/include/G4eBremsstrahlung52.hh | 2 +- .../standard/include/G4eBremsstrahlung52.icc | 2 +- .../include/G4eBremsstrahlungModel.hh | 18 +- .../include/G4eCoulombScatteringModel.hh | 69 +- .../standard/include/G4eIonisation.hh | 2 +- .../standard/include/G4eIonisation52.hh | 2 +- .../standard/include/G4eIonisation52.icc | 2 +- .../standard/include/G4eeToTwoGammaModel.hh | 11 +- .../standard/include/G4eplusAnnihilation.hh | 24 +- .../standard/include/G4eplusAnnihilation52.hh | 2 +- .../standard/include/G4hIonisation.hh | 2 +- .../standard/include/G4hIonisation52.hh | 2 +- .../standard/include/G4hIonisation52.icc | 2 +- .../standard/include/G4hMultipleScattering.hh | 128 + .../standard/include/G4ionIonisation.hh | 2 +- .../standard/src/G4ASTARStopping.cc | 2 +- .../standard/src/G4BetheBlochModel.cc | 20 +- .../standard/src/G4BetheHeitlerModel.cc | 2 +- .../standard/src/G4BohrFluctuations.cc | 2 +- .../standard/src/G4BraggIonModel.cc | 9 +- .../standard/src/G4BraggModel.cc | 2 +- .../standard/src/G4ComptonScattering.cc | 38 +- .../standard/src/G4ComptonScattering52.cc | 6 +- .../standard/src/G4CoulombScattering.cc | 34 +- .../standard/src/G4CoulombScatteringModel.cc | 156 +- .../standard/src/G4GammaConversion.cc | 28 +- .../standard/src/G4GammaConversion52.cc | 6 +- .../standard/src/G4InitXscPAI.cc | 2 +- .../standard/src/G4IonFluctuations.cc | 2 +- .../standard/src/G4KleinNishinaCompton.cc | 2 +- .../standard/src/G4MollerBhabhaModel.cc | 10 +- .../standard/src/G4MscModel71.cc | 2 +- .../standard/src/G4MultipleScattering.cc | 43 +- .../standard/src/G4MultipleScattering52.cc | 6 +- .../standard/src/G4MultipleScattering71.cc | 7 +- .../standard/src/G4PAIModel.cc | 78 +- .../standard/src/G4PAIxSection.cc | 2 +- .../standard/src/G4PEEffectModel.cc | 2 +- .../standard/src/G4PSTARStopping.cc | 2 +- .../standard/src/G4PhotoElectricEffect.cc | 28 +- .../standard/src/G4PhotoElectricEffect52.cc | 6 +- .../src/G4PolarizedComptonScattering.cc | 2 +- .../standard/src/G4UniversalFluctuation.cc | 2 +- .../standard/src/G4UrbanMscModel.cc | 398 +- .../standard/src/G4VeEnergyLoss.cc | 2 +- .../standard/src/G4VhEnergyLoss.cc | 2 +- .../standard/src/G4WaterStopping.cc | 2 +- .../standard/src/G4eBremsstrahlung.cc | 2 +- .../standard/src/G4eBremsstrahlung52.cc | 6 +- .../standard/src/G4eBremsstrahlungModel.cc | 41 +- .../standard/src/G4eCoulombScatteringModel.cc | 127 +- .../standard/src/G4eIonisation.cc | 2 +- .../standard/src/G4eIonisation52.cc | 6 +- .../standard/src/G4eeToTwoGammaModel.cc | 155 +- .../standard/src/G4eplusAnnihilation.cc | 22 +- .../standard/src/G4eplusAnnihilation52.cc | 9 +- .../standard/src/G4hIonisation.cc | 2 +- .../standard/src/G4hIonisation52.cc | 6 +- .../standard/src/G4hMultipleScattering.cc | 143 + .../standard/src/G4ionIonisation.cc | 2 +- .../processes/electromagnetic/utils/History | 27 +- .../utils/include/G4DummyModel.hh | 2 +- .../utils/include/G4EmCalculator.hh | 6 +- .../utils/include/G4EmCorrections.hh | 2 +- .../utils/include/G4EmModelManager.hh | 2 +- .../utils/include/G4EmMultiModel.hh | 2 +- .../utils/include/G4EmProcessOptions.hh | 2 +- .../utils/include/G4EmTableType.hh | 2 +- .../utils/include/G4EnergyLossMessenger.hh | 7 +- .../utils/include/G4EnergyLossTables.hh | 2 +- .../utils/include/G4LossTableBuilder.hh | 2 +- .../utils/include/G4LossTableManager.hh | 101 +- .../utils/include/G4VEmFluctuationModel.hh | 2 +- .../utils/include/G4VEmModel.hh | 43 +- .../utils/include/G4VEmProcess.hh | 14 +- .../utils/include/G4VEnergyLoss.hh | 2 +- .../utils/include/G4VEnergyLossProcess.hh | 7 +- .../utils/include/G4VMultipleScattering.hh | 2 +- .../utils/include/G4ionEffectiveCharge.hh | 8 +- .../electromagnetic/utils/src/G4DummyModel.cc | 2 +- .../utils/src/G4EmCalculator.cc | 36 +- .../utils/src/G4EmCorrections.cc | 2 +- .../utils/src/G4EmModelManager.cc | 2 +- .../utils/src/G4EmMultiModel.cc | 2 +- .../utils/src/G4EmProcessOptions.cc | 2 +- .../utils/src/G4EnergyLossMessenger.cc | 38 +- .../utils/src/G4EnergyLossTables.cc | 2 +- .../utils/src/G4LossTableBuilder.cc | 2 +- .../utils/src/G4LossTableManager.cc | 17 +- .../utils/src/G4VEmFluctuationModel.cc | 2 +- .../electromagnetic/utils/src/G4VEmModel.cc | 2 +- .../electromagnetic/utils/src/G4VEmProcess.cc | 21 +- .../utils/src/G4VEnergyLoss.cc | 2 +- .../utils/src/G4VEnergyLossProcess.cc | 2 +- .../utils/src/G4VMultipleScattering.cc | 2 +- .../utils/src/G4ionEffectiveCharge.cc | 7 +- .../xrays/include/G4Cerenkov.hh | 2 +- .../xrays/include/G4ForwardXrayTR.hh | 2 +- .../xrays/include/G4GammaXTRadiator.hh | 2 +- .../xrays/include/G4RegularXTRadiator.hh | 2 +- .../xrays/include/G4Scintillation.hh | 2 +- .../xrays/include/G4StrawTubeXTRadiator.hh | 2 +- .../xrays/include/G4SynchrotronRadiation.hh | 2 +- .../include/G4SynchrotronRadiationInMat.hh | 2 +- .../xrays/include/G4TransitionRadiation.hh | 2 +- .../include/G4TransparentRegXTRadiator.hh | 2 +- .../xrays/include/G4VTRModel.hh | 2 +- .../xrays/include/G4VTransitionRadiation.hh | 2 +- .../xrays/include/G4VXTRenergyLoss.hh | 2 +- .../electromagnetic/xrays/src/G4Cerenkov.cc | 2 +- .../xrays/src/G4ForwardXrayTR.cc | 2 +- .../xrays/src/G4GammaXTRadiator.cc | 2 +- .../xrays/src/G4RegularXTRadiator.cc | 2 +- .../xrays/src/G4Scintillation.cc | 2 +- .../xrays/src/G4StrawTubeXTRadiator.cc | 2 +- .../xrays/src/G4SynchrotronRadiation.cc | 2 +- .../xrays/src/G4SynchrotronRadiationInMat.cc | 2 +- .../xrays/src/G4TransitionRadiation.cc | 2 +- .../xrays/src/G4TransparentRegXTRadiator.cc | 2 +- .../xrays/src/G4VTransitionRadiation.cc | 2 +- .../xrays/src/G4VXTRenergyLoss.cc | 2 +- .../hadronic/cross_sections/GNUmakefile | 3 +- .../processes/hadronic/cross_sections/History | 78 + .../include/G4ElectroNuclearCrossSection.hh | 2 +- .../include/G4GlauberGribovCrossSection.hh | 135 + .../include/G4HadronCrossSections.hh | 2 +- .../include/G4IonsShenCrossSection.hh | 4 +- .../include/G4PhotoNuclearCrossSection.hh | 2 +- .../include/G4ProtonInelasticCrossSection.hh | 8 +- .../include/G4UElasticCrossSection.hh | 64 +- .../include/G4UInelasticCrossSection.hh | 61 +- .../include/G4UPiNuclearCrossSection.hh | 110 + .../src/G4ElectroNuclearCrossSection.cc | 2 +- .../src/G4GlauberGribovCrossSection.cc | 777 +++ .../src/G4HadronCaptureDataSet.cc | 2 +- .../src/G4HadronCrossSections.cc | 2 +- .../src/G4HadronElasticDataSet.cc | 2 +- .../src/G4HadronFissionDataSet.cc | 2 +- .../src/G4HadronInelasticDataSet.cc | 2 +- .../src/G4IonsShenCrossSection.cc | 2 + .../src/G4PhotoNuclearCrossSection.cc | 2 +- .../hadronic/cross_sections/src/G4PiData.cc | 2 +- .../src/G4PiNuclearCrossSection.cc | 119 +- .../src/G4ProtonInelasticCrossSection.cc | 6 + .../src/G4UElasticCrossSection.cc | 128 +- .../src/G4UInelasticCrossSection.cc | 147 + .../src/G4UPiNuclearCrossSection.cc | 298 + source/processes/hadronic/management/History | 5 + .../include/G4EnergyRangeManager.hh | 2 +- .../management/include/G4HadLeadBias.hh | 2 +- .../management/include/G4HadronicProcess.hh | 1 - .../include/G4VLeadingParticleBiasing.hh | 2 +- .../management/src/G4EnergyRangeManager.cc | 2 +- .../management/src/G4HadronicProcess.cc | 12 - .../binary_cascade/include/G4BinaryCascade.hh | 1 + .../binary_cascade/src/G4BinaryCascade.cc | 9 +- .../chiral_inv_phase_space/body/GNUmakefile | 1 + .../body/include/G4Chips.hh | 2 +- .../body/include/G4QBesIKJY.hh | 2 +- .../body/include/G4QCHIPSWorld.hh | 2 +- .../body/include/G4QCandidate.hh | 2 +- .../body/include/G4QCandidateVector.hh | 2 +- .../body/include/G4QChipolino.hh | 2 +- .../body/include/G4QContent.hh | 2 +- .../body/include/G4QDecayChan.hh | 2 +- .../body/include/G4QDecayChanVector.hh | 2 +- .../body/include/G4QEnvironment.hh | 2 +- .../body/include/G4QException.hh | 2 +- .../body/include/G4QFragmentation.hh | 137 + .../body/include/G4QHadron.hh | 161 +- .../body/include/G4QHadronBuilder.hh | 69 + .../body/include/G4QHadronVector.hh | 15 +- .../body/include/G4QInteraction.hh | 81 + .../body/include/G4QInteractionVector.hh | 56 + .../body/include/G4QIsotope.hh | 2 +- .../body/include/G4QNucleus.hh | 280 +- .../body/include/G4QPDGCode.hh | 2 +- .../body/include/G4QPDGCodeVector.hh | 2 +- .../body/include/G4QPDGToG4Particle.hh | 2 +- .../body/include/G4QParentCluster.hh | 2 +- .../body/include/G4QParentClusterVector.hh | 2 +- .../body/include/G4QParticle.hh | 2 +- .../body/include/G4QParticleVector.hh | 2 +- .../body/include/G4QParton.hh | 110 + .../body/include/G4QPartonPair.hh | 88 +- .../body/include/G4QPartonPairVector.hh | 44 + .../body/include/G4QPartonVector.hh | 58 +- .../body/include/G4QPomeron.hh | 116 + .../body/include/G4QSplitter.hh | 2 +- .../body/include/G4QString.hh | 174 + .../body/include/G4QStringVector.hh | 26 +- .../body/include/G4Quasmon.hh | 2 +- .../body/include/G4QuasmonString.hh | 2 +- .../body/include/G4QuasmonVector.hh | 2 +- .../body/src/G4QBesIKJY.cc | 2 +- .../body/src/G4QCHIPSWorld.cc | 2 +- .../body/src/G4QCandidate.cc | 48 +- .../body/src/G4QChipolino.cc | 18 +- .../body/src/G4QContent.cc | 20 +- .../body/src/G4QDecayChan.cc | 25 +- .../body/src/G4QEnvironment.cc | 360 +- .../body/src/G4QException.cc | 2 +- .../body/src/G4QFragmentation.cc | 799 +++ .../body/src/G4QHadron.cc | 747 ++- .../body/src/G4QHadronBuilder.cc | 217 + .../body/src/G4QInteraction.cc | 54 + .../body/src/G4QIsotope.cc | 37 +- .../body/src/G4QNucleus.cc | 653 +- .../body/src/G4QPDGCode.cc | 12 +- .../body/src/G4QPDGToG4Particle.cc | 2 +- .../body/src/G4QParentCluster.cc | 28 +- .../body/src/G4QParticle.cc | 27 +- .../body/src/G4QParton.cc | 154 + .../body/src/G4QPartonPair.cc | 43 + .../body/src/G4QPomeron.cc | 132 + .../body/src/G4QSplitter.cc | 49 +- .../body/src/G4QString.cc | 806 +++ .../body/src/G4Quasmon.cc | 229 +- .../body/src/G4QuasmonString.cc | 47 +- .../include/G4ElectroNuclearReaction.hh | 2 +- .../include/G4GammaNuclearReaction.hh | 2 +- .../include/G4QANuMuNuclearCrossSection.hh | 16 +- .../include/G4QAtomicElectronScattering.hh | 179 + .../interface/include/G4QCaptureAtRest.hh | 2 +- .../interface/include/G4QCollision.hh | 10 +- .../interface/include/G4QElastic.hh | 2 +- .../include/G4QElasticCrossSection.hh | 37 +- .../include/G4QElectronNuclearCrossSection.hh | 13 +- .../interface/include/G4QGluonString.hh | 161 + .../include/G4QMuonNuclearCrossSection.hh | 15 +- .../include/G4QNuMuNuclearCrossSection.hh | 15 +- .../include/G4QPhotonNuclearCrossSection.hh | 17 +- .../include/G4QProtonNuclearCrossSection.hh | 13 +- .../G4QStringChipsParticleLevelInterface.hh | 57 + .../include/G4QTauNuclearCrossSection.hh | 15 +- .../G4StringChipsParticleLevelInterface.hh | 42 + .../interface/include/G4VQCrossSection.hh | 23 +- .../src/G4QANuMuNuclearCrossSection.cc | 181 +- .../src/G4QAtomicElectronScattering.cc | 616 ++ .../interface/src/G4QCaptureAtRest.cc | 74 +- .../interface/src/G4QCollision.cc | 283 +- .../interface/src/G4QElastic.cc | 143 +- .../interface/src/G4QElasticCrossSection.cc | 1164 +++- .../src/G4QElectronNuclearCrossSection.cc | 218 +- .../interface/src/G4QGluonString.cc | 603 ++ .../src/G4QMuonNuclearCrossSection.cc | 189 +- .../src/G4QNuMuNuclearCrossSection.cc | 181 +- .../src/G4QPhotonNuclearCrossSection.cc | 179 +- .../src/G4QProtonNuclearCrossSection.cc | 186 +- .../G4QStringChipsParticleLevelInterface.cc | 600 ++ .../src/G4QTauNuclearCrossSection.cc | 185 +- .../G4StringChipsParticleLevelInterface.cc | 353 +- .../interface/src/G4VQCrossSection.cc | 212 +- .../hadronic/models/coherent_elastic/History | 67 + .../include/G4ChargeExchange.hh | 18 +- .../include/G4ChargeExchangeProcess.hh | 2 +- .../include/G4DiffElasticHadrNucleus.hh | 298 - .../include/G4ElasticHadrNucleusHE.hh | 286 +- .../include/G4HadronElastic.hh | 64 +- .../include/G4UHadronElasticProcess.hh | 19 +- .../coherent_elastic/src/G4ChargeExchange.cc | 80 +- .../src/G4ChargeExchangeProcess.cc | 31 +- .../src/G4DiffElasticHadrNucleus.cc | 1016 --- .../src/G4ElasticHadrNucleusHE.cc | 2052 +++--- .../coherent_elastic/src/G4HadronElastic.cc | 115 +- .../coherent_elastic/src/G4HadronValues.cc | 239 - .../src/G4IntegrHadrNucleus.cc | 226 - .../models/coherent_elastic/src/G4LEpp.cc | 3 +- .../src/G4UHadronElasticProcess.cc | 164 +- .../hadronic/models/de_excitation/History | 10 + .../include/G4AlphaEvaporationChannel.hh | 2 +- .../include/G4AlphaEvaporationProbability.hh | 2 +- .../include/G4DeuteronEvaporationChannel.hh | 2 +- .../G4DeuteronEvaporationProbability.hh | 2 +- .../evaporation/include/G4Evaporation.hh | 2 +- .../include/G4EvaporationChannel.hh | 2 +- .../include/G4EvaporationFactory.hh | 2 +- .../include/G4EvaporationProbability.hh | 2 +- .../include/G4He3EvaporationChannel.hh | 2 +- .../include/G4He3EvaporationProbability.hh | 2 +- .../include/G4NeutronEvaporationChannel.hh | 2 +- .../G4NeutronEvaporationProbability.hh | 2 +- .../include/G4ProtonEvaporationChannel.hh | 2 +- .../include/G4ProtonEvaporationProbability.hh | 2 +- .../include/G4TritonEvaporationChannel.hh | 2 +- .../include/G4TritonEvaporationProbability.hh | 2 +- .../evaporation/include/G4VEvaporation.hh | 2 +- .../src/G4AlphaEvaporationChannel.cc | 2 +- .../src/G4AlphaEvaporationProbability.cc | 2 +- .../src/G4DeuteronEvaporationChannel.cc | 2 +- .../src/G4DeuteronEvaporationProbability.cc | 2 +- .../evaporation/src/G4Evaporation.cc | 2 +- .../evaporation/src/G4EvaporationChannel.cc | 2 +- .../evaporation/src/G4EvaporationFactory.cc | 2 +- .../src/G4EvaporationProbability.cc | 2 +- .../src/G4He3EvaporationChannel.cc | 2 +- .../src/G4He3EvaporationProbability.cc | 2 +- .../src/G4NeutronEvaporationChannel.cc | 2 +- .../src/G4NeutronEvaporationProbability.cc | 2 +- .../src/G4ProtonEvaporationChannel.cc | 2 +- .../src/G4ProtonEvaporationProbability.cc | 2 +- .../src/G4TritonEvaporationChannel.cc | 2 +- .../src/G4TritonEvaporationProbability.cc | 2 +- .../evaporation/src/G4VEvaporation.cc | 2 +- .../include/G4B9FermiFragment.hh | 2 +- .../include/G4Be8FermiFragment.hh | 2 +- .../fermi_breakup/include/G4FermiBreakUp.hh | 2 +- .../include/G4FermiConfiguration.hh | 2 +- .../include/G4FermiConfigurationList.hh | 2 +- .../include/G4He5FermiFragment.hh | 2 +- .../include/G4Li5FermiFragment.hh | 2 +- .../include/G4StableFermiFragment.hh | 2 +- .../include/G4UnstableFermiFragment.hh | 2 +- .../fermi_breakup/include/G4VFermiBreakUp.hh | 2 +- .../fermi_breakup/include/G4VFermiFragment.hh | 2 +- .../fermi_breakup/src/G4B9FermiFragment.cc | 2 +- .../fermi_breakup/src/G4Be8FermiFragment.cc | 2 +- .../fermi_breakup/src/G4FermiConfiguration.cc | 2 +- .../fermi_breakup/src/G4He5FermiFragment.cc | 2 +- .../fermi_breakup/src/G4Li5FermiFragment.cc | 2 +- .../src/G4StableFermiFragment.cc | 2 +- .../src/G4UnstableFermiFragment.cc | 2 +- .../fermi_breakup/src/G4VFermiBreakUp.cc | 2 +- .../fermi_breakup/src/G4VFermiFragment.cc | 2 +- .../fission/include/G4CompetitiveFission.hh | 2 +- .../fission/include/G4FissionBarrier.hh | 2 +- .../include/G4FissionLevelDensityParameter.hh | 2 +- .../fission/include/G4FissionParameters.hh | 2 +- .../fission/include/G4FissionProbability.hh | 2 +- .../fission/include/G4VFissionBarrier.hh | 2 +- .../fission/src/G4CompetitiveFission.cc | 2 +- .../fission/src/G4FissionBarrier.cc | 2 +- .../src/G4FissionLevelDensityParameter.cc | 2 +- .../fission/src/G4FissionParameters.cc | 2 +- .../fission/src/G4FissionProbability.cc | 2 +- .../fission/src/G4VFissionBarrier.cc | 2 +- .../include/G4AlphaGEMChannel.hh | 2 +- .../include/G4AlphaGEMProbability.hh | 2 +- .../include/G4B10GEMChannel.hh | 2 +- .../include/G4B10GEMCoulombBarrier.hh | 2 +- .../include/G4B10GEMProbability.hh | 2 +- .../include/G4B11GEMChannel.hh | 2 +- .../include/G4B11GEMCoulombBarrier.hh | 2 +- .../include/G4B11GEMProbability.hh | 2 +- .../include/G4B12GEMChannel.hh | 2 +- .../include/G4B12GEMCoulombBarrier.hh | 2 +- .../include/G4B12GEMProbability.hh | 2 +- .../include/G4B13GEMChannel.hh | 2 +- .../include/G4B13GEMCoulombBarrier.hh | 2 +- .../include/G4B13GEMProbability.hh | 2 +- .../gem_evaporation/include/G4B8GEMChannel.hh | 2 +- .../include/G4B8GEMCoulombBarrier.hh | 2 +- .../include/G4B8GEMProbability.hh | 2 +- .../include/G4Be10GEMChannel.hh | 2 +- .../include/G4Be10GEMCoulombBarrier.hh | 2 +- .../include/G4Be10GEMProbability.hh | 2 +- .../include/G4Be11GEMChannel.hh | 2 +- .../include/G4Be11GEMCoulombBarrier.hh | 2 +- .../include/G4Be11GEMProbability.hh | 2 +- .../include/G4Be12GEMChannel.hh | 2 +- .../include/G4Be12GEMCoulombBarrier.hh | 2 +- .../include/G4Be12GEMProbability.hh | 2 +- .../include/G4Be7GEMChannel.hh | 2 +- .../include/G4Be7GEMCoulombBarrier.hh | 2 +- .../include/G4Be7GEMProbability.hh | 2 +- .../include/G4Be9GEMChannel.hh | 2 +- .../include/G4Be9GEMCoulombBarrier.hh | 2 +- .../include/G4Be9GEMProbability.hh | 2 +- .../include/G4C10GEMChannel.hh | 2 +- .../include/G4C10GEMCoulombBarrier.hh | 2 +- .../include/G4C10GEMProbability.hh | 2 +- .../include/G4C11GEMChannel.hh | 2 +- .../include/G4C11GEMCoulombBarrier.hh | 2 +- .../include/G4C11GEMProbability.hh | 2 +- .../include/G4C12GEMChannel.hh | 2 +- .../include/G4C12GEMCoulombBarrier.hh | 2 +- .../include/G4C12GEMProbability.hh | 2 +- .../include/G4C13GEMChannel.hh | 2 +- .../include/G4C13GEMCoulombBarrier.hh | 2 +- .../include/G4C13GEMProbability.hh | 2 +- .../include/G4C14GEMChannel.hh | 2 +- .../include/G4C14GEMCoulombBarrier.hh | 2 +- .../include/G4C14GEMProbability.hh | 2 +- .../include/G4C15GEMChannel.hh | 2 +- .../include/G4C15GEMCoulombBarrier.hh | 2 +- .../include/G4C15GEMProbability.hh | 2 +- .../include/G4C16GEMChannel.hh | 2 +- .../include/G4C16GEMCoulombBarrier.hh | 2 +- .../include/G4C16GEMProbability.hh | 2 +- .../include/G4DeuteronGEMChannel.hh | 2 +- .../include/G4DeuteronGEMProbability.hh | 2 +- .../include/G4EvaporationGEMFactory.hh | 2 +- .../include/G4F17GEMChannel.hh | 2 +- .../include/G4F17GEMCoulombBarrier.hh | 2 +- .../include/G4F17GEMProbability.hh | 2 +- .../include/G4F18GEMChannel.hh | 2 +- .../include/G4F18GEMCoulombBarrier.hh | 2 +- .../include/G4F18GEMProbability.hh | 2 +- .../include/G4F19GEMChannel.hh | 2 +- .../include/G4F19GEMCoulombBarrier.hh | 2 +- .../include/G4F19GEMProbability.hh | 2 +- .../include/G4F20GEMChannel.hh | 2 +- .../include/G4F20GEMCoulombBarrier.hh | 2 +- .../include/G4F20GEMProbability.hh | 2 +- .../include/G4F21GEMChannel.hh | 2 +- .../include/G4F21GEMCoulombBarrier.hh | 2 +- .../include/G4F21GEMProbability.hh | 2 +- .../gem_evaporation/include/G4GEMChannel.hh | 2 +- .../include/G4GEMCoulombBarrierHE.hh | 2 +- .../include/G4He3GEMChannel.hh | 2 +- .../include/G4He3GEMProbability.hh | 2 +- .../include/G4He6GEMChannel.hh | 2 +- .../include/G4He6GEMCoulombBarrier.hh | 2 +- .../include/G4He6GEMProbability.hh | 2 +- .../include/G4He8GEMChannel.hh | 2 +- .../include/G4He8GEMCoulombBarrier.hh | 2 +- .../include/G4He8GEMProbability.hh | 2 +- .../include/G4Li6GEMChannel.hh | 2 +- .../include/G4Li6GEMCoulombBarrier.hh | 2 +- .../include/G4Li6GEMProbability.hh | 2 +- .../include/G4Li7GEMChannel.hh | 2 +- .../include/G4Li7GEMCoulombBarrier.hh | 2 +- .../include/G4Li7GEMProbability.hh | 2 +- .../include/G4Li8GEMChannel.hh | 2 +- .../include/G4Li8GEMCoulombBarrier.hh | 2 +- .../include/G4Li8GEMProbability.hh | 2 +- .../include/G4Li9GEMChannel.hh | 2 +- .../include/G4Li9GEMCoulombBarrier.hh | 2 +- .../include/G4Li9GEMProbability.hh | 2 +- .../include/G4Mg22GEMChannel.hh | 2 +- .../include/G4Mg22GEMCoulombBarrier.hh | 2 +- .../include/G4Mg22GEMProbability.hh | 2 +- .../include/G4Mg23GEMChannel.hh | 2 +- .../include/G4Mg23GEMCoulombBarrier.hh | 2 +- .../include/G4Mg23GEMProbability.hh | 2 +- .../include/G4Mg24GEMChannel.hh | 2 +- .../include/G4Mg24GEMCoulombBarrier.hh | 2 +- .../include/G4Mg24GEMProbability.hh | 2 +- .../include/G4Mg25GEMChannel.hh | 2 +- .../include/G4Mg25GEMCoulombBarrier.hh | 2 +- .../include/G4Mg25GEMProbability.hh | 2 +- .../include/G4Mg26GEMChannel.hh | 2 +- .../include/G4Mg26GEMCoulombBarrier.hh | 2 +- .../include/G4Mg26GEMProbability.hh | 2 +- .../include/G4Mg27GEMChannel.hh | 2 +- .../include/G4Mg27GEMCoulombBarrier.hh | 2 +- .../include/G4Mg27GEMProbability.hh | 2 +- .../include/G4Mg28GEMChannel.hh | 2 +- .../include/G4Mg28GEMCoulombBarrier.hh | 2 +- .../include/G4Mg28GEMProbability.hh | 2 +- .../include/G4N12GEMChannel.hh | 2 +- .../include/G4N12GEMCoulombBarrier.hh | 2 +- .../include/G4N12GEMProbability.hh | 2 +- .../include/G4N13GEMChannel.hh | 2 +- .../include/G4N13GEMCoulombBarrier.hh | 2 +- .../include/G4N13GEMProbability.hh | 2 +- .../include/G4N14GEMChannel.hh | 2 +- .../include/G4N14GEMCoulombBarrier.hh | 2 +- .../include/G4N14GEMProbability.hh | 2 +- .../include/G4N15GEMChannel.hh | 2 +- .../include/G4N15GEMCoulombBarrier.hh | 2 +- .../include/G4N15GEMProbability.hh | 2 +- .../include/G4N16GEMChannel.hh | 2 +- .../include/G4N16GEMCoulombBarrier.hh | 2 +- .../include/G4N16GEMProbability.hh | 2 +- .../include/G4N17GEMChannel.hh | 2 +- .../include/G4N17GEMCoulombBarrier.hh | 2 +- .../include/G4N17GEMProbability.hh | 2 +- .../include/G4Na21GEMChannel.hh | 2 +- .../include/G4Na21GEMCoulombBarrier.hh | 2 +- .../include/G4Na21GEMProbability.hh | 2 +- .../include/G4Na22GEMChannel.hh | 2 +- .../include/G4Na22GEMCoulombBarrier.hh | 2 +- .../include/G4Na22GEMProbability.hh | 2 +- .../include/G4Na23GEMChannel.hh | 2 +- .../include/G4Na23GEMCoulombBarrier.hh | 2 +- .../include/G4Na23GEMProbability.hh | 2 +- .../include/G4Na24GEMChannel.hh | 2 +- .../include/G4Na24GEMCoulombBarrier.hh | 2 +- .../include/G4Na24GEMProbability.hh | 2 +- .../include/G4Na25GEMChannel.hh | 2 +- .../include/G4Na25GEMCoulombBarrier.hh | 2 +- .../include/G4Na25GEMProbability.hh | 2 +- .../include/G4Ne18GEMChannel.hh | 2 +- .../include/G4Ne18GEMCoulombBarrier.hh | 2 +- .../include/G4Ne18GEMProbability.hh | 2 +- .../include/G4Ne19GEMChannel.hh | 2 +- .../include/G4Ne19GEMCoulombBarrier.hh | 2 +- .../include/G4Ne19GEMProbability.hh | 2 +- .../include/G4Ne20GEMChannel.hh | 2 +- .../include/G4Ne20GEMCoulombBarrier.hh | 2 +- .../include/G4Ne20GEMProbability.hh | 2 +- .../include/G4Ne21GEMChannel.hh | 2 +- .../include/G4Ne21GEMCoulombBarrier.hh | 2 +- .../include/G4Ne21GEMProbability.hh | 2 +- .../include/G4Ne22GEMChannel.hh | 2 +- .../include/G4Ne22GEMCoulombBarrier.hh | 2 +- .../include/G4Ne22GEMProbability.hh | 2 +- .../include/G4Ne23GEMChannel.hh | 2 +- .../include/G4Ne23GEMCoulombBarrier.hh | 2 +- .../include/G4Ne23GEMProbability.hh | 2 +- .../include/G4Ne24GEMChannel.hh | 2 +- .../include/G4Ne24GEMCoulombBarrier.hh | 2 +- .../include/G4Ne24GEMProbability.hh | 2 +- .../include/G4NeutronGEMChannel.hh | 2 +- .../include/G4NeutronGEMProbability.hh | 2 +- .../include/G4O14GEMChannel.hh | 2 +- .../include/G4O14GEMCoulombBarrier.hh | 2 +- .../include/G4O14GEMProbability.hh | 2 +- .../include/G4O15GEMChannel.hh | 2 +- .../include/G4O15GEMCoulombBarrier.hh | 2 +- .../include/G4O15GEMProbability.hh | 2 +- .../include/G4O16GEMChannel.hh | 2 +- .../include/G4O16GEMCoulombBarrier.hh | 2 +- .../include/G4O16GEMProbability.hh | 2 +- .../include/G4O17GEMChannel.hh | 2 +- .../include/G4O17GEMCoulombBarrier.hh | 2 +- .../include/G4O17GEMProbability.hh | 2 +- .../include/G4O18GEMChannel.hh | 2 +- .../include/G4O18GEMCoulombBarrier.hh | 2 +- .../include/G4O18GEMProbability.hh | 2 +- .../include/G4O19GEMChannel.hh | 2 +- .../include/G4O19GEMCoulombBarrier.hh | 2 +- .../include/G4O19GEMProbability.hh | 2 +- .../include/G4O20GEMChannel.hh | 2 +- .../include/G4O20GEMCoulombBarrier.hh | 2 +- .../include/G4O20GEMProbability.hh | 2 +- .../include/G4ProtonGEMChannel.hh | 2 +- .../include/G4ProtonGEMProbability.hh | 2 +- .../include/G4TritonGEMChannel.hh | 2 +- .../include/G4TritonGEMProbability.hh | 2 +- .../gem_evaporation/src/G4AlphaGEMChannel.cc | 2 +- .../src/G4AlphaGEMProbability.cc | 2 +- .../src/G4B10GEMProbability.cc | 2 +- .../src/G4B11GEMProbability.cc | 2 +- .../src/G4B12GEMProbability.cc | 2 +- .../src/G4B13GEMProbability.cc | 2 +- .../gem_evaporation/src/G4B8GEMProbability.cc | 2 +- .../src/G4Be10GEMProbability.cc | 2 +- .../src/G4Be11GEMProbability.cc | 2 +- .../src/G4Be12GEMProbability.cc | 2 +- .../src/G4Be7GEMProbability.cc | 2 +- .../src/G4Be9GEMProbability.cc | 2 +- .../src/G4C10GEMProbability.cc | 2 +- .../src/G4C11GEMProbability.cc | 2 +- .../src/G4C12GEMProbability.cc | 2 +- .../src/G4C13GEMProbability.cc | 2 +- .../src/G4C14GEMProbability.cc | 2 +- .../src/G4C15GEMProbability.cc | 2 +- .../src/G4C16GEMProbability.cc | 2 +- .../src/G4DeuteronGEMChannel.cc | 2 +- .../src/G4DeuteronGEMProbability.cc | 2 +- .../src/G4EvaporationGEMFactory.cc | 2 +- .../src/G4F17GEMProbability.cc | 2 +- .../src/G4F18GEMProbability.cc | 2 +- .../src/G4F19GEMProbability.cc | 2 +- .../src/G4F20GEMProbability.cc | 2 +- .../src/G4F21GEMProbability.cc | 2 +- .../gem_evaporation/src/G4GEMChannel.cc | 2 +- .../src/G4GEMCoulombBarrierHE.cc | 2 +- .../gem_evaporation/src/G4He3GEMChannel.cc | 2 +- .../src/G4He3GEMProbability.cc | 2 +- .../src/G4He6GEMProbability.cc | 2 +- .../src/G4He8GEMProbability.cc | 2 +- .../src/G4Li6GEMProbability.cc | 2 +- .../src/G4Li7GEMProbability.cc | 2 +- .../src/G4Li8GEMProbability.cc | 2 +- .../src/G4Li9GEMProbability.cc | 2 +- .../src/G4Mg22GEMProbability.cc | 2 +- .../src/G4Mg23GEMProbability.cc | 2 +- .../src/G4Mg24GEMProbability.cc | 2 +- .../src/G4Mg25GEMProbability.cc | 2 +- .../src/G4Mg26GEMProbability.cc | 2 +- .../src/G4Mg27GEMProbability.cc | 2 +- .../src/G4Mg28GEMProbability.cc | 2 +- .../src/G4N12GEMProbability.cc | 2 +- .../src/G4N13GEMProbability.cc | 2 +- .../src/G4N14GEMProbability.cc | 2 +- .../src/G4N15GEMProbability.cc | 2 +- .../src/G4N16GEMProbability.cc | 2 +- .../src/G4N17GEMProbability.cc | 2 +- .../src/G4Na21GEMProbability.cc | 2 +- .../src/G4Na22GEMProbability.cc | 2 +- .../src/G4Na23GEMProbability.cc | 2 +- .../src/G4Na24GEMProbability.cc | 2 +- .../src/G4Na25GEMProbability.cc | 2 +- .../src/G4Ne18GEMProbability.cc | 2 +- .../src/G4Ne19GEMProbability.cc | 2 +- .../src/G4Ne20GEMProbability.cc | 2 +- .../src/G4Ne21GEMProbability.cc | 2 +- .../src/G4Ne22GEMProbability.cc | 2 +- .../src/G4Ne23GEMProbability.cc | 2 +- .../src/G4Ne24GEMProbability.cc | 2 +- .../src/G4NeutronGEMChannel.cc | 2 +- .../src/G4NeutronGEMProbability.cc | 2 +- .../src/G4O14GEMProbability.cc | 2 +- .../src/G4O15GEMProbability.cc | 2 +- .../src/G4O16GEMProbability.cc | 2 +- .../src/G4O17GEMProbability.cc | 2 +- .../src/G4O18GEMProbability.cc | 2 +- .../src/G4O19GEMProbability.cc | 2 +- .../src/G4O20GEMProbability.cc | 2 +- .../gem_evaporation/src/G4ProtonGEMChannel.cc | 2 +- .../src/G4ProtonGEMProbability.cc | 2 +- .../gem_evaporation/src/G4TritonGEMChannel.cc | 2 +- .../src/G4TritonGEMProbability.cc | 2 +- .../handler/include/G4ExcitationHandler.hh | 17 +- .../include/G4VEvaporationChannel.hh | 2 +- .../include/G4VEvaporationFactory.hh | 2 +- .../management/src/G4VEvaporationChannel.cc | 2 +- .../management/src/G4VEvaporationFactory.cc | 2 +- .../multifragmentation/include/G4Solver.hh | 2 +- .../multifragmentation/include/G4StatMF.hh | 2 +- .../include/G4StatMFChannel.hh | 2 +- .../include/G4StatMFFragment.hh | 2 +- .../include/G4StatMFMacroBiNucleon.hh | 2 +- .../include/G4StatMFMacroChemicalPotential.hh | 2 +- .../include/G4StatMFMacroMultiNucleon.hh | 2 +- .../include/G4StatMFMacroMultiplicity.hh | 2 +- .../include/G4StatMFMacroNucleon.hh | 2 +- .../include/G4StatMFMacroTemperature.hh | 2 +- .../include/G4StatMFMacroTetraNucleon.hh | 2 +- .../include/G4StatMFMacroTriNucleon.hh | 2 +- .../include/G4StatMFMicroCanonical.hh | 2 +- .../include/G4StatMFMicroManager.hh | 2 +- .../include/G4StatMFMicroPartition.hh | 2 +- .../include/G4StatMFParameters.hh | 2 +- .../include/G4VMultiFragmentation.hh | 2 +- .../include/G4VStatMFEnsemble.hh | 2 +- .../include/G4VStatMFMacroCluster.hh | 12 +- .../multifragmentation/src/G4Solver.cc | 2 +- .../multifragmentation/src/G4StatMF.cc | 2 +- .../multifragmentation/src/G4StatMFChannel.cc | 2 +- .../src/G4StatMFFragment.cc | 2 +- .../src/G4StatMFMacroBiNucleon.cc | 2 +- .../src/G4StatMFMacroCanonical.cc | 2 +- .../src/G4StatMFMacroChemicalPotential.cc | 2 +- .../src/G4StatMFMacroMultiNucleon.cc | 2 +- .../src/G4StatMFMacroMultiplicity.cc | 2 +- .../src/G4StatMFMacroNucleon.cc | 2 +- .../src/G4StatMFMacroTemperature.cc | 2 +- .../src/G4StatMFMacroTetraNucleon.cc | 2 +- .../src/G4StatMFMacroTriNucleon.cc | 2 +- .../src/G4StatMFMicroCanonical.cc | 2 +- .../src/G4StatMFMicroManager.cc | 2 +- .../src/G4StatMFMicroPartition.cc | 2 +- .../src/G4StatMFParameters.cc | 2 +- .../src/G4VMultiFragmentation.cc | 2 +- .../src/G4VStatMFEnsemble.cc | 2 +- .../src/G4VStatMFMacroCluster.cc | 2 +- .../util/include/G4AlphaCoulombBarrier.hh | 2 +- .../G4CameronGilbertPairingCorrections.hh | 2 +- .../G4CameronGilbertShellCorrections.hh | 2 +- .../G4CameronShellPlusPairingCorrections.hh | 2 +- .../G4CameronTruranHilfPairingCorrections.hh | 2 +- .../G4CameronTruranHilfShellCorrections.hh | 2 +- .../G4ConstantLevelDensityParameter.hh | 2 +- .../util/include/G4CookPairingCorrections.hh | 2 +- .../util/include/G4CookShellCorrections.hh | 2 +- .../util/include/G4CoulombBarrier.hh | 2 +- .../util/include/G4DeuteronCoulombBarrier.hh | 2 +- .../G4EvaporationLevelDensityParameter.hh | 2 +- .../util/include/G4He3CoulombBarrier.hh | 2 +- .../util/include/G4NeutronCoulombBarrier.hh | 2 +- .../util/include/G4PairingCorrection.hh | 2 +- .../util/include/G4ProtonCoulombBarrier.hh | 2 +- .../util/include/G4ShellCorrection.hh | 2 +- .../util/include/G4TritonCoulombBarrier.hh | 2 +- .../util/include/G4VCoulombBarrier.hh | 2 +- .../util/include/G4VEmissionProbability.hh | 2 +- .../util/include/G4VLevelDensityParameter.hh | 2 +- .../util/src/G4AlphaCoulombBarrier.cc | 2 +- .../src/G4CameronGilbertPairingCorrections.cc | 2 +- .../src/G4CameronGilbertShellCorrections.cc | 2 +- .../G4CameronShellPlusPairingCorrections.cc | 2 +- .../G4CameronTruranHilfPairingCorrections.cc | 2 +- .../G4CameronTruranHilfShellCorrections.cc | 2 +- .../util/src/G4CookPairingCorrections.cc | 2 +- .../util/src/G4CookShellCorrections.cc | 2 +- .../util/src/G4CoulombBarrier.cc | 2 +- .../util/src/G4DeuteronCoulombBarrier.cc | 2 +- .../src/G4EvaporationLevelDensityParameter.cc | 2 +- .../util/src/G4He3CoulombBarrier.cc | 2 +- .../util/src/G4NeutronCoulombBarrier.cc | 2 +- .../util/src/G4PairingCorrection.cc | 2 +- .../util/src/G4ProtonCoulombBarrier.cc | 2 +- .../util/src/G4ShellCorrection.cc | 2 +- .../util/src/G4TritonCoulombBarrier.cc | 2 +- .../util/src/G4VCoulombBarrier.cc | 2 +- .../util/src/G4VEmissionProbability.cc | 2 +- .../util/src/G4VLevelDensityParameter.cc | 2 +- .../hadronic/models/high_energy/History | 26 + .../include/G4HEAntiKaonZeroInelastic.hh | 2 +- .../include/G4HEAntiLambdaInelastic.hh | 2 +- .../include/G4HEAntiNeutronInelastic.hh | 2 +- .../include/G4HEAntiOmegaMinusInelastic.hh | 2 +- .../include/G4HEAntiProtonInelastic.hh | 2 +- .../include/G4HEAntiSigmaMinusInelastic.hh | 2 +- .../include/G4HEAntiSigmaPlusInelastic.hh | 2 +- .../include/G4HEAntiSigmaZeroInelastic.hh | 2 +- .../include/G4HEAntiXiMinusInelastic.hh | 2 +- .../include/G4HEAntiXiZeroInelastic.hh | 2 +- .../high_energy/include/G4HEInelastic.hh | 2 +- .../include/G4HEKaonMinusInelastic.hh | 2 +- .../include/G4HEKaonPlusInelastic.hh | 2 +- .../include/G4HEKaonZeroInelastic.hh | 2 +- .../include/G4HEKaonZeroLongInelastic.hh | 2 +- .../include/G4HEKaonZeroShortInelastic.hh | 2 +- .../include/G4HELambdaInelastic.hh | 2 +- .../include/G4HENeutronInelastic.hh | 2 +- .../include/G4HEOmegaMinusInelastic.hh | 2 +- .../include/G4HEPionMinusInelastic.hh | 2 +- .../include/G4HEPionPlusInelastic.hh | 2 +- .../models/high_energy/include/G4HEPlot.hh | 2 +- .../include/G4HEProtonInelastic.hh | 2 +- .../include/G4HESigmaMinusInelastic.hh | 2 +- .../include/G4HESigmaPlusInelastic.hh | 2 +- .../include/G4HESigmaZeroInelastic.hh | 2 +- .../models/high_energy/include/G4HEVector.hh | 2 +- .../include/G4HEXiMinusInelastic.hh | 2 +- .../include/G4HEXiZeroInelastic.hh | 2 +- .../src/G4HEAntiKaonZeroInelastic.cc | 2 +- .../src/G4HEAntiLambdaInelastic.cc | 2 +- .../src/G4HEAntiNeutronInelastic.cc | 2 +- .../src/G4HEAntiOmegaMinusInelastic.cc | 2 +- .../src/G4HEAntiProtonInelastic.cc | 2 +- .../src/G4HEAntiSigmaMinusInelastic.cc | 2 +- .../src/G4HEAntiSigmaPlusInelastic.cc | 2 +- .../src/G4HEAntiSigmaZeroInelastic.cc | 2 +- .../src/G4HEAntiXiMinusInelastic.cc | 2 +- .../src/G4HEAntiXiZeroInelastic.cc | 2 +- .../high_energy/src/G4HEKaonMinusInelastic.cc | 2 +- .../high_energy/src/G4HEKaonPlusInelastic.cc | 2 +- .../high_energy/src/G4HEKaonZeroInelastic.cc | 2 +- .../src/G4HEKaonZeroLongInelastic.cc | 2 +- .../src/G4HEKaonZeroShortInelastic.cc | 2 +- .../high_energy/src/G4HELambdaInelastic.cc | 2 +- .../high_energy/src/G4HENeutronInelastic.cc | 2 +- .../src/G4HEOmegaMinusInelastic.cc | 2 +- .../high_energy/src/G4HEPionMinusInelastic.cc | 2 +- .../high_energy/src/G4HEPionPlusInelastic.cc | 2 +- .../models/high_energy/src/G4HEPlot.cc | 2 +- .../high_energy/src/G4HEProtonInelastic.cc | 2 +- .../src/G4HESigmaMinusInelastic.cc | 2 +- .../high_energy/src/G4HESigmaPlusInelastic.cc | 2 +- .../high_energy/src/G4HESigmaZeroInelastic.cc | 2 +- .../models/high_energy/src/G4HEVector.cc | 6 +- .../high_energy/src/G4HEXiMinusInelastic.cc | 2 +- .../high_energy/src/G4HEXiZeroInelastic.cc | 2 +- .../include/G4CollisionInitialState.hh | 2 +- .../im_r_matrix/include/G4ListOfCollisions.hh | 2 +- .../include/G4VCrossSectionSource.hh | 8 +- .../include/G4XAnnihilationChannel.hh | 16 +- .../im_r_matrix/src/G4VCrossSectionSource.cc | 10 +- .../im_r_matrix/src/G4XAnnihilationChannel.cc | 16 +- .../leading_particle/include/G4Mars5GeV.hh | 2 +- .../models/leading_particle/src/G4Mars5GeV.cc | 2 +- .../models/low_energy/include/G4LCapture.hh | 2 +- .../low_energy/include/G4LEAlphaInelastic.hh | 2 +- .../include/G4LEAntiKaonZeroInelastic.hh | 2 +- .../include/G4LEAntiLambdaInelastic.hh | 2 +- .../include/G4LEAntiNeutronInelastic.hh | 2 +- .../include/G4LEAntiOmegaMinusInelastic.hh | 2 +- .../include/G4LEAntiProtonInelastic.hh | 2 +- .../include/G4LEAntiSigmaMinusInelastic.hh | 2 +- .../include/G4LEAntiSigmaPlusInelastic.hh | 2 +- .../include/G4LEAntiXiMinusInelastic.hh | 2 +- .../include/G4LEAntiXiZeroInelastic.hh | 2 +- .../include/G4LEDeuteronInelastic.hh | 2 +- .../include/G4LEKaonMinusInelastic.hh | 2 +- .../include/G4LEKaonPlusInelastic.hh | 2 +- .../include/G4LEKaonZeroInelastic.hh | 2 +- .../include/G4LEKaonZeroLInelastic.hh | 2 +- .../include/G4LEKaonZeroSInelastic.hh | 2 +- .../low_energy/include/G4LELambdaInelastic.hh | 2 +- .../include/G4LEOmegaMinusInelastic.hh | 2 +- .../include/G4LEPionMinusInelastic.hh | 2 +- .../include/G4LEPionPlusInelastic.hh | 2 +- .../low_energy/include/G4LEProtonInelastic.hh | 2 +- .../include/G4LESigmaMinusInelastic.hh | 2 +- .../include/G4LESigmaPlusInelastic.hh | 2 +- .../low_energy/include/G4LETritonInelastic.hh | 2 +- .../include/G4LEXiMinusInelastic.hh | 2 +- .../low_energy/include/G4LEXiZeroInelastic.hh | 2 +- .../models/low_energy/include/G4LElastic.hh | 2 +- .../models/low_energy/include/G4LFission.hh | 2 +- .../models/low_energy/src/G4LCapture.cc | 2 +- .../src/G4LEAntiKaonZeroInelastic.cc | 2 +- .../low_energy/src/G4LEAntiLambdaInelastic.cc | 2 +- .../src/G4LEAntiNeutronInelastic.cc | 2 +- .../src/G4LEAntiOmegaMinusInelastic.cc | 2 +- .../low_energy/src/G4LEAntiProtonInelastic.cc | 2 +- .../src/G4LEAntiSigmaMinusInelastic.cc | 2 +- .../src/G4LEAntiSigmaPlusInelastic.cc | 2 +- .../src/G4LEAntiXiMinusInelastic.cc | 2 +- .../low_energy/src/G4LEAntiXiZeroInelastic.cc | 2 +- .../low_energy/src/G4LEKaonMinusInelastic.cc | 2 +- .../low_energy/src/G4LEKaonPlusInelastic.cc | 2 +- .../low_energy/src/G4LEKaonZeroInelastic.cc | 2 +- .../low_energy/src/G4LELambdaInelastic.cc | 2 +- .../low_energy/src/G4LEOmegaMinusInelastic.cc | 2 +- .../low_energy/src/G4LEPionPlusInelastic.cc | 2 +- .../low_energy/src/G4LESigmaMinusInelastic.cc | 2 +- .../low_energy/src/G4LESigmaPlusInelastic.cc | 2 +- .../low_energy/src/G4LEXiMinusInelastic.cc | 2 +- .../low_energy/src/G4LEXiZeroInelastic.cc | 2 +- .../models/low_energy/src/G4LFission.cc | 2 +- .../include/G4HadronicInteraction.hh | 2 +- .../include/G4InelasticInteraction.hh | 2 +- .../models/management/include/G4V3DNucleus.hh | 2 +- .../include/G4VHighEnergyGenerator.hh | 2 +- .../include/G4VIntraNuclearTransportModel.hh | 2 +- .../management/include/G4VKineticNucleon.hh | 2 +- .../management/include/G4VNuclearDensity.hh | 2 +- .../management/include/G4VPreCompoundModel.hh | 2 +- .../models/management/src/G4V3DNucleus.cc | 2 +- .../management/src/G4VHighEnergyGenerator.cc | 2 +- .../src/G4VIntraNuclearTransportModel.cc | 2 +- .../management/src/G4VKineticNucleon.cc | 2 +- .../management/src/G4VNuclearDensity.cc | 2 +- .../management/src/G4VPreCompoundModel.cc | 2 +- .../hadronic/models/neutron_hp/History | 20 + .../include/G4InterpolationIterator.hh | 2 +- .../include/G4InterpolationManager.hh | 2 +- .../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 | 9 +- .../include/G4NeutronHPElementData.hh | 2 +- .../include/G4NeutronHPEnAngCorrelation.hh | 2 +- .../include/G4NeutronHPEnergyDistribution.hh | 2 +- .../include/G4NeutronHPEvapSpectrum.hh | 2 +- .../include/G4NeutronHPFCFissionFS.hh | 2 +- .../include/G4NeutronHPFSFissionFS.hh | 2 +- .../include/G4NeutronHPFastLegendre.hh | 2 +- .../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 | 2 +- .../neutron_hp/include/G4NeutronHPIsoData.hh | 2 +- .../include/G4NeutronHPIsotropic.hh | 2 +- .../include/G4NeutronHPJENDLHEData.hh} | 80 +- .../include/G4NeutronHPJENDLHEElasticData.hh | 31 +- .../G4NeutronHPJENDLHEInelasticData.hh | 44 + .../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 +- .../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 | 2 +- .../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 +- .../include/G4NeutronHPThermalScattering.hh | 121 + .../G4NeutronHPThermalScatteringData.hh | 97 + .../G4NeutronHPThermalScatteringNames.hh | 64 + .../include/G4NeutronHPWattSpectrum.hh | 2 +- .../neutron_hp/include/G4VNeutronHPEDis.hh | 2 +- .../include/G4VNeutronHPEnergyAngular.hh | 2 +- .../neutron_hp/src/G4NeutronHPElasticFS.cc | 69 + .../neutron_hp/src/G4NeutronHPElementData.cc | 8 +- .../neutron_hp/src/G4NeutronHPFission.cc | 4 +- .../neutron_hp/src/G4NeutronHPInelastic.cc | 2 +- .../neutron_hp/src/G4NeutronHPJENDLHEData.cc | 390 ++ .../src/G4NeutronHPJENDLHEElasticData.cc | 30 +- .../src/G4NeutronHPJENDLHEInelasticData.cc | 21 +- .../src/G4NeutronHPNBodyPhaseSpace.cc | 2 +- .../src/G4NeutronHPThermalScattering.cc | 838 +++ .../src/G4NeutronHPThermalScatteringData.cc | 285 + .../src/G4NeutronHPThermalScatteringNames.cc | 71 +- .../include/G4DiffractiveSplitableHadron.hh | 2 +- .../diffraction/include/G4FTFModel.hh | 2 +- .../diffraction/include/G4FTFParticipants.hh | 2 +- .../src/G4DiffractiveSplitableHadron.cc | 2 +- .../diffraction/src/G4FTFModel.cc | 2 +- .../diffraction/src/G4FTFParticipants.cc | 2 +- .../include/G4ExcitedStringDecay.hh | 2 +- .../include/G4FragmentingString.hh | 2 +- .../hadronization/include/G4HadronBuilder.hh | 2 +- .../include/G4LundStringFragmentation.hh | 2 +- .../include/G4QGSMFragmentation.hh | 2 +- .../include/G4VKinkyStringDecay.hh | 2 +- .../include/G4VLongitudinalStringDecay.hh | 2 +- .../hadronization/src/G4HadronBuilder.cc | 2 +- .../src/G4LundStringFragmentation.cc | 2 +- .../hadronization/src/G4QGSMFragmentation.cc | 2 +- .../hadronization/src/G4VKinkyStringDecay.cc | 2 +- .../src/G4VLongitudinalStringDecay.cc | 2 +- .../management/include/G4EventGenerator.hh | 2 +- .../management/include/G4InteractionCode.hh | 2 +- .../include/G4InteractionContent.hh | 2 +- .../include/G4PomeronCrossSection.hh | 2 +- .../management/include/G4StringModel.hh | 2 +- .../management/include/G4VParticipants.hh | 2 +- .../include/G4VPartonStringModel.hh | 2 +- .../management/include/G4VSplitableHadron.hh | 2 +- .../include/G4VStringFragmentation.hh | 2 +- .../management/include/G4VertexCode.hh | 2 +- .../management/src/G4EventGenerator.cc | 2 +- .../management/src/G4InteractionContent.cc | 2 +- .../management/src/G4PomeronCrossSection.cc | 2 +- .../management/src/G4StringModel.cc | 2 +- .../management/src/G4VParticipants.cc | 2 +- .../management/src/G4VPartonStringModel.cc | 2 +- .../management/src/G4VSplitableHadron.cc | 2 +- .../management/src/G4VStringFragmentation.cc | 2 +- .../photolepton_hadron/muon_nuclear/History | 8 +- .../include/G4MuNuclearInteraction.hh | 2 +- .../include/G4MuNuclearInteraction.icc | 2 +- .../src/G4MuNuclearInteraction.cc | 5 +- .../src/G4MuonNucleusInteractionModel.cc | 2 +- .../src/G4ParametrizedHadronicVertex.cc | 2 +- .../hadronic/models/pre_equilibrium/History | 24 + .../include/G4LowEIonFragmentation.hh | 2 +- .../include/G4PreCompoundAlpha.hh | 2 +- .../include/G4PreCompoundDeuteron.hh | 2 +- .../include/G4PreCompoundEmission.hh | 2 +- .../include/G4PreCompoundFragmentVector.hh | 2 +- .../include/G4PreCompoundFragmentVector.icc | 2 +- .../exciton_model/include/G4PreCompoundHe3.hh | 2 +- .../include/G4PreCompoundModel.hh | 2 +- .../include/G4PreCompoundNeutron.hh | 2 +- .../include/G4PreCompoundParameters.hh | 2 +- .../include/G4PreCompoundProton.hh | 2 +- .../include/G4PreCompoundTransitions.hh | 2 +- .../include/G4PreCompoundTriton.hh | 2 +- .../include/G4VPreCompoundFragment.hh | 28 +- .../include/G4VPreCompoundFragment.icc | 44 +- .../include/G4VPreCompoundIon.hh | 2 +- .../include/G4VPreCompoundNucleon.hh | 2 +- .../src/G4PreCompoundFragmentVector.cc | 2 +- .../exciton_model/src/G4PreCompoundModel.cc | 2 +- .../src/G4PreCompoundParameters.cc | 2 +- .../src/G4PreCompoundTransitions.cc | 2 +- .../src/G4VPreCompoundFragment.cc | 2 +- .../exciton_model/src/G4VPreCompoundIon.cc | 2 +- .../src/G4VPreCompoundNucleon.cc | 2 +- .../hadronic/models/radioactive_decay/History | 7 + .../src/G4NuclearDecayChannel.cc | 70 +- .../include/G4TheoFSGenerator.hh | 2 +- .../theo_high_energy/src/G4TheoFSGenerator.cc | 2 +- source/processes/hadronic/models/util/History | 16 + .../models/util/src/G4Fancy3DNucleus.cc | 11 +- .../hadronic/models/util/src/G4Fragment.cc | 10 +- .../include/G4ElectronNuclearProcess.hh | 2 +- .../include/G4PhotoNuclearProcess.hh | 2 +- .../processes/src/G4ElectronNuclearProcess.cc | 2 +- .../processes/src/G4PhotoNuclearProcess.cc | 2 +- source/processes/hadronic/stopping/History | 12 + .../include/G4MuMinusCaptureCascade.hh | 87 +- .../include/G4MuonMinusCaptureAtRest.hh | 17 +- .../stopping/include/G4StopElementSelector.hh | 7 +- .../stopping/src/G4MuMinusCaptureCascade.cc | 191 +- .../stopping/src/G4MuonMinusCaptureAtRest.cc | 255 +- .../stopping/src/G4StopElementSelector.cc | 13 +- source/processes/hadronic/util/History | 12 + .../util/include/G4HadronicWhiteBoard.hh | 5 +- .../hadronic/util/src/G4HadronicWhiteBoard.cc | 24 +- .../hadronic/util/src/G4ReactionDynamics.cc | 4 +- .../include/G4IVContinuousDiscreteProcess.hh | 2 +- .../include/G4IVRestDiscreteProcess.hh | 2 +- .../management/include/G4ParticleTypes.hh | 2 +- .../management/include/G4ProcTblElement.hh | 2 +- .../management/include/G4ProcTblElement.icc | 2 +- .../management/include/G4ProcessAttribute.hh | 2 +- .../management/include/G4ProcessManager.hh | 2 +- .../management/include/G4ProcessManager.icc | 2 +- .../include/G4ProcessManagerMessenger.hh | 2 +- .../management/include/G4ProcessTable.hh | 2 +- .../management/include/G4ProcessTable.icc | 2 +- .../include/G4ProcessTableMessenger.hh | 2 +- .../management/include/G4ProcessType.hh | 2 +- .../management/include/G4ProcessVector.hh | 2 +- .../management/include/G4ProcessVector.icc | 2 +- .../include/G4VContinuousDiscreteProcess.hh | 2 +- .../include/G4VContinuousProcess.hh | 2 +- .../management/include/G4VDiscreteProcess.hh | 2 +- .../management/include/G4VProcess.hh | 2 +- .../G4VRestContinuousDiscreteProcess.hh | 2 +- .../include/G4VRestContinuousProcess.hh | 2 +- .../include/G4VRestDiscreteProcess.hh | 2 +- .../management/include/G4VRestProcess.hh | 2 +- .../management/include/G4WrapperProcess.hh | 2 +- .../src/G4IVContinuousDiscreteProcess.cc | 2 +- .../management/src/G4IVRestDiscreteProcess.cc | 2 +- .../management/src/G4ProcTblElement.cc | 2 +- .../management/src/G4ProcessAttribute.cc | 2 +- .../management/src/G4ProcessManager.cc | 2 +- .../src/G4ProcessManagerMessenger.cc | 2 +- .../management/src/G4ProcessTable.cc | 2 +- .../management/src/G4ProcessTableMessenger.cc | 2 +- .../management/src/G4ProcessVector.cc | 2 +- .../src/G4VContinuousDiscreteProcess.cc | 2 +- .../management/src/G4VContinuousProcess.cc | 2 +- .../management/src/G4VDiscreteProcess.cc | 2 +- source/processes/management/src/G4VProcess.cc | 2 +- .../src/G4VRestContinuousDiscreteProcess.cc | 2 +- .../src/G4VRestContinuousProcess.cc | 2 +- .../management/src/G4VRestDiscreteProcess.cc | 2 +- .../management/src/G4VRestProcess.cc | 2 +- .../optical/include/G4OpAbsorption.hh | 2 +- .../optical/include/G4OpBoundaryProcess.hh | 2 +- .../processes/optical/include/G4OpRayleigh.hh | 2 +- source/processes/optical/include/G4OpWLS.hh | 2 +- .../processes/optical/src/G4OpAbsorption.cc | 2 +- source/processes/optical/src/G4OpRayleigh.cc | 2 +- source/processes/optical/src/G4OpWLS.cc | 2 +- source/processes/parameterisation/History | 30 +- .../include/G4FastSimulationManager.hh | 49 +- .../include/G4FastSimulationManagerProcess.hh | 4 +- .../G4FastSimulationManagerProcess81.hh | 161 + .../include/G4FastSimulationMessenger.hh | 17 +- .../parameterisation/include/G4FastStep.hh | 2 +- .../parameterisation/include/G4FastStep.icc | 2 +- .../parameterisation/include/G4FastTrack.hh | 2 +- .../include/G4FlavoredParallelWorld.hh | 6 +- .../include/G4GFSManager81.hh | 73 + .../include/G4GlobalFastSimulationManager.hh | 64 +- .../include/G4VFastSimulationModel.hh | 2 +- .../src/G4FastSimulationManager.cc | 14 +- .../src/G4FastSimulationManagerProcess.cc | 5 +- .../src/G4FastSimulationManagerProcess81.cc | 314 + .../src/G4FastSimulationMessenger.cc | 13 +- .../parameterisation/src/G4FastStep.cc | 2 +- .../parameterisation/src/G4FastTrack.cc | 2 +- .../parameterisation/src/G4GFSManager81.cc | 167 + .../src/G4GlobalFastSimulationManager.cc | 291 +- .../src/G4VFastSimulationModel.cc | 2 +- source/processes/scoring/GNUmakefile | 34 + source/processes/scoring/History | 60 + .../scoring/include/G4GCellFinder.hh | 73 + .../scoring/include/G4GeometrySampler.hh | 107 + .../include/G4ImportanceConfigurator.hh | 87 + .../scoring/include/G4ImportanceProcess.hh | 164 + .../scoring/include/G4NewProcessPlacer.hh | 94 + .../include/G4NewWeightCutOffConfigurator.hh | 84 + .../include/G4NewWeightCutOffProcess.hh | 159 + .../include/G4ParallelWorldScoringProcess.hh | 171 + .../scoring/include/G4PlaceOfAction.hh | 49 + .../scoring/include/G4ScoreConfigurator.hh | 86 + .../scoring/include/G4ScoreProcess.hh | 164 + .../scoring/include/G4TrackTerminator.hh | 70 + .../scoring/include/G4VProcessPlacer.hh | 70 + .../include/G4WeightWindowConfigurator.hh | 87 + .../scoring/include/G4WeightWindowProcess.hh | 170 + source/processes/scoring/src/G4GCellFinder.cc | 67 + .../scoring/src/G4GeometrySampler.cc | 263 + .../scoring/src/G4ImportanceConfigurator.cc | 102 + .../scoring/src/G4ImportanceProcess.cc | 471 ++ .../scoring/src/G4NewProcessPlacer.cc | 207 + .../src/G4NewWeightCutOffConfigurator.cc | 115 +- .../scoring/src/G4NewWeightCutOffProcess.cc | 378 ++ .../src/G4ParallelWorldScoringProcess.cc | 449 ++ .../scoring/src/G4ScoreConfigurator.cc | 84 + .../processes/scoring/src/G4ScoreProcess.cc | 413 ++ .../scoring/src/G4WeightWindowConfigurator.cc | 97 + .../scoring/src/G4WeightWindowProcess.cc | 417 ++ source/processes/transportation/GNUmakefile | 2 +- source/processes/transportation/History | 36 +- .../include/G4CoupledTransportation.hh | 204 + .../include/G4CoupledTransportation.icc | 129 + .../include/G4MImportanceConfigurator.hh | 2 +- .../include/G4MScoreConfigurator.hh | 2 +- .../transportation/include/G4MScoreProcess.hh | 2 +- .../include/G4MWeightWindowConfigurator.hh | 2 +- .../include/G4MassGCellFinder.hh | 2 +- .../include/G4MassGeometrySampler.hh | 2 +- .../include/G4MassImportanceProcess.hh | 2 +- .../include/G4MassWeightWindowProcess.hh | 2 +- .../transportation/include/G4NeutronKiller.hh | 141 + .../include/G4NeutronKillerMessenger.hh | 53 +- .../include/G4PImportanceConfigurator.hh | 2 +- .../include/G4PScoreConfigurator.hh | 2 +- .../transportation/include/G4PScoreProcess.hh | 2 +- .../include/G4PWeightWindowConfigurator.hh | 2 +- .../include/G4ParallelGCellFinder.hh | 2 +- .../include/G4ParallelGeometrySampler.hh | 2 +- .../include/G4ParallelImportanceProcess.hh | 2 +- .../include/G4ParallelTransport.hh | 2 +- .../G4ParallelTransportConfigurator.hh | 2 +- .../include/G4ParallelWWnTransportProcess.hh | 2 +- .../include/G4ParallelWeightWindowProcess.hh | 2 +- .../transportation/include/G4PlaceOfAction.hh | 2 +- .../transportation/include/G4ProcessPlacer.hh | 2 +- .../include/G4SamplingPostStepAction.hh | 2 +- .../transportation/include/G4StepLimiter.hh | 2 +- .../include/G4TrackTerminator.hh | 2 +- .../include/G4Transportation.hh | 2 +- .../include/G4Transportation.icc | 2 +- .../include/G4UserSpecialCuts.hh | 2 +- .../include/G4VProcessPlacer.hh | 2 +- .../transportation/include/G4VSampler.hh | 2 +- .../include/G4VSamplerConfigurator.hh | 2 +- .../include/G4VTrackTerminator.hh | 2 +- .../include/G4WeightCutOffConfigurator.hh | 2 +- .../include/G4WeightCutOffProcess.hh | 2 +- .../src/G4CoupledTransportation.cc | 772 +++ .../src/G4MImportanceConfigurator.cc | 4 +- .../src/G4MScoreConfigurator.cc | 4 +- .../transportation/src/G4MScoreProcess.cc | 4 +- .../src/G4MWeightWindowConfigurator.cc | 4 +- .../transportation/src/G4MassGCellFinder.cc | 4 +- .../src/G4MassGeometrySampler.cc | 4 +- .../src/G4MassImportanceProcess.cc | 4 +- .../src/G4MassWeightWindowProcess.cc | 4 +- .../transportation/src/G4NeutronKiller.cc | 95 +- .../src/G4NeutronKillerMessenger.cc | 98 +- .../src/G4PImportanceConfigurator.cc | 4 +- .../src/G4PScoreConfigurator.cc | 4 +- .../transportation/src/G4PScoreProcess.cc | 4 +- .../src/G4PWeightWindowConfigurator.cc | 4 +- .../src/G4ParallelGCellFinder.cc | 4 +- .../src/G4ParallelGeometrySampler.cc | 4 +- .../src/G4ParallelImportanceProcess.cc | 2 +- .../transportation/src/G4ParallelTransport.cc | 2 +- .../src/G4ParallelTransportConfigurator.cc | 4 +- .../src/G4ParallelWWnTransportProcess.cc | 2 +- .../src/G4ParallelWeightWindowProcess.cc | 2 +- .../transportation/src/G4ProcessPlacer.cc | 4 +- .../src/G4SamplingPostStepAction.cc | 2 +- .../transportation/src/G4StepLimiter.cc | 4 +- .../transportation/src/G4Transportation.cc | 159 +- .../transportation/src/G4UserSpecialCuts.cc | 4 +- .../transportation/src/G4VProcessPlacer.cc | 4 +- .../transportation/src/G4VSampler.cc | 4 +- .../src/G4VSamplerConfigurator.cc | 4 +- .../transportation/src/G4VTrackTerminator.cc | 4 +- .../src/G4WeightCutOffConfigurator.cc | 4 +- .../src/G4WeightCutOffProcess.cc | 4 +- source/readout/include/G4DCtable.hh | 2 +- source/readout/include/G4DMmessenger.hh | 2 +- source/readout/include/G4DigiManager.hh | 2 +- source/readout/include/G4VDigitizerModule.hh | 2 +- source/readout/src/G4DCtable.cc | 2 +- source/readout/src/G4DMmessenger.cc | 2 +- source/readout/src/G4DigiManager.cc | 2 +- source/readout/src/G4VDigitizerModule.cc | 2 +- source/run/GNUmakefile | 6 +- source/run/History | 42 +- source/run/include/G4ExceptionHandler.hh | 2 +- source/run/include/G4MSSteppingAction.hh | 2 +- source/run/include/G4MatScanMessenger.hh | 2 +- source/run/include/G4MaterialScanner.hh | 2 +- source/run/include/G4Run.hh | 20 +- source/run/include/G4RunManager.hh | 6 +- source/run/include/G4RunManagerKernel.hh | 2 +- source/run/include/G4RunMessenger.hh | 2 +- .../run/include/G4UserPhysicsListMessenger.hh | 2 +- source/run/include/G4UserRunAction.hh | 2 +- source/run/include/G4VModularPhysicsList.hh | 2 +- source/run/include/G4VPersistencyManager.hh | 2 +- source/run/include/G4VPhysicsConstructor.hh | 2 +- .../include/G4VUserDetectorConstruction.hh | 17 +- source/run/include/G4VUserParallelWorld.hh | 68 + source/run/include/G4VUserPhysicsList.hh | 11 +- .../include/G4VUserPrimaryGeneratorAction.hh | 2 +- source/run/src/G4ExceptionHandler.cc | 2 +- source/run/src/G4MSSteppingAction.cc | 2 +- source/run/src/G4MatScanMessenger.cc | 5 +- source/run/src/G4MaterialScanner.cc | 2 +- source/run/src/G4Run.cc | 17 +- source/run/src/G4RunManager.cc | 34 +- source/run/src/G4RunManagerKernel.cc | 40 +- source/run/src/G4RunMessenger.cc | 2 +- source/run/src/G4UserPhysicsListMessenger.cc | 2 +- source/run/src/G4UserRunAction.cc | 2 +- source/run/src/G4VModularPhysicsList.cc | 2 +- source/run/src/G4VPersistencyManager.cc | 2 +- source/run/src/G4VUserDetectorConstruction.cc | 34 +- .../src/G4VUserParallelWorld.cc} | 29 +- source/run/src/G4VUserPhysicsList.cc | 29 +- .../run/src/G4VUserPrimaryGeneratorAction.cc | 2 +- source/track/GNUmakefile | 3 +- source/track/History | 27 +- .../track/include/G4FieldTrackUpdator.hh | 62 +- source/track/include/G4ForceCondition.hh | 2 +- source/track/include/G4GPILSelection.hh | 2 +- source/track/include/G4ParticleChange.hh | 2 +- source/track/include/G4ParticleChange.icc | 2 +- .../track/include/G4ParticleChangeForDecay.hh | 2 +- .../track/include/G4ParticleChangeForGamma.hh | 23 +- .../track/include/G4ParticleChangeForLoss.hh | 52 +- .../track/include/G4ParticleChangeForMSC.icc | 2 +- .../include/G4ParticleChangeForRadDecay.hh | 2 +- .../include/G4ParticleChangeForTransport.hh | 2 +- .../include/G4ParticleChangeForTransport.icc | 2 +- source/track/include/G4Step.hh | 28 +- source/track/include/G4Step.icc | 56 +- source/track/include/G4StepPoint.hh | 110 +- source/track/include/G4StepPoint.icc | 30 +- source/track/include/G4StepStatus.hh | 2 +- source/track/include/G4SteppingControl.hh | 2 +- source/track/include/G4Track.hh | 2 +- source/track/include/G4Track.icc | 2 +- source/track/include/G4TrackFastVector.hh | 2 +- source/track/include/G4TrackStatus.hh | 2 +- .../include/G4TrackVector.hh | 7 +- source/track/include/G4VParticleChange.hh | 19 +- source/track/include/G4VParticleChange.icc | 47 +- .../track/include/G4VUserTrackInformation.hh | 2 +- .../track/src/G4FieldTrackUpdator.cc | 79 +- source/track/src/G4ParticleChange.cc | 2 +- source/track/src/G4ParticleChangeForDecay.cc | 2 +- source/track/src/G4ParticleChangeForGamma.cc | 55 +- source/track/src/G4ParticleChangeForLoss.cc | 8 +- source/track/src/G4ParticleChangeForMSC.cc | 2 +- .../track/src/G4ParticleChangeForTransport.cc | 11 +- source/track/src/G4Step.cc | 7 +- source/track/src/G4StepPoint.cc | 32 +- source/track/src/G4Track.cc | 2 +- source/track/src/G4VParticleChange.cc | 23 +- source/track/src/G4VUserTrackInformation.cc | 2 +- source/tracking/History | 43 +- source/tracking/include/G4RichTrajectory.hh | 2 +- .../tracking/include/G4RichTrajectoryPoint.hh | 26 +- source/tracking/include/G4SmoothTrajectory.hh | 2 +- .../include/G4SmoothTrajectoryPoint.hh | 2 +- source/tracking/include/G4SteppingManager.hh | 8 +- source/tracking/include/G4SteppingVerbose.hh | 2 +- source/tracking/include/G4TrackingManager.hh | 23 +- .../tracking/include/G4TrackingMessenger.hh | 2 +- source/tracking/include/G4Trajectory.hh | 2 +- source/tracking/include/G4TrajectoryPoint.hh | 2 +- .../tracking/include/G4UserSteppingAction.hh | 2 +- .../tracking/include/G4UserTrackingAction.hh | 2 +- source/tracking/include/G4VSteppingVerbose.hh | 4 +- source/tracking/include/G4VTrajectory.hh | 2 +- source/tracking/include/G4VTrajectoryPoint.hh | 2 +- source/tracking/src/G4RichTrajectory.cc | 39 +- source/tracking/src/G4RichTrajectoryPoint.cc | 101 +- source/tracking/src/G4SmoothTrajectory.cc | 29 +- .../tracking/src/G4SmoothTrajectoryPoint.cc | 2 +- source/tracking/src/G4SteppingManager.cc | 13 +- source/tracking/src/G4SteppingManager2.cc | 2 +- source/tracking/src/G4SteppingVerbose.cc | 7 +- source/tracking/src/G4TrackingManager.cc | 57 +- source/tracking/src/G4TrackingMessenger.cc | 17 +- source/tracking/src/G4Trajectory.cc | 33 +- source/tracking/src/G4TrajectoryPoint.cc | 2 +- source/tracking/src/G4UserSteppingAction.cc | 2 +- source/tracking/src/G4UserTrackingAction.cc | 2 +- source/tracking/src/G4VSteppingVerbose.cc | 6 +- source/tracking/src/G4VTrajectory.cc | 14 +- source/tracking/src/G4VTrajectoryPoint.cc | 2 +- source/visualization/FukuiRenderer/History | 6 +- .../FukuiRenderer/include/G4DAWNFILE.hh | 2 +- .../include/G4DAWNFILESceneHandler.hh | 2 +- .../FukuiRenderer/include/G4DAWNFILEViewer.hh | 2 +- .../FukuiRenderer/include/G4FRClientServer.hh | 2 +- .../FukuiRenderer/include/G4FRConst.hh | 2 +- .../FukuiRenderer/include/G4FRFeatures.hh | 2 +- .../FukuiRenderer/include/G4FRSceneFunc.icc | 8 +- .../FukuiRenderer/include/G4FRofstream.hh | 2 +- .../FukuiRenderer/include/G4FukuiRenderer.hh | 2 +- .../include/G4FukuiRendererSceneHandler.hh | 2 +- .../include/G4FukuiRendererViewer.hh | 2 +- .../FukuiRenderer/src/G4DAWNFILE.cc | 2 +- .../src/G4DAWNFILESceneHandler.cc | 2 +- .../FukuiRenderer/src/G4DAWNFILEViewer.cc | 2 +- .../FukuiRenderer/src/G4FRClientServer.cc | 2 +- .../FukuiRenderer/src/G4FukuiRenderer.cc | 2 +- .../src/G4FukuiRendererSceneHandler.cc | 2 +- .../src/G4FukuiRendererViewer.cc | 2 +- source/visualization/HepRep/History | 22 +- .../visualization/HepRep/include/G4HepRep.hh | 2 +- .../HepRep/include/G4HepRepFile.hh | 2 +- .../include/G4HepRepFileSceneHandler.hh | 2 +- .../HepRep/include/G4HepRepFileViewer.hh | 2 +- .../HepRep/include/G4HepRepMessenger.hh | 2 +- .../HepRep/include/G4HepRepSceneHandler.hh | 6 +- .../HepRep/include/G4HepRepViewer.hh | 2 +- source/visualization/HepRep/src/G4HepRep.cc | 2 +- .../visualization/HepRep/src/G4HepRepFile.cc | 2 +- .../HepRep/src/G4HepRepFileSceneHandler.cc | 279 +- .../HepRep/src/G4HepRepFileViewer.cc | 2 +- .../HepRep/src/G4HepRepMessenger.cc | 2 +- .../HepRep/src/G4HepRepSceneHandler.cc | 31 +- .../HepRep/src/G4HepRepViewer.cc | 2 +- source/visualization/History | 225 +- source/visualization/OpenGL/History | 70 +- .../visualization/OpenGL/include/G4OpenGL.hh | 2 +- .../OpenGL/include/G4OpenGLFontBaseStore.hh | 2 +- .../include/G4OpenGLImmediateSceneHandler.hh | 30 +- .../OpenGL/include/G4OpenGLImmediateViewer.hh | 5 +- .../OpenGL/include/G4OpenGLImmediateWin32.hh | 2 +- .../include/G4OpenGLImmediateWin32Viewer.hh | 2 +- .../OpenGL/include/G4OpenGLImmediateX.hh | 2 +- .../include/G4OpenGLImmediateXViewer.hh | 5 +- .../OpenGL/include/G4OpenGLImmediateXm.hh | 2 +- .../include/G4OpenGLImmediateXmViewer.hh | 5 +- .../OpenGL/include/G4OpenGLSceneHandler.hh | 9 +- .../OpenGL/include/G4OpenGLSceneHandler.icc | 2 +- .../include/G4OpenGLStoredSceneHandler.hh | 62 +- .../OpenGL/include/G4OpenGLStoredViewer.hh | 2 +- .../OpenGL/include/G4OpenGLStoredWin32.hh | 2 +- .../include/G4OpenGLStoredWin32Viewer.hh | 2 +- .../OpenGL/include/G4OpenGLStoredX.hh | 2 +- .../OpenGL/include/G4OpenGLStoredXViewer.hh | 5 +- .../OpenGL/include/G4OpenGLStoredXm.hh | 2 +- .../OpenGL/include/G4OpenGLStoredXmViewer.hh | 5 +- .../OpenGL/include/G4OpenGLTransform3D.hh | 2 +- .../OpenGL/include/G4OpenGLViewer.hh | 20 +- .../OpenGL/include/G4OpenGLViewerMessenger.hh | 49 +- .../OpenGL/include/G4OpenGLWin32Viewer.hh | 2 +- .../OpenGL/include/G4OpenGLXViewer.hh | 9 +- .../include/G4OpenGLXViewerMessenger.hh | 58 + .../OpenGL/include/G4OpenGLXmBox.hh | 2 +- .../include/G4OpenGLXmFourArrowButtons.hh | 2 +- .../OpenGL/include/G4OpenGLXmFramedBox.hh | 2 +- .../OpenGL/include/G4OpenGLXmPushButton.hh | 2 +- .../OpenGL/include/G4OpenGLXmRadioButton.hh | 2 +- .../OpenGL/include/G4OpenGLXmResources.hh | 2 +- .../OpenGL/include/G4OpenGLXmSeparator.hh | 2 +- .../OpenGL/include/G4OpenGLXmSliderBar.hh | 2 +- .../OpenGL/include/G4OpenGLXmTextField.hh | 2 +- .../OpenGL/include/G4OpenGLXmTopLevelShell.hh | 2 +- .../include/G4OpenGLXmVWidgetComponent.hh | 2 +- .../include/G4OpenGLXmVWidgetContainer.hh | 2 +- .../OpenGL/include/G4OpenGLXmVWidgetObject.hh | 2 +- .../OpenGL/include/G4OpenGLXmVWidgetShell.hh | 2 +- .../OpenGL/include/G4OpenGLXmViewer.hh | 2 +- .../include/G4OpenGLXmViewerMessenger.hh | 2 +- .../OpenGL/src/G4OpenGLFontBaseStore.cc | 2 +- .../src/G4OpenGLImmediateSceneHandler.cc | 52 +- .../OpenGL/src/G4OpenGLImmediateViewer.cc | 29 +- .../OpenGL/src/G4OpenGLImmediateWin32.cc | 10 +- .../src/G4OpenGLImmediateWin32Viewer.cc | 6 +- .../OpenGL/src/G4OpenGLImmediateX.cc | 12 +- .../OpenGL/src/G4OpenGLImmediateXViewer.cc | 26 +- .../OpenGL/src/G4OpenGLImmediateXm.cc | 6 +- .../OpenGL/src/G4OpenGLImmediateXmViewer.cc | 26 +- .../OpenGL/src/G4OpenGLSceneHandler.cc | 104 +- .../OpenGL/src/G4OpenGLStoredSceneHandler.cc | 146 +- .../OpenGL/src/G4OpenGLStoredViewer.cc | 164 +- .../OpenGL/src/G4OpenGLStoredWin32.cc | 10 +- .../OpenGL/src/G4OpenGLStoredWin32Viewer.cc | 13 +- .../OpenGL/src/G4OpenGLStoredX.cc | 12 +- .../OpenGL/src/G4OpenGLStoredXViewer.cc | 19 +- .../OpenGL/src/G4OpenGLStoredXm.cc | 6 +- .../OpenGL/src/G4OpenGLStoredXmViewer.cc | 21 +- .../OpenGL/src/G4OpenGLTransform3D.cc | 2 +- .../OpenGL/src/G4OpenGLViewer.cc | 67 +- .../OpenGL/src/G4OpenGLViewerMessenger.cc | 330 + .../OpenGL/src/G4OpenGLWin32Viewer.cc | 2 +- .../OpenGL/src/G4OpenGLXViewer.cc | 71 +- .../OpenGL/src/G4OpenGLXViewerMessenger.cc | 115 + .../visualization/OpenGL/src/G4OpenGLXmBox.cc | 2 +- .../src/G4OpenGLXmConvenienceRoutines.cc | 2 +- .../OpenGL/src/G4OpenGLXmFourArrowButtons.cc | 2 +- .../OpenGL/src/G4OpenGLXmFramedBox.cc | 2 +- .../src/G4OpenGLXmMainMenubarCallbacks.cc | 2 +- .../OpenGL/src/G4OpenGLXmPanningCallbacks.cc | 2 +- .../OpenGL/src/G4OpenGLXmPushButton.cc | 2 +- .../OpenGL/src/G4OpenGLXmRadioButton.cc | 2 +- .../OpenGL/src/G4OpenGLXmRotationCallbacks.cc | 2 +- .../OpenGL/src/G4OpenGLXmSeparator.cc | 2 +- .../OpenGL/src/G4OpenGLXmSliderBar.cc | 2 +- .../OpenGL/src/G4OpenGLXmStyleCallbacks.cc | 2 +- .../OpenGL/src/G4OpenGLXmTextField.cc | 2 +- .../OpenGL/src/G4OpenGLXmTopLevelShell.cc | 2 +- .../OpenGL/src/G4OpenGLXmVWidgetComponent.cc | 2 +- .../OpenGL/src/G4OpenGLXmVWidgetContainer.cc | 2 +- .../OpenGL/src/G4OpenGLXmVWidgetObject.cc | 2 +- .../OpenGL/src/G4OpenGLXmVWidgetShell.cc | 2 +- .../OpenGL/src/G4OpenGLXmViewer.cc | 2 +- .../OpenGL/src/G4OpenGLXmViewerMessenger.cc | 2 +- .../src/G4OpenGLXmWindowHandlingCallbacks.cc | 2 +- source/visualization/OpenInventor/GNUmakefile | 4 +- source/visualization/OpenInventor/History | 27 +- .../OpenInventor/include/G4OpenInventor.hh | 2 +- .../include/G4OpenInventorSceneHandler.hh | 6 +- .../include/G4OpenInventorTransform3D.hh | 2 +- .../OpenInventor/include/G4OpenInventorWin.hh | 2 +- .../include/G4OpenInventorWin32.hh | 2 +- .../include/G4OpenInventorWinViewer.hh | 2 +- .../OpenInventor/include/G4OpenInventorX.hh | 2 +- .../OpenInventor/include/G4OpenInventorXt.hh | 2 +- .../include/G4OpenInventorXtViewer.hh | 2 +- .../OpenInventor/include/HEPVis/SbMath.h | 2 +- .../HEPVis/nodekits/SoDetectorTreeKit.h | 2 +- .../OpenInventor/include/HEPVis/nodes/SoBox.h | 2 +- .../include/HEPVis/nodes/SoCons.h | 2 +- .../include/HEPVis/nodes/SoTrap.h | 2 +- .../OpenInventor/include/HEPVis/nodes/SoTrd.h | 2 +- .../include/HEPVis/nodes/SoTubs.h | 2 +- .../include/SoG4LineSet.h} | 21 +- .../include/SoG4MarkerSet.h} | 21 +- .../OpenInventor/include/SoG4Polyhedron.h | 31 +- .../OpenInventor/src/G4OpenInventor.cc | 2 +- .../src/G4OpenInventorSceneHandler.cc | 92 +- .../src/G4OpenInventorTransform3D.cc | 2 +- .../OpenInventor/src/G4OpenInventorViewer.cc | 56 +- .../OpenInventor/src/G4OpenInventorWin.cc | 2 +- .../src/G4OpenInventorWinViewer.cc | 2 +- .../OpenInventor/src/G4OpenInventorXt.cc | 2 +- .../src/G4OpenInventorXtViewer.cc | 2 +- .../visualization/OpenInventor/src/SoBox.cc | 2 +- .../visualization/OpenInventor/src/SoCons.cc | 2 +- .../OpenInventor/src/SoDetectorTreeKit.cc | 2 +- .../visualization/OpenInventor/src/SoTrap.cc | 2 +- .../visualization/OpenInventor/src/SoTrd.cc | 2 +- .../visualization/OpenInventor/src/SoTubs.cc | 2 +- source/visualization/RayTracer/History | 17 +- .../RayTracer/include/G4RTJpeg.hh | 2 +- .../RayTracer/include/G4RTJpegCoder.hh | 2 +- .../RayTracer/include/G4RTJpegCoderTables.hh | 2 +- .../RayTracer/include/G4RTJpegMaker.hh | 2 +- .../RayTracer/include/G4RTMessenger.hh | 2 +- .../RayTracer/include/G4RTOutBitStream.hh | 2 +- .../RayTracer/include/G4RTSimpleScanner.hh | 2 +- .../RayTracer/include/G4RTSteppingAction.hh | 2 +- .../RayTracer/include/G4RTTrackingAction.hh | 2 +- .../RayTracer/include/G4RTXScanner.hh | 2 +- .../RayTracer/include/G4RayTracer.hh | 2 +- .../RayTracer/include/G4RayTracerFeatures.hh | 2 +- .../include/G4RayTracerSceneHandler.hh | 2 +- .../RayTracer/include/G4RayTracerViewer.hh | 2 +- .../RayTracer/include/G4RayTracerX.hh | 2 +- .../RayTracer/include/G4RayTracerXViewer.hh | 2 +- .../RayTracer/include/G4RayTrajectory.hh | 2 +- .../RayTracer/include/G4RayTrajectoryPoint.hh | 2 +- .../RayTracer/include/G4TheRayTracer.hh | 2 +- .../RayTracer/include/G4VFigureFileMaker.hh | 2 +- .../RayTracer/include/G4VRTScanner.hh | 2 +- .../RayTracer/src/G4RTJpegCoder.cc | 2 +- .../RayTracer/src/G4RTJpegMaker.cc | 2 +- .../RayTracer/src/G4RTMessenger.cc | 12 +- .../RayTracer/src/G4RTOutBitStream.cc | 2 +- .../RayTracer/src/G4RTSimpleScanner.cc | 2 +- .../RayTracer/src/G4RTSteppingAction.cc | 2 +- .../RayTracer/src/G4RTTrackingAction.cc | 2 +- .../RayTracer/src/G4RTXScanner.cc | 2 +- .../RayTracer/src/G4RayTracer.cc | 2 +- .../RayTracer/src/G4RayTracerSceneHandler.cc | 9 +- .../RayTracer/src/G4RayTracerViewer.cc | 2 +- .../RayTracer/src/G4RayTracerX.cc | 2 +- .../RayTracer/src/G4RayTracerXViewer.cc | 2 +- .../RayTracer/src/G4RayTrajectory.cc | 2 +- .../RayTracer/src/G4RayTrajectoryPoint.cc | 2 +- .../RayTracer/src/G4TheRayTracer.cc | 2 +- source/visualization/Tree/GNUmakefile | 3 +- source/visualization/Tree/History | 11 +- .../visualization/Tree/include/G4ASCIITree.hh | 2 +- .../Tree/include/G4ASCIITreeMessenger.hh | 2 +- .../Tree/include/G4ASCIITreeSceneHandler.hh | 2 +- .../Tree/include/G4ASCIITreeViewer.hh | 2 +- source/visualization/Tree/include/G4VTree.hh | 2 +- .../Tree/include/G4VTreeSceneHandler.hh | 2 +- .../Tree/include/G4VTreeSceneHandler.icc | 2 +- .../Tree/include/G4VTreeViewer.hh | 2 +- source/visualization/Tree/src/G4ASCIITree.cc | 2 +- .../Tree/src/G4ASCIITreeMessenger.cc | 2 +- .../Tree/src/G4ASCIITreeSceneHandler.cc | 104 +- .../Tree/src/G4ASCIITreeViewer.cc | 2 +- source/visualization/Tree/src/G4VTree.cc | 2 +- .../Tree/src/G4VTreeSceneHandler.cc | 2 +- .../visualization/Tree/src/G4VTreeViewer.cc | 2 +- .../visualization/VRML/g4vrmlview/g4mini.java | 2 +- .../VRML/g4vrmlview/g4vrmlview.java | 2 +- source/visualization/VRML/include/FRClient.h | 2 +- .../visualization/VRML/include/G4FRClient.hh | 2 +- source/visualization/VRML/include/G4VRML1.hh | 2 +- .../visualization/VRML/include/G4VRML1File.hh | 2 +- .../VRML/include/G4VRML1FileSceneHandler.hh | 2 +- .../VRML/include/G4VRML1FileViewer.hh | 2 +- .../VRML/include/G4VRML1SceneHandler.hh | 2 +- .../VRML/include/G4VRML1Viewer.hh | 2 +- source/visualization/VRML/include/G4VRML2.hh | 2 +- .../visualization/VRML/include/G4VRML2File.hh | 2 +- .../VRML/include/G4VRML2FileSceneHandler.hh | 2 +- .../VRML/include/G4VRML2FileViewer.hh | 2 +- .../VRML/include/G4VRML2SceneHandler.hh | 2 +- .../VRML/include/G4VRML2Viewer.hh | 2 +- .../VRML/include/G4VRMLNetConfig.hh | 2 +- source/visualization/VRML/src/FRClient.cc | 2 +- source/visualization/VRML/src/G4FRClient.cc | 2 +- source/visualization/VRML/src/G4VRML1.cc | 2 +- source/visualization/VRML/src/G4VRML1File.cc | 2 +- .../VRML/src/G4VRML1FileSceneHandler.cc | 2 +- .../VRML/src/G4VRML1FileViewer.cc | 2 +- .../VRML/src/G4VRML1SceneHandler.cc | 2 +- .../VRML/src/G4VRML1SceneHandlerFunc.icc | 2 +- .../visualization/VRML/src/G4VRML1Viewer.cc | 2 +- source/visualization/VRML/src/G4VRML2.cc | 2 +- source/visualization/VRML/src/G4VRML2File.cc | 2 +- .../VRML/src/G4VRML2FileSceneHandler.cc | 2 +- .../VRML/src/G4VRML2FileViewer.cc | 2 +- .../VRML/src/G4VRML2SceneHandler.cc | 2 +- .../VRML/src/G4VRML2SceneHandlerFunc.icc | 2 +- .../visualization/VRML/src/G4VRML2Viewer.cc | 2 +- source/visualization/XXX/History | 26 +- source/visualization/XXX/include/G4XXX.hh | 2 +- source/visualization/XXX/include/G4XXXFile.hh | 2 +- .../XXX/include/G4XXXFileSceneHandler.hh | 2 +- .../XXX/include/G4XXXFileViewer.hh | 18 +- source/visualization/XXX/include/G4XXXSG.hh | 2 +- .../XXX/include/G4XXXSGSceneHandler.hh | 2 +- .../XXX/include/G4XXXSGViewer.hh | 2 +- .../XXX/include/G4XXXSceneHandler.hh | 2 +- .../visualization/XXX/include/G4XXXStored.hh | 2 +- .../XXX/include/G4XXXStoredSceneHandler.hh | 2 +- .../XXX/include/G4XXXStoredViewer.hh | 2 +- .../visualization/XXX/include/G4XXXViewer.hh | 2 +- source/visualization/XXX/src/G4XXX.cc | 2 +- source/visualization/XXX/src/G4XXXFile.cc | 2 +- .../XXX/src/G4XXXFileSceneHandler.cc | 8 +- .../visualization/XXX/src/G4XXXFileViewer.cc | 46 +- source/visualization/XXX/src/G4XXXSG.cc | 2 +- .../XXX/src/G4XXXSGSceneHandler.cc | 15 +- source/visualization/XXX/src/G4XXXSGViewer.cc | 10 +- .../XXX/src/G4XXXSceneHandler.cc | 10 +- source/visualization/XXX/src/G4XXXStored.cc | 2 +- .../XXX/src/G4XXXStoredSceneHandler.cc | 61 +- .../XXX/src/G4XXXStoredViewer.cc | 10 +- source/visualization/XXX/src/G4XXXViewer.cc | 2 +- source/visualization/management/GNUmakefile | 3 +- source/visualization/management/History | 174 +- .../include/G4GraphicsSystemList.hh | 2 +- .../management/include/G4Scene.hh | 30 +- .../management/include/G4Scene.icc | 20 +- .../management/include/G4SceneHandlerList.hh | 2 +- .../management/include/G4SceneList.hh | 2 +- .../management/include/G4VGraphicsSystem.hh | 2 +- .../management/include/G4VGraphicsSystem.icc | 2 +- .../management/include/G4VSceneHandler.hh | 52 +- .../management/include/G4VSceneHandler.icc | 7 +- .../management/include/G4VUserVisAction.hh | 2 +- .../management/include/G4VViewer.hh | 2 +- .../management/include/G4VViewer.icc | 2 +- .../management/include/G4VVisCommand.hh | 2 +- .../management/include/G4VVisCommand.icc | 2 +- .../management/include/G4ViewParameters.hh | 35 +- .../management/include/G4ViewParameters.icc | 77 +- .../management/include/G4ViewerList.hh | 2 +- .../include/G4VisCommandModelCreate.hh | 2 +- .../management/include/G4VisCommands.hh | 16 +- .../include/G4VisCommandsCompound.hh | 2 +- .../include/G4VisCommandsGeometry.hh | 2 +- .../include/G4VisCommandsGeometrySet.hh | 2 +- .../include/G4VisCommandsListManager.hh | 2 +- .../management/include/G4VisCommandsScene.hh | 19 +- .../include/G4VisCommandsSceneAdd.hh | 8 +- .../include/G4VisCommandsSceneHandler.hh | 2 +- .../management/include/G4VisCommandsViewer.hh | 67 +- .../include/G4VisCommandsViewerSet.hh | 7 +- .../management/include/G4VisExecutive.hh | 2 +- .../management/include/G4VisExecutive.icc | 10 +- .../include/G4VisFeaturesOfDAWNFILE.hh | 2 +- .../include/G4VisFeaturesOfFukuiRenderer.hh | 2 +- .../include/G4VisFeaturesOfOpenGL.hh | 2 +- .../include/G4VisFeaturesOfOpenInventor.hh | 2 +- .../management/include/G4VisFilterManager.hh | 2 +- .../management/include/G4VisListManager.hh | 2 +- .../management/include/G4VisManager.hh | 56 +- .../management/include/G4VisManager.icc | 29 +- .../management/include/G4VisModelManager.hh | 2 +- .../management/include/G4VisStateDependent.hh | 2 +- .../management/src/G4GraphicsSystemList.cc | 2 +- .../visualization/management/src/G4Scene.cc | 23 +- .../management/src/G4SceneHandlerList.cc | 2 +- .../management/src/G4SceneList.cc | 2 +- .../management/src/G4VGraphicsSystem.cc | 2 +- .../management/src/G4VSceneHandler.cc | 288 +- .../visualization/management/src/G4VViewer.cc | 2 +- .../management/src/G4VVisCommand.cc | 2 +- .../management/src/G4ViewParameters.cc | 77 +- .../management/src/G4ViewerList.cc | 2 +- .../management/src/G4VisCommands.cc | 153 +- .../management/src/G4VisCommandsCompound.cc | 27 +- .../management/src/G4VisCommandsGeometry.cc | 2 +- .../src/G4VisCommandsGeometrySet.cc | 8 +- .../management/src/G4VisCommandsScene.cc | 198 +- .../management/src/G4VisCommandsSceneAdd.cc | 418 +- .../src/G4VisCommandsSceneHandler.cc | 2 +- .../management/src/G4VisCommandsViewer.cc | 385 +- .../management/src/G4VisCommandsViewerSet.cc | 121 +- .../management/src/G4VisFeaturesOfDAWNFILE.cc | 2 +- .../src/G4VisFeaturesOfFukuiRenderer.cc | 2 +- .../management/src/G4VisFeaturesOfOpenGL.cc | 2 +- .../src/G4VisFeaturesOfOpenInventor.cc | 2 +- .../management/src/G4VisManager.cc | 416 +- .../management/src/G4VisStateDependent.cc | 2 +- source/visualization/modeling/History | 117 +- .../modeling/include/G4AttFilterUtils.hh | 52 + .../modeling/include/G4AttValueFilterT.hh | 220 + .../modeling/include/G4AttributeFilterT.hh | 229 + .../modeling/include/G4AxesModel.hh | 12 +- .../modeling/include/G4BoundingSphereScene.hh | 2 +- .../modeling/include/G4CallbackModel.hh | 2 +- .../include/G4FlavoredParallelWorldModel.hh | 2 +- .../modeling/include/G4HitFilterFactories.hh | 59 + .../modeling/include/G4HitsModel.hh | 16 +- .../modeling/include/G4LogicalVolumeModel.hh | 7 +- .../modeling/include/G4ModelApplyCommandsT.hh | 67 +- .../modeling/include/G4ModelColourMap.hh | 2 +- .../modeling/include/G4ModelCommandUtils.hh | 69 + .../modeling/include/G4ModelCommandsT.hh | 254 +- .../include/G4ModelCompoundCommandsT.hh | 141 + .../modeling/include/G4ModelingParameters.hh | 98 +- .../modeling/include/G4ModelingParameters.icc | 74 +- .../modeling/include/G4NullModel.hh | 2 +- .../include/G4PhysicalVolumeMassScene.hh | 7 +- .../modeling/include/G4PhysicalVolumeModel.hh | 76 +- .../include/G4PhysicalVolumeSearchScene.hh | 2 +- .../include/G4PhysicalVolumeSearchScene.icc | 2 +- .../modeling/include/G4ScaleModel.hh | 12 +- .../modeling/include/G4ScaleModel.icc | 36 - .../modeling/include/G4TextModel.hh | 12 +- .../modeling/include/G4TextModel.icc | 36 - .../modeling/include/G4TrajectoriesModel.hh | 18 +- .../include/G4TrajectoryChargeFilter.hh | 6 +- .../include/G4TrajectoryDrawByAttribute.hh | 83 + .../include/G4TrajectoryDrawByCharge.hh | 2 +- .../include/G4TrajectoryDrawByOriginVolume.hh | 2 +- .../include/G4TrajectoryDrawByParticleID.hh | 2 +- .../include/G4TrajectoryDrawerUtils.hh | 2 +- .../include/G4TrajectoryFilterFactories.hh | 20 +- .../include/G4TrajectoryGenericDrawer.hh | 2 +- .../include/G4TrajectoryModelFactories.hh | 16 +- .../include/G4TrajectoryOriginVolumeFilter.hh | 6 +- .../include/G4TrajectoryParticleFilter.hh | 6 +- .../modeling/include/G4VAttValueFilter.hh | 69 + .../modeling/include/G4VModel.hh | 8 +- .../modeling/include/G4VModel.icc | 13 +- .../modeling/include/G4VModelCommand.hh | 28 +- .../modeling/include/G4VModelFactory.hh | 2 +- .../modeling/include/G4VTrajectoryModel.hh | 6 +- .../modeling/include/G4VisTrajContext.hh | 10 +- .../modeling/include/G4VisTrajContext.icc | 10 +- .../modeling/src/G4AttFilterUtils.cc | 95 + .../visualization/modeling/src/G4AxesModel.cc | 2 +- .../modeling/src/G4BoundingSphereScene.cc | 2 +- .../src/G4FlavoredParallelWorldModel.cc | 2 +- .../modeling/src/G4HitFilterFactories.cc | 66 + .../visualization/modeling/src/G4HitsModel.cc | 20 +- .../modeling/src/G4LogicalVolumeModel.cc | 8 +- .../modeling/src/G4ModelingParameters.cc | 191 +- .../visualization/modeling/src/G4NullModel.cc | 2 +- .../modeling/src/G4PhysicalVolumeMassScene.cc | 17 +- .../modeling/src/G4PhysicalVolumeModel.cc | 312 +- .../src/G4PhysicalVolumeSearchScene.cc | 5 +- .../modeling/src/G4ScaleModel.cc | 2 +- .../visualization/modeling/src/G4TextModel.cc | 2 +- .../modeling/src/G4TrajectoriesModel.cc | 67 +- .../modeling/src/G4TrajectoryChargeFilter.cc | 6 +- .../src/G4TrajectoryDrawByAttribute.cc | 225 + .../modeling/src/G4TrajectoryDrawByCharge.cc | 2 +- .../src/G4TrajectoryDrawByOriginVolume.cc | 2 +- .../src/G4TrajectoryDrawByParticleID.cc | 2 +- .../modeling/src/G4TrajectoryDrawerUtils.cc | 290 +- .../src/G4TrajectoryFilterFactories.cc | 33 +- .../modeling/src/G4TrajectoryGenericDrawer.cc | 2 +- .../src/G4TrajectoryModelFactories.cc | 63 +- .../src/G4TrajectoryOriginVolumeFilter.cc | 6 +- .../src/G4TrajectoryParticleFilter.cc | 6 +- source/visualization/modeling/src/G4VModel.cc | 14 +- .../modeling/src/G4VTrajectoryModel.cc | 2 +- .../modeling/src/G4VisTrajContext.cc | 1 + 6714 files changed, 118229 insertions(+), 68144 deletions(-) create mode 100644 ReleaseNotes/Patch4.8.1-1.txt create mode 100644 ReleaseNotes/Patch4.8.1-2.txt create mode 100644 ReleaseNotes/ReleaseNotes4.8.2.html create mode 100644 environments/g4py/00README_MACOSX create mode 100644 environments/g4py/examples/education/lesson1/Lesson1Wx.py create mode 100644 environments/g4py/examples/education/lesson1/Lesson1withN03.py create mode 100644 environments/g4py/examples/education/lesson2/Lesson2Wx.py create mode 100644 environments/g4py/site-modules/geometries/ExN03geom/ExN03DetectorMessenger.cc create mode 100644 environments/g4py/site-modules/geometries/ExN03geom/ExN03DetectorMessenger.hh create mode 100644 environments/g4py/site-modules/physics_lists/EMLowEpl/GNUmakefile create mode 100644 environments/g4py/site-modules/physics_lists/EMLowEpl/PhysicsListEMlowE.cc rename examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02MuonSD.hh => environments/g4py/site-modules/physics_lists/EMLowEpl/PhysicsListEMlowE.hh (72%) rename examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/G4HepMCAsciiReader.hh => environments/g4py/site-modules/physics_lists/EMLowEpl/pyEMLowEpl.cc (64%) create mode 100644 environments/g4py/site-modules/utils/GNUmakefile create mode 100644 environments/g4py/site-modules/utils/MCScore/GNUmakefile create mode 100644 environments/g4py/site-modules/utils/MCScore/MCScore.py create mode 100644 environments/g4py/site-modules/utils/MCScore/MCScoreROOTIO.py create mode 100644 environments/g4py/site-modules/utils/MCScore/reaction.dat create mode 100644 environments/g4py/source/global/pyG4Exception.cc create mode 100644 environments/g4py/source/global/pyG4ExceptionHandler.cc rename examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/G4HepMCAsciiReaderMessenger.hh => environments/g4py/source/global/pyG4ExceptionSeverity.cc (69%) rename examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02DetectorConstruction.hh => environments/g4py/source/global/pyG4Version.cc (75%) create mode 100644 environments/g4py/source/intercoms/GNUmakefile create mode 100644 environments/g4py/source/intercoms/pyG4UIcommand.cc rename examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/H01PythiaInterface.hh => environments/g4py/source/intercoms/pyG4UIcommandTree.cc (50%) rename environments/g4py/source/{interface => intercoms}/pyG4UImanager.cc (72%) rename examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/G4HepMCAsciiReader.hh => environments/g4py/source/intercoms/pyG4UIparameter.cc (64%) rename examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02Field.cc => environments/g4py/source/intercoms/pymodG4intercoms.cc (73%) create mode 100644 environments/g4py/source/physics_lists/GNUmakefile create mode 100644 environments/g4py/source/physics_lists/pyPhysicsLists.cc rename examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02EventAction.hh => environments/g4py/source/physics_lists/pymodG4physicslists.cc (75%) create mode 100644 environments/g4py/source/processes/pyG4LossTableManager.cc rename examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02EventAction.cc => environments/g4py/source/processes/pyG4ProductionCutsTable.cc (58%) create mode 100644 environments/g4py/tools/00README create mode 100644 environments/g4py/tools/env/env+.csh create mode 100644 environments/g4py/tools/env/env+.sh create mode 100644 environments/g4py/tools/g4autobuild/g4auto.cfg create mode 100755 environments/g4py/tools/g4autobuild/g4autobuild create mode 100755 environments/g4py/tools/g4package/g4pack rename examples/advanced/{gammaray_telescope => Tiara/source/tiara}/hadronic_lists.gmk (78%) delete mode 100644 examples/advanced/composite_calorimeter/hadronic_lists.gmk delete mode 100644 examples/advanced/hadrontherapy/binaryDefault.mac delete mode 100644 examples/advanced/hadrontherapy/include/HadrontherapyProtonBinary.hh delete mode 100644 examples/advanced/hadrontherapy/include/HadrontherapyProtonPrecompoundFermi.hh delete mode 100644 examples/advanced/hadrontherapy/include/HadrontherapyProtonPrecompoundGEM.hh delete mode 100644 examples/advanced/hadrontherapy/include/HadrontherapyProtonPrecompoundGEMFermi.hh delete mode 100644 examples/advanced/hadrontherapy/precompoundDefaultEvaporationFermi.mac delete mode 100644 examples/advanced/hadrontherapy/precompoundGEMEvaporation.mac delete mode 100644 examples/advanced/hadrontherapy/precompoundGEMFermi.mac delete mode 100644 examples/advanced/hadrontherapy/src/HadrontherapyProtonBinary.cc delete mode 100644 examples/advanced/hadrontherapy/src/HadrontherapyProtonPrecompoundFermi.cc delete mode 100644 examples/advanced/hadrontherapy/src/HadrontherapyProtonPrecompoundGEM.cc delete mode 100644 examples/advanced/hadrontherapy/src/HadrontherapyProtonPrecompoundGEMFermi.cc create mode 100644 examples/advanced/human_phantom/GNUmakefile create mode 100644 examples/advanced/human_phantom/History create mode 100644 examples/advanced/human_phantom/README create mode 100644 examples/advanced/human_phantom/adultFemale.mac create mode 100644 examples/advanced/human_phantom/adultMale.mac create mode 100644 examples/advanced/human_phantom/adultORNLFemale.mac create mode 100644 examples/advanced/human_phantom/adultORNLMale.mac create mode 100644 examples/advanced/human_phantom/dawnVis.mac create mode 100644 examples/advanced/human_phantom/gdmlData/Female/MIRDArmBone.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/MIRDBrain.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/MIRDBreast.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/MIRDHead.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/MIRDHeart.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/MIRDKidney.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/MIRDLegBone.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/MIRDLegs.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/MIRDLiver.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/MIRDLowerLargeIntestine.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/MIRDLung.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/MIRDMiddleLowerSpine.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/MIRDOvary.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/MIRDPancreas.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/MIRDPelvis.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/MIRDSkull.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/MIRDSpleen.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/MIRDStomach.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/MIRDThyroid.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/MIRDTrunk.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/MIRDUpperLargeIntestine.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/MIRDUpperSpine.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/MIRDUrinaryBladder.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/MIRDUterus.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/ORNLArmBone.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/ORNLBrain.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/ORNLBreast.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/ORNLHead.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/ORNLHeart.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/ORNLKidney.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/ORNLLegBone.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/ORNLLegs.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/ORNLLiver.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/ORNLLowerLargeIntestine.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/ORNLLung.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/ORNLMiddleLowerSpine.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/ORNLOvary.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/ORNLPancreas.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/ORNLPelvis.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/ORNLSkull.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/ORNLSpleen.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/ORNLStomach.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/ORNLThyroid.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/ORNLTrunk.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/ORNLUpperLargeIntestine.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/ORNLUpperSpine.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/ORNLUrinaryBladder.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Female/ORNLUterus.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/MIRDArmBone.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/MIRDBrain.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/MIRDHead.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/MIRDHeart.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/MIRDKidney.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/MIRDLegBone.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/MIRDLegs.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/MIRDLiver.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/MIRDLowerLargeIntestine.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/MIRDLung.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/MIRDMiddleLowerSpine.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/MIRDPancreas.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/MIRDPelvis.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/MIRDSkull.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/MIRDSpleen.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/MIRDStomach.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/MIRDThyroid.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/MIRDTrunk.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/MIRDUpperLargeIntestine.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/MIRDUpperSpine.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/MIRDUrinaryBladder.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/ORNLArmBone.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/ORNLBrain.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/ORNLHead.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/ORNLHeart.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/ORNLKidney.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/ORNLLegBone.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/ORNLLegs.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/ORNLLiver.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/ORNLLowerLargeIntestine.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/ORNLLung.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/ORNLMiddleLowerSpine.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/ORNLPancreas.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/ORNLPelvis.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/ORNLSkull.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/ORNLSpleen.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/ORNLStomach.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/ORNLThyroid.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/ORNLTrunk.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/ORNLUpperLargeIntestine.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/ORNLUpperSpine.gdml create mode 100644 examples/advanced/human_phantom/gdmlData/Male/ORNLUrinaryBladder.gdml create mode 100644 examples/advanced/human_phantom/include/G4FemaleBuilder.hh create mode 100644 examples/advanced/human_phantom/include/G4HumanDummySD.hh rename examples/{extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04StackingAction.hh => advanced/human_phantom/include/G4HumanPhantomAnalysisManager.hh} (52%) create mode 100644 examples/advanced/human_phantom/include/G4HumanPhantomConstruction.hh create mode 100644 examples/advanced/human_phantom/include/G4HumanPhantomEnergyDeposit.hh rename examples/{extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04StackingActionMessenger.hh => advanced/human_phantom/include/G4HumanPhantomEventAction.hh} (70%) rename examples/{extended/medical/GammaTherapy/include/EmGammaNucleusBuilder.hh => advanced/human_phantom/include/G4HumanPhantomMaterial.hh} (61%) rename examples/{extended/eventgenerator/HepMC/HepMCEx02-clhep/include/G4HepMCAsciiReaderMessenger.hh => advanced/human_phantom/include/G4HumanPhantomMessenger.hh} (58%) create mode 100644 examples/advanced/human_phantom/include/G4HumanPhantomPhysicsList.hh create mode 100644 examples/advanced/human_phantom/include/G4HumanPhantomPrimaryGeneratorAction.hh rename examples/{novice/N05/include/ExN05DetectorMessenger.hh => advanced/human_phantom/include/G4HumanPhantomPrimaryGeneratorMessenger.hh} (67%) create mode 100644 examples/advanced/human_phantom/include/G4HumanPhantomROGeometry.hh create mode 100644 examples/advanced/human_phantom/include/G4HumanPhantomRunAction.hh rename examples/{extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04MuonSD.hh => advanced/human_phantom/include/G4HumanPhantomSD.hh} (68%) rename examples/{extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04CalorimeterSD.hh => advanced/human_phantom/include/G4HumanPhantomSDBreast.hh} (69%) rename examples/{extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04SteppingAction.hh => advanced/human_phantom/include/G4HumanPhantomSteppingAction.hh} (73%) create mode 100644 examples/advanced/human_phantom/include/G4MIRDAdrenal.hh create mode 100644 examples/advanced/human_phantom/include/G4MIRDArmBone.hh create mode 100644 examples/advanced/human_phantom/include/G4MIRDBodyFactory.hh create mode 100644 examples/advanced/human_phantom/include/G4MIRDBrain.hh create mode 100644 examples/advanced/human_phantom/include/G4MIRDBreast.hh create mode 100644 examples/advanced/human_phantom/include/G4MIRDHead.hh create mode 100644 examples/advanced/human_phantom/include/G4MIRDHeart.hh create mode 100644 examples/advanced/human_phantom/include/G4MIRDKidney.hh create mode 100644 examples/advanced/human_phantom/include/G4MIRDLegBone.hh create mode 100644 examples/advanced/human_phantom/include/G4MIRDLegs.hh create mode 100644 examples/advanced/human_phantom/include/G4MIRDLiver.hh create mode 100644 examples/advanced/human_phantom/include/G4MIRDLowerLargeIntestine.hh rename examples/{extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04DetectorConstruction.hh => advanced/human_phantom/include/G4MIRDLung.hh} (73%) create mode 100644 examples/advanced/human_phantom/include/G4MIRDMiddleLowerSpine.hh create mode 100644 examples/advanced/human_phantom/include/G4MIRDOvary.hh create mode 100644 examples/advanced/human_phantom/include/G4MIRDPancreas.hh create mode 100644 examples/advanced/human_phantom/include/G4MIRDPelvis.hh create mode 100644 examples/advanced/human_phantom/include/G4MIRDRibCage.hh create mode 100644 examples/advanced/human_phantom/include/G4MIRDSkull.hh create mode 100644 examples/advanced/human_phantom/include/G4MIRDSpleen.hh rename examples/{extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04DummySD.hh => advanced/human_phantom/include/G4MIRDStomach.hh} (73%) create mode 100644 examples/advanced/human_phantom/include/G4MIRDTestes.hh create mode 100644 examples/advanced/human_phantom/include/G4MIRDThyroid.hh create mode 100644 examples/advanced/human_phantom/include/G4MIRDTrunk.hh create mode 100644 examples/advanced/human_phantom/include/G4MIRDUpperLargeIntestine.hh create mode 100644 examples/advanced/human_phantom/include/G4MIRDUpperSpine.hh create mode 100644 examples/advanced/human_phantom/include/G4MIRDUrinaryBladder.hh create mode 100644 examples/advanced/human_phantom/include/G4MIRDUterus.hh create mode 100644 examples/advanced/human_phantom/include/G4MaleBuilder.hh create mode 100644 examples/advanced/human_phantom/include/G4ORNLAdrenal.hh create mode 100644 examples/advanced/human_phantom/include/G4ORNLArmBone.hh create mode 100644 examples/advanced/human_phantom/include/G4ORNLBodyFactory.hh create mode 100644 examples/advanced/human_phantom/include/G4ORNLBrain.hh create mode 100644 examples/advanced/human_phantom/include/G4ORNLBreast.hh create mode 100644 examples/advanced/human_phantom/include/G4ORNLEsophagus.hh create mode 100644 examples/advanced/human_phantom/include/G4ORNLHead.hh create mode 100644 examples/advanced/human_phantom/include/G4ORNLHeart.hh create mode 100644 examples/advanced/human_phantom/include/G4ORNLKidney.hh create mode 100644 examples/advanced/human_phantom/include/G4ORNLLegBone.hh create mode 100644 examples/advanced/human_phantom/include/G4ORNLLegs.hh create mode 100644 examples/advanced/human_phantom/include/G4ORNLLiver.hh create mode 100644 examples/advanced/human_phantom/include/G4ORNLLowerLargeIntestine.hh create mode 100644 examples/advanced/human_phantom/include/G4ORNLLung.hh rename examples/{extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04TrackerParametrisation.cc => advanced/human_phantom/include/G4ORNLMiddleLowerSpine.hh} (67%) create mode 100644 examples/advanced/human_phantom/include/G4ORNLOvary.hh create mode 100644 examples/advanced/human_phantom/include/G4ORNLPancreas.hh create mode 100644 examples/advanced/human_phantom/include/G4ORNLPelvis.hh create mode 100644 examples/advanced/human_phantom/include/G4ORNLRibCage.hh create mode 100644 examples/advanced/human_phantom/include/G4ORNLSkull.hh create mode 100644 examples/advanced/human_phantom/include/G4ORNLSpleen.hh create mode 100644 examples/advanced/human_phantom/include/G4ORNLStomach.hh create mode 100644 examples/advanced/human_phantom/include/G4ORNLTestes.hh create mode 100644 examples/advanced/human_phantom/include/G4ORNLThyroid.hh create mode 100644 examples/advanced/human_phantom/include/G4ORNLTrunk.hh create mode 100644 examples/advanced/human_phantom/include/G4ORNLUpperLargeIntestine.hh create mode 100644 examples/advanced/human_phantom/include/G4ORNLUpperSpine.hh create mode 100644 examples/advanced/human_phantom/include/G4ORNLUrinaryBladder.hh create mode 100644 examples/advanced/human_phantom/include/G4ORNLUterus.hh create mode 100644 examples/advanced/human_phantom/include/G4ParameterisedBreast.hh create mode 100644 examples/advanced/human_phantom/include/G4PhantomBuilder.hh create mode 100644 examples/advanced/human_phantom/include/G4VBodyFactory.hh create mode 100644 examples/advanced/human_phantom/include/G4VPhantomBuilder.hh create mode 100644 examples/advanced/human_phantom/noVis.mac create mode 100644 examples/advanced/human_phantom/openGLVis.mac create mode 100644 examples/advanced/human_phantom/phantom.cc create mode 100644 examples/advanced/human_phantom/run.mac rename examples/{extended/eventgenerator/HepMC/HepMCEx02/src/H02GeneralPhysics.cc => advanced/human_phantom/src/G4FemaleBuilder.cc} (54%) create mode 100644 examples/advanced/human_phantom/src/G4HumanPhantomAnalysisManager.cc create mode 100644 examples/advanced/human_phantom/src/G4HumanPhantomConstruction.cc create mode 100644 examples/advanced/human_phantom/src/G4HumanPhantomEnergyDeposit.cc rename examples/{extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02GeneralPhysics.cc => advanced/human_phantom/src/G4HumanPhantomEventAction.cc} (57%) create mode 100644 examples/advanced/human_phantom/src/G4HumanPhantomMaterial.cc create mode 100644 examples/advanced/human_phantom/src/G4HumanPhantomMessenger.cc create mode 100644 examples/advanced/human_phantom/src/G4HumanPhantomPhysicsList.cc create mode 100644 examples/advanced/human_phantom/src/G4HumanPhantomPrimaryGeneratorAction.cc rename examples/{extended/eventgenerator/HepMC/HepMCEx01/src/ExN04GeneralPhysics.cc => advanced/human_phantom/src/G4HumanPhantomPrimaryGeneratorMessenger.cc} (56%) create mode 100644 examples/advanced/human_phantom/src/G4HumanPhantomROGeometry.cc rename examples/{novice/N05/include/ExN05MinRangeCuts.hh => advanced/human_phantom/src/G4HumanPhantomRunAction.cc} (61%) rename examples/{extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04TrackerSD.cc => advanced/human_phantom/src/G4HumanPhantomSD.cc} (60%) rename examples/{extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04MuonSD.cc => advanced/human_phantom/src/G4HumanPhantomSDBreast.cc} (56%) create mode 100644 examples/advanced/human_phantom/src/G4HumanPhantomSteppingAction.cc create mode 100644 examples/advanced/human_phantom/src/G4MIRDAdrenal.cc create mode 100644 examples/advanced/human_phantom/src/G4MIRDArmBone.cc create mode 100644 examples/advanced/human_phantom/src/G4MIRDBodyFactory.cc create mode 100644 examples/advanced/human_phantom/src/G4MIRDBrain.cc create mode 100644 examples/advanced/human_phantom/src/G4MIRDBreast.cc create mode 100644 examples/advanced/human_phantom/src/G4MIRDHead.cc create mode 100644 examples/advanced/human_phantom/src/G4MIRDHeart.cc create mode 100644 examples/advanced/human_phantom/src/G4MIRDKidney.cc create mode 100644 examples/advanced/human_phantom/src/G4MIRDLegBone.cc create mode 100644 examples/advanced/human_phantom/src/G4MIRDLegs.cc create mode 100644 examples/advanced/human_phantom/src/G4MIRDLiver.cc create mode 100644 examples/advanced/human_phantom/src/G4MIRDLowerLargeIntestine.cc create mode 100644 examples/advanced/human_phantom/src/G4MIRDLung.cc create mode 100644 examples/advanced/human_phantom/src/G4MIRDMiddleLowerSpine.cc create mode 100644 examples/advanced/human_phantom/src/G4MIRDOvary.cc create mode 100644 examples/advanced/human_phantom/src/G4MIRDPancreas.cc create mode 100644 examples/advanced/human_phantom/src/G4MIRDPelvis.cc create mode 100644 examples/advanced/human_phantom/src/G4MIRDRibCage.cc create mode 100644 examples/advanced/human_phantom/src/G4MIRDSkull.cc create mode 100644 examples/advanced/human_phantom/src/G4MIRDSpleen.cc create mode 100644 examples/advanced/human_phantom/src/G4MIRDStomach.cc create mode 100644 examples/advanced/human_phantom/src/G4MIRDTestes.cc create mode 100644 examples/advanced/human_phantom/src/G4MIRDThyroid.cc create mode 100644 examples/advanced/human_phantom/src/G4MIRDTrunk.cc create mode 100644 examples/advanced/human_phantom/src/G4MIRDUpperLargeIntestine.cc create mode 100644 examples/advanced/human_phantom/src/G4MIRDUpperSpine.cc create mode 100644 examples/advanced/human_phantom/src/G4MIRDUrinaryBladder.cc create mode 100644 examples/advanced/human_phantom/src/G4MIRDUterus.cc create mode 100644 examples/advanced/human_phantom/src/G4MaleBuilder.cc create mode 100644 examples/advanced/human_phantom/src/G4ORNLAdrenal.cc create mode 100644 examples/advanced/human_phantom/src/G4ORNLArmBone.cc create mode 100644 examples/advanced/human_phantom/src/G4ORNLBodyFactory.cc create mode 100644 examples/advanced/human_phantom/src/G4ORNLBrain.cc create mode 100644 examples/advanced/human_phantom/src/G4ORNLBreast.cc create mode 100644 examples/advanced/human_phantom/src/G4ORNLEsophagus.cc create mode 100644 examples/advanced/human_phantom/src/G4ORNLHead.cc create mode 100644 examples/advanced/human_phantom/src/G4ORNLHeart.cc create mode 100644 examples/advanced/human_phantom/src/G4ORNLKidney.cc create mode 100644 examples/advanced/human_phantom/src/G4ORNLLegBone.cc create mode 100644 examples/advanced/human_phantom/src/G4ORNLLegs.cc create mode 100644 examples/advanced/human_phantom/src/G4ORNLLiver.cc create mode 100644 examples/advanced/human_phantom/src/G4ORNLLowerLargeIntestine.cc create mode 100644 examples/advanced/human_phantom/src/G4ORNLLung.cc create mode 100644 examples/advanced/human_phantom/src/G4ORNLMiddleLowerSpine.cc create mode 100644 examples/advanced/human_phantom/src/G4ORNLOvary.cc create mode 100644 examples/advanced/human_phantom/src/G4ORNLPancreas.cc create mode 100644 examples/advanced/human_phantom/src/G4ORNLPelvis.cc create mode 100644 examples/advanced/human_phantom/src/G4ORNLRibCage.cc create mode 100644 examples/advanced/human_phantom/src/G4ORNLSkull.cc create mode 100644 examples/advanced/human_phantom/src/G4ORNLSpleen.cc create mode 100644 examples/advanced/human_phantom/src/G4ORNLStomach.cc create mode 100644 examples/advanced/human_phantom/src/G4ORNLTestes.cc create mode 100644 examples/advanced/human_phantom/src/G4ORNLThyroid.cc create mode 100644 examples/advanced/human_phantom/src/G4ORNLTrunk.cc create mode 100644 examples/advanced/human_phantom/src/G4ORNLUpperLargeIntestine.cc create mode 100644 examples/advanced/human_phantom/src/G4ORNLUpperSpine.cc create mode 100644 examples/advanced/human_phantom/src/G4ORNLUrinaryBladder.cc create mode 100644 examples/advanced/human_phantom/src/G4ORNLUterus.cc create mode 100644 examples/advanced/human_phantom/src/G4ParameterisedBreast.cc create mode 100644 examples/advanced/human_phantom/src/G4PhantomBuilder.cc rename examples/{extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04Field.hh => advanced/human_phantom/src/G4VBodyFactory.cc} (77%) rename examples/{extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02Field.hh => advanced/human_phantom/src/G4VPhantomBuilder.cc} (77%) create mode 100644 examples/advanced/human_phantom/vrmlVis.mac delete mode 100644 examples/advanced/lAr_calorimeter/hadronic_lists.gmk create mode 100644 examples/advanced/microbeam/microbeam.out delete mode 100755 examples/advanced/microbeam/src/MicrobeamVisManager.cc delete mode 100644 examples/advanced/raredecay_calorimetry/include/PhotInVisManager.hh delete mode 100755 examples/advanced/raredecay_calorimetry/src/PhotInVisManager.cc delete mode 100644 examples/extended/electromagnetic/TestEm1/src/PhysListEmG4v52.cc rename examples/extended/{eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04TrackingAction.hh => electromagnetic/TestEm10/include/Em10TrackingAction.hh} (87%) rename examples/extended/{eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04SteppingVerbose.hh => electromagnetic/TestEm10/src/Em10TrackingAction.cc} (58%) delete mode 100644 examples/extended/electromagnetic/TestEm11/src/PhysListEmG4v52.cc delete mode 100644 examples/extended/electromagnetic/TestEm12/include/PhysListEmG4v52.hh delete mode 100644 examples/extended/electromagnetic/TestEm12/src/PhysListEmG4v52.cc delete mode 100644 examples/extended/electromagnetic/TestEm14/include/PhysListEmG4v52.hh delete mode 100644 examples/extended/electromagnetic/TestEm14/src/PhysListEmG4v52.cc delete mode 100644 examples/extended/electromagnetic/TestEm17/include/PhysListEmG4v52.hh delete mode 100644 examples/extended/electromagnetic/TestEm2/include/PhysListEmG4v52.hh delete mode 100644 examples/extended/electromagnetic/TestEm2/src/PhysListEmG4v52.cc create mode 100644 examples/extended/electromagnetic/TestEm3/fanoCav.mac delete mode 100644 examples/extended/electromagnetic/TestEm3/include/PhysListEmG4v52.hh delete mode 100644 examples/extended/electromagnetic/TestEm3/src/PhysListEmG4v52.cc delete mode 100644 examples/extended/electromagnetic/TestEm5/include/PhysListEmG4v52.hh rename examples/extended/electromagnetic/{TestEm8/include/PhysListEmG4v52.hh => TestEm5/include/PhysListEmStandardSS.hh} (86%) delete mode 100644 examples/extended/electromagnetic/TestEm5/src/PhysListEmG4v52.cc rename examples/extended/electromagnetic/TestEm5/src/{PhysListEmG4v71.cc => PhysListEmStandardSS.cc} (69%) delete mode 100644 examples/extended/electromagnetic/TestEm7/include/PhysListBinaryCascade.hh delete mode 100644 examples/extended/electromagnetic/TestEm7/include/PhysListEmG4v52.hh rename examples/extended/electromagnetic/{TestEm5/include/PhysListEmG4v71.hh => TestEm7/include/PhysListEmLivermore.hh} (88%) rename examples/extended/electromagnetic/{TestEm1/include/PhysListEmG4v71.hh => TestEm7/include/PhysListEmPenelope.hh} (88%) rename examples/extended/electromagnetic/{TestEm9/include/PhysListEmG4v52.hh => TestEm7/include/PhysListEmStandardSS.hh} (86%) delete mode 100644 examples/extended/electromagnetic/TestEm7/include/PhysListIonBinaryCascade.hh delete mode 100644 examples/extended/electromagnetic/TestEm7/src/PhysListBinaryCascade.cc delete mode 100644 examples/extended/electromagnetic/TestEm7/src/PhysListEmG4v52.cc rename examples/extended/electromagnetic/{TestEm1/src/PhysListEmG4v71.cc => TestEm7/src/PhysListEmLivermore.cc} (65%) create mode 100644 examples/extended/electromagnetic/TestEm7/src/PhysListEmPenelope.cc rename examples/extended/electromagnetic/{TestEm12/src/PhysListEmG4v71.cc => TestEm7/src/PhysListEmStandardSS.cc} (68%) delete mode 100644 examples/extended/electromagnetic/TestEm7/src/PhysListIonBinaryCascade.cc delete mode 100644 examples/extended/electromagnetic/TestEm8/src/PhysListEmG4v52.cc delete mode 100644 examples/extended/electromagnetic/TestEm9/include/PhysListBinaryCascade.hh create mode 100644 examples/extended/electromagnetic/TestEm9/include/PhysListEmLivermore.hh rename examples/extended/electromagnetic/{TestEm12/include/PhysListEmG4v71.hh => TestEm9/include/PhysListEmPenelope.hh} (88%) delete mode 100644 examples/extended/electromagnetic/TestEm9/src/PhysListBinaryCascade.cc delete mode 100644 examples/extended/electromagnetic/TestEm9/src/PhysListEmG4v52.cc delete mode 100644 examples/extended/electromagnetic/TestEm9/src/PhysListEmG4v71.cc rename examples/extended/electromagnetic/{TestEm11/src/PhysListEmG4v71.cc => TestEm9/src/PhysListEmLivermore.cc} (63%) create mode 100644 examples/extended/electromagnetic/TestEm9/src/PhysListEmPenelope.cc delete mode 100644 examples/extended/electromagnetic/TestEm9/src/PhysListIonBinaryCascade.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/GNUmakefile delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/History delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/README delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/data/GNUmakefile delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/data/example_MyPythia.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/data/example_MyPythia.dat delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/hepmcEx01-clhep.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/hepmc_ascii.in delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/hepmc_ascii.out delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/hepmc_pygen.in delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/hepmc_pygen.out delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04CalorimeterHit.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04CalorimeterParametrisation.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04DetectorParameterDef.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04EMPhysics.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04GeneralPhysics.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04HadronPhysics.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04IonPhysics.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04MuonPhysics.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04PrimaryGeneratorAction.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04TrackerHit.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04TrackerParametrisation.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/G4HepMCInterface.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/H01PythiaMessenger.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/pyh4mu.mac delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/pyset.mac delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04CalorimeterHit.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04CalorimeterROGeometry.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04CalorimeterSD.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04DetectorConstruction.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04DetectorParameterDef.icc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04EMPhysics.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04EventAction.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04HadronPhysics.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04IonPhysics.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04MuonPhysics.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04PrimaryGeneratorMessenger.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04StackingAction.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04StackingActionMessenger.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04SteppingAction.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04SteppingVerbose.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/G4HepMCAsciiReader.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/G4HepMCAsciiReaderMessenger.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/G4HepMCInterface.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/H01PythiaInterface.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/H01PythiaMessenger.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/vis.mac delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04EMPhysics.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04GeneralPhysics.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04HadronPhysics.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04IonPhysics.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04MuonPhysics.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04EMPhysics.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04HadronPhysics.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04IonPhysics.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04MuonPhysics.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/GNUmakefile delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/History delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/README delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/data/GNUmakefile delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/data/example_MyPythia.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/data/example_MyPythia.dat delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/hepmc_ascii.in delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/hepmc_ascii.out delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/hepmc_pygen.in delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/hepmc_pygen.out delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/G4HepMCInterface.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02EMPhysics.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02HadronPhysics.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02IonPhysics.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02MuonHit.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02MuonPhysics.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02PrimaryGeneratorAction.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02PythiaInterface.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02PythiaMessenger.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/pyh4mu.mac delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/pyset.mac delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/G4HepMCAsciiReader.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/G4HepMCAsciiReaderMessenger.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/G4HepMCInterface.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02DetectorConstruction.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02EMPhysics.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02HadronPhysics.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02IonPhysics.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02MuonHit.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02MuonPhysics.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02MuonSD.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02PrimaryGeneratorMessenger.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02PythiaInterface.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02PythiaMessenger.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02SteppingAction.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/vis.mac delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02/include/H02EMPhysics.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02/include/H02GeneralPhysics.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02/include/H02HadronPhysics.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02/include/H02IonPhysics.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02/include/H02MuonPhysics.hh delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02EMPhysics.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02HadronPhysics.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02IonPhysics.cc delete mode 100644 examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02MuonPhysics.cc create mode 100644 examples/extended/eventgenerator/HepMC/MCTruth/GNUmakefile create mode 100644 examples/extended/eventgenerator/HepMC/MCTruth/History create mode 100644 examples/extended/eventgenerator/HepMC/MCTruth/README create mode 100644 examples/extended/eventgenerator/HepMC/MCTruth/include/DetectorConstruction.hh create mode 100644 examples/extended/eventgenerator/HepMC/MCTruth/include/MCTruthConfig.hh create mode 100644 examples/extended/eventgenerator/HepMC/MCTruth/include/MCTruthEventAction.hh rename examples/{novice/N05/src/ExN05MaxTimeCuts.cc => extended/eventgenerator/HepMC/MCTruth/include/MCTruthManager.hh} (54%) create mode 100644 examples/extended/eventgenerator/HepMC/MCTruth/include/MCTruthTrackInformation.hh create mode 100644 examples/extended/eventgenerator/HepMC/MCTruth/include/MCTruthTrackingAction.hh create mode 100644 examples/extended/eventgenerator/HepMC/MCTruth/include/PhysicsList.hh create mode 100644 examples/extended/eventgenerator/HepMC/MCTruth/include/PrimaryGeneratorAction.hh rename examples/extended/eventgenerator/HepMC/{HepMCEx01-clhep/include/ExN04MuonHit.hh => MCTruth/mctruthex.cc} (55%) create mode 100644 examples/extended/eventgenerator/HepMC/MCTruth/src/DetectorConstruction.cc rename examples/{advanced/microbeam/include/MicrobeamVisManager.hh => extended/eventgenerator/HepMC/MCTruth/src/MCTruthConfig.cc} (81%) mode change 100755 => 100644 create mode 100644 examples/extended/eventgenerator/HepMC/MCTruth/src/MCTruthEventAction.cc create mode 100644 examples/extended/eventgenerator/HepMC/MCTruth/src/MCTruthManager.cc rename examples/extended/{analysis/A01/src/A01TrackingAction.cc => eventgenerator/HepMC/MCTruth/src/MCTruthTrackInformation.cc} (76%) create mode 100644 examples/extended/eventgenerator/HepMC/MCTruth/src/MCTruthTrackingAction.cc create mode 100644 examples/extended/eventgenerator/HepMC/MCTruth/src/PhysicsList.cc rename examples/extended/eventgenerator/HepMC/{HepMCEx01/src/ExN04PhysicsList.cc => MCTruth/src/PrimaryGeneratorAction.cc} (58%) create mode 100644 examples/extended/hadronic/Hadr01/run.csh delete mode 100644 examples/extended/medical/GammaTherapy/include/G4EmMuonBuilder52.hh delete mode 100644 examples/extended/medical/GammaTherapy/include/G4EmMuonBuilder71.hh delete mode 100644 examples/extended/medical/GammaTherapy/include/G4EmQEDBuilder71.hh delete mode 100644 examples/extended/medical/GammaTherapy/include/G4LowEnergyQEDBuilder.hh delete mode 100644 examples/extended/medical/GammaTherapy/include/G4PenelopeQEDBuilder.hh create mode 100644 examples/extended/medical/GammaTherapy/include/PhysListEmLivermore.hh rename examples/extended/{electromagnetic/TestEm7/include/PhysListEmG4v71.hh => medical/GammaTherapy/include/PhysListEmPenelope.hh} (88%) delete mode 100644 examples/extended/medical/GammaTherapy/src/EmBinaryCascadeBuilder.cc delete mode 100644 examples/extended/medical/GammaTherapy/src/EmGammaNucleusBuilder.cc delete mode 100644 examples/extended/medical/GammaTherapy/src/EmHadronElasticBuilder.cc delete mode 100644 examples/extended/medical/GammaTherapy/src/EmIonBinaryCascadeBuilder.cc delete mode 100644 examples/extended/medical/GammaTherapy/src/G4EmMuonBuilder.cc delete mode 100644 examples/extended/medical/GammaTherapy/src/G4EmMuonBuilder71.cc delete mode 100644 examples/extended/medical/GammaTherapy/src/G4EmQEDBuilder.cc delete mode 100644 examples/extended/medical/GammaTherapy/src/G4EmQEDBuilder52.cc delete mode 100644 examples/extended/medical/GammaTherapy/src/G4EmQEDBuilder71.cc delete mode 100644 examples/extended/medical/GammaTherapy/src/G4LowEnergyQEDBuilder.cc delete mode 100644 examples/extended/medical/GammaTherapy/src/G4PenelopeQEDBuilder.cc rename examples/extended/{electromagnetic/TestEm7/src/PhysListEmG4v71.cc => medical/GammaTherapy/src/PhysListEmLivermore.cc} (64%) create mode 100644 examples/extended/medical/GammaTherapy/src/PhysListEmPenelope.cc rename examples/{novice/N04 => extended/parallel/ParN04}/hadronic_lists.gmk (100%) delete mode 100644 examples/extended/parallel/ParN04/include/ExN04GeneralPhysics.hh delete mode 100644 examples/extended/parallel/ParN04/include/ExN04HadronPhysics.hh delete mode 100644 examples/extended/parallel/ParN04/include/ExN04IonPhysics.hh delete mode 100644 examples/extended/parallel/ParN04/include/ExN04MuonPhysics.hh delete mode 100644 examples/extended/parallel/ParN04/src/ExN04HadronPhysics.cc delete mode 100644 examples/extended/parallel/ParN04/src/ExN04IonPhysics.cc delete mode 100644 examples/extended/parallel/ParN04/src/ExN04MuonPhysics.cc delete mode 100644 examples/extended/parallel/ParN04/src/ExN04PhysicsList.cc create mode 100644 examples/extended/polarisation/Pol01/GNUmakefile create mode 100644 examples/extended/polarisation/Pol01/History create mode 100644 examples/extended/polarisation/Pol01/README create mode 100644 examples/extended/polarisation/Pol01/heprep2.mac create mode 100644 examples/extended/polarisation/Pol01/histo.mac create mode 100644 examples/extended/polarisation/Pol01/histos.mac rename examples/extended/{medical/GammaTherapy/include/G4EmHadronBuilder.hh => polarisation/Pol01/include/DetectorConstruction.hh} (58%) rename examples/extended/{medical/GammaTherapy/include/G4EmHadronBuilder52.hh => polarisation/Pol01/include/DetectorMessenger.hh} (71%) rename examples/extended/{electromagnetic/TestEm11/include/PhysListEmG4v52.hh => polarisation/Pol01/include/EventAction.hh} (75%) rename examples/extended/{electromagnetic/TestEm9/include/PhysListParticles.hh => polarisation/Pol01/include/EventActionMessenger.hh} (77%) create mode 100644 examples/extended/polarisation/Pol01/include/HistoManager.hh rename examples/extended/{medical/GammaTherapy/include/G4EmQEDBuilder52.hh => polarisation/Pol01/include/HistoMessenger.hh} (71%) create mode 100644 examples/extended/polarisation/Pol01/include/PhysListEmPolarized.hh rename examples/extended/{electromagnetic/TestEm3/include/PhysListEmG4v71.hh => polarisation/Pol01/include/PhysListEmStandard.hh} (88%) rename examples/extended/{electromagnetic/TestEm7/include/PhysListHadronElastic.hh => polarisation/Pol01/include/PhysicsList.hh} (67%) create mode 100644 examples/extended/polarisation/Pol01/include/PhysicsListMessenger.hh rename examples/extended/{electromagnetic/TestEm11/include/PhysListEmG4v71.hh => polarisation/Pol01/include/PrimaryGeneratorAction.hh} (75%) create mode 100644 examples/extended/polarisation/Pol01/include/ProcessesCount.hh create mode 100644 examples/extended/polarisation/Pol01/include/RunAction.hh rename examples/extended/{electromagnetic/TestEm9/src/PhysListHadronElastic.cc => polarisation/Pol01/include/StepMax.hh} (67%) rename examples/extended/{eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04RunAction.hh => polarisation/Pol01/include/StepMaxMessenger.hh} (81%) rename examples/extended/{electromagnetic/TestEm1/include/PhysListEmG4v52.hh => polarisation/Pol01/include/SteppingAction.hh} (74%) create mode 100644 examples/extended/polarisation/Pol01/plotResults.class create mode 100644 examples/extended/polarisation/Pol01/plotResults.java create mode 100644 examples/extended/polarisation/Pol01/pol01.cc create mode 100644 examples/extended/polarisation/Pol01/pol01.in create mode 100644 examples/extended/polarisation/Pol01/pol01.out create mode 100644 examples/extended/polarisation/Pol01/src/DetectorConstruction.cc create mode 100644 examples/extended/polarisation/Pol01/src/DetectorMessenger.cc rename examples/extended/{electromagnetic/TestEm17/src/PhysListEmG4v52.cc => polarisation/Pol01/src/EventAction.cc} (61%) rename examples/extended/{electromagnetic/TestEm9/src/PhysListGeneral.cc => polarisation/Pol01/src/EventActionMessenger.cc} (68%) create mode 100644 examples/extended/polarisation/Pol01/src/HistoManager.cc create mode 100644 examples/extended/polarisation/Pol01/src/HistoMessenger.cc create mode 100644 examples/extended/polarisation/Pol01/src/PhysListEmPolarized.cc rename examples/extended/{electromagnetic/TestEm3/src/PhysListEmG4v71.cc => polarisation/Pol01/src/PhysListEmStandard.cc} (73%) create mode 100644 examples/extended/polarisation/Pol01/src/PhysicsList.cc create mode 100644 examples/extended/polarisation/Pol01/src/PhysicsListMessenger.cc rename examples/extended/{electromagnetic/TestEm7/src/PhysListHadronElastic.cc => polarisation/Pol01/src/PrimaryGeneratorAction.cc} (67%) create mode 100644 examples/extended/polarisation/Pol01/src/RunAction.cc create mode 100644 examples/extended/polarisation/Pol01/src/StepMax.cc rename examples/extended/{eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04RunAction.cc => polarisation/Pol01/src/StepMaxMessenger.cc} (69%) rename examples/extended/{medical/GammaTherapy/src/G4EmHadronBuilder.cc => polarisation/Pol01/src/SteppingAction.cc} (52%) create mode 100644 examples/extended/polarisation/Pol01/vis.mac create mode 100644 examples/extended/runAndEvent/RE01/History create mode 100644 examples/extended/runAndEvent/RE02/include/RE02NestedPhantomParameterisation.hh create mode 100644 examples/extended/runAndEvent/RE02/include/RE02PSCellFlux.hh create mode 100644 examples/extended/runAndEvent/RE02/include/RE02PSEnergyDeposit.hh create mode 100644 examples/extended/runAndEvent/RE02/include/RE02PSFlatSurfaceCurrent.hh rename examples/extended/{eventgenerator/HepMC/HepMCEx02-clhep/src/H02PrimaryGeneratorAction.cc => runAndEvent/RE02/include/RE02PSFlatSurfaceFlux.hh} (56%) rename source/processes/hadronic/models/coherent_elastic/include/G4HadronValues.hh => examples/extended/runAndEvent/RE02/include/RE02PSNofStep.hh (68%) create mode 100644 examples/extended/runAndEvent/RE02/include/RE02PSPassageCellFlux.hh delete mode 100644 examples/extended/runAndEvent/RE02/include/RE02PhantomParameterisation.hh create mode 100644 examples/extended/runAndEvent/RE02/run.mac create mode 100644 examples/extended/runAndEvent/RE02/run1water.log create mode 100644 examples/extended/runAndEvent/RE02/src/RE02NestedPhantomParameterisation.cc create mode 100644 examples/extended/runAndEvent/RE02/src/RE02PSCellFlux.cc create mode 100644 examples/extended/runAndEvent/RE02/src/RE02PSEnergyDeposit.cc create mode 100644 examples/extended/runAndEvent/RE02/src/RE02PSFlatSurfaceCurrent.cc create mode 100644 examples/extended/runAndEvent/RE02/src/RE02PSFlatSurfaceFlux.cc rename examples/extended/{eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04PrimaryGeneratorAction.cc => runAndEvent/RE02/src/RE02PSNofStep.cc} (54%) create mode 100644 examples/extended/runAndEvent/RE02/src/RE02PSPassageCellFlux.cc delete mode 100644 examples/extended/runAndEvent/RE02/src/RE02PhantomParameterisation.cc create mode 100644 examples/novice/N03/visTutor/exN03Vis12.loop create mode 100644 examples/novice/N03/visTutor/exN03Vis12.mac create mode 100644 examples/novice/N03/visTutor/exN03Vis13.loop create mode 100644 examples/novice/N03/visTutor/exN03Vis13.mac create mode 100644 examples/novice/N05/exampleN05.ref rename examples/{extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04CalorimeterROGeometry.hh => novice/N05/include/ExN05ParallelWorldForPion.hh} (80%) delete mode 100644 examples/novice/N05/include/ExN05SpecialCuts.hh delete mode 100644 examples/novice/N05/src/ExN05DetectorMessenger.cc delete mode 100644 examples/novice/N05/src/ExN05MinEkineCuts.cc delete mode 100644 examples/novice/N05/src/ExN05MinRangeCuts.cc create mode 100644 examples/novice/N05/src/ExN05ParallelWorldForPion.cc delete mode 100644 examples/novice/N05/src/ExN05SpecialCuts.cc create mode 100644 examples/novice/N07/include/ExN07SteppingVerbose.hh create mode 100644 examples/novice/N07/src/ExN07SteppingVerbose.cc delete mode 100644 physics_lists/hadronic/FTFC/GNUmakefile delete mode 100644 physics_lists/hadronic/FTFP/GNUmakefile delete mode 100644 physics_lists/hadronic/GNUmakefile delete mode 100644 physics_lists/hadronic/GNUmakefile.user.code.example delete mode 100644 physics_lists/hadronic/History delete mode 100644 physics_lists/hadronic/LBE/GNUmakefile delete mode 100644 physics_lists/hadronic/LHEP/GNUmakefile delete mode 100644 physics_lists/hadronic/LHEP_BERT/GNUmakefile delete mode 100644 physics_lists/hadronic/LHEP_BERT_HP/GNUmakefile delete mode 100644 physics_lists/hadronic/LHEP_BIC/GNUmakefile delete mode 100644 physics_lists/hadronic/LHEP_BIC_HP/GNUmakefile delete mode 100644 physics_lists/hadronic/LHEP_EMV/GNUmakefile delete mode 100644 physics_lists/hadronic/LHEP_GN/GNUmakefile delete mode 100644 physics_lists/hadronic/LHEP_HP/GNUmakefile delete mode 100644 physics_lists/hadronic/LHEP_LEAD/GNUmakefile delete mode 100644 physics_lists/hadronic/LHEP_LEAD_HP/GNUmakefile delete mode 100644 physics_lists/hadronic/LHEP_PRECO/GNUmakefile delete mode 100644 physics_lists/hadronic/LHEP_PRECO_HP/GNUmakefile delete mode 100644 physics_lists/hadronic/Packaging/GNUmakefile delete mode 100644 physics_lists/hadronic/QBBC/GNUmakefile delete mode 100644 physics_lists/hadronic/QGSC/GNUmakefile delete mode 100644 physics_lists/hadronic/QGSC_LEAD/GNUmakefile delete mode 100644 physics_lists/hadronic/QGSC_LEAD_HP/GNUmakefile delete mode 100644 physics_lists/hadronic/QGSP/GNUmakefile delete mode 100644 physics_lists/hadronic/QGSP_BERT/GNUmakefile delete mode 100644 physics_lists/hadronic/QGSP_BERT_HP/GNUmakefile delete mode 100644 physics_lists/hadronic/QGSP_BIC/GNUmakefile delete mode 100644 physics_lists/hadronic/QGSP_EMV/GNUmakefile delete mode 100644 physics_lists/hadronic/QGSP_EMX/GNUmakefile delete mode 100644 physics_lists/hadronic/QGSP_GN/GNUmakefile delete mode 100644 physics_lists/hadronic/QGSP_HP/GNUmakefile delete mode 100644 physics_lists/hadronic/README rename examples/novice/N05/include/ExN05MinEkineCuts.hh => source/digits_hits/utils/include/G4PSCellCharge.hh (61%) mode change 100644 => 100755 create mode 100755 source/digits_hits/utils/src/G4PSCellCharge.cc create mode 100644 source/geometry/navigation/include/G4MultiNavigator.hh create mode 100644 source/geometry/navigation/include/G4PathFinder.hh create mode 100644 source/geometry/navigation/include/G4SafetyHelper.hh create mode 100644 source/geometry/navigation/src/G4MultiNavigator.cc create mode 100644 source/geometry/navigation/src/G4PathFinder.cc create mode 100644 source/geometry/navigation/src/G4SafetyHelper.cc create mode 100644 source/global/management/include/G4FPEDetection.hh create mode 100644 source/global/management/include/G4SliceTimer.hh create mode 100644 source/global/management/include/G4SliceTimer.icc rename examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04GeneralPhysics.cc => source/global/management/src/G4SliceTimer.cc (57%) create mode 100644 source/graphics_reps/include/G4AttDefT.hh rename examples/extended/medical/GammaTherapy/include/EmHadronElasticBuilder.hh => source/graphics_reps/include/G4AttHolder.hh (58%) rename examples/extended/medical/GammaTherapy/include/G4EmMuonBuilder.hh => source/graphics_reps/include/G4AttUtils.hh (51%) create mode 100644 source/graphics_reps/include/G4ConversionFatalError.hh create mode 100644 source/graphics_reps/include/G4ConversionUtils.hh create mode 100644 source/graphics_reps/include/G4CreatorFactoryT.hh rename examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04PhysicsList.hh => source/graphics_reps/include/G4DimensionedDouble.hh (83%) rename examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04PhysicsList.hh => source/graphics_reps/include/G4DimensionedThreeVector.hh (82%) create mode 100644 source/graphics_reps/include/G4DimensionedType.hh rename examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04PrimaryGeneratorMessenger.hh => source/graphics_reps/include/G4TypeKey.hh (63%) create mode 100644 source/graphics_reps/include/G4TypeKeyT.hh rename examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04MuonHit.cc => source/graphics_reps/src/G4AttDef.cc (62%) rename examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02PhysicsList.hh => source/graphics_reps/src/G4AttHolder.cc (84%) create mode 100644 source/graphics_reps/src/G4AttUtils.cc delete mode 100644 source/persistency/tools/README delete mode 100755 source/persistency/tools/g4pmv.sh delete mode 100755 source/persistency/tools/g4psed.sh delete mode 100755 source/persistency/tools/rename.sh delete mode 100644 source/persistency/tools/setup.csh create mode 100644 source/physics_lists/GNUmakefile rename {physics_lists => source/physics_lists}/History (58%) create mode 100644 source/physics_lists/builders/GNUmakefile rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/CompileTimeConstraints.hh (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4BertiniNeutronBuilder.hh (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4BertiniPiKBuilder.hh (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4BertiniProtonBuilder.hh (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4BinaryNeutronBuilder.hh (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4BinaryPiKBuilder.hh (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4BinaryProtonBuilder.hh (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4DataQuestionaire.hh (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4DecayPhysics.hh (96%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4ElectroNuclearBuilder.hh (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4EmExtraPhysics.hh (96%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4EmMessenger.hh (96%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4EmStandardPhysics.hh (91%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4EmStandardPhysics71.hh (91%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4EmStandardPhysics72.hh (94%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4FTFCNeutronBuilder.hh (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4FTFCPiKBuilder.hh (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4FTFCProtonBuilder.hh (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4FTFPNeutronBuilder.hh (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4FTFPPiKBuilder.hh (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4FTFPProtonBuilder.hh (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4HadronElasticPhysics.hh (84%) rename examples/extended/electromagnetic/TestEm9/include/PhysListGeneral.hh => source/physics_lists/builders/include/G4HadronHElasticPhysics.hh (62%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4HadronProcessStore.hh (89%) rename examples/extended/electromagnetic/TestEm9/include/PhysListHadronElastic.hh => source/physics_lists/builders/include/G4HadronQElasticPhysics.hh (71%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4IonBinaryCascadePhysics.hh (97%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4IonPhysics.hh (96%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4LEADNeutronBuilder.hh (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4LEADPiKBuilder.hh (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4LEADProtonBuilder.hh (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4LEPNeutronBuilder.hh (98%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4LEPPiKBuilder.hh (99%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4LEPProtonBuilder.hh (98%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4LHEPNeutronBuilder.hh (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4LHEPPiKBuilder.hh (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4LHEPProtonBuilder.hh (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4LHEPStoppingPhysics.hh (96%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4MiscLHEPBuilder.hh (99%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4NeutronBuilder.hh (98%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4NeutronHPBuilder.hh (100%) rename examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02GeneralPhysics.hh => source/physics_lists/builders/include/G4NeutronTrackingCut.hh (71%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4PiKBuilder.hh (96%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4PrecoNeutronBuilder.hh (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4PrecoProtonBuilder.hh (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4ProtonBuilder.hh (98%) create mode 100644 source/physics_lists/builders/include/G4QGSCEflowNeutronBuilder.hh create mode 100644 source/physics_lists/builders/include/G4QGSCEflowPiKBuilder.hh create mode 100644 source/physics_lists/builders/include/G4QGSCEflowProtonBuilder.hh rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4QGSCNeutronBuilder.hh (96%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4QGSCPiKBuilder.hh (96%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4QGSCProtonBuilder.hh (96%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4QGSPNeutronBuilder.hh (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4QGSPPiKBuilder.hh (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4QGSPProtonBuilder.hh (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4QStoppingPhysics.hh (96%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4StoppingHadronBuilder.hh (96%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4VNeutronBuilder.hh (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4VPiKBuilder.hh (96%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/G4VProtonBuilder.hh (95%) create mode 100644 source/physics_lists/builders/include/G4WarnPLStatus.hh rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/include/TheoModelFactory.hh (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4BertiniNeutronBuilder.cc (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4BertiniPiKBuilder.cc (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4BertiniProtonBuilder.cc (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4BinaryNeutronBuilder.cc (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4BinaryPiKBuilder.cc (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4BinaryProtonBuilder.cc (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4DecayPhysics.cc (97%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4ElectroNuclearBuilder.cc (97%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4EmExtraPhysics.cc (97%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4EmMessenger.cc (97%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4EmStandardPhysics.cc (85%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4EmStandardPhysics71.cc (81%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4EmStandardPhysics72.cc (79%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4FTFCNeutronBuilder.cc (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4FTFCPiKBuilder.cc (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4FTFCProtonBuilder.cc (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4FTFPNeutronBuilder.cc (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4FTFPPiKBuilder.cc (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4FTFPProtonBuilder.cc (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4HadronElasticPhysics.cc (55%) create mode 100644 source/physics_lists/builders/src/G4HadronHElasticPhysics.cc rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4HadronProcessStore.cc (74%) create mode 100644 source/physics_lists/builders/src/G4HadronQElasticPhysics.cc rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4IonBinaryCascadePhysics.cc (98%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4IonPhysics.cc (97%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4LEADNeutronBuilder.cc (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4LEADPiKBuilder.cc (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4LEADProtonBuilder.cc (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4LEPNeutronBuilder.cc (98%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4LEPPiKBuilder.cc (99%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4LEPProtonBuilder.cc (98%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4LHEPNeutronBuilder.cc (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4LHEPPiKBuilder.cc (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4LHEPProtonBuilder.cc (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4LHEPStoppingPhysics.cc (97%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4MiscLHEPBuilder.cc (91%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4NeutronBuilder.cc (98%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4NeutronHPBuilder.cc (100%) create mode 100644 source/physics_lists/builders/src/G4NeutronTrackingCut.cc rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4PiKBuilder.cc (97%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4PrecoNeutronBuilder.cc (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4PrecoProtonBuilder.cc (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4ProtonBuilder.cc (96%) rename examples/extended/electromagnetic/TestEm9/include/PhysListEmG4v71.hh => source/physics_lists/builders/src/G4QGSCEflowNeutronBuilder.cc (62%) rename examples/extended/parallel/ParN04/src/ExN04EMPhysics.cc => source/physics_lists/builders/src/G4QGSCEflowPiKBuilder.cc (50%) rename examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04CalorimeterParametrisation.cc => source/physics_lists/builders/src/G4QGSCEflowProtonBuilder.cc (62%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4QGSCNeutronBuilder.cc (97%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4QGSCPiKBuilder.cc (98%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4QGSCProtonBuilder.cc (97%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4QGSPNeutronBuilder.cc (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4QGSPPiKBuilder.cc (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4QGSPProtonBuilder.cc (100%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4QStoppingPhysics.cc (97%) rename {physics_lists/hadronic/Packaging => source/physics_lists/builders}/src/G4StoppingHadronBuilder.cc (97%) rename physics_lists/hadronic/common.gmk => source/physics_lists/lists/GNUmakefile (83%) rename {physics_lists/hadronic/FTFC => source/physics_lists/lists}/include/FTFC.hh (96%) rename {physics_lists/hadronic/FTFC => source/physics_lists/lists}/include/FTFC.icc (96%) rename {physics_lists/hadronic/FTFP => source/physics_lists/lists}/include/FTFP.hh (96%) rename {physics_lists/hadronic/FTFP => source/physics_lists/lists}/include/FTFP.icc (91%) rename {physics_lists/hadronic/QBBC => source/physics_lists/lists}/include/G4HadronInelasticQBBC.hh (90%) rename {physics_lists/hadronic/QBBC => source/physics_lists/lists}/include/G4HadronInelasticQLHEP.hh (93%) rename {physics_lists/hadronic/FTFC => source/physics_lists/lists}/include/HadronPhysicsFTFC.hh (96%) rename {physics_lists/hadronic/FTFP => source/physics_lists/lists}/include/HadronPhysicsFTFP.hh (96%) rename {physics_lists/hadronic/LHEP => source/physics_lists/lists}/include/HadronPhysicsLHEP.hh (96%) rename {physics_lists/hadronic/LHEP_BERT => source/physics_lists/lists}/include/HadronPhysicsLHEP_BERT.hh (96%) rename {physics_lists/hadronic/LHEP_BERT_HP => source/physics_lists/lists}/include/HadronPhysicsLHEP_BERT_HP.hh (96%) rename {physics_lists/hadronic/LHEP_BIC => source/physics_lists/lists}/include/HadronPhysicsLHEP_BIC.hh (96%) rename {physics_lists/hadronic/LHEP_BIC_HP => source/physics_lists/lists}/include/HadronPhysicsLHEP_BIC_HP.hh (96%) rename {physics_lists/hadronic/LHEP_EMV => source/physics_lists/lists}/include/HadronPhysicsLHEP_EMV.hh (96%) rename {physics_lists/hadronic/LHEP_HP => source/physics_lists/lists}/include/HadronPhysicsLHEP_HP.hh (96%) rename {physics_lists/hadronic/LHEP_LEAD => source/physics_lists/lists}/include/HadronPhysicsLHEP_LEAD.hh (96%) rename {physics_lists/hadronic/LHEP_LEAD_HP => source/physics_lists/lists}/include/HadronPhysicsLHEP_LEAD_HP.hh (97%) rename {physics_lists/hadronic/LHEP_PRECO => source/physics_lists/lists}/include/HadronPhysicsLHEP_PRECO.hh (96%) rename {physics_lists/hadronic/LHEP_PRECO_HP => source/physics_lists/lists}/include/HadronPhysicsLHEP_PRECO_HP.hh (96%) rename {physics_lists/hadronic/QGSC => source/physics_lists/lists}/include/HadronPhysicsQGSC.hh (96%) rename physics_lists/hadronic/LHEP_GN/include/HadronPhysicsLHEP_GN.hh => source/physics_lists/lists/include/HadronPhysicsQGSC_EFLOW.hh (71%) rename physics_lists/hadronic/QGSP_GN/include/HadronPhysicsQGSP_GN.hh => source/physics_lists/lists/include/HadronPhysicsQGSC_EMV.hh (77%) rename {physics_lists/hadronic/QGSC_LEAD => source/physics_lists/lists}/include/HadronPhysicsQGSC_LEAD.hh (97%) rename {physics_lists/hadronic/QGSC_LEAD_HP => source/physics_lists/lists}/include/HadronPhysicsQGSC_LEAD_HP.hh (97%) rename {physics_lists/hadronic/QGSP => source/physics_lists/lists}/include/HadronPhysicsQGSP.hh (96%) rename {physics_lists/hadronic/QGSP_BERT => source/physics_lists/lists}/include/HadronPhysicsQGSP_BERT.hh (97%) rename {physics_lists/hadronic/QGSP_BERT_HP => source/physics_lists/lists}/include/HadronPhysicsQGSP_BERT_HP.hh (95%) rename {physics_lists/hadronic/QGSP_BIC => source/physics_lists/lists}/include/HadronPhysicsQGSP_BIC.hh (97%) create mode 100644 source/physics_lists/lists/include/HadronPhysicsQGSP_BIC_HP.hh rename {physics_lists/hadronic/QGSP_EMV => source/physics_lists/lists}/include/HadronPhysicsQGSP_EMV.hh (96%) rename {physics_lists/hadronic/QGSP_EMX => source/physics_lists/lists}/include/HadronPhysicsQGSP_EMX.hh (96%) rename {physics_lists/hadronic/QGSP_HP => source/physics_lists/lists}/include/HadronPhysicsQGSP_HP.hh (96%) rename {physics_lists/hadronic/LBE => source/physics_lists/lists}/include/LBE.hh (91%) rename {physics_lists/hadronic/LBE => source/physics_lists/lists}/include/LBE.icc (98%) rename {physics_lists/hadronic/LHEP => source/physics_lists/lists}/include/LHEP.hh (100%) rename {physics_lists/hadronic/LHEP => source/physics_lists/lists}/include/LHEP.icc (96%) rename {physics_lists/hadronic/LHEP_BERT => source/physics_lists/lists}/include/LHEP_BERT.hh (96%) rename {physics_lists/hadronic/LHEP_BERT => source/physics_lists/lists}/include/LHEP_BERT.icc (97%) rename {physics_lists/hadronic/LHEP_BERT_HP => source/physics_lists/lists}/include/LHEP_BERT_HP.hh (100%) rename {physics_lists/hadronic/LHEP_BERT_HP => source/physics_lists/lists}/include/LHEP_BERT_HP.icc (97%) rename {physics_lists/hadronic/LHEP_BIC => source/physics_lists/lists}/include/LHEP_BIC.hh (96%) rename {physics_lists/hadronic/LHEP_BIC => source/physics_lists/lists}/include/LHEP_BIC.icc (95%) rename {physics_lists/hadronic/LHEP_BIC_HP => source/physics_lists/lists}/include/LHEP_BIC_HP.hh (96%) rename {physics_lists/hadronic/LHEP_BIC_HP => source/physics_lists/lists}/include/LHEP_BIC_HP.icc (95%) rename {physics_lists/hadronic/LHEP_EMV => source/physics_lists/lists}/include/LHEP_EMV.hh (96%) rename {physics_lists/hadronic/LHEP_EMV => source/physics_lists/lists}/include/LHEP_EMV.icc (97%) rename {physics_lists/hadronic/LHEP_HP => source/physics_lists/lists}/include/LHEP_HP.hh (96%) rename {physics_lists/hadronic/LHEP_HP => source/physics_lists/lists}/include/LHEP_HP.icc (94%) rename {physics_lists/hadronic/LHEP_LEAD => source/physics_lists/lists}/include/LHEP_LEAD.hh (96%) rename {physics_lists/hadronic/LHEP_LEAD => source/physics_lists/lists}/include/LHEP_LEAD.icc (97%) rename {physics_lists/hadronic/LHEP_LEAD_HP => source/physics_lists/lists}/include/LHEP_LEAD_HP.hh (96%) rename {physics_lists/hadronic/LHEP_LEAD_HP => source/physics_lists/lists}/include/LHEP_LEAD_HP.icc (97%) rename {physics_lists/hadronic/LHEP_PRECO => source/physics_lists/lists}/include/LHEP_PRECO.hh (96%) rename {physics_lists/hadronic/LHEP_PRECO => source/physics_lists/lists}/include/LHEP_PRECO.icc (95%) rename {physics_lists/hadronic/LHEP_PRECO_HP => source/physics_lists/lists}/include/LHEP_PRECO_HP.hh (96%) rename {physics_lists/hadronic/LHEP_PRECO_HP => source/physics_lists/lists}/include/LHEP_PRECO_HP.icc (96%) rename {physics_lists/hadronic/LBE => source/physics_lists/lists}/include/MaxTimeCuts.hh (100%) rename {physics_lists/hadronic/LBE => source/physics_lists/lists}/include/MinEkineCuts.hh (96%) rename {physics_lists/hadronic/QBBC => source/physics_lists/lists}/include/QBBC.hh (93%) rename {physics_lists/hadronic/QBBC => source/physics_lists/lists}/include/QBBC.icc (80%) rename {physics_lists/hadronic/QGSC => source/physics_lists/lists}/include/QGSC.hh (100%) rename {physics_lists/hadronic/QGSC => source/physics_lists/lists}/include/QGSC.icc (88%) rename examples/extended/parallel/ParN04/include/ExN04PhysicsList.hh => source/physics_lists/lists/include/QGSC_EFLOW.hh (82%) rename examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04PhysicsList.cc => source/physics_lists/lists/include/QGSC_EFLOW.icc (52%) rename physics_lists/hadronic/QGSP_GN/include/QGSP_GN.hh => source/physics_lists/lists/include/QGSC_EMV.hh (90%) rename examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02PhysicsList.cc => source/physics_lists/lists/include/QGSC_EMV.icc (53%) rename {physics_lists/hadronic/QGSC_LEAD => source/physics_lists/lists}/include/QGSC_LEAD.hh (96%) rename {physics_lists/hadronic/QGSC_LEAD => source/physics_lists/lists}/include/QGSC_LEAD.icc (92%) rename {physics_lists/hadronic/QGSC_LEAD_HP => source/physics_lists/lists}/include/QGSC_LEAD_HP.hh (96%) rename {physics_lists/hadronic/QGSC_LEAD_HP => source/physics_lists/lists}/include/QGSC_LEAD_HP.icc (97%) rename {physics_lists/hadronic/QGSP => source/physics_lists/lists}/include/QGSP.hh (96%) rename {physics_lists/hadronic/QGSP => source/physics_lists/lists}/include/QGSP.icc (91%) rename {physics_lists/hadronic/QGSP_BERT => source/physics_lists/lists}/include/QGSP_BERT.hh (96%) rename {physics_lists/hadronic/QGSP_BERT => source/physics_lists/lists}/include/QGSP_BERT.icc (92%) rename {physics_lists/hadronic/QGSP_BERT_HP => source/physics_lists/lists}/include/QGSP_BERT_HP.hh (96%) rename {physics_lists/hadronic/QGSP_BERT_HP => source/physics_lists/lists}/include/QGSP_BERT_HP.icc (95%) rename {physics_lists/hadronic/QGSP_BIC => source/physics_lists/lists}/include/QGSP_BIC.hh (96%) rename {physics_lists/hadronic/QGSP_BIC => source/physics_lists/lists}/include/QGSP_BIC.icc (93%) create mode 100644 source/physics_lists/lists/include/QGSP_BIC_HP.hh rename physics_lists/hadronic/QGSP_GN/include/QGSP_GN.icc => source/physics_lists/lists/include/QGSP_BIC_HP.icc (75%) rename {physics_lists/hadronic/QGSP_EMV => source/physics_lists/lists}/include/QGSP_EMV.hh (96%) rename {physics_lists/hadronic/QGSP_EMV => source/physics_lists/lists}/include/QGSP_EMV.icc (93%) rename {physics_lists/hadronic/QGSP_EMX => source/physics_lists/lists}/include/QGSP_EMX.hh (96%) rename {physics_lists/hadronic/QGSP_EMX => source/physics_lists/lists}/include/QGSP_EMX.icc (92%) rename {physics_lists/hadronic/QGSP_HP => source/physics_lists/lists}/include/QGSP_HP.hh (96%) rename {physics_lists/hadronic/QGSP_HP => source/physics_lists/lists}/include/QGSP_HP.icc (94%) rename physics_lists/hadronic/LHEP_GN/include/LHEP_GN.hh => source/physics_lists/lists/include/QGSP_QEL.hh (85%) rename physics_lists/hadronic/LHEP_GN/include/LHEP_GN.icc => source/physics_lists/lists/include/QGSP_QEL.icc (71%) rename {physics_lists/hadronic/LBE => source/physics_lists/lists}/include/SpecialCuts.hh (100%) rename {physics_lists/hadronic/QBBC => source/physics_lists/lists}/src/G4HadronInelasticQBBC.cc (87%) rename {physics_lists/hadronic/QBBC => source/physics_lists/lists}/src/G4HadronInelasticQLHEP.cc (93%) rename {physics_lists/hadronic/FTFC => source/physics_lists/lists}/src/HadronPhysicsFTFC.cc (97%) rename {physics_lists/hadronic/FTFP => source/physics_lists/lists}/src/HadronPhysicsFTFP.cc (97%) rename {physics_lists/hadronic/LHEP => source/physics_lists/lists}/src/HadronPhysicsLHEP.cc (97%) rename {physics_lists/hadronic/LHEP_BERT => source/physics_lists/lists}/src/HadronPhysicsLHEP_BERT.cc (97%) rename {physics_lists/hadronic/LHEP_BERT_HP => source/physics_lists/lists}/src/HadronPhysicsLHEP_BERT_HP.cc (97%) rename {physics_lists/hadronic/LHEP_BIC => source/physics_lists/lists}/src/HadronPhysicsLHEP_BIC.cc (97%) rename {physics_lists/hadronic/LHEP_BIC_HP => source/physics_lists/lists}/src/HadronPhysicsLHEP_BIC_HP.cc (97%) rename {physics_lists/hadronic/LHEP_EMV => source/physics_lists/lists}/src/HadronPhysicsLHEP_EMV.cc (97%) rename {physics_lists/hadronic/LHEP_HP => source/physics_lists/lists}/src/HadronPhysicsLHEP_HP.cc (97%) rename {physics_lists/hadronic/LHEP_LEAD => source/physics_lists/lists}/src/HadronPhysicsLHEP_LEAD.cc (97%) rename {physics_lists/hadronic/LHEP_LEAD_HP => source/physics_lists/lists}/src/HadronPhysicsLHEP_LEAD_HP.cc (97%) rename {physics_lists/hadronic/LHEP_PRECO => source/physics_lists/lists}/src/HadronPhysicsLHEP_PRECO.cc (97%) rename {physics_lists/hadronic/LHEP_PRECO_HP => source/physics_lists/lists}/src/HadronPhysicsLHEP_PRECO_HP.cc (97%) rename {physics_lists/hadronic/QGSC => source/physics_lists/lists}/src/HadronPhysicsQGSC.cc (97%) rename physics_lists/hadronic/LHEP_GN/src/HadronPhysicsLHEP_GN.cc => source/physics_lists/lists/src/HadronPhysicsQGSC_EFLOW.cc (69%) rename physics_lists/hadronic/QGSP_GN/src/HadronPhysicsQGSP_GN.cc => source/physics_lists/lists/src/HadronPhysicsQGSC_EMV.cc (77%) rename {physics_lists/hadronic/QGSC_LEAD => source/physics_lists/lists}/src/HadronPhysicsQGSC_LEAD.cc (97%) rename {physics_lists/hadronic/QGSC_LEAD_HP => source/physics_lists/lists}/src/HadronPhysicsQGSC_LEAD_HP.cc (97%) rename {physics_lists/hadronic/QGSP => source/physics_lists/lists}/src/HadronPhysicsQGSP.cc (97%) rename {physics_lists/hadronic/QGSP_BERT => source/physics_lists/lists}/src/HadronPhysicsQGSP_BERT.cc (97%) rename {physics_lists/hadronic/QGSP_BERT_HP => source/physics_lists/lists}/src/HadronPhysicsQGSP_BERT_HP.cc (97%) rename {physics_lists/hadronic/QGSP_BIC => source/physics_lists/lists}/src/HadronPhysicsQGSP_BIC.cc (97%) create mode 100644 source/physics_lists/lists/src/HadronPhysicsQGSP_BIC_HP.cc rename {physics_lists/hadronic/QGSP_EMV => source/physics_lists/lists}/src/HadronPhysicsQGSP_EMV.cc (97%) rename {physics_lists/hadronic/QGSP_EMX => source/physics_lists/lists}/src/HadronPhysicsQGSP_EMX.cc (97%) rename {physics_lists/hadronic/QGSP_HP => source/physics_lists/lists}/src/HadronPhysicsQGSP_HP.cc (97%) rename {physics_lists/hadronic/LBE => source/physics_lists/lists}/src/MaxTimeCuts.cc (100%) rename {physics_lists/hadronic/LBE => source/physics_lists/lists}/src/MinEkineCuts.cc (99%) rename {physics_lists/hadronic/LBE => source/physics_lists/lists}/src/SpecialCuts.cc (100%) create mode 100644 source/processes/electromagnetic/highenergy/include/G4mplIonisation.hh create mode 100644 source/processes/electromagnetic/highenergy/include/G4mplIonisationModel.hh rename examples/extended/electromagnetic/TestEm9/src/PhysListParticles.cc => source/processes/electromagnetic/highenergy/src/G4mplIonisation.cc (55%) create mode 100644 source/processes/electromagnetic/highenergy/src/G4mplIonisationModel.cc create mode 100644 source/processes/electromagnetic/polarisation/GNUmakefile create mode 100644 source/processes/electromagnetic/polarisation/History create mode 100644 source/processes/electromagnetic/polarisation/include/G4PolarizationHelper.hh create mode 100644 source/processes/electromagnetic/polarisation/include/G4PolarizationManager.hh create mode 100644 source/processes/electromagnetic/polarisation/include/G4PolarizationMessenger.hh create mode 100644 source/processes/electromagnetic/polarisation/include/G4PolarizedAnnihilationCrossSection.hh create mode 100644 source/processes/electromagnetic/polarisation/include/G4PolarizedAnnihilationModel.hh create mode 100644 source/processes/electromagnetic/polarisation/include/G4PolarizedBhabhaCrossSection.hh rename examples/extended/medical/GammaTherapy/include/EmIonBinaryCascadeBuilder.hh => source/processes/electromagnetic/polarisation/include/G4PolarizedBremsstrahlungCrossSection.hh (52%) create mode 100644 source/processes/electromagnetic/polarisation/include/G4PolarizedCompton.hh create mode 100644 source/processes/electromagnetic/polarisation/include/G4PolarizedComptonCrossSection.hh create mode 100644 source/processes/electromagnetic/polarisation/include/G4PolarizedComptonModel.hh create mode 100644 source/processes/electromagnetic/polarisation/include/G4PolarizedGammaConversion.hh create mode 100644 source/processes/electromagnetic/polarisation/include/G4PolarizedGammaConversionModel.hh create mode 100644 source/processes/electromagnetic/polarisation/include/G4PolarizedMollerBhabhaModel.hh create mode 100644 source/processes/electromagnetic/polarisation/include/G4PolarizedMollerCrossSection.hh create mode 100644 source/processes/electromagnetic/polarisation/include/G4PolarizedPairProductionCrossSection.hh create mode 100644 source/processes/electromagnetic/polarisation/include/G4StokesVector.hh create mode 100644 source/processes/electromagnetic/polarisation/include/G4VPolarizedCrossSection.hh rename examples/extended/medical/GammaTherapy/include/EmBinaryCascadeBuilder.hh => source/processes/electromagnetic/polarisation/include/G4ePolarizedBremsstrahlung.hh (60%) create mode 100644 source/processes/electromagnetic/polarisation/include/G4ePolarizedBremsstrahlungModel.hh create mode 100644 source/processes/electromagnetic/polarisation/include/G4ePolarizedIonisation.hh create mode 100644 source/processes/electromagnetic/polarisation/include/G4eplusPolarizedAnnihilation.hh create mode 100644 source/processes/electromagnetic/polarisation/src/G4PolarizationHelper.cc create mode 100644 source/processes/electromagnetic/polarisation/src/G4PolarizationManager.cc create mode 100644 source/processes/electromagnetic/polarisation/src/G4PolarizationMessenger.cc create mode 100644 source/processes/electromagnetic/polarisation/src/G4PolarizedAnnihilationCrossSection.cc create mode 100644 source/processes/electromagnetic/polarisation/src/G4PolarizedAnnihilationModel.cc create mode 100644 source/processes/electromagnetic/polarisation/src/G4PolarizedBhabhaCrossSection.cc create mode 100644 source/processes/electromagnetic/polarisation/src/G4PolarizedBremsstrahlungCrossSection.cc create mode 100644 source/processes/electromagnetic/polarisation/src/G4PolarizedCompton.cc create mode 100644 source/processes/electromagnetic/polarisation/src/G4PolarizedComptonCrossSection.cc create mode 100644 source/processes/electromagnetic/polarisation/src/G4PolarizedComptonModel.cc rename examples/extended/medical/GammaTherapy/src/G4EmMuonBuilder52.cc => source/processes/electromagnetic/polarisation/src/G4PolarizedGammaConversion.cc (51%) create mode 100644 source/processes/electromagnetic/polarisation/src/G4PolarizedGammaConversionModel.cc create mode 100644 source/processes/electromagnetic/polarisation/src/G4PolarizedMollerBhabhaModel.cc create mode 100644 source/processes/electromagnetic/polarisation/src/G4PolarizedMollerCrossSection.cc create mode 100644 source/processes/electromagnetic/polarisation/src/G4PolarizedPairProductionCrossSection.cc create mode 100644 source/processes/electromagnetic/polarisation/src/G4StokesVector.cc create mode 100644 source/processes/electromagnetic/polarisation/src/G4VPolarizedCrossSection.cc create mode 100644 source/processes/electromagnetic/polarisation/src/G4ePolarizedBremsstrahlung.cc create mode 100644 source/processes/electromagnetic/polarisation/src/G4ePolarizedBremsstrahlungModel.cc create mode 100644 source/processes/electromagnetic/polarisation/src/G4ePolarizedIonisation.cc create mode 100644 source/processes/electromagnetic/polarisation/src/G4eplusPolarizedAnnihilation.cc create mode 100644 source/processes/electromagnetic/standard/include/G4hMultipleScattering.hh create mode 100644 source/processes/electromagnetic/standard/src/G4hMultipleScattering.cc create mode 100644 source/processes/hadronic/cross_sections/History create mode 100644 source/processes/hadronic/cross_sections/include/G4GlauberGribovCrossSection.hh rename examples/extended/medical/GammaTherapy/include/DecaysBuilder.hh => source/processes/hadronic/cross_sections/include/G4UElasticCrossSection.hh (66%) rename examples/extended/medical/GammaTherapy/include/G4EmQEDBuilder.hh => source/processes/hadronic/cross_sections/include/G4UInelasticCrossSection.hh (61%) create mode 100644 source/processes/hadronic/cross_sections/include/G4UPiNuclearCrossSection.hh create mode 100644 source/processes/hadronic/cross_sections/src/G4GlauberGribovCrossSection.cc rename examples/extended/medical/GammaTherapy/src/G4EmHadronBuilder71.cc => source/processes/hadronic/cross_sections/src/G4UElasticCrossSection.cc (56%) create mode 100644 source/processes/hadronic/cross_sections/src/G4UInelasticCrossSection.cc create mode 100644 source/processes/hadronic/cross_sections/src/G4UPiNuclearCrossSection.cc create mode 100644 source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QFragmentation.hh create mode 100644 source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QHadronBuilder.hh create mode 100644 source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QInteraction.hh create mode 100644 source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QInteractionVector.hh create mode 100644 source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParton.hh rename examples/extended/electromagnetic/TestEm9/include/PhysListIonBinaryCascade.hh => source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPartonPair.hh (51%) create mode 100644 source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPartonPairVector.hh rename examples/novice/N05/include/ExN05MaxTimeCuts.hh => source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPartonVector.hh (65%) create mode 100644 source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPomeron.hh create mode 100644 source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QString.hh rename examples/extended/analysis/A01/include/A01TrackingAction.hh => source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QStringVector.hh (77%) create mode 100644 source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QFragmentation.cc create mode 100644 source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QHadronBuilder.cc create mode 100644 source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QInteraction.cc create mode 100644 source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QParton.cc create mode 100644 source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPartonPair.cc create mode 100644 source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPomeron.cc create mode 100644 source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QString.cc create mode 100644 source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QAtomicElectronScattering.hh create mode 100644 source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QGluonString.hh create mode 100644 source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QStringChipsParticleLevelInterface.hh create mode 100644 source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QAtomicElectronScattering.cc create mode 100644 source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QGluonString.cc create mode 100644 source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QStringChipsParticleLevelInterface.cc delete mode 100644 source/processes/hadronic/models/coherent_elastic/include/G4DiffElasticHadrNucleus.hh delete mode 100644 source/processes/hadronic/models/coherent_elastic/src/G4DiffElasticHadrNucleus.cc delete mode 100644 source/processes/hadronic/models/coherent_elastic/src/G4HadronValues.cc delete mode 100644 source/processes/hadronic/models/coherent_elastic/src/G4IntegrHadrNucleus.cc create mode 100644 source/processes/hadronic/models/high_energy/History rename source/processes/hadronic/models/{coherent_elastic/include/G4IntegrHadrNucleus.hh => neutron_hp/include/G4NeutronHPJENDLHEData.hh} (54%) rename examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04EventAction.hh => source/processes/hadronic/models/neutron_hp/include/G4NeutronHPJENDLHEElasticData.hh (77%) create mode 100644 source/processes/hadronic/models/neutron_hp/include/G4NeutronHPJENDLHEInelasticData.hh create mode 100644 source/processes/hadronic/models/neutron_hp/include/G4NeutronHPThermalScattering.hh create mode 100644 source/processes/hadronic/models/neutron_hp/include/G4NeutronHPThermalScatteringData.hh create mode 100644 source/processes/hadronic/models/neutron_hp/include/G4NeutronHPThermalScatteringNames.hh create mode 100644 source/processes/hadronic/models/neutron_hp/src/G4NeutronHPJENDLHEData.cc rename examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04Field.cc => source/processes/hadronic/models/neutron_hp/src/G4NeutronHPJENDLHEElasticData.cc (78%) rename examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04TrackingAction.cc => source/processes/hadronic/models/neutron_hp/src/G4NeutronHPJENDLHEInelasticData.cc (78%) create mode 100644 source/processes/hadronic/models/neutron_hp/src/G4NeutronHPThermalScattering.cc create mode 100644 source/processes/hadronic/models/neutron_hp/src/G4NeutronHPThermalScatteringData.cc rename examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04TrackerHit.cc => source/processes/hadronic/models/neutron_hp/src/G4NeutronHPThermalScatteringNames.cc (57%) create mode 100644 source/processes/hadronic/models/pre_equilibrium/History create mode 100644 source/processes/parameterisation/include/G4FastSimulationManagerProcess81.hh create mode 100644 source/processes/parameterisation/include/G4GFSManager81.hh create mode 100644 source/processes/parameterisation/src/G4FastSimulationManagerProcess81.cc create mode 100644 source/processes/parameterisation/src/G4GFSManager81.cc create mode 100644 source/processes/scoring/GNUmakefile create mode 100644 source/processes/scoring/History create mode 100644 source/processes/scoring/include/G4GCellFinder.hh create mode 100644 source/processes/scoring/include/G4GeometrySampler.hh create mode 100644 source/processes/scoring/include/G4ImportanceConfigurator.hh create mode 100644 source/processes/scoring/include/G4ImportanceProcess.hh create mode 100644 source/processes/scoring/include/G4NewProcessPlacer.hh create mode 100644 source/processes/scoring/include/G4NewWeightCutOffConfigurator.hh create mode 100644 source/processes/scoring/include/G4NewWeightCutOffProcess.hh create mode 100644 source/processes/scoring/include/G4ParallelWorldScoringProcess.hh create mode 100644 source/processes/scoring/include/G4PlaceOfAction.hh create mode 100644 source/processes/scoring/include/G4ScoreConfigurator.hh create mode 100644 source/processes/scoring/include/G4ScoreProcess.hh create mode 100644 source/processes/scoring/include/G4TrackTerminator.hh create mode 100644 source/processes/scoring/include/G4VProcessPlacer.hh create mode 100644 source/processes/scoring/include/G4WeightWindowConfigurator.hh create mode 100644 source/processes/scoring/include/G4WeightWindowProcess.hh create mode 100644 source/processes/scoring/src/G4GCellFinder.cc create mode 100644 source/processes/scoring/src/G4GeometrySampler.cc create mode 100644 source/processes/scoring/src/G4ImportanceConfigurator.cc create mode 100644 source/processes/scoring/src/G4ImportanceProcess.cc create mode 100644 source/processes/scoring/src/G4NewProcessPlacer.cc rename examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/hepmcEx02-clhep.cc => source/processes/scoring/src/G4NewWeightCutOffConfigurator.cc (50%) create mode 100644 source/processes/scoring/src/G4NewWeightCutOffProcess.cc create mode 100644 source/processes/scoring/src/G4ParallelWorldScoringProcess.cc create mode 100644 source/processes/scoring/src/G4ScoreConfigurator.cc create mode 100644 source/processes/scoring/src/G4ScoreProcess.cc create mode 100644 source/processes/scoring/src/G4WeightWindowConfigurator.cc create mode 100644 source/processes/scoring/src/G4WeightWindowProcess.cc create mode 100644 source/processes/transportation/include/G4CoupledTransportation.hh create mode 100644 source/processes/transportation/include/G4CoupledTransportation.icc create mode 100644 source/processes/transportation/include/G4NeutronKiller.hh rename examples/extended/medical/GammaTherapy/include/G4EmHadronBuilder71.hh => source/processes/transportation/include/G4NeutronKillerMessenger.hh (65%) create mode 100644 source/processes/transportation/src/G4CoupledTransportation.cc rename examples/extended/medical/GammaTherapy/src/DecaysBuilder.cc => source/processes/transportation/src/G4NeutronKiller.cc (66%) rename examples/extended/medical/GammaTherapy/src/G4EmHadronBuilder52.cc => source/processes/transportation/src/G4NeutronKillerMessenger.cc (59%) create mode 100644 source/run/include/G4VUserParallelWorld.hh rename source/{visualization/modeling/include/G4TrajectoriesModel.icc => run/src/G4VUserParallelWorld.cc} (74%) rename examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04TrackerSD.hh => source/track/include/G4FieldTrackUpdator.hh (72%) rename source/{tracking => track}/include/G4TrackVector.hh (93%) rename examples/extended/parallel/ParN04/src/ExN04GeneralPhysics.cc => source/track/src/G4FieldTrackUpdator.cc (56%) rename examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02PrimaryGeneratorMessenger.hh => source/visualization/OpenGL/include/G4OpenGLViewerMessenger.hh (67%) create mode 100644 source/visualization/OpenGL/include/G4OpenGLXViewerMessenger.hh create mode 100644 source/visualization/OpenGL/src/G4OpenGLViewerMessenger.cc create mode 100644 source/visualization/OpenGL/src/G4OpenGLXViewerMessenger.cc rename source/visualization/{modeling/include/G4AxesModel.icc => OpenInventor/include/SoG4LineSet.h} (81%) rename source/visualization/{modeling/include/G4HitsModel.icc => OpenInventor/include/SoG4MarkerSet.h} (80%) rename examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02SteppingAction.hh => source/visualization/OpenInventor/include/SoG4Polyhedron.h (75%) create mode 100644 source/visualization/modeling/include/G4AttFilterUtils.hh create mode 100644 source/visualization/modeling/include/G4AttValueFilterT.hh create mode 100644 source/visualization/modeling/include/G4AttributeFilterT.hh create mode 100644 source/visualization/modeling/include/G4HitFilterFactories.hh create mode 100644 source/visualization/modeling/include/G4ModelCommandUtils.hh create mode 100644 source/visualization/modeling/include/G4ModelCompoundCommandsT.hh delete mode 100644 source/visualization/modeling/include/G4ScaleModel.icc delete mode 100644 source/visualization/modeling/include/G4TextModel.icc create mode 100644 source/visualization/modeling/include/G4TrajectoryDrawByAttribute.hh create mode 100644 source/visualization/modeling/include/G4VAttValueFilter.hh create mode 100644 source/visualization/modeling/src/G4AttFilterUtils.cc create mode 100644 source/visualization/modeling/src/G4HitFilterFactories.cc create mode 100644 source/visualization/modeling/src/G4TrajectoryDrawByAttribute.cc diff --git a/Configure b/Configure index 508c4a1ade..071d6dd8e5 100755 --- a/Configure +++ b/Configure @@ -18,9 +18,9 @@ # you may fetch it yourself from your nearest archive site.) # -# $Id: Configure,v 1.87 2006/06/28 11:24:25 stesting Exp $ +# $Id: Configure,v 1.95 2006/12/15 15:19:44 stesting Exp $ # -# Generated on Wed Jun 28 13:14:07 CEST 2006 [metaconfig 3.0 PL70] +# Generated on Fri Dec 15 16:15:48 CET 2006 [metaconfig 3.0 PL70] cat >/tmp/c1$$ </dev/null |xargs echo` +xaw_dirs=`find $g4ui_xawhome /usr/X11R6/include /usr/local/include /usr/include /sw/include -type d -name Xaw 2>/dev/null |xargs echo` #echo ogl_dirs=$ogl_dirs if test "X$xaw_dirs" != "X" ; then @@ -3890,17 +3897,14 @@ fi ########################################################################## -if test "X$g4ui_xawhome" != "X" ; then -xaw_dirs=$g4ui_xawhome -fi +#if test "X$g4ui_xawhome" != "X" ; then +#xaw_dirs=$g4ui_xawhome +#fi -if test "X$xaw_dirs" != "X" ; then +if test "X$g4ui_xawhome" != "X" ; then g4message=`cat << EOM - XAW/include - XAW/lib - You have selected to use the XAW based user interfaces. Specify the correct path where XAW is installed in your system. It was found in $g4ui_xawhome. Press [Enter] to set this path or type the correct one. @@ -3932,9 +3936,6 @@ else g4message=`cat << EOM - XAW/include - XAW/lib - You have selected to use XAW based user interfaces. But XAW was not found in $ans. Please specify the correct path where XAW is installed in your system. @@ -3954,9 +3955,6 @@ else g4message=`cat << EOM - XAW/include - XAW/lib - You have selected to use XAW based user interfaces. But XAW was not found in expected place. Please specify the correct path where XAW is installed in your system. @@ -3988,9 +3986,6 @@ else g4message=`cat << EOM - XAW/include - XAW/lib - You have selected to use XAW based user interfaces. But XAW was not found in $ans. Please specify the correct path where XAW is installed in your system. @@ -4100,7 +4095,7 @@ gans=$ans if test "X$g4ui_build_xm_session" = "Xy" ; then if test "X$g4vis_xmhome" = "X" ; then -xm_dirs=`find $g4vis_xmhome /usr/X11R6/include /usr/local/include /usr/include -type d -name Xm 2>/dev/null |xargs echo` +xm_dirs=`find $g4vis_xmhome /usr/X11R6/include /usr/local/include /usr/include /sw/include -type d -name Xm 2>/dev/null |xargs echo` #echo ogl_dirs=$ogl_dirs if test "X$xm_dirs" != "X" ; then @@ -4124,17 +4119,14 @@ fi ########################################################################## -if test "X$g4vis_xmhome" != "X" ; then -xm_dirs=$g4vis_xmhome -fi +#if test "X$g4vis_xmhome" != "X" ; then +#xm_dirs=$g4vis_xmhome +#fi -if test "X$xm_dirs" != "X" ; then +if test "X$g4vis_xmhome" != "X" ; then g4message=`cat << EOM - XM/include - XM/lib - You have selected to use the XM Motif based user interfaces. Specify the correct path where Xm is installed in your system. It was found in $g4vis_xmhome. Press [Enter] to set this path or type the correct one. @@ -4166,9 +4158,6 @@ else g4message=`cat << EOM - XM/include - XM/lib - You have selected to use XM Motif based user interfaces. But XM Motif was not found in $ans. Please specify the correct path where Xm is installed in your system. @@ -4188,9 +4177,6 @@ else g4message=`cat << EOM - XM/include - XM/lib - You have selected to use XM Motif based user interfaces. But XM Motif was not found in expected place. Please specify the correct path where Xm is installed in your system. @@ -4222,9 +4208,6 @@ else g4message=`cat << EOM - XM/include - XM/lib - You have selected to use XM Motif based user interfaces. But XM Motif was not found in $ans. Please specify the correct path where Xm is installed in your system. @@ -4624,7 +4607,7 @@ if test "X$g4vis_build_openglxm_driver" = "Xy" ; then #echo PASS2 if test "X$g4vis_xmhome" = "X" ; then -xm_dirs=`find $g4vis_xmhome /usr/X11R6/include /usr/local/include /usr/include -type d -name Xm 2>/dev/null |xargs echo` +xm_dirs=`find $g4vis_xmhome /usr/X11R6/include /usr/local/include /usr/include /sw/include -type d -name Xm 2>/dev/null |xargs echo` #echo ogl_dirs=$ogl_dirs if test "X$xm_dirs" != "X" ; then @@ -4648,17 +4631,14 @@ fi ########################################################################## -if test "X$g4vis_xmhome" != "X" ; then -xm_dirs=$g4vis_xmhome -fi +#if test "X$g4vis_xmhome" != "X" ; then +#xm_dirs=$g4vis_xmhome +#fi -if test "X$xm_dirs" != "X" ; then +if test "X$g4vis_xmhome" != "X" ; then g4message=`cat << EOM - XM/include - XM/lib - You have selected to use OPENGLXM driver. Specify the correct path where Xm is installed in your system. It was found in $g4vis_xmhome. Press [Enter] to set this path or type the correct one. @@ -4690,9 +4670,6 @@ else g4message=`cat << EOM - XM/include - XM/lib - You have selected to use OPENGLXM driver. But it was not found in $ans. Please specify the correct path where Xm is installed in your system. @@ -4712,9 +4689,6 @@ else g4message=`cat << EOM - XM/include - XM/lib - You have selected to use OPENGLXM driver. But it was not found in expected place. Please specify the correct path where Xm is installed in your system. @@ -4746,9 +4720,6 @@ else g4message=`cat << EOM - XM/include - XM/lib - You have selected to use OPENGLXM driver. But it was not found in $ans. Please specify the correct path where Xm is installed in your system. @@ -4945,11 +4916,11 @@ fi ########################################################################## -if test "X$g4vis_oivhome" != "X" ; then -oiv_dirs=$g4vis_oivhome -fi +#if test "X$g4vis_oivhome" != "X" ; then +#oiv_dirs=$g4vis_oivhome +#fi -if test "X$oiv_dirs" != "X" ; then +if test "X$g4vis_oivhome" != "X" ; then g4message=`cat << EOM @@ -5159,11 +5130,11 @@ fi ########################################################################## -if test "X$g4vis_oivhome" != "X" ; then -oiv_dirs=$g4vis_oivhome -fi +#if test "X$g4vis_oivhome" != "X" ; then +#oiv_dirs=$g4vis_oivhome +#fi -if test "X$oiv_dirs" != "X" ; then +if test "X$g4vis_oivhome" != "X" ; then g4message=`cat << EOM @@ -5837,7 +5808,6 @@ State='$State' c='$c' cf_by='$cf_by' cf_time='$cf_time' -clhep_dirs='$clhep_dirs' contains='$contains' d_portable='$d_portable' eunicefix='$eunicefix' diff --git a/ReleaseNotes/Patch4.8.1-1.txt b/ReleaseNotes/Patch4.8.1-1.txt new file mode 100644 index 0000000000..cb16c43a56 --- /dev/null +++ b/ReleaseNotes/Patch4.8.1-1.txt @@ -0,0 +1,85 @@ + + Geant4 8.1 - patch-01 Release Notes + ----------------------------------- + + 27 July 2006 + +List of fixes included in this public patch since the public release 8.1: + + o Geometry: + -------- + + management + o Fixed problem in G4Region::ScanVolumeTree() for volume scanning + related to nested parameterisations. + + o Particles: + --------- + + Code cleanup for G4PrimaryVertex class. + + o Electromagnetic processes: + ------------------------- + + muons: + o G4EnergyLossForExtrapolator: fixed misprint in name for method + EnergyDispersion(). + + utils: + o Do not clear loss table map in G4LossTableManager to avoid crash + for activation/desactivation of regime with ion gun. + Propagating 'RandomStep' flag to processes. + + o Hadronic Processes: + ------------------ + + models/chiral_inv_phase_space/body: + o Bug fix in QGSC for redefenition of Chipolino. + o Fixed light Cone Boost bug, causing the error message from vectors. + + models/coherent_elastic: + o Fixed problem in rotation of final state which needs to be done in + PostStep of the process and not at model level. + o Removed 1 keV limit from G4UHadronElasticProcess. + + models/radioactive_decay + o G4NuclearDecayChannel::BetaDecayIt(): make additional check for + negative sqrt() argument in 'daughtermomentum[1]'. + + o Physics Lists: + ------------- + + Fixed initialisation problem for QBBC_HP + + Corrected flag for HP regime in G4HadronElasticPhysics() to be 'true' + for LHEP_HP and QGSP_HP. + + Added G4NeutronHPElasticData in HP physics lists for hadron elastic + physics. + + Added cout of list of processes and models for QBBC. + + + o Examples: + -------- + + Updated reference outputs. + + advanced/composite_calorimeter + o Updated hadronic physics list to be consistent with validation runs. + + advanced/lAr_calorimeter + o Updated hadronic physics list to be consistent with validation runs. + o Fixed few problems of use of non-initialised variables. + o Fixed compilation problems on gcc-4.X. + + advanced/hadrontherapy + o Corrected hadronic physics list for Precompund model. + + advanced/radioprotection + o Added missing inclusion of G4UItcsh.hh inside main(). + + extended/eventgenerator/HepMC + o Updated physics lists to conform with non-static particles. + + extended/parallel/ParN02 + + extended/parallel/ParN04 + o Updated physics lists to conform with non-static particles. + + ---------------------------------------------------------------------------- + + Technical Notes + --------------- + + o This patch should be applied on top of release 8.1. + o Technical notes distributed for release 8.1 are also applicable and + valid for this patch. + +The code and rebuilt binary libraries for release 8.1 are available through +our "Source Code" Web page: http://cern.ch/geant4 + +Please refer to the Geant4 User Documentation: + http://cern.ch/geant4/G4UsersDocuments/Overview/html +for further information about using Geant4. diff --git a/ReleaseNotes/Patch4.8.1-2.txt b/ReleaseNotes/Patch4.8.1-2.txt new file mode 100644 index 0000000000..9248b896b0 --- /dev/null +++ b/ReleaseNotes/Patch4.8.1-2.txt @@ -0,0 +1,112 @@ + + Geant4 8.1 - patch-02 Release Notes + ----------------------------------- + + 10 November 2006 + +List of fixes included in this public patch since the public release 8.1.p01: + + o Geometry: + -------- + + management + o Added empty virtual method CheckOverlaps() to G4VPhysicalVolume to + allow for proper overloading from subclasses. Implementation returns + always 'false', which is the case for replicas. + + o Global: + ------ + + Corrected inclusion of CLHEP headers in wrapper files + G4SystemOfUnits.hh and G4PhysicalConstants.hh. + + o Electromagnetic processes: + ------------------------- + + standard: + o Fixed energy non-conservation in G4PAIModel for positrons. Fix also + concerning 'Tmax' for electrons and positrons: 'Tmax' is defined + now for each particle independently. + o Fixed problem of positron zero incident energy in G4eeToTwoGammaModel. + o Added extra protection inside G4BetheBlochModel. + o Fixed problems and add comments in the classes prototype Coulomb + elastic scattering: G4CoulombScattering, G4CoulombScatteringModel, + G4eCoulombScatteringModel. Set default limit on scattering angle to + zero. + + utils: + o G4VEnergyLossProcess: made LambdaPhysicsVector() method protected. + o G4ionEffectiveCharge: added protection for NULL pointer to material. + + o Hadronic Processes: + ------------------ + + models/coherent_elastic: + o Introduced NaN check inside G4HadronElastic, G4ChargeExchange, and + G4UHadronElasticProcess. + o Removed HP data from G4UHadronElasticProcess (it is set in physics + lists); added low energy threshold of 20 MeV in G4HadronElastic for + QElastic. For any particle with kinetic energy below 10 KeV, the + primary particle is returned unchanged and no scattering is sampled. + This prevents situations of low-energy neutrons scattering forever, + and reduces precision in computing scattering for low-energy hadrons. + + models/utils: + o Reduced warning output from G4Fragment on negative excitation energy; + a maximum of 10 warnings is printed now. + o G4Fancy3DNucleus:ChoosePositions(): correctly use std::vector. + Correction addressing problem report #887 on WIN32/VC8. + o Removed meaningless 'const' qualifier from return type of method + G4Fancy3DNucleusHelper(). + + o Particles: + --------- + + Fixed bug in G4ParticleDefinition constructor causing not filling quark + contents when G4VERBOSE is not set. + + Fixed bug in k2(1770) decay. Addresses problem report #894. + + o Persistency: + ----------- + + Get Rid of useless forward declarations in G4MCTEvent and + G4MCTGenParticle header files. Clearing compilation warnings on + icc-9.X compilers. + + o Track: + ----- + + Made G4StepPoint::operator=() inline for optimisation. + + o Physics Lists: + ------------- + + G4HadronElasticPhysics: added explicit inclusions of data headers + in the header file. + + o Configuration: + ------------- + + Linux-icc: updated setup to support Intel icc compiler 9.X series. + + liblist.c: added .dylib search for list of libraries. + Addressing problem report #885. + + architecture.gmk: added variables for commands: echo, cat, cut, sed; + to be eventually overloaded in system dependent configurations. + Overloaded variables for WIN32-VC to force usage of the original + CygWin built-in commands. Use standard 'echo' command for Darwin-g++. + Replaced system commands with variables defined at architecture level + in source/GNUmakefile. + + o Examples: + -------- + + Updated reference outputs. + + advanced/underground_physics + o Fixed bug: removed uninitialized 'UserLimitsForXenon'. + + extended/analysis/AnaEx01 + o Corrected text in README for AIDA setup. + + ---------------------------------------------------------------------------- + + Technical Notes + --------------- + + o This patch should be applied on top of release 8.1.p01 + o Technical notes distributed for release 8.1 are also applicable and + valid for this patch. + +The code and rebuilt binary libraries for release 8.1.p02 are available +through our "Source Code" Web page: + http://cern.ch/geant4/support/download.shtml + +Please refer to the Geant4 User Documentation: + http://cern.ch/geant4/support/userdocuments.shtml +for further information about using Geant4. diff --git a/ReleaseNotes/ReleaseNotes4.8.2.html b/ReleaseNotes/ReleaseNotes4.8.2.html new file mode 100644 index 0000000000..ef1a5caf62 --- /dev/null +++ b/ReleaseNotes/ReleaseNotes4.8.2.html @@ -0,0 +1,1115 @@ + + +Geant4 8.2 Release Notes + + + +

+
+

+ +

+ +Geant4 8.2 Release Notes + + + + +
+ +December 15th, 2006 + +
+ +

+

+

+The code and binary libraries for the supported systems are available +through our Source +Code Web page. +

+

+Please refer to the +Geant4 +User Documentation for further information about using Geant4. +

+ +

Contents

+
    +
  1. Supported and Tested Platforms
    2. +
  2. CLHEP and AIDA
    3. +
  3. Items for migration of the user code
    4. +
  4. Known Run-Time Problems
    5. +
  5. Compilation Warnings
    6. +
  6. Known Run-Time Warnings
    7. +
  7. Geant4 Software License
    8. +
  8. Detailed list of changes and fixes
    9. +
+ +

+ +
+ + + +

1. Supported and Tested Platforms

+ +Official platforms: + + +More verified configurations: + + +Platforms configured but not tested and not supported: + + +

+ +
+ + + +

2. CLHEP and AIDA

+ +Geant4 8.2 requires the installation of +CLHEP.
+Tests have been performed with CLHEP-2.0.3.1
+The software has been verified also with CLHEP-1.9.3.1.
+

+Geant4 8.2 examples with histogramming cowork with analysis tools compliant +to AIDA 3.2.1 interfaces.
+AIDA headers can be downloaded from: +http://aida.freehep.org + + +

+ +
+ + + +

3. Items for migration of the user code

+ +Listed here is some relevant information on developments included in this +release, some of which may require minor migrations for advanced uses of +features in Geant4 in order to upgrade from release 8.1 to release 8.2. +Note that a full re-installation of libraries (or a full recompilation) and +a recompilation of user applications is anyhow required. + +

+Standard Electromagnetic physics +

+Some improvements were introduced to multiple scattering, which provide +improved results for large angle scattering; better particle transport near +geometry boundaries and less cut dependence for sampling calorimeters +(see details in Physics Reference Manual).
+A new class G4hMultipleScattering has been created to provide faster +simulation of hadron transport. This class uses the same multiple scattering +model configured to reduce step limitation. It is used for hadrons and ions +in most physics lists.
+A new module polarization is introduced for simulation of circular polarized +beams of e+- and gamma.
+The change in response of calorimeters, due to the revision of the +multiple scattering process (in its default configuration) is expected +to be less than 1%. Larger differences are seen in the revised +configuration, which does not apply most step limitations for electons and +that is used in the QGSP_EMV physics list. + +

+Hadronic physics +

+Reviewed coherent elastic scattering processes: data tables are now computed +on-flight and the G4ELASTIC data set is no longer necessary.
+New data sets are required for this release, see details below. + +

+Physics Lists +

+The physics list module has been moved inside the source tree; as +such it is now built as part of the kernel libraries by default. The number of +libraries has been reduced to two; it is now possible to use them together +with shared libraries (or DLL on Windows) and global libraries. + +

+ +
+ + + +

4. Known Run-Time Problems and Limitations

+ +For a complete list of outstanding run-time problems and to submit any +problem you may find running this version of Geant4, please refer to the +Geant4 Problem Reporting +System. + + +

+ +
+ + + +

5. Compilation Warnings

+ +There may be compilation warnings on some platforms. We do not believe +that any will lead to incorrect run-time behaviour. + + +

+ +
+ + + +

6. Known Run-Time Warnings

+ +The following message can be written to error output while tracking. +We believe it does not give rise to incorrect behaviour. +
+    G4PropagateInField: Warning: Particle is looping 
+    -  tracking in field will be stopped. 
+       It has performed 1000 steps in Field while a maximum of 1000
+       are allowed. 
+
+ + +

+ +
+ + + +

7. Geant4 Software License

+ +A Software License applies to the Geant4 code. +The details and the list of copyright holders is available at +http://cern.ch/geant4/license +and also in a text file LICENSE distributed with the source code. + +

+ +
+ + + +

8. Detailed list of changes and fixes

+ +These are the main new features/fixes included in this release since the +last patched public release (for the detailed list of fixes/additions, +please refer to the related History files provided in most packages): + +

+ + +

Configuration

 + + + +

Digitazation & Hits

 + + + +

Electromagnetic Processes (High-energy and Standard)

 + + + +

Electromagnetic Processes (Low-energy)

 + + + +

Event

 + + + +

General Processes: Parameterisation, Scoring, Transportation

 + + + +

Geometry

 + + + +

Global

 + + + +

Graphical Representations

 + + + +

Hadronic Processes

 + + + +

Intercoms

 + + + +

Materials

 + + + +

Particles

 + + + +

Persistency

 + + + +

Run

 + + + +

Track and Tracking

 + + + +

Visualization

 + + + +

Environments

 + + + +

Physics lists

 + + + +

Data sets

 + + + +

Examples

 + + +
+ + + diff --git a/config/History b/config/History index 519ee53f7b..4e7c95b111 100644 --- a/config/History +++ b/config/History @@ -1,4 +1,4 @@ -$Id: History,v 1.278 2006/06/13 15:37:35 gcosmo Exp $ +$Id: History,v 1.288 2006/11/30 15:47:16 gcosmo Exp $ ------------------------------------------------------------------- ========================================================= @@ -16,6 +16,37 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +3rd November 2006 Gunter Folger (config-V08-01-07) +- architecture.gmk: added G4LIB_BUILD_LISTS with default value 1 to build physics lists. +- binmake.gmk: added physics lists include directories to INCFLAGS. + +15th October 2006 Makoto Asai (config-V08-01-06) +- binmake.gmk: added 'processes/scoring' module. + +10th October 2006 Gabriele Cosmo (config-V08-01-05) +- Darwin-g++.gmk: use standard -echo- command. + Removed ECHO overloaded variable. + +5th October 2006 Gabriele Cosmo (config-V08-01-04) +- liblist.c: added .dylib search for list of libraries. + Addressing problem report #885. + +3rd October 2006 Gabriele Cosmo (config-V08-01-03) +- architecture.gmk: added variables for commands: echo, cat, cut, sed; + to be eventually overloaded in system dependent configurations. +- WIN32-VC.gmk: overload commands [echo, grep, cat, cut, sed], to force + usage of the original CygWin built-in commands. + +21st September 2006 Vladimir Ivantchenko (config-V08-01-02) +- binmake.gmk: added electromagnetic/polarisation module. + +18th August 2006 Gabriele Cosmo (config-V08-01-01) +- Linux-icc: corrected G4RUNPATHOPTION flag to allow linking of applications + with shared libraries. + +18th August 2006 Gabriele Cosmo (config-V08-01-00) +- Linux-icc: updated setup to support icc-9.X series. + 13th June 2006 Gabriele Cosmo (config-V08-00-02) - Removed defaults for X11, XM, XAW flags in architecture.gmk and added explicit settings in sys/*.gmk setups protected by ifndef statements for diff --git a/config/architecture.gmk b/config/architecture.gmk index ccd8780345..fe8fb9675f 100644 --- a/config/architecture.gmk +++ b/config/architecture.gmk @@ -1,4 +1,4 @@ -# $Id: architecture.gmk,v 1.105 2006/06/13 15:36:30 gcosmo Exp $ +# $Id: architecture.gmk,v 1.107 2006/10/31 11:35:43 gunter Exp $ # ------------------------------------------------------------------------ # GEANT 4 - Architecture configuration script for GNU Make # @@ -112,6 +112,12 @@ ifneq ($(G4LIB_BUILD_ZLIB),) G4LIB_USE_ZLIB = 1 endif +# Allow to disable building of physics_lists module. Default is to build these +# +ifneq ($(G4LIB_BUILD_LISTS),NO) + G4LIB_BUILD_LISTS = 1 +endif + # If not specified, the default path for G4 binaries G4BIN is # set to $G4WORKDIR/bin/$G4SYSTEM ... # @@ -267,14 +273,26 @@ G4TREP := $(G4TMP)/$(G4TEMPLATE_REPOSITORY) # AR := ar r -# Default echo used with makedepend. Changed for SUN-CC, Linux-g++. +# Default echo used with makedepend. Changed for SUN-CC, Linux-g++, WIN32. # ECHO:= echo -# Default grep used with source/GNUmakfile. Changed for SUN-CC. +# Default grep used with source/GNUmakefile. Changed for SUN-CC. # GREP := grep +# Default cut used with source/GNUmakefile. Changed for WIN32. +# +CUT := cut + +# Default cat used with source/GNUmakefile. Changed for WIN32. +# +CAT := cat + +# Default sed used with source/GNUmakefile. Changed for WIN32. +# +SED := sed + # Include architecture dependent setups... # include $(G4INSTALL)/config/sys/$(G4SYSTEM).gmk diff --git a/config/binmake.gmk b/config/binmake.gmk index a42592fa0a..a42e2d1a58 100644 --- a/config/binmake.gmk +++ b/config/binmake.gmk @@ -1,4 +1,4 @@ -# $Id: binmake.gmk,v 1.112 2006/04/24 10:54:18 gcosmo Exp $ +# $Id: binmake.gmk,v 1.116 2006/11/08 16:52:19 gunter Exp $ # ---------------------------------------------------------- # Script defining rules and paths for making binaries. # First implementation: Gabriele Cosmo, 25/06/1998. @@ -60,8 +60,11 @@ ifndef INCFLAGS -I$(G4BASE)/particles/hadrons/ions/include \ -I$(G4BASE)/particles/hadrons/mesons/include \ -I$(G4BASE)/particles/shortlived/include \ + -I$(G4BASE)/physics_lists/lists/include \ + -I$(G4BASE)/physics_lists/builders/include \ -I$(G4BASE)/processes/management/include \ -I$(G4BASE)/processes/cuts/include \ + -I$(G4BASE)/processes/scoring/include \ -I$(G4BASE)/processes/decay/include \ -I$(G4BASE)/processes/optical/include \ -I$(G4BASE)/processes/transportation/include \ @@ -72,6 +75,7 @@ ifndef INCFLAGS -I$(G4BASE)/processes/electromagnetic/xrays/include \ -I$(G4BASE)/processes/electromagnetic/lowenergy/include \ -I$(G4BASE)/processes/electromagnetic/highenergy/include \ + -I$(G4BASE)/processes/electromagnetic/polarisation/include \ -I$(G4BASE)/processes/hadronic/cross_sections/include \ -I$(G4BASE)/processes/hadronic/management/include \ -I$(G4BASE)/processes/hadronic/models/abrasion/include \ @@ -202,8 +206,13 @@ ifdef GLOBALLIBS LDLIBS2 += -lG3toG4 endif - LDLIBS2 += -lG4readout \ - -lG4run \ + LDLIBS2 += -lG4readout + + ifeq ($(G4LIB_BUILD_LISTS),1) + LDLIBS2 += -lG4physicslists + endif + + LDLIBS2 += -lG4run \ -lG4event \ -lG4tracking \ -lG4parmodels \ diff --git a/config/liblist.c b/config/liblist.c index 6c1c88b07d..0a2b90402f 100644 --- a/config/liblist.c +++ b/config/liblist.c @@ -1,4 +1,4 @@ -/* $Id: liblist.c,v 1.17 2002/11/22 11:53:10 gcosmo Exp $ */ +/* $Id: liblist.c,v 1.18 2006/10/05 14:22:06 gcosmo Exp $ */ /* Given a "libname.map" file on standard input and a list or directory @@ -549,6 +549,14 @@ int main (int argc, char** argv) { { printf("-l%s ",libmapPtr->lib); } + else /* case MacOS .dylib */ + { + sprintf(libname, "%s/lib%s.dylib", libpath, libmapPtr->lib); + if (!access(libname,R_OK)) + { + printf("-l%s ",libmapPtr->lib); + } + } } else { diff --git a/config/scripts/env.csh.SH b/config/scripts/env.csh.SH index b771199f24..33af2af74c 100755 --- a/config/scripts/env.csh.SH +++ b/config/scripts/env.csh.SH @@ -22,6 +22,61 @@ esac : Protect any dollar signs and backticks that you do not want interpreted : by putting a backslash in front. You may delete these comments. $spitshell >env.csh <env.sh <install.sh < $(name).dumpbin;\ - echo "Building $(name).def file ...";\ + $(ECHO) "Building $(name).def file ...";\ $(RM) $(name).def;\ $(G4LIB)/$(G4SYSTEM)/win32def.exe $(name) < $(name).dumpbin > $(name).def;\ $(RM) $(name).dumpbin;\ - echo "Building lib$(name).exp and lib$(name).lib file ...";\ + $(ECHO) "Building lib$(name).exp and lib$(name).lib file ...";\ $(RM) $(G4LIBDIR)/lib$(name).exp;\ $(RM) $(G4LIBDIR)/lib$(name).lib;\ lib.exe /nologo /machine:ix86 /def:$(name).def \ /out:$(G4LIBDIR)/lib$(name).lib;\ $(RM) $(G4LIBDIR)/$(name).dll;\ - echo "Building $(name).dll file ...";\ + $(ECHO) "Building $(name).dll file ...";\ link.exe /nologo /dll /out:$(G4LIBDIR)/$(name).dll \ $(G4LIBDIR)/lib$(name).exp $(G4LIBDIR)/lib$(name).a \ /libpath:$(G4LIBDIR) $(GLOBLIBS) \ @@ -80,20 +85,20 @@ ifeq ($(G4SYSTEM),WIN32-VC) define build-global-shared-lib @libdir=`(cd $(@D);/bin/pwd)`;\ cd $(G4TMP)/$(G4SYSTEM);\ - echo "Building $(name).dumpbin file ...";\ + $(ECHO) "Building $(name).dumpbin file ...";\ $(RM) $(name).dumpbin;\ dumpbin /symbols $(G4LIBDIR)/lib$(name).a > $(name).dumpbin;\ - echo "Building $(name).def file ...";\ + $(ECHO) "Building $(name).def file ...";\ $(RM) $(name).def;\ $(G4LIB)/$(G4SYSTEM)/win32def.exe $(name) < $(name).dumpbin > $(name).def;\ $(RM) $(name).dumpbin;\ - echo "Building lib$(name).exp and lib$(name).lib ...";\ + $(ECHO) "Building lib$(name).exp and lib$(name).lib ...";\ $(RM) $(G4LIBDIR)/lib$(name).exp;\ $(RM) $(G4LIBDIR)/lib$(name).lib;\ lib.exe /nologo /machine:ix86 /def:$(name).def \ /out:$(G4LIBDIR)/lib$(name).lib;\ $(RM) $(G4LIBDIR)/$(name).dll;\ - echo "Building $(name).dll ...";\ + $(ECHO) "Building $(name).dll ...";\ link.exe /nologo /dll /out:$(G4LIBDIR)/$(name).dll \ $(G4LIBDIR)/lib$(name).exp $(G4LIBDIR)/lib$(name).a \ /libpath:$(G4LIBDIR) $(GLOBLIBS) \ diff --git a/config/sys/WIN32-g++.gmk b/config/sys/WIN32-g++.gmk index 959e5a5f62..895ba1d439 100644 --- a/config/sys/WIN32-g++.gmk +++ b/config/sys/WIN32-g++.gmk @@ -1,7 +1,7 @@ # -# ------ GNU/WIN32 CYGNUS ------ !!! not supported !!! +# ------ GNU/WIN32 CYGWIN ------ !!! not supported !!! # Cygnus CygWin - gcc-3.2 and higher -# Windows 2000/XP +# Windows XP # # Stefano Agostinelli (agos001@pn.itnet.it) - IST Group, Genova # @@ -25,12 +25,18 @@ ifeq ($(G4SYSTEM),WIN32-g++) FCFLAGS += -fPIC CCFLAGS += -fPIC endif + G4RUNPATHOPTION := -Wl,-rpath + SHEXT := so + ECHO := echo -e + GREP := /usr/bin/grep + SED := /usr/bin/sed + CAT := /usr/bin/cat + CUT := /usr/bin/cut + FC := g77 FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore FCLIBS := -lg2c -lnsl - ECHO := echo -e - SHEXT := so ifndef X11FLAGS X11FLAGS := -I/usr/include/X11/extensions -I/usr/include/X11 endif diff --git a/environments/History b/environments/History index b649e42ac6..a5c40b51e8 100644 --- a/environments/History +++ b/environments/History @@ -1,4 +1,4 @@ -$Id: History,v 1.24 2006/06/29 06:15:06 kmura Exp $ +$Id: History,v 1.27 2006/12/01 02:42:50 kmura Exp $ ------------------------------------------------------------------- ========================================================= @@ -18,6 +18,22 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +envs-V08-01-02 01 December 2006 Koichi Murakami + - pyG4Material.cc : fix namespace problem + - pyG4VisManager.cc : replace SetVerboisity with SetVerboseLevel for G4.8.2 + - add messenger for ExN03geom + +envs-V08-01-01 21 November 2006 Koichi Murakami + - implement G4ExceptionHandler as translation to Python exceptions + - remove obsolete method; G4VPhysicalVolume::GetObjectRotation() + +envs-V08-01-00 20 November 2006 Koichi Murakami + [g4py] + - add MacOSX support + - more exposed staffs + - add physics list module + - add GUI examples using wxPython + envs-V08-00-09 29 June 2006 Koichi Murakami [g4py] - fix rpath of boost_python (config/sys/linux.gmk, linuxx8664gcc.gmk) diff --git a/environments/MOMO/MomoHome/include/MomoEventAction.hh b/environments/MOMO/MomoHome/include/MomoEventAction.hh index 8b63287a33..a274c54ddb 100644 --- a/environments/MOMO/MomoHome/include/MomoEventAction.hh +++ b/environments/MOMO/MomoHome/include/MomoEventAction.hh @@ -25,7 +25,7 @@ // // Taken from // $Id: MomoEventAction.hh,v 1.2 2006/06/29 15:27:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef MomoEventAction_h diff --git a/environments/MOMO/MomoHome/include/MomoRunAction.hh b/environments/MOMO/MomoHome/include/MomoRunAction.hh index cdff9c665a..b177b165a7 100644 --- a/environments/MOMO/MomoHome/include/MomoRunAction.hh +++ b/environments/MOMO/MomoHome/include/MomoRunAction.hh @@ -25,7 +25,7 @@ // // Taken after // $Id: MomoRunAction.hh,v 1.2 2006/06/29 15:27:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef MomoRunAction_h diff --git a/environments/MOMO/MomoHome/src/MomoEventAction.cc b/environments/MOMO/MomoHome/src/MomoEventAction.cc index eafe41b473..a349064993 100644 --- a/environments/MOMO/MomoHome/src/MomoEventAction.cc +++ b/environments/MOMO/MomoHome/src/MomoEventAction.cc @@ -25,7 +25,7 @@ // // Taken from // $Id: MomoEventAction.cc,v 1.2 2006/06/29 15:27:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // diff --git a/environments/MOMO/MomoHome/src/MomoRunAction.cc b/environments/MOMO/MomoHome/src/MomoRunAction.cc index 04dd182fa9..2e8d6059fc 100644 --- a/environments/MOMO/MomoHome/src/MomoRunAction.cc +++ b/environments/MOMO/MomoHome/src/MomoRunAction.cc @@ -25,7 +25,7 @@ // // Taken from // $Id: MomoRunAction.cc,v 1.2 2006/06/29 15:28:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // diff --git a/environments/g4py/00README b/environments/g4py/00README index bf5401accd..d65466a50a 100644 --- a/environments/g4py/00README +++ b/environments/g4py/00README @@ -1,4 +1,4 @@ -$Id: 00README,v 1.4 2006/06/14 01:28:37 kmura Exp $ +$Id: 00README,v 1.6 2006/08/10 08:48:26 kmura Exp $ ========================================================================== Geant4Py @@ -33,6 +33,16 @@ BOOST-Python (Optional) ROOT +Before Starting: +---------------- +In dafault situation, Geant4 creates and uses "granular static libraries". +But, the Python interface requires "global shared library". +If you donot build your Geant4 libraries in global shared mode, +you have to recreate your instance additionally. + +In "tools" directory, you can find some ways to handle both "glanular static" +and "global shared" environments. Please take a look. + How to Install: --------------- @@ -85,7 +95,7 @@ Enable/disable options: prefix with either --enable- or --disable- Supported Architectures: linux for Linux gcc 3.x and 4.x linuxx8664gcc for AMD Opteron and Intel EM64T Linux gcc 3.x and 4.x - macosx for MacOS X with gcc (test) + macosx for MacOS X with gcc You can specify all parameters adopting your environment. diff --git a/environments/g4py/00README_MACOSX b/environments/g4py/00README_MACOSX new file mode 100644 index 0000000000..161ada1799 --- /dev/null +++ b/environments/g4py/00README_MACOSX @@ -0,0 +1,97 @@ + +<<>> + H. Yoshida and K. Murakami + 16 November 2006 for Geant4-8.2 release + +Geant4Py package can be installed in Linux or Mac OS X systems. Documentation +on the installation and the latest version is available at +www-geant4.kek.jp/projects/Geant4Py. + +This text is a supplementary document dedicated to Mac OS X. The following +installation procedure was tested on a MacBook; Mac OS X 10.4.8 (8L2127), and +Darwin-8.8.1. + + +0) General remarks + + You have to install ALL packages from the system DVD, including supplementary + packages and Xcode packages. Then, OpenGL must work. + + a. Compilation of Geant4 libraries; + *.dylib must be created and all header files must be assembled. So + %make global; make includes + b. Linker; + If ld (linker) complains "Undefined symbols", try + %setenv MACOSX_DEPLOYMENT_TARGET 10.4 + c. Path of the Dynamic Libraries ; + If you have used Configure script to make the Geant4 libraries, the paths + to the dylibs are set automatically. The environment variables can be + checked in $G4INSTALL/.config/bin/Darwin-g++/env.csh. + d. X window; + For visialization with OpenGL, you have to start Xserver and + %setenv DISPLAY localhost:0.0 +1) Installation of Python 2.4.3 + +The latest Mac products (as of October 2006) include Python 2.3 by +default. This is not bad for the basic installation of Geant4Py, but some +examples here require Python 2.4 which provides advanced OS related +functionalities. So, we recommend you to install Python 2.4.3. (Python 2.5 is +already published but we don't tested it with respect to boost_python +wrappers.) + +Visit the Python language Web site; http://www.python.org/download/mac/ and +follow the instructions. Universal-MacPython-2.4.3-*.dmg is available +there. Or the site http://pythonmac.org/packages/ provides also *.dmg package, +too. + +2) Installation of Boost-Python + + Visit the site http://boost.org/ and download boost-1_33_1, the latest +version. Then, run the configure script and then make libboost_python.dylib. +Please make install it to the default prefix directory, i.e., /usr/local, for +simplcity. + +3) Compilation of Geant4Py + +If you have installed Python-2.4 and Boost-1_33_1 as above, you can configure +Geant4Py as below; + +./configure macosx --with-python-incdir=/usr/local/include/python2.4\ + --with-python-libdir=/usr/local/lib/python2.4\ + --with-boost-incdir=/usr/local/include/boost-1_33_1\ + --with-boost-libdir=/usr/local/lib\ + --with-boost-python-lib=boost_python-1_33_1 + +And then, %make; make install. The libraries will be installed in +$G4INSTALL/environments/g4py/lib whose path must be added to PYTHONPATH. + +If you want to enjoy examples/education, wxPython package is necessary. + +4) Installation of wxPython + +Download the latest version of wxPython from http://www.wxpython.org/ and +create the library. The next instructions are taken from the above Web page. + +%cd $WXDIR +%mkdir bld +%cd bld +%../configure --prefix=/opt/wx/2.7 \ + --with-mac\ + --with-opengl \ + --enable-debug \ + --enable-geometry \ + --enable-graphics_ctx \ + --enable-sound --with-sdl \ + --enable-mediactrl \ + --enable-display \ + --disable-debugreport + +And then make; make install. +You have to setenv/export PYTHONPATH, adding /opt/wx/2.7 + +5) Run + + g4py/examples/education/lesson1/Lesson1Wx.py and lesson2/Lesson2Wx.py are + exaples, using wxPython GUI toolkits. Run them, + %python Lesson1Wx.py + diff --git a/environments/g4py/GNUmakefile b/environments/g4py/GNUmakefile index 483dc4d7f1..bcaae9f000 100644 --- a/environments/g4py/GNUmakefile +++ b/environments/g4py/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.1 2006/02/27 09:29:42 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py # =========================================================== diff --git a/environments/g4py/History b/environments/g4py/History index ff2ec10c39..62974a73b5 100644 --- a/environments/g4py/History +++ b/environments/g4py/History @@ -1,4 +1,4 @@ -$Id: History,v 1.14 2006/06/29 02:04:49 kmura Exp $ +$Id: History,v 1.23 2006/12/01 02:38:18 kmura Exp $ ------------------------------------------------------------------- ========================================================= @@ -14,6 +14,42 @@ Geant4Py is a Geant4-Python bridge. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +01 Dec 2006 K.Murakami (1.2.0) + - pyG4Material.cc : fix namespace problem + - pyG4VisManager.cc : replace SetVerboisity with SetVerboseLevel for G4.8.2 + - add messenger for ExN03geom + +21 November 2006 K.Murakami (1.1.0) + - implement G4ExceptionHandler as translation to Python exceptions + - remove obsolete method; G4VPhysicalVolume::GetObjectRotation() + +20 November 2006 K.Murakami + - modification for G4.8.2 + - add G4Exception and G4ExceptionSeverity + - modify configure for supporting physics lists + - add physics list modules + +15 November 2006 H. Yoshida + - add 00README_MACOSX + +23 August 2006 K.Murakami + - add G4Version + - G4LossTableManager, modify for version evolution + +06 August 2006 K.Murakami (1.0.2) + - modify config tools for building on MacOSX (some side-effects) + - add tools dir for support tools for building user environment + - add intercoms dir (move pyG4UImanager.cc from interfacr to intercoms) + - new exposed staffs; + G4UImanager, G4UIcommandTree, G4UIcommand, G4UIparameter + - __init__.py is updeted + (gUImanager as global, and some modifications) + +12 July 2006 K.Murakami (1.0.1) + - add exposures of G4LossTableManager, G4ProductionCutsTable + - add site-modules/utls/MCScore + - add site-modules/physics_lists/EMLowEpl + 29 June 2006 K.Murakami - "site-modules/primaries/MedicalBeam/MedicalMeam.cc" fix a bug in calculation of cos from a sin value diff --git a/environments/g4py/config/build.gmk b/environments/g4py/config/build.gmk index 3d34a2ac6e..05604e674d 100644 --- a/environments/g4py/config/build.gmk +++ b/environments/g4py/config/build.gmk @@ -1,4 +1,4 @@ -# $Id: build.gmk,v 1.2 2006/04/25 05:53:05 kmura Exp $ +# $Id: build.gmk,v 1.3 2006/08/08 05:11:44 kmura Exp $ # =========================================================== # Script for building a module # =========================================================== @@ -8,9 +8,21 @@ objects := $(patsubst %.cc, %.o, $(sources)) .PHONY: clean debug -module_name := $(MODULE).$(soext) +# building module... +ifdef MODULE + module_name := $(MODULE).$(modext) + $(module_name) : $(objects) $(build-module) +endif + +# building shared library... +ifdef LIBRARY + module_name := $(LIBRARY).$(soext) + +$(module_name) : $(objects) + $(build-library) +endif module : $(module_name) diff --git a/environments/g4py/config/g4compile.gmk b/environments/g4py/config/g4compile.gmk index eb573cb593..6ec4ef2de3 100644 --- a/environments/g4py/config/g4compile.gmk +++ b/environments/g4py/config/g4compile.gmk @@ -1,4 +1,4 @@ -# $Id: g4compile.gmk,v 1.1 2006/04/25 05:53:05 kmura Exp $ +# $Id: g4compile.gmk,v 1.2 2006/08/08 05:11:44 kmura Exp $ # =========================================================== # Script for building a Boost-Python module # =========================================================== @@ -37,7 +37,7 @@ objects := $(patsubst %.cc, %.o, $(sources)) .PHONY: clean debug -all : $(objects) +compile : $(objects) clean : @-rm -f $(objects) diff --git a/environments/g4py/config/g4py.gmk b/environments/g4py/config/g4py.gmk index acefe64e12..3dd0ebab3f 100644 --- a/environments/g4py/config/g4py.gmk +++ b/environments/g4py/config/g4py.gmk @@ -1,4 +1,4 @@ -# $Id: g4py.gmk,v 1.2 2006/04/25 05:53:05 kmura Exp $ +# $Id: g4py.gmk,v 1.3 2006/11/20 08:01:30 kmura Exp $ # =========================================================== # Makefile for building Python module with Boost.Python # @@ -23,6 +23,10 @@ G4PY_LOPT := -L$(Q_G4_LIBDIR) \ -lG4interfaces \ -lG4global +ifeq ($(Q_ENABLE_PHYSICSLIST), 1) +G4PY_LOPT += -lG4physicslists +endif + include $(G4PY_INSTALL)/config/g4vis.gmk G4PY_LOPT += $(G4PY_VISLIBS) diff --git a/environments/g4py/config/sys/linux.gmk b/environments/g4py/config/sys/linux.gmk index 3e2147b7a4..6e916c4d66 100644 --- a/environments/g4py/config/sys/linux.gmk +++ b/environments/g4py/config/sys/linux.gmk @@ -1,5 +1,5 @@ -# $Id: linux.gmk,v 1.3 2006/06/27 06:40:13 kmura Exp $ -# $Name: geant4-08-01 $ +# $Id: linux.gmk,v 1.5 2006/08/10 08:49:08 kmura Exp $ +# $Name: geant4-08-02 $ # =========================================================== # System specific terms # =========================================================== @@ -9,7 +9,8 @@ CXX := g++ -m32 ifdef COMPILE_WITH_BOOST CXXFLAGS := -fPIC -ftemplate-depth-255 -finline-functions -Wno-inline - CXXFLAGS += -DBOOST_PYTHON_DYNAMIC_LIB + CXXFLAGS += -DBOOST_PYTHON_DYNAMIC_LIB + CXXFLAGS += -O2 ifndef DEBUG CXXFLAGS += -DNDEBUG endif @@ -17,19 +18,22 @@ else CXXFLAGS := -ansi -pedantic -Wno-non-virtual-dtor -Wno-long-long CXXFLAFS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -pipe CXXFLAGS += -fPIC + CXXFLAGS += -O2 endif ifdef COMPILE_G4PY CXXFLAGS := -fPIC -ansi -pipe CXXFLAGS += -ftemplate-depth-255 -finline-functions CXXFLAGS += -DBOOST_PYTHON_DYNAMIC_LIB + CXXFLAGS += -O2 ifndef DEBUG CXXFLAGS += -DNDEBUG endif endif # extention of shared library -soext := so +soext := so +modext := so # implicit rules %.o: %.cc @@ -61,31 +65,30 @@ ifdef COMPILE_G4PY ifneq ($(Q_CLHEP_LIBDIR), $(Q_G4_LIBDIR)) rpath3 := :$(Q_CLHEP_LIBDIR) endif + rpath4 := $(Q_LIBDIR) endif -rpathflag := -Wl,-rpath,$(rpath0):$(rpath1):$(rpath2):$(rpath3) +rpathflag := -Wl,-rpath,$(rpath0):$(rpath1):$(rpath2):$(rpath3):$(rpath4) ifdef CPPVERBOSE define build-library - $(CXX) $(rpathflag) -Wl,-soname,$@ -shared -o $@ \ - $(foreach dir,$(SUBLIBS),$(dir)/*.o) + $(CXX) $(rpathflag) -Wl,-soname,$@ -shared -o $@ $(objects) endef else define build-library @echo Building a library $@ ... - @$(CXX) $(rpathflag) -Wl,-soname,$@ -shared -o $@ \ - $(foreach dir,$(SUBLIBS),$(dir)/*.o) + @$(CXX) $(rpathflag) -Wl,-soname,$@ -shared -o $@ $(objects) endef endif ifdef CPPVERBOSE define build-module - $(CXX) $(rpathflag) -Wl,-soname,$@ -shared -o $@ $(objects) $(LOPT) + $(CXX) $(rpathflag) -Wl,-soname,$@ -shared -o $@ $(objects) $(LOPT) endef else define build-module @echo Building a module $@ ... - @$(CXX) $(rpathflag) -Wl,-soname,$@ -shared -o $@ $(objects) $(LOPT) + @$(CXX) $(rpathflag) -Wl,-soname,$@ -shared -o $@ $(objects) $(LOPT) endef endif diff --git a/environments/g4py/config/sys/linuxx8664gcc.gmk b/environments/g4py/config/sys/linuxx8664gcc.gmk index cae9f02e9f..27831b1024 100644 --- a/environments/g4py/config/sys/linuxx8664gcc.gmk +++ b/environments/g4py/config/sys/linuxx8664gcc.gmk @@ -1,5 +1,5 @@ -# $Id: linuxx8664gcc.gmk,v 1.3 2006/06/27 06:40:14 kmura Exp $ -# $Name: geant4-08-01 $ +# $Id: linuxx8664gcc.gmk,v 1.5 2006/08/10 08:49:08 kmura Exp $ +# $Name: geant4-08-02 $ # =========================================================== # System specific terms # =========================================================== @@ -9,7 +9,8 @@ CXX := g++ -m64 ifdef COMPILE_WITH_BOOST CXXFLAGS := -fPIC -ftemplate-depth-255 -finline-functions -Wno-inline - CXXFLAGS += -DBOOST_PYTHON_DYNAMIC_LIB + CXXFLAGS += -DBOOST_PYTHON_DYNAMIC_LIB + CXXFLAGS += -O2 ifndef DEBUG CXXFLAGS += -DNDEBUG endif @@ -17,19 +18,22 @@ else CXXFLAGS := -ansi -pedantic -Wno-non-virtual-dtor -Wno-long-long CXXFLAFS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -pipe CXXFLAGS += -fPIC + CXXFLAGS += -O2 endif ifdef COMPILE_G4PY CXXFLAGS := -fPIC -ansi -pipe CXXFLAGS += -ftemplate-depth-255 -finline-functions CXXFLAGS += -DBOOST_PYTHON_DYNAMIC_LIB + CXXFLAGS += -O2 ifndef DEBUG CXXFLAGS += -DNDEBUG endif endif # extention of shared library -soext := so +soext := so +modext := so # implicit rules %.o: %.cc @@ -61,20 +65,19 @@ ifdef COMPILE_G4PY ifneq ($(Q_CLHEP_LIBDIR), $(Q_G4_LIBDIR)) rpath3 := :$(Q_CLHEP_LIBDIR) endif + rpath4 := $(Q_LIBDIR) endif -rpathflag := -Wl,-rpath,$(rpath0):$(rpath1):$(rpath2):$(rpath3) +rpathflag := -Wl,-rpath,$(rpath0):$(rpath1):$(rpath2):$(rpath3):$(rpath4) ifdef CPPVERBOSE define build-library - $(CXX) $(rpathflag) -Wl,-soname,$@ -shared -o $@ \ - $(foreach dir,$(SUBLIBS),$(dir)/*.o) + $(CXX) $(rpathflag) -Wl,-soname,$@ -shared -o $@ $(objects) endef else define build-library @echo Building a library $@ ... - @$(CXX) $(rpathflag) -Wl,-soname,$@ -shared -o $@ \ - $(foreach dir,$(SUBLIBS),$(dir)/*.o) + @$(CXX) $(rpathflag) -Wl,-soname,$@ -shared -o $@ $(objects) endef endif diff --git a/environments/g4py/config/sys/macosx.gmk b/environments/g4py/config/sys/macosx.gmk index 7178fb4dd3..5254e6ec7e 100644 --- a/environments/g4py/config/sys/macosx.gmk +++ b/environments/g4py/config/sys/macosx.gmk @@ -1,37 +1,43 @@ -# $Id: macosx.gmk,v 1.2 2006/04/25 05:50:05 kmura Exp $ -# $Name: geant4-08-01 $ +# $Id: macosx.gmk,v 1.4 2006/08/10 08:49:08 kmura Exp $ +# $Name: geant4-08-02 $ # =========================================================== # System specific terms +# +# MacOSX 10.4 (Tiger) gcc 4.0.1 +# Note: gc-3.3 is not valid for this setup. # =========================================================== # compile flags CXX := g++ ifdef COMPILE_WITH_BOOST - CXXFLAGS := -fPIC -ftemplate-depth-256 -Wno-long-double - CXXFLAGS += -no-cpp-precomp -fno-inline -fcoalesce-templates - CXXFLAGS += -DBOOST_PYTHON_DYNAMIC_LIB + CXXFLAGS := -ftemplate-depth-256 -Wno-long-double + CXXFLAGS += -no-cpp-precomp -finline-functions -Wno-inline + CXXFLAGS += -DBOOST_PYTHON_DYNAMIC_LIB + CXXFLAGS += -O2 ifndef DEBUG CXXFLAGS += -DNDEBUG endif else CXXFLAGS := -ansi -pedantic -Wno-non-virtual-dtor -Wno-long-long CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -pipe - CXXFLAGS += -fPIC + CXXFLAGS += -O2 endif ifdef COMPILE_G4PY - CXXFLAGS := -fPIC -ansi -pipe + CXXFLAGS := -ansi -pipe CXXFLAGS += -ftemplate-depth-256 -Wno-long-double - CXXFLAGS += -no-cpp-precomp -fno-inline -fcoalesce-templates + CXXFLAGS += -no-cpp-precomp -finline-functions -Wno-inline CXXFLAGS += -DBOOST_PYTHON_DYNAMIC_LIB + CXXFLAGS += -O2 ifndef DEBUG CXXFLAGS += -DNDEBUG endif endif # extention of shared library -soext := so +soext := dylib +modext := so # implicit rules %.o: %.cc @@ -47,43 +53,36 @@ endif # building a shared library -ifdef BOOST_LIBDIR - rpath0 := $(BOOST_LIBDIR) +ifdef LOCALLIB + install_path := $(PWD) +else + install_path := $(Q_LIBDIR) endif -ifdef G4PY_EXLIB_LIBDIR - rpath1 := $(G4PY_EXLIB_LIBDIR) -endif - -ifdef COMPILE_G4PY - rpath2 := $(Q_G4_LIBDIR):$(Q_CLHEP_LIBDIR) -endif - -#rpathflag := -Wl,-rpath,$(rpath0):$(rpath1):$(rpath2) -rpathflag := ifdef CPPVERBOSE define build-library - $(CXX) $(rpathflag) -bundle -flat_namespace -undefined define_a_way \ - -o $@ $(foreach dir,$(SUBLIBS),$(dir)/*.o) + $(CXX) -dynamiclib -single_module -undefined dynamic_lookup \ + -o $@ -install_name $(install_path)/$@ $(objects) endef else define build-library @echo Building a module $@ ... - @$(CXX) $(rpathflag) -bundle -flat_namespace -undefined define_a_way \ - -o $@ $(foreach dir,$(SUBLIBS),$(dir)/*.o) + @$(CXX) -dynamiclib -single_module -undefined dynamic_lookup \ + -o $@ -install_name $(install_path)/$@ $(objects) endef endif +# building a module ifdef CPPVERBOSE define build-module - $(CXX) $(rpathflag) -bundle -flat_namespace -undefined define_a_way \ + $(CXX) -Wl,-x -bundle -flat_namespace -dead_strip \ -o $@ $(objects) $(LOPT) endef else define build-module @echo Building a module $@ ... - @$(CXX) $(rpathflag) -bundle -flat_namespace -undefined define_a_way \ + @$(CXX) -Wl,-x -bundle -flat_namespace -dead_strip \ -o $@ $(objects) $(LOPT) endef endif diff --git a/environments/g4py/configure b/environments/g4py/configure index 76151a3fdc..c933008b50 100755 --- a/environments/g4py/configure +++ b/environments/g4py/configure @@ -1,5 +1,5 @@ #! /bin/sh - -#$Id: configure,v 1.3 2006/06/20 09:35:06 kmura Exp $ +#$Id: configure,v 1.5 2006/11/20 08:01:17 kmura Exp $ # ====================================================================== # A configure script for Geant4Py # ====================================================================== @@ -58,7 +58,7 @@ Enable/disable options: prefix with either --enable- or --disable- Supported Architectures: linux for Linux gcc 3.x and 4.x linuxx8664gcc for AMD Opteron and Intel EM64T Linux gcc 3.x and 4.x - macosx for MacOS X with gcc (test) + macosx for MacOSX with gcc (Tiger and XCode 2.3) EOF } @@ -92,6 +92,7 @@ enable_openglxm=${enable_openglxm:-0} enable_raytracerx=${G4VIS_USE_RAYTRACERX:+1} enable_raytracerx=${enable_raytracerx:-0} +enable_physicslist=0 # checking system case $1 in @@ -174,6 +175,11 @@ if [ $system == linuxx8664gcc ]; then arch=64 fi +shlib=so +if [ $system == macosx ]; then +shlib=dylib +fi + echo -n "Checking for prefix ... " echo $prefix @@ -243,13 +249,13 @@ fi echo "$clhep_libdir" echo -n "Checking for CLHEP lib name ... " -if [ ! -f "$clhep_libdir"/lib${clhep_lib}.so ]; then +if [ ! -f "$clhep_libdir"/lib${clhep_lib}.${shlib} ]; then echo "no" - echo -n "### lib${clhep_lib}.so (clhep-lib) does not exist. " + echo -n "### lib${clhep_lib}.${shlib} (clhep-lib) does not exist. " echo "Try --with-clhep-lib option." exit -1 fi -echo "lib${clhep_lib}.so" +echo "lib${clhep_lib}.${shlib}" # --- echo -n "Checking for Python include dir (pyconfig.h) ... " @@ -304,17 +310,17 @@ fi echo "$boost_libdir" echo -n "Checking for Boost Python lib name ... " -if [ ! -f "$boost_libdir"/lib${boost_python_lib}.so ]; then +if [ ! -f "$boost_libdir"/lib${boost_python_lib}.${shlib} ]; then echo "no" - echo -n "### lib${boost_python_lib}.so (boost-python-lib) does not exist. " + echo -n "### lib${boost_python_lib}.${shlib} (boost-python-lib) does not exist. " echo "Try --with-boost-libdir option." exit -1 fi -echo "lib${boost_python_lib}.so" +echo "lib${boost_python_lib}.${shlib}" # --- echo -n "Checking for OpenGL support ..." -if [ -f "$g4_libdir"/libG4OpenGL.so ]; then +if [ -f "$g4_libdir"/libG4OpenGL.${shlib} ]; then if [ $enable_openglx == 0 ]; then echo "disabled" else @@ -325,6 +331,18 @@ else enable_openglx=0 fi +# --- +echo -n "Checking for physics list support ..." +if [ -f "$g4_incdir"/QGSP.hh ]; then + enable_physicslist=1 +fi +if [ $enable_physicslist == 0 ]; then + echo "no" +else + echo "yes" +fi + + # --- echo -n "Writing config.gmk ... " @@ -371,6 +389,8 @@ Q_ENABLE_OPENGLX := $enable_openglx Q_ENABLE_OPENGLXM := $enable_openglxm Q_ENABLE_RAYTRACERX := $enable_raytracerx +Q_ENABLE_PHYSICSLIST := $enable_physicslist + EOF echo "done" echo -n "Writing config.status ... " @@ -392,6 +412,10 @@ if [ $enable_raytracerx = 1 ]; then echo -n " raytracerx" fi +if [ $enable_physicslist = 1 ]; then + echo -n " physicslist" +fi + echo "." # --- @@ -404,5 +428,3 @@ echo "" exit 0 - - diff --git a/environments/g4py/examples/demos/water_phantom/g4lib/GNUmakefile b/environments/g4py/examples/demos/water_phantom/g4lib/GNUmakefile index b1350572c5..fe1bc10bcd 100644 --- a/environments/g4py/examples/demos/water_phantom/g4lib/GNUmakefile +++ b/environments/g4py/examples/demos/water_phantom/g4lib/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.1 2006/05/11 04:35:32 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py modules # =========================================================== diff --git a/environments/g4py/examples/demos/water_phantom/g4lib/MyDetectorConstruction.cc b/environments/g4py/examples/demos/water_phantom/g4lib/MyDetectorConstruction.cc index 0bbfb1f7e5..63b2b67e09 100644 --- a/environments/g4py/examples/demos/water_phantom/g4lib/MyDetectorConstruction.cc +++ b/environments/g4py/examples/demos/water_phantom/g4lib/MyDetectorConstruction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: MyDetectorConstruction.cc,v 1.3 2006/06/29 15:28:11 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // MyDetectorConstruction.cc // diff --git a/environments/g4py/examples/demos/water_phantom/g4lib/MyDetectorConstruction.hh b/environments/g4py/examples/demos/water_phantom/g4lib/MyDetectorConstruction.hh index 4d72dff17f..1d4eaeceb8 100644 --- a/environments/g4py/examples/demos/water_phantom/g4lib/MyDetectorConstruction.hh +++ b/environments/g4py/examples/demos/water_phantom/g4lib/MyDetectorConstruction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: MyDetectorConstruction.hh,v 1.3 2006/06/29 15:28:13 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // MyDetectorConstruction.hh // diff --git a/environments/g4py/examples/demos/water_phantom/g4lib/MyMaterials.cc b/environments/g4py/examples/demos/water_phantom/g4lib/MyMaterials.cc index fbd6050f16..af3766169f 100644 --- a/environments/g4py/examples/demos/water_phantom/g4lib/MyMaterials.cc +++ b/environments/g4py/examples/demos/water_phantom/g4lib/MyMaterials.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: MyMaterials.cc,v 1.3 2006/06/29 15:28:16 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // MyMaterials.cc // diff --git a/environments/g4py/examples/demos/water_phantom/g4lib/MyMaterials.hh b/environments/g4py/examples/demos/water_phantom/g4lib/MyMaterials.hh index 87ec88e622..42b126e5e4 100644 --- a/environments/g4py/examples/demos/water_phantom/g4lib/MyMaterials.hh +++ b/environments/g4py/examples/demos/water_phantom/g4lib/MyMaterials.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: MyMaterials.hh,v 1.3 2006/06/29 15:28:19 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // MyMaterials.hh // diff --git a/environments/g4py/examples/demos/water_phantom/g4lib/MyPhysicsList.cc b/environments/g4py/examples/demos/water_phantom/g4lib/MyPhysicsList.cc index 869e810a3a..f0c8135821 100644 --- a/environments/g4py/examples/demos/water_phantom/g4lib/MyPhysicsList.cc +++ b/environments/g4py/examples/demos/water_phantom/g4lib/MyPhysicsList.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: MyPhysicsList.cc,v 1.3 2006/06/29 15:28:21 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // MyPhysicsList.cc // diff --git a/environments/g4py/examples/demos/water_phantom/g4lib/MyPhysicsList.hh b/environments/g4py/examples/demos/water_phantom/g4lib/MyPhysicsList.hh index 49d6918151..305e10f2cc 100644 --- a/environments/g4py/examples/demos/water_phantom/g4lib/MyPhysicsList.hh +++ b/environments/g4py/examples/demos/water_phantom/g4lib/MyPhysicsList.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: MyPhysicsList.hh,v 1.3 2006/06/29 15:28:23 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // MyPhysicsList.hh // diff --git a/environments/g4py/examples/demos/water_phantom/g4lib/Particles.cc b/environments/g4py/examples/demos/water_phantom/g4lib/Particles.cc index 5d6fc49d53..3a1213ddcc 100644 --- a/environments/g4py/examples/demos/water_phantom/g4lib/Particles.cc +++ b/environments/g4py/examples/demos/water_phantom/g4lib/Particles.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: Particles.cc,v 1.3 2006/06/29 15:28:25 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // Particles.cc // diff --git a/environments/g4py/examples/demos/water_phantom/g4lib/PhysicsListEMstd.cc b/environments/g4py/examples/demos/water_phantom/g4lib/PhysicsListEMstd.cc index e5d11c61b4..fda70bca31 100644 --- a/environments/g4py/examples/demos/water_phantom/g4lib/PhysicsListEMstd.cc +++ b/environments/g4py/examples/demos/water_phantom/g4lib/PhysicsListEMstd.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListEMstd.cc,v 1.3 2006/06/29 15:28:29 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // PhysicsListEMstd.cc // diff --git a/environments/g4py/examples/demos/water_phantom/g4lib/pydemo_wp.cc b/environments/g4py/examples/demos/water_phantom/g4lib/pydemo_wp.cc index 3899b3890d..0b43a34802 100644 --- a/environments/g4py/examples/demos/water_phantom/g4lib/pydemo_wp.cc +++ b/environments/g4py/examples/demos/water_phantom/g4lib/pydemo_wp.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pydemo_wp.cc,v 1.3 2006/06/29 15:28:40 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pydemo_wp.cc // diff --git a/environments/g4py/examples/education/lesson1/History b/environments/g4py/examples/education/lesson1/History index 96439a0bd9..3e21fc3424 100644 --- a/environments/g4py/examples/education/lesson1/History +++ b/environments/g4py/examples/education/lesson1/History @@ -1,3 +1,8 @@ +27 Sep. 2006 Hajime Yoshida + - Lesson1.py as before + - Lesson1withN03.py with the physics list of N03 + - Lesson2Wx.py N03 physics list AND wxPython GUI + 09 March 2006 Hajime Yoshida diff --git a/environments/g4py/examples/education/lesson1/Lesson1Wx.py b/environments/g4py/examples/education/lesson1/Lesson1Wx.py new file mode 100644 index 0000000000..9ea9f5ad79 --- /dev/null +++ b/environments/g4py/examples/education/lesson1/Lesson1Wx.py @@ -0,0 +1,555 @@ +from Geant4 import * +import NISTmaterials +from EZsim import EZgeom +from EZsim.EZgeom import G4EzVolume +import ExN03pl +import ParticleGun +from time import * +import sys +from subprocess import * +import os + +# ================================================================== +# intialize +# ================================================================== +def Configure(): + # ------------------------------------------------------------------ + # setup for materials + # ------------------------------------------------------------------ + # simple materials for Qgeom + NISTmaterials.Construct() + + # ------------------------------------------------------------------ + # setup for geometry + # ------------------------------------------------------------------ + EZgeom.Construct() # initialize + + # ------------------------------------------------------------------ + # setup for physics list of N03 + # ------------------------------------------------------------------ + ExN03pl.Construct() + + # ------------------------------------------------------------------ + # setup for primary generator action + # ------------------------------------------------------------------ + ParticleGun.Construct() + gControlExecute("gun.mac") + +# ================================================================== +# constructing geometry +# ================================================================== +def ConstructGeom(): + + print "* Constructing geometry..." + # reset world material + global absorber + air= G4Material.GetMaterial("G4_AIR", 1) + galactic = G4Material.GetMaterial("G4_Galactic", 1) + absorber = {} # material's dictionary to be used by a radiobutton + aluminum = G4Material.GetMaterial("G4_Al", 1) + iron = G4Material.GetMaterial("G4_Fe", 1) + silver = G4Material.GetMaterial("G4_Ag", 1) + gold = G4Material.GetMaterial("G4_Au", 1) + lead = G4Material.GetMaterial("G4_Pb", 1) + water = G4Material.GetMaterial("G4_WATER", 1) + absorber = {"air":air, "aluminum":aluminum, "iron":iron, "lead":lead, "water":water, "gold":gold +} + EZgeom.SetWorldMaterial(galactic) + EZgeom.ResizeWorld(120.*cm, 120.*cm, 100.*cm) + # water phantom + global water_phantom, water_phantom_pv + + water_phantom= G4EzVolume("WaterPhantom") + water_phantom.CreateBoxVolume(water, 110.*cm, 110.*cm, 10.*cm) + water_phantom_pv = water_phantom.PlaceIt(G4ThreeVector(0.,0.,0.*cm)) + +# ================================================================== +# main +# ================================================================== +# ------------------------------------------------------------------ +# randum number +# ------------------------------------------------------------------ +#print "Random numbers..." +rand_engine= Ranlux64Engine() +HepRandom.setTheEngine(rand_engine) +HepRandom.setTheSeed(20050830L) + +# setup... + +Configure() +ConstructGeom() + +# ------------------------------------------------------------------ +# go... +# ------------------------------------------------------------------ +gRunManager.Initialize() + + + +global commandDic, commandList +commandDic = {} +commandList = [] + +def DumpTree(atree): + + ntree= atree.GetTreeEntry() + ncommand= atree.GetCommandEntry() + for i in range(1, ncommand+1): + icommand= atree.GetCommand(i) + command = str( icommand.GetCommandPath()) + commandList.append(command) + nparameter= icommand.GetParameterEntries() + pguide = "" + for j in range(0, nparameter): + iparam= icommand.GetParameter(j) + pguide = pguide + "Parameter: " + str(iparam.GetParameterName())+ " Type: " + str(iparam.GetParameterType()) + '\n' + guide = str(icommand.GetTitle()) + '\n' + pguide + commandDic[command] = guide + + for i in range(1, ntree+1): + itree= atree.GetTree(i) + DumpTree(itree) + +root_tree= gUImanager.GetTree() +DumpTree(root_tree) + +# visualization +# OGLSX, VRML and HEPREP sceneHandlers are all created with names +gApplyUICommand("/vis/sceneHandler/create OGLSX OGLSX") +gApplyUICommand("/vis/sceneHandler/create VRML2FILE VRML") +gApplyUICommand("/vis/sceneHandler/create HepRepFile HEPREP") + + +# OGLSX is the default so, viewer is created and volume is drawn +gApplyUICommand("/vis/viewer/create OGLSX oglsxviewer") +gApplyUICommand("/vis/viewer/select oglsxviewer") +gApplyUICommand("/vis/drawVolume") +gApplyUICommand("/vis/scene/add/trajectories") + +gApplyUICommand("/tracking/storeTrajectory 1") +gApplyUICommand("/vis/scene/endOfEventAction accumulate") +gApplyUICommand("/vis/scene/endOfRunAction accumulate") + +gApplyUICommand("/vis/viewer/set/viewpointThetaPhi 90. 0.") +gApplyUICommand("/vis/viewer/set/style s") + +# viewers VRML and Wired are tested by their envs vars +# if their envs var are set, then viewers are created and drawVolume + +global heprepViewer, heprepDir, heprepName, vrmlViewer +heprepViewer = os.environ.get("G4HEPREPFILE_VIEWER") +heprepDir = os.environ.get("G4HEPREPFILE_DIR") +heprepName = os.environ.get("G4HEPREPFILE_NAME") +if heprepViewer is not None: + gApplyUICommand("/vis/viewer/create HEPREP wired") +# gApplyUICommand("/vis/drawVolume") + +# VRML viewers name is user defined +vrmlDir = os.environ.get("G4VRML_DEST_DIR") +vrmlViewer = os.environ.get("G4VRMLFILE_VIEWER") +if vrmlViewer is not None: + gApplyUICommand("/vis/viewer/create VRML vrmlviewer") +# gApplyUICommand("/vis/drawVolume") + +############################### +###### wxPython GUI ########## +############################### + +import wx + +class ComPanel(wx.Panel): + def __init__(self, parent): + wx.Panel.__init__(self, parent, -1) + + self.g4comText = wx.TextCtrl(parent, -1, "enter Command", pos=(10,10), size=(300, 30)) + + self.g4comExec = wx.Button(parent, -1, "Execute", pos=(320,10), size=(60,30)) + self.g4comExec.Bind(wx.EVT_BUTTON, self.ExecuteCommand, self.g4comExec) + + self.comListBox = wx.ListBox(parent, -1, pos=(10,50), size=(300,200), choices=commandList, style=wx.LB_SINGLE) + self.comListBox.SetSelection(1) + self.comListBox.Bind(wx.EVT_LISTBOX, self.ShowGuide, self.comListBox) + + self.guide = wx.TextCtrl(parent, -1, "guidance", pos=(320,50), size=(300, 200), style =wx.TE_MULTILINE) + self.guide.Bind(wx.EVT_LISTBOX, self.ShowGuide, self.guide) + + + def ShowGuide(self, event): + self.guide.Clear() # how to cleat the whole text before showing the next + g4com =str(self.comListBox.GetStringSelection()) + self.guide.WriteText( commandDic[g4com]) + self.g4comText.SetValue(g4com) + + def ExecuteCommand(self, event): + gApplyUICommand(str(self.g4comText.GetValue())) + + +class VisPanel(wx.Panel): + def __init__(self, parent): + wx.Panel.__init__(self, parent, -1) + + self.visZoomIn = wx.Button(parent, -1, "Zoom In", pos=(10,100), size=(80,30)) + self.visZoomOut = wx.Button(parent, -1, "Zoom out", pos=(100,100), size=(80,30)) + self.visUp = wx.Button(parent, -1, "Up", pos=(190,100), size=(80,30)) + self.visDown = wx.Button(parent, -1, "Down", pos=(270,100), size=(80,30)) + self.visLeft = wx.Button(parent, -1, "Left", pos=(360,100), size=(80,30)) + self.visRight = wx.Button(parent, -1, "Left", pos=(450,100), size=(80,30)) + + viewerList = ["OpenGL", "VRML", "Wired"] + self.viewer = wx.RadioBox(self, -1, "Viewer", pos=(10,10), + size=(210,60), choices=viewerList, majorDimension=1, style=wx.RA_SPECIFY_ROWS) + self.viewer.Bind(wx.EVT_RADIOBOX, self.ViewerSelected, self.viewer) + self.viewer.SetToolTip(wx.ToolTip("Select one")) + self.viewer.SetSelection(0) + if vrmlViewer == None: self.viewer.EnableItem(1, False) + if heprepViewer == None: self.viewer.EnableItem(2, False) + + self.visZoomIn.Bind(wx.EVT_BUTTON, self.cmdExpand, self.visZoomIn) + self.visZoomOut.Bind(wx.EVT_BUTTON, self.cmdShrink, self.visZoomOut) + self.visUp.Bind(wx.EVT_BUTTON, self.cmdUp, self.visUp) + self.visDown.Bind(wx.EVT_BUTTON, self.cmdDown, self.visDown) + self.visRight.Bind(wx.EVT_BUTTON, self.cmdRight, self.visRight) + self.visLeft.Bind(wx.EVT_BUTTON, self.cmdLeft, self.visLeft) + + + def cmdExpand(self, event): + gApplyUICommand("/vis/viewer/zoom 1.2") + def cmdShrink(self, event): + gApplyUICommand("/vis/viewer/zoom 0.8") + def cmdUp(self, event): + gApplyUICommand("/vis/viewer/pan " + " 0. 10. mm") + def cmdDown(self, event): + gApplyUICommand("/vis/viewer/pan " + " 0. -10. mm") + def cmdRight(self, event): + gApplyUICommand("/vis/viewer/pan " + " -1. 0. mm") + def cmdLeft(self, event): + gApplyUICommand("/vis/viewer/pan " + " 1. 0. mm") + + def ViewerSelected(self, event): + self.viewerName = event.GetString() + + if self.viewerName == "OpenGL": + gApplyUICommand("/vis/viewer/select oglsxviewer") + gApplyUICommand("/vis/drawVolume") + gApplyUICommand("/vis/scene/add/trajectories") + + gApplyUICommand("/tracking/storeTrajectory 1") + gApplyUICommand("/vis/scene/endOfEventAction accumulate") + gApplyUICommand("/vis/scene/endOfRunAction accumulate") + + if self.viewerName == "VRML": + gApplyUICommand("/vis/viewer/select vrmlviewer") + + gApplyUICommand("/vis/viewer/set/viewpointThetaPhi 90. 0.") + gApplyUICommand("/vis/viewer/set/style s") + gApplyUICommand("/vis/drawVolume") + gApplyUICommand("/vis/scene/add/trajectories") + + gApplyUICommand("/tracking/storeTrajectory 1") + gApplyUICommand("/vis/scene/endOfEventAction accumulate") + gApplyUICommand("/vis/scene/endOfRunAction accumulate") + + if self.viewerName == "Wired": + + gApplyUICommand("/vis/viewer/select wired") + + gApplyUICommand("/vis/viewer/set/viewpointThetaPhi 90. 0.") + gApplyUICommand("/vis/viewer/set/style s") + gApplyUICommand("/vis/drawVolume") + gApplyUICommand("/vis/scene/add/trajectories") + + gApplyUICommand("/tracking/storeTrajectory 1") + gApplyUICommand("/vis/scene/endOfEventAction accumulate") + gApplyUICommand("/vis/scene/endOfRunAction accumulate") + +# everytime wired is chosen, a new instance of wired is created +# to reuse single wired, g4pipe.poll() must be checked BEFORE the SECOND Popen +# if g4pipe.poll() == None: + g4pipe=Popen(heprepViewer+ " -file " + heprepDir+"/" +heprepName +".heprep", shell=True) + + +# not used +class MyText(wx.StaticText): + def __init__(self, parent, Text): + wx.StaticText.__init__(self, parent, -1, Text, pos=(20,20)) + self.Bind(wx.EVT_LEFT_UP, self.ChangeColor) + + def ChangeColor(self, event): + TheColour = self.GetForegroundColour() + if TheColour == (0,0,0): + self.SetLabel("Simulation is running!") + self.SetForegroundColour("red") + else: + self.SetLabel("Click me to start a run") + self.SetForegroundColour("black") + +# to be used to choose materials and particles +# myList is a list of keys() of a dictionary +# f.e., materials are Python objects with their names as their keys +class SelectOne(wx.RadioBox): + def __init__(self, parent, myTitle, myList): + wx.RadioBox.__init__(self, parent, -1, myTitle, wx.DefaultPosition, + wx.DefaultSize, myList, 3, wx.RA_SPECIFY_ROWS) +# self.Bind(wx.EVT_RADIOBOX, self.Selected) + self.SetToolTip(wx.ToolTip("Select one")) + self.SetSelection(0) +# used only to test Bind and getValue +# def Selected(self, event): +# self.selected = event.GetString() + + +# used to %3.3f floating point number +# energy and length unit is given by unitList which must be a dictionary +# with units of Python objects and their name as their keys + +class FloatCounter(wx.Panel): + def __init__(self, parent, myTitle, unitList): + wx.Panel.__init__(self, parent, -1) + + self.sizer = wx.BoxSizer(wx.HORIZONTAL) + self.sizer.Add((10, -1)) + self.sizer.Add(wx.StaticText(parent, -1, myTitle, wx.DefaultPosition, (100, -1))) + + self.intPart = wx.SpinCtrl(parent, -1, "", wx.DefaultPosition, (60,-1)) + self.intPart.SetRange(0,999) + self.intPart.SetValue(1) + self.intPart.Bind(wx.EVT_SPINCTRL, self.SetFloat) + + self.manPart = wx.SpinCtrl(parent, -1, "", wx.DefaultPosition, (50, -1)) + self.manPart.SetRange(0,999) + self.manPart.SetValue(0) + self.manPart.Bind(wx.EVT_SPINCTRL, self.SetFloat) + + self.unitSel = wx.Choice(parent, -1, wx.DefaultPosition, (90, -1), unitList) + self.unitSel.Bind(wx.EVT_CHOICE, self.SetFloat, self.unitSel) + self.unitSel.SetSelection(2) + + self.valAndUnit = wx.TextCtrl(parent, -1, "value unset", wx.DefaultPosition, (150, -1)) + + self.sizer.Add(self.valAndUnit) + self.sizer.Add((10, -1)) + self.sizer.Add(wx.StaticText(parent, -1, " ", wx.DefaultPosition, (30, -1))) + self.sizer.Add(self.intPart) + self.sizer.Add(wx.StaticText(parent, -1, ".", wx.DefaultPosition, (10, -1))) + self.sizer.Add(self.manPart) + self.sizer.Add((5,-1)) + self.sizer.Add(self.unitSel) + self.SetSizer(self.sizer) + + def SetFloat(self, event): +# self.theValue = str(self.intPart.GetValue()) + "." + str(self.manPart.GetValue()) + " " + self.theValue = float (self.intPart.GetValue()) + float(self.manPart.GetValue())/ 1000. + self.theUnit = self.unitSel.GetStringSelection() + theText = "%.3f" % (self.theValue) + " " + self.theUnit + self.valAndUnit.SetValue(theText) +# user may edit the Entry, so finnaly this value must be got +# but it doesn't work for length but work for energy (gApplyUIcommnd) + + +# special class for this example to set/unset processes +class Processes(wx.Panel): + def __init__(self, parent, myTitle, myList): + wx.Panel.__init__(self, parent, -1) + self.processCheck = {} + self.sizer = wx.FlexGridSizer(rows=3) + self.sizer.AddGrowableRow(1) + for item in myList: + self.processCheck[item] = wx.CheckBox(parent, -1, item) + self.processCheck[item].SetValue(True) +# self.processCheck[item].Bind(wx.EVT_CHECKBOX, self.CheckedProcess) + self.sizer.Add(self.processCheck[item],0,wx.EXPAND) + + self.SetSizer(self.sizer) + self.SetBackgroundColour('green') + self.processState = {} + self.myList = myList + +# test only +# def CheckedProcess(self, event): +# self.processName = event.GetEventObject().GetLabel() +# self.processState = event.GetEventObject().GetValue() + + +# slider to set an integer value +# title is shown +class Adjuster(wx.Panel): + def __init__(self, parent, myTitle, minVal, maxVal, initVal): + wx.Panel.__init__(self, parent, -1) + self.sizer = wx.BoxSizer(wx.HORIZONTAL) + self.sizer.Add((10, -1)) + self.sizer.Add(wx.StaticText(parent, -1, myTitle, wx.DefaultPosition, (100, -1))) + self.slider = wx.Slider(parent, -1, initVal, minVal, maxVal, + wx.DefaultPosition, (300, -1), + wx.SL_HORIZONTAL | wx.SL_AUTOTICKS | wx.SL_LABELS) + self.slider.SetPageSize(1) + self.sizer.Add(self.slider) + self.SetSizer(self.sizer) + +# test only +# self.Bind(wx.EVT_SLIDER, self.Adjusted) + +# def Adjusted(self, event): +# print self.GetValue() + + +########################## no use now +class Counter(wx.SpinCtrl): + def __init__(self, parent, myTitle, minVal, maxVal, initVal): + wx.SpinCtrl.__init__(self, parent, -1, "", wx.DefaultPosition, wx.DefaultSize, wx.TE_RIGHT) + self.SetRange(minVal, maxVal) + self.SetValue(initVal) + self.Bind(wx.EVT_SPINCTRL, self.Adjusted) + def Adjusted(self, event): + print self.GetValue() + +############################ + + +############################ +# WxPython Application class +############################ + +# main class to instantiate the above classes and pack them using nested sizers + +class MyApp(wx.Frame): + def __init__(self): + wx.Frame.__init__(self, None, -1, "Geant4Py", wx.DefaultPosition, size=(650,500)) + self.nb = wx.Notebook(self, -1, wx.DefaultPosition, size=(650,500), + style= + wx.NB_TOP # | wx.NB_MULTILINE + #wx.NB_BOTTOM + #wx.NB_LEFT + #wx.NB_RIGHT + ) + self.nb.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED, self.OnPageChanged) + self.nb.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGING, self.OnPageChanging) + + panel = wx.Panel(self.nb) + self.nb.AddPage(panel, "Lesson1") + + commandPanel = wx.Panel(self.nb) + self.nb.AddPage(commandPanel, "Geant4 Commands") + comP = ComPanel(commandPanel) + gxsizer = wx.BoxSizer(wx.HORIZONTAL) + gxsizer.Add(comP) + commandPanel.SetSizer(gxsizer) + + visualizationPanel = wx.Panel(self.nb) + self.nb.AddPage(visualizationPanel, "Vis Commands") + visP = VisPanel(visualizationPanel) + vxsizer = wx.BoxSizer(wx.HORIZONTAL) + vxsizer.Add(visP) + visualizationPanel.SetSizer(vxsizer) + + +# outmost sizer in the vertical direction + bxsizer = wx.BoxSizer(wx.VERTICAL) +# nested sizer in the horizontal direction + bysizer = wx.BoxSizer(wx.HORIZONTAL) + + self.runStart = wx.Button(panel, -1, " Run Start", pos=(30,10), size=(80,30)) + self.Bind(wx.EVT_BUTTON, self.RunStart, self.runStart) + bxsizer.Add(self.runStart, 0, wx.ALL) +# widgets + + + materialList = absorber.keys() + self.theMaterial = SelectOne(panel, "Materials", materialList) + + particleList = ['gamma', 'e-', 'proton'] + self.theParticle = SelectOne(panel, "Particles", particleList) + + self.processList = ["phot", "compt", "conv", "msc", "eIoni", "eBrem", "annihil", "hIoni"] + self.theProcesses = Processes(panel, "Processes", self.processList) + + self.eventNo = Adjuster(panel, "Number of Events", 1 , 100 , 1) + + self.lengthUnit = {'micrometer':micrometer, 'mm':mm, 'cm':cm, 'm':m} + self.thickSpin = FloatCounter(panel, "absorber thickness", self.lengthUnit.keys()) + + self.energyUnit = { 'keV':keV, 'MeV':MeV, 'GeV':GeV, 'TeV':TeV, 'PeV':PeV} + self.energySpin = FloatCounter(panel, "incident beam energy", self.energyUnit.keys()) + +# now sizers + + bxsizer.Add(wx.StaticLine(panel), 0, wx.EXPAND|wx.TOP|wx.BOTTOM, 5) + bysizer.Add((10, -1)) + bysizer.Add(self.theMaterial, 0, wx.EXPAND, 10) + bysizer.Add((10, -1)) + bysizer.Add(self.theParticle, 0, wx.EXPAND, 10) + bysizer.Add((10, -1)) + bysizer.Add(self.theProcesses.sizer, 0, wx.EXPAND, 10) + + bxsizer.Add(bysizer, 0, wx.EXPAND) + + bxsizer.Add(wx.StaticLine(panel), 0, wx.EXPAND|wx.TOP|wx.BOTTOM, 5) + bxsizer.Add(self.energySpin.sizer, 0, wx.EXPAND) + bxsizer.Add(wx.StaticLine(panel), 0, wx.EXPAND|wx.TOP|wx.BOTTOM, 5) + bxsizer.Add(self.thickSpin.sizer, 0, wx.EXPAND) + + bxsizer.Add(wx.StaticLine(panel), 0, wx.EXPAND|wx.TOP|wx.BOTTOM, 5) + bxsizer.Add(self.eventNo.sizer, 0, wx.EXPAND) + + self.solid = EZgeom.G4EzVolume.GetSold(water_phantom) + + panel.SetSizer(bxsizer) + bxsizer.Fit(self) + bxsizer.SetSizeHints(self) + + def OnPageChanged(self, event): + old = event.GetOldSelection() + new = event.GetSelection() + sel = self.nb.GetSelection() + event.Skip() + + def OnPageChanging(self, event): + old = event.GetOldSelection() + new = event.GetSelection() + sel = self.nb.GetSelection() + event.Skip() + + +###### Run Action + + + def RunStart(self, event): + materialChosen = str( self.theMaterial.GetStringSelection() ) + water_phantom.SetMaterial(absorber[materialChosen]) + if materialChosen == "water": + water_phantom.SetColor(0., 0.9, 1.0) + if materialChosen == "air": + water_phantom.SetColor(0.9, 0.9, 1.0) + if materialChosen == "lead": + water_phantom.SetColor(0.2, 0.2, 0.2) + if materialChosen == "iron": + water_phantom.SetColor(0.7, 0.5, 0.7) + if materialChosen == "aluminum": + water_phantom.SetColor(.7, 0.9, 1.0) + if materialChosen == "gold": + water_phantom.SetColor(1., 0.9, .0) + + self.solid.SetZHalfLength( self.thickSpin.theValue * self.lengthUnit[self.thickSpin.theUnit] / 2.0 ) + +# + gApplyUICommand("/vis/scene/add/text 0 610 610 mm 20 0 0 " + "Geant4Py in Action") + gApplyUICommand("/vis/viewer/flush") + gApplyUICommand("/gun/particle " + str ( self.theParticle.GetStringSelection() ) ) + for i in self.processList: +# print i, self.theProcesses.processCheck[i].GetValue() + gProcessTable.SetProcessActivation(i, 1) + if self.theProcesses.processCheck[i].GetValue() != True: + gProcessTable.SetProcessActivation(i, 0) + + gApplyUICommand("/gun/energy " + str ( self.energySpin.valAndUnit.GetValue() ) ) + + eventNum = self.eventNo.slider.GetValue() + for i in range(eventNum): + gunYZpos = str(i-eventNum/2) + ". -50. cm" + gApplyUICommand("/gun/position 0. " + gunYZpos) + gRunManager.BeamOn(1) +# next line is necessary for vrml to draw trajectories + gApplyUICommand("/vis/viewer/update") + +app = wx.PySimpleApp(False) +MyApp().Show() +app.MainLoop() diff --git a/environments/g4py/examples/education/lesson1/Lesson1withN03.py b/environments/g4py/examples/education/lesson1/Lesson1withN03.py new file mode 100644 index 0000000000..2c7737d823 --- /dev/null +++ b/environments/g4py/examples/education/lesson1/Lesson1withN03.py @@ -0,0 +1,319 @@ +#!/usr/bin/python +# ================================================================== +# python script for "measurement" of mass attenuation coefficient +# +# +# - using site-module packages +# ================================================================== +from Geant4 import * +import NISTmaterials +from EZsim import EZgeom +from EZsim.EZgeom import G4EzVolume +import ExN03pl +import ParticleGun +from time import * +import sys + +# ================================================================== +# intialize +# ================================================================== +def Configure(): + # ------------------------------------------------------------------ + # setup for materials + # ------------------------------------------------------------------ + # simple materials for Qgeom + NISTmaterials.Construct() + + # ------------------------------------------------------------------ + # setup for geometry + # ------------------------------------------------------------------ + #Qgeom.Construct() + EZgeom.Construct() # initialize + + # ------------------------------------------------------------------ + # setup for physics list + # ------------------------------------------------------------------ + ExN03pl.Construct() + + # ------------------------------------------------------------------ + # setup for primary generator action + # ------------------------------------------------------------------ + ParticleGun.Construct() + gControlExecute("gun.mac") + +# ================================================================== +# constructing geometry +# ================================================================== +def ConstructGeom(): + print "* Constructing geometry..." + # reset world material + global absorber + air= G4Material.GetMaterial("G4_AIR", 1) + galactic = G4Material.GetMaterial("G4_Galactic", 1) + absorber = {} # material's dictionary to be used by a radiobutton + aluminum = G4Material.GetMaterial("G4_Al", 1) + iron = G4Material.GetMaterial("G4_Fe", 1) + silver = G4Material.GetMaterial("G4_Ag", 1) + gold = G4Material.GetMaterial("G4_Au", 1) + lead = G4Material.GetMaterial("G4_Pb", 1) + water = G4Material.GetMaterial("G4_WATER", 1) + absorber = {"air":air, "aluminum":aluminum, "iron":iron, "lead":lead, "water":water, "gold":gold} + EZgeom.SetWorldMaterial(galactic) + EZgeom.ResizeWorld(120.*cm, 120.*cm, 100.*cm) + # water phantom + global water_phantom, water_phantom_pv + + water_phantom= G4EzVolume("WaterPhantom") + water_phantom.CreateBoxVolume(water, 110.*cm, 110.*cm, 10.*cm) + + water_phantom_pv = water_phantom.PlaceIt(G4ThreeVector(0.,0.,0.*cm)) + +# ================================================================== +# main +# ================================================================== +# ------------------------------------------------------------------ +# randum number +# ------------------------------------------------------------------ +print "Random numbers..." +rand_engine= Ranlux64Engine() +HepRandom.setTheEngine(rand_engine) +HepRandom.setTheSeed(20050830L) + +# setup... + +Configure() +ConstructGeom() + + +# ------------------------------------------------------------------ +# go... +# ------------------------------------------------------------------ +gRunManager.Initialize() + +# visualization not here but after "Start a run" button +gControlExecute("oglx.mac") +#gControlExecute("vrml.mac") + +# creating widgets using grid layout + +from Tkinter import * + +class App(Frame): + + + + def init(self): + +#title and header row=0, 1 + title = Label(self, text="Geant4Py for Education @ H. Yoshida Naruto Univ. of Education") + title.grid(row=0, column=1, columnspan=5) + header = Label(self, text="Measurement of Mass Attenuation Coefficient") + header.grid(row=1, column=1, columnspan=5) + +#material selection row=2 + materialLabel = Label(self, bg="green", text="Material") + materialLabel.grid(row=2, column=0, sticky=W) + self.materialVar = StringVar() + self.materialVar.set("water") + ra1 = { } + pos=1 + for i in absorber.keys(): + ra1[i] = Radiobutton(self, text=i, variable=self.materialVar, value=i) + ra1[i].grid(row=2, column=pos, sticky=W) + pos=pos+1 + +#absorber thickness row=3 + thickLabel = Label(self, bg="green", text="Thickness (mm)") + self.thickVar = DoubleVar() + self.thickVar.set(100.0) + thick = Scale(self, orient=HORIZONTAL, length=400, from_=0., to=100., resolution=0.05, tickinterval=10.0, digits=4, variable=self.thickVar) + thickLabel.grid(row=3, column=0, sticky=W) + thick.grid(row=3, column=1, columnspan=5, sticky=W) + +#get logical volume and set its half length + self.solid = EZgeom.G4EzVolume.GetSold(water_phantom) + +#particle row=4 + particleLabel = Label(self, bg="green", text="Particle") + particleLabel.grid(row=4, column=0, sticky=W) + self.particleVar = StringVar() + self.particleVar.set("gamma") + ra1 = { } + pos1=1 + for i in ("gamma", "e-", "proton"): + ra1[i] = Radiobutton(self, text=i, variable=self.particleVar, value=i) + ra1[i].grid(row=4, column=pos1, sticky=W) + pos1=pos1+1 + +#energy row=5 + energyLabel = Label(self, bg="green", text="Energy (MeV)") + + self.energyVar=StringVar() + self.energyVar.set(1) + energy = Scale(self, orient=HORIZONTAL, length=400, from_=0., to=100., tickinterval=10.0, resolution=0.1, variable=self.energyVar, digits=4 ) + energyLabel.grid(row=5, column=0, sticky=W) + energy.grid(row=5, column=1, columnspan=5, sticky=W) + +#number of event row=6 + eventLabel = Label(self, bg="green", text="Events") + self.eventVar=IntVar() + event = Scale(self, orient=HORIZONTAL, length=400, from_=1, to=100, tickinterval=10, resolution=1, variable=self.eventVar ) + eventLabel.grid(row=6, column=0, sticky=W) + event.grid(row=6, column=1, columnspan=5, sticky=W) + +#start a run button row=7 + startBut = Button(self, bg="orange", text="Start a run", command=self.cmd_beamOn) + startBut.grid(row=0, column=0, sticky=W) + + +#on off processes + + processLabel = Label(self, text="Process On/Off", bg="green") + processLabel.grid(row=8, column=0, sticky=W) + procTab = {} + self.processList = ["phot", "compt", "msc", "conv", "eIoni", "eBrem", "hIoni"] + self.processVar = {} + pos = 1 + for i in self.processList: + self.processVar[i] = IntVar() + procTab[i] = Checkbutton(self, text=i, variable=self.processVar[i], command=self.cmd_setProcess) + procTab[i].grid(row=8, column=pos, sticky=W) + pos = pos + 1 + procTab[i].select() + + +#Zoom in/out Pan X Y row=9 + visLabel = Label(self, text="viewer", bg="orange") + expandBut = Button(self, text="Zoom in", command=self.cmd_expand) + shrinkBut = Button(self, text="Zoom out", command=self.cmd_shrink) + visLabel.grid(row=9, column=0, sticky=W) + expandBut.grid(row=9, column=1, sticky=W) + shrinkBut.grid(row=9, column=2, sticky=W) + + upBut = Button(self, text="Up", command=self.cmd_up) + downBut = Button(self, text="Down", command=self.cmd_down) + upBut.grid(row=9, column=3, sticky=W) + downBut.grid(row=9, column=4, sticky=W) + + leftBut = Button(self, text="Left", command=self.cmd_left) + rightBut = Button(self, text="Right", command=self.cmd_right) + leftBut.grid(row=9, column=5, sticky=W) + rightBut.grid(row=9, column=6, sticky=W) +# later +# resetBut = Button(self, text="Reset", command=self.cmd_reset) +# resetBut.grid(row=8, column=7, sticky=W) + + +# panLabel = Label(self, text="Pan X Y (mm)") +# self.panXYVar = StringVar() +# panXYEnt = Entry(self, textvariable=self.panXYVar) +# panBut = Button(self, bg="orange", text="OK", command=self.cmd_pan) +# panLabel.grid(row=8, column=3, sticky=W) +# panXYEnt.grid(row=8, column=4) +# panBut.grid(row=8, column=5) +#Geant4 command entry row = 9 +# g4comLabel = Label(self, text="Geant4 command") +# self.g4commandVar = StringVar() +# commandEntry = Entry(self, textvariable=self.g4commandVar) +# comBut = Button(self, bg="orange", text="Execute", command=self.cmd_g4command) +# g4comLabel.grid(row=9, column=0, sticky=W) +# commandEntry.grid(row=9, column=1, columnspan=4, sticky=E+W) +# comBut.grid(row=9, column=5) + +#exit row = 10 + exitBut = Button(self, bg="red", text="End all", command=sys.exit) + exitBut.grid(row=0, column=6, sticky=W) + +#on Run butto do... + def cmd_beamOn(self): + materialChosen = self.materialVar.get() + water_phantom.SetMaterial(absorber[materialChosen]) + + if materialChosen == "water": + water_phantom.SetColor(0., 0.9, 1.0) + + if materialChosen == "air": + water_phantom.SetColor(0.9, 0.9, 1.0) + + if materialChosen == "lead": + water_phantom.SetColor(0.2, 0.2, 0.2) + + if materialChosen == "iron": + water_phantom.SetColor(0.7, 0.5, 0.7) + + if materialChosen == "aluminum": + water_phantom.SetColor(.7, 0.9, 1.0) + + if materialChosen == "gold": + water_phantom.SetColor(1., 0.9, .0) + + self.solid.SetZHalfLength(self.thickVar.get() * mm/2.0) +# gControlExecute("oglx.mac") #draw for each run + gApplyUICommand("/vis/viewer/flush") + + self.cmd_particle(self.particleVar.get()) + self.cmd_energy(self.energyVar.get()) +# TODO later to reflesh text + gApplyUICommand("/vis/scene/add/text 0 610 610 mm 20 0 0 " + " ") + gApplyUICommand("/vis/scene/add/text 0 610 610 mm 20 0 0 " + self.materialVar.get() + " = " + str(self.thickVar.get()) + "mm " + self.particleVar.get() + " = "+self.energyVar.get() + "MeV") + + eventNum = self.eventVar.get() + for i in range(eventNum): + gunYZpos = str(i-eventNum/2) + ". -20. cm" + gApplyUICommand("/gun/position 0. " + gunYZpos) + gRunManager.BeamOn(1) + sleep(0.01) +# self.cmd_expand() #Zoom in to the last diaplayed OGLSX +# self.cmd_shrink() + + + + def cmd_g4command(self): + gApplyUICommand(self.g4commandVar.get()) + + def cmd_particle(self, particle): + gApplyUICommand("/gun/particle " + particle) + + def cmd_setProcess(self): + for i in self.processList: + if self.processVar[i].get() == 0: + gProcessTable.SetProcessActivation(i, 0) + else: + gProcessTable.SetProcessActivation(i, 1) + + def cmd_energy(self, penergy): + gApplyUICommand("/gun/energy " + penergy + " MeV") + + + def cmd_expand(self): + gApplyUICommand("/vis/viewer/zoom 1.2") + + def cmd_up(self): + gApplyUICommand("/vis/viewer/pan " + " 0. 10. mm") + + def cmd_down(self): + gApplyUICommand("/vis/viewer/pan " + " 0. -10. mm") + + def cmd_right(self): + gApplyUICommand("/vis/viewer/pan " + " -1. 0. mm") + + def cmd_left(self): + gApplyUICommand("/vis/viewer/pan " + " 1. 0. mm") + + + def cmd_shrink(self): + gApplyUICommand("/vis/viewer/zoom 0.8") + + +# def cmd_reset(self): +# gApplyUICommand("/vis/viewer/pan " + " 0. 0. mm") + + + def __init__(self, master=None): + Frame.__init__(self, master) + self.init() + self.grid() + + +app = App() +app.mainloop() diff --git a/environments/g4py/examples/education/lesson1/README b/environments/g4py/examples/education/lesson1/README index 3cb6bc331b..3d8a1fb187 100644 --- a/environments/g4py/examples/education/lesson1/README +++ b/environments/g4py/examples/education/lesson1/README @@ -1,7 +1,21 @@ -09 March 2006 +Hajime Yoshida + +******* README of lesson1 ****** + +26 September 2006 + - Lesson1.py as before + - Lesson1withN03.py + - physics is list is taken from examples/novice/N03 + - process on/off + - Leson1Wx.py + - same as Lesson1withN03 but + - New GUI toolkit is used and the default Python isn't enough + - wxPython is necessary + + 26 May 2006 Geant4.8.1 -Hajime Yoshida + The first version of the courseware of the mass attenuation coefficient diff --git a/environments/g4py/examples/education/lesson2/Lesson2Wx.py b/environments/g4py/examples/education/lesson2/Lesson2Wx.py new file mode 100644 index 0000000000..7ff0fd8cc7 --- /dev/null +++ b/environments/g4py/examples/education/lesson2/Lesson2Wx.py @@ -0,0 +1,598 @@ +#### 2006 Sep 26, the first draft version +## Wired not yet. g4pipe control and Popen + +from Geant4 import * +import Qmaterials, NISTmaterials +import ExN03geom +import ExN03pl +import ParticleGun, MedicalBeam +import sys +from time import * +from subprocess import * +import os + +# ================================================================== +# main +# ================================================================== +# ------------------------------------------------------------------ +# randum number +# ------------------------------------------------------------------ +rand_engine= Ranlux64Engine() +HepRandom.setTheEngine(rand_engine) +HepRandom.setTheSeed(20050830L) + +# ------------------------------------------------------------------ +# setup for materials +# ------------------------------------------------------------------ + + +# NIST materials +#NISTmaterials.Construct() + +# ------------------------------------------------------------------ +# setup for geometry +# ------------------------------------------------------------------ +# normal way for constructing user geometry + +exN03geom= ExN03geom.ExN03DetectorConstruction() +gRunManager.SetUserInitialization(exN03geom) + +# 2nd way, short-cut way + +#ExN01geom.Construct() +#ExN03geom.Construct() + +# magnetic field +#exN03geom.SetMagField(0.1 * tesla) + +# ------------------------------------------------------------------ +# setup for physics list +# ------------------------------------------------------------------ +# normal way for constructing user physics list +exN03PL= ExN03pl.ExN03PhysicsList() +gRunManager.SetUserInitialization(exN03PL) + +# 2nd way, short-cut way +#ExN01pl.Construct() + + +# ------------------------------------------------------------------ +# setup for primary generator action +# ------------------------------------------------------------------ +# normal way for constructing user physics list +#pgPGA= ParticleGun.ParticleGunAction() +#gRunManager.SetUserAction(pgPGA) +#pg= pgPGA.GetParticleGun() + +# 2nd way, short-cut way +pg= ParticleGun.Construct() + +# set parameters of particle gun +pg.SetParticleByName("e-") +pg.SetParticleEnergy(50.*MeV) +pg.SetParticlePosition(G4ThreeVector(-40.,0.,0.)*cm) +pg.SetParticleMomentumDirection(G4ThreeVector(1.,0.,0.)) + +# medical beam +#beam= MedicalBeam.Construct() + +# ------------------------------------------------------------------ +# go... +# ------------------------------------------------------------------ +gRunManager.Initialize() + + +# visualization +# OGLSX, VRML and HEPREP sceneHandlers are all created with names +gApplyUICommand("/vis/sceneHandler/create OGLSX OGLSX") +gApplyUICommand("/vis/sceneHandler/create VRML2FILE VRML") +gApplyUICommand("/vis/sceneHandler/create HepRepFile HEPREP") + +# OGLSX is the default so, viewer is created and volume is drawn +gApplyUICommand("/vis/viewer/create OGLSX oglsxviewer") +gApplyUICommand("/vis/drawVolume") +gApplyUICommand("/vis/scene/add/trajectories") + +gApplyUICommand("/tracking/storeTrajectory 1") +gApplyUICommand("/vis/scene/endOfEventAction accumulate") +gApplyUICommand("/vis/scene/endOfRunAction accumulate") +gApplyUICommand("/vis/viewer/select oglsxviewer") + +# viewers VRML and Wired are tested by their envs vars +# if their envs var are set, then viewers are created and drawVolume + +global heprepViewer, heprepDir, heprepName, vrmlViewer +heprepViewer = os.environ.get("G4HEPREPFILE_VIEWER") +heprepDir = os.environ.get("G4HEPREPFILE_DIR") +heprepName = os.environ.get("G4HEPREPFILE_NAME") +if heprepViewer is not None: + gApplyUICommand("/vis/viewer/create HEPREP wired") + gApplyUICommand("/vis/drawVolume") + +# VRML viewers name is user defined +vrmlDir = os.environ.get("G4VRML_DEST_DIR") +vrmlViewer = os.environ.get("G4VRMLFILE_VIEWER") + +if vrmlViewer is not None: + gApplyUICommand("/vis/viewer/create VRML vrmlviewer") + gApplyUICommand("/vis/drawVolume") + + +# test############################################################################TESSSSSSST +gApplyUICommand("/vis/viewer/select oglsxviewer") +gApplyUICommand("/vis/scene/add/trajectories") + +gApplyUICommand("/tracking/storeTrajectory 1") +gApplyUICommand("/vis/scene/endOfEventAction accumulate") +gApplyUICommand("/vis/scene/endOfRunAction accumulate") +#test######################################################################################## + +global commandDic, commandList +commandDic = {} +commandList = [] + +def DumpTree(atree): + + ntree= atree.GetTreeEntry() + ncommand= atree.GetCommandEntry() + for i in range(1, ncommand+1): + icommand= atree.GetCommand(i) + command = str( icommand.GetCommandPath()) + commandList.append(command) + nparameter= icommand.GetParameterEntries() + pguide = "" + for j in range(0, nparameter): + iparam= icommand.GetParameter(j) + pguide = pguide + "Parameter: " + str(iparam.GetParameterName())+ " Type: " + str(iparam.GetParameterType()) + '\n' + guide = str(icommand.GetTitle()) + '\n' + pguide + commandDic[command] = guide + + for i in range(1, ntree+1): + itree= atree.GetTree(i) + DumpTree(itree) + + +root_tree= gUImanager.GetTree() +DumpTree(root_tree) + + + + +###### wxPython GUI ########## + + +import wx + + + +class ComPanel(wx.Panel): + def __init__(self, parent): + wx.Panel.__init__(self, parent, -1) + + self.g4comText = wx.TextCtrl(parent, -1, "enter Command", pos=(10,10), size=(300, 30)) + self.g4comExec = wx.Button(parent, -1, "Execute", pos=(320,10), size=(60,30)) + self.g4comExec.Bind(wx.EVT_BUTTON, self.ExecuteCommand, self.g4comExec) +# self.sizerE = wx.BoxSizer(wx.HORIZONTAL) +# self.sizerE.Add(self.g4comText) +# self.sizerE.Add(self.g4comExec) + +# self.sizerL = wx.BoxSizer(wx.HORIZONTAL) + self.comListBox = wx.ListBox(parent, -1, pos=(10,50), size=(300,200), choices=commandList, style=wx.LB_SINGLE) + self.comListBox.SetSelection(1) + self.comListBox.Bind(wx.EVT_LISTBOX, self.ShowGuide, self.comListBox) +# self.sizerL.Add(self.comListBox) + + self.guide = wx.TextCtrl(parent, -1, "guidance", pos=(320,50), size=(300, 200), style =wx.TE_MULTILINE) + self.guide.Bind(wx.EVT_LISTBOX, self.ShowGuide, self.guide) + +# self.sizerL.Add(self.guide) +# self.sizer = wx.BoxSizer(wx.VERTICAL) +# self.sizer.Add(self.sizerE) +# self.sizer.Add(self.sizerL) +# self.SetSizer(self.sizer) + + def ShowGuide(self, event): + self.guide.Clear() # how to cleat the whole text before showing the next + g4com =str(self.comListBox.GetStringSelection()) + self.guide.WriteText( commandDic[g4com]) + self.g4comText.SetValue(g4com) + + def ExecuteCommand(self, event): + gApplyUICommand(str(self.g4comText.GetValue())) + +class VisPanel(wx.Panel): + def __init__(self, parent): + wx.Panel.__init__(self, parent, -1) + + self.visZoomIn = wx.Button(parent, -1, "Zoom In", pos=(10,100), size=(80,30)) + self.visZoomOut = wx.Button(parent, -1, "Zoom out", pos=(100,100), size=(80,30)) + self.visUp = wx.Button(parent, -1, "Up", pos=(190,100), size=(80,30)) + self.visDown = wx.Button(parent, -1, "Down", pos=(270,100), size=(80,30)) + self.visLeft = wx.Button(parent, -1, "Left", pos=(360,100), size=(80,30)) + self.visRight = wx.Button(parent, -1, "Left", pos=(450,100), size=(80,30)) + + viewerList = ["OpenGL", "VRML", "Wired"] + self.viewer = wx.RadioBox(self, -1, "Viewer", pos=(10,10), + size=(210,60), choices=viewerList, majorDimension=1, style=wx.RA_SPECIFY_ROWS) + self.viewer.Bind(wx.EVT_RADIOBOX, self.ViewerSelected, self.viewer) + self.viewer.SetToolTip(wx.ToolTip("Select one")) + self.viewer.SetSelection(0) + if vrmlViewer == None: self.viewer.EnableItem(1, False) + if heprepViewer == None: self.viewer.EnableItem(2, False) +# self.sizer = wx.BoxSizer(wx.HORIZONTAL) +# self.sizer.Add((20,30)) +# self.sizer.Add(self.visZoomIn) +# self.sizer.Add(self.visZoomOut) +# self.sizer.Add(self.visUp) +# self.sizer.Add(self.visDown) +# self.sizer.Add(self.visRight) +# self.sizer.Add(self.visLeft) +# self.SetSizer(self.sizer) + +# self.visZoomIn = wx.Button(parent, -1, "Zoom In", pos=(10,70), size=(80,30)) +# self.visZoomOut = wx.Button(parent, -1, "Zoom out", pos=(100,70), size=(80,30)) +# self.visUp = wx.Button(parent, -1, "Up", pos=(10,50), size=(190,70)) +# self.visDown = wx.Button(parent, -1, "Down", pos=(100,50), size=(270,70)) +# self.visLeft = wx.Button(parent, -1, "Left", pos=(10,90), size=(360,70)) +# self.visRight = wx.Button(parent, -1, "Left", pos=(100,90), size=(450,70)) + + + + self.visZoomIn.Bind(wx.EVT_BUTTON, self.cmdExpand, self.visZoomIn) + self.visZoomOut.Bind(wx.EVT_BUTTON, self.cmdShrink, self.visZoomOut) + self.visUp.Bind(wx.EVT_BUTTON, self.cmdUp, self.visUp) + self.visDown.Bind(wx.EVT_BUTTON, self.cmdDown, self.visDown) + self.visRight.Bind(wx.EVT_BUTTON, self.cmdRight, self.visRight) + self.visLeft.Bind(wx.EVT_BUTTON, self.cmdLeft, self.visLeft) + + def cmdExpand(self, event): + gApplyUICommand("/vis/viewer/zoom 1.2") + def cmdShrink(self, event): + gApplyUICommand("/vis/viewer/zoom 0.8") + def cmdUp(self, event): + gApplyUICommand("/vis/viewer/pan " + " 0. 10. mm") + def cmdDown(self, event): + gApplyUICommand("/vis/viewer/pan " + " 0. -10. mm") + def cmdRight(self, event): + gApplyUICommand("/vis/viewer/pan " + " -10. 0. mm") + def cmdLeft(self, event): + gApplyUICommand("/vis/viewer/pan " + " 10. 0. mm") + + def ViewerSelected(self, event): + self.viewerName = event.GetString() + + if self.viewerName == "OpenGL": + gApplyUICommand("/vis/viewer/select oglsxviewer") + gApplyUICommand("/vis/scene/add/trajectories") + + gApplyUICommand("/tracking/storeTrajectory 1") + gApplyUICommand("/vis/scene/endOfEventAction accumulate") + gApplyUICommand("/vis/scene/endOfRunAction accumulate") + + if self.viewerName == "VRML": + gApplyUICommand("/vis/viewer/select vrmlviewer") + gApplyUICommand("/vis/scene/add/trajectories") + + gApplyUICommand("/tracking/storeTrajectory 1") + gApplyUICommand("/vis/scene/endOfEventAction accumulate") + gApplyUICommand("/vis/scene/endOfRunAction accumulate") + + if self.viewerName == "Wired": + + gApplyUICommand("/vis/viewer/select wired") + gApplyUICommand("/vis/scene/add/trajectories") + + gApplyUICommand("/tracking/storeTrajectory 1") + gApplyUICommand("/vis/scene/endOfEventAction accumulate") + gApplyUICommand("/vis/scene/endOfRunAction accumulate") + +# everytime wired is chosen, a new instance of wired is created +# to reuse single wired, g4pipe.poll() must be checked BEFORE the SECOND Popen +# if g4pipe.poll() == None: + g4pipe=Popen(heprepViewer+ " -file " + heprepDir+"/" +heprepName +".heprep", shell=True) + + + +# not used +class MyText(wx.StaticText): + def __init__(self, parent, Text): + wx.StaticText.__init__(self, parent, -1, Text, pos=(20,20)) + self.Bind(wx.EVT_LEFT_UP, self.ChangeColor) + + def ChangeColor(self, event): + TheColour = self.GetForegroundColour() + if TheColour == (0,0,0): + self.SetLabel("Simulation is running!") + self.SetForegroundColour("red") + else: + self.SetLabel("Click me to start a run") + self.SetForegroundColour("black") + +# to be used to choose materials and particles +# myList is a list of keys() of a dictionary +# f.e., materials are Python objects with their names as their keys +class SelectOne(wx.RadioBox): + def __init__(self, parent, myTitle, myList): + wx.RadioBox.__init__(self, parent, -1, myTitle, wx.DefaultPosition, + wx.DefaultSize, myList, 5, wx.RA_SPECIFY_ROWS) +# self.Bind(wx.EVT_RADIOBOX, self.Selected) + self.SetToolTip(wx.ToolTip("Select one")) + self.SetSelection(0) +# used only to test Bind and getValue +# def Selected(self, event): +# self.selected = event.GetString() + + +# used to %3.3f floating point number +# energy and length unit is given by unitList which must be a dictionary +# with units of Python objects and their name as their keys + +class FloatCounter(wx.Panel): + def __init__(self, parent, myTitle, unitList): + wx.Panel.__init__(self, parent, -1) + + self.sizer = wx.BoxSizer(wx.HORIZONTAL) + self.sizer.Add((10, -1)) + self.sizer.Add(wx.StaticText(parent, -1, myTitle, wx.DefaultPosition, (100, -1))) + + self.intPart = wx.SpinCtrl(parent, -1, "", wx.DefaultPosition, (60,-1)) + self.intPart.SetRange(0,999) + self.intPart.SetValue(1) + self.intPart.Bind(wx.EVT_SPINCTRL, self.SetFloat) + + self.manPart = wx.SpinCtrl(parent, -1, "", wx.DefaultPosition, (50, -1)) + self.manPart.SetRange(0,999) + self.manPart.SetValue(0) + self.manPart.Bind(wx.EVT_SPINCTRL, self.SetFloat) + + self.unitSel = wx.Choice(parent, -1, wx.DefaultPosition, (90, -1), unitList) + self.unitSel.Bind(wx.EVT_CHOICE, self.SetFloat, self.unitSel) + self.unitSel.SetSelection(2) + + self.valAndUnit = wx.TextCtrl(parent, -1, "value unset", wx.DefaultPosition, (150, -1)) + + self.sizer.Add(self.valAndUnit) + self.sizer.Add((10, -1)) + self.sizer.Add(wx.StaticText(parent, -1, " ", wx.DefaultPosition, (30, -1))) + self.sizer.Add(self.intPart) + self.sizer.Add(wx.StaticText(parent, -1, ".", wx.DefaultPosition, (10, -1))) + self.sizer.Add(self.manPart) + self.sizer.Add((5,-1)) + self.sizer.Add(self.unitSel) + self.SetSizer(self.sizer) + + def SetFloat(self, event): + self.theValueStr = str(self.intPart.GetValue()) + "." + str(self.manPart.GetValue()) + " " + self.theValue = float (self.intPart.GetValue()) + float(self.manPart.GetValue())/ 1000. + self.theUnit = self.unitSel.GetStringSelection() + theText = "%.3f" % (self.theValue) + " " + self.theUnit + self.valAndUnit.SetValue(theText) +# user may edit the Entry, so finnaly this value must be got +# but it doesn't work for length but work for energy (gApplyUIcommnd) + theTextWithStar = "%.3f" % (self.theValue) + " * " + self.theUnit + +# special class for this example to set/unset processes +class Processes(wx.Panel): + def __init__(self, parent, myTitle, myList): + wx.Panel.__init__(self, parent, -1) + self.processCheck = {} + self.sizer = wx.FlexGridSizer(rows=5) + self.sizer.AddGrowableRow(1) + for item in myList: + self.processCheck[item] = wx.CheckBox(parent, -1, item) + self.processCheck[item].SetValue(True) +# self.processCheck[item].Bind(wx.EVT_CHECKBOX, self.CheckedProcess) + self.sizer.Add(self.processCheck[item],0,wx.EXPAND) + + self.SetSizer(self.sizer) + self.SetBackgroundColour('green') + self.processState = {} + self.myList = myList + +# test only +# def CheckedProcess(self, event): +# self.processName = event.GetEventObject().GetLabel() +# self.processState = event.GetEventObject().GetValue() + + +# slider to set an integer value +# title is shown +class Adjuster(wx.Panel): + def __init__(self, parent, myTitle, minVal, maxVal, initVal): + wx.Panel.__init__(self, parent, -1) + self.sizer = wx.BoxSizer(wx.HORIZONTAL) + self.sizer.Add((10, -1)) + self.sizer.Add(wx.StaticText(parent, -1, myTitle, wx.DefaultPosition, (100, -1))) + self.slider = wx.Slider(parent, -1, initVal, minVal, maxVal, + wx.DefaultPosition, (300, -1), + wx.SL_HORIZONTAL | wx.SL_AUTOTICKS | wx.SL_LABELS) + self.slider.SetPageSize(1) + self.sizer.Add(self.slider) + self.SetSizer(self.sizer) + +# test only +# self.Bind(wx.EVT_SLIDER, self.Adjusted) + +# def Adjusted(self, event): +# print self.GetValue() + + +########################## no use now +class Counter(wx.SpinCtrl): + def __init__(self, parent, myTitle, minVal, maxVal, initVal): + wx.SpinCtrl.__init__(self, parent, -1, "", wx.DefaultPosition, wx.DefaultSize, wx.TE_RIGHT) + self.SetRange(minVal, maxVal) + self.SetValue(initVal) + self.Bind(wx.EVT_SPINCTRL, self.Adjusted) + def Adjusted(self, event): + print self.GetValue() + +############################ + +# main class to instantiate the above classes and pack them using nested sizers +g4pipe=0 + +class MyApp(wx.Frame): + def __init__(self): + wx.Frame.__init__(self, None, -1, "Geant4Py") + self.nb = wx.Notebook(self, -1, wx.DefaultPosition, wx.DefaultSize, + style= + wx.NB_TOP # | wx.NB_MULTILINE + #wx.NB_BOTTOM + #wx.NB_LEFT + #wx.NB_RIGHT + ) + self.nb.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED, self.OnPageChanged) + self.nb.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGING, self.OnPageChanging) + + panel = wx.Panel(self.nb) + self.nb.AddPage(panel, "ExampleN03") + commandPanel = wx.Panel(self.nb) + self.nb.AddPage(commandPanel, "Geant4 Commands") + comP = ComPanel(commandPanel) + gxsizer = wx.BoxSizer(wx.HORIZONTAL) + gxsizer.Add(comP) + commandPanel.SetSizer(gxsizer) + + + visualizationPanel = wx.Panel(self.nb) + self.nb.AddPage(visualizationPanel, "Vis Commands") + visP = VisPanel(visualizationPanel) + vxsizer = wx.BoxSizer(wx.HORIZONTAL) + vxsizer.Add(visP) + visualizationPanel.SetSizer(vxsizer) + +# outmost sizer in the vertical direction + bxsizer = wx.BoxSizer(wx.VERTICAL) +# nested sizer in the horizontal direction + bysizer = wx.BoxSizer(wx.HORIZONTAL) + + + self.runStart = wx.Button(panel, -1, " Run Start", wx.DefaultPosition, wx.DefaultSize) + self.Bind(wx.EVT_BUTTON, self.RunStart, self.runStart) + bxsizer.Add(self.runStart, 0, wx.ALL) +# widgets + + absorberMaterialList = ['Aluminium', 'Lead'] + self.theAbsorberMaterial = SelectOne(panel, "Absorber Materials", absorberMaterialList) + gapMaterialList = ["liquidArgon","Scintillator", "Air", "Aerogel", "Galactic"] + self.theGapMaterial = SelectOne(panel, "Gap Materials", gapMaterialList) + + particleList = ["proton", "gamma", "e-", "e+", "mu-", "mu+"] + self.theParticle = SelectOne(panel, "Particles", particleList) + + self.processList = ["phot", "compt", "conv", "msc", "eIoni", "eBrem", "annihil","muIoni", "muBrems", "hIoni"] + self.theProcesses = Processes(panel, "Processes", self.processList) + + self.eventNo = Adjuster(panel, "Number of Events", 1 , 100 , 1) + self.layerNo = Adjuster(panel, "Number of Layers", 1, 10, 10) + + self.lengthUnit = {'micrometer':micrometer, 'mm':mm, 'cm':cm, 'm':m} + self.absorberThickSpin = FloatCounter(panel, "Absorber Thickness", self.lengthUnit.keys()) + self.gapThickSpin = FloatCounter(panel, "Gap Thickness", self.lengthUnit.keys()) + self.sizeYZSpin = FloatCounter(panel, "Section Size", self.lengthUnit.keys()) + self.cutLengthSpin = FloatCounter(panel, "Cut Length", self.lengthUnit.keys()) + self.magneticUnit = {'Tesla':tesla, 'gauss':gauss, 'kilogauss':kilogauss} + self.magneticFieldSpin = FloatCounter(panel, "Magnetic Field", self.magneticUnit.keys()) + + self.energyUnit = { 'keV':keV, 'MeV':MeV, 'GeV':GeV, 'TeV':TeV, 'PeV':PeV} + self.energySpin = FloatCounter(panel, "incident beam energy", self.energyUnit.keys()) + + +# now sizers + + bxsizer.Add(wx.StaticLine(panel), 0, wx.EXPAND|wx.TOP|wx.BOTTOM, 5) + bysizer.Add((10, -1)) + bysizer.Add(self.theAbsorberMaterial, 0, wx.EXPAND, 10) + bysizer.Add((10, -1)) + bysizer.Add(self.theGapMaterial, 0, wx.EXPAND, 10) + bysizer.Add((10, -1)) + bysizer.Add(self.theParticle, 0, wx.EXPAND, 10) + bysizer.Add((10, -1)) + bysizer.Add(self.theProcesses.sizer, 0, wx.EXPAND, 10) + + bxsizer.Add(bysizer, 0, wx.EXPAND) + + bxsizer.Add(wx.StaticLine(panel), 0, wx.EXPAND|wx.TOP|wx.BOTTOM, 5) + bxsizer.Add(self.layerNo.sizer, 0, wx.EXPAND) + bxsizer.Add(self.absorberThickSpin.sizer, 0, wx.EXPAND) + bxsizer.Add(self.gapThickSpin.sizer, 0, wx.EXPAND) + bxsizer.Add(self.sizeYZSpin.sizer, 0, wx.EXPAND) + bxsizer.Add(wx.StaticLine(panel), 0, wx.EXPAND|wx.TOP|wx.BOTTOM, 5) + + bxsizer.Add(self.energySpin.sizer, 0, wx.EXPAND) + bxsizer.Add(wx.StaticLine(panel), 0, wx.EXPAND|wx.TOP|wx.BOTTOM, 5) + bxsizer.Add(self.cutLengthSpin.sizer, 0, wx.EXPAND) + bxsizer.Add(wx.StaticLine(panel), 0, wx.EXPAND|wx.TOP|wx.BOTTOM, 5) + bxsizer.Add(self.magneticFieldSpin.sizer, 0, wx.EXPAND) + + bxsizer.Add(wx.StaticLine(panel), 0, wx.EXPAND|wx.TOP|wx.BOTTOM, 5) + bxsizer.Add(self.eventNo.sizer, 0, wx.EXPAND) + +# self.solid = EZgeom.G4EzVolume.GetSold(water_phantom) +# gControlExecute("oglx.mac") + + panel.SetSizer(bxsizer) + bxsizer.Fit(self) + bxsizer.SetSizeHints(self) + def OnPageChanged(self, event): + old = event.GetOldSelection() + new = event.GetSelection() + sel = self.nb.GetSelection() + event.Skip() + + def OnPageChanging(self, event): + old = event.GetOldSelection() + new = event.GetSelection() + sel = self.nb.GetSelection() + event.Skip() + + def RunStart(self, event): + + absorberTh = self.absorberThickSpin.theValue * self.lengthUnit[self.absorberThickSpin.theUnit]/2.0 + gapTh = self.gapThickSpin.theValue * self.lengthUnit[self.gapThickSpin.theUnit]/2.0 + yzSize = self.sizeYZSpin.theValue * self.lengthUnit[self.sizeYZSpin.theUnit] + print "BUG" + cutLen = self.cutLengthSpin.theValue * self.lengthUnit[self.cutLengthSpin.theUnit] + magF = self.magneticFieldSpin.theValue * self.magneticUnit[self.magneticFieldSpin.theUnit] + + exN03geom.SetNbOfLayers(self.layerNo.slider.GetValue()) + exN03geom.SetAbsorberMaterial(str(self.theAbsorberMaterial.GetStringSelection())) + exN03geom.SetAbsorberThickness(absorberTh) + exN03geom.SetGapMaterial(str(self.theGapMaterial.GetStringSelection())) + exN03geom.SetGapThickness(gapTh) + exN03geom.SetCalorSizeYZ(yzSize) + position = -self.layerNo.slider.GetValue() * ( absorberTh + gapTh )*1.2 + + exN03geom.UpdateGeometry() + exN03PL.SetDefaultCutValue(cutLen) + exN03PL.SetCutsWithDefault() + exN03geom.SetMagField(magF) + + print "Now geometry updated" + + print position + +# gApplyUICommand("/vis/viewer/flush") +# gApplyUICommand("/vis/scene/add/text 0 610 610 mm 20 0 0 " + "wxPython") + + gApplyUICommand("/gun/particle " + str ( self.theParticle.GetStringSelection() ) ) + for i in self.processList: +# print i, self.theProcesses.processCheck[i].GetValue() + gProcessTable.SetProcessActivation(i, 1) + if self.theProcesses.processCheck[i].GetValue() != True: + gProcessTable.SetProcessActivation(i, 0) + + gApplyUICommand("/gun/energy " + str ( self.energySpin.valAndUnit.GetValue() ) ) + + eventNum = self.eventNo.slider.GetValue() + for i in range(eventNum): + pg.SetParticlePosition(G4ThreeVector(position, (i-eventNum/2)*5.*mm, 0.*cm)) + gRunManager.BeamOn(1) +# sleep(0.01) + gApplyUICommand("/vis/viewer/update") + + +app = wx.PySimpleApp(False) +MyApp().Show() +app.MainLoop() diff --git a/environments/g4py/examples/education/lesson2/README b/environments/g4py/examples/education/lesson2/README index 86f6780a4a..7bc5adc31a 100644 --- a/environments/g4py/examples/education/lesson2/README +++ b/environments/g4py/examples/education/lesson2/README @@ -1,3 +1,8 @@ +26 Sep 2006 + - added Lesson2Wx.py + New version using wxPython + functionas are identical with ExN03.py + 26 May 2006 revised 02 July 2006 Geant4.8.1 release diff --git a/environments/g4py/site-modules/EZsim/EZgeom/EzDetectorConstruction.cc b/environments/g4py/site-modules/EZsim/EZgeom/EzDetectorConstruction.cc index 3c025a905d..4feaa1db68 100644 --- a/environments/g4py/site-modules/EZsim/EZgeom/EzDetectorConstruction.cc +++ b/environments/g4py/site-modules/EZsim/EZgeom/EzDetectorConstruction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EzDetectorConstruction.cc,v 1.3 2006/06/29 15:28:43 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // EzDetectorConstruction.cc // diff --git a/environments/g4py/site-modules/EZsim/EZgeom/EzDetectorConstruction.hh b/environments/g4py/site-modules/EZsim/EZgeom/EzDetectorConstruction.hh index 909d1ee008..db0748f9bf 100644 --- a/environments/g4py/site-modules/EZsim/EZgeom/EzDetectorConstruction.hh +++ b/environments/g4py/site-modules/EZsim/EZgeom/EzDetectorConstruction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EzDetectorConstruction.hh,v 1.3 2006/06/29 15:28:46 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // EzDetectorConstruction.hh // diff --git a/environments/g4py/site-modules/EZsim/EZgeom/GNUmakefile b/environments/g4py/site-modules/EZsim/EZgeom/GNUmakefile index e7d2ba4738..f1da56dede 100644 --- a/environments/g4py/site-modules/EZsim/EZgeom/GNUmakefile +++ b/environments/g4py/site-modules/EZsim/EZgeom/GNUmakefile @@ -1,5 +1,5 @@ -# $Id: GNUmakefile,v 1.2 2006/04/25 08:58:18 kmura Exp $ -# $Name: geant4-08-01 $ +# $Id: GNUmakefile,v 1.3 2006/08/10 08:50:18 kmura Exp $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py modules # =========================================================== @@ -32,9 +32,6 @@ cleanall: PACKAGE := EZsim# MODULE := EZgeom# -# location of exposured library -G4PY_EXLIB_LIBDIR := $(Q_LIBDIR) - include $(G4PY_INSTALL)/config/g4py.gmk include $(G4PY_INSTALL)/config/module.gmk include $(G4PY_INSTALL)/config/site-install.gmk diff --git a/environments/g4py/site-modules/EZsim/EZgeom/ezgeom/G4EzVolume.cc b/environments/g4py/site-modules/EZsim/EZgeom/ezgeom/G4EzVolume.cc index 25c3f797dd..6bce187ec7 100644 --- a/environments/g4py/site-modules/EZsim/EZgeom/ezgeom/G4EzVolume.cc +++ b/environments/g4py/site-modules/EZsim/EZgeom/ezgeom/G4EzVolume.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4EzVolume.cc,v 1.3 2006/06/29 15:28:52 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // G4EzVolume.cc // diff --git a/environments/g4py/site-modules/EZsim/EZgeom/ezgeom/G4EzVolume.hh b/environments/g4py/site-modules/EZsim/EZgeom/ezgeom/G4EzVolume.hh index d3e33c4842..527f78107e 100644 --- a/environments/g4py/site-modules/EZsim/EZgeom/ezgeom/G4EzVolume.hh +++ b/environments/g4py/site-modules/EZsim/EZgeom/ezgeom/G4EzVolume.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4EzVolume.hh,v 1.3 2006/06/29 15:28:55 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // G4EzVolume.hh // diff --git a/environments/g4py/site-modules/EZsim/EZgeom/ezgeom/G4EzVoxelParameterization.cc b/environments/g4py/site-modules/EZsim/EZgeom/ezgeom/G4EzVoxelParameterization.cc index b96d77cef0..12beada621 100644 --- a/environments/g4py/site-modules/EZsim/EZgeom/ezgeom/G4EzVoxelParameterization.cc +++ b/environments/g4py/site-modules/EZsim/EZgeom/ezgeom/G4EzVoxelParameterization.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4EzVoxelParameterization.cc,v 1.3 2006/06/29 15:28:58 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // G4EzVoxelParameterization.cc // diff --git a/environments/g4py/site-modules/EZsim/EZgeom/ezgeom/G4EzVoxelParameterization.hh b/environments/g4py/site-modules/EZsim/EZgeom/ezgeom/G4EzVoxelParameterization.hh index af8d9d7e11..6c20653674 100644 --- a/environments/g4py/site-modules/EZsim/EZgeom/ezgeom/G4EzVoxelParameterization.hh +++ b/environments/g4py/site-modules/EZsim/EZgeom/ezgeom/G4EzVoxelParameterization.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4EzVoxelParameterization.hh,v 1.3 2006/06/29 15:29:01 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // G4EzVoxelParameterization.hh // diff --git a/environments/g4py/site-modules/EZsim/EZgeom/ezgeom/G4EzWorld.cc b/environments/g4py/site-modules/EZsim/EZgeom/ezgeom/G4EzWorld.cc index 7c8088c621..7235cd7e6c 100644 --- a/environments/g4py/site-modules/EZsim/EZgeom/ezgeom/G4EzWorld.cc +++ b/environments/g4py/site-modules/EZsim/EZgeom/ezgeom/G4EzWorld.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4EzWorld.cc,v 1.3 2006/06/29 15:29:04 gunter Exp $ -// $Name: geant4-08-01 $ +// $Id: G4EzWorld.cc,v 1.4 2006/08/25 05:13:16 kmura Exp $ +// $Name: geant4-08-02 $ // ==================================================================== // G4EzWorld.cc // @@ -38,7 +38,7 @@ #include "G4PVPlacement.hh" #include "G4VisAttributes.hh" #include "G4RunManager.hh" -#include "G4Version.hh" +#include "pyG4Version.hh" G4VPhysicalVolume* G4EzWorld::world= G4EzWorld::CreateWorld(); diff --git a/environments/g4py/site-modules/EZsim/EZgeom/ezgeom/G4EzWorld.hh b/environments/g4py/site-modules/EZsim/EZgeom/ezgeom/G4EzWorld.hh index 82ff657453..8235a73186 100644 --- a/environments/g4py/site-modules/EZsim/EZgeom/ezgeom/G4EzWorld.hh +++ b/environments/g4py/site-modules/EZsim/EZgeom/ezgeom/G4EzWorld.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4EzWorld.hh,v 1.3 2006/06/29 15:29:07 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // G4EzWorld.hh // diff --git a/environments/g4py/site-modules/EZsim/EZgeom/ezgeom/GNUmakefile b/environments/g4py/site-modules/EZsim/EZgeom/ezgeom/GNUmakefile index 4d74a97d6e..03a862771d 100644 --- a/environments/g4py/site-modules/EZsim/EZgeom/ezgeom/GNUmakefile +++ b/environments/g4py/site-modules/EZsim/EZgeom/ezgeom/GNUmakefile @@ -1,11 +1,11 @@ -# $Id: GNUmakefile,v 1.1 2006/04/25 09:00:01 kmura Exp $ -# $Name: geant4-08-01 $ +# $Id: GNUmakefile,v 1.2 2006/08/08 05:26:19 kmura Exp $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py site-modules # =========================================================== include ../../../../config/config.gmk -MODULE := libezgeom# +LIBRARY := libezgeom# include $(G4PY_INSTALL)/config/g4py.gmk include $(G4PY_INSTALL)/config/module.gmk @@ -13,5 +13,5 @@ include $(G4PY_INSTALL)/config/module.gmk install: @echo ... intall $(lib_name) into $(Q_LIBDIR) @if [ ! -d $(Q_LIBDIR) ]; then install -d $(Q_LIBDIR); fi - @install -m 755 $(MODULE).$(soext) $(Q_LIBDIR) + @install -m 755 $(LIBRARY).$(soext) $(Q_LIBDIR) diff --git a/environments/g4py/site-modules/EZsim/EZgeom/pyEzgeom.cc b/environments/g4py/site-modules/EZsim/EZgeom/pyEzgeom.cc index 265ccb9314..f1b1f4f28e 100644 --- a/environments/g4py/site-modules/EZsim/EZgeom/pyEzgeom.cc +++ b/environments/g4py/site-modules/EZsim/EZgeom/pyEzgeom.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyEzgeom.cc,v 1.3 2006/06/29 15:28:49 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyEZgeom.cc // diff --git a/environments/g4py/site-modules/EZsim/GNUmakefile b/environments/g4py/site-modules/EZsim/GNUmakefile index 360d6df796..f4c0bf4710 100644 --- a/environments/g4py/site-modules/EZsim/GNUmakefile +++ b/environments/g4py/site-modules/EZsim/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.2 2006/04/25 10:17:30 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py site-modules # =========================================================== diff --git a/environments/g4py/site-modules/EZsim/python/GNUmakefile b/environments/g4py/site-modules/EZsim/python/GNUmakefile index bed642ecb1..bda521f7fb 100644 --- a/environments/g4py/site-modules/EZsim/python/GNUmakefile +++ b/environments/g4py/site-modules/EZsim/python/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.3 2006/06/14 08:23:52 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py modules # =========================================================== diff --git a/environments/g4py/site-modules/GNUmakefile b/environments/g4py/site-modules/GNUmakefile index 8ad6ba47e1..0089158d35 100644 --- a/environments/g4py/site-modules/GNUmakefile +++ b/environments/g4py/site-modules/GNUmakefile @@ -1,11 +1,11 @@ -# $Id: GNUmakefile,v 1.2 2006/04/25 10:18:58 kmura Exp $ -# $Name: geant4-08-01 $ +# $Id: GNUmakefile,v 1.3 2006/07/12 01:56:23 kmura Exp $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py site-modules # =========================================================== include ../config/config.gmk -SUBDIR := geometries materials physics_lists primaries +SUBDIR := geometries materials physics_lists primaries utils SUBDIR += EZsim .PHONY: all install clean uninstall diff --git a/environments/g4py/site-modules/geometries/ExN01geom/ExN01DetectorConstruction.cc b/environments/g4py/site-modules/geometries/ExN01geom/ExN01DetectorConstruction.cc index 63da49de23..e37d5872e6 100644 --- a/environments/g4py/site-modules/geometries/ExN01geom/ExN01DetectorConstruction.cc +++ b/environments/g4py/site-modules/geometries/ExN01geom/ExN01DetectorConstruction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: ExN01DetectorConstruction.cc,v 1.4 2006/06/29 15:29:10 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // ExN01DetectorConstruction.cc // diff --git a/environments/g4py/site-modules/geometries/ExN01geom/ExN01DetectorConstruction.hh b/environments/g4py/site-modules/geometries/ExN01geom/ExN01DetectorConstruction.hh index e6987333e4..21d78ec275 100644 --- a/environments/g4py/site-modules/geometries/ExN01geom/ExN01DetectorConstruction.hh +++ b/environments/g4py/site-modules/geometries/ExN01geom/ExN01DetectorConstruction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: ExN01DetectorConstruction.hh,v 1.4 2006/06/29 15:29:12 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // ExN01DetectorConstruction.hh // diff --git a/environments/g4py/site-modules/geometries/ExN01geom/GNUmakefile b/environments/g4py/site-modules/geometries/ExN01geom/GNUmakefile index a9c8b426b2..be5e314e84 100644 --- a/environments/g4py/site-modules/geometries/ExN01geom/GNUmakefile +++ b/environments/g4py/site-modules/geometries/ExN01geom/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.2 2006/04/25 10:25:12 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py modules # =========================================================== diff --git a/environments/g4py/site-modules/geometries/ExN01geom/pyExN01geom.cc b/environments/g4py/site-modules/geometries/ExN01geom/pyExN01geom.cc index dd28dc82e4..e092a7c470 100644 --- a/environments/g4py/site-modules/geometries/ExN01geom/pyExN01geom.cc +++ b/environments/g4py/site-modules/geometries/ExN01geom/pyExN01geom.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyExN01geom.cc,v 1.4 2006/06/29 15:29:14 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyExN01geom.cc // diff --git a/environments/g4py/site-modules/geometries/ExN03geom/ExN03DetectorConstruction.cc b/environments/g4py/site-modules/geometries/ExN03geom/ExN03DetectorConstruction.cc index aa368e8113..1ef0f2245a 100644 --- a/environments/g4py/site-modules/geometries/ExN03geom/ExN03DetectorConstruction.cc +++ b/environments/g4py/site-modules/geometries/ExN03geom/ExN03DetectorConstruction.cc @@ -23,14 +23,17 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: ExN03DetectorConstruction.cc,v 1.4 2006/06/29 15:29:16 gunter Exp $ -// $Name: geant4-08-01 $ -// ==================================================================== -// ExN03DetectorConstruction.cc // -// 2005 Q -// ==================================================================== +// $Id: ExN03DetectorConstruction.cc,v 1.5 2006/12/01 02:37:01 kmura Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + #include "ExN03DetectorConstruction.hh" +#include "ExN03DetectorMessenger.hh" #include "G4Material.hh" #include "G4Box.hh" @@ -47,14 +50,8 @@ #include "G4VisAttributes.hh" #include "G4Colour.hh" +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -// ==================================================================== -// -// class description -// -// ==================================================================== - -////////////////////////////////////////////////////// ExN03DetectorConstruction::ExN03DetectorConstruction() :AbsorberMaterial(0),GapMaterial(0),defaultMaterial(0), solidWorld(0),logicWorld(0),physiWorld(0), @@ -63,7 +60,6 @@ ExN03DetectorConstruction::ExN03DetectorConstruction() solidAbsorber(0),logicAbsorber(0),physiAbsorber(0), solidGap (0),logicGap (0),physiGap (0), magField(0) -////////////////////////////////////////////////////// { // default parameter values of the calorimeter AbsorberThickness = 10.*mm; @@ -77,149 +73,150 @@ ExN03DetectorConstruction::ExN03DetectorConstruction() SetAbsorberMaterial("Lead"); SetGapMaterial("liquidArgon"); + // create commands for interactive definition of the calorimeter + detectorMessenger = new ExN03DetectorMessenger(this); } +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -/////////////////////////////////////////////////////// ExN03DetectorConstruction::~ExN03DetectorConstruction() -/////////////////////////////////////////////////////// -{ -} +{ delete detectorMessenger;} +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -///////////////////////////////////////////////////////// G4VPhysicalVolume* ExN03DetectorConstruction::Construct() -///////////////////////////////////////////////////////// { return ConstructCalorimeter(); } +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -///////////////////////////////////////////////// void ExN03DetectorConstruction::DefineMaterials() -///////////////////////////////////////////////// { - //This function illustrates the possible ways to define materials + //This function illustrates the possible ways to define materials - G4String symbol; // a=mass of a mole; - G4double a, z, density; // z=mean number of protons; - G4int iz, n; // iz=number of protons in an isotope; - // n=number of nucleons in an isotope; +G4String symbol; //a=mass of a mole; +G4double a, z, density; //z=mean number of protons; +G4int iz, n; //iz=number of protons in an isotope; + // n=number of nucleons in an isotope; - G4int ncomponents, natoms; - G4double abundance, fractionmass; - - // - // define Elements - // - G4Element* H= new G4Element("Hydrogen",symbol="H" , z= 1., a= 1.01*g/mole); - G4Element* C= new G4Element("Carbon" ,symbol="C" , z= 6., a= 12.01*g/mole); - G4Element* N= new G4Element("Nitrogen",symbol="N" , z= 7., a= 14.01*g/mole); - G4Element* O= new G4Element("Oxygen" ,symbol="O" , z= 8., a= 16.00*g/mole); - G4Element* Si= new G4Element("Silicon",symbol="Si", z= 14., a= 28.09*g/mole); - - // - // define an Element from isotopes, by relative abundance - // - G4Isotope* U5 = new G4Isotope("U235", iz=92, n=235, a=235.01*g/mole); - G4Isotope* U8 = new G4Isotope("U238", iz=92, n=238, a=238.03*g/mole); +G4int ncomponents, natoms; +G4double abundance, fractionmass; - G4Element* U = new G4Element("enriched Uranium",symbol="U",ncomponents=2); - U->AddIsotope(U5, abundance= 90.*perCent); - U->AddIsotope(U8, abundance= 10.*perCent); +// +// define Elements +// - // - // define simple materials - // - new G4Material("Aluminium", z=13., a=26.98*g/mole, density=2.700*g/cm3); - new G4Material("liquidArgon", z=18., a= 39.95*g/mole, density= 1.390*g/cm3); - new G4Material("Lead" , z=82., a= 207.19*g/mole, density= 11.35*g/cm3); - - // - // define a material from elements. case 1: chemical molecule - // - G4Material* H2O = - new G4Material("Water", density= 1.000*g/cm3, ncomponents=2); - H2O-> AddElement(H, natoms=2); - H2O-> AddElement(O, natoms=1); - // overwrite computed meanExcitationEnergy with ICRU recommended value - H2O-> GetIonisation()->SetMeanExcitationEnergy(75.0*eV); +G4Element* H = new G4Element("Hydrogen",symbol="H" , z= 1., a= 1.01*g/mole); +G4Element* C = new G4Element("Carbon" ,symbol="C" , z= 6., a= 12.01*g/mole); +G4Element* N = new G4Element("Nitrogen",symbol="N" , z= 7., a= 14.01*g/mole); +G4Element* O = new G4Element("Oxygen" ,symbol="O" , z= 8., a= 16.00*g/mole); +G4Element* Si = new G4Element("Silicon",symbol="Si" , z= 14., a= 28.09*g/mole); - G4Material* Sci = - new G4Material("Scintillator", density= 1.032*g/cm3, ncomponents=2); - Sci-> AddElement(C, natoms=9); - Sci-> AddElement(H, natoms=10); +// +// define an Element from isotopes, by relative abundance +// - G4Material* Myl = - new G4Material("Mylar", density= 1.397*g/cm3, ncomponents=3); - Myl-> AddElement(C, natoms=10); - Myl-> AddElement(H, natoms= 8); - Myl-> AddElement(O, natoms= 4); +G4Isotope* U5 = new G4Isotope("U235", iz=92, n=235, a=235.01*g/mole); +G4Isotope* U8 = new G4Isotope("U238", iz=92, n=238, a=238.03*g/mole); - G4Material* SiO2 = - new G4Material("quartz",density= 2.200*g/cm3, ncomponents=2); - SiO2-> AddElement(Si, natoms=1); - SiO2-> AddElement(O , natoms=2); +G4Element* U = new G4Element("enriched Uranium",symbol="U",ncomponents=2); +U->AddIsotope(U5, abundance= 90.*perCent); +U->AddIsotope(U8, abundance= 10.*perCent); - // - // define a material from elements. case 2: mixture by fractional mass - // +// +// define simple materials +// - G4Material* Air = - new G4Material("Air" , density= 1.290*mg/cm3, ncomponents=2); - Air-> AddElement(N, fractionmass=0.7); - Air-> AddElement(O, fractionmass=0.3); +new G4Material("Aluminium", z=13., a=26.98*g/mole, density=2.700*g/cm3); +new G4Material("liquidArgon", z=18., a= 39.95*g/mole, density= 1.390*g/cm3); +new G4Material("Lead" , z=82., a= 207.19*g/mole, density= 11.35*g/cm3); - // - // define a material from elements and/or others materials - // (mixture of mixtures) - // +// +// define a material from elements. case 1: chemical molecule +// - G4Material* Aerog = - new G4Material("Aerogel", density= 0.200*g/cm3, ncomponents=3); - Aerog-> AddMaterial(SiO2, fractionmass=62.5*perCent); - Aerog-> AddMaterial(H2O , fractionmass=37.4*perCent); - Aerog-> AddElement (C , fractionmass= 0.1*perCent); - - // - // examples of gas in non STP conditions - // +G4Material* H2O = +new G4Material("Water", density= 1.000*g/cm3, ncomponents=2); +H2O->AddElement(H, natoms=2); +H2O->AddElement(O, natoms=1); +// overwrite computed meanExcitationEnergy with ICRU recommended value +H2O->GetIonisation()->SetMeanExcitationEnergy(75.0*eV); - G4Material* CO2 = - new G4Material("CarbonicGas", density= 27.*mg/cm3, ncomponents=2, - kStateGas, 325.*kelvin, 50.*atmosphere); - CO2-> AddElement(C, natoms=1); - CO2-> AddElement(O, natoms=2); - - G4Material* steam = - new G4Material("WaterSteam", density= 0.3*mg/cm3, ncomponents=1, - kStateGas, 500.*kelvin, 2.*atmosphere); - steam-> AddMaterial(H2O, fractionmass=1.); - - // - // examples of vacuum - // - G4Material* Vacuum = - new G4Material("Galactic", z=1., a=1.01*g/mole, - density= universe_mean_density, - kStateGas, 3.e-18*pascal, 2.73*kelvin); +G4Material* Sci = +new G4Material("Scintillator", density= 1.032*g/cm3, ncomponents=2); +Sci->AddElement(C, natoms=9); +Sci->AddElement(H, natoms=10); - G4Material* beam = - new G4Material("Beam", density= 1.e-5*g/cm3, ncomponents=1, - kStateGas, STP_Temperature, 2.e-2*bar); - beam-> AddMaterial(Air, fractionmass=1.); - - G4cout << *(G4Material::GetMaterialTable()) << G4endl; +G4Material* Myl = +new G4Material("Mylar", density= 1.397*g/cm3, ncomponents=3); +Myl->AddElement(C, natoms=10); +Myl->AddElement(H, natoms= 8); +Myl->AddElement(O, natoms= 4); - //default materials of the World - defaultMaterial = Vacuum; +G4Material* SiO2 = +new G4Material("quartz",density= 2.200*g/cm3, ncomponents=2); +SiO2->AddElement(Si, natoms=1); +SiO2->AddElement(O , natoms=2); +// +// define a material from elements. case 2: mixture by fractional mass +// + +G4Material* Air = +new G4Material("Air" , density= 1.290*mg/cm3, ncomponents=2); +Air->AddElement(N, fractionmass=0.7); +Air->AddElement(O, fractionmass=0.3); + +// +// define a material from elements and/or others materials (mixture of mixtures) +// + +G4Material* Aerog = +new G4Material("Aerogel", density= 0.200*g/cm3, ncomponents=3); +Aerog->AddMaterial(SiO2, fractionmass=62.5*perCent); +Aerog->AddMaterial(H2O , fractionmass=37.4*perCent); +Aerog->AddElement (C , fractionmass= 0.1*perCent); + +// +// examples of gas in non STP conditions +// + +G4Material* CO2 = +new G4Material("CarbonicGas", density= 27.*mg/cm3, ncomponents=2, + kStateGas, 325.*kelvin, 50.*atmosphere); +CO2->AddElement(C, natoms=1); +CO2->AddElement(O, natoms=2); + +G4Material* steam = +new G4Material("WaterSteam", density= 0.3*mg/cm3, ncomponents=1, + kStateGas, 500.*kelvin, 2.*atmosphere); +steam->AddMaterial(H2O, fractionmass=1.); + +// +// examples of vacuum +// + +G4Material* Vacuum = +new G4Material("Galactic", z=1., a=1.01*g/mole,density= universe_mean_density, + kStateGas, 2.73*kelvin, 3.e-18*pascal); + +G4Material* beam = +new G4Material("Beam", density= 1.e-5*g/cm3, ncomponents=1, + kStateGas, STP_Temperature, 2.e-2*bar); +beam->AddMaterial(Air, fractionmass=1.); + +G4cout << *(G4Material::GetMaterialTable()) << G4endl; + +//default materials of the World +defaultMaterial = Vacuum; } -//////////////////////////////////////////////////////////////////// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + G4VPhysicalVolume* ExN03DetectorConstruction::ConstructCalorimeter() -//////////////////////////////////////////////////////////////////// { + // Clean old geometry, if any // G4GeometryManager::GetInstance()->OpenGeometry(); @@ -233,21 +230,20 @@ G4VPhysicalVolume* ExN03DetectorConstruction::ConstructCalorimeter() // // World // - solidWorld = - new G4Box("World", //its name - WorldSizeX/2,WorldSizeYZ/2,WorldSizeYZ/2); //its size - -logicWorld = new G4LogicalVolume(solidWorld, //its solid - defaultMaterial, //its material - "World"); //its name + solidWorld = new G4Box("World", //its name + WorldSizeX/2,WorldSizeYZ/2,WorldSizeYZ/2); //its size + + logicWorld = new G4LogicalVolume(solidWorld, //its solid + defaultMaterial, //its material + "World"); //its name - physiWorld = new G4PVPlacement(0, //no rotation - G4ThreeVector(), //at (0,0,0) - logicWorld, //its logical volume - "World", //its name - 0, //its mother volume - false, //no boolean operation - 0); //copy number + physiWorld = new G4PVPlacement(0, //no rotation + G4ThreeVector(), //at (0,0,0) + logicWorld, //its logical volume + "World", //its name + 0, //its mother volume + false, //no boolean operation + 0); //copy number // // Calorimeter @@ -256,46 +252,46 @@ logicWorld = new G4LogicalVolume(solidWorld, //its solid solidLayer=0; logicLayer=0; physiLayer=0; if (CalorThickness > 0.) - { solidCalor = new G4Box("Calorimeter", //its name - CalorThickness/2,CalorSizeYZ/2,CalorSizeYZ/2);//size - - logicCalor = new G4LogicalVolume(solidCalor, //its solid - defaultMaterial, //its material - "Calorimeter"); //its name - - physiCalor = new G4PVPlacement(0, //no rotation - G4ThreeVector(), //at (0,0,0) - logicCalor, //its logical volume - "Calorimeter", //its name - logicWorld, //its mother volume - false, //no boolean operation - 0); //copy number + { solidCalor = new G4Box("Calorimeter", //its name + CalorThickness/2,CalorSizeYZ/2,CalorSizeYZ/2);//size + + logicCalor = new G4LogicalVolume(solidCalor, //its solid + defaultMaterial, //its material + "Calorimeter"); //its name + + physiCalor = new G4PVPlacement(0, //no rotation + G4ThreeVector(), //at (0,0,0) + logicCalor, //its logical volume + "Calorimeter", //its name + logicWorld, //its mother volume + false, //no boolean operation + 0); //copy number // // Layer // - solidLayer = new G4Box("Layer", //its name - LayerThickness/2,CalorSizeYZ/2,CalorSizeYZ/2); //size - - logicLayer = new G4LogicalVolume(solidLayer, //its solid - defaultMaterial, //its material - "Layer"); //its name - if (NbOfLayers > 1) - physiLayer = new G4PVReplica("Layer", //its name - logicLayer, //its logical volume - logicCalor, //its mother - kXAxis, //axis of replication - NbOfLayers, //number of replica - LayerThickness); //witdth of replica - else - physiLayer = new G4PVPlacement(0, //no rotation - G4ThreeVector(), //at (0,0,0) - logicLayer, //its logical volume - "Layer", //its name - logicCalor, //its mother volume - false, //no boolean operation - 0); //copy number - } + solidLayer = new G4Box("Layer", //its name + LayerThickness/2,CalorSizeYZ/2,CalorSizeYZ/2); //size + + logicLayer = new G4LogicalVolume(solidLayer, //its solid + defaultMaterial, //its material + "Layer"); //its name + if (NbOfLayers > 1) + physiLayer = new G4PVReplica("Layer", //its name + logicLayer, //its logical volume + logicCalor, //its mother + kXAxis, //axis of replication + NbOfLayers, //number of replica + LayerThickness); //witdth of replica + else + physiLayer = new G4PVPlacement(0, //no rotation + G4ThreeVector(), //at (0,0,0) + logicLayer, //its logical volume + "Layer", //its name + logicCalor, //its mother volume + false, //no boolean operation + 0); //copy number + } // // Absorber @@ -303,22 +299,22 @@ logicWorld = new G4LogicalVolume(solidWorld, //its solid solidAbsorber=0; logicAbsorber=0; physiAbsorber=0; if (AbsorberThickness > 0.) - { solidAbsorber = new G4Box("Absorber", //its name - AbsorberThickness/2,CalorSizeYZ/2,CalorSizeYZ/2); - - logicAbsorber = new G4LogicalVolume(solidAbsorber, //its solid - AbsorberMaterial, //its material - AbsorberMaterial->GetName()); //name - - physiAbsorber = new G4PVPlacement(0, //no rotation - G4ThreeVector(-GapThickness/2,0.,0.), //its position - logicAbsorber, //its logical volume - AbsorberMaterial->GetName(), //its name - logicLayer, //its mother - false, //no boulean operat - 0); //copy number - - } + { solidAbsorber = new G4Box("Absorber", //its name + AbsorberThickness/2,CalorSizeYZ/2,CalorSizeYZ/2); + + logicAbsorber = new G4LogicalVolume(solidAbsorber, //its solid + AbsorberMaterial, //its material + AbsorberMaterial->GetName()); //name + + physiAbsorber = new G4PVPlacement(0, //no rotation + G4ThreeVector(-GapThickness/2,0.,0.), //its position + logicAbsorber, //its logical volume + AbsorberMaterial->GetName(), //its name + logicLayer, //its mother + false, //no boulean operat + 0); //copy number + + } // // Gap @@ -326,43 +322,64 @@ logicWorld = new G4LogicalVolume(solidWorld, //its solid solidGap=0; logicGap=0; physiGap=0; if (GapThickness > 0.) - { solidGap = new G4Box("Gap", - GapThickness/2,CalorSizeYZ/2,CalorSizeYZ/2); - - logicGap = new G4LogicalVolume(solidGap, - GapMaterial, - GapMaterial->GetName()); - - physiGap = new G4PVPlacement(0, //no rotation - G4ThreeVector(AbsorberThickness/2,0.,0.), //its position - logicGap, //its logical volume - GapMaterial->GetName(), //its name - logicLayer, //its mother - false, //no boulean operat - 0); //copy number - } - + { solidGap = new G4Box("Gap", + GapThickness/2,CalorSizeYZ/2,CalorSizeYZ/2); + + logicGap = new G4LogicalVolume(solidGap, + GapMaterial, + GapMaterial->GetName()); + + physiGap = new G4PVPlacement(0, //no rotation + G4ThreeVector(AbsorberThickness/2,0.,0.), //its position + logicGap, //its logical volume + GapMaterial->GetName(), //its name + logicLayer, //its mother + false, //no boulean operat + 0); //copy number + } + PrintCalorParameters(); // // Visualization attributes // logicWorld->SetVisAttributes (G4VisAttributes::Invisible); - + G4VisAttributes* simpleBoxVisAtt= new G4VisAttributes(G4Colour(1.0,1.0,1.0)); simpleBoxVisAtt->SetVisibility(true); logicCalor->SetVisAttributes(simpleBoxVisAtt); + + /* + // Below are vis attributes that permits someone to test / play + // with the interactive expansion / contraction geometry system of the + // vis/OpenInventor driver : + {G4VisAttributes* simpleBoxVisAtt= new G4VisAttributes(G4Colour(1.0,1.0,0.0)); + simpleBoxVisAtt->SetVisibility(true); + delete logicCalor->GetVisAttributes(); + logicCalor->SetVisAttributes(simpleBoxVisAtt);} + + {G4VisAttributes* atb= new G4VisAttributes(G4Colour(1.0,0.0,0.0)); + logicLayer->SetVisAttributes(atb);} + {G4VisAttributes* atb= new G4VisAttributes(G4Colour(0.0,1.0,0.0)); + atb->SetForceSolid(true); + logicAbsorber->SetVisAttributes(atb);} + + {//Set opacity = 0.2 then transparency = 1 - 0.2 = 0.8 + G4VisAttributes* atb= new G4VisAttributes(G4Colour(0.0,0.0,1.0,0.2)); + atb->SetForceSolid(true); + logicGap->SetVisAttributes(atb);} + */ + // //always return the physical World // return physiWorld; } +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -////////////////////////////////////////////////////// void ExN03DetectorConstruction::PrintCalorParameters() -////////////////////////////////////////////////////// { G4cout << "\n------------------------------------------------------------" << "\n---> The calorimeter is " << NbOfLayers << " layers of: [ " @@ -372,74 +389,71 @@ void ExN03DetectorConstruction::PrintCalorParameters() << "\n------------------------------------------------------------\n"; } +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//////////////////////////////////////////////////////////////////////////// void ExN03DetectorConstruction::SetAbsorberMaterial(G4String materialChoice) -//////////////////////////////////////////////////////////////////////////// { // search the material by its name G4Material* pttoMaterial = G4Material::GetMaterial(materialChoice); if (pttoMaterial) AbsorberMaterial = pttoMaterial; } +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -/////////////////////////////////////////////////////////////////////// void ExN03DetectorConstruction::SetGapMaterial(G4String materialChoice) -/////////////////////////////////////////////////////////////////////// { // search the material by its name G4Material* pttoMaterial = G4Material::GetMaterial(materialChoice); if (pttoMaterial) GapMaterial = pttoMaterial; } -////////////////////////////////////////////////////////////////// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + void ExN03DetectorConstruction::SetAbsorberThickness(G4double val) -////////////////////////////////////////////////////////////////// { // change Absorber thickness and recompute the calorimeter parameters AbsorberThickness = val; } -///////////////////////////////////////////////////////////// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + void ExN03DetectorConstruction::SetGapThickness(G4double val) -///////////////////////////////////////////////////////////// { // change Gap thickness and recompute the calorimeter parameters GapThickness = val; } -//////////////////////////////////////////////////////////// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + void ExN03DetectorConstruction::SetCalorSizeYZ(G4double val) -//////////////////////////////////////////////////////////// { // change the transverse size and recompute the calorimeter parameters CalorSizeYZ = val; } +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//////////////////////////////////////////////////////// void ExN03DetectorConstruction::SetNbOfLayers(G4int val) -//////////////////////////////////////////////////////// { NbOfLayers = val; } +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + #include "G4FieldManager.hh" #include "G4TransportationManager.hh" -//////////////////////////////////////////////////////////////// void ExN03DetectorConstruction::SetMagField(G4double fieldValue) -//////////////////////////////////////////////////////////////// { //apply a global uniform magnetic field along Z axis G4FieldManager* fieldMgr - = G4TransportationManager::GetTransportationManager()->GetFieldManager(); - + = G4TransportationManager::GetTransportationManager()->GetFieldManager(); + if(magField) delete magField; //delete the existing magn field - + if(fieldValue!=0.) // create a new one if non nul { magField = new G4UniformMagField(G4ThreeVector(0.,0.,fieldValue)); - fieldMgr->SetDetectorField(magField); + fieldMgr->SetDetectorField(magField); fieldMgr->CreateChordFinder(magField); } else { magField = 0; @@ -447,12 +461,13 @@ void ExN03DetectorConstruction::SetMagField(G4double fieldValue) } } +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + #include "G4RunManager.hh" -//////////////////////////////////////////////// void ExN03DetectorConstruction::UpdateGeometry() -//////////////////////////////////////////////// { - G4RunManager::GetRunManager()-> DefineWorldVolume(ConstructCalorimeter()); + G4RunManager::GetRunManager()->DefineWorldVolume(ConstructCalorimeter()); } +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/environments/g4py/site-modules/geometries/ExN03geom/ExN03DetectorConstruction.hh b/environments/g4py/site-modules/geometries/ExN03geom/ExN03DetectorConstruction.hh index d88bb71f7f..abdc6fc28c 100644 --- a/environments/g4py/site-modules/geometries/ExN03geom/ExN03DetectorConstruction.hh +++ b/environments/g4py/site-modules/geometries/ExN03geom/ExN03DetectorConstruction.hh @@ -23,124 +23,137 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: ExN03DetectorConstruction.hh,v 1.4 2006/06/29 15:29:18 gunter Exp $ -// $Name: geant4-08-01 $ -// ==================================================================== -// ExN03DetectorConstruction.hh // -// 2005 Q -// ==================================================================== -#ifndef EXN03_DETECTOR_CONSTRUCTION_H -#define EXN03_DETECTOR_CONSTRUCTION_H +// $Id: ExN03DetectorConstruction.hh,v 1.5 2006/12/01 02:37:01 kmura Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#ifndef ExN03DetectorConstruction_h +#define ExN03DetectorConstruction_h 1 #include "G4VUserDetectorConstruction.hh" #include "globals.hh" -// ==================================================================== -// -// class definition -// -// ==================================================================== class G4Box; class G4LogicalVolume; class G4VPhysicalVolume; class G4Material; class G4UniformMagField; +class ExN03DetectorMessenger; -class ExN03DetectorConstruction : public G4VUserDetectorConstruction { -private: - G4Material* AbsorberMaterial; - G4double AbsorberThickness; - - G4Material* GapMaterial; - G4double GapThickness; - - G4int NbOfLayers; - G4double LayerThickness; - - G4double CalorSizeYZ; - G4double CalorThickness; - - G4Material* defaultMaterial; - G4double WorldSizeYZ; - G4double WorldSizeX; - - G4Box* solidWorld; //pointer to the solid World - G4LogicalVolume* logicWorld; //pointer to the logical World - G4VPhysicalVolume* physiWorld; //pointer to the physical World - - G4Box* solidCalor; //pointer to the solid Calor - G4LogicalVolume* logicCalor; //pointer to the logical Calor - G4VPhysicalVolume* physiCalor; //pointer to the physical Calor - - G4Box* solidLayer; //pointer to the solid Layer - G4LogicalVolume* logicLayer; //pointer to the logical Layer - G4VPhysicalVolume* physiLayer; //pointer to the physical Layer - - G4Box* solidAbsorber; //pointer to the solid Absorber - G4LogicalVolume* logicAbsorber; //pointer to the logical Absorber - G4VPhysicalVolume* physiAbsorber; //pointer to the physical Absorber - - G4Box* solidGap; //pointer to the solid Gap - G4LogicalVolume* logicGap; //pointer to the logical Gap - G4VPhysicalVolume* physiGap; //pointer to the physical Gap - - G4UniformMagField* magField; //pointer to the magnetic field - - - void DefineMaterials(); - void ComputeCalorParameters(); - G4VPhysicalVolume* ConstructCalorimeter(); +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -public: - ExN03DetectorConstruction(); - ~ExN03DetectorConstruction(); - - // set/get mehtods... - void SetAbsorberMaterial (G4String); - void SetAbsorberThickness(G4double); - void SetGapMaterial (G4String); - void SetGapThickness(G4double); - void SetCalorSizeYZ(G4double); - void SetNbOfLayers (G4int); - void SetMagField(G4double); +class ExN03DetectorConstruction : public G4VUserDetectorConstruction +{ + public: - G4double GetWorldSizeX() { return WorldSizeX; } - G4double GetWorldSizeYZ() { return WorldSizeYZ; } - G4double GetCalorThickness() { return CalorThickness; } - G4double GetCalorSizeYZ() { return CalorSizeYZ; } - G4int GetNbOfLayers() { return NbOfLayers; } - G4Material* GetAbsorberMaterial() { return AbsorberMaterial; } - G4double GetAbsorberThickness() { return AbsorberThickness; } - - G4Material* GetGapMaterial() { return GapMaterial; } - G4double GetGapThickness() { return GapThickness; } - - const G4VPhysicalVolume* GetphysiWorld() { return physiWorld; } - const G4VPhysicalVolume* GetAbsorber() { return physiAbsorber; } - const G4VPhysicalVolume* GetGap() { return physiGap; } + ExN03DetectorConstruction(); + ~ExN03DetectorConstruction(); - // operations... - virtual G4VPhysicalVolume* Construct(); - void UpdateGeometry(); - void PrintCalorParameters(); + public: + + void SetAbsorberMaterial (G4String); + void SetAbsorberThickness(G4double); + void SetGapMaterial (G4String); + void SetGapThickness(G4double); + + void SetCalorSizeYZ(G4double); + void SetNbOfLayers (G4int); + + void SetMagField(G4double); + + G4VPhysicalVolume* Construct(); + + void UpdateGeometry(); + + public: + + void PrintCalorParameters(); + + G4double GetWorldSizeX() {return WorldSizeX;}; + G4double GetWorldSizeYZ() {return WorldSizeYZ;}; + + G4double GetCalorThickness() {return CalorThickness;}; + G4double GetCalorSizeYZ() {return CalorSizeYZ;}; + + G4int GetNbOfLayers() {return NbOfLayers;}; + + G4Material* GetAbsorberMaterial() {return AbsorberMaterial;}; + G4double GetAbsorberThickness() {return AbsorberThickness;}; + + G4Material* GetGapMaterial() {return GapMaterial;}; + G4double GetGapThickness() {return GapThickness;}; + + const G4VPhysicalVolume* GetphysiWorld() {return physiWorld;}; + const G4VPhysicalVolume* GetAbsorber() {return physiAbsorber;}; + const G4VPhysicalVolume* GetGap() {return physiGap;}; + + private: + + G4Material* AbsorberMaterial; + G4double AbsorberThickness; + + G4Material* GapMaterial; + G4double GapThickness; + + G4int NbOfLayers; + G4double LayerThickness; + + G4double CalorSizeYZ; + G4double CalorThickness; + + G4Material* defaultMaterial; + G4double WorldSizeYZ; + G4double WorldSizeX; + + G4Box* solidWorld; //pointer to the solid World + G4LogicalVolume* logicWorld; //pointer to the logical World + G4VPhysicalVolume* physiWorld; //pointer to the physical World + + G4Box* solidCalor; //pointer to the solid Calor + G4LogicalVolume* logicCalor; //pointer to the logical Calor + G4VPhysicalVolume* physiCalor; //pointer to the physical Calor + + G4Box* solidLayer; //pointer to the solid Layer + G4LogicalVolume* logicLayer; //pointer to the logical Layer + G4VPhysicalVolume* physiLayer; //pointer to the physical Layer + + G4Box* solidAbsorber; //pointer to the solid Absorber + G4LogicalVolume* logicAbsorber; //pointer to the logical Absorber + G4VPhysicalVolume* physiAbsorber; //pointer to the physical Absorber + + G4Box* solidGap; //pointer to the solid Gap + G4LogicalVolume* logicGap; //pointer to the logical Gap + G4VPhysicalVolume* physiGap; //pointer to the physical Gap + + G4UniformMagField* magField; //pointer to the magnetic field + + ExN03DetectorMessenger* detectorMessenger; //pointer to the Messenger + + private: + + void DefineMaterials(); + void ComputeCalorParameters(); + G4VPhysicalVolume* ConstructCalorimeter(); }; +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -// ==================================================================== -// inline functions -// ==================================================================== - -inline void ExN03DetectorConstruction::ComputeCalorParameters() +inline void ExN03DetectorConstruction::ComputeCalorParameters() { // Compute derived parameters of the calorimeter - LayerThickness = AbsorberThickness + GapThickness; - CalorThickness = NbOfLayers*LayerThickness; - - WorldSizeX = 1.2*CalorThickness; WorldSizeYZ = 1.2*CalorSizeYZ; + LayerThickness = AbsorberThickness + GapThickness; + CalorThickness = NbOfLayers*LayerThickness; + + WorldSizeX = 1.2*CalorThickness; WorldSizeYZ = 1.2*CalorSizeYZ; } +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... #endif diff --git a/environments/g4py/site-modules/geometries/ExN03geom/ExN03DetectorMessenger.cc b/environments/g4py/site-modules/geometries/ExN03geom/ExN03DetectorMessenger.cc new file mode 100644 index 0000000000..4df799e58c --- /dev/null +++ b/environments/g4py/site-modules/geometries/ExN03geom/ExN03DetectorMessenger.cc @@ -0,0 +1,150 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: ExN03DetectorMessenger.cc,v 1.1 2006/12/01 02:37:01 kmura Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#include "ExN03DetectorMessenger.hh" + +#include "ExN03DetectorConstruction.hh" +#include "G4UIdirectory.hh" +#include "G4UIcmdWithAString.hh" +#include "G4UIcmdWithAnInteger.hh" +#include "G4UIcmdWithADoubleAndUnit.hh" +#include "G4UIcmdWithoutParameter.hh" + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +ExN03DetectorMessenger::ExN03DetectorMessenger( + ExN03DetectorConstruction* ExN03Det) +:ExN03Detector(ExN03Det) +{ + N03Dir = new G4UIdirectory("/N03/"); + N03Dir->SetGuidance("UI commands of this example"); + + detDir = new G4UIdirectory("/N03/det/"); + detDir->SetGuidance("detector control"); + + AbsMaterCmd = new G4UIcmdWithAString("/N03/det/setAbsMat",this); + AbsMaterCmd->SetGuidance("Select Material of the Absorber."); + AbsMaterCmd->SetParameterName("choice",false); + AbsMaterCmd->AvailableForStates(G4State_PreInit,G4State_Idle); + + GapMaterCmd = new G4UIcmdWithAString("/N03/det/setGapMat",this); + GapMaterCmd->SetGuidance("Select Material of the Gap."); + GapMaterCmd->SetParameterName("choice",false); + GapMaterCmd->AvailableForStates(G4State_PreInit,G4State_Idle); + + AbsThickCmd = new G4UIcmdWithADoubleAndUnit("/N03/det/setAbsThick",this); + AbsThickCmd->SetGuidance("Set Thickness of the Absorber"); + AbsThickCmd->SetParameterName("Size",false); + AbsThickCmd->SetRange("Size>=0."); + AbsThickCmd->SetUnitCategory("Length"); + AbsThickCmd->AvailableForStates(G4State_PreInit,G4State_Idle); + + GapThickCmd = new G4UIcmdWithADoubleAndUnit("/N03/det/setGapThick",this); + GapThickCmd->SetGuidance("Set Thickness of the Gap"); + GapThickCmd->SetParameterName("Size",false); + GapThickCmd->SetRange("Size>=0."); + GapThickCmd->SetUnitCategory("Length"); + GapThickCmd->AvailableForStates(G4State_PreInit,G4State_Idle); + + SizeYZCmd = new G4UIcmdWithADoubleAndUnit("/N03/det/setSizeYZ",this); + SizeYZCmd->SetGuidance("Set tranverse size of the calorimeter"); + SizeYZCmd->SetParameterName("Size",false); + SizeYZCmd->SetRange("Size>0."); + SizeYZCmd->SetUnitCategory("Length"); + SizeYZCmd->AvailableForStates(G4State_PreInit,G4State_Idle); + + NbLayersCmd = new G4UIcmdWithAnInteger("/N03/det/setNbOfLayers",this); + NbLayersCmd->SetGuidance("Set number of layers."); + NbLayersCmd->SetParameterName("NbLayers",false); + NbLayersCmd->SetRange("NbLayers>0 && NbLayers<500"); + NbLayersCmd->AvailableForStates(G4State_PreInit,G4State_Idle); + + UpdateCmd = new G4UIcmdWithoutParameter("/N03/det/update",this); + UpdateCmd->SetGuidance("Update calorimeter geometry."); + UpdateCmd->SetGuidance("This command MUST be applied before \"beamOn\" "); + UpdateCmd->SetGuidance("if you changed geometrical value(s)."); + UpdateCmd->AvailableForStates(G4State_Idle); + + MagFieldCmd = new G4UIcmdWithADoubleAndUnit("/N03/det/setField",this); + MagFieldCmd->SetGuidance("Define magnetic field."); + MagFieldCmd->SetGuidance("Magnetic field will be in Z direction."); + MagFieldCmd->SetParameterName("Bz",false); + MagFieldCmd->SetUnitCategory("Magnetic flux density"); + MagFieldCmd->AvailableForStates(G4State_PreInit,G4State_Idle); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +ExN03DetectorMessenger::~ExN03DetectorMessenger() +{ + delete NbLayersCmd; + delete AbsMaterCmd; delete GapMaterCmd; + delete AbsThickCmd; delete GapThickCmd; + delete SizeYZCmd; delete UpdateCmd; + delete MagFieldCmd; + delete detDir; + delete N03Dir; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void ExN03DetectorMessenger::SetNewValue(G4UIcommand* command,G4String newValue) +{ + if( command == AbsMaterCmd ) + { ExN03Detector->SetAbsorberMaterial(newValue);} + + if( command == GapMaterCmd ) + { ExN03Detector->SetGapMaterial(newValue);} + + if( command == AbsThickCmd ) + { ExN03Detector->SetAbsorberThickness(AbsThickCmd + ->GetNewDoubleValue(newValue));} + + if( command == GapThickCmd ) + { ExN03Detector->SetGapThickness(GapThickCmd->GetNewDoubleValue(newValue));} + + if( command == SizeYZCmd ) + { ExN03Detector->SetCalorSizeYZ(SizeYZCmd->GetNewDoubleValue(newValue));} + + if( command == NbLayersCmd ) + { ExN03Detector->SetNbOfLayers(NbLayersCmd->GetNewIntValue(newValue));} + + if( command == UpdateCmd ) + { ExN03Detector->UpdateGeometry(); } + + if( command == MagFieldCmd ) + { ExN03Detector->SetMagField(MagFieldCmd->GetNewDoubleValue(newValue));} +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/environments/g4py/site-modules/geometries/ExN03geom/ExN03DetectorMessenger.hh b/environments/g4py/site-modules/geometries/ExN03geom/ExN03DetectorMessenger.hh new file mode 100644 index 0000000000..4ea7ecb8a3 --- /dev/null +++ b/environments/g4py/site-modules/geometries/ExN03geom/ExN03DetectorMessenger.hh @@ -0,0 +1,76 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: ExN03DetectorMessenger.hh,v 1.1 2006/12/01 02:37:01 kmura Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#ifndef ExN03DetectorMessenger_h +#define ExN03DetectorMessenger_h 1 + +#include "globals.hh" +#include "G4UImessenger.hh" + +class ExN03DetectorConstruction; +class G4UIdirectory; +class G4UIcmdWithAString; +class G4UIcmdWithAnInteger; +class G4UIcmdWithADoubleAndUnit; +class G4UIcmdWithoutParameter; + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +class ExN03DetectorMessenger: public G4UImessenger +{ + public: + ExN03DetectorMessenger(ExN03DetectorConstruction* ); + ~ExN03DetectorMessenger(); + + void SetNewValue(G4UIcommand*, G4String); + + private: + ExN03DetectorConstruction* ExN03Detector; + + G4UIdirectory* N03Dir; + G4UIdirectory* detDir; + G4UIcmdWithAString* AbsMaterCmd; + G4UIcmdWithAString* GapMaterCmd; + G4UIcmdWithADoubleAndUnit* AbsThickCmd; + G4UIcmdWithADoubleAndUnit* GapThickCmd; + G4UIcmdWithADoubleAndUnit* SizeYZCmd; + G4UIcmdWithAnInteger* NbLayersCmd; + G4UIcmdWithADoubleAndUnit* MagFieldCmd; + G4UIcmdWithoutParameter* UpdateCmd; +}; + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#endif + diff --git a/environments/g4py/site-modules/geometries/ExN03geom/GNUmakefile b/environments/g4py/site-modules/geometries/ExN03geom/GNUmakefile index 505367ad62..447603b3f1 100644 --- a/environments/g4py/site-modules/geometries/ExN03geom/GNUmakefile +++ b/environments/g4py/site-modules/geometries/ExN03geom/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.2 2006/04/25 10:25:12 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py modules # =========================================================== diff --git a/environments/g4py/site-modules/geometries/ExN03geom/pyExN03geom.cc b/environments/g4py/site-modules/geometries/ExN03geom/pyExN03geom.cc index 1cc4fcf0ed..677b821b0b 100644 --- a/environments/g4py/site-modules/geometries/ExN03geom/pyExN03geom.cc +++ b/environments/g4py/site-modules/geometries/ExN03geom/pyExN03geom.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyExN03geom.cc,v 1.4 2006/06/29 15:29:21 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyExN03geom.cc // diff --git a/environments/g4py/site-modules/geometries/GNUmakefile b/environments/g4py/site-modules/geometries/GNUmakefile index 491c8f178b..c81776e387 100644 --- a/environments/g4py/site-modules/geometries/GNUmakefile +++ b/environments/g4py/site-modules/geometries/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.2 2006/04/25 10:25:12 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py site-modules # =========================================================== diff --git a/environments/g4py/site-modules/geometries/Qgeom/GNUmakefile b/environments/g4py/site-modules/geometries/Qgeom/GNUmakefile index e6f059d74a..c83b6384de 100644 --- a/environments/g4py/site-modules/geometries/Qgeom/GNUmakefile +++ b/environments/g4py/site-modules/geometries/Qgeom/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.2 2006/04/25 10:25:12 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py modules # =========================================================== diff --git a/environments/g4py/site-modules/geometries/Qgeom/QDetectorConstruction.cc b/environments/g4py/site-modules/geometries/Qgeom/QDetectorConstruction.cc index b9362466c0..70d6c12910 100644 --- a/environments/g4py/site-modules/geometries/Qgeom/QDetectorConstruction.cc +++ b/environments/g4py/site-modules/geometries/Qgeom/QDetectorConstruction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: QDetectorConstruction.cc,v 1.4 2006/06/29 15:29:24 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // QDetectorConstruction.cc // diff --git a/environments/g4py/site-modules/geometries/Qgeom/QDetectorConstruction.hh b/environments/g4py/site-modules/geometries/Qgeom/QDetectorConstruction.hh index ad05203bf4..0689ce84c9 100644 --- a/environments/g4py/site-modules/geometries/Qgeom/QDetectorConstruction.hh +++ b/environments/g4py/site-modules/geometries/Qgeom/QDetectorConstruction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: QDetectorConstruction.hh,v 1.4 2006/06/29 15:29:26 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // QDetectorConstruction.hh // diff --git a/environments/g4py/site-modules/geometries/Qgeom/pyQgeom.cc b/environments/g4py/site-modules/geometries/Qgeom/pyQgeom.cc index c1075ebe84..231e193155 100644 --- a/environments/g4py/site-modules/geometries/Qgeom/pyQgeom.cc +++ b/environments/g4py/site-modules/geometries/Qgeom/pyQgeom.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyQgeom.cc,v 1.4 2006/06/29 15:29:29 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyQgeom.cc // diff --git a/environments/g4py/site-modules/materials/GNUmakefile b/environments/g4py/site-modules/materials/GNUmakefile index 824cd0773a..25be9a7bb5 100644 --- a/environments/g4py/site-modules/materials/GNUmakefile +++ b/environments/g4py/site-modules/materials/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.2 2006/04/25 10:28:34 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py site-modules # =========================================================== diff --git a/environments/g4py/site-modules/materials/NISTmaterials/GNUmakefile b/environments/g4py/site-modules/materials/NISTmaterials/GNUmakefile index 40b934936e..d94206f566 100644 --- a/environments/g4py/site-modules/materials/NISTmaterials/GNUmakefile +++ b/environments/g4py/site-modules/materials/NISTmaterials/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.2 2006/04/25 10:28:34 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py modules # =========================================================== diff --git a/environments/g4py/site-modules/materials/NISTmaterials/NISTmaterials.cc b/environments/g4py/site-modules/materials/NISTmaterials/NISTmaterials.cc index 4f999e56a1..f150b12539 100644 --- a/environments/g4py/site-modules/materials/NISTmaterials/NISTmaterials.cc +++ b/environments/g4py/site-modules/materials/NISTmaterials/NISTmaterials.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: NISTmaterials.cc,v 1.4 2006/06/29 15:29:32 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // NISTmaterials.cc // diff --git a/environments/g4py/site-modules/materials/NISTmaterials/pyNISTmaterials.cc b/environments/g4py/site-modules/materials/NISTmaterials/pyNISTmaterials.cc index 9904d460e7..1643b2587e 100644 --- a/environments/g4py/site-modules/materials/NISTmaterials/pyNISTmaterials.cc +++ b/environments/g4py/site-modules/materials/NISTmaterials/pyNISTmaterials.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyNISTmaterials.cc,v 1.4 2006/06/29 15:29:34 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyNISTmaterials.cc // diff --git a/environments/g4py/site-modules/materials/Qmaterials/GNUmakefile b/environments/g4py/site-modules/materials/Qmaterials/GNUmakefile index ab20efa791..6ece208d3e 100644 --- a/environments/g4py/site-modules/materials/Qmaterials/GNUmakefile +++ b/environments/g4py/site-modules/materials/Qmaterials/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.2 2006/04/25 10:28:36 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py modules # =========================================================== diff --git a/environments/g4py/site-modules/materials/Qmaterials/Qmaterials.cc b/environments/g4py/site-modules/materials/Qmaterials/Qmaterials.cc index 0ccfa8d86d..8be0da814d 100644 --- a/environments/g4py/site-modules/materials/Qmaterials/Qmaterials.cc +++ b/environments/g4py/site-modules/materials/Qmaterials/Qmaterials.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: Qmaterials.cc,v 1.4 2006/06/29 15:29:37 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // Qmaterials.cc // diff --git a/environments/g4py/site-modules/materials/Qmaterials/pyQmaterials.cc b/environments/g4py/site-modules/materials/Qmaterials/pyQmaterials.cc index 18daa5e9f9..f14d8cdff2 100644 --- a/environments/g4py/site-modules/materials/Qmaterials/pyQmaterials.cc +++ b/environments/g4py/site-modules/materials/Qmaterials/pyQmaterials.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyQmaterials.cc,v 1.4 2006/06/29 15:29:40 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyQmaterials.cc // diff --git a/environments/g4py/site-modules/physics_lists/EMLowEpl/GNUmakefile b/environments/g4py/site-modules/physics_lists/EMLowEpl/GNUmakefile new file mode 100644 index 0000000000..d72a85ea19 --- /dev/null +++ b/environments/g4py/site-modules/physics_lists/EMLowEpl/GNUmakefile @@ -0,0 +1,14 @@ +# $Id: GNUmakefile,v 1.1 2006/07/12 08:46:18 kmura Exp $ +# $Name: geant4-08-02 $ +# =========================================================== +# Makefile for building Geant4Py modules +# =========================================================== +include ../../../config/config.gmk + +# python module name +MODULE := EMLowEpl# + +include $(G4PY_INSTALL)/config/g4py.gmk +include $(G4PY_INSTALL)/config/module.gmk +include $(G4PY_INSTALL)/config/site-install.gmk + diff --git a/environments/g4py/site-modules/physics_lists/EMLowEpl/PhysicsListEMlowE.cc b/environments/g4py/site-modules/physics_lists/EMLowEpl/PhysicsListEMlowE.cc new file mode 100644 index 0000000000..06beadd1b9 --- /dev/null +++ b/environments/g4py/site-modules/physics_lists/EMLowEpl/PhysicsListEMlowE.cc @@ -0,0 +1,135 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: PhysicsListEMlowE.cc,v 1.1 2006/07/12 08:46:18 kmura Exp $ +// $Name: geant4-08-02 $ +// ==================================================================== +// PhysicsListEMlowE.cc +// +// 2006 Q +// ==================================================================== +#include "PhysicsListEMlowE.hh" + +#include "G4ProcessManager.hh" +#include "G4ParticleDefinition.hh" + +#include "G4Gamma.hh" +#include "G4Electron.hh" +#include "G4Positron.hh" + +#include "G4LowEnergyCompton.hh" +#include "G4LowEnergyGammaConversion.hh" +#include "G4LowEnergyPhotoElectric.hh" +#include "G4LowEnergyRayleigh.hh" +#include "G4LowEnergyIonisation.hh" +#include "G4LowEnergyBremsstrahlung.hh" +#include "G4eplusAnnihilation.hh" +#include "G4MultipleScattering.hh" + +// ==================================================================== +// +// class description +// +// ==================================================================== + +////////////////////////////////////// +PhysicsListEMlowE::PhysicsListEMlowE() +////////////////////////////////////// +{ + SetVerboseLevel(1); + defaultCutValue = 1.*mm; // default cut value (1.0mm) +} + + +/////////////////////////////////////// +PhysicsListEMlowE::~PhysicsListEMlowE() +/////////////////////////////////////// +{ +} + + +/////////////////////////////////////////// +void PhysicsListEMlowE::ConstructParticle() +/////////////////////////////////////////// +{ + G4Gamma::GammaDefinition(); + G4Electron::ElectronDefinition(); + G4Positron::PositronDefinition(); +} + + +////////////////////////////////////////// +void PhysicsListEMlowE::ConstructProcess() +////////////////////////////////////////// +{ + AddTransportation(); + + G4ProcessManager* pm; + + // ---------------------------------------------------------- + // gamma physics + // ---------------------------------------------------------- + pm= G4Gamma::Gamma()-> GetProcessManager(); + pm-> AddDiscreteProcess(new G4LowEnergyPhotoElectric); + pm-> AddDiscreteProcess(new G4LowEnergyCompton); + pm-> AddDiscreteProcess(new G4LowEnergyGammaConversion); + pm-> AddDiscreteProcess(new G4LowEnergyRayleigh); + + // ---------------------------------------------------------- + // electron physics + // ---------------------------------------------------------- + G4LowEnergyIonisation* eion= new G4LowEnergyIonisation; + G4LowEnergyBremsstrahlung* ebrems= new G4LowEnergyBremsstrahlung; + G4MultipleScattering* msc= new G4MultipleScattering; + + pm= G4Electron::Electron()-> GetProcessManager(); + pm-> AddProcess(msc, ordInActive, 1, 1); + pm-> AddProcess(eion, ordInActive, 2, 2); + pm-> AddProcess(ebrems, ordInActive, ordInActive, 3); + + // ---------------------------------------------------------- + // positron physics + // ---------------------------------------------------------- + eion= new G4LowEnergyIonisation; + ebrems= new G4LowEnergyBremsstrahlung; + msc= new G4MultipleScattering; + G4eplusAnnihilation* annihilation= new G4eplusAnnihilation; + + pm= G4Positron::Positron()-> GetProcessManager(); + pm-> AddProcess(msc, ordInActive, 1, 1); + pm-> AddProcess(eion, ordInActive, 2, 2); + pm-> AddProcess(ebrems, ordInActive, ordInActive, 3); + pm-> AddProcess(annihilation, 0, ordInActive, 4); + +} + + +///////////////////////////////// +void PhysicsListEMlowE::SetCuts() +///////////////////////////////// +{ + SetCutsWithDefault(); +} + diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02MuonSD.hh b/environments/g4py/site-modules/physics_lists/EMLowEpl/PhysicsListEMlowE.hh similarity index 72% rename from examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02MuonSD.hh rename to environments/g4py/site-modules/physics_lists/EMLowEpl/PhysicsListEMlowE.hh index e0a0691903..b5ef513231 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02MuonSD.hh +++ b/environments/g4py/site-modules/physics_lists/EMLowEpl/PhysicsListEMlowE.hh @@ -23,37 +23,38 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// $Id: PhysicsListEMlowE.hh,v 1.1 2006/07/12 08:46:18 kmura Exp $ +// $Name: geant4-08-02 $ +// ==================================================================== +// PhysicsListEMlowE.hh +// +// Physics list for electron/positron/gamma +// model: EM-lowE package +// +// 2006 Q +// ==================================================================== +#ifndef PHYSICS_LIST_EMLOWE_H +#define PHYSICS_LIST_EMLOWE_H + +#include "G4VUserPhysicsList.hh" + // ==================================================================== // -// H02MuonSD.hh -// $Id: H02MuonSD.hh,v 1.3 2006/06/29 17:13:15 gunter Exp $ +// class definition // // ==================================================================== -#ifndef H02_MUON_SD_H -#define H02_MUON_SD_H - -#include "G4VSensitiveDetector.hh" -#include "H02MuonHit.hh" -class G4Step; -class G4HCofThisEvent; -class G4TouchableHistory; - -class H02MuonSD : public G4VSensitiveDetector { -private: - H02MuonHitsCollection* hitCollection; +class PhysicsListEMlowE : public G4VUserPhysicsList { public: - H02MuonSD(G4String name); - ~H02MuonSD(); - - virtual void Initialize(G4HCofThisEvent* HCE); - virtual G4bool ProcessHits(G4Step* astep, G4TouchableHistory* ROhist); - virtual void EndOfEvent(G4HCofThisEvent* HCE); - virtual void clear(); - virtual void DrawAll(); - virtual void PrintAll(); - + PhysicsListEMlowE(); + ~PhysicsListEMlowE(); + + virtual void ConstructParticle(); + virtual void ConstructProcess(); + virtual void SetCuts(); + }; #endif + diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/G4HepMCAsciiReader.hh b/environments/g4py/site-modules/physics_lists/EMLowEpl/pyEMLowEpl.cc similarity index 64% rename from examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/G4HepMCAsciiReader.hh rename to environments/g4py/site-modules/physics_lists/EMLowEpl/pyEMLowEpl.cc index 80a124f081..d626bebdbd 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/G4HepMCAsciiReader.hh +++ b/environments/g4py/site-modules/physics_lists/EMLowEpl/pyEMLowEpl.cc @@ -23,69 +23,55 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// $Id: pyEMLowEpl.cc,v 1.2 2006/07/12 09:18:08 kmura Exp $ +// $Name: geant4-08-02 $ // ==================================================================== +// pyEMLowEpl.cc // -// G4HepMCAsciiReader.hh -// $Id: G4HepMCAsciiReader.hh,v 1.3 2006/06/29 17:07:58 gunter Exp $ +// [Qgeom] +// a site-module of Geant4Py // +// Electron/Gamma EM-lowE physics list +// +// 2005 Q // ==================================================================== -#ifndef G4_HEPMC_ASCII_READER_H -#define G4_HEPMC_ASCII_READER_H +#include +#include "G4RunManager.hh" +#include "PhysicsListEMlowE.hh" -#include -#include "G4HepMCInterface.hh" -#include +using namespace boost::python; -class G4HepMCAsciiReaderMessenger; +// ==================================================================== +// thin wrappers +// ==================================================================== +namespace pyEMLowEpl { -class G4HepMCAsciiReader : public G4HepMCInterface +PhysicsListEMlowE* Construct() { -protected: - G4String filename; - std::ifstream from; + PhysicsListEMlowE* pl= new PhysicsListEMlowE; + + G4RunManager* runMgr= G4RunManager::GetRunManager(); + runMgr-> SetUserInitialization(pl); - G4int verbose; - G4HepMCAsciiReaderMessenger* messenger; + return pl; +} - virtual HepMC::GenEvent* GenerateHepMCEvent(); - -public: - G4HepMCAsciiReader(); - ~G4HepMCAsciiReader(); - - // set/get methods - void SetFileName(G4String name); - G4String GetFileName() const; - - void SetVerboseLevel(G4int i); - G4int GetVerboseLevel() const; - - // methods... - void Initialize(); }; +using namespace pyEMLowEpl; + // ==================================================================== -// inline functions +// Expose to Python // ==================================================================== -inline void G4HepMCAsciiReader::SetFileName(G4String name) -{ - filename= name; -} +BOOST_PYTHON_MODULE(EMLowEpl) { -inline G4String G4HepMCAsciiReader::GetFileName() const -{ - return filename; -} + class_ > + ("PhysicsListEMlowE", "Electron/Gamma EM-lowE physics list") + ; -inline void G4HepMCAsciiReader::SetVerboseLevel(G4int i) -{ - verbose= i; -} + // --- + def("Construct", Construct, + return_value_policy()); -inline G4int G4HepMCAsciiReader::GetVerboseLevel() const -{ - return verbose; } - -#endif diff --git a/environments/g4py/site-modules/physics_lists/EMSTDpl/GNUmakefile b/environments/g4py/site-modules/physics_lists/EMSTDpl/GNUmakefile index 7e4dc82e80..006f19f894 100644 --- a/environments/g4py/site-modules/physics_lists/EMSTDpl/GNUmakefile +++ b/environments/g4py/site-modules/physics_lists/EMSTDpl/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.2 2006/04/25 10:31:40 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py modules # =========================================================== diff --git a/environments/g4py/site-modules/physics_lists/EMSTDpl/PhysicsListEMstd.cc b/environments/g4py/site-modules/physics_lists/EMSTDpl/PhysicsListEMstd.cc index 8b4b80c356..885b66a88b 100644 --- a/environments/g4py/site-modules/physics_lists/EMSTDpl/PhysicsListEMstd.cc +++ b/environments/g4py/site-modules/physics_lists/EMSTDpl/PhysicsListEMstd.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: PhysicsListEMstd.cc,v 1.4 2006/06/29 15:29:43 gunter Exp $ -// $Name: geant4-08-01 $ +// $Id: PhysicsListEMstd.cc,v 1.5 2006/07/11 09:55:01 kmura Exp $ +// $Name: geant4-08-02 $ // ==================================================================== // PhysicsListEMstd.cc // @@ -38,8 +38,6 @@ #include "G4Gamma.hh" #include "G4Electron.hh" #include "G4Positron.hh" -#include "G4NeutrinoE.hh" -#include "G4AntiNeutrinoE.hh" #include "G4ComptonScattering.hh" #include "G4GammaConversion.hh" diff --git a/environments/g4py/site-modules/physics_lists/EMSTDpl/PhysicsListEMstd.hh b/environments/g4py/site-modules/physics_lists/EMSTDpl/PhysicsListEMstd.hh index aea356a3ea..07f57276e6 100644 --- a/environments/g4py/site-modules/physics_lists/EMSTDpl/PhysicsListEMstd.hh +++ b/environments/g4py/site-modules/physics_lists/EMSTDpl/PhysicsListEMstd.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListEMstd.hh,v 1.4 2006/06/29 15:29:46 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // PhysicsListEMstd.hh // diff --git a/environments/g4py/site-modules/physics_lists/EMSTDpl/pyEMSTDpl.cc b/environments/g4py/site-modules/physics_lists/EMSTDpl/pyEMSTDpl.cc index e6935e82f8..e5272bc4ec 100644 --- a/environments/g4py/site-modules/physics_lists/EMSTDpl/pyEMSTDpl.cc +++ b/environments/g4py/site-modules/physics_lists/EMSTDpl/pyEMSTDpl.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyEMSTDpl.cc,v 1.4 2006/06/29 15:29:49 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyEMSTDpl.cc // diff --git a/environments/g4py/site-modules/physics_lists/ExN01pl/ExN01PhysicsList.cc b/environments/g4py/site-modules/physics_lists/ExN01pl/ExN01PhysicsList.cc index 071faed648..3b74380fd0 100644 --- a/environments/g4py/site-modules/physics_lists/ExN01pl/ExN01PhysicsList.cc +++ b/environments/g4py/site-modules/physics_lists/ExN01pl/ExN01PhysicsList.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: ExN01PhysicsList.cc,v 1.4 2006/06/29 15:29:52 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // ExN01PhysicsList.cc // diff --git a/environments/g4py/site-modules/physics_lists/ExN01pl/ExN01PhysicsList.hh b/environments/g4py/site-modules/physics_lists/ExN01pl/ExN01PhysicsList.hh index e1c0adfdf2..6781257252 100644 --- a/environments/g4py/site-modules/physics_lists/ExN01pl/ExN01PhysicsList.hh +++ b/environments/g4py/site-modules/physics_lists/ExN01pl/ExN01PhysicsList.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: ExN01PhysicsList.hh,v 1.4 2006/06/29 15:29:55 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // ExN01PhysicsList.hh // diff --git a/environments/g4py/site-modules/physics_lists/ExN01pl/GNUmakefile b/environments/g4py/site-modules/physics_lists/ExN01pl/GNUmakefile index d654b7fe30..e1f4a4b5db 100644 --- a/environments/g4py/site-modules/physics_lists/ExN01pl/GNUmakefile +++ b/environments/g4py/site-modules/physics_lists/ExN01pl/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.2 2006/04/25 10:31:40 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py modules # =========================================================== diff --git a/environments/g4py/site-modules/physics_lists/ExN01pl/pyExN01pl.cc b/environments/g4py/site-modules/physics_lists/ExN01pl/pyExN01pl.cc index 75e21e0a8d..2cacb1319c 100644 --- a/environments/g4py/site-modules/physics_lists/ExN01pl/pyExN01pl.cc +++ b/environments/g4py/site-modules/physics_lists/ExN01pl/pyExN01pl.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyExN01pl.cc,v 1.4 2006/06/29 15:29:58 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyExN01pl.cc // diff --git a/environments/g4py/site-modules/physics_lists/ExN03pl/ExN03PhysicsList.cc b/environments/g4py/site-modules/physics_lists/ExN03pl/ExN03PhysicsList.cc index bcea428470..4660f6bb0a 100644 --- a/environments/g4py/site-modules/physics_lists/ExN03pl/ExN03PhysicsList.cc +++ b/environments/g4py/site-modules/physics_lists/ExN03pl/ExN03PhysicsList.cc @@ -25,7 +25,7 @@ // // // $Id: ExN03PhysicsList.cc,v 1.4 2006/06/29 15:30:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/environments/g4py/site-modules/physics_lists/ExN03pl/ExN03PhysicsList.hh b/environments/g4py/site-modules/physics_lists/ExN03pl/ExN03PhysicsList.hh index cd77447af7..84e128ca54 100644 --- a/environments/g4py/site-modules/physics_lists/ExN03pl/ExN03PhysicsList.hh +++ b/environments/g4py/site-modules/physics_lists/ExN03pl/ExN03PhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: ExN03PhysicsList.hh,v 1.4 2006/06/29 15:30:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/environments/g4py/site-modules/physics_lists/ExN03pl/GNUmakefile b/environments/g4py/site-modules/physics_lists/ExN03pl/GNUmakefile index c8359abf1e..082a735c2c 100644 --- a/environments/g4py/site-modules/physics_lists/ExN03pl/GNUmakefile +++ b/environments/g4py/site-modules/physics_lists/ExN03pl/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.1 2006/04/25 10:32:41 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py modules # =========================================================== diff --git a/environments/g4py/site-modules/physics_lists/ExN03pl/pyExN03pl.cc b/environments/g4py/site-modules/physics_lists/ExN03pl/pyExN03pl.cc index e1fb500c47..f6045a959d 100644 --- a/environments/g4py/site-modules/physics_lists/ExN03pl/pyExN03pl.cc +++ b/environments/g4py/site-modules/physics_lists/ExN03pl/pyExN03pl.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyExN03pl.cc,v 1.3 2006/06/29 15:30:07 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyExN03pl.cc // diff --git a/environments/g4py/site-modules/physics_lists/GNUmakefile b/environments/g4py/site-modules/physics_lists/GNUmakefile index b7c274d2d9..1b6f3f619e 100644 --- a/environments/g4py/site-modules/physics_lists/GNUmakefile +++ b/environments/g4py/site-modules/physics_lists/GNUmakefile @@ -1,10 +1,10 @@ -# $Id: GNUmakefile,v 1.2 2006/04/25 10:31:40 kmura Exp $ -# $Name: geant4-08-01 $ +# $Id: GNUmakefile,v 1.3 2006/07/12 08:45:14 kmura Exp $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py site-modules # =========================================================== -SUBDIR := ExN01pl ExN03pl EMSTDpl +SUBDIR := ExN01pl ExN03pl EMSTDpl EMLowEpl #SUBDIR2 := GenericPhysicsList .PHONY: all install clean diff --git a/environments/g4py/site-modules/primaries/GNUmakefile b/environments/g4py/site-modules/primaries/GNUmakefile index d1aa64b34e..87f33dd84f 100644 --- a/environments/g4py/site-modules/primaries/GNUmakefile +++ b/environments/g4py/site-modules/primaries/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.2 2006/04/25 10:29:52 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py site-modules # =========================================================== diff --git a/environments/g4py/site-modules/primaries/MedicalBeam/GNUmakefile b/environments/g4py/site-modules/primaries/MedicalBeam/GNUmakefile index dadec5ebb1..e15b67fbfa 100644 --- a/environments/g4py/site-modules/primaries/MedicalBeam/GNUmakefile +++ b/environments/g4py/site-modules/primaries/MedicalBeam/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.2 2006/04/25 10:29:52 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py modules # =========================================================== diff --git a/environments/g4py/site-modules/primaries/MedicalBeam/MedicalBeam.cc b/environments/g4py/site-modules/primaries/MedicalBeam/MedicalBeam.cc index 9ad50a96ba..449a121501 100644 --- a/environments/g4py/site-modules/primaries/MedicalBeam/MedicalBeam.cc +++ b/environments/g4py/site-modules/primaries/MedicalBeam/MedicalBeam.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: MedicalBeam.cc,v 1.6 2006/06/29 15:30:10 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // MedicalBeam.cc // diff --git a/environments/g4py/site-modules/primaries/MedicalBeam/MedicalBeam.hh b/environments/g4py/site-modules/primaries/MedicalBeam/MedicalBeam.hh index b991a3359e..d615fec3b3 100644 --- a/environments/g4py/site-modules/primaries/MedicalBeam/MedicalBeam.hh +++ b/environments/g4py/site-modules/primaries/MedicalBeam/MedicalBeam.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: MedicalBeam.hh,v 1.4 2006/06/29 15:30:12 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // MedicalBeam.hh // diff --git a/environments/g4py/site-modules/primaries/MedicalBeam/pyMedicalBeam.cc b/environments/g4py/site-modules/primaries/MedicalBeam/pyMedicalBeam.cc index 7566a04744..e76ab936fb 100644 --- a/environments/g4py/site-modules/primaries/MedicalBeam/pyMedicalBeam.cc +++ b/environments/g4py/site-modules/primaries/MedicalBeam/pyMedicalBeam.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyMedicalBeam.cc,v 1.4 2006/06/29 15:30:14 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyMedicalBeam.cc // diff --git a/environments/g4py/site-modules/primaries/ParticleGun/GNUmakefile b/environments/g4py/site-modules/primaries/ParticleGun/GNUmakefile index 9fbd3d6d91..b5f6ac658a 100644 --- a/environments/g4py/site-modules/primaries/ParticleGun/GNUmakefile +++ b/environments/g4py/site-modules/primaries/ParticleGun/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.2 2006/04/25 10:29:52 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py modules # =========================================================== diff --git a/environments/g4py/site-modules/primaries/ParticleGun/ParticleGunAction.cc b/environments/g4py/site-modules/primaries/ParticleGun/ParticleGunAction.cc index 24f45ce58e..54233230b2 100644 --- a/environments/g4py/site-modules/primaries/ParticleGun/ParticleGunAction.cc +++ b/environments/g4py/site-modules/primaries/ParticleGun/ParticleGunAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: ParticleGunAction.cc,v 1.4 2006/06/29 15:30:16 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // ParticleGunAction.cc // diff --git a/environments/g4py/site-modules/primaries/ParticleGun/ParticleGunAction.hh b/environments/g4py/site-modules/primaries/ParticleGun/ParticleGunAction.hh index 31e05fdd8b..a8b823b6f9 100644 --- a/environments/g4py/site-modules/primaries/ParticleGun/ParticleGunAction.hh +++ b/environments/g4py/site-modules/primaries/ParticleGun/ParticleGunAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: ParticleGunAction.hh,v 1.4 2006/06/29 15:30:19 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // ParticleGunAction.hh // diff --git a/environments/g4py/site-modules/primaries/ParticleGun/pyParticleGun.cc b/environments/g4py/site-modules/primaries/ParticleGun/pyParticleGun.cc index 63738b6c5c..076529116c 100644 --- a/environments/g4py/site-modules/primaries/ParticleGun/pyParticleGun.cc +++ b/environments/g4py/site-modules/primaries/ParticleGun/pyParticleGun.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyParticleGun.cc,v 1.4 2006/06/29 15:30:21 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyParticleGun.cc // diff --git a/environments/g4py/site-modules/utils/GNUmakefile b/environments/g4py/site-modules/utils/GNUmakefile new file mode 100644 index 0000000000..40525fca86 --- /dev/null +++ b/environments/g4py/site-modules/utils/GNUmakefile @@ -0,0 +1,19 @@ +# $Id: GNUmakefile,v 1.1 2006/07/12 01:57:46 kmura Exp $ +# $Name: geant4-08-02 $ +# =========================================================== +# Makefile for building Geant4Py site-modules +# =========================================================== + +SUBDIR := MCScore + +.PHONY: all install clean cleanlib + +all: + @for dir in $(SUBDIR); do (cd $$dir && $(MAKE)); done;: + +install: + @for dir in $(SUBDIR); do (cd $$dir && $(MAKE) install); done;: + +clean: + @for dir in $(SUBDIR); do (cd $$dir && $(MAKE) clean); done;: + diff --git a/environments/g4py/site-modules/utils/MCScore/GNUmakefile b/environments/g4py/site-modules/utils/MCScore/GNUmakefile new file mode 100644 index 0000000000..7ef62dd556 --- /dev/null +++ b/environments/g4py/site-modules/utils/MCScore/GNUmakefile @@ -0,0 +1,29 @@ +# $Id: GNUmakefile,v 1.1 2006/07/12 02:01:07 kmura Exp $ +# $Name: geant4-08-02 $ +# =========================================================== +# Makefile for building Geant4Py modules +# =========================================================== +include ../../../config/config.gmk + +include $(G4PY_INSTALL)/config/g4py.gmk +include $(G4PY_INSTALL)/config/sys/$(Q_SYSTEM).gmk + +install_dir := $(Q_LIBDIR) + +pys := $(wildcard *.py) +pycs := $(patsubst %.py, %.pyc, $(pys)) +pyos := $(patsubst %.py, %.pyo, $(pys)) + +.PHONY: clean + +all: $(pycs) $(pyos) + + +install: $(pycs) $(pyos) + @echo ... intall "*.py" into $(install_dir) + @if [ ! -d $(install_dir) ]; then install -d $(install_dir); fi + @install -m 644 $(pys) $(pycs) $(pyos) $(install_dir) + +clean: + @-\rm -f $(pycs) $(pyos) + diff --git a/environments/g4py/site-modules/utils/MCScore/MCScore.py b/environments/g4py/site-modules/utils/MCScore/MCScore.py new file mode 100644 index 0000000000..c99b3a1ccb --- /dev/null +++ b/environments/g4py/site-modules/utils/MCScore/MCScore.py @@ -0,0 +1,132 @@ +# ================================================================== +""" +Python module + +This module provides classes and functions for scoring reactions + + [C] MCVertex: + [C] MCParticle: + [f] read_next_vertex(stream): + + Q, 2006 +""" +# ================================================================== +from Geant4.HEPUnit import * +import string + +# ================================================================== +# class definition +# ================================================================== + +# ------------------------------------------------------------------ +# MCParticle +# ------------------------------------------------------------------ +class MCParticle: + "MC particle" + def __init__(self, aname, aZ, aA, akE, apx, apy, apz): + self.name= aname + self.Z= aZ + self.A= aA + self.kineticE= akE + self.px= apx + self.py= apy + self.pz= apz + + def printout(self): + print "--- particle: %s, Z=%2d, A=%2d, kE=%g" % \ + (self.name, self.Z, self.A, self.kineticE/MeV) + +# ------------------------------------------------------------------ +# MCVertex +# ------------------------------------------------------------------ +class MCVertex : + "MC vertex" + + def __init__(self, ax, ay, az): + self.x= ax + self.y= ay + self.z= az + self.nparticle= 0 + self.particle_list= [] + + def append_particle(self, aparticle): + self.particle_list.append(aparticle) + self.nparticle= self.nparticle+1 + + def printout(self): + print "@@@ vertex: x=(%g,%g,%g) Nsec=%3d" % \ + (self.x/cm, self.y/cm, self.z/cm, self.nparticle) + for p in self.particle_list: + p.printout() + + def dump_vertex(self, stream): + aline= "%g %g %g %d\n" % \ + (self.x/m, self.y/m, self.z/m, self.nparticle) + stream.write(aline) + for p in self.particle_list: + aline= " %s %d %d %g %g %g %g\n" % \ + (p.name, p.Z, p.A, p.kineticE/MeV, p.px/MeV, p.py/MeV, p.pz/MeV) + stream.write(aline) + + def __del__(self): + np= len(self.particle_list) + del self.particle_list[0:np] + + +# ================================================================== +# I/O interface +# ================================================================== +# ------------------------------------------------------------------ +def read_next_vertex(stream): +# ------------------------------------------------------------------ + line= stream.readline() + if (line == "") : # EOF + return 0 + + # reading vertex + data= line.split() + x= string.atof(data[0])*m + y= string.atof(data[1])*m + z= string.atof(data[2])*m + nsec= string.atoi(data[3]) + + vertex= MCVertex(x,y,z) + + # reading particles + for p in range(0, nsec): + data= stream.readline().split() + pname= data[0] + Z= string.atoi(data[1]) + A= string.atoi(data[2]) + kE= string.atof(data[3])*MeV + px= string.atof(data[4])*MeV + py= string.atof(data[5])*MeV + pz= string.atof(data[6])*MeV + + particle= MCParticle(pname, Z, A, kE, px, py, pz) + vertex.append_particle(particle) + + return vertex + +# ================================================================== +# test +# ================================================================== +def test(): + f= open("reaction.dat") + f.seek(0) + + while(1): + vertex= read_next_vertex(f) + if(vertex==0): + break + vertex.printout() + del vertex + f.close() + print ">>> EOF" + +# ================================================================== +# main +# ================================================================== +if (__name__ == "__main__") : + test() + diff --git a/environments/g4py/site-modules/utils/MCScore/MCScoreROOTIO.py b/environments/g4py/site-modules/utils/MCScore/MCScoreROOTIO.py new file mode 100644 index 0000000000..56f13a317c --- /dev/null +++ b/environments/g4py/site-modules/utils/MCScore/MCScoreROOTIO.py @@ -0,0 +1,190 @@ +# ================================================================== +""" +Python module + +This module provides ROOT IO interface for MCScore data + + [C] MCScoreROOTIO + [f] loop_tree(tfile, analyze_vertex): + + Q, 2006 +""" +# ================================================================== +from Geant4.HEPUnit import * +from array import array +import string +import MCScore +import ROOT + +# ================================================================== +from Geant4.HEPUnit import * +import string + +# ================================================================== +# class definition +# ================================================================== +# ------------------------------------------------------------------ +# MCScoreROOTIO +# ------------------------------------------------------------------ +class MCScoreROOTIO: + "ROOT IO interface for MCScore" + def __init__(self, bsize=250): + self.maxparticle= bsize # buffer size for #particles/vertex + + # ------------------------------------------------------------------ + def define_tree(self): + "define ROOT tree" + # ------------------------------------------------------------------ + # defining tree header... + self.vtree= ROOT.TTree('vertex', 'mc vertex') + self.ptree= ROOT.TTree('particle', 'mc particle') + + # vertex... + self.a_x= array('d', [0.]); self.vtree.Branch('x', self.a_x, 'x/d') + self.a_y= array('d', [0.]); self.vtree.Branch('y', self.a_y, 'y/d') + self.a_z= array('d', [0.]); self.vtree.Branch('z', self.a_z, 'z/d') + + #global a_np, a_namelist, a_Z, a_A, a_ke, a_px, a_py, a_pz + self.a_np= array('i', [0]); self.ptree.Branch('np', self.a_np, 'np/i') + + self.a_namelist= array('c', self.maxparticle*10*['\0']) + # 10 characters/particle + self.ptree.Branch('namelist', self.a_namelist, 'namelist/C') + + self.a_Z= array('i', self.maxparticle*[0]) + self.ptree.Branch('Z', self.a_Z, 'Z[np]/I') + + self.a_A= array('i', self.maxparticle*[0]) + self.ptree.Branch('A', self.a_A, 'A[np]/i') + + self.a_ke= array('d', self.maxparticle*[0.]) + self.ptree.Branch('kE', self.a_ke, 'kE[np]/d') + + self.a_px= array('d', self.maxparticle*[0.]) + self.ptree.Branch('px', self.a_px, 'px[np]/d') + + self.a_py= array('d', self.maxparticle*[0.]) + self.ptree.Branch('py', self.a_py, 'py[np]/d') + + self.a_pz= array('d', self.maxparticle*[0.]) + self.ptree.Branch('pz', self.a_pz, 'pz[np]/d') + + # ------------------------------------------------------------------ + def fill_tree(self, vertex): + "fill vertex information to ROOT tree" + # ------------------------------------------------------------------ + def push_pname(i0, pname): # local function + n= len(pname) + for i in xrange(n): + self.a_namelist[i0+i]= pname[i] + self.a_namelist[i0+n]= ' ' + + self.a_x[0]= vertex.x + self.a_y[0]= vertex.y + self.a_z[0]= vertex.z + self.vtree.Fill() + + if(vertex.nparticle > self.maxparticle): + raise """ + *** buffer overflow in #particles/vertex. + *** please increment buffersize in MCScoreROOTIO(bsize). + """, self.maxparticle + + idx_namelist=0 + self.a_np[0]= vertex.nparticle + for ip in range(vertex.nparticle): + particle= vertex.particle_list[ip] + push_pname(idx_namelist, particle.name) + idx_namelist+= (len(particle.name)+1) + self.a_Z[ip]= particle.Z + self.a_A[ip]= particle.A + self.a_ke[ip]= particle.kineticE + self.a_px[ip]= particle.px + self.a_py[ip]= particle.py + self.a_pz[ip]= particle.pz + + self.a_namelist[idx_namelist]= '\0' + self.ptree.Fill() + +# ================================================================== +def loop_tree(tfile, analyze_vertex): + """ + loop ROOT tree in a ROOT file. + * analyze_vertex: user function : analyze_vertex(MCVertex) + """ +# ================================================================== + avtree= tfile.Get("vertex") + aptree= tfile.Get("particle") + + # reading vertex... + n_vertex= avtree.GetEntries() + for ivtx in xrange(n_vertex): + avtree.GetEntry(ivtx) + aptree.GetEntry(ivtx) + + # vertex + vertex= MCScore.MCVertex(avtree.x, avtree.y, avtree.z) + + # reading secondary particles... + nsec= aptree.np + namelist= aptree.namelist + pname= namelist.split() + for ip in xrange(nsec): + particle= MCScore.MCParticle(pname[ip], aptree.Z[ip], aptree.A[ip], + aptree.kE[ip], aptree.px[ip], + aptree.py[ip], aptree.pz[ip]) + vertex.append_particle(particle) + + analyze_vertex(vertex) + + return n_vertex + +# ================================================================== +# test +# ================================================================== +# ------------------------------------------------------------------ +def test_t2root(): +# ------------------------------------------------------------------ + g= ROOT.TFile("reaction.root", 'recreate') + + rootio= MCScoreROOTIO() + rootio.define_tree() + + f= open("reaction.dat") + f.seek(0) + + while(1): + vertex= MCScore.read_next_vertex(f) + if(vertex==0): + break + + # filling ... + rootio.fill_tree(vertex) + + del vertex + + print ">>> EOF" + f.close() + + # closing ROOT file + g.Write() + g.Close() + +# ------------------------------------------------------------------ +def test_loop(): +# ------------------------------------------------------------------ + def my_analysis(vertex): + vertex.printout() + + f= ROOT.TFile("reaction.root", 'read') + nv= loop_tree(f, my_analysis) + print "*** # of vertex= ", nv + + +# ================================================================== +# main +# ================================================================== +if (__name__ == "__main__") : + test_t2root() + test_loop() + diff --git a/environments/g4py/site-modules/utils/MCScore/reaction.dat b/environments/g4py/site-modules/utils/MCScore/reaction.dat new file mode 100644 index 0000000000..edc6e64f25 --- /dev/null +++ b/environments/g4py/site-modules/utils/MCScore/reaction.dat @@ -0,0 +1,1842 @@ +0 0 -0.0305023 38 + proton 1 1 1000 0 0 1696.04 + proton 1 1 129.268 63.2281 -276.735 -422.739 + proton 1 1 111.814 34.3858 -242.184 403.102 + proton 1 1 82.1695 -236.712 94.2294 309.895 + neutron 0 1 74.3269 110.42 -247.06 268.26 + proton 1 1 44.7926 -124.531 251.567 85.2512 + neutron 0 1 44.511 -167.561 97.6229 -219.126 + proton 1 1 21.6735 -109.453 -139.936 -97.8724 + neutron 0 1 20.6685 124.985 -151.837 -24.2931 + neutron 0 1 19.8292 180.072 41.4736 -59.2368 + neutron 0 1 17.1647 144.898 77.0015 74.9989 + proton 1 1 14.2603 86.8485 138.55 14.9869 + neutron 0 1 8.81332 -66.3887 39.6594 103.241 + neutron 0 1 8.72505 -120.6 -36.3695 24.586 + neutron 0 1 5.00497 5.93651 16.3492 -95.538 + pi0 0 0 4.70288 -5.35245 -35.4667 2.26739 + neutron 0 1 4.62225 49.0102 -63.7755 47.3061 + neutron 0 1 4.48452 -4.04534 56.6136 -72.2886 + neutron 0 1 4.4182 -8.41472 51.6727 74.7063 + neutron 0 1 4.33618 -29.8664 -13.4453 -84.2275 + neutron 0 1 4.26413 70.3882 -46.7754 29.8092 + neutron 0 1 3.93701 27.6721 76.9943 -26.8286 + neutron 0 1 2.90508 -32.7165 4.86698 66.1318 + neutron 0 1 2.7312 -27.372 -57.9427 32.1429 + neutron 0 1 1.93394 21.5104 56.0088 -6.17988 + neutron 0 1 1.14687 -7.1144 -43.8711 13.4591 + gamma 0 0 0.917356 0.279188 -0.173667 0.856409 + neutron 0 1 0.833069 -32.0686 -18.5144 -13.9629 + gamma 0 0 0.643895 -0.382244 0.169259 0.489736 + neutron 0 1 0.562189 11.9617 -20.913 21.8244 + neutron 0 1 0.48924 7.09163 1.57869 -29.4415 + neutron 0 1 0.300866 15.105 6.83708 -17.0455 + neutron 0 1 0.182086 11.2883 -13.1121 -6.54553 + neutron 0 1 0.176325 5.08395 15.104 8.79729 + gamma 0 0 0.157846 0.150406 0.0125644 -0.0462096 + alpha 2 4 3.8739 -114.48 112.613 55.7415 + alpha 2 4 2.39579 40.929 73.5402 103.84 + Yb160[0.0] 70 160 4.43207 75.8139 195.65 1129.72 +0 0 -0.0414305 27 + proton 1 1 1000 0 0 1696.04 + proton 1 1 430.313 460.692 127.735 874.137 + proton 1 1 222.668 -51.8758 -28.1707 681.134 + proton 1 1 96.9347 370.567 -210.029 -99.3302 + neutron 0 1 28.701 -189.926 7.78062 136.472 + proton 1 1 27.176 -181.127 -106.335 87.3004 + proton 1 1 11.5799 -64.529 132.284 -14.1802 + neutron 0 1 11.2564 50.4159 -33.6421 132.685 + neutron 0 1 10.3315 3.34717 139.549 5.99554 + neutron 0 1 6.91773 -5.99949 2.85351 -114.031 + neutron 0 1 3.31254 73.404 -26.0186 13.0595 + gamma 0 0 2.45819 0.13254 -2.02832 1.3824 + gamma 0 0 1.72781 -0.317077 1.03555 1.34626 + neutron 0 1 1.67011 -39.988 21.2127 -33.0475 + neutron 0 1 1.66598 40.8877 13.3526 35.8228 + gamma 0 0 1.49572 -0.70336 -0.474581 1.23176 + gamma 0 0 1.2594 -1.17736 0.313256 0.319032 + neutron 0 1 1.12877 -41.43 19.7894 3.78324 + neutron 0 1 0.825729 14.8311 -9.15606 -35.3347 + neutron 0 1 0.800743 -22.8961 18.2172 -25.4803 + neutron 0 1 0.795167 -30.7879 -20.4541 -11.3397 + gamma 0 0 0.62935 -0.107782 0.619122 -0.033952 + neutron 0 1 0.539156 20.9258 -3.69161 23.7048 + neutron 0 1 0.487198 -26.3143 7.93839 -12.6605 + neutron 0 1 0.344635 -13.1302 -8.77096 -19.96 + neutron 0 1 0.0888052 12.6351 2.12594 -1.64934 + Re178[0.0] 75 178 0.449053 -377.531 -46.0358 64.7126 +0 0 0.0137304 29 + proton 1 1 1000 0 0 1696.04 + pi0 0 0 375.32 16.1036 94.8819 482.619 + proton 1 1 237.972 299.56 272.31 582.5 + proton 1 1 27.2745 -206.634 -43.5755 85.6114 + proton 1 1 15.4573 21.7815 -111.35 -127.953 + neutron 0 1 10.7386 49.8314 1.65693 133.449 + proton 1 1 7.99409 -41.4639 -107.006 43.5384 + neutron 0 1 7.33562 -46.6519 -106.987 -14.6882 + neutron 0 1 5.37089 20.6709 0.372525 -98.4583 + neutron 0 1 5.24916 91.9101 28.0406 25.6452 + neutron 0 1 4.29006 -89.1402 -11.5712 0.347478 + neutron 0 1 4.20598 49.9591 17.5451 71.537 + neutron 0 1 4.10522 74.2517 39.7345 25.2775 + neutron 0 1 2.97932 -47.9919 40.1956 41.0915 + neutron 0 1 2.58721 -12.0844 66.3424 -17.9179 + neutron 0 1 2.4495 13.944 -34.9591 56.5009 + gamma 0 0 2.21931 -1.3602 -0.114166 -1.7499 + neutron 0 1 2.00405 -28.3684 53.9038 7.71419 + neutron 0 1 1.83414 39.9355 -33.4969 27.0754 + neutron 0 1 1.68767 29.4276 -10.1823 -46.9525 + gamma 0 0 1.66925 0.865172 1.27067 0.650592 + gamma 0 0 1.21644 0.985299 -0.121476 -0.702957 + neutron 0 1 1.14211 -38.6415 7.7864 24.3656 + gamma 0 0 0.80498 -0.352971 -0.694617 0.202266 + neutron 0 1 0.648926 15.3145 -23.766 -20.5056 + gamma 0 0 0.185356 0.170901 0.0612552 -0.0373822 + gamma 0 0 0.111191 0.0991238 -0.00678745 -0.0499174 + neutron 0 1 0.080779 9.87314 -1.11166 7.28603 + Os178[0.0] 76 178 0.713393 -221.995 -139.16 409.641 +0.00135391 -0.00702061 0.0354987 40 + proton 1 1 999.963 31.6597 -164.169 1687.73 + neutron 0 1 128.463 -326.916 -105.999 373.888 + neutron 0 1 78.283 98.6729 -378.353 18.5776 + neutron 0 1 62.8393 -339.742 -15.262 -79.8399 + neutron 0 1 48.5852 297.396 -4.14148 72.088 + pi0 0 0 46.1365 -79.9301 -23.0658 -87.5352 + proton 1 1 36.6064 -26.147 79.5878 251.029 + proton 1 1 28.0541 -122.356 -13.514 195.648 + neutron 0 1 27.9402 -229.321 -1.54266 -26.3318 + neutron 0 1 18.1933 26.3762 58.2524 -174.441 + neutron 0 1 17.5209 -178.907 25.7852 -23.6327 + neutron 0 1 15.8987 172.951 -14.5004 -2.47505 + proton 1 1 13.8158 107.516 79.6217 90.651 + proton 1 1 11.0929 134.547 -51.8965 -11.9696 + neutron 0 1 8.87635 -29.8733 76.7107 99.9083 + neutron 0 1 6.8636 -33.7157 -61.1989 89.7923 + neutron 0 1 6.52619 -70.7113 53.0923 66.9871 + neutron 0 1 6.30204 -15.2451 -45.3499 -97.9442 + neutron 0 1 5.47428 -65.487 -75.3991 -18.5277 + neutron 0 1 5.06741 8.46403 59.0701 77.3764 + neutron 0 1 4.38308 -48.7097 -55.8302 52.5922 + neutron 0 1 3.30057 39.8806 64.5173 -21.4509 + neutron 0 1 2.89532 0.187221 70.9393 -20.4117 + neutron 0 1 2.87371 -68.9515 16.6387 19.4209 + neutron 0 1 2.33978 -38.8737 -0.641931 -53.7648 + neutron 0 1 2.25958 -45.5363 44.1507 15.1103 + proton 1 1 2.15462 41.007 -33.7247 35.0564 + neutron 0 1 1.71017 8.57055 -26.6898 49.3027 + gamma 0 0 1.47882 -0.935624 -0.8663 0.749033 + neutron 0 1 1.35078 27.2873 -9.59266 41.2735 + gamma 0 0 1.30673 1.30569 0.041371 -0.0314311 + neutron 0 1 1.1184 42.8773 7.62906 -14.3601 + gamma 0 0 0.835305 0.308833 0.417564 0.654215 + neutron 0 1 0.65755 -30.6393 14.6345 9.11689 + neutron 0 1 0.467727 -6.32551 -7.57318 -27.9602 + gamma 0 0 0.379497 -0.315466 0.167079 -0.12878 + neutron 0 1 0.191734 8.99574 14.0381 -9.07407 + deuteron 1 2 0.507704 -23.2628 -28.2547 -23.7756 + alpha 2 4 16.7499 -11.4916 46.4755 -350.508 + Hf161[0.0] 72 161 6.78888 808.714 77.4594 1172.68 +-0.00163755 -0.000756256 0.0334764 33 + proton 1 1 999.997 -34.1538 -19.0016 1695.58 + pi+ 1 0 486.487 -259.173 273.918 479.861 + neutron 0 1 72.0535 249.897 -82.284 267.152 + proton 1 1 16.0872 -56.2283 98.1551 132.857 + neutron 0 1 15.2527 135.61 -102.345 -5.46558 + neutron 0 1 10.5771 137.254 30.3542 -15.0849 + neutron 0 1 9.13129 1.06112 -84.1648 100.784 + neutron 0 1 7.37985 -85.1761 69.5671 -42.7507 + neutron 0 1 6.90285 9.7081 0.305195 -113.687 + neutron 0 1 6.30553 -27.6887 95.097 45.5913 + neutron 0 1 6.15617 -20.3296 -18.8435 104.105 + neutron 0 1 5.94086 -18.5245 -25.1564 101.109 + neutron 0 1 5.67959 8.89711 -100.769 21.7112 + neutron 0 1 5.66523 -25.9014 18.5439 98.3008 + neutron 0 1 5.60256 46.2258 -9.90915 -91.2377 + neutron 0 1 5.04722 -10.4482 -64.8291 -72.0964 + neutron 0 1 4.46668 65.1524 45.4704 45.8369 + neutron 0 1 4.14363 -56.5061 -67.1912 9.79842 + neutron 0 1 3.77434 51.2354 -49.6569 -44.8982 + neutron 0 1 3.38761 -21.2226 68.0027 -36.0897 + neutron 0 1 2.47239 40.9204 -52.2691 15.6696 + gamma 0 0 2.11587 -0.74022 0.349491 1.95111 + neutron 0 1 1.97753 31.8607 36.0281 -37.5076 + gamma 0 0 1.25071 0.608326 0.497684 0.972896 + gamma 0 0 0.831477 0.436272 -0.094289 0.70152 + gamma 0 0 0.756609 -0.50435 0.50359 0.253941 + gamma 0 0 0.420739 -0.412424 0.0741764 -0.0377647 + gamma 0 0 0.37844 -0.192928 -0.307849 0.105944 + neutron 0 1 0.327118 11.2105 -8.49943 20.4179 + gamma 0 0 0.239672 0.14148 0.107635 0.16075 + neutron 0 1 0.10021 3.41853 2.85435 12.9802 + alpha 2 4 2.1136 -29.6467 38.1687 -115.867 + Os172[0.0] 76 172 2.2462 -215.099 -130.679 809.988 +0 0 -0.0203515 32 + proton 1 1 1000 0 0 1696.04 + proton 1 1 268.845 449.941 -465.101 397.505 + proton 1 1 95.5122 -414.665 -121.41 40.8388 + neutron 0 1 81.122 -107.543 -217.131 316.715 + proton 1 1 71.6025 166.49 -38.048 332.153 + proton 1 1 64.3589 -107.31 216.925 257.57 + proton 1 1 60.4916 223.35 61.2405 252.069 + neutron 0 1 45.3978 -140.421 109.132 -236.097 + neutron 0 1 25.3327 45.7169 -214.611 -9.8537 + proton 1 1 22.4741 2.24056 -194.684 69.0802 + neutron 0 1 10.3341 33.5682 -124.812 53.1137 + neutron 0 1 8.65003 85.2646 -95.0151 5.60621 + neutron 0 1 8.31007 -12.7549 -36.5648 119.101 + neutron 0 1 8.07827 -106.441 0.620053 62.5723 + neutron 0 1 6.56177 -96.8161 -54.239 -7.63306 + neutron 0 1 6.10938 4.35927 91.5879 55.7702 + neutron 0 1 4.94328 66.868 9.27546 68.9647 + neutron 0 1 4.21448 -31.1466 -76.4044 33.6093 + neutron 0 1 3.54667 -35.621 64.1783 -35.91 + gamma 0 0 3.14129 -2.2987 0.576096 -2.062 + neutron 0 1 2.22437 6.49008 -63.0128 13.1183 + neutron 0 1 1.86527 -3.03393 58.0744 -11.2572 + neutron 0 1 0.799211 -11.0824 36.8501 4.65939 + neutron 0 1 0.767088 19.8639 -28.3916 -15.5366 + gamma 0 0 0.756483 -0.322803 -0.669528 -0.140698 + neutron 0 1 0.674893 -32.5124 -0.661824 14.5317 + neutron 0 1 0.51384 -15.3158 3.25853 26.8448 + neutron 0 1 0.458241 -19.6158 -16.5522 14.232 + neutron 0 1 0.222935 12.3447 13.733 -8.83102 + neutron 0 1 0.16529 -13.8712 -8.62285 -6.62313 + gamma 0 0 0.111394 0.0579524 0.0882334 -0.0355656 + W171[0.0] 74 171 3.77446 34.2175 1090.4 -108.037 +0 0 0.0121258 40 + proton 1 1 1000 0 0 1696.04 + proton 1 1 247.878 -345.406 356.486 529.349 + neutron 0 1 82.0244 72.8112 -222.938 325.361 + proton 1 1 78.9377 133.896 -39.2953 -367.272 + neutron 0 1 70.3247 -302.676 111.57 181.754 + proton 1 1 54.332 -311.883 -72.5492 48.7229 + neutron 0 1 40.2193 -194.501 -192.378 -48.531 + neutron 0 1 23.4728 206.703 34.142 -27.7056 + neutron 0 1 22.6246 -45.4347 150.357 135.48 + neutron 0 1 18.3625 34.2388 166.628 -76.847 + neutron 0 1 18.305 108.134 -121.708 -90.7018 + proton 1 1 16.1053 112.977 102.117 85.3824 + proton 1 1 13.7549 -21.376 -34.7101 156.01 + neutron 0 1 12.7379 -63.0411 92.4069 107.635 + neutron 0 1 10.8797 59.7578 -104.964 77.293 + neutron 0 1 9.05671 -89.85 -1.21229 95.0067 + neutron 0 1 6.22837 82.7297 26.0846 64.9469 + neutron 0 1 5.59348 64.2011 62.4248 50.2348 + neutron 0 1 5.45178 65.8184 33.5883 69.3837 + neutron 0 1 4.79177 -54.6573 60.2782 -49.0556 + neutron 0 1 4.51501 -49.1752 65.407 42.5253 + neutron 0 1 4.38322 37.8995 5.29383 82.4104 + neutron 0 1 3.62314 12.7078 80.7525 -11.7907 + proton 1 1 3.32888 -31.2236 -8.79364 -72.1501 + neutron 0 1 2.66629 33.5545 -50.5271 36.5859 + neutron 0 1 2.43237 -53.0857 -19.5891 37.0788 + gamma 0 0 2.10076 1.75116 -0.490854 -1.05152 + gamma 0 0 1.6264 -0.710273 -0.227909 -1.44525 + gamma 0 0 1.56994 0.512778 -0.810091 -1.24319 + gamma 0 0 1.33113 -0.316479 -1.28587 -0.135248 + neutron 0 1 0.968281 18.2085 -36.2716 -13.164 + neutron 0 1 0.79996 26.9992 -14.117 23.9922 + neutron 0 1 0.594598 -3.67941 29.3798 15.5232 + gamma 0 0 0.444307 0.351399 -0.0834007 -0.258789 + gamma 0 0 0.39268 0.25319 -0.299968 0.0105509 + neutron 0 1 0.0488556 2.95668 -7.93859 4.47721 + alpha 2 4 0.589452 -7.65497 -53.6039 -38.2444 + deuteron 1 2 1.97403 6.21242 77.0241 -37.9161 + deuteron 1 2 0.0734221 -15.1024 -6.49413 -2.27441 + Yb161[0.0] 70 161 2.02352 507.099 -463.654 366.66 +0 0 0.0326312 6 + proton 1 1 1000 0 0 1696.04 + neutron 0 1 614.196 -667.103 88.8057 1038.5 + proton 1 1 369.711 676.64 -187.141 581.035 + gamma 0 0 0.99598 0.226343 0.564437 0.788769 + neutron 0 1 0.208848 -7.62567 -6.55389 17.0702 + Au195[0.0] 79 195 0.0394541 -2.13538 104.324 58.6443 +0 0 -0.0496447 23 + proton 1 1 1000 0 0 1696.04 + neutron 0 1 501.696 -633.095 52.7984 889.3 + neutron 0 1 131.814 137.561 409.46 280.161 + neutron 0 1 98.3359 -17.7252 -415.387 -146.954 + proton 1 1 48.8339 242.233 -117.686 146.618 + neutron 0 1 37.3357 214.734 11.0134 159.124 + neutron 0 1 6.67105 70.8053 -85.4504 -16.2821 + neutron 0 1 5.23053 18.9688 8.76373 -97.0546 + neutron 0 1 4.11501 -49.6551 -72.6474 -2.51009 + neutron 0 1 3.11687 17.5502 -19.4726 -71.969 + neutron 0 1 2.59323 -61.1317 33.8013 0.352055 + proton 1 1 2.31383 34.2741 -25.6483 50.1478 + neutron 0 1 1.76351 52.4441 15.6818 -17.9071 + neutron 0 1 1.35406 43.6426 18.0308 -17.7906 + neutron 0 1 1.15083 -1.34473 24.3595 39.6066 + neutron 0 1 0.782915 -23.7162 -13.0148 27.2024 + neutron 0 1 0.767871 31.6893 11.422 17.5739 + neutron 0 1 0.72959 -36.9167 -2.02643 -2.14002 + gamma 0 0 0.681846 -0.339163 -0.481692 -0.343302 + gamma 0 0 0.572155 0.248476 0.231396 0.460518 + neutron 0 1 0.457795 -8.40569 -3.32 -27.9068 + deuteron 1 2 6.47685 -62.4645 -101.112 101.058 + Ir178[0.0] 77 178 0.671751 30.6426 270.686 385.292 +0 0 -0.0443798 20 + proton 1 1 1000 0 0 1696.04 + neutron 0 1 380.748 -384.838 -442.484 718.716 + neutron 0 1 175.673 475.417 -97.1996 354.266 + proton 1 1 139.475 -164.127 76.7665 498.351 + neutron 0 1 28.9198 -59.75 211.721 82.3689 + neutron 0 1 14.7796 133.273 -91.2448 43.6339 + pi0 0 0 12.7887 4.24767 -39.2528 -45.355 + gamma 0 0 2.86286 -0.916605 1.80947 -2.0203 + neutron 0 1 2.66593 45.6257 -8.17381 -53.5558 + gamma 0 0 2.26418 -2.26198 0.00871487 0.0993462 + neutron 0 1 2.10388 53.636 2.63942 32.7736 + gamma 0 0 1.95145 -0.339457 -1.76596 -0.757828 + neutron 0 1 1.17094 40.7089 -20.0195 11.9884 + neutron 0 1 1.15343 -43.2954 3.70576 16.7496 + gamma 0 0 0.946093 0.0748376 0.139229 -0.932795 + neutron 0 1 0.768556 28.192 25.4834 -0.783382 + neutron 0 1 0.660616 20.149 -25.8237 12.9991 + neutron 0 1 0.492457 -9.94975 17.5447 22.7776 + neutron 0 1 0.297173 6.47431 4.88728 22.1971 + Au185[0.0] 79 185 0.481616 -142.321 381.262 -17.4798 +0 0 -0.0368631 36 + proton 1 1 1000 0 0 1696.04 + neutron 0 1 167.212 -324.339 -17.6075 486.484 + proton 1 1 155.718 -74.1016 -173.07 530.108 + neutron 0 1 83.5892 192.247 -86.1371 345.953 + neutron 0 1 52.1651 -226.414 165.249 148.914 + proton 1 1 51.745 192.436 -107.869 226.079 + proton 1 1 43.0557 -77.5507 260.712 -93.0848 + neutron 0 1 26.3037 125.977 76.8098 168.375 + proton 1 1 25.4415 216.731 34.6916 -14.6077 + proton 1 1 23.2238 -150.59 -144.491 23.7683 + neutron 0 1 21.2637 152.591 13.8609 -130.128 + neutron 0 1 18.5346 -140.355 -120.712 30.022 + neutron 0 1 16.5786 -76.3541 -136.804 82.9634 + neutron 0 1 16.2944 112.433 126.841 46.4214 + neutron 0 1 14.9044 -6.28885 105.397 -130.695 + proton 1 1 13.5456 -142.402 -72.2578 10.1437 + neutron 0 1 11.0073 121.958 -74.0681 -21.1079 + neutron 0 1 10.6465 131.778 -17.13 49.6056 + neutron 0 1 5.55535 -33.9925 -29.7092 91.8258 + neutron 0 1 4.99786 -73.6637 13.3286 61.7465 + neutron 0 1 4.5916 64.7392 17.7728 -64.3605 + proton 1 1 4.36809 -3.02326 -18.6826 88.6443 + neutron 0 1 4.09599 65.1471 -38.6807 -44.4222 + neutron 0 1 3.54628 72.8602 9.08733 35.8513 + neutron 0 1 2.97438 24.7329 -8.51819 70.0987 + neutron 0 1 2.87897 11.3788 54.2681 -48.4122 + neutron 0 1 2.02636 44.4185 -23.3538 35.9653 + neutron 0 1 0.861151 1.89424 26.1997 -30.4786 + gamma 0 0 0.750641 0.0245751 -0.0376836 -0.749291 + gamma 0 0 0.284971 -0.0713801 -0.0311435 0.274123 + neutron 0 1 0.183149 -9.26623 11.8143 10.8975 + gamma 0 0 0.179586 0.00361654 -0.151333 0.0966238 + neutron 0 1 0.121478 -12.787 -1.78605 -7.84805 + gamma 0 0 0.0956871 0.0751168 -0.0310095 0.0505163 + neutron 0 1 0.0807492 -6.28183 0.903879 -10.5578 + Ta168[0.0] 73 168 0.37542 -173.945 154.192 -251.801 +0 0 -0.0437085 31 + proton 1 1 1000 0 0 1696.04 + proton 1 1 198.425 -338.856 165.488 519.15 + neutron 0 1 162.289 -70.8761 45.8032 569.367 + proton 1 1 154.519 351.789 335.903 277.941 + neutron 0 1 97.3337 56.4374 298.943 315.951 + proton 1 1 60.8447 10.8578 -312.932 140.838 + neutron 0 1 48.7806 -213.841 127.506 -179.05 + proton 1 1 42.6702 -134.595 -149.482 203.551 + neutron 0 1 7.94864 -78.1525 80.4564 49.1799 + neutron 0 1 5.68805 54.8408 -60.5116 63.6536 + neutron 0 1 5.43137 -88.6395 18.4129 -45.1636 + neutron 0 1 5.37632 -36.3907 69.1716 -63.4249 + neutron 0 1 5.20933 -50.2579 -83.7889 -16.4227 + proton 1 1 3.69581 -69.3681 -44.7267 11.6879 + neutron 0 1 3.69326 39.4531 30.4228 -66.8705 + neutron 0 1 2.91473 -71.411 19.406 -3.08962 + neutron 0 1 2.69104 67.1819 -9.43717 -21.4846 + neutron 0 1 2.58243 -44.8661 52.851 7.29349 + gamma 0 0 2.0054 -1.02152 0.942247 1.44579 + neutron 0 1 1.89477 19.477 -48.1094 29.5 + neutron 0 1 1.40956 -24.9502 -41.8471 -16.6442 + neutron 0 1 1.31738 -34.125 -0.933494 36.22 + neutron 0 1 1.30512 -35.6927 -12.875 -31.8506 + neutron 0 1 1.02288 1.48376 -5.59093 -43.4709 + gamma 0 0 0.774287 -0.621982 -0.404922 0.220675 + gamma 0 0 0.701166 -0.353058 -0.257974 -0.548118 + gamma 0 0 0.344291 -0.268497 -0.0034541 0.215485 + neutron 0 1 0.166452 10.9655 -9.4963 -10.1188 + neutron 0 1 0.0927631 8.83138 -6.26341 7.55639 + neutron 0 1 0.041252 8.63055 -0.229227 1.72651 + Re173[0.0] 75 173 2.02773 664.341 -458.42 -41.3202 +-2.77519e-05 0.000305943 -0.0311234 24 + proton 1 1 999.994 -5.83293 64.3035 1694.8 + pi0 0 0 376.177 268.195 -76.9212 406.465 + proton 1 1 186.956 -430.961 125.221 429.389 + neutron 0 1 105.862 -368.386 -150.956 227.242 + proton 1 1 29.9689 66.0746 67.3479 -219.624 + proton 1 1 13.5651 -0.11873 77.2821 -140.239 + neutron 0 1 4.98436 -48.8882 -55.9655 -62.2005 + neutron 0 1 4.41978 -37.0878 -31.7721 -77.0707 + gamma 0 0 3.76735 -3.24109 -1.67531 0.938936 + neutron 0 1 3.35204 -56.2718 -56.0673 0.300571 + neutron 0 1 2.45489 38.1581 47.4682 30.1629 + gamma 0 0 2.39148 -0.225075 2.23395 0.823379 + neutron 0 1 2.13739 -47.3442 -41.7233 6.22113 + neutron 0 1 1.94074 -58.7208 12.3363 -7.09651 + neutron 0 1 1.74815 45.4693 23.6586 25.7074 + neutron 0 1 0.753432 23.8939 23.6438 16.9239 + gamma 0 0 0.704592 -0.494891 0.0599755 0.497932 + neutron 0 1 0.496559 -8.57311 -2.4747 29.2185 + neutron 0 1 0.42369 15.6739 4.85999 22.9578 + neutron 0 1 0.371686 -0.302659 -24.871 8.9401 + gamma 0 0 0.308685 -0.240306 0.0864206 -0.17341 + neutron 0 1 0.148709 15.8089 0.425494 5.41869 + neutron 0 1 0.129239 8.42193 -12.4759 4.03693 + Ir181[0.0] 77 181 3.91321 573.328 134.583 985.962 +-0.00110813 -0.000140969 0.0169009 37 + proton 1 1 999.996 -52.7477 -6.71022 1695.2 + neutron 0 1 201.376 158.87 -134.116 612.974 + neutron 0 1 88.0073 -93.8074 386.855 -121.102 + pi0 0 0 86.7384 73.9872 -108.732 116.799 + neutron 0 1 41.2707 -126.17 -244.225 60.7598 + proton 1 1 40.947 -53.4807 83.9894 261.918 + proton 1 1 22.7592 103.771 91.1056 155.428 + neutron 0 1 18.1833 -1.80291 -178.089 52.7317 + neutron 0 1 15.6817 8.18895 50.4707 164.619 + neutron 0 1 13.4706 48.7156 96.6262 117.408 + neutron 0 1 12.515 -92.0716 -100.221 71.7808 + neutron 0 1 11.069 103.889 74.1752 68.0282 + proton 1 1 10.3926 57.1226 -127.421 10.5379 + neutron 0 1 9.4002 72.5204 108.45 -27.0548 + neutron 0 1 7.79437 92.6717 77.0608 -13.4534 + neutron 0 1 5.66001 -53.0261 86.0196 21.3728 + proton 1 1 5.26062 7.61965 -38.9595 91.2336 + neutron 0 1 5.18717 67.1992 63.9453 34.1984 + neutron 0 1 3.75774 1.08246 -74.2755 -39.4636 + neutron 0 1 3.47035 23.8339 41.203 65.3264 + neutron 0 1 3.01985 65.1156 -30.8164 -22.2289 + neutron 0 1 2.68308 20.0122 -17.2049 65.974 + neutron 0 1 2.43132 -41.2 0.202518 -53.6396 + proton 1 1 2.26682 -59.0215 -21.3955 17.8219 + neutron 0 1 1.57312 52.3954 -12.0678 8.22569 + neutron 0 1 1.37143 18.1549 -14.9155 -45.0211 + neutron 0 1 1.05826 21.7819 22.6523 -31.6568 + neutron 0 1 1.04507 35.2098 3.85233 -26.6521 + neutron 0 1 1.00273 -29.1913 -13.2861 -29.2682 + neutron 0 1 0.681787 -0.837777 -28.3836 21.8014 + gamma 0 0 0.245054 -0.0486103 -0.197172 -0.137157 + neutron 0 1 0.229053 -16.7395 -6.80746 10.1942 + neutron 0 1 0.160768 10.1905 -13.461 -4.13361 + alpha 2 4 3.0034 20.87 119.892 87.1165 + alpha 2 4 5.93333 -29.5652 -133.069 160.268 + deuteron 1 2 10.874 -77.2701 164.382 -88.979 + Yb158[0.0] 70 158 0.794316 -441.719 -179.949 -78.5301 +0 0 -0.0412204 37 + proton 1 1 1000 0 0 1696.04 + neutron 0 1 201.802 -50.9944 132.156 632.354 + proton 1 1 141.977 353.518 114.079 385.479 + proton 1 1 96.5286 -319.291 -97.1344 -281.205 + neutron 0 1 91.9858 -45.8618 -346.489 243.221 + proton 1 1 44.3286 169.764 29.697 235.474 + proton 1 1 29.6873 111.643 -168.941 -124.842 + neutron 0 1 24.4702 -72.6475 195.361 -56.0162 + neutron 0 1 19.6147 -81.4422 163.668 61.8324 + neutron 0 1 12.6568 120.297 -63.6385 -73.6386 + proton 1 1 11.6994 40.7513 129.782 59.8953 + neutron 0 1 11.409 105.383 -94.3401 -39.5413 + neutron 0 1 9.92673 126.33 -50.0223 17.0477 + neutron 0 1 9.80127 -24.5911 28.1831 -130.824 + neutron 0 1 6.96757 88.4137 -56.0768 46.6897 + neutron 0 1 5.3538 -39.9604 -86.4103 32.0248 + neutron 0 1 2.4535 -25.388 61.4098 -14.1686 + neutron 0 1 2.16569 55.2227 29.4424 12.5664 + neutron 0 1 1.93892 -35.0022 43.2835 -23.4227 + neutron 0 1 1.91645 6.3227 -57.9031 -14.5666 + neutron 0 1 1.87941 47.3163 -9.44006 -34.7454 + neutron 0 1 1.76413 -53.1241 20.482 8.74468 + gamma 0 0 1.54232 1.19168 0.413206 -0.887644 + neutron 0 1 1.53609 35.6211 32.93 23.1436 + neutron 0 1 1.17776 -1.49529 -46.9615 -2.63281 + proton 1 1 1.16222 22.8004 40.5238 -4.50207 + neutron 0 1 1.15222 30.9007 5.23745 34.4125 + neutron 0 1 0.895703 -5.55801 -38.8901 11.8581 + neutron 0 1 0.570148 7.7613 30.222 -9.90473 + neutron 0 1 0.423501 -27.3851 4.48066 5.09635 + neutron 0 1 0.395704 25.871 -1.1757 8.54669 + neutron 0 1 0.26885 1.17686 19.0363 -11.8959 + gamma 0 0 0.16558 -0.164198 0.0211886 -0.00260392 + neutron 0 1 0.0925129 1.60908 13.0783 -0.46998 + deuteron 1 2 7.30129 17.8425 80.4085 143.73 + deuteron 1 2 5.28051 22.3732 -131.259 45.8991 + Hf163[0.0] 72 163 2.10262 -609.206 74.7887 511.288 +0 0 0.0346371 31 + proton 1 1 1000 0 0 1696.04 + proton 1 1 169.941 356.047 -216.935 417.075 + neutron 0 1 165.626 -289.941 450.58 227.105 + neutron 0 1 95.8639 41.0174 152.748 405.36 + proton 1 1 62.223 -157.669 87.0597 296.98 + neutron 0 1 45.8574 -89.83 47.1957 -279.246 + pi+ 1 0 43.1584 57.1888 -101.172 20.0904 + neutron 0 1 30.424 -188.113 68.3499 134.306 + proton 1 1 14.8187 -56.3786 -148.954 -51.5909 + neutron 0 1 5.73917 -33.2674 11.7251 97.8437 + neutron 0 1 5.36648 6.91662 100.173 5.53984 + neutron 0 1 4.54705 17.8838 -71.0103 56.594 + neutron 0 1 4.12983 -47.066 31.774 -67.4741 + neutron 0 1 3.40259 -61.7575 50.899 -0.887969 + neutron 0 1 3.37329 -26.7338 27.7521 -69.7521 + neutron 0 1 2.87309 51.8533 -51.0948 -10.3789 + neutron 0 1 2.79856 -39.8925 -17.3253 58.0957 + gamma 0 0 2.74698 1.63515 1.78386 1.3 + neutron 0 1 2.38065 -11.5451 64.0188 -15.7329 + neutron 0 1 2.31504 -49.1682 39.1113 -20.2093 + neutron 0 1 1.01988 -28.1844 -14.2559 30.3305 + neutron 0 1 0.995722 -12.7493 35.6096 -21.0119 + neutron 0 1 0.845014 -24.2326 9.9018 30.0556 + neutron 0 1 0.751326 17.1785 8.00043 32.4546 + gamma 0 0 0.619064 -0.387055 0.0272165 -0.482377 + neutron 0 1 0.533251 1.53984 -5.5114 -31.1382 + neutron 0 1 0.479384 25.6014 -12.3233 -9.68299 + neutron 0 1 0.294771 -9.18503 -17.8262 -12.3232 + gamma 0 0 0.120834 -0.0864513 0.0560964 -0.0630886 + neutron 0 1 0.0488459 2.29152 -2.15492 9.04961 + Os173[0.0] 76 173 2.46283 547.039 -528.207 463.834 +0.000252546 0.000401177 -0.00447463 48 + proton 1 1 999.997 24.9339 39.6083 1695.39 + proton 1 1 135.827 -505.988 -23.8645 -129.389 + neutron 0 1 102.136 280.055 210.652 282.053 + neutron 0 1 55.2627 180.988 -47.9951 268.029 + neutron 0 1 53.2529 169.537 -261.875 -74.7225 + neutron 0 1 51.2843 263.138 -91.7253 146.1 + proton 1 1 37.9851 -202.168 -23.1408 176.964 + proton 1 1 30.172 -86.3329 -217.518 52.5533 + neutron 0 1 19.7998 -180.546 3.29283 70.6467 + neutron 0 1 16.5053 54.8546 138.388 95.5395 + neutron 0 1 16.1691 100.68 117.565 -81.7749 + neutron 0 1 14.8976 -37.0504 -131.631 -97.556 + proton 1 1 13.2451 -43.6368 151.153 16.7096 + neutron 0 1 12.5253 51.9541 69.8133 126.966 + neutron 0 1 11.3844 24.0987 130.076 -63.4187 + neutron 0 1 8.16412 110.586 -49.1864 -27.5595 + proton 1 1 7.7937 -31.2677 -22.1617 -114.966 + proton 1 1 7.27366 -7.69796 32.4398 -112.208 + neutron 0 1 6.56131 71.929 75.7952 -38.1303 + neutron 0 1 6.34574 71.8212 16.3915 -80.8566 + neutron 0 1 5.94172 -25.2184 88.1224 52.9061 + neutron 0 1 5.80637 4.70485 104.51 -0.389702 + neutron 0 1 5.73374 -36.4166 -28.4565 93.1203 + neutron 0 1 5.53046 -9.37639 -88.4225 -50.1657 + neutron 0 1 5.22839 21.6799 3.85769 96.7846 + neutron 0 1 4.30841 -63.8047 -25.6493 58.1869 + neutron 0 1 3.95636 -11.4137 -61.8011 -59.1652 + proton 1 1 3.4614 5.62365 47.9215 64.6479 + gamma 0 0 3.45505 -2.44251 -2.44224 0.0832732 + neutron 0 1 3.27045 -64.5869 8.58041 43.7175 + neutron 0 1 2.8303 16.3092 -52.0021 48.5418 + neutron 0 1 2.14588 -36.3436 43.2877 29.0227 + gamma 0 0 1.83862 1.59217 0.426592 0.814588 + neutron 0 1 1.60956 47.1863 -12.0738 25.59 + gamma 0 0 1.45483 -1.16383 -0.858746 -0.156765 + neutron 0 1 1.21875 44.4695 4.59652 17.1176 + neutron 0 1 1.02136 -17.4697 -29.7755 -26.9914 + neutron 0 1 0.945017 28.6711 -20.7135 -22.9264 + gamma 0 0 0.371024 -0.280903 -0.122064 0.209411 + neutron 0 1 0.239261 -9.32373 9.853 16.2987 + gamma 0 0 0.118366 -0.0736628 0.0423379 -0.0824121 + neutron 0 1 0.0638138 6.99408 -7.95153 2.78829 + neutron 0 1 0.0331735 0.498623 -4.11124 6.72217 + alpha 2 4 2.65311 10.9303 74.5957 -118.75 + triton 1 3 15.4248 -270.501 55.98 102.944 + He3 2 3 3.20395 52.9019 -73.3538 -99.1571 + alpha 2 4 20.9291 -187.701 316.326 145.49 + Dy147[0.0] 66 147 3.40887 234.523 -387.232 853.198 +0 0 -0.0476242 15 + proton 1 1 1000 0 0 1696.04 + proton 1 1 713.946 357.566 -150.345 1303.46 + neutron 0 1 169 -26.4757 440.351 389.261 + neutron 0 1 41.0582 -254 84.2138 -85.0383 + neutron 0 1 5.38567 -74.7964 67.4483 -2.36788 + neutron 0 1 3.94753 -37.9407 -9.55971 76.8285 + gamma 0 0 1.87704 1.81415 0.240256 -0.417613 + gamma 0 0 1.22448 -0.747418 -0.40017 -0.883512 + neutron 0 1 0.487567 -15.3857 -3.86069 -25.784 + neutron 0 1 0.335593 14.4446 19.9854 -4.76172 + neutron 0 1 0.26718 -7.68413 -4.99212 20.4492 + gamma 0 0 0.209232 -0.100997 0.168607 -0.0717573 + gamma 0 0 0.0873146 -0.003785 0.0169188 -0.0855761 + neutron 0 1 0.0293857 5.42541 -5.00873 0.835437 + Au189[0.0] 79 189 0.551522 37.8862 -438.26 24.6123 +0 0 -0.0317025 20 + proton 1 1 1000 0 0 1696.04 + neutron 0 1 260.558 43.2663 -527.592 526.58 + pi0 0 0 253.506 -184.212 235.233 208.402 + proton 1 1 196.96 -63.1527 -34.3957 635.001 + proton 1 1 28.8785 -60.1655 -153.185 167.153 + neutron 0 1 5.8167 -5.53544 101.843 23.6973 + neutron 0 1 4.71979 -62.3723 0.361671 70.7174 + neutron 0 1 4.0151 -19.1691 29.3354 -79.5802 + neutron 0 1 2.79158 26.8323 6.86109 -66.9813 + gamma 0 0 2.50272 -0.973648 2.21766 -0.630556 + gamma 0 0 2.17967 0.653551 1.33137 1.59728 + neutron 0 1 2.0815 -3.39914 -43.5973 44.76 + neutron 0 1 1.35194 -12.9766 -17.7383 45.379 + neutron 0 1 0.73657 -11.4798 -5.07904 -35.0296 + neutron 0 1 0.509472 6.53565 -10.4887 -28.3707 + neutron 0 1 0.267383 -5.37885 -4.98335 21.1838 + gamma 0 0 0.184739 -0.0944509 0.106261 0.117967 + neutron 0 1 0.0742412 0.999984 7.89365 -8.72953 + neutron 0 1 0.044622 7.64152 -3.00157 4.0559 + Pt184[0.0] 78 184 0.926794 342.982 414.878 166.713 +0 0 0.00269011 16 + proton 1 1 1000 0 0 1696.04 + neutron 0 1 339.902 -69.3022 -19.4106 865.491 + proton 1 1 308.532 -84.3337 -208.541 789.661 + neutron 0 1 106.936 164.997 411.465 125.912 + proton 1 1 65.9581 47.2276 5.41116 354.773 + proton 1 1 44.6071 -45.1182 122.576 -261.986 + neutron 0 1 17.3158 -85.6533 86.6516 -134.14 + proton 1 1 14.4829 -154.512 -57.6487 13.7906 + neutron 0 1 11.8917 85.9194 -122.757 6.01301 + proton 1 1 10.9894 135.499 40.0468 -27.9113 + neutron 0 1 1.8661 31.7599 47.7081 15.0129 + neutron 0 1 0.844506 -2.26688 -6.6745 39.2169 + gamma 0 0 0.65654 -0.478346 -0.353859 -0.277513 + neutron 0 1 0.354081 17.8887 10.634 15.2447 + gamma 0 0 0.192957 -0.182744 0.055204 -0.0281006 + Re186[0.0] 75 186 0.312594 -41.4448 -309.163 -104.735 +0 0 0.00247784 8 + proton 1 1 1000 0 0 1696.04 + proton 1 1 820.319 496.627 466.11 1322.27 + neutron 0 1 169.302 -404.829 -305.077 299.741 + gamma 0 0 0.718764 0.196566 0.106531 -0.683106 + gamma 0 0 0.651187 0.399552 0.0263312 -0.513526 + gamma 0 0 0.521136 0.506481 -0.0994891 -0.0718451 + gamma 0 0 0.181355 0.025827 0.0183782 0.178564 + Au196[0.0] 79 196 0.110207 -92.9253 -161.083 75.1203 +0 0 -0.0348524 35 + proton 1 1 1000 0 0 1696.04 + proton 1 1 274.999 199.932 285.558 685.68 + proton 1 1 157.982 -378.089 -292.351 -304.956 + neutron 0 1 42.3118 -116.184 259.015 26.6915 + proton 1 1 39.8791 -50.5824 -271.191 -17.9416 + proton 1 1 26.539 -4.33551 -60.3032 216.45 + pi- -1 0 17.0072 -7.80245 32.2012 -62.7602 + neutron 0 1 14.7612 158.147 -51.1572 18.1301 + neutron 0 1 13.6796 65.5665 77.1457 -125.069 + neutron 0 1 13.5004 -76.7313 108.862 -88.3893 + neutron 0 1 12.7911 13.386 -121.479 96.2465 + proton 1 1 12.3118 32.2918 -135.53 62.0016 + neutron 0 1 10.9819 -35.7318 -60.7307 125.667 + neutron 0 1 6.45457 -47.0395 -48.1877 -87.3834 + neutron 0 1 5.81287 -75.5367 -72.2979 -4.91435 + neutron 0 1 2.56832 1.24211 -46.8024 51.3888 + gamma 0 0 2.55674 -0.473685 -2.3848 0.79074 + neutron 0 1 2.36112 45.8553 47.1471 -10.8108 + gamma 0 0 1.87357 -0.226288 -0.911662 -1.62109 + neutron 0 1 1.73283 -0.193021 51.335 -24.9782 + gamma 0 0 1.6915 0.322679 -1.27561 1.06295 + neutron 0 1 1.59531 22.9717 -22.1777 -44.5062 + gamma 0 0 1.31435 1.05374 -0.78317 -0.0616173 + neutron 0 1 1.20353 31.0943 11.8393 34.0001 + neutron 0 1 0.85938 -34.2251 0.387282 -21.0741 + neutron 0 1 0.749642 -17.8662 -24.2894 -22.362 + neutron 0 1 0.382571 7.43482 -23.4592 -10.6507 + neutron 0 1 0.309556 -15.5561 -7.86498 16.6716 + neutron 0 1 0.246908 -16.4571 9.19348 10.4248 + neutron 0 1 0.155372 8.99377 13.2434 -5.9761 + neutron 0 1 0.107391 0.626226 11.1849 -8.73612 + gamma 0 0 0.0963916 0.0144924 0.0240692 -0.0922063 + neutron 0 1 0.0144331 2.05263 -1.63366 4.49887 + alpha 2 4 0.42224 -53.1114 12.5426 13.0297 + W168[0.0] 74 168 5.12352 339.158 325.132 1175.59 +0 0 -0.0396177 30 + proton 1 1 1000 0 0 1696.04 + proton 1 1 374.274 576.797 -128.643 702.266 + proton 1 1 146.145 -35.7216 523.054 144.031 + neutron 0 1 100.512 -405.23 -171.058 74.208 + proton 1 1 50.2151 57.5754 -164.931 257.362 + proton 1 1 35.5228 -80.4978 22.1024 246.888 + neutron 0 1 22.9198 7.37518 -205.804 34.4213 + neutron 0 1 19.9793 125.153 94.243 -115.75 + proton 1 1 11.1096 123.718 -19.7427 72.6308 + neutron 0 1 10.4945 27.586 -101.667 93.4534 + neutron 0 1 9.4769 84.1952 -75.6791 71.2881 + proton 1 1 7.82555 -59.0713 100.865 -32.9106 + neutron 0 1 7.37483 99.8275 7.87543 62.3308 + neutron 0 1 7.25246 -88.0083 26.2466 -72.4333 + neutron 0 1 6.0962 4.22579 -53.9697 -92.5319 + neutron 0 1 2.63656 -60.4246 33.0538 -14.7549 + neutron 0 1 2.51449 -12.9268 -8.72943 -66.9931 + neutron 0 1 2.39517 48.4474 13.0033 44.6133 + neutron 0 1 2.14056 61.4752 -13.1893 -8.59199 + neutron 0 1 1.93202 32.5024 50.362 -6.44318 + neutron 0 1 1.45958 -10.3497 -43.8878 -26.676 + neutron 0 1 1.40814 -31.7593 -10.3766 -39.1375 + neutron 0 1 0.956485 -6.69461 41.7933 -2.60341 + neutron 0 1 0.92684 4.36924 37.3063 -18.2116 + gamma 0 0 0.828924 0.293898 0.154085 0.759603 + neutron 0 1 0.637538 -10.9649 11.9302 30.5919 + neutron 0 1 0.489794 -3.96997 -4.34686 29.7653 + gamma 0 0 0.478071 -0.16137 -0.439979 -0.0944981 + gamma 0 0 0.104689 0.0301614 0.0859369 -0.0516222 + W173[0.0] 74 173 0.96278 -447.792 40.391 328.615 +0 0 -0.0407712 10 + proton 1 1 1000 0 0 1696.04 + neutron 0 1 582.456 13.7092 66.1013 1195.5 + pi0 0 0 144.154 -140.423 -190.11 61.9256 + proton 1 1 115.771 248.202 140.129 386.539 + gamma 0 0 2.88543 -0.807229 2.75847 0.254776 + gamma 0 0 2.27332 -1.03734 1.34207 1.51353 + gamma 0 0 1.94936 0.211747 -1.18969 1.52964 + gamma 0 0 0.484548 -0.0683908 0.19039 0.440297 + neutron 0 1 0.157305 -13.6437 -9.35714 -4.68123 + Au195[0.0] 79 195 0.0390323 -106.141 -9.86309 53.0178 +0.000606011 -0.000421807 0.00181001 12 + proton 1 1 999.996 45.455 -31.6385 1695.13 + pi+ 1 0 268.821 42.024 -254.762 283.962 + proton 1 1 266.398 -48.0187 307.707 688.395 + proton 1 1 142.089 422.549 18.8784 328.513 + neutron 0 1 121.547 -193.079 -346.195 293.335 + neutron 0 1 5.62642 -26.6352 -26.1717 -95.969 + neutron 0 1 1.90746 44.165 0.388457 40.4637 + neutron 0 1 1.39603 -33.5676 35.3637 15.7445 + gamma 0 0 1.02809 0.696127 -0.51146 -0.557488 + neutron 0 1 0.588855 -0.41263 -4.22819 -32.9975 + neutron 0 1 0.0844421 0.701113 12.0474 3.61299 + Ir190[0.0] 77 190 0.301506 -162.966 225.846 170.627 +0 0 -0.0414863 45 + proton 1 1 1000 0 0 1696.04 + pi+ 1 0 126.778 209.789 -14.6046 -85.0671 + proton 1 1 105.246 -240.16 -18.2035 388.031 + proton 1 1 80.5551 296.782 59.2146 257.038 + neutron 0 1 70.6397 -100.891 57.7224 352.449 + proton 1 1 29.1649 -180.779 1.39505 -151.317 + proton 1 1 14.4291 129.452 38.0205 -95.2976 + neutron 0 1 12.9941 -88.9446 -13.2054 128.456 + neutron 0 1 12.1036 -98.7125 105.203 45.5961 + proton 1 1 9.26012 -11.9501 122.765 47.4197 + neutron 0 1 8.80582 4.12042 -127.571 -18.263 + neutron 0 1 8.24049 -109.423 54.5034 -24.673 + neutron 0 1 7.77623 -92.7499 73.3979 -26.1391 + neutron 0 1 7.75632 33.9153 15.7964 115.046 + proton 1 1 6.69397 17.9749 -108.051 24.6612 + neutron 0 1 6.2801 15.2413 87.6528 -62.652 + neutron 0 1 6.25545 18.682 81.4145 -69.4017 + neutron 0 1 4.14589 -26.8945 -36.1603 76.0064 + proton 1 1 4.00596 50.3321 -35.2792 -61.2819 + neutron 0 1 3.95547 42.4683 62.7329 41.3463 + neutron 0 1 3.40328 31.5521 -73.031 -8.81596 + gamma 0 0 3.40078 -0.861605 2.40546 2.24426 + neutron 0 1 2.90227 -54.1007 -43.9121 24.6377 + proton 1 1 2.90202 -35.246 22.3573 60.9267 + neutron 0 1 2.7158 -28.3285 49.6217 42.9639 + neutron 0 1 2.63678 34.9742 44.8618 41.5456 + neutron 0 1 2.45087 41.9512 0.0460011 53.4004 + neutron 0 1 2.43755 12.2602 43.3311 -50.5818 + neutron 0 1 1.75246 24.2516 50.7835 -11.3606 + neutron 0 1 1.73394 -7.17525 -55.8582 9.47074 + neutron 0 1 1.48458 12.0942 14.0802 49.4713 + neutron 0 1 1.38379 30.9852 -32.0309 24.8229 + gamma 0 0 1.34905 -0.169627 1.33231 0.126941 + neutron 0 1 1.3076 -22.3321 20.2758 -39.3577 + neutron 0 1 1.2728 35.0907 -22.7741 25.3645 + proton 1 1 0.936433 -36.4634 -13.7056 -15.5149 + neutron 0 1 0.863906 -29.9646 -18.8493 19.2605 + gamma 0 0 0.509071 0.318728 -0.00548473 -0.396907 + neutron 0 1 0.492376 12.8012 -1.82515 -27.5369 + neutron 0 1 0.416007 -4.29697 -26.3122 -8.43244 + neutron 0 1 0.382983 24.7707 -1.09149 10.249 + neutron 0 1 0.269373 -19.5813 -2.41554 10.8166 + deuteron 1 2 13.8304 -188.153 60.6285 113.995 + deuteron 1 2 5.07415 -45.8058 -77.191 104.897 + Er157[0.0] 68 157 1.3149 343.178 -347.467 381.883 +0 0 -0.0422503 18 + proton 1 1 1000 0 0 1696.04 + neutron 0 1 596.413 301.758 -982.139 648.685 + proton 1 1 124.66 12.5802 219.268 448.591 + proton 1 1 61.2432 -162.637 303.615 6.58371 + proton 1 1 57.6063 287.623 169.38 -1.70786 + proton 1 1 29.5065 -187.441 39.7518 -139.737 + neutron 0 1 13.7478 -78.2277 -23.044 -139.185 + neutron 0 1 8.00788 -90.6956 -69.5225 45.309 + proton 1 1 7.73996 -92.1095 42.62 65.4497 + neutron 0 1 3.36952 -45.7035 52.4348 38.793 + neutron 0 1 2.58859 -7.90935 -67.5402 -15.7087 + gamma 0 0 1.6874 -1.67505 -0.129125 -0.157688 + neutron 0 1 1.30829 -37.7749 -32.0929 1.80608 + neutron 0 1 0.656028 -34.7083 2.4905 4.72504 + gamma 0 0 0.327895 0.0158196 0.210962 -0.25052 + neutron 0 1 0.157203 -0.651781 2.30964 17.0197 + neutron 0 1 0.120321 -6.08025 5.88631 12.4296 + Re184[0.0] 75 184 1.83472 143.637 336.503 703.391 +0 0 -0.0476869 7 + proton 1 1 1000 0 0 1696.04 + proton 1 1 979.222 33.7645 -316.452 1641.69 + proton 1 1 4.54186 -18.0119 77.1781 47.5683 + gamma 0 0 1.76484 -1.0796 0.493266 1.30606 + neutron 0 1 0.376162 8.37797 22.3221 11.7699 + gamma 0 0 0.236234 0.062544 0.149938 0.171503 + Pt195[0.0] 78 195 0.130434 -23.1136 216.309 -6.46712 +0 0 -0.0341388 10 + proton 1 1 1000 0 0 1696.04 + pi0 0 0 330.958 119.404 31.3346 428.529 + neutron 0 1 289.849 298.405 389.677 622.723 + proton 1 1 223.147 -460.634 -90.364 498.187 + gamma 0 0 3.14904 0.474497 1.21991 -2.86411 + gamma 0 0 1.64039 1.49713 -0.518536 0.424971 + gamma 0 0 0.760468 0.751174 -0.116342 -0.0226801 + neutron 0 1 0.165874 -2.75207 10.676 13.7904 + gamma 0 0 0.118891 0.025969 0.0912787 -0.0716167 + Au195[0.0] 79 195 0.377584 42.8262 -342.001 135.338 +0 0 0.0193621 33 + proton 1 1 1000 0 0 1696.04 + neutron 0 1 216.956 252.285 400.274 480.513 + neutron 0 1 114.163 -244.782 177.688 368.876 + neutron 0 1 102.304 -375.457 147.236 200.153 + neutron 0 1 91.5373 233.985 255.097 246.103 + proton 1 1 81.1121 -228.871 -293.931 -141.466 + neutron 0 1 49.3574 -18.329 -299.109 73.3701 + proton 1 1 27.8861 -29.4482 -43.6103 224.362 + neutron 0 1 11.9275 -12.2047 78.8922 127.211 + neutron 0 1 9.507 -84.9456 -101.787 19.4652 + neutron 0 1 8.63062 -58.0773 -81.9105 78.8051 + neutron 0 1 8.5278 115.756 51.5078 -6.71821 + neutron 0 1 8.51064 35.0656 48.4097 111.767 + neutron 0 1 6.36581 15.481 -88.2272 -63.0794 + neutron 0 1 5.86293 21.0658 84.2148 59.2934 + neutron 0 1 4.62007 5.797 32.6783 87.1871 + neutron 0 1 4.52257 -6.58508 -77.7795 49.2539 + proton 1 1 4.32316 39.1326 -73.6456 -34.2966 + neutron 0 1 4.10721 82.0971 27.1532 16.0504 + neutron 0 1 2.89203 -44.8468 -9.11985 57.8658 + neutron 0 1 2.65645 -56.5549 31.8235 -28.0659 + neutron 0 1 2.55456 -31.4667 41.1 -46.1249 + proton 1 1 1.91562 26.1119 -28.2354 -46.0364 + neutron 0 1 1.88463 21.6781 -48.7673 26.3974 + neutron 0 1 1.37473 7.43484 -20.6819 -45.8494 + gamma 0 0 1.31988 -0.610696 1.16684 0.0872912 + neutron 0 1 1.2053 37.7293 -11.5622 26.6304 + neutron 0 1 0.5955 11.3989 14.2337 28.0508 + neutron 0 1 0.0724742 -4.25628 -10.3128 3.42408 + triton 1 3 1.67064 22.8994 -31.5961 -88.6937 + alpha 2 4 0.832298 -54.2052 35.8823 -44.4927 + deuteron 1 2 0.908966 53.7674 3.21248 -22.568 + Hf162[0.0] 72 162 0.387966 268.958 -210.298 -21.4472 +-0.000621136 0.000169369 -0.00421895 30 + proton 1 1 999.992 -74.395 20.2857 1694.28 + proton 1 1 220.055 27.7659 -361.275 574.522 + neutron 0 1 167.433 -419.539 293.163 284.087 + pi- -1 0 87.9421 -173.672 44.4745 -11.9206 + neutron 0 1 54.8 -189.278 -172.285 201.174 + neutron 0 1 39.4695 197.217 -76.8721 175.847 + proton 1 1 24.3027 -53.0366 167.847 123.329 + proton 1 1 11.9388 -89.8335 -90.336 79.4703 + neutron 0 1 11.4304 -45.7433 -131.188 -48.0333 + neutron 0 1 6.256 48.3707 32.8759 91.512 + neutron 0 1 5.52432 73.3768 44.8134 -54.9459 + neutron 0 1 4.43845 1.97197 67.1698 -62.0037 + proton 1 1 4.42958 -77.8602 -6.88522 47.1414 + proton 1 1 3.98083 22.6705 -80.6858 21.492 + neutron 0 1 3.85632 71.1587 -34.6412 31.5885 + neutron 0 1 3.41773 31.3966 32.306 66.3673 + neutron 0 1 3.24265 62.8697 -40.8343 -21.9967 + neutron 0 1 3.23903 -41.6954 -59.4768 -28.6539 + neutron 0 1 3.01241 -17.1979 57.1745 -45.8814 + neutron 0 1 2.97775 58.6692 -24.3848 -39.5949 + neutron 0 1 1.74955 -46.9686 -31.1853 -10.589 + neutron 0 1 1.47757 -38.1982 -9.22401 35.136 + neutron 0 1 1.46973 0.224827 -52.1956 -6.28824 + neutron 0 1 1.37487 39.3205 4.53232 -31.9188 + neutron 0 1 0.799144 11.5566 24.6559 27.5838 + neutron 0 1 0.779305 12.346 -23.1601 27.8605 + neutron 0 1 0.664935 -9.92457 -17.9488 28.7973 + neutron 0 1 0.636537 -12.6793 3.62067 31.9792 + alpha 2 4 1.79601 13.0185 -56.3875 -100.215 + W168[0.0] 74 168 1.86134 469.299 516.619 308.429 +0 0 -0.0302484 44 + proton 1 1 1000 0 0 1696.04 + proton 1 1 103.586 269.968 87.5356 352.942 + proton 1 1 99.407 -26.5336 -114.544 427.316 + proton 1 1 69.9025 -82.8923 -65.3129 -353.447 + proton 1 1 65.0253 -233.487 -65.863 259.609 + neutron 0 1 60.1423 132.081 247.289 195.026 + neutron 0 1 46.3473 286.195 -69.0485 50.6501 + neutron 0 1 45.2173 -209.911 195.03 70.1034 + proton 1 1 26.876 -205.227 18.0596 -93.3386 + neutron 0 1 19.5151 100.537 154.226 56.2055 + neutron 0 1 15.9121 -7.1424 -154.544 78.8615 + neutron 0 1 14.6476 -18.7103 147.876 74.3101 + neutron 0 1 14.508 160.971 -16.6513 35.8343 + proton 1 1 13.3227 -54.7663 -46.9561 -141.329 + neutron 0 1 11.4609 120.777 30.3215 -78.4951 + proton 1 1 10.5856 -53.1486 79.9331 103.742 + neutron 0 1 10.3179 90.2765 55.8503 -90.6972 + proton 1 1 9.76942 -105.704 -85.1708 -0.882739 + neutron 0 1 9.29702 -35.0206 -60.4658 112.58 + proton 1 1 9.06729 24.2198 -41.231 121.7 + proton 1 1 8.15115 73.2641 -32.0142 -94.7096 + neutron 0 1 7.62735 -81.6626 0.943429 87.8708 + neutron 0 1 6.33592 -78.9886 -33.306 -67.8063 + neutron 0 1 5.7406 -62.0171 -74.0488 -38.6128 + neutron 0 1 5.4728 91.156 44.0889 -7.79865 + neutron 0 1 5.44835 -1.69876 62.6907 -79.5918 + neutron 0 1 4.36389 12.5013 -79.1647 42.3796 + neutron 0 1 3.65669 36.2517 9.83606 73.9854 + neutron 0 1 2.10827 -3.17401 4.97246 -62.7006 + neutron 0 1 1.91129 -44.9211 33.1978 -21.7997 + proton 1 1 1.764 -32.3204 44.3396 17.3991 + gamma 0 0 1.73391 0.999042 0.392896 -1.36161 + neutron 0 1 1.35586 -7.31465 -9.99411 -48.952 + neutron 0 1 1.1161 24.4151 4.57235 38.4908 + proton 1 1 1.03003 30.6906 -10.8518 -29.5683 + neutron 0 1 0.867879 -6.24563 -7.00473 -39.2879 + gamma 0 0 0.796323 -0.622478 0.294615 -0.399816 + neutron 0 1 0.790231 -18.0621 31.2153 13.5991 + neutron 0 1 0.477298 -6.77452 21.9792 -19.1874 + neutron 0 1 0.442115 8.6015 -23.6307 14.0923 + neutron 0 1 0.438893 -6.82757 24.2781 13.7437 + neutron 0 1 0.257563 14.2322 16.5403 2.81481 + deuteron 1 2 6.87051 -7.50258 -78.7272 139.878 + Ho157[0.0] 67 157 1.39654 -86.4618 -246.935 582.872 +-0.000219484 0.00185551 0.0153427 28 + proton 1 1 999.995 -7.01752 59.3258 1694.98 + neutron 0 1 291.143 504.535 549.403 274.699 + neutron 0 1 223.772 -349.824 -304.061 505.708 + neutron 0 1 184.332 46.9306 174.068 589.797 + proton 1 1 66.6069 -302.397 -193.516 -23.1308 + proton 1 1 18.971 156.337 -106.382 -14.1921 + neutron 0 1 13.6836 111.114 115.999 9.92011 + neutron 0 1 11.6899 138.819 24.3788 -47.3148 + neutron 0 1 9.32855 -74.1859 -73.8906 81.5672 + neutron 0 1 5.52122 -37.0035 -24.6205 91.8158 + neutron 0 1 4.83819 -47.6868 73.996 -36.9535 + proton 1 1 4.12553 65.9168 -39.5342 43.0207 + neutron 0 1 2.68732 -67.7369 20.2161 -7.75067 + proton 1 1 2.48166 5.42693 -11.7527 67.0487 + neutron 0 1 2.45295 10.5088 -34.1872 -57.7601 + neutron 0 1 2.43995 24.2358 -35.412 -52.4362 + gamma 0 0 1.98153 -1.20182 -0.458392 1.5073 + neutron 0 1 1.82833 38.6696 -40.2766 17.9294 + gamma 0 0 1.3294 0.849902 1.01327 0.13517 + neutron 0 1 0.855873 -17.351 -35.3328 -7.71774 + neutron 0 1 0.76029 7.59924 24.4692 -27.7988 + neutron 0 1 0.587878 6.87661 -11.5924 30.3871 + neutron 0 1 0.50187 9.59213 -17.9929 22.969 + gamma 0 0 0.400591 -0.155365 -0.357197 0.093513 + neutron 0 1 0.387287 23.7594 -12.4475 2.90964 + gamma 0 0 0.0587857 -0.0415206 -0.00924991 -0.0405739 + gamma 0 0 0.041512 0.0380733 -0.00356763 0.0161535 + Os177[0.0] 76 177 0.368334 -260.645 17.6083 230.55 +-0.00113077 0.000300594 0.0210945 16 + proton 1 1 999.995 -58.6493 15.5908 1694.95 + neutron 0 1 353.608 697.36 -462.01 299.584 + proton 1 1 296.636 -555.849 301.619 494.673 + proton 1 1 120.01 -257.934 -163.059 382.736 + proton 1 1 95.2565 246.081 191.005 301.311 + neutron 0 1 37.1155 139.924 -53.5532 220.626 + neutron 0 1 11.4645 -90.3067 85.0667 79.2658 + neutron 0 1 1.88186 -49.7597 -15.4946 28.7001 + gamma 0 0 1.42543 0.204566 -0.63755 -1.25838 + neutron 0 1 1.29334 25.3798 -6.39938 -41.7965 + neutron 0 1 0.952939 23.8091 -31.1292 -15.9908 + neutron 0 1 0.897723 -20.9829 -15.3454 -31.8117 + gamma 0 0 0.28801 0.157295 -0.221653 0.0952789 + neutron 0 1 0.224495 2.24016 12.6773 16.0054 + neutron 0 1 0.0120356 0.00268767 1.05741 4.63665 + Ir186[0.0] 77 186 0.228926 -218.977 172.017 -41.8299 +0 0 -0.041257 23 + proton 1 1 1000 0 0 1696.04 + neutron 0 1 236.479 383.336 295.749 515.639 + pi0 0 0 178.339 144.088 82.2491 228.958 + proton 1 1 157.601 -267.592 73.3777 493.553 + neutron 0 1 96.5987 -245.934 -344.881 106.893 + proton 1 1 20.4458 196.818 4.79959 5.02697 + neutron 0 1 10.6937 -137.965 0.943875 -34.2622 + neutron 0 1 10.2438 105.487 -3.10901 -90.6496 + neutron 0 1 5.40551 42.5508 79.4485 -45.434 + neutron 0 1 3.70856 14.6647 -52.5813 63.2675 + neutron 0 1 2.66775 -11.4107 -49.2554 49.6374 + neutron 0 1 2.60666 48.2081 50.7919 1.10213 + neutron 0 1 2.40891 14.3843 -43.7945 -49.0672 + neutron 0 1 1.59174 -0.835615 21.5855 50.2691 + neutron 0 1 1.40131 12.7088 -49.1891 7.35768 + neutron 0 1 1.00894 -3.4648 -0.941776 43.4058 + gamma 0 0 0.520491 -0.169496 0.157646 0.466187 + gamma 0 0 0.463193 0.095267 -0.147963 -0.428461 + neutron 0 1 0.381701 4.80314 25.8533 5.09424 + neutron 0 1 0.188205 -18.0537 5.20213 -0.836303 + neutron 0 1 0.0500438 -2.2579 -7.77647 5.33571 + neutron 0 1 0.0296208 0.475408 -0.696268 7.41293 + Pt180[0.0] 78 180 0.588194 -279.937 -87.7857 333.296 +0 0 0.0339516 40 + proton 1 1 1000 0 0 1696.04 + proton 1 1 261.682 428.366 -26.4035 612.65 + proton 1 1 132.478 -163.793 443.138 207.247 + neutron 0 1 44.5716 -106.949 49.8172 267.997 + proton 1 1 44.1902 128.792 261.193 -8.27047 + proton 1 1 38.26 -263.756 -9.21724 60.0708 + proton 1 1 32.9993 -120.677 143.716 -166.722 + proton 1 1 27.4951 -191.181 120.901 34.4147 + neutron 0 1 25.834 -148.946 -155.44 53.5384 + neutron 0 1 19.9443 79.8794 168.348 56.1596 + proton 1 1 18.5738 -7.19846 -108.259 153.061 + neutron 0 1 16.7257 71.9121 149.51 64.692 + proton 1 1 15.2904 -8.2077 156.288 -66.586 + neutron 0 1 12.8184 149.115 -7.86549 -44.2096 + neutron 0 1 9.38015 -111.959 -67.0375 -26.1835 + neutron 0 1 7.7989 79.8418 -58.6526 -70.0083 + neutron 0 1 5.40217 44.6477 -80.5054 -41.3041 + neutron 0 1 5.07924 74.4152 -8.35629 -62.9516 + neutron 0 1 5.0577 -1.61403 -45.487 -86.3596 + neutron 0 1 4.68954 -15.8441 -73.936 -55.8273 + neutron 0 1 4.68922 14.053 60.2542 70.7502 + neutron 0 1 3.06255 72.1573 17.2272 16.1508 + neutron 0 1 2.74239 -35.3496 -59.7573 18.4469 + neutron 0 1 2.51903 -27.2787 53.6929 33.36 + neutron 0 1 2.18976 -59.5622 22.8075 7.19796 + neutron 0 1 2.15392 61.5723 -11.222 11.622 + neutron 0 1 1.96235 31.7033 -9.48832 50.9532 + neutron 0 1 1.80421 -4.30039 -33.9191 47.1657 + neutron 0 1 1.7571 20.435 -53.712 -1.52862 + neutron 0 1 1.65709 -4.06993 47.7748 28.5946 + neutron 0 1 1.53122 -44.3197 -23.3357 -19.2594 + gamma 0 0 1.5075 -0.853091 -0.809732 -0.94293 + gamma 0 0 1.33123 -0.728021 -0.205964 -1.09532 + neutron 0 1 0.960462 17.3845 38.0291 7.57118 + neutron 0 1 0.865187 -35.7397 -18.6682 0.849968 + proton 1 1 0.674929 14.4978 0.881423 -32.4966 + gamma 0 0 0.507936 -0.0176976 0.26508 -0.432918 + gamma 0 0 0.274053 0.251467 0.0837132 -0.0697248 + neutron 0 1 0.210451 18.3174 1.62916 -7.57148 + Lu164[0.0] 71 164 3.68381 45.003 -883.279 585.366 +0 0 0.00710382 22 + proton 1 1 1000 0 0 1696.04 + neutron 0 1 407.493 545.526 -89.89 791.268 + neutron 0 1 142.015 -318.049 -186.874 388.532 + pi+ 1 0 88.368 149.283 -27.579 97.1078 + neutron 0 1 48.824 -211.182 35.7032 219.677 + neutron 0 1 11.1522 61.5288 111.287 70.0734 + proton 1 1 10.9515 -106.305 55.2932 -79.4536 + proton 1 1 7.03977 6.15625 114.898 4.52068 + neutron 0 1 5.60765 -34.9472 83.6371 48.5023 + neutron 0 1 5.45731 -71.058 -38.7741 -61.0909 + neutron 0 1 2.34117 11.2007 -4.09005 65.2891 + neutron 0 1 1.90875 -58.182 -13.3134 5.29595 + neutron 0 1 1.73956 23.181 31.4211 -41.7999 + neutron 0 1 1.73767 -45.0147 34.8254 -5.40373 + gamma 0 0 1.68529 -1.42082 -0.330134 0.844099 + neutron 0 1 0.881373 -3.93618 6.85662 39.931 + proton 1 1 0.602925 22.6277 17.7563 -17.4494 + neutron 0 1 0.219783 0.295113 13.2938 -15.37 + neutron 0 1 0.137378 -8.15622 -13.3331 3.72483 + neutron 0 1 0.0946799 -12.7795 1.64985 -3.44777 + neutron 0 1 0.0390478 -6.03063 -1.3592 5.92971 + Os180[0.0] 76 180 0.157022 57.2644 -131.079 179.356 +-0.00668242 0.00439657 0.0439361 20 + proton 1 1 999.961 -143.625 94.4955 1687.26 + proton 1 1 332.802 -635.824 -363.379 446.048 + proton 1 1 225.594 580.004 240.398 282.902 + pi0 0 0 114.164 56.3029 127.049 156.654 + proton 1 1 45.0085 -125.433 141.426 225.281 + proton 1 1 22.2064 -198.216 -43.0043 32.0215 + neutron 0 1 9.49273 104.796 -51.587 65.4588 + neutron 0 1 8.63635 82.5884 -97.3168 3.46555 + neutron 0 1 5.77261 27.7028 -73.2907 -68.861 + neutron 0 1 5.11775 3.5027 65.3881 -73.1796 + neutron 0 1 2.83381 36.1551 34.4508 53.283 + neutron 0 1 2.80691 24.4905 -14.5213 66.8714 + neutron 0 1 1.61472 29.2967 12.5109 44.9674 + gamma 0 0 1.24717 -1.14774 0.271676 0.405355 + neutron 0 1 1.17794 21.367 -41.7681 -3.70888 + gamma 0 0 1.15364 0.208842 -0.804499 0.800029 + neutron 0 1 0.797122 9.12023 -32.9929 18.0782 + gamma 0 0 0.737785 0.220237 0.550712 0.438792 + gamma 0 0 0.271 0.212352 0.162713 0.0432726 + Os185[0.0] 76 185 0.731751 -158.973 190.952 436.287 +0.000619809 0.000175288 0.0236265 10 + proton 1 1 1000 14.7618 4.17475 1695.97 + proton 1 1 938.157 -364.046 -61.9284 1582.49 + neutron 0 1 10.2467 -52.0122 58.2416 115.163 + neutron 0 1 7.15611 110.902 -25.6148 23.3056 + neutron 0 1 2.13954 58.3637 9.45069 -23.0088 + gamma 0 0 1.39156 -1.30282 -0.34376 0.347743 + gamma 0 0 0.738247 0.265107 0.675236 0.137054 + neutron 0 1 0.644526 -22.631 21.1596 15.8642 + neutron 0 1 0.59959 -5.635 -21.7582 24.9379 + Au192[0.0] 79 192 0.243492 290.858 24.2926 -43.2649 +0 0 -0.0443479 18 + proton 1 1 1000 0 0 1696.04 + proton 1 1 628.85 -645.799 -182.617 1060.71 + neutron 0 1 92.2842 318.96 -149.119 240.746 + neutron 0 1 70.0904 309.879 190.251 66.3419 + neutron 0 1 47.3664 -235.284 98.3312 161.937 + neutron 0 1 42.0981 234.818 157.643 29.8215 + proton 1 1 9.36833 -33.6416 27.3894 125.642 + neutron 0 1 4.57069 -40.1749 -16.2372 82.0496 + neutron 0 1 3.11738 45.7903 -53.1387 30.7767 + gamma 0 0 2.77163 2.46488 -1.26483 -0.0806126 + neutron 0 1 0.833636 -19.3506 27.001 21.5338 + gamma 0 0 0.682985 -0.4162 -0.524613 -0.134267 + neutron 0 1 0.423423 22.7798 -3.75905 -16.211 + neutron 0 1 0.293205 -10.7549 0.983358 20.8428 + neutron 0 1 0.0915328 8.09562 9.8123 3.1922 + neutron 0 1 0.0720192 10.6102 -2.56595 4.02223 + neutron 0 1 0.0446427 -3.40797 -8.29471 1.86415 + Pt184[0.0] 78 184 0.0841858 35.4291 -93.8904 -137.02 +0 0 -0.0268678 36 + proton 1 1 1000 0 0 1696.04 + pi0 0 0 291.83 -180.099 271.343 240.586 + proton 1 1 88.3379 -14.3499 123.081 397.767 + neutron 0 1 48.4048 142.929 -159.399 217.865 + proton 1 1 37.484 -138.215 228.192 23.8845 + neutron 0 1 22.4563 199.115 -55.1859 -3.2057 + neutron 0 1 22.2426 -145.124 -45.0073 -138.582 + neutron 0 1 19.1461 37.1285 -138.44 125.699 + neutron 0 1 17.5506 -118.699 118.727 -71.4304 + neutron 0 1 14.9951 57.822 -12.369 -157.817 + neutron 0 1 13.2132 -39.3317 -151.958 -19.1212 + neutron 0 1 12.4475 89.2704 121.676 27.7718 + neutron 0 1 10.4537 73.445 -45.0661 -111.032 + neutron 0 1 9.96907 -19.4791 131.82 -32.8129 + neutron 0 1 7.07992 -31.8242 -103.865 -39.4156 + neutron 0 1 6.03653 -77.2933 37.4217 63.2868 + proton 1 1 4.71914 -55.0176 -19.1516 -74.0556 + neutron 0 1 4.41397 -65.8505 60.8079 -16.7337 + neutron 0 1 4.26065 -34.2025 -76.8143 30.8903 + neutron 0 1 3.57999 47.1631 56.1508 36.9163 + gamma 0 0 2.99504 2.42733 -1.6405 0.622147 + gamma 0 0 2.46139 1.57499 -1.69408 -0.841389 + neutron 0 1 2.39725 21.9809 27.6405 -57.1255 + neutron 0 1 2.35556 64.7935 15.2868 -0.275461 + neutron 0 1 2.06963 -39.4539 42.2501 -23.4887 + gamma 0 0 1.73765 -1.48564 0.081812 0.897568 + gamma 0 0 1.41363 0.48991 0.260033 -1.30028 + neutron 0 1 1.35791 -39.9563 -14.341 -27.4111 + gamma 0 0 1.10255 -0.123264 -0.0266675 -1.09531 + gamma 0 0 1.05137 -0.239197 -0.494419 -0.896503 + neutron 0 1 0.891276 37.512 14.6473 -7.34361 + neutron 0 1 0.643685 -23.741 14.1309 -21.1345 + neutron 0 1 0.357958 -12.4039 14.1176 17.8777 + alpha 2 4 0.890463 20.3267 66.7378 42.0944 + triton 1 3 0.65084 27.0511 -38.2965 38.1941 + W166[0.0] 74 166 5.84409 213.863 -480.625 1236.81 +0 0 0.0151999 43 + proton 1 1 1000 0 0 1696.04 + neutron 0 1 374.768 -331.993 -335.788 788.49 + proton 1 1 60.8703 131.621 -315.96 27.8609 + proton 1 1 59.2736 -264.664 -210.895 -14.8057 + neutron 0 1 43.4794 101.274 254.001 93.9207 + proton 1 1 25.1318 -15.9696 87.5615 199.676 + proton 1 1 24.3254 -134.422 3.05209 167.812 + neutron 0 1 15.376 72.3746 43.8491 -148.22 + proton 1 1 13.0865 -123.155 82.2481 52.8856 + proton 1 1 10.9138 47.2205 2.60223 135.509 + neutron 0 1 10.6386 73.1739 113.744 42.5723 + neutron 0 1 10.6307 58.2399 26.9471 -126.378 + neutron 0 1 9.64264 2.21444 -134.861 4.51882 + proton 1 1 7.72284 54.73 -76.9865 75.0307 + neutron 0 1 7.61703 -40.7585 112.554 -6.46612 + neutron 0 1 6.8017 -36.3657 100.249 -38.1472 + neutron 0 1 6.26743 2.84481 83.6536 69.3584 + gamma 0 0 6.02718 -0.503253 1.24567 5.87554 + proton 1 1 5.98736 27.7387 -99.7958 -23.2973 + neutron 0 1 4.26315 -88.7736 10.2819 6.5355 + neutron 0 1 4.23877 16.0593 -36.3681 80.0164 + neutron 0 1 3.24989 -8.59319 -8.48297 77.277 + proton 1 1 3.1385 -6.67725 -63.3802 42.869 + gamma 0 0 2.01872 -1.95985 -0.413334 0.251788 + neutron 0 1 2.00773 -7.66486 -50.3294 34.4242 + neutron 0 1 1.96219 -42.6126 -7.99918 42.5587 + neutron 0 1 1.87457 15.9947 -55.62 -13.2915 + gamma 0 0 1.84874 -1.77443 0.490157 -0.170279 + neutron 0 1 1.36963 39.8832 6.90526 -30.6142 + neutron 0 1 1.26137 -27.0499 -14.0885 -37.9695 + neutron 0 1 1.02547 -16.374 36.9664 -17.1297 + neutron 0 1 0.86971 21.913 30.5993 -14.7837 + neutron 0 1 0.786368 26.9579 -25.5246 10.0037 + neutron 0 1 0.736704 -24.4304 13.9947 -24.3354 + neutron 0 1 0.414518 23.1725 15.5454 0.694505 + neutron 0 1 0.4057 -27.3109 3.69587 -1.72727 + neutron 0 1 0.374944 -18.672 18.7021 2.50911 + neutron 0 1 0.328818 -20.5108 6.24137 -12.5838 + gamma 0 0 0.103308 -0.0954208 0.0307985 0.0248772 + neutron 0 1 0.0812819 5.92991 -10.5875 -2.34248 + neutron 0 1 0.0496072 1.42741 -2.99958 9.06565 + deuteron 1 2 5.83204 27.5205 143.283 -24.9771 + Yb160[0.0] 70 160 1.25184 490.041 251.635 263.537 +-0.00150879 0.00167725 0.0212584 33 + proton 1 1 999.994 -46.0604 51.2031 1694.63 + neutron 0 1 276.75 333.888 58.1783 694.1 + proton 1 1 123.037 -140.007 290.333 -376.997 + neutron 0 1 109.052 148.982 440.334 -26.9492 + neutron 0 1 94.2297 161.733 -130.406 377.87 + neutron 0 1 31.4362 34.9313 -180.387 -162.177 + neutron 0 1 24.6114 -104.583 -189.514 -0.749061 + neutron 0 1 19.149 181.615 -57.986 1.941 + neutron 0 1 10.4232 106.045 -91.6208 -7.4447 + neutron 0 1 9.42656 -30.8533 8.47043 129.534 + neutron 0 1 7.61566 -104.242 50.4056 -31.0124 + proton 1 1 6.13253 24.4822 38.662 -97.2185 + neutron 0 1 5.79676 -89.7393 52.5117 10.7631 + neutron 0 1 5.34175 15.2318 -6.6714 98.9438 + proton 1 1 5.18752 -77.935 55.8886 -23.7513 + neutron 0 1 3.93509 37.1859 68.4672 36.5991 + proton 1 1 3.4278 -4.98531 78.7576 -14.7159 + proton 1 1 3.13629 39.0392 -61.8593 -23.3361 + neutron 0 1 2.61865 -42.5403 -54.6764 -11.3342 + neutron 0 1 2.14793 -17.8963 -58.8872 -15.9024 + neutron 0 1 1.94088 44.24 -36.1758 19.6233 + neutron 0 1 1.78136 25.5064 -34.0718 39.2315 + neutron 0 1 1.30005 14.0297 21.3893 42.3122 + neutron 0 1 1.11585 9.42208 -35.5765 -27.2693 + neutron 0 1 1.08683 36.3932 3.32177 -26.6078 + neutron 0 1 0.506452 -30.2087 -5.97077 -1.93086 + neutron 0 1 0.246848 18.1953 -10.587 4.55691 + neutron 0 1 0.237655 2.4924 -9.16351 18.8801 + gamma 0 0 0.144984 0.0776904 -0.122063 -0.00922407 + neutron 0 1 0.0528968 -5.58854 -3.26552 7.58337 + alpha 2 4 7.4742 -65.9598 217.961 -62.5872 + deuteron 1 2 24.8918 273.991 110.857 81.4496 + Hf164[0.0] 72 164 6.60204 -839.006 -477.392 1041.23 +0 0 -0.0245185 27 + proton 1 1 1000 0 0 1696.04 + proton 1 1 370.78 477.4 -152.549 762.942 + proton 1 1 123.232 432.31 191.202 -151.609 + neutron 0 1 92.6613 -357.331 -193.927 -131.969 + proton 1 1 81.0195 96.8039 176.725 343.508 + neutron 0 1 56.596 183.642 -119.036 -248.315 + proton 1 1 35.3849 154.649 16.3923 208.49 + neutron 0 1 31.7302 34.6025 -228.42 85.2012 + neutron 0 1 17.931 -98.5961 145.746 -55.2559 + proton 1 1 10.4642 10.6562 -137.83 25.2033 + gamma 0 0 2.74946 0.0137597 0.75164 2.64469 + neutron 0 1 2.26951 7.62153 -39.0464 -51.8377 + neutron 0 1 2.17652 -63.08 -2.57269 10.44 + neutron 0 1 2.00714 52.8813 31.2847 0.738825 + neutron 0 1 1.2541 -32.0399 36.4782 0.992409 + neutron 0 1 0.91332 -30.1576 -10.5374 -26.3925 + neutron 0 1 0.791504 24.5458 18.1186 23.6048 + neutron 0 1 0.768878 -32.1876 -20.2329 0.0276634 + neutron 0 1 0.68903 7.71267 29.6908 -18.8208 + neutron 0 1 0.614803 4.15274 32.3932 9.43986 + gamma 0 0 0.582766 -0.149402 0.061499 0.559922 + neutron 0 1 0.533829 -1.52082 28.5944 13.5449 + neutron 0 1 0.381075 15.3656 21.5539 -3.94492 + neutron 0 1 0.231676 9.27014 1.0707 -18.6634 + neutron 0 1 0.0793129 -11.4858 2.41042 3.36348 + neutron 0 1 0.0147245 1.3552 -4.89647 -1.3629 + Re175[0.0] 75 175 5.06797 -886.437 176.576 913.513 +0 0 -0.0260088 32 + proton 1 1 1000 0 0 1696.04 + neutron 0 1 203.496 -410.129 451.02 228.43 + proton 1 1 147.484 534.672 -54.7889 98.1668 + proton 1 1 105.655 -196.457 -408.913 60.1923 + neutron 0 1 65.3759 177.677 -295.889 -89.4677 + neutron 0 1 59.7242 105.834 -216.144 240.578 + neutron 0 1 54.8313 307.742 52.8908 -92.4071 + neutron 0 1 53.8396 223.784 41.9549 228.54 + neutron 0 1 21.0691 3.08139 73.8992 185.916 + neutron 0 1 11.8725 -86.783 82.8828 -89.7224 + neutron 0 1 10.3648 -79.5789 79.383 83.3651 + neutron 0 1 9.27135 -1.99885 129.323 27.9229 + neutron 0 1 7.40821 46.8126 41.2823 -100.4 + neutron 0 1 7.12203 85.1038 -70.5162 34.9106 + neutron 0 1 5.49397 -50.4888 88.3289 -1.72008 + neutron 0 1 5.04433 13.9654 2.39006 96.4555 + gamma 0 0 4.61501 0.348159 -4.28498 -1.67811 + neutron 0 1 4.37781 65.1989 37.263 51.051 + proton 1 1 2.27427 -41.6878 41.5199 -28.481 + neutron 0 1 2.1462 -38.6433 -35.0292 -36.2937 + proton 1 1 2.09106 35.6354 -51.5143 2.17576 + neutron 0 1 2.06512 41.7858 33.8298 31.534 + neutron 0 1 0.912959 -23.0285 24.5975 24.105 + neutron 0 1 0.662101 -10.3759 -30.1618 -15.0738 + neutron 0 1 0.518271 8.2136 -5.52139 29.601 + neutron 0 1 0.380056 -8.59498 14.3491 20.8459 + gamma 0 0 0.252124 0.127577 0.0908151 -0.197594 + gamma 0 0 0.158927 -0.140246 -0.0661582 0.0348127 + alpha 2 4 4.00071 166.675 35.2578 28.5845 + triton 1 3 12.414 -215.42 -17.5155 152.281 + deuteron 1 2 0.420041 22.4184 -6.75547 32.0566 + Hf165[0.0] 72 165 2.28672 -675.762 -33.1652 494.741 +0 0 -0.034343 30 + proton 1 1 1000 0 0 1696.04 + neutron 0 1 318.999 481.545 -157.996 666.598 + neutron 0 1 148.514 93.9058 -220.971 -493.445 + neutron 0 1 91.0897 -11.523 -368.271 -209.071 + neutron 0 1 82.2267 225.198 293.458 -156.346 + proton 1 1 79.4967 -136.596 311.318 199.803 + neutron 0 1 19.8994 -79.6692 155.978 -84.3394 + neutron 0 1 12.8888 23.1755 81.6053 131.108 + neutron 0 1 9.10173 -58.0041 90.862 -74.6043 + neutron 0 1 8.12453 -80.8828 48.57 80.1998 + proton 1 1 6.29907 23.2943 51.4448 93.1181 + neutron 0 1 5.014 21.2529 93.4035 -16.4683 + neutron 0 1 3.98959 -38.8604 -64.8391 42.4105 + neutron 0 1 3.64662 -44.1087 -22.8624 -66.3138 + neutron 0 1 3.12728 34.2921 50.6324 46.3331 + neutron 0 1 2.82029 -17.7991 17.6319 68.4103 + neutron 0 1 2.47971 26.4061 59.0222 22.0214 + neutron 0 1 2.11609 10.2315 -42.8706 -45.1478 + neutron 0 1 2.07831 -50.246 2.3779 -37.1406 + gamma 0 0 1.94905 -0.131047 1.70386 -0.937271 + proton 1 1 1.79916 5.0356 55.3514 17.0382 + neutron 0 1 1.21685 -43.3415 -16.4284 -11.8208 + neutron 0 1 0.864418 17.4008 -34.0685 12.7142 + gamma 0 0 0.761128 0.238575 -0.249003 0.678524 + gamma 0 0 0.672759 0.133738 -0.514013 0.412927 + neutron 0 1 0.366038 -1.63358 -23.8244 10.8489 + neutron 0 1 0.25925 6.11883 6.12009 20.3061 + neutron 0 1 0.232115 8.20221 -1.21121 19.1699 + gamma 0 0 0.119324 0.105953 -0.0375088 -0.0400632 + Ir174[0.0] 77 174 7.52363 -413.745 -365.34 1460.55 +0 0 -0.0424028 28 + proton 1 1 1000 0 0 1696.04 + proton 1 1 361.467 65.3551 416.86 794.306 + proton 1 1 127.991 -470.538 -161.421 95.3928 + neutron 0 1 75.208 196.8 -266.889 -192.411 + proton 1 1 68.3426 -340.489 130.316 -1.89457 + neutron 0 1 39.9054 270.168 -19.4268 -56.6722 + neutron 0 1 26.1061 11.5585 -179.765 131.488 + neutron 0 1 25.4144 -43.8798 -63.9171 205.893 + neutron 0 1 22.9047 -55.8715 -154.069 129.254 + neutron 0 1 15.2426 109.285 -126.652 -29.854 + neutron 0 1 9.10091 -101.402 -82.8605 -6.03749 + neutron 0 1 7.93276 -92.9704 -76.6678 -21.1704 + neutron 0 1 7.78053 -57.8825 53.5037 92.0224 + neutron 0 1 7.66901 42.1609 -111.364 -17.043 + neutron 0 1 4.79021 66.2718 13.9582 -66.6152 + neutron 0 1 2.86558 55.2376 47.4053 9.7241 + neutron 0 1 2.7727 71.7448 7.21277 4.31447 + gamma 0 0 2.28801 -1.05725 -1.85726 0.817181 + neutron 0 1 1.94192 34.1094 49.6452 4.97873 + neutron 0 1 1.79707 53.4832 -21.4309 7.77276 + neutron 0 1 1.66568 -43.6305 32.5049 13.1382 + gamma 0 0 1.60811 -1.09041 -0.875842 -0.793677 + gamma 0 0 1.15084 -0.903048 0.318022 0.638596 + neutron 0 1 0.801943 28.7637 -7.88676 -24.8606 + neutron 0 1 0.300005 4.82153 1.15875 23.2217 + neutron 0 1 0.229505 -5.39711 -11.2955 16.5712 + triton 1 3 5.70875 -67.8121 142.162 -85.4327 + Os173[0.0] 76 173 2.09754 273.159 391.347 669.289 +0 0 0.0375754 12 + proton 1 1 1000 0 0 1696.04 + proton 1 1 568.495 431.754 -417.45 1014.55 + proton 1 1 402.414 -318.326 464.336 774.691 + gamma 0 0 2.02903 -0.0800697 -1.18501 -1.64509 + neutron 0 1 1.61851 35.8294 -41.7759 -3.87955 + gamma 0 0 1.14165 -0.853488 -0.562287 -0.508685 + neutron 0 1 1.10831 -24.1095 26.8544 27.9547 + gamma 0 0 1.03671 -0.619002 -0.540284 0.63222 + gamma 0 0 0.975895 -0.435356 0.389106 -0.781942 + gamma 0 0 0.96257 0.330035 0.64596 0.632734 + gamma 0 0 0.189612 -0.0124063 -0.033389 -0.186237 + Pt194[0.0] 78 194 0.0816841 -123.478 -30.6785 -115.422 +0 0 -0.0241656 42 + proton 1 1 1000 0 0 1696.04 + proton 1 1 205.682 -323.602 245.684 513.028 + neutron 0 1 205.528 -460.093 -121.7 -449.399 + proton 1 1 112.35 68.6716 244.192 398.883 + proton 1 1 86.3141 105.563 -19.6822 397.356 + proton 1 1 25.6845 -60.6915 -186.877 101.248 + proton 1 1 24.7708 56.9021 15.312 208.866 + neutron 0 1 22.8759 36.0793 156.939 132.584 + neutron 0 1 21.6207 -89.2319 -170.056 64.9152 + proton 1 1 10.1707 117.938 27.0282 67.4493 + neutron 0 1 8.08188 -69.0974 -46.4995 -91.1897 + neutron 0 1 6.68616 4.66719 72.2409 85.8391 + neutron 0 1 6.40228 -92.0495 56.5719 -19.9561 + neutron 0 1 4.94512 25.6564 -90.6617 -20.9568 + neutron 0 1 3.82492 10.7636 7.92996 83.8058 + gamma 0 0 3.67128 3.04776 2.04109 0.152976 + neutron 0 1 3.59303 76.1658 -3.78344 30.8081 + neutron 0 1 3.48654 0.000436851 -80.889 4.56098 + neutron 0 1 2.71109 -64.7001 -25.9055 -15.6411 + neutron 0 1 2.62064 -38.16 -44.9268 -38.1679 + neutron 0 1 2.51975 16.7399 19.894 -63.7596 + neutron 0 1 2.28967 -44.6132 -24.8941 -41.204 + gamma 0 0 1.46692 0.132048 -0.674066 -1.29617 + neutron 0 1 1.22351 14.8516 36.3999 -27.4793 + neutron 0 1 1.20969 15.5616 41.8482 16.769 + neutron 0 1 0.979603 -26.0991 9.56932 -32.696 + gamma 0 0 0.815514 0.031978 -0.170253 -0.796903 + gamma 0 0 0.805653 -0.225648 -0.244291 0.733813 + gamma 0 0 0.788566 -0.0488781 0.167046 -0.769118 + neutron 0 1 0.67718 -9.54208 -11.3761 32.4423 + proton 1 1 0.663891 30.7228 -17.1065 3.12117 + neutron 0 1 0.614697 18.9376 -28.2281 -0.128743 + neutron 0 1 0.519572 -18.1179 -20.0228 15.7304 + neutron 0 1 0.432435 20.2671 19.4533 -4.85836 + gamma 0 0 0.415529 -0.243576 0.286203 0.177267 + neutron 0 1 0.111741 -14.275 0.717289 -2.38722 + neutron 0 1 0.0985224 7.04205 -7.89879 8.55364 + neutron 0 1 0.00781862 1.92129 -3.31541 -0.0946903 + alpha 2 4 5.43159 161.132 26.9797 117.6 + alpha 2 4 5.61963 156.609 104.807 80.089 + alpha 2 4 2.26586 -25.1415 60.7842 -112.116 + Ho155[0.0] 67 155 0.947936 386.532 -243.931 254.226 +0 0 0.0172698 26 + proton 1 1 1000 0 0 1696.04 + proton 1 1 365.705 -671.642 -19.5973 607.053 + neutron 0 1 145.098 104.79 57.5602 528.599 + neutron 0 1 112.903 200.376 -358.646 -236.918 + neutron 0 1 104.797 -89.2479 177.372 410.466 + proton 1 1 38.5143 9.88655 83.4425 258.257 + neutron 0 1 26.2758 137.605 -71.3456 -161.372 + neutron 0 1 11.9843 -32.1061 -1.06014 147.078 + neutron 0 1 9.02972 -58.0892 94.6063 68.7376 + neutron 0 1 7.82982 -59.4816 61.6194 -86.2529 + neutron 0 1 7.0216 94.7119 43.2546 -49.0155 + gamma 0 0 3.34972 0.217454 2.29814 -2.42733 + neutron 0 1 2.43013 49.6038 6.19177 45.5365 + neutron 0 1 2.40774 11.0613 -25.261 -61.3985 + gamma 0 0 2.11089 1.01574 -1.3272 -1.28944 + gamma 0 0 1.94887 -1.61243 0.984057 0.479374 + neutron 0 1 1.93607 48.4491 -19.5032 -30.2357 + neutron 0 1 1.79545 -38.0019 34.3127 27.4883 + neutron 0 1 1.54162 -28.7355 40.9721 19.8707 + neutron 0 1 0.963324 -15.9767 25.0775 30.4467 + neutron 0 1 0.884703 -20.0975 -34.6879 -7.48957 + neutron 0 1 0.71139 10.2531 12.5242 32.792 + gamma 0 0 0.124852 -8.77343e-05 -0.00753198 -0.124625 + neutron 0 1 0.0731471 0.841546 -7.86283 -8.65599 + neutron 0 1 0.011888 -2.5944 2.12732 3.32908 + Pt178[0.0] 78 178 0.477299 348.775 -103.046 161.084 +0 0 0.031297 27 + proton 1 1 1000 0 0 1696.04 + proton 1 1 140.971 178.453 -277.119 419.25 + proton 1 1 133.961 -147.879 362.677 -340.481 + neutron 0 1 133.815 473.724 -82.8891 -195.134 + neutron 0 1 132.645 -285.734 -2.53862 430.352 + proton 1 1 105.367 336.02 170.614 258.477 + neutron 0 1 69.3741 29.8241 -66.9198 360.289 + proton 1 1 47.3076 -88.1721 -120.299 262.234 + proton 1 1 26.4819 91.7179 -93.39 182.378 + neutron 0 1 11.5316 135.678 -45.324 36.6001 + neutron 0 1 10.142 -64.8243 107.781 -57.8115 + neutron 0 1 9.65135 -111.801 -67.4188 34.4182 + neutron 0 1 7.01511 -59.8289 -94.5471 26.6997 + neutron 0 1 5.79911 56.2579 -29.6029 83.0039 + neutron 0 1 5.65012 3.24421 14.0342 102.185 + neutron 0 1 3.94102 -82.5898 -18.6087 -15.9335 + gamma 0 0 3.44662 -0.822866 0.865727 3.23305 + neutron 0 1 2.28498 -18.9718 46.4731 42.1821 + gamma 0 0 1.90783 0.651463 -1.08472 -1.42786 + gamma 0 0 1.82515 -0.0910014 1.17551 -1.39322 + neutron 0 1 1.52095 48.7824 21.9238 -0.0146152 + neutron 0 1 1.34697 35.6809 35.1826 -4.69047 + neutron 0 1 0.671927 -7.9795 24.259 -24.7168 + gamma 0 0 0.179345 0.052531 0.0621588 0.159817 + neutron 0 1 0.155487 8.49028 14.4267 -3.46261 + neutron 0 1 0.029671 -0.429553 -3.5615 6.54888 + Re177[0.0] 75 177 0.909543 -529.454 103.83 93.0928 +0.000142025 -0.0011493 0.0268 29 + proton 1 1 999.992 25.4807 -17.7094 1695.75 + neutron 0 1 263.199 393.653 257.056 585.507 + proton 1 1 135.251 28.1535 293.306 430.438 + neutron 0 1 105.597 -375.574 -189.088 181.027 + proton 1 1 85.0642 -251.747 -96.2459 306.958 + proton 1 1 63.6042 -142.621 -296.678 -122.651 + proton 1 1 61.3587 298.121 112.018 132.223 + neutron 0 1 24.4968 -142.509 -76.7945 142.922 + proton 1 1 13.4961 85.4757 -80.3652 108.368 + proton 1 1 12.0957 12.8511 -125.429 83.3477 + neutron 0 1 11.8677 -102.567 -101.995 -38.9735 + proton 1 1 11.559 -78.9034 -87.6922 88.9326 + neutron 0 1 10.157 125.518 -41.6673 41.2133 + neutron 0 1 9.0762 32.4442 49.0368 116.964 + neutron 0 1 4.02274 59.1988 0.82755 63.7986 + neutron 0 1 3.76527 -79.8256 -20.8197 16.8534 + neutron 0 1 3.39591 -51.6593 49.3624 35.8828 + neutron 0 1 2.92498 47.2842 50.5371 -26.743 + neutron 0 1 2.51735 -53.6834 -21.1048 -37.5426 + neutron 0 1 1.83681 -14.9872 -53.5135 19.1485 + gamma 0 0 1.8079 -0.979861 1.3378 0.720195 + neutron 0 1 1.50706 -7.11647 35.1099 39.3813 + neutron 0 1 1.26703 0.635486 -30.6098 -38.0152 + neutron 0 1 0.829978 -28.3481 22.6055 15.6748 + neutron 0 1 0.481703 -5.95145 28.7007 -6.8018 + gamma 0 0 0.47674 0.429392 -0.191408 -0.0791657 + neutron 0 1 0.44937 15.9308 11.8133 -21.2434 + neutron 0 1 0.0873812 6.6832 -7.0915 -8.32188 + Ta173[0.0] 73 173 1.01208 255.575 299.865 -413.245 +0 0 -0.0489119 8 + proton 1 1 1000 0 0 1696.04 + pi0 0 0 467.139 260.574 -63.566 521.905 + proton 1 1 270.823 37.1376 30.5996 761.079 + neutron 0 1 110.511 -224.912 25.8399 410.639 + gamma 0 0 1.01642 -0.330701 0.931723 -0.235863 + gamma 0 0 0.409352 -0.0616194 -0.331692 0.231847 + neutron 0 1 0.256063 9.37775 8.42898 -17.9514 + Au195[0.0] 79 195 0.019572 -81.7855 -1.90233 20.3677 +-0.00154522 0.000579003 0.0180445 15 + proton 1 1 999.988 -87.493 32.7841 1693.45 + pi0 0 0 484.393 -208.382 129.042 552.562 + neutron 0 1 141.507 -85.566 -88.9422 520.29 + pi- -1 0 16.7475 12.1902 66.7308 18.8085 + neutron 0 1 6.87185 -4.27784 -75.145 -85.4123 + neutron 0 1 2.60028 -62.9752 25.8807 -16.0417 + neutron 0 1 2.20957 -26.2472 20.9331 55.044 + gamma 0 0 1.79055 1.52795 -0.451272 -0.8172 + neutron 0 1 1.75574 30.2565 9.90907 -47.8405 + neutron 0 1 1.38158 13.629 -32.4953 -36.829 + neutron 0 1 0.816302 -25.8553 22.2149 19.303 + neutron 0 1 0.58177 -13.2976 25.2155 -16.7605 + gamma 0 0 0.412918 -0.266554 0.302786 0.0881526 + gamma 0 0 0.168416 -0.0766106 0.0886412 -0.120985 + Tl190[0.0] 81 190 1.74946 281.85 -70.5004 731.174 +-0.000470108 -0.000395645 0.0290492 24 + proton 1 1 999.996 -29.5816 -27.6474 1695.55 + proton 1 1 213.847 -202.175 260.969 581.416 + proton 1 1 153.177 432.988 -302.049 -179.428 + proton 1 1 149.001 42.2728 150.907 -526.543 + proton 1 1 96.0254 -293.885 -308.592 88.4268 + proton 1 1 78.5851 266.874 155.544 241.306 + proton 1 1 54.9273 -98.1712 -290.532 -109.747 + neutron 0 1 48.67 193.998 -179.647 154.654 + proton 1 1 13.6749 126.949 -3.50406 -98.591 + neutron 0 1 13.3463 -34.9908 47.9996 -147.408 + neutron 0 1 12.8204 -34.4771 25.7844 149.673 + neutron 0 1 5.64054 26.7068 -21.9917 -97.13 + neutron 0 1 5.12456 -73.78 -30.1199 -57.4916 + neutron 0 1 5.04705 -68.8806 57.5201 38.1634 + neutron 0 1 4.42306 -46.9498 -77.9449 -7.16791 + neutron 0 1 2.45151 38.2635 -55.5625 7.83725 + neutron 0 1 1.6931 26.9592 33.8569 -36.2123 + gamma 0 0 1.16717 0.414747 -1.08421 -0.121527 + neutron 0 1 0.870743 30.4268 12.1541 -23.7379 + gamma 0 0 0.307657 -0.110496 0.287106 0.00375806 + neutron 0 1 0.267538 16.0047 13.0253 8.77509 + neutron 0 1 0.258569 9.02 19.8184 3.43824 + neutron 0 1 0.0848137 3.77072 -0.692918 12.0285 + Ta178[0.0] 73 178 9.76843 -390.809 466.207 1693.41 +0 0 -0.0119843 36 + proton 1 1 1000 0 0 1696.04 + proton 1 1 228.216 -233.884 347.547 552.132 + neutron 0 1 181.334 335.295 -498.412 113.116 + proton 1 1 99.026 -13.6667 401.786 -184.428 + neutron 0 1 82.4216 216.427 -337.403 -31.5137 + proton 1 1 67.9246 59.7768 -298.171 198.993 + neutron 0 1 18.1502 -7.81074 79.3618 167.561 + proton 1 1 15.917 -93.1855 -45.6677 139.116 + neutron 0 1 12.8441 139.873 9.5358 68.156 + neutron 0 1 9.45156 8.6071 58.0623 120.02 + neutron 0 1 9.14737 -112.722 -62.2903 -26.2006 + neutron 0 1 9.11023 55.8232 -90.1092 77.2426 + neutron 0 1 7.62114 93.1068 37.7156 65.4818 + proton 1 1 4.57831 -22.6117 -32.7462 83.8378 + proton 1 1 4.2015 -40.5655 78.715 -7.76768 + neutron 0 1 4.0743 -4.77773 79.998 35.3587 + gamma 0 0 3.35223 2.95899 0.32206 -1.54212 + neutron 0 1 2.7974 14.1688 37.0505 60.7536 + neutron 0 1 2.48792 -40.6455 -3.73727 54.9116 + neutron 0 1 2.26812 -41.3401 46.2814 20.4024 + neutron 0 1 1.89871 55.2967 22.1276 -4.91699 + neutron 0 1 1.70687 20.1711 -51.2414 -13.3337 + neutron 0 1 1.4346 -33.015 -2.96369 39.9886 + neutron 0 1 1.36778 31.8323 19.8025 -34.1567 + neutron 0 1 1.11727 24.7718 30.6935 23.3456 + neutron 0 1 0.86923 1.03452 -18.174 36.0941 + neutron 0 1 0.828217 -8.84424 28.3314 -26.0024 + gamma 0 0 0.791958 -0.158103 -0.529615 0.567194 + neutron 0 1 0.451291 -15.3612 -24.4034 -4.09196 + gamma 0 0 0.430298 0.0534224 0.0942639 0.416433 + neutron 0 1 0.136202 15.2407 0.545778 -4.83559 + neutron 0 1 0.0861392 -10.2373 7.2638 2.07609 + neutron 0 1 0.046095 -0.929142 0.671017 9.23618 + deuteron 1 2 8.15658 -86.3567 36.1062 -147.995 + alpha 2 4 1.94699 24.1972 34.3416 112.931 + Lu163[0.0] 71 163 0.537087 -332.526 109.497 201.085 +2.65355e-05 -3.76888e-06 0.0322844 37 + proton 1 1 999.998 37.6067 -5.34134 1695.61 + pi+ 1 0 237.515 181.085 -199.633 223.76 + neutron 0 1 185.841 207.003 14.3693 583.695 + neutron 0 1 31.9628 -139.883 199.565 41.1137 + neutron 0 1 19.5252 179.85 26.2662 63.5274 + neutron 0 1 19.1356 -159.334 -16.3211 -103.299 + neutron 0 1 16.8256 -1.27361 -156.539 85.9921 + proton 1 1 14.3118 -19.7911 -21.4026 161.901 + neutron 0 1 12.7294 -33.5098 -28.6934 -148.782 + neutron 0 1 12.0282 -81.4142 126.744 -7.40599 + neutron 0 1 10.5185 -91.3888 74.5638 -77.2306 + proton 1 1 10.5161 58.3416 128.11 5.33907 + neutron 0 1 8.98334 -105.821 -63.312 -41.8938 + neutron 0 1 7.97358 12.4805 70.3499 -99.7102 + neutron 0 1 7.88735 78.0221 -10.8349 93.1597 + neutron 0 1 4.85613 62.2204 -70.1569 -18.8555 + neutron 0 1 4.66851 -71.7439 38.7587 46.3155 + proton 1 1 4.37827 -39.7329 73.7864 -34.8147 + neutron 0 1 3.72032 75.8858 35.0293 -4.37013 + neutron 0 1 3.46243 -9.03056 24.9625 76.2475 + neutron 0 1 2.917 -2.83063 -27.0961 -68.9038 + neutron 0 1 2.77287 34.6373 57.2149 27.2945 + neutron 0 1 2.42 -2.29212 41.3137 -53.3037 + proton 1 1 1.97755 21.1922 -16.1528 54.8166 + neutron 0 1 1.95359 -0.695163 48.6388 -36.1754 + proton 1 1 1.34597 6.88321 -49.5475 -5.02549 + neutron 0 1 1.18361 -17.7943 -25.3477 -35.5868 + neutron 0 1 1.13717 -14.1454 -14.3091 41.6335 + neutron 0 1 0.540587 -11.4588 -27.5884 11.1222 + neutron 0 1 0.474873 21.9075 18.0253 9.36608 + neutron 0 1 0.112139 -4.45042 12.2041 6.48012 + neutron 0 1 0.0994244 9.24451 -9.93207 -1.65361 + neutron 0 1 0.0936509 6.68644 6.25972 9.5968 + gamma 0 0 0.0778019 0.0457064 0.0480301 0.0407085 + alpha 2 4 0.931055 -67.6165 20.3745 44.211 + alpha 2 4 4.2917 -145.557 -79.8076 66.7543 + Yb159[0.0] 70 159 2.23389 101.885 -205.254 780.257 +0 0 -0.0317042 20 + proton 1 1 1000 0 0 1696.04 + proton 1 1 516.93 615.417 145.543 915.061 + proton 1 1 91.6815 175.673 -366.411 -123.821 + neutron 0 1 73.3962 230.316 -187.154 -235.023 + pi0 0 0 40.7772 -99.8853 -48.0221 -19.6856 + neutron 0 1 15.6083 -154.366 8.11358 -75.3589 + neutron 0 1 10.882 -44.7109 72.489 -115.384 + neutron 0 1 3.81142 58.8578 52.2437 31.3535 + gamma 0 0 3.17307 -2.44521 -1.10491 -1.69367 + neutron 0 1 2.22552 -54.9565 23.254 25.0205 + neutron 0 1 2.17566 -16.9263 -9.41302 60.9752 + gamma 0 0 2.01846 0.26359 1.26091 -1.55396 + neutron 0 1 1.79177 12.8124 -36.2829 43.4692 + neutron 0 1 1.27899 15.5317 -17.6186 -43.0509 + neutron 0 1 1.11401 -13.3771 1.69394 43.7355 + neutron 0 1 0.809199 -16.4431 2.33183 -35.2907 + neutron 0 1 0.617901 -2.52277 -21.0727 -26.666 + gamma 0 0 0.501526 -0.0686055 -0.341818 0.360531 + gamma 0 0 0.292774 -0.0522798 -0.192647 -0.214174 + Pt185[0.0] 78 185 6.41884 -703.119 380.686 1253.81 +0 0 -0.0118597 34 + proton 1 1 1000 0 0 1696.04 + neutron 0 1 163.521 531.777 -200.472 105.072 + proton 1 1 127.844 25.1402 -57.2132 -502.338 + neutron 0 1 110.422 -201.726 330.782 263.78 + proton 1 1 89.2349 -24.4888 72.1824 411.833 + neutron 0 1 86.5181 208.999 -351.822 -51.0352 + proton 1 1 67.1559 169.899 15.5013 318.473 + proton 1 1 47.7434 215.034 50.9056 207.464 + neutron 0 1 18.3792 -163.621 0.60485 -90.0145 + neutron 0 1 10.9969 -4.0089 81.1939 119.067 + neutron 0 1 8.14286 -62.4714 -99.5561 39.4172 + neutron 0 1 7.60821 45.7991 81.1176 -75.3464 + proton 1 1 7.43393 112.058 31.1251 21.9014 + neutron 0 1 5.7377 22.8278 -76.7065 -66.4065 + neutron 0 1 4.83151 48.8095 -8.79455 81.5026 + neutron 0 1 3.68866 -81.2889 -11.065 14.6545 + neutron 0 1 3.08614 -38.8572 -24.1741 60.9469 + neutron 0 1 2.95166 2.72972 73.8815 -9.45166 + gamma 0 0 2.27003 -2.14852 -0.0554348 0.730631 + neutron 0 1 2.16399 -57.8841 25.9843 6.73419 + neutron 0 1 2.07063 11.1682 -18.8523 58.4392 + gamma 0 0 0.905248 0.703879 0.464288 0.32934 + neutron 0 1 0.657767 -11.1605 32.7682 6.1766 + neutron 0 1 0.538617 -4.52409 0.201536 31.4947 + gamma 0 0 0.47496 0.166478 0.0518592 0.441795 + gamma 0 0 0.234072 -0.189247 -0.101997 -0.092583 + neutron 0 1 0.150952 -3.51866 3.96686 -15.9864 + neutron 0 1 0.0944737 1.89085 -0.255027 -13.187 + neutron 0 1 0.0790516 11.4125 -3.66184 -2.21365 + alpha 2 4 11.2632 91.9608 -110.529 251.831 + alpha 2 4 9.20651 103.089 230.752 -69.5992 + deuteron 1 2 17.8623 74.8655 68.7717 238.726 + deuteron 1 2 0.0805064 11.7665 0.630918 12.7732 + Tm162[0.0] 69 162 3.9921 -1034.21 -137.626 339.921 +1.78988e-05 -9.4892e-05 -0.0121485 33 + proton 1 1 999.999 4.5966 -24.3693 1695.86 + neutron 0 1 365.273 -248.93 415.762 764.851 + neutron 0 1 120.889 -174.419 67.0935 454.815 + neutron 0 1 47.6945 -74.6097 -275.046 103.356 + pi- -1 0 26.373 -71.2192 -54.6117 1.63605 + proton 1 1 19.0359 51.6039 69.2949 169.172 + neutron 0 1 16.7543 174.697 31.4761 -15.9498 + proton 1 1 10.3834 91.7367 -105.502 6.81437 + neutron 0 1 8.92901 39.5804 31.1057 -119.684 + neutron 0 1 8.12406 -81.7901 -31.8006 87.3572 + proton 1 1 8.12385 -44.5069 -41.2628 107.83 + neutron 0 1 6.76456 -66.8579 66.6792 -61.9773 + neutron 0 1 6.02069 71.2133 -29.6492 -73.4813 + neutron 0 1 4.51727 39.5911 34.896 -75.6556 + neutron 0 1 4.18527 34.5608 64.4852 50.2932 + proton 1 1 3.74449 30.6424 70.327 -33.9984 + neutron 0 1 3.52451 12.9741 78.8562 -15.7737 + neutron 0 1 3.16352 71.5788 26.2453 -11.9303 + neutron 0 1 2.81456 -36.9322 37.0591 50.5913 + gamma 0 0 2.58851 2.39063 0.826269 0.550051 + neutron 0 1 2.50494 55.98 36.4062 15.9443 + gamma 0 0 1.25049 -1.24398 -0.125916 -0.0196296 + neutron 0 1 0.918028 1.65758 -41.0994 5.83321 + gamma 0 0 0.810011 -0.164765 -0.724711 0.322124 + neutron 0 1 0.802585 -2.37438 30.765 -23.5941 + gamma 0 0 0.75222 -0.509368 -0.433318 -0.344405 + neutron 0 1 0.69738 29.7944 13.2437 -15.7434 + neutron 0 1 0.634209 -23.9758 -5.96859 -24.1185 + gamma 0 0 0.350274 -0.0100621 0.349502 -0.0209456 + neutron 0 1 0.318955 -15.1959 -4.3758 18.6922 + neutron 0 1 0.13225 8.28777 12.0005 5.98623 + gamma 0 0 0.0624654 -0.0279216 -0.00913505 -0.0551259 + Ir174[0.0] 77 174 1.21388 131.077 -520.637 324.159 +0 0 -0.031459 40 + proton 1 1 1000 0 0 1696.04 + neutron 0 1 129.716 464.699 -47.2408 205.921 + proton 1 1 106.693 1.12815 -195.718 -416.282 + proton 1 1 95.6383 270.043 -71.9327 332.443 + proton 1 1 89.0055 -281.616 296.046 89.4092 + neutron 0 1 48.2201 273.817 44.0767 -126.565 + proton 1 1 27.8683 -112.885 195.003 -47.9964 + proton 1 1 26.6507 220.545 -45.5759 2.0791 + proton 1 1 21.8832 -44.1094 -187.149 67.6266 + neutron 0 1 15.5105 135.753 30.5583 100.122 + neutron 0 1 14.2444 157.28 39.6595 -25.6933 + neutron 0 1 13.7882 -138.377 -9.21456 82.8671 + neutron 0 1 13.3956 23.996 -155.885 -21.8053 + neutron 0 1 11.7937 -41.0722 -5.07578 -143.486 + proton 1 1 11.5507 -9.79291 -146.186 18.5129 + neutron 0 1 9.43153 121.355 33.281 44.4666 + neutron 0 1 9.32746 35.9666 -38.4197 121.839 + neutron 0 1 8.87966 -33.9687 120.963 -31.2893 + neutron 0 1 7.14418 -46.4063 -57.0532 -89.818 + neutron 0 1 6.71152 -105.559 37.0971 11.7496 + neutron 0 1 6.44417 47.5671 64.433 75.7412 + neutron 0 1 5.76391 65.938 -78.6867 18.0266 + neutron 0 1 5.72945 56.4622 -87.2314 1.38045 + neutron 0 1 3.60119 4.66457 -40.9293 71.2959 + proton 1 1 3.54876 34.6311 65.8312 33.7482 + neutron 0 1 3.03856 -38.2148 -62.1205 19.9941 + neutron 0 1 2.64606 59.4671 37.7262 4.43724 + neutron 0 1 1.87277 -36.9929 -36.2667 -28.9645 + neutron 0 1 1.80762 -28.1324 18.5916 -47.5705 + neutron 0 1 1.14329 22.1366 33.8912 22.6068 + neutron 0 1 1.10271 9.37945 -23.7452 -37.7033 + neutron 0 1 0.675933 7.66698 5.84368 -34.3175 + neutron 0 1 0.391543 -19.4319 -12.8737 13.8774 + neutron 0 1 0.252492 -19.2381 4.19738 9.31696 + neutron 0 1 0.159154 17.075 2.68295 0.586118 + gamma 0 0 0.13845 0.00052307 -0.0143693 -0.137701 + neutron 0 1 0.0982305 -4.65744 -8.34814 9.65476 + deuteron 1 2 8.38135 -135.453 -102.587 51.3718 + triton 1 3 3.20876 71.2046 -104.172 -46.0097 + Yb158[0.0] 70 158 10.754 -1004.87 486.538 1384.6 +-5.99576e-05 0.000269894 -0.0242535 34 + proton 1 1 1000 -4.22127 19.0017 1695.93 + neutron 0 1 184.998 -395.332 73.6779 469.195 + proton 1 1 147.35 235.264 4.21866 492.802 + proton 1 1 140.017 80.3826 -450.916 269.379 + proton 1 1 103.063 -196.912 -368.776 171.038 + proton 1 1 89.1053 -82.1308 328.233 246.308 + neutron 0 1 51.6317 -246.774 170.157 -99.1863 + neutron 0 1 15.097 122.192 13.8707 -116.077 + neutron 0 1 10.2763 -113.862 55.9392 -57.6398 + neutron 0 1 9.40034 3.80316 48.3621 -124.095 + proton 1 1 3.33847 16.1935 -37.2926 -67.9924 + neutron 0 1 3.19537 25.2823 72.8437 8.32656 + neutron 0 1 2.73224 0.926659 67.5156 -24.1349 + neutron 0 1 2.51884 -21.5555 -44.1017 -48.2699 + proton 1 1 2.17733 -38.2342 47.3511 19.6629 + neutron 0 1 2.08427 45.1456 41.8 11.6449 + neutron 0 1 1.7004 -32.8737 9.71357 -44.9793 + neutron 0 1 1.51248 -36.5736 16.1728 -35.2882 + neutron 0 1 1.48113 49.0311 -13.5911 -14.0239 + neutron 0 1 1.47778 0.807009 40.2695 34.0125 + neutron 0 1 1.13842 40.9915 14.7274 -15.5993 + neutron 0 1 1.00194 -15.443 -25.139 31.8327 + gamma 0 0 0.901714 0.29811 -0.102801 -0.844779 + neutron 0 1 0.841211 16.0585 -33.7857 13.4947 + neutron 0 1 0.820586 -20.1927 25.3569 -22.1798 + neutron 0 1 0.704775 -3.20733 36.2274 1.46577 + neutron 0 1 0.660701 -18.399 -28.6763 -9.00706 + neutron 0 1 0.542271 -6.85843 16.8479 26.2374 + neutron 0 1 0.431081 21.1164 11.0666 -15.5522 + gamma 0 0 0.0889546 -0.0706365 -0.00551115 -0.0537869 + deuteron 1 2 5.50301 -55.667 -60.7463 117.832 + alpha 2 4 3.39718 154.476 -36.3224 -12.4395 + triton 1 3 2.01323 51.8891 85.876 -35.3301 + Yb162[0.0] 70 162 1.50162 416.012 -61.7661 525.387 +-3.32223e-05 -1.92545e-07 0.0336057 47 + proton 1 1 999.999 -23.1851 -0.134372 1695.88 + proton 1 1 105.213 272.781 298.66 211.897 + proton 1 1 54.4049 47.6401 45.8238 317.307 + proton 1 1 41.9823 32.7747 -265.614 94.4404 + proton 1 1 40.5914 227.615 152.58 52.2475 + pi0 0 0 39.6415 -36.7791 -52.7743 -90.1941 + proton 1 1 30.8289 -232.871 -16.923 65.4746 + neutron 0 1 30.7884 -183.065 51.8613 150.336 + proton 1 1 26.955 -146.216 156.461 -73.8231 + proton 1 1 21.3528 -38.221 -69.7185 184.943 + neutron 0 1 15.0844 90.9779 -34.5749 -138.205 + neutron 0 1 13.6569 131.722 -92.0304 -5.42294 + neutron 0 1 12.2577 -113.423 77.1678 66.0633 + neutron 0 1 11.9641 15.6076 49.8286 141.063 + neutron 0 1 10.7812 -52.2332 -96.4919 -91.3046 + neutron 0 1 10.1541 -50.2471 -94.3764 88.0474 + neutron 0 1 9.29535 -37.6871 -101.136 -76.8425 + neutron 0 1 9.21702 24.8418 -116.784 56.1185 + neutron 0 1 8.8905 -96.6583 71.8128 47.8075 + proton 1 1 8.5111 71.093 42.9262 95.6401 + neutron 0 1 8.32198 -15.4303 -10.8659 123.9 + neutron 0 1 7.16955 -78.4318 -85.067 11.6614 + proton 1 1 6.52567 88.4879 -39.5915 53.7651 + neutron 0 1 5.21378 42.6898 58.0376 68.0718 + neutron 0 1 4.83621 24.0475 -89.2951 -23.6508 + neutron 0 1 4.46688 67.5534 2.8869 61.984 + neutron 0 1 4.35818 -60.8412 1.66046 67.1132 + neutron 0 1 4.05408 42.0873 -31.9155 69.6035 + neutron 0 1 3.82318 -41.6779 -11.1722 73.0549 + neutron 0 1 3.78594 54.3441 64.0573 8.48452 + neutron 0 1 3.29303 24.4827 -27.4691 -69.6056 + gamma 0 0 2.5727 1.15332 -2.2111 0.632217 + gamma 0 0 2.53147 -0.370082 -1.61793 -1.91146 + neutron 0 1 2.04874 24.047 0.522712 -57.2321 + gamma 0 0 1.87016 1.32871 0.0958413 1.31257 + neutron 0 1 1.78282 -1.15789 17.3143 55.2468 + proton 1 1 1.56368 39.699 4.76317 36.5796 + neutron 0 1 0.918865 -40.5417 8.69169 -2.88692 + neutron 0 1 0.837855 -17.4537 24.1203 26.2434 + neutron 0 1 0.626183 1.48557 25.5668 -22.8299 + neutron 0 1 0.44598 8.61721 -22.0008 -16.7321 + neutron 0 1 0.432131 -14.9878 -23.7848 -4.67613 + proton 1 1 0.414701 26.7498 -4.96923 -6.17488 + neutron 0 1 0.161618 -13.1569 -7.32411 8.77385 + neutron 0 1 0.149446 -11.5816 -4.59585 -11.2069 + deuteron 1 2 4.38429 18.9666 73.2411 103.642 + Er156[0.0] 68 156 0.0769138 -120.945 74.0923 47.1243 +0.000665826 -0.00088273 0.0234175 43 + proton 1 1 999.998 23.1386 -30.6764 1695.6 + proton 1 1 159.588 329.18 -362.547 -291.793 + proton 1 1 145.078 -52.7705 306.51 443.351 + neutron 0 1 97.6551 319.372 -269.855 -134.993 + neutron 0 1 45.4769 -97.5552 -271.874 -63.9766 + proton 1 1 39.1304 10.8346 151.735 227.641 + neutron 0 1 27.9844 -42.8713 -53.578 -220.592 + neutron 0 1 20.2663 -138.665 -67.3661 121.357 + proton 1 1 20.1589 -97.5755 -148.565 -81.5036 + proton 1 1 19.2354 -72.4011 154.056 86.5509 + neutron 0 1 18.9081 -118.192 145.15 29.1624 + neutron 0 1 18.1531 128.428 93.1983 -96.2382 + neutron 0 1 17.9521 -140.747 11.5472 118.801 + proton 1 1 17.1995 -55.2587 -85.1829 149.204 + neutron 0 1 15.0488 158.51 -14.5704 56.28 + proton 1 1 14.5097 -162.962 -24.9304 16.1394 + proton 1 1 10.9093 -0.050094 1.59619 143.486 + neutron 0 1 8.38531 119.094 -25.5963 -31.4447 + neutron 0 1 6.87777 -109.071 -31.0847 10.4313 + neutron 0 1 6.33105 -35.307 -83.3994 -61.1139 + neutron 0 1 5.97593 60.3089 -68.4084 54.2991 + neutron 0 1 5.032 7.93021 73.9599 -62.8343 + neutron 0 1 4.349 40.0258 -43.7503 -68.3746 + neutron 0 1 4.22924 44.3233 13.8085 -76.223 + neutron 0 1 4.10485 81.6794 -13.2613 29.7156 + neutron 0 1 2.65331 36.7572 37.7266 47.1018 + neutron 0 1 2.09295 53.8578 20.0353 -25.2038 + neutron 0 1 1.97739 -58.086 -12.2808 -13.9604 + gamma 0 0 1.90957 -1.37118 0.888317 -0.988546 + gamma 0 0 1.8484 1.76421 -0.515165 0.196832 + gamma 0 0 1.70917 0.368536 0.626659 1.54685 + gamma 0 0 1.47817 -0.871968 -1.19356 0.00757468 + neutron 0 1 1.37517 -25.8769 20.8093 38.5145 + neutron 0 1 1.34458 6.55217 19.7002 -45.7977 + proton 1 1 1.32815 19.3911 -39.4593 -23.6864 + proton 1 1 1.16174 -3.79997 40.7574 -22.4901 + neutron 0 1 0.824673 30.3847 -24.9973 -1.5003 + gamma 0 0 0.709095 -0.231434 0.113063 -0.660659 + neutron 0 1 0.49927 26.2311 14.4818 6.37576 + neutron 0 1 0.423526 25.7905 -0.830103 11.4106 + gamma 0 0 0.12532 0.118398 0.0036029 0.0409154 + alpha 2 4 9.0928 68.1002 -203.188 -148.138 + Er160[0.0] 68 160 10.3909 -332.202 709.054 1575.5 diff --git a/environments/g4py/source/GNUmakefile b/environments/g4py/source/GNUmakefile index 736b9daf49..72742bed21 100644 --- a/environments/g4py/source/GNUmakefile +++ b/environments/g4py/source/GNUmakefile @@ -1,13 +1,13 @@ -# $Id: GNUmakefile,v 1.2 2006/04/25 08:09:43 kmura Exp $ -# $Name: geant4-08-01 $ +# $Id: GNUmakefile,v 1.4 2006/11/20 08:56:26 kmura Exp $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py modules # =========================================================== include ../config/config.gmk -SUBDIR1 := global interface run event tracking track +SUBDIR1 := global interface intercoms run event tracking track SUBDIR1 += geometry materials particles processes digits_hits -SUBDIR2 := visualization graphics_reps +SUBDIR2 := visualization graphics_reps physics_lists SUBDIR3 := python SUBDIR4 := boost version diff --git a/environments/g4py/source/boost/GNUmakefile b/environments/g4py/source/boost/GNUmakefile index 2c93857891..0347d1112f 100644 --- a/environments/g4py/source/boost/GNUmakefile +++ b/environments/g4py/source/boost/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.2 2006/04/25 08:09:43 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py modules # =========================================================== diff --git a/environments/g4py/source/boost/pyG4indexing.hh b/environments/g4py/source/boost/pyG4indexing.hh index 62f0d682fd..2e2feca950 100644 --- a/environments/g4py/source/boost/pyG4indexing.hh +++ b/environments/g4py/source/boost/pyG4indexing.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4indexing.hh,v 1.4 2006/06/29 15:30:24 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4indexing.hh // diff --git a/environments/g4py/source/digits_hits/GNUmakefile b/environments/g4py/source/digits_hits/GNUmakefile index 3c67b9235a..d1e26457a5 100644 --- a/environments/g4py/source/digits_hits/GNUmakefile +++ b/environments/g4py/source/digits_hits/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.2 2006/04/25 08:09:43 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py modules # =========================================================== diff --git a/environments/g4py/source/digits_hits/pyG4VSensitiveDetector.cc b/environments/g4py/source/digits_hits/pyG4VSensitiveDetector.cc index 33075bee54..0b6f64e5fe 100644 --- a/environments/g4py/source/digits_hits/pyG4VSensitiveDetector.cc +++ b/environments/g4py/source/digits_hits/pyG4VSensitiveDetector.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4VSensitiveDetector.cc,v 1.4 2006/06/29 15:30:26 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4VSensitiveDetector.cc // diff --git a/environments/g4py/source/digits_hits/pymodG4digits_hits.cc b/environments/g4py/source/digits_hits/pymodG4digits_hits.cc index 30c74b35a9..5249be75b9 100644 --- a/environments/g4py/source/digits_hits/pymodG4digits_hits.cc +++ b/environments/g4py/source/digits_hits/pymodG4digits_hits.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pymodG4digits_hits.cc,v 1.4 2006/06/29 15:30:29 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pymodG4digits_hits.cc [Geant4Py module] // diff --git a/environments/g4py/source/event/GNUmakefile b/environments/g4py/source/event/GNUmakefile index 73a7d42c26..df7baa08bb 100644 --- a/environments/g4py/source/event/GNUmakefile +++ b/environments/g4py/source/event/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.2 2006/04/25 08:09:44 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py modules # =========================================================== diff --git a/environments/g4py/source/event/pyG4ClassificationOfNewTrack.cc b/environments/g4py/source/event/pyG4ClassificationOfNewTrack.cc index 35c84eaa12..ae139f0bac 100644 --- a/environments/g4py/source/event/pyG4ClassificationOfNewTrack.cc +++ b/environments/g4py/source/event/pyG4ClassificationOfNewTrack.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4ClassificationOfNewTrack.cc,v 1.4 2006/06/29 15:30:44 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4ClassificationOfNewTrack.cc // diff --git a/environments/g4py/source/event/pyG4Event.cc b/environments/g4py/source/event/pyG4Event.cc index bae3d8946f..875c029d7b 100644 --- a/environments/g4py/source/event/pyG4Event.cc +++ b/environments/g4py/source/event/pyG4Event.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4Event.cc,v 1.4 2006/06/29 15:31:29 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4Event.cc // diff --git a/environments/g4py/source/event/pyG4EventManager.cc b/environments/g4py/source/event/pyG4EventManager.cc index 01dac8883e..82416aa1a1 100644 --- a/environments/g4py/source/event/pyG4EventManager.cc +++ b/environments/g4py/source/event/pyG4EventManager.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4EventManager.cc,v 1.4 2006/06/29 15:31:34 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4EventManager.cc // diff --git a/environments/g4py/source/event/pyG4ParticleGun.cc b/environments/g4py/source/event/pyG4ParticleGun.cc index 0644580b50..8c717fd4ff 100644 --- a/environments/g4py/source/event/pyG4ParticleGun.cc +++ b/environments/g4py/source/event/pyG4ParticleGun.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4ParticleGun.cc,v 1.4 2006/06/29 15:31:36 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4ParticleGun.cc // diff --git a/environments/g4py/source/event/pyG4StackManager.cc b/environments/g4py/source/event/pyG4StackManager.cc index d9a0050722..8dba7c9a88 100644 --- a/environments/g4py/source/event/pyG4StackManager.cc +++ b/environments/g4py/source/event/pyG4StackManager.cc @@ -25,7 +25,7 @@ // // $Id: pyG4StackManager.cc,v 1.4 2006/06/29 15:31:38 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4StackManager.cc // diff --git a/environments/g4py/source/event/pyG4UserEventAction.cc b/environments/g4py/source/event/pyG4UserEventAction.cc index e8eb9b4fb7..b4a5e7d50e 100644 --- a/environments/g4py/source/event/pyG4UserEventAction.cc +++ b/environments/g4py/source/event/pyG4UserEventAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4UserEventAction.cc,v 1.6 2006/06/29 15:31:41 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4UserEventAction.cc // diff --git a/environments/g4py/source/event/pyG4UserStackingAction.cc b/environments/g4py/source/event/pyG4UserStackingAction.cc index 8c4f4b887e..f15320c2a3 100644 --- a/environments/g4py/source/event/pyG4UserStackingAction.cc +++ b/environments/g4py/source/event/pyG4UserStackingAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4UserStackingAction.cc,v 1.7 2006/06/29 15:31:44 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4UserStackingAction.cc // diff --git a/environments/g4py/source/event/pymodG4event.cc b/environments/g4py/source/event/pymodG4event.cc index 3d2f7ffd1f..d33ab7b8f6 100644 --- a/environments/g4py/source/event/pymodG4event.cc +++ b/environments/g4py/source/event/pymodG4event.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pymodG4event.cc,v 1.4 2006/06/29 15:31:47 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pymodG4event.cc [Geant4Py module] // diff --git a/environments/g4py/source/geometry/GNUmakefile b/environments/g4py/source/geometry/GNUmakefile index 44bf4c9f25..2f9ccc5d2f 100644 --- a/environments/g4py/source/geometry/GNUmakefile +++ b/environments/g4py/source/geometry/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.2 2006/04/25 08:09:45 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py modules # =========================================================== diff --git a/environments/g4py/source/geometry/pyG4Box.cc b/environments/g4py/source/geometry/pyG4Box.cc index 8675180562..0f50c49010 100644 --- a/environments/g4py/source/geometry/pyG4Box.cc +++ b/environments/g4py/source/geometry/pyG4Box.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4Box.cc,v 1.4 2006/06/29 15:31:50 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4Box.cc // diff --git a/environments/g4py/source/geometry/pyG4ChordFinder.cc b/environments/g4py/source/geometry/pyG4ChordFinder.cc index 6a2802ebfc..c49a2d07b8 100644 --- a/environments/g4py/source/geometry/pyG4ChordFinder.cc +++ b/environments/g4py/source/geometry/pyG4ChordFinder.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4ChordFinder.cc,v 1.4 2006/06/29 15:31:53 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4ChordFinder.cc // diff --git a/environments/g4py/source/geometry/pyG4Cons.cc b/environments/g4py/source/geometry/pyG4Cons.cc index a90086b329..6a29041dda 100644 --- a/environments/g4py/source/geometry/pyG4Cons.cc +++ b/environments/g4py/source/geometry/pyG4Cons.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4Cons.cc,v 1.4 2006/06/29 15:31:56 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4Cons.cc // diff --git a/environments/g4py/source/geometry/pyG4Field.cc b/environments/g4py/source/geometry/pyG4Field.cc index c80f2da92c..8bf7c77ca7 100644 --- a/environments/g4py/source/geometry/pyG4Field.cc +++ b/environments/g4py/source/geometry/pyG4Field.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4Field.cc,v 1.4 2006/06/29 15:31:59 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4Field.cc // diff --git a/environments/g4py/source/geometry/pyG4FieldManager.cc b/environments/g4py/source/geometry/pyG4FieldManager.cc index 3852f55bf7..3d51d975c0 100644 --- a/environments/g4py/source/geometry/pyG4FieldManager.cc +++ b/environments/g4py/source/geometry/pyG4FieldManager.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4FieldManager.cc,v 1.4 2006/06/29 15:32:02 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4FieldManager.cc // diff --git a/environments/g4py/source/geometry/pyG4LogicalVolume.cc b/environments/g4py/source/geometry/pyG4LogicalVolume.cc index 9098c5b5b5..665a0b2c03 100644 --- a/environments/g4py/source/geometry/pyG4LogicalVolume.cc +++ b/environments/g4py/source/geometry/pyG4LogicalVolume.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4LogicalVolume.cc,v 1.4 2006/06/29 15:32:08 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4LogicalVolume.cc // diff --git a/environments/g4py/source/geometry/pyG4MagneticField.cc b/environments/g4py/source/geometry/pyG4MagneticField.cc index 3988bd1157..340ec443c3 100644 --- a/environments/g4py/source/geometry/pyG4MagneticField.cc +++ b/environments/g4py/source/geometry/pyG4MagneticField.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4MagneticField.cc,v 1.4 2006/06/29 15:32:10 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4MagneticField.cc // diff --git a/environments/g4py/source/geometry/pyG4Orb.cc b/environments/g4py/source/geometry/pyG4Orb.cc index b0a1f7e627..83eeb49555 100644 --- a/environments/g4py/source/geometry/pyG4Orb.cc +++ b/environments/g4py/source/geometry/pyG4Orb.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4Orb.cc,v 1.4 2006/06/29 15:32:13 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4Orb.cc // diff --git a/environments/g4py/source/geometry/pyG4PVPlacement.cc b/environments/g4py/source/geometry/pyG4PVPlacement.cc index 9bd66a7d99..7498c080f3 100644 --- a/environments/g4py/source/geometry/pyG4PVPlacement.cc +++ b/environments/g4py/source/geometry/pyG4PVPlacement.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4PVPlacement.cc,v 1.4 2006/06/29 15:32:15 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4PVPlacement.cc // diff --git a/environments/g4py/source/geometry/pyG4PVReplica.cc b/environments/g4py/source/geometry/pyG4PVReplica.cc index 3807323522..bb7cd108f1 100644 --- a/environments/g4py/source/geometry/pyG4PVReplica.cc +++ b/environments/g4py/source/geometry/pyG4PVReplica.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4PVReplica.cc,v 1.4 2006/06/29 15:32:18 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4PVReplica.cc // diff --git a/environments/g4py/source/geometry/pyG4Para.cc b/environments/g4py/source/geometry/pyG4Para.cc index 86bc0b5be3..bf60c8e6c9 100644 --- a/environments/g4py/source/geometry/pyG4Para.cc +++ b/environments/g4py/source/geometry/pyG4Para.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4Para.cc,v 1.4 2006/06/29 15:32:21 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4Para.cc // diff --git a/environments/g4py/source/geometry/pyG4Region.cc b/environments/g4py/source/geometry/pyG4Region.cc index 354d88fe92..b3097b61bb 100644 --- a/environments/g4py/source/geometry/pyG4Region.cc +++ b/environments/g4py/source/geometry/pyG4Region.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4Region.cc,v 1.4 2006/06/29 15:32:25 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4Region.cc // diff --git a/environments/g4py/source/geometry/pyG4Sphere.cc b/environments/g4py/source/geometry/pyG4Sphere.cc index 08d00eedea..cedb1cc9a7 100644 --- a/environments/g4py/source/geometry/pyG4Sphere.cc +++ b/environments/g4py/source/geometry/pyG4Sphere.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4Sphere.cc,v 1.4 2006/06/29 15:32:27 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4Sphere.cc // diff --git a/environments/g4py/source/geometry/pyG4Torus.cc b/environments/g4py/source/geometry/pyG4Torus.cc index 0f587660c7..f4e27b5499 100644 --- a/environments/g4py/source/geometry/pyG4Torus.cc +++ b/environments/g4py/source/geometry/pyG4Torus.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4Torus.cc,v 1.4 2006/06/29 15:32:30 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4Torus.cc // diff --git a/environments/g4py/source/geometry/pyG4TouchableHistory.cc b/environments/g4py/source/geometry/pyG4TouchableHistory.cc index a9614899d1..3444e27ca9 100644 --- a/environments/g4py/source/geometry/pyG4TouchableHistory.cc +++ b/environments/g4py/source/geometry/pyG4TouchableHistory.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4TouchableHistory.cc,v 1.4 2006/06/29 15:32:33 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4VTouchable.cc // diff --git a/environments/g4py/source/geometry/pyG4TransportationManager.cc b/environments/g4py/source/geometry/pyG4TransportationManager.cc index 491a6301a6..3be4531a6b 100644 --- a/environments/g4py/source/geometry/pyG4TransportationManager.cc +++ b/environments/g4py/source/geometry/pyG4TransportationManager.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4TransportationManager.cc,v 1.4 2006/06/29 15:32:36 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4TransportationManager.cc // diff --git a/environments/g4py/source/geometry/pyG4Trap.cc b/environments/g4py/source/geometry/pyG4Trap.cc index b4ab46df53..2af8be483f 100644 --- a/environments/g4py/source/geometry/pyG4Trap.cc +++ b/environments/g4py/source/geometry/pyG4Trap.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4Trap.cc,v 1.4 2006/06/29 15:32:39 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4Trap.cc // diff --git a/environments/g4py/source/geometry/pyG4Trd.cc b/environments/g4py/source/geometry/pyG4Trd.cc index 56f38e8a8b..6b6620d5b8 100644 --- a/environments/g4py/source/geometry/pyG4Trd.cc +++ b/environments/g4py/source/geometry/pyG4Trd.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4Trd.cc,v 1.4 2006/06/29 15:32:42 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4Trd.cc // diff --git a/environments/g4py/source/geometry/pyG4Tubs.cc b/environments/g4py/source/geometry/pyG4Tubs.cc index 7cfe2ad9d9..86424402a3 100644 --- a/environments/g4py/source/geometry/pyG4Tubs.cc +++ b/environments/g4py/source/geometry/pyG4Tubs.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4Tubs.cc,v 1.4 2006/06/29 15:32:45 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4Tubs.cc // diff --git a/environments/g4py/source/geometry/pyG4UniformMagField.cc b/environments/g4py/source/geometry/pyG4UniformMagField.cc index e6b3dbb7d0..dad87d14d4 100644 --- a/environments/g4py/source/geometry/pyG4UniformMagField.cc +++ b/environments/g4py/source/geometry/pyG4UniformMagField.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4UniformMagField.cc,v 1.4 2006/06/29 15:32:48 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4UniformMagField.cc // diff --git a/environments/g4py/source/geometry/pyG4VPhysicalVolume.cc b/environments/g4py/source/geometry/pyG4VPhysicalVolume.cc index 230c139e42..98732869b3 100644 --- a/environments/g4py/source/geometry/pyG4VPhysicalVolume.cc +++ b/environments/g4py/source/geometry/pyG4VPhysicalVolume.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: pyG4VPhysicalVolume.cc,v 1.5 2006/06/29 15:32:51 gunter Exp $ -// $Name: geant4-08-01 $ +// $Id: pyG4VPhysicalVolume.cc,v 1.6 2006/11/21 06:03:22 kmura Exp $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4VPhysicalVolume.cc // @@ -72,8 +72,6 @@ void export_G4VPhysicalVolume() return_internal_reference<>()) .def("GetRotation", f2_GetRotation, return_internal_reference<>()) - .def("GetObjectRotation", &G4VPhysicalVolume::GetObjectRotation, - return_value_policy()) .def("GetObjectRotationValue", &G4VPhysicalVolume::GetObjectRotationValue) .def("GetFrameRotation", &G4VPhysicalVolume::GetFrameRotation, return_internal_reference<>()) diff --git a/environments/g4py/source/geometry/pyG4VSolid.cc b/environments/g4py/source/geometry/pyG4VSolid.cc index 1e34cce5bc..a9c1ec875c 100644 --- a/environments/g4py/source/geometry/pyG4VSolid.cc +++ b/environments/g4py/source/geometry/pyG4VSolid.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4VSolid.cc,v 1.4 2006/06/29 15:32:54 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4VSolid.cc // diff --git a/environments/g4py/source/geometry/pyG4VTouchable.cc b/environments/g4py/source/geometry/pyG4VTouchable.cc index ff6bc49a34..622e2310af 100644 --- a/environments/g4py/source/geometry/pyG4VTouchable.cc +++ b/environments/g4py/source/geometry/pyG4VTouchable.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4VTouchable.cc,v 1.4 2006/06/29 15:32:57 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4VTouchable.cc // diff --git a/environments/g4py/source/geometry/pymodG4geometry.cc b/environments/g4py/source/geometry/pymodG4geometry.cc index 4584e917a4..7e97b6a4bb 100644 --- a/environments/g4py/source/geometry/pymodG4geometry.cc +++ b/environments/g4py/source/geometry/pymodG4geometry.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pymodG4geometry.cc,v 1.4 2006/06/29 15:33:00 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pymodG4geometry.cc [Geant4Py module] // diff --git a/environments/g4py/source/global/G4PyCoutDestination.cc b/environments/g4py/source/global/G4PyCoutDestination.cc index a01ea04555..33dd452566 100644 --- a/environments/g4py/source/global/G4PyCoutDestination.cc +++ b/environments/g4py/source/global/G4PyCoutDestination.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4PyCoutDestination.cc,v 1.3 2006/06/29 15:33:03 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // G4PyCoutDistination.cc // diff --git a/environments/g4py/source/global/G4PyCoutDestination.hh b/environments/g4py/source/global/G4PyCoutDestination.hh index 80f1cf96bd..378b0326b5 100644 --- a/environments/g4py/source/global/G4PyCoutDestination.hh +++ b/environments/g4py/source/global/G4PyCoutDestination.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4PyCoutDestination.hh,v 1.3 2006/06/29 15:33:06 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // G4PyCoutDestination.hh // diff --git a/environments/g4py/source/global/GNUmakefile b/environments/g4py/source/global/GNUmakefile index 9b1b54f361..12b9c51357 100644 --- a/environments/g4py/source/global/GNUmakefile +++ b/environments/g4py/source/global/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.2 2006/04/25 08:09:45 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py modules # =========================================================== diff --git a/environments/g4py/source/global/pyG4ApplicationState.cc b/environments/g4py/source/global/pyG4ApplicationState.cc index 2ce9961328..2b5f3be14c 100644 --- a/environments/g4py/source/global/pyG4ApplicationState.cc +++ b/environments/g4py/source/global/pyG4ApplicationState.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: pyG4ApplicationState.cc,v 1.4 2006/06/29 15:33:09 gunter Exp $ -// $Name: geant4-08-01 $ +// $Id: pyG4ApplicationState.cc,v 1.5 2006/11/20 05:56:46 kmura Exp $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4ApplicationState.cc // @@ -42,7 +42,7 @@ using namespace boost::python; // ==================================================================== void export_G4ApplicationState() { - enum_("G4APplicationState") + enum_("G4ApplicationState") .value("G4State_PreInit", G4State_PreInit) .value("G4State_Init", G4State_Init) .value("G4State_Idle", G4State_Idle) diff --git a/environments/g4py/source/global/pyG4Exception.cc b/environments/g4py/source/global/pyG4Exception.cc new file mode 100644 index 0000000000..8f663b45b1 --- /dev/null +++ b/environments/g4py/source/global/pyG4Exception.cc @@ -0,0 +1,130 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: pyG4Exception.cc,v 1.1 2006/11/20 05:57:16 kmura Exp $ +// $Name: geant4-08-02 $ +// ==================================================================== +// pyG4Exception.cc +// +// 2005 Q +// ==================================================================== +#include +#include "G4StateManager.hh" +#include "G4ExceptionSeverity.hh" + +using namespace boost::python; + +// ==================================================================== +// thin wrappers +// ==================================================================== +namespace pyG4Exception { + +//////////////////////////////////////// +void f1_G4Exception(const char* message) +//////////////////////////////////////// +{ + if(message) { + G4cerr << message << G4endl; + } + + if(G4StateManager::GetStateManager()->SetNewState(G4State_Abort,message)) { + G4cerr << G4endl << "*** G4Exception: Aborting execution ***" << G4endl; + PyErr_SetString(PyExc_RuntimeError, message); + PyErr_Print(); + } else { + G4cerr << G4endl << "*** G4Exception: Abortion suppressed ***" + << G4endl << "*** No guarantee for further execution ***" + << G4endl; + } +} + + +////////////////////////////////////////////////// +void f2_G4Exception(const char* originOfException, + const char* exceptionCode, + G4ExceptionSeverity severity, + const char* description) +////////////////////////////////////////////////// +{ + G4VExceptionHandler* exceptionHandler + = G4StateManager::GetStateManager()-> GetExceptionHandler(); + G4bool toBeAborted = true; + if(exceptionHandler) { + toBeAborted = exceptionHandler + -> Notify(originOfException,exceptionCode,severity,description); + } else { + G4cerr << G4endl + << "*** ExceptionHandler is not defined ***" << G4endl; + G4cerr << G4endl; + G4cerr << "*** G4Exception : " << exceptionCode << G4endl; + G4cerr << " issued by : " << originOfException << G4endl; + G4cerr << description << G4endl; + G4cerr << G4endl << "Severity : "; + switch(severity) { + case FatalException: + G4cerr << "*** Fatal Exception ***"; + break; + case FatalErrorInArgument: + G4cerr << "*** Fatal Error In Argument ***"; + break; + case RunMustBeAborted: + G4cerr << "*** Run Must Be Aborted ***"; + break; + case EventMustBeAborted: + G4cerr << "*** Event Must Be Aborted ***"; + break; + default: + G4cerr << "*** This is just a warning message. ***"; + toBeAborted = false; + break; + } + G4cerr << G4endl; + } + if(toBeAborted) { + if(G4StateManager::GetStateManager()->SetNewState(G4State_Abort)) { + G4cerr << G4endl << "*** G4Exception: Aborting execution ***" << G4endl; + PyErr_SetString(PyExc_RuntimeError, description); + PyErr_Print(); + } else { + G4cerr << G4endl << "*** G4Exception: Abortion suppressed ***" + << G4endl << "*** No guarantee for further execution ***" + << G4endl; + } + } +} + +} + +using namespace pyG4Exception; + +// ==================================================================== +// module definition +// ==================================================================== +void export_G4Exception() +{ + def("G4Exception", f1_G4Exception); + def("G4Exception", f2_G4Exception); + +} diff --git a/environments/g4py/source/global/pyG4ExceptionHandler.cc b/environments/g4py/source/global/pyG4ExceptionHandler.cc new file mode 100644 index 0000000000..533e2f2693 --- /dev/null +++ b/environments/g4py/source/global/pyG4ExceptionHandler.cc @@ -0,0 +1,105 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: pyG4ExceptionHandler.cc,v 1.1 2006/11/21 05:58:33 kmura Exp $ +// $Name: geant4-08-02 $ +// ==================================================================== +// pyG4ExceptionHandler.cc +// +// 2005 Q +// ==================================================================== +#include +#include "G4VExceptionHandler.hh" +#include "G4StateManager.hh" + +using namespace boost::python; + +// ==================================================================== +// Python Exception Handler +// ==================================================================== +class PyG4ExceptionHandler : public G4VExceptionHandler { +public: + PyG4ExceptionHandler():G4VExceptionHandler() { + G4StateManager* sm= G4StateManager::GetStateManager(); + sm-> SetExceptionHandler(this); + } + ~PyG4ExceptionHandler() { } + + G4bool Notify(const char* originOfException, + const char* exceptionCode, + G4ExceptionSeverity severity, + const char* description) { + + G4cerr << "*** G4Exception : " << exceptionCode << G4endl; + G4cerr << " issued by : " << originOfException << G4endl; + G4cerr << description << G4endl; + G4cerr << G4endl << "Severity : "; + + switch(severity) { + case FatalException: + PyErr_SetString(PyExc_AssertionError, + "*** Fatal Exception ***"); + PyErr_Print(); + break; + + case FatalErrorInArgument: + PyErr_SetString(PyExc_ValueError, + "*** Fatal Error In Argument ***"); + PyErr_Print(); + + case RunMustBeAborted: + PyErr_SetString(PyExc_RuntimeError, + "*** Run Must Be Aborted ***"); + PyErr_Print(); + break; + + case EventMustBeAborted: + PyErr_SetString(PyExc_RuntimeError, + "*** Event Must Be Aborted ***"); + PyErr_Print(); + break; + + default: + PyErr_Warn(PyExc_RuntimeWarning, + "*** This is just a warning message. ***"); + break; + } + + G4cerr << G4endl; + + // anyway, no abort. + return false; + } +}; + +// ==================================================================== +// module definition +// ==================================================================== +void export_G4ExceptionHandler() +{ + class_ + ("G4ExceptionHandler", "exception handler") + ; +} diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/G4HepMCAsciiReaderMessenger.hh b/environments/g4py/source/global/pyG4ExceptionSeverity.cc similarity index 69% rename from examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/G4HepMCAsciiReaderMessenger.hh rename to environments/g4py/source/global/pyG4ExceptionSeverity.cc index 671bb30a4d..635d43413d 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/G4HepMCAsciiReaderMessenger.hh +++ b/environments/g4py/source/global/pyG4ExceptionSeverity.cc @@ -23,37 +23,31 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// $Id: pyG4ExceptionSeverity.cc,v 1.1 2006/11/20 05:57:16 kmura Exp $ +// $Name: geant4-08-02 $ +// ==================================================================== +// pyG4ExceptionSeverity.cc +// +// 2005 Q +// ==================================================================== +#include +#include "G4ExceptionSeverity.hh" + +using namespace boost::python; + // ==================================================================== // -// G4HepMCAsciiReaderMessenger.hh -// $Id: G4HepMCAsciiReaderMessenger.hh,v 1.2 2006/06/29 17:08:01 gunter Exp $ +// class description // // ==================================================================== -#ifndef G4_HEPMC_ASCII_READER_MESSENGER_H -#define G4_HEPMC_ASCII_READER_MESSENGER_H +void export_G4ExceptionSeverity() +{ + enum_("G4ExceptionSeverity") + .value("FatalException", FatalException) + .value("FatalErrorInArgument", FatalErrorInArgument) + .value("RunMustBeAborted", RunMustBeAborted) + .value("EventMustBeAborted", EventMustBeAborted) + .value("JustWarning", JustWarning) + ; -#include "G4UImessenger.hh" - -class G4HepMCAsciiReader; -class G4UIdirectory; -class G4UIcmdWithoutParameter; -class G4UIcmdWithAString; -class G4UIcmdWithAnInteger; - -class G4HepMCAsciiReaderMessenger : public G4UImessenger { -private: - G4HepMCAsciiReader* gen; - - G4UIdirectory* dir; - G4UIcmdWithAnInteger* verbose; - G4UIcmdWithAString* open; - -public: - G4HepMCAsciiReaderMessenger(G4HepMCAsciiReader* agen); - ~G4HepMCAsciiReaderMessenger(); - - void SetNewValue(G4UIcommand* command, G4String newValues); - G4String GetCurrentValue(G4UIcommand* command); -}; - -#endif +} diff --git a/environments/g4py/source/global/pyG4RandomDirection.cc b/environments/g4py/source/global/pyG4RandomDirection.cc index dbaec2183e..8cd77672fb 100644 --- a/environments/g4py/source/global/pyG4RandomDirection.cc +++ b/environments/g4py/source/global/pyG4RandomDirection.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4RandomDirection.cc,v 1.4 2006/06/29 15:33:12 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4RandomDirection.cc // diff --git a/environments/g4py/source/global/pyG4RotationMatrix.cc b/environments/g4py/source/global/pyG4RotationMatrix.cc index 6bb6ed62dd..e4fe867cce 100644 --- a/environments/g4py/source/global/pyG4RotationMatrix.cc +++ b/environments/g4py/source/global/pyG4RotationMatrix.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4RotationMatrix.cc,v 1.4 2006/06/29 15:33:15 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4RotationMatrix.cc // diff --git a/environments/g4py/source/global/pyG4StateManager.cc b/environments/g4py/source/global/pyG4StateManager.cc index 36baa0df0d..4224034fd6 100644 --- a/environments/g4py/source/global/pyG4StateManager.cc +++ b/environments/g4py/source/global/pyG4StateManager.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4StateManager.cc,v 1.4 2006/06/29 15:33:18 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4StateManager.cc // diff --git a/environments/g4py/source/global/pyG4String.cc b/environments/g4py/source/global/pyG4String.cc index 85a4d1548b..4d8d049100 100644 --- a/environments/g4py/source/global/pyG4String.cc +++ b/environments/g4py/source/global/pyG4String.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4String.cc,v 1.4 2006/06/29 15:33:21 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4String.cc // diff --git a/environments/g4py/source/global/pyG4ThreeVector.cc b/environments/g4py/source/global/pyG4ThreeVector.cc index 011dc306af..116b13d73f 100644 --- a/environments/g4py/source/global/pyG4ThreeVector.cc +++ b/environments/g4py/source/global/pyG4ThreeVector.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4ThreeVector.cc,v 1.5 2006/06/29 15:33:24 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4ThreeVector.cc // diff --git a/environments/g4py/source/global/pyG4Timer.cc b/environments/g4py/source/global/pyG4Timer.cc index 0cfcdadaaf..acdfd89c8e 100644 --- a/environments/g4py/source/global/pyG4Timer.cc +++ b/environments/g4py/source/global/pyG4Timer.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4Timer.cc,v 1.3 2006/06/29 15:33:27 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4Timer.cc // diff --git a/environments/g4py/source/global/pyG4Transform3D.cc b/environments/g4py/source/global/pyG4Transform3D.cc index 470d74ed27..a6896f79dd 100644 --- a/environments/g4py/source/global/pyG4Transform3D.cc +++ b/environments/g4py/source/global/pyG4Transform3D.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4Transform3D.cc,v 1.4 2006/06/29 15:33:30 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4Transform3D.cc // diff --git a/environments/g4py/source/global/pyG4UnitsTable.cc b/environments/g4py/source/global/pyG4UnitsTable.cc index 09346feae3..e4082091cb 100644 --- a/environments/g4py/source/global/pyG4UnitsTable.cc +++ b/environments/g4py/source/global/pyG4UnitsTable.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4UnitsTable.cc,v 1.4 2006/06/29 15:33:33 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4UnitsTable.cc // diff --git a/environments/g4py/source/global/pyG4UserLimits.cc b/environments/g4py/source/global/pyG4UserLimits.cc index a03fd30d21..a450dac528 100644 --- a/environments/g4py/source/global/pyG4UserLimits.cc +++ b/environments/g4py/source/global/pyG4UserLimits.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4UserLimits.cc,v 1.4 2006/06/29 15:33:36 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4UserLimits.cc // diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02DetectorConstruction.hh b/environments/g4py/source/global/pyG4Version.cc similarity index 75% rename from examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02DetectorConstruction.hh rename to environments/g4py/source/global/pyG4Version.cc index a5a09bf8f4..54cd596854 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02DetectorConstruction.hh +++ b/environments/g4py/source/global/pyG4Version.cc @@ -23,25 +23,25 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// $Id: pyG4Version.cc,v 1.1 2006/08/23 04:43:27 kmura Exp $ +// $Name: geant4-08-02 $ // ==================================================================== +// pyG4Version.cc // -// H02DetectorConstruction.hh -// $Id: H02DetectorConstruction.hh,v 1.3 2006/06/29 17:12:53 gunter Exp $ -// +// 2006 Q // ==================================================================== -#ifndef H02_DETECTOR_CONSTRUCTION_H -#define H02_DETECTOR_CONSTRUCTION_H - -#include "G4Types.hh" -#include "G4VUserDetectorConstruction.hh" +#include +#include "pyG4Version.hh" -class H02DetectorConstruction : public G4VUserDetectorConstruction { -public: - H02DetectorConstruction(); - ~H02DetectorConstruction(); +using namespace boost::python; - virtual G4VPhysicalVolume* Construct(); - -}; - -#endif +// ==================================================================== +// module definition +// ==================================================================== +void export_G4Version() +{ + scope current; + current.attr("G4VERSION_NUMBER")= G4VERSION_NUMBER; + current.attr("G4Version")= G4Version.c_str(); + current.attr("G4Date")= G4Date.c_str(); +} diff --git a/environments/g4py/source/global/pyRandomEngines.cc b/environments/g4py/source/global/pyRandomEngines.cc index 4e0f6914d9..56cb94c3cd 100644 --- a/environments/g4py/source/global/pyRandomEngines.cc +++ b/environments/g4py/source/global/pyRandomEngines.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyRandomEngines.cc,v 1.4 2006/06/29 15:33:39 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyRandomEngines.cc // diff --git a/environments/g4py/source/global/pyRandomize.cc b/environments/g4py/source/global/pyRandomize.cc index 4bcabec620..e03ae45620 100644 --- a/environments/g4py/source/global/pyRandomize.cc +++ b/environments/g4py/source/global/pyRandomize.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyRandomize.cc,v 1.4 2006/06/29 15:33:42 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyRandomize.cc // diff --git a/environments/g4py/source/global/pygeomdefs.cc b/environments/g4py/source/global/pygeomdefs.cc index 8aaf0aed07..d3ea55382b 100644 --- a/environments/g4py/source/global/pygeomdefs.cc +++ b/environments/g4py/source/global/pygeomdefs.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pygeomdefs.cc,v 1.4 2006/06/29 15:33:45 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pygeomdefs.cc // diff --git a/environments/g4py/source/global/pyglobals.cc b/environments/g4py/source/global/pyglobals.cc index 665efe370a..525b96d461 100644 --- a/environments/g4py/source/global/pyglobals.cc +++ b/environments/g4py/source/global/pyglobals.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyglobals.cc,v 1.4 2006/06/29 15:33:48 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyglobals.cc // diff --git a/environments/g4py/source/global/pymodG4global.cc b/environments/g4py/source/global/pymodG4global.cc index 01fba3e7fe..34f3d21eab 100644 --- a/environments/g4py/source/global/pymodG4global.cc +++ b/environments/g4py/source/global/pymodG4global.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: pymodG4global.cc,v 1.4 2006/06/29 15:33:51 gunter Exp $ -// $Name: geant4-08-01 $ +// $Id: pymodG4global.cc,v 1.7 2006/11/21 05:58:33 kmura Exp $ +// $Name: geant4-08-02 $ // ==================================================================== // pymodG4global.cc [Geant4Py module] // @@ -52,6 +52,10 @@ void export_RandomEngines(); void export_G4RandomDirection(); void export_G4UserLimits(); void export_G4Timer(); +void export_G4Version(); +void export_G4Exception(); +void export_G4ExceptionHandler(); +void export_G4ExceptionSeverity(); BOOST_PYTHON_MODULE(G4global) { @@ -69,5 +73,9 @@ BOOST_PYTHON_MODULE(G4global) export_G4RandomDirection(); export_G4UserLimits(); export_G4Timer(); + export_G4Version(); + export_G4Exception(); + export_G4ExceptionHandler(); + export_G4ExceptionSeverity(); } diff --git a/environments/g4py/source/graphics_reps/GNUmakefile b/environments/g4py/source/graphics_reps/GNUmakefile index 6706e78753..c45051ceeb 100644 --- a/environments/g4py/source/graphics_reps/GNUmakefile +++ b/environments/g4py/source/graphics_reps/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.2 2006/04/25 08:09:45 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py modules # =========================================================== diff --git a/environments/g4py/source/graphics_reps/pyG4Colour.cc b/environments/g4py/source/graphics_reps/pyG4Colour.cc index 278132120d..dc7c27be57 100644 --- a/environments/g4py/source/graphics_reps/pyG4Colour.cc +++ b/environments/g4py/source/graphics_reps/pyG4Colour.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4Colour.cc,v 1.4 2006/06/29 15:33:54 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4Colour.cc // diff --git a/environments/g4py/source/graphics_reps/pyG4VisAttributes.cc b/environments/g4py/source/graphics_reps/pyG4VisAttributes.cc index c8d1c338ed..bd775f1eb0 100644 --- a/environments/g4py/source/graphics_reps/pyG4VisAttributes.cc +++ b/environments/g4py/source/graphics_reps/pyG4VisAttributes.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4VisAttributes.cc,v 1.4 2006/06/29 15:33:57 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4VisAttributes.cc // diff --git a/environments/g4py/source/graphics_reps/pymodG4graphics_reps.cc b/environments/g4py/source/graphics_reps/pymodG4graphics_reps.cc index 5dc6428435..0d345094ab 100644 --- a/environments/g4py/source/graphics_reps/pymodG4graphics_reps.cc +++ b/environments/g4py/source/graphics_reps/pymodG4graphics_reps.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pymodG4graphics_reps.cc,v 1.4 2006/06/29 15:33:59 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pymodG4graphics_reps.cc [Geant4Py module] // diff --git a/environments/g4py/source/intercoms/GNUmakefile b/environments/g4py/source/intercoms/GNUmakefile new file mode 100644 index 0000000000..4a6bb95a53 --- /dev/null +++ b/environments/g4py/source/intercoms/GNUmakefile @@ -0,0 +1,14 @@ +# $Id: GNUmakefile,v 1.1 2006/08/08 05:20:57 kmura Exp $ +# $Name: geant4-08-02 $ +# =========================================================== +# Makefile for building Geant4Py modules +# =========================================================== +include ../../config/config.gmk + +# python module name +MODULE := G4intercoms# + +include $(G4PY_INSTALL)/config/g4py.gmk +include $(G4PY_INSTALL)/config/module.gmk +include $(G4PY_INSTALL)/config/install.gmk + diff --git a/environments/g4py/source/intercoms/pyG4UIcommand.cc b/environments/g4py/source/intercoms/pyG4UIcommand.cc new file mode 100644 index 0000000000..6d56f5be49 --- /dev/null +++ b/environments/g4py/source/intercoms/pyG4UIcommand.cc @@ -0,0 +1,89 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: pyG4UIcommand.cc,v 1.1 2006/08/08 05:20:57 kmura Exp $ +// $Name: geant4-08-02 $ +// ==================================================================== +// pyG4UIcommand.cc +// +// 2006 Q +// ==================================================================== +#include +#include "G4UIcommand.hh" +#include "G4UImessenger.hh" + +using namespace boost::python; + +// ==================================================================== +// thin wrappers +// ==================================================================== +namespace pyG4UIcommand { + +// GetStateList (returning python list) +list f_GetStateList(G4UIcommand* acommand) +{ + list pyStateList; + std::vector* stateList= acommand->GetStateList(); + + for(G4int i=0; i< stateList->size(); i++) { + pyStateList.append(&(*stateList)[i]); + } + + return pyStateList; +} + +}; + +using namespace pyG4UIcommand; + +// ==================================================================== +// module definition +// ==================================================================== +void export_G4UIcommand() +{ + class_ + ("G4UIcommand", "UI command") + .def(init()) + // --- + .def("GetCurrentValue", &G4UIcommand::GetCurrentValue) + .def("IsAvailable", &G4UIcommand::IsAvailable) + .def("List", &G4UIcommand::List) + .def("GetRange", &G4UIcommand::GetRange, + return_value_policy()) + .def("GetGuidanceEntries", &G4UIcommand::GetGuidanceEntries) + .def("GetGuidanceLine", &G4UIcommand::GetGuidanceLine, + return_value_policy()) + .def("GetCommandPath", &G4UIcommand::GetCommandPath, + return_value_policy()) + .def("GetCommandName", &G4UIcommand::GetCommandName, + return_value_policy()) + .def("GetParameterEntries", &G4UIcommand::GetParameterEntries) + .def("GetParameter", &G4UIcommand::GetParameter, + return_value_policy()) + .def("GetStateList", f_GetStateList) + .def("GetTitle", &G4UIcommand::GetTitle) + ; +} + diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/H01PythiaInterface.hh b/environments/g4py/source/intercoms/pyG4UIcommandTree.cc similarity index 50% rename from examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/H01PythiaInterface.hh rename to environments/g4py/source/intercoms/pyG4UIcommandTree.cc index 2b46e55f71..34ab92ae84 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/H01PythiaInterface.hh +++ b/environments/g4py/source/intercoms/pyG4UIcommandTree.cc @@ -23,91 +23,62 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// $Id: pyG4UIcommandTree.cc,v 1.1 2006/08/08 05:20:57 kmura Exp $ +// $Name: geant4-08-02 $ // ==================================================================== +// pyG4UIcommandTree.cc // -// H01PythiaInterface.hh -// $Id: H01PythiaInterface.hh,v 1.4 2006/06/29 17:08:06 gunter Exp $ -// -// A generic interface class with Pythia event generator via HepMC. -// +// 2006 Q // ==================================================================== -#ifndef H01_PYTHIA_INTERFACE_H -#define H01_PYTHIA_INTERFACE_H +#include +#include "G4UIcommandTree.hh" -#include "G4HepMCInterface.hh" +using namespace boost::python; -namespace HepMC { - class CBhepevt; -} -class H01PythiaMessenger; +// ==================================================================== +// wrappers +// ==================================================================== +namespace pyG4UIcommandTree { -class H01PythiaInterface : public G4HepMCInterface { -protected: - G4int verbose; - G4int mpylist; - HepMC::CBhepevt* hepevtio; +// GetTree +G4UIcommandTree*(G4UIcommandTree::*f1_GetTree)(G4int)= + &G4UIcommandTree::GetTree; +G4UIcommandTree*(G4UIcommandTree::*f2_GetTree)(const char*)= + &G4UIcommandTree::GetTree; - H01PythiaMessenger* messenger; - - // In default, this is automatic conversion, Pythia->HEPEVT->HepMC, - // by HepMC utilities. - virtual HepMC::GenEvent* GenerateHepMCEvent(); - -public: - H01PythiaInterface(); - ~H01PythiaInterface(); - - // set/get methods - void SetVerboseLevel(G4int i); - G4int GetVerboseLevel() const; - - void SetPylist(G4int i); - G4int GetPylist() const; - - // call pyxxx - void CallPyinit(G4String frame, G4String beam, - G4String target, G4double win); - void CallPystat(G4int istat); - void CallPygive(G4String par); - void CallPyrget(G4int lun, G4int move); - void CallPyrset(G4int lun, G4int move); - void CallPyevnt(); - void CallPylist(G4int mode); - void CallPyhepc(G4int mode); - - // random numbers operations - void SetRandomSeed(G4int iseed); - void PrintRandomStatus(std::ostream& ostr=G4cout) const; - - // setup user parameters (empty in default). - // Implement your parameters in a delived class if you want. - virtual void SetUserParameters(); - - virtual void Print() const; }; +using namespace pyG4UIcommandTree; + // ==================================================================== -// inline functions +// module definition // ==================================================================== - -inline void H01PythiaInterface::SetVerboseLevel(G4int i) +void export_G4UIcommandTree() { - verbose= i; + class_ + ("G4UIcommandTree", "UI command tree") + // constructors + .def(init()) + // --- + .def("FindPath", &G4UIcommandTree::FindPath, + return_value_policy()) + .def("List", &G4UIcommandTree::List) + .def("ListCurrent", &G4UIcommandTree::ListCurrent) + .def("ListCurrentWithNum", &G4UIcommandTree::ListCurrentWithNum) + .def("CreateHTML", &G4UIcommandTree::CreateHTML) + .def("GetGuidance", &G4UIcommandTree::GetGuidance, + return_value_policy()) + .def("GetPathName", &G4UIcommandTree::GetPathName) + // --- + .def("GetTreeEntry", &G4UIcommandTree::GetTreeEntry) + .def("GetCommandEntry", &G4UIcommandTree::GetCommandEntry) + .def("GetTree", f1_GetTree, + return_value_policy()) + .def("GetTree", f2_GetTree, + return_value_policy()) + .def("GetCommand", &G4UIcommandTree::GetCommand, + return_value_policy()) + // --- + .def("GetTitle", &G4UIcommandTree::GetTitle) + ; } - -inline G4int H01PythiaInterface::GetVerboseLevel() const -{ - return verbose; -} - -inline void H01PythiaInterface::SetPylist(G4int i) -{ - mpylist= i; -} - -inline G4int H01PythiaInterface::GetPylist() const -{ - return mpylist; -} - -#endif diff --git a/environments/g4py/source/interface/pyG4UImanager.cc b/environments/g4py/source/intercoms/pyG4UImanager.cc similarity index 72% rename from environments/g4py/source/interface/pyG4UImanager.cc rename to environments/g4py/source/intercoms/pyG4UImanager.cc index 35456fe964..d41bd248b2 100644 --- a/environments/g4py/source/interface/pyG4UImanager.cc +++ b/environments/g4py/source/intercoms/pyG4UImanager.cc @@ -23,18 +23,19 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: pyG4UImanager.cc,v 1.4 2006/06/29 15:34:01 gunter Exp $ -// $Name: geant4-08-01 $ +// $Id: pyG4UImanager.cc,v 1.1 2006/08/08 05:20:57 kmura Exp $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4UImanager.cc // // G4UImanager class is pure singleton, so it cannnot be exposed // from BPL. Functionality of G4UImanager is exposed in global // name space via wrappers. -// 2005 Q +// 2006 Q // ==================================================================== #include #include "G4UImanager.hh" +#include "G4UIcommandTree.hh" using namespace boost::python; @@ -43,6 +44,15 @@ using namespace boost::python; // ==================================================================== namespace pyG4UImanager { +// ApplyCommand +G4int(G4UImanager::*f1_ApplyCommand)(const char*)= &G4UImanager::ApplyCommand; +G4int(G4UImanager::*f2_ApplyCommand)(G4String)= &G4UImanager::ApplyCommand; + +// CreateHTML +BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_CreateHTML, CreateHTML, 0, 1); + + + ////////////////////////////////////////////// G4int ApplyUICommand_1(const G4String& cmdstr) ////////////////////////////////////////////// @@ -100,15 +110,6 @@ G4int ApplyUICommand_2(const std::string& cmdstr) return ApplyUICommand_1(cmdstr); } - -//////////////////////////////////////////////// -std::string GetCurrentValues(const char* cmdstr) -//////////////////////////////////////////////// -{ - G4UImanager* UImgr= G4UImanager::GetUIpointer(); - return UImgr-> GetCurrentValues(cmdstr); -} - }; using namespace pyG4UImanager; @@ -118,8 +119,31 @@ using namespace pyG4UImanager; // ==================================================================== void export_G4UImanager() { + class_ + ("G4UImanager", "UI manager class", no_init) + .def("GetUIpointer", &G4UImanager::GetUIpointer, + return_value_policy()) + .staticmethod("GetUIpointer") + // --- + .def("GetCurrentValues", &G4UImanager::GetCurrentValues) + .def("ExecuteMacroFile", &G4UImanager::ExecuteMacroFile) + .def("ApplyCommand", f1_ApplyCommand) + .def("ApplyCommand", f2_ApplyCommand) + .def("CreateHTML", &G4UImanager::CreateHTML, f_CreateHTML()) + // --- + .def("SetPauseAtBeginOfEvent", &G4UImanager::SetPauseAtBeginOfEvent) + .def("GetPauseAtBeginOfEvent", &G4UImanager::GetPauseAtBeginOfEvent) + .def("SetPauseAtEndOfEvent", &G4UImanager::SetPauseAtEndOfEvent) + .def("GetPauseAtEndOfEvent", &G4UImanager::GetPauseAtEndOfEvent) + .def("SetVerboseLevel", &G4UImanager::SetVerboseLevel) + .def("GetVerboseLevel", &G4UImanager::GetVerboseLevel) + // --- + .def("GetTree", &G4UImanager::GetTree, + return_value_policy()) + ; + + // --- def("ApplyUICommand", ApplyUICommand_1); def("ApplyUICommand", ApplyUICommand_2); - def("GetCurrentValues", GetCurrentValues); -} +} diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/G4HepMCAsciiReader.hh b/environments/g4py/source/intercoms/pyG4UIparameter.cc similarity index 64% rename from examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/G4HepMCAsciiReader.hh rename to environments/g4py/source/intercoms/pyG4UIparameter.cc index 2ee6d9e3bb..fc873c441e 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/G4HepMCAsciiReader.hh +++ b/environments/g4py/source/intercoms/pyG4UIparameter.cc @@ -23,69 +23,37 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// $Id: pyG4UIparameter.cc,v 1.1 2006/08/08 05:20:57 kmura Exp $ +// $Name: geant4-08-02 $ // ==================================================================== +// pyG4UIparameter.cc // -// G4HepMCAsciiReader.hh -// $Id: G4HepMCAsciiReader.hh,v 1.3 2006/06/29 17:12:34 gunter Exp $ -// +// 2006 Q // ==================================================================== -#ifndef G4_HEPMC_ASCII_READER_H -#define G4_HEPMC_ASCII_READER_H +#include +#include "G4UIparameter.hh" -#include -#include "G4HepMCInterface.hh" -#include - -class G4HepMCAsciiReaderMessenger; - -class G4HepMCAsciiReader : public G4HepMCInterface -{ -protected: - G4String filename; - std::ifstream from; - - G4int verbose; - G4HepMCAsciiReaderMessenger* messenger; - - virtual HepMC::GenEvent* GenerateHepMCEvent(); - -public: - G4HepMCAsciiReader(); - ~G4HepMCAsciiReader(); - - // set/get methods - void SetFileName(G4String name); - G4String GetFileName() const; - - void SetVerboseLevel(G4int i); - G4int GetVerboseLevel() const; - - // methods... - void Initialize(); -}; +using namespace boost::python; // ==================================================================== -// inline functions +// module definition // ==================================================================== - -inline void G4HepMCAsciiReader::SetFileName(G4String name) +void export_G4UIparameter() { - filename= name; + class_ + ("G4UIparameter", "UI parameter") + // constructors + .def(init()) + .def(init()) + // --- + .def("List", &G4UIparameter::List) + .def("GetDefaultValue", &G4UIparameter::GetDefaultValue) + .def("GetParameterType", &G4UIparameter::GetParameterType) + .def("GetParameterRange", &G4UIparameter::GetParameterRange) + .def("GetParameterName", &G4UIparameter::GetParameterName) + .def("GetParameterCandidates", &G4UIparameter::GetParameterCandidates) + .def("IsOmittable", &G4UIparameter::IsOmittable) + .def("GetCurrentAsDefault", &G4UIparameter::GetCurrentAsDefault) + .def("GetParameterGuidance", &G4UIparameter::GetParameterGuidance) + ; } - -inline G4String G4HepMCAsciiReader::GetFileName() const -{ - return filename; -} - -inline void G4HepMCAsciiReader::SetVerboseLevel(G4int i) -{ - verbose= i; -} - -inline G4int G4HepMCAsciiReader::GetVerboseLevel() const -{ - return verbose; -} - -#endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02Field.cc b/environments/g4py/source/intercoms/pymodG4intercoms.cc similarity index 73% rename from examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02Field.cc rename to environments/g4py/source/intercoms/pymodG4intercoms.cc index b61fd9c33a..8251270f81 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02Field.cc +++ b/environments/g4py/source/intercoms/pymodG4intercoms.cc @@ -23,29 +23,31 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// $Id: pymodG4intercoms.cc,v 1.1 2006/08/08 05:20:57 kmura Exp $ +// $Name: geant4-08-02 $ // ==================================================================== +// pymodG4intercoms.cc [Geant4Py module] // -// H02Field.hh -// $Id: H02Field.cc,v 1.4 2006/06/29 17:13:48 gunter Exp $ -// +// 2005 Q +// ==================================================================== +#include + +using namespace boost::python; + +// ==================================================================== +// module definition // ==================================================================== -#include "H02Field.hh" +void export_G4UImanager(); +void export_G4UIcommandTree(); +void export_G4UIcommand(); +void export_G4UIparameter(); -//////////////////////////////////////////////////////////////////////////// -void H02Field::GetFieldValue(const G4double Point[3], G4double* Bfield) const -//////////////////////////////////////////////////////////////////////////// +BOOST_PYTHON_MODULE(G4intercoms) { - const G4double Bz= 3.0*tesla; - const G4double rmax_sq = sqr(1.*m); - const G4double zmax = 1.*m; - - Bfield[0]= 0.; - Bfield[1] = 0.; - if(std::abs(Point[2]) +#include "pyG4Version.hh" #include "G4Element.hh" using namespace boost::python; @@ -99,7 +100,9 @@ void export_G4Element() .def("GetCountUse", &G4Element::GetCountUse) .def("increaseCountUse", &G4Element::increaseCountUse) .def("decreaseCountUse", &G4Element::decreaseCountUse) +#if G4VERSION_NUMBER >= 710 .def("GetIndexZ", &G4Element::GetIndexZ) +#endif .def("GetfCoulomb", &G4Element::GetfCoulomb) .def("GetfRadTsai", &G4Element::GetfRadTsai) .def("GetIonisation", &G4Element::GetIonisation, diff --git a/environments/g4py/source/materials/pyG4ElementTable.cc b/environments/g4py/source/materials/pyG4ElementTable.cc index 33132750d1..0763da2605 100644 --- a/environments/g4py/source/materials/pyG4ElementTable.cc +++ b/environments/g4py/source/materials/pyG4ElementTable.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4ElementTable.cc,v 1.4 2006/06/29 15:34:12 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4ElementTable.cc // diff --git a/environments/g4py/source/materials/pyG4Material.cc b/environments/g4py/source/materials/pyG4Material.cc index 5d1793c358..1f562efdcf 100644 --- a/environments/g4py/source/materials/pyG4Material.cc +++ b/environments/g4py/source/materials/pyG4Material.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: pyG4Material.cc,v 1.4 2006/06/29 15:34:15 gunter Exp $ -// $Name: geant4-08-01 $ +// $Id: pyG4Material.cc,v 1.5 2006/12/01 02:10:08 kmura Exp $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4Material.cc // @@ -51,8 +51,6 @@ void (G4Material::*f2_AddElement)(G4Element*, G4double) BOOST_PYTHON_FUNCTION_OVERLOADS(f_GetMaterial, G4Material::GetMaterial, 1, 2); #endif -} - // raw pointer -> Python list conversion list f_GetFractionVector(const G4Material* material) { @@ -104,6 +102,8 @@ void Print(G4Material& mat) G4cout << mat; } +} + using namespace pyG4Material; // ==================================================================== diff --git a/environments/g4py/source/materials/pyG4MaterialTable.cc b/environments/g4py/source/materials/pyG4MaterialTable.cc index f09f50d527..a8b3a25851 100644 --- a/environments/g4py/source/materials/pyG4MaterialTable.cc +++ b/environments/g4py/source/materials/pyG4MaterialTable.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4MaterialTable.cc,v 1.4 2006/06/29 15:34:18 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4MaterialTable.cc // diff --git a/environments/g4py/source/materials/pyG4NistManager.cc b/environments/g4py/source/materials/pyG4NistManager.cc index f6d19181b1..05418ff726 100644 --- a/environments/g4py/source/materials/pyG4NistManager.cc +++ b/environments/g4py/source/materials/pyG4NistManager.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4NistManager.cc,v 1.4 2006/06/29 15:34:21 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4NistManager.cc // diff --git a/environments/g4py/source/materials/pymodG4materials.cc b/environments/g4py/source/materials/pymodG4materials.cc index fb7a433fe9..bc4b97368a 100644 --- a/environments/g4py/source/materials/pymodG4materials.cc +++ b/environments/g4py/source/materials/pymodG4materials.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pymodG4materials.cc,v 1.4 2006/06/29 15:34:24 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pymodG4materials.cc [Geant4Py module] // diff --git a/environments/g4py/source/particles/GNUmakefile b/environments/g4py/source/particles/GNUmakefile index e7c22b4b31..08882019f3 100644 --- a/environments/g4py/source/particles/GNUmakefile +++ b/environments/g4py/source/particles/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.2 2006/04/25 08:09:45 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py modules # =========================================================== diff --git a/environments/g4py/source/particles/pyG4DecayTable.cc b/environments/g4py/source/particles/pyG4DecayTable.cc index 563662cc0b..ab0cb474a8 100644 --- a/environments/g4py/source/particles/pyG4DecayTable.cc +++ b/environments/g4py/source/particles/pyG4DecayTable.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4DecayTable.cc,v 1.4 2006/06/29 15:34:27 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4DecayTable.cc // diff --git a/environments/g4py/source/particles/pyG4DynamicParticle.cc b/environments/g4py/source/particles/pyG4DynamicParticle.cc index 875da8bd5a..1a5c74b824 100644 --- a/environments/g4py/source/particles/pyG4DynamicParticle.cc +++ b/environments/g4py/source/particles/pyG4DynamicParticle.cc @@ -23,16 +23,19 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: pyG4DynamicParticle.cc,v 1.4 2006/06/29 15:34:30 gunter Exp $ -// $Name: geant4-08-01 $ +// $Id: pyG4DynamicParticle.cc,v 1.5 2006/08/25 05:52:51 kmura Exp $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4DynamicParticle.cc // // 2005 Q // ==================================================================== #include -#include "G4DynamicParticle.hh" #include "pyG4Version.hh" +#include "G4DynamicParticle.hh" +#if G4VERSION_NUMBER <= 701 +#include "G4PrimaryParticle.hh" +#endif using namespace boost::python; @@ -74,6 +77,6 @@ void export_G4DynamicParticle() #if G4VERSION_NUMBER >= 710 .def("GetPDGcode", &G4DynamicParticle::GetPDGcode) #endif - ; + ; } diff --git a/environments/g4py/source/particles/pyG4ParticleDefinition.cc b/environments/g4py/source/particles/pyG4ParticleDefinition.cc index 68487d10cc..3803c8e1ae 100644 --- a/environments/g4py/source/particles/pyG4ParticleDefinition.cc +++ b/environments/g4py/source/particles/pyG4ParticleDefinition.cc @@ -23,14 +23,15 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: pyG4ParticleDefinition.cc,v 1.4 2006/06/29 15:34:33 gunter Exp $ -// $Name: geant4-08-01 $ +// $Id: pyG4ParticleDefinition.cc,v 1.5 2006/08/25 06:14:52 kmura Exp $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4ParticleDefinition.cc // // 2005 Q // ==================================================================== #include +#include "pyG4Version.hh" #include "G4ParticleDefinition.hh" #include "G4ParticleTable.hh" #include "G4DecayTable.hh" @@ -85,8 +86,10 @@ void export_G4ParticleDefinition() .def("GetParticleTable", &G4ParticleDefinition::GetParticleTable, return_value_policy()) .def("DumpTable", &G4ParticleDefinition::DumpTable) +#if G4VERSION_NUMBER >= 701 .def("GetAtomicNumber", &G4ParticleDefinition::GetAtomicNumber) .def("GetAtomicMass", &G4ParticleDefinition::GetAtomicMass) +#endif .def("SetVerboseLevel", &G4ParticleDefinition::SetVerboseLevel) .def("GetVerboseLevel", &G4ParticleDefinition::GetVerboseLevel) .def("SetApplyCutsFlag", &G4ParticleDefinition::SetApplyCutsFlag) diff --git a/environments/g4py/source/particles/pyG4ParticleList.cc b/environments/g4py/source/particles/pyG4ParticleList.cc index 0008f309fd..127444b989 100644 --- a/environments/g4py/source/particles/pyG4ParticleList.cc +++ b/environments/g4py/source/particles/pyG4ParticleList.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4ParticleList.cc,v 1.3 2006/06/29 15:34:35 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4ParticleList.cc // diff --git a/environments/g4py/source/particles/pyG4ParticleTable.cc b/environments/g4py/source/particles/pyG4ParticleTable.cc index 09a512c460..8724b476d5 100644 --- a/environments/g4py/source/particles/pyG4ParticleTable.cc +++ b/environments/g4py/source/particles/pyG4ParticleTable.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4ParticleTable.cc,v 1.4 2006/06/29 15:34:37 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4ParticleTable.cc // diff --git a/environments/g4py/source/particles/pyG4PrimaryParticle.cc b/environments/g4py/source/particles/pyG4PrimaryParticle.cc index 893dc13800..0463789abc 100644 --- a/environments/g4py/source/particles/pyG4PrimaryParticle.cc +++ b/environments/g4py/source/particles/pyG4PrimaryParticle.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4PrimaryParticle.cc,v 1.4 2006/06/29 15:34:40 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4PrimaryParticle.cc // diff --git a/environments/g4py/source/particles/pyG4PrimaryVertex.cc b/environments/g4py/source/particles/pyG4PrimaryVertex.cc index 4a121a268a..7a5b1e9286 100644 --- a/environments/g4py/source/particles/pyG4PrimaryVertex.cc +++ b/environments/g4py/source/particles/pyG4PrimaryVertex.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4PrimaryVertex.cc,v 1.4 2006/06/29 15:34:43 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4PrimaryVertex.cc // diff --git a/environments/g4py/source/particles/pymodG4particles.cc b/environments/g4py/source/particles/pymodG4particles.cc index 54c9a30f39..6ffd2ad998 100644 --- a/environments/g4py/source/particles/pymodG4particles.cc +++ b/environments/g4py/source/particles/pymodG4particles.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pymodG4particles.cc,v 1.4 2006/06/29 15:34:46 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pymodG4particles.cc // diff --git a/environments/g4py/source/physics_lists/GNUmakefile b/environments/g4py/source/physics_lists/GNUmakefile new file mode 100644 index 0000000000..28a036559a --- /dev/null +++ b/environments/g4py/source/physics_lists/GNUmakefile @@ -0,0 +1,14 @@ +# $Id: GNUmakefile,v 1.1 2006/11/20 08:53:12 kmura Exp $ +# $Name: geant4-08-02 $ +# =========================================================== +# Makefile for building Geant4Py modules +# =========================================================== +include ../../config/config.gmk + +# python module name +MODULE := G4physicslists# + +include $(G4PY_INSTALL)/config/g4py.gmk +include $(G4PY_INSTALL)/config/module.gmk +include $(G4PY_INSTALL)/config/install.gmk + diff --git a/environments/g4py/source/physics_lists/pyPhysicsLists.cc b/environments/g4py/source/physics_lists/pyPhysicsLists.cc new file mode 100644 index 0000000000..66cf4b9a7a --- /dev/null +++ b/environments/g4py/source/physics_lists/pyPhysicsLists.cc @@ -0,0 +1,181 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: pyPhysicsLists.cc,v 1.1 2006/11/20 08:53:05 kmura Exp $ +// $Name: geant4-08-02 $ +// ==================================================================== +// pyPhysicsLists.cc +// +// 2005 Q +// ==================================================================== +#include +#include "pyG4Version.hh" + +#if G4VERSION_NUMBER >= 820 + +#include "G4HadronInelasticQBBC.hh" +#include "G4HadronInelasticQLHEP.hh" + +#include "FTFC.hh" +#include "FTFP.hh" +#include "LBE.hh" +#include "LHEP.hh" +#include "LHEP_BERT.hh" +#include "LHEP_BERT_HP.hh" +#include "LHEP_BIC.hh" +#include "LHEP_BIC_HP.hh" +#include "LHEP_EMV.hh" +#include "LHEP_HP.hh" +#include "LHEP_LEAD.hh" +#include "LHEP_LEAD_HP.hh" +#include "LHEP_PRECO.hh" +#include "LHEP_PRECO_HP.hh" +#include "QBBC.hh" +#include "QGSC.hh" +#include "QGSC_LEAD.hh" +#include "QGSC_LEAD_HP.hh" +#include "QGSP.hh" +#include "QGSP_BERT.hh" +#include "QGSP_BERT_HP.hh" +#include "QGSP_BIC.hh" +#include "QGSP_EMV.hh" +#include "QGSP_EMX.hh" +#include "QGSP_HP.hh" + +#endif + +using namespace boost::python; + +// ==================================================================== +// module definition +// ==================================================================== +void export_PhysicsLists() +{ +#if G4VERSION_NUMBER >= 820 + + class_ > + ("FTFC", "FTFC physics list") + ; + + class_ > + ("FTFP", "FTFP physics list") + ; + + class_ > + ("LBE", "LBE physics list") + ; + + class_ > + ("LHEP", "LHEP physics list") + ; + + class_ > + ("LHEP_BERT", "LHEP_BERT physics list") + ; + + class_ > + ("LHEP_BERT_HP", "LHEP_BERT_HP physics list") + ; + + class_ > + ("LHEP_BIC", "LHEP_BIC physics list") + ; + + class_ > + ("LHEP_BIC_HP", "LHEP_BIC_HP physics list") + ; + + class_ > + ("LHEP_EMV", "LHEP_EMV physics list") + ; + + class_ > + ("LHEP_HP", "LHEP_HP physics list") + ; + + class_ > + ("LHEP_LEAD", "LHEP_LEAD physics list") + ; + + class_ > + ("LHEP_LEAD_HP", "LHEP_LEAD_HP physics list") + ; + + class_ > + ("LHEP_PRECO", "LHEP_PRECO physics list") + ; + + class_ > + ("LHEP_PRECO_HP", "LHEP_PRECO_HP physics list") + ; + + //class_ > + //("QBBC", "QBBC physics list") + // ; + + class_ > + ("QGSC", "QGSC physics list") + ; + + class_ > + ("QGSC_LEAD", "QGSC_LEAD physics list") + ; + + class_ > + ("QGSC_LEAD_HP", "QGSC_LEAD_HP physics list") + ; + + class_ > + ("QGSP", "QGSP physics list") + ; + + class_ > + ("QGSP_BERT", "QGSP_BERT physics list") + ; + + class_ > + ("QGSP_BERT_HP", "QGSP_BERT_HP physics list") + ; + + class_ > + ("QGSP_BIC", "QGSP_BIC physics list") + ; + + class_ > + ("QGSP_EMV", "QGSP_EMV physics list") + ; + + class_ > + ("QGSP_EMX", "QGSP_EMX physics list") + ; + + class_ > + ("QGSP_HP", "QGSP_HP physics list") + ; + +#endif + +} + diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02EventAction.hh b/environments/g4py/source/physics_lists/pymodG4physicslists.cc similarity index 75% rename from examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02EventAction.hh rename to environments/g4py/source/physics_lists/pymodG4physicslists.cc index e845d5c190..942ec76be9 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02EventAction.hh +++ b/environments/g4py/source/physics_lists/pymodG4physicslists.cc @@ -23,24 +23,34 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// $Id: pymodG4physicslists.cc,v 1.1 2006/11/20 08:53:05 kmura Exp $ +// $Name: geant4-08-02 $ // ==================================================================== +// pymodG4physicslists.cc [Geant4Py module] // -// H02EventAction.hh -// $Id: H02EventAction.hh,v 1.3 2006/06/29 17:12:59 gunter Exp $ -// +// 2005 Q // ==================================================================== -#ifndef H02_EVENT_ACTION_H -#define H02_EVENT_ACTION_H +#include +#include "pyG4Version.hh" -#include "G4UserEventAction.hh" +using namespace boost::python; -class H02EventAction : public G4UserEventAction { -public: - H02EventAction(); - ~H02EventAction(); +// ==================================================================== +// module definition +// ==================================================================== +#if G4VERSION_NUMBER >= 820 - virtual void BeginOfEventAction(const G4Event* anEvent); - virtual void EndOfEventAction(const G4Event* anEvent); -}; +void export_PhysicsLists(); #endif + +BOOST_PYTHON_MODULE(G4physicslists) +{ +#if G4VERSION_NUMBER >= 820 + + export_PhysicsLists(); + +#endif + +} + diff --git a/environments/g4py/source/processes/GNUmakefile b/environments/g4py/source/processes/GNUmakefile index 3fcbb423c0..c2e8de066e 100644 --- a/environments/g4py/source/processes/GNUmakefile +++ b/environments/g4py/source/processes/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.2 2006/04/25 08:09:45 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py modules # =========================================================== diff --git a/environments/g4py/source/processes/pyG4EmCalculator.cc b/environments/g4py/source/processes/pyG4EmCalculator.cc index 45a116207f..7d23b48d88 100644 --- a/environments/g4py/source/processes/pyG4EmCalculator.cc +++ b/environments/g4py/source/processes/pyG4EmCalculator.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: pyG4EmCalculator.cc,v 1.4 2006/06/29 15:34:49 gunter Exp $ -// $Name: geant4-08-01 $ +// $Id: pyG4EmCalculator.cc,v 1.5 2006/08/25 05:58:52 kmura Exp $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4EmCalculator.cc // @@ -136,6 +136,7 @@ G4double (G4EmCalculator::*f2_ComputeDEDX) BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_ComputeDEDX, ComputeDEDX, 4, 5); // ComputeNuclearDEDX +#if G4VERSION_NUMBER >=710 G4double (G4EmCalculator::*f1_ComputeNuclearDEDX) (G4double, const G4ParticleDefinition*, const G4Material*) = &G4EmCalculator::ComputeNuclearDEDX; @@ -143,6 +144,7 @@ G4double (G4EmCalculator::*f1_ComputeNuclearDEDX) G4double (G4EmCalculator::*f2_ComputeNuclearDEDX) (G4double, const G4String&, const G4String&) = &G4EmCalculator::ComputeNuclearDEDX; +#endif #if G4VERSION_NUMBER >= 810 @@ -256,8 +258,10 @@ void export_G4EmCalculator() // --- .def("ComputeDEDX", f1_ComputeDEDX, f_ComputeDEDX()) .def("ComputeDEDX", f2_ComputeDEDX, f_ComputeDEDX()) +#if G4VERSION_NUMBER >=710 .def("ComputeNuclearDEDX", f1_ComputeNuclearDEDX) .def("ComputeNuclearDEDX", f2_ComputeNuclearDEDX) +#endif #if G4VERSION_NUMBER >= 810 .def("ComputeElectronicDEDX", f1_ComputeElectronicDEDX, f_ComputeElectronicDEDX()) diff --git a/environments/g4py/source/processes/pyG4LossTableManager.cc b/environments/g4py/source/processes/pyG4LossTableManager.cc new file mode 100644 index 0000000000..5fc211b087 --- /dev/null +++ b/environments/g4py/source/processes/pyG4LossTableManager.cc @@ -0,0 +1,95 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: pyG4LossTableManager.cc,v 1.2 2006/08/23 02:17:06 kmura Exp $ +// $Name: geant4-08-02 $ +// ==================================================================== +// pyG4LossTableManager.cc +// +// 2005 Q +// ==================================================================== +#include +#include "pyG4Version.hh" +#include "G4LossTableManager.hh" + +using namespace boost::python; + +// ==================================================================== +// module definition +// ==================================================================== +void export_G4LossTableManager() +{ + class_ + ("G4LossTableManager", "energy loss table manager", no_init) + .def("Instance", &G4LossTableManager::Instance, + return_value_policy()) + .staticmethod("Instance") + + // internally used methods are limmitted to be exposed... + + // ---- + .def("SetLossFluctuations", &G4LossTableManager::SetLossFluctuations) + .def("SetSubCutoff", &G4LossTableManager::SetSubCutoff) + .def("SetIntegral", &G4LossTableManager::SetIntegral) + .def("SetRandomStep", &G4LossTableManager::SetRandomStep) + .def("SetMinSubRange", &G4LossTableManager::SetMinSubRange) + .def("SetMinEnergy", &G4LossTableManager::SetMinEnergy) + .def("SetMaxEnergy", &G4LossTableManager::SetMaxEnergy) + +#if G4VERSION_NUMBER >= 810 + .def("SetMaxEnergyForCSDARange", + &G4LossTableManager::SetMaxEnergyForCSDARange) +#else + .def("SetMaxEnergyForPreciseRange", + &G4LossTableManager::SetMaxEnergyForPreciseRange) +#endif + + .def("SetMaxEnergyForMuons", &G4LossTableManager::SetMaxEnergyForMuons) + +#if G4VERSION_NUMBER >= 810 + .def("SetStepFunction", &G4LossTableManager::SetStepFunction) + .def("SetBuildCSDARange", &G4LossTableManager::SetBuildCSDARange) + .def("SetLPMFlag", &G4LossTableManager::SetLPMFlag) + .def("SetBremsstrahlungTh", &G4LossTableManager::SetBremsstrahlungTh) +#else + .def("SetStepLimits", &G4LossTableManager::SetStepLimits) + .def("SetBuildPreciseRange", &G4LossTableManager::SetBuildPreciseRange) +#endif + .def("SetVerbose", &G4LossTableManager::SetVerbose) + + // --- +#if G4VERSION_NUMBER >= 810 + .def("BuildCSDARange", &G4LossTableManager::BuildCSDARange) + .def("LPMFlag", &G4LossTableManager::LPMFlag) + .def("SetMscStepLimitation", &G4LossTableManager::SetMscStepLimitation) + .def("MscFlag", &G4LossTableManager::MscFlag) + .def("FacRange", &G4LossTableManager::FacRange) + .def("BremsstrahlungTh", &G4LossTableManager::BremsstrahlungTh) +#else + .def("BuildPreciseRange", &G4LossTableManager::BuildPreciseRange) +#endif + ; +} + diff --git a/environments/g4py/source/processes/pyG4ProcVector.cc b/environments/g4py/source/processes/pyG4ProcVector.cc index 04f96b55e6..ae332d3322 100644 --- a/environments/g4py/source/processes/pyG4ProcVector.cc +++ b/environments/g4py/source/processes/pyG4ProcVector.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4ProcVector.cc,v 1.4 2006/06/29 15:34:52 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4ProcVector.cc // diff --git a/environments/g4py/source/processes/pyG4ProcessManager.cc b/environments/g4py/source/processes/pyG4ProcessManager.cc index 59a83df769..8a43a2ef12 100644 --- a/environments/g4py/source/processes/pyG4ProcessManager.cc +++ b/environments/g4py/source/processes/pyG4ProcessManager.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4ProcessManager.cc,v 1.4 2006/06/29 15:34:55 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4ProcessManager.cc // diff --git a/environments/g4py/source/processes/pyG4ProcessTable.cc b/environments/g4py/source/processes/pyG4ProcessTable.cc index a534692b28..0785cf38d1 100644 --- a/environments/g4py/source/processes/pyG4ProcessTable.cc +++ b/environments/g4py/source/processes/pyG4ProcessTable.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4ProcessTable.cc,v 1.4 2006/06/29 15:34:58 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4ProcessTable.cc // diff --git a/environments/g4py/source/processes/pyG4ProcessType.cc b/environments/g4py/source/processes/pyG4ProcessType.cc index b43d052d75..e8a70469bb 100644 --- a/environments/g4py/source/processes/pyG4ProcessType.cc +++ b/environments/g4py/source/processes/pyG4ProcessType.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4ProcessType.cc,v 1.4 2006/06/29 15:35:00 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4ProcessTyoe.cc // diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02EventAction.cc b/environments/g4py/source/processes/pyG4ProductionCutsTable.cc similarity index 58% rename from examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02EventAction.cc rename to environments/g4py/source/processes/pyG4ProductionCutsTable.cc index 86870939b3..36bc585b06 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02EventAction.cc +++ b/environments/g4py/source/processes/pyG4ProductionCutsTable.cc @@ -23,63 +23,41 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// $Id: pyG4ProductionCutsTable.cc,v 1.2 2006/07/12 06:29:02 kmura Exp $ +// $Name: geant4-08-02 $ // ==================================================================== +// pyG4ProductionCutsTable.cc // -// H02EventAction.cc -// $Id: H02EventAction.cc,v 1.4 2006/06/29 17:13:46 gunter Exp $ -// +// 2005 Q // ==================================================================== -#include "H02EventAction.hh" +#include +#include "G4ProductionCutsTable.hh" -#include "G4Event.hh" -#include "G4SDManager.hh" -#include "H02MuonSD.hh" +using namespace boost::python; // ==================================================================== -// -// class description -// +// module definition // ==================================================================== - -////////////////////////////// -H02EventAction::H02EventAction() -////////////////////////////// +void export_G4ProductionCutsTable() { + class_ + ("G4ProductionCutsTable", "production cuts table", no_init) + .def("GetProductionCutsTable", + &G4ProductionCutsTable::GetProductionCutsTable, + return_value_policy()) + .staticmethod("GetProductionCutsTable") + + // internally used methods are limmitted to be exposed... + + // --- + .def("GetLowEdgeEnergy", &G4ProductionCutsTable::GetLowEdgeEnergy) + .def("GetHighEdgeEnergy", &G4ProductionCutsTable::GetHighEdgeEnergy) + .def("SetEnergyRange", &G4ProductionCutsTable::SetEnergyRange) + .def("DumpCouples", &G4ProductionCutsTable::DumpCouples) + .def("IsModified", &G4ProductionCutsTable::IsModified) + // --- + .def("SetVerboseLevel", &G4ProductionCutsTable::SetVerboseLevel) + .def("GetVerboseLevel", &G4ProductionCutsTable::GetVerboseLevel) + ; } -/////////////////////////////// -H02EventAction::~H02EventAction() -/////////////////////////////// -{ -} - - -////////////////////////////////////////////////////////////// -void H02EventAction::BeginOfEventAction(const G4Event* anEvent) -////////////////////////////////////////////////////////////// -{ - const G4Event* ev = anEvent; ev = 0; -#ifdef DEBUG_HEPMC - // printout primary information - G4cout << "Print out primary information" << G4endl; - G4int nVtx= anEvent-> GetNumberOfPrimaryVertex(); - G4int i; - for(i=0; i< nVtx; i++) { - const G4PrimaryVertex* primaryVertex= anEvent-> GetPrimaryVertex(i); - primaryVertex-> Print(); - } -#endif -} - -//////////////////////////////////////////////////////////// -void H02EventAction::EndOfEventAction(const G4Event*) -//////////////////////////////////////////////////////////// -{ - G4cout << " Print out hit information" << G4endl; - G4SDManager* SDManager= G4SDManager::GetSDMpointer(); - H02MuonSD* muonSD= - (H02MuonSD*)SDManager-> FindSensitiveDetector("/mydet/muon"); - muonSD-> PrintAll(); - muonSD-> DrawAll(); - G4cout << G4endl; -} diff --git a/environments/g4py/source/processes/pyG4VProcess.cc b/environments/g4py/source/processes/pyG4VProcess.cc index defa5a31fa..300f92c226 100644 --- a/environments/g4py/source/processes/pyG4VProcess.cc +++ b/environments/g4py/source/processes/pyG4VProcess.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4VProcess.cc,v 1.4 2006/06/29 15:35:03 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4VProcess.cc // diff --git a/environments/g4py/source/processes/pymodG4processes.cc b/environments/g4py/source/processes/pymodG4processes.cc index 71b4a2c6be..529e3e08ea 100644 --- a/environments/g4py/source/processes/pymodG4processes.cc +++ b/environments/g4py/source/processes/pymodG4processes.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: pymodG4processes.cc,v 1.4 2006/06/29 15:35:06 gunter Exp $ -// $Name: geant4-08-01 $ +// $Id: pymodG4processes.cc,v 1.6 2006/07/12 05:43:18 kmura Exp $ +// $Name: geant4-08-02 $ // ==================================================================== // pymodG4processes.cc // @@ -43,6 +43,8 @@ void export_G4VProcess(); void export_G4ProcVector(); void export_G4ProcessType(); void export_G4EmCalculator(); +void export_G4LossTableManager(); +void export_G4ProductionCutsTable(); BOOST_PYTHON_MODULE(G4processes) { @@ -52,4 +54,6 @@ BOOST_PYTHON_MODULE(G4processes) export_G4ProcVector(); export_G4ProcessType(); export_G4EmCalculator(); + export_G4LossTableManager(); + export_G4ProductionCutsTable(); } diff --git a/environments/g4py/source/python/GNUmakefile b/environments/g4py/source/python/GNUmakefile index 87b7de9257..0c091d6bfb 100644 --- a/environments/g4py/source/python/GNUmakefile +++ b/environments/g4py/source/python/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.3 2006/06/29 01:39:00 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py modules # =========================================================== diff --git a/environments/g4py/source/python/__init__.py b/environments/g4py/source/python/__init__.py index 5352aa8be6..e2fa196f6a 100644 --- a/environments/g4py/source/python/__init__.py +++ b/environments/g4py/source/python/__init__.py @@ -1,4 +1,4 @@ -# $Id: __init__.py,v 1.4 2006/06/23 17:05:42 kmura Exp $ +# $Id: __init__.py,v 1.12 2006/12/01 02:21:56 kmura Exp $ """ # ================================================================== # [Geant4] module package @@ -13,8 +13,8 @@ # ================================================================== # docs # ================================================================== -__version__ = '1.0.0' -__date__ = '24/June/2006' +__version__ = '1.2.0' +__date__ = '01/Dec/2006' __author__ = 'K.Murakami (Koichi.Murakami@kek.jp)' __url__ = 'http://www-geant4.kek.jp/projects/Geant4Py/' @@ -34,6 +34,7 @@ def PrintVersion(): # import submodules # ================================================================== from G4interface import * +from G4intercoms import * from G4global import * from G4run import * from G4event import * @@ -43,6 +44,7 @@ from G4particles import * from G4processes import * from G4geometry import * from G4materials import * +from G4physicslists import * from G4digits_hits import * from G4visualization import * from G4graphics_reps import * @@ -61,6 +63,11 @@ else: gRunManager= G4RunManager.GetRunManager() gRunManagerKernel= G4RunManagerKernel.GetRunManagerKernel() +# ------------------------------------------------------------------ +# gUImanager +# ------------------------------------------------------------------ +gUImanager= G4UImanager.GetUIpointer() + # ------------------------------------------------------------------ # gEventManager # ------------------------------------------------------------------ @@ -80,6 +87,7 @@ gTrackingManager= gEventManager.GetTrackingManager() # gStateManager # ------------------------------------------------------------------ gStateManager= G4StateManager.GetStateManager() +gExceptionHandler= G4ExceptionHandler() # automatically registered # ------------------------------------------------------------------ # gTransportationManager @@ -97,6 +105,16 @@ gParticleIterator= PyG4ParticleList() # ------------------------------------------------------------------ gProcessTable= G4ProcessTable.GetProcessTable() +# ------------------------------------------------------------------ +# gLossTableManager +# ------------------------------------------------------------------ +gLossTableManager= G4LossTableManager.Instance() + +# ------------------------------------------------------------------ +# gProductionCutsTable +# ------------------------------------------------------------------ +gProductionCutsTable= G4ProductionCutsTable.GetProductionCutsTable() + # ------------------------------------------------------------------ # gEmCalculator # ------------------------------------------------------------------ @@ -166,11 +184,20 @@ if(G4VisManager.GetConcreteInstance() == None): gVisManager.Initialize() +# ------------------------------------------------------------------ +# version information +# ------------------------------------------------------------------ +gG4Version = G4Version +gG4Date = G4Date +gG4VERSION_NUMBER = G4VERSION_NUMBER + # ------------------------------------------------------------------ # functions # ------------------------------------------------------------------ -gApplyUICommand= G4interface.ApplyUICommand -gGetCurrentValues= G4interface.GetCurrentValues +gControlExecute= gUImanager.ExecuteMacroFile +gApplyUICommand= G4intercoms.ApplyUICommand +gGetCurrentValues= gUImanager.GetCurrentValues + gStartUISession= G4interface.StartUISession # EmCalculator @@ -231,10 +258,3 @@ def ListMaterial(self): G4MaterialTable.ListMaterial = ListMaterial -# ------------------------------------------------------------------ -# execute G4 macro -# ------------------------------------------------------------------ -def gControlExecute(g4mac): - ui_command= "/control/execute " + g4mac - gApplyUICommand(ui_command) - diff --git a/environments/g4py/source/run/GNUmakefile b/environments/g4py/source/run/GNUmakefile index 1aaa6045ff..7b25afd05a 100644 --- a/environments/g4py/source/run/GNUmakefile +++ b/environments/g4py/source/run/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.2 2006/04/25 08:09:45 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py modules # =========================================================== diff --git a/environments/g4py/source/run/pyG4Run.cc b/environments/g4py/source/run/pyG4Run.cc index 8738cef71b..f4237e2690 100644 --- a/environments/g4py/source/run/pyG4Run.cc +++ b/environments/g4py/source/run/pyG4Run.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4Run.cc,v 1.4 2006/06/29 15:35:09 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4Run.cc // diff --git a/environments/g4py/source/run/pyG4RunManager.cc b/environments/g4py/source/run/pyG4RunManager.cc index 777807a66d..c11a13e7cf 100644 --- a/environments/g4py/source/run/pyG4RunManager.cc +++ b/environments/g4py/source/run/pyG4RunManager.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4RunManager.cc,v 1.4 2006/06/29 15:35:12 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4RunManager.cc // diff --git a/environments/g4py/source/run/pyG4RunManagerKernel.cc b/environments/g4py/source/run/pyG4RunManagerKernel.cc index 3435b51506..1dbf2e8f7c 100644 --- a/environments/g4py/source/run/pyG4RunManagerKernel.cc +++ b/environments/g4py/source/run/pyG4RunManagerKernel.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4RunManagerKernel.cc,v 1.3 2006/06/29 15:35:15 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4RunManagerKernel.cc // diff --git a/environments/g4py/source/run/pyG4UserRunAction.cc b/environments/g4py/source/run/pyG4UserRunAction.cc index f90f7dc0f0..0f0f1486d7 100644 --- a/environments/g4py/source/run/pyG4UserRunAction.cc +++ b/environments/g4py/source/run/pyG4UserRunAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4UserRunAction.cc,v 1.6 2006/06/29 15:35:18 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4UserRunAction.cc // diff --git a/environments/g4py/source/run/pyG4VModularPhysicsList.cc b/environments/g4py/source/run/pyG4VModularPhysicsList.cc index b49392ac53..7b7a600ee9 100644 --- a/environments/g4py/source/run/pyG4VModularPhysicsList.cc +++ b/environments/g4py/source/run/pyG4VModularPhysicsList.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4VModularPhysicsList.cc,v 1.3 2006/06/29 15:35:21 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4VModularPhysicsList.cc // diff --git a/environments/g4py/source/run/pyG4VPhysicsConstructor.cc b/environments/g4py/source/run/pyG4VPhysicsConstructor.cc index 97eb422928..9a58fb1e1d 100644 --- a/environments/g4py/source/run/pyG4VPhysicsConstructor.cc +++ b/environments/g4py/source/run/pyG4VPhysicsConstructor.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4VPhysicsConstructor.cc,v 1.3 2006/06/29 15:35:24 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4VPhysicsConstructor.cc // diff --git a/environments/g4py/source/run/pyG4VUserDetectorConstruction.cc b/environments/g4py/source/run/pyG4VUserDetectorConstruction.cc index ddc2628d3f..40585e9629 100644 --- a/environments/g4py/source/run/pyG4VUserDetectorConstruction.cc +++ b/environments/g4py/source/run/pyG4VUserDetectorConstruction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4VUserDetectorConstruction.cc,v 1.5 2006/06/29 15:35:27 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4VUserDetectorConstruction.cc // diff --git a/environments/g4py/source/run/pyG4VUserPhysicsList.cc b/environments/g4py/source/run/pyG4VUserPhysicsList.cc index 30a21c96fb..39d92a075a 100644 --- a/environments/g4py/source/run/pyG4VUserPhysicsList.cc +++ b/environments/g4py/source/run/pyG4VUserPhysicsList.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4VUserPhysicsList.cc,v 1.5 2006/06/29 15:35:30 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4VUserPhysicsList.cc // diff --git a/environments/g4py/source/run/pyG4VUserPrimaryGeneratorAction.cc b/environments/g4py/source/run/pyG4VUserPrimaryGeneratorAction.cc index 8489c1522a..3293348aea 100644 --- a/environments/g4py/source/run/pyG4VUserPrimaryGeneratorAction.cc +++ b/environments/g4py/source/run/pyG4VUserPrimaryGeneratorAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4VUserPrimaryGeneratorAction.cc,v 1.7 2006/06/29 15:35:33 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4VUserPrimaryGeneratorAction.cc // diff --git a/environments/g4py/source/run/pymodG4run.cc b/environments/g4py/source/run/pymodG4run.cc index de4e4983a2..da2266edb7 100644 --- a/environments/g4py/source/run/pymodG4run.cc +++ b/environments/g4py/source/run/pymodG4run.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pymodG4run.cc,v 1.4 2006/06/29 15:35:35 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pymodG4run.cc [Geant4Py module] // diff --git a/environments/g4py/source/track/GNUmakefile b/environments/g4py/source/track/GNUmakefile index 6bb910387f..0360610c9c 100644 --- a/environments/g4py/source/track/GNUmakefile +++ b/environments/g4py/source/track/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.2 2006/04/25 08:09:45 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py modules # =========================================================== diff --git a/environments/g4py/source/track/pyG4Step.cc b/environments/g4py/source/track/pyG4Step.cc index be8e023b57..3ec94d7318 100644 --- a/environments/g4py/source/track/pyG4Step.cc +++ b/environments/g4py/source/track/pyG4Step.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4Step.cc,v 1.4 2006/06/29 15:35:38 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4Step.cc // diff --git a/environments/g4py/source/track/pyG4StepPoint.cc b/environments/g4py/source/track/pyG4StepPoint.cc index 4184674fb6..69034ca0ac 100644 --- a/environments/g4py/source/track/pyG4StepPoint.cc +++ b/environments/g4py/source/track/pyG4StepPoint.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4StepPoint.cc,v 1.4 2006/06/29 15:35:40 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4StepPoint.cc // diff --git a/environments/g4py/source/track/pyG4StepStatus.cc b/environments/g4py/source/track/pyG4StepStatus.cc index 6f44572fae..aa07293375 100644 --- a/environments/g4py/source/track/pyG4StepStatus.cc +++ b/environments/g4py/source/track/pyG4StepStatus.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4StepStatus.cc,v 1.4 2006/06/29 15:35:42 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4StepStatus.cc // diff --git a/environments/g4py/source/track/pyG4Track.cc b/environments/g4py/source/track/pyG4Track.cc index 19c356f791..17c46012a1 100644 --- a/environments/g4py/source/track/pyG4Track.cc +++ b/environments/g4py/source/track/pyG4Track.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4Track.cc,v 1.5 2006/06/29 15:35:46 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4Track.cc // diff --git a/environments/g4py/source/track/pyG4TrackStatus.cc b/environments/g4py/source/track/pyG4TrackStatus.cc index 97c2de46a9..b0352a8f1f 100644 --- a/environments/g4py/source/track/pyG4TrackStatus.cc +++ b/environments/g4py/source/track/pyG4TrackStatus.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4TrackStatus.cc,v 1.4 2006/06/29 15:35:48 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4TrackStatus.cc // diff --git a/environments/g4py/source/track/pymodG4track.cc b/environments/g4py/source/track/pymodG4track.cc index b0cacc5360..94288f7ac6 100644 --- a/environments/g4py/source/track/pymodG4track.cc +++ b/environments/g4py/source/track/pymodG4track.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pymodG4track.cc,v 1.4 2006/06/29 15:35:50 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pymodG4track.cc [Geant4Py module] // diff --git a/environments/g4py/source/tracking/GNUmakefile b/environments/g4py/source/tracking/GNUmakefile index 6816563c38..53cc462015 100644 --- a/environments/g4py/source/tracking/GNUmakefile +++ b/environments/g4py/source/tracking/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.2 2006/04/25 08:09:45 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py modules # =========================================================== diff --git a/environments/g4py/source/tracking/pyG4TrackingManager.cc b/environments/g4py/source/tracking/pyG4TrackingManager.cc index 4419e33987..0843046d42 100644 --- a/environments/g4py/source/tracking/pyG4TrackingManager.cc +++ b/environments/g4py/source/tracking/pyG4TrackingManager.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4TrackingManager.cc,v 1.4 2006/06/29 15:35:53 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4TrackingManager.cc // diff --git a/environments/g4py/source/tracking/pyG4UserSteppingAction.cc b/environments/g4py/source/tracking/pyG4UserSteppingAction.cc index fd2674da59..e9af6feda5 100644 --- a/environments/g4py/source/tracking/pyG4UserSteppingAction.cc +++ b/environments/g4py/source/tracking/pyG4UserSteppingAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $ID$ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4UserSteppingAction.cc // diff --git a/environments/g4py/source/tracking/pyG4UserTrackingAction.cc b/environments/g4py/source/tracking/pyG4UserTrackingAction.cc index 387dc82e43..3cc293b04f 100644 --- a/environments/g4py/source/tracking/pyG4UserTrackingAction.cc +++ b/environments/g4py/source/tracking/pyG4UserTrackingAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $ID$ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4UserTrackingAction.cc // diff --git a/environments/g4py/source/tracking/pymodG4tracking.cc b/environments/g4py/source/tracking/pymodG4tracking.cc index be65d30839..b725de9774 100644 --- a/environments/g4py/source/tracking/pymodG4tracking.cc +++ b/environments/g4py/source/tracking/pymodG4tracking.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pymodG4tracking.cc,v 1.4 2006/06/29 15:36:02 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pymodG4tracking.cc [Geant4Py module] // diff --git a/environments/g4py/source/version/G4Version_7.0.hh b/environments/g4py/source/version/G4Version_7.0.hh index 59836f9f82..5f759cbb05 100644 --- a/environments/g4py/source/version/G4Version_7.0.hh +++ b/environments/g4py/source/version/G4Version_7.0.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4Version_7.0.hh,v 1.4 2006/06/29 15:36:05 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // G4Version_7.0.hh // @@ -38,14 +38,14 @@ #endif #ifndef G4VERSION_TAG -#define G4VERSION_TAG "$Name: geant4-08-01 $" +#define G4VERSION_TAG "$Name: geant4-08-02 $" #endif // as variables #include "G4String.hh" -static const G4String G4Version = "$Name: geant4-08-01 $"; +static const G4String G4Version = "$Name: geant4-08-02 $"; static const G4String G4Date = "(17-December-2004)"; #endif diff --git a/environments/g4py/source/version/G4Version_7.0.p01.hh b/environments/g4py/source/version/G4Version_7.0.p01.hh index 99a93bbd58..c115034601 100644 --- a/environments/g4py/source/version/G4Version_7.0.p01.hh +++ b/environments/g4py/source/version/G4Version_7.0.p01.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4Version_7.0.p01.hh,v 1.4 2006/06/29 15:36:08 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // G4Version_7.0.p01.hh // @@ -38,14 +38,14 @@ #endif #ifndef G4VERSION_TAG -#define G4VERSION_TAG "$Name: geant4-08-01 $" +#define G4VERSION_TAG "$Name: geant4-08-02 $" #endif // as variables #include "G4String.hh" -static const G4String G4Version = "$Name: geant4-08-01 $"; +static const G4String G4Version = "$Name: geant4-08-02 $"; static const G4String G4Date = "(23-February-2005)"; #endif diff --git a/environments/g4py/source/version/G4Version_7.1.hh b/environments/g4py/source/version/G4Version_7.1.hh index d80d0a3cc5..d5bf1ace7a 100644 --- a/environments/g4py/source/version/G4Version_7.1.hh +++ b/environments/g4py/source/version/G4Version_7.1.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4Version_7.1.hh,v 1.4 2006/06/29 15:36:11 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // G4Version_7.1.hh // @@ -38,14 +38,14 @@ #endif #ifndef G4VERSION_TAG -#define G4VERSION_TAG "$Name: geant4-08-01 $" +#define G4VERSION_TAG "$Name: geant4-08-02 $" #endif // as variables #include "G4String.hh" -static const G4String G4Version = "$Name: geant4-08-01 $"; +static const G4String G4Version = "$Name: geant4-08-02 $"; static const G4String G4Date = "(30-June-2005)"; #endif diff --git a/environments/g4py/source/version/G4Version_7.1.p01.hh b/environments/g4py/source/version/G4Version_7.1.p01.hh index 6e9ccd215e..0811c1a4fa 100644 --- a/environments/g4py/source/version/G4Version_7.1.p01.hh +++ b/environments/g4py/source/version/G4Version_7.1.p01.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4Version_7.1.p01.hh,v 1.4 2006/06/29 15:36:14 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // G4Version_7.1.p01hh // @@ -38,14 +38,14 @@ #endif #ifndef G4VERSION_TAG -#define G4VERSION_TAG "$Name: geant4-08-01 $" +#define G4VERSION_TAG "$Name: geant4-08-02 $" #endif // as variables #include "G4String.hh" -static const G4String G4Version = "$Name: geant4-08-01 $"; +static const G4String G4Version = "$Name: geant4-08-02 $"; static const G4String G4Date = "(25-Oct-2005)"; #endif diff --git a/environments/g4py/source/version/GNUmakefile b/environments/g4py/source/version/GNUmakefile index 7a8fdd65b4..4a5335c5e5 100644 --- a/environments/g4py/source/version/GNUmakefile +++ b/environments/g4py/source/version/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.2 2006/04/25 08:09:45 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py modules # =========================================================== diff --git a/environments/g4py/source/version/pyG4Version.hh b/environments/g4py/source/version/pyG4Version.hh index 18da081369..dc8842fef0 100644 --- a/environments/g4py/source/version/pyG4Version.hh +++ b/environments/g4py/source/version/pyG4Version.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4Version.hh,v 1.4 2006/06/29 15:36:17 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4Version.hh // diff --git a/environments/g4py/source/visualization/GNUmakefile b/environments/g4py/source/visualization/GNUmakefile index 9a46e22c2b..706e3f3e82 100644 --- a/environments/g4py/source/visualization/GNUmakefile +++ b/environments/g4py/source/visualization/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.2 2006/04/25 08:09:45 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py modules # =========================================================== diff --git a/environments/g4py/source/visualization/pyG4ASCIITree.cc b/environments/g4py/source/visualization/pyG4ASCIITree.cc index 88794208ae..04923a14c3 100644 --- a/environments/g4py/source/visualization/pyG4ASCIITree.cc +++ b/environments/g4py/source/visualization/pyG4ASCIITree.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4ASCIITree.cc,v 1.5 2006/06/29 15:36:20 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4ASCIITree.cc // diff --git a/environments/g4py/source/visualization/pyG4DAWNFILE.cc b/environments/g4py/source/visualization/pyG4DAWNFILE.cc index 01e8208089..0eef2e3ed8 100644 --- a/environments/g4py/source/visualization/pyG4DAWNFILE.cc +++ b/environments/g4py/source/visualization/pyG4DAWNFILE.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4DAWNFILE.cc,v 1.5 2006/06/29 15:36:23 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4DAWNFILE.cc // diff --git a/environments/g4py/source/visualization/pyG4HepRep.cc b/environments/g4py/source/visualization/pyG4HepRep.cc index ec34add9be..f7f17f3a9a 100644 --- a/environments/g4py/source/visualization/pyG4HepRep.cc +++ b/environments/g4py/source/visualization/pyG4HepRep.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4HepRep.cc,v 1.5 2006/06/29 15:36:25 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4HepRep.cc // diff --git a/environments/g4py/source/visualization/pyG4HepRepFile.cc b/environments/g4py/source/visualization/pyG4HepRepFile.cc index 5168b060d5..ee0486c51d 100644 --- a/environments/g4py/source/visualization/pyG4HepRepFile.cc +++ b/environments/g4py/source/visualization/pyG4HepRepFile.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4HepRepFile.cc,v 1.5 2006/06/29 15:36:27 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4HepRepFile.cc // diff --git a/environments/g4py/source/visualization/pyG4OpenGLImmediateX.cc b/environments/g4py/source/visualization/pyG4OpenGLImmediateX.cc index 19e435660b..3785dfa753 100644 --- a/environments/g4py/source/visualization/pyG4OpenGLImmediateX.cc +++ b/environments/g4py/source/visualization/pyG4OpenGLImmediateX.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4OpenGLImmediateX.cc,v 1.5 2006/06/29 15:36:29 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4OpenGLImmediateX.cc // diff --git a/environments/g4py/source/visualization/pyG4OpenGLImmediateXm.cc b/environments/g4py/source/visualization/pyG4OpenGLImmediateXm.cc index 82d6dfe0f1..9aa1f964eb 100644 --- a/environments/g4py/source/visualization/pyG4OpenGLImmediateXm.cc +++ b/environments/g4py/source/visualization/pyG4OpenGLImmediateXm.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4OpenGLImmediateXm.cc,v 1.5 2006/06/29 15:36:32 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4OpenGLImmediateXm.cc // diff --git a/environments/g4py/source/visualization/pyG4OpenGLStoredX.cc b/environments/g4py/source/visualization/pyG4OpenGLStoredX.cc index 6b2bc23060..0a7306beb6 100644 --- a/environments/g4py/source/visualization/pyG4OpenGLStoredX.cc +++ b/environments/g4py/source/visualization/pyG4OpenGLStoredX.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4OpenGLStoredX.cc,v 1.5 2006/06/29 15:36:35 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4OpenGLStoredX.cc // diff --git a/environments/g4py/source/visualization/pyG4OpenGLStoredXm.cc b/environments/g4py/source/visualization/pyG4OpenGLStoredXm.cc index 5cfa8b8b9b..4e69be2047 100644 --- a/environments/g4py/source/visualization/pyG4OpenGLStoredXm.cc +++ b/environments/g4py/source/visualization/pyG4OpenGLStoredXm.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4OpenGLStoredXm.cc,v 1.5 2006/06/29 15:36:38 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4OpenGLStoredXm.cc // diff --git a/environments/g4py/source/visualization/pyG4RayTracer.cc b/environments/g4py/source/visualization/pyG4RayTracer.cc index 6a1d1006ce..82373f1bbf 100644 --- a/environments/g4py/source/visualization/pyG4RayTracer.cc +++ b/environments/g4py/source/visualization/pyG4RayTracer.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4RayTracer.cc,v 1.5 2006/06/29 15:36:41 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4RayTracer.cc // diff --git a/environments/g4py/source/visualization/pyG4RayTracerX.cc b/environments/g4py/source/visualization/pyG4RayTracerX.cc index a8afb77a5e..6b71899e12 100644 --- a/environments/g4py/source/visualization/pyG4RayTracerX.cc +++ b/environments/g4py/source/visualization/pyG4RayTracerX.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4RayTracerX.cc,v 1.5 2006/06/29 15:36:44 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4RayTracerX.cc // diff --git a/environments/g4py/source/visualization/pyG4VGraphicsSystem.cc b/environments/g4py/source/visualization/pyG4VGraphicsSystem.cc index 2ccc1c1ffa..01abefc3be 100644 --- a/environments/g4py/source/visualization/pyG4VGraphicsSystem.cc +++ b/environments/g4py/source/visualization/pyG4VGraphicsSystem.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4VGraphicsSystem.cc,v 1.5 2006/06/29 15:36:47 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4VGraphicsSystem.cc // diff --git a/environments/g4py/source/visualization/pyG4VRML1File.cc b/environments/g4py/source/visualization/pyG4VRML1File.cc index dcd772ae52..caf801592a 100644 --- a/environments/g4py/source/visualization/pyG4VRML1File.cc +++ b/environments/g4py/source/visualization/pyG4VRML1File.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4VRML1File.cc,v 1.5 2006/06/29 15:36:50 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4VRML1File.cc // diff --git a/environments/g4py/source/visualization/pyG4VRML2File.cc b/environments/g4py/source/visualization/pyG4VRML2File.cc index ddce479a0f..95cf8600d2 100644 --- a/environments/g4py/source/visualization/pyG4VRML2File.cc +++ b/environments/g4py/source/visualization/pyG4VRML2File.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pyG4VRML2File.cc,v 1.5 2006/06/29 15:36:53 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4VRML2File.cc // diff --git a/environments/g4py/source/visualization/pyG4VisManager.cc b/environments/g4py/source/visualization/pyG4VisManager.cc index ca3918537e..baeb4df60c 100644 --- a/environments/g4py/source/visualization/pyG4VisManager.cc +++ b/environments/g4py/source/visualization/pyG4VisManager.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: pyG4VisManager.cc,v 1.4 2006/06/29 15:36:56 gunter Exp $ -// $Name: geant4-08-01 $ +// $Id: pyG4VisManager.cc,v 1.6 2006/12/01 02:17:54 kmura Exp $ +// $Name: geant4-08-02 $ // ==================================================================== // pyG4VisManager.cc // @@ -47,8 +47,6 @@ public: PyG4VisManager() { SetVerboseLevel(quiet); } ~PyG4VisManager() { } - void SetVerbosity(Verbosity verb) { fVerbosity= verb; } - virtual void RegisterGraphicsSystems() { } #if G4VERSION_NUMBER >= 800 @@ -60,6 +58,22 @@ public: }; +// ==================================================================== +// thin wrappers +// ==================================================================== +namespace pyG4VisManager { + +void (PyG4VisManager::*f1_SetVerboseLevel)(G4int) + = &PyG4VisManager::SetVerboseLevel; +void (PyG4VisManager::*f2_SetVerboseLevel)(const G4String&) + = &PyG4VisManager::SetVerboseLevel; + void (PyG4VisManager::*f3_SetVerboseLevel)(G4VisManager::Verbosity) + = &PyG4VisManager::SetVerboseLevel; + +} + +using namespace pyG4VisManager; + // ==================================================================== // module definition // ==================================================================== @@ -74,7 +88,9 @@ void export_G4VisManager() return_value_policy()) .staticmethod("GetConcreteInstance") // --- - .def("SetVerbosity", &PyG4VisManager::SetVerbosity) + .def("SetVerboseLevel", f1_SetVerboseLevel) + .def("SetVerboseLevel", f2_SetVerboseLevel) + .def("SetVerboseLevel", f3_SetVerboseLevel) .def("GetVerbosity", &PyG4VisManager::GetVerbosity) .def("Initialize", &PyG4VisManager::Initialize) .def("RegisterGraphicsSystem", &PyG4VisManager::RegisterGraphicsSystem) diff --git a/environments/g4py/source/visualization/pymodG4visualization.cc b/environments/g4py/source/visualization/pymodG4visualization.cc index 1eda08b613..98913df0fd 100644 --- a/environments/g4py/source/visualization/pymodG4visualization.cc +++ b/environments/g4py/source/visualization/pymodG4visualization.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: pymodG4visualization.cc,v 1.4 2006/06/29 15:36:59 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // pymodG4visualization.cc [Geant4Py module] // diff --git a/environments/g4py/tests/GNUmakefile b/environments/g4py/tests/GNUmakefile index 3a8594a214..593b840be7 100644 --- a/environments/g4py/tests/GNUmakefile +++ b/environments/g4py/tests/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.2 2006/04/25 07:54:28 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py modules # =========================================================== diff --git a/environments/g4py/tests/History b/environments/g4py/tests/History index 8f2179217d..6efcc7f154 100644 --- a/environments/g4py/tests/History +++ b/environments/g4py/tests/History @@ -1,4 +1,4 @@ -$Id: History,v 1.2 2006/04/25 07:54:28 kmura Exp $ +$Id: History,v 1.3 2006/08/08 05:10:09 kmura Exp $ ------------------------------------------------------------------- ========================================================= @@ -14,6 +14,9 @@ A set of tests for python wrapping of C++ elements. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +Aug.07, 2006 K.Murakami +- gtest04 is added. + Oct.05, 2005 K.Murakami - test13 is added. diff --git a/environments/g4py/tests/README b/environments/g4py/tests/README index 7bdd780ff5..849ae56ad1 100644 --- a/environments/g4py/tests/README +++ b/environments/g4py/tests/README @@ -1,4 +1,4 @@ -$Id: README,v 1.2 2006/04/25 07:54:28 kmura Exp $ +$Id: README,v 1.3 2006/08/08 05:10:09 kmura Exp $ ------------------------------------------------------------------- ========================================================= @@ -34,4 +34,5 @@ test13 ## test for a list argument/return (K.M) gtest01 ## user application (K.M) gtest02 ## test for using site-module packages (K.M) gtest03 ## test for EZsim package (K.M) +gtest04 ## test for getting command tree and command information (K.M) diff --git a/environments/g4py/tests/gtest01/g4lib/GNUmakefile b/environments/g4py/tests/gtest01/g4lib/GNUmakefile index abb421b943..f0c56e7895 100644 --- a/environments/g4py/tests/gtest01/g4lib/GNUmakefile +++ b/environments/g4py/tests/gtest01/g4lib/GNUmakefile @@ -1,5 +1,5 @@ # $Id: GNUmakefile,v 1.1 2006/05/11 03:00:08 kmura Exp $ -# $Name: geant4-08-01 $ +# $Name: geant4-08-02 $ # =========================================================== # Makefile for building Geant4Py modules # =========================================================== diff --git a/environments/g4py/tests/gtest01/g4lib/Particles.cc b/environments/g4py/tests/gtest01/g4lib/Particles.cc index c6611ca9a4..9dd8d5ef05 100644 --- a/environments/g4py/tests/gtest01/g4lib/Particles.cc +++ b/environments/g4py/tests/gtest01/g4lib/Particles.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: Particles.cc,v 1.3 2006/06/29 15:37:02 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // Particles.cc // diff --git a/environments/g4py/tests/gtest01/g4lib/PhysicsListEMstd.cc b/environments/g4py/tests/gtest01/g4lib/PhysicsListEMstd.cc index a9ef336264..2b953751cd 100644 --- a/environments/g4py/tests/gtest01/g4lib/PhysicsListEMstd.cc +++ b/environments/g4py/tests/gtest01/g4lib/PhysicsListEMstd.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListEMstd.cc,v 1.3 2006/06/29 15:37:08 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // PhysicsListEMstd.cc // diff --git a/environments/g4py/tests/gtest01/g4lib/QDetectorConstruction.cc b/environments/g4py/tests/gtest01/g4lib/QDetectorConstruction.cc index 44a917f81a..d08107b9db 100644 --- a/environments/g4py/tests/gtest01/g4lib/QDetectorConstruction.cc +++ b/environments/g4py/tests/gtest01/g4lib/QDetectorConstruction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: QDetectorConstruction.cc,v 1.3 2006/06/29 15:37:14 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // QDetectorConstruction.cc // diff --git a/environments/g4py/tests/gtest01/g4lib/QDetectorConstruction.hh b/environments/g4py/tests/gtest01/g4lib/QDetectorConstruction.hh index d9afa3452b..f77222e166 100644 --- a/environments/g4py/tests/gtest01/g4lib/QDetectorConstruction.hh +++ b/environments/g4py/tests/gtest01/g4lib/QDetectorConstruction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: QDetectorConstruction.hh,v 1.3 2006/06/29 15:37:17 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // QDetectorConstruction.hh // diff --git a/environments/g4py/tests/gtest01/g4lib/QEventAction.cc b/environments/g4py/tests/gtest01/g4lib/QEventAction.cc index 7156080590..033de53fd1 100644 --- a/environments/g4py/tests/gtest01/g4lib/QEventAction.cc +++ b/environments/g4py/tests/gtest01/g4lib/QEventAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: QEventAction.cc,v 1.3 2006/06/29 15:37:19 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // QEventAction.cc // diff --git a/environments/g4py/tests/gtest01/g4lib/QEventAction.hh b/environments/g4py/tests/gtest01/g4lib/QEventAction.hh index c6e4963759..24faa6c373 100644 --- a/environments/g4py/tests/gtest01/g4lib/QEventAction.hh +++ b/environments/g4py/tests/gtest01/g4lib/QEventAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: QEventAction.hh,v 1.3 2006/06/29 15:37:22 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // QEventAction.hh // diff --git a/environments/g4py/tests/gtest01/g4lib/QMaterials.cc b/environments/g4py/tests/gtest01/g4lib/QMaterials.cc index 979c756aaa..064367ef06 100644 --- a/environments/g4py/tests/gtest01/g4lib/QMaterials.cc +++ b/environments/g4py/tests/gtest01/g4lib/QMaterials.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: QMaterials.cc,v 1.3 2006/06/29 15:37:25 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // QMaterials.cc // diff --git a/environments/g4py/tests/gtest01/g4lib/QMaterials.hh b/environments/g4py/tests/gtest01/g4lib/QMaterials.hh index 3347b951ba..87f8ae6a37 100644 --- a/environments/g4py/tests/gtest01/g4lib/QMaterials.hh +++ b/environments/g4py/tests/gtest01/g4lib/QMaterials.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: QMaterials.hh,v 1.3 2006/06/29 15:37:28 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // QMaterials.hh // diff --git a/environments/g4py/tests/gtest01/g4lib/QPhysicsList.cc b/environments/g4py/tests/gtest01/g4lib/QPhysicsList.cc index e548f46a29..d19aa4dfa4 100644 --- a/environments/g4py/tests/gtest01/g4lib/QPhysicsList.cc +++ b/environments/g4py/tests/gtest01/g4lib/QPhysicsList.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: QPhysicsList.cc,v 1.3 2006/06/29 15:37:31 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // QPhysicsList.cc // diff --git a/environments/g4py/tests/gtest01/g4lib/QPhysicsList.hh b/environments/g4py/tests/gtest01/g4lib/QPhysicsList.hh index 9b1856d38f..34ac396bcf 100644 --- a/environments/g4py/tests/gtest01/g4lib/QPhysicsList.hh +++ b/environments/g4py/tests/gtest01/g4lib/QPhysicsList.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: QPhysicsList.hh,v 1.3 2006/06/29 15:37:34 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // QPhysicsList.hh // diff --git a/environments/g4py/tests/gtest01/g4lib/QPrimaryGeneratorAction.cc b/environments/g4py/tests/gtest01/g4lib/QPrimaryGeneratorAction.cc index 981477213b..160bb41103 100644 --- a/environments/g4py/tests/gtest01/g4lib/QPrimaryGeneratorAction.cc +++ b/environments/g4py/tests/gtest01/g4lib/QPrimaryGeneratorAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: QPrimaryGeneratorAction.cc,v 1.3 2006/06/29 15:37:37 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // QPrimaryGeneratorAction.cc // diff --git a/environments/g4py/tests/gtest01/g4lib/QPrimaryGeneratorAction.hh b/environments/g4py/tests/gtest01/g4lib/QPrimaryGeneratorAction.hh index f0182d8f0b..4e93452802 100644 --- a/environments/g4py/tests/gtest01/g4lib/QPrimaryGeneratorAction.hh +++ b/environments/g4py/tests/gtest01/g4lib/QPrimaryGeneratorAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: QPrimaryGeneratorAction.hh,v 1.3 2006/06/29 15:37:40 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // QPrimaryGeneratorAction.hh // diff --git a/environments/g4py/tests/gtest01/g4lib/gtest01.cc b/environments/g4py/tests/gtest01/g4lib/gtest01.cc index c4dc462aa5..22456b87d5 100644 --- a/environments/g4py/tests/gtest01/g4lib/gtest01.cc +++ b/environments/g4py/tests/gtest01/g4lib/gtest01.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: gtest01.cc,v 1.3 2006/06/29 15:37:43 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // gtest01.cc // diff --git a/environments/g4py/tests/test01/mylib/GNUmakefile b/environments/g4py/tests/test01/mylib/GNUmakefile index 5bb13aadc1..964f6786da 100644 --- a/environments/g4py/tests/test01/mylib/GNUmakefile +++ b/environments/g4py/tests/test01/mylib/GNUmakefile @@ -1,11 +1,12 @@ -# $Id: GNUmakefile,v 1.2 2006/04/25 07:54:28 kmura Exp $ +# $Id: GNUmakefile,v 1.3 2006/08/08 05:10:09 kmura Exp $ # =========================================================== # Makefile for building local library # # =========================================================== include ../../../config/config.gmk -MODULE := libXXX# +LIBRARY := libXXX# +LOCALLIB := true include $(G4PY_INSTALL)/config/mylib.gmk diff --git a/environments/g4py/tests/test02/mylib/GNUmakefile b/environments/g4py/tests/test02/mylib/GNUmakefile index ba6798586e..1b12bcd0e7 100644 --- a/environments/g4py/tests/test02/mylib/GNUmakefile +++ b/environments/g4py/tests/test02/mylib/GNUmakefile @@ -1,11 +1,12 @@ -# $Id: GNUmakefile,v 1.2 2006/04/25 07:54:28 kmura Exp $ +# $Id: GNUmakefile,v 1.3 2006/08/08 05:10:10 kmura Exp $ # =========================================================== # Makefile for building local library # # =========================================================== include ../../../config/config.gmk -MODULE := libXXX +LIBRARY := libXXX# +LOCALLIB := true include $(G4PY_INSTALL)/config/mylib.gmk diff --git a/environments/g4py/tests/test03/mylib/GNUmakefile b/environments/g4py/tests/test03/mylib/GNUmakefile index ba6798586e..1b12bcd0e7 100644 --- a/environments/g4py/tests/test03/mylib/GNUmakefile +++ b/environments/g4py/tests/test03/mylib/GNUmakefile @@ -1,11 +1,12 @@ -# $Id: GNUmakefile,v 1.2 2006/04/25 07:54:28 kmura Exp $ +# $Id: GNUmakefile,v 1.3 2006/08/08 05:10:10 kmura Exp $ # =========================================================== # Makefile for building local library # # =========================================================== include ../../../config/config.gmk -MODULE := libXXX +LIBRARY := libXXX# +LOCALLIB := true include $(G4PY_INSTALL)/config/mylib.gmk diff --git a/environments/g4py/tests/test04/mylib/GNUmakefile b/environments/g4py/tests/test04/mylib/GNUmakefile index ba6798586e..1b12bcd0e7 100644 --- a/environments/g4py/tests/test04/mylib/GNUmakefile +++ b/environments/g4py/tests/test04/mylib/GNUmakefile @@ -1,11 +1,12 @@ -# $Id: GNUmakefile,v 1.2 2006/04/25 07:54:28 kmura Exp $ +# $Id: GNUmakefile,v 1.3 2006/08/08 05:10:10 kmura Exp $ # =========================================================== # Makefile for building local library # # =========================================================== include ../../../config/config.gmk -MODULE := libXXX +LIBRARY := libXXX# +LOCALLIB := true include $(G4PY_INSTALL)/config/mylib.gmk diff --git a/environments/g4py/tests/test05/mylib/GNUmakefile b/environments/g4py/tests/test05/mylib/GNUmakefile index d22d829b0e..1b12bcd0e7 100644 --- a/environments/g4py/tests/test05/mylib/GNUmakefile +++ b/environments/g4py/tests/test05/mylib/GNUmakefile @@ -1,11 +1,12 @@ -# $Id: GNUmakefile,v 1.2 2006/04/25 07:54:29 kmura Exp $ +# $Id: GNUmakefile,v 1.3 2006/08/08 05:10:10 kmura Exp $ # =========================================================== # Makefile for building local library # # =========================================================== include ../../../config/config.gmk -MODULE := libXXX +LIBRARY := libXXX# +LOCALLIB := true include $(G4PY_INSTALL)/config/mylib.gmk diff --git a/environments/g4py/tests/test06/mylib/GNUmakefile b/environments/g4py/tests/test06/mylib/GNUmakefile index d22d829b0e..1b12bcd0e7 100644 --- a/environments/g4py/tests/test06/mylib/GNUmakefile +++ b/environments/g4py/tests/test06/mylib/GNUmakefile @@ -1,11 +1,12 @@ -# $Id: GNUmakefile,v 1.2 2006/04/25 07:54:29 kmura Exp $ +# $Id: GNUmakefile,v 1.3 2006/08/08 05:10:10 kmura Exp $ # =========================================================== # Makefile for building local library # # =========================================================== include ../../../config/config.gmk -MODULE := libXXX +LIBRARY := libXXX# +LOCALLIB := true include $(G4PY_INSTALL)/config/mylib.gmk diff --git a/environments/g4py/tests/test06/test06.cc b/environments/g4py/tests/test06/test06.cc index 9bf27b3a98..d897060ec5 100644 --- a/environments/g4py/tests/test06/test06.cc +++ b/environments/g4py/tests/test06/test06.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: test06.cc,v 1.4 2006/06/29 15:38:55 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // test06.cc // diff --git a/environments/g4py/tests/test07/test07.cc b/environments/g4py/tests/test07/test07.cc index 098370b76e..bd932cf783 100644 --- a/environments/g4py/tests/test07/test07.cc +++ b/environments/g4py/tests/test07/test07.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: test07.cc,v 1.4 2006/06/29 15:39:08 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // test07.cc // diff --git a/environments/g4py/tests/test08/test08.cc b/environments/g4py/tests/test08/test08.cc index 74ded27d92..e1f07aff4a 100644 --- a/environments/g4py/tests/test08/test08.cc +++ b/environments/g4py/tests/test08/test08.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: test08.cc,v 1.4 2006/06/29 15:39:11 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // test08.cc // diff --git a/environments/g4py/tests/test09/test09.cc b/environments/g4py/tests/test09/test09.cc index 5da8c9585d..cf295b37ed 100644 --- a/environments/g4py/tests/test09/test09.cc +++ b/environments/g4py/tests/test09/test09.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: test09.cc,v 1.4 2006/06/29 15:39:14 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // test09.cc // diff --git a/environments/g4py/tests/test10/test10.cc b/environments/g4py/tests/test10/test10.cc index f028554d3a..74a87724dc 100644 --- a/environments/g4py/tests/test10/test10.cc +++ b/environments/g4py/tests/test10/test10.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: test10.cc,v 1.4 2006/06/29 15:39:17 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // test10.cc // diff --git a/environments/g4py/tests/test11/test11.cc b/environments/g4py/tests/test11/test11.cc index 68dea81d8e..044f30ff19 100644 --- a/environments/g4py/tests/test11/test11.cc +++ b/environments/g4py/tests/test11/test11.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: test11.cc,v 1.4 2006/06/29 15:39:20 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // test11.cc // diff --git a/environments/g4py/tests/test12/test12.cc b/environments/g4py/tests/test12/test12.cc index 609c76de18..01171c636c 100644 --- a/environments/g4py/tests/test12/test12.cc +++ b/environments/g4py/tests/test12/test12.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: test12.cc,v 1.4 2006/06/29 15:39:23 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // test12.cc // diff --git a/environments/g4py/tests/test13/test13.cc b/environments/g4py/tests/test13/test13.cc index 3a7d2a9c75..c26fe64b73 100644 --- a/environments/g4py/tests/test13/test13.cc +++ b/environments/g4py/tests/test13/test13.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: test13.cc,v 1.4 2006/06/29 15:39:25 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // ==================================================================== // test13.cc // diff --git a/environments/g4py/tools/00README b/environments/g4py/tools/00README new file mode 100644 index 0000000000..5fc699cc18 --- /dev/null +++ b/environments/g4py/tools/00README @@ -0,0 +1,101 @@ +$Id: 00README,v 1.5 2006/08/09 06:26:23 kmura Exp $ +========================================================================== +Geant4Py + + Geant4Py is a set of python modules for using Geant4. + +Tools package + + In dafault situation, Geant4 creates and uses "granular static libraries". + But, Python interface requires "global shared library". + This directory contains some utility tools for helping build + Geant4 environment for using Python interface. +========================================================================== + +env +--- +Additonal setup script for co-building global shared libraries + +A small setup script helps co-build global shared libraries, +in addition to an existing granular static environment. + + +g4autobuild +----------- +An automatic build tool. The tool takes care of multiple Geant4/CLHEP instances +(granular static libray, global static library and global shared library), +configuring visualization and UI environments. The building procedures +are fully automated, avoiding duplicated building processes. + +A sample configuration file is as follows; +--------------------------------------------------------------------- +# +# G4SYS +# +G4SYS Linux-g++ + +# +# Base directory of Geant4 builds +# +G4BASE /opt/heplib/Geant4 + +# +# Base directory of CLHEP +# +CLHEPBASE /opt/heplib/CLHEP + +# +# G4 version and CLHEP version (starting with "-") +# +# G4 version CLHEP version +- geant4.8.1.p01 2.0.2.3 +- geant4.8.1 2.0.2.3 + +# +# Visualization Options (starting with "v") +# G4VIS_BUILD_XXX_DRIVER and G4VIS_USE_XXX are activated. +# +v DAWN +v VRML +v RAYTRACERX_DRIVER +v OPENGLX + +# +# UI Options (starting with "u") +# G4UI_USE_XXX is activated. +# +u TCSH +u GAG +--------------------------------------------------------------------- + +Users just specify the base directories of Geant4 and CLHEP, +and give combinations of their versions. + +Then, type + + $ ./g4autobuild + +. A series of building processes will start. + +The "status" directory will be created by the script. Note that null files +(named geant4-%version%-xxx) associated with tasks will be created in this +directory after finishing each task. These files works as flags for task status. + + +g4package +--------- +A packaging tool. CLHEP and Geant4 libraries and headers are packed into +a specified directory. This script contains a special care for embedded +MacOSX(Mach-O) library paths. Using the packaged libraries makes free from +setting DYLD_LIBRARY_PATH in MacOSX, especially for CLHEP. + +For example, on MacOSX, + +$ ./g4pack --with-g4system=Darwin-g++ \ + --with-g4-dir=/opt/heplib/Geant4/geant4.8.1.p01 \ + --with-clhep-dir=/opt/heplib/CLHEP/2.0.2.3 \ + --with-install-dir=/Library/Frameworks/Geant4.framework/Versions/8.1.1 + +creates new package in a "g4" directory. Then you can copy it to the framework +directory specified. + diff --git a/environments/g4py/tools/env/env+.csh b/environments/g4py/tools/env/env+.csh new file mode 100644 index 0000000000..62d93cdcab --- /dev/null +++ b/environments/g4py/tools/env/env+.csh @@ -0,0 +1,30 @@ +#$Id: env+.csh,v 1.2 2006/08/08 09:32:52 kmura Exp $ +# ====================================================================== +# [csh version] +# Additonal setup script for co-building global shared libraries +# +# In dafault situation, Geant4 creates and uses "granular static libraries". +# But, Python interface requires "global shared library". +# This small setup script helps co-build global shared libraries, +# in addition to an existing granular static environment. +# +# After sourcing "env.csh", which is created by the "Configure" script, +# source this file additionally, then "make global". +# Global shared library staffs will be created in another directory. +# ====================================================================== + +if (! $?G4INSTALL) then + echo "*** G4INSTALL is not defined! Please source env.csh first." + exit +endif + +# Recompilation is necessary because position-independent codes (-fPIC option) +# shoud be required. The temporal directory should be different from +# the existing one. +setenv G4TMP $G4INSTALL/tmp-slib + +# Under this directory, new global shared library staffs will be created. +setenv G4LIB $G4INSTALL/slib + +setenv G4LIB_BUILD_SHARED 1 + diff --git a/environments/g4py/tools/env/env+.sh b/environments/g4py/tools/env/env+.sh new file mode 100644 index 0000000000..c4532c5ab8 --- /dev/null +++ b/environments/g4py/tools/env/env+.sh @@ -0,0 +1,30 @@ +#$Id: env+.sh,v 1.2 2006/08/08 09:32:52 kmura Exp $ +# ====================================================================== +# [sh version] +# Additonal setup script for co-building global shared libraries +# +# In dafault situation, Geant4 creates and uses "granular static libraries". +# But, Python interface requires "global shared library". +# This small setup script helps co-build global shared libraries, +# in addition to an existing granular static environment. +# +# After sourcing "env.csh", which is created by the "Configure" script, +# source this file additionally, then "make global". +# Global shared library staffs will be created in another directory. +# ====================================================================== + +if [ ! ${G4INSTALL:+1} ]; then + echo "*** G4INSTALL is not defined! Please source env.csh first." + exit +fi + +# Recompilation is necessary because position-independent codes (-fPIC option) +# shoud be required. The temporal directory should be different from +# the existing one. +export G4TMP=$G4INSTALL/tmp-slib + +# Under this directory, new global shared library staffs will be created. +export G4LIB=$G4INSTALL/slib + +export G4LIB_BUILD_SHARED=1 + diff --git a/environments/g4py/tools/g4autobuild/g4auto.cfg b/environments/g4py/tools/g4autobuild/g4auto.cfg new file mode 100644 index 0000000000..2eb9a96348 --- /dev/null +++ b/environments/g4py/tools/g4autobuild/g4auto.cfg @@ -0,0 +1,44 @@ +# ====================================================================== +# Geant4 Autobuild Configuration +# +# A sample configuration +# ====================================================================== + +# +# G4SYS +# +G4SYS Linux-g++ + +# +# Base directory of Geant4 builds +# +G4BASE /opt/heplib/Geant4 + +# +# Base directory of CLHEP +# +CLHEPBASE /opt/heplib/CLHEP + +# +# G4 version and CLHEP version (starting with "-") +# +# G4 version CLHEP version +- geant4.8.1.p01 2.0.2.3 +- geant4.8.1 2.0.2.3 + +# +# Visualization Options (starting with "v") +# G4VIS_BUILD_XXX_DRIVER and G4VIS_USE_XXX are activated. +# +v DAWN +v VRML +v RAYTRACERX_DRIVER +v OPENGLX + +# +# UI Options (starting with "u") +# G4UI_USE_XXX is activated. +# +u TCSH +u GAG + diff --git a/environments/g4py/tools/g4autobuild/g4autobuild b/environments/g4py/tools/g4autobuild/g4autobuild new file mode 100755 index 0000000000..5d9914197f --- /dev/null +++ b/environments/g4py/tools/g4autobuild/g4autobuild @@ -0,0 +1,286 @@ +#! /bin/sh - +# ====================================================================== +# A script for Geant4 autobuild +# +# [usage] +# g4autobuild [] +# +# [options] +# --help, -h print this message +# --prefix=PREFIX base directory of Geant4 builds [$(cwd)/] +# --config=CONFIG configure file [PREFIX/g4auto.cfg] +# ====================================================================== +export LANG=C + +IFS=' + ' + +PATH=/bin:/usr/bin +export PATH + +# ====================================================================== +# help message +# ====================================================================== +show_help() { +cat <] + + [options] + --help, -h print this message + --prefix=PREFIX root directory of autobuild [\$(PWD)/] + --config=CONFIG configure file [PREFIX/g4auto.cfg] + +EOF +} + +# ====================================================================== +# vis. environment +# ====================================================================== +add_vis_envs() { +avis=$1 + +# for bash +cat >> g4rc.sh <> g4rc.csh <> g4rc.sh <> g4rc.csh <& /dev/null + + cat > g4rc.sh << EOF +# ======================================================================== +# Geant4 development environment +# ======================================================================== +export LANG=C + +# ======================================================================== +# System +# ======================================================================== +export G4SYSTEM=$g4sys +export G4INSTALL=$g4base/$g4 +export CLHEP_BASE_DIR=$clhepbase/${clhep_set[$idx]} + +# ======================================================================== +# Visualization +# ======================================================================== +EOF + + cat > g4rc.csh << EOF +# ======================================================================== +# Geant4 development environment +# ======================================================================== +setenv LANG C + +# ======================================================================== +# System +# ======================================================================== +setenv G4SYSTEM $g4sys +setenv G4INSTALL $g4base/$g4 +setenv CLHEP_BASE_DIR $clhepbase/${clhep_set[$idx]} + +# ======================================================================== +# Visualization +# ======================================================================== +EOF + + # vis. envs + for vis in $vis_set + do + add_vis_envs $vis + done + + cat >> g4rc.sh <> g4rc.csh <& /dev/null + make >& make.log + make includes >& /dev/null + popd >& /dev/null + + touch $status_dir/$g4.lib + fi + + # ====================================================================== + # global lib + if [ ! -e $status_dir/$g4.glib ]; then + echo "@@@ buinding global lib ..." + export G4LIB=$G4INSTALL/glib + + pushd source >& /dev/null + make global >& make-global.log + popd >& /dev/null + + touch $status_dir/$g4.glib + fi + + # ====================================================================== + # shared lib + if [ ! -e $status_dir/$g4.slib ]; then + echo "@@@ buinding shared lib ..." + export G4LIB=$G4INSTALL/slib + if [ $g4sys == Darwin-g++ ]; then + export G4TMP=$G4INSTALL/tmp + else + export G4TMP=$G4INSTALL/tmp-slib + fi + export G4LIB_BUILD_SHARED=1 + + pushd source >& /dev/null + make global >& make-slib.log + popd >& /dev/null + + touch $status_dir/$g4.slib + fi + + # ====================================================================== + # done + unset G4LIB + unset G4TMP + unset G4LIB_BUILD_SHARED + + popd >& /dev/null + + echo $((idx++)) >& /dev/null +done + +exit 0 + diff --git a/environments/g4py/tools/g4package/g4pack b/environments/g4py/tools/g4package/g4pack new file mode 100755 index 0000000000..320805ee5e --- /dev/null +++ b/environments/g4py/tools/g4package/g4pack @@ -0,0 +1,242 @@ +#! /bin/sh - +# ====================================================================== +# A script for Geant4 packaging +# +# ====================================================================== +export LANG=C + +IFS=' + ' + +PATH=/bin:/usr/bin +export PATH + +# ====================================================================== +# help message +# ====================================================================== +show_help() { +cat <] + +Options: + --help, -h print this message + + --with-g4system=G4SYSTEM G4SYSTEM [\$G4SYSTEM] + --with-g4-dir=DIR Geant4 dir [\$G4INSTALL] + --with-clhep-dir=DIR CLHEP dir [\$CLHEP_BASE_DIR] + + --with-lib-dir=DIR G4 static granular libdir [lib] + --with-glib-dir=DIR G4 global static libdir [glib] + --with-slib-dir=DIR G4 global shared libdir [slib] + + --with-install-dir=DIR install path (MacOSX only) + + Enable/disable options: prefix with either --enable- or --disable- + lib packing static granular lib [disable] + glib packing global static lib [enable] + slib packing global shared lib [enable] + +EOF +} + +# ====================================================================== +# rebuild shared library (MacOSX only) +# ====================================================================== +rebuild_sharedlib() { +mkdir tmp +mv lib*.dylib ./tmp + +liblist=lib*.a + +for lib in $liblist +do + slibname=${lib%.*}.dylib + + #check linked libraries... + extliblist=`otool -L tmp/$slibname | grep -v /usr/lib | grep -v $slibname | awk '{print $1}'` + + ar x $lib + g++ -dynamiclib -single_module -undefined dynamic_lookup \ + -install_name $install_dir/lib/$slibname \ + $extliblist -o $slibname *.o + rm *.o __.SYMDEF + + chmod 755 $slibname +done + +rm -r tmp +} + + +# ====================================================================== +# main +# ====================================================================== +# default values +g4system=${G4SYSTEM:-XXX} +g4dir=${G4INSTALL:-/zzz} +clhepdir=${CLHEP_BASE_DIR:-/zzz} + +install_dir=/zzz + +libdir=lib +glibdir=glib +slibdir=slib + +enable_lib=0 +enable_glib=1 +enable_slib=1 + +# parsing options +while test $# -gt 0 +do + case $1 in + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + + case $1 in + --help|-h) show_help; exit 0 ;; + # --------------------------------------------------------------- + --with-g4system=*) g4system=$optarg ;; + --with-g4-dir=*) g4dir=$optarg ;; + --with-clhep-dir=*) clhepdir=$optarg ;; + --with-lib-dir=*) libdir=$optarg ;; + --with-glib-dir=*) glibdir=$optarg ;; + --with-slib-dir=*) slibdir=$optarg ;; + --with-install-dir=*) install_dir=$optarg ;; + # --------------------------------------------------------------- + --enable-lib ) enable_lib=1 ;; + --disable-lib ) enable_lib=0 ;; + --enable-glib ) enable_glib=1 ;; + --disable-glib ) enable_glib=0 ;; + --enable-slib ) enable_slib=1 ;; + --disable-slib ) enable_slib=0 ;; + # --------------------------------------------------------------- + -*) + echo "Unrecognized option: $1" + exit -1 + ;; + *) + echo "Invalid argument: $1" + exit -1 + ;; + esac + shift +done + +# check something +shlib=so +if [ $g4system == Darwin-g++ ]; then + shlib=dylib +fi + +echo -n "Checking for G4 dir ..." +if [ ! -d $g4dir ]; then + echo "no" + echo "### $g4dir does not exist." + exit -1 +fi +echo $g4dir + +echo -n "Checking for CLHEP dir ..." +if [ ! -d $clhepdir ]; then + echo "no" + echo "### $clhepdir does not exist." + exit -1 +fi +echo $clhepdir + +echo -n "Checking for G4SYSTEM ..." +if [ ! -e $g4dir/config/sys/$g4system.gmk ]; then + echo "no" + echo "### $g4system is invalid." + exit -1 +fi +echo $g4system + +if [ $enable_lib == 1 ]; then + echo -n "Checking for lib dir ..." + if [ ! -d $g4dir/$libdir ]; then + echo "no" + echo "### $libdir is invalid." + exit -1 + fi + echo $libdir +fi + +if [ $enable_glib == 1 ]; then + echo -n "Checking for glib dir ..." + if [ ! -d $g4dir/$glibdir ]; then + echo "no" + echo "### $glibdir is invalid." + exit -1 + fi + echo $glibdir +fi + +if [ $enable_slib == 1 ]; then + echo -n "Checking for glib dir ..." + if [ ! -d $g4dir/$slibdir ]; then + echo "no" + echo "### $slibdir is invalid." + exit -1 + fi + echo $slibdir +fi + +# ---------------------------------------------------------------------- +# ok go ahead + +echo "" +echo "Packing ..." + +g4packdir=g4 + +if [ -d $g4packdir ]; then + echo "### $g4packdir/ already exist. Please move it." + exit -1 +fi + +mkdir -p $g4packdir +mkdir -p $g4packdir/include +mkdir -p $g4packdir/lib + +# CLHEP +cp -pR $clhepdir/include/CLHEP $g4packdir/include/ +cp -pR $clhepdir/lib/libCLHEP-[12]* $g4packdir/lib/ + +# Geant4 +cp -pR $g4dir/include $g4packdir/include/ +mv $g4packdir/include/include $g4packdir/include/Geant4 +rm $g4packdir/include/Geant4/README + +if [ $enable_glib == 1 ]; then + cp -pR $g4dir/$glibdir/$g4system/lib* $g4packdir/lib +fi + +if [ $enable_slib == 1 ]; then + cp -pR $g4dir/$slibdir/$g4system/lib* $g4packdir/lib + + if [ $g4system == Darwin-g++ ]; then + if [ $enable_glib == 0 ]; then + echo "### gobal static library is required for the operation." + exit -1 + fi + pushd $g4packdir/lib >& /dev/null + rebuild_sharedlib + popd >& /dev/null + fi +fi + +if [ $enable_lib == 1 ]; then + cp -pR $g4dir/$libdir/$g4system/lib* $g4packdir/lib +fi + +# CLHEP links +pushd $g4packdir/lib >& /dev/null +ln -s libCLHEP-[12]*.a libCLHEP.a +ln -s libCLHEP-[12]*.$shlib libCLHEP.$shlib +popd >& /dev/null + +exit 0 + diff --git a/examples/History b/examples/History index bbe49259c6..d5c8b03be9 100644 --- a/examples/History +++ b/examples/History @@ -1,4 +1,4 @@ -$Id: History,v 1.111 2006/06/30 07:18:54 gcosmo Exp $ +$Id: History,v 1.117 2006/12/15 09:45:28 gcosmo Exp $ ------------------------------------------------------------------- ========================================================= @@ -17,6 +17,53 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +15th December 2006 Gabriele Cosmo (examples-V08-02-00) +- Updated reference outputs according to reference tag geant4-08-02-ref-00. +- Includes tags: testem0-V08-01-02, testem7-V08-01-03, exgdml-V08-01-00, + exampleN02-V08-01-01, exampleN04-V08-01-08. + +1st December 2006 Gabriele Cosmo (examples-V08-01-05) +- Updated reference outputs according to reference tag geant4-08-01-ref-05. +- Includes tags: air_shower-V08-01-00, brachy-V08-01-01, ccal-V08-01-01, + gammaraytel-V08-01-00, hadrontherapy-V08-01-05, + human_phantom-V08-01-03, lAr_calorimeter-V08-01-01, + microbeam-V08-01-01, radioprotection-V08-01-01, + raredecay-V08-01-00, tiara-V08-01-02, exampleA01-V08-01-02, + testem3-V08-01-01, testem5-V08-01-02, testem7-V08-01-02, + testem8-V08-01-01, testem9-V08-01-02, exHepMC-V08-01-05, + exhadr01-V08-01-03, gtherapy-V08-01-00, ParN04-V08-01-02, + expol01-V08-01-02, exampleRE01-V08-01-01, exampleRE02-V08-01-00, + exam-ext-vis-perps-V08-01-00, exam-ext-vis-UVA-V08-01-00, + exampleN02-V08-01-00, exampleN04-V08-01-06, + exampleN05-V08-01-01, exampleN07-V08-01-00. + +1st November 2006 Gabriele Cosmo (examples-V08-01-04) +- Updated reference outputs according to reference tag geant4-08-01-ref-04. +- Includes tags: DMX-V08-01-00, testem1-V08-01-00, testem2-V08-01-00, + testem3-V08-01-00, testem4-V08-01-00, testem6-V08-01-00, + testem7-V08-01-00, testem8-V08-01-00, testem9-V08-01-00, + testem11-V08-01-02, testem12-V08-01-00, testem13-V08-01-00, + testem14-V08-01-01, testem15-V08-01-00, testem16-V08-01-00, + testem17-V08-01-01, exHepMC-V08-01-01, expol01-V08-01-00, + exampleN03-V08-01-04, exampleN04-V08-01-00, + exampleN06-V08-01-00. + +29th September 2006 Gabriele Cosmo (examples-V08-01-03) +- Updated reference outputs according to reference tag geant4-08-01-ref-03. +- Includes tags: testem5-V08-01-01, testem11-V08-01-01, testem14-V08-01-00, + testem17-V08-01-00, LXe-V08-01-00, exampleN03-V08-01-03. + +25th August 2006 Gabriele Cosmo (examples-V08-01-02) +- Updated reference outputs according to reference tag geant4-08-01-ref-02. +- Includes tags: AnaEx01-V08-01-00, testem0-V08-01-01, testem5-V08-01-00, + exhadr01-V08-01-00, exampleN03-V08-01-00. + +26th July 2006 Gabriele Cosmo (examples-V08-01-01) +- Updated reference outputs according to reference tag geant4-08-01-ref-01. +- Includes tags: ccal-V08-01-00, hadrontherapy-V08-01-01, exHepMC-V08-01-00, + lAr_calorimeter-V08-01-00, radioprotection-V08-01-00, + ParN02-V08-01-00, ParN04-V08-01-00. + 30th June 2006 Gabriele Cosmo (examples-V08-01-00) - Updated reference outputs according to reference tag geant4-08-01-ref-00. - Changed disclaimer on each file. @@ -30,7 +77,7 @@ committal in the CVS repository ! exampleN01-V08-00-00, exampleN02-V08-00-03, exampleN03-V08-00-06, exampleN04-V08-00-01, exampleN05-V08-00-01, exampleN06-V08-00-02, - exampleN07-V08-00-00 + exampleN07-V08-00-00. 1st June 2006 Gabriele Cosmo (examples-V08-00-05) - Updated reference outputs according to reference tag geant4-08-00-ref-05. diff --git a/examples/README b/examples/README index 6f1569683e..d221421896 100644 --- a/examples/README +++ b/examples/README @@ -1,4 +1,4 @@ -$Id: README,v 1.9 2006/06/16 13:29:28 gcosmo Exp $ +$Id: README,v 1.10 2006/12/01 14:38:21 gcosmo Exp $ ------------------------------------------------------------------- ========================================================= @@ -59,7 +59,7 @@ Extended level examples electromagnetic - Specific EM physics simulation with histogramming eventgenerator - - Applications using interface to primary event generators like HepMC + - Applications using interface to HepMC field - Specific simulation setups in magnetic field g3tog3 @@ -108,6 +108,9 @@ Advanced level examples - Simulation of a typical telescope for gamma ray analysis hadrontherapy - Simulation of a hadron therapy beam line + human_phantom + - Anthropomorphic phantoms (male and female) based on MIRD/ORNL model + with geometry description derived from GDML persistent files lAr_calorimeter - Simulation of the Liquid Argon Calorimeter of the ATLAS Detector at LHC diff --git a/examples/advanced/Tiara/GNUmakefile b/examples/advanced/Tiara/GNUmakefile index 2e86a92519..ee252ec414 100644 --- a/examples/advanced/Tiara/GNUmakefile +++ b/examples/advanced/Tiara/GNUmakefile @@ -1,6 +1,6 @@ # $Id: GNUmakefile,v 1.7 2004/12/08 15:37:13 daquinog Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # -------------------------------------------------------------- diff --git a/examples/advanced/Tiara/History b/examples/advanced/Tiara/History index 5d4fdae95a..fe50bb897f 100644 --- a/examples/advanced/Tiara/History +++ b/examples/advanced/Tiara/History @@ -1,6 +1,6 @@ -# $Id: History,v 1.30 2006/06/26 10:28:38 ahoward Exp $ +# $Id: History,v 1.31 2006/11/20 12:44:40 ahoward Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # ------------------------------------------------------------------- ========================================================= @@ -19,6 +19,10 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +November 20th, 2006, A. Howard +- removed hadronic_list.gmk from GNUmakefile to accommodate new reference + physicslist location + June 26th, 2006 A. Howard - fixed configuration script, GNUmakefiles and python scripts to work for runSimNoAnalysis.py and also corrected Vis scripts for non-static particles diff --git a/examples/advanced/Tiara/README b/examples/advanced/Tiara/README index 73ba334e98..89c83afc00 100644 --- a/examples/advanced/Tiara/README +++ b/examples/advanced/Tiara/README @@ -1,6 +1,6 @@ # $Id: README,v 1.21 2005/03/17 19:48:27 daquinog Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # ------------------------------------------------------------------- Simulation of the TIARA experiment using importance sampling diff --git a/examples/advanced/Tiara/envCommon.csh b/examples/advanced/Tiara/envCommon.csh index c03ad53f76..16c98c3c31 100644 --- a/examples/advanced/Tiara/envCommon.csh +++ b/examples/advanced/Tiara/envCommon.csh @@ -1,6 +1,6 @@ # $Id: envCommon.csh,v 1.13 2005/03/17 19:48:27 daquinog Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # ------------------------------------------------------------------- # Before sourcing this script make sure you have set the # environment variables according to the description in README. diff --git a/examples/advanced/Tiara/run/runSim.py b/examples/advanced/Tiara/run/runSim.py index 7c488958a1..3d4b6a3b17 100755 --- a/examples/advanced/Tiara/run/runSim.py +++ b/examples/advanced/Tiara/run/runSim.py @@ -2,7 +2,7 @@ # # $Id: runSim.py,v 1.12 2005/12/15 16:23:11 ahoward Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # ------------------------------------------------------------------- # importing python libraries diff --git a/examples/advanced/Tiara/run/runSimNoAnalysis.py b/examples/advanced/Tiara/run/runSimNoAnalysis.py index c3b570579a..7c0bd2c382 100755 --- a/examples/advanced/Tiara/run/runSimNoAnalysis.py +++ b/examples/advanced/Tiara/run/runSimNoAnalysis.py @@ -2,7 +2,7 @@ # # $Id: runSimNoAnalysis.py,v 1.7 2005/12/15 16:23:06 ahoward Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # ------------------------------------------------------------------- diff --git a/examples/advanced/Tiara/run/runVisMode.py b/examples/advanced/Tiara/run/runVisMode.py index f6c1540c44..01a9eb1962 100644 --- a/examples/advanced/Tiara/run/runVisMode.py +++ b/examples/advanced/Tiara/run/runVisMode.py @@ -2,7 +2,7 @@ # # $Id: runVisMode.py,v 1.8 2006/06/26 10:12:05 ahoward Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # ------------------------------------------------------------------- diff --git a/examples/advanced/Tiara/run/runVisNoAnalysis.py b/examples/advanced/Tiara/run/runVisNoAnalysis.py index d894299a8c..63b3d0e79a 100755 --- a/examples/advanced/Tiara/run/runVisNoAnalysis.py +++ b/examples/advanced/Tiara/run/runVisNoAnalysis.py @@ -2,7 +2,7 @@ # # $Id: runVisNoAnalysis.py,v 1.5 2006/06/26 10:12:05 ahoward Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # ------------------------------------------------------------------- diff --git a/examples/advanced/Tiara/run/vis.mac b/examples/advanced/Tiara/run/vis.mac index 57b36bfcea..30918682b7 100644 --- a/examples/advanced/Tiara/run/vis.mac +++ b/examples/advanced/Tiara/run/vis.mac @@ -1,6 +1,6 @@ # $Id: vis.mac,v 1.2 2003/06/16 17:06:44 dressel Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # ------------------------------------------------------------------- diff --git a/examples/advanced/Tiara/source/CLHEPWrapper/include/CLHEP.i b/examples/advanced/Tiara/source/CLHEPWrapper/include/CLHEP.i index 601c1efa27..4a94de456b 100644 --- a/examples/advanced/Tiara/source/CLHEPWrapper/include/CLHEP.i +++ b/examples/advanced/Tiara/source/CLHEPWrapper/include/CLHEP.i @@ -1,6 +1,6 @@ # $Id: CLHEP.i,v 1.5 2005/12/15 14:23:31 ahoward Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # ------------------------------------------------------------------- diff --git a/examples/advanced/Tiara/source/G4KernelWrapper/G4String.i b/examples/advanced/Tiara/source/G4KernelWrapper/G4String.i index 44fca75df5..5945b53e2a 100644 --- a/examples/advanced/Tiara/source/G4KernelWrapper/G4String.i +++ b/examples/advanced/Tiara/source/G4KernelWrapper/G4String.i @@ -1,6 +1,6 @@ # $Id: G4String.i,v 1.1 2003/06/17 15:25:01 mdressel Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # ------------------------------------------------------------------- // coppied from std_string.i diff --git a/examples/advanced/Tiara/source/G4KernelWrapper/include/G4Kernel.i b/examples/advanced/Tiara/source/G4KernelWrapper/include/G4Kernel.i index 9b75315a9b..614b896099 100644 --- a/examples/advanced/Tiara/source/G4KernelWrapper/include/G4Kernel.i +++ b/examples/advanced/Tiara/source/G4KernelWrapper/include/G4Kernel.i @@ -1,6 +1,6 @@ # $Id: G4Kernel.i,v 1.7 2005/12/15 14:24:56 ahoward Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # ------------------------------------------------------------------- %module G4Kernel diff --git a/examples/advanced/Tiara/source/TiaraWrapper/GNUmakefile b/examples/advanced/Tiara/source/TiaraWrapper/GNUmakefile index 6d634ef3e7..07c177e0ad 100644 --- a/examples/advanced/Tiara/source/TiaraWrapper/GNUmakefile +++ b/examples/advanced/Tiara/source/TiaraWrapper/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.9 2004/12/14 13:11:06 daquinog Exp $ +# $Id: GNUmakefile,v 1.10 2006/11/23 08:50:29 ahoward Exp $ # -------------------------------------------------------------- # GNUmakefile Michael Dressel # -------------------------------------------------------------- @@ -19,18 +19,13 @@ SWIGFLAGS = -I../G4KernelWrapper \ -I$(G4INSTALL)/source/event/include \ -I$(G4INSTALL)/source/processes/transportation/include \ -I$(TIARA_BASE)/source/tiara/include \ - -I$(G4INSTALL)/physics_lists/hadronic/LHEP_BIC/include \ - -I$(G4INSTALL)/physics_lists/hadronic/LHEP_BIC_HP/include \ - -I$(G4INSTALL)/physics_lists/hadronic/LHEP/include \ - -I$(G4INSTALL)/physics_lists/hadronic/LHEP_PRECO/include \ - -I$(G4INSTALL)/physics_lists/hadronic/LHEP_LEAD/include \ - -I$(G4INSTALL)/physics_lists/hadronic/LHEP_PRECO_HP/include \ + -I$(G4INSTALL)/source/physics_lists/lists/include \ -I$(TIARA_BASE)/source/CLHEPWrapper/include \ -I$(TIARA_BASE)/source/G4KernelWrapper/include \ -I${CLHEP_BASE_DIR}/include -include $(TIARA_BASE)/source/hadronic_lists.gmk +##include $(TIARA_BASE)/source/hadronic_lists.gmk #SWIGFLAGS += ${LSTFLAGS} libdirTiara = $(G4WORKDIR)/tmp/$(G4SYSTEM)/tiara @@ -58,12 +53,7 @@ endif CPPFLAGS += -I$(TIARA_BASE)/source/tiara/include\ -I$(PYTHON_INCLUDE_DIR) \ - -I$(G4INSTALL)/physics_lists/hadronic/LHEP_BIC/include \ - -I$(G4INSTALL)/physics_lists/hadronic/LHEP_BIC_HP/include \ - -I$(G4INSTALL)/physics_lists/hadronic/LHEP/include \ - -I$(G4INSTALL)/physics_lists/hadronic/LHEP_PRECO/include \ - -I$(G4INSTALL)/physics_lists/hadronic/LHEP_LEAD/include \ - -I$(G4INSTALL)/physics_lists/hadronic/LHEP_PRECO_HP/include \ + -I$(G4INSTALL)/source/physics_lists/lists/include \ -I$(TIARA_BASE)/source/G4KernelWrapper/include diff --git a/examples/advanced/Tiara/source/TiaraWrapper/include/Tiara.i b/examples/advanced/Tiara/source/TiaraWrapper/include/Tiara.i index 979b5b29ae..b9ef49a1be 100644 --- a/examples/advanced/Tiara/source/TiaraWrapper/include/Tiara.i +++ b/examples/advanced/Tiara/source/TiaraWrapper/include/Tiara.i @@ -1,6 +1,6 @@ # $Id: Tiara.i,v 1.9 2005/12/14 13:18:40 ahoward Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # ------------------------------------------------------------------- %module Tiara diff --git a/examples/advanced/Tiara/source/py_modules/dataAcess.py b/examples/advanced/Tiara/source/py_modules/dataAcess.py index b2d2282e92..5a7d2e5e07 100644 --- a/examples/advanced/Tiara/source/py_modules/dataAcess.py +++ b/examples/advanced/Tiara/source/py_modules/dataAcess.py @@ -1,6 +1,6 @@ # $Id: dataAcess.py,v 1.3 2003/06/26 11:54:13 dressel Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # ------------------------------------------------------------------- # import os diff --git a/examples/advanced/Tiara/source/py_modules/detector.py b/examples/advanced/Tiara/source/py_modules/detector.py index e383069017..e19e3aac08 100644 --- a/examples/advanced/Tiara/source/py_modules/detector.py +++ b/examples/advanced/Tiara/source/py_modules/detector.py @@ -1,6 +1,6 @@ # $Id: detector.py,v 1.3 2003/06/26 11:54:13 dressel Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # ------------------------------------------------------------------- # diff --git a/examples/advanced/Tiara/source/py_modules/dpsManip.py b/examples/advanced/Tiara/source/py_modules/dpsManip.py index 42127e3dcd..eb3bcefd8a 100644 --- a/examples/advanced/Tiara/source/py_modules/dpsManip.py +++ b/examples/advanced/Tiara/source/py_modules/dpsManip.py @@ -1,6 +1,6 @@ # $Id: dpsManip.py,v 1.2 2003/06/16 17:06:44 dressel Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # ------------------------------------------------------------------- # import math diff --git a/examples/advanced/Tiara/source/py_modules/extractShelve.py b/examples/advanced/Tiara/source/py_modules/extractShelve.py index eb47ad73a1..37284e1b6e 100644 --- a/examples/advanced/Tiara/source/py_modules/extractShelve.py +++ b/examples/advanced/Tiara/source/py_modules/extractShelve.py @@ -1,6 +1,6 @@ # $Id: extractShelve.py,v 1.3 2003/07/04 13:26:31 dressel Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # ------------------------------------------------------------------- # import string diff --git a/examples/advanced/Tiara/source/py_modules/myPI.py b/examples/advanced/Tiara/source/py_modules/myPI.py index d1d979d416..8b4280cb4c 100644 --- a/examples/advanced/Tiara/source/py_modules/myPI.py +++ b/examples/advanced/Tiara/source/py_modules/myPI.py @@ -1,6 +1,6 @@ # $Id: myPI.py,v 1.1 2004/06/09 15:04:36 daquinog Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # ------------------------------------------------------------------- # import sys diff --git a/examples/advanced/Tiara/source/py_modules/myUtils.py b/examples/advanced/Tiara/source/py_modules/myUtils.py index ff2bb9793c..163bedd674 100644 --- a/examples/advanced/Tiara/source/py_modules/myUtils.py +++ b/examples/advanced/Tiara/source/py_modules/myUtils.py @@ -1,6 +1,6 @@ # $Id: myUtils.py,v 1.6 2004/12/08 15:37:14 daquinog Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # ------------------------------------------------------------------- # import CLHEP diff --git a/examples/advanced/Tiara/source/py_modules/parallelHall.py b/examples/advanced/Tiara/source/py_modules/parallelHall.py index c2501fdbe2..ea6fb69864 100644 --- a/examples/advanced/Tiara/source/py_modules/parallelHall.py +++ b/examples/advanced/Tiara/source/py_modules/parallelHall.py @@ -1,6 +1,6 @@ # $Id: parallelHall.py,v 1.4 2003/06/20 12:41:06 dressel Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # ------------------------------------------------------------------- # import G4Kernel diff --git a/examples/advanced/Tiara/source/py_modules/posLog.py b/examples/advanced/Tiara/source/py_modules/posLog.py index aa71b4a021..1e44ea6052 100644 --- a/examples/advanced/Tiara/source/py_modules/posLog.py +++ b/examples/advanced/Tiara/source/py_modules/posLog.py @@ -1,6 +1,6 @@ # $Id: posLog.py,v 1.2 2003/06/16 17:06:44 dressel Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # ------------------------------------------------------------------- # diff --git a/examples/advanced/Tiara/source/py_modules/runSequence.py b/examples/advanced/Tiara/source/py_modules/runSequence.py index a456dd7b91..8a4537be7f 100644 --- a/examples/advanced/Tiara/source/py_modules/runSequence.py +++ b/examples/advanced/Tiara/source/py_modules/runSequence.py @@ -1,6 +1,6 @@ # $Id: runSequence.py,v 1.4 2004/06/09 15:04:36 daquinog Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # ------------------------------------------------------------------- # import Tiara diff --git a/examples/advanced/Tiara/source/py_modules/slabGeometry.py b/examples/advanced/Tiara/source/py_modules/slabGeometry.py index ab99baeb65..5f755aec7c 100644 --- a/examples/advanced/Tiara/source/py_modules/slabGeometry.py +++ b/examples/advanced/Tiara/source/py_modules/slabGeometry.py @@ -1,6 +1,6 @@ # $Id: slabGeometry.py,v 1.3 2003/06/20 12:41:07 dressel Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # ------------------------------------------------------------------- # import math diff --git a/examples/advanced/Tiara/source/py_modules/tallyData.py b/examples/advanced/Tiara/source/py_modules/tallyData.py index 367b7ae242..cc5b0de9fa 100644 --- a/examples/advanced/Tiara/source/py_modules/tallyData.py +++ b/examples/advanced/Tiara/source/py_modules/tallyData.py @@ -1,6 +1,6 @@ # $Id: tallyData.py,v 1.2 2003/06/16 17:06:44 dressel Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # ------------------------------------------------------------------- # diff --git a/examples/advanced/Tiara/source/py_modules/tiaraApplication.py b/examples/advanced/Tiara/source/py_modules/tiaraApplication.py index 1204c606f0..9abded0d96 100644 --- a/examples/advanced/Tiara/source/py_modules/tiaraApplication.py +++ b/examples/advanced/Tiara/source/py_modules/tiaraApplication.py @@ -1,6 +1,6 @@ # $Id: tiaraApplication.py,v 1.7 2006/06/26 10:13:14 ahoward Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # ------------------------------------------------------------------- # import string diff --git a/examples/advanced/Tiara/source/py_modules/tiaraDetectors.py b/examples/advanced/Tiara/source/py_modules/tiaraDetectors.py index 799915a55a..8e3e61791e 100644 --- a/examples/advanced/Tiara/source/py_modules/tiaraDetectors.py +++ b/examples/advanced/Tiara/source/py_modules/tiaraDetectors.py @@ -1,6 +1,6 @@ # $Id: tiaraDetectors.py,v 1.4 2004/06/09 15:04:36 daquinog Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # ------------------------------------------------------------------- # import CLHEP diff --git a/examples/advanced/Tiara/source/py_modules/tiaraGenerators.py b/examples/advanced/Tiara/source/py_modules/tiaraGenerators.py index 2806f44ad7..aeb8da73ad 100644 --- a/examples/advanced/Tiara/source/py_modules/tiaraGenerators.py +++ b/examples/advanced/Tiara/source/py_modules/tiaraGenerators.py @@ -1,6 +1,6 @@ # $Id: tiaraGenerators.py,v 1.3 2004/06/09 15:04:36 daquinog Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # ------------------------------------------------------------------- # import string diff --git a/examples/advanced/Tiara/source/py_modules/tiaraSpecifications.py b/examples/advanced/Tiara/source/py_modules/tiaraSpecifications.py index 2e4daa6370..40ee71ed49 100644 --- a/examples/advanced/Tiara/source/py_modules/tiaraSpecifications.py +++ b/examples/advanced/Tiara/source/py_modules/tiaraSpecifications.py @@ -1,6 +1,6 @@ # $Id: tiaraSpecifications.py,v 1.3 2003/06/20 12:41:07 dressel Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # ------------------------------------------------------------------- # import CLHEP diff --git a/examples/advanced/Tiara/source/py_modules/variableGeometry.py b/examples/advanced/Tiara/source/py_modules/variableGeometry.py index ebd977543e..e756212c9b 100644 --- a/examples/advanced/Tiara/source/py_modules/variableGeometry.py +++ b/examples/advanced/Tiara/source/py_modules/variableGeometry.py @@ -1,6 +1,6 @@ # $Id: variableGeometry.py,v 1.2 2003/06/16 17:06:45 dressel Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # ------------------------------------------------------------------- # import G4Kernel diff --git a/examples/advanced/Tiara/source/tiara/GNUmakefile b/examples/advanced/Tiara/source/tiara/GNUmakefile index e43c678831..2726294f94 100644 --- a/examples/advanced/Tiara/source/tiara/GNUmakefile +++ b/examples/advanced/Tiara/source/tiara/GNUmakefile @@ -1,6 +1,6 @@ -# $Id: GNUmakefile,v 1.8 2004/12/14 13:11:07 daquinog Exp $ +# $Id: GNUmakefile,v 1.10 2006/11/20 12:43:02 ahoward Exp $ # -------------------------------------------------------------- -# GNUmakefile Michael Dressel +# GNUmakefile for examples module. Gabriele Cosmo, 06/04/98. # -------------------------------------------------------------- name := tiara @@ -8,48 +8,29 @@ G4TARGET := $(name) G4EXLIB := true ifndef G4INSTALL - G4INSTALL = ../.. + G4INSTALL = ../../.. endif +ifdef G4ANALYSIS_USE + CPPFLAGS += -DG4ANALYSIS_USE +endif + + include $(G4INSTALL)/config/architecture.gmk -include $(TIARA_BASE)/source/hadronic_lists.gmk +##include hadronic_lists.gmk -.PHONY: all tiaraClean +ifdef G4ANALYSIS_USE + CPPFLAGS += `aida-config --include` + LDFLAGS += `aida-config --lib` +endif +.PHONY: all all: lib bin include $(G4INSTALL)/config/binmake.gmk -ifdef G4ANALYSIS_USE - CPPFLAGS += `aida-config --include` -# LDFLAGS += `aida-config --lib` -endif +visclean: + rm -f g4*.prim g4*.eps g4*.wrl + rm -f .DAWN_* - -CPPFLAGS += -I$(PYTHON_INCLUDE_DIR) \ - -I$(G4INSTALL)/physics_lists/hadronic/LHEP_BIC/include \ - -I$(G4INSTALL)/physics_lists/hadronic/LHEP_BIC_HP/include \ - -I$(G4INSTALL)/physics_lists/hadronic/LHEP/include \ - -I$(G4INSTALL)/physics_lists/hadronic/LHEP_PRECO/include \ - -I$(G4INSTALL)/physics_lists/hadronic/LHEP_LEAD/include \ - -I$(G4INSTALL)/physics_lists/hadronic/LHEP_PRECO_HP/include - -LDFLAGS += -L$(PYTHON_LIB_DIR) - -ifdef G4ANALYSIS_USE - LDLIBS += `aida-config --lib` -endif - -LDLIBS += -lpython$(PYTHONVERSION) \ - -lnsl \ - -ldl \ - -lreadline \ - -ltermcap \ - -lieee \ - -lpthread \ - -lutil - -tiaraClean: - @echo Cleaning up $(G4WORKDIR)/tmp/$(G4SYSTEM)/$(name) - @rm -rf $(G4WORKDIR)/tmp/$(G4SYSTEM)/$(name) diff --git a/examples/advanced/gammaray_telescope/hadronic_lists.gmk b/examples/advanced/Tiara/source/tiara/hadronic_lists.gmk similarity index 78% rename from examples/advanced/gammaray_telescope/hadronic_lists.gmk rename to examples/advanced/Tiara/source/tiara/hadronic_lists.gmk index 1b5b6a273b..0c4d6e5b70 100644 --- a/examples/advanced/gammaray_telescope/hadronic_lists.gmk +++ b/examples/advanced/Tiara/source/tiara/hadronic_lists.gmk @@ -1,4 +1,4 @@ -# $Id: hadronic_lists.gmk,v 1.1 2006/06/02 05:24:20 flongo Exp $ +# $Id: hadronic_lists.gmk,v 1.1 2006/06/23 14:33:48 ahoward Exp $ # -------------------------------------------------------------- # hadronic physics-lists setup # -------------------------------------------------------------- @@ -10,28 +10,22 @@ else EXTRALIBS += -L$(G4LISTS_BASE)/hadronic/plists/lib/$(G4SYSTEM) endif -# EXTRALIBS += -lFTFC -# EXTRALIBS += -lFTFP -# EXTRALIBS += -lLBE +EXTRALIBS += -lFTFP EXTRALIBS += -lLHEP -# EXTRALIBS += -lLHEP_GN -# EXTRALIBS += -lLHEP_HP -# EXTRALIBS += -lLHEP_LEAD -# EXTRALIBS += -lLHEP_BERT_HP -# EXTRALIBS += -lLHEP_BIC_HP -# EXTRALIBS += -lLHEP_LEAD_HP -# EXTRALIBS += -lLHEP_PRECO +EXTRALIBS += -lLHEP_BERT_HP +EXTRALIBS += -lLHEP_BIC_HP +EXTRALIBS += -lLHEP_LEAD_HP +EXTRALIBS += -lLHEP_PRECO EXTRALIBS += -lQGSP_BERT -# EXTRALIBS += -lLHEP_PRECO_HP +EXTRALIBS += -lLHEP_PRECO_HP EXTRALIBS += -lQGSC -# EXTRALIBS += -lQGSC_LEAD -# EXTRALIBS += -lQGSC_LEAD_HP +EXTRALIBS += -lQGSC_LEAD +EXTRALIBS += -lQGSC_LEAD_HP EXTRALIBS += -lQGSP -# EXTRALIBS += -lQGSP_GN -# EXTRALIBS += -lQGSP_HP -# EXTRALIBS += -lLHEP_BERT -# EXTRALIBS += -lLHEP_BIC +EXTRALIBS += -lQGSP_HP +EXTRALIBS += -lQGSP_BERT_HP EXTRALIBS += -lQGSP_BIC +EXTRALIBS += -lQBBC EXTRALIBS += -lPackaging CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/FTFC/include @@ -55,6 +49,8 @@ CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/QGSC_LEAD_HP/include CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/QGSP/include CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/QGSP_BERT/include CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/QGSP_BIC/include +CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/QGSP_BERT_HP/include CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/QGSP_GN/include CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/QGSP_HP/include CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/QGSP_Model/include +CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/QBBC/include diff --git a/examples/advanced/Tiara/source/tiara/include/TiaraCellScorer.hh b/examples/advanced/Tiara/source/tiara/include/TiaraCellScorer.hh index 1c6e3cc57d..5fa8d76aa2 100644 --- a/examples/advanced/Tiara/source/tiara/include/TiaraCellScorer.hh +++ b/examples/advanced/Tiara/source/tiara/include/TiaraCellScorer.hh @@ -25,7 +25,7 @@ // // // $Id: TiaraCellScorer.hh,v 1.4 2006/06/29 15:43:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class TiaraCellScorer diff --git a/examples/advanced/Tiara/source/tiara/include/TiaraCellScorerStore.hh b/examples/advanced/Tiara/source/tiara/include/TiaraCellScorerStore.hh index 971ed47661..c958f4414b 100644 --- a/examples/advanced/Tiara/source/tiara/include/TiaraCellScorerStore.hh +++ b/examples/advanced/Tiara/source/tiara/include/TiaraCellScorerStore.hh @@ -25,7 +25,7 @@ // // // $Id: TiaraCellScorerStore.hh,v 1.3 2006/06/29 15:43:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class TiaraCellScorerStore diff --git a/examples/advanced/Tiara/source/tiara/include/TiaraConcreteShieldA.hh b/examples/advanced/Tiara/source/tiara/include/TiaraConcreteShieldA.hh index 7a0ea39418..e2c02b8a4d 100644 --- a/examples/advanced/Tiara/source/tiara/include/TiaraConcreteShieldA.hh +++ b/examples/advanced/Tiara/source/tiara/include/TiaraConcreteShieldA.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraConcreteShieldA.hh,v 1.4 2006/06/29 15:43:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // diff --git a/examples/advanced/Tiara/source/tiara/include/TiaraConcreteShieldB.hh b/examples/advanced/Tiara/source/tiara/include/TiaraConcreteShieldB.hh index 97c8f75435..63ad039df6 100644 --- a/examples/advanced/Tiara/source/tiara/include/TiaraConcreteShieldB.hh +++ b/examples/advanced/Tiara/source/tiara/include/TiaraConcreteShieldB.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraConcreteShieldB.hh,v 1.4 2006/06/29 15:43:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // diff --git a/examples/advanced/Tiara/source/tiara/include/TiaraDPSSampledEnergy.hh b/examples/advanced/Tiara/source/tiara/include/TiaraDPSSampledEnergy.hh index 1ceec3e06f..9a73bceb18 100644 --- a/examples/advanced/Tiara/source/tiara/include/TiaraDPSSampledEnergy.hh +++ b/examples/advanced/Tiara/source/tiara/include/TiaraDPSSampledEnergy.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraDPSSampledEnergy.hh,v 1.7 2006/06/29 15:43:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // diff --git a/examples/advanced/Tiara/source/tiara/include/TiaraDimensions.hh b/examples/advanced/Tiara/source/tiara/include/TiaraDimensions.hh index ae7087d773..65983920aa 100644 --- a/examples/advanced/Tiara/source/tiara/include/TiaraDimensions.hh +++ b/examples/advanced/Tiara/source/tiara/include/TiaraDimensions.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraDimensions.hh,v 1.4 2006/06/29 15:43:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // diff --git a/examples/advanced/Tiara/source/tiara/include/TiaraEnergyCutProcess.hh b/examples/advanced/Tiara/source/tiara/include/TiaraEnergyCutProcess.hh index cf21102d82..5f3234e576 100644 --- a/examples/advanced/Tiara/source/tiara/include/TiaraEnergyCutProcess.hh +++ b/examples/advanced/Tiara/source/tiara/include/TiaraEnergyCutProcess.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraEnergyCutProcess.hh,v 1.4 2006/06/29 15:43:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // diff --git a/examples/advanced/Tiara/source/tiara/include/TiaraFileAcess.hh b/examples/advanced/Tiara/source/tiara/include/TiaraFileAcess.hh index c11ab83831..bc4cca08aa 100644 --- a/examples/advanced/Tiara/source/tiara/include/TiaraFileAcess.hh +++ b/examples/advanced/Tiara/source/tiara/include/TiaraFileAcess.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraFileAcess.hh,v 1.4 2006/06/29 15:43:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // diff --git a/examples/advanced/Tiara/source/tiara/include/TiaraFixedEnergyGenerator.hh b/examples/advanced/Tiara/source/tiara/include/TiaraFixedEnergyGenerator.hh index fe8458e41e..f12581f360 100644 --- a/examples/advanced/Tiara/source/tiara/include/TiaraFixedEnergyGenerator.hh +++ b/examples/advanced/Tiara/source/tiara/include/TiaraFixedEnergyGenerator.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraFixedEnergyGenerator.hh,v 1.4 2006/06/29 15:43:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // diff --git a/examples/advanced/Tiara/source/tiara/include/TiaraGeometry.hh b/examples/advanced/Tiara/source/tiara/include/TiaraGeometry.hh index 7e68cb48dd..fe09833b30 100644 --- a/examples/advanced/Tiara/source/tiara/include/TiaraGeometry.hh +++ b/examples/advanced/Tiara/source/tiara/include/TiaraGeometry.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraGeometry.hh,v 1.5 2006/06/29 15:43:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // diff --git a/examples/advanced/Tiara/source/tiara/include/TiaraIronShieldA.hh b/examples/advanced/Tiara/source/tiara/include/TiaraIronShieldA.hh index 9b473c0b58..397632a611 100644 --- a/examples/advanced/Tiara/source/tiara/include/TiaraIronShieldA.hh +++ b/examples/advanced/Tiara/source/tiara/include/TiaraIronShieldA.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraIronShieldA.hh,v 1.4 2006/06/29 15:43:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // diff --git a/examples/advanced/Tiara/source/tiara/include/TiaraIronShieldB.hh b/examples/advanced/Tiara/source/tiara/include/TiaraIronShieldB.hh index d53dcafaf6..2bdbb730c1 100644 --- a/examples/advanced/Tiara/source/tiara/include/TiaraIronShieldB.hh +++ b/examples/advanced/Tiara/source/tiara/include/TiaraIronShieldB.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraIronShieldB.hh,v 1.4 2006/06/29 15:43:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // diff --git a/examples/advanced/Tiara/source/tiara/include/TiaraIsotropicDirections.hh b/examples/advanced/Tiara/source/tiara/include/TiaraIsotropicDirections.hh index 905f37fc62..dc717e0630 100644 --- a/examples/advanced/Tiara/source/tiara/include/TiaraIsotropicDirections.hh +++ b/examples/advanced/Tiara/source/tiara/include/TiaraIsotropicDirections.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraIsotropicDirections.hh,v 1.4 2006/06/29 15:43:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // diff --git a/examples/advanced/Tiara/source/tiara/include/TiaraMaterials.hh b/examples/advanced/Tiara/source/tiara/include/TiaraMaterials.hh index 0b6f22f86c..a2628a2405 100644 --- a/examples/advanced/Tiara/source/tiara/include/TiaraMaterials.hh +++ b/examples/advanced/Tiara/source/tiara/include/TiaraMaterials.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraMaterials.hh,v 1.5 2006/06/29 15:43:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // diff --git a/examples/advanced/Tiara/source/tiara/include/TiaraMeasure.hh b/examples/advanced/Tiara/source/tiara/include/TiaraMeasure.hh index a939d3ea86..a90d92c119 100644 --- a/examples/advanced/Tiara/source/tiara/include/TiaraMeasure.hh +++ b/examples/advanced/Tiara/source/tiara/include/TiaraMeasure.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraMeasure.hh,v 1.4 2006/06/29 15:43:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // diff --git a/examples/advanced/Tiara/source/tiara/include/TiaraPart.hh b/examples/advanced/Tiara/source/tiara/include/TiaraPart.hh index 7681c80ec8..a7f2c9092c 100644 --- a/examples/advanced/Tiara/source/tiara/include/TiaraPart.hh +++ b/examples/advanced/Tiara/source/tiara/include/TiaraPart.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraPart.hh,v 1.4 2006/06/29 15:44:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // diff --git a/examples/advanced/Tiara/source/tiara/include/TiaraPhysicsList.hh b/examples/advanced/Tiara/source/tiara/include/TiaraPhysicsList.hh index cc8defc550..1580afb9e2 100644 --- a/examples/advanced/Tiara/source/tiara/include/TiaraPhysicsList.hh +++ b/examples/advanced/Tiara/source/tiara/include/TiaraPhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: TiaraPhysicsList.hh,v 1.1.1.2 2006/06/29 15:44:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class TiaraPhysicsList diff --git a/examples/advanced/Tiara/source/tiara/include/TiaraPrimaryGeneratorAction.hh b/examples/advanced/Tiara/source/tiara/include/TiaraPrimaryGeneratorAction.hh index ecd4da2ac0..ce42e53ceb 100644 --- a/examples/advanced/Tiara/source/tiara/include/TiaraPrimaryGeneratorAction.hh +++ b/examples/advanced/Tiara/source/tiara/include/TiaraPrimaryGeneratorAction.hh @@ -25,7 +25,7 @@ // // // $Id: TiaraPrimaryGeneratorAction.hh,v 1.1.1.2 2006/06/29 15:44:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef TiaraPrimaryGeneratorAction_hh diff --git a/examples/advanced/Tiara/source/tiara/include/TiaraRandom.hh b/examples/advanced/Tiara/source/tiara/include/TiaraRandom.hh index 035cfda569..0b6447a9cb 100644 --- a/examples/advanced/Tiara/source/tiara/include/TiaraRandom.hh +++ b/examples/advanced/Tiara/source/tiara/include/TiaraRandom.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraRandom.hh,v 1.4 2006/06/29 15:44:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // diff --git a/examples/advanced/Tiara/source/tiara/include/TiaraSampledEnergy.hh b/examples/advanced/Tiara/source/tiara/include/TiaraSampledEnergy.hh index e43a775157..0e146f726f 100644 --- a/examples/advanced/Tiara/source/tiara/include/TiaraSampledEnergy.hh +++ b/examples/advanced/Tiara/source/tiara/include/TiaraSampledEnergy.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraSampledEnergy.hh,v 1.5 2006/06/29 15:44:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // diff --git a/examples/advanced/Tiara/source/tiara/include/TiaraSim.hh b/examples/advanced/Tiara/source/tiara/include/TiaraSim.hh index c9a44ad42a..f542b7f30e 100644 --- a/examples/advanced/Tiara/source/tiara/include/TiaraSim.hh +++ b/examples/advanced/Tiara/source/tiara/include/TiaraSim.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraSim.hh,v 1.5 2006/06/29 15:44:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // diff --git a/examples/advanced/Tiara/source/tiara/include/TiaraTally.hh b/examples/advanced/Tiara/source/tiara/include/TiaraTally.hh index c36ad8b587..99a4afd698 100644 --- a/examples/advanced/Tiara/source/tiara/include/TiaraTally.hh +++ b/examples/advanced/Tiara/source/tiara/include/TiaraTally.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraTally.hh,v 1.5 2006/06/29 15:44:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // diff --git a/examples/advanced/Tiara/source/tiara/include/TiaraTimedEventAction.hh b/examples/advanced/Tiara/source/tiara/include/TiaraTimedEventAction.hh index 067faa2b69..cb4b9cf946 100644 --- a/examples/advanced/Tiara/source/tiara/include/TiaraTimedEventAction.hh +++ b/examples/advanced/Tiara/source/tiara/include/TiaraTimedEventAction.hh @@ -25,7 +25,7 @@ // // // $Id: TiaraTimedEventAction.hh,v 1.1.1.2 2006/06/29 15:44:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class TiaraTimedEventAction diff --git a/examples/advanced/Tiara/source/tiara/include/TiaraVComponent.hh b/examples/advanced/Tiara/source/tiara/include/TiaraVComponent.hh index 04cfaa97bb..49b7c9de6b 100644 --- a/examples/advanced/Tiara/source/tiara/include/TiaraVComponent.hh +++ b/examples/advanced/Tiara/source/tiara/include/TiaraVComponent.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraVComponent.hh,v 1.5 2006/06/29 15:44:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // diff --git a/examples/advanced/Tiara/source/tiara/include/TiaraVDirectionGenerator.hh b/examples/advanced/Tiara/source/tiara/include/TiaraVDirectionGenerator.hh index b73cadcdb6..b54cc5958c 100644 --- a/examples/advanced/Tiara/source/tiara/include/TiaraVDirectionGenerator.hh +++ b/examples/advanced/Tiara/source/tiara/include/TiaraVDirectionGenerator.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraVDirectionGenerator.hh,v 1.4 2006/06/29 15:44:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // diff --git a/examples/advanced/Tiara/source/tiara/include/TiaraVSourceEnergyGenerator.hh b/examples/advanced/Tiara/source/tiara/include/TiaraVSourceEnergyGenerator.hh index a642b5adf3..03a31ca11b 100644 --- a/examples/advanced/Tiara/source/tiara/include/TiaraVSourceEnergyGenerator.hh +++ b/examples/advanced/Tiara/source/tiara/include/TiaraVSourceEnergyGenerator.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraVSourceEnergyGenerator.hh,v 1.4 2006/06/29 15:44:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // diff --git a/examples/advanced/Tiara/source/tiara/include/TiaraVisEventAction.hh b/examples/advanced/Tiara/source/tiara/include/TiaraVisEventAction.hh index 9ed3dad748..0caff6cab8 100644 --- a/examples/advanced/Tiara/source/tiara/include/TiaraVisEventAction.hh +++ b/examples/advanced/Tiara/source/tiara/include/TiaraVisEventAction.hh @@ -25,7 +25,7 @@ // // // $Id: TiaraVisEventAction.hh,v 1.1.1.2 2006/06/29 15:44:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class TiaraVisEventAction diff --git a/examples/advanced/Tiara/source/tiara/include/TiaraVisRunAction.hh b/examples/advanced/Tiara/source/tiara/include/TiaraVisRunAction.hh index 2e70c9176e..58aeee2797 100644 --- a/examples/advanced/Tiara/source/tiara/include/TiaraVisRunAction.hh +++ b/examples/advanced/Tiara/source/tiara/include/TiaraVisRunAction.hh @@ -25,7 +25,7 @@ // // // $Id: TiaraVisRunAction.hh,v 1.1.1.2 2006/06/29 15:44:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class TiaraVisRunAction diff --git a/examples/advanced/Tiara/source/tiara/src/TiaraCellScorer.cc b/examples/advanced/Tiara/source/tiara/src/TiaraCellScorer.cc index ca59fe0f44..5cd881a2a3 100644 --- a/examples/advanced/Tiara/source/tiara/src/TiaraCellScorer.cc +++ b/examples/advanced/Tiara/source/tiara/src/TiaraCellScorer.cc @@ -25,7 +25,7 @@ // // // $Id: TiaraCellScorer.cc,v 1.5 2006/06/29 15:44:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/examples/advanced/Tiara/source/tiara/src/TiaraCellScorerStore.cc b/examples/advanced/Tiara/source/tiara/src/TiaraCellScorerStore.cc index 1b4119a301..0d2d51e90b 100644 --- a/examples/advanced/Tiara/source/tiara/src/TiaraCellScorerStore.cc +++ b/examples/advanced/Tiara/source/tiara/src/TiaraCellScorerStore.cc @@ -25,7 +25,7 @@ // // // $Id: TiaraCellScorerStore.cc,v 1.1.1.2 2006/06/29 15:44:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/examples/advanced/Tiara/source/tiara/src/TiaraConcreteShieldA.cc b/examples/advanced/Tiara/source/tiara/src/TiaraConcreteShieldA.cc index c6c321f4ea..bc2b4253ff 100644 --- a/examples/advanced/Tiara/source/tiara/src/TiaraConcreteShieldA.cc +++ b/examples/advanced/Tiara/source/tiara/src/TiaraConcreteShieldA.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraConcreteShieldA.cc,v 1.4 2006/06/29 15:44:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "TiaraConcreteShieldA.hh" diff --git a/examples/advanced/Tiara/source/tiara/src/TiaraConcreteShieldB.cc b/examples/advanced/Tiara/source/tiara/src/TiaraConcreteShieldB.cc index 48d97cfc7c..2d1e47e8c7 100644 --- a/examples/advanced/Tiara/source/tiara/src/TiaraConcreteShieldB.cc +++ b/examples/advanced/Tiara/source/tiara/src/TiaraConcreteShieldB.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraConcreteShieldB.cc,v 1.4 2006/06/29 15:44:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "TiaraConcreteShieldB.hh" diff --git a/examples/advanced/Tiara/source/tiara/src/TiaraDPSSampledEnergy.cc b/examples/advanced/Tiara/source/tiara/src/TiaraDPSSampledEnergy.cc index 067e206e7b..c2786f3cab 100644 --- a/examples/advanced/Tiara/source/tiara/src/TiaraDPSSampledEnergy.cc +++ b/examples/advanced/Tiara/source/tiara/src/TiaraDPSSampledEnergy.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraDPSSampledEnergy.cc,v 1.9 2006/06/29 15:44:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "TiaraDPSSampledEnergy.hh" diff --git a/examples/advanced/Tiara/source/tiara/src/TiaraDimensions.cc b/examples/advanced/Tiara/source/tiara/src/TiaraDimensions.cc index ce5420edfc..88a528322e 100644 --- a/examples/advanced/Tiara/source/tiara/src/TiaraDimensions.cc +++ b/examples/advanced/Tiara/source/tiara/src/TiaraDimensions.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraDimensions.cc,v 1.4 2006/06/29 15:44:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "TiaraDimensions.hh" diff --git a/examples/advanced/Tiara/source/tiara/src/TiaraEnergyCutProcess.cc b/examples/advanced/Tiara/source/tiara/src/TiaraEnergyCutProcess.cc index 49c7f816f5..d49f78939a 100644 --- a/examples/advanced/Tiara/source/tiara/src/TiaraEnergyCutProcess.cc +++ b/examples/advanced/Tiara/source/tiara/src/TiaraEnergyCutProcess.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraEnergyCutProcess.cc,v 1.6 2006/06/29 15:44:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "TiaraEnergyCutProcess.hh" diff --git a/examples/advanced/Tiara/source/tiara/src/TiaraFileAcess.cc b/examples/advanced/Tiara/source/tiara/src/TiaraFileAcess.cc index 9c05602d98..7f9d735baa 100644 --- a/examples/advanced/Tiara/source/tiara/src/TiaraFileAcess.cc +++ b/examples/advanced/Tiara/source/tiara/src/TiaraFileAcess.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraFileAcess.cc,v 1.4 2006/06/29 15:44:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "TiaraFileAcess.hh" diff --git a/examples/advanced/Tiara/source/tiara/src/TiaraFixedEnergyGenerator.cc b/examples/advanced/Tiara/source/tiara/src/TiaraFixedEnergyGenerator.cc index 1ac2592a2e..8c63b1d532 100644 --- a/examples/advanced/Tiara/source/tiara/src/TiaraFixedEnergyGenerator.cc +++ b/examples/advanced/Tiara/source/tiara/src/TiaraFixedEnergyGenerator.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraFixedEnergyGenerator.cc,v 1.4 2006/06/29 15:45:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "TiaraFixedEnergyGenerator.hh" diff --git a/examples/advanced/Tiara/source/tiara/src/TiaraGeometry.cc b/examples/advanced/Tiara/source/tiara/src/TiaraGeometry.cc index 277471e3fc..53ff8ffd5a 100644 --- a/examples/advanced/Tiara/source/tiara/src/TiaraGeometry.cc +++ b/examples/advanced/Tiara/source/tiara/src/TiaraGeometry.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraGeometry.cc,v 1.5 2006/06/29 15:45:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "TiaraGeometry.hh" diff --git a/examples/advanced/Tiara/source/tiara/src/TiaraIronShieldA.cc b/examples/advanced/Tiara/source/tiara/src/TiaraIronShieldA.cc index d1c68d2651..a8bf011d38 100644 --- a/examples/advanced/Tiara/source/tiara/src/TiaraIronShieldA.cc +++ b/examples/advanced/Tiara/source/tiara/src/TiaraIronShieldA.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraIronShieldA.cc,v 1.4 2006/06/29 15:45:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "TiaraIronShieldA.hh" diff --git a/examples/advanced/Tiara/source/tiara/src/TiaraIronShieldB.cc b/examples/advanced/Tiara/source/tiara/src/TiaraIronShieldB.cc index 7275cea380..8ce8f96856 100644 --- a/examples/advanced/Tiara/source/tiara/src/TiaraIronShieldB.cc +++ b/examples/advanced/Tiara/source/tiara/src/TiaraIronShieldB.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraIronShieldB.cc,v 1.4 2006/06/29 15:45:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "TiaraIronShieldB.hh" diff --git a/examples/advanced/Tiara/source/tiara/src/TiaraIsotropicDirections.cc b/examples/advanced/Tiara/source/tiara/src/TiaraIsotropicDirections.cc index 820e982eb7..8b5357102a 100644 --- a/examples/advanced/Tiara/source/tiara/src/TiaraIsotropicDirections.cc +++ b/examples/advanced/Tiara/source/tiara/src/TiaraIsotropicDirections.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraIsotropicDirections.cc,v 1.5 2006/06/29 15:45:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "TiaraIsotropicDirections.hh" diff --git a/examples/advanced/Tiara/source/tiara/src/TiaraMaterials.cc b/examples/advanced/Tiara/source/tiara/src/TiaraMaterials.cc index 1d1c699e7f..add6a1f800 100644 --- a/examples/advanced/Tiara/source/tiara/src/TiaraMaterials.cc +++ b/examples/advanced/Tiara/source/tiara/src/TiaraMaterials.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraMaterials.cc,v 1.5 2006/06/29 15:45:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "TiaraMaterials.hh" diff --git a/examples/advanced/Tiara/source/tiara/src/TiaraMeasure.cc b/examples/advanced/Tiara/source/tiara/src/TiaraMeasure.cc index f68a6439c2..693973bc80 100644 --- a/examples/advanced/Tiara/source/tiara/src/TiaraMeasure.cc +++ b/examples/advanced/Tiara/source/tiara/src/TiaraMeasure.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraMeasure.cc,v 1.4 2006/06/29 15:45:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "TiaraMeasure.hh" diff --git a/examples/advanced/Tiara/source/tiara/src/TiaraPhysicsList.cc b/examples/advanced/Tiara/source/tiara/src/TiaraPhysicsList.cc index edfee40404..6b7b0d20f1 100644 --- a/examples/advanced/Tiara/source/tiara/src/TiaraPhysicsList.cc +++ b/examples/advanced/Tiara/source/tiara/src/TiaraPhysicsList.cc @@ -25,7 +25,7 @@ // // // $Id: TiaraPhysicsList.cc,v 1.6 2006/06/29 15:45:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "globals.hh" diff --git a/examples/advanced/Tiara/source/tiara/src/TiaraPrimaryGeneratorAction.cc b/examples/advanced/Tiara/source/tiara/src/TiaraPrimaryGeneratorAction.cc index c0ab4a92e1..fdda38b4ab 100644 --- a/examples/advanced/Tiara/source/tiara/src/TiaraPrimaryGeneratorAction.cc +++ b/examples/advanced/Tiara/source/tiara/src/TiaraPrimaryGeneratorAction.cc @@ -25,7 +25,7 @@ // // // $Id: TiaraPrimaryGeneratorAction.cc,v 1.5 2006/06/29 15:45:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "globals.hh" diff --git a/examples/advanced/Tiara/source/tiara/src/TiaraRandom.cc b/examples/advanced/Tiara/source/tiara/src/TiaraRandom.cc index 78fe305098..f4ce895675 100644 --- a/examples/advanced/Tiara/source/tiara/src/TiaraRandom.cc +++ b/examples/advanced/Tiara/source/tiara/src/TiaraRandom.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraRandom.cc,v 1.5 2006/06/29 15:45:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "TiaraRandom.hh" diff --git a/examples/advanced/Tiara/source/tiara/src/TiaraSampledEnergy.cc b/examples/advanced/Tiara/source/tiara/src/TiaraSampledEnergy.cc index 0378249810..5eb3e3fa78 100644 --- a/examples/advanced/Tiara/source/tiara/src/TiaraSampledEnergy.cc +++ b/examples/advanced/Tiara/source/tiara/src/TiaraSampledEnergy.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraSampledEnergy.cc,v 1.5 2006/06/29 15:45:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "TiaraSampledEnergy.hh" diff --git a/examples/advanced/Tiara/source/tiara/src/TiaraSim.cc b/examples/advanced/Tiara/source/tiara/src/TiaraSim.cc index 86f3fd6c58..c287dcbc81 100644 --- a/examples/advanced/Tiara/source/tiara/src/TiaraSim.cc +++ b/examples/advanced/Tiara/source/tiara/src/TiaraSim.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraSim.cc,v 1.9 2006/06/29 15:45:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "TiaraSim.hh" diff --git a/examples/advanced/Tiara/source/tiara/src/TiaraStackingAction.cc b/examples/advanced/Tiara/source/tiara/src/TiaraStackingAction.cc index 3687364334..9e332e12fc 100644 --- a/examples/advanced/Tiara/source/tiara/src/TiaraStackingAction.cc +++ b/examples/advanced/Tiara/source/tiara/src/TiaraStackingAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraStackingAction.cc,v 1.5 2006/06/29 15:45:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "TiaraStackingAction.hh" diff --git a/examples/advanced/Tiara/source/tiara/src/TiaraTally.cc b/examples/advanced/Tiara/source/tiara/src/TiaraTally.cc index 3f7dd7ab92..c53b92761e 100644 --- a/examples/advanced/Tiara/source/tiara/src/TiaraTally.cc +++ b/examples/advanced/Tiara/source/tiara/src/TiaraTally.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraTally.cc,v 1.5 2006/06/29 15:45:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "TiaraTally.hh" diff --git a/examples/advanced/Tiara/source/tiara/src/TiaraTimedEventAction.cc b/examples/advanced/Tiara/source/tiara/src/TiaraTimedEventAction.cc index bd9049290e..3ef0a1d235 100644 --- a/examples/advanced/Tiara/source/tiara/src/TiaraTimedEventAction.cc +++ b/examples/advanced/Tiara/source/tiara/src/TiaraTimedEventAction.cc @@ -25,7 +25,7 @@ // // // $Id: TiaraTimedEventAction.cc,v 1.4 2006/06/29 15:45:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/advanced/Tiara/source/tiara/src/TiaraVComponent.cc b/examples/advanced/Tiara/source/tiara/src/TiaraVComponent.cc index 140720ab8d..2cd15cf5e7 100644 --- a/examples/advanced/Tiara/source/tiara/src/TiaraVComponent.cc +++ b/examples/advanced/Tiara/source/tiara/src/TiaraVComponent.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraVComponent.cc,v 1.4 2006/06/29 15:45:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "TiaraVComponent.hh" diff --git a/examples/advanced/Tiara/source/tiara/src/TiaraVDirectionGenerator.cc b/examples/advanced/Tiara/source/tiara/src/TiaraVDirectionGenerator.cc index 572f8673ea..6b6ca17338 100644 --- a/examples/advanced/Tiara/source/tiara/src/TiaraVDirectionGenerator.cc +++ b/examples/advanced/Tiara/source/tiara/src/TiaraVDirectionGenerator.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraVDirectionGenerator.cc,v 1.4 2006/06/29 15:45:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "TiaraVDirectionGenerator.hh" diff --git a/examples/advanced/Tiara/source/tiara/src/TiaraVSourceEnergyGenerator.cc b/examples/advanced/Tiara/source/tiara/src/TiaraVSourceEnergyGenerator.cc index 3cf4e69de5..354bc39eed 100644 --- a/examples/advanced/Tiara/source/tiara/src/TiaraVSourceEnergyGenerator.cc +++ b/examples/advanced/Tiara/source/tiara/src/TiaraVSourceEnergyGenerator.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TiaraVSourceEnergyGenerator.cc,v 1.4 2006/06/29 15:45:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "TiaraVSourceEnergyGenerator.hh" diff --git a/examples/advanced/Tiara/source/tiara/src/TiaraVisEventAction.cc b/examples/advanced/Tiara/source/tiara/src/TiaraVisEventAction.cc index 2a5cf53b82..3ae32e7b3c 100644 --- a/examples/advanced/Tiara/source/tiara/src/TiaraVisEventAction.cc +++ b/examples/advanced/Tiara/source/tiara/src/TiaraVisEventAction.cc @@ -25,7 +25,7 @@ // // // $Id: TiaraVisEventAction.cc,v 1.4 2006/06/29 15:45:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/advanced/Tiara/source/tiara/src/TiaraVisRunAction.cc b/examples/advanced/Tiara/source/tiara/src/TiaraVisRunAction.cc index b318f4e30f..ed58034004 100644 --- a/examples/advanced/Tiara/source/tiara/src/TiaraVisRunAction.cc +++ b/examples/advanced/Tiara/source/tiara/src/TiaraVisRunAction.cc @@ -25,7 +25,7 @@ // // // $Id: TiaraVisRunAction.cc,v 1.1.1.2 2006/06/29 15:45:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/advanced/air_shower/History b/examples/advanced/air_shower/History index 8a9a3fa007..05251eb8c8 100644 --- a/examples/advanced/air_shower/History +++ b/examples/advanced/air_shower/History @@ -1,4 +1,4 @@ -$Id: History,v 1.12 2006/06/02 15:37:25 tomezb Exp $ +$Id: History,v 1.13 2006/11/16 04:53:32 tomezb Exp $ ------------------------------------------------------------------- ========================================================= @@ -7,6 +7,10 @@ $Id: History,v 1.12 2006/06/02 15:37:25 tomezb Exp $ History file ------------ +16.11.2006 -- B. Tome - air_shower-V08-01-00 + -- Tested with candidate tag geant4-08-02-cand-00. + -- Ultra.cc - Removed invocation of Visualisation.mac if argc==1. + 02.06.2006 -- B. Tome - air_shower-V08-00-01 -- UltraRunAction.cc : Removed use of visualization UI commands. -- Small changes in UltraPrimaryGeneratorAction.cc diff --git a/examples/advanced/air_shower/Ultra.cc b/examples/advanced/air_shower/Ultra.cc index ec3b597955..11845838fa 100644 --- a/examples/advanced/air_shower/Ultra.cc +++ b/examples/advanced/air_shower/Ultra.cc @@ -101,7 +101,6 @@ int main(int argc,char** argv) { #else G4UIsession* session = new G4UIterminal(); #endif - UImanager->ApplyCommand("/control/execute Visualisation.mac"); session->SessionStart(); delete session; } diff --git a/examples/advanced/brachytherapy/Brachy.cc b/examples/advanced/brachytherapy/Brachy.cc index 5ac1f51269..ae56356edf 100644 --- a/examples/advanced/brachytherapy/Brachy.cc +++ b/examples/advanced/brachytherapy/Brachy.cc @@ -25,7 +25,7 @@ // // // $Id: Brachy.cc -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------- // GEANT 4 - Brachytherapy example diff --git a/examples/advanced/brachytherapy/History b/examples/advanced/brachytherapy/History index 1a3ddc453e..6a6757942a 100644 --- a/examples/advanced/brachytherapy/History +++ b/examples/advanced/brachytherapy/History @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -$Id: History,v 1.18 2006/05/30 12:32:16 guatelli Exp $ +$Id: History,v 1.21 2006/11/15 10:03:37 guatelli Exp $ ------------------------------------------------------------------- ========================================================= @@ -8,6 +8,12 @@ $Id: History,v 1.18 2006/05/30 12:32:16 guatelli Exp $ Category History file --------------------- +15th November 2006 Susanna Guatelli (brachy-V08-01-01) +- Physics list cleaned. The cut is fixed to a value lower than the + 1 keV limit. + +14th November 2006 John Allison (brachy-V08-01-00) +- Removed /vis/scene/transientsAction none (no longer available). 30th May 2006 Susanna Guatelli (brachy-V08-00-02) - Deleted a warning during compilation diff --git a/examples/advanced/brachytherapy/VisualisationMacro.mac b/examples/advanced/brachytherapy/VisualisationMacro.mac index f833a8057e..9eac3564bd 100644 --- a/examples/advanced/brachytherapy/VisualisationMacro.mac +++ b/examples/advanced/brachytherapy/VisualisationMacro.mac @@ -17,7 +17,6 @@ /tracking/storeTrajectory 1 /vis/scene/endOfEventAction accumulate /vis/viewer/update -/vis/scene/transientsAction none ##/primary/energy Iodium ##/source/switch Iodium /vis/viewer/zoom 5 diff --git a/examples/advanced/brachytherapy/include/BrachyAnalysisManager.hh b/examples/advanced/brachytherapy/include/BrachyAnalysisManager.hh index 42d22f3846..bdcbc1d871 100644 --- a/examples/advanced/brachytherapy/include/BrachyAnalysisManager.hh +++ b/examples/advanced/brachytherapy/include/BrachyAnalysisManager.hh @@ -29,7 +29,7 @@ // // // $Id: BrachyAnalysisManager.hh,v 1.11 2006/06/29 15:47:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ********************************** // * * diff --git a/examples/advanced/brachytherapy/include/BrachyDetectorConstruction.hh b/examples/advanced/brachytherapy/include/BrachyDetectorConstruction.hh index b97b0f65a0..2b07854524 100644 --- a/examples/advanced/brachytherapy/include/BrachyDetectorConstruction.hh +++ b/examples/advanced/brachytherapy/include/BrachyDetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: BrachyDetectorConstruction.hh,v 1.17 2006/06/29 15:47:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // **************************************** // * * diff --git a/examples/advanced/brachytherapy/include/BrachyDetectorConstructionI.hh b/examples/advanced/brachytherapy/include/BrachyDetectorConstructionI.hh index 18a7b9b2d6..5168327ee7 100644 --- a/examples/advanced/brachytherapy/include/BrachyDetectorConstructionI.hh +++ b/examples/advanced/brachytherapy/include/BrachyDetectorConstructionI.hh @@ -25,7 +25,7 @@ // // // $Id: BrachyDetectorConstructionI.hh,v 1.5 2006/06/29 15:47:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // **************************************** // * * diff --git a/examples/advanced/brachytherapy/include/BrachyDetectorConstructionIr.hh b/examples/advanced/brachytherapy/include/BrachyDetectorConstructionIr.hh index 1043f983e8..81feac69c3 100644 --- a/examples/advanced/brachytherapy/include/BrachyDetectorConstructionIr.hh +++ b/examples/advanced/brachytherapy/include/BrachyDetectorConstructionIr.hh @@ -25,7 +25,7 @@ // // // $Id: BrachyDetectorConstructionIr.hh,v 1.5 2006/06/29 15:47:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // **************************************** // * * diff --git a/examples/advanced/brachytherapy/include/BrachyDetectorConstructionLeipzig.hh b/examples/advanced/brachytherapy/include/BrachyDetectorConstructionLeipzig.hh index 4a6ac37833..e80a4199df 100644 --- a/examples/advanced/brachytherapy/include/BrachyDetectorConstructionLeipzig.hh +++ b/examples/advanced/brachytherapy/include/BrachyDetectorConstructionLeipzig.hh @@ -25,7 +25,7 @@ // // // $Id: BrachyDetectorConstructionLeipzig.hh,v 1.5 2006/06/29 15:47:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ************************************************ diff --git a/examples/advanced/brachytherapy/include/BrachyDetectorMessenger.hh b/examples/advanced/brachytherapy/include/BrachyDetectorMessenger.hh index 4287ecf393..e844683df4 100644 --- a/examples/advanced/brachytherapy/include/BrachyDetectorMessenger.hh +++ b/examples/advanced/brachytherapy/include/BrachyDetectorMessenger.hh @@ -31,7 +31,7 @@ // ***************************************** // // $Id: BrachyDetectorMessenger.hh,v 1.7 2006/06/29 15:47:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // #ifndef BrachyDetectorMessenger_h diff --git a/examples/advanced/brachytherapy/include/BrachyEventAction.hh b/examples/advanced/brachytherapy/include/BrachyEventAction.hh index 63beecdf84..8acebf649a 100644 --- a/examples/advanced/brachytherapy/include/BrachyEventAction.hh +++ b/examples/advanced/brachytherapy/include/BrachyEventAction.hh @@ -25,7 +25,7 @@ // // // $Id: BrachyEventAction.hh,v 1.15 2006/06/29 15:47:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Code developed by: // S.Guatelli diff --git a/examples/advanced/brachytherapy/include/BrachyFactory.hh b/examples/advanced/brachytherapy/include/BrachyFactory.hh index 13ab6c6672..a5bc9d663b 100644 --- a/examples/advanced/brachytherapy/include/BrachyFactory.hh +++ b/examples/advanced/brachytherapy/include/BrachyFactory.hh @@ -26,7 +26,7 @@ // Code developed by: Susanna Guatelli // // $Id: BrachyFactory.hh,v 1.6 2006/06/29 15:47:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ********************************** // * * diff --git a/examples/advanced/brachytherapy/include/BrachyFactoryI.hh b/examples/advanced/brachytherapy/include/BrachyFactoryI.hh index 2783ea6fcc..f98188ab6e 100644 --- a/examples/advanced/brachytherapy/include/BrachyFactoryI.hh +++ b/examples/advanced/brachytherapy/include/BrachyFactoryI.hh @@ -35,7 +35,7 @@ // // // $Id: BrachyFactoryI.hh,v 1.7 2006/06/29 15:47:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/advanced/brachytherapy/include/BrachyFactoryIr.hh b/examples/advanced/brachytherapy/include/BrachyFactoryIr.hh index 124e0bb69f..d8ca8099cd 100644 --- a/examples/advanced/brachytherapy/include/BrachyFactoryIr.hh +++ b/examples/advanced/brachytherapy/include/BrachyFactoryIr.hh @@ -25,7 +25,7 @@ // // // $Id: BrachyFactoryIr.hh,v 1.6 2006/06/29 15:47:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ********************************** // * * diff --git a/examples/advanced/brachytherapy/include/BrachyFactoryLeipzig.hh b/examples/advanced/brachytherapy/include/BrachyFactoryLeipzig.hh index e4e9902e1b..69bee7fd04 100644 --- a/examples/advanced/brachytherapy/include/BrachyFactoryLeipzig.hh +++ b/examples/advanced/brachytherapy/include/BrachyFactoryLeipzig.hh @@ -25,7 +25,7 @@ // // // $Id: BrachyFactoryLeipzig.hh,v 1.6 2006/06/29 15:47:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ********************************** // * * diff --git a/examples/advanced/brachytherapy/include/BrachyMaterial.hh b/examples/advanced/brachytherapy/include/BrachyMaterial.hh index 1f51bf28b2..c608f191ee 100644 --- a/examples/advanced/brachytherapy/include/BrachyMaterial.hh +++ b/examples/advanced/brachytherapy/include/BrachyMaterial.hh @@ -25,7 +25,7 @@ // // // $Id: BrachyMaterial.hh,v 1.7 2006/06/29 15:47:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ********************************** // * * diff --git a/examples/advanced/brachytherapy/include/BrachyPhantomROGeometry.hh b/examples/advanced/brachytherapy/include/BrachyPhantomROGeometry.hh index 50da274bec..cc70b4449f 100644 --- a/examples/advanced/brachytherapy/include/BrachyPhantomROGeometry.hh +++ b/examples/advanced/brachytherapy/include/BrachyPhantomROGeometry.hh @@ -25,7 +25,7 @@ // // // $Id: BrachyPhantomROGeometry.hh,v 1.7 2006/06/29 15:47:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ************************************ // * * diff --git a/examples/advanced/brachytherapy/include/BrachyPhantomSD.hh b/examples/advanced/brachytherapy/include/BrachyPhantomSD.hh index 5a6e76b39c..7df7efc2df 100644 --- a/examples/advanced/brachytherapy/include/BrachyPhantomSD.hh +++ b/examples/advanced/brachytherapy/include/BrachyPhantomSD.hh @@ -25,7 +25,7 @@ // // // $Id: BrachyPhantomSD.hh,v 1.10 2006/06/29 15:47:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ******************************** // * * diff --git a/examples/advanced/brachytherapy/include/BrachyPhysicsList.hh b/examples/advanced/brachytherapy/include/BrachyPhysicsList.hh index 39c85c0d3d..5c914302bc 100644 --- a/examples/advanced/brachytherapy/include/BrachyPhysicsList.hh +++ b/examples/advanced/brachytherapy/include/BrachyPhysicsList.hh @@ -24,8 +24,10 @@ // ******************************************************************** // // -// $Id: BrachyPhysicsList.hh,v 1.8 2006/06/29 15:47:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: BrachyPhysicsList.hh,v 1.9 2006/11/15 10:02:17 guatelli Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// Code review: MGP, 5 November 2006 (still to be completed) // // ********************************** // * * @@ -39,41 +41,25 @@ #include "G4VUserPhysicsList.hh" #include "globals.hh" - -class G4LowEnergyIonisation; -class G4LowEnergyBremsstrahlung; - class BrachyPhysicsList: public G4VUserPhysicsList { - public: - BrachyPhysicsList(); - ~BrachyPhysicsList(); +public: + BrachyPhysicsList(); + ~BrachyPhysicsList(); - protected: - // Construct particle and physics - void ConstructParticle(); - void ConstructProcess(); - - void SetCuts(); +protected: + // Construct particle and physics + void ConstructParticle(); + void ConstructProcess(); + void ConstructBosons(); + void ConstructLeptons(); - private: - G4double cutForGamma; - G4double cutForElectron; - G4double cutForPositron; - - protected: - void ConstructBosons(); - void ConstructLeptons(); - - protected: - // these methods Construct physics processes and register them - void ConstructGeneral(); - void ConstructEM(); + void SetCuts(); - private: - G4LowEnergyIonisation* loweIon; - G4LowEnergyBremsstrahlung* loweBrem; - +private: + + // These methods construct physics processes and register them + void ConstructEM(); }; #endif diff --git a/examples/advanced/brachytherapy/include/BrachyPrimaryGeneratorAction.hh b/examples/advanced/brachytherapy/include/BrachyPrimaryGeneratorAction.hh index e8eebfcb87..879f2c2bce 100644 --- a/examples/advanced/brachytherapy/include/BrachyPrimaryGeneratorAction.hh +++ b/examples/advanced/brachytherapy/include/BrachyPrimaryGeneratorAction.hh @@ -25,7 +25,7 @@ // // // $Id: BrachyPrimaryGeneratorAction.hh,v 1.12 2006/06/29 15:47:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ******************************************** // * * diff --git a/examples/advanced/brachytherapy/include/BrachyPrimaryGeneratorActionI.hh b/examples/advanced/brachytherapy/include/BrachyPrimaryGeneratorActionI.hh index 5d9403d263..aee3aceadf 100644 --- a/examples/advanced/brachytherapy/include/BrachyPrimaryGeneratorActionI.hh +++ b/examples/advanced/brachytherapy/include/BrachyPrimaryGeneratorActionI.hh @@ -25,7 +25,7 @@ // // // $Id: BrachyPrimaryGeneratorActionI.hh,v 1.6 2006/06/29 15:47:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // diff --git a/examples/advanced/brachytherapy/include/BrachyPrimaryGeneratorActionIr.hh b/examples/advanced/brachytherapy/include/BrachyPrimaryGeneratorActionIr.hh index f1fb4ded2a..c2b0e6ad23 100644 --- a/examples/advanced/brachytherapy/include/BrachyPrimaryGeneratorActionIr.hh +++ b/examples/advanced/brachytherapy/include/BrachyPrimaryGeneratorActionIr.hh @@ -25,7 +25,7 @@ // // // $Id: BrachyPrimaryGeneratorActionIr.hh,v 1.7 2006/06/29 15:47:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ************************************************* // * * diff --git a/examples/advanced/brachytherapy/include/BrachyPrimaryGeneratorMessenger.hh b/examples/advanced/brachytherapy/include/BrachyPrimaryGeneratorMessenger.hh index 1a66ba7eb9..6b6650db9c 100644 --- a/examples/advanced/brachytherapy/include/BrachyPrimaryGeneratorMessenger.hh +++ b/examples/advanced/brachytherapy/include/BrachyPrimaryGeneratorMessenger.hh @@ -31,7 +31,7 @@ // *********************************************** // // $Id: BrachyPrimaryGeneratorMessenger.hh,v 1.2 2006/06/29 15:48:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // #ifndef BrachyPrimaryGeneratorMessenger_h diff --git a/examples/advanced/brachytherapy/include/BrachyRunAction.hh b/examples/advanced/brachytherapy/include/BrachyRunAction.hh index 5c91e8203b..28ed7a2611 100644 --- a/examples/advanced/brachytherapy/include/BrachyRunAction.hh +++ b/examples/advanced/brachytherapy/include/BrachyRunAction.hh @@ -25,7 +25,7 @@ // // // $Id: BrachyRunAction.hh,v 1.11 2006/06/29 15:48:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // diff --git a/examples/advanced/brachytherapy/src/BrachyAnalysisManager.cc b/examples/advanced/brachytherapy/src/BrachyAnalysisManager.cc index 9a8c655d7e..e22280f252 100644 --- a/examples/advanced/brachytherapy/src/BrachyAnalysisManager.cc +++ b/examples/advanced/brachytherapy/src/BrachyAnalysisManager.cc @@ -33,7 +33,7 @@ // ******************************* // // $Id: BrachyAnalysisManager.cc,v 1.18 2006/06/29 15:48:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifdef G4ANALYSIS_USE #include diff --git a/examples/advanced/brachytherapy/src/BrachyDetectorConstruction.cc b/examples/advanced/brachytherapy/src/BrachyDetectorConstruction.cc index b626354dbb..439ce8ee0b 100644 --- a/examples/advanced/brachytherapy/src/BrachyDetectorConstruction.cc +++ b/examples/advanced/brachytherapy/src/BrachyDetectorConstruction.cc @@ -38,7 +38,7 @@ // **************************************** // // $Id: BrachyDetectorConstruction.cc,v 1.29 2006/06/29 15:48:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4CSGSolid.hh" #include "G4MaterialPropertyVector.hh" diff --git a/examples/advanced/brachytherapy/src/BrachyDetectorConstructionI.cc b/examples/advanced/brachytherapy/src/BrachyDetectorConstructionI.cc index 203944fb23..fd17decac7 100644 --- a/examples/advanced/brachytherapy/src/BrachyDetectorConstructionI.cc +++ b/examples/advanced/brachytherapy/src/BrachyDetectorConstructionI.cc @@ -37,7 +37,7 @@ // **************************************** // // $Id: BrachyDetectorConstructionI.cc,v 1.9 2006/06/29 15:48:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "globals.hh" #include "BrachyDetectorConstructionI.hh" diff --git a/examples/advanced/brachytherapy/src/BrachyDetectorConstructionIr.cc b/examples/advanced/brachytherapy/src/BrachyDetectorConstructionIr.cc index 5154ea499f..527af74fbc 100644 --- a/examples/advanced/brachytherapy/src/BrachyDetectorConstructionIr.cc +++ b/examples/advanced/brachytherapy/src/BrachyDetectorConstructionIr.cc @@ -38,7 +38,7 @@ // **************************************** // // $Id: BrachyDetectorConstructionIr.cc,v 1.10 2006/06/29 15:48:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "globals.hh" #include "BrachyDetectorConstructionIr.hh" diff --git a/examples/advanced/brachytherapy/src/BrachyDetectorConstructionLeipzig.cc b/examples/advanced/brachytherapy/src/BrachyDetectorConstructionLeipzig.cc index 108bd4b8ab..56ffd7a4f7 100644 --- a/examples/advanced/brachytherapy/src/BrachyDetectorConstructionLeipzig.cc +++ b/examples/advanced/brachytherapy/src/BrachyDetectorConstructionLeipzig.cc @@ -39,7 +39,7 @@ // // // $Id: BrachyDetectorConstructionLeipzig.cc,v 1.10 2006/06/29 15:48:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "globals.hh" diff --git a/examples/advanced/brachytherapy/src/BrachyDetectorMessenger.cc b/examples/advanced/brachytherapy/src/BrachyDetectorMessenger.cc index 7ad63e125e..21452f73c9 100644 --- a/examples/advanced/brachytherapy/src/BrachyDetectorMessenger.cc +++ b/examples/advanced/brachytherapy/src/BrachyDetectorMessenger.cc @@ -35,7 +35,7 @@ // // // $Id: BrachyDetectorMessenger.cc,v 1.12 2006/06/29 15:48:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/advanced/brachytherapy/src/BrachyEventAction.cc b/examples/advanced/brachytherapy/src/BrachyEventAction.cc index cdc95398c6..babe8bd5b3 100644 --- a/examples/advanced/brachytherapy/src/BrachyEventAction.cc +++ b/examples/advanced/brachytherapy/src/BrachyEventAction.cc @@ -33,7 +33,7 @@ // ******************************* // // $Id: BrachyEventAction.cc,v 1.21 2006/06/29 15:48:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "BrachyEventAction.hh" #include "G4Event.hh" diff --git a/examples/advanced/brachytherapy/src/BrachyFactory.cc b/examples/advanced/brachytherapy/src/BrachyFactory.cc index 8da2126428..0e681298f7 100644 --- a/examples/advanced/brachytherapy/src/BrachyFactory.cc +++ b/examples/advanced/brachytherapy/src/BrachyFactory.cc @@ -35,7 +35,7 @@ // ******************************* // // $Id: BrachyFactory.cc,v 1.7 2006/06/29 15:48:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Factory of brachytherapic sources // diff --git a/examples/advanced/brachytherapy/src/BrachyFactoryI.cc b/examples/advanced/brachytherapy/src/BrachyFactoryI.cc index 01b14ebe89..96b44eadee 100644 --- a/examples/advanced/brachytherapy/src/BrachyFactoryI.cc +++ b/examples/advanced/brachytherapy/src/BrachyFactoryI.cc @@ -33,7 +33,7 @@ // ******************************* // // $Id: BrachyFactoryI.cc,v 1.6 2006/06/29 15:48:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "BrachyFactoryI.hh" #include "BrachyPrimaryGeneratorActionI.hh" diff --git a/examples/advanced/brachytherapy/src/BrachyFactoryIr.cc b/examples/advanced/brachytherapy/src/BrachyFactoryIr.cc index 9cd5d93a47..4ec63e1029 100644 --- a/examples/advanced/brachytherapy/src/BrachyFactoryIr.cc +++ b/examples/advanced/brachytherapy/src/BrachyFactoryIr.cc @@ -33,7 +33,7 @@ // ******************************* // // $Id: BrachyFactoryIr.cc,v 1.6 2006/06/29 15:48:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "globals.hh" #include "BrachyFactoryIr.hh" diff --git a/examples/advanced/brachytherapy/src/BrachyFactoryLeipzig.cc b/examples/advanced/brachytherapy/src/BrachyFactoryLeipzig.cc index b27e7ac8c5..db9914b0b1 100644 --- a/examples/advanced/brachytherapy/src/BrachyFactoryLeipzig.cc +++ b/examples/advanced/brachytherapy/src/BrachyFactoryLeipzig.cc @@ -33,7 +33,7 @@ // ******************************* // // $Id: BrachyFactoryLeipzig.cc,v 1.6 2006/06/29 15:48:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "globals.hh" diff --git a/examples/advanced/brachytherapy/src/BrachyMaterial.cc b/examples/advanced/brachytherapy/src/BrachyMaterial.cc index ba7eee5e2a..caee1b940f 100644 --- a/examples/advanced/brachytherapy/src/BrachyMaterial.cc +++ b/examples/advanced/brachytherapy/src/BrachyMaterial.cc @@ -33,7 +33,7 @@ // ******************************* // // $Id: BrachyMaterial.cc,v 1.7 2006/06/29 15:48:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4MaterialPropertiesTable.hh" diff --git a/examples/advanced/brachytherapy/src/BrachyPhantomROGeometry.cc b/examples/advanced/brachytherapy/src/BrachyPhantomROGeometry.cc index c5bf3878c6..9b7e0d1cdb 100644 --- a/examples/advanced/brachytherapy/src/BrachyPhantomROGeometry.cc +++ b/examples/advanced/brachytherapy/src/BrachyPhantomROGeometry.cc @@ -34,7 +34,7 @@ // ************************************ // // $Id: BrachyPhantomROGeometry.cc,v 1.11 2006/06/29 15:48:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "BrachyPhantomROGeometry.hh" #include "BrachyDummySD.hh" diff --git a/examples/advanced/brachytherapy/src/BrachyPhantomSD.cc b/examples/advanced/brachytherapy/src/BrachyPhantomSD.cc index eed38956ab..7623ddc879 100644 --- a/examples/advanced/brachytherapy/src/BrachyPhantomSD.cc +++ b/examples/advanced/brachytherapy/src/BrachyPhantomSD.cc @@ -34,7 +34,7 @@ // ******************************** // // $Id: BrachyPhantomSD.cc,v 1.13 2006/06/29 15:48:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "BrachyPhantomSD.hh" #include "BrachyAnalysisManager.hh" diff --git a/examples/advanced/brachytherapy/src/BrachyPhysicsList.cc b/examples/advanced/brachytherapy/src/BrachyPhysicsList.cc index d5e2454e08..73db6934f0 100644 --- a/examples/advanced/brachytherapy/src/BrachyPhysicsList.cc +++ b/examples/advanced/brachytherapy/src/BrachyPhysicsList.cc @@ -27,37 +27,42 @@ // Code developed by: // S. Agostinelli, F. Foppiano, S. Garelli , M. Tropeano, S.Guatelli // +// Code review: MGP, 5 November 2006 (still to be completed) +// // ********************************** // * * // * BrachyPhysicsList.cc * // * * // ********************************** // -// $Id: BrachyPhysicsList.cc,v 1.12 2006/06/29 15:48:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: BrachyPhysicsList.cc,v 1.13 2006/11/15 10:02:17 guatelli Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "BrachyPhysicsList.hh" #include "G4ParticleDefinition.hh" -#include "G4ParticleWithCuts.hh" +#include "G4ProductionCutsTable.hh" #include "G4ProcessManager.hh" #include "G4ParticleTypes.hh" -#include "G4ParticleTable.hh" -#include "G4Material.hh" #include "G4UnitsTable.hh" #include "G4ios.hh" +#include "G4MultipleScattering.hh" +// gamma +#include "G4LowEnergyRayleigh.hh" +#include "G4LowEnergyPhotoElectric.hh" +#include "G4LowEnergyCompton.hh" +#include "G4LowEnergyGammaConversion.hh" +// e- +#include "G4LowEnergyIonisation.hh" +#include "G4LowEnergyBremsstrahlung.hh" +// e+ +#include "G4eIonisation.hh" +#include "G4eBremsstrahlung.hh" +#include "G4eplusAnnihilation.hh" BrachyPhysicsList::BrachyPhysicsList(): G4VUserPhysicsList() { - // The production threshold is fixed to 0.1 mm for all the particles - // Secondary particles with a range bigger than 0.1 mm - // are generated; otherwise their energy is considered deposited locally - defaultCutValue = 0.1*mm; - cutForGamma = defaultCutValue; - cutForElectron = defaultCutValue; - cutForPositron = defaultCutValue; - SetVerboseLevel(1); } @@ -78,9 +83,8 @@ void BrachyPhysicsList::ConstructParticle() void BrachyPhysicsList::ConstructBosons() { - // gamma + // photons G4Gamma::GammaDefinition(); - } void BrachyPhysicsList::ConstructLeptons() @@ -96,55 +100,43 @@ void BrachyPhysicsList::ConstructProcess() ConstructEM(); } -#include "G4MultipleScattering.hh" -// gamma -#include "G4LowEnergyRayleigh.hh" -#include "G4LowEnergyPhotoElectric.hh" -#include "G4LowEnergyCompton.hh" -#include "G4LowEnergyGammaConversion.hh" -// e- -#include "G4LowEnergyIonisation.hh" -#include "G4LowEnergyBremsstrahlung.hh" -// e+ -#include "G4eIonisation.hh" -#include "G4eBremsstrahlung.hh" -#include "G4eplusAnnihilation.hh" - void BrachyPhysicsList::ConstructEM() { theParticleIterator->reset(); while( (*theParticleIterator)() ){ - G4ParticleDefinition* particle = theParticleIterator -> value(); - G4ProcessManager* pmanager = particle -> GetProcessManager(); - G4String particleName = particle -> GetParticleName(); + G4ParticleDefinition* particle = theParticleIterator->value(); + G4ProcessManager* pmanager = particle->GetProcessManager(); + G4String particleName = particle->GetParticleName(); - //processes + // Processes if (particleName == "gamma") { - //gamma - pmanager -> AddDiscreteProcess(new G4LowEnergyRayleigh); - pmanager -> AddDiscreteProcess(new G4LowEnergyPhotoElectric); - pmanager -> AddDiscreteProcess(new G4LowEnergyCompton); - pmanager -> AddDiscreteProcess(new G4LowEnergyGammaConversion); + // Photon + pmanager->AddDiscreteProcess(new G4LowEnergyRayleigh); + pmanager->AddDiscreteProcess(new G4LowEnergyPhotoElectric); + pmanager->AddDiscreteProcess(new G4LowEnergyCompton); + pmanager->AddDiscreteProcess(new G4LowEnergyGammaConversion); } else if (particleName == "e-") { - //electron - loweIon = new G4LowEnergyIonisation("LowEnergyIoni"); - loweBrem = new G4LowEnergyBremsstrahlung("LowEnBrem"); - loweBrem -> SetAngularGenerator("tsai"); + // Electron + G4LowEnergyIonisation* loweIon = new G4LowEnergyIonisation("LowEnergyIoni"); + + G4LowEnergyBremsstrahlung* loweBrem = new G4LowEnergyBremsstrahlung("LowEnBrem"); + // Select the Bremsstrahlung angular distribution model (Tsai/2BN/2BS) + loweBrem->SetAngularGenerator("tsai"); - pmanager -> AddProcess(new G4MultipleScattering, -1, 1,1); - pmanager -> AddProcess(loweIon, -1, 2,2); - pmanager -> AddProcess(loweBrem, -1,-1,3); + pmanager->AddProcess(new G4MultipleScattering, -1, 1,1); + pmanager->AddProcess(loweIon, -1, 2,2); + pmanager->AddProcess(loweBrem, -1,-1,3); } else if (particleName == "e+") { - //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); + // 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); } } @@ -152,14 +144,26 @@ void BrachyPhysicsList::ConstructEM() void BrachyPhysicsList::SetCuts() { - if (verboseLevel >0){ - G4cout << "BrachyPhysicsList::SetCuts:"; - G4cout << "CutLength : " << G4BestUnit(defaultCutValue,"Length") << G4endl; - } + // The production threshold is fixed to 0.1 mm for all the particles + // Secondary particles with a range bigger than 0.1 mm + // are generated; otherwise their energy is considered deposited locally + + defaultCutValue = 0.1 * mm; + + const G4double cutForGamma = defaultCutValue; + const G4double cutForElectron = defaultCutValue; + const G4double cutForPositron = defaultCutValue; SetCutValue(cutForGamma, "gamma"); SetCutValue(cutForElectron, "e-"); SetCutValue(cutForPositron, "e+"); + + // Set the secondary production cut lower than 990. eV + // Very important for high precision of lowenergy processes at low energies + + G4double lowLimit = 250. * eV; + G4double highLimit = 100. * GeV; + G4ProductionCutsTable::GetProductionCutsTable()->SetEnergyRange(lowLimit, highLimit); if (verboseLevel>0) DumpCutValuesTable(); } diff --git a/examples/advanced/brachytherapy/src/BrachyPrimaryGeneratorAction.cc b/examples/advanced/brachytherapy/src/BrachyPrimaryGeneratorAction.cc index d17c08d7aa..865cee2b91 100644 --- a/examples/advanced/brachytherapy/src/BrachyPrimaryGeneratorAction.cc +++ b/examples/advanced/brachytherapy/src/BrachyPrimaryGeneratorAction.cc @@ -38,7 +38,7 @@ // ******************************************** // // $Id: BrachyPrimaryGeneratorAction.cc,v 1.18 2006/06/29 15:48:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "globals.hh" #include "BrachyPrimaryGeneratorAction.hh" diff --git a/examples/advanced/brachytherapy/src/BrachyPrimaryGeneratorActionI.cc b/examples/advanced/brachytherapy/src/BrachyPrimaryGeneratorActionI.cc index 8956a17ef7..a9a86adcd3 100644 --- a/examples/advanced/brachytherapy/src/BrachyPrimaryGeneratorActionI.cc +++ b/examples/advanced/brachytherapy/src/BrachyPrimaryGeneratorActionI.cc @@ -38,7 +38,7 @@ // ******************************************** // // $Id: BrachyPrimaryGeneratorActionI.cc,v 1.10 2006/06/29 15:48:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "BrachyPrimaryGeneratorActionI.hh" diff --git a/examples/advanced/brachytherapy/src/BrachyPrimaryGeneratorActionIr.cc b/examples/advanced/brachytherapy/src/BrachyPrimaryGeneratorActionIr.cc index f2cf990afa..70ecf00a7c 100644 --- a/examples/advanced/brachytherapy/src/BrachyPrimaryGeneratorActionIr.cc +++ b/examples/advanced/brachytherapy/src/BrachyPrimaryGeneratorActionIr.cc @@ -38,7 +38,7 @@ // ******************************************** // // $Id: BrachyPrimaryGeneratorActionIr.cc,v 1.11 2006/06/29 15:48:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "BrachyPrimaryGeneratorActionIr.hh" diff --git a/examples/advanced/brachytherapy/src/BrachyPrimaryGeneratorMessenger.cc b/examples/advanced/brachytherapy/src/BrachyPrimaryGeneratorMessenger.cc index f08a7147ca..0c88025e67 100644 --- a/examples/advanced/brachytherapy/src/BrachyPrimaryGeneratorMessenger.cc +++ b/examples/advanced/brachytherapy/src/BrachyPrimaryGeneratorMessenger.cc @@ -35,7 +35,7 @@ // // // $Id: BrachyPrimaryGeneratorMessenger.cc,v 1.3 2006/06/29 15:48:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/advanced/brachytherapy/src/BrachyRunAction.cc b/examples/advanced/brachytherapy/src/BrachyRunAction.cc index 51a76d093e..fb90cfa6c9 100644 --- a/examples/advanced/brachytherapy/src/BrachyRunAction.cc +++ b/examples/advanced/brachytherapy/src/BrachyRunAction.cc @@ -39,7 +39,7 @@ // ******************************* // // $Id: BrachyRunAction.cc,v 1.18 2006/06/29 15:48:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "BrachyRunAction.hh" diff --git a/examples/advanced/composite_calorimeter/GNUmakefile b/examples/advanced/composite_calorimeter/GNUmakefile index 34b71105cb..019702595a 100644 --- a/examples/advanced/composite_calorimeter/GNUmakefile +++ b/examples/advanced/composite_calorimeter/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.9 2003/12/04 11:20:34 gcosmo Exp $ +# $Id: GNUmakefile,v 1.10 2006/11/14 14:39:51 ribon Exp $ # -------------------------------------------------------------- # GNUmakefile for examples module. Gabriele Cosmo, 06/04/98. # -------------------------------------------------------------- @@ -13,8 +13,6 @@ endif include $(G4INSTALL)/config/architecture.gmk -include hadronic_lists.gmk - .PHONY: all all: lib bin diff --git a/examples/advanced/composite_calorimeter/History b/examples/advanced/composite_calorimeter/History index 94b55ecd8c..c7fb855439 100644 --- a/examples/advanced/composite_calorimeter/History +++ b/examples/advanced/composite_calorimeter/History @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -$Id: History,v 1.29 2005/12/08 16:07:43 ribon Exp $ +$Id: History,v 1.31 2006/11/14 14:39:51 ribon Exp $ ------------------------------------------------------------------- ========================================================= @@ -9,6 +9,13 @@ $Id: History,v 1.29 2005/12/08 16:07:43 ribon Exp $ Example History file --------------------- +14.11.2006 - A.Ribon (ccal-V08-01-01) +- Removed hadronic_lists.gmk after the inclusion of + Physics Lists in the Geant4 kernel. + +21.07.2006 - A.Ribon (ccal-V08-01-00) +- New hadronic_lists.gmk, consistent with lAr_calorimeter. + 08.12.2005 - A.Ribon (ccal-V07-01-01) - Migration to CLHEP namespace. diff --git a/examples/advanced/composite_calorimeter/README b/examples/advanced/composite_calorimeter/README index 85ebbd63a3..f7f7185334 100644 --- a/examples/advanced/composite_calorimeter/README +++ b/examples/advanced/composite_calorimeter/README @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -$Id: README,v 1.11 2004/05/18 14:57:48 ribon Exp $ +$Id: README,v 1.12 2006/07/25 11:02:56 gcosmo Exp $ ------------------------------------------------------------------- ========================================================= @@ -254,17 +254,6 @@ $Id: README,v 1.11 2004/05/18 14:57:48 ribon Exp $ more sophisticated (but slower) QGSC Physics List for the learning purposes of this example. - Please refer to the Web page: - - http://cmsdoc.cern.ch/~hpw/GHAD/HomePage/index.html - - for more information on these (and others) Physics Lists. - Please notice that, for the time being, some classes, which can be - downloaded from the above Web page, have to be included in the - include/ and src/ subdirectories of this example. However, hopefully - soon, these classes will be distributed with Geant4 and therefore their - explicit inclusion in the example will no longer be necessary. - 5. Particle Generator --------------------- diff --git a/examples/advanced/composite_calorimeter/hadronic_lists.gmk b/examples/advanced/composite_calorimeter/hadronic_lists.gmk deleted file mode 100644 index 5a8f48003a..0000000000 --- a/examples/advanced/composite_calorimeter/hadronic_lists.gmk +++ /dev/null @@ -1,60 +0,0 @@ -# $Id: hadronic_lists.gmk,v 1.6 2005/10/13 09:38:07 ribon Exp $ -# -------------------------------------------------------------- -# hadronic physics-lists setup -# -------------------------------------------------------------- - -ifndef G4LISTS_BASE - EXTRALIBS += -L$(G4LIB)/plists/$(G4SYSTEM) - G4LISTS_BASE = $(G4INSTALL)/physics_lists -else - EXTRALIBS += -L$(G4LISTS_BASE)/hadronic/plists/lib/$(G4SYSTEM) -endif - -# EXTRALIBS += -lFTFC -EXTRALIBS += -lFTFP -# EXTRALIBS += -lLBE -EXTRALIBS += -lLHEP -# EXTRALIBS += -lLHEP_GN -# EXTRALIBS += -lLHEP_HP -# EXTRALIBS += -lLHEP_LEAD -# EXTRALIBS += -lLHEP_BERT_HP -# EXTRALIBS += -lLHEP_BIC_HP -# EXTRALIBS += -lLHEP_LEAD_HP -# EXTRALIBS += -lLHEP_PRECO -# EXTRALIBS += -lQGSP_BERT -# EXTRALIBS += -lLHEP_PRECO_HP -EXTRALIBS += -lQGSC -# EXTRALIBS += -lQGSC_LEAD -# EXTRALIBS += -lQGSC_LEAD_HP -EXTRALIBS += -lQGSP -# EXTRALIBS += -lQGSP_GN -# EXTRALIBS += -lQGSP_HP -# EXTRALIBS += -lLHEP_BERT -# EXTRALIBS += -lLHEP_BIC -# EXTRALIBS += -lQGSP_BIC -EXTRALIBS += -lPackaging - -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/FTFC/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/FTFP/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/LBE/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/LHEP/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/LHEP_BERT/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/LHEP_BIC/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/LHEP_GN/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/LHEP_HP/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/LHEP_BERT_HP/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/LHEP_BIC_HP/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/LHEP_LEAD/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/LHEP_LEAD_HP/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/LHEP_PRECO/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/LHEP_PRECO_HP/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/Packaging/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/QGSC/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/QGSC_LEAD/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/QGSC_LEAD_HP/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/QGSP/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/QGSP_BERT/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/QGSP_BIC/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/QGSP_GN/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/QGSP_HP/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/QGSP_Model/include diff --git a/examples/advanced/composite_calorimeter/src/CCalEndOfEventAction.cc b/examples/advanced/composite_calorimeter/src/CCalEndOfEventAction.cc index 9dd2ceaa7e..1e1c928826 100644 --- a/examples/advanced/composite_calorimeter/src/CCalEndOfEventAction.cc +++ b/examples/advanced/composite_calorimeter/src/CCalEndOfEventAction.cc @@ -81,7 +81,7 @@ CCalEndOfEventAction::~CCalEndOfEventAction() { if (theOrg) delete theOrg; if (SDnames) - delete SDnames; + delete[] SDnames; G4cout << "CCalEndOfEventAction deleted" << G4endl; } diff --git a/examples/advanced/composite_calorimeter/src/CCalutils.cc b/examples/advanced/composite_calorimeter/src/CCalutils.cc index c88301458d..712f729c72 100644 --- a/examples/advanced/composite_calorimeter/src/CCalutils.cc +++ b/examples/advanced/composite_calorimeter/src/CCalutils.cc @@ -93,7 +93,8 @@ std::ostream& tab(std::ostream& os) { std::istream& jump(std::istream& is) { - char first, second; + char first = ' '; + char second = ' '; is.ignore(999,'\n'); do { is.get(first); diff --git a/examples/advanced/gammaray_telescope/GNUmakefile b/examples/advanced/gammaray_telescope/GNUmakefile index 4cb0326833..ec0c6eff6a 100644 --- a/examples/advanced/gammaray_telescope/GNUmakefile +++ b/examples/advanced/gammaray_telescope/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.23 2006/06/02 05:24:20 flongo Exp $ +# $Id: GNUmakefile,v 1.24 2006/11/17 15:49:35 flongo Exp $ # -------------------------------------------------------------- # GNUmakefile for examples module. Gabriele Cosmo, 06/04/98. # -------------------------------------------------------------- @@ -10,19 +10,12 @@ G4EXLIB := true ifndef G4INSTALL G4INSTALL = ../../.. endif -.PHONY: all -all: lib bin + +.PHONY: all +all: had_list lib bin + +had_list: + @echo "Gamma Ray Tel Advanced example" include $(G4INSTALL)/config/binmake.gmk -include hadronic_lists.gmk - -ifdef G4ANALYSIS_USE - CPPFLAGS += `aida-config --include` - LDFLAGS += `aida-config --lib` - LOADLIBS += `aida-config --lib` -endif - -ifdef G4STORE_DATA - CPPFLAGS += -DG4STORE_DATA -endif diff --git a/examples/advanced/gammaray_telescope/GammaRayTel.cc b/examples/advanced/gammaray_telescope/GammaRayTel.cc index efdf426e6f..ffa45a4ab5 100644 --- a/examples/advanced/gammaray_telescope/GammaRayTel.cc +++ b/examples/advanced/gammaray_telescope/GammaRayTel.cc @@ -25,7 +25,7 @@ // // // $Id: GammaRayTel.cc,v 1.16 2006/06/29 15:54:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelAnalysis.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelAnalysis.hh index cdf2c39fec..5b0cfbf1b1 100644 --- a/examples/advanced/gammaray_telescope/include/GammaRayTelAnalysis.hh +++ b/examples/advanced/gammaray_telescope/include/GammaRayTelAnalysis.hh @@ -26,7 +26,7 @@ #ifdef G4ANALYSIS_USE // // $Id: GammaRayTelAnalysis.hh,v 1.18 2006/06/29 15:54:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------ // GEANT 4 class header file // CERN Geneva Switzerland diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelAnalysisMessenger.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelAnalysisMessenger.hh index c7bb4fd405..854e66bfd6 100644 --- a/examples/advanced/gammaray_telescope/include/GammaRayTelAnalysisMessenger.hh +++ b/examples/advanced/gammaray_telescope/include/GammaRayTelAnalysisMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelAnalysisMessenger.hh,v 1.4 2006/06/29 15:54:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------ // GEANT 4 class header file diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelAnticoincidenceHit.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelAnticoincidenceHit.hh index 4ff6310ede..a5f031d179 100644 --- a/examples/advanced/gammaray_telescope/include/GammaRayTelAnticoincidenceHit.hh +++ b/examples/advanced/gammaray_telescope/include/GammaRayTelAnticoincidenceHit.hh @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelAnticoincidenceHit.hh,v 1.3 2006/06/29 15:54:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------ // GEANT 4 class header file // CERN Geneva Switzerland diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelAnticoincidenceSD.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelAnticoincidenceSD.hh index 636107a051..5f241b5d6b 100644 --- a/examples/advanced/gammaray_telescope/include/GammaRayTelAnticoincidenceSD.hh +++ b/examples/advanced/gammaray_telescope/include/GammaRayTelAnticoincidenceSD.hh @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelAnticoincidenceSD.hh,v 1.5 2006/06/29 15:55:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------ // GEANT 4 class header file // CERN Geneva Switzerland diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelCalorimeterHit.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelCalorimeterHit.hh index 1d93f75e69..066f340eab 100644 --- a/examples/advanced/gammaray_telescope/include/GammaRayTelCalorimeterHit.hh +++ b/examples/advanced/gammaray_telescope/include/GammaRayTelCalorimeterHit.hh @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelCalorimeterHit.hh,v 1.3 2006/06/29 15:55:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------ // GEANT 4 class header file // CERN Geneva Switzerland diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelCalorimeterSD.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelCalorimeterSD.hh index 0a1e7f749d..b47df36bf3 100644 --- a/examples/advanced/gammaray_telescope/include/GammaRayTelCalorimeterSD.hh +++ b/examples/advanced/gammaray_telescope/include/GammaRayTelCalorimeterSD.hh @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelCalorimeterSD.hh,v 1.5 2006/06/29 15:55:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------ // GEANT 4 class header file // CERN Geneva Switzerland diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelDetectorConstruction.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelDetectorConstruction.hh index 4ae2597c13..2b01c6f4b8 100644 --- a/examples/advanced/gammaray_telescope/include/GammaRayTelDetectorConstruction.hh +++ b/examples/advanced/gammaray_telescope/include/GammaRayTelDetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelDetectorConstruction.hh,v 1.10 2006/06/29 15:55:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------ // GEANT 4 class header file // CERN Geneva Switzerland diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelDetectorMessenger.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelDetectorMessenger.hh index ac45ef3ce4..de33eab940 100644 --- a/examples/advanced/gammaray_telescope/include/GammaRayTelDetectorMessenger.hh +++ b/examples/advanced/gammaray_telescope/include/GammaRayTelDetectorMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelDetectorMessenger.hh,v 1.4 2006/06/29 15:55:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------ // GEANT 4 class header file diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelDigi.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelDigi.hh index e499a1f0d3..251f674075 100644 --- a/examples/advanced/gammaray_telescope/include/GammaRayTelDigi.hh +++ b/examples/advanced/gammaray_telescope/include/GammaRayTelDigi.hh @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelDigi.hh,v 1.3 2006/06/29 15:55:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------ // GEANT 4 class header file // CERN Geneva Switzerland diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelDigitizer.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelDigitizer.hh index 6400f357fa..254025752d 100644 --- a/examples/advanced/gammaray_telescope/include/GammaRayTelDigitizer.hh +++ b/examples/advanced/gammaray_telescope/include/GammaRayTelDigitizer.hh @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelDigitizer.hh,v 1.4 2006/06/29 15:55:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------ // GEANT 4 class header file // CERN Geneva Switzerland diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelDigitizerMessenger.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelDigitizerMessenger.hh index d01bda121f..11f408c9fe 100644 --- a/examples/advanced/gammaray_telescope/include/GammaRayTelDigitizerMessenger.hh +++ b/examples/advanced/gammaray_telescope/include/GammaRayTelDigitizerMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelDigitizerMessenger.hh,v 1.2 2006/06/29 15:55:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelDummySD.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelDummySD.hh index bcda6e2883..2a83edd138 100644 --- a/examples/advanced/gammaray_telescope/include/GammaRayTelDummySD.hh +++ b/examples/advanced/gammaray_telescope/include/GammaRayTelDummySD.hh @@ -26,7 +26,7 @@ // // $Id: GammaRayTelDummySD.hh,v 1.6 2006/06/29 15:55:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------ // GEANT 4 class header file // CERN Geneva Switzerland diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelEMPhysics.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelEMPhysics.hh index f2be3af9ec..96f8687750 100644 --- a/examples/advanced/gammaray_telescope/include/GammaRayTelEMPhysics.hh +++ b/examples/advanced/gammaray_telescope/include/GammaRayTelEMPhysics.hh @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelEMPhysics.hh,v 1.2 2006/06/29 15:55:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelEventAction.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelEventAction.hh index 8c620eb8e4..851e18ba80 100644 --- a/examples/advanced/gammaray_telescope/include/GammaRayTelEventAction.hh +++ b/examples/advanced/gammaray_telescope/include/GammaRayTelEventAction.hh @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelEventAction.hh,v 1.10 2006/06/29 15:55:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------ // GEANT 4 class header file // CERN Geneva Switzerland diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelGeneralPhysics.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelGeneralPhysics.hh index 20eda786fd..70378f1134 100644 --- a/examples/advanced/gammaray_telescope/include/GammaRayTelGeneralPhysics.hh +++ b/examples/advanced/gammaray_telescope/include/GammaRayTelGeneralPhysics.hh @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelGeneralPhysics.hh,v 1.2 2006/06/29 15:55:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelHadronPhysics.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelHadronPhysics.hh index 9c4394ff16..cf325966ce 100644 --- a/examples/advanced/gammaray_telescope/include/GammaRayTelHadronPhysics.hh +++ b/examples/advanced/gammaray_telescope/include/GammaRayTelHadronPhysics.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: GammaRayTelHadronPhysics.hh,v 1.4 2006/06/29 15:55:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------ // GEANT 4 class header file diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelIonPhysics.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelIonPhysics.hh index 2b52f2402f..36c8cb8d71 100644 --- a/examples/advanced/gammaray_telescope/include/GammaRayTelIonPhysics.hh +++ b/examples/advanced/gammaray_telescope/include/GammaRayTelIonPhysics.hh @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelIonPhysics.hh,v 1.2 2006/06/29 15:55:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelMuonPhysics.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelMuonPhysics.hh index f23d0f9a7c..0db01a95e7 100644 --- a/examples/advanced/gammaray_telescope/include/GammaRayTelMuonPhysics.hh +++ b/examples/advanced/gammaray_telescope/include/GammaRayTelMuonPhysics.hh @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelMuonPhysics.hh,v 1.2 2006/06/29 15:55:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelPrimaryGeneratorAction.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelPrimaryGeneratorAction.hh index b68ec45a3c..1b904cdaf8 100644 --- a/examples/advanced/gammaray_telescope/include/GammaRayTelPrimaryGeneratorAction.hh +++ b/examples/advanced/gammaray_telescope/include/GammaRayTelPrimaryGeneratorAction.hh @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelPrimaryGeneratorAction.hh,v 1.8 2006/06/29 15:55:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------ // GEANT 4 class header file diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelPrimaryGeneratorMessenger.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelPrimaryGeneratorMessenger.hh index 686813f5f0..d17678c68d 100644 --- a/examples/advanced/gammaray_telescope/include/GammaRayTelPrimaryGeneratorMessenger.hh +++ b/examples/advanced/gammaray_telescope/include/GammaRayTelPrimaryGeneratorMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelPrimaryGeneratorMessenger.hh,v 1.5 2006/06/29 15:55:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelRunAction.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelRunAction.hh index 46eaf0b14d..9af8448837 100644 --- a/examples/advanced/gammaray_telescope/include/GammaRayTelRunAction.hh +++ b/examples/advanced/gammaray_telescope/include/GammaRayTelRunAction.hh @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelRunAction.hh,v 1.6 2006/06/29 15:55:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------ // GEANT 4 class header file // CERN Geneva Switzerland diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerHit.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerHit.hh index d43103f819..faf1979a63 100644 --- a/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerHit.hh +++ b/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerHit.hh @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelTrackerHit.hh,v 1.3 2006/06/29 15:55:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------ // GEANT 4 class header file // CERN Geneva Switzerland diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerROGeometry.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerROGeometry.hh index bb6d3b023f..16e24ba55c 100644 --- a/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerROGeometry.hh +++ b/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerROGeometry.hh @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelTrackerROGeometry.hh,v 1.5 2006/06/29 15:56:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------ // GEANT 4 class header file // CERN Geneva Switzerland diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerSD.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerSD.hh index bde99d3afc..8d6abbc7a6 100644 --- a/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerSD.hh +++ b/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerSD.hh @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelTrackerSD.hh,v 1.5 2006/06/29 15:56:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------ // GEANT 4 class header file // CERN Geneva Switzerland diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelAnalysis.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelAnalysis.cc index 180e236ebb..012befc58a 100644 --- a/examples/advanced/gammaray_telescope/src/GammaRayTelAnalysis.cc +++ b/examples/advanced/gammaray_telescope/src/GammaRayTelAnalysis.cc @@ -26,7 +26,7 @@ #ifdef G4ANALYSIS_USE // // $Id: GammaRayTelAnalysis.cc,v 1.21 2006/06/29 15:56:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------ // GEANT 4 class implementation file // CERN Geneva Switzerland diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelAnalysisMessenger.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelAnalysisMessenger.cc index 538e137bec..c2dd834a2c 100644 --- a/examples/advanced/gammaray_telescope/src/GammaRayTelAnalysisMessenger.cc +++ b/examples/advanced/gammaray_telescope/src/GammaRayTelAnalysisMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelAnalysisMessenger.cc,v 1.9 2006/06/29 15:56:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------ // GEANT 4 class implementation file diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelAnticoincidenceHit.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelAnticoincidenceHit.cc index c59f6de41f..e937ad3879 100644 --- a/examples/advanced/gammaray_telescope/src/GammaRayTelAnticoincidenceHit.cc +++ b/examples/advanced/gammaray_telescope/src/GammaRayTelAnticoincidenceHit.cc @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelAnticoincidenceHit.cc,v 1.4 2006/06/29 15:56:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------ // GEANT 4 class implementation file // CERN Geneva Switzerland diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelAnticoincidenceSD.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelAnticoincidenceSD.cc index cdaae0b1e2..86f412ff65 100644 --- a/examples/advanced/gammaray_telescope/src/GammaRayTelAnticoincidenceSD.cc +++ b/examples/advanced/gammaray_telescope/src/GammaRayTelAnticoincidenceSD.cc @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelAnticoincidenceSD.cc,v 1.6 2006/06/29 15:56:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------ // GEANT 4 class implementation file // CERN Geneva Switzerland diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelCalorimeterHit.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelCalorimeterHit.cc index 37fec21bec..66e30cfacf 100644 --- a/examples/advanced/gammaray_telescope/src/GammaRayTelCalorimeterHit.cc +++ b/examples/advanced/gammaray_telescope/src/GammaRayTelCalorimeterHit.cc @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelCalorimeterHit.cc,v 1.4 2006/06/29 15:56:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------ // GEANT 4 class implementation file // CERN Geneva Switzerland diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelCalorimeterSD.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelCalorimeterSD.cc index 62b8635541..fe027d0ae9 100644 --- a/examples/advanced/gammaray_telescope/src/GammaRayTelCalorimeterSD.cc +++ b/examples/advanced/gammaray_telescope/src/GammaRayTelCalorimeterSD.cc @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelCalorimeterSD.cc,v 1.7 2006/06/29 15:56:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------ // GEANT 4 class implementation file // CERN Geneva Switzerland diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelDetectorConstruction.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelDetectorConstruction.cc index 919db7ce20..c31ab248e7 100644 --- a/examples/advanced/gammaray_telescope/src/GammaRayTelDetectorConstruction.cc +++ b/examples/advanced/gammaray_telescope/src/GammaRayTelDetectorConstruction.cc @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelDetectorConstruction.cc,v 1.15 2006/06/29 15:56:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------ // GEANT 4 class implementation file // CERN Geneva Switzerland diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelDetectorMessenger.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelDetectorMessenger.cc index f2b211282f..cc9249cf6b 100644 --- a/examples/advanced/gammaray_telescope/src/GammaRayTelDetectorMessenger.cc +++ b/examples/advanced/gammaray_telescope/src/GammaRayTelDetectorMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelDetectorMessenger.cc,v 1.8 2006/06/29 15:56:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------ // GEANT 4 class implementation file diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelDigi.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelDigi.cc index 70920a745a..b3e9c796c7 100644 --- a/examples/advanced/gammaray_telescope/src/GammaRayTelDigi.cc +++ b/examples/advanced/gammaray_telescope/src/GammaRayTelDigi.cc @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelDigi.cc,v 1.5 2006/06/29 15:56:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------ // GEANT 4 class implementation file // CERN Geneva Switzerland diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelDigitizer.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelDigitizer.cc index a2335fa977..44aa164872 100644 --- a/examples/advanced/gammaray_telescope/src/GammaRayTelDigitizer.cc +++ b/examples/advanced/gammaray_telescope/src/GammaRayTelDigitizer.cc @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelDigitizer.cc,v 1.6 2006/06/29 15:56:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------ // GEANT 4 class implementation file // CERN Geneva Switzerland diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelDigitizerMessenger.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelDigitizerMessenger.cc index 2b48c054dc..b42284ce9f 100644 --- a/examples/advanced/gammaray_telescope/src/GammaRayTelDigitizerMessenger.cc +++ b/examples/advanced/gammaray_telescope/src/GammaRayTelDigitizerMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelDigitizerMessenger.cc,v 1.5 2006/06/29 15:56:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------ // GEANT 4 class implementation file // CERN Geneva Switzerland diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelEMPhysics.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelEMPhysics.cc index 287874aa38..363a9d19b6 100644 --- a/examples/advanced/gammaray_telescope/src/GammaRayTelEMPhysics.cc +++ b/examples/advanced/gammaray_telescope/src/GammaRayTelEMPhysics.cc @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelEMPhysics.cc,v 1.4 2006/06/29 15:56:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelEventAction.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelEventAction.cc index a0d22f156a..b8c22393b7 100644 --- a/examples/advanced/gammaray_telescope/src/GammaRayTelEventAction.cc +++ b/examples/advanced/gammaray_telescope/src/GammaRayTelEventAction.cc @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelEventAction.cc,v 1.19 2006/06/29 15:56:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------ // GEANT 4 class implementation file // CERN Geneva Switzerland diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelHadronPhysics.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelHadronPhysics.cc index 86cde69f8b..76d2935f86 100644 --- a/examples/advanced/gammaray_telescope/src/GammaRayTelHadronPhysics.cc +++ b/examples/advanced/gammaray_telescope/src/GammaRayTelHadronPhysics.cc @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelHadronPhysics.cc,v 1.4 2006/06/29 15:56:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "GammaRayTelHadronPhysics.hh" diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelIonPhysics.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelIonPhysics.cc index 2ab129928d..85d77c11a9 100644 --- a/examples/advanced/gammaray_telescope/src/GammaRayTelIonPhysics.cc +++ b/examples/advanced/gammaray_telescope/src/GammaRayTelIonPhysics.cc @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelIonPhysics.cc,v 1.4 2006/06/29 15:56:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelMuonPhysics.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelMuonPhysics.cc index 2dffa3c992..a840b08ee7 100644 --- a/examples/advanced/gammaray_telescope/src/GammaRayTelMuonPhysics.cc +++ b/examples/advanced/gammaray_telescope/src/GammaRayTelMuonPhysics.cc @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelMuonPhysics.cc,v 1.4 2006/06/29 15:56:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelPhysicsList.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelPhysicsList.cc index 45190ef922..cbd5e819f5 100644 --- a/examples/advanced/gammaray_telescope/src/GammaRayTelPhysicsList.cc +++ b/examples/advanced/gammaray_telescope/src/GammaRayTelPhysicsList.cc @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelPhysicsList.cc,v 1.7 2006/06/29 15:56:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelPrimaryGeneratorAction.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelPrimaryGeneratorAction.cc index 42369887c7..02f32e683d 100644 --- a/examples/advanced/gammaray_telescope/src/GammaRayTelPrimaryGeneratorAction.cc +++ b/examples/advanced/gammaray_telescope/src/GammaRayTelPrimaryGeneratorAction.cc @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelPrimaryGeneratorAction.cc,v 1.10 2006/06/29 15:56:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------ // GEANT 4 class implementation file // CERN Geneva Switzerland diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelPrimaryGeneratorMessenger.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelPrimaryGeneratorMessenger.cc index ba39e985c6..bce92b9dc0 100644 --- a/examples/advanced/gammaray_telescope/src/GammaRayTelPrimaryGeneratorMessenger.cc +++ b/examples/advanced/gammaray_telescope/src/GammaRayTelPrimaryGeneratorMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelPrimaryGeneratorMessenger.cc,v 1.8 2006/06/29 15:57:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------ // GEANT 4 class implementation file // CERN Geneva Switzerland diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelRunAction.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelRunAction.cc index bae29ce5f4..b35e9a9e75 100644 --- a/examples/advanced/gammaray_telescope/src/GammaRayTelRunAction.cc +++ b/examples/advanced/gammaray_telescope/src/GammaRayTelRunAction.cc @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelRunAction.cc,v 1.11 2006/06/29 15:57:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------ // GEANT 4 class implementation file // CERN Geneva Switzerland diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerHit.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerHit.cc index eb2465782f..7e9f3abac9 100644 --- a/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerHit.cc +++ b/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerHit.cc @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelTrackerHit.cc,v 1.4 2006/06/29 15:57:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------ // GEANT 4 class implementation file // CERN Geneva Switzerland diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerROGeometry.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerROGeometry.cc index 6f992fac14..7c2e386de8 100644 --- a/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerROGeometry.cc +++ b/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerROGeometry.cc @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelTrackerROGeometry.cc,v 1.6 2006/06/29 15:57:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerSD.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerSD.cc index a68f609130..cd4aacfdfd 100644 --- a/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerSD.cc +++ b/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerSD.cc @@ -25,7 +25,7 @@ // // // $Id: GammaRayTelTrackerSD.cc,v 1.9 2006/06/29 15:57:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------ // GEANT 4 class implementation file // CERN Geneva Switzerland diff --git a/examples/advanced/hadrontherapy/History b/examples/advanced/hadrontherapy/History index c5a12fd244..974cc1d2bd 100644 --- a/examples/advanced/hadrontherapy/History +++ b/examples/advanced/hadrontherapy/History @@ -3,11 +3,29 @@ $Id: History, v 1.6 2004/02/27 G.A.P. Cirrone ----------------------------------------------------------- ==================================================== - Geant4 - Hadrontherapy + Geant4 - Hadrontherapy ==================================================== Category History file --------------------- +16.11.2006 S. Guatelli (hadrontherapy-V08-01-05) + - Physics lists cleaned + +15.11.2006 G.A.P. Cirrone (hadrontherapy-V08-01-04) + - Changed cut and cut per region default values. Improved Max Step function + along the beam line. + +14.11.2006 J. Allison +- Removed /vis/scene/transientsAction none (no longer available). + + +02.10.2006 G.A.P. Cirrone and S. Guatelli(hadrontherapy-V08-01-03) + - Bug fix in the geometry (hadrontherapy beam line) + problem: wrong volume hierarchy + +24.07.2006 S. Guatelli (hadrontherapy-V08-01-00) + - Bug fix in the HadrontherapyProtonPrecompound.cc concerning + neutron fission and capture 30.05.2006 S. Guatelli (hadrontherapy-V08-00-04) - Bug deleted in all the hadronic phsyics lists; the hadronic diff --git a/examples/advanced/hadrontherapy/bertini.mac b/examples/advanced/hadrontherapy/bertini.mac index 40055533ce..59084cb37a 100644 --- a/examples/advanced/hadrontherapy/bertini.mac +++ b/examples/advanced/hadrontherapy/bertini.mac @@ -6,7 +6,7 @@ # - INELASTIC SCATTERING ---> # PRECOMPOUND PHYSICS LIST with THE DEFAULT EVAPORATION MODEL AND WITHOUT THE FERMI BREAK-UP # -# * BERTINI MODEL FOR PROTONS, +# * PRECOMPOUND + EVAPORATION (DEFAULT MODEL) NO FERMI BREAK-UP FOR PROTONS, # NEUTRONS AND PIONS # # * LEP MODEL UP TO 100 MEV AND BINARY ION MODEL BETWEEN 80 MEV AND 40. GEV @@ -32,7 +32,7 @@ /physics/addPhysics decay # SETTING FOR THE PARTICULAR HADRONIC MODEL -/physics/addPhysics bertini +/physics/addPhysics proton-bertini /run/initialize @@ -42,9 +42,12 @@ #/beamLine/RangeShifter/thickness 4 cm #/beamLine/RangeShifter/RSMat Water - -/vis/viewer/flush -/run/beamOn 1000 +/run/beamOn 500 + + + + + diff --git a/examples/advanced/hadrontherapy/binaryDefault.mac b/examples/advanced/hadrontherapy/binaryDefault.mac deleted file mode 100644 index c4bc974e66..0000000000 --- a/examples/advanced/hadrontherapy/binaryDefault.mac +++ /dev/null @@ -1,45 +0,0 @@ -#---------------------------------------------------------------------------- -# PHYSICS LIST: -# -# - LOW ENERGY ELECTROMAGNETIC PHYSICS -# - ELASTIC SCATTERING FOR ALL THE HADRONS AND IONS -# - INELASTIC SCATTERING ---> -# -# * BINARY CASCADE MODEL WITH THE DEFAULT PRECOMPOUND -# -# * LEP MODEL UP TO 100 MEV AND BINARY ION MODEL BETWEEN 80 MEV AND 40. GEV -# FOR DEUTERON, TRITON, HE3, ALPHA -# -# * FISSION AND HADRON CAPTURE FOR NEUTRONS BETWEEN 0. MEV AND 100. TEV -# -# -#------------------------------------------------------------------------------- - - -/control/verbose 1 -/tracking/verbose 0 -/run/verbose 0 -/event/verbose 0 -# SETTING FOR THE PHYSICS MODELS -/physics/addPhysics photon-epdl -/physics/addPhysics electron-eedl -/physics/addPhysics positron-standard -/physics/addPhysics ion-LowE -/physics/addPhysics proton-precompound-binary -/physics/addPhysics muon-standard -/physics/addPhysics decay -/run/initialize - -# IF YOU WANT A RANGE SHIFTER PLEASE CHANGE -# THE FOLLOWIG PARAMETERS -# SETTING FOR THE RANGE SHIFTER - -#/beamLine/RangeShifter/thickness 0 cm -#/beamLine/RangeShifter/RSMat Water -#/tracking/verbose 1 -/beam/energy/meanEnergy 25 MeV -/run/beamOn 100 - - - - diff --git a/examples/advanced/hadrontherapy/currentEvent.rndm b/examples/advanced/hadrontherapy/currentEvent.rndm index 93d43bb2fb..e2716e1a74 100644 --- a/examples/advanced/hadrontherapy/currentEvent.rndm +++ b/examples/advanced/hadrontherapy/currentEvent.rndm @@ -1,203 +1,203 @@ Uvec 2226355706 -1071703215 -2147483648 -1071384726 -2147483648 -1072034353 -2684354560 -1070570947 -0 -1071698880 +1072117611 1610612736 -1068998050 -0 -1070013228 -2147483648 -1072614208 -0 -1072635681 -536870912 -1071851394 -0 -1072685874 -536870912 -1072377448 -1610612736 -1070853780 -1073741824 -1069647016 -2147483648 -1070874471 -3221225472 -1067083504 -0 -1068625460 -0 -1072116142 -0 -1072495278 -536870912 -1071668168 -2147483648 -1068452266 -0 -1070896795 -2147483648 -1070768794 -0 -1071388582 -1073741824 -1071749431 +1072474390 3758096384 -1070298467 -0 -1071367454 -3221225472 -1071959766 -1073741824 -1070638935 -0 -1071867903 -1073741824 -1071611865 -0 -1071839277 -536870912 -1072662627 -0 -1071930492 -0 -1071555665 -1073741824 -1069013722 -0 -1072054667 -3221225472 -1070641352 -3221225472 -1069857933 -0 -1066470476 -0 -1071352944 -1073741824 -1071695989 -536870912 -1070793269 -0 -1071822457 -536870912 -1071967002 +1072056252 1610612736 -1068549642 +1071879239 0 -1071578742 -3221225472 -1069716552 -2147483648 -1071668383 -2684354560 -1070946140 -2147483648 -1072145389 -0 -1071658598 +1072292310 3758096384 -1072679907 +1071892397 3758096384 -1072083606 -2147483648 -1072137233 +1070833779 +1073741824 +1072568340 2684354560 -1066143112 -0 -1070850314 +1070627542 2147483648 -1068065164 -0 -1069720738 +1070211792 2147483648 -1072295888 -2684354560 -1072131427 -3758096384 -1071899044 +1072345802 1610612736 -1072079169 +1068850291 +0 +1071588201 +3221225472 +1071051474 +1073741824 +1071762151 +3221225472 +1071081728 +3221225472 +1072587532 +1073741824 +1070206898 +2147483648 +1071999392 +1610612736 +1068762358 +0 +1071327201 +2147483648 +1071534434 +3221225472 +1071063361 +3221225472 +1072269914 2684354560 -1071864209 +1071957532 536870912 -1068778056 +1069655588 0 -1070175791 +1069415718 0 -1072232850 -1073741824 -1070952822 -0 -1067725964 -0 -1071381321 -0 -1072229963 -1610612736 -1070475310 -0 -1072478700 -1610612736 -1068733037 -0 -1072341873 +1071408867 2147483648 -1071071539 -2147483648 -1071985410 -3758096384 -1072658241 -3221225472 -1071929349 -1073741824 -1071405470 +1069141981 0 -1071691832 -2684354560 -1071187435 -0 -1070891902 -2147483648 -1072080829 +1071899078 536870912 -1072413488 -3758096384 -1072232517 -1073741824 -1071157787 +1071753217 0 -1069928263 -2147483648 -1072465233 +1072448270 2684354560 -1071363092 +1071673783 2147483648 -1071953458 -2684354560 -1071939849 +1071212335 0 -1070403033 -0 -1067911822 -0 -1069506703 -0 -1071894475 +1071194310 3221225472 -1071879158 -1610612736 -1072225459 +1067850418 +0 +1072668722 2684354560 +1071418550 +1073741824 +1071374082 +3221225472 +1070629504 +3221225472 +1070456746 +0 +1071830657 +2684354560 +1072073430 +1073741824 +1072186161 +2684354560 +1071417969 +1073741824 +1072486452 +2684354560 +1071429109 +0 +1070391955 +2147483648 +1071801088 +2684354560 +1072506823 +3758096384 +1071967156 +1610612736 +1071876772 +2147483648 +1072265406 +0 +1071325579 +2147483648 +1071851021 +536870912 +1071981605 +2684354560 +1072265211 +1073741824 +1072293446 +2684354560 +1068355136 +0 +1070697330 +1073741824 +1072637171 +1073741824 +1071719676 +0 +1072343457 +1073741824 +1067937546 +0 +1071770664 +2147483648 +1068451014 +0 +1072084223 +1610612736 +1072402541 +1610612736 +1072393275 +0 +1071950375 +3221225472 +1071465126 +0 +1071604482 +1073741824 +1072248661 +0 +1072182419 +3221225472 +1070214037 +0 +1072294972 +3758096384 +1071581359 +1073741824 +1071596144 +0 +1072293255 +3758096384 +1069637560 +0 +1071098882 +2147483648 +1069172691 +0 +1071855760 +0 +1070550116 +0 +1071296702 +1073741824 +1072232776 +2147483648 +1070626446 +2147483648 +1070174602 +2147483648 +1071571772 +1073741824 +1071765798 +2684354560 +1072310981 +3758096384 +1068567187 +0 +1070283848 +2147483648 +1071233108 +0 +1072552408 +2684354560 +1071308624 +1073741824 +1072003335 +3758096384 +1070825712 +0 1071461100 1073741824 1072693247 2684354560 -39 +70 diff --git a/examples/advanced/hadrontherapy/defaultMacro.mac b/examples/advanced/hadrontherapy/defaultMacro.mac index 4130587038..f5e1f925e6 100644 --- a/examples/advanced/hadrontherapy/defaultMacro.mac +++ b/examples/advanced/hadrontherapy/defaultMacro.mac @@ -50,7 +50,6 @@ /tracking/storeTrajectory 1 /vis/scene/endOfEventAction accumulate /vis/viewer/update -/vis/scene/transientsAction none /run/beamOn 100 diff --git a/examples/advanced/hadrontherapy/include/HadrontherapyBeamLine.hh b/examples/advanced/hadrontherapy/include/HadrontherapyBeamLine.hh index 559d95827e..b56f999c93 100644 --- a/examples/advanced/hadrontherapy/include/HadrontherapyBeamLine.hh +++ b/examples/advanced/hadrontherapy/include/HadrontherapyBeamLine.hh @@ -137,6 +137,8 @@ private: G4VPhysicalVolume* physiThirdMonitorLayer3; G4VPhysicalVolume* physiThirdMonitorLayer4; G4VPhysicalVolume* physiNozzleSupport; +G4VPhysicalVolume* physiHoleNozzle; + G4VPhysicalVolume* physiHoleNozzleSupport; G4VPhysicalVolume* physiSecondHoleNozzleSupport; G4Tubs* solidFinalCollimator; diff --git a/examples/advanced/hadrontherapy/include/HadrontherapyDetectorConstruction.hh b/examples/advanced/hadrontherapy/include/HadrontherapyDetectorConstruction.hh index 802222382b..d58c6d6997 100644 --- a/examples/advanced/hadrontherapy/include/HadrontherapyDetectorConstruction.hh +++ b/examples/advanced/hadrontherapy/include/HadrontherapyDetectorConstruction.hh @@ -109,7 +109,7 @@ public: // This method allows to change the material // of the range shifter through UI command. - void ComputeVoxelSize() {phantomSizeX/numberOfVoxelsAlongX;} + G4double ComputeVoxelSize() {return phantomSizeX/numberOfVoxelsAlongX;}; // Returns the size of the voxel along the X axis private: diff --git a/examples/advanced/hadrontherapy/include/HadrontherapyProtonBertini.hh b/examples/advanced/hadrontherapy/include/HadrontherapyProtonBertini.hh index bea4e779d8..af55549561 100644 --- a/examples/advanced/hadrontherapy/include/HadrontherapyProtonBertini.hh +++ b/examples/advanced/hadrontherapy/include/HadrontherapyProtonBertini.hh @@ -23,7 +23,7 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadrontherapyProtonBertini.hh; May 2005 +// $Id: HadrontherapyProtonBertiniElastic.hh; May 2005 // ---------------------------------------------------------------------------- // GEANT 4 - Hadrontherapy example // ---------------------------------------------------------------------------- @@ -42,48 +42,11 @@ #include "G4VPhysicsConstructor.hh" #include "globals.hh" - -#include "G4HadronElasticProcess.hh" -#include "G4HadronFissionProcess.hh" -#include "G4HadronCaptureProcess.hh" -#include "G4ProtonInelasticProcess.hh" - -#include "G4ProcessManager.hh" - -#include "G4ExcitationHandler.hh" -#include "G4PreCompoundModel.hh" - #include "G4ProtonInelasticCrossSection.hh" -#include "G4TheoFSGenerator.hh" -#include "G4ExcitationHandler.hh" -#include "G4PreCompoundModel.hh" -#include "G4ExcitedStringDecay.hh" -// For neutron -#include "G4HENeutronInelastic.hh" -#include "G4LENeutronInelastic.hh" -#include "G4LFission.hh" -#include "G4LCapture.hh" -#include "G4NeutronInelasticProcess.hh" #include "G4NeutronInelasticCrossSection.hh" -#include "G4HadronFissionProcess.hh" -#include "G4HadronCaptureProcess.hh" -#include "G4NeutronHPElastic.hh" -#include "G4NeutronHPElasticData.hh" -#include "G4NeutronHPInelastic.hh" -#include "G4NeutronHPInelasticData.hh" -// For ions -#include "G4TripathiCrossSection.hh" -#include "G4IonsShenCrossSection.hh" -#include "G4HadronInelasticProcess.hh" -#include "G4BinaryLightIonReaction.hh" -//#include "G4BinaryCascade.hh" -#include "G4IonInelasticProcess.hh" -#include "G4LEDeuteronInelastic.hh" #include "G4DeuteronInelasticProcess.hh" #include "G4TritonInelasticProcess.hh" -#include "G4LETritonInelastic.hh" #include "G4AlphaInelasticProcess.hh" -#include "G4LEAlphaInelastic.hh" class HadrontherapyProtonBertini: public G4VPhysicsConstructor { @@ -96,41 +59,12 @@ class HadrontherapyProtonBertini: public G4VPhysicsConstructor void ConstructParticle(){}; void ConstructProcess(); - private: - G4double binaryLightIonLowLimit; - G4double binaryLightIonHighLimit; - G4double LEPHighLimit; - G4double bertiniLowLimit; - G4double bertiniHighLimit; - G4double neutronLowLimit; - G4double neutronHighLimit; - - - G4ExcitationHandler theHandler; - - - // Proton inelastic proces - G4ProtonInelasticProcess theIPProton; - // Cross Section for proton inelastic process - G4ProtonInelasticCrossSection thePXSec; - - // Neutron inelastic process - G4NeutronInelasticProcess theIPNeutron; - // Cross Section for neutron inelastic process - G4NeutronInelasticCrossSection theNXSec; - - // Deuteron inelastic process - G4DeuteronInelasticProcess theIPdeuteron; - - // Tritium inelastic process - G4TritonInelasticProcess theIPtriton; - - // Alpha inelastic process - G4AlphaInelasticProcess theIPalpha; - - // He3 inelastic process - G4HadronInelasticProcess* theIPHe3; - +private: + G4ProtonInelasticCrossSection theProtonCrossSection; + G4NeutronInelasticCrossSection theNeutronCrossSection; + G4DeuteronInelasticProcess theDeuteronInelasticProcess; + G4TritonInelasticProcess theTritonInelasticProcess; + G4AlphaInelasticProcess theAlphaInelasticProcess; }; #endif diff --git a/examples/advanced/hadrontherapy/include/HadrontherapyProtonBinary.hh b/examples/advanced/hadrontherapy/include/HadrontherapyProtonBinary.hh deleted file mode 100644 index a3ede750e8..0000000000 --- a/examples/advanced/hadrontherapy/include/HadrontherapyProtonBinary.hh +++ /dev/null @@ -1,132 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// $Id: HadrontherapyProtonBinary.hh; May 2005 -// ---------------------------------------------------------------------------- -// GEANT 4 - Hadrontherapy example -// ---------------------------------------------------------------------------- -// Code developed by: -// -// G.A.P. Cirrone(a)*, F. Di Rosa(a), S. Guatelli(b), G. Russo(a) -// -// (a) Laboratori Nazionali del Sud -// of the National Institute for Nuclear Physics, Catania, Italy -// (b) National Institute for Nuclear Physics Section of Genova, genova, Italy -// -// * cirrone@lns.infn.it -// ---------------------------------------------------------------------------- -#ifndef HadrontherapyProtonBinary_h -#define HadrontherapyProtonBinary_h 1 - -#include "G4VPhysicsConstructor.hh" -#include "globals.hh" - -#include "G4HadronElasticProcess.hh" -#include "G4HadronFissionProcess.hh" -#include "G4HadronCaptureProcess.hh" -#include "G4ProtonInelasticProcess.hh" - -#include "G4ProcessManager.hh" - -#include "G4ExcitationHandler.hh" -#include "G4PreCompoundModel.hh" - -#include "G4ProtonInelasticCrossSection.hh" -#include "G4TheoFSGenerator.hh" -#include "G4ExcitationHandler.hh" -#include "G4PreCompoundModel.hh" -#include "G4ExcitedStringDecay.hh" -// For neutron -#include "G4HENeutronInelastic.hh" -#include "G4LENeutronInelastic.hh" -#include "G4LFission.hh" -#include "G4LCapture.hh" -#include "G4NeutronInelasticProcess.hh" -#include "G4NeutronInelasticCrossSection.hh" -#include "G4HadronFissionProcess.hh" -#include "G4HadronCaptureProcess.hh" -#include "G4NeutronHPElastic.hh" -#include "G4NeutronHPElasticData.hh" -#include "G4NeutronHPInelastic.hh" -#include "G4NeutronHPInelasticData.hh" -// For ions -#include "G4TripathiCrossSection.hh" -#include "G4IonsShenCrossSection.hh" -#include "G4HadronInelasticProcess.hh" -#include "G4BinaryLightIonReaction.hh" -#include "G4BinaryCascade.hh" -#include "G4IonInelasticProcess.hh" -#include "G4LEDeuteronInelastic.hh" -#include "G4DeuteronInelasticProcess.hh" -#include "G4TritonInelasticProcess.hh" -#include "G4LETritonInelastic.hh" -#include "G4AlphaInelasticProcess.hh" -#include "G4LEAlphaInelastic.hh" - -class HadrontherapyProtonBinary: public G4VPhysicsConstructor -{ - public: - HadrontherapyProtonBinary(const G4String& name = "proton-precompound-binary"); - virtual ~HadrontherapyProtonBinary(); - - protected: - // Construct particle and physics - void ConstructParticle(){}; - void ConstructProcess(); - - private: - - G4double binaryLightIonLowLimit; - G4double binaryLightIonHighLimit; - G4double LEPHighLimit; - G4double precompoundLowLimit; - G4double precompoundHighLimit; - G4double binaryLowLimit; - G4double binaryHighLimit; - G4double neutronLowLimit; - G4double neutronHighLimit; - - G4ProtonInelasticCrossSection theXSec; - G4ExcitationHandler theHandler; - G4DeuteronInelasticProcess theIPdeuteron; - G4TritonInelasticProcess theIPtriton; - G4AlphaInelasticProcess theIPalpha; - G4HadronInelasticProcess* theIPHe3; - G4HadronInelasticProcess* theIPIonC12; - G4HadronInelasticProcess* theIPGenericIon; - G4ProtonInelasticCrossSection thePXSec; - G4ProtonInelasticProcess theIPProton; - G4NeutronInelasticProcess theIPNeutron; - G4NeutronInelasticCrossSection theNXSec; -}; -#endif - - - - - - - - diff --git a/examples/advanced/hadrontherapy/include/HadrontherapyProtonPrecompound.hh b/examples/advanced/hadrontherapy/include/HadrontherapyProtonPrecompound.hh index df062b6c8b..8653332093 100644 --- a/examples/advanced/hadrontherapy/include/HadrontherapyProtonPrecompound.hh +++ b/examples/advanced/hadrontherapy/include/HadrontherapyProtonPrecompound.hh @@ -32,107 +32,45 @@ // G.A.P. Cirrone(a)*, F. Di Rosa(a), S. Guatelli(b), G. Russo(a) // // (a) Laboratori Nazionali del Sud -// of the INFN, Catania, Italy -// (b) INFN Section of Genova, Genova, Italy +// of the National Institute for Nuclear Physics, Catania, Italy +// (b) National Institute for Nuclear Physics Section of Genova, genova, Italy // // * cirrone@lns.infn.it // ---------------------------------------------------------------------------- - #ifndef HadrontherapyProtonPrecompound_h #define HadrontherapyProtonPrecompound_h 1 -#include "G4VPhysicsConstructor.hh" -#include "G4ExcitationHandler.hh" #include "G4VPhysicsConstructor.hh" #include "globals.hh" - -#include "G4HadronElasticProcess.hh" -#include "G4HadronFissionProcess.hh" -#include "G4HadronCaptureProcess.hh" -#include "G4ProtonInelasticProcess.hh" -#include "G4ProcessManager.hh" -#include "G4PreCompoundModel.hh" #include "G4ProtonInelasticCrossSection.hh" -#include "G4TheoFSGenerator.hh" -#include "G4ExcitationHandler.hh" -#include "G4PreCompoundModel.hh" -#include "G4GeneratorPrecompoundInterface.hh" -#include "G4ExcitedStringDecay.hh" -// For neutron -#include "G4HENeutronInelastic.hh" -#include "G4LENeutronInelastic.hh" -#include "G4LFission.hh" -#include "G4LCapture.hh" -#include "G4NeutronInelasticProcess.hh" #include "G4NeutronInelasticCrossSection.hh" -#include "G4HadronFissionProcess.hh" -#include "G4HadronCaptureProcess.hh" -#include "G4NeutronHPElastic.hh" -#include "G4NeutronHPElasticData.hh" -#include "G4NeutronHPInelastic.hh" -#include "G4NeutronHPInelasticData.hh" -// For ions -#include "G4TripathiCrossSection.hh" -#include "G4IonsShenCrossSection.hh" -#include "G4HadronInelasticProcess.hh" -#include "G4BinaryLightIonReaction.hh" -#include "G4BinaryCascade.hh" -#include "G4IonInelasticProcess.hh" -#include "G4LEDeuteronInelastic.hh" +#include "G4ProtonInelasticProcess.hh" +#include "G4NeutronInelasticProcess.hh" #include "G4DeuteronInelasticProcess.hh" #include "G4TritonInelasticProcess.hh" -#include "G4LETritonInelastic.hh" #include "G4AlphaInelasticProcess.hh" -#include "G4LEAlphaInelastic.hh" -#include "G4PionPlusInelasticProcess.hh" -#include "G4PionMinusInelasticProcess.hh" -#include "G4PiNuclearCrossSection.hh" - -class G4HadronInelasticProcess; +#include "G4ExcitationHandler.hh" class HadrontherapyProtonPrecompound: public G4VPhysicsConstructor { -public: - HadrontherapyProtonPrecompound(const G4String& name = "proton-precompound"); - virtual ~HadrontherapyProtonPrecompound(); + public: + HadrontherapyProtonPrecompound(const G4String& name = "proton-precompound"); + virtual ~HadrontherapyProtonPrecompound(); -protected: - // Construct particle and physics - void ConstructParticle(){}; - void ConstructProcess(); + protected: + // Construct particle and physics + void ConstructParticle(){}; + void ConstructProcess(); private: - - G4double binaryLightIonLowLimit; - G4double binaryLightIonHighLimit; - G4double LEPHighLimit; - G4double precompoundLowLimit; - G4double precompoundHighLimit; - G4double neutronLowLimit; - G4double neutronHighLimit; - - - G4ExcitationHandler theHandler; - - - // Proton inelastic proces - G4ProtonInelasticProcess protonInelasticProcess; - // Cross Section for proton inelastic process - G4ProtonInelasticCrossSection protonInelasticCrossSection; - - // Neutron inelastic process - G4NeutronInelasticProcess neutronInelasticProcess; - // Cross Section for neutron inelastic process + G4ExcitationHandler theHandler; + G4ProtonInelasticProcess protonInelasticProcess; + G4ProtonInelasticCrossSection protonInelasticCrossSection; + G4NeutronInelasticProcess neutronInelasticProcess; G4NeutronInelasticCrossSection neutronInelasticCrossSection; - - // Deuteron inelastic process - G4DeuteronInelasticProcess deuteronInelasticProcess; - - // Tritium inelastic process - G4TritonInelasticProcess tritonInelasticProcess; - - // Alpha inelastic process - G4AlphaInelasticProcess alphaInelasticProcess; + G4DeuteronInelasticProcess deuteronInelasticProcess; + G4TritonInelasticProcess tritonInelasticProcess; + G4AlphaInelasticProcess alphaInelasticProcess; }; #endif diff --git a/examples/advanced/hadrontherapy/include/HadrontherapyProtonPrecompoundFermi.hh b/examples/advanced/hadrontherapy/include/HadrontherapyProtonPrecompoundFermi.hh deleted file mode 100644 index 95ffd61aa1..0000000000 --- a/examples/advanced/hadrontherapy/include/HadrontherapyProtonPrecompoundFermi.hh +++ /dev/null @@ -1,146 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// $Id: HadrontherapyProtonPrecompoundFermi.hh; May 2005 -// ---------------------------------------------------------------------------- -// GEANT 4 - Hadrontherapy example -// ---------------------------------------------------------------------------- -// Code developed by: -// -// G.A.P. Cirrone(a)*, F. Di Rosa(a), S. Guatelli(b), G. Russo(a) -// -// (a) Laboratori Nazionali del Sud -// of the National Institute for Nuclear Physics, Catania, Italy -// (b) National Institute for Nuclear Physics Section of Genova, genova, Italy -// -// * cirrone@lns.infn.it -// ---------------------------------------------------------------------------- -#ifndef HadrontherapyProtonPrecompoundFermi_h -#define HadrontherapyProtonPrecompoundFermi_h 1 - -#include "G4VPhysicsConstructor.hh" -#include "globals.hh" - -#include "G4HadronElasticProcess.hh" -#include "G4HadronFissionProcess.hh" -#include "G4HadronCaptureProcess.hh" -#include "G4ProtonInelasticProcess.hh" - -#include "G4ProcessManager.hh" - -#include "G4ExcitationHandler.hh" -#include "G4PreCompoundModel.hh" - -#include "G4ProtonInelasticCrossSection.hh" -#include "G4TheoFSGenerator.hh" -#include "G4ExcitationHandler.hh" -#include "G4PreCompoundModel.hh" -#include "G4GeneratorPrecompoundInterface.hh" -#include "G4ExcitedStringDecay.hh" -// For neutron -#include "G4HENeutronInelastic.hh" -#include "G4LENeutronInelastic.hh" -#include "G4LFission.hh" -#include "G4LCapture.hh" -#include "G4NeutronInelasticProcess.hh" -#include "G4NeutronInelasticCrossSection.hh" -#include "G4HadronFissionProcess.hh" -#include "G4HadronCaptureProcess.hh" -#include "G4NeutronHPElastic.hh" -#include "G4NeutronHPElasticData.hh" -#include "G4NeutronHPInelastic.hh" -#include "G4NeutronHPInelasticData.hh" -// For ions -#include "G4TripathiCrossSection.hh" -#include "G4IonsShenCrossSection.hh" -#include "G4HadronInelasticProcess.hh" -#include "G4BinaryLightIonReaction.hh" -#include "G4BinaryCascade.hh" -#include "G4IonInelasticProcess.hh" -#include "G4LEDeuteronInelastic.hh" -#include "G4DeuteronInelasticProcess.hh" -#include "G4TritonInelasticProcess.hh" -#include "G4LETritonInelastic.hh" -#include "G4AlphaInelasticProcess.hh" -#include "G4LEAlphaInelastic.hh" -#include "G4PiNuclearCrossSection.hh" -class HadrontherapyProtonPrecompoundFermi: public G4VPhysicsConstructor -{ - public: - HadrontherapyProtonPrecompoundFermi(const G4String& name = "proton-precompoundFermi"); - virtual ~HadrontherapyProtonPrecompoundFermi(); - - protected: - // Construct particle and physics - void ConstructParticle(){}; - void ConstructProcess(); - - private: - - G4double binaryLightIonLowLimit; - G4double binaryLightIonHighLimit; - G4double LEPHighLimit; - G4double precompoundLowLimit; - G4double precompoundHighLimit; - G4double neutronLowLimit; - G4double neutronHighLimit; - G4int targetA; - G4int targetZ; - - G4ExcitationHandler theHandler; - - - // Proton inelastic proces - G4ProtonInelasticProcess theIPProton; - // Cross Section for proton inelastic process - G4ProtonInelasticCrossSection thePXSec; - - // Neutron inelastic process - G4NeutronInelasticProcess theIPNeutron; - // Cross Section for neutron inelastic process - G4NeutronInelasticCrossSection theNXSec; - - // Deuteron inelastic process - G4DeuteronInelasticProcess theIPdeuteron; - - // Tritium inelastic process - G4TritonInelasticProcess theIPtriton; - - // Alpha inelastic process - G4AlphaInelasticProcess theIPalpha; - - // He3 inelastic process - G4HadronInelasticProcess* theIPHe3; - -}; -#endif - - - - - - - - diff --git a/examples/advanced/hadrontherapy/include/HadrontherapyProtonPrecompoundGEM.hh b/examples/advanced/hadrontherapy/include/HadrontherapyProtonPrecompoundGEM.hh deleted file mode 100644 index c2d0ff6382..0000000000 --- a/examples/advanced/hadrontherapy/include/HadrontherapyProtonPrecompoundGEM.hh +++ /dev/null @@ -1,143 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// $Id: HadrontherapyProtonPrecompoundGEM.hh; May 2005 -// ---------------------------------------------------------------------------- -// GEANT 4 - Hadrontherapy example -// ---------------------------------------------------------------------------- -// Code developed by: -// -// G.A.P. Cirrone(a)*, F. Di Rosa(a), S. Guatelli(b), G. Russo(a) -// -// (a) Laboratori Nazionali del Sud -// of the National Institute for Nuclear Physics, Catania, Italy -// (b) National Institute for Nuclear Physics Section of Genova, genova, Italy -// -// * cirrone@lns.infn.it -// ---------------------------------------------------------------------------- -#ifndef HadrontherapyProtonPrecompoundGEM_h -#define HadrontherapyProtonPrecompoundGEM_h 1 - -#include "G4VPhysicsConstructor.hh" -#include "globals.hh" - -#include "G4HadronElasticProcess.hh" -#include "G4HadronFissionProcess.hh" -#include "G4HadronCaptureProcess.hh" -#include "G4ProtonInelasticProcess.hh" - -#include "G4ProcessManager.hh" - -#include "G4ExcitationHandler.hh" -#include "G4PreCompoundModel.hh" - -#include "G4ProtonInelasticCrossSection.hh" -#include "G4TheoFSGenerator.hh" -#include "G4ExcitationHandler.hh" -#include "G4PreCompoundModel.hh" -#include "G4GeneratorPrecompoundInterface.hh" -#include "G4ExcitedStringDecay.hh" -// For neutron -#include "G4HENeutronInelastic.hh" -#include "G4LENeutronInelastic.hh" -#include "G4LFission.hh" -#include "G4LCapture.hh" -#include "G4NeutronInelasticProcess.hh" -#include "G4NeutronInelasticCrossSection.hh" -#include "G4HadronFissionProcess.hh" -#include "G4HadronCaptureProcess.hh" -#include "G4NeutronHPElastic.hh" -#include "G4NeutronHPElasticData.hh" -#include "G4NeutronHPInelastic.hh" -#include "G4NeutronHPInelasticData.hh" -// For ions -#include "G4TripathiCrossSection.hh" -#include "G4IonsShenCrossSection.hh" -#include "G4HadronInelasticProcess.hh" -#include "G4BinaryLightIonReaction.hh" -#include "G4BinaryCascade.hh" -#include "G4IonInelasticProcess.hh" -#include "G4LEDeuteronInelastic.hh" -#include "G4DeuteronInelasticProcess.hh" -#include "G4TritonInelasticProcess.hh" -#include "G4LETritonInelastic.hh" -#include "G4AlphaInelasticProcess.hh" -#include "G4LEAlphaInelastic.hh" - -class HadrontherapyProtonPrecompoundGEM: public G4VPhysicsConstructor -{ - public: - HadrontherapyProtonPrecompoundGEM(const G4String& name = "proton-precompoundGEM"); - virtual ~HadrontherapyProtonPrecompoundGEM(); - - protected: - // Construct particle and physics - void ConstructParticle(){}; - void ConstructProcess(); - - private: - - G4double binaryLightIonLowLimit; - G4double binaryLightIonHighLimit; - G4double LEPHighLimit; - G4double precompoundLowLimit; - G4double precompoundHighLimit; - G4double neutronLowLimit; - G4double neutronHighLimit; - - G4ExcitationHandler theHandler; - - - // Proton inelastic proces - G4ProtonInelasticProcess theIPProton; - // Cross Section for proton inelastic process - G4ProtonInelasticCrossSection thePXSec; - - // Neutron inelastic process - G4NeutronInelasticProcess theIPNeutron; - // Cross Section for neutron inelastic process - G4NeutronInelasticCrossSection theNXSec; - - // Deuteron inelastic process - G4DeuteronInelasticProcess theIPdeuteron; - - // Tritium inelastic process - G4TritonInelasticProcess theIPtriton; - - // Alpha inelastic process - G4AlphaInelasticProcess theIPalpha; - - // He3 inelastic process - G4HadronInelasticProcess* theIPHe3; -}; -#endif - - - - - - - - diff --git a/examples/advanced/hadrontherapy/include/HadrontherapyProtonPrecompoundGEMFermi.hh b/examples/advanced/hadrontherapy/include/HadrontherapyProtonPrecompoundGEMFermi.hh deleted file mode 100644 index d4b5b64017..0000000000 --- a/examples/advanced/hadrontherapy/include/HadrontherapyProtonPrecompoundGEMFermi.hh +++ /dev/null @@ -1,145 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// $Id: HadrontherapyProtonPrecompoundGEMFermi.hh; May 2005 -// ---------------------------------------------------------------------------- -// GEANT 4 - Hadrontherapy example -// ---------------------------------------------------------------------------- -// Code developed by: -// -// G.A.P. Cirrone(a)*, F. Di Rosa(a), S. Guatelli(b), G. Russo(a) -// -// (a) Laboratori Nazionali del Sud -// of the National Institute for Nuclear Physics, Catania, Italy -// (b) National Institute for Nuclear Physics Section of Genova, genova, Italy -// -// * cirrone@lns.infn.it -// ---------------------------------------------------------------------------- -#ifndef HadrontherapyProtonPrecompoundGEMFermi_h -#define HadrontherapyProtonPrecompoundGEMFermi_h 1 - -#include "G4VPhysicsConstructor.hh" -#include "globals.hh" - -#include "G4HadronElasticProcess.hh" -#include "G4HadronFissionProcess.hh" -#include "G4HadronCaptureProcess.hh" -#include "G4ProtonInelasticProcess.hh" - -#include "G4ProcessManager.hh" - -#include "G4ExcitationHandler.hh" -#include "G4PreCompoundModel.hh" - -#include "G4ProtonInelasticCrossSection.hh" -#include "G4TheoFSGenerator.hh" -#include "G4ExcitationHandler.hh" -#include "G4PreCompoundModel.hh" -#include "G4GeneratorPrecompoundInterface.hh" -#include "G4ExcitedStringDecay.hh" -// For neutron -#include "G4HENeutronInelastic.hh" -#include "G4LENeutronInelastic.hh" -#include "G4LFission.hh" -#include "G4LCapture.hh" -#include "G4NeutronInelasticProcess.hh" -#include "G4NeutronInelasticCrossSection.hh" -#include "G4HadronFissionProcess.hh" -#include "G4HadronCaptureProcess.hh" -#include "G4NeutronHPElastic.hh" -#include "G4NeutronHPElasticData.hh" -#include "G4NeutronHPInelastic.hh" -#include "G4NeutronHPInelasticData.hh" -// For ions -#include "G4TripathiCrossSection.hh" -#include "G4IonsShenCrossSection.hh" -#include "G4HadronInelasticProcess.hh" -#include "G4BinaryLightIonReaction.hh" -#include "G4BinaryCascade.hh" -#include "G4IonInelasticProcess.hh" -#include "G4LEDeuteronInelastic.hh" -#include "G4DeuteronInelasticProcess.hh" -#include "G4TritonInelasticProcess.hh" -#include "G4LETritonInelastic.hh" -#include "G4AlphaInelasticProcess.hh" -#include "G4LEAlphaInelastic.hh" - -class HadrontherapyProtonPrecompoundGEMFermi: public G4VPhysicsConstructor -{ - public: - HadrontherapyProtonPrecompoundGEMFermi(const G4String& name = "proton-precompoundGEMFermi"); - virtual ~HadrontherapyProtonPrecompoundGEMFermi(); - - protected: - // Construct particle and physics - void ConstructParticle(){}; - void ConstructProcess(); - - private: - - G4double binaryLightIonLowLimit; - G4double binaryLightIonHighLimit; - G4double LEPHighLimit; - G4double precompoundLowLimit; - G4double precompoundHighLimit; - G4double neutronLowLimit; - G4double neutronHighLimit; - G4int targetZ; - G4int targetA; - - G4ExcitationHandler theHandler; - - - // Proton inelastic proces - G4ProtonInelasticProcess theIPProton; - // Cross Section for proton inelastic process - G4ProtonInelasticCrossSection thePXSec; - - // Neutron inelastic process - G4NeutronInelasticProcess theIPNeutron; - // Cross Section for neutron inelastic process - G4NeutronInelasticCrossSection theNXSec; - - // Deuteron inelastic process - G4DeuteronInelasticProcess theIPdeuteron; - - // Tritium inelastic process - G4TritonInelasticProcess theIPtriton; - - // Alpha inelastic process - G4AlphaInelasticProcess theIPalpha; - - // He3 inelastic process - G4HadronInelasticProcess* theIPHe3; -}; -#endif - - - - - - - - diff --git a/examples/advanced/hadrontherapy/precompoundDefaultEvaporation.mac b/examples/advanced/hadrontherapy/precompoundDefaultEvaporation.mac index 74c4071785..766f5c043b 100644 --- a/examples/advanced/hadrontherapy/precompoundDefaultEvaporation.mac +++ b/examples/advanced/hadrontherapy/precompoundDefaultEvaporation.mac @@ -42,7 +42,9 @@ #/beamLine/RangeShifter/thickness 4 cm #/beamLine/RangeShifter/RSMat Water -/run/beamOn 200 +/run/beamOn 500 + + diff --git a/examples/advanced/hadrontherapy/precompoundDefaultEvaporationFermi.mac b/examples/advanced/hadrontherapy/precompoundDefaultEvaporationFermi.mac deleted file mode 100644 index 5c4ddcf271..0000000000 --- a/examples/advanced/hadrontherapy/precompoundDefaultEvaporationFermi.mac +++ /dev/null @@ -1,49 +0,0 @@ -#---------------------------------------------------------------------------- -# PHYSICS LIST: -# -# - LOW ENERGY ELECTROMAGNETIC PHYSICS -# - ELASTIC SCATTERING FOR ALL THE HADRONS AND IONS -# - INELASTIC SCATTERING ---> -# PRECOMPOUND PHYSICS LIST with DEFAULT EVAPORATION MODEL + FERMI -# BREAK-UP -# -# * PRECOMPOUND + DEFAULT EVAPORATION + FERMI BREAK-UP FOR PROTONS, -# NEUTRONS AND PIONS -# -# * LEP MODEL UP TO 100 MEV AND BINARY ION MODEL BETWEEN 80 MEV AND 40. GEV -# FOR DEUTERON, TRITON, HE3, ALPHA -# -# * FISSION AND HADRON CAPTURE FOR NEUTRONS BETWEEN 0. MEV AND 100. TEV -# -# -#------------------------------------------------------------------------------- - - -/control/verbose 1 -/tracking/verbose 0 -/run/verbose 0 -/event/verbose 0 - -# SETTING FOR THE PHYSICS MODELS -/physics/addPhysics photon-epdl -/physics/addPhysics electron-eedl -/physics/addPhysics positron-standard -/physics/addPhysics ion-LowE -/physics/addPhysics muon-standard -/physics/addPhysics decay - -# SETTING FOR THE PARTICULAR HADRONIC MODEL -/physics/addPhysics proton-precompoundFermi - -/run/initialize - -# IF YOU WANT A RANGE SHIFTER PLEASE CHANGE -# THE FOLLOWIG PARAMETERS -# SETTING FOR THE RANGE SHIFTER -#/beamLine/RangeShifter/thickness 4 cm -#/beamLine/RangeShifter/RSMat Water - -/run/beamOn 200 - - - diff --git a/examples/advanced/hadrontherapy/precompoundGEMEvaporation.mac b/examples/advanced/hadrontherapy/precompoundGEMEvaporation.mac deleted file mode 100644 index fa838a4712..0000000000 --- a/examples/advanced/hadrontherapy/precompoundGEMEvaporation.mac +++ /dev/null @@ -1,48 +0,0 @@ -#---------------------------------------------------------------------------- -# PHYSICS LIST: -# -# - LOW ENERGY ELECTROMAGNETIC PHYSICS -# - ELASTIC SCATTERING FOR ALL THE HADRONS AND IONS -# - INELASTIC SCATTERING ---> -# * PRECOMPOUND PHYSICS LIST with GEM EVAPORATION MODEL -# -# * PRECOMPOUND + EVAPORATION (GEM MODEL) NO FERMI BREAK-UP FOR PROTONS, -# NEUTRONS AND PIONS -# -# * LEP MODEL UP TO 100 MEV AND BINARY ION MODEL BETWEEN 80 MEV AND 40. GEV -# FOR DEUTERON, TRITON, HE3, ALPHA -# -# * FISSION AND HADRON CAPTURE FOR NEUTRONS BETWEEN 0. MEV AND 100. TEV -# -# -#------------------------------------------------------------------------------- - - -/control/verbose 1 -/tracking/verbose 0 -/run/verbose 0 -/event/verbose 0 - -# SETTING FOR THE PHYSICS MODELS -/physics/addPhysics photon-epdl -/physics/addPhysics electron-eedl -/physics/addPhysics positron-standard -/physics/addPhysics ion-LowE -/physics/addPhysics muon-standard -/physics/addPhysics decay - -# SETTING FOR THE HADRONIC PHYSICS MODELS -/physics/addPhysics proton-precompoundGEM - -/run/initialize - -# IF YOU WANT A RANGE SHIFTER PLEASE CHANGE -# THE FOLLOWIG PARAMETERS -# SETTING FOR THE RANGE SHIFTER - -#/beamLine/RangeShifter/thickness 4 cm -#/beamLine/RangeShifter/RSMat Water - -/run/beamOn 10 - - diff --git a/examples/advanced/hadrontherapy/precompoundGEMFermi.mac b/examples/advanced/hadrontherapy/precompoundGEMFermi.mac deleted file mode 100644 index 56cc9b739a..0000000000 --- a/examples/advanced/hadrontherapy/precompoundGEMFermi.mac +++ /dev/null @@ -1,47 +0,0 @@ -#---------------------------------------------------------------------------- -# PHYSICS LIST: -# -# - LOW ENERGY ELECTROMAGNETIC PHYSICS -# - ELASTIC SCATTERING FOR ALL THE HADRONS AND IONS -# - INELASTIC SCATTERING ---> -# PRECOMPOUND PHYSICS LIST with GEM EVAPORATION MODEL and FERMI BREAK-UP MODEL -# -# * PRECOMPOUND + EVAPORATION(GEM MODEL) + FERMI BREAK-UP FOR PROTONS, -# NEUTRONS AND PIONS -# -# * LEP MODEL UP TO 100 MEV AND BINARY ION MODEL BETWEEN 80 MEV AND 40. GEV -# FOR DEUTERON, TRITON, HE3, ALPHA -# -# * FISSION AND HADRON CAPTURE FOR NEUTRONS BETWEEN 0. MEV AND 100. TEV -# -# -#------------------------------------------------------------------------------- - - -/control/verbose 1 -/tracking/verbose 0 -/run/verbose 0 -/event/verbose 0 - -# SETTING FOR THE PHYSICS MODELS -/physics/addPhysics photon-epdl -/physics/addPhysics electron-eedl -/physics/addPhysics positron-standard -/physics/addPhysics ion-LowE -/physics/addPhysics muon-standard -/physics/addPhysics decay - -# SETTING FOR THE PARTICULAR HADRONIC MODEL -/physics/addPhysics proton-precompoundGEMFermi - -/run/initialize - -# IF YOU WANT A RANGE SHIFTER PLEASE CHANGE -# THE FOLLOWIG PARAMETERS -# SETTING FOR THE RANGE SHIFTER -#/beamLine/RangeShifter/thickness 4 cm -#/beamLine/RangeShifter/RSMat Water - -/run/beamOn 10 - - diff --git a/examples/advanced/hadrontherapy/src/HadrontherapyAnalysisManager.cc b/examples/advanced/hadrontherapy/src/HadrontherapyAnalysisManager.cc index da3f26bca3..b3eae49dda 100644 --- a/examples/advanced/hadrontherapy/src/HadrontherapyAnalysisManager.cc +++ b/examples/advanced/hadrontherapy/src/HadrontherapyAnalysisManager.cc @@ -179,18 +179,16 @@ void HadrontherapyAnalysisManager::FillEnergyDeposit(G4int i, G4int k, G4double energy) { - if (ntuple) - { - G4int iSlice = ntuple -> findColumn("i"); - G4int jSlice = ntuple -> findColumn("j"); - G4int kSlice = ntuple -> findColumn("k"); - G4int iEnergy = ntuple -> findColumn("energy"); + if (ntuple) { + G4int iSlice = ntuple -> findColumn("i"); + G4int jSlice = ntuple -> findColumn("j"); + G4int kSlice = ntuple -> findColumn("k"); + G4int iEnergy = ntuple -> findColumn("energy"); - ntuple -> fill(iSlice,i); - ntuple -> fill(jSlice,j); - ntuple -> fill(kSlice,k); - ntuple -> fill(iEnergy, energy); - } + ntuple -> fill(iSlice,i); + ntuple -> fill(jSlice,j); + ntuple -> fill(kSlice,k); + ntuple -> fill(iEnergy, energy); } ntuple -> addRow(); } @@ -270,19 +268,18 @@ void HadrontherapyAnalysisManager::genericIonInformation(G4int a, G4int electronOccupancy, G4double energy) { - if (ionTuple) - { - G4int aIndex = ionTuple -> findColumn("a"); - G4int zIndex = ionTuple -> findColumn("z"); - G4int electronIndex = ionTuple -> findColumn("occupancy"); - G4int energyIndex = ionTuple -> findColumn("energy"); + if (ionTuple) { + G4int aIndex = ionTuple -> findColumn("a"); + G4int zIndex = ionTuple -> findColumn("z"); + G4int electronIndex = ionTuple -> findColumn("occupancy"); + G4int energyIndex = ionTuple -> findColumn("energy"); - ionTuple -> fill(aIndex,a); - ionTuple -> fill(zIndex,z); + ionTuple -> fill(aIndex,a); + ionTuple -> fill(zIndex,z); ionTuple -> fill(electronIndex, electronOccupancy); - ionTuple -> fill(energyIndex, energy); - } - ionTuple -> addRow(); + ionTuple -> fill(energyIndex, energy); + } + ionTuple -> addRow(); } void HadrontherapyAnalysisManager::finish() diff --git a/examples/advanced/hadrontherapy/src/HadrontherapyBeamLine.cc b/examples/advanced/hadrontherapy/src/HadrontherapyBeamLine.cc index 1b72df133a..80ebd67335 100755 --- a/examples/advanced/hadrontherapy/src/HadrontherapyBeamLine.cc +++ b/examples/advanced/hadrontherapy/src/HadrontherapyBeamLine.cc @@ -49,9 +49,10 @@ #include "G4RotationMatrix.hh" #include "HadrontherapyBeamLine.hh" #include "G4Material.hh" +#include "G4SubtractionSolid.hh" HadrontherapyBeamLine::HadrontherapyBeamLine(G4VPhysicalVolume* motherVolume): - physiBeamLineSupport(0), physiBeamLineCover(0), physiBeamLineCover2(0), + physiBeamLineSupport(0),/* physiBeamLineCover(0), physiBeamLineCover2(0)*/ firstScatteringFoil(0), physiFirstScatteringFoil(0), physiKaptonWindow(0), solidStopper(0), physiStopper(0), secondScatteringFoil(0), physiSecondScatteringFoil(0), @@ -67,11 +68,10 @@ HadrontherapyBeamLine::HadrontherapyBeamLine(G4VPhysicalVolume* motherVolume): physiSecondMonitorLayer3(0), physiSecondMonitorLayer4(0), physiThirdMonitorLayer1(0), physiThirdMonitorLayer2(0), physiThirdMonitorLayer3(0), physiThirdMonitorLayer4(0), - physiNozzleSupport(0), physiHoleNozzleSupport(0), - physiSecondHoleNozzleSupport(0), + physiNozzleSupport(0), physiHoleNozzle(0), + /*physiSecondHoleNozzleSupport(0),*/ solidFinalCollimator(0), physiFinalCollimator(0) - { mother = motherVolume; material = new HadrontherapyMaterial(); @@ -140,55 +140,7 @@ void HadrontherapyBeamLine::HadrontherapyBeamLineSupport() gray-> SetForceSolid(true); logicBeamLineSupport -> SetVisAttributes(gray); - //---------------------------------// - // Beam line cover 1 (left panel) // - //---------------------------------// - - const G4double beamLineCoverXSize = 1.5*m; - const G4double beamLineCoverYSize = 750.*mm; - const G4double beamLineCoverZSize = 10.*mm; - - const G4double beamLineCoverXPosition = -1948.59 *mm; - const G4double beamLineCoverYPosition = -980.*mm; - const G4double beamLineCoverZPosition = 600.*mm; - - G4Box* beamLineCover = new G4Box("BeamLineCover", - beamLineCoverXSize, - beamLineCoverYSize, - beamLineCoverZSize); - - G4LogicalVolume* logicBeamLineCover = new G4LogicalVolume(beamLineCover, - Al, - "BeamLineCover"); - - physiBeamLineCover = new G4PVPlacement(0, G4ThreeVector(beamLineCoverXPosition, - beamLineCoverYPosition, - beamLineCoverZPosition), - "BeamLineCover", - logicBeamLineCover, - mother, - false, - 0); - - // ---------------------------------// - // Beam line cover 2 (rigth panel) // - // ---------------------------------// - - // It has the same characteristic of beam line cover 1 but set in a different position - physiBeamLineCover2 = new G4PVPlacement(0, G4ThreeVector(beamLineCoverXPosition, - beamLineCoverYPosition, - - beamLineCoverZPosition), - "BeamLineCover2", - logicBeamLineCover, - mother, - false, - 0); - - // Visualisation attributes of the beam line covers - G4VisAttributes* blue = new G4VisAttributes(G4Colour(0. ,0. ,1.)); - blue -> SetVisibility(true); - blue -> SetForceSolid(true); - logicBeamLineCover -> SetVisAttributes(blue); + } void HadrontherapyBeamLine::HadrontherapyBeamScatteringFoils() @@ -291,7 +243,7 @@ void HadrontherapyBeamLine::HadrontherapyBeamScatteringFoils() const G4double startAngleStopper = 0.*deg; const G4double spanningAngleStopper = 360.*deg; - const G4double stopperXPosition = -2956.02 *mm; + const G4double stopperXPosition = -2956.04 *mm; const G4double stopperYPosition = 0.*m; const G4double stopperZPosition = 0.*m; @@ -327,7 +279,7 @@ void HadrontherapyBeamLine::HadrontherapyBeamScatteringFoils() const G4double secondScatteringFoilYSize = 52.5 *mm; const G4double secondScatteringFoilZSize = 52.5 *mm; - const G4double secondScatteringFoilXPosition = -2952.51 *mm; + const G4double secondScatteringFoilXPosition = -2952.52 *mm; const G4double secondScatteringFoilYPosition = 0 *mm; const G4double secondScatteringFoilZPosition = 0 *mm; @@ -459,28 +411,70 @@ void HadrontherapyBeamLine::HadrontherapyBeamCollimators() const G4double secondCollimatorYPosition = 0*mm; const G4double secondCollimatorZPosition = 0*mm; + const G4double secondCollimatorXSize = 20.*mm; + const G4double secondCollimatorYSize = 100.*mm; + const G4double secondCollimatorZSize = 100.*mm; + + G4Box* solidSecondCollimator = new G4Box("SecondCollimator", + secondCollimatorXSize, + secondCollimatorYSize, + secondCollimatorZSize); + + + G4LogicalVolume* logicSecondCollimator = new G4LogicalVolume(solidSecondCollimator, + PMMA, + "SecondCollimator"); + physiSecondCollimator = new G4PVPlacement(0, G4ThreeVector(secondCollimatorXPosition, - secondCollimatorYPosition, - secondCollimatorZPosition), - "SecondCollimator", - logicFirstCollimator, - mother, - false, - 0); + secondCollimatorYPosition, + secondCollimatorZPosition), + "SecondCollimator", + logicSecondCollimator, + mother, + false, + 0); + + // ------------------------------// // Hole of the second collimator // // ------------------------------// - physiHoleSecondCollimator = new G4PVPlacement(G4Transform3D(rm, G4ThreeVector()), - "HoleSecondCollimator", - logicHoleFirstCollimator, - physiSecondCollimator, - false, - 0); + G4double innerRadiusHoleSecondCollimator = 0.*mm; + G4double outerRadiusHoleSecondCollimator = 15.*mm; + G4double hightHoleSecondCollimator = 20.*mm; + G4double startAngleHoleSecondCollimator = 0.*deg; + G4double spanningAngleHoleSecondCollimator = 360.*deg; + + + G4Tubs* solidHoleSecondCollimator = new G4Tubs("HoleSecondCollimator", + innerRadiusHoleSecondCollimator, + outerRadiusHoleSecondCollimator, + hightHoleSecondCollimator, + startAngleHoleSecondCollimator, + spanningAngleHoleSecondCollimator); + + + G4LogicalVolume* logicHoleSecondCollimator = new G4LogicalVolume(solidHoleSecondCollimator, + Air, + "HoleSecondCollimator", + 0, 0, 0); + G4double phi2 = 90. *deg; + // Matrix definition for a 90 deg rotation. Also used for other volumes + G4RotationMatrix rm2; + rm2.rotateY(phi2); + + physiHoleSecondCollimator = new G4PVPlacement(G4Transform3D(rm2, G4ThreeVector()), + "HoleSecondCollimator", + logicHoleSecondCollimator, + physiSecondCollimator, + false, + 0); + + // ---------------------------------// - // First Collimator modulator box // + // First Collimator modulator box // // ---------------------------------// const G4double firstCollimatorModulatorXSize = 10.*mm; @@ -534,21 +528,58 @@ void HadrontherapyBeamLine::HadrontherapyBeamCollimators() // -------------------------------------------// // Second collimator modulator box // // -------------------------------------------// + + + const G4double secondCollimatorModulatorXSize = 10.*mm; + const G4double secondCollimatorModulatorYSize = 200.*mm; + const G4double secondCollimatorModulatorZSize = 200.*mm; const G4double secondCollimatorModulatorXPosition = -2090.5 *mm; + const G4double secondCollimatorModulatorYPosition = 0.*mm; + const G4double secondCollimatorModulatorZPosition = 0.*mm; + + + G4Box* solidSecondCollimatorModulatorBox = new G4Box("SecondCollimatorModulatorBox", + secondCollimatorModulatorXSize, + secondCollimatorModulatorYSize, + secondCollimatorModulatorZSize); + + G4LogicalVolume* logicSecondCollimatorModulatorBox = new G4LogicalVolume(solidSecondCollimatorModulatorBox, + Al, "SecondCollimatorModulatorBox"); + + physiSecondCollimatorModulatorBox = new G4PVPlacement(0, G4ThreeVector(secondCollimatorModulatorXPosition, + secondCollimatorModulatorYPosition, + secondCollimatorModulatorZPosition), + "SecondCollimatorModulatorBox", + logicSecondCollimatorModulatorBox, + mother, false, 0); - physiSecondCollimatorModulatorBox = new G4PVPlacement(0, G4ThreeVector(secondCollimatorModulatorXPosition,0., 0.), - "SecondCollimatorModulatorBox", logicFirstCollimatorModulatorBox, - mother, false, 0); - - // -------------------------------// - // Hole of the second collimator // + + + // -------------------------------// + // Hole of the second collimator modulator box // // -------------------------------// + const G4double innerRadiusHoleSecondCollimatorModulatorBox = 0.*mm; + const G4double outerRadiusHoleSecondCollimatorModulatorBox = 31.*mm; + const G4double hightHoleSecondCollimatorModulatorBox = 10.*mm; + const G4double startAngleHoleSecondCollimatorModulatorBox = 0.*deg; + const G4double spanningAngleHoleSecondCollimatorModulatorBox = 360.*deg; + + G4Tubs* solidHoleSecondCollimatorModulatorBox = new G4Tubs("HoleSecondCollimatorModulatorBox", + innerRadiusHoleSecondCollimatorModulatorBox, + outerRadiusHoleSecondCollimatorModulatorBox, + hightHoleSecondCollimatorModulatorBox , + startAngleHoleSecondCollimatorModulatorBox, + spanningAngleHoleSecondCollimatorModulatorBox); + + G4LogicalVolume* logicHoleSecondCollimatorModulatorBox = new G4LogicalVolume(solidHoleSecondCollimatorModulatorBox, + Air, "HoleSecondCollimatorModulatorBox", 0, 0, 0); + physiHoleSecondCollimatorModulatorBox = new G4PVPlacement(G4Transform3D(rm, G4ThreeVector()), - "HoleSecondCollimatorModulatorBox", - logicHoleFirstCollimatorModulatorBox, - physiSecondCollimatorModulatorBox, false, 0); + "HoleSecondCollimatorModulatorBox", + logicHoleSecondCollimatorModulatorBox, + physiSecondCollimatorModulatorBox, false, 0); G4VisAttributes * blue = new G4VisAttributes( G4Colour(0. ,0. ,1.)); blue -> SetVisibility(true); @@ -556,6 +587,8 @@ void HadrontherapyBeamLine::HadrontherapyBeamCollimators() logicFirstCollimator -> SetVisAttributes(yellow); logicFirstCollimatorModulatorBox -> SetVisAttributes(blue); + logicSecondCollimatorModulatorBox -> SetVisAttributes(blue); + } void HadrontherapyBeamLine::HadrontherapyBeamMonitoring() @@ -589,6 +622,8 @@ void HadrontherapyBeamLine::HadrontherapyBeamMonitoring() physiFirstMonitorLayer1 = new G4PVPlacement(0,G4ThreeVector(monitor1XPosition,0.*cm,0.*cm), "FirstMonitorLayer1", logicFirstMonitorLayer1, mother, false, 0); + + G4Box* solidFirstMonitorLayer2 = new G4Box("FirstMonitorLayer2", monitor2XSize, monitorYSize, monitorZSize); G4LogicalVolume* logicFirstMonitorLayer2 = new G4LogicalVolume(solidFirstMonitorLayer2, Cu, "FirstMonitorLayer2"); @@ -597,63 +632,120 @@ void HadrontherapyBeamLine::HadrontherapyBeamMonitoring() "FirstMonitorLayer2", logicFirstMonitorLayer2, physiFirstMonitorLayer1, false, 0); + + G4Box* solidFirstMonitorLayer3 = new G4Box("FirstMonitorLayer3", monitor3XSize, monitorYSize, monitorZSize); G4LogicalVolume* logicFirstMonitorLayer3 = new G4LogicalVolume(solidFirstMonitorLayer3, Air, "FirstMonitorLayer3"); physiFirstMonitorLayer3 = new G4PVPlacement(0, G4ThreeVector(0.*mm,0.*cm,0.*cm), "MonitorLayer3", logicFirstMonitorLayer3, physiFirstMonitorLayer1, false, 0); + + G4Box* solidFirstMonitorLayer4 = new G4Box("FirstMonitorLayer4", monitor2XSize, monitorYSize, monitorZSize); G4LogicalVolume* logicFirstMonitorLayer4 = new G4LogicalVolume(solidFirstMonitorLayer4, Cu, "FirstMonitorLayer4"); physiFirstMonitorLayer4 = new G4PVPlacement(0, G4ThreeVector(monitor4XPosition,0.*cm,0.*cm), - "FirstMonitorLayer4", - logicFirstMonitorLayer4, - physiFirstMonitorLayer1, false, 0); + "FirstMonitorLayer4", logicFirstMonitorLayer4, physiFirstMonitorLayer1, false, 0); + + + // ------------------------// // Second monitor chamber // // ------------------------// - physiSecondMonitorLayer1 = new G4PVPlacement(0, G4ThreeVector(-1634.92493 *mm,0.*cm,0.*cm), - "SecondMonitorLayer1", logicFirstMonitorLayer1,mother, false, 0); - physiSecondMonitorLayer2 = new G4PVPlacement(0, G4ThreeVector( monitor2XPosition,0.*cm,0.*cm), "SecondMonitorLayer2", - logicFirstMonitorLayer2, physiSecondMonitorLayer1, false, 0); + G4Box* solidSecondMonitorLayer1 = new G4Box("SecondMonitorLayer1", monitor1XSize, monitorYSize, monitorZSize); + + G4LogicalVolume* logicSecondMonitorLayer1 = new G4LogicalVolume(solidSecondMonitorLayer1, Kapton, "SecondMonitorLayer1"); + + physiSecondMonitorLayer1 = new G4PVPlacement(0, G4ThreeVector(-1634.92493 *mm,0.*cm,0.*cm), + "SecondMonitorLayer1", logicSecondMonitorLayer1,mother, false, 0); + + + + G4Box* solidSecondMonitorLayer2 = new G4Box("SecondMonitorLayer2", monitor2XSize, monitorYSize, monitorZSize); + + G4LogicalVolume* logicSecondMonitorLayer2 = new G4LogicalVolume(solidSecondMonitorLayer2, Cu, "SecondMonitorLayer2"); + + physiSecondMonitorLayer2 = new G4PVPlacement(0, G4ThreeVector( monitor2XPosition,0.*cm,0.*cm), "SecondMonitorLayer2", + logicSecondMonitorLayer2, physiSecondMonitorLayer1, false, 0); - physiSecondMonitorLayer3 = new G4PVPlacement(0, G4ThreeVector(0.*mm,0.*cm,0.*cm), "MonitorLayer3", - logicFirstMonitorLayer3, physiSecondMonitorLayer1, false, 0); - - physiSecondMonitorLayer4 = new G4PVPlacement(0, G4ThreeVector(monitor4XPosition,0.*cm,0.*cm), "SecondMonitorLayer4", - logicFirstMonitorLayer4, physiSecondMonitorLayer1, false, 0); + + + G4Box* solidSecondMonitorLayer3 = new G4Box("SecondMonitorLayer3", monitor3XSize, monitorYSize, monitorZSize); + + G4LogicalVolume* logicSecondMonitorLayer3 = new G4LogicalVolume(solidSecondMonitorLayer3, Air, "SecondMonitorLayer3"); + + physiSecondMonitorLayer3 = new G4PVPlacement(0, G4ThreeVector(0.*mm,0.*cm,0.*cm), "MonitorLayer3", + logicSecondMonitorLayer3, physiSecondMonitorLayer1, false, 0); + + + + G4Box* solidSecondMonitorLayer4 = new G4Box("SecondMonitorLayer4", monitor2XSize, monitorYSize, monitorZSize); + + G4LogicalVolume* logicSecondMonitorLayer4 = new G4LogicalVolume(solidSecondMonitorLayer4, Cu, "SecondMonitorLayer4"); + + physiSecondMonitorLayer4 = new G4PVPlacement(0, G4ThreeVector(monitor4XPosition,0.*cm,0.*cm), "SecondMonitorLayer4", + logicSecondMonitorLayer4, physiSecondMonitorLayer1, false, 0); // -----------------------// // Third monitor chamber // // -----------------------// - physiThirdMonitorLayer1 = new G4PVPlacement(0, G4ThreeVector(-1505.87489 *mm,0.*cm,0.*cm), - "ThirdMonitorLayer1", logicFirstMonitorLayer1, mother, false, 0); - physiThirdMonitorLayer2 = new G4PVPlacement(0, G4ThreeVector(monitor2XPosition, 0.*cm,0.*cm), + G4Box* solidThirdMonitorLayer1 = new G4Box("ThirdMonitorLayer1", monitor1XSize, monitorYSize, monitorZSize); + + G4LogicalVolume* logicThirdMonitorLayer1 = new G4LogicalVolume(solidThirdMonitorLayer1, Kapton, "ThirdMonitorLayer1"); + + physiThirdMonitorLayer1 = new G4PVPlacement(0, G4ThreeVector(-1505.87489 *mm,0.*cm,0.*cm), + "ThirdMonitorLayer1", logicThirdMonitorLayer1, mother, false, 0); + + + + G4Box* solidThirdMonitorLayer2 = new G4Box("ThirdMonitorLayer2", monitor2XSize, monitorYSize, monitorZSize); + + G4LogicalVolume* logicThirdMonitorLayer2 = new G4LogicalVolume(solidThirdMonitorLayer2, Cu, "ThirdMonitorLayer2"); + + physiThirdMonitorLayer2 = new G4PVPlacement(0, G4ThreeVector(monitor2XPosition, 0.*cm,0.*cm), "ThirdMonitorLayer2", - logicFirstMonitorLayer2, + logicThirdMonitorLayer2, physiThirdMonitorLayer1, false, 0); - physiThirdMonitorLayer3 = new G4PVPlacement(0, G4ThreeVector(0.*mm,0.*cm,0.*cm), "MonitorLayer3", - logicFirstMonitorLayer3, physiThirdMonitorLayer1, false, 0); + + + G4Box* solidThirdMonitorLayer3 = new G4Box("ThirdMonitorLayer3", monitor3XSize, monitorYSize, monitorZSize); + + G4LogicalVolume* logicThirdMonitorLayer3 = new G4LogicalVolume(solidThirdMonitorLayer3, Air, "ThirdMonitorLayer3"); + + physiThirdMonitorLayer3 = new G4PVPlacement(0, G4ThreeVector(0.*mm,0.*cm,0.*cm), "MonitorLayer3", + logicThirdMonitorLayer3, physiThirdMonitorLayer1, false, 0); - physiThirdMonitorLayer4 = new G4PVPlacement(0, G4ThreeVector(monitor4XPosition,0.*cm,0.*cm), "ThirdMonitorLayer4", - logicFirstMonitorLayer4, physiThirdMonitorLayer1, false, 0); + + + + + + G4Box* solidThirdMonitorLayer4 = new G4Box("ThirdMonitorLayer4", monitor2XSize, monitorYSize, monitorZSize); + + G4LogicalVolume* logicThirdMonitorLayer4 = new G4LogicalVolume(solidThirdMonitorLayer4, Cu, "ThirdMonitorLayer4"); + + physiThirdMonitorLayer4 = new G4PVPlacement(0, G4ThreeVector(monitor4XPosition,0.*cm,0.*cm), "ThirdMonitorLayer4", + logicThirdMonitorLayer4, physiThirdMonitorLayer1, false, 0); } + + + void HadrontherapyBeamLine::HadrontherapyBeamNozzle() { // ---------------// // Nozzle support // //----------------// - const G4double nozzleSupportXSize = 29.5 *mm; + const G4double nozzleSupportXSize = 29.50 *mm; const G4double nozzleSupportYSize = 180. *mm; const G4double nozzleSupportZSize = 180. *mm; @@ -661,24 +753,52 @@ void HadrontherapyBeamLine::HadrontherapyBeamNozzle() G4Material* PMMA = material -> GetMat("PMMA"); G4Material* Brass = material -> GetMat("Brass") ; - G4Material* Air = material -> GetMat("Air") ; + // G4Material* Air = material -> GetMat("Air") ; G4double phi = 90. *deg; + // Matrix definition for a 90 deg rotation. Also used for other volumes G4RotationMatrix rm; rm.rotateY(phi); - G4Box* solidNozzleSupport = new G4Box("NozzlSupport", nozzleSupportXSize, nozzleSupportYSize, nozzleSupportZSize); + // G4Subtraction + G4Box* solidNozzleBox = new G4Box("NozzleBox", nozzleSupportXSize, nozzleSupportYSize, nozzleSupportZSize); + + + const G4double innerRadiusHoleNozzle = 0.*mm; + const G4double outerRadiusHoleNozzle = 21.5 *mm; + const G4double hightHoleNozzle = 29.5 *mm; + const G4double startAngleHoleNozzle = 0.*deg; + const G4double spanningAngleHoleNozzle = 360.*deg; + + G4Tubs* solidHoleNozzle = new G4Tubs("HoleNozzle", + innerRadiusHoleNozzle, + outerRadiusHoleNozzle, + hightHoleNozzle, + startAngleHoleNozzle, + spanningAngleHoleNozzle); + + G4SubtractionSolid* solidNozzleSupport = new G4SubtractionSolid("NozzleSupport",solidNozzleBox, solidHoleNozzle, + &rm, G4ThreeVector(0 ,0,0 )); G4LogicalVolume* logicNozzleSupport = new G4LogicalVolume(solidNozzleSupport, PMMA, "NozzleSupport"); physiNozzleSupport = new G4PVPlacement(0, G4ThreeVector(nozzleSupportXPosition,0., 0.), "NozzleSupport", logicNozzleSupport, mother, false, 0); + + + G4VisAttributes * blue = new G4VisAttributes( G4Colour(0. ,0. ,1.)); + blue -> SetVisibility(true); + blue -> SetForceSolid(false); + + logicNozzleSupport -> SetVisAttributes(blue); + + //logicHoleNozzle -> SetVisAttributes(blue); // ---------------------------------// // First hole of the noozle support // // ---------------------------------// - + const G4double innerRadiusHoleNozzleSupport = 18.*mm; const G4double outerRadiusHoleNozzleSupport = 21.5 *mm; const G4double hightHoleNozzleSupport = 185.*mm; @@ -703,38 +823,11 @@ void HadrontherapyBeamLine::HadrontherapyBeamNozzle() 0., 0.)), "HoleNozzleSupport", logicHoleNozzleSupport, mother, false, 0); - //------------------------------------// - // Second Hole of the noozle support // - //------------------------------------// - const G4double innerRadiusSecondHoleNozzleSupport = 0.*mm; - const G4double outerRadiusSecondHoleNozzleSupport = 18.*mm; - const G4double hightSecondHoleNozzleSupport = 29.5 *mm; - const G4double startAngleSecondHoleNozzleSupport = 0.*deg; - const G4double spanningAngleSecondHoleNozzleSupport = 360.*deg; - - G4Tubs* solidSecondHoleNozzleSupport = new G4Tubs("SecondHoleNozzleSupport", - innerRadiusSecondHoleNozzleSupport, - outerRadiusSecondHoleNozzleSupport, - hightSecondHoleNozzleSupport, - startAngleSecondHoleNozzleSupport, - spanningAngleSecondHoleNozzleSupport); - - G4LogicalVolume* logicSecondHoleNozzleSupport = new G4LogicalVolume(solidSecondHoleNozzleSupport, - Air, - "SecondHoleNozzleSupport", - 0, 0, 0); - - physiSecondHoleNozzleSupport = new G4PVPlacement(G4Transform3D(rm, G4ThreeVector()), - "SecondHoleNozzleSupport", - logicSecondHoleNozzleSupport, - physiNozzleSupport, - false, 0); - - - G4VisAttributes * yellow = new G4VisAttributes( G4Colour(1., 1., 0. )); + G4VisAttributes * yellow = new G4VisAttributes( G4Colour(1., 1., 0. )); yellow-> SetVisibility(true); yellow-> SetForceSolid(true); - logicHoleNozzleSupport -> SetVisAttributes(yellow); + logicHoleNozzleSupport -> SetVisAttributes(yellow); + } void HadrontherapyBeamLine::HadrontherapyBeamFinalCollimator() @@ -743,7 +836,7 @@ void HadrontherapyBeamLine::HadrontherapyBeamFinalCollimator() // -----------------------// // Final collimator // //------------------------// - + const G4double outerRadiusFinalCollimator = 21.5*mm; const G4double hightFinalCollimator = 3.5*mm; const G4double startAngleFinalCollimator = 0.*deg; @@ -774,6 +867,8 @@ void HadrontherapyBeamLine::HadrontherapyBeamFinalCollimator() yellow-> SetVisibility(true); yellow-> SetForceSolid(true); logicFinalCollimator -> SetVisAttributes(yellow); + + } void HadrontherapyBeamLine::SetRangeShifterXPosition(G4double value) diff --git a/examples/advanced/hadrontherapy/src/HadrontherapyDetectorConstruction.cc b/examples/advanced/hadrontherapy/src/HadrontherapyDetectorConstruction.cc index 6b3af53429..2fcf3d4cab 100644 --- a/examples/advanced/hadrontherapy/src/HadrontherapyDetectorConstruction.cc +++ b/examples/advanced/hadrontherapy/src/HadrontherapyDetectorConstruction.cc @@ -56,10 +56,10 @@ #include "HadrontherapyDetectorConstruction.hh" #include "HadrontherapyMaterial.hh" #include "HadrontherapyBeamLine.hh" -#include "HadrontherapyModulator.hh" +//#include "HadrontherapyModulator.hh" HadrontherapyDetectorConstruction::HadrontherapyDetectorConstruction() - : phantomSD(0), phantomROGeometry(0), beamLine(0), modulator(0), + : phantomSD(0), phantomROGeometry(0), beamLine(0), /*modulator(0),*/ physicalTreatmentRoom(0), patientPhysicalVolume(0), phantomLogicalVolume(0), @@ -124,12 +124,16 @@ void HadrontherapyDetectorConstruction::ConstructBeamLine() "logicTreatmentRoom", 0,0,0); + + physicalTreatmentRoom = new G4PVPlacement(0, G4ThreeVector(), "physicalTreatmentRoom", logicTreatmentRoom, 0,false,0); + G4double maxStepTreatmentRoom = 0.1 *mm; + logicTreatmentRoom -> SetUserLimits(new G4UserLimits(maxStepTreatmentRoom)); // The treatment room is invisible in the Visualisation logicTreatmentRoom -> SetVisAttributes (G4VisAttributes::Invisible); @@ -142,8 +146,8 @@ void HadrontherapyDetectorConstruction::ConstructBeamLine() beamLine -> HadrontherapyBeamNozzle(); beamLine -> HadrontherapyBeamFinalCollimator(); - modulator = new HadrontherapyModulator(); - modulator -> BuildModulator(physicalTreatmentRoom); + //modulator = new HadrontherapyModulator(); + //modulator -> BuildModulator(physicalTreatmentRoom); // Patient - Mother volume of the phantom G4Box* patient = new G4Box("patient",20 *cm, 20 *cm, 20 *cm); @@ -171,7 +175,7 @@ void HadrontherapyDetectorConstruction::ConstructPhantom() G4Material* water = material -> GetMat("Water"); - ComputeVoxelSize(); + //ComputeVoxelSize(); //---------------------- // Water phantom @@ -184,7 +188,7 @@ void HadrontherapyDetectorConstruction::ConstructPhantom() 0,0,0); // Fixing the max step allowed in the phantom - G4double maxStep = 0.02*cm; + G4double maxStep = 0.01 *mm; phantomLogicalVolume -> SetUserLimits(new G4UserLimits(maxStep)); G4double phantomXtranslation = -180.*mm; @@ -239,13 +243,13 @@ void HadrontherapyDetectorConstruction::ConstructSensitiveDetector() phantomLogicalVolume -> SetSensitiveDetector(phantomSD); } } - +/* void HadrontherapyDetectorConstruction::SetModulatorAngle(G4double value) { modulator -> SetModulatorAngle(value); G4RunManager::GetRunManager() -> GeometryHasBeenModified(); } - +*/ void HadrontherapyDetectorConstruction::SetRangeShifterXPosition(G4double value) { beamLine -> SetRangeShifterXPosition(value); diff --git a/examples/advanced/hadrontherapy/src/HadrontherapyDetectorMessenger.cc b/examples/advanced/hadrontherapy/src/HadrontherapyDetectorMessenger.cc index 76369b693e..424b3f6ed2 100644 --- a/examples/advanced/hadrontherapy/src/HadrontherapyDetectorMessenger.cc +++ b/examples/advanced/hadrontherapy/src/HadrontherapyDetectorMessenger.cc @@ -47,8 +47,8 @@ HadrontherapyDetectorMessenger::HadrontherapyDetectorMessenger( HadrontherapyDetectorConstruction* detector) :hadrontherapyDetector(detector) { - modulatorDir = new G4UIdirectory("/modulator/"); - modulatorDir -> SetGuidance("Command to rotate the modulator wheel"); + //modulatorDir = new G4UIdirectory("/modulator/"); + //modulatorDir -> SetGuidance("Command to rotate the modulator wheel"); beamLineDir = new G4UIdirectory("/beamLine/"); beamLineDir -> SetGuidance("set specification of range shifter"); @@ -68,12 +68,12 @@ HadrontherapyDetectorMessenger::HadrontherapyDetectorMessenger( finalCollimatorDir = new G4UIdirectory("/beamLine/FinalCollimator/"); finalCollimatorDir -> SetGuidance("set specification of final collimator"); - modulatorAngleCmd = new G4UIcmdWithADoubleAndUnit("/modulator/angle",this); - modulatorAngleCmd -> SetGuidance("Set Modulator Angle"); - modulatorAngleCmd -> SetParameterName("Size",false); - modulatorAngleCmd -> SetRange("Size>=0."); - modulatorAngleCmd -> SetUnitCategory("Angle"); - modulatorAngleCmd -> AvailableForStates(G4State_Idle); + // modulatorAngleCmd = new G4UIcmdWithADoubleAndUnit("/modulator/angle",this); + //modulatorAngleCmd -> SetGuidance("Set Modulator Angle"); + //modulatorAngleCmd -> SetParameterName("Size",false); + //modulatorAngleCmd -> SetRange("Size>=0."); + //modulatorAngleCmd -> SetUnitCategory("Angle"); + //modulatorAngleCmd -> AvailableForStates(G4State_Idle); rangeShifterMatCmd = new G4UIcmdWithAString("/beamLine/RangeShifter/RSMat",this); rangeShifterMatCmd -> SetGuidance("Set material of range shifter"); @@ -132,21 +132,21 @@ HadrontherapyDetectorMessenger::~HadrontherapyDetectorMessenger() delete rangeShifterXPositionCmd; delete rangeShifterXSizeCmd; delete rangeShifterMatCmd; - delete modulatorAngleCmd; + //delete modulatorAngleCmd; delete finalCollimatorDir; delete rangeStopperDir; delete secondScatteringFoilDir; delete firstScatteringFoilDir; delete rangeShifterDir; delete beamLineDir; - delete modulatorDir; + //delete modulatorDir; } void HadrontherapyDetectorMessenger::SetNewValue(G4UIcommand* command,G4String newValue) { - if( command == modulatorAngleCmd ) - { hadrontherapyDetector -> SetModulatorAngle - (modulatorAngleCmd -> GetNewDoubleValue(newValue));} + //if( command == modulatorAngleCmd ) + // { hadrontherapyDetector -> SetModulatorAngle + // (modulatorAngleCmd -> GetNewDoubleValue(newValue));} if( command == rangeShifterMatCmd ) { hadrontherapyDetector -> SetRSMaterial(newValue);} diff --git a/examples/advanced/hadrontherapy/src/HadrontherapyPhysicsList.cc b/examples/advanced/hadrontherapy/src/HadrontherapyPhysicsList.cc index 2d32cc6717..2425b559ce 100644 --- a/examples/advanced/hadrontherapy/src/HadrontherapyPhysicsList.cc +++ b/examples/advanced/hadrontherapy/src/HadrontherapyPhysicsList.cc @@ -59,17 +59,14 @@ #include "HadrontherapyIonLowEZiegler2000.hh" #include "HadrontherapyIonStandard.hh" #include "HadrontherapyProtonPrecompound.hh" -#include "HadrontherapyProtonPrecompoundFermi.hh" -#include "HadrontherapyProtonPrecompoundGEM.hh" -#include "HadrontherapyProtonPrecompoundGEMFermi.hh" #include "HadrontherapyProtonBertini.hh" -#include "HadrontherapyProtonBinary.hh" #include "HadrontherapyMuonStandard.hh" #include "HadrontherapyDecay.hh" #include "HadrontherapyParticles.hh" #include "G4ParticleDefinition.hh" #include "G4ParticleTypes.hh" #include "G4ParticleTable.hh" + HadrontherapyPhysicsList::HadrontherapyPhysicsList(): G4VModularPhysicsList(), electronIsRegistered(false), positronIsRegistered(false), @@ -79,15 +76,12 @@ HadrontherapyPhysicsList::HadrontherapyPhysicsList(): G4VModularPhysicsList(), muonIsRegistered(false), decayIsRegistered(false) { - // - // The threshold of production of secondaries is fixed to 10. mm - // for all the particles, in all the experimental set-up - // The phantom is defined as a Geant4 Region. Here the cut is fixed to 0.001 * mm. - // - - defaultCutValue = 10. * mm; + // The secondary production threshold is set to 10. mm + // for all the particles in all the experimental set-up + // The phantom is defined as a Geant4 Region. Here the cut is fixed to 0.001 mm + defaultCutValue = 0.01 * mm; - // Messenger: it is possible to activate interactively physics processes and models + // Messenger: it is possible to activate physics processes and models interactively messenger = new HadrontherapyPhysicsListMessenger(this); SetVerboseLevel(1); @@ -109,13 +103,14 @@ void HadrontherapyPhysicsList::AddPhysicsList(const G4String& name) // Electromagnetic physics // //*************************// // - // The user can choose three alternative approaches: + // The user can choose three alternative approaches for electrons and photons: // Standard, Low Energy based on the Livermore libraries and Low Energy Penelope // // ******** PHOTONS ********// // Register standard processes for photons + if (name == "photon-standard") { if (photonIsRegistered) @@ -421,96 +416,11 @@ void HadrontherapyPhysicsList::AddPhysicsList(const G4String& name) protonHadronicIsRegistered = true; } } - - -//Precompond Default Evaporation + Fermi Breck-up Model - - if (name == "proton-precompoundFermi") - { - if (protonHadronicIsRegistered) - { - G4cout << "HadrontherapyPhysicsList::AddPhysicsList: " << name - << " cannot be registered ---- decay List already existing" - << G4endl; - } - else - { - G4cout << "HadrontherapyPhysicsList::AddPhysicsList: " << name - << " is registered" << G4endl; - RegisterPhysics( new HadrontherapyProtonPrecompoundFermi(name) ); - protonHadronicIsRegistered = true; - } - } - -//Precompound GEM Evaporation - - if (name == "proton-precompoundGEM") - { - if (protonHadronicIsRegistered) - { - G4cout << "HadrontherapyPhysicsList::AddPhysicsList: " << name - << " cannot be registered ---- decay List already existing" - << G4endl; - } - else - { - G4cout << "HadrontherapyPhysicsList::AddPhysicsList: " << name - << " is registered" << G4endl; - RegisterPhysics( new HadrontherapyProtonPrecompoundGEM(name) ); - protonHadronicIsRegistered = true; - } - - } - -//Precompound GEM Evaporation + Fermi Breck-up Model - - if (name == "proton-precompoundGEMFermi") - { - if (protonHadronicIsRegistered) - { - G4cout << "HadrontherapyPhysicsList::AddPhysicsList: " << name - << " cannot be registered ---- decay List already existing" - << G4endl; - } - else - { - G4cout << "HadrontherapyPhysicsList::AddPhysicsList: " << name - << " is registered" << G4endl; - RegisterPhysics( new HadrontherapyProtonPrecompoundGEMFermi(name) ); - protonHadronicIsRegistered = true; - } - - } - + //------------------------------------------------------------------------------------------------- // End Hadronic Precompound models //------------------------------------------------------------------------------------------------- -//-------------------------------------------------------------------------------------------- -//Begin Hadronic Binary models -//-------------------------------------------------------------------------------------------- - -// Binary cascade model with the default precompound - - -if (name == "proton-precompound-binary") - { - if (protonHadronicIsRegistered) - { - G4cout << "HadrontherapyPhysicsList::AddPhysicsList: " << name - << " cannot be registered ---- decay List already existing" - << G4endl; - } - else - { - G4cout << "HadrontherapyPhysicsList::AddPhysicsList: " << name - << " is registered" << G4endl; - RegisterPhysics( new HadrontherapyProtonBinary(name) ); - protonHadronicIsRegistered = true; - } - - } - //-------------------------------------------------------------------------------------------- // Begin Hadronic Bertini model //-------------------------------------------------------------------------------------------- @@ -558,14 +468,16 @@ void HadrontherapyPhysicsList::SetCuts() // Set the threshold of production equal to the defaultCutValue // in the experimental set-up G4VUserPhysicsList::SetCutsWithDefault(); - + + G4double lowlimit=250*eV; + G4ProductionCutsTable::GetProductionCutsTable() ->SetEnergyRange(lowlimit, 100.*GeV); // Definition of a smaller threshold of production in the phantom region // where high accuracy is required in the energy deposit calculation G4String regionName = "PhantomLog"; G4Region* region = G4RegionStore::GetInstance()->GetRegion(regionName); G4ProductionCuts* cuts = new G4ProductionCuts ; - G4double regionCut = 0.001*mm; + G4double regionCut = 0.01*mm; cuts -> SetProductionCut(regionCut,G4ProductionCuts::GetIndex("gamma")); cuts -> SetProductionCut(regionCut,G4ProductionCuts::GetIndex("e-")); cuts -> SetProductionCut(regionCut,G4ProductionCuts::GetIndex("e+")); diff --git a/examples/advanced/hadrontherapy/src/HadrontherapyPrimaryGeneratorAction.cc b/examples/advanced/hadrontherapy/src/HadrontherapyPrimaryGeneratorAction.cc index 6a208853e7..654f303247 100644 --- a/examples/advanced/hadrontherapy/src/HadrontherapyPrimaryGeneratorAction.cc +++ b/examples/advanced/hadrontherapy/src/HadrontherapyPrimaryGeneratorAction.cc @@ -74,12 +74,12 @@ void HadrontherapyPrimaryGeneratorAction::SetDefaultPrimaryParticle() particleGun -> SetParticleDefinition(particle); // Define the energy of primary particles: - // gaussian distribution with mean energy = 63.450 *MeV - // and sigma = 400.0 *keV + // gaussian distribution with mean energy = 64.55 *MeV + // and sigma = 300.0 *keV G4double defaultMeanKineticEnergy = 63.50 *MeV; meanKineticEnergy = defaultMeanKineticEnergy; - G4double defaultsigmaEnergy = 400.0 *keV; + G4double defaultsigmaEnergy = 300.0 *keV; sigmaEnergy = defaultsigmaEnergy; // Define the parameters of the initial position: @@ -93,18 +93,18 @@ void HadrontherapyPrimaryGeneratorAction::SetDefaultPrimaryParticle() G4double defaultZ0 = 0.0 *mm; Z0 = defaultZ0; - G4double defaultsigmaY = 1 *mm; + G4double defaultsigmaY = 1. *mm; sigmaY = defaultsigmaY; - G4double defaultsigmaZ = 1 *mm; + G4double defaultsigmaZ = 1. *mm; sigmaZ = defaultsigmaZ; // Define the parameters of the momentum of primary particles: // The momentum along the y and z axis has a gaussian distribution - G4double defaultsigmaMomentumY = 0.0001; + G4double defaultsigmaMomentumY = 0.0; sigmaMomentumY = defaultsigmaMomentumY; - G4double defaultsigmaMomentumZ = 0.0001; + G4double defaultsigmaMomentumZ = 0.0; sigmaMomentumZ = defaultsigmaMomentumZ; } diff --git a/examples/advanced/hadrontherapy/src/HadrontherapyProtonBertini.cc b/examples/advanced/hadrontherapy/src/HadrontherapyProtonBertini.cc index f442637832..d61c88c2ba 100644 --- a/examples/advanced/hadrontherapy/src/HadrontherapyProtonBertini.cc +++ b/examples/advanced/hadrontherapy/src/HadrontherapyProtonBertini.cc @@ -36,65 +36,61 @@ // (b) National Institute for Nuclear Physics Section of Genova, genova, Italy // // * cirrone@lns.infn.it + +// Code review by M.G. Pia, 2 November 2006 +// Further code review is needed // ---------------------------------------------------------------------------- #include "HadrontherapyProtonBertini.hh" #include "G4ParticleDefinition.hh" #include "G4ProcessManager.hh" -#include "G4ProcessVector.hh" #include "G4ParticleTypes.hh" -#include "G4ParticleTable.hh" -#include "G4Material.hh" +#include "G4HadronElasticProcess.hh" +#include "G4ProtonInelasticProcess.hh" +#include "G4ExcitationHandler.hh" +#include "G4NeutronInelasticProcess.hh" +#include "G4HadronInelasticProcess.hh" +#include "G4DeuteronInelasticProcess.hh" +#include "G4TritonInelasticProcess.hh" +#include "G4AlphaInelasticProcess.hh" #include "G4LElastic.hh" #include "G4CascadeInterface.hh" #include "G4PionPlusInelasticProcess.hh" #include "G4LEPionPlusInelastic.hh" #include "G4LEPionMinusInelastic.hh" -#include "G4HEPionPlusInelastic.hh" -#include "G4HEPionMinusInelastic.hh" #include "G4PionMinusInelasticProcess.hh" -#include "G4LEPionMinusInelastic.hh" -#include "G4HEPionMinusInelastic.hh" -#include "G4PiMinusAbsorptionAtRest.hh" -#include "G4AntiProtonInelasticProcess.hh" -#include "G4LEAntiProtonInelastic.hh" -#include "G4HEAntiProtonInelastic.hh" -#include "G4AntiProtonAnnihilationAtRest.hh" -// +#include "G4CascadeElasticInterface.hh" +#include "G4HadronFissionProcess.hh" +#include "G4HadronCaptureProcess.hh" +#include "G4LFission.hh" +#include "G4LCapture.hh" +#include "G4TripathiCrossSection.hh" +#include "G4IonsShenCrossSection.hh" +#include "G4BinaryLightIonReaction.hh" +#include "G4LEDeuteronInelastic.hh" +#include "G4LETritonInelastic.hh" +#include "G4LEAlphaInelastic.hh" + // BERTINI PHYSICS LIST // // BERTINI FOR PROTONS, NEUTRONS AND PIONS // // LEP MODEL UP TO 100 MEV AND BINARY ION MODEL BETWEEN 80 MEV AND 40. GEV -// FOR DEUTERON, TRITON, HE3, ALPHA +// FOR DEUTERON, TRITON, ALPHA // // FISSION AND HADRON CAPTURE FOR NEUTRONS BETWEEN 0. MEV AND 100. TEV // HadrontherapyProtonBertini::HadrontherapyProtonBertini(const G4String& name): G4VPhysicsConstructor(name) { - G4cout << "The Bertini model is set for protons, neutrons and pions !!!!" << G4endl; - // Inelastic process, energy limits + G4cout << "The Bertini model (for inelastic scattering) is set for protons, neutrons and pions" << G4endl; - // // The Bertini model is set for protons, neutrons and pions // This model contains a pre-equilibrium model and a de-excitation model - // Energy limit of the Bertini model - bertiniLowLimit = 0.*MeV; - bertiniHighLimit = 300.*MeV; - - // Energy limit of the neutron fission and capture - neutronLowLimit = 0.*TeV; - neutronHighLimit = 100.*TeV; // Ions: // The inelastic scattering is modelled with LEP model up to 100 MeV, // then Binary Ion Model - // Energy limit of the LEP model for ions - LEPHighLimit = 100.*MeV; - // Energy limit of the binary ion model - binaryLightIonLowLimit = 80.*MeV; - binaryLightIonHighLimit = 40.*GeV; } HadrontherapyProtonBertini::~HadrontherapyProtonBertini() @@ -103,31 +99,131 @@ HadrontherapyProtonBertini::~HadrontherapyProtonBertini() void HadrontherapyProtonBertini::ConstructProcess() { G4ParticleDefinition* particle = 0; - G4ProcessManager* pmanager = 0; + G4ProcessManager* processManager = 0; - // LOW ENERGY ELASTIC SCATTERING - // FOR PROTON, NEUTRON, IONS - G4LElastic* elastic_model = new G4LElastic(); - G4HadronElasticProcess* elastic_scattering = new G4HadronElasticProcess(); - elastic_scattering -> RegisterMe(elastic_model); + // Physics for proton, neutron, pion+ and pion- + + // Elastic scattering: Low Energy Parameterised model + G4LElastic* elasticModel = new G4LElastic(); + G4HadronElasticProcess* elasticScattering = new G4HadronElasticProcess(); + elasticScattering->RegisterMe(elasticModel); + + // Inelastic scattering: Bertini Inelastic model + G4CascadeInterface* theBertiniModel = new G4CascadeInterface; - // INELASTIC SCATTERING - // Bertini Model for protons, pions and neutrons - G4CascadeInterface * theBertiniModel = new G4CascadeInterface; - // Set the min and max energy for the Bertini Model - theBertiniModel -> SetMinEnergy(bertiniLowLimit); - theBertiniModel -> SetMaxEnergy(bertiniHighLimit); + // Energy limit of the Bertini model + G4double bertiniLowEnergyLimit = 0.* MeV; + G4double bertiniHighEnergyLimit = 300.*MeV; + + theBertiniModel->SetMinEnergy(bertiniLowEnergyLimit); + theBertiniModel->SetMaxEnergy(bertiniHighEnergyLimit); - // Binary Cascade for deuteron, triton, alpha particle, He3 - G4BinaryLightIonReaction* theBinaryCascade = new G4BinaryLightIonReaction(); - // Set the min and max energy for the Binary Cascade - theBinaryCascade -> SetMinEnergy(binaryLightIonLowLimit); - theBinaryCascade -> SetMaxEnergy(binaryLightIonHighLimit); + //-------------------------------------------------------------------------------------- + // Proton processes + particle = G4Proton::Proton(); + processManager = particle->GetProcessManager(); + + // Model Registration + G4ProtonInelasticProcess* theProtonInelasticProcess = new G4ProtonInelasticProcess(); + theProtonInelasticProcess->RegisterMe(theBertiniModel); + + // Activate the cross-sections for proton nuclear scattering up to 20 GeV + theProtonInelasticProcess->AddDataSet(&theProtonCrossSection); + + // Activate the proton inelastic scattering + processManager->AddDiscreteProcess(theProtonInelasticProcess); + // Activate the elastic scattering + processManager->AddDiscreteProcess(elasticScattering); + + //-------------------------------------------------------------------------------------- + // Pions plus processes + particle = G4PionPlus::PionPlus(); + processManager = particle->GetProcessManager(); + + // Define the inelastic process for pions plus + G4PionPlusInelasticProcess* thePionPlusInelasticProcess = new G4PionPlusInelasticProcess("inelastic"); + // Register the Low Energy Inelastic Model for pions plus + thePionPlusInelasticProcess->RegisterMe(theBertiniModel); + // Activate the inelastic process for pions plus + processManager->AddDiscreteProcess(thePionPlusInelasticProcess); + // Activate the elastic process for pions plus + processManager->AddDiscreteProcess(elasticScattering); + + //-------------------------------------------------------------------------------------- + // Pion Minus processes + particle = G4PionMinus::PionMinus(); + processManager = particle->GetProcessManager(); + + // Define the inelastic process for pions minus + G4PionMinusInelasticProcess* thePionMinusInelasticProcess = new G4PionMinusInelasticProcess("inelastic"); + // Register the inelastic model for pion minus + thePionMinusInelasticProcess->RegisterMe(theBertiniModel); + // Activate the inelastic process for pion minus + processManager->AddDiscreteProcess(thePionMinusInelasticProcess); + // Activate the elastic process for pion minus + processManager->AddDiscreteProcess(elasticScattering); + + //-------------------------------------------------------------------------------------- + // Neutron processes + particle = G4Neutron::Neutron(); + processManager = particle->GetProcessManager(); + + // Register the Bertini model + G4NeutronInelasticProcess* theNeutronInelasticProcess = new G4NeutronInelasticProcess(); + theNeutronInelasticProcess->RegisterMe(theBertiniModel); + + // Activate the Cross-sections for neutron nuclear scattering from 14 MeV up to 20 GeV + theNeutronInelasticProcess->AddDataSet(&theNeutronCrossSection); + // Activate the neutron inelastic process + processManager->AddDiscreteProcess(theNeutronInelasticProcess); + // Activate the Hadron Elastic Process + processManager->AddDiscreteProcess(elasticScattering); + + // Neutron capture process + + // Energy limits + G4double neutronLowEnergyLimit = 0. * MeV; + G4double neutronHighEnergyLimit = 100. * TeV; + + G4HadronCaptureProcess* neutronCapture = new G4HadronCaptureProcess(); + // Final state production model for capture of neutral hadrons in nuclei + G4LCapture* captureModel = new G4LCapture(); + // Set the energy range for the capture model + captureModel->SetMinEnergy(neutronLowEnergyLimit); + captureModel->SetMaxEnergy(neutronHighEnergyLimit); + // Register the neutron capture model + neutronCapture->RegisterMe(captureModel); + // Activate the neutron capture process + processManager->AddDiscreteProcess(neutronCapture); + + // Process for induced fission + G4HadronFissionProcess* fission = new G4HadronFissionProcess(); + //Final state production model for induced fission + G4LFission* fissionModel = new G4LFission(); + // Set the energy range for the fission model + fissionModel->SetMinEnergy(neutronLowEnergyLimit); + fissionModel->SetMaxEnergy(neutronHighEnergyLimit); + // Register the fission model + fission->RegisterMe(fissionModel); + // Activate the fission process + processManager->AddDiscreteProcess(fission); + + //-------------------------------------------------------------------------------------- + // Physics for ions + + // Energy limit of the LEP model for ions + G4double LEPHighEnergyLimit = 100.* MeV; + + // Energy limit of the binary ion model + G4double binaryLightIonLowEnergyLimit = 80.* MeV; + G4double binaryLightIonHighEnergyLimit = 40.* GeV; + + // Cross section data sets // TRIPATHI CROSS SECTION - // Implementation of formulas in analogy to NASA technical paper 3621 by + // Implementation of formulas taken from NASA technical paper 3621 by // Tripathi, et al. Cross-sections for ion ion scattering - G4TripathiCrossSection* TripathiCrossSection = new G4TripathiCrossSection; + G4TripathiCrossSection* tripathiCrossSection = new G4TripathiCrossSection; // IONS SHEN CROSS SECTION // Implementation of formulas @@ -135,158 +231,83 @@ void HadrontherapyProtonBertini::ConstructProcess() // Total Reaction Cross Section for Heavy-Ion Collisions G4IonsShenCrossSection* aShen = new G4IonsShenCrossSection; -//-------------------------------------------------------------------------------------- - // Proton BERTINI MODEL - particle = G4Proton::Proton(); - pmanager = particle -> GetProcessManager(); - - // Model Registration - theIPProton.RegisterMe(theBertiniModel); - // Active the Cross-sections for proton nuclear scattering up to 20 GeV - theIPProton.AddDataSet(&thePXSec); + // Intra-nuclear transport: Binary Cascade Model + // Binary Cascade for deuteron, triton, alpha particle + G4BinaryLightIonReaction* theBinaryCascade = new G4BinaryLightIonReaction(); + // Set the min and max energy for the Binary Cascade + theBinaryCascade->SetMinEnergy(binaryLightIonLowEnergyLimit); + theBinaryCascade->SetMaxEnergy(binaryLightIonHighEnergyLimit); - // Active the proton inelastic scattering - pmanager -> AddDiscreteProcess(&theIPProton); - // Active the Hadron Elastic Process - pmanager -> AddDiscreteProcess(elastic_scattering); - - // deuteron + //-------------------------------------------------------------------------------------- + // Deuteron particle = G4Deuteron::Deuteron(); - pmanager = particle -> GetProcessManager(); + processManager = particle->GetProcessManager(); - // Final state production model for deuteron inelastic scattering below 100 MeV - G4LEDeuteronInelastic* theDIModel = new G4LEDeuteronInelastic; + // Final state production model for deuteron inelastic scattering below 100 MeV: Low Energy Parameterised model + G4LEDeuteronInelastic* theDeuteronLEInelasticModel = new G4LEDeuteronInelastic; // Set the maximum energy for LEP model - theDIModel -> SetMaxEnergy(LEPHighLimit); - // Active the Tripathi and aShen Cross Section - theIPdeuteron.AddDataSet(TripathiCrossSection); - theIPdeuteron.AddDataSet(aShen); + theDeuteronLEInelasticModel->SetMaxEnergy(LEPHighEnergyLimit); + // G4DeuteronInelasticProcess theDeuteronInelasticProcess; + + // Activate the Tripathi and Shen Cross Section + theDeuteronInelasticProcess.AddDataSet(tripathiCrossSection); + theDeuteronInelasticProcess.AddDataSet(aShen); // Register the Parameterised Deuteron Inelastic Model and the Ion Binary Cascade Model - theIPdeuteron.RegisterMe(theDIModel); - theIPdeuteron.RegisterMe(theBinaryCascade); - // Active the deuteron elastic and inelastic scattering - pmanager -> AddDiscreteProcess(&theIPdeuteron); - // Active the Hadron Elastic Process - pmanager -> AddDiscreteProcess(elastic_scattering); + theDeuteronInelasticProcess.RegisterMe(theDeuteronLEInelasticModel); + theDeuteronInelasticProcess.RegisterMe(theBinaryCascade); - // triton + // Activate the deuteron elastic and inelastic scattering + processManager->AddDiscreteProcess(&theDeuteronInelasticProcess); + // Activate the Hadron Elastic Process + processManager->AddDiscreteProcess(elasticScattering); + + //-------------------------------------------------------------------------------------- + // Triton particle = G4Triton::Triton(); - pmanager = particle -> GetProcessManager(); + processManager = particle->GetProcessManager(); - // Final state production model for Triton inelastic scattering below 100 MeV - G4LETritonInelastic* theTIModel = new G4LETritonInelastic; + // Final state production model for Triton inelastic scattering below 100 MeV: Low Energy Parameterised model + G4LETritonInelastic* theTritonLEInelasticModel = new G4LETritonInelastic; // Set the maximum energy for LEP model - theTIModel -> SetMaxEnergy(LEPHighLimit); - // Active the Tripathi and aShen Cross Section - theIPtriton.AddDataSet(TripathiCrossSection); - theIPtriton.AddDataSet(aShen); - // Register the Triton Inelastic and Binary Cascade Model - theIPtriton.RegisterMe(theTIModel); - theIPtriton.RegisterMe(theBinaryCascade); - // Active the triton inelastic scattering using the triton inelastic and binary cascade model - pmanager -> AddDiscreteProcess(&theIPtriton); - // Active the Hadron Elastic Process - pmanager -> AddDiscreteProcess(elastic_scattering); + theTritonLEInelasticModel->SetMaxEnergy(LEPHighEnergyLimit); - // alpha + // Activate the Tripathi and Shen Cross Section + //G4TritonInelasticProcess theTritonInelasticProcess; + theTritonInelasticProcess.AddDataSet(tripathiCrossSection); + theTritonInelasticProcess.AddDataSet(aShen); + + // Register the Triton Inelastic and Binary Cascade Models + theTritonInelasticProcess.RegisterMe(theTritonLEInelasticModel); + theTritonInelasticProcess.RegisterMe(theBinaryCascade); + + // Activate the triton inelastic scattering using the parameterised Triton Inelastic and Binary Cascade models + processManager->AddDiscreteProcess(&theTritonInelasticProcess); + // Activate the Hadron Elastic Process + processManager->AddDiscreteProcess(elasticScattering); + + //-------------------------------------------------------------------------------------- + // Alpha particle = G4Alpha::Alpha(); - pmanager = particle->GetProcessManager(); - // Final state production model for Alpha inelastic scattering below 20 GeV - G4LEAlphaInelastic* theAIModel = new G4LEAlphaInelastic; + processManager = particle->GetProcessManager(); + + // Final state production model for Alpha inelastic scattering below 20 GeV: Low Energy Parameterised model + G4LEAlphaInelastic* theAlphaLEInelasticModel = new G4LEAlphaInelastic; // Set the maximum energy for LEP model - theAIModel -> SetMaxEnergy(LEPHighLimit); - // Register the Triton Inelastic and Binary Cascade Model - theIPalpha.AddDataSet(TripathiCrossSection); - theIPalpha.AddDataSet(aShen); - // Register the Alpha Inelastic and Binary Cascade Model - theIPalpha.RegisterMe(theAIModel); - theIPalpha.RegisterMe(theBinaryCascade); - // Active the alpha inelastic scattering using the alpha inelastic and binary cascade model - pmanager -> AddDiscreteProcess(&theIPalpha); - // Active the Hadron Elastic Process - pmanager -> AddDiscreteProcess(elastic_scattering); + theAlphaLEInelasticModel->SetMaxEnergy(LEPHighEnergyLimit); - // He3 - // particle = G4He3::He3(); -// pmanager = particle->GetProcessManager(); - -// // Binary Cascade inelastic scattering for ions -// G4BinaryLightIonReaction * theGenIonBC= new G4BinaryLightIonReaction; -// // Inelastic Scattering for ions -// G4HadronInelasticProcess* theIPHe3 = new G4HadronInelasticProcess("He3Inelastic",particle); -// // Active the Tripathi and aShen Cross Section -// theIPHe3 -> AddDataSet(TripathiCrossSection); -// theIPHe3 -> AddDataSet(aShen); -// // Register the Alpha Binary Cascade Model -// theIPHe3 -> RegisterMe(theGenIonBC); -// // Active the Inelastic Process for He3 -// pmanager -> AddDiscreteProcess(theIPHe3); -// // Active the Hadron Elastic Process -// pmanager -> AddDiscreteProcess(elastic_scattering); + //G4AlphaInelasticProcess theAlphaInelasticProcess; -// Neutron processes - particle = G4Neutron::Neutron(); - pmanager = particle->GetProcessManager(); - // Register the Precompound model - theIPNeutron.RegisterMe(theBertiniModel); - // Active the Cross-sections for neutron nuclear scattering from 14 MeV up to 20 GeV - theIPNeutron.AddDataSet(&theNXSec); - // Active the neutron inelastic process - pmanager -> AddDiscreteProcess(&theIPNeutron); - // Active the Hadron Elastic Process - pmanager -> AddDiscreteProcess(elastic_scattering); + // Activate the Tripathi and Shen Cross Section + theAlphaInelasticProcess.AddDataSet(tripathiCrossSection); + theAlphaInelasticProcess.AddDataSet(aShen); -// Pions plus processes - particle = G4PionPlus::PionPlus(); - pmanager = particle -> GetProcessManager(); - // Define the inelastic process for pions plus - G4PionPlusInelasticProcess* thePionPlusInelasticProcess = new G4PionPlusInelasticProcess("inelastic"); - // Register the Low Energy Inelastic Model for pions plus - thePionPlusInelasticProcess -> RegisterMe(theBertiniModel); - // Active the inelastic process for pions plus - pmanager->AddDiscreteProcess(thePionPlusInelasticProcess); - pmanager -> AddDiscreteProcess(elastic_scattering); + // Register the Alpha Inelastic and Binary Cascade Models + theAlphaInelasticProcess.RegisterMe(theAlphaLEInelasticModel); + theAlphaInelasticProcess.RegisterMe(theBinaryCascade); - // Pion Minus processes - particle = G4PionMinus::PionMinus(); - pmanager = particle -> GetProcessManager(); - // Define the inelastic process for pions minus - G4PionMinusInelasticProcess* thePionMinusInelasticProcess = new G4PionMinusInelasticProcess("inelastic"); - // Register the inelastic model for pion minus - thePionMinusInelasticProcess -> RegisterMe(theBertiniModel); - // Active the inelastic process for pion minus - pmanager -> AddDiscreteProcess(thePionMinusInelasticProcess); - // Active Absorption process for pion minus - pmanager -> AddRestProcess(new G4PiMinusAbsorptionAtRest, ordDefault); - pmanager -> AddDiscreteProcess(elastic_scattering); - - //HADRON CAPTURE - // Process for capture of neutral hadrons - G4HadronCaptureProcess* neutronCapture = new G4HadronCaptureProcess(); - // Final state production model for capture of neutral hadrons in nuclei - G4LCapture* capture_model = new G4LCapture(); - // Set the energy range for the capture model - capture_model -> SetMinEnergy(neutronLowLimit); - capture_model -> SetMaxEnergy(neutronHighLimit); - // Register the capture model - neutronCapture -> RegisterMe(capture_model); - // Active the neutron capture process - pmanager -> AddDiscreteProcess(neutronCapture); - - //FISSION - // Process for induced fission - G4HadronFissionProcess* fission = new G4HadronFissionProcess(); - //Final state production model for induced fission - G4LFission* fission_model = new G4LFission(); - // Set the energy range for the fission model - fission_model -> SetMinEnergy(neutronLowLimit); - fission_model -> SetMaxEnergy(neutronHighLimit); - // Register the fission model - fission -> RegisterMe(fission_model); - // Active the fission process - pmanager -> AddDiscreteProcess(fission); + // Activate the alpha inelastic scattering using the parameterised Alpha Inelastic and Binary Cascade models + processManager->AddDiscreteProcess(&theAlphaInelasticProcess); + // Activate the Hadron Elastic Process + processManager->AddDiscreteProcess(elasticScattering); } - - - diff --git a/examples/advanced/hadrontherapy/src/HadrontherapyProtonBinary.cc b/examples/advanced/hadrontherapy/src/HadrontherapyProtonBinary.cc deleted file mode 100644 index e336bcc778..0000000000 --- a/examples/advanced/hadrontherapy/src/HadrontherapyProtonBinary.cc +++ /dev/null @@ -1,272 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// $Id: HadrontherapyProtonBinary.cc; May 2005 -// ---------------------------------------------------------------------------- -// GEANT 4 - Hadrontherapy example -// ---------------------------------------------------------------------------- -// Code developed by: -// -// G.A.P. Cirrone(a)*, F. Di Rosa(a), S. Guatelli(b), G. Russo(a) -// -// (a) Laboratori Nazionali del Sud -// of the National Institute for Nuclear Physics, Catania, Italy -// (b) National Institute for Nuclear Physics Section of Genova, genova, Italy -// -// * cirrone@lns.infn.it -// ---------------------------------------------------------------------------- - -#include "HadrontherapyProtonBinary.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" -#include "G4ProcessVector.hh" -#include "G4ParticleTypes.hh" -#include "G4ParticleTable.hh" -#include "G4Material.hh" -#include "G4LElastic.hh" -#include "G4BinaryCascade.hh" -#include "G4CascadeInterface.hh" -#include "G4PionPlusInelasticProcess.hh" -#include "G4LEPionPlusInelastic.hh" -#include "G4LEPionMinusInelastic.hh" -#include "G4HEPionPlusInelastic.hh" -#include "G4HEPionMinusInelastic.hh" -#include "G4PionMinusInelasticProcess.hh" -#include "G4PionPlusInelasticProcess.hh" -#include "G4LEPionMinusInelastic.hh" -#include "G4HEPionMinusInelastic.hh" -#include "G4PiMinusAbsorptionAtRest.hh" -#include "G4AntiProtonInelasticProcess.hh" -#include "G4LEAntiProtonInelastic.hh" -#include "G4HEAntiProtonInelastic.hh" -#include "G4AntiProtonAnnihilationAtRest.hh" - -// BINARY + PRECOMPOUND PHYSICS LIST -// -// BINARY + PRECOMPOUND + EVAPORATION(DEFAULT EVAPORATION) FOR PROTONS, NEUTRONS AND PIONS -// -// LEP MODEL UP TO 100 MEV AND BINARY ION MODEL BETWEEN 80 MEV AND 40. GEV -// FOR DEUTERON, TRITON, HE3, ALPHA -// -// FISSION AND HADRON CAPTURE FOR NEUTRONS BETWEEN 0. MEV AND 100. TEV -// -HadrontherapyProtonBinary::HadrontherapyProtonBinary(const G4String& name): - G4VPhysicsConstructor(name) -{ - // Energy limits of the model for ions - binaryLightIonLowLimit = 80.*MeV; - binaryLightIonHighLimit = 40.*GeV; - LEPHighLimit = 100.*MeV; - - // Energy limits for protons, neutrons and pions - precompoundLowLimit = 0.*MeV; - precompoundHighLimit = 300.*MeV; - neutronLowLimit = 0.*TeV; - neutronHighLimit = 100.*TeV; - - binaryLowLimit = 0.*MeV; - binaryHighLimit = 300.*MeV; -} - -HadrontherapyProtonBinary::~HadrontherapyProtonBinary() -{} - -void HadrontherapyProtonBinary::ConstructProcess() -{ - - // ELASTIC SCATTERING FOR PROTON, NEUTRON, IONS - G4LElastic* elastic_Model = new G4LElastic(); - G4HadronElasticProcess* elastic = new G4HadronElasticProcess(); - elastic -> RegisterMe(elastic_Model); - - // PRECOMPOUND MODEL - G4PreCompoundModel* thePreEquilib = new G4PreCompoundModel(&theHandler); - thePreEquilib -> SetMinEnergy(precompoundLowLimit); - thePreEquilib -> SetMaxEnergy(precompoundHighLimit); - - ///////////////////////////////////////////////////////////////////////////// - // HADRONIC PHYSICS FOR PROTONS - G4ParticleDefinition* particle = 0; - G4ProcessManager* pmanager = 0; - particle = G4Proton::Proton(); - pmanager = particle -> GetProcessManager(); - - // INELASTIC SCATTERING: - //BINARY - PRECOMPOUND + DEFAULT EVAPORATION NO FERMI BREAK-UP - G4BinaryCascade* thePBC = new G4BinaryCascade(); - thePBC -> SetMinEnergy(binaryLowLimit); - thePBC -> SetMaxEnergy(binaryHighLimit); - theIPProton.RegisterMe(thePBC); - theIPProton.RegisterMe(thePreEquilib); - theIPProton.AddDataSet(&thePXSec); - pmanager -> AddDiscreteProcess(&theIPProton); - - // ELASTIC SCATTERING - pmanager -> AddDiscreteProcess(elastic); //ELASIC SCATTERING - - ///////////////////////////////////////////////////////////////////////////// - ////////// VERIFICARE LA POSSIBILITA' DEL BINARY PER PIONI - ///////////////////////////////////////////////////////////////////////////// - // HADRONIC PHYSICS FOR PION PLUS - particle = G4PionPlus::PionPlus(); - - // ELASTIC SCATTERING - pmanager -> AddDiscreteProcess(elastic); - - // INELASTIC SCATTERING: BINARY - PRECOMPOUND + DEFAULT EVAPORATION NO FERMI BREAK-UP - pmanager -> AddDiscreteProcess(elastic); - G4PionPlusInelasticProcess* thePionPlusInelasticProcess = new G4PionPlusInelasticProcess("inelastic"); - - G4PreCompoundModel* theLEPionPlusInelasticModel = new G4PreCompoundModel(&theHandler); - - thePionPlusInelasticProcess -> RegisterMe(theLEPionPlusInelasticModel); - - pmanager -> AddDiscreteProcess(thePionPlusInelasticProcess); - - - ///////////////////////////////////////////////////////////////////////////// - //HADRONIC PHYSICS FOR PION MINUS - particle = G4PionMinus::PionMinus(); - - // ELASTIC SCATTERING - pmanager -> AddDiscreteProcess(elastic); - - // INELASTIC SCATTERING: BINARY - PRECOMPOUND + DEFAULT EVAPORATION NO FERMI BREAK-UP - G4PionMinusInelasticProcess* thePionMinusInelasticProcess = new G4PionMinusInelasticProcess("inelastic"); - - G4PreCompoundModel* theLEPionMinusInelasticModel = new G4PreCompoundModel(&theHandler); - - thePionMinusInelasticProcess -> RegisterMe(theLEPionMinusInelasticModel); - - pmanager -> AddDiscreteProcess(thePionMinusInelasticProcess); - -///////////////////////////////////////////////////////////////////////////// - // Neutron - particle = G4Neutron::Neutron(); - pmanager = particle->GetProcessManager(); - thePreEquilib -> SetMinEnergy(precompoundLowLimit); - thePreEquilib -> SetMaxEnergy(precompoundHighLimit); - G4BinaryCascade* theNBC = new G4BinaryCascade(); - theNBC->SetMinEnergy(binaryLowLimit); - theNBC->SetMaxEnergy(binaryHighLimit); - theIPNeutron.RegisterMe(theNBC); - theIPNeutron.RegisterMe(thePreEquilib); - theIPNeutron.AddDataSet(&theNXSec); - pmanager -> AddDiscreteProcess(&theIPNeutron); - pmanager -> AddDiscreteProcess(elastic); // ELASTIC SCATTERING - - //Hadron Capture - G4HadronCaptureProcess* neutronCapture = new G4HadronCaptureProcess(); - G4LCapture* capture_model = new G4LCapture(); - capture_model -> SetMinEnergy(neutronLowLimit); - capture_model -> SetMaxEnergy(neutronHighLimit); - neutronCapture -> RegisterMe(capture_model); - pmanager -> AddDiscreteProcess(neutronCapture); - - //Fission - G4HadronFissionProcess* fission = new G4HadronFissionProcess(); - G4LFission* fission_model = new G4LFission(); - fission_model -> SetMinEnergy(neutronLowLimit); - fission_model -> SetMaxEnergy(neutronHighLimit); - fission -> RegisterMe(fission_model); - pmanager -> AddDiscreteProcess(fission); - - ///////////////////////////////////////////////////////////////////////////// - // ION HADRONIC PHYSICS LIST - G4TripathiCrossSection * TripathiCrossSection= new G4TripathiCrossSection; - G4IonsShenCrossSection * aShen = new G4IonsShenCrossSection; - - // INELASTIC SCATTERING FOR IONS - G4BinaryLightIonReaction* theBC = new G4BinaryLightIonReaction(); - theBC -> SetMinEnergy(binaryLightIonLowLimit); - theBC -> SetMaxEnergy(binaryLightIonHighLimit); - - ///////////////////////////////////////////////////////////////////////////// - // deuteron - particle = G4Deuteron::Deuteron(); - pmanager = particle -> GetProcessManager(); - - // INELASTIC SCATTERING - G4LEDeuteronInelastic* theDIModel = new G4LEDeuteronInelastic; - theDIModel -> SetMaxEnergy(LEPHighLimit); - theIPdeuteron.AddDataSet(TripathiCrossSection); - theIPdeuteron.AddDataSet(aShen); - theIPdeuteron.RegisterMe(theDIModel); - theIPdeuteron.RegisterMe(theBC); - pmanager -> AddDiscreteProcess(&theIPdeuteron); - - //ELASTIC SCATTERING - pmanager -> AddDiscreteProcess(elastic); - - ///////////////////////////////////////////////////////////////////////////// - // triton - particle = G4Triton::Triton(); - pmanager = particle->GetProcessManager(); - // INELASTIC SCATTERING - G4LETritonInelastic* theTIModel = new G4LETritonInelastic; - theTIModel -> SetMaxEnergy(LEPHighLimit); - theIPtriton.AddDataSet(TripathiCrossSection); - theIPtriton.AddDataSet(aShen); - theIPtriton.RegisterMe(theTIModel); - theIPtriton.RegisterMe(theBC); - pmanager -> AddDiscreteProcess(&theIPtriton); - - //ELASTIC SCATTERING - pmanager -> AddDiscreteProcess(elastic); //ELASTIC SCATTERING - - ///////////////////////////////////////////////////////////////////////////// - // alpha - particle = G4Alpha::Alpha(); - pmanager = particle->GetProcessManager(); - - // INELASTIC SCATTERING - G4LEAlphaInelastic* theAIModel = new G4LEAlphaInelastic; - theAIModel -> SetMaxEnergy(LEPHighLimit); - theIPalpha.AddDataSet(TripathiCrossSection); - theIPalpha.AddDataSet(aShen); - theIPalpha.RegisterMe(theAIModel); - theIPalpha.RegisterMe(theBC); - pmanager -> AddDiscreteProcess(&theIPalpha); - //ELASTIC SCATTERING - pmanager -> AddDiscreteProcess(elastic); //ELASTIC SCATTERING - - ///////////////////////////////////////////////////////////////////////////// - // He3 - // particle = G4He3::He3(); -// pmanager = particle->GetProcessManager(); -// G4BinaryLightIonReaction * theGenIonBC= new G4BinaryLightIonReaction; -// G4HadronInelasticProcess* theIPHe3 = -// new G4HadronInelasticProcess("He3Inelastic",particle); -// theIPHe3 -> AddDataSet(TripathiCrossSection); -// theIPHe3 -> AddDataSet(aShen); -// theIPHe3 -> RegisterMe(theGenIonBC); -// pmanager -> AddDiscreteProcess(theIPHe3); -// pmanager -> AddDiscreteProcess(elastic); //ELASTIC SCATTERING - - -} - - - diff --git a/examples/advanced/hadrontherapy/src/HadrontherapyProtonPrecompound.cc b/examples/advanced/hadrontherapy/src/HadrontherapyProtonPrecompound.cc index ed0d5171b5..77b750dd68 100644 --- a/examples/advanced/hadrontherapy/src/HadrontherapyProtonPrecompound.cc +++ b/examples/advanced/hadrontherapy/src/HadrontherapyProtonPrecompound.cc @@ -50,20 +50,13 @@ #include "G4PiNuclearCrossSection.hh" #include "G4LFission.hh" #include "G4LCapture.hh" -#include "G4NeutronInelasticProcess.hh" -#include "G4NeutronInelasticCrossSection.hh" #include "G4TripathiCrossSection.hh" #include "G4IonsShenCrossSection.hh" #include "G4HadronInelasticProcess.hh" #include "G4LEDeuteronInelastic.hh" -#include "G4DeuteronInelasticProcess.hh" -#include "G4TritonInelasticProcess.hh" #include "G4LETritonInelastic.hh" -#include "G4AlphaInelasticProcess.hh" #include "G4LEAlphaInelastic.hh" #include "G4HadronElasticProcess.hh" -#include "G4ProtonInelasticProcess.hh" -#include "G4ProtonInelasticCrossSection.hh" #include "G4HadronCaptureProcess.hh" #include "G4BinaryLightIonReaction.hh" #include "G4HadronInelasticProcess.hh" @@ -71,32 +64,12 @@ // PRECOMPOUND PHYSICS LIST // // PRECOMPOUND + EVAPORATION(DEFAULT EVAPORATION) FOR PROTONS, NEUTRONS AND PIONS -// -// LEP MODEL UP TO 200 MEV -// -// FISSION AND HADRON CAPTURE FOR NEUTRONS BETWEEN 0. MEV AND 100. TEV -// + HadrontherapyProtonPrecompound::HadrontherapyProtonPrecompound(const G4String& name): G4VPhysicsConstructor(name) { - G4cout<<"****** Proton Precompound Physics List is active !!!!!! ******" < RegisterMe(elasticScattering_model); + // Physics for proton, neutron, pion+ and pion- + // Elastic scattering: Low Energy Parameterised model + + G4LElastic* elasticScatteringModel = new G4LElastic(); + G4HadronElasticProcess* elasticScattering = new G4HadronElasticProcess(); + elasticScattering -> RegisterMe(elasticScatteringModel); - // TRIPATHI CROSS SECTION - // Implementation of formulas in analogy to NASA technical paper 3621 by - // Tripathi, et al. Cross-sections for ion ion scattering - G4TripathiCrossSection* TripathiCrossSection = new G4TripathiCrossSection; - - // IONS SHEN CROSS SECTION - // Implementation of formulas - // Shen et al. Nuc. Phys. A 491 130 (1989) - // Total Reaction Cross Section for Heavy-Ion Collisions - G4IonsShenCrossSection* aShen = new G4IonsShenCrossSection; - -//------------------------------------------// -// Activate the hadronic physics processes // -//------------------------------------------// - -// PRECOMPOUND + EVAPORATION(DEFAULT EVAPORATION) - - //////////// - // Proton // - //////////// + // Inelastic scattering: Inelastic PreCompound model + G4PreCompoundModel* preequilibriumModel = new G4PreCompoundModel(&theHandler); + // Set the minimum and maximum energy value of the pre-equilibrium model + G4double precompoundLowLimit = 0. * MeV; + G4double precompoundHighLimit = 300. * MeV; + preequilibriumModel -> SetMinEnergy(precompoundLowLimit); + preequilibriumModel -> SetMaxEnergy(precompoundHighLimit); + //-------------------------------------------------------------------------------------- + // Proton processes particle = G4Proton::Proton(); pmanager = particle -> GetProcessManager(); - G4PreCompoundModel* preequilibriumModel = new G4PreCompoundModel(&theHandler); - - // Set the minimum and maximum energy value of the pre-equilibrium model - preequilibriumModel -> SetMinEnergy(precompoundLowLimit); - preequilibriumModel -> SetMaxEnergy(precompoundHighLimit); - // Model Registration protonInelasticProcess.RegisterMe(preequilibriumModel); // Activate the cross-sections for proton nuclear scattering @@ -151,11 +108,10 @@ void HadrontherapyProtonPrecompound::ConstructProcess() // Activate the proton inelastic scattering using the precompound model pmanager -> AddDiscreteProcess(&protonInelasticProcess); // Activate the proton elastic scattering - pmanager -> AddDiscreteProcess(elastic_scattering); + pmanager -> AddDiscreteProcess(elasticScattering); - ///////////// - // Neutron // - ///////////// + //-------------------------------------------------------------------------------------- + // Neutron processes particle = G4Neutron::Neutron(); pmanager = particle -> GetProcessManager(); @@ -168,11 +124,42 @@ void HadrontherapyProtonPrecompound::ConstructProcess() // Activate the neutron inelastic process pmanager -> AddDiscreteProcess(&neutronInelasticProcess); // Activate the neutron elastic scattering - pmanager -> AddDiscreteProcess(elastic_scattering); + pmanager -> AddDiscreteProcess(elasticScattering); + + // Neutron capture process + + // Energy limits + G4HadronCaptureProcess* neutronCapture = new G4HadronCaptureProcess(); + + G4LCapture* captureModel = new G4LCapture(); + + // Energy limit of the neutron fission and capture + G4double neutronLowLimit = 0.*TeV; + G4double neutronHighLimit = 100.*TeV; + // Set the energy range for the capture model + captureModel -> SetMinEnergy(neutronLowLimit); + captureModel -> SetMaxEnergy(neutronHighLimit); + + // Register the capture model + neutronCapture -> RegisterMe(captureModel); + // Active the capture process + pmanager -> AddDiscreteProcess(neutronCapture); + + // Process for induced fission + G4HadronFissionProcess* fission = new G4HadronFissionProcess(); + //Final state production model for induced fission + G4LFission* fissionModel = new G4LFission(); + // Set the energy range for the fission model + fissionModel -> SetMinEnergy(neutronLowLimit); + fissionModel -> SetMaxEnergy(neutronHighLimit); + // Register the fission model + fission -> RegisterMe(fissionModel); + // Active the fission process + pmanager -> AddDiscreteProcess(fission); + + //-------------------------- + // Pion Plus - //////////////// - // Pions plus // - //////////////// particle = G4PionPlus::PionPlus(); pmanager = particle -> GetProcessManager(); @@ -182,11 +169,10 @@ void HadrontherapyProtonPrecompound::ConstructProcess() // Active the inelastic process for pions plus pmanager -> AddDiscreteProcess(pionPlusInelasticProcess); - pmanager -> AddDiscreteProcess(elastic_scattering); - - //////////////// - // Pion Minus // - /////////////// + pmanager -> AddDiscreteProcess(elasticScattering); + + //----------------------------- + // Pion Minus particle = G4PionMinus::PionMinus(); pmanager = particle -> GetProcessManager(); @@ -198,11 +184,24 @@ void HadrontherapyProtonPrecompound::ConstructProcess() // Active the inelastic process for pion minus pmanager -> AddDiscreteProcess(pionMinusInelasticProcess); - pmanager -> AddDiscreteProcess(elastic_scattering); + pmanager -> AddDiscreteProcess(elasticScattering); - /////////////// - // Deuteron // - ////////////// + //-------------------------------------------------------------------------------------- + // Physics for ions + + // Energy limit of the LEP model for ions + G4double LEPHighLimit = 200.*MeV; + + // TRIPATHI CROSS SECTION + // Implementation of formulas in analogy to NASA technical paper 3621 by + // Tripathi, et al. Cross-sections for ion ion scattering + G4TripathiCrossSection* TripathiCrossSection = new G4TripathiCrossSection; + + // IONS SHEN CROSS SECTION + // Implementation of formulas + // Shen et al. Nuc. Phys. A 491 130 (1989) + // Total Reaction Cross Section for Heavy-Ion Collisions + G4IonsShenCrossSection* aShen = new G4IonsShenCrossSection; particle = G4Deuteron::Deuteron(); pmanager = particle -> GetProcessManager(); @@ -222,11 +221,9 @@ void HadrontherapyProtonPrecompound::ConstructProcess() // Active the deuteron inelastic scattering using the deuteron inelastic and binary cascade model pmanager -> AddDiscreteProcess(&deuteronInelasticProcess); // Active the Hadron Elastic Process - pmanager -> AddDiscreteProcess(elastic_scattering); + pmanager -> AddDiscreteProcess(elasticScattering); - //////////// - // Triton // - //////////// + // Triton particle = G4Triton::Triton(); pmanager = particle -> GetProcessManager(); @@ -245,11 +242,9 @@ void HadrontherapyProtonPrecompound::ConstructProcess() // Active the triton inelastic scattering process pmanager -> AddDiscreteProcess(&tritonInelasticProcess); // Active the triton elastic scattering process - pmanager -> AddDiscreteProcess(elastic_scattering); + pmanager -> AddDiscreteProcess(elasticScattering); - /////////// - // Alpha // - ////////// + // Alpha particles particle = G4Alpha::Alpha(); pmanager = particle -> GetProcessManager(); @@ -268,56 +263,24 @@ void HadrontherapyProtonPrecompound::ConstructProcess() // Active the alpha inelastic scattering pmanager -> AddDiscreteProcess(&alphaInelasticProcess); // Active the alpha elastic scattering - pmanager -> AddDiscreteProcess(elastic_scattering); + pmanager -> AddDiscreteProcess(elasticScattering); // He3 // particle = G4He3::He3(); // G4HadronInelasticProcess* He3inelasticProcess = - //new G4HadronInelasticProcess("He3Inelastic",particle); + // new G4HadronInelasticProcess("He3Inelastic",particle); - //G4BinaryLightIonReaction * ionBinaryCascade= new G4BinaryLightIonReaction; + // G4BinaryLightIonReaction * ionBinaryCascade= new G4BinaryLightIonReaction; - //He3inelasticProcess -> AddDataSet(TripathiCrossSection); + // He3inelasticProcess -> AddDataSet(TripathiCrossSection); //He3inelasticProcess -> AddDataSet(aShen); //He3inelasticProcess -> RegisterMe(ionBinaryCascade); //pmanager = particle -> GetProcessManager(); //pmanager -> AddDiscreteProcess(He3inelasticProcess); - //pmanager -> AddDiscreteProcess(elastic_scattering); - - //////////////////// - // HADRON CAPTURE // - //////////////////// + //pmanager -> AddDiscreteProcess(elasticScattering); - G4HadronCaptureProcess* neutronCapture = new G4HadronCaptureProcess(); - - G4LCapture* capture_model = new G4LCapture(); - - // Set the energy range for the capture model - capture_model -> SetMinEnergy(neutronLowLimit); - capture_model -> SetMaxEnergy(neutronHighLimit); - - // Register the capture model - neutronCapture -> RegisterMe(capture_model); - // Active the capture process - pmanager -> AddDiscreteProcess(neutronCapture); - - ////////////// - // FISSION // - ///////////// - - // Process for induced fission - G4HadronFissionProcess* fission = new G4HadronFissionProcess(); - //Final state production model for induced fission - G4LFission* fission_model = new G4LFission(); - // Set the energy range for the fission model - fission_model -> SetMinEnergy(neutronLowLimit); - fission_model -> SetMaxEnergy(neutronHighLimit); - // Register the fission model - fission -> RegisterMe(fission_model); - // Active the fission process - pmanager -> AddDiscreteProcess(fission); } diff --git a/examples/advanced/hadrontherapy/src/HadrontherapyProtonPrecompoundFermi.cc b/examples/advanced/hadrontherapy/src/HadrontherapyProtonPrecompoundFermi.cc deleted file mode 100644 index 83f9961035..0000000000 --- a/examples/advanced/hadrontherapy/src/HadrontherapyProtonPrecompoundFermi.cc +++ /dev/null @@ -1,302 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// $Id: HadrontherapyProtonPrecompoundFermi.cc; May 2005 -// ---------------------------------------------------------------------------- -// GEANT 4 - Hadrontherapy example -// ---------------------------------------------------------------------------- -// Code developed by: -// -// G.A.P. Cirrone(a)*, F. Di Rosa(a), S. Guatelli(b), G. Russo(a) -// -// (a) Laboratori Nazionali del Sud -// of the National Institute for Nuclear Physics, Catania, Italy -// (b) National Institute for Nuclear Physics Section of Genova, genova, Italy -// -// * cirrone@lns.infn.it -// ---------------------------------------------------------------------------- - -#include "HadrontherapyProtonPrecompoundFermi.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" -#include "G4ProcessVector.hh" -#include "G4ParticleTypes.hh" -#include "G4ParticleTable.hh" -#include "G4Material.hh" -#include "G4LElastic.hh" -#include "G4BinaryCascade.hh" -#include "G4CascadeInterface.hh" -#include "G4PionPlusInelasticProcess.hh" -#include "G4LEPionPlusInelastic.hh" -#include "G4LEPionMinusInelastic.hh" -#include "G4HEPionPlusInelastic.hh" -#include "G4HEPionMinusInelastic.hh" -#include "G4PionMinusInelasticProcess.hh" -#include "G4LEPionMinusInelastic.hh" -#include "G4HEPionMinusInelastic.hh" -#include "G4PiMinusAbsorptionAtRest.hh" -#include "G4AntiProtonInelasticProcess.hh" -#include "G4LEAntiProtonInelastic.hh" -#include "G4HEAntiProtonInelastic.hh" -#include "G4AntiProtonAnnihilationAtRest.hh" -#include "G4FermiBreakUp.hh" -#include "G4PiNuclearCrossSection.hh" -// -// -// PRECOMPOUND + FERMI BREAKUP PHYSICS LIST -// -// ELASTIC SCATTERING FOR ALL THE HADRONS AND IONS -// INELASTIC SCATTERING: -// * PRECOMPOUND PHYSICS LIST with DEFAULT EVAPORATION MODEL + FERMI BREAK-UP -// * PRECOMPOUND + EVAPORATION + FERMI BREAK-UP FOR PROTONS, NEUTRONS AND PIONS -// * LEP MODEL UP TO 100 MEV AND BINARY ION MODEL BETWEEN 80 MEV AND 40. GEV -// FOR DEUTERON, TRITON, HE3, ALPHA -// * FISSION AND HADRON CAPTURE FOR NEUTRONS BETWEEN 0. MEV AND 100. TEV -// -// -HadrontherapyProtonPrecompoundFermi::HadrontherapyProtonPrecompoundFermi(const G4String& name): - G4VPhysicsConstructor(name) -{ - // Inelastic process, energy limits - - // Protons, neutrons and pions - // Energy limit of the precompound model - precompoundLowLimit = 0.*MeV; - precompoundHighLimit = 300.*MeV; - - // Energy limit of the neutron fission and capture - neutronLowLimit = 0.*TeV; - neutronHighLimit = 100.*TeV; - - // Ions - // Energy limit of the binary ion model - binaryLightIonLowLimit = 80.*MeV; - binaryLightIonHighLimit = 40.*GeV; - - // Energy limit of the LEP model for ions - LEPHighLimit = 100.*MeV; - - //targetZ should vary between 1 and 8 - targetZ = 1; - targetA = 2 * targetZ; - -} - -HadrontherapyProtonPrecompoundFermi::~HadrontherapyProtonPrecompoundFermi() -{} - -void HadrontherapyProtonPrecompoundFermi::ConstructProcess() -{ - G4ParticleDefinition* particle = 0; - G4ProcessManager* pmanager = 0; - - // LOW ENERGY ELASTIC SCATTERING - // FOR PROTON, NEUTRON, IONS - G4LElastic* elastic_Model = new G4LElastic(); - G4HadronElasticProcess* elastic = new G4HadronElasticProcess(); - elastic -> RegisterMe(elastic_Model); - - // FERMI BREAK-UP MODEL - G4FermiBreakUp* breakup = new G4FermiBreakUp(); - // Set the Fermi break up model - theHandler.SetFermiModel(breakup); - // fix the target A and Z; - theHandler.SetMaxAandZForFermiBreakUp(targetA,targetZ); - - // INELASTIC SCATTERING - // Binary Cascade - G4BinaryLightIonReaction* theBC = new G4BinaryLightIonReaction(); - // Set the min and max energy for the Binary Cascade - theBC -> SetMinEnergy(binaryLightIonLowLimit); - theBC -> SetMaxEnergy(binaryLightIonHighLimit); - - // TRIPATHI CROSS SECTION - // Implementation of formulas in analogy to NASA technical paper 3621 by - // Tripathi, et al. Cross-sections for ion ion scattering - G4TripathiCrossSection* TripathiCrossSection = new G4TripathiCrossSection; - - // IONS SHEN CROSS SECTION - // Implementation of formulas - // Shen et al. Nuc. Phys. A 491 130 (1989) - // Total Reaction Cross Section for Heavy-Ion Collisions - G4IonsShenCrossSection* aShen = new G4IonsShenCrossSection; - -//-------------------------------------------------------------------------------------- - - // Proton PRECOMPOUND + EVAPORATION(DEFAULT EVAPORATION)+ FERMI BREAK-UP - particle = G4Proton::Proton(); - pmanager = particle->GetProcessManager(); - - G4PreCompoundModel* thePreEquilib = new G4PreCompoundModel(&theHandler); - // Set the range of minimum and maximum energy value - thePreEquilib -> SetMinEnergy(precompoundLowLimit); - thePreEquilib -> SetMaxEnergy(precompoundHighLimit); - // Model Registration - theIPProton.RegisterMe(thePreEquilib); - // Active the Cross-sections for proton nuclear scattering up to 20 GeV - theIPProton.AddDataSet(&thePXSec); - // Active the proton inelastic scattering using the precompound model - pmanager -> AddDiscreteProcess(&theIPProton); - // Active the Hadron Elastic Process - pmanager -> AddDiscreteProcess(elastic); - - // deuteron - particle = G4Deuteron::Deuteron(); - pmanager = particle -> GetProcessManager(); - - // Final state production model for Deuteron inelastic scattering below 100 MeV - G4LEDeuteronInelastic* theDIModel = new G4LEDeuteronInelastic; - // Set the maximum energy for LEP model - theDIModel -> SetMaxEnergy(LEPHighLimit); - // Active the Tripathi and aShen Cross Section - theIPdeuteron.AddDataSet(TripathiCrossSection); - theIPdeuteron.AddDataSet(aShen); - // Register the Deuteron Inelastic and Binary Cascade Model - theIPdeuteron.RegisterMe(theDIModel); - theIPdeuteron.RegisterMe(theBC); - // Active the deuteron inelastic scattering using the deuteron inelastic and binary cascade model - pmanager -> AddDiscreteProcess(&theIPdeuteron); - // Active the Hadron Elastic Process - pmanager -> AddDiscreteProcess(elastic); - - // triton - particle = G4Triton::Triton(); - pmanager = particle->GetProcessManager(); - - // Final state production model for Triton inelastic scattering below 100 MeV - G4LETritonInelastic* theTIModel = new G4LETritonInelastic; - // Set the maximum energy for LEP model - theTIModel -> SetMaxEnergy(LEPHighLimit); - // Active the Tripathi and aShen Cross Section - theIPtriton.AddDataSet(TripathiCrossSection); - theIPtriton.AddDataSet(aShen); - // Register the Triton Inelastic and Binary Cascade Model - theIPtriton.RegisterMe(theTIModel); - theIPtriton.RegisterMe(theBC); - // Active the triton inelastic scattering using the triton inelastic and binary cascade model - pmanager -> AddDiscreteProcess(&theIPtriton); - // Active the Hadron Elastic Process - pmanager -> AddDiscreteProcess(elastic); - - // alpha - particle = G4Alpha::Alpha(); - pmanager = particle->GetProcessManager(); - // Final state production model for Alpha inelastic scattering below 20 GeV - G4LEAlphaInelastic* theAIModel = new G4LEAlphaInelastic; - // Set the maximum energy for LEP model - theAIModel -> SetMaxEnergy(LEPHighLimit); - // Register the Triton Inelastic and Binary Cascade Model - theIPalpha.AddDataSet(TripathiCrossSection); - theIPalpha.AddDataSet(aShen); - // Register the Alpha Inelastic and Binary Cascade Model - theIPalpha.RegisterMe(theAIModel); - theIPalpha.RegisterMe(theBC); - // Active the alpha inelastic scattering using the alpha inelastic and binary cascade model - pmanager -> AddDiscreteProcess(&theIPalpha); - // Active the Hadron Elastic Process - pmanager -> AddDiscreteProcess(elastic); - - // He3 - // particle = G4He3::He3(); -// pmanager = particle->GetProcessManager(); -// // Binary Cascade inelastic scattering for ions -// G4BinaryLightIonReaction * theGenIonBC= new G4BinaryLightIonReaction; -// // Inelastic Scattering for ions -// G4HadronInelasticProcess* theIPHe3 = new G4HadronInelasticProcess("He3Inelastic",particle); -// // Active the Tripathi and aShen Cross Section -// theIPHe3 -> AddDataSet(TripathiCrossSection); -// theIPHe3 -> AddDataSet(aShen); -// // Register the Alpha Binary Cascade Model -// theIPHe3 -> RegisterMe(theGenIonBC); -// // Active the Inelastic Process for He3 -// pmanager -> AddDiscreteProcess(theIPHe3); -// // Active the Hadron Elastic Process -// pmanager -> AddDiscreteProcess(elastic); - - // Neutron - particle = G4Neutron::Neutron(); - pmanager = particle->GetProcessManager(); - // Register the Precompound model - theIPNeutron.RegisterMe(thePreEquilib); - // Active the Cross-sections for neutron nuclear scattering from 14 MeV up to 20 GeV - theIPNeutron.AddDataSet(&theNXSec); - // Active the neutron inelastic process - pmanager -> AddDiscreteProcess(&theIPNeutron); - // Active the Hadron Elastic Process - pmanager -> AddDiscreteProcess(elastic); - - // Pions plus - particle = G4PionPlus::PionPlus(); - pmanager = particle -> GetProcessManager(); - // Define the inelastic process for pions plus - G4PionPlusInelasticProcess* thePionPlusInelasticProcess = new G4PionPlusInelasticProcess("inelastic"); - // Register the Low Energy Inelastic Model for pions plus - thePionPlusInelasticProcess -> RegisterMe(thePreEquilib); - // Active the inelastic process for pions plus - pmanager->AddDiscreteProcess(thePionPlusInelasticProcess); - pmanager -> AddDiscreteProcess(elastic); - - // Pion Minus - particle = G4PionMinus::PionMinus(); - pmanager = particle -> GetProcessManager(); - // Define the inelastic process for pions minus - G4PionMinusInelasticProcess* thePionMinusInelasticProcess = new G4PionMinusInelasticProcess("inelastic"); - // Register the inelastic model for pion minus - thePionMinusInelasticProcess -> RegisterMe(thePreEquilib); - // Active the inelastic process for pion minus - pmanager -> AddDiscreteProcess(thePionMinusInelasticProcess); - // Active Absorption process for pion minus - pmanager -> AddRestProcess(new G4PiMinusAbsorptionAtRest, ordDefault); - pmanager -> AddDiscreteProcess(elastic); - - //HADRON CAPTURE - // Process for capture of neutral hadrons - G4HadronCaptureProcess* neutronCapture = new G4HadronCaptureProcess(); - // Final state production model for capture of neutral hadrons in nuclei - G4LCapture* capture_model = new G4LCapture(); - // Set the energy range for the capture model - capture_model -> SetMinEnergy(neutronLowLimit); - capture_model -> SetMaxEnergy(neutronHighLimit); - // Register the capture model - neutronCapture -> RegisterMe(capture_model); - // Active the neutron capture process - pmanager -> AddDiscreteProcess(neutronCapture); - - //FISSION - // Process for induced fission - G4HadronFissionProcess* fission = new G4HadronFissionProcess(); - //Final state production model for induced fission - G4LFission* fission_model = new G4LFission(); - // Set the energy range for the fission model - fission_model -> SetMinEnergy(neutronLowLimit); - fission_model -> SetMaxEnergy(neutronHighLimit); - // Register the fission model - fission -> RegisterMe(fission_model); - // Active the fission process - pmanager -> AddDiscreteProcess(fission); -} - - - diff --git a/examples/advanced/hadrontherapy/src/HadrontherapyProtonPrecompoundGEM.cc b/examples/advanced/hadrontherapy/src/HadrontherapyProtonPrecompoundGEM.cc deleted file mode 100644 index 27d6e4dde3..0000000000 --- a/examples/advanced/hadrontherapy/src/HadrontherapyProtonPrecompoundGEM.cc +++ /dev/null @@ -1,295 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// $Id: HadrontherapyProtonPrecompoundGEM.cc; May 2005 -// ---------------------------------------------------------------------------- -// GEANT 4 - Hadrontherapy example -// ---------------------------------------------------------------------------- -// Code developed by: -// -// G.A.P. Cirrone(a)*, F. Di Rosa(a), S. Guatelli(b), G. Russo(a) -// -// (a) Laboratori Nazionali del Sud -// of the National Institute for Nuclear Physics, Catania, Italy -// (b) National Institute for Nuclear Physics Section of Genova, genova, Italy -// -// * cirrone@lns.infn.it -// ---------------------------------------------------------------------------- - -#include "HadrontherapyProtonPrecompoundGEM.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" -#include "G4ProcessVector.hh" -#include "G4ParticleTypes.hh" -#include "G4ParticleTable.hh" -#include "G4Material.hh" -#include "G4LElastic.hh" -#include "G4BinaryCascade.hh" -#include "G4CascadeInterface.hh" -#include "G4PionPlusInelasticProcess.hh" -#include "G4LEPionPlusInelastic.hh" -#include "G4LEPionMinusInelastic.hh" -#include "G4HEPionPlusInelastic.hh" -#include "G4HEPionMinusInelastic.hh" -#include "G4PionMinusInelasticProcess.hh" -#include "G4LEPionMinusInelastic.hh" -#include "G4HEPionMinusInelastic.hh" -#include "G4PiMinusAbsorptionAtRest.hh" -#include "G4AntiProtonInelasticProcess.hh" -#include "G4LEAntiProtonInelastic.hh" -#include "G4HEAntiProtonInelastic.hh" -#include "G4AntiProtonAnnihilationAtRest.hh" -#include "G4Evaporation.hh" -#include "G4ExcitationHandler.hh" -// -// -// HADRONIC PHYSICS LIST -// -// - ELASTIC SCATTERING FOR ALL THE HADRONS AND IONS -// - INELASTIC SCATTERING: -// * PRECOMPOUND PHYSICS LIST with GEM EVAPORATION MODEL -// * PRECOMPOUND + EVAPORATION(GEM MODEL) NO FERMI BREAK-UP FOR PROTONS, NEUTRONS AND PIONS -// * LEP MODEL UP TO 100 MEV AND BINARY ION MODEL BETWEEN 80 MEV AND 40. GEV -// FOR DEUTERON, TRITON, HE3, ALPHA -// * FISSION AND HADRON CAPTURE FOR NEUTRONS BETWEEN 0. MEV AND 100. TEV -// -// -HadrontherapyProtonPrecompoundGEM::HadrontherapyProtonPrecompoundGEM(const G4String& name): - G4VPhysicsConstructor(name) -{ - // Inelastic process, energy limits - - // Protons, neutrons and pions - // Energy limit of the precompound model - precompoundLowLimit = 0.*MeV; - precompoundHighLimit = 300.*MeV; - - // Energy limit of the neutron fission and capture - neutronLowLimit = 0.*TeV; - neutronHighLimit = 100.*TeV; - - // Ions - // Energy limit of the binary ion model - binaryLightIonLowLimit = 80.*MeV; - binaryLightIonHighLimit = 40.*GeV; - - // Energy limit of the LEP model for ions - LEPHighLimit = 100.*MeV; -} - -HadrontherapyProtonPrecompoundGEM::~HadrontherapyProtonPrecompoundGEM() -{} - -void HadrontherapyProtonPrecompoundGEM::ConstructProcess() -{ - G4ParticleDefinition* particle = 0; - G4ProcessManager* pmanager = 0; - - // LOW ENERGY ELASTIC SCATTERING - // FOR PROTON, NEUTRON, IONS - G4LElastic* elastic_Model = new G4LElastic(); - G4HadronElasticProcess* elastic = new G4HadronElasticProcess(); - elastic -> RegisterMe(elastic_Model); - - // GEM EVAPORATION MODEL - G4Evaporation* evaporation = new G4Evaporation(); - evaporation -> SetGEMChannel(); - theHandler.SetEvaporation(evaporation); - - // INELASTIC SCATTERING - // Binary Cascade - G4BinaryLightIonReaction* theBC = new G4BinaryLightIonReaction(); - // Set the min and max energy for the Binary Cascade - theBC -> SetMinEnergy(binaryLightIonLowLimit); - theBC -> SetMaxEnergy(binaryLightIonHighLimit); - - // TRIPATHI CROSS SECTION - // Implementation of formulas in analogy to NASA technical paper 3621 by - // Tripathi, et al. Cross-sections for ion ion scattering - G4TripathiCrossSection* TripathiCrossSection = new G4TripathiCrossSection; - - // IONS SHEN CROSS SECTION - // Implementation of formulas - // Shen et al. Nuc. Phys. A 491 130 (1989) - // Total Reaction Cross Section for Heavy-Ion Collisions - G4IonsShenCrossSection* aShen = new G4IonsShenCrossSection; - -//-------------------------------------------------------------------------------------- - - // Proton PRECOMPOUND + EVAPORATION(DEFAULT EVAPORATION)+ FERMI BREAK-UP - particle = G4Proton::Proton(); - pmanager = particle->GetProcessManager(); - - G4PreCompoundModel* thePreEquilib = new G4PreCompoundModel(&theHandler); - // Set the range of minimum and maximum energy value - thePreEquilib -> SetMinEnergy(precompoundLowLimit); - thePreEquilib -> SetMaxEnergy(precompoundHighLimit); - // Model Registration - theIPProton.RegisterMe(thePreEquilib); - // Active the Cross-sections for proton nuclear scattering up to 20 GeV - theIPProton.AddDataSet(&thePXSec); - // Active the proton inelastic scattering using the precompound model - pmanager -> AddDiscreteProcess(&theIPProton); - // Active the Hadron Elastic Process - pmanager -> AddDiscreteProcess(elastic); - - // deuteron - particle = G4Deuteron::Deuteron(); - pmanager = particle -> GetProcessManager(); - - // Final state production model for Deuteron inelastic scattering below 100 MeV - G4LEDeuteronInelastic* theDIModel = new G4LEDeuteronInelastic; - // Set the maximum energy for LEP model - theDIModel -> SetMaxEnergy(LEPHighLimit); - // Active the Tripathi and aShen Cross Section - theIPdeuteron.AddDataSet(TripathiCrossSection); - theIPdeuteron.AddDataSet(aShen); - // Register the Deuteron Inelastic and Binary Cascade Model - theIPdeuteron.RegisterMe(theDIModel); - theIPdeuteron.RegisterMe(theBC); - // Active the deuteron inelastic scattering using the deuteron inelastic and binary cascade model - pmanager -> AddDiscreteProcess(&theIPdeuteron); - // Active the Hadron Elastic Process - pmanager -> AddDiscreteProcess(elastic); - - // triton - particle = G4Triton::Triton(); - pmanager = particle->GetProcessManager(); - - // Final state production model for Triton inelastic scattering below 100 MeV - G4LETritonInelastic* theTIModel = new G4LETritonInelastic; - // Set the maximum energy for LEP model - theTIModel -> SetMaxEnergy(LEPHighLimit); - // Active the Tripathi and aShen Cross Section - theIPtriton.AddDataSet(TripathiCrossSection); - theIPtriton.AddDataSet(aShen); - // Register the Triton Inelastic and Binary Cascade Model - theIPtriton.RegisterMe(theTIModel); - theIPtriton.RegisterMe(theBC); - // Active the triton inelastic scattering using the triton inelastic and binary cascade model - pmanager -> AddDiscreteProcess(&theIPtriton); - // Active the Hadron Elastic Process - pmanager -> AddDiscreteProcess(elastic); - - // alpha - particle = G4Alpha::Alpha(); - pmanager = particle->GetProcessManager(); - // Final state production model for Alpha inelastic scattering below 20 GeV - G4LEAlphaInelastic* theAIModel = new G4LEAlphaInelastic; - // Set the maximum energy for LEP model - theAIModel -> SetMaxEnergy(LEPHighLimit); - // Register the Triton Inelastic and Binary Cascade Model - theIPalpha.AddDataSet(TripathiCrossSection); - theIPalpha.AddDataSet(aShen); - // Register the Alpha Inelastic and Binary Cascade Model - theIPalpha.RegisterMe(theAIModel); - theIPalpha.RegisterMe(theBC); - // Active the alpha inelastic scattering using the alpha inelastic and binary cascade model - pmanager -> AddDiscreteProcess(&theIPalpha); - // Active the Hadron Elastic Process - pmanager -> AddDiscreteProcess(elastic); - - // He3 -// particle = G4He3::He3(); -// pmanager = particle->GetProcessManager(); -// // Binary Cascade inelastic scattering for ions -// G4BinaryLightIonReaction * theGenIonBC= new G4BinaryLightIonReaction; -// // Inelastic Scattering for ions -// G4HadronInelasticProcess* theIPHe3 = new G4HadronInelasticProcess("He3Inelastic",particle); -// // Active the Tripathi and aShen Cross Section -// theIPHe3 -> AddDataSet(TripathiCrossSection); -// theIPHe3 -> AddDataSet(aShen); -// // Register the Alpha Binary Cascade Model -// theIPHe3 -> RegisterMe(theGenIonBC); -// // Active the Inelastic Process for He3 -// pmanager -> AddDiscreteProcess(theIPHe3); -// // Active the Hadron Elastic Process -// pmanager -> AddDiscreteProcess(elastic); - - // Neutron - particle = G4Neutron::Neutron(); - pmanager = particle->GetProcessManager(); - // Register the Precompound model - theIPNeutron.RegisterMe(thePreEquilib); - // Active the Cross-sections for neutron nuclear scattering from 14 MeV up to 20 GeV - theIPNeutron.AddDataSet(&theNXSec); - // Active the neutron inelastic process - pmanager -> AddDiscreteProcess(&theIPNeutron); - // Active the Hadron Elastic Process - pmanager -> AddDiscreteProcess(elastic); - - // Pions plus - particle = G4PionPlus::PionPlus(); - pmanager = particle -> GetProcessManager(); - // Define the inelastic process for pions plus - G4PionPlusInelasticProcess* thePionPlusInelasticProcess = new G4PionPlusInelasticProcess("inelastic"); - // Register the Low Energy Inelastic Model for pions plus - thePionPlusInelasticProcess -> RegisterMe(thePreEquilib); - // Active the inelastic process for pions plus - pmanager->AddDiscreteProcess(thePionPlusInelasticProcess); - pmanager -> AddDiscreteProcess(elastic); - - // Pion Minus - particle = G4PionMinus::PionMinus(); - pmanager = particle -> GetProcessManager(); - // Define the inelastic process for pions minus - G4PionMinusInelasticProcess* thePionMinusInelasticProcess = new G4PionMinusInelasticProcess("inelastic"); - // Register the inelastic model for pion minus - thePionMinusInelasticProcess -> RegisterMe(thePreEquilib); - // Active the inelastic process for pion minus - pmanager -> AddDiscreteProcess(thePionMinusInelasticProcess); - // Active Absorption process for pion minus - pmanager -> AddRestProcess(new G4PiMinusAbsorptionAtRest, ordDefault); - pmanager -> AddDiscreteProcess(elastic); - - //HADRON CAPTURE - // Process for capture of neutral hadrons - G4HadronCaptureProcess* neutronCapture = new G4HadronCaptureProcess(); - // Final state production model for capture of neutral hadrons in nuclei - G4LCapture* capture_model = new G4LCapture(); - // Set the energy range for the capture model - capture_model -> SetMinEnergy(neutronLowLimit); - capture_model -> SetMaxEnergy(neutronHighLimit); - // Register the capture model - neutronCapture -> RegisterMe(capture_model); - // Active the neutron capture process - pmanager -> AddDiscreteProcess(neutronCapture); - - //FISSION - // Process for induced fission - G4HadronFissionProcess* fission = new G4HadronFissionProcess(); - //Final state production model for induced fission - G4LFission* fission_model = new G4LFission(); - // Set the energy range for the fission model - fission_model -> SetMinEnergy(neutronLowLimit); - fission_model -> SetMaxEnergy(neutronHighLimit); - // Register the fission model - fission -> RegisterMe(fission_model); - // Active the fission process - pmanager -> AddDiscreteProcess(fission); -} - - - diff --git a/examples/advanced/hadrontherapy/src/HadrontherapyProtonPrecompoundGEMFermi.cc b/examples/advanced/hadrontherapy/src/HadrontherapyProtonPrecompoundGEMFermi.cc deleted file mode 100644 index 4396e0365b..0000000000 --- a/examples/advanced/hadrontherapy/src/HadrontherapyProtonPrecompoundGEMFermi.cc +++ /dev/null @@ -1,308 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// $Id: HadrontherapyProtonPrecompoundGEMFermi.cc; May 2005 -// ---------------------------------------------------------------------------- -// GEANT 4 - Hadrontherapy example -// ---------------------------------------------------------------------------- -// Code developed by: -// -// G.A.P. Cirrone(a)*, F. Di Rosa(a), S. Guatelli(b), G. Russo(a) -// -// (a) Laboratori Nazionali del Sud -// of the National Institute for Nuclear Physics, Catania, Italy -// (b) National Institute for Nuclear Physics Section of Genova, genova, Italy -// -// * cirrone@lns.infn.it -// ---------------------------------------------------------------------------- - -#include "HadrontherapyProtonPrecompoundGEMFermi.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" -#include "G4ProcessVector.hh" -#include "G4ParticleTypes.hh" -#include "G4ParticleTable.hh" -#include "G4Material.hh" -#include "G4LElastic.hh" -#include "G4BinaryCascade.hh" -#include "G4CascadeInterface.hh" -#include "G4PionPlusInelasticProcess.hh" -#include "G4LEPionPlusInelastic.hh" -#include "G4LEPionMinusInelastic.hh" -#include "G4HEPionPlusInelastic.hh" -#include "G4HEPionMinusInelastic.hh" -#include "G4PionMinusInelasticProcess.hh" -#include "G4LEPionMinusInelastic.hh" -#include "G4HEPionMinusInelastic.hh" -#include "G4PiMinusAbsorptionAtRest.hh" -#include "G4AntiProtonInelasticProcess.hh" -#include "G4LEAntiProtonInelastic.hh" -#include "G4HEAntiProtonInelastic.hh" -#include "G4AntiProtonAnnihilationAtRest.hh" -#include "G4Evaporation.hh" -#include "G4ExcitationHandler.hh" -#include "G4FermiBreakUp.hh" - -// -// -// HADRONIC PHYSICS LIST -// -// - ELASTIC SCATTERING FOR ALL THE HADRONS AND IONS -// - INELASTIC SCATTERING: -// * PRECOMPOUND PHYSICS LIST with GEM EVAPORATION MODEL + FERMI BREAKUP -// * PRECOMPOUND + GEM EVAPORATION MODEL + FERMI BREAK-UP FOR PROTONS, NEUTRONS AND PIONS -// * LEP MODEL UP TO 100 MEV AND BINARY ION MODEL BETWEEN 80 MEV AND 40. GEV -// FOR DEUTERON, TRITON, HE3, ALPHA -// * FISSION AND HADRON CAPTURE FOR NEUTRONS BETWEEN 0. MEV AND 100. TEV -// -// -HadrontherapyProtonPrecompoundGEMFermi::HadrontherapyProtonPrecompoundGEMFermi(const G4String& name): - G4VPhysicsConstructor(name) -{ - // Inelastic process, energy limits - - // Protons, neutrons and pions - // Energy limit of the precompound model - precompoundLowLimit = 0.*MeV; - precompoundHighLimit = 300.*MeV; - - // Energy limit of the neutron fission and capture - neutronLowLimit = 0.*TeV; - neutronHighLimit = 100.*TeV; - - // Ions - // Energy limit of the binary ion model - binaryLightIonLowLimit = 80.*MeV; - binaryLightIonHighLimit = 40.*GeV; - - // Energy limit of the LEP model for ions - LEPHighLimit = 100.*MeV; - - //targetZ should vary between 1 and 8 - targetZ = 1; - targetA = 2 * targetZ; -} - -HadrontherapyProtonPrecompoundGEMFermi::~HadrontherapyProtonPrecompoundGEMFermi() -{} - -void HadrontherapyProtonPrecompoundGEMFermi::ConstructProcess() -{ - G4ParticleDefinition* particle = 0; - G4ProcessManager* pmanager = 0; - - // LOW ENERGY ELASTIC SCATTERING - // FOR PROTON, NEUTRON, IONS - G4LElastic* elastic_Model = new G4LElastic(); - G4HadronElasticProcess* elastic = new G4HadronElasticProcess(); - elastic -> RegisterMe(elastic_Model); - - // GEM EVAPORATION MODEL - G4Evaporation* evaporation = new G4Evaporation(); - evaporation -> SetGEMChannel(); - theHandler.SetEvaporation(evaporation); - - // FERMI BREAK-UP MODEL - G4FermiBreakUp* breakup = new G4FermiBreakUp(); - // Set the Fermi break up model - theHandler.SetFermiModel(breakup); - // fix the target A and Z; - theHandler.SetMaxAandZForFermiBreakUp(targetA,targetZ); - - // INELASTIC SCATTERING - // Binary Cascade - G4BinaryLightIonReaction* theBC = new G4BinaryLightIonReaction(); - // Set the min and max energy for the Binary Cascade - theBC -> SetMinEnergy(binaryLightIonLowLimit); - theBC -> SetMaxEnergy(binaryLightIonHighLimit); - - // TRIPATHI CROSS SECTION - // Implementation of formulas in analogy to NASA technical paper 3621 by - // Tripathi, et al. Cross-sections for ion ion scattering - G4TripathiCrossSection* TripathiCrossSection = new G4TripathiCrossSection; - - // IONS SHEN CROSS SECTION - // Implementation of formulas - // Shen et al. Nuc. Phys. A 491 130 (1989) - // Total Reaction Cross Section for Heavy-Ion Collisions - G4IonsShenCrossSection* aShen = new G4IonsShenCrossSection; - -//-------------------------------------------------------------------------------------- - - // Proton PRECOMPOUND + EVAPORATION(DEFAULT EVAPORATION)+ FERMI BREAK-UP - particle = G4Proton::Proton(); - pmanager = particle->GetProcessManager(); - - G4PreCompoundModel* thePreEquilib = new G4PreCompoundModel(&theHandler); - // Set the range of minimum and maximum energy value - thePreEquilib -> SetMinEnergy(precompoundLowLimit); - thePreEquilib -> SetMaxEnergy(precompoundHighLimit); - // Model Registration - theIPProton.RegisterMe(thePreEquilib); - // Active the Cross-sections for proton nuclear scattering up to 20 GeV - theIPProton.AddDataSet(&thePXSec); - // Active the proton inelastic scattering using the precompound model - pmanager -> AddDiscreteProcess(&theIPProton); - // Active the Hadron Elastic Process - pmanager -> AddDiscreteProcess(elastic); - - // deuteron - particle = G4Deuteron::Deuteron(); - pmanager = particle -> GetProcessManager(); - - // Final state production model for Deuteron inelastic scattering below 100 MeV - G4LEDeuteronInelastic* theDIModel = new G4LEDeuteronInelastic; - // Set the maximum energy for LEP model - theDIModel -> SetMaxEnergy(LEPHighLimit); - // Active the Tripathi and aShen Cross Section - theIPdeuteron.AddDataSet(TripathiCrossSection); - theIPdeuteron.AddDataSet(aShen); - // Register the Deuteron Inelastic and Binary Cascade Model - theIPdeuteron.RegisterMe(theDIModel); - theIPdeuteron.RegisterMe(theBC); - // Active the deuteron inelastic scattering using the deuteron inelastic and binary cascade model - pmanager -> AddDiscreteProcess(&theIPdeuteron); - // Active the Hadron Elastic Process - pmanager -> AddDiscreteProcess(elastic); - - // triton - particle = G4Triton::Triton(); - pmanager = particle->GetProcessManager(); - - // Final state production model for Triton inelastic scattering below 100 MeV - G4LETritonInelastic* theTIModel = new G4LETritonInelastic; - // Set the maximum energy for LEP model - theTIModel -> SetMaxEnergy(LEPHighLimit); - // Active the Tripathi and aShen Cross Section - theIPtriton.AddDataSet(TripathiCrossSection); - theIPtriton.AddDataSet(aShen); - // Register the Triton Inelastic and Binary Cascade Model - theIPtriton.RegisterMe(theTIModel); - theIPtriton.RegisterMe(theBC); - // Active the triton inelastic scattering using the triton inelastic and binary cascade model - pmanager -> AddDiscreteProcess(&theIPtriton); - // Active the Hadron Elastic Process - pmanager -> AddDiscreteProcess(elastic); - - // alpha - particle = G4Alpha::Alpha(); - pmanager = particle->GetProcessManager(); - // Final state production model for Alpha inelastic scattering below 20 GeV - G4LEAlphaInelastic* theAIModel = new G4LEAlphaInelastic; - // Set the maximum energy for LEP model - theAIModel -> SetMaxEnergy(LEPHighLimit); - // Register the Triton Inelastic and Binary Cascade Model - theIPalpha.AddDataSet(TripathiCrossSection); - theIPalpha.AddDataSet(aShen); - // Register the Alpha Inelastic and Binary Cascade Model - theIPalpha.RegisterMe(theAIModel); - theIPalpha.RegisterMe(theBC); - // Active the alpha inelastic scattering using the alpha inelastic and binary cascade model - pmanager -> AddDiscreteProcess(&theIPalpha); - // Active the Hadron Elastic Process - pmanager -> AddDiscreteProcess(elastic); - - // He3 - // particle = G4He3::He3(); -// pmanager = particle->GetProcessManager(); -// // Binary Cascade inelastic scattering for ions -// G4BinaryLightIonReaction * theGenIonBC= new G4BinaryLightIonReaction; -// // Inelastic Scattering for ions -// G4HadronInelasticProcess* theIPHe3 = new G4HadronInelasticProcess("He3Inelastic",particle); -// // Active the Tripathi and aShen Cross Section -// theIPHe3 -> AddDataSet(TripathiCrossSection); -// theIPHe3 -> AddDataSet(aShen); -// // Register the Alpha Binary Cascade Model -// theIPHe3 -> RegisterMe(theGenIonBC); -// // Active the Inelastic Process for He3 -// pmanager -> AddDiscreteProcess(theIPHe3); -// // Active the Hadron Elastic Process -// pmanager -> AddDiscreteProcess(elastic); - - // Neutron - particle = G4Neutron::Neutron(); - pmanager = particle->GetProcessManager(); - // Register the Precompound model - theIPNeutron.RegisterMe(thePreEquilib); - // Active the Cross-sections for neutron nuclear scattering from 14 MeV up to 20 GeV - theIPNeutron.AddDataSet(&theNXSec); - // Active the neutron inelastic process - pmanager -> AddDiscreteProcess(&theIPNeutron); - // Active the Hadron Elastic Process - pmanager -> AddDiscreteProcess(elastic); - - // Pions plus - particle = G4PionPlus::PionPlus(); - pmanager = particle -> GetProcessManager(); - // Define the inelastic process for pions plus - G4PionPlusInelasticProcess* thePionPlusInelasticProcess = new G4PionPlusInelasticProcess("inelastic"); - // Register the Low Energy Inelastic Model for pions plus - thePionPlusInelasticProcess -> RegisterMe(thePreEquilib); - // Active the inelastic process for pions plus - pmanager->AddDiscreteProcess(thePionPlusInelasticProcess); - pmanager -> AddDiscreteProcess(elastic); - - // Pion Minus - particle = G4PionMinus::PionMinus(); - pmanager = particle -> GetProcessManager(); - // Define the inelastic process for pions minus - G4PionMinusInelasticProcess* thePionMinusInelasticProcess = new G4PionMinusInelasticProcess("inelastic"); - // Register the inelastic model for pion minus - thePionMinusInelasticProcess -> RegisterMe(thePreEquilib); - // Active the inelastic process for pion minus - pmanager -> AddDiscreteProcess(thePionMinusInelasticProcess); - // Active Absorption process for pion minus - pmanager -> AddRestProcess(new G4PiMinusAbsorptionAtRest, ordDefault); - pmanager -> AddDiscreteProcess(elastic); - - //HADRON CAPTURE - // Process for capture of neutral hadrons - G4HadronCaptureProcess* neutronCapture = new G4HadronCaptureProcess(); - // Final state production model for capture of neutral hadrons in nuclei - G4LCapture* capture_model = new G4LCapture(); - // Set the energy range for the capture model - capture_model -> SetMinEnergy(neutronLowLimit); - capture_model -> SetMaxEnergy(neutronHighLimit); - // Register the capture model - neutronCapture -> RegisterMe(capture_model); - // Active the neutron capture process - pmanager -> AddDiscreteProcess(neutronCapture); - - //FISSION - // Process for induced fission - G4HadronFissionProcess* fission = new G4HadronFissionProcess(); - //Final state production model for induced fission - G4LFission* fission_model = new G4LFission(); - // Set the energy range for the fission model - fission_model -> SetMinEnergy(neutronLowLimit); - fission_model -> SetMaxEnergy(neutronHighLimit); - // Register the fission model - fission -> RegisterMe(fission_model); - // Active the fission process - pmanager -> AddDiscreteProcess(fission); -} - - - diff --git a/examples/advanced/hadrontherapy/src/HadrontherapySteppingAction.cc b/examples/advanced/hadrontherapy/src/HadrontherapySteppingAction.cc index f8154bd6c3..ad01931e52 100644 --- a/examples/advanced/hadrontherapy/src/HadrontherapySteppingAction.cc +++ b/examples/advanced/hadrontherapy/src/HadrontherapySteppingAction.cc @@ -87,7 +87,7 @@ void HadrontherapySteppingAction::UserSteppingAction(const G4Step* aStep) { runAction -> AddHadronicProcess(); - if ( (process != "LElastic") && (process != "ProtonInelastic")) + if ( (process != "LElastic") && (process != "ProtonInelastic") && (process != "hElastic") ) G4cout << "Warning! Unknown proton process: "<< process << G4endl; } } diff --git a/examples/advanced/human_phantom/GNUmakefile b/examples/advanced/human_phantom/GNUmakefile new file mode 100644 index 0000000000..c5e0ede364 --- /dev/null +++ b/examples/advanced/human_phantom/GNUmakefile @@ -0,0 +1,58 @@ +# -------------------------------------------------------------- +# GNUmakefile for examples module. +# Author: Giorgio Guerrieri +# Date: 14/06/2005. +# -------------------------------------------------------------- + +name := phantom +G4TARGET := $(name) +G4EXLIB := true + +ifndef SCRAM_ARCH + SCRAM_ARCH := slc3_ia32_gcc323 +endif + +ifndef G4INSTALL + G4INSTALL = ../../.. +endif + +ifndef GDML_BASE +# GDML_BASE := /afs/cern.ch/sw/lcg/app/releases/GDML/pro + GDML_BASE := /local/GDML_2_8_0 +endif + +CPPFLAGS += \ + -I$(GDML_BASE)/include \ + -I$(XERCESCROOT)/include + +ifdef G4ANALYSIS_USE +CPPFLAGS += \ + `aida-config --include` +endif + +EXTRALIBS += \ + -L$(GDML_BASE)/$(SCRAM_ARCH)/lib \ + -lG4Processor \ + -lG4Subscribers \ + -lG4Processor \ + -lG4Evaluator\ + -lG4Writer \ + -L$(GDML_BASE)/$(SCRAM_ARCH)/lib \ + -lSaxana \ + -lProcesses \ + -lWriter \ + -L$(XERCESCROOT)/lib -lxerces-c + +ifdef G4ANALYSIS_USE +EXTRALIBS += \ + `aida-config --lib` +endif + +.PHONY: all +all: lib bin + +include $(G4INSTALL)/config/binmake.gmk + +visclean: + rm -f g4*.prim g4*.eps g4*.wrl + rm -f .DAWN_* diff --git a/examples/advanced/human_phantom/History b/examples/advanced/human_phantom/History new file mode 100644 index 0000000000..c1c36fd5f6 --- /dev/null +++ b/examples/advanced/human_phantom/History @@ -0,0 +1,60 @@ +$Id: History,v 1.8 2006/11/30 16:06:38 guatelli Exp $ +------------------------------------------------------------------- + + ========================================================= + Geant4 - an Object-Oriented Toolkit for Simulation in HEP + ========================================================= + + Category History file + --------------------- + +This file should be used by G4 developers and category coordinators +to briefly summarize all major modifications introduced in the code +and keep track of all category-tags. +It DOES NOT substitute the CVS log-message one should put at every +committal in the CVS repository ! + + ---------------------------------------------------------- + * Reverse chronological order (last date on top), please * + ---------------------------------------------------------- + +November 30, 2006, S. Guatelli tag: human_phantom-V08-01-03 +- Corrected bug in the definition of materials for MIRD phantom model. + +November 30, 2006, S. Guatelli tag: human_phantom-V08-01-01 + human_phantom-V08-01-02 +- Geantino introduced as primary particles +- MIRD model is hard-coded +- ORNL model is defined through GDML files +- No overlapping volumes +- Translation for the legs is set to:x="-7.01" y="-39.1" z="0" + instead of x="-7." y="-39." z="0", to avoid volume overlaps +- Review of the code +- Design iteration + +February 11, 2006, G. Guerrieri +- Energy deposit in the phantom added. + +November 23, 2005, G. Guerrieri +- Adult Male phantom GDML file added. + +August 15, 2005, G. Guerrieri +- Modified approximated legs and leg bones. +- Commit the example + +July 26, 2005, G. Guerrieri +- Commit the example + +June 30, 2005 G.Guerrieri +- Add other body part (now there's 26 body part on the Female MIRD/ORNL model) +- UI operates in PreInit reading GDML file and then Initialize() construction. + +June 20, 2005 G.Guerrieri +- UI with command defining +-- Sex of Phantom +-- Model pf Phantom +-- Name of body part to be built and their sensitivity + +June 15rd, 2005 G.Guerrieri +- First implementation of phantom using GDML file for description persistency. + diff --git a/examples/advanced/human_phantom/README b/examples/advanced/human_phantom/README new file mode 100644 index 0000000000..ae6f308336 --- /dev/null +++ b/examples/advanced/human_phantom/README @@ -0,0 +1,154 @@ +$Id: README,v 1.10 2006/11/30 16:06:38 guatelli Exp $ +------------------------------------------------------------------- + + ========================================================= + Geant4 - human_phantom example + ========================================================= + + README + ----------------------- + +Authors: S. Guatelli (guatelli@ge.infn.it) and M. G. Pia (pia@ge.infn.it), + INFN Genova, Italy. + +------> Introduction + +The human_phantom example models anthropomorphic phantoms for +Geant4 simulations. +Two models are available: MIRD [1] and ORNL [2] (Male and Female for each approach). + +[1] W.S. Snyder, et al, "MIRD Pamphlet No. 5 Revised, Estimates of +absorbed fractions for monoenergetic photon sources uniformly distributed +in various organs of a heterogeneous phantom", +J. Nucl. Med. Suppl., no. 3, pp. 5-52, 1969. + +[2] M. Cristy and K. F. Eckerman, "Specific absorbed fractions of energy +at various ages from internal photon sources", ORNL/TM-8381/VI, Apr. 1987. + +The example is based on code developed by the undergraduate student +G. Guerrieri. +Note: this is a preliminary beta-version of the code; an improved +version will be distributed in the next Geant4 public release, compliant +with the design in a forthcoming publication, and subject to a design +and code review. + +NOTE: At the moment this advanced example is executed correctly with geantino +particles as primary particles; it is not executed correctly with other primary particle types. +This is due to an internal Geant4 bug concerning ellipsoids. +For details look at the Geant4 Bug Report #914. This problem is taken under +care by the Geant4 Collaboration. + +-----> Geometry + +The process of building a phantom is handled through the Builder +design pattern. +The creation of coherent models of the human phantom is handled through +an Abstract Factory design pattern. + +The organs of the MIRD phantom are implemented in hard-code; the organs of +the ORNL phantom are handled through GDML (Geometry Description Markup Language, www.cern.ch/gdml). The materials of the MIRD model are defined in the +class G4HumanPhantomMaterial. The materials of the ORNL model are defined in +the GDML files. + +*** Parameterized breast *** +MIRD Female model: a breast is analytical and derives from the MIRD +anthropomorphic phantom; the other breast derives from the model [3] and +it is voxelised. + +[3] D.R. Dance and R. A. Hunt, "Voxel breast phantom to represent breasts +of different sizes and glandularities for use with a Monte Carlo simulation +program", Report RMTPC 02/1005. + +-----> Physics + +Particles: e-, e+, photon, geantino +Physics list: electromagnetic processes are active for photons, e- and e+ +The threshold of production of secondary particles is set to 0.1 * mm. + +-----> Primary particles + +The primary particles are geantino. +UI commands: + +/gun/energy energy : to change the energy of primary particles +/gun/particle particle_type : to change the type of primary particle +/gun/setBeam beamAlongX : generate a primary particle beam along the X axis +/gun/setBeam beamAlongY : generate a primary particle beam along the Y axis +/gun/setBeam beamAlongZ : generate a primary particle beam along the Y axis +/gun/setBeam isotropicFlux : generate a primary particle with random direction, + from a random point. + +-----> Energy deposit + +The energy deposit is calculated in the organs of the phantom. +At the end of the execution of the simulation the summary of the total energy deposit in +each organ is print out. +The user can set the sensitivity of each organ interactively through the UI command: +/bodypart/addBodyPart organName yes +(see adultFemale.mac as example) + +If the sensitivity is not set ( /bodypart/addBodyPart organName no ), +the energy deposit is not calculated in the specific organ. + +The energy deposit is calculated in each voxel of the parameterised breast. + +-----> Analysis + +output file: g4humanphantom.hbk containing +1D histogram id=10: Particle Path Distribution (cm) +2D histogram id=20: Particle Projection XY (cm, cm) +2D histogram id=30: Particle Projection YZ (cm, cm) +2D histogram id=40: Particle Projection ZX (cm, cm) +2D histogram id=50: Energy Deposit (MeV, y axis) in Body Part (x axis) +2D histogram id=100: Edep(MeV) in the parameterized breast, x= slice, y= sector + +-----> Setup + +Example enviroment with the compiler gcc-3.2.3, on the Linux platform + +A standard Geant4 example GNUmakefile is provided. + +The following environment variables need to be set: +G4LEDATA : points to low energy data base +set G4ANALYSIS_USE equal to 1 to activate the analysis + +- Install the GDML package with Geant4 extensions and Xerces. + See: http://cern.ch/gdml. + +- Set the environment variable GDML_BASE to point to the area where + GDML is installed. + +- Set the environment variable XERCESCROOT to point to the area where + Xerces is installed. + +- Add to the LD_LIBRARY_PATH the $XERCESCROOT/lib + +- IMPORTANT!!!! Customize the '*.gdml' schema file in the directories +gdmlData/Female and gdmlData/Male, specifying in the top line the + right path where to retrieve the main GDML schema file. + +- Analysis set-up: AIDA 3.2.1, PI 1.3.3 + Users can download the analysis tools from: + http://aida.freehep.org/ + http://www.cern.ch/PI + +- Compile and link to generate an executable: + % gmake + +- Execute the application: + % phantom + +- Default macro: adultFemale.mac (MIRD, Female model) +- Other macros: adultMale.mac (MIRD, Male model) + adultORNLFemale.mac (ORNL, Female model) + adultORNLMale.mac (ORNL, Male model) +- Visualization macros: vrmlVis.mac, dawnVis.mac, openGLVis.mac, noVis.mac +- Run particles: run.mac + +--------------------------------------------------------------------------- + +for comments, advices, doubts and questions please contact: +guatelli@ge.infn.it, pia@ge.infn.it + +last modified: S. Guatelli, 30/11/2006 + diff --git a/examples/advanced/human_phantom/adultFemale.mac b/examples/advanced/human_phantom/adultFemale.mac new file mode 100644 index 0000000000..e64135effd --- /dev/null +++ b/examples/advanced/human_phantom/adultFemale.mac @@ -0,0 +1,78 @@ +# +# Sets some default verbose +/control/verbose 2 +# +# +# +# Initialize New Phantom +# +# Choose model: ORNL, MIRD, MIX +# +/phantom/setPhantomModel MIRD +# +# Choose Sex of Phantom: Male or Female +# +/phantom/setPhantomSex Female +# +# Insert Body Part and their Sensitivity +# +/bodypart/addBodyPart Head yes +######### +/bodypart/addBodyPart Trunk no +/bodypart/addBodyPart Legs yes +############## +# +# Skeleton System +# +/bodypart/addBodyPart LegBones yes +/bodypart/addBodyPart ArmBones yes +/bodypart/addBodyPart UpperSpine yes +/bodypart/addBodyPart MiddleLowerSpine yes +/bodypart/addBodyPart Skull yes +/bodypart/addBodyPart Pelvis yes +# +# Organs +# +/bodypart/addBodyPart Breast yes +/bodypart/addBodyPart Lungs yes +/bodypart/addBodyPart Brain yes +/bodypart/addBodyPart Heart yes +/bodypart/addBodyPart Kidneys yes +/bodypart/addBodyPart UrinaryBladder yes +/bodypart/addBodyPart Spleen yes +/bodypart/addBodyPart Pancreas no +/bodypart/addBodyPart Thyroid yes +# +# Gastrointestinal System +# +/bodypart/addBodyPart Stomach yes +/bodypart/addBodyPart UpperLargeIntestine yes +/bodypart/addBodyPart LowerLargeIntestine yes +/bodypart/addBodyPart Liver yes +# +# Genitalia +# +#/bodypart/addBodyPart Ovaries yes +#/bodypart/addBodyPart Uterus yes +# +# +# Construct your Phantom +# +/phantom/buildNewPhantom +/run/initialize +# +# +# Visualization Config +# +# Visualize Phantom with VRML +#/control/execute vrmlVis.mac +# +# Visualize Phantom with OPENGL +/control/execute openGLVis.mac +# +# Visualize Phantom with DAWN +#/control/execute dawnVis.mac +# +# Run Particles +# +/control/execute run.mac diff --git a/examples/advanced/human_phantom/adultMale.mac b/examples/advanced/human_phantom/adultMale.mac new file mode 100644 index 0000000000..8ee38c8694 --- /dev/null +++ b/examples/advanced/human_phantom/adultMale.mac @@ -0,0 +1,71 @@ +# +# Sets some default verbose +/control/verbose 2 +# +# +# +# Initialize New Phantom +# +# Choose model: ORNL, MIRD, MIX +# +/phantom/setPhantomModel MIRD +# +# Choose Sex of Phantom: Male or Female +# +/phantom/setPhantomSex Male +# +# Insert Body Part and their Sensitivity +# +/bodypart/addBodyPart Head yes +######### +/bodypart/addBodyPart Trunk no +/bodypart/addBodyPart Legs yes +############## +# +# Skeleton System +# +/bodypart/addBodyPart LegBones yes +/bodypart/addBodyPart ArmBones yes +/bodypart/addBodyPart UpperSpine yes +/bodypart/addBodyPart MiddleLowerSpine yes +/bodypart/addBodyPart Skull yes +/bodypart/addBodyPart Pelvis yes +# +# Organs +# +/bodypart/addBodyPart Lungs yes +/bodypart/addBodyPart Brain yes +/bodypart/addBodyPart Heart yes +/bodypart/addBodyPart Kidneys yes +/bodypart/addBodyPart UrinaryBladder yes +/bodypart/addBodyPart Spleen yes +/bodypart/addBodyPart Pancreas no +/bodypart/addBodyPart Thyroid yes +# +# Gastrointestinal System +# +/bodypart/addBodyPart Stomach yes +/bodypart/addBodyPart UpperLargeIntestine yes +/bodypart/addBodyPart LowerLargeIntestine yes +/bodypart/addBodyPart Liver yes +# +# Construct your Phantom +# +/phantom/buildNewPhantom +/run/initialize +# +# +# Visualization Config +# +# Visualize Phantom with VRML +#/control/execute vrmlVis.mac +# +# Visualize Phantom with OPENGL +/control/execute openGLVis.mac +# +# Visualize Phantom with DAWN +#/control/execute dawnVis.mac +# +# Run Particles +# +/control/execute run.mac diff --git a/examples/advanced/human_phantom/adultORNLFemale.mac b/examples/advanced/human_phantom/adultORNLFemale.mac new file mode 100644 index 0000000000..f5d375286d --- /dev/null +++ b/examples/advanced/human_phantom/adultORNLFemale.mac @@ -0,0 +1,78 @@ +# +# Sets some default verbose +/control/verbose 2 +# +# +# +# Initialize New Phantom +# +# Choose model: ORNL, MIRD, MIX +# +/phantom/setPhantomModel ORNL +# +# Choose Sex of Phantom: Male or Female +# +/phantom/setPhantomSex Female +# +# Insert Body Part and their Sensitivity +# +/bodypart/addBodyPart Head yes +######### +/bodypart/addBodyPart Trunk no +/bodypart/addBodyPart Legs yes +############## +# +# Skeleton System +# +/bodypart/addBodyPart LegBones yes +/bodypart/addBodyPart ArmBones yes +/bodypart/addBodyPart UpperSpine yes +/bodypart/addBodyPart MiddleLowerSpine yes +/bodypart/addBodyPart Skull yes +/bodypart/addBodyPart Pelvis yes +# +# Organs +# +/bodypart/addBodyPart Breast yes +/bodypart/addBodyPart Lungs yes +/bodypart/addBodyPart Brain yes +/bodypart/addBodyPart Heart yes +/bodypart/addBodyPart Kidneys yes +/bodypart/addBodyPart UrinaryBladder yes +/bodypart/addBodyPart Spleen yes +/bodypart/addBodyPart Pancreas no +/bodypart/addBodyPart Thyroid yes +# +# Gastrointestinal System +# +/bodypart/addBodyPart Stomach yes +/bodypart/addBodyPart UpperLargeIntestine yes +/bodypart/addBodyPart LowerLargeIntestine yes +/bodypart/addBodyPart Liver yes +# +# Genitalia +# +#/bodypart/addBodyPart Ovaries yes +#/bodypart/addBodyPart Uterus yes +# +# +# Construct your Phantom +# +/phantom/buildNewPhantom +/run/initialize +# +# +# Visualization Config +# +# Visualize Phantom with VRML +#/control/execute vrmlVis.mac +# +# Visualize Phantom with OPENGL +/control/execute openGLVis.mac +# +# Visualize Phantom with DAWN +#/control/execute dawnVis.mac +# +# Run Particles +# +/control/execute run.mac diff --git a/examples/advanced/human_phantom/adultORNLMale.mac b/examples/advanced/human_phantom/adultORNLMale.mac new file mode 100644 index 0000000000..0750c32e23 --- /dev/null +++ b/examples/advanced/human_phantom/adultORNLMale.mac @@ -0,0 +1,78 @@ +# +# Sets some default verbose +/control/verbose 2 +# +# +# +# Initialize New Phantom +# +# Choose model: ORNL, MIRD, MIX +# +/phantom/setPhantomModel ORNL +# +# Choose Sex of Phantom: Male or Female +# +/phantom/setPhantomSex Male +# +# Insert Body Part and their Sensitivity +# +/bodypart/addBodyPart Head yes +######### +/bodypart/addBodyPart Trunk no +/bodypart/addBodyPart Legs yes +############## +# +# Skeleton System +# +/bodypart/addBodyPart LegBones yes +/bodypart/addBodyPart ArmBones yes +/bodypart/addBodyPart UpperSpine yes +/bodypart/addBodyPart MiddleLowerSpine yes +/bodypart/addBodyPart Skull yes +/bodypart/addBodyPart Pelvis yes +# +# Organs +# +/bodypart/addBodyPart Breast yes +/bodypart/addBodyPart Lungs yes +/bodypart/addBodyPart Brain yes +/bodypart/addBodyPart Heart yes +/bodypart/addBodyPart Kidneys yes +/bodypart/addBodyPart UrinaryBladder yes +/bodypart/addBodyPart Spleen yes +/bodypart/addBodyPart Pancreas no +/bodypart/addBodyPart Thyroid yes +# +# Gastrointestinal System +# +/bodypart/addBodyPart Stomach yes +/bodypart/addBodyPart UpperLargeIntestine yes +/bodypart/addBodyPart LowerLargeIntestine yes +/bodypart/addBodyPart Liver yes +# +# Genitalia +# +#/bodypart/addBodyPart Ovaries yes +#/bodypart/addBodyPart Uterus yes +# +# +# Construct your Phantom +# +/phantom/buildNewPhantom +/run/initialize +# +# +# Visualization Config +# +# Visualize Phantom with VRML +#/control/execute vrmlVis.mac +# +# Visualize Phantom with OPENGL +/control/execute openGLVis.mac +# +# Visualize Phantom with DAWN +#/control/execute dawnVis.mac +# +# Run Particles +# +/control/execute run.mac diff --git a/examples/advanced/human_phantom/dawnVis.mac b/examples/advanced/human_phantom/dawnVis.mac new file mode 100644 index 0000000000..5ab1072328 --- /dev/null +++ b/examples/advanced/human_phantom/dawnVis.mac @@ -0,0 +1,14 @@ +# +# Macro file for the initialization phase of "phantom.cc" +# when runing in interactive mode +# +# Sets some default verbose +# +/control/verbose 1 +/run/verbose 0 +/event/verbose 0 +/tracking/verbose 0 +/vis/scene/create +/vis/open DAWNFILE +/vis/viewer/flush +# diff --git a/examples/advanced/human_phantom/gdmlData/Female/MIRDArmBone.gdml b/examples/advanced/human_phantom/gdmlData/Female/MIRDArmBone.gdml new file mode 100644 index 0000000000..381bbe559b --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/MIRDArmBone.gdml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/MIRDBrain.gdml b/examples/advanced/human_phantom/gdmlData/Female/MIRDBrain.gdml new file mode 100644 index 0000000000..86ea947361 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/MIRDBrain.gdml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/MIRDBreast.gdml b/examples/advanced/human_phantom/gdmlData/Female/MIRDBreast.gdml new file mode 100644 index 0000000000..0f1e2a740a --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/MIRDBreast.gdml @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/MIRDHead.gdml b/examples/advanced/human_phantom/gdmlData/Female/MIRDHead.gdml new file mode 100644 index 0000000000..4d3da92fa3 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/MIRDHead.gdml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/MIRDHeart.gdml b/examples/advanced/human_phantom/gdmlData/Female/MIRDHeart.gdml new file mode 100644 index 0000000000..513b824b3f --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/MIRDHeart.gdml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/MIRDKidney.gdml b/examples/advanced/human_phantom/gdmlData/Female/MIRDKidney.gdml new file mode 100644 index 0000000000..4fc0b5cc47 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/MIRDKidney.gdml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/MIRDLegBone.gdml b/examples/advanced/human_phantom/gdmlData/Female/MIRDLegBone.gdml new file mode 100644 index 0000000000..c1e49d1d59 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/MIRDLegBone.gdml @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/MIRDLegs.gdml b/examples/advanced/human_phantom/gdmlData/Female/MIRDLegs.gdml new file mode 100644 index 0000000000..f6321c1cf6 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/MIRDLegs.gdml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/advanced/human_phantom/gdmlData/Female/MIRDLiver.gdml b/examples/advanced/human_phantom/gdmlData/Female/MIRDLiver.gdml new file mode 100644 index 0000000000..5ac3e84521 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/MIRDLiver.gdml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/MIRDLowerLargeIntestine.gdml b/examples/advanced/human_phantom/gdmlData/Female/MIRDLowerLargeIntestine.gdml new file mode 100644 index 0000000000..53214a5745 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/MIRDLowerLargeIntestine.gdml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/MIRDLung.gdml b/examples/advanced/human_phantom/gdmlData/Female/MIRDLung.gdml new file mode 100644 index 0000000000..f6782973a1 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/MIRDLung.gdml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/MIRDMiddleLowerSpine.gdml b/examples/advanced/human_phantom/gdmlData/Female/MIRDMiddleLowerSpine.gdml new file mode 100644 index 0000000000..0db16d9f69 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/MIRDMiddleLowerSpine.gdml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/MIRDOvary.gdml b/examples/advanced/human_phantom/gdmlData/Female/MIRDOvary.gdml new file mode 100644 index 0000000000..759602fd8b --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/MIRDOvary.gdml @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/MIRDPancreas.gdml b/examples/advanced/human_phantom/gdmlData/Female/MIRDPancreas.gdml new file mode 100644 index 0000000000..c0a68b1ec5 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/MIRDPancreas.gdml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/MIRDPelvis.gdml b/examples/advanced/human_phantom/gdmlData/Female/MIRDPelvis.gdml new file mode 100644 index 0000000000..6214cf32dd --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/MIRDPelvis.gdml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/MIRDSkull.gdml b/examples/advanced/human_phantom/gdmlData/Female/MIRDSkull.gdml new file mode 100644 index 0000000000..1a1ffdc146 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/MIRDSkull.gdml @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/MIRDSpleen.gdml b/examples/advanced/human_phantom/gdmlData/Female/MIRDSpleen.gdml new file mode 100644 index 0000000000..d7ac68adb6 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/MIRDSpleen.gdml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/MIRDStomach.gdml b/examples/advanced/human_phantom/gdmlData/Female/MIRDStomach.gdml new file mode 100644 index 0000000000..fa4203ff1d --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/MIRDStomach.gdml @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/MIRDThyroid.gdml b/examples/advanced/human_phantom/gdmlData/Female/MIRDThyroid.gdml new file mode 100644 index 0000000000..5637e0396d --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/MIRDThyroid.gdml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/MIRDTrunk.gdml b/examples/advanced/human_phantom/gdmlData/Female/MIRDTrunk.gdml new file mode 100644 index 0000000000..ddab78fa2f --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/MIRDTrunk.gdml @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/advanced/human_phantom/gdmlData/Female/MIRDUpperLargeIntestine.gdml b/examples/advanced/human_phantom/gdmlData/Female/MIRDUpperLargeIntestine.gdml new file mode 100644 index 0000000000..2564ef29db --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/MIRDUpperLargeIntestine.gdml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/MIRDUpperSpine.gdml b/examples/advanced/human_phantom/gdmlData/Female/MIRDUpperSpine.gdml new file mode 100644 index 0000000000..6b72c865c1 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/MIRDUpperSpine.gdml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/MIRDUrinaryBladder.gdml b/examples/advanced/human_phantom/gdmlData/Female/MIRDUrinaryBladder.gdml new file mode 100644 index 0000000000..79cfeeab0c --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/MIRDUrinaryBladder.gdml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/MIRDUterus.gdml b/examples/advanced/human_phantom/gdmlData/Female/MIRDUterus.gdml new file mode 100644 index 0000000000..e6fe80fede --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/MIRDUterus.gdml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/ORNLArmBone.gdml b/examples/advanced/human_phantom/gdmlData/Female/ORNLArmBone.gdml new file mode 100644 index 0000000000..ab924d4802 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/ORNLArmBone.gdml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/ORNLBrain.gdml b/examples/advanced/human_phantom/gdmlData/Female/ORNLBrain.gdml new file mode 100644 index 0000000000..b73687fe8e --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/ORNLBrain.gdml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/ORNLBreast.gdml b/examples/advanced/human_phantom/gdmlData/Female/ORNLBreast.gdml new file mode 100644 index 0000000000..0f1e2a740a --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/ORNLBreast.gdml @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/ORNLHead.gdml b/examples/advanced/human_phantom/gdmlData/Female/ORNLHead.gdml new file mode 100644 index 0000000000..1916bdebf7 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/ORNLHead.gdml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/ORNLHeart.gdml b/examples/advanced/human_phantom/gdmlData/Female/ORNLHeart.gdml new file mode 100644 index 0000000000..94e2d0ae6b --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/ORNLHeart.gdml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/ORNLKidney.gdml b/examples/advanced/human_phantom/gdmlData/Female/ORNLKidney.gdml new file mode 100644 index 0000000000..9e70cea00e --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/ORNLKidney.gdml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/ORNLLegBone.gdml b/examples/advanced/human_phantom/gdmlData/Female/ORNLLegBone.gdml new file mode 100644 index 0000000000..200c179ff2 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/ORNLLegBone.gdml @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/ORNLLegs.gdml b/examples/advanced/human_phantom/gdmlData/Female/ORNLLegs.gdml new file mode 100644 index 0000000000..8d90476df7 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/ORNLLegs.gdml @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/advanced/human_phantom/gdmlData/Female/ORNLLiver.gdml b/examples/advanced/human_phantom/gdmlData/Female/ORNLLiver.gdml new file mode 100644 index 0000000000..45b6de356e --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/ORNLLiver.gdml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/ORNLLowerLargeIntestine.gdml b/examples/advanced/human_phantom/gdmlData/Female/ORNLLowerLargeIntestine.gdml new file mode 100644 index 0000000000..526ccc18da --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/ORNLLowerLargeIntestine.gdml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/ORNLLung.gdml b/examples/advanced/human_phantom/gdmlData/Female/ORNLLung.gdml new file mode 100644 index 0000000000..05d96ae848 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/ORNLLung.gdml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/ORNLMiddleLowerSpine.gdml b/examples/advanced/human_phantom/gdmlData/Female/ORNLMiddleLowerSpine.gdml new file mode 100644 index 0000000000..ff6323f7ec --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/ORNLMiddleLowerSpine.gdml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/ORNLOvary.gdml b/examples/advanced/human_phantom/gdmlData/Female/ORNLOvary.gdml new file mode 100644 index 0000000000..ef389f20b2 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/ORNLOvary.gdml @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/ORNLPancreas.gdml b/examples/advanced/human_phantom/gdmlData/Female/ORNLPancreas.gdml new file mode 100644 index 0000000000..d3af2c3e1c --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/ORNLPancreas.gdml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/ORNLPelvis.gdml b/examples/advanced/human_phantom/gdmlData/Female/ORNLPelvis.gdml new file mode 100644 index 0000000000..5d7a5e664f --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/ORNLPelvis.gdml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/ORNLSkull.gdml b/examples/advanced/human_phantom/gdmlData/Female/ORNLSkull.gdml new file mode 100644 index 0000000000..ea7a37cce0 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/ORNLSkull.gdml @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/ORNLSpleen.gdml b/examples/advanced/human_phantom/gdmlData/Female/ORNLSpleen.gdml new file mode 100644 index 0000000000..80a36f30bc --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/ORNLSpleen.gdml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/ORNLStomach.gdml b/examples/advanced/human_phantom/gdmlData/Female/ORNLStomach.gdml new file mode 100644 index 0000000000..ab576c7c9f --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/ORNLStomach.gdml @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/ORNLThyroid.gdml b/examples/advanced/human_phantom/gdmlData/Female/ORNLThyroid.gdml new file mode 100644 index 0000000000..dfa1871905 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/ORNLThyroid.gdml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/ORNLTrunk.gdml b/examples/advanced/human_phantom/gdmlData/Female/ORNLTrunk.gdml new file mode 100644 index 0000000000..32043d73ed --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/ORNLTrunk.gdml @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/advanced/human_phantom/gdmlData/Female/ORNLUpperLargeIntestine.gdml b/examples/advanced/human_phantom/gdmlData/Female/ORNLUpperLargeIntestine.gdml new file mode 100644 index 0000000000..86504e668a --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/ORNLUpperLargeIntestine.gdml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/ORNLUpperSpine.gdml b/examples/advanced/human_phantom/gdmlData/Female/ORNLUpperSpine.gdml new file mode 100644 index 0000000000..46ab440b0d --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/ORNLUpperSpine.gdml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/ORNLUrinaryBladder.gdml b/examples/advanced/human_phantom/gdmlData/Female/ORNLUrinaryBladder.gdml new file mode 100644 index 0000000000..ed7f450729 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/ORNLUrinaryBladder.gdml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Female/ORNLUterus.gdml b/examples/advanced/human_phantom/gdmlData/Female/ORNLUterus.gdml new file mode 100644 index 0000000000..ef8ef4c977 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Female/ORNLUterus.gdml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/MIRDArmBone.gdml b/examples/advanced/human_phantom/gdmlData/Male/MIRDArmBone.gdml new file mode 100644 index 0000000000..bd7760954a --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/MIRDArmBone.gdml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/MIRDBrain.gdml b/examples/advanced/human_phantom/gdmlData/Male/MIRDBrain.gdml new file mode 100644 index 0000000000..5191424c30 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/MIRDBrain.gdml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/MIRDHead.gdml b/examples/advanced/human_phantom/gdmlData/Male/MIRDHead.gdml new file mode 100644 index 0000000000..4d3da92fa3 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/MIRDHead.gdml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/MIRDHeart.gdml b/examples/advanced/human_phantom/gdmlData/Male/MIRDHeart.gdml new file mode 100644 index 0000000000..513b824b3f --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/MIRDHeart.gdml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/MIRDKidney.gdml b/examples/advanced/human_phantom/gdmlData/Male/MIRDKidney.gdml new file mode 100644 index 0000000000..4fc0b5cc47 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/MIRDKidney.gdml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/MIRDLegBone.gdml b/examples/advanced/human_phantom/gdmlData/Male/MIRDLegBone.gdml new file mode 100644 index 0000000000..c1e49d1d59 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/MIRDLegBone.gdml @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/MIRDLegs.gdml b/examples/advanced/human_phantom/gdmlData/Male/MIRDLegs.gdml new file mode 100644 index 0000000000..f6321c1cf6 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/MIRDLegs.gdml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/advanced/human_phantom/gdmlData/Male/MIRDLiver.gdml b/examples/advanced/human_phantom/gdmlData/Male/MIRDLiver.gdml new file mode 100644 index 0000000000..5ac3e84521 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/MIRDLiver.gdml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/MIRDLowerLargeIntestine.gdml b/examples/advanced/human_phantom/gdmlData/Male/MIRDLowerLargeIntestine.gdml new file mode 100644 index 0000000000..172868302e --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/MIRDLowerLargeIntestine.gdml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/MIRDLung.gdml b/examples/advanced/human_phantom/gdmlData/Male/MIRDLung.gdml new file mode 100644 index 0000000000..f6782973a1 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/MIRDLung.gdml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/MIRDMiddleLowerSpine.gdml b/examples/advanced/human_phantom/gdmlData/Male/MIRDMiddleLowerSpine.gdml new file mode 100644 index 0000000000..0db16d9f69 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/MIRDMiddleLowerSpine.gdml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/MIRDPancreas.gdml b/examples/advanced/human_phantom/gdmlData/Male/MIRDPancreas.gdml new file mode 100644 index 0000000000..c0a68b1ec5 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/MIRDPancreas.gdml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/MIRDPelvis.gdml b/examples/advanced/human_phantom/gdmlData/Male/MIRDPelvis.gdml new file mode 100644 index 0000000000..6214cf32dd --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/MIRDPelvis.gdml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/MIRDSkull.gdml b/examples/advanced/human_phantom/gdmlData/Male/MIRDSkull.gdml new file mode 100644 index 0000000000..b226fc0b08 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/MIRDSkull.gdml @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/MIRDSpleen.gdml b/examples/advanced/human_phantom/gdmlData/Male/MIRDSpleen.gdml new file mode 100644 index 0000000000..d7ac68adb6 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/MIRDSpleen.gdml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/MIRDStomach.gdml b/examples/advanced/human_phantom/gdmlData/Male/MIRDStomach.gdml new file mode 100644 index 0000000000..fa4203ff1d --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/MIRDStomach.gdml @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/MIRDThyroid.gdml b/examples/advanced/human_phantom/gdmlData/Male/MIRDThyroid.gdml new file mode 100644 index 0000000000..5637e0396d --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/MIRDThyroid.gdml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/MIRDTrunk.gdml b/examples/advanced/human_phantom/gdmlData/Male/MIRDTrunk.gdml new file mode 100644 index 0000000000..ddab78fa2f --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/MIRDTrunk.gdml @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/advanced/human_phantom/gdmlData/Male/MIRDUpperLargeIntestine.gdml b/examples/advanced/human_phantom/gdmlData/Male/MIRDUpperLargeIntestine.gdml new file mode 100644 index 0000000000..2564ef29db --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/MIRDUpperLargeIntestine.gdml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/MIRDUpperSpine.gdml b/examples/advanced/human_phantom/gdmlData/Male/MIRDUpperSpine.gdml new file mode 100644 index 0000000000..6b72c865c1 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/MIRDUpperSpine.gdml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/MIRDUrinaryBladder.gdml b/examples/advanced/human_phantom/gdmlData/Male/MIRDUrinaryBladder.gdml new file mode 100644 index 0000000000..79cfeeab0c --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/MIRDUrinaryBladder.gdml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/ORNLArmBone.gdml b/examples/advanced/human_phantom/gdmlData/Male/ORNLArmBone.gdml new file mode 100644 index 0000000000..381bbe559b --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/ORNLArmBone.gdml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/ORNLBrain.gdml b/examples/advanced/human_phantom/gdmlData/Male/ORNLBrain.gdml new file mode 100644 index 0000000000..b73687fe8e --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/ORNLBrain.gdml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/ORNLHead.gdml b/examples/advanced/human_phantom/gdmlData/Male/ORNLHead.gdml new file mode 100644 index 0000000000..1916bdebf7 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/ORNLHead.gdml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/ORNLHeart.gdml b/examples/advanced/human_phantom/gdmlData/Male/ORNLHeart.gdml new file mode 100644 index 0000000000..94e2d0ae6b --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/ORNLHeart.gdml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/ORNLKidney.gdml b/examples/advanced/human_phantom/gdmlData/Male/ORNLKidney.gdml new file mode 100644 index 0000000000..9e70cea00e --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/ORNLKidney.gdml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/ORNLLegBone.gdml b/examples/advanced/human_phantom/gdmlData/Male/ORNLLegBone.gdml new file mode 100644 index 0000000000..200c179ff2 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/ORNLLegBone.gdml @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/ORNLLegs.gdml b/examples/advanced/human_phantom/gdmlData/Male/ORNLLegs.gdml new file mode 100644 index 0000000000..8d90476df7 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/ORNLLegs.gdml @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/advanced/human_phantom/gdmlData/Male/ORNLLiver.gdml b/examples/advanced/human_phantom/gdmlData/Male/ORNLLiver.gdml new file mode 100644 index 0000000000..45b6de356e --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/ORNLLiver.gdml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/ORNLLowerLargeIntestine.gdml b/examples/advanced/human_phantom/gdmlData/Male/ORNLLowerLargeIntestine.gdml new file mode 100644 index 0000000000..526ccc18da --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/ORNLLowerLargeIntestine.gdml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/ORNLLung.gdml b/examples/advanced/human_phantom/gdmlData/Male/ORNLLung.gdml new file mode 100644 index 0000000000..05d96ae848 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/ORNLLung.gdml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/ORNLMiddleLowerSpine.gdml b/examples/advanced/human_phantom/gdmlData/Male/ORNLMiddleLowerSpine.gdml new file mode 100644 index 0000000000..ff6323f7ec --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/ORNLMiddleLowerSpine.gdml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/ORNLPancreas.gdml b/examples/advanced/human_phantom/gdmlData/Male/ORNLPancreas.gdml new file mode 100644 index 0000000000..d3af2c3e1c --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/ORNLPancreas.gdml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/ORNLPelvis.gdml b/examples/advanced/human_phantom/gdmlData/Male/ORNLPelvis.gdml new file mode 100644 index 0000000000..5d7a5e664f --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/ORNLPelvis.gdml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/ORNLSkull.gdml b/examples/advanced/human_phantom/gdmlData/Male/ORNLSkull.gdml new file mode 100644 index 0000000000..ea7a37cce0 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/ORNLSkull.gdml @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/ORNLSpleen.gdml b/examples/advanced/human_phantom/gdmlData/Male/ORNLSpleen.gdml new file mode 100644 index 0000000000..80a36f30bc --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/ORNLSpleen.gdml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/ORNLStomach.gdml b/examples/advanced/human_phantom/gdmlData/Male/ORNLStomach.gdml new file mode 100644 index 0000000000..ab576c7c9f --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/ORNLStomach.gdml @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/ORNLThyroid.gdml b/examples/advanced/human_phantom/gdmlData/Male/ORNLThyroid.gdml new file mode 100644 index 0000000000..dfa1871905 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/ORNLThyroid.gdml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/ORNLTrunk.gdml b/examples/advanced/human_phantom/gdmlData/Male/ORNLTrunk.gdml new file mode 100644 index 0000000000..32043d73ed --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/ORNLTrunk.gdml @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/advanced/human_phantom/gdmlData/Male/ORNLUpperLargeIntestine.gdml b/examples/advanced/human_phantom/gdmlData/Male/ORNLUpperLargeIntestine.gdml new file mode 100644 index 0000000000..86504e668a --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/ORNLUpperLargeIntestine.gdml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/ORNLUpperSpine.gdml b/examples/advanced/human_phantom/gdmlData/Male/ORNLUpperSpine.gdml new file mode 100644 index 0000000000..46ab440b0d --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/ORNLUpperSpine.gdml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/gdmlData/Male/ORNLUrinaryBladder.gdml b/examples/advanced/human_phantom/gdmlData/Male/ORNLUrinaryBladder.gdml new file mode 100644 index 0000000000..ed7f450729 --- /dev/null +++ b/examples/advanced/human_phantom/gdmlData/Male/ORNLUrinaryBladder.gdml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/advanced/human_phantom/include/G4FemaleBuilder.hh b/examples/advanced/human_phantom/include/G4FemaleBuilder.hh new file mode 100644 index 0000000000..01720c00e9 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4FemaleBuilder.hh @@ -0,0 +1,59 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// + +#ifndef G4FemaleBuilder_h +#define G4FemaleBuilder_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "G4PhantomBuilder.hh" + +class G4PhantomBuilder; + +class G4VPhysicalVolume; +class G4VBodyFactory; +class G4FemaleBuilder: public G4PhantomBuilder +{ +public: + G4FemaleBuilder(); + ~G4FemaleBuilder(); + + void BuildBreast(G4bool sensitivity); + void BuildParameterisedBreast(G4bool sensitivity); + void BuildOvary(G4bool sensitivity); + void BuildUterus(G4bool sensitivity); + void BuildTestes(G4bool){;}; + void BuildMaleGenitalia(G4bool){;}; +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4HumanDummySD.hh b/examples/advanced/human_phantom/include/G4HumanDummySD.hh new file mode 100644 index 0000000000..bf5a17f009 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4HumanDummySD.hh @@ -0,0 +1,64 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// ******************************** +// * * +// * G4HumanDummySD.hh * +// * * +// ******************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +// Dummy sensitive used only to flag sensitivity in cells of RO geometry. + +#ifndef G4HumanDummySD_h +#define G4HumanDummySD_h 1 + +#include "G4VSensitiveDetector.hh" +class G4Step; + +class G4HumanDummySD : public G4VSensitiveDetector +{ +public: + G4HumanDummySD(); + ~G4HumanDummySD() {}; + + void Initialize(G4HCofThisEvent* ) {}; + G4bool ProcessHits(G4Step* ,G4TouchableHistory*) {return false;} + void EndOfEvent(G4HCofThisEvent*) {}; + void clear() {}; + void DrawAll() {}; + void PrintAll() {}; +}; + +G4HumanDummySD::G4HumanDummySD() : G4VSensitiveDetector("dummySD") +{} +#endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04StackingAction.hh b/examples/advanced/human_phantom/include/G4HumanPhantomAnalysisManager.hh similarity index 52% rename from examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04StackingAction.hh rename to examples/advanced/human_phantom/include/G4HumanPhantomAnalysisManager.hh index 7d54405987..7e63200d72 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04StackingAction.hh +++ b/examples/advanced/human_phantom/include/G4HumanPhantomAnalysisManager.hh @@ -23,55 +23,67 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// -#ifndef ExN04StackingAction_H -#define ExN04StackingAction_H 1 +#ifdef G4ANALYSIS_USE +#ifndef G4HUMANPHANTOMANALYSISMANAGER_HH +#define G4HUMANPHANTOMANALYSISMANAGER_HH 1 #include "globals.hh" -#include "G4UserStackingAction.hh" +#include #include "G4ThreeVector.hh" +#include -class G4Track; - -#include "ExN04TrackerHit.hh" -#include "ExN04MuonHit.hh" -class ExN04StackingActionMessenger; - -class ExN04StackingAction : public G4UserStackingAction +namespace AIDA { - public: - ExN04StackingAction(); - virtual ~ExN04StackingAction(); - - public: - virtual G4ClassificationOfNewTrack ClassifyNewTrack(const G4Track* aTrack); - virtual void NewStage(); - virtual void PrepareNewEvent(); - - private: - G4bool InsideRoI(const G4Track * aTrack,G4double ang); - G4VHitsCollection* GetCollection(G4String colName); - - ExN04TrackerHitsCollection* trkHits; - ExN04MuonHitsCollection* muonHits; - ExN04StackingActionMessenger* theMessenger; - - G4int stage; - G4int reqMuon; - G4int reqIsoMuon; - G4int reqIso; - G4double angRoI; - - public: - inline void SetNRequestMuon(G4int val) { reqMuon = val; } - inline G4int GetNRequestMuon() const { return reqMuon; } - inline void SetNRequestIsoMuon(G4int val) { reqIsoMuon = val; } - inline G4int GetNRequestIsoMuon() const { return reqIsoMuon; } - inline void SetNIsolation(G4int val) { reqIso = val; } - inline G4int GetNIsolation() const { return reqIso; } - inline void SetRoIAngle(G4double val) { angRoI = val; } - inline G4double GetRoIAngle() const { return angRoI; } + class ITree; + class IHistogramFactory; + class IAnalysisFactory; + class ITreeFactory; }; +class G4HumanPhantomAnalysisManager { + +public: + + ~G4HumanPhantomAnalysisManager(); + static G4HumanPhantomAnalysisManager* getInstance(); + + void book(); + void particlePath(G4double); + void particleProjectionXY(G4double, G4double); + void particleProjectionYZ(G4double, G4double); + void particleProjectionZX(G4double, G4double); + void bodypartEnergyDep(G4double,G4double); + void innerBreastEnergyDep(G4int, G4int, G4double); + void finish(); + +private: + static G4HumanPhantomAnalysisManager* instance; + G4HumanPhantomAnalysisManager(); + + AIDA::IAnalysisFactory* aFact; + AIDA::ITreeFactory* treeFact; + AIDA::ITree* theTree; + AIDA::IHistogramFactory* histogramFactory; + AIDA::IHistogram1D* histogramParticlePath; + AIDA::IHistogram2D* projectionXY; + AIDA::IHistogram2D* projectionYZ; + AIDA::IHistogram2D* projectionZX; + AIDA::IHistogram2D* energy; + AIDA::IHistogram2D* innerBreast; +}; +#endif #endif + + + diff --git a/examples/advanced/human_phantom/include/G4HumanPhantomConstruction.hh b/examples/advanced/human_phantom/include/G4HumanPhantomConstruction.hh new file mode 100644 index 0000000000..436d322e15 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4HumanPhantomConstruction.hh @@ -0,0 +1,77 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4HumanPhantomConstruction_H +#define G4HumanPhantomConstruction_H 1 + +#include "G4VUserDetectorConstruction.hh" +#include "G4HumanPhantomMessenger.hh" + +#include "globals.hh" +#include + +class G4VPhysicalVolume; +//class G4LogicalVolume; +//class G4HumanPhantomSD; +class G4HumanPhantomMaterial; +//class G4PhantomBuilder; +class G4HumanPhantomEnergyDeposit; +class G4HumanPhantomConstruction : public G4VUserDetectorConstruction +{ + public: + G4HumanPhantomConstruction(G4HumanPhantomEnergyDeposit*); + ~G4HumanPhantomConstruction(); + G4VPhysicalVolume* Construct(); + + void SetBodyPartSensitivity(G4String, G4bool); + void CleanPhantom(); + void UpdatePhantom(); + void SetPhantomSex(G4String); + void SetPhantomModel(G4String); + + G4VPhysicalVolume* GetMotherVolume(){return mother;}; + + private: + G4HumanPhantomEnergyDeposit* edepTot; + G4HumanPhantomMessenger* messenger; + + G4VPhysicalVolume* mother; + + G4String model; + G4String sex; + G4HumanPhantomMaterial* material; + std::map sensitivities; +}; + +#endif + diff --git a/examples/advanced/human_phantom/include/G4HumanPhantomEnergyDeposit.hh b/examples/advanced/human_phantom/include/G4HumanPhantomEnergyDeposit.hh new file mode 100644 index 0000000000..fdd95c178a --- /dev/null +++ b/examples/advanced/human_phantom/include/G4HumanPhantomEnergyDeposit.hh @@ -0,0 +1,53 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// + +#ifndef G4HumanPhantomEnergyDeposit_H +#define G4HumanPhantomEnergyDeposit_H 1 + +#include "globals.hh" +#include + +class G4HumanPhantomEnergyDeposit +{ +public: + G4HumanPhantomEnergyDeposit(); + ~G4HumanPhantomEnergyDeposit(); + void Fill(G4String bodypartName, G4double energyDeposit); + void TotalEnergyDeposit(); + +private: + std::map energyTotal; + G4String bodypartName; +}; +#endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04StackingActionMessenger.hh b/examples/advanced/human_phantom/include/G4HumanPhantomEventAction.hh similarity index 70% rename from examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04StackingActionMessenger.hh rename to examples/advanced/human_phantom/include/G4HumanPhantomEventAction.hh index 06e82ce584..a5c4525c6b 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04StackingActionMessenger.hh +++ b/examples/advanced/human_phantom/include/G4HumanPhantomEventAction.hh @@ -23,38 +23,31 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4HumanPhantomEventAction_h +#define G4HumanPhantomEventAction_h 1 -#ifndef ExN04StackingActionMessenger_h -#define ExN04StackingActionMessenger_h 1 - -class ExN04StackingAction; -class G4UIcmdWithAnInteger; -class G4UIcmdWithADoubleAndUnit; - -#include "G4UImessenger.hh" +#include "G4UserEventAction.hh" #include "globals.hh" -class ExN04StackingActionMessenger: public G4UImessenger +class G4Event; +class G4HumanPhantomEventAction : public G4UserEventAction { public: - ExN04StackingActionMessenger(ExN04StackingAction* msa); - ~ExN04StackingActionMessenger(); - + G4HumanPhantomEventAction(); + ~G4HumanPhantomEventAction(); + public: - void SetNewValue(G4UIcommand * command,G4String newValues); - G4String GetCurrentValue(G4UIcommand * command); - - private: - ExN04StackingAction * myAction; - - private: //commands - G4UIcmdWithAnInteger * muonCmd; - G4UIcmdWithAnInteger * isomuonCmd; - G4UIcmdWithAnInteger * isoCmd; - G4UIcmdWithADoubleAndUnit * roiCmd; - + void BeginOfEventAction(const G4Event*); + void EndOfEventAction(const G4Event*); }; - #endif - + diff --git a/examples/extended/medical/GammaTherapy/include/EmGammaNucleusBuilder.hh b/examples/advanced/human_phantom/include/G4HumanPhantomMaterial.hh similarity index 61% rename from examples/extended/medical/GammaTherapy/include/EmGammaNucleusBuilder.hh rename to examples/advanced/human_phantom/include/G4HumanPhantomMaterial.hh index d95a623089..0d50af468f 100644 --- a/examples/extended/medical/GammaTherapy/include/EmGammaNucleusBuilder.hh +++ b/examples/advanced/human_phantom/include/G4HumanPhantomMaterial.hh @@ -23,56 +23,48 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// -// -// ------------------------------------------------------------ -// GEANT 4 class header file -// Class Description: -// This class is an derived class of G4VPhysicsConstructor -// It is provide PhysicsList for hadron eleastic process -// -// ------------------------------------------------------------ -// History -// Created: 14.10.02 V.Ivanchenko -// -// Modified: -// -// ------------------------------------------------------------ +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy // -#ifndef EmGammaNucleusBuilder_h -#define EmGammaNucleusBuilder_h 1 +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +// This class manages the elements and materials +// +#ifndef G4HumanPhantomMaterial_H +#define G4HumanPhantomMaterial_H 1 -#include "G4VPhysicsConstructor.hh" #include "globals.hh" +class G4Material; - -class EmGammaNucleusBuilder : public G4VPhysicsConstructor -{ +class G4HumanPhantomMaterial +{ public: - EmGammaNucleusBuilder(const G4String& name = "gamma_e_A"); - virtual ~EmGammaNucleusBuilder(); + G4HumanPhantomMaterial(); + ~ G4HumanPhantomMaterial(); public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - void ConstructParticle(); + void DefineMaterials(); + G4Material* GetMaterial(G4String); //returns the material - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - void ConstructProcess(); - private: - + // G4Material* matW; + //G4Material* matplexiglass; + //G4Material* matPb; + //G4Material* matir192; + //G4Material* Titanium; + // G4Material* matAir; + G4Material* matH2O; + G4Material* soft; + G4Material* skeleton; + G4Material* lung; + G4Material* adipose; + G4Material* glandular; + G4Material* adipose_glandular; + //G4Material*Vacuum; + + //G4Material* muscle; }; - - #endif - - - - - - - - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/G4HepMCAsciiReaderMessenger.hh b/examples/advanced/human_phantom/include/G4HumanPhantomMessenger.hh similarity index 58% rename from examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/G4HepMCAsciiReaderMessenger.hh rename to examples/advanced/human_phantom/include/G4HumanPhantomMessenger.hh index c3a36cd58c..2a5c1b4b0b 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/G4HepMCAsciiReaderMessenger.hh +++ b/examples/advanced/human_phantom/include/G4HumanPhantomMessenger.hh @@ -23,37 +23,54 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// ==================================================================== +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. // -// G4HepMCAsciiReaderMessenger.hh -// $Id: G4HepMCAsciiReaderMessenger.hh,v 1.2 2006/06/29 17:12:49 gunter Exp $ -// -// ==================================================================== -#ifndef G4_HEPMC_ASCII_READER_MESSENGER_H -#define G4_HEPMC_ASCII_READER_MESSENGER_H +#ifndef G4HumanPhantomMessenger_h +#define G4HumanPhantomMessenger_h 1 + +class G4HumanPhantomConstruction; + +class G4UIcommand; +class G4UIdirectory; +class G4UIcmdWithAString; +class G4UIcmdWithoutParameter; #include "G4UImessenger.hh" +#include "globals.hh" +#include -class G4HepMCAsciiReader; -class G4UIdirectory; -class G4UIcmdWithoutParameter; -class G4UIcmdWithAString; -class G4UIcmdWithAnInteger; - -class G4HepMCAsciiReaderMessenger : public G4UImessenger { -private: - G4HepMCAsciiReader* gen; - - G4UIdirectory* dir; - G4UIcmdWithAnInteger* verbose; - G4UIcmdWithAString* open; - +class G4HumanPhantomMessenger: public G4UImessenger +{ public: - G4HepMCAsciiReaderMessenger(G4HepMCAsciiReader* agen); - ~G4HepMCAsciiReaderMessenger(); + G4HumanPhantomMessenger(G4HumanPhantomConstruction* myUsrPhtm); + ~G4HumanPhantomMessenger(); + + void SetNewValue(G4UIcommand* command, G4String newValue); + + void AddBodyPart(G4String); // Set Body Parts Sensitivity + +private: + G4HumanPhantomConstruction* myUserPhantom; + + G4UIdirectory* phantomDir; + G4UIdirectory* bpDir; + + G4UIcmdWithAString* modelCmd; + G4UIcmdWithAString* sexCmd; + G4UIcmdWithAString* bodypartCmd; + G4UIcmdWithoutParameter* endCmd; + G4UIcmdWithoutParameter* cleanCmd; + + G4String bodypart; + G4bool bps; - void SetNewValue(G4UIcommand* command, G4String newValues); - G4String GetCurrentValue(G4UIcommand* command); }; #endif + diff --git a/examples/advanced/human_phantom/include/G4HumanPhantomPhysicsList.hh b/examples/advanced/human_phantom/include/G4HumanPhantomPhysicsList.hh new file mode 100644 index 0000000000..5d470365c3 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4HumanPhantomPhysicsList.hh @@ -0,0 +1,62 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4HumanPhantomPhysicsList_h +#define G4HumanPhantomPhysicsList_h 1 + +#include "G4VUserPhysicsList.hh" +#include "globals.hh" + +class G4HumanPhantomPhysicsList: public G4VUserPhysicsList +{ +public: + G4HumanPhantomPhysicsList(); + ~G4HumanPhantomPhysicsList(); + +protected: + // Construct particle and physics + void ConstructParticle(); + void ConstructProcess(); + void ConstructBosons(); + void ConstructLeptons(); + + void SetCuts(); + +private: + // These methods construct physics processes and register them + void ConstructEM(); +}; +#endif + + + diff --git a/examples/advanced/human_phantom/include/G4HumanPhantomPrimaryGeneratorAction.hh b/examples/advanced/human_phantom/include/G4HumanPhantomPrimaryGeneratorAction.hh new file mode 100644 index 0000000000..42102c2700 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4HumanPhantomPrimaryGeneratorAction.hh @@ -0,0 +1,77 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4HumanPhantomPrimaryGeneratorAction_h +#define G4HumanPhantomPrimaryGeneratorAction_h 1 + +#include "G4VUserPrimaryGeneratorAction.hh" +#include "globals.hh" +#include + +//class G4HumanPhantomConstruction; +class G4HumanPhantomPrimaryGeneratorMessenger; +class G4ParticleGun; +class G4Event; + +class G4HumanPhantomPrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction +{ + public: + G4HumanPhantomPrimaryGeneratorAction(); + ~G4HumanPhantomPrimaryGeneratorAction(); + + public: + void GeneratePrimaries(G4Event* anEvent); + void GenerateBeamAlongZ(); + void GenerateBeamAlongX(); + void GenerateBeamAlongY(); + void GenerateIsotropicFlux(); + void SetBeam(G4String); + + private: + G4ParticleGun* particleGun; + + G4double x0; + G4double y0; + G4double z0; + + std::vector probability; + + G4HumanPhantomPrimaryGeneratorMessenger* messenger; + + G4String beamKind; + G4double worldLength; +}; + +#endif + + diff --git a/examples/novice/N05/include/ExN05DetectorMessenger.hh b/examples/advanced/human_phantom/include/G4HumanPhantomPrimaryGeneratorMessenger.hh similarity index 67% rename from examples/novice/N05/include/ExN05DetectorMessenger.hh rename to examples/advanced/human_phantom/include/G4HumanPhantomPrimaryGeneratorMessenger.hh index 1f8a076ebb..c7027c407f 100644 --- a/examples/novice/N05/include/ExN05DetectorMessenger.hh +++ b/examples/advanced/human_phantom/include/G4HumanPhantomPrimaryGeneratorMessenger.hh @@ -23,40 +23,36 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// -// $Id: ExN05DetectorMessenger.hh,v 1.5 2006/06/29 17:52:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy // +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// -#ifndef ExN05DetectorMessenger_h -#define ExN05DetectorMessenger_h 1 +#ifndef G4HumanPhantomPrimaryGeneratorMessenger_h +#define G4HumanPhantomPrimaryGeneratorMessenger_h 1 -#include "globals.hh" #include "G4UImessenger.hh" +#include "globals.hh" + +class G4HumanPhantomPrimaryGeneratorAction; -class ExN05DetectorConstruction; -class G4UIdirectory; class G4UIcmdWithAString; -class G4UIcmdWithADoubleAndUnit; -class ExN05DetectorMessenger: public G4UImessenger +class G4HumanPhantomPrimaryGeneratorMessenger: public G4UImessenger { public: - ExN05DetectorMessenger(ExN05DetectorConstruction * myDet); - ~ExN05DetectorMessenger(); - - void SetNewValue(G4UIcommand * command,G4String newValues); - G4String GetCurrentValue(G4UIcommand * command); - - private: - ExN05DetectorConstruction* myDetector; - - G4UIdirectory* mydetDir; - G4UIcmdWithAString* SwitchCmd; - G4UIcmdWithADoubleAndUnit* TmaxCmd; - G4UIcmdWithADoubleAndUnit* EminCmd; - G4UIcmdWithADoubleAndUnit* RminCmd; + G4HumanPhantomPrimaryGeneratorMessenger(G4HumanPhantomPrimaryGeneratorAction*); + ~G4HumanPhantomPrimaryGeneratorMessenger(); + + void SetNewValue(G4UIcommand*, G4String); + +private: + G4HumanPhantomPrimaryGeneratorAction* primary; + G4UIcmdWithAString* beamCmd; }; #endif diff --git a/examples/advanced/human_phantom/include/G4HumanPhantomROGeometry.hh b/examples/advanced/human_phantom/include/G4HumanPhantomROGeometry.hh new file mode 100644 index 0000000000..7ba5e334a4 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4HumanPhantomROGeometry.hh @@ -0,0 +1,52 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// + +#ifndef G4HumanPhantomROGeometry_h +#define G4HumanPhantomROGeometry_h + +#include "G4VReadOutGeometry.hh" + +class G4HumanPhantomROGeometry : public G4VReadOutGeometry +{ +public: + G4HumanPhantomROGeometry(G4String aString); + ~G4HumanPhantomROGeometry(); + +private: + G4VPhysicalVolume* Build(); + +private: + G4VPhysicalVolume* ROvoxel_phys; +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4HumanPhantomRunAction.hh b/examples/advanced/human_phantom/include/G4HumanPhantomRunAction.hh new file mode 100644 index 0000000000..f71c9527d9 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4HumanPhantomRunAction.hh @@ -0,0 +1,56 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// + +#ifndef G4HumanPhantomRunAction_h +#define G4HumanPhantomRunAction_h 1 + +#include "G4UserRunAction.hh" +#include "globals.hh" + +class G4HumanPhantomRunAction : public G4UserRunAction +{ + public: + G4HumanPhantomRunAction(); + ~G4HumanPhantomRunAction(); + + public: + void BeginOfRunAction(const G4Run*); + void EndOfRunAction(const G4Run*); +}; +#endif + + + + + diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04MuonSD.hh b/examples/advanced/human_phantom/include/G4HumanPhantomSD.hh similarity index 68% rename from examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04MuonSD.hh rename to examples/advanced/human_phantom/include/G4HumanPhantomSD.hh index ef0ae97cca..0dca7bfd37 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04MuonSD.hh +++ b/examples/advanced/human_phantom/include/G4HumanPhantomSD.hh @@ -23,38 +23,34 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // - -#ifndef ExN04MuonSD_h -#define ExN04MuonSD_h 1 +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4HumanPhantomSD_h +#define G4HumanPhantomSD_h 1 #include "G4VSensitiveDetector.hh" -#include "ExN04MuonHit.hh" + class G4Step; -class G4HCofThisEvent; -class G4TouchableHistory; +class G4HumanPhantomEnergyDeposit; -class ExN04MuonSD : public G4VSensitiveDetector +class G4HumanPhantomSD : public G4VSensitiveDetector { - public: - ExN04MuonSD(G4String name); - ~ExN04MuonSD(); + G4HumanPhantomSD(G4String,G4HumanPhantomEnergyDeposit*); + ~G4HumanPhantomSD(); - void Initialize(G4HCofThisEvent*HCE); - G4bool ProcessHits(G4Step*aStep,G4TouchableHistory*ROhist); - void EndOfEvent(G4HCofThisEvent*HCE); - void clear(); - void DrawAll(); - void PrintAll(); + void Initialize(G4HCofThisEvent*); + G4bool ProcessHits(G4Step*, G4TouchableHistory*); + void EndOfEvent(G4HCofThisEvent*); private: - ExN04MuonHitsCollection * muonCollection; - G4double positionResolution; - + G4HumanPhantomEnergyDeposit* energyTotal; }; - - - - #endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04CalorimeterSD.hh b/examples/advanced/human_phantom/include/G4HumanPhantomSDBreast.hh similarity index 69% rename from examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04CalorimeterSD.hh rename to examples/advanced/human_phantom/include/G4HumanPhantomSDBreast.hh index c1fe38c622..4173f827a0 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04CalorimeterSD.hh +++ b/examples/advanced/human_phantom/include/G4HumanPhantomSDBreast.hh @@ -23,39 +23,31 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // - -#ifndef ExN04CalorimeterSD_h -#define ExN04CalorimeterSD_h 1 +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4HumanPhantomSDBreast_h +#define G4HumanPhantomSDBreast_h 1 #include "G4VSensitiveDetector.hh" -#include "ExN04CalorimeterHit.hh" -class G4Step; -class G4HCofThisEvent; -class G4TouchableHistory; -class ExN04CalorimeterSD : public G4VSensitiveDetector +//class G4Step; +//class G4HCofThisEvent; + +class G4HumanPhantomSDBreast : public G4VSensitiveDetector { - public: - ExN04CalorimeterSD(G4String name); - ~ExN04CalorimeterSD(); + G4HumanPhantomSDBreast(G4String); + ~G4HumanPhantomSDBreast(); - void Initialize(G4HCofThisEvent*HCE); - G4bool ProcessHits(G4Step*aStep,G4TouchableHistory*ROhist); - void EndOfEvent(G4HCofThisEvent*HCE); - void clear(); - void DrawAll(); - void PrintAll(); - - private: - ExN04CalorimeterHitsCollection *CalCollection; - int CellID[20][48]; - const int numberOfCellsInZ; - const int numberOfCellsInPhi; + void Initialize(G4HCofThisEvent*); + G4bool ProcessHits(G4Step*, G4TouchableHistory*); + void EndOfEvent(G4HCofThisEvent*); }; - - - - #endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04SteppingAction.hh b/examples/advanced/human_phantom/include/G4HumanPhantomSteppingAction.hh similarity index 73% rename from examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04SteppingAction.hh rename to examples/advanced/human_phantom/include/G4HumanPhantomSteppingAction.hh index 477fe55e0d..033869caac 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04SteppingAction.hh +++ b/examples/advanced/human_phantom/include/G4HumanPhantomSteppingAction.hh @@ -23,21 +23,27 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// -#ifndef ExN04SteppingAction_H -#define ExN04SteppingAction_H 1 +#ifndef G4HumanPhantomSteppingAction_h +#define G4HumanPhantomSteppingAction_h 1 -#include "globals.hh" #include "G4UserSteppingAction.hh" +#include "globals.hh" -class ExN04SteppingAction : public G4UserSteppingAction +class G4HumanPhantomSteppingAction : public G4UserSteppingAction { public: - ExN04SteppingAction(); - virtual ~ExN04SteppingAction(); + G4HumanPhantomSteppingAction(); + ~G4HumanPhantomSteppingAction(); - virtual void UserSteppingAction(const G4Step*); + void UserSteppingAction(const G4Step*); }; - #endif - diff --git a/examples/advanced/human_phantom/include/G4MIRDAdrenal.hh b/examples/advanced/human_phantom/include/G4MIRDAdrenal.hh new file mode 100644 index 0000000000..bb0134359c --- /dev/null +++ b/examples/advanced/human_phantom/include/G4MIRDAdrenal.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4MIRDAdrenal_h +#define G4MIRDAdrenal_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4MIRDAdrenal +{ +public: + + G4MIRDAdrenal(); + ~G4MIRDAdrenal(); + G4VPhysicalVolume* ConstructAdrenal(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4MIRDArmBone.hh b/examples/advanced/human_phantom/include/G4MIRDArmBone.hh new file mode 100644 index 0000000000..935162c498 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4MIRDArmBone.hh @@ -0,0 +1,57 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// + +#ifndef G4MIRDArmBone_h +#define G4MIRDArmBone_h 1 + +#include "G4VPhysicalVolume.hh" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4MIRDArmBone +{ +public: + + G4MIRDArmBone(); + ~G4MIRDArmBone(); + + G4VPhysicalVolume* ConstructArmBone(G4VPhysicalVolume*, G4String, G4bool); + +private: + // SAXProcessor sxp; + // ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4MIRDBodyFactory.hh b/examples/advanced/human_phantom/include/G4MIRDBodyFactory.hh new file mode 100644 index 0000000000..aa79d25734 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4MIRDBodyFactory.hh @@ -0,0 +1,97 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4MIRDBodyFactory_h +#define G4MIRDBodyFactory_h 1 + +#include "G4VBodyFactory.hh" + +class G4VBodyFactory; +class G4VPhysicalVolume; +class G4MIRDBodyFactory: public G4VBodyFactory +{ +public: + G4MIRDBodyFactory(); + ~G4MIRDBodyFactory(); + + G4VPhysicalVolume* CreateHead(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateTrunk(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateLegs(G4VPhysicalVolume*,G4String,G4bool); + + G4VPhysicalVolume* CreateUpperSpine(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateMiddleLowerSpine(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateLegBone(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateArmBone(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateSkull(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateRibCage(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreatePelvis(G4VPhysicalVolume*,G4String,G4bool); + + G4VPhysicalVolume* CreateBreast(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateParameterisedBreast(G4VPhysicalVolume*, + G4String,G4bool); + + G4VPhysicalVolume* CreateUterus(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateOvary(G4VPhysicalVolume*,G4String,G4bool); + + G4VPhysicalVolume* CreateTestes(G4VPhysicalVolume*,G4String,G4bool); + + G4VPhysicalVolume* CreateBrain(G4VPhysicalVolume*,G4String,G4bool); + + G4VPhysicalVolume* CreateHeart(G4VPhysicalVolume*,G4String,G4bool); + + G4VPhysicalVolume* CreateLung(G4VPhysicalVolume*,G4String,G4bool); + + G4VPhysicalVolume* CreateStomach(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateUpperLargeIntestine(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateLowerLargeIntestine(G4VPhysicalVolume*,G4String,G4bool); + + G4VPhysicalVolume* CreateKidney(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateAdrenal(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateLiver(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreatePancreas(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateSpleen(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateUrinaryBladder(G4VPhysicalVolume*,G4String,G4bool); + + G4VPhysicalVolume* CreateThyroid(G4VPhysicalVolume*,G4String,G4bool); + + G4VPhysicalVolume* CreateEsophagus(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateNeck(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateScapulae(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateClavicles(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateMaleGenitalia(G4VPhysicalVolume*,G4String,G4bool); + +private: + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4MIRDBrain.hh b/examples/advanced/human_phantom/include/G4MIRDBrain.hh new file mode 100644 index 0000000000..09de43ab88 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4MIRDBrain.hh @@ -0,0 +1,57 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4MIRDBrain_h +#define G4MIRDBrain_h 1 + +#include "G4VPhysicalVolume.hh" + +//#include "Saxana/SAXProcessor.h" +///#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4MIRDBrain +{ +public: + + G4MIRDBrain(); + ~G4MIRDBrain(); + G4VPhysicalVolume* ConstructBrain(G4VPhysicalVolume*, G4String, G4bool); + +private: + //AXProcessor sxp; + //ProcessingConfigurator config; +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4MIRDBreast.hh b/examples/advanced/human_phantom/include/G4MIRDBreast.hh new file mode 100644 index 0000000000..7620bb204d --- /dev/null +++ b/examples/advanced/human_phantom/include/G4MIRDBreast.hh @@ -0,0 +1,50 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4MIRDBreast_h +#define G4MIRDBreast_h 1 + +#include "G4VPhysicalVolume.hh" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4MIRDBreast +{ +public: + + G4MIRDBreast(); + ~G4MIRDBreast(); + G4VPhysicalVolume* ConstructBreast(G4VPhysicalVolume*, G4String, G4bool); +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4MIRDHead.hh b/examples/advanced/human_phantom/include/G4MIRDHead.hh new file mode 100644 index 0000000000..5bf67cfa9c --- /dev/null +++ b/examples/advanced/human_phantom/include/G4MIRDHead.hh @@ -0,0 +1,59 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4MIRDHead_h +#define G4MIRDHead_h 1 + +#include "G4VPhysicalVolume.hh" + +//##include "Saxana/SAXProcessor.h" +//#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; +class G4HumanPhantomMaterial; + +class G4MIRDHead +{ +public: + + G4MIRDHead(); + ~G4MIRDHead(); + G4VPhysicalVolume* ConstructHead(G4VPhysicalVolume*, G4String, G4bool); + +private: + // SAXProcessor sxp; + // ProcessingConfigurator config; + G4HumanPhantomMaterial* material; +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4MIRDHeart.hh b/examples/advanced/human_phantom/include/G4MIRDHeart.hh new file mode 100644 index 0000000000..032d267b4b --- /dev/null +++ b/examples/advanced/human_phantom/include/G4MIRDHeart.hh @@ -0,0 +1,50 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4MIRDHeart_h +#define G4MIRDHeart_h 1 + +#include "G4VPhysicalVolume.hh" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4MIRDHeart +{ +public: + + G4MIRDHeart(); + ~G4MIRDHeart(); + G4VPhysicalVolume* ConstructHeart(G4VPhysicalVolume*, G4String, G4bool); +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4MIRDKidney.hh b/examples/advanced/human_phantom/include/G4MIRDKidney.hh new file mode 100644 index 0000000000..611e3fdb46 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4MIRDKidney.hh @@ -0,0 +1,50 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4MIRDKidney_h +#define G4MIRDKidney_h 1 + +#include "G4VPhysicalVolume.hh" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4MIRDKidney +{ +public: + + G4MIRDKidney(); + ~G4MIRDKidney(); + G4VPhysicalVolume* ConstructKidney(G4VPhysicalVolume*, G4String, G4bool); +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4MIRDLegBone.hh b/examples/advanced/human_phantom/include/G4MIRDLegBone.hh new file mode 100644 index 0000000000..657a0754de --- /dev/null +++ b/examples/advanced/human_phantom/include/G4MIRDLegBone.hh @@ -0,0 +1,53 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4MIRDLegBone_h +#define G4MIRDLegBone_h 1 + +#include "G4VPhysicalVolume.hh" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4MIRDLegBone +{ +public: + + G4MIRDLegBone(); + ~G4MIRDLegBone(); + G4VPhysicalVolume* ConstructLegBone(G4VPhysicalVolume*, G4String, G4bool); + +private: + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4MIRDLegs.hh b/examples/advanced/human_phantom/include/G4MIRDLegs.hh new file mode 100644 index 0000000000..c545a7417b --- /dev/null +++ b/examples/advanced/human_phantom/include/G4MIRDLegs.hh @@ -0,0 +1,50 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4MIRDLegs_h +#define G4MIRDLegs_h 1 + +#include "G4VPhysicalVolume.hh" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4MIRDLegs +{ +public: + + G4MIRDLegs(); + ~G4MIRDLegs(); + G4VPhysicalVolume* ConstructLegs(G4VPhysicalVolume*, G4String, G4bool); +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4MIRDLiver.hh b/examples/advanced/human_phantom/include/G4MIRDLiver.hh new file mode 100644 index 0000000000..eb2d88d945 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4MIRDLiver.hh @@ -0,0 +1,51 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4MIRDLiver_h +#define G4MIRDLiver_h 1 + +#include "G4VPhysicalVolume.hh" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4MIRDLiver +{ +public: + + G4MIRDLiver(); + ~G4MIRDLiver(); + G4VPhysicalVolume* ConstructLiver(G4VPhysicalVolume*, G4String, G4bool); + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4MIRDLowerLargeIntestine.hh b/examples/advanced/human_phantom/include/G4MIRDLowerLargeIntestine.hh new file mode 100644 index 0000000000..38ab06bac9 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4MIRDLowerLargeIntestine.hh @@ -0,0 +1,50 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4MIRDLowerLargeIntestine_h +#define G4MIRDLowerLargeIntestine_h 1 + +#include "G4VPhysicalVolume.hh" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4MIRDLowerLargeIntestine +{ +public: + + G4MIRDLowerLargeIntestine(); + ~G4MIRDLowerLargeIntestine(); + G4VPhysicalVolume* ConstructLowerLargeIntestine(G4VPhysicalVolume*, G4String, G4bool); + }; +#endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04DetectorConstruction.hh b/examples/advanced/human_phantom/include/G4MIRDLung.hh similarity index 73% rename from examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04DetectorConstruction.hh rename to examples/advanced/human_phantom/include/G4MIRDLung.hh index 62f0f25f65..b44f1cf2eb 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04DetectorConstruction.hh +++ b/examples/advanced/human_phantom/include/G4MIRDLung.hh @@ -23,37 +23,29 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4MIRDLung_h +#define G4MIRDLung_h 1 -#ifndef ExN04DetectorConstruction_h -#define ExN04DetectorConstruction_h 1 - -#include "G4VUserDetectorConstruction.hh" -#include "globals.hh" +#include "G4VPhysicalVolume.hh" class G4VPhysicalVolume; -class G4Material; +class G4LogicalVolume; -class ExN04DetectorConstruction : public G4VUserDetectorConstruction +class G4MIRDLung { - public: - ExN04DetectorConstruction(); - ~ExN04DetectorConstruction(); +public: - public: - G4VPhysicalVolume* Construct(); - - private: - void DefineMaterials(); - -#include "ExN04DetectorParameterDef.hh" - - G4Material* Air; - G4Material* Ar; - G4Material* Silicon; - G4Material* Scinti; - G4Material* Lead; + G4MIRDLung(); + ~G4MIRDLung(); + G4VPhysicalVolume* ConstructLung(G4VPhysicalVolume*, G4String, G4bool); }; - #endif - diff --git a/examples/advanced/human_phantom/include/G4MIRDMiddleLowerSpine.hh b/examples/advanced/human_phantom/include/G4MIRDMiddleLowerSpine.hh new file mode 100644 index 0000000000..b3aaf12faf --- /dev/null +++ b/examples/advanced/human_phantom/include/G4MIRDMiddleLowerSpine.hh @@ -0,0 +1,52 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4MIRDMiddleLowerSpine_h +#define G4MIRDMiddleLowerSpine_h 1 + +#include "G4VPhysicalVolume.hh" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4MIRDMiddleLowerSpine +{ +public: + + G4MIRDMiddleLowerSpine(); + ~G4MIRDMiddleLowerSpine(); + G4VPhysicalVolume* ConstructMiddleLowerSpine(G4VPhysicalVolume*, G4String, G4bool); + +private: +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4MIRDOvary.hh b/examples/advanced/human_phantom/include/G4MIRDOvary.hh new file mode 100644 index 0000000000..2cefbb8fee --- /dev/null +++ b/examples/advanced/human_phantom/include/G4MIRDOvary.hh @@ -0,0 +1,51 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4MIRDOvary_h +#define G4MIRDOvary_h 1 + +#include "G4VPhysicalVolume.hh" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4MIRDOvary +{ +public: + + G4MIRDOvary(); + ~G4MIRDOvary(); + G4VPhysicalVolume* ConstructOvary(G4VPhysicalVolume*, G4String, G4bool); + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4MIRDPancreas.hh b/examples/advanced/human_phantom/include/G4MIRDPancreas.hh new file mode 100644 index 0000000000..48340e5a4c --- /dev/null +++ b/examples/advanced/human_phantom/include/G4MIRDPancreas.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4MIRDPancreas_h +#define G4MIRDPancreas_h 1 + +#include "G4VPhysicalVolume.hh" + +//#include "Saxana/SAXProcessor.h" +//#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4MIRDPancreas +{ +public: + + G4MIRDPancreas(); + ~G4MIRDPancreas(); + G4VPhysicalVolume* ConstructPancreas(G4VPhysicalVolume*, G4String, G4bool); + +private: + // SAXProcessor sxp; + // ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4MIRDPelvis.hh b/examples/advanced/human_phantom/include/G4MIRDPelvis.hh new file mode 100644 index 0000000000..7107cf5c4c --- /dev/null +++ b/examples/advanced/human_phantom/include/G4MIRDPelvis.hh @@ -0,0 +1,50 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4MIRDPelvis_h +#define G4MIRDPelvis_h 1 + +#include "G4VPhysicalVolume.hh" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4MIRDPelvis +{ +public: + + G4MIRDPelvis(); + ~G4MIRDPelvis(); + G4VPhysicalVolume* ConstructPelvis(G4VPhysicalVolume*, G4String, G4bool); +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4MIRDRibCage.hh b/examples/advanced/human_phantom/include/G4MIRDRibCage.hh new file mode 100644 index 0000000000..9231fbdcce --- /dev/null +++ b/examples/advanced/human_phantom/include/G4MIRDRibCage.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4MIRDRibCage_h +#define G4MIRDRibCage_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4MIRDRibCage +{ +public: + + G4MIRDRibCage(); + ~G4MIRDRibCage(); + G4VPhysicalVolume* ConstructRibCage(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4MIRDSkull.hh b/examples/advanced/human_phantom/include/G4MIRDSkull.hh new file mode 100644 index 0000000000..6cffb39b9e --- /dev/null +++ b/examples/advanced/human_phantom/include/G4MIRDSkull.hh @@ -0,0 +1,53 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4MIRDSkull_h +#define G4MIRDSkull_h 1 + +#include "G4VPhysicalVolume.hh" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4MIRDSkull +{ +public: + + G4MIRDSkull(); + ~G4MIRDSkull(); + G4VPhysicalVolume* ConstructSkull(G4VPhysicalVolume*, G4String, G4bool); + +private: + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4MIRDSpleen.hh b/examples/advanced/human_phantom/include/G4MIRDSpleen.hh new file mode 100644 index 0000000000..d73e047d1c --- /dev/null +++ b/examples/advanced/human_phantom/include/G4MIRDSpleen.hh @@ -0,0 +1,52 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4MIRDSpleen_h +#define G4MIRDSpleen_h 1 + +#include "G4VPhysicalVolume.hh" + + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4MIRDSpleen +{ +public: + + G4MIRDSpleen(); + ~G4MIRDSpleen(); + G4VPhysicalVolume* ConstructSpleen(G4VPhysicalVolume*, G4String, G4bool); + +}; +#endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04DummySD.hh b/examples/advanced/human_phantom/include/G4MIRDStomach.hh similarity index 73% rename from examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04DummySD.hh rename to examples/advanced/human_phantom/include/G4MIRDStomach.hh index b23da2c4c0..a4e79c4008 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04DummySD.hh +++ b/examples/advanced/human_phantom/include/G4MIRDStomach.hh @@ -23,31 +23,28 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. // -// Dummy sensitive used only to flag sensitivity -// in cells of RO geometry. -// +#ifndef G4MIRDStomach_h +#define G4MIRDStomach_h 1 -#ifndef ExN04DummySD_h -#define ExN04DummySD_h 1 +#include "G4VPhysicalVolume.hh" -#include "G4VSensitiveDetector.hh" -class G4Step; +class G4VPhysicalVolume; +class G4LogicalVolume; -class ExN04DummySD : public G4VSensitiveDetector +class G4MIRDStomach { public: - ExN04DummySD(); - ~ExN04DummySD() {} - - void Initialize(G4HCofThisEvent*) {} - G4bool ProcessHits(G4Step*,G4TouchableHistory*) {return false;} - void EndOfEvent(G4HCofThisEvent*) {} - void clear() {} - void DrawAll() {} - void PrintAll() {} + + G4MIRDStomach(); + ~G4MIRDStomach(); + G4VPhysicalVolume* ConstructStomach(G4VPhysicalVolume*, G4String, G4bool); }; -ExN04DummySD::ExN04DummySD() - : G4VSensitiveDetector("dummySD") -{} #endif diff --git a/examples/advanced/human_phantom/include/G4MIRDTestes.hh b/examples/advanced/human_phantom/include/G4MIRDTestes.hh new file mode 100644 index 0000000000..35a2913f71 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4MIRDTestes.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4MIRDTestes_h +#define G4MIRDTestes_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4MIRDTestes +{ +public: + + G4MIRDTestes(); + ~G4MIRDTestes(); + G4VPhysicalVolume* ConstructTestes(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4MIRDThyroid.hh b/examples/advanced/human_phantom/include/G4MIRDThyroid.hh new file mode 100644 index 0000000000..8845f39d7a --- /dev/null +++ b/examples/advanced/human_phantom/include/G4MIRDThyroid.hh @@ -0,0 +1,51 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4MIRDThyroid_h +#define G4MIRDThyroid_h 1 + +#include "G4VPhysicalVolume.hh" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4MIRDThyroid +{ +public: + + G4MIRDThyroid(); + ~G4MIRDThyroid(); + G4VPhysicalVolume* ConstructThyroid(G4VPhysicalVolume*, G4String, G4bool); + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4MIRDTrunk.hh b/examples/advanced/human_phantom/include/G4MIRDTrunk.hh new file mode 100644 index 0000000000..936ac1b48b --- /dev/null +++ b/examples/advanced/human_phantom/include/G4MIRDTrunk.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4MIRDTrunk_h +#define G4MIRDTrunk_h 1 + +#include "G4VPhysicalVolume.hh" + +//#include "Saxana/SAXProcessor.h" +//#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4MIRDTrunk +{ +public: + + G4MIRDTrunk(); + ~G4MIRDTrunk(); + G4VPhysicalVolume* ConstructTrunk(G4VPhysicalVolume*, G4String, G4bool); + +private: + // SAXProcessor sxp; + // ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4MIRDUpperLargeIntestine.hh b/examples/advanced/human_phantom/include/G4MIRDUpperLargeIntestine.hh new file mode 100644 index 0000000000..25629d6fa2 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4MIRDUpperLargeIntestine.hh @@ -0,0 +1,50 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4MIRDUpperLargeIntestine_h +#define G4MIRDUpperLargeIntestine_h 1 + +#include "G4VPhysicalVolume.hh" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4MIRDUpperLargeIntestine +{ +public: + + G4MIRDUpperLargeIntestine(); + ~G4MIRDUpperLargeIntestine(); + G4VPhysicalVolume* ConstructUpperLargeIntestine(G4VPhysicalVolume*, G4String, G4bool); +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4MIRDUpperSpine.hh b/examples/advanced/human_phantom/include/G4MIRDUpperSpine.hh new file mode 100644 index 0000000000..ee13cdc0cc --- /dev/null +++ b/examples/advanced/human_phantom/include/G4MIRDUpperSpine.hh @@ -0,0 +1,53 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4MIRDUpperSpine_h +#define G4MIRDUpperSpine_h 1 + +#include "G4VPhysicalVolume.hh" + + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4MIRDUpperSpine +{ +public: + + G4MIRDUpperSpine(); + ~G4MIRDUpperSpine(); + G4VPhysicalVolume* ConstructUpperSpine(G4VPhysicalVolume*, G4String, G4bool); + +private: +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4MIRDUrinaryBladder.hh b/examples/advanced/human_phantom/include/G4MIRDUrinaryBladder.hh new file mode 100644 index 0000000000..f5efec80c5 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4MIRDUrinaryBladder.hh @@ -0,0 +1,51 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// + +#ifndef G4MIRDUrinaryBladder_h +#define G4MIRDUrinaryBladder_h 1 + +#include "G4VPhysicalVolume.hh" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4MIRDUrinaryBladder +{ +public: + + G4MIRDUrinaryBladder(); + ~G4MIRDUrinaryBladder(); + G4VPhysicalVolume* ConstructUrinaryBladder(G4VPhysicalVolume*, G4String, G4bool); +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4MIRDUterus.hh b/examples/advanced/human_phantom/include/G4MIRDUterus.hh new file mode 100644 index 0000000000..ab18308e42 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4MIRDUterus.hh @@ -0,0 +1,50 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4MIRDUterus_h +#define G4MIRDUterus_h 1 + +#include "G4VPhysicalVolume.hh" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4MIRDUterus +{ +public: + + G4MIRDUterus(); + ~G4MIRDUterus(); + G4VPhysicalVolume* ConstructUterus(G4VPhysicalVolume*, G4String, G4bool); +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4MaleBuilder.hh b/examples/advanced/human_phantom/include/G4MaleBuilder.hh new file mode 100644 index 0000000000..f40074ae2a --- /dev/null +++ b/examples/advanced/human_phantom/include/G4MaleBuilder.hh @@ -0,0 +1,54 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4MaleBuilder_h +#define G4MaleBuilder_h 1 + +//#include "G4VPhysicalVolume.hh" + +#include "G4PhantomBuilder.hh" + +class G4PhantomBuilder; +class G4MaleBuilder: public G4PhantomBuilder +{ +public: + G4MaleBuilder(); + ~G4MaleBuilder(); + void BuildBreast(G4bool){;}; + void BuildParameterisedBreast(G4bool){;}; + void BuildOvary(G4bool){;}; + void BuildUterus(G4bool){;}; + void BuildMaleGenitalia(G4bool); + void BuildTestes(G4bool); +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4ORNLAdrenal.hh b/examples/advanced/human_phantom/include/G4ORNLAdrenal.hh new file mode 100644 index 0000000000..3ceba67456 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4ORNLAdrenal.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4ORNLAdrenal_h +#define G4ORNLAdrenal_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4ORNLAdrenal +{ +public: + + G4ORNLAdrenal(); + ~G4ORNLAdrenal(); + G4VPhysicalVolume* ConstructAdrenal(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4ORNLArmBone.hh b/examples/advanced/human_phantom/include/G4ORNLArmBone.hh new file mode 100644 index 0000000000..8627ec17d0 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4ORNLArmBone.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4ORNLArmBone_h +#define G4ORNLArmBone_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4ORNLArmBone +{ +public: + + G4ORNLArmBone(); + ~G4ORNLArmBone(); + G4VPhysicalVolume* ConstructArmBone(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4ORNLBodyFactory.hh b/examples/advanced/human_phantom/include/G4ORNLBodyFactory.hh new file mode 100644 index 0000000000..2992cc2160 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4ORNLBodyFactory.hh @@ -0,0 +1,96 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4ORNLBodyFactory_h +#define G4ORNLBodyFactory_h 1 + +#include "G4VBodyFactory.hh" + +class G4VBodyFactory; +class G4ORNLBodyFactory: public G4VBodyFactory +{ +public: + G4ORNLBodyFactory(); + ~G4ORNLBodyFactory(); + + G4VPhysicalVolume* CreateHead(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateTrunk(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateLegs(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateNeck(G4VPhysicalVolume*,G4String,G4bool); + + G4VPhysicalVolume* CreateUpperSpine(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateMiddleLowerSpine(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateLegBone(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateArmBone(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateSkull(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateRibCage(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreatePelvis(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateScapulae(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateClavicles(G4VPhysicalVolume*,G4String,G4bool); + + G4VPhysicalVolume* CreateBreast(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateParameterisedBreast(G4VPhysicalVolume*,G4String,G4bool) { G4cout<< "Parameterised breast is not available for ORNL model"<< G4endl; + return 0;}; + + + G4VPhysicalVolume* CreateUterus(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateOvary(G4VPhysicalVolume*,G4String,G4bool); + + G4VPhysicalVolume* CreateTestes(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateMaleGenitalia(G4VPhysicalVolume*,G4String,G4bool); + + G4VPhysicalVolume* CreateBrain(G4VPhysicalVolume*,G4String,G4bool); + + G4VPhysicalVolume* CreateHeart(G4VPhysicalVolume*,G4String,G4bool); + + G4VPhysicalVolume* CreateLung(G4VPhysicalVolume*,G4String,G4bool); + + G4VPhysicalVolume* CreateStomach(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateUpperLargeIntestine(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateLowerLargeIntestine(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateEsophagus(G4VPhysicalVolume*,G4String,G4bool); + + G4VPhysicalVolume* CreateKidney(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateAdrenal(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateLiver(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreatePancreas(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateSpleen(G4VPhysicalVolume*,G4String,G4bool); + G4VPhysicalVolume* CreateUrinaryBladder(G4VPhysicalVolume*,G4String,G4bool); + + G4VPhysicalVolume* CreateThyroid(G4VPhysicalVolume*,G4String,G4bool); + + +private: + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4ORNLBrain.hh b/examples/advanced/human_phantom/include/G4ORNLBrain.hh new file mode 100644 index 0000000000..872085f05e --- /dev/null +++ b/examples/advanced/human_phantom/include/G4ORNLBrain.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4ORNLBrain_h +#define G4ORNLBrain_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4ORNLBrain +{ +public: + + G4ORNLBrain(); + ~G4ORNLBrain(); + G4VPhysicalVolume* ConstructBrain(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4ORNLBreast.hh b/examples/advanced/human_phantom/include/G4ORNLBreast.hh new file mode 100644 index 0000000000..7a5b2c24c0 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4ORNLBreast.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4ORNLBreast_h +#define G4ORNLBreast_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4ORNLBreast +{ +public: + + G4ORNLBreast(); + ~G4ORNLBreast(); + G4VPhysicalVolume* ConstructBreast(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4ORNLEsophagus.hh b/examples/advanced/human_phantom/include/G4ORNLEsophagus.hh new file mode 100644 index 0000000000..8b43901ab1 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4ORNLEsophagus.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4ORNLEsophagus_h +#define G4ORNLEsophagus_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4ORNLEsophagus +{ +public: + + G4ORNLEsophagus(); + ~G4ORNLEsophagus(); + G4VPhysicalVolume* ConstructEsophagus(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4ORNLHead.hh b/examples/advanced/human_phantom/include/G4ORNLHead.hh new file mode 100644 index 0000000000..f077387971 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4ORNLHead.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4ORNLHead_h +#define G4ORNLHead_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4ORNLHead +{ +public: + + G4ORNLHead(); + ~G4ORNLHead(); + G4VPhysicalVolume* ConstructHead(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4ORNLHeart.hh b/examples/advanced/human_phantom/include/G4ORNLHeart.hh new file mode 100644 index 0000000000..688a57fbe8 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4ORNLHeart.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4ORNLHeart_h +#define G4ORNLHeart_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4ORNLHeart +{ +public: + + G4ORNLHeart(); + ~G4ORNLHeart(); + G4VPhysicalVolume* ConstructHeart(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4ORNLKidney.hh b/examples/advanced/human_phantom/include/G4ORNLKidney.hh new file mode 100644 index 0000000000..e4a7ec2545 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4ORNLKidney.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4ORNLKidney_h +#define G4ORNLKidney_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4ORNLKidney +{ +public: + + G4ORNLKidney(); + ~G4ORNLKidney(); + G4VPhysicalVolume* ConstructKidney(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4ORNLLegBone.hh b/examples/advanced/human_phantom/include/G4ORNLLegBone.hh new file mode 100644 index 0000000000..b87e9e1fdc --- /dev/null +++ b/examples/advanced/human_phantom/include/G4ORNLLegBone.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4ORNLLegBone_h +#define G4ORNLLegBone_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4ORNLLegBone +{ +public: + + G4ORNLLegBone(); + ~G4ORNLLegBone(); + G4VPhysicalVolume* ConstructLegBone(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4ORNLLegs.hh b/examples/advanced/human_phantom/include/G4ORNLLegs.hh new file mode 100644 index 0000000000..0e6bde94db --- /dev/null +++ b/examples/advanced/human_phantom/include/G4ORNLLegs.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4ORNLLegs_h +#define G4ORNLLegs_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4ORNLLegs +{ +public: + + G4ORNLLegs(); + ~G4ORNLLegs(); + G4VPhysicalVolume* ConstructLegs(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4ORNLLiver.hh b/examples/advanced/human_phantom/include/G4ORNLLiver.hh new file mode 100644 index 0000000000..a7d6e5bf5d --- /dev/null +++ b/examples/advanced/human_phantom/include/G4ORNLLiver.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4ORNLLiver_h +#define G4ORNLLiver_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4ORNLLiver +{ +public: + + G4ORNLLiver(); + ~G4ORNLLiver(); + G4VPhysicalVolume* ConstructLiver(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4ORNLLowerLargeIntestine.hh b/examples/advanced/human_phantom/include/G4ORNLLowerLargeIntestine.hh new file mode 100644 index 0000000000..8cc480e23c --- /dev/null +++ b/examples/advanced/human_phantom/include/G4ORNLLowerLargeIntestine.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4ORNLLowerLargeIntestine_h +#define G4ORNLLowerLargeIntestine_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4ORNLLowerLargeIntestine +{ +public: + + G4ORNLLowerLargeIntestine(); + ~G4ORNLLowerLargeIntestine(); + G4VPhysicalVolume* ConstructLowerLargeIntestine(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4ORNLLung.hh b/examples/advanced/human_phantom/include/G4ORNLLung.hh new file mode 100644 index 0000000000..0229075703 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4ORNLLung.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4ORNLLung_h +#define G4ORNLLung_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4ORNLLung +{ +public: + + G4ORNLLung(); + ~G4ORNLLung(); + G4VPhysicalVolume* ConstructLung(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; + +}; +#endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04TrackerParametrisation.cc b/examples/advanced/human_phantom/include/G4ORNLMiddleLowerSpine.hh similarity index 67% rename from examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04TrackerParametrisation.cc rename to examples/advanced/human_phantom/include/G4ORNLMiddleLowerSpine.hh index cecc49d418..41ae2af20a 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04TrackerParametrisation.cc +++ b/examples/advanced/human_phantom/include/G4ORNLMiddleLowerSpine.hh @@ -23,36 +23,36 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // - -#include "ExN04TrackerParametrisation.hh" +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4ORNLMiddleLowerSpine_h +#define G4ORNLMiddleLowerSpine_h 1 #include "G4VPhysicalVolume.hh" -#include "G4ThreeVector.hh" -#include "G4Tubs.hh" -ExN04TrackerParametrisation::ExN04TrackerParametrisation() +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4ORNLMiddleLowerSpine { +public: -#include "ExN04DetectorParameterDef.icc" + G4ORNLMiddleLowerSpine(); + ~G4ORNLMiddleLowerSpine(); + G4VPhysicalVolume* ConstructMiddleLowerSpine(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; -} - -ExN04TrackerParametrisation::~ExN04TrackerParametrisation() -{;} - -void ExN04TrackerParametrisation::ComputeTransformation -(const G4int, G4VPhysicalVolume* physVol) const -{ - G4ThreeVector origin; - physVol->SetTranslation(origin); -} - -void ExN04TrackerParametrisation::ComputeDimensions -(G4Tubs& trackerLayer, const G4int copyNo, const G4VPhysicalVolume*) const -{ - trackerLayer.SetInnerRadius(tracker_radius[copyNo]); - trackerLayer.SetOuterRadius(tracker_radius[copyNo]+tracker_thick); - trackerLayer.SetZHalfLength(tracker_length[copyNo]); - trackerLayer.SetStartPhiAngle(trkTubs_sphi); - trackerLayer.SetDeltaPhiAngle(trkTubs_dphi); -} +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4ORNLOvary.hh b/examples/advanced/human_phantom/include/G4ORNLOvary.hh new file mode 100644 index 0000000000..a7b7543e76 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4ORNLOvary.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4ORNLOvary_h +#define G4ORNLOvary_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4ORNLOvary +{ +public: + + G4ORNLOvary(); + ~G4ORNLOvary(); + G4VPhysicalVolume* ConstructOvary(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4ORNLPancreas.hh b/examples/advanced/human_phantom/include/G4ORNLPancreas.hh new file mode 100644 index 0000000000..116cd2f2f1 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4ORNLPancreas.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4ORNLPancreas_h +#define G4ORNLPancreas_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4ORNLPancreas +{ +public: + + G4ORNLPancreas(); + ~G4ORNLPancreas(); + G4VPhysicalVolume* ConstructPancreas(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4ORNLPelvis.hh b/examples/advanced/human_phantom/include/G4ORNLPelvis.hh new file mode 100644 index 0000000000..32661f9aae --- /dev/null +++ b/examples/advanced/human_phantom/include/G4ORNLPelvis.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4ORNLPelvis_h +#define G4ORNLPelvis_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4ORNLPelvis +{ +public: + + G4ORNLPelvis(); + ~G4ORNLPelvis(); + G4VPhysicalVolume* ConstructPelvis(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4ORNLRibCage.hh b/examples/advanced/human_phantom/include/G4ORNLRibCage.hh new file mode 100644 index 0000000000..31f75bb1c9 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4ORNLRibCage.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4ORNLRibCage_h +#define G4ORNLRibCage_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4ORNLRibCage +{ +public: + + G4ORNLRibCage(); + ~G4ORNLRibCage(); + G4VPhysicalVolume* ConstructRibCage(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4ORNLSkull.hh b/examples/advanced/human_phantom/include/G4ORNLSkull.hh new file mode 100644 index 0000000000..f3d94c24f1 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4ORNLSkull.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4ORNLSkull_h +#define G4ORNLSkull_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4ORNLSkull +{ +public: + + G4ORNLSkull(); + ~G4ORNLSkull(); + G4VPhysicalVolume* ConstructSkull(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4ORNLSpleen.hh b/examples/advanced/human_phantom/include/G4ORNLSpleen.hh new file mode 100644 index 0000000000..27a191e275 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4ORNLSpleen.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4ORNLSpleen_h +#define G4ORNLSpleen_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4ORNLSpleen +{ +public: + + G4ORNLSpleen(); + ~G4ORNLSpleen(); + G4VPhysicalVolume* ConstructSpleen(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4ORNLStomach.hh b/examples/advanced/human_phantom/include/G4ORNLStomach.hh new file mode 100644 index 0000000000..47fe286c91 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4ORNLStomach.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4ORNLStomach_h +#define G4ORNLStomach_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4ORNLStomach +{ +public: + + G4ORNLStomach(); + ~G4ORNLStomach(); + G4VPhysicalVolume* ConstructStomach(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4ORNLTestes.hh b/examples/advanced/human_phantom/include/G4ORNLTestes.hh new file mode 100644 index 0000000000..042581730a --- /dev/null +++ b/examples/advanced/human_phantom/include/G4ORNLTestes.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4ORNLTestes_h +#define G4ORNLTestes_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4ORNLTestes +{ +public: + + G4ORNLTestes(); + ~G4ORNLTestes(); + G4VPhysicalVolume* ConstructTestes(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4ORNLThyroid.hh b/examples/advanced/human_phantom/include/G4ORNLThyroid.hh new file mode 100644 index 0000000000..f6ed616143 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4ORNLThyroid.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4ORNLThyroid_h +#define G4ORNLThyroid_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4ORNLThyroid +{ +public: + + G4ORNLThyroid(); + ~G4ORNLThyroid(); + G4VPhysicalVolume* ConstructThyroid(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4ORNLTrunk.hh b/examples/advanced/human_phantom/include/G4ORNLTrunk.hh new file mode 100644 index 0000000000..9e8aed2c1b --- /dev/null +++ b/examples/advanced/human_phantom/include/G4ORNLTrunk.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4ORNLTrunk_h +#define G4ORNLTrunk_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4ORNLTrunk +{ +public: + + G4ORNLTrunk(); + ~G4ORNLTrunk(); + G4VPhysicalVolume* ConstructTrunk(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4ORNLUpperLargeIntestine.hh b/examples/advanced/human_phantom/include/G4ORNLUpperLargeIntestine.hh new file mode 100644 index 0000000000..46b89ea01f --- /dev/null +++ b/examples/advanced/human_phantom/include/G4ORNLUpperLargeIntestine.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4ORNLUpperLargeIntestine_h +#define G4ORNLUpperLargeIntestine_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4ORNLUpperLargeIntestine +{ +public: + + G4ORNLUpperLargeIntestine(); + ~G4ORNLUpperLargeIntestine(); + G4VPhysicalVolume* ConstructUpperLargeIntestine(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4ORNLUpperSpine.hh b/examples/advanced/human_phantom/include/G4ORNLUpperSpine.hh new file mode 100644 index 0000000000..38c6de7acf --- /dev/null +++ b/examples/advanced/human_phantom/include/G4ORNLUpperSpine.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4ORNLUpperSpine_h +#define G4ORNLUpperSpine_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4ORNLUpperSpine +{ +public: + + G4ORNLUpperSpine(); + ~G4ORNLUpperSpine(); + G4VPhysicalVolume* ConstructUpperSpine(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4ORNLUrinaryBladder.hh b/examples/advanced/human_phantom/include/G4ORNLUrinaryBladder.hh new file mode 100644 index 0000000000..6d64bd1a84 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4ORNLUrinaryBladder.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4ORNLUrinaryBladder_h +#define G4ORNLUrinaryBladder_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4ORNLUrinaryBladder +{ +public: + + G4ORNLUrinaryBladder(); + ~G4ORNLUrinaryBladder(); + G4VPhysicalVolume* ConstructUrinaryBladder(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4ORNLUterus.hh b/examples/advanced/human_phantom/include/G4ORNLUterus.hh new file mode 100644 index 0000000000..505ad6389b --- /dev/null +++ b/examples/advanced/human_phantom/include/G4ORNLUterus.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4ORNLUterus_h +#define G4ORNLUterus_h 1 + +#include "G4VPhysicalVolume.hh" + +#include "Saxana/SAXProcessor.h" +#include "Saxana/ProcessingConfigurator.h" + +class G4VPhysicalVolume; +class G4LogicalVolume; + +class G4ORNLUterus +{ +public: + + G4ORNLUterus(); + ~G4ORNLUterus(); + G4VPhysicalVolume* ConstructUterus(G4VPhysicalVolume*, G4String, G4bool); + +private: + SAXProcessor sxp; + ProcessingConfigurator config; + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4ParameterisedBreast.hh b/examples/advanced/human_phantom/include/G4ParameterisedBreast.hh new file mode 100644 index 0000000000..c5686ed151 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4ParameterisedBreast.hh @@ -0,0 +1,53 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4ParameterisedBreast_h +#define G4ParameterisedBreast_h 1 + +#include "G4VPhysicalVolume.hh" + +class G4VPhysicalVolume; +class G4LogicalVolume; +class G4HumanPhantomSDBreast; + +class G4ParameterisedBreast +{ +public: + G4ParameterisedBreast(); + ~G4ParameterisedBreast(); + G4VPhysicalVolume* ConstructBreast(G4VPhysicalVolume*, G4String, G4bool); + +private: + G4HumanPhantomSDBreast* breastSD; +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4PhantomBuilder.hh b/examples/advanced/human_phantom/include/G4PhantomBuilder.hh new file mode 100644 index 0000000000..8efa29d9d9 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4PhantomBuilder.hh @@ -0,0 +1,114 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// + +#ifndef G4PhantomBuilder_h +#define G4PhantomBuilder_h 1 + +#include "G4VPhysicalVolume.hh" +#include "G4VPhantomBuilder.hh" +#include "globals.hh" + +class G4VPhantomBuilder; +class G4VPhysicalVolume; +class G4VBodyFactory; +class G4PhantomBuilder: public G4VPhantomBuilder +{ +public: + G4PhantomBuilder(); + ~G4PhantomBuilder(); + + void BuildWorld(); + + void BuildHead(G4bool); + void BuildTrunk(G4bool); + void BuildLegs(G4bool); + void BuildNeck(G4bool); + + void BuildUpperSpine(G4bool); + void BuildMiddleLowerSpine(G4bool); + void BuildLegBone(G4bool); + void BuildArmBone(G4bool); + void BuildSkull(G4bool); +// void BuildRibCage(G4bool); + void BuildPelvis(G4bool); +// void BuildScapulae(G4bool); +// void BuildClavicles(G4bool); + +virtual void BuildBreast(G4bool)= 0; +virtual void BuildParameterisedBreast(G4bool) = 0; + +virtual void BuildUterus(G4bool)=0; +virtual void BuildOvary(G4bool)=0; + +virtual void BuildTestes(G4bool) =0; +virtual void BuildMaleGenitalia(G4bool)=0; + + void BuildBrain(G4bool); + + void BuildHeart(G4bool); + + void BuildLung(G4bool); + + void BuildStomach(G4bool); + void BuildUpperLargeIntestine(G4bool); + void BuildLowerLargeIntestine(G4bool); + // void BuildEsophagus(G4bool); + + void BuildKidney(G4bool); + // void BuildAdrenal(G4bool); + void BuildLiver(G4bool); + void BuildPancreas(G4bool); + void BuildSpleen(G4bool); + void BuildUrinaryBladder(G4bool); + + void BuildThyroid(G4bool); + + void SetSex(G4String); + void SetModel(G4String); + + G4VPhysicalVolume* GetPhantom(); + +protected: + G4String sex; + G4String model; + G4bool sensitivity; + G4VPhysicalVolume* motherVolume; + G4VPhysicalVolume* headVolume; + G4VPhysicalVolume* trunkVolume; + G4VPhysicalVolume* legsVolume; + G4VPhysicalVolume* neckVolume; + G4VPhysicalVolume* maleGenitaliaVolume; + G4VBodyFactory* body; +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4VBodyFactory.hh b/examples/advanced/human_phantom/include/G4VBodyFactory.hh new file mode 100644 index 0000000000..6971b57f9e --- /dev/null +++ b/examples/advanced/human_phantom/include/G4VBodyFactory.hh @@ -0,0 +1,92 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifndef G4VBodyFactory_h +#define G4VBodyFactory_h 1 + +#include "G4VPhysicalVolume.hh" +class G4VPhysicalVolume; +class G4VBodyFactory +{ +public: + + G4VBodyFactory(); + virtual ~G4VBodyFactory(); + + virtual G4VPhysicalVolume* CreateHead(G4VPhysicalVolume*,G4String,G4bool) = 0; + virtual G4VPhysicalVolume* CreateTrunk(G4VPhysicalVolume*,G4String,G4bool) = 0; + virtual G4VPhysicalVolume* CreateLegs(G4VPhysicalVolume*,G4String,G4bool) = 0; + virtual G4VPhysicalVolume* CreateNeck(G4VPhysicalVolume*,G4String,G4bool) = 0; + + virtual G4VPhysicalVolume* CreateUpperSpine(G4VPhysicalVolume*,G4String,G4bool) = 0; + virtual G4VPhysicalVolume* CreateMiddleLowerSpine(G4VPhysicalVolume*,G4String,G4bool) = 0; + virtual G4VPhysicalVolume* CreateLegBone(G4VPhysicalVolume*,G4String,G4bool) = 0; + virtual G4VPhysicalVolume* CreateArmBone(G4VPhysicalVolume*,G4String,G4bool) = 0; + virtual G4VPhysicalVolume* CreateSkull(G4VPhysicalVolume*,G4String,G4bool) = 0; + virtual G4VPhysicalVolume* CreateRibCage(G4VPhysicalVolume*,G4String,G4bool) = 0; + virtual G4VPhysicalVolume* CreatePelvis(G4VPhysicalVolume*,G4String,G4bool) = 0; + virtual G4VPhysicalVolume* CreateScapulae(G4VPhysicalVolume*,G4String,G4bool) = 0; + virtual G4VPhysicalVolume* CreateClavicles(G4VPhysicalVolume*,G4String,G4bool) = 0; + + virtual G4VPhysicalVolume* CreateBreast(G4VPhysicalVolume*,G4String,G4bool) = 0; + virtual G4VPhysicalVolume* CreateParameterisedBreast(G4VPhysicalVolume*,G4String,G4bool) = 0; + + virtual G4VPhysicalVolume* CreateUterus(G4VPhysicalVolume*,G4String,G4bool) = 0; + virtual G4VPhysicalVolume* CreateOvary(G4VPhysicalVolume*,G4String,G4bool) = 0; + + virtual G4VPhysicalVolume* CreateTestes(G4VPhysicalVolume*,G4String,G4bool) = 0; + virtual G4VPhysicalVolume* CreateMaleGenitalia(G4VPhysicalVolume*,G4String,G4bool) = 0; + + virtual G4VPhysicalVolume* CreateBrain(G4VPhysicalVolume*,G4String,G4bool) = 0; + + virtual G4VPhysicalVolume* CreateHeart(G4VPhysicalVolume*,G4String,G4bool) = 0; + + virtual G4VPhysicalVolume* CreateLung(G4VPhysicalVolume*,G4String,G4bool) = 0; + + virtual G4VPhysicalVolume* CreateStomach(G4VPhysicalVolume*,G4String,G4bool) = 0; + virtual G4VPhysicalVolume* CreateUpperLargeIntestine(G4VPhysicalVolume*,G4String,G4bool) = 0; + virtual G4VPhysicalVolume* CreateLowerLargeIntestine(G4VPhysicalVolume*,G4String,G4bool) = 0; + virtual G4VPhysicalVolume* CreateEsophagus(G4VPhysicalVolume*,G4String,G4bool) = 0; + + virtual G4VPhysicalVolume* CreateKidney(G4VPhysicalVolume*,G4String,G4bool) = 0; + virtual G4VPhysicalVolume* CreateAdrenal(G4VPhysicalVolume*,G4String,G4bool) = 0; + virtual G4VPhysicalVolume* CreateLiver(G4VPhysicalVolume*,G4String,G4bool) = 0; + virtual G4VPhysicalVolume* CreatePancreas(G4VPhysicalVolume*,G4String,G4bool) = 0; + virtual G4VPhysicalVolume* CreateSpleen(G4VPhysicalVolume*,G4String,G4bool) = 0; + virtual G4VPhysicalVolume* CreateUrinaryBladder(G4VPhysicalVolume*,G4String,G4bool) = 0; + + virtual G4VPhysicalVolume* CreateThyroid(G4VPhysicalVolume*,G4String,G4bool) = 0; + + +}; +#endif diff --git a/examples/advanced/human_phantom/include/G4VPhantomBuilder.hh b/examples/advanced/human_phantom/include/G4VPhantomBuilder.hh new file mode 100644 index 0000000000..389b90eb73 --- /dev/null +++ b/examples/advanced/human_phantom/include/G4VPhantomBuilder.hh @@ -0,0 +1,88 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// + +#ifndef G4VPhantomBuilder_h +#define G4VPhantomBuilder_h 1 + +#include "G4VPhysicalVolume.hh" +class G4VPhysicalVolume; +class G4VPhantomBuilder +{ +public: + + G4VPhantomBuilder(); + virtual ~G4VPhantomBuilder(); + + virtual void BuildWorld() = 0; + + virtual void BuildHead(G4bool) = 0; + virtual void BuildTrunk(G4bool) = 0; + virtual void BuildLegs(G4bool) = 0; + virtual void BuildNeck(G4bool) = 0; + + virtual void BuildUpperSpine(G4bool) = 0; + virtual void BuildMiddleLowerSpine(G4bool) = 0; + virtual void BuildLegBone(G4bool) = 0; + virtual void BuildArmBone(G4bool) = 0; + virtual void BuildSkull(G4bool) = 0; + //virtual void BuildRibCage(G4bool) = 0; + virtual void BuildPelvis(G4bool) = 0; + //virtual void BuildScapulae(G4bool) = 0; + //virtual void BuildClavicles(G4bool) = 0; + + virtual void BuildBrain(G4bool) = 0; + + virtual void BuildHeart(G4bool) = 0; + + virtual void BuildLung(G4bool) = 0; + + virtual void BuildStomach(G4bool) = 0; + virtual void BuildUpperLargeIntestine(G4bool) = 0; + virtual void BuildLowerLargeIntestine(G4bool) = 0; + //virtual void BuildEsophagus(G4bool) = 0; + + virtual void BuildKidney(G4bool) = 0; +// virtual void BuildAdrenal(G4bool) = 0; + virtual void BuildLiver(G4bool) = 0; + virtual void BuildPancreas(G4bool) = 0; + virtual void BuildSpleen(G4bool) = 0; + virtual void BuildUrinaryBladder(G4bool) = 0; + + virtual void BuildThyroid(G4bool) = 0; + + virtual void SetSex(G4String) = 0; + virtual void SetModel(G4String) = 0; + +}; +#endif diff --git a/examples/advanced/human_phantom/noVis.mac b/examples/advanced/human_phantom/noVis.mac new file mode 100644 index 0000000000..a8e02480a9 --- /dev/null +++ b/examples/advanced/human_phantom/noVis.mac @@ -0,0 +1,6 @@ +# +# Macro file for the initialization phase of "phantom.cc" +# when runing in interactive mode +# +# Sets some default verbose +# diff --git a/examples/advanced/human_phantom/openGLVis.mac b/examples/advanced/human_phantom/openGLVis.mac new file mode 100644 index 0000000000..5962ece5d7 --- /dev/null +++ b/examples/advanced/human_phantom/openGLVis.mac @@ -0,0 +1,15 @@ +# +# Macro file for the visualization +# when runing in interactive mode +# +# create empty scene +# +/vis/scene/create +/vis/open OGLIX +# +# Create a scene handler for a specific graphics system +# (Edit the next line(s) to choose another graphic system) +# +#/vis/viewer/set/viewpointThetaPhi 90 180 deg +#/vis/viewer/zoom 1.5 +# \ No newline at end of file diff --git a/examples/advanced/human_phantom/phantom.cc b/examples/advanced/human_phantom/phantom.cc new file mode 100644 index 0000000000..4f1be156a7 --- /dev/null +++ b/examples/advanced/human_phantom/phantom.cc @@ -0,0 +1,133 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// + +#include + +#include "globals.hh" + +#include "G4RunManager.hh" +#include "G4UImanager.hh" +#include "G4UIsession.hh" +#include "G4UIterminal.hh" +#include "G4UItcsh.hh" +#include "G4TransportationManager.hh" + +#ifdef G4VIS_USE +#include "G4VisExecutive.hh" +#endif + +#include "G4HumanPhantomConstruction.hh" +#include "G4HumanPhantomPhysicsList.hh" +#include "G4HumanPhantomPrimaryGeneratorAction.hh" +#include "G4HumanPhantomSteppingAction.hh" +#include "G4HumanPhantomEventAction.hh" +#include "G4HumanPhantomRunAction.hh" +#include "G4HumanPhantomEnergyDeposit.hh" +#ifdef G4ANALYSIS_USE +#include "G4HumanPhantomAnalysisManager.hh" +#endif +int main(int argc,char** argv) +{ + G4cout << "Starting run " << G4endl; + + G4RunManager* runManager = new G4RunManager; + + G4HumanPhantomEnergyDeposit* energyTotal = new G4HumanPhantomEnergyDeposit(); + + // Set mandatory initialization classes + G4HumanPhantomConstruction* userPhantom = new G4HumanPhantomConstruction(energyTotal); + runManager->SetUserInitialization(userPhantom); + + runManager->SetUserInitialization(new G4HumanPhantomPhysicsList); + + runManager->SetUserAction(new G4HumanPhantomPrimaryGeneratorAction); + + G4UIsession* session=0; + + if (argc==1) + // Define UI session for interactive mode. + { + // G4UIterminal is a (dumb) terminal +#ifdef G4UI_USE_TCSH + session = new G4UIterminal(new G4UItcsh); +#else + session = new G4UIterminal(); +#endif + } + +#ifdef G4VIS_USE + G4VisManager* visManager = new G4VisExecutive; + visManager->Initialize(); +#endif + + runManager->SetUserAction(new G4HumanPhantomRunAction); + + + + G4HumanPhantomEventAction* eventAction = new G4HumanPhantomEventAction(); + runManager->SetUserAction(eventAction); + + runManager->SetUserAction(new G4HumanPhantomSteppingAction()); + + G4UImanager* UI = G4UImanager::GetUIpointer(); + + if (session) // Define UI session for interactive mode. + { + G4cout << " UI session starts ..." << G4endl; + UI -> ApplyCommand("/control/execute adultFemale.mac"); + session -> SessionStart(); + delete session; + } + else // Batch mode + { + G4String command = "/control/execute "; + G4String fileName = argv[1]; + UI -> ApplyCommand(command+fileName); + } + + energyTotal->TotalEnergyDeposit(); + +#ifdef G4ANALYSIS_USE + G4HumanPhantomAnalysisManager* analysis = G4HumanPhantomAnalysisManager::getInstance(); + if (analysis)analysis->finish(); +#endif + + // job termination +#ifdef G4VIS_USE + delete visManager; +#endif + + delete runManager; + return 0; +} diff --git a/examples/advanced/human_phantom/run.mac b/examples/advanced/human_phantom/run.mac new file mode 100644 index 0000000000..d0f642af30 --- /dev/null +++ b/examples/advanced/human_phantom/run.mac @@ -0,0 +1,47 @@ +# +# Macro file for the initialization phase of "phantom.cc" +# when runing in interactive mode +# +# Sets some default verbose +# +/run/verbose 0 +/event/verbose 0 +/tracking/verbose 0 +#/control/execute openGLVis.mac +# Visualize Phantom with DAWN +#/control/execute dawnVis.mac +# +# Create Scene and SceneHandler +# +# Run Particles +# +# for drawing the tracks +# (if too many tracks cause core dump => storeTrajectory 0) +/tracking/storeTrajectory 1 +/vis/scene/add/trajectories +# (if you prefer refreshing each event, comment out next line) +/vis/scene/endOfEventAction accumulate +# +# Set Particle +#/gun/particle e- +/gun/energy 100. MeV +# +# Set Direction of Beam +# +#/gun/setBeam beamAlongX +#/gun/setBeam beamAlongY +/gun/setBeam beamAlongZ +#/gun/setBeam isotropicFlux +# +/run/beamOn 500 + + + + + + + + + + + diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02GeneralPhysics.cc b/examples/advanced/human_phantom/src/G4FemaleBuilder.cc similarity index 54% rename from examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02GeneralPhysics.cc rename to examples/advanced/human_phantom/src/G4FemaleBuilder.cc index f4c85aacf7..32e48ce9a0 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02GeneralPhysics.cc +++ b/examples/advanced/human_phantom/src/G4FemaleBuilder.cc @@ -23,54 +23,59 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// -// $Id: H02GeneralPhysics.cc,v 1.4 2006/06/29 17:10:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy // +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// -#include "H02GeneralPhysics.hh" +#include"G4FemaleBuilder.hh" -#include "globals.hh" -#include "G4ios.hh" -#include +#include "G4VBodyFactory.hh" +#include "G4MIRDBodyFactory.hh" +#include "G4ORNLBodyFactory.hh" -H02GeneralPhysics::H02GeneralPhysics(const G4String& name) - : G4VPhysicsConstructor(name) -{ +G4FemaleBuilder::G4FemaleBuilder() +{ } -H02GeneralPhysics::~H02GeneralPhysics() +G4FemaleBuilder::~G4FemaleBuilder() { +} + +void G4FemaleBuilder::BuildBreast(G4bool sensitivity) +{ + if (motherVolume == 0) + G4Exception("The world volume is missing !!!!!"); + + body -> CreateBreast(motherVolume,sex,sensitivity); } -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" -// Bosons -#include "G4ChargedGeantino.hh" -#include "G4Geantino.hh" - -void H02GeneralPhysics::ConstructParticle() +void G4FemaleBuilder::BuildParameterisedBreast(G4bool sensitivity) { - // pseudo-particles - G4Geantino::GeantinoDefinition(); - G4ChargedGeantino::ChargedGeantinoDefinition(); +G4cout << "Builder: build parameterised breast!!!!" < CreateParameterisedBreast(motherVolume,sex,sensitivity); } -void H02GeneralPhysics::ConstructProcess() -{ - // Add Decay Process - theParticleIterator->reset(); - while( (*theParticleIterator)() ){ - G4ParticleDefinition* particle = theParticleIterator->value(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - if (fDecayProcess.IsApplicable(*particle)) { - pmanager ->AddProcess(&fDecayProcess); - // set ordering for PostStepDoIt and AtRestDoIt - pmanager ->SetProcessOrdering(&fDecayProcess, idxPostStep); - pmanager ->SetProcessOrdering(&fDecayProcess, idxAtRest); - } - } +void G4FemaleBuilder::BuildOvary(G4bool sensitivity) +{ +if (trunkVolume == 0) + G4Exception("The trunk volume is missing !!!!!"); + + body -> CreateOvary(trunkVolume,sex,sensitivity); } +void G4FemaleBuilder::BuildUterus(G4bool sensitivity ) +{ +if (trunkVolume == 0) + G4Exception("The trunk volume is missing !!!!!"); + body -> CreateUterus(trunkVolume,sex,sensitivity); +} diff --git a/examples/advanced/human_phantom/src/G4HumanPhantomAnalysisManager.cc b/examples/advanced/human_phantom/src/G4HumanPhantomAnalysisManager.cc new file mode 100644 index 0000000000..c969fc0b85 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4HumanPhantomAnalysisManager.cc @@ -0,0 +1,166 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#ifdef G4ANALYSIS_USE +#include +#include +#include "G4HumanPhantomAnalysisManager.hh" +#include "G4ios.hh" +#include +#include "G4RunManager.hh" + +G4HumanPhantomAnalysisManager* G4HumanPhantomAnalysisManager::instance = 0; + +G4HumanPhantomAnalysisManager::G4HumanPhantomAnalysisManager() + : aFact(0), treeFact(0),theTree(0), histogramFactory(0), + histogramParticlePath(0), projectionXY(0), projectionYZ(0), + projectionZX(0), energy(0), innerBreast(0) +{ + aFact = AIDA_createAnalysisFactory(); + treeFact = aFact -> createTreeFactory(); +} + +G4HumanPhantomAnalysisManager::~G4HumanPhantomAnalysisManager() +{ + delete innerBreast; + innerBreast = 0; + + delete energy; + energy = 0; + + delete projectionXY; + projectionXY = 0; + + delete projectionYZ; + projectionYZ = 0; + + delete projectionZX; + projectionZX = 0; + + delete histogramParticlePath; + histogramParticlePath = 0; + + delete histogramFactory; + histogramFactory = 0; + + delete treeFact; + treeFact = 0; + + delete theTree; + theTree = 0; + + delete aFact; + aFact = 0; +} + +G4HumanPhantomAnalysisManager* G4HumanPhantomAnalysisManager::getInstance() +{ + if (instance == 0) instance = new G4HumanPhantomAnalysisManager; + return instance; +} + +void G4HumanPhantomAnalysisManager::book() +{ + G4String fileName = "G4HumanPhantom.hbk"; + theTree = treeFact->create(fileName,"hbook",false, true); + + histogramFactory = aFact -> createHistogramFactory( *theTree ); + + G4double histogramDimension = 20.; + + G4int bins = 3600; + + G4int binsProj = 300; + + histogramParticlePath = histogramFactory->createHistogram1D + ("10","Particle Path Distribution",bins,0.,histogramDimension); + + projectionXY = histogramFactory->createHistogram2D + ("20","Particle Projection XY",binsProj,-histogramDimension,histogramDimension,binsProj,-histogramDimension,histogramDimension); + + projectionYZ = histogramFactory->createHistogram2D + ("30","Particle Projection YZ",binsProj,-histogramDimension,histogramDimension,binsProj,-histogramDimension,histogramDimension); + + projectionZX = histogramFactory->createHistogram2D + ("40","Particle Projection ZX",binsProj,-histogramDimension,histogramDimension,binsProj,-histogramDimension,histogramDimension); + + energy = histogramFactory->createHistogram2D + ("50","Energy Deposit in Body Part", 1000,0.,30.,500,0.,100.); + + innerBreast = histogramFactory->createHistogram2D("100", "Edep(MeV) in innerBreast, x= slice, y= sector", + 11, -0.5, 10.5, + 11, -0.5, 10.5); + + G4cout<<"Booking the histograms"< fill(path); +} + +void G4HumanPhantomAnalysisManager::particleProjectionXY(G4double xx,G4double yy) +{ + projectionXY -> fill(xx,yy,1.); +} + +void G4HumanPhantomAnalysisManager::particleProjectionYZ(G4double yy,G4double zz) +{ + projectionYZ -> fill(yy,zz,1.); +} + +void G4HumanPhantomAnalysisManager::particleProjectionZX(G4double zz,G4double xx) +{ + projectionZX -> fill(zz,xx,1.); +} + +void G4HumanPhantomAnalysisManager::bodypartEnergyDep(G4double bpID, G4double eDep) +{ + energy -> fill(bpID,eDep); +} + +void G4HumanPhantomAnalysisManager::innerBreastEnergyDep(G4int slice, G4int sector, G4double edep) +{ + // G4cout << "analisis " << slice << " "<< sector << " "<< edep << G4endl; + innerBreast -> fill(slice,sector, edep); +} + +void G4HumanPhantomAnalysisManager::finish() +{ + theTree -> commit(); + theTree -> close(); + G4cout<<"closing the hbk file"< + +#include "G4HumanPhantomConstruction.hh" + +#include "G4HumanPhantomSD.hh" +#include "G4SDManager.hh" + +//#include "G4VBodyFactory.hh" +//#include "G4MIRDBodyFactory.hh" +//#include "G4ORNLBodyFactory.hh" + +#include "G4PhantomBuilder.hh" +#include "G4FemaleBuilder.hh" +#include "G4MaleBuilder.hh" + +#include "G4RunManager.hh" +#include "G4HumanPhantomMaterial.hh" +#include "G4HumanPhantomEnergyDeposit.hh" + +G4HumanPhantomConstruction::G4HumanPhantomConstruction(G4HumanPhantomEnergyDeposit* energyDep): + edepTot(energyDep) +{ + messenger = new G4HumanPhantomMessenger(this); + material = new G4HumanPhantomMaterial(); +} + +G4HumanPhantomConstruction::~G4HumanPhantomConstruction() +{ + delete material; + delete messenger; +} + +G4VPhysicalVolume* G4HumanPhantomConstruction::Construct() +{ + material -> DefineMaterials(); + + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + G4String bodypartSD = "BodyPartSD"; + G4HumanPhantomSD* userPhantomSD = new G4HumanPhantomSD( bodypartSD, edepTot); + SDman->AddNewDetector( userPhantomSD ); + + G4PhantomBuilder* builder = 0; + + if(sex=="Female") builder = new G4FemaleBuilder; + else builder = new G4MaleBuilder ; + + builder->BuildWorld(); + + builder->SetModel(model); + + builder->SetSex(sex); + + // the argument indicates the sensitivity of the volume + builder->BuildHead(sensitivities["Head"]); + + builder->BuildTrunk(sensitivities["Trunk"]); + builder->BuildLegs(sensitivities["Legs"]); + builder->BuildBrain(sensitivities["Brain"]); + + builder->BuildArmBone(sensitivities["ArmBone"]); + builder->BuildLegBone(sensitivities["LegBone"]); + builder->BuildSkull(sensitivities["Skull"]); + builder->BuildUpperSpine(sensitivities["UpperSpine"]); + builder->BuildMiddleLowerSpine(sensitivities["MiddleLowerSpine"]); + + builder->BuildPelvis(sensitivities["Pelvis"]); + builder->BuildStomach(sensitivities["Stomach"]); + builder->BuildUpperLargeIntestine(sensitivities["UpperLargeIntestine"]); + builder->BuildLowerLargeIntestine(sensitivities["LowerLargeIntestine"]); + + builder->BuildSpleen(sensitivities["Spleen"]); + builder->BuildPancreas(sensitivities["Pancreas"]); + builder->BuildLiver(sensitivities["Liver"]); + + builder->BuildKidney(sensitivities["Kidney"]); + builder->BuildUrinaryBladder(sensitivities["UrinaryBladder"]); + + builder->BuildHeart(sensitivities["Hearth"]); + builder->BuildLung(sensitivities["Lung"]); + builder->BuildThyroid(sensitivities["Thyroid"]); + + if(sex=="Female"){ + builder->BuildOvary(true); + builder->BuildUterus(true); + builder->BuildBreast(true); + if(model == "MIRD") builder->BuildParameterisedBreast(true); + } + + if(sex=="Male"){ + builder->BuildMaleGenitalia(sensitivities["MaleGenitalia"]); + builder->BuildTestes(sensitivities["Testes"]); + } + + return builder->GetPhantom(); + delete builder; +} + +void G4HumanPhantomConstruction::SetBodyPartSensitivity(G4String bodyPartName, G4bool bodyPartSensitivity) +{ + sensitivities[bodyPartName] = bodyPartSensitivity; + if(bodyPartSensitivity==true) + G4cout << " >>> " << bodyPartName << " added as sensitive volume." << G4endl; +} + +void G4HumanPhantomConstruction::CleanPhantom() +{ + //delete mother; +} + +void G4HumanPhantomConstruction::UpdatePhantom() +{ + G4RunManager::GetRunManager()->DefineWorldVolume(Construct()); +} + +void G4HumanPhantomConstruction::SetPhantomSex(G4String newSex) +{ + sex=newSex; + + if (sex == "Male") + { + G4cout << ">> Male Phantom will be built." << G4endl; + } + if (sex == "Female") + { + G4cout << ">> Female Phantom will be built." << G4endl; + } + if ((sex != "Female") && (sex != "Male")) + G4cout << sex << " can not be defined!" << G4endl; +} + +void G4HumanPhantomConstruction::SetPhantomModel(G4String newModel) +{ + model = newModel; + + if (model == "MIRD") + { + G4cout<<" >> Phantom " << model << " will be built."<> Phantom " << model << " will be built."<::iterator i = energyTotal.begin(); + std::map::iterator end = energyTotal.end(); + + G4double k = 0.;; + + while(i!=end) + { + + G4String bodypart = i->first; + G4double energyDep = i->second; + + G4cout << "Energy Total in " < bodypartEnergyDep(k,energyDep/MeV); +#endif + i++; + k++; + } + +} diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02GeneralPhysics.cc b/examples/advanced/human_phantom/src/G4HumanPhantomEventAction.cc similarity index 57% rename from examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02GeneralPhysics.cc rename to examples/advanced/human_phantom/src/G4HumanPhantomEventAction.cc index e98cfcdd9b..449609a99f 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02GeneralPhysics.cc +++ b/examples/advanced/human_phantom/src/G4HumanPhantomEventAction.cc @@ -23,54 +23,45 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// -// $Id: H02GeneralPhysics.cc,v 1.3 2006/06/29 17:13:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy // - -#include "H02GeneralPhysics.hh" - -#include "globals.hh" +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4HumanPhantomEventAction.hh" +#include "G4Event.hh" +#include "G4EventManager.hh" +#include "G4TrajectoryContainer.hh" +#include "G4Trajectory.hh" +#include "G4VVisManager.hh" #include "G4ios.hh" -#include -H02GeneralPhysics::H02GeneralPhysics(const G4String& name) - : G4VPhysicsConstructor(name) +G4HumanPhantomEventAction::G4HumanPhantomEventAction() +{ +} + +G4HumanPhantomEventAction::~G4HumanPhantomEventAction() +{ } + +void G4HumanPhantomEventAction::BeginOfEventAction(const G4Event*) { } - -H02GeneralPhysics::~H02GeneralPhysics() -{ -} - -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" -// Bosons -#include "G4ChargedGeantino.hh" -#include "G4Geantino.hh" - -void H02GeneralPhysics::ConstructParticle() -{ - // pseudo-particles - G4Geantino::GeantinoDefinition(); - G4ChargedGeantino::ChargedGeantinoDefinition(); -} - -void H02GeneralPhysics::ConstructProcess() -{ - // Add Decay Process - theParticleIterator->reset(); - while( (*theParticleIterator)() ){ - G4ParticleDefinition* particle = theParticleIterator->value(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - if (fDecayProcess.IsApplicable(*particle)) { - pmanager ->AddProcess(&fDecayProcess); - // set ordering for PostStepDoIt and AtRestDoIt - pmanager ->SetProcessOrdering(&fDecayProcess, idxPostStep); - pmanager ->SetProcessOrdering(&fDecayProcess, idxAtRest); + +void G4HumanPhantomEventAction::EndOfEventAction(const G4Event* evt) +{ + G4TrajectoryContainer* trajectoryContainer = evt->GetTrajectoryContainer(); + G4int n_trajectories = 0; + if (trajectoryContainer) n_trajectories = trajectoryContainer->entries(); + + if (G4VVisManager::GetConcreteInstance()) + { + for (G4int i=0; iGetTrajectoryContainer()))[i]); + trj->DrawTrajectory(500); + } } - } } - - diff --git a/examples/advanced/human_phantom/src/G4HumanPhantomMaterial.cc b/examples/advanced/human_phantom/src/G4HumanPhantomMaterial.cc new file mode 100644 index 0000000000..f616b9dbaf --- /dev/null +++ b/examples/advanced/human_phantom/src/G4HumanPhantomMaterial.cc @@ -0,0 +1,215 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// + +#include "G4MaterialPropertiesTable.hh" +#include "G4MaterialPropertyVector.hh" +#include "globals.hh" +#include "G4MaterialTable.hh" +#include "Randomize.hh" +#include "G4RunManager.hh" +#include "G4Element.hh" +#include "G4ElementTable.hh" +#include "G4HumanPhantomMaterial.hh" + +G4HumanPhantomMaterial::G4HumanPhantomMaterial(): + soft(0), skeleton(0),lung(0), adipose(0), glandular(0), + adipose_glandular(0) +{;} + +G4HumanPhantomMaterial::~G4HumanPhantomMaterial() +{;} + +void G4HumanPhantomMaterial::DefineMaterials() +{ + // Define required materials + + G4double A; // atomic mass + G4double Z; // atomic number + G4double d; // density + + // General elements + + A = 1.01*g/mole; + G4Element* elH = new G4Element ("Hydrogen","H",Z = 1.,A); + + A = 12.011*g/mole; + G4Element* elC = new G4Element("Carbon","C",Z = 6.,A); + + A = 14.01*g/mole; + G4Element* elN = new G4Element("Nitrogen","N",Z = 7.,A); + + A = 16.00*g/mole; + G4Element* elO = new G4Element("Oxygen","O",Z = 8.,A); + + A = 22.99*g/mole; + G4Element* elNa = new G4Element("Sodium","Na",Z = 11.,A); + + A = 24.305*g/mole; + G4Element* elMg = new G4Element("Magnesium","Mg",Z = 12.,A); + + A = 30.974*g/mole; + G4Element* elP = new G4Element("Phosphorus","P",Z = 15.,A); + + A = 32.064*g/mole; + G4Element* elS = new G4Element("Sulfur","S",Z = 16.,A); + + A = 35.453*g/mole; + G4Element* elCl = new G4Element("Chlorine","Cl",Z = 17.,A); + + A = 39.098*g/mole; + G4Element* elK = new G4Element("Potassium","K",Z = 19.,A); + + A = 40.08*g/mole; + G4Element* elCa = new G4Element("Calcium","Ca",Z = 20.,A); + + A = 55.85*g/mole; + G4Element* elFe = new G4Element("Iron","Fe",Z = 26.,A); + + A = 65.38*g/mole; + G4Element* elZn = new G4Element("Zinc","Zn",Z = 30.,A); + + A = 85.47 *g/mole; + G4Element* elRb = new G4Element("Rb","Rb",Z = 37.,A); + + A = 87.62 *g/mole; + G4Element* elSr = new G4Element("Sr","Sr",Z = 38.,A); + + A = 91.22 *g/mole; + G4Element* elZr = new G4Element("Zr","Zr",Z = 40.,A); + + A = 207.19 *g/mole; + G4Element* elPb = new G4Element("Lead","Pb", Z = 82.,A); + + // Water + d = 1.000*g/cm3; + matH2O = new G4Material("Water",d,2); + matH2O->AddElement(elH,2); + matH2O->AddElement(elO,1); + matH2O->GetIonisation()->SetMeanExcitationEnergy(75.0*eV); + + // MIRD soft tissue + d = 0.9869 *g/cm3; + soft = new G4Material("soft_tissue",d,16); + soft->AddElement(elH,0.1047); + soft->AddElement(elC,0.2302); + soft->AddElement(elN,0.0234); + soft->AddElement(elO,0.6321); + soft->AddElement(elNa,0.0013); + soft->AddElement(elMg,0.00015); + soft->AddElement(elP,0.0024); + soft->AddElement(elS,0.0022); + soft->AddElement(elCl,0.0014); + soft->AddElement(elK,0.0021); + soft->AddElement(elFe,0.000063); + soft->AddElement(elZn,0.000032); + soft->AddElement(elRb,0.0000057); + soft->AddElement(elSr,0.00000034); + soft->AddElement(elZr,0.000008); + soft->AddElement(elPb,0.00000016); + + // MIRD Skeleton + + d = 1.4862*g/cm3; + skeleton = new G4Material("skeleton",d,15); + skeleton -> AddElement(elH,0.0704); + skeleton -> AddElement(elC,0.2279); + skeleton -> AddElement(elN,0.0387); + skeleton -> AddElement(elO,0.4856); + skeleton -> AddElement(elNa,0.0032); + skeleton -> AddElement(elMg,0.0011); + skeleton -> AddElement(elP,0.0694); + skeleton -> AddElement(elS,0.0017); + skeleton -> AddElement(elCl,0.0014); + skeleton -> AddElement(elK,0.0015); + skeleton -> AddElement(elCa,0.0991); + skeleton -> AddElement(elFe,0.00008); + skeleton -> AddElement(elZn,0.000048); + skeleton -> AddElement(elSr,0.000032); + skeleton -> AddElement(elPb,0.000011); + + // MIRD lung material + d = 0.2958 *g/cm3; + lung = new G4Material("lung_material", d,16); + lung -> AddElement(elH, 0.1021); + lung -> AddElement(elC, 0.1001); + lung -> AddElement(elN,0.028); + lung -> AddElement(elO,0.7596); + lung -> AddElement(elNa,0.0019); + lung -> AddElement(elMg,0.000074); + lung -> AddElement(elP,0.00081); + lung -> AddElement(elS,0.0023); + lung -> AddElement(elCl,0.0027); + lung -> AddElement(elK,0.0020); + lung -> AddElement(elCa,0.00007); + lung -> AddElement(elFe,0.00037); + lung -> AddElement(elZn,0.000011); + lung -> AddElement(elRb,0.0000037); + lung -> AddElement(elSr,0.000000059); + lung -> AddElement(elPb,0.00000041); + + G4double density_adipose = 0.93 *g/cm3; + adipose = new G4Material("adipose", density_adipose,8); + adipose -> AddElement(elH, 0.112); + adipose -> AddElement(elC, 0.619); + adipose -> AddElement(elN, 0.017); + adipose -> AddElement(elO, 0.251); + adipose -> AddElement(elS, 0.00025); + adipose -> AddElement(elP, 0.00025); + adipose -> AddElement(elK, 0.00025); + adipose -> AddElement(elCa,0.00025); + + G4double density_glandular = 1.04 * g/cm3; + glandular = new G4Material("glandular", density_glandular,8); + glandular -> AddElement(elH, 0.1); + glandular -> AddElement(elC,0.184); + glandular -> AddElement(elN, 0.032); + glandular -> AddElement(elO, 0.679); + glandular -> AddElement(elS, 0.00125); + glandular -> AddElement(elP, 0.00125); + glandular -> AddElement(elK, 0.00125); + glandular -> AddElement(elCa,0.00125); + + + d = (density_adipose * 0.5) + (density_glandular * 0.5); + adipose_glandular = new G4Material("adipose_glandular", d, 2); + adipose_glandular -> AddMaterial(adipose, 0.5); + adipose_glandular -> AddMaterial(glandular, 0.5); +} + +G4Material* G4HumanPhantomMaterial::GetMaterial(G4String material) +{ + // Returns a material + G4Material* pttoMaterial = G4Material::GetMaterial(material); + return pttoMaterial; +} diff --git a/examples/advanced/human_phantom/src/G4HumanPhantomMessenger.cc b/examples/advanced/human_phantom/src/G4HumanPhantomMessenger.cc new file mode 100644 index 0000000000..892128b0c6 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4HumanPhantomMessenger.cc @@ -0,0 +1,145 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4HumanPhantomMessenger.hh" +#include "G4HumanPhantomConstruction.hh" + +#include "G4UIdirectory.hh" +#include "G4UIcmdWithAString.hh" +#include "G4UIcmdWithoutParameter.hh" + +#include "globals.hh" + +#include "G4RunManager.hh" + +G4HumanPhantomMessenger::G4HumanPhantomMessenger(G4HumanPhantomConstruction* myUsrPhtm) + :myUserPhantom(myUsrPhtm),bps(false) +{ + phantomDir = new G4UIdirectory("/phantom/"); + phantomDir->SetGuidance("Set Your Phantom."); + + bpDir = new G4UIdirectory("/bodypart/"); + bpDir->SetGuidance("Add Body Part to Phantom"); + + cleanCmd = new G4UIcmdWithoutParameter("/phantom/startNewPhantom",this); + cleanCmd->SetGuidance("Start a New Phantom and clean previous one."); + cleanCmd->AvailableForStates(G4State_PreInit,G4State_Idle); + + modelCmd = new G4UIcmdWithAString("/phantom/setPhantomModel",this); + modelCmd->SetGuidance("Set sex of Phantom: MIRD, ORNL or MIX."); + modelCmd->SetParameterName("phantomModel",true); + modelCmd->SetDefaultValue("MIRD"); + modelCmd->SetCandidates("MIRD ORNL MIX"); + modelCmd->AvailableForStates(G4State_PreInit,G4State_Idle); + + sexCmd = new G4UIcmdWithAString("/phantom/setPhantomSex",this); + sexCmd->SetGuidance("Set sex of Phantom: Male or Female."); + sexCmd->SetParameterName("phantomSex",true); + sexCmd->SetDefaultValue("Female"); + sexCmd->SetCandidates("Male Female"); + sexCmd->AvailableForStates(G4State_PreInit,G4State_Idle); + + bodypartCmd = new G4UIcmdWithAString("/bodypart/addBodyPart",this); + bodypartCmd->SetGuidance("Add a Body Part to Phantom"); + bodypartCmd->SetParameterName("bpName",true); + bodypartCmd->AvailableForStates(G4State_PreInit,G4State_Idle); + + endCmd = new G4UIcmdWithoutParameter("/phantom/buildNewPhantom",this); + endCmd->SetGuidance("Build your Phantom."); + endCmd->AvailableForStates(G4State_PreInit,G4State_Idle); + +} + +G4HumanPhantomMessenger::~G4HumanPhantomMessenger() +{ + delete cleanCmd; + delete modelCmd; + delete sexCmd; + delete bodypartCmd; + delete endCmd; + delete phantomDir; + delete bpDir; +} + +void G4HumanPhantomMessenger::SetNewValue(G4UIcommand* command,G4String newValue){ + if( command == cleanCmd ) + { + myUserPhantom->CleanPhantom(); + } + if( command == modelCmd ) + { + myUserPhantom->SetPhantomModel(newValue); + } + if( command == sexCmd ) + { + myUserPhantom->SetPhantomSex(newValue); + } + if( command == bodypartCmd ) + { + AddBodyPart(newValue); + } + if( command == endCmd ) + { + G4cout << + " ****************>>>> NEW PHANTOM CONSTRUCTION <<<<***************** " + << G4endl; + + //myUserPhantom->UpdatePhantom(); + + //G4RunManager::GetRunManager()->Initialize(); + } +} + +void G4HumanPhantomMessenger::AddBodyPart(G4String newBodyPartSensitivity) +{ + + char* str = new char[newBodyPartSensitivity.length()+1]; + + strcpy(str, newBodyPartSensitivity.c_str()); + + std::string bodypart = strtok(str," "); + + std::string sensitivity = strtok(NULL," "); + + if(sensitivity=="yes"){ + bps=true; + }else{ + bps=false; + } + + G4cout << " >>> Body Part = " << bodypart << "\n" + << " >>> Sensitivity = " << sensitivity << G4endl; + + myUserPhantom->SetBodyPartSensitivity(bodypart,bps); +} + diff --git a/examples/advanced/human_phantom/src/G4HumanPhantomPhysicsList.cc b/examples/advanced/human_phantom/src/G4HumanPhantomPhysicsList.cc new file mode 100644 index 0000000000..1aa2a3086d --- /dev/null +++ b/examples/advanced/human_phantom/src/G4HumanPhantomPhysicsList.cc @@ -0,0 +1,163 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. + +#include "G4HumanPhantomPhysicsList.hh" + +#include "G4ParticleDefinition.hh" +#include "G4ProductionCutsTable.hh" +#include "G4ProcessManager.hh" +#include "G4ParticleTypes.hh" +#include "G4UnitsTable.hh" +#include "G4ios.hh" + +#include "G4MultipleScattering.hh" +// gamma +#include "G4LowEnergyRayleigh.hh" +#include "G4LowEnergyPhotoElectric.hh" +#include "G4LowEnergyCompton.hh" +#include "G4LowEnergyGammaConversion.hh" +// e- +#include "G4LowEnergyIonisation.hh" +#include "G4LowEnergyBremsstrahlung.hh" +// e+ +#include "G4eIonisation.hh" +#include "G4eBremsstrahlung.hh" +#include "G4eplusAnnihilation.hh" + +G4HumanPhantomPhysicsList::G4HumanPhantomPhysicsList(): G4VUserPhysicsList() +{ + SetVerboseLevel(1); +} + +G4HumanPhantomPhysicsList::~G4HumanPhantomPhysicsList() +{ +} + +void G4HumanPhantomPhysicsList::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. + G4Geantino::GeantinoDefinition(); + + ConstructBosons(); + ConstructLeptons(); +} + +void G4HumanPhantomPhysicsList::ConstructBosons() +{ + // photons + G4Gamma::GammaDefinition(); +} + +void G4HumanPhantomPhysicsList::ConstructLeptons() +{ + // leptons + G4Electron::ElectronDefinition(); + G4Positron::PositronDefinition(); +} + +void G4HumanPhantomPhysicsList::ConstructProcess() +{ + AddTransportation(); + ConstructEM(); +} + +void G4HumanPhantomPhysicsList::ConstructEM() +{ + theParticleIterator->reset(); + + while( (*theParticleIterator)() ){ + + G4ParticleDefinition* particle = theParticleIterator->value(); + G4ProcessManager* pmanager = particle->GetProcessManager(); + G4String particleName = particle->GetParticleName(); + + // Processes + + if (particleName == "gamma") { + // Photon + pmanager->AddDiscreteProcess(new G4LowEnergyRayleigh); + pmanager->AddDiscreteProcess(new G4LowEnergyPhotoElectric); + pmanager->AddDiscreteProcess(new G4LowEnergyCompton); + pmanager->AddDiscreteProcess(new G4LowEnergyGammaConversion); + + } else if (particleName == "e-") { + // Electron + G4LowEnergyIonisation* loweIon = new G4LowEnergyIonisation("LowEnergyIoni"); + + G4LowEnergyBremsstrahlung* loweBrem = new G4LowEnergyBremsstrahlung("LowEnBrem"); + // Select the Bremsstrahlung angular distribution model (Tsai/2BN/2BS) + loweBrem->SetAngularGenerator("tsai"); + + pmanager->AddProcess(new G4MultipleScattering, -1, 1,1); + pmanager->AddProcess(loweIon, -1, 2,2); + pmanager->AddProcess(loweBrem, -1,-1,3); + + } else if (particleName == "e+") { + // 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 G4HumanPhantomPhysicsList::SetCuts() +{ + // The production threshold is fixed to 0.1 mm for all the particles + // Secondary particles with a range bigger than 0.1 mm + // are generated; otherwise their energy is considered deposited locally + + defaultCutValue = 0.1 * mm; + + const G4double cutForGamma = defaultCutValue; + const G4double cutForElectron = defaultCutValue; + const G4double cutForPositron = defaultCutValue; + + SetCutValue(cutForGamma, "gamma"); + SetCutValue(cutForElectron, "e-"); + SetCutValue(cutForPositron, "e+"); + + // Set the secondary production cut lower than 990. eV + // Very important for high precision of lowenergy processes at low energies + + G4double lowLimit = 250. * eV; + G4double highLimit = 100. * GeV; + G4ProductionCutsTable::GetProductionCutsTable()->SetEnergyRange(lowLimit, highLimit); + + if (verboseLevel>0) DumpCutValuesTable(); +} diff --git a/examples/advanced/human_phantom/src/G4HumanPhantomPrimaryGeneratorAction.cc b/examples/advanced/human_phantom/src/G4HumanPhantomPrimaryGeneratorAction.cc new file mode 100644 index 0000000000..096e51cfcb --- /dev/null +++ b/examples/advanced/human_phantom/src/G4HumanPhantomPrimaryGeneratorAction.cc @@ -0,0 +1,195 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4HumanPhantomPrimaryGeneratorAction.hh" +#include "G4HumanPhantomConstruction.hh" +#include "G4HumanPhantomPrimaryGeneratorMessenger.hh" + +#include "G4Event.hh" +#include "G4ParticleGun.hh" +#include "G4ParticleTable.hh" +#include "G4ParticleDefinition.hh" +#include "globals.hh" + +#include "G4RunManager.hh" +//#ifdef G$ANALYSIS_USE +//#include "G4HumanPhantomAnalysisManager.hh" +//#endif + +#include "G4ios.hh" + +G4HumanPhantomPrimaryGeneratorAction::G4HumanPhantomPrimaryGeneratorAction() + :beamKind("beamAlongZ"),worldLength(200.) +{ + G4int n_particle = 1; + + messenger= new G4HumanPhantomPrimaryGeneratorMessenger(this); + + particleGun = new G4ParticleGun(n_particle); + + probability.push_back(0.1667); + probability.push_back(0.1667); + probability.push_back(0.1667); + probability.push_back(0.1667); + probability.push_back(0.1666); + probability.push_back(0.1666); + + // Default Particle + G4ParticleTable* particleTable = G4ParticleTable::GetParticleTable(); + +particleGun->SetParticleDefinition(particleTable->FindParticle("geantino")); + particleGun->SetParticleEnergy(100.*MeV); +} + +G4HumanPhantomPrimaryGeneratorAction::~G4HumanPhantomPrimaryGeneratorAction() +{ + delete particleGun; + delete messenger; +} + +void G4HumanPhantomPrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent) +{ + if (beamKind == "beamAlongZ") GenerateBeamAlongZ(); + if (beamKind == "beamAlongY") GenerateBeamAlongY(); + if (beamKind == "beamAlongX") GenerateBeamAlongX(); + if (beamKind == "isotropicFlux") GenerateIsotropicFlux(); + + particleGun->SetParticlePosition(G4ThreeVector(x0, y0,z0)); + particleGun->GeneratePrimaryVertex(anEvent); +} + +void G4HumanPhantomPrimaryGeneratorAction::GenerateBeamAlongZ() +{ + z0 = 0.5*(worldLength)*cm; + y0 = (worldLength)*(G4UniformRand()-0.5)*cm; + x0 = (worldLength)*(G4UniformRand()-0.5)*cm; + G4ThreeVector direction(0.,0.,-1.); + particleGun->SetParticleMomentumDirection(direction); +} + +void G4HumanPhantomPrimaryGeneratorAction::GenerateBeamAlongX() +{ + x0 = -0.5*(worldLength)*cm; + y0 = (worldLength)*(G4UniformRand()-0.5)*cm; + z0 = (worldLength)*(G4UniformRand()-0.5)*cm; + + G4ThreeVector direction(1.,0.,0.); + particleGun->SetParticleMomentumDirection(direction); +} +void G4HumanPhantomPrimaryGeneratorAction::GenerateBeamAlongY() +{ + y0 = 0.5*(worldLength)*cm; + x0 = (worldLength)*(G4UniformRand()-0.5)*cm; + z0 = (worldLength)*(G4UniformRand()-0.5)*cm; + + G4ThreeVector direction(0.,-1.,0.); + particleGun->SetParticleMomentumDirection(direction); +} + +void G4HumanPhantomPrimaryGeneratorAction::GenerateIsotropicFlux() +{ + G4double random = G4UniformRand(); + G4double sum = 0.; + G4int i = 0; + + while(sum 1 || n == 0.0); + n = std::sqrt(n); + a /= n; + b /= n; + c /= n; + + G4ThreeVector direction(a,b,c); + particleGun->SetParticleMomentumDirection(direction); +} + +void G4HumanPhantomPrimaryGeneratorAction::SetBeam(G4String beam) +{ + if((beam == "beamAlongZ")||(beam == "beamAlongX")|| + (beam == "beamAlongY")||(beam == "isotropicFlux")) beamKind = beam; + + else G4cout<<"This option is not valid "<< + "---> beamAlongZ/beamAlongY/beamAlongX/isotropicFlux" + < +#include "G4UIcmdWithAString.hh" -ExN04GeneralPhysics::ExN04GeneralPhysics(const G4String& name) - : G4VPhysicsConstructor(name) -{ + +G4HumanPhantomPrimaryGeneratorMessenger::G4HumanPhantomPrimaryGeneratorMessenger(G4HumanPhantomPrimaryGeneratorAction* primaryGun) + :primary(primaryGun) +{ + beamCmd = new G4UIcmdWithAString("/gun/setBeam",this); + beamCmd->SetGuidance("Choose the type of beam"); + beamCmd->SetGuidance("Choice : beamAlongX, beamAlongY, beamAlongZ, isotropicFlux "); + beamCmd->SetParameterName("choice",true); + beamCmd->SetCandidates("beamAlongX beamAlongY beamAlongZ isotropicFlux"); + beamCmd->AvailableForStates(G4State_PreInit,G4State_Idle); } -ExN04GeneralPhysics::~ExN04GeneralPhysics() +G4HumanPhantomPrimaryGeneratorMessenger::~G4HumanPhantomPrimaryGeneratorMessenger() { + delete beamCmd; } -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" -// Bosons -#include "G4ChargedGeantino.hh" -#include "G4Geantino.hh" - -void ExN04GeneralPhysics::ConstructParticle() -{ - // pseudo-particles - G4Geantino::GeantinoDefinition(); - G4ChargedGeantino::ChargedGeantinoDefinition(); -} - -void ExN04GeneralPhysics::ConstructProcess() -{ - // Add Decay Process - theParticleIterator->reset(); - while( (*theParticleIterator)() ){ - G4ParticleDefinition* particle = theParticleIterator->value(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - if (fDecayProcess.IsApplicable(*particle)) { - pmanager ->AddProcess(&fDecayProcess); - // set ordering for PostStepDoIt and AtRestDoIt - pmanager ->SetProcessOrdering(&fDecayProcess, idxPostStep); - pmanager ->SetProcessOrdering(&fDecayProcess, idxAtRest); - } - } +void G4HumanPhantomPrimaryGeneratorMessenger::SetNewValue(G4UIcommand * command,G4String newValue) +{ + if( command == beamCmd ) + { primary->SetBeam(newValue); + } } diff --git a/examples/advanced/human_phantom/src/G4HumanPhantomROGeometry.cc b/examples/advanced/human_phantom/src/G4HumanPhantomROGeometry.cc new file mode 100644 index 0000000000..492e943197 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4HumanPhantomROGeometry.cc @@ -0,0 +1,159 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4HumanPhantomROGeometry.hh" +#include "G4HumanDummySD.hh" +#include "G4LogicalVolume.hh" +#include "G4VPhysicalVolume.hh" +#include "G4PVPlacement.hh" +#include "G4PVReplica.hh" +#include "G4SDManager.hh" +#include "G4Box.hh" +#include "G4ThreeVector.hh" +#include "G4Material.hh" +#include "G4Tubs.hh" + +G4HumanPhantomROGeometry::G4HumanPhantomROGeometry(G4String aString): + + G4VReadOutGeometry(aString), ROvoxel_phys(0) +{ +} + +G4HumanPhantomROGeometry::~G4HumanPhantomROGeometry() +{ +} + +G4VPhysicalVolume* G4HumanPhantomROGeometry::Build() +{ + + // A dummy material is used to fill the volumes of the readout geometry. + // (It will be allowed to set a NULL pointer in volumes of such virtual + // division in future, since this material is irrelevant for tracking.) + + G4Material* dummyMat = new G4Material(name="dummyMat", + 1., 1.*g/mole, 1.*g/cm3); + + + G4double worldSizeX = 2.0*m; + G4double worldSizeY = 2.0*m; + G4double worldSizeZ = 2.0*m; + + + // world volume of ROGeometry ... + G4Box *ROWorld = new G4Box("ROWorld", + worldSizeX/2., + worldSizeY/2., + worldSizeZ/2.); + + G4LogicalVolume *ROWorldLog = new G4LogicalVolume(ROWorld, + dummyMat, + "ROWorldLog", + 0,0,0); + + G4VPhysicalVolume *ROWorldPhys = new G4PVPlacement(0, + G4ThreeVector(), + "ROWorldPhys", + ROWorldLog, + 0,false,0); + + // Breast Mother Volume + G4double rmin = 0.* cm; + G4double startPhi = 0.* degree; + G4double spanningPhi = 180. * degree; + G4double rmax = 5.5 *cm; + G4double zz = 5. *cm; + + G4Tubs* ROinnerBreast = new G4Tubs("inner_breast", + rmin, rmax, + zz/2., startPhi, spanningPhi); + + G4LogicalVolume* ROinnerBreast_log = new G4LogicalVolume(ROinnerBreast, + dummyMat, + "InnerBreast", + 0, 0, 0); + G4RotationMatrix* matrix = new G4RotationMatrix(); + matrix -> rotateX(-90.* degree); + matrix -> rotateY(180.* degree); + matrix -> rotateZ(-18. * degree); + + + G4VPhysicalVolume* ROphysInnerBreast = new G4PVPlacement(matrix, + G4ThreeVector(8.63*cm, 46.87* cm, 8.4854 *cm), + "physicalParameterisedBreast", + ROinnerBreast_log, + ROWorldPhys, + false, + 0); + + // Breast RO Geometry - slices along z axis + G4double rmin_voxelz = 0.* cm; + G4double rmax_voxelz = 5.5 * cm; + G4double zz_voxels = 5. * cm; + G4double startPhi_voxelz = 0.* degree; + G4double spanningPhi_voxelz = 180. * degree; + G4int nslice = 10; + + G4Tubs* ROvoxelz = new G4Tubs("voxel_z", rmin_voxelz, rmax_voxelz, zz_voxels/(2*nslice),startPhi_voxelz, spanningPhi_voxelz); + + G4LogicalVolume* ROvoxelz_log = new G4LogicalVolume(ROvoxelz, dummyMat, "voxelz_log",0 , 0, 0); + + G4VPhysicalVolume* ROvoxelz_phys = new G4PVReplica("LinearArray", ROvoxelz_log, ROphysInnerBreast, + kZAxis, nslice, zz_voxels/nslice); + + G4double voxel_height = (zz_voxels/nslice); + + G4int n_voxels = 10; + + G4double voxel_phi = spanningPhi_voxelz/n_voxels; + + + G4Tubs* ROvoxel = new G4Tubs("voxel", rmin_voxelz, rmax_voxelz, voxel_height/2., + startPhi_voxelz,voxel_phi); + + G4LogicalVolume* ROvoxel_log = new G4LogicalVolume(ROvoxel, dummyMat, "voxel_log", 0,0,0); + + ROvoxel_phys = new G4PVReplica("RZPhiSlices", + ROvoxel_log, + ROvoxelz_phys, + kPhi, n_voxels, voxel_phi,- (voxel_phi/2.)); + + //delete matrix; + + G4HumanDummySD *dummySD = new G4HumanDummySD; + ROvoxel_log -> SetSensitiveDetector(dummySD); + + return ROWorldPhys; +} + + + diff --git a/examples/novice/N05/include/ExN05MinRangeCuts.hh b/examples/advanced/human_phantom/src/G4HumanPhantomRunAction.cc similarity index 61% rename from examples/novice/N05/include/ExN05MinRangeCuts.hh rename to examples/advanced/human_phantom/src/G4HumanPhantomRunAction.cc index e49da6225e..7e15f759e1 100644 --- a/examples/novice/N05/include/ExN05MinRangeCuts.hh +++ b/examples/advanced/human_phantom/src/G4HumanPhantomRunAction.cc @@ -23,49 +23,44 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// -// $Id: ExN05MinRangeCuts.hh,v 1.6 2006/06/29 17:52:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy // -// ------------------------------------------------------------ -// GEANT 4 class header file +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. // -// ------------------------------------------------------------ -// 14 Aug. 1998 H.Kurashige -// ------------------------------------------------------------ - -#ifndef ExN05MinRangeCuts_h -#define ExN05MinRangeCuts_h 1 +#include "G4HumanPhantomRunAction.hh" +#include "G4HumanPhantomAnalysisManager.hh" #include "G4ios.hh" -#include "globals.hh" -#include "ExN05SpecialCuts.hh" +#include "G4Run.hh" +G4HumanPhantomRunAction::G4HumanPhantomRunAction() +{} -class ExN05MinRangeCuts : public ExN05SpecialCuts +G4HumanPhantomRunAction::~G4HumanPhantomRunAction() +{} + +void G4HumanPhantomRunAction::BeginOfRunAction(const G4Run* aRun) { - public: - - ExN05MinRangeCuts(const G4String& processName ="ExN05MinRangeCuts" ); - - virtual ~ExN05MinRangeCuts(); - - // PostStep GPIL - virtual G4double PostStepGetPhysicalInteractionLength( - const G4Track& track, - G4double previousStepSize, - G4ForceCondition* condition - ); - - - private: - - // hide assignment operator as private - ExN05MinRangeCuts(ExN05MinRangeCuts&); - ExN05MinRangeCuts& operator=(const ExN05MinRangeCuts& right); - -}; + G4int run_number = aRun->GetRunID(); + G4cout << "### Run " << run_number << " start." << G4endl; +#ifdef G4ANALYSIS_USE + if (run_number == 0) + { + G4HumanPhantomAnalysisManager* analysis = G4HumanPhantomAnalysisManager::getInstance(); + analysis->book(); + } #endif +} + +void G4HumanPhantomRunAction::EndOfRunAction(const G4Run* aRun) +{ + G4cout << "Number of events = " << aRun->GetNumberOfEvent() << G4endl; +} + + diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04TrackerSD.cc b/examples/advanced/human_phantom/src/G4HumanPhantomSD.cc similarity index 60% rename from examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04TrackerSD.cc rename to examples/advanced/human_phantom/src/G4HumanPhantomSD.cc index b83b11a795..4a444aea5e 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04TrackerSD.cc +++ b/examples/advanced/human_phantom/src/G4HumanPhantomSD.cc @@ -23,58 +23,48 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // - -#include "ExN04TrackerSD.hh" -#include "ExN04TrackerHit.hh" +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4HumanPhantomSD.hh" +//#include "G4HCofThisEvent.hh" #include "G4Step.hh" -#include "G4HCofThisEvent.hh" -#include "G4TouchableHistory.hh" +//#include "G4ThreeVector.hh" +#include "G4SDManager.hh" #include "G4ios.hh" +#include "G4HumanPhantomEnergyDeposit.hh" -ExN04TrackerSD::ExN04TrackerSD(G4String name) -:G4VSensitiveDetector(name) +G4HumanPhantomSD::G4HumanPhantomSD(G4String name, G4HumanPhantomEnergyDeposit* edepTot) + :G4VSensitiveDetector(name), energyTotal(edepTot) { - G4String HCname; - collectionName.insert(HCname="trackerCollection"); } -ExN04TrackerSD::~ExN04TrackerSD(){;} - -void ExN04TrackerSD::Initialize(G4HCofThisEvent*HCE) -{ - static int HCID = -1; - trackerCollection = new ExN04TrackerHitsCollection - (SensitiveDetectorName,collectionName[0]); - if(HCID<0) - { HCID = GetCollectionID(0); } - HCE->AddHitsCollection(HCID,trackerCollection); +G4HumanPhantomSD::~G4HumanPhantomSD() +{ } -G4bool ExN04TrackerSD::ProcessHits(G4Step*aStep,G4TouchableHistory*) +void G4HumanPhantomSD::Initialize(G4HCofThisEvent*) { - G4double edep = aStep->GetTotalEnergyDeposit(); +} + +G4bool G4HumanPhantomSD::ProcessHits(G4Step* aStep,G4TouchableHistory*) +{ +G4double edep = aStep->GetTotalEnergyDeposit(); + if(edep==0.) return false; + + G4String bodypartName = aStep->GetPreStepPoint()->GetTouchable() + ->GetVolume()->GetLogicalVolume()->GetName(); - ExN04TrackerHit* newHit = new ExN04TrackerHit(); - newHit->SetEdep( edep ); - newHit->SetPos( aStep->GetPreStepPoint()->GetPosition() ); - trackerCollection->insert( newHit ); - - return true; + energyTotal->Fill(bodypartName, edep); + return true; } -void ExN04TrackerSD::EndOfEvent(G4HCofThisEvent*) -{;} - -void ExN04TrackerSD::clear() +void G4HumanPhantomSD::EndOfEvent(G4HCofThisEvent*) { -} - -void ExN04TrackerSD::DrawAll() -{ -} - -void ExN04TrackerSD::PrintAll() -{ -} - +} diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04MuonSD.cc b/examples/advanced/human_phantom/src/G4HumanPhantomSDBreast.cc similarity index 56% rename from examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04MuonSD.cc rename to examples/advanced/human_phantom/src/G4HumanPhantomSDBreast.cc index c8082e9498..fd4c393490 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04MuonSD.cc +++ b/examples/advanced/human_phantom/src/G4HumanPhantomSDBreast.cc @@ -23,75 +23,61 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // - -#include "ExN04MuonSD.hh" -#include "ExN04MuonHit.hh" +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4HumanPhantomSDBreast.hh" #include "G4HCofThisEvent.hh" -#include "G4TouchableHistory.hh" -#include "G4Track.hh" #include "G4Step.hh" +#include "G4ThreeVector.hh" +#include "G4SDManager.hh" #include "G4ios.hh" +#ifdef G4ANALYSIS_USE +#include "G4HumanPhantomAnalysisManager.hh" +#endif -ExN04MuonSD::ExN04MuonSD(G4String name) +G4HumanPhantomSDBreast::G4HumanPhantomSDBreast(G4String name) :G4VSensitiveDetector(name) { - G4String HCname; - collectionName.insert(HCname="muonCollection"); - positionResolution = 5*cm; } -ExN04MuonSD::~ExN04MuonSD(){;} +G4HumanPhantomSDBreast::~G4HumanPhantomSDBreast() +{;} -void ExN04MuonSD::Initialize(G4HCofThisEvent*HCE) -{ - static int HCID = -1; - muonCollection = new ExN04MuonHitsCollection - (SensitiveDetectorName,collectionName[0]); - if(HCID<0) - { HCID = GetCollectionID(0); } - HCE->AddHitsCollection(HCID,muonCollection); -} +void G4HumanPhantomSDBreast::Initialize(G4HCofThisEvent*) +{} -G4bool ExN04MuonSD::ProcessHits(G4Step*aStep,G4TouchableHistory*) +G4bool G4HumanPhantomSDBreast::ProcessHits(G4Step* aStep,G4TouchableHistory* ROhist) { + if(!ROhist) return false; + + // Check the volume + if(aStep -> GetPreStepPoint() -> GetPhysicalVolume() -> + GetName() != "innerBreast") + return false; + G4double edep = aStep->GetTotalEnergyDeposit(); + if(edep==0.) return false; - if(edep==0.) return true; - - ExN04MuonHit* aHit; - int nHit = muonCollection->entries(); - G4ThreeVector hitpos = aStep->GetPreStepPoint()->GetPosition(); - for(int i=0;iGetPos(); - G4double dist2 = sqr(pos.x()-hitpos.x()) - +sqr(pos.y()-hitpos.y())+sqr(pos.z()-hitpos.z()); - if(dist2<=sqr(positionResolution)) - aHit->AddEdep(edep); - return true; - } - - aHit = new ExN04MuonHit(); - aHit->SetEdep( edep ); - aHit->SetPos( aStep->GetPreStepPoint()->GetPosition() ); - muonCollection->insert( aHit ); - + if(edep != 0) + { + +#ifdef G4ANALYSIS_USE + G4int sector = ROhist -> GetReplicaNumber(); + G4int slice = ROhist -> GetReplicaNumber(1); + G4HumanPhantomAnalysisManager* analysis = + G4HumanPhantomAnalysisManager::getInstance(); + + analysis -> innerBreastEnergyDep(slice,sector,edep/MeV); +#endif + } return true; } -void ExN04MuonSD::EndOfEvent(G4HCofThisEvent*) -{;} - -void ExN04MuonSD::clear() -{ -} - -void ExN04MuonSD::DrawAll() -{ -} - -void ExN04MuonSD::PrintAll() -{ -} - +void G4HumanPhantomSDBreast::EndOfEvent(G4HCofThisEvent*) +{} diff --git a/examples/advanced/human_phantom/src/G4HumanPhantomSteppingAction.cc b/examples/advanced/human_phantom/src/G4HumanPhantomSteppingAction.cc new file mode 100644 index 0000000000..600b04ac93 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4HumanPhantomSteppingAction.cc @@ -0,0 +1,78 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4HumanPhantomSteppingAction.hh" +#include "G4HumanPhantomEventAction.hh" +#include "G4SteppingManager.hh" +#include "G4Track.hh" +#ifdef G4ANALYSIS_USE +#include "G4HumanPhantomAnalysisManager.hh" +#endif + +G4HumanPhantomSteppingAction::G4HumanPhantomSteppingAction() +{ } + +G4HumanPhantomSteppingAction::~G4HumanPhantomSteppingAction() +{} + +void G4HumanPhantomSteppingAction::UserSteppingAction(const G4Step* aStep) +{ + + G4String name = aStep->GetPreStepPoint()->GetPhysicalVolume()->GetName(); + + G4ThreeVector particlePosition = aStep -> GetTrack() -> GetPosition(); + +#ifdef G4ANALYSIS_USE + + if (particlePosition[2]/cm >= 0.) // section at the z-coord + { + G4HumanPhantomAnalysisManager* analysis = G4HumanPhantomAnalysisManager::getInstance(); + analysis -> particleProjectionXY(particlePosition[0]/cm,particlePosition[1]/cm); + } + + if (particlePosition[0]/cm >= 0.) // section at the x-coord + { + G4HumanPhantomAnalysisManager* analysis = G4HumanPhantomAnalysisManager::getInstance(); + analysis -> particleProjectionYZ(particlePosition[1]/cm,particlePosition[2]/cm); + } + + if ((particlePosition[1]/cm >= 50.) && (particlePosition[1]/cm <= 51.)) + // section at the y-coord + { + G4HumanPhantomAnalysisManager* analysis = G4HumanPhantomAnalysisManager::getInstance(); + analysis -> particleProjectionZX(particlePosition[2]/cm,particlePosition[0]/cm); + } + +#endif + +} diff --git a/examples/advanced/human_phantom/src/G4MIRDAdrenal.cc b/examples/advanced/human_phantom/src/G4MIRDAdrenal.cc new file mode 100644 index 0000000000..7dab3e0c17 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4MIRDAdrenal.cc @@ -0,0 +1,93 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4MIRDAdrenal.hh" + +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" +#include "G4VisAttributes.hh" +#include "G4PhysicalVolumeStore.hh" + +G4MIRDAdrenal::G4MIRDAdrenal() +{ +} + +G4MIRDAdrenal::~G4MIRDAdrenal() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4MIRDAdrenal::ConstructAdrenal(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/MIRDAdrenal.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + G4LogicalVolume* logicAdrenal = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("AdrenalVolume"); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("AdrenalPos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("AdrenalRot"); + + G4PhysicalVolumeStore::DeRegister((G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume()); + + // Define rotation and position here! + G4VPhysicalVolume* physAdrenal = new G4PVPlacement(rm,position, + "physicalAdrenal", + logicAdrenal, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicAdrenal->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* AdrenalVisAtt = new G4VisAttributes(G4Colour(1.0,1.0,0.0)); + AdrenalVisAtt->SetForceSolid(true); + logicAdrenal->SetVisAttributes(AdrenalVisAtt); + + G4cout << "Adrenal created !!!!!!" << G4endl; + + return physAdrenal; +} diff --git a/examples/advanced/human_phantom/src/G4MIRDArmBone.cc b/examples/advanced/human_phantom/src/G4MIRDArmBone.cc new file mode 100644 index 0000000000..c9595471d3 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4MIRDArmBone.cc @@ -0,0 +1,121 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// + +#include "G4MIRDArmBone.hh" +#include "globals.hh" +#include "G4SDManager.hh" +#include "G4VisAttributes.hh" +#include "G4HumanPhantomMaterial.hh" +#include "G4EllipticalTube.hh" +#include "G4RotationMatrix.hh" +#include "G4ThreeVector.hh" +#include "G4VPhysicalVolume.hh" +#include "G4PVPlacement.hh" +#include "G4UnionSolid.hh" + +G4MIRDArmBone::G4MIRDArmBone() +{ +} + +G4MIRDArmBone::~G4MIRDArmBone() +{ +} + +G4VPhysicalVolume* G4MIRDArmBone::ConstructArmBone(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + + G4HumanPhantomMaterial* material = new G4HumanPhantomMaterial(); + + G4cout << "ConstructArmBone for "<< sex < GetMaterial("skeleton"); + + delete material; + + G4double dx = 1.21 * cm; + G4double dy = 2.65 * cm; + G4double dz= 31.10 * cm; + + G4EllipticalTube* arm = new G4EllipticalTube("OneArmBone",dx,dy,dz); + + G4UnionSolid* arms = new G4UnionSolid("ArmBone", arm, arm, + 0, + G4ThreeVector(31.74 * cm, 0.0, 0.0)); + + G4LogicalVolume* logicArmBone = new G4LogicalVolume(arms, + skeleton, + "ArmBoneVolume", + 0, 0,0); + + G4VPhysicalVolume* physArmBone = new G4PVPlacement(0, + G4ThreeVector(-15.87 * cm, 0.0, 0.0), + "physicalArmBone", + logicArmBone, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicArmBone->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + + // Visualization Attributes + G4VisAttributes* ArmBoneVisAtt = new G4VisAttributes(G4Colour(0.46,0.53,0.6)); + ArmBoneVisAtt->SetForceSolid(true); + logicArmBone->SetVisAttributes(ArmBoneVisAtt); + + G4cout << "ArmBone created !!!!!!" << G4endl; + + // Testing ArmBone Volume + G4double ArmBoneVol = logicArmBone->GetSolid()->GetCubicVolume(); + G4cout << "Volume of ArmBone = " << ArmBoneVol/cm3 << " cm^3" << G4endl; + + // Testing ArmBone Material + G4String ArmBoneMat = logicArmBone->GetMaterial()->GetName(); + G4cout << "Material of ArmBone = " << ArmBoneMat << G4endl; + + // Testing Density + G4double ArmBoneDensity = logicArmBone->GetMaterial()->GetDensity(); + G4cout << "Density of Material = " << ArmBoneDensity*cm3/g << " g/cm^3" << G4endl; + + // Testing Mass + G4double ArmBoneMass = (ArmBoneVol)*ArmBoneDensity; + G4cout << "Mass of ArmBone = " << ArmBoneMass/gram << " g" << G4endl; + + return physArmBone; +} diff --git a/examples/advanced/human_phantom/src/G4MIRDBodyFactory.cc b/examples/advanced/human_phantom/src/G4MIRDBodyFactory.cc new file mode 100644 index 0000000000..0155b367f8 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4MIRDBodyFactory.cc @@ -0,0 +1,279 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4MIRDBodyFactory.hh" +#include "G4MIRDStomach.hh" +#include "G4MIRDUpperLargeIntestine.hh" +#include "G4MIRDLowerLargeIntestine.hh" +#include "G4MIRDKidney.hh" +#include "G4MIRDAdrenal.hh" +#include "G4MIRDLiver.hh" +#include "G4MIRDPancreas.hh" +#include "G4MIRDSpleen.hh" +#include "G4MIRDUrinaryBladder.hh" +#include "G4MIRDLung.hh" +#include "G4MIRDHeart.hh" +#include "G4MIRDBrain.hh" +#include "G4MIRDHead.hh" +#include "G4MIRDTrunk.hh" +#include "G4MIRDLegs.hh" +#include "G4MIRDThyroid.hh" +#include "G4MIRDUterus.hh" +#include "G4MIRDBreast.hh" +#include "G4MIRDOvary.hh" +#include "G4MIRDUpperSpine.hh" +#include "G4MIRDMiddleLowerSpine.hh" +#include "G4MIRDLegBone.hh" +#include "G4MIRDArmBone.hh" +#include "G4MIRDSkull.hh" +#include "G4MIRDRibCage.hh" +#include "G4MIRDPelvis.hh" +#include "G4MIRDTestes.hh" +#include "G4ParameterisedBreast.hh" + +G4MIRDBodyFactory::G4MIRDBodyFactory() +{ +} + +G4MIRDBodyFactory::~G4MIRDBodyFactory() +{ +} + +G4VPhysicalVolume* G4MIRDBodyFactory::CreateStomach(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4MIRDStomach* stomach = new G4MIRDStomach(); + return stomach -> ConstructStomach(motherVolume,sex,sensitivity); + delete stomach; +} + +G4VPhysicalVolume* G4MIRDBodyFactory::CreateUpperLargeIntestine(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4MIRDUpperLargeIntestine* upperLargeIntestine = new G4MIRDUpperLargeIntestine(); + return upperLargeIntestine -> ConstructUpperLargeIntestine(motherVolume,sex,sensitivity); + delete upperLargeIntestine; +} +G4VPhysicalVolume* G4MIRDBodyFactory::CreateLowerLargeIntestine(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4MIRDLowerLargeIntestine* lowerLargeIntestine = new G4MIRDLowerLargeIntestine(); + return lowerLargeIntestine -> ConstructLowerLargeIntestine(motherVolume,sex,sensitivity); + delete lowerLargeIntestine; +} + +G4VPhysicalVolume* G4MIRDBodyFactory::CreateKidney(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4MIRDKidney* kidney = new G4MIRDKidney(); + return kidney -> ConstructKidney(motherVolume,sex,sensitivity); + delete kidney; +} +G4VPhysicalVolume* G4MIRDBodyFactory::CreateAdrenal(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4MIRDAdrenal* adrenal = new G4MIRDAdrenal(); + return adrenal -> ConstructAdrenal(motherVolume,sex,sensitivity); + delete adrenal; +} +G4VPhysicalVolume* G4MIRDBodyFactory::CreateLiver(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4MIRDLiver* liver = new G4MIRDLiver(); + return liver -> ConstructLiver(motherVolume,sex,sensitivity); + delete liver; +} +G4VPhysicalVolume* G4MIRDBodyFactory::CreatePancreas(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4MIRDPancreas* pancreas = new G4MIRDPancreas(); + return pancreas -> ConstructPancreas(motherVolume,sex,sensitivity); + delete pancreas; +} +G4VPhysicalVolume* G4MIRDBodyFactory::CreateSpleen(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4MIRDSpleen* spleen = new G4MIRDSpleen(); + return spleen -> ConstructSpleen(motherVolume,sex,sensitivity); + delete spleen; +} +G4VPhysicalVolume* G4MIRDBodyFactory::CreateUrinaryBladder(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4MIRDUrinaryBladder* urinaryBladder = new G4MIRDUrinaryBladder(); + return urinaryBladder -> ConstructUrinaryBladder(motherVolume,sex,sensitivity); +} +G4VPhysicalVolume* G4MIRDBodyFactory::CreateLung(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4MIRDLung* lung = new G4MIRDLung(); + return lung -> ConstructLung(motherVolume,sex,sensitivity); + delete lung; +} +G4VPhysicalVolume* G4MIRDBodyFactory::CreateHeart(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4MIRDHeart* heart = new G4MIRDHeart(); + return heart -> ConstructHeart(motherVolume,sex,sensitivity); + delete heart; +} +G4VPhysicalVolume* G4MIRDBodyFactory::CreateBrain(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4MIRDBrain* brain = new G4MIRDBrain(); + return brain -> ConstructBrain(motherVolume,sex,sensitivity); + delete brain; +} + +G4VPhysicalVolume* G4MIRDBodyFactory::CreateHead(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4MIRDHead* head = new G4MIRDHead(); + return head -> ConstructHead(motherVolume, sex, sensitivity); + delete head; +} +G4VPhysicalVolume* G4MIRDBodyFactory::CreateTrunk(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4MIRDTrunk* trunk = new G4MIRDTrunk(); + return trunk -> ConstructTrunk(motherVolume,sex,sensitivity); + delete trunk; +} +G4VPhysicalVolume* G4MIRDBodyFactory::CreateLegs(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4MIRDLegs* legs = new G4MIRDLegs(); + return legs -> ConstructLegs(motherVolume,sex,sensitivity); + delete legs; +} +G4VPhysicalVolume* G4MIRDBodyFactory::CreateThyroid(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4MIRDThyroid* thyroid = new G4MIRDThyroid(); + return thyroid -> ConstructThyroid(motherVolume,sex,sensitivity); + delete thyroid; +} +G4VPhysicalVolume* G4MIRDBodyFactory::CreateUterus(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4MIRDUterus* uterus = new G4MIRDUterus(); + return uterus -> ConstructUterus(motherVolume,sex,sensitivity); + delete uterus; +} +G4VPhysicalVolume* G4MIRDBodyFactory::CreateBreast(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4MIRDBreast* breast = new G4MIRDBreast(); + return breast -> ConstructBreast(motherVolume,sex,sensitivity); + delete breast; +} + +G4VPhysicalVolume* G4MIRDBodyFactory::CreateParameterisedBreast(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4cout << "G4MIRDBodyFactory::CreateParameterisedBreast" << G4endl; + G4ParameterisedBreast* breast = new G4ParameterisedBreast(); + return breast -> ConstructBreast(motherVolume,sex,sensitivity); + delete breast; +} + +G4VPhysicalVolume* G4MIRDBodyFactory::CreateOvary(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4MIRDOvary* ovary = new G4MIRDOvary(); + return ovary -> ConstructOvary(motherVolume,sex,sensitivity); + delete ovary; +} +G4VPhysicalVolume* G4MIRDBodyFactory::CreateUpperSpine(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4MIRDUpperSpine* upperSpine = new G4MIRDUpperSpine(); + return upperSpine -> ConstructUpperSpine(motherVolume,sex,sensitivity); + delete upperSpine; +} +G4VPhysicalVolume* G4MIRDBodyFactory::CreateMiddleLowerSpine(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4MIRDMiddleLowerSpine* middleLowerSpine = new G4MIRDMiddleLowerSpine(); + return middleLowerSpine -> ConstructMiddleLowerSpine(motherVolume,sex,sensitivity); + delete middleLowerSpine; +} +G4VPhysicalVolume* G4MIRDBodyFactory::CreateLegBone(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4MIRDLegBone* legBone = new G4MIRDLegBone(); + return legBone -> ConstructLegBone(motherVolume,sex,sensitivity); + delete legBone; +} +G4VPhysicalVolume* G4MIRDBodyFactory::CreateArmBone(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4MIRDArmBone* armBone = new G4MIRDArmBone(); + return armBone -> ConstructArmBone(motherVolume,sex,sensitivity); + delete armBone; +} +G4VPhysicalVolume* G4MIRDBodyFactory::CreateSkull(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4MIRDSkull* skull = new G4MIRDSkull(); + return skull -> ConstructSkull(motherVolume,sex,sensitivity); + delete skull; +} +G4VPhysicalVolume* G4MIRDBodyFactory::CreateRibCage(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4MIRDRibCage* ribCage = new G4MIRDRibCage(); + return ribCage -> ConstructRibCage(motherVolume,sex,sensitivity); + delete ribCage; +} +G4VPhysicalVolume* G4MIRDBodyFactory::CreatePelvis(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4MIRDPelvis* pelvis = new G4MIRDPelvis(); + return pelvis -> ConstructPelvis(motherVolume,sex,sensitivity); + delete pelvis; +} +G4VPhysicalVolume* G4MIRDBodyFactory::CreateTestes(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4MIRDTestes* testes = new G4MIRDTestes(); + return testes -> ConstructTestes(motherVolume,sex,sensitivity); + delete testes; +} +G4VPhysicalVolume* G4MIRDBodyFactory::CreateEsophagus(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4cout << motherVolume << ">>>> Cannot create Esophagus of " << sex + << "phantom and with sensitivity = " << sensitivity + << ": not yet implemented!" << G4endl; + return 0; +} +G4VPhysicalVolume* G4MIRDBodyFactory::CreateClavicles(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4cout << motherVolume << ">>>> Cannot create Clavicles of " << sex + << "phantom and with sensitivity = " << sensitivity + << ": not yet implemented!" << G4endl; + return 0; +} +G4VPhysicalVolume* G4MIRDBodyFactory::CreateScapulae(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4cout << motherVolume << ">>>> Cannot create Scapulae of " << sex + << "phantom and with sensitivity = " << sensitivity + << ": not yet implemented!" << G4endl; + return 0; +} +G4VPhysicalVolume* G4MIRDBodyFactory::CreateNeck(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4cout << motherVolume << ">>>> Cannot create Neck of " << sex + << "phantom and with sensitivity = " << sensitivity + << ": not yet implemented!" << G4endl; + return 0; +} +G4VPhysicalVolume* G4MIRDBodyFactory::CreateMaleGenitalia(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4cout << motherVolume << ">>>> Cannot create Male Genitalia of " << sex + << "phantom and with sensitivity = " << sensitivity + << ": not yet implemented!" << G4endl; + return 0; +} diff --git a/examples/advanced/human_phantom/src/G4MIRDBrain.cc b/examples/advanced/human_phantom/src/G4MIRDBrain.cc new file mode 100644 index 0000000000..f4a7bd689b --- /dev/null +++ b/examples/advanced/human_phantom/src/G4MIRDBrain.cc @@ -0,0 +1,116 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4MIRDBrain.hh" +#include "globals.hh" +#include "G4SDManager.hh" +#include "G4VisAttributes.hh" +#include "G4Ellipsoid.hh" +#include "G4ThreeVector.hh" +#include "G4VPhysicalVolume.hh" +#include "G4RotationMatrix.hh" +#include "G4Material.hh" +#include "G4LogicalVolume.hh" +#include "G4HumanPhantomMaterial.hh" +#include "G4VPhysicalVolume.hh" +#include "G4PVPlacement.hh" + +G4MIRDBrain::G4MIRDBrain() +{ +} + +G4MIRDBrain::~G4MIRDBrain() +{ + +} + +G4VPhysicalVolume* G4MIRDBrain::ConstructBrain(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + + G4HumanPhantomMaterial* material = new G4HumanPhantomMaterial(); + G4Material* soft = material -> GetMaterial("soft_tissue"); + delete material; + + G4double ax = 6.58 * cm; + G4double by= 8.57 * cm; + G4double cz = 5.73 * cm; + + G4Ellipsoid* brain = new G4Ellipsoid("Brain", ax, by, cz); + + + G4LogicalVolume* logicBrain = new G4LogicalVolume(brain, soft, + "BrainVolume", + 0, 0, 0); + + // Define rotation and position here! + G4VPhysicalVolume* physBrain = new G4PVPlacement(0, + G4ThreeVector(0.*cm, 0.*cm, 8.25 * cm), + "physicalBrain", + logicBrain, + mother, + false, + 0); + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicBrain->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + + // Visualization Attributes + G4VisAttributes* BrainVisAtt = new G4VisAttributes(G4Colour(0.41,0.41,0.41)); + BrainVisAtt->SetForceSolid(true); + logicBrain->SetVisAttributes(BrainVisAtt); + + G4cout << "Brain created for " << sex << "!!!! "<GetSolid()->GetCubicVolume(); + G4cout << "Volume of Brain = " << BrainVol/cm3 << " cm^3" << G4endl; + + // Testing Brain Material + G4String BrainMat = logicBrain->GetMaterial()->GetName(); + G4cout << "Material of Brain = " << BrainMat << G4endl; + + // Testing Density + G4double BrainDensity = logicBrain->GetMaterial()->GetDensity(); + G4cout << "Density of Material = " << BrainDensity*cm3/g << " g/cm^3" << G4endl; + + // Testing Mass + G4double BrainMass = (BrainVol)*BrainDensity; + G4cout << "Mass of Brain = " << BrainMass/gram << " g" << G4endl; + + + return physBrain; +} diff --git a/examples/advanced/human_phantom/src/G4MIRDBreast.cc b/examples/advanced/human_phantom/src/G4MIRDBreast.cc new file mode 100644 index 0000000000..2e21401af7 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4MIRDBreast.cc @@ -0,0 +1,147 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4MIRDBreast.hh" +#include "globals.hh" +#include "G4SDManager.hh" +#include "G4VisAttributes.hh" +#include "G4Ellipsoid.hh" +#include "G4ThreeVector.hh" +#include "G4VPhysicalVolume.hh" +#include "G4RotationMatrix.hh" +#include "G4Material.hh" +#include "G4LogicalVolume.hh" +#include "G4HumanPhantomMaterial.hh" +#include "G4VPhysicalVolume.hh" +#include "G4PVPlacement.hh" +#include "G4EllipticalTube.hh" +#include "G4UnionSolid.hh" +#include "G4SubtractionSolid.hh" + +G4MIRDBreast::G4MIRDBreast() +{ +} + +G4MIRDBreast::~G4MIRDBreast() +{ +} + +G4VPhysicalVolume* G4MIRDBreast::ConstructBreast(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + G4cout << "ConstructBreast for " << sex << G4endl; + + G4HumanPhantomMaterial* material = new G4HumanPhantomMaterial(); + G4Material* soft = material -> GetMaterial("soft_tissue"); + delete material; + + G4double ax= 4.95* cm; + G4double by= 4.35* cm; + G4double cz= 4.15*cm; + G4double zcut1= -4.15 *cm; + G4double zcut2= 4.15*cm; + + G4Ellipsoid* oneBreast = new G4Ellipsoid("OneBreast", + ax, by, cz, + zcut1, zcut2); + + G4double dx= 17.25* cm; + G4double dy= 9.80* cm; + G4double dz= 31.55*cm; + + G4EllipticalTube* Trunk = new G4EllipticalTube("Trunk",dx, dy, dz ); + + /* + G4UnionSolid* BreastUnion = new G4UnionSolid("BreastUnion", + oneBreast,oneBreast, + 0, + G4ThreeVector(17.26*cm, + 0. *cm, + 0. *cm)); + */ + + G4RotationMatrix* rm_relative = new G4RotationMatrix(); + rm_relative -> rotateX(90. * degree); + + G4SubtractionSolid* breast = new G4SubtractionSolid("Breast", + oneBreast, + Trunk, + rm_relative, + G4ThreeVector(8.63*cm, + 0.0*cm, + -8.4854*cm)); + + + G4LogicalVolume* logicBreast = new G4LogicalVolume(breast, soft,"BreastVolume", 0, 0,0); + + + // Define rotation and position here! + G4VPhysicalVolume* physBreast = new G4PVPlacement(0,G4ThreeVector(-8.63*cm, 46.87* cm, 8.4854 *cm), + "physicalBreast", + logicBreast, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicBreast->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* BreastVisAtt = new G4VisAttributes(G4Colour(1.0,0.41,0.71)); + BreastVisAtt->SetForceSolid(true); + logicBreast->SetVisAttributes(BreastVisAtt); + + G4cout << "Breast created !!!!!!" << G4endl; + + // Testing Breast Volume + G4double BreastVol = logicBreast->GetSolid()->GetCubicVolume(); + G4cout << "Volume of Breast = " << BreastVol/cm3 << " cm^3" << G4endl; + + // Testing Breast Material + G4String BreastMat = logicBreast->GetMaterial()->GetName(); + G4cout << "Material of Breast = " << BreastMat << G4endl; + + // Testing Density + G4double BreastDensity = logicBreast->GetMaterial()->GetDensity(); + G4cout << "Density of Material = " << BreastDensity*cm3/g << " g/cm^3" << G4endl; + + // Testing Mass + G4double BreastMass = (BreastVol)*BreastDensity; + G4cout << "Mass of Breast = " << BreastMass/gram << " g" << G4endl; + + + return physBreast; +} diff --git a/examples/advanced/human_phantom/src/G4MIRDHead.cc b/examples/advanced/human_phantom/src/G4MIRDHead.cc new file mode 100644 index 0000000000..eb2c613069 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4MIRDHead.cc @@ -0,0 +1,131 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4MIRDHead.hh" +//#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4HumanPhantomMaterial.hh" +#include "G4SDManager.hh" +#include "G4PVPlacement.hh" +#include "G4VisAttributes.hh" +#include "G4UnionSolid.hh" +#include "G4Ellipsoid.hh" +#include "G4ThreeVector.hh" +#include "G4VPhysicalVolume.hh" +#include "G4RotationMatrix.hh" +#include "G4Material.hh" +#include "G4EllipticalTube.hh" + +G4MIRDHead::G4MIRDHead() +{ + material = new G4HumanPhantomMaterial(); +} + +G4MIRDHead::~G4MIRDHead() +{ + delete material; +} + +G4VPhysicalVolume* G4MIRDHead::ConstructHead(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // G4cout << "ConstructHead"<< G4endl; + G4Material* soft = material -> GetMaterial("soft_tissue"); + + // Ellipsoid + G4double ax = 7.77 * cm; + G4double by = 9.76 * cm; + G4double cz = 6.92 * cm; + G4double zcut1 = 0.0 * cm; + G4double zcut2 = 6.92 * cm; + + G4Ellipsoid* head1 = new G4Ellipsoid("Head1", ax, by, cz, zcut1, zcut2); + + G4double dx = 7.77 * cm; + G4double dy = 9.76 * cm; + G4double dz = 8.25 * cm; + + G4EllipticalTube* head2 = new G4EllipticalTube("Head2", dx, dy, dz); + // G4Tubs(Name, r_int, r_est, halfz lenght, spanning angles) + + G4UnionSolid* head = new G4UnionSolid("Head",head2,head1, + 0, // Rotation + G4ThreeVector(0.* cm, 0.*cm, 8.15 * cm) ); + + G4LogicalVolume* logicHead = new G4LogicalVolume(head, soft,"HeadVolume", + 0, 0,0); + G4RotationMatrix* rm = new G4RotationMatrix(); + rm -> rotateX(90.* degree); + + // Define rotation and position here! + G4VPhysicalVolume* physHead = new G4PVPlacement(rm, + G4ThreeVector(0.* cm,71.35*cm, 0.*cm), + "physicalHead", + logicHead, + mother, + false, + 0); + // delete rm; + + // Sensitive Body Part + + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicHead->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* HeadVisAtt = new G4VisAttributes(G4Colour(0.94,0.5,0.5)); + HeadVisAtt->SetForceSolid(false); + logicHead->SetVisAttributes(HeadVisAtt); + + G4cout << "Head created for " << sex << "!!!!!!" << G4endl; + + // Testing Head Volume + G4double HeadVol = logicHead->GetSolid()->GetCubicVolume(); + G4cout << "Volume of Head = " << HeadVol/cm3 << " cm^3" << G4endl; + + // Testing Head Material + G4String HeadMat = logicHead->GetMaterial()->GetName(); + G4cout << "Material of Head = " << HeadMat << G4endl; + + // Testing Density + G4double HeadDensity = logicHead->GetMaterial()->GetDensity(); + G4cout << "Density of Material = " << HeadDensity*cm3/g << " g/cm^3" << G4endl; + + // Testing Mass + G4double HeadMass = (HeadVol)*HeadDensity; + G4cout << "Mass of Head = " << HeadMass/gram << " g" << G4endl; + + return physHead; +} diff --git a/examples/advanced/human_phantom/src/G4MIRDHeart.cc b/examples/advanced/human_phantom/src/G4MIRDHeart.cc new file mode 100644 index 0000000000..1cf5e16741 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4MIRDHeart.cc @@ -0,0 +1,135 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4MIRDHeart.hh" +#include "globals.hh" +#include "G4SDManager.hh" +#include "G4VisAttributes.hh" +#include "G4Ellipsoid.hh" +#include "G4ThreeVector.hh" +#include "G4VPhysicalVolume.hh" +#include "G4RotationMatrix.hh" +#include "G4Material.hh" +#include "G4LogicalVolume.hh" +#include "G4HumanPhantomMaterial.hh" +#include "G4VPhysicalVolume.hh" +#include "G4PVPlacement.hh" +#include "G4Sphere.hh" +#include "G4UnionSolid.hh" + +G4MIRDHeart::G4MIRDHeart() +{ +} + +G4MIRDHeart::~G4MIRDHeart() +{ + +} + +G4VPhysicalVolume* G4MIRDHeart::ConstructHeart(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + G4cout << "ConstructHeart for " << sex << G4endl; + + G4HumanPhantomMaterial* material = new G4HumanPhantomMaterial(); + G4Material* soft = material -> GetMaterial("soft_tissue"); + delete material; + + G4double ax= 4.00* cm; + G4double by= 4.00 *cm; + G4double cz= 7.00 *cm; + G4double zcut1= -7.00 *cm; + G4double zcut2= 0.0 *cm; + + G4Ellipsoid* heart1 = new G4Ellipsoid("Heart1",ax, by, cz, zcut1, zcut2); + + G4double rmin =0.*cm; + G4double rmax = 3.99*cm; + G4double startphi = 0. * degree; + G4double deltaphi = 360. * degree; + G4double starttheta = 0. * degree; + G4double deltatheta = 90. * degree; + + G4Sphere* heart2 = new G4Sphere("Heart2", rmin,rmax, + startphi, deltaphi, + starttheta, deltatheta); + + G4UnionSolid* heart = new G4UnionSolid("Heart", heart1, heart2); + + G4LogicalVolume* logicHeart = new G4LogicalVolume(heart, soft, + "HeartVolume", + 0, 0, 0); + + G4RotationMatrix* matrix = new G4RotationMatrix(); + matrix -> rotateY(25. * degree); + + // Define rotation and position here! + G4VPhysicalVolume* physHeart = new G4PVPlacement(matrix,G4ThreeVector(0.0,-3.0*cm, 15.32 *cm), + "physicalHeart", + logicHeart, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicHeart->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* HeartVisAtt = new G4VisAttributes(G4Colour(1.0,0.0,0.0)); + HeartVisAtt->SetForceSolid(true); + logicHeart->SetVisAttributes(HeartVisAtt); + + G4cout << "Heart created !!!!!!" << G4endl; + + // Testing Heart Volume + G4double HeartVol = logicHeart->GetSolid()->GetCubicVolume(); + G4cout << "Volume of Heart = " << HeartVol/cm3 << " cm^3" << G4endl; + + // Testing Heart Material + G4String HeartMat = logicHeart->GetMaterial()->GetName(); + G4cout << "Material of Heart = " << HeartMat << G4endl; + + // Testing Density + G4double HeartDensity = logicHeart->GetMaterial()->GetDensity(); + G4cout << "Density of Material = " << HeartDensity*cm3/g << " g/cm^3" << G4endl; + + // Testing Mass + G4double HeartMass = (HeartVol)*HeartDensity; + G4cout << "Mass of Heart = " << HeartMass/gram << " g" << G4endl; + + + return physHeart; +} diff --git a/examples/advanced/human_phantom/src/G4MIRDKidney.cc b/examples/advanced/human_phantom/src/G4MIRDKidney.cc new file mode 100644 index 0000000000..b7d6c81e90 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4MIRDKidney.cc @@ -0,0 +1,142 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// + +#include "G4MIRDKidney.hh" + +#include "globals.hh" +#include "G4SDManager.hh" +#include "G4VisAttributes.hh" +#include "G4HumanPhantomMaterial.hh" +#include "G4SDManager.hh" +#include "G4PVPlacement.hh" +#include "G4SubtractionSolid.hh" +#include "G4Ellipsoid.hh" +#include "G4ThreeVector.hh" +#include "G4VPhysicalVolume.hh" +#include "G4RotationMatrix.hh" +#include "G4Material.hh" +#include "G4EllipticalTube.hh" +#include "G4Box.hh" +#include "G4UnionSolid.hh" + +G4MIRDKidney::G4MIRDKidney() +{ +} + +G4MIRDKidney::~G4MIRDKidney() +{ +} + +G4VPhysicalVolume* G4MIRDKidney::ConstructKidney(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + G4cout << "ConstructKidney for " << sex << G4endl; + + G4HumanPhantomMaterial* material = new G4HumanPhantomMaterial(); + G4Material* soft = material -> GetMaterial("soft_tissue"); + delete material; + + G4double ax= 4.05 *cm; + G4double by= 1.53 *cm; + G4double cz= 4.96 *cm; + G4double zcut1 =-4.96 *cm; + G4double zcut2 = 4.96*cm; + + G4VSolid* oneKidney = new G4Ellipsoid("OneKidney",ax, by, cz, + zcut1,zcut2); + + G4double xx = 4.96 * cm; + G4double yy = 20.00*cm; + G4double zz = 20.00*cm; + G4VSolid* subtrKidney = new G4Box("SubtrKidney",xx/2., yy/2., zz/2.); + + G4UnionSolid* unionKidney = new G4UnionSolid("UnionKidney", + oneKidney, + oneKidney,0, + G4ThreeVector(10.36 *cm, + 0.0 * cm, + 0.0 * cm)); + G4SubtractionSolid* kidney = new G4SubtractionSolid("Kidneys", + unionKidney, + subtrKidney, + 0, + G4ThreeVector(5.18 *cm, + 0.0 *cm, + 0.0 * cm)); + + G4LogicalVolume* logicKidney = new G4LogicalVolume(kidney, + soft, + "KidneyVolume", + 0, 0, 0); + + G4VPhysicalVolume* physKidney = new G4PVPlacement(0 ,G4ThreeVector(-5.18*cm, + 5.88 *cm, + -2.25 *cm), + "physicalKidney", logicKidney, + mother, + false, + 0, true); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicKidney->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* KidneyVisAtt = new G4VisAttributes(G4Colour(0.72,0.52,0.04)); + KidneyVisAtt->SetForceSolid(true); + logicKidney->SetVisAttributes(KidneyVisAtt); + + G4cout << "Kidney created !!!!!!" << G4endl; + + // Testing Kidney Volume + G4double KidneyVol = logicKidney->GetSolid()->GetCubicVolume(); + G4cout << "Volume of Kidney = " << KidneyVol/cm3 << " cm^3" << G4endl; + + // Testing Kidney Material + G4String KidneyMat = logicKidney->GetMaterial()->GetName(); + G4cout << "Material of Kidney = " << KidneyMat << G4endl; + + // Testing Density + G4double KidneyDensity = logicKidney->GetMaterial()->GetDensity(); + G4cout << "Density of Material = " << KidneyDensity*cm3/g << " g/cm^3" << G4endl; + + // Testing Mass + G4double KidneyMass = (KidneyVol)*KidneyDensity; + G4cout << "Mass of Kidney = " << KidneyMass/gram << " g" << G4endl; + + + return physKidney; +} diff --git a/examples/advanced/human_phantom/src/G4MIRDLegBone.cc b/examples/advanced/human_phantom/src/G4MIRDLegBone.cc new file mode 100644 index 0000000000..d45d5b30c4 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4MIRDLegBone.cc @@ -0,0 +1,139 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// + +#include "G4MIRDLegBone.hh" + +#include "globals.hh" +#include "G4SDManager.hh" +#include "G4VisAttributes.hh" +#include "G4HumanPhantomMaterial.hh" +#include "G4EllipticalTube.hh" +#include "G4RotationMatrix.hh" +#include "G4ThreeVector.hh" +#include "G4VPhysicalVolume.hh" +#include "G4PVPlacement.hh" +#include "G4Cons.hh" +#include "G4UnionSolid.hh" + +G4MIRDLegBone::G4MIRDLegBone() +{ +} + +G4MIRDLegBone::~G4MIRDLegBone() +{ +} + +G4VPhysicalVolume* G4MIRDLegBone::ConstructLegBone(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + + G4HumanPhantomMaterial* material = new G4HumanPhantomMaterial(); + + G4cout << "ConstructArmBone for "<< sex < GetMaterial("skeleton"); + + delete material; + + G4double dz = 76. * cm; + G4double rmin1 = 0.0 * cm; + G4double rmin2 = 0.0 * cm; + G4double rmax1 = 1.0 * cm; + G4double rmax2 = 2.0 * cm; + G4double startphi = 0 * degree; + G4double deltaphi = 360 * degree; + + G4Cons* leg_bone = new G4Cons("OneLegBone", + rmin1, rmax1, + rmin2, rmax2, dz/2., + startphi, deltaphi); + + G4RotationMatrix* rm_relative = new G4RotationMatrix(); + rm_relative -> rotateY(-12.5 * degree); + + G4UnionSolid* legs_bones = new G4UnionSolid("LegBone", + leg_bone, leg_bone, + rm_relative, + G4ThreeVector(10.* cm, 0.0,-0.95 * cm)); + + + G4LogicalVolume* logicLegBone = new G4LogicalVolume(legs_bones, skeleton,"LegBoneVolume", + 0, 0, 0); + + + G4RotationMatrix* rm = new G4RotationMatrix(); + rm -> rotateY(6.25 * degree); + + + // Define rotation and position here! + G4VPhysicalVolume* physLegBone = new G4PVPlacement(rm, + G4ThreeVector(-5.0 * cm, 0.0, 0.0), + "physicalLegBone", + logicLegBone, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicLegBone->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* LegBoneVisAtt = new G4VisAttributes(G4Colour(0.46,0.53,0.6)); + LegBoneVisAtt->SetForceSolid(true); + logicLegBone->SetVisAttributes(LegBoneVisAtt); + + G4cout << "LegBone created !!!!!!" << G4endl; + + // Testing LegBone Volume + G4double LegBoneVol = logicLegBone->GetSolid()->GetCubicVolume(); + G4cout << "Volume of LegBone = " << LegBoneVol/cm3 << " cm^3" << G4endl; + + // Testing LegBone Material + G4String LegBoneMat = logicLegBone->GetMaterial()->GetName(); + G4cout << "Material of LegBone = " << LegBoneMat << G4endl; + + // Testing Density + G4double LegBoneDensity = logicLegBone->GetMaterial()->GetDensity(); + G4cout << "Density of Material = " << LegBoneDensity*cm3/g << " g/cm^3" << G4endl; + + // Testing Mass + G4double LegBoneMass = (LegBoneVol)*LegBoneDensity; + G4cout << "Mass of LegBone = " << LegBoneMass/gram << " g" << G4endl; + + + return physLegBone; +} diff --git a/examples/advanced/human_phantom/src/G4MIRDLegs.cc b/examples/advanced/human_phantom/src/G4MIRDLegs.cc new file mode 100644 index 0000000000..c55a233872 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4MIRDLegs.cc @@ -0,0 +1,137 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4MIRDLegs.hh" + +#include "globals.hh" + +#include "G4SDManager.hh" +#include "G4Cons.hh" + +#include "G4VisAttributes.hh" +#include "G4HumanPhantomMaterial.hh" +#include "G4EllipticalTube.hh" +#include "G4ThreeVector.hh" +#include "G4VPhysicalVolume.hh" +#include "G4RotationMatrix.hh" +#include "G4LogicalVolume.hh" +#include "G4PVPlacement.hh" +#include "G4IntersectionSolid.hh" + +G4MIRDLegs::G4MIRDLegs() +{ +} + +G4MIRDLegs::~G4MIRDLegs() +{ +} + +G4VPhysicalVolume* G4MIRDLegs::ConstructLegs(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + + G4cout << "ConstructLegs for "< GetMaterial("soft_tissue"); + + G4double rmin1 = 0.* cm; + G4double rmin2 = 0.* cm; + G4double dz= 78.0 * cm; + G4double rmax1= 4.0 * cm; + G4double rmax2= 17.25 * cm; + G4double startphi= 0.* degree; + G4double deltaphi= 360. * degree; + + G4Cons* leg1 = new G4Cons("Leg1", + rmin1, rmax1, + rmin2, rmax2, dz/2., + startphi, deltaphi); + + G4double dxx = 17.25 * cm; + G4double dyy = 9.80 * cm; + G4double dzz = 78. * cm; + + G4EllipticalTube* trunk1 = new G4EllipticalTube("Trunk_Leg", dxx, dyy, dzz); + + G4IntersectionSolid* intersection = new G4IntersectionSolid("Legs", + leg1, trunk1); + + G4LogicalVolume* logicLegs = new G4LogicalVolume(intersection, + soft, + "LegsVolume", + 0, 0, 0); + + G4RotationMatrix* rm = new G4RotationMatrix(); + rm -> rotateX(90.* degree); + + G4VPhysicalVolume* physLegs = new G4PVPlacement(rm, + G4ThreeVector(0. * cm, -39.00001 * cm, 0. *cm), + "physicalLegs", + logicLegs, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity == true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicLegs->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* LegsVisAtt = new G4VisAttributes(G4Colour(0.94,0.5,0.5)); + LegsVisAtt->SetForceSolid(false); + logicLegs->SetVisAttributes(LegsVisAtt); + + G4cout << "Legs created !!!!!!" << G4endl; + + // Testing Legs Volume + G4double LegsVol = logicLegs->GetSolid()->GetCubicVolume(); + G4cout << "Volume of Legs = " << LegsVol/cm3 << " cm^3" << G4endl; + + // Testing Legs Material + G4String LegsMat = logicLegs->GetMaterial()->GetName(); + G4cout << "Material of Legs = " << LegsMat << G4endl; + + // Testing Density + G4double LegsDensity = logicLegs->GetMaterial()->GetDensity(); + G4cout << "Density of Material = " << LegsDensity*cm3/g << " g/cm^3" << G4endl; + + // Testing Mass + G4double LegsMass = (LegsVol)*LegsDensity; + G4cout << "Mass of Legs = " << LegsMass/gram << " g" << G4endl; + + + return physLegs; +} diff --git a/examples/advanced/human_phantom/src/G4MIRDLiver.cc b/examples/advanced/human_phantom/src/G4MIRDLiver.cc new file mode 100644 index 0000000000..e0c2e7044b --- /dev/null +++ b/examples/advanced/human_phantom/src/G4MIRDLiver.cc @@ -0,0 +1,143 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4MIRDLiver.hh" + +#include "globals.hh" + +#include "G4SDManager.hh" + +#include "G4VisAttributes.hh" +#include "G4HumanPhantomMaterial.hh" +#include "G4SDManager.hh" +#include "G4PVPlacement.hh" +#include "G4SubtractionSolid.hh" +#include "G4Ellipsoid.hh" +#include "G4ThreeVector.hh" +#include "G4VPhysicalVolume.hh" +#include "G4RotationMatrix.hh" +#include "G4Material.hh" +#include "G4EllipticalTube.hh" +#include "G4Box.hh" + +G4MIRDLiver::G4MIRDLiver() +{ +} + +G4MIRDLiver::~G4MIRDLiver() +{ + +} + +G4VPhysicalVolume* G4MIRDLiver::ConstructLiver(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + G4cout << "ConstructLiver for " << sex << G4endl; + + G4HumanPhantomMaterial* material = new G4HumanPhantomMaterial(); + G4Material* soft = material -> GetMaterial("soft_tissue"); + delete material; + + G4double dx= 14.19 *cm; + G4double dy= 7.84 *cm; + G4double dz= 7.21* cm; + + //G4double dx = 16.5 * cm; + //G4double dy = 8. *cm; + //G4double dz = 8. *cm; + G4EllipticalTube* firstLiver = new G4EllipticalTube("FirstLiver",dx, dy, dz); + + G4double xx = 20.00 * cm; + G4double yy = 50.00 * cm; + G4double zz = 50.00 *cm; + + G4Box* subtrLiver = new G4Box("SubtrLiver", xx/2., yy/2., zz/2.); + + G4RotationMatrix* rm_relative = new G4RotationMatrix(); + rm_relative -> rotateY(32.* degree); + rm_relative -> rotateZ(40.9* degree); + + + G4SubtractionSolid* liver = new G4SubtractionSolid("Liver", + firstLiver,subtrLiver, + rm_relative, + G4ThreeVector(10.0*cm,0.0*cm,0.0 *cm)); + + + G4LogicalVolume* logicLiver = new G4LogicalVolume(liver, + soft, + "LiverVolume", + 0, 0, 0); + + G4RotationMatrix* rm = new G4RotationMatrix(); + rm -> rotateX(180.* degree); + + // Define rotation and position here! + G4VPhysicalVolume* physLiver = new G4PVPlacement(rm,G4ThreeVector(0. *cm,0. *cm,0.*cm), + "physicalLiver", + logicLiver, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicLiver->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* LiverVisAtt = new G4VisAttributes(G4Colour(2.0,2.0,0.0)); + LiverVisAtt->SetForceSolid(true); + logicLiver->SetVisAttributes(LiverVisAtt); + + G4cout << "Liver created !!!!!!" << G4endl; + + // Testing Liver Volume + G4double LiverVol = logicLiver->GetSolid()->GetCubicVolume(); + G4cout << "Volume of Liver = " << LiverVol/cm3 << " cm^3" << G4endl; + + // Testing Liver Material + G4String LiverMat = logicLiver->GetMaterial()->GetName(); + G4cout << "Material of Liver = " << LiverMat << G4endl; + + // Testing Density + G4double LiverDensity = logicLiver->GetMaterial()->GetDensity(); + G4cout << "Density of Material = " << LiverDensity*cm3/g << " g/cm^3" << G4endl; + + // Testing Mass + G4double LiverMass = (LiverVol)*LiverDensity; + G4cout << "Mass of Liver = " << LiverMass/gram << " g" << G4endl; + + return physLiver; +} diff --git a/examples/advanced/human_phantom/src/G4MIRDLowerLargeIntestine.cc b/examples/advanced/human_phantom/src/G4MIRDLowerLargeIntestine.cc new file mode 100644 index 0000000000..3694aecd01 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4MIRDLowerLargeIntestine.cc @@ -0,0 +1,151 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4MIRDLowerLargeIntestine.hh" +#include "globals.hh" +#include "G4SDManager.hh" +#include "G4VisAttributes.hh" +#include "G4EllipticalTube.hh" +#include "G4UnionSolid.hh" +#include "G4RotationMatrix.hh" +#include "G4ThreeVector.hh" +#include "G4VPhysicalVolume.hh" +#include "G4PVPlacement.hh" +#include "G4LogicalVolume.hh" +#include "G4Torus.hh" +#include "G4HumanPhantomMaterial.hh" + +G4MIRDLowerLargeIntestine::G4MIRDLowerLargeIntestine() +{ +} + +G4MIRDLowerLargeIntestine::~G4MIRDLowerLargeIntestine() +{ + +} + +G4VPhysicalVolume* G4MIRDLowerLargeIntestine::ConstructLowerLargeIntestine(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + G4cout << "ConstructLowerLargeIntestine for " << sex << G4endl; + + G4HumanPhantomMaterial* material = new G4HumanPhantomMaterial(); + G4Material* soft = material -> GetMaterial("soft_tissue"); + delete material; + + G4double dx = 1.62 * cm; + G4double dy = 2.09 *cm; + G4double dz = 6.885 *cm; + + G4EllipticalTube* DescendingColonLowerLargeIntestine = new G4EllipticalTube("DiscendingColon",dx, dy, dz); + + + G4double rmin= 0.0 *cm; + G4double rmax = 1.62 * cm; + G4double rtor= 5.16*cm; + G4double startphi= 0. * degree; + G4double deltaphi= 90. * degree; + + G4Torus* SigmoidColonUpLowerLargeIntestine = new G4Torus("SigmoidColonUpLowerLargeIntestine", + rmin, rmax,rtor, + startphi, deltaphi); + + rtor = 2.70 * cm; + G4VSolid* SigmoidColonDownLowerLargeIntestine = new G4Torus("SigmoidColonDownLowerLargeIntestine", + rmin, rmax, + rtor,startphi,deltaphi); + + G4RotationMatrix* relative_rm = new G4RotationMatrix(); + relative_rm -> rotateY(180. * degree); + relative_rm -> rotateZ(90. * degree); + + G4UnionSolid* SigmoidColonLowerLargeIntestine = new G4UnionSolid( "SigmoidColonLowerLargeIntestine", + SigmoidColonUpLowerLargeIntestine, + SigmoidColonDownLowerLargeIntestine, + relative_rm, + G4ThreeVector(0.0,7.85*cm,0.0)); + + G4RotationMatrix* relative_rm_2 = new G4RotationMatrix(); + relative_rm_2 -> rotateX(90. * degree); + + G4UnionSolid* LowerLargeIntestine = new G4UnionSolid( "LowerLargeIntestine", + DescendingColonLowerLargeIntestine, + SigmoidColonLowerLargeIntestine, + relative_rm_2, + G4ThreeVector(-5.16*cm,0.0*cm, -6.885*cm) + ); + + + G4LogicalVolume* logicLowerLargeIntestine = new G4LogicalVolume( LowerLargeIntestine, soft, + "LowerLargeIntestineVolume", + 0, 0, 0); + + G4VPhysicalVolume* physLowerLargeIntestine = new G4PVPlacement(0, + G4ThreeVector(7.86*cm, -2.31*cm,-16.79 *cm), + "physicalLowerLargeIntestine", + logicLowerLargeIntestine, + mother, + false, + 0); + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicLowerLargeIntestine->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* LowerLargeIntestineVisAtt = new G4VisAttributes(G4Colour(1.0,1.0,0.0)); + LowerLargeIntestineVisAtt->SetForceSolid(true); + logicLowerLargeIntestine->SetVisAttributes(LowerLargeIntestineVisAtt); + + G4cout << "LowerLargeIntestine created !!!!!!" << G4endl; + + // Testing LowerLargeIntestine Volume + G4double LowerLargeIntestineVol = logicLowerLargeIntestine->GetSolid()->GetCubicVolume(); + G4cout << "Volume of LowerLargeIntestine = " << LowerLargeIntestineVol/cm3 << " cm^3" << G4endl; + + // Testing LowerLargeIntestine Material + G4String LowerLargeIntestineMat = logicLowerLargeIntestine->GetMaterial()->GetName(); + G4cout << "Material of LowerLargeIntestine = " << LowerLargeIntestineMat << G4endl; + + // Testing Density + G4double LowerLargeIntestineDensity = logicLowerLargeIntestine->GetMaterial()->GetDensity(); + G4cout << "Density of Material = " << LowerLargeIntestineDensity*cm3/g << " g/cm^3" << G4endl; + + // Testing Mass + G4double LowerLargeIntestineMass = (LowerLargeIntestineVol)*LowerLargeIntestineDensity; + G4cout << "Mass of LowerLargeIntestine = " << LowerLargeIntestineMass/gram << " g" << G4endl; + + + return physLowerLargeIntestine; +} diff --git a/examples/advanced/human_phantom/src/G4MIRDLung.cc b/examples/advanced/human_phantom/src/G4MIRDLung.cc new file mode 100644 index 0000000000..22dbfe9d77 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4MIRDLung.cc @@ -0,0 +1,131 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4MIRDLung.hh" +#include "globals.hh" +#include "G4SDManager.hh" +#include "G4VisAttributes.hh" +#include "G4Ellipsoid.hh" +#include "G4ThreeVector.hh" +#include "G4VPhysicalVolume.hh" +#include "G4RotationMatrix.hh" +#include "G4Material.hh" +#include "G4LogicalVolume.hh" +#include "G4HumanPhantomMaterial.hh" +#include "G4VPhysicalVolume.hh" +#include "G4PVPlacement.hh" +#include "G4UnionSolid.hh" +#include "G4SubtractionSolid.hh" + +G4MIRDLung::G4MIRDLung() +{ +} + +G4MIRDLung::~G4MIRDLung() +{ + +} + +G4VPhysicalVolume* G4MIRDLung::ConstructLung(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + + G4cout << "ConstructLungs for " << sex << G4endl; + + G4HumanPhantomMaterial* material = new G4HumanPhantomMaterial(); + G4Material* lung_material = material -> GetMaterial("lung_material"); + delete material; + + G4double ax = 4.09 *cm; + G4double by = 6.98 *cm; + G4double cz = 20.55*cm; + G4double zcut1 = 0.0 *cm; + G4double zcut2=20.55 *cm; + + G4Ellipsoid* oneLung = new G4Ellipsoid("OneLung",ax, by, cz, zcut1,zcut2); + + ax= 5.0*cm; + by= 7.0*cm; + cz= 20.55*cm; + + G4Ellipsoid* subtrLung = new G4Ellipsoid("subtrLung",ax, by, cz); + + G4UnionSolid* lung1 = new G4UnionSolid("Lung1", oneLung, oneLung,0, + G4ThreeVector(14.66*cm, 0.0*cm,0.*cm)); + + G4SubtractionSolid* lung = new G4SubtractionSolid("Lung", lung1, + subtrLung, + 0, G4ThreeVector(7.50*cm,-4.0*cm,0.0)); + + G4LogicalVolume* logicLung = new G4LogicalVolume(lung,lung_material, + "LungVolume", 0, 0, 0); + + + G4VPhysicalVolume* physLung = new G4PVPlacement(0,G4ThreeVector(-7.33 *cm, 0.0*cm, 7.66*cm), + "physicalLung", + logicLung, + mother, + false, + 0, true); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicLung->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* LungVisAtt = new G4VisAttributes(G4Colour(0.25,0.41,0.88)); + LungVisAtt->SetForceSolid(true); + logicLung->SetVisAttributes(LungVisAtt); + + G4cout << "Lung created !!!!!!" << G4endl; + + // Testing Lung Volume + G4double LungVol = logicLung->GetSolid()->GetCubicVolume(); + G4cout << "Volume of Lung = " << LungVol/cm3 << " cm^3" << G4endl; + + // Testing Lung Material + G4String LungMat = logicLung->GetMaterial()->GetName(); + G4cout << "Material of Lung = " << LungMat << G4endl; + + // Testing Density + G4double LungDensity = logicLung->GetMaterial()->GetDensity(); + G4cout << "Density of Material = " << LungDensity*cm3/g << " g/cm^3" << G4endl; + + // Testing Mass + G4double LungMass = (LungVol)*LungDensity; + G4cout << "Mass of Lung = " << LungMass/gram << " g" << G4endl; + + return physLung; +} diff --git a/examples/advanced/human_phantom/src/G4MIRDMiddleLowerSpine.cc b/examples/advanced/human_phantom/src/G4MIRDMiddleLowerSpine.cc new file mode 100644 index 0000000000..b0392383f1 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4MIRDMiddleLowerSpine.cc @@ -0,0 +1,126 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4MIRDMiddleLowerSpine.hh" +#include "globals.hh" +#include "G4SDManager.hh" +#include "G4VisAttributes.hh" +#include "G4HumanPhantomMaterial.hh" +#include "G4EllipticalTube.hh" +#include "G4RotationMatrix.hh" +#include "G4ThreeVector.hh" +#include "G4VPhysicalVolume.hh" +#include "G4PVPlacement.hh" +#include "G4UnionSolid.hh" + +G4MIRDMiddleLowerSpine::G4MIRDMiddleLowerSpine() +{ +} + +G4MIRDMiddleLowerSpine::~G4MIRDMiddleLowerSpine() +{ +} + +G4VPhysicalVolume* G4MIRDMiddleLowerSpine::ConstructMiddleLowerSpine(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + G4HumanPhantomMaterial* material = new G4HumanPhantomMaterial(); + + G4cout << "ConstructMiddleLowerSpine for "<< sex < GetMaterial("skeleton"); + + delete material; + + G4double dx = 1.73 *cm; + G4double dy = 2.45 *cm; + G4double dz = 15.645 *cm; + + G4VSolid* midSpine = new G4EllipticalTube("MiddleSpine",dx, dy, dz); + + dx = 1.73 *cm; + dy = 2.45 *cm; + dz = 5.905 *cm; + + G4VSolid* lowSpine = new G4EllipticalTube("LowSpine",dx, dy, dz); + + G4UnionSolid* middleLowerSpine = new G4UnionSolid("MiddleLowerSpine", + midSpine, + lowSpine, + 0, + G4ThreeVector(0.0, 0.0, -21.56 * cm) + ); + + G4LogicalVolume* logicMiddleLowerSpine = new G4LogicalVolume( middleLowerSpine, skeleton, + "MiddleLowerSpineVolume", + 0, 0, 0); + // Define rotation and position here! + G4VPhysicalVolume* physMiddleLowerSpine = new G4PVPlacement(0,G4ThreeVector(0.0 *cm, 5.39 * cm,15.905 * cm), + "physicalMiddleLowerSpine", + logicMiddleLowerSpine, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicMiddleLowerSpine->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* MiddleLowerSpineVisAtt = new G4VisAttributes(G4Colour(0.46,0.53,0.6)); + MiddleLowerSpineVisAtt->SetForceSolid(true); + logicMiddleLowerSpine->SetVisAttributes(MiddleLowerSpineVisAtt); + + G4cout << "MiddleLowerSpine created !!!!!!" << G4endl; + + // Testing MiddleLowerSpine Volume + G4double MiddleLowerSpineVol = logicMiddleLowerSpine->GetSolid()->GetCubicVolume(); + G4cout << "Volume of MiddleLowerSpine = " << MiddleLowerSpineVol/cm3 << " cm^3" << G4endl; + + // Testing MiddleLowerSpine Material + G4String MiddleLowerSpineMat = logicMiddleLowerSpine->GetMaterial()->GetName(); + G4cout << "Material of MiddleLowerSpine = " << MiddleLowerSpineMat << G4endl; + + // Testing Density + G4double MiddleLowerSpineDensity = logicMiddleLowerSpine->GetMaterial()->GetDensity(); + G4cout << "Density of Material = " << MiddleLowerSpineDensity*cm3/g << " g/cm^3" << G4endl; + + // Testing Mass + G4double MiddleLowerSpineMass = (MiddleLowerSpineVol)*MiddleLowerSpineDensity; + G4cout << "Mass of MiddleLowerSpine = " << MiddleLowerSpineMass/gram << " g" << G4endl; + + + return physMiddleLowerSpine; +} diff --git a/examples/advanced/human_phantom/src/G4MIRDOvary.cc b/examples/advanced/human_phantom/src/G4MIRDOvary.cc new file mode 100644 index 0000000000..746c920ded --- /dev/null +++ b/examples/advanced/human_phantom/src/G4MIRDOvary.cc @@ -0,0 +1,130 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4MIRDOvary.hh" +#include "G4SDManager.hh" + +#include "globals.hh" + +#include "G4VisAttributes.hh" +#include "G4Ellipsoid.hh" +#include "G4ThreeVector.hh" +#include "G4VPhysicalVolume.hh" +#include "G4RotationMatrix.hh" +#include "G4Material.hh" +#include "G4LogicalVolume.hh" +#include "G4HumanPhantomMaterial.hh" +#include "G4VPhysicalVolume.hh" +#include "G4PVPlacement.hh" +#include "G4UnionSolid.hh" + +G4MIRDOvary::G4MIRDOvary() +{ +} + +G4MIRDOvary::~G4MIRDOvary() +{ + +} + +G4VPhysicalVolume* G4MIRDOvary::ConstructOvary(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + G4cout << "ConstructOvary for " << sex << G4endl; + + G4HumanPhantomMaterial* material = new G4HumanPhantomMaterial(); + G4Material* soft = material -> GetMaterial("soft_tissue"); + delete material; + + G4double ax= 1.17 *cm; + G4double by= 0.58*cm; + G4double cz= 1.80*cm; + G4double zcut1=-1.80*cm; + G4double zcut2= 1.80*cm; + + G4Ellipsoid* OneOvary = new G4Ellipsoid("OneOvary", + ax, by, cz, + zcut1, zcut2); + + G4UnionSolid* Ovary = new G4UnionSolid("Ovary", OneOvary, + OneOvary,0, + G4ThreeVector(10.36*cm, + 0.0*cm, + 0.0*cm)); + + + G4LogicalVolume* logicOvary = new G4LogicalVolume(Ovary, + soft, + "OvaryVolume", + 0, 0, 0); + + // Define rotation and position here! + G4VPhysicalVolume* physOvary = new G4PVPlacement(0, + G4ThreeVector(-5.18 *cm,0.0*cm, -18.03*cm), + "physicalOvary", + logicOvary, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicOvary->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* OvaryVisAtt = new G4VisAttributes(G4Colour(0.85,0.44,0.84)); + OvaryVisAtt->SetForceSolid(true); + logicOvary->SetVisAttributes(OvaryVisAtt); + + G4cout << "Ovary created !!!!!!" << G4endl; + + // Testing Ovary Volume + G4double OvaryVol = logicOvary->GetSolid()->GetCubicVolume(); + G4cout << "Volume of Ovary = " << OvaryVol/cm3 << " cm^3" << G4endl; + + // Testing Ovary Material + G4String OvaryMat = logicOvary->GetMaterial()->GetName(); + G4cout << "Material of Ovary = " << OvaryMat << G4endl; + + // Testing Density + G4double OvaryDensity = logicOvary->GetMaterial()->GetDensity(); + G4cout << "Density of Material = " << OvaryDensity*cm3/g << " g/cm^3" << G4endl; + + // Testing Mass + G4double OvaryMass = (OvaryVol)*OvaryDensity; + G4cout << "Mass of Ovary = " << OvaryMass/gram << " g" << G4endl; + + return physOvary; +} diff --git a/examples/advanced/human_phantom/src/G4MIRDPancreas.cc b/examples/advanced/human_phantom/src/G4MIRDPancreas.cc new file mode 100644 index 0000000000..c66139a57a --- /dev/null +++ b/examples/advanced/human_phantom/src/G4MIRDPancreas.cc @@ -0,0 +1,135 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4MIRDPancreas.hh" + +#include "globals.hh" +#include "G4SDManager.hh" +#include "G4VisAttributes.hh" +#include "G4Ellipsoid.hh" +#include "G4ThreeVector.hh" +#include "G4VPhysicalVolume.hh" +#include "G4RotationMatrix.hh" +#include "G4Material.hh" +#include "G4LogicalVolume.hh" +#include "G4HumanPhantomMaterial.hh" +#include "G4VPhysicalVolume.hh" +#include "G4PVPlacement.hh" +#include "G4Box.hh" +#include "G4SubtractionSolid.hh" + +G4MIRDPancreas::G4MIRDPancreas() +{ +} + +G4MIRDPancreas::~G4MIRDPancreas() +{ + +} + +G4VPhysicalVolume* G4MIRDPancreas::ConstructPancreas(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + + G4cout << "ConstructPancreas for " << sex << G4endl; + + G4HumanPhantomMaterial* material = new G4HumanPhantomMaterial(); + G4Material* soft = material -> GetMaterial("soft_tissue"); + delete material; + + G4double ax= 2.87*cm; + G4double by= 1.14*cm; + G4double cz= 13.32*cm; + G4double zcut1= -13.32 *cm; + G4double zcut2= 0.0 *cm; + + G4Ellipsoid* pancreasFirst = new G4Ellipsoid("PancreasFirst",ax, by, cz, + zcut1, zcut2); + + G4double xx = 5.74 * cm; + G4double yy = 2.30 * cm; + G4double zz = 10.71 * cm; + G4Box* subtrPancreas = new G4Box("SubtrPancreas",xx/2., yy/2., zz/2.); + + G4SubtractionSolid* pancreas = new G4SubtractionSolid("pancreas", + pancreasFirst, + subtrPancreas, + 0, + G4ThreeVector(-2.87 * cm,0.0,-8.685*cm)); + + G4LogicalVolume* logicPancreas = new G4LogicalVolume(pancreas, soft, + "PancreasVolume", + 0, 0, 0); + G4RotationMatrix* rotation = new G4RotationMatrix(); + rotation ->rotateY(90. * degree); + + + G4VPhysicalVolume* physPancreas = new G4PVPlacement(rotation, + G4ThreeVector(-0.72 *cm, 0.0, 1.8*cm), + "physicalPancreas", + logicPancreas, + mother, + false, + 0); + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicPancreas->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* PancreasVisAtt = new G4VisAttributes(G4Colour(0.28,0.82,0.8)); + PancreasVisAtt->SetForceSolid(true); + logicPancreas->SetVisAttributes(PancreasVisAtt); + + G4cout << "Pancreas created !!!!!!" << G4endl; + + // Testing Pancreas Volume + G4double PancreasVol = logicPancreas->GetSolid()->GetCubicVolume(); + G4cout << "Volume of Pancreas = " << PancreasVol/cm3 << " cm^3" << G4endl; + + // Testing Pancreas Material + G4String PancreasMat = logicPancreas->GetMaterial()->GetName(); + G4cout << "Material of Pancreas = " << PancreasMat << G4endl; + + // Testing Density + G4double PancreasDensity = logicPancreas->GetMaterial()->GetDensity(); + G4cout << "Density of Material = " << PancreasDensity*cm3/g << " g/cm^3" << G4endl; + + // Testing Mass + G4double PancreasMass = (PancreasVol)*PancreasDensity; + G4cout << "Mass of Pancreas = " << PancreasMass/gram << " g" << G4endl; + + + return physPancreas; +} diff --git a/examples/advanced/human_phantom/src/G4MIRDPelvis.cc b/examples/advanced/human_phantom/src/G4MIRDPelvis.cc new file mode 100644 index 0000000000..f2b06b24ef --- /dev/null +++ b/examples/advanced/human_phantom/src/G4MIRDPelvis.cc @@ -0,0 +1,147 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4MIRDPelvis.hh" + +#include "globals.hh" +#include "G4SDManager.hh" +#include "G4VisAttributes.hh" +#include "G4HumanPhantomMaterial.hh" +#include "G4EllipticalTube.hh" +#include "G4RotationMatrix.hh" +#include "G4ThreeVector.hh" +#include "G4VPhysicalVolume.hh" +#include "G4PVPlacement.hh" +#include "G4SubtractionSolid.hh" +#include "G4Box.hh" +#include "G4VSolid.hh" +#include "G4LogicalVolume.hh" + +G4MIRDPelvis::G4MIRDPelvis() +{ +} + +G4MIRDPelvis::~G4MIRDPelvis() +{ + +} + +G4VPhysicalVolume* G4MIRDPelvis::ConstructPelvis(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + G4HumanPhantomMaterial* material = new G4HumanPhantomMaterial(); + + G4cout << "ConstructMiddleLowerSpine for "<< sex < GetMaterial("skeleton"); + + delete material; + + G4double dx= 10.35 *cm; + G4double dy= 11.76 * cm; + G4double dz= 9.915 * cm; + + G4VSolid* outPelvis = new G4EllipticalTube("OutPelvis",dx, dy, dz); + + dx = 9.75 * cm; + dy = 11.07* cm; + dz = 10.0 *cm; + + G4VSolid* inPelvis = new G4EllipticalTube("InPelvis",dx, dy, dz); + + G4double x = 20.71 * cm; + G4double y = 23.52 * cm; + G4double z = 19.84 *cm; + + G4VSolid* subPelvis = new G4Box("SubtrPelvis", x/2., y/2., z/2.); + + G4SubtractionSolid* firstPelvis = new G4SubtractionSolid("FirstPelvis", + outPelvis, + inPelvis); + + + G4SubtractionSolid* secondPelvis = new G4SubtractionSolid("SecondPelvis", + firstPelvis, + subPelvis, 0, + G4ThreeVector(0.0, + 14.70 * cm, -8.21 *cm)); + + G4SubtractionSolid* pelvis = new G4SubtractionSolid("Pelvis", secondPelvis, subPelvis, + 0, + G4ThreeVector(0.0, + -11.76 * cm, 0.0)); + + + G4LogicalVolume* logicPelvis = new G4LogicalVolume(pelvis, skeleton, + "PelvisVolume", 0, 0, 0); + + + G4VPhysicalVolume* physPelvis = new G4PVPlacement(0,G4ThreeVector(0.0, -2.94 * cm,-21.635 * cm), + "physicalPelvis", + logicPelvis, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicPelvis->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* PelvisVisAtt = new G4VisAttributes(G4Colour(0.46,0.53,0.6)); + PelvisVisAtt->SetForceSolid(false); + logicPelvis->SetVisAttributes(PelvisVisAtt); + + G4cout << "Pelvis created !!!!!!" << G4endl; + + // Testing Pelvis Volume + G4double PelvisVol = logicPelvis->GetSolid()->GetCubicVolume(); + G4cout << "Volume of Pelvis = " << PelvisVol/cm3 << " cm^3" << G4endl; + + // Testing Pelvis Material + G4String PelvisMat = logicPelvis->GetMaterial()->GetName(); + G4cout << "Material of Pelvis = " << PelvisMat << G4endl; + + // Testing Density + G4double PelvisDensity = logicPelvis->GetMaterial()->GetDensity(); + G4cout << "Density of Material = " << PelvisDensity*cm3/g << " g/cm^3" << G4endl; + + // Testing Mass + G4double PelvisMass = (PelvisVol)*PelvisDensity; + G4cout << "Mass of Pelvis = " << PelvisMass/gram << " g" << G4endl; + + + return physPelvis; +} diff --git a/examples/advanced/human_phantom/src/G4MIRDRibCage.cc b/examples/advanced/human_phantom/src/G4MIRDRibCage.cc new file mode 100644 index 0000000000..371307a2d8 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4MIRDRibCage.cc @@ -0,0 +1,90 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4MIRDRibCage.hh" + +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" +#include "G4VisAttributes.hh" + +G4MIRDRibCage::G4MIRDRibCage() +{ +} + +G4MIRDRibCage::~G4MIRDRibCage() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4MIRDRibCage::ConstructRibCage(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/MIRDRibCage.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + + G4LogicalVolume* logicRibCage = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("RibCageVolume"); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("RibCagePos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("RibCageRot"); + + // Define rotation and position here! + G4VPhysicalVolume* physRibCage = new G4PVPlacement(rm,position, + "physicalRibCage", + logicRibCage, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicRibCage->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* RibCageVisAtt = new G4VisAttributes(G4Colour(1.0,1.0,0.0)); + RibCageVisAtt->SetForceSolid(true); + logicRibCage->SetVisAttributes(RibCageVisAtt); + + G4cout << "RibCage created !!!!!!" << G4endl; + + return physRibCage; +} diff --git a/examples/advanced/human_phantom/src/G4MIRDSkull.cc b/examples/advanced/human_phantom/src/G4MIRDSkull.cc new file mode 100644 index 0000000000..64b7245971 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4MIRDSkull.cc @@ -0,0 +1,168 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4MIRDSkull.hh" +#include "globals.hh" +#include "G4SDManager.hh" +#include "G4VisAttributes.hh" +#include "G4HumanPhantomMaterial.hh" +#include "G4EllipticalTube.hh" +#include "G4RotationMatrix.hh" +#include "G4ThreeVector.hh" +#include "G4VPhysicalVolume.hh" +#include "G4PVPlacement.hh" +#include "G4Ellipsoid.hh" +#include "G4SubtractionSolid.hh" +#include "G4Box.hh" +#include "G4UnionSolid.hh" +#include "G4VSolid.hh" + +G4MIRDSkull::G4MIRDSkull() +{ +} + +G4MIRDSkull::~G4MIRDSkull() +{ + +} + +G4VPhysicalVolume* G4MIRDSkull::ConstructSkull(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + + G4HumanPhantomMaterial* material = new G4HumanPhantomMaterial(); + + G4cout << "ConstructSkull for "<< sex < GetMaterial("skeleton"); + + delete material; + + G4double ax = 7.68 * cm; + G4double by = 9.67 * cm; + G4double cz = 6.83 * cm; + G4double zcut1 = -6.83 * cm; + G4double zcut2 = 6.83 * cm; + + G4Ellipsoid* craniumOut = new G4Ellipsoid("CraniumOut", ax, by, cz, zcut1, zcut2); + + ax = 7.18 * cm; + by = 9.17 * cm; + cz= 6.33 * cm; + zcut1 =-6.33 * cm; + zcut2 = 6.33 * cm; + + G4Ellipsoid* craniumIn = new G4Ellipsoid("CraniumIn", ax, by, cz, zcut1, zcut2); + + G4double dx = 6.92 * cm; + G4double dy = 8.91 * cm; + G4double dz = 5.13 * cm; + + G4EllipticalTube* facialSkeletonOut = new G4EllipticalTube("FacialSkeletonOut",dx, dy, dz); + + dx= 5.82 * cm; + dy= 7.81 * cm; + dz= 6.13 * cm; + + G4EllipticalTube* facialSkeletonIn = new G4EllipticalTube("FacialSkeletonIn",dx, dy, dz); + + G4double xx = 14.84 * cm; + G4double yy = 18.82 * cm; + G4double zz = 11.26 * cm; + + G4VSolid* subtr = new G4Box("SubtrFacialSkeleton", xx/2., yy/2., zz/2.); + + G4VSolid* firstFacialSkeleton = new G4SubtractionSolid("SubtrFacialSkeleton", + facialSkeletonOut, + facialSkeletonIn); + + + G4SubtractionSolid* facialSkeleton = new G4SubtractionSolid("FacialSkeleton", + firstFacialSkeleton, + subtr,0, + G4ThreeVector(0.0, 8.91 * cm, 0.0)); + + G4SubtractionSolid* cranium = new G4SubtractionSolid("Cranium", + craniumOut, + craniumIn,0, + G4ThreeVector(0.0, 0.0,-0.6 * cm)); + + G4UnionSolid* skull = new G4UnionSolid("Skull", facialSkeleton, cranium,0, + G4ThreeVector(0.0,0.0,5.13 * cm)); + + G4LogicalVolume* logicSkull = new G4LogicalVolume(skull, skeleton, + "SkullVolume", + 0, 0, 0); + + // Define rotation and position here! + G4VPhysicalVolume* physSkull = new G4PVPlacement(0, + G4ThreeVector(0., 0.,2.875 * cm), + "physicalSkull", + logicSkull, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicSkull->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* SkullVisAtt = new G4VisAttributes(G4Colour(0.46,0.53,0.6)); + SkullVisAtt->SetForceSolid(false); + logicSkull->SetVisAttributes(SkullVisAtt); + + G4cout << "Skull created !!!!!!" << G4endl; + + + // Testing Skull Volume + G4double SkullVol = logicSkull->GetSolid()->GetCubicVolume(); + G4cout << "Volume of Skull = " << SkullVol/cm3 << " cm^3" << G4endl; + + // Testing Skull Material + G4String SkullMat = logicSkull->GetMaterial()->GetName(); + G4cout << "Material of Skull = " << SkullMat << G4endl; + + // Testing Density + G4double SkullDensity = logicSkull->GetMaterial()->GetDensity(); + G4cout << "Density of Material = " << SkullDensity*cm3/g << " g/cm^3" << G4endl; + + // Testing Mass + G4double SkullMass = (SkullVol)*SkullDensity; + G4cout << "Mass of Skull = " << SkullMass/gram << " g" << G4endl; + + + return physSkull; +} diff --git a/examples/advanced/human_phantom/src/G4MIRDSpleen.cc b/examples/advanced/human_phantom/src/G4MIRDSpleen.cc new file mode 100644 index 0000000000..bdba1e9a65 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4MIRDSpleen.cc @@ -0,0 +1,119 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4MIRDSpleen.hh" + +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" +#include "G4VisAttributes.hh" +#include "G4ThreeVector.hh" +#include "G4VPhysicalVolume.hh" +#include "G4RotationMatrix.hh" +#include "G4Material.hh" +#include "G4LogicalVolume.hh" +#include "G4HumanPhantomMaterial.hh" +#include "G4VPhysicalVolume.hh" +#include "G4PVPlacement.hh" +#include "G4Ellipsoid.hh" +G4MIRDSpleen::G4MIRDSpleen() +{ +} + +G4MIRDSpleen::~G4MIRDSpleen() +{ + +} + +G4VPhysicalVolume* G4MIRDSpleen::ConstructSpleen(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + + G4cout << "ConstructSpleen for " << sex << G4endl; + G4HumanPhantomMaterial* material = new G4HumanPhantomMaterial(); + G4Material* soft = material -> GetMaterial("soft_tissue"); + delete material; + + G4double ax= 2.90 *cm; + G4double by= 1.88 *cm; + G4double cz= 5.19 * cm; + + G4Ellipsoid* spleen = new G4Ellipsoid("spleen", ax, by, cz); + + + G4LogicalVolume* logicSpleen = new G4LogicalVolume(spleen, soft, + "SpleenVolume", + 0, 0, 0); + + // Define rotation and position here! + G4VPhysicalVolume* physSpleen = new G4PVPlacement(0, + G4ThreeVector(9.49 *cm, 2.94 *cm, 1.8*cm), + "physicalSpleen", + logicSpleen, + mother, + false, + 0, true); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicSpleen->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* SpleenVisAtt = new G4VisAttributes(G4Colour(0.41,0.41,0.41)); + SpleenVisAtt->SetForceSolid(true); + logicSpleen->SetVisAttributes(SpleenVisAtt); + + G4cout << "Spleen created !!!!!!" << G4endl; + + // Testing Spleen Volume + G4double SpleenVol = logicSpleen->GetSolid()->GetCubicVolume(); + G4cout << "Volume of Spleen = " << SpleenVol/cm3 << " cm^3" << G4endl; + + // Testing Spleen Material + G4String SpleenMat = logicSpleen->GetMaterial()->GetName(); + G4cout << "Material of Spleen = " << SpleenMat << G4endl; + + // Testing Density + G4double SpleenDensity = logicSpleen->GetMaterial()->GetDensity(); + G4cout << "Density of Material = " << SpleenDensity*cm3/g << " g/cm^3" << G4endl; + + // Testing Mass + G4double SpleenMass = (SpleenVol)*SpleenDensity; + G4cout << "Mass of Spleen = " << SpleenMass/gram << " g" << G4endl; + + + + return physSpleen; +} diff --git a/examples/advanced/human_phantom/src/G4MIRDStomach.cc b/examples/advanced/human_phantom/src/G4MIRDStomach.cc new file mode 100644 index 0000000000..c7fe389243 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4MIRDStomach.cc @@ -0,0 +1,118 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4MIRDStomach.hh" + +#include "globals.hh" +#include "G4SDManager.hh" +#include "G4VisAttributes.hh" +#include "G4Ellipsoid.hh" +#include "G4ThreeVector.hh" +#include "G4VPhysicalVolume.hh" +#include "G4RotationMatrix.hh" +#include "G4Material.hh" +#include "G4LogicalVolume.hh" +#include "G4HumanPhantomMaterial.hh" +#include "G4VPhysicalVolume.hh" +#include "G4PVPlacement.hh" + +G4MIRDStomach::G4MIRDStomach() +{ +} + +G4MIRDStomach::~G4MIRDStomach() +{ +} + +G4VPhysicalVolume* G4MIRDStomach::ConstructStomach(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + + G4cout << "ConstructStomach for " << sex << G4endl; + + G4HumanPhantomMaterial* material = new G4HumanPhantomMaterial(); + G4Material* soft = material -> GetMaterial("soft_tissue"); + delete material; + + G4double ax = 3.43 * cm; + G4double by= 2.92 * cm; + G4double cz = 7.16 * cm; + G4double zcut1 = -7.16 * cm; + G4double zcut2 = 7.16 * cm; + + G4Ellipsoid* stomach = new G4Ellipsoid("stomach", + ax, by, cz, + zcut1, zcut2); + + G4LogicalVolume* logicStomach = new G4LogicalVolume(stomach, soft, + "StomachVolume", 0, 0, 0); + + // Define rotation and position here! + G4VPhysicalVolume* physStomach = new G4PVPlacement(0,G4ThreeVector(6.90 *cm,-3.92 * cm, 0), + "physicalStomach", + logicStomach, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicStomach->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* StomachVisAtt = new G4VisAttributes(G4Colour(0.63,0.32,0.17)); + StomachVisAtt->SetForceSolid(true); + logicStomach->SetVisAttributes(StomachVisAtt); + + G4cout << "Stomach created !!!!!!" << G4endl; + + // Testing Stomach Volume + G4double StomachVol = logicStomach->GetSolid()->GetCubicVolume(); + G4cout << "Volume of Stomach = " << StomachVol/cm3 << " cm^3" << G4endl; + + // Testing Stomach Material + G4String StomachMat = logicStomach->GetMaterial()->GetName(); + G4cout << "Material of Stomach = " << StomachMat << G4endl; + + // Testing Density + G4double StomachDensity = logicStomach->GetMaterial()->GetDensity(); + G4cout << "Density of Material = " << StomachDensity*cm3/g << " g/cm^3" << G4endl; + + // Testing Mass + G4double StomachMass = (StomachVol)*StomachDensity; + G4cout << "Mass of Stomach = " << StomachMass/gram << " g" << G4endl; + + return physStomach; +} diff --git a/examples/advanced/human_phantom/src/G4MIRDTestes.cc b/examples/advanced/human_phantom/src/G4MIRDTestes.cc new file mode 100644 index 0000000000..aaa6caac7e --- /dev/null +++ b/examples/advanced/human_phantom/src/G4MIRDTestes.cc @@ -0,0 +1,90 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4MIRDTestes.hh" + +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" +#include "G4VisAttributes.hh" + +G4MIRDTestes::G4MIRDTestes() +{ +} + +G4MIRDTestes::~G4MIRDTestes() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4MIRDTestes::ConstructTestes(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/MIRDTestes.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + + G4LogicalVolume* logicTestes = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("TestesVolume"); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("TestesPos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("TestesRot"); + + // Define rotation and position here! + G4VPhysicalVolume* physTestes = new G4PVPlacement(rm,position, + "physicalTestes", + logicTestes, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicTestes->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* TestesVisAtt = new G4VisAttributes(G4Colour(1.0,1.0,0.0)); + TestesVisAtt->SetForceSolid(true); + logicTestes->SetVisAttributes(TestesVisAtt); + + G4cout << "Testes created !!!!!!" << G4endl; + + return physTestes; +} diff --git a/examples/advanced/human_phantom/src/G4MIRDThyroid.cc b/examples/advanced/human_phantom/src/G4MIRDThyroid.cc new file mode 100644 index 0000000000..54f6ec3afb --- /dev/null +++ b/examples/advanced/human_phantom/src/G4MIRDThyroid.cc @@ -0,0 +1,158 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4MIRDThyroid.hh" + +#include "globals.hh" +#include "G4SDManager.hh" +#include "G4VisAttributes.hh" +#include "G4HumanPhantomMaterial.hh" +#include "G4RotationMatrix.hh" +#include "G4ThreeVector.hh" +#include "G4VPhysicalVolume.hh" +#include "G4PVPlacement.hh" +#include "G4Tubs.hh" +#include "G4Box.hh" +#include "G4VSolid.hh" +#include "G4SubtractionSolid.hh" + +G4MIRDThyroid::G4MIRDThyroid() +{ +} + +G4MIRDThyroid::~G4MIRDThyroid() +{ +} + +G4VPhysicalVolume* G4MIRDThyroid::ConstructThyroid(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + G4HumanPhantomMaterial* material = new G4HumanPhantomMaterial(); + G4Material* soft = material -> GetMaterial("soft_tissue"); + delete material; + + G4double z= 4.20*cm; + G4double rmin= 0. * cm; + G4double rmax= 1.85 *cm; + G4double startphi = 0. * degree; + G4double deltaphi= 180. * degree; + + G4Tubs* LobOfThyroidOut = new G4Tubs("LobOfThyroidOut", + rmin, rmax,z/2., + startphi, deltaphi); + + z= 4.50*cm; + rmax= 0.83 * cm; + deltaphi= 360. * degree; + G4Tubs* LobOfThyroidIn = new G4Tubs("LobOfThyroidIn", + rmin, rmax,z/2., + startphi, deltaphi); + + G4double xx = 3.72*cm; + G4double yy= 3.72*cm; + G4double zz= 20.00*cm; + G4Box* SubtrThyroid = new G4Box("SubtrThyroid", + xx/2., yy/2., zz/2.); + + G4SubtractionSolid* FirstThyroid = new G4SubtractionSolid("FirstThyroid", + LobOfThyroidOut, + LobOfThyroidIn); + + G4RotationMatrix* relative_matrix = new G4RotationMatrix(); + relative_matrix -> rotateX(-50.* degree); + + G4SubtractionSolid* SecondThyroid = new G4SubtractionSolid("SecondThyroid", + FirstThyroid, + SubtrThyroid, + relative_matrix, + G4ThreeVector(0.0 *cm,0.0 *cm, 4.20*cm)); + + G4RotationMatrix* relative_matrix_2 = new G4RotationMatrix(); + relative_matrix_2 -> rotateX(50.* degree); + +G4SubtractionSolid* thyroid = new G4SubtractionSolid("SecondThyroid", + SecondThyroid, + SubtrThyroid, + relative_matrix_2, + G4ThreeVector(0.0 *cm,0.0 *cm, -5.40*cm)); + + + + G4LogicalVolume* logicThyroid = new G4LogicalVolume(thyroid, soft, + "ThyroidVolume", + 0, 0, 0); + + G4RotationMatrix* rm = new G4RotationMatrix(); + + rm -> rotateZ(180.*degree); + + G4VPhysicalVolume* physThyroid = new G4PVPlacement(rm, + G4ThreeVector(0.0*cm,-3.91*cm, -5.925*cm), + "physicalThyroid", + logicThyroid, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicThyroid->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* ThyroidVisAtt = new G4VisAttributes(G4Colour(0.0,1.0,1.0)); + ThyroidVisAtt->SetForceSolid(true); + logicThyroid->SetVisAttributes(ThyroidVisAtt); + + G4cout << "Thyroid created for "<GetSolid()->GetCubicVolume(); + G4cout << "Volume of Thyroid = " << ThyroidVol/cm3 << " cm^3" << G4endl; + + // Testing Thyroid Material + G4String ThyroidMat = logicThyroid->GetMaterial()->GetName(); + G4cout << "Material of Thyroid = " << ThyroidMat << G4endl; + + // Testing Density + G4double ThyroidDensity = logicThyroid->GetMaterial()->GetDensity(); + G4cout << "Density of Material = " << ThyroidDensity*cm3/g << " g/cm^3" << G4endl; + + // Testing Mass + G4double ThyroidMass = (ThyroidVol)*ThyroidDensity; + G4cout << "Mass of Thyroid = " << ThyroidMass/gram << " g" << G4endl; + + + return physThyroid; +} diff --git a/examples/advanced/human_phantom/src/G4MIRDTrunk.cc b/examples/advanced/human_phantom/src/G4MIRDTrunk.cc new file mode 100644 index 0000000000..533e8aa43d --- /dev/null +++ b/examples/advanced/human_phantom/src/G4MIRDTrunk.cc @@ -0,0 +1,118 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4MIRDTrunk.hh" +#include "globals.hh" +#include "G4SDManager.hh" +#include "G4VisAttributes.hh" +#include "G4HumanPhantomMaterial.hh" +#include "G4EllipticalTube.hh" +#include "G4RotationMatrix.hh" +#include "G4ThreeVector.hh" +#include "G4VPhysicalVolume.hh" +#include "G4PVPlacement.hh" + +G4MIRDTrunk::G4MIRDTrunk() +{ +} + +G4MIRDTrunk::~G4MIRDTrunk() +{ + +} + +G4VPhysicalVolume* G4MIRDTrunk::ConstructTrunk(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + + G4HumanPhantomMaterial* material = new G4HumanPhantomMaterial(); + + G4cout << "ConstructTrunck for "<< sex < GetMaterial("soft_tissue"); + + delete material; + + G4double dx = 17.25 * cm; + G4double dy = 9.80 * cm; + G4double dz = 31.55 * cm; + + G4EllipticalTube* trunk = new G4EllipticalTube("Trunk",dx, dy, dz); + + G4LogicalVolume* logicTrunk = new G4LogicalVolume(trunk, soft, + "TrunkVolume", + 0, 0, 0); + G4RotationMatrix* rm = new G4RotationMatrix(); + rm -> rotateX(90.* degree); + + // Define rotation and position here! + G4VPhysicalVolume* physTrunk = new G4PVPlacement(rm, + G4ThreeVector(0.* cm,31.55*cm, 0.*cm), + "physicalTrunk", + logicTrunk, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity == true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicTrunk->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* TrunkVisAtt = new G4VisAttributes(G4Colour(0.94,0.5,0.5)); + TrunkVisAtt->SetForceSolid(false); + logicTrunk->SetVisAttributes(TrunkVisAtt); + + G4cout << "Trunk created !!!!!!" << G4endl; + + // Testing Trunk Volume + G4double TrunkVol = logicTrunk->GetSolid()->GetCubicVolume(); + G4cout << "Volume of Trunk = " << TrunkVol/cm3 << " cm^3" << G4endl; + + // Testing Trunk Material + G4String TrunkMat = logicTrunk->GetMaterial()->GetName(); + G4cout << "Material of Trunk = " << TrunkMat << G4endl; + + // Testing Density + G4double TrunkDensity = logicTrunk->GetMaterial()->GetDensity(); + G4cout << "Density of Material = " << TrunkDensity*cm3/g << " g/cm^3" << G4endl; + + // Testing Mass + G4double TrunkMass = (TrunkVol)*TrunkDensity; + G4cout << "Mass of Trunk = " << TrunkMass/gram << " g" << G4endl; + + + return physTrunk; +} diff --git a/examples/advanced/human_phantom/src/G4MIRDUpperLargeIntestine.cc b/examples/advanced/human_phantom/src/G4MIRDUpperLargeIntestine.cc new file mode 100644 index 0000000000..91f25f471b --- /dev/null +++ b/examples/advanced/human_phantom/src/G4MIRDUpperLargeIntestine.cc @@ -0,0 +1,131 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4MIRDUpperLargeIntestine.hh" + +#include "globals.hh" +#include "G4SDManager.hh" +#include "G4VisAttributes.hh" +#include "G4EllipticalTube.hh" +#include "G4UnionSolid.hh" +#include "G4RotationMatrix.hh" +#include "G4ThreeVector.hh" +#include "G4VPhysicalVolume.hh" +#include "G4PVPlacement.hh" +#include "G4LogicalVolume.hh" +#include "G4HumanPhantomMaterial.hh" + +G4MIRDUpperLargeIntestine::G4MIRDUpperLargeIntestine() +{ +} + +G4MIRDUpperLargeIntestine::~G4MIRDUpperLargeIntestine() +{ +} + +G4VPhysicalVolume* G4MIRDUpperLargeIntestine::ConstructUpperLargeIntestine(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ +G4cout << "ConstructUpperLargeIntestine for " << sex << G4endl; + + G4HumanPhantomMaterial* material = new G4HumanPhantomMaterial(); + G4Material* soft = material -> GetMaterial("soft_tissue"); + delete material; + + G4double dx = 2.16 * cm; + G4double dy = 2.45 * cm; + G4double dz = 4.3 * cm; + + G4VSolid* AscendingColonUpperLargeIntestine = new G4EllipticalTube("AscendingColon",dx, dy, dz); + + dx = 2.45 * cm; + dy = 1.35 *cm; + dz = 9.06* cm; + + G4VSolid* TraverseColonUpperLargeIntestine = new G4EllipticalTube("TraverseColon",dx, dy, dz); + + G4RotationMatrix* relative_rm = new G4RotationMatrix(); + relative_rm -> rotateX(90. * degree); + relative_rm -> rotateZ(0. * degree); + relative_rm -> rotateY(90. * degree); + G4UnionSolid* upperLargeIntestine = new G4UnionSolid("UpperLargeIntestine", + AscendingColonUpperLargeIntestine, + TraverseColonUpperLargeIntestine, + relative_rm, + G4ThreeVector(7.2 *cm, 0.0, 5.65 * cm)); + + + G4LogicalVolume* logicUpperLargeIntestine = new G4LogicalVolume(upperLargeIntestine, soft, + "UpperLargeIntestineVolume", + 0, 0, 0); + + G4VPhysicalVolume* physUpperLargeIntestine = new G4PVPlacement(0, + G4ThreeVector(-7.33 * cm, -2.31 *cm,-14.22 *cm), + "physicalUpperLargeIntestine", + logicUpperLargeIntestine, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicUpperLargeIntestine->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* UpperLargeIntestineVisAtt = new G4VisAttributes(G4Colour(1.0,1.0,0.0)); + UpperLargeIntestineVisAtt->SetForceSolid(true); + logicUpperLargeIntestine->SetVisAttributes(UpperLargeIntestineVisAtt); + + G4cout << "UpperLargeIntestine created !!!!!!" << G4endl; + + // Testing UpperLargeIntestine Volume + G4double UpperLargeIntestineVol = logicUpperLargeIntestine->GetSolid()->GetCubicVolume(); + G4cout << "Volume of UpperLargeIntestine = " << UpperLargeIntestineVol/cm3 << " cm^3" << G4endl; + + // Testing UpperLargeIntestine Material + G4String UpperLargeIntestineMat = logicUpperLargeIntestine->GetMaterial()->GetName(); + G4cout << "Material of UpperLargeIntestine = " << UpperLargeIntestineMat << G4endl; + + // Testing Density + G4double UpperLargeIntestineDensity = logicUpperLargeIntestine->GetMaterial()->GetDensity(); + G4cout << "Density of Material = " << UpperLargeIntestineDensity*cm3/g << " g/cm^3" << G4endl; + + // Testing Mass + G4double UpperLargeIntestineMass = (UpperLargeIntestineVol)*UpperLargeIntestineDensity; + G4cout << "Mass of UpperLargeIntestine = " << UpperLargeIntestineMass/gram << " g" << G4endl; + + + return physUpperLargeIntestine; +} diff --git a/examples/advanced/human_phantom/src/G4MIRDUpperSpine.cc b/examples/advanced/human_phantom/src/G4MIRDUpperSpine.cc new file mode 100644 index 0000000000..49e366826c --- /dev/null +++ b/examples/advanced/human_phantom/src/G4MIRDUpperSpine.cc @@ -0,0 +1,115 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4MIRDUpperSpine.hh" +#include "globals.hh" +#include "G4SDManager.hh" +#include "G4VisAttributes.hh" +#include "G4VisAttributes.hh" +#include "G4HumanPhantomMaterial.hh" +#include "G4EllipticalTube.hh" +#include "G4RotationMatrix.hh" +#include "G4ThreeVector.hh" +#include "G4VPhysicalVolume.hh" +#include "G4PVPlacement.hh" + +G4MIRDUpperSpine::G4MIRDUpperSpine() +{ +} + +G4MIRDUpperSpine::~G4MIRDUpperSpine() +{ + +} + +G4VPhysicalVolume* G4MIRDUpperSpine::ConstructUpperSpine(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + G4HumanPhantomMaterial* material = new G4HumanPhantomMaterial(); + + G4cout << "ConstructUpperSpine for "<< sex < GetMaterial("skeleton"); + + delete material; + + G4double dx = 1.73 *cm; + G4double dy = 2.45 *cm; + G4double dz = 5.*cm; + + G4EllipticalTube* upperSpine = new G4EllipticalTube("UpperSpine",dx, dy, dz); + + G4LogicalVolume* logicUpperSpine = new G4LogicalVolume(upperSpine, skeleton, + "UpperSpineVolume", + 0, 0, 0); + // Define rotation and position here! + G4VPhysicalVolume* physUpperSpine = new G4PVPlacement(0, + G4ThreeVector(0.0, 5.39 *cm, -3.25 *cm), + "physicalUpperSpine", + logicUpperSpine, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicUpperSpine->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* UpperSpineVisAtt = new G4VisAttributes(G4Colour(0.46,0.53,0.6)); + UpperSpineVisAtt->SetForceSolid(true); + logicUpperSpine->SetVisAttributes(UpperSpineVisAtt); + + G4cout << "UpperSpine created !!!!!!" << G4endl; + + // Testing UpperSpine Volume + G4double UpperSpineVol = logicUpperSpine->GetSolid()->GetCubicVolume(); + G4cout << "Volume of UpperSpine = " << UpperSpineVol/cm3 << " cm^3" << G4endl; + + // Testing UpperSpine Material + G4String UpperSpineMat = logicUpperSpine->GetMaterial()->GetName(); + G4cout << "Material of UpperSpine = " << UpperSpineMat << G4endl; + + // Testing Density + G4double UpperSpineDensity = logicUpperSpine->GetMaterial()->GetDensity(); + G4cout << "Density of Material = " << UpperSpineDensity*cm3/g << " g/cm^3" << G4endl; + + // Testing Mass + G4double UpperSpineMass = (UpperSpineVol)*UpperSpineDensity; + G4cout << "Mass of UpperSpine = " << UpperSpineMass/gram << " g" << G4endl; + + + return physUpperSpine; +} diff --git a/examples/advanced/human_phantom/src/G4MIRDUrinaryBladder.cc b/examples/advanced/human_phantom/src/G4MIRDUrinaryBladder.cc new file mode 100644 index 0000000000..5c95fe9c57 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4MIRDUrinaryBladder.cc @@ -0,0 +1,113 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4MIRDUrinaryBladder.hh" +#include "globals.hh" +#include "G4SDManager.hh" +#include "G4VisAttributes.hh" +#include "G4Ellipsoid.hh" +#include "G4Material.hh" +#include "G4LogicalVolume.hh" +#include "G4HumanPhantomMaterial.hh" +#include "G4VPhysicalVolume.hh" +#include "G4PVPlacement.hh" +G4MIRDUrinaryBladder::G4MIRDUrinaryBladder() +{ +} + +G4MIRDUrinaryBladder::~G4MIRDUrinaryBladder() +{ +} + +G4VPhysicalVolume* G4MIRDUrinaryBladder::ConstructUrinaryBladder(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + + G4cout << "ConstructUrinaryBladded for " << sex << G4endl; + + G4HumanPhantomMaterial* material = new G4HumanPhantomMaterial(); + G4Material* soft = material -> GetMaterial("soft_tissue"); + delete material; + + G4double ax = 4.27*cm; + G4double by= 3.38 *cm; + G4double cz= 3.11 *cm; + G4double zcut1= -3.11*cm; + G4double zcut2= 3.11*cm; + + G4Ellipsoid* bladder = new G4Ellipsoid("bladder",ax, by, cz, zcut1, zcut2 ); + + G4LogicalVolume* logicUrinaryBladder = new G4LogicalVolume(bladder, soft, + "UrinaryBladderVolume", + 0, 0, 0); + + // Define rotation and position here! + G4VPhysicalVolume* physUrinaryBladder = new G4PVPlacement(0,G4ThreeVector(0 *cm, -4.41 *cm,-24.34 *cm), + "physicalUrinaryBladder", + logicUrinaryBladder, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicUrinaryBladder->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* UrinaryBladderVisAtt = new G4VisAttributes(G4Colour(0.85,0.65,0.125)); + UrinaryBladderVisAtt->SetForceSolid(true); + logicUrinaryBladder->SetVisAttributes(UrinaryBladderVisAtt); + + G4cout << "UrinaryBladder created !!!!!!" << G4endl; + + // Testing UrinaryBladder Volume + G4double UrinaryBladderVol = logicUrinaryBladder->GetSolid()->GetCubicVolume(); + G4cout << "Volume of UrinaryBladder = " << UrinaryBladderVol/cm3 << " cm^3" << G4endl; + + // Testing UrinaryBladder Material + G4String UrinaryBladderMat = logicUrinaryBladder->GetMaterial()->GetName(); + G4cout << "Material of UrinaryBladder = " << UrinaryBladderMat << G4endl; + + // Testing Density + G4double UrinaryBladderDensity = logicUrinaryBladder->GetMaterial()->GetDensity(); + G4cout << "Density of Material = " << UrinaryBladderDensity*cm3/g << " g/cm^3" << G4endl; + + // Testing Mass + G4double UrinaryBladderMass = (UrinaryBladderVol)*UrinaryBladderDensity; + G4cout << "Mass of UrinaryBladder = " << UrinaryBladderMass/gram << " g" << G4endl; + + + return physUrinaryBladder; +} diff --git a/examples/advanced/human_phantom/src/G4MIRDUterus.cc b/examples/advanced/human_phantom/src/G4MIRDUterus.cc new file mode 100644 index 0000000000..975848d434 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4MIRDUterus.cc @@ -0,0 +1,123 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4MIRDUterus.hh" +#include "globals.hh" +#include "G4SDManager.hh" +#include "G4VisAttributes.hh" +#include "G4Ellipsoid.hh" +#include "G4ThreeVector.hh" +#include "G4VPhysicalVolume.hh" +#include "G4RotationMatrix.hh" +#include "G4Material.hh" +#include "G4LogicalVolume.hh" +#include "G4HumanPhantomMaterial.hh" +#include "G4VPhysicalVolume.hh" +#include "G4PVPlacement.hh" +G4MIRDUterus::G4MIRDUterus() +{ +} + +G4MIRDUterus::~G4MIRDUterus() +{ +} + +G4VPhysicalVolume* G4MIRDUterus::ConstructUterus(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + + G4cout << "ConstructUterus for " << sex << G4endl; + + G4HumanPhantomMaterial* material = new G4HumanPhantomMaterial(); + G4Material* soft = material -> GetMaterial("soft_tissue"); + delete material; + + G4double ax= 2.47*cm; + G4double by= 1.55*cm; + G4double cz= 5.61*cm; + G4double zcut1= -5.61* cm; + G4double zcut2= 2.81*cm; + + G4Ellipsoid* uterus = new G4Ellipsoid("Uterus", + ax, by, cz, + zcut1, zcut2); + + G4LogicalVolume* logicUterus = new G4LogicalVolume(uterus, + soft, + "UterusVolume", + 0, 0, 0); + + + G4RotationMatrix* rm = new G4RotationMatrix(); + rm -> rotateX(90.* degree); + + // Define rotation and position here! + G4VPhysicalVolume* physUterus = new G4PVPlacement(rm, + G4ThreeVector(0. *cm, 1.96*cm,-18.93 *cm), + "physicalUterus", + logicUterus, + mother, + false, + 0, true); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicUterus->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* UterusVisAtt = new G4VisAttributes(G4Colour(0.85,0.44,0.84)); + UterusVisAtt->SetForceSolid(true); + logicUterus->SetVisAttributes(UterusVisAtt); + + G4cout << "Uterus created !!!!!!" << G4endl; + + // Testing Uterus Volume + G4double UterusVol = logicUterus->GetSolid()->GetCubicVolume(); + G4cout << "Volume of Uterus = " << UterusVol/cm3 << " cm^3" << G4endl; + + // Testing Uterus Material + G4String UterusMat = logicUterus->GetMaterial()->GetName(); + G4cout << "Material of Uterus = " << UterusMat << G4endl; + + // Testing Density + G4double UterusDensity = logicUterus->GetMaterial()->GetDensity(); + G4cout << "Density of Material = " << UterusDensity*cm3/g << " g/cm^3" << G4endl; + + // Testing Mass + G4double UterusMass = (UterusVol)*UterusDensity; + G4cout << "Mass of Uterus = " << UterusMass/gram << " g" << G4endl; + + return physUterus; +} diff --git a/examples/advanced/human_phantom/src/G4MaleBuilder.cc b/examples/advanced/human_phantom/src/G4MaleBuilder.cc new file mode 100644 index 0000000000..c9a3ff4cbf --- /dev/null +++ b/examples/advanced/human_phantom/src/G4MaleBuilder.cc @@ -0,0 +1,51 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include"G4MaleBuilder.hh" +G4MaleBuilder::G4MaleBuilder() +{ +} + +G4MaleBuilder::~G4MaleBuilder() +{ +} + +void G4MaleBuilder::BuildMaleGenitalia(G4bool /*sensitivity*/) +{ + G4cout<< "Male Genitalia not available !!! "<< G4endl; +} + +void G4MaleBuilder::BuildTestes(G4bool /*sensitivity*/) +{ + G4cout << "Male testes are not available !!!" << G4endl; +} diff --git a/examples/advanced/human_phantom/src/G4ORNLAdrenal.cc b/examples/advanced/human_phantom/src/G4ORNLAdrenal.cc new file mode 100644 index 0000000000..1aa9fd467c --- /dev/null +++ b/examples/advanced/human_phantom/src/G4ORNLAdrenal.cc @@ -0,0 +1,94 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// + +#include "G4ORNLAdrenal.hh" +#include "G4PhysicalVolumeStore.hh" +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" +#include "G4VisAttributes.hh" + +G4ORNLAdrenal::G4ORNLAdrenal() +{ +} + +G4ORNLAdrenal::~G4ORNLAdrenal() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4ORNLAdrenal::ConstructAdrenal(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/ORNLAdrenal.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + G4LogicalVolume* logicAdrenal = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("AdrenalVolume"); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("AdrenalPos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("AdrenalRot"); + +G4PhysicalVolumeStore::DeRegister((G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume()); + + // Define rotation and position here! + G4VPhysicalVolume* physAdrenal = new G4PVPlacement(rm,position, + "physicalAdrenal", + logicAdrenal, + mother, + false, + 0); + + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicAdrenal->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + + // Visualization Attributes + G4VisAttributes* AdrenalVisAtt = new G4VisAttributes(G4Colour(1.0,1.0,0.0)); + AdrenalVisAtt->SetForceSolid(true); + logicAdrenal->SetVisAttributes(AdrenalVisAtt); + + G4cout << "Adrenal created !!!!!!" << G4endl; + + return physAdrenal; +} diff --git a/examples/advanced/human_phantom/src/G4ORNLArmBone.cc b/examples/advanced/human_phantom/src/G4ORNLArmBone.cc new file mode 100644 index 0000000000..1decd02d12 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4ORNLArmBone.cc @@ -0,0 +1,92 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4ORNLArmBone.hh" +#include "G4PhysicalVolumeStore.hh" +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" +#include "G4VisAttributes.hh" + +G4ORNLArmBone::G4ORNLArmBone() +{ +} + +G4ORNLArmBone::~G4ORNLArmBone() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4ORNLArmBone::ConstructArmBone(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/ORNLArmBone.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + + G4LogicalVolume* logicArmBone = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("ArmBoneVolume"); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("ArmBonePos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("ArmBoneRot"); + + G4PhysicalVolumeStore::DeRegister((G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume()); + + // Define rotation and position here! + G4VPhysicalVolume* physArmBone = new G4PVPlacement(rm,position, + "physicalArmBone", + logicArmBone, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicArmBone->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* ArmBoneVisAtt = new G4VisAttributes(G4Colour(1.0,1.0,0.0)); + ArmBoneVisAtt->SetForceSolid(true); + logicArmBone->SetVisAttributes(ArmBoneVisAtt); + + G4cout << "ArmBone created !!!!!!" << G4endl; + + return physArmBone; +} diff --git a/examples/advanced/human_phantom/src/G4ORNLBodyFactory.cc b/examples/advanced/human_phantom/src/G4ORNLBodyFactory.cc new file mode 100644 index 0000000000..50a5debb1f --- /dev/null +++ b/examples/advanced/human_phantom/src/G4ORNLBodyFactory.cc @@ -0,0 +1,241 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +// +#include "G4ORNLBodyFactory.hh" +#include "G4ORNLStomach.hh" +#include "G4ORNLUpperLargeIntestine.hh" +#include "G4ORNLLowerLargeIntestine.hh" +#include "G4ORNLEsophagus.hh" +#include "G4ORNLKidney.hh" +#include "G4ORNLAdrenal.hh" +#include "G4ORNLLiver.hh" +#include "G4ORNLPancreas.hh" +#include "G4ORNLSpleen.hh" +#include "G4ORNLUrinaryBladder.hh" +#include "G4ORNLLung.hh" +#include "G4ORNLHeart.hh" +#include "G4ORNLBrain.hh" +#include "G4ORNLHead.hh" +#include "G4ORNLTrunk.hh" +#include "G4ORNLLegs.hh" +#include "G4ORNLThyroid.hh" +#include "G4ORNLUterus.hh" +#include "G4ORNLBreast.hh" +#include "G4ORNLOvary.hh" +#include "G4ORNLUpperSpine.hh" +#include "G4ORNLMiddleLowerSpine.hh" +#include "G4ORNLLegBone.hh" +#include "G4ORNLArmBone.hh" +#include "G4ORNLSkull.hh" +#include "G4ORNLRibCage.hh" +#include "G4ORNLPelvis.hh" +#include "G4ORNLTestes.hh" + + +G4ORNLBodyFactory::G4ORNLBodyFactory() +{ +} + +G4ORNLBodyFactory::~G4ORNLBodyFactory() +{ +} + +G4VPhysicalVolume* G4ORNLBodyFactory::CreateStomach(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4ORNLStomach* stomach = new G4ORNLStomach(); + return stomach -> ConstructStomach(motherVolume, sex, sensitivity); +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreateUpperLargeIntestine(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4ORNLUpperLargeIntestine* upperLargeIntestine = new G4ORNLUpperLargeIntestine(); + return upperLargeIntestine -> ConstructUpperLargeIntestine(motherVolume, sex, sensitivity); +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreateLowerLargeIntestine(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4ORNLLowerLargeIntestine* lowerLargeIntestine = new G4ORNLLowerLargeIntestine(); + return lowerLargeIntestine -> ConstructLowerLargeIntestine(motherVolume, sex, sensitivity); +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreateEsophagus(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4ORNLEsophagus* esophagus = new G4ORNLEsophagus(); + return esophagus -> ConstructEsophagus(motherVolume, sex, sensitivity); +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreateKidney(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4ORNLKidney* kidney = new G4ORNLKidney(); + return kidney -> ConstructKidney(motherVolume, sex, sensitivity); +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreateAdrenal(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4ORNLAdrenal* adrenal = new G4ORNLAdrenal(); + return adrenal -> ConstructAdrenal(motherVolume, sex, sensitivity); +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreateLiver(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4ORNLLiver* liver = new G4ORNLLiver(); + return liver -> ConstructLiver(motherVolume, sex, sensitivity); +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreatePancreas(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4ORNLPancreas* pancreas = new G4ORNLPancreas(); + return pancreas -> ConstructPancreas(motherVolume, sex, sensitivity); +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreateSpleen(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4ORNLSpleen* spleen = new G4ORNLSpleen(); + return spleen -> ConstructSpleen(motherVolume, sex, sensitivity); +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreateUrinaryBladder(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4ORNLUrinaryBladder* urinaryBladder = new G4ORNLUrinaryBladder(); + return urinaryBladder -> ConstructUrinaryBladder(motherVolume, sex, sensitivity); +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreateLung(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4ORNLLung* lung = new G4ORNLLung(); + return lung -> ConstructLung(motherVolume, sex, sensitivity); +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreateHeart(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4ORNLHeart* heart = new G4ORNLHeart(); + return heart -> ConstructHeart(motherVolume, sex, sensitivity); +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreateBrain(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4ORNLBrain* brain = new G4ORNLBrain(); + return brain -> ConstructBrain(motherVolume, sex, sensitivity); +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreateHead(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4ORNLHead* head = new G4ORNLHead(); + return head -> ConstructHead(motherVolume, sex, sensitivity); +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreateTrunk(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4ORNLTrunk* trunk = new G4ORNLTrunk(); + return trunk -> ConstructTrunk(motherVolume, sex, sensitivity); +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreateLegs(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4ORNLLegs* legs = new G4ORNLLegs(); + return legs -> ConstructLegs(motherVolume, sex, sensitivity); +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreateThyroid(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4ORNLThyroid* thyroid = new G4ORNLThyroid(); + return thyroid -> ConstructThyroid(motherVolume, sex, sensitivity); +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreateUterus(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4ORNLUterus* uterus = new G4ORNLUterus(); + return uterus -> ConstructUterus(motherVolume, sex, sensitivity); +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreateBreast(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4ORNLBreast* breast = new G4ORNLBreast(); + return breast -> ConstructBreast(motherVolume, sex, sensitivity); +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreateOvary(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4ORNLOvary* ovary = new G4ORNLOvary(); + return ovary -> ConstructOvary(motherVolume, sex, sensitivity); +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreateUpperSpine(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4ORNLUpperSpine* upperSpine = new G4ORNLUpperSpine(); + return upperSpine -> ConstructUpperSpine(motherVolume, sex, sensitivity); +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreateMiddleLowerSpine(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4ORNLMiddleLowerSpine* middleLowerSpine = new G4ORNLMiddleLowerSpine(); + return middleLowerSpine -> ConstructMiddleLowerSpine(motherVolume, sex, sensitivity); +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreateLegBone(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4ORNLLegBone* legBone = new G4ORNLLegBone(); + return legBone -> ConstructLegBone(motherVolume, sex, sensitivity); +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreateArmBone(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4ORNLArmBone* armBone = new G4ORNLArmBone(); + return armBone -> ConstructArmBone(motherVolume, sex, sensitivity); +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreateSkull(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4ORNLSkull* skull = new G4ORNLSkull(); + return skull -> ConstructSkull(motherVolume, sex, sensitivity); +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreateRibCage(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4ORNLRibCage* ribCage = new G4ORNLRibCage(); + return ribCage -> ConstructRibCage(motherVolume, sex, sensitivity); +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreatePelvis(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4ORNLPelvis* pelvis = new G4ORNLPelvis(); + return pelvis -> ConstructPelvis(motherVolume, sex, sensitivity); +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreateTestes(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4ORNLTestes* testes = new G4ORNLTestes(); + return testes -> ConstructTestes(motherVolume, sex, sensitivity); +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreateNeck(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4cout << motherVolume << ">>>> Cannot create Neck of " << sex + << "phantom and with sensitivity = " << sensitivity + << ": not yet implemented!" << G4endl; + return 0; +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreateScapulae(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4cout << motherVolume << ">>>> Cannot create Scapulae of " << sex + << "phantom and with sensitivity = " << sensitivity + << ": not yet implemented!" << G4endl; + return 0; +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreateClavicles(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4cout << motherVolume << ">>>> Cannot create Clavicles of " << sex + << "phantom and with sensitivity = " << sensitivity + << ": not yet implemented!" << G4endl; + return 0; +} +G4VPhysicalVolume* G4ORNLBodyFactory::CreateMaleGenitalia(G4VPhysicalVolume* motherVolume, G4String sex, G4bool sensitivity) +{ + G4cout << motherVolume << ">>>> Cannot create Male Genitalia of " << sex + << "phantom and with sensitivity = " << sensitivity + << ": not yet implemented!" << G4endl; + return 0; +} diff --git a/examples/advanced/human_phantom/src/G4ORNLBrain.cc b/examples/advanced/human_phantom/src/G4ORNLBrain.cc new file mode 100644 index 0000000000..c766d7cce8 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4ORNLBrain.cc @@ -0,0 +1,91 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4ORNLBrain.hh" +#include "G4PhysicalVolumeStore.hh" +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" +#include "G4VisAttributes.hh" + +G4ORNLBrain::G4ORNLBrain() +{ +} + +G4ORNLBrain::~G4ORNLBrain() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4ORNLBrain::ConstructBrain(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/ORNLBrain.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + + G4LogicalVolume* logicBrain = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("BrainVolume"); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("BrainPos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("BrainRot"); + + G4PhysicalVolumeStore::DeRegister((G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume()); + // Define rotation and position here! + G4VPhysicalVolume* physBrain = new G4PVPlacement(rm,position, + "physicalBrain", + logicBrain, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicBrain->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* BrainVisAtt = new G4VisAttributes(G4Colour(0.41,0.41,0.41)); + BrainVisAtt->SetForceSolid(true); + logicBrain->SetVisAttributes(BrainVisAtt); + + G4cout << "Brain created !!!!!!" << G4endl; + + return physBrain; +} diff --git a/examples/advanced/human_phantom/src/G4ORNLBreast.cc b/examples/advanced/human_phantom/src/G4ORNLBreast.cc new file mode 100644 index 0000000000..f5c0bdb5f2 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4ORNLBreast.cc @@ -0,0 +1,91 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4ORNLBreast.hh" +#include "G4PhysicalVolumeStore.hh" +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" +#include "G4VisAttributes.hh" + +G4ORNLBreast::G4ORNLBreast() +{ +} + +G4ORNLBreast::~G4ORNLBreast() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4ORNLBreast::ConstructBreast(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/ORNLBreast.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + + G4LogicalVolume* logicBreast = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("BreastVolume"); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("BreastPos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("BreastRot"); + G4PhysicalVolumeStore::DeRegister((G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume()); + + // Define rotation and position here! + G4VPhysicalVolume* physBreast = new G4PVPlacement(rm,position, + "physicalBreast", + logicBreast, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicBreast->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* BreastVisAtt = new G4VisAttributes(G4Colour(1.0,0.41,0.71)); + BreastVisAtt->SetForceSolid(true); + logicBreast->SetVisAttributes(BreastVisAtt); + + G4cout << "Breast created !!!!!!" << G4endl; + + return physBreast; +} diff --git a/examples/advanced/human_phantom/src/G4ORNLEsophagus.cc b/examples/advanced/human_phantom/src/G4ORNLEsophagus.cc new file mode 100644 index 0000000000..35a7bc8112 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4ORNLEsophagus.cc @@ -0,0 +1,91 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4ORNLEsophagus.hh" + +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" + +#include "G4VisAttributes.hh" + +G4ORNLEsophagus::G4ORNLEsophagus() +{ +} + +G4ORNLEsophagus::~G4ORNLEsophagus() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4ORNLEsophagus::ConstructEsophagus(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/ORNLEsophagus.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + + G4LogicalVolume* logicEsophagus = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("EsophagusVolume"); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("EsophagusPos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("EsophagusRot"); + + // Define rotation and position here! + G4VPhysicalVolume* physEsophagus = new G4PVPlacement(rm,position, + "physicalEsophagus", + logicEsophagus, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicEsophagus->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* EsophagusVisAtt = new G4VisAttributes(G4Colour(1.0,1.0,0.0)); + EsophagusVisAtt->SetForceSolid(true); + logicEsophagus->SetVisAttributes(EsophagusVisAtt); + + G4cout << "Esophagus created !!!!!!" << G4endl; + + return physEsophagus; +} diff --git a/examples/advanced/human_phantom/src/G4ORNLHead.cc b/examples/advanced/human_phantom/src/G4ORNLHead.cc new file mode 100644 index 0000000000..9f034c5c99 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4ORNLHead.cc @@ -0,0 +1,95 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4ORNLHead.hh" + +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" + +#include "G4VisAttributes.hh" +#include "G4PhysicalVolumeStore.hh" + +G4ORNLHead::G4ORNLHead() +{ +} + +G4ORNLHead::~G4ORNLHead() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4ORNLHead::ConstructHead(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/ORNLHead.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + + G4LogicalVolume* logicHead = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("HeadVolume"); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("HeadPos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("HeadRot"); + +G4PhysicalVolumeStore::DeRegister((G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume()); + + + // Define rotation and position here! + G4VPhysicalVolume* physHead = new G4PVPlacement(rm,position, + "physicalHead", + logicHead, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicHead->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* HeadVisAtt = new G4VisAttributes(G4Colour(0.94,0.5,0.5)); + HeadVisAtt->SetForceSolid(false); + logicHead->SetVisAttributes(HeadVisAtt); + + G4cout << "Head created !!!!!!" << G4endl; + + return physHead; +} diff --git a/examples/advanced/human_phantom/src/G4ORNLHeart.cc b/examples/advanced/human_phantom/src/G4ORNLHeart.cc new file mode 100644 index 0000000000..a7c2c31adf --- /dev/null +++ b/examples/advanced/human_phantom/src/G4ORNLHeart.cc @@ -0,0 +1,93 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4ORNLHeart.hh" +#include "G4PhysicalVolumeStore.hh" +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" + +#include "G4VisAttributes.hh" + +G4ORNLHeart::G4ORNLHeart() +{ +} + +G4ORNLHeart::~G4ORNLHeart() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4ORNLHeart::ConstructHeart(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/ORNLHeart.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + + G4LogicalVolume* logicHeart = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("HeartVolume"); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("HeartPos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("HeartRot"); + +G4PhysicalVolumeStore::DeRegister((G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume()); + + // Define rotation and position here! + G4VPhysicalVolume* physHeart = new G4PVPlacement(rm,position, + "physicalHeart", + logicHeart, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicHeart->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* HeartVisAtt = new G4VisAttributes(G4Colour(1.0,0.0,0.0)); + HeartVisAtt->SetForceSolid(true); + logicHeart->SetVisAttributes(HeartVisAtt); + + G4cout << "Heart created !!!!!!" << G4endl; + + return physHeart; +} diff --git a/examples/advanced/human_phantom/src/G4ORNLKidney.cc b/examples/advanced/human_phantom/src/G4ORNLKidney.cc new file mode 100644 index 0000000000..c14a5ed950 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4ORNLKidney.cc @@ -0,0 +1,93 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4ORNLKidney.hh" +#include "G4PhysicalVolumeStore.hh" +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" + +#include "G4VisAttributes.hh" + +G4ORNLKidney::G4ORNLKidney() +{ +} + +G4ORNLKidney::~G4ORNLKidney() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4ORNLKidney::ConstructKidney(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/ORNLKidney.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + + G4LogicalVolume* logicKidney = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("KidneyVolume"); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("KidneyPos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("KidneyRot"); + +G4PhysicalVolumeStore::DeRegister((G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume()); + // Define rotation and position here! + G4VPhysicalVolume* physKidney = new G4PVPlacement(rm,position, + "physicalKidney", + logicKidney, + mother, + false, + 0); + + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicKidney->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* KidneyVisAtt = new G4VisAttributes(G4Colour(0.72,0.52,0.04)); + KidneyVisAtt->SetForceSolid(true); + logicKidney->SetVisAttributes(KidneyVisAtt); + + G4cout << "Kidney created !!!!!!" << G4endl; + + return physKidney; +} diff --git a/examples/advanced/human_phantom/src/G4ORNLLegBone.cc b/examples/advanced/human_phantom/src/G4ORNLLegBone.cc new file mode 100644 index 0000000000..05eabb3fdb --- /dev/null +++ b/examples/advanced/human_phantom/src/G4ORNLLegBone.cc @@ -0,0 +1,94 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4ORNLLegBone.hh" +#include "G4PhysicalVolumeStore.hh" +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" + +#include "G4VisAttributes.hh" + +G4ORNLLegBone::G4ORNLLegBone() +{ +} + +G4ORNLLegBone::~G4ORNLLegBone() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4ORNLLegBone::ConstructLegBone(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/ORNLLegBone.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + + G4LogicalVolume* logicLegBone = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("LegBoneVolume"); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("LegBonePos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("LegBoneRot"); + + G4PhysicalVolumeStore::DeRegister((G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume()); + + // Define rotation and position here! + G4VPhysicalVolume* physLegBone = new G4PVPlacement(rm,position, + "physicalLegBone", + logicLegBone, + mother, + false, + 0); + + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicLegBone->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* LegBoneVisAtt = new G4VisAttributes(G4Colour(0.46,0.53,0.6)); + LegBoneVisAtt->SetForceSolid(true); + logicLegBone->SetVisAttributes(LegBoneVisAtt); + + G4cout << "LegBone created !!!!!!" << G4endl; + + return physLegBone; +} diff --git a/examples/advanced/human_phantom/src/G4ORNLLegs.cc b/examples/advanced/human_phantom/src/G4ORNLLegs.cc new file mode 100644 index 0000000000..3151c2fd5c --- /dev/null +++ b/examples/advanced/human_phantom/src/G4ORNLLegs.cc @@ -0,0 +1,94 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +// +#include "G4ORNLLegs.hh" + +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" +#include "G4PhysicalVolumeStore.hh" +#include "G4VisAttributes.hh" + +G4ORNLLegs::G4ORNLLegs() +{ +} + +G4ORNLLegs::~G4ORNLLegs() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4ORNLLegs::ConstructLegs(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/ORNLLegs.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + + G4LogicalVolume* logicLegs = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("LegsVolume"); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("LegsPos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("LegsRot"); + + G4PhysicalVolumeStore::DeRegister((G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume()); + + // Define rotation and position here! + G4VPhysicalVolume* physLegs = new G4PVPlacement(rm,position, + "physicalLegs", + logicLegs, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicLegs->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* LegsVisAtt = new G4VisAttributes(G4Colour(0.94,0.5,0.5)); + LegsVisAtt->SetForceSolid(false); + logicLegs->SetVisAttributes(LegsVisAtt); + + G4cout << "Legs created !!!!!!" << G4endl; + + return physLegs; +} diff --git a/examples/advanced/human_phantom/src/G4ORNLLiver.cc b/examples/advanced/human_phantom/src/G4ORNLLiver.cc new file mode 100644 index 0000000000..7f64531b44 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4ORNLLiver.cc @@ -0,0 +1,94 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4ORNLLiver.hh" +#include "G4PhysicalVolumeStore.hh" +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" + +#include "G4VisAttributes.hh" + +G4ORNLLiver::G4ORNLLiver() +{ +} + +G4ORNLLiver::~G4ORNLLiver() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4ORNLLiver::ConstructLiver(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/ORNLLiver.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + + G4LogicalVolume* logicLiver = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("LiverVolume"); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("LiverPos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("LiverRot"); + + G4PhysicalVolumeStore::DeRegister((G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume()); + + // Define rotation and position here! + G4VPhysicalVolume* physLiver = new G4PVPlacement(rm,position, + "physicalLiver", + logicLiver, + mother, + false, + 0); + + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicLiver->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* LiverVisAtt = new G4VisAttributes(G4Colour(1.0,1.0,0.0)); + LiverVisAtt->SetForceSolid(true); + logicLiver->SetVisAttributes(LiverVisAtt); + + G4cout << "Liver created !!!!!!" << G4endl; + + return physLiver; +} diff --git a/examples/advanced/human_phantom/src/G4ORNLLowerLargeIntestine.cc b/examples/advanced/human_phantom/src/G4ORNLLowerLargeIntestine.cc new file mode 100644 index 0000000000..e8d69d772e --- /dev/null +++ b/examples/advanced/human_phantom/src/G4ORNLLowerLargeIntestine.cc @@ -0,0 +1,94 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4ORNLLowerLargeIntestine.hh" +#include "G4PhysicalVolumeStore.hh" +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" + +#include "G4VisAttributes.hh" + +G4ORNLLowerLargeIntestine::G4ORNLLowerLargeIntestine() +{ +} + +G4ORNLLowerLargeIntestine::~G4ORNLLowerLargeIntestine() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4ORNLLowerLargeIntestine::ConstructLowerLargeIntestine(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/ORNLLowerLargeIntestine.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + + G4LogicalVolume* logicLowerLargeIntestine = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("LowerLargeIntestineVolume"); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("LowerLargeIntestinePos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("LowerLargeIntestineRot"); + + G4PhysicalVolumeStore::DeRegister((G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume()); + + // Define rotation and position here! + G4VPhysicalVolume* physLowerLargeIntestine = new G4PVPlacement(rm,position, + "physicalLowerLargeIntestine", + logicLowerLargeIntestine, + mother, + false, + 0); + + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicLowerLargeIntestine->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* LowerLargeIntestineVisAtt = new G4VisAttributes(G4Colour(1.0,1.0,0.0)); + LowerLargeIntestineVisAtt->SetForceSolid(true); + logicLowerLargeIntestine->SetVisAttributes(LowerLargeIntestineVisAtt); + + G4cout << "LowerLargeIntestine created !!!!!!" << G4endl; + + return physLowerLargeIntestine; +} diff --git a/examples/advanced/human_phantom/src/G4ORNLLung.cc b/examples/advanced/human_phantom/src/G4ORNLLung.cc new file mode 100644 index 0000000000..315175da26 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4ORNLLung.cc @@ -0,0 +1,94 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4ORNLLung.hh" +#include "G4PhysicalVolumeStore.hh" +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" + +#include "G4VisAttributes.hh" + +G4ORNLLung::G4ORNLLung() +{ +} + +G4ORNLLung::~G4ORNLLung() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4ORNLLung::ConstructLung(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/ORNLLung.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + + G4LogicalVolume* logicLung = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("LungVolume"); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("LungPos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("LungRot"); + +G4PhysicalVolumeStore::DeRegister((G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume()); + + // Define rotation and position here! + G4VPhysicalVolume* physLung = new G4PVPlacement(rm,position, + "physicalLung", + logicLung, + mother, + false, + 0); + + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicLung->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* LungVisAtt = new G4VisAttributes(G4Colour(0.25,0.41,0.88)); + LungVisAtt->SetForceSolid(true); + logicLung->SetVisAttributes(LungVisAtt); + + G4cout << "Lung created !!!!!!" << G4endl; + + return physLung; +} diff --git a/examples/advanced/human_phantom/src/G4ORNLMiddleLowerSpine.cc b/examples/advanced/human_phantom/src/G4ORNLMiddleLowerSpine.cc new file mode 100644 index 0000000000..6a33f12fd1 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4ORNLMiddleLowerSpine.cc @@ -0,0 +1,93 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4ORNLMiddleLowerSpine.hh" +#include "G4PhysicalVolumeStore.hh" +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" + +#include "G4VisAttributes.hh" + +G4ORNLMiddleLowerSpine::G4ORNLMiddleLowerSpine() +{ +} + +G4ORNLMiddleLowerSpine::~G4ORNLMiddleLowerSpine() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4ORNLMiddleLowerSpine::ConstructMiddleLowerSpine(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/ORNLMiddleLowerSpine.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + + G4LogicalVolume* logicMiddleLowerSpine = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("MiddleLowerSpineVolume"); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("MiddleLowerSpinePos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("MiddleLowerSpineRot"); + + G4PhysicalVolumeStore::DeRegister((G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume()); + + // Define rotation and position here! + G4VPhysicalVolume* physMiddleLowerSpine = new G4PVPlacement(rm,position, + "physicalMiddleLowerSpine", + logicMiddleLowerSpine, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicMiddleLowerSpine->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* MiddleLowerSpineVisAtt = new G4VisAttributes(G4Colour(1.0,1.0,0.0)); + MiddleLowerSpineVisAtt->SetForceSolid(true); + logicMiddleLowerSpine->SetVisAttributes(MiddleLowerSpineVisAtt); + + G4cout << "MiddleLowerSpine created !!!!!!" << G4endl; + + return physMiddleLowerSpine; +} diff --git a/examples/advanced/human_phantom/src/G4ORNLOvary.cc b/examples/advanced/human_phantom/src/G4ORNLOvary.cc new file mode 100644 index 0000000000..6f91a2d86a --- /dev/null +++ b/examples/advanced/human_phantom/src/G4ORNLOvary.cc @@ -0,0 +1,92 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4ORNLOvary.hh" +#include "G4PhysicalVolumeStore.hh" +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" + +#include "G4VisAttributes.hh" + +G4ORNLOvary::G4ORNLOvary() +{ +} + +G4ORNLOvary::~G4ORNLOvary() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4ORNLOvary::ConstructOvary(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/ORNLOvary.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + G4LogicalVolume* logicOvary = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("OvaryVolume"); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("OvaryPos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("OvaryRot"); + + G4PhysicalVolumeStore::DeRegister((G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume()); + + // Define rotation and position here! + G4VPhysicalVolume* physOvary = new G4PVPlacement(rm,position, + "physicalOvary", + logicOvary, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicOvary->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* OvaryVisAtt = new G4VisAttributes(G4Colour(0.85,0.44,0.84)); + OvaryVisAtt->SetForceSolid(true); + logicOvary->SetVisAttributes(OvaryVisAtt); + + G4cout << "Ovary created !!!!!!" << G4endl; + + return physOvary; +} diff --git a/examples/advanced/human_phantom/src/G4ORNLPancreas.cc b/examples/advanced/human_phantom/src/G4ORNLPancreas.cc new file mode 100644 index 0000000000..a5df4da91a --- /dev/null +++ b/examples/advanced/human_phantom/src/G4ORNLPancreas.cc @@ -0,0 +1,92 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4ORNLPancreas.hh" +#include "G4PhysicalVolumeStore.hh" +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" + +#include "G4VisAttributes.hh" + +G4ORNLPancreas::G4ORNLPancreas() +{ +} + +G4ORNLPancreas::~G4ORNLPancreas() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4ORNLPancreas::ConstructPancreas(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/ORNLPancreas.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + G4LogicalVolume* logicPancreas = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("PancreasVolume"); + + G4PhysicalVolumeStore::DeRegister((G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume()); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("PancreasPos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("PancreasRot"); + + // Define rotation and position here! + G4VPhysicalVolume* physPancreas = new G4PVPlacement(rm,position, + "physicalPancreas", + logicPancreas, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicPancreas->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* PancreasVisAtt = new G4VisAttributes(G4Colour(0.28,0.82,0.81)); + PancreasVisAtt->SetForceSolid(true); + logicPancreas->SetVisAttributes(PancreasVisAtt); + + G4cout << "Pancreas created !!!!!!" << G4endl; + + return physPancreas; +} diff --git a/examples/advanced/human_phantom/src/G4ORNLPelvis.cc b/examples/advanced/human_phantom/src/G4ORNLPelvis.cc new file mode 100644 index 0000000000..09dd190859 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4ORNLPelvis.cc @@ -0,0 +1,94 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4ORNLPelvis.hh" +#include "G4PhysicalVolumeStore.hh" +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" + +#include "G4VisAttributes.hh" + +G4ORNLPelvis::G4ORNLPelvis() +{ +} + +G4ORNLPelvis::~G4ORNLPelvis() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4ORNLPelvis::ConstructPelvis(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/ORNLPelvis.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + + G4LogicalVolume* logicPelvis = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("PelvisVolume"); + + G4PhysicalVolumeStore::DeRegister((G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume()); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("PelvisPos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("PelvisRot"); + + // Define rotation and position here! + G4VPhysicalVolume* physPelvis = new G4PVPlacement(rm,position, + "physicalPelvis", + logicPelvis, + mother, + false, + 0); + + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicPelvis->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* PelvisVisAtt = new G4VisAttributes(G4Colour(0.46,0.53,0.6)); + PelvisVisAtt->SetForceSolid(true); + logicPelvis->SetVisAttributes(PelvisVisAtt); + + G4cout << "Pelvis created !!!!!!" << G4endl; + + return physPelvis; +} diff --git a/examples/advanced/human_phantom/src/G4ORNLRibCage.cc b/examples/advanced/human_phantom/src/G4ORNLRibCage.cc new file mode 100644 index 0000000000..2768266446 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4ORNLRibCage.cc @@ -0,0 +1,91 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4ORNLRibCage.hh" + +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" + +#include "G4VisAttributes.hh" + +G4ORNLRibCage::G4ORNLRibCage() +{ +} + +G4ORNLRibCage::~G4ORNLRibCage() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4ORNLRibCage::ConstructRibCage(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/ORNLRibCage.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + + G4LogicalVolume* logicRibCage = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("RibCageVolume"); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("RibCagePos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("RibCageRot"); + + // Define rotation and position here! + G4VPhysicalVolume* physRibCage = new G4PVPlacement(rm,position, + "physicalRibCage", + logicRibCage, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicRibCage->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* RibCageVisAtt = new G4VisAttributes(G4Colour(1.0,1.0,0.0)); + RibCageVisAtt->SetForceSolid(true); + logicRibCage->SetVisAttributes(RibCageVisAtt); + + G4cout << "RibCage created !!!!!!" << G4endl; + + return physRibCage; +} diff --git a/examples/advanced/human_phantom/src/G4ORNLSkull.cc b/examples/advanced/human_phantom/src/G4ORNLSkull.cc new file mode 100644 index 0000000000..2f88367463 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4ORNLSkull.cc @@ -0,0 +1,94 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4ORNLSkull.hh" +#include "G4PhysicalVolumeStore.hh" +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" + +#include "G4VisAttributes.hh" + +G4ORNLSkull::G4ORNLSkull() +{ +} + +G4ORNLSkull::~G4ORNLSkull() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4ORNLSkull::ConstructSkull(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/ORNLSkull.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + + G4LogicalVolume* logicSkull = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("SkullVolume"); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("SkullPos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("SkullRot"); + + G4PhysicalVolumeStore::DeRegister((G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume()); + + // Define rotation and position here! + G4VPhysicalVolume* physSkull = new G4PVPlacement(rm,position, + "physicalSkull", + logicSkull, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicSkull->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + + // Visualization Attributes + G4VisAttributes* SkullVisAtt = new G4VisAttributes(G4Colour(0.46,0.53,0.6)); + SkullVisAtt->SetForceSolid(false); + logicSkull->SetVisAttributes(SkullVisAtt); + + G4cout << "Skull created !!!!!!" << G4endl; + + return physSkull; +} diff --git a/examples/advanced/human_phantom/src/G4ORNLSpleen.cc b/examples/advanced/human_phantom/src/G4ORNLSpleen.cc new file mode 100644 index 0000000000..9ae9e4b484 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4ORNLSpleen.cc @@ -0,0 +1,93 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4ORNLSpleen.hh" +#include "G4PhysicalVolumeStore.hh" +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" + +#include "G4VisAttributes.hh" + +G4ORNLSpleen::G4ORNLSpleen() +{ +} + +G4ORNLSpleen::~G4ORNLSpleen() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4ORNLSpleen::ConstructSpleen(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/ORNLSpleen.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + + G4LogicalVolume* logicSpleen = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("SpleenVolume"); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("SpleenPos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("SpleenRot"); + + G4PhysicalVolumeStore::DeRegister((G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume()); + + // Define rotation and position here! + G4VPhysicalVolume* physSpleen = new G4PVPlacement(rm,position, + "physicalSpleen", + logicSpleen, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicSpleen->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* SpleenVisAtt = new G4VisAttributes(G4Colour(0.41,0.41,0.41)); + SpleenVisAtt->SetForceSolid(true); + logicSpleen->SetVisAttributes(SpleenVisAtt); + + G4cout << "Spleen created !!!!!!" << G4endl; + + return physSpleen; +} diff --git a/examples/advanced/human_phantom/src/G4ORNLStomach.cc b/examples/advanced/human_phantom/src/G4ORNLStomach.cc new file mode 100644 index 0000000000..108a2e45b6 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4ORNLStomach.cc @@ -0,0 +1,94 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4ORNLStomach.hh" +#include "G4PhysicalVolumeStore.hh" +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" + +#include "G4VisAttributes.hh" + +G4ORNLStomach::G4ORNLStomach() +{ +} + +G4ORNLStomach::~G4ORNLStomach() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4ORNLStomach::ConstructStomach(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/ORNLStomach.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + + G4LogicalVolume* logicStomach = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("StomachVolume"); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("StomachPos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("StomachRot"); + + G4PhysicalVolumeStore::DeRegister((G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume()); + + // Define rotation and position here! + G4VPhysicalVolume* physStomach = new G4PVPlacement(rm,position, + "physicalStomach", + logicStomach, + mother, + false, + 0); + + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicStomach->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* StomachVisAtt = new G4VisAttributes(G4Colour(0.63,0.32,0.17)); + StomachVisAtt->SetForceSolid(true); + logicStomach->SetVisAttributes(StomachVisAtt); + + G4cout << "Stomach created !!!!!!" << G4endl; + + return physStomach; +} diff --git a/examples/advanced/human_phantom/src/G4ORNLTestes.cc b/examples/advanced/human_phantom/src/G4ORNLTestes.cc new file mode 100644 index 0000000000..f439836c6e --- /dev/null +++ b/examples/advanced/human_phantom/src/G4ORNLTestes.cc @@ -0,0 +1,94 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4ORNLTestes.hh" +#include "G4PhysicalVolumeStore.hh" +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" + +#include "G4VisAttributes.hh" + +G4ORNLTestes::G4ORNLTestes() +{ +} + +G4ORNLTestes::~G4ORNLTestes() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4ORNLTestes::ConstructTestes(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/ORNLTestes.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + + G4LogicalVolume* logicTestes = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("TestesVolume"); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("TestesPos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("TestesRot"); + + G4PhysicalVolumeStore::DeRegister((G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume()); + + // Define rotation and position here! + G4VPhysicalVolume* physTestes = new G4PVPlacement(rm,position, + "physicalTestes", + logicTestes, + mother, + false, + 0); + + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicTestes->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* TestesVisAtt = new G4VisAttributes(G4Colour(1.0,1.0,0.0)); + TestesVisAtt->SetForceSolid(true); + logicTestes->SetVisAttributes(TestesVisAtt); + + G4cout << "Testes created !!!!!!" << G4endl; + + return physTestes; +} diff --git a/examples/advanced/human_phantom/src/G4ORNLThyroid.cc b/examples/advanced/human_phantom/src/G4ORNLThyroid.cc new file mode 100644 index 0000000000..d0491d7d2e --- /dev/null +++ b/examples/advanced/human_phantom/src/G4ORNLThyroid.cc @@ -0,0 +1,94 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4ORNLThyroid.hh" +#include "G4PhysicalVolumeStore.hh" +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" + +#include "G4VisAttributes.hh" + +G4ORNLThyroid::G4ORNLThyroid() +{ +} + +G4ORNLThyroid::~G4ORNLThyroid() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4ORNLThyroid::ConstructThyroid(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/ORNLThyroid.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + + G4LogicalVolume* logicThyroid = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("ThyroidVolume"); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("ThyroidPos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("ThyroidRot"); + + G4PhysicalVolumeStore::DeRegister((G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume()); + + // Define rotation and position here! + G4VPhysicalVolume* physThyroid = new G4PVPlacement(rm,position, + "physicalThyroid", + logicThyroid, + mother, + false, + 0); + + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicThyroid->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* ThyroidVisAtt = new G4VisAttributes(G4Colour(0.0,1.0,1.0)); + ThyroidVisAtt->SetForceSolid(true); + logicThyroid->SetVisAttributes(ThyroidVisAtt); + + G4cout << "Thyroid created !!!!!!" << G4endl; + + return physThyroid; +} diff --git a/examples/advanced/human_phantom/src/G4ORNLTrunk.cc b/examples/advanced/human_phantom/src/G4ORNLTrunk.cc new file mode 100644 index 0000000000..b1c1bd9e92 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4ORNLTrunk.cc @@ -0,0 +1,95 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4ORNLTrunk.hh" + +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" +#include "G4PhysicalVolumeStore.hh" +#include "G4VisAttributes.hh" + +G4ORNLTrunk::G4ORNLTrunk() +{ +} + +G4ORNLTrunk::~G4ORNLTrunk() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4ORNLTrunk::ConstructTrunk(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/ORNLTrunk.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + + G4LogicalVolume* logicTrunk = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("TrunkVolume"); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("TrunkPos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("TrunkRot"); + + // Define rotation and position here! +G4PhysicalVolumeStore::DeRegister((G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume()); + + + G4VPhysicalVolume* physTrunk = new G4PVPlacement(rm,position, + "physicalTrunk", + logicTrunk, + mother, + false, + 0); + + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicTrunk->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* TrunkVisAtt = new G4VisAttributes(G4Colour(0.94,0.5,0.5)); + TrunkVisAtt->SetForceSolid(false); + logicTrunk->SetVisAttributes(TrunkVisAtt); + + G4cout << "Trunk created !!!!!!" << G4endl; + + return physTrunk; +} diff --git a/examples/advanced/human_phantom/src/G4ORNLUpperLargeIntestine.cc b/examples/advanced/human_phantom/src/G4ORNLUpperLargeIntestine.cc new file mode 100644 index 0000000000..194eaca1bc --- /dev/null +++ b/examples/advanced/human_phantom/src/G4ORNLUpperLargeIntestine.cc @@ -0,0 +1,93 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4ORNLUpperLargeIntestine.hh" +#include "G4PhysicalVolumeStore.hh" +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" + +#include "G4VisAttributes.hh" + +G4ORNLUpperLargeIntestine::G4ORNLUpperLargeIntestine() +{ +} + +G4ORNLUpperLargeIntestine::~G4ORNLUpperLargeIntestine() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4ORNLUpperLargeIntestine::ConstructUpperLargeIntestine(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/ORNLUpperLargeIntestine.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + G4LogicalVolume* logicUpperLargeIntestine = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("UpperLargeIntestineVolume"); + + G4PhysicalVolumeStore::DeRegister((G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume()); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("UpperLargeIntestinePos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("UpperLargeIntestineRot"); + + // Define rotation and position here! + G4VPhysicalVolume* physUpperLargeIntestine = new G4PVPlacement(rm,position, + "physicalUpperLargeIntestine", + logicUpperLargeIntestine, + mother, + false, + 0); + + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicUpperLargeIntestine->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* UpperLargeIntestineVisAtt = new G4VisAttributes(G4Colour(1.0,1.0,0.0)); + UpperLargeIntestineVisAtt->SetForceSolid(true); + logicUpperLargeIntestine->SetVisAttributes(UpperLargeIntestineVisAtt); + + G4cout << "UpperLargeIntestine created !!!!!!" << G4endl; + + return physUpperLargeIntestine; +} diff --git a/examples/advanced/human_phantom/src/G4ORNLUpperSpine.cc b/examples/advanced/human_phantom/src/G4ORNLUpperSpine.cc new file mode 100644 index 0000000000..b4c793902b --- /dev/null +++ b/examples/advanced/human_phantom/src/G4ORNLUpperSpine.cc @@ -0,0 +1,94 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4ORNLUpperSpine.hh" +#include "G4PhysicalVolumeStore.hh" +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" + +#include "G4VisAttributes.hh" + +G4ORNLUpperSpine::G4ORNLUpperSpine() +{ +} + +G4ORNLUpperSpine::~G4ORNLUpperSpine() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4ORNLUpperSpine::ConstructUpperSpine(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/ORNLUpperSpine.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + + G4LogicalVolume* logicUpperSpine = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("UpperSpineVolume"); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("UpperSpinePos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("UpperSpineRot"); + + G4PhysicalVolumeStore::DeRegister((G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume()); + + // Define rotation and position here! + G4VPhysicalVolume* physUpperSpine = new G4PVPlacement(rm,position, + "physicalUpperSpine", + logicUpperSpine, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicUpperSpine->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + + // Visualization Attributes + G4VisAttributes* UpperSpineVisAtt = new G4VisAttributes(G4Colour(1.0,1.0,0.0)); + UpperSpineVisAtt->SetForceSolid(true); + logicUpperSpine->SetVisAttributes(UpperSpineVisAtt); + + G4cout << "UpperSpine created !!!!!!" << G4endl; + + return physUpperSpine; +} diff --git a/examples/advanced/human_phantom/src/G4ORNLUrinaryBladder.cc b/examples/advanced/human_phantom/src/G4ORNLUrinaryBladder.cc new file mode 100644 index 0000000000..8475518daa --- /dev/null +++ b/examples/advanced/human_phantom/src/G4ORNLUrinaryBladder.cc @@ -0,0 +1,93 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4ORNLUrinaryBladder.hh" +#include "G4PhysicalVolumeStore.hh" +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" + +#include "G4VisAttributes.hh" + +G4ORNLUrinaryBladder::G4ORNLUrinaryBladder() +{ +} + +G4ORNLUrinaryBladder::~G4ORNLUrinaryBladder() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4ORNLUrinaryBladder::ConstructUrinaryBladder(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/ORNLUrinaryBladder.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + + G4LogicalVolume* logicUrinaryBladder = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("UrinaryBladderVolume"); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("UrinaryBladderPos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("UrinaryBladderRot"); + +G4PhysicalVolumeStore::DeRegister((G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume()); + // Define rotation and position here! + G4VPhysicalVolume* physUrinaryBladder = new G4PVPlacement(rm,position, + "physicalUrinaryBladder", + logicUrinaryBladder, + mother, + false, + 0); + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicUrinaryBladder->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + + // Visualization Attributes + G4VisAttributes* UrinaryBladderVisAtt = new G4VisAttributes(G4Colour(0.85,0.65,0.125)); + UrinaryBladderVisAtt->SetForceSolid(true); + logicUrinaryBladder->SetVisAttributes(UrinaryBladderVisAtt); + + G4cout << "UrinaryBladder created !!!!!!" << G4endl; + + return physUrinaryBladder; +} diff --git a/examples/advanced/human_phantom/src/G4ORNLUterus.cc b/examples/advanced/human_phantom/src/G4ORNLUterus.cc new file mode 100644 index 0000000000..6aca9d40e3 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4ORNLUterus.cc @@ -0,0 +1,94 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4ORNLUterus.hh" +#include "G4PhysicalVolumeStore.hh" +#include "G4Processor/GDMLProcessor.h" +#include "globals.hh" +#include "G4SDManager.hh" + +#include "G4VisAttributes.hh" + +G4ORNLUterus::G4ORNLUterus() +{ +} + +G4ORNLUterus::~G4ORNLUterus() +{ + sxp.Finalize(); +} + +G4VPhysicalVolume* G4ORNLUterus::ConstructUterus(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + // Initialize GDML Processor + sxp.Initialize(); + config.SetURI( "gdmlData/"+sex+"/ORNLUterus.gdml" ); + config.SetSetupName( "Default" ); + sxp.Configure( &config ); + + // Run GDML Processor + sxp.Run(); + + + G4LogicalVolume* logicUterus = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("UterusVolume"); + + G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("UterusPos"); + G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("UterusRot"); + +G4PhysicalVolumeStore::DeRegister((G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume()); + + // Define rotation and position here! + G4VPhysicalVolume* physUterus = new G4PVPlacement(rm,position, + "physicalUterus", + logicUterus, + mother, + false, + 0); + + + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + logicUterus->SetSensitiveDetector( SDman->FindSensitiveDetector("BodyPartSD") ); + } + + // Visualization Attributes + G4VisAttributes* UterusVisAtt = new G4VisAttributes(G4Colour(0.85,0.44,0.84)); + UterusVisAtt->SetForceSolid(true); + logicUterus->SetVisAttributes(UterusVisAtt); + + G4cout << "Uterus created !!!!!!" << G4endl; + + return physUterus; +} diff --git a/examples/advanced/human_phantom/src/G4ParameterisedBreast.cc b/examples/advanced/human_phantom/src/G4ParameterisedBreast.cc new file mode 100644 index 0000000000..06b38e16f5 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4ParameterisedBreast.cc @@ -0,0 +1,204 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4ParameterisedBreast.hh" +#include "globals.hh" +#include "G4SDManager.hh" +#include "G4VisAttributes.hh" +#include "G4Tubs.hh" +#include "G4ThreeVector.hh" +#include "G4VPhysicalVolume.hh" +#include "G4RotationMatrix.hh" +#include "G4Material.hh" +#include "G4LogicalVolume.hh" +#include "G4HumanPhantomMaterial.hh" +#include "G4VPhysicalVolume.hh" +#include "G4PVPlacement.hh" +#include "G4PVReplica.hh" +#include "G4HumanPhantomROGeometry.hh" +#include "G4HumanPhantomSDBreast.hh" +G4ParameterisedBreast::G4ParameterisedBreast():breastSD(0) +{ +} + +G4ParameterisedBreast::~G4ParameterisedBreast() +{ + + +} + +G4VPhysicalVolume* G4ParameterisedBreast::ConstructBreast(G4VPhysicalVolume* mother, G4String sex, G4bool sensitivity) +{ + + G4cout << "ConstructParameterisedBreast for " << sex << G4endl; + + G4HumanPhantomMaterial* material = new G4HumanPhantomMaterial(); + G4Material* adipose = material -> GetMaterial("adipose"); + G4Material* adipose_glandular = material -> GetMaterial("adipose_glandular"); + delete material; + + G4double rmin = 0.* cm; + G4double rmax = 6. * cm; + G4double zz = 6. * cm; + G4double startPhi = 0.* degree; + G4double spanningPhi = 180. * degree; + + G4Tubs* breast = new G4Tubs("out_breast", rmin, rmax, + zz/2., startPhi, spanningPhi); + + G4LogicalVolume* breast_log = new G4LogicalVolume(breast, + adipose, + "Breast", + 0, 0, 0); + rmax = 5.5 *cm; + zz = 5. *cm; + G4Tubs* innerBreast = new G4Tubs("inner_breast", + rmin, rmax, + zz/2., startPhi, spanningPhi); + + G4LogicalVolume* innerBreast_log = new G4LogicalVolume(innerBreast, + adipose_glandular, + "InnerBreast", + 0, 0, 0); + + G4RotationMatrix* matrix = new G4RotationMatrix(); + matrix -> rotateX(-90.* degree); + matrix -> rotateY(180.* degree); + matrix -> rotateZ(-18. * degree); + + + G4VPhysicalVolume* physBreast = new G4PVPlacement(matrix,G4ThreeVector(8.63*cm, 46.87* cm, 8.4854 *cm), + "physicalParameterisedBreast", + breast_log, + mother, + false, + 0); + + G4VPhysicalVolume* physInnerBreast = new G4PVPlacement(0,0, + "innerBreast", + innerBreast_log, + physBreast, + false, + 0); + + + // Parameterisation with Replicas + /* + G4double rmin_voxelz = 0.* cm; + G4double rmax_voxelz = 5.5 * cm; + G4double zz_voxels = 5. * cm; + G4double startPhi_voxelz = 0.* degree; + G4double spanningPhi_voxelz = 180. * degree; + G4int nslice = 10; + + G4Tubs* voxelz = new G4Tubs("voxel_z", rmin_voxelz, rmax_voxelz, zz_voxels/(2*nslice),startPhi_voxelz, spanningPhi_voxelz); + G4LogicalVolume* voxelz_log = new G4LogicalVolume(voxelz, adipose_glandular, "voxelz_log",0 , 0, 0); + G4VPhysicalVolume* voxelz_phys = new G4PVReplica("LinearArray", voxelz_log, physInnerBreast, + kZAxis, nslice, zz_voxels/nslice); + + G4double voxel_height = (zz_voxels/nslice); + + G4int n_voxels = 10; + + G4double voxel_phi = spanningPhi_voxelz/n_voxels; + + G4cout <<"voxel_phi: " < SetForceSolid(false); + breast_log -> SetVisAttributes(BreastVisAtt); + + G4VisAttributes* innerBreastVisAtt = new G4VisAttributes(G4Colour(1.0,0.0,0.)); + innerBreastVisAtt -> SetForceSolid(false); + innerBreast_log -> SetVisAttributes(innerBreastVisAtt); + // voxelz_log -> SetVisAttributes(innerBreastVisAtt); + // voxel_log -> SetVisAttributes(innerBreastVisAtt); + + G4cout << "Parameterised Breast created !!!!!!" << G4endl; + + // Testing Breast Volume + G4double BreastVol = breast_log->GetSolid()->GetCubicVolume(); + G4cout << "Volume of Breast = " << BreastVol/cm3 << " cm^3" << G4endl; + + // Testing Breast Material + G4String BreastMat = breast_log->GetMaterial()->GetName(); + G4cout << "Material of Breast = " << BreastMat << G4endl; + + G4String innerBreastMat = innerBreast_log->GetMaterial()->GetName(); + G4cout << "Material of the Inner Breast = " << BreastMat << G4endl; + + // Testing Density + //G4double BreastDensity = logicBreast->GetMaterial()->GetDensity(); + //G4cout << "Density of Material = " << BreastDensity*cm3/g << " g/cm^3" << G4endl; + + // Testing Mass + //G4double BreastMass = (BreastVol)*BreastDensity; + //G4cout << "Mass of Breast = " << BreastMass/gram << " g" << G4endl; + + + // Sensitive detector + // Sensitive Body Part + if (sensitivity==true) + { + G4SDManager* SDman = G4SDManager::GetSDMpointer(); + + if(!breastSD) + { + G4String sensitiveDetectorName = "Parameterised_breast"; + + breastSD = new G4HumanPhantomSDBreast(sensitiveDetectorName); + + G4String ROGeometryName = "PhantomROGeometry"; + + G4HumanPhantomROGeometry* phantomROGeometry = new G4HumanPhantomROGeometry(ROGeometryName); + phantomROGeometry -> BuildROGeometry(); + breastSD -> SetROgeometry(phantomROGeometry); + SDman -> AddNewDetector(breastSD); + innerBreast_log -> SetSensitiveDetector(breastSD); + } + } + return physInnerBreast; + +} diff --git a/examples/advanced/human_phantom/src/G4PhantomBuilder.cc b/examples/advanced/human_phantom/src/G4PhantomBuilder.cc new file mode 100644 index 0000000000..c9089310c9 --- /dev/null +++ b/examples/advanced/human_phantom/src/G4PhantomBuilder.cc @@ -0,0 +1,335 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include "G4PhantomBuilder.hh" +#include "G4VBodyFactory.hh" +#include "G4MIRDBodyFactory.hh" +#include "G4ORNLBodyFactory.hh" +#include "G4RunManager.hh" +#include "G4Element.hh" +#include "G4Material.hh" +#include "G4Box.hh" +#include "G4LogicalVolume.hh" +#include "G4PVPlacement.hh" + +#include "G4VisAttributes.hh" + +G4PhantomBuilder::G4PhantomBuilder(): sex("Female"), model("MIRD") +{ + // sex can be "female" or "male" + motherVolume = 0; + headVolume = 0; + trunkVolume = 0; + neckVolume = 0; + maleGenitaliaVolume = 0; +} + +G4PhantomBuilder::~G4PhantomBuilder() +{ + delete body; +} + +void G4PhantomBuilder::BuildWorld() +{ + // Elements + G4double A; + G4double Z; + A = 16.00*g/mole; + G4Element* elO = new G4Element("Oxygen","O",Z = 8.,A); + A = 14.01*g/mole; + G4Element* elN = new G4Element("Nitrogen","N",Z = 7.,A); + + // Air Material + G4double d = 1.290*mg/cm3; + G4Material* matAir = new G4Material("Air",d,2); + matAir->AddElement(elN,0.7); + matAir->AddElement(elO,0.3); + + // World Volume + G4double worldSize = 1.*m ; + + G4Box* world = new G4Box("world", worldSize, worldSize, worldSize); + + G4LogicalVolume* logicWorld = new G4LogicalVolume(world, + matAir, + "logicalWorld", 0, 0,0); + + motherVolume = new G4PVPlacement(0,G4ThreeVector(), + "physicalWorld", + logicWorld, + 0, + false, + 0); + + // Visualization Attributes + G4VisAttributes* WorldVisAtt = new G4VisAttributes(G4VisAttributes::Invisible); + WorldVisAtt->SetForceSolid(false); + logicWorld->SetVisAttributes(WorldVisAtt); +} + +void G4PhantomBuilder::BuildHead(G4bool sensitivity) +{ + if (motherVolume == 0) + G4Exception("The world volume is missing !!!!!"); + + G4cout <<"MotherVolume: " << motherVolume -> GetName()<< G4endl; + G4cout << "sensitivity : "<< sensitivity << G4endl; + headVolume = body -> CreateHead(motherVolume,sex, sensitivity); +} + +void G4PhantomBuilder::BuildTrunk(G4bool sensitivity) +{ + if (motherVolume == 0) + G4Exception("The world volume is missing !!!!!"); + + trunkVolume = body -> CreateTrunk(motherVolume,sex,sensitivity); +} + +void G4PhantomBuilder::BuildLegs(G4bool sensitivity) +{ + if (motherVolume == 0) + G4Exception("The world volume is missing !!!!!"); + + legsVolume = body -> CreateLegs(motherVolume,sex,sensitivity); +} + +void G4PhantomBuilder::BuildNeck(G4bool sensitivity) +{ + if (motherVolume == 0) + G4Exception("The world volume is missing !!!!!"); + + neckVolume = body -> CreateNeck(motherVolume,sex,sensitivity); +} + +void G4PhantomBuilder::BuildUpperSpine(G4bool sensitivity) +{ + if (headVolume == 0) + G4Exception("The head volume is missing !!!!!"); + + body -> CreateUpperSpine(headVolume,sex,sensitivity); +} + +void G4PhantomBuilder::BuildMiddleLowerSpine(G4bool sensitivity) +{ + if (trunkVolume == 0) + G4Exception("The trunk volume is missing !!!!!"); + + body -> CreateMiddleLowerSpine(trunkVolume,sex,sensitivity); +} + +void G4PhantomBuilder::BuildSpleen(G4bool sensitivity) +{ + if (trunkVolume == 0) + G4Exception("The trunk volume is missing !!!!!"); + + body -> CreateSpleen(trunkVolume,sex,sensitivity); +} + +void G4PhantomBuilder::BuildLegBone(G4bool sensitivity) +{ + if (legsVolume == 0) + G4Exception("The legs volume volume is missing !!!!!"); + + body -> CreateLegBone(legsVolume,sex,sensitivity); +} + +void G4PhantomBuilder::BuildArmBone(G4bool sensitivity) +{ + if (trunkVolume == 0) + G4Exception("The trunk volume is missing !!!!!"); + + body -> CreateArmBone(trunkVolume,sex,sensitivity); +} + +void G4PhantomBuilder::BuildSkull(G4bool sensitivity) +{ + if (headVolume == 0) + G4Exception("The head volume is missing !!!!!"); + + body -> CreateSkull(headVolume,sex,sensitivity); +} +/* +void G4PhantomBuilder::BuildRibCage(G4bool sensitivity) +{ + if (trunkVolume == 0) + G4Exception("The trunk volume is missing !!!!!"); + + body -> CreateRibCage(trunkVolume,sex,sensitivity); +} +*/ +void G4PhantomBuilder::BuildPelvis(G4bool sensitivity) +{ + if (trunkVolume == 0) + G4Exception("The trunk volume is missing !!!!!"); + + body -> CreatePelvis(trunkVolume,sex,sensitivity); +} +/* +void G4PhantomBuilder::BuildScapulae(G4bool sensitivity) +{ + if (trunkVolume == 0) + G4Exception("The trunk volume is missing !!!!!"); + + body -> CreateScapulae(trunkVolume,sex,sensitivity); +} + +void G4PhantomBuilder::BuildClavicles(G4bool sensitivity) +{ + if (trunkVolume == 0) + G4Exception("The trunk volume is missing !!!!!"); + + body -> CreateClavicles(trunkVolume,sex,sensitivity); +} +*/ + +void G4PhantomBuilder::BuildBrain(G4bool sensitivity) +{ + if (headVolume == 0) + G4Exception("The trunk volume is missing !!!!!"); + + body -> CreateBrain(headVolume,sex,sensitivity); +} + +void G4PhantomBuilder::BuildHeart(G4bool sensitivity) +{ + if (trunkVolume == 0) + G4Exception("The trunk volume is missing !!!!!"); + + body -> CreateHeart(trunkVolume,sex,sensitivity); +} + +void G4PhantomBuilder::BuildLung(G4bool sensitivity) +{ + if (trunkVolume == 0) + G4Exception("The trunk volume is missing !!!!!"); + + body -> CreateLung(trunkVolume,sex,sensitivity); +} + +void G4PhantomBuilder::BuildStomach(G4bool sensitivity) +{ + if (trunkVolume == 0) + G4Exception("The trunk volume is missing !!!!!"); + + body -> CreateStomach(trunkVolume,sex,sensitivity); +} + +void G4PhantomBuilder::BuildUpperLargeIntestine(G4bool sensitivity) +{ + if (trunkVolume == 0) + G4Exception("The trunk volume is missing !!!!!"); + + body -> CreateUpperLargeIntestine(trunkVolume,sex,sensitivity); +} + +void G4PhantomBuilder::BuildLowerLargeIntestine(G4bool sensitivity) +{ + if (trunkVolume == 0) + G4Exception("The trunk volume is missing !!!!!"); + + body -> CreateLowerLargeIntestine(trunkVolume,sex,sensitivity); +} +/* +void G4PhantomBuilder::BuildEsophagus(G4bool sensitivity) +{ + if (trunkVolume == 0) + G4Exception("The trunk volume is missing !!!!!"); + + body -> CreateEsophagus(trunkVolume,sex,sensitivity); +} +*/ +void G4PhantomBuilder::BuildKidney(G4bool sensitivity) +{ + if (trunkVolume == 0) + G4Exception("The trunk volume is missing !!!!!"); + + body -> CreateKidney(trunkVolume,sex,sensitivity); +} +/* +void G4PhantomBuilder::BuildAdrenal(G4bool sensitivity) +{ + if (trunkVolume == 0) + G4Exception("The trunk volume is missing !!!!!"); + + body -> CreateAdrenal(trunkVolume,sex,sensitivity); +} +*/ +void G4PhantomBuilder::BuildLiver(G4bool sensitivity) +{ + if (trunkVolume == 0) + G4Exception("The trunk volume is missing !!!!!"); + + body -> CreateLiver(trunkVolume,sex,sensitivity); +} +void G4PhantomBuilder::BuildPancreas(G4bool sensitivity) +{ + if (trunkVolume == 0) + G4Exception("The trunk volume is missing !!!!!"); + + body -> CreatePancreas(trunkVolume,sex,sensitivity); +} + +void G4PhantomBuilder::BuildUrinaryBladder(G4bool sensitivity) +{ + if (trunkVolume == 0) + G4Exception("The trunk volume is missing !!!!!"); + + body -> CreateUrinaryBladder(trunkVolume,sex,sensitivity); +} + +void G4PhantomBuilder::BuildThyroid(G4bool sensitivity) +{ + if (headVolume == 0) + G4Exception("The trunk volume is missing !!!!!"); + + body -> CreateThyroid(headVolume,sex,sensitivity); +} + + +G4VPhysicalVolume* G4PhantomBuilder::GetPhantom() +{ + return motherVolume; +} + +void G4PhantomBuilder::SetSex(G4String sexFlag) +{ + sex = sexFlag; +} + +void G4PhantomBuilder::SetModel(G4String modelFlag) +{ + model = modelFlag; + + if(model=="MIRD") body = new G4MIRDBodyFactory(); + if(model=="ORNL") body = new G4ORNLBodyFactory(); +} diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04Field.hh b/examples/advanced/human_phantom/src/G4VBodyFactory.cc similarity index 77% rename from examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04Field.hh rename to examples/advanced/human_phantom/src/G4VBodyFactory.cc index e4e5d13a88..872f967be8 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04Field.hh +++ b/examples/advanced/human_phantom/src/G4VBodyFactory.cc @@ -23,27 +23,18 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. +// +#include"G4VBodyFactory.hh" -#ifndef ExN04Field_H -#define ExN04Field_H 1 - -#include "globals.hh" -#include "G4MagneticField.hh" - -class ExN04Field : public G4MagneticField -{ - public: - ExN04Field(); - ~ExN04Field(); - - void GetFieldValue( const double Point[3], - double *Bfield ) const; - - private: - G4double Bz; - G4double rmax_sq; - G4double zmax; -}; - -#endif +G4VBodyFactory::G4VBodyFactory() +{;} +G4VBodyFactory::~G4VBodyFactory() +{;} diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02Field.hh b/examples/advanced/human_phantom/src/G4VPhantomBuilder.cc similarity index 77% rename from examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02Field.hh rename to examples/advanced/human_phantom/src/G4VPhantomBuilder.cc index 5f5143ecf5..d2b6cca5fc 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02Field.hh +++ b/examples/advanced/human_phantom/src/G4VPhantomBuilder.cc @@ -23,26 +23,18 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// ==================================================================== +// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy +// +// Based on code developed by the undergraduate student G. Guerrieri +// Note: this is a preliminary beta-version of the code; an improved +// version will be distributed in the next Geant4 public release, compliant +// with the design in a forthcoming publication, and subject to a +// design and code review. // -// H02Field.hh -// $Id: H02Field.hh,v 1.3 2006/06/29 17:13:01 gunter Exp $ // -// ==================================================================== -#ifndef H02_FIELD_H -#define H02_FIELD_H - -#include "globals.hh" -#include "G4MagneticField.hh" - -class H02Field : public G4MagneticField { -public: - H02Field() { } - ~H02Field() { } - - void GetFieldValue(const G4double Point[3], G4double* Bfield ) const; - -}; - -#endif +#include"G4VPhantomBuilder.hh" +G4VPhantomBuilder::G4VPhantomBuilder() +{;} +G4VPhantomBuilder::~G4VPhantomBuilder() +{;} diff --git a/examples/advanced/human_phantom/vrmlVis.mac b/examples/advanced/human_phantom/vrmlVis.mac new file mode 100644 index 0000000000..5b234d5706 --- /dev/null +++ b/examples/advanced/human_phantom/vrmlVis.mac @@ -0,0 +1,13 @@ +# +# Macro file for the initialization phase +# when runing in interactive mode +# +# Sets some default verbose +# +/vis/open VRML2FILE +/vis/drawVolume +/vis/scene/create +# Attack the current scene handler to the current scene +/vis/sceneHandler/attach +/vis/viewer/flush +# diff --git a/examples/advanced/lAr_calorimeter/GNUmakefile b/examples/advanced/lAr_calorimeter/GNUmakefile index 278de873fe..60fd0d5022 100644 --- a/examples/advanced/lAr_calorimeter/GNUmakefile +++ b/examples/advanced/lAr_calorimeter/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.7 2004/01/28 17:58:58 ribon Exp $ +# $Id: GNUmakefile,v 1.8 2006/11/14 14:49:19 ribon Exp $ # -------------------------------------------------------------- # GNUmakefile for examples module. Gabriele Cosmo, 06/04/98. # -------------------------------------------------------------- @@ -13,8 +13,6 @@ endif include $(G4INSTALL)/config/architecture.gmk -include hadronic_lists.gmk - #G4ANALYSIS_USE:= true ifdef G4ANALYSIS_USE diff --git a/examples/advanced/lAr_calorimeter/History b/examples/advanced/lAr_calorimeter/History index f4993a8180..bbe90cda78 100644 --- a/examples/advanced/lAr_calorimeter/History +++ b/examples/advanced/lAr_calorimeter/History @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -$Id: History,v 1.13 2005/12/08 16:39:16 ribon Exp $ +$Id: History,v 1.15 2006/11/14 14:49:19 ribon Exp $ ------------------------------------------------------------------- ========================================================= @@ -9,6 +9,14 @@ $Id: History,v 1.13 2005/12/08 16:39:16 ribon Exp $ Category History file --------------------- +14.11.2006 - A.Ribon (lAr_calorimeter-V08-01-01) + Removed hadronic_lists.gmk after the inclusion of + Physics Lists in the Geant4 kernel. + +21.07.2006 - A.Ribon (lAr_calorimeter-V08-01-00) + New hadronic_lists.gmk, consistent with composite_calorimeter. + Fixed some uninitialization problems. + 08.12.2005 - A.Ribon (lAr_calorimeter-V07-01-00) Migration to CLHEP namespace. Removed also old header files. diff --git a/examples/advanced/lAr_calorimeter/hadronic_lists.gmk b/examples/advanced/lAr_calorimeter/hadronic_lists.gmk deleted file mode 100644 index 5707022457..0000000000 --- a/examples/advanced/lAr_calorimeter/hadronic_lists.gmk +++ /dev/null @@ -1,60 +0,0 @@ -# $Id: hadronic_lists.gmk,v 1.4 2005/10/13 09:38:33 ribon Exp $ -# -------------------------------------------------------------- -# hadronic physics-lists setup -# -------------------------------------------------------------- - -ifndef G4LISTS_BASE - EXTRALIBS += -L$(G4LIB)/plists/$(G4SYSTEM) - G4LISTS_BASE = $(G4INSTALL)/physics_lists -else - EXTRALIBS += -L$(G4LISTS_BASE)/hadronic/plists/lib/$(G4SYSTEM) -endif - -# EXTRALIBS += -lFTFC -EXTRALIBS += -lFTFP -# EXTRALIBS += -lLBE -EXTRALIBS += -lLHEP -# EXTRALIBS += -lLHEP_GN -# EXTRALIBS += -lLHEP_HP -# EXTRALIBS += -lLHEP_LEAD -# EXTRALIBS += -lLHEP_BERT_HP -# EXTRALIBS += -lLHEP_BIC_HP -# EXTRALIBS += -lLHEP_LEAD_HP -# EXTRALIBS += -lLHEP_PRECO -# EXTRALIBS += -lQGSP_BERT -# EXTRALIBS += -lLHEP_PRECO_HP -EXTRALIBS += -lQGSC -# EXTRALIBS += -lQGSC_LEAD -# EXTRALIBS += -lQGSC_LEAD_HP -EXTRALIBS += -lQGSP -# EXTRALIBS += -lQGSP_GN -# EXTRALIBS += -lQGSP_HP -# EXTRALIBS += -lLHEP_BERT -# EXTRALIBS += -lLHEP_BIC -# EXTRALIBS += -lQGSP_BIC -EXTRALIBS += -lPackaging - -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/FTFC/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/FTFP/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/LBE/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/LHEP/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/LHEP_BERT/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/LHEP_BIC/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/LHEP_GN/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/LHEP_HP/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/LHEP_BERT_HP/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/LHEP_BIC_HP/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/LHEP_LEAD/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/LHEP_LEAD_HP/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/LHEP_PRECO/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/LHEP_PRECO_HP/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/Packaging/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/QGSC/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/QGSC_LEAD/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/QGSC_LEAD_HP/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/QGSP/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/QGSP_BERT/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/QGSP_BIC/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/QGSP_GN/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/QGSP_HP/include -CPPFLAGS += -I$(G4LISTS_BASE)/hadronic/QGSP_Model/include diff --git a/examples/advanced/lAr_calorimeter/include/FCALCalorHit.hh b/examples/advanced/lAr_calorimeter/include/FCALCalorHit.hh index a7a0b98032..bf3c453f62 100644 --- a/examples/advanced/lAr_calorimeter/include/FCALCalorHit.hh +++ b/examples/advanced/lAr_calorimeter/include/FCALCalorHit.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: FCALCalorHit.hh,v 1.6 2006/06/29 16:01:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/advanced/lAr_calorimeter/include/FCALEMModuleSD.hh b/examples/advanced/lAr_calorimeter/include/FCALEMModuleSD.hh index cb333e8ad3..9d3b88213c 100644 --- a/examples/advanced/lAr_calorimeter/include/FCALEMModuleSD.hh +++ b/examples/advanced/lAr_calorimeter/include/FCALEMModuleSD.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: FCALEMModuleSD.hh,v 1.8 2006/06/29 16:01:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/advanced/lAr_calorimeter/include/FCALHadModuleSD.hh b/examples/advanced/lAr_calorimeter/include/FCALHadModuleSD.hh index 7d916d72c3..f04084ba7c 100644 --- a/examples/advanced/lAr_calorimeter/include/FCALHadModuleSD.hh +++ b/examples/advanced/lAr_calorimeter/include/FCALHadModuleSD.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: FCALHadModuleSD.hh,v 1.8 2006/06/29 16:01:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/advanced/lAr_calorimeter/include/FCALPrimaryGeneratorAction.hh b/examples/advanced/lAr_calorimeter/include/FCALPrimaryGeneratorAction.hh index 6b5f4d3533..26fe5761b4 100644 --- a/examples/advanced/lAr_calorimeter/include/FCALPrimaryGeneratorAction.hh +++ b/examples/advanced/lAr_calorimeter/include/FCALPrimaryGeneratorAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: FCALPrimaryGeneratorAction.hh,v 1.6 2006/06/29 16:02:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/advanced/lAr_calorimeter/include/FCALRunAction.hh b/examples/advanced/lAr_calorimeter/include/FCALRunAction.hh index 1ae36f0388..29c6b4428a 100644 --- a/examples/advanced/lAr_calorimeter/include/FCALRunAction.hh +++ b/examples/advanced/lAr_calorimeter/include/FCALRunAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: FCALRunAction.hh,v 1.10 2006/06/29 16:02:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/advanced/lAr_calorimeter/include/FCALSteppingAction.hh b/examples/advanced/lAr_calorimeter/include/FCALSteppingAction.hh index df2b716bf0..e747a8decb 100644 --- a/examples/advanced/lAr_calorimeter/include/FCALSteppingAction.hh +++ b/examples/advanced/lAr_calorimeter/include/FCALSteppingAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: FCALSteppingAction.hh,v 1.7 2006/06/29 16:02:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/advanced/lAr_calorimeter/include/FCALSteppingVerbose.hh b/examples/advanced/lAr_calorimeter/include/FCALSteppingVerbose.hh index f75d4205d3..0f089ee0cb 100644 --- a/examples/advanced/lAr_calorimeter/include/FCALSteppingVerbose.hh +++ b/examples/advanced/lAr_calorimeter/include/FCALSteppingVerbose.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: FCALSteppingVerbose.hh,v 1.6 2006/06/29 16:02:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/examples/advanced/lAr_calorimeter/include/FCALTBEventAction.hh b/examples/advanced/lAr_calorimeter/include/FCALTBEventAction.hh index 074c2e010d..1d92ce8739 100644 --- a/examples/advanced/lAr_calorimeter/include/FCALTBEventAction.hh +++ b/examples/advanced/lAr_calorimeter/include/FCALTBEventAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: FCALTBEventAction.hh,v 1.11 2006/06/29 16:02:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/advanced/lAr_calorimeter/include/FCALTestbeamSetupSD.hh b/examples/advanced/lAr_calorimeter/include/FCALTestbeamSetupSD.hh index 58dfcc1854..780a6eb0ab 100644 --- a/examples/advanced/lAr_calorimeter/include/FCALTestbeamSetupSD.hh +++ b/examples/advanced/lAr_calorimeter/include/FCALTestbeamSetupSD.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: FCALTestbeamSetupSD.hh,v 1.7 2006/06/29 16:02:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/advanced/lAr_calorimeter/lArCal.cc b/examples/advanced/lAr_calorimeter/lArCal.cc index 1f22ae7a02..a7888dd192 100644 --- a/examples/advanced/lAr_calorimeter/lArCal.cc +++ b/examples/advanced/lAr_calorimeter/lArCal.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: lArCal.cc,v 1.11 2006/06/29 16:01:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/advanced/lAr_calorimeter/src/FCALCalorHit.cc b/examples/advanced/lAr_calorimeter/src/FCALCalorHit.cc index f2b724f76e..d350fbf861 100644 --- a/examples/advanced/lAr_calorimeter/src/FCALCalorHit.cc +++ b/examples/advanced/lAr_calorimeter/src/FCALCalorHit.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: FCALCalorHit.cc,v 1.6 2006/06/29 16:02:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/advanced/lAr_calorimeter/src/FCALCryostatVolumes.cc b/examples/advanced/lAr_calorimeter/src/FCALCryostatVolumes.cc index 03b7d497db..26a96b0554 100644 --- a/examples/advanced/lAr_calorimeter/src/FCALCryostatVolumes.cc +++ b/examples/advanced/lAr_calorimeter/src/FCALCryostatVolumes.cc @@ -55,11 +55,12 @@ #include "G4VisAttributes.hh" #include "G4Colour.hh" -FCALCryostatVolumes::FCALCryostatVolumes() { +FCALCryostatVolumes::FCALCryostatVolumes() +{ #include "FCALCryostatVolumesParameters.input" -}; +} -FCALCryostatVolumes::~FCALCryostatVolumes() {;}; +FCALCryostatVolumes::~FCALCryostatVolumes() {;} G4LogicalVolume * FCALCryostatVolumes::Construct() { @@ -247,4 +248,4 @@ G4LogicalVolume * FCALCryostatVolumes::Construct() return LogicalCryostat; -}; +} diff --git a/examples/advanced/lAr_calorimeter/src/FCALEMModule.cc b/examples/advanced/lAr_calorimeter/src/FCALEMModule.cc index 3ee6152872..d94f2374c4 100644 --- a/examples/advanced/lAr_calorimeter/src/FCALEMModule.cc +++ b/examples/advanced/lAr_calorimeter/src/FCALEMModule.cc @@ -56,14 +56,16 @@ #include #include -FCALEMModule::FCALEMModule() { +FCALEMModule::FCALEMModule() : + FcalEmModuleSD(0) + { F1LArGapID = new G4int[2400]; F1LArIX = new G4int[2400]; F1LArJY = new G4int[2400]; F1LArITile = new G4int[2400]; F1LArGapPosX = new G4double[2400]; F1LArGapPosY = new G4double[2400]; -}; +} FCALEMModule::~FCALEMModule(){ @@ -73,7 +75,7 @@ FCALEMModule::~FCALEMModule(){ delete [] F1LArIX; delete [] F1LArJY; delete [] F1LArITile; -}; +} void FCALEMModule::InitializeGeometry() { @@ -91,7 +93,7 @@ void FCALEMModule::InitializeGeometry() { >> F1LArIX[NF1LarGap] >> F1LArJY[NF1LarGap] >> F1LArITile[NF1LarGap]; }; G4cout << "********" << " Number of Rods in FCAL1 : " << NF1LarGap-1 << G4endl;; -}; +} @@ -191,7 +193,7 @@ G4LogicalVolume * FCALEMModule::Construct() return LogicalEmModule; -}; +} G4int FCALEMModule::GetF1TileID(G4int GapID) diff --git a/examples/advanced/lAr_calorimeter/src/FCALEMModuleSD.cc b/examples/advanced/lAr_calorimeter/src/FCALEMModuleSD.cc index 69e30a5a7d..eb195709c5 100644 --- a/examples/advanced/lAr_calorimeter/src/FCALEMModuleSD.cc +++ b/examples/advanced/lAr_calorimeter/src/FCALEMModuleSD.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: FCALEMModuleSD.cc,v 1.11 2006/06/29 16:02:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: FCALEMModuleSD.cc,v 1.12 2006/07/21 11:45:53 ribon Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // @@ -52,7 +52,8 @@ //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... -FCALEMModuleSD::FCALEMModuleSD(G4String name) : G4VSensitiveDetector(name) +FCALEMModuleSD::FCALEMModuleSD(G4String name) : G4VSensitiveDetector(name), + Init_state(0) { EmModule = new FCALEMModule(); } diff --git a/examples/advanced/lAr_calorimeter/src/FCALHadModule.cc b/examples/advanced/lAr_calorimeter/src/FCALHadModule.cc index 72ecc0e2fd..5ec184e35d 100644 --- a/examples/advanced/lAr_calorimeter/src/FCALHadModule.cc +++ b/examples/advanced/lAr_calorimeter/src/FCALHadModule.cc @@ -57,15 +57,16 @@ #include "G4ios.hh" -FCALHadModule::FCALHadModule() { - +FCALHadModule::FCALHadModule() : + FcalHadModuleSD(0) +{ F2LArGapID = new G4int[2600]; F2LArIX = new G4int[2600]; F2LArJY = new G4int[2600]; F2LArITile = new G4int[2600]; F2LArGapPosX = new G4double[2600]; F2LArGapPosY = new G4double[2600]; -}; +} FCALHadModule::~FCALHadModule() { delete [] F2LArGapID; @@ -74,7 +75,7 @@ FCALHadModule::~FCALHadModule() { delete [] F2LArIX; delete [] F2LArJY; delete [] F2LArITile; -}; +} void FCALHadModule::InitializeGeometry() { @@ -95,7 +96,7 @@ void FCALHadModule::InitializeGeometry() { }; G4cout << "*********" << " Number of Rods in FCAL2 : " << NF2LarGap-1 << G4endl; -}; +} G4LogicalVolume * FCALHadModule::Construct() @@ -261,11 +262,12 @@ G4LogicalVolume * FCALHadModule::Construct() return LogicalHadModule; -}; +} G4int FCALHadModule::GetF2TileID(G4int TileID) -{ return F2LArITile[TileID]; -}; +{ + return F2LArITile[TileID]; +} diff --git a/examples/advanced/lAr_calorimeter/src/FCALHadModuleSD.cc b/examples/advanced/lAr_calorimeter/src/FCALHadModuleSD.cc index c4c3f51579..c618041199 100644 --- a/examples/advanced/lAr_calorimeter/src/FCALHadModuleSD.cc +++ b/examples/advanced/lAr_calorimeter/src/FCALHadModuleSD.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: FCALHadModuleSD.cc,v 1.9 2006/06/29 16:03:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: FCALHadModuleSD.cc,v 1.10 2006/07/21 11:45:53 ribon Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // @@ -50,7 +50,8 @@ #include //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... -FCALHadModuleSD::FCALHadModuleSD(G4String name) : G4VSensitiveDetector(name) +FCALHadModuleSD::FCALHadModuleSD(G4String name) : G4VSensitiveDetector(name), + InitF2(0) { HadModule = new FCALHadModule(); } diff --git a/examples/advanced/lAr_calorimeter/src/FCALMaterialConsultant.cc b/examples/advanced/lAr_calorimeter/src/FCALMaterialConsultant.cc index 34d7f07553..0bd8ff38ea 100644 --- a/examples/advanced/lAr_calorimeter/src/FCALMaterialConsultant.cc +++ b/examples/advanced/lAr_calorimeter/src/FCALMaterialConsultant.cc @@ -248,7 +248,7 @@ FCALMaterialConsultant::FCALMaterialConsultant() StainlessSteel = new G4Material(name="StainlessSteel",density,nel=1); StainlessSteel->AddElement(elO, fractionmass = 1.); -}; +} FCALMaterialConsultant * FCALMaterialConsultant::construct() { @@ -256,7 +256,7 @@ FCALMaterialConsultant * FCALMaterialConsultant::construct() theFCALMaterialConsultant = new FCALMaterialConsultant(); } return theFCALMaterialConsultant; -}; +} G4Material * FCALMaterialConsultant::Material(G4String what) { @@ -284,5 +284,5 @@ G4Material * FCALMaterialConsultant::Material(G4String what) if(what == "RhoaCell") material = RhoaCell; return material; -}; +} diff --git a/examples/advanced/lAr_calorimeter/src/FCALPrimaryGeneratorAction.cc b/examples/advanced/lAr_calorimeter/src/FCALPrimaryGeneratorAction.cc index d5b003f910..63bb41db6f 100644 --- a/examples/advanced/lAr_calorimeter/src/FCALPrimaryGeneratorAction.cc +++ b/examples/advanced/lAr_calorimeter/src/FCALPrimaryGeneratorAction.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: FCALPrimaryGeneratorAction.cc,v 1.8 2006/06/29 16:03:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: FCALPrimaryGeneratorAction.cc,v 1.9 2006/07/21 08:19:33 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // @@ -81,7 +81,7 @@ FCALPrimaryGeneratorAction::FCALPrimaryGeneratorAction() }; Nevent = 2500; -}; +} //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/examples/advanced/lAr_calorimeter/src/FCALRunAction.cc b/examples/advanced/lAr_calorimeter/src/FCALRunAction.cc index 6be3e23eb1..ca9ba28b10 100644 --- a/examples/advanced/lAr_calorimeter/src/FCALRunAction.cc +++ b/examples/advanced/lAr_calorimeter/src/FCALRunAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: FCALRunAction.cc,v 1.7 2006/06/29 16:03:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/advanced/lAr_calorimeter/src/FCALSteppingAction.cc b/examples/advanced/lAr_calorimeter/src/FCALSteppingAction.cc index 38211aebb2..8600b0339b 100644 --- a/examples/advanced/lAr_calorimeter/src/FCALSteppingAction.cc +++ b/examples/advanced/lAr_calorimeter/src/FCALSteppingAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: FCALSteppingAction.cc,v 1.7 2006/06/29 16:03:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/advanced/lAr_calorimeter/src/FCALSteppingVerbose.cc b/examples/advanced/lAr_calorimeter/src/FCALSteppingVerbose.cc index a87dc37f67..f34026e329 100644 --- a/examples/advanced/lAr_calorimeter/src/FCALSteppingVerbose.cc +++ b/examples/advanced/lAr_calorimeter/src/FCALSteppingVerbose.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: FCALSteppingVerbose.cc,v 1.7 2006/06/29 16:03:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/examples/advanced/lAr_calorimeter/src/FCALTBEventAction.cc b/examples/advanced/lAr_calorimeter/src/FCALTBEventAction.cc index cb6c813cec..62d7552f3e 100644 --- a/examples/advanced/lAr_calorimeter/src/FCALTBEventAction.cc +++ b/examples/advanced/lAr_calorimeter/src/FCALTBEventAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: FCALTBEventAction.cc,v 1.13 2006/06/29 16:03:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/advanced/lAr_calorimeter/src/FCALTestbeamSetup.cc b/examples/advanced/lAr_calorimeter/src/FCALTestbeamSetup.cc index 6e6fe00a25..70b5e83525 100644 --- a/examples/advanced/lAr_calorimeter/src/FCALTestbeamSetup.cc +++ b/examples/advanced/lAr_calorimeter/src/FCALTestbeamSetup.cc @@ -63,11 +63,11 @@ #include "G4ios.hh" -FCALTestbeamSetup::FCALTestbeamSetup() { +FCALTestbeamSetup::FCALTestbeamSetup() : FCALTBSetupSD(0) { #include "FCALTestbeamSetupParameters.input" -}; +} -FCALTestbeamSetup::~FCALTestbeamSetup() {}; +FCALTestbeamSetup::~FCALTestbeamSetup() {} G4VPhysicalVolume * FCALTestbeamSetup::Construct() { @@ -432,7 +432,4 @@ G4VPhysicalVolume * FCALTestbeamSetup::Construct() return PhysicalMother; -}; - - - +} diff --git a/examples/advanced/lAr_calorimeter/src/FCALTestbeamSetupSD.cc b/examples/advanced/lAr_calorimeter/src/FCALTestbeamSetupSD.cc index 87a7ae1848..2b192d30a8 100644 --- a/examples/advanced/lAr_calorimeter/src/FCALTestbeamSetupSD.cc +++ b/examples/advanced/lAr_calorimeter/src/FCALTestbeamSetupSD.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: FCALTestbeamSetupSD.cc,v 1.11 2006/06/29 16:03:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/advanced/microbeam/History b/examples/advanced/microbeam/History index fb30615eed..0bd578eea7 100644 --- a/examples/advanced/microbeam/History +++ b/examples/advanced/microbeam/History @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -$Id: History,v 1.8 2006/06/24 19:29:12 sincerti Exp $ +$Id: History,v 1.10 2006/11/23 12:24:20 sincerti Exp $ ------------------------------------------------------------------- ========================================================= @@ -9,6 +9,18 @@ $Id: History,v 1.8 2006/06/24 19:29:12 sincerti Exp $ Package History file -------------------- -24 Jun 2006 - S. Incerti, corrected for CLHEP 2.0.2.3 compatibility -06 Apr 2006 - S. Incerti, updated README file -04 Apr 2006 - MGP, package created +23 Nov 2006 - S. Incerti (microbeam-V08-01-01) +- Replaced G4MultipleScattering process for alphas by +G4hMultipleScattering process in src/MicrobeamPhysicsList.cc. + +22 Nov 2006 - G. Cosmo (microbeam-V08-01-00) +- Removed obsolete vis-manager classes. Now using G4VisExecutive. + +24 Jun 2006 - S. Incerti +- Corrected for CLHEP 2.0.2.3 compatibility. + +06 Apr 2006 - S. Incerti +- Updated README file. + +04 Apr 2006 - MGP +- Package created. diff --git a/examples/advanced/microbeam/README b/examples/advanced/microbeam/README index ccb3ac654a..d31ed65150 100644 --- a/examples/advanced/microbeam/README +++ b/examples/advanced/microbeam/README @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -$Id: README,v 1.8 2006/06/23 10:53:39 sincerti Exp $ +$Id: README,v 1.9 2006/11/23 12:24:20 sincerti Exp $ ------------------------------------------------------------------- ========================================================= @@ -26,6 +26,8 @@ CENBG, Bordeaux-Gradignan, France. For more information on this facility, please visit : http://www.cenbg.in2p3.fr/ +An overall description of this example is also available in this directory: +to access it, simply open the microbeam.htm file with your internet browser. ---->1. GEOMETRY SET-UP. @@ -74,9 +76,10 @@ cellular irradiation are 3 MeV alpha particles. More details on the experimental setup and its simulation with Geant4 can be found in the following papers : -- GEANT4 SIMULATION OF THE NEW CENBG MICRO AND NANO PROBES FACILITY +- GEANT4 SIMULATION OF THE NEW CENBG MICRO AND NANOPROBES FACILITY By S. Incerti, C. Habchi, Ph. Moretto, J. Olivier and H. Seznec -To be published in NIMB, 2006 +(CENBG, Gradignan),. May 2006. 5pp. +Published in Nucl.Instrum.Meth.B249:738-742, 2006 - DEVELOPMENT OF A FOCUSED CHARGED PARTICLE MICROBEAM FOR THE IRRADIATION OF INDIVIDUAL CELLS. @@ -91,6 +94,11 @@ C. Michelet-Habchi, Ph. Moretto, D.T. Nguyen, T. Pouthier, R.W. Smith (CENBG, Gradignan),. Oct 2003. 6pp. Published in IEEE Trans.Nucl.Sci.51:1395-1401, 2004 +- SIMULATION OF ION PROPAGATION IN THE MICROBEAM LINE OF CENBG USING GEANT4. +S. Incerti, Ph. Barberet, B. Courtois, C. Michelet-Habchi, Ph. Moretto +(CENBG, Gradignan). Sep 2003. +Published in Nucl.Instrum.Meth.B210:92-97, 2003 + ---->3. SET-UP diff --git a/examples/advanced/microbeam/microbeam.mac b/examples/advanced/microbeam/microbeam.mac index fde1967895..18fa17e737 100755 --- a/examples/advanced/microbeam/microbeam.mac +++ b/examples/advanced/microbeam/microbeam.mac @@ -6,7 +6,7 @@ #/vis/viewer/zoom 2000000 #/vis/viewer/set/viewpointVector 400 0 105.79 -/tracking/storeTrajectory 1 +#/tracking/storeTrajectory 1 #/vis/scene/endOfEventAction accumulate /tracking/verbose 0 diff --git a/examples/advanced/microbeam/microbeam.out b/examples/advanced/microbeam/microbeam.out new file mode 100644 index 0000000000..09d61d0ad8 --- /dev/null +++ b/examples/advanced/microbeam/microbeam.out @@ -0,0 +1,349 @@ + +************************************************************* + Geant4 version Name: global-V08-01-05 (15-December-2006) + Copyright : Geant4 Collaboration + Reference : NIM A 506 (2003), 250-303 + WWW : http://cern.ch/geant4 +************************************************************* + +Visualization Manager instantiating... +Visualization Manager initialising... +Registering graphics systems... + +You have successfully registered the following graphics systems. +Current available graphics systems are: + ASCIITree (ATree) + DAWNFILE (DAWNFILE) + GAGTree (GAGTree) + G4HepRep (HepRepXML) + G4HepRepFile (HepRepFile) + RayTracer (RayTracer) + VRML1FILE (VRML1FILE) + VRML2FILE (VRML2FILE) + +Registering model factories... + +You have successfully registered the following model factories. +Registered model factories: + generic + drawByCharge + drawByParticleID + drawByOriginVolume + drawByAttribute + +Registered filter factories: + chargeFilter + particleFilter + originVolumeFilter + attributeFilter + + + +***** Table : Nb of materials = 16 ***** + + Material: Vacuum density: 0.000 mg/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 204727576.737 pc + ---> Element: Vacuum ( ) Z = 1.0 N = 1.0 A = 1.01 g/mole ElmMassFraction: 100.00 % ElmAbundance 100.00 % + + Material: H2O density: 1.000 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 36.092 cm + ---> Element: Hydrogen (H) Z = 1.0 N = 1.0 A = 1.01 g/mole ElmMassFraction: 11.21 % ElmAbundance 66.67 % + ---> Element: Oxygen (O) Z = 8.0 N = 16.0 A = 16.00 g/mole ElmMassFraction: 88.79 % ElmAbundance 33.33 % + + Material: Air density: 1.290 mg/cm3 temperature: 293.16 K pressure: 1.00 atm RadLength: 285.161 m + ---> Element: Nitrogen (N) Z = 7.0 N = 14.0 A = 14.01 g/mole ElmMassFraction: 70.00 % ElmAbundance 72.71 % + ---> Element: Oxygen (O) Z = 8.0 N = 16.0 A = 16.00 g/mole ElmMassFraction: 30.00 % ElmAbundance 27.29 % + + Material: LPAir density: 0.000 mg/cm3 temperature: 293.16 K pressure: 1.00 atm RadLength: 56273252.573 km + ---> Element: Nitrogen (N) Z = 7.0 N = 14.0 A = 14.01 g/mole ElmMassFraction: 71.50 % ElmAbundance 75.57 % + ---> Element: Oxygen (O) Z = 8.0 N = 16.0 A = 16.00 g/mole ElmMassFraction: 25.00 % ElmAbundance 23.14 % + ---> Element: Argon (Ar) Z = 18.0 N = 39.9 A = 39.95 g/mole ElmMassFraction: 3.50 % ElmAbundance 1.30 % + + Material: Pl density: 21.400 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 3.058 mm + ---> Element: Pl ( ) Z = 78.0 N = 195.1 A = 195.09 g/mole ElmMassFraction: 100.00 % ElmAbundance 100.00 % + + Material: Butane density: 0.026 mg/cm3 temperature: 293.16 K pressure: 0.01 atm RadLength: 17.729 km + ---> Element: Carbon (C) Z = 6.0 N = 12.0 A = 12.01 g/mole ElmMassFraction: 82.63 % ElmAbundance 28.57 % + ---> Element: Hydrogen (H) Z = 1.0 N = 1.0 A = 1.01 g/mole ElmMassFraction: 17.37 % ElmAbundance 71.43 % + + Material: Polyprop density: 900.000 mg/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 49.764 cm + ---> Element: Carbon (C) Z = 6.0 N = 12.0 A = 12.01 g/mole ElmMassFraction: 85.60 % ElmAbundance 33.33 % + ---> Element: Hydrogen (H) Z = 1.0 N = 1.0 A = 1.01 g/mole ElmMassFraction: 14.40 % ElmAbundance 66.67 % + + Material: Si3N4 density: 3.440 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 7.644 cm + ---> Element: Silicon (Si) Z = 14.0 N = 28.1 A = 28.09 g/mole ElmMassFraction: 60.06 % ElmAbundance 42.86 % + ---> Element: Nitrogen (N) Z = 7.0 N = 14.0 A = 14.01 g/mole ElmMassFraction: 39.94 % ElmAbundance 57.14 % + + Material: SiO2 density: 2.500 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 10.819 cm + ---> Element: Silicon (Si) Z = 14.0 N = 28.1 A = 28.09 g/mole ElmMassFraction: 46.74 % ElmAbundance 33.33 % + ---> Element: Oxygen (O) Z = 8.0 N = 16.0 A = 16.00 g/mole ElmMassFraction: 53.26 % ElmAbundance 66.67 % + + Material: Laiton density: 8.500 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 1.487 cm + ---> Element: Cuivre (Cu) Z = 29.0 N = 63.5 A = 63.55 g/mole ElmMassFraction: 49.28 % ElmAbundance 50.00 % + ---> Element: Zinc (Zn) Z = 30.0 N = 65.4 A = 65.41 g/mole ElmMassFraction: 50.72 % ElmAbundance 50.00 % + + Material: Cytoplasm1 density: 1.000 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 48.413 cm + ---> Element: Hydrogen (H) Z = 1.0 N = 1.0 A = 1.01 g/mole ElmMassFraction: 59.60 % ElmAbundance 95.53 % + ---> Element: Oxygen (O) Z = 8.0 N = 16.0 A = 16.00 g/mole ElmMassFraction: 24.24 % ElmAbundance 2.45 % + ---> Element: Carbon (C) Z = 6.0 N = 12.0 A = 12.01 g/mole ElmMassFraction: 11.11 % ElmAbundance 1.50 % + ---> Element: Nitrogen (N) Z = 7.0 N = 14.0 A = 14.01 g/mole ElmMassFraction: 4.04 % ElmAbundance 0.47 % + ---> Element: Phosphorus (P) Z = 15.0 N = 31.0 A = 30.97 g/mole ElmMassFraction: 1.01 % ElmAbundance 0.05 % + + Material: Cytoplasm2 density: 10.000 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 3.619 cm + ---> Element: Hydrogen (H) Z = 1.0 N = 1.0 A = 1.01 g/mole ElmMassFraction: 10.64 % ElmAbundance 64.80 % + ---> Element: Oxygen (O) Z = 8.0 N = 16.0 A = 16.00 g/mole ElmMassFraction: 74.50 % ElmAbundance 28.64 % + ---> Element: Carbon (C) Z = 6.0 N = 12.0 A = 12.01 g/mole ElmMassFraction: 9.04 % ElmAbundance 4.63 % + ---> Element: Nitrogen (N) Z = 7.0 N = 14.0 A = 14.01 g/mole ElmMassFraction: 3.21 % ElmAbundance 1.41 % + ---> Element: Phosphorus (P) Z = 15.0 N = 31.0 A = 30.97 g/mole ElmMassFraction: 2.61 % ElmAbundance 0.52 % + + Material: Cytoplasm3 density: 1.000 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 48.413 cm + ---> Element: Hydrogen (H) Z = 1.0 N = 1.0 A = 1.01 g/mole ElmMassFraction: 59.60 % ElmAbundance 95.53 % + ---> Element: Oxygen (O) Z = 8.0 N = 16.0 A = 16.00 g/mole ElmMassFraction: 24.24 % ElmAbundance 2.45 % + ---> Element: Carbon (C) Z = 6.0 N = 12.0 A = 12.01 g/mole ElmMassFraction: 11.11 % ElmAbundance 1.50 % + ---> Element: Nitrogen (N) Z = 7.0 N = 14.0 A = 14.01 g/mole ElmMassFraction: 4.04 % ElmAbundance 0.47 % + ---> Element: Phosphorus (P) Z = 15.0 N = 31.0 A = 30.97 g/mole ElmMassFraction: 1.01 % ElmAbundance 0.05 % + + Material: Nucleus1 density: 1.000 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 36.185 cm + ---> Element: Hydrogen (H) Z = 1.0 N = 1.0 A = 1.01 g/mole ElmMassFraction: 10.64 % ElmAbundance 64.80 % + ---> Element: Oxygen (O) Z = 8.0 N = 16.0 A = 16.00 g/mole ElmMassFraction: 74.50 % ElmAbundance 28.64 % + ---> Element: Carbon (C) Z = 6.0 N = 12.0 A = 12.01 g/mole ElmMassFraction: 9.04 % ElmAbundance 4.63 % + ---> Element: Nitrogen (N) Z = 7.0 N = 14.0 A = 14.01 g/mole ElmMassFraction: 3.21 % ElmAbundance 1.41 % + ---> Element: Phosphorus (P) Z = 15.0 N = 31.0 A = 30.97 g/mole ElmMassFraction: 2.61 % ElmAbundance 0.52 % + + Material: Nucleus2 density: 1.100 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 32.896 cm + ---> Element: Hydrogen (H) Z = 1.0 N = 1.0 A = 1.01 g/mole ElmMassFraction: 10.64 % ElmAbundance 64.80 % + ---> Element: Oxygen (O) Z = 8.0 N = 16.0 A = 16.00 g/mole ElmMassFraction: 74.50 % ElmAbundance 28.64 % + ---> Element: Carbon (C) Z = 6.0 N = 12.0 A = 12.01 g/mole ElmMassFraction: 9.04 % ElmAbundance 4.63 % + ---> Element: Nitrogen (N) Z = 7.0 N = 14.0 A = 14.01 g/mole ElmMassFraction: 3.21 % ElmAbundance 1.41 % + ---> Element: Phosphorus (P) Z = 15.0 N = 31.0 A = 30.97 g/mole ElmMassFraction: 2.61 % ElmAbundance 0.52 % + + Material: Nucleus3 density: 1.000 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 36.185 cm + ---> Element: Hydrogen (H) Z = 1.0 N = 1.0 A = 1.01 g/mole ElmMassFraction: 10.64 % ElmAbundance 64.80 % + ---> Element: Oxygen (O) Z = 8.0 N = 16.0 A = 16.00 g/mole ElmMassFraction: 74.50 % ElmAbundance 28.64 % + ---> Element: Carbon (C) Z = 6.0 N = 12.0 A = 12.01 g/mole ElmMassFraction: 9.04 % ElmAbundance 4.63 % + ---> Element: Nitrogen (N) Z = 7.0 N = 14.0 A = 14.01 g/mole ElmMassFraction: 3.21 % ElmAbundance 1.41 % + ---> Element: Phosphorus (P) Z = 15.0 N = 31.0 A = 30.97 g/mole ElmMassFraction: 2.61 % ElmAbundance 0.52 % + + + ==========> The phantom contains 53480 voxels + +Thank you for using G4BinaryCascade. +MicrobeamPhysicsList::SetCuts:CutLength : 10 nm + +msc: Model variant of multiple scattering for e- + Lambda tables from 100 eV to 100 TeV in 120 bins. + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 +G4AugerData for Element no. 6 are loaded +G4AugerData for Element no. 7 are loaded +G4AugerData for Element no. 8 are loaded +G4AugerData for Element no. 14 are loaded +G4AugerData for Element no. 15 are loaded +G4AugerData for Element no. 18 are loaded +G4AugerData for Element no. 29 are loaded +G4AugerData for Element no. 30 are loaded +G4AugerData for Element no. 78 are loaded +AugerTransitionTable complete + +IONI: Total cross sections from EEDL database. + Gamma energy sampled from a parametrised formula. + Implementation of the continuous dE/dx part. + At present it can be used for electrons in the energy range [250eV,100GeV]. + The process must work with G4LowEnergyBremsstrahlung. + +LowEnBrem: Total cross sections from EEDL database. + Gamma energy sampled from a parameterised formula. + Implementation of the continuous dE/dx part. + At present it can be used for electrons in the energy range [250eV,100GeV]. + The process must work with G4LowEnergyIonisation. + +eIoni: tables are built for e+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +eBrem: tables are built for e+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Total cross sections from a parametrisation based on the EEDL data library. + Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. + +annihil: Sampling according eplus2gg model + tables are built for e+ + Lambda tables from 100 eV to 100 TeV in 120 bins. + +msc: Model variant of multiple scattering for proton + Lambda tables from 100 eV to 100 TeV in 120 bins. + Boundary/stepping algorithm is active with facrange= 0.2 Step limitation 0 + +hLowEIoni: Knock-on electron cross sections . + Good description above the mean excitation energy. + Delta ray energy sampled from differential Xsection. + PhysicsTables from 10 eV to 0.1 TeV in 360 bins. + Electronic stopping power model is ICRU_R49He + from 1 keV to 2.5 MeV . + + Parametrisation model for antiprotons is ICRU_R49p + from 25 keV to 2 MeV . + Parametrization of the Barkas effect is switched on. + Nuclear stopping power model is ICRU_R49 + +msc: Model variant of multiple scattering for GenericIon + Boundary/stepping algorithm is active with facrange= 0.2 Step limitation 0 + +hLowEIoni: Knock-on electron cross sections . + Good description above the mean excitation energy. + Delta ray energy sampled from differential Xsection. + PhysicsTables from 10 eV to 0.1 TeV in 360 bins. + Electronic stopping power model is ICRU_R49p + from 1 keV to 2 MeV . + + Parametrisation model for antiprotons is ICRU_R49He + from 25 keV to 2 MeV . + Parametrization of the Barkas effect is switched on. + Nuclear stopping power model is ICRU_R49 + +msc: Model variant of multiple scattering for pi- + Lambda tables from 100 eV to 100 TeV in 120 bins. + Boundary/stepping algorithm is active with facrange= 0.2 Step limitation 0 + +========= Table of registered couples ============================== + +Index : 0 used in the geometry : Yes recalculation needed : No + Material : Vacuum + Range cuts : gamma 10 nm e- 10 nm e+ 10 nm + Energy thresholds : gamma 990 eV e- 990 eV e+ 990 eV + Region(s) which use this couple : + DefaultRegionForTheWorld + +Index : 1 used in the geometry : Yes recalculation needed : No + Material : Pl + Range cuts : gamma 10 nm e- 10 nm e+ 10 nm + Energy thresholds : gamma 990 eV e- 990 eV e+ 990 eV + Region(s) which use this couple : + DefaultRegionForTheWorld + +Index : 2 used in the geometry : Yes recalculation needed : No + Material : Butane + Range cuts : gamma 10 nm e- 10 nm e+ 10 nm + Energy thresholds : gamma 990 eV e- 990 eV e+ 990 eV + Region(s) which use this couple : + DefaultRegionForTheWorld + +Index : 3 used in the geometry : Yes recalculation needed : No + Material : Laiton + Range cuts : gamma 10 nm e- 10 nm e+ 10 nm + Energy thresholds : gamma 990 eV e- 990 eV e+ 990 eV + Region(s) which use this couple : + DefaultRegionForTheWorld + +Index : 4 used in the geometry : Yes recalculation needed : No + Material : Si3N4 + Range cuts : gamma 10 nm e- 10 nm e+ 10 nm + Energy thresholds : gamma 990 eV e- 990 eV e+ 990 eV + Region(s) which use this couple : + DefaultRegionForTheWorld + +Index : 5 used in the geometry : Yes recalculation needed : No + Material : Air + Range cuts : gamma 10 nm e- 10 nm e+ 10 nm + Energy thresholds : gamma 990 eV e- 990 eV e+ 990 eV + Region(s) which use this couple : + DefaultRegionForTheWorld + +Index : 6 used in the geometry : Yes recalculation needed : No + Material : Polyprop + Range cuts : gamma 10 nm e- 10 nm e+ 10 nm + Energy thresholds : gamma 990 eV e- 990 eV e+ 990 eV + Region(s) which use this couple : + DefaultRegionForTheWorld + +Index : 7 used in the geometry : Yes recalculation needed : No + Material : H2O + Range cuts : gamma 10 nm e- 10 nm e+ 10 nm + Energy thresholds : gamma 990 eV e- 990 eV e+ 990 eV + Region(s) which use this couple : + DefaultRegionForTheWorld + +Index : 8 used in the geometry : Yes recalculation needed : No + Material : Cytoplasm1 + Range cuts : gamma 10 nm e- 10 nm e+ 10 nm + Energy thresholds : gamma 990 eV e- 990 eV e+ 990 eV + Region(s) which use this couple : + DefaultRegionForTheWorld + +Index : 9 used in the geometry : Yes recalculation needed : No + Material : Nucleus1 + Range cuts : gamma 10 nm e- 10 nm e+ 10 nm + Energy thresholds : gamma 990 eV e- 990 eV e+ 990 eV + Region(s) which use this couple : + DefaultRegionForTheWorld + +Index : 10 used in the geometry : Yes recalculation needed : No + Material : Nucleus2 + Range cuts : gamma 10 nm e- 10 nm e+ 10 nm + Energy thresholds : gamma 990 eV e- 990 eV e+ 990 eV + Region(s) which use this couple : + DefaultRegionForTheWorld + +Index : 11 used in the geometry : Yes recalculation needed : No + Material : Cytoplasm2 + Range cuts : gamma 10 nm e- 10 nm e+ 10 nm + Energy thresholds : gamma 990 eV e- 990 eV e+ 990 eV + Region(s) which use this couple : + DefaultRegionForTheWorld + +Index : 12 used in the geometry : Yes recalculation needed : No + Material : SiO2 + Range cuts : gamma 10 nm e- 10 nm e+ 10 nm + Energy thresholds : gamma 990 eV e- 990 eV e+ 990 eV + Region(s) which use this couple : + DefaultRegionForTheWorld + +==================================================================== + +-> Event # 1 generated + ===> The incident alpha particle has reached the targeted cell : + -----> total absorbed dose within Nucleus is (Gy) = 0.38476 + -----> total absorbed dose within Cytoplasm is (Gy) = 0.0474129 + +-> Event # 2 generated + ===> Sorry, the incident alpha particle has missed the targeted cell ! + +-> Event # 3 generated + ===> The incident alpha particle has reached the targeted cell : + -----> total absorbed dose within Nucleus is (Gy) = 0.629625 + -----> total absorbed dose within Cytoplasm is (Gy) = 0.0207051 + +-> Event # 4 generated + ===> The incident alpha particle has reached the targeted cell : + -----> total absorbed dose within Nucleus is (Gy) = 0.642498 + -----> total absorbed dose within Cytoplasm is (Gy) = 0.00610788 + +-> Event # 5 generated + ===> The incident alpha particle has reached the targeted cell : + -----> total absorbed dose within Nucleus is (Gy) = 0.628085 + -----> total absorbed dose within Cytoplasm is (Gy) = 0.00760408 + +-> Event # 6 generated + ===> Sorry, the incident alpha particle has missed the targeted cell ! + +-> Event # 7 generated + ===> The incident alpha particle has reached the targeted cell : + -----> total absorbed dose within Nucleus is (Gy) = 0.321989 + -----> total absorbed dose within Cytoplasm is (Gy) = 0.0549673 + +-> Event # 8 generated + ===> Sorry, the incident alpha particle has missed the targeted cell ! + +-> Event # 9 generated + ===> Sorry, the incident alpha particle has missed the targeted cell ! + +-> Event # 10 generated + ===> The incident alpha particle has reached the targeted cell : + -----> total absorbed dose within Nucleus is (Gy) = 0.543119 + -----> total absorbed dose within Cytoplasm is (Gy) = 0.0475622 + +ERROR: G4VisCommandsViewerUpdate::SetNewValue: no current viewer. +-> Total number of particles detected by the gas detector : 6 + +Graphics systems deleted. +Visualization Manager deleting... diff --git a/examples/advanced/microbeam/src/MicrobeamPhysicsList.cc b/examples/advanced/microbeam/src/MicrobeamPhysicsList.cc index 8fba217769..0bf910a883 100755 --- a/examples/advanced/microbeam/src/MicrobeamPhysicsList.cc +++ b/examples/advanced/microbeam/src/MicrobeamPhysicsList.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // ------------------------------------------------------------------- -// $Id: MicrobeamPhysicsList.cc,v 1.5 2006/06/29 16:05:33 gunter Exp $ +// $Id: MicrobeamPhysicsList.cc,v 1.6 2006/11/23 12:24:20 sincerti Exp $ // ------------------------------------------------------------------- #include "G4ParticleDefinition.hh" @@ -124,6 +124,7 @@ void MicrobeamPhysicsList::ConstructProcess() #include "G4LowEnergyBremsstrahlung.hh" #include "G4hLowEnergyIonisation.hh" +#include "G4hMultipleScattering.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -189,7 +190,8 @@ void MicrobeamPhysicsList::ConstructEM() (particle->GetPDGCharge() != 0.0) && (particle->GetParticleName() != "chargedgeantino")) { - pmanager->AddProcess(new G4MultipleScattering(),-1,1,1); + //pmanager->AddProcess(new G4MultipleScattering(),-1,1,1); + pmanager->AddProcess(new G4hMultipleScattering(),-1,1,1); G4hLowEnergyIonisation* hLowEnergyIonisation = new G4hLowEnergyIonisation(); pmanager->AddProcess(hLowEnergyIonisation,-1,2,2); diff --git a/examples/advanced/microbeam/src/MicrobeamVisManager.cc b/examples/advanced/microbeam/src/MicrobeamVisManager.cc deleted file mode 100755 index 569ba81d3a..0000000000 --- a/examples/advanced/microbeam/src/MicrobeamVisManager.cc +++ /dev/null @@ -1,153 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// ------------------------------------------------------------------- -// $Id: MicrobeamVisManager.cc,v 1.5 2006/06/29 16:05:45 gunter Exp $ -// ------------------------------------------------------------------- - -#ifdef G4VIS_USE - -#include "MicrobeamVisManager.hh" - -// Supported drivers... - -#ifdef G4VIS_USE_DAWN - #include "G4FukuiRenderer.hh" -#endif - -#ifdef G4VIS_USE_DAWNFILE - #include "G4DAWNFILE.hh" -#endif - -#ifdef G4VIS_USE_OPENGLX - #include "G4OpenGLImmediateX.hh" - #include "G4OpenGLStoredX.hh" -#endif - -#ifdef G4VIS_USE_OPENGLWIN32 - #include "G4OpenGLImmediateWin32.hh" - #include "G4OpenGLStoredWin32.hh" -#endif - -#ifdef G4VIS_USE_OPENGLXM - #include "G4OpenGLImmediateXm.hh" - #include "G4OpenGLStoredXm.hh" -#endif - -#ifdef G4VIS_USE_OPACS - #include "G4Wo.hh" - #include "G4Xo.hh" -#endif - -#ifdef G4VIS_USE_OIX - #include "G4OpenInventorX.hh" -#endif - -#ifdef G4VIS_USE_OIWIN32 - #include "G4OpenInventorWin32.hh" -#endif - -#ifdef G4VIS_USE_VRML - #include "G4VRML1.hh" - #include "G4VRML2.hh" -#endif - -#ifdef G4VIS_USE_VRMLFILE - #include "G4VRML1File.hh" - #include "G4VRML2File.hh" -#endif - -#ifdef G4VIS_USE_RAYTRACER - #include "G4RayTracer.hh" -#endif - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... - -MicrobeamVisManager::MicrobeamVisManager () {} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... - -void MicrobeamVisManager::RegisterGraphicsSystems () { - -#ifdef G4VIS_USE_DAWN - RegisterGraphicsSystem (new G4FukuiRenderer); -#endif - -#ifdef G4VIS_USE_DAWNFILE - RegisterGraphicsSystem (new G4DAWNFILE); -#endif - -#ifdef G4VIS_USE_OPENGLX - RegisterGraphicsSystem (new G4OpenGLImmediateX); - RegisterGraphicsSystem (new G4OpenGLStoredX); -#endif - -#ifdef G4VIS_USE_OPENGLWIN32 - RegisterGraphicsSystem (new G4OpenGLImmediateWin32); - RegisterGraphicsSystem (new G4OpenGLStoredWin32); -#endif - -#ifdef G4VIS_USE_OPENGLXM - RegisterGraphicsSystem (new G4OpenGLImmediateXm); - RegisterGraphicsSystem (new G4OpenGLStoredXm); -#endif - -#ifdef G4VIS_USE_OPACS - RegisterGraphicsSystem (new G4Wo); - RegisterGraphicsSystem (new G4Xo); -#endif - -#ifdef G4VIS_USE_OIX - RegisterGraphicsSystem (new G4OpenInventorX); -#endif - -#ifdef G4VIS_USE_OIWIN32 - RegisterGraphicsSystem (new G4OpenInventorWin32); -#endif - -#ifdef G4VIS_USE_VRML - RegisterGraphicsSystem (new G4VRML1); - RegisterGraphicsSystem (new G4VRML2); -#endif - -#ifdef G4VIS_USE_VRMLFILE - RegisterGraphicsSystem (new G4VRML1File); - RegisterGraphicsSystem (new G4VRML2File); -#endif - -#ifdef G4VIS_USE_RAYTRACER - RegisterGraphicsSystem (new G4RayTracer); -#endif - - if (fVerbose > 0) { - G4cout << - "\nYou have successfully chosen to use the following graphics systems." - << G4endl; - PrintAvailableGraphicsSystems (); - } - -} - -#endif diff --git a/examples/advanced/purging_magnet/PurgMag.cc b/examples/advanced/purging_magnet/PurgMag.cc index b4df2ad210..35db5b82f6 100644 --- a/examples/advanced/purging_magnet/PurgMag.cc +++ b/examples/advanced/purging_magnet/PurgMag.cc @@ -33,7 +33,7 @@ // ********************* // // $Id: PurgMag.cc,v 1.5 2006/06/29 16:05:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Comments: Main program for the Purgin Magnet example. // diff --git a/examples/advanced/purging_magnet/include/PurgMagAnalysisManager.hh b/examples/advanced/purging_magnet/include/PurgMagAnalysisManager.hh index 26bd8b3477..7512bc216f 100644 --- a/examples/advanced/purging_magnet/include/PurgMagAnalysisManager.hh +++ b/examples/advanced/purging_magnet/include/PurgMagAnalysisManager.hh @@ -33,7 +33,7 @@ // ************************************ // // $Id: PurgMagAnalysisManager.hh,v 1.3 2006/06/29 16:05:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifdef G4ANALYSIS_USE diff --git a/examples/advanced/purging_magnet/include/PurgMagDetectorConstruction.hh b/examples/advanced/purging_magnet/include/PurgMagDetectorConstruction.hh index 6035054ba7..bbd1fb13a9 100644 --- a/examples/advanced/purging_magnet/include/PurgMagDetectorConstruction.hh +++ b/examples/advanced/purging_magnet/include/PurgMagDetectorConstruction.hh @@ -33,7 +33,7 @@ // ***************************************** // // $Id: PurgMagDetectorConstruction.hh,v 1.3 2006/06/29 16:05:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/examples/advanced/purging_magnet/include/PurgMagEventAction.hh b/examples/advanced/purging_magnet/include/PurgMagEventAction.hh index 31a331603d..764d9d7e4a 100644 --- a/examples/advanced/purging_magnet/include/PurgMagEventAction.hh +++ b/examples/advanced/purging_magnet/include/PurgMagEventAction.hh @@ -33,7 +33,7 @@ // ******************************** // // $Id: PurgMagEventAction.hh,v 1.3 2006/06/29 16:05:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/examples/advanced/purging_magnet/include/PurgMagPhysicsList.hh b/examples/advanced/purging_magnet/include/PurgMagPhysicsList.hh index 2624714e53..d747cd95bf 100644 --- a/examples/advanced/purging_magnet/include/PurgMagPhysicsList.hh +++ b/examples/advanced/purging_magnet/include/PurgMagPhysicsList.hh @@ -34,7 +34,7 @@ // // // $Id: PurgMagPhysicsList.hh,v 1.4 2006/06/29 16:05:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/examples/advanced/purging_magnet/include/PurgMagPrimaryGeneratorAction.hh b/examples/advanced/purging_magnet/include/PurgMagPrimaryGeneratorAction.hh index f9771b726c..f76a2bb869 100644 --- a/examples/advanced/purging_magnet/include/PurgMagPrimaryGeneratorAction.hh +++ b/examples/advanced/purging_magnet/include/PurgMagPrimaryGeneratorAction.hh @@ -34,7 +34,7 @@ // ******************************************** // // $Id: PurgMagPrimaryGeneratorAction.hh,v 1.3 2006/06/29 16:05:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/examples/advanced/purging_magnet/include/PurgMagRunAction.hh b/examples/advanced/purging_magnet/include/PurgMagRunAction.hh index c75c5beeae..ff5f9871e5 100644 --- a/examples/advanced/purging_magnet/include/PurgMagRunAction.hh +++ b/examples/advanced/purging_magnet/include/PurgMagRunAction.hh @@ -33,7 +33,7 @@ // ****************************** // // $Id: PurgMagRunAction.hh,v 1.3 2006/06/29 16:05:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef PurgMagRunAction_h diff --git a/examples/advanced/purging_magnet/include/PurgMagSteppingAction.hh b/examples/advanced/purging_magnet/include/PurgMagSteppingAction.hh index 8da90fcf6c..468d0d149e 100644 --- a/examples/advanced/purging_magnet/include/PurgMagSteppingAction.hh +++ b/examples/advanced/purging_magnet/include/PurgMagSteppingAction.hh @@ -33,7 +33,7 @@ // *********************************** // // $Id: PurgMagSteppingAction.hh,v 1.3 2006/06/29 16:06:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/examples/advanced/purging_magnet/include/PurgMagSteppingVerbose.hh b/examples/advanced/purging_magnet/include/PurgMagSteppingVerbose.hh index 8a8be51232..2d28c67169 100644 --- a/examples/advanced/purging_magnet/include/PurgMagSteppingVerbose.hh +++ b/examples/advanced/purging_magnet/include/PurgMagSteppingVerbose.hh @@ -34,7 +34,7 @@ // ************************************ // // $Id: PurgMagSteppingVerbose.hh,v 1.3 2006/06/29 16:06:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // class PurgMagSteppingVerbose; diff --git a/examples/advanced/purging_magnet/include/PurgMagTabulatedField3D.hh b/examples/advanced/purging_magnet/include/PurgMagTabulatedField3D.hh index 5948a1ef1e..2139588de7 100644 --- a/examples/advanced/purging_magnet/include/PurgMagTabulatedField3D.hh +++ b/examples/advanced/purging_magnet/include/PurgMagTabulatedField3D.hh @@ -33,7 +33,7 @@ // ************************************* // // $Id: PurgMagTabulatedField3D.hh,v 1.3 2006/06/29 16:06:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "globals.hh" diff --git a/examples/advanced/purging_magnet/include/PurgMagTrackingAction.hh b/examples/advanced/purging_magnet/include/PurgMagTrackingAction.hh index 9db7687d83..3cb07fb6c5 100644 --- a/examples/advanced/purging_magnet/include/PurgMagTrackingAction.hh +++ b/examples/advanced/purging_magnet/include/PurgMagTrackingAction.hh @@ -33,7 +33,7 @@ // ********************************** // // $Id: PurgMagTrackingAction.hh,v 1.3 2006/06/29 16:06:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef PurgMagTrackingAction_h diff --git a/examples/advanced/purging_magnet/src/PurgMagAnalysisManager.cc b/examples/advanced/purging_magnet/src/PurgMagAnalysisManager.cc index 5b9a644ac3..04c9f94452 100644 --- a/examples/advanced/purging_magnet/src/PurgMagAnalysisManager.cc +++ b/examples/advanced/purging_magnet/src/PurgMagAnalysisManager.cc @@ -33,7 +33,7 @@ // ************************************ // // $Id: PurgMagAnalysisManager.cc,v 1.3 2006/06/29 16:06:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifdef G4ANALYSIS_USE #include diff --git a/examples/advanced/purging_magnet/src/PurgMagDetectorConstruction.cc b/examples/advanced/purging_magnet/src/PurgMagDetectorConstruction.cc index e258d126cb..df3410cba5 100644 --- a/examples/advanced/purging_magnet/src/PurgMagDetectorConstruction.cc +++ b/examples/advanced/purging_magnet/src/PurgMagDetectorConstruction.cc @@ -33,7 +33,7 @@ // ***************************************** // // $Id: PurgMagDetectorConstruction.cc,v 1.4 2006/06/29 16:06:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "PurgMagDetectorConstruction.hh" #include "PurgMagTabulatedField3D.hh" diff --git a/examples/advanced/purging_magnet/src/PurgMagEventAction.cc b/examples/advanced/purging_magnet/src/PurgMagEventAction.cc index dab4926db9..323aee5de1 100644 --- a/examples/advanced/purging_magnet/src/PurgMagEventAction.cc +++ b/examples/advanced/purging_magnet/src/PurgMagEventAction.cc @@ -33,7 +33,7 @@ // ******************************** // // $Id: PurgMagEventAction.cc,v 1.4 2006/06/29 16:06:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/examples/advanced/purging_magnet/src/PurgMagPhysicsList.cc b/examples/advanced/purging_magnet/src/PurgMagPhysicsList.cc index a704b1a87a..957ae2c9b7 100644 --- a/examples/advanced/purging_magnet/src/PurgMagPhysicsList.cc +++ b/examples/advanced/purging_magnet/src/PurgMagPhysicsList.cc @@ -34,7 +34,7 @@ // // // $Id: PurgMagPhysicsList.cc,v 1.5 2006/06/29 16:06:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/examples/advanced/purging_magnet/src/PurgMagPrimaryGeneratorAction.cc b/examples/advanced/purging_magnet/src/PurgMagPrimaryGeneratorAction.cc index d68f0c17b8..a623af71ef 100644 --- a/examples/advanced/purging_magnet/src/PurgMagPrimaryGeneratorAction.cc +++ b/examples/advanced/purging_magnet/src/PurgMagPrimaryGeneratorAction.cc @@ -33,7 +33,7 @@ // ******************************************** // // $Id: PurgMagPrimaryGeneratorAction.cc,v 1.3 2006/06/29 16:06:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/examples/advanced/purging_magnet/src/PurgMagRunAction.cc b/examples/advanced/purging_magnet/src/PurgMagRunAction.cc index 6a29b25c7b..0185bf564b 100644 --- a/examples/advanced/purging_magnet/src/PurgMagRunAction.cc +++ b/examples/advanced/purging_magnet/src/PurgMagRunAction.cc @@ -33,7 +33,7 @@ // ****************************** // // $Id: PurgMagRunAction.cc,v 1.4 2006/06/29 16:06:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "PurgMagRunAction.hh" diff --git a/examples/advanced/purging_magnet/src/PurgMagSteppingAction.cc b/examples/advanced/purging_magnet/src/PurgMagSteppingAction.cc index f30e869830..b12e848c59 100644 --- a/examples/advanced/purging_magnet/src/PurgMagSteppingAction.cc +++ b/examples/advanced/purging_magnet/src/PurgMagSteppingAction.cc @@ -33,7 +33,7 @@ // *********************************** // // $Id: PurgMagSteppingAction.cc,v 1.5 2006/06/29 16:06:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/examples/advanced/purging_magnet/src/PurgMagSteppingVerbose.cc b/examples/advanced/purging_magnet/src/PurgMagSteppingVerbose.cc index 236b41f743..66e9bd46ae 100644 --- a/examples/advanced/purging_magnet/src/PurgMagSteppingVerbose.cc +++ b/examples/advanced/purging_magnet/src/PurgMagSteppingVerbose.cc @@ -33,7 +33,7 @@ // ************************************ // // $Id: PurgMagSteppingVerbose.cc,v 1.3 2006/06/29 16:06:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "PurgMagSteppingVerbose.hh" diff --git a/examples/advanced/purging_magnet/src/PurgMagTabulatedField3D.cc b/examples/advanced/purging_magnet/src/PurgMagTabulatedField3D.cc index 92fbf7b827..eb3f900b86 100644 --- a/examples/advanced/purging_magnet/src/PurgMagTabulatedField3D.cc +++ b/examples/advanced/purging_magnet/src/PurgMagTabulatedField3D.cc @@ -33,7 +33,7 @@ // ************************************* // // $Id: PurgMagTabulatedField3D.cc,v 1.4 2006/06/29 16:06:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "PurgMagTabulatedField3D.hh" diff --git a/examples/advanced/purging_magnet/src/PurgMagTrackingAction.cc b/examples/advanced/purging_magnet/src/PurgMagTrackingAction.cc index d316bd2cb2..d6a1c81144 100644 --- a/examples/advanced/purging_magnet/src/PurgMagTrackingAction.cc +++ b/examples/advanced/purging_magnet/src/PurgMagTrackingAction.cc @@ -33,7 +33,7 @@ // *********************************** // // $Id: PurgMagTrackingAction.cc,v 1.3 2006/06/29 16:06:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "PurgMagTrackingAction.hh" diff --git a/examples/advanced/radiation_monitor/Radmon.cc b/examples/advanced/radiation_monitor/Radmon.cc index 983127c1a3..670ef61723 100644 --- a/examples/advanced/radiation_monitor/Radmon.cc +++ b/examples/advanced/radiation_monitor/Radmon.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: Radmon.cc,v 1.3 2006/06/29 16:06:29 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Application main file // diff --git a/examples/advanced/radiation_monitor/analysis/include/RadmonAnalysis.hh b/examples/advanced/radiation_monitor/analysis/include/RadmonAnalysis.hh index ac21d299c3..5711ab5a51 100644 --- a/examples/advanced/radiation_monitor/analysis/include/RadmonAnalysis.hh +++ b/examples/advanced/radiation_monitor/analysis/include/RadmonAnalysis.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonAnalysis.hh,v 1.4 2006/06/29 16:06:41 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Analysis main class // diff --git a/examples/advanced/radiation_monitor/analysis/include/RadmonAnalysisLayout.hh b/examples/advanced/radiation_monitor/analysis/include/RadmonAnalysisLayout.hh index 3861880e41..f1fcad90f2 100644 --- a/examples/advanced/radiation_monitor/analysis/include/RadmonAnalysisLayout.hh +++ b/examples/advanced/radiation_monitor/analysis/include/RadmonAnalysisLayout.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonAnalysisLayout.hh,v 1.3 2006/06/29 16:06:44 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Concrete class to keep track of the analysis options // diff --git a/examples/advanced/radiation_monitor/analysis/include/RadmonAnalysisMessenger.hh b/examples/advanced/radiation_monitor/analysis/include/RadmonAnalysisMessenger.hh index 4d4c1e09df..6ae8f5a685 100644 --- a/examples/advanced/radiation_monitor/analysis/include/RadmonAnalysisMessenger.hh +++ b/examples/advanced/radiation_monitor/analysis/include/RadmonAnalysisMessenger.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonAnalysisMessenger.hh,v 1.3 2006/06/29 16:06:47 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: UI commands for managing a layout // diff --git a/examples/advanced/radiation_monitor/analysis/include/RadmonAnalysisSensitiveDetectorTypeLayout.hh b/examples/advanced/radiation_monitor/analysis/include/RadmonAnalysisSensitiveDetectorTypeLayout.hh index 66674d72b7..b5413b77cb 100644 --- a/examples/advanced/radiation_monitor/analysis/include/RadmonAnalysisSensitiveDetectorTypeLayout.hh +++ b/examples/advanced/radiation_monitor/analysis/include/RadmonAnalysisSensitiveDetectorTypeLayout.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonAnalysisSensitiveDetectorTypeLayout.hh,v 1.3 2006/06/29 16:06:49 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Internal class to manage sensitive detector types // diff --git a/examples/advanced/radiation_monitor/analysis/include/RadmonAnalysisSensitiveDetectorTypeLayout.icc b/examples/advanced/radiation_monitor/analysis/include/RadmonAnalysisSensitiveDetectorTypeLayout.icc index b6ad6e63f5..fa813f58f4 100644 --- a/examples/advanced/radiation_monitor/analysis/include/RadmonAnalysisSensitiveDetectorTypeLayout.icc +++ b/examples/advanced/radiation_monitor/analysis/include/RadmonAnalysisSensitiveDetectorTypeLayout.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonAnalysisSensitiveDetectorTypeLayout.icc,v 1.3 2006/06/29 16:06:51 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONANALYSISSENSITIVEDETECTORTYPELAYOUT_HH diff --git a/examples/advanced/radiation_monitor/analysis/include/RadmonDataAnalysisDepositedEnergy.hh b/examples/advanced/radiation_monitor/analysis/include/RadmonDataAnalysisDepositedEnergy.hh index 372d940a97..5f6c71cf18 100644 --- a/examples/advanced/radiation_monitor/analysis/include/RadmonDataAnalysisDepositedEnergy.hh +++ b/examples/advanced/radiation_monitor/analysis/include/RadmonDataAnalysisDepositedEnergy.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDataAnalysisDepositedEnergy.hh,v 1.3 2006/06/29 16:06:53 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Energy deposit analysis // diff --git a/examples/advanced/radiation_monitor/analysis/include/RadmonDataAnalysisDepositedEnergy.icc b/examples/advanced/radiation_monitor/analysis/include/RadmonDataAnalysisDepositedEnergy.icc index 49730e3f94..2ba2598b6c 100644 --- a/examples/advanced/radiation_monitor/analysis/include/RadmonDataAnalysisDepositedEnergy.icc +++ b/examples/advanced/radiation_monitor/analysis/include/RadmonDataAnalysisDepositedEnergy.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDataAnalysisDepositedEnergy.icc,v 1.3 2006/06/29 16:06:55 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDATAANALYSISDEPOSITEDENERGY_HH diff --git a/examples/advanced/radiation_monitor/analysis/include/RadmonDataAnalysisLayout.hh b/examples/advanced/radiation_monitor/analysis/include/RadmonDataAnalysisLayout.hh index 4822ff1096..a06b3fd0a5 100644 --- a/examples/advanced/radiation_monitor/analysis/include/RadmonDataAnalysisLayout.hh +++ b/examples/advanced/radiation_monitor/analysis/include/RadmonDataAnalysisLayout.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDataAnalysisLayout.hh,v 1.3 2006/06/29 16:06:57 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Internal class that describes layer informations // diff --git a/examples/advanced/radiation_monitor/analysis/include/RadmonDataAnalysisLayout.icc b/examples/advanced/radiation_monitor/analysis/include/RadmonDataAnalysisLayout.icc index 61437556fe..45f68aebdd 100644 --- a/examples/advanced/radiation_monitor/analysis/include/RadmonDataAnalysisLayout.icc +++ b/examples/advanced/radiation_monitor/analysis/include/RadmonDataAnalysisLayout.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDataAnalysisLayout.icc,v 1.3 2006/06/29 16:07:01 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDATAANALYSISLAYOUT_HH diff --git a/examples/advanced/radiation_monitor/analysis/include/RadmonDataAnalysisWithLabelFactory.hh b/examples/advanced/radiation_monitor/analysis/include/RadmonDataAnalysisWithLabelFactory.hh index 58164f199a..f166d89692 100644 --- a/examples/advanced/radiation_monitor/analysis/include/RadmonDataAnalysisWithLabelFactory.hh +++ b/examples/advanced/radiation_monitor/analysis/include/RadmonDataAnalysisWithLabelFactory.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDataAnalysisWithLabelFactory.hh,v 1.3 2006/06/29 16:07:05 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Concrete factory that constructs // RadmonSubPhysiscsListWithLabel objects diff --git a/examples/advanced/radiation_monitor/analysis/include/RadmonDataAnalysisWithLabelFactory.icc b/examples/advanced/radiation_monitor/analysis/include/RadmonDataAnalysisWithLabelFactory.icc index 81416f18f9..c969400c3d 100644 --- a/examples/advanced/radiation_monitor/analysis/include/RadmonDataAnalysisWithLabelFactory.icc +++ b/examples/advanced/radiation_monitor/analysis/include/RadmonDataAnalysisWithLabelFactory.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDataAnalysisWithLabelFactory.icc,v 1.3 2006/06/29 16:07:07 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDATAANALYSISWITHLABELFACTORY_HH diff --git a/examples/advanced/radiation_monitor/analysis/include/RadmonDataAnalysisWithLabelMessenger.hh b/examples/advanced/radiation_monitor/analysis/include/RadmonDataAnalysisWithLabelMessenger.hh index 7d6568b830..739d76a434 100644 --- a/examples/advanced/radiation_monitor/analysis/include/RadmonDataAnalysisWithLabelMessenger.hh +++ b/examples/advanced/radiation_monitor/analysis/include/RadmonDataAnalysisWithLabelMessenger.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDataAnalysisWithLabelMessenger.hh,v 1.3 2006/06/29 16:07:09 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: UI commands for dumping the available constructors // diff --git a/examples/advanced/radiation_monitor/analysis/include/RadmonVAnalysisLayout.hh b/examples/advanced/radiation_monitor/analysis/include/RadmonVAnalysisLayout.hh index c75791f2ad..e46f147a30 100644 --- a/examples/advanced/radiation_monitor/analysis/include/RadmonVAnalysisLayout.hh +++ b/examples/advanced/radiation_monitor/analysis/include/RadmonVAnalysisLayout.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVAnalysisLayout.hh,v 1.1.2.2 2006/06/29 16:07:11 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Abstract class to keep track of the analysis options // diff --git a/examples/advanced/radiation_monitor/analysis/include/RadmonVAnalysisLayout.icc b/examples/advanced/radiation_monitor/analysis/include/RadmonVAnalysisLayout.icc index e4f08ef12b..336a0e5b3d 100644 --- a/examples/advanced/radiation_monitor/analysis/include/RadmonVAnalysisLayout.icc +++ b/examples/advanced/radiation_monitor/analysis/include/RadmonVAnalysisLayout.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVAnalysisLayout.icc,v 1.3 2006/06/29 16:07:13 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONVANALYSISLAYOUT_HH diff --git a/examples/advanced/radiation_monitor/analysis/include/RadmonVDataAnalysis.hh b/examples/advanced/radiation_monitor/analysis/include/RadmonVDataAnalysis.hh index 835ee09554..1533fc5323 100644 --- a/examples/advanced/radiation_monitor/analysis/include/RadmonVDataAnalysis.hh +++ b/examples/advanced/radiation_monitor/analysis/include/RadmonVDataAnalysis.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVDataAnalysis.hh,v 1.4 2006/06/29 16:07:15 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Abstract class of an analysis piece // diff --git a/examples/advanced/radiation_monitor/analysis/include/RadmonVDataAnalysis.icc b/examples/advanced/radiation_monitor/analysis/include/RadmonVDataAnalysis.icc index 3c57693e2a..309f7b1842 100644 --- a/examples/advanced/radiation_monitor/analysis/include/RadmonVDataAnalysis.icc +++ b/examples/advanced/radiation_monitor/analysis/include/RadmonVDataAnalysis.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVDataAnalysis.icc,v 1.3 2006/06/29 16:07:17 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONVDATAANALYSIS_HH diff --git a/examples/advanced/radiation_monitor/analysis/include/RadmonVDataAnalysisFactory.hh b/examples/advanced/radiation_monitor/analysis/include/RadmonVDataAnalysisFactory.hh index 719e33a938..50ecd867de 100644 --- a/examples/advanced/radiation_monitor/analysis/include/RadmonVDataAnalysisFactory.hh +++ b/examples/advanced/radiation_monitor/analysis/include/RadmonVDataAnalysisFactory.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVDataAnalysisFactory.hh,v 1.1.2.2 2006/06/29 16:07:19 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Abstract class of a factory of analysis items // diff --git a/examples/advanced/radiation_monitor/analysis/include/RadmonVDataAnalysisFactory.icc b/examples/advanced/radiation_monitor/analysis/include/RadmonVDataAnalysisFactory.icc index 9422d03c1b..6b980cd9f0 100644 --- a/examples/advanced/radiation_monitor/analysis/include/RadmonVDataAnalysisFactory.icc +++ b/examples/advanced/radiation_monitor/analysis/include/RadmonVDataAnalysisFactory.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVDataAnalysisFactory.icc,v 1.1.2.2 2006/06/29 16:07:21 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONVDATAANALYSISFACTORY_HH diff --git a/examples/advanced/radiation_monitor/analysis/include/RadmonVDataAnalysisWithLabel.hh b/examples/advanced/radiation_monitor/analysis/include/RadmonVDataAnalysisWithLabel.hh index 19b19450fd..54229462cd 100644 --- a/examples/advanced/radiation_monitor/analysis/include/RadmonVDataAnalysisWithLabel.hh +++ b/examples/advanced/radiation_monitor/analysis/include/RadmonVDataAnalysisWithLabel.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVDataAnalysisWithLabel.hh,v 1.3 2006/06/29 16:07:23 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Abstract class of an analysis piece with label // and attributes diff --git a/examples/advanced/radiation_monitor/analysis/include/RadmonVDataAnalysisWithLabel.icc b/examples/advanced/radiation_monitor/analysis/include/RadmonVDataAnalysisWithLabel.icc index 494779761f..a8ad538514 100644 --- a/examples/advanced/radiation_monitor/analysis/include/RadmonVDataAnalysisWithLabel.icc +++ b/examples/advanced/radiation_monitor/analysis/include/RadmonVDataAnalysisWithLabel.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVDataAnalysisWithLabel.icc,v 1.3 2006/06/29 16:07:25 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONVDATAANALYSISWITHLABEL_HH diff --git a/examples/advanced/radiation_monitor/analysis/src/RadmonAnalysis.cc b/examples/advanced/radiation_monitor/analysis/src/RadmonAnalysis.cc index 83edd707c2..c19892dda0 100644 --- a/examples/advanced/radiation_monitor/analysis/src/RadmonAnalysis.cc +++ b/examples/advanced/radiation_monitor/analysis/src/RadmonAnalysis.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonAnalysis.cc,v 1.2.2.2 2006/06/29 16:07:35 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/analysis/src/RadmonAnalysisLayout.cc b/examples/advanced/radiation_monitor/analysis/src/RadmonAnalysisLayout.cc index da36cffa4b..58af2d6930 100644 --- a/examples/advanced/radiation_monitor/analysis/src/RadmonAnalysisLayout.cc +++ b/examples/advanced/radiation_monitor/analysis/src/RadmonAnalysisLayout.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonAnalysisLayout.cc,v 1.3 2006/06/29 16:07:37 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/analysis/src/RadmonAnalysisMessenger.cc b/examples/advanced/radiation_monitor/analysis/src/RadmonAnalysisMessenger.cc index 9418f711f3..0b23122c8b 100644 --- a/examples/advanced/radiation_monitor/analysis/src/RadmonAnalysisMessenger.cc +++ b/examples/advanced/radiation_monitor/analysis/src/RadmonAnalysisMessenger.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonAnalysisMessenger.cc,v 1.3 2006/06/29 16:07:39 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Messenger commands path diff --git a/examples/advanced/radiation_monitor/analysis/src/RadmonAnalysisSensitiveDetectorTypeLayout.cc b/examples/advanced/radiation_monitor/analysis/src/RadmonAnalysisSensitiveDetectorTypeLayout.cc index 3995c32b40..1263089c35 100644 --- a/examples/advanced/radiation_monitor/analysis/src/RadmonAnalysisSensitiveDetectorTypeLayout.cc +++ b/examples/advanced/radiation_monitor/analysis/src/RadmonAnalysisSensitiveDetectorTypeLayout.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonAnalysisSensitiveDetectorTypeLayout.cc,v 1.3 2006/06/29 16:07:41 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/analysis/src/RadmonDataAnalysisDepositedEnergy.cc b/examples/advanced/radiation_monitor/analysis/src/RadmonDataAnalysisDepositedEnergy.cc index 4c2204620e..6b2ad0674c 100644 --- a/examples/advanced/radiation_monitor/analysis/src/RadmonDataAnalysisDepositedEnergy.cc +++ b/examples/advanced/radiation_monitor/analysis/src/RadmonDataAnalysisDepositedEnergy.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDataAnalysisDepositedEnergy.cc,v 1.3 2006/06/29 16:07:43 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #include "RadmonDataAnalysisDepositedEnergy.hh" diff --git a/examples/advanced/radiation_monitor/analysis/src/RadmonDataAnalysisLayout.cc b/examples/advanced/radiation_monitor/analysis/src/RadmonDataAnalysisLayout.cc index 145d2e5d21..e00b62e178 100644 --- a/examples/advanced/radiation_monitor/analysis/src/RadmonDataAnalysisLayout.cc +++ b/examples/advanced/radiation_monitor/analysis/src/RadmonDataAnalysisLayout.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDataAnalysisLayout.cc,v 1.1.2.2 2006/06/29 16:07:45 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/analysis/src/RadmonDataAnalysisWithLabelFactory.cc b/examples/advanced/radiation_monitor/analysis/src/RadmonDataAnalysisWithLabelFactory.cc index e9fea7df6d..bfb21f8da8 100644 --- a/examples/advanced/radiation_monitor/analysis/src/RadmonDataAnalysisWithLabelFactory.cc +++ b/examples/advanced/radiation_monitor/analysis/src/RadmonDataAnalysisWithLabelFactory.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDataAnalysisWithLabelFactory.cc,v 1.3 2006/06/29 16:07:47 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/analysis/src/RadmonDataAnalysisWithLabelMessenger.cc b/examples/advanced/radiation_monitor/analysis/src/RadmonDataAnalysisWithLabelMessenger.cc index 31447430b0..57f26ff2f4 100644 --- a/examples/advanced/radiation_monitor/analysis/src/RadmonDataAnalysisWithLabelMessenger.cc +++ b/examples/advanced/radiation_monitor/analysis/src/RadmonDataAnalysisWithLabelMessenger.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDataAnalysisWithLabelMessenger.cc,v 1.3 2006/06/29 16:07:49 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Messenger commands path diff --git a/examples/advanced/radiation_monitor/application/include/RadmonApplication.hh b/examples/advanced/radiation_monitor/application/include/RadmonApplication.hh index 6b933419a7..569c45498d 100644 --- a/examples/advanced/radiation_monitor/application/include/RadmonApplication.hh +++ b/examples/advanced/radiation_monitor/application/include/RadmonApplication.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonApplication.hh,v 1.8 2006/06/29 16:07:51 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Radmon application // diff --git a/examples/advanced/radiation_monitor/application/include/RadmonApplication.icc b/examples/advanced/radiation_monitor/application/include/RadmonApplication.icc index e5c1f49017..fcf8af46ba 100644 --- a/examples/advanced/radiation_monitor/application/include/RadmonApplication.icc +++ b/examples/advanced/radiation_monitor/application/include/RadmonApplication.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonApplication.icc,v 1.3 2006/06/29 16:07:53 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONAPPLICATION_HH diff --git a/examples/advanced/radiation_monitor/application/include/RadmonApplicationAnalysisSetup.hh b/examples/advanced/radiation_monitor/application/include/RadmonApplicationAnalysisSetup.hh index 47f868a243..0b61192c81 100644 --- a/examples/advanced/radiation_monitor/application/include/RadmonApplicationAnalysisSetup.hh +++ b/examples/advanced/radiation_monitor/application/include/RadmonApplicationAnalysisSetup.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonApplicationAnalysisSetup.hh,v 1.3 2006/06/29 16:07:55 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Radmon application analysis setup // diff --git a/examples/advanced/radiation_monitor/application/include/RadmonApplicationAnalysisSetup.icc b/examples/advanced/radiation_monitor/application/include/RadmonApplicationAnalysisSetup.icc index 1e3ed5c729..c37f0ada05 100644 --- a/examples/advanced/radiation_monitor/application/include/RadmonApplicationAnalysisSetup.icc +++ b/examples/advanced/radiation_monitor/application/include/RadmonApplicationAnalysisSetup.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonApplicationAnalysisSetup.icc,v 1.3 2006/06/29 16:07:57 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONAPPLICATIONANALYSISSETUP_HH diff --git a/examples/advanced/radiation_monitor/application/include/RadmonApplicationDetectorSetup.hh b/examples/advanced/radiation_monitor/application/include/RadmonApplicationDetectorSetup.hh index 7c562a46d8..f262172506 100644 --- a/examples/advanced/radiation_monitor/application/include/RadmonApplicationDetectorSetup.hh +++ b/examples/advanced/radiation_monitor/application/include/RadmonApplicationDetectorSetup.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonApplicationDetectorSetup.hh,v 1.3 2006/06/29 16:07:59 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Radmon application detector entity constructors setup // diff --git a/examples/advanced/radiation_monitor/application/include/RadmonApplicationDetectorSetup.icc b/examples/advanced/radiation_monitor/application/include/RadmonApplicationDetectorSetup.icc index a0fd4258bc..a448037940 100644 --- a/examples/advanced/radiation_monitor/application/include/RadmonApplicationDetectorSetup.icc +++ b/examples/advanced/radiation_monitor/application/include/RadmonApplicationDetectorSetup.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonApplicationDetectorSetup.icc,v 1.3 2006/06/29 16:08:01 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONAPPLICATIONDETECTORSETUP_HH diff --git a/examples/advanced/radiation_monitor/application/include/RadmonApplicationEventNumbering.hh b/examples/advanced/radiation_monitor/application/include/RadmonApplicationEventNumbering.hh index 6f60250de9..7244e1f346 100644 --- a/examples/advanced/radiation_monitor/application/include/RadmonApplicationEventNumbering.hh +++ b/examples/advanced/radiation_monitor/application/include/RadmonApplicationEventNumbering.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonApplicationEventNumbering.hh,v 1.3 2006/06/29 16:08:03 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Dumps event id // diff --git a/examples/advanced/radiation_monitor/application/include/RadmonApplicationEventNumbering.icc b/examples/advanced/radiation_monitor/application/include/RadmonApplicationEventNumbering.icc index b397f6e8ed..4ed80f9edb 100644 --- a/examples/advanced/radiation_monitor/application/include/RadmonApplicationEventNumbering.icc +++ b/examples/advanced/radiation_monitor/application/include/RadmonApplicationEventNumbering.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonApplicationEventNumbering.icc,v 1.3 2006/06/29 16:08:05 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONAPPLICATIONEVENTNUMBERING_HH diff --git a/examples/advanced/radiation_monitor/application/include/RadmonApplicationEventTracks.hh b/examples/advanced/radiation_monitor/application/include/RadmonApplicationEventTracks.hh index 469d2b817d..cd41f8f387 100644 --- a/examples/advanced/radiation_monitor/application/include/RadmonApplicationEventTracks.hh +++ b/examples/advanced/radiation_monitor/application/include/RadmonApplicationEventTracks.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonApplicationEventTracks.hh,v 1.3 2006/06/29 16:08:07 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Dumps event id // diff --git a/examples/advanced/radiation_monitor/application/include/RadmonApplicationEventTracks.icc b/examples/advanced/radiation_monitor/application/include/RadmonApplicationEventTracks.icc index bff04af00f..42b35c419c 100644 --- a/examples/advanced/radiation_monitor/application/include/RadmonApplicationEventTracks.icc +++ b/examples/advanced/radiation_monitor/application/include/RadmonApplicationEventTracks.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonApplicationEventTracks.icc,v 1.3 2006/06/29 16:08:09 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONAPPLICATIONEVENTTRACKS_HH diff --git a/examples/advanced/radiation_monitor/application/include/RadmonApplicationGeneratorSetup.hh b/examples/advanced/radiation_monitor/application/include/RadmonApplicationGeneratorSetup.hh index 6e2a340bae..8a9bb7b7bf 100644 --- a/examples/advanced/radiation_monitor/application/include/RadmonApplicationGeneratorSetup.hh +++ b/examples/advanced/radiation_monitor/application/include/RadmonApplicationGeneratorSetup.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonApplicationGeneratorSetup.hh,v 1.3 2006/06/29 16:08:11 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Radmon application generators algoritms setup // diff --git a/examples/advanced/radiation_monitor/application/include/RadmonApplicationGeneratorSetup.icc b/examples/advanced/radiation_monitor/application/include/RadmonApplicationGeneratorSetup.icc index a9a451ff20..70cd71d20c 100644 --- a/examples/advanced/radiation_monitor/application/include/RadmonApplicationGeneratorSetup.icc +++ b/examples/advanced/radiation_monitor/application/include/RadmonApplicationGeneratorSetup.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonApplicationGeneratorSetup.icc,v 1.3 2006/06/29 16:08:13 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONAPPLICATIONGENERATORSETUP_HH diff --git a/examples/advanced/radiation_monitor/application/include/RadmonApplicationMessenger.hh b/examples/advanced/radiation_monitor/application/include/RadmonApplicationMessenger.hh index 639dab3b18..fc9a680871 100644 --- a/examples/advanced/radiation_monitor/application/include/RadmonApplicationMessenger.hh +++ b/examples/advanced/radiation_monitor/application/include/RadmonApplicationMessenger.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonApplicationMessenger.hh,v 1.1.2.2 2006/06/29 16:08:15 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: UI commands for managing application level options // diff --git a/examples/advanced/radiation_monitor/application/include/RadmonApplicationOptions.hh b/examples/advanced/radiation_monitor/application/include/RadmonApplicationOptions.hh index 43dc0f8dff..cfc9cc4741 100644 --- a/examples/advanced/radiation_monitor/application/include/RadmonApplicationOptions.hh +++ b/examples/advanced/radiation_monitor/application/include/RadmonApplicationOptions.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonApplicationOptions.hh,v 1.3 2006/06/29 16:08:17 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Supporting class for application startup // diff --git a/examples/advanced/radiation_monitor/application/include/RadmonApplicationOptions.icc b/examples/advanced/radiation_monitor/application/include/RadmonApplicationOptions.icc index 771113e445..730452f54e 100644 --- a/examples/advanced/radiation_monitor/application/include/RadmonApplicationOptions.icc +++ b/examples/advanced/radiation_monitor/application/include/RadmonApplicationOptions.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonApplicationOptions.icc,v 1.3 2006/06/29 16:08:19 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONAPPLICATIONOPTIONS_HH diff --git a/examples/advanced/radiation_monitor/application/include/RadmonApplicationPhysicsSetup.hh b/examples/advanced/radiation_monitor/application/include/RadmonApplicationPhysicsSetup.hh index 9dcfb912ec..0d3b761587 100644 --- a/examples/advanced/radiation_monitor/application/include/RadmonApplicationPhysicsSetup.hh +++ b/examples/advanced/radiation_monitor/application/include/RadmonApplicationPhysicsSetup.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonApplicationPhysicsSetup.hh,v 1.3 2006/06/29 16:08:21 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Radmon application generators algoritms setup // diff --git a/examples/advanced/radiation_monitor/application/include/RadmonApplicationPhysicsSetup.icc b/examples/advanced/radiation_monitor/application/include/RadmonApplicationPhysicsSetup.icc index db932cf8df..69ef3cfb87 100644 --- a/examples/advanced/radiation_monitor/application/include/RadmonApplicationPhysicsSetup.icc +++ b/examples/advanced/radiation_monitor/application/include/RadmonApplicationPhysicsSetup.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonApplicationPhysicsSetup.icc,v 1.3 2006/06/29 16:08:23 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONAPPLICATIONPHYSICSSETUP_HH diff --git a/examples/advanced/radiation_monitor/application/include/RadmonApplicationRunNumbering.hh b/examples/advanced/radiation_monitor/application/include/RadmonApplicationRunNumbering.hh index 020a153588..56ea8ef09e 100644 --- a/examples/advanced/radiation_monitor/application/include/RadmonApplicationRunNumbering.hh +++ b/examples/advanced/radiation_monitor/application/include/RadmonApplicationRunNumbering.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonApplicationRunNumbering.hh,v 1.3 2006/06/29 16:08:25 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Dumps run id // diff --git a/examples/advanced/radiation_monitor/application/include/RadmonApplicationRunNumbering.icc b/examples/advanced/radiation_monitor/application/include/RadmonApplicationRunNumbering.icc index a4ce8964f6..00828835bb 100644 --- a/examples/advanced/radiation_monitor/application/include/RadmonApplicationRunNumbering.icc +++ b/examples/advanced/radiation_monitor/application/include/RadmonApplicationRunNumbering.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonApplicationRunNumbering.icc,v 1.3 2006/06/29 16:08:27 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONAPPLICATIONRUNNUMBERING_HH diff --git a/examples/advanced/radiation_monitor/application/src/RadmonApplication.cc b/examples/advanced/radiation_monitor/application/src/RadmonApplication.cc index c7bff7dfd0..8d31a41bef 100644 --- a/examples/advanced/radiation_monitor/application/src/RadmonApplication.cc +++ b/examples/advanced/radiation_monitor/application/src/RadmonApplication.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonApplication.cc,v 1.12.2.2 2006/06/29 16:08:29 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/application/src/RadmonApplicationAnalysisSetup.cc b/examples/advanced/radiation_monitor/application/src/RadmonApplicationAnalysisSetup.cc index 50515df4d7..b8824becb9 100644 --- a/examples/advanced/radiation_monitor/application/src/RadmonApplicationAnalysisSetup.cc +++ b/examples/advanced/radiation_monitor/application/src/RadmonApplicationAnalysisSetup.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonApplicationAnalysisSetup.cc,v 1.3.2.2 2006/06/29 16:08:31 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/application/src/RadmonApplicationDetectorSetup.cc b/examples/advanced/radiation_monitor/application/src/RadmonApplicationDetectorSetup.cc index ef25083bcc..1dce1a0b4c 100644 --- a/examples/advanced/radiation_monitor/application/src/RadmonApplicationDetectorSetup.cc +++ b/examples/advanced/radiation_monitor/application/src/RadmonApplicationDetectorSetup.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonApplicationDetectorSetup.cc,v 1.1.2.2 2006/06/29 16:08:33 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/application/src/RadmonApplicationEventNumbering.cc b/examples/advanced/radiation_monitor/application/src/RadmonApplicationEventNumbering.cc index 7d973abb97..4928e4843b 100644 --- a/examples/advanced/radiation_monitor/application/src/RadmonApplicationEventNumbering.cc +++ b/examples/advanced/radiation_monitor/application/src/RadmonApplicationEventNumbering.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonApplicationEventNumbering.cc,v 1.3 2006/06/29 16:08:35 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/application/src/RadmonApplicationEventTracks.cc b/examples/advanced/radiation_monitor/application/src/RadmonApplicationEventTracks.cc index 07b58df3be..cf57cf836d 100644 --- a/examples/advanced/radiation_monitor/application/src/RadmonApplicationEventTracks.cc +++ b/examples/advanced/radiation_monitor/application/src/RadmonApplicationEventTracks.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonApplicationEventTracks.cc,v 1.3 2006/06/29 16:08:37 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/application/src/RadmonApplicationGeneratorSetup.cc b/examples/advanced/radiation_monitor/application/src/RadmonApplicationGeneratorSetup.cc index 17fc8f14b6..d70036d17a 100644 --- a/examples/advanced/radiation_monitor/application/src/RadmonApplicationGeneratorSetup.cc +++ b/examples/advanced/radiation_monitor/application/src/RadmonApplicationGeneratorSetup.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonApplicationGeneratorSetup.cc,v 1.3 2006/06/29 16:08:39 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/application/src/RadmonApplicationMessenger.cc b/examples/advanced/radiation_monitor/application/src/RadmonApplicationMessenger.cc index dbc1a231a4..bb4a9a65fe 100644 --- a/examples/advanced/radiation_monitor/application/src/RadmonApplicationMessenger.cc +++ b/examples/advanced/radiation_monitor/application/src/RadmonApplicationMessenger.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonApplicationMessenger.cc,v 1.1.2.2 2006/06/29 16:08:41 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Messenger commands path diff --git a/examples/advanced/radiation_monitor/application/src/RadmonApplicationOptions.cc b/examples/advanced/radiation_monitor/application/src/RadmonApplicationOptions.cc index 1ace2d2d8d..a990fcb5bc 100644 --- a/examples/advanced/radiation_monitor/application/src/RadmonApplicationOptions.cc +++ b/examples/advanced/radiation_monitor/application/src/RadmonApplicationOptions.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonApplicationOptions.cc,v 1.5 2006/06/29 16:08:43 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/application/src/RadmonApplicationPhysicsSetup.cc b/examples/advanced/radiation_monitor/application/src/RadmonApplicationPhysicsSetup.cc index c03ed61185..6c8bef787c 100644 --- a/examples/advanced/radiation_monitor/application/src/RadmonApplicationPhysicsSetup.cc +++ b/examples/advanced/radiation_monitor/application/src/RadmonApplicationPhysicsSetup.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonApplicationPhysicsSetup.cc,v 1.4.2.2 2006/06/29 16:08:45 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/application/src/RadmonApplicationRunNumbering.cc b/examples/advanced/radiation_monitor/application/src/RadmonApplicationRunNumbering.cc index d292ce24f5..45558cbb55 100644 --- a/examples/advanced/radiation_monitor/application/src/RadmonApplicationRunNumbering.cc +++ b/examples/advanced/radiation_monitor/application/src/RadmonApplicationRunNumbering.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonApplicationRunNumbering.cc,v 1.3 2006/06/29 16:08:47 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeConstructor.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeConstructor.hh index d20745d79a..21367f6836 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeConstructor.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeConstructor.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorCarvedFlatVolumeConstructor.hh,v 1.3 2006/06/29 16:08:49 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Builds a box with carved borders // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeConstructor.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeConstructor.icc index 4654703c49..e7b9a47ee9 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeConstructor.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeConstructor.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorCarvedFlatVolumeConstructor.icc,v 1.1.2.2 2006/06/29 16:08:51 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORCARVEDFLATVOLUMECONSTRUCTOR_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithGroundAndKeyMarksAndHoleConstructor.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithGroundAndKeyMarksAndHoleConstructor.hh index bda52c3e4f..12e3037327 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithGroundAndKeyMarksAndHoleConstructor.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithGroundAndKeyMarksAndHoleConstructor.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorCarvedFlatVolumeWithGroundAndKeyMarksAndHoleConstructor.hh,v 1.3 2006/06/29 16:08:53 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Builds a carved box with a ground pad and marks and hole // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithGroundAndKeyMarksAndHoleConstructor.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithGroundAndKeyMarksAndHoleConstructor.icc index 6085aaf42f..b39a1ebb93 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithGroundAndKeyMarksAndHoleConstructor.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithGroundAndKeyMarksAndHoleConstructor.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorCarvedFlatVolumeWithGroundAndKeyMarksAndHoleConstructor.icc,v 1.3 2006/06/29 16:08:55 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORCARVEDFLATVOLUMEWITHGROUNDANDKEYMARKSANDHOLECONSTRUCTOR_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithGroundAndKeyMarksConstructor.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithGroundAndKeyMarksConstructor.hh index 60fa941869..daeba72206 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithGroundAndKeyMarksConstructor.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithGroundAndKeyMarksConstructor.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorCarvedFlatVolumeWithGroundAndKeyMarksConstructor.hh,v 1.3 2006/06/29 16:08:57 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Builds a carved box with a ground pad and marks // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithGroundAndKeyMarksConstructor.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithGroundAndKeyMarksConstructor.icc index c13859dbc5..d70ae55573 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithGroundAndKeyMarksConstructor.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithGroundAndKeyMarksConstructor.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorCarvedFlatVolumeWithGroundAndKeyMarksConstructor.icc,v 1.3 2006/06/29 16:08:59 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORCARVEDFLATVOLUMEWITHGROUNDANDKEYMARKSCONSTRUCTOR_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithGroundConstructor.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithGroundConstructor.hh index c8b9469f06..fb90088af9 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithGroundConstructor.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithGroundConstructor.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorCarvedFlatVolumeWithGroundConstructor.hh,v 1.3 2006/06/29 16:09:01 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Builds a box with carved borders // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithGroundConstructor.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithGroundConstructor.icc index a3bf5a799a..1cb7498154 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithGroundConstructor.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithGroundConstructor.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorCarvedFlatVolumeWithGroundConstructor.icc,v 1.3 2006/06/29 16:09:03 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORCARVEDFLATVOLUMEWITHGROUNDCONSTRUCTOR_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithHoleConstructor.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithHoleConstructor.hh index 6e2de4f9af..188c9ec3af 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithHoleConstructor.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithHoleConstructor.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorCarvedFlatVolumeWithHoleConstructor.hh,v 1.3 2006/06/29 16:09:05 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Builds a box with carved borders // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithHoleConstructor.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithHoleConstructor.icc index 1d50b0b95f..204912d8bc 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithHoleConstructor.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithHoleConstructor.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorCarvedFlatVolumeWithHoleConstructor.icc,v 1.3 2006/06/29 16:09:07 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORCARVEDFLATVOLUMEWITHHOLECONSTRUCTOR_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithPinsConstructor.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithPinsConstructor.hh index 4bc5537dc4..6c903cfbdc 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithPinsConstructor.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithPinsConstructor.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorCarvedFlatVolumeWithPinsConstructor.hh,v 1.3 2006/06/29 16:09:09 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Builds a box with carved borders and pins // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithPinsConstructor.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithPinsConstructor.icc index ccdee2baf4..3e534339b2 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithPinsConstructor.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithPinsConstructor.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorCarvedFlatVolumeWithPinsConstructor.icc,v 1.3 2006/06/29 16:09:11 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORCARVEDFLATVOLUMEWITHPINSCONSTRUCTOR_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithTracksAndHoleConstructor.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithTracksAndHoleConstructor.hh index 4340e9093c..a7e1dd3dc8 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithTracksAndHoleConstructor.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithTracksAndHoleConstructor.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorCarvedFlatVolumeWithTracksAndHoleConstructor.hh,v 1.3 2006/06/29 16:09:13 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Builds a box with carved borders // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithTracksAndHoleConstructor.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithTracksAndHoleConstructor.icc index 49e6118c20..60dc9ec063 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithTracksAndHoleConstructor.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithTracksAndHoleConstructor.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorCarvedFlatVolumeWithTracksAndHoleConstructor.icc,v 1.3 2006/06/29 16:09:15 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORCARVEDFLATVOLUMEWITHTRACKSANDHOLECONSTRUCTOR_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithTracksConstructor.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithTracksConstructor.hh index 0a4e383061..bd9a311ff8 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithTracksConstructor.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithTracksConstructor.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorCarvedFlatVolumeWithTracksConstructor.hh,v 1.3 2006/06/29 16:09:17 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Builds a box with carved borders and tracks // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithTracksConstructor.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithTracksConstructor.icc index 487f2c428b..231564e573 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithTracksConstructor.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorCarvedFlatVolumeWithTracksConstructor.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorCarvedFlatVolumeWithTracksConstructor.icc,v 1.3 2006/06/29 16:09:19 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORCARVEDFLATVOLUMEWITHTRACKSCONSTRUCTOR_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorConstruction.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorConstruction.hh index c89af6759d..d0d33b7e1d 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorConstruction.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorConstruction.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorConstruction.hh,v 1.3.2.2 2006/06/29 16:09:21 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Implementation of the G4VUserDetectorConstruction // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorEnvironmentLayout.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorEnvironmentLayout.hh index ac8f9b8913..eaab700096 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorEnvironmentLayout.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorEnvironmentLayout.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorEnvironmentLayout.hh,v 1.5 2006/06/29 16:09:23 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Internal class to describe the environment layout // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorEnvironmentLayout.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorEnvironmentLayout.icc index b5b8e942d7..0cdf9714c4 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorEnvironmentLayout.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorEnvironmentLayout.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorEnvironmentLayout.icc,v 1.3 2006/06/29 16:09:25 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORENVIRONMENTLAYOUT_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeComponent.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeComponent.hh index 7261a3b94a..f5ccc075af 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeComponent.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeComponent.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorFlatVolumeComponent.hh,v 1.4 2006/06/29 16:09:27 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Component to create a box // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeComponent.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeComponent.icc index 9c20c1e0f0..a9eebfd041 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeComponent.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeComponent.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorFlatVolumeComponent.icc,v 1.1.2.2 2006/06/29 16:09:29 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORFLATVOLUMECOMPONENT_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeConstructor.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeConstructor.hh index 8f435d06f1..a4d7994da2 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeConstructor.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeConstructor.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorFlatVolumeConstructor.hh,v 1.3 2006/06/29 16:09:31 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Builds a box // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeConstructor.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeConstructor.icc index 610bd3f46e..d0be4bdcb9 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeConstructor.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeConstructor.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorFlatVolumeConstructor.icc,v 1.3 2006/06/29 16:09:33 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORFLATVOLUMECONSTRUCTOR_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithGroundAndKeyMarksAndHoleConstructor.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithGroundAndKeyMarksAndHoleConstructor.hh index 720dd481e3..c935981209 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithGroundAndKeyMarksAndHoleConstructor.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithGroundAndKeyMarksAndHoleConstructor.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorFlatVolumeWithGroundAndKeyMarksAndHoleConstructor.hh,v 1.3 2006/06/29 16:09:35 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Builds a box with a ground pad, marks and hole // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithGroundAndKeyMarksAndHoleConstructor.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithGroundAndKeyMarksAndHoleConstructor.icc index 61d5a4a9a6..e6319202be 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithGroundAndKeyMarksAndHoleConstructor.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithGroundAndKeyMarksAndHoleConstructor.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorFlatVolumeWithGroundAndKeyMarksAndHoleConstructor.icc,v 1.3 2006/06/29 16:09:37 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORFLATVOLUMEWITHGROUNDANDKEYMARKSANDHOLECONSTRUCTOR_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithGroundAndKeyMarksConstructor.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithGroundAndKeyMarksConstructor.hh index 0eeddb878f..522dd1a968 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithGroundAndKeyMarksConstructor.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithGroundAndKeyMarksConstructor.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorFlatVolumeWithGroundAndKeyMarksConstructor.hh,v 1.3 2006/06/29 16:09:39 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Builds a box with a ground pad and marks // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithGroundAndKeyMarksConstructor.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithGroundAndKeyMarksConstructor.icc index 34ed775439..7342f7d4f6 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithGroundAndKeyMarksConstructor.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithGroundAndKeyMarksConstructor.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorFlatVolumeWithGroundAndKeyMarksConstructor.icc,v 1.3 2006/06/29 16:09:41 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORFLATVOLUMEWITHGROUNDANDKEYMARKSCONSTRUCTOR_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithGroundConstructor.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithGroundConstructor.hh index 4e3ab38c6c..ce352d428b 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithGroundConstructor.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithGroundConstructor.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorFlatVolumeWithGroundConstructor.hh,v 1.3 2006/06/29 16:09:43 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Builds a box with carved borders // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithGroundConstructor.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithGroundConstructor.icc index ff731bda5c..fc490c6686 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithGroundConstructor.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithGroundConstructor.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorFlatVolumeWithGroundConstructor.icc,v 1.3 2006/06/29 16:09:45 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORFLATVOLUMEWITHGROUNDCONSTRUCTOR_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithHoleConstructor.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithHoleConstructor.hh index 75c432d010..702bd3b3b7 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithHoleConstructor.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithHoleConstructor.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorFlatVolumeWithHoleConstructor.hh,v 1.3 2006/06/29 16:09:47 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Builds a box with a hole // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithHoleConstructor.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithHoleConstructor.icc index d6ff30d0ad..997a875b74 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithHoleConstructor.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithHoleConstructor.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorFlatVolumeWithHoleConstructor.icc,v 1.3 2006/06/29 16:09:49 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORFLATVOLUMEWITHHOLECONSTRUCTOR_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithPadsConstructor.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithPadsConstructor.hh index 5217798e2c..a54c032348 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithPadsConstructor.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithPadsConstructor.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorFlatVolumeWithPadsConstructor.hh,v 1.3 2006/06/29 16:09:51 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Builds a box with pins // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithPadsConstructor.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithPadsConstructor.icc index 454930583b..6c2bc204ec 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithPadsConstructor.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithPadsConstructor.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorFlatVolumeWithPadsConstructor.icc,v 1.3 2006/06/29 16:09:53 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORFLATVOLUMEWITHPADSCONSTRUCTOR_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithPinsConstructor.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithPinsConstructor.hh index a52ee1879b..ec18f6e06d 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithPinsConstructor.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithPinsConstructor.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorFlatVolumeWithPinsConstructor.hh,v 1.3 2006/06/29 16:09:55 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Builds a box with pins // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithPinsConstructor.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithPinsConstructor.icc index 7de9cb2248..409e132f74 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithPinsConstructor.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithPinsConstructor.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorFlatVolumeWithPinsConstructor.icc,v 1.3 2006/06/29 16:09:57 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORFLATVOLUMEWITHPINSCONSTRUCTOR_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithTracksAndHoleConstructor.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithTracksAndHoleConstructor.hh index 6f5ce4e101..5e9b0b15b2 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithTracksAndHoleConstructor.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithTracksAndHoleConstructor.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorFlatVolumeWithTracksAndHoleConstructor.hh,v 1.3 2006/06/29 16:09:59 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Builds a box with tracks and a hole // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithTracksAndHoleConstructor.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithTracksAndHoleConstructor.icc index e59e3a3e47..bb6e3b708c 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithTracksAndHoleConstructor.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithTracksAndHoleConstructor.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorFlatVolumeWithTracksAndHoleConstructor.icc,v 1.3 2006/06/29 16:10:01 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORFLATVOLUMEWITHTRACKSANDHOLECONSTRUCTOR_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithTracksConstructor.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithTracksConstructor.hh index 95836ccc05..7073a2566a 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithTracksConstructor.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithTracksConstructor.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorFlatVolumeWithTracksConstructor.hh,v 1.3 2006/06/29 16:10:03 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Builds a box with tracks // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithTracksConstructor.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithTracksConstructor.icc index 4a590fbdc6..9087e8cc66 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithTracksConstructor.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorFlatVolumeWithTracksConstructor.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorFlatVolumeWithTracksConstructor.icc,v 1.3 2006/06/29 16:10:05 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORFLATVOLUMEWITHTRACKSCONSTRUCTOR_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLabelledEntitiesConstructorsFactory.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLabelledEntitiesConstructorsFactory.hh index c85070324c..61e064045c 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLabelledEntitiesConstructorsFactory.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLabelledEntitiesConstructorsFactory.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorLabelledEntitiesConstructorsFactory.hh,v 1.4 2006/06/29 16:10:07 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Concrete factory that constructs // RadmonVDetectorLabelledEntityConstructor objects diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLabelledEntitiesConstructorsFactory.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLabelledEntitiesConstructorsFactory.icc index f506408f42..4cf3a1daa5 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLabelledEntitiesConstructorsFactory.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLabelledEntitiesConstructorsFactory.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorLabelledEntitiesConstructorsFactory.icc,v 1.3 2006/06/29 16:10:09 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORLABELLEDENTITIESCONSTRUCTORSFACTORY_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLabelledEntitiesConstructorsMessenger.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLabelledEntitiesConstructorsMessenger.hh index 7a3980e361..c81a4feded 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLabelledEntitiesConstructorsMessenger.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLabelledEntitiesConstructorsMessenger.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorLabelledEntitiesConstructorsMessenger.hh,v 1.3 2006/06/29 16:10:11 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: UI commands for dumping the available constructors // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerLayout.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerLayout.hh index 63f846c54e..acc3960ed1 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerLayout.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerLayout.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorLayerLayout.hh,v 1.5 2006/06/29 16:10:13 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Internal class that describes layer informations // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerLayout.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerLayout.icc index ef1176bc36..362a6f0109 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerLayout.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerLayout.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorLayerLayout.icc,v 1.5 2006/06/29 16:10:15 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORLAYERLAYOUT_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItem.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItem.hh index 78c37c92d5..fe71608a38 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItem.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItem.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorLayerVolumeItem.hh,v 1.5 2006/06/29 16:10:17 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: solids, physical and logical volumes // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItem.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItem.icc index 91847c14c1..7564922b84 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItem.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItem.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorLayerVolumeItem.icc,v 1.4 2006/06/29 16:10:19 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORLAYERVOLUMEITEM_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItemIntersection.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItemIntersection.hh index 6bfe5efd26..ce99baa5c2 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItemIntersection.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItemIntersection.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorLayerVolumeItemIntersection.hh,v 1.3 2006/06/29 16:10:21 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Intersection of two solids // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItemIntersection.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItemIntersection.icc index ba7ff68947..c52336b406 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItemIntersection.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItemIntersection.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorLayerVolumeItemIntersection.icc,v 1.3 2006/06/29 16:10:23 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORLAYERVOLUMEITEMINTERSECTION_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItemSubtraction.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItemSubtraction.hh index 200893a763..340b4468b4 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItemSubtraction.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItemSubtraction.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorLayerVolumeItemSubtraction.hh,v 1.3 2006/06/29 16:10:25 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Subtraction of two solids // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItemSubtraction.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItemSubtraction.icc index ddb0dcb7fb..e3f209ee53 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItemSubtraction.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItemSubtraction.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorLayerVolumeItemSubtraction.icc,v 1.3 2006/06/29 16:10:27 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORLAYERVOLUMEITEMSUBTRACTION_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItemUnion.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItemUnion.hh index fa085f4d26..9af6aa60ed 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItemUnion.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItemUnion.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorLayerVolumeItemUnion.hh,v 1.3 2006/06/29 16:10:29 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Union of two solids // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItemUnion.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItemUnion.icc index 7834045d66..6f8cdd4ca4 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItemUnion.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumeItemUnion.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorLayerVolumeItemUnion.icc,v 1.3 2006/06/29 16:10:31 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORLAYERVOLUMEITEMUNION_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumesList.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumesList.hh index 4e560d78ff..80388ef051 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumesList.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumesList.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorLayerVolumesList.hh,v 1.4 2006/06/29 16:10:33 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Collection of solids, physical and logical volumes // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumesList.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumesList.icc index aa3dc3d53e..a1894d8c05 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumesList.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayerVolumesList.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorLayerVolumesList.icc,v 1.3 2006/06/29 16:10:35 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORLAYERVOLUMESLIST_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayout.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayout.hh index c5af72dda8..0414d8c187 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayout.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorLayout.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorLayout.hh,v 1.4.2.2 2006/06/29 16:10:37 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Class to keep track of the configured detector layout // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMessenger.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMessenger.hh index 4d390dcfdb..cfa6a65a91 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMessenger.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMessenger.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorMessenger.hh,v 1.5 2006/06/29 16:10:39 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: UI commands for managing a layout // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayerLayout.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayerLayout.hh index 2d517443d4..92624fedf9 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayerLayout.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayerLayout.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorMultilayerLayout.hh,v 1.4 2006/06/29 16:10:41 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Internal class to manage multilayers // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayerLayout.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayerLayout.icc index 516364bcd8..58d4fb5574 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayerLayout.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayerLayout.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorMultilayerLayout.icc,v 1.4 2006/06/29 16:10:43 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORMULTILAYERLAYOUT_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayerPlacementLayout.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayerPlacementLayout.hh index d56a4a1f4b..98e9b2c07a 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayerPlacementLayout.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayerPlacementLayout.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorMultilayerPlacementLayout.hh,v 1.4 2006/06/29 16:10:45 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Internal class to manage placed multilayer // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayerPlacementLayout.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayerPlacementLayout.icc index a2180d22d5..c36be5b2ed 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayerPlacementLayout.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayerPlacementLayout.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorMultilayerPlacementLayout.icc,v 1.3 2006/06/29 16:10:47 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORMULTILAYERPLACEMENTLAYOUT_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayerPlacementsLayoutCollection.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayerPlacementsLayoutCollection.hh index 4070502177..72f5714b0b 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayerPlacementsLayoutCollection.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayerPlacementsLayoutCollection.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorMultilayerPlacementsLayoutCollection.hh,v 1.4 2006/06/29 16:10:49 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Internal class to collect placed multilayer // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayerPlacementsLayoutCollection.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayerPlacementsLayoutCollection.icc index cb2f5c06b1..b16bb312f5 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayerPlacementsLayoutCollection.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayerPlacementsLayoutCollection.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorMultilayerPlacementsLayoutCollection.icc,v 1.3 2006/06/29 16:11:14 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORMULTILAYERPLACEMENTSLAYOUTCOLLECTION_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayersLayoutCollection.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayersLayoutCollection.hh index 9f11de4093..1074540c98 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayersLayoutCollection.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayersLayoutCollection.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorMultilayersLayoutCollection.hh,v 1.4 2006/06/29 16:11:42 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Internal class to collect multilayers // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayersLayoutCollection.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayersLayoutCollection.icc index 966bbbcf25..a846b4308d 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayersLayoutCollection.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorMultilayersLayoutCollection.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorMultilayersLayoutCollection.icc,v 1.3 2006/06/29 16:12:06 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORMULTILAYERSLAYOUTCOLLECTION_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorPadsData.hh b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorPadsData.hh index 3bfa18dd99..da14aba0ba 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorPadsData.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorPadsData.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorPadsData.hh,v 1.3 2006/06/29 16:12:09 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Internal class for pads data managemenet // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorPadsData.icc b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorPadsData.icc index 0e390ca188..eaaa4ad8cd 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonDetectorPadsData.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonDetectorPadsData.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorPadsData.icc,v 1.3 2006/06/29 16:12:11 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONDETECTORPADSDATA_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorCarvedVolumesDecorator.hh b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorCarvedVolumesDecorator.hh index fde87e11bc..ba5eaad953 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorCarvedVolumesDecorator.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorCarvedVolumesDecorator.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonTDetectorCarvedVolumesDecorator.hh,v 1.5 2006/06/29 16:12:13 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Carves the borders of a component with the following method // - Constructor diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorCarvedVolumesDecorator.icc b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorCarvedVolumesDecorator.icc index 0dd56e9912..612646ffe7 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorCarvedVolumesDecorator.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorCarvedVolumesDecorator.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonTDetectorCarvedVolumesDecorator.icc,v 1.2.2.2 2006/06/29 16:12:15 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONTDETECTORCARVEDVOLUMESDECORATOR_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorLayerConstructor.hh b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorLayerConstructor.hh index 3b1d167b28..e49eeecbec 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorLayerConstructor.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorLayerConstructor.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonTDetectorLayerConstructor.hh,v 1.4 2006/06/29 16:12:17 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Generates a layer using a component with the following methods // - Constructor with RadmonVDetectorLabelledEntityConstructor or its base classes as argument diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorLayerConstructor.icc b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorLayerConstructor.icc index 93d9686e41..763122d5bd 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorLayerConstructor.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorLayerConstructor.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonTDetectorLayerConstructor.icc,v 1.2.2.2 2006/06/29 16:12:20 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONTDETECTORLAYERCONSTRUCTOR_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithGroundDecorator.hh b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithGroundDecorator.hh index f42aa3e2f1..4914b77e00 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithGroundDecorator.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithGroundDecorator.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonTDetectorVolumesWithGroundDecorator.hh,v 1.4 2006/06/29 16:12:28 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Decorates with a ground plane // - Constructor diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithGroundDecorator.icc b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithGroundDecorator.icc index fc02ae600d..3ef744590e 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithGroundDecorator.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithGroundDecorator.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonTDetectorVolumesWithGroundDecorator.icc,v 1.1.2.2 2006/06/29 16:12:30 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONTDETECTORVOLUMESWITHGROUNDDECORATOR_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithHoleDecorator.hh b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithHoleDecorator.hh index 89413fc427..b85c854b40 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithHoleDecorator.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithHoleDecorator.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonTDetectorVolumesWithHoleDecorator.hh,v 1.5 2006/06/29 16:12:32 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Decorates with a hole a component with the following method // - Constructor diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithHoleDecorator.icc b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithHoleDecorator.icc index 4a5744eb3d..e4a08e03f4 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithHoleDecorator.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithHoleDecorator.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonTDetectorVolumesWithHoleDecorator.icc,v 1.4 2006/06/29 16:12:34 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONTDETECTORVOLUMESWITHHOLEDECORATOR_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithKeyMarksDecorator.hh b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithKeyMarksDecorator.hh index c8373c9cf3..8c72c87151 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithKeyMarksDecorator.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithKeyMarksDecorator.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonTDetectorVolumesWithKeyMarksDecorator.hh,v 1.3 2006/06/29 16:12:36 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Decorates with key marks // - Constructor diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithKeyMarksDecorator.icc b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithKeyMarksDecorator.icc index 31844b3db5..b04ef59519 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithKeyMarksDecorator.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithKeyMarksDecorator.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonTDetectorVolumesWithKeyMarksDecorator.icc,v 1.1.2.2 2006/06/29 16:12:38 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONTDETECTORVOLUMESWITHKEYMARKSDECORATOR_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithPadsDecorator.hh b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithPadsDecorator.hh index 9ffbd48f04..fb36324d9c 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithPadsDecorator.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithPadsDecorator.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonTDetectorVolumesWithPadsDecorator.hh,v 1.3 2006/06/29 16:12:40 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Decorates with a ground plane // - Constructor diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithPadsDecorator.icc b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithPadsDecorator.icc index 0c2d25c03f..42f893bd5a 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithPadsDecorator.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithPadsDecorator.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonTDetectorVolumesWithPadsDecorator.icc,v 1.1.2.2 2006/06/29 16:12:42 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONTDETECTORVOLUMESWITHPADSDECORATOR_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithPinsDecorator.hh b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithPinsDecorator.hh index 8374229541..dccf0a55b2 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithPinsDecorator.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithPinsDecorator.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonTDetectorVolumesWithPinsDecorator.hh,v 1.3 2006/06/29 16:12:44 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Decorates with the pin out // - Constructor diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithPinsDecorator.icc b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithPinsDecorator.icc index 4bcdc7ece4..e2f7fe9b6c 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithPinsDecorator.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithPinsDecorator.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonTDetectorVolumesWithPinsDecorator.icc,v 1.1.2.2 2006/06/29 16:12:46 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONTDETECTORVOLUMESWITHPINSDECORATOR_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithTracksDecorator.hh b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithTracksDecorator.hh index 119d84cb8e..df266e2b1a 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithTracksDecorator.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithTracksDecorator.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonTDetectorVolumesWithTracksDecorator.hh,v 1.3 2006/06/29 16:12:48 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Decorates with tracks according to the pin-out // - Constructor diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithTracksDecorator.icc b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithTracksDecorator.icc index 94ce5d0e49..0a032aab50 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithTracksDecorator.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonTDetectorVolumesWithTracksDecorator.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonTDetectorVolumesWithTracksDecorator.icc,v 1.1.2.2 2006/06/29 16:12:50 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONTDETECTORVOLUMESWITHTRACKSDECORATOR_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorEntitiesConstructorsFactory.hh b/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorEntitiesConstructorsFactory.hh index 8410871438..121925a030 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorEntitiesConstructorsFactory.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorEntitiesConstructorsFactory.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVDetectorEntitiesConstructorsFactory.hh,v 1.4 2006/06/29 16:12:52 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Abstract class of a factory of detector-entity constructor // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorEntitiesConstructorsFactory.icc b/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorEntitiesConstructorsFactory.icc index 2c4b19e477..3a14f59e9a 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorEntitiesConstructorsFactory.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorEntitiesConstructorsFactory.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVDetectorEntitiesConstructorsFactory.icc,v 1.3 2006/06/29 16:13:10 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONVDETECTORENTITIESCONSTRUCTORSFACTORY_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorEntityConstructor.hh b/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorEntityConstructor.hh index ac359a196f..2eb3200938 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorEntityConstructor.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorEntityConstructor.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVDetectorEntityConstructor.hh,v 1.4 2006/06/29 16:13:12 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Abstract class of a detector-entity constructor // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorEntityConstructor.icc b/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorEntityConstructor.icc index 37e152e84b..54d467a112 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorEntityConstructor.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorEntityConstructor.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVDetectorEntityConstructor.icc,v 1.3 2006/06/29 16:13:14 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONVDETECTORENTITYCONSTRUCTOR_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorLabelledEntityConstructor.hh b/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorLabelledEntityConstructor.hh index 0a59ddbc46..3db27e7a53 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorLabelledEntityConstructor.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorLabelledEntityConstructor.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVDetectorLabelledEntityConstructor.hh,v 1.8 2006/06/29 16:13:16 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Abstract class of a detector-entity constructor with label // and attributes diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorLabelledEntityConstructor.icc b/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorLabelledEntityConstructor.icc index 1950deda8d..4b7b1cdaec 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorLabelledEntityConstructor.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorLabelledEntityConstructor.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVDetectorLabelledEntityConstructor.icc,v 1.3 2006/06/29 16:13:18 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONVDETECTORLABELLEDENTITYCONSTRUCTOR_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorLayerVolumeItemOperation.hh b/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorLayerVolumeItemOperation.hh index 5577adef4c..72f64ea689 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorLayerVolumeItemOperation.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorLayerVolumeItemOperation.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVDetectorLayerVolumeItemOperation.hh,v 1.3 2006/06/29 16:13:20 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Operates on solids // diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorLayerVolumeItemOperation.icc b/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorLayerVolumeItemOperation.icc index 47092d73b0..9e53b241bd 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorLayerVolumeItemOperation.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorLayerVolumeItemOperation.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVDetectorLayerVolumeItemOperation.icc,v 1.3 2006/06/29 16:13:22 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONVDETECTORLAYERVOLUMEITEMOPERATION_HH diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorLayout.hh b/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorLayout.hh index 4cba4c59f7..53e094db29 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorLayout.hh +++ b/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorLayout.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVDetectorLayout.hh,v 1.7 2006/06/29 16:13:24 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Abstract class to keep track of the configured detector // layout diff --git a/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorLayout.icc b/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorLayout.icc index bc9b2a82d6..3f3f5687e8 100644 --- a/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorLayout.icc +++ b/examples/advanced/radiation_monitor/detector/include/RadmonVDetectorLayout.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVDetectorLayout.icc,v 1.3 2006/06/29 16:13:26 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONVDETECTORLAYOUT_HH diff --git a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorConstruction.cc b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorConstruction.cc index ecad726c47..0d8fb90369 100644 --- a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorConstruction.cc +++ b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorConstruction.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorConstruction.cc,v 1.4.2.2 2006/06/29 16:13:28 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorEnvironmentLayout.cc b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorEnvironmentLayout.cc index 72c8471338..9e1af73384 100644 --- a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorEnvironmentLayout.cc +++ b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorEnvironmentLayout.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorEnvironmentLayout.cc,v 1.5 2006/06/29 16:13:30 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorFlatVolumeComponent.cc b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorFlatVolumeComponent.cc index 76cf596cdf..5d3cd16c2b 100644 --- a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorFlatVolumeComponent.cc +++ b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorFlatVolumeComponent.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorFlatVolumeComponent.cc,v 1.2.2.2 2006/06/29 16:13:32 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLabelledEntitiesConstructorsFactory.cc b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLabelledEntitiesConstructorsFactory.cc index 3e0c39a3df..56844d0078 100644 --- a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLabelledEntitiesConstructorsFactory.cc +++ b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLabelledEntitiesConstructorsFactory.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorLabelledEntitiesConstructorsFactory.cc,v 1.2.2.2 2006/06/29 16:13:34 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLabelledEntitiesConstructorsMessenger.cc b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLabelledEntitiesConstructorsMessenger.cc index 94068dd5a0..0725cb7102 100644 --- a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLabelledEntitiesConstructorsMessenger.cc +++ b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLabelledEntitiesConstructorsMessenger.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorLabelledEntitiesConstructorsMessenger.cc,v 1.5 2006/06/29 16:13:36 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Messenger commands path diff --git a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLayerLayout.cc b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLayerLayout.cc index a810572764..eb9e9609f5 100644 --- a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLayerLayout.cc +++ b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLayerLayout.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorLayerLayout.cc,v 1.5 2006/06/29 16:13:39 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLayerVolumeItem.cc b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLayerVolumeItem.cc index ba4050519a..48cb920475 100644 --- a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLayerVolumeItem.cc +++ b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLayerVolumeItem.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorLayerVolumeItem.cc,v 1.2.2.2 2006/06/29 16:13:44 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLayerVolumeItemIntersection.cc b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLayerVolumeItemIntersection.cc index b4ce59e64a..5f9b7657de 100644 --- a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLayerVolumeItemIntersection.cc +++ b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLayerVolumeItemIntersection.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorLayerVolumeItemIntersection.cc,v 1.3 2006/06/29 16:13:49 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLayerVolumeItemSubtraction.cc b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLayerVolumeItemSubtraction.cc index d37459ec28..51df67305a 100644 --- a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLayerVolumeItemSubtraction.cc +++ b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLayerVolumeItemSubtraction.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorLayerVolumeItemSubtraction.cc,v 1.3 2006/06/29 16:13:53 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLayerVolumeItemUnion.cc b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLayerVolumeItemUnion.cc index 5edd41666e..9d26f90927 100644 --- a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLayerVolumeItemUnion.cc +++ b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLayerVolumeItemUnion.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorLayerVolumeItemUnion.cc,v 1.3 2006/06/29 16:13:55 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLayerVolumesList.cc b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLayerVolumesList.cc index 9a351cf3f5..42178d4a94 100644 --- a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLayerVolumesList.cc +++ b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLayerVolumesList.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorLayerVolumesList.cc,v 1.3 2006/06/29 16:13:57 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLayout.cc b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLayout.cc index 6770077202..6c6c832fc8 100644 --- a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLayout.cc +++ b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorLayout.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorLayout.cc,v 1.3.2.2 2006/06/29 16:13:59 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorMessenger.cc b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorMessenger.cc index ffbba886b4..20e78add6f 100644 --- a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorMessenger.cc +++ b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorMessenger.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorMessenger.cc,v 1.3.2.2 2006/06/29 16:14:01 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Messenger commands path diff --git a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorMultilayerLayout.cc b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorMultilayerLayout.cc index d45b16be77..3003688084 100644 --- a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorMultilayerLayout.cc +++ b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorMultilayerLayout.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorMultilayerLayout.cc,v 1.6.2.2 2006/06/29 16:14:03 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorMultilayerPlacementLayout.cc b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorMultilayerPlacementLayout.cc index d29b7a7061..eef503e99b 100644 --- a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorMultilayerPlacementLayout.cc +++ b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorMultilayerPlacementLayout.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorMultilayerPlacementLayout.cc,v 1.5 2006/06/29 16:14:05 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorMultilayerPlacementsLayoutCollection.cc b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorMultilayerPlacementsLayoutCollection.cc index 32fdbb713f..415078a9a3 100644 --- a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorMultilayerPlacementsLayoutCollection.cc +++ b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorMultilayerPlacementsLayoutCollection.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorMultilayerPlacementsLayoutCollection.cc,v 1.4 2006/06/29 16:14:07 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorMultilayersLayoutCollection.cc b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorMultilayersLayoutCollection.cc index a3cfef530f..ca52ffe190 100644 --- a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorMultilayersLayoutCollection.cc +++ b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorMultilayersLayoutCollection.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorMultilayersLayoutCollection.cc,v 1.5 2006/06/29 16:14:09 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorPadsData.cc b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorPadsData.cc index d6ffbe4140..46609a653c 100644 --- a/examples/advanced/radiation_monitor/detector/src/RadmonDetectorPadsData.cc +++ b/examples/advanced/radiation_monitor/detector/src/RadmonDetectorPadsData.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDetectorPadsData.cc,v 1.3 2006/06/29 16:14:11 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/detector/src/RadmonVDetectorLabelledEntityConstructor.cc b/examples/advanced/radiation_monitor/detector/src/RadmonVDetectorLabelledEntityConstructor.cc index 94f0ab50b7..d2b0b723f1 100644 --- a/examples/advanced/radiation_monitor/detector/src/RadmonVDetectorLabelledEntityConstructor.cc +++ b/examples/advanced/radiation_monitor/detector/src/RadmonVDetectorLabelledEntityConstructor.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVDetectorLabelledEntityConstructor.cc,v 1.7 2006/06/29 16:14:13 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/detector/src/RadmonVDetectorLayerVolumeItemOperation.cc b/examples/advanced/radiation_monitor/detector/src/RadmonVDetectorLayerVolumeItemOperation.cc index ed6ca5760c..0c54276fa8 100644 --- a/examples/advanced/radiation_monitor/detector/src/RadmonVDetectorLayerVolumeItemOperation.cc +++ b/examples/advanced/radiation_monitor/detector/src/RadmonVDetectorLayerVolumeItemOperation.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVDetectorLayerVolumeItemOperation.cc,v 1.3 2006/06/29 16:14:15 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/generalPurpose/include/RadmonDumpStyle.hh b/examples/advanced/radiation_monitor/generalPurpose/include/RadmonDumpStyle.hh index 9440bc89e6..8ddb4f806c 100644 --- a/examples/advanced/radiation_monitor/generalPurpose/include/RadmonDumpStyle.hh +++ b/examples/advanced/radiation_monitor/generalPurpose/include/RadmonDumpStyle.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonDumpStyle.hh,v 1.3 2006/06/29 16:14:17 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Define dump widths // diff --git a/examples/advanced/radiation_monitor/generalPurpose/include/RadmonLayoutEntityWithAttributes.hh b/examples/advanced/radiation_monitor/generalPurpose/include/RadmonLayoutEntityWithAttributes.hh index a859c3030c..9b0ad78466 100644 --- a/examples/advanced/radiation_monitor/generalPurpose/include/RadmonLayoutEntityWithAttributes.hh +++ b/examples/advanced/radiation_monitor/generalPurpose/include/RadmonLayoutEntityWithAttributes.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonLayoutEntityWithAttributes.hh,v 1.3.2.2 2006/06/29 16:14:19 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Provides attributes to other detector classes // diff --git a/examples/advanced/radiation_monitor/generalPurpose/include/RadmonLayoutEntityWithAttributes.icc b/examples/advanced/radiation_monitor/generalPurpose/include/RadmonLayoutEntityWithAttributes.icc index fea3e3e037..3bfe57d881 100644 --- a/examples/advanced/radiation_monitor/generalPurpose/include/RadmonLayoutEntityWithAttributes.icc +++ b/examples/advanced/radiation_monitor/generalPurpose/include/RadmonLayoutEntityWithAttributes.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonLayoutEntityWithAttributes.icc,v 1.3 2006/06/29 16:14:21 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONLAYOUTENTITYWITHATTRIBUTES_HH diff --git a/examples/advanced/radiation_monitor/generalPurpose/include/RadmonMessenger.hh b/examples/advanced/radiation_monitor/generalPurpose/include/RadmonMessenger.hh index 55f84b87cd..82d247db7f 100644 --- a/examples/advanced/radiation_monitor/generalPurpose/include/RadmonMessenger.hh +++ b/examples/advanced/radiation_monitor/generalPurpose/include/RadmonMessenger.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonMessenger.hh,v 1.3 2006/06/29 16:14:23 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: UI commands for managing a layout // diff --git a/examples/advanced/radiation_monitor/generalPurpose/include/RadmonMessenger.icc b/examples/advanced/radiation_monitor/generalPurpose/include/RadmonMessenger.icc index b25723c664..a47921ea62 100644 --- a/examples/advanced/radiation_monitor/generalPurpose/include/RadmonMessenger.icc +++ b/examples/advanced/radiation_monitor/generalPurpose/include/RadmonMessenger.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonMessenger.icc,v 1.3 2006/06/29 16:14:25 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONMESSENGER_HH diff --git a/examples/advanced/radiation_monitor/generalPurpose/include/RadmonMessengersSupport.hh b/examples/advanced/radiation_monitor/generalPurpose/include/RadmonMessengersSupport.hh index aed0c811fd..17f70a01c4 100644 --- a/examples/advanced/radiation_monitor/generalPurpose/include/RadmonMessengersSupport.hh +++ b/examples/advanced/radiation_monitor/generalPurpose/include/RadmonMessengersSupport.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonMessengersSupport.hh,v 1.3 2006/06/29 16:14:27 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Define macros useful to maintain the code of messengers // diff --git a/examples/advanced/radiation_monitor/generalPurpose/include/RadmonTLabelledCollection.hh b/examples/advanced/radiation_monitor/generalPurpose/include/RadmonTLabelledCollection.hh index d4bed8ddff..4764803f13 100644 --- a/examples/advanced/radiation_monitor/generalPurpose/include/RadmonTLabelledCollection.hh +++ b/examples/advanced/radiation_monitor/generalPurpose/include/RadmonTLabelledCollection.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonTLabelledCollection.hh,v 1.4 2006/06/29 16:14:29 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Container for objects with the following methods // - Constructor diff --git a/examples/advanced/radiation_monitor/generalPurpose/include/RadmonTLabelledCollection.icc b/examples/advanced/radiation_monitor/generalPurpose/include/RadmonTLabelledCollection.icc index c78bc144c7..29175005b6 100644 --- a/examples/advanced/radiation_monitor/generalPurpose/include/RadmonTLabelledCollection.icc +++ b/examples/advanced/radiation_monitor/generalPurpose/include/RadmonTLabelledCollection.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonTLabelledCollection.icc,v 1.6 2006/06/29 16:14:31 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONTLABELLEDCOLLECTION_HH diff --git a/examples/advanced/radiation_monitor/generalPurpose/include/RadmonTokenizer.hh b/examples/advanced/radiation_monitor/generalPurpose/include/RadmonTokenizer.hh index a9f6c39fdf..646dc8d39a 100644 --- a/examples/advanced/radiation_monitor/generalPurpose/include/RadmonTokenizer.hh +++ b/examples/advanced/radiation_monitor/generalPurpose/include/RadmonTokenizer.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonTokenizer.hh,v 1.3 2006/06/29 16:14:33 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Reads single tokens of a string // diff --git a/examples/advanced/radiation_monitor/generalPurpose/include/RadmonTokenizer.icc b/examples/advanced/radiation_monitor/generalPurpose/include/RadmonTokenizer.icc index dcd33d5dc4..8774e03441 100644 --- a/examples/advanced/radiation_monitor/generalPurpose/include/RadmonTokenizer.icc +++ b/examples/advanced/radiation_monitor/generalPurpose/include/RadmonTokenizer.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonTokenizer.icc,v 1.3 2006/06/29 16:14:35 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONTOKENIZER_HH diff --git a/examples/advanced/radiation_monitor/generalPurpose/include/RadmonVLayoutObserver.hh b/examples/advanced/radiation_monitor/generalPurpose/include/RadmonVLayoutObserver.hh index 27bce5883d..248b2b7b9d 100644 --- a/examples/advanced/radiation_monitor/generalPurpose/include/RadmonVLayoutObserver.hh +++ b/examples/advanced/radiation_monitor/generalPurpose/include/RadmonVLayoutObserver.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVLayoutObserver.hh,v 1.3 2006/06/29 16:14:37 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Observer class of the observer-subjectmodel for the detector // layout diff --git a/examples/advanced/radiation_monitor/generalPurpose/include/RadmonVLayoutObserver.icc b/examples/advanced/radiation_monitor/generalPurpose/include/RadmonVLayoutObserver.icc index d7ec78d90e..239870e58c 100644 --- a/examples/advanced/radiation_monitor/generalPurpose/include/RadmonVLayoutObserver.icc +++ b/examples/advanced/radiation_monitor/generalPurpose/include/RadmonVLayoutObserver.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVLayoutObserver.icc,v 1.3 2006/06/29 16:14:39 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONVLAYOUTOBSERVER_HH diff --git a/examples/advanced/radiation_monitor/generalPurpose/include/RadmonVLayoutSubject.hh b/examples/advanced/radiation_monitor/generalPurpose/include/RadmonVLayoutSubject.hh index 237f762ed1..4167c38f01 100644 --- a/examples/advanced/radiation_monitor/generalPurpose/include/RadmonVLayoutSubject.hh +++ b/examples/advanced/radiation_monitor/generalPurpose/include/RadmonVLayoutSubject.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVLayoutSubject.hh,v 1.2.2.2 2006/06/29 16:14:41 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Subject class of the observer-subjectmodel for the detector // layout diff --git a/examples/advanced/radiation_monitor/generalPurpose/include/RadmonVLayoutSubject.icc b/examples/advanced/radiation_monitor/generalPurpose/include/RadmonVLayoutSubject.icc index 7390e9c20e..8034149868 100644 --- a/examples/advanced/radiation_monitor/generalPurpose/include/RadmonVLayoutSubject.icc +++ b/examples/advanced/radiation_monitor/generalPurpose/include/RadmonVLayoutSubject.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVLayoutSubject.icc,v 1.3 2006/06/29 16:14:43 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONVLAYOUTSUBJECT_HH diff --git a/examples/advanced/radiation_monitor/generalPurpose/src/RadmonLayoutEntityWithAttributes.cc b/examples/advanced/radiation_monitor/generalPurpose/src/RadmonLayoutEntityWithAttributes.cc index 11c5776c55..2fca1d3171 100644 --- a/examples/advanced/radiation_monitor/generalPurpose/src/RadmonLayoutEntityWithAttributes.cc +++ b/examples/advanced/radiation_monitor/generalPurpose/src/RadmonLayoutEntityWithAttributes.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonLayoutEntityWithAttributes.cc,v 1.5 2006/06/29 16:14:45 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/generalPurpose/src/RadmonMessenger.cc b/examples/advanced/radiation_monitor/generalPurpose/src/RadmonMessenger.cc index 3233f5cfbc..8d15b55fae 100644 --- a/examples/advanced/radiation_monitor/generalPurpose/src/RadmonMessenger.cc +++ b/examples/advanced/radiation_monitor/generalPurpose/src/RadmonMessenger.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonMessenger.cc,v 1.3 2006/06/29 16:14:47 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/generalPurpose/src/RadmonTokenizer.cc b/examples/advanced/radiation_monitor/generalPurpose/src/RadmonTokenizer.cc index f380177c45..20c96c04e5 100644 --- a/examples/advanced/radiation_monitor/generalPurpose/src/RadmonTokenizer.cc +++ b/examples/advanced/radiation_monitor/generalPurpose/src/RadmonTokenizer.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonTokenizer.cc,v 1.3 2006/06/29 16:14:49 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/generalPurpose/src/RadmonVLayoutSubject.cc b/examples/advanced/radiation_monitor/generalPurpose/src/RadmonVLayoutSubject.cc index 737cb98604..db79e15b2f 100644 --- a/examples/advanced/radiation_monitor/generalPurpose/src/RadmonVLayoutSubject.cc +++ b/examples/advanced/radiation_monitor/generalPurpose/src/RadmonVLayoutSubject.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVLayoutSubject.cc,v 1.3 2006/06/29 16:14:51 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedDirection.hh b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedDirection.hh index 93a1a28105..ebca7183ad 100644 --- a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedDirection.hh +++ b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedDirection.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorFixedDirection.hh,v 1.3 2006/06/29 16:14:53 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Abstract class for a primary generator // diff --git a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedDirection.icc b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedDirection.icc index cdf46ce0d0..d3eb6163bd 100644 --- a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedDirection.icc +++ b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedDirection.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorFixedDirection.icc,v 1.3 2006/06/29 16:14:55 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONGENERATORFIXEDDIRECTION_HH diff --git a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedEnergy.hh b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedEnergy.hh index 5d0d08965b..355a53bafc 100644 --- a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedEnergy.hh +++ b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedEnergy.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorFixedEnergy.hh,v 1.3 2006/06/29 16:14:57 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Abstract class for a primary generator // diff --git a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedEnergy.icc b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedEnergy.icc index 05c10cff2a..3e35ea1b12 100644 --- a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedEnergy.icc +++ b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedEnergy.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorFixedEnergy.icc,v 1.3 2006/06/29 16:14:59 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONGENERATORFIXEDENERGY_HH diff --git a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedParticle.hh b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedParticle.hh index db5b8e890c..8bfeb7aebc 100644 --- a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedParticle.hh +++ b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedParticle.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorFixedParticle.hh,v 1.3 2006/06/29 16:15:01 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Abstract class for a primary generator // diff --git a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedParticle.icc b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedParticle.icc index a986487181..b236c7b4a6 100644 --- a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedParticle.icc +++ b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedParticle.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorFixedParticle.icc,v 1.3 2006/06/29 16:15:03 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONGENERATORFIXEDPARTICLE_HH diff --git a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedPosition.hh b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedPosition.hh index 8c63ab485f..ca5cd0279c 100644 --- a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedPosition.hh +++ b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedPosition.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorFixedPosition.hh,v 1.3 2006/06/29 16:15:05 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Abstract class for a primary generator // diff --git a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedPosition.icc b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedPosition.icc index 352d705199..6d3a86a025 100644 --- a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedPosition.icc +++ b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorFixedPosition.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorFixedPosition.icc,v 1.3 2006/06/29 16:15:07 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONGENERATORFIXEDPOSITION_HH diff --git a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorLayout.hh b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorLayout.hh index 8655469dd1..5b2e13cec2 100644 --- a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorLayout.hh +++ b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorLayout.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorLayout.hh,v 1.3 2006/06/29 16:15:09 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Implementation of the particles source data // diff --git a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorLayout.icc b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorLayout.icc index 218382511e..2903568d3f 100644 --- a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorLayout.icc +++ b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorLayout.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorLayout.icc,v 1.3 2006/06/29 16:15:11 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONGENERATORLAYOUT_HH diff --git a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorMessenger.hh b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorMessenger.hh index 484014d4a9..e06ab72ae9 100644 --- a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorMessenger.hh +++ b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorMessenger.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorMessenger.hh,v 1.3 2006/06/29 16:15:13 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Messenger to change sources properties // diff --git a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorSourceAlgorithmLayout.hh b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorSourceAlgorithmLayout.hh index a14c31e49e..fa25ab3a7e 100644 --- a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorSourceAlgorithmLayout.hh +++ b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorSourceAlgorithmLayout.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorSourceAlgorithmLayout.hh,v 1.3 2006/06/29 16:15:15 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Container for the data of an algorithm of a particles source // diff --git a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorSourceAlgorithmLayout.icc b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorSourceAlgorithmLayout.icc index 01a3dd6f46..f22e8d4abd 100644 --- a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorSourceAlgorithmLayout.icc +++ b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorSourceAlgorithmLayout.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorSourceAlgorithmLayout.icc,v 1.3 2006/06/29 16:15:17 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONGENERATORSOURCEALGORITHMLAYOUT_HH diff --git a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorSourceLayout.hh b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorSourceLayout.hh index 618643ae42..4fb8f714f0 100644 --- a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorSourceLayout.hh +++ b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorSourceLayout.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorSourceLayout.hh,v 1.3 2006/06/29 16:15:19 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Container for the data of a particles source // diff --git a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorSourceLayout.icc b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorSourceLayout.icc index 16bc83787c..6bf07dd0a3 100644 --- a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorSourceLayout.icc +++ b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorSourceLayout.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorSourceLayout.icc,v 1.3 2006/06/29 16:15:21 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONGENERATORSOURCELAYOUT_HH diff --git a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorUniformPlane.hh b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorUniformPlane.hh index 89311afe73..f2e0ecae45 100644 --- a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorUniformPlane.hh +++ b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorUniformPlane.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorUniformPlane.hh,v 1.3 2006/06/29 16:15:23 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Abstract class for a primary generator // diff --git a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorUniformPlane.icc b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorUniformPlane.icc index fb87aa8fd5..4dd6f92e4d 100644 --- a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorUniformPlane.icc +++ b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorUniformPlane.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorUniformPlane.icc,v 1.3 2006/06/29 16:15:36 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONGENERATORUNIFORMPLANE_HH diff --git a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorUniformSphere.hh b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorUniformSphere.hh index 7dd2886900..0910c30da2 100644 --- a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorUniformSphere.hh +++ b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorUniformSphere.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorUniformSphere.hh,v 1.3 2006/06/29 16:15:40 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Abstract class for a primary generator // diff --git a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorUniformSphere.icc b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorUniformSphere.icc index a9c75e8000..8bad83c7a5 100644 --- a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorUniformSphere.icc +++ b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorUniformSphere.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorUniformSphere.icc,v 1.3 2006/06/29 16:15:42 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONGENERATORUNIFORMSPHERE_HH diff --git a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorsWithLabelFactory.hh b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorsWithLabelFactory.hh index b0fc066749..66fe5adb0e 100644 --- a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorsWithLabelFactory.hh +++ b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorsWithLabelFactory.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorsWithLabelFactory.hh,v 1.3 2006/06/29 16:15:44 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Factory of primary generators with a label // diff --git a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorsWithLabelMessenger.hh b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorsWithLabelMessenger.hh index be79b6ac78..225c6e4b81 100644 --- a/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorsWithLabelMessenger.hh +++ b/examples/advanced/radiation_monitor/generator/include/RadmonGeneratorsWithLabelMessenger.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorsWithLabelMessenger.hh,v 1.3 2006/06/29 16:15:46 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: UI commands for dumping the available constructors // diff --git a/examples/advanced/radiation_monitor/generator/include/RadmonPrimaryGeneratorAction.hh b/examples/advanced/radiation_monitor/generator/include/RadmonPrimaryGeneratorAction.hh index 1710686d76..f0517dcd7a 100644 --- a/examples/advanced/radiation_monitor/generator/include/RadmonPrimaryGeneratorAction.hh +++ b/examples/advanced/radiation_monitor/generator/include/RadmonPrimaryGeneratorAction.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPrimaryGeneratorAction.hh,v 1.1.2.2 2006/06/29 16:15:48 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Primary particles generator user action // diff --git a/examples/advanced/radiation_monitor/generator/include/RadmonVGenerator.hh b/examples/advanced/radiation_monitor/generator/include/RadmonVGenerator.hh index f5b613e718..e1c553b3ca 100644 --- a/examples/advanced/radiation_monitor/generator/include/RadmonVGenerator.hh +++ b/examples/advanced/radiation_monitor/generator/include/RadmonVGenerator.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVGenerator.hh,v 1.3 2006/06/29 16:15:50 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Abstract class for a primary generator // diff --git a/examples/advanced/radiation_monitor/generator/include/RadmonVGenerator.icc b/examples/advanced/radiation_monitor/generator/include/RadmonVGenerator.icc index 2b2577da17..ffeb1ee67d 100644 --- a/examples/advanced/radiation_monitor/generator/include/RadmonVGenerator.icc +++ b/examples/advanced/radiation_monitor/generator/include/RadmonVGenerator.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVGenerator.icc,v 1.3 2006/06/29 16:15:52 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONVGENERATOR_HH diff --git a/examples/advanced/radiation_monitor/generator/include/RadmonVGeneratorLayout.hh b/examples/advanced/radiation_monitor/generator/include/RadmonVGeneratorLayout.hh index af3cb9b162..5bf090b9a0 100644 --- a/examples/advanced/radiation_monitor/generator/include/RadmonVGeneratorLayout.hh +++ b/examples/advanced/radiation_monitor/generator/include/RadmonVGeneratorLayout.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVGeneratorLayout.hh,v 1.3 2006/06/29 16:15:54 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Abstract class for storing primary generator data // diff --git a/examples/advanced/radiation_monitor/generator/include/RadmonVGeneratorLayout.icc b/examples/advanced/radiation_monitor/generator/include/RadmonVGeneratorLayout.icc index 1a89332a80..b2ff47d441 100644 --- a/examples/advanced/radiation_monitor/generator/include/RadmonVGeneratorLayout.icc +++ b/examples/advanced/radiation_monitor/generator/include/RadmonVGeneratorLayout.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVGeneratorLayout.icc,v 1.3 2006/06/29 16:15:56 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONVGENERATORLAYOUT_HH diff --git a/examples/advanced/radiation_monitor/generator/include/RadmonVGeneratorWithLabel.hh b/examples/advanced/radiation_monitor/generator/include/RadmonVGeneratorWithLabel.hh index b75cdd05b5..933ec94448 100644 --- a/examples/advanced/radiation_monitor/generator/include/RadmonVGeneratorWithLabel.hh +++ b/examples/advanced/radiation_monitor/generator/include/RadmonVGeneratorWithLabel.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVGeneratorWithLabel.hh,v 1.3 2006/06/29 16:15:58 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Primary generators with a label abstract class // diff --git a/examples/advanced/radiation_monitor/generator/include/RadmonVGeneratorWithLabel.icc b/examples/advanced/radiation_monitor/generator/include/RadmonVGeneratorWithLabel.icc index 1da3141a57..7abce14db3 100644 --- a/examples/advanced/radiation_monitor/generator/include/RadmonVGeneratorWithLabel.icc +++ b/examples/advanced/radiation_monitor/generator/include/RadmonVGeneratorWithLabel.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVGeneratorWithLabel.icc,v 1.3 2006/06/29 16:16:00 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONVGENERATORWITHLABEL_HH diff --git a/examples/advanced/radiation_monitor/generator/include/RadmonVGeneratorsFactory.hh b/examples/advanced/radiation_monitor/generator/include/RadmonVGeneratorsFactory.hh index 1bea2635f0..449ce9580e 100644 --- a/examples/advanced/radiation_monitor/generator/include/RadmonVGeneratorsFactory.hh +++ b/examples/advanced/radiation_monitor/generator/include/RadmonVGeneratorsFactory.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVGeneratorsFactory.hh,v 1.3 2006/06/29 16:16:02 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Abstract factory for a primary generators // diff --git a/examples/advanced/radiation_monitor/generator/include/RadmonVGeneratorsFactory.icc b/examples/advanced/radiation_monitor/generator/include/RadmonVGeneratorsFactory.icc index b3798d9804..e3344c38c4 100644 --- a/examples/advanced/radiation_monitor/generator/include/RadmonVGeneratorsFactory.icc +++ b/examples/advanced/radiation_monitor/generator/include/RadmonVGeneratorsFactory.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVGeneratorsFactory.icc,v 1.3 2006/06/29 16:16:04 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONVGENERATORSFACTORY_HH diff --git a/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorFixedDirection.cc b/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorFixedDirection.cc index a48a7977e9..fb520b6de3 100644 --- a/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorFixedDirection.cc +++ b/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorFixedDirection.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorFixedDirection.cc,v 1.4 2006/06/29 16:16:16 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorFixedEnergy.cc b/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorFixedEnergy.cc index a61aea9ae1..b49eae48ea 100644 --- a/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorFixedEnergy.cc +++ b/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorFixedEnergy.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorFixedEnergy.cc,v 1.3 2006/06/29 16:16:19 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorFixedParticle.cc b/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorFixedParticle.cc index c5fdd1acad..1fdcc2022c 100644 --- a/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorFixedParticle.cc +++ b/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorFixedParticle.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorFixedParticle.cc,v 1.3 2006/06/29 16:16:21 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorFixedPosition.cc b/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorFixedPosition.cc index 985ebec8a2..1b1fc53eb8 100644 --- a/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorFixedPosition.cc +++ b/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorFixedPosition.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorFixedPosition.cc,v 1.3 2006/06/29 16:16:23 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorLayout.cc b/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorLayout.cc index fb0b070870..2a4a56cccf 100644 --- a/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorLayout.cc +++ b/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorLayout.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorLayout.cc,v 1.1.2.2 2006/06/29 16:16:25 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorMessenger.cc b/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorMessenger.cc index 1a95cb10e5..59b9b9b68d 100644 --- a/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorMessenger.cc +++ b/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorMessenger.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorMessenger.cc,v 1.3 2006/06/29 16:16:27 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Messenger commands path diff --git a/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorSourceAlgorithmLayout.cc b/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorSourceAlgorithmLayout.cc index 915daf6334..d83afa07d1 100644 --- a/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorSourceAlgorithmLayout.cc +++ b/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorSourceAlgorithmLayout.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorSourceAlgorithmLayout.cc,v 1.3 2006/06/29 16:16:29 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorSourceLayout.cc b/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorSourceLayout.cc index 8b5b8be652..74d00d9020 100644 --- a/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorSourceLayout.cc +++ b/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorSourceLayout.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorSourceLayout.cc,v 1.3 2006/06/29 16:16:31 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorUniformPlane.cc b/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorUniformPlane.cc index 3d275580fc..4ef83394c0 100644 --- a/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorUniformPlane.cc +++ b/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorUniformPlane.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorUniformPlane.cc,v 1.5 2006/06/29 16:16:33 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorUniformSphere.cc b/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorUniformSphere.cc index 717aac2783..8378b3a9ac 100644 --- a/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorUniformSphere.cc +++ b/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorUniformSphere.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorUniformSphere.cc,v 1.4 2006/06/29 16:16:35 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorsWithLabelFactory.cc b/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorsWithLabelFactory.cc index 47aa7c9958..06ee5fa67b 100644 --- a/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorsWithLabelFactory.cc +++ b/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorsWithLabelFactory.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorsWithLabelFactory.cc,v 1.3 2006/06/29 16:16:37 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorsWithLabelMessenger.cc b/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorsWithLabelMessenger.cc index 97f9892246..f3367dff99 100644 --- a/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorsWithLabelMessenger.cc +++ b/examples/advanced/radiation_monitor/generator/src/RadmonGeneratorsWithLabelMessenger.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonGeneratorsWithLabelMessenger.cc,v 1.3 2006/06/29 16:16:39 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Messenger commands path diff --git a/examples/advanced/radiation_monitor/generator/src/RadmonPrimaryGeneratorAction.cc b/examples/advanced/radiation_monitor/generator/src/RadmonPrimaryGeneratorAction.cc index 70ffceb00b..86d3d8ffcb 100644 --- a/examples/advanced/radiation_monitor/generator/src/RadmonPrimaryGeneratorAction.cc +++ b/examples/advanced/radiation_monitor/generator/src/RadmonPrimaryGeneratorAction.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPrimaryGeneratorAction.cc,v 1.2.2.2 2006/06/29 16:16:41 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/materials/include/RadmonMaterialsDumpStyle.hh b/examples/advanced/radiation_monitor/materials/include/RadmonMaterialsDumpStyle.hh index c5fcdfb4f4..da5835241d 100644 --- a/examples/advanced/radiation_monitor/materials/include/RadmonMaterialsDumpStyle.hh +++ b/examples/advanced/radiation_monitor/materials/include/RadmonMaterialsDumpStyle.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonMaterialsDumpStyle.hh,v 1.3 2006/06/29 16:16:43 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Define dump widths // diff --git a/examples/advanced/radiation_monitor/materials/include/RadmonMaterialsManager.hh b/examples/advanced/radiation_monitor/materials/include/RadmonMaterialsManager.hh index cbad562158..74707e986a 100644 --- a/examples/advanced/radiation_monitor/materials/include/RadmonMaterialsManager.hh +++ b/examples/advanced/radiation_monitor/materials/include/RadmonMaterialsManager.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonMaterialsManager.hh,v 1.4 2006/06/29 16:16:45 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Singleton that manages the materials creation // diff --git a/examples/advanced/radiation_monitor/materials/include/RadmonMaterialsManager.icc b/examples/advanced/radiation_monitor/materials/include/RadmonMaterialsManager.icc index 0494c12b0d..0c57e061bf 100644 --- a/examples/advanced/radiation_monitor/materials/include/RadmonMaterialsManager.icc +++ b/examples/advanced/radiation_monitor/materials/include/RadmonMaterialsManager.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonMaterialsManager.icc,v 1.3 2006/06/29 16:16:47 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONMATERIALSMANAGER_HH diff --git a/examples/advanced/radiation_monitor/materials/include/RadmonMaterialsMessenger.hh b/examples/advanced/radiation_monitor/materials/include/RadmonMaterialsMessenger.hh index bf69498ac7..691a7dee26 100644 --- a/examples/advanced/radiation_monitor/materials/include/RadmonMaterialsMessenger.hh +++ b/examples/advanced/radiation_monitor/materials/include/RadmonMaterialsMessenger.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonMaterialsMessenger.hh,v 1.5 2006/06/29 16:16:49 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: UI commands for managing a layout // diff --git a/examples/advanced/radiation_monitor/materials/src/RadmonMaterialsManager.cc b/examples/advanced/radiation_monitor/materials/src/RadmonMaterialsManager.cc index 073762dd43..3ef2a2f1a3 100644 --- a/examples/advanced/radiation_monitor/materials/src/RadmonMaterialsManager.cc +++ b/examples/advanced/radiation_monitor/materials/src/RadmonMaterialsManager.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonMaterialsManager.cc,v 1.4 2006/06/29 16:16:51 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/materials/src/RadmonMaterialsMessenger.cc b/examples/advanced/radiation_monitor/materials/src/RadmonMaterialsMessenger.cc index 63d6ae335b..b14992e983 100644 --- a/examples/advanced/radiation_monitor/materials/src/RadmonMaterialsMessenger.cc +++ b/examples/advanced/radiation_monitor/materials/src/RadmonMaterialsMessenger.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonMaterialsMessenger.cc,v 1.4 2006/06/29 16:16:53 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Messenger commands path diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsDecay.hh b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsDecay.hh index 9d20cf0df0..6140e4ac32 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsDecay.hh +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsDecay.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsDecay.hh,v 1.4 2006/06/29 16:16:55 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Decay processes // diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsDecay.icc b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsDecay.icc index c68b8ce47d..a1cf4eab40 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsDecay.icc +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsDecay.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsDecay.icc,v 1.3 2006/06/29 16:16:57 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONPHYSICSDECAY_HH diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsElectronEEDL.hh b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsElectronEEDL.hh index c41075d14d..0d4a533d71 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsElectronEEDL.hh +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsElectronEEDL.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsElectronEEDL.hh,v 1.3 2006/06/29 16:16:59 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: EEDL processes for electrons // diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsElectronEEDL.icc b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsElectronEEDL.icc index 9b59b18bc3..ca4f89d958 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsElectronEEDL.icc +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsElectronEEDL.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsElectronEEDL.icc,v 1.3 2006/06/29 16:17:01 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONPHYSICSELECTRONEEDL_HH diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsElectronStandard.hh b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsElectronStandard.hh index f131d4f3ca..a39ffb3dfc 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsElectronStandard.hh +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsElectronStandard.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsElectronStandard.hh,v 1.3 2006/06/29 16:17:03 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Standard processes for electrons // diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsElectronStandard.icc b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsElectronStandard.icc index 53895dd06f..0977b69c0d 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsElectronStandard.icc +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsElectronStandard.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsElectronStandard.icc,v 1.3 2006/06/29 16:17:05 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONPHYSICSELECTRONSTANDARD_HH diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsHadronsBertini.hh b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsHadronsBertini.hh index 2d75b7346d..ace60b8e28 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsHadronsBertini.hh +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsHadronsBertini.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsHadronsBertini.hh,v 1.3 2006/06/29 16:17:07 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Hadrons (except neutron) processes based on bertini cascade model // diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsHadronsBertini.icc b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsHadronsBertini.icc index 4c465bfcd1..905d90b267 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsHadronsBertini.icc +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsHadronsBertini.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsHadronsBertini.icc,v 1.3 2006/06/29 16:17:09 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONPHYSICSHADRONSBERTINI_HH diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsHadronsBinary.hh b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsHadronsBinary.hh index 66734da8d8..fbf2b528f3 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsHadronsBinary.hh +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsHadronsBinary.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsHadronsBinary.hh,v 1.3 2006/06/29 16:17:11 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Hadrons (except neutron) processes based on binary cascade model // diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsHadronsBinary.icc b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsHadronsBinary.icc index 2129be8bbe..a0b67ea3ef 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsHadronsBinary.icc +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsHadronsBinary.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsHadronsBinary.icc,v 1.3 2006/06/29 16:17:13 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONPHYSICSHADRONSBINARY_HH diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsICRUIonization.hh b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsICRUIonization.hh index a1af1e3ea8..3eccc1e801 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsICRUIonization.hh +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsICRUIonization.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsICRUIonization.hh,v 1.3 2006/06/29 16:17:15 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: ICRU ionization processe // diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsICRUIonization.icc b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsICRUIonization.icc index b3abaadd28..67ebeb0623 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsICRUIonization.icc +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsICRUIonization.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsICRUIonization.icc,v 1.3 2006/06/29 16:17:17 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONPHYSICSICRUIONIZATION_HH diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsInfo.hh b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsInfo.hh index fa0f21637e..13c1e1f7f1 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsInfo.hh +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsInfo.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsInfo.hh,v 1.3 2006/06/29 16:17:19 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Provides informations about a process // diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsInfo.icc b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsInfo.icc index ad8891083c..7a28fdad4c 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsInfo.icc +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsInfo.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsInfo.icc,v 1.3 2006/06/29 16:17:21 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONPHYSICSINFO_HH diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsInfoList.hh b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsInfoList.hh index 8738f6f38e..fb67398427 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsInfoList.hh +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsInfoList.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsInfoList.hh,v 1.3 2006/06/29 16:17:23 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Provides informations about a process // diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsInfoList.icc b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsInfoList.icc index b7b8b87b76..b28dc4fbd2 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsInfoList.icc +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsInfoList.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsInfoList.icc,v 1.3 2006/06/29 16:17:25 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONPHYSICSINFOLIST_HH diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsLayout.hh b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsLayout.hh index f01aa3042e..ceb9052507 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsLayout.hh +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsLayout.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsLayout.hh,v 1.4 2006/06/29 16:17:27 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Abstract class to keep track of the configured physics list // diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsList.hh b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsList.hh index 336d010a97..014b5f0de0 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsList.hh +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsList.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsList.hh,v 1.6 2006/06/29 16:17:29 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Implementation of the G4VUserPhysicsList // diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsMessenger.hh b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsMessenger.hh index 2ec3b9726d..2838af6aa4 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsMessenger.hh +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsMessenger.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsMessenger.hh,v 1.3 2006/06/29 16:17:31 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: UI commands for managing a layout // diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsMuonStandard.hh b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsMuonStandard.hh index b982036b28..9468c314fe 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsMuonStandard.hh +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsMuonStandard.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsMuonStandard.hh,v 1.3 2006/06/29 16:17:33 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: EEDL processes for electrons // diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsMuonStandard.icc b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsMuonStandard.icc index 4ff5cab753..78e03d1277 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsMuonStandard.icc +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsMuonStandard.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsMuonStandard.icc,v 1.3 2006/06/29 16:17:35 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONPHYSICSMUONSTANDARD_HH diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsNeutronBertini.hh b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsNeutronBertini.hh index fb336d19ee..6ef6b510fc 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsNeutronBertini.hh +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsNeutronBertini.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsNeutronBertini.hh,v 1.3 2006/06/29 16:17:37 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Neutron processes based on bertini cascade model // diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsNeutronBertini.icc b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsNeutronBertini.icc index dd9f54833b..7a87d21afa 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsNeutronBertini.icc +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsNeutronBertini.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsNeutronBertini.icc,v 1.3 2006/06/29 16:17:39 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONPHYSICSNEUTRONBERTINI_HH diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsNeutronBinary.hh b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsNeutronBinary.hh index f6ec572af1..b419549382 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsNeutronBinary.hh +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsNeutronBinary.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsNeutronBinary.hh,v 1.4 2006/06/29 16:17:41 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Neutron processes based on binary cascade model // diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsNeutronBinary.icc b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsNeutronBinary.icc index 2cba3420f9..5ff641dafb 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsNeutronBinary.icc +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsNeutronBinary.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsNeutronBinary.icc,v 1.3 2006/06/29 16:17:43 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONPHYSICSNEUTRONBINARY_HH diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsNuclear.hh b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsNuclear.hh index 7f849c6085..14e0b0c731 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsNuclear.hh +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsNuclear.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsNuclear.hh,v 1.3 2006/06/29 16:17:45 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: EEDL processes for electrons // diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsNuclear.icc b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsNuclear.icc index 1c2c32c729..8ce8cea500 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsNuclear.icc +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsNuclear.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsNuclear.icc,v 1.3 2006/06/29 16:17:47 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONPHYSICSNUCLEAR_HH diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsPhotonEPDL.hh b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsPhotonEPDL.hh index b84efe1104..d0f8e7ddc7 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsPhotonEPDL.hh +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsPhotonEPDL.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsPhotonEPDL.hh,v 1.3 2006/06/29 16:17:49 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: EEDL processes for electrons // diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsPhotonEPDL.icc b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsPhotonEPDL.icc index bce7588108..de27e0d948 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsPhotonEPDL.icc +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsPhotonEPDL.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsPhotonEPDL.icc,v 1.3 2006/06/29 16:17:51 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONPHYSICSPHOTONEPDL_HH diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsPhotonStandard.hh b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsPhotonStandard.hh index 3247dd0ed3..e529a3f150 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsPhotonStandard.hh +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsPhotonStandard.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsPhotonStandard.hh,v 1.3 2006/06/29 16:17:53 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: EEDL processes for electrons // diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsPhotonStandard.icc b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsPhotonStandard.icc index 8bd211339e..963a8ed8d3 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsPhotonStandard.icc +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsPhotonStandard.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsPhotonStandard.icc,v 1.3 2006/06/29 16:17:55 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONPHYSICSPHOTONSTANDARD_HH diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsPositronStandard.hh b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsPositronStandard.hh index 926bbcf993..659ac65585 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsPositronStandard.hh +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsPositronStandard.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsPositronStandard.hh,v 1.3 2006/06/29 16:17:57 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Standard processes for electrons // diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsPositronStandard.icc b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsPositronStandard.icc index 38d96d52b1..1b9853a551 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsPositronStandard.icc +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsPositronStandard.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsPositronStandard.icc,v 1.3 2006/06/29 16:17:59 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONPHYSICSPOSITRONSTANDARD_HH diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsProductionCuts.hh b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsProductionCuts.hh index 3462101018..a825168753 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsProductionCuts.hh +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsProductionCuts.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsProductionCuts.hh,v 1.3 2006/06/29 16:18:01 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Particles production cuts // diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsProductionCuts.icc b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsProductionCuts.icc index d4dd3dfa33..3aae6768bc 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsProductionCuts.icc +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsProductionCuts.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsProductionCuts.icc,v 1.3 2006/06/29 16:18:03 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONPHYSICSPRODUCTIONCUTS_HH diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsSteppingAction.hh b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsSteppingAction.hh index 73a70023ea..972f06c7e3 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsSteppingAction.hh +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsSteppingAction.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsSteppingAction.hh,v 1.3 2006/06/29 16:18:05 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Observer class for the Stepping Action // diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsSteppingAction.icc b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsSteppingAction.icc index dd34e146f5..1fe1cd53ee 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsSteppingAction.icc +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsSteppingAction.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsSteppingAction.icc,v 1.3 2006/06/29 16:18:07 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONPHYSICSSTEPPINGACTION_HH diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsTauStandard.hh b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsTauStandard.hh index 4f4abdc17c..7c76386f78 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsTauStandard.hh +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsTauStandard.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsTauStandard.hh,v 1.3 2006/06/29 16:18:09 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: EEDL processes for electrons // diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsTauStandard.icc b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsTauStandard.icc index b9b1a4b7db..a2ed67cbdc 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsTauStandard.icc +++ b/examples/advanced/radiation_monitor/physics/include/RadmonPhysicsTauStandard.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsTauStandard.icc,v 1.3 2006/06/29 16:18:11 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONPHYSICSTAUSTANDARD_HH diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonSubPhysicsListLayout.hh b/examples/advanced/radiation_monitor/physics/include/RadmonSubPhysicsListLayout.hh index 2e3482f9de..b5e67326c0 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonSubPhysicsListLayout.hh +++ b/examples/advanced/radiation_monitor/physics/include/RadmonSubPhysicsListLayout.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonSubPhysicsListLayout.hh,v 1.5 2006/06/29 16:18:13 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Internal class that describes sub physics list informations // diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonSubPhysicsListLayout.icc b/examples/advanced/radiation_monitor/physics/include/RadmonSubPhysicsListLayout.icc index 2a72d77413..6b35205fb9 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonSubPhysicsListLayout.icc +++ b/examples/advanced/radiation_monitor/physics/include/RadmonSubPhysicsListLayout.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonSubPhysicsListLayout.icc,v 1.5 2006/06/29 16:18:15 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONSUBPHYSICSLISTLAYOUT_HH diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonSubPhysicsListWithLabelFactory.hh b/examples/advanced/radiation_monitor/physics/include/RadmonSubPhysicsListWithLabelFactory.hh index 45018b062a..bf2c8aac3b 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonSubPhysicsListWithLabelFactory.hh +++ b/examples/advanced/radiation_monitor/physics/include/RadmonSubPhysicsListWithLabelFactory.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonSubPhysicsListWithLabelFactory.hh,v 1.3 2006/06/29 16:18:17 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Concrete factory that constructs // RadmonSubPhysiscsListWithLabel objects diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonSubPhysicsListWithLabelFactory.icc b/examples/advanced/radiation_monitor/physics/include/RadmonSubPhysicsListWithLabelFactory.icc index 17349f50d5..8fb848598f 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonSubPhysicsListWithLabelFactory.icc +++ b/examples/advanced/radiation_monitor/physics/include/RadmonSubPhysicsListWithLabelFactory.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonSubPhysicsListWithLabelFactory.icc,v 1.3 2006/06/29 16:18:19 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONSUBPHYSICSLISTWITHLABELFACTORY_HH diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonSubPhysicsListWithLabelMessenger.hh b/examples/advanced/radiation_monitor/physics/include/RadmonSubPhysicsListWithLabelMessenger.hh index b4ae7f8cc3..4f0da8421f 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonSubPhysicsListWithLabelMessenger.hh +++ b/examples/advanced/radiation_monitor/physics/include/RadmonSubPhysicsListWithLabelMessenger.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonSubPhysicsListWithLabelMessenger.hh,v 1.4 2006/06/29 16:18:21 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: UI commands for dumping the available constructors // diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonVPhysicsLayout.hh b/examples/advanced/radiation_monitor/physics/include/RadmonVPhysicsLayout.hh index 8b4ee6f1b7..205f28c3d0 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonVPhysicsLayout.hh +++ b/examples/advanced/radiation_monitor/physics/include/RadmonVPhysicsLayout.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVPhysicsLayout.hh,v 1.4 2006/06/29 16:18:23 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Abstract class to keep track of the configured physics list // diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonVPhysicsLayout.icc b/examples/advanced/radiation_monitor/physics/include/RadmonVPhysicsLayout.icc index f79f9cdffd..0628ced719 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonVPhysicsLayout.icc +++ b/examples/advanced/radiation_monitor/physics/include/RadmonVPhysicsLayout.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVPhysicsLayout.icc,v 1.3 2006/06/29 16:18:25 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONVPHYSICSLAYOUT_HH diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonVSubPhysicsList.hh b/examples/advanced/radiation_monitor/physics/include/RadmonVSubPhysicsList.hh index 36e0233602..24cacfb6ee 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonVSubPhysicsList.hh +++ b/examples/advanced/radiation_monitor/physics/include/RadmonVSubPhysicsList.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVSubPhysicsList.hh,v 1.4 2006/06/29 16:18:27 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Abstract class of a physics list piece // diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonVSubPhysicsList.icc b/examples/advanced/radiation_monitor/physics/include/RadmonVSubPhysicsList.icc index 9418fbe43d..82139a8221 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonVSubPhysicsList.icc +++ b/examples/advanced/radiation_monitor/physics/include/RadmonVSubPhysicsList.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVSubPhysicsList.icc,v 1.3 2006/06/29 16:18:29 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONVSUBPHYSICSLIST_HH diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonVSubPhysicsListFactory.hh b/examples/advanced/radiation_monitor/physics/include/RadmonVSubPhysicsListFactory.hh index 4f5893b903..15ce81e16f 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonVSubPhysicsListFactory.hh +++ b/examples/advanced/radiation_monitor/physics/include/RadmonVSubPhysicsListFactory.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVSubPhysicsListFactory.hh,v 1.4 2006/06/29 16:18:31 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Abstract class of a factory of sub physics lists // diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonVSubPhysicsListFactory.icc b/examples/advanced/radiation_monitor/physics/include/RadmonVSubPhysicsListFactory.icc index 3b71760ea2..780715c6a7 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonVSubPhysicsListFactory.icc +++ b/examples/advanced/radiation_monitor/physics/include/RadmonVSubPhysicsListFactory.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVSubPhysicsListFactory.icc,v 1.3 2006/06/29 16:18:33 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONVSUBPHYSICSLISTFACTORY_HH diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonVSubPhysicsListWithLabel.hh b/examples/advanced/radiation_monitor/physics/include/RadmonVSubPhysicsListWithLabel.hh index a11cc7ef7f..cd6704010e 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonVSubPhysicsListWithLabel.hh +++ b/examples/advanced/radiation_monitor/physics/include/RadmonVSubPhysicsListWithLabel.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVSubPhysicsListWithLabel.hh,v 1.4 2006/06/29 16:18:35 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Abstract class of a physics list piece with label // and attributes diff --git a/examples/advanced/radiation_monitor/physics/include/RadmonVSubPhysicsListWithLabel.icc b/examples/advanced/radiation_monitor/physics/include/RadmonVSubPhysicsListWithLabel.icc index 6b4485a801..21ea1e159e 100644 --- a/examples/advanced/radiation_monitor/physics/include/RadmonVSubPhysicsListWithLabel.icc +++ b/examples/advanced/radiation_monitor/physics/include/RadmonVSubPhysicsListWithLabel.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonVSubPhysicsListWithLabel.icc,v 1.4 2006/06/29 16:18:37 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONVSUBPHYSICSLISTWITHLABEL_HH diff --git a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsDecay.cc b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsDecay.cc index 64677ecbe3..b970eefead 100644 --- a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsDecay.cc +++ b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsDecay.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsDecay.cc,v 1.6 2006/06/29 16:18:39 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #include "RadmonPhysicsDecay.hh" diff --git a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsElectronEEDL.cc b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsElectronEEDL.cc index 27723a1f38..6bff463706 100644 --- a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsElectronEEDL.cc +++ b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsElectronEEDL.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsElectronEEDL.cc,v 1.4 2006/06/29 16:18:41 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #include "RadmonPhysicsElectronEEDL.hh" diff --git a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsElectronStandard.cc b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsElectronStandard.cc index a1416a942b..cca979cbc9 100644 --- a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsElectronStandard.cc +++ b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsElectronStandard.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsElectronStandard.cc,v 1.4 2006/06/29 16:18:43 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #include "RadmonPhysicsElectronStandard.hh" diff --git a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsHadronsBertini.cc b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsHadronsBertini.cc index d3bed2d271..a6d505cfa2 100644 --- a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsHadronsBertini.cc +++ b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsHadronsBertini.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsHadronsBertini.cc,v 1.4 2006/06/29 16:18:45 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #include "RadmonPhysicsHadronsBertini.hh" diff --git a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsHadronsBinary.cc b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsHadronsBinary.cc index 9432116d2b..db5c1c5989 100644 --- a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsHadronsBinary.cc +++ b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsHadronsBinary.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsHadronsBinary.cc,v 1.3 2006/06/29 16:18:47 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #include "RadmonPhysicsHadronsBinary.hh" diff --git a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsICRUIonization.cc b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsICRUIonization.cc index 60cbcbf506..cabcf88d18 100644 --- a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsICRUIonization.cc +++ b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsICRUIonization.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsICRUIonization.cc,v 1.5 2006/06/29 16:18:49 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #include "RadmonPhysicsICRUIonization.hh" diff --git a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsInfo.cc b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsInfo.cc index 1bee011a32..7c5e21a242 100644 --- a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsInfo.cc +++ b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsInfo.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsInfo.cc,v 1.3 2006/06/29 16:18:51 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #include "RadmonPhysicsInfo.hh" diff --git a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsInfoList.cc b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsInfoList.cc index 6ffe1b2088..c509bd92b6 100644 --- a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsInfoList.cc +++ b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsInfoList.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsInfoList.cc,v 1.3 2006/06/29 16:18:53 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #include "RadmonPhysicsInfoList.hh" diff --git a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsLayout.cc b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsLayout.cc index c24d78b7b0..ce71c6806b 100644 --- a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsLayout.cc +++ b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsLayout.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsLayout.cc,v 1.4 2006/06/29 16:18:55 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsList.cc b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsList.cc index 8341d7a8cc..cb3937e214 100644 --- a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsList.cc +++ b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsList.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsList.cc,v 1.6 2006/06/29 16:18:57 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsMessenger.cc b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsMessenger.cc index 5270359f8d..c50dab93f2 100644 --- a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsMessenger.cc +++ b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsMessenger.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsMessenger.cc,v 1.4 2006/06/29 16:18:59 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Messenger commands path diff --git a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsMuonStandard.cc b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsMuonStandard.cc index 57a528bbea..ab584b4dd1 100644 --- a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsMuonStandard.cc +++ b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsMuonStandard.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsMuonStandard.cc,v 1.4 2006/06/29 16:19:01 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #include "RadmonPhysicsMuonStandard.hh" diff --git a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsNeutronBertini.cc b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsNeutronBertini.cc index b6ba59b0cb..11732d29d1 100644 --- a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsNeutronBertini.cc +++ b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsNeutronBertini.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsNeutronBertini.cc,v 1.1.2.2 2006/06/29 16:19:14 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #include "RadmonPhysicsNeutronBertini.hh" diff --git a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsNeutronBinary.cc b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsNeutronBinary.cc index 2b80514e15..8d4ff41008 100644 --- a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsNeutronBinary.cc +++ b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsNeutronBinary.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsNeutronBinary.cc,v 1.2.2.2 2006/06/29 16:19:29 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #include "RadmonPhysicsNeutronBinary.hh" diff --git a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsNuclear.cc b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsNuclear.cc index ffca1371d4..ab9992cd8d 100644 --- a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsNuclear.cc +++ b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsNuclear.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsNuclear.cc,v 1.3 2006/06/29 16:19:33 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #include "RadmonPhysicsNuclear.hh" diff --git a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsPhotonEPDL.cc b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsPhotonEPDL.cc index 147a3c4259..e930ab3555 100644 --- a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsPhotonEPDL.cc +++ b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsPhotonEPDL.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsPhotonEPDL.cc,v 1.3 2006/06/29 16:19:46 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #include "RadmonPhysicsPhotonEPDL.hh" diff --git a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsPhotonStandard.cc b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsPhotonStandard.cc index 85cd7731b7..ec95d58f49 100644 --- a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsPhotonStandard.cc +++ b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsPhotonStandard.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsPhotonStandard.cc,v 1.3 2006/06/29 16:19:48 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #include "RadmonPhysicsPhotonStandard.hh" diff --git a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsPositronStandard.cc b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsPositronStandard.cc index 619742350a..26596b8b19 100644 --- a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsPositronStandard.cc +++ b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsPositronStandard.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsPositronStandard.cc,v 1.4 2006/06/29 16:19:50 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #include "RadmonPhysicsPositronStandard.hh" diff --git a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsProductionCuts.cc b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsProductionCuts.cc index 0b41506924..5fafe1e910 100644 --- a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsProductionCuts.cc +++ b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsProductionCuts.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsProductionCuts.cc,v 1.3 2006/06/29 16:19:52 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #include "RadmonPhysicsProductionCuts.hh" diff --git a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsSteppingAction.cc b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsSteppingAction.cc index 8a4868bf3c..e3973b685d 100644 --- a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsSteppingAction.cc +++ b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsSteppingAction.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsSteppingAction.cc,v 1.3 2006/06/29 16:19:54 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsTauStandard.cc b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsTauStandard.cc index 8913525b61..833cb3498b 100644 --- a/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsTauStandard.cc +++ b/examples/advanced/radiation_monitor/physics/src/RadmonPhysicsTauStandard.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonPhysicsTauStandard.cc,v 1.3 2006/06/29 16:19:56 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #include "RadmonPhysicsTauStandard.hh" diff --git a/examples/advanced/radiation_monitor/physics/src/RadmonSubPhysicsListLayout.cc b/examples/advanced/radiation_monitor/physics/src/RadmonSubPhysicsListLayout.cc index 0df7b54b6f..f74efc455d 100644 --- a/examples/advanced/radiation_monitor/physics/src/RadmonSubPhysicsListLayout.cc +++ b/examples/advanced/radiation_monitor/physics/src/RadmonSubPhysicsListLayout.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonSubPhysicsListLayout.cc,v 1.5 2006/06/29 16:19:59 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/physics/src/RadmonSubPhysicsListWithLabelFactory.cc b/examples/advanced/radiation_monitor/physics/src/RadmonSubPhysicsListWithLabelFactory.cc index 940ef9a410..bde6d9ca38 100644 --- a/examples/advanced/radiation_monitor/physics/src/RadmonSubPhysicsListWithLabelFactory.cc +++ b/examples/advanced/radiation_monitor/physics/src/RadmonSubPhysicsListWithLabelFactory.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonSubPhysicsListWithLabelFactory.cc,v 1.3 2006/06/29 16:20:10 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/physics/src/RadmonSubPhysicsListWithLabelMessenger.cc b/examples/advanced/radiation_monitor/physics/src/RadmonSubPhysicsListWithLabelMessenger.cc index e94fc5c553..fa90e6ca93 100644 --- a/examples/advanced/radiation_monitor/physics/src/RadmonSubPhysicsListWithLabelMessenger.cc +++ b/examples/advanced/radiation_monitor/physics/src/RadmonSubPhysicsListWithLabelMessenger.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonSubPhysicsListWithLabelMessenger.cc,v 1.5 2006/06/29 16:20:12 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Messenger commands path diff --git a/examples/advanced/radiation_monitor/sensitivity/include/RadmonHit.hh b/examples/advanced/radiation_monitor/sensitivity/include/RadmonHit.hh index b452c1d75b..d1e307ae54 100644 --- a/examples/advanced/radiation_monitor/sensitivity/include/RadmonHit.hh +++ b/examples/advanced/radiation_monitor/sensitivity/include/RadmonHit.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonHit.hh,v 1.3 2006/06/29 16:20:14 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Radmon hit // diff --git a/examples/advanced/radiation_monitor/sensitivity/include/RadmonHit.icc b/examples/advanced/radiation_monitor/sensitivity/include/RadmonHit.icc index b2c31570b6..70c7c5ee72 100644 --- a/examples/advanced/radiation_monitor/sensitivity/include/RadmonHit.icc +++ b/examples/advanced/radiation_monitor/sensitivity/include/RadmonHit.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonHit.icc,v 1.3 2006/06/29 16:20:16 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONHIT_HH diff --git a/examples/advanced/radiation_monitor/sensitivity/include/RadmonHitsManager.hh b/examples/advanced/radiation_monitor/sensitivity/include/RadmonHitsManager.hh index e7d0730399..c4e126c496 100644 --- a/examples/advanced/radiation_monitor/sensitivity/include/RadmonHitsManager.hh +++ b/examples/advanced/radiation_monitor/sensitivity/include/RadmonHitsManager.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonHitsManager.hh,v 1.3 2006/06/29 16:20:18 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Global features for hits // diff --git a/examples/advanced/radiation_monitor/sensitivity/include/RadmonHitsManager.icc b/examples/advanced/radiation_monitor/sensitivity/include/RadmonHitsManager.icc index c3efa7140b..36f6653ef5 100644 --- a/examples/advanced/radiation_monitor/sensitivity/include/RadmonHitsManager.icc +++ b/examples/advanced/radiation_monitor/sensitivity/include/RadmonHitsManager.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonHitsManager.icc,v 1.3 2006/06/29 16:20:20 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONHITSMANAGER_HH diff --git a/examples/advanced/radiation_monitor/sensitivity/include/RadmonSensitiveDetector.hh b/examples/advanced/radiation_monitor/sensitivity/include/RadmonSensitiveDetector.hh index 543842da91..5e8b5789f8 100644 --- a/examples/advanced/radiation_monitor/sensitivity/include/RadmonSensitiveDetector.hh +++ b/examples/advanced/radiation_monitor/sensitivity/include/RadmonSensitiveDetector.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonSensitiveDetector.hh,v 1.4 2006/06/29 16:20:22 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Radmon sensitive detector class // diff --git a/examples/advanced/radiation_monitor/sensitivity/include/RadmonSensitiveDetector.icc b/examples/advanced/radiation_monitor/sensitivity/include/RadmonSensitiveDetector.icc index e964c95077..08abd5c542 100644 --- a/examples/advanced/radiation_monitor/sensitivity/include/RadmonSensitiveDetector.icc +++ b/examples/advanced/radiation_monitor/sensitivity/include/RadmonSensitiveDetector.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonSensitiveDetector.icc,v 1.3 2006/06/29 16:20:24 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONSENSITIVEDETECTOR_HH diff --git a/examples/advanced/radiation_monitor/sensitivity/include/RadmonSensitiveDetectorDataStorer.hh b/examples/advanced/radiation_monitor/sensitivity/include/RadmonSensitiveDetectorDataStorer.hh index e6aae1496e..9c31bee44e 100644 --- a/examples/advanced/radiation_monitor/sensitivity/include/RadmonSensitiveDetectorDataStorer.hh +++ b/examples/advanced/radiation_monitor/sensitivity/include/RadmonSensitiveDetectorDataStorer.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonSensitiveDetectorDataStorer.hh,v 1.3 2006/06/29 16:20:26 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Stores data step into a radmon hit // diff --git a/examples/advanced/radiation_monitor/sensitivity/include/RadmonSensitiveDetectorDataStorer.icc b/examples/advanced/radiation_monitor/sensitivity/include/RadmonSensitiveDetectorDataStorer.icc index 35bf6a34c4..e042a8f162 100644 --- a/examples/advanced/radiation_monitor/sensitivity/include/RadmonSensitiveDetectorDataStorer.icc +++ b/examples/advanced/radiation_monitor/sensitivity/include/RadmonSensitiveDetectorDataStorer.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonSensitiveDetectorDataStorer.icc,v 1.3 2006/06/29 16:20:28 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONSENSITIVEDETECTORDATASTORER_HH diff --git a/examples/advanced/radiation_monitor/sensitivity/src/RadmonHit.cc b/examples/advanced/radiation_monitor/sensitivity/src/RadmonHit.cc index aeb0f1e032..d121ded4ee 100644 --- a/examples/advanced/radiation_monitor/sensitivity/src/RadmonHit.cc +++ b/examples/advanced/radiation_monitor/sensitivity/src/RadmonHit.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonHit.cc,v 1.3 2006/06/29 16:20:30 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/sensitivity/src/RadmonHitsManager.cc b/examples/advanced/radiation_monitor/sensitivity/src/RadmonHitsManager.cc index 8d83f07d93..38b6ff3483 100644 --- a/examples/advanced/radiation_monitor/sensitivity/src/RadmonHitsManager.cc +++ b/examples/advanced/radiation_monitor/sensitivity/src/RadmonHitsManager.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonHitsManager.cc,v 1.3 2006/06/29 16:20:32 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/sensitivity/src/RadmonSensitiveDetector.cc b/examples/advanced/radiation_monitor/sensitivity/src/RadmonSensitiveDetector.cc index 3061a46636..1c191c611a 100644 --- a/examples/advanced/radiation_monitor/sensitivity/src/RadmonSensitiveDetector.cc +++ b/examples/advanced/radiation_monitor/sensitivity/src/RadmonSensitiveDetector.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonSensitiveDetector.cc,v 1.2.2.2 2006/06/29 16:20:34 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/userActions/include/RadmonEventAction.hh b/examples/advanced/radiation_monitor/userActions/include/RadmonEventAction.hh index f5d9ad1aef..ce85631897 100644 --- a/examples/advanced/radiation_monitor/userActions/include/RadmonEventAction.hh +++ b/examples/advanced/radiation_monitor/userActions/include/RadmonEventAction.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonEventAction.hh,v 1.3 2006/06/29 16:20:36 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Radmon event action class // diff --git a/examples/advanced/radiation_monitor/userActions/include/RadmonEventAction.icc b/examples/advanced/radiation_monitor/userActions/include/RadmonEventAction.icc index 77bd57099a..0315a8420b 100644 --- a/examples/advanced/radiation_monitor/userActions/include/RadmonEventAction.icc +++ b/examples/advanced/radiation_monitor/userActions/include/RadmonEventAction.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonEventAction.icc,v 1.3 2006/06/29 16:20:38 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONEVENTACTION_HH diff --git a/examples/advanced/radiation_monitor/userActions/include/RadmonEventActionObserver.hh b/examples/advanced/radiation_monitor/userActions/include/RadmonEventActionObserver.hh index 1a81e6747f..8df6f2e180 100644 --- a/examples/advanced/radiation_monitor/userActions/include/RadmonEventActionObserver.hh +++ b/examples/advanced/radiation_monitor/userActions/include/RadmonEventActionObserver.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonEventActionObserver.hh,v 1.3 2006/06/29 16:20:40 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Observer class for the Event Action // diff --git a/examples/advanced/radiation_monitor/userActions/include/RadmonEventActionObserver.icc b/examples/advanced/radiation_monitor/userActions/include/RadmonEventActionObserver.icc index 4769a5a573..24352e7fcf 100644 --- a/examples/advanced/radiation_monitor/userActions/include/RadmonEventActionObserver.icc +++ b/examples/advanced/radiation_monitor/userActions/include/RadmonEventActionObserver.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonEventActionObserver.icc,v 1.3 2006/06/29 16:20:42 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONEVENTACTIONOBSERVER_HH diff --git a/examples/advanced/radiation_monitor/userActions/include/RadmonRunAction.hh b/examples/advanced/radiation_monitor/userActions/include/RadmonRunAction.hh index b0110bb9d9..56882c2f27 100644 --- a/examples/advanced/radiation_monitor/userActions/include/RadmonRunAction.hh +++ b/examples/advanced/radiation_monitor/userActions/include/RadmonRunAction.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonRunAction.hh,v 1.3 2006/06/29 16:21:00 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Radmon run action class // diff --git a/examples/advanced/radiation_monitor/userActions/include/RadmonRunAction.icc b/examples/advanced/radiation_monitor/userActions/include/RadmonRunAction.icc index 1f9aaad042..c7e897dbcc 100644 --- a/examples/advanced/radiation_monitor/userActions/include/RadmonRunAction.icc +++ b/examples/advanced/radiation_monitor/userActions/include/RadmonRunAction.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonRunAction.icc,v 1.3 2006/06/29 16:21:38 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONRUNACTION_HH diff --git a/examples/advanced/radiation_monitor/userActions/include/RadmonRunActionObserver.hh b/examples/advanced/radiation_monitor/userActions/include/RadmonRunActionObserver.hh index d61157bb18..5ecf33a7a0 100644 --- a/examples/advanced/radiation_monitor/userActions/include/RadmonRunActionObserver.hh +++ b/examples/advanced/radiation_monitor/userActions/include/RadmonRunActionObserver.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonRunActionObserver.hh,v 1.3 2006/06/29 16:21:44 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Observer class for the Run Action // diff --git a/examples/advanced/radiation_monitor/userActions/include/RadmonRunActionObserver.icc b/examples/advanced/radiation_monitor/userActions/include/RadmonRunActionObserver.icc index 1703851bd3..7d406a54ef 100644 --- a/examples/advanced/radiation_monitor/userActions/include/RadmonRunActionObserver.icc +++ b/examples/advanced/radiation_monitor/userActions/include/RadmonRunActionObserver.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonRunActionObserver.icc,v 1.3 2006/06/29 16:21:46 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONRUNACTIONOBSERVER_HH diff --git a/examples/advanced/radiation_monitor/userActions/include/RadmonSteppingAction.hh b/examples/advanced/radiation_monitor/userActions/include/RadmonSteppingAction.hh index 787d891ac6..2c4b72852b 100644 --- a/examples/advanced/radiation_monitor/userActions/include/RadmonSteppingAction.hh +++ b/examples/advanced/radiation_monitor/userActions/include/RadmonSteppingAction.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonSteppingAction.hh,v 1.3 2006/06/29 16:21:48 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Radmon stepping action class // diff --git a/examples/advanced/radiation_monitor/userActions/include/RadmonSteppingAction.icc b/examples/advanced/radiation_monitor/userActions/include/RadmonSteppingAction.icc index a18b6e1e8a..c923f024f2 100644 --- a/examples/advanced/radiation_monitor/userActions/include/RadmonSteppingAction.icc +++ b/examples/advanced/radiation_monitor/userActions/include/RadmonSteppingAction.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonSteppingAction.icc,v 1.3 2006/06/29 16:21:50 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONSTEPPINGACTION_HH diff --git a/examples/advanced/radiation_monitor/userActions/include/RadmonSteppingActionObserver.hh b/examples/advanced/radiation_monitor/userActions/include/RadmonSteppingActionObserver.hh index 74921638aa..1f36eff105 100644 --- a/examples/advanced/radiation_monitor/userActions/include/RadmonSteppingActionObserver.hh +++ b/examples/advanced/radiation_monitor/userActions/include/RadmonSteppingActionObserver.hh @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonSteppingActionObserver.hh,v 1.3 2006/06/29 16:21:52 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Description: Observer class for the Stepping Action // diff --git a/examples/advanced/radiation_monitor/userActions/include/RadmonSteppingActionObserver.icc b/examples/advanced/radiation_monitor/userActions/include/RadmonSteppingActionObserver.icc index c1bd452889..01f73cb0b6 100644 --- a/examples/advanced/radiation_monitor/userActions/include/RadmonSteppingActionObserver.icc +++ b/examples/advanced/radiation_monitor/userActions/include/RadmonSteppingActionObserver.icc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonSteppingActionObserver.icc,v 1.3 2006/06/29 16:21:54 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // #ifndef RADMONSTEPPINGACTIONOBSERVER_HH diff --git a/examples/advanced/radiation_monitor/userActions/src/RadmonEventAction.cc b/examples/advanced/radiation_monitor/userActions/src/RadmonEventAction.cc index 201d06a9a5..a853808dd8 100644 --- a/examples/advanced/radiation_monitor/userActions/src/RadmonEventAction.cc +++ b/examples/advanced/radiation_monitor/userActions/src/RadmonEventAction.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonEventAction.cc,v 1.1.2.2 2006/06/29 16:21:56 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/userActions/src/RadmonRunAction.cc b/examples/advanced/radiation_monitor/userActions/src/RadmonRunAction.cc index f00a927796..f966c09b03 100644 --- a/examples/advanced/radiation_monitor/userActions/src/RadmonRunAction.cc +++ b/examples/advanced/radiation_monitor/userActions/src/RadmonRunAction.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonRunAction.cc,v 1.3 2006/06/29 16:21:58 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radiation_monitor/userActions/src/RadmonSteppingAction.cc b/examples/advanced/radiation_monitor/userActions/src/RadmonSteppingAction.cc index 021bb96fb0..74bc7f1e15 100644 --- a/examples/advanced/radiation_monitor/userActions/src/RadmonSteppingAction.cc +++ b/examples/advanced/radiation_monitor/userActions/src/RadmonSteppingAction.cc @@ -29,7 +29,7 @@ // Main author: Riccardo Capra // // Id: $Id: RadmonSteppingAction.cc,v 1.3 2006/06/29 16:22:00 gunter Exp $ -// Tag: $Name: geant4-08-01 $ +// Tag: $Name: geant4-08-02 $ // // Include files diff --git a/examples/advanced/radioprotection/History b/examples/advanced/radioprotection/History index 42f84207d8..ee891539d5 100644 --- a/examples/advanced/radioprotection/History +++ b/examples/advanced/radioprotection/History @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -$Id: History,v 1.18 2006/05/31 08:51:21 guatelli Exp $ +$Id: History,v 1.19 2006/11/15 18:39:30 guatelli Exp $ ------------------------------------------------------------------- ========================================================= @@ -8,6 +8,9 @@ $Id: History,v 1.18 2006/05/31 08:51:21 guatelli Exp $ Category History file --------------------- +15th November 2006 Susanna Guatelli (radioprotection-V08-01-00) +- The hadronic physics lists are more clear. + 31th May 2006 Susanna Guatelli(radioprotection-V08-00-01) - Added histograms - Added comments diff --git a/examples/advanced/radioprotection/README b/examples/advanced/radioprotection/README index bc63825c98..abc29939c0 100644 --- a/examples/advanced/radioprotection/README +++ b/examples/advanced/radioprotection/README @@ -115,10 +115,13 @@ binary cascade approach for the modeling of proton hadronic physics. 3. PRIMARY PARTICLES -Primary particles are generated according spectra derived from the differential flux (CREME 96). +Primary particles are generated according spectra derived from the +differential flux (CREME 96). gcr_min_z=1.txt and gcr_min_z=2.txt contain the differential flux -of galactic cosmic protons and alpha particles with respect to the energy (MeV/nucl). -These files are read by the primary particle component of the application and the spectra are derived. +of galactic cosmic protons and alpha particles with respect to the +energy (MeV/nucl). +These files are read by the primary particle component of the application +and the spectra are derived. Primary particles are generated from a point set in the position (0., 0., -25. m), with a direction (0., 0., 1.) by default. The user can change these parameters interactively. diff --git a/examples/advanced/radioprotection/include/RemSimDecay.hh b/examples/advanced/radioprotection/include/RemSimDecay.hh index 37d1d4c1c5..91043f0ada 100644 --- a/examples/advanced/radioprotection/include/RemSimDecay.hh +++ b/examples/advanced/radioprotection/include/RemSimDecay.hh @@ -31,7 +31,7 @@ // ************************ // // $Id: RemSimDecay.hh,v 1.3 2006/06/29 16:22:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author:Susanna Guatelli, guatelli@ge.infn.it // diff --git a/examples/advanced/radioprotection/include/RemSimDecorator.hh b/examples/advanced/radioprotection/include/RemSimDecorator.hh index 8b9d934998..d601cbe07c 100644 --- a/examples/advanced/radioprotection/include/RemSimDecorator.hh +++ b/examples/advanced/radioprotection/include/RemSimDecorator.hh @@ -31,7 +31,7 @@ // *************************** // // $Id: RemSimDecorator.hh,v 1.10 2006/06/29 16:22:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author:Susanna Guatelli, guatelli@ge.infn.it // diff --git a/examples/advanced/radioprotection/include/RemSimDetectorConstruction.hh b/examples/advanced/radioprotection/include/RemSimDetectorConstruction.hh index e8d69cc521..99ee30e196 100644 --- a/examples/advanced/radioprotection/include/RemSimDetectorConstruction.hh +++ b/examples/advanced/radioprotection/include/RemSimDetectorConstruction.hh @@ -30,7 +30,7 @@ // ************************************** // // $Id: RemSimDetectorConstruction.hh,v 1.13 2006/06/29 16:22:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author:Susanna Guatelli, guatelli@ge.infn.it // diff --git a/examples/advanced/radioprotection/include/RemSimDetectorMessenger.hh b/examples/advanced/radioprotection/include/RemSimDetectorMessenger.hh index e2c64622a2..615da73522 100644 --- a/examples/advanced/radioprotection/include/RemSimDetectorMessenger.hh +++ b/examples/advanced/radioprotection/include/RemSimDetectorMessenger.hh @@ -31,7 +31,7 @@ // ***************************************** // // $Id: RemSimDetectorMessenger.hh,v 1.9 2006/06/29 16:22:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // #ifndef RemSimDetectorMessenger_h diff --git a/examples/advanced/radioprotection/include/RemSimElectronEEDL.hh b/examples/advanced/radioprotection/include/RemSimElectronEEDL.hh index 5a71b29ede..a2617c077b 100644 --- a/examples/advanced/radioprotection/include/RemSimElectronEEDL.hh +++ b/examples/advanced/radioprotection/include/RemSimElectronEEDL.hh @@ -25,7 +25,7 @@ // // // $Id: RemSimElectronEEDL.hh,v 1.4 2006/06/29 16:22:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Susanna Guatelli, guatelli@ge.infn.it diff --git a/examples/advanced/radioprotection/include/RemSimEventAction.hh b/examples/advanced/radioprotection/include/RemSimEventAction.hh index d1b450fd36..686c86eddd 100644 --- a/examples/advanced/radioprotection/include/RemSimEventAction.hh +++ b/examples/advanced/radioprotection/include/RemSimEventAction.hh @@ -31,7 +31,7 @@ // ********************************** // // $Id: RemSimEventAction.hh,v 1.5 2006/06/29 16:22:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author : Susanna Guatelli, guatelli@ge.infn.it // diff --git a/examples/advanced/radioprotection/include/RemSimHadronicBertini.hh b/examples/advanced/radioprotection/include/RemSimHadronicBertini.hh index a64e6b8cad..59503c8afd 100644 --- a/examples/advanced/radioprotection/include/RemSimHadronicBertini.hh +++ b/examples/advanced/radioprotection/include/RemSimHadronicBertini.hh @@ -29,8 +29,8 @@ // * * // ************************************** // -// $Id: RemSimHadronicBertini.hh,v 1.4 2006/06/29 16:22:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: RemSimHadronicBertini.hh,v 1.5 2006/11/15 18:39:30 guatelli Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author : Susanna Guatelli, guatelli@ge.infn.it // @@ -40,33 +40,24 @@ #include "G4VPhysicsConstructor.hh" #include "globals.hh" + +#include "G4ProtonInelasticCrossSection.hh" +#include "G4PiNuclearCrossSection.hh" +#include "G4NeutronInelasticCrossSection.hh" +#include "G4TheoFSGenerator.hh" +#include "G4GeneratorPrecompoundInterface.hh" #include "G4ExcitationHandler.hh" -#include "G4QGSParticipants.hh" +#include "G4PreCompoundModel.hh" +#include "G4QGSMFragmentation.hh" +#include "G4ExcitedStringDecay.hh" #include "G4QGSModel.hh" -class G4ProtonInelasticCrossSection; -class G4NeutronInelasticCrossSection; -class G4PiNuclearCrossSection; -class G4TripathiCrossSection; -class G4IonsShenCrossSection; - -class G4LElastic; -class G4CascadeInterface; -class G4BinaryLightIonReaction; -class G4LEProtonInelastic; -class G4LENeutronInelastic; -class G4LEPionPlusInelastic; -class G4LEPionMinusInelastic; -class G4LEAlphaInelastic; -class G4LFission; -class G4LCapture; - -class G4TheoFSGenerator; -class G4GeneratorPrecompoundInterface; -class G4ExcitationHandler; -class G4PreCompoundModel; -class G4QGSMFragmentation; -class G4ExcitedStringDecay; +//class G4TheoFSGenerator; +//class G4GeneratorPrecompoundInterface; +//class G4ExcitationHandler; +//class G4PreCompoundModel; +//class G4QGSMFragmentation; +//class G4ExcitedStringDecay; class RemSimHadronicBertini: public G4VPhysicsConstructor { @@ -79,34 +70,18 @@ class RemSimHadronicBertini: public G4VPhysicsConstructor void ConstructParticle(){}; void ConstructProcess(); - private: - - G4ProtonInelasticCrossSection* proton_XC; - G4NeutronInelasticCrossSection* neutron_XC; - G4PiNuclearCrossSection* pion_XC; - - G4TripathiCrossSection* tripathi; - G4IonsShenCrossSection* shen; - - G4LElastic* elastic_model; - G4CascadeInterface* bertini_model; - G4BinaryLightIonReaction* binary_ion_model; - - G4LEProtonInelastic* LEP_proton_model; - G4LENeutronInelastic* LEP_neutron_model; - G4LEPionPlusInelastic* LEP_pip_model; - G4LEPionMinusInelastic* LEP_pim_model; - G4LEAlphaInelastic* LEP_alpha_model; - G4LFission* nfission_model; - G4LCapture* ncapture_model; - - G4TheoFSGenerator* QGSP_model; - G4GeneratorPrecompoundInterface* theCascade; - G4ExcitationHandler theHandler; - G4PreCompoundModel* thePreEquilib; - G4QGSMFragmentation* theFragmentation; - G4ExcitedStringDecay* theStringDecay; - G4QGSModel theStringModel; + private: + G4ProtonInelasticCrossSection protonCrossSection; + G4PiNuclearCrossSection pionCrossSection; + G4NeutronInelasticCrossSection neutronCrossSection; + + G4TheoFSGenerator* QGSPModel; + G4GeneratorPrecompoundInterface* theCascade; + G4ExcitationHandler theHandler; + G4PreCompoundModel* thePreEquilib; + G4QGSMFragmentation* theFragmentation; + G4ExcitedStringDecay* theStringDecay; + G4QGSModel theStringModel; }; #endif diff --git a/examples/advanced/radioprotection/include/RemSimHadronicBinary.hh b/examples/advanced/radioprotection/include/RemSimHadronicBinary.hh index 5f44384749..f3308b61d1 100644 --- a/examples/advanced/radioprotection/include/RemSimHadronicBinary.hh +++ b/examples/advanced/radioprotection/include/RemSimHadronicBinary.hh @@ -29,8 +29,8 @@ // * * // ************************************** // -// $Id: RemSimHadronicBinary.hh,v 1.4 2006/06/29 16:22:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: RemSimHadronicBinary.hh,v 1.5 2006/11/15 18:39:30 guatelli Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author : Susanna Guatelli, guatelli@ge.infn.it // @@ -40,33 +40,17 @@ #include "G4VPhysicsConstructor.hh" #include "globals.hh" -#include "G4ExcitationHandler.hh" -#include "G4QGSParticipants.hh" + +#include "G4ProtonInelasticCrossSection.hh" +#include "G4PiNuclearCrossSection.hh" +#include "G4NeutronInelasticCrossSection.hh" #include "G4QGSModel.hh" - -class G4ProtonInelasticCrossSection; -class G4NeutronInelasticCrossSection; -class G4PiNuclearCrossSection; -class G4TripathiCrossSection; -class G4IonsShenCrossSection; -class G4BinaryCascade; -class G4LElastic; -class G4CascadeInterface; -class G4BinaryLightIonReaction; -class G4LEProtonInelastic; -class G4LENeutronInelastic; -class G4LEPionPlusInelastic; -class G4LEPionMinusInelastic; -class G4LEAlphaInelastic; -class G4LFission; -class G4LCapture; - -class G4TheoFSGenerator; -class G4GeneratorPrecompoundInterface; -class G4ExcitationHandler; -class G4PreCompoundModel; -class G4QGSMFragmentation; -class G4ExcitedStringDecay; +#include "G4TheoFSGenerator.hh" +#include "G4GeneratorPrecompoundInterface.hh" +#include "G4ExcitationHandler.hh" +#include "G4PreCompoundModel.hh" +#include "G4QGSMFragmentation.hh" +#include "G4ExcitedStringDecay.hh" class RemSimHadronicBinary: public G4VPhysicsConstructor { @@ -79,33 +63,17 @@ class RemSimHadronicBinary: public G4VPhysicsConstructor void ConstructParticle(){}; void ConstructProcess(); - private: - - G4ProtonInelasticCrossSection* proton_XC; - G4NeutronInelasticCrossSection* neutron_XC; - G4PiNuclearCrossSection* pion_XC; - - G4TripathiCrossSection* tripathi; - G4IonsShenCrossSection* shen; - - G4LElastic* elastic_model; - G4BinaryLightIonReaction* binary_ion_model; - G4BinaryCascade* binarycascade_model; - G4LEProtonInelastic* LEP_proton_model; - G4LENeutronInelastic* LEP_neutron_model; - G4LEPionPlusInelastic* LEP_pip_model; - G4LEPionMinusInelastic* LEP_pim_model; - G4LEAlphaInelastic* LEP_alpha_model; - G4LFission* nfission_model; - G4LCapture* ncapture_model; - - G4TheoFSGenerator* QGSP_model; - G4GeneratorPrecompoundInterface* theCascade; - G4ExcitationHandler theHandler; - G4PreCompoundModel* thePreEquilib; - G4QGSMFragmentation* theFragmentation; - G4ExcitedStringDecay* theStringDecay; - G4QGSModel theStringModel; + private: + G4ProtonInelasticCrossSection protonCrossSection; + G4PiNuclearCrossSection pionCrossSection; + G4NeutronInelasticCrossSection neutronCrossSection; + G4TheoFSGenerator* QGSPModel; + G4GeneratorPrecompoundInterface* theCascade; + G4ExcitationHandler theHandler; + G4PreCompoundModel* thePreEquilib; + G4QGSMFragmentation* theFragmentation; + G4ExcitedStringDecay* theStringDecay; + G4QGSModel theStringModel; }; #endif diff --git a/examples/advanced/radioprotection/include/RemSimIonICRU.hh b/examples/advanced/radioprotection/include/RemSimIonICRU.hh index a300c4e3e2..6cde771c81 100644 --- a/examples/advanced/radioprotection/include/RemSimIonICRU.hh +++ b/examples/advanced/radioprotection/include/RemSimIonICRU.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RemSimIonICRU.hh,v 1.5 2006/06/29 16:22:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Susanna Guatelli, guatelli@ge.infn.it diff --git a/examples/advanced/radioprotection/include/RemSimMaterial.hh b/examples/advanced/radioprotection/include/RemSimMaterial.hh index 74a7f2afa2..936e8e9d44 100644 --- a/examples/advanced/radioprotection/include/RemSimMaterial.hh +++ b/examples/advanced/radioprotection/include/RemSimMaterial.hh @@ -25,7 +25,7 @@ // // // $Id: RemSimMaterial.hh,v 1.6 2006/06/29 16:22:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ********************************** // * * diff --git a/examples/advanced/radioprotection/include/RemSimMoonHabitat.hh b/examples/advanced/radioprotection/include/RemSimMoonHabitat.hh index 2df669dccc..122bdb1c72 100644 --- a/examples/advanced/radioprotection/include/RemSimMoonHabitat.hh +++ b/examples/advanced/radioprotection/include/RemSimMoonHabitat.hh @@ -31,7 +31,7 @@ // ************************************** // // $Id: RemSimMoonHabitat.hh,v 1.6 2006/06/29 16:22:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author:Susanna Guatelli, guatelli@ge.infn.it // diff --git a/examples/advanced/radioprotection/include/RemSimMuonStandard.hh b/examples/advanced/radioprotection/include/RemSimMuonStandard.hh index 17439517f2..6e60dc9915 100644 --- a/examples/advanced/radioprotection/include/RemSimMuonStandard.hh +++ b/examples/advanced/radioprotection/include/RemSimMuonStandard.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RemSimMuonStandard.hh,v 1.3 2006/06/29 16:22:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author:Susanna Guatelli, guatelli@ge.infn.it // diff --git a/examples/advanced/radioprotection/include/RemSimPhotonEPDL.hh b/examples/advanced/radioprotection/include/RemSimPhotonEPDL.hh index 131be798a0..4967d07f11 100644 --- a/examples/advanced/radioprotection/include/RemSimPhotonEPDL.hh +++ b/examples/advanced/radioprotection/include/RemSimPhotonEPDL.hh @@ -25,7 +25,7 @@ // // // $Id: RemSimPhotonEPDL.hh,v 1.4 2006/06/29 16:22:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author:Susanna Guatelli, guatelli@ge.infn.it // diff --git a/examples/advanced/radioprotection/include/RemSimPhysicsList.hh b/examples/advanced/radioprotection/include/RemSimPhysicsList.hh index 64e7fe663e..75009030ec 100644 --- a/examples/advanced/radioprotection/include/RemSimPhysicsList.hh +++ b/examples/advanced/radioprotection/include/RemSimPhysicsList.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RemSimPhysicsList.hh,v 1.6 2006/06/29 16:23:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Susanna Guatelli, guatelli@ge.infn.it diff --git a/examples/advanced/radioprotection/include/RemSimPhysicsListMessenger.hh b/examples/advanced/radioprotection/include/RemSimPhysicsListMessenger.hh index 8e3b566df3..8efa34c736 100644 --- a/examples/advanced/radioprotection/include/RemSimPhysicsListMessenger.hh +++ b/examples/advanced/radioprotection/include/RemSimPhysicsListMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RemSimPhysicsListMessenger.hh,v 1.4 2006/06/29 16:23:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Susanna Guatelli, guatelli@ge.infn.it diff --git a/examples/advanced/radioprotection/include/RemSimPositronStandard.hh b/examples/advanced/radioprotection/include/RemSimPositronStandard.hh index e711f404f5..1f3328a1b6 100644 --- a/examples/advanced/radioprotection/include/RemSimPositronStandard.hh +++ b/examples/advanced/radioprotection/include/RemSimPositronStandard.hh @@ -25,7 +25,7 @@ // // // $Id: RemSimPositronStandard.hh,v 1.4 2006/06/29 16:23:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Susanna Guatelli, guatelli@ge.infn.it diff --git a/examples/advanced/radioprotection/include/RemSimPrimaryGeneratorAction.hh b/examples/advanced/radioprotection/include/RemSimPrimaryGeneratorAction.hh index 0eb681539f..04ade929e1 100644 --- a/examples/advanced/radioprotection/include/RemSimPrimaryGeneratorAction.hh +++ b/examples/advanced/radioprotection/include/RemSimPrimaryGeneratorAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // -// $Id: RemSimPrimaryGeneratorAction.hh,v 1.14 2006/06/29 16:23:07 gunter Exp $// GEANT4 tag $Name: geant4-08-01 $ +// $Id: RemSimPrimaryGeneratorAction.hh,v 1.14 2006/06/29 16:23:07 gunter Exp $// GEANT4 tag $Name: geant4-08-02 $ // // Author: Susanna Guatelli, guatelli@ge.infn.it // diff --git a/examples/advanced/radioprotection/include/RemSimPrimaryGeneratorMessenger.hh b/examples/advanced/radioprotection/include/RemSimPrimaryGeneratorMessenger.hh index ca7f6b5205..8e2fa63771 100644 --- a/examples/advanced/radioprotection/include/RemSimPrimaryGeneratorMessenger.hh +++ b/examples/advanced/radioprotection/include/RemSimPrimaryGeneratorMessenger.hh @@ -31,7 +31,7 @@ // ************************************************ // // $Id: RemSimPrimaryGeneratorMessenger.hh,v 1.10 2006/06/29 16:23:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //Code developed by: S.Guatelli, guatelli@ge.infn.it // diff --git a/examples/advanced/radioprotection/include/RemSimROGeometry.hh b/examples/advanced/radioprotection/include/RemSimROGeometry.hh index 5f9529b89a..650c3f4232 100644 --- a/examples/advanced/radioprotection/include/RemSimROGeometry.hh +++ b/examples/advanced/radioprotection/include/RemSimROGeometry.hh @@ -25,7 +25,7 @@ // // // $Id: RemSimROGeometry.hh,v 1.6 2006/06/29 16:23:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ************************************ // * * diff --git a/examples/advanced/radioprotection/include/RemSimRoofDecorator.hh b/examples/advanced/radioprotection/include/RemSimRoofDecorator.hh index f68ded9497..07780a3b9d 100644 --- a/examples/advanced/radioprotection/include/RemSimRoofDecorator.hh +++ b/examples/advanced/radioprotection/include/RemSimRoofDecorator.hh @@ -33,7 +33,7 @@ // // // $Id: RemSimRoofDecorator.hh,v 1.6 2006/06/29 16:23:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef RemSimRoofDecorator_h diff --git a/examples/advanced/radioprotection/include/RemSimRunAction.hh b/examples/advanced/radioprotection/include/RemSimRunAction.hh index 37eb7f81a7..78b46b2832 100644 --- a/examples/advanced/radioprotection/include/RemSimRunAction.hh +++ b/examples/advanced/radioprotection/include/RemSimRunAction.hh @@ -25,7 +25,7 @@ // // // $Id: RemSimRunAction.hh,v 1.10 2006/06/29 16:23:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Code developed by: S.Guatelli, guatelli@ge.infn.it // diff --git a/examples/advanced/radioprotection/include/RemSimSensitiveDetector.hh b/examples/advanced/radioprotection/include/RemSimSensitiveDetector.hh index 627d9518f3..ab695514c7 100644 --- a/examples/advanced/radioprotection/include/RemSimSensitiveDetector.hh +++ b/examples/advanced/radioprotection/include/RemSimSensitiveDetector.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RemSimSensitiveDetector.hh,v 1.5 2006/06/29 16:23:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Code developed by: S.Guatelli, guatelli@ge.infn.it // diff --git a/examples/advanced/radioprotection/include/RemSimShelterSPEDecorator.hh b/examples/advanced/radioprotection/include/RemSimShelterSPEDecorator.hh index 64682db3e0..2c2c1c432d 100644 --- a/examples/advanced/radioprotection/include/RemSimShelterSPEDecorator.hh +++ b/examples/advanced/radioprotection/include/RemSimShelterSPEDecorator.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RemSimShelterSPEDecorator.hh,v 1.5 2006/06/29 16:23:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Code developed by: S.Guatelli, guatelli@ge.infn.it // diff --git a/examples/advanced/radioprotection/include/RemSimShieldingDecorator.hh b/examples/advanced/radioprotection/include/RemSimShieldingDecorator.hh index bee5d4538c..801ac6be38 100644 --- a/examples/advanced/radioprotection/include/RemSimShieldingDecorator.hh +++ b/examples/advanced/radioprotection/include/RemSimShieldingDecorator.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RemSimShieldingDecorator.hh,v 1.7 2006/06/29 16:23:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Code developed by: S.Guatelli, guatelli@ge.infn.it // diff --git a/examples/advanced/radioprotection/include/RemSimSteppingAction.hh b/examples/advanced/radioprotection/include/RemSimSteppingAction.hh index cd81a1f711..05e39f3ad6 100644 --- a/examples/advanced/radioprotection/include/RemSimSteppingAction.hh +++ b/examples/advanced/radioprotection/include/RemSimSteppingAction.hh @@ -25,7 +25,7 @@ // // // $Id: RemSimSteppingAction.hh,v 1.4 2006/06/29 16:23:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Susanna Guatelli (guatelli@ge.infn.it) // diff --git a/examples/advanced/radioprotection/include/RemSimSteppingActionMessenger.hh b/examples/advanced/radioprotection/include/RemSimSteppingActionMessenger.hh index 9a3097e198..d6f6896e86 100644 --- a/examples/advanced/radioprotection/include/RemSimSteppingActionMessenger.hh +++ b/examples/advanced/radioprotection/include/RemSimSteppingActionMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: RemSimSteppingActionMessenger.hh,v 1.3 2006/06/29 16:23:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Susanna Guatelli, guatelli@ge.infn.it // diff --git a/examples/advanced/radioprotection/include/RemSimVGeometryComponent.hh b/examples/advanced/radioprotection/include/RemSimVGeometryComponent.hh index 1abc162249..e935626092 100644 --- a/examples/advanced/radioprotection/include/RemSimVGeometryComponent.hh +++ b/examples/advanced/radioprotection/include/RemSimVGeometryComponent.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RemSimVGeometryComponent.hh,v 1.8 2006/06/29 16:23:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Code developed by: S.Guatelli, guatelli@ge.infn.it // diff --git a/examples/advanced/radioprotection/include/RemSimVehicle1.hh b/examples/advanced/radioprotection/include/RemSimVehicle1.hh index 37e8d20859..2791ccb6e5 100644 --- a/examples/advanced/radioprotection/include/RemSimVehicle1.hh +++ b/examples/advanced/radioprotection/include/RemSimVehicle1.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RemSimVehicle1.hh,v 1.8 2006/06/29 16:23:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Code developed by: S.Guatelli, guatelli@ge.infn.it // diff --git a/examples/advanced/radioprotection/remsim.cc b/examples/advanced/radioprotection/remsim.cc index f4005a94ac..c9a9eff226 100644 --- a/examples/advanced/radioprotection/remsim.cc +++ b/examples/advanced/radioprotection/remsim.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: remsim.cc,v 1.13 2006/06/29 16:22:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: remsim.cc,v 1.14 2006/07/24 09:53:27 guatelli Exp $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4RunManager.hh" #include "G4UImanager.hh" @@ -42,6 +42,7 @@ #ifdef G4ANALYSIS_USE #include "RemSimAnalysisManager.hh" #endif +#include "G4UItcsh.hh" int main(int argc,char** argv) { diff --git a/examples/advanced/radioprotection/src/RemSimDecay.cc b/examples/advanced/radioprotection/src/RemSimDecay.cc index ff55bcca5d..0978703b0b 100644 --- a/examples/advanced/radioprotection/src/RemSimDecay.cc +++ b/examples/advanced/radioprotection/src/RemSimDecay.cc @@ -31,7 +31,7 @@ // *********************** // // $Id: RemSimDecay.cc,v 1.5 2006/06/29 16:23:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author:Susanna Guatelli, guatelli@ge.infn.it // diff --git a/examples/advanced/radioprotection/src/RemSimDecorator.cc b/examples/advanced/radioprotection/src/RemSimDecorator.cc index bb35ec5ce6..f04dbab484 100644 --- a/examples/advanced/radioprotection/src/RemSimDecorator.cc +++ b/examples/advanced/radioprotection/src/RemSimDecorator.cc @@ -31,7 +31,7 @@ // *************************** // // $Id: RemSimDecorator.cc,v 1.6 2006/06/29 16:23:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author:Susanna Guatelli, guatelli@ge.infn.it // diff --git a/examples/advanced/radioprotection/src/RemSimDetectorConstruction.cc b/examples/advanced/radioprotection/src/RemSimDetectorConstruction.cc index a84e47408e..0a217a6c4d 100644 --- a/examples/advanced/radioprotection/src/RemSimDetectorConstruction.cc +++ b/examples/advanced/radioprotection/src/RemSimDetectorConstruction.cc @@ -31,7 +31,7 @@ // ************************************** // // $Id: RemSimDetectorConstruction.cc,v 1.17 2006/06/29 16:23:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author:Susanna Guatelli, guatelli@ge.infn.it // diff --git a/examples/advanced/radioprotection/src/RemSimDetectorMessenger.cc b/examples/advanced/radioprotection/src/RemSimDetectorMessenger.cc index 4e806048da..96dbbbc131 100644 --- a/examples/advanced/radioprotection/src/RemSimDetectorMessenger.cc +++ b/examples/advanced/radioprotection/src/RemSimDetectorMessenger.cc @@ -35,7 +35,7 @@ // // // $Id: RemSimDetectorMessenger.cc,v 1.13 2006/06/29 16:23:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/advanced/radioprotection/src/RemSimElectronEEDL.cc b/examples/advanced/radioprotection/src/RemSimElectronEEDL.cc index 0149647a8f..83ab19dec7 100644 --- a/examples/advanced/radioprotection/src/RemSimElectronEEDL.cc +++ b/examples/advanced/radioprotection/src/RemSimElectronEEDL.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RemSimElectronEEDL.cc,v 1.6 2006/06/29 16:23:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Susanna Guatelli, guatelloi@ge.infn.it diff --git a/examples/advanced/radioprotection/src/RemSimEventAction.cc b/examples/advanced/radioprotection/src/RemSimEventAction.cc index 0f1969add4..421dc3220f 100644 --- a/examples/advanced/radioprotection/src/RemSimEventAction.cc +++ b/examples/advanced/radioprotection/src/RemSimEventAction.cc @@ -31,7 +31,7 @@ // // // $Id: RemSimEventAction.cc,v 1.9 2006/06/29 16:23:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author : Susanna Guatelli, guatelli@ge.infn.it // diff --git a/examples/advanced/radioprotection/src/RemSimHadronicBertini.cc b/examples/advanced/radioprotection/src/RemSimHadronicBertini.cc index 73b6b0150a..9d45e0dd8b 100644 --- a/examples/advanced/radioprotection/src/RemSimHadronicBertini.cc +++ b/examples/advanced/radioprotection/src/RemSimHadronicBertini.cc @@ -29,10 +29,12 @@ // * * // ************************************** // -// $Id: RemSimHadronicBertini.cc,v 1.4 2006/06/29 16:23:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: RemSimHadronicBertini.cc,v 1.5 2006/11/15 18:39:30 guatelli Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author : Susanna Guatelli, guatelli@ge.infn.it + +// Code review: MGP, 7 November 2006 (to be completed) // #include "RemSimHadronicBertini.hh" #include "G4BinaryLightIonReaction.hh" @@ -40,17 +42,10 @@ #include "G4IonsShenCrossSection.hh" #include "G4ParticleDefinition.hh" #include "G4ProcessManager.hh" -#include "G4ProcessVector.hh" -#include "G4ParticleTypes.hh" -#include "G4ParticleTable.hh" -#include "G4Material.hh" -#include "G4ios.hh" - -#include "G4ProtonInelasticCrossSection.hh" -#include "G4NeutronInelasticCrossSection.hh" -#include "G4PiNuclearCrossSection.hh" #include "G4LElastic.hh" #include "G4CascadeInterface.hh" +//#include "G4PreCompoundModel.hh" +//#include "G4QGSModel.hh" #include "G4LEProtonInelastic.hh" #include "G4LENeutronInelastic.hh" #include "G4LEPionPlusInelastic.hh" @@ -58,54 +53,11 @@ #include "G4LEAlphaInelastic.hh" #include "G4LFission.hh" #include "G4LCapture.hh" -#include "G4TheoFSGenerator.hh" -#include "G4GeneratorPrecompoundInterface.hh" -#include "G4ExcitationHandler.hh" -#include "G4PreCompoundModel.hh" -#include "G4QGSMFragmentation.hh" -#include "G4ExcitedStringDecay.hh" - -RemSimHadronicBertini::RemSimHadronicBertini(const G4String& name): -G4VPhysicsConstructor(name) -{ - // Hadronic cross sections - - proton_XC = new G4ProtonInelasticCrossSection(); - neutron_XC = new G4NeutronInelasticCrossSection(); - pion_XC = new G4PiNuclearCrossSection(); - - // Hadronic cross sections for alpha particles - tripathi = new G4TripathiCrossSection(); - shen = new G4IonsShenCrossSection(); - - // Hadronic models - - elastic_model = new G4LElastic(); - bertini_model = new G4CascadeInterface(); - binary_ion_model = new G4BinaryLightIonReaction(); - - LEP_proton_model = new G4LEProtonInelastic(); - LEP_neutron_model = new G4LENeutronInelastic(); - LEP_pip_model = new G4LEPionPlusInelastic(); - LEP_pim_model = new G4LEPionMinusInelastic(); - LEP_alpha_model = new G4LEAlphaInelastic(); - nfission_model = new G4LFission(); - ncapture_model = new G4LCapture(); - - QGSP_model = new G4TheoFSGenerator(); - theCascade = new G4GeneratorPrecompoundInterface(); - thePreEquilib = new G4PreCompoundModel(&theHandler); - theCascade -> SetDeExcitation(thePreEquilib); - QGSP_model -> SetTransport(theCascade); - theFragmentation = new G4QGSMFragmentation(); - theStringDecay = new G4ExcitedStringDecay(theFragmentation); - theStringModel.SetFragmentationModel(theStringDecay); - QGSP_model -> SetHighEnergyGenerator(&theStringModel); - -} -RemSimHadronicBertini::~RemSimHadronicBertini() -{} - +//#include "G4TheoFSGenerator.hh" +//#include "G4GeneratorPrecompoundInterface.hh" +//#include "G4PreCompoundModel.hh" +//#include "G4QGSMFragmentation.hh" +//#include "G4ExcitedStringDecay.hh" #include "G4HadronElasticProcess.hh" #include "G4HadronFissionProcess.hh" #include "G4HadronCaptureProcess.hh" @@ -114,159 +66,216 @@ RemSimHadronicBertini::~RemSimHadronicBertini() #include "G4PionPlusInelasticProcess.hh" #include "G4PionMinusInelasticProcess.hh" #include "G4AlphaInelasticProcess.hh" +#include "G4ExcitationHandler.hh" + +// +// BERTINI PHYSICS LIST +// + +RemSimHadronicBertini::RemSimHadronicBertini(const G4String& name): +G4VPhysicsConstructor(name) +{} + +RemSimHadronicBertini::~RemSimHadronicBertini() +{} void RemSimHadronicBertini::ConstructProcess() { - // Set model energy regions - // 0 - 3.2 GeV: Bertini cascade model for p, n, pi+, pi- + // Physics for proton, neutron, pion+ and pion- + + // Elastic scattering: LElastic model + G4LElastic* elasticModel = new G4LElastic(); + G4HadronElasticProcess* elasticScattering = new G4HadronElasticProcess(); + elasticScattering->RegisterMe(elasticModel); - bertini_model -> SetMaxEnergy(3.2*GeV); + // Inelastic scattering: Bertini model up to 3.2 GeV + G4CascadeInterface* bertiniModel = new G4CascadeInterface(); + // Energy limit of the Bertini model + G4double bertiniHighEnergyLimit = 3.2 * GeV; + bertiniModel->SetMaxEnergy(bertiniHighEnergyLimit); - // 80 MeV - 20 GeV for light ions + // Inelastic scattering: LEP model between 2.8 * GeV and 25. * GeV + G4LEProtonInelastic* LEPProtonModel = new G4LEProtonInelastic(); + G4LENeutronInelastic* LEPNeutronModel = new G4LENeutronInelastic(); + G4LEPionPlusInelastic* LEPPionPlusModel = new G4LEPionPlusInelastic(); + G4LEPionMinusInelastic* LEPPionMinusModel = new G4LEPionMinusInelastic(); + // Set the energy limits + G4double LEPLowEnergyLimit = 2.8 * GeV; + G4double LEPHighEnergyLimit = 25. * GeV; + LEPProtonModel->SetMinEnergy(LEPLowEnergyLimit); + LEPProtonModel->SetMaxEnergy(LEPHighEnergyLimit); + LEPNeutronModel->SetMinEnergy(LEPLowEnergyLimit); + LEPNeutronModel->SetMaxEnergy(LEPHighEnergyLimit); + LEPPionPlusModel->SetMinEnergy(LEPLowEnergyLimit); + LEPPionPlusModel->SetMaxEnergy(LEPHighEnergyLimit); + LEPPionMinusModel->SetMinEnergy(LEPLowEnergyLimit); + LEPPionMinusModel->SetMaxEnergy(LEPHighEnergyLimit); - binary_ion_model -> SetMinEnergy(80*MeV); - binary_ion_model -> SetMaxEnergy(110.*GeV); - - // 2.8 - 25 GeV: LEP models for p, n, pi+, pi- + // Inelastic scattering: QGSP model between 20 GeV and 100 TeV + QGSPModel = new G4TheoFSGenerator(); + // Set the energy limits + G4double QGSPLowEnergyLimit = 20.* GeV; + G4double QGSPHighEnergyLimit = 100.* GeV; + QGSPModel->SetMinEnergy(QGSPLowEnergyLimit); + QGSPModel->SetMaxEnergy(QGSPHighEnergyLimit); - LEP_proton_model -> SetMinEnergy(2.8*GeV); - LEP_proton_model -> SetMaxEnergy(25*GeV); - LEP_neutron_model -> SetMinEnergy(2.8*GeV); - LEP_neutron_model -> SetMaxEnergy(25*GeV); - LEP_pip_model -> SetMinEnergy(2.8*GeV); - LEP_pip_model -> SetMaxEnergy(25*GeV); - LEP_pim_model -> SetMinEnergy(2.8*GeV); - LEP_pim_model -> SetMaxEnergy(25*GeV); - nfission_model -> SetMinEnergy(0*TeV); - nfission_model -> SetMaxEnergy(100*TeV); - ncapture_model -> SetMinEnergy(0*TeV); - ncapture_model -> SetMaxEnergy(100*TeV); + theCascade = new G4GeneratorPrecompoundInterface(); - // Up to 100 MeV for alphas - LEP_alpha_model -> SetMaxEnergy(100.*MeV); + thePreEquilib = new G4PreCompoundModel(&theHandler); + theCascade->SetDeExcitation(thePreEquilib); + QGSPModel->SetTransport(theCascade); - // 20 GeV - 100 TeV: QGSP model for p, n, pi+, pi- - - QGSP_model -> SetMinEnergy(20*GeV); - QGSP_model -> SetMaxEnergy(100*TeV); - - // ****************************************** - // * register models, processes to proton * - // ****************************************** + // Set the fragmentation + theFragmentation = new G4QGSMFragmentation(); + theStringDecay = new G4ExcitedStringDecay(theFragmentation); + theStringModel.SetFragmentationModel(theStringDecay); + QGSPModel->SetHighEnergyGenerator(&theStringModel); + // --------------------------------------------------------------------------------------------- + // Proton processes G4ParticleDefinition* proton = G4Proton::ProtonDefinition(); - G4ProcessManager* protMan = proton -> GetProcessManager(); + G4ProcessManager* protonProcessManager = proton->GetProcessManager(); + + // Proton inelastic scattering + G4ProtonInelasticProcess* protonInelasticProcess = new G4ProtonInelasticProcess(); + // Activate the cross-sections for proton nuclear scattering up to 20 GeV + //G4ProtonInelasticCrossSection protonCrossSection; + protonInelasticProcess->AddDataSet(&protonCrossSection); + // Set the models + protonInelasticProcess->RegisterMe(bertiniModel); + protonInelasticProcess->RegisterMe(LEPProtonModel); + + protonInelasticProcess->RegisterMe(QGSPModel); + // Activate the inelastic scattering + protonProcessManager->AddDiscreteProcess(protonInelasticProcess); + // Activate the elastic scattering + protonProcessManager->AddDiscreteProcess(elasticScattering); - // Elastic process - - G4HadronElasticProcess* protelProc = new G4HadronElasticProcess(); - protelProc -> RegisterMe(elastic_model); - protMan -> AddDiscreteProcess(protelProc); - - // Inelastic process - - G4ProtonInelasticProcess* protinelProc = new G4ProtonInelasticProcess(); - protinelProc -> AddDataSet(proton_XC); - protinelProc -> RegisterMe(bertini_model); - protinelProc -> RegisterMe(LEP_proton_model); - protinelProc -> RegisterMe(QGSP_model); - protMan -> AddDiscreteProcess(protinelProc); - - // ****************************************** - // * register models, processes to neutron * - // ****************************************** + //------------------------------------------------------ + // Pion Plus processes + G4ParticleDefinition* piPlus = G4PionPlus::PionPlusDefinition(); + G4ProcessManager* pionPlusProcessManager = piPlus->GetProcessManager(); + + // Define the inelastic scattering for pion plus + G4PionPlusInelasticProcess* pionPlusInelasticProcess = new G4PionPlusInelasticProcess(); + // Set the cross section + // G4PiNuclearCrossSection pionCrossSection; + pionPlusInelasticProcess->AddDataSet(&pionCrossSection); + // Register the models + pionPlusInelasticProcess->RegisterMe(bertiniModel); + pionPlusInelasticProcess->RegisterMe(LEPPionPlusModel); + pionPlusInelasticProcess->RegisterMe(QGSPModel); + // Activate the inelastic scattering + pionPlusProcessManager->AddDiscreteProcess(pionPlusInelasticProcess); + // Activate the elastic process + pionPlusProcessManager->AddDiscreteProcess(elasticScattering); + //------------------------------------------------------------ + // Pion Minus processes + G4ParticleDefinition* piMinus = G4PionMinus::PionMinusDefinition(); + G4ProcessManager* pionMinusProcessManager = piMinus->GetProcessManager(); + + // Define the inelastic processes for pion minus + G4PionMinusInelasticProcess* pionMinusInelasticProcess = new G4PionMinusInelasticProcess(); + // Set the cross section + pionMinusInelasticProcess->AddDataSet(&pionCrossSection); + // Register the models + pionMinusInelasticProcess->RegisterMe(bertiniModel); + pionMinusInelasticProcess->RegisterMe(LEPPionMinusModel); + pionMinusInelasticProcess->RegisterMe(QGSPModel); + // Activate the inelastic scattering + pionMinusProcessManager->AddDiscreteProcess(pionMinusInelasticProcess); + // Activate the elastic scattering + pionMinusProcessManager->AddDiscreteProcess(elasticScattering); + + //----------------------------------------------------- + // Neutron processes G4ParticleDefinition* neutron = G4Neutron::NeutronDefinition(); - G4ProcessManager* neutMan = neutron->GetProcessManager(); - - // Elastic process - - G4HadronElasticProcess* neutelProc = new G4HadronElasticProcess(); - neutelProc -> RegisterMe(elastic_model); - neutMan -> AddDiscreteProcess(neutelProc); + G4ProcessManager* neutronProcessManager = neutron->GetProcessManager(); // Inelastic process + G4NeutronInelasticProcess* neutronInelasticProcess = new G4NeutronInelasticProcess(); + // Set the cross section + //G4NeutronInelasticCrossSection neutronCrossSection; + neutronInelasticProcess->AddDataSet(&neutronCrossSection); + // Set the models + neutronInelasticProcess->RegisterMe(bertiniModel); + neutronInelasticProcess->RegisterMe(LEPNeutronModel); + neutronInelasticProcess->RegisterMe(QGSPModel); + // Activate the neutron inelastic scattering + neutronProcessManager->AddDiscreteProcess(neutronInelasticProcess); + // Activate the neutron elastic scattering + neutronProcessManager->AddDiscreteProcess(elasticScattering); - G4NeutronInelasticProcess* neutinelProc = new G4NeutronInelasticProcess(); - neutinelProc -> AddDataSet(neutron_XC); - neutinelProc -> RegisterMe(bertini_model); - neutinelProc -> RegisterMe(LEP_neutron_model); - neutinelProc -> RegisterMe(QGSP_model); - neutMan -> AddDiscreteProcess(neutinelProc); + // Neutron capture process + G4HadronCaptureProcess* neutronCapture = new G4HadronCaptureProcess(); + // Final state production model for capture of neutral hadrons in nuclei + G4LCapture* captureModel = new G4LCapture(); + // Set the energy range for the capture model + G4double neutronLowEnergyLimit = 0. * MeV; + G4double neutronHighEnergyLimit = 100. * TeV; + captureModel->SetMinEnergy(neutronLowEnergyLimit); + captureModel->SetMaxEnergy(neutronHighEnergyLimit); + // Activate the neutron capture model + neutronCapture->RegisterMe(captureModel); + // Activate the neutron capture process + neutronProcessManager->AddDiscreteProcess(neutronCapture); - G4HadronCaptureProcess* neutcapProc = new G4HadronCaptureProcess(); - neutcapProc -> RegisterMe(ncapture_model); - neutMan -> AddDiscreteProcess(neutcapProc); - - G4HadronFissionProcess* neutfisProc = new G4HadronFissionProcess(); - neutfisProc -> RegisterMe(nfission_model); - neutMan -> AddDiscreteProcess(neutfisProc); - - // ****************************************** - // * register models, processes to pi+ * - // ****************************************** - - G4ParticleDefinition* piplus = G4PionPlus::PionPlusDefinition(); - G4ProcessManager* pipMan = piplus -> GetProcessManager(); - - // Elastic process - - G4HadronElasticProcess* pipelProc = new G4HadronElasticProcess(); - pipelProc -> RegisterMe(elastic_model); - pipMan -> AddDiscreteProcess(pipelProc); - - // Inelastic process - - G4PionPlusInelasticProcess* pipinelProc = new G4PionPlusInelasticProcess(); - pipinelProc -> AddDataSet(pion_XC); - pipinelProc -> RegisterMe(bertini_model); - pipinelProc -> RegisterMe(LEP_pip_model); - pipinelProc -> RegisterMe(QGSP_model); - pipMan -> AddDiscreteProcess(pipinelProc); - - // ****************************************** - // * register models, processes to pi- * - // ****************************************** - - G4ParticleDefinition* piminus = G4PionMinus::PionMinusDefinition(); - G4ProcessManager* pimMan = piminus -> GetProcessManager(); - - // Elastic process - - G4HadronElasticProcess* pimelProc = new G4HadronElasticProcess(); - pimelProc -> RegisterMe(elastic_model); - pimMan -> AddDiscreteProcess(pimelProc); - - // Inelastic process - - G4PionMinusInelasticProcess* piminelProc = new G4PionMinusInelasticProcess(); - piminelProc -> AddDataSet(pion_XC); - piminelProc -> RegisterMe(bertini_model); - piminelProc -> RegisterMe(LEP_pim_model); - piminelProc -> RegisterMe(QGSP_model); - pimMan -> AddDiscreteProcess(piminelProc); - - // ****************************************** - // * register models, processes to alpha * - // ****************************************** + // Process for induced fission + G4HadronFissionProcess* fission = new G4HadronFissionProcess(); + //Final state production model for induced fission + G4LFission* fissionModel = new G4LFission(); + // Set the energy range for the fission model + fissionModel->SetMinEnergy(neutronLowEnergyLimit); + fissionModel->SetMaxEnergy(neutronHighEnergyLimit); + // Register the fission model + fission->RegisterMe(fissionModel); + // Activate the fission process + neutronProcessManager->AddDiscreteProcess(fission); + //-------------------------------------------------------- + // Physics for alpha particles + G4ParticleDefinition* alpha = G4Alpha::AlphaDefinition(); - G4ProcessManager* alfMan = alpha -> GetProcessManager(); + G4ProcessManager* alphaProcessManager = alpha->GetProcessManager(); - // Elastic process + // Cross section data sets + + // TRIPATHI CROSS SECTION + // Implementation of formulas taken from NASA technical paper 3621 by + // Tripathi, et al. Cross-sections for ion ion scattering + G4TripathiCrossSection* tripathi = new G4TripathiCrossSection(); - G4HadronElasticProcess* alfelProc = new G4HadronElasticProcess(); - alfelProc -> RegisterMe(elastic_model); - alfMan -> AddDiscreteProcess(alfelProc); + // IONS SHEN CROSS SECTION + // Implementation of formulas + // Shen et al. Nuc. Phys. A 491 130 (1989) + // Total Reaction Cross Section for Heavy-Ion Collisions + G4IonsShenCrossSection* shen = new G4IonsShenCrossSection(); - // Inelastic process + G4LEAlphaInelastic* LEPAlphaModel = new G4LEAlphaInelastic(); + // Energy limit of the LEP model for alpha particles + G4double LEPAlphaHighLimit = 100 * MeV; + LEPAlphaModel->SetMaxEnergy(LEPAlphaHighLimit); - G4AlphaInelasticProcess* alfinelProc = new G4AlphaInelasticProcess(); - alfinelProc -> AddDataSet(tripathi); - alfinelProc -> AddDataSet(shen); - alfinelProc -> RegisterMe(LEP_alpha_model); - alfinelProc -> RegisterMe(binary_ion_model); - alfMan -> AddDiscreteProcess(alfinelProc); + G4BinaryLightIonReaction* binaryIonModel = new G4BinaryLightIonReaction(); + // Energy limit of the binary ion model + G4double binaryIonLowLimit = 80. * MeV; + G4double binaryIonHighLimit = 40. * GeV; + binaryIonModel->SetMinEnergy(binaryIonLowLimit); + binaryIonModel->SetMaxEnergy(binaryIonHighLimit); + + // Define the alpha inelastic scattering + G4AlphaInelasticProcess* alphaInelasticProcess = new G4AlphaInelasticProcess(); + // Activate the Tripathi and Shen Cross Section + alphaInelasticProcess->AddDataSet(tripathi); + alphaInelasticProcess->AddDataSet(shen); + // Set the models + alphaInelasticProcess->RegisterMe(LEPAlphaModel); + alphaInelasticProcess->RegisterMe(binaryIonModel); + // Activate the inelastic scattering + alphaProcessManager->AddDiscreteProcess(alphaInelasticProcess); + // Activate the elastic scattering + alphaProcessManager->AddDiscreteProcess(elasticScattering); } diff --git a/examples/advanced/radioprotection/src/RemSimHadronicBinary.cc b/examples/advanced/radioprotection/src/RemSimHadronicBinary.cc index dce48a7085..613a9686f1 100644 --- a/examples/advanced/radioprotection/src/RemSimHadronicBinary.cc +++ b/examples/advanced/radioprotection/src/RemSimHadronicBinary.cc @@ -25,14 +25,16 @@ // // ************************************** // * * -// * RemSimHadronicPhysics.cc * +// * RemSimHadronicBinary.cc * // * * // ************************************** // -// $Id: RemSimHadronicBinary.cc,v 1.6 2006/06/29 16:23:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: RemSimHadronicBinary.cc,v 1.7 2006/11/15 18:39:30 guatelli Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author : Susanna Guatelli, guatelli@ge.infn.it + +// Code review: MGP, 7 November 2006 (to be completed) // #include "RemSimHadronicBinary.hh" #include "G4BinaryLightIonReaction.hh" @@ -40,17 +42,9 @@ #include "G4IonsShenCrossSection.hh" #include "G4ParticleDefinition.hh" #include "G4ProcessManager.hh" -#include "G4ProcessVector.hh" -#include "G4ParticleTypes.hh" -#include "G4ParticleTable.hh" -#include "G4Material.hh" -#include "G4ios.hh" - -#include "G4ProtonInelasticCrossSection.hh" -#include "G4NeutronInelasticCrossSection.hh" -#include "G4PiNuclearCrossSection.hh" #include "G4LElastic.hh" -#include "G4CascadeInterface.hh" +//#include "G4CascadeInterface.hh" +//#include "G4PreCompoundModel.hh" #include "G4LEProtonInelastic.hh" #include "G4LENeutronInelastic.hh" #include "G4LEPionPlusInelastic.hh" @@ -58,60 +52,6 @@ #include "G4LEAlphaInelastic.hh" #include "G4LFission.hh" #include "G4LCapture.hh" -#include "G4TheoFSGenerator.hh" -#include "G4GeneratorPrecompoundInterface.hh" -#include "G4ExcitationHandler.hh" -#include "G4PreCompoundModel.hh" -#include "G4QGSMFragmentation.hh" -#include "G4ExcitedStringDecay.hh" -#include "G4BinaryCascade.hh" -#include "G4PiMinusAbsorptionAtRest.hh" - -RemSimHadronicBinary::RemSimHadronicBinary(const G4String& name): -G4VPhysicsConstructor(name) -{ - // Hadronic cross sections - - proton_XC = new G4ProtonInelasticCrossSection(); - neutron_XC = new G4NeutronInelasticCrossSection(); - pion_XC = new G4PiNuclearCrossSection(); - - // Hadronic cross sections for alpha particles - tripathi = new G4TripathiCrossSection(); - shen = new G4IonsShenCrossSection(); - - // Hadronic models - - elastic_model = new G4LElastic(); - - binarycascade_model = new G4BinaryCascade(); - //bertini_model = new G4CascadeInterface(); - - binary_ion_model = new G4BinaryLightIonReaction(); - - LEP_proton_model = new G4LEProtonInelastic(); - LEP_neutron_model = new G4LENeutronInelastic(); - LEP_pip_model = new G4LEPionPlusInelastic(); - LEP_pim_model = new G4LEPionMinusInelastic(); - LEP_alpha_model = new G4LEAlphaInelastic(); - nfission_model = new G4LFission(); - ncapture_model = new G4LCapture(); - - QGSP_model = new G4TheoFSGenerator(); - theCascade = new G4GeneratorPrecompoundInterface(); - - thePreEquilib = new G4PreCompoundModel(&theHandler); - theCascade -> SetDeExcitation(thePreEquilib); - QGSP_model -> SetTransport(theCascade); - theFragmentation = new G4QGSMFragmentation(); - theStringDecay = new G4ExcitedStringDecay(theFragmentation); - theStringModel.SetFragmentationModel(theStringDecay); - QGSP_model -> SetHighEnergyGenerator(&theStringModel); - -} -RemSimHadronicBinary::~RemSimHadronicBinary() -{} - #include "G4HadronElasticProcess.hh" #include "G4HadronFissionProcess.hh" #include "G4HadronCaptureProcess.hh" @@ -120,158 +60,218 @@ RemSimHadronicBinary::~RemSimHadronicBinary() #include "G4PionPlusInelasticProcess.hh" #include "G4PionMinusInelasticProcess.hh" #include "G4AlphaInelasticProcess.hh" +#include "G4BinaryCascade.hh" + +// +// BINARY PHYSICS LIST +// + +RemSimHadronicBinary::RemSimHadronicBinary(const G4String& name): +G4VPhysicsConstructor(name) +{} + +RemSimHadronicBinary::~RemSimHadronicBinary() +{} void RemSimHadronicBinary::ConstructProcess() { - // 0- 10. GeV: binary cascade for p, n + // Physics for proton, neutron, pion+ and pion- + + // Elastic scattering: LElastic model + G4LElastic* elasticModel = new G4LElastic(); + G4HadronElasticProcess* elasticScattering = new G4HadronElasticProcess(); + elasticScattering->RegisterMe(elasticModel); - binarycascade_model -> SetMaxEnergy(10.*GeV); + // Inelastic scattering: Binary model up to 10. GeV + G4BinaryCascade* binaryModel = new G4BinaryCascade(); + // Energy limit of the Binary model + G4double binaryHighEnergyLimit = 10. * GeV; + binaryModel->SetMaxEnergy(binaryHighEnergyLimit); - // 80 MeV - 20 GeV for light ions + // Inelastic scattering: LEP model between 8. * GeV and 25. * GeV + G4LEProtonInelastic* LEPProtonModel = new G4LEProtonInelastic(); + G4LENeutronInelastic* LEPNeutronModel = new G4LENeutronInelastic(); + G4LEPionPlusInelastic* LEPPionPlusModel = new G4LEPionPlusInelastic(); + G4LEPionMinusInelastic* LEPPionMinusModel = new G4LEPionMinusInelastic(); + // Set the energy limits + G4double LEPLowEnergyLimit = 8. * GeV; + G4double LEPHighEnergyLimit = 25. * GeV; + LEPProtonModel->SetMinEnergy(LEPLowEnergyLimit); + LEPProtonModel->SetMaxEnergy(LEPHighEnergyLimit); + LEPNeutronModel->SetMinEnergy(LEPLowEnergyLimit); + LEPNeutronModel->SetMaxEnergy(LEPHighEnergyLimit); - binary_ion_model -> SetMinEnergy(80*MeV); - binary_ion_model -> SetMaxEnergy(110.*GeV); + // no intranuclear transport activated for pions + // at this stage; further tests on Binary Cascade for pions needed - LEP_proton_model -> SetMinEnergy(8.*GeV); - LEP_proton_model -> SetMaxEnergy(25*GeV); - - LEP_neutron_model -> SetMinEnergy(8.*GeV); - LEP_neutron_model -> SetMaxEnergy(25*GeV); - - LEP_pip_model -> SetMinEnergy(0.*GeV); - LEP_pip_model -> SetMaxEnergy(25*GeV); - LEP_pim_model -> SetMinEnergy(0.*GeV); - LEP_pim_model -> SetMaxEnergy(25*GeV); - - nfission_model -> SetMinEnergy(0*TeV); - nfission_model -> SetMaxEnergy(100*TeV); - ncapture_model -> SetMinEnergy(0*TeV); - ncapture_model -> SetMaxEnergy(100*TeV); + G4double LEPPionLowEnergyLimit = 0. * MeV; + LEPPionPlusModel->SetMinEnergy(LEPPionLowEnergyLimit); + LEPPionPlusModel->SetMaxEnergy(LEPHighEnergyLimit); + LEPPionMinusModel->SetMinEnergy(LEPPionLowEnergyLimit); + LEPPionMinusModel->SetMaxEnergy(LEPHighEnergyLimit); - // Up to 100 MeV for alphas - LEP_alpha_model -> SetMaxEnergy(100.*MeV); + // Inelastic scattering: QGSP model between 20 GeV and 100 TeV + QGSPModel = new G4TheoFSGenerator(); + // Set the energy limits + G4double QGSPLowEnergyLimit = 20.* GeV; + G4double QGSPHighEnergyLimit = 100.* GeV; + QGSPModel->SetMinEnergy(QGSPLowEnergyLimit); + QGSPModel->SetMaxEnergy(QGSPHighEnergyLimit); - // 20 GeV - 100 TeV: QGSP model for p, n, pi+, pi- + theCascade = new G4GeneratorPrecompoundInterface(); + thePreEquilib = new G4PreCompoundModel(&theHandler); + theCascade->SetDeExcitation(thePreEquilib); + QGSPModel->SetTransport(theCascade); - QGSP_model -> SetMinEnergy(20*GeV); - QGSP_model -> SetMaxEnergy(100*TeV); - - // ****************************************** - // * register models, processes to proton * - // ****************************************** + // Set the fragmentation + theFragmentation = new G4QGSMFragmentation(); + theStringDecay = new G4ExcitedStringDecay(theFragmentation); + theStringModel.SetFragmentationModel(theStringDecay); + QGSPModel->SetHighEnergyGenerator(&theStringModel); + // --------------------------------------------------------------------------------------------- + // Proton processes G4ParticleDefinition* proton = G4Proton::ProtonDefinition(); - G4ProcessManager* protMan = proton -> GetProcessManager(); + G4ProcessManager* protonProcessManager = proton->GetProcessManager(); + + // Proton inelastic scattering + G4ProtonInelasticProcess* protonInelasticProcess = new G4ProtonInelasticProcess(); + // Activate the cross-sections for proton nuclear scattering up to 20 GeV + //G4ProtonInelasticCrossSection protonCrossSection; + protonInelasticProcess->AddDataSet(&protonCrossSection); + // Set the models + protonInelasticProcess->RegisterMe(binaryModel); + protonInelasticProcess->RegisterMe(LEPProtonModel); + + protonInelasticProcess->RegisterMe(QGSPModel); + // Activate the inelastic scattering + protonProcessManager->AddDiscreteProcess(protonInelasticProcess); + // Activate the elastic scattering + protonProcessManager->AddDiscreteProcess(elasticScattering); - // Elastic process - - G4HadronElasticProcess* protelProc = new G4HadronElasticProcess(); - protelProc -> RegisterMe(elastic_model); - protMan -> AddDiscreteProcess(protelProc); - - // Inelastic process - - G4ProtonInelasticProcess* protinelProc = new G4ProtonInelasticProcess(); - protinelProc -> AddDataSet(proton_XC); - protinelProc -> RegisterMe(binarycascade_model); - protinelProc -> RegisterMe(LEP_proton_model); - protinelProc -> RegisterMe(QGSP_model); - protMan -> AddDiscreteProcess(protinelProc); - - // ****************************************** - // * register models, processes to neutron * - // ****************************************** + //------------------------------------------------------ + // Pion Plus processes + G4ParticleDefinition* piPlus = G4PionPlus::PionPlusDefinition(); + G4ProcessManager* pionPlusProcessManager = piPlus->GetProcessManager(); + + // Define the inelastic scattering for pion plus + G4PionPlusInelasticProcess* pionPlusInelasticProcess = new G4PionPlusInelasticProcess(); + // Set the cross section + // G4PiNuclearCrossSection pionCrossSection; + pionPlusInelasticProcess->AddDataSet(&pionCrossSection); + // Register the models + pionPlusInelasticProcess->RegisterMe(LEPPionPlusModel); + pionPlusInelasticProcess->RegisterMe(QGSPModel); + // Activate the inelastic scattering + pionPlusProcessManager->AddDiscreteProcess(pionPlusInelasticProcess); + // Activate the elastic process + pionPlusProcessManager->AddDiscreteProcess(elasticScattering); + //------------------------------------------------------------ + // Pion Minus processes + G4ParticleDefinition* piMinus = G4PionMinus::PionMinusDefinition(); + G4ProcessManager* pionMinusProcessManager = piMinus->GetProcessManager(); + + // Define the inelastic processes for pion minus + G4PionMinusInelasticProcess* pionMinusInelasticProcess = new G4PionMinusInelasticProcess(); + // Set the cross section + pionMinusInelasticProcess->AddDataSet(&pionCrossSection); + // Register the models + pionMinusInelasticProcess->RegisterMe(LEPPionMinusModel); + pionMinusInelasticProcess->RegisterMe(QGSPModel); + // Activate the inelastic scattering + pionMinusProcessManager->AddDiscreteProcess(pionMinusInelasticProcess); + // Activate the elastic scattering + pionMinusProcessManager->AddDiscreteProcess(elasticScattering); + + //----------------------------------------------------- + // Neutron processes G4ParticleDefinition* neutron = G4Neutron::NeutronDefinition(); - G4ProcessManager* neutMan = neutron->GetProcessManager(); - - // Elastic process - - G4HadronElasticProcess* neutelProc = new G4HadronElasticProcess(); - neutelProc -> RegisterMe(elastic_model); - neutMan -> AddDiscreteProcess(neutelProc); + G4ProcessManager* neutronProcessManager = neutron->GetProcessManager(); // Inelastic process + G4NeutronInelasticProcess* neutronInelasticProcess = new G4NeutronInelasticProcess(); + // Set the cross section + //G4NeutronInelasticCrossSection neutronCrossSection; + neutronInelasticProcess->AddDataSet(&neutronCrossSection); + // Set the models + neutronInelasticProcess->RegisterMe(binaryModel); + neutronInelasticProcess->RegisterMe(LEPNeutronModel); + neutronInelasticProcess->RegisterMe(QGSPModel); + // Activate the neutron inelastic scattering + neutronProcessManager->AddDiscreteProcess(neutronInelasticProcess); + // Activate the neutron elastic scattering + neutronProcessManager->AddDiscreteProcess(elasticScattering); - G4NeutronInelasticProcess* neutinelProc = new G4NeutronInelasticProcess(); - neutinelProc -> AddDataSet(neutron_XC); - neutinelProc -> RegisterMe(binarycascade_model); - neutinelProc -> RegisterMe(LEP_neutron_model); - neutinelProc -> RegisterMe(QGSP_model); - neutMan -> AddDiscreteProcess(neutinelProc); + // Neutron capture process + G4HadronCaptureProcess* neutronCapture = new G4HadronCaptureProcess(); + // Final state production model for capture of neutral hadrons in nuclei + G4LCapture* captureModel = new G4LCapture(); + // Set the energy range for the capture model + G4double neutronLowEnergyLimit = 0. * MeV; + G4double neutronHighEnergyLimit = 100. * TeV; + captureModel->SetMinEnergy(neutronLowEnergyLimit); + captureModel->SetMaxEnergy(neutronHighEnergyLimit); + // Activate the neutron capture model + neutronCapture->RegisterMe(captureModel); + // Activate the neutron capture process + neutronProcessManager->AddDiscreteProcess(neutronCapture); - G4HadronCaptureProcess* neutcapProc = new G4HadronCaptureProcess(); - neutcapProc -> RegisterMe(ncapture_model); - neutMan -> AddDiscreteProcess(neutcapProc); - - G4HadronFissionProcess* neutfisProc = new G4HadronFissionProcess(); - neutfisProc -> RegisterMe(nfission_model); - neutMan -> AddDiscreteProcess(neutfisProc); - - // ****************************************** - // * register models, processes to pi+ * - // ****************************************** - - G4ParticleDefinition* piplus = G4PionPlus::PionPlusDefinition(); - G4ProcessManager* pipMan = piplus -> GetProcessManager(); - - // Elastic process - - G4HadronElasticProcess* pipelProc = new G4HadronElasticProcess(); - pipelProc -> RegisterMe(elastic_model); - pipMan -> AddDiscreteProcess(pipelProc); - - // Inelastic process - - G4PionPlusInelasticProcess* pipinelProc = new G4PionPlusInelasticProcess(); - pipinelProc -> AddDataSet(pion_XC); - pipinelProc -> RegisterMe(LEP_pip_model); - pipinelProc -> RegisterMe(QGSP_model); - pipMan -> AddDiscreteProcess(pipinelProc); - - // ****************************************** - // * register models, processes to pi- * - // ****************************************** - - G4ParticleDefinition* piminus = G4PionMinus::PionMinusDefinition(); - G4ProcessManager* pimMan = piminus -> GetProcessManager(); - - // Elastic process - - G4HadronElasticProcess* pimelProc = new G4HadronElasticProcess(); - pimelProc -> RegisterMe(elastic_model); - pimMan -> AddDiscreteProcess(pimelProc); - - // Inelastic process - - G4PionMinusInelasticProcess* piminelProc = new G4PionMinusInelasticProcess(); - piminelProc -> AddDataSet(pion_XC); - piminelProc -> RegisterMe(LEP_pim_model); - piminelProc -> RegisterMe(QGSP_model); - //pimMan -> AddRestProcess(new G4PiMinusAbsorptionAtRest, ordDefault); - pimMan -> AddDiscreteProcess(piminelProc); - - // ****************************************** - // * register models, processes to alpha * - // ****************************************** + // Process for induced fission + G4HadronFissionProcess* fission = new G4HadronFissionProcess(); + //Final state production model for induced fission + G4LFission* fissionModel = new G4LFission(); + // Set the energy range for the fission model + fissionModel->SetMinEnergy(neutronLowEnergyLimit); + fissionModel->SetMaxEnergy(neutronHighEnergyLimit); + // Register the fission model + fission->RegisterMe(fissionModel); + // Activate the fission process + neutronProcessManager->AddDiscreteProcess(fission); + //-------------------------------------------------------- + // Physics for alpha particles + G4ParticleDefinition* alpha = G4Alpha::AlphaDefinition(); - G4ProcessManager* alfMan = alpha -> GetProcessManager(); + G4ProcessManager* alphaProcessManager = alpha->GetProcessManager(); - // Elastic process + // Cross section data sets + + // TRIPATHI CROSS SECTION + // Implementation of formulas taken from NASA technical paper 3621 by + // Tripathi, et al. Cross-sections for ion ion scattering + G4TripathiCrossSection* tripathi = new G4TripathiCrossSection(); - G4HadronElasticProcess* alfelProc = new G4HadronElasticProcess(); - alfelProc -> RegisterMe(elastic_model); - alfMan -> AddDiscreteProcess(alfelProc); + // IONS SHEN CROSS SECTION + // Implementation of formulas + // Shen et al. Nuc. Phys. A 491 130 (1989) + // Total Reaction Cross Section for Heavy-Ion Collisions + G4IonsShenCrossSection* shen = new G4IonsShenCrossSection(); - // Inelastic process + G4LEAlphaInelastic* LEPAlphaModel = new G4LEAlphaInelastic(); + // Energy limit of the LEP model for alpha particles + G4double LEPAlphaHighLimit = 100 * MeV; + LEPAlphaModel->SetMaxEnergy(LEPAlphaHighLimit); - G4AlphaInelasticProcess* alfinelProc = new G4AlphaInelasticProcess(); - alfinelProc -> AddDataSet(tripathi); - alfinelProc -> AddDataSet(shen); - alfinelProc -> RegisterMe(LEP_alpha_model); - alfinelProc -> RegisterMe(binary_ion_model); - alfMan -> AddDiscreteProcess(alfinelProc); + G4BinaryLightIonReaction* binaryIonModel = new G4BinaryLightIonReaction(); + // Energy limit of the binary ion model + G4double binaryIonLowLimit = 80. * MeV; + G4double binaryIonHighLimit = 40. * GeV; + binaryIonModel->SetMinEnergy(binaryIonLowLimit); + binaryIonModel->SetMaxEnergy(binaryIonHighLimit); + + // Define the alpha inelastic scattering + G4AlphaInelasticProcess* alphaInelasticProcess = new G4AlphaInelasticProcess(); + // Activate the Tripathi and Shen Cross Section + alphaInelasticProcess->AddDataSet(tripathi); + alphaInelasticProcess->AddDataSet(shen); + // Set the models + alphaInelasticProcess->RegisterMe(LEPAlphaModel); + alphaInelasticProcess->RegisterMe(binaryIonModel); + // Activate the inelastic scattering + alphaProcessManager->AddDiscreteProcess(alphaInelasticProcess); + // Activate the elastic scattering + alphaProcessManager->AddDiscreteProcess(elasticScattering); } diff --git a/examples/advanced/radioprotection/src/RemSimIonICRU.cc b/examples/advanced/radioprotection/src/RemSimIonICRU.cc index 210ccdc239..ba1619f038 100644 --- a/examples/advanced/radioprotection/src/RemSimIonICRU.cc +++ b/examples/advanced/radioprotection/src/RemSimIonICRU.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RemSimIonICRU.cc,v 1.10 2006/06/29 16:23:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Susanna Guatelli, guatelli@ge.infn.it diff --git a/examples/advanced/radioprotection/src/RemSimMaterial.cc b/examples/advanced/radioprotection/src/RemSimMaterial.cc index 74cddd0619..6bfb8cc84e 100644 --- a/examples/advanced/radioprotection/src/RemSimMaterial.cc +++ b/examples/advanced/radioprotection/src/RemSimMaterial.cc @@ -33,7 +33,7 @@ // ******************************* // // $Id: RemSimMaterial.cc,v 1.7 2006/06/29 16:23:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4MaterialPropertiesTable.hh" diff --git a/examples/advanced/radioprotection/src/RemSimMoonHabitat.cc b/examples/advanced/radioprotection/src/RemSimMoonHabitat.cc index 325ed1d183..5a61cdd935 100644 --- a/examples/advanced/radioprotection/src/RemSimMoonHabitat.cc +++ b/examples/advanced/radioprotection/src/RemSimMoonHabitat.cc @@ -31,7 +31,7 @@ // ************************************** // // $Id: RemSimMoonHabitat.cc,v 1.7 2006/06/29 16:23:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author:Susanna Guatelli, guatelli@ge.infn.it // diff --git a/examples/advanced/radioprotection/src/RemSimMuonStandard.cc b/examples/advanced/radioprotection/src/RemSimMuonStandard.cc index 6fd2aa9378..338d8074b0 100644 --- a/examples/advanced/radioprotection/src/RemSimMuonStandard.cc +++ b/examples/advanced/radioprotection/src/RemSimMuonStandard.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RemSimMuonStandard.cc,v 1.6 2006/06/29 16:23:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author:Susanna Guatelli, guatelli@ge.infn.it // diff --git a/examples/advanced/radioprotection/src/RemSimPhotonEPDL.cc b/examples/advanced/radioprotection/src/RemSimPhotonEPDL.cc index f61c093056..d9054d8a4e 100644 --- a/examples/advanced/radioprotection/src/RemSimPhotonEPDL.cc +++ b/examples/advanced/radioprotection/src/RemSimPhotonEPDL.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RemSimPhotonEPDL.cc,v 1.7 2006/06/29 16:24:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author:Susanna Guatelli, guatelli@ge.infn.it // diff --git a/examples/advanced/radioprotection/src/RemSimPhysicsList.cc b/examples/advanced/radioprotection/src/RemSimPhysicsList.cc index 7d1a084528..44da537fe1 100644 --- a/examples/advanced/radioprotection/src/RemSimPhysicsList.cc +++ b/examples/advanced/radioprotection/src/RemSimPhysicsList.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RemSimPhysicsList.cc,v 1.10 2006/06/29 16:24:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Susanna Guatelli diff --git a/examples/advanced/radioprotection/src/RemSimPhysicsListMessenger.cc b/examples/advanced/radioprotection/src/RemSimPhysicsListMessenger.cc index e9a08a277d..788a2f7ee6 100644 --- a/examples/advanced/radioprotection/src/RemSimPhysicsListMessenger.cc +++ b/examples/advanced/radioprotection/src/RemSimPhysicsListMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RemSimPhysicsListMessenger.cc,v 1.4 2006/06/29 16:24:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Susanna Guatelli, guatelli@ge.infn.it diff --git a/examples/advanced/radioprotection/src/RemSimPositronStandard.cc b/examples/advanced/radioprotection/src/RemSimPositronStandard.cc index 8b735c8c29..55d9716548 100644 --- a/examples/advanced/radioprotection/src/RemSimPositronStandard.cc +++ b/examples/advanced/radioprotection/src/RemSimPositronStandard.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RemSimPositronStandard.cc,v 1.6 2006/06/29 16:24:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Susanna Guatelli, guatelli@ge.infn.it #include "RemSimPositronStandard.hh" diff --git a/examples/advanced/radioprotection/src/RemSimPrimaryGeneratorMessenger.cc b/examples/advanced/radioprotection/src/RemSimPrimaryGeneratorMessenger.cc index 99cee8d00d..30c33d92cb 100644 --- a/examples/advanced/radioprotection/src/RemSimPrimaryGeneratorMessenger.cc +++ b/examples/advanced/radioprotection/src/RemSimPrimaryGeneratorMessenger.cc @@ -34,7 +34,7 @@ // // // $Id: RemSimPrimaryGeneratorMessenger.cc,v 1.11 2006/06/29 16:24:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/advanced/radioprotection/src/RemSimROGeometry.cc b/examples/advanced/radioprotection/src/RemSimROGeometry.cc index cbd1a5cd63..47d769d670 100644 --- a/examples/advanced/radioprotection/src/RemSimROGeometry.cc +++ b/examples/advanced/radioprotection/src/RemSimROGeometry.cc @@ -33,7 +33,7 @@ // ************************************ // // $Id: RemSimROGeometry.cc,v 1.6 2006/06/29 16:24:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "RemSimROGeometry.hh" #include "RemSimDummySD.hh" diff --git a/examples/advanced/radioprotection/src/RemSimRoofDecorator.cc b/examples/advanced/radioprotection/src/RemSimRoofDecorator.cc index d41d690fc5..bf5ee3e47c 100644 --- a/examples/advanced/radioprotection/src/RemSimRoofDecorator.cc +++ b/examples/advanced/radioprotection/src/RemSimRoofDecorator.cc @@ -33,7 +33,7 @@ // // // $Id: RemSimRoofDecorator.cc,v 1.7 2006/06/29 16:24:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "RemSimVGeometryComponent.hh" #include "RemSimMaterial.hh" diff --git a/examples/advanced/radioprotection/src/RemSimRunAction.cc b/examples/advanced/radioprotection/src/RemSimRunAction.cc index 644d5092ba..ebe75cf283 100644 --- a/examples/advanced/radioprotection/src/RemSimRunAction.cc +++ b/examples/advanced/radioprotection/src/RemSimRunAction.cc @@ -32,7 +32,7 @@ // // Code developed by: S.Guatelli, guatelli@ge.infn.it // $Id: RemSimRunAction.cc,v 1.14 2006/06/29 16:24:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "RemSimRunAction.hh" diff --git a/examples/advanced/radioprotection/src/RemSimSensitiveDetector.cc b/examples/advanced/radioprotection/src/RemSimSensitiveDetector.cc index c28b1329c8..8c40461c1e 100644 --- a/examples/advanced/radioprotection/src/RemSimSensitiveDetector.cc +++ b/examples/advanced/radioprotection/src/RemSimSensitiveDetector.cc @@ -25,7 +25,7 @@ // // // $Id: RemSimSensitiveDetector.cc,v 1.15 2006/06/29 16:24:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Code developed by: S.Guatelli, guatelli@ge.infn.it // diff --git a/examples/advanced/radioprotection/src/RemSimShelterSPEDecorator.cc b/examples/advanced/radioprotection/src/RemSimShelterSPEDecorator.cc index 840c073903..84e1807371 100644 --- a/examples/advanced/radioprotection/src/RemSimShelterSPEDecorator.cc +++ b/examples/advanced/radioprotection/src/RemSimShelterSPEDecorator.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RemSimShelterSPEDecorator.cc,v 1.3 2006/06/29 16:24:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Code developed by: S.Guatelli, guatelli@ge.infn.it // diff --git a/examples/advanced/radioprotection/src/RemSimShieldingDecorator.cc b/examples/advanced/radioprotection/src/RemSimShieldingDecorator.cc index b4ca60472e..2cb6165ce2 100644 --- a/examples/advanced/radioprotection/src/RemSimShieldingDecorator.cc +++ b/examples/advanced/radioprotection/src/RemSimShieldingDecorator.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RemSimShieldingDecorator.cc,v 1.6 2006/06/29 16:24:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Code developed by: S.Guatelli, guatelli@ge.infn.it // diff --git a/examples/advanced/radioprotection/src/RemSimSteppingAction.cc b/examples/advanced/radioprotection/src/RemSimSteppingAction.cc index cd3eb8bbd5..d7465e4ee2 100644 --- a/examples/advanced/radioprotection/src/RemSimSteppingAction.cc +++ b/examples/advanced/radioprotection/src/RemSimSteppingAction.cc @@ -25,7 +25,7 @@ // // // $Id: RemSimSteppingAction.cc,v 1.10 2006/06/29 16:24:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Author: Susanna Guatelli (guatelli@ge.infn.it) diff --git a/examples/advanced/radioprotection/src/RemSimSteppingActionMessenger.cc b/examples/advanced/radioprotection/src/RemSimSteppingActionMessenger.cc index 4aa1a2a75b..61b17e34b6 100644 --- a/examples/advanced/radioprotection/src/RemSimSteppingActionMessenger.cc +++ b/examples/advanced/radioprotection/src/RemSimSteppingActionMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // -//$Id: RemSimSteppingActionMessenger.cc,v 1.5 2006/06/29 16:24:27 gunter Exp $// GEANT4 tag $Name: geant4-08-01 $ +//$Id: RemSimSteppingActionMessenger.cc,v 1.5 2006/06/29 16:24:27 gunter Exp $// GEANT4 tag $Name: geant4-08-02 $ // // Code developed by: S.Guatelli, guatelli@ge.infn.it // diff --git a/examples/advanced/radioprotection/src/RemSimVGeometryComponent.cc b/examples/advanced/radioprotection/src/RemSimVGeometryComponent.cc index 34c77dabaa..be8ad3e729 100644 --- a/examples/advanced/radioprotection/src/RemSimVGeometryComponent.cc +++ b/examples/advanced/radioprotection/src/RemSimVGeometryComponent.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RemSimVGeometryComponent.cc,v 1.4 2006/06/29 16:24:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Code developed by: S.Guatelli, guatelli@ge.infn.it // diff --git a/examples/advanced/radioprotection/src/RemSimVehicle1.cc b/examples/advanced/radioprotection/src/RemSimVehicle1.cc index 5f391bd13a..b6ec3cf9fc 100644 --- a/examples/advanced/radioprotection/src/RemSimVehicle1.cc +++ b/examples/advanced/radioprotection/src/RemSimVehicle1.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RemSimVehicle1.cc,v 1.9 2006/06/29 16:24:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Code developed by: S.Guatelli, guatelli@ge.infn.it // diff --git a/examples/advanced/radioprotection/vehicle1.mac b/examples/advanced/radioprotection/vehicle1.mac index 417ed56bcb..ebdc3acf9c 100644 --- a/examples/advanced/radioprotection/vehicle1.mac +++ b/examples/advanced/radioprotection/vehicle1.mac @@ -54,3 +54,5 @@ + + diff --git a/examples/advanced/radioprotection/vehicle2.mac b/examples/advanced/radioprotection/vehicle2.mac index eda5d68807..789a4fda2e 100644 --- a/examples/advanced/radioprotection/vehicle2.mac +++ b/examples/advanced/radioprotection/vehicle2.mac @@ -36,7 +36,8 @@ /configuration/choose vehicle /configuration/AddShielding On /configuration/AddSPE On -/run/beamOn 50 +/run/beamOn 500 + diff --git a/examples/advanced/raredecay_calorimetry/History b/examples/advanced/raredecay_calorimetry/History index 846c0ea13b..fc5ee69fa8 100644 --- a/examples/advanced/raredecay_calorimetry/History +++ b/examples/advanced/raredecay_calorimetry/History @@ -1,4 +1,4 @@ -$Id: History,v 1.1 2005/05/11 10:37:19 mkossov Exp $ +$Id: History,v 1.2 2006/11/22 09:44:58 gcosmo Exp $ ------------------------------------------------------------------- ========================================================= @@ -14,5 +14,9 @@ track of all tags. ---------------------------------------------------------- * Reverse chronological order (last date on top), please * ---------------------------------------------------------- -May. 10, 2005 Mikhail Kosov (example-PhotIn-V07-03-00) + +Nov. 22, 2006 Gabriele Cosmo (raredecay-V08-01-00) +- Removed obsolete vis-manager classes. Now using G4VisExecutive. + +May. 10, 2005 Mikhail Kosov - Created as a copy of the Novice Example N07 diff --git a/examples/advanced/raredecay_calorimetry/PhotIn.cc b/examples/advanced/raredecay_calorimetry/PhotIn.cc index f2692646bc..6b632e3d75 100644 --- a/examples/advanced/raredecay_calorimetry/PhotIn.cc +++ b/examples/advanced/raredecay_calorimetry/PhotIn.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: PhotIn.cc,v 1.9 2006/06/29 16:24:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhotIn.cc,v 1.10 2006/11/22 09:46:02 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- @@ -44,7 +44,7 @@ #include "G4UItcsh.hh" #ifdef G4VIS_USE -#include "PhotInVisManager.hh" +#include "G4VisExecutive.hh" #endif #include "PhotInDetectorConstruction.hh" @@ -261,7 +261,7 @@ int main(int argc,char** argv) #ifdef G4VIS_USE // visualization manager - G4VisManager* visManager = new PhotInVisManager; + G4VisManager* visManager = new G4VisExecutive; visManager->Initialize(); #ifdef debug G4cout<<"PhotIn: Visualization Manager is constructed and initialized"< 0) - { - G4cout<<"PhotInVisManager::RegisterGraphicsSystems: chosen graphics systems"<SetUserLimits(theUserLimitsForRoom); vessel_log->SetUserLimits(theUserLimitsForRoom); GXe_log->SetUserLimits(theUserLimitsForDetector); - LXe_log->SetUserLimits(theUserLimitsForXenon); + // LXe_log->SetUserLimits(theUserLimitsForXenon); + LXe_log->SetUserLimits(theUserLimitsForDetector); CuShield_log->SetUserLimits(theUserLimitsForDetector); ring_log->SetUserLimits(theUserLimitsForDetector); mirror_log->SetUserLimits(theUserLimitsForDetector); diff --git a/examples/advanced/underground_physics/src/DMXMinEkineCuts.cc b/examples/advanced/underground_physics/src/DMXMinEkineCuts.cc index 06c0b36921..df7222f268 100644 --- a/examples/advanced/underground_physics/src/DMXMinEkineCuts.cc +++ b/examples/advanced/underground_physics/src/DMXMinEkineCuts.cc @@ -25,7 +25,7 @@ // // // $Id: DMXMinEkineCuts.cc,v 1.6 2006/06/29 16:26:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/advanced/xray_fluorescence/History b/examples/advanced/xray_fluorescence/History index 7789763ecb..3b89242fa7 100644 --- a/examples/advanced/xray_fluorescence/History +++ b/examples/advanced/xray_fluorescence/History @@ -1,6 +1,6 @@ # $Id: History,v 1.6 2005/11/15 15:57:47 gcosmo Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # ------------------------------------------------------------------- ========================================================= diff --git a/examples/advanced/xray_telescope/include/XrayTelAnalysis.hh b/examples/advanced/xray_telescope/include/XrayTelAnalysis.hh index fe7cfb1c37..9b4d2e5aa2 100644 --- a/examples/advanced/xray_telescope/include/XrayTelAnalysis.hh +++ b/examples/advanced/xray_telescope/include/XrayTelAnalysis.hh @@ -25,7 +25,7 @@ // // // $Id: XrayTelAnalysis.hh,v 1.10 2006/06/29 16:29:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: A. Pfeiffer (Andreas.Pfeiffer@cern.ch) // (copy of his UserAnalyser class) diff --git a/examples/advanced/xray_telescope/src/XrayTelAnalysis.cc b/examples/advanced/xray_telescope/src/XrayTelAnalysis.cc index 0d276c9817..48f6feb1be 100644 --- a/examples/advanced/xray_telescope/src/XrayTelAnalysis.cc +++ b/examples/advanced/xray_telescope/src/XrayTelAnalysis.cc @@ -25,7 +25,7 @@ // // // $Id: XrayTelAnalysis.cc,v 1.12 2006/06/29 16:30:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: A. Pfeiffer (Andreas.Pfeiffer@cern.ch) // (copied from his UserAnalyser class) diff --git a/examples/advanced/xray_telescope/test.out b/examples/advanced/xray_telescope/test.out index 9040d7a5e5..4b4f374e42 100644 --- a/examples/advanced/xray_telescope/test.out +++ b/examples/advanced/xray_telescope/test.out @@ -1,5 +1,5 @@ ********************************************** - Geant4 version $Name: geant4-08-01 $ + Geant4 version $Name: geant4-08-02 $ (19-May-2003) Copyright : Geant4 Collaboration ********************************************** diff --git a/examples/extended/analysis/A01/A01app.cc b/examples/extended/analysis/A01/A01app.cc index ac48369da0..9774d052ce 100644 --- a/examples/extended/analysis/A01/A01app.cc +++ b/examples/extended/analysis/A01/A01app.cc @@ -23,7 +23,7 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: A01app.cc,v 1.7 2006/06/29 16:30:23 gunter Exp $ +// $Id: A01app.cc,v 1.8 2006/11/06 19:46:06 allison Exp $ // -------------------------------------------------------------- // // -------------------------------------------------------------- @@ -37,14 +37,14 @@ #include "G4RunManager.hh" #include "G4UImanager.hh" #include "G4UIterminal.hh" +#ifdef G4UI_USE_TCSH #include "G4UItcsh.hh" +#endif #include "A01DetectorConstruction.hh" #include "A01PhysicsList.hh" #include "A01PrimaryGeneratorAction.hh" -#include "A01TrackingAction.hh" - #include "A01EventAction.hh" #ifdef G4VIS_USE @@ -74,7 +74,6 @@ int main(int argc,char** argv) // optional user action classes runManager->SetUserAction(new A01EventAction); - //runManager->SetUserAction(new A01TrackingAction); if(argc>1) // execute an argument macro file if exist @@ -87,7 +86,11 @@ int main(int argc,char** argv) else // start interactive session { +#ifdef G4UI_USE_TCSH + G4UIsession* session = new G4UIterminal(new G4UItcsh); +#else G4UIsession* session = new G4UIterminal(); +#endif session->SessionStart(); delete session; } diff --git a/examples/extended/analysis/A01/GNUmakefile b/examples/extended/analysis/A01/GNUmakefile index 4009e32f07..5e811e1332 100644 --- a/examples/extended/analysis/A01/GNUmakefile +++ b/examples/extended/analysis/A01/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.9 2005/03/31 16:04:00 duns Exp $ +# $Id: GNUmakefile,v 1.10 2006/11/10 21:04:51 duns Exp $ # -------------------------------------------------------------- # GNUmakefile for examples module # -------------------------------------------------------------- @@ -14,8 +14,9 @@ endif .PHONY: all all: lib bin -# A01PhysicsList use hadronic-lists, so it needs below include command. -#include hadlist.gmk +# +# A01 uses its own physics lists. +# include $(G4INSTALL)/config/binmake.gmk diff --git a/examples/extended/analysis/A01/History b/examples/extended/analysis/A01/History index 93da2f00a5..689a331f76 100644 --- a/examples/extended/analysis/A01/History +++ b/examples/extended/analysis/A01/History @@ -1,4 +1,4 @@ -$Id: History,v 1.38 2006/06/01 18:07:06 perl Exp $ +$Id: History,v 1.41 2006/11/14 07:11:18 perl Exp $ ------------------------------------------------------------------- ========================================================= @@ -10,6 +10,19 @@ $Id: History,v 1.38 2006/06/01 18:07:06 perl Exp $ ---------------------------------------------------------- --------------------------------------------------------------------------- + +13 November 2006 - Joseph Perl (exampleA01-V08-01-02) +- Remove unused attributes from hit classes. + +10 November 2006 - Mark Donszelmann (exampleA01-V08-01-01) +- Fixed Makefile +- Fixed limits on histogram + +6 November 2006 - John Allison (exampleA01-V08-01-00) +- Change "Bookkeeping" to "Physics" in G4AttDefs. +- Removed tracking action. Use "/vis/scene/add/trajectories rich", etc. +- Invoke G4UIterminal(new G4UItcsh) if G4UI_USE_TCSH set. + 1 June 2006 - Joseph Perl (exampleA01-V08-00-01) - Add Time attribute to Hit classes. diff --git a/examples/extended/analysis/A01/novis.mac b/examples/extended/analysis/A01/novis.mac index ad32b399db..14a0b8e450 100644 --- a/examples/extended/analysis/A01/novis.mac +++ b/examples/extended/analysis/A01/novis.mac @@ -14,9 +14,9 @@ #/vis/viewer/set/culling global false #/vis/scene/endOfEventAction accumulate # -# Add volume to scene +# Draw detector # -#/vis/scene/add/volume +/vis/drawVolume # # Add trajectories to scene # diff --git a/examples/extended/analysis/A01/src/A01DriftChamberHit.cc b/examples/extended/analysis/A01/src/A01DriftChamberHit.cc index 14732dda29..778366ba98 100644 --- a/examples/extended/analysis/A01/src/A01DriftChamberHit.cc +++ b/examples/extended/analysis/A01/src/A01DriftChamberHit.cc @@ -23,7 +23,7 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: A01DriftChamberHit.cc,v 1.9 2006/06/29 16:32:28 gunter Exp $ +// $Id: A01DriftChamberHit.cc,v 1.11 2006/11/14 07:11:18 perl Exp $ // -------------------------------------------------------------- // #include "A01DriftChamberHit.hh" @@ -100,29 +100,17 @@ const std::map* A01DriftChamberHit::GetAttDefs() const = G4AttDefStore::GetInstance("A01DriftChamberHit",isNew); if (isNew) { G4String HitType("HitType"); - (*store)[HitType] = G4AttDef(HitType,"Hit Type","Bookkeeping","","G4String"); + (*store)[HitType] = G4AttDef(HitType,"Hit Type","Physics","","G4String"); G4String ID("ID"); - (*store)[ID] = G4AttDef(ID,"ID","Bookkeeping","","G4int"); - - G4String Column("Column"); - (*store)[Column] = G4AttDef(Column,"Column ID","Bookkeeping","","G4int"); - - G4String Row("Row"); - (*store)[Row] = G4AttDef(Row,"Row ID","Bookkeeping","","G4int"); + (*store)[ID] = G4AttDef(ID,"ID","Physics","","G4int"); G4String Time("Time"); (*store)[Time] = G4AttDef(Time,"Time","Physics","G4BestUnit","G4double"); - G4String Energy("Energy"); - (*store)[Energy] = G4AttDef(Energy,"Energy Deposited","Physics","G4BestUnit","G4double"); - G4String Pos("Pos"); (*store)[Pos] = G4AttDef(Pos, "Position", "Physics","G4BestUnit","G4ThreeVector"); - - G4String LVol("LVol"); - (*store)[LVol] = G4AttDef(LVol,"Logical Volume","Bookkeeping","","G4String"); } return store; } @@ -136,25 +124,12 @@ std::vector* A01DriftChamberHit::CreateAttValues() const values->push_back (G4AttValue("ID",G4UIcommand::ConvertToString(layerID),"")); - values->push_back - (G4AttValue("Column"," ","")); - - values->push_back - (G4AttValue("Row"," ","")); - values->push_back (G4AttValue("Time",G4BestUnit(time,"Time"),"")); - G4double noEnergy = 0.*MeV; - values->push_back - (G4AttValue("Energy",G4BestUnit(noEnergy,"Energy"),"")); - values->push_back (G4AttValue("Pos",G4BestUnit(worldPos,"Length"),"")); - values->push_back - (G4AttValue("LVol"," ","")); - return values; } diff --git a/examples/extended/analysis/A01/src/A01EmCalorimeterHit.cc b/examples/extended/analysis/A01/src/A01EmCalorimeterHit.cc index 065163bf05..9c4807fdb8 100644 --- a/examples/extended/analysis/A01/src/A01EmCalorimeterHit.cc +++ b/examples/extended/analysis/A01/src/A01EmCalorimeterHit.cc @@ -23,7 +23,7 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: A01EmCalorimeterHit.cc,v 1.10 2006/06/29 16:32:35 gunter Exp $ +// $Id: A01EmCalorimeterHit.cc,v 1.12 2006/11/14 07:11:19 perl Exp $ // -------------------------------------------------------------- // @@ -109,19 +109,10 @@ const std::map* A01EmCalorimeterHit::GetAttDefs() const = G4AttDefStore::GetInstance("A01EmCalorimeterHit",isNew); if (isNew) { G4String HitType("HitType"); - (*store)[HitType] = G4AttDef(HitType,"Hit Type","Bookkeeping","","G4String"); + (*store)[HitType] = G4AttDef(HitType,"Hit Type","Physics","","G4String"); G4String ID("ID"); - (*store)[ID] = G4AttDef(ID,"ID","Bookkeeping","","G4int"); - - G4String Column("Column"); - (*store)[Column] = G4AttDef(Column,"Column ID","Bookkeeping","","G4int"); - - G4String Row("Row"); - (*store)[Row] = G4AttDef(Row,"Row ID","Bookkeeping","","G4int"); - - G4String Time("Time"); - (*store)[Time] = G4AttDef(Time,"Time","Physics","G4BestUnit","G4double"); + (*store)[ID] = G4AttDef(ID,"ID","Physics","","G4int"); G4String Energy("Energy"); (*store)[Energy] = G4AttDef(Energy,"Energy Deposited","Physics","G4BestUnit","G4double"); @@ -131,7 +122,7 @@ const std::map* A01EmCalorimeterHit::GetAttDefs() const "Physics","G4BestUnit","G4ThreeVector"); G4String LVol("LVol"); - (*store)[LVol] = G4AttDef(LVol,"Logical Volume","Bookkeeping","","G4String"); + (*store)[LVol] = G4AttDef(LVol,"Logical Volume","Physics","","G4String"); } return store; } @@ -145,16 +136,6 @@ std::vector* A01EmCalorimeterHit::CreateAttValues() const values->push_back (G4AttValue("ID",G4UIcommand::ConvertToString(cellID),"")); - values->push_back - (G4AttValue("Column"," ","")); - - values->push_back - (G4AttValue("Row"," ","")); - - G4double noTime = 0.*s; - values->push_back - (G4AttValue("Time",G4BestUnit(noTime,"Time"),"")); - values->push_back (G4AttValue("Energy",G4BestUnit(edep,"Energy"),"")); diff --git a/examples/extended/analysis/A01/src/A01EventAction.cc b/examples/extended/analysis/A01/src/A01EventAction.cc index feed7a421f..10a455a318 100644 --- a/examples/extended/analysis/A01/src/A01EventAction.cc +++ b/examples/extended/analysis/A01/src/A01EventAction.cc @@ -23,7 +23,7 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: A01EventAction.cc,v 1.8 2006/06/29 16:32:37 gunter Exp $ +// $Id: A01EventAction.cc,v 1.9 2006/11/10 21:04:51 duns Exp $ // -------------------------------------------------------------- // @@ -82,8 +82,8 @@ A01EventAction::A01EventAction() if (hFactory) { // Create some histograms - dc1Hits = hFactory->createHistogram1D("Drift Chamber 1 # Hits",10,0,10); - dc2Hits = hFactory->createHistogram1D("Drift Chamber 2 # Hits",10,0,10); + dc1Hits = hFactory->createHistogram1D("Drift Chamber 1 # Hits",50,0,50); + dc2Hits = hFactory->createHistogram1D("Drift Chamber 2 # Hits",50,0,50); // Create some clouds (Scatter Plots) dc1XY = hFactory->createCloud2D("Drift Chamber 1 X vs Y"); diff --git a/examples/extended/analysis/A01/src/A01HadCalorimeterHit.cc b/examples/extended/analysis/A01/src/A01HadCalorimeterHit.cc index 04df615417..96396412e9 100644 --- a/examples/extended/analysis/A01/src/A01HadCalorimeterHit.cc +++ b/examples/extended/analysis/A01/src/A01HadCalorimeterHit.cc @@ -23,7 +23,7 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: A01HadCalorimeterHit.cc,v 1.9 2006/06/29 16:32:46 gunter Exp $ +// $Id: A01HadCalorimeterHit.cc,v 1.11 2006/11/14 07:11:19 perl Exp $ // -------------------------------------------------------------- // @@ -109,19 +109,13 @@ const std::map* A01HadCalorimeterHit::GetAttDefs() const = G4AttDefStore::GetInstance("A01HadCalorimeterHit",isNew); if (isNew) { G4String HitType("HitType"); - (*store)[HitType] = G4AttDef(HitType,"Hit Type","Bookkeeping","","G4String"); - - G4String ID("ID"); - (*store)[ID] = G4AttDef(ID,"ID","Bookkeeping","","G4int"); + (*store)[HitType] = G4AttDef(HitType,"Hit Type","Physics","","G4String"); G4String Column("Column"); - (*store)[Column] = G4AttDef(Column,"Column ID","Bookkeeping","","G4int"); + (*store)[Column] = G4AttDef(Column,"Column ID","Physics","","G4int"); G4String Row("Row"); - (*store)[Row] = G4AttDef(Row,"Row ID","Bookkeeping","","G4int"); - - G4String Time("Time"); - (*store)[Time] = G4AttDef(Time,"Time","Physics","G4BestUnit","G4double"); + (*store)[Row] = G4AttDef(Row,"Row ID","Physics","","G4int"); G4String Energy("Energy"); (*store)[Energy] = G4AttDef(Energy,"Energy Deposited","Physics","G4BestUnit","G4double"); @@ -129,9 +123,6 @@ const std::map* A01HadCalorimeterHit::GetAttDefs() const G4String Pos("Pos"); (*store)[Pos] = G4AttDef(Pos, "Position", "Physics","G4BestUnit","G4ThreeVector"); - - G4String LVol("LVol"); - (*store)[LVol] = G4AttDef(LVol,"Logical Volume","Bookkeeping","","G4String"); } return store; } @@ -142,28 +133,18 @@ std::vector* A01HadCalorimeterHit::CreateAttValues() const values->push_back(G4AttValue("HitType","HadCalorimeterHit","")); - values->push_back - (G4AttValue("ID"," ","")); - values->push_back (G4AttValue("Column",G4UIcommand::ConvertToString(columnID),"")); values->push_back (G4AttValue("Row",G4UIcommand::ConvertToString(rowID),"")); - G4double noTime = 0.*s; - values->push_back - (G4AttValue("Time",G4BestUnit(noTime,"Time"),"")); - values->push_back (G4AttValue("Energy",G4BestUnit(edep,"Energy"),"")); values->push_back (G4AttValue("Pos",G4BestUnit(pos,"Length"),"")); - values->push_back - (G4AttValue("LVol"," ","")); - return values; } diff --git a/examples/extended/analysis/A01/src/A01HodoscopeHit.cc b/examples/extended/analysis/A01/src/A01HodoscopeHit.cc index 82068d2b76..1841f62125 100644 --- a/examples/extended/analysis/A01/src/A01HodoscopeHit.cc +++ b/examples/extended/analysis/A01/src/A01HodoscopeHit.cc @@ -23,7 +23,7 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: A01HodoscopeHit.cc,v 1.9 2006/06/29 16:32:52 gunter Exp $ +// $Id: A01HodoscopeHit.cc,v 1.11 2006/11/14 07:11:19 perl Exp $ // -------------------------------------------------------------- // #include "A01HodoscopeHit.hh" @@ -97,29 +97,20 @@ const std::map* A01HodoscopeHit::GetAttDefs() const = G4AttDefStore::GetInstance("A01HodoscopeHit",isNew); if (isNew) { G4String HitType("HitType"); - (*store)[HitType] = G4AttDef(HitType,"Hit Type","Bookkeeping","","G4String"); + (*store)[HitType] = G4AttDef(HitType,"Hit Type","Physics","","G4String"); G4String ID("ID"); - (*store)[ID] = G4AttDef(ID,"ID","Bookkeeping","","G4int"); - - G4String Column("Column"); - (*store)[Column] = G4AttDef(Column,"Column ID","Bookkeeping","","G4int"); - - G4String Row("Row"); - (*store)[Row] = G4AttDef(Row,"Row ID","Bookkeeping","","G4int"); + (*store)[ID] = G4AttDef(ID,"ID","Physics","","G4int"); G4String Time("Time"); (*store)[Time] = G4AttDef(Time,"Time","Physics","G4BestUnit","G4double"); - G4String Energy("Energy"); - (*store)[Energy] = G4AttDef(Energy,"Energy Deposited","Physics","G4BestUnit","G4double"); - G4String Pos("Pos"); (*store)[Pos] = G4AttDef(Pos, "Position", "Physics","G4BestUnit","G4ThreeVector"); G4String LVol("LVol"); - (*store)[LVol] = G4AttDef(LVol,"Logical Volume","Bookkeeping","","G4String"); + (*store)[LVol] = G4AttDef(LVol,"Logical Volume","Physics","","G4String"); } return store; } @@ -133,19 +124,9 @@ std::vector* A01HodoscopeHit::CreateAttValues() const values->push_back (G4AttValue("ID",G4UIcommand::ConvertToString(id),"")); - values->push_back - (G4AttValue("Column"," ","")); - - values->push_back - (G4AttValue("Row"," ","")); - values->push_back (G4AttValue("Time",G4BestUnit(time,"Time"),"")); - G4double noEnergy = 0.*MeV; - values->push_back - (G4AttValue("Energy",G4BestUnit(noEnergy,"Energy"),"")); - values->push_back (G4AttValue("Pos",G4BestUnit(pos,"Length"),"")); diff --git a/examples/extended/analysis/A01/test.out b/examples/extended/analysis/A01/test.out index baa4b1bbaf..7056204e84 100644 --- a/examples/extended/analysis/A01/test.out +++ b/examples/extended/analysis/A01/test.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version $Name: geant4-08-01 $ (25-June-2004) + Geant4 version $Name: geant4-08-02 $ (25-June-2004) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 diff --git a/examples/extended/analysis/A01/vis.mac b/examples/extended/analysis/A01/vis.mac index d99cfb00f7..201f6bd15b 100644 --- a/examples/extended/analysis/A01/vis.mac +++ b/examples/extended/analysis/A01/vis.mac @@ -1,36 +1,25 @@ # # Macro file for A01app # +# Set verbosity +# +/control/verbose 2 +# /vis/verbose confirmations +# # Create a scene handler and viewer for HepRep # /vis/open HepRepFile #/vis/open DAWNFILE # -# Create a new empty scene +# Draw detector # -/vis/scene/create -# -# Declare that the world volume should be added to the scene -# -/vis/scene/add/volume -# -# Attach scene to scenehandler -# -/vis/sceneHandler/attach -# -# Draw a picture that has just the detector (no trajectories or hits). -# -/vis/viewer/flush +/vis/drawVolume # # Declare that trajectories and hits should be added to the scene # /vis/scene/add/trajectories /vis/scene/add/hits # -# Store particle trajactories for visualisation -# -/tracking/storeTrajectory 1 -# # Execute the visualization via the /vis/viewer/flush that comes # automatically at the end of each /run. # diff --git a/examples/extended/analysis/AnaEx01/AnaEx01.cc b/examples/extended/analysis/AnaEx01/AnaEx01.cc index c77a160012..a3594c980e 100644 --- a/examples/extended/analysis/AnaEx01/AnaEx01.cc +++ b/examples/extended/analysis/AnaEx01/AnaEx01.cc @@ -25,7 +25,7 @@ // // // $Id: AnaEx01.cc,v 1.14 2006/06/29 16:33:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/analysis/AnaEx01/History b/examples/extended/analysis/AnaEx01/History index ac1e689df7..b5d394d7f1 100644 --- a/examples/extended/analysis/AnaEx01/History +++ b/examples/extended/analysis/AnaEx01/History @@ -1,4 +1,4 @@ -$Id: History,v 1.14 2005/12/06 11:07:17 gcosmo Exp $ +$Id: History,v 1.15 2006/08/16 15:43:44 gcosmo Exp $ -------------------------------------------------- ========================================================= @@ -15,6 +15,9 @@ track of all tags. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +16th August 2006 Gabriele Cosmo (AnaEx01-V08-01-00) +- Corrected text in README for AIDA setup. + 6th December 2005 Gabriele Cosmo - Trivial change in main() for support of CLHEP-2.0.X series. diff --git a/examples/extended/analysis/AnaEx01/README b/examples/extended/analysis/AnaEx01/README index d73e7b310a..b4e9a23bc3 100644 --- a/examples/extended/analysis/AnaEx01/README +++ b/examples/extended/analysis/AnaEx01/README @@ -1,4 +1,4 @@ -$Id: README,v 1.14 2005/10/25 13:45:42 gbarrand Exp $ +$Id: README,v 1.15 2006/08/16 15:42:16 gcosmo Exp $ ------------------------------------------------------------------- ========================================================= @@ -23,19 +23,10 @@ $Id: README,v 1.14 2005/10/25 13:45:42 gbarrand Exp $ The first one permits to validate/devalidate the AIDA analysis code in the example code. The two others permit to give the compilation and link flags of the AIDA compliant system used. - An AIDA compliant system should define the command 'aida-config' that - permits to retrieve the correct values. For example under some - UNIX csh flavour : - csh> source .csh - csh> source .csh (or some equivalent) - csh> setenv G4ANALYSIS_USE 1 - csh> setenv G4ANALYSIS_AIDA_CONFIG_CFLAGS `aida-config --cflags` - csh> setenv G4ANALYSIS_AIDA_CONFIG_LIBS `aida-config --libs` - csh> cd $G4INSTALL/examples/extended/analysis/AnaEx01 - csh> gmake - For info, the CPP macros G4ANALYSIS_*_AIDA_* are used in the - config/analysis.gmk file of the Geant4 GNUmakefile system. + The variable G4ANALYSIS_USE must be defined in the environment, and the + the system properly configured to use one of the AIDA compliant analysis + tools (i.e. path set to retrieve the 'aida-config' command). Working with the OpenScientist/Lab package : ------------------------------------------ @@ -52,8 +43,6 @@ $Id: README,v 1.14 2005/10/25 13:45:42 gbarrand Exp $ csh> source /Lab//cmt/setup.csh csh> source .csh csh> setenv G4ANALYSIS_USE 1 - csh> setenv G4ANALYSIS_AIDA_CONFIG_CFLAGS `aida-config --cflags` - csh> setenv G4ANALYSIS_AIDA_CONFIG_LIBS `aida-config --libs` csh> cd $G4INSTALL/examples/extended/analysis/AnaEx01 csh> gmake @@ -109,8 +98,6 @@ $Id: README,v 1.14 2005/10/25 13:45:42 gbarrand Exp $ csh> source .csh csh> source /Falsetto//cmt/setup.csh csh> setenv G4ANALYSIS_USE 1 - csh> setenv G4ANALYSIS_AIDA_CONFIG_CFLAGS `aida-config --cflags` - csh> setenv G4ANALYSIS_AIDA_CONFIG_LIBS `aida-config --libs` csh> cd $G4INSTALL/examples/extended/analysis/AnaEx01 csh> gmake diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01AnalysisManager.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01AnalysisManager.hh index 54279d5d45..6ee09b8c71 100644 --- a/examples/extended/analysis/AnaEx01/include/AnaEx01AnalysisManager.hh +++ b/examples/extended/analysis/AnaEx01/include/AnaEx01AnalysisManager.hh @@ -25,7 +25,7 @@ // // // $Id: AnaEx01AnalysisManager.hh,v 1.9 2006/06/29 16:33:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01CalorHit.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01CalorHit.hh index 3c01083392..f9154ac81d 100644 --- a/examples/extended/analysis/AnaEx01/include/AnaEx01CalorHit.hh +++ b/examples/extended/analysis/AnaEx01/include/AnaEx01CalorHit.hh @@ -25,7 +25,7 @@ // // // $Id: AnaEx01CalorHit.hh,v 1.4 2006/06/29 16:33:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01CalorimeterSD.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01CalorimeterSD.hh index d10eac2a2d..00ab9eaa20 100644 --- a/examples/extended/analysis/AnaEx01/include/AnaEx01CalorimeterSD.hh +++ b/examples/extended/analysis/AnaEx01/include/AnaEx01CalorimeterSD.hh @@ -25,7 +25,7 @@ // // // $Id: AnaEx01CalorimeterSD.hh,v 1.4 2006/06/29 16:33:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01DetectorConstruction.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01DetectorConstruction.hh index bc9716967a..c3795d1e3b 100644 --- a/examples/extended/analysis/AnaEx01/include/AnaEx01DetectorConstruction.hh +++ b/examples/extended/analysis/AnaEx01/include/AnaEx01DetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: AnaEx01DetectorConstruction.hh,v 1.4 2006/06/29 16:33:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01DetectorMessenger.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01DetectorMessenger.hh index e88d23ead3..21c46b4e47 100644 --- a/examples/extended/analysis/AnaEx01/include/AnaEx01DetectorMessenger.hh +++ b/examples/extended/analysis/AnaEx01/include/AnaEx01DetectorMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: AnaEx01DetectorMessenger.hh,v 1.4 2006/06/29 16:33:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01EventAction.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01EventAction.hh index 7b258e8b4d..4e0b3aec3f 100644 --- a/examples/extended/analysis/AnaEx01/include/AnaEx01EventAction.hh +++ b/examples/extended/analysis/AnaEx01/include/AnaEx01EventAction.hh @@ -25,7 +25,7 @@ // // // $Id: AnaEx01EventAction.hh,v 1.6 2006/06/29 16:33:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01PhysicsList.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01PhysicsList.hh index 9cefb0fa41..4bcbd4837f 100644 --- a/examples/extended/analysis/AnaEx01/include/AnaEx01PhysicsList.hh +++ b/examples/extended/analysis/AnaEx01/include/AnaEx01PhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: AnaEx01PhysicsList.hh,v 1.4 2006/06/29 16:33:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01PrimaryGeneratorAction.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01PrimaryGeneratorAction.hh index c4a46c41cb..b30d550ce9 100644 --- a/examples/extended/analysis/AnaEx01/include/AnaEx01PrimaryGeneratorAction.hh +++ b/examples/extended/analysis/AnaEx01/include/AnaEx01PrimaryGeneratorAction.hh @@ -25,7 +25,7 @@ // // // $Id: AnaEx01PrimaryGeneratorAction.hh,v 1.4 2006/06/29 16:33:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01PrimaryGeneratorMessenger.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01PrimaryGeneratorMessenger.hh index 716a0124dd..f0b597d8cb 100644 --- a/examples/extended/analysis/AnaEx01/include/AnaEx01PrimaryGeneratorMessenger.hh +++ b/examples/extended/analysis/AnaEx01/include/AnaEx01PrimaryGeneratorMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: AnaEx01PrimaryGeneratorMessenger.hh,v 1.4 2006/06/29 16:33:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01RunAction.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01RunAction.hh index c73adb4a12..48b7ddd4b0 100644 --- a/examples/extended/analysis/AnaEx01/include/AnaEx01RunAction.hh +++ b/examples/extended/analysis/AnaEx01/include/AnaEx01RunAction.hh @@ -25,7 +25,7 @@ // // // $Id: AnaEx01RunAction.hh,v 1.6 2006/06/29 16:33:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01SteppingAction.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01SteppingAction.hh index 8cc4aa539b..1914f7ec97 100644 --- a/examples/extended/analysis/AnaEx01/include/AnaEx01SteppingAction.hh +++ b/examples/extended/analysis/AnaEx01/include/AnaEx01SteppingAction.hh @@ -25,7 +25,7 @@ // // // $Id: AnaEx01SteppingAction.hh,v 1.6 2006/06/29 16:33:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01SteppingVerbose.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01SteppingVerbose.hh index 4619ef202c..2406c0e405 100644 --- a/examples/extended/analysis/AnaEx01/include/AnaEx01SteppingVerbose.hh +++ b/examples/extended/analysis/AnaEx01/include/AnaEx01SteppingVerbose.hh @@ -25,7 +25,7 @@ // // // $Id: AnaEx01SteppingVerbose.hh,v 1.4 2006/06/29 16:33:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01AnalysisManager.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01AnalysisManager.cc index 0415edb75c..b1e1b66f1f 100644 --- a/examples/extended/analysis/AnaEx01/src/AnaEx01AnalysisManager.cc +++ b/examples/extended/analysis/AnaEx01/src/AnaEx01AnalysisManager.cc @@ -25,7 +25,7 @@ // // // $Id: AnaEx01AnalysisManager.cc,v 1.16 2006/06/29 16:33:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Guy Barrand 14th Septembre 2000. diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01CalorHit.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01CalorHit.cc index 36953964ac..9e9ba8bc2f 100644 --- a/examples/extended/analysis/AnaEx01/src/AnaEx01CalorHit.cc +++ b/examples/extended/analysis/AnaEx01/src/AnaEx01CalorHit.cc @@ -25,7 +25,7 @@ // // // $Id: AnaEx01CalorHit.cc,v 1.6 2006/06/29 16:33:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01CalorimeterSD.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01CalorimeterSD.cc index 2deda3334e..67a8bb3845 100644 --- a/examples/extended/analysis/AnaEx01/src/AnaEx01CalorimeterSD.cc +++ b/examples/extended/analysis/AnaEx01/src/AnaEx01CalorimeterSD.cc @@ -25,7 +25,7 @@ // // // $Id: AnaEx01CalorimeterSD.cc,v 1.5 2006/06/29 16:33:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01DetectorConstruction.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01DetectorConstruction.cc index ae25bbe807..ddc954d803 100644 --- a/examples/extended/analysis/AnaEx01/src/AnaEx01DetectorConstruction.cc +++ b/examples/extended/analysis/AnaEx01/src/AnaEx01DetectorConstruction.cc @@ -25,7 +25,7 @@ // // // $Id: AnaEx01DetectorConstruction.cc,v 1.5 2006/06/29 16:33:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01DetectorMessenger.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01DetectorMessenger.cc index 3364e9527a..33dbad5155 100644 --- a/examples/extended/analysis/AnaEx01/src/AnaEx01DetectorMessenger.cc +++ b/examples/extended/analysis/AnaEx01/src/AnaEx01DetectorMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: AnaEx01DetectorMessenger.cc,v 1.5 2006/06/29 16:33:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01EventAction.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01EventAction.cc index 998309a927..1b313f1ae4 100644 --- a/examples/extended/analysis/AnaEx01/src/AnaEx01EventAction.cc +++ b/examples/extended/analysis/AnaEx01/src/AnaEx01EventAction.cc @@ -25,7 +25,7 @@ // // // $Id: AnaEx01EventAction.cc,v 1.6 2006/06/29 16:33:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01PhysicsList.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01PhysicsList.cc index 556db09360..3e83d8ce1c 100644 --- a/examples/extended/analysis/AnaEx01/src/AnaEx01PhysicsList.cc +++ b/examples/extended/analysis/AnaEx01/src/AnaEx01PhysicsList.cc @@ -25,7 +25,7 @@ // // // $Id: AnaEx01PhysicsList.cc,v 1.5 2006/06/29 16:33:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01PrimaryGeneratorAction.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01PrimaryGeneratorAction.cc index c45e784299..527483008b 100644 --- a/examples/extended/analysis/AnaEx01/src/AnaEx01PrimaryGeneratorAction.cc +++ b/examples/extended/analysis/AnaEx01/src/AnaEx01PrimaryGeneratorAction.cc @@ -25,7 +25,7 @@ // // // $Id: AnaEx01PrimaryGeneratorAction.cc,v 1.5 2006/06/29 16:33:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01PrimaryGeneratorMessenger.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01PrimaryGeneratorMessenger.cc index 0e181119fc..8c3ebff356 100644 --- a/examples/extended/analysis/AnaEx01/src/AnaEx01PrimaryGeneratorMessenger.cc +++ b/examples/extended/analysis/AnaEx01/src/AnaEx01PrimaryGeneratorMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: AnaEx01PrimaryGeneratorMessenger.cc,v 1.5 2006/06/29 16:33:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01RunAction.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01RunAction.cc index fc21581870..c279902ac0 100644 --- a/examples/extended/analysis/AnaEx01/src/AnaEx01RunAction.cc +++ b/examples/extended/analysis/AnaEx01/src/AnaEx01RunAction.cc @@ -25,7 +25,7 @@ // // // $Id: AnaEx01RunAction.cc,v 1.7 2006/06/29 16:34:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01SteppingAction.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01SteppingAction.cc index 05debf3d6a..a1330cd9b3 100644 --- a/examples/extended/analysis/AnaEx01/src/AnaEx01SteppingAction.cc +++ b/examples/extended/analysis/AnaEx01/src/AnaEx01SteppingAction.cc @@ -25,7 +25,7 @@ // // // $Id: AnaEx01SteppingAction.cc,v 1.7 2006/06/29 16:34:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01SteppingVerbose.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01SteppingVerbose.cc index 7ef788a894..afa450f92d 100644 --- a/examples/extended/analysis/AnaEx01/src/AnaEx01SteppingVerbose.cc +++ b/examples/extended/analysis/AnaEx01/src/AnaEx01SteppingVerbose.cc @@ -25,7 +25,7 @@ // // // $Id: AnaEx01SteppingVerbose.cc,v 1.7 2006/06/29 16:34:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/examples/extended/biasing/B01/exampleB01.cc b/examples/extended/biasing/B01/exampleB01.cc index 0f973afb88..5d1ec9eda9 100644 --- a/examples/extended/biasing/B01/exampleB01.cc +++ b/examples/extended/biasing/B01/exampleB01.cc @@ -25,7 +25,7 @@ // // // $Id: exampleB01.cc,v 1.23 2006/06/29 16:34:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/biasing/B01/exampleB01.out b/examples/extended/biasing/B01/exampleB01.out index e5876d0802..c9a3f862bf 100644 --- a/examples/extended/biasing/B01/exampleB01.out +++ b/examples/extended/biasing/B01/exampleB01.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -101,7 +101,7 @@ DoIt Vector: ================================================ conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.022 MeV to 100 GeV in 100 bins. @@ -111,6 +111,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model msc: Model variant of multiple scattering for e- Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -140,7 +141,7 @@ eBrem: tables are built for e+ Total cross sections from a parametrisation based on the EEDL data library. Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -221,26 +222,26 @@ hIoni: tables are built for pi- Bether-Bloch model for Escaled > 0.297504 MeV, ICRU49 parametrisation for protons below. Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 Volume name | Importance| Tr.Entering| Population| Collisions| Coll*WGT| NumWGTedE| FluxWGTedE| Av.Tr.WGT| -cell_01_rep:0............ | 1 | 113 | 133 | 113 | 113 | 8.4732787 | 9.1010333 | 1 | -cell_02_rep:0............ | 2 | 72 | 163 | 200 | 100 | 4.323174 | 8.705577 | 1 | -cell_03_rep:0............ | 4 | 85 | 178 | 221 | 55.25 | 5.7181907 | 8.1739911 | 1 | -cell_04_rep:0............ | 8 | 104 | 214 | 250 | 31.25 | 6.2701176 | 8.0477481 | 1 | -cell_05_rep:0............ | 16 | 111 | 235 | 288 | 18 | 6.2358927 | 7.7232756 | 1 | -cell_06_rep:0............ | 32 | 122 | 255 | 283 | 8.84375 | 6.5801742 | 7.7215434 | 1 | -cell_07_rep:0............ | 64 | 130 | 280 | 375 | 5.859375 | 5.651861 | 7.0303223 | 1 | -cell_08_rep:0............ | 128 | 130 | 267 | 335 | 2.6171875 | 5.6877812 | 7.0891822 | 1 | -cell_09_rep:0............ | 256 | 144 | 297 | 475 | 1.8554688 | 4.9052988 | 6.4262423 | 1 | -cell_10_rep:0............ | 512 | 156 | 327 | 464 | 0.90625 | 4.9657552 | 6.5502973 | 1 | -cell_11_rep:0............ | 1024 | 189 | 373 | 541 | 0.52832031 | 0.036775942 | 6.4250402 | 1 | -cell_12_rep:0............ | 2048 | 202 | 443 | 596 | 0.29101562 | 4.9093467 | 6.3738032 | 1 | -cell_13_rep:0............ | 4096 | 226 | 459 | 636 | 0.15527344 | 3.7290047 | 5.8188979 | 1 | -cell_14_rep:0............ | 8192 | 269 | 554 | 935 | 0.11413574 | 4.0605216 | 5.6795257 | 1 | -cell_15_rep:0............ | 16384 | 300 | 614 | 1095 | 0.066833496 | 0.089155765 | 5.1283107 | 1 | -cell_16_rep:0............ | 32768 | 371 | 749 | 1427 | 0.043548584 | 0.042230138 | 4.713344 | 1 | -cell_17_rep:0............ | 65536 | 382 | 779 | 1549 | 0.023635864 | 2.7935776 | 4.1630758 | 1 | -cell_18_rep:0............ | 131072 | 312 | 719 | 1516 | 0.011566162 | 0.14353462 | 4.1215867 | 1 | -rest_rep:0............... | 131072 | 333 | 333 | 0 | 0 | 0 | 0 | 0 | -shieldWorld_rep:0........ | 1 | 15 | 114 | 0 | 0 | 10 | 10 | 1 | +cell_01_rep:0............ | 1 | 106 | 127 | 165 | 165 | 4.7833307 | 8.4257685 | 1 | +cell_02_rep:0............ | 2 | 79 | 170 | 150 | 75 | 8.3770212 | 8.9611837 | 1 | +cell_03_rep:0............ | 4 | 120 | 257 | 292 | 73 | 0.030422242 | 8.1225467 | 1 | +cell_04_rep:0............ | 8 | 118 | 267 | 325 | 40.625 | 6.2788095 | 7.9670281 | 1 | +cell_05_rep:0............ | 16 | 112 | 236 | 298 | 18.625 | 0.066754216 | 7.5980323 | 1 | +cell_06_rep:0............ | 32 | 124 | 264 | 342 | 10.6875 | 5.2637216 | 7.6806894 | 1 | +cell_07_rep:0............ | 64 | 161 | 322 | 438 | 6.84375 | 4.9595564 | 7.2063026 | 1 | +cell_08_rep:0............ | 128 | 205 | 412 | 532 | 4.15625 | 4.0919226 | 6.9949884 | 1 | +cell_09_rep:0............ | 256 | 236 | 482 | 650 | 2.5390625 | 0.11583494 | 6.6067148 | 1 | +cell_10_rep:0............ | 512 | 267 | 549 | 748 | 1.4609375 | 4.0989275 | 6.2777243 | 1 | +cell_11_rep:0............ | 1024 | 325 | 648 | 993 | 0.96972656 | 0.64376933 | 5.8542585 | 1 | +cell_12_rep:0............ | 2048 | 374 | 733 | 1233 | 0.60205078 | 0.13579459 | 5.5076248 | 1 | +cell_13_rep:0............ | 4096 | 412 | 832 | 1361 | 0.33227539 | 3.5686894 | 5.4720131 | 1 | +cell_14_rep:0............ | 8192 | 438 | 897 | 1402 | 0.17114258 | 0.22945117 | 5.496985 | 1 | +cell_15_rep:0............ | 16384 | 476 | 990 | 1656 | 0.10107422 | 0.80759575 | 5.4423419 | 1 | +cell_16_rep:0............ | 32768 | 539 | 1059 | 1738 | 0.053039551 | 3.8380076 | 5.1041349 | 1 | +cell_17_rep:0............ | 65536 | 579 | 1201 | 1995 | 0.030441284 | 0.1904835 | 4.9379711 | 1 | +cell_18_rep:0............ | 131072 | 501 | 1179 | 2198 | 0.016769409 | 0.54009342 | 4.7248222 | 1 | +rest_rep:0............... | 131072 | 548 | 548 | 0 | 0 | 0 | 0 | 0 | +shieldWorld_rep:0........ | 1 | 11 | 110 | 0 | 0 | 10 | 10 | 1 | === G4ProcessPlacer::RemoveProcess: for: neutron ProcessName: MassImportanceProcess, will be removed! The initial Vectors: diff --git a/examples/extended/biasing/B01/include/B01DetectorConstruction.hh b/examples/extended/biasing/B01/include/B01DetectorConstruction.hh index c9bb89db47..0150417fc6 100644 --- a/examples/extended/biasing/B01/include/B01DetectorConstruction.hh +++ b/examples/extended/biasing/B01/include/B01DetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: B01DetectorConstruction.hh,v 1.7 2006/06/29 16:34:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef B01DetectorConstruction_hh diff --git a/examples/extended/biasing/B01/src/B01DetectorConstruction.cc b/examples/extended/biasing/B01/src/B01DetectorConstruction.cc index 707bb7cea4..ede40d21b3 100644 --- a/examples/extended/biasing/B01/src/B01DetectorConstruction.cc +++ b/examples/extended/biasing/B01/src/B01DetectorConstruction.cc @@ -25,7 +25,7 @@ // // // $Id: B01DetectorConstruction.cc,v 1.17 2006/06/29 16:34:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4Types.hh" diff --git a/examples/extended/biasing/B01/src/B01PhysicsList.cc b/examples/extended/biasing/B01/src/B01PhysicsList.cc index 5bc07265e8..1d2dd6be95 100644 --- a/examples/extended/biasing/B01/src/B01PhysicsList.cc +++ b/examples/extended/biasing/B01/src/B01PhysicsList.cc @@ -25,7 +25,7 @@ // // // $Id: B01PhysicsList.cc,v 1.6 2006/06/29 16:34:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "globals.hh" diff --git a/examples/extended/biasing/B01/src/B01PrimaryGeneratorAction.cc b/examples/extended/biasing/B01/src/B01PrimaryGeneratorAction.cc index 422b77e432..85d02fda27 100644 --- a/examples/extended/biasing/B01/src/B01PrimaryGeneratorAction.cc +++ b/examples/extended/biasing/B01/src/B01PrimaryGeneratorAction.cc @@ -25,7 +25,7 @@ // // // $Id: B01PrimaryGeneratorAction.cc,v 1.8 2006/06/29 16:34:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "globals.hh" diff --git a/examples/extended/biasing/B02/exampleB02.cc b/examples/extended/biasing/B02/exampleB02.cc index 1f1bbd44c0..cf7901cbcd 100644 --- a/examples/extended/biasing/B02/exampleB02.cc +++ b/examples/extended/biasing/B02/exampleB02.cc @@ -25,7 +25,7 @@ // // // $Id: exampleB02.cc,v 1.20 2006/06/29 16:34:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/biasing/B02/exampleB02.out b/examples/extended/biasing/B02/exampleB02.out index b74f4821e2..ea6b8b9e43 100644 --- a/examples/extended/biasing/B02/exampleB02.out +++ b/examples/extended/biasing/B02/exampleB02.out @@ -1,5 +1,5 @@ ********************************************** - Geant4 version $Name: geant4-08-01 $ + Geant4 version $Name: geant4-08-02 $ (31-Jul-2002) Copyright : Geant4 Collaboration ********************************************** diff --git a/examples/extended/biasing/B02/include/B02CellScorer.hh b/examples/extended/biasing/B02/include/B02CellScorer.hh index 32427ffa5c..a1b7ea8367 100644 --- a/examples/extended/biasing/B02/include/B02CellScorer.hh +++ b/examples/extended/biasing/B02/include/B02CellScorer.hh @@ -25,7 +25,7 @@ // // // $Id: B02CellScorer.hh,v 1.3 2006/06/29 16:34:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class B02CellScorer diff --git a/examples/extended/biasing/B02/include/B02CellScorerStore.hh b/examples/extended/biasing/B02/include/B02CellScorerStore.hh index e51a559375..f8da51d0aa 100644 --- a/examples/extended/biasing/B02/include/B02CellScorerStore.hh +++ b/examples/extended/biasing/B02/include/B02CellScorerStore.hh @@ -25,7 +25,7 @@ // // // $Id: B02CellScorerStore.hh,v 1.3 2006/06/29 16:34:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class B02CellScorerStore diff --git a/examples/extended/biasing/B02/include/B02DetectorConstruction.hh b/examples/extended/biasing/B02/include/B02DetectorConstruction.hh index b73aeb125b..a474b886e6 100644 --- a/examples/extended/biasing/B02/include/B02DetectorConstruction.hh +++ b/examples/extended/biasing/B02/include/B02DetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: B02DetectorConstruction.hh,v 1.4 2006/06/29 16:34:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef B02DetectorConstruction_hh diff --git a/examples/extended/biasing/B02/include/B02ImportanceDetectorConstruction.hh b/examples/extended/biasing/B02/include/B02ImportanceDetectorConstruction.hh index 622c352caa..b6b54b4427 100644 --- a/examples/extended/biasing/B02/include/B02ImportanceDetectorConstruction.hh +++ b/examples/extended/biasing/B02/include/B02ImportanceDetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: B02ImportanceDetectorConstruction.hh,v 1.5 2006/06/29 16:34:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef B02ImportanceDetectorConstruction_hh diff --git a/examples/extended/biasing/B02/include/B02ScoringDetectorConstruction.hh b/examples/extended/biasing/B02/include/B02ScoringDetectorConstruction.hh index 4f06c602cd..2ec5763411 100644 --- a/examples/extended/biasing/B02/include/B02ScoringDetectorConstruction.hh +++ b/examples/extended/biasing/B02/include/B02ScoringDetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: B02ScoringDetectorConstruction.hh,v 1.3 2006/06/29 16:34:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef B02ScoringDetectorConstruction_hh diff --git a/examples/extended/biasing/B02/src/B02CellScorer.cc b/examples/extended/biasing/B02/src/B02CellScorer.cc index 557f6ca459..91c1fc5f1c 100644 --- a/examples/extended/biasing/B02/src/B02CellScorer.cc +++ b/examples/extended/biasing/B02/src/B02CellScorer.cc @@ -25,7 +25,7 @@ // // // $Id: B02CellScorer.cc,v 1.2 2006/06/29 16:34:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/examples/extended/biasing/B02/src/B02CellScorerStore.cc b/examples/extended/biasing/B02/src/B02CellScorerStore.cc index 977df4f14e..07524785d4 100644 --- a/examples/extended/biasing/B02/src/B02CellScorerStore.cc +++ b/examples/extended/biasing/B02/src/B02CellScorerStore.cc @@ -25,7 +25,7 @@ // // // $Id: B02CellScorerStore.cc,v 1.3 2006/06/29 16:34:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/examples/extended/biasing/B02/src/B02DetectorConstruction.cc b/examples/extended/biasing/B02/src/B02DetectorConstruction.cc index 4e752c1377..2d72edcdfc 100644 --- a/examples/extended/biasing/B02/src/B02DetectorConstruction.cc +++ b/examples/extended/biasing/B02/src/B02DetectorConstruction.cc @@ -25,7 +25,7 @@ // // // $Id: B02DetectorConstruction.cc,v 1.12 2006/06/29 16:34:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4Types.hh" #include "globals.hh" diff --git a/examples/extended/biasing/B02/src/B02ImportanceDetectorConstruction.cc b/examples/extended/biasing/B02/src/B02ImportanceDetectorConstruction.cc index 058f535294..4e70afd247 100644 --- a/examples/extended/biasing/B02/src/B02ImportanceDetectorConstruction.cc +++ b/examples/extended/biasing/B02/src/B02ImportanceDetectorConstruction.cc @@ -25,7 +25,7 @@ // // // $Id: B02ImportanceDetectorConstruction.cc,v 1.9 2006/06/29 16:34:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "globals.hh" diff --git a/examples/extended/biasing/B02/src/B02PhysicsList.cc b/examples/extended/biasing/B02/src/B02PhysicsList.cc index 876b1d6020..9829f1de42 100644 --- a/examples/extended/biasing/B02/src/B02PhysicsList.cc +++ b/examples/extended/biasing/B02/src/B02PhysicsList.cc @@ -25,7 +25,7 @@ // // // $Id: B02PhysicsList.cc,v 1.5 2006/06/29 16:34:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "globals.hh" diff --git a/examples/extended/biasing/B02/src/B02PrimaryGeneratorAction.cc b/examples/extended/biasing/B02/src/B02PrimaryGeneratorAction.cc index 759d64883b..575f24c63b 100644 --- a/examples/extended/biasing/B02/src/B02PrimaryGeneratorAction.cc +++ b/examples/extended/biasing/B02/src/B02PrimaryGeneratorAction.cc @@ -25,7 +25,7 @@ // // // $Id: B02PrimaryGeneratorAction.cc,v 1.6 2006/06/29 16:34:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "globals.hh" diff --git a/examples/extended/biasing/B02/src/B02ScoringDetectorConstruction.cc b/examples/extended/biasing/B02/src/B02ScoringDetectorConstruction.cc index 26beafb5c2..1ee15ddd39 100644 --- a/examples/extended/biasing/B02/src/B02ScoringDetectorConstruction.cc +++ b/examples/extended/biasing/B02/src/B02ScoringDetectorConstruction.cc @@ -25,7 +25,7 @@ // // // $Id: B02ScoringDetectorConstruction.cc,v 1.7 2006/06/29 16:34:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "globals.hh" diff --git a/examples/extended/biasing/B03/exampleB03.cc b/examples/extended/biasing/B03/exampleB03.cc index 44e9fbbf86..9799c2c529 100644 --- a/examples/extended/biasing/B03/exampleB03.cc +++ b/examples/extended/biasing/B03/exampleB03.cc @@ -25,7 +25,7 @@ // // // $Id: exampleB03.cc,v 1.12 2006/06/29 16:34:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/biasing/B03/exampleB03.out b/examples/extended/biasing/B03/exampleB03.out index 5d6a8a75e3..a95e963bf5 100644 --- a/examples/extended/biasing/B03/exampleB03.out +++ b/examples/extended/biasing/B03/exampleB03.out @@ -1,5 +1,5 @@ ********************************************** - Geant4 version $Name: geant4-08-01 $ + Geant4 version $Name: geant4-08-02 $ (31-Jul-2002) Copyright : Geant4 Collaboration ********************************************** diff --git a/examples/extended/biasing/B03/include/B03AppBase.hh b/examples/extended/biasing/B03/include/B03AppBase.hh index a5a5b9b2ed..ec765a794d 100644 --- a/examples/extended/biasing/B03/include/B03AppBase.hh +++ b/examples/extended/biasing/B03/include/B03AppBase.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: B03AppBase.hh,v 1.2 2006/06/29 16:35:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- #ifndef B03AppBase_hh diff --git a/examples/extended/biasing/B03/include/B03DetectorConstruction.hh b/examples/extended/biasing/B03/include/B03DetectorConstruction.hh index c57a9a4484..0faeab32c6 100644 --- a/examples/extended/biasing/B03/include/B03DetectorConstruction.hh +++ b/examples/extended/biasing/B03/include/B03DetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: B03DetectorConstruction.hh,v 1.5 2006/06/29 16:35:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef B03DetectorConstruction_hh diff --git a/examples/extended/biasing/B03/include/B03ImportanceDetectorConstruction.hh b/examples/extended/biasing/B03/include/B03ImportanceDetectorConstruction.hh index 32f90405b9..346ac48264 100644 --- a/examples/extended/biasing/B03/include/B03ImportanceDetectorConstruction.hh +++ b/examples/extended/biasing/B03/include/B03ImportanceDetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: B03ImportanceDetectorConstruction.hh,v 1.3 2006/06/29 16:35:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef B03ImportanceDetectorConstruction_hh diff --git a/examples/extended/biasing/B03/include/B03PhysicsList.hh b/examples/extended/biasing/B03/include/B03PhysicsList.hh index 5d661104e4..b5e6a9667c 100644 --- a/examples/extended/biasing/B03/include/B03PhysicsList.hh +++ b/examples/extended/biasing/B03/include/B03PhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: B03PhysicsList.hh,v 1.4 2006/06/29 16:35:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef B03PhysicsList_h diff --git a/examples/extended/biasing/B03/include/B03PrimaryGeneratorAction.hh b/examples/extended/biasing/B03/include/B03PrimaryGeneratorAction.hh index 3b0914ac95..8341fe03de 100644 --- a/examples/extended/biasing/B03/include/B03PrimaryGeneratorAction.hh +++ b/examples/extended/biasing/B03/include/B03PrimaryGeneratorAction.hh @@ -25,7 +25,7 @@ // // // $Id: B03PrimaryGeneratorAction.hh,v 1.4 2006/06/29 16:35:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef B03PrimaryGeneratorAction_hh diff --git a/examples/extended/biasing/B03/setupPI.csh b/examples/extended/biasing/B03/setupPI.csh index d51c346db6..391ea56302 100644 --- a/examples/extended/biasing/B03/setupPI.csh +++ b/examples/extended/biasing/B03/setupPI.csh @@ -1,6 +1,6 @@ # #Id: setupPI.csh,v 1.6 2004/06/19 17:22:46 daquinog Exp $ # ------------------------------------------------------------------- -# GEANT4 tag $Name: geant4-08-01 $ +# GEANT4 tag $Name: geant4-08-02 $ # ------------------------------------------------------------------- # before sourcing this script make sure you have set the diff --git a/examples/extended/biasing/B03/src/B03AppBase.cc b/examples/extended/biasing/B03/src/B03AppBase.cc index 64e2fcd719..5f48cffec6 100644 --- a/examples/extended/biasing/B03/src/B03AppBase.cc +++ b/examples/extended/biasing/B03/src/B03AppBase.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: B03AppBase.cc,v 1.3 2006/06/29 16:35:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- #include "B03AppBase.hh" diff --git a/examples/extended/biasing/B03/src/B03DetectorConstruction.cc b/examples/extended/biasing/B03/src/B03DetectorConstruction.cc index e6009b48af..fa8d99b021 100644 --- a/examples/extended/biasing/B03/src/B03DetectorConstruction.cc +++ b/examples/extended/biasing/B03/src/B03DetectorConstruction.cc @@ -25,7 +25,7 @@ // // // $Id: B03DetectorConstruction.cc,v 1.15 2006/06/29 16:35:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4Types.hh" diff --git a/examples/extended/biasing/B03/src/B03ImportanceDetectorConstruction.cc b/examples/extended/biasing/B03/src/B03ImportanceDetectorConstruction.cc index d2834323f8..c0b1fe49a9 100644 --- a/examples/extended/biasing/B03/src/B03ImportanceDetectorConstruction.cc +++ b/examples/extended/biasing/B03/src/B03ImportanceDetectorConstruction.cc @@ -25,7 +25,7 @@ // // // $Id: B03ImportanceDetectorConstruction.cc,v 1.8 2006/06/29 16:35:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "globals.hh" diff --git a/examples/extended/biasing/B03/src/B03PhysicsList.cc b/examples/extended/biasing/B03/src/B03PhysicsList.cc index fee96c113b..bf1f566578 100644 --- a/examples/extended/biasing/B03/src/B03PhysicsList.cc +++ b/examples/extended/biasing/B03/src/B03PhysicsList.cc @@ -25,7 +25,7 @@ // // // $Id: B03PhysicsList.cc,v 1.5 2006/06/29 16:35:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "globals.hh" diff --git a/examples/extended/biasing/B03/src/B03PrimaryGeneratorAction.cc b/examples/extended/biasing/B03/src/B03PrimaryGeneratorAction.cc index 3b80de7718..c6cd3a447b 100644 --- a/examples/extended/biasing/B03/src/B03PrimaryGeneratorAction.cc +++ b/examples/extended/biasing/B03/src/B03PrimaryGeneratorAction.cc @@ -25,7 +25,7 @@ // // // $Id: B03PrimaryGeneratorAction.cc,v 1.6 2006/06/29 16:35:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "globals.hh" diff --git a/examples/extended/electromagnetic/TestEm0/DirectAccess.cc b/examples/extended/electromagnetic/TestEm0/DirectAccess.cc index 880b59daa6..6b279afe19 100644 --- a/examples/extended/electromagnetic/TestEm0/DirectAccess.cc +++ b/examples/extended/electromagnetic/TestEm0/DirectAccess.cc @@ -25,7 +25,7 @@ // // // $Id: DirectAccess.cc,v 1.2 2006/06/29 16:35:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------ // diff --git a/examples/extended/electromagnetic/TestEm0/History b/examples/extended/electromagnetic/TestEm0/History index 8b8b0d6287..4d785601ac 100644 --- a/examples/extended/electromagnetic/TestEm0/History +++ b/examples/extended/electromagnetic/TestEm0/History @@ -1,4 +1,4 @@ -$Id: History,v 1.7 2006/06/19 10:32:27 maire Exp $ +$Id: History,v 1.11 2006/12/08 16:38:38 maire Exp $ ------------------------------------------------------------------- ========================================================= @@ -15,6 +15,15 @@ track of all tags. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +08-12-06 mma (testem0-V08-01-02) +- correct a cout in BeginOfRun + +16-08-06 mma (testem0-V08-01-01) + +21-07-06 V.Ivant (testem0-V08-01-00) +- open a possibility to use NIST materials additionally to + predefined materials + 17-06-06 mma (testem0-V08-00-04) - compute e- critical energy and Moliere radius diff --git a/examples/extended/electromagnetic/TestEm0/TestEm0.cc b/examples/extended/electromagnetic/TestEm0/TestEm0.cc index 8f279af44c..b878154ac7 100644 --- a/examples/extended/electromagnetic/TestEm0/TestEm0.cc +++ b/examples/extended/electromagnetic/TestEm0/TestEm0.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: TestEm0.cc,v 1.2 2006/06/29 16:35:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: TestEm0.cc,v 1.3 2006/08/17 13:50:45 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm0/TestEm0.in b/examples/extended/electromagnetic/TestEm0/TestEm0.in index 43d58652fe..899d1148f9 100644 --- a/examples/extended/electromagnetic/TestEm0/TestEm0.in +++ b/examples/extended/electromagnetic/TestEm0/TestEm0.in @@ -1,4 +1,4 @@ -# $Id: TestEm0.in,v 1.1 2006/03/18 11:02:14 maire Exp $ +# $Id: TestEm0.in,v 1.2 2006/08/17 16:06:02 maire Exp $ # # Macro file for "TestEm0.cc" # @@ -6,13 +6,12 @@ /run/verbose 0 # /testem/det/setMat Germanium -/testem/phys/setCuts 1 mm /gun/particle gamma /gun/energy 300 keV /run/beamOn # /testem/det/setMat Water -/testem/phys/setCuts 100 um /gun/particle e- /gun/energy 10 MeV +/testem/phys/setCuts 100 um /run/beamOn diff --git a/examples/extended/electromagnetic/TestEm0/TestEm0.out b/examples/extended/electromagnetic/TestEm0/TestEm0.out index 090849212b..262dd6076e 100644 --- a/examples/extended/electromagnetic/TestEm0/TestEm0.out +++ b/examples/extended/electromagnetic/TestEm0/TestEm0.out @@ -1,13 +1,13 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 ************************************************************* -***** Table : Nb of materials = 14 ***** +***** Table : Nb of materials = 15 ***** Material: Air density: 1.290 mg/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 285.161 m ---> Element: Nitrogen (N) Z = 7.0 N = 14.0 A = 14.01 g/mole ElmMassFraction: 70.00 % ElmAbundance 72.71 % @@ -20,6 +20,10 @@ ---> Element: Hydrogen (H) Z = 1.0 N = 1.0 A = 1.01 g/mole ElmMassFraction: 11.21 % ElmAbundance 66.67 % ---> Element: Oxygen (O) Z = 8.0 N = 16.0 A = 16.00 g/mole ElmMassFraction: 88.79 % ElmAbundance 33.33 % + Material: WaterSteam density: 1.000 mg/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 360.925 m + ---> Element: Hydrogen (H) Z = 1.0 N = 1.0 A = 1.01 g/mole ElmMassFraction: 11.21 % ElmAbundance 66.67 % + ---> Element: Oxygen (O) Z = 8.0 N = 16.0 A = 16.00 g/mole ElmMassFraction: 88.79 % ElmAbundance 33.33 % + Material: BGO density: 7.100 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 1.123 cm ---> Element: Oxygen (O) Z = 8.0 N = 16.0 A = 16.00 g/mole ElmMassFraction: 15.41 % ElmAbundance 63.16 % ---> Element: Germanium (Ge) Z = 32.0 N = 72.6 A = 72.59 g/mole ElmMassFraction: 17.48 % ElmAbundance 15.79 % @@ -84,6 +88,7 @@ Index : 0 used in the geometry : Yes recalculation needed : No ------------------------------------------------------------- + e- (10 MeV) in Water (density: 1 g/cm3 ; radiation length: 36.0925 cm ) Range cuts : gamma 100 um e- 100 um diff --git a/examples/extended/electromagnetic/TestEm0/include/DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm0/include/DetectorConstruction.hh index 829f8b4f47..437256a323 100644 --- a/examples/extended/electromagnetic/TestEm0/include/DetectorConstruction.hh +++ b/examples/extended/electromagnetic/TestEm0/include/DetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: DetectorConstruction.hh,v 1.2 2006/06/29 16:35:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm0/include/DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm0/include/DetectorMessenger.hh index 67587b7c3e..5c312fe6af 100644 --- a/examples/extended/electromagnetic/TestEm0/include/DetectorMessenger.hh +++ b/examples/extended/electromagnetic/TestEm0/include/DetectorMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorMessenger.hh,v 1.2 2006/06/29 16:35:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm0/include/PhysListEmStandard.hh b/examples/extended/electromagnetic/TestEm0/include/PhysListEmStandard.hh index df50e4efdb..b46a9ff7b3 100644 --- a/examples/extended/electromagnetic/TestEm0/include/PhysListEmStandard.hh +++ b/examples/extended/electromagnetic/TestEm0/include/PhysListEmStandard.hh @@ -25,7 +25,7 @@ // // // $Id: PhysListEmStandard.hh,v 1.2 2006/06/29 16:35:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm0/include/PhysicsList.hh b/examples/extended/electromagnetic/TestEm0/include/PhysicsList.hh index 4b4170912b..3cfb4ddd45 100644 --- a/examples/extended/electromagnetic/TestEm0/include/PhysicsList.hh +++ b/examples/extended/electromagnetic/TestEm0/include/PhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: PhysicsList.hh,v 1.2 2006/06/29 16:35:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... // diff --git a/examples/extended/electromagnetic/TestEm0/include/PhysicsListMessenger.hh b/examples/extended/electromagnetic/TestEm0/include/PhysicsListMessenger.hh index 47093b15c6..c8a0ee2bcc 100644 --- a/examples/extended/electromagnetic/TestEm0/include/PhysicsListMessenger.hh +++ b/examples/extended/electromagnetic/TestEm0/include/PhysicsListMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListMessenger.hh,v 1.2 2006/06/29 16:35:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm0/include/PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm0/include/PrimaryGeneratorAction.hh index 3460c97d50..7519768f44 100644 --- a/examples/extended/electromagnetic/TestEm0/include/PrimaryGeneratorAction.hh +++ b/examples/extended/electromagnetic/TestEm0/include/PrimaryGeneratorAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorAction.hh,v 1.2 2006/06/29 16:35:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm0/include/RunAction.hh b/examples/extended/electromagnetic/TestEm0/include/RunAction.hh index ac79c970ca..79195cdd72 100644 --- a/examples/extended/electromagnetic/TestEm0/include/RunAction.hh +++ b/examples/extended/electromagnetic/TestEm0/include/RunAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RunAction.hh,v 1.3 2006/06/29 16:35:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm0/src/DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm0/src/DetectorConstruction.cc index b411800852..20e6cef757 100644 --- a/examples/extended/electromagnetic/TestEm0/src/DetectorConstruction.cc +++ b/examples/extended/electromagnetic/TestEm0/src/DetectorConstruction.cc @@ -25,8 +25,8 @@ // // -// $Id: DetectorConstruction.cc,v 1.5 2006/06/29 16:35:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: DetectorConstruction.cc,v 1.9 2006/12/08 16:38:38 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // @@ -37,6 +37,7 @@ #include "DetectorMessenger.hh" #include "G4Material.hh" +#include "G4NistManager.hh" #include "G4Box.hh" #include "G4LogicalVolume.hh" #include "G4PVPlacement.hh" @@ -109,6 +110,11 @@ void DetectorConstruction::DefineMaterials() ///H2O->SetChemicalFormula("H_2O"); H2O->GetIonisation()->SetMeanExcitationEnergy(75.0*eV); + G4Material* steam = + new G4Material("WaterSteam", density= 1.0*mg/cm3, ncomponents=1); + steam->AddMaterial(H2O, fractionmass=1.); + steam->GetIonisation()->SetMeanExcitationEnergy(71.6*eV); + G4Material* BGO = new G4Material("BGO", density= 7.10*g/cm3, ncomponents=3); BGO->AddElement(O , natoms=12); @@ -125,7 +131,7 @@ void DetectorConstruction::DefineMaterials() new G4Material("Tungsten" , z=74., a=183.85*g/mole, density= 19.30*g/cm3); new G4Material("Lead" , z=82., a=207.19*g/mole, density= 11.35*g/cm3); new G4Material("Uranium" , z=92., a=238.03*g/mole, density= 18.95*g/cm3); - + G4cout << *(G4Material::GetMaterialTable()) << G4endl; } @@ -140,18 +146,18 @@ G4VPhysicalVolume* DetectorConstruction::ConstructVolumes() G4LogicalVolumeStore::GetInstance()->Clean(); G4SolidStore::GetInstance()->Clean(); - G4Box* - sBox = new G4Box("Container", //its name - BoxSize/2,BoxSize/2,BoxSize/2); //its dimensions + G4Box* + sBox = new G4Box("Container", //its name + BoxSize/2,BoxSize/2,BoxSize/2); //its dimensions G4LogicalVolume* - lBox = new G4LogicalVolume(sBox, //its shape - aMaterial, //its material - aMaterial->GetName()); //its name + lBox = new G4LogicalVolume(sBox, //its shape + aMaterial, //its material + aMaterial->GetName()); //its name pBox = new G4PVPlacement(0, //no rotation G4ThreeVector(), //at (0,0,0) - lBox, //its logical volume + lBox, //its logical volume aMaterial->GetName(), //its name 0, //its mother volume false, //no boolean operation @@ -176,8 +182,10 @@ void DetectorConstruction::PrintParameters() void DetectorConstruction::SetMaterial(G4String materialChoice) { - // search the material by its name - G4Material* pttoMaterial = G4Material::GetMaterial(materialChoice); + // search the material by its name, or build it from nist data base + G4Material* pttoMaterial = + G4NistManager::Instance()->FindOrBuildMaterial(materialChoice); + if (pttoMaterial) { aMaterial = pttoMaterial; if (pBox) G4RunManager::GetRunManager() diff --git a/examples/extended/electromagnetic/TestEm0/src/DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm0/src/DetectorMessenger.cc index 38970fff5e..5d4075d00e 100644 --- a/examples/extended/electromagnetic/TestEm0/src/DetectorMessenger.cc +++ b/examples/extended/electromagnetic/TestEm0/src/DetectorMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorMessenger.cc,v 1.2 2006/06/29 16:35:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm0/src/PhysListEmStandard.cc b/examples/extended/electromagnetic/TestEm0/src/PhysListEmStandard.cc index 1420a9a154..bfbeab6ad9 100644 --- a/examples/extended/electromagnetic/TestEm0/src/PhysListEmStandard.cc +++ b/examples/extended/electromagnetic/TestEm0/src/PhysListEmStandard.cc @@ -25,7 +25,7 @@ // // // $Id: PhysListEmStandard.cc,v 1.2 2006/06/29 16:35:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm0/src/PhysicsList.cc b/examples/extended/electromagnetic/TestEm0/src/PhysicsList.cc index 9cc7384714..b554fe7d54 100644 --- a/examples/extended/electromagnetic/TestEm0/src/PhysicsList.cc +++ b/examples/extended/electromagnetic/TestEm0/src/PhysicsList.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: PhysicsList.cc,v 1.4 2006/06/29 16:35:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysicsList.cc,v 1.5 2006/08/17 13:50:45 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm0/src/PhysicsListMessenger.cc b/examples/extended/electromagnetic/TestEm0/src/PhysicsListMessenger.cc index b401e59c92..d3a5c2ba30 100644 --- a/examples/extended/electromagnetic/TestEm0/src/PhysicsListMessenger.cc +++ b/examples/extended/electromagnetic/TestEm0/src/PhysicsListMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListMessenger.cc,v 1.2 2006/06/29 16:35:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm0/src/PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm0/src/PrimaryGeneratorAction.cc index ef45ddb568..a134ddd1fc 100644 --- a/examples/extended/electromagnetic/TestEm0/src/PrimaryGeneratorAction.cc +++ b/examples/extended/electromagnetic/TestEm0/src/PrimaryGeneratorAction.cc @@ -25,7 +25,7 @@ // // // $Id: PrimaryGeneratorAction.cc,v 1.2 2006/06/29 16:35:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm0/src/RunAction.cc b/examples/extended/electromagnetic/TestEm0/src/RunAction.cc index e1818d2a14..3ff818400a 100644 --- a/examples/extended/electromagnetic/TestEm0/src/RunAction.cc +++ b/examples/extended/electromagnetic/TestEm0/src/RunAction.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: RunAction.cc,v 1.5 2006/06/29 16:36:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: RunAction.cc,v 1.9 2006/12/08 16:38:38 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -190,7 +190,8 @@ void RunAction::BeginOfRunAction(const G4Run*) if (charge == 0.) { G4cout.precision(prec); - G4cout << "\n-------------------------------------------------------------\n"; + G4cout << "\n-------------------------------------------------------------\n" + << G4endl; return; } diff --git a/examples/extended/electromagnetic/TestEm1/GNUmakefile b/examples/extended/electromagnetic/TestEm1/GNUmakefile index 0197f433e0..e8430391df 100644 --- a/examples/extended/electromagnetic/TestEm1/GNUmakefile +++ b/examples/extended/electromagnetic/TestEm1/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.12 2004/07/23 15:39:13 maire Exp $ +# $Id: GNUmakefile,v 1.13 2006/10/19 17:24:12 maire Exp $ # -------------------------------------------------------------- # GNUmakefile for examples module. Gabriele Cosmo, 06/04/98. # -------------------------------------------------------------- @@ -25,7 +25,7 @@ include $(G4INSTALL)/config/architecture.gmk ifdef G4ANALYSIS_USE # for the aida-config command see the README file CPPFLAGS += `aida-config --include` - LDFLAGS += `aida-config --lib` + LOADLIBS += `aida-config --lib` endif include $(G4INSTALL)/config/binmake.gmk diff --git a/examples/extended/electromagnetic/TestEm1/History b/examples/extended/electromagnetic/TestEm1/History index 8a2376a3ac..48fe22936c 100644 --- a/examples/extended/electromagnetic/TestEm1/History +++ b/examples/extended/electromagnetic/TestEm1/History @@ -1,4 +1,4 @@ -$Id: History,v 1.76 2006/05/19 12:36:43 maire Exp $ +$Id: History,v 1.77 2006/10/19 17:24:12 maire Exp $ ------------------------------------------------------------------- ========================================================= @@ -15,6 +15,10 @@ track of all tags. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +19-10-06 mma (testem1-V08-01-00) +- GNUmakefile : LOADLIBS +- remove PhysicsLists 52 and 71 + 19-05-06 mma (testem1-V08-00-04) - update README diff --git a/examples/extended/electromagnetic/TestEm1/TestEm1.cc b/examples/extended/electromagnetic/TestEm1/TestEm1.cc index 8b5adac2ea..9b440aa88e 100644 --- a/examples/extended/electromagnetic/TestEm1/TestEm1.cc +++ b/examples/extended/electromagnetic/TestEm1/TestEm1.cc @@ -25,7 +25,7 @@ // // // $Id: TestEm1.cc,v 1.14 2006/06/29 16:36:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm1/TestEm1.out b/examples/extended/electromagnetic/TestEm1/TestEm1.out index 487f01e3ef..9f7853d6b2 100644 --- a/examples/extended/electromagnetic/TestEm1/TestEm1.out +++ b/examples/extended/electromagnetic/TestEm1/TestEm1.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -73,17 +73,13 @@ Registered model factories: drawByCharge drawByParticleID drawByOriginVolume - -Registered models: - None + drawByAttribute Registered filter factories: chargeFilter particleFilter originVolumeFilter - -Registered filters: - None + attributeFilter /run/verbose 2 # @@ -120,6 +116,7 @@ PhysicsList::SetCuts:CutLength : 1 mm /run/beamOn 2000 phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV Sampling according Klein-Nishina model @@ -127,7 +124,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.022 MeV to 100 GeV in 100 bins. @@ -161,7 +158,7 @@ eBrem: tables are built for e+ Total cross sections from a parametrisation based on the EEDL data library. Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -289,7 +286,7 @@ Start Run processing. Run terminated. Run Summary Number of events processed : 2000 - User=88.64s Real=125.25s Sys=29.48s + User=93.45s Real=229.21s Sys=10.12s ======================== run summary ====================== @@ -297,29 +294,29 @@ Run Summary ============================================================ - total energy deposit: 99.783 MeV + total energy deposit: 99.778 MeV - nb tracks/event neutral: 27.951 charged: 148.47 - nb steps/event neutral: 141.41 charged: 363.77 + nb tracks/event neutral: 27.852 charged: 148.23 + nb steps/event neutral: 141.16 charged: 360.34 nb of process calls per event: eBrem eIoni compt phot mscTransportation conv annihil - 26.174 188.17 113.46 25.501 147.96 0.9905 1.4625 1.463 + 26.195 187.84 113.31 25.441 144.89 0.999 1.4155 1.416 --------------------------------------------------------- Primary particle : - true Range = 11.121 cm rms = 3.8093 cm - proj Range = 9.5817 cm rms = 3.5013 cm - proj/true = 0.86158 - transverse dispersion at end = 1.8005 cm - mass true Range from simulation = 30.027 g/cm2 + true Range = 11.117 cm rms = 3.8519 cm + proj Range = 9.5829 cm rms = 3.5673 cm + proj/true = 0.862 + transverse dispersion at end = 1.7458 cm + mass true Range from simulation = 30.016 g/cm2 from PhysicsTable (csda range) = 31.791 g/cm2 --------------------------------------------------------- --------- Ranecu engine status --------- Initial seed (index) = 0 - Current couple of seeds = 486808439, 1322415313 + Current couple of seeds = 1518067820, 1468624748 ---------------------------------------- # /process/eLoss/verbose 0 @@ -347,7 +344,7 @@ Index : 0 used in the geometry : Yes recalculation needed : No --------- Ranecu engine status --------- Initial seed (index) = 0 - Current couple of seeds = 486808439, 1322415313 + Current couple of seeds = 1518067820, 1468624748 ---------------------------------------- Start Run processing. @@ -355,7 +352,7 @@ Start Run processing. Run terminated. Run Summary Number of events processed : 2000 - User=175.77s Real=232.34s Sys=49.85s + User=180.14s Real=317.87s Sys=17.19s ======================== run summary ====================== @@ -363,29 +360,29 @@ Run Summary ============================================================ - total energy deposit: 99.793 MeV + total energy deposit: 99.804 MeV - nb tracks/event neutral: 36.393 charged: 290.7 - nb steps/event neutral: 146.05 charged: 775.79 + nb tracks/event neutral: 36.715 charged: 292.17 + nb steps/event neutral: 148.23 charged: 774.58 nb of process calls per event: - eIoni eBrem msc phot compt conv annihilTransportation - 449.81 34.605 289.96 34.055 109.65 1.397 1.3975 0.949 + eIoni eBrem msc phot conv annihil comptTransportation + 450.68 34.889 287.6 34.344 1.414 1.415 111.52 0.965 --------------------------------------------------------- Primary particle : - true Range = 11.149 cm rms = 3.8924 cm - proj Range = 9.5626 cm rms = 3.5687 cm - proj/true = 0.85772 - transverse dispersion at end = 1.9027 cm - mass true Range from simulation = 30.102 g/cm2 + true Range = 11.099 cm rms = 3.8352 cm + proj Range = 9.6044 cm rms = 3.546 cm + proj/true = 0.86534 + transverse dispersion at end = 1.7575 cm + mass true Range from simulation = 29.967 g/cm2 from PhysicsTable (csda range) = 31.791 g/cm2 --------------------------------------------------------- --------- Ranecu engine status --------- Initial seed (index) = 0 - Current couple of seeds = 763249003, 2053971629 + Current couple of seeds = 2000278172, 2144462017 ---------------------------------------- Graphics systems deleted. Visualization Manager deleting... @@ -395,7 +392,9 @@ UserRunAction deleted. UserPrimaryGenerator deleted. G4 kernel has come to Quit state. EventManager deleted. +Default detector region deleted. UImanager deleted. +Units table cleared. StateManager deleted. RunManagerKernel is deleted. RunManager is deleting. diff --git a/examples/extended/electromagnetic/TestEm1/include/DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm1/include/DetectorConstruction.hh index b1fe0e8e6f..b7487ac6bf 100644 --- a/examples/extended/electromagnetic/TestEm1/include/DetectorConstruction.hh +++ b/examples/extended/electromagnetic/TestEm1/include/DetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: DetectorConstruction.hh,v 1.2 2006/06/29 16:36:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm1/include/DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm1/include/DetectorMessenger.hh index 8b64e50eb8..751d6571e7 100644 --- a/examples/extended/electromagnetic/TestEm1/include/DetectorMessenger.hh +++ b/examples/extended/electromagnetic/TestEm1/include/DetectorMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorMessenger.hh,v 1.3 2006/06/29 16:36:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm1/include/EventAction.hh b/examples/extended/electromagnetic/TestEm1/include/EventAction.hh index 29e5789ac0..9c59a34f4c 100644 --- a/examples/extended/electromagnetic/TestEm1/include/EventAction.hh +++ b/examples/extended/electromagnetic/TestEm1/include/EventAction.hh @@ -25,7 +25,7 @@ // // // $Id: EventAction.hh,v 1.3 2006/06/29 16:36:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm1/include/EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm1/include/EventActionMessenger.hh index 9e1dfb3e1a..855ae13f11 100644 --- a/examples/extended/electromagnetic/TestEm1/include/EventActionMessenger.hh +++ b/examples/extended/electromagnetic/TestEm1/include/EventActionMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventActionMessenger.hh,v 1.3 2006/06/29 16:36:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm1/include/HistoManager.hh b/examples/extended/electromagnetic/TestEm1/include/HistoManager.hh index ada58ada4a..483a0ecc75 100644 --- a/examples/extended/electromagnetic/TestEm1/include/HistoManager.hh +++ b/examples/extended/electromagnetic/TestEm1/include/HistoManager.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoManager.hh,v 1.5 2006/06/29 16:36:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm1/include/HistoMessenger.hh b/examples/extended/electromagnetic/TestEm1/include/HistoMessenger.hh index bfba8260bd..6df141e40d 100644 --- a/examples/extended/electromagnetic/TestEm1/include/HistoMessenger.hh +++ b/examples/extended/electromagnetic/TestEm1/include/HistoMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoMessenger.hh,v 1.3 2006/06/29 16:36:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm1/include/PhysListEmLivermore.hh b/examples/extended/electromagnetic/TestEm1/include/PhysListEmLivermore.hh index fee0daed13..73a42fa807 100644 --- a/examples/extended/electromagnetic/TestEm1/include/PhysListEmLivermore.hh +++ b/examples/extended/electromagnetic/TestEm1/include/PhysListEmLivermore.hh @@ -25,7 +25,7 @@ // // // $Id: PhysListEmLivermore.hh,v 1.2 2006/06/29 16:36:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm1/include/PhysListEmPenelope.hh b/examples/extended/electromagnetic/TestEm1/include/PhysListEmPenelope.hh index 052799553c..2de175d198 100644 --- a/examples/extended/electromagnetic/TestEm1/include/PhysListEmPenelope.hh +++ b/examples/extended/electromagnetic/TestEm1/include/PhysListEmPenelope.hh @@ -25,7 +25,7 @@ // // // $Id: PhysListEmPenelope.hh,v 1.2 2006/06/29 16:36:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm1/include/PhysListEmStandard.hh b/examples/extended/electromagnetic/TestEm1/include/PhysListEmStandard.hh index d84a5202d4..a5824c94f3 100644 --- a/examples/extended/electromagnetic/TestEm1/include/PhysListEmStandard.hh +++ b/examples/extended/electromagnetic/TestEm1/include/PhysListEmStandard.hh @@ -25,7 +25,7 @@ // // // $Id: PhysListEmStandard.hh,v 1.4 2006/06/29 16:36:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm1/include/PhysicsList.hh b/examples/extended/electromagnetic/TestEm1/include/PhysicsList.hh index 4456f4ab70..2b4ea9a4ce 100644 --- a/examples/extended/electromagnetic/TestEm1/include/PhysicsList.hh +++ b/examples/extended/electromagnetic/TestEm1/include/PhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: PhysicsList.hh,v 1.4 2006/06/29 16:36:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... // diff --git a/examples/extended/electromagnetic/TestEm1/include/PhysicsListMessenger.hh b/examples/extended/electromagnetic/TestEm1/include/PhysicsListMessenger.hh index 1dbf770814..247d1b9ade 100644 --- a/examples/extended/electromagnetic/TestEm1/include/PhysicsListMessenger.hh +++ b/examples/extended/electromagnetic/TestEm1/include/PhysicsListMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListMessenger.hh,v 1.3 2006/06/29 16:36:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm1/include/PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm1/include/PrimaryGeneratorAction.hh index 2be25409aa..5ad9f4c22a 100644 --- a/examples/extended/electromagnetic/TestEm1/include/PrimaryGeneratorAction.hh +++ b/examples/extended/electromagnetic/TestEm1/include/PrimaryGeneratorAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorAction.hh,v 1.3 2006/06/29 16:36:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm1/include/PrimaryGeneratorMessenger.hh b/examples/extended/electromagnetic/TestEm1/include/PrimaryGeneratorMessenger.hh index 013e69e1df..095c9d0307 100644 --- a/examples/extended/electromagnetic/TestEm1/include/PrimaryGeneratorMessenger.hh +++ b/examples/extended/electromagnetic/TestEm1/include/PrimaryGeneratorMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorMessenger.hh,v 1.3 2006/06/29 16:36:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm1/include/ProcessesCount.hh b/examples/extended/electromagnetic/TestEm1/include/ProcessesCount.hh index af0df7a520..eb10190e68 100644 --- a/examples/extended/electromagnetic/TestEm1/include/ProcessesCount.hh +++ b/examples/extended/electromagnetic/TestEm1/include/ProcessesCount.hh @@ -25,7 +25,7 @@ // // // $Id: ProcessesCount.hh,v 1.10 2006/06/29 16:36:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm1/include/RunAction.hh b/examples/extended/electromagnetic/TestEm1/include/RunAction.hh index 5ec4bbb362..d3358a0f77 100644 --- a/examples/extended/electromagnetic/TestEm1/include/RunAction.hh +++ b/examples/extended/electromagnetic/TestEm1/include/RunAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RunAction.hh,v 1.8 2006/06/29 16:36:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm1/include/StepMax.hh b/examples/extended/electromagnetic/TestEm1/include/StepMax.hh index 18fab9c68a..4c05019e9c 100644 --- a/examples/extended/electromagnetic/TestEm1/include/StepMax.hh +++ b/examples/extended/electromagnetic/TestEm1/include/StepMax.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMax.hh,v 1.2 2006/06/29 16:36:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm1/include/StepMaxMessenger.hh b/examples/extended/electromagnetic/TestEm1/include/StepMaxMessenger.hh index 0f0cfec3fc..1b9605f461 100644 --- a/examples/extended/electromagnetic/TestEm1/include/StepMaxMessenger.hh +++ b/examples/extended/electromagnetic/TestEm1/include/StepMaxMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMaxMessenger.hh,v 1.2 2006/06/29 16:36:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm1/include/SteppingAction.hh b/examples/extended/electromagnetic/TestEm1/include/SteppingAction.hh index 82ff362d9c..35cfbf7ae9 100644 --- a/examples/extended/electromagnetic/TestEm1/include/SteppingAction.hh +++ b/examples/extended/electromagnetic/TestEm1/include/SteppingAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingAction.hh,v 1.4 2006/06/29 16:36:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm1/include/SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm1/include/SteppingVerbose.hh index cee9937231..da6e6c3cdf 100644 --- a/examples/extended/electromagnetic/TestEm1/include/SteppingVerbose.hh +++ b/examples/extended/electromagnetic/TestEm1/include/SteppingVerbose.hh @@ -25,7 +25,7 @@ // // // $Id: SteppingVerbose.hh,v 1.2 2006/06/29 16:36:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // This class manages the verbose outputs in G4SteppingManager. // It inherits from G4SteppingVerbose. diff --git a/examples/extended/electromagnetic/TestEm1/include/TrackingAction.hh b/examples/extended/electromagnetic/TestEm1/include/TrackingAction.hh index 1a43b8b675..832c4a32e1 100644 --- a/examples/extended/electromagnetic/TestEm1/include/TrackingAction.hh +++ b/examples/extended/electromagnetic/TestEm1/include/TrackingAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TrackingAction.hh,v 1.4 2006/06/29 16:36:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm1/range.mac b/examples/extended/electromagnetic/TestEm1/range.mac index bc3ab48063..76a77b1ef3 100644 --- a/examples/extended/electromagnetic/TestEm1/range.mac +++ b/examples/extended/electromagnetic/TestEm1/range.mac @@ -1,4 +1,4 @@ -# $Id: range.mac,v 1.9 2006/01/25 15:28:27 maire Exp $ +# $Id: range.mac,v 1.10 2006/10/19 17:24:12 maire Exp $ # # Macro file for "TestEm1.cc" # @@ -32,6 +32,6 @@ /testem/histo/setFileType hbook /testem/histo/setHisto 1 150 70 85 mm # csda range # -/testem/event/printModulo 2000 +/testem/event/printModulo 4000 # -/run/beamOn 20000 +/run/beamOn 40000 diff --git a/examples/extended/electromagnetic/TestEm1/src/DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm1/src/DetectorConstruction.cc index c2cb34209e..b04bfdd82e 100644 --- a/examples/extended/electromagnetic/TestEm1/src/DetectorConstruction.cc +++ b/examples/extended/electromagnetic/TestEm1/src/DetectorConstruction.cc @@ -26,7 +26,7 @@ // // $Id: DetectorConstruction.cc,v 1.6 2006/06/29 16:36:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm1/src/DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm1/src/DetectorMessenger.cc index f64bc1c381..f175be068c 100644 --- a/examples/extended/electromagnetic/TestEm1/src/DetectorMessenger.cc +++ b/examples/extended/electromagnetic/TestEm1/src/DetectorMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorMessenger.cc,v 1.3 2006/06/29 16:36:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm1/src/EventAction.cc b/examples/extended/electromagnetic/TestEm1/src/EventAction.cc index 96dba3b66f..b4b6fed3b0 100644 --- a/examples/extended/electromagnetic/TestEm1/src/EventAction.cc +++ b/examples/extended/electromagnetic/TestEm1/src/EventAction.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: EventAction.cc,v 1.4 2006/06/29 16:36:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: EventAction.cc,v 1.5 2006/10/19 17:24:13 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm1/src/EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm1/src/EventActionMessenger.cc index 57d4c7725f..062777d3d4 100644 --- a/examples/extended/electromagnetic/TestEm1/src/EventActionMessenger.cc +++ b/examples/extended/electromagnetic/TestEm1/src/EventActionMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventActionMessenger.cc,v 1.3 2006/06/29 16:37:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm1/src/HistoManager.cc b/examples/extended/electromagnetic/TestEm1/src/HistoManager.cc index bbd2c04e36..4068e1bf47 100644 --- a/examples/extended/electromagnetic/TestEm1/src/HistoManager.cc +++ b/examples/extended/electromagnetic/TestEm1/src/HistoManager.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoManager.cc,v 1.9 2006/06/29 16:37:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm1/src/HistoMessenger.cc b/examples/extended/electromagnetic/TestEm1/src/HistoMessenger.cc index 5949cb2a18..1907540adf 100644 --- a/examples/extended/electromagnetic/TestEm1/src/HistoMessenger.cc +++ b/examples/extended/electromagnetic/TestEm1/src/HistoMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoMessenger.cc,v 1.5 2006/06/29 16:37:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm1/src/PhysListEmG4v52.cc b/examples/extended/electromagnetic/TestEm1/src/PhysListEmG4v52.cc deleted file mode 100644 index 39ab9c6f94..0000000000 --- a/examples/extended/electromagnetic/TestEm1/src/PhysListEmG4v52.cc +++ /dev/null @@ -1,120 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: PhysListEmG4v52.cc,v 1.3 2006/06/29 16:37:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#include "PhysListEmG4v52.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" - -#include "G4ComptonScattering52.hh" -#include "G4GammaConversion52.hh" -#include "G4PhotoElectricEffect52.hh" - -#include "G4MultipleScattering52.hh" - -#include "G4eIonisation52.hh" -#include "G4eBremsstrahlung52.hh" -#include "G4eplusAnnihilation52.hh" - -#include "G4MuIonisation52.hh" -#include "G4MuBremsstrahlung52.hh" -#include "G4MuPairProduction52.hh" - -#include "G4hIonisation52.hh" - - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListEmG4v52::PhysListEmG4v52(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListEmG4v52::~PhysListEmG4v52() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void PhysListEmG4v52::ConstructProcess() -{ - // Add EM processes realised on base of prototype of model approach design - - theParticleIterator->reset(); - while( (*theParticleIterator)() ){ - G4ParticleDefinition* particle = theParticleIterator->value(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - G4String particleName = particle->GetParticleName(); - - if (particleName == "gamma") { - // gamma - pmanager->AddDiscreteProcess(new G4PhotoElectricEffect52); - pmanager->AddDiscreteProcess(new G4ComptonScattering52); - pmanager->AddDiscreteProcess(new G4GammaConversion52); - - } else if (particleName == "e-") { - //electron - pmanager->AddProcess(new G4MultipleScattering52, -1, 1,1); - pmanager->AddProcess(new G4eIonisation52, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung52, -1,-1,3); - - } else if (particleName == "e+") { - //positron - pmanager->AddProcess(new G4MultipleScattering52, -1, 1,1); - pmanager->AddProcess(new G4eIonisation52, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung52, -1,-1,3); - pmanager->AddProcess(new G4eplusAnnihilation52, 0,-1,4); - - } else if( particleName == "mu+" || - particleName == "mu-" ) { - //muon - pmanager->AddProcess(new G4MultipleScattering52,-1, 1,1); - pmanager->AddProcess(new G4MuIonisation52, -1, 2,2); - pmanager->AddProcess(new G4MuBremsstrahlung52, -1,-1,3); - pmanager->AddProcess(new G4MuPairProduction52, -1,-1,4); - - } else if( particleName == "GenericIon" ) { - - pmanager->AddProcess(new G4MultipleScattering52, -1,1,1); - pmanager->AddProcess(new G4hIonisation52, -1,2,2); - - } else if ((!particle->IsShortLived()) && - (particle->GetPDGCharge() != 0.0) && - (particle->GetParticleName() != "chargedgeantino")) { - //all others charged particles except geantino - pmanager->AddProcess(new G4MultipleScattering52, -1,1,1); - pmanager->AddProcess(new G4hIonisation52, -1,2,2); - } - } -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - diff --git a/examples/extended/electromagnetic/TestEm1/src/PhysListEmLivermore.cc b/examples/extended/electromagnetic/TestEm1/src/PhysListEmLivermore.cc index fcb5df1351..71396cb6c0 100644 --- a/examples/extended/electromagnetic/TestEm1/src/PhysListEmLivermore.cc +++ b/examples/extended/electromagnetic/TestEm1/src/PhysListEmLivermore.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: PhysListEmLivermore.cc,v 1.2 2006/06/29 16:37:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListEmLivermore.cc,v 1.4 2006/10/19 17:24:13 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm1/src/PhysListEmPenelope.cc b/examples/extended/electromagnetic/TestEm1/src/PhysListEmPenelope.cc index 3d5c08ca46..240f38819a 100644 --- a/examples/extended/electromagnetic/TestEm1/src/PhysListEmPenelope.cc +++ b/examples/extended/electromagnetic/TestEm1/src/PhysListEmPenelope.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: PhysListEmPenelope.cc,v 1.2 2006/06/29 16:37:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListEmPenelope.cc,v 1.3 2006/10/19 17:24:13 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -104,8 +104,8 @@ void PhysListEmPenelope::ConstructProcess() pmanager->AddProcess(new G4MuPairProduction, -1, 4, 4); } else if( particleName == "alpha" || particleName == "GenericIon" ) { - pmanager->AddProcess(new G4MultipleScattering, -1, 1,1); - pmanager->AddProcess(new G4ionIonisation, -1, 2,2); + pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4ionIonisation, -1, 2, 2); } else if ((!particle->IsShortLived()) && (particle->GetPDGCharge() != 0.0) && diff --git a/examples/extended/electromagnetic/TestEm1/src/PhysListEmStandard.cc b/examples/extended/electromagnetic/TestEm1/src/PhysListEmStandard.cc index 601cec29ae..ae365eac33 100644 --- a/examples/extended/electromagnetic/TestEm1/src/PhysListEmStandard.cc +++ b/examples/extended/electromagnetic/TestEm1/src/PhysListEmStandard.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: PhysListEmStandard.cc,v 1.11 2006/06/29 16:37:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListEmStandard.cc,v 1.12 2006/10/19 17:24:13 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -82,35 +82,35 @@ void PhysListEmStandard::ConstructProcess() } else if (particleName == "e-") { //electron - pmanager->AddProcess(new G4MultipleScattering, -1, 1,1); - pmanager->AddProcess(new G4eIonisation, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung("eBrem", 10*GeV),-1,3,3); + pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4eIonisation, -1, 2, 2); + pmanager->AddProcess(new G4eBremsstrahlung("eBrem", 10*GeV),-1, 3, 3); } else if (particleName == "e+") { //positron - pmanager->AddProcess(new G4MultipleScattering, -1, 1,1); - pmanager->AddProcess(new G4eIonisation, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung("eBrem", 10*GeV),-1,3,3); - pmanager->AddProcess(new G4eplusAnnihilation, 0,-1,4); + pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4eIonisation, -1, 2, 2); + pmanager->AddProcess(new G4eBremsstrahlung("eBrem", 10*GeV),-1, 3, 3); + pmanager->AddProcess(new G4eplusAnnihilation, 0,-1, 4); } else if( particleName == "mu+" || particleName == "mu-" ) { //muon - pmanager->AddProcess(new G4MultipleScattering,-1, 1,1); - pmanager->AddProcess(new G4MuIonisation, -1, 2,2); - pmanager->AddProcess(new G4MuBremsstrahlung, -1, 3,3); - pmanager->AddProcess(new G4MuPairProduction, -1, 4,4); + pmanager->AddProcess(new G4MultipleScattering,-1, 1, 1); + pmanager->AddProcess(new G4MuIonisation, -1, 2, 2); + pmanager->AddProcess(new G4MuBremsstrahlung, -1, 3, 3); + pmanager->AddProcess(new G4MuPairProduction, -1, 4, 4); } else if( particleName == "alpha" || particleName == "GenericIon" ) { - pmanager->AddProcess(new G4MultipleScattering,-1, 1,1); - pmanager->AddProcess(new G4ionIonisation, -1, 2,2); + pmanager->AddProcess(new G4MultipleScattering,-1, 1, 1); + pmanager->AddProcess(new G4ionIonisation, -1, 2, 2); } else if ((!particle->IsShortLived()) && (particle->GetPDGCharge() != 0.0) && (particle->GetParticleName() != "chargedgeantino")) { //all others charged particles except geantino - pmanager->AddProcess(new G4MultipleScattering,-1,1,1); - pmanager->AddProcess(new G4hIonisation, -1,2,2); + pmanager->AddProcess(new G4MultipleScattering,-1, 1, 1); + pmanager->AddProcess(new G4hIonisation, -1, 2, 2); } } } diff --git a/examples/extended/electromagnetic/TestEm1/src/PhysicsList.cc b/examples/extended/electromagnetic/TestEm1/src/PhysicsList.cc index c893e1cd32..3537ab1df7 100644 --- a/examples/extended/electromagnetic/TestEm1/src/PhysicsList.cc +++ b/examples/extended/electromagnetic/TestEm1/src/PhysicsList.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: PhysicsList.cc,v 1.9 2006/06/29 16:37:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysicsList.cc,v 1.10 2006/10/19 17:24:13 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -34,9 +34,6 @@ #include "PhysicsListMessenger.hh" #include "PhysListEmStandard.hh" -#include "PhysListEmG4v52.hh" -#include "PhysListEmG4v71.hh" - #include "PhysListEmLivermore.hh" #include "PhysListEmPenelope.hh" @@ -216,19 +213,7 @@ void PhysicsList::AddPhysicsList(const G4String& name) emName = name; delete emPhysicsList; emPhysicsList = new PhysListEmStandard(name); - - } else if (name == "g4v52") { - - emName = name; - delete emPhysicsList; - emPhysicsList = new PhysListEmG4v52(name); - - } else if (name == "g4v71") { - - emName = name; - delete emPhysicsList; - emPhysicsList = new PhysListEmG4v71(name); - + } else if (name == "livermore") { emName = name; diff --git a/examples/extended/electromagnetic/TestEm1/src/PhysicsListMessenger.cc b/examples/extended/electromagnetic/TestEm1/src/PhysicsListMessenger.cc index 32da7da487..10564d7990 100644 --- a/examples/extended/electromagnetic/TestEm1/src/PhysicsListMessenger.cc +++ b/examples/extended/electromagnetic/TestEm1/src/PhysicsListMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListMessenger.cc,v 1.3 2006/06/29 16:37:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm1/src/PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm1/src/PrimaryGeneratorAction.cc index c5fcbac12f..c7870fc0e3 100644 --- a/examples/extended/electromagnetic/TestEm1/src/PrimaryGeneratorAction.cc +++ b/examples/extended/electromagnetic/TestEm1/src/PrimaryGeneratorAction.cc @@ -25,7 +25,7 @@ // // // $Id: PrimaryGeneratorAction.cc,v 1.4 2006/06/29 16:37:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm1/src/PrimaryGeneratorMessenger.cc b/examples/extended/electromagnetic/TestEm1/src/PrimaryGeneratorMessenger.cc index d9dbd555ea..496b17c721 100644 --- a/examples/extended/electromagnetic/TestEm1/src/PrimaryGeneratorMessenger.cc +++ b/examples/extended/electromagnetic/TestEm1/src/PrimaryGeneratorMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorMessenger.cc,v 1.4 2006/06/29 16:37:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm1/src/RunAction.cc b/examples/extended/electromagnetic/TestEm1/src/RunAction.cc index 77e9baa36e..d130adb3c9 100644 --- a/examples/extended/electromagnetic/TestEm1/src/RunAction.cc +++ b/examples/extended/electromagnetic/TestEm1/src/RunAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RunAction.cc,v 1.19 2006/06/29 16:37:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm1/src/StepMax.cc b/examples/extended/electromagnetic/TestEm1/src/StepMax.cc index 3d0f63991e..81702c1792 100644 --- a/examples/extended/electromagnetic/TestEm1/src/StepMax.cc +++ b/examples/extended/electromagnetic/TestEm1/src/StepMax.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMax.cc,v 1.2 2006/06/29 16:37:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm1/src/StepMaxMessenger.cc b/examples/extended/electromagnetic/TestEm1/src/StepMaxMessenger.cc index 9fb008a41b..3fe37b8152 100644 --- a/examples/extended/electromagnetic/TestEm1/src/StepMaxMessenger.cc +++ b/examples/extended/electromagnetic/TestEm1/src/StepMaxMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMaxMessenger.cc,v 1.2 2006/06/29 16:37:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm1/src/SteppingAction.cc b/examples/extended/electromagnetic/TestEm1/src/SteppingAction.cc index dd57571071..2bb79941e0 100644 --- a/examples/extended/electromagnetic/TestEm1/src/SteppingAction.cc +++ b/examples/extended/electromagnetic/TestEm1/src/SteppingAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingAction.cc,v 1.8 2006/06/29 16:37:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm1/src/SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm1/src/SteppingVerbose.cc index a1fc67ec98..26cd467cac 100644 --- a/examples/extended/electromagnetic/TestEm1/src/SteppingVerbose.cc +++ b/examples/extended/electromagnetic/TestEm1/src/SteppingVerbose.cc @@ -25,7 +25,7 @@ // // // $Id: SteppingVerbose.cc,v 1.2 2006/06/29 16:37:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm1/src/TrackingAction.cc b/examples/extended/electromagnetic/TestEm1/src/TrackingAction.cc index 8b7d6937ba..b3f7251a04 100644 --- a/examples/extended/electromagnetic/TestEm1/src/TrackingAction.cc +++ b/examples/extended/electromagnetic/TestEm1/src/TrackingAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TrackingAction.cc,v 1.10 2006/06/29 16:37:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm10/GNUmakefile b/examples/extended/electromagnetic/TestEm10/GNUmakefile index 5d0b8b02f8..177da9c2bc 100644 --- a/examples/extended/electromagnetic/TestEm10/GNUmakefile +++ b/examples/extended/electromagnetic/TestEm10/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.3 2004/12/03 09:12:42 vnivanch Exp $ +# $Id: GNUmakefile,v 1.4 2006/10/26 15:19:21 maire Exp $ # -------------------------------------------------------------- # GNUmakefile for examples module. Gabriele Cosmo, 06/04/98. # -------------------------------------------------------------- @@ -23,7 +23,7 @@ include $(G4INSTALL)/config/architecture.gmk # for the aida-config command see the README file ifdef G4ANALYSIS_USE CPPFLAGS += `aida-config --include` - LDFLAGS += `aida-config --lib` + LOADLIBS += `aida-config --lib` endif include $(G4INSTALL)/config/binmake.gmk diff --git a/examples/extended/electromagnetic/TestEm10/History b/examples/extended/electromagnetic/TestEm10/History index e5611439c6..dca6a8b7c6 100644 --- a/examples/extended/electromagnetic/TestEm10/History +++ b/examples/extended/electromagnetic/TestEm10/History @@ -1,4 +1,4 @@ -$Id: History,v 1.19 2006/05/22 19:05:49 vnivanch Exp $ +$Id: History,v 1.20 2006/10/26 15:19:21 maire Exp $ ------------------------------------------------------------------- ========================================================= @@ -15,6 +15,10 @@ track of all tags. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- + +25-10-06 mma (testem10-V08-01-00) +- GNUmakefile : LOADLIBS + 22 May 05: V.Ivant (testem10-V08-00-01) - Remove extra files diff --git a/examples/extended/electromagnetic/TestEm10/TestEm10.cc b/examples/extended/electromagnetic/TestEm10/TestEm10.cc index 7ed22689e2..5b02ec52e5 100644 --- a/examples/extended/electromagnetic/TestEm10/TestEm10.cc +++ b/examples/extended/electromagnetic/TestEm10/TestEm10.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: TestEm10.cc,v 1.7 2006/06/29 16:37:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: TestEm10.cc,v 1.8 2006/08/16 15:58:32 grichine Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- @@ -54,7 +54,8 @@ #include "Em10EventAction.hh" #include "Em10SteppingAction.hh" #include "Em10SteppingVerbose.hh" - + #include "Em10TrackingAction.hh" + int main(int argc,char** argv) { @@ -106,6 +107,11 @@ int main(int argc,char** argv) eventAction, runAction); runManager->SetUserAction(steppingAction); + + + runManager->SetUserAction( new Em10TrackingAction ); + + //Initialize G4 kernel, physics tables ... diff --git a/examples/extended/electromagnetic/TestEm10/TestEm10.large_N.out b/examples/extended/electromagnetic/TestEm10/TestEm10.large_N.out index a5381ec9b1..89b73475e9 100644 --- a/examples/extended/electromagnetic/TestEm10/TestEm10.large_N.out +++ b/examples/extended/electromagnetic/TestEm10/TestEm10.large_N.out @@ -1,5 +1,5 @@ ********************************************** - Geant4 version $Name: geant4-08-01 $ + Geant4 version $Name: geant4-08-02 $ (13-Dec-2002) Copyright : Geant4 Collaboration ********************************************** diff --git a/examples/extended/electromagnetic/TestEm10/TestEm10.out b/examples/extended/electromagnetic/TestEm10/TestEm10.out index c7c05e61e3..de10850a29 100644 --- a/examples/extended/electromagnetic/TestEm10/TestEm10.out +++ b/examples/extended/electromagnetic/TestEm10/TestEm10.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -29,17 +29,13 @@ Registered model factories: drawByCharge drawByParticleID drawByOriginVolume - -Registered models: - None + drawByAttribute Registered filter factories: chargeFilter particleFilter originVolumeFilter - -Registered filters: - None + attributeFilter hist file = g4.p11 Nb of bins in Edep plot = 65 @@ -79,6 +75,7 @@ Detector positron cut = 1 mm Detector cuts are set phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV Sampling according Klein-Nishina model @@ -86,7 +83,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.022 MeV to 100 GeV in 100 bins. @@ -159,7 +156,7 @@ Lorentz Factor XTR photon number 8.085e+04 3.149 9.283e+04 3.149 -total time for build X-ray TR energy loss tables = 0.6 s +total time for build X-ray TR energy loss tables = 0.44 s SynRad: Incoherent Synchrotron Radiation good description for long magnets at all energies @@ -176,7 +173,7 @@ eBrem: tables are built for e+ Total cross sections from a parametrisation based on the EEDL data library. Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -233,7 +230,7 @@ Lorentz Factor XTR photon number 8.085e+04 3.149 9.283e+04 3.149 -total time for build X-ray TR energy loss tables = 0.6 s +total time for build X-ray TR energy loss tables = 0.44 s msc: Model variant of multiple scattering for proton Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -341,26 +338,26 @@ Start Run processing. Run terminated. Run Summary Number of events processed : 1000 - User=19.34s Real=24.61s Sys=5.1s + User=28.68s Real=32.3s Sys=3.34s ================== run summary ===================== end of Run TotNbofEvents = 1000 - mean charged track length in absorber=44.1278 +- 0.523115 mm + mean charged track length in absorber=114.629 +- 2.11901 mm - mean energy deposit in absorber=0.0532311 +- 0.000922791 MeV + mean energy deposit in absorber=0.0512368 +- 0.000839775 MeV - mean number of steps in absorber (charged) =15.908 +- 0.424502 - mean number of steps in absorber (neutral) =2.863 +- 0.0542423 + mean number of steps in absorber (charged) =60.95 +- 1.51948 + mean number of steps in absorber (neutral) =2.871 +- 0.0527481 - mean number of charged secondaries = 5.422 +- 0.107907 + mean number of charged secondaries = 5.083 +- 0.101302 - mean number of neutral secondaries = 0.043 +- 0.00671945 + mean number of neutral secondaries = 0.149 +- 0.0121983 - mean number of e-s =5.421 and e+s =0.001 + mean number of e-s =5.083 and e+s =0 -(number) transmission coeff=0.492 reflection coeff=0.024 +(number) transmission coeff=0.569 reflection coeff=0.066 energy deposit distribution -#entries=1000 #underflows=0 #overflows=60 +#entries=1000 #underflows=0 #overflows=51 bin nb Elow entries normalized 0 0 0 0 1 1.53846 0 0 @@ -368,73 +365,73 @@ Run Summary 3 4.61538 0 0 4 6.15385 0 0 5 7.69231 0 0 - 6 9.23077 1 0.001 - 7 10.7692 1 0.001 - 8 12.3077 2 0.002 - 9 13.8462 1 0.001 - 10 15.3846 7 0.007 - 11 16.9231 14 0.014 - 12 18.4615 9 0.009 - 13 20 22 0.022 - 14 21.5385 24 0.024 - 15 23.0769 18 0.018 - 16 24.6154 27 0.027 - 17 26.1538 21 0.021 - 18 27.6923 28 0.028 - 19 29.2308 25 0.025 - 20 30.7692 29 0.029 - 21 32.3077 26 0.026 - 22 33.8462 30 0.03 - 23 35.3846 27 0.027 - 24 36.9231 32 0.032 - 25 38.4615 22 0.022 - 26 40 36 0.036 - 27 41.5385 30 0.03 - 28 43.0769 26 0.026 - 29 44.6154 35 0.035 - 30 46.1538 25 0.025 - 31 47.6923 21 0.021 - 32 49.2308 27 0.027 + 6 9.23077 0 0 + 7 10.7692 0 0 + 8 12.3077 1 0.001 + 9 13.8462 5 0.005 + 10 15.3846 15 0.015 + 11 16.9231 12 0.012 + 12 18.4615 10 0.01 + 13 20 23 0.023 + 14 21.5385 17 0.017 + 15 23.0769 22 0.022 + 16 24.6154 15 0.015 + 17 26.1538 31 0.031 + 18 27.6923 34 0.034 + 19 29.2308 26 0.026 + 20 30.7692 24 0.024 + 21 32.3077 31 0.031 + 22 33.8462 36 0.036 + 23 35.3846 32 0.032 + 24 36.9231 25 0.025 + 25 38.4615 33 0.033 + 26 40 24 0.024 + 27 41.5385 32 0.032 + 28 43.0769 28 0.028 + 29 44.6154 27 0.027 + 30 46.1538 31 0.031 + 31 47.6923 30 0.03 + 32 49.2308 23 0.023 33 50.7692 21 0.021 - 34 52.3077 25 0.025 - 35 53.8462 20 0.02 - 36 55.3846 24 0.024 - 37 56.9231 18 0.018 - 38 58.4615 16 0.016 - 39 60 15 0.015 - 40 61.5385 11 0.011 - 41 63.0769 14 0.014 - 42 64.6154 14 0.014 - 43 66.1538 12 0.012 - 44 67.6923 18 0.018 - 45 69.2308 18 0.018 + 34 52.3077 12 0.012 + 35 53.8462 31 0.031 + 36 55.3846 27 0.027 + 37 56.9231 19 0.019 + 38 58.4615 21 0.021 + 39 60 18 0.018 + 40 61.5385 18 0.018 + 41 63.0769 13 0.013 + 42 64.6154 12 0.012 + 43 66.1538 8 0.008 + 44 67.6923 15 0.015 + 45 69.2308 12 0.012 46 70.7692 16 0.016 - 47 72.3077 15 0.015 - 48 73.8462 16 0.016 - 49 75.3846 13 0.013 - 50 76.9231 10 0.01 - 51 78.4615 9 0.009 - 52 80 3 0.003 - 53 81.5385 11 0.011 + 47 72.3077 13 0.013 + 48 73.8462 15 0.015 + 49 75.3846 8 0.008 + 50 76.9231 8 0.008 + 51 78.4615 7 0.007 + 52 80 11 0.011 + 53 81.5385 13 0.013 54 83.0769 6 0.006 - 55 84.6154 7 0.007 - 56 86.1538 5 0.005 - 57 87.6923 3 0.003 - 58 89.2308 7 0.007 - 59 90.7692 3 0.003 - 60 92.3077 6 0.006 - 61 93.8462 4 0.004 - 62 95.3846 4 0.004 - 63 96.9231 7 0.007 - 64 98.4615 3 0.003 + 55 84.6154 4 0.004 + 56 86.1538 10 0.01 + 57 87.6923 4 0.004 + 58 89.2308 0 0 + 59 90.7692 5 0.005 + 60 92.3077 5 0.005 + 61 93.8462 5 0.005 + 62 95.3846 2 0.002 + 63 96.9231 1 0.001 + 64 98.4615 2 0.002 - Emp = 0.04 width= 0.0492308 MeV + Emp = 0.0338462 width= 0.0415385 MeV ERROR: G4VisCommandsViewerUpdate::SetNewValue: no current viewer. --------- Ranecu engine status --------- Initial seed (index) = 0 - Current couple of seeds = 591453591, 1204852694 + Current couple of seeds = 1693453792, 80564918 ---------------------------------------- ========= Table of registered couples ============================== diff --git a/examples/extended/electromagnetic/TestEm10/barr90.mac b/examples/extended/electromagnetic/TestEm10/barr90.mac index 566b14b2ac..284967267a 100644 --- a/examples/extended/electromagnetic/TestEm10/barr90.mac +++ b/examples/extended/electromagnetic/TestEm10/barr90.mac @@ -91,13 +91,15 @@ # # Particle and its energy # -/gun/particle e- +/gun/particle e+ /gun/energy 20000.0 MeV # #/tracking/verbose 1 # /event/printModulo 1000 /run/beamOn 10000 +#/tracking/verbose 0 +#/run/beamOn 1 # diff --git a/examples/extended/electromagnetic/TestEm10/include/Em10CalorHit.hh b/examples/extended/electromagnetic/TestEm10/include/Em10CalorHit.hh index b94967b984..9d48f898af 100644 --- a/examples/extended/electromagnetic/TestEm10/include/Em10CalorHit.hh +++ b/examples/extended/electromagnetic/TestEm10/include/Em10CalorHit.hh @@ -25,7 +25,7 @@ // // // $Id: Em10CalorHit.hh,v 1.4 2006/06/29 16:37:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm10/include/Em10CalorimeterSD.hh b/examples/extended/electromagnetic/TestEm10/include/Em10CalorimeterSD.hh index eb9efe0bcf..57c661cba0 100644 --- a/examples/extended/electromagnetic/TestEm10/include/Em10CalorimeterSD.hh +++ b/examples/extended/electromagnetic/TestEm10/include/Em10CalorimeterSD.hh @@ -25,7 +25,7 @@ // // // $Id: Em10CalorimeterSD.hh,v 1.3 2006/06/29 16:37:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm10/include/Em10DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm10/include/Em10DetectorConstruction.hh index 4980f62136..0e10e4351b 100644 --- a/examples/extended/electromagnetic/TestEm10/include/Em10DetectorConstruction.hh +++ b/examples/extended/electromagnetic/TestEm10/include/Em10DetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: Em10DetectorConstruction.hh,v 1.19 2006/06/29 16:37:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm10/include/Em10DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm10/include/Em10DetectorMessenger.hh index 39c17362a1..2038d3167e 100644 --- a/examples/extended/electromagnetic/TestEm10/include/Em10DetectorMessenger.hh +++ b/examples/extended/electromagnetic/TestEm10/include/Em10DetectorMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: Em10DetectorMessenger.hh,v 1.7 2006/06/29 16:37:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm10/include/Em10EventAction.hh b/examples/extended/electromagnetic/TestEm10/include/Em10EventAction.hh index c946fec9bf..2b7280867c 100644 --- a/examples/extended/electromagnetic/TestEm10/include/Em10EventAction.hh +++ b/examples/extended/electromagnetic/TestEm10/include/Em10EventAction.hh @@ -25,7 +25,7 @@ // // // $Id: Em10EventAction.hh,v 1.3 2006/06/29 16:37:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm10/include/Em10EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm10/include/Em10EventActionMessenger.hh index a9aa7c60d9..8c5492cbe1 100644 --- a/examples/extended/electromagnetic/TestEm10/include/Em10EventActionMessenger.hh +++ b/examples/extended/electromagnetic/TestEm10/include/Em10EventActionMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: Em10EventActionMessenger.hh,v 1.3 2006/06/29 16:37:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm10/include/Em10PhysicsList.hh b/examples/extended/electromagnetic/TestEm10/include/Em10PhysicsList.hh index cfac94d604..e07f327723 100644 --- a/examples/extended/electromagnetic/TestEm10/include/Em10PhysicsList.hh +++ b/examples/extended/electromagnetic/TestEm10/include/Em10PhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: Em10PhysicsList.hh,v 1.11 2006/06/29 16:37:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef Em10PhysicsList_h diff --git a/examples/extended/electromagnetic/TestEm10/include/Em10PhysicsListMessenger.hh b/examples/extended/electromagnetic/TestEm10/include/Em10PhysicsListMessenger.hh index 2b72e526dd..65496d2bf9 100644 --- a/examples/extended/electromagnetic/TestEm10/include/Em10PhysicsListMessenger.hh +++ b/examples/extended/electromagnetic/TestEm10/include/Em10PhysicsListMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: Em10PhysicsListMessenger.hh,v 1.7 2006/06/29 16:37:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm10/include/Em10PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm10/include/Em10PrimaryGeneratorAction.hh index 8559e28a53..a69e2832b4 100644 --- a/examples/extended/electromagnetic/TestEm10/include/Em10PrimaryGeneratorAction.hh +++ b/examples/extended/electromagnetic/TestEm10/include/Em10PrimaryGeneratorAction.hh @@ -25,7 +25,7 @@ // // // $Id: Em10PrimaryGeneratorAction.hh,v 1.3 2006/06/29 16:38:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm10/include/Em10PrimaryGeneratorMessenger.hh b/examples/extended/electromagnetic/TestEm10/include/Em10PrimaryGeneratorMessenger.hh index e67d1d5240..e509411e6d 100644 --- a/examples/extended/electromagnetic/TestEm10/include/Em10PrimaryGeneratorMessenger.hh +++ b/examples/extended/electromagnetic/TestEm10/include/Em10PrimaryGeneratorMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: Em10PrimaryGeneratorMessenger.hh,v 1.3 2006/06/29 16:38:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm10/include/Em10RunAction.hh b/examples/extended/electromagnetic/TestEm10/include/Em10RunAction.hh index febb7af953..24c641ba74 100644 --- a/examples/extended/electromagnetic/TestEm10/include/Em10RunAction.hh +++ b/examples/extended/electromagnetic/TestEm10/include/Em10RunAction.hh @@ -25,7 +25,7 @@ // // // $Id: Em10RunAction.hh,v 1.5 2006/06/29 16:38:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm10/include/Em10RunMessenger.hh b/examples/extended/electromagnetic/TestEm10/include/Em10RunMessenger.hh index fdb9d54369..7802b6f366 100644 --- a/examples/extended/electromagnetic/TestEm10/include/Em10RunMessenger.hh +++ b/examples/extended/electromagnetic/TestEm10/include/Em10RunMessenger.hh @@ -26,7 +26,7 @@ // // $Id: Em10RunMessenger.hh,v 1.3 2006/06/29 16:38:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm10/include/Em10StepCut.hh b/examples/extended/electromagnetic/TestEm10/include/Em10StepCut.hh index 3557a21dc4..7257798f43 100644 --- a/examples/extended/electromagnetic/TestEm10/include/Em10StepCut.hh +++ b/examples/extended/electromagnetic/TestEm10/include/Em10StepCut.hh @@ -25,7 +25,7 @@ // // // $Id: Em10StepCut.hh,v 1.5 2006/06/29 16:38:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm10/include/Em10SteppingAction.hh b/examples/extended/electromagnetic/TestEm10/include/Em10SteppingAction.hh index 51bebf0aa5..c4ed5ee48b 100644 --- a/examples/extended/electromagnetic/TestEm10/include/Em10SteppingAction.hh +++ b/examples/extended/electromagnetic/TestEm10/include/Em10SteppingAction.hh @@ -25,7 +25,7 @@ // // // $Id: Em10SteppingAction.hh,v 1.3 2006/06/29 16:38:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm10/include/Em10SteppingMessenger.hh b/examples/extended/electromagnetic/TestEm10/include/Em10SteppingMessenger.hh index 53b0cf7322..7be0dc6d88 100644 --- a/examples/extended/electromagnetic/TestEm10/include/Em10SteppingMessenger.hh +++ b/examples/extended/electromagnetic/TestEm10/include/Em10SteppingMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: Em10SteppingMessenger.hh,v 1.3 2006/06/29 16:38:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/examples/extended/electromagnetic/TestEm10/include/Em10SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm10/include/Em10SteppingVerbose.hh index 862574aa26..4fcb705bd0 100644 --- a/examples/extended/electromagnetic/TestEm10/include/Em10SteppingVerbose.hh +++ b/examples/extended/electromagnetic/TestEm10/include/Em10SteppingVerbose.hh @@ -25,7 +25,7 @@ // // // $Id: Em10SteppingVerbose.hh,v 1.3 2006/06/29 16:38:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04TrackingAction.hh b/examples/extended/electromagnetic/TestEm10/include/Em10TrackingAction.hh similarity index 87% rename from examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04TrackingAction.hh rename to examples/extended/electromagnetic/TestEm10/include/Em10TrackingAction.hh index d0bd462cac..5e0f582e28 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04TrackingAction.hh +++ b/examples/extended/electromagnetic/TestEm10/include/Em10TrackingAction.hh @@ -23,21 +23,22 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // + #ifndef Em10TrackingAction_h + #define Em10TrackingAction_h -#ifndef ExN04TrackingAction_h -#define ExN04TrackingAction_h 1 + #include "G4UserTrackingAction.hh" -#include "G4UserTrackingAction.hh" + #include "globals.hh" - -class ExN04TrackingAction : public G4UserTrackingAction { + class Em10TrackingAction : public G4UserTrackingAction { public: - ExN04TrackingAction(){}; - virtual ~ExN04TrackingAction(){}; - + Em10TrackingAction(); + virtual ~Em10TrackingAction(){}; + virtual void PreUserTrackingAction(const G4Track*); -}; + }; + + #endif -#endif diff --git a/examples/extended/electromagnetic/TestEm10/include/StepMax.hh b/examples/extended/electromagnetic/TestEm10/include/StepMax.hh index 23c2942359..0f1dc77cce 100644 --- a/examples/extended/electromagnetic/TestEm10/include/StepMax.hh +++ b/examples/extended/electromagnetic/TestEm10/include/StepMax.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMax.hh,v 1.2 2006/06/29 16:38:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // /////////////////////////////////////////////////////////////////////////////////. diff --git a/examples/extended/electromagnetic/TestEm10/include/TRTDetectorConstruction.hh b/examples/extended/electromagnetic/TestEm10/include/TRTDetectorConstruction.hh index 58ceee2604..85b82c7ba6 100644 --- a/examples/extended/electromagnetic/TestEm10/include/TRTDetectorConstruction.hh +++ b/examples/extended/electromagnetic/TestEm10/include/TRTDetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: TRTDetectorConstruction.hh,v 1.3 2006/06/29 16:38:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm10/include/TRTMaterials.hh b/examples/extended/electromagnetic/TestEm10/include/TRTMaterials.hh index b0e4caf698..72670bd54a 100644 --- a/examples/extended/electromagnetic/TestEm10/include/TRTMaterials.hh +++ b/examples/extended/electromagnetic/TestEm10/include/TRTMaterials.hh @@ -25,7 +25,7 @@ // // // $Id: TRTMaterials.hh,v 1.3 2006/06/29 16:38:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm10/src/Em10CalorHit.cc b/examples/extended/electromagnetic/TestEm10/src/Em10CalorHit.cc index a4b955ce07..4ba3256efc 100644 --- a/examples/extended/electromagnetic/TestEm10/src/Em10CalorHit.cc +++ b/examples/extended/electromagnetic/TestEm10/src/Em10CalorHit.cc @@ -25,7 +25,7 @@ // // // $Id: Em10CalorHit.cc,v 1.4 2006/06/29 16:38:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm10/src/Em10CalorimeterSD.cc b/examples/extended/electromagnetic/TestEm10/src/Em10CalorimeterSD.cc index 771f4f85e6..89ce5a4a08 100644 --- a/examples/extended/electromagnetic/TestEm10/src/Em10CalorimeterSD.cc +++ b/examples/extended/electromagnetic/TestEm10/src/Em10CalorimeterSD.cc @@ -25,7 +25,7 @@ // // // $Id: Em10CalorimeterSD.cc,v 1.4 2006/06/29 16:38:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm10/src/Em10DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm10/src/Em10DetectorConstruction.cc index 76a4f1e4e5..d251b4fe3f 100644 --- a/examples/extended/electromagnetic/TestEm10/src/Em10DetectorConstruction.cc +++ b/examples/extended/electromagnetic/TestEm10/src/Em10DetectorConstruction.cc @@ -25,7 +25,7 @@ // // // $Id: Em10DetectorConstruction.cc,v 1.31 2006/06/29 16:38:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm10/src/Em10DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm10/src/Em10DetectorMessenger.cc index e56b4284bf..43938567c0 100644 --- a/examples/extended/electromagnetic/TestEm10/src/Em10DetectorMessenger.cc +++ b/examples/extended/electromagnetic/TestEm10/src/Em10DetectorMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: Em10DetectorMessenger.cc,v 1.11 2006/06/29 16:38:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm10/src/Em10EventAction.cc b/examples/extended/electromagnetic/TestEm10/src/Em10EventAction.cc index 90c72e5fc3..b34a9018b4 100644 --- a/examples/extended/electromagnetic/TestEm10/src/Em10EventAction.cc +++ b/examples/extended/electromagnetic/TestEm10/src/Em10EventAction.cc @@ -25,7 +25,7 @@ // // // $Id: Em10EventAction.cc,v 1.6 2006/06/29 16:38:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm10/src/Em10EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm10/src/Em10EventActionMessenger.cc index 0e5bc91a35..89127b6ec9 100644 --- a/examples/extended/electromagnetic/TestEm10/src/Em10EventActionMessenger.cc +++ b/examples/extended/electromagnetic/TestEm10/src/Em10EventActionMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: Em10EventActionMessenger.cc,v 1.4 2006/06/29 16:38:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm10/src/Em10PhysicsList.cc b/examples/extended/electromagnetic/TestEm10/src/Em10PhysicsList.cc index 9dabdbf6da..436da2736a 100644 --- a/examples/extended/electromagnetic/TestEm10/src/Em10PhysicsList.cc +++ b/examples/extended/electromagnetic/TestEm10/src/Em10PhysicsList.cc @@ -25,7 +25,7 @@ // // // $Id: Em10PhysicsList.cc,v 1.24 2006/06/29 16:38:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "Em10PhysicsList.hh" diff --git a/examples/extended/electromagnetic/TestEm10/src/Em10PhysicsListMessenger.cc b/examples/extended/electromagnetic/TestEm10/src/Em10PhysicsListMessenger.cc index db212b12c6..18e078a5d5 100644 --- a/examples/extended/electromagnetic/TestEm10/src/Em10PhysicsListMessenger.cc +++ b/examples/extended/electromagnetic/TestEm10/src/Em10PhysicsListMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: Em10PhysicsListMessenger.cc,v 1.9 2006/06/29 16:38:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // diff --git a/examples/extended/electromagnetic/TestEm10/src/Em10PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm10/src/Em10PrimaryGeneratorAction.cc index b5bb989c4a..32923747a6 100644 --- a/examples/extended/electromagnetic/TestEm10/src/Em10PrimaryGeneratorAction.cc +++ b/examples/extended/electromagnetic/TestEm10/src/Em10PrimaryGeneratorAction.cc @@ -25,7 +25,7 @@ // // // $Id: Em10PrimaryGeneratorAction.cc,v 1.6 2006/06/29 16:38:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm10/src/Em10PrimaryGeneratorMessenger.cc b/examples/extended/electromagnetic/TestEm10/src/Em10PrimaryGeneratorMessenger.cc index 931fecbe7b..803469b8d0 100644 --- a/examples/extended/electromagnetic/TestEm10/src/Em10PrimaryGeneratorMessenger.cc +++ b/examples/extended/electromagnetic/TestEm10/src/Em10PrimaryGeneratorMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: Em10PrimaryGeneratorMessenger.cc,v 1.4 2006/06/29 16:38:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm10/src/Em10RunAction.cc b/examples/extended/electromagnetic/TestEm10/src/Em10RunAction.cc index 8f14a9696f..664458207e 100644 --- a/examples/extended/electromagnetic/TestEm10/src/Em10RunAction.cc +++ b/examples/extended/electromagnetic/TestEm10/src/Em10RunAction.cc @@ -25,7 +25,7 @@ // // // $Id: Em10RunAction.cc,v 1.9 2006/06/29 16:38:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm10/src/Em10RunMessenger.cc b/examples/extended/electromagnetic/TestEm10/src/Em10RunMessenger.cc index 583bf8a01a..c39fa8841e 100644 --- a/examples/extended/electromagnetic/TestEm10/src/Em10RunMessenger.cc +++ b/examples/extended/electromagnetic/TestEm10/src/Em10RunMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: Em10RunMessenger.cc,v 1.5 2006/06/29 16:39:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm10/src/Em10StepCut.cc b/examples/extended/electromagnetic/TestEm10/src/Em10StepCut.cc index 67dbca9b90..1248158d14 100644 --- a/examples/extended/electromagnetic/TestEm10/src/Em10StepCut.cc +++ b/examples/extended/electromagnetic/TestEm10/src/Em10StepCut.cc @@ -25,7 +25,7 @@ // // // $Id: Em10StepCut.cc,v 1.3 2006/06/29 16:39:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "Em10StepCut.hh" diff --git a/examples/extended/electromagnetic/TestEm10/src/Em10SteppingAction.cc b/examples/extended/electromagnetic/TestEm10/src/Em10SteppingAction.cc index 74b88e5f23..9736bbe8b3 100644 --- a/examples/extended/electromagnetic/TestEm10/src/Em10SteppingAction.cc +++ b/examples/extended/electromagnetic/TestEm10/src/Em10SteppingAction.cc @@ -25,7 +25,7 @@ // // // $Id: Em10SteppingAction.cc,v 1.6 2006/06/29 16:39:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm10/src/Em10SteppingMessenger.cc b/examples/extended/electromagnetic/TestEm10/src/Em10SteppingMessenger.cc index 53a52c8a65..d0510d26dd 100644 --- a/examples/extended/electromagnetic/TestEm10/src/Em10SteppingMessenger.cc +++ b/examples/extended/electromagnetic/TestEm10/src/Em10SteppingMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: Em10SteppingMessenger.cc,v 1.4 2006/06/29 16:39:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/examples/extended/electromagnetic/TestEm10/src/Em10SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm10/src/Em10SteppingVerbose.cc index 01b89b6bc5..3e23b3a503 100644 --- a/examples/extended/electromagnetic/TestEm10/src/Em10SteppingVerbose.cc +++ b/examples/extended/electromagnetic/TestEm10/src/Em10SteppingVerbose.cc @@ -25,7 +25,7 @@ // // // $Id: Em10SteppingVerbose.cc,v 1.6 2006/06/29 16:39:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm10/src/Em10TrackingAction.cc similarity index 58% rename from examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04SteppingVerbose.hh rename to examples/extended/electromagnetic/TestEm10/src/Em10TrackingAction.cc index 95ec074de3..0231ef4330 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04SteppingVerbose.hh +++ b/examples/extended/electromagnetic/TestEm10/src/Em10TrackingAction.cc @@ -23,38 +23,34 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// -// $Id: ExN04SteppingVerbose.hh,v 1.2 2006/06/29 17:07:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// This class manages the verbose outputs in G4SteppingManager. -// It inherits from G4SteppingVerbose. -// It shows how to extract informations during the tracking of a particle. -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + #include "Em10TrackingAction.hh" -class ExN04SteppingVerbose; + #include "G4TrackingManager.hh" + #include "G4Track.hh" + #include "G4RunManager.hh" -#ifndef ExN04SteppingVerbose_h -#define ExN04SteppingVerbose_h 1 + #include "G4UImanager.hh" -#include "G4SteppingVerbose.hh" + Em10TrackingAction::Em10TrackingAction() + { } -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + void Em10TrackingAction::PreUserTrackingAction(const G4Track* aTrack) + { -class ExN04SteppingVerbose : public G4SteppingVerbose -{ - public: - - ExN04SteppingVerbose(); - ~ExN04SteppingVerbose(); + if( aTrack->GetParentID() == 1 && aTrack->GetKineticEnergy() > 100.*GeV ){ + G4cout << "[Em10TrackingAction::DEBUG]" << G4endl; + G4cout << " Track ID: " << aTrack->GetTrackID() << G4endl; + G4cout << " particle: " << aTrack->GetDynamicParticle()->GetDefinition()->GetParticleName() << G4endl; + G4cout << " Parent ID: " << aTrack->GetParentID() << G4endl; + G4cout << " created by: " << aTrack->GetCreatorProcess()->GetProcessName() << G4endl; + G4cout << " kin. energy (TeV): " << aTrack->GetKineticEnergy() / TeV << G4endl; + G4cout << " volume: " << aTrack->GetVolume()->GetName() << G4endl; + G4cout << " global time: " << aTrack->GetGlobalTime() << G4endl; - void StepInfo(); - void TrackingStarted(); + G4cout << " Killing event..." << G4endl; + if( aTrack->GetTrackID() != 1 ) + const_cast(aTrack)->SetTrackStatus( fKillTrackAndSecondaries ); + } -}; - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#endif + return; + } diff --git a/examples/extended/electromagnetic/TestEm10/src/StepMax.cc b/examples/extended/electromagnetic/TestEm10/src/StepMax.cc index aa2014ef4c..e81206b04c 100644 --- a/examples/extended/electromagnetic/TestEm10/src/StepMax.cc +++ b/examples/extended/electromagnetic/TestEm10/src/StepMax.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMax.cc,v 1.2 2006/06/29 16:39:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // /////////////////////////////////////////////////////////////////////////// diff --git a/examples/extended/electromagnetic/TestEm11/GNUmakefile b/examples/extended/electromagnetic/TestEm11/GNUmakefile index fc5d5ac5ae..8980f9f271 100644 --- a/examples/extended/electromagnetic/TestEm11/GNUmakefile +++ b/examples/extended/electromagnetic/TestEm11/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.3 2006/04/11 15:08:02 maire Exp $ +# $Id: GNUmakefile,v 1.5 2006/09/20 09:29:37 maire Exp $ # -------------------------------------------------------------- # GNUmakefile for examples module. Gabriele Cosmo, 06/04/98. # -------------------------------------------------------------- @@ -25,7 +25,7 @@ include $(G4INSTALL)/config/architecture.gmk ifdef G4ANALYSIS_USE # for the aida-config command see the README file CPPFLAGS += `aida-config --include` - LDFLAGS += `aida-config --lib` + LOADLIBS += `aida-config --lib` endif include $(G4INSTALL)/config/binmake.gmk diff --git a/examples/extended/electromagnetic/TestEm11/History b/examples/extended/electromagnetic/TestEm11/History index dd063cd335..8d5572f810 100644 --- a/examples/extended/electromagnetic/TestEm11/History +++ b/examples/extended/electromagnetic/TestEm11/History @@ -1,4 +1,4 @@ -$Id: History,v 1.10 2006/05/19 15:21:57 maire Exp $ +$Id: History,v 1.14 2006/10/26 10:18:59 maire Exp $ ------------------------------------------------------------------- ========================================================= @@ -15,6 +15,20 @@ track of all tags. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +25-10-06 mma (testem11-V08-01-02) +- GNUmakefile : LOADLIBS +- remove PhysicsLists 52 and 71 + +20-09-06 mma (testem11-V08-01-01) +- correct GNUmakefile :inactivate G4ANALYSIS_USE + +18-09-06 mma (testem11-V08-01-00) +- replace G4_WATER by Water. + Restaure hLowEnergyIonisation in livermore PhysicsList + +06-07-06 mma +- correction of stepMax in HistoManager::SetHisto() + 19-05-06 mma (testem11-V08-00-02) - update README diff --git a/examples/extended/electromagnetic/TestEm11/TestEm11.cc b/examples/extended/electromagnetic/TestEm11/TestEm11.cc index 6a4286d43c..3c5244decb 100644 --- a/examples/extended/electromagnetic/TestEm11/TestEm11.cc +++ b/examples/extended/electromagnetic/TestEm11/TestEm11.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TestEm11.cc,v 1.3 2006/06/29 16:39:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/TestEm11.in b/examples/extended/electromagnetic/TestEm11/TestEm11.in index a088a1dd53..d5a6415556 100644 --- a/examples/extended/electromagnetic/TestEm11/TestEm11.in +++ b/examples/extended/electromagnetic/TestEm11/TestEm11.in @@ -1,4 +1,4 @@ -# $Id: TestEm11.in,v 1.5 2006/05/18 16:36:21 vnivanch Exp $ +# $Id: TestEm11.in,v 1.6 2006/10/26 10:18:59 maire Exp $ # # limit the step size from histo 1 # @@ -10,7 +10,7 @@ /testem/det/setSizeYZ 1 mm # /testem/phys/addPhysics standard # em physics -###/testem/phys/addPhysics g4v52 # em physics +###/testem/phys/addPhysics penelope # em physics # /run/initialize # diff --git a/examples/extended/electromagnetic/TestEm11/TestEm11.out b/examples/extended/electromagnetic/TestEm11/TestEm11.out index 73f940e64a..ad74ee9ad3 100644 --- a/examples/extended/electromagnetic/TestEm11/TestEm11.out +++ b/examples/extended/electromagnetic/TestEm11/TestEm11.out @@ -1,13 +1,13 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 ************************************************************* -***** Table : Nb of materials = 8 ***** +***** Table : Nb of materials = 9 ***** Material: G4_Al density: 2.699 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 8.896 cm ---> Element: Al (Al) Z = 13.0 N = 27.0 A = 26.98 g/mole ElmMassFraction: 100.00 % ElmAbundance 100.00 % @@ -24,6 +24,9 @@ Material: G4_W density: 19.300 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 3.504 mm ---> Element: W (W) Z = 74.0 N = 183.8 A = 183.84 g/mole ElmMassFraction: 100.00 % ElmAbundance 100.00 % + Material: G4_Au density: 19.320 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 3.344 mm + ---> Element: Au (Au) Z = 79.0 N = 197.0 A = 196.97 g/mole ElmMassFraction: 100.00 % ElmAbundance 100.00 % + Material: G4_Pb density: 11.350 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 5.613 mm ---> Element: Pb (Pb) Z = 82.0 N = 207.2 A = 207.22 g/mole ElmMassFraction: 100.00 % ElmAbundance 100.00 % @@ -33,7 +36,7 @@ ---> Element: O (O) Z = 8.0 N = 16.0 A = 16.00 g/mole ElmMassFraction: 23.18 % ElmAbundance 21.07 % ---> Element: Ar (Ar) Z = 18.0 N = 39.9 A = 39.95 g/mole ElmMassFraction: 1.28 % ElmAbundance 0.47 % - Material: G4_WATER H_2O density: 1.000 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 36.083 cm + Material: Water density: 1.000 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 36.083 cm ---> Element: H (H) Z = 1.0 N = 1.0 A = 1.01 g/mole ElmMassFraction: 11.19 % ElmAbundance 66.67 % ---> Element: O (O) Z = 8.0 N = 16.0 A = 16.00 g/mole ElmMassFraction: 88.81 % ElmAbundance 33.33 % @@ -61,17 +64,13 @@ Registered model factories: drawByCharge drawByParticleID drawByOriginVolume - -Registered models: - None + drawByAttribute Registered filter factories: chargeFilter particleFilter originVolumeFilter - -Registered filters: - None + attributeFilter /run/verbose 2 # @@ -81,7 +80,7 @@ Registered filters: # /testem/phys/addPhysics standard # em physics PhysicsList::AddPhysicsList: -###/testem/phys/addPhysics g4v52 # em physics +###/testem/phys/addPhysics penelope # em physics # /run/initialize userDetector->Construct() start. @@ -118,6 +117,7 @@ PhysicsList::SetCuts:CutLength : 1 mm /run/beamOn 20000 phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV Sampling according Klein-Nishina model @@ -125,7 +125,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.022 MeV to 100 GeV in 100 bins. @@ -159,7 +159,7 @@ eBrem: tables are built for e+ Total cross sections from a parametrisation based on the EEDL data library. Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -289,7 +289,7 @@ Start Run processing. Run terminated. Run Summary Number of events processed : 20000 - User=155.99s Real=330.59s Sys=139.23s + User=159.75s Real=271.78s Sys=47.23s ======================== run summary ====================== @@ -297,20 +297,20 @@ Run Summary ============================================================ - Total Energy deposited = 451.259 keV +- 99.216 keV + Total Energy deposited = 451.298 keV +- 102.255 keV - Track length of primary track = 867.103 um +- 178.865 um + Track length of primary track = 867.560 um +- 185.114 um Range from EmCalculator = 937.365 um (from full dE/dx) - Projected range = 312.554 um +- 200.604 um + Projected range = 337.244 um +- 204.936 um - Nb of steps of primary track = 87.23 +- 17.87 Step size= 9.935 um +- 59.364 nm + Nb of steps of primary track = 87.27 +- 18.50 Step size= 9.932 um +- 94.328 nm - absorbed = 78.59 % transmit = 4.82 % reflected = 16.59 % + absorbed = 79.29 % transmit = 5.07 % reflected = 15.64 % --------- Ranecu engine status --------- Initial seed (index) = 0 - Current couple of seeds = 431591907, 1496536939 + Current couple of seeds = 249103066, 419417247 ---------------------------------------- Graphics systems deleted. Visualization Manager deleting... @@ -320,7 +320,9 @@ UserRunAction deleted. UserPrimaryGenerator deleted. G4 kernel has come to Quit state. EventManager deleted. +Default detector region deleted. UImanager deleted. +Units table cleared. StateManager deleted. RunManagerKernel is deleted. RunManager is deleting. diff --git a/examples/extended/electromagnetic/TestEm11/include/DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm11/include/DetectorConstruction.hh index b683b1425f..b42f33bc6f 100644 --- a/examples/extended/electromagnetic/TestEm11/include/DetectorConstruction.hh +++ b/examples/extended/electromagnetic/TestEm11/include/DetectorConstruction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorConstruction.hh,v 1.2 2006/06/29 16:39:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/include/DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm11/include/DetectorMessenger.hh index 49c7962f29..1a640a9e01 100644 --- a/examples/extended/electromagnetic/TestEm11/include/DetectorMessenger.hh +++ b/examples/extended/electromagnetic/TestEm11/include/DetectorMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorMessenger.hh,v 1.2 2006/06/29 16:39:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/include/EventAction.hh b/examples/extended/electromagnetic/TestEm11/include/EventAction.hh index ce03dae515..a8d5a8169e 100644 --- a/examples/extended/electromagnetic/TestEm11/include/EventAction.hh +++ b/examples/extended/electromagnetic/TestEm11/include/EventAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventAction.hh,v 1.2 2006/06/29 16:39:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/include/EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm11/include/EventActionMessenger.hh index 071fb3fff8..9e1c7bfaee 100644 --- a/examples/extended/electromagnetic/TestEm11/include/EventActionMessenger.hh +++ b/examples/extended/electromagnetic/TestEm11/include/EventActionMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventActionMessenger.hh,v 1.2 2006/06/29 16:39:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/include/HistoManager.hh b/examples/extended/electromagnetic/TestEm11/include/HistoManager.hh index 3dc290e7ad..c32ba53267 100644 --- a/examples/extended/electromagnetic/TestEm11/include/HistoManager.hh +++ b/examples/extended/electromagnetic/TestEm11/include/HistoManager.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoManager.hh,v 1.3 2006/06/29 16:39:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/include/HistoMessenger.hh b/examples/extended/electromagnetic/TestEm11/include/HistoMessenger.hh index 2c47d2b60f..a934db896b 100644 --- a/examples/extended/electromagnetic/TestEm11/include/HistoMessenger.hh +++ b/examples/extended/electromagnetic/TestEm11/include/HistoMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoMessenger.hh,v 1.2 2006/06/29 16:39:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/include/PhysListEmLivermore.hh b/examples/extended/electromagnetic/TestEm11/include/PhysListEmLivermore.hh index 455b8b353d..d33e71a9d8 100644 --- a/examples/extended/electromagnetic/TestEm11/include/PhysListEmLivermore.hh +++ b/examples/extended/electromagnetic/TestEm11/include/PhysListEmLivermore.hh @@ -25,7 +25,7 @@ // // // $Id: PhysListEmLivermore.hh,v 1.2 2006/06/29 16:39:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/include/PhysListEmPenelope.hh b/examples/extended/electromagnetic/TestEm11/include/PhysListEmPenelope.hh index 78406c6bd3..b2aec64ca8 100644 --- a/examples/extended/electromagnetic/TestEm11/include/PhysListEmPenelope.hh +++ b/examples/extended/electromagnetic/TestEm11/include/PhysListEmPenelope.hh @@ -25,7 +25,7 @@ // // // $Id: PhysListEmPenelope.hh,v 1.2 2006/06/29 16:39:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/include/PhysListEmStandard.hh b/examples/extended/electromagnetic/TestEm11/include/PhysListEmStandard.hh index d2785c1eda..c90c4451cf 100644 --- a/examples/extended/electromagnetic/TestEm11/include/PhysListEmStandard.hh +++ b/examples/extended/electromagnetic/TestEm11/include/PhysListEmStandard.hh @@ -25,7 +25,7 @@ // // // $Id: PhysListEmStandard.hh,v 1.2 2006/06/29 16:39:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/include/PhysicsList.hh b/examples/extended/electromagnetic/TestEm11/include/PhysicsList.hh index f1c0cefd24..f4b48ee24c 100644 --- a/examples/extended/electromagnetic/TestEm11/include/PhysicsList.hh +++ b/examples/extended/electromagnetic/TestEm11/include/PhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: PhysicsList.hh,v 1.3 2006/06/29 16:39:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... // diff --git a/examples/extended/electromagnetic/TestEm11/include/PhysicsListMessenger.hh b/examples/extended/electromagnetic/TestEm11/include/PhysicsListMessenger.hh index 7d2077dce9..77bf33235f 100644 --- a/examples/extended/electromagnetic/TestEm11/include/PhysicsListMessenger.hh +++ b/examples/extended/electromagnetic/TestEm11/include/PhysicsListMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListMessenger.hh,v 1.2 2006/06/29 16:39:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/include/PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm11/include/PrimaryGeneratorAction.hh index 6f4df971ac..0ebbe3c74a 100644 --- a/examples/extended/electromagnetic/TestEm11/include/PrimaryGeneratorAction.hh +++ b/examples/extended/electromagnetic/TestEm11/include/PrimaryGeneratorAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorAction.hh,v 1.2 2006/06/29 16:39:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/include/PrimaryGeneratorMessenger.hh b/examples/extended/electromagnetic/TestEm11/include/PrimaryGeneratorMessenger.hh index d94cad2e3a..e72eed8c13 100644 --- a/examples/extended/electromagnetic/TestEm11/include/PrimaryGeneratorMessenger.hh +++ b/examples/extended/electromagnetic/TestEm11/include/PrimaryGeneratorMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorMessenger.hh,v 1.2 2006/06/29 16:39:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/include/RunAction.hh b/examples/extended/electromagnetic/TestEm11/include/RunAction.hh index 809f004794..8472ab4300 100644 --- a/examples/extended/electromagnetic/TestEm11/include/RunAction.hh +++ b/examples/extended/electromagnetic/TestEm11/include/RunAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RunAction.hh,v 1.2 2006/06/29 16:39:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/include/StepMax.hh b/examples/extended/electromagnetic/TestEm11/include/StepMax.hh index 78a5e0e983..fa489d7e40 100644 --- a/examples/extended/electromagnetic/TestEm11/include/StepMax.hh +++ b/examples/extended/electromagnetic/TestEm11/include/StepMax.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMax.hh,v 1.3 2006/06/29 16:39:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/include/StepMaxMessenger.hh b/examples/extended/electromagnetic/TestEm11/include/StepMaxMessenger.hh index 7839856b0d..e09b198e0a 100644 --- a/examples/extended/electromagnetic/TestEm11/include/StepMaxMessenger.hh +++ b/examples/extended/electromagnetic/TestEm11/include/StepMaxMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMaxMessenger.hh,v 1.3 2006/06/29 16:40:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/include/SteppingAction.hh b/examples/extended/electromagnetic/TestEm11/include/SteppingAction.hh index 92087bbfbe..255a7b32b5 100644 --- a/examples/extended/electromagnetic/TestEm11/include/SteppingAction.hh +++ b/examples/extended/electromagnetic/TestEm11/include/SteppingAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingAction.hh,v 1.2 2006/06/29 16:40:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/include/SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm11/include/SteppingVerbose.hh index 0846c28cd7..1d6844a72b 100644 --- a/examples/extended/electromagnetic/TestEm11/include/SteppingVerbose.hh +++ b/examples/extended/electromagnetic/TestEm11/include/SteppingVerbose.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingVerbose.hh,v 1.2 2006/06/29 16:40:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/include/TrackingAction.hh b/examples/extended/electromagnetic/TestEm11/include/TrackingAction.hh index dd1905ae9b..2bc2fd61fe 100644 --- a/examples/extended/electromagnetic/TestEm11/include/TrackingAction.hh +++ b/examples/extended/electromagnetic/TestEm11/include/TrackingAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TrackingAction.hh,v 1.2 2006/06/29 16:40:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/range.mac b/examples/extended/electromagnetic/TestEm11/range.mac index 945ddbb655..7480e26fbf 100644 --- a/examples/extended/electromagnetic/TestEm11/range.mac +++ b/examples/extended/electromagnetic/TestEm11/range.mac @@ -1,4 +1,4 @@ -# $Id: range.mac,v 1.1 2006/03/28 11:00:22 maire Exp $ +# $Id: range.mac,v 1.3 2006/09/18 17:26:20 maire Exp $ # # Macro file for "TestEm11.cc" # @@ -8,7 +8,7 @@ /control/verbose 2 /run/verbose 2 # -/testem/det/setMat G4_WATER +/testem/det/setMat Water /testem/det/setSizeX 5 mm /testem/det/setSizeYZ 5 mm # @@ -26,11 +26,11 @@ /process/eLoss/fluct false # /gun/particle e- -/gun/energy 100 keV +/gun/energy 500 keV # -/testem/histo/setFileName range +/testem/histo/setFileName range.std /testem/histo/setFileType hbook -/testem/histo/setHisto 3 200 0 2000 um # csda range +/testem/histo/setHisto 3 200 0 4 mm # csda range # /testem/event/printModulo 2000 # diff --git a/examples/extended/electromagnetic/TestEm11/run01.mac b/examples/extended/electromagnetic/TestEm11/run01.mac index 0e3447c77f..05deabaa89 100644 --- a/examples/extended/electromagnetic/TestEm11/run01.mac +++ b/examples/extended/electromagnetic/TestEm11/run01.mac @@ -1,4 +1,4 @@ -# $Id: run01.mac,v 1.4 2006/04/11 14:59:45 maire Exp $ +# $Id: run01.mac,v 1.5 2006/07/06 15:56:38 maire Exp $ # # limit the step size from histo 1 # @@ -10,7 +10,7 @@ /testem/det/setSizeYZ 1 mm # /testem/phys/addPhysics standard # em physics -###/testem/phys/addPhysics g4v52 # em physics +###/testem/phys/addPhysics penelope # em physics # /run/initialize # diff --git a/examples/extended/electromagnetic/TestEm11/run02.mac b/examples/extended/electromagnetic/TestEm11/run02.mac index 820598a804..9ed162f4d8 100644 --- a/examples/extended/electromagnetic/TestEm11/run02.mac +++ b/examples/extended/electromagnetic/TestEm11/run02.mac @@ -1,4 +1,4 @@ -# $Id: run02.mac,v 1.3 2006/04/11 14:59:45 maire Exp $ +# $Id: run02.mac,v 1.4 2006/10/26 10:18:59 maire Exp $ # # limit the step size by geometry # @@ -11,7 +11,7 @@ /testem/det/setNbOfLayers 100 # /testem/phys/addPhysics standard # em physics -###/testem/phys/addPhysics g4v52 # em physics +###/testem/phys/addPhysics penelope # em physics # /run/initialize # diff --git a/examples/extended/electromagnetic/TestEm11/src/DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm11/src/DetectorConstruction.cc index 2082197368..0834a94e1c 100644 --- a/examples/extended/electromagnetic/TestEm11/src/DetectorConstruction.cc +++ b/examples/extended/electromagnetic/TestEm11/src/DetectorConstruction.cc @@ -23,8 +23,9 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: DetectorConstruction.cc,v 1.3 2006/06/29 16:40:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: DetectorConstruction.cc,v 1.6 2006/10/26 10:18:59 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ + // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -91,11 +92,21 @@ void DetectorConstruction::DefineMaterials() man->FindOrBuildMaterial("G4_Fe", isotopes); man->FindOrBuildMaterial("G4_Ge", isotopes); man->FindOrBuildMaterial("G4_W" , isotopes); + man->FindOrBuildMaterial("G4_Au", isotopes); man->FindOrBuildMaterial("G4_Pb", isotopes); man->FindOrBuildMaterial("G4_AIR" , isotopes); - man->FindOrBuildMaterial("G4_WATER", isotopes); - + ///man->FindOrBuildMaterial("G4_WATER", isotopes); + + G4Element* H = man->FindOrBuildElement("H", isotopes); + G4Element* O = man->FindOrBuildElement("O", isotopes); + + G4Material* H2O = + new G4Material("Water", 1.000*g/cm3, 2); + H2O->AddElement(H, 2); + H2O->AddElement(O, 1); + H2O->GetIonisation()->SetMeanExcitationEnergy(75.0*eV); + G4cout << *(G4Material::GetMaterialTable()) << G4endl; } diff --git a/examples/extended/electromagnetic/TestEm11/src/DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm11/src/DetectorMessenger.cc index 5b4ef06798..ebd0ae4500 100644 --- a/examples/extended/electromagnetic/TestEm11/src/DetectorMessenger.cc +++ b/examples/extended/electromagnetic/TestEm11/src/DetectorMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorMessenger.cc,v 1.2 2006/06/29 16:40:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/src/EventAction.cc b/examples/extended/electromagnetic/TestEm11/src/EventAction.cc index ddd2173488..360616687e 100644 --- a/examples/extended/electromagnetic/TestEm11/src/EventAction.cc +++ b/examples/extended/electromagnetic/TestEm11/src/EventAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventAction.cc,v 1.2 2006/06/29 16:40:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/src/EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm11/src/EventActionMessenger.cc index f7f1226ef2..5abd01fc45 100644 --- a/examples/extended/electromagnetic/TestEm11/src/EventActionMessenger.cc +++ b/examples/extended/electromagnetic/TestEm11/src/EventActionMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventActionMessenger.cc,v 1.2 2006/06/29 16:40:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/src/HistoManager.cc b/examples/extended/electromagnetic/TestEm11/src/HistoManager.cc index 7cef1debe6..2e4cf10d4c 100644 --- a/examples/extended/electromagnetic/TestEm11/src/HistoManager.cc +++ b/examples/extended/electromagnetic/TestEm11/src/HistoManager.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HistoManager.cc,v 1.3 2006/06/29 16:40:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HistoManager.cc,v 1.4 2006/07/06 15:56:38 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -199,11 +199,11 @@ void HistoManager::SetHisto(G4int ih, << nbins << " bins from " << vmin << " " << unit << " to " << vmax << " " << unit << G4endl; - // compute constraint of stepMax from histos 1 + // compute constraint on stepMax from histos 1 // G4double frac = 1.; if (ih == 1) { - stepMax = std::min(stepMax,frac*Width[ih]); + stepMax = frac*Width[ih]; G4cout << " stepMax = " << G4BestUnit(stepMax,"Length") << G4endl; } } diff --git a/examples/extended/electromagnetic/TestEm11/src/HistoMessenger.cc b/examples/extended/electromagnetic/TestEm11/src/HistoMessenger.cc index 80f7312b7b..7c1469ef34 100644 --- a/examples/extended/electromagnetic/TestEm11/src/HistoMessenger.cc +++ b/examples/extended/electromagnetic/TestEm11/src/HistoMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoMessenger.cc,v 1.3 2006/06/29 16:40:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/src/PhysListEmG4v52.cc b/examples/extended/electromagnetic/TestEm11/src/PhysListEmG4v52.cc deleted file mode 100644 index 28a159e0ca..0000000000 --- a/examples/extended/electromagnetic/TestEm11/src/PhysListEmG4v52.cc +++ /dev/null @@ -1,120 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: PhysListEmG4v52.cc,v 1.2 2006/06/29 16:40:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#include "PhysListEmG4v52.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" - -#include "G4ComptonScattering52.hh" -#include "G4GammaConversion52.hh" -#include "G4PhotoElectricEffect52.hh" - -#include "G4MultipleScattering52.hh" - -#include "G4eIonisation52.hh" -#include "G4eBremsstrahlung52.hh" -#include "G4eplusAnnihilation52.hh" - -#include "G4MuIonisation52.hh" -#include "G4MuBremsstrahlung52.hh" -#include "G4MuPairProduction52.hh" - -#include "G4hIonisation52.hh" - - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListEmG4v52::PhysListEmG4v52(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListEmG4v52::~PhysListEmG4v52() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void PhysListEmG4v52::ConstructProcess() -{ - // Add EM processes realised on base of prototype of model approach design - - theParticleIterator->reset(); - while( (*theParticleIterator)() ){ - G4ParticleDefinition* particle = theParticleIterator->value(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - G4String particleName = particle->GetParticleName(); - - if (particleName == "gamma") { - // gamma - pmanager->AddDiscreteProcess(new G4PhotoElectricEffect52); - pmanager->AddDiscreteProcess(new G4ComptonScattering52); - pmanager->AddDiscreteProcess(new G4GammaConversion52); - - } else if (particleName == "e-") { - //electron - pmanager->AddProcess(new G4MultipleScattering52, -1, 1,1); - pmanager->AddProcess(new G4eIonisation52, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung52, -1,-1,3); - - } else if (particleName == "e+") { - //positron - pmanager->AddProcess(new G4MultipleScattering52, -1, 1,1); - pmanager->AddProcess(new G4eIonisation52, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung52, -1,-1,3); - pmanager->AddProcess(new G4eplusAnnihilation52, 0,-1,4); - - } else if( particleName == "mu+" || - particleName == "mu-" ) { - //muon - pmanager->AddProcess(new G4MultipleScattering52,-1, 1,1); - pmanager->AddProcess(new G4MuIonisation52, -1, 2,2); - pmanager->AddProcess(new G4MuBremsstrahlung52, -1,-1,3); - pmanager->AddProcess(new G4MuPairProduction52, -1,-1,4); - - } else if( particleName == "GenericIon" ) { - - pmanager->AddProcess(new G4MultipleScattering52,-1,1,1); - pmanager->AddProcess(new G4hIonisation52, -1,2,2); - - } else if ((!particle->IsShortLived()) && - (particle->GetPDGCharge() != 0.0) && - (particle->GetParticleName() != "chargedgeantino")) { - //all others charged particles except geantino - pmanager->AddProcess(new G4MultipleScattering52,-1,1,1); - pmanager->AddProcess(new G4hIonisation52, -1,2,2); - } - } -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - diff --git a/examples/extended/electromagnetic/TestEm11/src/PhysListEmLivermore.cc b/examples/extended/electromagnetic/TestEm11/src/PhysListEmLivermore.cc index e95da4437e..ee57665ff1 100644 --- a/examples/extended/electromagnetic/TestEm11/src/PhysListEmLivermore.cc +++ b/examples/extended/electromagnetic/TestEm11/src/PhysListEmLivermore.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: PhysListEmLivermore.cc,v 1.3 2006/06/29 16:40:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListEmLivermore.cc,v 1.4 2006/09/18 17:26:20 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -108,8 +108,8 @@ void PhysListEmLivermore::ConstructProcess() (particle->GetPDGCharge() != 0.0) && (particle->GetParticleName() != "chargedgeantino")) { //all others charged particles except geantino - ///pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); - ///pmanager->AddProcess(new G4hLowEnergyIonisation, -1, 2, 2); + pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4hLowEnergyIonisation, -1, 2, 2); } } } diff --git a/examples/extended/electromagnetic/TestEm11/src/PhysListEmPenelope.cc b/examples/extended/electromagnetic/TestEm11/src/PhysListEmPenelope.cc index c43a9063e7..e76fff211d 100644 --- a/examples/extended/electromagnetic/TestEm11/src/PhysListEmPenelope.cc +++ b/examples/extended/electromagnetic/TestEm11/src/PhysListEmPenelope.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: PhysListEmPenelope.cc,v 1.2 2006/06/29 16:40:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListEmPenelope.cc,v 1.3 2006/09/18 17:26:20 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/src/PhysListEmStandard.cc b/examples/extended/electromagnetic/TestEm11/src/PhysListEmStandard.cc index e477de7a0c..fd68d08900 100644 --- a/examples/extended/electromagnetic/TestEm11/src/PhysListEmStandard.cc +++ b/examples/extended/electromagnetic/TestEm11/src/PhysListEmStandard.cc @@ -25,7 +25,7 @@ // // // $Id: PhysListEmStandard.cc,v 1.3 2006/06/29 16:40:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/src/PhysicsList.cc b/examples/extended/electromagnetic/TestEm11/src/PhysicsList.cc index b42c2aa74a..6a85222374 100644 --- a/examples/extended/electromagnetic/TestEm11/src/PhysicsList.cc +++ b/examples/extended/electromagnetic/TestEm11/src/PhysicsList.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: PhysicsList.cc,v 1.4 2006/06/29 16:40:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysicsList.cc,v 1.5 2006/10/26 10:18:59 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -33,9 +33,6 @@ #include "PhysicsListMessenger.hh" #include "PhysListEmStandard.hh" -#include "PhysListEmG4v52.hh" -#include "PhysListEmG4v71.hh" - #include "PhysListEmLivermore.hh" #include "PhysListEmPenelope.hh" @@ -213,18 +210,6 @@ void PhysicsList::AddPhysicsList(const G4String& name) emName = name; delete emPhysicsList; emPhysicsList = new PhysListEmStandard(name); - - } else if (name == "g4v52") { - - emName = name; - delete emPhysicsList; - emPhysicsList = new PhysListEmG4v52(name); - - } else if (name == "g4v71") { - - emName = name; - delete emPhysicsList; - emPhysicsList = new PhysListEmG4v71(name); } else if (name == "livermore") { diff --git a/examples/extended/electromagnetic/TestEm11/src/PhysicsListMessenger.cc b/examples/extended/electromagnetic/TestEm11/src/PhysicsListMessenger.cc index 0b94e3b653..6ff54def45 100644 --- a/examples/extended/electromagnetic/TestEm11/src/PhysicsListMessenger.cc +++ b/examples/extended/electromagnetic/TestEm11/src/PhysicsListMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListMessenger.cc,v 1.2 2006/06/29 16:40:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/src/PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm11/src/PrimaryGeneratorAction.cc index 31c67ff254..ef0b5c823d 100644 --- a/examples/extended/electromagnetic/TestEm11/src/PrimaryGeneratorAction.cc +++ b/examples/extended/electromagnetic/TestEm11/src/PrimaryGeneratorAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorAction.cc,v 1.2 2006/06/29 16:40:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/src/PrimaryGeneratorMessenger.cc b/examples/extended/electromagnetic/TestEm11/src/PrimaryGeneratorMessenger.cc index 578484fcde..28f8c7176d 100644 --- a/examples/extended/electromagnetic/TestEm11/src/PrimaryGeneratorMessenger.cc +++ b/examples/extended/electromagnetic/TestEm11/src/PrimaryGeneratorMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorMessenger.cc,v 1.2 2006/06/29 16:40:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/src/RunAction.cc b/examples/extended/electromagnetic/TestEm11/src/RunAction.cc index 45c34e009a..0e4df4c7bb 100644 --- a/examples/extended/electromagnetic/TestEm11/src/RunAction.cc +++ b/examples/extended/electromagnetic/TestEm11/src/RunAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RunAction.cc,v 1.6 2006/06/29 16:40:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/src/StepMax.cc b/examples/extended/electromagnetic/TestEm11/src/StepMax.cc index 4de3567114..aaf61c6689 100644 --- a/examples/extended/electromagnetic/TestEm11/src/StepMax.cc +++ b/examples/extended/electromagnetic/TestEm11/src/StepMax.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMax.cc,v 1.3 2006/06/29 16:40:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/src/StepMaxMessenger.cc b/examples/extended/electromagnetic/TestEm11/src/StepMaxMessenger.cc index 788ddee2bb..aeaa1c23cc 100644 --- a/examples/extended/electromagnetic/TestEm11/src/StepMaxMessenger.cc +++ b/examples/extended/electromagnetic/TestEm11/src/StepMaxMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMaxMessenger.cc,v 1.3 2006/06/29 16:40:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/src/SteppingAction.cc b/examples/extended/electromagnetic/TestEm11/src/SteppingAction.cc index 8e267b3921..9fa3a624c0 100644 --- a/examples/extended/electromagnetic/TestEm11/src/SteppingAction.cc +++ b/examples/extended/electromagnetic/TestEm11/src/SteppingAction.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: SteppingAction.cc,v 1.3 2006/06/29 16:41:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: SteppingAction.cc,v 1.4 2006/09/18 17:26:20 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -65,7 +65,7 @@ void SteppingAction::UserSteppingAction(const G4Step* aStep) // G4ThreeVector prePoint = aStep->GetPreStepPoint() ->GetPosition(); G4ThreeVector postPoint = aStep->GetPostStepPoint()->GetPosition(); - G4ThreeVector point = prePoint + G4UniformRand()*(postPoint - prePoint); + G4ThreeVector point = prePoint + G4UniformRand()*(postPoint - prePoint); G4double x = point.x() + 0.5*detector->GetAbsorSizeX(); histoManager->FillHisto(1, x, edep); diff --git a/examples/extended/electromagnetic/TestEm11/src/SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm11/src/SteppingVerbose.cc index 0d6942dc38..44e90cc889 100644 --- a/examples/extended/electromagnetic/TestEm11/src/SteppingVerbose.cc +++ b/examples/extended/electromagnetic/TestEm11/src/SteppingVerbose.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingVerbose.cc,v 1.2 2006/06/29 16:41:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/src/TrackingAction.cc b/examples/extended/electromagnetic/TestEm11/src/TrackingAction.cc index 1540274667..f2b0cc99d9 100644 --- a/examples/extended/electromagnetic/TestEm11/src/TrackingAction.cc +++ b/examples/extended/electromagnetic/TestEm11/src/TrackingAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TrackingAction.cc,v 1.2 2006/06/29 16:41:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/water.mac b/examples/extended/electromagnetic/TestEm11/water.mac index 3843f995a2..cc360c4270 100644 --- a/examples/extended/electromagnetic/TestEm11/water.mac +++ b/examples/extended/electromagnetic/TestEm11/water.mac @@ -1,11 +1,11 @@ -# $Id: water.mac,v 1.3 2006/02/16 17:32:43 maire Exp $ +# $Id: water.mac,v 1.4 2006/09/18 17:26:20 maire Exp $ # # no constraint on tracking step # /control/verbose 2 /run/verbose 2 # -/testem/det/setMat G4_WATER +/testem/det/setMat Water /testem/det/setSizeX 3 cm /testem/det/setSizeYZ 3 cm # diff --git a/examples/extended/electromagnetic/TestEm12/GNUmakefile b/examples/extended/electromagnetic/TestEm12/GNUmakefile index efb2e2fb79..8869b567c6 100644 --- a/examples/extended/electromagnetic/TestEm12/GNUmakefile +++ b/examples/extended/electromagnetic/TestEm12/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.1 2005/07/22 11:08:48 maire Exp $ +# $Id: GNUmakefile,v 1.2 2006/10/25 17:27:01 maire Exp $ # -------------------------------------------------------------- # GNUmakefile for examples module. Gabriele Cosmo, 06/04/98. # -------------------------------------------------------------- @@ -25,7 +25,7 @@ include $(G4INSTALL)/config/architecture.gmk ifdef G4ANALYSIS_USE # for the aida-config command see the README file CPPFLAGS += `aida-config --include` - LDFLAGS += `aida-config --lib` + LOADLIBS += `aida-config --lib` endif include $(G4INSTALL)/config/binmake.gmk diff --git a/examples/extended/electromagnetic/TestEm12/History b/examples/extended/electromagnetic/TestEm12/History index da382dcb02..0e1e265100 100644 --- a/examples/extended/electromagnetic/TestEm12/History +++ b/examples/extended/electromagnetic/TestEm12/History @@ -1,4 +1,4 @@ -$Id: History,v 1.10 2006/05/19 15:35:15 maire Exp $ +$Id: History,v 1.11 2006/10/25 17:27:02 maire Exp $ ------------------------------------------------------------------- ========================================================= @@ -14,6 +14,11 @@ track of all tags. ---------------------------------------------------------- * Reverse chronological order (last date on top), please * ---------------------------------------------------------- + + +24-10-06 mma (testem12-V08-01-00) +- GNUmakefile : LOADLIBS +- remove PhysicsLists 52 and 71 19-05-06 mma (testem12-V08-00-02) - update README diff --git a/examples/extended/electromagnetic/TestEm12/TestEm12.cc b/examples/extended/electromagnetic/TestEm12/TestEm12.cc index 1892e76ee4..a2e322941d 100644 --- a/examples/extended/electromagnetic/TestEm12/TestEm12.cc +++ b/examples/extended/electromagnetic/TestEm12/TestEm12.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TestEm12.cc,v 1.4 2006/06/29 16:41:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/TestEm12.in b/examples/extended/electromagnetic/TestEm12/TestEm12.in index f7000e61bb..a7d97e1660 100644 --- a/examples/extended/electromagnetic/TestEm12/TestEm12.in +++ b/examples/extended/electromagnetic/TestEm12/TestEm12.in @@ -1,4 +1,4 @@ -# $Id: TestEm12.in,v 1.6 2006/05/19 15:35:15 maire Exp $ +# $Id: TestEm12.in,v 1.7 2006/10/25 17:27:02 maire Exp $ # # limit the step size from histos 1 and 8 # @@ -10,7 +10,6 @@ /testem/det/setNbOfLayers 1 # /testem/phys/addPhysics standard # em physics -###/testem/phys/addPhysics g4v52 # em physics # /run/initialize # diff --git a/examples/extended/electromagnetic/TestEm12/TestEm12.out b/examples/extended/electromagnetic/TestEm12/TestEm12.out index b2168e85a8..f5a7c70897 100644 --- a/examples/extended/electromagnetic/TestEm12/TestEm12.out +++ b/examples/extended/electromagnetic/TestEm12/TestEm12.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -61,17 +61,13 @@ Registered model factories: drawByCharge drawByParticleID drawByOriginVolume - -Registered models: - None + drawByAttribute Registered filter factories: chargeFilter particleFilter originVolumeFilter - -Registered filters: - None + attributeFilter /run/verbose 2 # @@ -81,7 +77,6 @@ Registered filters: # /testem/phys/addPhysics standard # em physics PhysicsList::AddPhysicsList: -###/testem/phys/addPhysics g4v52 # em physics # /run/initialize userDetector->Construct() start. @@ -124,6 +119,7 @@ PhysicsList::SetCuts:CutLength : 1 mm /run/beamOn 10000 phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV Sampling according Klein-Nishina model @@ -131,7 +127,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.022 MeV to 100 GeV in 100 bins. @@ -165,7 +161,7 @@ eBrem: tables are built for e+ Total cross sections from a parametrisation based on the EEDL data library. Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -311,7 +307,7 @@ Start Run processing. Run terminated. Run Summary Number of events processed : 10000 - User=623.02s Real=773.01s Sys=123.98s + User=639.23s Real=740.01s Sys=43.11s ======================== run summary ====================== @@ -319,18 +315,18 @@ Run Summary ============================================================ - Total Energy deposited = 3.942 MeV +- 203.122 keV + Total Energy deposited = 3.937 MeV +- 222.512 keV - Track length of primary track = 2.020 cm +- 2.712 mm + Track length of primary track = 2.020 cm +- 2.729 mm Range from EmCalculator = 2.021 cm (from full dE/dx) - Projected range = 1.267 cm +- 3.984 mm + Projected range = 1.315 cm +- 4.420 mm - Nb of steps of primary track = 239.01 +- 30.16 Step size= 84.518 um +- 4.494 um + Nb of steps of primary track = 238.75 +- 30.39 Step size= 84.595 um +- 4.546 um --------- Ranecu engine status --------- Initial seed (index) = 0 - Current couple of seeds = 886262852, 1206969110 + Current couple of seeds = 1061622923, 978064961 ---------------------------------------- Graphics systems deleted. Visualization Manager deleting... @@ -340,7 +336,9 @@ UserRunAction deleted. UserPrimaryGenerator deleted. G4 kernel has come to Quit state. EventManager deleted. +Default detector region deleted. UImanager deleted. +Units table cleared. StateManager deleted. RunManagerKernel is deleted. RunManager is deleting. diff --git a/examples/extended/electromagnetic/TestEm12/include/DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm12/include/DetectorConstruction.hh index 6e30d3a815..f846d0225c 100644 --- a/examples/extended/electromagnetic/TestEm12/include/DetectorConstruction.hh +++ b/examples/extended/electromagnetic/TestEm12/include/DetectorConstruction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorConstruction.hh,v 1.2 2006/06/29 16:42:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/include/DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm12/include/DetectorMessenger.hh index efd2126705..39d19dc40c 100644 --- a/examples/extended/electromagnetic/TestEm12/include/DetectorMessenger.hh +++ b/examples/extended/electromagnetic/TestEm12/include/DetectorMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorMessenger.hh,v 1.2 2006/06/29 16:42:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/include/EventAction.hh b/examples/extended/electromagnetic/TestEm12/include/EventAction.hh index 829ebce4b1..d3b4e39732 100644 --- a/examples/extended/electromagnetic/TestEm12/include/EventAction.hh +++ b/examples/extended/electromagnetic/TestEm12/include/EventAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventAction.hh,v 1.2 2006/06/29 16:42:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/include/EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm12/include/EventActionMessenger.hh index f78523f2a4..eb9548db4f 100644 --- a/examples/extended/electromagnetic/TestEm12/include/EventActionMessenger.hh +++ b/examples/extended/electromagnetic/TestEm12/include/EventActionMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventActionMessenger.hh,v 1.2 2006/06/29 16:42:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/include/HistoManager.hh b/examples/extended/electromagnetic/TestEm12/include/HistoManager.hh index 780b3adaa8..666e729270 100644 --- a/examples/extended/electromagnetic/TestEm12/include/HistoManager.hh +++ b/examples/extended/electromagnetic/TestEm12/include/HistoManager.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoManager.hh,v 1.3 2006/06/29 16:42:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/include/HistoMessenger.hh b/examples/extended/electromagnetic/TestEm12/include/HistoMessenger.hh index c7fec9834b..96156e48a5 100644 --- a/examples/extended/electromagnetic/TestEm12/include/HistoMessenger.hh +++ b/examples/extended/electromagnetic/TestEm12/include/HistoMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoMessenger.hh,v 1.2 2006/06/29 16:42:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/include/PhysListEmG4v52.hh b/examples/extended/electromagnetic/TestEm12/include/PhysListEmG4v52.hh deleted file mode 100644 index 0bceb38f9e..0000000000 --- a/examples/extended/electromagnetic/TestEm12/include/PhysListEmG4v52.hh +++ /dev/null @@ -1,67 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: PhysListEmG4v52.hh,v 1.2 2006/06/29 16:42:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#ifndef PhysListEmG4v52_h -#define PhysListEmG4v52_h 1 - -#include "G4VPhysicsConstructor.hh" -#include "globals.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -class PhysListEmG4v52 : public G4VPhysicsConstructor -{ - public: - PhysListEmG4v52(const G4String& name = "g4v52"); - ~PhysListEmG4v52(); - - public: - // This method is dummy for physics. - void ConstructParticle() {}; - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - void ConstructProcess(); -}; - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#endif - - - - - - - - diff --git a/examples/extended/electromagnetic/TestEm12/include/PhysListEmLivermore.hh b/examples/extended/electromagnetic/TestEm12/include/PhysListEmLivermore.hh index b83d5a526f..30c02af7f7 100644 --- a/examples/extended/electromagnetic/TestEm12/include/PhysListEmLivermore.hh +++ b/examples/extended/electromagnetic/TestEm12/include/PhysListEmLivermore.hh @@ -25,7 +25,7 @@ // // // $Id: PhysListEmLivermore.hh,v 1.2 2006/06/29 16:42:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/include/PhysListEmPenelope.hh b/examples/extended/electromagnetic/TestEm12/include/PhysListEmPenelope.hh index ebd1f8be5b..5190df090c 100644 --- a/examples/extended/electromagnetic/TestEm12/include/PhysListEmPenelope.hh +++ b/examples/extended/electromagnetic/TestEm12/include/PhysListEmPenelope.hh @@ -25,7 +25,7 @@ // // // $Id: PhysListEmPenelope.hh,v 1.2 2006/06/29 16:42:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/include/PhysListEmStandard.hh b/examples/extended/electromagnetic/TestEm12/include/PhysListEmStandard.hh index 0a4259301c..9ca58c5d98 100644 --- a/examples/extended/electromagnetic/TestEm12/include/PhysListEmStandard.hh +++ b/examples/extended/electromagnetic/TestEm12/include/PhysListEmStandard.hh @@ -25,7 +25,7 @@ // // // $Id: PhysListEmStandard.hh,v 1.2 2006/06/29 16:42:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/include/PhysicsList.hh b/examples/extended/electromagnetic/TestEm12/include/PhysicsList.hh index 9d9a8485c3..36a5f44083 100644 --- a/examples/extended/electromagnetic/TestEm12/include/PhysicsList.hh +++ b/examples/extended/electromagnetic/TestEm12/include/PhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: PhysicsList.hh,v 1.3 2006/06/29 16:42:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... // diff --git a/examples/extended/electromagnetic/TestEm12/include/PhysicsListMessenger.hh b/examples/extended/electromagnetic/TestEm12/include/PhysicsListMessenger.hh index 78daf41e67..17cf453875 100644 --- a/examples/extended/electromagnetic/TestEm12/include/PhysicsListMessenger.hh +++ b/examples/extended/electromagnetic/TestEm12/include/PhysicsListMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListMessenger.hh,v 1.2 2006/06/29 16:42:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/include/PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm12/include/PrimaryGeneratorAction.hh index d36fc97ac7..ce8cb01391 100644 --- a/examples/extended/electromagnetic/TestEm12/include/PrimaryGeneratorAction.hh +++ b/examples/extended/electromagnetic/TestEm12/include/PrimaryGeneratorAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorAction.hh,v 1.2 2006/06/29 16:42:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/include/PrimaryGeneratorMessenger.hh b/examples/extended/electromagnetic/TestEm12/include/PrimaryGeneratorMessenger.hh index c82d170680..d9a3125d62 100644 --- a/examples/extended/electromagnetic/TestEm12/include/PrimaryGeneratorMessenger.hh +++ b/examples/extended/electromagnetic/TestEm12/include/PrimaryGeneratorMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorMessenger.hh,v 1.2 2006/06/29 16:42:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/include/RunAction.hh b/examples/extended/electromagnetic/TestEm12/include/RunAction.hh index 3c32f5069c..8b91f05d86 100644 --- a/examples/extended/electromagnetic/TestEm12/include/RunAction.hh +++ b/examples/extended/electromagnetic/TestEm12/include/RunAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RunAction.hh,v 1.3 2006/06/29 16:42:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/include/StepMax.hh b/examples/extended/electromagnetic/TestEm12/include/StepMax.hh index 010d263e22..f315c7959c 100644 --- a/examples/extended/electromagnetic/TestEm12/include/StepMax.hh +++ b/examples/extended/electromagnetic/TestEm12/include/StepMax.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMax.hh,v 1.3 2006/06/29 16:42:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/include/StepMaxMessenger.hh b/examples/extended/electromagnetic/TestEm12/include/StepMaxMessenger.hh index 0402dace52..e174132db8 100644 --- a/examples/extended/electromagnetic/TestEm12/include/StepMaxMessenger.hh +++ b/examples/extended/electromagnetic/TestEm12/include/StepMaxMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMaxMessenger.hh,v 1.3 2006/06/29 16:42:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/include/SteppingAction.hh b/examples/extended/electromagnetic/TestEm12/include/SteppingAction.hh index 8835c00222..77b0088b1d 100644 --- a/examples/extended/electromagnetic/TestEm12/include/SteppingAction.hh +++ b/examples/extended/electromagnetic/TestEm12/include/SteppingAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingAction.hh,v 1.2 2006/06/29 16:42:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/include/SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm12/include/SteppingVerbose.hh index 4a6d525ccd..99d42e810c 100644 --- a/examples/extended/electromagnetic/TestEm12/include/SteppingVerbose.hh +++ b/examples/extended/electromagnetic/TestEm12/include/SteppingVerbose.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingVerbose.hh,v 1.2 2006/06/29 16:42:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/include/TrackingAction.hh b/examples/extended/electromagnetic/TestEm12/include/TrackingAction.hh index 3b5571d856..70d94af163 100644 --- a/examples/extended/electromagnetic/TestEm12/include/TrackingAction.hh +++ b/examples/extended/electromagnetic/TestEm12/include/TrackingAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TrackingAction.hh,v 1.2 2006/06/29 16:42:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/run01.mac b/examples/extended/electromagnetic/TestEm12/run01.mac index 7db6864c97..d16b3a9306 100644 --- a/examples/extended/electromagnetic/TestEm12/run01.mac +++ b/examples/extended/electromagnetic/TestEm12/run01.mac @@ -1,4 +1,4 @@ -# $Id: run01.mac,v 1.4 2006/04/11 13:20:37 maire Exp $ +# $Id: run01.mac,v 1.5 2006/10/25 17:27:02 maire Exp $ # # limit the step size from histos 1 and 8 # @@ -9,7 +9,8 @@ /testem/det/setRadius 3 cm # /testem/phys/addPhysics standard # em physics -###/testem/phys/addPhysics g4v52 # em physics +###/testem/phys/addPhysics livermore # em physics +###/testem/phys/addPhysics penelope # em physics # /run/initialize # diff --git a/examples/extended/electromagnetic/TestEm12/run02.mac b/examples/extended/electromagnetic/TestEm12/run02.mac index 50b020cb19..69f17fbca9 100644 --- a/examples/extended/electromagnetic/TestEm12/run02.mac +++ b/examples/extended/electromagnetic/TestEm12/run02.mac @@ -1,4 +1,4 @@ -# $Id: run02.mac,v 1.3 2006/04/11 13:20:37 maire Exp $ +# $Id: run02.mac,v 1.4 2006/10/25 17:27:02 maire Exp $ # # limit the step size by geometry # @@ -10,7 +10,8 @@ /testem/det/setNbOfLayers 150 # /testem/phys/addPhysics standard # em physics -###/testem/phys/addPhysics g4v52 # em physics +###/testem/phys/addPhysics livermore # em physics +###/testem/phys/addPhysics penelope # em physics # /run/initialize # diff --git a/examples/extended/electromagnetic/TestEm12/src/DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm12/src/DetectorConstruction.cc index 66017114f3..de91b4cdc2 100644 --- a/examples/extended/electromagnetic/TestEm12/src/DetectorConstruction.cc +++ b/examples/extended/electromagnetic/TestEm12/src/DetectorConstruction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorConstruction.cc,v 1.2 2006/06/29 16:43:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/src/DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm12/src/DetectorMessenger.cc index 0f7708e843..faa249b1ba 100644 --- a/examples/extended/electromagnetic/TestEm12/src/DetectorMessenger.cc +++ b/examples/extended/electromagnetic/TestEm12/src/DetectorMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorMessenger.cc,v 1.2 2006/06/29 16:43:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/src/EventAction.cc b/examples/extended/electromagnetic/TestEm12/src/EventAction.cc index b8a342d626..1d9ed9e52e 100644 --- a/examples/extended/electromagnetic/TestEm12/src/EventAction.cc +++ b/examples/extended/electromagnetic/TestEm12/src/EventAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventAction.cc,v 1.2 2006/06/29 16:43:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/src/EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm12/src/EventActionMessenger.cc index aaf87a5d95..0fb4fceeed 100644 --- a/examples/extended/electromagnetic/TestEm12/src/EventActionMessenger.cc +++ b/examples/extended/electromagnetic/TestEm12/src/EventActionMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventActionMessenger.cc,v 1.2 2006/06/29 16:43:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/src/HistoManager.cc b/examples/extended/electromagnetic/TestEm12/src/HistoManager.cc index 99fc085205..6dc9b0b614 100644 --- a/examples/extended/electromagnetic/TestEm12/src/HistoManager.cc +++ b/examples/extended/electromagnetic/TestEm12/src/HistoManager.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoManager.cc,v 1.3 2006/06/29 16:43:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/src/HistoMessenger.cc b/examples/extended/electromagnetic/TestEm12/src/HistoMessenger.cc index 3ab2ee8fa2..f6a418a56f 100644 --- a/examples/extended/electromagnetic/TestEm12/src/HistoMessenger.cc +++ b/examples/extended/electromagnetic/TestEm12/src/HistoMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoMessenger.cc,v 1.3 2006/06/29 16:43:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/src/PhysListEmG4v52.cc b/examples/extended/electromagnetic/TestEm12/src/PhysListEmG4v52.cc deleted file mode 100644 index c01788ee01..0000000000 --- a/examples/extended/electromagnetic/TestEm12/src/PhysListEmG4v52.cc +++ /dev/null @@ -1,120 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: PhysListEmG4v52.cc,v 1.2 2006/06/29 16:43:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#include "PhysListEmG4v52.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" - -#include "G4ComptonScattering52.hh" -#include "G4GammaConversion52.hh" -#include "G4PhotoElectricEffect52.hh" - -#include "G4MultipleScattering52.hh" - -#include "G4eIonisation52.hh" -#include "G4eBremsstrahlung52.hh" -#include "G4eplusAnnihilation52.hh" - -#include "G4MuIonisation52.hh" -#include "G4MuBremsstrahlung52.hh" -#include "G4MuPairProduction52.hh" - -#include "G4hIonisation52.hh" - - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListEmG4v52::PhysListEmG4v52(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListEmG4v52::~PhysListEmG4v52() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void PhysListEmG4v52::ConstructProcess() -{ - // Add EM processes realised on base of prototype of model approach design - - theParticleIterator->reset(); - while( (*theParticleIterator)() ){ - G4ParticleDefinition* particle = theParticleIterator->value(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - G4String particleName = particle->GetParticleName(); - - if (particleName == "gamma") { - // gamma - pmanager->AddDiscreteProcess(new G4PhotoElectricEffect52); - pmanager->AddDiscreteProcess(new G4ComptonScattering52); - pmanager->AddDiscreteProcess(new G4GammaConversion52); - - } else if (particleName == "e-") { - //electron - pmanager->AddProcess(new G4MultipleScattering52, -1, 1,1); - pmanager->AddProcess(new G4eIonisation52, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung52, -1,-1,3); - - } else if (particleName == "e+") { - //positron - pmanager->AddProcess(new G4MultipleScattering52, -1, 1,1); - pmanager->AddProcess(new G4eIonisation52, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung52, -1,-1,3); - pmanager->AddProcess(new G4eplusAnnihilation52, 0,-1,4); - - } else if( particleName == "mu+" || - particleName == "mu-" ) { - //muon - pmanager->AddProcess(new G4MultipleScattering52,-1, 1,1); - pmanager->AddProcess(new G4MuIonisation52, -1, 2,2); - pmanager->AddProcess(new G4MuBremsstrahlung52, -1,-1,3); - pmanager->AddProcess(new G4MuPairProduction52, -1,-1,4); - - } else if( particleName == "GenericIon" ) { - - pmanager->AddProcess(new G4MultipleScattering52,-1,1,1); - pmanager->AddProcess(new G4hIonisation52, -1,2,2); - - } else if ((!particle->IsShortLived()) && - (particle->GetPDGCharge() != 0.0) && - (particle->GetParticleName() != "chargedgeantino")) { - //all others charged particles except geantino - pmanager->AddProcess(new G4MultipleScattering52,-1,1,1); - pmanager->AddProcess(new G4hIonisation52, -1,2,2); - } - } -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - diff --git a/examples/extended/electromagnetic/TestEm12/src/PhysListEmLivermore.cc b/examples/extended/electromagnetic/TestEm12/src/PhysListEmLivermore.cc index b608026bab..103395fe33 100644 --- a/examples/extended/electromagnetic/TestEm12/src/PhysListEmLivermore.cc +++ b/examples/extended/electromagnetic/TestEm12/src/PhysListEmLivermore.cc @@ -25,7 +25,7 @@ // // // $Id: PhysListEmLivermore.cc,v 1.2 2006/06/29 16:43:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/src/PhysListEmPenelope.cc b/examples/extended/electromagnetic/TestEm12/src/PhysListEmPenelope.cc index 17e4591caa..940e448abf 100644 --- a/examples/extended/electromagnetic/TestEm12/src/PhysListEmPenelope.cc +++ b/examples/extended/electromagnetic/TestEm12/src/PhysListEmPenelope.cc @@ -25,7 +25,7 @@ // // // $Id: PhysListEmPenelope.cc,v 1.2 2006/06/29 16:43:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/src/PhysListEmStandard.cc b/examples/extended/electromagnetic/TestEm12/src/PhysListEmStandard.cc index 64f5dd8201..65252ba85b 100644 --- a/examples/extended/electromagnetic/TestEm12/src/PhysListEmStandard.cc +++ b/examples/extended/electromagnetic/TestEm12/src/PhysListEmStandard.cc @@ -25,7 +25,7 @@ // // // $Id: PhysListEmStandard.cc,v 1.2 2006/06/29 16:43:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/src/PhysicsList.cc b/examples/extended/electromagnetic/TestEm12/src/PhysicsList.cc index 1a7393d99c..ed2e59ff48 100644 --- a/examples/extended/electromagnetic/TestEm12/src/PhysicsList.cc +++ b/examples/extended/electromagnetic/TestEm12/src/PhysicsList.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: PhysicsList.cc,v 1.4 2006/06/29 16:43:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysicsList.cc,v 1.5 2006/10/25 17:27:02 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -33,9 +33,6 @@ #include "PhysicsListMessenger.hh" #include "PhysListEmStandard.hh" -#include "PhysListEmG4v52.hh" -#include "PhysListEmG4v71.hh" - #include "PhysListEmLivermore.hh" #include "PhysListEmPenelope.hh" @@ -213,18 +210,6 @@ void PhysicsList::AddPhysicsList(const G4String& name) emName = name; delete emPhysicsList; emPhysicsList = new PhysListEmStandard(name); - - } else if (name == "g4v52") { - - emName = name; - delete emPhysicsList; - emPhysicsList = new PhysListEmG4v52(name); - - } else if (name == "g4v71") { - - emName = name; - delete emPhysicsList; - emPhysicsList = new PhysListEmG4v71(name); } else if (name == "livermore") { diff --git a/examples/extended/electromagnetic/TestEm12/src/PhysicsListMessenger.cc b/examples/extended/electromagnetic/TestEm12/src/PhysicsListMessenger.cc index 96707a672b..72b11885c3 100644 --- a/examples/extended/electromagnetic/TestEm12/src/PhysicsListMessenger.cc +++ b/examples/extended/electromagnetic/TestEm12/src/PhysicsListMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListMessenger.cc,v 1.2 2006/06/29 16:43:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/src/PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm12/src/PrimaryGeneratorAction.cc index 28aee7349b..fee1a5250a 100644 --- a/examples/extended/electromagnetic/TestEm12/src/PrimaryGeneratorAction.cc +++ b/examples/extended/electromagnetic/TestEm12/src/PrimaryGeneratorAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorAction.cc,v 1.2 2006/06/29 16:43:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/src/PrimaryGeneratorMessenger.cc b/examples/extended/electromagnetic/TestEm12/src/PrimaryGeneratorMessenger.cc index d8f40a19bb..ffccd7b207 100644 --- a/examples/extended/electromagnetic/TestEm12/src/PrimaryGeneratorMessenger.cc +++ b/examples/extended/electromagnetic/TestEm12/src/PrimaryGeneratorMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorMessenger.cc,v 1.2 2006/06/29 16:43:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/src/RunAction.cc b/examples/extended/electromagnetic/TestEm12/src/RunAction.cc index 1d47771075..1e1969e830 100644 --- a/examples/extended/electromagnetic/TestEm12/src/RunAction.cc +++ b/examples/extended/electromagnetic/TestEm12/src/RunAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RunAction.cc,v 1.6 2006/06/29 16:43:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/src/StepMax.cc b/examples/extended/electromagnetic/TestEm12/src/StepMax.cc index ffaac8c95e..f4ac8c4477 100644 --- a/examples/extended/electromagnetic/TestEm12/src/StepMax.cc +++ b/examples/extended/electromagnetic/TestEm12/src/StepMax.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMax.cc,v 1.3 2006/06/29 16:43:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/src/StepMaxMessenger.cc b/examples/extended/electromagnetic/TestEm12/src/StepMaxMessenger.cc index 4d3777fd38..91507ffd82 100644 --- a/examples/extended/electromagnetic/TestEm12/src/StepMaxMessenger.cc +++ b/examples/extended/electromagnetic/TestEm12/src/StepMaxMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMaxMessenger.cc,v 1.3 2006/06/29 16:43:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/src/SteppingAction.cc b/examples/extended/electromagnetic/TestEm12/src/SteppingAction.cc index 85f0159a7f..c98951a332 100644 --- a/examples/extended/electromagnetic/TestEm12/src/SteppingAction.cc +++ b/examples/extended/electromagnetic/TestEm12/src/SteppingAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingAction.cc,v 1.3 2006/06/29 16:43:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/src/SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm12/src/SteppingVerbose.cc index cf69eac0e8..20626cfd3d 100644 --- a/examples/extended/electromagnetic/TestEm12/src/SteppingVerbose.cc +++ b/examples/extended/electromagnetic/TestEm12/src/SteppingVerbose.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingVerbose.cc,v 1.2 2006/06/29 16:43:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm12/src/TrackingAction.cc b/examples/extended/electromagnetic/TestEm12/src/TrackingAction.cc index 45944b14a9..5c52cc9ac6 100644 --- a/examples/extended/electromagnetic/TestEm12/src/TrackingAction.cc +++ b/examples/extended/electromagnetic/TestEm12/src/TrackingAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TrackingAction.cc,v 1.2 2006/06/29 16:43:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm13/GNUmakefile b/examples/extended/electromagnetic/TestEm13/GNUmakefile index b32af1bd13..a4b627f497 100644 --- a/examples/extended/electromagnetic/TestEm13/GNUmakefile +++ b/examples/extended/electromagnetic/TestEm13/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.2 2006/04/24 16:48:54 maire Exp $ +# $Id: GNUmakefile,v 1.3 2006/10/24 16:04:29 maire Exp $ # -------------------------------------------------------------- # GNUmakefile for examples module. Gabriele Cosmo, 06/04/98. # -------------------------------------------------------------- @@ -19,7 +19,7 @@ include $(G4INSTALL)/config/architecture.gmk ifdef G4ANALYSIS_USE # for the aida-config command see the README file CPPFLAGS += `aida-config --include` - LDFLAGS += `aida-config --lib` + LOADLIBS += `aida-config --lib` endif include $(G4INSTALL)/config/binmake.gmk diff --git a/examples/extended/electromagnetic/TestEm13/History b/examples/extended/electromagnetic/TestEm13/History index 15a11625e8..93daef45ca 100644 --- a/examples/extended/electromagnetic/TestEm13/History +++ b/examples/extended/electromagnetic/TestEm13/History @@ -1,4 +1,4 @@ -$Id: History,v 1.11 2006/05/19 15:43:35 maire Exp $ +$Id: History,v 1.12 2006/10/24 16:04:30 maire Exp $ ------------------------------------------------------------------- ========================================================= @@ -14,6 +14,9 @@ track of all tags. ---------------------------------------------------------- * Reverse chronological order (last date on top), please * ---------------------------------------------------------- + +24-10-06 mma (testem13-V08-01-00) +- GNUmakefile : LOADLIBS 19-05-06 mma (testem13-V08-00-08) - update README diff --git a/examples/extended/electromagnetic/TestEm13/TestEm13.cc b/examples/extended/electromagnetic/TestEm13/TestEm13.cc index 6d5f0bc811..80d5b444b7 100644 --- a/examples/extended/electromagnetic/TestEm13/TestEm13.cc +++ b/examples/extended/electromagnetic/TestEm13/TestEm13.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TestEm13.cc,v 1.4 2006/06/29 16:43:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm13/TestEm13.out b/examples/extended/electromagnetic/TestEm13/TestEm13.out index 24cd16251f..c8f01c7f3d 100644 --- a/examples/extended/electromagnetic/TestEm13/TestEm13.out +++ b/examples/extended/electromagnetic/TestEm13/TestEm13.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -83,17 +83,13 @@ Registered model factories: drawByCharge drawByParticleID drawByOriginVolume - -Registered models: - None + drawByAttribute Registered filter factories: chargeFilter particleFilter originVolumeFilter - -Registered filters: - None + attributeFilter /run/verbose 2 # @@ -117,6 +113,7 @@ physicsList->setCut() start. /run/beamOn 100000 phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV Sampling according Klein-Nishina model @@ -124,7 +121,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.022 MeV to 100 GeV in 100 bins. @@ -152,7 +149,7 @@ eBrem: tables are built for e+ Total cross sections from a parametrisation based on the EEDL data library. Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -276,7 +273,7 @@ Start Run processing. Run terminated. Run Summary Number of events processed : 100000 - User=21.85s Real=21.99s Sys=0.01s + User=21.14s Real=21.18s Sys=0s The run consists of 100000 gamma of 100 keV through 1 cm of Water (density: 1 g/cm3 ) @@ -343,14 +340,14 @@ Start Run processing. Run terminated. Run Summary Number of events processed : 100000 - User=22.93s Real=23.03s Sys=0s + User=22.03s Real=22.06s Sys=0s The run consists of 100000 e- of 100 MeV through 1 cm of Water (density: 1 g/cm3 ) - Process calls frequency ---> Transportation = 52908 eIoni = 18035 eBrem = 29057 + Process calls frequency ---> Transportation = 52912 eIoni = 18017 eBrem = 29071 - Nb of incident particles unaltered after 1 cm of Water : 52908 over 100000 incident particles. Ratio = 52.908 % - ---> CrossSection per volume: 0.63662 cm^-1 CrossSection per mass: 0.63662 cm2/g + Nb of incident particles unaltered after 1 cm of Water : 52912 over 100000 incident particles. Ratio = 52.912 % + ---> CrossSection per volume: 0.63654 cm^-1 CrossSection per mass: 0.63654 cm2/g Verification from G4EmCalculator: eIoni= 0.24497 cm2/g eBrem= 0.39397 cm2/g total= 0.63894 cm2/g @@ -358,7 +355,7 @@ Run Summary --------- Ranecu engine status --------- Initial seed (index) = 0 - Current couple of seeds = 765263512, 415249894 + Current couple of seeds = 1826055384, 302571145 ---------------------------------------- Graphics systems deleted. Visualization Manager deleting... @@ -368,7 +365,9 @@ UserRunAction deleted. UserPrimaryGenerator deleted. G4 kernel has come to Quit state. EventManager deleted. +Default detector region deleted. UImanager deleted. +Units table cleared. StateManager deleted. RunManagerKernel is deleted. RunManager is deleting. diff --git a/examples/extended/electromagnetic/TestEm13/anni.mac b/examples/extended/electromagnetic/TestEm13/anni.mac index f194e4d648..ab9375d336 100644 --- a/examples/extended/electromagnetic/TestEm13/anni.mac +++ b/examples/extended/electromagnetic/TestEm13/anni.mac @@ -1,4 +1,4 @@ -# $Id: anni.mac,v 1.3 2006/04/24 16:48:54 maire Exp $ +# $Id: anni.mac,v 1.4 2006/06/01 18:17:29 vnivanch Exp $ # # Macro file for "TestEm13.cc" # (can be run in batch, without graphic) @@ -17,7 +17,7 @@ /process/inactivate eBrem # /gun/particle e+ -/gun/energy 100 MeV +/gun/energy 10 MeV # ##/tracking/verbose 2 ##/run/beamOn 1 diff --git a/examples/extended/electromagnetic/TestEm13/include/DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm13/include/DetectorConstruction.hh index d913a8f3f6..6640769060 100644 --- a/examples/extended/electromagnetic/TestEm13/include/DetectorConstruction.hh +++ b/examples/extended/electromagnetic/TestEm13/include/DetectorConstruction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorConstruction.hh,v 1.2 2006/06/29 16:43:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm13/include/DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm13/include/DetectorMessenger.hh index b6bfa4bb31..d7778d3912 100644 --- a/examples/extended/electromagnetic/TestEm13/include/DetectorMessenger.hh +++ b/examples/extended/electromagnetic/TestEm13/include/DetectorMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorMessenger.hh,v 1.2 2006/06/29 16:43:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm13/include/EventAction.hh b/examples/extended/electromagnetic/TestEm13/include/EventAction.hh index e8528e1db5..1824d825d0 100644 --- a/examples/extended/electromagnetic/TestEm13/include/EventAction.hh +++ b/examples/extended/electromagnetic/TestEm13/include/EventAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventAction.hh,v 1.2 2006/06/29 16:43:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm13/include/EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm13/include/EventActionMessenger.hh index c82725ffad..81445f2d9f 100644 --- a/examples/extended/electromagnetic/TestEm13/include/EventActionMessenger.hh +++ b/examples/extended/electromagnetic/TestEm13/include/EventActionMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventActionMessenger.hh,v 1.2 2006/06/29 16:44:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm13/include/PhysListEmLivermore.hh b/examples/extended/electromagnetic/TestEm13/include/PhysListEmLivermore.hh index 4dc78cfbea..db953b2fde 100644 --- a/examples/extended/electromagnetic/TestEm13/include/PhysListEmLivermore.hh +++ b/examples/extended/electromagnetic/TestEm13/include/PhysListEmLivermore.hh @@ -25,7 +25,7 @@ // // // $Id: PhysListEmLivermore.hh,v 1.2 2006/06/29 16:44:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm13/include/PhysListEmPenelope.hh b/examples/extended/electromagnetic/TestEm13/include/PhysListEmPenelope.hh index 1e169f9e93..ba25303b8d 100644 --- a/examples/extended/electromagnetic/TestEm13/include/PhysListEmPenelope.hh +++ b/examples/extended/electromagnetic/TestEm13/include/PhysListEmPenelope.hh @@ -25,7 +25,7 @@ // // // $Id: PhysListEmPenelope.hh,v 1.2 2006/06/29 16:44:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm13/include/PhysListEmStandard.hh b/examples/extended/electromagnetic/TestEm13/include/PhysListEmStandard.hh index a9cc17e7fd..009304a29b 100644 --- a/examples/extended/electromagnetic/TestEm13/include/PhysListEmStandard.hh +++ b/examples/extended/electromagnetic/TestEm13/include/PhysListEmStandard.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysListEmStandard.hh,v 1.2 2006/06/29 16:44:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm13/include/PhysicsList.hh b/examples/extended/electromagnetic/TestEm13/include/PhysicsList.hh index 9de8a8121f..5f682df7f9 100644 --- a/examples/extended/electromagnetic/TestEm13/include/PhysicsList.hh +++ b/examples/extended/electromagnetic/TestEm13/include/PhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: PhysicsList.hh,v 1.3 2006/06/29 16:44:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... // diff --git a/examples/extended/electromagnetic/TestEm13/include/PhysicsListMessenger.hh b/examples/extended/electromagnetic/TestEm13/include/PhysicsListMessenger.hh index 5491f1520c..767094981a 100644 --- a/examples/extended/electromagnetic/TestEm13/include/PhysicsListMessenger.hh +++ b/examples/extended/electromagnetic/TestEm13/include/PhysicsListMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListMessenger.hh,v 1.3 2006/06/29 16:44:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm13/include/PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm13/include/PrimaryGeneratorAction.hh index ccc2578533..ed651b4c47 100644 --- a/examples/extended/electromagnetic/TestEm13/include/PrimaryGeneratorAction.hh +++ b/examples/extended/electromagnetic/TestEm13/include/PrimaryGeneratorAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorAction.hh,v 1.2 2006/06/29 16:44:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm13/include/ProcessesCount.hh b/examples/extended/electromagnetic/TestEm13/include/ProcessesCount.hh index 05fe63dcb2..56f37004a5 100644 --- a/examples/extended/electromagnetic/TestEm13/include/ProcessesCount.hh +++ b/examples/extended/electromagnetic/TestEm13/include/ProcessesCount.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: ProcessesCount.hh,v 1.2 2006/06/29 16:44:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm13/include/RunAction.hh b/examples/extended/electromagnetic/TestEm13/include/RunAction.hh index e4608e782b..4365a93051 100644 --- a/examples/extended/electromagnetic/TestEm13/include/RunAction.hh +++ b/examples/extended/electromagnetic/TestEm13/include/RunAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RunAction.hh,v 1.3 2006/06/29 16:44:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm13/include/SteppingAction.hh b/examples/extended/electromagnetic/TestEm13/include/SteppingAction.hh index ae2318783e..de9236f4ea 100644 --- a/examples/extended/electromagnetic/TestEm13/include/SteppingAction.hh +++ b/examples/extended/electromagnetic/TestEm13/include/SteppingAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingAction.hh,v 1.4 2006/06/29 16:44:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm13/include/SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm13/include/SteppingVerbose.hh index 6a06eeabfb..1b65278665 100644 --- a/examples/extended/electromagnetic/TestEm13/include/SteppingVerbose.hh +++ b/examples/extended/electromagnetic/TestEm13/include/SteppingVerbose.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingVerbose.hh,v 1.2 2006/06/29 16:44:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // This class manages the verbose outputs in G4SteppingManager. // It inherits from G4SteppingVerbose. diff --git a/examples/extended/electromagnetic/TestEm13/src/DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm13/src/DetectorConstruction.cc index 814412fa1d..00889c2605 100644 --- a/examples/extended/electromagnetic/TestEm13/src/DetectorConstruction.cc +++ b/examples/extended/electromagnetic/TestEm13/src/DetectorConstruction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorConstruction.cc,v 1.5 2006/06/29 16:44:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm13/src/DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm13/src/DetectorMessenger.cc index f0127e9a0d..a346f14935 100644 --- a/examples/extended/electromagnetic/TestEm13/src/DetectorMessenger.cc +++ b/examples/extended/electromagnetic/TestEm13/src/DetectorMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorMessenger.cc,v 1.2 2006/06/29 16:44:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm13/src/EventAction.cc b/examples/extended/electromagnetic/TestEm13/src/EventAction.cc index 19439e778b..eba77ce21f 100644 --- a/examples/extended/electromagnetic/TestEm13/src/EventAction.cc +++ b/examples/extended/electromagnetic/TestEm13/src/EventAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventAction.cc,v 1.2 2006/06/29 16:44:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm13/src/EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm13/src/EventActionMessenger.cc index d09b14ccd8..5977a9fa27 100644 --- a/examples/extended/electromagnetic/TestEm13/src/EventActionMessenger.cc +++ b/examples/extended/electromagnetic/TestEm13/src/EventActionMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventActionMessenger.cc,v 1.2 2006/06/29 16:44:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm13/src/PhysListEmLivermore.cc b/examples/extended/electromagnetic/TestEm13/src/PhysListEmLivermore.cc index e71135a20b..20398e436e 100644 --- a/examples/extended/electromagnetic/TestEm13/src/PhysListEmLivermore.cc +++ b/examples/extended/electromagnetic/TestEm13/src/PhysListEmLivermore.cc @@ -25,7 +25,7 @@ // // // $Id: PhysListEmLivermore.cc,v 1.3 2006/06/29 16:44:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm13/src/PhysListEmPenelope.cc b/examples/extended/electromagnetic/TestEm13/src/PhysListEmPenelope.cc index db98840391..345ddc1203 100644 --- a/examples/extended/electromagnetic/TestEm13/src/PhysListEmPenelope.cc +++ b/examples/extended/electromagnetic/TestEm13/src/PhysListEmPenelope.cc @@ -25,7 +25,7 @@ // // // $Id: PhysListEmPenelope.cc,v 1.3 2006/06/29 16:44:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm13/src/PhysListEmStandard.cc b/examples/extended/electromagnetic/TestEm13/src/PhysListEmStandard.cc index 52692c42fb..b7105fdeca 100644 --- a/examples/extended/electromagnetic/TestEm13/src/PhysListEmStandard.cc +++ b/examples/extended/electromagnetic/TestEm13/src/PhysListEmStandard.cc @@ -25,7 +25,7 @@ // // // $Id: PhysListEmStandard.cc,v 1.3 2006/06/29 16:44:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm13/src/PhysicsList.cc b/examples/extended/electromagnetic/TestEm13/src/PhysicsList.cc index 14f72ae8bf..7521966b0a 100644 --- a/examples/extended/electromagnetic/TestEm13/src/PhysicsList.cc +++ b/examples/extended/electromagnetic/TestEm13/src/PhysicsList.cc @@ -25,7 +25,7 @@ // // // $Id: PhysicsList.cc,v 1.5 2006/06/29 16:44:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm13/src/PhysicsListMessenger.cc b/examples/extended/electromagnetic/TestEm13/src/PhysicsListMessenger.cc index b4b109cbf3..5c1281ef89 100644 --- a/examples/extended/electromagnetic/TestEm13/src/PhysicsListMessenger.cc +++ b/examples/extended/electromagnetic/TestEm13/src/PhysicsListMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListMessenger.cc,v 1.3 2006/06/29 16:44:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm13/src/PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm13/src/PrimaryGeneratorAction.cc index 25d8ebdff0..cc08a0d631 100644 --- a/examples/extended/electromagnetic/TestEm13/src/PrimaryGeneratorAction.cc +++ b/examples/extended/electromagnetic/TestEm13/src/PrimaryGeneratorAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorAction.cc,v 1.2 2006/06/29 16:44:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm13/src/RunAction.cc b/examples/extended/electromagnetic/TestEm13/src/RunAction.cc index 92931c5cb3..2c816a8297 100644 --- a/examples/extended/electromagnetic/TestEm13/src/RunAction.cc +++ b/examples/extended/electromagnetic/TestEm13/src/RunAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RunAction.cc,v 1.6 2006/06/29 16:44:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm13/src/SteppingAction.cc b/examples/extended/electromagnetic/TestEm13/src/SteppingAction.cc index fc04be8d61..e3cecf1735 100644 --- a/examples/extended/electromagnetic/TestEm13/src/SteppingAction.cc +++ b/examples/extended/electromagnetic/TestEm13/src/SteppingAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingAction.cc,v 1.5 2006/06/29 16:44:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm13/src/SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm13/src/SteppingVerbose.cc index 79dfa72960..8ff3794d7c 100644 --- a/examples/extended/electromagnetic/TestEm13/src/SteppingVerbose.cc +++ b/examples/extended/electromagnetic/TestEm13/src/SteppingVerbose.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingVerbose.cc,v 1.2 2006/06/29 16:44:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm14/GNUmakefile b/examples/extended/electromagnetic/TestEm14/GNUmakefile index dbc07708ed..0542890e8c 100644 --- a/examples/extended/electromagnetic/TestEm14/GNUmakefile +++ b/examples/extended/electromagnetic/TestEm14/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.2 2006/04/24 15:42:26 maire Exp $ +# $Id: GNUmakefile,v 1.3 2006/10/24 16:54:16 maire Exp $ # -------------------------------------------------------------- # GNUmakefile for examples module. Gabriele Cosmo, 06/04/98. # -------------------------------------------------------------- @@ -25,7 +25,7 @@ include $(G4INSTALL)/config/architecture.gmk ifdef G4ANALYSIS_USE # for the aida-config command see the README file CPPFLAGS += `aida-config --include` - LDFLAGS += `aida-config --lib` + LOADLIBS += `aida-config --lib` endif include $(G4INSTALL)/config/binmake.gmk diff --git a/examples/extended/electromagnetic/TestEm14/History b/examples/extended/electromagnetic/TestEm14/History index 3b85bce257..3b1243a06d 100644 --- a/examples/extended/electromagnetic/TestEm14/History +++ b/examples/extended/electromagnetic/TestEm14/History @@ -1,4 +1,4 @@ -$Id: History,v 1.6 2006/05/19 15:46:37 maire Exp $ +$Id: History,v 1.8 2006/10/24 16:54:16 maire Exp $ ------------------------------------------------------------------- ========================================================= @@ -14,6 +14,13 @@ track of all tags. ---------------------------------------------------------- * Reverse chronological order (last date on top), please * ---------------------------------------------------------- + +24-10-06 mma (testem14-V08-01-01) +- GNUmakefile : LOADLIBS +- remove PhysicsList g4v52 + +06-09-06 mma (testem14-V08-01-00) +- compute mass_energy_transfer coefficient 19-05-06 mma (testem14-V08-00-04) - update README diff --git a/examples/extended/electromagnetic/TestEm14/TestEm14.cc b/examples/extended/electromagnetic/TestEm14/TestEm14.cc index 98069ddd2f..327b9d3466 100644 --- a/examples/extended/electromagnetic/TestEm14/TestEm14.cc +++ b/examples/extended/electromagnetic/TestEm14/TestEm14.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TestEm14.cc,v 1.3 2006/06/29 16:44:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm14/TestEm14.out b/examples/extended/electromagnetic/TestEm14/TestEm14.out index cf9ee76752..e15423d869 100644 --- a/examples/extended/electromagnetic/TestEm14/TestEm14.out +++ b/examples/extended/electromagnetic/TestEm14/TestEm14.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -83,17 +83,13 @@ Registered model factories: drawByCharge drawByParticleID drawByOriginVolume - -Registered models: - None + drawByAttribute Registered filter factories: chargeFilter particleFilter originVolumeFilter - -Registered filters: - None + attributeFilter /run/verbose 2 # @@ -118,6 +114,7 @@ physicsList->setCut() start. /run/beamOn 100000 phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV Sampling according Klein-Nishina model @@ -125,7 +122,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.022 MeV to 100 GeV in 100 bins. @@ -153,7 +150,7 @@ eBrem: tables are built for e+ Total cross sections from a parametrisation based on the EEDL data library. Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -277,7 +274,7 @@ Start Run processing. Run terminated. Run Summary Number of events processed : 100000 - User=23s Real=23s Sys=0.01s + User=23s Real=23s Sys=0s The run consists of 100000 gamma of 100 keV through 100 m of Water (density: 1 g/cm3 ) @@ -286,7 +283,9 @@ Run Summary MeanFreePath: 6.0724 cm +- 6.0579 cm massic: 6.0724 g/cm2 CrossSection: 0.16468 cm^-1 massic: 0.16468 cm2/g - Verification : crossSections from G4EmCalculator. + mean energy of charged secondaries: 15.125 keV mass_energy_transfer coef: 0.024907 cm2/g + + Verification : crossSections from G4EmCalculator compt= 0.1623 cm2/g phot= 0.0026853 cm2/g total= 0.16498 cm2/g --------- Ranecu engine status --------- @@ -344,21 +343,23 @@ Start Run processing. Run terminated. Run Summary Number of events processed : 100000 - User=24s Real=24s Sys=0s + User=23s Real=23s Sys=0s The run consists of 100000 e- of 100 MeV through 100 m of Water (density: 1 g/cm3 ) - Process calls frequency ---> eBrem = 61704 eIoni = 38296 + Process calls frequency ---> eBrem = 61689 eIoni = 38311 - MeanFreePath: 1.5662 cm +- 1.5652 cm massic: 1.5662 g/cm2 - CrossSection: 0.6385 cm^-1 massic: 0.6385 cm2/g + MeanFreePath: 1.5667 cm +- 1.5656 cm massic: 1.5667 g/cm2 + CrossSection: 0.63828 cm^-1 massic: 0.63828 cm2/g - Verification : crossSections from G4EmCalculator. + mean energy of charged secondaries: 704.14 keV mass_energy_transfer coef: 0.0044944 cm2/g + + Verification : crossSections from G4EmCalculator eBrem= 0.39397 cm2/g eIoni= 0.24497 cm2/g total= 0.63894 cm2/g --------- Ranecu engine status --------- Initial seed (index) = 0 - Current couple of seeds = 1508433973, 1464590570 + Current couple of seeds = 1057715345, 1956988917 ---------------------------------------- Graphics systems deleted. Visualization Manager deleting... @@ -368,7 +369,9 @@ UserRunAction deleted. UserPrimaryGenerator deleted. G4 kernel has come to Quit state. EventManager deleted. +Default detector region deleted. UImanager deleted. +Units table cleared. StateManager deleted. RunManagerKernel is deleted. RunManager is deleting. diff --git a/examples/extended/electromagnetic/TestEm14/compton.mac b/examples/extended/electromagnetic/TestEm14/compton.mac index eb4dd39d10..8beee7b360 100644 --- a/examples/extended/electromagnetic/TestEm14/compton.mac +++ b/examples/extended/electromagnetic/TestEm14/compton.mac @@ -1,4 +1,4 @@ -# $Id: compton.mac,v 1.2 2006/05/10 11:15:33 maire Exp $ +# $Id: compton.mac,v 1.3 2006/09/06 09:56:06 maire Exp $ # # Macro file for "TestEm14.cc" # (can be run in batch, without graphic) @@ -10,7 +10,9 @@ # /testem/det/setMat Aluminium # -### /testem/phys/addPhysics g4v52 +/testem/phys/addPhysics standard +####/testem/phys/addPhysics livermore +####/testem/phys/addPhysics penelope # /run/initialize # @@ -28,7 +30,4 @@ /testem/histo/setHisto 3 100 0. 300. keV #energy of ch. secondary /testem/histo/setHisto 4 200 -1. +1. none #costeta of ch. secondary # -##/tracking/verbose 2 -##/run/beamOn 1 -# /run/beamOn 100000 diff --git a/examples/extended/electromagnetic/TestEm14/conv.mac b/examples/extended/electromagnetic/TestEm14/conv.mac index ed41e8ede6..f8d31f6d03 100644 --- a/examples/extended/electromagnetic/TestEm14/conv.mac +++ b/examples/extended/electromagnetic/TestEm14/conv.mac @@ -1,4 +1,4 @@ -# $Id: conv.mac,v 1.1 2006/04/24 15:42:48 maire Exp $ +# $Id: conv.mac,v 1.2 2006/10/24 16:54:16 maire Exp $ # # Macro file for "TestEm13.cc" # (can be run in batch, without graphic) @@ -10,8 +10,6 @@ # /testem/det/setMat Lead # -#### /testem/phys/addPhysics g4v52 -# /run/initialize # /process/inactivate phot diff --git a/examples/extended/electromagnetic/TestEm14/include/DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm14/include/DetectorConstruction.hh index 6554b0cb59..17c93036aa 100644 --- a/examples/extended/electromagnetic/TestEm14/include/DetectorConstruction.hh +++ b/examples/extended/electromagnetic/TestEm14/include/DetectorConstruction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorConstruction.hh,v 1.3 2006/06/29 16:44:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm14/include/DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm14/include/DetectorMessenger.hh index 802197e543..5ef94a4d04 100644 --- a/examples/extended/electromagnetic/TestEm14/include/DetectorMessenger.hh +++ b/examples/extended/electromagnetic/TestEm14/include/DetectorMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorMessenger.hh,v 1.3 2006/06/29 16:44:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm14/include/EventAction.hh b/examples/extended/electromagnetic/TestEm14/include/EventAction.hh index 0f938fff1d..210606cc5e 100644 --- a/examples/extended/electromagnetic/TestEm14/include/EventAction.hh +++ b/examples/extended/electromagnetic/TestEm14/include/EventAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventAction.hh,v 1.3 2006/06/29 16:45:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm14/include/EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm14/include/EventActionMessenger.hh index ceb16c72ee..4cd5021ecd 100644 --- a/examples/extended/electromagnetic/TestEm14/include/EventActionMessenger.hh +++ b/examples/extended/electromagnetic/TestEm14/include/EventActionMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventActionMessenger.hh,v 1.3 2006/06/29 16:45:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm14/include/HistoManager.hh b/examples/extended/electromagnetic/TestEm14/include/HistoManager.hh index a29fece427..bccf7094bb 100644 --- a/examples/extended/electromagnetic/TestEm14/include/HistoManager.hh +++ b/examples/extended/electromagnetic/TestEm14/include/HistoManager.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoManager.hh,v 1.3 2006/06/29 16:45:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm14/include/HistoMessenger.hh b/examples/extended/electromagnetic/TestEm14/include/HistoMessenger.hh index 4187925abb..f9e5b4bbbc 100644 --- a/examples/extended/electromagnetic/TestEm14/include/HistoMessenger.hh +++ b/examples/extended/electromagnetic/TestEm14/include/HistoMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoMessenger.hh,v 1.3 2006/06/29 16:45:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm14/include/PhysListEmG4v52.hh b/examples/extended/electromagnetic/TestEm14/include/PhysListEmG4v52.hh deleted file mode 100644 index 032b8d5421..0000000000 --- a/examples/extended/electromagnetic/TestEm14/include/PhysListEmG4v52.hh +++ /dev/null @@ -1,67 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: PhysListEmG4v52.hh,v 1.3 2006/06/29 16:45:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#ifndef PhysListEmG4v52_h -#define PhysListEmG4v52_h 1 - -#include "G4VPhysicsConstructor.hh" -#include "globals.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -class PhysListEmG4v52 : public G4VPhysicsConstructor -{ - public: - PhysListEmG4v52(const G4String& name = "g4v52"); - ~PhysListEmG4v52(); - - public: - // This method is dummy for physics. - void ConstructParticle() {}; - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - void ConstructProcess(); -}; - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#endif - - - - - - - - diff --git a/examples/extended/electromagnetic/TestEm14/include/PhysListEmLivermore.hh b/examples/extended/electromagnetic/TestEm14/include/PhysListEmLivermore.hh index 96b19a2406..1c1ae24aee 100644 --- a/examples/extended/electromagnetic/TestEm14/include/PhysListEmLivermore.hh +++ b/examples/extended/electromagnetic/TestEm14/include/PhysListEmLivermore.hh @@ -25,7 +25,7 @@ // // // $Id: PhysListEmLivermore.hh,v 1.2 2006/06/29 16:45:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm14/include/PhysListEmPenelope.hh b/examples/extended/electromagnetic/TestEm14/include/PhysListEmPenelope.hh index 0f25e4b72e..51175daa47 100644 --- a/examples/extended/electromagnetic/TestEm14/include/PhysListEmPenelope.hh +++ b/examples/extended/electromagnetic/TestEm14/include/PhysListEmPenelope.hh @@ -25,7 +25,7 @@ // // // $Id: PhysListEmPenelope.hh,v 1.2 2006/06/29 16:45:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm14/include/PhysListEmStandard.hh b/examples/extended/electromagnetic/TestEm14/include/PhysListEmStandard.hh index ff8912133e..49605623cc 100644 --- a/examples/extended/electromagnetic/TestEm14/include/PhysListEmStandard.hh +++ b/examples/extended/electromagnetic/TestEm14/include/PhysListEmStandard.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysListEmStandard.hh,v 1.3 2006/06/29 16:45:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm14/include/PhysicsList.hh b/examples/extended/electromagnetic/TestEm14/include/PhysicsList.hh index 27cf7039db..6c2c66f8d3 100644 --- a/examples/extended/electromagnetic/TestEm14/include/PhysicsList.hh +++ b/examples/extended/electromagnetic/TestEm14/include/PhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: PhysicsList.hh,v 1.3 2006/06/29 16:45:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... // diff --git a/examples/extended/electromagnetic/TestEm14/include/PhysicsListMessenger.hh b/examples/extended/electromagnetic/TestEm14/include/PhysicsListMessenger.hh index 9d2d87e624..a914e9ea4d 100644 --- a/examples/extended/electromagnetic/TestEm14/include/PhysicsListMessenger.hh +++ b/examples/extended/electromagnetic/TestEm14/include/PhysicsListMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListMessenger.hh,v 1.3 2006/06/29 16:45:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm14/include/PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm14/include/PrimaryGeneratorAction.hh index c45faf277e..7904b5ce49 100644 --- a/examples/extended/electromagnetic/TestEm14/include/PrimaryGeneratorAction.hh +++ b/examples/extended/electromagnetic/TestEm14/include/PrimaryGeneratorAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorAction.hh,v 1.3 2006/06/29 16:45:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm14/include/ProcessesCount.hh b/examples/extended/electromagnetic/TestEm14/include/ProcessesCount.hh index 2fc33eb5a9..203915cebf 100644 --- a/examples/extended/electromagnetic/TestEm14/include/ProcessesCount.hh +++ b/examples/extended/electromagnetic/TestEm14/include/ProcessesCount.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: ProcessesCount.hh,v 1.3 2006/06/29 16:45:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm14/include/RunAction.hh b/examples/extended/electromagnetic/TestEm14/include/RunAction.hh index f48ce2525d..5c220d013c 100644 --- a/examples/extended/electromagnetic/TestEm14/include/RunAction.hh +++ b/examples/extended/electromagnetic/TestEm14/include/RunAction.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: RunAction.hh,v 1.3 2006/06/29 16:45:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: RunAction.hh,v 1.4 2006/09/06 09:56:06 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -58,6 +58,8 @@ class RunAction : public G4UserRunAction void CountProcesses(G4String); void SumTrack (G4double track) {totalCount++; sumTrack += track; sumTrack2 += track*track;}; + void SumeTransf (G4double energy) + {eTransfer += energy;}; private: DetectorConstruction* detector; @@ -68,6 +70,7 @@ class RunAction : public G4UserRunAction G4int totalCount; //all processes counter G4double sumTrack; //sum of trackLength G4double sumTrack2; //sum of trackLength*trackLength + G4double eTransfer; //energy transfered to charged secondaries }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm14/include/SteppingAction.hh b/examples/extended/electromagnetic/TestEm14/include/SteppingAction.hh index e787bcf2dc..7162b820ca 100644 --- a/examples/extended/electromagnetic/TestEm14/include/SteppingAction.hh +++ b/examples/extended/electromagnetic/TestEm14/include/SteppingAction.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: SteppingAction.hh,v 1.3 2006/06/29 16:45:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: SteppingAction.hh,v 1.4 2006/09/06 09:56:06 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -58,7 +58,7 @@ class SteppingAction : public G4UserSteppingAction HistoManager* histoManager; SteppingMessenger* stepMessenger; - G4double fract; //max edep for plotting hinal state + G4double fract; //max edep for plotting final state }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm14/include/SteppingMessenger.hh b/examples/extended/electromagnetic/TestEm14/include/SteppingMessenger.hh index ee8c45e20d..3f48d685b0 100644 --- a/examples/extended/electromagnetic/TestEm14/include/SteppingMessenger.hh +++ b/examples/extended/electromagnetic/TestEm14/include/SteppingMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingMessenger.hh,v 1.2 2006/06/29 16:45:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm14/include/SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm14/include/SteppingVerbose.hh index 693c44f5b7..3de982a690 100644 --- a/examples/extended/electromagnetic/TestEm14/include/SteppingVerbose.hh +++ b/examples/extended/electromagnetic/TestEm14/include/SteppingVerbose.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingVerbose.hh,v 1.3 2006/06/29 16:45:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // This class manages the verbose outputs in G4SteppingManager. // It inherits from G4SteppingVerbose. diff --git a/examples/extended/electromagnetic/TestEm14/photoelec.mac b/examples/extended/electromagnetic/TestEm14/photoelec.mac index 86736c5fa8..1ae13e8cc2 100644 --- a/examples/extended/electromagnetic/TestEm14/photoelec.mac +++ b/examples/extended/electromagnetic/TestEm14/photoelec.mac @@ -1,4 +1,4 @@ -# $Id: photoelec.mac,v 1.2 2006/05/10 11:15:33 maire Exp $ +# $Id: photoelec.mac,v 1.3 2006/10/24 16:54:16 maire Exp $ # # Macro file for "TestEm14.cc" # (can be run in batch, without graphic) @@ -11,8 +11,6 @@ /testem/det/setMat Iron ###/testem/det/setMat BGO # -###/testem/phys/addPhysics g4v52 -# /run/initialize # /process/inactivate compt diff --git a/examples/extended/electromagnetic/TestEm14/src/DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm14/src/DetectorConstruction.cc index 548aa94c4a..64a84969af 100644 --- a/examples/extended/electromagnetic/TestEm14/src/DetectorConstruction.cc +++ b/examples/extended/electromagnetic/TestEm14/src/DetectorConstruction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorConstruction.cc,v 1.4 2006/06/29 16:45:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm14/src/DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm14/src/DetectorMessenger.cc index d09e28b62d..4d1daea922 100644 --- a/examples/extended/electromagnetic/TestEm14/src/DetectorMessenger.cc +++ b/examples/extended/electromagnetic/TestEm14/src/DetectorMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorMessenger.cc,v 1.3 2006/06/29 16:45:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm14/src/EventAction.cc b/examples/extended/electromagnetic/TestEm14/src/EventAction.cc index 7ed2d40609..4dc897c176 100644 --- a/examples/extended/electromagnetic/TestEm14/src/EventAction.cc +++ b/examples/extended/electromagnetic/TestEm14/src/EventAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventAction.cc,v 1.3 2006/06/29 16:45:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm14/src/EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm14/src/EventActionMessenger.cc index 4168c60d8d..d0a6095571 100644 --- a/examples/extended/electromagnetic/TestEm14/src/EventActionMessenger.cc +++ b/examples/extended/electromagnetic/TestEm14/src/EventActionMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventActionMessenger.cc,v 1.3 2006/06/29 16:45:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm14/src/HistoManager.cc b/examples/extended/electromagnetic/TestEm14/src/HistoManager.cc index 48bf89406e..dbaee4c563 100644 --- a/examples/extended/electromagnetic/TestEm14/src/HistoManager.cc +++ b/examples/extended/electromagnetic/TestEm14/src/HistoManager.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoManager.cc,v 1.4 2006/06/29 16:45:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm14/src/HistoMessenger.cc b/examples/extended/electromagnetic/TestEm14/src/HistoMessenger.cc index 141633d068..de3bc60451 100644 --- a/examples/extended/electromagnetic/TestEm14/src/HistoMessenger.cc +++ b/examples/extended/electromagnetic/TestEm14/src/HistoMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoMessenger.cc,v 1.3 2006/06/29 16:45:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm14/src/PhysListEmG4v52.cc b/examples/extended/electromagnetic/TestEm14/src/PhysListEmG4v52.cc deleted file mode 100644 index 0ff10938f2..0000000000 --- a/examples/extended/electromagnetic/TestEm14/src/PhysListEmG4v52.cc +++ /dev/null @@ -1,113 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: PhysListEmG4v52.cc,v 1.3 2006/06/29 16:45:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#include "PhysListEmG4v52.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" - -#include "G4ComptonScattering52.hh" -#include "G4GammaConversion52.hh" -#include "G4PhotoElectricEffect52.hh" - -#include "G4eIonisation52.hh" -#include "G4eBremsstrahlung52.hh" -#include "G4eplusAnnihilation52.hh" - -#include "G4MuIonisation52.hh" -#include "G4MuBremsstrahlung52.hh" -#include "G4MuPairProduction52.hh" - -#include "G4hIonisation52.hh" - - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListEmG4v52::PhysListEmG4v52(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListEmG4v52::~PhysListEmG4v52() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void PhysListEmG4v52::ConstructProcess() -{ - // Add EM processes realised on base of prototype of model approach design - - theParticleIterator->reset(); - while( (*theParticleIterator)() ){ - G4ParticleDefinition* particle = theParticleIterator->value(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - G4String particleName = particle->GetParticleName(); - - if (particleName == "gamma") { - // gamma - pmanager->AddDiscreteProcess(new G4PhotoElectricEffect52); - pmanager->AddDiscreteProcess(new G4ComptonScattering52); - pmanager->AddDiscreteProcess(new G4GammaConversion52); - - } else if (particleName == "e-") { - //electron - pmanager->AddProcess(new G4eIonisation52, -1, 1,1); - pmanager->AddProcess(new G4eBremsstrahlung52, -1,-1,2); - - } else if (particleName == "e+") { - //positron - pmanager->AddProcess(new G4eIonisation52, -1, 1,1); - pmanager->AddProcess(new G4eBremsstrahlung52, -1,-1,2); - pmanager->AddProcess(new G4eplusAnnihilation52, 0,-1,3); - - } else if( particleName == "mu+" || - particleName == "mu-" ) { - //muon - pmanager->AddProcess(new G4MuIonisation52, -1, 1,1); - pmanager->AddProcess(new G4MuBremsstrahlung52, -1,-1,2); - pmanager->AddProcess(new G4MuPairProduction52, -1,-1,3); - - } else if( particleName == "GenericIon" ) { - - pmanager->AddProcess(new G4hIonisation52, -1,1,1); - - } else if ((!particle->IsShortLived()) && - (particle->GetPDGCharge() != 0.0) && - (particle->GetParticleName() != "chargedgeantino")) { - //all others charged particles except geantino - pmanager->AddProcess(new G4hIonisation52, -1,1,1); - } - } -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - diff --git a/examples/extended/electromagnetic/TestEm14/src/PhysListEmLivermore.cc b/examples/extended/electromagnetic/TestEm14/src/PhysListEmLivermore.cc index 9263671459..a2d0c028d4 100644 --- a/examples/extended/electromagnetic/TestEm14/src/PhysListEmLivermore.cc +++ b/examples/extended/electromagnetic/TestEm14/src/PhysListEmLivermore.cc @@ -25,7 +25,7 @@ // // // $Id: PhysListEmLivermore.cc,v 1.2 2006/06/29 16:45:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm14/src/PhysListEmPenelope.cc b/examples/extended/electromagnetic/TestEm14/src/PhysListEmPenelope.cc index 94b45d0cd7..fae8c20a6e 100644 --- a/examples/extended/electromagnetic/TestEm14/src/PhysListEmPenelope.cc +++ b/examples/extended/electromagnetic/TestEm14/src/PhysListEmPenelope.cc @@ -25,7 +25,7 @@ // // // $Id: PhysListEmPenelope.cc,v 1.2 2006/06/29 16:45:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm14/src/PhysListEmStandard.cc b/examples/extended/electromagnetic/TestEm14/src/PhysListEmStandard.cc index c739d2365f..0ee0337a28 100644 --- a/examples/extended/electromagnetic/TestEm14/src/PhysListEmStandard.cc +++ b/examples/extended/electromagnetic/TestEm14/src/PhysListEmStandard.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: PhysListEmStandard.cc,v 1.3 2006/06/29 16:45:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListEmStandard.cc,v 1.4 2006/10/24 16:54:16 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -49,6 +49,7 @@ #include "G4hIonisation.hh" #include "G4ionIonisation.hh" + //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... PhysListEmStandard::PhysListEmStandard(const G4String& name) diff --git a/examples/extended/electromagnetic/TestEm14/src/PhysicsList.cc b/examples/extended/electromagnetic/TestEm14/src/PhysicsList.cc index 3450ae9a74..dc1231c3a3 100644 --- a/examples/extended/electromagnetic/TestEm14/src/PhysicsList.cc +++ b/examples/extended/electromagnetic/TestEm14/src/PhysicsList.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: PhysicsList.cc,v 1.3 2006/06/29 16:45:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysicsList.cc,v 1.4 2006/10/24 16:54:16 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -34,7 +34,6 @@ #include "PhysicsListMessenger.hh" #include "PhysListEmStandard.hh" -#include "PhysListEmG4v52.hh" #include "PhysListEmLivermore.hh" #include "PhysListEmPenelope.hh" @@ -204,12 +203,7 @@ void PhysicsList::AddPhysicsList(const G4String& name) emName = name; delete emPhysicsList; emPhysicsList = new PhysListEmStandard(name); - - } else if (name == "g4v52") { - emName = name; - delete emPhysicsList; - emPhysicsList = new PhysListEmG4v52(name); - + } else if (name == "livermore") { emName = name; delete emPhysicsList; diff --git a/examples/extended/electromagnetic/TestEm14/src/PhysicsListMessenger.cc b/examples/extended/electromagnetic/TestEm14/src/PhysicsListMessenger.cc index 5198c86ef4..e3f906bd92 100644 --- a/examples/extended/electromagnetic/TestEm14/src/PhysicsListMessenger.cc +++ b/examples/extended/electromagnetic/TestEm14/src/PhysicsListMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListMessenger.cc,v 1.3 2006/06/29 16:45:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm14/src/PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm14/src/PrimaryGeneratorAction.cc index d087a13a93..642b0f30bb 100644 --- a/examples/extended/electromagnetic/TestEm14/src/PrimaryGeneratorAction.cc +++ b/examples/extended/electromagnetic/TestEm14/src/PrimaryGeneratorAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorAction.cc,v 1.3 2006/06/29 16:45:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm14/src/RunAction.cc b/examples/extended/electromagnetic/TestEm14/src/RunAction.cc index cc94a4fc3d..efef17a0bc 100644 --- a/examples/extended/electromagnetic/TestEm14/src/RunAction.cc +++ b/examples/extended/electromagnetic/TestEm14/src/RunAction.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: RunAction.cc,v 1.3 2006/06/29 16:45:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: RunAction.cc,v 1.4 2006/09/06 09:56:06 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -69,6 +69,7 @@ void RunAction::BeginOfRunAction(const G4Run* aRun) ProcCounter = new ProcessesCount; totalCount = 0; sumTrack = sumTrack2 = 0.; + eTransfer = 0.; histoManager->book(); } @@ -141,11 +142,20 @@ void RunAction::EndOfRunAction(const G4Run* aRun) << "\n CrossSection:\t" << CrossSection*cm << " cm^-1 " << "\t\t\tmassic: " << G4BestUnit(massicCS, "Surface/Mass") << G4endl; - + + //compute energy transfer coefficient + // + G4double MeanTransfer = eTransfer/totalCount; + G4double massTransfCoef = massicCS*MeanTransfer/energy; + + G4cout << "\n mean energy of charged secondaries: " << G4BestUnit(MeanTransfer, "Energy") + << "\tmass_energy_transfer coef: " << G4BestUnit(massTransfCoef, "Surface/Mass") + << G4endl; + //check cross section from G4EmCalculator // G4cout << "\n Verification : " - << "crossSections from G4EmCalculator. \n"; + << "crossSections from G4EmCalculator \n"; G4EmCalculator emCalculator; G4double sumc = 0.0; diff --git a/examples/extended/electromagnetic/TestEm14/src/SteppingAction.cc b/examples/extended/electromagnetic/TestEm14/src/SteppingAction.cc index c5f31f4911..98c591fe2c 100644 --- a/examples/extended/electromagnetic/TestEm14/src/SteppingAction.cc +++ b/examples/extended/electromagnetic/TestEm14/src/SteppingAction.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: SteppingAction.cc,v 1.3 2006/06/29 16:46:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: SteppingAction.cc,v 1.4 2006/09/06 09:56:06 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -103,7 +103,10 @@ void SteppingAction::UserSteppingAction(const G4Step* aStep) id++; G4ThreeVector direction = (*secondary)[lp]->GetMomentumDirection(); G4double costeta = direction.x(); - histoManager->FillHisto(id,costeta); + histoManager->FillHisto(id,costeta); + + //energy tranferred to charged secondaries + if (charge != 0.) runAction->SumeTransf(energy); } } diff --git a/examples/extended/electromagnetic/TestEm14/src/SteppingMessenger.cc b/examples/extended/electromagnetic/TestEm14/src/SteppingMessenger.cc index d4105e047e..4cd4acd9b5 100644 --- a/examples/extended/electromagnetic/TestEm14/src/SteppingMessenger.cc +++ b/examples/extended/electromagnetic/TestEm14/src/SteppingMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingMessenger.cc,v 1.2 2006/06/29 16:46:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm14/src/SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm14/src/SteppingVerbose.cc index 55b6c4f004..c2b1b2fd68 100644 --- a/examples/extended/electromagnetic/TestEm14/src/SteppingVerbose.cc +++ b/examples/extended/electromagnetic/TestEm14/src/SteppingVerbose.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingVerbose.cc,v 1.3 2006/06/29 16:46:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm15/GNUmakefile b/examples/extended/electromagnetic/TestEm15/GNUmakefile index d8fd8e8e14..33b63fe8f8 100644 --- a/examples/extended/electromagnetic/TestEm15/GNUmakefile +++ b/examples/extended/electromagnetic/TestEm15/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.1 2006/05/09 14:03:02 maire Exp $ +# $Id: GNUmakefile,v 1.2 2006/10/24 10:28:10 maire Exp $ # -------------------------------------------------------------- # GNUmakefile for examples module. Gabriele Cosmo, 06/04/98. # -------------------------------------------------------------- @@ -25,7 +25,7 @@ include $(G4INSTALL)/config/architecture.gmk ifdef G4ANALYSIS_USE # for the aida-config command see the README file CPPFLAGS += `aida-config --include` - LDFLAGS += `aida-config --lib` + LOADLIBS += `aida-config --lib` endif include $(G4INSTALL)/config/binmake.gmk diff --git a/examples/extended/electromagnetic/TestEm15/History b/examples/extended/electromagnetic/TestEm15/History index 70755a3363..cb5c17f161 100644 --- a/examples/extended/electromagnetic/TestEm15/History +++ b/examples/extended/electromagnetic/TestEm15/History @@ -1,4 +1,4 @@ -$Id: History,v 1.6 2006/06/02 14:42:39 maire Exp $ +$Id: History,v 1.7 2006/10/24 10:28:10 maire Exp $ ------------------------------------------------------------------- ========================================================= @@ -15,6 +15,9 @@ track of all tags. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +24-10-06 mma (testem15-V08-01-00) +- GNUmakefile : LOADLIBS + 02-06-06 mma (testem15-V08-00-05) - SteppingAction: prePoint->GetTouchableHandle->GetVolume() diff --git a/examples/extended/electromagnetic/TestEm15/TestEm15.cc b/examples/extended/electromagnetic/TestEm15/TestEm15.cc index 00ce5ce9e3..e8a0f4f78f 100644 --- a/examples/extended/electromagnetic/TestEm15/TestEm15.cc +++ b/examples/extended/electromagnetic/TestEm15/TestEm15.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TestEm15.cc,v 1.2 2006/06/29 16:46:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm15/TestEm15.out b/examples/extended/electromagnetic/TestEm15/TestEm15.out index 41d5cc6ce5..c96f01893c 100644 --- a/examples/extended/electromagnetic/TestEm15/TestEm15.out +++ b/examples/extended/electromagnetic/TestEm15/TestEm15.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -86,17 +86,13 @@ Registered model factories: drawByCharge drawByParticleID drawByOriginVolume - -Registered models: - None + drawByAttribute Registered filter factories: chargeFilter particleFilter originVolumeFilter - -Registered filters: - None + attributeFilter /run/verbose 2 # @@ -125,6 +121,7 @@ physicsList->setCut() start. /run/beamOn 10000 phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV Sampling according Klein-Nishina model @@ -132,7 +129,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.022 MeV to 100 GeV in 100 bins. @@ -164,7 +161,7 @@ eBrem: tables are built for e+ Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. Step function: finalRange(mm)= 1, dRoverRange= 1, integral: 0 -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -292,31 +289,31 @@ Start Run processing. Run terminated. Run Summary Number of events processed : 10000 - User=3.6s Real=3.6s Sys=0s + User=3.4s Real=3.4s Sys=0s The run consists of 10000 e- of 5 MeV through 100 m of Water (density: 1 g/cm3 ) Process calls frequency ---> msc = 10000 - truePathLength : 3.3384 mm +- 1.8386 nm - geomPathLength : 3.2675 mm +- 49.342 um - lateralDisplac : 478.01 um +- 76.756 um - Psi : 145.41 mrad +- 24.099 mrad (8.3313 deg +- 1.3808 deg) + truePathLength : 2.6311 cm +- 2.4801 mm + geomPathLength : 2.0081 cm +- 1.3007 mm + lateralDisplac : 1.1355 cm +- 1.1044 mm + Psi : 513.82 mrad +- 28.091 mrad (29.44 deg +- 1.6095 deg) - Theta_plane : 241.4 mrad (13.831 deg) - phi correlation: 0.10775 +- 0.152 (std::cos(phi_pos - phi_dir)) + Theta_plane : 1678.5 mrad (96.168 deg) + phi correlation: 0.28825 +- 0.17735 (std::cos(phi_pos - phi_dir)) Verification from G4EmCalculator. transport mean free path : 8.346 cm range from restrict dE/dx: 2.7521 cm - ---> effective facRange : 0.04 + ---> effective facRange : 0.31526 - compute theta0 from Highland : 196.79 mrad (11.275 deg) + compute theta0 from Highland : 605.2 mrad (34.676 deg) --------- Ranecu engine status --------- Initial seed (index) = 0 - Current couple of seeds = 662140468, 25595378 + Current couple of seeds = 178521571, 539724907 ---------------------------------------- # /gun/energy 100 keV @@ -348,7 +345,7 @@ Index : 1 used in the geometry : Yes recalculation needed : No --------- Ranecu engine status --------- Initial seed (index) = 0 - Current couple of seeds = 662140468, 25595378 + Current couple of seeds = 178521571, 539724907 ---------------------------------------- Start Run processing. @@ -356,31 +353,31 @@ Start Run processing. Run terminated. Run Summary Number of events processed : 10000 - User=3.4s Real=3.4s Sys=0s + User=3.3s Real=3.3s Sys=0s The run consists of 10000 e- of 100 keV through 100 m of Water (density: 1 g/cm3 ) Process calls frequency ---> msc = 10000 - truePathLength : 6.3051 um +- 5404.2 fm - geomPathLength : 6.1799 um +- 87.267 nm - lateralDisplac : 857.04 nm +- 137.2 nm - Psi : 137.93 mrad +- 22.728 mrad (7.903 deg +- 1.3022 deg) + truePathLength : 6.3049 um +- 1.816 um + geomPathLength : 6.1688 um +- 1.7433 um + lateralDisplac : 958.03 nm +- 400.61 nm + Psi : 147.6 mrad +- 22.686 mrad (8.4567 deg +- 1.2998 deg) - Theta_plane : 235.78 mrad (13.509 deg) - phi correlation: 0.11174 +- 0.14473 (std::cos(phi_pos - phi_dir)) + Theta_plane : 240.59 mrad (13.785 deg) + phi correlation: 0.087898 +- 0.13241 (std::cos(phi_pos - phi_dir)) Verification from G4EmCalculator. transport mean free path : 157.63 um range from restrict dE/dx: 143.16 um - ---> effective facRange : 0.04 + ---> effective facRange : 0.039999 compute theta0 from Highland : 180.68 mrad (10.352 deg) --------- Ranecu engine status --------- Initial seed (index) = 0 - Current couple of seeds = 572567671, 2066393807 + Current couple of seeds = 382949488, 373885619 ---------------------------------------- Graphics systems deleted. Visualization Manager deleting... @@ -390,7 +387,9 @@ UserRunAction deleted. UserPrimaryGenerator deleted. G4 kernel has come to Quit state. EventManager deleted. +Default detector region deleted. UImanager deleted. +Units table cleared. StateManager deleted. RunManagerKernel is deleted. RunManager is deleting. diff --git a/examples/extended/electromagnetic/TestEm15/include/DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm15/include/DetectorConstruction.hh index 89121698c0..f297821230 100644 --- a/examples/extended/electromagnetic/TestEm15/include/DetectorConstruction.hh +++ b/examples/extended/electromagnetic/TestEm15/include/DetectorConstruction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorConstruction.hh,v 1.2 2006/06/29 16:46:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm15/include/DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm15/include/DetectorMessenger.hh index e957ad439a..364c8f7ca6 100644 --- a/examples/extended/electromagnetic/TestEm15/include/DetectorMessenger.hh +++ b/examples/extended/electromagnetic/TestEm15/include/DetectorMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorMessenger.hh,v 1.2 2006/06/29 16:46:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm15/include/EventAction.hh b/examples/extended/electromagnetic/TestEm15/include/EventAction.hh index ae7ff05512..e459fbbf11 100644 --- a/examples/extended/electromagnetic/TestEm15/include/EventAction.hh +++ b/examples/extended/electromagnetic/TestEm15/include/EventAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventAction.hh,v 1.2 2006/06/29 16:46:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm15/include/EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm15/include/EventActionMessenger.hh index 914c681931..11666ec19d 100644 --- a/examples/extended/electromagnetic/TestEm15/include/EventActionMessenger.hh +++ b/examples/extended/electromagnetic/TestEm15/include/EventActionMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventActionMessenger.hh,v 1.2 2006/06/29 16:46:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm15/include/HistoManager.hh b/examples/extended/electromagnetic/TestEm15/include/HistoManager.hh index 3dd8ad8bd7..966310ac48 100644 --- a/examples/extended/electromagnetic/TestEm15/include/HistoManager.hh +++ b/examples/extended/electromagnetic/TestEm15/include/HistoManager.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoManager.hh,v 1.3 2006/06/29 16:46:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm15/include/HistoMessenger.hh b/examples/extended/electromagnetic/TestEm15/include/HistoMessenger.hh index 7e70f9a1c4..00007f8adc 100644 --- a/examples/extended/electromagnetic/TestEm15/include/HistoMessenger.hh +++ b/examples/extended/electromagnetic/TestEm15/include/HistoMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoMessenger.hh,v 1.2 2006/06/29 16:46:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm15/include/PhysListEmStandard.hh b/examples/extended/electromagnetic/TestEm15/include/PhysListEmStandard.hh index cda8c87790..8403c3fab1 100644 --- a/examples/extended/electromagnetic/TestEm15/include/PhysListEmStandard.hh +++ b/examples/extended/electromagnetic/TestEm15/include/PhysListEmStandard.hh @@ -25,7 +25,7 @@ // // // $Id: PhysListEmStandard.hh,v 1.2 2006/06/29 16:46:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm15/include/PhysicsList.hh b/examples/extended/electromagnetic/TestEm15/include/PhysicsList.hh index 57b243e4ca..85ae3a46df 100644 --- a/examples/extended/electromagnetic/TestEm15/include/PhysicsList.hh +++ b/examples/extended/electromagnetic/TestEm15/include/PhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: PhysicsList.hh,v 1.2 2006/06/29 16:46:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... // diff --git a/examples/extended/electromagnetic/TestEm15/include/PhysicsListMessenger.hh b/examples/extended/electromagnetic/TestEm15/include/PhysicsListMessenger.hh index b2903228ae..c55f070e5d 100644 --- a/examples/extended/electromagnetic/TestEm15/include/PhysicsListMessenger.hh +++ b/examples/extended/electromagnetic/TestEm15/include/PhysicsListMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListMessenger.hh,v 1.2 2006/06/29 16:46:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm15/include/PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm15/include/PrimaryGeneratorAction.hh index 2f00c88f8b..46a10f9cae 100644 --- a/examples/extended/electromagnetic/TestEm15/include/PrimaryGeneratorAction.hh +++ b/examples/extended/electromagnetic/TestEm15/include/PrimaryGeneratorAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorAction.hh,v 1.2 2006/06/29 16:46:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm15/include/ProcessesCount.hh b/examples/extended/electromagnetic/TestEm15/include/ProcessesCount.hh index adb29572ac..8f5a049ff7 100644 --- a/examples/extended/electromagnetic/TestEm15/include/ProcessesCount.hh +++ b/examples/extended/electromagnetic/TestEm15/include/ProcessesCount.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: ProcessesCount.hh,v 1.2 2006/06/29 16:46:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm15/include/RunAction.hh b/examples/extended/electromagnetic/TestEm15/include/RunAction.hh index 3149153c81..0fcdc9982f 100644 --- a/examples/extended/electromagnetic/TestEm15/include/RunAction.hh +++ b/examples/extended/electromagnetic/TestEm15/include/RunAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RunAction.hh,v 1.3 2006/06/29 16:46:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm15/include/StepMax.hh b/examples/extended/electromagnetic/TestEm15/include/StepMax.hh index 8fc950363c..fefd0ea5d1 100644 --- a/examples/extended/electromagnetic/TestEm15/include/StepMax.hh +++ b/examples/extended/electromagnetic/TestEm15/include/StepMax.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMax.hh,v 1.2 2006/06/29 16:46:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm15/include/StepMaxMessenger.hh b/examples/extended/electromagnetic/TestEm15/include/StepMaxMessenger.hh index cad5acdb17..b440b9bcee 100644 --- a/examples/extended/electromagnetic/TestEm15/include/StepMaxMessenger.hh +++ b/examples/extended/electromagnetic/TestEm15/include/StepMaxMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMaxMessenger.hh,v 1.2 2006/06/29 16:46:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm15/include/SteppingAction.hh b/examples/extended/electromagnetic/TestEm15/include/SteppingAction.hh index 22c508e9e9..be16c4979e 100644 --- a/examples/extended/electromagnetic/TestEm15/include/SteppingAction.hh +++ b/examples/extended/electromagnetic/TestEm15/include/SteppingAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingAction.hh,v 1.2 2006/06/29 16:46:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm15/include/SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm15/include/SteppingVerbose.hh index c89031766e..11e69eee64 100644 --- a/examples/extended/electromagnetic/TestEm15/include/SteppingVerbose.hh +++ b/examples/extended/electromagnetic/TestEm15/include/SteppingVerbose.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingVerbose.hh,v 1.2 2006/06/29 16:46:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // This class manages the verbose outputs in G4SteppingManager. // It inherits from G4SteppingVerbose. diff --git a/examples/extended/electromagnetic/TestEm15/src/DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm15/src/DetectorConstruction.cc index ccfce064f8..37f060c122 100644 --- a/examples/extended/electromagnetic/TestEm15/src/DetectorConstruction.cc +++ b/examples/extended/electromagnetic/TestEm15/src/DetectorConstruction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorConstruction.cc,v 1.3 2006/06/29 16:46:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm15/src/DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm15/src/DetectorMessenger.cc index 0714dede84..b9f1c24e25 100644 --- a/examples/extended/electromagnetic/TestEm15/src/DetectorMessenger.cc +++ b/examples/extended/electromagnetic/TestEm15/src/DetectorMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorMessenger.cc,v 1.2 2006/06/29 16:46:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm15/src/EventAction.cc b/examples/extended/electromagnetic/TestEm15/src/EventAction.cc index 087e39fa62..2ad24233d1 100644 --- a/examples/extended/electromagnetic/TestEm15/src/EventAction.cc +++ b/examples/extended/electromagnetic/TestEm15/src/EventAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventAction.cc,v 1.2 2006/06/29 16:46:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm15/src/EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm15/src/EventActionMessenger.cc index cb0558e3be..92ae01fbcd 100644 --- a/examples/extended/electromagnetic/TestEm15/src/EventActionMessenger.cc +++ b/examples/extended/electromagnetic/TestEm15/src/EventActionMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventActionMessenger.cc,v 1.2 2006/06/29 16:46:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm15/src/HistoManager.cc b/examples/extended/electromagnetic/TestEm15/src/HistoManager.cc index 9c61ab8222..59a0021dec 100644 --- a/examples/extended/electromagnetic/TestEm15/src/HistoManager.cc +++ b/examples/extended/electromagnetic/TestEm15/src/HistoManager.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoManager.cc,v 1.4 2006/06/29 16:46:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm15/src/HistoMessenger.cc b/examples/extended/electromagnetic/TestEm15/src/HistoMessenger.cc index 463a8c1ac3..bfd48c9362 100644 --- a/examples/extended/electromagnetic/TestEm15/src/HistoMessenger.cc +++ b/examples/extended/electromagnetic/TestEm15/src/HistoMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoMessenger.cc,v 1.2 2006/06/29 16:46:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm15/src/PhysListEmStandard.cc b/examples/extended/electromagnetic/TestEm15/src/PhysListEmStandard.cc index 0e818da25e..8eee55897f 100644 --- a/examples/extended/electromagnetic/TestEm15/src/PhysListEmStandard.cc +++ b/examples/extended/electromagnetic/TestEm15/src/PhysListEmStandard.cc @@ -25,7 +25,7 @@ // // // $Id: PhysListEmStandard.cc,v 1.2 2006/06/29 16:47:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm15/src/PhysicsList.cc b/examples/extended/electromagnetic/TestEm15/src/PhysicsList.cc index f2b7354403..d0164206c9 100644 --- a/examples/extended/electromagnetic/TestEm15/src/PhysicsList.cc +++ b/examples/extended/electromagnetic/TestEm15/src/PhysicsList.cc @@ -25,7 +25,7 @@ // // // $Id: PhysicsList.cc,v 1.2 2006/06/29 16:47:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm15/src/PhysicsListMessenger.cc b/examples/extended/electromagnetic/TestEm15/src/PhysicsListMessenger.cc index 827fbe39f9..49cf6d93f0 100644 --- a/examples/extended/electromagnetic/TestEm15/src/PhysicsListMessenger.cc +++ b/examples/extended/electromagnetic/TestEm15/src/PhysicsListMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListMessenger.cc,v 1.2 2006/06/29 16:47:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm15/src/PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm15/src/PrimaryGeneratorAction.cc index 47d981ed3f..e81a3934a6 100644 --- a/examples/extended/electromagnetic/TestEm15/src/PrimaryGeneratorAction.cc +++ b/examples/extended/electromagnetic/TestEm15/src/PrimaryGeneratorAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorAction.cc,v 1.2 2006/06/29 16:47:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm15/src/RunAction.cc b/examples/extended/electromagnetic/TestEm15/src/RunAction.cc index e54b05b733..0b8ad5ea21 100644 --- a/examples/extended/electromagnetic/TestEm15/src/RunAction.cc +++ b/examples/extended/electromagnetic/TestEm15/src/RunAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RunAction.cc,v 1.5 2006/06/29 16:47:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm15/src/StepMax.cc b/examples/extended/electromagnetic/TestEm15/src/StepMax.cc index 2ed5ce8b9f..86941359de 100644 --- a/examples/extended/electromagnetic/TestEm15/src/StepMax.cc +++ b/examples/extended/electromagnetic/TestEm15/src/StepMax.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMax.cc,v 1.2 2006/06/29 16:47:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm15/src/StepMaxMessenger.cc b/examples/extended/electromagnetic/TestEm15/src/StepMaxMessenger.cc index c80c556c8e..6a56c00ed3 100644 --- a/examples/extended/electromagnetic/TestEm15/src/StepMaxMessenger.cc +++ b/examples/extended/electromagnetic/TestEm15/src/StepMaxMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMaxMessenger.cc,v 1.2 2006/06/29 16:47:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm15/src/SteppingAction.cc b/examples/extended/electromagnetic/TestEm15/src/SteppingAction.cc index 20d3d4a21e..d3f4daba43 100644 --- a/examples/extended/electromagnetic/TestEm15/src/SteppingAction.cc +++ b/examples/extended/electromagnetic/TestEm15/src/SteppingAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingAction.cc,v 1.5 2006/06/29 16:47:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm15/src/SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm15/src/SteppingVerbose.cc index c28974ea4a..c15125b9ab 100644 --- a/examples/extended/electromagnetic/TestEm15/src/SteppingVerbose.cc +++ b/examples/extended/electromagnetic/TestEm15/src/SteppingVerbose.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingVerbose.cc,v 1.2 2006/06/29 16:47:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm16/GNUmakefile b/examples/extended/electromagnetic/TestEm16/GNUmakefile index 887119ea39..77898dd88b 100644 --- a/examples/extended/electromagnetic/TestEm16/GNUmakefile +++ b/examples/extended/electromagnetic/TestEm16/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.2 2006/05/24 12:58:49 maire Exp $ +# $Id: GNUmakefile,v 1.3 2006/10/24 10:14:46 maire Exp $ # -------------------------------------------------------------- # GNUmakefile for examples module. Gabriele Cosmo, 06/04/98. # -------------------------------------------------------------- @@ -27,7 +27,7 @@ ifdef G4ANALYSIS_USE # add RunAction.o such that the linker finds AIDA_createAnalysisFactory # for the aida-config command see the README file CPPFLAGS += `aida-config --include` - LDFLAGS += $(G4WORKDIR)/tmp/$(G4SYSTEM)/TestEm16/RunAction.o `aida-config --lib` + LOADLIBS += $(G4WORKDIR)/tmp/$(G4SYSTEM)/TestEm16/RunAction.o `aida-config --lib` endif include $(G4INSTALL)/config/binmake.gmk diff --git a/examples/extended/electromagnetic/TestEm16/History b/examples/extended/electromagnetic/TestEm16/History index 80b577962a..852763b9b7 100644 --- a/examples/extended/electromagnetic/TestEm16/History +++ b/examples/extended/electromagnetic/TestEm16/History @@ -1,4 +1,4 @@ -$Id: History,v 1.4 2006/05/24 13:03:05 maire Exp $ +$Id: History,v 1.5 2006/10/24 10:14:46 maire Exp $ ------------------------------------------------------------------- ========================================================= @@ -15,6 +15,9 @@ track of all tags. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +24-10-06 mma (testem16-V08-01-00) +- GNUmakefile : LOADLIBS + 24-05-06 mma (testem16-V08-00-01) - remove PrimaryGeneratorMessenger diff --git a/examples/extended/electromagnetic/TestEm16/TestEm16.cc b/examples/extended/electromagnetic/TestEm16/TestEm16.cc index f0619a5c05..2e789f42b5 100644 --- a/examples/extended/electromagnetic/TestEm16/TestEm16.cc +++ b/examples/extended/electromagnetic/TestEm16/TestEm16.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TestEm16.cc,v 1.2 2006/06/29 16:47:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm16/TestEm16.out b/examples/extended/electromagnetic/TestEm16/TestEm16.out index 0b3a3d147c..096a4b1ea3 100644 --- a/examples/extended/electromagnetic/TestEm16/TestEm16.out +++ b/examples/extended/electromagnetic/TestEm16/TestEm16.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -45,17 +45,13 @@ Registered model factories: drawByCharge drawByParticleID drawByOriginVolume - -Registered models: - None + drawByAttribute Registered filter factories: chargeFilter particleFilter originVolumeFilter - -Registered filters: - None + attributeFilter G4ANALYSIS_USE was not set, there will be no AIDA histos /run/verbose 2 @@ -100,6 +96,7 @@ CutLength : 1 km /run/beamOn 100 phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV Sampling according Klein-Nishina model @@ -107,7 +104,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.022 MeV to 100 GeV in 100 bins. @@ -142,7 +139,7 @@ eBrem: tables are built for e+ Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -222,7 +219,7 @@ G4SynchrotronRadiation::GetRandomEnergySR : Run terminated. Run Summary Number of events processed : 100 - User=4.83s Real=5.12s Sys=0.06s + User=6.38s Real=7.26s Sys=0.03s Summary for synchrotron radiation : Number of photons = 27201 Emean = 2.016 +/- 0.02196 keV @@ -242,7 +239,9 @@ UserRunAction deleted. UserPrimaryGenerator deleted. G4 kernel has come to Quit state. EventManager deleted. +Default detector region deleted. UImanager deleted. +Units table cleared. StateManager deleted. RunManagerKernel is deleted. RunManager is deleting. diff --git a/examples/extended/electromagnetic/TestEm16/include/DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm16/include/DetectorConstruction.hh index a2cb79fea7..d7cec09ce5 100644 --- a/examples/extended/electromagnetic/TestEm16/include/DetectorConstruction.hh +++ b/examples/extended/electromagnetic/TestEm16/include/DetectorConstruction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorConstruction.hh,v 1.3 2006/06/29 16:47:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm16/include/DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm16/include/DetectorMessenger.hh index 9ab118738b..36419411fa 100644 --- a/examples/extended/electromagnetic/TestEm16/include/DetectorMessenger.hh +++ b/examples/extended/electromagnetic/TestEm16/include/DetectorMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorMessenger.hh,v 1.3 2006/06/29 16:47:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm16/include/EventAction.hh b/examples/extended/electromagnetic/TestEm16/include/EventAction.hh index 7c0bdfaeed..844561c78b 100644 --- a/examples/extended/electromagnetic/TestEm16/include/EventAction.hh +++ b/examples/extended/electromagnetic/TestEm16/include/EventAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventAction.hh,v 1.2 2006/06/29 16:47:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm16/include/EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm16/include/EventActionMessenger.hh index 878facbcdf..64837ca056 100644 --- a/examples/extended/electromagnetic/TestEm16/include/EventActionMessenger.hh +++ b/examples/extended/electromagnetic/TestEm16/include/EventActionMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventActionMessenger.hh,v 1.2 2006/06/29 16:47:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm16/include/PhysicsList.hh b/examples/extended/electromagnetic/TestEm16/include/PhysicsList.hh index 0ecd2c41e2..7404f8857d 100644 --- a/examples/extended/electromagnetic/TestEm16/include/PhysicsList.hh +++ b/examples/extended/electromagnetic/TestEm16/include/PhysicsList.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsList.hh,v 1.4 2006/06/29 16:47:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm16/include/PhysicsListMessenger.hh b/examples/extended/electromagnetic/TestEm16/include/PhysicsListMessenger.hh index 5258681d17..6e06281301 100644 --- a/examples/extended/electromagnetic/TestEm16/include/PhysicsListMessenger.hh +++ b/examples/extended/electromagnetic/TestEm16/include/PhysicsListMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListMessenger.hh,v 1.4 2006/06/29 16:47:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm16/include/PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm16/include/PrimaryGeneratorAction.hh index 17dcb83baa..55deff6913 100644 --- a/examples/extended/electromagnetic/TestEm16/include/PrimaryGeneratorAction.hh +++ b/examples/extended/electromagnetic/TestEm16/include/PrimaryGeneratorAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorAction.hh,v 1.3 2006/06/29 16:47:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm16/include/RunAction.hh b/examples/extended/electromagnetic/TestEm16/include/RunAction.hh index f23b796f7b..18b8f8e9fd 100644 --- a/examples/extended/electromagnetic/TestEm16/include/RunAction.hh +++ b/examples/extended/electromagnetic/TestEm16/include/RunAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RunAction.hh,v 1.4 2006/06/29 16:47:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm16/include/SteppingAction.hh b/examples/extended/electromagnetic/TestEm16/include/SteppingAction.hh index b746543aa8..81fbb7046c 100644 --- a/examples/extended/electromagnetic/TestEm16/include/SteppingAction.hh +++ b/examples/extended/electromagnetic/TestEm16/include/SteppingAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingAction.hh,v 1.2 2006/06/29 16:47:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm16/include/SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm16/include/SteppingVerbose.hh index ef0908518c..065dd9a1c2 100644 --- a/examples/extended/electromagnetic/TestEm16/include/SteppingVerbose.hh +++ b/examples/extended/electromagnetic/TestEm16/include/SteppingVerbose.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingVerbose.hh,v 1.2 2006/06/29 16:47:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // This class manages the verbose outputs in G4SteppingManager. // It inherits from G4SteppingVerbose. diff --git a/examples/extended/electromagnetic/TestEm16/src/DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm16/src/DetectorConstruction.cc index 9511ce1ee3..1f9955bf20 100644 --- a/examples/extended/electromagnetic/TestEm16/src/DetectorConstruction.cc +++ b/examples/extended/electromagnetic/TestEm16/src/DetectorConstruction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorConstruction.cc,v 1.3 2006/06/29 16:47:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm16/src/DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm16/src/DetectorMessenger.cc index a748eb32d3..d320ea81d1 100644 --- a/examples/extended/electromagnetic/TestEm16/src/DetectorMessenger.cc +++ b/examples/extended/electromagnetic/TestEm16/src/DetectorMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorMessenger.cc,v 1.2 2006/06/29 16:47:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm16/src/EventAction.cc b/examples/extended/electromagnetic/TestEm16/src/EventAction.cc index c8a44b83cc..dd04a3e7bb 100644 --- a/examples/extended/electromagnetic/TestEm16/src/EventAction.cc +++ b/examples/extended/electromagnetic/TestEm16/src/EventAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventAction.cc,v 1.2 2006/06/29 16:47:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm16/src/EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm16/src/EventActionMessenger.cc index b6446453ba..ea23ebdcf0 100644 --- a/examples/extended/electromagnetic/TestEm16/src/EventActionMessenger.cc +++ b/examples/extended/electromagnetic/TestEm16/src/EventActionMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventActionMessenger.cc,v 1.2 2006/06/29 16:47:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm16/src/PhysicsList.cc b/examples/extended/electromagnetic/TestEm16/src/PhysicsList.cc index b83315e929..e7fa93b437 100644 --- a/examples/extended/electromagnetic/TestEm16/src/PhysicsList.cc +++ b/examples/extended/electromagnetic/TestEm16/src/PhysicsList.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsList.cc,v 1.4 2006/06/29 16:47:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm16/src/PhysicsListMessenger.cc b/examples/extended/electromagnetic/TestEm16/src/PhysicsListMessenger.cc index 2e11f50fb2..bef8890d18 100644 --- a/examples/extended/electromagnetic/TestEm16/src/PhysicsListMessenger.cc +++ b/examples/extended/electromagnetic/TestEm16/src/PhysicsListMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListMessenger.cc,v 1.4 2006/06/29 16:47:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm16/src/PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm16/src/PrimaryGeneratorAction.cc index 1818c41067..20f107c6fe 100644 --- a/examples/extended/electromagnetic/TestEm16/src/PrimaryGeneratorAction.cc +++ b/examples/extended/electromagnetic/TestEm16/src/PrimaryGeneratorAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorAction.cc,v 1.3 2006/06/29 16:48:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm16/src/RunAction.cc b/examples/extended/electromagnetic/TestEm16/src/RunAction.cc index 397a731e85..31a31cb6d2 100644 --- a/examples/extended/electromagnetic/TestEm16/src/RunAction.cc +++ b/examples/extended/electromagnetic/TestEm16/src/RunAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RunAction.cc,v 1.6 2006/06/29 16:48:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm16/src/SteppingAction.cc b/examples/extended/electromagnetic/TestEm16/src/SteppingAction.cc index bdf5579763..2459a528f6 100644 --- a/examples/extended/electromagnetic/TestEm16/src/SteppingAction.cc +++ b/examples/extended/electromagnetic/TestEm16/src/SteppingAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingAction.cc,v 1.4 2006/06/29 16:48:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm16/src/SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm16/src/SteppingVerbose.cc index 1991f1c2e0..56ea22fd96 100644 --- a/examples/extended/electromagnetic/TestEm16/src/SteppingVerbose.cc +++ b/examples/extended/electromagnetic/TestEm16/src/SteppingVerbose.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingVerbose.cc,v 1.2 2006/06/29 16:48:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/GNUmakefile b/examples/extended/electromagnetic/TestEm17/GNUmakefile index bb18839605..ba738c70a3 100644 --- a/examples/extended/electromagnetic/TestEm17/GNUmakefile +++ b/examples/extended/electromagnetic/TestEm17/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.1 2006/05/09 16:22:19 maire Exp $ +# $Id: GNUmakefile,v 1.2 2006/10/24 10:06:21 maire Exp $ # -------------------------------------------------------------- # GNUmakefile for examples module. Gabriele Cosmo, 06/04/98. # -------------------------------------------------------------- @@ -25,7 +25,7 @@ include $(G4INSTALL)/config/architecture.gmk ifdef G4ANALYSIS_USE # for the aida-config command see the README file CPPFLAGS += `aida-config --include` - LDFLAGS += `aida-config --lib` + LOADLIBS += `aida-config --lib` endif include $(G4INSTALL)/config/binmake.gmk diff --git a/examples/extended/electromagnetic/TestEm17/History b/examples/extended/electromagnetic/TestEm17/History index fbf7cefac4..620c8ca03a 100644 --- a/examples/extended/electromagnetic/TestEm17/History +++ b/examples/extended/electromagnetic/TestEm17/History @@ -1,4 +1,4 @@ -$Id: History,v 1.1 2006/05/09 16:22:19 maire Exp $ +$Id: History,v 1.3 2006/10/24 10:06:21 maire Exp $ ------------------------------------------------------------------- ========================================================= @@ -15,6 +15,13 @@ track of all tags. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +19-10-06 mma (testem17-V08-01-01) +- GNUmakefile : LOADLIBS +- remove PhysicsLists 52 + +26-09-06 V.Ivant (testem17-V08-01-00) +- fix ConstructParticles + 10-05-06 mma (testem17-V08-00-00) - rename TestEm14 -> TestEm17 diff --git a/examples/extended/electromagnetic/TestEm17/TestEm17.cc b/examples/extended/electromagnetic/TestEm17/TestEm17.cc index ff5fc43cb6..58e3c312c9 100644 --- a/examples/extended/electromagnetic/TestEm17/TestEm17.cc +++ b/examples/extended/electromagnetic/TestEm17/TestEm17.cc @@ -25,7 +25,7 @@ // // // $Id: TestEm17.cc,v 1.2 2006/06/29 16:48:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/TestEm17.out b/examples/extended/electromagnetic/TestEm17/TestEm17.out index 0be9964cd6..2184147427 100644 --- a/examples/extended/electromagnetic/TestEm17/TestEm17.out +++ b/examples/extended/electromagnetic/TestEm17/TestEm17.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -54,17 +54,13 @@ Registered model factories: drawByCharge drawByParticleID drawByOriginVolume - -Registered models: - None + drawByAttribute Registered filter factories: chargeFilter particleFilter originVolumeFilter - -Registered filters: - None + attributeFilter /run/verbose 2 # @@ -141,7 +137,7 @@ Start Run processing. Run terminated. Run Summary Number of events processed : 10000 - User=76.37s Real=105.83s Sys=12.11s + User=68.79s Real=92.16s Sys=3.33s The run consists of 10000 mu+ of 10 TeV through 1 m of Iron (density: 7.9 g/cm3 ) @@ -162,7 +158,9 @@ UserRunAction deleted. UserPrimaryGenerator deleted. G4 kernel has come to Quit state. EventManager deleted. +Default detector region deleted. UImanager deleted. +Units table cleared. StateManager deleted. RunManagerKernel is deleted. RunManager is deleting. diff --git a/examples/extended/electromagnetic/TestEm17/include/DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm17/include/DetectorConstruction.hh index 15ad8138df..3bca68e90c 100644 --- a/examples/extended/electromagnetic/TestEm17/include/DetectorConstruction.hh +++ b/examples/extended/electromagnetic/TestEm17/include/DetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: DetectorConstruction.hh,v 1.2 2006/06/29 16:48:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/include/DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm17/include/DetectorMessenger.hh index c130c40205..75b8ce97a1 100644 --- a/examples/extended/electromagnetic/TestEm17/include/DetectorMessenger.hh +++ b/examples/extended/electromagnetic/TestEm17/include/DetectorMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: DetectorMessenger.hh,v 1.2 2006/06/29 16:48:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm17/include/EventAction.hh b/examples/extended/electromagnetic/TestEm17/include/EventAction.hh index 2be004b911..3c6c49ec66 100644 --- a/examples/extended/electromagnetic/TestEm17/include/EventAction.hh +++ b/examples/extended/electromagnetic/TestEm17/include/EventAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventAction.hh,v 1.2 2006/06/29 16:48:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/include/EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm17/include/EventActionMessenger.hh index 9a5480b66b..8754e7ebf8 100644 --- a/examples/extended/electromagnetic/TestEm17/include/EventActionMessenger.hh +++ b/examples/extended/electromagnetic/TestEm17/include/EventActionMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventActionMessenger.hh,v 1.2 2006/06/29 16:48:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/include/HistoManager.hh b/examples/extended/electromagnetic/TestEm17/include/HistoManager.hh index 617f6bf1cd..d02ab30b1b 100644 --- a/examples/extended/electromagnetic/TestEm17/include/HistoManager.hh +++ b/examples/extended/electromagnetic/TestEm17/include/HistoManager.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoManager.hh,v 1.2 2006/06/29 16:48:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/include/HistoMessenger.hh b/examples/extended/electromagnetic/TestEm17/include/HistoMessenger.hh index 990f646c61..d7ede5ab95 100644 --- a/examples/extended/electromagnetic/TestEm17/include/HistoMessenger.hh +++ b/examples/extended/electromagnetic/TestEm17/include/HistoMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoMessenger.hh,v 1.2 2006/06/29 16:48:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/include/MuCrossSections.hh b/examples/extended/electromagnetic/TestEm17/include/MuCrossSections.hh index 9300786696..feab52137c 100644 --- a/examples/extended/electromagnetic/TestEm17/include/MuCrossSections.hh +++ b/examples/extended/electromagnetic/TestEm17/include/MuCrossSections.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: MuCrossSections.hh,v 1.2 2006/06/29 16:48:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/include/MuNuclearBuilder.hh b/examples/extended/electromagnetic/TestEm17/include/MuNuclearBuilder.hh index b09f2c1e76..65bc66ee29 100644 --- a/examples/extended/electromagnetic/TestEm17/include/MuNuclearBuilder.hh +++ b/examples/extended/electromagnetic/TestEm17/include/MuNuclearBuilder.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: MuNuclearBuilder.hh,v 1.2 2006/06/29 16:48:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/include/PhysListEmG4v52.hh b/examples/extended/electromagnetic/TestEm17/include/PhysListEmG4v52.hh deleted file mode 100644 index 8b492b0011..0000000000 --- a/examples/extended/electromagnetic/TestEm17/include/PhysListEmG4v52.hh +++ /dev/null @@ -1,66 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// $Id: PhysListEmG4v52.hh,v 1.2 2006/06/29 16:48:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#ifndef PhysListEmG4v52_h -#define PhysListEmG4v52_h 1 - -#include "G4VPhysicsConstructor.hh" -#include "globals.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -class PhysListEmG4v52 : public G4VPhysicsConstructor -{ - public: - PhysListEmG4v52(const G4String& name = "g4v52"); - ~PhysListEmG4v52(); - - public: - // This method is dummy for physics. - void ConstructParticle() {}; - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - void ConstructProcess(); -}; - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#endif - - - - - - - - diff --git a/examples/extended/electromagnetic/TestEm17/include/PhysListEmStandard.hh b/examples/extended/electromagnetic/TestEm17/include/PhysListEmStandard.hh index a40dac6ac0..b6b7b02c7a 100644 --- a/examples/extended/electromagnetic/TestEm17/include/PhysListEmStandard.hh +++ b/examples/extended/electromagnetic/TestEm17/include/PhysListEmStandard.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysListEmStandard.hh,v 1.2 2006/06/29 16:48:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/include/PhysicsList.hh b/examples/extended/electromagnetic/TestEm17/include/PhysicsList.hh index 66ed64d67a..6aa5b38a10 100644 --- a/examples/extended/electromagnetic/TestEm17/include/PhysicsList.hh +++ b/examples/extended/electromagnetic/TestEm17/include/PhysicsList.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsList.hh,v 1.2 2006/06/29 16:48:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/include/PhysicsListMessenger.hh b/examples/extended/electromagnetic/TestEm17/include/PhysicsListMessenger.hh index 1d8b29543c..16b59beb9d 100644 --- a/examples/extended/electromagnetic/TestEm17/include/PhysicsListMessenger.hh +++ b/examples/extended/electromagnetic/TestEm17/include/PhysicsListMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListMessenger.hh,v 1.2 2006/06/29 16:48:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/include/PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm17/include/PrimaryGeneratorAction.hh index 08fc99dc83..953c56ea79 100644 --- a/examples/extended/electromagnetic/TestEm17/include/PrimaryGeneratorAction.hh +++ b/examples/extended/electromagnetic/TestEm17/include/PrimaryGeneratorAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorAction.hh,v 1.2 2006/06/29 16:48:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/include/ProcessesCount.hh b/examples/extended/electromagnetic/TestEm17/include/ProcessesCount.hh index 0171f8feb5..3946e37dad 100644 --- a/examples/extended/electromagnetic/TestEm17/include/ProcessesCount.hh +++ b/examples/extended/electromagnetic/TestEm17/include/ProcessesCount.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: ProcessesCount.hh,v 1.2 2006/06/29 16:48:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/include/RunAction.hh b/examples/extended/electromagnetic/TestEm17/include/RunAction.hh index 3c8e9f3894..86231f3ece 100644 --- a/examples/extended/electromagnetic/TestEm17/include/RunAction.hh +++ b/examples/extended/electromagnetic/TestEm17/include/RunAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RunAction.hh,v 1.2 2006/06/29 16:48:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/include/StackingAction.hh b/examples/extended/electromagnetic/TestEm17/include/StackingAction.hh index e191f0b8ef..a54c9c278f 100644 --- a/examples/extended/electromagnetic/TestEm17/include/StackingAction.hh +++ b/examples/extended/electromagnetic/TestEm17/include/StackingAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StackingAction.hh,v 1.2 2006/06/29 16:48:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/include/SteppingAction.hh b/examples/extended/electromagnetic/TestEm17/include/SteppingAction.hh index 92f0704891..f01270fbba 100644 --- a/examples/extended/electromagnetic/TestEm17/include/SteppingAction.hh +++ b/examples/extended/electromagnetic/TestEm17/include/SteppingAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingAction.hh,v 1.2 2006/06/29 16:48:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/include/SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm17/include/SteppingVerbose.hh index 0b030b91fd..3bb2ff160b 100644 --- a/examples/extended/electromagnetic/TestEm17/include/SteppingVerbose.hh +++ b/examples/extended/electromagnetic/TestEm17/include/SteppingVerbose.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingVerbose.hh,v 1.2 2006/06/29 16:48:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // This class manages the verbose outputs in G4SteppingManager. // It inherits from G4SteppingVerbose. diff --git a/examples/extended/electromagnetic/TestEm17/src/DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm17/src/DetectorConstruction.cc index 906e187e6f..4d1129e5d4 100644 --- a/examples/extended/electromagnetic/TestEm17/src/DetectorConstruction.cc +++ b/examples/extended/electromagnetic/TestEm17/src/DetectorConstruction.cc @@ -25,7 +25,7 @@ // // // $Id: DetectorConstruction.cc,v 1.2 2006/06/29 16:48:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/src/DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm17/src/DetectorMessenger.cc index c86ef016aa..60581945ce 100644 --- a/examples/extended/electromagnetic/TestEm17/src/DetectorMessenger.cc +++ b/examples/extended/electromagnetic/TestEm17/src/DetectorMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: DetectorMessenger.cc,v 1.2 2006/06/29 16:48:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm17/src/EventAction.cc b/examples/extended/electromagnetic/TestEm17/src/EventAction.cc index 76b41822b8..5639ddf642 100644 --- a/examples/extended/electromagnetic/TestEm17/src/EventAction.cc +++ b/examples/extended/electromagnetic/TestEm17/src/EventAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventAction.cc,v 1.2 2006/06/29 16:48:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/src/EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm17/src/EventActionMessenger.cc index 39a4a27d25..3e1e69ff10 100644 --- a/examples/extended/electromagnetic/TestEm17/src/EventActionMessenger.cc +++ b/examples/extended/electromagnetic/TestEm17/src/EventActionMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventActionMessenger.cc,v 1.2 2006/06/29 16:48:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/src/HistoManager.cc b/examples/extended/electromagnetic/TestEm17/src/HistoManager.cc index 9ed7c21a3e..f36dcd5305 100644 --- a/examples/extended/electromagnetic/TestEm17/src/HistoManager.cc +++ b/examples/extended/electromagnetic/TestEm17/src/HistoManager.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoManager.cc,v 1.2 2006/06/29 16:48:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/src/HistoMessenger.cc b/examples/extended/electromagnetic/TestEm17/src/HistoMessenger.cc index c44f6983dd..79bc155050 100644 --- a/examples/extended/electromagnetic/TestEm17/src/HistoMessenger.cc +++ b/examples/extended/electromagnetic/TestEm17/src/HistoMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoMessenger.cc,v 1.2 2006/06/29 16:49:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/src/MuCrossSections.cc b/examples/extended/electromagnetic/TestEm17/src/MuCrossSections.cc index 2cb2447fd9..1247193954 100644 --- a/examples/extended/electromagnetic/TestEm17/src/MuCrossSections.cc +++ b/examples/extended/electromagnetic/TestEm17/src/MuCrossSections.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: MuCrossSections.cc,v 1.2 2006/06/29 16:49:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/src/MuNuclearBuilder.cc b/examples/extended/electromagnetic/TestEm17/src/MuNuclearBuilder.cc index 6d71037482..1e96cb4985 100644 --- a/examples/extended/electromagnetic/TestEm17/src/MuNuclearBuilder.cc +++ b/examples/extended/electromagnetic/TestEm17/src/MuNuclearBuilder.cc @@ -25,7 +25,7 @@ // // // $Id: MuNuclearBuilder.cc,v 1.2 2006/06/29 16:49:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/src/PhysListEmStandard.cc b/examples/extended/electromagnetic/TestEm17/src/PhysListEmStandard.cc index 79fd5dbcc9..683dcc5cec 100644 --- a/examples/extended/electromagnetic/TestEm17/src/PhysListEmStandard.cc +++ b/examples/extended/electromagnetic/TestEm17/src/PhysListEmStandard.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysListEmStandard.cc,v 1.2 2006/06/29 16:49:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/src/PhysicsList.cc b/examples/extended/electromagnetic/TestEm17/src/PhysicsList.cc index 48b4d06eb4..84b7cd7736 100644 --- a/examples/extended/electromagnetic/TestEm17/src/PhysicsList.cc +++ b/examples/extended/electromagnetic/TestEm17/src/PhysicsList.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: PhysicsList.cc,v 1.2 2006/06/29 16:49:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysicsList.cc,v 1.4 2006/10/24 10:06:21 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -34,11 +34,23 @@ #include "PhysicsListMessenger.hh" #include "PhysListEmStandard.hh" -#include "PhysListEmG4v52.hh" #include "MuNuclearBuilder.hh" #include "G4LossTableManager.hh" +#include "G4Gamma.hh" +#include "G4Electron.hh" +#include "G4Positron.hh" + +#include "G4BosonConstructor.hh" +#include "G4LeptonConstructor.hh" +#include "G4MesonConstructor.hh" +#include "G4BosonConstructor.hh" +#include "G4BaryonConstructor.hh" +#include "G4IonConstructor.hh" +#include "G4ShortLivedConstructor.hh" + + //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... PhysicsList::PhysicsList() : G4VModularPhysicsList() @@ -71,92 +83,25 @@ PhysicsList::~PhysicsList() //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -// Bosons -#include "G4Geantino.hh" -#include "G4Gamma.hh" - -// leptons -#include "G4MuonPlus.hh" -#include "G4MuonMinus.hh" -#include "G4NeutrinoMu.hh" -#include "G4AntiNeutrinoMu.hh" - -#include "G4Electron.hh" -#include "G4Positron.hh" -#include "G4NeutrinoE.hh" -#include "G4AntiNeutrinoE.hh" - -// Mesons -#include "G4PionPlus.hh" -#include "G4PionMinus.hh" -#include "G4PionZero.hh" -#include "G4Eta.hh" -#include "G4EtaPrime.hh" - -#include "G4KaonPlus.hh" -#include "G4KaonMinus.hh" -#include "G4KaonZero.hh" -#include "G4AntiKaonZero.hh" -#include "G4KaonZeroLong.hh" -#include "G4KaonZeroShort.hh" - -// Baryons -#include "G4Proton.hh" -#include "G4AntiProton.hh" -#include "G4Neutron.hh" -#include "G4AntiNeutron.hh" - -// Nuclei -#include "G4Deuteron.hh" -#include "G4Triton.hh" -#include "G4Alpha.hh" -#include "G4GenericIon.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - void PhysicsList::ConstructParticle() { -// pseudo-particles - G4Geantino::GeantinoDefinition(); - -// gamma - G4Gamma::GammaDefinition(); + G4BosonConstructor pBosonConstructor; + pBosonConstructor.ConstructParticle(); -// leptons - G4Electron::ElectronDefinition(); - G4Positron::PositronDefinition(); - G4MuonPlus::MuonPlusDefinition(); - G4MuonMinus::MuonMinusDefinition(); + G4LeptonConstructor pLeptonConstructor; + pLeptonConstructor.ConstructParticle(); - G4NeutrinoE::NeutrinoEDefinition(); - G4AntiNeutrinoE::AntiNeutrinoEDefinition(); - G4NeutrinoMu::NeutrinoMuDefinition(); - G4AntiNeutrinoMu::AntiNeutrinoMuDefinition(); + G4MesonConstructor pMesonConstructor; + pMesonConstructor.ConstructParticle(); -// mesons - G4PionPlus::PionPlusDefinition(); - G4PionMinus::PionMinusDefinition(); - G4PionZero::PionZeroDefinition(); - G4Eta::EtaDefinition(); - G4EtaPrime::EtaPrimeDefinition(); - G4KaonPlus::KaonPlusDefinition(); - G4KaonMinus::KaonMinusDefinition(); - G4KaonZero::KaonZeroDefinition(); - G4AntiKaonZero::AntiKaonZeroDefinition(); - G4KaonZeroLong::KaonZeroLongDefinition(); - G4KaonZeroShort::KaonZeroShortDefinition(); + G4BaryonConstructor pBaryonConstructor; + pBaryonConstructor.ConstructParticle(); -// barions - G4Proton::ProtonDefinition(); - G4AntiProton::AntiProtonDefinition(); - G4Neutron::NeutronDefinition(); - G4AntiNeutron::AntiNeutronDefinition(); + G4IonConstructor pIonConstructor; + pIonConstructor.ConstructParticle(); -// ions - G4Deuteron::DeuteronDefinition(); - G4Triton::TritonDefinition(); - G4Alpha::AlphaDefinition(); - G4GenericIon::GenericIonDefinition(); + G4ShortLivedConstructor pShortLivedConstructor; + pShortLivedConstructor.ConstructParticle(); } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -189,12 +134,6 @@ void PhysicsList::AddPhysicsList(const G4String& name) delete emPhysicsList; emPhysicsList = new PhysListEmStandard(name); - } else if (name == "g4v52") { - - emName = name; - delete emPhysicsList; - emPhysicsList = new PhysListEmG4v52(name); - } else if (name == "muNucl") { muNuclPhysicsList = new MuNuclearBuilder(name); diff --git a/examples/extended/electromagnetic/TestEm17/src/PhysicsListMessenger.cc b/examples/extended/electromagnetic/TestEm17/src/PhysicsListMessenger.cc index 227830affb..77970273bd 100644 --- a/examples/extended/electromagnetic/TestEm17/src/PhysicsListMessenger.cc +++ b/examples/extended/electromagnetic/TestEm17/src/PhysicsListMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListMessenger.cc,v 1.2 2006/06/29 16:49:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/src/PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm17/src/PrimaryGeneratorAction.cc index 444c568602..bab2af4395 100644 --- a/examples/extended/electromagnetic/TestEm17/src/PrimaryGeneratorAction.cc +++ b/examples/extended/electromagnetic/TestEm17/src/PrimaryGeneratorAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorAction.cc,v 1.2 2006/06/29 16:49:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/src/RunAction.cc b/examples/extended/electromagnetic/TestEm17/src/RunAction.cc index 212a93a04c..850ea7a52d 100644 --- a/examples/extended/electromagnetic/TestEm17/src/RunAction.cc +++ b/examples/extended/electromagnetic/TestEm17/src/RunAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RunAction.cc,v 1.2 2006/06/29 16:49:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/src/StackingAction.cc b/examples/extended/electromagnetic/TestEm17/src/StackingAction.cc index 1c24c018a3..aa6a96d959 100644 --- a/examples/extended/electromagnetic/TestEm17/src/StackingAction.cc +++ b/examples/extended/electromagnetic/TestEm17/src/StackingAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StackingAction.cc,v 1.2 2006/06/29 16:49:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/src/SteppingAction.cc b/examples/extended/electromagnetic/TestEm17/src/SteppingAction.cc index 49a034c4fc..0b1d9b58da 100644 --- a/examples/extended/electromagnetic/TestEm17/src/SteppingAction.cc +++ b/examples/extended/electromagnetic/TestEm17/src/SteppingAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingAction.cc,v 1.2 2006/06/29 16:49:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/src/SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm17/src/SteppingVerbose.cc index 0c99e751ad..88a2a6f9ff 100644 --- a/examples/extended/electromagnetic/TestEm17/src/SteppingVerbose.cc +++ b/examples/extended/electromagnetic/TestEm17/src/SteppingVerbose.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingVerbose.cc,v 1.2 2006/06/29 16:49:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/GNUmakefile b/examples/extended/electromagnetic/TestEm2/GNUmakefile index 8617fba7d4..30a657db3c 100644 --- a/examples/extended/electromagnetic/TestEm2/GNUmakefile +++ b/examples/extended/electromagnetic/TestEm2/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.20 2004/09/17 10:51:34 maire Exp $ +# $Id: GNUmakefile,v 1.21 2006/10/20 16:03:39 maire Exp $ # -------------------------------------------------------------- # GNUmakefile for examples module. Gabriele Cosmo, 06/04/98. # -------------------------------------------------------------- @@ -25,7 +25,7 @@ include $(G4INSTALL)/config/architecture.gmk ifdef G4ANALYSIS_USE # for the aida-config command see the README file CPPFLAGS += `aida-config --include` - LDFLAGS += `aida-config --lib` + LOADLIBS += `aida-config --lib` endif include $(G4INSTALL)/config/binmake.gmk diff --git a/examples/extended/electromagnetic/TestEm2/History b/examples/extended/electromagnetic/TestEm2/History index 6336e21f3d..f3c76d3dc5 100644 --- a/examples/extended/electromagnetic/TestEm2/History +++ b/examples/extended/electromagnetic/TestEm2/History @@ -1,4 +1,4 @@ -$Id: History,v 1.65 2006/06/10 14:29:08 maire Exp $ +$Id: History,v 1.66 2006/10/20 16:03:39 maire Exp $ ------------------------------------------------------------------- ========================================================= @@ -14,7 +14,11 @@ track of all tags. ---------------------------------------------------------- * Reverse chronological order (last date on top), please * ---------------------------------------------------------- - + +20-10-06 mma (testem2-V08-01-00) +- GNUmakefile : LOADLIBS +- remove PhysicsLists 52 and 71 + 09-06-06 mma (testem2-V08-00-05) - PhysicsList : remove all Builders, replaced by PhysListEm. - PrimaryGenerator : allow /gun/particle/position diff --git a/examples/extended/electromagnetic/TestEm2/TestEm2.cc b/examples/extended/electromagnetic/TestEm2/TestEm2.cc index 5129746a9f..81c4062087 100644 --- a/examples/extended/electromagnetic/TestEm2/TestEm2.cc +++ b/examples/extended/electromagnetic/TestEm2/TestEm2.cc @@ -25,7 +25,7 @@ // // // $Id: TestEm2.cc,v 1.11 2006/06/29 16:49:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/TestEm2.in b/examples/extended/electromagnetic/TestEm2/TestEm2.in index cef6b3bffb..10f6fca41d 100644 --- a/examples/extended/electromagnetic/TestEm2/TestEm2.in +++ b/examples/extended/electromagnetic/TestEm2/TestEm2.in @@ -1,4 +1,4 @@ -# $Id: TestEm2.in,v 1.21 2006/06/10 14:29:08 maire Exp $ +# $Id: TestEm2.in,v 1.22 2006/10/20 16:03:39 maire Exp $ # # Macro file for "TestEm2.cc" # (can be run in batch, without graphic) @@ -16,7 +16,6 @@ /testem/run/acceptance 0.9450 0.0096 3.0 # /testem/phys/addPhysics standard -#### /testem/phys/addPhysics g4v52 # /testem/phys/setCuts 1.0 mm # diff --git a/examples/extended/electromagnetic/TestEm2/TestEm2.out b/examples/extended/electromagnetic/TestEm2/TestEm2.out index 28fbc4569e..1394291e21 100644 --- a/examples/extended/electromagnetic/TestEm2/TestEm2.out +++ b/examples/extended/electromagnetic/TestEm2/TestEm2.out @@ -1,13 +1,13 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 ************************************************************* -***** Table : Nb of materials = 8 ***** +***** Table : Nb of materials = 10 ***** Material: Air density: 1.290 mg/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 285.161 m ---> Element: Nitrogen (N) Z = 7.0 N = 14.0 A = 14.01 g/mole ElmMassFraction: 70.00 % ElmAbundance 72.71 % @@ -26,9 +26,15 @@ Material: Iron density: 7.870 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 1.759 cm ---> Element: Iron ( ) Z = 26.0 N = 55.9 A = 55.85 g/mole ElmMassFraction: 100.00 % ElmAbundance 100.00 % + Material: Copper density: 8.960 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 1.436 cm + ---> Element: Copper ( ) Z = 29.0 N = 63.5 A = 63.55 g/mole ElmMassFraction: 100.00 % ElmAbundance 100.00 % + Material: Lead density: 11.350 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 5.612 mm ---> Element: Lead ( ) Z = 82.0 N = 207.2 A = 207.19 g/mole ElmMassFraction: 100.00 % ElmAbundance 100.00 % + Material: Uranium density: 18.950 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 3.166 mm + ---> Element: Uranium ( ) Z = 92.0 N = 238.0 A = 238.03 g/mole ElmMassFraction: 100.00 % ElmAbundance 100.00 % + Material: BGO density: 7.100 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 1.123 cm ---> Element: Oxygen (O) Z = 8.0 N = 16.0 A = 16.00 g/mole ElmMassFraction: 15.41 % ElmAbundance 63.16 % ---> Element: Germanium (Ge) Z = 32.0 N = 72.6 A = 72.59 g/mole ElmMassFraction: 17.48 % ElmAbundance 15.79 % @@ -63,17 +69,13 @@ Registered model factories: drawByCharge drawByParticleID drawByOriginVolume - -Registered models: - None + drawByAttribute Registered filter factories: chargeFilter particleFilter originVolumeFilter - -Registered filters: - None + attributeFilter /run/verbose 2 # @@ -86,7 +88,6 @@ Registered filters: # /testem/phys/addPhysics standard PhysicsList::AddPhysicsList: -#### /testem/phys/addPhysics g4v52 # /testem/phys/setCuts 1.0 mm # @@ -111,6 +112,7 @@ PhysicsList::SetCuts:CutLength : 1 mm /run/beamOn 100 phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV Sampling according Klein-Nishina model @@ -118,7 +120,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.022 MeV to 100 GeV in 100 bins. @@ -150,7 +152,7 @@ eBrem: tables are built for e+ Total cross sections from a parametrisation based on the EEDL data library. Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -279,25 +281,25 @@ Start Run processing. Run terminated. Run Summary Number of events processed : 100 - User=166.46s Real=215.27s Sys=47.3s + User=160.76s Real=178.85s Sys=16.33s SUMMARY - energy deposit : 94.73 % E0 +- 1.01 % E0 - charged traklen: 481.00 radl +- 5.31 radl - neutral traklen: 4480.68 radl +- 124.78 radl + energy deposit : 94.82 % E0 +- 0.80 % E0 + charged traklen: 486.89 radl +- 4.33 radl + neutral traklen: 4464.64 radl +- 136.84 radl - 90.00 % confinement: radius = 3.11 radl (2.78 cm ) + 90.00 % confinement: radius = 3.05 radl (2.72 cm ) --------- Ranecu engine status --------- Initial seed (index) = 0 - Current couple of seeds = 883291145, 1147291742 + Current couple of seeds = 1762442429, 271121094 ---------------------------------------- <<<>>> 100 events for Total Energy in Absorber -Edep: 0.94734711 delEdep= 0.0023471143 nrms= 2.4449107 -Erms: 0.010138023 delErms= 0.00053802299 nrms= 0.56044062 -<<<>>> IS ACCEPTED +Edep: 0.94819548 delEdep= 0.0031954754 nrms= 3.3286202 +Erms: 0.0080173114 delErms= -0.0015826886 nrms= -1.648634 +<<<>>> IS NOT ACCEPTED Graphics systems deleted. Visualization Manager deleting... @@ -307,7 +309,9 @@ UserRunAction deleted. UserPrimaryGenerator deleted. G4 kernel has come to Quit state. EventManager deleted. +Default detector region deleted. UImanager deleted. +Units table cleared. StateManager deleted. RunManagerKernel is deleted. RunManager is deleting. diff --git a/examples/extended/electromagnetic/TestEm2/geant3/src/ugeom.F b/examples/extended/electromagnetic/TestEm2/geant3/src/ugeom.F index 88ea9f8034..e1f0a89892 100644 --- a/examples/extended/electromagnetic/TestEm2/geant3/src/ugeom.F +++ b/examples/extended/electromagnetic/TestEm2/geant3/src/ugeom.F @@ -45,6 +45,9 @@ CALL GSMIXT( 7,'PbWO4' , APbWO, ZPbWO, 8.28 ,-3,WPbWO) CALL GSMATE( 8,'Lead ' ,207.19, 82. ,11.35 ,0.56,18.5,0,0) CALL GSMATE( 9,'Tungsten' ,183.85, 74. ,19.30 ,0.35, 9.6,0,0) + + CALL GSMATE(10,'Copper' , 63.55, 29. , 8.96 , 1.43,17.1,0,0) + CALL GSMATE(11,'Uranium' ,238.03, 92. ,18.95 , 0.32,17.1,0,0) * * *** Defines USER tracking media parameters FIELDM = 0.0 diff --git a/examples/extended/electromagnetic/TestEm2/include/DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm2/include/DetectorConstruction.hh index 792a2188ce..8861d2ac83 100644 --- a/examples/extended/electromagnetic/TestEm2/include/DetectorConstruction.hh +++ b/examples/extended/electromagnetic/TestEm2/include/DetectorConstruction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorConstruction.hh,v 1.9 2006/06/29 16:49:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/include/DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm2/include/DetectorMessenger.hh index a023f16209..61495f7352 100644 --- a/examples/extended/electromagnetic/TestEm2/include/DetectorMessenger.hh +++ b/examples/extended/electromagnetic/TestEm2/include/DetectorMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorMessenger.hh,v 1.6 2006/06/29 16:49:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/include/EmAcceptance.hh b/examples/extended/electromagnetic/TestEm2/include/EmAcceptance.hh index 496e15e2db..60916e114c 100644 --- a/examples/extended/electromagnetic/TestEm2/include/EmAcceptance.hh +++ b/examples/extended/electromagnetic/TestEm2/include/EmAcceptance.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EmAcceptance.hh,v 1.3 2006/06/29 16:49:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/include/EventAction.hh b/examples/extended/electromagnetic/TestEm2/include/EventAction.hh index c1bf01c309..e7facfd568 100644 --- a/examples/extended/electromagnetic/TestEm2/include/EventAction.hh +++ b/examples/extended/electromagnetic/TestEm2/include/EventAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventAction.hh,v 1.3 2006/06/29 16:49:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/include/EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm2/include/EventActionMessenger.hh index 9f7aeee422..5257bb4a28 100644 --- a/examples/extended/electromagnetic/TestEm2/include/EventActionMessenger.hh +++ b/examples/extended/electromagnetic/TestEm2/include/EventActionMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventActionMessenger.hh,v 1.3 2006/06/29 16:49:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/include/PhysListEmG4v52.hh b/examples/extended/electromagnetic/TestEm2/include/PhysListEmG4v52.hh deleted file mode 100644 index ee6ba34c3c..0000000000 --- a/examples/extended/electromagnetic/TestEm2/include/PhysListEmG4v52.hh +++ /dev/null @@ -1,67 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: PhysListEmG4v52.hh,v 1.4 2006/06/29 16:49:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#ifndef PhysListEmG4v52_h -#define PhysListEmG4v52_h 1 - -#include "G4VPhysicsConstructor.hh" -#include "globals.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -class PhysListEmG4v52 : public G4VPhysicsConstructor -{ - public: - PhysListEmG4v52(const G4String& name = "g4v52"); - ~PhysListEmG4v52(); - - public: - // This method is dummy for physics. - void ConstructParticle() {}; - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - void ConstructProcess(); -}; - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#endif - - - - - - - - diff --git a/examples/extended/electromagnetic/TestEm2/include/PhysListEmLivermore.hh b/examples/extended/electromagnetic/TestEm2/include/PhysListEmLivermore.hh index f44acb6f4f..b54d134120 100644 --- a/examples/extended/electromagnetic/TestEm2/include/PhysListEmLivermore.hh +++ b/examples/extended/electromagnetic/TestEm2/include/PhysListEmLivermore.hh @@ -25,7 +25,7 @@ // // // $Id: PhysListEmLivermore.hh,v 1.2 2006/06/29 16:49:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/include/PhysListEmPenelope.hh b/examples/extended/electromagnetic/TestEm2/include/PhysListEmPenelope.hh index b1c50fa667..1ce86d9bfa 100644 --- a/examples/extended/electromagnetic/TestEm2/include/PhysListEmPenelope.hh +++ b/examples/extended/electromagnetic/TestEm2/include/PhysListEmPenelope.hh @@ -25,7 +25,7 @@ // // // $Id: PhysListEmPenelope.hh,v 1.2 2006/06/29 16:49:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/include/PhysListEmStandard.hh b/examples/extended/electromagnetic/TestEm2/include/PhysListEmStandard.hh index 5e32a8bb38..9fcebf8f90 100644 --- a/examples/extended/electromagnetic/TestEm2/include/PhysListEmStandard.hh +++ b/examples/extended/electromagnetic/TestEm2/include/PhysListEmStandard.hh @@ -25,7 +25,7 @@ // // // $Id: PhysListEmStandard.hh,v 1.4 2006/06/29 16:49:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/include/PhysicsList.hh b/examples/extended/electromagnetic/TestEm2/include/PhysicsList.hh index 2cce618c3c..9cfc617a86 100644 --- a/examples/extended/electromagnetic/TestEm2/include/PhysicsList.hh +++ b/examples/extended/electromagnetic/TestEm2/include/PhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: PhysicsList.hh,v 1.8 2006/06/29 16:49:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... // diff --git a/examples/extended/electromagnetic/TestEm2/include/PhysicsListMessenger.hh b/examples/extended/electromagnetic/TestEm2/include/PhysicsListMessenger.hh index f084820b67..a2708390dc 100644 --- a/examples/extended/electromagnetic/TestEm2/include/PhysicsListMessenger.hh +++ b/examples/extended/electromagnetic/TestEm2/include/PhysicsListMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListMessenger.hh,v 1.5 2006/06/29 16:49:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/include/PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm2/include/PrimaryGeneratorAction.hh index feb3a069ec..2d68f68ad8 100644 --- a/examples/extended/electromagnetic/TestEm2/include/PrimaryGeneratorAction.hh +++ b/examples/extended/electromagnetic/TestEm2/include/PrimaryGeneratorAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorAction.hh,v 1.5 2006/06/29 16:49:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/include/RunAction.hh b/examples/extended/electromagnetic/TestEm2/include/RunAction.hh index db3e3a4f28..c299b9218b 100644 --- a/examples/extended/electromagnetic/TestEm2/include/RunAction.hh +++ b/examples/extended/electromagnetic/TestEm2/include/RunAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RunAction.hh,v 1.9 2006/06/29 16:49:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/include/RunActionMessenger.hh b/examples/extended/electromagnetic/TestEm2/include/RunActionMessenger.hh index eff12558b6..64c2a40b58 100644 --- a/examples/extended/electromagnetic/TestEm2/include/RunActionMessenger.hh +++ b/examples/extended/electromagnetic/TestEm2/include/RunActionMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RunActionMessenger.hh,v 1.4 2006/06/29 16:50:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/include/StepMax.hh b/examples/extended/electromagnetic/TestEm2/include/StepMax.hh index 06836b9973..86461a55c7 100644 --- a/examples/extended/electromagnetic/TestEm2/include/StepMax.hh +++ b/examples/extended/electromagnetic/TestEm2/include/StepMax.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMax.hh,v 1.2 2006/06/29 16:50:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/include/StepMaxMessenger.hh b/examples/extended/electromagnetic/TestEm2/include/StepMaxMessenger.hh index 5360a37b7d..325cf19799 100644 --- a/examples/extended/electromagnetic/TestEm2/include/StepMaxMessenger.hh +++ b/examples/extended/electromagnetic/TestEm2/include/StepMaxMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMaxMessenger.hh,v 1.2 2006/06/29 16:50:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/include/SteppingAction.hh b/examples/extended/electromagnetic/TestEm2/include/SteppingAction.hh index 11a7b65672..942a47a99b 100644 --- a/examples/extended/electromagnetic/TestEm2/include/SteppingAction.hh +++ b/examples/extended/electromagnetic/TestEm2/include/SteppingAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingAction.hh,v 1.4 2006/06/29 16:50:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/include/SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm2/include/SteppingVerbose.hh index df80cdb9c2..c4f9e07b1b 100644 --- a/examples/extended/electromagnetic/TestEm2/include/SteppingVerbose.hh +++ b/examples/extended/electromagnetic/TestEm2/include/SteppingVerbose.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingVerbose.hh,v 1.3 2006/06/29 16:50:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // This class manages the verbose outputs in G4SteppingManager. // It inherits from G4SteppingVerbose. diff --git a/examples/extended/electromagnetic/TestEm2/include/TrackingAction.hh b/examples/extended/electromagnetic/TestEm2/include/TrackingAction.hh index 357a094d71..c8a97b1e51 100644 --- a/examples/extended/electromagnetic/TestEm2/include/TrackingAction.hh +++ b/examples/extended/electromagnetic/TestEm2/include/TrackingAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TrackingAction.hh,v 1.4 2006/06/29 16:50:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/run01.mac b/examples/extended/electromagnetic/TestEm2/run01.mac index a458cc2a3f..a2d9227163 100644 --- a/examples/extended/electromagnetic/TestEm2/run01.mac +++ b/examples/extended/electromagnetic/TestEm2/run01.mac @@ -1,4 +1,4 @@ -# $Id: run01.mac,v 1.23 2006/04/12 15:25:38 maire Exp $ +# $Id: run01.mac,v 1.24 2006/10/20 16:03:39 maire Exp $ # # Macro file for "TestEm2.cc" # (can be run in batch, without graphic) @@ -13,7 +13,6 @@ /testem/det/setRbin 50 0.1 # /testem/phys/addPhysics standard -#### /testem/phys/addPhysics g4v71 # /testem/phys/setCuts 1 mm # diff --git a/examples/extended/electromagnetic/TestEm2/run02.mac b/examples/extended/electromagnetic/TestEm2/run02.mac index 26a201a3ce..4fc8e9d0bd 100644 --- a/examples/extended/electromagnetic/TestEm2/run02.mac +++ b/examples/extended/electromagnetic/TestEm2/run02.mac @@ -1,4 +1,4 @@ -# $Id: run02.mac,v 1.9 2003/10/08 17:28:29 maire Exp $ +# $Id: run02.mac,v 1.10 2006/10/20 16:03:39 maire Exp $ # # Macro file for "TestEm2.cc" # (can be run in batch, without graphic) @@ -16,7 +16,6 @@ /testem/det/setRbin 12 0.11245 # /testem/phys/addPhysics standard -###/testem/phys/addPhysics g4v52 # /testem/phys/setCuts 2.0 mm # diff --git a/examples/extended/electromagnetic/TestEm2/run03.mac b/examples/extended/electromagnetic/TestEm2/run03.mac index 7d7cf7dfca..93ee5f3980 100644 --- a/examples/extended/electromagnetic/TestEm2/run03.mac +++ b/examples/extended/electromagnetic/TestEm2/run03.mac @@ -1,4 +1,4 @@ -# $Id: run03.mac,v 1.10 2003/10/08 17:28:30 maire Exp $ +# $Id: run03.mac,v 1.11 2006/10/20 16:03:40 maire Exp $ # # Macro file for "TestEm2.cc" # (can be run in batch, without graphic) @@ -16,7 +16,6 @@ /testem/det/setRbin 6 0.111 # /testem/phys/addPhysics standard -###/testem/phys/addPhysics g4v52 # /testem/phys/setCuts 5.0 mm # diff --git a/examples/extended/electromagnetic/TestEm2/run04.mac b/examples/extended/electromagnetic/TestEm2/run04.mac index b983b0a0e2..3cc053aac8 100644 --- a/examples/extended/electromagnetic/TestEm2/run04.mac +++ b/examples/extended/electromagnetic/TestEm2/run04.mac @@ -1,4 +1,4 @@ -# $Id: run04.mac,v 1.10 2006/01/13 17:43:59 maire Exp $ +# $Id: run04.mac,v 1.11 2006/10/20 16:03:40 maire Exp $ # # Macro file for "TestEm2.cc" # (can be run in batch, without graphic) @@ -15,7 +15,6 @@ /testem/det/setRbin 50 0.1 # /testem/phys/addPhysics standard -###/testem/phys/addPhysics g4v52 # /testem/phys/setCuts 0.8 mm # diff --git a/examples/extended/electromagnetic/TestEm2/run05.mac b/examples/extended/electromagnetic/TestEm2/run05.mac index 3d53050b61..241d980151 100644 --- a/examples/extended/electromagnetic/TestEm2/run05.mac +++ b/examples/extended/electromagnetic/TestEm2/run05.mac @@ -1,4 +1,4 @@ -# $Id: run05.mac,v 1.4 2006/06/10 14:29:08 maire Exp $ +# $Id: run05.mac,v 1.5 2006/10/20 16:03:40 maire Exp $ # # # Macro file for "TestEm2.cc" @@ -10,7 +10,7 @@ /run/verbose 2 # /testem/phys/addPhysics standard -###/testem/phys/addPhysics g4v52 +# /testem/phys/setCuts 1 mm # /run/initialize diff --git a/examples/extended/electromagnetic/TestEm2/src/DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm2/src/DetectorConstruction.cc index 940553c004..3872362711 100644 --- a/examples/extended/electromagnetic/TestEm2/src/DetectorConstruction.cc +++ b/examples/extended/electromagnetic/TestEm2/src/DetectorConstruction.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: DetectorConstruction.cc,v 1.11 2006/06/29 16:50:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: DetectorConstruction.cc,v 1.12 2006/10/20 16:03:40 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -110,9 +110,13 @@ void DetectorConstruction::DefineMaterials() new G4Material("Aluminium", z=13., a= 26.98*g/mole, density= 2.7*g/cm3); new G4Material("Iron", z=26., a= 55.85*g/mole, density= 7.87*g/cm3); - + + new G4Material("Copper" , z=29., a= 63.55*g/mole, density= 8.960*g/cm3); + new G4Material("Lead", z=82., a=207.19*g/mole, density=11.35*g/cm3); + new G4Material("Uranium" , z=92., a=238.03*g/mole, density= 18.95*g/cm3); + G4Material* BGO = new G4Material("BGO", density= 7.10*g/cm3, ncomponents=3); BGO->AddElement(O , natoms=12); diff --git a/examples/extended/electromagnetic/TestEm2/src/DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm2/src/DetectorMessenger.cc index 157d9eec7a..cad5c5b8f6 100644 --- a/examples/extended/electromagnetic/TestEm2/src/DetectorMessenger.cc +++ b/examples/extended/electromagnetic/TestEm2/src/DetectorMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorMessenger.cc,v 1.8 2006/06/29 16:50:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/src/EmAcceptance.cc b/examples/extended/electromagnetic/TestEm2/src/EmAcceptance.cc index 0c326516e6..403ca64de2 100644 --- a/examples/extended/electromagnetic/TestEm2/src/EmAcceptance.cc +++ b/examples/extended/electromagnetic/TestEm2/src/EmAcceptance.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EmAcceptance.cc,v 1.5 2006/06/29 16:50:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/src/EventAction.cc b/examples/extended/electromagnetic/TestEm2/src/EventAction.cc index 4b015388f0..1402762e2d 100644 --- a/examples/extended/electromagnetic/TestEm2/src/EventAction.cc +++ b/examples/extended/electromagnetic/TestEm2/src/EventAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventAction.cc,v 1.3 2006/06/29 16:50:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/src/EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm2/src/EventActionMessenger.cc index a2df240c7e..00c3358be8 100644 --- a/examples/extended/electromagnetic/TestEm2/src/EventActionMessenger.cc +++ b/examples/extended/electromagnetic/TestEm2/src/EventActionMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: EventActionMessenger.cc,v 1.3 2006/06/29 16:50:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm2/src/PhysListEmG4v52.cc b/examples/extended/electromagnetic/TestEm2/src/PhysListEmG4v52.cc deleted file mode 100644 index 1ee73cf4b3..0000000000 --- a/examples/extended/electromagnetic/TestEm2/src/PhysListEmG4v52.cc +++ /dev/null @@ -1,120 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: PhysListEmG4v52.cc,v 1.6 2006/06/29 16:50:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#include "PhysListEmG4v52.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" - -#include "G4ComptonScattering52.hh" -#include "G4GammaConversion52.hh" -#include "G4PhotoElectricEffect52.hh" - -#include "G4MultipleScattering52.hh" - -#include "G4eIonisation52.hh" -#include "G4eBremsstrahlung52.hh" -#include "G4eplusAnnihilation52.hh" - -#include "G4MuIonisation52.hh" -#include "G4MuBremsstrahlung52.hh" -#include "G4MuPairProduction52.hh" - -#include "G4hIonisation52.hh" - - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListEmG4v52::PhysListEmG4v52(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListEmG4v52::~PhysListEmG4v52() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void PhysListEmG4v52::ConstructProcess() -{ - // Add EM processes realised on base of prototype of model approach design - - theParticleIterator->reset(); - while( (*theParticleIterator)() ){ - G4ParticleDefinition* particle = theParticleIterator->value(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - G4String particleName = particle->GetParticleName(); - - if (particleName == "gamma") { - // gamma - pmanager->AddDiscreteProcess(new G4PhotoElectricEffect52); - pmanager->AddDiscreteProcess(new G4ComptonScattering52); - pmanager->AddDiscreteProcess(new G4GammaConversion52); - - } else if (particleName == "e-") { - //electron - pmanager->AddProcess(new G4MultipleScattering52, -1, 1,1); - pmanager->AddProcess(new G4eIonisation52, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung52, -1,-1,3); - - } else if (particleName == "e+") { - //positron - pmanager->AddProcess(new G4MultipleScattering52, -1, 1,1); - pmanager->AddProcess(new G4eIonisation52, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung52, -1,-1,3); - pmanager->AddProcess(new G4eplusAnnihilation52, 0,-1,4); - - } else if( particleName == "mu+" || - particleName == "mu-" ) { - //muon - pmanager->AddProcess(new G4MultipleScattering52,-1, 1,1); - pmanager->AddProcess(new G4MuIonisation52, -1, 2,2); - pmanager->AddProcess(new G4MuBremsstrahlung52, -1,-1,3); - pmanager->AddProcess(new G4MuPairProduction52, -1,-1,4); - - } else if( particleName == "GenericIon" ) { - - pmanager->AddProcess(new G4MultipleScattering52,-1,1,1); - pmanager->AddProcess(new G4hIonisation52, -1,2,2); - - } else if ((!particle->IsShortLived()) && - (particle->GetPDGCharge() != 0.0) && - (particle->GetParticleName() != "chargedgeantino")) { - //all others charged particles except geantino - pmanager->AddProcess(new G4MultipleScattering52,-1,1,1); - pmanager->AddProcess(new G4hIonisation52, -1,2,2); - } - } -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - diff --git a/examples/extended/electromagnetic/TestEm2/src/PhysListEmLivermore.cc b/examples/extended/electromagnetic/TestEm2/src/PhysListEmLivermore.cc index 11212d5d1e..d7c10df2f0 100644 --- a/examples/extended/electromagnetic/TestEm2/src/PhysListEmLivermore.cc +++ b/examples/extended/electromagnetic/TestEm2/src/PhysListEmLivermore.cc @@ -25,7 +25,7 @@ // // // $Id: PhysListEmLivermore.cc,v 1.2 2006/06/29 16:50:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/src/PhysListEmPenelope.cc b/examples/extended/electromagnetic/TestEm2/src/PhysListEmPenelope.cc index a249ae9f5e..a2da772c87 100644 --- a/examples/extended/electromagnetic/TestEm2/src/PhysListEmPenelope.cc +++ b/examples/extended/electromagnetic/TestEm2/src/PhysListEmPenelope.cc @@ -25,7 +25,7 @@ // // // $Id: PhysListEmPenelope.cc,v 1.2 2006/06/29 16:50:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/src/PhysListEmStandard.cc b/examples/extended/electromagnetic/TestEm2/src/PhysListEmStandard.cc index fbad5a95b8..cd432bacd5 100644 --- a/examples/extended/electromagnetic/TestEm2/src/PhysListEmStandard.cc +++ b/examples/extended/electromagnetic/TestEm2/src/PhysListEmStandard.cc @@ -25,7 +25,7 @@ // // // $Id: PhysListEmStandard.cc,v 1.5 2006/06/29 16:50:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/src/PhysicsList.cc b/examples/extended/electromagnetic/TestEm2/src/PhysicsList.cc index 89ae7f312e..1317728cda 100644 --- a/examples/extended/electromagnetic/TestEm2/src/PhysicsList.cc +++ b/examples/extended/electromagnetic/TestEm2/src/PhysicsList.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: PhysicsList.cc,v 1.11 2006/06/29 16:50:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysicsList.cc,v 1.12 2006/10/20 16:03:41 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -33,8 +33,6 @@ #include "PhysicsListMessenger.hh" #include "PhysListEmStandard.hh" -#include "PhysListEmG4v52.hh" - #include "PhysListEmLivermore.hh" #include "PhysListEmPenelope.hh" @@ -204,12 +202,6 @@ void PhysicsList::AddPhysicsList(const G4String& name) emName = name; delete emPhysicsList; emPhysicsList = new PhysListEmStandard(name); - - } else if (name == "g4v52") { - - emName = name; - delete emPhysicsList; - emPhysicsList = new PhysListEmG4v52(name); } else if (name == "livermore") { diff --git a/examples/extended/electromagnetic/TestEm2/src/PhysicsListMessenger.cc b/examples/extended/electromagnetic/TestEm2/src/PhysicsListMessenger.cc index b436bdf737..8698433ff2 100644 --- a/examples/extended/electromagnetic/TestEm2/src/PhysicsListMessenger.cc +++ b/examples/extended/electromagnetic/TestEm2/src/PhysicsListMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListMessenger.cc,v 1.5 2006/06/29 16:50:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/src/PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm2/src/PrimaryGeneratorAction.cc index 2e5ea0551b..48b60687f6 100644 --- a/examples/extended/electromagnetic/TestEm2/src/PrimaryGeneratorAction.cc +++ b/examples/extended/electromagnetic/TestEm2/src/PrimaryGeneratorAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorAction.cc,v 1.6 2006/06/29 16:50:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/src/RunAction.cc b/examples/extended/electromagnetic/TestEm2/src/RunAction.cc index e6285642b1..d5a6869d07 100644 --- a/examples/extended/electromagnetic/TestEm2/src/RunAction.cc +++ b/examples/extended/electromagnetic/TestEm2/src/RunAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RunAction.cc,v 1.21 2006/06/29 16:50:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/src/RunActionMessenger.cc b/examples/extended/electromagnetic/TestEm2/src/RunActionMessenger.cc index 4ac2a967a8..c7753db89b 100644 --- a/examples/extended/electromagnetic/TestEm2/src/RunActionMessenger.cc +++ b/examples/extended/electromagnetic/TestEm2/src/RunActionMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RunActionMessenger.cc,v 1.4 2006/06/29 16:50:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/src/StepMax.cc b/examples/extended/electromagnetic/TestEm2/src/StepMax.cc index 340b4f561d..84270dbeec 100644 --- a/examples/extended/electromagnetic/TestEm2/src/StepMax.cc +++ b/examples/extended/electromagnetic/TestEm2/src/StepMax.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMax.cc,v 1.2 2006/06/29 16:50:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/src/StepMaxMessenger.cc b/examples/extended/electromagnetic/TestEm2/src/StepMaxMessenger.cc index 7635070cc2..a7c6256fc4 100644 --- a/examples/extended/electromagnetic/TestEm2/src/StepMaxMessenger.cc +++ b/examples/extended/electromagnetic/TestEm2/src/StepMaxMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMaxMessenger.cc,v 1.2 2006/06/29 16:50:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/src/SteppingAction.cc b/examples/extended/electromagnetic/TestEm2/src/SteppingAction.cc index 609c2e7182..95796578b0 100644 --- a/examples/extended/electromagnetic/TestEm2/src/SteppingAction.cc +++ b/examples/extended/electromagnetic/TestEm2/src/SteppingAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingAction.cc,v 1.6 2006/06/29 16:50:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/src/SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm2/src/SteppingVerbose.cc index 64ed4879c0..a950f5653b 100644 --- a/examples/extended/electromagnetic/TestEm2/src/SteppingVerbose.cc +++ b/examples/extended/electromagnetic/TestEm2/src/SteppingVerbose.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingVerbose.cc,v 1.3 2006/06/29 16:50:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm2/src/TrackingAction.cc b/examples/extended/electromagnetic/TestEm2/src/TrackingAction.cc index 30e0aa4758..89f89d211f 100644 --- a/examples/extended/electromagnetic/TestEm2/src/TrackingAction.cc +++ b/examples/extended/electromagnetic/TestEm2/src/TrackingAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TrackingAction.cc,v 1.3 2006/06/29 16:51:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/GNUmakefile b/examples/extended/electromagnetic/TestEm3/GNUmakefile index 9357cf3752..dba16bf96f 100644 --- a/examples/extended/electromagnetic/TestEm3/GNUmakefile +++ b/examples/extended/electromagnetic/TestEm3/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.19 2004/10/25 12:50:55 maire Exp $ +# $Id: GNUmakefile,v 1.20 2006/10/31 12:53:48 maire Exp $ # -------------------------------------------------------------- # GNUmakefile for examples module. Gabriele Cosmo, 06/04/98. # -------------------------------------------------------------- @@ -25,7 +25,7 @@ include $(G4INSTALL)/config/architecture.gmk ifdef G4ANALYSIS_USE # for the aida-config command see the README file CPPFLAGS += `aida-config --include` - LDFLAGS += `aida-config --lib` + LOADLIBS += `aida-config --lib` endif include $(G4INSTALL)/config/binmake.gmk diff --git a/examples/extended/electromagnetic/TestEm3/History b/examples/extended/electromagnetic/TestEm3/History index 5c28c6da68..457adbce65 100644 --- a/examples/extended/electromagnetic/TestEm3/History +++ b/examples/extended/electromagnetic/TestEm3/History @@ -1,4 +1,4 @@ -$Id: History,v 1.93 2006/06/02 10:46:26 maire Exp $ +$Id: History,v 1.95 2006/11/22 19:16:09 vnivanch Exp $ ------------------------------------------------------------------- ========================================================= @@ -14,7 +14,14 @@ track of all tags. ---------------------------------------------------------- * Reverse chronological order (last date on top), please * --------------------------------------------------------- + +22-11-06 V.Ivant (testem3-V08-01-01) +- Fix names of standard EM builders +31-10-06 mma (testem3-V08-01-00) +- flag LOADLIBS in GNUmakefile +- remove physics lists 52 and 71 + 02-06-06 mma (testem3-V08-00-04) - SteppingAction: replace Touchable by TouchableHandle diff --git a/examples/extended/electromagnetic/TestEm3/README b/examples/extended/electromagnetic/TestEm3/README index 5c85a11512..7267745c1c 100644 --- a/examples/extended/electromagnetic/TestEm3/README +++ b/examples/extended/electromagnetic/TestEm3/README @@ -1,4 +1,4 @@ -$Id: README,v 1.27 2006/05/15 14:39:01 maire Exp $ +$Id: README,v 1.28 2006/11/22 19:16:09 vnivanch Exp $ ------------------------------------------------------------------- ========================================================= @@ -58,15 +58,13 @@ $Id: README,v 1.27 2006/05/15 14:39:01 maire Exp $ 2- PHYSICS LISTS - Physics Lists are subdivided on 4 following modules: - 1. "particles" - particle definitions - 2. "general" - decays and transportation - 3. "standard" (alternative) - standard EM physics - 4. "g4v52" (alternative) - standard EM physics version G4 5.2 - - Notice that there is an example of definition of a static ion : IonC12 - (see PhysListParticle.cc) and an example of use : ionC12.mac - + The following options for EM physics are available: + - "standard" the best standard EM physics (default) + - "G4standard" recommended standard EM physics for LHC + - "G4standard_fast" the best CPU performance standard physics for LHC + - "Livermore" low-energy EM physics using Livermore data + - "Penelope" low-energy EM physics implementing Penelope models + 3- AN EVENT : THE PRIMARY GENERATOR The primary kinematic consists of a single particle which hits the calorimeter diff --git a/examples/extended/electromagnetic/TestEm3/TestEm3.cc b/examples/extended/electromagnetic/TestEm3/TestEm3.cc index 6b7b4103b5..745a6aad34 100644 --- a/examples/extended/electromagnetic/TestEm3/TestEm3.cc +++ b/examples/extended/electromagnetic/TestEm3/TestEm3.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TestEm3.cc,v 1.20 2006/06/29 16:51:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/TestEm3.in b/examples/extended/electromagnetic/TestEm3/TestEm3.in index 46687c274d..2ffae7f201 100644 --- a/examples/extended/electromagnetic/TestEm3/TestEm3.in +++ b/examples/extended/electromagnetic/TestEm3/TestEm3.in @@ -1,4 +1,4 @@ -# $Id: TestEm3.in,v 1.23 2006/05/29 13:42:35 maire Exp $ +# $Id: TestEm3.in,v 1.24 2006/10/31 12:53:48 maire Exp $ # # Macro file for "exampleN03.cc" # (can be run in batch, without graphic) @@ -8,7 +8,6 @@ /control/verbose 2 /run/verbose 2 # -#### /testem/phys/addPhysics g4v71 /testem/phys/addPhysics standard # /run/initialize diff --git a/examples/extended/electromagnetic/TestEm3/TestEm3.out b/examples/extended/electromagnetic/TestEm3/TestEm3.out index 7ba0c5691a..3ebfb84f3f 100644 --- a/examples/extended/electromagnetic/TestEm3/TestEm3.out +++ b/examples/extended/electromagnetic/TestEm3/TestEm3.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -29,21 +29,16 @@ Registered model factories: drawByCharge drawByParticleID drawByOriginVolume - -Registered models: - None + drawByAttribute Registered filter factories: chargeFilter particleFilter originVolumeFilter - -Registered filters: - None + attributeFilter /run/verbose 2 # -#### /testem/phys/addPhysics g4v71 /testem/phys/addPhysics standard # /run/initialize @@ -101,6 +96,7 @@ PhysicsList::SetCuts:CutLength : 1 mm /run/beamOn 100 phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV Sampling according Klein-Nishina model @@ -108,7 +104,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.022 MeV to 100 GeV in 100 bins. @@ -140,7 +136,7 @@ eBrem: tables are built for e+ Total cross sections from a parametrisation based on the EEDL data library. Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -289,28 +285,28 @@ Start Run processing. Run terminated. Run Summary Number of events processed : 100 - User=106.64s Real=148.3s Sys=40.47s + User=100.2s Real=112.47s Sys=10.23s ------------------------------------------------------------ material Total Edep sqrt(E0(GeV))*rmsE/Emean total tracklen - Lead: 786.04 MeV +- 16.12 MeV 2.051 +- 0.2051 % 54.1 cm +- 1.23 cm -liquidArgon: 203.1 MeV +- 15.33 MeV 7.546 +- 0.7546 % 1 m +- 7.9 cm + Lead: 784.78 MeV +- 15.66 MeV 1.995 +- 0.1995 % 54.1 cm +- 1.2 cm +liquidArgon: 205.09 MeV +- 14.75 MeV 7.192 +- 0.7192 % 1.02 m +- 7.72 cm ------------------------------------------------------------ Energy deposition from Energy flow balance : material Total Edep - Lead: 786.028 MeV -liquidArgon: 203.108 MeV + Lead: 784.779 MeV +liquidArgon: 205.104 MeV ------------------------------------------------------------ --------- Ranecu engine status --------- Initial seed (index) = 0 - Current couple of seeds = 188592221, 473382051 + Current couple of seeds = 474290945, 1957549042 ---------------------------------------- Graphics systems deleted. Visualization Manager deleting... @@ -320,7 +316,9 @@ UserRunAction deleted. UserPrimaryGenerator deleted. G4 kernel has come to Quit state. EventManager deleted. +Default detector region deleted. UImanager deleted. +Units table cleared. StateManager deleted. RunManagerKernel is deleted. RunManager is deleting. diff --git a/examples/extended/electromagnetic/TestEm3/atlashec.mac b/examples/extended/electromagnetic/TestEm3/atlashec.mac index ce1a4560e2..59a884f86d 100644 --- a/examples/extended/electromagnetic/TestEm3/atlashec.mac +++ b/examples/extended/electromagnetic/TestEm3/atlashec.mac @@ -1,4 +1,4 @@ -# $Id: atlashec.mac,v 1.5 2005/11/12 00:28:55 vnivanch Exp $ +# $Id: atlashec.mac,v 1.6 2006/10/31 12:53:48 maire Exp $ # # Macro file for "TestEm3.cc" # @@ -13,7 +13,6 @@ /testem/det/setAbsor 2 Copper 2.5 cm /testem/det/setSizeYZ 17 cm # -#### /testem/phys/addPhysics g4v52 /testem/phys/addPhysics standard /testem/phys/setCuts 0.7 mm # diff --git a/examples/extended/electromagnetic/TestEm3/fanoCav.mac b/examples/extended/electromagnetic/TestEm3/fanoCav.mac new file mode 100644 index 0000000000..4a664f315d --- /dev/null +++ b/examples/extended/electromagnetic/TestEm3/fanoCav.mac @@ -0,0 +1,37 @@ +# $Id: fanoCav.mac,v 1.1 2006/10/31 13:43:36 maire Exp $ +# +# Macro file for "TestEm3.cc" +# (can be run in batch, without graphic) +# +# water-steam-water 1 layer; +# +# E. Poon et al. Phys. Med. Biol. 50(2005) p.681 +# +/control/verbose 2 +/run/verbose 2 +# +/testem/det/setNbOfLayers 1 +/testem/det/setNbOfAbsor 3 +/testem/det/setAbsor 1 Water 5 mm +/testem/det/setAbsor 2 WaterSteam 2 mm +/testem/det/setAbsor 3 Water 5 mm +/testem/det/setSizeYZ 2 cm +# +/testem/phys/setCuts 1 km +# +/run/initialize +# +/testem/gun/setDefault +/gun/particle gamma +/gun/energy 1.25 MeV +/testem/gun/rndm 0.99 +# +/process/eLoss/StepFunction 0.2 1 mum +# +/testem/histo/setFileName fanoCav +/testem/histo/setFileType hbook +/testem/histo/setHisto 2 100 0 1000 eV +# +/testem/event/printModulo 100000 +# +/run/beamOn 2000000 diff --git a/examples/extended/electromagnetic/TestEm3/include/DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm3/include/DetectorConstruction.hh index 83363ff20e..540a689e30 100644 --- a/examples/extended/electromagnetic/TestEm3/include/DetectorConstruction.hh +++ b/examples/extended/electromagnetic/TestEm3/include/DetectorConstruction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorConstruction.hh,v 1.13 2006/06/29 16:51:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/include/DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm3/include/DetectorMessenger.hh index 264af3e3f1..723aa0c6a2 100644 --- a/examples/extended/electromagnetic/TestEm3/include/DetectorMessenger.hh +++ b/examples/extended/electromagnetic/TestEm3/include/DetectorMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorMessenger.hh,v 1.8 2006/06/29 16:51:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/include/EmAcceptance.hh b/examples/extended/electromagnetic/TestEm3/include/EmAcceptance.hh index 501a5504e4..1e619e7e5b 100644 --- a/examples/extended/electromagnetic/TestEm3/include/EmAcceptance.hh +++ b/examples/extended/electromagnetic/TestEm3/include/EmAcceptance.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EmAcceptance.hh,v 1.4 2006/06/29 16:51:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/include/EventAction.hh b/examples/extended/electromagnetic/TestEm3/include/EventAction.hh index f449399415..6653de0284 100644 --- a/examples/extended/electromagnetic/TestEm3/include/EventAction.hh +++ b/examples/extended/electromagnetic/TestEm3/include/EventAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventAction.hh,v 1.10 2006/06/29 16:51:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/include/EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm3/include/EventActionMessenger.hh index e6fad53a3d..dd29a7b693 100644 --- a/examples/extended/electromagnetic/TestEm3/include/EventActionMessenger.hh +++ b/examples/extended/electromagnetic/TestEm3/include/EventActionMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventActionMessenger.hh,v 1.3 2006/06/29 16:51:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/include/HistoManager.hh b/examples/extended/electromagnetic/TestEm3/include/HistoManager.hh index e95d93bc96..fae1970fc9 100644 --- a/examples/extended/electromagnetic/TestEm3/include/HistoManager.hh +++ b/examples/extended/electromagnetic/TestEm3/include/HistoManager.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoManager.hh,v 1.7 2006/06/29 16:51:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/include/HistoMessenger.hh b/examples/extended/electromagnetic/TestEm3/include/HistoMessenger.hh index e88bf6306d..dea9c2e01d 100644 --- a/examples/extended/electromagnetic/TestEm3/include/HistoMessenger.hh +++ b/examples/extended/electromagnetic/TestEm3/include/HistoMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoMessenger.hh,v 1.4 2006/06/29 16:51:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/include/PhysListEmG4v52.hh b/examples/extended/electromagnetic/TestEm3/include/PhysListEmG4v52.hh deleted file mode 100644 index 0f40c36dc3..0000000000 --- a/examples/extended/electromagnetic/TestEm3/include/PhysListEmG4v52.hh +++ /dev/null @@ -1,66 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// $Id: PhysListEmG4v52.hh,v 1.3 2006/06/29 16:51:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#ifndef PhysListEmG4v52_h -#define PhysListEmG4v52_h 1 - -#include "G4VPhysicsConstructor.hh" -#include "globals.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -class PhysListEmG4v52 : public G4VPhysicsConstructor -{ - public: - PhysListEmG4v52(const G4String& name = "g4v52"); - ~PhysListEmG4v52(); - - public: - // This method is dummy for physics. - void ConstructParticle() {}; - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - void ConstructProcess(); -}; - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#endif - - - - - - - - diff --git a/examples/extended/electromagnetic/TestEm3/include/PhysListEmLivermore.hh b/examples/extended/electromagnetic/TestEm3/include/PhysListEmLivermore.hh index 0eaef1668b..695aa06597 100644 --- a/examples/extended/electromagnetic/TestEm3/include/PhysListEmLivermore.hh +++ b/examples/extended/electromagnetic/TestEm3/include/PhysListEmLivermore.hh @@ -25,7 +25,7 @@ // // // $Id: PhysListEmLivermore.hh,v 1.2 2006/06/29 16:51:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/include/PhysListEmPenelope.hh b/examples/extended/electromagnetic/TestEm3/include/PhysListEmPenelope.hh index 0efe84e8f4..dbd65b44ab 100644 --- a/examples/extended/electromagnetic/TestEm3/include/PhysListEmPenelope.hh +++ b/examples/extended/electromagnetic/TestEm3/include/PhysListEmPenelope.hh @@ -25,7 +25,7 @@ // // // $Id: PhysListEmPenelope.hh,v 1.2 2006/06/29 16:51:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/include/PhysListEmStandard.hh b/examples/extended/electromagnetic/TestEm3/include/PhysListEmStandard.hh index f8341b4a2a..840ac979fe 100644 --- a/examples/extended/electromagnetic/TestEm3/include/PhysListEmStandard.hh +++ b/examples/extended/electromagnetic/TestEm3/include/PhysListEmStandard.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysListEmStandard.hh,v 1.4 2006/06/29 16:51:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/include/PhysicsList.hh b/examples/extended/electromagnetic/TestEm3/include/PhysicsList.hh index fdbcc2c547..dc14a4cdb3 100644 --- a/examples/extended/electromagnetic/TestEm3/include/PhysicsList.hh +++ b/examples/extended/electromagnetic/TestEm3/include/PhysicsList.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsList.hh,v 1.6 2006/06/29 16:51:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/include/PhysicsListMessenger.hh b/examples/extended/electromagnetic/TestEm3/include/PhysicsListMessenger.hh index 2487fc6815..94b10f7c17 100644 --- a/examples/extended/electromagnetic/TestEm3/include/PhysicsListMessenger.hh +++ b/examples/extended/electromagnetic/TestEm3/include/PhysicsListMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListMessenger.hh,v 1.3 2006/06/29 16:52:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/include/PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm3/include/PrimaryGeneratorAction.hh index 0335a1a4a4..f408c43887 100644 --- a/examples/extended/electromagnetic/TestEm3/include/PrimaryGeneratorAction.hh +++ b/examples/extended/electromagnetic/TestEm3/include/PrimaryGeneratorAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorAction.hh,v 1.4 2006/06/29 16:52:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/include/PrimaryGeneratorMessenger.hh b/examples/extended/electromagnetic/TestEm3/include/PrimaryGeneratorMessenger.hh index c7557b3c85..b020c31c8c 100644 --- a/examples/extended/electromagnetic/TestEm3/include/PrimaryGeneratorMessenger.hh +++ b/examples/extended/electromagnetic/TestEm3/include/PrimaryGeneratorMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorMessenger.hh,v 1.3 2006/06/29 16:52:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/include/RunAction.hh b/examples/extended/electromagnetic/TestEm3/include/RunAction.hh index aa7aa3d410..2f7ae41362 100644 --- a/examples/extended/electromagnetic/TestEm3/include/RunAction.hh +++ b/examples/extended/electromagnetic/TestEm3/include/RunAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RunAction.hh,v 1.17 2006/06/29 16:52:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/include/RunActionMessenger.hh b/examples/extended/electromagnetic/TestEm3/include/RunActionMessenger.hh index d31d86ddd7..c58166a66f 100644 --- a/examples/extended/electromagnetic/TestEm3/include/RunActionMessenger.hh +++ b/examples/extended/electromagnetic/TestEm3/include/RunActionMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RunActionMessenger.hh,v 1.9 2006/06/29 16:52:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/include/StepMax.hh b/examples/extended/electromagnetic/TestEm3/include/StepMax.hh index 0e3014d598..be1b642280 100644 --- a/examples/extended/electromagnetic/TestEm3/include/StepMax.hh +++ b/examples/extended/electromagnetic/TestEm3/include/StepMax.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMax.hh,v 1.7 2006/06/29 16:52:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/include/StepMaxMessenger.hh b/examples/extended/electromagnetic/TestEm3/include/StepMaxMessenger.hh index ebaf299f03..d804f325e8 100644 --- a/examples/extended/electromagnetic/TestEm3/include/StepMaxMessenger.hh +++ b/examples/extended/electromagnetic/TestEm3/include/StepMaxMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMaxMessenger.hh,v 1.2 2006/06/29 16:52:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/include/SteppingAction.hh b/examples/extended/electromagnetic/TestEm3/include/SteppingAction.hh index a458a51225..74df6bb5e3 100644 --- a/examples/extended/electromagnetic/TestEm3/include/SteppingAction.hh +++ b/examples/extended/electromagnetic/TestEm3/include/SteppingAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingAction.hh,v 1.8 2006/06/29 16:52:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/include/SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm3/include/SteppingVerbose.hh index 89cd3a14a3..8cb19312fc 100644 --- a/examples/extended/electromagnetic/TestEm3/include/SteppingVerbose.hh +++ b/examples/extended/electromagnetic/TestEm3/include/SteppingVerbose.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingVerbose.hh,v 1.5 2006/06/29 16:52:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // This class manages the verbose outputs in G4SteppingManager. // It inherits from G4SteppingVerbose. diff --git a/examples/extended/electromagnetic/TestEm3/include/TrackingAction.hh b/examples/extended/electromagnetic/TestEm3/include/TrackingAction.hh index 0d69fb8f63..a6df274939 100644 --- a/examples/extended/electromagnetic/TestEm3/include/TrackingAction.hh +++ b/examples/extended/electromagnetic/TestEm3/include/TrackingAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TrackingAction.hh,v 1.2 2006/06/29 16:52:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/ionC12.mac b/examples/extended/electromagnetic/TestEm3/ionC12.mac index 47094f2f12..503ff56b08 100644 --- a/examples/extended/electromagnetic/TestEm3/ionC12.mac +++ b/examples/extended/electromagnetic/TestEm3/ionC12.mac @@ -1,4 +1,4 @@ -# $Id: ionC12.mac,v 1.9 2005/11/12 00:28:55 vnivanch Exp $ +# $Id: ionC12.mac,v 1.10 2006/10/31 12:53:48 maire Exp $ # # Macro file for "TestEm3.cc" # (can be run in batch, without graphic) @@ -11,7 +11,6 @@ # # select EM PhysicsList # -###/testem/phys/addPhysics g4v52 /testem/phys/addPhysics standard # /testem/phys/setCuts 1 mm diff --git a/examples/extended/electromagnetic/TestEm3/lhcb.mac b/examples/extended/electromagnetic/TestEm3/lhcb.mac index 9933ebf45d..4d32e06fb7 100644 --- a/examples/extended/electromagnetic/TestEm3/lhcb.mac +++ b/examples/extended/electromagnetic/TestEm3/lhcb.mac @@ -1,4 +1,4 @@ -# $Id: lhcb.mac,v 1.1 2004/12/03 12:27:39 maire Exp $ +# $Id: lhcb.mac,v 1.2 2006/10/31 12:53:48 maire Exp $ # # Macro file for "TestEm3.cc" # @@ -13,7 +13,6 @@ /testem/det/setAbsor 2 Scintillator 4 mm /testem/det/setSizeYZ 20 cm # -####/testem/phys/addPhysics g4v52 /testem/phys/addPhysics standard # /gun/particle e- diff --git a/examples/extended/electromagnetic/TestEm3/linac.mac b/examples/extended/electromagnetic/TestEm3/linac.mac index fe84cdba8c..8ebffa4e8b 100644 --- a/examples/extended/electromagnetic/TestEm3/linac.mac +++ b/examples/extended/electromagnetic/TestEm3/linac.mac @@ -1,4 +1,4 @@ -# $Id: linac.mac,v 1.4 2006/03/20 12:26:03 maire Exp $ +# $Id: linac.mac,v 1.5 2006/11/08 10:27:18 maire Exp $ # # Macro file for "TestEm3" # @@ -12,7 +12,7 @@ /testem/det/setAbsor 1 Tungsten 2.50 mm /testem/det/setAbsor 2 NemaG10 0.68 mm /testem/det/setAbsor 3 Silicon 0.32 mm -/testem/det/setAbsor 4 Air 0.25 mm +/testem/det/setAbsor 4 Air20 0.25 mm /testem/det/setSizeYZ 30 cm # /testem/phys/addPhysics standard diff --git a/examples/extended/electromagnetic/TestEm3/run01.mac b/examples/extended/electromagnetic/TestEm3/run01.mac index 1603d13b2d..43da3f8ac4 100644 --- a/examples/extended/electromagnetic/TestEm3/run01.mac +++ b/examples/extended/electromagnetic/TestEm3/run01.mac @@ -1,4 +1,4 @@ -# $Id: run01.mac,v 1.16 2006/03/20 12:26:03 maire Exp $ +# $Id: run01.mac,v 1.17 2006/10/31 12:53:48 maire Exp $ # # Macro file for "exampleN03.cc" # (can be run in batch, without graphic) @@ -8,9 +8,7 @@ /control/verbose 2 /run/verbose 2 # -###/testem/phys/addPhysics g4v52 -/testem/phys/addPhysics g4v71 -###/testem/phys/addPhysics standard +/testem/phys/addPhysics standard # /testem/phys/setCuts 0.1 um # diff --git a/examples/extended/electromagnetic/TestEm3/run02.mac b/examples/extended/electromagnetic/TestEm3/run02.mac index 02d824babe..c4eaf19564 100644 --- a/examples/extended/electromagnetic/TestEm3/run02.mac +++ b/examples/extended/electromagnetic/TestEm3/run02.mac @@ -1,4 +1,4 @@ -# $Id: run02.mac,v 1.14 2006/03/20 12:26:03 maire Exp $ +# $Id: run02.mac,v 1.15 2006/10/31 12:53:48 maire Exp $ # # Macro file for "TestEm3.cc" # (can be run in batch, without graphic) @@ -8,7 +8,6 @@ /control/verbose 2 /run/verbose 2 # -###/testem/phys/addPhysics g4v52 /testem/phys/addPhysics standard # /testem/det/setNbOfLayers 50 diff --git a/examples/extended/electromagnetic/TestEm3/run07.mac b/examples/extended/electromagnetic/TestEm3/run07.mac index c5e3609094..f5cec07725 100644 --- a/examples/extended/electromagnetic/TestEm3/run07.mac +++ b/examples/extended/electromagnetic/TestEm3/run07.mac @@ -1,4 +1,4 @@ -# $Id: run07.mac,v 1.11 2004/10/20 14:32:28 maire Exp $ +# $Id: run07.mac,v 1.12 2006/10/31 12:53:48 maire Exp $ # # Macro file for "TestEm3.cc" # (can be run in batch, without graphic) @@ -8,7 +8,6 @@ /control/verbose 2 /run/verbose 2 # -###/testem/phys/addPhysics g4v52 /testem/phys/addPhysics standard # /testem/det/setNbOfLayers 2 diff --git a/examples/extended/electromagnetic/TestEm3/run08.mac b/examples/extended/electromagnetic/TestEm3/run08.mac index fdf3574389..958a7f5079 100644 --- a/examples/extended/electromagnetic/TestEm3/run08.mac +++ b/examples/extended/electromagnetic/TestEm3/run08.mac @@ -1,4 +1,4 @@ -# $Id: run08.mac,v 1.8 2004/11/23 14:05:25 maire Exp $ +# $Id: run08.mac,v 1.9 2006/10/31 12:53:48 maire Exp $ # # Macro file for "TestEm3.cc" # (can be run in batch, without graphic) @@ -8,7 +8,6 @@ /control/verbose 2 /run/verbose 2 # -###/testem/phys/addPhysics g4v52 /testem/phys/addPhysics standard # /testem/phys/setCuts 1 mm diff --git a/examples/extended/electromagnetic/TestEm3/run15.mac b/examples/extended/electromagnetic/TestEm3/run15.mac index edb9fdca01..aa81d5bc73 100644 --- a/examples/extended/electromagnetic/TestEm3/run15.mac +++ b/examples/extended/electromagnetic/TestEm3/run15.mac @@ -1,4 +1,4 @@ -# $Id: run15.mac,v 1.14 2006/03/20 12:26:03 maire Exp $ +# $Id: run15.mac,v 1.15 2006/10/31 12:53:48 maire Exp $ # # Macro file for "TestEm3.cc" # (can be run in batch, without graphic) @@ -8,7 +8,6 @@ /control/verbose 2 /run/verbose 2 # -###/testem/phys/addPhysics g4v52 /testem/phys/addPhysics standard # /testem/det/setNbOfLayers 20 diff --git a/examples/extended/electromagnetic/TestEm3/sicapo1.mac b/examples/extended/electromagnetic/TestEm3/sicapo1.mac index f11dfce853..081621264d 100644 --- a/examples/extended/electromagnetic/TestEm3/sicapo1.mac +++ b/examples/extended/electromagnetic/TestEm3/sicapo1.mac @@ -1,4 +1,4 @@ -# $Id: sicapo1.mac,v 1.3 2004/10/20 14:32:29 maire Exp $ +# $Id: sicapo1.mac,v 1.4 2006/10/31 12:53:48 maire Exp $ # # Macro file for "TestEm3.cc" # (can be run in batch, without graphic) @@ -11,7 +11,6 @@ /control/verbose 2 /run/verbose 2 # -###/testem/phys/addPhysics g4v52 /testem/phys/addPhysics standard # /testem/det/setNbOfLayers 15 diff --git a/examples/extended/electromagnetic/TestEm3/sicapo2.mac b/examples/extended/electromagnetic/TestEm3/sicapo2.mac index d20a2bc31b..feba7704ca 100644 --- a/examples/extended/electromagnetic/TestEm3/sicapo2.mac +++ b/examples/extended/electromagnetic/TestEm3/sicapo2.mac @@ -1,4 +1,4 @@ -# $Id: sicapo2.mac,v 1.3 2004/10/20 14:32:29 maire Exp $ +# $Id: sicapo2.mac,v 1.4 2006/10/31 12:53:48 maire Exp $ # # Macro file for "TestEm3.cc" # (can be run in batch, without graphic) @@ -11,7 +11,6 @@ /control/verbose 2 /run/verbose 2 # -###/testem/phys/addPhysics g4v52 /testem/phys/addPhysics standard # /testem/det/setNbOfLayers 15 diff --git a/examples/extended/electromagnetic/TestEm3/sicapo3.mac b/examples/extended/electromagnetic/TestEm3/sicapo3.mac index 4b5d5d5c8b..6e2ca812b0 100644 --- a/examples/extended/electromagnetic/TestEm3/sicapo3.mac +++ b/examples/extended/electromagnetic/TestEm3/sicapo3.mac @@ -1,4 +1,4 @@ -# $Id: sicapo3.mac,v 1.4 2004/10/20 14:32:29 maire Exp $ +# $Id: sicapo3.mac,v 1.5 2006/10/31 12:53:48 maire Exp $ # # Macro file for "TestEm3.cc" # (can be run in batch, without graphic) @@ -10,7 +10,6 @@ /control/verbose 2 /run/verbose 2 # -###/testem/phys/addPhysics g4v52 /testem/phys/addPhysics standard # /testem/det/setNbOfLayers 10 diff --git a/examples/extended/electromagnetic/TestEm3/src/DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm3/src/DetectorConstruction.cc index e10b738de6..381d2742b3 100644 --- a/examples/extended/electromagnetic/TestEm3/src/DetectorConstruction.cc +++ b/examples/extended/electromagnetic/TestEm3/src/DetectorConstruction.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: DetectorConstruction.cc,v 1.17 2006/06/29 16:52:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: DetectorConstruction.cc,v 1.18 2006/10/31 12:53:48 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -172,10 +172,6 @@ void DetectorConstruction::DefineMaterials() SiO2->AddElement(Si, natoms=1); SiO2->AddElement(O , natoms=2); - // - // define a material from elements. case 2: compounds - // - G4Material* G10 = new G4Material("NemaG10", density= 1.700*g/cm3, ncomponents=4); G10->AddElement(Si, natoms=1); diff --git a/examples/extended/electromagnetic/TestEm3/src/DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm3/src/DetectorMessenger.cc index 72f210567e..0ca9691346 100644 --- a/examples/extended/electromagnetic/TestEm3/src/DetectorMessenger.cc +++ b/examples/extended/electromagnetic/TestEm3/src/DetectorMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorMessenger.cc,v 1.11 2006/06/29 16:52:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/src/EmAcceptance.cc b/examples/extended/electromagnetic/TestEm3/src/EmAcceptance.cc index 7fb475c72d..f2cf2bdbff 100644 --- a/examples/extended/electromagnetic/TestEm3/src/EmAcceptance.cc +++ b/examples/extended/electromagnetic/TestEm3/src/EmAcceptance.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EmAcceptance.cc,v 1.6 2006/06/29 16:52:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/src/EventAction.cc b/examples/extended/electromagnetic/TestEm3/src/EventAction.cc index b24948858a..f06a6dfb57 100644 --- a/examples/extended/electromagnetic/TestEm3/src/EventAction.cc +++ b/examples/extended/electromagnetic/TestEm3/src/EventAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventAction.cc,v 1.14 2006/06/29 16:52:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/src/EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm3/src/EventActionMessenger.cc index f4cd7213c4..f4ba766f18 100644 --- a/examples/extended/electromagnetic/TestEm3/src/EventActionMessenger.cc +++ b/examples/extended/electromagnetic/TestEm3/src/EventActionMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventActionMessenger.cc,v 1.4 2006/06/29 16:52:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/src/HistoManager.cc b/examples/extended/electromagnetic/TestEm3/src/HistoManager.cc index cc1e6a34a9..4086ea8f03 100644 --- a/examples/extended/electromagnetic/TestEm3/src/HistoManager.cc +++ b/examples/extended/electromagnetic/TestEm3/src/HistoManager.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoManager.cc,v 1.13 2006/06/29 16:52:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/src/HistoMessenger.cc b/examples/extended/electromagnetic/TestEm3/src/HistoMessenger.cc index 774492a0b3..38300ad763 100644 --- a/examples/extended/electromagnetic/TestEm3/src/HistoMessenger.cc +++ b/examples/extended/electromagnetic/TestEm3/src/HistoMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoMessenger.cc,v 1.8 2006/06/29 16:52:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/src/PhysListEmG4v52.cc b/examples/extended/electromagnetic/TestEm3/src/PhysListEmG4v52.cc deleted file mode 100644 index 85df422baf..0000000000 --- a/examples/extended/electromagnetic/TestEm3/src/PhysListEmG4v52.cc +++ /dev/null @@ -1,119 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// $Id: PhysListEmG4v52.cc,v 1.5 2006/06/29 16:52:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#include "PhysListEmG4v52.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" - -#include "G4ComptonScattering52.hh" -#include "G4GammaConversion52.hh" -#include "G4PhotoElectricEffect52.hh" - -#include "G4MultipleScattering52.hh" - -#include "G4eIonisation52.hh" -#include "G4eBremsstrahlung52.hh" -#include "G4eplusAnnihilation52.hh" - -#include "G4MuIonisation52.hh" -#include "G4MuBremsstrahlung52.hh" -#include "G4MuPairProduction52.hh" - -#include "G4hIonisation52.hh" - - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListEmG4v52::PhysListEmG4v52(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListEmG4v52::~PhysListEmG4v52() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void PhysListEmG4v52::ConstructProcess() -{ - // Add EM processes realised on base of prototype of model approach design - - theParticleIterator->reset(); - while( (*theParticleIterator)() ){ - G4ParticleDefinition* particle = theParticleIterator->value(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - G4String particleName = particle->GetParticleName(); - - if (particleName == "gamma") { - // gamma - pmanager->AddDiscreteProcess(new G4PhotoElectricEffect52); - pmanager->AddDiscreteProcess(new G4ComptonScattering52); - pmanager->AddDiscreteProcess(new G4GammaConversion52); - - } else if (particleName == "e-") { - //electron - pmanager->AddProcess(new G4MultipleScattering52, -1, 1,1); - pmanager->AddProcess(new G4eIonisation52, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung52, -1,-1,3); - - } else if (particleName == "e+") { - //positron - pmanager->AddProcess(new G4MultipleScattering52, -1, 1,1); - pmanager->AddProcess(new G4eIonisation52, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung52, -1,-1,3); - pmanager->AddProcess(new G4eplusAnnihilation52, 0,-1,4); - - } else if( particleName == "mu+" || - particleName == "mu-" ) { - //muon - pmanager->AddProcess(new G4MultipleScattering52,-1, 1,1); - pmanager->AddProcess(new G4MuIonisation52, -1, 2,2); - pmanager->AddProcess(new G4MuBremsstrahlung52, -1,-1,3); - pmanager->AddProcess(new G4MuPairProduction52, -1,-1,4); - - } else if( particleName == "GenericIon" ) { - - pmanager->AddProcess(new G4MultipleScattering52,-1,1,1); - pmanager->AddProcess(new G4hIonisation52, -1,2,2); - - } else if ((!particle->IsShortLived()) && - (particle->GetPDGCharge() != 0.0) && - (particle->GetParticleName() != "chargedgeantino")) { - //all others charged particles except geantino - pmanager->AddProcess(new G4MultipleScattering52,-1,1,1); - pmanager->AddProcess(new G4hIonisation52, -1,2,2); - } - } -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - diff --git a/examples/extended/electromagnetic/TestEm3/src/PhysListEmLivermore.cc b/examples/extended/electromagnetic/TestEm3/src/PhysListEmLivermore.cc index 03b45d54e1..c5b9767e83 100644 --- a/examples/extended/electromagnetic/TestEm3/src/PhysListEmLivermore.cc +++ b/examples/extended/electromagnetic/TestEm3/src/PhysListEmLivermore.cc @@ -25,7 +25,7 @@ // // // $Id: PhysListEmLivermore.cc,v 1.2 2006/06/29 16:52:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/src/PhysListEmPenelope.cc b/examples/extended/electromagnetic/TestEm3/src/PhysListEmPenelope.cc index 6c5ab79d36..66ce009b76 100644 --- a/examples/extended/electromagnetic/TestEm3/src/PhysListEmPenelope.cc +++ b/examples/extended/electromagnetic/TestEm3/src/PhysListEmPenelope.cc @@ -25,7 +25,7 @@ // // // $Id: PhysListEmPenelope.cc,v 1.2 2006/06/29 16:52:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/src/PhysListEmStandard.cc b/examples/extended/electromagnetic/TestEm3/src/PhysListEmStandard.cc index be76337f9e..70f3050bb3 100644 --- a/examples/extended/electromagnetic/TestEm3/src/PhysListEmStandard.cc +++ b/examples/extended/electromagnetic/TestEm3/src/PhysListEmStandard.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysListEmStandard.cc,v 1.12 2006/06/29 16:52:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/src/PhysicsList.cc b/examples/extended/electromagnetic/TestEm3/src/PhysicsList.cc index 42deff2cf2..abd1f640b7 100644 --- a/examples/extended/electromagnetic/TestEm3/src/PhysicsList.cc +++ b/examples/extended/electromagnetic/TestEm3/src/PhysicsList.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: PhysicsList.cc,v 1.14 2006/06/29 16:52:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysicsList.cc,v 1.16 2006/11/22 19:16:09 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -33,11 +33,12 @@ #include "PhysicsListMessenger.hh" #include "PhysListEmStandard.hh" -#include "PhysListEmG4v52.hh" -#include "PhysListEmG4v71.hh" #include "PhysListEmLivermore.hh" #include "PhysListEmPenelope.hh" +#include "G4EmStandardPhysics.hh" +#include "G4EmStandardPhysics71.hh" + #include "G4LossTableManager.hh" #include "G4UnitsTable.hh" @@ -216,17 +217,17 @@ void PhysicsList::AddPhysicsList(const G4String& name) delete emPhysicsList; emPhysicsList = new PhysListEmStandard(name); - } else if (name == "g4v52") { + } else if (name == "G4standard") { emName = name; delete emPhysicsList; - emPhysicsList = new PhysListEmG4v52(name); + emPhysicsList = new G4EmStandardPhysics(name); - } else if (name == "g4v71") { + } else if (name == "G4standard_fast") { emName = name; delete emPhysicsList; - emPhysicsList = new PhysListEmG4v71(name); + emPhysicsList = new G4EmStandardPhysics71(name); } else if (name == "Livermore") { diff --git a/examples/extended/electromagnetic/TestEm3/src/PhysicsListMessenger.cc b/examples/extended/electromagnetic/TestEm3/src/PhysicsListMessenger.cc index 4a015f06f9..0568fcf10c 100644 --- a/examples/extended/electromagnetic/TestEm3/src/PhysicsListMessenger.cc +++ b/examples/extended/electromagnetic/TestEm3/src/PhysicsListMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListMessenger.cc,v 1.3 2006/06/29 16:52:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/src/PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm3/src/PrimaryGeneratorAction.cc index c40d95a167..9a06b93935 100644 --- a/examples/extended/electromagnetic/TestEm3/src/PrimaryGeneratorAction.cc +++ b/examples/extended/electromagnetic/TestEm3/src/PrimaryGeneratorAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorAction.cc,v 1.7 2006/06/29 16:53:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/src/PrimaryGeneratorMessenger.cc b/examples/extended/electromagnetic/TestEm3/src/PrimaryGeneratorMessenger.cc index 862afd0855..4651d2678d 100644 --- a/examples/extended/electromagnetic/TestEm3/src/PrimaryGeneratorMessenger.cc +++ b/examples/extended/electromagnetic/TestEm3/src/PrimaryGeneratorMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorMessenger.cc,v 1.3 2006/06/29 16:53:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/src/RunAction.cc b/examples/extended/electromagnetic/TestEm3/src/RunAction.cc index bbcd4da337..0c75866ad0 100644 --- a/examples/extended/electromagnetic/TestEm3/src/RunAction.cc +++ b/examples/extended/electromagnetic/TestEm3/src/RunAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RunAction.cc,v 1.29 2006/06/29 16:53:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/src/RunActionMessenger.cc b/examples/extended/electromagnetic/TestEm3/src/RunActionMessenger.cc index ebbd260902..068d2b9c07 100644 --- a/examples/extended/electromagnetic/TestEm3/src/RunActionMessenger.cc +++ b/examples/extended/electromagnetic/TestEm3/src/RunActionMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RunActionMessenger.cc,v 1.9 2006/06/29 16:53:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/src/StepMax.cc b/examples/extended/electromagnetic/TestEm3/src/StepMax.cc index 20f8dede12..5241a0a999 100644 --- a/examples/extended/electromagnetic/TestEm3/src/StepMax.cc +++ b/examples/extended/electromagnetic/TestEm3/src/StepMax.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMax.cc,v 1.4 2006/06/29 16:53:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/src/StepMaxMessenger.cc b/examples/extended/electromagnetic/TestEm3/src/StepMaxMessenger.cc index 9edb6a9bdb..9c9da796ee 100644 --- a/examples/extended/electromagnetic/TestEm3/src/StepMaxMessenger.cc +++ b/examples/extended/electromagnetic/TestEm3/src/StepMaxMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMaxMessenger.cc,v 1.3 2006/06/29 16:53:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/src/SteppingAction.cc b/examples/extended/electromagnetic/TestEm3/src/SteppingAction.cc index 44dd528081..32b14f2340 100644 --- a/examples/extended/electromagnetic/TestEm3/src/SteppingAction.cc +++ b/examples/extended/electromagnetic/TestEm3/src/SteppingAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingAction.cc,v 1.25 2006/06/29 16:53:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/src/SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm3/src/SteppingVerbose.cc index 44c1139bb3..10073544d1 100644 --- a/examples/extended/electromagnetic/TestEm3/src/SteppingVerbose.cc +++ b/examples/extended/electromagnetic/TestEm3/src/SteppingVerbose.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingVerbose.cc,v 1.4 2006/06/29 16:53:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/src/TrackingAction.cc b/examples/extended/electromagnetic/TestEm3/src/TrackingAction.cc index b7be2429bb..00282e8082 100644 --- a/examples/extended/electromagnetic/TestEm3/src/TrackingAction.cc +++ b/examples/extended/electromagnetic/TestEm3/src/TrackingAction.cc @@ -25,7 +25,7 @@ // // // $Id: TrackingAction.cc,v 1.2 2006/06/29 16:53:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm3/storeTables.mac b/examples/extended/electromagnetic/TestEm3/storeTables.mac index 45d3ef1781..24212ac79a 100644 --- a/examples/extended/electromagnetic/TestEm3/storeTables.mac +++ b/examples/extended/electromagnetic/TestEm3/storeTables.mac @@ -1,4 +1,4 @@ -# $Id: storeTables.mac,v 1.4 2003/10/24 12:12:11 maire Exp $ +# $Id: storeTables.mac,v 1.6 2006/11/22 19:16:09 vnivanch Exp $ # # Macro file for "testEm3.cc" # @@ -7,18 +7,17 @@ # /control/verbose 2 # -###/testem/phys/addPhysics g4v52 /testem/phys/addPhysics standard # /run/initialize -/run/beamOn 0 +/run/beamOn 3 # /run/particle/storePhysicsTable physdata # /gun/particle e- /gun/energy 1 GeV # -/run/beamOn 3 +#/run/beamOn 3 # /run/particle/retrievePhysicsTable physdata # diff --git a/examples/extended/electromagnetic/TestEm4/GNUmakefile b/examples/extended/electromagnetic/TestEm4/GNUmakefile index 5f3e49b8c6..ca43072a18 100644 --- a/examples/extended/electromagnetic/TestEm4/GNUmakefile +++ b/examples/extended/electromagnetic/TestEm4/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.13 2004/09/24 14:41:19 maire Exp $ +# $Id: GNUmakefile,v 1.14 2006/10/20 16:38:15 maire Exp $ # -------------------------------------------------------------- # GNUmakefile for examples module. Gabriele Cosmo, 06/04/98. # -------------------------------------------------------------- @@ -25,7 +25,7 @@ include $(G4INSTALL)/config/architecture.gmk ifdef G4ANALYSIS_USE # for the aida-config command see the README file CPPFLAGS += `aida-config --include` - LDFLAGS += `aida-config --lib` + LOADLIBS += `aida-config --lib` endif include $(G4INSTALL)/config/binmake.gmk diff --git a/examples/extended/electromagnetic/TestEm4/History b/examples/extended/electromagnetic/TestEm4/History index 210b0aebf4..8289e18796 100644 --- a/examples/extended/electromagnetic/TestEm4/History +++ b/examples/extended/electromagnetic/TestEm4/History @@ -1,4 +1,4 @@ -$Id: History,v 1.41 2006/05/19 12:56:20 maire Exp $ +$Id: History,v 1.42 2006/10/20 16:38:15 maire Exp $ ------------------------------------------------------------------- ========================================================= @@ -15,6 +15,9 @@ track of all tags. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +20-10-06 mma (testem4-V08-01-00) +- GNUmakefile : LOADLIBS + 19-05-06 mma (testem4-V08-00-01) - update README diff --git a/examples/extended/electromagnetic/TestEm4/TestEm4.cc b/examples/extended/electromagnetic/TestEm4/TestEm4.cc index 90af381cba..f51312d3bf 100644 --- a/examples/extended/electromagnetic/TestEm4/TestEm4.cc +++ b/examples/extended/electromagnetic/TestEm4/TestEm4.cc @@ -25,7 +25,7 @@ // // // $Id: TestEm4.cc,v 1.11 2006/06/29 16:53:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... diff --git a/examples/extended/electromagnetic/TestEm4/TestEm4.out b/examples/extended/electromagnetic/TestEm4/TestEm4.out index dce64cc7c2..d0579fd348 100644 --- a/examples/extended/electromagnetic/TestEm4/TestEm4.out +++ b/examples/extended/electromagnetic/TestEm4/TestEm4.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -29,17 +29,13 @@ Registered model factories: drawByCharge drawByParticleID drawByOriginVolume - -Registered models: - None + drawByAttribute Registered filter factories: chargeFilter particleFilter originVolumeFilter - -Registered filters: - None + attributeFilter Material: FluorCarbonate density: 1.610 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 22.435 cm ---> Element: Carbon (C) Z = 6.0 N = 12.0 A = 12.01 g/mole ElmMassFraction: 38.74 % ElmAbundance 50.00 % @@ -50,6 +46,7 @@ PhysicsList::SetCuts:CutLength : 1 (mm) /run/beamOn 100000 phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV Sampling according Klein-Nishina model @@ -57,7 +54,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.022 MeV to 100 GeV in 100 bins. @@ -89,7 +86,7 @@ eBrem: tables are built for e+ Total cross sections from a parametrisation based on the EEDL data library. Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -143,11 +140,11 @@ Start Run processing. Run terminated. Run Summary Number of events processed : 100000 - User=93.58s Real=383.02s Sys=118.87s + User=62.45s Real=482.4s Sys=38.08s --------- Ranecu engine status --------- Initial seed (index) = 0 - Current couple of seeds = 759153061, 381217352 + Current couple of seeds = 1815096542, 661504055 ---------------------------------------- Graphics systems deleted. Visualization Manager deleting... @@ -157,7 +154,9 @@ UserRunAction deleted. UserPrimaryGenerator deleted. G4 kernel has come to Quit state. EventManager deleted. +Default detector region deleted. UImanager deleted. +Units table cleared. StateManager deleted. RunManagerKernel is deleted. RunManager is deleting. diff --git a/examples/extended/electromagnetic/TestEm4/include/DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm4/include/DetectorConstruction.hh index 2eecd2334f..0e08cdfb3b 100644 --- a/examples/extended/electromagnetic/TestEm4/include/DetectorConstruction.hh +++ b/examples/extended/electromagnetic/TestEm4/include/DetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: DetectorConstruction.hh,v 1.3 2006/06/29 16:53:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm4/include/EventAction.hh b/examples/extended/electromagnetic/TestEm4/include/EventAction.hh index 39bb8e3efb..a6d03c5296 100644 --- a/examples/extended/electromagnetic/TestEm4/include/EventAction.hh +++ b/examples/extended/electromagnetic/TestEm4/include/EventAction.hh @@ -25,7 +25,7 @@ // // // $Id: EventAction.hh,v 1.2 2006/06/29 16:53:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm4/include/EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm4/include/EventActionMessenger.hh index 5f108c502b..5e8b0df03f 100644 --- a/examples/extended/electromagnetic/TestEm4/include/EventActionMessenger.hh +++ b/examples/extended/electromagnetic/TestEm4/include/EventActionMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: EventActionMessenger.hh,v 1.3 2006/06/29 16:53:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm4/include/PhysicsList.hh b/examples/extended/electromagnetic/TestEm4/include/PhysicsList.hh index a41f865ab2..e9179e8549 100644 --- a/examples/extended/electromagnetic/TestEm4/include/PhysicsList.hh +++ b/examples/extended/electromagnetic/TestEm4/include/PhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: PhysicsList.hh,v 1.2 2006/06/29 16:53:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm4/include/PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm4/include/PrimaryGeneratorAction.hh index 8979ec5b3a..f87bafc3cd 100644 --- a/examples/extended/electromagnetic/TestEm4/include/PrimaryGeneratorAction.hh +++ b/examples/extended/electromagnetic/TestEm4/include/PrimaryGeneratorAction.hh @@ -25,7 +25,7 @@ // // // $Id: PrimaryGeneratorAction.hh,v 1.2 2006/06/29 16:53:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm4/include/RunAction.hh b/examples/extended/electromagnetic/TestEm4/include/RunAction.hh index e37ed6c58e..7bf3552b40 100644 --- a/examples/extended/electromagnetic/TestEm4/include/RunAction.hh +++ b/examples/extended/electromagnetic/TestEm4/include/RunAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RunAction.hh,v 1.7 2006/06/29 16:53:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm4/include/SteppingAction.hh b/examples/extended/electromagnetic/TestEm4/include/SteppingAction.hh index 851019875f..b06d8d3c85 100644 --- a/examples/extended/electromagnetic/TestEm4/include/SteppingAction.hh +++ b/examples/extended/electromagnetic/TestEm4/include/SteppingAction.hh @@ -25,7 +25,7 @@ // // // $Id: SteppingAction.hh,v 1.2 2006/06/29 16:53:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm4/include/SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm4/include/SteppingVerbose.hh index 4322565365..aa4e60693c 100644 --- a/examples/extended/electromagnetic/TestEm4/include/SteppingVerbose.hh +++ b/examples/extended/electromagnetic/TestEm4/include/SteppingVerbose.hh @@ -25,7 +25,7 @@ // // // $Id: SteppingVerbose.hh,v 1.2 2006/06/29 16:53:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // This class manages the verbose outputs in G4SteppingManager. // It inherits from G4SteppingVerbose. diff --git a/examples/extended/electromagnetic/TestEm4/src/DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm4/src/DetectorConstruction.cc index 25e6bbc20d..bd7bf0b647 100644 --- a/examples/extended/electromagnetic/TestEm4/src/DetectorConstruction.cc +++ b/examples/extended/electromagnetic/TestEm4/src/DetectorConstruction.cc @@ -25,7 +25,7 @@ // // // $Id: DetectorConstruction.cc,v 1.3 2006/06/29 16:53:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm4/src/EventAction.cc b/examples/extended/electromagnetic/TestEm4/src/EventAction.cc index 9053784b7f..37e42a9eb6 100644 --- a/examples/extended/electromagnetic/TestEm4/src/EventAction.cc +++ b/examples/extended/electromagnetic/TestEm4/src/EventAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventAction.cc,v 1.7 2006/06/29 16:53:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm4/src/EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm4/src/EventActionMessenger.cc index fe27e10ef9..ffbbb71ee6 100644 --- a/examples/extended/electromagnetic/TestEm4/src/EventActionMessenger.cc +++ b/examples/extended/electromagnetic/TestEm4/src/EventActionMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: EventActionMessenger.cc,v 1.3 2006/06/29 16:54:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm4/src/PhysicsList.cc b/examples/extended/electromagnetic/TestEm4/src/PhysicsList.cc index e87e11ec2a..604051da11 100644 --- a/examples/extended/electromagnetic/TestEm4/src/PhysicsList.cc +++ b/examples/extended/electromagnetic/TestEm4/src/PhysicsList.cc @@ -25,7 +25,7 @@ // // // $Id: PhysicsList.cc,v 1.6 2006/06/29 16:54:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm4/src/PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm4/src/PrimaryGeneratorAction.cc index 1a09d9ad02..01b2ac2024 100644 --- a/examples/extended/electromagnetic/TestEm4/src/PrimaryGeneratorAction.cc +++ b/examples/extended/electromagnetic/TestEm4/src/PrimaryGeneratorAction.cc @@ -25,7 +25,7 @@ // // // $Id: PrimaryGeneratorAction.cc,v 1.3 2006/06/29 16:54:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm4/src/RunAction.cc b/examples/extended/electromagnetic/TestEm4/src/RunAction.cc index 780a5331e1..c633b2eb6a 100644 --- a/examples/extended/electromagnetic/TestEm4/src/RunAction.cc +++ b/examples/extended/electromagnetic/TestEm4/src/RunAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RunAction.cc,v 1.10 2006/06/29 16:54:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm4/src/SteppingAction.cc b/examples/extended/electromagnetic/TestEm4/src/SteppingAction.cc index 1ace991228..4b6c460b5d 100644 --- a/examples/extended/electromagnetic/TestEm4/src/SteppingAction.cc +++ b/examples/extended/electromagnetic/TestEm4/src/SteppingAction.cc @@ -25,7 +25,7 @@ // // // $Id: SteppingAction.cc,v 1.2 2006/06/29 16:54:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm4/src/SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm4/src/SteppingVerbose.cc index d27fffe554..dea326eb4a 100644 --- a/examples/extended/electromagnetic/TestEm4/src/SteppingVerbose.cc +++ b/examples/extended/electromagnetic/TestEm4/src/SteppingVerbose.cc @@ -25,7 +25,7 @@ // // // $Id: SteppingVerbose.cc,v 1.2 2006/06/29 16:54:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/GNUmakefile b/examples/extended/electromagnetic/TestEm5/GNUmakefile index 87415e069c..691e19c968 100644 --- a/examples/extended/electromagnetic/TestEm5/GNUmakefile +++ b/examples/extended/electromagnetic/TestEm5/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.18 2004/06/21 10:57:09 maire Exp $ +# $Id: GNUmakefile,v 1.19 2006/09/25 17:06:28 maire Exp $ # -------------------------------------------------------------- # GNUmakefile for examples module. Gabriele Cosmo, 06/04/98. # -------------------------------------------------------------- @@ -25,7 +25,7 @@ include $(G4INSTALL)/config/architecture.gmk ifdef G4ANALYSIS_USE # for the aida-config command see the README file CPPFLAGS += `aida-config --include` - LDFLAGS += `aida-config --lib` + LOADLIBS += `aida-config --lib` endif include $(G4INSTALL)/config/binmake.gmk diff --git a/examples/extended/electromagnetic/TestEm5/History b/examples/extended/electromagnetic/TestEm5/History index ea7114adc5..b4d6844bf2 100644 --- a/examples/extended/electromagnetic/TestEm5/History +++ b/examples/extended/electromagnetic/TestEm5/History @@ -1,4 +1,4 @@ -$Id: History,v 1.75 2006/06/02 13:32:48 maire Exp $ +$Id: History,v 1.79 2006/11/06 15:20:35 maire Exp $ ------------------------------------------------------------------- ========================================================= @@ -15,6 +15,19 @@ track of all tags. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +06-11-06 mma (testem5-V08-01-02) +- remove PhysicsLists g4v52 and g4v71 + +25-09-06 mma (testem5-V08-01-01) +- StackingAction: more options for killSecondaries + +10-08-06 V.Ivant (testem5-V08-01-00) +- Add NIST materials +- Add "standardSS" physics - single scattering instead of multiple + +29-06-06 mma +- PhysicsList::ConstructProcess() : mv AddDecay() after EmProcess + 02-06-06 mma (testem5-V08-00-04) - SteppingAction. prePoint->GetTouchableHandle()->GetVolume() diff --git a/examples/extended/electromagnetic/TestEm5/TestEm5.cc b/examples/extended/electromagnetic/TestEm5/TestEm5.cc index c0ec27977b..cc773ad223 100644 --- a/examples/extended/electromagnetic/TestEm5/TestEm5.cc +++ b/examples/extended/electromagnetic/TestEm5/TestEm5.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: TestEm5.cc,v 1.15 2006/06/29 16:54:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: TestEm5.cc,v 1.16 2006/08/10 08:44:39 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -70,11 +70,7 @@ int main(int argc,char** argv) { runManager->SetUserInitialization(detector); runManager->SetUserInitialization(new PhysicsList()); -#ifdef G4VIS_USE - // visualization manager - G4VisManager* visManager = new G4VisExecutive; - visManager->Initialize(); -#endif + G4VisManager* visManager = 0; HistoManager* histo = new HistoManager(); @@ -112,20 +108,26 @@ int main(int argc,char** argv) { if (argc==1) // Define UI terminal for interactive mode { - G4UIsession * session = 0; + +#ifdef G4VIS_USE + // visualization manager + visManager = new G4VisExecutive; + visManager->Initialize(); +#endif + G4UIsession * session = 0; #ifdef G4UI_USE_TCSH session = new G4UIterminal(new G4UItcsh); #else session = new G4UIterminal(); #endif - session->SessionStart(); - delete session; + session->SessionStart(); + delete session; } else // Batch mode { - G4String command = "/control/execute "; - G4String fileName = argv[1]; - UI->ApplyCommand(command+fileName); + G4String command = "/control/execute "; + G4String fileName = argv[1]; + UI->ApplyCommand(command+fileName); } // job termination diff --git a/examples/extended/electromagnetic/TestEm5/TestEm5.out b/examples/extended/electromagnetic/TestEm5/TestEm5.out index bf1e7c2d11..843956b7a2 100644 --- a/examples/extended/electromagnetic/TestEm5/TestEm5.out +++ b/examples/extended/electromagnetic/TestEm5/TestEm5.out @@ -1,46 +1,11 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 ************************************************************* -Visualization Manager instantiating... -Visualization Manager initialising... -Registering graphics systems... - -You have successfully registered the following graphics systems. -Current available graphics systems are: - ASCIITree (ATree) - DAWNFILE (DAWNFILE) - GAGTree (GAGTree) - G4HepRep (HepRepXML) - G4HepRepFile (HepRepFile) - RayTracer (RayTracer) - VRML1FILE (VRML1FILE) - VRML2FILE (VRML2FILE) - -Registering model factories... - -You have successfully registered the following model factories. -Registered model factories: - generic - drawByCharge - drawByParticleID - drawByOriginVolume - -Registered models: - None - -Registered filter factories: - chargeFilter - particleFilter - originVolumeFilter - -Registered filters: - None - /run/verbose 2 # /testem/det/setAbsMat Silicon @@ -85,6 +50,7 @@ PhysicsList::SetCuts:CutLength : 1 mm /run/beamOn 100000 phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV Sampling according Klein-Nishina model @@ -92,7 +58,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.022 MeV to 100 GeV in 100 bins. @@ -124,7 +90,7 @@ eBrem: tables are built for e+ Total cross sections from a parametrisation based on the EEDL data library. Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -270,26 +236,26 @@ Start Run processing. Run terminated. Run Summary Number of events processed : 100000 - User=135.87s Real=450.49s Sys=134.62s + User=96.49s Real=352.43s Sys=41.25s ======================== run summary ====================== The run was 100000 pi+ of 5 GeV through 20 um of Silicon (density: 2.33 g/cm3 ) - Total energy deposit in absorber per event = 6.316 keV +- 16.15 eV - -----> Mean dE/dx = 3.158 MeV/cm (1.355 MeV*cm2/g) + Total energy deposit in absorber per event = 6.369 keV +- 15.68 eV + -----> Mean dE/dx = 3.185 MeV/cm (1.367 MeV*cm2/g) From formulas : restricted dEdx = 2.806 MeV/cm (1.204 MeV*cm2/g) full dEdx = 4.696 MeV/cm (2.016 MeV*cm2/g) - Total track length (charged) in absorber per event = 20.33 um +- 8.292 nm - Total track length (neutral) in absorber per event = 0 fm +- 0 fm + Total track length (charged) in absorber per event = 20.31 um +- 7.758 nm + Total track length (neutral) in absorber per event = 4.881 Ang +- 2.7 Ang - Number of steps (charged) in absorber per event = 4.339 +- 9.106e-06 - Number of steps (neutral) in absorber per event = 0 +- 0 + Number of steps (charged) in absorber per event = 4.382 +- 8.808e-06 + Number of steps (neutral) in absorber per event = 4e-05 +- 8.808e-06 - Number of secondaries per event : Gammas = 0; electrons = 0.03652; positrons = 0 + Number of secondaries per event : Gammas = 4e-05; electrons = 0.03567; positrons = 0 Number of events with the primary particle transmitted = 100 % Number of events with at least 1 particle transmitted (same charge as primary) = 100 % @@ -298,23 +264,23 @@ Run Summary Number of events with at least 1 particle reflected (same charge as primary) = 0 % MultipleScattering: - rms proj angle of transmit primary particle = 0.02813 mrad (central part only) + rms proj angle of transmit primary particle = 0.02437 mrad (central part only) computed theta0 (Highland formula) = 0.02627 mrad - central part defined as +- 0.0788 mrad; Tail ratio = 2.927 % + central part defined as +- 0.0788 mrad; Tail ratio = 1.297 % --------- Ranecu engine status --------- Initial seed (index) = 0 - Current couple of seeds = 1728014667, 1847164391 + Current couple of seeds = 1998594552, 1902404041 ---------------------------------------- -Graphics systems deleted. -Visualization Manager deleting... UserDetectorConstruction deleted. UserPhysicsList deleted. UserRunAction deleted. UserPrimaryGenerator deleted. G4 kernel has come to Quit state. EventManager deleted. +Default detector region deleted. UImanager deleted. +Units table cleared. StateManager deleted. RunManagerKernel is deleted. RunManager is deleting. diff --git a/examples/extended/electromagnetic/TestEm5/include/DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm5/include/DetectorConstruction.hh index ad43397bbf..36aa09b5b4 100644 --- a/examples/extended/electromagnetic/TestEm5/include/DetectorConstruction.hh +++ b/examples/extended/electromagnetic/TestEm5/include/DetectorConstruction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorConstruction.hh,v 1.6 2006/06/29 16:54:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/include/DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm5/include/DetectorMessenger.hh index 42aae99f92..1308739077 100644 --- a/examples/extended/electromagnetic/TestEm5/include/DetectorMessenger.hh +++ b/examples/extended/electromagnetic/TestEm5/include/DetectorMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorMessenger.hh,v 1.5 2006/06/29 16:54:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/include/EventAction.hh b/examples/extended/electromagnetic/TestEm5/include/EventAction.hh index b7efd0f60a..6f4cf5eae5 100644 --- a/examples/extended/electromagnetic/TestEm5/include/EventAction.hh +++ b/examples/extended/electromagnetic/TestEm5/include/EventAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventAction.hh,v 1.3 2006/06/29 16:54:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/include/EventMessenger.hh b/examples/extended/electromagnetic/TestEm5/include/EventMessenger.hh index 28fad00ee2..558eca74a9 100644 --- a/examples/extended/electromagnetic/TestEm5/include/EventMessenger.hh +++ b/examples/extended/electromagnetic/TestEm5/include/EventMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventMessenger.hh,v 1.5 2006/06/29 16:54:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/include/HistoManager.hh b/examples/extended/electromagnetic/TestEm5/include/HistoManager.hh index 7ab707ea5b..dbe191a0b3 100644 --- a/examples/extended/electromagnetic/TestEm5/include/HistoManager.hh +++ b/examples/extended/electromagnetic/TestEm5/include/HistoManager.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoManager.hh,v 1.9 2006/06/29 16:54:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/include/HistoMessenger.hh b/examples/extended/electromagnetic/TestEm5/include/HistoMessenger.hh index 4c71f4b00f..eaf381bba8 100644 --- a/examples/extended/electromagnetic/TestEm5/include/HistoMessenger.hh +++ b/examples/extended/electromagnetic/TestEm5/include/HistoMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoMessenger.hh,v 1.7 2006/06/29 16:54:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/include/PhysListBinaryCascade.hh b/examples/extended/electromagnetic/TestEm5/include/PhysListBinaryCascade.hh index 98f488d3ff..91e4ac304d 100644 --- a/examples/extended/electromagnetic/TestEm5/include/PhysListBinaryCascade.hh +++ b/examples/extended/electromagnetic/TestEm5/include/PhysListBinaryCascade.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: PhysListBinaryCascade.hh,v 1.3 2006/06/29 16:54:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListBinaryCascade.hh,v 1.4 2006/08/10 08:44:39 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Class Description: // This class is an derived class of G4VPhysicsConstructor @@ -39,36 +39,36 @@ #include "G4VPhysicsConstructor.hh" #include "globals.hh" -#include "G4ProtonInelasticProcess.hh" -#include "G4NeutronInelasticProcess.hh" -#include "G4ProtonInelasticCrossSection.hh" -#include "G4NeutronInelasticCrossSection.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +class G4ProtonInelasticProcess; +class G4NeutronInelasticProcess; +class G4HadronFissionProcess; +class G4HadronCaptureProcess; + class PhysListBinaryCascade : public G4VPhysicsConstructor { - public: - PhysListBinaryCascade(const G4String& name = "binary"); - ~PhysListBinaryCascade(); +public: + PhysListBinaryCascade(const G4String& name = "binary"); + virtual ~PhysListBinaryCascade(); - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - void ConstructParticle() {}; +public: + // This method will be invoked in the Construct() method. + // each particle type will be instantiated + void ConstructParticle() {}; - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - void ConstructProcess(); + // This method will be invoked in the Construct() method. + // each physics process will be instantiated and + // registered to the process manager of each particle type + void ConstructProcess(); - private: - - G4ProtonInelasticProcess theIPproton; - G4NeutronInelasticProcess theIPneutron; - G4ProtonInelasticCrossSection thePXSec; - G4NeutronInelasticCrossSection theNXSec; +private: + G4ProtonInelasticProcess* theIPproton; + G4NeutronInelasticProcess* theIPneutron; + G4HadronFissionProcess* theFissionProcess; + G4HadronCaptureProcess* theCaptureProcess; }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/include/PhysListEmG4v52.hh b/examples/extended/electromagnetic/TestEm5/include/PhysListEmG4v52.hh deleted file mode 100644 index 11198efcd1..0000000000 --- a/examples/extended/electromagnetic/TestEm5/include/PhysListEmG4v52.hh +++ /dev/null @@ -1,66 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// $Id: PhysListEmG4v52.hh,v 1.4 2006/06/29 16:54:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#ifndef PhysListEmG4v52_h -#define PhysListEmG4v52_h 1 - -#include "G4VPhysicsConstructor.hh" -#include "globals.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -class PhysListEmG4v52 : public G4VPhysicsConstructor -{ - public: - PhysListEmG4v52(const G4String& name = "g4v52"); - ~PhysListEmG4v52(); - - public: - // This method is dummy for physics. - void ConstructParticle() {}; - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - void ConstructProcess(); -}; - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#endif - - - - - - - - diff --git a/examples/extended/electromagnetic/TestEm5/include/PhysListEmLivermore.hh b/examples/extended/electromagnetic/TestEm5/include/PhysListEmLivermore.hh index e0f431de6d..2788d3976f 100644 --- a/examples/extended/electromagnetic/TestEm5/include/PhysListEmLivermore.hh +++ b/examples/extended/electromagnetic/TestEm5/include/PhysListEmLivermore.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: PhysListEmLivermore.hh,v 1.2 2006/06/29 16:54:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListEmLivermore.hh,v 1.3 2006/08/10 08:44:39 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -40,18 +40,18 @@ class PhysListEmLivermore : public G4VPhysicsConstructor { - public: - PhysListEmLivermore(const G4String& name = "Livermore"); - ~PhysListEmLivermore(); +public: + PhysListEmLivermore(const G4String& name = "Livermore"); + virtual ~PhysListEmLivermore(); - public: - // This method is dummy for physics - void ConstructParticle() {}; +public: + // This method is dummy for physics + void ConstructParticle() {}; - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - void ConstructProcess(); + // This method will be invoked in the Construct() method. + // each physics process will be instantiated and + // registered to the process manager of each particle type + void ConstructProcess(); }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/include/PhysListEmPenelope.hh b/examples/extended/electromagnetic/TestEm5/include/PhysListEmPenelope.hh index c8ba51ba82..32e55a495b 100644 --- a/examples/extended/electromagnetic/TestEm5/include/PhysListEmPenelope.hh +++ b/examples/extended/electromagnetic/TestEm5/include/PhysListEmPenelope.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: PhysListEmPenelope.hh,v 1.2 2006/06/29 16:54:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListEmPenelope.hh,v 1.3 2006/08/10 08:44:39 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -39,18 +39,18 @@ class PhysListEmPenelope : public G4VPhysicsConstructor { - public: - PhysListEmPenelope(const G4String& name = "penelope"); - ~PhysListEmPenelope(); +public: + PhysListEmPenelope(const G4String& name = "penelope"); + virtual ~PhysListEmPenelope(); - public: - // This method is dummy for physics - void ConstructParticle() {}; +public: + // This method is dummy for physics + void ConstructParticle() {}; - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - void ConstructProcess(); + // This method will be invoked in the Construct() method. + // each physics process will be instantiated and + // registered to the process manager of each particle type + void ConstructProcess(); }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/include/PhysListEmStandard.hh b/examples/extended/electromagnetic/TestEm5/include/PhysListEmStandard.hh index 7951f5b7c0..f9dde5996a 100644 --- a/examples/extended/electromagnetic/TestEm5/include/PhysListEmStandard.hh +++ b/examples/extended/electromagnetic/TestEm5/include/PhysListEmStandard.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: PhysListEmStandard.hh,v 1.5 2006/06/29 16:54:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListEmStandard.hh,v 1.6 2006/08/10 08:44:39 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -39,18 +39,18 @@ class PhysListEmStandard : public G4VPhysicsConstructor { - public: - PhysListEmStandard(const G4String& name = "standard"); - ~PhysListEmStandard(); +public: + PhysListEmStandard(const G4String& name = "standard"); + virtual ~PhysListEmStandard(); - public: - // This method is dummy for physics - void ConstructParticle() {}; +public: + // This method is dummy for physics + void ConstructParticle() {}; - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - void ConstructProcess(); + // This method will be invoked in the Construct() method. + // each physics process will be instantiated and + // registered to the process manager of each particle type + void ConstructProcess(); }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm8/include/PhysListEmG4v52.hh b/examples/extended/electromagnetic/TestEm5/include/PhysListEmStandardSS.hh similarity index 86% rename from examples/extended/electromagnetic/TestEm8/include/PhysListEmG4v52.hh rename to examples/extended/electromagnetic/TestEm5/include/PhysListEmStandardSS.hh index f03e60b7e8..a1381b6084 100644 --- a/examples/extended/electromagnetic/TestEm8/include/PhysListEmG4v52.hh +++ b/examples/extended/electromagnetic/TestEm5/include/PhysListEmStandardSS.hh @@ -23,29 +23,28 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// -// $Id: PhysListEmG4v52.hh,v 1.2 2006/06/29 16:59:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListEmStandardSS.hh,v 1.1 2006/08/10 08:45:14 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#ifndef PhysListEmG4v52_h -#define PhysListEmG4v52_h 1 +#ifndef PhysListEmStandardSS_h +#define PhysListEmStandardSS_h 1 #include "G4VPhysicsConstructor.hh" #include "globals.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -class PhysListEmG4v52 : public G4VPhysicsConstructor +class PhysListEmStandardSS : public G4VPhysicsConstructor { public: - PhysListEmG4v52(const G4String& name = "g4v52"); - ~PhysListEmG4v52(); + PhysListEmStandardSS(const G4String& name = "standardSS"); + virtual ~PhysListEmStandardSS(); public: - // This method is dummy for physics. + // This method is dummy for physics void ConstructParticle() {}; // This method will be invoked in the Construct() method. diff --git a/examples/extended/electromagnetic/TestEm5/include/PhysListHadronElastic.hh b/examples/extended/electromagnetic/TestEm5/include/PhysListHadronElastic.hh index 951ceecc13..f3b2248bf5 100644 --- a/examples/extended/electromagnetic/TestEm5/include/PhysListHadronElastic.hh +++ b/examples/extended/electromagnetic/TestEm5/include/PhysListHadronElastic.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: PhysListHadronElastic.hh,v 1.4 2006/06/29 16:54:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListHadronElastic.hh,v 1.5 2006/08/10 08:44:39 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Class Description: // This class is an derived class of G4VPhysicsConstructor @@ -37,30 +37,31 @@ #define PhysListHadronElastic_h 1 #include "G4VPhysicsConstructor.hh" -#include "G4HadronElasticProcess.hh" #include "globals.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +class G4UHadronElasticProcess; + class PhysListHadronElastic : public G4VPhysicsConstructor { - public: - PhysListHadronElastic(const G4String& name = "elastic"); - virtual ~PhysListHadronElastic(); +public: + PhysListHadronElastic(const G4String& name = "elastic"); + virtual ~PhysListHadronElastic(); - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - void ConstructParticle() {}; +public: + // This method will be invoked in the Construct() method. + // each particle type will be instantiated + void ConstructParticle() {}; - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - void ConstructProcess(); + // This method will be invoked in the Construct() method. + // each physics process will be instantiated and + // registered to the process manager of each particle type + void ConstructProcess(); - private: - // Elastic Process - G4HadronElasticProcess theElasticProcess; +private: + // Elastic Process + G4UHadronElasticProcess* theElasticProcess; }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/include/PhysListIonBinaryCascade.hh b/examples/extended/electromagnetic/TestEm5/include/PhysListIonBinaryCascade.hh index cbd56d07a7..98c65a60d8 100644 --- a/examples/extended/electromagnetic/TestEm5/include/PhysListIonBinaryCascade.hh +++ b/examples/extended/electromagnetic/TestEm5/include/PhysListIonBinaryCascade.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: PhysListIonBinaryCascade.hh,v 1.5 2006/06/29 16:55:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListIonBinaryCascade.hh,v 1.6 2006/08/10 08:44:39 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Class Description: // This class is an derived class of G4VPhysicsConstructor @@ -39,37 +39,36 @@ #include "G4VPhysicsConstructor.hh" #include "globals.hh" -#include "G4DeuteronInelasticProcess.hh" -#include "G4TritonInelasticProcess.hh" -#include "G4AlphaInelasticProcess.hh" - -class G4HadronInelasticProcess; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +class G4DeuteronInelasticProcess; +class G4TritonInelasticProcess; +class G4AlphaInelasticProcess; +class G4HadronInelasticProcess; class PhysListIonBinaryCascade : public G4VPhysicsConstructor { - public: - PhysListIonBinaryCascade(const G4String& name = "binary_ion"); - ~PhysListIonBinaryCascade(); +public: + PhysListIonBinaryCascade(const G4String& name = "binary_ion"); + virtual ~PhysListIonBinaryCascade(); - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - void ConstructParticle() {}; +public: + // This method will be invoked in the Construct() method. + // each particle type will be instantiated + void ConstructParticle() {}; - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - void ConstructProcess(); + // This method will be invoked in the Construct() method. + // each physics process will be instantiated and + // registered to the process manager of each particle type + void ConstructProcess(); - private: +private: - G4DeuteronInelasticProcess theIPdeuteron; - G4TritonInelasticProcess theIPtriton; - G4AlphaInelasticProcess theIPalpha; - G4HadronInelasticProcess* theIPGenericIon; + G4DeuteronInelasticProcess* theIPdeuteron; + G4TritonInelasticProcess* theIPtriton; + G4AlphaInelasticProcess* theIPalpha; + G4HadronInelasticProcess* theIPGenericIon; }; diff --git a/examples/extended/electromagnetic/TestEm5/include/PhysicsList.hh b/examples/extended/electromagnetic/TestEm5/include/PhysicsList.hh index 4b8f28972d..b207782368 100644 --- a/examples/extended/electromagnetic/TestEm5/include/PhysicsList.hh +++ b/examples/extended/electromagnetic/TestEm5/include/PhysicsList.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsList.hh,v 1.5 2006/06/29 16:55:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/include/PhysicsListMessenger.hh b/examples/extended/electromagnetic/TestEm5/include/PhysicsListMessenger.hh index 9db0d6caa0..0bf52835a4 100644 --- a/examples/extended/electromagnetic/TestEm5/include/PhysicsListMessenger.hh +++ b/examples/extended/electromagnetic/TestEm5/include/PhysicsListMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListMessenger.hh,v 1.7 2006/06/29 16:55:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/include/PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm5/include/PrimaryGeneratorAction.hh index 94eebcb428..a06dde3703 100644 --- a/examples/extended/electromagnetic/TestEm5/include/PrimaryGeneratorAction.hh +++ b/examples/extended/electromagnetic/TestEm5/include/PrimaryGeneratorAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorAction.hh,v 1.4 2006/06/29 16:55:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/include/PrimaryGeneratorMessenger.hh b/examples/extended/electromagnetic/TestEm5/include/PrimaryGeneratorMessenger.hh index 04d2eea7f0..5b7d07c670 100644 --- a/examples/extended/electromagnetic/TestEm5/include/PrimaryGeneratorMessenger.hh +++ b/examples/extended/electromagnetic/TestEm5/include/PrimaryGeneratorMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorMessenger.hh,v 1.4 2006/06/29 16:55:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/include/RunAction.hh b/examples/extended/electromagnetic/TestEm5/include/RunAction.hh index 248a7b99a4..42bff5c03f 100644 --- a/examples/extended/electromagnetic/TestEm5/include/RunAction.hh +++ b/examples/extended/electromagnetic/TestEm5/include/RunAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RunAction.hh,v 1.7 2006/06/29 16:55:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/include/StackingAction.hh b/examples/extended/electromagnetic/TestEm5/include/StackingAction.hh index f38defc350..2231235288 100644 --- a/examples/extended/electromagnetic/TestEm5/include/StackingAction.hh +++ b/examples/extended/electromagnetic/TestEm5/include/StackingAction.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: StackingAction.hh,v 1.3 2006/06/29 16:55:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: StackingAction.hh,v 1.4 2006/09/25 17:06:29 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -48,7 +48,7 @@ class StackingAction : public G4UserStackingAction StackingAction(RunAction*,EventAction*,HistoManager* ); ~StackingAction(); - void SetKillStatus(G4bool value) {killSecondary = value;}; + void SetKillStatus(G4int value) {killSecondary = value;}; G4ClassificationOfNewTrack ClassifyNewTrack(const G4Track*); @@ -57,7 +57,7 @@ class StackingAction : public G4UserStackingAction EventAction* eventaction; HistoManager* histoManager; - G4bool killSecondary; + G4int killSecondary; StackingMessenger* stackMessenger; }; diff --git a/examples/extended/electromagnetic/TestEm5/include/StackingMessenger.hh b/examples/extended/electromagnetic/TestEm5/include/StackingMessenger.hh index 0e22302f13..012a9b223d 100644 --- a/examples/extended/electromagnetic/TestEm5/include/StackingMessenger.hh +++ b/examples/extended/electromagnetic/TestEm5/include/StackingMessenger.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: StackingMessenger.hh,v 1.5 2006/06/29 16:55:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: StackingMessenger.hh,v 1.6 2006/09/25 17:06:29 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -37,7 +37,7 @@ class StackingAction; class G4UIdirectory; -class G4UIcmdWithABool; +class G4UIcmdWithAnInteger; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -50,10 +50,10 @@ class StackingMessenger: public G4UImessenger void SetNewValue(G4UIcommand*, G4String); private: - StackingAction* stackAction; + StackingAction* stackAction; - G4UIdirectory* stackDir; - G4UIcmdWithABool* killCmd; + G4UIdirectory* stackDir; + G4UIcmdWithAnInteger* killCmd; }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/include/StepMax.hh b/examples/extended/electromagnetic/TestEm5/include/StepMax.hh index 5078125c58..7d26e79f2c 100644 --- a/examples/extended/electromagnetic/TestEm5/include/StepMax.hh +++ b/examples/extended/electromagnetic/TestEm5/include/StepMax.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMax.hh,v 1.3 2006/06/29 16:55:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/include/StepMaxMessenger.hh b/examples/extended/electromagnetic/TestEm5/include/StepMaxMessenger.hh index 1949b42ab4..c0fdda54d9 100644 --- a/examples/extended/electromagnetic/TestEm5/include/StepMaxMessenger.hh +++ b/examples/extended/electromagnetic/TestEm5/include/StepMaxMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMaxMessenger.hh,v 1.3 2006/06/29 16:55:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/include/SteppingAction.hh b/examples/extended/electromagnetic/TestEm5/include/SteppingAction.hh index f9459b1764..527e5a9bc7 100644 --- a/examples/extended/electromagnetic/TestEm5/include/SteppingAction.hh +++ b/examples/extended/electromagnetic/TestEm5/include/SteppingAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingAction.hh,v 1.3 2006/06/29 16:55:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/include/SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm5/include/SteppingVerbose.hh index 60c823c071..7fbe743c36 100644 --- a/examples/extended/electromagnetic/TestEm5/include/SteppingVerbose.hh +++ b/examples/extended/electromagnetic/TestEm5/include/SteppingVerbose.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingVerbose.hh,v 1.3 2006/06/29 16:55:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // This class manages the verbose outputs in G4SteppingManager. // It inherits from G4SteppingVerbose. diff --git a/examples/extended/electromagnetic/TestEm5/include/TrackingAction.hh b/examples/extended/electromagnetic/TestEm5/include/TrackingAction.hh index c8e981bee7..c07af53d61 100644 --- a/examples/extended/electromagnetic/TestEm5/include/TrackingAction.hh +++ b/examples/extended/electromagnetic/TestEm5/include/TrackingAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TrackingAction.hh,v 1.4 2006/06/29 16:55:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/src/DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm5/src/DetectorConstruction.cc index 602f2d015c..73cdb666e2 100644 --- a/examples/extended/electromagnetic/TestEm5/src/DetectorConstruction.cc +++ b/examples/extended/electromagnetic/TestEm5/src/DetectorConstruction.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: DetectorConstruction.cc,v 1.11 2006/06/29 16:55:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: DetectorConstruction.cc,v 1.13 2006/09/25 17:06:29 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -44,6 +44,7 @@ #include "G4SolidStore.hh" #include "G4UnitsTable.hh" +#include "G4NistManager.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -184,7 +185,7 @@ Havar->AddElement(W , fractionmass=0.0631); // // examples of gas -// +// new G4Material("ArgonGas", z=18, a=39.948*g/mole, density= 1.782*mg/cm3, kStateGas, 273.15*kelvin, 1*atmosphere); @@ -221,6 +222,11 @@ XeCH->AddElement (Xe, natoms=875); XeCH->AddElement (C, natoms=225); XeCH->AddElement (H, natoms=700); +G4Material* steam = +new G4Material("WaterSteam", density= 1.0*mg/cm3, ncomponents=1); +steam->AddMaterial(H2O, fractionmass=1.); +steam->GetIonisation()->SetMeanExcitationEnergy(71.6*eV); + // // example of vacuum // @@ -326,7 +332,9 @@ void DetectorConstruction::PrintCalorParameters() void DetectorConstruction::SetAbsorberMaterial(G4String materialChoice) { // search the material by its name - G4Material* pttoMaterial = G4Material::GetMaterial(materialChoice); + G4Material* pttoMaterial = + G4NistManager::Instance()->FindOrBuildMaterial(materialChoice); + if (pttoMaterial) AbsorberMaterial = pttoMaterial; } @@ -335,7 +343,9 @@ void DetectorConstruction::SetAbsorberMaterial(G4String materialChoice) void DetectorConstruction::SetWorldMaterial(G4String materialChoice) { // search the material by its name - G4Material* pttoMaterial = G4Material::GetMaterial(materialChoice); + G4Material* pttoMaterial = + G4NistManager::Instance()->FindOrBuildMaterial(materialChoice); + if (pttoMaterial) WorldMaterial = pttoMaterial; } diff --git a/examples/extended/electromagnetic/TestEm5/src/DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm5/src/DetectorMessenger.cc index 5d2b3314c8..36e5807518 100644 --- a/examples/extended/electromagnetic/TestEm5/src/DetectorMessenger.cc +++ b/examples/extended/electromagnetic/TestEm5/src/DetectorMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorMessenger.cc,v 1.4 2006/06/29 16:55:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/src/EventAction.cc b/examples/extended/electromagnetic/TestEm5/src/EventAction.cc index ba5936c895..637cfc0da1 100644 --- a/examples/extended/electromagnetic/TestEm5/src/EventAction.cc +++ b/examples/extended/electromagnetic/TestEm5/src/EventAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventAction.cc,v 1.6 2006/06/29 16:55:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/src/EventMessenger.cc b/examples/extended/electromagnetic/TestEm5/src/EventMessenger.cc index 0b5ace7ce2..f50d028f43 100644 --- a/examples/extended/electromagnetic/TestEm5/src/EventMessenger.cc +++ b/examples/extended/electromagnetic/TestEm5/src/EventMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventMessenger.cc,v 1.5 2006/06/29 16:55:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/src/HistoManager.cc b/examples/extended/electromagnetic/TestEm5/src/HistoManager.cc index e126ce34c9..8935386d46 100644 --- a/examples/extended/electromagnetic/TestEm5/src/HistoManager.cc +++ b/examples/extended/electromagnetic/TestEm5/src/HistoManager.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoManager.cc,v 1.16 2006/06/29 16:55:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/src/HistoMessenger.cc b/examples/extended/electromagnetic/TestEm5/src/HistoMessenger.cc index 7e8fc8b715..53a77ac5c9 100644 --- a/examples/extended/electromagnetic/TestEm5/src/HistoMessenger.cc +++ b/examples/extended/electromagnetic/TestEm5/src/HistoMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoMessenger.cc,v 1.7 2006/06/29 16:55:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/src/PhysListBinaryCascade.cc b/examples/extended/electromagnetic/TestEm5/src/PhysListBinaryCascade.cc index 22822f2e67..dcd53478b3 100644 --- a/examples/extended/electromagnetic/TestEm5/src/PhysListBinaryCascade.cc +++ b/examples/extended/electromagnetic/TestEm5/src/PhysListBinaryCascade.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: PhysListBinaryCascade.cc,v 1.3 2006/06/29 16:55:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListBinaryCascade.cc,v 1.4 2006/08/10 08:44:39 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -37,6 +37,10 @@ #include "G4Proton.hh" #include "G4Neutron.hh" +#include "G4ProtonInelasticProcess.hh" +#include "G4NeutronInelasticProcess.hh" +#include "G4ProtonInelasticCrossSection.hh" +#include "G4NeutronInelasticCrossSection.hh" #include "G4HadronFissionProcess.hh" #include "G4HadronCaptureProcess.hh" @@ -51,7 +55,12 @@ PhysListBinaryCascade::PhysListBinaryCascade(const G4String& name) //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... PhysListBinaryCascade::~PhysListBinaryCascade() -{} +{ + delete theIPproton; + delete theIPneutron; + delete theFissionProcess; + delete theCaptureProcess; +} //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -61,31 +70,32 @@ void PhysListBinaryCascade::ConstructProcess() // Binary Cascade G4ParticleDefinition* particle = 0; G4ProcessManager* pmanager = 0; - - G4BinaryCascade* theBC = 0; + G4BinaryCascade* theBC = 0; // proton particle = G4Proton::Proton(); pmanager = particle->GetProcessManager(); theBC = new G4BinaryCascade(); - theIPproton.RegisterMe(theBC); - theIPproton.AddDataSet(&thePXSec); - pmanager->AddDiscreteProcess(&theIPproton); + theIPproton = new G4ProtonInelasticProcess(); + theIPproton->RegisterMe(theBC); + theIPproton->AddDataSet(new G4ProtonInelasticCrossSection); + pmanager->AddDiscreteProcess(theIPproton); // neutron particle = G4Neutron::Neutron(); pmanager = particle->GetProcessManager(); theBC = new G4BinaryCascade(); - theIPneutron.RegisterMe(theBC); - theIPneutron.AddDataSet(&theNXSec); - pmanager->AddDiscreteProcess(&theIPneutron); + theIPneutron = new G4NeutronInelasticProcess(); + theIPneutron->RegisterMe(theBC); + theIPneutron->AddDataSet(new G4NeutronInelasticCrossSection); + pmanager->AddDiscreteProcess(theIPneutron); // fission - G4HadronFissionProcess* theFissionProcess = new G4HadronFissionProcess; + theFissionProcess = new G4HadronFissionProcess; G4LFission* theFissionModel = new G4LFission; theFissionProcess->RegisterMe(theFissionModel); pmanager->AddDiscreteProcess(theFissionProcess); // capture - G4HadronCaptureProcess* theCaptureProcess = new G4HadronCaptureProcess; + theCaptureProcess = new G4HadronCaptureProcess; G4LCapture* theCaptureModel = new G4LCapture; theCaptureProcess->RegisterMe(theCaptureModel); pmanager->AddDiscreteProcess(theCaptureProcess); diff --git a/examples/extended/electromagnetic/TestEm5/src/PhysListEmG4v52.cc b/examples/extended/electromagnetic/TestEm5/src/PhysListEmG4v52.cc deleted file mode 100644 index 2119c85500..0000000000 --- a/examples/extended/electromagnetic/TestEm5/src/PhysListEmG4v52.cc +++ /dev/null @@ -1,119 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// $Id: PhysListEmG4v52.cc,v 1.7 2006/06/29 16:55:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#include "PhysListEmG4v52.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" - -#include "G4ComptonScattering52.hh" -#include "G4GammaConversion52.hh" -#include "G4PhotoElectricEffect52.hh" - -#include "G4MultipleScattering52.hh" - -#include "G4eIonisation52.hh" -#include "G4eBremsstrahlung52.hh" -#include "G4eplusAnnihilation52.hh" - -#include "G4MuIonisation52.hh" -#include "G4MuBremsstrahlung52.hh" -#include "G4MuPairProduction52.hh" - -#include "G4hIonisation52.hh" - - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListEmG4v52::PhysListEmG4v52(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListEmG4v52::~PhysListEmG4v52() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void PhysListEmG4v52::ConstructProcess() -{ - // Add EM processes realised on base of prototype of model approach design - - theParticleIterator->reset(); - while( (*theParticleIterator)() ){ - G4ParticleDefinition* particle = theParticleIterator->value(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - G4String particleName = particle->GetParticleName(); - - if (particleName == "gamma") { - // gamma - pmanager->AddDiscreteProcess(new G4PhotoElectricEffect52); - pmanager->AddDiscreteProcess(new G4ComptonScattering52); - pmanager->AddDiscreteProcess(new G4GammaConversion52); - - } else if (particleName == "e-") { - //electron - pmanager->AddProcess(new G4MultipleScattering52, -1, 1,1); - pmanager->AddProcess(new G4eIonisation52, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung52, -1,-1,3); - - } else if (particleName == "e+") { - //positron - pmanager->AddProcess(new G4MultipleScattering52, -1, 1,1); - pmanager->AddProcess(new G4eIonisation52, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung52, -1,-1,3); - pmanager->AddProcess(new G4eplusAnnihilation52, 0,-1,4); - - } else if( particleName == "mu+" || - particleName == "mu-" ) { - //muon - pmanager->AddProcess(new G4MultipleScattering52, -1, 1,1); - pmanager->AddProcess(new G4MuIonisation52, -1, 2,2); - pmanager->AddProcess(new G4MuBremsstrahlung52, -1,-1,3); - pmanager->AddProcess(new G4MuPairProduction52, -1,-1,4); - - } else if( particleName == "GenericIon" ) { - - pmanager->AddProcess(new G4MultipleScattering52, -1,1,1); - pmanager->AddProcess(new G4hIonisation52, -1,2,2); - - } else if ((!particle->IsShortLived()) && - (particle->GetPDGCharge() != 0.0) && - (particle->GetParticleName() != "chargedgeantino")) { - //all others charged particles except geantino - pmanager->AddProcess(new G4MultipleScattering52, -1,1,1); - pmanager->AddProcess(new G4hIonisation52, -1,2,2); - } - } -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - diff --git a/examples/extended/electromagnetic/TestEm5/src/PhysListEmLivermore.cc b/examples/extended/electromagnetic/TestEm5/src/PhysListEmLivermore.cc index ae70a604c0..b77735ff7e 100644 --- a/examples/extended/electromagnetic/TestEm5/src/PhysListEmLivermore.cc +++ b/examples/extended/electromagnetic/TestEm5/src/PhysListEmLivermore.cc @@ -25,7 +25,7 @@ // // // $Id: PhysListEmLivermore.cc,v 1.2 2006/06/29 16:55:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/src/PhysListEmPenelope.cc b/examples/extended/electromagnetic/TestEm5/src/PhysListEmPenelope.cc index 53a3ac250d..b7fc4aa876 100644 --- a/examples/extended/electromagnetic/TestEm5/src/PhysListEmPenelope.cc +++ b/examples/extended/electromagnetic/TestEm5/src/PhysListEmPenelope.cc @@ -25,7 +25,7 @@ // // // $Id: PhysListEmPenelope.cc,v 1.3 2006/06/29 16:55:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/src/PhysListEmStandard.cc b/examples/extended/electromagnetic/TestEm5/src/PhysListEmStandard.cc index 6ae3cb2f89..d924431d54 100644 --- a/examples/extended/electromagnetic/TestEm5/src/PhysListEmStandard.cc +++ b/examples/extended/electromagnetic/TestEm5/src/PhysListEmStandard.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: PhysListEmStandard.cc,v 1.9 2006/06/29 16:55:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListEmStandard.cc,v 1.10 2006/11/06 15:20:35 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -66,6 +66,8 @@ PhysListEmStandard::~PhysListEmStandard() void PhysListEmStandard::ConstructProcess() { // Add standard EM Processes + // + G4MultipleScattering* msc(0); theParticleIterator->reset(); while( (*theParticleIterator)() ){ @@ -81,13 +83,13 @@ void PhysListEmStandard::ConstructProcess() } else if (particleName == "e-") { //electron - pmanager->AddProcess(new G4MultipleScattering, -1, 1,1); + pmanager->AddProcess(msc=new G4MultipleScattering, -1, 1,1); pmanager->AddProcess(new G4eIonisation, -1, 2,2); pmanager->AddProcess(new G4eBremsstrahlung, -1, 3,3); } else if (particleName == "e+") { //positron - pmanager->AddProcess(new G4MultipleScattering, -1, 1,1); + pmanager->AddProcess(msc=new G4MultipleScattering, -1, 1,1); pmanager->AddProcess(new G4eIonisation, -1, 2,2); pmanager->AddProcess(new G4eBremsstrahlung, -1, 3,3); pmanager->AddProcess(new G4eplusAnnihilation, 0,-1,4); @@ -95,22 +97,23 @@ void PhysListEmStandard::ConstructProcess() } else if (particleName == "mu+" || particleName == "mu-" ) { //muon - pmanager->AddProcess(new G4MultipleScattering, -1, 1,1); + pmanager->AddProcess(msc=new G4MultipleScattering, -1, 1,1); pmanager->AddProcess(new G4MuIonisation, -1, 2,2); pmanager->AddProcess(new G4MuBremsstrahlung, -1, 3,3); pmanager->AddProcess(new G4MuPairProduction, -1, 4,4); } else if (particleName == "alpha" || particleName == "GenericIon" ) { - pmanager->AddProcess(new G4MultipleScattering, -1, 1,1); + pmanager->AddProcess(msc=new G4MultipleScattering, -1, 1,1); pmanager->AddProcess(new G4ionIonisation, -1, 2,2); } else if ((!particle->IsShortLived()) && (particle->GetPDGCharge() != 0.0) && (particle->GetParticleName() != "chargedgeantino")) { //all others charged particles except geantino - pmanager->AddProcess(new G4MultipleScattering, -1,1,1); + pmanager->AddProcess(msc=new G4MultipleScattering, -1,1,1); pmanager->AddProcess(new G4hIonisation, -1,2,2); } + if(msc) msc->SetSkin(1.); } } diff --git a/examples/extended/electromagnetic/TestEm5/src/PhysListEmG4v71.cc b/examples/extended/electromagnetic/TestEm5/src/PhysListEmStandardSS.cc similarity index 69% rename from examples/extended/electromagnetic/TestEm5/src/PhysListEmG4v71.cc rename to examples/extended/electromagnetic/TestEm5/src/PhysListEmStandardSS.cc index d2f59b71a3..beeede2c02 100644 --- a/examples/extended/electromagnetic/TestEm5/src/PhysListEmG4v71.cc +++ b/examples/extended/electromagnetic/TestEm5/src/PhysListEmStandardSS.cc @@ -23,13 +23,13 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: PhysListEmG4v71.cc,v 1.2 2006/06/29 16:55:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListEmStandardSS.cc,v 1.1 2006/08/10 08:45:15 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#include "PhysListEmG4v71.hh" +#include "PhysListEmStandardSS.hh" #include "G4ParticleDefinition.hh" #include "G4ProcessManager.hh" @@ -37,7 +37,7 @@ #include "G4GammaConversion.hh" #include "G4PhotoElectricEffect.hh" -#include "G4MultipleScattering71.hh" +#include "G4MultipleScattering.hh" #include "G4eIonisation.hh" #include "G4eBremsstrahlung.hh" @@ -49,21 +49,22 @@ #include "G4hIonisation.hh" #include "G4ionIonisation.hh" +#include "G4CoulombScattering.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -PhysListEmG4v71::PhysListEmG4v71(const G4String& name) +PhysListEmStandardSS::PhysListEmStandardSS(const G4String& name) : G4VPhysicsConstructor(name) {} //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -PhysListEmG4v71::~PhysListEmG4v71() +PhysListEmStandardSS::~PhysListEmStandardSS() {} //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -void PhysListEmG4v71::ConstructProcess() +void PhysListEmStandardSS::ConstructProcess() { // Add standard EM Processes @@ -81,35 +82,43 @@ void PhysListEmG4v71::ConstructProcess() } else if (particleName == "e-") { //electron - pmanager->AddProcess(new G4MultipleScattering71, -1, 1,1); - pmanager->AddProcess(new G4eIonisation, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung, -1, 3,3); + pmanager->AddDiscreteProcess(new G4CoulombScattering); + pmanager->AddProcess(new G4eIonisation, -1, 2,2); + pmanager->AddProcess(new G4eBremsstrahlung, -1, 3,3); } else if (particleName == "e+") { //positron - pmanager->AddProcess(new G4MultipleScattering71, -1, 1,1); - pmanager->AddProcess(new G4eIonisation, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung, -1, 3,3); - pmanager->AddProcess(new G4eplusAnnihilation, 0,-1,4); + pmanager->AddDiscreteProcess(new G4CoulombScattering); + pmanager->AddProcess(new G4eIonisation, -1, 2,2); + pmanager->AddProcess(new G4eBremsstrahlung, -1, 3,3); + pmanager->AddProcess(new G4eplusAnnihilation, 0,-1,4); } else if (particleName == "mu+" || particleName == "mu-" ) { //muon - pmanager->AddProcess(new G4MultipleScattering71, -1, 1,1); - pmanager->AddProcess(new G4MuIonisation, -1, 2,2); - pmanager->AddProcess(new G4MuBremsstrahlung, -1, 3,3); - pmanager->AddProcess(new G4MuPairProduction, -1, 4,4); + pmanager->AddDiscreteProcess(new G4CoulombScattering); + pmanager->AddProcess(new G4MultipleScattering, -1, 1,1); + pmanager->AddProcess(new G4MuIonisation, -1, 2,2); + pmanager->AddProcess(new G4MuBremsstrahlung, -1, 3,3); + pmanager->AddProcess(new G4MuPairProduction, -1, 4,4); - } else if (particleName == "alpha" || particleName == "GenericIon" ) { - pmanager->AddProcess(new G4MultipleScattering71, -1, 1,1); - pmanager->AddProcess(new G4ionIonisation, -1, 2,2); + } else if (particleName == "alpha" || particleName == "He3") { + pmanager->AddDiscreteProcess(new G4CoulombScattering); + pmanager->AddProcess(new G4ionIonisation, -1, 2,2); + + } else if (particleName == "GenericIon" ) { + + G4CoulombScattering* cs = new G4CoulombScattering(); + cs->SetBuildTableFlag(false); + pmanager->AddDiscreteProcess(cs); + pmanager->AddProcess(new G4ionIonisation, -1, 2,2); } else if ((!particle->IsShortLived()) && (particle->GetPDGCharge() != 0.0) && (particle->GetParticleName() != "chargedgeantino")) { //all others charged particles except geantino - pmanager->AddProcess(new G4MultipleScattering71, -1,1,1); - pmanager->AddProcess(new G4hIonisation, -1,2,2); + pmanager->AddDiscreteProcess(new G4CoulombScattering); + pmanager->AddProcess(new G4hIonisation, -1,2,2); } } } diff --git a/examples/extended/electromagnetic/TestEm5/src/PhysListHadronElastic.cc b/examples/extended/electromagnetic/TestEm5/src/PhysListHadronElastic.cc index 3dcc2b1803..d35b2f1019 100644 --- a/examples/extended/electromagnetic/TestEm5/src/PhysListHadronElastic.cc +++ b/examples/extended/electromagnetic/TestEm5/src/PhysListHadronElastic.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: PhysListHadronElastic.cc,v 1.6 2006/06/29 16:55:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListHadronElastic.cc,v 1.7 2006/08/10 08:44:39 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -32,7 +32,8 @@ #include "PhysListHadronElastic.hh" #include "G4ParticleDefinition.hh" #include "G4ProcessManager.hh" -#include "G4LElastic.hh" +#include "G4UHadronElasticProcess.hh" +#include "G4HadronElastic.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -43,7 +44,9 @@ PhysListHadronElastic::PhysListHadronElastic(const G4String& name) //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... PhysListHadronElastic::~PhysListHadronElastic() -{} +{ + delete theElasticProcess; +} //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -51,21 +54,19 @@ void PhysListHadronElastic::ConstructProcess() { // Hadron elastic process - - theElasticProcess.RegisterMe( new G4LElastic() ); + theElasticProcess = new G4UHadronElasticProcess("hElastic"); + theElasticProcess->RegisterMe( new G4HadronElastic() ); theParticleIterator->reset(); while( (*theParticleIterator)() ){ G4ParticleDefinition* particle = theParticleIterator->value(); - G4ProcessManager* pManager = particle->GetProcessManager(); - if (particle->GetPDGMass() > 110.*MeV && theElasticProcess.IsApplicable(*particle)) { - pManager->AddDiscreteProcess(&theElasticProcess); - G4cout << "### Elastic model are registered for " + if (theElasticProcess->IsApplicable(*particle)) { + particle->GetProcessManager()->AddDiscreteProcess(theElasticProcess); + G4cout << "### Elastic process is registered for " << particle->GetParticleName() << G4endl; } } - } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/src/PhysListIonBinaryCascade.cc b/examples/extended/electromagnetic/TestEm5/src/PhysListIonBinaryCascade.cc index 5466e2c522..3281404161 100644 --- a/examples/extended/electromagnetic/TestEm5/src/PhysListIonBinaryCascade.cc +++ b/examples/extended/electromagnetic/TestEm5/src/PhysListIonBinaryCascade.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: PhysListIonBinaryCascade.cc,v 1.5 2006/06/29 16:56:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListIonBinaryCascade.cc,v 1.6 2006/08/10 08:44:39 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -41,11 +41,16 @@ #include "G4HadronInelasticProcess.hh" #include "G4BinaryLightIonReaction.hh" #include "G4TripathiCrossSection.hh" +#include "G4TripathiLightCrossSection.hh" #include "G4IonsShenCrossSection.hh" #include "G4LEDeuteronInelastic.hh" #include "G4LETritonInelastic.hh" #include "G4LEAlphaInelastic.hh" +#include "G4DeuteronInelasticProcess.hh" +#include "G4TritonInelasticProcess.hh" +#include "G4AlphaInelasticProcess.hh" + //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... PhysListIonBinaryCascade::PhysListIonBinaryCascade(const G4String& name) @@ -55,7 +60,12 @@ PhysListIonBinaryCascade::PhysListIonBinaryCascade(const G4String& name) //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... PhysListIonBinaryCascade::~PhysListIonBinaryCascade() -{} +{ + delete theIPGenericIon; + delete theIPdeuteron; + delete theIPtriton; + delete theIPalpha; +} //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -65,51 +75,59 @@ void PhysListIonBinaryCascade::ConstructProcess() G4ParticleDefinition* particle = 0; G4ProcessManager* pmanager = 0; G4BinaryLightIonReaction* theBC = new G4BinaryLightIonReaction(); - theBC->SetMinEnergy(80*MeV); + // theBC->SetMinEnergy(80*MeV); + theBC->SetMinEnergy(0.0); theBC->SetMaxEnergy(20*GeV); - G4TripathiCrossSection * TripathiCrossSection= new G4TripathiCrossSection; - G4IonsShenCrossSection * aShen = new G4IonsShenCrossSection; + G4TripathiCrossSection* TripathiCrossSection= new G4TripathiCrossSection; + G4TripathiLightCrossSection* fTripathiLight = new G4TripathiLightCrossSection; + G4IonsShenCrossSection* aShen = new G4IonsShenCrossSection; // deuteron particle = G4Deuteron::Deuteron(); pmanager = particle->GetProcessManager(); - G4LEDeuteronInelastic* theDIModel = new G4LEDeuteronInelastic; - theDIModel->SetMaxEnergy(100*MeV); - theIPdeuteron.AddDataSet(TripathiCrossSection); - theIPdeuteron.AddDataSet(aShen); - theIPdeuteron.RegisterMe(theDIModel); - theIPdeuteron.RegisterMe(theBC); - pmanager->AddDiscreteProcess(&theIPdeuteron); + // G4LEDeuteronInelastic* theDIModel = new G4LEDeuteronInelastic; + // theDIModel->SetMaxEnergy(100*MeV); + theIPdeuteron = new G4DeuteronInelasticProcess(); + theIPdeuteron->AddDataSet(TripathiCrossSection); + theIPdeuteron->AddDataSet(fTripathiLight); + theIPdeuteron->AddDataSet(aShen); + // theIPdeuteron.RegisterMe(theDIModel); + theIPdeuteron->RegisterMe(theBC); + pmanager->AddDiscreteProcess(theIPdeuteron); // triton particle = G4Triton::Triton(); pmanager = particle->GetProcessManager(); - G4LETritonInelastic* theTIModel = new G4LETritonInelastic; - theTIModel->SetMaxEnergy(100*MeV); - theIPtriton.AddDataSet(TripathiCrossSection); - theIPtriton.AddDataSet(aShen); - theIPtriton.RegisterMe(theTIModel); - theIPtriton.RegisterMe(theBC); - pmanager->AddDiscreteProcess(&theIPtriton); + // G4LETritonInelastic* theTIModel = new G4LETritonInelastic; + // theTIModel->SetMaxEnergy(100*MeV); + theIPtriton = new G4TritonInelasticProcess; + theIPtriton->AddDataSet(TripathiCrossSection); + theIPtriton->AddDataSet(fTripathiLight); + theIPtriton->AddDataSet(aShen); + // theIPtriton->RegisterMe(theTIModel); + theIPtriton->RegisterMe(theBC); + pmanager->AddDiscreteProcess(theIPtriton); // alpha particle = G4Alpha::Alpha(); pmanager = particle->GetProcessManager(); - G4LEAlphaInelastic* theAIModel = new G4LEAlphaInelastic; - theAIModel->SetMaxEnergy(100*MeV); - theIPalpha.AddDataSet(TripathiCrossSection); - theIPalpha.AddDataSet(aShen); - theIPalpha.RegisterMe(theAIModel); - theIPalpha.RegisterMe(theBC); - pmanager->AddDiscreteProcess(&theIPalpha); + // G4LEAlphaInelastic* theAIModel = new G4LEAlphaInelastic; + // theAIModel->SetMaxEnergy(100*MeV); + theIPalpha = new G4AlphaInelasticProcess(); + theIPalpha->AddDataSet(TripathiCrossSection); + theIPalpha->AddDataSet(fTripathiLight); + theIPalpha->AddDataSet(aShen); + // theIPalpha->RegisterMe(theAIModel); + theIPalpha->RegisterMe(theBC); + pmanager->AddDiscreteProcess(theIPalpha); // GenericIon particle = G4GenericIon::GenericIon(); pmanager = particle->GetProcessManager(); - G4HadronInelasticProcess* theIPGenericIon = - new G4HadronInelasticProcess("IonInelastic",particle); + theIPGenericIon = new G4HadronInelasticProcess("IonInelastic",particle); theIPGenericIon->AddDataSet(TripathiCrossSection); + theIPGenericIon->AddDataSet(fTripathiLight); theIPGenericIon->AddDataSet(aShen); G4BinaryLightIonReaction * theGenIonBC= new G4BinaryLightIonReaction; theGenIonBC->SetMinEnergy(0*MeV); diff --git a/examples/extended/electromagnetic/TestEm5/src/PhysicsList.cc b/examples/extended/electromagnetic/TestEm5/src/PhysicsList.cc index ef74acd40e..cf9c708e53 100644 --- a/examples/extended/electromagnetic/TestEm5/src/PhysicsList.cc +++ b/examples/extended/electromagnetic/TestEm5/src/PhysicsList.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: PhysicsList.cc,v 1.13.2.1 2006/06/29 16:56:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysicsList.cc,v 1.17 2006/12/13 15:42:28 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -33,8 +33,7 @@ #include "PhysicsListMessenger.hh" #include "PhysListEmStandard.hh" -#include "PhysListEmG4v52.hh" -#include "PhysListEmG4v71.hh" +#include "PhysListEmStandardSS.hh" #include "PhysListEmLivermore.hh" #include "PhysListEmPenelope.hh" #include "PhysListHadronElastic.hh" @@ -44,6 +43,33 @@ #include "G4LossTableManager.hh" #include "G4UnitsTable.hh" +#include "G4ParticleDefinition.hh" +#include "G4ProcessManager.hh" +#include "G4Decay.hh" +#include "StepMax.hh" + +// Bosons +#include "G4ChargedGeantino.hh" +#include "G4Geantino.hh" +#include "G4Gamma.hh" +#include "G4OpticalPhoton.hh" + +// leptons +#include "G4MuonPlus.hh" +#include "G4MuonMinus.hh" +#include "G4NeutrinoMu.hh" +#include "G4AntiNeutrinoMu.hh" + +#include "G4Electron.hh" +#include "G4Positron.hh" +#include "G4NeutrinoE.hh" +#include "G4AntiNeutrinoE.hh" + +// Hadrons +#include "G4MesonConstructor.hh" +#include "G4BaryonConstructor.hh" +#include "G4IonConstructor.hh" + //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... PhysicsList::PhysicsList() : G4VModularPhysicsList() @@ -76,30 +102,6 @@ PhysicsList::~PhysicsList() //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -// Bosons -#include "G4ChargedGeantino.hh" -#include "G4Geantino.hh" -#include "G4Gamma.hh" -#include "G4OpticalPhoton.hh" - -// leptons -#include "G4MuonPlus.hh" -#include "G4MuonMinus.hh" -#include "G4NeutrinoMu.hh" -#include "G4AntiNeutrinoMu.hh" - -#include "G4Electron.hh" -#include "G4Positron.hh" -#include "G4NeutrinoE.hh" -#include "G4AntiNeutrinoE.hh" - -// Hadrons -#include "G4MesonConstructor.hh" -#include "G4BaryonConstructor.hh" -#include "G4IonConstructor.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - void PhysicsList::ConstructParticle() { // pseudo-particles @@ -141,19 +143,12 @@ void PhysicsList::ConstructParticle() void PhysicsList::ConstructProcess() { AddTransportation(); - AddDecay(); emPhysicsList->ConstructProcess(); for(size_t i=0; iConstructProcess(); + AddDecay(); AddStepMax(); } - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" -#include "G4Decay.hh" - //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... void PhysicsList::AddDecay() @@ -181,10 +176,6 @@ void PhysicsList::AddDecay() //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#include "StepMax.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - void PhysicsList::AddStepMax() { // Step limitation seen as a process @@ -218,17 +209,11 @@ void PhysicsList::AddPhysicsList(const G4String& name) delete emPhysicsList; emPhysicsList = new PhysListEmStandard(name); - } else if (name == "g4v52") { + } else if (name == "standardSS") { emName = name; delete emPhysicsList; - emPhysicsList = new PhysListEmG4v52(name); - - } else if (name == "g4v71") { - - emName = name; - delete emPhysicsList; - emPhysicsList = new PhysListEmG4v71(name); + emPhysicsList = new PhysListEmStandardSS(name); } else if (name == "livermore") { diff --git a/examples/extended/electromagnetic/TestEm5/src/PhysicsListMessenger.cc b/examples/extended/electromagnetic/TestEm5/src/PhysicsListMessenger.cc index eab36f4126..66c245285e 100644 --- a/examples/extended/electromagnetic/TestEm5/src/PhysicsListMessenger.cc +++ b/examples/extended/electromagnetic/TestEm5/src/PhysicsListMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListMessenger.cc,v 1.6 2006/06/29 16:56:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/src/PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm5/src/PrimaryGeneratorAction.cc index 2e43a337a2..6edbf9f920 100644 --- a/examples/extended/electromagnetic/TestEm5/src/PrimaryGeneratorAction.cc +++ b/examples/extended/electromagnetic/TestEm5/src/PrimaryGeneratorAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorAction.cc,v 1.4 2006/06/29 16:56:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/src/PrimaryGeneratorMessenger.cc b/examples/extended/electromagnetic/TestEm5/src/PrimaryGeneratorMessenger.cc index 4bb6c7c41e..8ee3997a98 100644 --- a/examples/extended/electromagnetic/TestEm5/src/PrimaryGeneratorMessenger.cc +++ b/examples/extended/electromagnetic/TestEm5/src/PrimaryGeneratorMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorMessenger.cc,v 1.4 2006/06/29 16:56:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/src/RunAction.cc b/examples/extended/electromagnetic/TestEm5/src/RunAction.cc index 1414af437d..5e4938a28a 100644 --- a/examples/extended/electromagnetic/TestEm5/src/RunAction.cc +++ b/examples/extended/electromagnetic/TestEm5/src/RunAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RunAction.cc,v 1.23 2006/06/29 16:56:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/src/StackingAction.cc b/examples/extended/electromagnetic/TestEm5/src/StackingAction.cc index bae747b922..258103170e 100644 --- a/examples/extended/electromagnetic/TestEm5/src/StackingAction.cc +++ b/examples/extended/electromagnetic/TestEm5/src/StackingAction.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: StackingAction.cc,v 1.6 2006/06/29 16:56:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: StackingAction.cc,v 1.7 2006/09/25 17:06:29 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -43,7 +43,7 @@ StackingAction::StackingAction(RunAction* RA, EventAction* EA, HistoManager* HM) :runaction(RA), eventaction(EA), histoManager(HM) { - killSecondary = false; + killSecondary = 0; stackMessenger = new StackingMessenger(this); } @@ -79,7 +79,8 @@ StackingAction::ClassifyNewTrack(const G4Track* aTrack) //stack or delete secondaries G4ClassificationOfNewTrack status = fUrgent; if (killSecondary) - {eventaction->AddEnergy(energy); status = fKill;} + {if (killSecondary == 1) eventaction->AddEnergy(energy); + status = fKill;} return status; } diff --git a/examples/extended/electromagnetic/TestEm5/src/StackingMessenger.cc b/examples/extended/electromagnetic/TestEm5/src/StackingMessenger.cc index 7d36268eef..c48150611d 100644 --- a/examples/extended/electromagnetic/TestEm5/src/StackingMessenger.cc +++ b/examples/extended/electromagnetic/TestEm5/src/StackingMessenger.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: StackingMessenger.cc,v 1.4 2006/06/29 16:56:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: StackingMessenger.cc,v 1.5 2006/09/25 17:06:29 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -33,7 +33,7 @@ #include "StackingAction.hh" #include "G4UIdirectory.hh" -#include "G4UIcmdWithABool.hh" +#include "G4UIcmdWithAnInteger.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -43,10 +43,11 @@ StackingMessenger::StackingMessenger(StackingAction* stack) stackDir = new G4UIdirectory("/testem/stack/"); stackDir->SetGuidance("stacking control"); - killCmd = new G4UIcmdWithABool("/testem/stack/killSecondaries",this); - killCmd->SetGuidance(" Choice : true false"); + killCmd = new G4UIcmdWithAnInteger("/testem/stack/killSecondaries",this); + killCmd->SetGuidance(" Choice: 0=no kill; 1=kill and record; 2=kill only"); killCmd->SetParameterName("choice",true); - killCmd->SetDefaultValue(true); + killCmd->SetRange("choice>=0"); + killCmd->SetDefaultValue(1); } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -62,7 +63,7 @@ StackingMessenger::~StackingMessenger() void StackingMessenger::SetNewValue(G4UIcommand* command, G4String newValue) { if(command == killCmd) - {stackAction->SetKillStatus(killCmd->GetNewBoolValue(newValue));} + {stackAction->SetKillStatus(killCmd->GetNewIntValue(newValue));} } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/src/StepMax.cc b/examples/extended/electromagnetic/TestEm5/src/StepMax.cc index 9b9ca68824..f36a3595db 100644 --- a/examples/extended/electromagnetic/TestEm5/src/StepMax.cc +++ b/examples/extended/electromagnetic/TestEm5/src/StepMax.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMax.cc,v 1.2 2006/06/29 16:56:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/src/StepMaxMessenger.cc b/examples/extended/electromagnetic/TestEm5/src/StepMaxMessenger.cc index c6473f1658..c4e60912ce 100644 --- a/examples/extended/electromagnetic/TestEm5/src/StepMaxMessenger.cc +++ b/examples/extended/electromagnetic/TestEm5/src/StepMaxMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMaxMessenger.cc,v 1.3 2006/06/29 16:56:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/src/SteppingAction.cc b/examples/extended/electromagnetic/TestEm5/src/SteppingAction.cc index f50c04decd..722fe64320 100644 --- a/examples/extended/electromagnetic/TestEm5/src/SteppingAction.cc +++ b/examples/extended/electromagnetic/TestEm5/src/SteppingAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingAction.cc,v 1.7 2006/06/29 16:56:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/src/SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm5/src/SteppingVerbose.cc index 6f632c9d1e..f3ad83ad5e 100644 --- a/examples/extended/electromagnetic/TestEm5/src/SteppingVerbose.cc +++ b/examples/extended/electromagnetic/TestEm5/src/SteppingVerbose.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingVerbose.cc,v 1.3 2006/06/29 16:56:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm5/src/TrackingAction.cc b/examples/extended/electromagnetic/TestEm5/src/TrackingAction.cc index d63a146a29..8951d85c1c 100644 --- a/examples/extended/electromagnetic/TestEm5/src/TrackingAction.cc +++ b/examples/extended/electromagnetic/TestEm5/src/TrackingAction.cc @@ -25,7 +25,7 @@ // // // $Id: TrackingAction.cc,v 1.11 2006/06/29 16:56:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm6/GNUmakefile b/examples/extended/electromagnetic/TestEm6/GNUmakefile index bfd14e8260..0da97553af 100644 --- a/examples/extended/electromagnetic/TestEm6/GNUmakefile +++ b/examples/extended/electromagnetic/TestEm6/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.12 2004/09/27 09:35:30 maire Exp $ +# $Id: GNUmakefile,v 1.13 2006/10/20 16:47:47 maire Exp $ # -------------------------------------------------------------- # GNUmakefile for examples module. Gabriele Cosmo, 06/04/98. # -------------------------------------------------------------- @@ -25,7 +25,7 @@ include $(G4INSTALL)/config/architecture.gmk ifdef G4ANALYSIS_USE # for the aida-config command see the README file CPPFLAGS += `aida-config --include` - LDFLAGS += `aida-config --lib` + LOADLIBS += `aida-config --lib` endif include $(G4INSTALL)/config/binmake.gmk diff --git a/examples/extended/electromagnetic/TestEm6/History b/examples/extended/electromagnetic/TestEm6/History index e516c57205..da0b848fa2 100644 --- a/examples/extended/electromagnetic/TestEm6/History +++ b/examples/extended/electromagnetic/TestEm6/History @@ -1,4 +1,4 @@ -$Id: History,v 1.29 2006/05/24 13:42:00 maire Exp $ +$Id: History,v 1.30 2006/10/20 16:47:47 maire Exp $ ------------------------------------------------------------------- ========================================================= @@ -15,6 +15,9 @@ track of all tags. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +20-10-06 mma (testem6-V08-01-00) +- GNUmakefile : LOADLIBS + 24-05-06 mma (testem6-V08-00-01) - register G4StepLimiter in PhysicsList diff --git a/examples/extended/electromagnetic/TestEm6/TestEm6.cc b/examples/extended/electromagnetic/TestEm6/TestEm6.cc index 948177079b..40ac8481a6 100644 --- a/examples/extended/electromagnetic/TestEm6/TestEm6.cc +++ b/examples/extended/electromagnetic/TestEm6/TestEm6.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TestEm6.cc,v 1.15 2006/06/29 16:56:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm6/TestEm6.out b/examples/extended/electromagnetic/TestEm6/TestEm6.out index df41917aeb..edcad40565 100644 --- a/examples/extended/electromagnetic/TestEm6/TestEm6.out +++ b/examples/extended/electromagnetic/TestEm6/TestEm6.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -42,17 +42,13 @@ Registered model factories: drawByCharge drawByParticleID drawByOriginVolume - -Registered models: - None + drawByAttribute Registered filter factories: chargeFilter particleFilter originVolumeFilter - -Registered filters: - None + attributeFilter /run/verbose 2 # @@ -242,8 +238,8 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process 0 31.9 m 0 fm 0 fm 29.8 TeV 0 eV 0 fm 0 fm Iron initStep - 1 189 m 4.03 mm -7.45 mm 8.95 TeV 20.8 TeV 157 m 157 m Iron muIoni - 2 250 m 9.81 mm -9.96 mm 5.97 TeV 2.98 TeV 61.5 m 218 m OutOfWorld Transportation + 1 189 m 4.47 mm 7.11 mm 10.2 TeV 19.6 TeV 157 m 157 m Iron muIoni + 2 250 m 6.69 mm 7.36 mm 7.17 TeV 3.01 TeV 61.5 m 218 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = mu+, Track ID = 2, Parent ID = 1 @@ -251,8 +247,8 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process 0 31.9 m 0 fm 0 fm 70.2 TeV 0 eV 0 fm 0 fm Iron initStep - 1 216 m -581 um -4.8 mm 16.7 TeV 53.5 TeV 184 m 184 m Iron muIoni - 2 250 m 4.53 mm -6.8 mm 13.6 TeV 3.15 TeV 34.1 m 218 m OutOfWorld Transportation + 1 216 m 2.56 mm 4.16 mm 13.7 TeV 56.5 TeV 184 m 184 m Iron muIoni + 2 250 m 3.15 mm 3.55 mm 5.74 TeV 7.91 TeV 34.1 m 218 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = gamma, Track ID = 1, Parent ID = 0 @@ -260,50 +256,23 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process 0 -250 m 0 fm 0 fm 100 TeV 0 eV 0 fm 0 fm Iron initStep - 1 -123 m 0 fm 0 fm 0 eV 0 eV 127 m 127 m Iron GammaToMuPair + 1 120 m 0 fm 0 fm 0 eV 0 eV 370 m 370 m Iron GammaToMuPair ********************************************************************************************************* * G4Track Information: Particle = mu-, Track ID = 3, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -123 m 0 fm 0 fm 73.1 TeV 0 eV 0 fm 0 fm Iron initStep - 1 62.8 m -2.61 mm 3.58 mm 25.4 TeV 47.7 TeV 185 m 185 m Iron muIoni - 2 215 m -4.46 mm 957 um 12.5 TeV 12.9 TeV 152 m 337 m Iron muIoni - 3 250 m -6.34 mm 2.46 mm 8.16 TeV 4.34 TeV 35.5 m 373 m OutOfWorld Transportation + 0 120 m 0 fm 0 fm 20 TeV 0 eV 0 fm 0 fm Iron initStep + 1 250 m 1.11 mm 1.17 mm 9.3 TeV 10.7 TeV 130 m 130 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = mu+, Track ID = 2, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -123 m 0 fm 0 fm 26.9 TeV 0 eV 0 fm 0 fm Iron initStep - 1 30.7 m -371 um 601 um 0 eV 26.9 TeV 153 m 153 m Iron muIoni - 2 30.7 m -371 um 601 um 0 eV 0 eV 0 fm 153 m Iron Decay - -********************************************************************************************************* -* G4Track Information: Particle = e+, Track ID = 6, Parent ID = 2 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 30.7 m -371 um 601 um 39.9 MeV 0 eV 0 fm 0 fm Iron initStep - 1 250 m -173 m -119 m 39.9 MeV 0 eV 303 m 303 m OutOfWorld Transportation - -********************************************************************************************************* -* G4Track Information: Particle = nu_e, Track ID = 5, Parent ID = 2 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 30.7 m -371 um 601 um 17.4 MeV 0 eV 0 fm 0 fm Iron initStep - 1 -24.9 m -250 m 89.3 m 17.4 MeV 0 eV 271 m 271 m OutOfWorld Transportation - -********************************************************************************************************* -* G4Track Information: Particle = anti_nu_mu, Track ID = 4, Parent ID = 2 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 30.7 m -371 um 601 um 47.3 MeV 0 eV 0 fm 0 fm Iron initStep - 1 -132 m 250 m 64.2 m 47.3 MeV 0 eV 305 m 305 m OutOfWorld Transportation + 0 120 m 0 fm 0 fm 80 TeV 0 eV 0 fm 0 fm Iron initStep + 1 250 m -277 um -292 um 33.1 TeV 46.9 TeV 130 m 130 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = gamma, Track ID = 1, Parent ID = 0 @@ -311,33 +280,58 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process 0 -250 m 0 fm 0 fm 100 TeV 0 eV 0 fm 0 fm Iron initStep - 1 -213 m 0 fm 0 fm 0 eV 0 eV 37.1 m 37.1 m Iron GammaToMuPair + 1 -155 m 0 fm 0 fm 0 eV 0 eV 94.5 m 94.5 m Iron GammaToMuPair ********************************************************************************************************* * G4Track Information: Particle = mu-, Track ID = 3, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -213 m 0 fm 0 fm 8.06 TeV 0 eV 0 fm 0 fm Iron initStep - 1 -97.9 m -1.75 cm 4.47 mm 3.03 TeV 5.03 TeV 115 m 115 m Iron muIoni - 2 -13.5 m -1.29 cm -1.13 cm 1.74 TeV 1.29 TeV 84.4 m 199 m Iron muIoni - 3 54.3 m -9.22 cm -2.57 cm 954 GeV 787 GeV 67.8 m 267 m Iron muIoni - 4 106 m -14.8 cm -2.51 cm 678 GeV 276 GeV 51.2 m 318 m Iron muIoni - 5 148 m -22.7 cm 3.43 cm 465 GeV 213 GeV 42.5 m 361 m Iron muIoni - 6 182 m -34.5 cm 3.8 cm 341 GeV 124 GeV 33.9 m 395 m Iron muIoni - 7 210 m -52.2 cm 4.54 cm 260 GeV 80.1 GeV 27.7 m 423 m Iron muIoni - 8 233 m -63.8 cm 2.22 cm 193 GeV 67.9 GeV 22.9 m 446 m Iron muIoni - 9 250 m -76.5 cm -8.09 cm 152 GeV 40.3 GeV 17.4 m 463 m OutOfWorld Transportation + 0 -155 m 0 fm 0 fm 77.5 TeV 0 eV 0 fm 0 fm Iron initStep + 1 31.9 m -754 nm 225 um 0 eV 77.5 TeV 187 m 187 m Iron muIoni + 2 31.9 m -754 nm 225 um 0 eV 0 eV 0 fm 187 m Iron Decay + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 6, Parent ID = 3 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 31.9 m -754 nm 225 um 45.8 MeV 0 eV 0 fm 0 fm Iron initStep + 1 31.9 m -3.18 mm 4.51 mm 28.9 MeV 16.9 MeV 6.08 mm 6.08 mm Iron eIoni + 2 31.9 m -6.54 mm 6.04 mm 18 MeV 10.9 MeV 4.94 mm 1.1 cm Iron eIoni + 3 31.9 m -9.61 mm 7.74 mm 11.1 MeV 6.85 MeV 3.97 mm 1.5 cm Iron eIoni + 4 31.9 m -1.21 cm 8.95 mm 6.96 MeV 4.15 MeV 3.19 mm 1.82 cm Iron eIoni + 5 31.9 m -1.42 cm 9.66 mm 3.67 MeV 3.29 MeV 2.6 mm 2.08 cm Iron eIoni + 6 31.9 m -1.57 cm 9.81 mm 1.78 MeV 1.89 MeV 1.97 mm 2.27 cm Iron eIoni + 7 31.9 m -1.54 cm 1.03 cm 95.7 keV 1.69 MeV 1.37 mm 2.41 cm Iron eIoni + 8 31.9 m -1.54 cm 1.03 cm 0 eV 95.7 keV 25.3 um 2.41 cm Iron eIoni + +********************************************************************************************************* +* G4Track Information: Particle = anti_nu_e, Track ID = 5, Parent ID = 3 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 31.9 m -754 nm 225 um 46 MeV 0 eV 0 fm 0 fm Iron initStep + 1 -174 m 44.7 m -250 m 46 MeV 0 eV 327 m 327 m OutOfWorld Transportation + +********************************************************************************************************* +* G4Track Information: Particle = nu_mu, Track ID = 4, Parent ID = 3 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 31.9 m -754 nm 225 um 12.9 MeV 0 eV 0 fm 0 fm Iron initStep + 1 67.5 m 250 m 66.9 m 12.9 MeV 0 eV 261 m 261 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = mu+, Track ID = 2, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -213 m 0 fm 0 fm 91.9 TeV 0 eV 0 fm 0 fm Iron initStep - 1 -24.7 m -3.95 mm 1.91 mm 39 TeV 52.9 TeV 188 m 188 m Iron muIoni - 2 141 m -9.63 mm 2.97 mm 11.3 TeV 27.7 TeV 165 m 354 m Iron muIoni - 3 250 m -1.29 cm -4.85 mm 6.24 TeV 5.08 TeV 109 m 463 m OutOfWorld Transportation + 0 -155 m 0 fm 0 fm 22.5 TeV 0 eV 0 fm 0 fm Iron initStep + 1 -7.88 m -9.05 mm 3.17 mm 8.19 TeV 14.3 TeV 148 m 148 m Iron muIoni + 2 108 m -2.07 cm 3.34 mm 4.34 TeV 3.85 TeV 115 m 263 m Iron muIoni + 3 203 m -4.72 cm 1.93 cm 2.36 TeV 1.98 TeV 95.3 m 358 m Iron muIoni + 4 250 m -7.8 cm 9.06 mm 1.83 TeV 528 GeV 47.1 m 405 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = gamma, Track ID = 1, Parent ID = 0 @@ -345,15 +339,31 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process 0 -250 m 0 fm 0 fm 100 TeV 0 eV 0 fm 0 fm Iron initStep - 1 250 m 0 fm 0 fm 100 TeV 0 eV 500 m 500 m OutOfWorld Transportation + 1 189 m 0 fm 0 fm 0 eV 0 eV 439 m 439 m Iron GammaToMuPair + +********************************************************************************************************* +* G4Track Information: Particle = mu-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 189 m 0 fm 0 fm 66.8 TeV 0 eV 0 fm 0 fm Iron initStep + 1 250 m 97.6 um -12.7 um 51.7 TeV 15.1 TeV 60.9 m 60.9 m OutOfWorld Transportation + +********************************************************************************************************* +* G4Track Information: Particle = mu+, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 189 m 0 fm 0 fm 33.2 TeV 0 eV 0 fm 0 fm Iron initStep + 1 250 m -154 um 43.6 um 20.8 TeV 12.4 TeV 60.9 m 60.9 m OutOfWorld Transportation Run terminated. Run Summary Number of events processed : 5 - User=0.03s Real=0.13s Sys=0.03s + User=0.02s Real=0.24s Sys=0s --------- Ranecu engine status --------- Initial seed (index) = 0 - Current couple of seeds = 1668767406, 1044125548 + Current couple of seeds = 79307383, 1611440905 ---------------------------------------- # /gun/particle e+ @@ -385,7 +395,7 @@ Index : 0 used in the geometry : Yes recalculation needed : No --------- Ranecu engine status --------- Initial seed (index) = 0 - Current couple of seeds = 1668767406, 1044125548 + Current couple of seeds = 79307383, 1611440905 ---------------------------------------- Start Run processing. @@ -397,168 +407,164 @@ Start Run processing. Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process 0 -250 m 0 fm 0 fm 1e+03 GeV 0 eV 0 fm 0 fm Iron initStep - 1 -243 m 0 fm 0 fm 0 eV 0 eV 6.76 m 6.76 m Iron AnnihiToMuPair + 1 -245 m 0 fm 0 fm 0 eV 0 eV 4.98 m 4.98 m Iron AnnihiToMuPair ********************************************************************************************************* * G4Track Information: Particle = mu-, Track ID = 3, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -243 m 0 fm 0 fm 763 GeV 0 eV 0 fm 0 fm Iron initStep - 1 -198 m 3.44 cm 2.45 cm 550 GeV 213 GeV 45.5 m 45.5 m Iron muIoni - 2 -160 m 5.38 cm 10 cm 409 GeV 140 GeV 37.6 m 83.1 m Iron muIoni - 3 -129 m 15.1 cm 16.4 cm 298 GeV 111 GeV 31.3 m 114 m Iron muIoni - 4 -104 m 28.6 cm 25.7 cm 226 GeV 72.6 GeV 25.3 m 140 m Iron muIoni - 5 -82.9 m 59 cm 32.7 cm 159 GeV 66.7 GeV 20.6 m 160 m Iron muIoni - 6 -67.1 m 83.9 cm 35.1 cm 118 GeV 41.3 GeV 15.8 m 176 m Iron muIoni - 7 -54.7 m 1.06 m 41.4 cm 93.9 GeV 23.6 GeV 12.4 m 189 m Iron muIoni - 8 -44.5 m 1.21 m 47.6 cm 69.9 GeV 24 GeV 10.3 m 199 m Iron muIoni - 9 -36.5 m 1.39 m 51.7 cm 55.3 GeV 14.6 GeV 7.99 m 207 m Iron muIoni - 10 -30 m 1.54 m 59 cm 44.8 GeV 10.5 GeV 6.51 m 213 m Iron muIoni - 11 -24.5 m 1.7 m 66.1 cm 32.8 GeV 12 GeV 5.41 m 219 m Iron muIoni - 12 -20.4 m 1.83 m 71.9 cm 25.9 GeV 6.87 GeV 4.1 m 223 m Iron muIoni - 13 -17.1 m 1.93 m 77.9 cm 20.4 GeV 5.55 GeV 3.32 m 226 m Iron muIoni - 14 -14.4 m 1.97 m 85.8 cm 16.2 GeV 4.23 GeV 2.67 m 229 m Iron muIoni - 15 -12.3 m 1.97 m 90.2 cm 13.1 GeV 3.1 GeV 2.17 m 231 m Iron muIoni - 16 -10.5 m 2 m 96.7 cm 10.6 GeV 2.5 GeV 1.79 m 233 m Iron muIoni - 17 -9.03 m 2 m 1.03 m 8.71 GeV 1.86 GeV 1.47 m 234 m Iron muIoni - 18 -7.8 m 1.97 m 1.1 m 6.64 GeV 2.06 GeV 1.23 m 235 m Iron muIoni - 19 -6.84 m 1.96 m 1.16 m 5.26 GeV 1.38 GeV 96.2 cm 236 m Iron muIoni - 20 -6.06 m 1.95 m 1.2 m 4.16 GeV 1.1 GeV 77.7 cm 237 m Iron muIoni - 21 -5.44 m 2.03 m 1.18 m 3.37 GeV 787 MeV 62.6 cm 238 m Iron muIoni - 22 -4.93 m 2.08 m 1.16 m 2.72 GeV 657 MeV 51.5 cm 238 m Iron muIoni - 23 -4.51 m 2.14 m 1.14 m 1.97 GeV 750 MeV 42.2 cm 239 m Iron muIoni - 24 -4.2 m 2.19 m 1.14 m 1.58 GeV 384 MeV 31.2 cm 239 m Iron muIoni - 25 -3.95 m 2.23 m 1.14 m 1.25 GeV 338 MeV 25.4 cm 239 m Iron muIoni - 26 -3.75 m 2.26 m 1.13 m 998 MeV 247 MeV 20.2 cm 240 m Iron muIoni - 27 -3.59 m 2.29 m 1.12 m 776 MeV 222 MeV 16.3 cm 240 m Iron muIoni - 28 -3.47 m 2.31 m 1.11 m 636 MeV 140 MeV 12.7 cm 240 m Iron muIoni - 29 -3.37 m 2.34 m 1.1 m 531 MeV 106 MeV 10.4 cm 240 m Iron muIoni - 30 -3.28 m 2.35 m 1.1 m 419 MeV 111 MeV 8.59 cm 240 m Iron muIoni - 31 -3.22 m 2.36 m 1.1 m 345 MeV 74 MeV 6.71 cm 240 m Iron muIoni - 32 -3.17 m 2.37 m 1.1 m 276 MeV 69.8 MeV 5.43 cm 240 m Iron muIoni - 33 -3.12 m 2.38 m 1.1 m 233 MeV 42.8 MeV 4.23 cm 240 m Iron muIoni - 34 -3.09 m 2.39 m 1.11 m 191 MeV 41.2 MeV 3.49 cm 240 m Iron muIoni - 35 -3.06 m 2.39 m 1.11 m 161 MeV 30.1 MeV 2.78 cm 240 m Iron muIoni - 36 -3.04 m 2.39 m 1.12 m 129 MeV 32.8 MeV 2.26 cm 240 m Iron muIoni - 37 -3.03 m 2.39 m 1.13 m 103 MeV 25.6 MeV 1.72 cm 240 m Iron muIoni - 38 -3.01 m 2.4 m 1.13 m 84.4 MeV 18.6 MeV 1.31 cm 240 m Iron muIoni - 39 -3 m 2.4 m 1.13 m 70.1 MeV 14.3 MeV 1.03 cm 240 m Iron muIoni - 40 -3 m 2.4 m 1.13 m 56.8 MeV 13.3 MeV 8.2 mm 240 m Iron muIoni - 41 -2.99 m 2.4 m 1.14 m 46.5 MeV 10.3 MeV 6.39 mm 240 m Iron muIoni - 42 -2.99 m 2.4 m 1.14 m 38.4 MeV 8.11 MeV 5.09 mm 240 m Iron muIoni - 43 -2.98 m 2.4 m 1.14 m 29.5 MeV 8.94 MeV 4.14 mm 240 m Iron muIoni - 44 -2.98 m 2.4 m 1.14 m 22.3 MeV 7.23 MeV 3.2 mm 240 m Iron muIoni - 45 -2.98 m 2.4 m 1.14 m 15.9 MeV 6.32 MeV 2.51 mm 240 m Iron muIoni - 46 -2.98 m 2.4 m 1.14 m 9.07 MeV 6.86 MeV 1.93 mm 240 m Iron muIoni - 47 -2.97 m 2.4 m 1.14 m 935 keV 8.14 MeV 1.12 mm 240 m Iron muIoni - 48 -2.97 m 2.4 m 1.14 m 0 eV 935 keV 21.7 um 240 m Iron muIoni - 49 -2.97 m 2.4 m 1.14 m 0 eV 0 eV 0 fm 240 m Iron Decay + 0 -245 m 0 fm 0 fm 868 GeV 0 eV 0 fm 0 fm Iron initStep + 1 -196 m -2.6 cm 3.98 cm 620 GeV 248 GeV 48.7 m 48.7 m Iron muIoni + 2 -156 m -22.7 cm 6.94 cm 437 GeV 183 GeV 40.5 m 89.2 m Iron muIoni + 3 -123 m -40.7 cm 5.97 cm 289 GeV 149 GeV 32.6 m 122 m Iron muIoni + 4 -98.5 m -58.8 cm -11.4 cm 227 GeV 61.7 GeV 24.7 m 147 m Iron muIoni + 5 -77.8 m -69.6 cm -21.7 cm 178 GeV 49.2 GeV 20.7 m 167 m Iron muIoni + 6 -60.6 m -77.6 cm -23.1 cm 141 GeV 36.9 GeV 17.2 m 184 m Iron muIoni + 7 -46.2 m -88.2 cm -24.8 cm 104 GeV 37.2 GeV 14.3 m 199 m Iron muIoni + 8 -35.1 m -89.7 cm -28.2 cm 81.4 GeV 22.2 GeV 11.2 m 210 m Iron muIoni + 9 -26 m -90.2 cm -25.6 cm 65.7 GeV 15.7 GeV 9.11 m 219 m Iron muIoni + 10 -18.4 m -85.4 cm -21.9 cm 47.8 GeV 17.9 GeV 7.57 m 227 m Iron muIoni + 11 -12.7 m -81.4 cm -18.8 cm 37.7 GeV 10.1 GeV 5.74 m 232 m Iron muIoni + 12 -8 m -82.7 cm -11.9 cm 29.6 GeV 8.11 GeV 4.65 m 237 m Iron muIoni + 13 -4.26 m -86.6 cm -8.68 cm 24.2 GeV 5.39 GeV 3.74 m 241 m Iron muIoni + 14 -1.13 m -92.4 cm -4.84 cm 20 GeV 4.22 GeV 3.13 m 244 m Iron muIoni + 15 1.49 m -97 cm -3.43 cm 15.7 GeV 4.34 GeV 2.63 m 247 m Iron muIoni + 16 3.6 m -1.04 m -5.99 mm 12.9 GeV 2.75 GeV 2.11 m 249 m Iron muIoni + 17 5.36 m -1.13 m 2.53 cm 9.86 GeV 3.06 GeV 1.77 m 250 m Iron muIoni + 18 6.74 m -1.18 m 7.11 cm 7.82 GeV 2.04 GeV 1.38 m 252 m Iron muIoni + 19 7.86 m -1.24 m 8.64 cm 6.19 GeV 1.63 GeV 1.12 m 253 m Iron muIoni + 20 8.75 m -1.17 m 4.92 cm 5.02 GeV 1.17 GeV 90.1 cm 254 m Iron muIoni + 21 9.5 m -1.13 m 2.79 mm 4.04 GeV 975 MeV 74.4 cm 255 m Iron muIoni + 22 10.1 m -1.09 m -2.43 cm 2.91 GeV 1.14 GeV 61 cm 255 m Iron muIoni + 23 10.5 m -1.04 m -3.25 cm 2.34 GeV 569 MeV 44.9 cm 256 m Iron muIoni + 24 10.9 m -1 m -4.65 cm 1.84 GeV 502 MeV 36.7 cm 256 m Iron muIoni + 25 11.2 m -97.1 cm -6.24 cm 1.47 GeV 369 MeV 29.2 cm 256 m Iron muIoni + 26 11.4 m -94.3 cm -7.86 cm 1.14 GeV 331 MeV 23.6 cm 256 m Iron muIoni + 27 11.6 m -92.3 cm -9.65 cm 927 MeV 209 MeV 18.4 cm 257 m Iron muIoni + 28 11.8 m -89.7 cm -11.1 cm 769 MeV 158 MeV 15.1 cm 257 m Iron muIoni + 29 11.9 m -88.7 cm -11.7 cm 600 MeV 169 MeV 12.6 cm 257 m Iron muIoni + 30 12 m -88 cm -12 cm 491 MeV 109 MeV 9.76 cm 257 m Iron muIoni + 31 12.1 m -87 cm -12.1 cm 388 MeV 103 MeV 7.93 cm 257 m Iron muIoni + 32 12.1 m -85.9 cm -11.9 cm 326 MeV 62.2 MeV 6.17 cm 257 m Iron muIoni + 33 12.2 m -84.9 cm -11.6 cm 266 MeV 60 MeV 5.1 cm 257 m Iron muIoni + 34 12.2 m -84.9 cm -10.5 cm 222 MeV 43.6 MeV 4.06 cm 257 m Iron muIoni + 35 12.2 m -85.1 cm -9.53 cm 176 MeV 46.7 MeV 3.31 cm 257 m Iron muIoni + 36 12.3 m -85.4 cm -8.89 cm 140 MeV 35.5 MeV 2.5 cm 257 m Iron muIoni + 37 12.3 m -85.3 cm -8.59 cm 120 MeV 20.2 MeV 1.91 cm 257 m Iron muIoni + 38 12.3 m -85.1 cm -8.38 cm 101 MeV 18.4 MeV 1.58 cm 257 m Iron muIoni + 39 12.3 m -84.4 cm -8.14 cm 85 MeV 16.5 MeV 1.29 cm 257 m Iron muIoni + 40 12.3 m -83.8 cm -7.93 cm 69 MeV 16 MeV 1.04 cm 257 m Iron muIoni + 41 12.3 m -83.4 cm -7.78 cm 56.9 MeV 12.1 MeV 8.04 mm 257 m Iron muIoni + 42 12.3 m -83 cm -7.65 cm 47.6 MeV 9.3 MeV 6.41 mm 257 m Iron muIoni + 43 12.3 m -82.7 cm -7.5 cm 37.6 MeV 10 MeV 5.22 mm 257 m Iron muIoni + 44 12.3 m -82.5 cm -7.39 cm 29.1 MeV 8.51 MeV 4.05 mm 257 m Iron muIoni + 45 12.3 m -82.3 cm -7.34 cm 22.4 MeV 6.69 MeV 3.16 mm 257 m Iron muIoni + 46 12.3 m -82.1 cm -7.28 cm 15.3 MeV 7.09 MeV 2.52 mm 257 m Iron muIoni + 47 12.4 m -82 cm -7.17 cm 8.49 MeV 6.79 MeV 1.87 mm 257 m Iron muIoni + 48 12.4 m -81.9 cm -7.14 cm 0 eV 8.49 MeV 1 mm 257 m Iron muIoni + 49 12.4 m -81.9 cm -7.14 cm 0 eV 0 eV 0 fm 257 m Iron Decay ********************************************************************************************************* * G4Track Information: Particle = e-, Track ID = 6, Parent ID = 3 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -2.97 m 2.4 m 1.14 m 33.6 MeV 0 eV 0 fm 0 fm Iron initStep - 1 -2.98 m 2.4 m 1.14 m 21.8 MeV 11.8 MeV 5.3 mm 5.3 mm Iron eIoni - 2 -2.98 m 2.4 m 1.15 m 15 MeV 6.86 MeV 4.34 mm 9.64 mm Iron eIoni - 3 -2.98 m 2.41 m 1.15 m 9.97 MeV 5.02 MeV 3.65 mm 1.33 cm Iron eIoni - 4 -2.99 m 2.4 m 1.15 m 4.99 MeV 4.98 MeV 3.04 mm 1.63 cm Iron eIoni - 5 -2.99 m 2.4 m 1.15 m 2.49 MeV 2.5 MeV 2.25 mm 1.86 cm Iron eIoni - 6 -2.99 m 2.4 m 1.15 m 381 keV 2.11 MeV 1.65 mm 2.02 cm Iron eIoni - 7 -2.99 m 2.41 m 1.15 m 0 eV 381 keV 218 um 2.05 cm Iron eIoni + 0 12.4 m -81.9 cm -7.14 cm 45 MeV 0 eV 0 fm 0 fm Iron initStep + 1 12.3 m -82.4 cm -6.89 cm 21.2 MeV 23.8 MeV 6.03 mm 6.03 mm Iron eIoni + 2 12.3 m -82.8 cm -6.83 cm 14.1 MeV 7.1 MeV 4.28 mm 1.03 cm Iron eIoni + 3 12.4 m -82.9 cm -6.69 cm 8.84 MeV 5.22 MeV 3.54 mm 1.39 cm Iron eIoni + 4 12.4 m -82.9 cm -6.5 cm 5.06 MeV 3.79 MeV 2.88 mm 1.67 cm Iron eIoni + 5 12.4 m -82.8 cm -6.48 cm 0 eV 5.06 MeV 2.27 mm 1.9 cm Iron eIoni ********************************************************************************************************* * G4Track Information: Particle = anti_nu_e, Track ID = 5, Parent ID = 3 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -2.97 m 2.4 m 1.14 m 21.9 MeV 0 eV 0 fm 0 fm Iron initStep - 1 83.6 m 223 m 250 m 21.9 MeV 0 eV 343 m 343 m OutOfWorld Transportation + 0 12.4 m -81.9 cm -7.14 cm 33.4 MeV 0 eV 0 fm 0 fm Iron initStep + 1 250 m 76.7 m -208 m 33.4 MeV 0 eV 325 m 325 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = nu_mu, Track ID = 4, Parent ID = 3 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -2.97 m 2.4 m 1.14 m 49.1 MeV 0 eV 0 fm 0 fm Iron initStep - 1 120 m -250 m -227 m 49.1 MeV 0 eV 362 m 362 m OutOfWorld Transportation + 0 12.4 m -81.9 cm -7.14 cm 26.3 MeV 0 eV 0 fm 0 fm Iron initStep + 1 -65 m 250 m -46.6 m 26.3 MeV 0 eV 267 m 267 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = mu+, Track ID = 2, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -243 m 0 fm 0 fm 237 GeV 0 eV 0 fm 0 fm Iron initStep - 1 -222 m 5.26 cm -3.04 cm 171 GeV 65.6 GeV 21.4 m 21.4 m Iron muIoni - 2 -205 m 10.6 cm -5.39 cm 137 GeV 34.3 GeV 16.7 m 38 m Iron muIoni - 3 -191 m 15.6 cm -6.42 cm 111 GeV 25.2 GeV 14 m 52 m Iron muIoni - 4 -179 m 24.5 cm -2.75 cm 78.5 GeV 33 GeV 11.8 m 63.9 m Iron muIoni - 5 -171 m 32.9 cm -3.91 cm 38.7 GeV 39.8 GeV 8.82 m 72.7 m Iron muIoni - 6 -166 m 39 cm -7.42 cm 31.2 GeV 7.49 GeV 4.75 m 77.4 m Iron muIoni - 7 -162 m 44 cm -13.4 cm 25.5 GeV 5.64 GeV 3.92 m 81.3 m Iron muIoni - 8 -159 m 49.3 cm -19.6 cm 20.7 GeV 4.83 GeV 3.27 m 84.6 m Iron muIoni - 9 -156 m 55.7 cm -24.9 cm 16.8 GeV 3.88 GeV 2.71 m 87.3 m Iron muIoni - 10 -154 m 63.5 cm -29.4 cm 13.7 GeV 3.12 GeV 2.24 m 89.6 m Iron muIoni - 11 -152 m 71.4 cm -34.2 cm 11.1 GeV 2.6 GeV 1.86 m 91.4 m Iron muIoni - 12 -150 m 81.8 cm -35.9 cm 8.85 GeV 2.26 GeV 1.54 m 93 m Iron muIoni - 13 -149 m 89 cm -37.5 cm 7.11 GeV 1.74 GeV 1.25 m 94.2 m Iron muIoni - 14 -148 m 1.15 m -15.5 cm 5.68 GeV 1.43 GeV 1.02 m 95.2 m Iron muIoni - 15 -147 m 1.38 m 1.86 cm 4.02 GeV 1.66 GeV 83.2 cm 96.1 m Iron muIoni - 16 -147 m 1.55 m 14.1 cm 3.29 GeV 731 MeV 60.5 cm 96.7 m Iron muIoni - 17 -146 m 1.67 m 23.5 cm 2.43 GeV 860 MeV 50.2 cm 97.2 m Iron muIoni - 18 -146 m 1.76 m 28.5 cm 1.95 GeV 479 MeV 37.9 cm 97.5 m Iron muIoni - 19 -146 m 1.85 m 33.4 cm 1.57 GeV 384 MeV 30.8 cm 97.8 m Iron muIoni - 20 -145 m 1.92 m 37.2 cm 1.25 GeV 318 MeV 25.1 cm 98.1 m Iron muIoni - 21 -145 m 1.99 m 40 cm 949 MeV 299 MeV 20.2 cm 98.3 m Iron muIoni - 22 -145 m 2.05 m 42.6 cm 787 MeV 162 MeV 15.4 cm 98.5 m Iron muIoni - 23 -145 m 2.08 m 44.8 cm 646 MeV 140 MeV 12.8 cm 98.6 m Iron muIoni - 24 -145 m 2.11 m 46.1 cm 528 MeV 118 MeV 10.5 cm 98.7 m Iron muIoni - 25 -145 m 2.13 m 46.8 cm 424 MeV 104 MeV 8.54 cm 98.8 m Iron muIoni - 26 -145 m 2.15 m 48.5 cm 343 MeV 80.7 MeV 6.77 cm 98.8 m Iron muIoni - 27 -145 m 2.17 m 49.5 cm 277 MeV 66.7 MeV 5.39 cm 98.9 m Iron muIoni - 28 -145 m 2.19 m 50.2 cm 227 MeV 49.5 MeV 4.24 cm 98.9 m Iron muIoni - 29 -145 m 2.2 m 50.3 cm 193 MeV 34.5 MeV 3.38 cm 99 m Iron muIoni - 30 -145 m 2.21 m 50.4 cm 155 MeV 37.3 MeV 2.79 cm 99 m Iron muIoni - 31 -145 m 2.22 m 50.8 cm 130 MeV 24.8 MeV 2.16 cm 99 m Iron muIoni - 32 -144 m 2.22 m 51 cm 108 MeV 22.9 MeV 1.75 cm 99 m Iron muIoni - 33 -144 m 2.23 m 51.3 cm 89.4 MeV 18.1 MeV 1.38 cm 99.1 m Iron muIoni - 34 -144 m 2.23 m 51.6 cm 72.8 MeV 16.7 MeV 1.1 cm 99.1 m Iron muIoni - 35 -144 m 2.23 m 51.8 cm 61.3 MeV 11.5 MeV 8.57 mm 99.1 m Iron muIoni - 36 -144 m 2.23 m 51.9 cm 52.2 MeV 9.06 MeV 6.96 mm 99.1 m Iron muIoni - 37 -144 m 2.23 m 51.8 cm 43 MeV 9.17 MeV 5.78 mm 99.1 m Iron muIoni - 38 -144 m 2.24 m 51.8 cm 35.2 MeV 7.78 MeV 4.67 mm 99.1 m Iron muIoni - 39 -144 m 2.24 m 51.8 cm 26.8 MeV 8.41 MeV 3.8 mm 99.1 m Iron muIoni - 40 -144 m 2.24 m 51.9 cm 19.7 MeV 7.12 MeV 2.94 mm 99.1 m Iron muIoni - 41 -144 m 2.24 m 51.8 cm 12.7 MeV 7.05 MeV 2.27 mm 99.1 m Iron muIoni - 42 -144 m 2.24 m 51.7 cm 4.97 MeV 7.69 MeV 1.6 mm 99.1 m Iron muIoni - 43 -144 m 2.24 m 51.7 cm 0 eV 4.97 MeV 389 um 99.1 m Iron muIoni - 44 -144 m 2.24 m 51.7 cm 0 eV 0 eV 0 fm 99.1 m Iron Decay + 0 -245 m 0 fm 0 fm 132 GeV 0 eV 0 fm 0 fm Iron initStep + 1 -231 m 3.37 cm -1.85 cm 104 GeV 27.4 GeV 13.6 m 13.6 m Iron muIoni + 2 -220 m 4.57 cm -3.88 cm 82 GeV 22.2 GeV 11.2 m 24.8 m Iron muIoni + 3 -211 m 16.6 cm -7.3 cm 63.6 GeV 18.3 GeV 9.15 m 33.9 m Iron muIoni + 4 -204 m 26.7 cm -4.56 cm 46 GeV 17.7 GeV 7.36 m 41.3 m Iron muIoni + 5 -198 m 35.4 cm -4.43 cm 23 GeV 22.9 GeV 5.53 m 46.8 m Iron muIoni + 6 -195 m 42.5 cm -1.25 cm 18.6 GeV 4.38 GeV 2.98 m 49.8 m Iron muIoni + 7 -193 m 46.7 cm 6.07 mm 15.4 GeV 3.26 GeV 2.46 m 52.2 m Iron muIoni + 8 -191 m 50.4 cm -1.41 cm 12.5 GeV 2.9 GeV 2.07 m 54.3 m Iron muIoni + 9 -189 m 61.6 cm 6.99 mm 10.2 GeV 2.31 GeV 1.71 m 56 m Iron muIoni + 10 -188 m 70.7 cm 8.08 mm 8.27 GeV 1.89 GeV 1.42 m 57.4 m Iron muIoni + 11 -186 m 79.6 cm 599 um 6.7 GeV 1.57 GeV 1.17 m 58.6 m Iron muIoni + 12 -185 m 90.1 cm 1.3 cm 5.33 GeV 1.37 GeV 96.8 cm 59.6 m Iron muIoni + 13 -185 m 97.6 cm 2.26 cm 4.27 GeV 1.06 GeV 78.5 cm 60.3 m Iron muIoni + 14 -184 m 1.18 m 19.9 cm 3.41 GeV 864 MeV 64 cm 61 m Iron muIoni + 15 -184 m 1.37 m 33.8 cm 2.44 GeV 972 MeV 52 cm 61.5 m Iron muIoni + 16 -183 m 1.5 m 43.7 cm 2 GeV 443 MeV 38 cm 61.9 m Iron muIoni + 17 -183 m 1.6 m 51.2 cm 1.49 GeV 507 MeV 31.5 cm 62.2 m Iron muIoni + 18 -183 m 1.67 m 55.2 cm 1.2 GeV 291 MeV 23.9 cm 62.4 m Iron muIoni + 19 -183 m 1.74 m 59.1 cm 966 MeV 232 MeV 19.4 cm 62.6 m Iron muIoni + 20 -182 m 1.8 m 62.2 cm 775 MeV 191 MeV 15.7 cm 62.8 m Iron muIoni + 21 -182 m 1.85 m 64.4 cm 600 MeV 175 MeV 12.6 cm 62.9 m Iron muIoni + 22 -182 m 1.9 m 66.5 cm 500 MeV 99.4 MeV 9.73 cm 63 m Iron muIoni + 23 -182 m 1.93 m 68.3 cm 414 MeV 85.8 MeV 8.06 cm 63.1 m Iron muIoni + 24 -182 m 1.95 m 69.3 cm 342 MeV 72.9 MeV 6.61 cm 63.2 m Iron muIoni + 25 -182 m 1.97 m 69.9 cm 276 MeV 65 MeV 5.35 cm 63.2 m Iron muIoni + 26 -182 m 1.99 m 71.2 cm 226 MeV 50.4 MeV 4.23 cm 63.2 m Iron muIoni + 27 -182 m 2 m 72 cm 184 MeV 42.2 MeV 3.37 cm 63.3 m Iron muIoni + 28 -182 m 2.01 m 72.5 cm 152 MeV 31.6 MeV 2.64 cm 63.3 m Iron muIoni + 29 -182 m 2.02 m 72.9 cm 130 MeV 22.5 MeV 2.11 cm 63.3 m Iron muIoni + 30 -182 m 2.03 m 73.2 cm 105 MeV 24.4 MeV 1.74 cm 63.3 m Iron muIoni + 31 -182 m 2.03 m 73.7 cm 88.6 MeV 16.7 MeV 1.35 cm 63.4 m Iron muIoni + 32 -182 m 2.04 m 74 cm 72.9 MeV 15.7 MeV 1.09 cm 63.4 m Iron muIoni + 33 -182 m 2.04 m 74.3 cm 60.3 MeV 12.7 MeV 8.59 mm 63.4 m Iron muIoni + 34 -182 m 2.04 m 74.6 cm 48.5 MeV 11.7 MeV 6.83 mm 63.4 m Iron muIoni + 35 -182 m 2.04 m 74.8 cm 40 MeV 8.55 MeV 5.33 mm 63.4 m Iron muIoni + 36 -182 m 2.05 m 74.9 cm 33 MeV 6.96 MeV 4.31 mm 63.4 m Iron muIoni + 37 -182 m 2.05 m 74.9 cm 25.5 MeV 7.55 MeV 3.56 mm 63.4 m Iron muIoni + 38 -182 m 2.05 m 74.9 cm 18 MeV 7.41 MeV 2.8 mm 63.4 m Iron muIoni + 39 -182 m 2.05 m 75 cm 10.6 MeV 7.42 MeV 2.13 mm 63.4 m Iron muIoni + 40 -182 m 2.05 m 75 cm 2.8 MeV 7.83 MeV 1.36 mm 63.4 m Iron muIoni + 41 -182 m 2.05 m 75 cm 0 eV 2.8 MeV 144 um 63.4 m Iron muIoni + 42 -182 m 2.05 m 75 cm 0 eV 0 eV 0 fm 63.4 m Iron Decay ********************************************************************************************************* * G4Track Information: Particle = e+, Track ID = 9, Parent ID = 2 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -144 m 2.24 m 51.7 cm 34.8 MeV 0 eV 0 fm 0 fm Iron initStep - 1 -120 m 119 m -250 m 34.8 MeV 0 eV 278 m 278 m OutOfWorld Transportation + 0 -182 m 2.05 m 75 cm 33.5 MeV 0 eV 0 fm 0 fm Iron initStep + 1 -250 m -31.8 m -4.01 m 33.5 MeV 0 eV 76.2 m 76.2 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = nu_e, Track ID = 8, Parent ID = 2 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -144 m 2.24 m 51.7 cm 38.8 MeV 0 eV 0 fm 0 fm Iron initStep - 1 156 m -203 m 250 m 38.8 MeV 0 eV 441 m 441 m OutOfWorld Transportation + 0 -182 m 2.05 m 75 cm 47 MeV 0 eV 0 fm 0 fm Iron initStep + 1 250 m -18.6 m 28.3 m 47 MeV 0 eV 433 m 433 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = anti_nu_mu, Track ID = 7, Parent ID = 2 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -144 m 2.24 m 51.7 cm 31.1 MeV 0 eV 0 fm 0 fm Iron initStep - 1 -250 m 14.4 m 34.5 m 31.1 MeV 0 eV 112 m 112 m OutOfWorld Transportation + 0 -182 m 2.05 m 75 cm 24.1 MeV 0 eV 0 fm 0 fm Iron initStep + 1 -250 m 71.1 m -2.84 m 24.1 MeV 0 eV 97 m 97 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = e+, Track ID = 1, Parent ID = 0 @@ -566,167 +572,163 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process 0 -250 m 0 fm 0 fm 1e+03 GeV 0 eV 0 fm 0 fm Iron initStep - 1 -249 m 0 fm 0 fm 0 eV 0 eV 1.29 m 1.29 m Iron AnnihiToMuPair + 1 -247 m 0 fm 0 fm 0 eV 0 eV 3.03 m 3.03 m Iron AnnihiToMuPair ********************************************************************************************************* * G4Track Information: Particle = mu-, Track ID = 3, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -249 m 0 fm 0 fm 429 GeV 0 eV 0 fm 0 fm Iron initStep - 1 -216 m -4.88 mm -3.64 cm 333 GeV 95.9 GeV 32.2 m 32.2 m Iron muIoni - 2 -189 m -1.18 cm -15.4 cm 256 GeV 77.3 GeV 27.3 m 59.5 m Iron muIoni - 3 -167 m 16.5 cm -38.9 cm 202 GeV 54 GeV 22.7 m 82.2 m Iron muIoni - 4 -148 m 34.9 cm -59.6 cm 154 GeV 47.3 GeV 19 m 101 m Iron muIoni - 5 -132 m 44.5 cm -82.5 cm 107 GeV 47.5 GeV 15.4 m 117 m Iron muIoni - 6 -121 m 54.9 cm -99.4 cm 86.9 GeV 19.9 GeV 11.4 m 128 m Iron muIoni - 7 -111 m 70.7 cm -1.12 m 71.4 GeV 15.5 GeV 9.62 m 138 m Iron muIoni - 8 -103 m 79 cm -1.16 m 34.5 GeV 36.9 GeV 8.13 m 146 m Iron muIoni - 9 -98.7 m 81.1 cm -1.19 m 25.4 GeV 9.06 GeV 4.29 m 150 m Iron muIoni - 10 -95.4 m 81.7 cm -1.25 m 19.5 GeV 5.86 GeV 3.26 m 153 m Iron muIoni - 11 -92.8 m 81.5 cm -1.29 m 16 GeV 3.6 GeV 2.57 m 156 m Iron muIoni - 12 -90.7 m 84.4 cm -1.3 m 13.1 GeV 2.87 GeV 2.14 m 158 m Iron muIoni - 13 -88.9 m 88.4 cm -1.31 m 10.8 GeV 2.31 GeV 1.79 m 160 m Iron muIoni - 14 -87.4 m 91 cm -1.27 m 8.78 GeV 2 GeV 1.5 m 161 m Iron muIoni - 15 -86.2 m 91 cm -1.24 m 7.06 GeV 1.72 GeV 1.24 m 163 m Iron muIoni - 16 -85.1 m 90.2 cm -1.22 m 5.65 GeV 1.41 GeV 1.02 m 164 m Iron muIoni - 17 -84.3 m 88.7 cm -1.17 m 4.64 GeV 1.01 GeV 82.9 cm 164 m Iron muIoni - 18 -83.6 m 85.5 cm -1.13 m 3.75 GeV 882 MeV 69.1 cm 165 m Iron muIoni - 19 -83.1 m 83 cm -1.11 m 3.03 GeV 728 MeV 56.9 cm 166 m Iron muIoni - 20 -82.6 m 83.5 cm -1.1 m 2.04 GeV 983 MeV 46.6 cm 166 m Iron muIoni - 21 -82.3 m 83.1 cm -1.1 m 1.59 GeV 458 MeV 32.3 cm 166 m Iron muIoni - 22 -82 m 84.6 cm -1.1 m 1.3 GeV 287 MeV 25.4 cm 167 m Iron muIoni - 23 -81.8 m 85.4 cm -1.11 m 1.04 GeV 255 MeV 21 cm 167 m Iron muIoni - 24 -81.6 m 87.8 cm -1.11 m 743 MeV 301 MeV 17 cm 167 m Iron muIoni - 25 -81.5 m 88.4 cm -1.12 m 607 MeV 137 MeV 12.1 cm 167 m Iron muIoni - 26 -81.4 m 89.5 cm -1.12 m 489 MeV 117 MeV 9.87 cm 167 m Iron muIoni - 27 -81.3 m 90.8 cm -1.13 m 393 MeV 96.6 MeV 7.9 cm 167 m Iron muIoni - 28 -81.3 m 91.3 cm -1.13 m 319 MeV 74.1 MeV 6.25 cm 167 m Iron muIoni - 29 -81.2 m 91.3 cm -1.13 m 253 MeV 65.3 MeV 4.97 cm 168 m Iron muIoni - 30 -81.2 m 91.7 cm -1.14 m 209 MeV 44 MeV 3.84 cm 168 m Iron muIoni - 31 -81.2 m 92.4 cm -1.14 m 176 MeV 33.3 MeV 3.08 cm 168 m Iron muIoni - 32 -81.1 m 92.6 cm -1.14 m 147 MeV 28.6 MeV 2.51 cm 168 m Iron muIoni - 33 -81.1 m 93 cm -1.14 m 126 MeV 21.2 MeV 2.03 cm 168 m Iron muIoni - 34 -81.1 m 93.3 cm -1.14 m 105 MeV 21.2 MeV 1.68 cm 168 m Iron muIoni - 35 -81.1 m 93.3 cm -1.14 m 87.9 MeV 17.1 MeV 1.34 cm 168 m Iron muIoni - 36 -81.1 m 93.3 cm -1.14 m 73.7 MeV 14.2 MeV 1.08 cm 168 m Iron muIoni - 37 -81.1 m 93.4 cm -1.14 m 61.5 MeV 12.2 MeV 8.71 mm 168 m Iron muIoni - 38 -81.1 m 93.4 cm -1.14 m 50.6 MeV 10.8 MeV 7 mm 168 m Iron muIoni - 39 -81.1 m 93.3 cm -1.14 m 40.4 MeV 10.3 MeV 5.59 mm 168 m Iron muIoni - 40 -81.1 m 93.3 cm -1.14 m 32.6 MeV 7.81 MeV 4.36 mm 168 m Iron muIoni - 41 -81 m 93.3 cm -1.14 m 25 MeV 7.55 MeV 3.51 mm 168 m Iron muIoni - 42 -81 m 93.2 cm -1.14 m 18 MeV 7 MeV 2.76 mm 168 m Iron muIoni - 43 -81 m 93.2 cm -1.14 m 10.4 MeV 7.58 MeV 2.13 mm 168 m Iron muIoni - 44 -81 m 93.3 cm -1.14 m 2.35 MeV 8.09 MeV 1.33 mm 168 m Iron muIoni - 45 -81 m 93.3 cm -1.14 m 0 eV 2.35 MeV 105 um 168 m Iron muIoni - 46 -81 m 93.3 cm -1.14 m 0 eV 0 eV 0 fm 168 m Iron Decay + 0 -247 m 0 fm 0 fm 934 GeV 0 eV 0 fm 0 fm Iron initStep + 1 -196 m 3.38 cm -4.49 cm 445 GeV 489 GeV 50.6 m 50.6 m Iron muIoni + 2 -163 m 17.4 cm -3.49 cm 338 GeV 107 GeV 33 m 83.7 m Iron muIoni + 3 -136 m 23.1 cm 3.72 cm 256 GeV 82.4 GeV 27.6 m 111 m Iron muIoni + 4 -113 m 32.3 cm 6.59 cm 197 GeV 59.3 GeV 22.7 m 134 m Iron muIoni + 5 -94.4 m 34.6 cm 6.92 cm 153 GeV 43.3 GeV 18.6 m 153 m Iron muIoni + 6 -79.1 m 51.3 cm -30.4 cm 99.7 GeV 53.6 GeV 15.4 m 168 m Iron muIoni + 7 -68.3 m 60.1 cm -54 cm 76.9 GeV 22.8 GeV 10.8 m 179 m Iron muIoni + 8 -59.6 m 66.2 cm -77.1 cm 61 GeV 15.9 GeV 8.68 m 187 m Iron muIoni + 9 -52.5 m 72.7 cm -95.7 cm 50.2 GeV 10.8 GeV 7.1 m 194 m Iron muIoni + 10 -46.5 m 79.4 cm -1.21 m 41.1 GeV 9.1 GeV 5.99 m 200 m Iron muIoni + 11 -41.5 m 86.4 cm -1.42 m 33.7 GeV 7.37 GeV 5.02 m 205 m Iron muIoni + 12 -37.3 m 94.3 cm -1.53 m 27.3 GeV 6.46 GeV 4.21 m 210 m Iron muIoni + 13 -33.8 m 97.1 cm -1.57 m 13.9 GeV 13.4 GeV 3.47 m 213 m Iron muIoni + 14 -32 m 97 cm -1.6 m 10.2 GeV 3.62 GeV 1.88 m 215 m Iron muIoni + 15 -30.5 m 95 cm -1.63 m 8.03 GeV 2.2 GeV 1.43 m 216 m Iron muIoni + 16 -29.4 m 90.5 cm -1.64 m 6.47 GeV 1.56 GeV 1.14 m 218 m Iron muIoni + 17 -28.5 m 86.5 cm -1.67 m 5.32 GeV 1.16 GeV 94 cm 219 m Iron muIoni + 18 -27.7 m 84.5 cm -1.7 m 4.37 GeV 946 MeV 78.4 cm 219 m Iron muIoni + 19 -27 m 82.3 cm -1.69 m 3.56 GeV 816 MeV 65.5 cm 220 m Iron muIoni + 20 -26.5 m 78.9 cm -1.68 m 2.85 GeV 702 MeV 54.1 cm 221 m Iron muIoni + 21 -26 m 75.5 cm -1.68 m 2.28 GeV 574 MeV 44.1 cm 221 m Iron muIoni + 22 -25.7 m 72.3 cm -1.65 m 1.87 GeV 409 MeV 35.8 cm 221 m Iron muIoni + 23 -25.4 m 68.2 cm -1.63 m 1.52 GeV 355 MeV 29.7 cm 222 m Iron muIoni + 24 -25.1 m 65 cm -1.62 m 1.22 GeV 291 MeV 24.3 cm 222 m Iron muIoni + 25 -24.9 m 64 cm -1.62 m 872 MeV 353 MeV 19.8 cm 222 m Iron muIoni + 26 -24.8 m 62.8 cm -1.62 m 683 MeV 188 MeV 14.2 cm 222 m Iron muIoni + 27 -24.7 m 63.1 cm -1.63 m 565 MeV 119 MeV 11.1 cm 222 m Iron muIoni + 28 -24.6 m 63 cm -1.64 m 460 MeV 104 MeV 9.17 cm 222 m Iron muIoni + 29 -24.5 m 64 cm -1.64 m 349 MeV 111 MeV 7.4 cm 222 m Iron muIoni + 30 -24.5 m 64.1 cm -1.64 m 289 MeV 60.3 MeV 5.5 cm 223 m Iron muIoni + 31 -24.4 m 64.5 cm -1.65 m 238 MeV 51.3 MeV 4.46 cm 223 m Iron muIoni + 32 -24.4 m 65.1 cm -1.65 m 195 MeV 42.7 MeV 3.57 cm 223 m Iron muIoni + 33 -24.4 m 65.2 cm -1.65 m 161 MeV 34.3 MeV 2.83 cm 223 m Iron muIoni + 34 -24.3 m 65.1 cm -1.65 m 130 MeV 30.4 MeV 2.25 cm 223 m Iron muIoni + 35 -24.3 m 65.3 cm -1.66 m 109 MeV 21.6 MeV 1.75 cm 223 m Iron muIoni + 36 -24.3 m 65.6 cm -1.66 m 91.8 MeV 16.8 MeV 1.4 cm 223 m Iron muIoni + 37 -24.3 m 65.7 cm -1.66 m 76.9 MeV 14.9 MeV 1.14 cm 223 m Iron muIoni + 38 -24.3 m 65.9 cm -1.66 m 65.6 MeV 11.3 MeV 9.17 mm 223 m Iron muIoni + 39 -24.3 m 65.9 cm -1.66 m 54 MeV 11.6 MeV 7.57 mm 223 m Iron muIoni + 40 -24.3 m 65.9 cm -1.66 m 44.3 MeV 9.71 MeV 6.02 mm 223 m Iron muIoni + 41 -24.3 m 65.9 cm -1.66 m 35.8 MeV 8.44 MeV 4.82 mm 223 m Iron muIoni + 42 -24.3 m 65.9 cm -1.66 m 28.2 MeV 7.67 MeV 3.86 mm 223 m Iron muIoni + 43 -24.3 m 65.9 cm -1.66 m 20.7 MeV 7.48 MeV 3.07 mm 223 m Iron muIoni + 44 -24.3 m 65.9 cm -1.66 m 13.9 MeV 6.77 MeV 2.36 mm 223 m Iron muIoni + 45 -24.3 m 66 cm -1.66 m 6.33 MeV 7.58 MeV 1.74 mm 223 m Iron muIoni + 46 -24.3 m 66 cm -1.66 m 0 eV 6.33 MeV 594 um 223 m Iron muIoni + 47 -24.3 m 66 cm -1.66 m 0 eV 0 eV 0 fm 223 m Iron Decay ********************************************************************************************************* * G4Track Information: Particle = e-, Track ID = 6, Parent ID = 3 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -81 m 93.3 cm -1.14 m 46 MeV 0 eV 0 fm 0 fm Iron initStep - 1 -81 m 93.4 cm -1.14 m 28.3 MeV 17.7 MeV 6.09 mm 6.09 mm Iron eIoni - 2 -81.1 m 93.5 cm -1.14 m 19.5 MeV 8.83 MeV 4.89 mm 1.1 cm Iron eIoni - 3 -81.1 m 93.3 cm -1.14 m 12.7 MeV 6.81 MeV 4.12 mm 1.51 cm Iron eIoni - 4 -81.1 m 93 cm -1.14 m 7.96 MeV 4.69 MeV 3.38 mm 1.85 cm Iron eIoni - 5 -81.1 m 92.8 cm -1.14 m 3.28 MeV 4.68 MeV 2.75 mm 2.12 cm Iron eIoni - 6 -81.1 m 92.7 cm -1.14 m 1.01 MeV 2.27 MeV 1.88 mm 2.31 cm Iron eIoni - 7 -81.1 m 92.7 cm -1.14 m 0 eV 1.01 MeV 781 um 2.39 cm Iron eIoni + 0 -24.3 m 66 cm -1.66 m 40 MeV 0 eV 0 fm 0 fm Iron initStep + 1 -24.3 m 65.9 cm -1.66 m 25.3 MeV 14.7 MeV 5.73 mm 5.73 mm Iron eIoni + 2 -24.3 m 65.8 cm -1.65 m 16.4 MeV 8.82 MeV 4.65 mm 1.04 cm Iron eIoni + 3 -24.3 m 65.8 cm -1.65 m 10.9 MeV 5.51 MeV 3.81 mm 1.42 cm Iron eIoni + 4 -24.3 m 66 cm -1.65 m 4.46 MeV 6.48 MeV 3.16 mm 1.74 cm Iron eIoni + 5 -24.2 m 66 cm -1.66 m 2.3 MeV 2.16 MeV 2.15 mm 1.95 cm Iron eIoni + 6 -24.2 m 66 cm -1.65 m 684 keV 1.62 MeV 1.59 mm 2.11 cm Iron eIoni + 7 -24.2 m 66 cm -1.65 m 0 eV 684 keV 482 um 2.16 cm Iron eIoni ********************************************************************************************************* * G4Track Information: Particle = anti_nu_e, Track ID = 5, Parent ID = 3 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -81 m 93.3 cm -1.14 m 12 MeV 0 eV 0 fm 0 fm Iron initStep - 1 -82.4 m 97.8 m -250 m 12 MeV 0 eV 267 m 267 m OutOfWorld Transportation + 0 -24.3 m 66 cm -1.66 m 20.3 MeV 0 eV 0 fm 0 fm Iron initStep + 1 -250 m 164 m 130 m 20.3 MeV 0 eV 309 m 309 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = nu_mu, Track ID = 4, Parent ID = 3 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -81 m 93.3 cm -1.14 m 46.6 MeV 0 eV 0 fm 0 fm Iron initStep - 1 250 m -128 m 13.6 m 46.6 MeV 0 eV 356 m 356 m OutOfWorld Transportation + 0 -24.3 m 66 cm -1.66 m 44.3 MeV 0 eV 0 fm 0 fm Iron initStep + 1 -80.4 m -99.5 m -250 m 44.3 MeV 0 eV 274 m 274 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = mu+, Track ID = 2, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -249 m 0 fm 0 fm 571 GeV 0 eV 0 fm 0 fm Iron initStep - 1 -210 m 4.37 mm 3.26 cm 421 GeV 150 GeV 38.5 m 38.5 m Iron muIoni - 2 -178 m -6.8 cm 11.6 cm 311 GeV 111 GeV 31.9 m 70.3 m Iron muIoni - 3 -152 m -27.1 cm 5.93 cm 230 GeV 81 GeV 26 m 96.3 m Iron muIoni - 4 -132 m -44.2 cm -4.17 cm 184 GeV 45.8 GeV 20.9 m 117 m Iron muIoni - 5 -114 m -65.8 cm -21 cm 102 GeV 81.3 GeV 17.7 m 135 m Iron muIoni - 6 -103 m -81.3 cm -27 cm 77.6 GeV 24.9 GeV 11 m 146 m Iron muIoni - 7 -94.1 m -1.01 m -37.2 cm 45.5 GeV 32 GeV 8.73 m 155 m Iron muIoni - 8 -88.6 m -1.12 m -44.4 cm 36.2 GeV 9.32 GeV 5.48 m 160 m Iron muIoni - 9 -84.2 m -1.23 m -47 cm 29.5 GeV 6.69 GeV 4.47 m 165 m Iron muIoni - 10 -80.4 m -1.33 m -39.8 cm 23.8 GeV 5.74 GeV 3.72 m 168 m Iron muIoni - 11 -77.4 m -1.41 m -36.3 cm 19 GeV 4.75 GeV 3.06 m 171 m Iron muIoni - 12 -74.9 m -1.49 m -36.4 cm 14.1 GeV 4.9 GeV 2.51 m 174 m Iron muIoni - 13 -73 m -1.56 m -35.3 cm 11.5 GeV 2.59 GeV 1.91 m 176 m Iron muIoni - 14 -71.4 m -1.63 m -35.2 cm 9.18 GeV 2.35 GeV 1.59 m 177 m Iron muIoni - 15 -70.1 m -1.73 m -45.9 cm 7.09 GeV 2.1 GeV 1.29 m 179 m Iron muIoni - 16 -69.1 m -1.8 m -55.2 cm 5.64 GeV 1.45 GeV 1.02 m 180 m Iron muIoni - 17 -68.3 m -1.85 m -64.5 cm 4.5 GeV 1.14 GeV 82.6 cm 180 m Iron muIoni - 18 -67.6 m -1.9 m -71.4 cm 3.36 GeV 1.13 GeV 67.1 cm 181 m Iron muIoni - 19 -67.1 m -1.94 m -76.1 cm 2.71 GeV 650 MeV 51.3 cm 182 m Iron muIoni - 20 -66.7 m -1.97 m -79.9 cm 2.19 GeV 526 MeV 42 cm 182 m Iron muIoni - 21 -66.3 m -2 m -82.3 cm 1.77 GeV 422 MeV 34.4 cm 182 m Iron muIoni - 22 -66.1 m -2.01 m -83.8 cm 1.43 GeV 333 MeV 28.1 cm 183 m Iron muIoni - 23 -65.8 m -2.01 m -84.2 cm 1.16 GeV 275 MeV 23 cm 183 m Iron muIoni - 24 -65.6 m -2 m -82.8 cm 923 MeV 236 MeV 18.8 cm 183 m Iron muIoni - 25 -65.5 m -2 m -80.7 cm 674 MeV 248 MeV 15 cm 183 m Iron muIoni - 26 -65.4 m -2.01 m -79.5 cm 557 MeV 118 MeV 11 cm 183 m Iron muIoni - 27 -65.3 m -2.01 m -78.3 cm 457 MeV 99.4 MeV 9.01 cm 183 m Iron muIoni - 28 -65.2 m -2.01 m -77.1 cm 354 MeV 103 MeV 7.33 cm 184 m Iron muIoni - 29 -65.2 m -2.01 m -76.9 cm 264 MeV 89.6 MeV 5.57 cm 184 m Iron muIoni - 30 -65.1 m -2.01 m -77.1 cm 214 MeV 50.4 MeV 4.02 cm 184 m Iron muIoni - 31 -65.1 m -2.01 m -77.9 cm 181 MeV 32.9 MeV 3.16 cm 184 m Iron muIoni - 32 -65.1 m -2 m -78.3 cm 152 MeV 29 MeV 2.6 cm 184 m Iron muIoni - 33 -65.1 m -1.99 m -78.8 cm 126 MeV 25.9 MeV 2.11 cm 184 m Iron muIoni - 34 -65 m -1.99 m -79.1 cm 103 MeV 23.1 MeV 1.68 cm 184 m Iron muIoni - 35 -65 m -1.98 m -79.5 cm 84.7 MeV 18.4 MeV 1.31 cm 184 m Iron muIoni - 36 -65 m -1.98 m -79.9 cm 69.7 MeV 15 MeV 1.03 cm 184 m Iron muIoni - 37 -65 m -1.98 m -80.1 cm 58.7 MeV 10.9 MeV 8.13 mm 184 m Iron muIoni - 38 -65 m -1.98 m -80.3 cm 47.9 MeV 10.8 MeV 6.64 mm 184 m Iron muIoni - 39 -65 m -1.98 m -80.5 cm 38 MeV 9.83 MeV 5.25 mm 184 m Iron muIoni - 40 -65 m -1.98 m -80.6 cm 30.2 MeV 7.88 MeV 4.1 mm 184 m Iron muIoni - 41 -65 m -1.97 m -80.8 cm 23.1 MeV 7.03 MeV 3.27 mm 184 m Iron muIoni - 42 -65 m -1.97 m -80.9 cm 16 MeV 7.16 MeV 2.59 mm 184 m Iron muIoni - 43 -65 m -1.97 m -81.1 cm 9.17 MeV 6.81 MeV 1.93 mm 184 m Iron muIoni - 44 -65 m -1.97 m -81.2 cm 496 keV 8.68 MeV 1.13 mm 184 m Iron muIoni - 45 -65 m -1.97 m -81.2 cm 0 eV 496 keV 7.57 um 184 m Iron muIoni - 46 -65 m -1.97 m -81.2 cm 0 eV 0 eV 0 fm 184 m Iron Decay + 0 -247 m 0 fm 0 fm 65.3 GeV 0 eV 0 fm 0 fm Iron initStep + 1 -239 m -4.38 mm -2.2 cm 47.5 GeV 17.8 GeV 7.52 m 7.52 m Iron muIoni + 2 -234 m 6.17 cm 1.51 cm 38 GeV 9.55 GeV 5.7 m 13.2 m Iron muIoni + 3 -229 m 2.4 cm 12.7 cm 30.7 GeV 7.29 GeV 4.67 m 17.9 m Iron muIoni + 4 -225 m -1.11 cm 13.2 cm 24.5 GeV 6.19 GeV 3.86 m 21.8 m Iron muIoni + 5 -222 m -6.69 mm 11.6 cm 19.9 GeV 4.62 GeV 3.15 m 24.9 m Iron muIoni + 6 -219 m 4 cm 5.35 cm 16 GeV 3.85 GeV 2.61 m 27.5 m Iron muIoni + 7 -217 m 7.56 cm -3.32 cm 13 GeV 3.01 GeV 2.15 m 29.7 m Iron muIoni + 8 -216 m 12 cm -11.2 cm 10.1 GeV 2.91 GeV 1.78 m 31.4 m Iron muIoni + 9 -214 m 14.6 cm -16.6 cm 8.23 GeV 1.91 GeV 1.41 m 32.9 m Iron muIoni + 10 -213 m 13 cm -21.8 cm 6.8 GeV 1.42 GeV 1.17 m 34 m Iron muIoni + 11 -212 m 12.1 cm -28.5 cm 5.47 GeV 1.33 GeV 98.1 cm 35 m Iron muIoni + 12 -211 m 11.2 cm -31.3 cm 4.4 GeV 1.06 GeV 80.3 cm 35.8 m Iron muIoni + 13 -211 m 7.93 cm -31.7 cm 3.61 GeV 788 MeV 65.8 cm 36.5 m Iron muIoni + 14 -210 m -5.22 mm -33.6 cm 2.87 GeV 747 MeV 54.8 cm 37 m Iron muIoni + 15 -210 m -7.53 cm -36 cm 2.12 GeV 747 MeV 44.2 cm 37.5 m Iron muIoni + 16 -209 m -13.2 cm -37.3 cm 1.73 GeV 394 MeV 33.4 cm 37.8 m Iron muIoni + 17 -209 m -18.2 cm -38.7 cm 1.38 GeV 350 MeV 27.5 cm 38.1 m Iron muIoni + 18 -209 m -23.9 cm -44.4 cm 1.08 GeV 298 MeV 22.1 cm 38.3 m Iron muIoni + 19 -209 m -28.1 cm -49.2 cm 862 MeV 216 MeV 17.5 cm 38.5 m Iron muIoni + 20 -208 m -31.1 cm -53.7 cm 691 MeV 171 MeV 14 cm 38.6 m Iron muIoni + 21 -208 m -34.2 cm -57.2 cm 541 MeV 150 MeV 11.2 cm 38.7 m Iron muIoni + 22 -208 m -36.1 cm -59.6 cm 445 MeV 96.4 MeV 8.75 cm 38.8 m Iron muIoni + 23 -208 m -38 cm -61.6 cm 366 MeV 78.8 MeV 7.12 cm 38.9 m Iron muIoni + 24 -208 m -39.6 cm -62.9 cm 302 MeV 64.1 MeV 5.77 cm 38.9 m Iron muIoni + 25 -208 m -40.4 cm -63.9 cm 251 MeV 50.9 MeV 4.67 cm 39 m Iron muIoni + 26 -208 m -40.8 cm -64.3 cm 208 MeV 42.5 MeV 3.79 cm 39 m Iron muIoni + 27 -208 m -41 cm -64.2 cm 172 MeV 36.5 MeV 3.06 cm 39 m Iron muIoni + 28 -208 m -41.5 cm -64.1 cm 139 MeV 32.9 MeV 2.44 cm 39.1 m Iron muIoni + 29 -208 m -42 cm -64.1 cm 117 MeV 21.8 MeV 1.89 cm 39.1 m Iron muIoni + 30 -208 m -42.4 cm -64 cm 98.3 MeV 18.8 MeV 1.53 cm 39.1 m Iron muIoni + 31 -208 m -42.9 cm -64.1 cm 82.6 MeV 15.7 MeV 1.24 cm 39.1 m Iron muIoni + 32 -208 m -43.3 cm -64.1 cm 67.3 MeV 15.3 MeV 9.98 mm 39.1 m Iron muIoni + 33 -208 m -43.9 cm -64.3 cm 55.7 MeV 11.5 MeV 7.79 mm 39.1 m Iron muIoni + 34 -208 m -44.3 cm -64.6 cm 44.9 MeV 10.9 MeV 6.24 mm 39.1 m Iron muIoni + 35 -208 m -44.6 cm -64.8 cm 36.8 MeV 8.07 MeV 4.89 mm 39.1 m Iron muIoni + 36 -208 m -44.9 cm -64.9 cm 28.9 MeV 7.86 MeV 3.96 mm 39.2 m Iron muIoni + 37 -208 m -45.1 cm -65 cm 22.1 MeV 6.85 MeV 3.14 mm 39.2 m Iron muIoni + 38 -208 m -45.3 cm -65.1 cm 15.4 MeV 6.64 MeV 2.49 mm 39.2 m Iron muIoni + 39 -208 m -45.4 cm -65.3 cm 8.06 MeV 7.36 MeV 1.88 mm 39.2 m Iron muIoni + 40 -208 m -45.4 cm -65.4 cm 0 eV 8.06 MeV 911 um 39.2 m Iron muIoni + 41 -208 m -45.4 cm -65.4 cm 0 eV 0 eV 0 fm 39.2 m Iron Decay ********************************************************************************************************* * G4Track Information: Particle = e+, Track ID = 9, Parent ID = 2 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -65 m -1.97 m -81.2 cm 28.9 MeV 0 eV 0 fm 0 fm Iron initStep - 1 250 m 90.7 m -35.2 m 28.9 MeV 0 eV 330 m 330 m OutOfWorld Transportation + 0 -208 m -45.4 cm -65.4 cm 49.2 MeV 0 eV 0 fm 0 fm Iron initStep + 1 18.8 m 198 m 250 m 49.2 MeV 0 eV 392 m 392 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = nu_e, Track ID = 8, Parent ID = 2 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -65 m -1.97 m -81.2 cm 47.3 MeV 0 eV 0 fm 0 fm Iron initStep - 1 -250 m 37.6 m -45 m 47.3 MeV 0 eV 194 m 194 m OutOfWorld Transportation + 0 -208 m -45.4 cm -65.4 cm 14.2 MeV 0 eV 0 fm 0 fm Iron initStep + 1 -250 m -62.6 m 8.28 m 14.2 MeV 0 eV 75.5 m 75.5 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = anti_nu_mu, Track ID = 7, Parent ID = 2 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -65 m -1.97 m -81.2 cm 28.4 MeV 0 eV 0 fm 0 fm Iron initStep - 1 179 m -250 m 191 m 28.4 MeV 0 eV 397 m 397 m OutOfWorld Transportation + 0 -208 m -45.4 cm -65.4 cm 41.2 MeV 0 eV 0 fm 0 fm Iron initStep + 1 -250 m -27.6 m -68.4 m 41.2 MeV 0 eV 84.2 m 84.2 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = e+, Track ID = 1, Parent ID = 0 @@ -734,165 +736,172 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process 0 -250 m 0 fm 0 fm 1e+03 GeV 0 eV 0 fm 0 fm Iron initStep - 1 -248 m 0 fm 0 fm 0 eV 0 eV 2.42 m 2.42 m Iron AnnihiToMuPair + 1 -248 m 0 fm 0 fm 0 eV 0 eV 2.03 m 2.03 m Iron AnnihiToMuPair ********************************************************************************************************* * G4Track Information: Particle = mu-, Track ID = 3, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -248 m 0 fm 0 fm 967 GeV 0 eV 0 fm 0 fm Iron initStep - 1 -196 m 5.2 cm 1.19 cm 700 GeV 268 GeV 51.6 m 51.6 m Iron muIoni - 2 -153 m 13.8 cm -2.57 mm 470 GeV 230 GeV 43.3 m 94.9 m Iron muIoni - 3 -119 m 24.7 cm -879 um 357 GeV 112 GeV 34.2 m 129 m Iron muIoni - 4 -89.9 m 38.7 cm 3.99 mm 278 GeV 79 GeV 28.6 m 158 m Iron muIoni - 5 -65.9 m 50.1 cm -4.75 mm 216 GeV 62.4 GeV 24 m 182 m Iron muIoni - 6 -45.9 m 63.9 cm -1.33 cm 175 GeV 41.4 GeV 20 m 202 m Iron muIoni - 7 -28.9 m 71.5 cm 1.89 cm 130 GeV 44.4 GeV 17 m 219 m Iron muIoni - 8 -15.4 m 82 cm 5.7 mm 104 GeV 26.4 GeV 13.5 m 232 m Iron muIoni - 9 -4.27 m 91.7 cm 9.62 cm 79.9 GeV 23.9 GeV 11.2 m 243 m Iron muIoni - 10 4.7 m 93.7 cm 24.2 cm 64.6 GeV 15.3 GeV 8.97 m 252 m Iron muIoni - 11 12.2 m 95.8 cm 37.9 cm 51.3 GeV 13.3 GeV 7.47 m 260 m Iron muIoni - 12 18.3 m 95 cm 54 cm 41.3 GeV 10 GeV 6.1 m 266 m Iron muIoni - 13 23.3 m 92 cm 63.1 cm 33.1 GeV 8.15 GeV 5.04 m 271 m Iron muIoni - 14 27.4 m 85.2 cm 68.7 cm 26.3 GeV 6.79 GeV 4.14 m 275 m Iron muIoni - 15 30.8 m 76.3 cm 73.6 cm 21.5 GeV 4.85 GeV 3.37 m 278 m Iron muIoni - 16 33.6 m 68.3 cm 77.2 cm 16.8 GeV 4.68 GeV 2.8 m 281 m Iron muIoni - 17 35.8 m 62.5 cm 77.7 cm 13.1 GeV 3.73 GeV 2.24 m 283 m Iron muIoni - 18 37.6 m 58 cm 78.4 cm 10.8 GeV 2.25 GeV 1.79 m 285 m Iron muIoni - 19 39.1 m 56.4 cm 77.1 cm 8.77 GeV 2.07 GeV 1.5 m 287 m Iron muIoni - 20 40.4 m 59.3 cm 77.4 cm 7.15 GeV 1.61 GeV 1.24 m 288 m Iron muIoni - 21 41.4 m 60.3 cm 78.5 cm 5.87 GeV 1.29 GeV 1.03 m 289 m Iron muIoni - 22 42.3 m 61.6 cm 79.5 cm 4.66 GeV 1.21 GeV 85.8 cm 290 m Iron muIoni - 23 43 m 65.1 cm 79.3 cm 3.59 GeV 1.07 GeV 69.4 cm 291 m Iron muIoni - 24 43.5 m 68.2 cm 79.8 cm 2.91 GeV 680 MeV 54.5 cm 291 m Iron muIoni - 25 44 m 69.3 cm 81.7 cm 2.36 GeV 547 MeV 44.9 cm 292 m Iron muIoni - 26 44.3 m 70.3 cm 82.8 cm 1.93 GeV 427 MeV 36.9 cm 292 m Iron muIoni - 27 44.6 m 70.5 cm 83.8 cm 1.43 GeV 504 MeV 30.6 cm 292 m Iron muIoni - 28 44.9 m 69.8 cm 84.8 cm 1.11 GeV 317 MeV 23 cm 292 m Iron muIoni - 29 45 m 69 cm 86.1 cm 898 MeV 211 MeV 18 cm 293 m Iron muIoni - 30 45.2 m 70.9 cm 82.5 cm 695 MeV 203 MeV 14.6 cm 293 m Iron muIoni - 31 45.3 m 71.6 cm 79.7 cm 563 MeV 131 MeV 11.3 cm 293 m Iron muIoni - 32 45.4 m 73.2 cm 78 cm 451 MeV 112 MeV 9.15 cm 293 m Iron muIoni - 33 45.4 m 74.4 cm 77.4 cm 345 MeV 106 MeV 7.24 cm 293 m Iron muIoni - 34 45.5 m 75 cm 76.9 cm 280 MeV 64.5 MeV 5.42 cm 293 m Iron muIoni - 35 45.5 m 75.9 cm 77.1 cm 229 MeV 51.3 MeV 4.31 cm 293 m Iron muIoni - 36 45.6 m 76.6 cm 77.2 cm 187 MeV 42.4 MeV 3.42 cm 293 m Iron muIoni - 37 45.6 m 77 cm 77.5 cm 159 MeV 27.5 MeV 2.7 cm 293 m Iron muIoni - 38 45.6 m 77.6 cm 77.6 cm 135 MeV 24.5 MeV 2.23 cm 293 m Iron muIoni - 39 45.6 m 78.4 cm 77.8 cm 115 MeV 20 MeV 1.82 cm 293 m Iron muIoni - 40 45.7 m 78.9 cm 77.9 cm 96.3 MeV 18.3 MeV 1.5 cm 293 m Iron muIoni - 41 45.7 m 79.5 cm 78 cm 77.8 MeV 18.6 MeV 1.21 cm 293 m Iron muIoni - 42 45.7 m 80 cm 78.2 cm 65.4 MeV 12.4 MeV 9.29 mm 293 m Iron muIoni - 43 45.7 m 80.4 cm 78.3 cm 54.4 MeV 11 MeV 7.54 mm 293 m Iron muIoni - 44 45.7 m 80.7 cm 78.4 cm 44.7 MeV 9.73 MeV 6.08 mm 293 m Iron muIoni - 45 45.7 m 80.9 cm 78.5 cm 36.4 MeV 8.28 MeV 4.87 mm 293 m Iron muIoni - 46 45.7 m 81 cm 78.6 cm 28.9 MeV 7.51 MeV 3.92 mm 293 m Iron muIoni - 47 45.7 m 81.2 cm 78.6 cm 21.4 MeV 7.44 MeV 3.14 mm 293 m Iron muIoni - 48 45.7 m 81.3 cm 78.6 cm 14.5 MeV 6.98 MeV 2.43 mm 293 m Iron muIoni - 49 45.7 m 81.4 cm 78.7 cm 7.12 MeV 7.34 MeV 1.79 mm 293 m Iron muIoni - 50 45.7 m 81.4 cm 78.6 cm 0 eV 7.12 MeV 735 um 293 m Iron muIoni - 51 45.7 m 81.4 cm 78.6 cm 0 eV 0 eV 0 fm 293 m Iron Decay + 0 -248 m 0 fm 0 fm 261 GeV 0 eV 0 fm 0 fm Iron initStep + 1 -225 m 5.39 cm -7.19 cm 192 GeV 68.6 GeV 23 m 23 m Iron muIoni + 2 -207 m 12.6 cm -14.4 cm 148 GeV 44.5 GeV 18.3 m 41.3 m Iron muIoni + 3 -192 m 24.4 cm -21.2 cm 120 GeV 28.1 GeV 14.9 m 56.2 m Iron muIoni + 4 -179 m 31.3 cm -29.1 cm 96 GeV 23.7 GeV 12.6 m 68.8 m Iron muIoni + 5 -169 m 38.9 cm -39.4 cm 74.7 GeV 21.3 GeV 10.5 m 79.2 m Iron muIoni + 6 -160 m 47.2 cm -50.8 cm 59.2 GeV 15.5 GeV 8.46 m 87.7 m Iron muIoni + 7 -153 m 57.5 cm -59.7 cm 45.7 GeV 13.5 GeV 6.91 m 94.6 m Iron muIoni + 8 -148 m 61.8 cm -68.5 cm 36.9 GeV 8.81 GeV 5.51 m 100 m Iron muIoni + 9 -143 m 62 cm -72.1 cm 30.2 GeV 6.65 GeV 4.56 m 105 m Iron muIoni + 10 -139 m 61.8 cm -72.5 cm 24.2 GeV 6 GeV 3.81 m 108 m Iron muIoni + 11 -136 m 60.6 cm -68.3 cm 19.7 GeV 4.52 GeV 3.13 m 112 m Iron muIoni + 12 -134 m 63.1 cm -61.2 cm 16.2 GeV 3.56 GeV 2.6 m 114 m Iron muIoni + 13 -132 m 63.6 cm -55 cm 13 GeV 3.17 GeV 2.17 m 116 m Iron muIoni + 14 -130 m 66.3 cm -51.8 cm 10.6 GeV 2.44 GeV 1.78 m 118 m Iron muIoni + 15 -128 m 68.9 cm -50.7 cm 8.66 GeV 1.9 GeV 1.47 m 120 m Iron muIoni + 16 -127 m 71.4 cm -49.6 cm 7.07 GeV 1.6 GeV 1.23 m 121 m Iron muIoni + 17 -126 m 73.6 cm -47 cm 5.57 GeV 1.5 GeV 1.02 m 122 m Iron muIoni + 18 -125 m 77.1 cm -48.7 cm 4.43 GeV 1.14 GeV 81.8 cm 123 m Iron muIoni + 19 -125 m 80.3 cm -51.1 cm 3.52 GeV 902 MeV 66.2 cm 123 m Iron muIoni + 20 -124 m 85.4 cm -52.5 cm 2.86 GeV 668 MeV 53.7 cm 124 m Iron muIoni + 21 -124 m 88.9 cm -52.1 cm 2.29 GeV 563 MeV 44.2 cm 124 m Iron muIoni + 22 -123 m 90 cm -52.6 cm 1.86 GeV 431 MeV 36 cm 125 m Iron muIoni + 23 -123 m 90.6 cm -53.1 cm 1.52 GeV 345 MeV 29.6 cm 125 m Iron muIoni + 24 -123 m 92.1 cm -53.6 cm 1.24 GeV 282 MeV 24.4 cm 125 m Iron muIoni + 25 -123 m 93.1 cm -54.6 cm 1.01 GeV 225 MeV 20 cm 125 m Iron muIoni + 26 -122 m 94.2 cm -56.6 cm 820 MeV 192 MeV 16.5 cm 126 m Iron muIoni + 27 -122 m 95.8 cm -57.6 cm 665 MeV 155 MeV 13.4 cm 126 m Iron muIoni + 28 -122 m 97 cm -58.5 cm 547 MeV 118 MeV 10.8 cm 126 m Iron muIoni + 29 -122 m 98.6 cm -59.2 cm 462 MeV 84.9 MeV 8.87 cm 126 m Iron muIoni + 30 -122 m 1.01 m -59.5 cm 366 MeV 96 MeV 7.44 cm 126 m Iron muIoni + 31 -122 m 1.03 m -59.6 cm 291 MeV 75.1 MeV 5.8 cm 126 m Iron muIoni + 32 -122 m 1.04 m -59.7 cm 242 MeV 49.8 MeV 4.5 cm 126 m Iron muIoni + 33 -122 m 1.05 m -59.5 cm 202 MeV 39.8 MeV 3.64 cm 126 m Iron muIoni + 34 -122 m 1.06 m -59.4 cm 171 MeV 30.9 MeV 2.95 cm 126 m Iron muIoni + 35 -122 m 1.07 m -59.3 cm 138 MeV 32.7 MeV 2.43 cm 126 m Iron muIoni + 36 -122 m 1.07 m -59.2 cm 113 MeV 25.1 MeV 1.88 cm 126 m Iron muIoni + 37 -122 m 1.07 m -59 cm 94.9 MeV 18.1 MeV 1.47 cm 126 m Iron muIoni + 38 -122 m 1.08 m -59.5 cm 78.4 MeV 16.5 MeV 1.19 cm 126 m Iron muIoni + 39 -122 m 1.08 m -59.9 cm 65.3 MeV 13 MeV 9.37 mm 126 m Iron muIoni + 40 -122 m 1.08 m -60.1 cm 54.1 MeV 11.3 MeV 7.53 mm 126 m Iron muIoni + 41 -122 m 1.09 m -60.3 cm 42.7 MeV 11.4 MeV 6.03 mm 126 m Iron muIoni + 42 -122 m 1.09 m -60.5 cm 34.4 MeV 8.3 MeV 4.63 mm 126 m Iron muIoni + 43 -122 m 1.09 m -60.6 cm 26.4 MeV 7.96 MeV 3.71 mm 126 m Iron muIoni + 44 -122 m 1.09 m -60.7 cm 18.4 MeV 8.04 MeV 2.9 mm 126 m Iron muIoni + 45 -122 m 1.09 m -60.8 cm 12 MeV 6.43 MeV 2.16 mm 126 m Iron muIoni + 46 -122 m 1.09 m -60.9 cm 4.63 MeV 7.33 MeV 1.52 mm 126 m Iron muIoni + 47 -122 m 1.09 m -60.9 cm 0 eV 4.63 MeV 345 um 126 m Iron muIoni + 48 -122 m 1.09 m -60.9 cm 0 eV 0 eV 0 fm 126 m Iron Decay ********************************************************************************************************* * G4Track Information: Particle = e-, Track ID = 6, Parent ID = 3 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 45.7 m 81.4 cm 78.6 cm 48.5 MeV 0 eV 0 fm 0 fm Iron initStep - 1 45.7 m 80.9 cm 79 cm 31 MeV 17.5 MeV 6.23 mm 6.23 mm Iron eIoni - 2 45.7 m 80.5 cm 79.3 cm 18.3 MeV 12.7 MeV 5.11 mm 1.13 cm Iron eIoni - 3 45.7 m 80.1 cm 79.2 cm 6.91 MeV 11.4 MeV 4 mm 1.53 cm Iron eIoni - 4 45.7 m 79.9 cm 79.2 cm 2.5 MeV 4.41 MeV 2.59 mm 1.79 cm Iron eIoni - 5 45.7 m 79.9 cm 79.3 cm 439 keV 2.06 MeV 1.66 mm 1.96 cm Iron eIoni - 6 45.7 m 79.9 cm 79.3 cm 0 eV 439 keV 266 um 1.99 cm Iron eIoni + 0 -122 m 1.09 m -60.9 cm 35.6 MeV 0 eV 0 fm 0 fm Iron initStep + 1 -122 m 1.1 m -61.1 cm 22.7 MeV 12.9 MeV 5.43 mm 5.43 mm Iron eIoni + 2 -122 m 1.1 m -61.1 cm 15.2 MeV 7.51 MeV 4.42 mm 9.85 mm Iron eIoni + 3 -122 m 1.11 m -61.3 cm 9.01 MeV 6.16 MeV 3.67 mm 1.35 cm Iron eIoni + 4 -122 m 1.11 m -61.4 cm 5.49 MeV 3.52 MeV 2.9 mm 1.64 cm Iron eIoni + 5 -122 m 1.11 m -61.5 cm 2.82 MeV 2.67 MeV 2.35 mm 1.88 cm Iron eIoni + 6 -122 m 1.11 m -61.5 cm 0 eV 2.82 MeV 1.75 mm 2.05 cm Iron eIoni ********************************************************************************************************* * G4Track Information: Particle = anti_nu_e, Track ID = 5, Parent ID = 3 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 45.7 m 81.4 cm 78.6 cm 19.3 MeV 0 eV 0 fm 0 fm Iron initStep - 1 -2.37 m 83.5 m -250 m 19.3 MeV 0 eV 268 m 268 m OutOfWorld Transportation + 0 -122 m 1.09 m -60.9 cm 27.7 MeV 0 eV 0 fm 0 fm Iron initStep + 1 250 m -227 m 33.5 m 27.7 MeV 0 eV 437 m 437 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = nu_mu, Track ID = 4, Parent ID = 3 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 45.7 m 81.4 cm 78.6 cm 36.8 MeV 0 eV 0 fm 0 fm Iron initStep - 1 79.5 m 250 m -43.1 m 36.8 MeV 0 eV 255 m 255 m OutOfWorld Transportation + 0 -122 m 1.09 m -60.9 cm 41.3 MeV 0 eV 0 fm 0 fm Iron initStep + 1 -250 m -60.6 m 17.5 m 41.3 MeV 0 eV 143 m 143 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = mu+, Track ID = 2, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -248 m 0 fm 0 fm 32.5 GeV 0 eV 0 fm 0 fm Iron initStep - 1 -244 m -9.47 mm 6.86 mm 26.4 GeV 6.1 GeV 4.06 m 4.06 m Iron muIoni - 2 -240 m -2.5 cm 1.71 cm 19.5 GeV 6.83 GeV 3.37 m 7.42 m Iron muIoni - 3 -238 m -3.36 cm 4.03 cm 16.1 GeV 3.42 GeV 2.57 m 9.99 m Iron muIoni - 4 -235 m -8.24 mm 3.43 cm 13.2 GeV 2.91 GeV 2.16 m 12.1 m Iron muIoni - 5 -234 m 1.75 cm 1.05 cm 10.9 GeV 2.28 GeV 1.8 m 13.9 m Iron muIoni - 6 -232 m 4.54 cm -5.04 mm 8.56 GeV 2.37 GeV 1.51 m 15.5 m Iron muIoni - 7 -231 m 9.98 cm -1.38 cm 7.01 GeV 1.54 GeV 1.21 m 16.7 m Iron muIoni - 8 -230 m 12.4 cm 1.81 cm 5.71 GeV 1.3 GeV 1.01 m 17.7 m Iron muIoni - 9 -229 m 14.6 cm 2.17 cm 4.69 GeV 1.02 GeV 83.6 cm 18.5 m Iron muIoni - 10 -228 m 17.5 cm 2.28 cm 3.84 GeV 853 MeV 69.7 cm 19.2 m Iron muIoni - 11 -228 m 20.7 cm 1.4 cm 3.06 GeV 776 MeV 58 cm 19.8 m Iron muIoni - 12 -227 m 21.6 cm -7.93 mm 2.46 GeV 603 MeV 47 cm 20.3 m Iron muIoni - 13 -227 m 24.9 cm -2.69 cm 1.98 GeV 477 MeV 38.3 cm 20.6 m Iron muIoni - 14 -227 m 28 cm -2.97 cm 1.59 GeV 393 MeV 31.3 cm 21 m Iron muIoni - 15 -226 m 29.8 cm -3.43 cm 1.28 GeV 306 MeV 25.4 cm 21.2 m Iron muIoni - 16 -226 m 32.6 cm -5.35 cm 1.05 GeV 229 MeV 20.7 cm 21.4 m Iron muIoni - 17 -226 m 34.2 cm -7.42 cm 845 MeV 208 MeV 17.1 cm 21.6 m Iron muIoni - 18 -226 m 36.7 cm -9.2 cm 683 MeV 162 MeV 13.8 cm 21.7 m Iron muIoni - 19 -226 m 38.5 cm -10.7 cm 557 MeV 127 MeV 11.1 cm 21.8 m Iron muIoni - 20 -226 m 38.4 cm -11.4 cm 462 MeV 94.5 MeV 9.01 cm 21.9 m Iron muIoni - 21 -226 m 38.1 cm -12.3 cm 386 MeV 76.1 MeV 7.42 cm 22 m Iron muIoni - 22 -226 m 37.6 cm -13.5 cm 318 MeV 68 MeV 6.12 cm 22.1 m Iron muIoni - 23 -225 m 37.1 cm -14.6 cm 256 MeV 61.8 MeV 4.95 cm 22.1 m Iron muIoni - 24 -225 m 37.1 cm -15.4 cm 208 MeV 48.5 MeV 3.88 cm 22.2 m Iron muIoni - 25 -225 m 37.4 cm -15.5 cm 167 MeV 40.2 MeV 3.05 cm 22.2 m Iron muIoni - 26 -225 m 36.7 cm -15.5 cm 138 MeV 29.5 MeV 2.36 cm 22.2 m Iron muIoni - 27 -225 m 36 cm -15.9 cm 116 MeV 21.9 MeV 1.87 cm 22.2 m Iron muIoni - 28 -225 m 35.5 cm -16.1 cm 97.5 MeV 18.5 MeV 1.51 cm 22.2 m Iron muIoni - 29 -225 m 35.1 cm -16.4 cm 82.6 MeV 14.9 MeV 1.22 cm 22.3 m Iron muIoni - 30 -225 m 35 cm -16.7 cm 68.1 MeV 14.5 MeV 9.98 mm 22.3 m Iron muIoni - 31 -225 m 34.8 cm -16.9 cm 57.4 MeV 10.7 MeV 7.91 mm 22.3 m Iron muIoni - 32 -225 m 34.6 cm -17.1 cm 47.6 MeV 9.8 MeV 6.47 mm 22.3 m Iron muIoni - 33 -225 m 34.5 cm -17.2 cm 40.1 MeV 7.5 MeV 5.22 mm 22.3 m Iron muIoni - 34 -225 m 34.3 cm -17.4 cm 32.5 MeV 7.61 MeV 4.33 mm 22.3 m Iron muIoni - 35 -225 m 34.2 cm -17.4 cm 25 MeV 7.58 MeV 3.5 mm 22.3 m Iron muIoni - 36 -225 m 34.1 cm -17.6 cm 17.7 MeV 7.28 MeV 2.75 mm 22.3 m Iron muIoni - 37 -225 m 34 cm -17.7 cm 11 MeV 6.66 MeV 2.09 mm 22.3 m Iron muIoni - 38 -225 m 34 cm -17.7 cm 3.06 MeV 7.95 MeV 1.41 mm 22.3 m Iron muIoni - 39 -225 m 34 cm -17.7 cm 0 eV 3.06 MeV 167 um 22.3 m Iron muIoni - 40 -225 m 34 cm -17.7 cm 0 eV 0 eV 0 fm 22.3 m Iron Decay + 0 -248 m 0 fm 0 fm 739 GeV 0 eV 0 fm 0 fm Iron initStep + 1 -203 m -4.92 cm -2.51 cm 549 GeV 190 GeV 44.6 m 44.6 m Iron muIoni + 2 -166 m -4.42 mm -4.8 cm 394 GeV 155 GeV 37.6 m 82.2 m Iron muIoni + 3 -135 m 2.72 cm 2.71 cm 297 GeV 97.1 GeV 30.5 m 113 m Iron muIoni + 4 -110 m -5.38 cm 8.79 cm 227 GeV 69.2 GeV 25.1 m 138 m Iron muIoni + 5 -89.4 m -6.97 cm 8.05 cm 173 GeV 54.1 GeV 20.7 m 159 m Iron muIoni + 6 -72.5 m -11.1 cm 11.7 cm 104 GeV 69.7 GeV 16.9 m 175 m Iron muIoni + 7 -61.4 m -13.3 cm 6.73 cm 85.3 GeV 18.4 GeV 11.2 m 187 m Iron muIoni + 8 -51.9 m -11.7 cm 3.37 cm 66.7 GeV 18.7 GeV 9.46 m 196 m Iron muIoni + 9 -44.2 m -3 cm 24.9 cm 52.9 GeV 13.7 GeV 7.66 m 204 m Iron muIoni + 10 -38 m 1.94 cm 50 cm 42.9 GeV 10.1 GeV 6.26 m 210 m Iron muIoni + 11 -32.8 m 8.5 cm 72 cm 34.8 GeV 8.01 GeV 5.2 m 215 m Iron muIoni + 12 -28.5 m 15.5 cm 86 cm 28.5 GeV 6.35 GeV 4.32 m 220 m Iron muIoni + 13 -24.9 m 20.6 cm 93.3 cm 23.5 GeV 4.98 GeV 3.61 m 223 m Iron muIoni + 14 -21.8 m 21.3 cm 1.01 m 18.7 GeV 4.87 GeV 3.04 m 226 m Iron muIoni + 15 -19.4 m 21 cm 1.07 m 14.4 GeV 4.27 GeV 2.46 m 229 m Iron muIoni + 16 -17.4 m 21.9 cm 1.14 m 11.7 GeV 2.66 GeV 1.94 m 231 m Iron muIoni + 17 -15.8 m 26.1 cm 1.17 m 8.9 GeV 2.82 GeV 1.61 m 232 m Iron muIoni + 18 -14.6 m 29.4 cm 1.19 m 7.03 GeV 1.87 GeV 1.26 m 233 m Iron muIoni + 19 -13.6 m 34.5 cm 1.21 m 5.66 GeV 1.38 GeV 1.01 m 234 m Iron muIoni + 20 -12.7 m 42.6 cm 1.23 m 4.56 GeV 1.09 GeV 82.8 cm 235 m Iron muIoni + 21 -12.1 m 49.9 cm 1.26 m 3.66 GeV 907 MeV 68 cm 236 m Iron muIoni + 22 -11.5 m 54.8 cm 1.28 m 2.95 GeV 710 MeV 55.4 cm 237 m Iron muIoni + 23 -11.1 m 60.7 cm 1.28 m 2.41 GeV 533 MeV 45.4 cm 237 m Iron muIoni + 24 -10.7 m 64.7 cm 1.26 m 1.92 GeV 494 MeV 37.7 cm 237 m Iron muIoni + 25 -10.4 m 69.7 cm 1.25 m 1.54 GeV 377 MeV 30.4 cm 238 m Iron muIoni + 26 -10.1 m 73.5 cm 1.24 m 1.24 GeV 298 MeV 24.7 cm 238 m Iron muIoni + 27 -9.94 m 74 cm 1.24 m 1.02 GeV 222 MeV 20.1 cm 238 m Iron muIoni + 28 -9.77 m 73.9 cm 1.23 m 844 MeV 178 MeV 16.6 cm 238 m Iron muIoni + 29 -9.63 m 73.5 cm 1.22 m 684 MeV 160 MeV 13.7 cm 238 m Iron muIoni + 30 -9.52 m 72.9 cm 1.21 m 541 MeV 144 MeV 11.1 cm 238 m Iron muIoni + 31 -9.44 m 73.2 cm 1.2 m 430 MeV 111 MeV 8.74 cm 239 m Iron muIoni + 32 -9.37 m 74 cm 1.2 m 340 MeV 90 MeV 6.87 cm 239 m Iron muIoni + 33 -9.32 m 73.1 cm 1.2 m 276 MeV 64.3 MeV 5.33 cm 239 m Iron muIoni + 34 -9.28 m 72 cm 1.21 m 234 MeV 41.8 MeV 4.22 cm 239 m Iron muIoni + 35 -9.24 m 71.1 cm 1.21 m 186 MeV 47.8 MeV 3.5 cm 239 m Iron muIoni + 36 -9.22 m 70.9 cm 1.22 m 157 MeV 29.2 MeV 2.68 cm 239 m Iron muIoni + 37 -9.2 m 70.5 cm 1.22 m 132 MeV 24.8 MeV 2.19 cm 239 m Iron muIoni + 38 -9.18 m 70 cm 1.22 m 112 MeV 20.7 MeV 1.78 cm 239 m Iron muIoni + 39 -9.16 m 69.6 cm 1.22 m 93 MeV 18.5 MeV 1.44 cm 239 m Iron muIoni + 40 -9.15 m 69.3 cm 1.22 m 78.6 MeV 14.4 MeV 1.16 cm 239 m Iron muIoni + 41 -9.14 m 69.1 cm 1.22 m 64.7 MeV 14 MeV 9.39 mm 239 m Iron muIoni + 42 -9.14 m 68.9 cm 1.22 m 53.2 MeV 11.5 MeV 7.42 mm 239 m Iron muIoni + 43 -9.13 m 68.9 cm 1.22 m 42.9 MeV 10.3 MeV 5.92 mm 239 m Iron muIoni + 44 -9.13 m 69 cm 1.22 m 34.7 MeV 8.23 MeV 4.66 mm 239 m Iron muIoni + 45 -9.12 m 69 cm 1.22 m 27 MeV 7.65 MeV 3.74 mm 239 m Iron muIoni + 46 -9.12 m 69.1 cm 1.22 m 20.9 MeV 6.15 MeV 2.96 mm 239 m Iron muIoni + 47 -9.12 m 69.2 cm 1.22 m 13.9 MeV 6.97 MeV 2.38 mm 239 m Iron muIoni + 48 -9.12 m 69.2 cm 1.22 m 6.33 MeV 7.56 MeV 1.74 mm 239 m Iron muIoni + 49 -9.12 m 69.2 cm 1.22 m 0 eV 6.33 MeV 596 um 239 m Iron muIoni + 50 -9.12 m 69.2 cm 1.22 m 0 eV 0 eV 0 fm 239 m Iron Decay ********************************************************************************************************* * G4Track Information: Particle = e+, Track ID = 9, Parent ID = 2 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -225 m 34 cm -17.7 cm 42.4 MeV 0 eV 0 fm 0 fm Iron initStep - 1 -22.9 m 250 m -106 m 42.4 MeV 0 eV 338 m 338 m OutOfWorld Transportation + 0 -9.12 m 69.2 cm 1.22 m 34.4 MeV 0 eV 0 fm 0 fm Iron initStep + 1 98.9 m 95.1 m -250 m 34.4 MeV 0 eV 289 m 289 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = nu_e, Track ID = 8, Parent ID = 2 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -225 m 34 cm -17.7 cm 22.2 MeV 0 eV 0 fm 0 fm Iron initStep - 1 -250 m -26.8 m -44.2 m 22.2 MeV 0 eV 57.3 m 57.3 m OutOfWorld Transportation + 0 -9.12 m 69.2 cm 1.22 m 35.5 MeV 0 eV 0 fm 0 fm Iron initStep + 1 208 m -149 m 250 m 35.5 MeV 0 eV 363 m 363 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = anti_nu_mu, Track ID = 7, Parent ID = 2 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -225 m 34 cm -17.7 cm 40 MeV 0 eV 0 fm 0 fm Iron initStep - 1 -250 m -32.1 m 47.2 m 40 MeV 0 eV 62.5 m 62.5 m OutOfWorld Transportation + 0 -9.12 m 69.2 cm 1.22 m 34.7 MeV 0 eV 0 fm 0 fm Iron initStep + 1 -250 m 24.9 m 40.5 m 34.7 MeV 0 eV 245 m 245 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = e+, Track ID = 1, Parent ID = 0 @@ -900,164 +909,167 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process 0 -250 m 0 fm 0 fm 1e+03 GeV 0 eV 0 fm 0 fm Iron initStep - 1 -234 m 0 fm 0 fm 0 eV 0 eV 16.1 m 16.1 m Iron AnnihiToMuPair + 1 -249 m 0 fm 0 fm 0 eV 0 eV 1.24 m 1.24 m Iron AnnihiToMuPair ********************************************************************************************************* * G4Track Information: Particle = mu-, Track ID = 3, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -234 m 0 fm 0 fm 40 GeV 0 eV 0 fm 0 fm Iron initStep - 1 -229 m -4.02 cm 9.77 mm 30.4 GeV 9.56 GeV 4.9 m 4.9 m Iron muIoni - 2 -225 m -4 cm -3.03 cm 21.6 GeV 8.78 GeV 3.83 m 8.73 m Iron muIoni - 3 -222 m -5.81 cm -1.74 cm 17.5 GeV 4.14 GeV 2.82 m 11.6 m Iron muIoni - 4 -220 m -7.63 cm -8.56 mm 14.5 GeV 3.03 GeV 2.33 m 13.9 m Iron muIoni - 5 -218 m -9.16 cm 9.43 mm 11.9 GeV 2.62 GeV 1.96 m 15.8 m Iron muIoni - 6 -216 m -11.1 cm 3.95 cm 9.64 GeV 2.21 GeV 1.63 m 17.5 m Iron muIoni - 7 -215 m -12.6 cm 5.01 cm 7.09 GeV 2.55 GeV 1.35 m 18.8 m Iron muIoni - 8 -214 m -11.3 cm 7.7 cm 5.38 GeV 1.72 GeV 1.02 m 19.8 m Iron muIoni - 9 -213 m -10 cm 11.2 cm 4.42 GeV 955 MeV 79.2 cm 20.6 m Iron muIoni - 10 -213 m -8.06 cm 15.6 cm 3.56 GeV 863 MeV 66.2 cm 21.3 m Iron muIoni - 11 -212 m -7.85 cm 19.5 cm 2.86 GeV 702 MeV 54.1 cm 21.8 m Iron muIoni - 12 -212 m -9.02 cm 20.4 cm 2.33 GeV 530 MeV 44.1 cm 22.3 m Iron muIoni - 13 -211 m -9.36 cm 20.1 cm 1.92 GeV 409 MeV 36.5 cm 22.6 m Iron muIoni - 14 -211 m -9.4 cm 21.3 cm 1.55 GeV 368 MeV 30.4 cm 22.9 m Iron muIoni - 15 -211 m -10.1 cm 22.6 cm 1.27 GeV 284 MeV 24.9 cm 23.2 m Iron muIoni - 16 -211 m -10.9 cm 23.2 cm 1.01 GeV 258 MeV 20.5 cm 23.4 m Iron muIoni - 17 -210 m -11.6 cm 24 cm 801 MeV 206 MeV 16.4 cm 23.6 m Iron muIoni - 18 -210 m -13.3 cm 25.2 cm 608 MeV 192 MeV 13.1 cm 23.7 m Iron muIoni - 19 -210 m -13.8 cm 26.2 cm 458 MeV 150 MeV 9.9 cm 23.8 m Iron muIoni - 20 -210 m -14.7 cm 27.1 cm 376 MeV 82 MeV 7.37 cm 23.9 m Iron muIoni - 21 -210 m -15.3 cm 27.4 cm 314 MeV 62.3 MeV 5.97 cm 23.9 m Iron muIoni - 22 -210 m -15 cm 27.8 cm 265 MeV 49 MeV 4.89 cm 24 m Iron muIoni - 23 -210 m -14.7 cm 28.5 cm 217 MeV 47.8 MeV 4.05 cm 24 m Iron muIoni - 24 -210 m -14.8 cm 28.8 cm 176 MeV 41.8 MeV 3.22 cm 24.1 m Iron muIoni - 25 -210 m -14.7 cm 28.6 cm 140 MeV 35.7 MeV 2.51 cm 24.1 m Iron muIoni - 26 -210 m -14.6 cm 28.7 cm 117 MeV 23 MeV 1.91 cm 24.1 m Iron muIoni - 27 -210 m -14.7 cm 28.5 cm 94.2 MeV 22.6 MeV 1.53 cm 24.1 m Iron muIoni - 28 -210 m -14.8 cm 28.3 cm 77.9 MeV 16.3 MeV 1.18 cm 24.1 m Iron muIoni - 29 -210 m -14.8 cm 28 cm 64.7 MeV 13.2 MeV 9.31 mm 24.1 m Iron muIoni - 30 -210 m -14.9 cm 27.7 cm 53.9 MeV 10.8 MeV 7.44 mm 24.1 m Iron muIoni - 31 -210 m -14.8 cm 27.6 cm 42.8 MeV 11 MeV 6.01 mm 24.1 m Iron muIoni - 32 -210 m -14.8 cm 27.5 cm 33.4 MeV 9.41 MeV 4.65 mm 24.2 m Iron muIoni - 33 -210 m -14.9 cm 27.4 cm 24.6 MeV 8.77 MeV 3.6 mm 24.2 m Iron muIoni - 34 -210 m -14.9 cm 27.3 cm 17.1 MeV 7.52 MeV 2.72 mm 24.2 m Iron muIoni - 35 -210 m -14.9 cm 27.2 cm 10 MeV 7.08 MeV 2.04 mm 24.2 m Iron muIoni - 36 -210 m -15 cm 27.2 cm 1.04 MeV 9.01 MeV 1.27 mm 24.2 m Iron muIoni - 37 -210 m -15 cm 27.2 cm 0 eV 1.04 MeV 25.7 um 24.2 m Iron muIoni - 38 -210 m -15 cm 27.2 cm 0 eV 0 eV 0 fm 24.2 m Iron Decay + 0 -249 m 0 fm 0 fm 560 GeV 0 eV 0 fm 0 fm Iron initStep + 1 -211 m 4.08 cm 3.82 cm 424 GeV 136 GeV 38.1 m 38.1 m Iron muIoni + 2 -179 m 2.78 cm 13.1 cm 321 GeV 102 GeV 32 m 70.1 m Iron muIoni + 3 -152 m -10.1 cm 14.7 cm 218 GeV 104 GeV 26.6 m 96.7 m Iron muIoni + 4 -132 m -17.2 cm 17.3 cm 175 GeV 42.7 GeV 20.1 m 117 m Iron muIoni + 5 -115 m -22.7 cm 14.8 cm 140 GeV 35.2 GeV 17 m 134 m Iron muIoni + 6 -101 m -27.2 cm 18.6 cm 110 GeV 29.7 GeV 14.3 m 148 m Iron muIoni + 7 -88.9 m -38.2 cm 20.9 cm 89.6 GeV 20.8 GeV 11.8 m 160 m Iron muIoni + 8 -79 m -43.5 cm 27.1 cm 73.6 GeV 16 GeV 9.87 m 170 m Iron muIoni + 9 -70.7 m -46.6 cm 32.1 cm 59.6 GeV 14 GeV 8.35 m 178 m Iron muIoni + 10 -63.7 m -46.5 cm 42.3 cm 47.6 GeV 12 GeV 6.96 m 185 m Iron muIoni + 11 -58 m -50.1 cm 44.3 cm 38.5 GeV 9.11 GeV 5.71 m 191 m Iron muIoni + 12 -53.3 m -55.8 cm 47 cm 30.8 GeV 7.69 GeV 4.73 m 195 m Iron muIoni + 13 -49.4 m -53.9 cm 45.9 cm 24 GeV 6.76 GeV 3.87 m 199 m Iron muIoni + 14 -46.3 m -54.8 cm 44.2 cm 16.8 GeV 7.23 GeV 3.1 m 202 m Iron muIoni + 15 -44.1 m -57.7 cm 43.9 cm 6.49 GeV 10.3 GeV 2.24 m 205 m Iron muIoni + 16 -43.1 m -58.9 cm 43 cm 5.15 GeV 1.34 GeV 94.2 cm 206 m Iron muIoni + 17 -42.4 m -57.4 cm 43.8 cm 4 GeV 1.15 GeV 76.2 cm 206 m Iron muIoni + 18 -41.8 m -59.1 cm 47.4 cm 3.19 GeV 812 MeV 60.4 cm 207 m Iron muIoni + 19 -41.3 m -61.1 cm 50.9 cm 2.54 GeV 652 MeV 49 cm 207 m Iron muIoni + 20 -40.9 m -63.7 cm 52.4 cm 1.96 GeV 577 MeV 39.6 cm 208 m Iron muIoni + 21 -40.6 m -66.6 cm 52.7 cm 1.5 GeV 459 MeV 31.1 cm 208 m Iron muIoni + 22 -40.3 m -67.1 cm 52.3 cm 1.2 GeV 299 MeV 24.1 cm 208 m Iron muIoni + 23 -40.1 m -66.6 cm 52.4 cm 916 MeV 288 MeV 19.5 cm 209 m Iron muIoni + 24 -40 m -66.4 cm 53.2 cm 743 MeV 173 MeV 14.9 cm 209 m Iron muIoni + 25 -39.9 m -66.5 cm 53.2 cm 531 MeV 212 MeV 12.1 cm 209 m Iron muIoni + 26 -39.8 m -66.3 cm 53.2 cm 438 MeV 92.8 MeV 8.59 cm 209 m Iron muIoni + 27 -39.7 m -65.6 cm 53.6 cm 350 MeV 87.6 MeV 7.02 cm 209 m Iron muIoni + 28 -39.6 m -65.4 cm 53.9 cm 287 MeV 63.6 MeV 5.52 cm 209 m Iron muIoni + 29 -39.6 m -64.9 cm 54.3 cm 220 MeV 66.3 MeV 4.42 cm 209 m Iron muIoni + 30 -39.6 m -64.7 cm 54.4 cm 185 MeV 35.2 MeV 3.27 cm 209 m Iron muIoni + 31 -39.5 m -64.5 cm 54.7 cm 152 MeV 33.4 MeV 2.67 cm 209 m Iron muIoni + 32 -39.5 m -65.6 cm 53 cm 125 MeV 27.1 MeV 2.1 cm 209 m Iron muIoni + 33 -39.5 m -66.6 cm 51.6 cm 95.2 MeV 29.6 MeV 1.66 cm 209 m Iron muIoni + 34 -39.5 m -67.3 cm 50.7 cm 80.2 MeV 15 MeV 1.19 cm 209 m Iron muIoni + 35 -39.5 m -68 cm 50 cm 68.5 MeV 11.7 MeV 9.64 mm 209 m Iron muIoni + 36 -39.5 m -68.6 cm 49.5 cm 55.8 MeV 12.7 MeV 7.97 mm 209 m Iron muIoni + 37 -39.5 m -69.1 cm 49.1 cm 44.9 MeV 10.9 MeV 6.26 mm 209 m Iron muIoni + 38 -39.5 m -69.4 cm 48.8 cm 36.3 MeV 8.61 MeV 4.9 mm 209 m Iron muIoni + 39 -39.5 m -69.7 cm 48.5 cm 27.6 MeV 8.71 MeV 3.92 mm 209 m Iron muIoni + 40 -39.5 m -69.9 cm 48.4 cm 20.8 MeV 6.8 MeV 3.02 mm 209 m Iron muIoni + 41 -39.5 m -70.1 cm 48.2 cm 13.9 MeV 6.89 MeV 2.38 mm 209 m Iron muIoni + 42 -39.5 m -70.2 cm 48.2 cm 6.62 MeV 7.3 MeV 1.74 mm 209 m Iron muIoni + 43 -39.5 m -70.3 cm 48.1 cm 0 eV 6.62 MeV 646 um 209 m Iron muIoni + 44 -39.5 m -70.3 cm 48.1 cm 0 eV 0 eV 0 fm 209 m Iron Decay ********************************************************************************************************* * G4Track Information: Particle = e-, Track ID = 6, Parent ID = 3 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -210 m -15 cm 27.2 cm 27.1 MeV 0 eV 0 fm 0 fm Iron initStep - 1 -210 m -14.8 cm 26.8 cm 18.9 MeV 8.24 MeV 4.21 mm 4.21 mm Iron msc - 2 -210 m -14.9 cm 26.4 cm 11.7 MeV 7.13 MeV 4.06 mm 8.27 mm Iron eIoni - 3 -210 m -14.9 cm 26.1 cm 7.49 MeV 4.24 MeV 3.27 mm 1.15 cm Iron eIoni - 4 -210 m -14.9 cm 26 cm 3.92 MeV 3.58 MeV 2.68 mm 1.42 cm Iron eIoni - 5 -210 m -15 cm 26.1 cm 1.66 MeV 2.25 MeV 2.03 mm 1.62 cm Iron eIoni - 6 -210 m -15 cm 26.1 cm 212 keV 1.45 MeV 1.3 mm 1.76 cm Iron eIoni - 7 -210 m -15 cm 26.1 cm 0 eV 212 keV 91.1 um 1.76 cm Iron eIoni + 0 -39.5 m -70.3 cm 48.1 cm 36.9 MeV 0 eV 0 fm 0 fm Iron initStep + 1 -39.5 m -70.1 cm 47.7 cm 22.1 MeV 14.8 MeV 5.52 mm 5.52 mm Iron eIoni + 2 -39.5 m -69.8 cm 47.3 cm 14.6 MeV 7.5 MeV 4.37 mm 9.89 mm Iron eIoni + 3 -39.5 m -70 cm 47.1 cm 8.37 MeV 6.24 MeV 3.61 mm 1.35 cm Iron eIoni + 4 -39.5 m -70.2 cm 46.9 cm 4.68 MeV 3.69 MeV 2.81 mm 1.63 cm Iron eIoni + 5 -39.5 m -70.2 cm 47.1 cm 2.66 MeV 2.03 MeV 2.19 mm 1.85 cm Iron eIoni + 6 -39.5 m -70.2 cm 47.2 cm 408 keV 2.25 MeV 1.71 mm 2.02 cm Iron eIoni + 7 -39.5 m -70.2 cm 47.2 cm 0 eV 408 keV 240 um 2.04 cm Iron eIoni ********************************************************************************************************* * G4Track Information: Particle = anti_nu_e, Track ID = 5, Parent ID = 3 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -210 m -15 cm 27.2 cm 28.4 MeV 0 eV 0 fm 0 fm Iron initStep - 1 -84.7 m -76 m -250 m 28.4 MeV 0 eV 290 m 290 m OutOfWorld Transportation + 0 -39.5 m -70.3 cm 48.1 cm 18 MeV 0 eV 0 fm 0 fm Iron initStep + 1 -250 m 10.1 m -17.1 m 18 MeV 0 eV 211 m 211 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = nu_mu, Track ID = 4, Parent ID = 3 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -210 m -15 cm 27.2 cm 49.1 MeV 0 eV 0 fm 0 fm Iron initStep - 1 -229 m -3.82 m 250 m 49.1 MeV 0 eV 250 m 250 m OutOfWorld Transportation + 0 -39.5 m -70.3 cm 48.1 cm 49.8 MeV 0 eV 0 fm 0 fm Iron initStep + 1 249 m -69.7 m 250 m 49.8 MeV 0 eV 388 m 388 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = mu+, Track ID = 2, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -234 m 0 fm 0 fm 960 GeV 0 eV 0 fm 0 fm Iron initStep - 1 -183 m 8.58 mm 2.63 mm 705 GeV 254 GeV 51.3 m 51.3 m Iron muIoni - 2 -139 m 5.15 cm -4.29 cm 516 GeV 189 GeV 43.5 m 94.8 m Iron muIoni - 3 -103 m 15.5 cm -8.94 cm 382 GeV 134 GeV 36.2 m 131 m Iron muIoni - 4 -73 m 29.4 cm -10.3 cm 293 GeV 88.9 GeV 29.9 m 161 m Iron muIoni - 5 -48.1 m 42.4 cm -8.24 cm 223 GeV 70.3 GeV 24.9 m 186 m Iron muIoni - 6 -27.7 m 52.5 cm -11.2 cm 171 GeV 52.1 GeV 20.4 m 206 m Iron muIoni - 7 -11 m 58.8 cm -7.35 cm 127 GeV 43.8 GeV 16.7 m 223 m Iron muIoni - 8 2.14 m 64.5 cm -13.9 cm 102 GeV 24.8 GeV 13.2 m 236 m Iron muIoni - 9 13.1 m 73.4 cm -20.1 cm 83.5 GeV 18.4 GeV 11 m 247 m Iron muIoni - 10 22.4 m 83.8 cm -19.3 cm 60.7 GeV 22.9 GeV 9.29 m 256 m Iron muIoni - 11 29.5 m 87.4 cm -15.4 cm 46 GeV 14.6 GeV 7.06 m 263 m Iron muIoni - 12 35 m 91.1 cm -14.1 cm 37 GeV 9.07 GeV 5.54 m 269 m Iron muIoni - 13 39.6 m 94.1 cm -7.88 cm 28.9 GeV 8.1 GeV 4.56 m 273 m Iron muIoni - 14 43.2 m 88.3 cm -10.4 cm 23.3 GeV 5.57 GeV 3.65 m 277 m Iron muIoni - 15 46.2 m 85.4 cm -19.1 cm 19.1 GeV 4.15 GeV 3.01 m 280 m Iron muIoni - 16 48.8 m 81.1 cm -24.2 cm 15.4 GeV 3.77 GeV 2.52 m 283 m Iron muIoni - 17 50.8 m 75.9 cm -28.2 cm 12.5 GeV 2.9 GeV 2.07 m 285 m Iron muIoni - 18 52.5 m 75.6 cm -30.7 cm 9.81 GeV 2.66 GeV 1.71 m 286 m Iron muIoni - 19 53.9 m 76.1 cm -32 cm 7.36 GeV 2.45 GeV 1.37 m 288 m Iron muIoni - 20 55 m 79.1 cm -32.4 cm 5.99 GeV 1.37 GeV 1.05 m 289 m Iron muIoni - 21 55.8 m 83.8 cm -28.8 cm 4.95 GeV 1.04 GeV 87.4 cm 290 m Iron muIoni - 22 56.6 m 87.3 cm -23.8 cm 4.03 GeV 924 MeV 73.3 cm 290 m Iron muIoni - 23 57.2 m 91 cm -17.3 cm 3.24 GeV 784 MeV 60.6 cm 291 m Iron muIoni - 24 57.6 m 92.1 cm -12.7 cm 2.51 GeV 731 MeV 49.6 cm 292 m Iron muIoni - 25 58 m 93.8 cm -7.77 cm 2.06 GeV 450 MeV 39.1 cm 292 m Iron muIoni - 26 58.4 m 93.8 cm -3.44 cm 1.69 GeV 373 MeV 32.5 cm 292 m Iron muIoni - 27 58.6 m 99.5 cm -5.18 cm 1.38 GeV 308 MeV 26.9 cm 293 m Iron muIoni - 28 58.8 m 1.06 m -6.69 cm 1.14 GeV 238 MeV 22.2 cm 293 m Iron muIoni - 29 59 m 1.11 m -7.92 cm 795 MeV 349 MeV 18.5 cm 293 m Iron muIoni - 30 59.1 m 1.15 m -9.95 cm 644 MeV 151 MeV 12.9 cm 293 m Iron muIoni - 31 59.2 m 1.19 m -11.6 cm 534 MeV 110 MeV 10.5 cm 293 m Iron muIoni - 32 59.3 m 1.22 m -12.3 cm 443 MeV 90.8 MeV 8.63 cm 293 m Iron muIoni - 33 59.4 m 1.25 m -13.1 cm 365 MeV 77.5 MeV 7.09 cm 293 m Iron muIoni - 34 59.4 m 1.27 m -14.1 cm 302 MeV 63.5 MeV 5.76 cm 293 m Iron muIoni - 35 59.5 m 1.29 m -15.1 cm 238 MeV 63.5 MeV 4.67 cm 293 m Iron muIoni - 36 59.5 m 1.3 m -15.7 cm 191 MeV 47.8 MeV 3.58 cm 294 m Iron muIoni - 37 59.5 m 1.31 m -16.2 cm 159 MeV 31.6 MeV 2.76 cm 294 m Iron muIoni - 38 59.5 m 1.31 m -16.6 cm 131 MeV 28.4 MeV 2.22 cm 294 m Iron muIoni - 39 59.6 m 1.32 m -17 cm 104 MeV 26.3 MeV 1.75 cm 294 m Iron muIoni - 40 59.6 m 1.32 m -17.4 cm 88.9 MeV 15.4 MeV 1.33 cm 294 m Iron muIoni - 41 59.6 m 1.32 m -17.6 cm 75.4 MeV 13.5 MeV 1.09 cm 294 m Iron muIoni - 42 59.6 m 1.32 m -17.9 cm 61.9 MeV 13.5 MeV 8.95 mm 294 m Iron muIoni - 43 59.6 m 1.32 m -18.2 cm 48.4 MeV 13.5 MeV 7.05 mm 294 m Iron muIoni - 44 59.6 m 1.32 m -18.3 cm 39.8 MeV 8.59 MeV 5.31 mm 294 m Iron muIoni - 45 59.6 m 1.32 m -18.5 cm 31.4 MeV 8.42 MeV 4.29 mm 294 m Iron muIoni - 46 59.6 m 1.32 m -18.7 cm 22.9 MeV 8.5 MeV 3.39 mm 294 m Iron muIoni - 47 59.6 m 1.32 m -18.9 cm 16.3 MeV 6.59 MeV 2.57 mm 294 m Iron muIoni - 48 59.6 m 1.32 m -19 cm 9.14 MeV 7.18 MeV 1.97 mm 294 m Iron muIoni - 49 59.6 m 1.32 m -19.1 cm 1.06 MeV 8.09 MeV 1.13 mm 294 m Iron muIoni - 50 59.6 m 1.32 m -19.1 cm 0 eV 1.06 MeV 26.8 um 294 m Iron muIoni - 51 59.6 m 1.32 m -19.1 cm 0 eV 0 eV 0 fm 294 m Iron Decay + 0 -249 m 0 fm 0 fm 439 GeV 0 eV 0 fm 0 fm Iron initStep + 1 -216 m -1.13 cm -3.4 cm 316 GeV 123 GeV 32.7 m 32.7 m Iron muIoni + 2 -190 m 5.35 cm -2.61 cm 240 GeV 76.4 GeV 26.3 m 59 m Iron muIoni + 3 -168 m 13.7 cm -3.4 cm 178 GeV 62.1 GeV 21.6 m 80.6 m Iron muIoni + 4 -151 m 7.82 cm -5.68 cm 139 GeV 38.6 GeV 17.2 m 97.8 m Iron muIoni + 5 -137 m 13.7 cm -27.1 cm 112 GeV 27.2 GeV 14.2 m 112 m Iron muIoni + 6 -125 m 33.2 cm -58.7 cm 88.4 GeV 23.5 GeV 11.9 m 124 m Iron muIoni + 7 -115 m 45.6 cm -84.4 cm 70.9 GeV 17.4 GeV 9.75 m 134 m Iron muIoni + 8 -107 m 64.1 cm -1.04 m 55.3 GeV 15.7 GeV 8.08 m 142 m Iron muIoni + 9 -101 m 79.9 cm -1.18 m 41.2 GeV 14.1 GeV 6.5 m 148 m Iron muIoni + 10 -95.6 m 97.7 cm -1.28 m 33.5 GeV 7.68 GeV 5.02 m 153 m Iron muIoni + 11 -91.4 m 1.17 m -1.28 m 27.7 GeV 5.81 GeV 4.18 m 157 m Iron muIoni + 12 -87.9 m 1.33 m -1.23 m 22.6 GeV 5.11 GeV 3.52 m 161 m Iron muIoni + 13 -85 m 1.49 m -1.14 m 18.3 GeV 4.35 GeV 2.93 m 164 m Iron muIoni + 14 -82.6 m 1.57 m -1.08 m 14.2 GeV 4.09 GeV 2.41 m 166 m Iron muIoni + 15 -80.6 m 1.65 m -1.01 m 11.7 GeV 2.5 GeV 1.92 m 168 m Iron muIoni + 16 -79 m 1.69 m -93.7 cm 9.58 GeV 2.09 GeV 1.61 m 170 m Iron muIoni + 17 -77.7 m 1.84 m -99.2 cm 7.84 GeV 1.74 GeV 1.34 m 171 m Iron muIoni + 18 -76.6 m 2.01 m -1.04 m 6.49 GeV 1.35 GeV 1.12 m 172 m Iron muIoni + 19 -75.7 m 2.16 m -1.08 m 3.95 GeV 2.54 GeV 93.9 cm 173 m Iron muIoni + 20 -75.1 m 2.25 m -1.13 m 3.17 GeV 777 MeV 59.5 cm 174 m Iron muIoni + 21 -74.6 m 2.34 m -1.18 m 2.6 GeV 570 MeV 48.6 cm 174 m Iron muIoni + 22 -74.2 m 2.42 m -1.19 m 2.13 GeV 474 MeV 40.4 cm 175 m Iron muIoni + 23 -73.9 m 2.49 m -1.22 m 1.72 GeV 410 MeV 33.5 cm 175 m Iron muIoni + 24 -73.6 m 2.54 m -1.24 m 1.39 GeV 327 MeV 27.4 cm 175 m Iron muIoni + 25 -73.4 m 2.59 m -1.27 m 1.05 GeV 344 MeV 22.4 cm 175 m Iron muIoni + 26 -73.2 m 2.61 m -1.29 m 777 MeV 270 MeV 17 cm 176 m Iron muIoni + 27 -73.1 m 2.63 m -1.3 m 639 MeV 138 MeV 12.7 cm 176 m Iron muIoni + 28 -73 m 2.66 m -1.31 m 527 MeV 111 MeV 10.4 cm 176 m Iron muIoni + 29 -72.9 m 2.69 m -1.31 m 432 MeV 95.4 MeV 8.52 cm 176 m Iron muIoni + 30 -72.9 m 2.71 m -1.29 m 347 MeV 85.1 MeV 6.91 cm 176 m Iron muIoni + 31 -72.8 m 2.73 m -1.28 m 288 MeV 59.2 MeV 5.45 cm 176 m Iron muIoni + 32 -72.8 m 2.74 m -1.27 m 234 MeV 54.1 MeV 4.43 cm 176 m Iron muIoni + 33 -72.7 m 2.74 m -1.26 m 182 MeV 51.3 MeV 3.49 cm 176 m Iron muIoni + 34 -72.7 m 2.75 m -1.26 m 153 MeV 28.9 MeV 2.61 cm 176 m Iron muIoni + 35 -72.7 m 2.75 m -1.25 m 130 MeV 23.8 MeV 2.13 cm 176 m Iron muIoni + 36 -72.7 m 2.75 m -1.25 m 110 MeV 19.5 MeV 1.73 cm 176 m Iron muIoni + 37 -72.7 m 2.76 m -1.24 m 94.4 MeV 15.5 MeV 1.42 cm 176 m Iron muIoni + 38 -72.7 m 2.76 m -1.24 m 80.1 MeV 14.4 MeV 1.18 cm 176 m Iron muIoni + 39 -72.6 m 2.76 m -1.23 m 66.6 MeV 13.5 MeV 9.6 mm 176 m Iron muIoni + 40 -72.6 m 2.76 m -1.23 m 56.3 MeV 10.3 MeV 7.7 mm 176 m Iron muIoni + 41 -72.6 m 2.76 m -1.23 m 46.6 MeV 9.76 MeV 6.32 mm 176 m Iron muIoni + 42 -72.6 m 2.76 m -1.22 m 37.2 MeV 9.42 MeV 5.09 mm 176 m Iron muIoni + 43 -72.6 m 2.76 m -1.22 m 29.4 MeV 7.75 MeV 4 mm 176 m Iron muIoni + 44 -72.6 m 2.76 m -1.22 m 22.1 MeV 7.29 MeV 3.19 mm 176 m Iron muIoni + 45 -72.6 m 2.76 m -1.22 m 15.7 MeV 6.41 MeV 2.5 mm 176 m Iron muIoni + 46 -72.6 m 2.76 m -1.22 m 8.48 MeV 7.22 MeV 1.91 mm 176 m Iron muIoni + 47 -72.6 m 2.76 m -1.22 m 0 eV 8.48 MeV 1 mm 176 m Iron muIoni + 48 -72.6 m 2.76 m -1.22 m 0 eV 0 eV 0 fm 176 m Iron Decay ********************************************************************************************************* * G4Track Information: Particle = e+, Track ID = 9, Parent ID = 2 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 59.6 m 1.32 m -19.1 cm 24.3 MeV 0 eV 0 fm 0 fm Iron initStep - 1 250 m 212 m 99.1 m 24.3 MeV 0 eV 301 m 301 m OutOfWorld Transportation + 0 -72.6 m 2.76 m -1.22 m 29.4 MeV 0 eV 0 fm 0 fm Iron initStep + 1 -194 m 19.6 m 250 m 29.4 MeV 0 eV 279 m 279 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = nu_e, Track ID = 8, Parent ID = 2 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 59.6 m 1.32 m -19.1 cm 36.5 MeV 0 eV 0 fm 0 fm Iron initStep - 1 -221 m 250 m 9 m 36.5 MeV 0 eV 375 m 375 m OutOfWorld Transportation + 0 -72.6 m 2.76 m -1.22 m 44.2 MeV 0 eV 0 fm 0 fm Iron initStep + 1 144 m 250 m -231 m 44.2 MeV 0 eV 401 m 401 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = anti_nu_mu, Track ID = 7, Parent ID = 2 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 59.6 m 1.32 m -19.1 cm 43.8 MeV 0 eV 0 fm 0 fm Iron initStep - 1 133 m -250 m -54.5 m 43.8 MeV 0 eV 267 m 267 m OutOfWorld Transportation + 0 -72.6 m 2.76 m -1.22 m 31.1 MeV 0 eV 0 fm 0 fm Iron initStep + 1 -170 m -250 m -10.7 m 31.1 MeV 0 eV 271 m 271 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = e+, Track ID = 1, Parent ID = 0 @@ -1065,178 +1077,178 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process 0 -250 m 0 fm 0 fm 1e+03 GeV 0 eV 0 fm 0 fm Iron initStep - 1 -250 m 0 fm 0 fm 0 eV 0 eV 26.9 cm 26.9 cm Iron AnnihiToMuPair + 1 -249 m 0 fm 0 fm 0 eV 0 eV 72.9 cm 72.9 cm Iron AnnihiToMuPair ********************************************************************************************************* * G4Track Information: Particle = mu-, Track ID = 3, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -250 m 0 fm 0 fm 530 GeV 0 eV 0 fm 0 fm Iron initStep - 1 -213 m 2.7 cm -6.64 mm 361 GeV 169 GeV 36.8 m 36.8 m Iron muIoni - 2 -184 m 12.7 cm -724 um 270 GeV 90.7 GeV 28.8 m 65.6 m Iron muIoni - 3 -161 m 21.5 cm 3.36 cm 202 GeV 67.4 GeV 23.5 m 89.1 m Iron muIoni - 4 -142 m 24.3 cm 4.02 cm 158 GeV 44.3 GeV 19 m 108 m Iron muIoni - 5 -126 m 35.5 cm 2.14 cm 116 GeV 42 GeV 15.7 m 124 m Iron muIoni - 6 -114 m 41.3 cm 2.33 cm 41.5 GeV 74.5 GeV 12.2 m 136 m Iron muIoni - 7 -109 m 45.2 cm 5.91 cm 33.4 GeV 8.08 GeV 5.06 m 141 m Iron muIoni - 8 -104 m 44.4 cm 10 cm 26.4 GeV 6.96 GeV 4.17 m 145 m Iron muIoni - 9 -101 m 40.8 cm 12.6 cm 21.5 GeV 4.9 GeV 3.38 m 149 m Iron muIoni - 10 -98.2 m 41.3 cm 7.95 cm 17.4 GeV 4.1 GeV 2.81 m 152 m Iron muIoni - 11 -95.9 m 41 cm 2.92 cm 14.4 GeV 3.05 GeV 2.32 m 154 m Iron muIoni - 12 -93.9 m 40.9 cm -2.63 cm 10.6 GeV 3.79 GeV 1.95 m 156 m Iron muIoni - 13 -92.5 m 39.9 cm -4.5 cm 8.15 GeV 2.44 GeV 1.47 m 157 m Iron muIoni - 14 -91.3 m 35.3 cm -7.56 cm 6.55 GeV 1.6 GeV 1.16 m 158 m Iron muIoni - 15 -90.3 m 31 cm -12.3 cm 5.1 GeV 1.45 GeV 95 cm 159 m Iron muIoni - 16 -89.6 m 26.7 cm -16.6 cm 4.17 GeV 932 MeV 75.5 cm 160 m Iron muIoni - 17 -89 m 23.9 cm -21.6 cm 3.12 GeV 1.04 GeV 62.7 cm 161 m Iron muIoni - 18 -88.5 m 23.4 cm -25.1 cm 2.37 GeV 755 MeV 48 cm 161 m Iron muIoni - 19 -88.1 m 23.3 cm -26.1 cm 1.84 GeV 525 MeV 37.1 cm 162 m Iron muIoni - 20 -87.8 m 24.2 cm -27.2 cm 1.5 GeV 340 MeV 29.3 cm 162 m Iron muIoni - 21 -87.6 m 24.1 cm -28.6 cm 1.22 GeV 282 MeV 24.1 cm 162 m Iron muIoni - 22 -87.4 m 24.7 cm -30.3 cm 976 MeV 242 MeV 19.7 cm 162 m Iron muIoni - 23 -87.2 m 28.5 cm -29.8 cm 804 MeV 172 MeV 15.9 cm 163 m Iron muIoni - 24 -87.1 m 32 cm -29 cm 646 MeV 158 MeV 13.1 cm 163 m Iron muIoni - 25 -87 m 34.8 cm -27.6 cm 514 MeV 132 MeV 10.5 cm 163 m Iron muIoni - 26 -86.9 m 37.2 cm -26.6 cm 399 MeV 116 MeV 8.32 cm 163 m Iron muIoni - 27 -86.9 m 38.3 cm -25.5 cm 329 MeV 69.6 MeV 6.36 cm 163 m Iron muIoni - 28 -86.8 m 39 cm -24.4 cm 270 MeV 59.3 MeV 5.16 cm 163 m Iron muIoni - 29 -86.8 m 39.4 cm -23.3 cm 221 MeV 48.6 MeV 4.13 cm 163 m Iron muIoni - 30 -86.7 m 39.8 cm -22.5 cm 186 MeV 35.6 MeV 3.29 cm 163 m Iron muIoni - 31 -86.7 m 40 cm -21.9 cm 158 MeV 28.3 MeV 2.68 cm 163 m Iron muIoni - 32 -86.7 m 40.4 cm -21.4 cm 134 MeV 24 MeV 2.2 cm 163 m Iron muIoni - 33 -86.7 m 40.8 cm -21.1 cm 113 MeV 20.4 MeV 1.8 cm 163 m Iron muIoni - 34 -86.7 m 41.1 cm -20.7 cm 92.4 MeV 20.7 MeV 1.47 cm 163 m Iron muIoni - 35 -86.7 m 41.2 cm -20.5 cm 78.1 MeV 14.2 MeV 1.15 cm 163 m Iron muIoni - 36 -86.6 m 41.4 cm -20.4 cm 64.8 MeV 13.3 MeV 9.34 mm 163 m Iron muIoni - 37 -86.6 m 41.7 cm -20.3 cm 53.7 MeV 11.1 MeV 7.45 mm 163 m Iron muIoni - 38 -86.6 m 41.9 cm -20.3 cm 44.5 MeV 9.21 MeV 5.99 mm 163 m Iron muIoni - 39 -86.6 m 42.1 cm -20.3 cm 35.8 MeV 8.73 MeV 4.85 mm 163 m Iron muIoni - 40 -86.6 m 42.3 cm -20.3 cm 27.4 MeV 8.33 MeV 3.86 mm 163 m Iron muIoni - 41 -86.6 m 42.4 cm -20.3 cm 20.7 MeV 6.69 MeV 3 mm 163 m Iron muIoni - 42 -86.6 m 42.6 cm -20.3 cm 13.7 MeV 7.08 MeV 2.37 mm 163 m Iron muIoni - 43 -86.6 m 42.7 cm -20.3 cm 6.31 MeV 7.36 MeV 1.71 mm 163 m Iron muIoni - 44 -86.6 m 42.7 cm -20.3 cm 0 eV 6.31 MeV 590 um 163 m Iron muIoni - 45 -86.6 m 42.7 cm -20.3 cm 0 eV 0 eV 0 fm 163 m Iron Decay + 0 -249 m 0 fm 0 fm 160 GeV 0 eV 0 fm 0 fm Iron initStep + 1 -233 m 2.99 cm 3.35 cm 124 GeV 35.9 GeV 15.9 m 15.9 m Iron muIoni + 2 -220 m 2.22 cm 8.66 cm 97.8 GeV 26.6 GeV 13 m 28.9 m Iron muIoni + 3 -210 m 7.45 cm 6.32 mm 78.2 GeV 19.6 GeV 10.6 m 39.5 m Iron muIoni + 4 -201 m 9.85 cm -8.96 cm 64 GeV 14.2 GeV 8.8 m 48.3 m Iron muIoni + 5 -194 m 13.3 cm -18.9 cm 46.6 GeV 17.4 GeV 7.4 m 55.7 m Iron muIoni + 6 -188 m 14.2 cm -22.3 cm 35.8 GeV 10.8 GeV 5.61 m 61.3 m Iron muIoni + 7 -183 m 7.38 cm -27.7 cm 28.8 GeV 7.02 GeV 4.43 m 65.8 m Iron muIoni + 8 -180 m 9.37 mm -36.5 cm 22.4 GeV 6.39 GeV 3.64 m 69.4 m Iron muIoni + 9 -177 m -6.05 cm -45 cm 18.3 GeV 4.05 GeV 2.91 m 72.3 m Iron muIoni + 10 -175 m -10.9 cm -54.8 cm 13.7 GeV 4.63 GeV 2.43 m 74.8 m Iron muIoni + 11 -173 m -11.2 cm -61.6 cm 10.3 GeV 3.34 GeV 1.86 m 76.6 m Iron muIoni + 12 -171 m -10.5 cm -63.5 cm 8.06 GeV 2.29 GeV 1.44 m 78.1 m Iron muIoni + 13 -170 m -8.27 cm -65.5 cm 6.57 GeV 1.49 GeV 1.15 m 79.2 m Iron muIoni + 14 -169 m -7.87 cm -68.4 cm 5.33 GeV 1.24 GeV 95.3 cm 80.2 m Iron muIoni + 15 -168 m -6.12 cm -71.7 cm 4.26 GeV 1.08 GeV 78.6 cm 80.9 m Iron muIoni + 16 -168 m 2.13 cm -70.9 cm 3.49 GeV 768 MeV 63.9 cm 81.6 m Iron muIoni + 17 -167 m 9.99 cm -68.9 cm 2.76 GeV 727 MeV 53.2 cm 82.1 m Iron muIoni + 18 -167 m 16.4 cm -65.9 cm 2.16 GeV 605 MeV 42.8 cm 82.5 m Iron muIoni + 19 -166 m 21.8 cm -63.4 cm 1.56 GeV 600 MeV 34 cm 82.9 m Iron muIoni + 20 -166 m 24.2 cm -60.8 cm 1.26 GeV 296 MeV 25 cm 83.1 m Iron muIoni + 21 -166 m 25.5 cm -59.2 cm 1.01 GeV 250 MeV 20.4 cm 83.3 m Iron muIoni + 22 -166 m 26.9 cm -57.1 cm 804 MeV 206 MeV 16.4 cm 83.5 m Iron muIoni + 23 -166 m 28 cm -55.3 cm 667 MeV 136 MeV 13.1 cm 83.6 m Iron muIoni + 24 -166 m 28.6 cm -54.2 cm 553 MeV 115 MeV 10.9 cm 83.7 m Iron muIoni + 25 -165 m 29.7 cm -53.1 cm 459 MeV 94 MeV 8.97 cm 83.8 m Iron muIoni + 26 -165 m 30.8 cm -52.8 cm 381 MeV 77.9 MeV 7.38 cm 83.9 m Iron muIoni + 27 -165 m 31.6 cm -51.8 cm 302 MeV 78.9 MeV 6.05 cm 84 m Iron muIoni + 28 -165 m 31.9 cm -51.4 cm 253 MeV 49.2 MeV 4.68 cm 84 m Iron muIoni + 29 -165 m 32.7 cm -51.2 cm 209 MeV 43.9 MeV 3.83 cm 84.1 m Iron muIoni + 30 -165 m 33.6 cm -51.3 cm 175 MeV 34.5 MeV 3.08 cm 84.1 m Iron muIoni + 31 -165 m 34.3 cm -51.5 cm 147 MeV 27.8 MeV 2.49 cm 84.1 m Iron muIoni + 32 -165 m 34.9 cm -51.7 cm 122 MeV 24.4 MeV 2.02 cm 84.1 m Iron muIoni + 33 -165 m 35.4 cm -51.8 cm 99.7 MeV 22.6 MeV 1.62 cm 84.1 m Iron muIoni + 34 -165 m 35.8 cm -51.9 cm 82.2 MeV 17.6 MeV 1.26 cm 84.2 m Iron muIoni + 35 -165 m 36.3 cm -52 cm 68.4 MeV 13.7 MeV 9.93 mm 84.2 m Iron muIoni + 36 -165 m 36.7 cm -52 cm 55 MeV 13.4 MeV 7.97 mm 84.2 m Iron muIoni + 37 -165 m 37 cm -52.1 cm 45.4 MeV 9.54 MeV 6.15 mm 84.2 m Iron muIoni + 38 -165 m 37.2 cm -52.2 cm 37.2 MeV 8.28 MeV 4.96 mm 84.2 m Iron muIoni + 39 -165 m 37.4 cm -52.2 cm 28.3 MeV 8.89 MeV 4.01 mm 84.2 m Iron muIoni + 40 -165 m 37.5 cm -52.3 cm 21.4 MeV 6.91 MeV 3.08 mm 84.2 m Iron muIoni + 41 -165 m 37.7 cm -52.3 cm 14.8 MeV 6.56 MeV 2.43 mm 84.2 m Iron muIoni + 42 -165 m 37.9 cm -52.2 cm 7.08 MeV 7.72 MeV 1.82 mm 84.2 m Iron muIoni + 43 -165 m 37.9 cm -52.2 cm 0 eV 7.08 MeV 729 um 84.2 m Iron muIoni + 44 -165 m 37.9 cm -52.2 cm 0 eV 0 eV 0 fm 84.2 m Iron Decay ********************************************************************************************************* * G4Track Information: Particle = e-, Track ID = 6, Parent ID = 3 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -86.6 m 42.7 cm -20.3 cm 41.2 MeV 0 eV 0 fm 0 fm Iron initStep - 1 -86.6 m 43.2 cm -20 cm 27.7 MeV 13.5 MeV 5.81 mm 5.81 mm Iron eIoni - 2 -86.6 m 43.5 cm -19.7 cm 18.8 MeV 8.87 MeV 4.85 mm 1.07 cm Iron eIoni - 3 -86.6 m 43.7 cm -19.4 cm 10.6 MeV 8.26 MeV 4.05 mm 1.47 cm Iron eIoni - 4 -86.6 m 43.9 cm -19.4 cm 6.04 MeV 4.52 MeV 3.12 mm 1.78 cm Iron eIoni - 5 -86.6 m 44.1 cm -19.5 cm 3.22 MeV 2.82 MeV 2.44 mm 2.03 cm Iron eIoni - 6 -86.6 m 44.3 cm -19.6 cm 1.38 MeV 1.83 MeV 1.86 mm 2.21 cm Iron eIoni - 7 -86.6 m 44.3 cm -19.6 cm 189 keV 1.2 MeV 1.12 mm 2.32 cm Iron eIoni - 8 -86.6 m 44.3 cm -19.6 cm 0 eV 189 keV 76.1 um 2.33 cm Iron eIoni + 0 -165 m 37.9 cm -52.2 cm 47.7 MeV 0 eV 0 fm 0 fm Iron initStep + 1 -165 m 38 cm -51.9 cm 29.6 MeV 18.1 MeV 6.18 mm 6.18 mm Iron eIoni + 2 -165 m 37.9 cm -51.6 cm 19.5 MeV 10.1 MeV 5 mm 1.12 cm Iron eIoni + 3 -165 m 37.8 cm -51.4 cm 12.6 MeV 6.94 MeV 4.12 mm 1.53 cm Iron eIoni + 4 -165 m 37.5 cm -51.4 cm 8.15 MeV 4.41 MeV 3.37 mm 1.87 cm Iron eIoni + 5 -165 m 37.5 cm -51.4 cm 4.24 MeV 3.91 MeV 2.78 mm 2.15 cm Iron eIoni + 6 -165 m 37.6 cm -51.3 cm 1.8 MeV 2.43 MeV 2.1 mm 2.36 cm Iron eIoni + 7 -165 m 37.5 cm -51.3 cm 276 keV 1.53 MeV 1.38 mm 2.49 cm Iron eIoni + 8 -165 m 37.5 cm -51.3 cm 0 eV 276 keV 137 um 2.51 cm Iron eIoni ********************************************************************************************************* * G4Track Information: Particle = anti_nu_e, Track ID = 5, Parent ID = 3 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -86.6 m 42.7 cm -20.3 cm 42.8 MeV 0 eV 0 fm 0 fm Iron initStep - 1 -184 m -250 m 16.2 m 42.8 MeV 0 eV 269 m 269 m OutOfWorld Transportation + 0 -165 m 37.9 cm -52.2 cm 39.6 MeV 0 eV 0 fm 0 fm Iron initStep + 1 40.6 m 6.68 m -250 m 39.6 MeV 0 eV 323 m 323 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = nu_mu, Track ID = 4, Parent ID = 3 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -86.6 m 42.7 cm -20.3 cm 20.6 MeV 0 eV 0 fm 0 fm Iron initStep - 1 89.8 m 19.2 m -250 m 20.6 MeV 0 eV 306 m 306 m OutOfWorld Transportation + 0 -165 m 37.9 cm -52.2 cm 17.4 MeV 0 eV 0 fm 0 fm Iron initStep + 1 250 m -65.6 m 169 m 17.4 MeV 0 eV 453 m 453 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = mu+, Track ID = 2, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -250 m 0 fm 0 fm 470 GeV 0 eV 0 fm 0 fm Iron initStep - 1 -216 m 6.05 cm -1.38 cm 352 GeV 117 GeV 34.1 m 34.1 m Iron muIoni - 2 -187 m 7.97 cm -5.37 mm 276 GeV 76.7 GeV 28.3 m 62.4 m Iron muIoni - 3 -163 m 16.2 cm -3.36 mm 200 GeV 76.1 GeV 23.9 m 86.3 m Iron muIoni - 4 -145 m 21.7 cm 5.23 mm 157 GeV 42.3 GeV 18.8 m 105 m Iron muIoni - 5 -129 m 23.8 cm -2.31 cm 127 GeV 30.2 GeV 15.7 m 121 m Iron muIoni - 6 -116 m 29.9 cm 5.18 cm 103 GeV 24.5 GeV 13.2 m 134 m Iron muIoni - 7 -105 m 34.1 cm 9.19 cm 81.3 GeV 21.5 GeV 11.1 m 145 m Iron muIoni - 8 -95.6 m 27.5 cm 15.3 cm 65.7 GeV 15.5 GeV 9.08 m 154 m Iron muIoni - 9 -88 m 22.3 cm 16.7 cm 52.7 GeV 13 GeV 7.57 m 162 m Iron muIoni - 10 -81.8 m 16.7 cm 18.7 cm 42.8 GeV 9.92 GeV 6.24 m 168 m Iron muIoni - 11 -76.6 m 19.6 cm 22 cm 33.7 GeV 9.12 GeV 5.19 m 173 m Iron muIoni - 12 -72.4 m 20.9 cm 23.8 cm 24.7 GeV 8.97 GeV 4.19 m 177 m Iron muIoni - 13 -69.2 m 19.9 cm 27.8 cm 19.3 GeV 5.38 GeV 3.17 m 180 m Iron muIoni - 14 -66.7 m 13.5 cm 30.8 cm 15.8 GeV 3.53 GeV 2.54 m 183 m Iron muIoni - 15 -64.6 m 7.56 cm 30.9 cm 12.5 GeV 3.27 GeV 2.12 m 185 m Iron muIoni - 16 -62.9 m 5.51 cm 30 cm 9.71 GeV 2.81 GeV 1.71 m 187 m Iron muIoni - 17 -61.5 m 1.61 cm 28.4 cm 7.73 GeV 1.98 GeV 1.36 m 188 m Iron muIoni - 18 -60.4 m -1.48 cm 27.3 cm 6.39 GeV 1.34 GeV 1.1 m 189 m Iron muIoni - 19 -59.5 m -5.23 cm 28.6 cm 5.24 GeV 1.15 GeV 92.7 cm 190 m Iron muIoni - 20 -58.7 m -10.7 cm 30.2 cm 4.23 GeV 1.02 GeV 77.3 cm 191 m Iron muIoni - 21 -58.1 m -17.7 cm 30.7 cm 3.38 GeV 850 MeV 63.3 cm 192 m Iron muIoni - 22 -57.6 m -21.8 cm 30.3 cm 2.71 GeV 663 MeV 51.5 cm 192 m Iron muIoni - 23 -57.2 m -26.1 cm 30 cm 1.87 GeV 840 MeV 42 cm 193 m Iron muIoni - 24 -56.9 m -29.6 cm 29.3 cm 1.5 GeV 370 MeV 29.7 cm 193 m Iron muIoni - 25 -56.6 m -32.1 cm 29.6 cm 1.19 GeV 311 MeV 24.1 cm 193 m Iron muIoni - 26 -56.4 m -33.8 cm 28.9 cm 962 MeV 230 MeV 19.3 cm 193 m Iron muIoni - 27 -56.3 m -33.9 cm 28.6 cm 793 MeV 169 MeV 15.6 cm 193 m Iron muIoni - 28 -56.1 m -34.2 cm 29.3 cm 636 MeV 157 MeV 12.9 cm 194 m Iron muIoni - 29 -56 m -34.9 cm 30.1 cm 523 MeV 114 MeV 10.3 cm 194 m Iron muIoni - 30 -56 m -36.1 cm 31 cm 435 MeV 87.6 MeV 8.44 cm 194 m Iron muIoni - 31 -55.9 m -36.3 cm 32.3 cm 341 MeV 93.6 MeV 6.95 cm 194 m Iron muIoni - 32 -55.8 m -36.2 cm 33.5 cm 284 MeV 57.5 MeV 5.35 cm 194 m Iron muIoni - 33 -55.8 m -36.1 cm 34.2 cm 239 MeV 44.5 MeV 4.36 cm 194 m Iron muIoni - 34 -55.8 m -36.1 cm 34.9 cm 200 MeV 39.6 MeV 3.59 cm 194 m Iron muIoni - 35 -55.7 m -36 cm 35.4 cm 159 MeV 41.1 MeV 2.91 cm 194 m Iron muIoni - 36 -55.7 m -36 cm 35.2 cm 133 MeV 26 MeV 2.21 cm 194 m Iron muIoni - 37 -55.7 m -36.1 cm 35 cm 110 MeV 22.4 MeV 1.78 cm 194 m Iron muIoni - 38 -55.7 m -36 cm 34.8 cm 91.3 MeV 18.9 MeV 1.42 cm 194 m Iron muIoni - 39 -55.7 m -35.9 cm 34.7 cm 76.8 MeV 14.5 MeV 1.13 cm 194 m Iron muIoni - 40 -55.7 m -35.9 cm 34.5 cm 64.2 MeV 12.6 MeV 9.14 mm 194 m Iron muIoni - 41 -55.6 m -35.9 cm 34.3 cm 52.2 MeV 12 MeV 7.37 mm 194 m Iron muIoni - 42 -55.6 m -35.8 cm 34.2 cm 41.9 MeV 10.4 MeV 5.79 mm 194 m Iron muIoni - 43 -55.6 m -35.8 cm 34 cm 34.1 MeV 7.79 MeV 4.53 mm 194 m Iron muIoni - 44 -55.6 m -35.8 cm 34 cm 26.9 MeV 7.18 MeV 3.67 mm 194 m Iron muIoni - 45 -55.6 m -35.8 cm 33.9 cm 19.8 MeV 7.05 MeV 2.94 mm 194 m Iron muIoni - 46 -55.6 m -35.9 cm 33.8 cm 12.8 MeV 7.08 MeV 2.28 mm 194 m Iron muIoni - 47 -55.6 m -35.9 cm 33.7 cm 5.72 MeV 7.03 MeV 1.61 mm 194 m Iron muIoni - 48 -55.6 m -35.9 cm 33.7 cm 0 eV 5.72 MeV 503 um 194 m Iron muIoni - 49 -55.6 m -35.9 cm 33.7 cm 0 eV 0 eV 0 fm 194 m Iron Decay + 0 -249 m 0 fm 0 fm 840 GeV 0 eV 0 fm 0 fm Iron initStep + 1 -201 m -8.57 mm 2.97 cm 581 GeV 259 GeV 47.8 m 47.8 m Iron muIoni + 2 -163 m -7.37 cm 6.51 cm 419 GeV 162 GeV 38.8 m 86.7 m Iron muIoni + 3 -131 m -11.7 cm -2.51 cm 325 GeV 94.2 GeV 31.7 m 118 m Iron muIoni + 4 -104 m -12.8 cm -2.56 cm 251 GeV 74.1 GeV 26.8 m 145 m Iron muIoni + 5 -81.7 m -3.62 cm -3 cm 199 GeV 51.5 GeV 22.3 m 168 m Iron muIoni + 6 -62.9 m 6.25 cm -1.36 cm 152 GeV 47.1 GeV 18.8 m 186 m Iron muIoni + 7 -47.7 m 20.3 cm -1.81 cm 109 GeV 43.2 GeV 15.2 m 202 m Iron muIoni + 8 -36.1 m 37 cm 4.48 cm 79.1 GeV 29.7 GeV 11.6 m 213 m Iron muIoni + 9 -27.2 m 51.3 cm 3.25 cm 63.3 GeV 15.9 GeV 8.88 m 222 m Iron muIoni + 10 -19.9 m 63.7 cm 6.02 cm 51 GeV 12.2 GeV 7.32 m 229 m Iron muIoni + 11 -13.8 m 68.8 cm 10.2 cm 42.2 GeV 8.86 GeV 6.07 m 235 m Iron muIoni + 12 -8.71 m 77.2 cm 2.06 cm 33 GeV 9.16 GeV 5.12 m 241 m Iron muIoni + 13 -4.6 m 82 cm -7 cm 26.2 GeV 6.8 GeV 4.12 m 245 m Iron muIoni + 14 -1.25 m 89.1 cm -11.5 cm 20.6 GeV 5.62 GeV 3.35 m 248 m Iron muIoni + 15 1.44 m 97.3 cm -14.5 cm 16.5 GeV 4.03 GeV 2.69 m 251 m Iron muIoni + 16 3.65 m 1.03 m -13.2 cm 13.4 GeV 3.19 GeV 2.21 m 253 m Iron muIoni + 17 5.46 m 1.09 m -14.8 cm 10.9 GeV 2.47 GeV 1.82 m 255 m Iron muIoni + 18 6.97 m 1.05 m -6.06 cm 8.95 GeV 1.94 GeV 1.51 m 256 m Iron muIoni + 19 8.23 m 1.09 m -2.05 cm 7.21 GeV 1.74 GeV 1.26 m 258 m Iron muIoni + 20 9.26 m 1.12 m 2.93 mm 5.66 GeV 1.55 GeV 1.03 m 259 m Iron muIoni + 21 10.1 m 1.16 m 1.3 cm 4.69 GeV 969 MeV 82.9 cm 259 m Iron muIoni + 22 10.8 m 1.21 m 1.02 cm 3.81 GeV 882 MeV 69.7 cm 260 m Iron muIoni + 23 11.4 m 1.25 m 1.37 cm 3.1 GeV 704 MeV 57.5 cm 261 m Iron muIoni + 24 11.8 m 1.29 m 2.2 cm 2.53 GeV 572 MeV 47.6 cm 261 m Iron muIoni + 25 12.2 m 1.32 m 2.14 cm 2.02 GeV 516 MeV 39.4 cm 262 m Iron muIoni + 26 12.5 m 1.35 m 3.91 cm 1.45 GeV 567 MeV 31.8 cm 262 m Iron muIoni + 27 12.8 m 1.36 m 4.25 cm 1.1 GeV 349 MeV 23.3 cm 262 m Iron muIoni + 28 13 m 1.38 m 4.55 cm 908 MeV 192 MeV 17.8 cm 262 m Iron muIoni + 29 13.1 m 1.41 m 4.77 cm 744 MeV 164 MeV 14.8 cm 262 m Iron muIoni + 30 13.2 m 1.44 m 5.39 cm 561 MeV 183 MeV 12.1 cm 263 m Iron muIoni + 31 13.3 m 1.45 m 5.7 cm 454 MeV 107 MeV 9.09 cm 263 m Iron muIoni + 32 13.4 m 1.47 m 5.88 cm 372 MeV 82 MeV 7.28 cm 263 m Iron muIoni + 33 13.4 m 1.49 m 6.35 cm 305 MeV 67.2 MeV 5.88 cm 263 m Iron muIoni + 34 13.5 m 1.5 m 6.36 cm 247 MeV 57.2 MeV 4.72 cm 263 m Iron muIoni + 35 13.5 m 1.52 m 6.47 cm 209 MeV 38.8 MeV 3.73 cm 263 m Iron muIoni + 36 13.5 m 1.53 m 6.46 cm 167 MeV 41.4 MeV 3.07 cm 263 m Iron muIoni + 37 13.6 m 1.54 m 6.9 cm 137 MeV 30 MeV 2.36 cm 263 m Iron muIoni + 38 13.6 m 1.55 m 7.16 cm 117 MeV 19.9 MeV 1.86 cm 263 m Iron muIoni + 39 13.6 m 1.56 m 7.18 cm 96.6 MeV 20.8 MeV 1.54 cm 263 m Iron muIoni + 40 13.6 m 1.57 m 7.2 cm 82.7 MeV 13.9 MeV 1.21 cm 263 m Iron muIoni + 41 13.6 m 1.57 m 7.14 cm 68.5 MeV 14.2 MeV 10 mm 263 m Iron muIoni + 42 13.6 m 1.58 m 6.99 cm 55.9 MeV 12.6 MeV 7.96 mm 263 m Iron muIoni + 43 13.6 m 1.58 m 6.96 cm 44.3 MeV 11.5 MeV 6.26 mm 263 m Iron muIoni + 44 13.6 m 1.58 m 7 cm 36.9 MeV 7.39 MeV 4.83 mm 263 m Iron muIoni + 45 13.6 m 1.59 m 7 cm 28.7 MeV 8.28 MeV 3.98 mm 263 m Iron muIoni + 46 13.6 m 1.59 m 6.95 cm 21 MeV 7.65 MeV 3.12 mm 263 m Iron muIoni + 47 13.6 m 1.59 m 6.99 cm 14 MeV 7.04 MeV 2.39 mm 263 m Iron muIoni + 48 13.6 m 1.59 m 7.03 cm 6.08 MeV 7.89 MeV 1.75 mm 263 m Iron muIoni + 49 13.6 m 1.59 m 7.03 cm 0 eV 6.08 MeV 557 um 263 m Iron muIoni + 50 13.6 m 1.59 m 7.03 cm 0 eV 0 eV 0 fm 263 m Iron Decay ********************************************************************************************************* * G4Track Information: Particle = e+, Track ID = 9, Parent ID = 2 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -55.6 m -35.9 cm 33.7 cm 44.3 MeV 0 eV 0 fm 0 fm Iron initStep - 1 -19.6 m 250 m -140 m 44.3 MeV 0 eV 289 m 289 m OutOfWorld Transportation + 0 13.6 m 1.59 m 7.03 cm 25.1 MeV 0 eV 0 fm 0 fm Iron initStep + 1 250 m 99 m -191 m 25.1 MeV 0 eV 319 m 319 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = nu_e, Track ID = 8, Parent ID = 2 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -55.6 m -35.9 cm 33.7 cm 40.4 MeV 0 eV 0 fm 0 fm Iron initStep - 1 -151 m -177 m 250 m 40.4 MeV 0 eV 320 m 320 m OutOfWorld Transportation + 0 13.6 m 1.59 m 7.03 cm 32.3 MeV 0 eV 0 fm 0 fm Iron initStep + 1 57.8 m -218 m -250 m 32.3 MeV 0 eV 336 m 336 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = anti_nu_mu, Track ID = 7, Parent ID = 2 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -55.6 m -35.9 cm 33.7 cm 20 MeV 0 eV 0 fm 0 fm Iron initStep - 1 45.8 m -250 m -154 m 20 MeV 0 eV 311 m 311 m OutOfWorld Transportation + 0 13.6 m 1.59 m 7.03 cm 47.2 MeV 0 eV 0 fm 0 fm Iron initStep + 1 -132 m 87.4 m 250 m 47.2 MeV 0 eV 302 m 302 m OutOfWorld Transportation Run terminated. Run Summary Number of events processed : 5 - User=0.25s Real=0.53s Sys=0.19s + User=0.19s Real=0.29s Sys=0.05s --------- Ranecu engine status --------- Initial seed (index) = 0 - Current couple of seeds = 648184594, 1578627531 + Current couple of seeds = 1891701582, 1583383883 ---------------------------------------- # /gun/particle anti_proton @@ -1262,7 +1274,7 @@ Index : 0 used in the geometry : Yes recalculation needed : No --------- Ranecu engine status --------- Initial seed (index) = 0 - Current couple of seeds = 648184594, 1578627531 + Current couple of seeds = 1891701582, 1583383883 ---------------------------------------- Start Run processing. @@ -1274,63 +1286,62 @@ Start Run processing. Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process 0 -250 m 0 fm 0 fm 1 GeV 0 eV 0 fm 0 fm Iron initStep - 1 -250 m 730 um 393 um 927 MeV 72.6 MeV 5.8 cm 5.8 cm Iron hhIoni - 2 -250 m 373 um 3.2 mm 862 MeV 65.4 MeV 5.23 cm 11 cm Iron hhIoni - 3 -250 m -690 um 4.78 mm 796 MeV 65.8 MeV 4.73 cm 15.8 cm Iron hhIoni - 4 -250 m -813 um 6.65 mm 742 MeV 54.7 MeV 4.22 cm 20 cm Iron hhIoni - 5 -250 m -1.76 mm 7.6 mm 691 MeV 50.5 MeV 3.82 cm 23.8 cm Iron hhIoni - 6 -250 m -2.03 mm 8.67 mm 642 MeV 49 MeV 3.45 cm 27.2 cm Iron hhIoni - 7 -250 m -1.13 mm 9.98 mm 596 MeV 46 MeV 3.09 cm 30.3 cm Iron hhIoni - 8 -250 m 358 um 1.11 cm 555 MeV 41.3 MeV 2.77 cm 33.1 cm Iron hhIoni - 9 -250 m 3.31 mm 1.25 cm 520 MeV 34.6 MeV 2.49 cm 35.6 cm Iron hhIoni - 10 -250 m 6.08 mm 1.35 cm 487 MeV 32.8 MeV 2.26 cm 37.8 cm Iron hhIoni - 11 -250 m 8.18 mm 1.44 cm 455 MeV 32.7 MeV 2.04 cm 39.9 cm Iron hhIoni - 12 -250 m 1.02 cm 1.46 cm 425 MeV 29.2 MeV 1.84 cm 41.7 cm Iron hhIoni - 13 -250 m 1.2 cm 1.49 cm 396 MeV 29.1 MeV 1.66 cm 43.4 cm Iron hhIoni - 14 -250 m 1.36 cm 1.54 cm 372 MeV 24 MeV 1.48 cm 44.9 cm Iron hhIoni - 15 -250 m 1.51 cm 1.55 cm 348 MeV 24.7 MeV 1.35 cm 46.2 cm Iron hhIoni - 16 -250 m 1.67 cm 1.52 cm 327 MeV 20.8 MeV 1.21 cm 47.4 cm Iron hhIoni - 17 -250 m 1.82 cm 1.54 cm 305 MeV 21.6 MeV 1.1 cm 48.5 cm Iron hhIoni - 18 -250 m 1.93 cm 1.57 cm 286 MeV 19.4 MeV 9.83 mm 49.5 cm Iron hhIoni - 19 -249 m 2.04 cm 1.58 cm 268 MeV 18.3 MeV 8.87 mm 50.4 cm Iron hhIoni - 20 -249 m 2.1 cm 1.61 cm 251 MeV 16.2 MeV 7.97 mm 51.2 cm Iron hhIoni - 21 -249 m 2.14 cm 1.63 cm 235 MeV 16.3 MeV 7.17 mm 51.9 cm Iron hhIoni - 22 -249 m 2.17 cm 1.65 cm 220 MeV 14.8 MeV 6.47 mm 52.6 cm Iron hhIoni - 23 -249 m 2.21 cm 1.64 cm 207 MeV 13.1 MeV 5.83 mm 53.1 cm Iron hhIoni - 24 -249 m 2.23 cm 1.63 cm 194 MeV 13.7 MeV 5.26 mm 53.7 cm Iron hhIoni - 25 -249 m 2.26 cm 1.61 cm 183 MeV 10.7 MeV 4.71 mm 54.1 cm Iron hhIoni - 26 -249 m 2.27 cm 1.6 cm 171 MeV 11.6 MeV 4.31 mm 54.6 cm Iron hhIoni - 27 -249 m 2.28 cm 1.59 cm 160 MeV 11.5 MeV 3.87 mm 55 cm Iron hhIoni - 28 -249 m 2.28 cm 1.59 cm 150 MeV 9.49 MeV 3.44 mm 55.3 cm Iron hhIoni - 29 -249 m 2.29 cm 1.58 cm 139 MeV 11 MeV 3.13 mm 55.6 cm Iron hhIoni - 30 -249 m 2.28 cm 1.58 cm 131 MeV 8.68 MeV 2.77 mm 55.9 cm Iron hhIoni - 31 -249 m 2.29 cm 1.57 cm 123 MeV 8.11 MeV 2.49 mm 56.1 cm Iron hhIoni - 32 -249 m 2.29 cm 1.57 cm 115 MeV 7.26 MeV 2.25 mm 56.4 cm Iron hhIoni - 33 -249 m 2.3 cm 1.57 cm 109 MeV 6.62 MeV 2.05 mm 56.6 cm Iron hhIoni - 34 -249 m 2.31 cm 1.56 cm 102 MeV 7.12 MeV 1.87 mm 56.8 cm Iron hhIoni - 35 -249 m 2.32 cm 1.56 cm 94.7 MeV 6.85 MeV 1.67 mm 56.9 cm Iron hhIoni - 36 -249 m 2.32 cm 1.56 cm 88.3 MeV 6.43 MeV 1.5 mm 57.1 cm Iron hhIoni - 37 -249 m 2.33 cm 1.56 cm 82.5 MeV 5.74 MeV 1.35 mm 57.2 cm Iron hhIoni - 38 -249 m 2.32 cm 1.57 cm 77.6 MeV 4.91 MeV 1.22 mm 57.3 cm Iron hhIoni - 39 -249 m 2.33 cm 1.58 cm 72.4 MeV 5.24 MeV 1.11 mm 57.4 cm Iron hhIoni - 40 -249 m 2.33 cm 1.59 cm 67 MeV 5.36 MeV 1.01 mm 57.5 cm Iron hhIoni - 41 -249 m 2.33 cm 1.6 cm 62 MeV 5.03 MeV 901 um 57.6 cm Iron hhIoni - 42 -249 m 2.33 cm 1.61 cm 57.8 MeV 4.17 MeV 805 um 57.7 cm Iron hhIoni - 43 -249 m 2.33 cm 1.63 cm 53.4 MeV 4.38 MeV 736 um 57.8 cm Iron hhIoni - 44 -249 m 2.34 cm 1.63 cm 49.2 MeV 4.25 MeV 663 um 57.9 cm Iron hhIoni - 45 -249 m 2.34 cm 1.64 cm 45.1 MeV 4.11 MeV 595 um 57.9 cm Iron hhIoni - 46 -249 m 2.34 cm 1.65 cm 41.2 MeV 3.86 MeV 538 um 58 cm Iron hhIoni - 47 -249 m 2.34 cm 1.66 cm 37.6 MeV 3.65 MeV 484 um 58 cm Iron hhIoni - 48 -249 m 2.34 cm 1.67 cm 33.6 MeV 3.97 MeV 437 um 58.1 cm Iron hhIoni - 49 -249 m 2.34 cm 1.67 cm 30 MeV 3.62 MeV 390 um 58.1 cm Iron hhIoni - 50 -249 m 2.33 cm 1.68 cm 26.1 MeV 3.83 MeV 350 um 58.1 cm Iron hhIoni - 51 -249 m 2.33 cm 1.69 cm 22.7 MeV 3.43 MeV 312 um 58.2 cm Iron hhIoni - 52 -249 m 2.33 cm 1.69 cm 19.1 MeV 3.62 MeV 280 um 58.2 cm Iron hhIoni - 53 -249 m 2.33 cm 1.7 cm 15.6 MeV 3.53 MeV 249 um 58.2 cm Iron hhIoni - 54 -249 m 2.34 cm 1.7 cm 11.6 MeV 3.99 MeV 220 um 58.2 cm Iron hhIoni - 55 -249 m 2.34 cm 1.71 cm 7.42 MeV 4.14 MeV 187 um 58.3 cm Iron hhIoni - 56 -249 m 2.33 cm 1.71 cm 2.1 MeV 5.32 MeV 139 um 58.3 cm Iron hhIoni - 57 -249 m 2.33 cm 1.71 cm 0 eV 2.1 MeV 20.4 um 58.3 cm Iron hhIoni + 1 -250 m -220 um 800 um 924 MeV 75.6 MeV 5.8 cm 5.8 cm Iron hhIoni + 2 -250 m -421 um 2.17 mm 854 MeV 70.2 MeV 5.21 cm 11 cm Iron hhIoni + 3 -250 m -2.5 mm 2.7 mm 792 MeV 62.3 MeV 4.66 cm 15.7 cm Iron hhIoni + 4 -250 m -4.74 mm 3.55 mm 736 MeV 55.7 MeV 4.18 cm 19.9 cm Iron hhIoni + 5 -250 m -5.69 mm 4.33 mm 686 MeV 50.1 MeV 3.78 cm 23.6 cm Iron hhIoni + 6 -250 m -6.71 mm 4.39 mm 637 MeV 48.9 MeV 3.41 cm 27 cm Iron hhIoni + 7 -250 m -7.67 mm 4.05 mm 595 MeV 42.3 MeV 3.05 cm 30.1 cm Iron hhIoni + 8 -250 m -8.86 mm 4.69 mm 553 MeV 42.4 MeV 2.76 cm 32.9 cm Iron hhIoni + 9 -250 m -9.09 mm 5.51 mm 515 MeV 37.7 MeV 2.48 cm 35.3 cm Iron hhIoni + 10 -250 m -9.27 mm 7.05 mm 483 MeV 31.9 MeV 2.22 cm 37.6 cm Iron hhIoni + 11 -250 m -1.03 cm 8.31 mm 452 MeV 31 MeV 2.02 cm 39.6 cm Iron hhIoni + 12 -250 m -1.05 cm 8.84 mm 422 MeV 29.8 MeV 1.83 cm 41.4 cm Iron hhIoni + 13 -250 m -1.11 cm 9.64 mm 395 MeV 27.4 MeV 1.64 cm 43 cm Iron hhIoni + 14 -250 m -1.17 cm 1.05 cm 370 MeV 24.6 MeV 1.47 cm 44.5 cm Iron hhIoni + 15 -250 m -1.23 cm 1.14 cm 347 MeV 23.4 MeV 1.34 cm 45.9 cm Iron hhIoni + 16 -250 m -1.29 cm 1.22 cm 323 MeV 23.4 MeV 1.21 cm 47.1 cm Iron hhIoni + 17 -250 m -1.33 cm 1.27 cm 303 MeV 20.7 MeV 1.08 cm 48.1 cm Iron hhIoni + 18 -250 m -1.4 cm 1.33 cm 282 MeV 20.7 MeV 9.7 mm 49.1 cm Iron hhIoni + 19 -250 m -1.46 cm 1.41 cm 265 MeV 17 MeV 8.68 mm 50 cm Iron hhIoni + 20 -249 m -1.5 cm 1.47 cm 248 MeV 17.1 MeV 7.84 mm 50.8 cm Iron hhIoni + 21 -249 m -1.53 cm 1.54 cm 233 MeV 14.5 MeV 7.02 mm 51.5 cm Iron hhIoni + 22 -249 m -1.57 cm 1.62 cm 219 MeV 14.6 MeV 6.4 mm 52.1 cm Iron hhIoni + 23 -249 m -1.63 cm 1.68 cm 205 MeV 13.5 MeV 5.77 mm 52.7 cm Iron hhIoni + 24 -249 m -1.66 cm 1.74 cm 192 MeV 12.9 MeV 5.18 mm 53.2 cm Iron hhIoni + 25 -249 m -1.71 cm 1.8 cm 180 MeV 12.4 MeV 4.66 mm 53.7 cm Iron hhIoni + 26 -249 m -1.74 cm 1.86 cm 168 MeV 12.1 MeV 4.2 mm 54.1 cm Iron hhIoni + 27 -249 m -1.78 cm 1.92 cm 157 MeV 11.1 MeV 3.75 mm 54.5 cm Iron hhIoni + 28 -249 m -1.8 cm 1.97 cm 146 MeV 10.4 MeV 3.34 mm 54.8 cm Iron hhIoni + 29 -249 m -1.83 cm 2.02 cm 138 MeV 8.92 MeV 3 mm 55.1 cm Iron hhIoni + 30 -249 m -1.86 cm 2.06 cm 129 MeV 8.83 MeV 2.71 mm 55.4 cm Iron hhIoni + 31 -249 m -1.88 cm 2.09 cm 121 MeV 8.17 MeV 2.43 mm 55.6 cm Iron hhIoni + 32 -249 m -1.91 cm 2.12 cm 113 MeV 7.31 MeV 2.19 mm 55.8 cm Iron hhIoni + 33 -249 m -1.93 cm 2.14 cm 106 MeV 7.48 MeV 1.99 mm 56 cm Iron hhIoni + 34 -249 m -1.95 cm 2.16 cm 99.1 MeV 6.61 MeV 1.78 mm 56.2 cm Iron hhIoni + 35 -249 m -1.96 cm 2.18 cm 92.7 MeV 6.38 MeV 1.61 mm 56.4 cm Iron hhIoni + 36 -249 m -1.99 cm 2.21 cm 86.9 MeV 5.79 MeV 1.46 mm 56.5 cm Iron hhIoni + 37 -249 m -2 cm 2.24 cm 81 MeV 5.9 MeV 1.32 mm 56.6 cm Iron hhIoni + 38 -249 m -2.01 cm 2.26 cm 75.3 MeV 5.75 MeV 1.18 mm 56.8 cm Iron hhIoni + 39 -249 m -2.03 cm 2.28 cm 70.1 MeV 5.16 MeV 1.06 mm 56.9 cm Iron hhIoni + 40 -249 m -2.04 cm 2.3 cm 65.3 MeV 4.86 MeV 962 um 57 cm Iron hhIoni + 41 -249 m -2.04 cm 2.32 cm 60.6 MeV 4.67 MeV 866 um 57 cm Iron hhIoni + 42 -249 m -2.05 cm 2.33 cm 55.7 MeV 4.87 MeV 782 um 57.1 cm Iron hhIoni + 43 -249 m -2.06 cm 2.35 cm 51.5 MeV 4.18 MeV 701 um 57.2 cm Iron hhIoni + 44 -249 m -2.07 cm 2.36 cm 47.5 MeV 4.06 MeV 632 um 57.3 cm Iron hhIoni + 45 -249 m -2.08 cm 2.37 cm 43.5 MeV 3.96 MeV 571 um 57.3 cm Iron hhIoni + 46 -249 m -2.08 cm 2.38 cm 39.6 MeV 3.9 MeV 516 um 57.4 cm Iron hhIoni + 47 -249 m -2.08 cm 2.39 cm 35.7 MeV 3.94 MeV 462 um 57.4 cm Iron hhIoni + 48 -249 m -2.09 cm 2.4 cm 32 MeV 3.69 MeV 415 um 57.5 cm Iron hhIoni + 49 -249 m -2.09 cm 2.41 cm 28.2 MeV 3.75 MeV 371 um 57.5 cm Iron hhIoni + 50 -249 m -2.09 cm 2.41 cm 24.5 MeV 3.76 MeV 333 um 57.5 cm Iron hhIoni + 51 -249 m -2.1 cm 2.42 cm 20.9 MeV 3.61 MeV 296 um 57.6 cm Iron hhIoni + 52 -249 m -2.1 cm 2.42 cm 17.2 MeV 3.72 MeV 264 um 57.6 cm Iron hhIoni + 53 -249 m -2.1 cm 2.43 cm 13.4 MeV 3.81 MeV 233 um 57.6 cm Iron hhIoni + 54 -249 m -2.1 cm 2.43 cm 9.22 MeV 4.13 MeV 202 um 57.6 cm Iron hhIoni + 55 -249 m -2.1 cm 2.44 cm 4.45 MeV 4.77 MeV 164 um 57.6 cm Iron hhIoni + 56 -249 m -2.1 cm 2.44 cm 0 eV 4.45 MeV 68 um 57.6 cm Iron hhIoni ********************************************************************************************************* * G4Track Information: Particle = anti_proton, Track ID = 1, Parent ID = 0 @@ -1338,70 +1349,70 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process 0 -250 m 0 fm 0 fm 1 GeV 0 eV 0 fm 0 fm Iron initStep - 1 -250 m 828 um 39.7 um 922 MeV 77.7 MeV 5.8 cm 5.8 cm Iron hhIoni - 2 -250 m 1.73 mm 853 um 854 MeV 68.8 MeV 5.19 cm 11 cm Iron hhIoni - 3 -250 m 2.72 mm 2.53 mm 789 MeV 65 MeV 4.66 cm 15.6 cm Iron hhIoni - 4 -250 m 3.28 mm 3.18 mm 735 MeV 53.1 MeV 4.16 cm 19.8 cm Iron hhIoni - 5 -250 m 3.93 mm 3.65 mm 682 MeV 53.2 MeV 3.77 cm 23.6 cm Iron hhIoni - 6 -250 m 4.65 mm 3.77 mm 636 MeV 46.6 MeV 3.38 cm 27 cm Iron hhIoni - 7 -250 m 4.12 mm 3.25 mm 593 MeV 42.4 MeV 3.04 cm 30 cm Iron hhIoni - 8 -250 m 3.54 mm 2.81 mm 553 MeV 40.5 MeV 2.75 cm 32.8 cm Iron hhIoni - 9 -250 m 3.75 mm 2.47 mm 517 MeV 35.8 MeV 2.48 cm 35.2 cm Iron hhIoni - 10 -250 m 3.94 mm 2.47 mm 483 MeV 33.8 MeV 2.24 cm 37.5 cm Iron hhIoni - 11 -250 m 3.69 mm 3.51 mm 453 MeV 30.2 MeV 2.02 cm 39.5 cm Iron hhIoni - 12 -250 m 3.71 mm 4.84 mm 422 MeV 30.9 MeV 1.83 cm 41.3 cm Iron hhIoni - 13 -250 m 3.51 mm 5.75 mm 395 MeV 27.3 MeV 1.64 cm 43 cm Iron hhIoni - 14 -250 m 3.57 mm 6.52 mm 369 MeV 26.2 MeV 1.47 cm 44.4 cm Iron hhIoni - 15 -250 m 3.19 mm 7.35 mm 343 MeV 25.1 MeV 1.33 cm 45.8 cm Iron hhIoni - 16 -250 m 3.41 mm 8.09 mm 323 MeV 20.8 MeV 1.19 cm 46.9 cm Iron hhIoni - 17 -250 m 3.49 mm 8.73 mm 300 MeV 22.4 MeV 1.07 cm 48 cm Iron hhIoni - 18 -250 m 3.6 mm 9.3 mm 283 MeV 17.5 MeV 9.58 mm 49 cm Iron hhIoni - 19 -250 m 3.37 mm 9.86 mm 265 MeV 17.6 MeV 8.71 mm 49.8 cm Iron hhIoni - 20 -249 m 3.36 mm 1.03 cm 249 MeV 16.3 MeV 7.85 mm 50.6 cm Iron hhIoni - 21 -249 m 3.6 mm 1.08 cm 233 MeV 15.4 MeV 7.06 mm 51.3 cm Iron hhIoni - 22 -249 m 3.71 mm 1.15 cm 218 MeV 15.7 MeV 6.39 mm 52 cm Iron hhIoni - 23 -249 m 3.77 mm 1.21 cm 204 MeV 13.3 MeV 5.71 mm 52.5 cm Iron hhIoni - 24 -249 m 3.89 mm 1.25 cm 191 MeV 13.6 MeV 5.14 mm 53.1 cm Iron hhIoni - 25 -249 m 3.99 mm 1.29 cm 179 MeV 12.2 MeV 4.6 mm 53.5 cm Iron hhIoni - 26 -249 m 4.11 mm 1.33 cm 166 MeV 12.1 MeV 4.15 mm 53.9 cm Iron hhIoni - 27 -249 m 4.07 mm 1.35 cm 156 MeV 10.3 MeV 3.69 mm 54.3 cm Iron hhIoni - 28 -249 m 4.09 mm 1.37 cm 145 MeV 11.2 MeV 3.32 mm 54.6 cm Iron hhIoni - 29 -249 m 4.06 mm 1.38 cm 135 MeV 9.5 MeV 2.96 mm 54.9 cm Iron hhIoni - 30 -249 m 4.04 mm 1.39 cm 128 MeV 7.33 MeV 2.65 mm 55.2 cm Iron hhIoni - 31 -249 m 4.01 mm 1.4 cm 120 MeV 8.37 MeV 2.41 mm 55.4 cm Iron hhIoni - 32 -249 m 3.97 mm 1.41 cm 112 MeV 8.09 MeV 2.17 mm 55.7 cm Iron hhIoni - 33 -249 m 3.93 mm 1.39 cm 104 MeV 7.34 MeV 1.95 mm 55.9 cm Iron hhIoni - 34 -249 m 3.93 mm 1.38 cm 97.5 MeV 6.82 MeV 1.75 mm 56 cm Iron hhIoni - 35 -249 m 3.94 mm 1.37 cm 90.9 MeV 6.66 MeV 1.57 mm 56.2 cm Iron hhIoni - 36 -249 m 3.92 mm 1.36 cm 84.8 MeV 6.06 MeV 1.41 mm 56.3 cm Iron hhIoni - 37 -249 m 3.89 mm 1.35 cm 78.9 MeV 5.89 MeV 1.27 mm 56.5 cm Iron hhIoni - 38 -249 m 3.87 mm 1.33 cm 73.6 MeV 5.32 MeV 1.14 mm 56.6 cm Iron hhIoni - 39 -249 m 3.89 mm 1.32 cm 68.1 MeV 5.52 MeV 1.03 mm 56.7 cm Iron hhIoni - 40 -249 m 3.92 mm 1.31 cm 62.6 MeV 5.5 MeV 921 um 56.8 cm Iron hhIoni - 41 -249 m 3.97 mm 1.3 cm 57.8 MeV 4.71 MeV 814 um 56.8 cm Iron hhIoni - 42 -249 m 4.01 mm 1.29 cm 53.3 MeV 4.55 MeV 736 um 56.9 cm Iron hhIoni - 43 -249 m 4.06 mm 1.28 cm 49.6 MeV 3.73 MeV 661 um 57 cm Iron hhIoni - 44 -249 m 4.11 mm 1.27 cm 45.4 MeV 4.15 MeV 600 um 57 cm Iron hhIoni - 45 -249 m 4.16 mm 1.26 cm 41.7 MeV 3.7 MeV 542 um 57.1 cm Iron hhIoni - 46 -249 m 4.18 mm 1.26 cm 37.6 MeV 4.14 MeV 491 um 57.1 cm Iron hhIoni - 47 -249 m 4.22 mm 1.25 cm 33.7 MeV 3.83 MeV 438 um 57.2 cm Iron hhIoni - 48 -249 m 4.27 mm 1.25 cm 30 MeV 3.76 MeV 392 um 57.2 cm Iron hhIoni - 49 -249 m 4.31 mm 1.25 cm 26.3 MeV 3.69 MeV 351 um 57.3 cm Iron hhIoni - 50 -249 m 4.33 mm 1.24 cm 22.6 MeV 3.69 MeV 313 um 57.3 cm Iron hhIoni - 51 -249 m 4.37 mm 1.24 cm 19 MeV 3.63 MeV 279 um 57.3 cm Iron hhIoni - 52 -249 m 4.4 mm 1.24 cm 15.3 MeV 3.66 MeV 248 um 57.3 cm Iron hhIoni - 53 -249 m 4.43 mm 1.23 cm 11.2 MeV 4.11 MeV 218 um 57.4 cm Iron hhIoni - 54 -249 m 4.45 mm 1.23 cm 6.73 MeV 4.46 MeV 184 um 57.4 cm Iron hhIoni - 55 -249 m 4.46 mm 1.23 cm 1.56 MeV 5.17 MeV 127 um 57.4 cm Iron hhIoni - 56 -249 m 4.47 mm 1.23 cm 0 eV 1.56 MeV 12.8 um 57.4 cm Iron hhIoni + 1 -250 m 780 um -282 um 931 MeV 68.9 MeV 5.8 cm 5.8 cm Iron hhIoni + 2 -250 m 395 um 144 um 858 MeV 73.2 MeV 5.26 cm 11.1 cm Iron hhIoni + 3 -250 m -1.24 mm 1.08 mm 798 MeV 59.9 MeV 4.69 cm 15.8 cm Iron hhIoni + 4 -250 m -2.95 mm 526 um 742 MeV 55.8 MeV 4.23 cm 20 cm Iron hhIoni + 5 -250 m -4.15 mm 931 um 688 MeV 53.8 MeV 3.82 cm 23.8 cm Iron hhIoni + 6 -250 m -5.34 mm 1.13 mm 638 MeV 49.9 MeV 3.43 cm 27.2 cm Iron hhIoni + 7 -250 m -5.87 mm 1.14 mm 594 MeV 44.1 MeV 3.06 cm 30.3 cm Iron hhIoni + 8 -250 m -6.79 mm 1.5 mm 553 MeV 41.8 MeV 2.76 cm 33 cm Iron hhIoni + 9 -250 m -7.99 mm 1.06 mm 517 MeV 35.6 MeV 2.48 cm 35.5 cm Iron hhIoni + 10 -250 m -8.74 mm -1.69 mm 483 MeV 34 MeV 2.24 cm 37.8 cm Iron hhIoni + 11 -250 m -9.65 mm -4.38 mm 452 MeV 31.4 MeV 2.02 cm 39.8 cm Iron hhIoni + 12 -250 m -9.85 mm -6.81 mm 425 MeV 26.5 MeV 1.82 cm 41.6 cm Iron hhIoni + 13 -250 m -9.71 mm -9.09 mm 397 MeV 27.9 MeV 1.66 cm 43.3 cm Iron hhIoni + 14 -250 m -9.56 mm -1.07 cm 373 MeV 23.8 MeV 1.49 cm 44.7 cm Iron hhIoni + 15 -250 m -9.82 mm -1.16 cm 347 MeV 26.2 MeV 1.35 cm 46.1 cm Iron hhIoni + 16 -250 m -9.78 mm -1.28 cm 325 MeV 22.5 MeV 1.21 cm 47.3 cm Iron hhIoni + 17 -250 m -9.47 mm -1.37 cm 303 MeV 21.6 MeV 1.08 cm 48.4 cm Iron hhIoni + 18 -250 m -9.29 mm -1.46 cm 283 MeV 19.9 MeV 9.72 mm 49.4 cm Iron hhIoni + 19 -249 m -9.28 mm -1.56 cm 264 MeV 18.6 MeV 8.74 mm 50.2 cm Iron hhIoni + 20 -249 m -9.06 mm -1.64 cm 247 MeV 17 MeV 7.82 mm 51 cm Iron hhIoni + 21 -249 m -8.82 mm -1.71 cm 232 MeV 15.2 MeV 7 mm 51.7 cm Iron hhIoni + 22 -249 m -8.54 mm -1.77 cm 217 MeV 15.7 MeV 6.34 mm 52.4 cm Iron hhIoni + 23 -249 m -8.47 mm -1.82 cm 203 MeV 13.4 MeV 5.67 mm 52.9 cm Iron hhIoni + 24 -249 m -8.16 mm -1.88 cm 191 MeV 11.9 MeV 5.09 mm 53.4 cm Iron hhIoni + 25 -249 m -7.73 mm -1.94 cm 180 MeV 11.1 MeV 4.62 mm 53.9 cm Iron hhIoni + 26 -249 m -7.37 mm -2 cm 168 MeV 11.9 MeV 4.2 mm 54.3 cm Iron hhIoni + 27 -249 m -7.13 mm -2.05 cm 158 MeV 10.6 MeV 3.76 mm 54.7 cm Iron hhIoni + 28 -249 m -6.9 mm -2.09 cm 148 MeV 9.68 MeV 3.36 mm 55 cm Iron hhIoni + 29 -249 m -6.76 mm -2.15 cm 138 MeV 10 MeV 3.05 mm 55.3 cm Iron hhIoni + 30 -249 m -6.66 mm -2.19 cm 129 MeV 9.24 MeV 2.73 mm 55.6 cm Iron hhIoni + 31 -249 m -6.7 mm -2.23 cm 120 MeV 8.96 MeV 2.43 mm 55.8 cm Iron hhIoni + 32 -249 m -6.79 mm -2.28 cm 111 MeV 8.28 MeV 2.17 mm 56.1 cm Iron hhIoni + 33 -249 m -6.79 mm -2.32 cm 104 MeV 7.68 MeV 1.94 mm 56.3 cm Iron hhIoni + 34 -249 m -6.87 mm -2.35 cm 97 MeV 6.78 MeV 1.73 mm 56.4 cm Iron hhIoni + 35 -249 m -6.86 mm -2.38 cm 90.7 MeV 6.32 MeV 1.56 mm 56.6 cm Iron hhIoni + 36 -249 m -6.85 mm -2.4 cm 85 MeV 5.66 MeV 1.41 mm 56.7 cm Iron hhIoni + 37 -249 m -6.8 mm -2.43 cm 79 MeV 6.05 MeV 1.28 mm 56.9 cm Iron hhIoni + 38 -249 m -6.76 mm -2.44 cm 73.7 MeV 5.28 MeV 1.14 mm 57 cm Iron hhIoni + 39 -249 m -6.72 mm -2.46 cm 68.4 MeV 5.25 MeV 1.03 mm 57.1 cm Iron hhIoni + 40 -249 m -6.67 mm -2.48 cm 63.9 MeV 4.53 MeV 929 um 57.2 cm Iron hhIoni + 41 -249 m -6.65 mm -2.49 cm 58.9 MeV 5.04 MeV 839 um 57.2 cm Iron hhIoni + 42 -249 m -6.65 mm -2.51 cm 54.5 MeV 4.32 MeV 753 um 57.3 cm Iron hhIoni + 43 -249 m -6.67 mm -2.52 cm 49.8 MeV 4.7 MeV 681 um 57.4 cm Iron hhIoni + 44 -249 m -6.68 mm -2.54 cm 45.6 MeV 4.22 MeV 604 um 57.5 cm Iron hhIoni + 45 -249 m -6.69 mm -2.55 cm 41.8 MeV 3.87 MeV 545 um 57.5 cm Iron hhIoni + 46 -249 m -6.68 mm -2.55 cm 37.8 MeV 3.98 MeV 491 um 57.6 cm Iron hhIoni + 47 -249 m -6.67 mm -2.56 cm 33.8 MeV 3.93 MeV 440 um 57.6 cm Iron hhIoni + 48 -249 m -6.66 mm -2.57 cm 30.4 MeV 3.41 MeV 393 um 57.6 cm Iron hhIoni + 49 -249 m -6.66 mm -2.57 cm 26.8 MeV 3.63 MeV 355 um 57.7 cm Iron hhIoni + 50 -249 m -6.66 mm -2.58 cm 23.2 MeV 3.61 MeV 318 um 57.7 cm Iron hhIoni + 51 -249 m -6.64 mm -2.58 cm 19.2 MeV 3.95 MeV 284 um 57.7 cm Iron hhIoni + 52 -249 m -6.63 mm -2.59 cm 15.5 MeV 3.78 MeV 250 um 57.8 cm Iron hhIoni + 53 -249 m -6.62 mm -2.59 cm 11.6 MeV 3.87 MeV 219 um 57.8 cm Iron hhIoni + 54 -249 m -6.63 mm -2.6 cm 7.1 MeV 4.49 MeV 187 um 57.8 cm Iron hhIoni + 55 -249 m -6.63 mm -2.6 cm 2.38 MeV 4.73 MeV 134 um 57.8 cm Iron hhIoni + 56 -249 m -6.62 mm -2.6 cm 0 eV 2.38 MeV 24.7 um 57.8 cm Iron hhIoni Run terminated. Run Summary Number of events processed : 2 - User=0.04s Real=0.1s Sys=0.05s + User=0.03s Real=0.04s Sys=0.01s --------- Ranecu engine status --------- Initial seed (index) = 0 - Current couple of seeds = 317171509, 1218282485 + Current couple of seeds = 1802113116, 1362187258 ---------------------------------------- # Graphics systems deleted. @@ -1412,7 +1423,9 @@ UserRunAction deleted. UserPrimaryGenerator deleted. G4 kernel has come to Quit state. EventManager deleted. +Default detector region deleted. UImanager deleted. +Units table cleared. StateManager deleted. RunManagerKernel is deleted. RunManager is deleting. diff --git a/examples/extended/electromagnetic/TestEm6/include/DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm6/include/DetectorConstruction.hh index 9f7474bf36..56f4b7b2ec 100644 --- a/examples/extended/electromagnetic/TestEm6/include/DetectorConstruction.hh +++ b/examples/extended/electromagnetic/TestEm6/include/DetectorConstruction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorConstruction.hh,v 1.3 2006/06/29 16:56:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm6/include/DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm6/include/DetectorMessenger.hh index 0b976cb410..fb1e2d2648 100644 --- a/examples/extended/electromagnetic/TestEm6/include/DetectorMessenger.hh +++ b/examples/extended/electromagnetic/TestEm6/include/DetectorMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorMessenger.hh,v 1.4 2006/06/29 16:56:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm6/include/EventAction.hh b/examples/extended/electromagnetic/TestEm6/include/EventAction.hh index 0af26827c9..ea087ea9db 100644 --- a/examples/extended/electromagnetic/TestEm6/include/EventAction.hh +++ b/examples/extended/electromagnetic/TestEm6/include/EventAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventAction.hh,v 1.3 2006/06/29 16:56:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm6/include/EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm6/include/EventActionMessenger.hh index 80d433e6a1..da78f24919 100644 --- a/examples/extended/electromagnetic/TestEm6/include/EventActionMessenger.hh +++ b/examples/extended/electromagnetic/TestEm6/include/EventActionMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventActionMessenger.hh,v 1.3 2006/06/29 16:56:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm6/include/PhysicsList.hh b/examples/extended/electromagnetic/TestEm6/include/PhysicsList.hh index 5fcaa249c8..fcc059dbcf 100644 --- a/examples/extended/electromagnetic/TestEm6/include/PhysicsList.hh +++ b/examples/extended/electromagnetic/TestEm6/include/PhysicsList.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsList.hh,v 1.7 2006/06/29 16:56:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm6/include/PhysicsListMessenger.hh b/examples/extended/electromagnetic/TestEm6/include/PhysicsListMessenger.hh index 81eae4f09b..d6526474ed 100644 --- a/examples/extended/electromagnetic/TestEm6/include/PhysicsListMessenger.hh +++ b/examples/extended/electromagnetic/TestEm6/include/PhysicsListMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListMessenger.hh,v 1.5 2006/06/29 16:56:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm6/include/PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm6/include/PrimaryGeneratorAction.hh index 087cb1bfa0..af44483a5a 100644 --- a/examples/extended/electromagnetic/TestEm6/include/PrimaryGeneratorAction.hh +++ b/examples/extended/electromagnetic/TestEm6/include/PrimaryGeneratorAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorAction.hh,v 1.3 2006/06/29 16:56:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm6/include/PrimaryGeneratorMessenger.hh b/examples/extended/electromagnetic/TestEm6/include/PrimaryGeneratorMessenger.hh index 565ebdf23c..818f73a99e 100644 --- a/examples/extended/electromagnetic/TestEm6/include/PrimaryGeneratorMessenger.hh +++ b/examples/extended/electromagnetic/TestEm6/include/PrimaryGeneratorMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorMessenger.hh,v 1.3 2006/06/29 16:56:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm6/include/RunAction.hh b/examples/extended/electromagnetic/TestEm6/include/RunAction.hh index 8a5aa94135..0ae54a8d7a 100644 --- a/examples/extended/electromagnetic/TestEm6/include/RunAction.hh +++ b/examples/extended/electromagnetic/TestEm6/include/RunAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RunAction.hh,v 1.9 2006/06/29 16:56:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm6/include/SteppingAction.hh b/examples/extended/electromagnetic/TestEm6/include/SteppingAction.hh index f7b4129cfb..8686eefa9a 100644 --- a/examples/extended/electromagnetic/TestEm6/include/SteppingAction.hh +++ b/examples/extended/electromagnetic/TestEm6/include/SteppingAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingAction.hh,v 1.4 2006/06/29 16:56:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm6/include/SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm6/include/SteppingVerbose.hh index c73864f24c..ebdddbb787 100644 --- a/examples/extended/electromagnetic/TestEm6/include/SteppingVerbose.hh +++ b/examples/extended/electromagnetic/TestEm6/include/SteppingVerbose.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingVerbose.hh,v 1.3 2006/06/29 16:56:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // This class manages the verbose outputs in G4SteppingManager. // It inherits from G4SteppingVerbose. diff --git a/examples/extended/electromagnetic/TestEm6/src/DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm6/src/DetectorConstruction.cc index faad29b8d1..4a4843726d 100644 --- a/examples/extended/electromagnetic/TestEm6/src/DetectorConstruction.cc +++ b/examples/extended/electromagnetic/TestEm6/src/DetectorConstruction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorConstruction.cc,v 1.10 2006/06/29 16:57:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm6/src/DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm6/src/DetectorMessenger.cc index 3c55122b01..e4bb130b59 100644 --- a/examples/extended/electromagnetic/TestEm6/src/DetectorMessenger.cc +++ b/examples/extended/electromagnetic/TestEm6/src/DetectorMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorMessenger.cc,v 1.5 2006/06/29 16:57:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm6/src/EventAction.cc b/examples/extended/electromagnetic/TestEm6/src/EventAction.cc index 544b8a0c4a..d1cc098629 100644 --- a/examples/extended/electromagnetic/TestEm6/src/EventAction.cc +++ b/examples/extended/electromagnetic/TestEm6/src/EventAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventAction.cc,v 1.6 2006/06/29 16:57:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm6/src/EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm6/src/EventActionMessenger.cc index b290c9acb5..2a7fe84494 100644 --- a/examples/extended/electromagnetic/TestEm6/src/EventActionMessenger.cc +++ b/examples/extended/electromagnetic/TestEm6/src/EventActionMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventActionMessenger.cc,v 1.6 2006/06/29 16:57:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm6/src/PhysicsList.cc b/examples/extended/electromagnetic/TestEm6/src/PhysicsList.cc index 8d4983f6ad..eb5b94a918 100644 --- a/examples/extended/electromagnetic/TestEm6/src/PhysicsList.cc +++ b/examples/extended/electromagnetic/TestEm6/src/PhysicsList.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsList.cc,v 1.12 2006/06/29 16:57:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm6/src/PhysicsListMessenger.cc b/examples/extended/electromagnetic/TestEm6/src/PhysicsListMessenger.cc index 37f7f71815..2b3ae1be5b 100644 --- a/examples/extended/electromagnetic/TestEm6/src/PhysicsListMessenger.cc +++ b/examples/extended/electromagnetic/TestEm6/src/PhysicsListMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListMessenger.cc,v 1.8 2006/06/29 16:57:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm6/src/PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm6/src/PrimaryGeneratorAction.cc index 0f81df550a..57211f2256 100644 --- a/examples/extended/electromagnetic/TestEm6/src/PrimaryGeneratorAction.cc +++ b/examples/extended/electromagnetic/TestEm6/src/PrimaryGeneratorAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorAction.cc,v 1.3 2006/06/29 16:57:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm6/src/PrimaryGeneratorMessenger.cc b/examples/extended/electromagnetic/TestEm6/src/PrimaryGeneratorMessenger.cc index 5c5bf8bcdd..861eda8181 100644 --- a/examples/extended/electromagnetic/TestEm6/src/PrimaryGeneratorMessenger.cc +++ b/examples/extended/electromagnetic/TestEm6/src/PrimaryGeneratorMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorMessenger.cc,v 1.5 2006/06/29 16:57:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm6/src/RunAction.cc b/examples/extended/electromagnetic/TestEm6/src/RunAction.cc index de5ece8dd1..f4e5b2bd18 100644 --- a/examples/extended/electromagnetic/TestEm6/src/RunAction.cc +++ b/examples/extended/electromagnetic/TestEm6/src/RunAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RunAction.cc,v 1.12 2006/06/29 16:57:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm6/src/SteppingAction.cc b/examples/extended/electromagnetic/TestEm6/src/SteppingAction.cc index 364e27343d..8621b516c0 100644 --- a/examples/extended/electromagnetic/TestEm6/src/SteppingAction.cc +++ b/examples/extended/electromagnetic/TestEm6/src/SteppingAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingAction.cc,v 1.9 2006/06/29 16:57:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm6/src/SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm6/src/SteppingVerbose.cc index ff0b4e7546..37104a98ac 100644 --- a/examples/extended/electromagnetic/TestEm6/src/SteppingVerbose.cc +++ b/examples/extended/electromagnetic/TestEm6/src/SteppingVerbose.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingVerbose.cc,v 1.5 2006/06/29 16:57:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm7/GNUmakefile b/examples/extended/electromagnetic/TestEm7/GNUmakefile index 2703e87a96..f8fd5f52d6 100644 --- a/examples/extended/electromagnetic/TestEm7/GNUmakefile +++ b/examples/extended/electromagnetic/TestEm7/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.6 2004/07/08 16:21:06 maire Exp $ +# $Id: GNUmakefile,v 1.7 2006/10/24 11:37:56 vnivanch Exp $ # -------------------------------------------------------------- # GNUmakefile for examples module. Gabriele Cosmo, 06/04/98. # -------------------------------------------------------------- @@ -25,7 +25,7 @@ include $(G4INSTALL)/config/architecture.gmk ifdef G4ANALYSIS_USE # for the aida-config command see the README file CPPFLAGS += `aida-config --include` - LDFLAGS += `aida-config --lib` + LOADLIBS += `aida-config --lib` endif include $(G4INSTALL)/config/binmake.gmk @@ -33,6 +33,6 @@ include $(G4INSTALL)/config/binmake.gmk visclean: rm -f g4*.prim g4*.eps g4*.wrl rm -f .DAWN_* - + histclean: rm ${G4WORKDIR}/tmp/${G4SYSTEM}/${G4TARGET}/RunAction.o diff --git a/examples/extended/electromagnetic/TestEm7/History b/examples/extended/electromagnetic/TestEm7/History index ed4e204b2d..2a0a372039 100644 --- a/examples/extended/electromagnetic/TestEm7/History +++ b/examples/extended/electromagnetic/TestEm7/History @@ -1,4 +1,4 @@ -$Id: History,v 1.39 2006/06/02 14:14:49 maire Exp $ +$Id: History,v 1.44 2006/12/11 20:13:53 vnivanch Exp $ ------------------------------------------------------------------- ========================================================= @@ -14,6 +14,23 @@ track of all tags. ---------------------------------------------------------- * Reverse chronological order (last date on top), please * ---------------------------------------------------------- + +11-12-06: V.Ivant (testem7-V08-01-03) +- fix Livermore phys constructor +- fix use of elastic constructor + +22-11-06: V.Ivant (testem7-V08-01-02) +- Fix cout for the case when range exceed width of the absober +- Rename standard options: "G4standard", "G4standard_fast" +- Add Livermore and Penelope options + +15-11-06: V.Ivant (testem7-V08-01-01) +- Add NIST materials + +26-10-06 mma (testem7-V08-01-00) +- Add "standardSS" and "standardMSC" options to Physics List +- Remove "g4v52" and "g4v71" options +- substitute LDFLAGS -> LOADLIBS 02-06-06 mma (testem7-V08-00-05) - SteppingAction: prePoint->GetTouchableHandle->GetVolume() diff --git a/examples/extended/electromagnetic/TestEm7/README b/examples/extended/electromagnetic/TestEm7/README index c0f2aa24a5..e2aed37f87 100644 --- a/examples/extended/electromagnetic/TestEm7/README +++ b/examples/extended/electromagnetic/TestEm7/README @@ -1,4 +1,4 @@ -$Id: README,v 1.13 2006/05/15 14:40:24 maire Exp $ +$Id: README,v 1.14 2006/11/22 18:56:20 vnivanch Exp $ ------------------------------------------------------------------- ========================================================= @@ -38,8 +38,18 @@ $Id: README,v 1.13 2006/05/15 14:40:24 maire Exp $ Physics Lists are subdivided on 4 following modules: 1. "particles" - particle definitions 2. "general" - decays and transportation - 3. "standard" (alternative) - standard EM physics - 4. "model" (alternative) - standard EM physics using model approach + + The following options for EM physics are available: + - "standard" the best standard EM physics (default) + - "G4standard" recommended standard EM physics for LHC + - "G4standard_fast" the best CPU performance standard physics for LHC + - "Livermore" low-energy EM physics using Livermore data + - "Penelope" low-energy EM physics implementing Penelope models + + Optional components can be added: + - "elastic" elastic scattering of hadrons + - "binary" QBBC configuration of hadron inelastic models + - "binary_ion" Binary ion inelastic models Notice that there is an example of definition of a static ion : IonC12 (see PhysListParticle.cc) and an example of use : ionC12.mac diff --git a/examples/extended/electromagnetic/TestEm7/TestEm7.cc b/examples/extended/electromagnetic/TestEm7/TestEm7.cc index 55c68a3743..25c9f9bf27 100644 --- a/examples/extended/electromagnetic/TestEm7/TestEm7.cc +++ b/examples/extended/electromagnetic/TestEm7/TestEm7.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TestEm7.cc,v 1.6 2006/06/29 16:57:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm7/TestEm7.out b/examples/extended/electromagnetic/TestEm7/TestEm7.out index 5abb377aeb..4346185e52 100644 --- a/examples/extended/electromagnetic/TestEm7/TestEm7.out +++ b/examples/extended/electromagnetic/TestEm7/TestEm7.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -44,17 +44,13 @@ Registered model factories: drawByCharge drawByParticleID drawByOriginVolume - -Registered models: - None + drawByAttribute Registered filter factories: chargeFilter particleFilter originVolumeFilter - -Registered filters: - None + attributeFilter /run/verbose 2 # @@ -104,6 +100,7 @@ PhysicsList::SetCuts:CutLength : 1 mm /run/beamOn 10000 phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV Sampling according Klein-Nishina model @@ -111,7 +108,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.022 MeV to 100 GeV in 100 bins. @@ -120,114 +117,114 @@ msc: Model variant of multiple scattering for e- Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 eIoni: tables are built for e- - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. + dE/dx and range tables from 100 eV to 100 TeV in 480 bins. + Lambda tables from threshold to 100 TeV in 480 bins. Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV. Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 eBrem: tables are built for e- - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. + dE/dx and range tables from 100 eV to 100 TeV in 480 bins. + Lambda tables from threshold to 100 TeV in 480 bins. Total cross sections from a parametrisation based on the EEDL data library. Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. eIoni: tables are built for e+ - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. + dE/dx and range tables from 100 eV to 100 TeV in 480 bins. + Lambda tables from threshold to 100 TeV in 480 bins. Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV. Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 eBrem: tables are built for e+ - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. + dE/dx and range tables from 100 eV to 100 TeV in 480 bins. + Lambda tables from threshold to 100 TeV in 480 bins. Total cross sections from a parametrisation based on the EEDL data library. Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. msc: Model variant of multiple scattering for proton Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + Boundary/stepping algorithm is active with facrange= 0.2 Step limitation 0 hIoni: tables are built for proton - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. + dE/dx and range tables from 100 eV to 100 TeV in 480 bins. + Lambda tables from threshold to 100 TeV in 480 bins. Scaling relation is used to proton dE/dx and range Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for protons below. Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 msc: Model variant of multiple scattering for GenericIon - Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + Boundary/stepping algorithm is active with facrange= 0.2 Step limitation 0 ionIoni: tables are built for GenericIon - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. + dE/dx and range tables from 100 eV to 100 TeV in 480 bins. + Lambda tables from threshold to 100 TeV in 480 bins. Scaling relation is used to proton dE/dx and range Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for alpha particles below. Stopping Power data for 8 ion/material pairs are used. Step function: finalRange(mm)= 0.1, dRoverRange= 0.1, integral: 1 hIoni: tables are built for anti_proton - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. + dE/dx and range tables from 100 eV to 100 TeV in 480 bins. + Lambda tables from threshold to 100 TeV in 480 bins. Scaling relation is used to proton dE/dx and range Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for protons below. Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 msc: Model variant of multiple scattering for mu+ Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + Boundary/stepping algorithm is active with facrange= 0.2 Step limitation 0 muIoni: tables are built for mu+ - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. + dE/dx and range tables from 100 eV to 100 TeV in 480 bins. + Lambda tables from threshold to 100 TeV in 480 bins. Bether-Bloch model for E > 0.2 MeV, parametrisation of Bragg peak below, radiative corrections for E > 1 GeV Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 muBrems: tables are built for mu+ - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. + dE/dx and range tables from 100 eV to 100 TeV in 480 bins. + Lambda tables from threshold to 100 TeV in 480 bins. Parametrised model muPairProd: tables are built for mu+ - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. + dE/dx and range tables from 100 eV to 100 TeV in 480 bins. + Lambda tables from threshold to 100 TeV in 480 bins. Parametrised model muIoni: tables are built for mu- - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. + dE/dx and range tables from 100 eV to 100 TeV in 480 bins. + Lambda tables from threshold to 100 TeV in 480 bins. Bether-Bloch model for E > 0.2 MeV, parametrisation of Bragg peak below, radiative corrections for E > 1 GeV Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 muBrems: tables are built for mu- - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. + dE/dx and range tables from 100 eV to 100 TeV in 480 bins. + Lambda tables from threshold to 100 TeV in 480 bins. Parametrised model muPairProd: tables are built for mu- - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. + dE/dx and range tables from 100 eV to 100 TeV in 480 bins. + Lambda tables from threshold to 100 TeV in 480 bins. Parametrised model hIoni: tables are built for pi+ - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. + dE/dx and range tables from 100 eV to 100 TeV in 480 bins. + Lambda tables from threshold to 100 TeV in 480 bins. Scaling relation is used to proton dE/dx and range Bether-Bloch model for Escaled > 0.297504 MeV, ICRU49 parametrisation for protons below. Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 msc: Model variant of multiple scattering for pi- Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + Boundary/stepping algorithm is active with facrange= 0.2 Step limitation 0 hIoni: tables are built for pi- - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. + dE/dx and range tables from 100 eV to 100 TeV in 480 bins. + Lambda tables from threshold to 100 TeV in 480 bins. Scaling relation is used to proton dE/dx and range Bether-Bloch model for Escaled > 0.297504 MeV, ICRU49 parametrisation for protons below. Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 @@ -299,25 +296,25 @@ Start Run processing. Run terminated. Run Summary Number of events processed : 10000 - User=188.36s Real=267.48s Sys=59.62s + User=185.08s Real=285.56s Sys=25.33s The run consists of 10000 proton of 160 MeV through 20 cm of Water (density: 1 g/cm3 ) - projected Range= 17.6818 cm rms= 1.88663 mm + projected Range= 17.7591 cm rms= 2.39362 mm --------------------------------------------------------- Cumulated Doses : Edep Edep/Ebeam Dose - tally 0: 4.58124 GeV 0.286327 % 9.17494e-05 Gy - tally 1: 4.69123 GeV 0.293202 % 9.39523e-05 Gy - tally 2: 2.64732 GeV 0.165457 % 5.30184e-05 Gy - tally 3: 1.46715 GeV 0.091697 % 2.9383e-05 Gy + tally 0: 4.63463 GeV 0.289665 % 9.28188e-05 Gy + tally 1: 4.94989 GeV 0.309368 % 9.91325e-05 Gy + tally 2: 3.37934 GeV 0.211209 % 6.76787e-05 Gy + tally 3: 1.99408 GeV 0.12463 % 3.99359e-05 Gy --------------------------------------------------------- --------- Ranecu engine status --------- Initial seed (index) = 0 - Current couple of seeds = 2096667914, 1375986834 + Current couple of seeds = 921989408, 1028175994 ---------------------------------------- # /gun/particle ion @@ -352,7 +349,7 @@ Index : 1 used in the geometry : Yes recalculation needed : No --------- Ranecu engine status --------- Initial seed (index) = 0 - Current couple of seeds = 2096667914, 1375986834 + Current couple of seeds = 921989408, 1028175994 ---------------------------------------- Start Run processing. @@ -360,25 +357,25 @@ Start Run processing. Run terminated. Run Summary Number of events processed : 1000 - User=74.93s Real=100.29s Sys=22.41s + User=63.73s Real=91.39s Sys=6.83s The run consists of 1000 C12[0.0] of 3.5 GeV through 20 cm of Water (density: 1 g/cm3 ) - projected Range= 16.379 cm rms= 461.733 um + projected Range= 16.4657 cm rms= 464.552 um --------------------------------------------------------- Cumulated Doses : Edep Edep/Ebeam Dose - tally 0: 11.1463 GeV 0.318467 % 0.00022323 Gy - tally 1: 13.0655 GeV 0.373299 % 0.000261665 Gy - tally 2: 15.8046 GeV 0.451561 % 0.000316523 Gy - tally 3: 22.9671 GeV 0.656203 % 0.000459967 Gy + tally 0: 11.0529 GeV 0.315798 % 0.00022136 Gy + tally 1: 13.0458 GeV 0.372738 % 0.000261272 Gy + tally 2: 15.891 GeV 0.454029 % 0.000318253 Gy + tally 3: 24.2011 GeV 0.69146 % 0.000484681 Gy --------------------------------------------------------- --------- Ranecu engine status --------- Initial seed (index) = 0 - Current couple of seeds = 877080592, 1634085242 + Current couple of seeds = 30782651, 380120556 ---------------------------------------- Graphics systems deleted. Visualization Manager deleting... @@ -388,7 +385,9 @@ UserRunAction deleted. UserPrimaryGenerator deleted. G4 kernel has come to Quit state. EventManager deleted. +Default detector region deleted. UImanager deleted. +Units table cleared. StateManager deleted. RunManagerKernel is deleted. RunManager is deleting. diff --git a/examples/extended/electromagnetic/TestEm7/include/DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm7/include/DetectorConstruction.hh index 304805070a..48aee1d543 100644 --- a/examples/extended/electromagnetic/TestEm7/include/DetectorConstruction.hh +++ b/examples/extended/electromagnetic/TestEm7/include/DetectorConstruction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorConstruction.hh,v 1.2 2006/06/29 16:57:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm7/include/DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm7/include/DetectorMessenger.hh index 276f52179b..f22e085b3f 100644 --- a/examples/extended/electromagnetic/TestEm7/include/DetectorMessenger.hh +++ b/examples/extended/electromagnetic/TestEm7/include/DetectorMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorMessenger.hh,v 1.3 2006/06/29 16:57:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm7/include/EventAction.hh b/examples/extended/electromagnetic/TestEm7/include/EventAction.hh index 9101328bdf..692c42b3e5 100644 --- a/examples/extended/electromagnetic/TestEm7/include/EventAction.hh +++ b/examples/extended/electromagnetic/TestEm7/include/EventAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventAction.hh,v 1.2 2006/06/29 16:57:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm7/include/EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm7/include/EventActionMessenger.hh index bbbddaf9c9..2ba80d1a91 100644 --- a/examples/extended/electromagnetic/TestEm7/include/EventActionMessenger.hh +++ b/examples/extended/electromagnetic/TestEm7/include/EventActionMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventActionMessenger.hh,v 1.3 2006/06/29 16:57:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm7/include/PhysListBinaryCascade.hh b/examples/extended/electromagnetic/TestEm7/include/PhysListBinaryCascade.hh deleted file mode 100644 index 5c44fb564d..0000000000 --- a/examples/extended/electromagnetic/TestEm7/include/PhysListBinaryCascade.hh +++ /dev/null @@ -1,76 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// $Id: PhysListBinaryCascade.hh,v 1.6 2006/06/29 16:57:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// The class provides PhysicsList for Binary Cascade for -// protons and neutrons with the energy E<3 GeV -// -// 14.10.02 created by V.Ivanchenko -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#ifndef PhysListBinaryCascade_h -#define PhysListBinaryCascade_h 1 - -#include "G4VPhysicsConstructor.hh" -#include "globals.hh" -#include "G4ProtonInelasticProcess.hh" -#include "G4NeutronInelasticProcess.hh" -#include "G4ProtonInelasticCrossSection.hh" -#include "G4NeutronInelasticCrossSection.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -class PhysListBinaryCascade : public G4VPhysicsConstructor -{ - public: - PhysListBinaryCascade(const G4String& name = "binary"); - virtual ~PhysListBinaryCascade(); - - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - void ConstructParticle() {}; - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - void ConstructProcess(); - - private: - - G4ProtonInelasticProcess theIPproton; - G4NeutronInelasticProcess theIPneutron; - G4ProtonInelasticCrossSection thePXSec; - G4NeutronInelasticCrossSection theNXSec; - -}; - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#endif diff --git a/examples/extended/electromagnetic/TestEm7/include/PhysListEmG4v52.hh b/examples/extended/electromagnetic/TestEm7/include/PhysListEmG4v52.hh deleted file mode 100644 index 98ae9f5206..0000000000 --- a/examples/extended/electromagnetic/TestEm7/include/PhysListEmG4v52.hh +++ /dev/null @@ -1,67 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: PhysListEmG4v52.hh,v 1.2 2006/06/29 16:57:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#ifndef PhysListEmG4v52_h -#define PhysListEmG4v52_h 1 - -#include "G4VPhysicsConstructor.hh" -#include "globals.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -class PhysListEmG4v52 : public G4VPhysicsConstructor -{ - public: - PhysListEmG4v52(const G4String& name = "g4v52"); - ~PhysListEmG4v52(); - - public: - // This method is dummy for physics. - void ConstructParticle() {}; - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - void ConstructProcess(); -}; - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#endif - - - - - - - - diff --git a/examples/extended/electromagnetic/TestEm5/include/PhysListEmG4v71.hh b/examples/extended/electromagnetic/TestEm7/include/PhysListEmLivermore.hh similarity index 88% rename from examples/extended/electromagnetic/TestEm5/include/PhysListEmG4v71.hh rename to examples/extended/electromagnetic/TestEm7/include/PhysListEmLivermore.hh index aa27c15ca0..c5be9ab801 100644 --- a/examples/extended/electromagnetic/TestEm5/include/PhysListEmG4v71.hh +++ b/examples/extended/electromagnetic/TestEm7/include/PhysListEmLivermore.hh @@ -23,25 +23,26 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: PhysListEmG4v71.hh,v 1.2 2006/06/29 16:54:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// +// $Id: PhysListEmLivermore.hh,v 1.1 2006/11/22 18:56:20 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#ifndef PhysListEmG4v71_h -#define PhysListEmG4v71_h 1 +#ifndef PhysListEmLivermore_h +#define PhysListEmLivermore_h 1 #include "G4VPhysicsConstructor.hh" #include "globals.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -class PhysListEmG4v71 : public G4VPhysicsConstructor +class PhysListEmLivermore : public G4VPhysicsConstructor { public: - PhysListEmG4v71(const G4String& name = "g4v71"); - ~PhysListEmG4v71(); + PhysListEmLivermore(const G4String& name = "Livermore"); + ~PhysListEmLivermore(); public: // This method is dummy for physics diff --git a/examples/extended/electromagnetic/TestEm1/include/PhysListEmG4v71.hh b/examples/extended/electromagnetic/TestEm7/include/PhysListEmPenelope.hh similarity index 88% rename from examples/extended/electromagnetic/TestEm1/include/PhysListEmG4v71.hh rename to examples/extended/electromagnetic/TestEm7/include/PhysListEmPenelope.hh index 90c58b5e91..89b44f4e80 100644 --- a/examples/extended/electromagnetic/TestEm1/include/PhysListEmG4v71.hh +++ b/examples/extended/electromagnetic/TestEm7/include/PhysListEmPenelope.hh @@ -24,25 +24,25 @@ // ******************************************************************** // // -// $Id: PhysListEmG4v71.hh,v 1.3 2006/06/29 16:36:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListEmPenelope.hh,v 1.1 2006/11/22 18:56:21 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#ifndef PhysListEmG4v71_h -#define PhysListEmG4v71_h 1 +#ifndef PhysListEmPenelope_h +#define PhysListEmPenelope_h 1 #include "G4VPhysicsConstructor.hh" #include "globals.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -class PhysListEmG4v71 : public G4VPhysicsConstructor +class PhysListEmPenelope : public G4VPhysicsConstructor { public: - PhysListEmG4v71(const G4String& name = "g4v71"); - ~PhysListEmG4v71(); + PhysListEmPenelope(const G4String& name = "Penelope"); + ~PhysListEmPenelope(); public: // This method is dummy for physics diff --git a/examples/extended/electromagnetic/TestEm7/include/PhysListEmStandard.hh b/examples/extended/electromagnetic/TestEm7/include/PhysListEmStandard.hh index 85c7d68b97..e1b813b3aa 100644 --- a/examples/extended/electromagnetic/TestEm7/include/PhysListEmStandard.hh +++ b/examples/extended/electromagnetic/TestEm7/include/PhysListEmStandard.hh @@ -25,7 +25,7 @@ // // // $Id: PhysListEmStandard.hh,v 1.3 2006/06/29 16:57:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm9/include/PhysListEmG4v52.hh b/examples/extended/electromagnetic/TestEm7/include/PhysListEmStandardSS.hh similarity index 86% rename from examples/extended/electromagnetic/TestEm9/include/PhysListEmG4v52.hh rename to examples/extended/electromagnetic/TestEm7/include/PhysListEmStandardSS.hh index 875a1d96ac..bdd623c9c2 100644 --- a/examples/extended/electromagnetic/TestEm9/include/PhysListEmG4v52.hh +++ b/examples/extended/electromagnetic/TestEm7/include/PhysListEmStandardSS.hh @@ -23,29 +23,28 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// -// $Id: PhysListEmG4v52.hh,v 1.3 2006/06/29 17:01:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListEmStandardSS.hh,v 1.1 2006/10/24 11:37:56 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#ifndef PhysListEmG4v52_h -#define PhysListEmG4v52_h 1 +#ifndef PhysListEmStandardSS_h +#define PhysListEmStandardSS_h 1 #include "G4VPhysicsConstructor.hh" #include "globals.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -class PhysListEmG4v52 : public G4VPhysicsConstructor +class PhysListEmStandardSS : public G4VPhysicsConstructor { public: - PhysListEmG4v52(const G4String& name = "g4v52"); - ~PhysListEmG4v52(); + PhysListEmStandardSS(const G4String& name = "standardSS"); + virtual ~PhysListEmStandardSS(); public: - // This method is dummy for physics. + // This method is dummy for physics void ConstructParticle() {}; // This method will be invoked in the Construct() method. diff --git a/examples/extended/electromagnetic/TestEm7/include/PhysListIonBinaryCascade.hh b/examples/extended/electromagnetic/TestEm7/include/PhysListIonBinaryCascade.hh deleted file mode 100644 index dcec440ba7..0000000000 --- a/examples/extended/electromagnetic/TestEm7/include/PhysListIonBinaryCascade.hh +++ /dev/null @@ -1,74 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// $Id: PhysListIonBinaryCascade.hh,v 1.4 2006/06/29 16:57:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// 18.11.03 created by V.Ivanchenko -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#ifndef PhysListIonBinaryCascade_h -#define PhysListIonBinaryCascade_h 1 - -#include "G4VPhysicsConstructor.hh" -#include "globals.hh" -#include "G4DeuteronInelasticProcess.hh" -#include "G4TritonInelasticProcess.hh" -#include "G4AlphaInelasticProcess.hh" - -class G4HadronInelasticProcess; - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -class PhysListIonBinaryCascade : public G4VPhysicsConstructor -{ - public: - PhysListIonBinaryCascade(const G4String& name = "binary_ion"); - virtual ~PhysListIonBinaryCascade(); - - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - void ConstructParticle() {}; - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - void ConstructProcess(); - - private: - - G4DeuteronInelasticProcess theIPdeuteron; - G4TritonInelasticProcess theIPtriton; - G4AlphaInelasticProcess theIPalpha; - G4HadronInelasticProcess* theIPGenericIon; - -}; - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#endif diff --git a/examples/extended/electromagnetic/TestEm7/include/PhysicsList.hh b/examples/extended/electromagnetic/TestEm7/include/PhysicsList.hh index 00921c4e63..7ab57f4bce 100644 --- a/examples/extended/electromagnetic/TestEm7/include/PhysicsList.hh +++ b/examples/extended/electromagnetic/TestEm7/include/PhysicsList.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: PhysicsList.hh,v 1.5 2006/06/29 16:57:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysicsList.hh,v 1.6 2006/11/22 18:56:21 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... // @@ -48,35 +48,39 @@ class PhysicsListMessenger; class PhysicsList: public G4VModularPhysicsList { - public: - PhysicsList(); - ~PhysicsList(); +public: + PhysicsList(); + virtual ~PhysicsList(); - void ConstructParticle(); + void ConstructParticle(); - void SetCuts(); - void SetCutForGamma(G4double); - void SetCutForElectron(G4double); - void SetCutForPositron(G4double); + void SetCuts(); + void SetCutForGamma(G4double); + void SetCutForElectron(G4double); + void SetCutForPositron(G4double); - void AddPhysicsList(const G4String& name); - void ConstructProcess(); + void AddPhysicsList(const G4String& name); + void ConstructProcess(); - void AddStepMax(); - StepMax* GetStepMaxProcess() {return stepMaxProcess;}; + void AddStepMax(); + StepMax* GetStepMaxProcess() {return stepMaxProcess;}; - private: - G4double cutForGamma; - G4double cutForElectron; - G4double cutForPositron; +private: + G4double cutForGamma; + G4double cutForElectron; + G4double cutForPositron; + + G4bool helIsRegisted; + G4bool bicIsRegisted; + G4bool biciIsRegisted; - G4String emName; - G4VPhysicsConstructor* emPhysicsList; - std::vector hadronPhys; + G4String emName; + G4VPhysicsConstructor* emPhysicsList; + std::vector hadronPhys; - StepMax* stepMaxProcess; + StepMax* stepMaxProcess; - PhysicsListMessenger* pMessenger; + PhysicsListMessenger* pMessenger; }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm7/include/PhysicsListMessenger.hh b/examples/extended/electromagnetic/TestEm7/include/PhysicsListMessenger.hh index d42b5ccee6..d20b3657cb 100644 --- a/examples/extended/electromagnetic/TestEm7/include/PhysicsListMessenger.hh +++ b/examples/extended/electromagnetic/TestEm7/include/PhysicsListMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListMessenger.hh,v 1.3 2006/06/29 16:57:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm7/include/PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm7/include/PrimaryGeneratorAction.hh index fa1750b1f1..3e5161081c 100644 --- a/examples/extended/electromagnetic/TestEm7/include/PrimaryGeneratorAction.hh +++ b/examples/extended/electromagnetic/TestEm7/include/PrimaryGeneratorAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorAction.hh,v 1.3 2006/06/29 16:57:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm7/include/PrimaryGeneratorMessenger.hh b/examples/extended/electromagnetic/TestEm7/include/PrimaryGeneratorMessenger.hh index 2bb2c61d11..67eec90e91 100644 --- a/examples/extended/electromagnetic/TestEm7/include/PrimaryGeneratorMessenger.hh +++ b/examples/extended/electromagnetic/TestEm7/include/PrimaryGeneratorMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorMessenger.hh,v 1.3 2006/06/29 16:57:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm7/include/RunAction.hh b/examples/extended/electromagnetic/TestEm7/include/RunAction.hh index 5129097565..d6524d7947 100644 --- a/examples/extended/electromagnetic/TestEm7/include/RunAction.hh +++ b/examples/extended/electromagnetic/TestEm7/include/RunAction.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: RunAction.hh,v 1.9 2006/06/29 16:57:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: RunAction.hh,v 1.10 2006/11/22 17:58:11 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -50,19 +50,19 @@ namespace AIDA { class RunAction : public G4UserRunAction { - public: - RunAction(DetectorConstruction*, PhysicsList*,PrimaryGeneratorAction*); - ~RunAction(); +public: + RunAction(DetectorConstruction*, PhysicsList*,PrimaryGeneratorAction*); + virtual ~RunAction(); - public: - void BeginOfRunAction(const G4Run*); - void EndOfRunAction(const G4Run*); + void BeginOfRunAction(const G4Run*); + void EndOfRunAction(const G4Run*); - void FillTallyEdep(G4int n, G4double e) {tallyEdep[n] += e;}; + void FillTallyEdep(G4int n, G4double e) {tallyEdep[n] += e;}; - G4double GetBinLength() {return binLength;}; - G4double GetOffsetX() {return offsetX;} - void FillHisto(G4int id, G4double x, G4double weight = 1.0); + G4double GetBinLength() {return binLength;}; + G4double GetLength() {return length;}; + G4double GetOffsetX() {return offsetX;} + void FillHisto(G4int id, G4double x, G4double weight = 1.0); void AddProjRange (G4double x) {projRange += x; projRange2 += x*x;}; @@ -77,6 +77,7 @@ class RunAction : public G4UserRunAction G4double* tallyEdep; G4double binLength; G4double offsetX; + G4double length; G4double projRange, projRange2; AIDA::IAnalysisFactory* af; diff --git a/examples/extended/electromagnetic/TestEm7/include/StepMax.hh b/examples/extended/electromagnetic/TestEm7/include/StepMax.hh index 4c334120fa..7e7bdf0b12 100644 --- a/examples/extended/electromagnetic/TestEm7/include/StepMax.hh +++ b/examples/extended/electromagnetic/TestEm7/include/StepMax.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMax.hh,v 1.3 2006/06/29 16:58:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm7/include/StepMaxMessenger.hh b/examples/extended/electromagnetic/TestEm7/include/StepMaxMessenger.hh index 7e81d85992..25ae3c251a 100644 --- a/examples/extended/electromagnetic/TestEm7/include/StepMaxMessenger.hh +++ b/examples/extended/electromagnetic/TestEm7/include/StepMaxMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMaxMessenger.hh,v 1.2 2006/06/29 16:58:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm7/include/SteppingAction.hh b/examples/extended/electromagnetic/TestEm7/include/SteppingAction.hh index bde47d6307..e5cfe562b2 100644 --- a/examples/extended/electromagnetic/TestEm7/include/SteppingAction.hh +++ b/examples/extended/electromagnetic/TestEm7/include/SteppingAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingAction.hh,v 1.2 2006/06/29 16:58:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm7/include/SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm7/include/SteppingVerbose.hh index 11e027183c..f50cbc552a 100644 --- a/examples/extended/electromagnetic/TestEm7/include/SteppingVerbose.hh +++ b/examples/extended/electromagnetic/TestEm7/include/SteppingVerbose.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingVerbose.hh,v 1.2 2006/06/29 16:58:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm7/include/TrackingAction.hh b/examples/extended/electromagnetic/TestEm7/include/TrackingAction.hh index 93dc7c744d..b056fb3511 100644 --- a/examples/extended/electromagnetic/TestEm7/include/TrackingAction.hh +++ b/examples/extended/electromagnetic/TestEm7/include/TrackingAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TrackingAction.hh,v 1.2 2006/06/29 16:58:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm7/ionC12.mac b/examples/extended/electromagnetic/TestEm7/ionC12.mac index e224b5a8a4..3e66ed911b 100644 --- a/examples/extended/electromagnetic/TestEm7/ionC12.mac +++ b/examples/extended/electromagnetic/TestEm7/ionC12.mac @@ -1,4 +1,4 @@ -# $Id: ionC12.mac,v 1.14 2006/01/30 10:35:33 maire Exp $ +# $Id: ionC12.mac,v 1.15 2006/12/11 20:13:53 vnivanch Exp $ # # Macro file for "TestEm7.cc" # (can be run in batch, without graphic) @@ -8,27 +8,31 @@ /run/verbose 2 # /testem/det/setMat Water +#/testem/det/setMat G4_WATER /testem/det/setSizeX 20 cm /testem/det/setSizeYZ 20 cm # /testem/det/tallyMat Water +#/testem/det/tallyMat G4_WATER /testem/det/tallySize 2. 2. 2. mm /testem/det/tallyPosition -9.9 0. 0. cm /testem/det/tallyPosition -5. 0. 0. cm /testem/det/tallyPosition 0. 0. 0. cm /testem/det/tallyPosition 5. 0. 0. cm # -/testem/phys/addPhysics standard #em physics +#/testem/phys/addPhysics standard #em physics +/testem/phys/addPhysics Livermore #em physics # -/testem/phys/addPhysics binary #hadronic physics -/testem/phys/addPhysics binary_ion #hadronic physics -/testem/phys/addPhysics elastic #hadronic physics +#/testem/phys/addPhysics binary #hadronic physics +#/testem/phys/addPhysics binary_ion #hadronic physics +#/testem/phys/addPhysics elastic #hadronic physics # /run/initialize # /gun/particle ion /gun/ion 6 12 6 -/gun/energy 3.5 GeV +#/gun/energy 3.5 GeV +/gun/energy 2.4 GeV # beam size /testem/gun/rndm 2 mm # diff --git a/examples/extended/electromagnetic/TestEm7/proton.mac b/examples/extended/electromagnetic/TestEm7/proton.mac index a42f59c43c..7a93d9bb9c 100644 --- a/examples/extended/electromagnetic/TestEm7/proton.mac +++ b/examples/extended/electromagnetic/TestEm7/proton.mac @@ -1,4 +1,4 @@ -# $Id: proton.mac,v 1.3 2006/01/30 10:35:33 maire Exp $ +# $Id: proton.mac,v 1.4 2006/10/26 17:52:42 vnivanch Exp $ # # Macro file for "TestEm7.cc" # (can be run in batch, without graphic) @@ -11,7 +11,9 @@ /testem/det/setSizeX 30 cm /testem/det/setSizeYZ 30 cm # -/testem/phys/addPhysics standard #em physics +/testem/phys/addPhysics standard #defult em physics +#/testem/phys/addPhysics standardMSC #precise msc +#/testem/phys/addPhysics standardSS #msc replaced by single scattering # ####/testem/phys/addPhysics binary #hadronic physics ####/testem/phys/addPhysics binary_ion #hadronic physics diff --git a/examples/extended/electromagnetic/TestEm7/src/DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm7/src/DetectorConstruction.cc index 258b906c57..6b182a6b12 100644 --- a/examples/extended/electromagnetic/TestEm7/src/DetectorConstruction.cc +++ b/examples/extended/electromagnetic/TestEm7/src/DetectorConstruction.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: DetectorConstruction.cc,v 1.6 2006/06/29 16:58:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: DetectorConstruction.cc,v 1.7 2006/11/15 18:48:17 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -43,6 +43,8 @@ #include "G4LogicalVolumeStore.hh" #include "G4SolidStore.hh" +#include "G4NistManager.hh" + #include "G4UnitsTable.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -248,7 +250,8 @@ void DetectorConstruction::SetSizeYZ(G4double value) void DetectorConstruction::SetMaterial(G4String materialChoice) { // search the material by its name - G4Material* pttoMaterial = G4Material::GetMaterial(materialChoice); + G4Material* pttoMaterial = + G4NistManager::Instance()->FindOrBuildMaterial(materialChoice); if (pttoMaterial) absorMaterial = pttoMaterial; } @@ -289,7 +292,8 @@ void DetectorConstruction::SetTallySize(G4ThreeVector value) void DetectorConstruction::SetTallyMaterial(G4String materialChoice) { // search the material by its name - G4Material* pttoMaterial = G4Material::GetMaterial(materialChoice); + G4Material* pttoMaterial = + G4NistManager::Instance()->FindOrBuildMaterial(materialChoice); if (pttoMaterial) tallyMaterial = pttoMaterial; } diff --git a/examples/extended/electromagnetic/TestEm7/src/DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm7/src/DetectorMessenger.cc index 2d111718d2..104d747818 100644 --- a/examples/extended/electromagnetic/TestEm7/src/DetectorMessenger.cc +++ b/examples/extended/electromagnetic/TestEm7/src/DetectorMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorMessenger.cc,v 1.3 2006/06/29 16:58:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm7/src/EventAction.cc b/examples/extended/electromagnetic/TestEm7/src/EventAction.cc index ee98fb6c59..17f5f5a925 100644 --- a/examples/extended/electromagnetic/TestEm7/src/EventAction.cc +++ b/examples/extended/electromagnetic/TestEm7/src/EventAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventAction.cc,v 1.4 2006/06/29 16:58:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm7/src/EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm7/src/EventActionMessenger.cc index 2e8529f4e6..0ad63e84e2 100644 --- a/examples/extended/electromagnetic/TestEm7/src/EventActionMessenger.cc +++ b/examples/extended/electromagnetic/TestEm7/src/EventActionMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventActionMessenger.cc,v 1.4 2006/06/29 16:58:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm7/src/PhysListBinaryCascade.cc b/examples/extended/electromagnetic/TestEm7/src/PhysListBinaryCascade.cc deleted file mode 100644 index 663d53d8ce..0000000000 --- a/examples/extended/electromagnetic/TestEm7/src/PhysListBinaryCascade.cc +++ /dev/null @@ -1,95 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// $Id: PhysListBinaryCascade.cc,v 1.7 2006/06/29 16:58:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#include "PhysListBinaryCascade.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" -#include "G4LFission.hh" -#include "G4LCapture.hh" -#include "G4Proton.hh" -#include "G4Neutron.hh" - -#include "G4HadronFissionProcess.hh" -#include "G4HadronCaptureProcess.hh" - -#include "G4BinaryCascade.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListBinaryCascade::PhysListBinaryCascade(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListBinaryCascade::~PhysListBinaryCascade() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void PhysListBinaryCascade::ConstructProcess() -{ - - // Binary Cascade - G4ParticleDefinition* particle = 0; - G4ProcessManager* pmanager = 0; - - G4BinaryCascade* theBC = 0; - - // proton - particle = G4Proton::Proton(); - pmanager = particle->GetProcessManager(); - theBC = new G4BinaryCascade(); - theIPproton.RegisterMe(theBC); - theIPproton.AddDataSet(&thePXSec); - pmanager->AddDiscreteProcess(&theIPproton); - - // neutron - particle = G4Neutron::Neutron(); - pmanager = particle->GetProcessManager(); - theBC = new G4BinaryCascade(); - theIPneutron.RegisterMe(theBC); - theIPneutron.AddDataSet(&theNXSec); - pmanager->AddDiscreteProcess(&theIPneutron); - // fission - G4HadronFissionProcess* theFissionProcess = new G4HadronFissionProcess; - G4LFission* theFissionModel = new G4LFission; - theFissionProcess->RegisterMe(theFissionModel); - pmanager->AddDiscreteProcess(theFissionProcess); - // capture - G4HadronCaptureProcess* theCaptureProcess = new G4HadronCaptureProcess; - G4LCapture* theCaptureModel = new G4LCapture; - theCaptureProcess->RegisterMe(theCaptureModel); - pmanager->AddDiscreteProcess(theCaptureProcess); -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - diff --git a/examples/extended/electromagnetic/TestEm7/src/PhysListEmG4v52.cc b/examples/extended/electromagnetic/TestEm7/src/PhysListEmG4v52.cc deleted file mode 100644 index db02718dee..0000000000 --- a/examples/extended/electromagnetic/TestEm7/src/PhysListEmG4v52.cc +++ /dev/null @@ -1,120 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: PhysListEmG4v52.cc,v 1.3 2006/06/29 16:58:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#include "PhysListEmG4v52.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" - -#include "G4ComptonScattering52.hh" -#include "G4GammaConversion52.hh" -#include "G4PhotoElectricEffect52.hh" - -#include "G4MultipleScattering52.hh" - -#include "G4eIonisation52.hh" -#include "G4eBremsstrahlung52.hh" -#include "G4eplusAnnihilation52.hh" - -#include "G4MuIonisation52.hh" -#include "G4MuBremsstrahlung52.hh" -#include "G4MuPairProduction52.hh" - -#include "G4hIonisation52.hh" - - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListEmG4v52::PhysListEmG4v52(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListEmG4v52::~PhysListEmG4v52() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void PhysListEmG4v52::ConstructProcess() -{ - // Add EM processes realised on base of prototype of model approach design - - theParticleIterator->reset(); - while( (*theParticleIterator)() ){ - G4ParticleDefinition* particle = theParticleIterator->value(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - G4String particleName = particle->GetParticleName(); - - if (particleName == "gamma") { - // gamma - pmanager->AddDiscreteProcess(new G4PhotoElectricEffect52); - pmanager->AddDiscreteProcess(new G4ComptonScattering52); - pmanager->AddDiscreteProcess(new G4GammaConversion52); - - } else if (particleName == "e-") { - //electron - pmanager->AddProcess(new G4MultipleScattering52, -1, 1,1); - pmanager->AddProcess(new G4eIonisation52, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung52, -1,-1,3); - - } else if (particleName == "e+") { - //positron - pmanager->AddProcess(new G4MultipleScattering52, -1, 1,1); - pmanager->AddProcess(new G4eIonisation52, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung52, -1,-1,3); - pmanager->AddProcess(new G4eplusAnnihilation52, 0,-1,4); - - } else if( particleName == "mu+" || - particleName == "mu-" ) { - //muon - pmanager->AddProcess(new G4MultipleScattering52,-1, 1,1); - pmanager->AddProcess(new G4MuIonisation52, -1, 2,2); - pmanager->AddProcess(new G4MuBremsstrahlung52, -1,-1,3); - pmanager->AddProcess(new G4MuPairProduction52, -1,-1,4); - - } else if( particleName == "GenericIon" ) { - - pmanager->AddProcess(new G4MultipleScattering52,-1,1,1); - pmanager->AddProcess(new G4hIonisation52, -1,2,2); - - } else if ((!particle->IsShortLived()) && - (particle->GetPDGCharge() != 0.0) && - (particle->GetParticleName() != "chargedgeantino")) { - //all others charged particles except geantino - pmanager->AddProcess(new G4MultipleScattering52,-1,1,1); - pmanager->AddProcess(new G4hIonisation52, -1,2,2); - } - } -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - diff --git a/examples/extended/electromagnetic/TestEm1/src/PhysListEmG4v71.cc b/examples/extended/electromagnetic/TestEm7/src/PhysListEmLivermore.cc similarity index 65% rename from examples/extended/electromagnetic/TestEm1/src/PhysListEmG4v71.cc rename to examples/extended/electromagnetic/TestEm7/src/PhysListEmLivermore.cc index 2f5e6f31df..da982ce16a 100644 --- a/examples/extended/electromagnetic/TestEm1/src/PhysListEmG4v71.cc +++ b/examples/extended/electromagnetic/TestEm7/src/PhysListEmLivermore.cc @@ -24,22 +24,25 @@ // ******************************************************************** // // -// $Id: PhysListEmG4v71.cc,v 1.2 2006/06/29 16:37:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListEmLivermore.cc,v 1.2 2006/12/11 20:13:53 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#include "PhysListEmG4v71.hh" +#include "PhysListEmLivermore.hh" #include "G4ParticleDefinition.hh" #include "G4ProcessManager.hh" -#include "G4ComptonScattering.hh" -#include "G4GammaConversion.hh" -#include "G4PhotoElectricEffect.hh" +#include "G4LowEnergyCompton.hh" +#include "G4LowEnergyGammaConversion.hh" +#include "G4LowEnergyPhotoElectric.hh" +#include "G4LowEnergyRayleigh.hh" -#include "G4MultipleScattering71.hh" +#include "G4MultipleScattering.hh" +#include "G4LowEnergyIonisation.hh" +#include "G4LowEnergyBremsstrahlung.hh" #include "G4eIonisation.hh" #include "G4eBremsstrahlung.hh" #include "G4eplusAnnihilation.hh" @@ -48,25 +51,24 @@ #include "G4MuBremsstrahlung.hh" #include "G4MuPairProduction.hh" -#include "G4hIonisation.hh" -#include "G4ionIonisation.hh" +#include "G4hLowEnergyIonisation.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -PhysListEmG4v71::PhysListEmG4v71(const G4String& name) +PhysListEmLivermore::PhysListEmLivermore(const G4String& name) : G4VPhysicsConstructor(name) { } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -PhysListEmG4v71::~PhysListEmG4v71() +PhysListEmLivermore::~PhysListEmLivermore() { } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -void PhysListEmG4v71::ConstructProcess() +void PhysListEmLivermore::ConstructProcess() { - // Add standard EM Processes + // Add LowEn or standard EM Processes theParticleIterator->reset(); while( (*theParticleIterator)() ){ @@ -76,41 +78,38 @@ void PhysListEmG4v71::ConstructProcess() if (particleName == "gamma") { // gamma - pmanager->AddDiscreteProcess(new G4PhotoElectricEffect); - pmanager->AddDiscreteProcess(new G4ComptonScattering); - pmanager->AddDiscreteProcess(new G4GammaConversion); + pmanager->AddDiscreteProcess(new G4LowEnergyPhotoElectric); + pmanager->AddDiscreteProcess(new G4LowEnergyCompton); + pmanager->AddDiscreteProcess(new G4LowEnergyGammaConversion); + pmanager->AddDiscreteProcess(new G4LowEnergyRayleigh); } else if (particleName == "e-") { //electron - pmanager->AddProcess(new G4MultipleScattering71, -1, 1,1); - pmanager->AddProcess(new G4eIonisation, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung("brem", 10*GeV),-1,3,3); + pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4LowEnergyIonisation, -1, 2, 2); + pmanager->AddProcess(new G4LowEnergyBremsstrahlung, -1,-1, 3); } else if (particleName == "e+") { //positron - pmanager->AddProcess(new G4MultipleScattering71, -1, 1,1); - pmanager->AddProcess(new G4eIonisation, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung("brem", 10*GeV),-1,3,3); - pmanager->AddProcess(new G4eplusAnnihilation, 0,-1,4); + pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4eIonisation, -1, 2, 2); + pmanager->AddProcess(new G4eBremsstrahlung, -1, 3, 3); + pmanager->AddProcess(new G4eplusAnnihilation, 0,-1, 4); } else if( particleName == "mu+" || particleName == "mu-" ) { //muon - pmanager->AddProcess(new G4MultipleScattering71,-1, 1,1); - pmanager->AddProcess(new G4MuIonisation, -1, 2,2); - pmanager->AddProcess(new G4MuBremsstrahlung, -1, 3,3); - pmanager->AddProcess(new G4MuPairProduction, -1, 4,4); + pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4MuIonisation, -1, 2, 2); + pmanager->AddProcess(new G4MuBremsstrahlung, -1, 3, 3); + pmanager->AddProcess(new G4MuPairProduction, -1, 4, 4); - } else if( particleName == "alpha" || particleName == "GenericIon" ) { - pmanager->AddProcess(new G4MultipleScattering71,-1, 1,1); - pmanager->AddProcess(new G4ionIonisation, -1, 2,2); - } else if ((!particle->IsShortLived()) && (particle->GetPDGCharge() != 0.0) && (particle->GetParticleName() != "chargedgeantino")) { //all others charged particles except geantino - pmanager->AddProcess(new G4MultipleScattering71,-1,1,1); - pmanager->AddProcess(new G4hIonisation, -1,2,2); + pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4hLowEnergyIonisation, -1, 2, 2); } } } diff --git a/examples/extended/electromagnetic/TestEm7/src/PhysListEmPenelope.cc b/examples/extended/electromagnetic/TestEm7/src/PhysListEmPenelope.cc new file mode 100644 index 0000000000..dd38999411 --- /dev/null +++ b/examples/extended/electromagnetic/TestEm7/src/PhysListEmPenelope.cc @@ -0,0 +1,121 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: PhysListEmPenelope.cc,v 1.1 2006/11/22 18:56:21 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#include "PhysListEmPenelope.hh" +#include "G4ParticleDefinition.hh" +#include "G4ProcessManager.hh" + +#include "G4PenelopeCompton.hh" +#include "G4PenelopeGammaConversion.hh" +#include "G4PenelopePhotoElectric.hh" +#include "G4PenelopeRayleigh.hh" + +#include "G4MultipleScattering.hh" + +#include "G4PenelopeIonisation.hh" +#include "G4PenelopeBremsstrahlung.hh" +#include "G4PenelopeAnnihilation.hh" + +#include "G4MuIonisation.hh" +#include "G4MuBremsstrahlung.hh" +#include "G4MuPairProduction.hh" + +#include "G4hIonisation.hh" +#include "G4ionIonisation.hh" + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +PhysListEmPenelope::PhysListEmPenelope(const G4String& name) + : G4VPhysicsConstructor(name) +{ } + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +PhysListEmPenelope::~PhysListEmPenelope() +{ } + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void PhysListEmPenelope::ConstructProcess() +{ + // Add Penelope or standard EM Processes + + theParticleIterator->reset(); + while( (*theParticleIterator)() ){ + G4ParticleDefinition* particle = theParticleIterator->value(); + G4ProcessManager* pmanager = particle->GetProcessManager(); + G4String particleName = particle->GetParticleName(); + + if (particleName == "gamma") { + // gamma + pmanager->AddDiscreteProcess(new G4PenelopePhotoElectric); + pmanager->AddDiscreteProcess(new G4PenelopeCompton); + pmanager->AddDiscreteProcess(new G4PenelopeGammaConversion); + pmanager->AddDiscreteProcess(new G4PenelopeRayleigh); + + } else if (particleName == "e-") { + //electron + pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4PenelopeIonisation, -1, 2, 2); + pmanager->AddProcess(new G4PenelopeBremsstrahlung, -1,-1, 3); + + } else if (particleName == "e+") { + //positron + pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4PenelopeIonisation, -1, 2, 2); + pmanager->AddProcess(new G4PenelopeBremsstrahlung, -1,-1, 3); + pmanager->AddProcess(new G4PenelopeAnnihilation, 0,-1, 4); + + } else if( particleName == "mu+" || + particleName == "mu-" ) { + //muon + pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4MuIonisation, -1, 2, 2); + pmanager->AddProcess(new G4MuBremsstrahlung, -1, 3, 3); + pmanager->AddProcess(new G4MuPairProduction, -1, 4, 4); + + } else if( particleName == "alpha" || particleName == "GenericIon" ) { + pmanager->AddProcess(new G4MultipleScattering, -1, 1,1); + pmanager->AddProcess(new G4ionIonisation, -1, 2,2); + + } else if ((!particle->IsShortLived()) && + (particle->GetPDGCharge() != 0.0) && + (particle->GetParticleName() != "chargedgeantino")) { + //all others charged particles except geantino + pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4hIonisation, -1, 2, 2); + } + } +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + diff --git a/examples/extended/electromagnetic/TestEm7/src/PhysListEmStandard.cc b/examples/extended/electromagnetic/TestEm7/src/PhysListEmStandard.cc index 5a4685b225..94d371b384 100644 --- a/examples/extended/electromagnetic/TestEm7/src/PhysListEmStandard.cc +++ b/examples/extended/electromagnetic/TestEm7/src/PhysListEmStandard.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: PhysListEmStandard.cc,v 1.5 2006/06/29 16:58:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListEmStandard.cc,v 1.6 2006/10/24 11:37:56 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -39,6 +39,7 @@ #include "G4PhotoElectricEffect.hh" #include "G4MultipleScattering.hh" +#include "G4hMultipleScattering.hh" #include "G4eIonisation.hh" #include "G4eBremsstrahlung.hh" @@ -96,21 +97,21 @@ void PhysListEmStandard::ConstructProcess() } else if( particleName == "mu+" || particleName == "mu-" ) { //muon - pmanager->AddProcess(new G4MultipleScattering,-1, 1,1); - pmanager->AddProcess(new G4MuIonisation, -1, 2,2); - pmanager->AddProcess(new G4MuBremsstrahlung, -1, 3,3); - pmanager->AddProcess(new G4MuPairProduction, -1, 4,4); + pmanager->AddProcess(new G4hMultipleScattering,-1, 1,1); + pmanager->AddProcess(new G4MuIonisation, -1, 2,2); + pmanager->AddProcess(new G4MuBremsstrahlung, -1, 3,3); + pmanager->AddProcess(new G4MuPairProduction, -1, 4,4); } else if( particleName == "alpha" || particleName == "GenericIon" ) { - pmanager->AddProcess(new G4MultipleScattering,-1, 1,1); - pmanager->AddProcess(new G4ionIonisation, -1, 2,2); + pmanager->AddProcess(new G4hMultipleScattering,-1, 1,1); + pmanager->AddProcess(new G4ionIonisation, -1, 2,2); } else if ((!particle->IsShortLived()) && (particle->GetPDGCharge() != 0.0) && (particle->GetParticleName() != "chargedgeantino")) { //all others charged particles except geantino - pmanager->AddProcess(new G4MultipleScattering,-1,1,1); - pmanager->AddProcess(new G4hIonisation, -1,2,2); + pmanager->AddProcess(new G4hMultipleScattering,-1,1,1); + pmanager->AddProcess(new G4hIonisation, -1,2,2); } } } diff --git a/examples/extended/electromagnetic/TestEm12/src/PhysListEmG4v71.cc b/examples/extended/electromagnetic/TestEm7/src/PhysListEmStandardSS.cc similarity index 68% rename from examples/extended/electromagnetic/TestEm12/src/PhysListEmG4v71.cc rename to examples/extended/electromagnetic/TestEm7/src/PhysListEmStandardSS.cc index 796f06df13..377660606d 100644 --- a/examples/extended/electromagnetic/TestEm12/src/PhysListEmG4v71.cc +++ b/examples/extended/electromagnetic/TestEm7/src/PhysListEmStandardSS.cc @@ -23,14 +23,13 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// -// $Id: PhysListEmG4v71.cc,v 1.2 2006/06/29 16:43:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListEmStandardSS.cc,v 1.1 2006/10/24 11:37:56 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#include "PhysListEmG4v71.hh" +#include "PhysListEmStandardSS.hh" #include "G4ParticleDefinition.hh" #include "G4ProcessManager.hh" @@ -38,7 +37,7 @@ #include "G4GammaConversion.hh" #include "G4PhotoElectricEffect.hh" -#include "G4MultipleScattering71.hh" +#include "G4MultipleScattering.hh" #include "G4eIonisation.hh" #include "G4eBremsstrahlung.hh" @@ -50,21 +49,22 @@ #include "G4hIonisation.hh" #include "G4ionIonisation.hh" +#include "G4CoulombScattering.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -PhysListEmG4v71::PhysListEmG4v71(const G4String& name) +PhysListEmStandardSS::PhysListEmStandardSS(const G4String& name) : G4VPhysicsConstructor(name) {} //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -PhysListEmG4v71::~PhysListEmG4v71() +PhysListEmStandardSS::~PhysListEmStandardSS() {} //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -void PhysListEmG4v71::ConstructProcess() +void PhysListEmStandardSS::ConstructProcess() { // Add standard EM Processes @@ -75,42 +75,50 @@ void PhysListEmG4v71::ConstructProcess() G4String particleName = particle->GetParticleName(); if (particleName == "gamma") { - // gamma + // gamma pmanager->AddDiscreteProcess(new G4PhotoElectricEffect); pmanager->AddDiscreteProcess(new G4ComptonScattering); pmanager->AddDiscreteProcess(new G4GammaConversion); } else if (particleName == "e-") { //electron - pmanager->AddProcess(new G4MultipleScattering71, -1, 1,1); - pmanager->AddProcess(new G4eIonisation, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung, -1, 3,3); + pmanager->AddDiscreteProcess(new G4CoulombScattering); + pmanager->AddProcess(new G4eIonisation, -1, 2,2); + pmanager->AddProcess(new G4eBremsstrahlung, -1, 3,3); } else if (particleName == "e+") { //positron - pmanager->AddProcess(new G4MultipleScattering71, -1, 1,1); - pmanager->AddProcess(new G4eIonisation, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung, -1, 3,3); - pmanager->AddProcess(new G4eplusAnnihilation, 0,-1,4); - - } else if( particleName == "mu+" || + pmanager->AddDiscreteProcess(new G4CoulombScattering); + pmanager->AddProcess(new G4eIonisation, -1, 2,2); + pmanager->AddProcess(new G4eBremsstrahlung, -1, 3,3); + pmanager->AddProcess(new G4eplusAnnihilation, 0,-1,4); + + } else if (particleName == "mu+" || particleName == "mu-" ) { //muon - pmanager->AddProcess(new G4MultipleScattering71,-1, 1,1); - pmanager->AddProcess(new G4MuIonisation, -1, 2,2); - pmanager->AddProcess(new G4MuBremsstrahlung, -1, 3,3); - pmanager->AddProcess(new G4MuPairProduction, -1, 4,4); - - } else if( particleName == "GenericIon" ) { - pmanager->AddProcess(new G4MultipleScattering71,-1, 1,1); - pmanager->AddProcess(new G4ionIonisation, -1, 2,2); + pmanager->AddDiscreteProcess(new G4CoulombScattering); + pmanager->AddProcess(new G4MultipleScattering, -1, 1,1); + pmanager->AddProcess(new G4MuIonisation, -1, 2,2); + pmanager->AddProcess(new G4MuBremsstrahlung, -1, 3,3); + pmanager->AddProcess(new G4MuPairProduction, -1, 4,4); + + } else if (particleName == "alpha" || particleName == "He3") { + pmanager->AddDiscreteProcess(new G4CoulombScattering); + pmanager->AddProcess(new G4ionIonisation, -1, 2,2); + } else if (particleName == "GenericIon" ) { + + G4CoulombScattering* cs = new G4CoulombScattering(); + cs->SetBuildTableFlag(false); + pmanager->AddDiscreteProcess(cs); + pmanager->AddProcess(new G4ionIonisation, -1, 2,2); + } else if ((!particle->IsShortLived()) && (particle->GetPDGCharge() != 0.0) && (particle->GetParticleName() != "chargedgeantino")) { //all others charged particles except geantino - pmanager->AddProcess(new G4MultipleScattering71,-1,1,1); - pmanager->AddProcess(new G4hIonisation, -1,2,2); + pmanager->AddDiscreteProcess(new G4CoulombScattering); + pmanager->AddProcess(new G4hIonisation, -1,2,2); } } } diff --git a/examples/extended/electromagnetic/TestEm7/src/PhysListIonBinaryCascade.cc b/examples/extended/electromagnetic/TestEm7/src/PhysListIonBinaryCascade.cc deleted file mode 100644 index 4e535152e5..0000000000 --- a/examples/extended/electromagnetic/TestEm7/src/PhysListIonBinaryCascade.cc +++ /dev/null @@ -1,121 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// $Id: PhysListIonBinaryCascade.cc,v 1.6 2006/06/29 16:58:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#include "PhysListIonBinaryCascade.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" -#include "G4Deuteron.hh" -#include "G4Triton.hh" -#include "G4Alpha.hh" -#include "G4GenericIon.hh" - -#include "G4HadronInelasticProcess.hh" -#include "G4BinaryLightIonReaction.hh" -#include "G4TripathiCrossSection.hh" -#include "G4IonsShenCrossSection.hh" -#include "G4LEDeuteronInelastic.hh" -#include "G4LETritonInelastic.hh" -#include "G4LEAlphaInelastic.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListIonBinaryCascade::PhysListIonBinaryCascade(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListIonBinaryCascade::~PhysListIonBinaryCascade() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void PhysListIonBinaryCascade::ConstructProcess() -{ - // Binary Cascade - G4ParticleDefinition* particle = 0; - G4ProcessManager* pmanager = 0; - G4BinaryLightIonReaction* theBC = new G4BinaryLightIonReaction(); - theBC->SetMinEnergy(80*MeV); - theBC->SetMaxEnergy(20*GeV); - - G4TripathiCrossSection * TripathiCrossSection= new G4TripathiCrossSection; - G4IonsShenCrossSection * aShen = new G4IonsShenCrossSection; - - // deuteron - particle = G4Deuteron::Deuteron(); - pmanager = particle->GetProcessManager(); - G4LEDeuteronInelastic* theDIModel = new G4LEDeuteronInelastic; - theDIModel->SetMaxEnergy(100*MeV); - theIPdeuteron.AddDataSet(TripathiCrossSection); - theIPdeuteron.AddDataSet(aShen); - theIPdeuteron.RegisterMe(theDIModel); - theIPdeuteron.RegisterMe(theBC); - pmanager->AddDiscreteProcess(&theIPdeuteron); - - // triton - particle = G4Triton::Triton(); - pmanager = particle->GetProcessManager(); - G4LETritonInelastic* theTIModel = new G4LETritonInelastic; - theTIModel->SetMaxEnergy(100*MeV); - theIPtriton.AddDataSet(TripathiCrossSection); - theIPtriton.AddDataSet(aShen); - theIPtriton.RegisterMe(theTIModel); - theIPtriton.RegisterMe(theBC); - pmanager->AddDiscreteProcess(&theIPtriton); - - // alpha - particle = G4Alpha::Alpha(); - pmanager = particle->GetProcessManager(); - G4LEAlphaInelastic* theAIModel = new G4LEAlphaInelastic; - theAIModel->SetMaxEnergy(100*MeV); - theIPalpha.AddDataSet(TripathiCrossSection); - theIPalpha.AddDataSet(aShen); - theIPalpha.RegisterMe(theAIModel); - theIPalpha.RegisterMe(theBC); - pmanager->AddDiscreteProcess(&theIPalpha); - - // GenericIon - particle = G4GenericIon::GenericIon(); - pmanager = particle->GetProcessManager(); - G4HadronInelasticProcess* theIPGenericIon = - new G4HadronInelasticProcess("IonInelastic",particle); - theIPGenericIon->AddDataSet(TripathiCrossSection); - theIPGenericIon->AddDataSet(aShen); - G4BinaryLightIonReaction * theGenIonBC= new G4BinaryLightIonReaction; - theGenIonBC->SetMinEnergy(0*MeV); - theGenIonBC->SetMaxEnergy(10*GeV); - theIPGenericIon->RegisterMe(theGenIonBC); - pmanager->AddDiscreteProcess(theIPGenericIon); -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - diff --git a/examples/extended/electromagnetic/TestEm7/src/PhysicsList.cc b/examples/extended/electromagnetic/TestEm7/src/PhysicsList.cc index c4fe88b57d..8cf2632338 100644 --- a/examples/extended/electromagnetic/TestEm7/src/PhysicsList.cc +++ b/examples/extended/electromagnetic/TestEm7/src/PhysicsList.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: PhysicsList.cc,v 1.16 2006/06/29 16:58:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysicsList.cc,v 1.21 2006/12/11 20:13:53 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -33,15 +33,26 @@ #include "PhysicsListMessenger.hh" #include "PhysListEmStandard.hh" -#include "PhysListEmG4v52.hh" -#include "PhysListEmG4v71.hh" -#include "PhysListHadronElastic.hh" -#include "PhysListBinaryCascade.hh" -#include "PhysListIonBinaryCascade.hh" +#include "PhysListEmStandardSS.hh" +#include "PhysListEmLivermore.hh" +#include "PhysListEmPenelope.hh" +#include "G4EmStandardPhysics.hh" +#include "G4EmStandardPhysics71.hh" + +#include "G4HadronElasticPhysics.hh" +#include "G4HadronHElasticPhysics.hh" +#include "G4HadronQElasticPhysics.hh" +#include "G4HadronInelasticQBBC.hh" +#include "G4IonBinaryCascadePhysics.hh" + +#include "G4EmProcessOptions.hh" #include "G4LossTableManager.hh" #include "G4UnitsTable.hh" +#include "G4ProcessManager.hh" +#include "G4Decay.hh" + //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... PhysicsList::PhysicsList() : G4VModularPhysicsList() @@ -52,6 +63,10 @@ PhysicsList::PhysicsList() : G4VModularPhysicsList() cutForElectron = defaultCutValue; cutForPositron = defaultCutValue; + helIsRegisted = false; + bicIsRegisted = false; + biciIsRegisted = false; + stepMaxProcess = 0; pMessenger = new PhysicsListMessenger(this); @@ -78,7 +93,6 @@ PhysicsList::~PhysicsList() #include "G4ChargedGeantino.hh" #include "G4Geantino.hh" #include "G4Gamma.hh" -#include "G4OpticalPhoton.hh" // leptons #include "G4MuonPlus.hh" @@ -107,9 +121,6 @@ void PhysicsList::ConstructParticle() // gamma G4Gamma::GammaDefinition(); -// optical photon - G4OpticalPhoton::OpticalPhotonDefinition(); - // leptons G4Electron::ElectronDefinition(); G4Positron::PositronDefinition(); @@ -135,10 +146,6 @@ void PhysicsList::ConstructParticle() } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#include "G4ProcessManager.hh" -#include "G4Decay.hh" - void PhysicsList::ConstructProcess() { // transportation @@ -175,6 +182,9 @@ void PhysicsList::ConstructProcess() // step limitation (as a full process) // AddStepMax(); + + G4EmProcessOptions opt; + opt.SetDEDXBinning(480); } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -193,29 +203,53 @@ void PhysicsList::AddPhysicsList(const G4String& name) delete emPhysicsList; emPhysicsList = new PhysListEmStandard(name); - } else if (name == "g4v52") { + } else if (name == "G4standard") { emName = name; delete emPhysicsList; - emPhysicsList = new PhysListEmG4v52(name); + emPhysicsList = new G4EmStandardPhysics(name); - } else if (name == "g4v71") { + } else if (name == "G4standard_fast") { emName = name; delete emPhysicsList; - emPhysicsList = new PhysListEmG4v71(name); + emPhysicsList = new G4EmStandardPhysics71(name); - } else if (name == "elastic") { + } else if (name == "standardSS") { - hadronPhys.push_back( new PhysListHadronElastic(name)); + emName = name; + delete emPhysicsList; + emPhysicsList = new PhysListEmStandardSS(name); - } else if (name == "binary") { + } else if (name == "Livermore") { + emName = name; + delete emPhysicsList; + emPhysicsList = new PhysListEmLivermore(); - hadronPhys.push_back( new PhysListBinaryCascade(name)); + } else if (name == "Penelope") { + emName = name; + delete emPhysicsList; + emPhysicsList = new PhysListEmPenelope(); - } else if (name == "binary_ion") { + } else if (name == "elastic" && !helIsRegisted) { + hadronPhys.push_back( new G4HadronElasticPhysics(name)); + helIsRegisted = true; - hadronPhys.push_back( new PhysListIonBinaryCascade(name)); + } else if (name == "HElastic" && !helIsRegisted) { + hadronPhys.push_back( new G4HadronElasticPhysics(name)); + helIsRegisted = true; + + } else if (name == "QElastic" && !helIsRegisted) { + hadronPhys.push_back( new G4HadronElasticPhysics(name)); + helIsRegisted = true; + + } else if (name == "binary" && !bicIsRegisted) { + hadronPhys.push_back(new G4HadronInelasticQBBC()); + bicIsRegisted = true; + + } else if (name == "binary_ion" && !biciIsRegisted) { + hadronPhys.push_back(new G4IonBinaryCascadePhysics()); + biciIsRegisted = true; } else { @@ -248,10 +282,6 @@ void PhysicsList::AddStepMax() //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#include "G4Gamma.hh" -#include "G4Electron.hh" -#include "G4Positron.hh" - void PhysicsList::SetCuts() { diff --git a/examples/extended/electromagnetic/TestEm7/src/PhysicsListMessenger.cc b/examples/extended/electromagnetic/TestEm7/src/PhysicsListMessenger.cc index cd1320b522..6c93097563 100644 --- a/examples/extended/electromagnetic/TestEm7/src/PhysicsListMessenger.cc +++ b/examples/extended/electromagnetic/TestEm7/src/PhysicsListMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListMessenger.cc,v 1.3 2006/06/29 16:58:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm7/src/PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm7/src/PrimaryGeneratorAction.cc index d3e6c19363..b388125c16 100644 --- a/examples/extended/electromagnetic/TestEm7/src/PrimaryGeneratorAction.cc +++ b/examples/extended/electromagnetic/TestEm7/src/PrimaryGeneratorAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorAction.cc,v 1.2 2006/06/29 16:58:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm7/src/PrimaryGeneratorMessenger.cc b/examples/extended/electromagnetic/TestEm7/src/PrimaryGeneratorMessenger.cc index 2c4dc01fb8..e03caae512 100644 --- a/examples/extended/electromagnetic/TestEm7/src/PrimaryGeneratorMessenger.cc +++ b/examples/extended/electromagnetic/TestEm7/src/PrimaryGeneratorMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PrimaryGeneratorMessenger.cc,v 1.3 2006/06/29 16:58:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm7/src/RunAction.cc b/examples/extended/electromagnetic/TestEm7/src/RunAction.cc index 07000b1f74..56901af9c0 100644 --- a/examples/extended/electromagnetic/TestEm7/src/RunAction.cc +++ b/examples/extended/electromagnetic/TestEm7/src/RunAction.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: RunAction.cc,v 1.18 2006/06/29 16:58:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: RunAction.cc,v 1.19 2006/11/22 17:58:11 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -82,7 +82,7 @@ RunAction::~RunAction() void RunAction::bookHisto() { - G4double length = detector->GetAbsorSizeX(); + length = detector->GetAbsorSizeX(); G4double stepMax = physics->GetStepMaxProcess()->GetMaxStep(); const G4int nbmin = 100; G4int nbBins = (int)(0.5 + length/stepMax); diff --git a/examples/extended/electromagnetic/TestEm7/src/StepMax.cc b/examples/extended/electromagnetic/TestEm7/src/StepMax.cc index 793fcced21..57a3043758 100644 --- a/examples/extended/electromagnetic/TestEm7/src/StepMax.cc +++ b/examples/extended/electromagnetic/TestEm7/src/StepMax.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMax.cc,v 1.5 2006/06/29 16:58:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm7/src/StepMaxMessenger.cc b/examples/extended/electromagnetic/TestEm7/src/StepMaxMessenger.cc index 33c796aa94..d0bdb6ea6e 100644 --- a/examples/extended/electromagnetic/TestEm7/src/StepMaxMessenger.cc +++ b/examples/extended/electromagnetic/TestEm7/src/StepMaxMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMaxMessenger.cc,v 1.3 2006/06/29 16:58:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm7/src/SteppingAction.cc b/examples/extended/electromagnetic/TestEm7/src/SteppingAction.cc index 90f3de7c99..4de9762187 100644 --- a/examples/extended/electromagnetic/TestEm7/src/SteppingAction.cc +++ b/examples/extended/electromagnetic/TestEm7/src/SteppingAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingAction.cc,v 1.10 2006/06/29 16:58:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm7/src/SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm7/src/SteppingVerbose.cc index 4571716758..118f6f36ef 100644 --- a/examples/extended/electromagnetic/TestEm7/src/SteppingVerbose.cc +++ b/examples/extended/electromagnetic/TestEm7/src/SteppingVerbose.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: SteppingVerbose.cc,v 1.3 2006/06/29 16:58:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm7/src/TrackingAction.cc b/examples/extended/electromagnetic/TestEm7/src/TrackingAction.cc index 842c3a03c1..2b4c807f0e 100644 --- a/examples/extended/electromagnetic/TestEm7/src/TrackingAction.cc +++ b/examples/extended/electromagnetic/TestEm7/src/TrackingAction.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: TrackingAction.cc,v 1.2 2006/06/29 16:58:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: TrackingAction.cc,v 1.3 2006/11/22 17:58:11 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -48,6 +48,7 @@ void TrackingAction::PostUserTrackingAction(const G4Track* aTrack) // extract Projected Range of primary particle if (aTrack->GetTrackID() == 1) { G4double x = aTrack->GetPosition().x() + runAction->GetOffsetX(); + if(x > runAction->GetLength()) x = runAction->GetLength(); runAction->AddProjRange(x); } } diff --git a/examples/extended/electromagnetic/TestEm8/GNUmakefile b/examples/extended/electromagnetic/TestEm8/GNUmakefile index 7e279a1bbb..e6cb9cea7d 100644 --- a/examples/extended/electromagnetic/TestEm8/GNUmakefile +++ b/examples/extended/electromagnetic/TestEm8/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.6 2003/11/26 13:55:49 vnivanch Exp $ +# $Id: GNUmakefile,v 1.7 2006/10/26 16:20:33 maire Exp $ # -------------------------------------------------------------- # GNUmakefile for examples module. Gabriele Cosmo, 06/04/98. # -------------------------------------------------------------- @@ -23,7 +23,7 @@ include $(G4INSTALL)/config/architecture.gmk ifdef G4ANALYSIS_USE # for the aida-config command see the README file CPPFLAGS += `aida-config --include` - LDFLAGS += `aida-config --lib` + LOADLIBS += `aida-config --lib` endif include $(G4INSTALL)/config/binmake.gmk diff --git a/examples/extended/electromagnetic/TestEm8/History b/examples/extended/electromagnetic/TestEm8/History index 51f423a36f..e3267716dd 100644 --- a/examples/extended/electromagnetic/TestEm8/History +++ b/examples/extended/electromagnetic/TestEm8/History @@ -1,4 +1,4 @@ -$Id: History,v 1.20 2005/12/06 12:17:29 gcosmo Exp $ +$Id: History,v 1.22 2006/11/15 19:29:08 vnivanch Exp $ ------------------------------------------------------------------- ========================================================= @@ -15,6 +15,14 @@ track of all tags. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +15-11-06 V.Ivant (testem8-V08-01-01) +- Put on the head version of Em8DetectorConstruction.cc and + PhysListEmModelPai.cc, which provide non-zero results + +25-10-06 mma (testem8-V08-01-00) +- GNUmakefile : LOADLIBS +- remove PhysicsLists 52 + 05-12-05 Gabriele Cosmo - Trivial changes for support of CLHEP-2.0.X series. diff --git a/examples/extended/electromagnetic/TestEm8/TestEm8.cc b/examples/extended/electromagnetic/TestEm8/TestEm8.cc index b1c10c9746..a03b587bf3 100644 --- a/examples/extended/electromagnetic/TestEm8/TestEm8.cc +++ b/examples/extended/electromagnetic/TestEm8/TestEm8.cc @@ -25,7 +25,7 @@ // // // $Id: TestEm8.cc,v 1.7 2006/06/29 16:58:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/electromagnetic/TestEm8/TestEm8.in b/examples/extended/electromagnetic/TestEm8/TestEm8.in index 066002e87a..8d29d1a7e7 100644 --- a/examples/extended/electromagnetic/TestEm8/TestEm8.in +++ b/examples/extended/electromagnetic/TestEm8/TestEm8.in @@ -9,7 +9,6 @@ # # select EM PhysicsList # -#/testem/phys/addPhysics g4v52 #/testem/phys/addPhysics standard /testem/phys/addPhysics pai #/testem/phys/addPhysics pai_photon diff --git a/examples/extended/electromagnetic/TestEm8/TestEm8.large_N.in b/examples/extended/electromagnetic/TestEm8/TestEm8.large_N.in index afb133d940..4e75831106 100644 --- a/examples/extended/electromagnetic/TestEm8/TestEm8.large_N.in +++ b/examples/extended/electromagnetic/TestEm8/TestEm8.large_N.in @@ -10,8 +10,6 @@ # # select EM PhysicsList # -#/testem/phys/addPhysics g4v52 -# /testem/phys/addPhysics standard # #/testem/phys/addPhysics model diff --git a/examples/extended/electromagnetic/TestEm8/TestEm8.out b/examples/extended/electromagnetic/TestEm8/TestEm8.out index a79a87697d..78e9c99811 100644 --- a/examples/extended/electromagnetic/TestEm8/TestEm8.out +++ b/examples/extended/electromagnetic/TestEm8/TestEm8.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -29,27 +29,23 @@ Registered model factories: drawByCharge drawByParticleID drawByOriginVolume - -Registered models: - None + drawByAttribute Registered filter factories: chargeFilter particleFilter originVolumeFilter - -Registered filters: - None + attributeFilter /run/verbose 2 #/tracking/verbose 2 # # select EM PhysicsList # -#/testem/phys/addPhysics g4v52 #/testem/phys/addPhysics standard /testem/phys/addPhysics pai PhysicsList::AddPhysicsList: +PhysListEmModelPai is called #/testem/phys/addPhysics pai_photon # /testem/phys/setCuts 1 mm @@ -96,6 +92,7 @@ PhysicsList::SetCuts:CutLength : 1 mm /run/beamOn 1000 phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV Sampling according Klein-Nishina model @@ -103,7 +100,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.022 MeV to 100 GeV in 100 bins. @@ -135,7 +132,7 @@ eBrem: tables are built for e+ Total cross sections from a parametrisation based on the EEDL data library. Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -288,47 +285,47 @@ Start Run processing. Run terminated. Run Summary Number of events processed : 1000 - User=2.15s Real=2.27s Sys=0.11s + User=3.29s Real=3.33s Sys=0s ================== run summary ===================== end of Run TotNbofEvents = 1000 - mean charged track length in absorber=23.6512 +- 0.214181 mm + mean charged track length in absorber=23.5946 +- 0.275744 mm - mean energy deposit in absorber=0.0161746 +- 0.000367275 MeV + mean energy deposit in absorber=0.0156782 +- 0.000274501 MeV - mean number of steps in absorber (charged) =0.344 +- 0.11522 + mean number of steps in absorber (charged) =0.12 +- 0.0633372 mean number of steps in absorber (neutral) =0.001 +- 0.0009995 - mean number of charged secondaries = 0.015 +- 0.00384383 + mean number of charged secondaries = 0.007 +- 0.00299182 mean number of neutral secondaries = 0.001 +- 0.0009995 - mean number of e-s =0.015 and e+s =0 + mean number of e-s =0.007 and e+s =0 -(number) transmission coeff=0.497 reflection coeff=0 +(number) transmission coeff=0.48 reflection coeff=0 energy deposit distribution -#entries=1000 #underflows=0 #overflows=11 +#entries=1000 #underflows=0 #overflows=9 bin nb Elow entries normalized 0 0 0 0 1 3 4 0.004 - 2 6 92 0.092 - 3 9 260 0.26 - 4 12 264 0.264 - 5 15 145 0.145 - 6 18 79 0.079 - 7 21 46 0.046 - 8 24 31 0.031 - 9 27 17 0.017 - 10 30 18 0.018 - 11 33 10 0.01 - 12 36 8 0.008 - 13 39 4 0.004 - 14 42 3 0.003 + 2 6 103 0.103 + 3 9 252 0.252 + 4 12 254 0.254 + 5 15 157 0.157 + 6 18 78 0.078 + 7 21 53 0.053 + 8 24 30 0.03 + 9 27 22 0.022 + 10 30 14 0.014 + 11 33 8 0.008 + 12 36 3 0.003 + 13 39 3 0.003 + 14 42 2 0.002 15 45 1 0.001 - 16 48 0 0 - 17 51 4 0.004 - 18 54 1 0.001 - 19 57 2 0.002 + 16 48 3 0.003 + 17 51 1 0.001 + 18 54 2 0.002 + 19 57 1 0.001 Emp = 0.012 width= 0.006 MeV @@ -337,7 +334,7 @@ ERROR: G4VisCommandsViewerUpdate::SetNewValue: no current viewer. --------- Ranecu engine status --------- Initial seed (index) = 0 - Current couple of seeds = 946924133, 1481012020 + Current couple of seeds = 528793405, 102530346 ---------------------------------------- # Graphics systems deleted. @@ -349,7 +346,9 @@ UserPrimaryGenerator deleted. G4 kernel has come to Quit state. G4SDManager deleted. EventManager deleted. +Default detector region deleted. UImanager deleted. +Units table cleared. StateManager deleted. RunManagerKernel is deleted. RunManager is deleting. diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8CalorHit.hh b/examples/extended/electromagnetic/TestEm8/include/Em8CalorHit.hh index 20f8fc1e0c..948c886a14 100644 --- a/examples/extended/electromagnetic/TestEm8/include/Em8CalorHit.hh +++ b/examples/extended/electromagnetic/TestEm8/include/Em8CalorHit.hh @@ -25,7 +25,7 @@ // // // $Id: Em8CalorHit.hh,v 1.4 2006/06/29 16:58:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8CalorimeterSD.hh b/examples/extended/electromagnetic/TestEm8/include/Em8CalorimeterSD.hh index 8819ea76f1..2de8622e9d 100644 --- a/examples/extended/electromagnetic/TestEm8/include/Em8CalorimeterSD.hh +++ b/examples/extended/electromagnetic/TestEm8/include/Em8CalorimeterSD.hh @@ -25,7 +25,7 @@ // // // $Id: Em8CalorimeterSD.hh,v 1.4 2006/06/29 16:59:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm8/include/Em8DetectorConstruction.hh index 9b008491a6..ccbc1a275d 100644 --- a/examples/extended/electromagnetic/TestEm8/include/Em8DetectorConstruction.hh +++ b/examples/extended/electromagnetic/TestEm8/include/Em8DetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: Em8DetectorConstruction.hh,v 1.8 2006/06/29 16:59:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm8/include/Em8DetectorMessenger.hh index f72f1fcc1c..17e5da0b05 100644 --- a/examples/extended/electromagnetic/TestEm8/include/Em8DetectorMessenger.hh +++ b/examples/extended/electromagnetic/TestEm8/include/Em8DetectorMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: Em8DetectorMessenger.hh,v 1.5 2006/06/29 16:59:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8EventAction.hh b/examples/extended/electromagnetic/TestEm8/include/Em8EventAction.hh index f98f9b32ff..1e4b98ba3f 100644 --- a/examples/extended/electromagnetic/TestEm8/include/Em8EventAction.hh +++ b/examples/extended/electromagnetic/TestEm8/include/Em8EventAction.hh @@ -25,7 +25,7 @@ // // // $Id: Em8EventAction.hh,v 1.4 2006/06/29 16:59:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm8/include/Em8EventActionMessenger.hh index 41b6e3a642..54adf97e5d 100644 --- a/examples/extended/electromagnetic/TestEm8/include/Em8EventActionMessenger.hh +++ b/examples/extended/electromagnetic/TestEm8/include/Em8EventActionMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: Em8EventActionMessenger.hh,v 1.4 2006/06/29 16:59:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorAction.hh index de0ec817df..ef12fdb5bf 100644 --- a/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorAction.hh +++ b/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorAction.hh @@ -25,7 +25,7 @@ // // // $Id: Em8PrimaryGeneratorAction.hh,v 1.4 2006/06/29 16:59:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorMessenger.hh b/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorMessenger.hh index de0595f732..129c9caf8b 100644 --- a/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorMessenger.hh +++ b/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: Em8PrimaryGeneratorMessenger.hh,v 1.4 2006/06/29 16:59:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8RunAction.hh b/examples/extended/electromagnetic/TestEm8/include/Em8RunAction.hh index 54dc353683..5bf30869da 100644 --- a/examples/extended/electromagnetic/TestEm8/include/Em8RunAction.hh +++ b/examples/extended/electromagnetic/TestEm8/include/Em8RunAction.hh @@ -25,7 +25,7 @@ // // // $Id: Em8RunAction.hh,v 1.8 2006/06/29 16:59:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8RunMessenger.hh b/examples/extended/electromagnetic/TestEm8/include/Em8RunMessenger.hh index 9c18bb0d73..0557ecea40 100644 --- a/examples/extended/electromagnetic/TestEm8/include/Em8RunMessenger.hh +++ b/examples/extended/electromagnetic/TestEm8/include/Em8RunMessenger.hh @@ -26,7 +26,7 @@ // // $Id: Em8RunMessenger.hh,v 1.4 2006/06/29 16:59:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8SteppingAction.hh b/examples/extended/electromagnetic/TestEm8/include/Em8SteppingAction.hh index 8c8ab9fab3..cdf4ff222d 100644 --- a/examples/extended/electromagnetic/TestEm8/include/Em8SteppingAction.hh +++ b/examples/extended/electromagnetic/TestEm8/include/Em8SteppingAction.hh @@ -25,7 +25,7 @@ // // // $Id: Em8SteppingAction.hh,v 1.5 2006/06/29 16:59:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm8/include/Em8SteppingVerbose.hh index 2ae9ff2e78..e30ff48ea5 100644 --- a/examples/extended/electromagnetic/TestEm8/include/Em8SteppingVerbose.hh +++ b/examples/extended/electromagnetic/TestEm8/include/Em8SteppingVerbose.hh @@ -25,7 +25,7 @@ // // // $Id: Em8SteppingVerbose.hh,v 1.4 2006/06/29 16:59:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/examples/extended/electromagnetic/TestEm8/include/PhysListEmModel.hh b/examples/extended/electromagnetic/TestEm8/include/PhysListEmModel.hh index e263695b0b..8e2c66a9a4 100644 --- a/examples/extended/electromagnetic/TestEm8/include/PhysListEmModel.hh +++ b/examples/extended/electromagnetic/TestEm8/include/PhysListEmModel.hh @@ -25,7 +25,7 @@ // // // $Id: PhysListEmModel.hh,v 1.2 2006/06/29 16:59:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm8/include/PhysListEmModelPai.hh b/examples/extended/electromagnetic/TestEm8/include/PhysListEmModelPai.hh index 92e2c24695..2a25b438ea 100644 --- a/examples/extended/electromagnetic/TestEm8/include/PhysListEmModelPai.hh +++ b/examples/extended/electromagnetic/TestEm8/include/PhysListEmModelPai.hh @@ -25,7 +25,7 @@ // // // $Id: PhysListEmModelPai.hh,v 1.2 2006/06/29 16:59:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm8/include/PhysListEmPAI.hh b/examples/extended/electromagnetic/TestEm8/include/PhysListEmPAI.hh index f3d1cac73a..0beb84d9f4 100644 --- a/examples/extended/electromagnetic/TestEm8/include/PhysListEmPAI.hh +++ b/examples/extended/electromagnetic/TestEm8/include/PhysListEmPAI.hh @@ -25,7 +25,7 @@ // // // $Id: PhysListEmPAI.hh,v 1.2 2006/06/29 16:59:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm8/include/PhysListEmPaiPhoton.hh b/examples/extended/electromagnetic/TestEm8/include/PhysListEmPaiPhoton.hh index 450fc3f53d..2711d0a23c 100644 --- a/examples/extended/electromagnetic/TestEm8/include/PhysListEmPaiPhoton.hh +++ b/examples/extended/electromagnetic/TestEm8/include/PhysListEmPaiPhoton.hh @@ -25,7 +25,7 @@ // // // $Id: PhysListEmPaiPhoton.hh,v 1.2 2006/06/29 16:59:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm8/include/PhysListEmStandard.hh b/examples/extended/electromagnetic/TestEm8/include/PhysListEmStandard.hh index c2f7a60faa..95eb0e4603 100644 --- a/examples/extended/electromagnetic/TestEm8/include/PhysListEmStandard.hh +++ b/examples/extended/electromagnetic/TestEm8/include/PhysListEmStandard.hh @@ -25,7 +25,7 @@ // // // $Id: PhysListEmStandard.hh,v 1.3 2006/06/29 16:59:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm8/include/PhysListGeneral.hh b/examples/extended/electromagnetic/TestEm8/include/PhysListGeneral.hh index 8a62b1d4c2..55d9a40ebf 100644 --- a/examples/extended/electromagnetic/TestEm8/include/PhysListGeneral.hh +++ b/examples/extended/electromagnetic/TestEm8/include/PhysListGeneral.hh @@ -25,7 +25,7 @@ // // // $Id: PhysListGeneral.hh,v 1.2 2006/06/29 16:59:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm8/include/PhysListParticles.hh b/examples/extended/electromagnetic/TestEm8/include/PhysListParticles.hh index ebb9997737..48d9832853 100644 --- a/examples/extended/electromagnetic/TestEm8/include/PhysListParticles.hh +++ b/examples/extended/electromagnetic/TestEm8/include/PhysListParticles.hh @@ -25,7 +25,7 @@ // // // $Id: PhysListParticles.hh,v 1.2 2006/06/29 16:59:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm8/include/PhysicsList.hh b/examples/extended/electromagnetic/TestEm8/include/PhysicsList.hh index 655c078ccb..0424611d94 100644 --- a/examples/extended/electromagnetic/TestEm8/include/PhysicsList.hh +++ b/examples/extended/electromagnetic/TestEm8/include/PhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: PhysicsList.hh,v 1.2 2006/06/29 16:59:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... // diff --git a/examples/extended/electromagnetic/TestEm8/include/PhysicsListMessenger.hh b/examples/extended/electromagnetic/TestEm8/include/PhysicsListMessenger.hh index 09564f948c..cb3c1bc864 100644 --- a/examples/extended/electromagnetic/TestEm8/include/PhysicsListMessenger.hh +++ b/examples/extended/electromagnetic/TestEm8/include/PhysicsListMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: PhysicsListMessenger.hh,v 1.2 2006/06/29 16:59:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm8/include/StepMax.hh b/examples/extended/electromagnetic/TestEm8/include/StepMax.hh index 63f59a0ff2..1a8d4fbcae 100644 --- a/examples/extended/electromagnetic/TestEm8/include/StepMax.hh +++ b/examples/extended/electromagnetic/TestEm8/include/StepMax.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMax.hh,v 1.2 2006/06/29 16:59:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm8/include/StepMaxMessenger.hh b/examples/extended/electromagnetic/TestEm8/include/StepMaxMessenger.hh index 64588b3fcc..b43b6144e3 100644 --- a/examples/extended/electromagnetic/TestEm8/include/StepMaxMessenger.hh +++ b/examples/extended/electromagnetic/TestEm8/include/StepMaxMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMaxMessenger.hh,v 1.2 2006/06/29 16:59:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm8/include/TRTDetectorConstruction.hh b/examples/extended/electromagnetic/TestEm8/include/TRTDetectorConstruction.hh index 96cee626c2..a9107428a8 100644 --- a/examples/extended/electromagnetic/TestEm8/include/TRTDetectorConstruction.hh +++ b/examples/extended/electromagnetic/TestEm8/include/TRTDetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: TRTDetectorConstruction.hh,v 1.4 2006/06/29 16:59:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm8/include/TRTMaterials.hh b/examples/extended/electromagnetic/TestEm8/include/TRTMaterials.hh index 5a20715bd3..d622f8d84c 100644 --- a/examples/extended/electromagnetic/TestEm8/include/TRTMaterials.hh +++ b/examples/extended/electromagnetic/TestEm8/include/TRTMaterials.hh @@ -25,7 +25,7 @@ // // // $Id: TRTMaterials.hh,v 1.4 2006/06/29 17:00:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm8/run11.mac b/examples/extended/electromagnetic/TestEm8/run11.mac index 0b93ec0fba..d107bb3063 100644 --- a/examples/extended/electromagnetic/TestEm8/run11.mac +++ b/examples/extended/electromagnetic/TestEm8/run11.mac @@ -10,13 +10,11 @@ # # select EM PhysicsList # -#/testem/phys/addPhysics g4v52 +/testem/phys/addPhysics pai # -#/testem/phys/addPhysics modelPAI +#/testem/phys/addPhysics pai-photon # -#/testem/phys/addPhysics paiPhoton -# -/testem/phys/addPhysics standard +#/testem/phys/addPhysics standard # #/testem/phys/addPhysics model # @@ -34,9 +32,9 @@ # # PLOT: energy deposit distribution in absorber # -/plots/setnbinEn 30 +/plots/setnbinEn 150 /plots/setEnlow 0.00 MeV -/plots/setEnhigh 1.2 MeV +/plots/setEnhigh 0.3 MeV # # #/process/eLoss/verbose 2 @@ -44,11 +42,11 @@ /run/initialize /run/particle/dumpCutValues # -/gun/particle e- +#/gun/particle e- # #/gun/particle proton # -#/gun/particle pi+ +/gun/particle pi+ # #/gun/particle mu- # @@ -56,21 +54,23 @@ # #/gun/energy 2210.00 MeV # -/gun/energy 1.00 MeV +#/gun/energy 1.00 MeV # #/gun/energy 8861.00 MeV # #/gun/energy 2864.00 MeV # +/gun/energy 3863.00 MeV +# #/gun/energy 318.0 MeV # #/gun/energy 10.46 MeV # #/tracking/verbose 1 # -/calor/setGammaCut 10.0 -/calor/setElectronCut 10.0 -/calor/setPositronCut 100. +/calor/setGammaCut 0.1 +/calor/setElectronCut 0.1 +/calor/setPositronCut 0.1 /calor/update # #/testem/stepMax 10 mm @@ -80,7 +80,7 @@ #/tracking/verbose 1 # /event/printModulo 1000 -/run/beamOn 10000 +/run/beamOn 50000 # #/run/beamOn 3820 #/tracking/verbose 6 diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8CalorHit.cc b/examples/extended/electromagnetic/TestEm8/src/Em8CalorHit.cc index db6fe36ef6..ac4f38b3aa 100644 --- a/examples/extended/electromagnetic/TestEm8/src/Em8CalorHit.cc +++ b/examples/extended/electromagnetic/TestEm8/src/Em8CalorHit.cc @@ -25,7 +25,7 @@ // // // $Id: Em8CalorHit.cc,v 1.5 2006/06/29 17:00:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8CalorimeterSD.cc b/examples/extended/electromagnetic/TestEm8/src/Em8CalorimeterSD.cc index 3782fc6b11..63e8e4495e 100644 --- a/examples/extended/electromagnetic/TestEm8/src/Em8CalorimeterSD.cc +++ b/examples/extended/electromagnetic/TestEm8/src/Em8CalorimeterSD.cc @@ -25,7 +25,7 @@ // // // $Id: Em8CalorimeterSD.cc,v 1.7 2006/06/29 17:00:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm8/src/Em8DetectorConstruction.cc index 7fa7b9a30e..da04f7ebdf 100644 --- a/examples/extended/electromagnetic/TestEm8/src/Em8DetectorConstruction.cc +++ b/examples/extended/electromagnetic/TestEm8/src/Em8DetectorConstruction.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: Em8DetectorConstruction.cc,v 1.17.2.1 2006/06/29 17:00:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: Em8DetectorConstruction.cc,v 1.19 2006/11/15 19:29:08 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm8/src/Em8DetectorMessenger.cc index 0f23e04d1d..fe62f1e263 100644 --- a/examples/extended/electromagnetic/TestEm8/src/Em8DetectorMessenger.cc +++ b/examples/extended/electromagnetic/TestEm8/src/Em8DetectorMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: Em8DetectorMessenger.cc,v 1.7 2006/06/29 17:00:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8EventAction.cc b/examples/extended/electromagnetic/TestEm8/src/Em8EventAction.cc index 4ad620dad1..9c0d71ed3a 100644 --- a/examples/extended/electromagnetic/TestEm8/src/Em8EventAction.cc +++ b/examples/extended/electromagnetic/TestEm8/src/Em8EventAction.cc @@ -25,7 +25,7 @@ // // // $Id: Em8EventAction.cc,v 1.9 2006/06/29 17:00:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm8/src/Em8EventActionMessenger.cc index c3c6a7fb64..c9b2489026 100644 --- a/examples/extended/electromagnetic/TestEm8/src/Em8EventActionMessenger.cc +++ b/examples/extended/electromagnetic/TestEm8/src/Em8EventActionMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: Em8EventActionMessenger.cc,v 1.5 2006/06/29 17:00:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorAction.cc index 2bcd91e1d5..da7f891df1 100644 --- a/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorAction.cc +++ b/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorAction.cc @@ -25,7 +25,7 @@ // // // $Id: Em8PrimaryGeneratorAction.cc,v 1.7 2006/06/29 17:00:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorMessenger.cc b/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorMessenger.cc index dcc3664b4a..e9b0690baf 100644 --- a/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorMessenger.cc +++ b/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: Em8PrimaryGeneratorMessenger.cc,v 1.5 2006/06/29 17:00:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8RunAction.cc b/examples/extended/electromagnetic/TestEm8/src/Em8RunAction.cc index 6ad1496163..a0552f6f2b 100644 --- a/examples/extended/electromagnetic/TestEm8/src/Em8RunAction.cc +++ b/examples/extended/electromagnetic/TestEm8/src/Em8RunAction.cc @@ -25,7 +25,7 @@ // // // $Id: Em8RunAction.cc,v 1.14 2006/06/29 17:00:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8RunMessenger.cc b/examples/extended/electromagnetic/TestEm8/src/Em8RunMessenger.cc index 41f5311ec0..5723e64a77 100644 --- a/examples/extended/electromagnetic/TestEm8/src/Em8RunMessenger.cc +++ b/examples/extended/electromagnetic/TestEm8/src/Em8RunMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: Em8RunMessenger.cc,v 1.7 2006/06/29 17:00:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8SteppingAction.cc b/examples/extended/electromagnetic/TestEm8/src/Em8SteppingAction.cc index f4dc6aeea9..91c91a17ac 100644 --- a/examples/extended/electromagnetic/TestEm8/src/Em8SteppingAction.cc +++ b/examples/extended/electromagnetic/TestEm8/src/Em8SteppingAction.cc @@ -25,7 +25,7 @@ // // // $Id: Em8SteppingAction.cc,v 1.9 2006/06/29 17:00:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm8/src/Em8SteppingVerbose.cc index a98bddede6..6f372e75d3 100644 --- a/examples/extended/electromagnetic/TestEm8/src/Em8SteppingVerbose.cc +++ b/examples/extended/electromagnetic/TestEm8/src/Em8SteppingVerbose.cc @@ -25,7 +25,7 @@ // // // $Id: Em8SteppingVerbose.cc,v 1.8 2006/06/29 17:00:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/examples/extended/electromagnetic/TestEm8/src/PhysListEmG4v52.cc b/examples/extended/electromagnetic/TestEm8/src/PhysListEmG4v52.cc deleted file mode 100644 index cfb4b50321..0000000000 --- a/examples/extended/electromagnetic/TestEm8/src/PhysListEmG4v52.cc +++ /dev/null @@ -1,123 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: PhysListEmG4v52.cc,v 1.3 2006/06/29 17:00:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#include "PhysListEmG4v52.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" - -#include "G4ComptonScattering52.hh" -#include "G4GammaConversion52.hh" -#include "G4PhotoElectricEffect52.hh" - -#include "G4MultipleScattering52.hh" -#include "G4MultipleScattering.hh" - -#include "G4eIonisation52.hh" -#include "G4eBremsstrahlung52.hh" -#include "G4eplusAnnihilation52.hh" - -#include "G4MuIonisation52.hh" -#include "G4MuBremsstrahlung52.hh" -#include "G4MuPairProduction52.hh" - -#include "G4hIonisation52.hh" - - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListEmG4v52::PhysListEmG4v52(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListEmG4v52::~PhysListEmG4v52() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void PhysListEmG4v52::ConstructProcess() -{ - // Add EM processes realised on base of Geant4 version 5.2 - - theParticleIterator->reset(); - while( (*theParticleIterator)() ){ - G4ParticleDefinition* particle = theParticleIterator->value(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - G4String particleName = particle->GetParticleName(); - - if (particleName == "gamma") { - // gamma - pmanager->AddDiscreteProcess(new G4PhotoElectricEffect52); - pmanager->AddDiscreteProcess(new G4ComptonScattering52); - pmanager->AddDiscreteProcess(new G4GammaConversion52); - - } else if (particleName == "e-") { - //electron - pmanager->AddProcess(new G4MultipleScattering, -1, 1,1); - // pmanager->AddProcess(new G4MultipleScattering52, -1, 1,1); - pmanager->AddProcess(new G4eIonisation52, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung52, -1,-1,3); - - } else if (particleName == "e+") { - //positron - pmanager->AddProcess(new G4MultipleScattering, -1, 1,1); - // pmanager->AddProcess(new G4MultipleScattering52, -1, 1,1); - pmanager->AddProcess(new G4eIonisation52, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung52, -1,-1,3); - pmanager->AddProcess(new G4eplusAnnihilation52, 0,-1,4); - - } else if( particleName == "mu+" || - particleName == "mu-" ) { - //muon - pmanager->AddProcess(new G4MultipleScattering52,-1, 1,1); - pmanager->AddProcess(new G4MuIonisation52, -1, 2,2); - pmanager->AddProcess(new G4MuBremsstrahlung52, -1,-1,3); - pmanager->AddProcess(new G4MuPairProduction52, -1,-1,4); - - } else if( particleName == "GenericIon" ) { - - pmanager->AddProcess(new G4MultipleScattering52,-1,1,1); - pmanager->AddProcess(new G4hIonisation52, -1,2,2); - - } else if ((!particle->IsShortLived()) && - (particle->GetPDGCharge() != 0.0) && - (particle->GetParticleName() != "chargedgeantino")) { - //all others charged particles except geantino - pmanager->AddProcess(new G4MultipleScattering52,-1,1,1); - pmanager->AddProcess(new G4hIonisation52, -1,2,2); - } - } -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - diff --git a/examples/extended/electromagnetic/TestEm8/src/PhysListEmModelPai.cc b/examples/extended/electromagnetic/TestEm8/src/PhysListEmModelPai.cc index 42bc7b6c97..90cfe76955 100644 --- a/examples/extended/electromagnetic/TestEm8/src/PhysListEmModelPai.cc +++ b/examples/extended/electromagnetic/TestEm8/src/PhysListEmModelPai.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: PhysListEmModelPai.cc,v 1.2.2.1 2006/06/29 17:00:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListEmModelPai.cc,v 1.4 2006/11/15 19:29:08 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm8/src/PhysListEmPAI.cc b/examples/extended/electromagnetic/TestEm8/src/PhysListEmPAI.cc index 2aede7165f..1c17c40b05 100644 --- a/examples/extended/electromagnetic/TestEm8/src/PhysListEmPAI.cc +++ b/examples/extended/electromagnetic/TestEm8/src/PhysListEmPAI.cc @@ -25,7 +25,7 @@ // // // $Id: PhysListEmPAI.cc,v 1.2 2006/06/29 17:00:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm8/src/PhysListEmPaiPhoton.cc b/examples/extended/electromagnetic/TestEm8/src/PhysListEmPaiPhoton.cc index e0f0620291..50ff687014 100644 --- a/examples/extended/electromagnetic/TestEm8/src/PhysListEmPaiPhoton.cc +++ b/examples/extended/electromagnetic/TestEm8/src/PhysListEmPaiPhoton.cc @@ -25,7 +25,7 @@ // // // $Id: PhysListEmPaiPhoton.cc,v 1.3 2006/06/29 17:00:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm8/src/PhysListEmStandard.cc b/examples/extended/electromagnetic/TestEm8/src/PhysListEmStandard.cc index e927031251..cf8a745f7d 100644 --- a/examples/extended/electromagnetic/TestEm8/src/PhysListEmStandard.cc +++ b/examples/extended/electromagnetic/TestEm8/src/PhysListEmStandard.cc @@ -25,7 +25,7 @@ // // // $Id: PhysListEmStandard.cc,v 1.7 2006/06/29 17:00:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm8/src/PhysListGeneral.cc b/examples/extended/electromagnetic/TestEm8/src/PhysListGeneral.cc index b5b9d6cc9e..46c843420a 100644 --- a/examples/extended/electromagnetic/TestEm8/src/PhysListGeneral.cc +++ b/examples/extended/electromagnetic/TestEm8/src/PhysListGeneral.cc @@ -25,7 +25,7 @@ // // // $Id: PhysListGeneral.cc,v 1.3 2006/06/29 17:00:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm8/src/PhysListParticles.cc b/examples/extended/electromagnetic/TestEm8/src/PhysListParticles.cc index 615ac50262..eeadf0f5dd 100644 --- a/examples/extended/electromagnetic/TestEm8/src/PhysListParticles.cc +++ b/examples/extended/electromagnetic/TestEm8/src/PhysListParticles.cc @@ -25,7 +25,7 @@ // // // $Id: PhysListParticles.cc,v 1.3 2006/06/29 17:00:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm8/src/PhysicsList.cc b/examples/extended/electromagnetic/TestEm8/src/PhysicsList.cc index 3ac275e39d..1c89b20b50 100644 --- a/examples/extended/electromagnetic/TestEm8/src/PhysicsList.cc +++ b/examples/extended/electromagnetic/TestEm8/src/PhysicsList.cc @@ -25,8 +25,8 @@ // // -// $Id: PhysicsList.cc,v 1.6.2.1 2006/06/29 17:00:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysicsList.cc,v 1.9 2006/12/13 15:42:31 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -44,8 +44,6 @@ #include "PhysListEmPAI.hh" -#include "PhysListEmG4v52.hh" - #include "G4Gamma.hh" #include "G4Electron.hh" #include "G4Positron.hh" @@ -124,27 +122,22 @@ void PhysicsList::AddPhysicsList(const G4String& name) emName = name; delete emPhysicsList; emPhysicsList = new PhysListEmStandard(name); - + G4cout<<"PhysListEmStandard is called"<SetUserInitialization(phys = new PhysicsList); runManager->SetUserAction(kin = new PrimaryGeneratorAction(det)); -#ifdef G4VIS_USE //visualization manager - G4VisManager* visManager = new G4VisExecutive; - visManager->Initialize(); +#ifdef G4VIS_USE + G4VisManager* visManager = 0; #endif //set user action classes @@ -89,6 +88,10 @@ int main(int argc,char** argv) { if (argc==1) // Define UI terminal for interactive mode { +#ifdef G4VIS_USE + visManager = new G4VisExecutive; + visManager->Initialize(); +#endif G4UIsession* session = 0; #ifdef G4UI_USE_TCSH session = new G4UIterminal(new G4UItcsh); @@ -107,7 +110,7 @@ int main(int argc,char** argv) { //job termination #ifdef G4VIS_USE - delete visManager; + if(visManager) delete visManager; #endif delete runManager; diff --git a/examples/extended/electromagnetic/TestEm9/TestEm9.in b/examples/extended/electromagnetic/TestEm9/TestEm9.in index 96761d5e02..ebdebbc201 100644 --- a/examples/extended/electromagnetic/TestEm9/TestEm9.in +++ b/examples/extended/electromagnetic/TestEm9/TestEm9.in @@ -1,5 +1,5 @@ -# $Id: TestEm9.in,v 1.11 2004/12/03 10:54:06 vnivanch Exp $ -# GEANT4 tag $Name: geant4-08-01 $ +# $Id: TestEm9.in,v 1.13 2006/11/17 17:45:05 vnivanch Exp $ +# GEANT4 tag $Name: geant4-08-02 $ # # Macro file for TestEm9 - Crystal Calorimeter # V.Ivanchenko @@ -10,8 +10,7 @@ #/tracking/verbose 1 # # select EM PhysicsList - -#/testem/phys/addPhysics g4v52 +# /testem/phys/addPhysics standard # /testem/phys/setCuts 0.3 mm diff --git a/examples/extended/electromagnetic/TestEm9/TestEm9.out b/examples/extended/electromagnetic/TestEm9/TestEm9.out index 5913c20dcd..959e374bb3 100644 --- a/examples/extended/electromagnetic/TestEm9/TestEm9.out +++ b/examples/extended/electromagnetic/TestEm9/TestEm9.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -12,48 +12,12 @@ G4Material: Mean excitation energy is changed for G4_Al Iold= 166.4eV; Inew= 166 G4Material: Mean excitation energy is changed for G4_Si Iold= 173.6eV; Inew= 173 eV; G4Material: Mean excitation energy is changed for G4_Fe Iold= 286eV; Inew= 286 eV; G4Material: Mean excitation energy is changed for G4_CESIUM_IODIDE Iold= 491.166eV; Inew= 553.1 eV; -Visualization Manager instantiating... -Visualization Manager initialising... -Registering graphics systems... - -You have successfully registered the following graphics systems. -Current available graphics systems are: - ASCIITree (ATree) - DAWNFILE (DAWNFILE) - GAGTree (GAGTree) - G4HepRep (HepRepXML) - G4HepRepFile (HepRepFile) - RayTracer (RayTracer) - VRML1FILE (VRML1FILE) - VRML2FILE (VRML2FILE) - -Registering model factories... - -You have successfully registered the following model factories. -Registered model factories: - generic - drawByCharge - drawByParticleID - drawByOriginVolume - -Registered models: - None - -Registered filter factories: - chargeFilter - particleFilter - originVolumeFilter - -Registered filters: - None - /run/verbose 1 #/tracking/verbose 1 # # select EM PhysicsList -#/testem/phys/addPhysics g4v52 +# /testem/phys/addPhysics standard -PhysicsList::AddPhysicsList: # /testem/phys/setCuts 0.3 mm /testem/phys/VertexCuts 0.01 mm @@ -125,6 +89,7 @@ Muon cuts are set /run/beamOn 100 phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV Sampling according Klein-Nishina model @@ -132,7 +97,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.022 MeV to 100 GeV in 100 bins. @@ -164,7 +129,7 @@ eBrem: tables are built for e+ Total cross sections from a parametrisation based on the EEDL data library. Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -315,40 +280,33 @@ Index : 7 used in the geometry : Yes recalculation needed : No ### Run 0 start HistoManager: Histograms are booked and run has been started -/vis/scene/notifyHandlers -WARNING: Scene "refresh" not found. - /vis/scene/list to see scenes. Start Run processing. Run terminated. Run Summary Number of events processed : 100 - User=51.51s Real=58.97s Sys=7.09s + User=49.14s Real=51.92s Sys=2.39s RunAction: End of run actions are started HistoManager: End of run actions are started ======================================================== Number of events 100 -Average number of e- 1325 -Average number of gamma 703.1 -Average number of e+ 48.11 -Average number of steps 4606 -Edep 1x1 = 0.8291 +- 0.003254 res= 3.925 % -Edep 3x3 = 0.9555 +- 0.001635 res= 1.711 % -Edep 5x5 = 0.978 +- 0.00107 res= 1.094 % +Average number of e- 1326 +Average number of gamma 702.8 +Average number of e+ 48.58 +Average number of steps 4459 +Edep 1x1 = 0.8217 +- 0.003201 res= 3.896 % +Edep 3x3 = 0.9541 +- 0.001265 res= 1.326 % +Edep 5x5 = 0.979 +- 0.0008846 res= 0.9036 % ======================================================== <<<<>>>> 100 events for Crystal Calorimeter -Edep1x1: 0.8291 delEdep1x1= 0.00309 nrms= 0.8803 -Erms1x1: 0.03254 delErms1x1= -0.002562 nrms= -0.7298 -Edep3x3: 0.9555 delEdep3x3= -0.0009376 nrms= -0.586 -Erms3x3: 0.01635 delErms3x3= 0.0003471 nrms= 0.2169 -Edep5x5: 0.978 delEdep5x5= -0.0009607 nrms= -0.8073 -Erms5x5: 0.0107 delErms5x5= -0.001201 nrms= -1.009 +Edep1x1: 0.8217 delEdep1x1= -0.004331 nrms= -1.234 +Erms1x1: 0.03201 delErms1x1= -0.003085 nrms= -0.879 +Edep3x3: 0.9541 delEdep3x3= -0.002289 nrms= -1.431 +Erms3x3: 0.01265 delErms3x3= -0.003348 nrms= -2.093 +Edep5x5: 0.979 delEdep5x5= -3.317e-06 nrms= -0.002788 +Erms5x5: 0.008846 delErms5x5= -0.003054 nrms= -2.566 <<<<>>>> IS ACCEPTED -/vis/viewer/update -ERROR: G4VisCommandsViewerUpdate::SetNewValue: no current viewer. # -Graphics systems deleted. -Visualization Manager deleting... G4 kernel has come to Quit state. diff --git a/examples/extended/electromagnetic/TestEm9/cms10gev.mac b/examples/extended/electromagnetic/TestEm9/cms10gev.mac index ab47fabd1f..137321d919 100644 --- a/examples/extended/electromagnetic/TestEm9/cms10gev.mac +++ b/examples/extended/electromagnetic/TestEm9/cms10gev.mac @@ -1,4 +1,4 @@ -# $Id: cms10gev.mac,v 1.1 2005/05/13 11:46:02 vnivanch Exp $ +# $Id: cms10gev.mac,v 1.2 2006/10/26 15:50:35 maire Exp $ # # Macro file for "TestEm9.cc" # @@ -12,7 +12,6 @@ /testem/del/EcalLength 230 mm /testem/det/EcalWidth 22 mm # -#/testem/phys/addPhysics g4v52 /testem/phys/addPhysics standard # /testem/phys/VertexCuts 0.01 mm diff --git a/examples/extended/electromagnetic/TestEm9/cms_cal.mac b/examples/extended/electromagnetic/TestEm9/cms_cal.mac index 8c677ce15b..3f952d86ba 100644 --- a/examples/extended/electromagnetic/TestEm9/cms_cal.mac +++ b/examples/extended/electromagnetic/TestEm9/cms_cal.mac @@ -1,4 +1,4 @@ -# $Id: cms_cal.mac,v 1.1 2005/10/03 08:17:11 vnivanch Exp $ +# $Id: cms_cal.mac,v 1.2 2006/10/26 15:50:35 maire Exp $ # # Macro file for "TestEm9.cc" # @@ -12,7 +12,6 @@ /testem/det/EcalLength 230 mm /testem/det/EcalWidth 22 mm # -#/testem/phys/addPhysics g4v52 /testem/phys/addPhysics standard # /testem/phys/VertexCuts 0.01 mm diff --git a/examples/extended/electromagnetic/TestEm9/csi.mac b/examples/extended/electromagnetic/TestEm9/csi.mac index 7d0ce4b0f9..ea9ab005a7 100644 --- a/examples/extended/electromagnetic/TestEm9/csi.mac +++ b/examples/extended/electromagnetic/TestEm9/csi.mac @@ -1,5 +1,5 @@ -# $Id: csi.mac,v 1.3 2005/12/02 17:17:36 vnivanch Exp $ -# GEANT4 tag $Name: geant4-08-01 $ +# $Id: csi.mac,v 1.4 2006/10/26 15:50:35 maire Exp $ +# GEANT4 tag $Name: geant4-08-02 $ # # Macro file for TestEm9 - Crystal Calorimeter # V.Ivanchenko @@ -10,8 +10,7 @@ #/tracking/verbose 1 # # select EM PhysicsList - -#/testem/phys/addPhysics g4v52 +# /testem/phys/addPhysics standard # /testem/phys/addPhysics binary #hadronic physics diff --git a/examples/extended/electromagnetic/TestEm9/include/DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm9/include/DetectorConstruction.hh index 94ec9df5fc..454eaa6769 100644 --- a/examples/extended/electromagnetic/TestEm9/include/DetectorConstruction.hh +++ b/examples/extended/electromagnetic/TestEm9/include/DetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: DetectorConstruction.hh,v 1.5 2006/06/29 17:00:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ///////////////////////////////////////////////////////////////////////// diff --git a/examples/extended/electromagnetic/TestEm9/include/DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm9/include/DetectorMessenger.hh index 0019d7bc8b..3f7be4dbb8 100644 --- a/examples/extended/electromagnetic/TestEm9/include/DetectorMessenger.hh +++ b/examples/extended/electromagnetic/TestEm9/include/DetectorMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: DetectorMessenger.hh,v 1.4 2006/06/29 17:00:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ///////////////////////////////////////////////////////////////////////// diff --git a/examples/extended/electromagnetic/TestEm9/include/EmAcceptance.hh b/examples/extended/electromagnetic/TestEm9/include/EmAcceptance.hh index 0362fd8ea6..d28fe7dba8 100644 --- a/examples/extended/electromagnetic/TestEm9/include/EmAcceptance.hh +++ b/examples/extended/electromagnetic/TestEm9/include/EmAcceptance.hh @@ -25,7 +25,7 @@ // // // $Id: EmAcceptance.hh,v 1.2 2006/06/29 17:01:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm9/include/EventAction.hh b/examples/extended/electromagnetic/TestEm9/include/EventAction.hh index ed4b9d2c82..f06972395e 100644 --- a/examples/extended/electromagnetic/TestEm9/include/EventAction.hh +++ b/examples/extended/electromagnetic/TestEm9/include/EventAction.hh @@ -27,7 +27,7 @@ #define EventAction_h 1 // $Id: EventAction.hh,v 1.3 2006/06/29 17:01:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/examples/extended/electromagnetic/TestEm9/include/EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm9/include/EventActionMessenger.hh index aa677d2960..28c9db6ffe 100644 --- a/examples/extended/electromagnetic/TestEm9/include/EventActionMessenger.hh +++ b/examples/extended/electromagnetic/TestEm9/include/EventActionMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventActionMessenger.hh,v 1.3 2006/06/29 17:01:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm9/include/Histo.hh b/examples/extended/electromagnetic/TestEm9/include/Histo.hh index b619a4d2d5..58af37b59e 100644 --- a/examples/extended/electromagnetic/TestEm9/include/Histo.hh +++ b/examples/extended/electromagnetic/TestEm9/include/Histo.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: Histo.hh,v 1.4 2006/06/29 17:01:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef Histo_h #define Histo_h 1 diff --git a/examples/extended/electromagnetic/TestEm9/include/HistoManager.hh b/examples/extended/electromagnetic/TestEm9/include/HistoManager.hh index 57076d8e29..8b9ea9ea3c 100644 --- a/examples/extended/electromagnetic/TestEm9/include/HistoManager.hh +++ b/examples/extended/electromagnetic/TestEm9/include/HistoManager.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: HistoManager.hh,v 1.7 2006/06/29 17:01:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef HistoManager_h #define HistoManager_h 1 diff --git a/examples/extended/electromagnetic/TestEm9/include/HistoMessenger.hh b/examples/extended/electromagnetic/TestEm9/include/HistoMessenger.hh index fc8001f61f..926869250e 100644 --- a/examples/extended/electromagnetic/TestEm9/include/HistoMessenger.hh +++ b/examples/extended/electromagnetic/TestEm9/include/HistoMessenger.hh @@ -26,7 +26,7 @@ // // $Id: HistoMessenger.hh,v 1.3 2006/06/29 17:01:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm9/include/PhysListBinaryCascade.hh b/examples/extended/electromagnetic/TestEm9/include/PhysListBinaryCascade.hh deleted file mode 100644 index 14860aff76..0000000000 --- a/examples/extended/electromagnetic/TestEm9/include/PhysListBinaryCascade.hh +++ /dev/null @@ -1,79 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// $Id: PhysListBinaryCascade.hh,v 1.6 2006/06/29 17:01:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// ------------------------------------------------------------ -// GEANT 4 class header file -// Class Description: -// This class is an derived class of G4VPhysicsConstructor -// It is provide PhysicsList for Binary Cascade for -// protons and neutrons with the energy E<3 GeV -// -// ------------------------------------------------------------ -// History -// Created: 14.10.02 V.Ivanchenko -// -// Modified: -// -// ------------------------------------------------------------ -// -#ifndef PhysListBinaryCascade_h -#define PhysListBinaryCascade_h 1 - -#include "G4VPhysicsConstructor.hh" -#include "globals.hh" -#include "G4ProtonInelasticProcess.hh" -#include "G4NeutronInelasticProcess.hh" -#include "G4ProtonInelasticCrossSection.hh" -#include "G4NeutronInelasticCrossSection.hh" - -class PhysListBinaryCascade : public G4VPhysicsConstructor -{ - public: - PhysListBinaryCascade(const G4String& name = "binary"); - virtual ~PhysListBinaryCascade(); - - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - void ConstructParticle() {}; - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - void ConstructProcess(); - - private: - - G4ProtonInelasticProcess theIPproton; - G4NeutronInelasticProcess theIPneutron; - G4ProtonInelasticCrossSection thePXSec; - G4NeutronInelasticCrossSection theNXSec; - -}; - -#endif diff --git a/examples/extended/electromagnetic/TestEm9/include/PhysListEmLivermore.hh b/examples/extended/electromagnetic/TestEm9/include/PhysListEmLivermore.hh new file mode 100644 index 0000000000..2e132987c5 --- /dev/null +++ b/examples/extended/electromagnetic/TestEm9/include/PhysListEmLivermore.hh @@ -0,0 +1,67 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: PhysListEmLivermore.hh,v 1.1 2006/11/17 17:45:57 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#ifndef PhysListEmLivermore_h +#define PhysListEmLivermore_h 1 + +#include "G4VPhysicsConstructor.hh" +#include "globals.hh" + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +class PhysListEmLivermore : public G4VPhysicsConstructor +{ + public: + PhysListEmLivermore(const G4String& name = "Livermore"); + ~PhysListEmLivermore(); + + public: + // This method is dummy for physics + void ConstructParticle() {}; + + // This method will be invoked in the Construct() method. + // each physics process will be instantiated and + // registered to the process manager of each particle type + void ConstructProcess(); +}; + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#endif + + + + + + + + diff --git a/examples/extended/electromagnetic/TestEm12/include/PhysListEmG4v71.hh b/examples/extended/electromagnetic/TestEm9/include/PhysListEmPenelope.hh similarity index 88% rename from examples/extended/electromagnetic/TestEm12/include/PhysListEmG4v71.hh rename to examples/extended/electromagnetic/TestEm9/include/PhysListEmPenelope.hh index 6a92f45e01..89f70a6928 100644 --- a/examples/extended/electromagnetic/TestEm12/include/PhysListEmG4v71.hh +++ b/examples/extended/electromagnetic/TestEm9/include/PhysListEmPenelope.hh @@ -24,25 +24,25 @@ // ******************************************************************** // // -// $Id: PhysListEmG4v71.hh,v 1.2 2006/06/29 16:42:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListEmPenelope.hh,v 1.1 2006/11/17 17:45:57 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#ifndef PhysListEmG4v71_h -#define PhysListEmG4v71_h 1 +#ifndef PhysListEmPenelope_h +#define PhysListEmPenelope_h 1 #include "G4VPhysicsConstructor.hh" #include "globals.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -class PhysListEmG4v71 : public G4VPhysicsConstructor +class PhysListEmPenelope : public G4VPhysicsConstructor { public: - PhysListEmG4v71(const G4String& name = "g4v71"); - ~PhysListEmG4v71(); + PhysListEmPenelope(const G4String& name = "Penelope"); + ~PhysListEmPenelope(); public: // This method is dummy for physics diff --git a/examples/extended/electromagnetic/TestEm9/include/PhysListEmStandard.hh b/examples/extended/electromagnetic/TestEm9/include/PhysListEmStandard.hh index b7336e73e5..781f5bd5cf 100644 --- a/examples/extended/electromagnetic/TestEm9/include/PhysListEmStandard.hh +++ b/examples/extended/electromagnetic/TestEm9/include/PhysListEmStandard.hh @@ -25,7 +25,7 @@ // // // $Id: PhysListEmStandard.hh,v 1.3 2006/06/29 17:02:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm9/include/PhysicsList.hh b/examples/extended/electromagnetic/TestEm9/include/PhysicsList.hh index 6fb76ac81d..e41a7670d2 100644 --- a/examples/extended/electromagnetic/TestEm9/include/PhysicsList.hh +++ b/examples/extended/electromagnetic/TestEm9/include/PhysicsList.hh @@ -23,14 +23,23 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// -// $Id: PhysicsList.hh,v 1.4 2006/06/29 17:02:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysicsList.hh,v 1.5 2006/11/17 17:03:26 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... // -// 14.10.02 (V.Ivanchenko) provide modular list on base of old PhysicsList +//--------------------------------------------------------------------------- // +// ClassName: PhysicsList +// +// Author: V.Ivanchenko 14.10.2002 +// +// Modified: +// 17.11.06 Use components from physics_lists subdirectory (V.Ivanchenko) +// +//---------------------------------------------------------------------------- +// + //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -82,7 +91,7 @@ private: G4VPhysicsConstructor* emPhysicsList; G4VPhysicsConstructor* generalPhysicsList; - G4VPhysicsConstructor* particleList; + std::vector hadronPhys; G4String emName; @@ -91,7 +100,12 @@ private: PhysicsListMessenger* pMessenger; G4ProductionCuts* vertexDetectorCuts; G4ProductionCuts* muonDetectorCuts; + G4bool mscStepLimit; + G4bool helIsRegisted; + G4bool bicIsRegisted; + G4bool gnucIsRegisted; + G4bool stopIsRegisted; }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm9/include/PhysicsListMessenger.hh b/examples/extended/electromagnetic/TestEm9/include/PhysicsListMessenger.hh index 62363f263d..9d4b6b989f 100644 --- a/examples/extended/electromagnetic/TestEm9/include/PhysicsListMessenger.hh +++ b/examples/extended/electromagnetic/TestEm9/include/PhysicsListMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: PhysicsListMessenger.hh,v 1.4 2006/06/29 17:02:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm9/include/PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm9/include/PrimaryGeneratorAction.hh index 55c6165970..982c9c6f34 100644 --- a/examples/extended/electromagnetic/TestEm9/include/PrimaryGeneratorAction.hh +++ b/examples/extended/electromagnetic/TestEm9/include/PrimaryGeneratorAction.hh @@ -25,7 +25,7 @@ // // // $Id: PrimaryGeneratorAction.hh,v 1.3 2006/06/29 17:02:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ///////////////////////////////////////////////////////////////////////// diff --git a/examples/extended/electromagnetic/TestEm9/include/StepMax.hh b/examples/extended/electromagnetic/TestEm9/include/StepMax.hh index deda120676..4e81a93af2 100644 --- a/examples/extended/electromagnetic/TestEm9/include/StepMax.hh +++ b/examples/extended/electromagnetic/TestEm9/include/StepMax.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMax.hh,v 1.3 2006/06/29 17:02:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm9/include/StepMaxMessenger.hh b/examples/extended/electromagnetic/TestEm9/include/StepMaxMessenger.hh index 0fb41ba840..33ba9e48a3 100644 --- a/examples/extended/electromagnetic/TestEm9/include/StepMaxMessenger.hh +++ b/examples/extended/electromagnetic/TestEm9/include/StepMaxMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMaxMessenger.hh,v 1.3 2006/06/29 17:02:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm9/include/SteppingAction.hh b/examples/extended/electromagnetic/TestEm9/include/SteppingAction.hh index 563d3da982..3c13f01430 100644 --- a/examples/extended/electromagnetic/TestEm9/include/SteppingAction.hh +++ b/examples/extended/electromagnetic/TestEm9/include/SteppingAction.hh @@ -25,7 +25,7 @@ // // // $Id: SteppingAction.hh,v 1.3 2006/06/29 17:02:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ///////////////////////////////////////////////////////////////////////// diff --git a/examples/extended/electromagnetic/TestEm9/src/DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm9/src/DetectorConstruction.cc index f68e3d2de6..d09c351819 100644 --- a/examples/extended/electromagnetic/TestEm9/src/DetectorConstruction.cc +++ b/examples/extended/electromagnetic/TestEm9/src/DetectorConstruction.cc @@ -25,7 +25,7 @@ // // // $Id: DetectorConstruction.cc,v 1.9 2006/06/29 17:02:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ///////////////////////////////////////////////////////////////////////// diff --git a/examples/extended/electromagnetic/TestEm9/src/DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm9/src/DetectorMessenger.cc index c2d9ae98e8..cca44037aa 100644 --- a/examples/extended/electromagnetic/TestEm9/src/DetectorMessenger.cc +++ b/examples/extended/electromagnetic/TestEm9/src/DetectorMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: DetectorMessenger.cc,v 1.3 2006/06/29 17:03:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ///////////////////////////////////////////////////////////////////////// diff --git a/examples/extended/electromagnetic/TestEm9/src/EmAcceptance.cc b/examples/extended/electromagnetic/TestEm9/src/EmAcceptance.cc index 3fbfa8f59e..218925f4d9 100644 --- a/examples/extended/electromagnetic/TestEm9/src/EmAcceptance.cc +++ b/examples/extended/electromagnetic/TestEm9/src/EmAcceptance.cc @@ -25,7 +25,7 @@ // // // $Id: EmAcceptance.cc,v 1.4 2006/06/29 17:03:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm9/src/EventAction.cc b/examples/extended/electromagnetic/TestEm9/src/EventAction.cc index 6556ea240d..cca5bce46d 100644 --- a/examples/extended/electromagnetic/TestEm9/src/EventAction.cc +++ b/examples/extended/electromagnetic/TestEm9/src/EventAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventAction.cc,v 1.4 2006/06/29 17:03:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/examples/extended/electromagnetic/TestEm9/src/EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm9/src/EventActionMessenger.cc index f2b90a744d..452bf2c037 100644 --- a/examples/extended/electromagnetic/TestEm9/src/EventActionMessenger.cc +++ b/examples/extended/electromagnetic/TestEm9/src/EventActionMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventActionMessenger.cc,v 1.3 2006/06/29 17:03:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm9/src/HistoMessenger.cc b/examples/extended/electromagnetic/TestEm9/src/HistoMessenger.cc index 76b0738297..d87d734272 100644 --- a/examples/extended/electromagnetic/TestEm9/src/HistoMessenger.cc +++ b/examples/extended/electromagnetic/TestEm9/src/HistoMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: HistoMessenger.cc,v 1.6 2006/06/29 17:03:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm9/src/PhysListBinaryCascade.cc b/examples/extended/electromagnetic/TestEm9/src/PhysListBinaryCascade.cc deleted file mode 100644 index a59f4b751f..0000000000 --- a/examples/extended/electromagnetic/TestEm9/src/PhysListBinaryCascade.cc +++ /dev/null @@ -1,92 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// $Id: PhysListBinaryCascade.cc,v 1.5 2006/06/29 17:03:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ - -#include "PhysListBinaryCascade.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" -#include "G4LFission.hh" -#include "G4LCapture.hh" -#include "G4Proton.hh" -#include "G4Neutron.hh" - -#include "G4HadronFissionProcess.hh" -#include "G4HadronCaptureProcess.hh" - -#include "G4BinaryCascade.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListBinaryCascade::PhysListBinaryCascade(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListBinaryCascade::~PhysListBinaryCascade() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void PhysListBinaryCascade::ConstructProcess() -{ - - // Binary Cascade - G4ParticleDefinition* particle = 0; - G4ProcessManager* pmanager = 0; - - G4BinaryCascade* theBC = 0; - - // proton - particle = G4Proton::Proton(); - pmanager = particle->GetProcessManager(); - theBC = new G4BinaryCascade(); - theIPproton.RegisterMe(theBC); - theIPproton.AddDataSet(&thePXSec); - pmanager->AddDiscreteProcess(&theIPproton); - - // neutron - particle = G4Neutron::Neutron(); - pmanager = particle->GetProcessManager(); - theBC = new G4BinaryCascade(); - theIPneutron.RegisterMe(theBC); - theIPneutron.AddDataSet(&theNXSec); - pmanager->AddDiscreteProcess(&theIPneutron); - // fission - G4HadronFissionProcess* theFissionProcess = new G4HadronFissionProcess; - G4LFission* theFissionModel = new G4LFission; - theFissionProcess->RegisterMe(theFissionModel); - pmanager->AddDiscreteProcess(theFissionProcess); - // capture - G4HadronCaptureProcess* theCaptureProcess = new G4HadronCaptureProcess; - G4LCapture* theCaptureModel = new G4LCapture; - theCaptureProcess->RegisterMe(theCaptureModel); - pmanager->AddDiscreteProcess(theCaptureProcess); -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - diff --git a/examples/extended/electromagnetic/TestEm9/src/PhysListEmG4v52.cc b/examples/extended/electromagnetic/TestEm9/src/PhysListEmG4v52.cc deleted file mode 100644 index bf1b936e74..0000000000 --- a/examples/extended/electromagnetic/TestEm9/src/PhysListEmG4v52.cc +++ /dev/null @@ -1,121 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: PhysListEmG4v52.cc,v 1.6 2006/06/29 17:03:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#include "PhysListEmG4v52.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" - -#include "G4ComptonScattering52.hh" -#include "G4GammaConversion52.hh" -#include "G4PhotoElectricEffect52.hh" - -#include "G4MultipleScattering52.hh" -#include "G4MultipleScattering.hh" - -#include "G4eIonisation52.hh" -#include "G4eBremsstrahlung52.hh" -#include "G4eplusAnnihilation52.hh" - -#include "G4MuIonisation52.hh" -#include "G4MuBremsstrahlung52.hh" -#include "G4MuPairProduction52.hh" - -#include "G4hIonisation52.hh" - - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListEmG4v52::PhysListEmG4v52(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListEmG4v52::~PhysListEmG4v52() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void PhysListEmG4v52::ConstructProcess() -{ - // Add EM processes realised on base of Geant4 version 5.2 - - theParticleIterator->reset(); - while( (*theParticleIterator)() ){ - G4ParticleDefinition* particle = theParticleIterator->value(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - G4String particleName = particle->GetParticleName(); - - if (particleName == "gamma") { - // gamma - pmanager->AddDiscreteProcess(new G4PhotoElectricEffect52); - pmanager->AddDiscreteProcess(new G4ComptonScattering52); - pmanager->AddDiscreteProcess(new G4GammaConversion52); - - } else if (particleName == "e-") { - //electron - pmanager->AddProcess(new G4MultipleScattering52, -1, 1, 1); - pmanager->AddProcess(new G4eIonisation52, -1, 2, 2); - pmanager->AddProcess(new G4eBremsstrahlung52, -1,-1, 3); - - } else if (particleName == "e+") { - //positron - pmanager->AddProcess(new G4MultipleScattering52, -1, 1, 1); - pmanager->AddProcess(new G4eIonisation52, -1, 2, 2); - pmanager->AddProcess(new G4eBremsstrahlung52, -1,-1, 3); - pmanager->AddProcess(new G4eplusAnnihilation52, 0,-1, 4); - - } else if( particleName == "mu+" || - particleName == "mu-" ) { - //muon - pmanager->AddProcess(new G4MultipleScattering52,-1, 1, 1); - pmanager->AddProcess(new G4MuIonisation52, -1, 2, 2); - pmanager->AddProcess(new G4MuBremsstrahlung52, -1,-1, 3); - pmanager->AddProcess(new G4MuPairProduction52, -1,-1, 4); - - } else if( particleName == "GenericIon" ) { - - // pmanager->AddProcess(new G4MultipleScattering52,-1,1,1); - pmanager->AddProcess(new G4hIonisation52, -1,2,2); - - } else if ((!particle->IsShortLived()) && - (particle->GetPDGCharge() != 0.0) && - (particle->GetParticleName() != "chargedgeantino")) { - //all others charged particles except geantino - pmanager->AddProcess(new G4MultipleScattering52,-1,1,1); - pmanager->AddProcess(new G4hIonisation52, -1,2,2); - } - } -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - diff --git a/examples/extended/electromagnetic/TestEm9/src/PhysListEmG4v71.cc b/examples/extended/electromagnetic/TestEm9/src/PhysListEmG4v71.cc deleted file mode 100644 index 3db724d250..0000000000 --- a/examples/extended/electromagnetic/TestEm9/src/PhysListEmG4v71.cc +++ /dev/null @@ -1,123 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: PhysListEmG4v71.cc,v 1.2 2006/06/29 17:03:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#include "PhysListEmG4v71.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" - -#include "G4ComptonScattering.hh" -#include "G4GammaConversion.hh" -#include "G4PhotoElectricEffect.hh" - -#include "G4MultipleScattering71.hh" - -#include "G4eIonisation.hh" -#include "G4eBremsstrahlung.hh" -#include "G4eplusAnnihilation.hh" - -#include "G4MuIonisation.hh" -#include "G4MuBremsstrahlung.hh" -#include "G4MuPairProduction.hh" - -#include "G4hIonisation.hh" -#include "G4ionIonisation.hh" - - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListEmG4v71::PhysListEmG4v71(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListEmG4v71::~PhysListEmG4v71() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void PhysListEmG4v71::ConstructProcess() -{ - // Add EM processes realised on base of Geant4 version 7.1 - - theParticleIterator->reset(); - while( (*theParticleIterator)() ){ - G4ParticleDefinition* particle = theParticleIterator->value(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - G4String particleName = particle->GetParticleName(); - - if (particleName == "gamma") { - // gamma - pmanager->AddDiscreteProcess(new G4PhotoElectricEffect); - pmanager->AddDiscreteProcess(new G4ComptonScattering); - pmanager->AddDiscreteProcess(new G4GammaConversion); - - } else if (particleName == "e-") { - //electron - pmanager->AddProcess(new G4MultipleScattering71, -1, 1, 1); - pmanager->AddProcess(new G4eIonisation, -1, 2, 2); - pmanager->AddProcess(new G4eBremsstrahlung, -1,-1, 3); - - } else if (particleName == "e+") { - //positron - pmanager->AddProcess(new G4MultipleScattering71, -1, 1, 1); - pmanager->AddProcess(new G4eIonisation, -1, 2, 2); - pmanager->AddProcess(new G4eBremsstrahlung, -1,-1, 3); - pmanager->AddProcess(new G4eplusAnnihilation, 0,-1, 4); - - } else if( particleName == "mu+" || - particleName == "mu-" ) { - //muon - pmanager->AddProcess(new G4MultipleScattering71,-1, 1, 1); - pmanager->AddProcess(new G4MuIonisation, -1, 2, 2); - pmanager->AddProcess(new G4MuBremsstrahlung, -1,-1, 3); - pmanager->AddProcess(new G4MuPairProduction, -1,-1, 4); - - } else if( particleName == "GenericIon" || - particleName == "alpha" || - particleName == "He3") { - - pmanager->AddProcess(new G4MultipleScattering71,-1, 1, 1); - pmanager->AddProcess(new G4ionIonisation, -1, 2, 2); - - } else if (!particle->IsShortLived() && - particle->GetPDGCharge() != 0.0 && - particle->GetParticleName() != "chargedgeantino") { - //all others charged particles except geantino - pmanager->AddProcess(new G4MultipleScattering71,-1, 1, 1); - pmanager->AddProcess(new G4hIonisation, -1, 2, 2); - } - } -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - diff --git a/examples/extended/electromagnetic/TestEm11/src/PhysListEmG4v71.cc b/examples/extended/electromagnetic/TestEm9/src/PhysListEmLivermore.cc similarity index 63% rename from examples/extended/electromagnetic/TestEm11/src/PhysListEmG4v71.cc rename to examples/extended/electromagnetic/TestEm9/src/PhysListEmLivermore.cc index d8333f86ff..70308c37c4 100644 --- a/examples/extended/electromagnetic/TestEm11/src/PhysListEmG4v71.cc +++ b/examples/extended/electromagnetic/TestEm9/src/PhysListEmLivermore.cc @@ -24,22 +24,25 @@ // ******************************************************************** // // -// $Id: PhysListEmG4v71.cc,v 1.2 2006/06/29 16:40:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListEmLivermore.cc,v 1.1 2006/11/17 17:45:57 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#include "PhysListEmG4v71.hh" +#include "PhysListEmLivermore.hh" #include "G4ParticleDefinition.hh" #include "G4ProcessManager.hh" -#include "G4ComptonScattering.hh" -#include "G4GammaConversion.hh" -#include "G4PhotoElectricEffect.hh" +#include "G4LowEnergyCompton.hh" +#include "G4LowEnergyGammaConversion.hh" +#include "G4LowEnergyPhotoElectric.hh" +#include "G4LowEnergyRayleigh.hh" -#include "G4MultipleScattering71.hh" +#include "G4MultipleScattering.hh" +#include "G4LowEnergyIonisation.hh" +#include "G4LowEnergyBremsstrahlung.hh" #include "G4eIonisation.hh" #include "G4eBremsstrahlung.hh" #include "G4eplusAnnihilation.hh" @@ -48,25 +51,24 @@ #include "G4MuBremsstrahlung.hh" #include "G4MuPairProduction.hh" -#include "G4hIonisation.hh" - +#include "G4hLowEnergyIonisation.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -PhysListEmG4v71::PhysListEmG4v71(const G4String& name) - : G4VPhysicsConstructor(name) -{} +PhysListEmLivermore::PhysListEmLivermore(const G4String& name) + : G4VPhysicsConstructor(name) +{ } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -PhysListEmG4v71::~PhysListEmG4v71() -{} +PhysListEmLivermore::~PhysListEmLivermore() +{ } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -void PhysListEmG4v71::ConstructProcess() +void PhysListEmLivermore::ConstructProcess() { - // Add EM processes realised on base of prototype of model approach design + // Add LowEn or standard EM Processes theParticleIterator->reset(); while( (*theParticleIterator)() ){ @@ -76,42 +78,38 @@ void PhysListEmG4v71::ConstructProcess() if (particleName == "gamma") { // gamma - pmanager->AddDiscreteProcess(new G4PhotoElectricEffect); - pmanager->AddDiscreteProcess(new G4ComptonScattering); - pmanager->AddDiscreteProcess(new G4GammaConversion); + pmanager->AddDiscreteProcess(new G4LowEnergyPhotoElectric); + pmanager->AddDiscreteProcess(new G4LowEnergyCompton); + pmanager->AddDiscreteProcess(new G4LowEnergyGammaConversion); + pmanager->AddDiscreteProcess(new G4LowEnergyRayleigh); } else if (particleName == "e-") { //electron - pmanager->AddProcess(new G4MultipleScattering71, -1, 1,1); - pmanager->AddProcess(new G4eIonisation, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung, -1,-1,3); + pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4LowEnergyIonisation, -1, 2, 2); + pmanager->AddProcess(new G4LowEnergyBremsstrahlung, -1,-1, 3); } else if (particleName == "e+") { //positron - pmanager->AddProcess(new G4MultipleScattering71, -1, 1,1); - pmanager->AddProcess(new G4eIonisation, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung, -1,-1,3); - pmanager->AddProcess(new G4eplusAnnihilation, 0,-1,4); + pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4eIonisation, -1, 2, 2); + pmanager->AddProcess(new G4eBremsstrahlung, -1, 3, 3); + pmanager->AddProcess(new G4eplusAnnihilation, 0,-1, 4); } else if( particleName == "mu+" || particleName == "mu-" ) { //muon - pmanager->AddProcess(new G4MultipleScattering71,-1, 1,1); - pmanager->AddProcess(new G4MuIonisation, -1, 2,2); - pmanager->AddProcess(new G4MuBremsstrahlung, -1,-1,3); - pmanager->AddProcess(new G4MuPairProduction, -1,-1,4); + pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4MuIonisation, -1, 2, 2); + pmanager->AddProcess(new G4MuBremsstrahlung, -1, 3, 3); + pmanager->AddProcess(new G4MuPairProduction, -1, 4, 4); - } else if( particleName == "GenericIon" ) { - - pmanager->AddProcess(new G4MultipleScattering71,-1,1,1); - pmanager->AddProcess(new G4hIonisation, -1,2,2); - } else if ((!particle->IsShortLived()) && (particle->GetPDGCharge() != 0.0) && (particle->GetParticleName() != "chargedgeantino")) { //all others charged particles except geantino - pmanager->AddProcess(new G4MultipleScattering71,-1,1,1); - pmanager->AddProcess(new G4hIonisation, -1,2,2); + ///pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + ///pmanager->AddProcess(new G4hLowEnergyIonisation, -1, 2, 2); } } } diff --git a/examples/extended/electromagnetic/TestEm9/src/PhysListEmPenelope.cc b/examples/extended/electromagnetic/TestEm9/src/PhysListEmPenelope.cc new file mode 100644 index 0000000000..08bf478e25 --- /dev/null +++ b/examples/extended/electromagnetic/TestEm9/src/PhysListEmPenelope.cc @@ -0,0 +1,121 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: PhysListEmPenelope.cc,v 1.1 2006/11/17 17:45:57 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#include "PhysListEmPenelope.hh" +#include "G4ParticleDefinition.hh" +#include "G4ProcessManager.hh" + +#include "G4PenelopeCompton.hh" +#include "G4PenelopeGammaConversion.hh" +#include "G4PenelopePhotoElectric.hh" +#include "G4PenelopeRayleigh.hh" + +#include "G4MultipleScattering.hh" + +#include "G4PenelopeIonisation.hh" +#include "G4PenelopeBremsstrahlung.hh" +#include "G4PenelopeAnnihilation.hh" + +#include "G4MuIonisation.hh" +#include "G4MuBremsstrahlung.hh" +#include "G4MuPairProduction.hh" + +#include "G4hIonisation.hh" +#include "G4ionIonisation.hh" + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +PhysListEmPenelope::PhysListEmPenelope(const G4String& name) + : G4VPhysicsConstructor(name) +{ } + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +PhysListEmPenelope::~PhysListEmPenelope() +{ } + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void PhysListEmPenelope::ConstructProcess() +{ + // Add Penelope or standard EM Processes + + theParticleIterator->reset(); + while( (*theParticleIterator)() ){ + G4ParticleDefinition* particle = theParticleIterator->value(); + G4ProcessManager* pmanager = particle->GetProcessManager(); + G4String particleName = particle->GetParticleName(); + + if (particleName == "gamma") { + // gamma + pmanager->AddDiscreteProcess(new G4PenelopePhotoElectric); + pmanager->AddDiscreteProcess(new G4PenelopeCompton); + pmanager->AddDiscreteProcess(new G4PenelopeGammaConversion); + pmanager->AddDiscreteProcess(new G4PenelopeRayleigh); + + } else if (particleName == "e-") { + //electron + pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4PenelopeIonisation, -1, 2, 2); + pmanager->AddProcess(new G4PenelopeBremsstrahlung, -1,-1, 3); + + } else if (particleName == "e+") { + //positron + pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4PenelopeIonisation, -1, 2, 2); + pmanager->AddProcess(new G4PenelopeBremsstrahlung, -1,-1, 3); + pmanager->AddProcess(new G4PenelopeAnnihilation, 0,-1, 4); + + } else if( particleName == "mu+" || + particleName == "mu-" ) { + //muon + pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4MuIonisation, -1, 2, 2); + pmanager->AddProcess(new G4MuBremsstrahlung, -1, 3, 3); + pmanager->AddProcess(new G4MuPairProduction, -1, 4, 4); + + } else if( particleName == "alpha" || particleName == "GenericIon" ) { + pmanager->AddProcess(new G4MultipleScattering, -1, 1,1); + pmanager->AddProcess(new G4ionIonisation, -1, 2,2); + + } else if ((!particle->IsShortLived()) && + (particle->GetPDGCharge() != 0.0) && + (particle->GetParticleName() != "chargedgeantino")) { + //all others charged particles except geantino + pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4hIonisation, -1, 2, 2); + } + } +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + diff --git a/examples/extended/electromagnetic/TestEm9/src/PhysListEmStandard.cc b/examples/extended/electromagnetic/TestEm9/src/PhysListEmStandard.cc index 2de463d3b5..890a11ae1c 100644 --- a/examples/extended/electromagnetic/TestEm9/src/PhysListEmStandard.cc +++ b/examples/extended/electromagnetic/TestEm9/src/PhysListEmStandard.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: PhysListEmStandard.cc,v 1.6 2006/06/29 17:03:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListEmStandard.cc,v 1.8 2006/11/22 19:09:12 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -83,13 +83,13 @@ void PhysListEmStandard::ConstructProcess() } else if (particleName == "e-") { pmanager->AddProcess(new G4MultipleScattering, -1, 1,1); - pmanager->AddProcess(new G4eIonisation, -1, 2,2); + pmanager->AddProcess(new G4eIonisation(), -1, 2,2); pmanager->AddProcess(new G4eBremsstrahlung, -1, 3,3); } else if (particleName == "e+") { pmanager->AddProcess(new G4MultipleScattering, -1, 1,1); - pmanager->AddProcess(new G4eIonisation, -1, 2,2); + pmanager->AddProcess(new G4eIonisation(), -1, 2,2); pmanager->AddProcess(new G4eBremsstrahlung, -1, 3,3); pmanager->AddProcess(new G4eplusAnnihilation, 0,-1,4); diff --git a/examples/extended/electromagnetic/TestEm9/src/PhysListIonBinaryCascade.cc b/examples/extended/electromagnetic/TestEm9/src/PhysListIonBinaryCascade.cc deleted file mode 100644 index 4fc7949c0f..0000000000 --- a/examples/extended/electromagnetic/TestEm9/src/PhysListIonBinaryCascade.cc +++ /dev/null @@ -1,121 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// $Id: PhysListIonBinaryCascade.cc,v 1.4 2006/06/29 17:03:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ - -#include "PhysListIonBinaryCascade.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" - -#include "G4Deuteron.hh" -#include "G4Triton.hh" -#include "G4Alpha.hh" -#include "G4GenericIon.hh" - -#include "G4HadronInelasticProcess.hh" -#include "G4BinaryLightIonReaction.hh" -#include "G4TripathiCrossSection.hh" -#include "G4IonsShenCrossSection.hh" -#include "G4LEDeuteronInelastic.hh" -#include "G4LETritonInelastic.hh" -#include "G4LEAlphaInelastic.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListIonBinaryCascade::PhysListIonBinaryCascade(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListIonBinaryCascade::~PhysListIonBinaryCascade() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void PhysListIonBinaryCascade::ConstructProcess() -{ - // Binary Cascade - G4ParticleDefinition* particle = 0; - G4ProcessManager* pmanager = 0; - G4BinaryLightIonReaction* theBC = new G4BinaryLightIonReaction(); - theBC->SetMinEnergy(80*MeV); - theBC->SetMaxEnergy(20*GeV); - - G4TripathiCrossSection * TripathiCrossSection= new G4TripathiCrossSection; - G4IonsShenCrossSection * aShen = new G4IonsShenCrossSection; - - // deuteron - particle = G4Deuteron::Deuteron(); - pmanager = particle->GetProcessManager(); - G4LEDeuteronInelastic* theDIModel = new G4LEDeuteronInelastic; - theDIModel->SetMaxEnergy(100*MeV); - theIPdeuteron.AddDataSet(TripathiCrossSection); - theIPdeuteron.AddDataSet(aShen); - theIPdeuteron.RegisterMe(theDIModel); - theIPdeuteron.RegisterMe(theBC); - pmanager->AddDiscreteProcess(&theIPdeuteron); - - // triton - particle = G4Triton::Triton(); - pmanager = particle->GetProcessManager(); - G4LETritonInelastic* theTIModel = new G4LETritonInelastic; - theTIModel->SetMaxEnergy(100*MeV); - theIPtriton.AddDataSet(TripathiCrossSection); - theIPtriton.AddDataSet(aShen); - theIPtriton.RegisterMe(theTIModel); - theIPtriton.RegisterMe(theBC); - pmanager->AddDiscreteProcess(&theIPtriton); - - // alpha - particle = G4Alpha::Alpha(); - pmanager = particle->GetProcessManager(); - G4LEAlphaInelastic* theAIModel = new G4LEAlphaInelastic; - theAIModel->SetMaxEnergy(100*MeV); - theIPalpha.AddDataSet(TripathiCrossSection); - theIPalpha.AddDataSet(aShen); - theIPalpha.RegisterMe(theAIModel); - theIPalpha.RegisterMe(theBC); - pmanager->AddDiscreteProcess(&theIPalpha); - - - // GenericIon - particle = G4GenericIon::GenericIon(); - pmanager = particle->GetProcessManager(); - G4HadronInelasticProcess* theIPGenericIon = - new G4HadronInelasticProcess("IonInelastic",particle); - theIPGenericIon->AddDataSet(TripathiCrossSection); - theIPGenericIon->AddDataSet(aShen); - G4BinaryLightIonReaction * theGenIonBC= new G4BinaryLightIonReaction; - theGenIonBC->SetMinEnergy(0*MeV); - theGenIonBC->SetMaxEnergy(10*GeV); - theIPGenericIon->RegisterMe(theGenIonBC); - pmanager->AddDiscreteProcess(theIPGenericIon); - -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - diff --git a/examples/extended/electromagnetic/TestEm9/src/PhysicsList.cc b/examples/extended/electromagnetic/TestEm9/src/PhysicsList.cc index fa8dd0e655..4a6d9a1a28 100644 --- a/examples/extended/electromagnetic/TestEm9/src/PhysicsList.cc +++ b/examples/extended/electromagnetic/TestEm9/src/PhysicsList.cc @@ -23,6 +23,19 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// $Id: PhysicsList.cc,v 1.16 2006/11/22 19:09:12 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +//--------------------------------------------------------------------------- +// +// ClassName: PhysicsList +// +// Author: V.Ivanchenko 14.10.2002 +// +// Modified: +// 17.11.06 Use components from physics_lists subdirectory (V.Ivanchenko) +// +//---------------------------------------------------------------------------- // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -31,13 +44,19 @@ #include "PhysicsList.hh" #include "PhysicsListMessenger.hh" -#include "PhysListParticles.hh" -#include "PhysListGeneral.hh" #include "PhysListEmStandard.hh" -#include "PhysListEmG4v52.hh" -#include "PhysListHadronElastic.hh" -#include "PhysListBinaryCascade.hh" -#include "PhysListIonBinaryCascade.hh" +#include "G4EmStandardPhysics.hh" +#include "G4EmStandardPhysics71.hh" +#include "G4EmStandardPhysics72.hh" +#include "PhysListEmLivermore.hh" +#include "PhysListEmPenelope.hh" +#include "G4DecayPhysics.hh" +#include "G4HadronElasticPhysics.hh" +#include "G4HadronInelasticQBBC.hh" +#include "G4IonBinaryCascadePhysics.hh" +#include "G4EmExtraPhysics.hh" +#include "G4QStoppingPhysics.hh" + #include "G4RegionStore.hh" #include "G4Region.hh" #include "G4ProductionCuts.hh" @@ -68,25 +87,25 @@ PhysicsList::PhysicsList() : G4VModularPhysicsList() vertexDetectorCuts = 0; muonDetectorCuts = 0; - stepMaxProcess = 0; - - mscStepLimit = true; - pMessenger = new PhysicsListMessenger(this); stepMaxProcess = new StepMax(); + // Initilise flags + SetVerboseLevel(1); - // Particles - particleList = new PhysListParticles("particles"); + mscStepLimit = true; + helIsRegisted = false; + bicIsRegisted = false; + gnucIsRegisted = false; + stopIsRegisted = false; - // General Physics - generalPhysicsList = new PhysListGeneral("general"); + // Decay Physics is always defined + generalPhysicsList = new G4DecayPhysics(); // EM physics emName = G4String("standard"); emPhysicsList = new PhysListEmStandard(emName); - } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -106,7 +125,7 @@ PhysicsList::~PhysicsList() void PhysicsList::ConstructParticle() { - particleList->ConstructParticle(); + generalPhysicsList->ConstructParticle(); } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -114,54 +133,91 @@ void PhysicsList::ConstructParticle() void PhysicsList::ConstructProcess() { AddTransportation(); - generalPhysicsList->ConstructProcess(); emPhysicsList->ConstructProcess(); + generalPhysicsList->ConstructProcess(); for(size_t i=0; iConstructProcess(); } AddStepMax(); - if(!mscStepLimit) { - G4EmProcessOptions opt; - opt.SetMscStepLimitation(false); - } } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... void PhysicsList::AddPhysicsList(const G4String& name) { - if (verboseLevel>-1) { + if (verboseLevel > 1) G4cout << "PhysicsList::AddPhysicsList: <" << name << ">" << G4endl; - } if (name == emName) return; - if (name == "standard") { - + if (name == "G4standard") { emName = name; delete emPhysicsList; - emPhysicsList = new PhysListEmStandard(name); - - } else if (name == "g4v52") { + emPhysicsList = new G4EmStandardPhysics(); + if (verboseLevel > 0) + G4cout << "PhysicsList::Set " << name << " EM physics" << G4endl; + } else if (name == "G4standard_fast") { emName = name; delete emPhysicsList; - emPhysicsList = new PhysListEmG4v52(name); + emPhysicsList = new G4EmStandardPhysics71(); + if (verboseLevel > 0) + G4cout << "PhysicsList::Set " << name << " EM physics" << G4endl; - } else if (name == "elastic") { + } else if (name == "G4standard_exp") { + emName = name; + delete emPhysicsList; + emPhysicsList = new G4EmStandardPhysics72(); + if (verboseLevel > 0) + G4cout << "PhysicsList::Set " << name << " EM physics" << G4endl; - hadronPhys.push_back( new PhysListHadronElastic(name)); + } else if (name == "standard") { + emName = name; + delete emPhysicsList; + emPhysicsList = new PhysListEmStandard(); + if (verboseLevel > 0) + G4cout << "PhysicsList::Set " << name << " EM physics" << G4endl; - } else if (name == "binary") { + } else if (name == "Livermore") { + emName = name; + delete emPhysicsList; + emPhysicsList = new PhysListEmLivermore(); + if (verboseLevel > 0) + G4cout << "PhysicsList::Set Livermore EM physics" << G4endl; - hadronPhys.push_back( new PhysListBinaryCascade(name)); + } else if (name == "Penelope") { + emName = name; + delete emPhysicsList; + emPhysicsList = new PhysListEmPenelope(); + if (verboseLevel > 0) + G4cout << "PhysicsList::Set Penelope EM physics" << G4endl; - } else if (name == "binary_ion") { + } else if (name == "elastic" && !helIsRegisted) { + hadronPhys.push_back( new G4HadronElasticPhysics(name)); + helIsRegisted = true; + if (verboseLevel > 0) + G4cout << "PhysicsList::Add hadron elastic physics" << G4endl; - hadronPhys.push_back( new PhysListIonBinaryCascade(name)); + } else if (name == "binary" && !bicIsRegisted) { + hadronPhys.push_back(new G4HadronInelasticQBBC()); + hadronPhys.push_back(new G4IonBinaryCascadePhysics()); + bicIsRegisted = true; + if (verboseLevel > 0) + G4cout << "PhysicsList::Add hadron inelastic physics from " << G4endl; + + } else if (name == "gamma_nuc" && !gnucIsRegisted) { + hadronPhys.push_back(new G4EmExtraPhysics()); + gnucIsRegisted = true; + if (verboseLevel > 0) + G4cout << "PhysicsList::Add gamma- and electro-nuclear physics" << G4endl; + + } else if (name == "stopping" && !stopIsRegisted) { + hadronPhys.push_back(new G4QStoppingPhysics()); + gnucIsRegisted = true; + if (verboseLevel > 0) + G4cout << "PhysicsList::Add stopping physics" << G4endl; } else { - G4cout << "PhysicsList::AddPhysicsList: <" << name << ">" << " is not defined" << G4endl; diff --git a/examples/extended/electromagnetic/TestEm9/src/PhysicsListMessenger.cc b/examples/extended/electromagnetic/TestEm9/src/PhysicsListMessenger.cc index 43561c4dc0..3950b1d4ee 100644 --- a/examples/extended/electromagnetic/TestEm9/src/PhysicsListMessenger.cc +++ b/examples/extended/electromagnetic/TestEm9/src/PhysicsListMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: PhysicsListMessenger.cc,v 1.3 2006/06/29 17:03:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/electromagnetic/TestEm9/src/PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm9/src/PrimaryGeneratorAction.cc index f993d76002..b7917e05c5 100644 --- a/examples/extended/electromagnetic/TestEm9/src/PrimaryGeneratorAction.cc +++ b/examples/extended/electromagnetic/TestEm9/src/PrimaryGeneratorAction.cc @@ -25,7 +25,7 @@ // // // $Id: PrimaryGeneratorAction.cc,v 1.3 2006/06/29 17:03:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ///////////////////////////////////////////////////////////////////////// diff --git a/examples/extended/electromagnetic/TestEm9/src/StepMax.cc b/examples/extended/electromagnetic/TestEm9/src/StepMax.cc index 04b83d9ba6..6f31801912 100644 --- a/examples/extended/electromagnetic/TestEm9/src/StepMax.cc +++ b/examples/extended/electromagnetic/TestEm9/src/StepMax.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMax.cc,v 1.3 2006/06/29 17:03:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm9/src/StepMaxMessenger.cc b/examples/extended/electromagnetic/TestEm9/src/StepMaxMessenger.cc index 4b1935f614..444089e0b4 100644 --- a/examples/extended/electromagnetic/TestEm9/src/StepMaxMessenger.cc +++ b/examples/extended/electromagnetic/TestEm9/src/StepMaxMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StepMaxMessenger.cc,v 1.2 2006/06/29 17:03:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm9/src/SteppingAction.cc b/examples/extended/electromagnetic/TestEm9/src/SteppingAction.cc index 64bf2beed0..f1f610c867 100644 --- a/examples/extended/electromagnetic/TestEm9/src/SteppingAction.cc +++ b/examples/extended/electromagnetic/TestEm9/src/SteppingAction.cc @@ -25,7 +25,7 @@ // // // $Id: SteppingAction.cc,v 1.2 2006/06/29 17:03:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ///////////////////////////////////////////////////////////////////////// diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/GNUmakefile b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/GNUmakefile deleted file mode 100644 index 53c194bc2b..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/GNUmakefile +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: GNUmakefile,v 1.1 2002/11/19 10:32:59 murakami Exp $ -# -------------------------------------------------------------- -# GNUmakefile for examples module. Gabriele Cosmo, 06/04/98. -# -------------------------------------------------------------- -name := hepmcEx01-clhep -G4TARGET := $(name) -G4EXLIB := true - -ifndef G4INSTALL - G4INSTALL = ../../../../.. -endif - -.PHONY: all -all : lib bin - -include $(G4INSTALL)/config/binmake.gmk - -# check gcc -USE_GCC := 0 -ifeq ($(G4SYSTEM),Linux-g++) - USE_GCC := 1 -endif -ifeq ($(G4SYSTEM),Linux-egcs) - USE_GCC := 1 -endif - -# PYTHIA - CERNLIB_DIR := /cern/pro/lib - -ifeq ($(USE_GCC),1) - LDLIBS1 += -L$(CERNLIB_DIR) -lpythia6 -lg2c -else - LDLIBS1 += -L$(CERNLIB_DIR) -lpythia6 # and something? -endif - -CXXFLAGS_WITHOUT_O := $(filter-out -O% , $(CXXFLAGS)) -CXXFLAGS_WITHOUT_O := $(filter-out +O% , $(CXXFLAGS_WITHOUT_O)) - -# On HP-acc optimization has to be turned off to compile ExN04HadronPhysics. -# -ifeq ($(G4SYSTEM),HP-aCC) - COMPILER := $(shell aCC -V 2>&1) -ifeq ($(COMPILER), aCC: HP ANSI C++ B3910B A.01.15) -$(G4TMP)/$(G4SYSTEM)/$(name)/XXHadronPhysics.o: src/XXHadronPhysics.cc - $(CXX) $(CXXFLAGS_WITHOUT_O) $(CPPFLAGS) -c $(OUT_OBJ)$@ src/XXHadronPhysics.cc -endif -endif - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/History b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/History deleted file mode 100644 index 276c1d0a99..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/History +++ /dev/null @@ -1,47 +0,0 @@ -$Id: History,v 1.7 2005/12/06 13:44:22 gcosmo Exp $ -------------------------------------------------------------------- - - ========================================================= - Geant4 - an Object-Oriented Toolkit for Simulation in HEP - ========================================================= - - Example HepMCEx01 (for CLHEP-HepMC) History file - ------------------------------------------------ -This file should be used by the G4 example coordinator to briefly -summarize all major modifications introduced in the code and keep -track of all tags. - - ---------------------------------------------------------- - * Reverse chronological order (last date on top), please * - ---------------------------------------------------------- - -Dec 6th, 2005 G.Cosmo -- Trivial changes for support of CLHEP-2.0.X series. - -May 3rd, 2005 J.Allison (examples-V07-00-03) -- Replaced vis manager with G4VisExecutive. - -Dec. 3rd, 2004 G.Cosmo -- Implemented migration to . - -Dec. 2nd, 2003 G.Cosmo -- Brought up-to-date with examples/novice/N04. - -Nov. 13th, 2003 J.Allison -- Removed OPACS from Vis Manager. - -Jul. 04, 2003 G.Cosmo (exHepMC-V05-02-00) -- fixed compilation errors due to incorrect code migration from g4std wrappers. -- fixed pedantic compilation warnings on Linux-g++. - -Nov. 19, 2002 K.Murakami -- modified as is ExN04. (physics lists and vis. manager) -- "std" namespace left/not cared was modified to "G4std". - -May. 28, 2002 K.Murakami -- renamed classes and filenames. - -Apr. 15, 2002 K.Murakami -- Created from examples/novice/N04. -- Replace N04PrimaryGeneatorAction with HepMC-interface version. -- Resize the world volume. diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/README b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/README deleted file mode 100644 index d3e223ba2e..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/README +++ /dev/null @@ -1,51 +0,0 @@ -$Id: README,v 1.1 2002/11/19 10:33:00 murakami Exp $ -------------------------------------------------------------------- - - ========================================================= - Geant4 - an Object-Oriented Toolkit for Simulation in HEP - ========================================================= - - HepMCEx01 - --------- - - HepMCEx01 is based on ExampleN04, which has a simplified collider detector -geometry. Only part of the primary generator action is replaced with new one. -This example demonstrates the following features. - -1. HepMC interface - - ExN04PrimaryGeneratorAction has G4HepMCInterface as the generator. -There are two types of generators provided as samples. One generator reads -primary information from a HepMC Ascii file (data/example_MyPythia.dat). -The other one generates primaries directly invoking PYTHIA routines -in every event. - -2. Readout geometry - - ExN04DetectorConstruction defines a simplified collider detecor -geometry, tracker made of cylindrical tubes, calorimeter made of -cylindrical tubes, and muon trackers made of planes. - Cylindrical calorimeter is made of tubes of lead and scintirator -without cut in phi nor z direction. Energy deposition in scintirator -is accumulated by ExN04CalorimeterSD sensitive detector, which has -a readout geometry to find the phi-z cell. - -3. Full set of "ordinary" physics processes - - ExN04PhysicsList defines almost all of leptons and hadrons which -Geant4 has dedicated classes for. Also almost all physics processes -Geant4 has are defined. - -4. Event filtering by the stacking mechanism. - - Higgs events in "pythia_event.data" have two lepton pairs produced -by the Higgs decay via Z0. At the first stage of each event, only the -primary muons are tracked without tracking secondaries. then the number -of hits on the muon trackers are examined. At the next stage, only -the primary charged particles are tracked only inside the barrel -tracking area and the isolation of the primary muons are examined. -At the third stage, all particles in the RoI (Region of Interest) along -the isolated muons are tracked. All these examinations are applied in -ExN04StackingAction. - - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/data/GNUmakefile b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/data/GNUmakefile deleted file mode 100644 index d6d63cab9e..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/data/GNUmakefile +++ /dev/null @@ -1,20 +0,0 @@ -# // CLHEP -CLHEPD := $(CLHEP_BASE_DIR) -CLHEPINC := -I$(CLHEPD)/include -CLHEPLIB := -L$(CLHEPD)/lib -lCLHEP - -# // CERN libraries -CLIBD := /cern/pro/lib -CLIB := -L$(CLIBD) -lpythia6 - -CXXFLAGS := $(CLHEPINC) -LOPT := $(CLHEPLIB) $(CLIB) -lg2c - -%.o: %.cc - $(CXX) -c -o $@ $(CXXFLAGS) $*.cc - -example_MyPythia : example_MyPythia.o - $(CXX) -o $@ example_MyPythia.o $(LOPT) - -example_MyPythia.o : example_MyPythia.cc - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/data/example_MyPythia.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/data/example_MyPythia.cc deleted file mode 100644 index 8be05eddcd..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/data/example_MyPythia.cc +++ /dev/null @@ -1,97 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// sample event generation using Pythia and HepMC(CLHEP) -// ==================================================================== -// $Id: example_MyPythia.cc,v 1.4 2006/06/29 17:06:50 gunter Exp $ -// ==================================================================== -// example_MyPythia.cc - -#include "CLHEP/HepMC/CBhepevt.h" -#include "CLHEP/HepMC/WriteHepMC.h" -#include "CLHEP/HepMC/ReadHepMC.h" -#include "CLHEP/HepMC/include/PythiaWrapper6_2.h" - -#include -#include - -// global parameters -hepev2_t hepev2_; -hepev3_t hepev3_; -hepev4_t hepev4_; -hepev5_t hepev5_; - -int main() { - // initialize Pythia... - // select W+gamma process (process number 20) - pysubs.msel= 0; - pysubs.msub[20-1]= 1; - // set random number seed (mandatory!) - pydatr.mrpy[0]= 55122 ; - // tell Pythia not to write multiple copies of particles in event record. - pypars.mstp[128-1]= 2; - // example of setting a Pythia parameter: set the top mass - pydat2.pmas[1-1][6-1]= 175; - // call pythia initialization - call_pyinit( "CMS", "p", "p", 14000. ); - - // prepare HepMC-HEPEVT interface... - HepMC::CBhepevt* hepevtio= new HepMC::CBhepevt; - - std::ofstream to; - std::string fname= "example_MyPythia.dat"; - to.open(fname.c_str(), std::ios::out); - - HepMC::writeComment(to, "generate sample pythia events..."); - for ( int i = 1; i <= 10; i++ ) { - if ( i%50==1 ) std::cout << "Processing Event Number " - << i << std::endl; - call_pyevnt(); // generate one event with Pythia - // pythia pyhepc routine converts common PYJETS in common HEPEVT - call_pyhepc( 1 ); - - HepMC::GenEvent* evt= new HepMC::GenEvent(); - hepevtio-> toGenEvent(evt, false); - hepevtio-> clean(); // clear HEPEVT - - // add some information to the event - evt-> set_event_number(i); - evt-> set_signal_process_id(20); - - // write the event out to the ascii file - to << evt; - - // we also need to delete the created event from memory - delete evt; - } - - // write out some information from Pythia to the screen - call_pystat(1); - to.close(); - delete hepevtio; - - return 0; -} - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/data/example_MyPythia.dat b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/data/example_MyPythia.dat deleted file mode 100644 index 3417cca269..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/data/example_MyPythia.dat +++ /dev/null @@ -1,5901 +0,0 @@ -BlockType Comment -generate sample pythia events... -BlockType GenEvent -E 1 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 78 0 0 -V -1 0 0 0 0 0 1 2 0 -P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -1 0 -P 3 2 -7.7594698288360897e-01 -9.1232539665921930e-01 1.8833052220885656e+03 1.8833056029166935e+03 0 3 0 0 -3 0 -P 20 2101 7.7594698288360897e-01 9.1232539665921930e-01 4.4469502845870420e+03 4.4469504836059705e+03 5.7933000000000001e-01 2 0 0 -16 0 -V -2 0 0 0 0 0 1 3 0 -P 2 2212 0 0 -6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -2 0 -P 4 -1 -1.0077355308447375e+00 -1.2716278982991639e-02 -4.1454166842423659e+00 4.2661659707370658e+00 0 3 0 0 -4 0 -P 13 2214 9.9965263761245238e-01 2.7342497748314848e-02 -4.0826017593891916e+03 4.0826020585869046e+03 1.2012315772156326e+00 2 0 0 -9 0 -P 26 1 8.0828932322852265e-03 -1.4626218765323211e-02 -2.4623230582064652e+03 2.4623230803764359e+03 3.3000000000000002e-01 2 0 0 -16 0 -V -3 0 0 0 0 0 0 4 0 -P 5 2 -5.0183078832283403e+00 1.1490196188676447e+00 1.4784133950691614e+03 1.4784223585904062e+03 0 3 0 0 -5 0 -P 21 21 1.4581184692651741e+00 -3.9123134860507047e-01 1.0923177669273832e+02 1.0924220892535446e+02 0 2 0 0 -16 0 -P 22 21 3.1078318510719791e+00 2.3161265926755781e-01 1.4647261850356662e+02 1.4650576860495917e+02 0 2 0 0 -16 0 -P 23 21 -1.0916504553308495e-01 -1.8718066652841989e+00 8.6094190154962845e+01 8.6114604775486654e+01 0 2 0 0 -16 0 -V -4 0 0 0 0 0 0 3 0 -P 6 -1 2.5393345338288575e-02 8.3451451612681318e+00 6.6003848774206497e-01 8.3712450322473053e+00 0 3 0 0 -5 0 -P 24 21 -5.3671673260814667e-01 -6.6758503288897897e+00 4.7470952833050397e+01 4.7941072217280407e+01 0 2 0 0 -16 0 -P 25 21 -7.1083651803421799e-01 -1.7119307722665538e+00 1.0816833663101894e+01 1.0974510741696802e+01 0 2 0 0 -16 0 -V -5 0 0 0 0 0 0 2 0 -P 7 22 -4.0262403277658469e+00 -1.2288309207825838e+00 2.4575369641175027e+02 2.4578974741971544e+02 0 3 0 0 -6 0 -P 8 24 -9.6667421012420562e-01 1.0722995700918359e+01 1.2333197371451533e+03 1.2410038562029381e+03 1.3746665043908820e+02 3 0 0 -7 0 -V -6 0 0 0 0 0 0 1 0 -P 9 22 -4.0262403277658469e+00 -1.2288309207825838e+00 2.4575369641175027e+02 2.4578974741971544e+02 0 1 0 0 0 0 -V -7 0 0 0 0 0 0 1 0 -P 10 24 -9.6667421012420562e-01 1.0722995700918359e+01 1.2333197371451533e+03 1.2410038562029381e+03 1.3746665043908820e+02 2 0 0 -8 0 -V -8 0 0 0 0 0 0 2 0 -P 11 -13 -2.5622328442447461e+01 4.7040178447927353e+01 2.0936799887850253e+02 2.1611166609336419e+02 1.0566000000000000e-01 1 0 0 0 0 -P 12 14 2.4655654232323258e+01 -3.6317182747008992e+01 1.0239517382666510e+03 1.0248921901095741e+03 0 1 0 0 0 0 -V -9 0 0 0 0 0 0 2 0 -P 29 2212 1.0242368375894155e+00 1.1819305384951433e-01 -3.7370902170825884e+03 3.7370904770952066e+03 9.3827000000000005e-01 1 0 0 0 0 -P 30 111 -2.4584199976963136e-02 -9.0850556101199478e-02 -3.4551154230660296e+02 3.4551158149169805e+02 1.3497999999999999e-01 2 0 0 -20 0 -V -10 0 0 0 0 0 2 1 0 -P 14 1 2.3065048155050207e+00 5.8203193328752807e+00 1.5053434005803197e+02 1.5066447364361579e+02 0 2 0 0 -10 0 -P 15 -1 -2.3065048155050207e+00 -5.8203193328752807e+00 4.6213780965918581e+01 4.6635926416942638e+01 0 2 0 0 -10 0 -P 31 92 0 0 1.9674812102395055e+02 1.9730040006055842e+02 1.4752109598335721e+01 2 0 0 -11 0 -V -11 0 0 0 0 0 0 8 0 -P 32 -211 2.5433561751902267e-01 1.6471020112402412e+00 3.4162682623605711e+01 3.4203596235891361e+01 1.3957000000000000e-01 1 0 0 0 0 -P 33 211 1.8267397603378879e-01 -2.2451207083727245e-01 8.9833818072340854e+00 8.9891269838019312e+00 1.3957000000000000e-01 1 0 0 0 0 -P 34 -211 1.6527958883141400e+00 3.3636085038226837e+00 8.5511074879269898e+01 8.5593276623858827e+01 1.3957000000000000e-01 1 0 0 0 0 -P 35 221 1.5340695778001462e-01 1.0080214339909595e-01 1.6778513363366923e+01 1.6788445638414284e+01 5.4744999999999999e-01 2 0 0 -21 0 -P 36 211 -5.4270097089667468e-01 7.1269909168117845e-02 3.1032133671979825e+00 3.1542061966557080e+00 1.3957000000000000e-01 1 0 0 0 0 -P 37 221 -4.3895349893169139e-01 -1.0908000994225866e+00 1.6203900382989026e+01 1.6255725580713296e+01 5.4744999999999999e-01 2 0 0 -22 0 -P 38 -213 -1.1775778049994057e+00 -2.1994908478570685e+00 1.6736113732474852e+01 1.6955085170015739e+01 1.0737601126508725e+00 2 0 0 -23 0 -P 39 211 -8.3980164819194153e-02 -1.6679795495132113e+00 1.5269240867812080e+01 1.5360937631207282e+01 1.3957000000000000e-01 1 0 0 0 0 -V -12 0 0 0 0 0 2 1 0 -P 16 2 -3.9452709365158856e+00 -1.3309715048590964e+00 3.4100364633141048e+01 3.4353624496149465e+01 0 2 0 0 -12 0 -P 17 -2 3.9452709365158856e+00 1.3309715048590964e+00 4.3760023670797966e+02 4.3762004503311903e+02 0 2 0 0 -12 0 -P 40 92 0 0 4.7170060134112072e+02 4.7197366952926848e+02 1.6052645369166928e+01 2 0 0 -13 0 -V -13 0 0 0 0 0 0 8 0 -P 41 221 -2.6764857527202399e+00 -7.4082656853446693e-01 2.6999649559108772e+01 2.7147618271339081e+01 5.4744999999999999e-01 2 0 0 -24 0 -P 42 211 -1.0793700584347439e+00 -1.7691740782741042e-01 8.9362513158609644e+00 9.0040217046253623e+00 1.3957000000000000e-01 1 0 0 0 0 -P 43 223 7.3128413379081270e-01 -2.4207212017445862e-01 2.9711160638588780e+01 2.9731384214780988e+01 7.8023422073180737e-01 2 0 0 -25 0 -P 44 -213 6.8313854697846552e-02 2.1615069868878325e-01 2.6710541480290658e+01 2.6723469313128675e+01 7.9962369406794465e-01 2 0 0 -26 0 -P 45 211 -7.6171122821958814e-02 3.3362556819896899e-01 9.9768132257362261e+00 9.9836561432089255e+00 1.3957000000000000e-01 1 0 0 0 0 -P 46 223 1.1759907015886510e+00 7.6699830168521430e-03 1.5941193545306197e+02 1.5941819661887365e+02 7.8309345789913631e-01 2 0 0 -27 0 -P 47 -213 4.1784646533132969e-01 2.7042442905701480e-01 5.6342534981914696e+01 5.6346454491891919e+01 4.4040955728183379e-01 2 0 0 -28 0 -P 48 111 1.4385917785683024e+00 3.3194541757471685e-01 1.5361171468655868e+02 1.5361886877141990e+02 1.3497999999999999e-01 2 0 0 -29 0 -V -14 0 0 0 0 0 2 1 0 -P 18 2 1.5410660823344702e+00 3.0415562160378746e+00 -6.3245198112592114e+01 6.3337043135802176e+01 0 2 0 0 -14 0 -P 19 -2 -1.5410660823344702e+00 -3.0415562160378746e+00 -3.1131552297791711e+02 3.1133419471028151e+02 0 2 0 0 -14 0 -P 49 92 0 0 -3.7456072109050922e+02 3.7467123784608367e+02 9.0995980831222933e+00 2 0 0 -15 0 -V -15 0 0 0 0 0 0 3 0 -P 50 113 1.5650691169710587e+00 2.8328826851235629e+00 -6.1146078921515716e+01 6.1234504633574247e+01 5.8900305128951691e-01 2 0 0 -30 0 -P 51 211 2.0243674382169874e-01 1.1974235089754615e-01 -2.6986180398301357e+01 2.6987566232256142e+01 1.3957000000000000e-01 1 0 0 0 0 -P 52 -211 -1.7675058607927574e+00 -2.9526250360211090e+00 -2.8642846177069208e+02 2.8644916698025321e+02 1.3957000000000000e-01 1 0 0 0 0 -V -16 0 0 0 0 0 0 1 0 -P 53 92 3.9932619002775978e+00 -9.5215072778841598e+00 2.3847135982279970e+03 7.3100517292471832e+03 6.9101295742883694e+03 2 0 0 -17 0 -V -17 0 0 0 0 0 0 31 0 -P 54 2212 8.2215700554402904e-01 7.5777360143587646e-01 2.8563381940988261e+03 2.8563385670437092e+03 9.3827000000000005e-01 1 0 0 0 0 -P 55 113 -3.6038310812821978e-01 -1.6892929069557774e-01 8.6247137938804929e+02 8.6247157540874730e+02 4.2392385196816618e-01 2 0 0 -31 0 -P 56 -2214 1.0274054900145733e+00 9.2951858077602798e-02 4.5344312824574462e+02 4.5344608664771232e+02 1.2722974294659994e+00 2 0 0 -32 0 -P 57 223 -3.5950138267252507e-01 4.0383168579159467e-01 1.2478306984250651e+02 1.2478685771933476e+02 8.0809583036116783e-01 2 0 0 -33 0 -P 58 2212 1.6784465902779000e+00 -6.2450245543458038e-01 1.5667821954585344e+02 1.5669126337139798e+02 9.3827000000000005e-01 1 0 0 0 0 -P 59 -213 5.5576917486158994e-01 3.4454408402510756e-01 9.1366431045160198e+01 9.1370656398000975e+01 5.8697416466134156e-01 2 0 0 -34 0 -P 60 -311 6.8837804480312736e-02 -2.9839760512711585e-02 3.7650473956009833e+01 3.7653837700767077e+01 4.9767000000000000e-01 2 0 0 -35 0 -P 61 311 5.5852191137677354e-01 -2.3170010256673915e-01 5.8824232435728810e+01 5.8829445252735184e+01 4.9767000000000000e-01 2 0 0 -36 0 -P 62 211 3.2384754659479414e-01 -1.1095603539042695e+00 5.0326870381868780e+01 5.0340335354770062e+01 1.3957000000000000e-01 1 0 0 0 0 -P 63 113 -1.6488951177897816e-02 -7.8122143799785340e-02 4.9112488643673986e+00 4.9474711292126861e+00 5.9222479834954955e-01 2 0 0 -37 0 -P 64 -211 7.0648600777312476e-01 -6.4021847151240463e-01 6.5555221578401913e+01 6.5562302874050388e+01 1.3957000000000000e-01 1 0 0 0 0 -P 65 213 4.7207901564054866e-01 -4.3912457471518479e-01 1.4382616336991193e+01 1.4418576507834425e+01 7.8740512194284817e-01 2 0 0 -38 0 -P 66 -213 -3.0042801873910607e-01 -3.8199301959389176e-01 1.6229684769106441e+01 1.6256964556636262e+01 8.0625878581263533e-01 2 0 0 -39 0 -P 67 211 -4.3941675941743208e-01 -3.1906445983026024e+00 2.4837368567595707e+01 2.5045711353216259e+01 1.3957000000000000e-01 1 0 0 0 0 -P 68 -211 -1.3996633591260657e-01 -1.2032611277813125e-01 4.9245854481282014e-01 5.4411777389114624e-01 1.3957000000000000e-01 1 0 0 0 0 -P 69 -311 -2.6561371175678439e-01 -2.6535883073847484e+00 2.0655232762662497e+01 2.0832628193716424e+01 4.9767000000000000e-01 2 0 0 -40 0 -P 70 323 1.0866371896259655e-01 -8.8626238190570616e-01 4.6627917510728158e+00 4.8302466865539628e+00 8.9016140429299728e-01 2 0 0 -41 0 -P 71 113 -4.9783662946179669e-01 -2.2840858695582428e-01 1.7034444868848415e+00 1.9604937252009362e+00 8.0112466846605357e-01 2 0 0 -42 0 -P 72 -323 -2.9015742650522380e-01 -2.3021536904469947e-01 6.4282764365011924e-01 1.1577885131594590e+00 8.8885117621720233e-01 2 0 0 -43 0 -P 73 311 7.9013389939514289e-02 -3.2312546676672708e-02 -8.4688302464291099e-01 9.8598859161290120e-01 4.9767000000000000e-01 2 0 0 -44 0 -P 74 113 1.2774634435977392e-01 1.7876746229795942e-01 -7.0745137977013928e-01 1.0861776738766289e+00 7.9436613121131461e-01 2 0 0 -45 0 -P 75 -2112 2.3991231535880583e-01 -6.4340230480703609e-01 -2.3473851019465588e+00 2.6200253904556892e+00 9.3957000000000002e-01 1 0 0 0 0 -P 76 2112 1.4332258420217242e-01 -2.1997217583827630e-01 -2.2266533235780592e+00 2.4309886732740313e+00 9.3957000000000002e-01 1 0 0 0 0 -P 77 221 -1.5764236109767513e-01 9.2260932887338432e-01 -1.1183066194239037e+01 1.1235512008581036e+01 5.4744999999999999e-01 2 0 0 -46 0 -P 78 211 -3.9688019773273309e-01 -5.0114132735548866e-01 -1.1139586968129358e+00 1.2919134198703757e+00 1.3957000000000000e-01 1 0 0 0 0 -P 79 111 2.8720505725726897e-01 2.8206480950685814e-01 -1.0371931167428463e+00 1.1207303259460017e+00 1.3497999999999999e-01 2 0 0 -47 0 -P 80 223 4.0600347620418453e-01 -2.4511798802410625e-01 -3.5094643591439350e+01 3.5108232820041870e+01 8.5386256819630568e-01 2 0 0 -48 0 -P 81 -321 -6.1416080466482037e-01 2.7652838022953574e-01 -2.2846185259167453e+02 2.2846337866717087e+02 4.9359999999999998e-01 1 0 0 0 0 -P 82 323 1.2565639040248300e-01 -3.0746308740674749e-01 -1.4994406836076098e+03 1.4994409818689087e+03 8.8550960455907635e-01 2 0 0 -49 0 -P 83 -321 1.9429284964222532e-01 2.9316952731129947e-01 -1.6936871917454789e+02 1.6936980360698905e+02 4.9359999999999998e-01 1 0 0 0 0 -P 84 311 -9.3629085348251956e-02 -1.1090305621819395e-01 -5.0941280621429246e+02 5.0941306998980963e+02 4.9767000000000000e-01 2 0 0 -50 0 -V -18 0 0 0 0 0 2 1 0 -P 27 21 -1.3650212674856288e-01 -5.9889764280123572e+00 -1.3829130975861951e+01 1.5070877049244315e+01 0 2 0 0 -18 0 -P 28 21 1.3650212674856288e-01 5.9889764280123572e+00 -6.1244142694407962e+01 6.1536424058104799e+01 0 2 0 0 -18 0 -P 85 92 0 0 -7.5073273670269913e+01 7.6607301107349116e+01 1.5253922884976552e+01 2 0 0 -19 0 -V -19 0 0 0 0 0 0 9 0 -P 86 -2112 -3.8391846582458374e-02 -2.4829965966375998e+00 -7.9823040467504578e+00 8.4122955079137967e+00 9.3957000000000002e-01 1 0 0 0 0 -P 87 2212 1.8826721276030065e-01 -2.1411823793389910e+00 -4.4940750564267944e+00 5.0692373914317530e+00 9.3827000000000005e-01 1 0 0 0 0 -P 88 -213 2.0012868143999138e-01 -1.1118139792674885e-01 -1.6567370969599078e+00 1.8269381912397860e+00 7.3519558879763558e-01 2 0 0 -51 0 -P 89 -313 -6.2630872275736982e-01 1.3663451184419380e+00 -1.2866054962931736e+01 1.2986301018153689e+01 9.2167360059140557e-01 2 0 0 -52 0 -P 90 321 7.8884764052036593e-02 7.4459657794075773e-01 -1.0937413012935250e+01 1.0974119155786763e+01 4.9359999999999998e-01 1 0 0 0 0 -P 91 -211 4.2278301863584250e-02 3.9247341077632097e-01 -8.7403526103734830e+00 8.7503752131858565e+00 1.3957000000000000e-01 1 0 0 0 0 -P 92 211 6.4367355561099904e-02 3.6656271279001679e-01 -1.3767381548990618e+00 1.4329686357086739e+00 1.3957000000000000e-01 1 0 0 0 0 -P 93 -2212 4.1585942036274817e-02 5.6395536708324689e-01 -1.1971979631427098e+01 1.2021997418683901e+01 9.3827000000000005e-01 1 0 0 0 0 -P 94 2112 4.9188311626540610e-02 1.3014271868710594e+00 -1.5047619097566116e+01 1.5133068575244886e+01 9.3957000000000002e-01 1 0 0 0 0 -V -20 0 -7.4269769026061745e-06 -2.7446285922861489e-05 -1.0438030306862014e-01 1.0438031490658096e-01 0 2 0 -P 95 22 -4.5719298565037564e-02 -1.2006795010764217e-01 -2.7170906130817190e+02 2.7170909168361442e+02 0 1 0 0 0 0 -P 96 22 2.1135098588074424e-02 2.9217394006442684e-02 -7.3802480998431093e+01 7.3802489808083607e+01 0 1 0 0 0 0 -V -21 0 0 0 0 0 0 3 0 -P 97 211 1.9058278725344435e-01 1.3383881894953986e-01 6.8583567178648615e+00 6.8637286719855979e+00 1.3957000000000000e-01 1 0 0 0 0 -P 98 -211 -4.9893773724282060e-02 -5.3826599477990789e-02 4.3098583175285032e+00 4.3127421895514972e+00 1.3957000000000000e-01 1 0 0 0 0 -P 99 111 1.2717944250852329e-02 2.0789923927546888e-02 5.6102983279735579e+00 5.6119747768771902e+00 1.3497999999999999e-01 2 0 0 -53 0 -V -22 0 0 0 0 0 0 3 0 -P 100 111 2.0228195634579012e-02 -1.9810461285380357e-01 2.6837098683979255e+00 2.6944707969597661e+00 1.3497999999999999e-01 2 0 0 -54 0 -P 101 111 -1.9448733826450373e-01 -3.0772173043153522e-01 5.9693477937278034e+00 5.9819604370981914e+00 1.3497999999999999e-01 2 0 0 -55 0 -P 102 111 -2.6469435630176663e-01 -5.8497375613724767e-01 7.5508427208632973e+00 7.5792943466553382e+00 1.3497999999999999e-01 2 0 0 -56 0 -V -23 0 0 0 0 0 0 2 0 -P 103 -211 5.9300840341949650e-02 -7.9895912928811963e-01 3.9895681488508994e+00 4.0716073090566693e+00 1.3957000000000000e-01 1 0 0 0 0 -P 104 111 -1.2368786453413552e+00 -1.4005317185689488e+00 1.2746545583623952e+01 1.2883477860959070e+01 1.3497999999999999e-01 2 0 0 -57 0 -V -24 0 0 0 0 0 0 2 0 -P 105 22 -6.3422905570294317e-03 -7.9336321700606463e-02 8.0076038030440988e-01 8.0470594831637421e-01 0 1 0 0 0 0 -P 106 22 -2.6701434621632107e+00 -6.6149024683386048e-01 2.6198889178804361e+01 2.6342912323022706e+01 0 1 0 0 0 0 -V -25 0 0 0 0 0 0 3 0 -P 107 -211 1.7586778974385729e-02 3.3676945404653977e-02 3.2030504088469960e+00 3.2063148844056766e+00 1.3957000000000000e-01 1 0 0 0 0 -P 108 211 3.9410357646856603e-01 9.7313149537317151e-02 1.4025732004537366e+01 1.4032299367033970e+01 1.3957000000000000e-01 1 0 0 0 0 -P 109 111 3.1959377834786096e-01 -3.7306221511642979e-01 1.2482378225204421e+01 1.2492769963341344e+01 1.3497999999999999e-01 2 0 0 -58 0 -V -26 0 0 0 0 0 0 2 0 -P 110 -211 -8.4080503689870231e-02 -1.8799913200941373e-01 1.7544692223771495e+01 1.7546456001611979e+01 1.3957000000000000e-01 1 0 0 0 0 -P 111 111 1.5239435838771678e-01 4.0414983069819693e-01 9.1658492565191594e+00 9.1770133115166939e+00 1.3497999999999999e-01 2 0 0 -59 0 -V -27 0 0 0 0 0 0 3 0 -P 112 -211 4.7070025031333157e-01 6.8525031471775202e-02 4.9225309974297012e+01 4.9227805925676876e+01 1.3957000000000000e-01 1 0 0 0 0 -P 113 211 5.9651172498042482e-01 -1.2288599138979327e-01 1.0093129545527971e+02 1.0093322946022674e+02 1.3957000000000000e-01 1 0 0 0 0 -P 114 111 1.0877872629489453e-01 6.2030942934870215e-02 9.2553300234852465e+00 9.2571612329700255e+00 1.3497999999999999e-01 2 0 0 -60 0 -V -28 0 0 0 0 0 0 2 0 -P 115 -211 4.0683649987303769e-02 6.5512868154666238e-03 6.5875064226277624e+00 6.5891136529731558e+00 1.3957000000000000e-01 1 0 0 0 0 -P 116 111 3.7716281534402596e-01 2.6387314224154818e-01 4.9755028559286941e+01 4.9757340838918765e+01 1.3497999999999999e-01 2 0 0 -61 0 -V -29 0 3.6949163916019824e-04 8.5257720973118501e-05 3.9454030739861111e-02 3.9455868213549919e-02 0 2 0 -P 117 22 4.7151597958341473e-01 4.5921772870311794e-02 5.0588381905928500e+01 5.0590600114925508e+01 0 1 0 0 0 0 -P 118 22 9.6707579898488760e-01 2.8602364470440500e-01 1.0302333278063017e+02 1.0302826865649438e+02 0 1 0 0 0 0 -V -30 0 0 0 0 0 0 2 0 -P 119 -211 9.1583466897251198e-01 2.1251086350657316e+00 -4.3722848514166444e+01 4.3784264317553273e+01 1.3957000000000000e-01 1 0 0 0 0 -P 120 211 6.4923444799854679e-01 7.0777405005783134e-01 -1.7423230407349280e+01 1.7450240316020970e+01 1.3957000000000000e-01 1 0 0 0 0 -V -31 0 0 0 0 0 0 2 0 -P 121 211 -1.0733243092126835e-01 4.2644543258701532e-02 1.5591728243781708e+02 1.5591738768138310e+02 1.3957000000000000e-01 1 0 0 0 0 -P 122 -211 -2.5305067720695146e-01 -2.1157383395427928e-01 7.0655409695023229e+02 7.0655418772736425e+02 1.3957000000000000e-01 1 0 0 0 0 -V -32 0 0 0 0 0 0 2 0 -P 123 -2212 4.9944981990249282e-01 1.4870720522775491e-01 3.2948710527509917e+02 3.2948885331238847e+02 9.3827000000000005e-01 1 0 0 0 0 -P 124 111 5.2795567011208044e-01 -5.5755347150152117e-02 1.2395602297064545e+02 1.2395723333532385e+02 1.3497999999999999e-01 2 0 0 -62 0 -V -33 0 0 0 0 0 0 3 0 -P 125 211 -1.2188920384027405e-01 3.5075345690126225e-01 3.1795559830185887e+01 3.1798034367950663e+01 1.3957000000000000e-01 1 0 0 0 0 -P 126 -211 -2.2097435527052245e-01 7.1076741178384292e-02 8.2130801390093922e+01 8.2131248001797573e+01 1.3957000000000000e-01 1 0 0 0 0 -P 127 111 -1.6637823561728583e-02 -1.7998512288051847e-02 1.0856708622226705e+01 1.0857575349586533e+01 1.3497999999999999e-01 2 0 0 -63 0 -V -34 0 0 0 0 0 0 2 0 -P 128 -211 3.1091271140052751e-01 3.5632832396911990e-01 3.4350353332907815e+01 3.4353891926084358e+01 1.3957000000000000e-01 1 0 0 0 0 -P 129 111 2.4485646346106241e-01 -1.1784239944012394e-02 5.7016077712252383e+01 5.7016764471916609e+01 1.3497999999999999e-01 2 0 0 -64 0 -V -35 0 0 0 0 0 0 1 0 -P 130 310 6.8837804480312736e-02 -2.9839760512711585e-02 3.7650473956009833e+01 3.7653837700767077e+01 4.9767000000000000e-01 2 0 0 -65 0 -V -36 0 0 0 0 0 0 1 0 -P 131 130 5.5852191137677354e-01 -2.3170010256673915e-01 5.8824232435728810e+01 5.8829445252735191e+01 4.9767000000000000e-01 1 0 0 0 0 -V -37 0 0 0 0 0 0 2 0 -P 132 211 1.0828998400047013e-01 -5.1351427865948790e-02 4.3747265017350578e+00 4.3785928606872950e+00 1.3957000000000000e-01 1 0 0 0 0 -P 133 -211 -1.2477893517836794e-01 -2.6770715933836557e-02 5.3652236263234054e-01 5.6887826852539047e-01 1.3957000000000000e-01 1 0 0 0 0 -V -38 0 0 0 0 0 0 2 0 -P 134 211 1.8156078434278519e-01 -5.3337778057810092e-01 1.1827166973830426e+01 1.1841402559958460e+01 1.3957000000000000e-01 1 0 0 0 0 -P 135 111 2.9051823129776339e-01 9.4253205862916190e-02 2.5554493631607658e+00 2.5771739478759641e+00 1.3497999999999999e-01 2 0 0 -66 0 -V -39 0 0 0 0 0 0 2 0 -P 136 -211 -4.9377802104061563e-01 -2.1311641152282343e-01 6.7449678075376100e+00 6.7678139637952421e+00 1.3957000000000000e-01 1 0 0 0 0 -P 137 111 1.9335000230150959e-01 -1.6887660807106833e-01 9.4847169615688305e+00 9.4891505928410194e+00 1.3497999999999999e-01 2 0 0 -67 0 -V -40 0 0 0 0 0 0 1 0 -P 138 130 -2.6561371175678439e-01 -2.6535883073847484e+00 2.0655232762662497e+01 2.0832628193716424e+01 4.9767000000000000e-01 1 0 0 0 0 -V -41 0 0 0 0 0 0 2 0 -P 139 311 -4.5567411934308917e-02 -1.9406127316992008e-01 1.8546771679191969e+00 1.9306058616080843e+00 4.9767000000000000e-01 2 0 0 -68 0 -P 140 211 1.5423113089690546e-01 -6.9220110873578600e-01 2.8081145831536185e+00 2.8996408249458776e+00 1.3957000000000000e-01 1 0 0 0 0 -V -42 0 0 0 0 0 0 2 0 -P 141 211 7.2357677730123915e-02 -1.3328084686398270e-01 6.2898311502468995e-02 2.1548874717056224e-01 1.3957000000000000e-01 1 0 0 0 0 -P 142 -211 -5.7019430719192066e-01 -9.5127740091841564e-02 1.6405461753823727e+00 1.7450049780303740e+00 1.3957000000000000e-01 1 0 0 0 0 -V -43 0 0 0 0 0 0 2 0 -P 143 -311 -1.0247389161942042e-01 -3.7550445704827762e-01 2.5312077640729019e-01 6.8062475129529332e-01 4.9767000000000000e-01 2 0 0 -69 0 -P 144 -211 -1.8768353488580339e-01 1.4528908800357815e-01 3.8970686724282899e-01 4.7716376186416543e-01 1.3957000000000000e-01 1 0 0 0 0 -V -44 0 0 0 0 0 0 1 0 -P 145 310 7.9013389939514289e-02 -3.2312546676672708e-02 -8.4688302464291099e-01 9.8598859161290064e-01 4.9767000000000000e-01 2 0 0 -70 0 -V -45 0 0 0 0 0 0 2 0 -P 146 -211 -7.3050709928776256e-02 3.0537971459793700e-01 -7.3307859769912698e-01 8.0961545909989518e-01 1.3957000000000000e-01 1 0 0 0 0 -P 147 211 2.0079705428855016e-01 -1.2661225229997761e-01 2.5627217928987662e-02 2.7656221477673332e-01 1.3957000000000000e-01 1 0 0 0 0 -V -46 0 0 0 0 0 0 3 0 -P 148 -211 -1.3676538015193693e-01 2.1243887536093334e-01 -2.4816336935736563e+00 2.4983635882218485e+00 1.3957000000000000e-01 1 0 0 0 0 -P 149 211 -6.2902915281313837e-02 5.6601656520515309e-01 -6.6535918753555769e+00 6.6793784259866031e+00 1.3957000000000000e-01 1 0 0 0 0 -P 150 111 4.2025934335575603e-02 1.4415388830729814e-01 -2.0478406253098065e+00 2.0577699943725856e+00 1.3497999999999999e-01 2 0 0 -71 0 -V -47 0 2.1528371579891772e-05 2.1143067906480407e-05 -7.7746119899777387e-05 8.4007917995002846e-05 0 2 0 -P 151 22 1.3065354257831752e-01 1.6396812327723584e-01 -6.9933227768013839e-01 7.3008323377859696e-01 0 1 0 0 0 0 -P 152 22 1.5655151467895148e-01 1.1809668622962230e-01 -3.3786083906270786e-01 3.9064709216740479e-01 0 1 0 0 0 0 -V -48 0 0 0 0 0 0 2 0 -P 153 -211 -6.7869057726822266e-02 2.1587332720713015e-01 -6.2122541431505294e+00 6.2179408831531298e+00 1.3957000000000000e-01 1 0 0 0 0 -P 154 211 4.7387253393100676e-01 -4.6099131523123638e-01 -2.8882389448288819e+01 2.8890291936888733e+01 1.3957000000000000e-01 1 0 0 0 0 -V -49 0 0 0 0 0 0 2 0 -P 155 321 2.7028747166747208e-01 -1.7866346638866426e-01 -6.5733789914797921e+02 6.5733816432121944e+02 4.9359999999999998e-01 1 0 0 0 0 -P 156 111 -1.4463108126498905e-01 -1.2879962101808320e-01 -8.4210278445963058e+02 8.4210281754768846e+02 1.3497999999999999e-01 2 0 0 -72 0 -V -50 0 0 0 0 0 0 1 0 -P 157 130 -9.3629085348251956e-02 -1.1090305621819395e-01 -5.0941280621429246e+02 5.0941306998980963e+02 4.9767000000000000e-01 1 0 0 0 0 -V -51 0 0 0 0 0 0 2 0 -P 158 -211 -1.3297904895597815e-01 -2.9438247842001541e-01 -9.5132803387557174e-01 1.0143220809977018e+00 1.3957000000000000e-01 1 0 0 0 0 -P 159 111 3.3310773039596953e-01 1.8320108049326658e-01 -7.0540906308433615e-01 8.1261611024208424e-01 1.3497999999999999e-01 2 0 0 -73 0 -V -52 0 0 0 0 0 0 2 0 -P 160 -311 -2.8181023933901379e-02 5.6769404948908375e-01 -5.7061728336847795e+00 5.7559668641087107e+00 4.9767000000000000e-01 2 0 0 -74 0 -P 161 111 -5.9812769882346839e-01 7.9865106895285420e-01 -7.1598821292469550e+00 7.2303341540449777e+00 1.3497999999999999e-01 2 0 0 -75 0 -V -53 0 6.3322798099678783e-07 1.0351328244606082e-06 2.7933743165875751e-04 2.7942090225223967e-04 0 2 0 -P 162 22 5.8096471301070769e-02 5.3428646123028153e-02 3.7765134140627472e+00 3.7773381350893178e+00 0 1 0 0 0 0 -P 163 22 -4.5378527050218442e-02 -3.2638722195481272e-02 1.8337849139108104e+00 1.8346366417878721e+00 0 1 0 0 0 0 -V -54 0 3.7908084154555169e-06 -3.7125240783364860e-05 5.0293314033274142e-04 5.0494976204667260e-04 0 2 0 -P 164 22 2.3879476083673905e-02 -9.5043452643842410e-02 2.0569871554342769e+00 2.0593201899874849e+00 0 1 0 0 0 0 -P 165 22 -3.6512804490948913e-03 -1.0306116020996116e-01 6.2672271296364868e-01 6.3515060697228121e-01 0 1 0 0 0 0 -V -55 0 -2.8163829617978358e-05 -4.4561370745053719e-05 8.6442488078252821e-04 8.6625132533200738e-04 0 2 0 -P 166 22 -2.1272696263621679e-01 -2.5289224126334287e-01 5.0842833699721055e+00 5.0950117401727875e+00 0 1 0 0 0 0 -P 167 22 1.8239624371713066e-02 -5.4829489168192323e-02 8.8506442375569738e-01 8.8694869692540323e-01 0 1 0 0 0 0 -V -56 0 -1.0050177887851955e-04 -2.2210863847062044e-04 2.8669788660454984e-03 2.8777816615566582e-03 0 2 0 -P 168 22 -2.3432702581842058e-01 -3.6425243249658318e-01 4.8985588570153329e+00 4.9176689462846062e+00 0 1 0 0 0 0 -P 169 22 -3.0367330483346080e-02 -2.2072132364066455e-01 2.6522838638479649e+00 2.6616254003707325e+00 0 1 0 0 0 0 -V -57 0 -2.7250250929128789e-04 -3.0855768194360781e-04 2.8082509706315608e-03 2.8384191599824990e-03 0 2 0 -P 170 22 -1.2172414307179868e-02 -1.7033656066235661e-02 7.2692940643269088e-02 7.5647714627834581e-02 0 1 0 0 0 0 -P 171 22 -1.2247062310341752e+00 -1.3834980625027131e+00 1.2673852642980682e+01 1.2807830146331236e+01 0 1 0 0 0 0 -V -58 0 7.5098213197226507e-05 -8.7662237705231396e-05 2.9331118584683597e-03 2.9355537112795457e-03 0 2 0 -P 172 22 3.2605188375907718e-01 -3.4647857601151411e-01 1.2132012012470367e+01 1.2141337352419752e+01 0 1 0 0 0 0 -P 173 22 -6.4581054112161709e-03 -2.6583639104915669e-02 3.5036621273405388e-01 3.5143261092159195e-01 0 1 0 0 0 0 -V -59 0 1.4467157300980747e-06 3.8366900426852168e-06 8.7013577401450696e-05 8.7119560419112813e-05 0 2 0 -P 174 22 -2.1452482341985615e-02 1.4905556420087129e-02 4.8556153445010763e-01 4.8626370247877698e-01 0 1 0 0 0 0 -P 175 22 1.7384684072970241e-01 3.8924427427810981e-01 8.6802877220690533e+00 8.6907496090379173e+00 0 1 0 0 0 0 -V -60 0 1.3419342637882059e-05 7.6523646281469803e-06 1.1417714569953998e-03 1.1419973617136749e-03 0 2 0 -P 176 22 -1.6355529844852102e-02 4.0361833523059554e-02 4.2397615259600352e+00 4.2399851860558204e+00 0 1 0 0 0 0 -P 177 22 1.2513425613974663e-01 2.1669109411810668e-02 5.0155684975252131e+00 5.0171760469142059e+00 0 1 0 0 0 0 -V -61 0 1.8450118173567006e-05 1.2908193647738750e-05 2.4339254011843977e-03 2.4340385136936960e-03 0 2 0 -P 178 22 1.0751210652606756e-01 2.8884350394443786e-02 7.9047322108340383e+00 7.9055160795323509e+00 0 1 0 0 0 0 -P 179 22 2.6965070881795838e-01 2.3498879184710436e-01 4.1850296348452900e+01 4.1851824759386410e+01 0 1 0 0 0 0 -V -62 0 5.5808110402548016e-05 -5.8936777184863162e-06 1.3102902017394719e-02 1.3103029960268379e-02 0 2 0 -P 180 22 2.0951224553846201e-01 4.2892218244458290e-02 4.5755572283853013e+01 4.5756072057665904e+01 0 1 0 0 0 0 -P 181 22 3.1844342457361852e-01 -9.8647565394610406e-02 7.8200450686792436e+01 7.8201161277657945e+01 0 1 0 0 0 0 -V -63 0 -7.7083740048796682e-06 -8.3387868451053499e-06 5.0299590094601649e-03 5.0303605679107057e-03 0 2 0 -P 182 22 -6.6083273365725573e-02 -4.5663363344813121e-02 6.0722671538732644e+00 6.0727984101054098e+00 0 1 0 0 0 0 -P 183 22 4.9445449803996989e-02 2.7664851056761277e-02 4.7844414683534406e+00 4.7847769394811230e+00 0 1 0 0 0 0 -V -64 0 1.6595430708072929e-05 -7.9869052535450839e-07 3.8643307738137509e-03 3.8643773197462525e-03 0 2 0 -P 184 22 1.6865708784952835e-01 5.3640703946320818e-02 3.2632464854177648e+01 3.2632944779739709e+01 0 1 0 0 0 0 -P 185 22 7.6199375611534031e-02 -6.5424943890333209e-02 2.4383612858074731e+01 2.4383819692176896e+01 0 1 0 0 0 0 -V -65 0 7.5637609908900192e+00 -3.2787335134736542e+00 4.1369591657798037e+03 4.1373287673609439e+03 0 2 0 -P 186 211 1.5828490107324933e-01 -6.4280458726054257e-02 3.2153714760343846e+01 3.2154471520485849e+01 1.3957000000000000e-01 1 0 0 0 0 -P 187 -211 -8.9447096592936592e-02 3.4440698213342676e-02 5.4967591956659874e+00 5.4993661802812257e+00 1.3957000000000000e-01 1 0 0 0 0 -V -66 0 2.5320261325297056e-06 8.2146851594660370e-07 2.2272146360575985e-05 2.2461488062029682e-05 0 2 0 -P 188 22 1.2669605830908041e-02 -2.6208921583066511e-02 3.1664036093791548e-01 3.1797569821819927e-01 0 1 0 0 0 0 -P 189 22 2.7784862546685535e-01 1.2046212744598270e-01 2.2388090022228502e+00 2.2591982496577647e+00 0 1 0 0 0 0 -V -67 0 1.3660190168239829e-04 -1.1931143282950388e-04 6.7009586679455911e-03 6.7040910313070105e-03 0 2 0 -P 190 22 3.6058703115079364e-04 4.2662265957210021e-04 -3.1743476677878273e-04 6.4249103640209230e-04 0 1 0 0 0 0 -P 191 22 1.9298941527035879e-01 -1.6930323073064041e-01 9.4850343963356085e+00 9.4885081018046158e+00 0 1 0 0 0 0 -V -68 0 0 0 0 0 0 1 0 -P 192 310 -4.5567411934308917e-02 -1.9406127316992008e-01 1.8546771679191969e+00 1.9306058616080843e+00 4.9767000000000000e-01 2 0 0 -76 0 -V -69 0 0 0 0 0 0 1 0 -P 193 310 -1.0247389161942042e-01 -3.7550445704827762e-01 2.5312077640729019e-01 6.8062475129529332e-01 4.9767000000000000e-01 2 0 0 -77 0 -V -70 0 5.4385624976392712e+00 -2.2241015692846111e+00 -5.8291718166200262e+01 6.7866479106276032e+01 0 2 0 -P 194 211 3.7783620486313486e-02 1.7172654641153431e-01 -5.6951638254031056e-01 6.1216525840763614e-01 1.3957000000000000e-01 1 0 0 0 0 -P 195 -211 4.1229769453200796e-02 -2.0403909308820700e-01 -2.7736664210260031e-01 3.7382333320526429e-01 1.3957000000000000e-01 1 0 0 0 0 -V -71 0 8.7730673005939703e-06 3.0092650734755197e-05 -4.2749421067659666e-04 4.2956700273743739e-04 0 2 0 -P 196 22 2.2729804313198435e-02 1.4173360040581309e-01 -1.0529592182762286e+00 1.0626985333767038e+00 0 1 0 0 0 0 -P 197 22 1.9296130022377168e-02 2.4202879014850413e-03 -9.9488140703357786e-01 9.9507146099588162e-01 0 1 0 0 0 0 -V -72 0 -6.1533975488663230e-05 -5.4798406078115862e-05 -3.5827660033139480e-01 3.5827661440886521e-01 0 2 0 -P 198 22 -1.6235924682431213e-01 -1.3015266567446149e-01 -6.7338370639108132e+02 6.7338373854232020e+02 0 1 0 0 0 0 -P 199 22 1.7728165559323081e-02 1.3530446563782706e-03 -1.6871907806854932e+02 1.6871907900536871e+02 0 1 0 0 0 0 -V -73 0 1.5932823142593387e-06 8.7626618918794967e-07 -3.3740309274555397e-06 3.8868112583033451e-06 0 2 0 -P 200 22 1.3362069744752528e-01 3.8397322366062157e-02 -1.4759414341141447e-01 2.0276310394298949e-01 0 1 0 0 0 0 -P 201 22 1.9948703294844422e-01 1.4480375812720442e-01 -5.5781491967292174e-01 6.0985300629909467e-01 0 1 0 0 0 0 -V -74 0 0 0 0 0 0 1 0 -P 202 310 -2.8181023933901379e-02 5.6769404948908375e-01 -5.7061728336847795e+00 5.7559668641087107e+00 4.9767000000000000e-01 2 0 0 -78 0 -V -75 0 -2.7124016605470135e-05 3.6217391200682724e-05 -3.2468779183593861e-04 3.2788266459349427e-04 0 2 0 -P 203 22 -4.6115329401590260e-01 6.6198954161011503e-01 -6.0743062014745783e+00 6.1276494957736771e+00 0 1 0 0 0 0 -P 204 22 -1.3697440480756579e-01 1.3666152734273918e-01 -1.0855759277723773e+00 1.1026846582713004e+00 0 1 0 0 0 0 -V -76 0 -2.4429198574998088e+00 -1.0403841641959659e+01 9.9431314846080440e+01 1.0350193693526136e+02 0 2 0 -P 205 -211 -6.1157976329956530e-02 7.9033809450869533e-02 2.9779915054099509e-01 3.4373065046345536e-01 1.3957000000000000e-01 1 0 0 0 0 -P 206 211 1.5590564395647613e-02 -2.7309508262078958e-01 1.5568780173782018e+00 1.5868752111446289e+00 1.3957000000000000e-01 1 0 0 0 0 -V -77 0 -1.4903509094708578e+01 -5.4612291992451460e+01 3.6813160246280908e+01 9.8988113076509521e+01 0 2 0 -P 207 -211 -2.4069686163035753e-01 -3.2706064871694290e-01 1.7742951834380868e-01 4.6461238254868642e-01 1.3957000000000000e-01 1 0 0 0 0 -P 208 211 1.3822297001093711e-01 -4.8443808331334694e-02 7.5691258063481481e-02 2.1601236874660687e-01 1.3957000000000000e-01 1 0 0 0 0 -V -78 0 -1.3280346540154400e-01 2.6752660668688737e+00 -2.6890418469921691e+01 2.7125073527598740e+01 0 2 0 -P 209 211 5.4187093550292845e-02 4.8896006520894103e-01 -5.0394127666042294e+00 5.0652916010423583e+00 1.3957000000000000e-01 1 0 0 0 0 -P 210 -211 -8.2368117484194217e-02 7.8733984280142638e-02 -6.6676006708054880e-01 6.9067526306635141e-01 1.3957000000000000e-01 1 0 0 0 0 -BlockType GenEvent -E 2 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 224 0 0 -V -1 0 0 0 0 0 1 3 0 -P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -1 0 -P 3 21 2.2381466690269431e-03 -3.4720102421292970e-01 8.5760509831394440e+00 8.5830766060849815e+00 0 3 0 0 -3 0 -P 13 1 -1.5953315142106061e-01 2.5534284672707136e-01 4.5110225338059212e+02 4.5110247456187125e+02 3.3000000000000002e-01 2 0 0 -9 0 -P 41 2203 1.5729500475203367e-01 9.1858177485858339e-02 4.1239913742420931e+03 4.1239914503976361e+03 7.7132999999999996e-01 2 0 0 -13 0 -V -2 0 0 0 0 0 1 2 0 -P 2 2212 0 0 -6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -2 0 -P 4 1 1.8117451391948236e-01 -9.2107013792072212e-01 -1.9146656945590603e+03 1.9146659246760862e+03 0 3 0 0 -4 0 -P 39 2203 -1.8117451391948236e-01 9.2107013792072212e-01 -4.3349283892041103e+03 4.3349285594657858e+03 7.7132999999999996e-01 2 0 0 -11 0 -V -3 0 0 0 0 0 0 8 0 -P 5 -2 -1.2188640529118391e+01 1.1628197337501724e+00 -1.1080748662284646e+01 1.6513573162643777e+01 0 3 0 0 -5 0 -P 11 -4 1.9522097387122794e+00 -1.0579566003536176e+00 -8.1797583597675185e+00 8.6074875461043483e+00 1.5000000000000000e+00 2 0 0 -9 0 -P 12 21 1.8528631058109368e+00 6.4833945342773376e+00 -3.6105831959994241e+01 3.6730077700698025e+01 0 2 0 0 -9 0 -P 14 4 1.0685515977985798e+01 -5.1823216653895150e+00 -2.7066366488563993e+01 2.9595183805014884e+01 1.5000000000000000e+00 2 0 0 -11 0 -P 15 21 3.5171262487128507e-01 -6.4498578844444887e-01 -1.1127260710033722e+00 1.3333670713197316e+00 0 2 0 0 -11 0 -P 16 21 3.3207848203048465e-02 9.6085117788368979e-02 -6.6003952661133902e-02 1.2120904590654386e-01 0 2 0 0 -11 0 -P 17 21 -3.7579969777487718e-02 -1.6462158612486150e-01 -9.7318874051882720e-01 9.8772913565377995e-01 0 2 0 0 -11 0 -P 40 2 -5.7580659856764782e-01 -2.1687633978359599e+00 2.8191957870207176e+00 3.6182665463315975e+00 3.3000000000000002e-01 2 0 0 -13 0 -V -4 0 0 0 0 0 0 12 0 -P 6 1 -1.0356250591506910e+01 -7.5276061205649762e+00 -8.5247158145293622e+02 8.5256771811105455e+02 0 3 0 0 -5 0 -P 28 21 8.2987543073312353e-01 1.2838272062790441e+00 -3.8410647385758452e+01 3.8441055372078296e+01 0 2 0 0 -11 0 -P 29 21 1.4485320516326545e+00 3.4111844708869525e+00 -3.4836760966940879e+01 3.5033331832225194e+01 0 2 0 0 -11 0 -P 30 21 4.7483608911375708e+00 5.0805058534361418e+00 -7.0730773803904057e+01 7.1071800552528032e+01 0 2 0 0 -11 0 -P 31 21 7.0471823787681096e+00 5.3004641843654632e+00 -7.0878720555638282e+01 7.1425140725473000e+01 0 2 0 0 -11 0 -P 32 21 6.4330986433301513e-05 -2.8659752464543387e-01 -2.0138946295725479e+00 2.0341852728531187e+00 0 2 0 0 -11 0 -P 33 21 -2.0101138190485397e+00 1.8374935910906517e-01 -1.0007919765693144e+02 1.0009955107315744e+02 0 2 0 0 -11 0 -P 34 21 -1.9229525710899356e+00 -1.5157785543803595e+00 -2.2906932968426068e+02 2.2908241559144841e+02 0 2 0 0 -11 0 -P 35 21 -3.1664534528418580e+00 -1.7416366637989906e+00 -8.3806850645725774e+01 8.3884730081777633e+01 0 2 0 0 -11 0 -P 36 21 -3.7168946513508216e-01 -3.5284021138698476e+00 -1.0878664867278101e+02 1.0884448862478403e+02 0 2 0 0 -11 0 -P 37 21 -3.1241121155591017e-01 2.4591674095968902e-01 -7.8556145968468542e+01 7.8557152094687893e+01 0 2 0 0 -11 0 -P 38 21 2.1757864903890276e+00 -6.9754834757800643e-01 -1.5468366370543001e+02 1.5470053793663271e+02 0 2 0 0 -11 0 -V -5 0 0 0 0 0 0 2 0 -P 7 22 -1.3261813212669724e+01 -8.0763106975450007e+00 -1.0418644172499936e+02 1.0533715927196684e+02 0 3 0 0 -6 0 -P 8 -24 -9.2830779079555814e+00 1.7115243107301954e+00 -7.5936588839022193e+02 7.6374413200173183e+02 8.1113758792799615e+01 3 0 0 -7 0 -V -6 0 0 0 0 0 0 1 0 -P 9 22 -1.3261813212669724e+01 -8.0763106975450007e+00 -1.0418644172499936e+02 1.0533715927196684e+02 0 1 0 0 0 0 -V -7 0 0 0 0 0 0 1 0 -P 10 -24 -9.2830779079555814e+00 1.7115243107301954e+00 -7.5936588839022193e+02 7.6374413200173183e+02 8.1113758792799615e+01 2 0 0 -8 0 -V -8 0 0 0 0 0 0 6 0 -P 42 -4 -3.6405680130529461e+01 2.3505435732580519e+01 -3.4936432423810379e+02 3.5204482684040653e+02 1.5000000000000000e+00 2 0 0 -15 0 -P 43 21 -1.2696872981433902e+00 -7.3488203514654904e-02 -1.1342868074612710e+01 1.1413945965755696e+01 0 2 0 0 -15 0 -P 44 21 -4.1552470502532822e-02 -2.4740042534493506e-01 -1.9652301256829328e+00 1.9811771816668682e+00 0 2 0 0 -15 0 -P 45 21 9.2875684016986071e-01 -5.2482893316735224e-01 -8.2669188038171093e+00 8.3354652651280841e+00 0 2 0 0 -15 0 -P 46 21 2.5933060912540751e+00 -1.5432000571134972e+00 -4.0105536618336508e+01 4.0218910606130805e+01 0 2 0 0 -15 0 -P 47 3 2.4911779059795872e+01 -1.9404993802709878e+01 -3.4832101052966868e+02 3.4974980614264371e+02 5.0000000000000000e-01 2 0 0 -15 0 -V -9 0 0 0 0 0 0 1 0 -P 52 92 3.6455396931021555e+00 5.6807807806507915e+00 4.0681666306083036e+02 4.9644003980867365e+02 2.8444218138552606e+02 2 0 0 -10 0 -V -10 0 0 0 0 0 0 17 0 -P 53 -423 1.8014118894544171e+00 -7.4135744726077624e-01 -9.8985325423010675e+00 1.0286033591286305e+01 2.0066999999999999e+00 2 0 0 -21 0 -P 54 -323 5.0264419845508967e-01 1.5096096593072483e+00 -6.4075559093590417e+00 6.6727104662027399e+00 9.6784281807288342e-01 2 0 0 -22 0 -P 55 313 6.4824466837653216e-01 1.7028313815609744e+00 -1.2490128522047499e+01 1.2658108385343498e+01 9.5107388447566010e-01 2 0 0 -23 0 -P 56 113 3.1373653839431187e-01 1.0591234964860790e+00 -3.8183528211076077e+00 4.0448247418494256e+00 7.4874276589783129e-01 2 0 0 -24 0 -P 57 223 8.2692544173461439e-03 4.6939097115965078e-01 -5.5469163366739194e+00 5.6207627549321177e+00 7.7736531746492565e-01 2 0 0 -25 0 -P 58 213 1.9044107216389983e-01 8.1937027750395064e-01 -3.6346431429697050e+00 3.7966133083889493e+00 7.0427720613090783e-01 2 0 0 -26 0 -P 59 223 4.7623181452657998e-01 3.2991099537503743e-01 -1.3035235691380478e+00 1.6193069146444774e+00 7.6638318254016657e-01 2 0 0 -27 0 -P 60 -323 -1.0115943353617618e-01 5.6476717758048370e-03 1.7300715275273690e-01 8.2205819328193652e-01 7.9723463989499699e-01 2 0 0 -28 0 -P 61 313 -7.7118065121252105e-02 3.7088297201745679e-01 6.5831368662425160e-01 1.1370141416373667e+00 8.4612225676080488e-01 2 0 0 -29 0 -P 62 213 -3.5806889091875166e-01 -1.8533975814985065e-01 2.0214743365951066e-01 7.5874614723662881e-01 6.1013766841301631e-01 2 0 0 -30 0 -P 63 221 5.3742504319834894e-01 2.2371832414580742e-01 7.6764387006558730e+00 7.7179199395330977e+00 5.4744999999999999e-01 2 0 0 -31 0 -P 64 -213 -3.5723363435424654e-01 -2.4687075875660527e-01 4.3946274554500251e+00 4.4381896913330143e+00 4.4296300411712430e-01 2 0 0 -32 0 -P 65 211 -9.6962110337190308e-03 -1.9969339915386206e-01 9.7285408505103610e-01 1.0029438298701092e+00 1.3957000000000000e-01 1 0 0 0 0 -P 66 -213 3.6007407932397151e-01 -1.9108983779111039e-02 2.4483370677350226e+01 2.4497188617868417e+01 7.3945382481060740e-01 2 0 0 -33 0 -P 67 113 -3.7252120952480011e-01 1.1767633929689882e-02 3.8343277541438461e+01 3.8352383249490323e+01 7.4796909511894960e-01 2 0 0 -34 0 -P 68 113 -9.0606939026123462e-02 1.6342699333927246e-01 1.6719221309737839e+02 1.6719396525633584e+02 7.4228009410397144e-01 2 0 0 -35 0 -P 69 221 1.7346551830672804e-01 4.0747075115002573e-01 2.0582006607406680e+02 2.0582127057943939e+02 5.4744999999999999e-01 2 0 0 -36 0 -V -11 0 0 0 0 0 10 1 0 -P 18 21 -3.8916892480043179e+00 -1.8950634673498339e+00 4.3405633505207952e+01 4.3620929961851424e+01 0 2 0 0 -11 0 -P 19 21 -3.9110823174159708e+00 3.1313981445182435e+00 7.8933491919030098e+02 7.8935081989720652e+02 0 2 0 0 -11 0 -P 20 21 3.8916892480043179e+00 1.8950634673498339e+00 1.4168700767391088e+03 1.4168766886604622e+03 0 2 0 0 -11 0 -P 21 21 4.3740574207816687e+00 6.7194450447463385e+00 8.3124634883261848e+01 8.3510408001070459e+01 0 2 0 0 -11 0 -P 22 21 3.9110823174159708e+00 -3.1313981445182435e+00 3.6591766345710994e+01 3.6933177273722393e+01 0 2 0 0 -11 0 -P 23 21 -1.7556414536864717e+00 -3.2948210135311675e+00 9.6577188877003675e+00 1.0354209604743055e+01 0 2 0 0 -11 0 -P 24 21 -4.3740574207816687e+00 -6.7194450447463385e+00 8.7596980484749754e-01 8.0653978902882315e+00 0 2 0 0 -11 0 -P 25 21 -2.3472186202550427e+00 -1.7652302001002413e+00 -4.8822773731482902e+00 5.6975525674603205e+00 0 2 0 0 -11 0 -P 26 21 1.7556414536864717e+00 3.2948210135311675e+00 -4.6484359802172142e+00 5.9620532945694862e+00 0 2 0 0 -11 0 -P 27 21 2.3472186202550427e+00 1.7652302001002413e+00 -7.2800433838180606e+02 7.2801026241093734e+02 0 2 0 0 -11 0 -P 70 92 1.9317863021338749e+01 2.7609108265139839e+00 -3.6936736405113015e+03 8.4685219372436368e+03 7.6205156017495565e+03 2 0 0 -12 0 -V -12 0 0 0 0 0 0 90 0 -P 91 -213 -1.4723087124553025e+00 1.8245140592851474e+00 3.9234982586875026e+02 3.9235769486019092e+02 8.2359715080257312e-01 2 0 0 -52 0 -P 92 213 1.7539750249024346e+00 1.4987779798051035e+00 6.9123026432414906e+02 6.9123466203199087e+02 8.7000748675694395e-01 2 0 0 -53 0 -P 93 -211 -8.9424661017914325e-02 -3.0761209203019885e-01 1.4068666240461201e+02 1.4068709635323111e+02 1.3957000000000000e-01 1 0 0 0 0 -P 94 111 7.0564265001932358e-01 3.8262897153753883e-01 1.6816678510920750e+02 1.6816875503507225e+02 1.3497999999999999e-01 2 0 0 -54 0 -P 95 223 1.8302919870385345e-01 6.5783452518379060e-01 2.6383157492994411e+02 2.6383362307134547e+02 7.8389220432534346e-01 2 0 0 -55 0 -P 96 113 1.1656756707026841e+00 -6.4896512612338464e-01 1.0945955049891027e+02 1.0947082232861229e+02 8.2933128176902648e-01 2 0 0 -56 0 -P 97 213 -3.5903158855632840e-02 9.9198943525646954e-01 3.7343100725470698e+01 3.7367385916754081e+01 9.1050885910361523e-01 2 0 0 -57 0 -P 98 221 4.2162092047841054e-01 3.3016782868221339e-01 8.5630844493739087e+00 8.5972607140467154e+00 5.4744999999999999e-01 2 0 0 -58 0 -P 99 -213 9.7457004419126791e-01 2.5386776349576827e+00 3.2029157610337023e+01 3.2157623407268844e+01 9.2256981884626144e-01 2 0 0 -59 0 -P 100 111 1.2787995261416203e+00 5.9131216608945592e-01 1.8321222064458190e+01 1.8375809528872868e+01 1.3497999999999999e-01 2 0 0 -60 0 -P 101 331 1.5941076518656097e+00 2.2203899316199833e+00 3.0301907248901987e+01 3.0440010892784585e+01 9.5779412068020275e-01 2 0 0 -61 0 -P 102 213 1.7703923967892532e+00 -1.5783757695402438e+00 1.7113365104763496e+01 1.7299350723397684e+01 8.8017664914626426e-01 2 0 0 -62 0 -P 103 -211 -1.8759452428865081e-01 -1.2769116703025019e-01 3.8721698603132602e+00 3.8813239946826195e+00 1.3957000000000000e-01 1 0 0 0 0 -P 104 211 6.9482022183564407e-01 -7.4276553322659658e-02 2.8254613298076237e+00 2.9139326790753919e+00 1.3957000000000000e-01 1 0 0 0 0 -P 105 311 6.3686850058466904e-01 -2.8985459322238305e-01 6.1254602664267574e+00 6.1853501175537389e+00 4.9767000000000000e-01 2 0 0 -63 0 -P 106 333 8.7207094479077651e-02 -2.0295472311855449e+00 7.6184364527955317e+00 7.9504887791525123e+00 1.0212887942231736e+00 2 0 0 -64 0 -P 107 -323 -1.9822568338569455e-01 -1.5507438333859327e-01 2.6398270078375625e+00 2.7898910808615089e+00 8.6687030508629537e-01 2 0 0 -65 0 -P 108 113 -1.1042506848572424e+00 -1.9030565630970109e+00 5.3217383054275196e+00 5.8133432539368144e+00 7.9565528923260520e-01 2 0 0 -66 0 -P 109 213 -7.2310463393123914e-01 -7.6975522680298714e-01 6.1285789995101991e-01 1.6294860676683323e+00 1.0789933356557311e+00 2 0 0 -67 0 -P 110 -211 -4.3482640295969677e-01 -8.1532294744635425e-01 1.7768661421435300e-01 9.5125066471169373e-01 1.3957000000000000e-01 1 0 0 0 0 -P 111 213 -5.9736000021821500e-01 -1.2204809639168086e+00 2.6747136936349564e-01 1.5533645053088498e+00 7.0355355146585397e-01 2 0 0 -68 0 -P 112 -211 -1.4286103486218285e+00 -1.6452141393289603e+00 4.8302563621898731e-01 2.2361687419741094e+00 1.3957000000000000e-01 1 0 0 0 0 -P 113 111 4.3583065059189477e-02 -2.4339437891750076e-01 6.2664394827260231e-02 2.8859441094320626e-01 1.3497999999999999e-01 2 0 0 -69 0 -P 114 213 -1.1457523430575574e+00 -1.7185955494709606e+00 -2.0075212146900698e+00 2.9665875925104452e+00 7.1005733734910470e-01 2 0 0 -70 0 -P 115 -213 -9.9510244241403112e-01 -3.8721112665348262e-01 -1.1073021899671061e+00 1.6337817612725141e+00 5.5042108976504500e-01 2 0 0 -71 0 -P 116 321 3.6387094509041512e-01 4.3920647350883402e-01 9.9248798190379642e-02 7.6078622161241372e-01 4.9359999999999998e-01 1 0 0 0 0 -P 117 -321 -1.2747399230810363e-01 -1.0200080057828731e+00 -1.4513610769384608e+00 1.8457399291959007e+00 4.9359999999999998e-01 1 0 0 0 0 -P 118 211 -2.0133216812193178e-01 3.5802685432120634e-01 -1.7925786519980291e+00 1.8443253180593948e+00 1.3957000000000000e-01 1 0 0 0 0 -P 119 311 -2.8765138987802308e-01 7.2322394316508809e-01 -1.3293539465693636e+00 1.6188432716682488e+00 4.9767000000000000e-01 2 0 0 -72 0 -P 120 -321 1.0298266079353463e-01 -1.3133623038629999e-01 -8.4534917780111540e-01 9.9303113055191838e-01 4.9359999999999998e-01 1 0 0 0 0 -P 121 113 -2.0064710281109285e-02 9.6668445379680457e-01 -2.7580016928497004e+00 3.0477179748732270e+00 8.6436687279907831e-01 2 0 0 -73 0 -P 122 213 6.9914421880252642e-01 4.8815033788881651e-01 -2.1395488946251060e+00 2.3683512678933512e+00 5.5165647333695911e-01 2 0 0 -74 0 -P 123 223 1.5872029432710627e-01 -2.3339814721712135e-01 -7.4179222929870310e+00 7.4628850957322737e+00 7.6773431625352861e-01 2 0 0 -75 0 -P 124 223 -3.0717425565275075e-01 5.6842261363386204e-01 -1.7694534053195312e+01 1.7723823647209741e+01 7.8735571800585269e-01 2 0 0 -76 0 -P 125 1114 7.6998734838977989e-01 -3.4728630806103294e-01 -1.9364499157932190e+02 1.9364995150560429e+02 1.0988476103652125e+00 2 0 0 -77 0 -P 126 111 6.5158363716255141e-01 1.5605607263941090e+00 -1.1121050811925711e+02 1.1122344737851247e+02 1.3497999999999999e-01 2 0 0 -78 0 -P 127 -2112 1.0813888713417015e-01 9.3320687480095546e-02 -7.6290462496469246e+01 7.6296381712894501e+01 9.3957000000000002e-01 1 0 0 0 0 -P 128 211 3.9294549049558353e-01 -4.8295703118897615e-01 -5.9670507038186024e+01 5.9673918453806799e+01 1.3957000000000000e-01 1 0 0 0 0 -P 129 -211 -4.9079394553889405e-02 3.0193103218666079e-01 -5.2738809586108296e+01 5.2739881375291844e+01 1.3957000000000000e-01 1 0 0 0 0 -P 130 113 7.7374346420721107e-01 8.6434540604482102e-01 -8.8859763366085502e+01 8.8870436517698323e+01 7.4240786646212009e-01 2 0 0 -79 0 -P 131 223 1.6985777384718924e-02 2.8325881170135603e-01 -9.6927730933742907e+01 9.6931159023301547e+01 7.6422612195160899e-01 2 0 0 -80 0 -P 132 223 3.0185368861046491e-01 2.4293189269126073e-01 -3.2090245504750932e+01 3.2101336386389761e+01 7.4953964748340296e-01 2 0 0 -81 0 -P 133 221 6.5201407902947539e-01 -1.2988330070145512e-02 -7.4859939959601558e+00 7.5342616536739797e+00 5.4744999999999999e-01 2 0 0 -82 0 -P 134 213 1.2458254485181726e+00 2.4534172247832897e+00 -3.9148897598913670e+01 3.9260611329490111e+01 1.0899915724536897e+00 2 0 0 -83 0 -P 135 221 8.8556817596659831e-01 9.1587012185965244e-01 -1.2421218347891800e+01 1.2498376527489638e+01 5.4744999999999999e-01 2 0 0 -84 0 -P 136 -211 1.8161190527346487e+00 1.8932700926893988e+00 -2.7662401209321924e+01 2.7786879646840031e+01 1.3957000000000000e-01 1 0 0 0 0 -P 137 111 7.2247895685888563e-01 1.1632455888028332e+00 -1.2867988035904569e+01 1.2941346600549585e+01 1.3497999999999999e-01 2 0 0 -85 0 -P 138 113 1.2139941660877747e+00 1.6756779361740803e+00 -1.8860823514754017e+01 1.8989026284653107e+01 7.5549798376482546e-01 2 0 0 -86 0 -P 139 211 1.1157147548814101e+00 5.0436447513334515e-01 -1.1621107696187737e+01 1.1686266589862242e+01 1.3957000000000000e-01 1 0 0 0 0 -P 140 -213 4.5823331418939195e-01 1.1538176266903686e+00 -1.8447864138782936e+01 1.8525111286873642e+01 1.1466403194399666e+00 2 0 0 -87 0 -P 141 213 2.0821117255183093e+00 1.6804026242358250e+00 -2.6142179810664658e+01 2.6288201716404078e+01 7.0501206525005999e-01 2 0 0 -88 0 -P 142 313 1.7813828024493763e+00 1.2357154576419902e+00 -2.2601396009113010e+01 2.2725602197916988e+01 9.6414538120668236e-01 2 0 0 -89 0 -P 143 -313 1.4186766512402984e+00 6.4743845122084742e-01 -1.8091956801791984e+01 1.8183781843473593e+01 9.4826221280775747e-01 2 0 0 -90 0 -P 144 2112 -1.1231017999695494e+00 5.3690695272926670e-01 -5.0961864079027272e+01 5.0985723579479917e+01 9.3957000000000002e-01 1 0 0 0 0 -P 145 -213 -5.7530555364241898e-01 -4.7810186265971222e-01 -9.4505926829143817e+01 9.4510818189169768e+01 6.0414491613054433e-01 2 0 0 -91 0 -P 146 -1114 -8.0379050531219987e-01 -7.4317351469684056e-01 -3.3976739042042894e+01 3.4017782197130039e+01 1.2618730645032841e+00 2 0 0 -92 0 -P 147 -213 -1.7993965627187491e-01 6.2933882558033644e-02 -4.3212693477627020e+01 4.3219348613222635e+01 7.3408310595441117e-01 2 0 0 -93 0 -P 148 211 -1.1857733256197995e+00 -2.3402786696214123e-01 -3.9319959891382794e+01 3.9338779252375360e+01 1.3957000000000000e-01 1 0 0 0 0 -P 149 311 -1.4096245121895092e+00 -2.1826091973706498e+00 -7.8978356177349141e+01 7.9022650196503378e+01 4.9767000000000000e-01 2 0 0 -94 0 -P 150 -323 -3.0387368245023250e-01 -3.9194042956116942e-01 -7.8833271694584482e+01 7.8839861573241009e+01 8.9055617476780402e-01 2 0 0 -95 0 -P 151 213 -1.8006034881526349e+00 -1.2055027990336920e+00 -8.9338286707006162e+01 8.9369650117474464e+01 9.5366684777524879e-01 2 0 0 -96 0 -P 152 113 4.9137946671111676e-01 -9.7164155725422818e-01 -5.0430982625195028e+01 5.0451579348850466e+01 9.4462116985729094e-01 2 0 0 -97 0 -P 153 221 2.6692022391655834e-01 -2.6056453113669759e-01 -2.1564701043027426e+01 2.1574873646408001e+01 5.4744999999999999e-01 2 0 0 -98 0 -P 154 311 4.1329176006341922e-01 1.8028596136298070e-01 -8.9119644403072215e+01 8.9122174609160766e+01 4.9767000000000000e-01 2 0 0 -99 0 -P 155 -321 3.6881058325853905e-01 -3.6759956648503250e-01 -5.2482305038393726e+01 5.2487209239876819e+01 4.9359999999999998e-01 1 0 0 0 0 -P 156 221 -4.0997910950580485e-01 -2.7374853556398043e-01 -4.8760304863457051e+01 4.8765869755503466e+01 5.4744999999999999e-01 2 0 0 -100 0 -P 157 211 7.1285808765427905e-01 -3.2842857210290849e-01 -1.3495391606091425e+02 1.3495627059140784e+02 1.3957000000000000e-01 1 0 0 0 0 -P 158 113 -8.5570937057012242e-01 4.5138982048336918e-01 -3.8575888425787775e+02 3.8576089945786532e+02 7.8662275684624183e-01 2 0 0 -101 0 -P 159 -211 8.5048282385916807e-01 -2.4394986791084675e-01 -2.3972504452141907e+03 2.3972506125543050e+03 1.3957000000000000e-01 1 0 0 0 0 -P 160 2224 -1.9025691153649760e-03 7.5090832178153066e-01 -1.3897064940632451e+03 1.3897072600852762e+03 1.2510896217992251e+00 2 0 0 -102 0 -P 72 213 1.0805121219025640e+00 -6.6038780518628226e-01 -2.3089962780132609e+00 2.7002122967490942e+00 5.9671109996278038e-01 2 0 0 -38 0 -P 73 331 8.8350480325607927e-01 -9.1723208806001100e-01 -1.3273651063348788e+00 2.0738588580152020e+00 9.5765181392258825e-01 2 0 0 -39 0 -P 74 -213 1.6671177452769768e+00 -6.0237742035546349e-01 -4.3269280810687976e+00 4.7129738478160546e+00 5.8964034655445841e-01 2 0 0 -40 0 -P 75 111 -2.2944867559712592e-01 -5.4494370034286373e-02 -1.1132060518150413e+00 1.1458898923091787e+00 1.3497999999999999e-01 2 0 0 -41 0 -P 76 211 1.9057714121074421e-01 -3.7678379479520874e-01 3.2988192916386494e-01 5.5370348279671411e-01 1.3957000000000000e-01 1 0 0 0 0 -P 77 -211 2.1514156450681340e-01 4.1042646895793555e-01 1.1603516057783952e-01 4.9767431377362004e-01 1.3957000000000000e-01 1 0 0 0 0 -P 78 211 1.1821640765841486e-01 -7.3020341573840120e-01 -1.3087805912292785e+00 1.5098207073272469e+00 1.3957000000000000e-01 1 0 0 0 0 -P 79 3112 -1.2499623449219958e-01 -5.9241869360866006e-02 4.0162992375308786e+00 4.1932869895481408e+00 1.1974400000000001e+00 2 0 0 -42 0 -P 80 311 -1.0795922983869366e-01 -3.0104120411989399e-02 1.6962385074932020e+00 1.7712882195102833e+00 4.9767000000000000e-01 2 0 0 -43 0 -P 81 -1114 -5.9337323488907867e-01 -4.6246084613168187e-01 7.5339721507890793e+00 7.6936474040793801e+00 1.3658375376831626e+00 2 0 0 -44 0 -P 82 -211 -3.9495796561206009e-01 3.0833169972538993e-01 9.3878856442942862e+00 9.4022835995784941e+00 1.3957000000000000e-01 1 0 0 0 0 -P 83 211 -3.1344790463608746e-01 -7.2171857255188154e-01 8.5253322989485287e+00 8.5627038883335214e+00 1.3957000000000000e-01 1 0 0 0 0 -P 84 -213 -1.2690227290925465e-01 -1.0105632908426881e-01 5.1452653640166943e+00 5.1881794411189812e+00 6.4585886893524336e-01 2 0 0 -45 0 -P 85 213 -1.2041062649028871e+00 -1.2215218528395928e-01 2.3429585452245682e+01 2.3473631837985316e+01 7.7532196386217789e-01 2 0 0 -46 0 -P 86 223 -7.4237011822675184e-02 1.4248179815169867e-01 1.5165880769368950e+01 1.5186849387363358e+01 7.8143624628963737e-01 2 0 0 -47 0 -P 87 -213 -9.0074449059785699e-01 -6.0424612216057405e-01 2.4880423729369195e+01 2.4913870228144820e+01 6.9927875585816668e-01 2 0 0 -48 0 -P 88 323 -3.9622224355221425e-01 4.7691198706436511e-01 8.3475162278290014e+01 8.3482329557234976e+01 9.0121795712962360e-01 2 0 0 -49 0 -P 89 -313 -1.1785958161298775e+00 4.3758697222424819e-01 2.3405851550380999e+02 2.3406361463389302e+02 8.9802292856965138e-01 2 0 0 -50 0 -P 90 111 -2.1010818134776000e-02 1.4739930625154105e-01 2.2010537086033544e+01 2.2011454527723057e+01 1.3497999999999999e-01 2 0 0 -51 0 -P 71 423 6.7375280292117559e+00 -3.1280786052117606e+00 -1.8078833346658740e+01 1.9648160722343899e+01 2.0066999999999999e+00 2 0 0 -37 0 -V -13 0 0 0 0 0 0 1 0 -P 161 92 -4.1851159381561415e-01 -2.0769052203501017e+00 4.1268105700291135e+03 4.1276097169439681e+03 8.1191168355921960e+01 2 0 0 -14 0 -V -14 0 0 0 0 0 0 14 0 -P 162 211 -3.1267035370541174e-01 -1.6630336354906903e+00 2.9600402088397786e+00 3.4124421527269715e+00 1.3957000000000000e-01 1 0 0 0 0 -P 163 223 -1.3456644959131422e-02 1.0490675531334205e-01 2.8997985766568299e+00 3.0056909067982369e+00 7.8368331194730689e-01 2 0 0 -103 0 -P 164 -213 -7.6664826358880125e-02 -1.5791348259790233e-01 2.8310851989334567e+00 2.9388621741173262e+00 7.6879991626605593e-01 2 0 0 -104 0 -P 165 113 -3.9648671529754964e-01 -2.4605982607667140e-01 7.6583440010326704e+00 7.7151393693837971e+00 8.0956500507766405e-01 2 0 0 -105 0 -P 166 223 8.9691194834938370e-02 -2.5125974088198971e-02 1.8317488091703201e+01 1.8334490887220280e+01 7.8390706009713318e-01 2 0 0 -106 0 -P 167 331 7.9224066352126379e-02 -2.1422931649456503e-01 1.6453778503957725e+01 1.6483212902440073e+01 9.5776295456158800e-01 2 0 0 -107 0 -P 168 211 1.5527914687816030e-01 -4.5548875201547573e-02 2.0928087163014524e+01 2.0929178158760095e+01 1.3957000000000000e-01 1 0 0 0 0 -P 169 113 -9.0692399597892714e-02 1.6957858902038977e-01 7.6922069406224782e+00 7.7066837587922024e+00 4.3121332478473434e-01 2 0 0 -108 0 -P 170 -211 1.9561892851724411e-02 -3.4229386330714748e-02 4.3617570241825661e+00 4.3641675542360279e+00 1.3957000000000000e-01 1 0 0 0 0 -P 171 211 1.4955539305015297e-01 -7.3620802444243974e-02 6.1402424512466673e+01 6.1402809403415823e+01 1.3957000000000000e-01 1 0 0 0 0 -P 172 313 -9.7870346573322886e-02 5.6843447855507345e-01 7.2008545829421976e+01 7.2016348838853801e+01 8.8945559212654413e-01 2 0 0 -109 0 -P 173 -313 -1.3048017096509981e-01 -7.9611017480924984e-01 2.3671747454399076e+02 2.3672050958431549e+02 8.8661541134793842e-01 2 0 0 -110 0 -P 174 2112 5.2848587189431351e-01 -1.8847878506702731e-01 1.0586464613615185e+03 1.0586470269955985e+03 9.3957000000000002e-01 1 0 0 0 0 -P 175 211 -3.2198770221974171e-01 5.2452521536190455e-01 2.6139330780727728e+03 2.6139331542573095e+03 1.3957000000000000e-01 1 0 0 0 0 -V -15 0 0 0 0 0 0 1 0 -P 176 92 -9.2830779079555690e+00 1.7115243107302014e+00 -7.5936588839022170e+02 7.6374413200173171e+02 8.1113758792800169e+01 2 0 0 -16 0 -V -16 0 0 0 0 0 0 10 0 -P 177 -411 -2.6390450740240546e+01 1.6827024890099779e+01 -2.5400527191191205e+02 2.5593314966697744e+02 1.8693000000000000e+00 2 0 0 -111 0 -P 178 -2112 -3.3029260138577476e+00 1.9451764508002454e+00 -3.1157827697945482e+01 3.1406783507986372e+01 9.3957000000000002e-01 1 0 0 0 0 -P 179 2112 -3.6871070129151744e+00 2.3786739914127644e+00 -3.4678443322119684e+01 3.4967557408439028e+01 9.3957000000000002e-01 1 0 0 0 0 -P 180 -313 -1.6887882543152506e+00 9.5163004863946332e-01 -1.9256191761625256e+01 1.9375050572033444e+01 9.1326775426620022e-01 2 0 0 -112 0 -P 181 323 -1.0684585629853891e+00 1.1397180800571156e+00 -1.1888673019374792e+01 1.2026652906041873e+01 9.2696977187468266e-01 2 0 0 -113 0 -P 182 -323 -1.0389598140931948e+00 -2.4279557457761929e-02 -1.5588480592748905e+01 1.5651040269879616e+01 9.3504403461721142e-01 2 0 0 -114 0 -P 183 321 9.7335278175105699e-01 -7.7540269787809635e-01 -1.2014313647022332e+01 1.2088673969904482e+01 4.9359999999999998e-01 1 0 0 0 0 -P 184 113 9.1572165877639158e+00 -6.8871050884448293e+00 -1.3173902282931255e+02 1.3223974804671991e+02 9.4551324862806529e-01 2 0 0 -115 0 -P 185 111 1.5749182160948232e+00 -1.4409120111312630e+00 -2.3979729812343567e+01 2.4074930036961863e+01 1.3497999999999999e-01 2 0 0 -116 0 -P 186 -321 1.6188124904841935e+01 -1.2402999795367213e+01 -2.2505793379581706e+02 2.2598054561678759e+02 4.9359999999999998e-01 1 0 0 0 0 -V -17 0 0 0 0 0 2 1 0 -P 48 3 2.6809949063516858e+00 -2.1334338920576483e+00 -4.9258539041941329e+00 6.0002758724185767e+00 0 2 0 0 -17 0 -P 49 -3 -2.6809949063516858e+00 2.1334338920576483e+00 2.5402154973416849e+01 2.5632181942884813e+01 0 2 0 0 -17 0 -P 187 92 0 0 2.0476301069222714e+01 3.1632457815303390e+01 2.4110858175508753e+01 2 0 0 -18 0 -V -18 0 0 0 0 0 0 11 0 -P 188 -321 2.3165815711701914e+00 -1.4668486212149290e+00 -3.7345492849367883e+00 4.6592589942036238e+00 4.9359999999999998e-01 1 0 0 0 0 -P 189 213 -1.8805628523845630e-01 -4.7820853896800425e-01 -1.8580072096583751e-02 8.0239109587132929e-01 6.1598512846892473e-01 2 0 0 -117 0 -P 190 -211 5.2779424626199234e-01 -6.9896042852539919e-02 3.7768327334195961e-01 6.6751529050352554e-01 1.3957000000000000e-01 1 0 0 0 0 -P 191 213 -1.6891692283320525e-01 6.6648603572310589e-02 1.6599824117289130e+00 1.9453974090260178e+00 9.9802530459814820e-01 2 0 0 -118 0 -P 192 113 -7.4221913151521435e-01 4.9737556351137047e-01 2.7144616154803280e+00 2.9374218163653363e+00 6.7961266540398446e-01 2 0 0 -119 0 -P 193 -213 2.6977494445296846e-02 3.3051528732393581e-01 2.9686265628592207e-01 7.9252551915710912e-01 6.5574470753239167e-01 2 0 0 -120 0 -P 194 211 -6.8694313677862559e-03 -3.6465893769440583e-01 8.2207140953389746e-01 9.1011236515101712e-01 1.3957000000000000e-01 1 0 0 0 0 -P 195 113 -1.7926234409549882e-01 4.5811796288984646e-01 4.3631920667074748e+00 4.4594263972685484e+00 7.7912240741974559e-01 2 0 0 -121 0 -P 196 -213 -8.7517280978279891e-02 1.1556616042151517e-01 1.2143912094050173e+00 1.4643347407834515e+00 8.0530454592083023e-01 2 0 0 -122 0 -P 197 323 -7.6278088917320597e-01 6.2000960206627131e-01 7.1458893862408148e+00 7.2776101788726990e+00 9.6624438094104526e-01 2 0 0 -123 0 -P 198 221 -7.3573102667583368e-01 2.9137896094462912e-01 5.6348963975317616e+00 5.7164640081007310e+00 5.4744999999999999e-01 2 0 0 -124 0 -V -19 0 0 0 0 0 2 1 0 -P 50 21 1.2797607567819380e+00 -2.6322105018962016e+00 9.7689792994647917e-01 3.0855549397840010e+00 0 2 0 0 -19 0 -P 51 21 -1.2797607567819380e+00 2.6322105018962016e+00 2.1455385372104661e+00 3.6290019751368225e+00 0 2 0 0 -19 0 -P 199 92 0 0 3.1224364671569451e+00 6.7145569149208235e+00 5.9443809662806357e+00 2 0 0 -20 0 -V -20 0 0 0 0 0 0 5 0 -P 200 213 4.6881355005877492e-02 -1.7685658006218710e-01 -3.6436198676174875e-01 1.1033453735196406e+00 1.0252488695491191e+00 2 0 0 -125 0 -P 201 111 3.7295347928756839e-01 -3.7777914400943240e-02 1.1758598639554589e+00 1.2415262738220798e+00 1.3497999999999999e-01 2 0 0 -126 0 -P 202 -213 -7.7174053973165080e-01 1.1344979778855320e+00 1.1415247517969562e+00 1.9615336994911579e+00 8.1355182550511485e-01 2 0 0 -127 0 -P 203 223 4.0683186443833641e-01 -5.2896991332825460e-01 1.1174071860398992e-01 1.0379283489087789e+00 7.8707555809178420e-01 2 0 0 -128 0 -P 204 223 -5.4926159000131487e-02 -3.9089357009414699e-01 1.0576731195622895e+00 1.3702232191791681e+00 7.7654657068951227e-01 2 0 0 -129 0 -V -21 0 0 0 0 0 0 2 0 -P 205 -421 1.6217223175989148e+00 -6.8010125330790361e-01 -9.1387443651518652e+00 9.4913397269165518e+00 1.8645000000000000e+00 2 0 0 -130 0 -P 206 111 1.7968957185550219e-01 -6.1256193952872552e-02 -7.5978817714920155e-01 7.9469386436974088e-01 1.3497999999999999e-01 2 0 0 -131 0 -V -22 0 0 0 0 0 0 2 0 -P 207 -311 3.8379010207120906e-01 6.7470718262439966e-01 -2.3156482330478920e+00 2.4924740305268194e+00 4.9767000000000000e-01 2 0 0 -132 0 -P 208 -211 1.1885409638388056e-01 8.3490247668284856e-01 -4.0919076763111493e+00 4.1802364356759165e+00 1.3957000000000000e-01 1 0 0 0 0 -V -23 0 0 0 0 0 0 2 0 -P 209 311 4.9216148712404084e-01 1.6700552201381169e+00 -1.0293091901049095e+01 1.0451158963486355e+01 4.9767000000000000e-01 2 0 0 -133 0 -P 210 111 1.5608318125249132e-01 3.2776161422857351e-02 -2.1970366209984036e+00 2.2069494218571477e+00 1.3497999999999999e-01 2 0 0 -134 0 -V -24 0 0 0 0 0 0 2 0 -P 211 -211 2.0686418792920924e-01 -7.4052015170417047e-03 -8.4407254316637448e-01 8.8021921831125127e-01 1.3957000000000000e-01 1 0 0 0 0 -P 212 211 1.0687235046510266e-01 1.0665286980031208e+00 -2.9742802779412334e+00 3.1646055235381785e+00 1.3957000000000000e-01 1 0 0 0 0 -V -25 0 0 0 0 0 0 3 0 -P 213 211 1.6494907868686517e-01 9.3669242179650447e-02 -1.1169618990498749e+00 1.1415190731298617e+00 1.3957000000000000e-01 1 0 0 0 0 -P 214 -211 -3.2961684312823265e-02 9.7904714471502771e-02 -3.2110680804773697e+00 3.2157596004846356e+00 1.3957000000000000e-01 1 0 0 0 0 -P 215 111 -1.2371813995669578e-01 2.7781701450849755e-01 -1.2188863571466753e+00 1.2634840813176285e+00 1.3497999999999999e-01 2 0 0 -135 0 -V -26 0 0 0 0 0 0 2 0 -P 216 211 2.6192308140908338e-01 8.2567800152099802e-01 -2.4544236849886327e+00 2.6065347250907127e+00 1.3957000000000000e-01 1 0 0 0 0 -P 217 111 -7.1482009245183581e-02 -6.3077240170473347e-03 -1.1802194579810725e+00 1.1900785832982377e+00 1.3497999999999999e-01 2 0 0 -136 0 -V -27 0 0 0 0 0 0 3 0 -P 218 -211 1.2750107324969964e-01 -6.0407306768978437e-02 -2.7535093013034662e-01 3.3941639031513160e-01 1.3957000000000000e-01 1 0 0 0 0 -P 219 211 1.9975853129734369e-01 3.0355779618777118e-01 -9.8170033356441933e-01 1.0560616157558897e+00 1.3957000000000000e-01 1 0 0 0 0 -P 220 111 1.4897220997953661e-01 8.6760505956244627e-02 -4.6472305443281688e-02 2.2382890857345566e-01 1.3497999999999999e-01 2 0 0 -137 0 -V -28 0 0 0 0 0 0 2 0 -P 221 -311 -8.2754245304295648e-02 1.3966417583534083e-01 2.8673365676272389e-01 5.9686343994935065e-01 4.9767000000000000e-01 2 0 0 -138 0 -P 222 -211 -1.8405188231880528e-02 -1.3401650405953600e-01 -1.1372650400998702e-01 2.2519475333258582e-01 1.3957000000000000e-01 1 0 0 0 0 -V -29 0 0 0 0 0 0 2 0 -P 223 321 -1.8606728549463221e-02 1.8438159657958669e-02 1.8496301802780613e-01 5.2776742426644740e-01 4.9359999999999998e-01 1 0 0 0 0 -P 224 -211 -5.8511336571788884e-02 3.5244481235949815e-01 4.7335066859644559e-01 6.0924671737091951e-01 1.3957000000000000e-01 1 0 0 0 0 -V -30 0 0 0 0 0 0 2 0 -P 225 211 1.0573260084598722e-01 -2.9908689762051261e-02 1.7688449051444560e-01 2.5068270879638765e-01 1.3957000000000000e-01 1 0 0 0 0 -P 226 111 -4.6380149176473889e-01 -1.5543106838779938e-01 2.5262943145065019e-02 5.0806343844024116e-01 1.3497999999999999e-01 2 0 0 -139 0 -V -31 0 0 0 0 0 0 3 0 -P 227 22 9.2357515717230873e-02 1.2167869364811841e-01 1.5090349685127447e+00 1.5167472272569451e+00 0 1 0 0 0 0 -P 228 -211 1.6376765932694964e-01 -1.1407305807929946e-01 3.2242673069684358e+00 3.2334520192058642e+00 1.3957000000000000e-01 1 0 0 0 0 -P 229 211 2.8129986815416846e-01 2.1611268857698845e-01 2.9431364251746919e+00 2.9677206930702882e+00 1.3957000000000000e-01 1 0 0 0 0 -V -32 0 0 0 0 0 0 2 0 -P 230 -211 -3.4592648683826727e-01 -7.9172091937077929e-02 3.3441833061786439e+00 3.3658542934390199e+00 1.3957000000000000e-01 1 0 0 0 0 -P 231 111 -1.1307147515979296e-02 -1.6769866681952736e-01 1.0504441492713814e+00 1.0723353978939945e+00 1.3497999999999999e-01 2 0 0 -140 0 -V -33 0 0 0 0 0 0 2 0 -P 232 -211 2.4529482978165587e-01 2.1068895148048891e-01 2.0592913103800264e+01 2.0595924579230772e+01 1.3957000000000000e-01 1 0 0 0 0 -P 233 111 1.1477924954231560e-01 -2.2979793525959996e-01 3.8904575735499605e+00 3.9012640386376463e+00 1.3497999999999999e-01 2 0 0 -141 0 -V -34 0 0 0 0 0 0 2 0 -P 234 -211 1.0683530591018791e-02 2.9505319405206820e-01 1.8571534555359463e+01 1.8574405671540525e+01 1.3957000000000000e-01 1 0 0 0 0 -P 235 211 -3.8320474011581890e-01 -2.8328556012237832e-01 1.9771742986078998e+01 1.9777977577949802e+01 1.3957000000000000e-01 1 0 0 0 0 -V -35 0 0 0 0 0 0 2 0 -P 236 211 -2.0039518369288894e-02 -2.6884321977876424e-01 6.0433873079858088e+01 6.0434635545160802e+01 1.3957000000000000e-01 1 0 0 0 0 -P 237 -211 -7.0567420656834565e-02 4.3227021311803671e-01 1.0675834001752031e+02 1.0675932971117506e+02 1.3957000000000000e-01 1 0 0 0 0 -V -36 0 0 0 0 0 0 3 0 -P 238 211 2.3019840431794759e-02 1.0722469130411325e-01 4.8915482888414573e+01 4.8915804941134901e+01 1.3957000000000000e-01 1 0 0 0 0 -P 239 -211 1.5228297752088477e-01 2.4892222450875526e-01 1.3594839004485266e+02 1.3594877486741612e+02 1.3957000000000000e-01 1 0 0 0 0 -P 240 111 -1.8372996459514808e-03 5.1323835337157217e-02 2.0956193140799577e+01 2.0956690770888397e+01 1.3497999999999999e-01 2 0 0 -142 0 -V -37 0 0 0 0 0 0 2 0 -P 241 421 6.2436518356625337e+00 -2.8651113247762519e+00 -1.6799099320280089e+01 1.8244948598748316e+01 1.8645000000000000e+00 2 0 0 -143 0 -P 242 111 4.9387619354922196e-01 -2.6296728043550860e-01 -1.2797340263786521e+00 1.4032121235955854e+00 1.3497999999999999e-01 2 0 0 -144 0 -V -38 0 0 0 0 0 0 2 0 -P 243 211 2.7007673122422310e-01 -4.6451763092717235e-01 -9.3209210659772479e-01 1.0848933358965471e+00 1.3957000000000000e-01 1 0 0 0 0 -P 244 111 8.1043539067834081e-01 -1.9587017425910982e-01 -1.3769041714155361e+00 1.6153189608525471e+00 1.3497999999999999e-01 2 0 0 -145 0 -V -39 0 0 0 0 0 0 3 0 -P 245 211 4.2743761782097450e-01 -3.1321195981240602e-01 -3.4462938877908883e-01 6.4734368723904778e-01 1.3957000000000000e-01 1 0 0 0 0 -P 246 -211 6.6967622594905324e-02 -6.5307943664755175e-02 -1.1166100354230166e-01 2.0173684490892191e-01 1.3957000000000000e-01 1 0 0 0 0 -P 247 221 3.8909956284019970e-01 -5.3871218458285008e-01 -8.7107471401348857e-01 1.2247783258672331e+00 5.4744999999999999e-01 2 0 0 -146 0 -V -40 0 0 0 0 0 0 2 0 -P 248 -211 8.9544666103778403e-01 -3.4343535149518389e-01 -1.6695180355689065e+00 1.9304255539673623e+00 1.3957000000000000e-01 1 0 0 0 0 -P 249 111 7.7167108423919306e-01 -2.5894206886027965e-01 -2.6574100454998915e+00 2.7825482938486923e+00 1.3497999999999999e-01 2 0 0 -147 0 -V -41 0 -1.1546839958446812e-05 -2.7423900695209169e-06 -5.6021295776194672e-05 5.7666086596760802e-05 0 2 0 -P 250 22 -1.8671110918704986e-01 -7.3362208509199348e-02 -6.4793461233395855e-01 6.7827893509349302e-01 0 1 0 0 0 0 -P 251 22 -4.2737566410076068e-02 1.8867838474912971e-02 -4.6527143948108279e-01 4.6761095721568580e-01 0 1 0 0 0 0 -V -42 0 -9.5849625824338869e+00 -4.5427856562572915e+00 3.0797790083823350e+02 3.2154967752035753e+02 0 2 0 -P 252 2112 2.3494946269770597e-02 -7.7140433032913139e-02 3.6864044468885173e+00 3.8051113242385117e+00 9.3957000000000002e-01 1 0 0 0 0 -P 253 -211 -1.4849118076197018e-01 1.7898563672047136e-02 3.2989479064236149e-01 3.8817566530963010e-01 1.3957000000000000e-01 1 0 0 0 0 -V -43 0 0 0 0 0 0 1 0 -P 254 310 -1.0795922983869366e-01 -3.0104120411989399e-02 1.6962385074932020e+00 1.7712882195102833e+00 4.9767000000000000e-01 2 0 0 -148 0 -V -44 0 0 0 0 0 0 2 0 -P 255 -2112 -7.1620069765306504e-01 -5.9406387712284348e-01 6.6924011570619157e+00 6.8217945118102632e+00 9.3957000000000002e-01 1 0 0 0 0 -P 256 211 1.2282746276398639e-01 1.3160303099116163e-01 8.4157099372716293e-01 8.7185289226911644e-01 1.3957000000000000e-01 1 0 0 0 0 -V -45 0 0 0 0 0 0 2 0 -P 257 -211 1.0917582350152771e-01 -1.9998037871313329e-01 3.9245082818393935e+00 3.9335933383400823e+00 1.3957000000000000e-01 1 0 0 0 0 -P 258 111 -2.3607809641078237e-01 9.8924049628864474e-02 1.2207570821773017e+00 1.2545861027789014e+00 1.3497999999999999e-01 2 0 0 -149 0 -V -46 0 0 0 0 0 0 2 0 -P 259 211 -9.2512366564428780e-02 6.6785049859374487e-02 1.0583879226240367e+00 1.0736310169273680e+00 1.3957000000000000e-01 1 0 0 0 0 -P 260 111 -1.1115938983384583e+00 -1.8893723514333377e-01 2.2371197529621647e+01 2.2400000821057944e+01 1.3497999999999999e-01 2 0 0 -150 0 -V -47 0 0 0 0 0 0 3 0 -P 261 211 -8.7979223122396005e-02 -1.8498323078029286e-01 7.8982483377437287e+00 7.9021367824748960e+00 1.3957000000000000e-01 1 0 0 0 0 -P 262 -211 -9.3830291977028552e-02 7.2250537096242073e-02 3.3416130761211456e+00 3.3466224763494039e+00 1.3957000000000000e-01 1 0 0 0 0 -P 263 111 1.0757250327674936e-01 2.5521449183574951e-01 3.9260193555040792e+00 3.9380901285390704e+00 1.3497999999999999e-01 2 0 0 -151 0 -V -48 0 0 0 0 0 0 2 0 -P 264 -211 -5.8001042529546454e-01 -4.0485193410956233e-01 2.1083579793599277e+01 2.1095903248734608e+01 1.3957000000000000e-01 1 0 0 0 0 -P 265 111 -3.2073406530239251e-01 -1.9939418805101175e-01 3.7968439357699193e+00 3.8179669794102113e+00 1.3497999999999999e-01 2 0 0 -152 0 -V -49 0 0 0 0 0 0 2 0 -P 266 321 -2.7856704535459481e-01 6.3755292333151825e-01 6.4308924492340807e+01 6.4314582200698453e+01 4.9359999999999998e-01 1 0 0 0 0 -P 267 111 -1.1765519819761945e-01 -1.6064093626715317e-01 1.9166237785949200e+01 1.9167747356536566e+01 1.3497999999999999e-01 2 0 0 -153 0 -V -50 0 0 0 0 0 0 2 0 -P 268 -321 -8.9367168692652132e-01 2.0771029167550126e-02 1.5400335786204033e+02 1.5400674321036507e+02 4.9359999999999998e-01 1 0 0 0 0 -P 269 211 -2.8492412920335630e-01 4.1681594305669806e-01 8.0055157641769668e+01 8.0056871423527923e+01 1.3957000000000000e-01 1 0 0 0 0 -V -51 0 -6.6002531619560156e-06 4.6303420024687618e-05 6.9143008171581527e-03 6.9145890185681727e-03 0 2 0 -P 270 22 3.2985399197000089e-03 1.3785210455256494e-01 2.1286406525307036e+01 2.1286853145632609e+01 0 1 0 0 0 0 -P 271 22 -2.4309358054476007e-02 9.5472016989760957e-03 7.2413056072650817e-01 7.2460138209044855e-01 0 1 0 0 0 0 -V -52 0 0 0 0 0 0 2 0 -P 272 -211 -2.8540776280327329e-01 9.3966682333239981e-01 1.4340676176985525e+02 1.4341019221948926e+02 1.3957000000000000e-01 1 0 0 0 0 -P 273 111 -1.1869009496520293e+00 8.8484723595274772e-01 2.4894306409889506e+02 2.4894750264070180e+02 1.3497999999999999e-01 2 0 0 -154 0 -V -53 0 0 0 0 0 0 2 0 -P 274 211 1.7933401902204655e+00 1.2885124651880893e+00 6.1833606751116611e+02 6.1834002635958245e+02 1.3957000000000000e-01 1 0 0 0 0 -P 275 111 -3.9365165318030595e-02 2.1026551461701451e-01 7.2894196812983083e+01 7.2894635672408640e+01 1.3497999999999999e-01 2 0 0 -155 0 -V -54 0 1.0676767945586468e-04 5.7893903355371724e-05 2.5444575107770855e-02 2.5444873168571566e-02 0 2 0 -P 276 22 2.4999471933883968e-01 1.5059317622941079e-01 4.8566265682726126e+01 4.8567142576329971e+01 0 1 0 0 0 0 -P 277 22 4.5564793068048387e-01 2.3203579530812810e-01 1.1960051942648138e+02 1.1960161245874228e+02 0 1 0 0 0 0 -V -55 0 0 0 0 0 0 3 0 -P 278 211 2.6192602171711871e-01 6.6663279626861305e-02 8.4515411988941139e+01 8.4515959396311999e+01 1.3957000000000000e-01 1 0 0 0 0 -P 279 -211 3.0260190289747680e-02 5.2722368310901424e-01 1.3997838615805080e+02 1.3997945189094159e+02 1.3957000000000000e-01 1 0 0 0 0 -P 280 111 -1.0915701330301296e-01 6.3947562447915010e-02 3.9337776782952176e+01 3.9338211784091911e+01 1.3497999999999999e-01 2 0 0 -156 0 -V -56 0 0 0 0 0 0 2 0 -P 281 -211 1.0460657961309405e+00 -3.9020867461042025e-01 9.9157631500447565e+01 9.9164015050939852e+01 1.3957000000000000e-01 1 0 0 0 0 -P 282 211 1.1960987457174342e-01 -2.5875645151296439e-01 1.0301918998462718e+01 1.0306807277672448e+01 1.3957000000000000e-01 1 0 0 0 0 -V -57 0 0 0 0 0 0 2 0 -P 283 211 -1.6242543744049195e-01 3.1007645455399614e-02 2.1896606379610399e+00 2.2003265646581580e+00 1.3957000000000000e-01 1 0 0 0 0 -P 284 111 1.2652227858485912e-01 9.6098178980106996e-01 3.5153440087509658e+01 3.5167059352095940e+01 1.3497999999999999e-01 2 0 0 -157 0 -V -58 0 0 0 0 0 0 3 0 -P 285 111 2.9219528435810188e-01 2.1022194446087650e-01 3.5594569879955653e+00 3.5801571194466431e+00 1.3497999999999999e-01 2 0 0 -158 0 -P 286 111 7.2165970952666164e-02 1.0925849693542053e-01 1.7329492789665644e+00 1.7431231024763754e+00 1.3497999999999999e-01 2 0 0 -159 0 -P 287 111 5.7259665167642498e-02 1.0687387285916360e-02 3.2706781824117788e+00 3.2739804921236972e+00 1.3497999999999999e-01 2 0 0 -160 0 -V -59 0 0 0 0 0 0 2 0 -P 288 -211 5.5626398321002368e-01 1.3631010577680165e+00 1.2299140896707550e+01 1.2387728633396405e+01 1.3957000000000000e-01 1 0 0 0 0 -P 289 111 4.1830606098124423e-01 1.1755765771896662e+00 1.9730016713629471e+01 1.9769894773872441e+01 1.3497999999999999e-01 2 0 0 -161 0 -V -60 0 3.8941374669982273e-05 1.8006347465645076e-05 5.5790884985439169e-04 5.5957112049228436e-04 0 2 0 -P 290 22 1.2285446892288159e+00 5.5994878566880602e-01 1.7826169650336105e+01 1.7877225430658086e+01 0 1 0 0 0 0 -P 291 22 5.0254836912804378e-02 3.1363380420649907e-02 4.9505241412208734e-01 4.9858409821478411e-01 0 1 0 0 0 0 -V -61 0 0 0 0 0 0 3 0 -P 292 211 3.3246427160202974e-01 2.4826372883767425e-01 4.4532204940244178e+00 4.4746865727386238e+00 1.3957000000000000e-01 1 0 0 0 0 -P 293 -211 3.0564376993854531e-01 6.9193900353716309e-01 8.2429344382337373e+00 8.2787466223238155e+00 1.3957000000000000e-01 1 0 0 0 0 -P 294 221 9.5599961032503467e-01 1.2801871992451461e+00 1.7605752316643834e+01 1.7686577697722150e+01 5.4744999999999999e-01 2 0 0 -162 0 -V -62 0 0 0 0 0 0 2 0 -P 295 211 8.0273279393105107e-02 2.0186889552187660e-02 5.6907814730655848e-01 5.9176095894894998e-01 1.3957000000000000e-01 1 0 0 0 0 -P 296 111 1.6901191173961481e+00 -1.5985626590924316e+00 1.6544286957456936e+01 1.6707589764448741e+01 1.3497999999999999e-01 2 0 0 -163 0 -V -63 0 0 0 0 0 0 1 0 -P 297 310 6.3686850058466904e-01 -2.8985459322238305e-01 6.1254602664267574e+00 6.1853501175537380e+00 4.9767000000000000e-01 2 0 0 -164 0 -V -64 0 0 0 0 0 0 2 0 -P 298 130 1.4358399666748303e-01 -1.0812535661317952e+00 4.2011710653840471e+00 4.3688945269818387e+00 4.9767000000000000e-01 1 0 0 0 0 -P 299 310 -5.6376902188405402e-02 -9.4829366505374968e-01 3.4172653874114838e+00 3.5815942521706718e+00 4.9767000000000000e-01 2 0 0 -165 0 -V -65 0 0 0 0 0 0 2 0 -P 300 -321 -2.2142072696580159e-01 1.5578586639161984e-01 1.6476923364331792e+00 1.7412143377649063e+00 4.9359999999999998e-01 1 0 0 0 0 -P 301 111 2.3195043580107069e-02 -3.1086024973021309e-01 9.9213467140438327e-01 1.0486767430966022e+00 1.3497999999999999e-01 2 0 0 -166 0 -V -66 0 0 0 0 0 0 2 0 -P 302 -211 -1.1624801152423032e+00 -1.7625857585222973e+00 5.0201713535008983e+00 5.4479049898002465e+00 1.3957000000000000e-01 1 0 0 0 0 -P 303 211 5.8229430385060822e-02 -1.4047080457471348e-01 3.0156695192662147e-01 3.6543826413656960e-01 1.3957000000000000e-01 1 0 0 0 0 -V -67 0 0 0 0 0 0 2 0 -P 304 211 1.4948479945856540e-03 1.2568218777132778e-01 -1.5080220659718138e-01 2.4087203513088271e-01 1.3957000000000000e-01 1 0 0 0 0 -P 305 111 -7.2459948192582480e-01 -8.9543741457431492e-01 7.6366010654820127e-01 1.3886140325374496e+00 1.3497999999999999e-01 2 0 0 -167 0 -V -68 0 0 0 0 0 0 2 0 -P 306 211 1.0563433052605793e-01 -2.7158694112764570e-01 -4.0122677357734220e-02 3.2558822539384402e-01 1.3957000000000000e-01 1 0 0 0 0 -P 307 111 -7.0299433074427298e-01 -9.4889402278916302e-01 3.0759404672122986e-01 1.2277762799150060e+00 1.3497999999999999e-01 2 0 0 -168 0 -V -69 0 1.2667704663510530e-05 -7.0744177920900302e-05 1.8213818727785282e-05 8.3881864673891209e-05 0 2 0 -P 308 22 5.4027065630195055e-02 -1.9904590108705426e-02 1.9071272126093892e-02 6.0653358921930293e-02 0 1 0 0 0 0 -P 309 22 -1.0444000571005583e-02 -2.2348978880879536e-01 4.3593122701166338e-02 2.2794105202127599e-01 0 1 0 0 0 0 -V -70 0 0 0 0 0 0 2 0 -P 310 211 -4.3737588677301271e-02 -6.4946955578646784e-02 -3.5924173334191872e-02 1.6401650780328356e-01 1.3957000000000000e-01 1 0 0 0 0 -P 311 111 -1.1020147543802561e+00 -1.6536485938923138e+00 -1.9715970413558779e+00 2.8025710847072287e+00 1.3497999999999999e-01 2 0 0 -169 0 -V -71 0 0 0 0 0 0 2 0 -P 312 -211 -7.4010583846387956e-01 -4.7229998155360581e-01 -9.2048603238071680e-01 1.2796867762901407e+00 1.3957000000000000e-01 1 0 0 0 0 -P 313 111 -2.5499660395015161e-01 8.5088854900123176e-02 -1.8681615758638939e-01 3.5409498498237357e-01 1.3497999999999999e-01 2 0 0 -170 0 -V -72 0 0 0 0 0 0 1 0 -P 314 310 -2.8765138987802308e-01 7.2322394316508809e-01 -1.3293539465693636e+00 1.6188432716682486e+00 4.9767000000000000e-01 2 0 0 -171 0 -V -73 0 0 0 0 0 0 2 0 -P 315 -211 -5.0232272700335232e-03 1.0288006080287391e+00 -2.6829806284030435e+00 2.8768595310126805e+00 1.3957000000000000e-01 1 0 0 0 0 -P 316 211 -1.5041483011075760e-02 -6.2116154231934534e-02 -7.5021064446656849e-02 1.7085844386054616e-01 1.3957000000000000e-01 1 0 0 0 0 -V -74 0 0 0 0 0 0 2 0 -P 317 211 2.3075821910509536e-01 4.3897541651857841e-01 -1.2656582782473587e+00 1.3664989696989467e+00 1.3957000000000000e-01 1 0 0 0 0 -P 318 111 4.6838599969743122e-01 4.9174921370238156e-02 -8.7389061637774768e-01 1.0018522981944049e+00 1.3497999999999999e-01 2 0 0 -172 0 -V -75 0 0 0 0 0 0 2 0 -P 319 -211 2.5742640827553703e-01 5.6243178021327091e-02 -5.9271374260145144e+00 5.9346330554225126e+00 1.3957000000000000e-01 1 0 0 0 0 -P 320 211 -9.8706113948430804e-02 -2.8964132523844838e-01 -1.4907848669725159e+00 1.5282520403097610e+00 1.3957000000000000e-01 1 0 0 0 0 -V -76 0 0 0 0 0 0 2 0 -P 321 -211 -1.8116809968197792e-01 2.3195288966429489e-01 -1.4818039389156070e+01 1.4821619181008760e+01 1.3957000000000000e-01 1 0 0 0 0 -P 322 211 -1.2600615597077278e-01 3.3646972396956704e-01 -2.8764946640392428e+00 2.9022044662009816e+00 1.3957000000000000e-01 1 0 0 0 0 -V -77 0 0 0 0 0 0 2 0 -P 323 2112 6.8523780701355297e-01 -3.5080743538294351e-01 -1.6307557677702232e+02 1.6308010040974429e+02 9.3957000000000002e-01 1 0 0 0 0 -P 324 -211 8.4749541376226964e-02 3.5211273219105275e-03 -3.0569414802299615e+01 3.0569851095860052e+01 1.3957000000000000e-01 1 0 0 0 0 -V -78 0 9.2659059340455155e-06 2.2192099479511942e-05 -1.5814794116037168e-03 1.5816634155477668e-03 0 2 0 -P 325 22 6.5173830040521086e-01 1.4984807920980339e+00 -1.0754272896002473e+02 1.0755514287873845e+02 0 1 0 0 0 0 -P 326 22 -1.5466324265940194e-04 6.2079934296075334e-02 -3.6677791592323956e+00 3.6683044997740333e+00 0 1 0 0 0 0 -V -79 0 0 0 0 0 0 2 0 -P 327 -211 6.6823265779759167e-01 7.0798190000280858e-01 -4.8392336668505656e+01 4.8402329502603237e+01 1.3957000000000000e-01 1 0 0 0 0 -P 328 211 1.0551080640961935e-01 1.5636350604201216e-01 -4.0467426697579832e+01 4.0468107015095086e+01 1.3957000000000000e-01 1 0 0 0 0 -V -80 0 0 0 0 0 0 3 0 -P 329 211 -1.6210443044946699e-01 5.3631565721785644e-02 -3.2851753809151361e+01 3.2852494004461882e+01 1.3957000000000000e-01 1 0 0 0 0 -P 330 -211 6.3753390431136939e-02 -3.4266989260422084e-02 -4.3006183481217263e+01 4.3006470863422045e+01 1.3957000000000000e-01 1 0 0 0 0 -P 331 111 1.1533681740304895e-01 2.6389423523999250e-01 -2.1069793643374290e+01 2.1072194155417638e+01 1.3497999999999999e-01 2 0 0 -173 0 -V -81 0 0 0 0 0 0 3 0 -P 332 -211 5.6711449398208394e-02 -4.9900954611827149e-02 -1.7771001367628735e+01 1.7771709982073371e+01 1.3957000000000000e-01 1 0 0 0 0 -P 333 211 8.5429989515703270e-02 2.9119120815685540e-01 -8.1609305243617207e+00 8.1677633052859324e+00 1.3957000000000000e-01 1 0 0 0 0 -P 334 111 1.5971224969655323e-01 1.6416391462325010e-03 -6.1583136127604776e+00 6.1618630990304570e+00 1.3497999999999999e-01 2 0 0 -174 0 -V -82 0 0 0 0 0 0 3 0 -P 335 111 3.2030294786127822e-01 -1.0601635141293821e-01 -2.8028052211989629e+00 2.8262643460150190e+00 1.3497999999999999e-01 2 0 0 -175 0 -P 336 111 2.9110855186201823e-01 8.7859720184946685e-02 -3.6679991381187156e+00 3.6830559046853768e+00 1.3497999999999999e-01 2 0 0 -176 0 -P 337 111 4.0602579306178992e-02 5.1683011578460081e-03 -1.0151896366424780e+00 1.0249414029735842e+00 1.3497999999999999e-01 2 0 0 -177 0 -V -83 0 0 0 0 0 0 2 0 -P 338 211 6.5793571993552347e-01 5.6569505409351306e-01 -1.7197107586476218e+01 1.7219549338804743e+01 1.3957000000000000e-01 1 0 0 0 0 -P 339 111 5.8788972858264898e-01 1.8877221706897764e+00 -2.1951790012437453e+01 2.2041061990685371e+01 1.3497999999999999e-01 2 0 0 -178 0 -V -84 0 0 0 0 0 0 2 0 -P 340 22 6.6593323470164767e-01 6.3569398019847445e-01 -6.3111210203307069e+00 6.3779167792313567e+00 0 1 0 0 0 0 -P 341 22 2.1963494126495064e-01 2.8017614166117788e-01 -6.1100973275610935e+00 6.1204597482582805e+00 0 1 0 0 0 0 -V -85 0 3.0223187720401600e-04 4.8661610779874898e-04 -5.3830165474146501e-03 5.4137043570611056e-03 0 2 0 -P 342 22 5.7856337531910038e-02 1.3626196294686996e-01 -1.7555647494935451e+00 1.7617951833295136e+00 0 1 0 0 0 0 -P 343 22 6.6462261932697564e-01 1.0269836258559635e+00 -1.1112423286411024e+01 1.1179551417220072e+01 0 1 0 0 0 0 -V -86 0 0 0 0 0 0 2 0 -P 344 -211 4.1265547372750555e-01 1.2949869224888536e-01 -3.6370992906819448e+00 3.6653820382697559e+00 1.3957000000000000e-01 1 0 0 0 0 -P 345 211 8.0133869236026911e-01 1.5461792439251949e+00 -1.5223724224072070e+01 1.5323644246383349e+01 1.3957000000000000e-01 1 0 0 0 0 -V -87 0 0 0 0 0 0 2 0 -P 346 -211 4.4315996363918092e-01 4.3179607305874240e-01 -3.3584103881800651e+00 3.4177827201882520e+00 1.3957000000000000e-01 1 0 0 0 0 -P 347 111 1.5073350550211109e-02 7.2202155363162623e-01 -1.5089453750602873e+01 1.5107328566685394e+01 1.3497999999999999e-01 2 0 0 -179 0 -V -88 0 0 0 0 0 0 2 0 -P 348 211 2.0265472465231706e+00 1.6273344433143688e+00 -2.5085446979218137e+01 2.5220115801971495e+01 1.3957000000000000e-01 1 0 0 0 0 -P 349 111 5.5564478995138736e-02 5.3068180921456376e-02 -1.0567328314465232e+00 1.0680859144325889e+00 1.3497999999999999e-01 2 0 0 -180 0 -V -89 0 0 0 0 0 0 2 0 -P 350 321 5.5334359353845797e-01 4.4390121636406382e-01 -6.4488659797201224e+00 6.5065160267835447e+00 4.9359999999999998e-01 1 0 0 0 0 -P 351 -211 1.2280392089109184e+00 7.9181424127792643e-01 -1.6152530029392889e+01 1.6219086171133444e+01 1.3957000000000000e-01 1 0 0 0 0 -V -90 0 0 0 0 0 0 2 0 -P 352 -311 4.9782761336762366e-01 5.0953796112831118e-01 -7.5199540324803458e+00 7.5699963900902567e+00 4.9767000000000000e-01 2 0 0 -181 0 -P 353 111 9.2084903787267469e-01 1.3790049009253627e-01 -1.0572002769311638e+01 1.0613785453383338e+01 1.3497999999999999e-01 2 0 0 -182 0 -V -91 0 0 0 0 0 0 2 0 -P 354 -211 -4.1646899766105938e-01 -6.4165585437284340e-04 -4.5711127402477864e+01 4.5713237634499237e+01 1.3957000000000000e-01 1 0 0 0 0 -P 355 111 -1.5883655598135957e-01 -4.7746020680533935e-01 -4.8794799426665946e+01 4.8797580554670517e+01 1.3497999999999999e-01 2 0 0 -183 0 -V -92 0 0 0 0 0 0 2 0 -P 356 -2112 -5.0910243761024854e-01 -4.5126876099486196e-01 -2.8494746972763384e+01 2.8518348928599259e+01 9.3957000000000002e-01 1 0 0 0 0 -P 357 211 -2.9468806770195133e-01 -2.9190475370197855e-01 -5.4819920692795092e+00 5.4994332685307823e+00 1.3957000000000000e-01 1 0 0 0 0 -V -93 0 0 0 0 0 0 2 0 -P 358 -211 -2.4885074976450763e-01 3.3424025035342403e-01 -2.8357333619216721e+01 2.8360738583772349e+01 1.3957000000000000e-01 1 0 0 0 0 -P 359 111 6.8911093492632733e-02 -2.7130636779539036e-01 -1.4855359858410299e+01 1.4858610029450290e+01 1.3497999999999999e-01 2 0 0 -184 0 -V -94 0 0 0 0 0 0 1 0 -P 360 130 -1.4096245121895092e+00 -2.1826091973706498e+00 -7.8978356177349141e+01 7.9022650196503378e+01 4.9767000000000000e-01 1 0 0 0 0 -V -95 0 0 0 0 0 0 2 0 -P 361 -321 -3.8980393264709728e-02 2.3659798443371793e-02 -4.5021650566010770e+01 4.5024379395002207e+01 4.9359999999999998e-01 1 0 0 0 0 -P 362 111 -2.6489328918552280e-01 -4.1560022800454127e-01 -3.3811621128573726e+01 3.3815482178238803e+01 1.3497999999999999e-01 2 0 0 -185 0 -V -96 0 0 0 0 0 0 2 0 -P 363 211 -1.8760543427401080e+00 -1.0875370782743450e+00 -8.1985678412572810e+01 8.2014469829099326e+01 1.3957000000000000e-01 1 0 0 0 0 -P 364 111 7.5450854587473110e-02 -1.1796572075934705e-01 -7.3526082944333560e+00 7.3551802883751556e+00 1.3497999999999999e-01 2 0 0 -186 0 -V -97 0 0 0 0 0 0 2 0 -P 365 -211 3.3024357657183534e-01 -1.0764108627154867e+00 -4.6204481583885297e+01 4.6218408879857975e+01 1.3957000000000000e-01 1 0 0 0 0 -P 366 211 1.6113589013928148e-01 1.0476930546125837e-01 -4.2265010413097350e+00 4.2331704689924887e+00 1.3957000000000000e-01 1 0 0 0 0 -V -98 0 0 0 0 0 0 2 0 -P 367 22 -1.5306529296572205e-01 -5.6288475914386925e-02 -3.1187132731459890e+00 3.1229745206338810e+00 0 1 0 0 0 0 -P 368 22 4.1998551688228036e-01 -2.0427605522231063e-01 -1.8445987769881434e+01 1.8451899125774119e+01 0 1 0 0 0 0 -V -99 0 0 0 0 0 0 1 0 -P 369 130 4.1329176006341922e-01 1.8028596136298070e-01 -8.9119644403072215e+01 8.9122174609160780e+01 4.9767000000000000e-01 1 0 0 0 0 -V -100 0 0 0 0 0 0 3 0 -P 370 211 -2.5393868742732295e-01 -1.0813557949514663e-01 -2.2588965411228937e+01 2.2591082672043903e+01 1.3957000000000000e-01 1 0 0 0 0 -P 371 -211 -9.4699960295409211e-02 -7.0342706977206501e-02 -6.2577223207694175e+00 6.2603901322250373e+00 1.3957000000000000e-01 1 0 0 0 0 -P 372 111 -6.1340461783072626e-02 -9.5270249091627290e-02 -1.9913617131458697e+01 1.9914396951234526e+01 1.3497999999999999e-01 2 0 0 -187 0 -V -101 0 0 0 0 0 0 2 0 -P 373 211 -5.6588712441174915e-01 1.7007007181064696e-01 -3.2251333498529675e+02 3.2251390648341049e+02 1.3957000000000000e-01 1 0 0 0 0 -P 374 -211 -2.8982224615837326e-01 2.8131974867272219e-01 -6.3245549272580966e+01 6.3246992974454749e+01 1.3957000000000000e-01 1 0 0 0 0 -V -102 0 0 0 0 0 0 2 0 -P 375 2212 9.5560807623884438e-04 8.6244164763986575e-01 -1.1728103150663380e+03 1.1728110074871845e+03 9.3827000000000005e-01 1 0 0 0 0 -P 376 211 -2.8581771916038204e-03 -1.1153332585833524e-01 -2.1689617899690685e+02 2.1689625259809148e+02 1.3957000000000000e-01 1 0 0 0 0 -V -103 0 0 0 0 0 0 3 0 -P 377 -211 6.9777075380562020e-02 4.7507027834957305e-02 2.3372071430252870e+00 2.3428919676866879e+00 1.3957000000000000e-01 1 0 0 0 0 -P 378 211 -3.3611510436482870e-03 -3.9382859649498635e-02 1.3924281785635231e-01 2.0107375312329462e-01 1.3957000000000000e-01 1 0 0 0 0 -P 379 111 -7.9872569296045165e-02 9.6782587127883388e-02 4.2334861577519067e-01 4.6172518598825418e-01 1.3497999999999999e-01 2 0 0 -188 0 -V -104 0 0 0 0 0 0 2 0 -P 380 -211 2.4592593317047373e-01 -2.5402408844388685e-01 9.5163384838481568e-01 1.0247412202147479e+00 1.3957000000000000e-01 1 0 0 0 0 -P 381 111 -3.2259075952935390e-01 9.6110605845984534e-02 1.8794513505486412e+00 1.9141209539025790e+00 1.3497999999999999e-01 2 0 0 -189 0 -V -105 0 0 0 0 0 0 2 0 -P 382 -211 -4.5837447734990650e-01 -1.0851873872112007e-01 2.2553461445730871e+00 2.3082351472239804e+00 1.3957000000000000e-01 1 0 0 0 0 -P 383 211 6.1887762052356861e-02 -1.3754108735555134e-01 5.4029978564595833e+00 5.4069042221598167e+00 1.3957000000000000e-01 1 0 0 0 0 -V -106 0 0 0 0 0 0 3 0 -P 384 211 1.5445020817728534e-02 2.3301757642101320e-01 6.4439298137185208e+00 6.4496702992183712e+00 1.3957000000000000e-01 1 0 0 0 0 -P 385 -211 -1.2475197802699829e-01 -1.9095926689690346e-01 6.3048485731892709e+00 6.3105169212499730e+00 1.3957000000000000e-01 1 0 0 0 0 -P 386 111 1.9899815204420815e-01 -6.7184283612308757e-02 5.5687097047954106e+00 5.5743036667519377e+00 1.3497999999999999e-01 2 0 0 -190 0 -V -107 0 0 0 0 0 0 2 0 -P 387 22 -3.7754050692170192e-03 6.8280684928958862e-02 3.4642925362567140e-01 3.5311433472098541e-01 0 1 0 0 0 0 -P 388 113 8.2999471421343396e-02 -2.8251000142352389e-01 1.6107349250332053e+01 1.6130098567719088e+01 8.0416361457125063e-01 2 0 0 -191 0 -V -108 0 0 0 0 0 0 2 0 -P 389 211 -1.4673680780120973e-01 1.9405519317056662e-03 5.3082618403845041e+00 5.3121237756181632e+00 1.3957000000000000e-01 1 0 0 0 0 -P 390 -211 5.6044408203317006e-02 1.6763803708868413e-01 2.3839451002379750e+00 2.3945599831740396e+00 1.3957000000000000e-01 1 0 0 0 0 -V -109 0 0 0 0 0 0 2 0 -P 391 321 1.9846678448419963e-01 2.0386347738843802e-01 3.9517065449383580e+01 3.9521172200136242e+01 4.9359999999999998e-01 1 0 0 0 0 -P 392 -211 -2.9633713105752252e-01 3.6457100116663532e-01 3.2491480380038389e+01 3.2495176638717545e+01 1.3957000000000000e-01 1 0 0 0 0 -V -110 0 0 0 0 0 0 2 0 -P 393 -321 8.7679693769441944e-02 -3.7650460777736888e-01 1.7261252844619153e+02 1.7261366707475875e+02 4.9359999999999998e-01 1 0 0 0 0 -P 394 211 -2.1815986473454180e-01 -4.1960556703188107e-01 6.4104946097799257e+01 6.4106842509556756e+01 1.3957000000000000e-01 1 0 0 0 0 -V -111 0 -3.8117306469070869e+00 2.4304278506338637e+00 -3.6687500677897781e+01 3.6965955593079201e+01 0 4 0 -P 395 13 -1.4149561259899173e+00 1.0402134060499841e+00 -1.3160839701082471e+01 1.3277914385994174e+01 1.0566000000000000e-01 1 0 0 0 0 -P 396 -14 -1.3089155169219182e+00 1.0462816645268493e+00 -1.2289940437364569e+01 1.2403652732398342e+01 0 1 0 0 0 0 -P 397 323 -2.1581479174280773e+01 1.3503790177823028e+01 -2.0949493928636579e+02 2.1103796270682068e+02 8.8290675088899884e-01 2 0 0 -192 0 -P 398 -211 -2.0850999230479355e+00 1.2367396416999163e+00 -1.9059552487099179e+01 1.9213619841764203e+01 1.3957000000000000e-01 1 0 0 0 0 -V -112 0 0 0 0 0 0 2 0 -P 399 -311 -4.4690407303060170e-01 3.0479452171944948e-01 -6.3255618455358773e+00 6.3681261797769668e+00 4.9767000000000000e-01 2 0 0 -193 0 -P 400 111 -1.2418841812846488e+00 6.4683552692001378e-01 -1.2930629916089380e+01 1.3006924392256479e+01 1.3497999999999999e-01 2 0 0 -194 0 -V -113 0 0 0 0 0 0 2 0 -P 401 311 -9.3258822715903111e-01 9.6253600257025262e-01 -1.1172693777377827e+01 1.1263789683300944e+01 4.9767000000000000e-01 2 0 0 -195 0 -P 402 211 -1.3587033582635805e-01 1.7718207748686304e-01 -7.1597924199696528e-01 7.6286322274092955e-01 1.3957000000000000e-01 1 0 0 0 0 -V -114 0 0 0 0 0 0 2 0 -P 403 -321 -9.2232459910796916e-01 -9.2465403799705914e-02 -1.4887975269241240e+01 1.4924968378343664e+01 4.9359999999999998e-01 1 0 0 0 0 -P 404 111 -1.1663521498522561e-01 6.8185846341943981e-02 -7.0050532350766603e-01 7.2607189153595308e-01 1.3497999999999999e-01 2 0 0 -196 0 -V -115 0 0 0 0 0 0 2 0 -P 405 -211 8.0700028232659307e+00 -6.2899386723757056e+00 -1.1945209016908863e+02 1.1988957252246230e+02 1.3957000000000000e-01 1 0 0 0 0 -P 406 211 1.0872137644979858e+00 -5.9716641606912368e-01 -1.2286932660223906e+01 1.2350175524257606e+01 1.3957000000000000e-01 1 0 0 0 0 -V -116 0 1.8675243735831720e-03 -1.7086209769348198e-03 -2.8434955821092834e-02 2.8547843422511342e-02 0 2 0 -P 407 22 1.0284917633797830e+00 -8.5251486620572126e-01 -1.4939793795464507e+01 1.4999400506534974e+01 0 1 0 0 0 0 -P 408 22 5.4642645271504009e-01 -5.8839714492554174e-01 -9.0399360168790608e+00 9.0755295304268895e+00 0 1 0 0 0 0 -V -117 0 0 0 0 0 0 2 0 -P 409 211 6.3239069735772049e-02 -4.0712194024407136e-02 -1.9482115859367102e-01 2.5118067485200196e-01 1.3957000000000000e-01 1 0 0 0 0 -P 410 111 -2.5129535497422834e-01 -4.3749634494359707e-01 1.7624108649708728e-01 5.5121042101932738e-01 1.3497999999999999e-01 2 0 0 -197 0 -V -118 0 0 0 0 0 0 2 0 -P 411 211 -8.9867935841088972e-02 -4.4410153793443752e-01 8.8775575440297683e-01 1.0064255989707680e+00 1.3957000000000000e-01 1 0 0 0 0 -P 412 111 -7.9048986992116252e-02 5.1075014150674813e-01 7.7222665732593598e-01 9.3897181005524955e-01 1.3497999999999999e-01 2 0 0 -198 0 -V -119 0 0 0 0 0 0 2 0 -P 413 -211 -6.6518601310751921e-02 8.3313999049881182e-02 1.2857659839509159e+00 1.2977056280772190e+00 1.3957000000000000e-01 1 0 0 0 0 -P 414 211 -6.7570053020446241e-01 4.1406156446148923e-01 1.4286956315294119e+00 1.6397161882881173e+00 1.3957000000000000e-01 1 0 0 0 0 -V -120 0 0 0 0 0 0 2 0 -P 415 -211 -1.7917883923619066e-01 3.7320756329498238e-02 3.3628350035695148e-01 4.0750984380178873e-01 1.3957000000000000e-01 1 0 0 0 0 -P 416 111 2.0615633368148753e-01 2.9319453099443760e-01 -3.9420844071029401e-02 3.8501567535532039e-01 1.3497999999999999e-01 2 0 0 -199 0 -V -121 0 0 0 0 0 0 2 0 -P 417 -211 -4.0949193990631622e-01 9.8784294800820266e-02 1.6177062253094043e+00 1.6774669004342038e+00 1.3957000000000000e-01 1 0 0 0 0 -P 418 211 2.3022959581081737e-01 3.5933366808902623e-01 2.7454858413980707e+00 2.7819594968343444e+00 1.3957000000000000e-01 1 0 0 0 0 -V -122 0 0 0 0 0 0 2 0 -P 419 -211 1.7106562716093260e-01 -8.5567367789404127e-03 1.1082111017219458e+00 1.1300213703377633e+00 1.3957000000000000e-01 1 0 0 0 0 -P 420 111 -2.5858290813921248e-01 1.2412289720045558e-01 1.0618010768307151e-01 3.3431337044568815e-01 1.3497999999999999e-01 2 0 0 -200 0 -V -123 0 0 0 0 0 0 2 0 -P 421 321 -4.3364031456645963e-01 3.1333513178025424e-01 2.3850228401197859e+00 2.4936314353003528e+00 4.9359999999999998e-01 1 0 0 0 0 -P 422 111 -3.2914057460674639e-01 3.0667447028601713e-01 4.7608665461210302e+00 4.7839787435723471e+00 1.3497999999999999e-01 2 0 0 -201 0 -V -124 0 0 0 0 0 0 3 0 -P 423 22 -3.6801339550226492e-01 1.7380726639585706e-01 3.6329416264764558e+00 3.6556678851485542e+00 0 1 0 0 0 0 -P 424 211 -2.0485179035825907e-01 1.0503476392148384e-01 1.2552849482286934e+00 1.2838288997349061e+00 1.3957000000000000e-01 1 0 0 0 0 -P 425 -211 -1.6286584081530955e-01 1.2536930627288169e-02 7.4666982282661187e-01 7.7696722321727008e-01 1.3957000000000000e-01 1 0 0 0 0 -V -125 0 0 0 0 0 0 2 0 -P 426 211 -3.6738729491780953e-01 -1.2990768478039541e-01 -4.9576508877336578e-01 6.4584227113010451e-01 1.3957000000000000e-01 1 0 0 0 0 -P 427 111 4.1426864992368700e-01 -4.6948895281791733e-02 1.3140310201161695e-01 4.5750310238953612e-01 1.3497999999999999e-01 2 0 0 -202 0 -V -126 0 6.9426357033436299e-05 -7.0324668325621512e-06 2.1888967731901427e-04 2.3111366735984392e-04 0 2 0 -P 428 22 1.7329754036781519e-01 -3.5760193007135399e-02 3.5401094689066487e-01 3.9577086732081140e-01 0 1 0 0 0 0 -P 429 22 1.9965593891975320e-01 -2.0177213938078393e-03 8.2184891706479402e-01 8.4575540650126857e-01 0 1 0 0 0 0 -V -127 0 0 0 0 0 0 2 0 -P 430 -211 -3.7279482875192040e-02 7.0816911438682062e-01 6.4425103332057665e-01 9.6821094460323387e-01 1.3957000000000000e-01 1 0 0 0 0 -P 431 111 -7.3446105685645879e-01 4.2632886349871141e-01 4.9727371847637947e-01 9.9332275488792399e-01 1.3497999999999999e-01 2 0 0 -203 0 -V -128 0 0 0 0 0 0 3 0 -P 432 211 3.5893828107734344e-01 -2.8226148103218018e-01 1.1790620111171650e-01 4.9182302757987484e-01 1.3957000000000000e-01 1 0 0 0 0 -P 433 -211 -1.5008674707049818e-02 9.4286417803348802e-02 3.1852852341836643e-02 1.7207433858934496e-01 1.3957000000000000e-01 1 0 0 0 0 -P 434 111 6.2902258068042838e-02 -3.4099485009942332e-01 -3.8018334849563219e-02 3.7403098273955909e-01 1.3497999999999999e-01 2 0 0 -204 0 -V -129 0 0 0 0 0 0 3 0 -P 435 -211 6.2512878218440995e-02 -1.0363521755860323e-01 1.7834621769483228e-01 2.5677865278800954e-01 1.3957000000000000e-01 1 0 0 0 0 -P 436 211 2.0006607633586731e-02 -2.7092422208840949e-01 8.6756397153503473e-01 9.1975389538118113e-01 1.3957000000000000e-01 1 0 0 0 0 -P 437 111 -1.3744564485215921e-01 -1.6334130447134231e-02 1.1762930332422402e-02 1.9369067100997739e-01 1.3497999999999999e-01 2 0 0 -205 0 -V -130 0 1.5843923112336528e-01 -6.6444617855219837e-02 -8.9283819735022774e-01 9.2728610338778894e-01 0 2 0 -P 438 10323 8.7256927989165967e-01 -6.3042634964667288e-01 -7.4558774953617020e+00 7.6433087325073386e+00 1.2927662681406757e+00 2 0 0 -206 0 -P 439 -211 7.4915303770725516e-01 -4.9674903661230729e-02 -1.6828668697901639e+00 1.8480309944092130e+00 1.3957000000000000e-01 1 0 0 0 0 -V -131 0 6.3341395332392340e-05 -2.1593088333733440e-05 -2.6782880498143764e-04 2.8013321925965200e-04 0 2 0 -P 440 22 1.8312594343566238e-01 -8.4377915874067108e-02 -7.2688918009528936e-01 7.5433588273795882e-01 0 1 0 0 0 0 -P 441 22 -3.4363715801602034e-03 2.3121721921194556e-02 -3.2898997053912235e-02 4.0357981631782891e-02 0 1 0 0 0 0 -V -132 0 0 0 0 0 0 1 0 -P 442 310 3.8379010207120906e-01 6.7470718262439966e-01 -2.3156482330478920e+00 2.4924740305268194e+00 4.9767000000000000e-01 2 0 0 -207 0 -V -133 0 0 0 0 0 0 1 0 -P 443 310 4.9216148712404084e-01 1.6700552201381169e+00 -1.0293091901049095e+01 1.0451158963486355e+01 4.9767000000000000e-01 2 0 0 -208 0 -V -134 0 9.6048817494557951e-06 2.0169447607449687e-06 -1.3519891620979356e-04 1.3580891966622047e-04 0 2 0 -P 444 22 1.5816391710962158e-01 4.6061575462403102e-02 -2.1743161685814321e+00 2.1805477051337747e+00 0 1 0 0 0 0 -P 445 22 -2.0807358571302472e-03 -1.3285414039545751e-02 -2.2720452416971754e-02 2.6401716723371889e-02 0 1 0 0 0 0 -V -135 0 -6.1063190212079914e-05 1.3712130821739223e-04 -6.0160207306227294e-04 6.2361403763779813e-04 0 2 0 -P 446 22 -2.5237797460208114e-02 2.4511377645867576e-02 -3.8105441354096364e-01 3.8267508428664126e-01 0 1 0 0 0 0 -P 447 22 -9.8480342496487655e-02 2.5330563686262997e-01 -8.3783194360571156e-01 8.8080899703098514e-01 0 1 0 0 0 0 -V -136 0 -4.4426904102195735e-05 -3.9203241902067923e-06 -7.3352018546965340e-04 7.3964774707043087e-04 0 2 0 -P 448 22 -9.3539797166090302e-02 -3.7702636311332943e-02 -1.0340724780016020e+00 1.0389788603234766e+00 0 1 0 0 0 0 -P 449 22 2.2057787920906725e-02 3.1394912294285607e-02 -1.4614697997947071e-01 1.5109972297476049e-01 0 1 0 0 0 0 -V -137 0 3.4098188860393095e-05 1.9858577100558979e-05 -1.0637027187826258e-05 5.1232108310682472e-05 0 2 0 -P 450 22 1.6215511123058321e-01 9.3620873556322176e-02 -6.6667187162900293e-02 1.9875528145904667e-01 0 1 0 0 0 0 -P 451 22 -1.3182901251046604e-02 -6.8603676000775432e-03 2.0194881719618613e-02 2.5073627114409011e-02 0 1 0 0 0 0 -V -138 0 0 0 0 0 0 1 0 -P 452 130 -8.2754245304295648e-02 1.3966417583534083e-01 2.8673365676272389e-01 5.9686343994935065e-01 4.9767000000000000e-01 1 0 0 0 0 -V -139 0 -3.0024804301746423e-05 -1.0062036223726178e-05 1.6354301085376340e-06 3.2890160085510046e-05 0 2 0 -P 453 22 -2.2227458161680197e-01 -3.7647953140759721e-02 -4.5941596270482596e-02 2.3007387569320689e-01 0 1 0 0 0 0 -P 454 22 -2.4152691014793695e-01 -1.1778311524703966e-01 7.1204539415547607e-02 2.7798956274703429e-01 0 1 0 0 0 0 -V -140 0 -5.2312039080510034e-07 -7.7585077934244670e-06 4.8598353661629399e-05 4.9611143007349821e-05 0 2 0 -P 455 22 4.7206675991752704e-02 -1.2250638112759871e-01 8.1646707124802609e-01 8.2695511492915996e-01 0 1 0 0 0 0 -P 456 22 -5.8513823507732002e-02 -4.5192285691928666e-02 2.3397707802335543e-01 2.4538028296483455e-01 0 1 0 0 0 0 -V -141 0 3.0596166820026153e-05 -6.1256159019476770e-05 1.0370610489371156e-03 1.0399416777082222e-03 0 2 0 -P 457 22 4.0001623016009347e-02 3.0748574500628228e-04 9.6083364275377592e-01 9.6166600929786894e-01 0 1 0 0 0 0 -P 458 22 7.4777626526306248e-02 -2.3010542100460624e-01 2.9296239307961844e+00 2.9395980293397774e+00 0 1 0 0 0 0 -V -142 0 -4.8576316925451316e-07 1.3569495300677073e-05 5.5406023824234275e-03 5.5407339507114817e-03 0 2 0 -P 459 22 6.5319363905594258e-02 3.0658385922958279e-02 8.8762098019672298e+00 8.8765030842369192e+00 0 1 0 0 0 0 -P 460 22 -6.7156663551545731e-02 2.0665449414198934e-02 1.2079983338832347e+01 1.2080187686651476e+01 0 1 0 0 0 0 -V -143 0 9.0037533931825553e-01 -4.1316775008103196e-01 -2.4225397489886213e+00 2.6310406502189263e+00 0 2 0 -P 461 -313 3.3260378225084786e+00 -1.5544554022213999e+00 -7.2364383456584944e+00 8.1606541269951336e+00 8.6681985191492394e-01 2 0 0 -209 0 -P 462 111 2.9176140131540547e+00 -1.3106559225548522e+00 -9.5626609746215951e+00 1.0084294471753186e+01 1.3497999999999999e-01 2 0 0 -210 0 -V -144 0 1.1084488636694684e-04 -5.9020010882937835e-05 -2.8722172598448888e-04 3.1493497848296892e-04 0 2 0 -P 463 22 3.1314551809140151e-01 -2.2424078531812608e-01 -9.5181719689775401e-01 1.0267911285218234e+00 0 1 0 0 0 0 -P 464 22 1.8073067545782046e-01 -3.8726495117382520e-02 -3.2791682948089795e-01 3.7642099507376175e-01 0 1 0 0 0 0 -V -145 0 2.1762554097457766e-05 -5.2596854880985613e-06 -3.6973893122269703e-05 4.3376025620967871e-05 0 2 0 -P 465 22 6.1212626343456389e-01 -1.9963698177142020e-01 -1.1024657025825368e+00 1.2767083113413062e+00 0 1 0 0 0 0 -P 466 22 1.9830912724377689e-01 3.7668075123103504e-03 -2.7443846883299938e-01 3.3861064951124098e-01 0 1 0 0 0 0 -V -146 0 0 0 0 0 0 3 0 -P 467 -211 1.7393789155705139e-01 -1.3065291375810584e-01 -4.3049883216363505e-01 5.0212907044608479e-01 1.3957000000000000e-01 1 0 0 0 0 -P 468 211 5.4061889742620196e-02 -2.0391370194446679e-01 -3.1469861234019963e-01 4.0375547955673285e-01 1.3957000000000000e-01 1 0 0 0 0 -P 469 111 1.6109978154052820e-01 -2.0414556888027760e-01 -1.2587726950965411e-01 3.1889377586441564e-01 1.3497999999999999e-01 2 0 0 -211 0 -V -147 0 1.0714041926560731e-04 -3.5952055726626964e-05 -3.6896034107096622e-04 3.8633479589775667e-04 0 2 0 -P 470 22 2.5050241289919523e-02 -3.1553935481967076e-02 -2.0563051401164908e-01 2.0954014824319075e-01 0 1 0 0 0 0 -P 471 22 7.4662084294927367e-01 -2.2738813337831260e-01 -2.4517795314882425e+00 2.5730081456055021e+00 0 1 0 0 0 0 -V -148 0 -8.2236368158045554e+00 -2.2931374491773147e+00 1.2920849342338417e+02 1.3492529573552881e+02 0 2 0 -P 472 211 1.1959041323412727e-02 1.8026949323956257e-01 6.7905858545809583e-01 7.1640802357774702e-01 1.3957000000000000e-01 1 0 0 0 0 -P 473 -211 -1.1991827116210638e-01 -2.1037361365155197e-01 1.0171799220351061e+00 1.0548801959325360e+00 1.3957000000000000e-01 1 0 0 0 0 -V -149 0 -9.2045643512728860e-06 3.8569981482441684e-06 4.7596694869231805e-05 4.8915671097022722e-05 0 2 0 -P 474 22 -1.6000027299236894e-01 3.3406489255377600e-03 8.2592413992356950e-01 8.4128588018661254e-01 0 1 0 0 0 0 -P 475 22 -7.6077823418413418e-02 9.5583400703326729e-02 3.9483294225373233e-01 4.1330022259228810e-01 0 1 0 0 0 0 -V -150 0 -5.1376001790767983e-04 -8.7323614726347900e-05 1.0339591518642124e-02 1.0352903915864018e-02 0 2 0 -P 476 22 -9.8141079344267446e-01 -1.3524648836133710e-01 2.0155938367930911e+01 2.0180270321527644e+01 0 1 0 0 0 0 -P 477 22 -1.3018310489578394e-01 -5.3690746781996687e-02 2.2152591616907351e+00 2.2197304995303044e+00 0 1 0 0 0 0 -V -151 0 1.8812133423387019e-05 4.4631564068415145e-05 6.8657693823981141e-04 6.8868785865107516e-04 0 2 0 -P 478 22 1.1022166047224506e-01 2.1611844596084642e-01 2.5503585056497373e+00 2.5618712895970677e+00 0 1 0 0 0 0 -P 479 22 -2.6491571954957035e-03 3.9096045874903049e-02 1.3756608498543419e+00 1.3762188389420000e+00 0 1 0 0 0 0 -V -152 0 -6.1390506341479101e-05 -3.8165294835329746e-05 7.2673967916918672e-04 7.3078276184993679e-04 0 2 0 -P 480 22 -2.3353319762731059e-01 -1.5443990800084420e-01 3.2775654162838568e+00 3.2895021656167542e+00 0 1 0 0 0 0 -P 481 22 -8.7200867675081895e-02 -4.4954280050167550e-02 5.1927851948606241e-01 5.2846481379345667e-01 0 1 0 0 0 0 -V -153 0 -2.1949467253790887e-06 -2.9968781866244220e-06 3.5756066464182236e-04 3.5758882682307923e-04 0 2 0 -P 482 22 -9.6872819742027924e-02 -1.7212501507269221e-01 1.3349169664484013e+01 1.3350630775180569e+01 0 1 0 0 0 0 -P 483 22 -2.0782378455591517e-02 1.1484078805539037e-02 5.8170681214651880e+00 5.8171165813559886e+00 0 1 0 0 0 0 -V -154 0 -8.9986340215037180e-04 6.7085770245716900e-04 1.8873921422629708e-01 1.8874257936079455e-01 0 2 0 -P 484 22 -5.9132218144870774e-01 4.5823878854928546e-01 1.3682075425726194e+02 1.3682279941674801e+02 0 1 0 0 0 0 -P 485 22 -5.9557876820332156e-01 4.2660844740346221e-01 1.1212230984163310e+02 1.1212470322395373e+02 0 1 0 0 0 0 -V -155 0 -5.1873522246844111e-06 2.7707778595899736e-05 9.6056467932884703e-03 9.6057046240736067e-03 0 2 0 -P 486 22 -5.3358764522310233e-02 1.0089755553224661e-01 2.0124549509027762e+01 2.0124873177632029e+01 0 1 0 0 0 0 -P 487 22 1.3993599204279632e-02 1.0936795908476790e-01 5.2769647303955324e+01 5.2769762494776600e+01 0 1 0 0 0 0 -V -156 0 -3.7961104939160116e-05 2.2238792132853197e-05 1.3680343821661578e-02 1.3680495100296034e-02 0 2 0 -P 488 22 -5.8340790011343790e-02 1.4637676680264345e-02 3.2736459456784488e+01 3.2736514714841775e+01 0 1 0 0 0 0 -P 489 22 -5.0816223291669176e-02 4.9309885767650677e-02 6.6013173261676918e+00 6.6016970692501333e+00 0 1 0 0 0 0 -V -157 0 6.4821581940860607e-05 4.9234301285117272e-04 1.8010279475067351e-02 1.8017257078420904e-02 0 2 0 -P 490 22 -2.5234079465957855e-02 2.3544476449702920e-01 7.9958679452732673e+00 7.9993734250967465e+00 0 1 0 0 0 0 -P 491 22 1.5175635805081697e-01 7.2553702530404074e-01 2.7157572142236390e+01 2.7167685926999180e+01 0 1 0 0 0 0 -V -158 0 1.4804463480565830e-04 1.0651174971634308e-04 1.8034463186217421e-03 1.8139343160849324e-03 0 2 0 -P 492 22 2.4200308501046050e-01 1.0332693936441227e-01 2.2320018200418206e+00 2.2474594710968643e+00 0 1 0 0 0 0 -P 493 22 5.0192199347641360e-02 1.0689500509646421e-01 1.3274551679537445e+00 1.3326976483497788e+00 0 1 0 0 0 0 -V -159 0 2.4952594602505824e-05 3.7777957462761067e-05 5.9919627289598465e-04 6.0271404297856631e-04 0 2 0 -P 494 22 2.1275464521165535e-02 6.8760375565027509e-02 1.4863415101773401e+00 1.4880832367561605e+00 0 1 0 0 0 0 -P 495 22 5.0890506431500629e-02 4.0498121370393020e-02 2.4660776878922408e-01 2.5503986572021459e-01 0 1 0 0 0 0 -V -160 0 2.0236519733306777e-05 3.7771007405603190e-06 1.1559121658481918e-03 1.1570792571236135e-03 0 2 0 -P 496 22 -1.2833830815182560e-02 -2.3124364578967924e-02 1.4876882759176302e-01 1.5110131539335275e-01 0 1 0 0 0 0 -P 497 22 7.0093495982825063e-02 3.3811751864884283e-02 3.1219093548200161e+00 3.1228791767303448e+00 0 1 0 0 0 0 -V -161 0 9.9092870836126360e-05 2.7848331350535774e-04 4.6738600755917839e-03 4.6833068224631591e-03 0 2 0 -P 498 22 2.6456748621759857e-01 6.3513480445463311e-01 1.1741987252901410e+01 1.1762128073690251e+01 0 1 0 0 0 0 -P 499 22 1.5373857476364564e-01 5.4044177273503313e-01 7.9880294607280593e+00 8.0077667001821897e+00 0 1 0 0 0 0 -V -162 0 0 0 0 0 0 3 0 -P 500 111 3.7256730615539213e-01 4.0392989421236170e-01 4.8383474581306611e+00 4.8713233810796961e+00 1.3497999999999999e-01 2 0 0 -212 0 -P 501 111 4.3040406011067917e-01 7.1737842978781352e-01 9.9218515099128535e+00 9.9579735112945826e+00 1.3497999999999999e-01 2 0 0 -213 0 -P 502 111 1.5302824405896340e-01 1.5887887524497102e-01 2.8455533486003191e+00 2.8572808053478687e+00 1.3497999999999999e-01 2 0 0 -214 0 -V -163 0 2.5839849297056158e-04 -2.4440063293579029e-04 2.5294186504828259e-03 2.5543856476549264e-03 0 2 0 -P 503 22 1.0377695069292572e+00 -1.0215680356798684e+00 1.0766543901355142e+01 1.0864577045648971e+01 0 1 0 0 0 0 -P 504 22 6.5234961046689088e-01 -5.7699462341256325e-01 5.7777430561017944e+00 5.8430127187997627e+00 0 1 0 0 0 0 -V -164 0 2.9081685912101332e+01 -1.3235793939462669e+01 2.7971035052250431e+02 2.8244513460775647e+02 0 2 0 -P 505 -211 1.6762062809584813e-01 3.9634778053940575e-04 7.8798055709064896e-01 8.1761236249686153e-01 1.3957000000000000e-01 1 0 0 0 0 -P 506 211 4.6924787248882088e-01 -2.9025094100292242e-01 5.3374797093361082e+00 5.3677377550568766e+00 1.3957000000000000e-01 1 0 0 0 0 -V -165 0 -3.0050263375036868e+00 -5.0546364354167757e+01 1.8214857668293783e+02 1.9090770581995881e+02 0 2 0 -P 507 211 -9.7967500090645355e-03 -8.7693414903352140e-01 3.0997225316964849e+00 3.2244176274885290e+00 1.3957000000000000e-01 1 0 0 0 0 -P 508 -211 -4.6580152179340854e-02 -7.1359516020228234e-02 3.1754285571499852e-01 3.5717662468214256e-01 1.3957000000000000e-01 1 0 0 0 0 -V -166 0 5.6480984727818789e-06 -7.5695882859026960e-05 2.4158929915350398e-04 2.5535755044692415e-04 0 2 0 -P 509 22 -1.5831173828552911e-02 -2.9378876913681856e-01 9.0618464764577900e-01 9.5275027292812764e-01 0 1 0 0 0 0 -P 510 22 3.9026217408659976e-02 -1.7071480593394573e-02 8.5950023758604277e-02 9.5926470168474803e-02 0 1 0 0 0 0 -V -167 0 -1.3980777099787572e-04 -1.7277007798433808e-04 1.4734431911646548e-04 2.6792598878135266e-04 0 2 0 -P 511 22 -1.2336930388478158e-01 -1.2478121246765621e-01 1.7383616081680370e-01 2.4700070229341370e-01 0 1 0 0 0 0 -P 512 22 -6.0123017804104317e-01 -7.7065620210665875e-01 5.8982394573139763e-01 1.1416133302440359e+00 0 1 0 0 0 0 -V -168 0 -2.8186737865916890e-04 -3.8046149041595802e-04 1.2333062138451006e-04 4.9228004617499265e-04 0 2 0 -P 513 22 -4.8768644239564540e-01 -5.8187949922834425e-01 1.4921470252584854e-01 7.7374856715125973e-01 0 1 0 0 0 0 -P 514 22 -2.1530788834862755e-01 -3.6701452356081865e-01 1.5837934419538133e-01 4.5402771276374626e-01 0 1 0 0 0 0 -V -169 0 -3.4658007413822462e-04 -5.2006713158035483e-04 -6.2006088942802176e-04 8.8139953703405920e-04 0 2 0 -P 515 22 -1.0775610701610787e+00 -1.6290514307907258e+00 -1.9570560690361336e+00 2.7649620036157683e+00 0 1 0 0 0 0 -P 516 22 -2.4453684219177260e-02 -2.4597163101588097e-02 -1.4540972319744369e-02 3.7609081091414698e-02 0 1 0 0 0 0 -V -170 0 -3.2936317532428194e-06 1.0990395558401315e-06 -2.4129875422404844e-06 4.5736236017871529e-06 0 2 0 -P 517 22 -1.1277518702680793e-01 -2.8406275204800626e-02 -9.5641457125978296e-02 1.5057372812387532e-01 0 1 0 0 0 0 -P 518 22 -1.4222141692334364e-01 1.1349513010492379e-01 -9.1174700460411068e-02 2.0352125685849817e-01 0 1 0 0 0 0 -V -171 0 -2.7271832796903617e+00 6.8567867727248952e+00 -1.2603422001234511e+01 1.5348030492065396e+01 0 2 0 -P 519 -211 -3.7348317016183979e-01 4.9790328223054242e-01 -1.0151019995738311e+00 1.1988783137953889e+00 1.3957000000000000e-01 1 0 0 0 0 -P 520 211 8.5831780283816786e-02 2.2532066093454553e-01 -3.1425194699553238e-01 4.1996495787285959e-01 1.3957000000000000e-01 1 0 0 0 0 -V -172 0 3.1974236939944823e-04 3.3569120093488014e-05 -5.9655894167858436e-04 6.8391161951871296e-04 0 2 0 -P 521 22 1.9897288125315632e-02 1.6243576481117575e-02 -1.3069032052262358e-01 1.3319052417475438e-01 0 1 0 0 0 0 -P 522 22 4.4848871157211562e-01 3.2931344889120584e-02 -7.4320029585512404e-01 8.6866177401965050e-01 0 1 0 0 0 0 -V -173 0 1.9560921305414770e-05 4.4755997995360398e-05 -3.5733999312562766e-03 3.5738070538753140e-03 0 2 0 -P 523 22 5.1120391576480297e-03 1.7106579289460694e-01 -1.2815304960687456e+01 1.2816447669844537e+01 0 1 0 0 0 0 -P 524 22 1.1022477824540093e-01 9.2828442345385592e-02 -8.2544886826868353e+00 8.2557464855730984e+00 0 1 0 0 0 0 -V -174 0 5.5231096619475536e-05 5.6770554839812856e-07 -2.1296451261918815e-03 2.1308725963420996e-03 0 2 0 -P 525 22 9.7472420846883984e-02 6.0287687292296423e-02 -2.6041322266357367e+00 2.6066530516867035e+00 0 1 0 0 0 0 -P 526 22 6.2239828849669235e-02 -5.8646048146063924e-02 -3.5541813861247409e+00 3.5552100473437531e+00 0 1 0 0 0 0 -V -175 0 5.3769907760083674e-05 -1.7797180683467078e-05 -4.7051261694481660e-04 4.7445074797331378e-04 0 2 0 -P 527 22 5.3037730429285952e-02 1.8802208065621582e-02 -7.8476669872783666e-01 7.8678160585350465e-01 0 1 0 0 0 0 -P 528 22 2.6726521743199222e-01 -1.2481855947855978e-01 -2.0180385224711261e+00 2.0394827401615143e+00 0 1 0 0 0 0 -V -176 0 2.9254383701421145e-05 8.8292904820199445e-06 -3.6860838857756469e-04 3.7012148884077044e-04 0 2 0 -P 529 22 2.6766648875802562e-01 3.2296618557240302e-02 -2.7936079938788474e+00 2.8065876156354146e+00 0 1 0 0 0 0 -P 530 22 2.3442063103992584e-02 5.5563101627706384e-02 -8.7439114423986819e-01 8.7646828904996255e-01 0 1 0 0 0 0 -V -177 0 1.1791599049523860e-05 1.5009523055407391e-06 -2.9482632283654421e-04 2.9765838229104172e-04 0 2 0 -P 531 22 -1.5428123271640134e-02 -5.0390978815312924e-02 -2.3845419747560437e-01 2.4420827591911123e-01 0 1 0 0 0 0 -P 532 22 5.6030702577819128e-02 5.5559279973158932e-02 -7.7673543916687360e-01 7.8073312705447295e-01 0 1 0 0 0 0 -V -178 0 3.2723311563305957e-04 1.0507501276705404e-03 -1.2218877606198402e-02 1.2268568468549786e-02 0 2 0 -P 533 22 9.4401096396448003e-02 2.3410779978091101e-01 -3.2781170771961121e+00 3.2878214064519824e+00 0 1 0 0 0 0 -P 534 22 4.9348863218620098e-01 1.6536143709088655e+00 -1.8673672935241342e+01 1.8753240584233389e+01 0 1 0 0 0 0 -V -179 0 1.7342743189630799e-05 8.3072667488889255e-04 -1.7361270833368348e-02 1.7381836821258590e-02 0 2 0 -P 535 22 -3.8453506099116352e-02 1.6907034517103431e-01 -2.8447753591404483e+00 2.8500544376766270e+00 0 1 0 0 0 0 -P 536 22 5.3526856649327458e-02 5.5295120846059187e-01 -1.2244678391462424e+01 1.2257274129008765e+01 0 1 0 0 0 0 -V -180 0 1.0839912633860633e-05 1.0352917101532169e-05 -2.0615493526385194e-04 2.0836977521051438e-04 0 2 0 -P 537 22 -2.8004400899389711e-02 6.2646397586995417e-02 -5.7297679271081736e-01 5.7707124567555479e-01 0 1 0 0 0 0 -P 538 22 8.3568879894528450e-02 -9.5782166655390463e-03 -4.8375603873570577e-01 4.9101466875703387e-01 0 1 0 0 0 0 -V -181 0 0 0 0 0 0 1 0 -P 539 310 4.9782761336762366e-01 5.0953796112831118e-01 -7.5199540324803458e+00 7.5699963900902567e+00 4.9767000000000000e-01 2 0 0 -215 0 -V -182 0 8.7757799449387813e-05 1.3142049408522492e-05 -1.0075220374350941e-03 1.0115039674349258e-03 0 2 0 -P 540 22 2.7618616299673959e-01 8.4600539789103923e-03 -3.7511108822759187e+00 3.7612741485131078e+00 0 1 0 0 0 0 -P 541 22 6.4466287487593510e-01 1.2944043611362591e-01 -6.8208918870357209e+00 6.8525113048702293e+00 0 1 0 0 0 0 -V -183 0 -2.6136531610599666e-05 -7.8566005859732383e-05 -8.0291769723185909e-03 8.0296346065171897e-03 0 2 0 -P 542 22 -7.4716552899476629e-03 4.9182992465864129e-03 -2.7131229900018922e-01 2.7145971872272112e-01 0 1 0 0 0 0 -P 543 22 -1.5136490069141190e-01 -4.8237850605192573e-01 -4.8523487127665760e+01 4.8526120835947800e+01 0 1 0 0 0 0 -V -184 0 3.0415448928081571e-05 -1.1974711988028776e-04 -6.5567445846735376e-03 6.5581791201926257e-03 0 2 0 -P 544 22 1.3556393099985419e-02 -6.1583833433596850e-02 -1.3131200271624943e+00 1.3146332378536185e+00 0 1 0 0 0 0 -P 545 22 5.5354700392647317e-02 -2.0972253436179353e-01 -1.3542239831247805e+01 1.3543976791596672e+01 0 1 0 0 0 0 -V -185 0 -3.1088009732033299e-05 -4.8775051918327588e-05 -3.9681488720718049e-03 3.9686020068036556e-03 0 2 0 -P 546 22 -2.3880690879437318e-02 -6.3743256993639932e-02 -2.3974399240098516e+00 2.3984060705905081e+00 0 1 0 0 0 0 -P 547 22 -2.4101259830608548e-01 -3.5185697101090135e-01 -3.1414181204563874e+01 3.1417076107648302e+01 0 1 0 0 0 0 -V -186 0 4.9936185293428575e-06 -7.8074106944437902e-06 -4.8662299743094315e-04 4.8679322156790417e-04 0 3 0 -P 548 22 -7.6945087736918416e-03 -3.4952019188524259e-03 -3.4251266665547355e+00 3.4251370927082716e+00 0 1 0 0 0 0 -P 549 11 3.7993073439308529e-02 -5.4461719288112491e-02 -1.9843239859383353e+00 1.9854348374518325e+00 5.1000000000000004e-04 1 0 0 0 0 -P 550 -11 4.5152289921856444e-02 -6.0008799552382155e-02 -1.9431576419402867e+00 1.9446083582150522e+00 5.1000000000000004e-04 1 0 0 0 0 -V -187 0 -3.3864176965536530e-06 -5.2595766008398732e-06 -1.0993693802770681e-03 1.0994124317216158e-03 0 2 0 -P 551 22 3.7271706047568784e-02 2.3949720321528242e-03 -4.4966347495633086e+00 4.4967898535447492e+00 0 1 0 0 0 0 -P 552 22 -9.8612167830641417e-02 -9.7665221123780122e-02 -1.5416982381895389e+01 1.5417607097689778e+01 0 1 0 0 0 0 -V -188 0 -4.6383230818921369e-06 5.6203138543926335e-06 2.4584505964231955e-05 2.6813092486387573e-05 0 2 0 -P 553 22 -6.5476919329221801e-03 1.0368115961250647e-01 1.8400605847919932e-01 2.1130755946083196e-01 0 1 0 0 0 0 -P 554 22 -7.3324877363122987e-02 -6.8985724846230816e-03 2.3934255729599138e-01 2.5041762652742228e-01 0 1 0 0 0 0 -V -189 0 -4.9726058411939644e-05 1.4815060441523449e-05 2.8970980996520599e-04 2.9505398883757013e-04 0 2 0 -P 555 22 -1.2227550286838383e-01 -2.9022998042734331e-02 7.1445373986730298e-01 7.2542248340362359e-01 0 1 0 0 0 0 -P 556 22 -2.0031525666097008e-01 1.2513360388871886e-01 1.1649976106813382e+00 1.1886984704989552e+00 0 1 0 0 0 0 -V -190 0 4.1144825782597785e-06 -1.3891011630816487e-06 1.1513855193327027e-04 1.1525421260035257e-04 0 2 0 -P 557 22 9.3887241474577124e-02 3.4826553659132765e-02 1.8468116251162237e+00 1.8495245014911006e+00 0 1 0 0 0 0 -P 558 22 1.0511091056963101e-01 -1.0201083727144152e-01 3.7218980796791872e+00 3.7247791652608369e+00 0 1 0 0 0 0 -V -191 0 0 0 0 0 0 2 0 -P 559 211 2.7960965099084567e-01 -4.5946947899938018e-01 9.9891123687115861e+00 1.0004555935108064e+01 1.3957000000000000e-01 1 0 0 0 0 -P 560 -211 -1.9661017956950227e-01 1.7695947757585628e-01 6.1182368816204669e+00 6.1255426326110252e+00 1.3957000000000000e-01 1 0 0 0 0 -V -192 0 -3.8117306469070869e+00 2.4304278506338637e+00 -3.6687500677897781e+01 3.6965955593079201e+01 0 2 0 -P 561 311 -1.8715297405296983e+01 1.1577069668267237e+01 -1.8242722485100242e+02 1.8375045834320991e+02 4.9767000000000000e-01 2 0 0 -216 0 -P 562 211 -2.8661817689837927e+00 1.9267205095557918e+00 -2.7067714435363381e+01 2.7287504363610779e+01 1.3957000000000000e-01 1 0 0 0 0 -V -193 0 0 0 0 0 0 1 0 -P 563 310 -4.4690407303060170e-01 3.0479452171944948e-01 -6.3255618455358773e+00 6.3681261797769668e+00 4.9767000000000000e-01 2 0 0 -217 0 -V -194 0 -3.1527778681318056e-04 1.6421247362094913e-04 -3.2827057816517463e-03 3.3020747002308936e-03 0 2 0 -P 564 22 -2.9431917300519211e-01 1.7742963419472862e-01 -3.6976505269072799e+00 3.7135864699541625e+00 0 1 0 0 0 0 -P 565 22 -9.4756500827945667e-01 4.6940589272528510e-01 -9.2329793891821001e+00 9.2933379223023156e+00 0 1 0 0 0 0 -V -195 0 0 0 0 0 0 1 0 -P 566 310 -9.3258822715903111e-01 9.6253600257025262e-01 -1.1172693777377827e+01 1.1263789683300944e+01 4.9767000000000000e-01 2 0 0 -218 0 -V -196 0 -6.5693861061007710e-06 3.8405137903525116e-06 -3.9455407529225346e-05 4.0895424224071609e-05 0 2 0 -P 567 22 1.7454219099767260e-02 4.4134073479361206e-02 -2.8161765485158968e-01 2.8558881233405026e-01 0 1 0 0 0 0 -P 568 22 -1.3408943408499285e-01 2.4051772862582772e-02 -4.1888766865607635e-01 4.4048307920190266e-01 0 1 0 0 0 0 -V -197 0 -4.4674668139318611e-05 -7.7777020687567041e-05 3.1331705484877706e-05 9.7992828544315845e-05 0 2 0 -P 569 22 -1.1564015998464669e-01 -2.1072831940990802e-01 1.3246041090625361e-02 2.4073746863995532e-01 0 1 0 0 0 0 -P 570 22 -1.3565519498958165e-01 -2.2676802553368905e-01 1.6299504540646192e-01 3.1047295237937217e-01 0 1 0 0 0 0 -V -198 0 -4.1994933803133881e-06 2.7133704299912539e-05 4.1024696949819633e-05 4.9883066825652891e-05 0 2 0 -P 571 22 -9.1327603613570452e-02 4.7743485030051019e-01 7.5852594270345663e-01 9.0091418748815133e-01 0 1 0 0 0 0 -P 572 22 1.2278616621454207e-02 3.3315291206237996e-02 1.3700714622479238e-02 3.8057622567098298e-02 0 1 0 0 0 0 -V -199 0 2.9180616181076244e-05 4.1500529828774420e-05 -5.5798650462421432e-06 5.4497450772478213e-05 0 2 0 -P 573 22 2.0272262046875161e-01 2.6691626730043372e-01 -7.2202577647962327e-02 3.4286143967836935e-01 0 1 0 0 0 0 -P 574 22 3.4337132127359193e-03 2.6278263694003868e-02 3.2781733576932932e-02 4.2154235676950993e-02 0 1 0 0 0 0 -V -200 0 -2.1589576501028010e-05 1.0363255653369697e-05 8.8651781906517996e-06 2.7912456157651145e-05 0 2 0 -P 575 22 -3.8865980834170609e-02 8.3634946299046928e-02 4.5307746193725261e-02 1.0275291029358541e-01 0 1 0 0 0 0 -P 576 22 -2.1971692730504189e-01 4.0487950901408658e-02 6.0872361489346244e-02 2.3156046015210280e-01 0 1 0 0 0 0 -V -201 0 -5.5928360981912877e-05 5.2110866302600545e-05 8.0897793623986721e-04 8.1290521662359661e-04 0 2 0 -P 577 22 -2.6406015212804240e-01 1.5887290229264120e-01 3.1439228369676688e+00 3.1589902133168448e+00 0 1 0 0 0 0 -P 578 22 -6.5080422478704020e-02 1.4780156799337593e-01 1.6169437091533618e+00 1.6249885302555025e+00 0 1 0 0 0 0 -V -202 0 2.5577613621733289e-05 -2.8987004054158923e-06 8.1130391415557820e-06 2.8246978345620541e-05 0 2 0 -P 579 22 4.1523619773097542e-01 -2.5212523152159896e-02 1.2013330443018896e-01 4.3299974834068033e-01 0 1 0 0 0 0 -P 580 22 -9.6754780728841897e-04 -2.1736372129631837e-02 1.1269797581427982e-02 2.4503354048855987e-02 0 1 0 0 0 0 -V -203 0 -9.7897731963963699e-05 5.6826197138257549e-05 6.6282573799741188e-05 1.3240190736311445e-04 0 2 0 -P 581 22 -3.4078459999881455e-01 2.7082520501007290e-01 2.2460587057992729e-01 4.8982469554328012e-01 0 1 0 0 0 0 -P 582 22 -3.9367645685764430e-01 1.5550365848863854e-01 2.7266784789645226e-01 5.0349805934464398e-01 0 1 0 0 0 0 -V -204 0 1.0051858600423073e-05 -5.4491398591193902e-05 -6.0753769080588552e-06 5.9770613427078703e-05 0 2 0 -P 583 22 5.5789906689558660e-02 -8.2513813655285095e-02 3.4609669383240317e-02 1.0544606368748895e-01 0 1 0 0 0 0 -P 584 22 7.1123513784841722e-03 -2.5848103644413822e-01 -7.2628004232803536e-02 2.6858491905207016e-01 0 1 0 0 0 0 -V -205 0 -3.7511928053308099e-05 -4.4579420963488085e-06 3.2103614254240428e-06 5.2862428077211607e-05 0 2 0 -P 585 22 -9.4580225870565235e-02 4.1353138776709604e-02 4.7263360195968919e-02 1.1353116941803613e-01 0 1 0 0 0 0 -P 586 22 -4.2865418981593975e-02 -5.7687269223843832e-02 -3.5500429863546519e-02 8.0159501591941129e-02 0 1 0 0 0 0 -V -206 0 1.5843923112336528e-01 -6.6444617855219837e-02 -8.9283819735022774e-01 9.2728610338778894e-01 0 2 0 -P 587 321 3.8552872954303585e-01 -2.7291260034918019e-01 -2.9224624236940806e+00 3.0012566145926773e+00 4.9359999999999998e-01 1 0 0 0 0 -P 588 223 4.8704055034862392e-01 -3.5751374929749274e-01 -4.5334150716676227e+00 4.6420521179146625e+00 7.9484028256763894e-01 2 0 0 -219 0 -V -207 0 6.3429893183150927e+00 1.1151044358051168e+01 -3.8271263192902083e+01 4.1193704752906903e+01 0 2 0 -P 589 -211 1.4786817700154750e-01 5.9321872089188232e-01 -1.7433086461786294e+00 1.8526678788513411e+00 1.3957000000000000e-01 1 0 0 0 0 -P 590 211 2.3592192506966145e-01 8.1488461732517337e-02 -5.7233958686926234e-01 6.3980615167547805e-01 1.3957000000000000e-01 1 0 0 0 0 -V -208 0 6.8329392612838751e+00 2.3186263413004074e+01 -1.4290446044786810e+02 1.4509898940858528e+02 0 2 0 -P 591 211 2.4410696810169960e-01 1.3645749729262360e+00 -7.8972249366110239e+00 8.0191829105553794e+00 1.3957000000000000e-01 1 0 0 0 0 -P 592 -211 2.4805451902234124e-01 3.0548024721188094e-01 -2.3958669644380710e+00 2.4319760529309771e+00 1.3957000000000000e-01 1 0 0 0 0 -V -209 0 9.0037533931825553e-01 -4.1316775008103196e-01 -2.4225397489886213e+00 2.6310406502189263e+00 0 2 0 -P 593 -321 2.2771576165304452e+00 -1.0470309598375531e+00 -5.5075471687666786e+00 6.0711150061229135e+00 4.9359999999999998e-01 1 0 0 0 0 -P 594 211 1.0488802059780338e+00 -5.0742444238384699e-01 -1.7288911768918163e+00 2.0895391208722200e+00 1.3957000000000000e-01 1 0 0 0 0 -V -210 0 9.0046542976216415e-01 -4.1320822067561436e-01 -2.4228350260089080e+00 2.6313520343024166e+00 0 2 0 -P 595 22 2.6060905464746402e+00 -1.1260542878061872e+00 -8.4399332612949678e+00 8.9046156374446763e+00 0 1 0 0 0 0 -P 596 22 3.1152346667941438e-01 -1.8460163474866495e-01 -1.1227277133266274e+00 1.1796788343085065e+00 0 1 0 0 0 0 -V -211 0 1.1569229356777967e-05 -1.4660522105994798e-05 -9.0397577689810670e-06 2.2901056712458870e-05 0 2 0 -P 597 22 1.5315840728112597e-02 -6.0222579655507182e-02 -9.2350984073855877e-02 1.1131054908220694e-01 0 1 0 0 0 0 -P 598 22 1.4578394081241561e-01 -1.4392298922477043e-01 -3.3526285435798248e-02 2.0758322678220872e-01 0 1 0 0 0 0 -V -212 0 4.5366605022425090e-05 4.9185550274341878e-05 5.8915367630974652e-04 5.9316907338555658e-04 0 2 0 -P 599 22 6.2412753514439541e-02 9.0724804124025227e-02 5.9158564124042290e-01 6.0174738288291663e-01 0 1 0 0 0 0 -P 600 22 3.1015455264095260e-01 3.1320509008833647e-01 4.2467618168902384e+00 4.2695759981967800e+00 0 1 0 0 0 0 -V -213 0 1.0618662664215143e-05 1.7698716751283111e-05 2.4478578143780885e-04 2.4567696110588694e-04 0 2 0 -P 601 22 2.7037667242088931e-01 3.4218773845439160e-01 4.6801937946366561e+00 4.7004691200659314e+00 0 1 0 0 0 0 -P 602 22 1.6002738768978980e-01 3.7519069133342203e-01 5.2416577152761965e+00 5.2575043912286512e+00 0 1 0 0 0 0 -V -214 0 3.4213984360743327e-05 3.5522065787995497e-05 6.3620750774059183e-04 6.3882952712151966e-04 0 2 0 -P 603 22 1.6633397364096600e-01 9.3159794517856359e-02 2.2056974914033418e+00 2.2139212184910280e+00 0 1 0 0 0 0 -P 604 22 -1.3305729582002584e-02 6.5719080727114673e-02 6.3985585719697713e-01 6.4335958685684069e-01 0 1 0 0 0 0 -V -215 0 2.3355944705345006e+01 2.3905344191100344e+01 -3.5280411502535122e+02 3.5515188864392519e+02 0 2 0 -P 605 -211 -2.6117036784758577e-02 1.4271093127076998e-01 -1.2708986814665231e+00 1.2867446339378819e+00 1.3957000000000000e-01 1 0 0 0 0 -P 606 211 5.2394465015238212e-01 3.6682702985754118e-01 -6.2490553510138218e+00 6.2832517561523735e+00 1.3957000000000000e-01 1 0 0 0 0 -V -216 0 -3.8117306469070869e+00 2.4304278506338637e+00 -3.6687500677897781e+01 3.6965955593079201e+01 0 1 0 -P 607 130 -1.8715297405296983e+01 1.1577069668267237e+01 -1.8242722485100242e+02 1.8375045834320991e+02 4.9767000000000000e-01 1 0 0 0 0 -V -217 0 -8.5683490912819821e+01 5.8437280409922408e+01 -1.2127797744938878e+03 1.2209404983857619e+03 0 2 0 -P 608 111 -3.5967176370115622e-01 3.2878999327079506e-01 -3.3312469013489321e+00 3.3694053118355725e+00 1.3497999999999999e-01 2 0 0 -220 0 -P 609 111 -8.7232309329445451e-02 -2.3995471551345536e-02 -2.9943149441869452e+00 2.9987208679413939e+00 1.3497999999999999e-01 2 0 0 -221 0 -V -218 0 -1.6982282479171256e+00 1.7527626680229260e+00 -2.0345296697419474e+01 2.0511180885320400e+01 0 2 0 -P 610 111 -1.6065970337379756e-01 2.2472617477739559e-01 -1.4854185479765942e+00 1.5169051575464865e+00 1.3497999999999999e-01 2 0 0 -222 0 -P 611 111 -7.7192852378523358e-01 7.3780982779285698e-01 -9.6872752294012336e+00 9.7468845257544565e+00 1.3497999999999999e-01 2 0 0 -223 0 -V -219 0 1.5843923112336528e-01 -6.6444617855219837e-02 -8.9283819735022774e-01 9.2728610338778894e-01 0 3 0 -P 612 -211 3.2073970588280426e-01 -2.2344149637641733e-01 -1.7720504229152780e+00 1.8200116888325020e+00 1.3957000000000000e-01 1 0 0 0 0 -P 613 211 1.0327478319521827e-01 -2.9696360012404494e-01 -1.9981974224513948e+00 2.0275911285646449e+00 1.3957000000000000e-01 1 0 0 0 0 -P 614 111 6.3026061270601327e-02 1.6289134720296952e-01 -7.6316722630094946e-01 7.9444930051751483e-01 1.3497999999999999e-01 2 0 0 -224 0 -V -220 0 -8.5683537123124310e+01 5.8437322652564823e+01 -1.2127802024894916e+03 1.2209409312839239e+03 0 2 0 -P 615 22 -3.2562028377162922e-01 2.7551611057831837e-01 -3.1161850712685530e+00 3.1452419771440030e+00 0 1 0 0 0 0 -P 616 22 -3.4051479929526993e-02 5.3273882692476640e-02 -2.1506183008037907e-01 2.2416333469156946e-01 0 1 0 0 0 0 -V -221 0 -8.5683519961278023e+01 5.8437272419403094e+01 -1.2127807716041691e+03 1.2209414969632207e+03 0 2 0 -P 617 22 -1.0095930423421715e-01 2.7455429715276092e-02 -2.2937984531900248e+00 2.2961833388449753e+00 0 1 0 0 0 0 -P 618 22 1.3726994904771693e-02 -5.1450901266621621e-02 -7.0051649099692037e-01 7.0253752909641898e-01 0 1 0 0 0 0 -V -222 0 -1.6982374833223159e+00 1.7527755862422265e+00 -2.0345382085615018e+01 2.0511268083500596e+01 0 2 0 -P 619 22 -7.3037469158247367e-02 2.0430474030481502e-01 -1.0086454152325899e+00 1.0317172444433522e+00 0 1 0 0 0 0 -P 620 22 -8.7622234215550196e-02 2.0421434472580581e-02 -4.7677313274400424e-01 4.8518791310313425e-01 0 1 0 0 0 0 -V -223 0 -1.6983640114226690e+00 1.7528924308773342e+00 -2.0347000454184229e+01 2.0512895125914664e+01 0 2 0 -P 621 22 -6.7157134859009704e-01 5.7128422133885581e-01 -7.8635746548436938e+00 7.9128490501271402e+00 0 1 0 0 0 0 -P 622 22 -1.0035717519513651e-01 1.6652560645400125e-01 -1.8237005745575405e+00 1.8340354756273183e+00 0 1 0 0 0 0 -V -224 0 1.5844801754335897e-01 -6.6421909284177794e-02 -8.9294458997005066e-01 9.2739685702013275e-01 0 2 0 -P 623 22 -8.7214544347417808e-03 -2.0043855121139119e-02 -1.1849558188276470e-01 1.2049490786464623e-01 0 1 0 0 0 0 -P 624 22 7.1747515705343115e-02 1.8293520232410862e-01 -6.4467164441818470e-01 6.7395439265287005e-01 0 1 0 0 0 0 -BlockType GenEvent -E 3 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 102 0 0 -V -1 0 0 0 0 0 1 3 0 -P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -1 0 -P 3 21 5.4969932515599695e-01 2.2550476873687056e-01 5.5705531929900893e+01 5.5708700481541165e+01 0 3 0 0 -3 0 -P 14 2101 -9.4236956683619111e-01 2.1652326170818870e-01 6.5343226954385455e+03 6.5343227926610143e+03 5.7933000000000001e-01 2 0 0 -9 0 -P 15 2 3.9267024168019415e-01 -4.4202803044505923e-01 2.0241152885643043e+01 2.0252475128694172e+01 3.3000000000000002e-01 2 0 0 -11 0 -V -2 0 0 0 0 0 1 2 0 -P 2 2212 0 0 -6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -2 0 -P 4 1 -2.4852244145458005e+00 -5.1082941165122786e-01 -1.2650126797311423e+03 1.2650152240853247e+03 0 3 0 0 -4 0 -P 29 2203 2.4852244145458005e+00 5.1082941165122786e-01 -5.5694416402834304e+03 5.5694422716067393e+03 7.7132999999999996e-01 2 0 0 -11 0 -V -3 0 0 0 0 0 0 4 0 -P 13 2 -1.0608618276380355e+00 5.3963075851129338e-01 6.2467108078944122e-01 1.3841037287882854e+00 3.3000000000000002e-01 2 0 0 -9 0 -P 16 21 1.2784868462321570e+00 -8.7405515584658322e-01 5.0158545116382854e+01 5.0182448617257258e+01 0 2 0 0 -11 0 -P 17 21 -1.6686180664312625e-01 9.4299371379547992e-01 -4.2196845113635542e+00 4.3269871021549715e+00 0 2 0 0 -11 0 -P 5 -2 5.1478982848448318e-01 -3.7127142663721519e-01 4.3686552602229858e+00 4.4145214715099570e+00 0 3 0 0 -5 0 -V -4 0 0 0 0 0 0 7 0 -P 6 1 2.5722674946760922e+00 4.3788611284604106e-01 -4.6269073817910544e+02 4.6269809541539877e+02 0 3 0 0 -5 0 -P 23 21 -6.2117781148280848e-01 -2.8319314770868491e+00 -4.2435587401747085e+01 4.2534512761940860e+01 0 2 0 0 -11 0 -P 24 21 -1.0853374093767046e-01 2.4951738842432462e-02 -1.2807245422014727e+01 1.2807729598250830e+01 0 2 0 0 -11 0 -P 25 21 -4.7236154263853830e-02 -2.8124786400644658e-01 -7.3009915305624826e+00 7.3065593095945598e+00 0 2 0 0 -11 0 -P 26 21 -3.6487430314729372e+00 1.0613239469355105e+00 -1.4428971573317793e+02 1.4433974435543163e+02 0 2 0 0 -11 0 -P 27 21 -8.5735899903395096e-01 1.3023755707753566e+00 -8.6410163495004923e+01 8.6424230409151221e+01 0 2 0 0 -11 0 -P 28 21 2.0970411268715061e-01 -2.3598056104377471e-01 -5.0430489298734267e+02 5.0430499179922384e+02 0 2 0 0 -11 0 -V -5 0 0 0 0 0 0 2 0 -P 7 22 6.1062538570560743e-01 4.7283777698592582e+00 -5.7841992636145454e+00 7.4958242253514973e+00 0 3 0 0 -6 0 -P 8 -24 2.4764319374549677e+00 -4.6617630836504320e+00 -4.5253788365526782e+02 4.5961679266155716e+02 8.0182262397111174e+01 3 0 0 -7 0 -V -6 0 0 0 0 0 0 1 0 -P 9 22 6.1062538570560743e-01 4.7283777698592582e+00 -5.7841992636145454e+00 7.4958242253514982e+00 0 1 0 0 0 0 -V -7 0 0 0 0 0 0 1 0 -P 10 -24 2.4764319374549677e+00 -4.6617630836504320e+00 -4.5253788365526782e+02 4.5961679266155716e+02 8.0182262397111174e+01 2 0 0 -8 0 -V -8 0 0 0 0 0 0 2 0 -P 11 13 1.1665477362123605e+01 3.4513182507826755e+01 -2.8476888728061687e+02 2.8708983516659214e+02 1.0566000000000000e-01 1 0 0 0 0 -P 12 -14 -9.1890454246686382e+00 -3.9174945591477190e+01 -1.6776899637465104e+02 1.7252695749496510e+02 0 1 0 0 0 0 -V -9 0 0 0 0 0 0 1 0 -P 35 92 -2.0032313944742266e+00 7.5615402021948208e-01 6.5349473665193345e+03 6.5357068963898028e+03 9.9614093552669928e+01 2 0 0 -10 0 -V -10 0 0 0 0 0 0 9 0 -P 36 321 -2.7347780861062648e-01 1.7597531166764313e-01 9.6890202910053802e-01 1.1349755610206478e+00 4.9359999999999998e-01 1 0 0 0 0 -P 37 333 -1.1091211096030533e+00 1.4407005271255402e-01 2.4365019278869586e+00 2.8692745467802063e+00 1.0223937423264025e+00 2 0 0 -17 0 -P 38 -321 5.7487835922576980e-01 -1.6335008561432823e-01 3.0727085777785232e+00 3.1689662892385013e+00 4.9359999999999998e-01 1 0 0 0 0 -P 39 323 -4.9346996389094194e-01 1.1818828175705887e-01 1.1352455312350665e+01 1.1390232114301151e+01 7.7567062825092892e-01 2 0 0 -18 0 -P 40 333 4.6705005789470379e-02 -1.1036790308186785e-02 6.0989748896587884e+01 6.0998269072082245e+01 1.0183595401409025e+00 2 0 0 -19 0 -P 41 -313 6.6116839338003747e-02 2.0047724383885190e-01 1.0174249585391416e+02 1.0174747600392061e+02 9.8430077868461274e-01 2 0 0 -20 0 -P 42 -211 6.6195102743584266e-01 2.3352413161979789e-03 1.9139236560226081e+01 1.9151189010327013e+01 1.3957000000000000e-01 1 0 0 0 0 -P 43 213 -1.1330549383455299e+00 2.6772966756529654e-01 8.9903421865118207e+02 8.9903532297395714e+02 7.9382395898092395e-01 2 0 0 -21 0 -P 44 2112 -3.4375880581316148e-01 2.1765097284394738e-02 5.4362110987103097e+03 5.4362111908181760e+03 9.3957000000000002e-01 1 0 0 0 0 -V -11 0 0 0 0 0 5 1 0 -P 18 21 9.3397002995552358e-01 2.9110210203548919e+00 1.9719566949430803e+01 1.9955141294184987e+01 0 2 0 0 -11 0 -P 19 21 -2.1357165232265416e+00 4.1733949000175592e+00 -2.5122523216850832e+00 5.3188271063165358e+00 0 2 0 0 -11 0 -P 20 21 2.1357165232265416e+00 -4.1733949000175592e+00 -7.2379746050422105e+00 8.6236179438975249e+00 0 2 0 0 -11 0 -P 21 21 2.6814323415953143e+00 -1.7234320325764891e+00 -3.0705360378789067e+01 3.0870365293672400e+01 0 2 0 0 -11 0 -P 22 21 -2.6814323415953143e+00 1.7234320325764891e+00 -1.0476850460974710e+02 1.0481698266758141e+02 0 2 0 0 -11 0 -P 45 92 -1.4985589873352057e-01 2.0882523139261866e+00 -6.4263147483284502e+03 6.6115068849940917e+03 1.5538653939405463e+03 2 0 0 -12 0 -V -12 0 0 0 0 0 0 44 0 -P 46 211 1.3949741497349764e+00 -8.1413890613658435e-01 3.1237954613440834e+01 3.1279994617218282e+01 1.3957000000000000e-01 1 0 0 0 0 -P 47 113 6.8753804353602468e-02 -1.4130704072596839e-01 2.6547465088091574e+01 2.6560329224240288e+01 8.1147466457031847e-01 2 0 0 -22 0 -P 48 -211 -3.3705321336487631e-01 -1.6764450883023393e-01 9.4322808686628328e+00 9.4408215596006979e+00 1.3957000000000000e-01 1 0 0 0 0 -P 49 113 5.9981396172818402e-01 -2.6687872216516484e-01 2.2150499557325571e+00 2.4423648313647601e+00 7.9227433510622125e-01 2 0 0 -23 0 -P 50 323 -3.0748077012799063e-01 -6.1187613112430157e-02 -1.4211926385251549e-02 9.7630268316421653e-01 9.2448721046057525e-01 2 0 0 -24 0 -P 51 -313 1.4293786442054000e-02 4.6772668279335211e-01 -3.8804113875347573e-01 1.1164769507355792e+00 9.3646798879139526e-01 2 0 0 -25 0 -P 52 111 8.0828878413878216e-02 -1.3461691433235596e-02 -7.1537625213290668e-01 7.3259627847649700e-01 1.3497999999999999e-01 2 0 0 -26 0 -P 53 113 -2.3019258837112086e-01 1.4760214205834568e-01 -1.6237023486867372e+00 1.8378775046348748e+00 8.1646150235689630e-01 2 0 0 -27 0 -P 54 223 3.6047327332852880e-01 7.5799280465086738e-01 8.7170208350794642e-01 1.4416890830588578e+00 7.8365095363453574e-01 2 0 0 -28 0 -P 55 113 1.2071093866836292e-01 1.1591242726102904e-01 9.8276244825033521e-01 1.2590091097043403e+00 7.6894413784082705e-01 2 0 0 -29 0 -P 56 -213 8.6853791013771414e-02 1.0081227171470937e+00 7.4151556572422583e+00 7.5162670018422455e+00 6.9705181156703200e-01 2 0 0 -30 0 -P 57 323 1.7595879809624551e-01 4.2346453954444735e-01 1.9254698599629185e+00 2.1644899849972110e+00 8.7595604835439056e-01 2 0 0 -31 0 -P 58 -321 1.9281037659969705e-01 1.9746412913081476e-01 6.1305191305880840e+00 6.1565472217895207e+00 4.9359999999999998e-01 1 0 0 0 0 -P 59 223 -2.6288378130564161e-01 7.8988896286242360e-01 6.4711248501236418e-01 1.3136617569823170e+00 7.8353059121744273e-01 2 0 0 -32 0 -P 60 213 1.3477705105748747e-01 1.0791582261049506e+00 5.7410962076755911e-01 1.3686690060033124e+00 6.0075424332623606e-01 2 0 0 -33 0 -P 61 -211 -1.0477191658271894e+00 1.1109784504404854e+00 -1.2067512533016968e-01 1.5381907679342692e+00 1.3957000000000000e-01 1 0 0 0 0 -P 62 213 -9.0771555535794080e-02 5.8156740475700852e-01 -1.5429989954783372e+00 1.7635958777355596e+00 6.1884117376634729e-01 2 0 0 -34 0 -P 63 221 1.9394945996907104e-01 -2.7378498648517408e-01 -2.6641812525406994e-01 6.9516525503715665e-01 5.4744999999999999e-01 2 0 0 -35 0 -P 64 -213 2.3145858795471871e-01 2.7432639064021358e-01 -1.3070279086378056e+00 1.5830182128523671e+00 8.1779989100299288e-01 2 0 0 -36 0 -P 65 213 -4.5215145872547829e-01 2.8618967307221177e-01 -1.2291118677569723e+00 1.5726626222361686e+00 8.2231762070197112e-01 2 0 0 -37 0 -P 66 2114 9.5337951957865841e-01 -6.6930286811799566e-01 -3.0888059546382411e+00 3.5274937030638558e+00 1.2432179061304942e+00 2 0 0 -38 0 -P 67 211 -1.3638801371095294e-01 -6.4982930487435098e-01 -8.8570463039764313e-01 1.1157205263708860e+00 1.3957000000000000e-01 1 0 0 0 0 -P 68 -2212 8.4949812677802405e-01 -2.0925593127370514e+00 -5.2863706614781849e+00 5.8246473634168812e+00 9.3827000000000005e-01 1 0 0 0 0 -P 69 -211 1.1996322072747415e-01 2.3947821917494630e-01 -1.0577767107781229e+00 1.1000510654288269e+00 1.3957000000000000e-01 1 0 0 0 0 -P 70 323 1.4839074584839513e+00 -9.6300995788224397e-01 -1.5468440231889129e+01 1.5599973376532240e+01 9.7834381311676155e-01 2 0 0 -39 0 -P 71 -321 -2.7807528173586266e-01 3.2958209552231060e-01 -8.8436515986138815e+00 8.8679064484052397e+00 4.9359999999999998e-01 1 0 0 0 0 -P 72 213 4.8061490063831430e-01 -1.4112979134958886e-01 -1.3685006725010053e+01 1.3716801676932008e+01 7.8761086838132732e-01 2 0 0 -40 0 -P 73 111 -6.6907029234828486e-01 1.7831713785343023e-01 -1.8676644255472887e+01 1.8689962875930050e+01 1.3497999999999999e-01 2 0 0 -41 0 -P 74 -213 -3.4452308143729315e-01 -1.7121136884034183e-01 -1.7652850045181019e+01 1.7672257910595317e+01 7.3319537265859602e-01 2 0 0 -42 0 -P 75 2212 -3.9310532187388653e-01 8.2724580957524885e-02 -3.9775536449638281e+01 3.9788629350604467e+01 9.3827000000000005e-01 1 0 0 0 0 -P 76 -2212 -6.6472940215998422e-01 6.9112739079230504e-02 -2.6053725752692522e+01 2.6079179778862152e+01 9.3827000000000005e-01 1 0 0 0 0 -P 77 3224 -4.0748859480073829e-01 -1.6567442175761489e+00 -3.4492491111585458e+01 3.4561985780104671e+01 1.3740704581611196e+00 2 0 0 -43 0 -P 78 311 -2.7836629784373346e-01 5.3322922791229938e-02 -1.9006813991509159e+01 1.9015440690833291e+01 4.9767000000000000e-01 2 0 0 -44 0 -P 79 -2112 -1.8554501644645200e+00 2.6350454241754517e-01 -6.6852567158069846e+01 6.6885429335288151e+01 9.3957000000000002e-01 1 0 0 0 0 -P 80 -211 -4.2046149174458702e-01 -6.9882022956308021e-02 -4.4649768696748026e+01 4.4652021184053616e+01 1.3957000000000000e-01 1 0 0 0 0 -P 81 211 -1.2259199970940475e+00 5.3487296324306122e-01 -3.4837579454291500e+01 3.4863525222574047e+01 1.3957000000000000e-01 1 0 0 0 0 -P 82 311 -1.7383101241416014e-02 2.3283172203271379e-01 -6.0426993477096801e+01 6.0429493865934312e+01 4.9767000000000000e-01 2 0 0 -45 0 -P 83 -323 -5.6275410327378561e-01 -7.3372721057032519e-02 -1.4782442541338469e+02 1.4782894973592141e+02 1.0077477319741224e+00 2 0 0 -46 0 -P 84 211 -1.3376613799881737e-01 -9.1221013772773460e-02 -7.1076645245746004e+00 7.1108782461679887e+00 1.3957000000000000e-01 1 0 0 0 0 -P 85 113 1.7962314176801067e-02 8.3402302003156015e-01 -6.4704726517325719e+02 6.4704829538644378e+02 7.9829647914481627e-01 2 0 0 -47 0 -P 86 -211 2.6669980751781586e-01 -2.7900006105441300e-01 -5.1992006516225081e+02 5.1992022715790301e+02 1.3957000000000000e-01 1 0 0 0 0 -P 87 213 3.4004774827278034e-01 1.9424841399564963e-01 -1.0234108895905553e+03 1.0234111585835141e+03 6.3025058636637177e-01 2 0 0 -48 0 -P 88 2214 5.6694851511787103e-01 9.8756119003734349e-02 -8.8006311174153848e+02 8.8006411796473139e+02 1.1999572706375610e+00 2 0 0 -49 0 -P 89 223 1.2311994476002099e+00 3.3274939646704554e-01 -2.8709726179406398e+03 2.8709730082148681e+03 7.8381066483662754e-01 2 0 0 -50 0 -V -13 0 0 0 0 0 3 1 0 -P 31 21 -9.3397002995552358e-01 -2.9110210203548919e+00 1.0151020105427864e+02 1.0155622709355579e+02 0 2 0 0 -13 0 -P 32 21 3.0018432040494889e+00 -2.3510280488458859e+00 2.9747792961823656e+01 2.9991158390560429e+01 0 2 0 0 -13 0 -P 30 21 -3.0018432040494889e+00 2.3510280488458859e+00 2.3572952493951814e+02 2.3576035994992682e+02 0 2 0 0 -13 0 -P 90 92 -9.3397002995552336e-01 -2.9110210203548919e+00 3.6698751895562049e+02 3.6730774543404306e+02 1.5026458106954815e+01 2 0 0 -14 0 -V -14 0 0 0 0 0 0 11 0 -P 91 211 -8.2406320068481598e-01 -1.4474846551483079e-02 1.5925371343061592e+01 1.5947295127362915e+01 1.3957000000000000e-01 1 0 0 0 0 -P 92 -211 -1.2971269419881442e+00 8.9201364509882908e-01 8.3237290846445731e+01 8.3252293024801261e+01 1.3957000000000000e-01 1 0 0 0 0 -P 93 -311 -2.0800376351271022e-02 -2.1447848449823942e-01 2.1067216961652552e+01 2.1074196060922706e+01 4.9767000000000000e-01 2 0 0 -51 0 -P 94 313 -3.6169721163227725e-01 5.4167305000773069e-01 5.0328382832671906e+01 5.0338889823024189e+01 7.9591173918767333e-01 2 0 0 -52 0 -P 95 213 -8.9383792146133589e-01 -3.4747707496988950e-01 5.5172517965309702e+01 5.5185392155323349e+01 7.0787156810377283e-01 2 0 0 -53 0 -P 96 113 -1.2750819481863768e-01 -1.5623904654280926e-01 3.4052323819224185e+01 3.4060522483400433e+01 7.1955915219897681e-01 2 0 0 -54 0 -P 97 -211 -5.7174412643767436e-01 -9.4910638921379709e-01 3.9932536181067732e+01 3.9948149142624189e+01 1.3957000000000000e-01 1 0 0 0 0 -P 98 111 4.2301035938398712e-01 -2.4488475692500022e-01 3.0794121251526874e+00 3.1208820780762889e+00 1.3497999999999999e-01 2 0 0 -55 0 -P 99 -2112 1.1392327237977038e+00 -1.4946995580917366e+00 2.4907483094827445e+01 2.4995949349283496e+01 9.3957000000000002e-01 1 0 0 0 0 -P 100 2112 5.3941297703374469e-01 -8.0160103815638795e-01 1.3991639212989071e+01 1.4056396772840444e+01 9.3957000000000002e-01 1 0 0 0 0 -P 101 223 1.0611518832031974e+00 -1.2174652051210852e-01 2.5293344573217894e+01 2.5327779416383844e+01 7.7605729877600649e-01 2 0 0 -56 0 -V -15 0 0 0 0 0 2 1 0 -P 33 21 1.0190408349472695e+00 -2.8843457133167565e+00 -9.8491291741771736e+00 1.0313255543563667e+01 0 2 0 0 -15 0 -P 34 21 -1.0190408349472695e+00 2.8843457133167565e+00 -7.4489250551266313e+00 8.0526007534281785e+00 0 2 0 0 -15 0 -P 102 92 0 0 -1.7298054229303805e+01 1.8365856296991847e+01 6.1710612865065464e+00 2 0 0 -16 0 -V -16 0 0 0 0 0 0 7 0 -P 103 113 2.5426454423078015e-01 -1.2821686593910947e-01 -3.6908260328296461e+00 3.7716166626566090e+00 7.2236100548951021e-01 2 0 0 -57 0 -P 104 223 -7.8492867790755053e-02 4.3394394227840256e-02 -9.8224104521300815e-01 1.2585985464264791e+00 7.8181111940243286e-01 2 0 0 -58 0 -P 105 213 1.7802555916136972e-01 3.2682068270571213e-01 -2.6219971626667316e+00 2.7700960092936304e+00 8.1243948778549657e-01 2 0 0 -59 0 -P 106 111 1.9399017214205891e-01 -8.3030313783991927e-01 -1.7838453636238722e+00 1.9817566372581945e+00 1.3497999999999999e-01 2 0 0 -60 0 -P 107 -211 -2.8807161077252330e-01 5.2270945259205381e-01 -3.1028538235201237e+00 3.1628139464400387e+00 1.3957000000000000e-01 1 0 0 0 0 -P 108 223 2.5327277586763380e-01 -1.3809611761063298e-01 -2.5208029155085732e+00 2.6552334264970665e+00 7.8268740481497745e-01 2 0 0 -61 0 -P 109 113 -5.1298857283856425e-01 2.0369159186405553e-01 -2.5954878859418495e+00 2.7657410684198265e+00 7.7981969134800333e-01 2 0 0 -62 0 -V -17 0 0 0 0 0 0 2 0 -P 110 321 -5.3517797822608215e-01 -4.1546823888825380e-03 1.3908700471651065e+00 1.5699022829032940e+00 4.9359999999999998e-01 1 0 0 0 0 -P 111 -321 -5.7394313137697117e-01 1.4822473510143655e-01 1.0456318807218525e+00 1.2993722638769123e+00 4.9359999999999998e-01 1 0 0 0 0 -V -18 0 0 0 0 0 0 2 0 -P 112 311 -1.6481661079814763e-01 7.9549466215372497e-02 8.2576997208588896e+00 8.2747068069837457e+00 4.9767000000000000e-01 2 0 0 -63 0 -P 113 211 -3.2865335309279431e-01 3.8638815541686355e-02 3.0947555914917761e+00 3.1155253073174056e+00 1.3957000000000000e-01 1 0 0 0 0 -V -19 0 0 0 0 0 0 2 0 -P 114 321 -8.9052577900346819e-02 3.8384145837852435e-02 3.2135901794444422e+01 3.2139838655576021e+01 4.9359999999999998e-01 1 0 0 0 0 -P 115 -321 1.3575758368981719e-01 -4.9420936146039221e-02 2.8853847102143465e+01 2.8858430416506227e+01 4.9359999999999998e-01 1 0 0 0 0 -V -20 0 0 0 0 0 0 2 0 -P 116 -311 -2.0774100376841340e-01 2.8253422511277831e-01 4.5249454551591235e+01 4.5253550076855042e+01 4.9767000000000000e-01 2 0 0 -64 0 -P 117 111 2.7385784310641714e-01 -8.2056981273926410e-02 5.6493041302322936e+01 5.6493925927065568e+01 1.3497999999999999e-01 2 0 0 -65 0 -V -21 0 0 0 0 0 0 2 0 -P 118 211 -1.0330625473694905e+00 4.3248162283071701e-01 6.3795354712657922e+02 6.3795454542604386e+02 1.3957000000000000e-01 1 0 0 0 0 -P 119 111 -9.9992390976039472e-02 -1.6475195526542039e-01 2.6108067152460302e+02 2.6108077754791344e+02 1.3497999999999999e-01 2 0 0 -66 0 -V -22 0 0 0 0 0 0 2 0 -P 120 -211 2.5499953205520359e-01 -1.0027654595046133e-02 2.3322262674548515e+01 2.3324076431034285e+01 1.3957000000000000e-01 1 0 0 0 0 -P 121 211 -1.8624572770160111e-01 -1.3127938613092227e-01 3.2252024135430615e+00 3.2362527932060021e+00 1.3957000000000000e-01 1 0 0 0 0 -V -23 0 0 0 0 0 0 2 0 -P 122 211 7.6228828054477105e-01 -2.1517928961636448e-01 1.6414979312633347e+00 1.8279444172560420e+00 1.3957000000000000e-01 1 0 0 0 0 -P 123 -211 -1.6247431881658703e-01 -5.1699432548800363e-02 5.7355202446922249e-01 6.1442041410871839e-01 1.3957000000000000e-01 1 0 0 0 0 -V -24 0 0 0 0 0 0 2 0 -P 124 311 -4.4770508064804587e-01 -2.2677035333779219e-01 -7.6463961108518649e-02 7.1090561865793589e-01 4.9767000000000000e-01 2 0 0 -67 0 -P 125 211 1.4022431052005524e-01 1.6558274022536204e-01 6.2252034723267097e-02 2.6539706450628059e-01 1.3957000000000000e-01 1 0 0 0 0 -V -25 0 0 0 0 0 0 2 0 -P 126 -321 -2.5986605631982164e-02 2.9198614472084311e-01 9.5408561624206661e-02 5.8195787305647173e-01 4.9359999999999998e-01 1 0 0 0 0 -P 127 211 4.0280392074036164e-02 1.7574053807250894e-01 -4.8344970037768237e-01 5.3451907767910722e-01 1.3957000000000000e-01 1 0 0 0 0 -V -26 0 4.6370571701477952e-05 -7.7228131835718235e-06 -4.1040289614321631e-04 4.2028182162054536e-04 0 2 0 -P 128 22 -1.6794961432842453e-02 2.2822192504643863e-02 -3.8769689788982341e-02 4.8020954244825338e-02 0 1 0 0 0 0 -P 129 22 9.7623839846720670e-02 -3.6283883937879464e-02 -6.7660656234392436e-01 6.8457532423167167e-01 0 1 0 0 0 0 -V -27 0 0 0 0 0 0 2 0 -P 130 -211 -8.0905401518794953e-02 2.9454613008823682e-01 -1.9743357093526082e-01 3.8956758922826545e-01 1.3957000000000000e-01 1 0 0 0 0 -P 131 211 -1.4928718685232592e-01 -1.4694398802989114e-01 -1.4262687777514764e+00 1.4483099154066095e+00 1.3957000000000000e-01 1 0 0 0 0 -V -28 0 0 0 0 0 0 3 0 -P 132 211 1.9697316487609509e-01 3.5057333972336180e-01 6.7516622935079007e-01 7.9814116317971096e-01 1.3957000000000000e-01 1 0 0 0 0 -P 133 -211 -3.8819295397041619e-02 1.4724962955523235e-01 1.9980284787495695e-01 2.8738537544248732e-01 1.3957000000000000e-01 1 0 0 0 0 -P 134 111 2.0231940384947528e-01 2.6016983537227312e-01 -3.2669937178005843e-03 3.5616254443665946e-01 1.3497999999999999e-01 2 0 0 -68 0 -V -29 0 0 0 0 0 0 2 0 -P 135 -211 1.1488257758393901e-01 2.7148426262030395e-01 9.9743688408424791e-01 1.0494102315655771e+00 1.3957000000000000e-01 1 0 0 0 0 -P 136 211 5.8283610844239242e-03 -1.5557183535927488e-01 -1.4674435833912692e-02 2.0959887813876332e-01 1.3957000000000000e-01 1 0 0 0 0 -V -30 0 0 0 0 0 0 2 0 -P 137 -211 -8.4860032327779208e-03 1.2798646073174491e-01 3.8322629520223433e-01 4.2754499718268074e-01 1.3957000000000000e-01 1 0 0 0 0 -P 138 111 9.5339794246549328e-02 8.8013625641534876e-01 7.0319293620400245e+00 7.0887220046595649e+00 1.3497999999999999e-01 2 0 0 -69 0 -V -31 0 0 0 0 0 0 2 0 -P 139 311 6.6329685576106023e-02 5.2124166663591132e-01 1.7596312276628496e+00 1.9026481515225586e+00 4.9767000000000000e-01 2 0 0 -70 0 -P 140 211 1.0962911252013950e-01 -9.7777127091463953e-02 1.6583863230006918e-01 2.6184183347465939e-01 1.3957000000000000e-01 1 0 0 0 0 -V -32 0 0 0 0 0 0 3 0 -P 141 211 -1.8053057003619555e-01 4.4658535224822332e-01 1.2486955297486922e-01 5.1681907251997494e-01 1.3957000000000000e-01 1 0 0 0 0 -P 142 -211 -2.2545152457920553e-01 2.9947362949028894e-01 3.5940892111084544e-01 5.3774287737657378e-01 1.3957000000000000e-01 1 0 0 0 0 -P 143 111 1.4309831330975950e-01 4.3829981123911323e-02 1.6283401092664959e-01 2.5909980708576519e-01 1.3497999999999999e-01 2 0 0 -71 0 -V -33 0 0 0 0 0 0 2 0 -P 144 211 6.6134181730062705e-02 1.0799589201098942e+00 4.9977866601512050e-01 1.1999764576948531e+00 1.3957000000000000e-01 1 0 0 0 0 -P 145 111 6.8642869327424763e-02 -8.0069400494364870e-04 7.4330954752438616e-02 1.6869254830845534e-01 1.3497999999999999e-01 2 0 0 -72 0 -V -34 0 0 0 0 0 0 2 0 -P 146 211 -4.0874140835117249e-02 -5.3240879661743137e-02 -5.8665739429170261e-01 6.0675528002094503e-01 1.3957000000000000e-01 1 0 0 0 0 -P 147 111 -4.9897414700676830e-02 6.3480828441875170e-01 -9.5634160118663458e-01 1.1568405977146143e+00 1.3497999999999999e-01 2 0 0 -73 0 -V -35 0 0 0 0 0 0 3 0 -P 148 111 -8.0692078035366516e-02 -5.7579150443156604e-02 -3.2542865426087308e-02 1.7060248683287640e-01 1.3497999999999999e-01 2 0 0 -74 0 -P 149 111 2.0056546976702694e-01 -6.3971292668162691e-02 -9.6007889896875975e-02 2.6787300959774685e-01 1.3497999999999999e-01 2 0 0 -75 0 -P 150 111 7.4076068237410586e-02 -1.5223454337385475e-01 -1.3786736993110663e-01 2.5668975860653298e-01 1.3497999999999999e-01 2 0 0 -76 0 -V -36 0 0 0 0 0 0 2 0 -P 151 -211 4.3518580826092879e-01 4.0714118730605248e-01 -8.3812731381468930e-01 1.0378284122025792e+00 1.3957000000000000e-01 1 0 0 0 0 -P 152 111 -2.0372722030621004e-01 -1.3281479666583887e-01 -4.6890059482311636e-01 5.4518980064978795e-01 1.3497999999999999e-01 2 0 0 -77 0 -V -37 0 0 0 0 0 0 2 0 -P 153 211 -1.1547174774767054e-01 -2.6117390082266756e-01 -4.8927985529292894e-01 5.8345530479574848e-01 1.3957000000000000e-01 1 0 0 0 0 -P 154 111 -3.3667971097780769e-01 5.4736357389487933e-01 -7.3983201246404340e-01 9.8920731744041990e-01 1.3497999999999999e-01 2 0 0 -78 0 -V -38 0 0 0 0 0 0 2 0 -P 155 2212 6.0433317807337594e-01 -7.1283905966837302e-01 -2.4506791222575126e+00 2.7855945268969080e+00 9.3827000000000005e-01 1 0 0 0 0 -P 156 -211 3.4904634150528252e-01 4.3536191550377301e-02 -6.3812683238072887e-01 7.4189917616694812e-01 1.3957000000000000e-01 1 0 0 0 0 -V -39 0 0 0 0 0 0 2 0 -P 157 311 5.3882428291032602e-01 -2.9867949202148447e-01 -4.4165576592752496e+00 4.4870032352797464e+00 4.9767000000000000e-01 2 0 0 -79 0 -P 158 211 9.4508317557362542e-01 -6.6433046586075961e-01 -1.1051882572613879e+01 1.1112970141252495e+01 1.3957000000000000e-01 1 0 0 0 0 -V -40 0 0 0 0 0 0 2 0 -P 160 111 4.8049692547880568e-01 2.1718022336522114e-01 -7.3403587397017889e+00 7.3605115700426689e+00 1.3497999999999999e-01 2 0 0 -80 0 -P 159 211 1.1797515950852807e-04 -3.5831001471481000e-01 -6.3446479853082618e+00 6.3562901068893360e+00 1.3957000000000000e-01 1 0 0 0 0 -V -41 0 -1.1583593514972181e-04 3.0871991557086950e-05 -3.2334817096694663e-03 3.2357875583571205e-03 0 2 0 -P 161 22 -5.0398876263600001e-01 7.9556733552219663e-02 -1.2778281559309137e+01 1.2788464081182569e+01 0 1 0 0 0 0 -P 162 22 -1.6508152971228482e-01 9.8760404301210553e-02 -5.8983626961637485e+00 5.9014987947474795e+00 0 1 0 0 0 0 -V -42 0 0 0 0 0 0 2 0 -P 163 -211 1.3279309858393523e-01 1.2066647820448219e-01 -7.1877811768646929e+00 7.1913748641955930e+00 1.3957000000000000e-01 1 0 0 0 0 -P 164 111 -4.7731618002122833e-01 -2.9187784704482400e-01 -1.0465068868316324e+01 1.0480883046399720e+01 1.3497999999999999e-01 2 0 0 -81 0 -V -43 0 0 0 0 0 0 2 0 -P 165 3122 -4.6866358421255944e-01 -1.6184680144817571e+00 -3.0858384900186707e+01 3.0924484551557821e+01 1.1156800000000000e+00 2 0 0 -82 0 -P 166 211 6.1174989411821111e-02 -3.8276203094391698e-02 -3.6341062113987506e+00 3.6375012285468498e+00 1.3957000000000000e-01 1 0 0 0 0 -V -44 0 0 0 0 0 0 1 0 -P 167 130 -2.7836629784373346e-01 5.3322922791229938e-02 -1.9006813991509159e+01 1.9015440690833294e+01 4.9767000000000000e-01 1 0 0 0 0 -V -45 0 0 0 0 0 0 1 0 -P 168 310 -1.7383101241416014e-02 2.3283172203271379e-01 -6.0426993477096801e+01 6.0429493865934312e+01 4.9767000000000000e-01 2 0 0 -83 0 -V -46 0 0 0 0 0 0 2 0 -P 169 -311 -5.4517775501888455e-01 2.5850199343546754e-01 -8.9865234716413994e+01 8.9868638178901193e+01 4.9767000000000000e-01 2 0 0 -84 0 -P 170 -211 -1.7576348254901095e-02 -3.3187471449250006e-01 -5.7959190696970708e+01 5.7960311557020233e+01 1.3957000000000000e-01 1 0 0 0 0 -V -47 0 0 0 0 0 0 2 0 -P 171 211 9.2955499979074457e-02 -1.0866822487967489e-02 -3.2945012188350809e+01 3.2945440757232113e+01 1.3957000000000000e-01 1 0 0 0 0 -P 172 -211 -7.4993185802273390e-02 8.4488984251952770e-01 -6.1410225298490639e+02 6.1410285462921172e+02 1.3957000000000000e-01 1 0 0 0 0 -V -48 0 0 0 0 0 0 2 0 -P 173 211 8.5949161239965377e-02 3.4709531138046762e-01 -6.9899167123526638e+02 6.9899177663150601e+02 1.3957000000000000e-01 1 0 0 0 0 -P 174 111 2.5409858703281496e-01 -1.5284689738481802e-01 -3.2441921835528876e+02 3.2441938195200805e+02 1.3497999999999999e-01 2 0 0 -85 0 -V -49 0 0 0 0 0 0 2 0 -P 175 2212 3.8253495145818550e-01 1.6289928814342811e-01 -5.7652974840092349e+02 5.7653066181339580e+02 9.3827000000000005e-01 1 0 0 0 0 -P 176 111 1.8441356365968553e-01 -6.4143169139693756e-02 -3.0353336334061498e+02 3.0353345615133566e+02 1.3497999999999999e-01 2 0 0 -86 0 -V -50 0 0 0 0 0 0 3 0 -P 177 211 5.3333410812648374e-01 7.4617552270279233e-02 -1.0059322469405662e+03 1.0059324007743916e+03 1.3957000000000000e-01 1 0 0 0 0 -P 178 -211 3.9966223398528372e-01 -1.6207176715030084e-02 -1.3243593232465137e+03 1.3243593910046934e+03 1.3957000000000000e-01 1 0 0 0 0 -P 179 111 2.9820310548844248e-01 2.7433902091179635e-01 -5.4068104775355994e+02 5.4068121643578320e+02 1.3497999999999999e-01 2 0 0 -87 0 -V -51 0 0 0 0 0 0 1 0 -P 180 130 -2.0800376351271022e-02 -2.1447848449823942e-01 2.1067216961652552e+01 2.1074196060922702e+01 4.9767000000000000e-01 1 0 0 0 0 -V -52 0 0 0 0 0 0 2 0 -P 181 321 -3.8962671843311852e-01 2.0566888018468360e-01 3.0940913755190643e+01 3.0947986907618706e+01 4.9359999999999998e-01 1 0 0 0 0 -P 182 -211 2.7929506800841261e-02 3.3600416982304704e-01 1.9387469077481260e+01 1.9390902915405476e+01 1.3957000000000000e-01 1 0 0 0 0 -V -53 0 0 0 0 0 0 2 0 -P 183 211 -8.9120775201636582e-01 -1.8208840020122474e-01 3.6286732442122407e+01 3.6298399944816033e+01 1.3957000000000000e-01 1 0 0 0 0 -P 184 111 -2.6301694449702272e-03 -1.6538867476866476e-01 1.8885785523187302e+01 1.8886992210507319e+01 1.3497999999999999e-01 2 0 0 -88 0 -V -54 0 0 0 0 0 0 2 0 -P 185 -211 -1.1987217934407324e-02 -3.3403146114971544e-01 2.8599290261216566e+01 2.8601583941115017e+01 1.3957000000000000e-01 1 0 0 0 0 -P 186 211 -1.1552097688423035e-01 1.7779241460690620e-01 5.4530335580076184e+00 5.4589385422854200e+00 1.3957000000000000e-01 1 0 0 0 0 -V -55 0 4.2254465579185501e-05 -2.4461515664588543e-05 3.0760219167180113e-04 3.1174462142442600e-04 0 2 0 -P 187 22 2.8751370315703634e-01 -9.5574760408875581e-02 1.6953251489157042e+00 1.7221864082834764e+00 0 1 0 0 0 0 -P 188 22 1.3549665622695076e-01 -1.4930999651612464e-01 1.3840869762369830e+00 1.3986956697928123e+00 0 1 0 0 0 0 -V -56 0 0 0 0 0 0 3 0 -P 189 211 5.0375258570605386e-01 -1.9695435251561838e-01 8.7561249240525978e+00 8.7739250712036227e+00 1.3957000000000000e-01 1 0 0 0 0 -P 190 -211 2.5412965478975740e-02 -9.0827288189110802e-02 3.8528483651797676e+00 3.8565289737097310e+00 1.3957000000000000e-01 1 0 0 0 0 -P 191 111 5.3198633201816781e-01 1.6603512019262065e-01 1.2684371283985527e+01 1.2697325371470487e+01 1.3497999999999999e-01 2 0 0 -89 0 -V -57 0 0 0 0 0 0 2 0 -P 192 -211 -1.7141939419169341e-01 -5.6722519524079404e-02 -2.2381290066936166e+00 2.2497340483776216e+00 1.3957000000000000e-01 1 0 0 0 0 -P 193 211 4.2568393842247360e-01 -7.1494346415030066e-02 -1.4526970261360295e+00 1.5218826142789872e+00 1.3957000000000000e-01 1 0 0 0 0 -V -58 0 0 0 0 0 0 3 0 -P 194 -211 7.6459071874841397e-02 -8.7541130858253866e-02 -7.8342648501977918e-01 8.0420537277137760e-01 1.3957000000000000e-01 1 0 0 0 0 -P 195 211 -1.9416584560678463e-01 1.2013959035912780e-01 -1.3157418602565010e-01 2.9820370235825233e-01 1.3957000000000000e-01 1 0 0 0 0 -P 196 111 3.9213905941188162e-02 1.0795934726966315e-02 -6.7240374167578831e-02 1.5618947129684915e-01 1.3497999999999999e-01 2 0 0 -90 0 -V -59 0 0 0 0 0 0 2 0 -P 197 211 -2.8016474706981570e-01 2.5051985090551032e-01 -1.3859234437513488e+00 1.4427460130036787e+00 1.3957000000000000e-01 1 0 0 0 0 -P 198 111 4.5819030623118540e-01 7.6300831800201821e-02 -1.2360737189153828e+00 1.3273499962899518e+00 1.3497999999999999e-01 2 0 0 -91 0 -V -60 0 9.8262426864790465e-05 -4.2057595215624915e-04 -9.0357657115137360e-04 1.0038251653789662e-03 0 2 0 -P 199 22 1.0753811039473163e-01 -5.8421054425128616e-01 -1.1054519305528825e+00 1.2549463637800418e+00 0 1 0 0 0 0 -P 200 22 8.6452061747327294e-02 -2.4609259358863311e-01 -6.7839343307098976e-01 7.2681027347815286e-01 0 1 0 0 0 0 -V -61 0 0 0 0 0 0 3 0 -P 201 -211 -4.1923779688965344e-02 9.4741716713696952e-02 -3.1625212825159438e-01 3.6087226232135133e-01 1.3957000000000000e-01 1 0 0 0 0 -P 202 211 1.2543443318519545e-01 2.9266802084010526e-02 -2.6988866705562498e-01 3.3001518182922718e-01 1.3957000000000000e-01 1 0 0 0 0 -P 203 111 1.6976212237140365e-01 -2.6210463640834042e-01 -1.9346621202013536e+00 1.9643459823464879e+00 1.3497999999999999e-01 2 0 0 -92 0 -V -62 0 0 0 0 0 0 2 0 -P 204 211 -6.2798117767117945e-01 1.3395368585235701e-01 -1.3083434892807686e+00 1.4640855235627768e+00 1.3957000000000000e-01 1 0 0 0 0 -P 205 -211 1.1499260483261517e-01 6.9737906011698547e-02 -1.2871443966610814e+00 1.3016555448570508e+00 1.3957000000000000e-01 1 0 0 0 0 -V -63 0 0 0 0 0 0 1 0 -P 206 310 -1.6481661079814763e-01 7.9549466215372497e-02 8.2576997208588896e+00 8.2747068069837439e+00 4.9767000000000000e-01 2 0 0 -93 0 -V -64 0 0 0 0 0 0 1 0 -P 207 310 -2.0774100376841340e-01 2.8253422511277831e-01 4.5249454551591235e+01 4.5253550076855049e+01 4.9767000000000000e-01 2 0 0 -94 0 -V -65 0 7.3754023811518823e-05 -2.2099175550823247e-05 1.5214423169825254e-02 1.5214661412533925e-02 0 2 0 -P 208 22 3.2723447556854225e-02 -6.3493276229220436e-02 1.6358826635059781e+01 1.6358982581324781e+01 0 1 0 0 0 0 -P 209 22 2.4113439554956292e-01 -1.8563705044705985e-02 4.0134214667263159e+01 4.0134943345740787e+01 0 1 0 0 0 0 -V -66 0 -2.4091747932102252e-05 -3.9694646150891612e-05 6.2903683639507407e-02 6.2903709184319812e-02 0 2 0 -P 210 22 -3.5501503450890148e-02 -4.3221742365836700e-03 1.1206888944609352e+02 1.1206889515257420e+02 0 1 0 0 0 0 -P 211 22 -6.4490887525149324e-02 -1.6042978102883673e-01 1.4901178207850950e+02 1.4901188239533926e+02 0 1 0 0 0 0 -V -67 0 0 0 0 0 0 1 0 -P 212 310 -4.4770508064804587e-01 -2.2677035333779219e-01 -7.6463961108518649e-02 7.1090561865793789e-01 4.9767000000000000e-01 2 0 0 -95 0 -V -68 0 5.6216918348570056e-07 7.2291367578196445e-07 -9.0777412143587177e-09 9.8964114654623947e-07 0 2 0 -P 213 22 5.9588311079569842e-02 3.1727756685069239e-04 -3.4800397785193422e-03 5.9690687374414804e-02 0 1 0 0 0 0 -P 214 22 1.4273109276990548e-01 2.5985255780542243e-01 2.1304606071875768e-04 2.9647185706224466e-01 0 1 0 0 0 0 -V -69 0 6.8125667432656671e-05 6.2890706209118587e-04 5.0247106668746657e-03 5.0652922174674346e-03 0 2 0 -P 215 22 9.8238845130149910e-02 6.3480873157616224e-01 5.4797247598160750e+00 5.5172471795016902e+00 0 1 0 0 0 0 -P 216 22 -2.8990508836005870e-03 2.4532752483918649e-01 1.5522046022239493e+00 1.5714748251578743e+00 0 1 0 0 0 0 -V -70 0 0 0 0 0 0 1 0 -P 217 310 6.6329685576106023e-02 5.2124166663591132e-01 1.7596312276628496e+00 1.9026481515225759e+00 4.9767000000000000e-01 2 0 0 -96 0 -V -71 0 2.0742689619148677e-05 6.3533362024919996e-06 2.3603460236328297e-05 3.7557583695116871e-05 0 2 0 -P 219 22 -2.8722140438245738e-03 5.3180710552864677e-02 2.8023708625927783e-02 6.0181108610361057e-02 0 1 0 0 0 0 -P 218 22 1.4597052735358410e-01 -9.3507294289533575e-03 1.3481030230072180e-01 1.9891869847540525e-01 0 1 0 0 0 0 -V -72 0 3.7626593470519508e-05 -4.3890047303515130e-07 4.0744517881454282e-05 9.2468831779623026e-05 0 2 0 -P 220 22 2.4209710898237435e-02 6.4530876697482267e-02 1.6755104325429430e-02 7.0930090018820904e-02 0 1 0 0 0 0 -P 221 22 4.4433158429187325e-02 -6.5331570702425915e-02 5.7575850427009183e-02 9.7762458289636103e-02 0 1 0 0 0 0 -V -73 0 -5.9090765758585417e-06 7.5176856078054691e-05 -1.1325427956519639e-04 1.3699827373751485e-04 0 2 0 -P 222 22 -6.9815720431071801e-02 2.1207143051907135e-01 -3.9649262793632423e-01 4.5503288943720027e-01 0 1 0 0 0 0 -P 223 22 1.9918305730394971e-02 4.2273685389968030e-01 -5.5984897325031024e-01 7.0180770827741401e-01 0 1 0 0 0 0 -V -74 0 -3.8400536521541616e-05 -2.7401330134324772e-05 -1.5486817575355602e-05 8.1187982585110302e-05 0 2 0 -P 224 22 -1.1199399900954692e-01 -6.3644204944269311e-02 -5.7287936449814218e-03 1.2894207891051448e-01 0 1 0 0 0 0 -P 225 22 3.1301920974180393e-02 6.0650545011126985e-03 -2.6814071781105887e-02 4.1660407922362044e-02 0 1 0 0 0 0 -V -75 0 4.3814671092180448e-07 -1.3974893838171328e-07 -2.0973471270863068e-07 5.8518387156228786e-07 0 2 0 -P 226 22 1.7806955474676234e-01 -9.4868783602879855e-02 -1.0662617316560713e-01 2.2820603242233170e-01 0 1 0 0 0 0 -P 227 22 2.2495915020264604e-02 3.0897490934717161e-02 1.0618283268731158e-02 3.9666977175415293e-02 0 1 0 0 0 0 -V -76 0 2.7804071585685933e-06 -5.7140453624173457e-06 -5.1747808895705093e-06 9.6347181936474378e-06 0 2 0 -P 228 22 2.0833233827278030e-02 -3.0122302260885887e-03 -8.8160895834764164e-02 9.0639068381273363e-02 0 1 0 0 0 0 -P 229 22 5.3242834410132556e-02 -1.4922231314776616e-01 -4.9706474096342455e-02 1.6605069022525973e-01 0 1 0 0 0 0 -V -77 0 -1.6175287979886273e-04 -1.0545068944792832e-04 -3.7229203558581531e-04 4.3286321857002722e-04 0 2 0 -P 230 22 -5.3478825919207371e-02 -1.0851873814833554e-01 -1.5766115696858526e-01 1.9872931783628903e-01 0 1 0 0 0 0 -P 231 22 -1.5024839438700266e-01 -2.4296058517503317e-02 -3.1123943785453106e-01 3.4646048281349889e-01 0 1 0 0 0 0 -V -78 0 -3.6620022303480086e-05 5.9535711926116886e-05 -8.0470143919802894e-05 1.0759422931137554e-04 0 2 0 -P 232 22 -2.1948986096420983e-01 4.4633454790483357e-01 -6.1110621067207616e-01 7.8793472346475779e-01 0 1 0 0 0 0 -P 233 22 -1.1718985001359787e-01 1.0102902599004575e-01 -1.2872580179196724e-01 2.0127259397566213e-01 0 1 0 0 0 0 -V -79 0 0 0 0 0 0 1 0 -P 234 130 5.3882428291032602e-01 -2.9867949202148447e-01 -4.4165576592752496e+00 4.4870032352797464e+00 4.9767000000000000e-01 1 0 0 0 0 -V -80 0 1.6108302389358591e-05 7.2808056107108974e-06 -2.4608007243264460e-04 2.4675568109509100e-04 0 2 0 -P 235 22 2.6570728735577170e-01 1.4441211255928108e-01 -3.3133962149639591e+00 3.3271684204658607e+00 0 1 0 0 0 0 -P 236 22 2.1478963812303389e-01 7.2768110805940062e-02 -4.0269625247378293e+00 4.0333431495768082e+00 0 1 0 0 0 0 -V -81 0 -3.4512069906198131e-05 -2.1104058657373751e-05 -7.5667074252636459e-04 7.5781417751216165e-04 0 2 0 -P 237 22 -1.8517356431284140e-01 -4.7137481113194234e-02 -2.9821525694305429e+00 2.9882679161024384e+00 0 1 0 0 0 0 -P 238 22 -2.9214261570838684e-01 -2.4474036593162976e-01 -7.4829162988857805e+00 7.4926151302972830e+00 0 1 0 0 0 0 -V -82 0 -9.5308150963195587e+01 -3.2913415731351159e+02 -6.2754088553496240e+03 6.2888509826317713e+03 0 2 0 -P 239 2212 -4.7367594868960872e-01 -1.4369308345140306e+00 -2.6150068211133135e+01 2.6210600091706407e+01 9.3827000000000005e-01 1 0 0 0 0 -P 240 -211 5.0123644770492803e-03 -1.8153717996772661e-01 -4.7083166890535697e+00 4.7138844598514140e+00 1.3957000000000000e-01 1 0 0 0 0 -V -83 0 -1.4864983960191469e+00 1.9910370223202563e+01 -5.1673534907541507e+03 5.1675673089874317e+03 0 2 0 -P 241 -211 -1.8400658600957862e-01 -3.3309345305199931e-04 -2.5499791367105406e+01 2.5500837203618424e+01 1.3957000000000000e-01 1 0 0 0 0 -P 242 211 1.6662348476816261e-01 2.3316481548576576e-01 -3.4927202109991391e+01 3.4928656662315888e+01 1.3957000000000000e-01 1 0 0 0 0 -V -84 0 0 0 0 0 0 1 0 -P 243 130 -5.4517775501888455e-01 2.5850199343546754e-01 -8.9865234716413994e+01 8.9868638178901193e+01 4.9767000000000000e-01 1 0 0 0 0 -V -85 0 5.7272233467841676e-06 -3.4450735417619763e-06 -7.3122064282472015e-03 7.3122101156150102e-03 0 2 0 -P 244 22 1.6319053796774280e-01 -5.8337248729609763e-02 -2.3911426643792683e+02 2.3911432924133621e+02 0 1 0 0 0 0 -P 245 22 9.0908049065072161e-02 -9.4509648655208264e-02 -8.5304951917361947e+01 8.5305052710671873e+01 0 1 0 0 0 0 -V -86 0 4.3353964989961207e-06 -1.5079480348632104e-06 -7.1357955165588264e-03 7.1357976984551316e-03 0 2 0 -P 246 22 3.5587885991872119e-02 -7.9942846660418745e-02 -1.1802533908101961e+02 1.1802537152047441e+02 0 1 0 0 0 0 -P 247 22 1.4882567766781341e-01 1.5799677520724986e-02 -1.8550802425959540e+02 1.8550808463086122e+02 0 1 0 0 0 0 -V -87 0 7.0770676303012794e-05 6.5107162497295579e-05 -1.2831644845235862e-01 1.2831648848465474e-01 0 2 0 -P 248 22 1.8114845821850648e-01 2.3989936867935877e-01 -4.1762092695334275e+02 4.1762103514530997e+02 0 1 0 0 0 0 -P 249 22 1.1705464726993600e-01 3.4439652232437577e-02 -1.2306012080021719e+02 1.2306018129047324e+02 0 1 0 0 0 0 -V -88 0 -6.2417076750674925e-07 -3.9248716946618685e-05 4.4818235066635065e-03 4.4821098680430417e-03 0 2 0 -P 250 22 -1.3241355407539917e-02 -1.0246241139417403e-02 2.5096339222582625e-01 2.5152125792467273e-01 0 1 0 0 0 0 -P 251 22 1.0611185962569689e-02 -1.5514243362924734e-01 1.8634822130961478e+01 1.8635470952582644e+01 0 1 0 0 0 0 -V -89 0 1.3582222174720734e-04 4.2390673510491999e-05 3.2384657002777202e-03 3.2417730276224663e-03 0 2 0 -P 252 22 1.8270933871487663e-01 1.0969751742799415e-01 5.7283206751857012e+00 5.7322834896351260e+00 0 1 0 0 0 0 -P 253 22 3.4927699330329121e-01 5.6337602764626502e-02 6.9560506087998260e+00 6.9650418818353623e+00 0 1 0 0 0 0 -V -90 0 3.5279272098553364e-05 9.7126952709604466e-06 -6.0493628454770447e-05 1.4051777614489206e-04 0 2 0 -P 254 22 7.6896925214123460e-02 3.5622213305934604e-02 -7.1477115362458474e-02 1.1086504051655867e-01 0 1 0 0 0 0 -P 255 22 -3.7683019272935298e-02 -2.4826278578968294e-02 4.2367411948796398e-03 4.5324430780290477e-02 0 1 0 0 0 0 -V -91 0 4.0801170434363689e-05 6.7944764440148752e-06 -1.1007054009880686e-04 1.1819855786593737e-04 0 2 0 -P 256 22 1.2083898222827490e-01 -3.9112841475455871e-02 -3.3967101043474301e-01 3.6264068900774049e-01 0 1 0 0 0 0 -P 257 22 3.3735132400291051e-01 1.1541367327565770e-01 -8.9640270848063985e-01 9.6470930728221138e-01 0 1 0 0 0 0 -V -92 0 5.6114899634550859e-06 -8.6638734014096062e-06 -6.3950290668699704e-05 6.4931491257954731e-05 0 3 0 -P 258 22 3.7763112644272664e-02 -1.9003168856709707e-02 -5.6880931194233830e-01 5.7037812585643310e-01 0 1 0 0 0 0 -P 259 11 1.2719536651632049e-01 -2.1827911800405031e-01 -1.2119610200457922e+00 1.2380122005983156e+00 5.1000000000000004e-04 1 0 0 0 0 -P 260 -11 4.8036432108104722e-03 -2.4822349547580416e-02 -1.5389178821322286e-01 1.5595565589173888e-01 5.1000000000000004e-04 1 0 0 0 0 -V -93 0 -1.4381524495815356e+01 6.9413064099863986e+00 7.2054819134743707e+02 7.2203219119746802e+02 0 2 0 -P 261 111 9.2014239650662466e-02 1.3215606270806735e-01 2.2548623593500721e+00 2.2646314722759553e+00 1.3497999999999999e-01 2 0 0 -97 0 -P 262 111 -2.5683085044881010e-01 -5.2606596492694856e-02 6.0028373615088171e+00 6.0100753347077882e+00 1.3497999999999999e-01 2 0 0 -98 0 -V -94 0 -7.7825606900085225e+00 1.0584524547671682e+01 1.6951714868486924e+03 1.6953249167125366e+03 0 2 0 -P 263 111 -2.8943395680254397e-01 1.5615697178674603e-01 3.6631605117101834e+01 3.6633330043429979e+01 1.3497999999999999e-01 2 0 0 -99 0 -P 264 111 8.1692953034130586e-02 1.2637725332603228e-01 8.6178494344894041e+00 8.6202200334250758e+00 1.3497999999999999e-01 2 0 0 -100 0 -V -95 0 -1.3657774741477642e+01 -6.9178987190624293e+00 -2.3326238673673467e+00 2.1687019472789341e+01 0 2 0 -P 265 211 -2.9529816783651242e-01 -9.1672761735730857e-02 1.5454665700808420e-01 3.7278594027166795e-01 1.3957000000000000e-01 1 0 0 0 0 -P 266 -211 -1.5240691281153346e-01 -1.3509759160206133e-01 -2.3101061811660287e-01 3.3811967838627000e-01 1.3957000000000000e-01 1 0 0 0 0 -V -96 0 5.5767429881696557e+00 4.3823979931555911e+01 1.4794297644263381e+02 1.5996728532329485e+02 0 2 0 -P 267 111 1.6009544349417862e-01 1.5482137875335267e-01 1.0998242066687225e+00 1.1302358587132031e+00 1.3497999999999999e-01 2 0 0 -101 0 -P 268 111 -9.3765757918072581e-02 3.6642028788255870e-01 6.5980702099412725e-01 7.7241229280937296e-01 1.3497999999999999e-01 2 0 0 -102 0 -V -97 0 -1.4381499058109947e+01 6.9413429450597066e+00 7.2054881471317537e+02 7.2203281726391674e+02 0 2 0 -P 269 22 1.6608090838720359e-02 -2.6977769960342162e-02 2.3862848367837755e-01 2.4072220914569153e-01 0 1 0 0 0 0 -P 270 22 7.5406148811942117e-02 1.5913383266840953e-01 2.0162338756716944e+00 2.0239092631302644e+00 0 1 0 0 0 0 -V -98 0 -1.4381537586881612e+01 6.9413037285466928e+00 7.2054849732135528e+02 7.2203249754031685e+02 0 2 0 -P 271 22 -7.1650056340312379e-02 -3.1679388923150559e-02 3.2465350796190910e+00 3.2474801519722116e+00 0 1 0 0 0 0 -P 272 22 -1.8518079410849772e-01 -2.0927207569544297e-02 2.7563022818897256e+00 2.7625951827355784e+00 0 1 0 0 0 0 -V -99 0 -7.7826677342413646e+00 1.0584582300754398e+01 1.6951850346787774e+03 1.6953384651805682e+03 0 2 0 -P 273 22 -9.9605722022381674e-02 2.5022940238770892e-02 6.2018655777368492e+00 6.2027158641771596e+00 0 1 0 0 0 0 -P 274 22 -1.8982823478016234e-01 1.3113403154797515e-01 3.0429739539364984e+01 3.0430614179252810e+01 0 1 0 0 0 0 -V -100 0 -7.7825535982837781e+00 1.0584535518418377e+01 1.6951722349599286e+03 1.6953256650295632e+03 0 2 0 -P 275 22 7.7600359093490293e-02 2.3880769340730748e-03 3.6033115788038983e+00 3.6041478677469825e+00 0 1 0 0 0 0 -P 276 22 4.0925939406402977e-03 1.2398917639195919e-01 5.0145378556855054e+00 5.0160721656780911e+00 0 1 0 0 0 0 -V -101 0 5.5767505180503374e+00 4.3823987213377826e+01 1.4794302817143299e+02 1.5996733848246649e+02 0 2 0 -P 277 22 1.4877919418107663e-01 9.9270607473697217e-02 5.7038285808899925e-01 5.9776793735624267e-01 0 1 0 0 0 0 -P 278 22 1.1316249313101989e-02 5.5550771279655430e-02 5.2944134857972314e-01 5.3246792135695076e-01 0 1 0 0 0 0 -V -102 0 5.5767344317322669e+00 4.3824013368626339e+01 1.4794303665221980e+02 1.5996735580848653e+02 0 2 0 -P 279 22 -6.6030914697511434e-02 5.1578189162365749e-02 1.6923379462356794e-01 1.8883979595347436e-01 0 1 0 0 0 0 -P 280 22 -2.7734843220561155e-02 3.1484209872019292e-01 4.9057322637055928e-01 5.8357249685589085e-01 0 1 0 0 0 0 -BlockType GenEvent -E 4 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 189 0 0 -V -1 0 0 0 0 0 1 2 0 -P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -1 0 -P 3 2 -9.2820880453940977e-02 1.6078548997780676e-01 2.3716619521660218e+03 2.3716619594325907e+03 0 3 0 0 -3 0 -P 31 2103 9.2820880453940977e-02 -1.6078548997780676e-01 4.2732759596864398e+03 4.2732760333322394e+03 7.7132999999999996e-01 2 0 0 -11 0 -V -2 0 0 0 0 0 1 3 0 -P 2 2212 0 0 -6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -2 0 -P 4 21 2.8438240035156620e-01 -3.1515117320208030e-01 -3.8035697500337951e+03 3.8035697737212290e+03 0 3 0 0 -4 0 -P 14 2203 -1.4352353535702972e-01 4.4026544033137993e-01 -2.9147371774374851e+03 2.9147373162806402e+03 7.7132999999999996e-01 2 0 0 -9 0 -P 33 1 -1.4085886499453648e-01 -1.2511426712929963e-01 -8.4457632655431709e+01 8.4458487486809346e+01 3.3000000000000002e-01 2 0 0 -13 0 -V -3 0 0 0 0 0 0 5 0 -P 5 2 1.8330374025472010e-01 6.4045820926453234e-01 1.8525053358893920e+03 1.8525054556696041e+03 0 3 0 0 -5 0 -P 27 21 1.9372450554350890e-01 -5.2219821644400299e-01 1.2126803157754753e+02 1.2126931063898388e+02 0 2 0 0 -11 0 -P 28 21 -2.3795161344271451e-01 7.1609049465699426e-01 1.0167002308049599e+02 1.0167282330965078e+02 0 2 0 0 -11 0 -P 29 21 3.4192681965240401e-01 2.4291397251790178e-01 3.1944822354571826e+01 3.1947575751740445e+01 0 2 0 0 -11 0 -P 30 21 -5.9675894419355358e-01 -9.5050198748863479e-01 1.7993365505285936e+02 1.7993715512908133e+02 0 2 0 0 -11 0 -V -4 0 0 0 0 0 0 15 0 -P 6 -1 -5.7988882832211965e+00 -1.9327729931963271e+00 2.4200413742942017e+00 6.5741400211589776e+00 0 3 0 0 -5 0 -P 11 1 -9.8845705950266671e-01 -4.9594742583225058e+00 1.9044643416753072e+01 1.9707378698059269e+01 3.3000000000000002e-01 2 0 0 -9 0 -P 12 21 2.6044264833858743e-01 -3.1030363873699462e+00 1.1727671819750038e+01 1.2134041021282840e+01 0 2 0 0 -9 0 -P 13 21 7.5691010065949327e-01 -5.4011599026484958e-01 5.1524452837099819e+00 5.2356786174330239e+00 0 2 0 0 -9 0 -P 15 2 -1.8311360214351913e-01 -1.4805571719661075e+00 -2.1411903451828903e+03 2.1411908903188796e+03 3.3000000000000002e-01 2 0 0 -11 0 -P 16 21 4.3968109830755170e-01 -2.9544412986812052e-01 -3.1326029880598599e-01 6.1541751428642444e-01 0 2 0 0 -11 0 -P 17 21 2.7322936418785587e-01 -3.3048055802107390e-01 -7.6828223487860681e-01 8.7984616673284832e-01 0 2 0 0 -11 0 -P 18 21 2.9260573411497637e-01 1.3800589535119959e-01 -2.1582422861451325e+00 2.1823550372232328e+00 0 2 0 0 -11 0 -P 19 21 1.0223538075759215e+00 -1.4522275427264191e+00 -2.4692904014076042e+01 2.4756689616992229e+01 0 2 0 0 -11 0 -P 20 21 1.2063407328190996e+00 -7.4888083722587195e-01 -1.1210724096630058e+01 1.1300283856734948e+01 0 2 0 0 -11 0 -P 21 21 -5.4913410279006636e-01 1.0519596533332111e-01 3.4138908785026851e+00 3.4593735537367594e+00 0 2 0 0 -11 0 -P 22 21 6.4314231442077185e-01 3.1223541119268439e+00 7.5129505920112933e+00 8.1613205938051365e+00 0 2 0 0 -11 0 -P 23 21 1.2086144926726743e+00 3.4136643559921347e+00 6.3113339858338602e+00 7.2764544943269689e+00 0 2 0 0 -11 0 -P 24 21 2.4400337609788756e+00 6.9128514496625586e+00 2.4435124802319205e+01 2.5511107463705560e+01 0 2 0 0 -11 0 -P 32 -2 -7.1644398238490137e-01 8.6978994307757240e-01 -1.6189139599034304e+03 1.6189143857217191e+03 3.3000000000000002e-01 2 0 0 -13 0 -V -5 0 0 0 0 0 0 2 0 -P 7 22 1.3643288924243656e+01 -1.0581519988970058e+01 9.9183478070503759e+02 9.9198505034811774e+02 0 3 0 0 -6 0 -P 8 24 -1.9258873467210137e+01 9.2892052050382574e+00 8.6309059655865008e+02 8.6709454534264773e+02 8.0438667035438414e+01 3 0 0 -7 0 -V -6 0 0 0 0 0 0 1 0 -P 9 22 1.3643288924243656e+01 -1.0581519988970058e+01 9.9183478070503759e+02 9.9198505034811762e+02 0 1 0 0 0 0 -V -7 0 0 0 0 0 0 1 0 -P 10 24 -1.9258873467210137e+01 9.2892052050382574e+00 8.6309059655865008e+02 8.6709454534264773e+02 8.0438667035438414e+01 2 0 0 -8 0 -V -8 0 0 0 0 0 0 9 0 -P 34 4 -2.2700858926615656e+01 -1.6386334061858157e+01 3.4828459595439756e+02 3.4941129163080990e+02 1.5000000000000000e+00 2 0 0 -15 0 -P 35 21 -7.4503781777991165e+00 -8.5245909374436160e+00 1.2403122509900038e+02 1.2454686501555096e+02 0 2 0 0 -15 0 -P 36 21 -2.0027042250268927e+00 -1.0978633289287578e+00 2.1859513177439908e+01 2.1978499595209318e+01 0 2 0 0 -15 0 -P 40 21 3.3737992516561754e-01 1.9913397179993726e+00 1.8847206960760861e+01 1.8955117232772242e+01 0 2 0 0 -15 0 -P 41 21 9.3276664365375481e+00 2.1890146052654789e+01 2.2925649830527726e+02 2.3048801676129600e+02 0 2 0 0 -15 0 -P 42 -3 4.2852829509391617e+00 8.3218012077022046e+00 8.9256848114117304e+01 8.9747707271978427e+01 5.0000000000000000e-01 2 0 0 -15 0 -P 37 21 -1.0274145350843458e+00 -2.5975390684764665e-01 3.0272901154602945e+00 3.2074192370485028e+00 0 2 0 0 -15 0 -P 38 21 -2.6505880313310659e-01 5.5852304317418111e-01 2.2691371688433564e+00 2.3518477097595722e+00 0 2 0 0 -15 0 -P 39 21 2.3721188780666763e-01 2.7959374185858841e+00 2.6258281663350946e+01 2.6407780888220010e+01 0 2 0 0 -15 0 -V -9 0 0 0 0 0 0 1 0 -P 51 92 -1.1462784586161573e-01 -8.1623611956259214e+00 -2.8788124169172720e+03 2.9518144146174154e+03 6.5236551814627580e+02 2 0 0 -10 0 -V -10 0 0 0 0 0 0 16 0 -P 52 -213 3.0616585418758002e-01 -2.5300431240125230e+00 1.2105798622634046e+01 1.2400251650786375e+01 8.4913189283512225e-01 2 0 0 -25 0 -P 53 213 -1.5404831881885364e-01 -1.7509696799112910e+00 5.5613068929310039e+00 5.8606722227440304e+00 5.7421149464447840e-01 2 0 0 -26 0 -P 54 223 -5.1151607297610935e-01 -1.4176238804041423e+00 5.9722475655096865e+00 6.2094845467470412e+00 7.8654382798990441e-01 2 0 0 -27 0 -P 55 223 2.1595395219106844e-01 -1.8737275125004771e+00 7.0985598228311808e+00 7.3857993220666733e+00 7.7652377102120052e-01 2 0 0 -28 0 -P 64 -211 4.4026111693685754e-01 6.5311510758350333e-01 -3.0666546764622510e+01 3.0676977677837161e+01 1.3957000000000000e-01 1 0 0 0 0 -P 65 211 4.5884509599108031e-02 -7.3354084743733938e-01 -5.8516434437769988e+02 5.8516482259132022e+02 1.3957000000000000e-01 1 0 0 0 0 -P 66 2214 -4.9851835496356245e-01 6.3248545172766857e-01 -1.2651382944982172e+03 1.2651390770952955e+03 1.1539624265769346e+00 2 0 0 -33 0 -P 67 111 2.6622991607876895e-01 4.8781176567800157e-02 -9.9923848265446202e+02 9.9923852842810425e+02 1.3497999999999999e-01 2 0 0 -34 0 -P 56 113 -4.7677120078934182e-02 -1.0152067643004612e+00 2.4368651745900176e+00 2.7334250167134941e+00 7.0737724080239639e-01 2 0 0 -29 0 -P 57 -211 2.1984336478833474e-01 4.7825007839895524e-03 2.2352079885760445e+00 2.2503307566776294e+00 1.3957000000000000e-01 1 0 0 0 0 -P 58 211 -3.3498969538027201e-01 6.9648415330084867e-02 -1.1066497586449596e-01 3.8574022288587678e-01 1.3957000000000000e-01 1 0 0 0 0 -P 59 113 1.3909780482065315e-01 -3.3069396730450967e-01 -1.7329298988899207e+00 1.9541788674726714e+00 8.2889221994938656e-01 2 0 0 -30 0 -P 60 -211 -2.8599753074680223e-01 6.4799383066966643e-01 -3.4804982825084108e+00 3.5545799571290018e+00 1.3957000000000000e-01 1 0 0 0 0 -P 61 111 4.1381767414316867e-01 -3.0024085245337195e-01 -3.1398849342385469e+00 3.1840990307421961e+00 1.3497999999999999e-01 2 0 0 -31 0 -P 62 211 5.4968392420735113e-01 1.4756230968950473e-01 -1.8166962247609939e+00 1.9088719207253644e+00 1.3957000000000000e-01 1 0 0 0 0 -P 63 113 -8.7881886984997282e-01 -4.1468335965402653e-01 -2.3734060373081363e+01 2.3767575310168922e+01 8.0481639937447114e-01 2 0 0 -32 0 -V -11 0 0 0 0 0 2 1 0 -P 25 21 -8.0759531061318546e-01 -3.3406171290107096e+00 1.9645698208408786e+00 3.9587204459677277e+00 0 2 0 0 -11 0 -P 26 21 8.0759531061318546e-01 3.3406171290107096e+00 -1.6092526703563814e+02 1.6096196290888045e+02 0 2 0 0 -11 0 -P 68 92 6.5875152481577262e+00 8.7100003117229168e+00 2.4104713366823571e+03 7.0983573201329691e+03 6.6765399212358125e+03 2 0 0 -12 0 -V -12 0 0 0 0 0 0 59 0 -P 69 323 2.6965373089886259e-02 -7.8436620352785036e-01 -6.3251215118341054e+02 6.3251328488303113e+02 9.0454484922708100e-01 2 0 0 -35 0 -P 70 -311 -5.1319872938403244e-01 -3.5703956672451648e-01 -6.6805309680723667e+02 6.6805357470741524e+02 4.9767000000000000e-01 2 0 0 -36 0 -P 71 -211 5.7620530575271300e-01 6.1421445206986870e-02 -3.3565202145218319e+02 3.3565255066790428e+02 1.3957000000000000e-01 1 0 0 0 0 -P 72 213 2.7459733564460981e-01 -4.6031431506940862e-01 -3.8571257213471154e+02 3.8571373935139655e+02 7.8302534873042506e-01 2 0 0 -37 0 -P 73 223 -5.7926526471571715e-01 -1.9525945624624185e-02 -8.4084403531743789e+01 8.4090163084732680e+01 7.9541235743155470e-01 2 0 0 -38 0 -P 74 -213 -7.3223666424297493e-02 3.6563852853395723e-01 -1.6810679233890163e+01 1.6836622172984743e+01 8.5665433648741185e-01 2 0 0 -39 0 -P 75 211 6.4146448505876097e-01 -6.3543078272220832e-01 -1.6981265495312542e+01 1.7005825665706883e+01 1.3957000000000000e-01 1 0 0 0 0 -P 76 -211 -1.5924531765929986e-01 1.8172819723608069e-02 -3.3819669982319928e-01 3.9943224111784109e-01 1.3957000000000000e-01 1 0 0 0 0 -P 77 331 -2.1878967436288869e-02 -2.4374301737778187e-01 -4.9639779751442061e+00 5.0614320935167747e+00 9.5766808019706395e-01 2 0 0 -40 0 -P 78 211 3.8160876729373411e-01 4.9824059133778851e-03 -3.9596912966490905e+00 3.9804880385830423e+00 1.3957000000000000e-01 1 0 0 0 0 -P 79 -211 8.2763694246190667e-01 -4.7171503722470046e-02 -5.3206398228798824e+00 5.3866405086107614e+00 1.3957000000000000e-01 1 0 0 0 0 -P 80 213 -9.2963436667075124e-03 -9.3331491880418926e-01 -5.7858987283250789e+00 5.9114736383731179e+00 7.7313215110905542e-01 2 0 0 -41 0 -P 81 111 6.8908760945870035e-02 -7.4336047790866958e-02 -3.2488145678831243e-01 3.6611723081706654e-01 1.3497999999999999e-01 2 0 0 -42 0 -P 82 311 8.0944838552899079e-01 -2.2401821592795629e-01 -2.2078412448770441e+00 2.4140483096622667e+00 4.9767000000000000e-01 2 0 0 -43 0 -P 83 -311 2.0825369584158310e-01 -2.9899435700293758e-01 -7.9825277911540260e+00 8.0063220390387535e+00 4.9767000000000000e-01 2 0 0 -44 0 -P 84 221 4.8600128562752809e-02 -2.9412330619311078e-01 -1.2557942635204722e+00 1.4019954445479514e+00 5.4744999999999999e-01 2 0 0 -45 0 -P 85 221 2.4321537069915566e-01 2.7897521224850303e-02 -2.0466306405757497e+00 2.1326815209210972e+00 5.4744999999999999e-01 2 0 0 -46 0 -P 86 113 -1.4242560875299726e-01 2.0098755311294011e-01 -9.3281640560500445e-01 1.1994889447031605e+00 7.1270346664252460e-01 2 0 0 -47 0 -P 87 -213 6.2995506969133175e-01 -5.3351618156801850e-01 -3.0268003767966487e+00 3.2877827626531611e+00 9.8311345611693934e-01 2 0 0 -48 0 -P 88 213 -4.4470514704296038e-01 2.6740585629040976e-02 -1.1790528923872898e+00 1.4643031719074535e+00 7.4534577847138228e-01 2 0 0 -49 0 -P 89 2112 -5.6465354678112804e-02 4.1816050990651149e-01 8.1955389032907600e-01 1.3162472839013655e+00 9.3957000000000002e-01 1 0 0 0 0 -P 90 -2212 -3.0528283048302102e-02 -4.0769401042822612e-01 1.4135481591829637e+00 1.7451691532440265e+00 9.3827000000000005e-01 1 0 0 0 0 -P 91 211 3.5221781060737328e-01 1.2088893752373304e+00 9.4706264424757203e-01 1.5817327033035504e+00 1.3957000000000000e-01 1 0 0 0 0 -P 92 -213 -2.9970119748950869e-01 5.7605009045793187e-01 1.9803888278068278e+00 2.1668024374217025e+00 5.9282238404204501e-01 2 0 0 -50 0 -P 93 323 5.3610594923405364e-01 1.5427556638110751e+00 4.1323311180303905e+00 4.5365775346539055e+00 9.1480633571205505e-01 2 0 0 -51 0 -P 94 -323 1.6764230184000011e+00 4.2661339477853915e+00 1.1422857768230408e+01 1.2340341966212989e+01 8.8998160249935854e-01 2 0 0 -52 0 -P 95 221 1.6521720620708708e-01 1.7305666862956806e+00 5.3795959051527014e+00 5.6799569880571275e+00 5.4744999999999999e-01 2 0 0 -53 0 -P 96 111 3.4091599571513381e-01 4.2578712335088759e-01 7.7507818540955942e-01 9.5733180478016111e-01 1.3497999999999999e-01 2 0 0 -54 0 -P 97 111 1.8636424148468736e-01 1.4599342475026946e+00 5.4281639450086834e+00 5.6257731070340586e+00 1.3497999999999999e-01 2 0 0 -55 0 -P 98 223 1.0069287360881967e+00 1.3509470596584172e+00 6.7582433289884696e+00 7.0091592256500288e+00 7.8453598970226335e-01 2 0 0 -56 0 -P 99 211 -3.4146209562673929e-01 1.5158950380356184e-01 5.2424511386917438e-01 6.5870210621260206e-01 1.3957000000000000e-01 1 0 0 0 0 -P 100 2112 -2.1154881148046689e-01 -1.0735068025792132e+00 7.0201326895106064e-01 1.6039900777454950e+00 9.3957000000000002e-01 1 0 0 0 0 -P 101 -2212 4.7469686931938010e-02 2.7754353367769968e-01 1.0039073590343506e+00 1.4026633105228941e+00 9.3827000000000005e-01 1 0 0 0 0 -P 102 111 1.7437178164815947e-01 -5.6048963315392508e-01 1.2589521396946993e-01 6.1532377851712639e-01 1.3497999999999999e-01 2 0 0 -57 0 -P 103 113 -3.1883151078144545e-01 -8.4606752962111467e-02 1.3914257241876302e-01 9.7271600632710076e-01 9.0443570174538301e-01 2 0 0 -58 0 -P 104 111 -1.1927545843921665e-01 -2.6335718259241964e-01 1.5515874628685319e-01 3.5479216107209921e-01 1.3497999999999999e-01 2 0 0 -59 0 -P 105 211 2.9312098402116255e-01 -6.2323282486230425e-01 -2.6684020281172388e-01 7.5167981481212065e-01 1.3957000000000000e-01 1 0 0 0 0 -P 106 1114 -4.4062914350054427e-01 2.4638804826043872e-01 -2.3241854935092199e+01 2.3280385473541951e+01 1.2400265563311581e+00 2 0 0 -60 0 -P 107 211 1.6813770838362588e-01 1.0298303158833499e-01 -3.2163782230045408e+00 3.2254370947351405e+00 1.3957000000000000e-01 1 0 0 0 0 -P 108 -2212 3.4457685450197267e-01 1.2186713305630190e+00 -5.3030716885410776e+01 5.3054134400573211e+01 9.3827000000000005e-01 1 0 0 0 0 -P 109 2214 1.2020287573136482e-01 3.7479987432403911e-01 -1.0966878173055145e+01 1.1045072570427967e+01 1.2515141015024636e+00 2 0 0 -61 0 -P 110 211 2.1009296797946009e-01 4.0052377799798089e-01 -1.6589816940124287e+01 1.6596567845300751e+01 1.3957000000000000e-01 1 0 0 0 0 -P 111 -2224 1.9658035577195881e-01 5.1914185814482328e-01 -3.0401238446225552e+01 3.0431387801714855e+01 1.2352782556752151e+00 2 0 0 -62 0 -P 112 323 -7.0406239463945264e-01 -1.9001858472173550e-01 -1.3737092732247977e+01 1.3787611740640099e+01 9.2666599061989985e-01 2 0 0 -63 0 -P 113 333 8.2916907628090986e-01 6.4319863963863733e-01 -5.3961951740099057e+00 5.5928926174794418e+00 1.0297085158212156e+00 2 0 0 -64 0 -P 114 -323 -4.4426618158725512e-01 -1.3800261314922405e-02 -1.0646399753717462e+00 1.4542717828265139e+00 8.8537294619351015e-01 2 0 0 -65 0 -P 115 213 4.6955864160020383e-01 -2.2138569541027434e-01 2.7803521001940323e-01 1.1481484305370542e+00 9.8561873790043575e-01 2 0 0 -66 0 -P 116 223 2.8564258373702955e-01 -7.0418327707246611e-02 -7.3250403882459747e-01 1.1252011437712499e+00 8.0185099646301594e-01 2 0 0 -67 0 -P 117 -213 -2.1467687225524573e-01 4.2741287912168013e-01 -7.4289123826589104e-04 1.0126576271927121e+00 8.9258444379442525e-01 2 0 0 -68 0 -P 118 113 1.7395230303924547e-01 -4.1608763137866295e-01 1.2004688227692567e+01 1.2053458057779810e+01 9.8484688446354629e-01 2 0 0 -69 0 -P 119 221 -1.9567117285229671e-01 2.8889340409270481e-01 5.3075723066706981e+00 5.3471274437637426e+00 5.4744999999999999e-01 2 0 0 -70 0 -P 120 111 -1.9087267842121336e-01 5.4252206762536037e-01 6.2318609039251946e+01 6.2321408960009578e+01 1.3497999999999999e-01 2 0 0 -71 0 -P 121 323 1.3070310306706950e-01 -6.1697493783128776e-01 2.9221144136450206e+01 2.9240305127864819e+01 8.4996350061396719e-01 2 0 0 -72 0 -P 122 -311 -4.9885948856357186e-02 1.2822300091927889e-02 4.5329270329114166e+00 4.5604556717363289e+00 4.9767000000000000e-01 2 0 0 -73 0 -P 123 2112 -4.7863725043095502e-02 -1.0825222107858737e-01 1.4718621532001902e+02 1.4718926177372941e+02 9.3957000000000002e-01 1 0 0 0 0 -P 124 -2112 1.9344894382294975e-01 -6.5018197886060145e-03 2.1812090513132770e+02 2.1812301463133616e+02 9.3957000000000002e-01 1 0 0 0 0 -P 125 313 -5.9342554539725090e-01 -3.3850796627627300e-01 5.9882469556753961e+02 5.9882576075663053e+02 8.9943464447186261e-01 2 0 0 -74 0 -P 126 3224 3.5223036811653632e-02 -3.4414941922204685e-02 2.5172332877548356e+03 2.5172336781781446e+03 1.4011239061029810e+00 2 0 0 -75 0 -P 127 -213 1.1663718569999987e-01 -2.4641154449404332e-01 1.1115119089591544e+03 1.1115121550661386e+03 6.8758916911370760e-01 2 0 0 -76 0 -V -13 0 0 0 0 0 0 1 0 -P 128 92 -8.5730284737943785e-01 7.4467567594827277e-01 -1.7033715925588622e+03 1.7033728732085285e+03 1.7530933029711124e+00 2 0 0 -14 0 -V -14 0 0 0 0 0 0 2 0 -P 129 113 -7.8533622992976027e-01 8.6523895857592903e-01 -1.6750124441451264e+03 1.6750130337654648e+03 7.8093002700065262e-01 2 0 0 -77 0 -P 130 -211 -7.1966617449677556e-02 -1.2056328262765621e-01 -2.8359148413735429e+01 2.8359839443063105e+01 1.3957000000000000e-01 1 0 0 0 0 -V -15 0 0 0 0 0 0 1 0 -P 131 92 -1.9258873467210122e+01 9.2892052050382539e+00 8.6309059655864780e+02 8.6709454534264501e+02 8.0438667035440048e+01 2 0 0 -16 0 -V -16 0 0 0 0 0 0 12 0 -P 132 423 -1.9137366351719628e+01 -1.4131846763827689e+01 2.9493587085754592e+02 2.9590056209345943e+02 2.0066999999999999e+00 2 0 0 -78 0 -P 133 211 -4.5604000871635657e+00 -4.7377185099919146e+00 7.2689922512815102e+01 7.2986899785775833e+01 1.3957000000000000e-01 1 0 0 0 0 -P 134 113 -5.1617104439380377e+00 -3.6881619942643642e+00 7.3158252581438703e+01 7.3436922903472933e+01 7.7841580023243062e-01 2 0 0 -79 0 -P 135 111 -1.0963849349911059e-01 -3.7173119868868731e-02 3.1818045250357909e+00 3.1867698498692643e+00 1.3497999999999999e-01 2 0 0 -80 0 -P 136 -213 -1.8575628946181175e+00 -2.6189368213267570e+00 3.1084349603980588e+01 3.1260260648800589e+01 8.1100896844567072e-01 2 0 0 -81 0 -P 137 113 -1.9702196225596913e+00 -7.5035350425204206e-01 1.8597051073293592e+01 1.8730245499430811e+01 7.2594221794524227e-01 2 0 0 -82 0 -P 138 331 -1.8481053319477775e-01 -3.7946619601020762e-02 3.7006231730721044e+00 3.8272144972627773e+00 9.5779124022995710e-01 2 0 0 -83 0 -P 139 323 5.4756376576753629e-01 3.2204856220182068e+00 3.6360592290988627e+01 3.6518541749074082e+01 9.1644203753305542e-01 2 0 0 -84 0 -P 140 -323 1.3311259853615089e+00 3.7379512567484707e+00 3.4112393141607136e+01 3.4353366987544497e+01 8.6849383798280422e-01 2 0 0 -85 0 -P 141 113 4.4805357982732119e-01 3.0030852094344707e+00 2.9362369493599097e+01 2.9533424673175375e+01 9.2474745847981388e-01 2 0 0 -86 0 -P 142 213 4.7752867246856443e+00 1.0891165458689070e+01 1.1393626861842178e+02 1.1455865944632977e+02 8.9011184662167564e-01 2 0 0 -87 0 -P 143 313 6.6208049038407921e+00 1.4438654991280693e+01 1.5197109868684942e+02 1.5280167720844955e+02 9.0989345262094001e-01 2 0 0 -88 0 -V -17 0 0 0 0 0 2 1 0 -P 43 2 2.1378197802742376e+00 2.3547451315414101e+00 -5.4651779492327037e+00 6.3232324063115968e+00 0 2 0 0 -17 0 -P 44 -2 -2.1378197802742376e+00 -2.3547451315414101e+00 -2.4068773120863955e+01 2.4277992865784292e+01 0 2 0 0 -17 0 -P 144 92 0 0 -2.9533951070096659e+01 3.0601225272095888e+01 8.0112871838860240e+00 2 0 0 -18 0 -V -18 0 0 0 0 0 0 4 0 -P 145 323 1.8776251777286357e+00 1.8318837713470195e+00 -4.9994852273624932e+00 5.7335457349190850e+00 9.9870901469245166e-01 2 0 0 -89 0 -P 146 -321 3.7073773471981229e-02 1.7044744097734246e-01 -1.6359966049568000e+00 1.7177172777396612e+00 4.9359999999999998e-01 1 0 0 0 0 -P 147 323 -4.7852083980675375e-01 -6.4107933193332411e-01 -5.4042107535842536e+00 5.5372300715771994e+00 9.0302718257077641e-01 2 0 0 -90 0 -P 148 -321 -1.4361781113938632e+00 -1.3612518803910378e+00 -1.7494258484193114e+01 1.7612732187859947e+01 4.9359999999999998e-01 1 0 0 0 0 -V -19 0 0 0 0 0 2 1 0 -P 45 1 1.8673293224089542e+00 2.3063057798131541e+00 2.4390505988349268e+01 2.4570363194630016e+01 0 2 0 0 -19 0 -P 46 -1 -1.8673293224089542e+00 -2.3063057798131541e+00 -3.0519906661080940e+00 4.2568312362999272e+00 0 2 0 0 -19 0 -P 149 92 0 0 2.1338515322241175e+01 2.8827194430929943e+01 1.9382334807786108e+01 2 0 0 -20 0 -V -20 0 0 0 0 0 0 8 0 -P 150 -211 1.1192865003182519e+00 9.7257533806658769e-01 1.0060654115125574e+01 1.0170297245759494e+01 1.3957000000000000e-01 1 0 0 0 0 -P 151 213 -2.0771851785387677e-01 4.2519322630392231e-01 6.3745975039723319e+00 6.4406040423465116e+00 7.8863859294723537e-01 2 0 0 -91 0 -P 152 311 3.6602657683902218e-01 2.7637537539729494e-02 1.1512728067232807e+00 1.3068449765883683e+00 4.9767000000000000e-01 2 0 0 -92 0 -P 153 -313 6.6372648031348541e-02 5.1378838214452516e-01 4.7850741764275320e+00 4.9115056800953063e+00 9.7855472083141659e-01 2 0 0 -93 0 -P 154 111 1.4261163265033819e-01 2.7035572090208759e-01 1.0157832817158920e-01 3.4923924571247367e-01 1.3497999999999999e-01 2 0 0 -94 0 -P 155 -213 2.4227172397104807e-01 -2.6403356349582480e-01 1.3501615848246171e+00 1.6600803924695697e+00 8.9695110983686888e-01 2 0 0 -95 0 -P 156 223 -1.1140200512928606e+00 -8.1846412592718654e-01 -1.3130036485215084e+00 2.0628775198106455e+00 7.8775686642327825e-01 2 0 0 -96 0 -P 157 213 -6.1483051266327160e-01 -1.1270525155338409e+00 -1.1718195444822426e+00 1.9257453281475732e+00 8.2889691275736610e-01 2 0 0 -97 0 -V -21 0 0 0 0 0 2 1 0 -P 47 21 -1.6032500697232532e-01 4.0174652936366986e+00 7.5678264791499856e+00 8.5695816182565032e+00 0 2 0 0 -21 0 -P 48 21 1.6032500697232532e-01 -4.0174652936366986e+00 2.9067715926331368e+02 2.9070496495396026e+02 0 2 0 0 -21 0 -P 158 92 0 0 2.9824498574246365e+02 2.9927454657221676e+02 2.4802876959812384e+01 2 0 0 -22 0 -V -22 0 0 0 0 0 0 11 0 -P 159 2112 1.7964317510379571e-01 2.3175583066793864e-01 5.5679324197099680e+00 5.6542590717765355e+00 9.3957000000000002e-01 1 0 0 0 0 -P 160 -2212 -1.5090219905010202e-01 6.0109050142401987e-01 3.2508753296939252e+00 3.4398578846651389e+00 9.3827000000000005e-01 1 0 0 0 0 -P 161 213 -1.3185920968150541e-01 5.1253454596483206e-01 2.8515148690980490e+00 3.0007314728969532e+00 7.7017777932231246e-01 2 0 0 -98 0 -P 162 2112 -2.9589184870575446e-02 8.1735278132525635e-01 3.9016671878094096e+00 4.0956977083678945e+00 9.3957000000000002e-01 1 0 0 0 0 -P 163 111 -1.6746154439354902e-02 7.6768893592516851e-01 2.2228509364031699e+00 2.3556130034237106e+00 1.3497999999999999e-01 2 0 0 -99 0 -P 164 -2112 1.5035799035598119e-01 2.6606398705642531e-01 4.0650357319587354e+00 4.1833843784038702e+00 9.3957000000000002e-01 1 0 0 0 0 -P 165 -213 1.6067245661882737e-01 -1.2470285603911700e-01 4.7366324423320982e+00 4.8109860944668297e+00 8.1763920330425799e-01 2 0 0 -100 0 -P 166 3222 -3.8764262791963577e-01 -4.9242591697810201e-01 5.0258807822997092e+01 5.0276785049131227e+01 1.1893700000000000e+00 2 0 0 -101 0 -P 167 -3322 -1.2309526187710051e-01 -2.5079778996359208e+00 1.8364860958891464e+02 1.8367048176432749e+02 1.3149000000000000e+00 2 0 0 -102 0 -P 168 -313 2.7382092931236746e-01 1.3620019933979283e-01 1.7228910752887057e+01 1.7258673294130080e+01 9.6587253141499774e-01 2 0 0 -103 0 -P 169 223 7.5340086447302335e-02 -2.0758010905029387e-01 2.0512148660659509e+01 2.0528076850627027e+01 7.7777302470221710e-01 2 0 0 -104 0 -V -23 0 0 0 0 0 2 1 0 -P 49 21 -2.6546407805414689e+00 1.5019300198250121e+00 2.4952404169620731e+01 2.5138126129492459e+01 0 2 0 0 -23 0 -P 50 21 2.6546407805414689e+00 -1.5019300198250121e+00 1.7863101526357177e+00 3.5346591659698707e+00 0 2 0 0 -23 0 -P 170 92 0 0 2.6738714322256449e+01 2.8672785295462329e+01 1.0352283467546599e+01 2 0 0 -24 0 -V -24 0 0 0 0 0 0 9 0 -P 171 113 2.2244165301205804e-01 3.1494817743372011e-01 1.4782187353346177e+00 1.6863066829397060e+00 7.1402167752056300e-01 2 0 0 -105 0 -P 172 111 3.4623449760310282e-01 -1.0264048500571971e-01 9.3540089980756547e-01 1.0117350642601477e+00 1.3497999999999999e-01 2 0 0 -106 0 -P 173 -3222 -8.2595480421942175e-02 1.6978619896754682e-01 3.9520196416308315e+00 4.1314294876570097e+00 1.1893700000000000e+00 2 0 0 -107 0 -P 174 3222 -6.9310081431249626e-01 6.6149599980748386e-01 1.1548527819325548e+01 1.1649079855816854e+01 1.1893700000000000e+00 2 0 0 -108 0 -P 175 -211 -1.7560637096079756e-01 -5.6685470235918856e-01 2.1835043271014025e+00 2.2670096564592077e+00 1.3957000000000000e-01 1 0 0 0 0 -P 176 -2112 -1.9019072817495811e-01 1.9359363989648683e-02 1.6880525050363864e+00 1.9413552850309042e+00 9.3957000000000002e-01 1 0 0 0 0 -P 177 223 2.4540057371541862e-01 -2.8376756848088225e-01 2.3218440550203154e+00 2.4773736223134661e+00 7.7825109971008344e-01 2 0 0 -109 0 -P 178 3212 8.6531980859782553e-01 -4.4081003261827684e-01 1.9558781200763713e+00 2.4881170750393125e+00 1.1925500000000000e+00 2 0 0 -110 0 -P 179 321 -5.3790313905821097e-01 2.2848304826566801e-01 6.7526821892341016e-01 1.0203785659457194e+00 4.9359999999999998e-01 1 0 0 0 0 -V -25 0 0 0 0 0 0 2 0 -P 180 -211 -1.4955554398415169e-01 -5.6951699534149869e-01 4.0889018315438204e+00 4.1334385735875658e+00 1.3957000000000000e-01 1 0 0 0 0 -P 181 111 4.5572139817173168e-01 -1.9605261286710240e+00 8.0168967910902253e+00 8.2668130771988633e+00 1.3497999999999999e-01 2 0 0 -111 0 -V -26 0 0 0 0 0 0 2 0 -P 182 211 1.8489337684983235e-02 -7.6473513145543626e-01 1.7001134900440293e+00 1.8694992219361533e+00 1.3957000000000000e-01 1 0 0 0 0 -P 183 111 -1.7253765650383687e-01 -9.8623454845585490e-01 3.8611934028869754e+00 3.9911730008078652e+00 1.3497999999999999e-01 2 0 0 -112 0 -V -27 0 0 0 0 0 0 3 0 -P 184 -211 -2.5172946512403243e-02 -7.7548570243937753e-01 3.0753336193267011e+00 3.1747706069864448e+00 1.3957000000000000e-01 1 0 0 0 0 -P 185 211 -3.7700741046237424e-01 -6.0130878108935260e-01 2.2322285260513164e+00 2.3464933017539047e+00 1.3957000000000000e-01 1 0 0 0 0 -P 186 111 -1.0933571600133193e-01 -4.0829396875412233e-02 6.6468542013166909e-01 6.8822063800669864e-01 1.3497999999999999e-01 2 0 0 -113 0 -V -28 0 0 0 0 0 0 3 0 -P 187 -211 1.1038114308213799e-01 -1.2888105525180060e-01 6.0684971341572025e-01 6.4539963024755354e-01 1.3957000000000000e-01 1 0 0 0 0 -P 188 211 8.5502102732195953e-02 -1.0434887961818418e+00 3.1241617499531409e+00 3.2978850650225713e+00 1.3957000000000000e-01 1 0 0 0 0 -P 189 111 2.0070706376734491e-02 -7.0135766106683461e-01 3.3675483594623192e+00 3.4425146267966618e+00 1.3497999999999999e-01 2 0 0 -114 0 -V -29 0 0 0 0 0 0 2 0 -P 190 211 6.0515548805711243e-02 -7.5842708879401355e-01 1.0059791141196675e+00 1.2689946980223401e+00 1.3957000000000000e-01 1 0 0 0 0 -P 191 -211 -1.0819266888464543e-01 -2.5677967550644770e-01 1.4308860604703502e+00 1.4644303186911753e+00 1.3957000000000000e-01 1 0 0 0 0 -V -30 0 0 0 0 0 0 2 0 -P 192 211 3.2630837518369948e-01 1.2528291854798834e-01 -9.1079671575371779e-01 9.8549652851884084e-01 1.3957000000000000e-01 1 0 0 0 0 -P 193 -211 -1.8721057036304636e-01 -4.5597688585249807e-01 -8.2213318313620309e-01 9.6868233895383105e-01 1.3957000000000000e-01 1 0 0 0 0 -V -31 0 1.9363804248396288e-05 -1.4049194748185942e-05 -1.4692489235742219e-04 1.4899380618883134e-04 0 2 0 -P 194 22 2.3644587135507725e-01 -1.2558235327998157e-01 -1.9632153706257331e+00 1.9813864259647422e+00 0 1 0 0 0 0 -P 195 22 1.7737180278809139e-01 -1.7465849917339041e-01 -1.1766695636128137e+00 1.2027126047774541e+00 0 1 0 0 0 0 -V -32 0 0 0 0 0 0 2 0 -P 196 -211 -7.0389269565655677e-01 -3.1919107716430056e-02 -1.8774282217689745e+01 1.8788018424804608e+01 1.3957000000000000e-01 1 0 0 0 0 -P 197 211 -1.7492617419341611e-01 -3.8276425193759644e-01 -4.9597781553916187e+00 4.9795568853643175e+00 1.3957000000000000e-01 1 0 0 0 0 -V -33 0 0 0 0 0 0 2 0 -P 198 2212 -5.1743590343267754e-01 4.2825914755438255e-01 -1.0893061128262852e+03 1.0893067239933462e+03 9.3827000000000005e-01 1 0 0 0 0 -P 199 111 1.8917548469115111e-02 2.0422630417328605e-01 -1.7583218167193181e+02 1.7583235310194934e+02 1.3497999999999999e-01 2 0 0 -115 0 -V -34 0 3.2334201386706010e-05 5.9245798152790670e-06 -1.2135968341715789e-01 1.2135968897646612e-01 0 2 0 -P 200 22 1.6703387848561871e-01 5.7069751590140542e-02 -4.1826167954092972e+02 4.1826171678707635e+02 0 1 0 0 0 0 -P 201 22 9.9196037593150224e-02 -8.2885750223403894e-03 -5.8097680311353236e+02 5.8097681164102789e+02 0 1 0 0 0 0 -V -35 0 0 0 0 0 0 2 0 -P 202 311 -2.5901715207887410e-01 -6.0542629745708865e-01 -4.0542979190677522e+02 4.0543063213315133e+02 4.9767000000000000e-01 2 0 0 -116 0 -P 203 211 2.8598252516876038e-01 -1.7893990607076177e-01 -2.2708235927663534e+02 2.2708265274987977e+02 1.3957000000000000e-01 1 0 0 0 0 -V -36 0 0 0 0 0 0 1 0 -P 204 130 -5.1319872938403244e-01 -3.5703956672451648e-01 -6.6805309680723667e+02 6.6805357470741524e+02 4.9767000000000000e-01 1 0 0 0 0 -V -37 0 0 0 0 0 0 2 0 -P 205 211 5.0113066374848658e-01 -1.7917812277643974e-01 -1.9423655414467504e+02 1.9423733339016991e+02 1.3957000000000000e-01 1 0 0 0 0 -P 206 111 -2.2653332810387683e-01 -2.8113619229296893e-01 -1.9147601799003647e+02 1.9147640596122679e+02 1.3497999999999999e-01 2 0 0 -117 0 -V -38 0 0 0 0 0 0 3 0 -P 207 211 -1.2953975496923764e-01 -6.3100220954130662e-02 -6.4093109045566621e+00 6.4124494728746901e+00 1.3957000000000000e-01 1 0 0 0 0 -P 208 -211 -6.5502456608810988e-02 -1.0670875197924584e-01 -3.2314799704027415e+01 3.2315343677978753e+01 1.3957000000000000e-01 1 0 0 0 0 -P 209 111 -3.8422305313766852e-01 1.5028302730875231e-01 -4.5360292923159719e+01 4.5362369933879265e+01 1.3497999999999999e-01 2 0 0 -118 0 -V -39 0 0 0 0 0 0 2 0 -P 210 -211 2.5359517635261491e-01 -7.4343477557339457e-02 -3.1117407054990411e+00 3.1260594155076933e+00 1.3957000000000000e-01 1 0 0 0 0 -P 211 111 -3.2681884277691242e-01 4.3998200609129667e-01 -1.3698938528391123e+01 1.3710562757477057e+01 1.3497999999999999e-01 2 0 0 -119 0 -V -40 0 0 0 0 0 0 3 0 -P 212 111 -7.8940863078874490e-02 -1.7382885204461537e-01 -1.5695053597983348e+00 1.5868253856371490e+00 1.3497999999999999e-01 2 0 0 -120 0 -P 213 111 -7.8383943780866334e-03 -2.5856424870530047e-02 -1.3381901875049935e+00 1.3452518624659702e+00 1.3497999999999999e-01 2 0 0 -121 0 -P 214 221 6.4900290020672255e-02 -4.4057740462636476e-02 -2.0562824278408782e+00 2.1293548454136566e+00 5.4744999999999999e-01 2 0 0 -122 0 -V -41 0 0 0 0 0 0 2 0 -P 215 211 -1.8048202178105321e-02 -1.0093102102911666e+00 -5.4042555680151514e+00 5.4994991469698977e+00 1.3957000000000000e-01 1 0 0 0 0 -P 216 111 8.7518585113978108e-03 7.5995291486977395e-02 -3.8164316030992712e-01 4.1197449140322134e-01 1.3497999999999999e-01 2 0 0 -123 0 -V -42 0 6.0737920994850714e-07 -6.5521668592152024e-07 -2.8635871526700522e-06 3.2270496719116053e-06 0 2 0 -P 217 22 3.6690098624894099e-02 3.2104328088457951e-02 -5.1174608902313651e-02 7.0680208088407345e-02 0 1 0 0 0 0 -P 218 22 3.2218662320975935e-02 -1.0644037587932491e-01 -2.7370684788599875e-01 2.9543702272865918e-01 0 1 0 0 0 0 -V -43 0 0 0 0 0 0 1 0 -P 219 310 8.0944838552899079e-01 -2.2401821592795629e-01 -2.2078412448770441e+00 2.4140483096622671e+00 4.9767000000000000e-01 2 0 0 -124 0 -V -44 0 0 0 0 0 0 1 0 -P 220 130 2.0825369584158310e-01 -2.9899435700293758e-01 -7.9825277911540260e+00 8.0063220390387517e+00 4.9767000000000000e-01 1 0 0 0 0 -V -45 0 0 0 0 0 0 3 0 -P 221 -211 2.0336907664022314e-02 -6.8795029656673473e-02 -1.2781071680927664e-01 2.0238999518281200e-01 1.3957000000000000e-01 1 0 0 0 0 -P 222 211 -6.8179243585667487e-02 -8.9502122733327735e-02 -3.5872734119120031e-01 4.0102883867347155e-01 1.3957000000000000e-01 1 0 0 0 0 -P 223 111 9.6442464484397972e-02 -1.3582615380310958e-01 -7.6925620551999541e-01 7.9857661069166797e-01 1.3497999999999999e-01 2 0 0 -125 0 -V -46 0 0 0 0 0 0 3 0 -P 224 111 2.6160440603946145e-01 3.8824481999259884e-02 -1.0269049807729116e+00 1.0689703670345518e+00 1.3497999999999999e-01 2 0 0 -126 0 -P 225 111 -1.7096717800365663e-02 2.3430492041171140e-02 -2.9482920802539647e-01 3.2555360237865472e-01 1.3497999999999999e-01 2 0 0 -127 0 -P 226 111 -1.2923175399401406e-03 -3.4357452815580718e-02 -7.2489645177744166e-01 7.3815755150789031e-01 1.3497999999999999e-01 2 0 0 -128 0 -V -47 0 0 0 0 0 0 2 0 -P 227 -211 4.0983186168897998e-02 4.1316543328976252e-01 -4.9254568519727593e-01 6.5914060239111794e-01 1.3957000000000000e-01 1 0 0 0 0 -P 228 211 -1.8340879492189527e-01 -2.1217788017682243e-01 -4.4027072040772847e-01 5.4034834231204232e-01 1.3957000000000000e-01 1 0 0 0 0 -V -48 0 0 0 0 0 0 2 0 -P 229 -211 1.4311547145631315e-01 -6.9370880998933593e-01 -2.0936733660680962e+00 2.2146471276277619e+00 1.3957000000000000e-01 1 0 0 0 0 -P 230 111 4.8683959823501871e-01 1.6019262842131735e-01 -9.3312701072855297e-01 1.0731356350254004e+00 1.3497999999999999e-01 2 0 0 -129 0 -V -49 0 0 0 0 0 0 2 0 -P 231 211 -5.9605235147848823e-01 3.4238597371628854e-03 -1.0703021959451100e+00 1.2330112343622257e+00 1.3957000000000000e-01 1 0 0 0 0 -P 232 111 1.5134720443552790e-01 2.3316725891878089e-02 -1.0875069644217970e-01 2.3129193754522784e-01 1.3497999999999999e-01 2 0 0 -130 0 -V -50 0 0 0 0 0 0 2 0 -P 233 -211 -1.9269073508976683e-01 1.6767418600061659e-01 1.4340467581323610e+00 1.4632888441624703e+00 1.3957000000000000e-01 1 0 0 0 0 -P 234 111 -1.0701046239974184e-01 4.0837590445731536e-01 5.4634206967446686e-01 7.0351359325923257e-01 1.3497999999999999e-01 2 0 0 -131 0 -V -51 0 0 0 0 0 0 2 0 -P 235 311 6.3943275598408489e-01 1.2113139656898524e+00 3.6184751514319600e+00 3.9009221503807563e+00 4.9767000000000000e-01 2 0 0 -132 0 -P 236 211 -1.0332680675003121e-01 3.3144169812122276e-01 5.1385596659843058e-01 6.3565538427314960e-01 1.3957000000000000e-01 1 0 0 0 0 -V -52 0 0 0 0 0 0 2 0 -P 237 -321 6.0112350196689945e-01 1.3754851910638788e+00 3.6979799224894263e+00 4.0214432039490360e+00 4.9359999999999998e-01 1 0 0 0 0 -P 238 111 1.0752995164331018e+00 2.8906487567215131e+00 7.7248778457409824e+00 8.3188987622639523e+00 1.3497999999999999e-01 2 0 0 -133 0 -V -53 0 0 0 0 0 0 3 0 -P 239 111 2.8770026660581679e-03 5.7529118234130172e-01 2.0142417965499644e+00 2.0991326392090666e+00 1.3497999999999999e-01 2 0 0 -134 0 -P 240 111 -3.1779121290212139e-02 5.5540485052736488e-01 1.4046209535474936e+00 1.5167940150475190e+00 1.3497999999999999e-01 2 0 0 -135 0 -P 241 111 1.9411932483124106e-01 5.9987065342701418e-01 1.9607331550552445e+00 2.0640303338005435e+00 1.3497999999999999e-01 2 0 0 -136 0 -V -54 0 5.4954611087139647e-05 6.8635576106003366e-05 1.2494022215636810e-04 1.5431894564725410e-04 0 2 0 -P 242 22 2.7045544910683439e-01 2.8952946094327370e-01 4.6146839849127375e-01 6.0821586752713319e-01 0 1 0 0 0 0 -P 243 22 7.0460546608299382e-02 1.3625766240761386e-01 3.1360978691828562e-01 3.4911593725302786e-01 0 1 0 0 0 0 -V -55 0 9.6240369574681310e-05 7.5392473585625148e-04 2.8031584815723328e-03 2.9052058412651406e-03 0 2 0 -P 244 22 8.6498389738220507e-02 2.8849502818976608e-01 1.1962677619018982e+00 1.2335995747742843e+00 0 1 0 0 0 0 -P 245 22 9.9865851746466866e-02 1.1714392193129286e+00 4.2318961831067856e+00 4.3921735322597746e+00 0 1 0 0 0 0 -V -56 0 0 0 0 0 0 3 0 -P 246 -211 4.9508715212394944e-01 7.9494983361117566e-01 2.6140269814839323e+00 2.7802290141250303e+00 1.3957000000000000e-01 1 0 0 0 0 -P 247 211 2.9246050150768399e-01 2.7688149449938243e-01 1.5693519673596861e+00 1.6262047501142205e+00 1.3957000000000000e-01 1 0 0 0 0 -P 248 111 2.1938108245656321e-01 2.7911573154785918e-01 2.5748643801448514e+00 2.6027254614107957e+00 1.3497999999999999e-01 2 0 0 -137 0 -V -57 0 8.3373127297123383e-06 -2.6798931049491529e-05 6.0194818227837910e-06 2.9420739543035361e-05 0 2 0 -P 249 22 7.9399386678645364e-02 -1.3411768106791125e-01 -1.4409354255737384e-02 1.5652298383958299e-01 0 1 0 0 0 0 -P 250 22 9.4972394969514082e-02 -4.2637195208601375e-01 1.4030456822520732e-01 4.5880079467754337e-01 0 1 0 0 0 0 -V -58 0 0 0 0 0 0 2 0 -P 251 -211 -2.5832734309574518e-02 -4.0424593103120743e-01 -1.2480732107260117e-01 4.4624965569792446e-01 1.3957000000000000e-01 1 0 0 0 0 -P 252 211 -2.9299877647187089e-01 3.1963917806909597e-01 2.6394989349136422e-01 5.2646635062917657e-01 1.3957000000000000e-01 1 0 0 0 0 -V -59 0 -5.4768382651334292e-05 -1.2092719775668951e-04 7.1245113617988620e-05 1.6291191074476475e-04 0 2 0 -P 253 22 1.7493171764315394e-02 -1.3904813024503002e-02 -1.1450675993148609e-02 2.5109218711905378e-02 0 1 0 0 0 0 -P 254 22 -1.3676863020353203e-01 -2.4945236956791661e-01 1.6660942228000178e-01 3.2968294236019380e-01 0 1 0 0 0 0 -V -60 0 0 0 0 0 0 2 0 -P 255 2112 -1.9138160467729162e-01 3.0369538458739065e-01 -1.5191645722299414e+01 1.5224905561020293e+01 9.3957000000000002e-01 1 0 0 0 0 -P 256 -211 -2.4924753882325268e-01 -5.7307336326951931e-02 -8.0502092127927884e+00 8.0554799125216761e+00 1.3957000000000000e-01 1 0 0 0 0 -V -61 0 0 0 0 0 0 2 0 -P 257 2112 8.3027060514221970e-02 1.0739718499538585e-01 -9.4824633945358805e+00 9.5298652383827278e+00 9.3957000000000002e-01 1 0 0 0 0 -P 258 211 3.7175815217142839e-02 2.6740268932865324e-01 -1.4844147785192647e+00 1.5152073320452397e+00 1.3957000000000000e-01 1 0 0 0 0 -V -62 0 0 0 0 0 0 2 0 -P 259 -2212 1.9997999199392005e-01 5.2159092633940130e-01 -2.9420638804998770e+01 2.9440896511124400e+01 9.3827000000000005e-01 1 0 0 0 0 -P 260 -211 -3.3996362219612538e-03 -2.4490681945780598e-03 -9.8059964122678123e-01 9.9049129059046015e-01 1.3957000000000000e-01 1 0 0 0 0 -V -63 0 0 0 0 0 0 2 0 -P 261 311 -3.7995269441653340e-01 1.6535799088428479e-01 -6.1483584577768262e+00 6.1823696483920711e+00 4.9767000000000000e-01 2 0 0 -138 0 -P 262 211 -3.2410970022291918e-01 -3.5537657560602026e-01 -7.5887342744711495e+00 7.6052420922480319e+00 1.3957000000000000e-01 1 0 0 0 0 -V -64 0 0 0 0 0 0 2 0 -P 263 -321 2.6631810341032058e-01 1.7773913266626884e-01 -2.2183705565824408e+00 2.2950654495671614e+00 4.9359999999999998e-01 1 0 0 0 0 -P 264 321 5.6285097287058927e-01 4.6545950697236843e-01 -3.1778246174274649e+00 3.2978271679122821e+00 4.9359999999999998e-01 1 0 0 0 0 -V -65 0 0 0 0 0 0 2 0 -P 265 -311 -3.9453058218165832e-01 2.5328290511276014e-01 -7.7255254295189668e-01 1.0316586018738949e+00 4.9767000000000000e-01 2 0 0 -139 0 -P 266 -211 -4.9735599405596756e-02 -2.6708316642768254e-01 -2.9208743241984952e-01 4.2261318095261929e-01 1.3957000000000000e-01 1 0 0 0 0 -V -66 0 0 0 0 0 0 2 0 -P 267 211 4.6420703636526520e-02 -3.1935185958196421e-01 -2.6465407149408987e-01 4.4007051071727998e-01 1.3957000000000000e-01 1 0 0 0 0 -P 268 111 4.2313793796367721e-01 9.7966164171689893e-02 5.4268928151349305e-01 7.0807791981977419e-01 1.3497999999999999e-01 2 0 0 -140 0 -V -67 0 0 0 0 0 0 3 0 -P 269 -211 1.6386205957906591e-01 -2.8797173352374816e-01 -3.9627447208558847e-01 5.3506236646289917e-01 1.3957000000000000e-01 1 0 0 0 0 -P 270 211 -1.4271113813788025e-02 -1.6982856077004688e-02 -5.1470645008149614e-03 1.4141555523701732e-01 1.3957000000000000e-01 1 0 0 0 0 -P 271 111 1.3605163797175168e-01 2.3453626189350621e-01 -3.3108250223819413e-01 4.4872322207133397e-01 1.3497999999999999e-01 2 0 0 -141 0 -V -68 0 0 0 0 0 0 2 0 -P 272 -211 -3.7696463658742585e-01 4.6783841638839324e-01 2.6462046064315636e-01 6.7117724497876563e-01 1.3957000000000000e-01 1 0 0 0 0 -P 273 111 1.6228776433218009e-01 -4.0425537266713100e-02 -2.6536335188142224e-01 3.4148038221394672e-01 1.3497999999999999e-01 2 0 0 -142 0 -V -69 0 0 0 0 0 0 2 0 -P 274 -211 4.5889677578228821e-01 -5.1523219110723040e-01 9.6187324222664792e+00 9.6444566284284221e+00 1.3957000000000000e-01 1 0 0 0 0 -P 275 211 -2.8494447274304274e-01 9.9144559728567477e-02 2.3859558054260877e+00 2.4090014293513886e+00 1.3957000000000000e-01 1 0 0 0 0 -V -70 0 0 0 0 0 0 3 0 -P 276 111 -2.9460756327081435e-03 9.2886448846853601e-03 1.7698034532282698e+00 1.7749700903801551e+00 1.3497999999999999e-01 2 0 0 -143 0 -P 277 111 -1.4355787675334006e-01 2.4399905742791486e-01 2.9250863072903583e+00 2.9418521223034277e+00 1.3497999999999999e-01 2 0 0 -144 0 -P 278 111 -4.9167220466248530e-02 3.5605701780104602e-02 6.1268254615206985e-01 6.3030523108015979e-01 1.3497999999999999e-01 2 0 0 -145 0 -V -71 0 -7.5868240100300521e-05 2.1564214861322876e-04 2.4770455533049511e-02 2.4771568448014918e-02 0 2 0 -P 279 22 1.2440521239830230e-02 1.3976757843603155e-02 4.1819631103660040e+00 4.1820049704406896e+00 0 1 0 0 0 0 -P 280 22 -2.0331319966104358e-01 5.2854530978175718e-01 5.8136645928885947e+01 5.8139403989568891e+01 0 1 0 0 0 0 -V -72 0 0 0 0 0 0 2 0 -P 281 321 2.1642746277190641e-01 -6.7327959002127669e-01 2.1482677626049064e+01 2.1499981981335011e+01 4.9359999999999998e-01 1 0 0 0 0 -P 282 111 -8.5724359704836925e-02 5.6304652189988848e-02 7.7384665104011416e+00 7.7403231465298052e+00 1.3497999999999999e-01 2 0 0 -146 0 -V -73 0 0 0 0 0 0 1 0 -P 283 310 -4.9885948856357186e-02 1.2822300091927889e-02 4.5329270329114166e+00 4.5604556717363280e+00 4.9767000000000000e-01 2 0 0 -147 0 -V -74 0 0 0 0 0 0 2 0 -P 284 321 -2.7920309589361664e-01 -2.9417814389614927e-01 2.2570322131419886e+02 2.2570412545568442e+02 4.9359999999999998e-01 1 0 0 0 0 -P 285 -211 -3.1422244950363426e-01 -4.4329822380123687e-02 3.7312147425334075e+02 3.7312163530094614e+02 1.3957000000000000e-01 1 0 0 0 0 -V -75 0 0 0 0 0 0 2 0 -P 286 3122 7.4262577958025780e-02 -2.4548660956187812e-01 2.0956003441221887e+03 2.0956006568059443e+03 1.1156800000000000e+00 2 0 0 -148 0 -P 287 211 -3.9039541146372155e-02 2.1107166763967344e-01 4.2163294363264680e+02 4.2163302137220023e+02 1.3957000000000000e-01 1 0 0 0 0 -V -76 0 0 0 0 0 0 2 0 -P 288 -211 -2.0057133852812120e-01 6.3358175356901622e-02 5.3623025438152285e+02 5.3623031379900362e+02 1.3957000000000000e-01 1 0 0 0 0 -P 289 111 3.1720852422812107e-01 -3.0976971985094492e-01 5.7528165457763157e+02 5.7528184126713484e+02 1.3497999999999999e-01 2 0 0 -149 0 -V -77 0 0 0 0 0 0 2 0 -P 290 -211 -3.5297618575010037e-01 5.2153555934991228e-02 -8.0473046163509775e+02 8.0473055284076520e+02 1.3957000000000000e-01 1 0 0 0 0 -P 291 211 -4.3236004417965990e-01 8.1308540264093787e-01 -8.7028198251002880e+02 8.7028248092469994e+02 1.3957000000000000e-01 1 0 0 0 0 -V -78 0 0 0 0 0 0 2 0 -P 292 421 -1.7659721204514614e+01 -1.3074065417320448e+01 2.7202781467015444e+02 2.7292014446359110e+02 1.8645000000000000e+00 2 0 0 -150 0 -P 293 111 -1.4776451472050109e+00 -1.0577813465072390e+00 2.2908056187391484e+01 2.2980417629868313e+01 1.3497999999999999e-01 2 0 0 -151 0 -V -79 0 0 0 0 0 0 2 0 -P 294 -211 -1.1583166595630789e+00 -1.0356886852578260e+00 2.0998472633156180e+01 2.1056345391518004e+01 1.3957000000000000e-01 1 0 0 0 0 -P 295 211 -4.0033937843749587e+00 -2.6524733090065382e+00 5.2159779948282527e+01 5.2380577511954947e+01 1.3957000000000000e-01 1 0 0 0 0 -V -80 0 -1.4431088124816109e-05 -4.8928852593760701e-06 4.1880274008966248e-04 4.1945629741203458e-04 0 2 0 -P 296 22 -8.5756643853515627e-02 3.5367132902272655e-02 1.2404140135934969e+00 1.2438777918967254e+00 0 1 0 0 0 0 -P 297 22 -2.3881849645594963e-02 -7.2540252771141386e-02 1.9413905114422942e+00 1.9428920579725391e+00 0 1 0 0 0 0 -V -81 0 0 0 0 0 0 2 0 -P 298 -211 -3.7116803471142029e-01 -1.5843331213655415e-01 3.3881934198240016e+00 3.4149965240721345e+00 1.3957000000000000e-01 1 0 0 0 0 -P 299 111 -1.4863948599066970e+00 -2.4605035091902030e+00 2.7696156184156585e+01 2.7845264124728452e+01 1.3497999999999999e-01 2 0 0 -152 0 -V -82 0 0 0 0 0 0 2 0 -P 300 211 -1.3102071172472114e+00 -6.6653559707336441e-01 1.4736991379972928e+01 1.4810783473893188e+01 1.3957000000000000e-01 1 0 0 0 0 -P 301 -211 -6.6001250531248001e-01 -8.3817907178677653e-02 3.8600596933206637e+00 3.9194620255376229e+00 1.3957000000000000e-01 1 0 0 0 0 -V -83 0 0 0 0 0 0 3 0 -P 302 111 -1.0129607511280893e-01 1.7331886710189474e-02 1.1003937127586700e+00 1.1133944550827461e+00 1.3497999999999999e-01 2 0 0 -153 0 -P 303 111 2.6736441445761979e-02 -6.4664089522388349e-02 2.1034626839622458e-01 2.5954081529339207e-01 1.3497999999999999e-01 2 0 0 -154 0 -P 304 221 -1.1025089952773082e-01 9.3855832111780987e-03 2.3898831919172103e+00 2.4542792268866394e+00 5.4744999999999999e-01 2 0 0 -155 0 -V -84 0 0 0 0 0 0 2 0 -P 305 311 2.1723555449960955e-01 2.5511909827769035e+00 2.9876035175259780e+01 2.9989680224020404e+01 4.9767000000000000e-01 2 0 0 -156 0 -P 306 211 3.3032821126792672e-01 6.6929463924130272e-01 6.4845571157288475e+00 6.5288615250536779e+00 1.3957000000000000e-01 1 0 0 0 0 -V -85 0 0 0 0 0 0 2 0 -P 307 -311 7.4141747198539887e-01 1.8100047541943822e+00 1.5235835672865862e+01 1.5368935589605529e+01 4.9767000000000000e-01 2 0 0 -157 0 -P 308 -211 5.8970851337611008e-01 1.9279465025540885e+00 1.8876557468741275e+01 1.8984431397938966e+01 1.3957000000000000e-01 1 0 0 0 0 -V -86 0 0 0 0 0 0 2 0 -P 309 -211 5.6503765038489062e-01 2.3392525032674194e+00 1.9776469739542058e+01 1.9922841287434835e+01 1.3957000000000000e-01 1 0 0 0 0 -P 310 211 -1.1698407055756944e-01 6.6383270616705115e-01 9.5858997540570403e+00 9.6105833857405401e+00 1.3957000000000000e-01 1 0 0 0 0 -V -87 0 0 0 0 0 0 2 0 -P 311 211 1.3668928578316808e+00 3.5273910635892820e+00 3.2919426948257488e+01 3.3136370262701405e+01 1.3957000000000000e-01 1 0 0 0 0 -P 312 111 3.4083938668539631e+00 7.3637743950997869e+00 8.1016841670164283e+01 8.1422289183628351e+01 1.3497999999999999e-01 2 0 0 -158 0 -V -88 0 0 0 0 0 0 2 0 -P 313 321 5.1398658600433409e+00 1.0815446396235405e+01 1.1230433937571154e+02 1.1294202222992146e+02 4.9359999999999998e-01 1 0 0 0 0 -P 314 -211 1.4809390437974521e+00 3.6232085950452890e+00 3.9666759311137888e+01 3.9859654978528077e+01 1.3957000000000000e-01 1 0 0 0 0 -V -89 0 0 0 0 0 0 2 0 -P 315 311 8.3836765391802071e-01 1.1061415327090975e+00 -2.0993031465343575e+00 2.5653768813702778e+00 4.9767000000000000e-01 2 0 0 -159 0 -P 316 211 1.0392575238106148e+00 7.2574223863792198e-01 -2.9001820808281353e+00 3.1681688535488077e+00 1.3957000000000000e-01 1 0 0 0 0 -V -90 0 0 0 0 0 0 2 0 -P 317 311 1.6058894356953304e-02 -3.9658053507255009e-01 -2.7554049904710340e+00 2.8279791546790221e+00 4.9767000000000000e-01 2 0 0 -160 0 -P 318 211 -4.9457973416370704e-01 -2.4449879686077405e-01 -2.6488057631132196e+00 2.7092509168981773e+00 1.3957000000000000e-01 1 0 0 0 0 -V -91 0 0 0 0 0 0 2 0 -P 319 211 5.5367043874559790e-02 5.2998456753257217e-01 5.0211679739135224e+00 5.0512925829459654e+00 1.3957000000000000e-01 1 0 0 0 0 -P 320 111 -2.6308556172843650e-01 -1.0479134122864993e-01 1.3534295300588093e+00 1.3893114594005462e+00 1.3497999999999999e-01 2 0 0 -161 0 -V -92 0 0 0 0 0 0 1 0 -P 321 130 3.6602657683902218e-01 2.7637537539729494e-02 1.1512728067232807e+00 1.3068449765883683e+00 4.9767000000000000e-01 1 0 0 0 0 -V -93 0 0 0 0 0 0 2 0 -P 322 -321 -1.8424422202606633e-01 1.0267733119375648e-01 3.3182378596813287e+00 3.3613735319231615e+00 4.9359999999999998e-01 1 0 0 0 0 -P 323 211 2.5061687005741484e-01 4.1111105095076861e-01 1.4668363167462029e+00 1.5501321481721444e+00 1.3957000000000000e-01 1 0 0 0 0 -V -94 0 4.9204414482214235e-05 9.3279171563236449e-05 3.5046945812757313e-05 1.2049586895639305e-04 0 2 0 -P 324 22 1.4638419996119670e-03 5.3436389585819963e-02 -2.7413433695101901e-02 6.0075676544863857e-02 0 1 0 0 0 0 -P 325 22 1.4114779065072622e-01 2.1691933131626764e-01 1.2899176186669112e-01 2.8916356916760982e-01 0 1 0 0 0 0 -V -95 0 0 0 0 0 0 2 0 -P 326 -211 -1.7165868603711240e-01 -4.4258740952734626e-01 6.6513282107305505e-01 8.2899443552578533e-01 1.3957000000000000e-01 1 0 0 0 0 -P 327 111 4.1393041000816050e-01 1.7855384603152144e-01 6.8502876375156219e-01 8.3108595694378429e-01 1.3497999999999999e-01 2 0 0 -162 0 -V -96 0 0 0 0 0 0 3 0 -P 328 -211 -3.9561090808922145e-01 -2.1572664482033080e-01 -2.0918580262695435e-01 5.1602757756276807e-01 1.3957000000000000e-01 1 0 0 0 0 -P 329 211 -7.2592869091610646e-01 -5.6546117318346967e-01 -8.6889461933755874e-01 1.2732542743250301e+00 1.3957000000000000e-01 1 0 0 0 0 -P 330 111 7.5195477124670789e-03 -3.7276307923386154e-02 -2.3492322655699543e-01 2.7359566792284662e-01 1.3497999999999999e-01 2 0 0 -163 0 -V -97 0 0 0 0 0 0 2 0 -P 331 211 -2.1245054419147788e-01 -9.4426467212448351e-01 -1.0757049671517334e+00 1.4537509986254611e+00 1.3957000000000000e-01 1 0 0 0 0 -P 332 111 -4.0237996847179375e-01 -1.8278784340935744e-01 -9.6114577330509182e-02 4.7199432952211190e-01 1.3497999999999999e-01 2 0 0 -164 0 -V -98 0 0 0 0 0 0 2 0 -P 333 211 2.0149439122852938e-01 -5.3302766918694060e-02 5.7020627225908882e-01 6.2294153215317916e-01 1.3957000000000000e-01 1 0 0 0 0 -P 334 111 -3.3335360091003480e-01 5.6583731288352612e-01 2.2813085968389601e+00 2.3777899407437744e+00 1.3497999999999999e-01 2 0 0 -165 0 -V -99 0 -3.5153111932296456e-07 1.6115135681743178e-05 4.6661535374685549e-05 4.9448443747731639e-05 0 2 0 -P 335 22 -9.2603642081564800e-03 7.6483303944505310e-01 2.1439769219474183e+00 2.2763330982997969e+00 0 1 0 0 0 0 -P 336 22 -7.4857902311984215e-03 2.8558964801153959e-03 7.8874014455751498e-02 7.9279905123913585e-02 0 1 0 0 0 0 -V -100 0 0 0 0 0 0 2 0 -P 337 -211 9.3383194809242093e-02 -2.6183692551778537e-01 6.6393712447782982e-01 7.3319253051110411e-01 1.3957000000000000e-01 1 0 0 0 0 -P 338 111 6.7289261809585277e-02 1.3713406947866838e-01 4.0726953178542686e+00 4.0777935639557263e+00 1.3497999999999999e-01 2 0 0 -166 0 -V -101 0 -1.9219786930458220e+00 -2.4415068214109641e+00 2.4918920370571573e+02 2.4927833695139438e+02 0 2 0 -P 339 2112 -3.3088369099467252e-01 -5.7444073773084292e-01 3.9933593320707132e+01 3.9950145600068296e+01 9.3957000000000002e-01 1 0 0 0 0 -P 340 211 -5.6758936924963282e-02 8.2014820752740830e-02 1.0325214502289962e+01 1.0326639449062938e+01 1.3957000000000000e-01 1 0 0 0 0 -V -102 0 -2.1522575615476658e+01 -4.3850708113160948e+02 3.2110018097210530e+04 3.2113842334975812e+04 0 2 0 -P 341 -3122 -6.1950855666021008e-02 -1.8608321980917468e+00 1.4056162772703544e+02 1.4057838548480370e+02 1.1156800000000000e+00 2 0 0 -167 0 -P 342 111 -6.1144406211079527e-02 -6.4714570154417439e-01 4.3086981861879245e+01 4.3092096279523801e+01 1.3497999999999999e-01 2 0 0 -168 0 -V -103 0 0 0 0 0 0 2 0 -P 343 -311 2.3049720807893612e-01 2.8623903870378370e-01 1.6043582351245217e+01 1.6055505966499382e+01 4.9767000000000000e-01 2 0 0 -169 0 -P 344 111 4.3323721233431339e-02 -1.5003883936399090e-01 1.1853284016418417e+00 1.2031673276307036e+00 1.3497999999999999e-01 2 0 0 -170 0 -V -104 0 0 0 0 0 0 3 0 -P 345 211 -9.5026966603014729e-03 1.0472305562351994e-01 5.4539722523898408e+00 5.4567710538707095e+00 1.3957000000000000e-01 1 0 0 0 0 -P 346 -211 1.5951683483820989e-01 -1.9899631133411760e-01 1.3219014899412011e+01 1.3222211609571907e+01 1.3957000000000000e-01 1 0 0 0 0 -P 347 111 -7.4674051730606081e-02 -1.1330685333969616e-01 1.8391615088576583e+00 1.8490941871844135e+00 1.3497999999999999e-01 2 0 0 -171 0 -V -105 0 0 0 0 0 0 2 0 -P 348 211 9.4240763765740421e-02 -2.0039207547628959e-01 4.4634358422556447e-01 5.1743664882589113e-01 1.3957000000000000e-01 1 0 0 0 0 -P 349 -211 1.2820088924631756e-01 5.1534025291000973e-01 1.0318751511090531e+00 1.1688700341138147e+00 1.3957000000000000e-01 1 0 0 0 0 -V -106 0 1.7283871159768377e-04 -5.1237670737495545e-05 4.6694794270726891e-04 5.0505361596110525e-04 0 2 0 -P 350 22 2.0590099653440450e-01 -1.0805686291631406e-01 4.5142756285929947e-01 5.0779754873991134e-01 0 1 0 0 0 0 -P 351 22 1.4033350106869832e-01 5.4163779105943517e-03 4.8397333694826589e-01 5.0393751552023625e-01 0 1 0 0 0 0 -V -107 0 -5.9571695161317901e+00 1.2245768940169006e+01 2.8503800469478131e+02 2.9797787574076551e+02 0 2 0 -P 352 -2212 -2.0445056851432947e-01 3.2050366895688145e-02 2.9022963766333598e+00 3.0572049508829320e+00 9.3827000000000005e-01 1 0 0 0 0 -P 353 111 1.2185508809238729e-01 1.3773583207185866e-01 1.0497232649974710e+00 1.0742245367740775e+00 1.3497999999999999e-01 2 0 0 -172 0 -V -108 0 -9.6322276038832619e+00 9.1930061220952801e+00 1.6049331662647239e+02 1.6189071810331086e+02 0 2 0 -P 354 2212 -4.0557945128879624e-01 6.3010018115544275e-01 8.6263887815885774e+00 8.7095611217567726e+00 9.3827000000000005e-01 1 0 0 0 0 -P 355 111 -2.8752136302370007e-01 3.1395818652041142e-02 2.9221390377369709e+00 2.9395187340600821e+00 1.3497999999999999e-01 2 0 0 -173 0 -V -109 0 0 0 0 0 0 2 0 -P 356 22 8.2860331849337263e-02 2.5946703798069704e-01 5.8422378213656290e-01 6.4459786379308515e-01 0 1 0 0 0 0 -P 357 111 1.6254024186608135e-01 -5.4323460646157928e-01 1.7376202728837526e+00 1.8327757585203810e+00 1.3497999999999999e-01 2 0 0 -174 0 -V -110 0 0 0 0 0 0 2 0 -P 358 3122 8.2287967470987355e-01 -4.8977375048154131e-01 1.9007652783367175e+00 2.4030521824217304e+00 1.1156800000000000e+00 2 0 0 -175 0 -P 359 22 4.2440133887952043e-02 4.8963717863264443e-02 5.5112841739653869e-02 8.5064892617582183e-02 0 1 0 0 0 0 -V -111 0 1.9575759832658340e-06 -8.4215463207310107e-06 3.4437014986610818e-05 3.5510543948550919e-05 0 2 0 -P 360 22 3.8993041770294784e-01 -1.7748547164591819e+00 7.3603534731863398e+00 7.5813559635089769e+00 0 1 0 0 0 0 -P 361 22 6.5790980468783872e-02 -1.8567141221184214e-01 6.5654331790388576e-01 6.8545711368985129e-01 0 1 0 0 0 0 -V -112 0 -1.9123820769240353e-05 -1.0931279074538166e-04 4.2796901319070433e-04 4.4237576117062659e-04 0 2 0 -P 362 22 -2.8016866721716417e-02 -2.9039021747390238e-02 1.1296536115102888e-01 1.1995575194600025e-01 0 1 0 0 0 0 -P 363 22 -1.4452078978212046e-01 -9.5719552670846475e-01 3.7482280417359468e+00 3.8712172488618730e+00 0 1 0 0 0 0 -V -113 0 -5.2829075954546687e-05 -1.9728039359830118e-05 3.2116418888762709e-04 3.3253598813309538e-04 0 2 0 -P 364 22 -9.2677622365995471e-02 3.5763487191755067e-02 4.0184387193941451e-01 4.1394041372978913e-01 0 1 0 0 0 0 -P 365 22 -1.6658093635336459e-02 -7.6592884067167299e-02 2.6284154819225458e-01 2.7428022427690846e-01 0 1 0 0 0 0 -V -114 0 1.9026721056032020e-06 -6.6487627924737098e-05 3.1923840683783920e-04 3.2634509371974645e-04 0 2 0 -P 366 22 -5.2922013066489092e-03 -1.8495279301222559e-01 1.1983795218151989e+00 1.2125794907319167e+00 0 1 0 0 0 0 -P 367 22 2.5362907683383399e-02 -5.1640486805460895e-01 2.1691688376471201e+00 2.2299351360646953e+00 0 1 0 0 0 0 -V -115 0 8.3080161206741342e-07 8.9690026702319606e-06 -7.7220185387585991e-03 7.7220260674473792e-03 0 2 0 -P 368 22 1.2807334442024216e-02 1.6872475428951880e-01 -8.7236246335492766e+01 8.7236410441840746e+01 0 1 0 0 0 0 -P 369 22 6.1102140270908939e-03 3.5501549883767261e-02 -8.8595935336439027e+01 8.8595942660108562e+01 0 1 0 0 0 0 -V -116 0 0 0 0 0 0 1 0 -P 370 130 -2.5901715207887410e-01 -6.0542629745708865e-01 -4.0542979190677522e+02 4.0543063213315133e+02 4.9767000000000000e-01 1 0 0 0 0 -V -117 0 -2.5932220974105986e-05 -3.2182840041165912e-05 -2.1919063527299769e-02 2.1919107939990485e-02 0 2 0 -P 371 22 -1.3648486710504911e-02 -2.4201149018738738e-02 -4.4727716633536524e+01 4.4727725263272021e+01 0 1 0 0 0 0 -P 372 22 -2.1288484139337188e-01 -2.5693504327423017e-01 -1.4674830135649992e+02 1.4674868069795471e+02 0 1 0 0 0 0 -V -118 0 -6.3426606413962393e-05 2.4808356359595279e-05 -7.4879667489093568e-03 7.4883096167834978e-03 0 2 0 -P 373 22 -2.0640267653597780e-01 9.1527235463937567e-02 -3.1540598860155647e+01 3.1541407003444920e+01 0 1 0 0 0 0 -P 374 22 -1.7782037660169078e-01 5.8755791844814761e-02 -1.3819694063004073e+01 1.3820962930434334e+01 0 1 0 0 0 0 -V -119 0 -7.6594382175148806e-05 1.0311568830732706e-04 -3.2105301032281353e-03 3.2132543973279917e-03 0 2 0 -P 375 22 -1.4532360372654066e-01 1.8123345408859942e-01 -4.2544899258831723e+00 4.2608272722702969e+00 0 1 0 0 0 0 -P 376 22 -1.8149523905037179e-01 2.5874855200269725e-01 -9.4444486025079506e+00 9.4497354852067552e+00 0 1 0 0 0 0 -V -120 0 -2.6945611630769845e-05 -5.9334602571253519e-05 -5.3573371544319063e-04 5.4164571933427151e-04 0 2 0 -P 377 22 -5.1425758174186931e-02 -1.9143430287238708e-01 -1.4218012667249478e+00 1.4355523476978096e+00 0 1 0 0 0 0 -P 378 22 -2.7515104904687560e-02 1.7605450827771700e-02 -1.4770409307338708e-01 1.5127303793933949e-01 0 1 0 0 0 0 -V -121 0 -3.9050402682915103e-07 -1.2881513157305690e-06 -6.6667818902411055e-05 6.7019627241645576e-05 0 2 0 -P 379 22 -3.0608461630266422e-02 4.7117413463821520e-02 -7.5238235400289355e-01 7.5447739209987430e-01 0 1 0 0 0 0 -P 380 22 2.2770067252179792e-02 -7.2973838334351560e-02 -5.8580783350209997e-01 5.9077447036609565e-01 0 1 0 0 0 0 -V -122 0 0 0 0 0 0 3 0 -P 381 111 2.9839928828064254e-02 1.0831091175723169e-01 -6.6841704714606320e-01 6.9110247016893900e-01 1.3497999999999999e-01 2 0 0 -176 0 -P 382 111 9.4051595670043689e-02 -1.5755662152753916e-01 -9.1611447140274083e-01 9.4401012534229567e-01 1.3497999999999999e-01 2 0 0 -177 0 -P 383 111 -5.8991234477435692e-02 5.1879693076710056e-03 -4.7175090929207414e-01 4.9424224990242172e-01 1.3497999999999999e-01 2 0 0 -178 0 -V -123 0 1.5187813460115701e-06 1.3188082387851436e-05 -6.6229648474863657e-05 7.1493291597544587e-05 0 2 0 -P 384 22 5.5902947386336610e-02 8.1294574520283755e-02 -3.1554495833037971e-01 3.3060938900859188e-01 0 1 0 0 0 0 -P 385 22 -4.7151088874938803e-02 -5.2992830333063673e-03 -6.6098201979547425e-02 8.1365102394629227e-02 0 1 0 0 0 0 -V -124 0 1.3941114862900531e+02 -3.8582616698811592e+01 -3.8025609716628168e+02 4.1577110253421068e+02 0 2 0 -P 386 211 3.9155250151203191e-01 -2.1528995768384931e-01 -1.5735145062373210e+00 1.6416731750135662e+00 1.3957000000000000e-01 1 0 0 0 0 -P 387 -211 4.1789588401695882e-01 -8.7282582441069474e-03 -6.3432673863972289e-01 7.7237513464870078e-01 1.3957000000000000e-01 1 0 0 0 0 -V -125 0 8.4498806531586952e-06 -1.1900512863807261e-05 -6.7398973710353891e-05 6.9967903545644137e-05 0 2 0 -P 388 22 -2.6630265638253693e-02 -6.5818770699674248e-02 -3.0798444672715158e-01 3.1606281187480750e-01 0 1 0 0 0 0 -P 389 22 1.2307273012265166e-01 -7.0007383103435336e-02 -4.6127175879284371e-01 4.8251379881686041e-01 0 1 0 0 0 0 -V -126 0 7.8004833521485510e-05 1.1576629387707435e-05 -3.0620108155017886e-04 3.1874407920848768e-04 0 2 0 -P 390 22 1.9933684671653129e-01 7.6146875018833646e-02 -6.2136899240287891e-01 6.5698778508720601e-01 0 1 0 0 0 0 -P 391 22 6.2267559322930169e-02 -3.7322393019573769e-02 -4.0553598837003274e-01 4.1198258194734583e-01 0 1 0 0 0 0 -V -127 0 -8.7813863521750088e-06 1.2034602514798763e-05 -1.5143311212175529e-04 1.6721408133485042e-04 0 2 0 -P 392 22 -2.3942903281016213e-03 -3.0130749814585231e-02 -5.2283330825283574e-03 3.0674585203165079e-02 0 1 0 0 0 0 -P 393 22 -1.4702427472264043e-02 5.3561241855756364e-02 -2.8960087494286813e-01 2.9487901717548981e-01 0 1 0 0 0 0 -V -128 0 -2.1423274294986983e-09 -5.6955749109414071e-08 -1.2016903773209067e-06 1.2236738425450761e-06 0 2 0 -P 394 22 2.9979179212612915e-02 -5.2589578798866686e-02 -6.6790136325526994e-01 6.7063898337537198e-01 0 1 0 0 0 0 -P 395 22 -3.1271496752553057e-02 1.8232125983285968e-02 -5.6995088522171715e-02 6.7518568132518497e-02 0 1 0 0 0 0 -V -129 0 6.4230189101412486e-04 2.1134687592085452e-04 -1.2311020831505474e-03 1.4158196050410717e-03 0 2 0 -P 396 22 4.7543339096574699e-01 1.2513612268912652e-01 -8.8650115517581829e-01 1.0136963335116276e+00 0 1 0 0 0 0 -P 397 22 1.1406207269271662e-02 3.5056505732190810e-02 -4.6625855552734644e-02 5.9439301513772705e-02 0 1 0 0 0 0 -V -130 0 6.1987795725867684e-06 9.5499117210155789e-07 -4.4541397254386405e-06 9.4731035377011082e-06 0 2 0 -P 398 22 3.1268929850001737e-02 -1.5940111577112004e-02 2.8161984871342943e-02 4.4999228026143444e-02 0 1 0 0 0 0 -P 399 22 1.2007827458552617e-01 3.9256837468990093e-02 -1.3691268131352266e-01 1.8629270951908428e-01 0 1 0 0 0 0 -V -131 0 -6.1020743762232836e-06 2.3286883231540951e-05 3.1154149503248974e-05 4.0116565936475085e-05 0 2 0 -P 400 22 9.8091349468157167e-03 2.8377074072342766e-02 2.8749442920756804e-03 3.0161942344527581e-02 0 1 0 0 0 0 -P 401 22 -1.1681959734655756e-01 3.7999883038497267e-01 5.4346712538239117e-01 6.7335165091470495e-01 0 1 0 0 0 0 -V -132 0 0 0 0 0 0 1 0 -P 402 310 6.3943275598408489e-01 1.2113139656898524e+00 3.6184751514319600e+00 3.9009221503807563e+00 4.9767000000000000e-01 2 0 0 -179 0 -V -133 0 2.1682042467538229e-04 5.8286243176109223e-04 1.5576230338453930e-03 1.6773997708551909e-03 0 2 0 -P 403 22 2.4201269272194240e-02 6.6012324731882441e-02 2.3795568295198377e-01 2.4812544307272844e-01 0 1 0 0 0 0 -P 404 22 1.0510982471609078e+00 2.8246364319896307e+00 7.4869221627889990e+00 8.0707733191912254e+00 0 1 0 0 0 0 -V -134 0 3.4028799303023395e-07 6.8044664732665194e-05 2.3824180161942965e-04 2.4828257593497463e-04 0 2 0 -P 405 22 -1.8724816343446530e-02 1.8332032364017255e-02 1.8532644632463863e-01 1.8716990640861672e-01 0 1 0 0 0 0 -P 406 22 2.1601819009504697e-02 5.5695914997728446e-01 1.8289153502253255e+00 1.9119627328004498e+00 0 1 0 0 0 0 -V -135 0 -2.8410493234902523e-07 4.9653121634296811e-06 1.2557293115166877e-05 1.3560118830762203e-05 0 2 0 -P 407 22 -4.4743249094535947e-02 1.9716395208185372e-01 6.6189268680366531e-01 6.9208201189183216e-01 0 1 0 0 0 0 -P 408 22 1.2964127804323806e-02 3.5824089844551110e-01 7.4272826674382830e-01 8.2471200315568660e-01 0 1 0 0 0 0 -V -136 0 1.2820883171547144e-04 3.9619298966311092e-04 1.2949937227216559e-03 1.3632177937560695e-03 0 2 0 -P 409 22 9.5401467154298369e-02 1.4201353519440010e-01 4.1464312309795665e-01 4.4855122744902953e-01 0 1 0 0 0 0 -P 410 22 9.8717857676942675e-02 4.5785711823261399e-01 1.5460900319572877e+00 1.6154791063515139e+00 0 1 0 0 0 0 -V -137 0 2.1777252934043211e-04 2.7706919009262037e-04 2.5559848756957063e-03 2.5836416730343919e-03 0 2 0 -P 411 22 2.2477690016267710e-01 2.0485754477111837e-01 1.9801073036459287e+00 2.0033262845698210e+00 0 1 0 0 0 0 -P 412 22 -5.3958177061138798e-03 7.4258186776740800e-02 5.9475707649892273e-01 5.9939917684096833e-01 0 1 0 0 0 0 -V -138 0 0 0 0 0 0 1 0 -P 413 130 -3.7995269441653340e-01 1.6535799088428479e-01 -6.1483584577768262e+00 6.1823696483920711e+00 4.9767000000000000e-01 1 0 0 0 0 -V -139 0 0 0 0 0 0 1 0 -P 414 130 -3.9453058218165832e-01 2.5328290511276014e-01 -7.7255254295189668e-01 1.0316586018738949e+00 4.9767000000000000e-01 1 0 0 0 0 -V -140 0 5.1667498257619163e-05 1.1962214121015359e-05 6.6265382966993475e-05 8.6460256588212749e-05 0 2 0 -P 415 22 1.3628231428135446e-01 -3.0848081013764246e-02 1.8460013377020124e-01 2.3152037205414516e-01 0 1 0 0 0 0 -P 416 22 2.8685562368232276e-01 1.2881424518545415e-01 3.5808914774329187e-01 4.7655754776562892e-01 0 1 0 0 0 0 -V -141 0 1.4713679733888919e-04 2.5364571091757474e-04 -3.5805830609983571e-04 4.8528410808895716e-04 0 2 0 -P 417 22 1.5170505358038230e-01 1.4788339243534807e-01 -2.0395109752352847e-01 2.9407477148008737e-01 0 1 0 0 0 0 -P 418 22 -1.5653415608630622e-02 8.6652869458158130e-02 -1.2713140471466566e-01 1.5464845059124649e-01 0 1 0 0 0 0 -V -142 0 9.7597729456307835e-06 -2.4311387032276793e-06 -1.5958603367984514e-05 2.0536181575424412e-05 0 2 0 -P 419 22 1.7652769046773198e-01 -5.0690402920813803e-02 -2.6675987154484626e-01 3.2387091798549728e-01 0 1 0 0 0 0 -P 420 22 -1.4239926135551901e-02 1.0264865654100702e-02 1.3965196634240379e-03 1.7609464228449393e-02 0 1 0 0 0 0 -V -143 0 -2.1652244280857262e-08 6.8267089224883744e-08 1.3007207375452835e-05 1.3045179682912007e-05 0 2 0 -P 421 22 4.6650114506723746e-02 -3.2179447089061786e-02 1.2307133927841611e+00 1.2320175344437061e+00 0 1 0 0 0 0 -P 422 22 -4.9596190139431888e-02 4.1468091973747144e-02 5.3909006044410879e-01 5.4295255593644887e-01 0 1 0 0 0 0 -V -144 0 -3.5047386073016382e-05 5.9568512439212194e-05 7.1411357862754014e-04 7.1820668730872685e-04 0 2 0 -P 423 22 -1.6211167583281016e-02 1.6029005891738021e-01 1.5450176957825907e+00 1.5533947937415964e+00 0 1 0 0 0 0 -P 424 22 -1.2734670917005905e-01 8.3708998510534635e-02 1.3800686115077676e+00 1.3884573285618313e+00 0 1 0 0 0 0 -V -145 0 -7.8293712475779411e-06 5.6698396843146972e-06 9.7563357563170913e-05 1.0036958783961753e-04 0 2 0 -P 425 22 -4.4907714662178962e-04 2.5252550384878151e-03 5.2306614750949010e-01 5.2307243595291153e-01 0 1 0 0 0 0 -P 426 22 -4.8718143319626740e-02 3.3080446741616781e-02 8.9616398642579656e-02 1.0723279512724822e-01 0 1 0 0 0 0 -V -146 0 -5.4416939621261388e-05 3.5741612642758141e-05 4.9122987480755935e-03 4.9134773215459586e-03 0 2 0 -P 427 22 -2.6387009064352013e-02 8.4004864299616053e-02 5.9618585584390296e+00 5.9625087473567762e+00 0 1 0 0 0 0 -P 428 22 -5.9337350640484919e-02 -2.7700212109627198e-02 1.7766079519621116e+00 1.7778143991730293e+00 0 1 0 0 0 0 -V -147 0 -4.8810730286750834e+00 1.2545934191710093e+00 4.4352264291904982e+02 4.4621617285212420e+02 0 2 0 -P 429 211 -1.7457052418593882e-01 1.4834074360287047e-01 2.2901757748054155e+00 2.3058327581446125e+00 1.3957000000000000e-01 1 0 0 0 0 -P 430 -211 1.2468457532958163e-01 -1.3551844351094258e-01 2.2427512581060007e+00 2.2546229135917155e+00 1.3957000000000000e-01 1 0 0 0 0 -V -148 0 3.3734014604774782e+00 -1.1151308101528222e+01 9.5193318840002597e+04 9.5193333043762643e+04 0 2 0 -P 431 2212 8.1826167453099480e-02 -1.1732909246796693e-01 1.8196620878460528e+03 1.8196623353678799e+03 9.3827000000000005e-01 1 0 0 0 0 -P 432 -211 -7.5635894950737050e-03 -1.2815751709391118e-01 2.7593825627613575e+02 2.7593832143806401e+02 1.3957000000000000e-01 1 0 0 0 0 -V -149 0 5.5860599777425171e-05 -5.4550622136858487e-05 1.0130742338609310e-01 1.0130745626221979e-01 0 2 0 -P 433 22 5.3127991794322899e-02 -3.2276297017659527e-03 4.3064051628352409e+01 4.3064084521216841e+01 0 1 0 0 0 0 -P 434 22 2.6408053243379820e-01 -3.0654209014917899e-01 5.3221760294927924e+02 5.3221775674591811e+02 0 1 0 0 0 0 -V -150 0 -1.5319121601429257e+00 -1.1341243479074379e+00 2.3597355380886921e+01 2.3674761521425197e+01 0 3 0 -P 435 -11 -3.4448541147224727e+00 -2.1673819217200201e+00 5.1935029434568854e+01 5.2094259250861342e+01 5.1000000000000004e-04 1 0 0 0 0 -P 436 12 -4.2238184423944363e+00 -2.9424417727589072e+00 5.8151692879242468e+01 5.8379088640900576e+01 0 1 0 0 0 0 -P 437 -323 -9.9910486473977098e+00 -7.9642417228415239e+00 1.6194109235634318e+02 1.6244679657182928e+02 8.9113612264994757e-01 2 0 0 -180 0 -V -151 0 -3.0267907484688106e-04 -2.1667467318300509e-04 4.6924589888549329e-03 4.7072814206849970e-03 0 2 0 -P 438 22 -3.8616153777891304e-01 -3.2085121577077497e-01 6.9505767564859688e+00 6.9686859223044602e+00 0 1 0 0 0 0 -P 439 22 -1.0914836094260980e+00 -7.3693013073646418e-01 1.5957479430905517e+01 1.6011731707563854e+01 0 1 0 0 0 0 -V -152 0 -1.7062890829058920e-05 -2.8245053783665636e-05 3.1793469023735265e-04 3.1964635688822040e-04 0 2 0 -P 440 22 -1.0435465547979850e+00 -1.7996058853758738e+00 1.9566723582087082e+01 1.9676997801811968e+01 0 1 0 0 0 0 -P 441 22 -4.4284830510871187e-01 -6.6089762381432915e-01 8.1294326020695031e+00 8.1682663229164856e+00 0 1 0 0 0 0 -V -153 0 -3.1542001895608145e-05 5.3968764619798570e-06 3.4264526572323572e-04 3.4669349205948460e-04 0 2 0 -P 442 22 -8.0791166844111639e-02 -3.2189915652128150e-02 3.3426949576462373e-01 3.4539759569003958e-01 0 1 0 0 0 0 -P 443 22 -2.0504908268697278e-02 4.9521802362317624e-02 7.6612421699404609e-01 7.6799685939270645e-01 0 1 0 0 0 0 -V -154 0 9.1194079493466010e-06 -2.2055972303718910e-05 7.1746026337098247e-05 8.8525564591978662e-05 0 2 0 -P 444 22 4.4375559630183692e-02 -8.1141214280723017e-02 6.7063784646850977e-02 1.1423938969813084e-01 0 1 0 0 0 0 -P 445 22 -1.7639118184421713e-02 1.6477124758334672e-02 1.4328248374937363e-01 1.4530142559526124e-01 0 1 0 0 0 0 -V -155 0 0 0 0 0 0 3 0 -P 446 -211 -1.2083893186628652e-02 -3.0447187204953679e-03 2.1866051202995368e-01 2.5970655595851694e-01 1.3957000000000000e-01 1 0 0 0 0 -P 447 211 -3.9017277570356779e-02 6.7873350480066846e-02 9.7799031246865564e-01 9.9099645601633257e-01 1.3957000000000000e-01 1 0 0 0 0 -P 448 111 -5.9149728770745383e-02 -5.5443048548393381e-02 1.1932323674186009e+00 1.2035762149117901e+00 1.3497999999999999e-01 2 0 0 -181 0 -V -156 0 0 0 0 0 0 1 0 -P 449 130 2.1723555449960955e-01 2.5511909827769035e+00 2.9876035175259780e+01 2.9989680224020404e+01 4.9767000000000000e-01 1 0 0 0 0 -V -157 0 0 0 0 0 0 1 0 -P 450 130 7.4141747198539887e-01 1.8100047541943822e+00 1.5235835672865862e+01 1.5368935589605529e+01 4.9767000000000000e-01 1 0 0 0 0 -V -158 0 1.7351913697729272e-03 3.7488501266216717e-03 4.1245152398448455e-02 4.1451563116734411e-02 0 2 0 -P 451 22 1.0308594459127123e+00 2.3659970894042619e+00 2.5530134555087137e+01 2.5660249099047178e+01 0 1 0 0 0 0 -P 452 22 2.3775344209412506e+00 4.9977773056955250e+00 5.5486707115077145e+01 5.5762040084581187e+01 0 1 0 0 0 0 -V -159 0 0 0 0 0 0 1 0 -P 453 310 8.3836765391802071e-01 1.1061415327090975e+00 -2.0993031465343575e+00 2.5653768813702778e+00 4.9767000000000000e-01 2 0 0 -182 0 -V -160 0 0 0 0 0 0 1 0 -P 454 130 1.6058894356953304e-02 -3.9658053507255009e-01 -2.7554049904710340e+00 2.8279791546790221e+00 4.9767000000000000e-01 1 0 0 0 0 -V -161 0 -1.9621188813682868e-04 -7.8154448263063547e-05 1.0094015110836691e-03 1.0361626189904641e-03 0 2 0 -P 455 22 -2.3254182817736807e-01 -1.2491575400732739e-01 1.0094632796952816e+00 1.0434058464971556e+00 0 1 0 0 0 0 -P 456 22 -3.0543733551068413e-02 2.0124412778677454e-02 3.4396625036352763e-01 3.4590561290339050e-01 0 1 0 0 0 0 -V -162 0 8.3568869810553821e-05 3.6048434114535610e-05 1.3830121728265946e-04 1.6778886609429203e-04 0 2 0 -P 457 22 2.4288492612237900e-01 9.0668436853967346e-02 2.7353811306807857e-01 3.7687790075813715e-01 0 1 0 0 0 0 -P 458 22 1.7104548388578150e-01 8.7885409177554094e-02 4.1149065068348356e-01 4.5420805618564708e-01 0 1 0 0 0 0 -V -163 0 1.3216006764163915e-07 -6.5515102303526367e-07 -4.1289011918747853e-06 4.8085900059113686e-06 0 2 0 -P 459 22 -3.5887241341837671e-03 -8.6583539240239468e-02 -1.1971285349112167e-01 1.4778618169255256e-01 0 1 0 0 0 0 -P 460 22 1.1108271846650846e-02 4.9307231316853314e-02 -1.1521037306587376e-01 1.2580948623029431e-01 0 1 0 0 0 0 -V -164 0 -1.5055072319461211e-05 -6.8390188808296272e-06 -3.5961330733259308e-06 1.7659698101569677e-05 0 2 0 -P 461 22 -4.0993083371611022e-01 -1.7677142719017691e-01 -1.0529647981044868e-01 4.5867066023728786e-01 0 1 0 0 0 0 -P 462 22 7.5508652443164728e-03 -6.0164162191805306e-03 9.1819024799394983e-03 1.3323669284824168e-02 0 1 0 0 0 0 -V -165 0 -2.7392401929328713e-06 4.6496102213396840e-06 1.8746016793834067e-05 1.9538825314188313e-05 0 2 0 -P 463 22 -1.0003731834853867e-01 2.5283097632200424e-01 1.1235326616057013e+00 1.1559656609714217e+00 0 1 0 0 0 0 -P 464 22 -2.3331628256149614e-01 3.1300633656152188e-01 1.1577759352332588e+00 1.2218242797723524e+00 0 1 0 0 0 0 -V -166 0 8.0199826021123069e-06 1.6344552188550145e-05 4.8541096624487993e-04 4.8601860918723636e-04 0 2 0 -P 465 22 8.3203992980317998e-03 1.3075378695986642e-01 2.0217898032967851e+00 2.0260305502542839e+00 0 1 0 0 0 0 -P 466 22 5.8968862511553477e-02 6.3802825188019703e-03 2.0509055145574835e+00 2.0517630137014415e+00 0 1 0 0 0 0 -V -167 0 -2.2176502920647817e+01 -4.5814924703217315e+02 3.3593727812626566e+04 3.3597728938269509e+04 0 2 0 -P 467 -2112 1.7006220476968738e-02 -1.4198676287057894e+00 1.1029194055578076e+02 1.1030508264191346e+02 9.3957000000000002e-01 1 0 0 0 0 -P 468 111 -7.8957076142989746e-02 -4.4096456938595763e-01 3.0269687171254702e+01 3.0273302842890274e+01 1.3497999999999999e-01 2 0 0 -183 0 -V -168 0 -2.1522583089730073e+01 -4.3850716023828937e+02 3.2110023364135854e+04 3.2113847602526319e+04 0 2 0 -P 469 22 -5.9972763472978974e-02 -9.9333440691246874e-02 7.7279221313918729e+00 7.7287932003421123e+00 0 1 0 0 0 0 -P 470 22 -1.1716427381005567e-03 -5.4781226085292756e-01 3.5359059730487374e+01 3.5363303079181698e+01 0 1 0 0 0 0 -V -169 0 0 0 0 0 0 1 0 -P 471 310 2.3049720807893612e-01 2.8623903870378370e-01 1.6043582351245217e+01 1.6055505966499382e+01 4.9767000000000000e-01 2 0 0 -184 0 -V -170 0 3.4914532678784311e-06 -1.2091611271883410e-05 9.5525467425175406e-05 9.6963104236280875e-05 0 2 0 -P 472 22 -2.8578799884222700e-03 -9.5650782111636912e-02 1.0001698534411347e+00 1.0047372668160850e+00 0 1 0 0 0 0 -P 473 22 4.6181601221853615e-02 -5.4388057252354009e-02 1.8515854820070704e-01 1.9843006081461845e-01 0 1 0 0 0 0 -V -171 0 -9.1930787284703778e-06 -1.3949140284832638e-05 2.2641809508738701e-04 2.2764090129283901e-04 0 2 0 -P 474 22 -5.6083499290132392e-02 -1.8008624103932162e-02 1.2949529474570507e+00 1.2962919445720726e+00 0 1 0 0 0 0 -P 475 22 -1.8590552440473678e-02 -9.5298229235763990e-02 5.4420856140060736e-01 5.5280224261234023e-01 0 1 0 0 0 0 -V -172 0 -5.9571323110808398e+00 1.2245810993961999e+01 2.8503832519848919e+02 2.9797820372525308e+02 0 2 0 -P 476 22 8.5402691888110185e-02 9.3794685734850029e-04 4.4832020929371880e-01 4.5638307329173206e-01 0 1 0 0 0 0 -P 477 22 3.6452396204277100e-02 1.3679788521451017e-01 6.0140305570375219e-01 6.1784146348234537e-01 0 1 0 0 0 0 -V -173 0 -9.6322483005437558e+00 9.1930083820616098e+00 1.6049352697091061e+02 1.6189092969879238e+02 0 2 0 -P 478 22 -2.5840597269925236e-01 2.3419710580106768e-02 2.8430324580141546e+00 2.8548477519637201e+00 0 1 0 0 0 0 -P 479 22 -2.9115390324447706e-02 7.9761080719343742e-03 7.9106579722816081e-02 8.4670982096361508e-02 0 1 0 0 0 0 -V -174 0 1.9362453383904747e-06 -6.4712311384416142e-06 2.0699238014152610e-05 2.1832768783954246e-05 0 2 0 -P 480 22 7.9982585631339087e-02 -3.0055554413619706e-01 7.3899963334118335e-01 8.0178008655346600e-01 0 1 0 0 0 0 -P 481 22 8.2557656234742274e-02 -2.4267906232538228e-01 9.9862063954256941e-01 1.0309956719669151e+00 0 1 0 0 0 0 -V -175 0 5.9189417978298913e+00 -3.5229237181331476e+00 1.3672131417971420e+01 1.7285061767891126e+01 0 2 0 -P 482 2112 6.4235137517222740e-01 -4.9497879877226753e-01 1.6667267978295450e+00 2.0780734597031976e+00 9.3957000000000002e-01 1 0 0 0 0 -P 483 111 1.8052829953764615e-01 5.2050482907261431e-03 2.3403848050717271e-01 3.2497872271853295e-01 1.3497999999999999e-01 2 0 0 -185 0 -V -176 0 3.2368107173649057e-05 1.1748751882197927e-04 -7.2504846587870763e-04 7.4965590405039033e-04 0 2 0 -P 484 22 3.3096438086071843e-02 9.5270032922071729e-02 -6.7001799393867234e-01 6.7756613373792551e-01 0 1 0 0 0 0 -P 485 22 -3.2565092580075930e-03 1.3040878835159950e-02 1.6009467926091832e-03 1.3536336431013284e-02 0 1 0 0 0 0 -V -177 0 1.7771818971166606e-05 -2.9771613501586606e-05 -1.7310732929777555e-04 1.7837844148214842e-04 0 2 0 -P 486 22 6.1558622792612913e-02 -1.6626655517397546e-01 -5.8726617661499658e-01 6.1344567290473251e-01 0 1 0 0 0 0 -P 487 22 3.2492972877430783e-02 8.7099336464362964e-03 -3.2884829478774430e-01 3.3056445243756311e-01 0 1 0 0 0 0 -V -178 0 -9.0319580215618126e-06 7.9431328093258927e-07 -7.2228263183565165e-05 7.5671839946126528e-05 0 2 0 -P 488 22 2.9573892989124079e-02 1.8632854481216092e-02 -3.9234195500013468e-02 5.2546365327999708e-02 0 1 0 0 0 0 -P 489 22 -8.8565127466559770e-02 -1.3444885173545086e-02 -4.3251671379206064e-01 4.4169588457442188e-01 0 1 0 0 0 0 -V -179 0 3.8965967184924509e+01 7.3815455645638423e+01 2.2050384921737077e+02 2.3771569892247584e+02 0 2 0 -P 490 -211 3.4370582722418813e-01 9.0073938794577968e-01 2.0637289851098379e+00 2.2820872572159208e+00 1.3957000000000000e-01 1 0 0 0 0 -P 491 211 2.9572692875989670e-01 3.1057457774407260e-01 1.5547461663221218e+00 1.6188348931648355e+00 1.3957000000000000e-01 1 0 0 0 0 -V -180 0 -1.5319121601429257e+00 -1.1341243479074379e+00 2.3597355380886921e+01 2.3674761521425197e+01 0 2 0 -P 492 -311 -5.3510513540338858e+00 -4.2539020075613285e+00 9.0128199084237636e+01 9.0388436088253655e+01 4.9767000000000000e-01 2 0 0 -186 0 -P 493 -211 -4.6399972933638240e+00 -3.7103397152801953e+00 7.1812893272105555e+01 7.2058360483575626e+01 1.3957000000000000e-01 1 0 0 0 0 -V -181 0 -6.5602296668407379e-06 -6.1491259464092745e-06 1.3234005529448296e-04 1.3348727974680637e-04 0 2 0 -P 494 22 1.9370444762873518e-02 5.2687557162780880e-03 2.9877395026023861e-02 3.5994897564105149e-02 0 1 0 0 0 0 -P 495 22 -7.8520173533618898e-02 -6.0711804264671466e-02 1.1633549723925771e+00 1.1675813173476850e+00 0 1 0 0 0 0 -V -182 0 5.7856733218161665e+01 7.6336122058612588e+01 -1.4487536765697124e+02 1.7703966169953557e+02 0 2 0 -P 496 -211 7.3723989960307834e-01 1.0190140014707236e+00 -1.6758967864123988e+00 2.1000052448428641e+00 1.3957000000000000e-01 1 0 0 0 0 -P 497 211 1.0112775431494231e-01 8.7127531238373843e-02 -4.2340636012195859e-01 4.6537163652741326e-01 1.3957000000000000e-01 1 0 0 0 0 -V -183 0 -2.2176503811378527e+01 -4.5814925200678346e+02 3.3593728154105018e+04 3.3597729279788749e+04 0 2 0 -P 498 22 -1.6452711791992366e-02 -3.6019051458233342e-01 2.5273229778463250e+01 2.5275801695169278e+01 0 1 0 0 0 0 -P 499 22 -6.2504364350997391e-02 -8.0774054803624262e-02 4.9964573927914531e+00 4.9975011477210005e+00 0 1 0 0 0 0 -V -184 0 8.3204896062159062e+00 1.0332658544013446e+01 5.7914133239431510e+02 5.7957175112961193e+02 0 2 0 -P 500 111 2.3112168034984848e-01 1.3399634313306413e-01 4.4107569879031141e+00 4.4209013852196390e+00 1.3497999999999999e-01 2 0 0 -187 0 -P 501 111 -6.2447227091235033e-04 1.5224269557071959e-01 1.1632825363342103e+01 1.1634604581279744e+01 1.3497999999999999e-01 2 0 0 -188 0 -V -185 0 5.9191423123642126e+00 -3.5229179368354964e+00 1.3672391366783058e+01 1.7285422724912362e+01 0 2 0 -P 502 22 1.3849160653925421e-01 4.8985762220871587e-02 9.9620470836708538e-02 1.7749300885361896e-01 0 1 0 0 0 0 -P 503 22 4.2036692998391960e-02 -4.3780713930145439e-02 1.3441800967046419e-01 1.4748571386491399e-01 0 1 0 0 0 0 -V -186 0 -1.5319121601429257e+00 -1.1341243479074379e+00 2.3597355380886921e+01 2.3674761521425197e+01 0 1 0 -P 504 310 -5.3510513540338858e+00 -4.2539020075613285e+00 9.0128199084237636e+01 9.0388436088253655e+01 4.9767000000000000e-01 2 0 0 -189 0 -V -187 0 8.3205058018096860e+00 1.0332667933657628e+01 5.7914164147318786e+02 5.7957206091934199e+02 0 2 0 -P 505 22 1.4556432632519314e-01 1.1477835496819101e-01 2.0062005312401254e+00 2.0147465387526720e+00 0 1 0 0 0 0 -P 506 22 8.5557354024655349e-02 1.9217988164873117e-02 2.4045564566629887e+00 2.4061548464669662e+00 0 1 0 0 0 0 -V -188 0 8.3204895606801834e+00 1.0332669645357106e+01 5.7914218064513989e+02 5.7957259951017500e+02 0 2 0 -P 507 22 -5.3429310476486372e-02 1.0250131131284537e-01 4.7891381981192582e+00 4.7905329443313311e+00 0 1 0 0 0 0 -P 508 22 5.2804838205574023e-02 4.9741384257874215e-02 6.8436871652228444e+00 6.8440716369484100e+00 0 1 0 0 0 0 -V -189 0 -3.2981548940590801e+02 -2.6210829108664274e+02 5.5529047098669216e+03 5.5689474897177488e+03 0 2 0 -P 509 -211 -1.7367273505747305e+00 -1.5458641657711161e+00 2.8848140564360470e+01 2.8942021555434749e+01 1.3957000000000000e-01 1 0 0 0 0 -P 510 211 -3.6143240034591551e+00 -2.7080378417902127e+00 6.1280058519877166e+01 6.1446414532818906e+01 1.3957000000000000e-01 1 0 0 0 0 -BlockType GenEvent -E 5 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 218 0 0 -V -1 0 0 0 0 0 1 3 0 -P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -1 0 -P 3 21 3.2992939111429004e-01 -7.1181912190923491e-01 9.0096214824555136e+02 9.0096248984688827e+02 0 3 0 0 -3 0 -P 14 2 -5.5365822308336554e-01 3.4509673924388229e-01 2.5091064739376443e+00 2.6134545117488437e+00 3.3000000000000002e-01 2 0 0 -9 0 -P 29 2101 2.2372883196907553e-01 3.6672238266535262e-01 5.3966101099142470e+03 5.3966101581077546e+03 5.7933000000000001e-01 2 0 0 -25 0 -V -2 0 0 0 0 0 1 3 0 -P 2 2212 0 0 -6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -2 0 -P 4 21 -4.4604738137447780e-01 -4.4508489499117149e-01 -3.3991077613470765e+01 3.3996917744924559e+01 0 3 0 0 -4 0 -P 16 2203 2.3781727192142083e-01 1.3771298185638053e-01 -6.2853045277091305e+03 6.2853045810455988e+03 7.7132999999999996e-01 2 0 0 -11 0 -P 37 1 2.0823010945305698e-01 3.0737191313479095e-01 -7.4415207898946619e+01 7.4416865722193066e+01 3.3000000000000002e-01 2 0 0 -25 0 -V -3 0 0 0 0 0 0 5 0 -P 5 1 -3.0085522013949689e-01 1.1399974905881729e+00 5.0422379313784262e+02 5.0422517159941145e+02 0 3 0 0 -5 0 -P 13 -1 1.2673117148687165e+00 -1.3842638091505211e+00 7.8698417845006162e+01 7.8721484593363400e+01 3.3000000000000002e-01 2 0 0 -9 0 -P 30 21 -4.6149507887473545e-01 -2.2715799945074164e-01 5.7059132312250952e+01 5.7061450723684736e+01 0 2 0 0 -25 0 -P 31 21 -4.0362956554163681e-01 1.1673687347620827e+00 1.4998499597455123e+02 1.4999008195235854e+02 0 2 0 0 -25 0 -P 32 21 2.5074276787416866e-01 -1.3942091873039719e+00 1.0761474191487194e+02 1.0762406500684733e+02 0 2 0 0 -25 0 -V -4 0 0 0 0 0 0 4 0 -P 6 -2 3.6455143299337252e+00 3.8342312877411899e+00 -1.8047247107697999e+00 5.5900031824060150e+00 0 3 0 0 -5 0 -P 15 2 -4.1159171909325689e+00 -3.0147215458824776e+00 -2.9604825409076863e+01 3.0043034264596933e+01 3.3000000000000002e-01 2 0 0 -11 0 -P 35 21 -1.6212560032512757e-01 -8.5363446188281877e-01 8.8578769426193138e-01 1.2408047163436402e+00 0 2 0 0 -25 0 -P 36 21 1.6433585287674621e-01 -4.2451452632135017e-01 -8.6248126834592029e-02 4.6331155282492553e-01 0 2 0 0 -25 0 -V -5 0 0 0 0 0 0 2 0 -P 7 -24 -9.0579211800333426e-01 3.7016351602104836e+00 4.9106971928988440e+02 4.9762938157847765e+02 8.0442586013329560e+01 3 0 0 -6 0 -P 8 22 4.2504512277975630e+00 1.2725936181188806e+00 1.1349349137188561e+01 1.2185793203339950e+01 0 3 0 0 -7 0 -V -6 0 0 0 0 0 0 1 0 -P 9 -24 -9.0579211800333426e-01 3.7016351602104836e+00 4.9106971928988440e+02 4.9762938157847765e+02 8.0442586013329560e+01 2 0 0 -8 0 -V -7 0 0 0 0 0 0 1 0 -P 10 22 4.2504512277975630e+00 1.2725936181188806e+00 1.1349349137188561e+01 1.2185793203339923e+01 0 1 0 0 0 0 -V -8 0 0 0 0 0 0 2 0 -P 11 11 -3.1560318019062390e+01 2.6910330199055338e+01 2.8518798748746264e+02 2.8818814644654589e+02 5.1000000000000004e-04 1 0 0 0 0 -P 12 -12 3.0654525901059060e+01 -2.3208695038844859e+01 2.0588173180242171e+02 2.0944123513193171e+02 0 1 0 0 0 0 -V -9 0 0 0 0 0 0 1 0 -P 46 92 7.1365349178535098e-01 -1.0391670699066387e+00 8.1207524318943811e+01 8.1334939105112241e+01 4.3727730006198762e+00 2 0 0 -10 0 -V -10 0 0 0 0 0 0 5 0 -P 47 111 -1.2987933502875690e-01 -2.5113340363148784e-01 2.5317152752162979e+00 2.5510269428703771e+00 1.3497999999999999e-01 2 0 0 -35 0 -P 48 213 7.4830653663342495e-01 -1.7382372879353764e-02 4.3774839145295914e+01 4.3790551134415779e+01 9.0308451414957169e-01 2 0 0 -36 0 -P 49 -213 -2.9117511823875525e-01 -4.3939165795158736e-01 1.4260854072619713e+01 1.4288861360745033e+01 7.2232411525528162e-01 2 0 0 -37 0 -P 50 213 -2.1069355383734140e-01 -2.7656697558868826e-01 1.5627412790254821e+01 1.5654259573374869e+01 8.4789811178222296e-01 2 0 0 -38 0 -P 51 111 5.9709496225677960e-01 -5.4692659855521464e-02 5.0127030355570623e+00 5.0502400937061882e+00 1.3497999999999999e-01 2 0 0 -39 0 -V -11 0 0 0 0 0 0 1 0 -P 52 92 -3.8780999190111483e+00 -2.8770085640260969e+00 -6.3149093531182070e+03 6.3153476153101956e+03 7.4243163100063839e+01 2 0 0 -12 0 -V -12 0 0 0 0 0 0 10 0 -P 53 113 -2.6442133118282958e+00 -2.3165293324998335e+00 -2.2580063872574136e+01 2.2865503691765191e+01 7.8345542426979031e-01 2 0 0 -40 0 -P 54 221 -5.1630481154154895e-01 1.5967696321760094e-02 -2.0035205258790207e+01 2.0049338564902872e+01 5.4744999999999999e-01 2 0 0 -41 0 -P 55 211 -8.7519077897546693e-01 -6.7220077889196328e-01 -6.5156567288365199e+00 6.6099224790975617e+00 1.3957000000000000e-01 1 0 0 0 0 -P 56 111 1.9202974635290213e-01 2.5211810958452568e-01 -9.4217139466307191e+00 9.4280089232669173e+00 1.3497999999999999e-01 2 0 0 -42 0 -P 57 -213 9.4326428486984373e-02 -4.8155754348202640e-01 -4.3195836080971688e+01 4.3206533032295752e+01 8.2670840923091482e-01 2 0 0 -43 0 -P 58 321 -4.2092082351619076e-01 7.6023322511133951e-01 -5.4832750693731569e+01 5.4841857358199974e+01 4.9359999999999998e-01 1 0 0 0 0 -P 59 -323 5.3330045068290033e-01 -4.0351878893496296e-01 -6.3591499500441905e+01 6.3601150529299844e+01 8.8334769611541319e-01 2 0 0 -44 0 -P 60 111 -4.7209376929507818e-01 -5.2551861933480060e-01 -3.3238644448347941e+01 3.3246424570325850e+01 1.3497999999999999e-01 2 0 0 -45 0 -P 61 2224 6.8188613475259922e-03 3.7782727808420416e-02 -9.1247280998350175e+02 9.1247367669780419e+02 1.2570732634256450e+00 2 0 0 -46 0 -P 62 111 2.2414808927512009e-01 4.5621474029144382e-01 -5.1490251726043825e+03 5.1490251994632381e+03 1.3497999999999999e-01 2 0 0 -47 0 -V -13 0 0 0 0 0 2 1 0 -P 17 2 -3.6919233007313528e+00 8.1942682496522661e+00 2.9565764077792278e+02 2.9579421373680213e+02 0 2 0 0 -13 0 -P 18 -2 3.6919233007313528e+00 -8.1942682496522661e+00 1.0292203617146285e+02 1.0331370605822661e+02 0 2 0 0 -13 0 -P 63 92 0 0 3.9857967694938566e+02 3.9910791979502875e+02 2.0527366271357579e+01 2 0 0 -14 0 -V -14 0 0 0 0 0 0 7 0 -P 64 213 -1.5835447595257053e+00 3.0390962863600426e+00 1.0583303842892066e+02 1.0589013999419520e+02 5.8822159912046279e-01 2 0 0 -48 0 -P 65 -213 -1.1443922070689834e+00 2.4049085538196557e+00 9.6289570725061836e+01 9.6329373550777277e+01 7.5733717238090137e-01 2 0 0 -49 0 -P 66 213 -3.0046508081645801e-01 1.7803118867427987e+00 5.7444662891378144e+01 5.7478363119977544e+01 7.8303420682014024e-01 2 0 0 -50 0 -P 67 -213 -2.5016439277491315e-01 3.1350862441051930e-01 4.0612390002610852e+01 4.0622507641923903e+01 8.1304090487992176e-01 2 0 0 -51 0 -P 68 213 3.3250187937355535e-01 -8.3151583915031479e-01 6.8897046607273635e+00 6.9760920973408034e+00 6.2916972907766511e-01 2 0 0 -52 0 -P 69 223 1.8182876739207015e+00 -4.9227019655990896e+00 6.7504589614192298e+01 6.7712745517919686e+01 7.7918026591325340e-01 2 0 0 -53 0 -P 70 -211 1.1277768868918030e+00 -1.7836075465836119e+00 2.4005720626494561e+01 2.4098697872894373e+01 1.3957000000000000e-01 1 0 0 0 0 -V -15 0 0 0 0 0 2 1 0 -P 19 1 4.0721905699000063e+00 -5.2481001487683923e+00 5.1379595964107374e+01 5.1807221240325212e+01 0 2 0 0 -15 0 -P 20 -1 -4.0721905699000063e+00 5.2481001487683923e+00 3.4479876218613377e+01 3.5113916831649327e+01 0 2 0 0 -15 0 -P 71 92 0 0 8.5859472182720751e+01 8.6921138071974539e+01 1.3543828123239873e+01 2 0 0 -16 0 -V -16 0 0 0 0 0 0 8 0 -P 72 -211 4.1720297738051321e-01 -9.7235207672939661e-01 7.5602071648272782e+00 7.6351646377442872e+00 1.3957000000000000e-01 1 0 0 0 0 -P 73 211 2.6665249123579446e+00 -2.9349752846126558e+00 3.2950695340201079e+01 3.3188736616767464e+01 1.3957000000000000e-01 1 0 0 0 0 -P 74 111 3.6072230697643126e-01 -6.2146570580823457e-01 3.1338517615404928e+00 3.2180097373930638e+00 1.3497999999999999e-01 2 0 0 -54 0 -P 75 113 -4.4948408298591003e-01 -3.3788088157719054e-03 8.4523847160801058e+00 8.4982551917835956e+00 7.5860830396560419e-01 2 0 0 -55 0 -P 76 -213 -2.7928243095832456e-01 3.3421120888543193e-01 4.9816177588983468e+00 5.0588216417181506e+00 7.6515691106980155e-01 2 0 0 -56 0 -P 77 213 -3.0578817058647956e-01 7.0283103003245251e-01 4.1808064202695698e+00 4.3325688354318341e+00 8.3936435946542598e-01 2 0 0 -57 0 -P 78 -211 -3.2872639824348276e-01 9.2343958879558319e-01 4.7634610442269851e+00 4.8652690186489309e+00 1.3957000000000000e-01 1 0 0 0 0 -P 79 213 -2.0811691139406925e+00 2.5716900482525915e+00 1.9836447976676894e+01 2.0124312392487205e+01 7.4727930113389407e-01 2 0 0 -58 0 -V -17 0 0 0 0 0 2 1 0 -P 21 3 -1.8652550805155896e+00 -4.6351934290813315e+00 -2.5073948479495525e+00 5.5902793815615270e+00 0 2 0 0 -17 0 -P 22 -3 1.8652550805155896e+00 4.6351934290813315e+00 -3.8523971426252422e+02 3.8527211375820042e+02 0 2 0 0 -17 0 -P 80 92 0 0 -3.8774710911047379e+02 3.9086239313976193e+02 4.9250276622696788e+01 2 0 0 -18 0 -V -18 0 0 0 0 0 0 10 0 -P 81 -313 -1.6233937553850981e+00 -4.1954492475589094e+00 -2.4490241228785110e+00 5.1978988434783595e+00 8.8500370548764440e-01 2 0 0 -59 0 -P 82 -211 -4.2766056399724119e-02 2.0905450136158240e-02 -1.4002124745972655e-01 2.0335119391229980e-01 1.3957000000000000e-01 1 0 0 0 0 -P 83 323 -4.4702319815240105e-01 -4.8462854486530810e-01 -3.3690973393284223e+00 3.5379978508332535e+00 8.5552167970554593e-01 2 0 0 -60 0 -P 84 333 2.9235882051604356e-01 4.1909099446358361e-01 -1.1614528740318077e+01 1.1670274542743341e+01 1.0182922477141036e+00 2 0 0 -61 0 -P 85 -313 -1.9559777497210154e-01 3.2725284319419412e-01 -4.0791168457425862e+01 4.0802601861674923e+01 8.8743543275557690e-01 2 0 0 -62 0 -P 86 -213 4.2480750680325324e-01 4.0902356994726946e-01 -2.7722906134034435e+01 2.7734649552550263e+01 5.5090796661843766e-01 2 0 0 -63 0 -P 87 113 3.6771897497445705e-01 4.4681480751080627e-01 -2.0704917165556715e+01 2.0730406353871473e+01 8.4928914234349040e-01 2 0 0 -64 0 -P 88 211 -2.8978227338924745e-01 -7.0628302343640245e-02 -1.4183290555585218e+01 1.4187112916027539e+01 1.3957000000000000e-01 1 0 0 0 0 -P 89 -211 -1.9540105972758251e-02 2.5692526030371343e-01 -1.4545461008205347e+01 1.4548412563961943e+01 1.3957000000000000e-01 1 0 0 0 0 -P 90 323 1.5332178619775767e+00 2.8706931692121325e+00 -2.5222669433968153e+02 2.5224968746070860e+02 1.0039174358388165e+00 2 0 0 -65 0 -V -19 0 0 0 0 0 2 1 0 -P 23 3 1.3025773740614568e-01 -4.3032393523974077e+00 2.5316489086932532e+00 4.9944050896041228e+00 0 2 0 0 -19 0 -P 24 -3 -1.3025773740614568e-01 4.3032393523974077e+00 -3.3157804489828713e+01 3.3436130676079749e+01 0 2 0 0 -19 0 -P 91 92 0 0 -3.0626155581135460e+01 3.8430535765683871e+01 2.3215181962620765e+01 2 0 0 -20 0 -V -20 0 0 0 0 0 0 9 0 -P 92 -311 2.2891228831712537e-01 -1.3418287413741594e+00 9.8860382248171286e-01 1.7543996561917701e+00 4.9767000000000000e-01 2 0 0 -66 0 -P 93 -213 -3.7639146848800681e-01 -1.5406289235386026e+00 1.6502657513639488e-01 1.7867414552349492e+00 8.0622778404095086e-01 2 0 0 -67 0 -P 94 2114 1.6153252959411044e-01 -1.2772848818918856e+00 5.2372112884638644e-01 1.9163288714391824e+00 1.3192736998381318e+00 2 0 0 -68 0 -P 95 211 2.5979025784637988e-01 2.2354774310929568e-01 -6.7894811146840361e-01 7.7324956804880274e-01 1.3957000000000000e-01 1 0 0 0 0 -P 96 -2214 -1.8636538951424170e-01 2.9256938238575925e-01 -4.5902650063153603e+00 4.7327213645256432e+00 1.0989948972200578e+00 2 0 0 -69 0 -P 97 111 2.4447109857296742e-01 3.3083128753819330e-01 -2.0318743236789594e+00 2.0774860592739199e+00 1.3497999999999999e-01 2 0 0 -70 0 -P 98 213 -2.7401510515621635e-01 2.8125233782844189e-01 -1.7321877321484938e+00 1.8713869334189455e+00 5.8942985993049790e-01 2 0 0 -71 0 -P 99 111 -1.0109282624214720e-01 5.2155147439574179e-01 -1.7600692215106526e+00 1.8434475758402007e+00 1.3497999999999999e-01 2 0 0 -72 0 -P 100 313 4.3158615070028994e-02 2.5099903215472157e+00 -2.1510162712478085e+01 2.1674774281710462e+01 8.9823502798501531e-01 2 0 0 -73 0 -V -21 0 0 0 0 0 2 1 0 -P 25 2 -2.8388113750031851e+00 2.9291876839233497e+00 -2.8168940832775746e+00 4.9572051386744045e+00 0 2 0 0 -21 0 -P 26 -2 2.8388113750031851e+00 -2.9291876839233497e+00 6.3131813241358550e+01 6.3263455751739258e+01 0 2 0 0 -21 0 -P 101 92 0 0 6.0314919158080976e+01 6.8220660890413654e+01 3.1877407348763036e+01 2 0 0 -22 0 -V -22 0 0 0 0 0 0 10 0 -P 102 213 -1.2382245544498864e+00 1.4759587873216322e+00 -1.5264135160047374e+00 2.5739330296056240e+00 7.6389700217915013e-01 2 0 0 -74 0 -P 103 221 -8.9982101828616334e-01 5.4142902707731055e-01 -5.3645233237309187e-01 1.3001176345700249e+00 5.4744999999999999e-01 2 0 0 -75 0 -P 104 -211 -8.6753321823725624e-03 5.6832963889609747e-02 9.7176499890667928e-02 1.7952243370663501e-01 1.3957000000000000e-01 1 0 0 0 0 -P 105 321 -4.0054756700537497e-01 4.1344381052312046e-01 1.2388557587843947e-01 7.6835065810119207e-01 4.9359999999999998e-01 1 0 0 0 0 -P 106 -313 -4.3881953299186965e-01 1.5849794511534281e-02 1.5502399495560006e+00 1.8454355154493816e+00 8.9976360337661621e-01 2 0 0 -76 0 -P 107 -213 2.6975585621736647e-01 -2.0224994353228565e-01 1.4308574448043745e-01 8.2389832737315261e-01 7.3801196599538910e-01 2 0 0 -77 0 -P 108 213 7.7555631014750070e-01 1.3582975137081782e-01 4.8071584803948841e+00 4.9465123732681642e+00 8.5981084646306349e-01 2 0 0 -78 0 -P 109 -211 1.6084505806401775e-01 -9.8786281136593837e-02 1.3415766842308592e+01 1.3417820598522365e+01 1.3957000000000000e-01 1 0 0 0 0 -P 110 211 3.3737414580549596e-01 -7.4336572542037649e-01 6.7542972105104546e+00 6.8048824022753731e+00 1.3957000000000000e-01 1 0 0 0 0 -P 111 -213 1.4425566346812861e+00 -1.5949421846047691e+00 3.5486174703439339e+01 3.5560187917541761e+01 7.9596446614794569e-01 2 0 0 -79 0 -V -23 0 0 0 0 0 2 1 0 -P 27 2 -3.5408957207564704e+00 1.3337324649314468e+00 1.4937252408811208e+01 1.5409032880678133e+01 0 2 0 0 -23 0 -P 28 -2 3.5408957207564704e+00 -1.3337324649314468e+00 4.7168621002604638e+00 6.0469474006441590e+00 0 2 0 0 -23 0 -P 112 92 0 0 1.9654114509071672e+01 2.1455980281322294e+01 8.6066760539008023e+00 2 0 0 -24 0 -V -24 0 0 0 0 0 0 8 0 -P 113 223 -1.7834465290486393e-01 1.0779146855581252e-01 2.9797667718739342e+00 3.0863604647422442e+00 7.7664991318275456e-01 2 0 0 -80 0 -P 114 113 -1.0902801693616622e+00 4.5065934647299072e-01 4.8491888434946748e+00 5.1024990374205057e+00 1.0625720176709026e+00 2 0 0 -81 0 -P 115 111 -3.3248940486964124e-01 2.3166493925117712e-01 5.1260100030508238e-01 6.6723102021907743e-01 1.3497999999999999e-01 2 0 0 -82 0 -P 116 213 5.4395505009151517e-02 -3.5753673771347694e-01 3.6959306688638129e+00 3.7765891594248417e+00 6.8697218303008856e-01 2 0 0 -83 0 -P 117 223 -3.6940382873256322e-01 -2.0534285256312060e-01 1.5468769853517426e+00 1.7802756873006378e+00 7.7325819698327591e-01 2 0 0 -84 0 -P 118 113 -2.1983674369034181e-01 6.1736195755313583e-01 1.8723689218941149e+00 2.0935892371951130e+00 6.6924325466460510e-01 2 0 0 -85 0 -P 119 111 1.1404511704074396e+00 -2.7154403133829735e-01 1.2971289847431351e+00 1.7536043557484422e+00 1.3497999999999999e-01 2 0 0 -86 0 -P 120 -213 9.9550812414248135e-01 -5.7305409021822129e-01 2.9002523325451683e+00 3.1958313192714209e+00 6.9458391375909678e-01 2 0 0 -87 0 -V -25 0 0 0 0 0 2 1 0 -P 33 21 8.8527156785984806e-01 -5.7553602736705196e+00 -2.4199878604494717e+01 2.4890600677783713e+01 0 2 0 0 -25 0 -P 34 21 -8.8527156785984806e-01 5.7553602736705196e+00 -6.2954009301687258e+01 6.3222742464919470e+01 0 2 0 0 -25 0 -P 121 92 -1.8021268256845246e-01 -1.0580531443966563e+00 5.5504994238782192e+03 5.8755200809247099e+03 1.9270939818607703e+03 2 0 0 -26 0 -V -26 0 0 0 0 0 0 37 0 -P 122 221 1.1563614818692559e-01 -3.1187647073665451e-02 5.3420846984279729e+02 5.3420876377842535e+02 5.4744999999999999e-01 2 0 0 -88 0 -P 123 2212 -6.2791982027313717e-02 7.6867611752465992e-01 2.9853349842085568e+03 2.9853352312756942e+03 9.3827000000000005e-01 1 0 0 0 0 -P 124 -211 -6.3737058678301636e-02 -6.4464644421178707e-01 1.9900387741310286e+02 1.9900498068310966e+02 1.3957000000000000e-01 1 0 0 0 0 -P 125 113 1.5027328344524130e-01 2.0693100318503993e-01 1.2269984836524957e+03 1.2269987428070176e+03 7.5535553100313535e-01 2 0 0 -89 0 -P 126 113 -9.9821919675496071e-02 5.0103807635626529e-01 2.1777529106655865e+02 2.1777760470222898e+02 8.6412218253814066e-01 2 0 0 -90 0 -P 127 -313 -9.1855261829841561e-01 -4.5271496597028515e-01 1.9852981625081372e+02 1.9853426767512232e+02 8.4782720070859996e-01 2 0 0 -91 0 -P 128 323 7.1450236264555178e-01 1.5079031761695599e-01 1.0405513205706657e+02 1.0406120895549580e+02 8.5524880571797579e-01 2 0 0 -92 0 -P 129 -213 -2.6371613026223212e-01 -3.3569803118640140e-01 1.5291910085517253e+02 1.5292119444523502e+02 6.7680487398242095e-01 2 0 0 -93 0 -P 130 211 3.0711481321928247e-01 5.6434962399740579e-02 1.7469094645523576e+01 1.7472442643564186e+01 1.3957000000000000e-01 1 0 0 0 0 -P 131 -211 -1.3416783174028993e-01 4.7853828154534966e-01 4.9650636537858709e+01 4.9653320012799036e+01 1.3957000000000000e-01 1 0 0 0 0 -P 132 211 -4.4171694323995486e-01 -8.0515863604828064e-01 1.9039571188948941e+01 1.9062217739053946e+01 1.3957000000000000e-01 1 0 0 0 0 -P 133 -2114 -1.3488630166892554e-01 -2.6020823766813067e-01 1.8719458121583301e+00 2.1920492447609377e+00 1.1022686271828712e+00 2 0 0 -94 0 -P 134 221 5.9907600476643053e-01 3.1183801267853273e-01 3.6841720694354785e-01 9.4422865160420322e-01 5.4744999999999999e-01 2 0 0 -95 0 -P 135 1114 -7.9078364399711776e-02 -5.3473729042418372e-02 2.4990460379589137e+00 2.8511181245797439e+00 1.3691349944600548e+00 2 0 0 -96 0 -P 136 223 -1.3331819562169198e-01 -3.1501969795261053e-01 -4.3131521562232121e-02 8.5408332284258204e-01 7.8140056489842125e-01 2 0 0 -97 0 -P 137 211 3.0231113463725909e-02 -2.1285675831915882e-01 -2.3543486414109713e-01 3.4803919310407555e-01 1.3957000000000000e-01 1 0 0 0 0 -P 138 111 -3.6331973746602270e-02 7.4355670744629440e-02 -7.6645288247255569e-02 1.7590588022778733e-01 1.3497999999999999e-01 2 0 0 -98 0 -P 139 113 1.6627168576861587e-01 -2.5512952828724614e-03 -1.1719602585717434e-01 7.9896620060520418e-01 7.7263141188851436e-01 2 0 0 -99 0 -P 140 -213 1.8246870701846693e-01 -6.4142436952788440e-01 -2.3077172616991168e+00 2.5247664616293304e+00 7.7728159309153089e-01 2 0 0 -100 0 -P 141 113 -9.2484989919595070e-02 -1.1964227291138891e+00 -5.3193696218967101e+00 5.5240094460187201e+00 8.8261337246030414e-01 2 0 0 -101 0 -P 142 221 4.3290844393668704e-01 -2.2932482823933737e+00 -1.1118240214783999e+01 1.1373713746251170e+01 5.4744999999999999e-01 2 0 0 -102 0 -P 143 211 1.4314659529045259e-01 3.3792954234072853e-01 -4.8759767464944481e+00 4.8917600452786267e+00 1.3957000000000000e-01 1 0 0 0 0 -P 144 -211 -1.5173971936078676e-01 1.2638509867730544e-01 -2.3517255215454607e+00 2.3641258107781722e+00 1.3957000000000000e-01 1 0 0 0 0 -P 145 111 2.8806011104816087e-01 1.8808112209402078e-01 -6.9861950017284147e-01 7.9034292714425880e-01 1.3497999999999999e-01 2 0 0 -103 0 -P 146 111 -2.9325266533451849e-01 -2.1300619373632457e-01 -6.2084500620099243e+00 6.2204855547752071e+00 1.3497999999999999e-01 2 0 0 -104 0 -P 147 213 -6.9858610278359504e-02 1.2685306871492477e+00 -1.8500623011952744e+01 1.8556331415289904e+01 6.7106887426753614e-01 2 0 0 -105 0 -P 148 223 5.5063662683315945e-02 1.1997527113990876e-01 -3.0076947242410959e+00 3.1107144834006855e+00 7.8287353408961513e-01 2 0 0 -106 0 -P 149 -2214 -1.8794218320233000e-01 1.5241617555512106e+00 -1.9106462282427337e+01 1.9207265750409690e+01 1.2262810998017089e+00 2 0 0 -107 0 -P 150 2214 -2.8650488155922194e-01 2.9534757115427968e-01 -7.5922854307518755e+00 7.7042773613584803e+00 1.2424879732977692e+00 2 0 0 -108 0 -P 151 -213 -1.3395677309501619e-01 2.8646169779760616e-01 -7.1516780777701350e-01 1.1477456820086733e+00 8.4014905577871046e-01 2 0 0 -109 0 -P 152 221 1.5464435260082576e-01 -3.5154860600178450e-01 -2.3517657972875368e-02 6.6914563505238200e-01 5.4744999999999999e-01 2 0 0 -110 0 -P 153 -311 9.3352618998182743e-02 4.0984422314125646e-01 -2.9781253674948460e+00 3.0485395080484676e+00 4.9767000000000000e-01 2 0 0 -111 0 -P 154 333 -3.2368338848019457e-01 -4.2702770182420224e-01 -9.2713163076349650e-02 1.1654977849741417e+00 1.0308568096824740e+00 2 0 0 -112 0 -P 155 333 -1.0877256872155437e-01 3.7570467122067591e-01 -1.1471981162283685e+01 1.1523662684436765e+01 1.0175777145777671e+00 2 0 0 -113 0 -P 156 321 6.2410157985014460e-02 -5.2815613120594274e-01 -2.4718281324740081e+00 2.5761248423242393e+00 4.9359999999999998e-01 1 0 0 0 0 -P 157 113 1.7841524909498518e-01 -2.1422710011190485e-01 -4.1990941872267165e+01 4.1999942208294883e+01 8.2354169806912858e-01 2 0 0 -114 0 -P 158 -211 1.6252710659019495e-01 4.3949932995684760e-01 -1.7920595656609230e+01 1.7927264241762899e+01 1.3957000000000000e-01 1 0 0 0 0 -V -27 0 0 0 0 0 2 1 0 -P 38 21 -6.3139095306073623e+00 7.0920315162380083e+00 2.2607817567288038e+01 2.4520925344362215e+01 0 2 0 0 -27 0 -P 39 21 6.3139095306073623e+00 -7.0920315162380083e+00 -3.5928099200277863e+00 1.0152371531295421e+01 0 2 0 0 -27 0 -P 159 92 0 0 1.9015007647260251e+01 3.4673296875657634e+01 2.8994258059176538e+01 2 0 0 -28 0 -V -28 0 0 0 0 0 0 17 0 -P 160 213 -5.1422483611792558e-01 1.5560370109051272e-01 1.4202938423971254e+00 1.7497322796917145e+00 8.6930360517508554e-01 2 0 0 -115 0 -P 161 -213 1.2736655420832138e-01 8.1992574492073922e-01 1.5226761082985145e+00 1.8398587605528547e+00 6.1484734827861653e-01 2 0 0 -116 0 -P 162 223 -1.7023916178032368e+00 2.0795757104791130e+00 6.5575562691596261e+00 7.1299160716087355e+00 7.8191214916280161e-01 2 0 0 -117 0 -P 163 211 -2.9059822685827419e-01 -2.9736811450474465e-02 1.1929840970980694e+00 1.2361320512944036e+00 1.3957000000000000e-01 1 0 0 0 0 -P 164 -211 -1.0881062221915685e+00 1.2539725263908137e+00 2.4746291473983963e+00 2.9832350644507852e+00 1.3957000000000000e-01 1 0 0 0 0 -P 165 211 -1.2852746139432256e+00 1.4134826699002714e+00 5.3384294397887020e+00 5.6716992832711099e+00 1.3957000000000000e-01 1 0 0 0 0 -P 166 -2212 1.4237307138452032e-01 -3.5996864709774652e-02 5.6565571914432167e-01 1.1053880998206356e+00 9.3827000000000005e-01 1 0 0 0 0 -P 167 211 -1.7998566349533646e-01 -1.5840940836931164e-01 5.4777086598057086e-02 2.8278736506418189e-01 1.3957000000000000e-01 1 0 0 0 0 -P 168 2114 3.5739987847657645e-01 2.2720806770406607e-01 3.6523500098511946e-01 1.3004119985260876e+00 1.1740172830078466e+00 2 0 0 -118 0 -P 169 111 -5.1434735918982422e-01 -7.7300339775299809e-01 1.1148117917540183e-01 9.4484660794944053e-01 1.3497999999999999e-01 2 0 0 -119 0 -P 170 -211 1.5714668856322211e+00 -6.0581539196193168e-01 -5.4913199377787304e-02 1.6908624149062295e+00 1.3957000000000000e-01 1 0 0 0 0 -P 171 -1114 8.8585869246348492e-01 -1.5968024045320024e+00 -4.2221015967941866e-01 2.3027386541183241e+00 1.3378416752747129e+00 2 0 0 -120 0 -P 172 3112 1.2493548114864377e+00 -1.2508727455032398e+00 -6.8508891720731258e-01 2.2424940241854410e+00 1.1974400000000001e+00 2 0 0 -121 0 -P 173 313 6.8179411573870519e-01 -3.6752254254946726e-01 5.4549415498849577e-02 1.1551152151744939e+00 8.5521896965537603e-01 2 0 0 -122 0 -P 174 213 8.7514099172343518e-01 -9.1457541533900566e-01 -1.9944632590699943e-01 1.6271978862616123e+00 1.0028330760397095e+00 2 0 0 -123 0 -P 175 -211 7.3183821062345222e-02 7.1751877688641233e-02 -4.4579470420669780e-02 1.7880525076215875e-01 1.3957000000000000e-01 1 0 0 0 0 -P 176 113 -3.8901028257665571e-01 -2.8878531600595153e-01 7.6297841431025348e-01 1.2320758480194269e+00 8.3734632970974121e-01 2 0 0 -124 0 -V -29 0 0 0 0 0 2 1 0 -P 40 21 4.0592867731266056e+00 -2.6703314664466724e+00 -1.8206386794109676e+01 1.8843593058222922e+01 0 2 0 0 -29 0 -P 41 21 -4.0592867731266056e+00 2.6703314664466724e+00 6.5387013204165399e+01 6.5567293485463281e+01 0 2 0 0 -29 0 -P 177 92 0 0 4.7180626410055723e+01 8.4410886543686203e+01 6.9994187320418376e+01 2 0 0 -30 0 -V -30 0 0 0 0 0 0 15 0 -P 178 -321 -3.3623874390774883e-02 2.4690994028450861e-01 -2.6951601874273334e-01 6.1512188052391659e-01 4.9359999999999998e-01 1 0 0 0 0 -P 179 211 9.2022143347366359e-01 -9.0492262529110890e-01 -3.4802493120833939e+00 3.7144727086822180e+00 1.3957000000000000e-01 1 0 0 0 0 -P 180 331 2.8547714123264654e+00 -1.3978162152551836e+00 -1.1295889724261475e+01 1.1773753288764665e+01 9.5944351253944427e-01 2 0 0 -125 0 -P 181 -211 -2.1966458442153422e-01 -7.8242988024705071e-02 -3.6872339754814093e-01 4.5805155127295866e-01 1.3957000000000000e-01 1 0 0 0 0 -P 182 211 2.9560049319651122e-01 -2.0553784478372053e-01 2.0154644030530203e-01 4.3557572213806423e-01 1.3957000000000000e-01 1 0 0 0 0 -P 183 -213 4.8499322815683815e-01 -2.4176671902283986e-01 -1.2630218756659783e+00 1.5443904458672615e+00 7.0444872992306051e-01 2 0 0 -126 0 -P 184 223 -4.9798993623797905e-01 -7.9872460916706869e-02 1.4542593319776393e+00 1.7271969649830978e+00 7.8355954757476942e-01 2 0 0 -127 0 -P 185 111 -8.1435240888755867e-02 2.1770867381234621e-01 -4.8166487593616319e-01 5.5158808745506804e-01 1.3497999999999999e-01 2 0 0 -128 0 -P 186 211 -4.0963834077238803e-02 -8.1786285732019265e-02 -7.3954640395227589e-02 1.8252700066602331e-01 1.3957000000000000e-01 1 0 0 0 0 -P 187 -213 -1.9208712477878448e-01 1.0153734892728536e+00 1.0093633192296094e+01 1.0172602378103548e+01 7.2974470614907838e-01 2 0 0 -129 0 -P 188 113 -4.0460519527275640e-01 -1.8742290283792634e-01 1.4460803220046335e+01 1.4483694098040059e+01 6.8097888964938624e-01 2 0 0 -130 0 -P 189 323 -1.8174133915270314e+00 8.5518474033833691e-01 1.5636980567886377e+01 1.5790404265907304e+01 8.8734053469796670e-01 2 0 0 -131 0 -P 190 -313 -6.1300964784639689e-01 4.4874979596463827e-01 1.5814169758309760e+01 1.5858292211205139e+01 9.0570939246514259e-01 2 0 0 -132 0 -P 191 2112 -2.0875628243328179e-01 2.2254556192762173e-01 2.8276378449769140e+00 2.9952350959206409e+00 9.3957000000000002e-01 1 0 0 0 0 -P 192 -3122 -4.4603745527894489e-01 1.7089584026390511e-01 3.9246158988903992e+00 4.1079808441562280e+00 1.1156800000000000e+00 2 0 0 -133 0 -V -31 0 0 0 0 0 2 1 0 -P 42 21 -3.5966403857613591e+00 9.8909210856074747e-01 -6.8991601771054407e+00 7.8429928224539607e+00 0 2 0 0 -31 0 -P 43 21 3.5966403857613591e+00 -9.8909210856074747e-01 -5.4062667533947362e+01 5.4191199895830252e+01 0 2 0 0 -31 0 -P 193 92 0 0 -6.0961827711052806e+01 6.2034192718284217e+01 1.1484625737791408e+01 2 0 0 -32 0 -V -32 0 0 0 0 0 0 9 0 -P 194 -313 9.9449836339841191e-01 -6.3495009228094301e-01 -1.4642299615826484e+01 1.4717074686290321e+01 8.9619231626098039e-01 2 0 0 -134 0 -P 195 -213 6.9761486862091593e-01 -2.0191774573662452e-01 -9.7431391037408730e+00 9.7889921005604528e+00 6.0676970015494547e-01 2 0 0 -135 0 -P 196 321 9.0124089448534161e-01 -4.4767419129957531e-01 -8.9439134555301649e+00 9.0138713209953245e+00 4.9359999999999998e-01 1 0 0 0 0 -P 197 -321 -6.3603380049890879e-01 1.4504099316767780e-01 -4.6266617828900456e+00 4.6984269812705879e+00 4.9359999999999998e-01 1 0 0 0 0 -P 198 113 3.6907253066300794e-01 -1.4699212866480399e-01 -8.5021209501925501e+00 8.5375578909228391e+00 6.6784195014715297e-01 2 0 0 -136 0 -P 199 221 -1.1158814362096265e+00 7.2491333857959150e-01 -2.4507253306324639e+00 2.8419090198019128e+00 5.4744999999999999e-01 2 0 0 -137 0 -P 200 211 -3.4212525303292468e-01 -2.2696230407884616e-01 -6.7469338663752003e+00 6.7608548245304183e+00 1.3957000000000000e-01 1 0 0 0 0 -P 201 -213 -1.7598972275668995e-01 3.3505003289999202e-01 -1.7733387402423706e+00 1.9326147762775303e+00 6.6860951143368275e-01 2 0 0 -138 0 -P 202 323 -6.9239644466952743e-01 4.5349209741353164e-01 -3.5326948656226587e+00 3.7428911176348358e+00 9.1882152013627227e-01 2 0 0 -139 0 -V -33 0 0 0 0 0 2 1 0 -P 44 21 1.6002652901426460e+00 -2.4352657274836234e+00 2.8688832362561115e+01 2.8836443443833804e+01 0 2 0 0 -33 0 -P 45 21 -1.6002652901426460e+00 2.4352657274836234e+00 8.2577967751982451e-01 3.0287423525444375e+00 0 2 0 0 -33 0 -P 203 92 0 0 2.9514612040080941e+01 3.1865185796378242e+01 1.2011567006898593e+01 2 0 0 -34 0 -V -34 0 0 0 0 0 0 9 0 -P 204 111 1.0518787012931753e-01 -1.5995524457287180e-01 7.7600686419646514e-01 8.1059016893171143e-01 1.3497999999999999e-01 2 0 0 -140 0 -P 205 111 1.2478783609177713e-01 -3.6358255829143427e-02 2.1168354202844193e+00 2.1251131084660222e+00 1.3497999999999999e-01 2 0 0 -141 0 -P 206 -2224 -5.5186870172860858e-01 1.0329040235764173e+00 8.5442774549095424e-01 1.9723301257490100e+00 1.3373816085188170e+00 2 0 0 -142 0 -P 207 2224 -4.4972267469397098e-01 7.1644814273694990e-01 1.8328017645199988e+00 2.3811516687914014e+00 1.2630013999973755e+00 2 0 0 -143 0 -P 208 -213 -5.0716668288443600e-01 -5.4504576392598904e-02 1.3018912898240806e+00 1.5715730784703104e+00 7.1744840746711636e-01 2 0 0 -144 0 -P 209 211 1.1243572544296603e+00 -1.1191386976602283e-01 4.6556363922388408e+00 4.7928210848594484e+00 1.3957000000000000e-01 1 0 0 0 0 -P 210 -211 3.7004756859602959e-03 -8.3816613942284957e-01 6.7174081650278819e+00 6.7709370408591569e+00 1.3957000000000000e-01 1 0 0 0 0 -P 211 213 2.3150705552517567e-01 -5.3768853904646212e-03 3.2265766557190916e+00 3.3703104910732882e+00 9.4581788064766070e-01 2 0 0 -145 0 -P 212 221 -8.0782432554875203e-02 -5.4307719493941597e-01 8.0330277427792112e+00 8.0703590291778973e+00 5.4744999999999999e-01 2 0 0 -146 0 -V -35 0 -1.6215267168984296e-05 -3.1353680968872467e-05 3.1608138103218157e-04 3.1849241778733736e-04 0 2 0 -P 213 22 1.5032738330306678e-02 -1.0610389672991376e-01 7.6971546215477149e-01 7.7713957099295439e-01 0 1 0 0 0 0 -P 214 22 -1.4491207335906356e-01 -1.4502950690157407e-01 1.7619998130615260e+00 1.7738873718774226e+00 0 1 0 0 0 0 -V -36 0 0 0 0 0 0 2 0 -P 215 211 7.8196068794107787e-02 -3.3495008531546488e-01 9.1794139134572532e+00 9.1869160094288596e+00 1.3957000000000000e-01 1 0 0 0 0 -P 216 111 6.7011046783931716e-01 3.1756771243611115e-01 3.4595425231838661e+01 3.4603635124986923e+01 1.3497999999999999e-01 2 0 0 -147 0 -V -37 0 0 0 0 0 0 2 0 -P 217 -211 -4.9685789383140927e-01 -3.6267488655702912e-01 1.0819762776427670e+01 1.0838133933619364e+01 1.3957000000000000e-01 1 0 0 0 0 -P 218 111 2.0568277559265397e-01 -7.6716771394558292e-02 3.4410912961920448e+00 3.4507274271256705e+00 1.3497999999999999e-01 2 0 0 -148 0 -V -38 0 0 0 0 0 0 2 0 -P 219 211 1.5091075346411628e-01 -4.4759866324261638e-01 8.8874577707197915e+00 8.9010956645839556e+00 1.3957000000000000e-01 1 0 0 0 0 -P 220 111 -3.6160430730145765e-01 1.7103168765392807e-01 6.7399550195350288e+00 6.7531639087909117e+00 1.3497999999999999e-01 2 0 0 -149 0 -V -39 0 6.6134868952544265e-05 -6.0578167977499482e-06 5.5521228499667028e-04 5.5936992922159148e-04 0 2 0 -P 221 22 3.9890753756978531e-01 -8.3411821985644619e-02 2.9894333750092708e+00 3.0170841319386961e+00 0 1 0 0 0 0 -P 222 22 1.9818742468699430e-01 2.8719162130123162e-02 2.0232696605477911e+00 2.0331559617674917e+00 0 1 0 0 0 0 -V -40 0 0 0 0 0 0 2 0 -P 223 -211 -8.0116535432035585e-01 -4.3595563284300476e-01 -4.4464390949206933e+00 4.5411698546200583e+00 1.3957000000000000e-01 1 0 0 0 0 -P 224 211 -1.8430479575079395e+00 -1.8805736996568283e+00 -1.8133624777653438e+01 1.8324333837145126e+01 1.3957000000000000e-01 1 0 0 0 0 -V -41 0 0 0 0 0 0 2 0 -P 225 22 -5.5928768554192265e-01 -1.5147257359489372e-01 -1.5692017076727673e+01 1.5702711440769178e+01 0 1 0 0 0 0 -P 226 22 4.2982874000373740e-02 1.6744026991665381e-01 -4.3431881820625335e+00 4.3466271241336942e+00 0 1 0 0 0 0 -V -42 0 7.6394153622048107e-05 1.0029878162263965e-04 -3.7481894148792775e-03 3.7506937113298347e-03 0 3 0 -P 227 22 1.1629338988407917e-01 8.9272709148877694e-02 -2.8532131053532828e+00 2.8569772126653779e+00 0 1 0 0 0 0 -P 228 -11 1.5797118386348692e-02 1.4711735030322620e-02 -1.0283381816186061e+00 1.0285648545286661e+00 5.1000000000000004e-04 1 0 0 0 0 -P 229 11 5.9939238082474242e-02 1.4813366540532533e-01 -5.5401626596588285e+00 5.5424668560728723e+00 5.1000000000000004e-04 1 0 0 0 0 -V -43 0 0 0 0 0 0 2 0 -P 230 -211 1.4467675491244145e-01 1.8856155472397737e-01 -1.1886630144118609e+01 1.1889825179173203e+01 1.3957000000000000e-01 1 0 0 0 0 -P 231 111 -5.0350326425457087e-02 -6.7011909820600379e-01 -3.1309205936853076e+01 3.1316707853122548e+01 1.3497999999999999e-01 2 0 0 -150 0 -V -44 0 0 0 0 0 0 2 0 -P 232 -311 5.3036395409351500e-01 -1.2314697068839459e-01 -3.4041141413635536e+01 3.4049132665491257e+01 4.9767000000000000e-01 2 0 0 -151 0 -P 233 -211 2.9364965893852782e-03 -2.8037181824656832e-01 -2.9550358086806355e+01 2.9552017863808569e+01 1.3957000000000000e-01 1 0 0 0 0 -V -45 0 -4.8872289253927846e-05 -5.4402958994364631e-05 -3.4409448959975063e-03 3.4417503130490870e-03 0 2 0 -P 234 22 -4.4188958398665414e-02 -3.6742753102171405e-03 -2.1044367148210967e+00 2.1049038103985716e+00 0 1 0 0 0 0 -P 235 22 -4.2790481089641280e-01 -5.2184434402458346e-01 -3.1134207733526843e+01 3.1141520759927278e+01 0 1 0 0 0 0 -V -46 0 0 0 0 0 0 2 0 -P 236 2212 1.2977839391996976e-01 -1.4318504925871164e-01 -6.0637712423823552e+02 6.0637788094093207e+02 9.3827000000000005e-01 1 0 0 0 0 -P 237 211 -1.2295953257244377e-01 1.8096777706713205e-01 -3.0609568574526622e+02 3.0609579575687195e+02 1.3957000000000000e-01 1 0 0 0 0 -V -47 0 4.2169714021909966e-05 8.5829172994005684e-05 -9.6870296651885690e-01 9.6870297157190144e-01 0 2 0 -P 238 22 9.2913107559837393e-02 1.9693827307980796e-01 -2.8833621000331136e+03 2.8833621082557238e+03 0 1 0 0 0 0 -P 239 22 1.3123498171528272e-01 2.5927646721163589e-01 -2.2656630725712694e+03 2.2656630912075148e+03 0 1 0 0 0 0 -V -48 0 0 0 0 0 0 2 0 -P 240 211 -9.2822980160143120e-01 1.2804318498963387e+00 5.1973118949309658e+01 5.1997362331091381e+01 1.3957000000000000e-01 1 0 0 0 0 -P 241 111 -6.5531495792427386e-01 1.7586644364637036e+00 5.3859919479611001e+01 5.3892777663103821e+01 1.3497999999999999e-01 2 0 0 -152 0 -V -49 0 0 0 0 0 0 2 0 -P 242 -211 -7.6039881533248244e-01 2.0320687957741885e+00 6.9082683121476649e+01 6.9116887205634285e+01 1.3957000000000000e-01 1 0 0 0 0 -P 243 111 -3.8399339173650116e-01 3.7283975804546754e-01 2.7206887603585198e+01 2.7212486345143006e+01 1.3497999999999999e-01 2 0 0 -153 0 -V -50 0 0 0 0 0 0 2 0 -P 244 211 1.0973573194578165e-01 1.1879012864271921e+00 3.0285434690618651e+01 3.0309242576840955e+01 1.3957000000000000e-01 1 0 0 0 0 -P 245 111 -4.1020081276223969e-01 5.9241060031560666e-01 2.7159228200759497e+01 2.7169120543136597e+01 1.3497999999999999e-01 2 0 0 -154 0 -V -51 0 0 0 0 0 0 2 0 -P 246 -211 -3.1659081224093022e-01 -4.3498967383643228e-02 7.7575986968116100e+00 7.7654323271941532e+00 1.3957000000000000e-01 1 0 0 0 0 -P 247 111 6.6426419466017059e-02 3.5700759179416253e-01 3.2854791305799246e+01 3.2857075314729755e+01 1.3497999999999999e-01 2 0 0 -155 0 -V -52 0 0 0 0 0 0 2 0 -P 248 211 2.8109806984337099e-02 -7.3137418999519999e-01 4.8717155060388739e+00 4.9283658674777211e+00 1.3957000000000000e-01 1 0 0 0 0 -P 249 111 3.0439207238921828e-01 -1.0014164915511482e-01 2.0179891546884896e+00 2.0477262298630827e+00 1.3497999999999999e-01 2 0 0 -156 0 -V -53 0 0 0 0 0 0 3 0 -P 250 -211 5.7751284344357268e-01 -1.6610167022038862e+00 2.0077346456800402e+01 2.0154697172139258e+01 1.3957000000000000e-01 1 0 0 0 0 -P 251 211 5.8128837571324521e-01 -1.9934568518397549e+00 2.9607592755877548e+01 2.9680646808630684e+01 1.3957000000000000e-01 1 0 0 0 0 -P 252 111 6.5948645476388301e-01 -1.2682284115554467e+00 1.7819650401514330e+01 1.7877401537149723e+01 1.3497999999999999e-01 2 0 0 -157 0 -V -54 0 5.1864047261200106e-06 -8.9353295080138478e-06 4.5057994120876729e-05 4.6268003358622562e-05 0 2 0 -P 253 22 2.7757152045232775e-01 -5.5879187093033122e-01 2.7799486518070124e+00 2.8491066688819608e+00 0 1 0 0 0 0 -P 254 22 8.3150786524103473e-02 -6.2673834877903317e-02 3.5390310973347999e-01 3.6890306851110266e-01 0 1 0 0 0 0 -V -55 0 0 0 0 0 0 2 0 -P 255 211 -3.4537287284459200e-01 2.0534899061500686e-01 2.2461602796552680e+00 2.2860810169468100e+00 1.3957000000000000e-01 1 0 0 0 0 -P 256 -211 -1.0411121014131801e-01 -2.0872779943077877e-01 6.2062244364248373e+00 6.2121741748367851e+00 1.3957000000000000e-01 1 0 0 0 0 -V -56 0 0 0 0 0 0 2 0 -P 257 -211 1.2850549764079238e-03 3.2229511813417006e-01 9.1196910591118752e-01 9.7726313220946881e-01 1.3957000000000000e-01 1 0 0 0 0 -P 258 111 -2.8056748593473252e-01 1.1916090751261861e-02 4.0696486529871594e+00 4.0815585095086817e+00 1.3497999999999999e-01 2 0 0 -158 0 -V -57 0 0 0 0 0 0 2 0 -P 259 211 7.8085905486046631e-02 1.9157586059214773e-02 2.0788278036794767e+00 2.0850585708775737e+00 1.3957000000000000e-01 1 0 0 0 0 -P 260 111 -3.8387407607252627e-01 6.8367344397323782e-01 2.1019786165900940e+00 2.2475102645542622e+00 1.3497999999999999e-01 2 0 0 -159 0 -V -58 0 0 0 0 0 0 2 0 -P 261 211 -1.9218849411493319e-01 1.1374276734294492e-01 1.0045138277378207e+00 1.0384611930204639e+00 1.3957000000000000e-01 1 0 0 0 0 -P 262 111 -1.8889806198257593e+00 2.4579472809096470e+00 1.8831934148939073e+01 1.9085851199466742e+01 1.3497999999999999e-01 2 0 0 -160 0 -V -59 0 0 0 0 0 0 2 0 -P 263 -311 -1.4318375653716335e+00 -3.5863038245912704e+00 -2.3209274506000757e+00 4.5327821032712690e+00 4.9767000000000000e-01 2 0 0 -161 0 -P 264 111 -1.9155619001346455e-01 -6.0914542296763896e-01 -1.2809667227843524e-01 6.6511674020709111e-01 1.3497999999999999e-01 2 0 0 -162 0 -V -60 0 0 0 0 0 0 2 0 -P 265 311 -2.9659176075774984e-01 -4.6221487895696203e-02 -1.5427574353175526e+00 1.6485991118583883e+00 4.9767000000000000e-01 2 0 0 -163 0 -P 266 211 -1.5043143739465120e-01 -4.3840705696961185e-01 -1.8263399040108697e+00 1.8893987389748650e+00 1.3957000000000000e-01 1 0 0 0 0 -V -61 0 0 0 0 0 0 2 0 -P 267 -321 1.3117237531214782e-01 2.2171635567557227e-01 -7.0771807964257647e+00 7.0990487616100166e+00 4.9359999999999998e-01 1 0 0 0 0 -P 268 321 1.6118644520389575e-01 1.9737463878801137e-01 -4.5373479438923123e+00 4.5712257811333235e+00 4.9359999999999998e-01 1 0 0 0 0 -V -62 0 0 0 0 0 0 2 0 -P 269 -321 7.0076510378991513e-02 1.6115182850873450e-01 -1.4990960823910882e+01 1.5000114266670419e+01 4.9359999999999998e-01 1 0 0 0 0 -P 270 211 -2.6567428535109305e-01 1.6610101468545962e-01 -2.5800207633514976e+01 2.5802487595004493e+01 1.3957000000000000e-01 1 0 0 0 0 -V -63 0 0 0 0 0 0 2 0 -P 271 -211 4.8599111099490840e-02 -7.4756967766754417e-02 -8.1617511091659747e+00 8.1634313515029557e+00 1.3957000000000000e-01 1 0 0 0 0 -P 272 111 3.7620839570376235e-01 4.8378053771402385e-01 -1.9561155024868459e+01 1.9571218201047309e+01 1.3497999999999999e-01 2 0 0 -164 0 -V -64 0 0 0 0 0 0 2 0 -P 273 -211 5.3030438115813272e-01 2.8459142744427268e-01 -8.4553036392123389e+00 8.4778449168068466e+00 1.3957000000000000e-01 1 0 0 0 0 -P 274 211 -1.6258540618367565e-01 1.6222338006653356e-01 -1.2249613526344374e+01 1.2252561437064626e+01 1.3957000000000000e-01 1 0 0 0 0 -V -65 0 0 0 0 0 0 2 0 -P 275 311 8.0055295557585249e-01 1.1955698343636345e+00 -1.3612825986589098e+02 1.3613677343689312e+02 4.9767000000000000e-01 2 0 0 -165 0 -P 276 211 7.3266490640172433e-01 1.6751233348484984e+00 -1.1609843447379056e+02 1.1611291402381548e+02 1.3957000000000000e-01 1 0 0 0 0 -V -66 0 0 0 0 0 0 1 0 -P 277 130 2.2891228831712537e-01 -1.3418287413741594e+00 9.8860382248171286e-01 1.7543996561917690e+00 4.9767000000000000e-01 1 0 0 0 0 -V -67 0 0 0 0 0 0 2 0 -P 278 -211 -3.8537250695572384e-01 -9.0184159113101237e-01 4.3277868687666932e-01 1.0810214620097742e+00 1.3957000000000000e-01 1 0 0 0 0 -P 279 111 8.9810384677170528e-03 -6.3878733240759011e-01 -2.6775211174027441e-01 7.0571999322517431e-01 1.3497999999999999e-01 2 0 0 -166 0 -V -68 0 0 0 0 0 0 2 0 -P 280 2112 2.4694209341644854e-01 -8.4716433213517051e-01 6.4556864532723501e-01 1.4416027413516419e+00 9.3957000000000002e-01 1 0 0 0 0 -P 281 111 -8.5409563822338136e-02 -4.3012054975671515e-01 -1.2184751648084854e-01 4.7472613008753961e-01 1.3497999999999999e-01 2 0 0 -167 0 -V -69 0 0 0 0 0 0 2 0 -P 282 -2212 -1.1996124512738150e-01 2.3026123610330118e-01 -3.6071253594137636e+00 3.7361898892602081e+00 9.3827000000000005e-01 1 0 0 0 0 -P 283 111 -6.6404144386860195e-02 6.2308146282458045e-02 -9.8313964690159639e-01 9.9653147526543429e-01 1.3497999999999999e-01 2 0 0 -168 0 -V -70 0 2.2607956805941250e-06 3.0594289068836569e-06 -1.8790166695767641e-05 1.9211970399434110e-05 0 2 0 -P 284 22 1.5503350124231352e-01 9.7732231082630405e-02 -8.5706126698882723e-01 8.7643652985959741e-01 0 1 0 0 0 0 -P 285 22 8.9437597330653915e-02 2.3309905645556292e-01 -1.1748130566901320e+00 1.2010495294143226e+00 0 1 0 0 0 0 -V -71 0 0 0 0 0 0 2 0 -P 286 211 -3.1925262209964905e-01 1.3821580424106233e-01 -5.1157300993405530e-01 6.3420231366062840e-01 1.3957000000000000e-01 1 0 0 0 0 -P 287 111 4.5237516943432650e-02 1.4303653358737961e-01 -1.2206147222144386e+00 1.2371846197583172e+00 1.3497999999999999e-01 2 0 0 -169 0 -V -72 0 -9.3894008003613711e-06 4.8441180380011681e-05 -1.6347347256430333e-04 1.7121757089428238e-04 0 2 0 -P 288 22 -9.1259807998499157e-02 1.5539919386615769e-01 -5.1519193076376746e-01 5.4580215054016890e-01 0 1 0 0 0 0 -P 289 22 -9.8330182436480451e-03 3.6615228052958404e-01 -1.2448772907468852e+00 1.2976454253000318e+00 0 1 0 0 0 0 -V -73 0 0 0 0 0 0 2 0 -P 290 311 2.9288036009376067e-01 1.2928728715900386e+00 -1.1628140700302700e+01 1.1714035630061840e+01 4.9767000000000000e-01 2 0 0 -170 0 -P 291 111 -2.4972174502373165e-01 1.2171174499571773e+00 -9.8820220121753870e+00 9.9607386516486240e+00 1.3497999999999999e-01 2 0 0 -171 0 -V -74 0 0 0 0 0 0 2 0 -P 292 211 -8.1826523521756611e-01 7.8243572685105356e-01 -1.2828767012552214e+00 1.7166875304906464e+00 1.3957000000000000e-01 1 0 0 0 0 -P 293 111 -4.1995931923232044e-01 6.9352306047057866e-01 -2.4353681474951611e-01 8.5724549911498049e-01 1.3497999999999999e-01 2 0 0 -172 0 -V -75 0 0 0 0 0 0 2 0 -P 294 22 -2.3993756374341146e-01 1.6870365091332759e-01 -4.5024786003822342e-01 5.3735843884283452e-01 0 1 0 0 0 0 -P 295 22 -6.5988345454275177e-01 3.7272537616398288e-01 -8.6204472334868429e-02 7.6275919572719031e-01 0 1 0 0 0 0 -V -76 0 0 0 0 0 0 2 0 -P 296 -321 2.9684402714531981e-02 1.0172982955755167e-01 7.8543908048649558e-01 9.3369461342657356e-01 4.9359999999999998e-01 1 0 0 0 0 -P 297 211 -4.6850393570640159e-01 -8.5880035046017392e-02 7.6480086906950495e-01 9.1174090202280789e-01 1.3957000000000000e-01 1 0 0 0 0 -V -77 0 0 0 0 0 0 2 0 -P 298 -211 -1.2939988042445941e-01 -9.9234300444954626e-02 2.9453547623268478e-01 3.6444849718208244e-01 1.3957000000000000e-01 1 0 0 0 0 -P 299 111 3.9915573664182591e-01 -1.0301564308733102e-01 -1.5144973175224732e-01 4.5944983019106961e-01 1.3497999999999999e-01 2 0 0 -173 0 -V -78 0 0 0 0 0 0 2 0 -P 300 211 2.0689198584967584e-02 -2.5828734371727674e-01 1.5152033244273926e+00 1.5435223659275032e+00 1.3957000000000000e-01 1 0 0 0 0 -P 301 111 7.5486711156253306e-01 3.9411709508809456e-01 3.2919551559674907e+00 3.4029900073406600e+00 1.3497999999999999e-01 2 0 0 -174 0 -V -79 0 0 0 0 0 0 2 0 -P 302 -211 1.1757002829753060e+00 -7.7106228617607020e-01 2.2873454234941420e+01 2.2917050347446786e+01 1.3957000000000000e-01 1 0 0 0 0 -P 303 111 2.6685635170597993e-01 -8.2387989842869880e-01 1.2612720468497917e+01 1.2643137570094973e+01 1.3497999999999999e-01 2 0 0 -175 0 -V -80 0 0 0 0 0 0 3 0 -P 304 211 -3.0013898117931026e-01 2.2241352690799113e-01 1.2558660560100285e+00 1.3176610036398551e+00 1.3957000000000000e-01 1 0 0 0 0 -P 305 -211 -2.8515883010338406e-02 -1.2080898873270086e-01 9.9053262633137185e-01 1.0079894027564984e+00 1.3957000000000000e-01 1 0 0 0 0 -P 306 111 1.5031021128478475e-01 6.1869303805222545e-03 7.3336808953253430e-01 7.6071005834589123e-01 1.3497999999999999e-01 2 0 0 -176 0 -V -81 0 0 0 0 0 0 2 0 -P 307 211 5.1240948779819634e-02 3.3106285181225731e-01 6.2296340656530647e-01 7.2096562851593138e-01 1.3957000000000000e-01 1 0 0 0 0 -P 308 -211 -1.1415211181414819e+00 1.1959649466073342e-01 4.2262254369293686e+00 4.3815334089045752e+00 1.3957000000000000e-01 1 0 0 0 0 -V -82 0 -5.1481558743536353e-05 3.5870232266659004e-05 7.9369441921158649e-05 1.0331184230181930e-04 0 2 0 -P 309 22 -8.3041828422767416e-02 1.3659289369937574e-01 1.7956183625056635e-01 2.4040802173521689e-01 0 1 0 0 0 0 -P 310 22 -2.4944757644687382e-01 9.5072045551801362e-02 3.3303916405451600e-01 4.2682299848386052e-01 0 1 0 0 0 0 -V -83 0 0 0 0 0 0 2 0 -P 311 211 1.0309018758041712e-01 4.2724264587845878e-03 2.2631018679628315e-01 2.8520505947647545e-01 1.3957000000000000e-01 1 0 0 0 0 -P 312 111 -4.8694682571265593e-02 -3.6180916417226161e-01 3.4696204820675303e+00 3.4913840999483670e+00 1.3497999999999999e-01 2 0 0 -177 0 -V -84 0 0 0 0 0 0 3 0 -P 313 -211 3.0574739693101170e-02 -4.3491576202209295e-02 4.0806616924722747e-02 1.5482666693013367e-01 1.3957000000000000e-01 1 0 0 0 0 -P 314 211 -1.5562677085262105e-01 -2.3620058456930920e-01 9.0884352597140916e-01 9.6202221780842523e-01 1.3957000000000000e-01 1 0 0 0 0 -P 315 111 -2.4435179757304334e-01 7.4349308208397899e-02 5.9722684245561075e-01 6.6342680256207898e-01 1.3497999999999999e-01 2 0 0 -178 0 -V -85 0 0 0 0 0 0 2 0 -P 316 111 -3.6392887739340002e-01 6.7496682775182959e-01 1.4962438007820593e+00 1.6867096840135030e+00 1.3497999999999999e-01 2 0 0 -179 0 -P 317 22 1.4409213370305821e-01 -5.7604870198693786e-02 3.7612512111205554e-01 4.0687955318161023e-01 0 1 0 0 0 0 -V -86 0 3.5647739613994551e-04 -8.4878083113578028e-05 4.0545108369145441e-04 5.4813422162874350e-04 0 2 0 -P 318 22 1.0473665451576206e+00 -2.7870050354220938e-01 1.2250032599908525e+00 1.6356294316190043e+00 0 1 0 0 0 0 -P 319 22 9.3084625249818934e-02 7.1564722039120275e-03 7.2125724752282516e-02 1.1797492412943782e-01 0 1 0 0 0 0 -V -87 0 0 0 0 0 0 2 0 -P 320 -211 9.3744393824816696e-01 -6.7184195479951447e-01 2.5898309235071864e+00 2.8384638005162497e+00 1.3957000000000000e-01 1 0 0 0 0 -P 321 111 5.8064185894314453e-02 9.8787864581293211e-02 3.1042140903798182e-01 3.5736751875517092e-01 1.3497999999999999e-01 2 0 0 -180 0 -V -88 0 0 0 0 0 0 3 0 -P 322 -211 8.3735586764706563e-02 -1.0421123019306522e-01 2.4974112587102385e+02 2.4974120065127514e+02 1.3957000000000000e-01 1 0 0 0 0 -P 323 211 6.6821925997163825e-04 -1.0568054772206613e-03 2.1333331792164230e+02 2.1333336358105069e+02 1.3957000000000000e-01 1 0 0 0 0 -P 324 111 3.1232342162247389e-02 7.4080388596620431e-02 7.1134026050131084e+01 7.1134199546099481e+01 1.3497999999999999e-01 2 0 0 -181 0 -V -89 0 0 0 0 0 0 2 0 -P 325 211 1.2309113191819084e-01 2.0477190657215033e-01 1.1824104023206878e+03 1.1824104346963943e+03 1.3957000000000000e-01 1 0 0 0 0 -P 326 -211 2.7182151527050440e-02 2.1590966128895990e-03 4.4588081331807786e+01 4.4588308110623188e+01 1.3957000000000000e-01 1 0 0 0 0 -V -90 0 0 0 0 0 0 2 0 -P 327 211 3.8045312551576935e-02 4.4176323178469101e-01 2.0603934105508088e+02 2.0603986542510555e+02 1.3957000000000000e-01 1 0 0 0 0 -P 328 -211 -1.3786723222707301e-01 5.9274844571574309e-02 1.1735950011477758e+01 1.1737739277123415e+01 1.3957000000000000e-01 1 0 0 0 0 -V -91 0 0 0 0 0 0 2 0 -P 329 -321 -8.3627361383984444e-01 -5.2573367818186700e-01 1.4711426769101732e+02 1.4711841199755347e+02 4.9359999999999998e-01 1 0 0 0 0 -P 330 211 -8.2279004458571267e-02 7.3018712211581877e-02 5.1415548559796406e+01 5.1415855677568857e+01 1.3957000000000000e-01 1 0 0 0 0 -V -92 0 0 0 0 0 0 2 0 -P 331 311 1.8498251272975502e-01 2.1534491855260202e-01 5.4113827121414495e+01 5.4116860155770283e+01 4.9767000000000000e-01 2 0 0 -182 0 -P 332 211 5.2951984991579670e-01 -6.4554600935646037e-02 4.9941304935652070e+01 4.9944348799725510e+01 1.3957000000000000e-01 1 0 0 0 0 -V -93 0 0 0 0 0 0 2 0 -P 333 -211 -7.6476777911200444e-02 -4.0287232681542129e-01 1.3202657166015865e+02 1.3202728225230263e+02 1.3957000000000000e-01 1 0 0 0 0 -P 334 111 -1.8723935235103165e-01 6.7174295629019873e-02 2.0892529195013871e+01 2.0893912192932397e+01 1.3497999999999999e-01 2 0 0 -183 0 -V -94 0 0 0 0 0 0 2 0 -P 335 -2212 -1.2935100172353481e-01 -1.5203835057338125e-01 1.5037893482216367e+00 1.7836984998639236e+00 9.3827000000000005e-01 1 0 0 0 0 -P 336 211 -5.5352999453907193e-03 -1.0816988709474940e-01 3.6815646393669343e-01 4.0835074489701390e-01 1.3957000000000000e-01 1 0 0 0 0 -V -95 0 0 0 0 0 0 2 0 -P 337 22 4.6738825445375309e-01 1.6146085191757137e-01 5.0134341685598127e-01 7.0417796665907206e-01 0 1 0 0 0 0 -P 338 22 1.3168775031267746e-01 1.5037716076096133e-01 -1.3292620991243345e-01 2.4005068494513118e-01 0 1 0 0 0 0 -V -96 0 0 0 0 0 0 2 0 -P 339 2112 1.8167414076157981e-01 -1.5341709619492785e-01 1.3596341969857564e+00 1.6697123205329250e+00 9.3957000000000002e-01 1 0 0 0 0 -P 340 -211 -2.6075250516129161e-01 9.9943367152509469e-02 1.1394118409731577e+00 1.1814058040468192e+00 1.3957000000000000e-01 1 0 0 0 0 -V -97 0 0 0 0 0 0 3 0 -P 341 211 4.5932154060343913e-02 1.3436313571120873e-01 -2.6773721114820626e-02 2.0089756608059256e-01 1.3957000000000000e-01 1 0 0 0 0 -P 342 -211 -2.3240549013258138e-01 -1.2739824390148866e-01 -1.7172491484146121e-02 3.0002883820846565e-01 1.3957000000000000e-01 1 0 0 0 0 -P 343 111 5.3155140450545445e-02 -3.2198458976233074e-01 8.1469103673461631e-04 3.5315691855352199e-01 1.3497999999999999e-01 2 0 0 -184 0 -V -98 0 -5.3456041917950884e-06 1.0940115392255510e-05 -1.1276991913333317e-05 2.5881423818737699e-05 0 2 0 -P 344 22 2.8925221694516508e-02 7.6693657802626408e-02 -9.9535856321624535e-03 8.2569119313216199e-02 0 1 0 0 0 0 -P 345 22 -6.5257195441118784e-02 -2.3379870579969641e-03 -6.6691702615093121e-02 9.3336760914571146e-02 0 1 0 0 0 0 -V -99 0 0 0 0 0 0 2 0 -P 346 211 -1.6181000821158892e-01 -1.6963424504261243e-01 -2.6313301097208053e-01 3.7904751972786288e-01 1.3957000000000000e-01 1 0 0 0 0 -P 347 -211 3.2808169398020481e-01 1.6708294975973997e-01 1.4593698511490616e-01 4.1991868087733947e-01 1.3957000000000000e-01 1 0 0 0 0 -V -100 0 0 0 0 0 0 2 0 -P 348 -211 4.6420365845633227e-01 -4.0847882605596070e-01 -1.4697255584821705e+00 1.6005976977416989e+00 1.3957000000000000e-01 1 0 0 0 0 -P 349 111 -2.8173495143786537e-01 -2.3294554347192373e-01 -8.3799170321694616e-01 9.2416876388761626e-01 1.3497999999999999e-01 2 0 0 -185 0 -V -101 0 0 0 0 0 0 2 0 -P 350 211 -4.3713138842513549e-01 -8.0193348901581640e-01 -2.8575036213923499e+00 3.0031629830433717e+00 1.3957000000000000e-01 1 0 0 0 0 -P 351 -211 3.4464639850554046e-01 -3.9448924009807262e-01 -2.4618660005043602e+00 2.5208464629753493e+00 1.3957000000000000e-01 1 0 0 0 0 -V -102 0 0 0 0 0 0 2 0 -P 352 22 3.2856276203468715e-01 -2.2653644571307425e+00 -1.0628501612512524e+01 1.0872206590172965e+01 0 1 0 0 0 0 -P 353 22 1.0434568190199986e-01 -2.7883825262630772e-02 -4.8973860227147370e-01 5.0150715607820417e-01 0 1 0 0 0 0 -V -103 0 4.9037358891567776e-06 3.2017628026642254e-06 -1.1892814674675885e-05 1.3454250789796279e-05 0 2 0 -P 354 22 2.2354910027528657e-01 1.6029891550903602e-01 -6.4738274096045079e-01 7.0340198737330506e-01 0 1 0 0 0 0 -P 355 22 6.4511010772874300e-02 2.7782206584984766e-02 -5.1236759212390626e-02 8.6940939770953726e-02 0 1 0 0 0 0 -V -104 0 -1.3726373686040436e-04 -9.9702507710567058e-05 -2.9060095827281827e-03 2.9116430753003118e-03 0 2 0 -P 356 22 -2.5303124530879706e-01 -1.9767059562620412e-01 -4.4765459960137299e+00 4.4880466274209283e+00 0 1 0 0 0 0 -P 357 22 -4.0221420025721384e-02 -1.5335598110120413e-02 -1.7319040659961942e+00 1.7324389273542784e+00 0 1 0 0 0 0 -V -105 0 0 0 0 0 0 2 0 -P 358 211 -2.3305194831128404e-01 3.5257524413723085e-01 -3.8645950116748433e+00 3.8901409874903243e+00 1.3957000000000000e-01 1 0 0 0 0 -P 359 111 1.6319333803292452e-01 9.1595544301201692e-01 -1.4636028000277902e+01 1.4666190427799593e+01 1.3497999999999999e-01 2 0 0 -186 0 -V -106 0 0 0 0 0 0 3 0 -P 360 211 -5.1068619640013913e-02 -1.1688780893563810e-01 -1.4247259084409054e+00 1.4372176115232076e+00 1.3957000000000000e-01 1 0 0 0 0 -P 361 -211 -3.9918742821603924e-02 2.3757962531374108e-01 -4.9884072044398658e-01 5.7127877053654863e-01 1.3957000000000000e-01 1 0 0 0 0 -P 362 111 1.4605102514493379e-01 -7.1654523819423611e-04 -1.0841280953562038e+00 1.1022181013409436e+00 1.3497999999999999e-01 2 0 0 -187 0 -V -107 0 0 0 0 0 0 2 0 -P 363 -2212 -1.1406253960346636e-01 1.3050504356992600e+00 -1.3746559005676280e+01 1.3840679246052170e+01 9.3827000000000005e-01 1 0 0 0 0 -P 364 111 -7.3879643598863620e-02 2.1911131985195054e-01 -5.3599032767510568e+00 5.3665865043575209e+00 1.3497999999999999e-01 2 0 0 -188 0 -V -108 0 0 0 0 0 0 2 0 -P 366 111 -1.9383253021003571e-01 2.6263377003627869e-01 -2.5692229458455249e+00 2.5933903857287377e+00 1.3497999999999999e-01 2 0 0 -189 0 -P 365 2212 -9.2672351349186208e-02 3.2713801118000992e-02 -5.0230624849063501e+00 5.1108869756297421e+00 9.3827000000000005e-01 1 0 0 0 0 -V -109 0 0 0 0 0 0 2 0 -P 367 -211 -8.9256978629664779e-02 4.9532478206519792e-01 -7.2657351357255473e-01 8.9481970445850134e-01 1.3957000000000000e-01 1 0 0 0 0 -P 368 111 -4.4699794465351418e-02 -2.0886308426759173e-01 1.1405705795541135e-02 2.5292597755017221e-01 1.3497999999999999e-01 2 0 0 -190 0 -V -110 0 0 0 0 0 0 3 0 -P 369 -211 5.2655584360949588e-02 -2.6070291359845066e-01 -2.7865206099874709e-02 3.0165356675183341e-01 1.3957000000000000e-01 1 0 0 0 0 -P 370 211 1.1822125040940321e-01 -3.6410489305205150e-02 -7.4902779595835356e-02 2.0097810594935350e-01 1.3957000000000000e-01 1 0 0 0 0 -P 371 111 -1.6232482169526979e-02 -5.4435203098128715e-02 7.9250327722834704e-02 1.6651396235119514e-01 1.3497999999999999e-01 2 0 0 -191 0 -V -111 0 0 0 0 0 0 1 0 -P 372 130 9.3352618998182743e-02 4.0984422314125646e-01 -2.9781253674948460e+00 3.0485395080484676e+00 4.9767000000000000e-01 1 0 0 0 0 -V -112 0 0 0 0 0 0 2 0 -P 373 130 -2.2310089003166997e-01 -9.6246577399157734e-02 -1.0045105369445986e-02 5.5390770335486272e-01 4.9767000000000000e-01 1 0 0 0 0 -P 374 310 -1.0058249844852461e-01 -3.3078112442504448e-01 -8.2668057706903650e-02 6.1159008161927886e-01 4.9767000000000000e-01 2 0 0 -192 0 -V -113 0 0 0 0 0 0 2 0 -P 375 -321 5.8939484155127987e-02 2.3553953346591427e-01 -5.9125978676033464e+00 5.9381316286021688e+00 4.9359999999999998e-01 1 0 0 0 0 -P 376 321 -1.6771205287668237e-01 1.4016513775476167e-01 -5.5593832946803383e+00 5.5855310558345961e+00 4.9359999999999998e-01 1 0 0 0 0 -V -114 0 0 0 0 0 0 2 0 -P 377 211 4.4626469507733829e-01 -2.9876737728109021e-01 -2.7747433142093183e+01 2.7752980738717618e+01 1.3957000000000000e-01 1 0 0 0 0 -P 378 -211 -2.6784944598235311e-01 8.4540277169185385e-02 -1.4243508730173986e+01 1.4246961469577274e+01 1.3957000000000000e-01 1 0 0 0 0 -V -115 0 0 0 0 0 0 2 0 -P 379 211 -4.7708602474535206e-01 4.2323427871643926e-01 1.2306474356724806e+00 1.3930941194029927e+00 1.3957000000000000e-01 1 0 0 0 0 -P 380 111 -3.7138811372573445e-02 -2.6763057762592657e-01 1.8964640672464467e-01 3.5663816028872181e-01 1.3497999999999999e-01 2 0 0 -193 0 -V -116 0 0 0 0 0 0 2 0 -P 381 -211 1.8239573851947732e-01 8.5172318449127438e-01 1.2672881147092623e+00 1.5440853405862578e+00 1.3957000000000000e-01 1 0 0 0 0 -P 382 111 -5.5029184311155943e-02 -3.1797439570535158e-02 2.5538799358925224e-01 2.9577341996659695e-01 1.3497999999999999e-01 2 0 0 -194 0 -V -117 0 0 0 0 0 0 3 0 -P 383 211 -6.2243035013886994e-01 4.2244827222762471e-01 1.4918178951339065e+00 1.6765686686276411e+00 1.3957000000000000e-01 1 0 0 0 0 -P 384 -211 -5.3662832160087004e-01 7.6596039196045107e-01 2.0066624387491827e+00 2.2182964647637142e+00 1.3957000000000000e-01 1 0 0 0 0 -P 385 111 -5.4333294606349714e-01 8.9116704629103738e-01 3.0590759352765375e+00 3.2350509382173804e+00 1.3497999999999999e-01 2 0 0 -195 0 -V -118 0 0 0 0 0 0 2 0 -P 386 2212 1.5566891027165103e-01 1.9712389042807388e-01 1.7138534409912462e-01 9.8631342223181673e-01 9.3827000000000005e-01 1 0 0 0 0 -P 387 -211 2.0173096820492542e-01 3.0084177275992156e-02 1.9384965688599484e-01 3.1409857629427085e-01 1.3957000000000000e-01 1 0 0 0 0 -V -119 0 -7.1660461754768958e-05 -1.0769721945931413e-04 1.5531901999572816e-05 1.3163894594449711e-04 0 2 0 -P 388 22 -1.1697413369043864e-01 -9.6649254231599702e-02 4.1343221873855411e-02 1.5726820495912039e-01 0 1 0 0 0 0 -P 389 22 -3.9737322549938564e-01 -6.7635414352139833e-01 7.0137957301546427e-02 7.8757840299032089e-01 0 1 0 0 0 0 -V -120 0 0 0 0 0 0 2 0 -P 390 -2112 3.0284788000153912e-01 -8.9128481759035616e-01 -3.4314384176045293e-01 1.3735519449684543e+00 9.3957000000000002e-01 1 0 0 0 0 -P 391 211 5.8301081246194575e-01 -7.0551758694164624e-01 -7.9066317918965748e-02 9.2918670914986956e-01 1.3957000000000000e-01 1 0 0 0 0 -V -121 0 2.2874989631111603e+01 -2.2902782156161990e+01 -1.2543595889194581e+01 4.1058814581296019e+01 0 2 0 -P 392 2112 7.2363470358385507e-01 -8.6288876686327309e-01 -4.4761632740272878e-01 1.5334198282490092e+00 9.3957000000000002e-01 1 0 0 0 0 -P 393 -211 5.2572010790258272e-01 -3.8798397863996692e-01 -2.3747258980458383e-01 7.0907419593643206e-01 1.3957000000000000e-01 1 0 0 0 0 -V -122 0 0 0 0 0 0 2 0 -P 394 311 5.7209538578317543e-01 -9.1601292232158002e-02 -1.3829998035577337e-01 7.7619987157909842e-01 4.9767000000000000e-01 2 0 0 -196 0 -P 395 111 1.0969872995552975e-01 -2.7592125031730930e-01 1.9284939585462296e-01 3.7891534359539542e-01 1.3497999999999999e-01 2 0 0 -197 0 -V -123 0 0 0 0 0 0 2 0 -P 396 211 1.2768453337087937e-01 -7.3004776309065877e-01 1.5341155177660637e-01 7.6960247243256708e-01 1.3957000000000000e-01 1 0 0 0 0 -P 397 111 7.4745645835255581e-01 -1.8452765224834686e-01 -3.5285787768360583e-01 8.5759541382904525e-01 1.3497999999999999e-01 2 0 0 -198 0 -V -124 0 0 0 0 0 0 2 0 -P 398 -211 -5.1931286949743072e-01 -4.0616083780816176e-01 7.4895484048546535e-01 1.0075046504018192e+00 1.3957000000000000e-01 1 0 0 0 0 -P 399 211 1.3030258692077507e-01 1.1737552180221024e-01 1.4023573824788065e-02 2.2457119761760758e-01 1.3957000000000000e-01 1 0 0 0 0 -V -125 0 0 0 0 0 0 3 0 -P 400 -211 4.3941879075108720e-01 -2.1455387542550161e-01 -1.6625524305449231e+00 1.7385863821898757e+00 1.3957000000000000e-01 1 0 0 0 0 -P 401 211 7.2245244435792022e-01 -5.5562326516907601e-01 -3.3678421544139758e+00 3.4917753806772347e+00 1.3957000000000000e-01 1 0 0 0 0 -P 402 221 1.6929001772174577e+00 -6.2763907466060598e-01 -6.2654951393025753e+00 6.5433915258975537e+00 5.4744999999999999e-01 2 0 0 -199 0 -V -126 0 0 0 0 0 0 2 0 -P 403 -211 5.4351932812512205e-01 4.2529626811621611e-02 -8.8825094786447778e-01 1.0515186924084912e+00 1.3957000000000000e-01 1 0 0 0 0 -P 404 111 -5.8526099968283993e-02 -2.8429634583446145e-01 -3.7477092780150040e-01 4.9287175345877016e-01 1.3497999999999999e-01 2 0 0 -200 0 -V -127 0 0 0 0 0 0 3 0 -P 405 211 -1.7994431618017598e-01 -1.4981023610554228e-01 1.8335551296569244e-01 3.2851498109288968e-01 1.3957000000000000e-01 1 0 0 0 0 -P 406 -211 -3.4015018251631030e-01 1.0007639479731749e-01 5.8171857101285707e-01 6.9540902512316316e-01 1.3957000000000000e-01 1 0 0 0 0 -P 407 111 2.2104562458507233e-02 -3.0138619608482096e-02 6.8918524799908965e-01 7.0327295876704488e-01 1.3497999999999999e-01 2 0 0 -201 0 -V -128 0 -9.5716033249145031e-06 2.5588689164333307e-05 -5.6613145337201016e-05 6.4831666416758084e-05 0 2 0 -P 408 22 -8.8748848813062955e-02 2.1752980276142420e-01 -4.8819357581726175e-01 5.4178274310309327e-01 0 1 0 0 0 0 -P 409 22 7.3136079243070681e-03 1.7887105092202264e-04 6.5286998810985524e-03 9.8053443519745542e-03 0 1 0 0 0 0 -V -129 0 0 0 0 0 0 2 0 -P 410 -211 -1.3210591454662315e-01 -4.1453641988988016e-02 1.7499835301972946e+00 1.7609919130859564e+00 1.3957000000000000e-01 1 0 0 0 0 -P 411 111 -5.9981210232161325e-02 1.0568271312618416e+00 8.3436496620987999e+00 8.4116104650175920e+00 1.3497999999999999e-01 2 0 0 -202 0 -V -130 0 0 0 0 0 0 2 0 -P 412 -211 2.1039382235683586e-02 1.7495114851534666e-01 2.9952412067790757e+00 3.0036644672231736e+00 1.3957000000000000e-01 1 0 0 0 0 -P 413 211 -4.2564457750844004e-01 -3.6237405135327300e-01 1.1465562013267260e+01 1.1480029630816887e+01 1.3957000000000000e-01 1 0 0 0 0 -V -131 0 0 0 0 0 0 2 0 -P 414 311 -7.8781697561949271e-01 5.4422089375246685e-01 9.1458600181790075e+00 9.2093030609974118e+00 4.9767000000000000e-01 2 0 0 -203 0 -P 415 211 -1.0295964159075386e+00 3.1096384658587001e-01 6.4911205497073698e+00 6.5811012049098920e+00 1.3957000000000000e-01 1 0 0 0 0 -V -132 0 0 0 0 0 0 2 0 -P 416 -311 -7.2639469362242060e-01 3.6391099384214726e-01 1.1382133321844409e+01 1.1421940064958441e+01 4.9767000000000000e-01 2 0 0 -204 0 -P 417 111 1.1338504577602361e-01 8.4838802122491092e-02 4.4320364364653537e+00 4.4363521462467022e+00 1.3497999999999999e-01 2 0 0 -205 0 -V -133 0 -3.6644226869673425e+01 1.4039955316751673e+01 3.2242699278545501e+02 3.3749134797523197e+02 0 2 0 -P 418 -2212 -4.4069160658852696e-01 7.0169749752342234e-02 3.4521641169690143e+00 3.6051242099664664e+00 9.3827000000000005e-01 1 0 0 0 0 -P 419 211 -5.3458486904178924e-03 1.0072609051156285e-01 4.7245178192138493e-01 5.0285663418976212e-01 1.3957000000000000e-01 1 0 0 0 0 -V -134 0 0 0 0 0 0 2 0 -P 420 -321 8.2738509392200044e-01 -4.4400280839202599e-01 -1.3379709157489843e+01 1.3421697459208426e+01 4.9359999999999998e-01 1 0 0 0 0 -P 421 211 1.6711326947641161e-01 -1.9094728388891710e-01 -1.2625904583366416e+00 1.2953772270818957e+00 1.3957000000000000e-01 1 0 0 0 0 -V -135 0 0 0 0 0 0 2 0 -P 422 -211 -4.5648702994576327e-03 8.5062884111795842e-02 -2.3933131666525642e+00 2.3988922924689202e+00 1.3957000000000000e-01 1 0 0 0 0 -P 423 111 7.0217973892037344e-01 -2.8698062984842038e-01 -7.3498259370883083e+00 7.3900998080915326e+00 1.3497999999999999e-01 2 0 0 -206 0 -V -136 0 0 0 0 0 0 2 0 -P 424 211 4.6755588266707993e-01 6.7144388467335656e-02 -6.1051702587828593e+00 6.1250061670128959e+00 1.3957000000000000e-01 1 0 0 0 0 -P 425 -211 -9.8483352004072017e-02 -2.1413651713213966e-01 -2.3969506914096916e+00 2.4125517239099432e+00 1.3957000000000000e-01 1 0 0 0 0 -V -137 0 0 0 0 0 0 3 0 -P 426 111 -1.4763122465585482e-01 1.5578289972556411e-01 -6.3575580169438950e-01 6.8444746338076856e-01 1.3497999999999999e-01 2 0 0 -207 0 -P 427 111 -5.9749928543227060e-01 4.0523346497645923e-01 -1.0521574728239369e+00 1.2831502270771551e+00 1.3497999999999999e-01 2 0 0 -208 0 -P 428 111 -3.7075092612150112e-01 1.6389697387756819e-01 -7.6281205611413760e-01 8.7431132934398903e-01 1.3497999999999999e-01 2 0 0 -209 0 -V -138 0 0 0 0 0 0 2 0 -P 429 -211 1.4873964520465802e-01 2.9361212237253576e-01 -5.2603507832528784e-01 6.3602220793648723e-01 1.3957000000000000e-01 1 0 0 0 0 -P 430 111 -3.2472936796134794e-01 4.1437910527456240e-02 -1.2473036619170828e+00 1.2965925683410431e+00 1.3497999999999999e-01 2 0 0 -210 0 -V -139 0 0 0 0 0 0 2 0 -P 431 321 -1.3937482792474679e-01 4.2593421262169195e-01 -1.9171899663819201e+00 2.0298038386347144e+00 4.9359999999999998e-01 1 0 0 0 0 -P 432 111 -5.5302161674478068e-01 2.7557884791839724e-02 -1.6155048992407390e+00 1.7130872790001219e+00 1.3497999999999999e-01 2 0 0 -211 0 -V -140 0 1.8598834508787614e-05 -2.8282549299325688e-05 1.3720995802205736e-04 1.4332481861146809e-04 0 2 0 -P 433 22 7.3486303836907945e-03 -7.2423525982247119e-02 1.1094367272080649e-01 1.3269388833325652e-01 0 1 0 0 0 0 -P 434 22 9.7839239745626749e-02 -8.7531718590624669e-02 6.6506319147565862e-01 6.7789628059845486e-01 0 1 0 0 0 0 -V -141 0 7.9626809661280000e-06 -2.3200113145596084e-06 1.3507474476220213e-04 1.3560294199833913e-04 0 2 0 -P 435 22 8.0733491049569533e-02 4.1269360133104692e-02 1.3628764571598302e+00 1.3658891954120498e+00 0 1 0 0 0 0 -P 436 22 4.4054345042207586e-02 -7.7627615962248125e-02 7.5395896312458921e-01 7.5922391305397241e-01 0 1 0 0 0 0 -V -142 0 0 0 0 0 0 2 0 -P 437 -2212 -3.3636249934798157e-01 6.3185487895276859e-01 9.1363404725172559e-01 1.4924671132797558e+00 9.3827000000000005e-01 1 0 0 0 0 -P 438 -211 -2.1550620238062704e-01 4.0104914462364860e-01 -5.9206301760771352e-02 4.7986301246925406e-01 1.3957000000000000e-01 1 0 0 0 0 -V -143 0 0 0 0 0 0 2 0 -P 439 2212 -3.1316133468193180e-01 6.3226783732812875e-01 1.0670883973236167e+00 1.5864617487547701e+00 9.3827000000000005e-01 1 0 0 0 0 -P 440 211 -1.3656134001203910e-01 8.4180305408821043e-02 7.6571336719638172e-01 7.9468992003663097e-01 1.3957000000000000e-01 1 0 0 0 0 -V -144 0 0 0 0 0 0 2 0 -P 441 -211 1.0685444223770994e-01 -1.6539225620957393e-01 3.8242266590415475e-01 4.5221604409537064e-01 1.3957000000000000e-01 1 0 0 0 0 -P 442 111 -6.1402112512214591e-01 1.1088767981697505e-01 9.1946862391992579e-01 1.1193570343749397e+00 1.3497999999999999e-01 2 0 0 -212 0 -V -145 0 0 0 0 0 0 2 0 -P 443 211 9.7606484216440248e-02 3.9484400593725694e-01 2.3399496935609863e+00 2.3791328605359197e+00 1.3957000000000000e-01 1 0 0 0 0 -P 444 111 1.3390057130873545e-01 -4.0022089132772154e-01 8.8662696215810521e-01 9.9117763053736829e-01 1.3497999999999999e-01 2 0 0 -213 0 -V -146 0 0 0 0 0 0 2 0 -P 445 22 4.4521386228282923e-02 6.9294890896827888e-02 2.7189184044015768e-01 2.8409348572965798e-01 0 1 0 0 0 0 -P 446 22 -1.2530381878315813e-01 -6.1237208583624381e-01 7.7611359023390527e+00 7.7862655434482386e+00 0 1 0 0 0 0 -V -147 0 5.6913008971348268e-04 2.6971275534858177e-04 2.9382166688662489e-02 2.9389139415471353e-02 0 2 0 -P 447 22 4.2233155950894929e-01 2.7013379931995773e-01 2.3306869194700617e+01 2.3312260462567259e+01 0 1 0 0 0 0 -P 448 22 2.4777890833036781e-01 4.7433913116153387e-02 1.1288556037138038e+01 1.1291374662419651e+01 0 1 0 0 0 0 -V -148 0 7.2343549030833013e-05 -2.6983122416924707e-05 1.2103140682944620e-03 1.2137033258959099e-03 0 2 0 -P 449 22 -8.2133726674077593e-03 8.9676039303206116e-03 6.5846311157447568e-01 6.5857539182326363e-01 0 1 0 0 0 0 -P 450 22 2.1389614826006173e-01 -8.5684375324878909e-02 2.7826281846175691e+00 2.7921520353024070e+00 0 1 0 0 0 0 -V -149 0 -7.5113701994512593e-05 3.5527295882971153e-05 1.4000468538991121e-03 1.4027906502289988e-03 0 2 0 -P 451 22 -3.5454234029793569e-01 1.4220281432805057e-01 6.5246306076120621e+00 6.5358034301266219e+00 0 1 0 0 0 0 -P 452 22 -7.0619670035219672e-03 2.8828873325877486e-02 2.1532441192296625e-01 2.1736047866429073e-01 0 1 0 0 0 0 -V -150 0 -5.0929560966308059e-06 -6.7782820668099025e-05 -3.1669389769068959e-03 3.1676977988036627e-03 0 2 0 -P 453 22 -5.5002501226308863e-02 -1.3676652957384980e-01 -8.4032580701003532e+00 8.4045509428796699e+00 0 1 0 0 0 0 -P 454 22 4.6521748008517740e-03 -5.3335256863215397e-01 -2.2905947866752722e+01 2.2912156910242874e+01 0 1 0 0 0 0 -V -151 0 0 0 0 0 0 1 0 -P 455 310 5.3036395409351500e-01 -1.2314697068839459e-01 -3.4041141413635536e+01 3.4049132665491257e+01 4.9767000000000000e-01 2 0 0 -214 0 -V -152 0 -4.4479064681634288e-05 1.1936817293250047e-04 3.6557060285476724e-03 3.6579362557860790e-03 0 2 0 -P 456 22 -3.6430534851601371e-01 8.0739446461353415e-01 2.4463146973768701e+01 2.4479178173881873e+01 0 1 0 0 0 0 -P 457 22 -2.9100960940826009e-01 9.5126997185016959e-01 2.9396772505842296e+01 2.9413599489221941e+01 0 1 0 0 0 0 -V -153 0 -3.2688397628246890e-06 3.1738916671182650e-06 2.3160543367457004e-04 2.3165309436201878e-04 0 2 0 -P 458 22 -3.6863888541709272e-01 3.2058557735849108e-01 2.2617594353889025e+01 2.2622869935030884e+01 0 1 0 0 0 0 -P 459 22 -1.5354506319408460e-02 5.2254180686976508e-02 4.5892932496961736e+00 4.5896164101121171e+00 0 1 0 0 0 0 -V -154 0 -4.2854531593272900e-05 6.1890366858268527e-05 2.8373810259926832e-03 2.8384144995640204e-03 0 2 0 -P 460 22 -2.8096998668766182e-01 3.1168131470771288e-01 1.4142709945501387e+01 1.4148934022672554e+01 0 1 0 0 0 0 -P 461 22 -1.2923082607457784e-01 2.8072928560789373e-01 1.3016518255258111e+01 1.3020186520464037e+01 0 1 0 0 0 0 -V -155 0 4.8419069681422279e-05 2.6022741558005558e-04 2.3948279049090002e-02 2.3949943892512968e-02 0 2 0 -P 462 22 -1.3484395339657791e-02 2.2805801648532943e-02 6.3682372456238570e+00 6.3682923574579586e+00 0 1 0 0 0 0 -P 463 22 7.9910814805674857e-02 3.3420179014562956e-01 2.6486554060175386e+01 2.6488782957271795e+01 0 1 0 0 0 0 -V -156 0 6.4458166593028880e-05 -2.1206028966113369e-05 4.2733005526343507e-04 4.3362718820302870e-04 0 2 0 -P 464 22 1.3203767002721134e-01 -4.0120215621858198e-02 4.9619347728990221e-01 5.1502577111519743e-01 0 1 0 0 0 0 -P 465 22 1.7235440236200694e-01 -6.0021433533256625e-02 1.5217956773985872e+00 1.5327004587478847e+00 0 1 0 0 0 0 -V -157 0 1.3825358825667505e-05 -2.6586918860885477e-05 3.7356803793201702e-04 3.7477872265037859e-04 0 2 0 -P 466 22 2.0055595174990928e-01 -3.1804893931032557e-01 4.0786477119442743e+00 4.0959425015162259e+00 0 1 0 0 0 0 -P 467 22 4.5893050301397365e-01 -9.5017947224512112e-01 1.3741002689570054e+01 1.3781459035633496e+01 0 1 0 0 0 0 -V -158 0 -3.6148472811710377e-05 1.5352758396390464e-06 5.2433582314645737e-04 5.2587029576442771e-04 0 2 0 -P 468 22 -1.1858415852348296e-01 2.7338446840418432e-02 9.6412493381788344e-01 9.7177491289789286e-01 0 1 0 0 0 0 -P 469 22 -1.6198332741124952e-01 -1.5422356089156571e-02 3.1055237191692759e+00 3.1097835966107890e+00 0 1 0 0 0 0 -V -159 0 -4.4031131225084997e-05 7.8418723750972992e-05 2.4110118934396308e-04 2.5779396306412045e-04 0 2 0 -P 470 22 -6.4845192110584787e-02 1.0986152109814992e-01 2.2013532446554113e-01 2.5442879914704414e-01 0 1 0 0 0 0 -P 471 22 -3.1902888396194151e-01 5.7381192287508798e-01 1.8818432921245529e+00 1.9930814654072178e+00 0 1 0 0 0 0 -V -160 0 -2.1425183974074652e-06 2.7878514019335631e-06 2.1359544375097700e-05 2.1647542010680192e-05 0 2 0 -P 472 22 -1.0106649381417249e-01 1.1138815142136117e-01 7.6457489296899328e-01 7.7922815876192886e-01 0 1 0 0 0 0 -P 473 22 -1.7879141260115867e+00 2.3465591294882859e+00 1.8067359255970079e+01 1.8306623040704810e+01 0 1 0 0 0 0 -V -161 0 0 0 0 0 0 1 0 -P 474 130 -1.4318375653716335e+00 -3.5863038245912704e+00 -2.3209274506000757e+00 4.5327821032712690e+00 4.9767000000000000e-01 1 0 0 0 0 -V -162 0 -6.6832389808381253e-07 -2.1252586175838513e-06 -4.4691882492897211e-07 2.3205379709460523e-06 0 2 0 -P 475 22 -8.9978113978881197e-02 -4.2173754181458945e-01 -1.3491536512632196e-01 4.5184153297165791e-01 0 1 0 0 0 0 -P 476 22 -1.0157807603458334e-01 -1.8740788115304952e-01 6.8186928478867403e-03 2.1327520723543308e-01 0 1 0 0 0 0 -V -163 0 0 0 0 0 0 1 0 -P 477 310 -2.9659176075774984e-01 -4.6221487895696203e-02 -1.5427574353175526e+00 1.6485991118583883e+00 4.9767000000000000e-01 2 0 0 -215 0 -V -164 0 4.3951762908156004e-06 5.6519226407509845e-06 -2.2852952185035586e-04 2.2864708816162558e-04 0 2 0 -P 478 22 1.2883066985740826e-01 8.7348139542502687e-02 -3.9328723885587951e+00 3.9359512527044345e+00 0 1 0 0 0 0 -P 479 22 2.4737772584635406e-01 3.9643239817152115e-01 -1.5628282636309663e+01 1.5635266948342874e+01 0 1 0 0 0 0 -V -165 0 0 0 0 0 0 1 0 -P 480 130 8.0055295557585249e-01 1.1955698343636345e+00 -1.3612825986589098e+02 1.3613677343689312e+02 4.9767000000000000e-01 1 0 0 0 0 -V -166 0 4.3515025435173503e-07 -3.0950593427809659e-05 -1.2973154490519804e-05 3.4193622002278503e-05 0 2 0 -P 481 22 -2.4004418795421954e-02 -6.1969176712752407e-02 5.3372209402327469e-03 6.6669910090888906e-02 0 1 0 0 0 0 -P 482 22 3.2985457263139006e-02 -5.7681815569483774e-01 -2.7308933268050717e-01 6.3905008313428557e-01 0 1 0 0 0 0 -V -167 0 -1.3223933000948637e-05 -6.6595414819650182e-05 -1.8865608512255433e-05 7.3501681277001948e-05 0 2 0 -P 483 22 -3.7755194341771034e-02 -4.2694828777757612e-02 -5.4028993871350510e-02 7.8533020334744422e-02 0 1 0 0 0 0 -P 484 22 -4.7654369480567102e-02 -3.8742572097895756e-01 -6.7818522609498041e-02 3.9619310975279542e-01 0 1 0 0 0 0 -V -168 0 -3.2646319843143344e-06 3.0632601190069616e-06 -4.8334168988367450e-05 4.8992552461397858e-05 0 2 0 -P 485 22 -9.1214787830148150e-03 3.2607644996470279e-02 -8.2554522871056302e-01 8.2623930222071917e-01 0 1 0 0 0 0 -P 486 22 -5.7282665603845380e-02 2.9700501285987765e-02 -1.5759441819103331e-01 1.7029217304471525e-01 0 1 0 0 0 0 -V -169 0 5.0024187811615822e-05 1.5817151124905720e-04 -1.3497703728087306e-03 1.3680935638846403e-03 0 2 0 -P 487 22 -3.6296416944126709e-03 5.0920677562811878e-02 -8.6736175513884239e-01 8.6886276475621793e-01 0 1 0 0 0 0 -P 488 22 4.8867158637845319e-02 9.2115856024567719e-02 -3.5325296707559606e-01 3.6832185500209919e-01 0 1 0 0 0 0 -V -170 0 0 0 0 0 0 1 0 -P 489 130 2.9288036009376067e-01 1.2928728715900386e+00 -1.1628140700302700e+01 1.1714035630061840e+01 4.9767000000000000e-01 1 0 0 0 0 -V -171 0 -6.0930955149452699e-06 2.9697104970938514e-05 -2.4111678378370367e-04 2.4303743351679105e-04 0 2 0 -P 490 22 -9.4973743741273875e-02 6.4498168710204640e-01 -4.7230425563942617e+00 4.7678247008681511e+00 0 1 0 0 0 0 -P 491 22 -1.5474800128245778e-01 5.7213576285513090e-01 -5.1589794557811262e+00 5.1929139507804729e+00 0 1 0 0 0 0 -V -172 0 -1.1660551399751801e-05 1.9256296796349287e-05 -6.7620205483465163e-06 2.3802198800847105e-05 0 2 0 -P 492 22 -3.7027549960274636e-01 6.2212464289035718e-01 -2.5897423070960202e-01 7.6890224935888085e-01 0 1 0 0 0 0 -P 493 22 -4.9683819629574119e-02 7.1398417580221585e-02 1.5437415960085871e-02 8.8343249756098599e-02 0 1 0 0 0 0 -V -173 0 3.5746214235745734e-05 -9.2255200399066187e-06 -1.3563013280753561e-05 4.1145824932297914e-05 0 2 0 -P 494 22 3.2749523814777576e-01 -4.6886764491434571e-02 -7.1889393460914761e-02 3.3855514260770275e-01 0 1 0 0 0 0 -P 495 22 7.1660498494050137e-02 -5.6128878595896443e-02 -7.9560338291332564e-02 1.2089468758336715e-01 0 1 0 0 0 0 -V -174 0 1.1296287249582715e-05 5.8978061805748885e-06 4.9262804651243690e-05 5.0924397210535035e-05 0 2 0 -P 496 22 4.4736495198225906e-01 2.4974300382315295e-01 1.7169319940927230e+00 1.7917484311587706e+00 0 1 0 0 0 0 -P 497 22 3.0750215958027394e-01 1.4437409126494161e-01 1.5750231618747674e+00 1.6112415761818897e+00 0 1 0 0 0 0 -V -175 0 1.3475981409980000e-04 -4.1605118725126302e-04 6.3692988934369579e-03 6.3846592284279354e-03 0 2 0 -P 498 22 1.2364083130382091e-01 -2.9386391435205311e-01 5.5204694179527154e+00 5.5296677702982304e+00 0 1 0 0 0 0 -P 499 22 1.4321552040215901e-01 -5.3001598407664563e-01 7.0922510505452010e+00 7.1134697997967420e+00 0 1 0 0 0 0 -V -176 0 4.7324747145545989e-05 1.9479376242148272e-06 2.3089887975729631e-04 2.3950742171524708e-04 0 2 0 -P 500 22 1.4135983992053097e-01 -4.0296581708771914e-02 6.3148368395046228e-01 6.4836568534694761e-01 0 1 0 0 0 0 -P 501 22 8.9503713642537751e-03 4.6483512089294167e-02 1.0188440558207200e-01 1.1234437299894350e-01 0 1 0 0 0 0 -V -177 0 -9.0223456025112655e-07 -6.7037449449237448e-06 6.4286516403409821e-05 6.4689761422605756e-05 0 2 0 -P 502 22 2.4050370315804339e-02 -2.6635670283075513e-01 2.2348889868834592e+00 2.2508338670697521e+00 0 1 0 0 0 0 -P 503 22 -7.2745052887069936e-02 -9.5452461341506492e-02 1.2347314951840711e+00 1.2405502328786151e+00 0 1 0 0 0 0 -V -178 0 -1.1141606101247371e-05 3.3900741233981917e-06 2.7231501048168288e-05 3.0249992775056765e-05 0 2 0 -P 504 22 -1.5484032034025672e-01 3.3070965672253198e-02 2.0512268590893062e-01 2.5912261547009452e-01 0 1 0 0 0 0 -P 505 22 -8.9511477232786629e-02 4.1278342536144701e-02 3.9210415654668013e-01 4.0430418709198446e-01 0 1 0 0 0 0 -V -179 0 -5.7452969269882372e-05 1.0655611802714043e-04 2.3621002466825029e-04 2.6627862107816958e-04 0 2 0 -P 506 22 -1.5904748085006137e-01 4.2641811118253042e-01 9.2542971764623405e-01 1.0312849601405114e+00 0 1 0 0 0 0 -P 507 22 -2.0488139654333862e-01 2.4854871656929914e-01 5.7081408313582516e-01 6.5542472387299155e-01 0 1 0 0 0 0 -V -180 0 1.2541142567955775e-05 2.1336951076054253e-05 6.7047166629993952e-05 7.7186942912155069e-05 0 2 0 -P 508 22 -3.7656617144148925e-02 1.4185309883022947e-02 3.3350767109029379e-02 5.2263921570995034e-02 0 1 0 0 0 0 -P 509 22 9.5720803038463378e-02 8.4602554698270271e-02 2.7707064192895242e-01 3.0510359718417601e-01 0 1 0 0 0 0 -V -181 0 1.2584156716671960e-05 2.9848520962308407e-05 2.8661370545072881e-02 2.8661440450187415e-02 0 2 0 -P 510 22 -4.0194037712829624e-02 4.7510012834891861e-02 1.6029784814713764e+01 1.6029905613197329e+01 0 1 0 0 0 0 -P 511 22 7.1426379875077009e-02 2.6570375761728566e-02 5.5104241235417319e+01 5.5104293932902152e+01 0 1 0 0 0 0 -V -182 0 0 0 0 0 0 1 0 -P 512 130 1.8498251272975502e-01 2.1534491855260202e-01 5.4113827121414495e+01 5.4116860155770283e+01 4.9767000000000000e-01 1 0 0 0 0 -V -183 0 -2.2239658429523491e-05 7.9787361538852465e-06 2.4815441155492533e-03 2.4817083833750635e-03 0 2 0 -P 513 22 -2.6447337141224440e-02 -3.9309724692202258e-02 3.8222339420741900e+00 3.8225275700825549e+00 0 1 0 0 0 0 -P 514 22 -1.6079201520980721e-01 1.0648402032122213e-01 1.7070295252939683e+01 1.7071384622849845e+01 0 1 0 0 0 0 -V -184 0 3.4803808964272598e-06 -2.1082232229174461e-05 5.3342632466181025e-08 2.3123268650157156e-05 0 2 0 -P 515 22 7.1813325473446363e-02 -2.2554379405664721e-01 5.2069084583338858e-02 2.4235995197715629e-01 0 1 0 0 0 0 -P 516 22 -1.8658185022900918e-02 -9.6440795705683577e-02 -5.1254393546604243e-02 1.1079696657636637e-01 0 1 0 0 0 0 -V -185 0 -5.3747799410516562e-05 -4.4440032307684720e-05 -1.5986731409189337e-04 1.7630768596296016e-04 0 2 0 -P 517 22 -1.9710479787187180e-01 -2.3282431232600628e-01 -6.5389094601821218e-01 7.2154752514216858e-01 0 1 0 0 0 0 -P 518 22 -8.4630153565993557e-02 -1.2123114591746497e-04 -1.8410075719873392e-01 2.0262123874545424e-01 0 1 0 0 0 0 -V -186 0 7.6865554396668605e-05 4.3142338883686831e-04 -6.8937030148838192e-03 6.9079097940412853e-03 0 2 0 -P 519 22 9.1906525835010915e-04 -1.4789438215505925e-03 -2.5924226335474737e-01 2.5924811101542949e-01 0 1 0 0 0 0 -P 520 22 1.6227427277457440e-01 9.1743438683356748e-01 -1.4376785736923154e+01 1.4406942316784155e+01 0 1 0 0 0 0 -V -187 0 9.6604711234698149e-06 -4.7395522046942198e-08 -7.1709104054133583e-05 7.2905658342372988e-05 0 2 0 -P 521 22 8.5947444322755293e-02 -6.6719307979624706e-02 -6.4429326409960863e-01 6.5341582427043943e-01 0 1 0 0 0 0 -P 522 22 6.0103580822178510e-02 6.6002762741430479e-02 -4.3983483125659523e-01 4.4880227707049974e-01 0 1 0 0 0 0 -V -188 0 -4.4469111055583206e-06 1.3188593151499278e-05 -3.2261949631913662e-04 3.2302176841489226e-04 0 2 0 -P 523 22 -3.1712032262728999e-02 -2.0883585220431546e-03 -3.0080324114774448e-01 3.0247744397977422e-01 0 1 0 0 0 0 -P 524 22 -4.2167611336134614e-02 2.2119967837399371e-01 -5.0591000356033122e+00 5.0641090603777545e+00 0 1 0 0 0 0 -V -189 0 -4.3236035757693638e-05 5.8582752132276060e-05 -5.7308757738288424e-04 5.7847833554835050e-04 0 2 0 -P 525 22 -1.9920557528452923e-01 2.2951795799458932e-01 -1.9774628498852040e+00 2.0006800536174132e+00 0 1 0 0 0 0 -P 526 22 5.3730450744935102e-03 3.3115812041689355e-02 -5.9176009596032075e-01 5.9271033211132973e-01 0 1 0 0 0 0 -V -190 0 -4.6563360052264990e-06 -2.1757073182779297e-05 1.1881217619907731e-06 2.6347063784305840e-05 0 2 0 -P 527 22 2.6481780274558765e-02 3.2840805847918842e-03 -9.1585090480877599e-03 2.8212553230456044e-02 0 1 0 0 0 0 -P 528 22 -7.1181574739910172e-02 -2.1214716485238358e-01 2.0564214843628897e-02 2.2471342431971594e-01 0 1 0 0 0 0 -V -191 0 -6.7958182803273389e-06 -2.2789598315534417e-05 3.3178587244766811e-05 6.9711989667256509e-05 0 2 0 -P 529 22 4.4007402269560576e-02 1.9050423208921346e-02 4.4254119127109588e-02 6.5253330479526792e-02 0 1 0 0 0 0 -P 530 22 -6.0239884439087552e-02 -7.3485626307050064e-02 3.4996208595725116e-02 1.0126063187166835e-01 0 1 0 0 0 0 -V -192 0 -9.2399879437066819e+00 -3.0387131447697538e+01 -7.5942819906423047e+00 5.6183581317030246e+01 0 2 0 -P 531 -211 7.2339661850637116e-02 -3.2521430738104773e-01 2.9845760368060501e-02 3.6244713644053916e-01 1.3957000000000000e-01 1 0 0 0 0 -P 532 211 -1.7292216029916171e-01 -5.5668170439967064e-03 -1.1251381807496415e-01 2.4914294517873958e-01 1.3957000000000000e-01 1 0 0 0 0 -V -193 0 -3.3735231507927859e-06 -2.4310362020575016e-05 1.7226629499045319e-05 3.2395411854205048e-05 0 2 0 -P 534 22 4.6605103750219246e-03 -4.7604324203406684e-02 -1.8116794935990260e-02 5.1147925652673905e-02 0 1 0 0 0 0 -P 533 22 -4.1799321747595368e-02 -2.2002625342251989e-01 2.0776320166063492e-01 3.0549023463604780e-01 0 1 0 0 0 0 -V -194 0 -1.7223995802044271e-06 -9.9525183324882429e-07 7.9935797423441558e-06 9.2576333951367783e-06 0 2 0 -P 535 22 1.0874576406073361e-03 -1.8699332423074717e-02 2.3331489504831751e-01 2.3406556314117663e-01 0 1 0 0 0 0 -P 536 22 -5.6116641951763281e-02 -1.3098107147460443e-02 2.2073098540934744e-02 6.1707856825420224e-02 0 1 0 0 0 0 -V -195 0 -1.0561297718282755e-04 1.7322491781130437e-04 5.9462272496750264e-04 6.2882871984594924e-04 0 2 0 -P 537 22 -2.1748912590842331e-01 4.0316638854421255e-01 1.5358537367294918e+00 1.6027137477934530e+00 0 1 0 0 0 0 -P 538 22 -3.2584382015507379e-01 4.8800065774682477e-01 1.5232221985470455e+00 1.6323371904239272e+00 0 1 0 0 0 0 -V -196 0 0 0 0 0 0 1 0 -P 539 310 5.7209538578317543e-01 -9.1601292232158002e-02 -1.3829998035577337e-01 7.7619987157909842e-01 4.9767000000000000e-01 2 0 0 -216 0 -V -197 0 2.4019926994931783e-07 -6.0416454152739986e-07 4.2226818955174602e-07 8.2968315987892530e-07 0 2 0 -P 540 22 6.6848277001447187e-02 -6.0958209970164400e-02 5.6178057143901434e-03 9.0643009889750908e-02 0 1 0 0 0 0 -P 541 22 4.2850452954082546e-02 -2.1496304034714489e-01 1.8723159014023277e-01 2.8827233370564426e-01 0 1 0 0 0 0 -V -198 0 6.5287521213597090e-06 -1.6117799071818023e-06 -3.0820813596859984e-06 7.4907746327396357e-06 0 2 0 -P 542 22 2.3363370799508734e-01 -5.5730263288117409e-03 -1.4570219730322215e-01 2.7539952511393773e-01 0 1 0 0 0 0 -P 543 22 5.1382275035746849e-01 -1.7895462591953512e-01 -2.0715568038038368e-01 5.8219588871510730e-01 0 1 0 0 0 0 -V -199 0 0 0 0 0 0 3 0 -P 544 211 7.2039523215605261e-01 -3.6736437975442332e-01 -2.9003951596164219e+00 3.0142491179150896e+00 1.3957000000000000e-01 1 0 0 0 0 -P 545 -211 2.0811046164856656e-01 -9.7076490529901388e-02 -9.3664893491201751e-01 9.7443564253007409e-01 1.3957000000000000e-01 1 0 0 0 0 -P 546 111 7.6439448341283889e-01 -1.6319820437628141e-01 -2.4284510447741372e+00 2.5547067654523916e+00 1.3497999999999999e-01 2 0 0 -217 0 -V -200 0 -1.6432909207964205e-05 -7.9824489275475590e-05 -1.0522786643367612e-04 1.3838811709899012e-04 0 2 0 -P 547 22 2.0913225215301631e-02 3.6758058149488726e-03 -2.1306516927539914e-02 3.0080595088506565e-02 0 1 0 0 0 0 -P 548 22 -7.9439325183585624e-02 -2.8797215164941031e-01 -3.5346441087396047e-01 4.6279115837026358e-01 0 1 0 0 0 0 -V -201 0 1.6164268726202693e-07 -2.2039284754121565e-07 5.0397629773053878e-06 5.1427813216031760e-06 0 2 0 -P 549 22 -5.6717912031914300e-02 -1.7745651231293166e-02 2.5677103342421997e-01 2.6355870937729325e-01 0 1 0 0 0 0 -P 550 22 7.8822474490421540e-02 -1.2392968377188934e-02 4.3241421457486973e-01 4.3971424938975157e-01 0 1 0 0 0 0 -V -202 0 -3.8148426826111342e-05 6.7214870004697462e-04 5.3066136439277271e-03 5.3498371418724423e-03 0 2 0 -P 551 22 -7.0179649086229604e-02 3.3943873319233780e-01 3.0226410969029458e+00 3.0424501700806421e+00 0 1 0 0 0 0 -P 552 22 1.0198438854068275e-02 7.1738839806950361e-01 5.3210085651958536e+00 5.3691602949369495e+00 0 1 0 0 0 0 -V -203 0 0 0 0 0 0 1 0 -P 553 130 -7.8781697561949271e-01 5.4422089375246685e-01 9.1458600181790075e+00 9.2093030609974118e+00 4.9767000000000000e-01 1 0 0 0 0 -V -204 0 0 0 0 0 0 1 0 -P 554 310 -7.2639469362242060e-01 3.6391099384214726e-01 1.1382133321844409e+01 1.1421940064958441e+01 4.9767000000000000e-01 2 0 0 -218 0 -V -205 0 1.1779236187810234e-05 8.8136515821122369e-06 4.6043112317678921e-04 4.6087946946870634e-04 0 2 0 -P 555 22 7.9864146623307694e-02 1.2156376086533430e-01 3.1649610887278126e+00 3.1683015517833417e+00 0 1 0 0 0 0 -P 556 22 3.3520899152715923e-02 -3.6724958742843213e-02 1.2670753477375407e+00 1.2680505944633595e+00 0 1 0 0 0 0 -V -206 0 3.9918137703655458e-05 -1.6314529835601096e-05 -4.1782943538884980e-04 4.2011896019205453e-04 0 2 0 -P 557 22 4.8444453326069842e-01 -1.7062202826696454e-01 -4.3743293539038568e+00 4.4043791479345922e+00 0 1 0 0 0 0 -P 558 22 2.1773520565967508e-01 -1.1635860158145582e-01 -2.9754965831844515e+00 2.9857206601569413e+00 0 1 0 0 0 0 -V -207 0 -9.8382711082984495e-05 1.0381505708631199e-04 -4.2367310508488541e-04 4.5612164498563096e-04 0 2 0 -P 559 22 -1.1820584450122643e-02 -1.6060206837071978e-02 -1.1815502929093931e-02 2.3178925123038745e-02 0 1 0 0 0 0 -P 560 22 -1.3581064020573216e-01 1.7184310656263610e-01 -6.2394029876529555e-01 6.6126853825772958e-01 0 1 0 0 0 0 -V -208 0 -4.3921776029805596e-05 2.9788443136967845e-05 -7.7343397718084210e-05 9.4323521818948618e-05 0 2 0 -P 561 22 -3.7219271349381805e-01 3.1341750210245684e-01 -6.3166726390592265e-01 7.9734652372254633e-01 0 1 0 0 0 0 -P 562 22 -2.2530657193845258e-01 9.1815962874002371e-02 -4.2049020891801436e-01 4.8580370335460860e-01 0 1 0 0 0 0 -V -209 0 -4.5476606945718249e-05 2.0103734705655713e-05 -9.3567140646843043e-05 1.0724373122600039e-04 0 2 0 -P 563 22 -2.9119152917936542e-01 1.1654730397796420e-01 -6.8492021847390561e-01 7.5332030797310356e-01 0 1 0 0 0 0 -P 564 22 -7.9559396942135666e-02 4.7349669899603999e-02 -7.7891837640231998e-02 1.2099102137088527e-01 0 1 0 0 0 0 -V -210 0 -3.1513825920006135e-05 4.0214012888618100e-06 -1.2104636768091706e-04 1.2582968009452371e-04 0 2 0 -P 565 22 -2.0821687003115755e-01 -3.5550488162903690e-03 -9.7529066000740405e-01 9.9727567644826054e-01 0 1 0 0 0 0 -P 566 22 -1.1651249793019035e-01 4.4992959343746600e-02 -2.7201300190967870e-01 2.9931689189278221e-01 0 1 0 0 0 0 -V -211 0 -7.6322960167519920e-05 3.8032859468481829e-06 -2.2295713646956259e-04 2.3642455954656021e-04 0 2 0 -P 567 22 -2.3596479193032335e-01 7.8693352480712103e-02 -7.1353458927233204e-01 7.5564782593706314e-01 0 1 0 0 0 0 -P 568 22 -3.1705682481445735e-01 -5.1135467688872380e-02 -9.0197030996840699e-01 9.5743945306305900e-01 0 1 0 0 0 0 -V -212 0 -1.8139484355414673e-04 3.2758568898555692e-05 2.7163050319436966e-04 3.3068177270168745e-04 0 2 0 -P 569 22 -2.5438740051631026e-01 4.5020203517792519e-02 5.0087060048465426e-01 5.6356998384946588e-01 0 1 0 0 0 0 -P 570 22 -3.5963372460583565e-01 6.5867476299182534e-02 4.1859802343527158e-01 5.5578705052547384e-01 0 1 0 0 0 0 -V -213 0 2.4428922970138252e-05 -7.3016606499326774e-05 1.6175690327614769e-04 1.8083120743594527e-04 0 2 0 -P 571 22 2.9367307545180181e-02 -1.9052347198993341e-01 5.3467463287475814e-01 5.6836484336323057e-01 0 1 0 0 0 0 -P 572 22 1.0453326376355529e-01 -2.0969741933778815e-01 3.5195232928334702e-01 4.2281278717413778e-01 0 1 0 0 0 0 -V -214 0 4.9579155221870880e-01 -1.1511948969643888e-01 -3.1822129333071317e+01 3.1829599665719567e+01 0 2 0 -P 573 211 3.7577127580332814e-01 -7.2432832855482146e-02 -2.9616994036592914e+01 2.9619795173422023e+01 1.3957000000000000e-01 1 0 0 0 0 -P 574 -211 1.5459267829018677e-01 -5.0714137832912419e-02 -4.4241473770426190e+00 4.4293374920692319e+00 1.3957000000000000e-01 1 0 0 0 0 -V -215 0 -4.7708493299121385e-01 -7.4349925969399086e-02 -2.4816142086001607e+00 2.6518666425556883e+00 0 2 0 -P 575 211 -1.8710039471863932e-01 -7.5516186697918888e-02 -1.3934778944835580e+00 1.4149097778556750e+00 1.3957000000000000e-01 1 0 0 0 0 -P 576 -211 -1.0949136603911050e-01 2.9294698802222685e-02 -1.4927954083399445e-01 2.3368933400271319e-01 1.3957000000000000e-01 1 0 0 0 0 -V -216 0 1.0046434401596073e+01 -1.6085890506737788e+00 -2.4286538834502935e+00 1.3630665945105468e+01 0 2 0 -P 577 211 4.2277088197502372e-01 1.2823578574380656e-01 -9.4354533417582487e-02 4.7282364393896442e-01 1.3957000000000000e-01 1 0 0 0 0 -P 578 -211 1.4932450380815165e-01 -2.1983707797596455e-01 -4.3945446938190864e-02 3.0337622764013394e-01 1.3957000000000000e-01 1 0 0 0 0 -V -217 0 2.4449966258954613e-05 -5.2200672258999185e-06 -7.7676575897242336e-05 8.1714998697994160e-05 0 2 0 -P 579 22 7.4264847022229474e-01 -1.4651608537616675e-01 -2.3931683946888840e+00 2.5100296171430410e+00 0 1 0 0 0 0 -P 580 22 2.1746013190544179e-02 -1.6682119000114660e-02 -3.5282650085253067e-02 4.4677148309350663e-02 0 1 0 0 0 0 -V -218 0 -3.3167578833116316e+01 1.6616374930143870e+01 5.1971443012433133e+02 5.2153202777739250e+02 0 2 0 -P 581 211 -4.1414101287442306e-01 3.9477834598429262e-01 8.2622830335795356e+00 8.2832459478684441e+00 1.3957000000000000e-01 1 0 0 0 0 -P 582 -211 -3.1225368074799753e-01 -3.0867352142145359e-02 3.1198502882648715e+00 3.1386941170899947e+00 1.3957000000000000e-01 1 0 0 0 0 -BlockType GenEvent -E 6 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 168 0 0 -V -1 0 0 0 0 0 1 2 0 -P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -1 0 -P 3 2 5.1553292069003653e-01 3.8485835711180655e-01 1.7290951843317296e+03 1.7290953040157517e+03 0 3 0 0 -3 0 -P 34 2101 -5.1553292069003653e-01 -3.8485835711180655e-01 4.2219673894488587e+03 4.2219674782123802e+03 5.7933000000000001e-01 2 0 0 -13 0 -V -2 0 0 0 0 0 1 3 0 -P 2 2212 0 0 -6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -2 0 -P 4 21 -4.9797130516589477e-01 1.0933883123411841e+00 -1.3097958796984543e+02 1.3098509815308313e+02 0 3 0 0 -4 0 -P 19 2103 2.9142878896144259e-01 -6.5062234924971918e-01 -6.7718730985476304e+03 6.7718731800014712e+03 7.7132999999999996e-01 2 0 0 -9 0 -P 47 2 2.0654251620445219e-01 -4.4276596309146488e-01 -5.7621689243983575e+01 5.7624705403492385e+01 3.3000000000000002e-01 2 0 0 -13 0 -V -3 0 0 0 0 0 0 4 0 -P 5 2 -3.1543729466487069e+00 -4.6848142715162355e+00 8.5430129997171412e+02 8.5431996856377293e+02 0 3 0 0 -5 0 -P 35 21 -5.5465777356364798e-01 9.8068482118457034e-01 7.0650666253777854e+02 7.0650756089247534e+02 0 2 0 0 -13 0 -P 36 21 3.9295485495835827e+00 2.0268615205012281e+00 5.6968906941557279e+01 5.7140229939532411e+01 0 2 0 0 -13 0 -P 37 21 7.2056915500682295e-01 2.7350626169661183e+00 3.1393811690569535e+01 3.1520964450486176e+01 0 2 0 0 -13 0 -V -4 0 0 0 0 0 0 14 0 -P 6 -1 2.6542267443335232e+00 4.7733493416006816e+00 -9.5183018160378474e-01 5.5439845095298299e+00 0 3 0 0 -5 0 -P 11 1 1.0452289512758353e+00 1.6158783855979435e+00 -6.1449917248529795e+00 6.4477430017130333e+00 3.3000000000000002e-01 2 0 0 -9 0 -P 12 21 2.0507170473914881e-02 -8.9170706750033535e-01 6.3770653890766849e-01 1.0964632543028934e+00 0 2 0 0 -9 0 -P 13 21 2.4396972905842967e-01 -1.4625120878663037e-01 1.0957508431732279e+00 1.1320691476598213e+00 0 2 0 0 -9 0 -P 14 21 2.2404339997558728e-01 3.9772174914434660e-02 2.5679435268111024e+00 2.5780052808055083e+00 0 2 0 0 -9 0 -P 15 21 2.2907916028215539e-01 5.6145433093357851e-02 2.9566325145909338e+00 2.9660251849350718e+00 0 2 0 0 -9 0 -P 16 21 -6.4153613197677273e-01 -7.0041909254235180e-01 1.0594798881277963e+00 1.4229030701972845e+00 0 2 0 0 -9 0 -P 17 21 -6.0129688723679253e-01 1.0936253434099126e+00 -4.3678739538393438e+00 4.5426751166000470e+00 0 2 0 0 -9 0 -P 18 21 -3.0305601865621408e+00 -1.6350966724517046e+00 -5.7074862415394945e+00 6.6658259330709209e+00 0 2 0 0 -9 0 -P 44 21 4.9246236874230154e-01 -5.4861752836502131e-01 4.3982393709953467e+00 4.4595975089272537e+00 0 2 0 0 -13 0 -P 45 21 4.3766303360700642e-01 2.8042708174598313e-01 -4.3159676870355774e+00 4.3471560076327940e+00 0 2 0 0 -13 0 -P 46 21 -1.4413565938367516e+00 2.1405263273210222e+00 -1.0566874068613508e+02 1.0570024654645897e+02 0 2 0 0 -13 0 -P 42 21 -6.7308225475211777e-03 8.7119620191138739e-02 7.4004359099556938e-02 1.1450666950073547e-01 0 2 0 0 -13 0 -P 43 21 -5.4922530444249185e-01 -5.7443001559112279e+00 6.3312048654001273e+01 6.3574477091698256e+01 0 2 0 0 -13 0 -V -5 0 0 0 0 0 0 2 0 -P 7 22 1.3362652386696274e+01 -5.2304954478332810e+00 3.2435236228283662e+02 3.2466963744688843e+02 0 3 0 0 -6 0 -P 8 24 -1.3862798589011460e+01 5.3190305179177280e+00 5.2899710750727365e+02 5.3519431562641421e+02 7.9840756868868453e+01 3 0 0 -7 0 -V -6 0 0 0 0 0 0 1 0 -P 9 22 1.3362652386696274e+01 -5.2304954478332810e+00 3.2435236228283662e+02 3.2466963744688843e+02 0 1 0 0 0 0 -V -7 0 0 0 0 0 0 1 0 -P 10 24 -1.3862798589011460e+01 5.3190305179177280e+00 5.2899710750727365e+02 5.3519431562641421e+02 7.9840756868868453e+01 2 0 0 -8 0 -V -8 0 0 0 0 0 0 14 0 -P 20 -3 7.5856117110311561e-01 2.0869673719529196e+01 5.4238786725784678e+01 5.8122411182736293e+01 5.0000000000000000e-01 2 0 0 -11 0 -P 21 21 8.7653865698945155e-01 1.9452440200741499e+00 3.7291978086873669e+00 4.2964183468500563e+00 0 2 0 0 -11 0 -P 22 21 -2.0857452765265194e-01 -7.8097599171663326e-02 5.4489705676514189e-01 5.8865556232250016e-01 0 2 0 0 -11 0 -P 23 21 4.3330618320281716e-01 -2.4374988476555451e-01 8.2552704145238334e+00 8.2702271958899356e+00 0 2 0 0 -11 0 -P 24 21 2.6578215572600017e-01 -6.1069772931963884e-01 4.5356490599717514e+00 4.5842888506420660e+00 0 2 0 0 -11 0 -P 25 21 1.6304916049466662e+00 -3.6620941265445184e-01 9.3379838052457362e+00 9.4863351066020183e+00 0 2 0 0 -11 0 -P 26 21 2.6494131576136009e+00 -1.8737085154722346e+00 9.4375769353402248e+00 9.9798813665872306e+00 0 2 0 0 -11 0 -P 27 21 4.8537372653729438e-01 -5.1150354578642432e-01 3.0414025015288576e+01 3.0422198164537093e+01 0 2 0 0 -11 0 -P 28 21 -5.8689790026581257e-01 -6.6235167154779151e-01 4.0123127325052408e+01 4.0132885583078945e+01 0 2 0 0 -11 0 -P 29 21 4.1758121948632577e-02 4.2034989308576348e-01 1.8538918442599272e+01 1.8543730336550770e+01 0 2 0 0 -11 0 -P 30 21 -2.5101750377319743e+00 -1.9382973720472618e+00 6.5945986831567893e+01 6.6022201982453325e+01 0 2 0 0 -11 0 -P 31 21 8.7123477679498865e-02 -8.9409756075726099e-01 2.1265649086936058e+01 2.1284614913998784e+01 0 2 0 0 -11 0 -P 32 21 -1.4970574855498966e+00 -4.0178069904057806e-01 2.0564942822669387e+01 2.0623275252607758e+01 0 2 0 0 -11 0 -P 33 4 -1.6288441893558204e+01 -1.0335743124208518e+01 2.4206509617684176e+02 2.4283719178155783e+02 1.5000000000000000e+00 2 0 0 -11 0 -V -9 0 0 0 0 0 0 1 0 -P 54 92 -2.2191360057483411e+00 -1.2186750535150928e+00 -6.7797759371562515e+03 6.7987248899907554e+03 5.0723955090606091e+02 2 0 0 -10 0 -V -10 0 0 0 0 0 0 28 0 -P 55 223 4.3914986813415746e-01 3.6830815462664462e-01 -2.8127082215870023e+00 2.9747272598040237e+00 7.8049421970396760e-01 2 0 0 -19 0 -P 56 2214 9.3832780090047519e-03 9.1663704029871862e-01 -1.5328564926592643e+00 2.1740194902635626e+00 1.2395161182511469e+00 2 0 0 -20 0 -P 57 -2214 1.8785147040946842e-01 2.0187292697287215e-01 -1.2056659478163527e+00 1.7030569421445392e+00 1.1707825233078986e+00 2 0 0 -21 0 -P 58 -211 4.3147175131205556e-02 -2.3557373365294690e-02 2.1335388761743965e-01 2.5964648047518357e-01 1.3957000000000000e-01 1 0 0 0 0 -P 59 213 5.4943604442193794e-01 -4.4949867669686494e-01 1.8435024615148028e+00 2.2056789519361231e+00 9.8111634689298655e-01 2 0 0 -22 0 -P 68 -213 -5.2211437200382105e-01 7.9286955835134260e-02 -8.5790184370084488e-01 1.2011011581202928e+00 6.5403255254922366e-01 2 0 0 -29 0 -P 69 223 -9.5592288677932846e-01 -1.7918868574715585e-01 -3.0639090063121457e+00 3.3077794403724048e+00 7.7972384638497683e-01 2 0 0 -30 0 -P 70 211 7.0967562238259174e-02 3.8996758193883674e-01 -2.7910900605680138e+00 2.8225475409556564e+00 1.3957000000000000e-01 1 0 0 0 0 -P 71 221 -7.9420492103182139e-01 -1.1446092486693100e+00 -5.8237902163823607e+00 6.0130795584011185e+00 5.4744999999999999e-01 2 0 0 -31 0 -P 72 -211 -2.2868738909695571e-01 5.3871835020221159e-01 -8.0709761702752125e+00 8.0933708372239366e+00 1.3957000000000000e-01 1 0 0 0 0 -P 73 323 -3.7655233898013341e-01 -5.2497601208213923e-02 -9.3341650875051556e+00 9.3805406988977769e+00 8.5050470942461276e-01 2 0 0 -32 0 -P 74 -323 4.7081490132332504e-01 -1.5865648494546025e-02 -3.2261583443112883e+01 3.2277241798891765e+01 8.8806165162095285e-01 2 0 0 -33 0 -P 75 211 -9.1757958893698033e-02 3.2181918311161262e-01 -1.6614336925585420e+01 1.6618292883789543e+01 1.3957000000000000e-01 1 0 0 0 0 -P 76 -211 -5.6452720769387055e-01 -4.8762420703273973e-01 -5.1472406189058162e+01 5.1478000612026534e+01 1.3957000000000000e-01 1 0 0 0 0 -P 77 2212 4.1629393788876684e-01 4.8136660226161482e-01 -2.2629571529474541e+02 2.2629855528880839e+02 9.3827000000000005e-01 1 0 0 0 0 -P 78 -2212 1.6931670804072943e-01 -2.7905712401517913e-01 -3.0378841559864082e+02 3.0379003990182349e+02 9.3827000000000005e-01 1 0 0 0 0 -P 79 113 -3.4822564064186329e-01 -1.3279027021738696e-01 -5.8612314068012904e+02 5.8612361777362742e+02 6.4836483108520382e-01 2 0 0 -34 0 -P 80 223 3.1115346594947385e-01 9.5015147249963641e-02 -1.6070126147938757e+02 1.6070340807922597e+02 7.6425313486313373e-01 2 0 0 -35 0 -P 81 111 -3.0700454395497856e-01 -2.6156960683994035e-01 -8.8893536417835003e+02 8.8893546592367738e+02 1.3497999999999999e-01 2 0 0 -36 0 -P 82 2214 4.7537093601289926e-01 -3.4129421297560109e-01 -4.4813354731965437e+03 4.4813356767779196e+03 1.2174455488125147e+00 2 0 0 -37 0 -P 60 313 -7.8106864351388319e-02 -2.9683058321885142e-01 1.5358913398195986e+00 1.7943222638789789e+00 8.7545479696332307e-01 2 0 0 -23 0 -P 61 -313 -2.8127679350961809e-01 -4.0985048763141485e-01 1.3613208314607497e+00 1.6998147557129637e+00 8.8830273037505358e-01 2 0 0 -24 0 -P 62 111 5.2287976246185208e-01 3.1551855841571058e-01 1.6575473956800690e+00 1.7716202121286238e+00 1.3497999999999999e-01 2 0 0 -25 0 -P 63 223 4.2062353527572627e-01 -5.3534021227090882e-02 -5.1902760003831150e-01 1.0278601073623364e+00 7.7930526807457901e-01 2 0 0 -26 0 -P 64 313 -1.0164883296342317e+00 3.0317113360459302e-01 -4.7102726088297031e-01 1.4817262414936587e+00 9.2113229978235245e-01 2 0 0 -27 0 -P 65 -311 -5.9377456944595330e-01 4.5203893895285015e-02 -9.6189558945220821e-01 1.2359329210161991e+00 4.9767000000000000e-01 2 0 0 -28 0 -P 66 -211 -1.4391794255819610e-02 -7.1461790982322015e-01 -2.6658286748581150e-01 7.7552052901194535e-01 1.3957000000000000e-01 1 0 0 0 0 -P 67 211 -1.3248904077166496e-01 -4.3317492476548036e-01 -1.1482597221245971e+00 1.2422455617645944e+00 1.3957000000000000e-01 1 0 0 0 0 -V -11 0 0 0 0 0 0 1 0 -P 83 92 -1.3862798589011463e+01 5.3190305179177262e+00 5.2899710750727411e+02 5.3519431562641466e+02 7.9840756868868667e+01 2 0 0 -12 0 -V -12 0 0 0 0 0 0 21 0 -P 84 311 2.5888648514865614e-01 6.8942858996681888e+00 1.8438621810969973e+01 1.9693365634025938e+01 4.9767000000000000e-01 2 0 0 -38 0 -P 85 -2214 5.9843068834265156e-01 7.0360055489560640e+00 1.7358883624012101e+01 1.8783497498949131e+01 1.2749291146342472e+00 2 0 0 -39 0 -P 86 2212 3.4886119643935054e-01 4.9862993156252911e+00 1.2320349332712045e+01 1.3328775010192965e+01 9.3827000000000005e-01 1 0 0 0 0 -P 87 213 -1.7633909923617705e-01 5.5008275946494822e-01 3.1366704522030666e+00 3.2788845202711485e+00 7.6072048176052942e-01 2 0 0 -40 0 -P 88 -213 9.3596281426276295e-01 3.1300597444033751e+00 1.2279947128812188e+01 1.2716588374863234e+01 4.9113950774381010e-01 2 0 0 -41 0 -P 89 223 2.1870910397305326e-01 -5.2382770779191845e-01 2.3985226478001938e+00 2.5828193483021984e+00 7.7189102491382144e-01 2 0 0 -42 0 -P 90 213 6.1204214328732109e-01 -1.6796573188674388e-01 4.5599062798313206e+00 4.6552912175547361e+00 6.9006011850357374e-01 2 0 0 -43 0 -P 91 221 5.4269273511143312e-01 7.7987872353382517e-02 1.0780774373457542e+00 1.3276106267994858e+00 5.4744999999999999e-01 2 0 0 -44 0 -P 92 -211 8.0098137319982554e-01 -5.7398530539559300e-01 6.2237539585614439e+00 6.3028266208608654e+00 1.3957000000000000e-01 1 0 0 0 0 -P 93 213 5.5057551623275680e-01 -1.0534036535349371e+00 9.4814928549044328e+00 9.5835615561107037e+00 7.3017305195649951e-01 2 0 0 -45 0 -P 94 -321 1.5575020040762801e+00 -8.3099763629883872e-01 8.8844400576506484e+00 9.0715646755244688e+00 4.9359999999999998e-01 1 0 0 0 0 -P 95 313 3.3279971362282484e-01 -1.8260757454558951e-01 7.4157827342161626e+00 7.4614577188472992e+00 7.3172163653847266e-01 2 0 0 -46 0 -P 96 -1114 -5.0615240179884302e-01 -3.3322629949875109e-02 2.3237572673526984e+01 2.3276087644739984e+01 1.2386168239838844e+00 2 0 0 -47 0 -P 97 -211 1.7928451814409808e-02 -8.9954836115038374e-03 3.5726096339188897e+00 3.5753911295660967e+00 1.3957000000000000e-01 1 0 0 0 0 -P 98 3122 -6.5369447377612477e-01 -1.0702310712709195e+00 2.9383501117182917e+01 2.9431404838655745e+01 1.1156800000000000e+00 2 0 0 -48 0 -P 99 321 -2.4057580701681808e-01 -2.6944576020956384e-01 4.7340903611494610e+01 4.7344854772714633e+01 4.9359999999999998e-01 1 0 0 0 0 -P 100 -211 5.7342976079554991e-02 -6.8530273376454165e-01 2.0599804297672083e+01 2.0611752592661787e+01 1.3957000000000000e-01 1 0 0 0 0 -P 101 223 -2.3410430059255853e+00 -1.1503275478832635e+00 4.4285266064355085e+01 4.4369010681721200e+01 7.8777069059294114e-01 2 0 0 -49 0 -P 102 223 -3.1953002833548410e+00 -2.9014902189151588e+00 5.7122129530076670e+01 5.7290619886004976e+01 8.0551566129046692e-01 2 0 0 -50 0 -P 103 111 -9.4229307627474845e-01 -2.6009023256420677e-01 1.3944330755467364e+01 1.3979203946897107e+01 1.3497999999999999e-01 2 0 0 -51 0 -P 104 411 -1.2640115643219200e+01 -7.6436973349308683e+00 1.8593454150456017e+02 1.8652974733115090e+02 1.8693000000000000e+00 2 0 0 -52 0 -V -13 0 0 0 0 0 4 1 0 -P 38 21 -3.6780928056629758e+00 1.8218289456156361e-01 2.3176136987604477e+02 2.3179062561742003e+02 0 2 0 0 -13 0 -P 39 21 1.9326626594872165e+00 3.0361539888006712e+00 4.1524606600260074e+02 4.1526166298688753e+02 0 2 0 0 -13 0 -P 40 21 3.6780928056629758e+00 -1.8218289456156361e-01 5.0306149033881333e+01 5.0440759192474694e+01 0 2 0 0 -13 0 -P 41 21 -3.1335321392207005e-01 3.6624933692512527e+00 2.9580619506280872e+01 2.9808138121859425e+01 0 2 0 0 -13 0 -P 105 92 4.3385916536288640e+00 7.8287873414824647e+00 5.6439088698045143e+03 5.9802581086412247e+03 1.9772960329759103e+03 2 0 0 -14 0 -V -14 0 0 0 0 0 0 44 0 -P 106 2212 -3.4160521964083146e-01 -4.2707439382586243e-01 3.8512250996931152e+03 3.8512252528180561e+03 9.3827000000000005e-01 1 0 0 0 0 -P 107 223 -2.5910643630590879e-01 2.6822308539292211e-01 3.3980500829705886e+02 3.3980610932012291e+02 7.8050480217877360e-01 2 0 0 -53 0 -P 108 -213 -8.4375493495365134e-02 9.5940084333554179e-02 4.2717554323319206e+02 4.2717675743312810e+02 1.0104606796748297e+00 2 0 0 -54 0 -P 109 113 -3.4570270925533353e-01 3.3786281887310854e-01 1.4073143387350351e+02 1.4073480152132342e+02 8.4511390146478793e-01 2 0 0 -55 0 -P 110 213 2.4695902556986107e-01 1.2962129105176443e-01 1.2135495094371257e+02 1.2135708944265656e+02 6.6426576206931942e-01 2 0 0 -56 0 -P 111 -213 7.1828294249699365e-01 2.4088172256065112e-02 1.8213566215684704e+01 1.8242281874573358e+01 7.2824657412961591e-01 2 0 0 -57 0 -P 112 211 3.2873577492781386e-01 9.7272501560572222e-01 3.9426955314388032e+01 3.9440569802087708e+01 1.3957000000000000e-01 1 0 0 0 0 -P 113 111 3.6542984071301632e-02 -1.2598519400611854e-01 1.0816686858157469e+00 1.0979227682619390e+00 1.3497999999999999e-01 2 0 0 -58 0 -P 114 -323 8.6173923366826966e-01 1.1984057445008052e+00 3.0606103245405613e+01 3.0655843761329539e+01 9.3189592515667330e-01 2 0 0 -59 0 -P 115 321 9.6888861415451444e-03 7.5096383158525493e-01 1.2274824797803829e+01 1.2307680745276246e+01 4.9359999999999998e-01 1 0 0 0 0 -P 129 113 -1.8452176626646558e-01 6.0381110882112632e-01 1.3101634256941848e+01 1.3132355266544623e+01 6.3819942549986375e-01 2 0 0 -69 0 -P 130 -3112 1.4055290907999738e+00 4.7729917439304131e-01 2.0435320259645351e+01 2.0524120034603992e+01 1.1974400000000001e+00 2 0 0 -70 0 -P 131 3122 5.3829758889303592e-01 4.0787393536340916e-01 1.1614299998698201e+01 1.1687293603033934e+01 1.1156800000000000e+00 2 0 0 -71 0 -P 132 113 3.0711687734085993e-03 -8.8265073989745946e-01 1.3713684841961960e+01 1.3753831262363400e+01 5.6889426802210974e-01 2 0 0 -72 0 -P 133 221 -7.5480206365605290e-02 1.8124278719185263e-01 5.6912987989439365e+00 5.7209378366508021e+00 5.4744999999999999e-01 2 0 0 -73 0 -P 134 -323 3.4119607349226949e-02 2.9236525030979216e-01 9.4123046873792351e+00 9.4590213924699373e+00 8.9160786669277803e-01 2 0 0 -74 0 -P 135 311 3.1370849344690394e-01 -1.6502140696154801e+00 1.7013060483686480e+01 1.7103026689591879e+01 4.9767000000000000e-01 2 0 0 -75 0 -P 136 111 -4.0944263992706453e-01 4.8640258974619648e-02 1.8573871902464190e+00 1.9073845771304352e+00 1.3497999999999999e-01 2 0 0 -76 0 -P 137 211 4.2521983009641312e-01 1.0095857429967137e-01 1.7231640563937192e+00 1.7831933960676001e+00 1.3957000000000000e-01 1 0 0 0 0 -P 138 331 -6.4813629763747049e-01 -1.8623822616724834e+00 1.5746494503179859e+01 1.5898343095215896e+01 9.5743181773845276e-01 2 0 0 -77 0 -P 139 223 2.6048232688869083e-01 -7.5634998087022398e-01 9.4625709838721264e+00 9.5283224643966609e+00 7.8023267332483393e-01 2 0 0 -78 0 -P 140 -213 1.8439421727607613e-01 -1.4205338969033782e-02 4.9823217426385797e+00 5.0459413515342293e+00 7.7703999699749782e-01 2 0 0 -79 0 -P 141 223 2.2982888723697886e-02 -2.4721922626951739e-01 7.1905766008958572e-01 1.0910344129213754e+00 7.8209117923282823e-01 2 0 0 -80 0 -P 116 113 1.7372162770218658e+00 5.9807209762691627e-01 1.9986477309083451e+01 2.0086000654430649e+01 7.8264706999466116e-01 2 0 0 -60 0 -P 117 111 3.0531402020407761e-01 1.8264305008182584e+00 4.1855045772255252e+01 4.1896206764135989e+01 1.3497999999999999e-01 2 0 0 -61 0 -P 118 -211 -3.5077119331308954e-01 -4.5694813801297091e-01 4.3816705499162680e+01 4.3820714309743344e+01 1.3957000000000000e-01 1 0 0 0 0 -P 119 211 -3.7029195227841366e-01 2.5395295815850005e-01 1.0279729792404048e+01 1.0290477764643340e+01 1.3957000000000000e-01 1 0 0 0 0 -P 120 -323 -7.3509947734007886e-01 2.6814421430056673e-01 6.0116876101422612e+01 6.0128892408855542e+01 9.1248975921951503e-01 2 0 0 -62 0 -P 121 311 -6.9510494917716592e-01 3.2581753110533535e-01 7.2855221980526849e+01 7.2860966046400250e+01 4.9767000000000000e-01 2 0 0 -63 0 -P 122 113 -5.2905073522641244e-01 3.1400871973230815e-01 7.3063252128309969e+01 7.3071887443745908e+01 9.3990790504694877e-01 2 0 0 -64 0 -P 123 211 6.6028226411728730e-01 4.7432898901159826e-01 8.6408369660818963e+01 8.6412306923746485e+01 1.3957000000000000e-01 1 0 0 0 0 -P 124 -323 3.0867648137115933e-01 4.2956262666170625e-01 1.9432116829669465e+02 1.9432395791775645e+02 8.9686532393962448e-01 2 0 0 -65 0 -P 125 323 6.2311833999943100e-01 6.5723937948714817e-01 2.0539373968623146e+01 2.0576811112060657e+01 8.4795781196740605e-01 2 0 0 -66 0 -P 126 -213 8.2345550936719503e-01 5.3491978714712018e-01 3.7603445724436263e+01 3.7621593707277178e+01 6.3321763259171782e-01 2 0 0 -67 0 -P 127 213 9.8022239868273831e-01 8.7532758950826225e-02 3.4555170316705698e+01 3.4579992236556180e+01 8.6462103200085083e-01 2 0 0 -68 0 -P 128 -211 -5.4933402605629666e-01 6.9404217019334813e-01 8.2074041622333471e+00 8.2561749783622673e+00 1.3957000000000000e-01 1 0 0 0 0 -P 142 211 -2.5858770326589875e-01 3.7058982588567041e-01 -1.3267284914603703e+00 1.4085072574477475e+00 1.3957000000000000e-01 1 0 0 0 0 -P 143 113 3.8294560107957676e-01 -4.0649528732935525e-01 -2.2779494568707106e+00 2.5112020323957029e+00 8.9732723542952919e-01 2 0 0 -81 0 -P 144 -213 -1.7928345872764893e-02 -4.4205911706645860e-02 -7.7159032233104536e+00 7.7555350485384382e+00 7.8159180484414870e-01 2 0 0 -82 0 -P 145 -2112 1.2412666094555554e-01 6.0949944184229277e-01 -5.5543953322427688e+00 5.6675388211554232e+00 9.3957000000000002e-01 1 0 0 0 0 -P 146 2212 -6.3965319906624407e-01 -1.8727663295352737e-02 -7.6895933419740139e+00 7.7730112117685382e+00 9.3827000000000005e-01 1 0 0 0 0 -P 147 223 -1.7596507607359885e-02 5.0768816135776895e-01 -3.0916304915378632e+01 3.0930486957261824e+01 7.8680168175708287e-01 2 0 0 -83 0 -P 148 -213 -6.6424238417843881e-02 1.1248577022620441e+00 -6.6508630910885344e+01 6.6523631467643838e+01 8.5196301137017705e-01 2 0 0 -84 0 -P 149 213 -4.1830686176762299e-01 -2.4546245054114987e-01 -4.5077618999398048e+01 4.5083098707959479e+01 5.0874552725374045e-01 2 0 0 -85 0 -V -15 0 0 0 0 0 4 1 0 -P 48 21 1.5946597234291504e+00 -9.2504118596319991e+00 -1.3340867622115992e+01 1.6312320745901555e+01 0 2 0 0 -15 0 -P 49 21 3.1335321392207005e-01 -3.6624933692512527e+00 -1.5996227394120206e+01 1.6413145303715751e+01 0 2 0 0 -15 0 -P 50 21 -1.5946597234291504e+00 9.2504118596319991e+00 3.4553214778277602e-01 9.3932130643086573e+00 0 2 0 0 -15 0 -P 51 21 -1.9326626594872165e+00 -3.0361539888006712e+00 -2.2403930493388815e+00 4.2394312135724528e+00 0 2 0 0 -15 0 -P 150 92 -1.6193094455651464e+00 -6.6986473580519243e+00 -3.1231955917792302e+01 4.6358110327498416e+01 3.3558088193125087e+01 2 0 0 -16 0 -V -16 0 0 0 0 0 0 16 0 -P 157 -211 3.7929530102443287e-01 -1.7398661940045272e+00 -1.6262506930350391e+00 2.4156097366743579e+00 1.3957000000000000e-01 1 0 0 0 0 -P 158 211 3.5929042858649445e-02 -2.5352917615846560e-01 -5.9214749380134923e-01 6.6006543508924009e-01 1.3957000000000000e-01 1 0 0 0 0 -P 159 113 -1.8124205568734308e-01 -3.1612383038769862e+00 -1.1255356346808174e+01 1.1743159345237892e+01 1.0920021141756768e+00 2 0 0 -91 0 -P 160 -211 2.8532095261363383e-01 1.0522733295491603e-02 -1.4240332868527008e+00 1.4590645499363166e+00 1.3957000000000000e-01 1 0 0 0 0 -P 161 111 8.0154759639689030e-02 -3.4769109444583562e-01 -8.8595154092897399e-01 9.6459505281971181e-01 1.3497999999999999e-01 2 0 0 -92 0 -P 162 211 3.8450845074859470e-02 2.0662978645006660e-01 -7.8432525673484271e-02 2.6420783886723115e-01 1.3957000000000000e-01 1 0 0 0 0 -P 163 2112 -6.2517197323617857e-01 3.1384370147711613e+00 1.1380234215497604e-02 3.3351983728762726e+00 9.3957000000000002e-01 1 0 0 0 0 -P 164 -2212 4.7227611869119018e-01 9.0023711940114270e-01 -1.4423015082082278e+00 1.9985134067384713e+00 9.3827000000000005e-01 1 0 0 0 0 -P 165 213 -8.8060853310417464e-01 -2.2704271380420674e-01 -3.0207510516881181e-01 1.2785039593373555e+00 8.4634698700419575e-01 2 0 0 -93 0 -P 166 113 -5.6015858000582994e-02 1.9712923875091308e+00 2.0121776569014715e-01 2.1471534595610358e+00 8.2501390065658908e-01 2 0 0 -94 0 -P 151 -213 -9.1575437638018786e-01 1.9786173531659450e+00 1.0038490462694034e-01 2.3689498194545235e+00 9.2103930964307001e-01 2 0 0 -86 0 -P 152 221 -1.1496652822320098e-01 -7.9300120639953120e-01 -1.4401545991065330e+00 1.7366102003012958e+00 5.4744999999999999e-01 2 0 0 -87 0 -P 153 213 -7.2057087624760130e-01 -1.4035436254698561e+00 -1.4434746483930367e+00 2.3576881056684051e+00 9.9293355606685296e-01 2 0 0 -88 0 -P 154 311 -4.2407341657881786e-01 -1.1323088737363824e+00 -4.2536503779649254e-01 1.3749809062203735e+00 4.9767000000000000e-01 2 0 0 -89 0 -P 155 -323 6.8739672657553341e-01 -3.4637271310558235e+00 -5.6861873569991586e+00 6.7553227489313796e+00 9.1199719583656946e-01 2 0 0 -90 0 -P 156 211 3.2027042541495282e-01 -2.3824354336932485e+00 -4.9432086795529084e+00 5.4984873897845601e+00 1.3957000000000000e-01 1 0 0 0 0 -V -17 0 0 0 0 0 2 1 0 -P 52 21 -3.0362721334232550e+00 7.6960555799361619e-01 3.0949052196359327e+02 3.0950637219042926e+02 0 2 0 0 -17 0 -P 53 21 3.0362721334232550e+00 -7.6960555799361619e-01 4.2639680730324301e+00 5.2908094759627442e+00 0 2 0 0 -17 0 -P 167 92 0 0 3.1375449003662573e+02 3.1479718166639202e+02 2.5600499349824197e+01 2 0 0 -18 0 -V -18 0 0 0 0 0 0 14 0 -P 168 213 3.2999323989997326e-01 5.6942160313396906e-01 1.1610979057575713e+01 1.1657922862124975e+01 8.1190780467921042e-01 2 0 0 -95 0 -P 169 311 -3.9549707014260671e-01 -2.8851686492632728e-01 8.4163752596000130e+00 8.4452772514077648e+00 4.9767000000000000e-01 2 0 0 -96 0 -P 170 -323 5.2128742450140031e-01 9.7134097701761499e-02 8.3960820516559060e+00 8.4589041202825257e+00 8.8186704559962104e-01 2 0 0 -97 0 -P 171 113 3.8591072460653691e-01 -2.7644757220945215e-01 4.7314982713787517e+00 4.8147268927460747e+00 7.5443277508689677e-01 2 0 0 -98 0 -P 172 213 6.0325469359176376e-01 -3.0740340709509106e-01 1.4598324375000185e+00 1.7877548921809201e+00 7.7880917361405333e-01 2 0 0 -99 0 -P 173 1114 3.6710399464270077e-01 1.2951245679680667e-01 3.1121459445196282e+00 3.3467359928685627e+00 1.1677545147092263e+00 2 0 0 -100 0 -P 174 -1114 9.7380249513257433e-01 -6.3457340363777717e-02 1.2276570613075052e+01 1.2375786282599574e+01 1.2221219092993045e+00 2 0 0 -101 0 -P 175 2112 -3.2151359419442543e-01 -3.9573049090654866e-01 1.2203622044795935e+01 1.2250353317754321e+01 9.3957000000000002e-01 1 0 0 0 0 -P 176 211 -2.6031509045536677e-01 -2.5957138973744100e-02 2.1813184663724797e+01 2.1815199808345582e+01 1.3957000000000000e-01 1 0 0 0 0 -P 177 -3222 -1.3419797779501037e+00 1.0195367754860356e+00 7.0658805821816856e+01 7.0688908649965128e+01 1.1893700000000000e+00 2 0 0 -102 0 -P 178 -323 6.5303950764476326e-01 4.5843110713109797e-01 4.3702629036619392e+01 4.3720185385460475e+01 9.4773717249732448e-01 2 0 0 -103 0 -P 179 113 -1.2053222613750429e+00 -6.5261496518697781e-01 8.2787798768823720e+01 8.2800346532049119e+01 4.4615332971601729e-01 2 0 0 -104 0 -P 180 213 2.0228441721426238e-01 1.5934395893829920e-01 2.2925780883396051e+01 2.2952070100818403e+01 1.0676063491270991e+00 2 0 0 -105 0 -P 181 -211 -5.1204870311642947e-01 -4.2325221952605135e-01 9.6591851821438173e+00 9.6830095777884910e+00 1.3957000000000000e-01 1 0 0 0 0 -V -19 0 0 0 0 0 0 2 0 -P 182 22 1.8587946456084625e-01 -2.1984404913873207e-01 -1.2052101682909502e+00 1.2391182877510287e+00 0 1 0 0 0 0 -P 183 111 2.5327040357331115e-01 5.8815220376537669e-01 -1.6074980532960521e+00 1.7356089720529952e+00 1.3497999999999999e-01 2 0 0 -106 0 -V -20 0 0 0 0 0 0 2 0 -P 184 2212 -1.8155431084997567e-01 5.7356379733320284e-01 -9.9133230842357767e-01 1.4916526861249948e+00 9.3827000000000005e-01 1 0 0 0 0 -P 185 111 1.9093758885898043e-01 3.4307324296551578e-01 -5.4152418423568671e-01 6.8236680413856798e-01 1.3497999999999999e-01 2 0 0 -107 0 -V -21 0 0 0 0 0 0 2 0 -P 186 -2212 3.1520905862425908e-01 2.1080784939947769e-01 -1.0716835086387424e+00 1.4739921423113049e+00 9.3827000000000005e-01 1 0 0 0 0 -P 187 111 -1.2735758821479068e-01 -8.9349224266055422e-03 -1.3398243917761030e-01 2.2906479983323427e-01 1.3497999999999999e-01 2 0 0 -108 0 -V -22 0 0 0 0 0 0 2 0 -P 188 211 7.9805875536976001e-01 -3.2097636430674814e-01 1.5504153910727283e+00 1.7785362726807428e+00 1.3957000000000000e-01 1 0 0 0 0 -P 189 111 -2.4862271094782207e-01 -1.2852231239011683e-01 2.9308707044207477e-01 4.2714267925538041e-01 1.3497999999999999e-01 2 0 0 -109 0 -V -23 0 0 0 0 0 0 2 0 -P 190 321 -1.5072910497911379e-01 -4.2818751301287367e-01 1.3882161311751551e+00 1.5417032127627126e+00 4.9359999999999998e-01 1 0 0 0 0 -P 191 -211 7.2622240627725473e-02 1.3135692979402222e-01 1.4767520864444364e-01 2.5261905111626654e-01 1.3957000000000000e-01 1 0 0 0 0 -V -24 0 0 0 0 0 0 2 0 -P 192 -321 -7.3081843994436652e-02 -3.2872056572966601e-02 1.0091837996890252e+00 1.1262834588058825e+00 4.9359999999999998e-01 1 0 0 0 0 -P 193 211 -2.0819494951518142e-01 -3.7697843105844819e-01 3.5213703177172428e-01 5.7353129690708116e-01 1.3957000000000000e-01 1 0 0 0 0 -V -25 0 1.4713437953703780e-06 8.8784517316833685e-07 4.6642120258844947e-06 4.9852042362384955e-06 0 2 0 -P 194 22 2.7205036877184846e-01 2.1002866456737385e-01 7.6826252672454298e-01 8.4163576032511367e-01 0 1 0 0 0 0 -P 195 22 2.5082939369000368e-01 1.0548989384833672e-01 8.8928486895552616e-01 9.2998445180351008e-01 0 1 0 0 0 0 -V -26 0 0 0 0 0 0 3 0 -P 196 211 4.8097144381577590e-02 -3.3729039691863125e-02 -1.4857572844262404e-01 2.1214503387648262e-01 1.3957000000000000e-01 1 0 0 0 0 -P 197 -211 3.7753509906070848e-01 -2.8072898252255268e-02 -4.9028060511515958e-01 6.3496117620776427e-01 1.3957000000000000e-01 1 0 0 0 0 -P 198 111 -5.0087081665597831e-03 8.2679167170274983e-03 1.1982873351947212e-01 1.8075389727808949e-01 1.3497999999999999e-01 2 0 0 -110 0 -V -27 0 0 0 0 0 0 2 0 -P 199 311 -8.4559749187529187e-01 9.9710033077653488e-03 -5.2448860633214933e-01 1.1126087660291861e+00 4.9767000000000000e-01 2 0 0 -111 0 -P 200 111 -1.7089083775893985e-01 2.9320013029682768e-01 5.3461345449179000e-02 3.6911747546447249e-01 1.3497999999999999e-01 2 0 0 -112 0 -V -28 0 0 0 0 0 0 1 0 -P 201 310 -5.9377456944595330e-01 4.5203893895285015e-02 -9.6189558945220821e-01 1.2359329210161991e+00 4.9767000000000000e-01 2 0 0 -113 0 -V -29 0 0 0 0 0 0 2 0 -P 202 -211 5.7565215324936768e-02 -1.1132129032450142e-01 -3.4466881494030727e-01 3.9240611690858496e-01 1.3957000000000000e-01 1 0 0 0 0 -P 203 111 -5.7967958732875779e-01 1.9060824615963567e-01 -5.1323302876053767e-01 8.0869504121170799e-01 1.3497999999999999e-01 2 0 0 -114 0 -V -30 0 0 0 0 0 0 3 0 -P 206 111 -3.4573985065176793e-01 2.1582774372736507e-01 -9.4505589920380773e-01 1.0380115183903642e+00 1.3497999999999999e-01 2 0 0 -115 0 -P 204 211 -2.9500658243202599e-01 -2.2831491421237085e-01 -7.6054280475650438e-01 8.5852299124538090e-01 1.3957000000000000e-01 1 0 0 0 0 -P 205 -211 -3.1517645369553471e-01 -1.6670151526215007e-01 -1.3583103023518337e+00 1.4112449307366599e+00 1.3957000000000000e-01 1 0 0 0 0 -V -31 0 0 0 0 0 0 2 0 -P 207 22 -2.7296924447765503e-01 -1.1720991606231085e-01 -6.8344889887257443e-01 7.4521994754848742e-01 0 1 0 0 0 0 -P 208 22 -5.2123567655416625e-01 -1.0273993326069992e+00 -5.1403413175097858e+00 5.2678596108526312e+00 0 1 0 0 0 0 -V -32 0 0 0 0 0 0 2 0 -P 209 311 -1.7100390911822591e-01 -2.6586260149101487e-01 -5.1674196262737446e+00 5.2009447490532308e+00 4.9767000000000000e-01 2 0 0 -116 0 -P 210 211 -2.0554842986190747e-01 2.1336500028280095e-01 -4.1667454612314101e+00 4.1795959498445461e+00 1.3957000000000000e-01 1 0 0 0 0 -V -33 0 0 0 0 0 0 2 0 -P 211 -321 5.0202951655587369e-01 -1.0818066855080209e-01 -1.7205959210260328e+01 1.7220697140292657e+01 4.9359999999999998e-01 1 0 0 0 0 -P 212 111 -3.1214615232548548e-02 9.2315020056256067e-02 -1.5055624232852555e+01 1.5056544658599103e+01 1.3497999999999999e-01 2 0 0 -117 0 -V -34 0 0 0 0 0 0 2 0 -P 213 211 9.1259248721195466e-02 -4.6924362818728679e-02 -3.3138429820366952e+02 3.3138434348331810e+02 1.3957000000000000e-01 1 0 0 0 0 -P 214 -211 -4.3948488936305879e-01 -8.5865907398658278e-02 -2.5473884247645952e+02 2.5473927429030923e+02 1.3957000000000000e-01 1 0 0 0 0 -V -35 0 0 0 0 0 0 3 0 -P 215 -211 -1.2003912619075557e-02 1.5417261170584987e-01 -3.7414862979715281e+01 3.7415442866066513e+01 1.3957000000000000e-01 1 0 0 0 0 -P 216 211 7.5480641148820526e-02 -1.0982597901254602e-01 -1.5712350184328226e+01 1.5713535158350382e+01 1.3957000000000000e-01 1 0 0 0 0 -P 217 111 2.4767673741972890e-01 5.0668514556659799e-02 -1.0757404831534404e+02 1.0757443005480903e+02 1.3497999999999999e-01 2 0 0 -118 0 -V -36 0 -7.0045040781826522e-05 -5.9678770686458553e-05 -2.0281626139517797e-01 2.0281628460902201e-01 0 2 0 -P 218 22 -2.0306043592456660e-01 -1.0355072122695697e-01 -5.7088734079546225e+02 5.7088738630031651e+02 0 1 0 0 0 0 -P 219 22 -1.0394410803041193e-01 -1.5801888561298336e-01 -3.1804802338288772e+02 3.1804807962336088e+02 0 1 0 0 0 0 -V -37 0 0 0 0 0 0 2 0 -P 220 2212 1.9744570739179240e-01 -2.9511038265664724e-01 -2.9201396219359308e+03 2.9201397942608260e+03 9.3827000000000005e-01 1 0 0 0 0 -P 221 111 2.7792522862110680e-01 -4.6183830318953831e-02 -1.5611958512606125e+03 1.5611958825170939e+03 1.3497999999999999e-01 2 0 0 -119 0 -V -38 0 0 0 0 0 0 1 0 -P 222 130 2.5888648514865614e-01 6.8942858996681888e+00 1.8438621810969973e+01 1.9693365634025938e+01 4.9767000000000000e-01 1 0 0 0 0 -V -39 0 0 0 0 0 0 2 0 -P 223 -2212 6.4080126117661795e-01 6.6596959653282841e+00 1.6651831163988486e+01 1.7970142133934655e+01 9.3827000000000005e-01 1 0 0 0 0 -P 224 111 -4.2370572833966343e-02 3.7630958362777911e-01 7.0705246002361244e-01 8.1335536501447692e-01 1.3497999999999999e-01 2 0 0 -120 0 -V -40 0 0 0 0 0 0 2 0 -P 225 211 7.1578317760274915e-02 -4.5300168548451349e-02 1.5812339005719036e+00 1.5896402089975410e+00 1.3957000000000000e-01 1 0 0 0 0 -P 226 111 -2.4791741699645198e-01 5.9538292801339954e-01 1.5554365516311630e+00 1.6892443112736077e+00 1.3497999999999999e-01 2 0 0 -121 0 -V -41 0 0 0 0 0 0 2 0 -P 227 -211 8.3215158992368088e-01 2.4641162172429856e+00 1.0127048332028291e+01 1.0456621476596988e+01 1.3957000000000000e-01 1 0 0 0 0 -P 228 111 1.0381122433908205e-01 6.6594352716038974e-01 2.1528987967838971e+00 2.2599668982662449e+00 1.3497999999999999e-01 2 0 0 -122 0 -V -42 0 0 0 0 0 0 3 0 -P 229 211 1.4965349692285381e-02 -2.3653199756728413e-01 1.4382398007146437e+00 1.4643035398524038e+00 1.3957000000000000e-01 1 0 0 0 0 -P 230 -211 2.2523982939715814e-01 -2.3702484908296056e-02 5.6148232442395496e-01 6.2131873791011349e-01 1.3957000000000000e-01 1 0 0 0 0 -P 231 111 -2.1496075116390248e-02 -2.6359322531633833e-01 3.9880052266159505e-01 4.9719707053968126e-01 1.3497999999999999e-01 2 0 0 -123 0 -V -43 0 0 0 0 0 0 2 0 -P 232 211 2.3913424705178085e-01 -1.1677536002552498e-01 3.6380966329753557e+00 3.6504860729208013e+00 1.3957000000000000e-01 1 0 0 0 0 -P 233 111 3.7290789623554016e-01 -5.1190371861218900e-02 9.2180964685596467e-01 1.0048051446339359e+00 1.3497999999999999e-01 2 0 0 -124 0 -V -44 0 0 0 0 0 0 3 0 -P 234 111 2.5665924518427391e-01 -7.3737349265815239e-02 3.8717337870206897e-01 4.8931992641919431e-01 1.3497999999999999e-01 2 0 0 -125 0 -P 235 111 1.6865575199696520e-01 1.3369711769649753e-01 2.2670061612841966e-01 3.4048854858132604e-01 1.3497999999999999e-01 2 0 0 -126 0 -P 236 111 1.1737773793019404e-01 1.8028103922700229e-02 4.6420344251526557e-01 4.9780215179896570e-01 1.3497999999999999e-01 2 0 0 -127 0 -V -45 0 0 0 0 0 0 2 0 -P 237 211 4.0644969833856254e-01 -1.1066065128461260e+00 8.3074841847963157e+00 8.3918742005045495e+00 1.3957000000000000e-01 1 0 0 0 0 -P 238 111 1.4412581789419426e-01 5.3202859311188878e-02 1.1740086701081160e+00 1.1916873556061522e+00 1.3497999999999999e-01 2 0 0 -128 0 -V -46 0 0 0 0 0 0 2 0 -P 239 311 2.5178180326027377e-01 -3.2242494783834660e-02 4.0106627287096375e+00 4.0493857073985327e+00 4.9767000000000000e-01 2 0 0 -129 0 -P 240 111 8.1017910362551057e-02 -1.5036507976175487e-01 3.4051200055065252e+00 3.4120720114487666e+00 1.3497999999999999e-01 2 0 0 -130 0 -V -47 0 0 0 0 0 0 2 0 -P 241 -2112 -2.6558420839918023e-01 -4.1394355142160610e-02 1.3870983886355736e+01 1.3905367101404735e+01 9.3957000000000002e-01 1 0 0 0 0 -P 242 211 -2.4056819339966279e-01 8.0717251922855018e-03 9.3665887871712474e+00 9.3707205433352510e+00 1.3957000000000000e-01 1 0 0 0 0 -V -48 0 -1.7671461207839840e+01 -2.8931783299526622e+01 7.9433041118326389e+02 7.9562540263520054e+02 0 2 0 -P 243 2212 -6.4323292945979427e-01 -9.6342862692646503e-01 2.7198319694383319e+01 2.7239142572986808e+01 9.3827000000000005e-01 1 0 0 0 0 -P 244 -211 -1.0461544316330479e-02 -1.0680244434445450e-01 2.1851814227995972e+00 2.1922622656689379e+00 1.3957000000000000e-01 1 0 0 0 0 -V -49 0 0 0 0 0 0 3 0 -P 245 211 -1.0658262219708090e+00 -8.2252278997220341e-01 2.1555528495606971e+01 2.1597981798892423e+01 1.3957000000000000e-01 1 0 0 0 0 -P 246 -211 -4.9088454070215592e-01 -3.0027745336315973e-02 7.2664188190925962e+00 7.2843799693009830e+00 1.3957000000000000e-01 1 0 0 0 0 -P 247 111 -7.8433224325262052e-01 -2.9777701257474420e-01 1.5463318749655521e+01 1.5486648913527794e+01 1.3497999999999999e-01 2 0 0 -131 0 -V -50 0 0 0 0 0 0 3 0 -P 248 -211 -1.2188640219493940e+00 -9.3422180369870000e-01 2.0922904541008972e+01 2.0979652382715557e+01 1.3957000000000000e-01 1 0 0 0 0 -P 249 211 -1.0146380362055605e+00 -1.1421994186045756e+00 1.6785995231936074e+01 1.6855955195949480e+01 1.3957000000000000e-01 1 0 0 0 0 -P 250 111 -9.6179822519988656e-01 -8.2506899661188349e-01 1.9413229757131628e+01 1.9455012307339945e+01 1.3497999999999999e-01 2 0 0 -132 0 -V -51 0 -6.7612250962819850e-05 -1.8662225712865060e-05 1.0005460236156168e-03 1.0030482758662050e-03 0 2 0 -P 251 22 -5.4111388577644548e-01 -1.7745401666901453e-01 8.9546946112744887e+00 8.9727838348307714e+00 0 1 0 0 0 0 -P 252 22 -4.0117919049830292e-01 -8.2636215895192267e-02 4.9896361441928754e+00 5.0064201120663352e+00 0 1 0 0 0 0 -V -52 0 -1.0031594106859512e+00 -6.0662790835180747e-01 1.4756351155848559e+01 1.4803588565939812e+01 0 4 0 -P 253 -13 -2.6618575532310844e+00 -1.6167266063331194e+00 3.6143438395162441e+01 3.6277521878069642e+01 1.0566000000000000e-01 1 0 0 0 0 -P 254 14 -1.7622608552463395e+00 -6.1124567981443900e-01 2.3767021479078203e+01 2.3840102654770387e+01 0 1 0 0 0 0 -P 255 -323 -7.3856701894561985e+00 -4.9147012895514184e+00 1.1208276364753114e+02 1.1243641907035618e+02 8.3666814418099522e-01 2 0 0 -133 0 -P 256 211 -8.3032704528557788e-01 -5.0102375923189180e-01 1.3941317982788394e+01 1.3975703727954690e+01 1.3957000000000000e-01 1 0 0 0 0 -V -53 0 0 0 0 0 0 3 0 -P 257 -211 1.3857831485530528e-01 2.6488289772950824e-01 1.2033220667879797e+02 1.2033265895372175e+02 1.3957000000000000e-01 1 0 0 0 0 -P 258 211 -1.7979563690597777e-01 3.7159338534362971e-02 6.0674676874761047e+01 6.0675115170299051e+01 1.3957000000000000e-01 1 0 0 0 0 -P 259 111 -2.1788911425523635e-01 -3.3819150870949083e-02 1.5879812474349990e+02 1.5879833519610222e+02 1.3497999999999999e-01 2 0 0 -134 0 -V -54 0 0 0 0 0 0 2 0 -P 260 -211 -3.1834604045503856e-01 3.0376945733427041e-01 3.6415849333717392e+02 3.6415878592925657e+02 1.3957000000000000e-01 1 0 0 0 0 -P 261 111 2.3397054695967343e-01 -2.0782937300071624e-01 6.3017049896018172e+01 6.3017971503871578e+01 1.3497999999999999e-01 2 0 0 -135 0 -V -55 0 0 0 0 0 0 2 0 -P 262 211 -3.2804553869109360e-01 -2.0500235184311433e-01 6.3497741005976408e+01 6.3499072689974568e+01 1.3957000000000000e-01 1 0 0 0 0 -P 263 -211 -1.7657170564239925e-02 5.4286517071622287e-01 7.7233692867527111e+01 7.7235728831348879e+01 1.3957000000000000e-01 1 0 0 0 0 -V -56 0 0 0 0 0 0 2 0 -P 265 111 1.3819210244527837e-02 -1.2966282475160049e-01 1.1780976594232847e+01 1.1782471410232937e+01 1.3497999999999999e-01 2 0 0 -136 0 -P 264 211 2.3313981532533326e-01 2.5928411580336491e-01 1.0957397434947973e+02 1.0957461803242364e+02 1.3957000000000000e-01 1 0 0 0 0 -V -57 0 0 0 0 0 0 2 0 -P 266 -211 4.5549648708790008e-01 2.2808652686664740e-01 5.9317208860832444e+00 5.9551904225460079e+00 1.3957000000000000e-01 1 0 0 0 0 -P 267 111 2.6278645540909368e-01 -2.0399835461058230e-01 1.2281845329601460e+01 1.2287091452027347e+01 1.3497999999999999e-01 2 0 0 -137 0 -V -58 0 2.1464610372068443e-05 -7.4001157013187091e-05 6.3535032736792402e-04 6.4489764692951892e-04 0 2 0 -P 268 22 -4.6675719704953711e-02 -1.7936313484327244e-02 2.2709027355224920e-01 2.3253027005837071e-01 0 1 0 0 0 0 -P 269 22 8.3218703776255343e-02 -1.0804888052179129e-01 8.5457841226349773e-01 8.6539249820356823e-01 0 1 0 0 0 0 -V -59 0 0 0 0 0 0 2 0 -P 270 -311 7.4489573882419291e-01 8.6535957172601397e-01 1.7511148478823699e+01 1.7555389865406173e+01 4.9767000000000000e-01 2 0 0 -138 0 -P 271 -211 1.1684349484407686e-01 3.3304617277479132e-01 1.3094954766581912e+01 1.3100453895923364e+01 1.3957000000000000e-01 1 0 0 0 0 -V -60 0 0 0 0 0 0 2 0 -P 272 -211 1.4834296209480378e+00 5.9292167637229842e-01 1.8632553603080105e+01 1.8701434520142339e+01 1.3957000000000000e-01 1 0 0 0 0 -P 273 211 2.5378665607382822e-01 5.1504212546178629e-03 1.3539237060033491e+00 1.3845661342883115e+00 1.3957000000000000e-01 1 0 0 0 0 -V -61 0 2.9762149049519281e-06 1.7804127290848588e-05 4.0800488294499739e-04 4.0840612215915523e-04 0 2 0 -P 274 22 1.6410544409971853e-01 1.1774821168325287e+00 2.5564031639197310e+01 2.5591660914878588e+01 0 1 0 0 0 0 -P 275 22 1.4120857610435908e-01 6.4894838398572974e-01 1.6291014133057946e+01 1.6304545849257401e+01 0 1 0 0 0 0 -V -62 0 0 0 0 0 0 2 0 -P 276 -311 -4.7598331792509141e-01 -8.4343084301410715e-02 2.7348337649344273e+01 2.7357136573228090e+01 4.9767000000000000e-01 2 0 0 -139 0 -P 277 -211 -2.5911615941498739e-01 3.5248729860197742e-01 3.2768538452078332e+01 3.2771755835627452e+01 1.3957000000000000e-01 1 0 0 0 0 -V -63 0 0 0 0 0 0 1 0 -P 278 310 -6.9510494917716592e-01 3.2581753110533535e-01 7.2855221980526849e+01 7.2860966046400236e+01 4.9767000000000000e-01 2 0 0 -140 0 -V -64 0 0 0 0 0 0 2 0 -P 279 -211 -3.5884084719608189e-01 -1.6833740109714063e-01 5.2889439384711885e+01 5.2891108727726980e+01 1.3957000000000000e-01 1 0 0 0 0 -P 280 211 -1.7020988803033060e-01 4.8234612082944878e-01 2.0173812743598088e+01 2.0180778716018942e+01 1.3957000000000000e-01 1 0 0 0 0 -V -65 0 0 0 0 0 0 2 0 -P 281 -321 3.4124973471434705e-01 1.1009176865102556e-01 1.5639404073440900e+02 1.5639523071300783e+02 4.9359999999999998e-01 1 0 0 0 0 -P 282 111 -3.2573253343187690e-02 3.1947085801068070e-01 3.7927127562285655e+01 3.7928727204748640e+01 1.3497999999999999e-01 2 0 0 -141 0 -V -66 0 0 0 0 0 0 2 0 -P 283 321 4.9926846924895973e-01 5.0291971801674606e-01 1.8932076706358586e+01 1.8951764208711591e+01 4.9359999999999998e-01 1 0 0 0 0 -P 284 111 1.2384987075047131e-01 1.5431966147040221e-01 1.6072972622645629e+00 1.6250469033490718e+00 1.3497999999999999e-01 2 0 0 -142 0 -V -67 0 0 0 0 0 0 2 0 -P 285 -211 1.7859206659747753e-01 1.1537889269107618e-01 3.5102971391524509e+00 3.5194989991719074e+00 1.3957000000000000e-01 1 0 0 0 0 -P 286 111 6.4486344276971752e-01 4.1954089445604403e-01 3.4093148585283814e+01 3.4102094708105270e+01 1.3497999999999999e-01 2 0 0 -143 0 -V -68 0 0 0 0 0 0 2 0 -P 287 211 1.5204545582315820e-01 -2.7098259271716346e-01 5.5290903643553468e+00 5.5395730366427456e+00 1.3957000000000000e-01 1 0 0 0 0 -P 288 111 8.2817694285958010e-01 3.5851535166798970e-01 2.9026079952350351e+01 2.9040419199913433e+01 1.3497999999999999e-01 2 0 0 -144 0 -V -69 0 0 0 0 0 0 2 0 -P 289 -211 2.2195516193061104e-02 5.9812657288889171e-01 7.4880607642605312e+00 7.5132404348784751e+00 1.3957000000000000e-01 1 0 0 0 0 -P 290 211 -2.0671728245952670e-01 5.6845359322346689e-03 5.6135734926813177e+00 5.6191148316661534e+00 1.3957000000000000e-01 1 0 0 0 0 -V -70 0 2.8328565239901664e+01 9.6200077887030560e+00 4.1187571780827233e+02 4.1366548525931290e+02 0 2 0 -P 291 -2112 8.7074311781260816e-01 2.9303660553681032e-01 1.5105424132384448e+01 1.5162476513865569e+01 9.3957000000000002e-01 1 0 0 0 0 -P 292 211 5.3478597298736574e-01 1.8426256885623099e-01 5.3298961272609038e+00 5.3616435207384239e+00 1.3957000000000000e-01 1 0 0 0 0 -V -71 0 2.3556324247227142e+01 1.7848882981569922e+01 5.0825086777096664e+02 5.1144512508733749e+02 0 2 0 -P 293 2212 4.2293484863058523e-01 2.9818090643247958e-01 8.7896810414164062e+00 8.8547517831886218e+00 9.3827000000000005e-01 1 0 0 0 0 -P 294 -211 1.1536274026245073e-01 1.0969302893092955e-01 2.8246189572817935e+00 2.8325418198453116e+00 1.3957000000000000e-01 1 0 0 0 0 -V -72 0 0 0 0 0 0 2 0 -P 295 211 1.8426627916469118e-01 -7.5048765015658725e-01 1.0044347862878006e+01 1.0074998240698443e+01 1.3957000000000000e-01 1 0 0 0 0 -P 296 -211 -1.8119511039128258e-01 -1.3216308974087224e-01 3.6693369790839530e+00 3.6788330216649565e+00 1.3957000000000000e-01 1 0 0 0 0 -V -73 0 0 0 0 0 0 3 0 -P 297 -211 -9.2330691001946449e-02 1.3153518843286626e-02 1.6918771409868543e+00 1.7001841125750792e+00 1.3957000000000000e-01 1 0 0 0 0 -P 298 211 9.0350579840365638e-02 1.9611894399870142e-01 2.5597390976925207e+00 2.5726192684943445e+00 1.3957000000000000e-01 1 0 0 0 0 -P 299 111 -7.3500095204024493e-02 -2.8029675650135422e-02 1.4396825602645615e+00 1.4481344555813784e+00 1.3497999999999999e-01 2 0 0 -145 0 -V -74 0 0 0 0 0 0 2 0 -P 300 -321 -1.6702756185750384e-01 1.3389650322075297e-01 3.6488781901075438e+00 3.6883301758705538e+00 4.9359999999999998e-01 1 0 0 0 0 -P 301 111 2.0114716920673079e-01 1.5846874708903921e-01 5.7634264972716922e+00 5.7706912165993858e+00 1.3497999999999999e-01 2 0 0 -146 0 -V -75 0 0 0 0 0 0 1 0 -P 302 310 3.1370849344690394e-01 -1.6502140696154801e+00 1.7013060483686480e+01 1.7103026689591879e+01 4.9767000000000000e-01 2 0 0 -147 0 -V -76 0 -4.4060919108810952e-05 5.2342729044881510e-06 1.9987704934143461e-04 2.0525736542072959e-04 0 2 0 -P 303 22 -1.7794066347471776e-01 -1.3349370806625340e-02 5.5028936743970702e-01 5.7849760011252294e-01 0 1 0 0 0 0 -P 304 22 -2.3150197645234680e-01 6.1989629781244990e-02 1.3070978228067121e+00 1.3288869770179124e+00 0 1 0 0 0 0 -V -77 0 0 0 0 0 0 2 0 -P 305 22 -4.8147715868567109e-01 -1.0464340696446410e+00 7.7587519913374754e+00 7.8437922575456005e+00 0 1 0 0 0 0 -P 306 113 -1.6665913895179937e-01 -8.1594819202784230e-01 7.9877425118423817e+00 8.0545508376702948e+00 6.1498946369148655e-01 2 0 0 -148 0 -V -78 0 0 0 0 0 0 3 0 -P 307 211 -1.8184679283982430e-01 -2.8499906586894308e-01 3.0136790064542227e+00 3.0357920980289825e+00 1.3957000000000000e-01 1 0 0 0 0 -P 308 -211 3.5179468682444448e-01 -2.3385890449493285e-01 3.1756943767047940e+00 3.2067061056517057e+00 1.3957000000000000e-01 1 0 0 0 0 -P 309 111 9.0534432904070691e-02 -2.3749201050634819e-01 3.2731976007131105e+00 3.2858242607159731e+00 1.3497999999999999e-01 2 0 0 -149 0 -V -79 0 0 0 0 0 0 2 0 -P 310 -211 2.7856484699452511e-01 2.8577154471696598e-01 3.4544645566440200e+00 3.4802397773372986e+00 1.3957000000000000e-01 1 0 0 0 0 -P 311 111 -9.4170629718448959e-02 -2.9997688368599973e-01 1.5278571859945593e+00 1.5657015741969307e+00 1.3497999999999999e-01 2 0 0 -150 0 -V -80 0 0 0 0 0 0 3 0 -P 313 -211 7.9426483332274311e-02 -1.5467016237984951e-01 9.7427050026002354e-02 2.4331716002351791e-01 1.3957000000000000e-01 1 0 0 0 0 -P 314 111 1.8971003374894185e-01 4.4985653465487427e-02 1.4939175240432037e-01 2.8026969513162736e-01 1.3497999999999999e-01 2 0 0 -151 0 -P 312 211 -2.4615362835751831e-01 -1.3753471735515529e-01 4.7223885765926288e-01 5.6744755776623024e-01 1.3957000000000000e-01 1 0 0 0 0 -V -81 0 0 0 0 0 0 2 0 -P 315 211 5.7720189775931130e-01 -3.9507585597671829e-01 -1.1132509901501841e+00 1.3221401267350796e+00 1.3957000000000000e-01 1 0 0 0 0 -P 316 -211 -1.9425629667973457e-01 -1.1419431352636915e-02 -1.1646984667205262e+00 1.1890619056606293e+00 1.3957000000000000e-01 1 0 0 0 0 -V -82 0 0 0 0 0 0 2 0 -P 317 -211 -2.9021697517593742e-01 1.1988738882319924e-01 -2.0078266346984845e+00 2.0370190128184267e+00 1.3957000000000000e-01 1 0 0 0 0 -P 318 111 2.7228862930317249e-01 -1.6409330052984511e-01 -5.7080765886119700e+00 5.7185160357199880e+00 1.3497999999999999e-01 2 0 0 -152 0 -V -83 0 0 0 0 0 0 3 0 -P 319 211 2.6159158905174562e-01 1.1976908035329931e-01 -1.4753856976310765e+01 1.4757321920131888e+01 1.3957000000000000e-01 1 0 0 0 0 -P 320 -211 -2.6126819940006357e-01 2.3461403354789964e-01 -1.1509852823941991e+01 1.1516053865385521e+01 1.3957000000000000e-01 1 0 0 0 0 -P 321 111 -1.7919897259041917e-02 1.5330504745657006e-01 -4.6525951151258740e+00 4.6571111717444085e+00 1.3497999999999999e-01 2 0 0 -153 0 -V -84 0 0 0 0 0 0 2 0 -P 322 -211 1.1189448533215496e-01 1.1139057069963787e+00 -4.6227315661100803e+01 4.6241080213549104e+01 1.3957000000000000e-01 1 0 0 0 0 -P 323 111 -1.7831872374999885e-01 1.0951995265665338e-02 -2.0281315249784544e+01 2.0282551254094816e+01 1.3497999999999999e-01 2 0 0 -154 0 -V -85 0 0 0 0 0 0 2 0 -P 324 211 -1.8870258535806511e-01 9.9084535100534471e-02 -1.2736262200082729e+01 1.2738810031748375e+01 1.3957000000000000e-01 1 0 0 0 0 -P 325 111 -2.2960427640955786e-01 -3.4454698564168434e-01 -3.2341356799315314e+01 3.2344288676211129e+01 1.3497999999999999e-01 2 0 0 -155 0 -V -86 0 0 0 0 0 0 2 0 -P 326 -211 -1.0197116374969704e+00 1.5402199673687851e+00 -1.0565560002434418e-01 1.8554601214374720e+00 1.3957000000000000e-01 1 0 0 0 0 -P 327 111 1.0395726111678255e-01 4.3839738579715976e-01 2.0604050465128451e-01 5.1348969801705135e-01 1.3497999999999999e-01 2 0 0 -156 0 -V -87 0 0 0 0 0 0 3 0 -P 328 22 6.5303627407064125e-03 -1.3036945355560819e-01 -9.6430844554637241e-02 1.6228908724690547e-01 0 1 0 0 0 0 -P 329 -211 -1.2443340358908676e-01 -5.8991175846200250e-01 -1.2399150957152332e+00 1.3857664969911101e+00 1.3957000000000000e-01 1 0 0 0 0 -P 330 211 2.9365126251793771e-03 -7.2719994381920436e-02 -1.0380865883666240e-01 1.8855461606328006e-01 1.3957000000000000e-01 1 0 0 0 0 -V -88 0 0 0 0 0 0 2 0 -P 331 211 -2.3181192257978658e-01 -3.5965984364971582e-01 6.4686117305103930e-02 4.5470435368081163e-01 1.3957000000000000e-01 1 0 0 0 0 -P 332 111 -4.8875895366781463e-01 -1.0438837818201401e+00 -1.5081607656981406e+00 1.9029837519875930e+00 1.3497999999999999e-01 2 0 0 -157 0 -V -89 0 0 0 0 0 0 1 0 -P 333 130 -4.2407341657881786e-01 -1.1323088737363824e+00 -4.2536503779649254e-01 1.3749809062203728e+00 4.9767000000000000e-01 1 0 0 0 0 -V -90 0 0 0 0 0 0 2 0 -P 334 -311 5.4533423118825564e-01 -2.1932503402815775e+00 -4.1527351550146987e+00 4.7540110617715117e+00 4.9767000000000000e-01 2 0 0 -158 0 -P 335 -211 1.4206249538727772e-01 -1.2704767907742456e+00 -1.5334522019844594e+00 2.0013116871598671e+00 1.3957000000000000e-01 1 0 0 0 0 -V -91 0 0 0 0 0 0 2 0 -P 336 211 -1.2225698895883293e-01 -3.1496728462498411e+00 -1.0197663615851679e+01 1.0674605792099211e+01 1.3957000000000000e-01 1 0 0 0 0 -P 337 -211 -5.8985066728510137e-02 -1.1565457627145266e-02 -1.0576927309564947e+00 1.0685535531386812e+00 1.3957000000000000e-01 1 0 0 0 0 -V -92 0 3.8527617637917094e-05 -1.6712307045937573e-04 -4.2584623006883233e-04 4.6364744324007163e-04 0 2 0 -P 338 22 1.4995858064857176e-02 -1.9939694528972410e-01 -3.3316020649286715e-01 3.8856111583680686e-01 0 1 0 0 0 0 -P 339 22 6.5158901574831854e-02 -1.4829414915611150e-01 -5.5279133443610673e-01 5.7603393698290495e-01 0 1 0 0 0 0 -V -93 0 0 0 0 0 0 2 0 -P 340 211 8.5893108070628790e-02 -1.6165390012367403e-01 5.6069209211904635e-02 2.3692435620019278e-01 1.3957000000000000e-01 1 0 0 0 0 -P 341 111 -9.6650164117480342e-01 -6.5388813680532676e-02 -3.5814431438071642e-01 1.0415796031371627e+00 1.3497999999999999e-01 2 0 0 -159 0 -V -94 0 0 0 0 0 0 2 0 -P 342 211 -3.3890199253143205e-01 8.2436823164178752e-01 -1.3217187365235175e-01 9.1180410778124699e-01 1.3957000000000000e-01 1 0 0 0 0 -P 343 -211 2.8288613453084904e-01 1.1469241558673431e+00 3.3338963934249888e-01 1.2353493517797889e+00 1.3957000000000000e-01 1 0 0 0 0 -V -95 0 0 0 0 0 0 2 0 -P 344 211 1.0363531280713142e-01 -1.6220264472005022e-01 4.0741120327917821e+00 4.0810438145961632e+00 1.3957000000000000e-01 1 0 0 0 0 -P 345 111 2.2635792709284186e-01 7.3162424785401936e-01 7.5368670247839322e+00 7.5768790475288128e+00 1.3497999999999999e-01 2 0 0 -160 0 -V -96 0 0 0 0 0 0 1 0 -P 346 130 -3.9549707014260671e-01 -2.8851686492632728e-01 8.4163752596000130e+00 8.4452772514077648e+00 4.9767000000000000e-01 1 0 0 0 0 -V -97 0 0 0 0 0 0 2 0 -P 347 -311 5.0093079509551341e-01 -1.6736784839411437e-01 6.2499799234045614e+00 6.2919685417213573e+00 4.9767000000000000e-01 2 0 0 -161 0 -P 348 -211 2.0356629405886905e-02 2.6450194609587585e-01 2.1461021282513455e+00 2.1669355785611693e+00 1.3957000000000000e-01 1 0 0 0 0 -V -98 0 0 0 0 0 0 2 0 -P 349 -211 3.6607738155790637e-01 -4.3044115371221930e-01 4.2533118453167278e+00 4.2929516273199475e+00 1.3957000000000000e-01 1 0 0 0 0 -P 350 211 1.9833343048630526e-02 1.5399358150276715e-01 4.7818642606202344e-01 5.2177526542612684e-01 1.3957000000000000e-01 1 0 0 0 0 -V -99 0 0 0 0 0 0 2 0 -P 351 211 1.5940818450812536e-01 -1.9127479523860261e-01 1.2196341057309632e+00 1.2525909760747569e+00 1.3957000000000000e-01 1 0 0 0 0 -P 352 111 4.4384650908363849e-01 -1.1612861185648843e-01 2.4019833176905525e-01 5.3516391610616321e-01 1.3497999999999999e-01 2 0 0 -162 0 -V -100 0 0 0 0 0 0 2 0 -P 353 2112 2.4461206701185767e-01 -3.6870254613733507e-02 2.2892535780963792e+00 2.4868993161626327e+00 9.3957000000000002e-01 1 0 0 0 0 -P 354 -211 1.2249192763084313e-01 1.6638271141054020e-01 8.2289236642324926e-01 8.5983667670593000e-01 1.3957000000000000e-01 1 0 0 0 0 -V -101 0 0 0 0 0 0 2 0 -P 355 -2112 1.0306418575496812e+00 -1.2658702532810939e-01 1.1049846019117362e+01 1.1138228573010105e+01 9.3957000000000002e-01 1 0 0 0 0 -P 356 211 -5.6839362417106777e-02 6.3129684964331675e-02 1.2267245939576892e+00 1.2375577095894705e+00 1.3957000000000000e-01 1 0 0 0 0 -V -102 0 -3.0012621268697615e+01 2.2801365277584146e+01 1.5802443623017721e+03 1.5809175950845424e+03 0 2 0 -P 357 -2112 -1.1378581036056166e+00 9.7861646295080473e-01 5.6072853838445951e+01 5.6100803386565886e+01 9.3957000000000002e-01 1 0 0 0 0 -P 358 -211 -2.0412167434448733e-01 4.0920312535230922e-02 1.4585951983370913e+01 1.4588105263399255e+01 1.3957000000000000e-01 1 0 0 0 0 -V -103 0 0 0 0 0 0 2 0 -P 359 -311 4.7336032540883582e-01 1.9957792363092278e-01 3.8244208976342740e+01 3.8250896682304671e+01 4.9767000000000000e-01 2 0 0 -163 0 -P 360 -211 1.7967918223592744e-01 2.5885318350017517e-01 5.4584200602766515e+00 5.4692887031558053e+00 1.3957000000000000e-01 1 0 0 0 0 -V -104 0 0 0 0 0 0 2 0 -P 361 -211 -3.2092342397034901e-01 -3.5332105099211819e-01 2.8100859079842962e+01 2.8105259088277762e+01 1.3957000000000000e-01 1 0 0 0 0 -P 362 211 -8.8439883740469394e-01 -2.9929391419485957e-01 5.4686939688980750e+01 5.4695087443771357e+01 1.3957000000000000e-01 1 0 0 0 0 -V -105 0 0 0 0 0 0 2 0 -P 363 211 9.3368745682880214e-02 -3.7681332268505119e-01 1.5272857477423360e+01 1.5278427972583108e+01 1.3957000000000000e-01 1 0 0 0 0 -P 364 111 1.0891567153138218e-01 5.3615728162335041e-01 7.6529234059726923e+00 7.6736421282352971e+00 1.3497999999999999e-01 2 0 0 -164 0 -V -106 0 3.8458390904380503e-05 8.9309240418746158e-05 -2.4409401035204432e-04 2.6354728923169718e-04 0 2 0 -P 365 22 2.1224395554242417e-01 4.8081206587306669e-01 -1.4361207927576540e+00 1.5292712874909715e+00 0 1 0 0 0 0 -P 366 22 4.1026448030886967e-02 1.0734013789231003e-01 -1.7137726053839816e-01 2.0633768456202375e-01 0 1 0 0 0 0 -V -107 0 4.3736281292517583e-06 7.8584567595844059e-06 -1.2404186200301000e-05 1.5630335896051612e-05 0 2 0 -P 367 22 6.0632728091395464e-02 2.9953596761870191e-02 -4.5605230561117767e-02 8.1568270358703371e-02 0 1 0 0 0 0 -P 368 22 1.3030486076758502e-01 3.1311964620364563e-01 -4.9591895367456895e-01 6.0079853377986470e-01 0 1 0 0 0 0 -V -108 0 -1.3697641095364497e-05 -9.6097423271048161e-07 -1.4410161111415212e-05 2.4636517224285515e-05 0 2 0 -P 369 22 2.7690702351260706e-02 1.0286881774652524e-02 -2.0116122984700145e-02 3.5738681247177738e-02 0 1 0 0 0 0 -P 370 22 -1.5504829056605138e-01 -1.9221804201258064e-02 -1.1386631619291016e-01 1.9332611858605653e-01 0 1 0 0 0 0 -V -109 0 -1.2153169023578906e-05 -6.2824244005050017e-06 1.4326674711770995e-05 2.0879577567088964e-05 0 2 0 -P 371 22 -1.8133550327440726e-01 -2.1084177871680054e-02 1.5281630107905045e-01 2.3807546950450442e-01 0 1 0 0 0 0 -P 372 22 -6.7287207673414770e-02 -1.0743813451843676e-01 1.4027076936302429e-01 1.8906720975087596e-01 0 1 0 0 0 0 -V -110 0 -5.9930910720649131e-07 9.8928458623747859e-07 1.4337918863531024e-05 2.1627823622279452e-05 0 2 0 -P 373 22 1.3368502630494792e-03 7.1193937795053341e-02 5.3178847259601876e-02 8.8872682772896006e-02 0 1 0 0 0 0 -P 374 22 -6.3455584296092616e-03 -6.2926021078025848e-02 6.6649886259870242e-02 9.1881214505193501e-02 0 1 0 0 0 0 -V -111 0 0 0 0 0 0 1 0 -P 375 130 -8.4559749187529187e-01 9.9710033077653488e-03 -5.2448860633214933e-01 1.1126087660291861e+00 4.9767000000000000e-01 1 0 0 0 0 -V -112 0 -3.8983732874524748e-05 6.6885010970516116e-05 1.2195638089406324e-05 8.4203326822728840e-05 0 2 0 -P 376 22 -6.9501739814868346e-02 5.8747270131682114e-02 6.7485383437181481e-02 1.1329611892241456e-01 0 1 0 0 0 0 -P 377 22 -1.0138909794407150e-01 2.3445286016514555e-01 -1.4024037988002492e-02 2.5582135654205801e-01 0 1 0 0 0 0 -V -113 0 -1.1912408123196776e+02 9.0688833868512901e+00 -1.9297715704041471e+02 2.4795500052785277e+02 0 2 0 -P 378 -211 -4.6643829830683509e-01 -1.1593546915583072e-01 -7.8530117194117199e-01 9.3122684383985455e-01 1.3957000000000000e-01 1 0 0 0 0 -P 379 211 -1.2733627113911816e-01 1.6113936305111573e-01 -1.7659441751103602e-01 3.0470607717634451e-01 1.3957000000000000e-01 1 0 0 0 0 -V -114 0 -1.5133275992010396e-04 4.9760717101996210e-05 -1.3398603715268880e-04 2.1112016913381942e-04 0 2 0 -P 380 22 -1.1176794650841664e-01 1.9471339867306089e-02 -3.6632243387093595e-02 1.1921882484955004e-01 0 1 0 0 0 0 -P 381 22 -4.6791164082034109e-01 1.7113690629232955e-01 -4.7660078537344397e-01 6.8947621636215795e-01 0 1 0 0 0 0 -V -115 0 -2.3405923657104216e-04 1.4611123604191701e-04 -6.3978468743944869e-04 7.0271385577448068e-04 0 2 0 -P 382 22 -1.5654606706326107e-02 5.9193877959733618e-02 -1.8136750724565426e-01 1.9142401778132240e-01 0 1 0 0 0 0 -P 383 22 -3.3008524394544181e-01 1.5663386576763144e-01 -7.6368839195815341e-01 8.4658750060904175e-01 0 1 0 0 0 0 -V -116 0 0 0 0 0 0 1 0 -P 384 130 -1.7100390911822591e-01 -2.6586260149101487e-01 -5.1674196262737446e+00 5.2009447490532308e+00 4.9767000000000000e-01 1 0 0 0 0 -V -117 0 -1.5719477175582176e-05 4.6489243577943278e-05 -7.5819144246790952e-03 7.5823779450975570e-03 0 2 0 -P 385 22 -4.6933693407794318e-02 2.8454853467780084e-02 -1.9950342681093154e+00 1.9957891124047258e+00 0 1 0 0 0 0 -P 386 22 1.5719078175245767e-02 6.3860166588475972e-02 -1.3060589964743238e+01 1.3060755546194381e+01 0 1 0 0 0 0 -V -118 0 4.6249141509978390e-06 9.4614267138868386e-07 -2.0087503716210106e-03 2.0087574999136074e-03 0 2 0 -P 387 22 2.3741658257604767e-01 7.3640089833744204e-02 -8.3863686540923268e+01 8.3864054932555888e+01 0 1 0 0 0 0 -P 388 22 1.0260154843681210e-02 -2.2971575277084405e-02 -2.3710361774420765e+01 2.3710375122253165e+01 0 1 0 0 0 0 -V -119 0 8.0119424837326258e-05 -1.3313731683508782e-05 -4.5005670871262882e-01 4.5005671772315053e-01 0 2 0 -P 389 22 4.2401624770675016e-02 -5.3374706122119440e-02 -5.2723836697148852e+02 5.2723837137818316e+02 0 1 0 0 0 0 -P 390 22 2.3552360385043181e-01 7.1908758031656028e-03 -1.0339574842891241e+03 1.0339575111389108e+03 0 1 0 0 0 0 -V -120 0 -1.0574775438722866e-05 9.3918705274453874e-05 1.7646494932804896e-04 2.0299584739183731e-04 0 2 0 -P 391 22 -8.5106936416403350e-02 2.7456829559547896e-01 5.6036665343756142e-01 6.2979498716423898e-01 0 1 0 0 0 0 -P 392 22 4.2736363582437008e-02 1.0174128803230018e-01 1.4668580658605107e-01 1.8356037785023779e-01 0 1 0 0 0 0 -V -121 0 -4.3851597869865436e-05 1.0531124861711626e-04 2.7512539861286188e-04 2.9879329632975386e-04 0 2 0 -P 393 22 -2.2168226147523581e-01 5.3450139560674614e-01 1.2608632340692663e+00 1.3873034498572918e+00 0 1 0 0 0 0 -P 394 22 -2.6235155521216191e-02 6.0881532406653491e-02 2.9457331756189681e-01 3.0194086141631588e-01 0 1 0 0 0 0 -V -122 0 3.4877577943497759e-05 2.2373782240192860e-04 7.2331191609908019e-04 7.5928371084947772e-04 0 2 0 -P 395 22 -4.0112956797155415e-03 1.5481676149413653e-01 6.7269609638733785e-01 6.9029295101958354e-01 0 1 0 0 0 0 -P 396 22 1.0782252001879759e-01 5.1112676566625326e-01 1.4802027003965594e+00 1.5696739472466619e+00 0 1 0 0 0 0 -V -123 0 -3.1383658047148092e-07 -3.8483860900566085e-06 5.8223741610822792e-06 7.2589357635634373e-06 0 2 0 -P 397 22 -3.4203777351233013e-02 -7.7314876934825694e-02 2.3165639285197370e-01 2.4660124275787404e-01 0 1 0 0 0 0 -P 398 22 1.2707702234842765e-02 -1.8627834838151267e-01 1.6714412980962137e-01 2.5059582778180722e-01 0 1 0 0 0 0 -V -124 0 3.2236808159334187e-05 -4.4252594647466681e-06 7.9687775574346266e-05 8.6862496107126174e-05 0 2 0 -P 399 22 2.8048142698490619e-01 -1.6909267864752442e-03 5.3537686917943428e-01 6.0440142469161939e-01 0 1 0 0 0 0 -P 400 22 9.2426469250633983e-02 -4.9499445074743652e-02 3.8643277767653045e-01 4.0040371994231605e-01 0 1 0 0 0 0 -V -125 0 4.2009406464945751e-05 -1.2069163044297390e-05 6.3371665519486119e-05 8.0090782101313509e-05 0 2 0 -P 401 22 1.5677840685418869e-02 1.9658044984528937e-04 1.2369344343658331e-01 1.2468320368690350e-01 0 1 0 0 0 0 -P 402 22 2.4098140449885502e-01 -7.3933929715660526e-02 2.6347993526548569e-01 3.6463672273229075e-01 0 1 0 0 0 0 -V -126 0 4.1067867362733860e-05 3.2555400164699854e-05 5.5201857772271590e-05 8.2909348694607668e-05 0 2 0 -P 403 22 -4.8371529729373045e-03 6.8203982431913487e-02 6.7555697751643287e-02 9.6119475483211703e-02 0 1 0 0 0 0 -P 404 22 1.7349290496990249e-01 6.5493135264584043e-02 1.5914491837677636e-01 2.4436907309811426e-01 0 1 0 0 0 0 -V -127 0 2.2996903462980960e-06 3.5321056006164265e-07 9.0947755025366818e-06 9.7530487726669384e-06 0 2 0 -P 405 22 7.5194678532599424e-02 1.6444172407965130e-02 4.4468114488586097e-01 4.5129366392937964e-01 0 1 0 0 0 0 -P 406 22 4.2183059397594619e-02 1.5839315147350983e-03 1.9522297629404592e-02 4.6508487869585918e-02 0 1 0 0 0 0 -V -128 0 4.2478406964594337e-05 1.5680554272100167e-05 3.4601724241679823e-04 3.5122770649711978e-04 0 2 0 -P 407 22 7.0751074460728869e-02 5.8688867322594630e-02 2.8102517910808417e-01 2.9567760986873448e-01 0 1 0 0 0 0 -P 408 22 7.3374743433465395e-02 -5.4860080114057562e-03 8.9298349100003183e-01 8.9600974573741798e-01 0 1 0 0 0 0 -V -129 0 0 0 0 0 0 1 0 -P 409 130 2.5178180326027377e-01 -3.2242494783834660e-02 4.0106627287096375e+00 4.0493857073985327e+00 4.9767000000000000e-01 1 0 0 0 0 -V -130 0 9.7296294408389538e-05 -1.8057692433404323e-04 4.0892878755954612e-03 4.0976367013533495e-03 0 2 0 -P 410 22 2.2610663559113998e-02 1.5843981511661730e-02 1.7624472459684748e-01 1.7839416135329073e-01 0 1 0 0 0 0 -P 411 22 5.8407246803437063e-02 -1.6620906127341661e-01 3.2288752809096777e+00 3.2336778500954755e+00 0 1 0 0 0 0 -V -131 0 -5.9918336999371855e-06 -2.2748399729338936e-06 1.1813059477552841e-04 1.1830882340672078e-04 0 2 0 -P 412 22 -6.4079677880824115e-01 -2.9594268267928575e-01 1.2675721449920001e+01 1.2695358083139070e+01 0 1 0 0 0 0 -P 413 22 -1.4353546444437934e-01 -1.8343298954584674e-03 2.7875972997355194e+00 2.7912908303887272e+00 0 1 0 0 0 0 -V -132 0 -2.1628437162218839e-04 -1.8553738695043266e-04 4.3655499554553336e-03 4.3749458062479468e-03 0 2 0 -P 414 22 -1.8975057145655388e-01 -2.3624605238895813e-01 4.4154025237974253e+00 4.4257877178864025e+00 0 1 0 0 0 0 -P 415 22 -7.7204765374333273e-01 -5.8882294422292536e-01 1.4997827233334203e+01 1.5029224589453543e+01 0 1 0 0 0 0 -V -133 0 -1.0031594106859512e+00 -6.0662790835180747e-01 1.4756351155848559e+01 1.4803588565939812e+01 0 2 0 -P 416 -311 -5.7533254882839175e+00 -4.0301381457755010e+00 9.0395852379808090e+01 9.0669733486699556e+01 4.9767000000000000e-01 2 0 0 -165 0 -P 417 -211 -1.6323447011722816e+00 -8.8456314377591827e-01 2.1686911267723048e+01 2.1766685583656617e+01 1.3957000000000000e-01 1 0 0 0 0 -V -134 0 -2.3360926691629899e-05 -3.6259117715442567e-06 1.7025501083802078e-02 1.7025523647425003e-02 0 2 0 -P 418 22 -7.2611311153853525e-02 3.7197986780457486e-02 8.1779099887878104e+01 8.1779140583429168e+01 0 1 0 0 0 0 -P 419 22 -1.4527780310138280e-01 -7.1017137651406562e-02 7.7019024855621765e+01 7.7019194612673004e+01 0 1 0 0 0 0 -V -135 0 1.2076169997944896e-05 -1.0726917860116507e-05 3.2525658344699942e-03 3.2526134023936229e-03 0 2 0 -P 420 22 7.5246657878530437e-02 -1.4550284380572404e-01 3.7015590489964843e+01 3.7015952945424132e+01 0 1 0 0 0 0 -P 421 22 1.5872388908114299e-01 -6.2326529194992208e-02 2.6001459406053321e+01 2.6002018558447446e+01 0 1 0 0 0 0 -V -136 0 3.2332819614426833e-06 -3.0337223685055661e-05 2.7563962365646020e-03 2.7567459788091471e-03 0 2 0 -P 422 22 5.2995067612266689e-02 -1.0388453409721403e-01 1.0481693098366938e+01 1.0482341851035432e+01 0 1 0 0 0 0 -P 423 22 -3.9175857367738848e-02 -2.5778290654386461e-02 1.2992834958659103e+00 1.3001295591975057e+00 0 1 0 0 0 0 -V -137 0 3.1210382498907047e-05 -2.4228290863135666e-05 1.4586790248855876e-03 1.4593020915778690e-03 0 2 0 -P 424 22 1.4570887631797527e-01 -1.2616945494337359e-01 4.7114504656630327e+00 4.7153913197522614e+00 0 1 0 0 0 0 -P 425 22 1.1707757909111839e-01 -7.7828899667208698e-02 7.5703948639384269e+00 7.5717001322750876e+00 0 1 0 0 0 0 -V -138 0 0 0 0 0 0 1 0 -P 426 130 7.4489573882419291e-01 8.6535957172601397e-01 1.7511148478823699e+01 1.7555389865406173e+01 4.9767000000000000e-01 1 0 0 0 0 -V -139 0 0 0 0 0 0 1 0 -P 427 310 -4.7598331792509141e-01 -8.4343084301410715e-02 2.7348337649344273e+01 2.7357136573228090e+01 4.9767000000000000e-01 2 0 0 -166 0 -V -140 0 -8.3925193175608200e+01 3.9338375119302427e+01 8.7963531058230437e+03 8.7970466296407194e+03 0 2 0 -P 428 -211 -4.8915716729371289e-01 3.5379275820838541e-01 4.0094024505926598e+01 4.0098812013784375e+01 1.3957000000000000e-01 1 0 0 0 0 -P 429 211 -2.0594778188345286e-01 -2.7975227103050119e-02 3.2761197474600237e+01 3.2762154032615854e+01 1.3957000000000000e-01 1 0 0 0 0 -V -141 0 -2.3066035847172713e-06 2.2622629018241768e-05 2.6857264600342206e-03 2.6858397352112653e-03 0 2 0 -P 430 22 5.3127791655494534e-02 1.2374417391665785e-01 1.4536463780597019e+01 1.4537087549692799e+01 0 1 0 0 0 0 -P 431 22 -8.5701044998682224e-02 1.9572668409402283e-01 2.3390663781688637e+01 2.3391639655055833e+01 0 1 0 0 0 0 -V -142 0 7.4745864093440425e-06 9.3134989752651984e-06 9.7003591521736574e-05 9.8074817718559216e-05 0 2 0 -P 432 22 -5.3080603537296158e-03 6.2270797239337615e-02 7.9227269487634211e-01 7.9473382383044622e-01 0 1 0 0 0 0 -P 433 22 1.2915793110420093e-01 9.2048864231064606e-02 8.1502456738822093e-01 8.3031307951862532e-01 0 1 0 0 0 0 -V -143 0 1.6683368743087236e-04 1.0854011843115621e-04 8.8202948366584450e-03 8.8226093028841972e-03 0 2 0 -P 434 22 4.7366546711335589e-01 2.6593638108134854e-01 2.6023432393861224e+01 2.6029101303951776e+01 0 1 0 0 0 0 -P 435 22 1.7119797565636166e-01 1.5360451337469549e-01 8.0697161914225859e+00 8.0729934041534896e+00 0 1 0 0 0 0 -V -144 0 1.7954480389756124e-04 7.7724415131910377e-05 6.2927154370721232e-03 6.2958241174259407e-03 0 2 0 -P 436 22 1.1422002392478928e-01 6.4918508167836715e-03 4.3441170283238124e+00 4.3456232135063573e+00 0 1 0 0 0 0 -P 437 22 7.1395691893479074e-01 3.5202350085120604e-01 2.4681962924026539e+01 2.4694795986407076e+01 0 1 0 0 0 0 -V -145 0 -1.9609651427977344e-05 -7.4782511180791459e-06 3.8410389939440802e-04 3.8635884505955950e-04 0 2 0 -P 438 22 -1.0729773963663858e-01 -3.0268391562004265e-02 8.2224722500628999e-01 8.2977073911377908e-01 0 1 0 0 0 0 -P 439 22 3.3797644432614085e-02 2.2387159118688409e-03 6.1743533525827154e-01 6.1836371646759947e-01 0 1 0 0 0 0 -V -146 0 5.2131973766054339e-06 4.1070866662282870e-06 1.4937262112277159e-04 1.4956090324421662e-04 0 2 0 -P 440 22 1.8118299159397690e-02 2.9575529460455215e-02 2.1818118251376073e+00 2.1820874925212306e+00 0 1 0 0 0 0 -P 441 22 1.8302887004733309e-01 1.2889321762858399e-01 3.5816146721340854e+00 3.5886037240781548e+00 0 1 0 0 0 0 -V -147 0 6.1675119851635953e+00 -3.2443224410695379e+01 3.3447693202227225e+02 3.3624566849186726e+02 0 2 0 -P 442 -211 1.7168112378432487e-01 -6.2348686049339996e-01 4.8195537594747444e+00 4.8647495823360636e+00 1.3957000000000000e-01 1 0 0 0 0 -P 443 211 1.4202736966257906e-01 -1.0267272091220803e+00 1.2193506724211735e+01 1.2238277107255811e+01 1.3957000000000000e-01 1 0 0 0 0 -V -148 0 0 0 0 0 0 2 0 -P 444 211 -1.8843760989747041e-01 -5.7132487376221974e-01 7.0005634871052020e+00 7.0277514018421163e+00 1.3957000000000000e-01 1 0 0 0 0 -P 445 -211 2.1778470945671029e-02 -2.4462331826562256e-01 9.8717902473717956e-01 1.0267994358281778e+00 1.3957000000000000e-01 1 0 0 0 0 -V -149 0 3.3815872655375920e-05 -8.8706576341638220e-05 1.2225849291934955e-03 1.2273011627084497e-03 0 2 0 -P 446 22 4.1946401175051981e-02 -2.3452337052872346e-01 2.8068387162995183e+00 2.8169317157527307e+00 0 1 0 0 0 0 -P 447 22 4.8588031729018710e-02 -2.9686399776247515e-03 4.6635888441359208e-01 4.6889254496324323e-01 0 1 0 0 0 0 -V -150 0 -2.2719145518260682e-06 -7.2370955710423777e-06 3.6860335163427627e-05 3.7773350362741714e-05 0 2 0 -P 448 22 -2.8163592205792350e-03 -2.1581075512772691e-01 1.0509549888338077e+00 1.0728879729322758e+00 0 1 0 0 0 0 -P 449 22 -9.1354270497869719e-02 -8.4166128558272837e-02 4.7690219716075166e-01 4.9281360126465479e-01 0 1 0 0 0 0 -V -151 0 5.9843090047528281e-05 1.4190501461534226e-05 4.7124887992592318e-05 8.8409686466827799e-05 0 2 0 -P 450 22 2.0924146209939254e-01 4.3206977463747263e-02 1.2033302804903956e-01 2.4521188797139343e-01 0 1 0 0 0 0 -P 451 22 -1.9531428350450693e-02 1.7786760017401684e-03 2.9058724355280816e-02 3.5057807160233830e-02 0 1 0 0 0 0 -V -152 0 1.0195251485624900e-05 -6.1441143182856532e-06 -2.1372642871293361e-04 2.1411731095032145e-04 0 2 0 -P 452 22 1.9533270339594799e-01 -1.0471989149621931e-01 -4.8287806447212560e+00 4.8338642549750723e+00 0 1 0 0 0 0 -P 453 22 7.6955925907224484e-02 -5.9373409033625792e-02 -8.7929594389071397e-01 8.8465178074493211e-01 0 1 0 0 0 0 -V -153 0 -4.3180098738504445e-06 3.6940653122024246e-05 -1.1210974792840959e-03 1.1221856762077622e-03 0 2 0 -P 454 22 -7.1590286058456104e-02 5.2136269562120231e-02 -1.7161269640007177e+00 1.7184106366733500e+00 0 1 0 0 0 0 -P 455 22 5.3670388799414187e-02 1.0116877789444984e-01 -2.9364681511251565e+00 2.9387005350710602e+00 0 1 0 0 0 0 -V -154 0 -6.2729864115820472e-05 3.8527483842666313e-06 -7.1346638364952423e-03 7.1350986443538779e-03 0 2 0 -P 456 22 -6.4640508041547584e-02 -3.2289955193366408e-02 -3.2563504549031794e+00 3.2571520261778351e+00 0 1 0 0 0 0 -P 457 22 -1.1367821570845126e-01 4.3241950459031744e-02 -1.7024964794881363e+01 1.7025399227916957e+01 0 1 0 0 0 0 -V -155 0 -3.5839923770696304e-05 -5.3781827995199834e-05 -5.0483021503518492e-03 5.0487597996870161e-03 0 2 0 -P 458 22 -1.7396435578211061e-01 -1.7417492837193710e-01 -1.5179023412587368e+01 1.5181019473758385e+01 0 1 0 0 0 0 -P 459 22 -5.5639920627447256e-02 -1.7037205726974725e-01 -1.7162333386727944e+01 1.7163269202452724e+01 0 1 0 0 0 0 -V -156 0 4.5507577628584387e-06 1.9190966414477778e-05 9.0194798894498126e-06 2.2478153082292885e-05 0 2 0 -P 460 22 5.3961060971557492e-02 7.9158052349659946e-02 -1.0977173258833227e-03 9.5807089175567753e-02 0 1 0 0 0 0 -P 461 22 4.9996200145225052e-02 3.5923933344749981e-01 2.0713822197716783e-01 4.1768260884148362e-01 0 1 0 0 0 0 -V -157 0 -5.1581249311847977e-06 -1.1016643111822161e-05 -1.5916397208488843e-05 2.0083167502314703e-05 0 2 0 -P 462 22 -3.1716501142518883e-01 -5.8150051590051388e-01 -7.7670585418244320e-01 1.0207881652851305e+00 0 1 0 0 0 0 -P 463 22 -1.7159394224262578e-01 -4.6238326591962625e-01 -7.3145491151569741e-01 8.8219558670246279e-01 0 1 0 0 0 0 -V -158 0 0 0 0 0 0 1 0 -P 464 310 5.4533423118825564e-01 -2.1932503402815775e+00 -4.1527351550146987e+00 4.7540110617715117e+00 4.9767000000000000e-01 2 0 0 -167 0 -V -159 0 -2.9899249577558377e-04 -2.0228382203658472e-05 -1.1079387539825041e-04 3.2221826826116836e-04 0 2 0 -P 465 22 -8.3346775443643040e-01 -4.8634651175075268e-02 -3.5562649196823404e-01 9.0747122751625553e-01 0 1 0 0 0 0 -P 466 22 -1.3303388673837305e-01 -1.6754162505457412e-02 -2.5178224124823680e-03 1.3410837562090722e-01 0 1 0 0 0 0 -V -160 0 3.8723550913267867e-05 1.2516057721069469e-04 1.2893485008857004e-03 1.2961934460564023e-03 0 2 0 -P 467 22 9.4494307196249280e-02 1.2938868819578370e-01 1.7092391437658199e+00 1.7167320866421871e+00 0 1 0 0 0 0 -P 468 22 1.3186361989659259e-01 6.0223555965823572e-01 5.8276278810181124e+00 5.8601469608866257e+00 0 1 0 0 0 0 -V -161 0 0 0 0 0 0 1 0 -P 469 130 5.0093079509551341e-01 -1.6736784839411437e-01 6.2499799234045614e+00 6.2919685417213573e+00 4.9767000000000000e-01 1 0 0 0 0 -V -162 0 1.1030443660979173e-04 -2.8860204694531712e-05 5.9693928234557251e-05 1.3299857732767785e-04 0 2 0 -P 470 22 2.5718881712629815e-01 -1.7110260067217876e-02 7.9616960930951566e-02 2.6977344035740969e-01 0 1 0 0 0 0 -P 471 22 1.8665769195734039e-01 -9.9018351789270556e-02 1.6058137083810370e-01 2.6539047574875341e-01 0 1 0 0 0 0 -V -163 0 0 0 0 0 0 1 0 -P 472 310 4.7336032540883582e-01 1.9957792363092278e-01 3.8244208976342740e+01 3.8250896682304671e+01 4.9767000000000000e-01 2 0 0 -168 0 -V -164 0 5.0645331992271131e-05 2.4931089480602684e-04 3.5585773943948317e-03 3.5682115136422437e-03 0 2 0 -P 473 22 5.6913977335912823e-02 7.9267004492891840e-02 9.6228112476905237e-01 9.6721632632222521e-01 0 1 0 0 0 0 -P 474 22 5.2001694195469371e-02 4.5689027713045866e-01 6.6906422812036404e+00 6.7064258019130722e+00 0 1 0 0 0 0 -V -165 0 -1.0031594106859512e+00 -6.0662790835180747e-01 1.4756351155848559e+01 1.4803588565939812e+01 0 1 0 -P 475 130 -5.7533254882839175e+00 -4.0301381457755010e+00 9.0395852379808090e+01 9.0669733486699556e+01 4.9767000000000000e-01 1 0 0 0 0 -V -166 0 -2.1954338730932741e+00 -3.8902553359153652e-01 1.2614195621370837e+02 1.2618254052583406e+02 0 2 0 -P 476 -211 -3.8419677861900481e-01 1.0373514257599888e-01 1.3727450016645596e+01 1.3733926310014542e+01 1.3957000000000000e-01 1 0 0 0 0 -P 477 211 -9.1786539306086476e-02 -1.8807822687740958e-01 1.3620887632698674e+01 1.3623210263213544e+01 1.3957000000000000e-01 1 0 0 0 0 -V -167 0 6.0843234933367697e+01 -2.4470212594333566e+02 -4.6332290584815917e+02 5.3040758376185750e+02 0 2 0 -P 478 211 4.3923811914830291e-01 -1.9192225167157120e+00 -3.3556575631746446e+00 3.8931045015736121e+00 1.3957000000000000e-01 1 0 0 0 0 -P 479 -211 1.0609611203995273e-01 -2.7402782356586536e-01 -7.9707759184005411e-01 8.6090656019789924e-01 1.3957000000000000e-01 1 0 0 0 0 -V -168 0 1.7832638234533317e+01 7.5185872593688456e+00 1.4407526500071178e+03 1.4410045922055583e+03 0 2 0 -P 480 211 -1.6780378320731124e-02 1.2970062371486263e-02 4.2224922518224925e+00 4.2248515246355689e+00 1.3957000000000000e-01 1 0 0 0 0 -P 481 -211 4.9014070372956692e-01 1.8660786125943651e-01 3.4021716724520246e+01 3.4026045157669103e+01 1.3957000000000000e-01 1 0 0 0 0 -BlockType GenEvent -E 7 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 146 0 0 -V -1 0 0 0 0 0 1 2 0 -P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -1 0 -P 3 2 9.5585977786327769e-02 7.9414932775068517e-02 2.4315489624226007e+02 2.4315492799858069e+02 0 3 0 0 -3 0 -P 24 2101 -9.5585977786327769e-02 -7.9414932775068517e-02 6.5004858943937879e+03 6.5004859213968966e+03 5.7933000000000001e-01 2 0 0 -17 0 -V -2 0 0 0 0 0 1 3 0 -P 2 2212 0 0 -6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -2 0 -P 4 21 -3.1839018050093307e-03 5.0554804870918790e-01 -2.5725369994220681e+01 2.5730337158815754e+01 0 3 0 0 -4 0 -P 12 2101 3.8701429021918715e-01 -2.0438006852161128e-01 -5.1057965796384815e+03 5.1057966312635817e+03 5.7933000000000001e-01 2 0 0 -9 0 -P 33 2 -3.8383038841417783e-01 -3.0116798018757662e-01 -1.4059242432952470e+02 1.4059365813141250e+02 3.3000000000000002e-01 2 0 0 -17 0 -V -3 0 0 0 0 0 0 3 0 -P 5 2 -2.1264769648708381e-01 8.3899334394629999e-01 2.3005421402360733e+02 2.3005584217509832e+02 0 3 0 0 -5 0 -P 25 21 -3.6511185605667584e-03 -1.4425395575640334e+00 8.1652186717378754e+00 8.2916662778419035e+00 0 2 0 0 -17 0 -P 26 21 2.9593935486652639e-01 6.8709099958216890e-01 4.0361549279216140e+00 4.1049020384963599e+00 0 2 0 0 -17 0 -V -4 0 0 0 0 0 0 4 0 -P 6 -3 -1.9831035912957480e+00 8.3830206726540324e-01 -1.1595024534665217e+01 1.1793220262900215e+01 0 3 0 0 -5 0 -P 11 3 -2.8557959363283214e-01 -1.4780078065351945e+00 -1.0810465318999622e+01 1.0926217240828231e+01 5.0000000000000000e-01 2 0 0 -9 0 -P 31 21 1.2172273336784700e+00 -4.7627796523471329e-02 -9.7231787370062306e-01 1.5586253033918638e+00 0 2 0 0 -17 0 -P 32 21 1.0642173874125529e+00 1.1887517313130824e+00 -1.4482536478625649e+00 2.1547918588388710e+00 0 2 0 0 -17 0 -V -5 0 0 0 0 0 0 2 0 -P 7 22 1.4000883323926923e+00 -8.2378971281789837e-02 8.3381755872705611e+01 8.3393550386399113e+01 0 3 0 0 -6 0 -P 8 24 -3.5958396201755241e+00 1.7596743824934931e+00 1.3507743361623650e+02 1.5845551205159941e+02 8.2741825642653993e+01 3 0 0 -7 0 -V -6 0 0 0 0 0 0 1 0 -P 9 22 1.4000883323926923e+00 -8.2378971281789837e-02 8.3381755872705611e+01 8.3393550386399113e+01 0 1 0 0 0 0 -V -7 0 0 0 0 0 0 1 0 -P 10 24 -3.5958396201755241e+00 1.7596743824934931e+00 1.3507743361623650e+02 1.5845551205159941e+02 8.2741825642653993e+01 2 0 0 -8 0 -V -8 0 0 0 0 0 0 7 0 -P 13 2 -4.9357754672154250e+00 1.4347517927759370e+00 5.9322107559486689e+01 5.9545291480258513e+01 3.3000000000000002e-01 2 0 0 -11 0 -P 14 21 -6.6611694690988275e+00 2.4614122585280231e+00 7.0400917686742488e+01 7.0758172249839646e+01 0 2 0 0 -11 0 -P 15 21 -1.1364538745352168e+00 -8.4363652633784314e-01 1.5206113213728849e+00 2.0773802704860946e+00 0 2 0 0 -11 0 -P 16 21 -7.0207935266386619e+00 -9.6120038752047388e-01 5.9385495803026025e+00 9.2456378388066369e+00 0 2 0 0 -11 0 -P 17 21 1.9233062830932506e+00 -9.9992930184166651e-01 2.0384347101481007e-01 2.1772730255856527e+00 0 2 0 0 -11 0 -P 18 21 6.5191036641582967e+00 1.4569596471037023e+00 -1.4166998204938244e+00 6.8285051349997472e+00 0 2 0 0 -11 0 -P 19 -3 7.7159427700610506e+00 -7.8868310021418342e-01 -8.9189618218918798e-01 7.8232520516230650e+00 5.0000000000000000e-01 2 0 0 -11 0 -V -9 0 0 0 0 0 0 1 0 -P 38 92 1.0143469658635501e-01 -1.6823878750568058e+00 -5.1166070449574809e+03 5.1167228485044097e+03 3.4383356156668995e+01 2 0 0 -10 0 -V -10 0 0 0 0 0 0 8 0 -P 39 -313 -2.1040013596164128e-01 -5.8425235058654956e-01 -1.1872843281185203e+01 1.1925692262405972e+01 9.3386794122427452e-01 2 0 0 -23 0 -P 40 113 -2.6276647691303950e-01 -5.6521457952856013e-01 -1.1962401435561386e+01 1.1993068060118460e+01 5.8831934084434256e-01 2 0 0 -24 0 -P 41 -211 2.1202252232348538e-02 1.2037186058540997e-01 -3.8928936098051310e+01 3.8929378166513047e+01 1.3957000000000000e-01 1 0 0 0 0 -P 42 2114 -3.0865407405585576e-01 -4.5752156743261424e-01 -6.0439787274539817e+01 6.0455579370402425e+01 1.2667272387158715e+00 2 0 0 -25 0 -P 43 223 7.5934744704867152e-01 -4.5802192101885630e-02 -7.5778630043207073e+01 7.5786642607491785e+01 7.9732057812523760e-01 2 0 0 -26 0 -P 44 -3114 -4.7130125309522669e-01 -3.6998042550758815e-02 -1.6236037253483892e+02 1.6236696425649211e+02 1.3845643686705831e+00 2 0 0 -27 0 -P 45 -311 3.9338164815186982e-01 1.5120222274855744e-01 -1.5841292434872400e+02 1.5841426667878346e+02 4.9767000000000000e-01 2 0 0 -28 0 -P 46 2112 1.8062528917922832e-01 -2.6417322619040490e-01 -4.5968511499413735e+03 4.5968512571022029e+03 9.3957000000000002e-01 1 0 0 0 0 -V -11 0 0 0 0 0 0 1 0 -P 47 92 -3.5958396201755329e+00 1.7596743824934951e+00 1.3507743361623648e+02 1.5845551205159936e+02 8.2741825642653964e+01 2 0 0 -12 0 -V -12 0 0 0 0 0 0 19 0 -P 48 213 -4.6020701303904872e+00 1.4837736955946597e+00 4.4190052474360535e+01 4.4457621785313627e+01 5.8203372280644805e-01 2 0 0 -29 0 -P 49 111 6.6697298340082936e-02 -2.7309372095162640e-02 1.5613189066221931e+00 1.5687991139677566e+00 1.3497999999999999e-01 2 0 0 -30 0 -P 50 -213 -1.2537860530518419e+00 6.3570399222428886e-01 2.3101138766532216e+01 2.3148198586365478e+01 4.4764545197942257e-01 2 0 0 -31 0 -P 51 223 -4.9718024532112670e+00 1.2416775214387061e+00 4.4371163546531150e+01 4.4672913013609495e+01 7.8001278675560926e-01 2 0 0 -32 0 -P 52 211 2.0193990881854440e-01 1.9756624416254592e-01 8.6476093093118023e-01 9.2038220331072151e-01 1.3957000000000000e-01 1 0 0 0 0 -P 53 3112 -7.0584972907924126e-01 -6.5661601113311763e-02 9.0004313706404595e+00 9.1073685934583164e+00 1.1974400000000001e+00 2 0 0 -33 0 -P 54 -3212 -1.3667402501295773e+00 -6.0384937118763382e-01 5.0703170378781293e+00 5.4187547777607730e+00 1.1925500000000000e+00 2 0 0 -34 0 -P 55 211 -2.6364081709202364e-01 7.3413299932848253e-01 2.6874106938374962e+00 2.8018054470987304e+00 1.3957000000000000e-01 1 0 0 0 0 -P 56 -213 -3.4695940866764934e+00 -5.0692299600103696e-01 3.4058985381402325e+00 4.9419726631930434e+00 7.2656376283600244e-01 2 0 0 -35 0 -P 57 111 -2.2664032636498591e-01 -6.4174781661402613e-01 5.5446080822234844e-01 8.8817368004139652e-01 1.3497999999999999e-01 2 0 0 -36 0 -P 58 113 -5.0290045956692175e-01 -2.2402253400552827e-02 4.2604824703776056e-01 1.0487762353368946e+00 8.1547762066989726e-01 2 0 0 -37 0 -P 59 213 -1.2005200767227959e+00 6.2152297680195367e-02 1.6050487128422106e+00 2.2598983813267526e+00 1.0420402874195425e+00 2 0 0 -38 0 -P 60 -213 -2.9276047393825264e-02 -5.2442944213790954e-01 9.3491138108836302e-02 9.6897732639620227e-01 8.0888388501252917e-01 2 0 0 -39 0 -P 61 213 4.8741035118588283e-01 -5.4382265811505015e-01 -2.1420018845659008e-01 9.8970129623833414e-01 6.3270451327498556e-01 2 0 0 -40 0 -P 62 -211 1.8697788601233423e-01 4.2760734454290197e-02 -2.6920172278503485e-01 3.5880156454388884e-01 1.3957000000000000e-01 1 0 0 0 0 -P 63 211 1.2983839367590966e-01 -2.1540737154801419e-02 3.5452183158205530e-01 4.0309741477440403e-01 1.3957000000000000e-01 1 0 0 0 0 -P 64 311 4.6391648249289439e+00 8.7190463208380886e-01 -2.7041866263032449e-01 4.7542475369195865e+00 4.9767000000000000e-01 2 0 0 -41 0 -P 65 -323 2.2512956578581989e+00 -8.1702811801166697e-01 -6.8930905945599441e-01 2.6161470913906841e+00 7.9574590142266011e-01 2 0 0 -42 0 -P 66 323 7.0336564886840316e+00 2.6471663135766954e-01 -7.6549975370238721e-01 7.1298753405532898e+00 8.4067473090788580e-01 2 0 0 -43 0 -V -13 0 0 0 0 0 2 1 0 -P 20 3 2.9480913835759774e+00 -4.2454566557718891e+00 -4.1875620167901211e+01 4.2193396514955836e+01 0 2 0 0 -13 0 -P 21 -3 -2.9480913835759774e+00 4.2454566557718891e+00 -1.4413638757204703e+02 1.4422903094502612e+02 0 2 0 0 -13 0 -P 67 92 0 0 -1.8601200773994825e+02 1.8642242745998198e+02 1.2363431426010967e+01 2 0 0 -14 0 -V -14 0 0 0 0 0 0 7 0 -P 68 -313 6.7124336041434551e-01 -1.0017568531182413e+00 -1.2051454636583410e+01 1.2140615058432582e+01 8.3838576904817708e-01 2 0 0 -44 0 -P 69 111 1.8807531206737291e+00 -2.0970278275644705e+00 -2.6588570500903835e+01 2.6737708557249952e+01 1.3497999999999999e-01 2 0 0 -45 0 -P 70 113 -1.1068971892740748e-01 -5.1341043207208503e-01 -9.0115038018838742e+00 9.0608170742198180e+00 7.8445063290764161e-01 2 0 0 -46 0 -P 71 223 -2.0672406052829917e-01 1.7379335103852600e-01 -1.3130580146872006e+01 1.3156750961396625e+01 7.8423332032961013e-01 2 0 0 -47 0 -P 72 113 -4.4140526611159947e-01 5.7742869906215955e-01 -2.4813075874939347e+01 2.4836133069027387e+01 7.8518082980101878e-01 2 0 0 -48 0 -P 73 -211 7.7896309901419436e-02 -3.6602920137854170e-02 -1.3397448490641568e+00 1.3497420695647062e+00 1.3957000000000000e-01 1 0 0 0 0 -P 74 323 -1.8710737454221880e+00 2.8975759827919654e+00 -9.9077077929701588e+01 9.9140660670090867e+01 8.4045432777846174e-01 2 0 0 -49 0 -V -15 0 0 0 0 0 2 1 0 -P 22 3 -2.3797373606868244e+00 -2.4917871101526390e+00 -4.3280761946634883e+00 5.5321240455167233e+00 0 2 0 0 -15 0 -P 23 -3 2.3797373606868244e+00 2.4917871101526390e+00 -9.6661085500222009e+02 9.6661699610602295e+02 0 2 0 0 -15 0 -P 75 92 0 0 -9.7093893119688357e+02 9.7214912015153971e+02 4.8492305551150785e+01 2 0 0 -16 0 -V -16 0 0 0 0 0 0 9 0 -P 76 -323 -2.2398361126526320e+00 -2.4341442137074423e+00 -4.8632735500917565e+00 5.9530803627759008e+00 9.1968055213627808e-01 2 0 0 -50 0 -P 77 111 -6.7528675734192661e-02 -1.2563759364867366e-01 -1.7655103539140375e+00 1.7763984173495295e+00 1.3497999999999999e-01 2 0 0 -51 0 -P 78 113 1.5354061763556762e-01 6.2318321309839064e-01 -1.0151106705392891e+01 1.0185911304933418e+01 5.4395747016322149e-01 2 0 0 -52 0 -P 79 111 -1.6671670434852973e-01 -5.1368748512571094e-01 -7.9559061682556891e+00 7.9753577882357432e+00 1.3497999999999999e-01 2 0 0 -53 0 -P 80 211 -9.6736485997603927e-02 5.1279243800840213e-01 -4.1217511496160233e+00 4.1569972764560212e+00 1.3957000000000000e-01 1 0 0 0 0 -P 81 111 4.4784540883304857e-02 -6.3293049003740509e-01 -2.8876930883969312e+01 2.8884216512452983e+01 1.3497999999999999e-01 2 0 0 -54 0 -P 82 -211 -1.1552696499474494e-01 2.9652397766424610e-01 -1.5381300035866197e+01 1.5385224844870098e+01 1.3957000000000000e-01 1 0 0 0 0 -P 83 213 1.3734383108429742e+00 1.9976391213286977e+00 -5.6939502407682789e+02 5.6940054246694490e+02 6.3829722452204496e-01 2 0 0 -55 0 -P 84 313 1.1145814743658564e+00 2.7626103241949523e-01 -3.2842812827294995e+02 3.2843139117752128e+02 9.0810677110516835e-01 2 0 0 -56 0 -V -17 0 0 0 0 0 4 1 0 -P 27 21 -3.2798144322212153e+00 8.7986496652623636e-01 2.4766780065185029e+02 2.4769107942110830e+02 0 2 0 0 -17 0 -P 28 21 3.2798144322212153e+00 -8.7986496652623636e-01 5.5985508273586087e+00 6.5479093179154937e+00 0 2 0 0 -17 0 -P 29 21 -3.7733390949497778e+00 9.0629369874865717e-01 -3.3241294584168473e+00 5.1097253204240456e+00 0 2 0 0 -17 0 -P 30 21 3.7733390949497778e+00 -9.0629369874865717e-01 -1.2185775397046967e+01 1.2788767658423664e+01 0 2 0 0 -17 0 -P 85 92 2.0943165911964767e+00 5.0924638451013138e-03 6.6074307187661043e+03 6.9293270467247485e+03 2.0874453839536136e+03 2 0 0 -18 0 -V -18 0 0 0 0 0 0 36 0 -P 86 113 2.9356129599336628e-01 -4.3313617556154632e-01 1.5897828498253559e+03 1.5897830714807062e+03 6.5649266342745860e-01 2 0 0 -57 0 -P 87 2112 -1.1641820817776909e-01 7.5916177472945279e-01 1.5838148551780225e+03 1.5838153200907500e+03 9.3957000000000002e-01 1 0 0 0 0 -P 88 113 2.7160958203151061e-02 -4.0515716778460686e-01 1.6165720701806258e+03 1.6165722765277476e+03 7.0870302833514009e-01 2 0 0 -58 0 -P 89 111 -1.4385672069497962e-01 9.5872413866507322e-01 7.8787988037092839e+02 7.8788048837348356e+02 1.3497999999999999e-01 2 0 0 -59 0 -P 90 -2214 -3.6919767591725938e-01 -8.0507840752899340e-01 8.0872498075085002e+02 8.0872637466061587e+02 1.2124863189911272e+00 2 0 0 -60 0 -P 91 211 3.5761092944521689e-01 -5.0085597321715558e-01 3.0003167406315214e+01 3.0009803006335137e+01 1.3957000000000000e-01 1 0 0 0 0 -P 92 2114 -9.8516795397972409e-02 -1.4151599991198704e-01 6.0200362965077282e+01 6.0212675769296112e+01 1.2053587989159509e+00 2 0 0 -61 0 -P 93 223 -6.6801252072040476e-02 3.4914305837557824e-01 1.7318687060519537e+01 1.7340112417543374e+01 7.8499291101563418e-01 2 0 0 -62 0 -P 94 223 1.0880283197397357e-01 -1.1874086178082427e-01 5.9048803867980695e+00 5.9574951798301630e+00 7.7343324650876888e-01 2 0 0 -63 0 -P 95 223 -1.1326999883260454e-01 -3.7014701840945025e-01 2.2018767133093363e+01 2.2035600678331608e+01 7.6925436990825247e-01 2 0 0 -64 0 -P 96 211 1.7074748485127106e-02 3.1351296613888224e-01 1.0137555013396343e+01 1.0143376329482720e+01 1.3957000000000000e-01 1 0 0 0 0 -P 97 221 -2.4049267933068028e-01 -5.2371012095719160e-01 1.4536298958950805e+01 1.4558014904034785e+01 5.4744999999999999e-01 2 0 0 -65 0 -P 98 -211 -2.7609773133260801e-01 -5.7044915366057758e-01 6.8816596070175269e+00 6.9121893004977597e+00 1.3957000000000000e-01 1 0 0 0 0 -P 99 211 -3.2003753499352694e-01 5.9754365375792062e-01 1.9274593244220643e+01 1.9287013946098735e+01 1.3957000000000000e-01 1 0 0 0 0 -P 100 223 -3.4604842053761919e-01 3.1486430485676520e-01 6.2632131591575501e+01 6.2638853372545277e+01 7.8940172470456005e-01 2 0 0 -66 0 -P 101 111 2.2948981413776891e-02 5.5605194404662266e-02 1.1648969035652028e+00 1.1742329367414746e+00 1.3497999999999999e-01 2 0 0 -67 0 -P 102 111 -2.9172378240014335e-01 3.0693544637119191e-01 5.3046712918767929e+00 5.3232573908011185e+00 1.3497999999999999e-01 2 0 0 -68 0 -P 103 -213 3.2106496746452690e-01 2.1715005346640492e-01 1.8335690284947212e+01 1.8357740097185115e+01 8.1169353282945367e-01 2 0 0 -69 0 -P 104 211 -4.1566685736877346e-01 -2.4857973476376449e-01 7.6291201423937034e+00 7.6457520724142878e+00 1.3957000000000000e-01 1 0 0 0 0 -P 105 221 -2.5513573334891759e-01 3.0928061930424477e-01 4.8173473574429913e+01 4.8178252422360707e+01 5.4744999999999999e-01 2 0 0 -70 0 -P 106 223 -7.4215211736769937e-01 -2.4846169610654173e-01 2.0946282884976224e+01 2.0974976715559247e+01 7.6834792969024879e-01 2 0 0 -71 0 -P 107 113 2.4449291316315186e-01 -4.2766229921875031e-02 1.6107139368476123e+01 1.6128248722013453e+01 7.8667812261840997e-01 2 0 0 -72 0 -P 108 223 4.7207387017201917e-02 -3.2716583505686320e-01 2.1203916701555983e+00 2.2765517765484846e+00 7.5984283600187197e-01 2 0 0 -73 0 -P 109 -2212 9.4887946882507612e-01 4.1648238312682367e-01 3.2378432709009703e+00 3.5267278689504029e+00 9.3827000000000005e-01 1 0 0 0 0 -P 110 223 1.6600334088172941e-01 -4.1616381624079307e-01 2.6794215643440502e+00 2.8255103226053060e+00 7.7682638507277058e-01 2 0 0 -74 0 -P 111 2212 1.5707280006131925e+00 1.9053939806349487e-01 4.0977610121829917e+00 4.4917132165791367e+00 9.3827000000000005e-01 1 0 0 0 0 -P 112 221 -1.1579086126404439e+00 9.9177839411389315e-02 -7.1473619559073187e-01 1.4700809266311647e+00 5.4744999999999999e-01 2 0 0 -75 0 -P 113 -213 -1.0802536131659559e+00 -4.3742284486781746e-02 -8.7239930641296504e-01 1.8065991907361469e+00 1.1549280626638436e+00 2 0 0 -76 0 -P 114 -311 -1.2221059279354842e+00 7.8797526225771200e-02 -6.0729148702831515e-01 1.4547268913275133e+00 4.9767000000000000e-01 2 0 0 -77 0 -P 115 323 1.7061356136889678e+00 -2.9014219266128297e-02 -5.6916355500633795e+00 6.0003241000917313e+00 8.3512484945562682e-01 2 0 0 -78 0 -P 116 -213 5.0727937246066324e-01 -4.7763269349581511e-01 -1.4192395564892897e+00 1.7279116972796664e+00 6.9711732389306924e-01 2 0 0 -79 0 -P 117 113 1.8377335751287966e+00 3.7435212119187783e-01 -6.4021253801990987e+00 6.7571572558931825e+00 1.0745048130573336e+00 2 0 0 -80 0 -P 118 113 1.1595987846627662e+00 3.3781193392132147e-01 -1.7297809040002605e+00 2.3075689039392140e+00 9.3485080440263357e-01 2 0 0 -81 0 -P 119 211 2.7239080429789903e-01 -2.2711690982550835e-02 -1.2958981254113522e-01 3.3314542708521427e-01 1.3957000000000000e-01 1 0 0 0 0 -P 120 113 2.1267666995458101e-01 1.7395120076323969e-01 -1.6083970877226670e+00 1.8184518290999967e+00 8.0270509950570113e-01 2 0 0 -82 0 -P 121 221 -4.7135039096220882e-01 -1.2291206979554646e-01 -1.3887351759484287e+02 1.3887545092360841e+02 5.4744999999999999e-01 2 0 0 -83 0 -V -19 0 0 0 0 0 2 1 0 -P 34 21 -1.7804898284392838e+00 -2.5209727458596531e+00 -1.6027171333206104e+02 1.6030142713653206e+02 0 2 0 0 -19 0 -P 35 21 1.7804898284392838e+00 2.5209727458596531e+00 -3.9047632682122253e+00 4.9772104431420550e+00 0 2 0 0 -19 0 -P 122 92 0 0 -1.6417647660027328e+02 1.6527863757967410e+02 1.9055512885072925e+01 2 0 0 -20 0 -V -20 0 0 0 0 0 0 12 0 -P 123 -211 -6.0070155236750178e-01 3.1318832669430013e-01 -2.3722419674713313e+00 2.4710202387124545e+00 1.3957000000000000e-01 1 0 0 0 0 -P 124 -313 -5.5418962740188848e-01 5.6022873335349721e-01 -2.6963373036122778e+01 2.6989313170610149e+01 8.8235908753902637e-01 2 0 0 -84 0 -P 125 -3122 7.8192980547996760e-01 -1.0098791190461021e+00 -2.5752937819053422e+01 2.5808715935323384e+01 1.1156800000000000e+00 2 0 0 -85 0 -P 126 2112 -5.2911926360048755e-01 -7.0628422357488740e-01 -3.1365989018949879e+01 3.1392465075577743e+01 9.3957000000000002e-01 1 0 0 0 0 -P 127 -313 -6.6375047799976095e-01 -5.2431994602761678e-01 -3.0745812034728321e+01 3.0766432948134987e+01 7.4361453347412232e-01 2 0 0 -86 0 -P 128 323 -1.0010822452572499e-01 2.3468051859673056e-01 -2.0435238020895113e+01 2.0455561586261695e+01 8.7518582957059732e-01 2 0 0 -87 0 -P 129 -2212 7.6440809257191722e-01 -3.6826018672418046e-03 -3.6284282265723400e+00 3.8249412128597280e+00 9.3827000000000005e-01 1 0 0 0 0 -P 130 331 -2.1598897730547920e-01 3.8740437897781693e-01 -2.8085273570100782e+00 3.0002184788953326e+00 9.5747146947695072e-01 2 0 0 -88 0 -P 131 2114 3.7114271301432933e-01 1.6103528252915164e-01 -3.1873923166002567e+00 3.4301830299056255e+00 1.2012520814081056e+00 2 0 0 -89 0 -P 132 213 1.4340847993733810e-01 8.3134947437200180e-01 -7.5071475809012984e+00 7.6369252082162546e+00 1.1196668673315859e+00 2 0 0 -90 0 -P 133 111 2.5133273495763248e-01 1.9971281449766987e-01 -1.8807651137350476e+00 1.9127337413708869e+00 1.3497999999999999e-01 2 0 0 -91 0 -P 134 223 3.5163629723965795e-01 -4.4343363850532036e-01 -7.5286241082333785e+00 7.5901269538058527e+00 7.8074626769700195e-01 2 0 0 -92 0 -V -21 0 0 0 0 0 2 1 0 -P 36 21 -7.9835767352754738e-01 2.8310917836013409e+00 -4.9511789036910145e+01 4.9599089803115852e+01 0 2 0 0 -21 0 -P 37 21 7.9835767352754738e-01 -2.8310917836013409e+00 -3.3864087660105230e+02 3.3865365162772304e+02 0 2 0 0 -21 0 -P 135 92 0 0 -3.8815266563796246e+02 3.8825274143083885e+02 8.8147255604432342e+00 2 0 0 -22 0 -V -22 0 0 0 0 0 0 9 0 -P 136 2114 -1.4960565618058827e-01 -3.7983243334584205e-01 -6.0084225372661976e+01 6.0097896107156856e+01 1.2150404701074575e+00 2 0 0 -93 0 -P 137 -211 2.9811563003694558e-01 5.4783511804293061e-01 -4.4437689646128113e+01 4.4442285462337956e+01 1.3957000000000000e-01 1 0 0 0 0 -P 138 -3112 2.3307186571895475e-01 1.4326900914430873e-01 -2.7582276932951583e+01 2.7609612671372336e+01 1.1974400000000001e+00 2 0 0 -94 0 -P 139 -323 -2.7304396428318978e-01 8.3408142249412254e-01 -4.6194743956008772e+01 4.6211892601868342e+01 9.0244327224705545e-01 2 0 0 -95 0 -P 140 113 -1.2438472963311790e-01 -5.3617617384831562e-01 -3.5265788970736466e+01 3.5278430062698547e+01 7.6733272432928068e-01 2 0 0 -96 0 -P 141 321 1.7857873999080959e-01 3.3202431338286048e-01 -2.0117667576333965e+01 2.0127253170339291e+01 4.9359999999999998e-01 1 0 0 0 0 -P 142 -321 -8.8311177964749923e-02 -9.5005248461867819e-01 -1.2922147930037769e+02 1.2922594457819073e+02 4.9359999999999998e-01 1 0 0 0 0 -P 143 111 -1.3174275413026160e-01 -1.9950654911601931e-01 -4.1534180411145236e+00 4.1624824373277072e+00 1.3497999999999999e-01 2 0 0 -97 0 -P 144 211 5.7322046445197547e-02 2.0835777786463264e-01 -2.1095375841649318e+01 2.1096944339547068e+01 1.3957000000000000e-01 1 0 0 0 0 -V -23 0 0 0 0 0 0 2 0 -P 145 -321 4.7317159073082486e-03 -6.3950612894738934e-01 -1.0249740682428344e+01 1.0281527877466626e+01 4.9359999999999998e-01 1 0 0 0 0 -P 146 211 -2.1513185186894951e-01 5.5253778360839806e-02 -1.6231025987568579e+00 1.6441643849393461e+00 1.3957000000000000e-01 1 0 0 0 0 -V -24 0 0 0 0 0 0 2 0 -P 147 -211 -4.0628598070699080e-02 -3.7486371473267571e-01 -3.2698973194384027e+00 3.2945229931167308e+00 1.3957000000000000e-01 1 0 0 0 0 -P 148 211 -2.2213787884234046e-01 -1.9035086479588445e-01 -8.6925041161229846e+00 8.6985450670017315e+00 1.3957000000000000e-01 1 0 0 0 0 -V -25 0 0 0 0 0 0 2 0 -P 149 2112 -5.0305378851233962e-01 -3.5001326226330570e-01 -4.8922578174780284e+01 4.8935437256146848e+01 9.3957000000000002e-01 1 0 0 0 0 -P 150 111 1.9439971445648394e-01 -1.0750830516930852e-01 -1.1517209099759532e+01 1.1520142114255574e+01 1.3497999999999999e-01 2 0 0 -98 0 -V -26 0 0 0 0 0 0 3 0 -P 151 211 5.5467664486743833e-02 -8.8581067293380639e-02 -8.8067473190807988e+00 8.8084732726121882e+00 1.3957000000000000e-01 1 0 0 0 0 -P 152 -211 3.2763508143091863e-01 2.6975363668793567e-01 -2.7798223999518537e+01 2.7801813773266648e+01 1.3957000000000000e-01 1 0 0 0 0 -P 153 111 3.7624470113100927e-01 -2.2697476149644069e-01 -3.9173658724607755e+01 3.9176355561612958e+01 1.3497999999999999e-01 2 0 0 -99 0 -V -27 0 0 0 0 0 0 2 0 -P 154 -3122 -3.4471300641577951e-01 -9.3043940044976126e-02 -1.5322034894383646e+02 1.5322482682830801e+02 1.1156800000000000e+00 2 0 0 -100 0 -P 155 211 -1.2658824667944718e-01 5.6045897494217310e-02 -9.1400235910024410e+00 9.1421374281840926e+00 1.3957000000000000e-01 1 0 0 0 0 -V -28 0 0 0 0 0 0 1 0 -P 156 310 3.9338164815186982e-01 1.5120222274855744e-01 -1.5841292434872400e+02 1.5841426667878343e+02 4.9767000000000000e-01 2 0 0 -101 0 -V -29 0 0 0 0 0 0 2 0 -P 157 211 -4.1204788433400203e+00 1.3492927461039024e+00 3.8318172798207833e+01 3.8562945727619358e+01 1.3957000000000000e-01 1 0 0 0 0 -P 158 111 -4.8159128705046694e-01 1.3448094949075709e-01 5.8718796761526999e+00 5.8946760576942649e+00 1.3497999999999999e-01 2 0 0 -102 0 -V -30 0 3.6262632367244094e-07 -1.4847823601754692e-07 8.4887296679066190e-06 8.5293987828113712e-06 0 2 0 -P 159 22 9.2329242767276706e-02 1.8864949736969224e-02 1.1925858469138277e+00 1.1963032966843019e+00 0 1 0 0 0 0 -P 160 22 -2.5631944427193760e-02 -4.6174321832131868e-02 3.6873305970836540e-01 3.7249581728345482e-01 0 1 0 0 0 0 -V -31 0 0 0 0 0 0 2 0 -P 161 -211 -1.1341007829402066e+00 6.0266876159191429e-01 2.0286919317455499e+01 2.0328009479531275e+01 1.3957000000000000e-01 1 0 0 0 0 -P 162 111 -1.1968527011163542e-01 3.3035230632374672e-02 2.8142194490767198e+00 2.8201891068342042e+00 1.3497999999999999e-01 2 0 0 -103 0 -V -32 0 0 0 0 0 0 2 0 -P 163 22 -3.4376924339807431e+00 5.6473113570386968e-01 3.1590143475639518e+01 3.1781658473682139e+01 0 1 0 0 0 0 -P 164 111 -1.5341100192305239e+00 6.7694638573483645e-01 1.2781020070891630e+01 1.2891254539927354e+01 1.3497999999999999e-01 2 0 0 -104 0 -V -33 0 -2.7789154446939715e+01 -2.5850833391285808e+00 3.5434507819968331e+02 3.5855517402969622e+02 0 2 0 -P 165 2112 -5.1909013901515177e-01 -3.4217945727699796e-02 5.8209743622944101e+00 5.9192195221685608e+00 9.3957000000000002e-01 1 0 0 0 0 -P 166 -211 -1.8675959006408943e-01 -3.1443655385611960e-02 3.1794570083460498e+00 3.1881490712897551e+00 1.3957000000000000e-01 1 0 0 0 0 -V -34 0 0 0 0 0 0 2 0 -P 167 -3122 -1.3578313501585406e+00 -5.6110171407454090e-01 4.7532121296764123e+00 5.0986575214573620e+00 1.1156800000000000e+00 2 0 0 -105 0 -P 168 22 -8.9088999710365789e-03 -4.2747657113092849e-02 3.1710490820171716e-01 3.2009725630341157e-01 0 1 0 0 0 0 -V -35 0 0 0 0 0 0 2 0 -P 169 -211 -2.3446543659562806e+00 -6.4929378742615518e-01 2.2395655634208214e+00 3.3097009254536083e+00 1.3957000000000000e-01 1 0 0 0 0 -P 170 111 -1.1249397207202128e+00 1.4237079142511824e-01 1.1663329747194109e+00 1.6322717377394349e+00 1.3497999999999999e-01 2 0 0 -106 0 -V -36 0 -6.7418093062859160e-05 -1.9089901041571765e-04 1.6493397696685196e-04 2.6420265438809298e-04 0 2 0 -P 171 22 -2.1187394174684773e-01 -5.9635452415112900e-01 5.5296385850315732e-01 8.4041556058747868e-01 0 1 0 0 0 0 -P 172 22 -1.4766384618138196e-02 -4.5393292462897188e-02 1.4969497191911496e-03 4.7758119453917933e-02 0 1 0 0 0 0 -V -37 0 0 0 0 0 0 2 0 -P 173 -211 -4.0255782642450305e-02 -2.7831301333626307e-01 3.9015845799110332e-01 5.0078145799386653e-01 1.3957000000000000e-01 1 0 0 0 0 -P 174 211 -4.6264467692447137e-01 2.5591075993571022e-01 3.5889789046657225e-02 5.4799477734302793e-01 1.3957000000000000e-01 1 0 0 0 0 -V -38 0 0 0 0 0 0 2 0 -P 175 211 7.8035236055542037e-02 -5.6695538610673002e-02 6.0047941576510799e-01 6.2398653496866729e-01 1.3957000000000000e-01 1 0 0 0 0 -P 176 111 -1.2785553127783380e+00 1.1884783629086837e-01 1.0045692970771025e+00 1.6359118463580851e+00 1.3497999999999999e-01 2 0 0 -107 0 -V -39 0 0 0 0 0 0 2 0 -P 177 -211 1.2627572705779661e-01 -6.1331993051647760e-01 2.5729317570399224e-01 6.9122099185177921e-01 1.3957000000000000e-01 1 0 0 0 0 -P 178 111 -1.5555177445162185e-01 8.8890488378568028e-02 -1.6380203759515596e-01 2.7775633454442306e-01 1.3497999999999999e-01 2 0 0 -108 0 -V -40 0 0 0 0 0 0 2 0 -P 179 211 3.5639704325469085e-01 -6.3423964972341818e-01 -2.4163817735466017e-01 7.7919675267370847e-01 1.3957000000000000e-01 1 0 0 0 0 -P 180 111 1.3101330793119204e-01 9.0416991608367872e-02 2.7437988898070045e-02 2.1050454356462622e-01 1.3497999999999999e-01 2 0 0 -109 0 -V -41 0 0 0 0 0 0 1 0 -P 181 310 4.6391648249289439e+00 8.7190463208380886e-01 -2.7041866263032449e-01 4.7542475369195882e+00 4.9767000000000000e-01 2 0 0 -110 0 -V -42 0 0 0 0 0 0 2 0 -P 182 -321 1.9525512673653487e+00 -5.3227249651774589e-01 -4.9906661042476869e-01 2.1420735057135949e+00 4.9359999999999998e-01 1 0 0 0 0 -P 183 111 2.9874439049285023e-01 -2.8475562149392120e-01 -1.9024244903122581e-01 4.7407358567708918e-01 1.3497999999999999e-01 2 0 0 -111 0 -V -43 0 0 0 0 0 0 2 0 -P 184 321 4.1462756309890736e+00 3.2192760120503588e-01 -6.3518186464597759e-01 4.2358394622231152e+00 4.9359999999999998e-01 1 0 0 0 0 -P 185 111 2.8873808576949571e+00 -5.7210969847366372e-02 -1.3031788905640951e-01 2.8940358783301670e+00 1.3497999999999999e-01 2 0 0 -112 0 -V -44 0 0 0 0 0 0 2 0 -P 186 -321 7.4632910485972637e-01 -9.0683090050122783e-01 -1.0937761687495565e+01 1.1011703823991564e+01 4.9359999999999998e-01 1 0 0 0 0 -P 187 211 -7.5085744445380881e-02 -9.4925952617013309e-02 -1.1136929490878451e+00 1.1289112344410193e+00 1.3957000000000000e-01 1 0 0 0 0 -V -45 0 5.4870443770135152e-04 -6.1180197566582301e-04 -7.7571407249639283e-03 7.8006513337980929e-03 0 2 0 -P 188 22 1.6307255770237250e+00 -1.7467424291525475e+00 -2.2610684940145120e+01 2.2736610312090640e+01 0 1 0 0 0 0 -P 189 22 2.5002754365000407e-01 -3.5028539841192269e-01 -3.9778855607587129e+00 4.0010982451593105e+00 0 1 0 0 0 0 -V -46 0 0 0 0 0 0 2 0 -P 190 -211 -3.4771060598395914e-01 -2.2516011178622557e-02 -4.1162097602971910e+00 4.1332883049624050e+00 1.3957000000000000e-01 1 0 0 0 0 -P 191 211 2.3702088705655167e-01 -4.9089442089346247e-01 -4.8952940415866841e+00 4.9275287692574148e+00 1.3957000000000000e-01 1 0 0 0 0 -V -47 0 0 0 0 0 0 3 0 -P 192 211 7.5704020926990898e-02 1.9439819800615879e-01 -3.0400693063104991e+00 3.0504135670829546e+00 1.3957000000000000e-01 1 0 0 0 0 -P 193 -211 1.2388078103698906e-02 -1.3418403734202855e-01 -2.2669176314964452e+00 2.2752042003402604e+00 1.3957000000000000e-01 1 0 0 0 0 -P 194 111 -2.9481615955898893e-01 1.1357919037439569e-01 -7.8235932090650602e+00 7.8311331939734075e+00 1.3497999999999999e-01 2 0 0 -113 0 -V -48 0 0 0 0 0 0 2 0 -P 195 -211 -2.5840149143461150e-01 4.9160936948202588e-01 -7.6888525573623507e+00 7.7101481527072950e+00 1.3957000000000000e-01 1 0 0 0 0 -P 196 211 -1.8300377467698797e-01 8.5819329580133663e-02 -1.7124223317576995e+01 1.7125984916320089e+01 1.3957000000000000e-01 1 0 0 0 0 -V -49 0 0 0 0 0 0 2 0 -P 197 321 -1.0059304477724786e+00 1.6154958423579500e+00 -4.8713814360191492e+01 4.8753472423629795e+01 4.9359999999999998e-01 1 0 0 0 0 -P 198 111 -8.6514329764970965e-01 1.2820801404340156e+00 -5.0363263569510103e+01 5.0387188246461093e+01 1.3497999999999999e-01 2 0 0 -114 0 -V -50 0 0 0 0 0 0 2 0 -P 199 -311 -2.1609164566645891e+00 -2.4014342910428788e+00 -4.6611982375210808e+00 5.6930563869726507e+00 4.9767000000000000e-01 2 0 0 -115 0 -P 200 -211 -7.8919655988042958e-02 -3.2709922664563601e-02 -2.0207531257067607e-01 2.6002397580325015e-01 1.3957000000000000e-01 1 0 0 0 0 -V -51 0 -1.5071098302075203e-05 -2.8039888295285812e-05 -3.9402786753742279e-04 3.9645787334712418e-04 0 2 0 -P 201 22 -1.6628700951457295e-03 2.7466545158185005e-02 -1.7085866096558761e-01 1.7306027350849057e-01 0 1 0 0 0 0 -P 202 22 -6.5865805639046926e-02 -1.5310413880685866e-01 -1.5946516929484500e+00 1.6033381438410388e+00 0 1 0 0 0 0 -V -52 0 0 0 0 0 0 2 0 -P 203 -211 2.0587461757273046e-01 1.6855553016750627e-01 -2.1998932359118348e+00 2.2203164997858775e+00 1.3957000000000000e-01 1 0 0 0 0 -P 204 211 -5.2333999937162846e-02 4.5462768293088435e-01 -7.9512134694810550e+00 7.9655948051475409e+00 1.3957000000000000e-01 1 0 0 0 0 -V -53 0 -5.1634935389906184e-06 -1.5909755539324514e-05 -2.4640764257625601e-04 2.4701009158988296e-04 0 2 0 -P 205 22 -1.9369005581290913e-02 -2.6993645287572443e-01 -3.6129505223448715e+00 3.6230722217312223e+00 0 1 0 0 0 0 -P 206 22 -1.4734769876723883e-01 -2.4375103224998654e-01 -4.3429556459108172e+00 4.3522855665045208e+00 0 1 0 0 0 0 -V -54 0 1.6507694663061706e-06 -2.3329977412751538e-05 -1.0644109517188483e-03 1.0646795018213276e-03 0 2 0 -P 207 22 3.2699543974523036e-04 -1.6531900817126896e-01 -5.2016361454811575e+00 5.2042625867037895e+00 0 1 0 0 0 0 -P 208 22 4.4457545443559635e-02 -4.6761148186613616e-01 -2.3675294738488155e+01 2.3679953925749196e+01 0 1 0 0 0 0 -V -55 0 0 0 0 0 0 2 0 -P 209 211 8.3079894702839219e-01 1.5302975509736045e+00 -3.5793639413666205e+02 3.5794065676425424e+02 1.3957000000000000e-01 1 0 0 0 0 -P 210 111 5.4263936381458211e-01 4.6734157035509338e-01 -2.1145862994016593e+02 2.1145988570269063e+02 1.3497999999999999e-01 2 0 0 -116 0 -V -56 0 0 0 0 0 0 2 0 -P 211 321 1.0977767389319530e+00 3.1868442334370795e-01 -2.4770380304560078e+02 2.4770693239742806e+02 4.9359999999999998e-01 1 0 0 0 0 -P 212 -211 1.6804735433903449e-02 -4.2423390924212670e-02 -8.0724325227349169e+01 8.0724458780093229e+01 1.3957000000000000e-01 1 0 0 0 0 -V -57 0 0 0 0 0 0 2 0 -P 213 211 4.8735411154823403e-02 -4.3391527553418574e-01 5.7573302557377576e+02 5.7573320806926313e+02 1.3957000000000000e-01 1 0 0 0 0 -P 214 -211 2.4482588483854287e-01 7.7909997263942679e-04 1.0140498242515802e+03 1.0140498634114431e+03 1.3957000000000000e-01 1 0 0 0 0 -V -58 0 0 0 0 0 0 2 0 -P 215 -211 2.2644715345669786e-01 -1.8312403295315868e-01 3.1678254960143175e+02 3.1678271421353344e+02 1.3957000000000000e-01 1 0 0 0 0 -P 216 211 -1.9928619525354679e-01 -2.2203313483144810e-01 1.2997895205791938e+03 1.2997895623142140e+03 1.3957000000000000e-01 1 0 0 0 0 -V -59 0 -1.5147243004817694e-05 1.0094785584425737e-04 8.2958988283135748e-02 8.2959052302129133e-02 0 2 0 -P 217 22 -9.8281010852660555e-02 2.5143009431644470e-01 2.1253074378795648e+02 2.1253091523661075e+02 0 1 0 0 0 0 -P 218 22 -4.5575709842319061e-02 7.0729404434862853e-01 5.7534913658297194e+02 5.7534957313687289e+02 0 1 0 0 0 0 -V -60 0 0 0 0 0 0 2 0 -P 219 -2212 -3.3519434428000028e-01 -4.0216052205848135e-01 5.6696550298238196e+02 5.6696652106715453e+02 9.3827000000000005e-01 1 0 0 0 0 -P 220 111 -3.4003331637259090e-02 -4.0291788547051194e-01 2.4175947776846803e+02 2.4175985359346117e+02 1.3497999999999999e-01 2 0 0 -117 0 -V -61 0 0 0 0 0 0 2 0 -P 221 2112 -1.5928388612196823e-01 -2.9344070178772974e-01 5.2068168002132694e+01 5.2077714904602516e+01 9.3957000000000002e-01 1 0 0 0 0 -P 222 111 6.0767090723995811e-02 1.5192470187574267e-01 8.1321949629446006e+00 8.1349608646936105e+00 1.3497999999999999e-01 2 0 0 -118 0 -V -62 0 0 0 0 0 0 3 0 -P 223 -211 -2.0855792861887895e-01 3.0026778285653749e-01 1.2281199215305971e+01 1.2287432242008229e+01 1.3957000000000000e-01 1 0 0 0 0 -P 224 211 1.8322216671360106e-01 8.4641186236416213e-02 3.0390432107555543e+00 3.0489338980243836e+00 1.3957000000000000e-01 1 0 0 0 0 -P 225 111 -4.1465490166762591e-02 -3.5765910717375442e-02 1.9984446344580136e+00 2.0037462775107624e+00 1.3497999999999999e-01 2 0 0 -119 0 -V -63 0 0 0 0 0 0 3 0 -P 226 211 2.5229722362814772e-01 7.8453898573060024e-02 2.0068040102688629e+00 2.0289285408271467e+00 1.3957000000000000e-01 1 0 0 0 0 -P 227 -211 -4.0632702319755090e-02 -1.2069487246477217e-01 6.9918612236714750e-01 7.2426465283617236e-01 1.3957000000000000e-01 1 0 0 0 0 -P 228 111 -1.0286168933441908e-01 -7.6499887889112148e-02 3.1988902541620599e+00 3.2043019861668447e+00 1.3497999999999999e-01 2 0 0 -120 0 -V -64 0 0 0 0 0 0 3 0 -P 229 -211 -1.6757424870507753e-01 -2.0645190227526286e-01 8.7703893221804687e+00 8.7755291671955220e+00 1.3957000000000000e-01 1 0 0 0 0 -P 230 211 9.8968590493889952e-02 -2.6775289950262515e-01 5.1595877232286771e+00 5.1693627901017445e+00 1.3957000000000000e-01 1 0 0 0 0 -P 231 111 -4.4664340621416956e-02 1.0405778336843771e-01 8.0887900876842203e+00 8.0907087210343445e+00 1.3497999999999999e-01 2 0 0 -121 0 -V -65 0 0 0 0 0 0 3 0 -P 232 22 4.3201839353883581e-02 2.1195937699919901e-02 3.1454940200310616e-01 3.1820903978210507e-01 0 1 0 0 0 0 -P 233 211 -1.0483563972662920e-01 -3.3980469291825055e-01 5.8420066258245038e+00 5.8544836614140072e+00 1.3957000000000000e-01 1 0 0 0 0 -P 234 -211 -1.7885887895793467e-01 -2.0510136573886101e-01 8.3797429311231948e+00 8.3853222028386707e+00 1.3957000000000000e-01 1 0 0 0 0 -V -66 0 0 0 0 0 0 3 0 -P 235 211 -6.2449587517871177e-02 -1.5860535579672613e-01 1.4572062057648969e+01 1.4573727320309697e+01 1.3957000000000000e-01 1 0 0 0 0 -P 236 -211 -6.9803021048007466e-02 1.9955448295151124e-01 3.0748651976026064e+01 3.0749695487615565e+01 1.3957000000000000e-01 1 0 0 0 0 -P 237 111 -2.1379581197174061e-01 2.7391517770198009e-01 1.7311417557900477e+01 1.7315430564620016e+01 1.3497999999999999e-01 2 0 0 -122 0 -V -67 0 9.9012612323046163e-06 2.3990675043343193e-05 5.0259087072063646e-04 5.0661887099154334e-04 0 2 0 -P 238 22 7.2226354217322569e-02 2.8177786734834089e-02 9.0357006333380763e-01 9.0689001166727001e-01 0 1 0 0 0 0 -P 239 22 -4.9277372803545674e-02 2.7427407669828176e-02 2.6132684023139513e-01 2.6734292507420448e-01 0 1 0 0 0 0 -V -68 0 -1.8040088071645551e-05 1.8980771602814036e-05 3.2803886097063062e-04 3.2918821827960463e-04 0 2 0 -P 240 22 -2.6219607110444487e-01 2.0044463067522406e-01 3.6450568212061958e+00 3.6599677675480899e+00 0 1 0 0 0 0 -P 241 22 -2.9527711295698492e-02 1.0649081569596784e-01 1.6596144706705973e+00 1.6632896232530285e+00 0 1 0 0 0 0 -V -69 0 0 0 0 0 0 2 0 -P 242 -211 -1.5779048821080130e-01 2.4427658010237480e-01 1.1215533923889044e+01 1.1220171561458509e+01 1.3957000000000000e-01 1 0 0 0 0 -P 243 111 4.7885545567532817e-01 -2.7126526635969879e-02 7.1201563610581680e+00 7.1375685357266061e+00 1.3497999999999999e-01 2 0 0 -123 0 -V -70 0 0 0 0 0 0 3 0 -P 244 -211 1.4447474134589635e-02 1.0331254294609675e-01 1.3021878060525166e+01 1.3023043815449808e+01 1.3957000000000000e-01 1 0 0 0 0 -P 245 211 -2.2533489453973266e-01 6.7750325072043191e-02 1.3920844135234320e+01 1.3923532136050548e+01 1.3957000000000000e-01 1 0 0 0 0 -P 246 111 -4.4248312943774556e-02 1.3821775128610481e-01 2.1230751378670416e+01 2.1231676470860343e+01 1.3497999999999999e-01 2 0 0 -124 0 -V -71 0 0 0 0 0 0 3 0 -P 247 -211 4.3968497828360605e-02 -8.9581304918981322e-02 2.7716342830236234e+00 2.7769397585695201e+00 1.3957000000000000e-01 1 0 0 0 0 -P 248 211 -3.0260312919721499e-01 -2.2696578300232692e-01 6.5963063148826535e+00 6.6086170190982152e+00 1.3957000000000000e-01 1 0 0 0 0 -P 249 111 -4.8351748599884498e-01 6.8085391814766527e-02 1.1578342287069946e+01 1.1589419937891513e+01 1.3497999999999999e-01 2 0 0 -125 0 -V -72 0 0 0 0 0 0 2 0 -P 250 211 2.7918293477948802e-01 -1.1595431069407330e-01 1.5372053925904542e+01 1.5375659667118606e+01 1.3957000000000000e-01 1 0 0 0 0 -P 251 -211 -3.4690021616336185e-02 7.3188080772198266e-02 7.3508544257158037e-01 7.5258905489484496e-01 1.3957000000000000e-01 1 0 0 0 0 -V -73 0 0 0 0 0 0 3 0 -P 252 211 6.9604979207269713e-02 6.4059599095633635e-02 3.4643965893791207e-01 3.8529041975080902e-01 1.3957000000000000e-01 1 0 0 0 0 -P 253 -211 -1.7967466933591134e-01 -5.9481031195502451e-02 9.5730795988163619e-01 9.8576837787879446e-01 1.3957000000000000e-01 1 0 0 0 0 -P 254 111 1.5727707714584355e-01 -3.3174440295699437e-01 8.1664405133604978e-01 9.0549297891888092e-01 1.3497999999999999e-01 2 0 0 -126 0 -V -74 0 0 0 0 0 0 3 0 -P 255 -211 -2.6768527911412210e-02 -3.1628709299904190e-01 1.4372749842883532e+00 1.4785104817502697e+00 1.3957000000000000e-01 1 0 0 0 0 -P 256 211 5.8658587383824110e-02 4.7066254481115677e-02 1.1853313384479452e-01 1.9795441622710730e-01 1.3957000000000000e-01 1 0 0 0 0 -P 257 111 1.3411328140931753e-01 -1.4694297772286691e-01 1.1236134462109026e+00 1.1490454246279296e+00 1.3497999999999999e-01 2 0 0 -127 0 -V -75 0 0 0 0 0 0 3 0 -P 258 111 -2.9382405415384755e-01 1.5899008760270572e-01 -2.7730141991355345e-01 4.5467142052408799e-01 1.3497999999999999e-01 2 0 0 -128 0 -P 259 111 -2.9461008023809460e-01 7.9261822040132043e-03 -1.9522454331244052e-01 3.7840473894202054e-01 1.3497999999999999e-01 2 0 0 -129 0 -P 260 111 -5.6947447824850161e-01 -6.7738430395329619e-02 -2.4221023236473779e-01 6.3700476716505527e-01 1.3497999999999999e-01 2 0 0 -130 0 -V -76 0 0 0 0 0 0 2 0 -P 261 -211 -1.1998250888346944e+00 2.2147907356684138e-01 -5.3025571611185474e-01 1.3376412572863117e+00 1.3957000000000000e-01 1 0 0 0 0 -P 262 111 1.1957147566873839e-01 -2.6522135805362312e-01 -3.4214359030111036e-01 4.6895793344983716e-01 1.3497999999999999e-01 2 0 0 -131 0 -V -77 0 0 0 0 0 0 1 0 -P 263 310 -1.2221059279354842e+00 7.8797526225771200e-02 -6.0729148702831515e-01 1.4547268913275146e+00 4.9767000000000000e-01 2 0 0 -132 0 -V -78 0 0 0 0 0 0 2 0 -P 264 311 6.1455156080652751e-01 -1.6499131271689300e-02 -2.1080593895117539e+00 2.2515629373462178e+00 4.9767000000000000e-01 2 0 0 -133 0 -P 265 211 1.0915840528824405e+00 -1.2515087994438999e-02 -3.5835761605516261e+00 3.7487611627454607e+00 1.3957000000000000e-01 1 0 0 0 0 -V -79 0 0 0 0 0 0 2 0 -P 266 -211 1.7582177056811502e-01 -1.1719437561076100e-01 -3.7786363095881875e-02 2.5603790894419687e-01 1.3957000000000000e-01 1 0 0 0 0 -P 267 111 3.3145760189254819e-01 -3.6043831788505409e-01 -1.3814531933934078e+00 1.4718737883354707e+00 1.3497999999999999e-01 2 0 0 -134 0 -V -80 0 0 0 0 0 0 2 0 -P 268 -211 1.4142297312131940e+00 3.0559262664089600e-02 -3.1393293993058156e+00 3.4461352938368117e+00 1.3957000000000000e-01 1 0 0 0 0 -P 269 211 4.2350384391560253e-01 3.4379285852778824e-01 -3.2627959808932827e+00 3.3110219620563313e+00 1.3957000000000000e-01 1 0 0 0 0 -V -81 0 0 0 0 0 0 2 0 -P 270 211 2.2262437178167788e-01 2.2164126913244933e-01 -1.1281504278306380e+00 1.1793598415277167e+00 1.3957000000000000e-01 1 0 0 0 0 -P 271 -211 9.3697441288108851e-01 1.1617066478887220e-01 -6.0163047616962251e-01 1.1282090624115000e+00 1.3957000000000000e-01 1 0 0 0 0 -V -82 0 0 0 0 0 0 2 0 -P 272 -211 2.3127343736279543e-01 4.0719281310637140e-01 -1.3765569924613603e+00 1.4607129520440862e+00 1.3957000000000000e-01 1 0 0 0 0 -P 273 211 -1.8596767408214455e-02 -2.3324161234313170e-01 -2.3184009526130650e-01 3.5773887705591995e-01 1.3957000000000000e-01 1 0 0 0 0 -V -83 0 0 0 0 0 0 3 0 -P 274 111 -1.4346763318903757e-01 1.0781369477650569e-02 -5.8080541309671737e+01 5.8080876350349484e+01 1.3497999999999999e-01 2 0 0 -135 0 -P 275 111 -2.6461917860165884e-01 -1.6666569637677223e-01 -6.3921636890275806e+01 6.3922544404120060e+01 1.3497999999999999e-01 2 0 0 -136 0 -P 276 111 -6.3263579171512346e-02 3.2972257103575209e-02 -1.6871339394895315e+01 1.6872030169138945e+01 1.3497999999999999e-01 2 0 0 -137 0 -V -84 0 0 0 0 0 0 2 0 -P 277 -321 -1.9241511971658415e-01 6.8333986075057515e-02 -1.5062462347721974e+01 1.5071931065676043e+01 4.9359999999999998e-01 1 0 0 0 0 -P 278 211 -3.6177450768530445e-01 4.9189474727843974e-01 -1.1900910688400808e+01 1.1917382104934106e+01 1.3957000000000000e-01 1 0 0 0 0 -V -85 0 3.5965274506955190e+01 -4.6449923613080180e+01 -1.1845199806065368e+03 1.1870855245326934e+03 0 2 0 -P 279 -2212 7.0831682930111939e-01 -9.1340702772143101e-01 -2.1316092442071589e+01 2.1368017519667180e+01 9.3827000000000005e-01 1 0 0 0 0 -P 280 211 7.3612976178848225e-02 -9.6472091324671175e-02 -4.4368453769818323e+00 4.4406984156562039e+00 1.3957000000000000e-01 1 0 0 0 0 -V -86 0 0 0 0 0 0 2 0 -P 281 -321 -4.4123751089775892e-01 -4.2768077428762763e-01 -1.7597613328393198e+01 1.7615255808570037e+01 4.9359999999999998e-01 1 0 0 0 0 -P 282 211 -2.2251296710200200e-01 -9.6639171739989163e-02 -1.3148198706335124e+01 1.3151177139564950e+01 1.3957000000000000e-01 1 0 0 0 0 -V -87 0 0 0 0 0 0 2 0 -P 283 311 1.1053483946443671e-01 2.3990656324443796e-01 -9.0517810821029947e+00 9.0692992726583253e+00 4.9767000000000000e-01 2 0 0 -138 0 -P 284 211 -2.1064306399016169e-01 -5.2260446477074120e-03 -1.1383456938792117e+01 1.1386262313603362e+01 1.3957000000000000e-01 1 0 0 0 0 -V -88 0 0 0 0 0 0 2 0 -P 285 22 -3.5874584636615608e-02 1.0662985418752213e-01 -2.4754642143430844e-01 2.7191201222423805e-01 0 1 0 0 0 0 -P 286 113 -1.8011439266886359e-01 2.8077452479029485e-01 -2.5609809355757700e+00 2.7283064666710946e+00 8.7963475117748524e-01 2 0 0 -139 0 -V -89 0 0 0 0 0 0 2 0 -P 287 2212 3.2237536636423531e-01 1.2209256343323748e-02 -2.9549510500184519e+00 3.1170757519964258e+00 9.3827000000000005e-01 1 0 0 0 0 -P 288 -211 4.8767346650093954e-02 1.4882602618582788e-01 -2.3244126658180475e-01 3.1310727790919962e-01 1.3957000000000000e-01 1 0 0 0 0 -V -90 0 0 0 0 0 0 2 0 -P 289 211 9.9155276979379939e-02 6.7357724758643656e-02 -5.1838620433734066e+00 5.1871258228102608e+00 1.3957000000000000e-01 1 0 0 0 0 -P 290 111 4.4253202957958163e-02 7.6399174961335814e-01 -2.3232855375278914e+00 2.4497993854059930e+00 1.3497999999999999e-01 2 0 0 -140 0 -V -91 0 9.6383408543088094e-06 7.6587722623014910e-06 -7.2125325163580596e-05 7.3351287749992734e-05 0 2 0 -P 291 22 -1.2269390628257775e-02 -2.5957213503575527e-04 -1.5849465772618179e-01 1.5896905941667261e-01 0 1 0 0 0 0 -P 292 22 2.6360212558589025e-01 1.9997238663270561e-01 -1.7222704560088657e+00 1.7537646819542143e+00 0 1 0 0 0 0 -V -92 0 0 0 0 0 0 3 0 -P 293 211 2.4603887976188546e-01 -2.1260457138838254e-01 -2.7393540734610169e+00 2.7621144724317976e+00 1.3957000000000000e-01 1 0 0 0 0 -P 294 -211 1.6587673815884174e-01 -1.3851309640486942e-01 -4.3161880209091308e+00 4.3238477987641240e+00 1.3957000000000000e-01 1 0 0 0 0 -P 295 111 -6.0279320681069205e-02 -9.2315970712068443e-02 -4.7308201386323090e-01 5.0416468260993141e-01 1.3497999999999999e-01 2 0 0 -141 0 -V -93 0 0 0 0 0 0 2 0 -P 296 2112 7.4171566481101445e-02 -3.8781235549565807e-01 -4.8819322937294800e+01 4.8829959898459137e+01 9.3957000000000002e-01 1 0 0 0 0 -P 297 111 -2.2377722266168973e-01 7.9799221498159933e-03 -1.1264902435367182e+01 1.1267936208697719e+01 1.3497999999999999e-01 2 0 0 -142 0 -V -94 0 5.0154104234163355e-01 3.0829670479462740e-01 -5.9353555524325564e+01 5.9412378560295316e+01 0 2 0 -P 298 -2112 3.2040808606255766e-01 2.1628229926567114e-01 -2.5231223973342530e+01 2.5251671119996491e+01 9.3957000000000002e-01 1 0 0 0 0 -P 299 211 -8.7336220343602930e-02 -7.3013290121362429e-02 -2.3510529596090493e+00 2.3579415513758439e+00 1.3957000000000000e-01 1 0 0 0 0 -V -95 0 0 0 0 0 0 2 0 -P 300 -311 -2.8878157481450778e-01 4.5737313947049302e-01 -1.9055191875712950e+01 1.9069362806234462e+01 4.9767000000000000e-01 2 0 0 -143 0 -P 301 -211 1.5737610531318013e-02 3.7670828302362941e-01 -2.7139552080295822e+01 2.7142529795633884e+01 1.3957000000000000e-01 1 0 0 0 0 -V -96 0 0 0 0 0 0 2 0 -P 302 -211 2.0611775579728736e-01 -5.2708370551699557e-01 -2.3061051418638730e+01 2.3068417242625809e+01 1.3957000000000000e-01 1 0 0 0 0 -P 303 211 -3.3050248543040528e-01 -9.0924683313200385e-03 -1.2204737552097738e+01 1.2210012820072743e+01 1.3957000000000000e-01 1 0 0 0 0 -V -97 0 -7.4282491859497750e-06 -1.1249076815240985e-05 -2.3418839530493129e-04 2.3469948674397263e-04 0 2 0 -P 304 22 -1.3782377984232405e-01 -1.7354840433172641e-01 -4.0358135637561290e+00 4.0418938091362637e+00 0 1 0 0 0 0 -P 305 22 6.0810257120624319e-03 -2.5958144784292918e-02 -1.1760447735839455e-01 1.2058862819144350e-01 0 1 0 0 0 0 -V -98 0 1.1329499597191234e-05 -6.2655200061162853e-06 -6.7121608805501367e-04 6.7138702239328879e-04 0 2 0 -P 306 22 8.3512273166797750e-04 -7.8008196154925541e-03 -3.4118096618637224e+00 3.4118186820233136e+00 0 1 0 0 0 0 -P 307 22 1.9356459172481594e-01 -9.9707485553815978e-02 -8.1053994378958087e+00 8.1083234322322628e+00 0 1 0 0 0 0 -V -99 0 2.0041229932726539e-04 -1.2090146041663490e-04 -2.0866428136954773e-02 2.0867864647033187e-02 0 2 0 -P 308 22 3.4255432656942236e-01 -2.0736141795750798e-01 -3.0756055443747755e+01 3.0758662010614099e+01 0 1 0 0 0 0 -P 309 22 3.3690374561586876e-02 -1.9613343538932699e-02 -8.4176032808599981e+00 8.4176935509988660e+00 0 1 0 0 0 0 -V -100 0 -1.4655426294584716e+01 -3.9557503781629491e+00 -6.5141421674948333e+03 6.5143325441403531e+03 0 2 0 -P 310 -2212 -2.9021401161431271e-01 -1.7933607075051763e-01 -1.2972263526808578e+02 1.2972647700869905e+02 9.3827000000000005e-01 1 0 0 0 0 -P 311 211 -5.4498994801466791e-02 8.6292130705541509e-02 -2.3497713675750649e+01 2.3498349819608933e+01 1.3957000000000000e-01 1 0 0 0 0 -V -101 0 6.2882302674241096e+01 2.4169769943670968e+01 -2.5322405107628230e+04 2.5322619679928397e+04 0 2 0 -P 312 -211 -3.0454181678031815e-02 -9.4438048079860462e-03 -1.9166526513342280e+01 1.9167061199207968e+01 1.3957000000000000e-01 1 0 0 0 0 -P 313 211 4.2383582982990159e-01 1.6064602755654347e-01 -1.3924639783538171e+02 1.3924720547957548e+02 1.3957000000000000e-01 1 0 0 0 0 -V -102 0 -6.8085613147043767e-05 1.9012424329253531e-05 8.3014485275483495e-04 8.3336772172386763e-04 0 2 0 -P 314 22 -6.4530051532456653e-02 4.1147663561012245e-02 5.0009863277170408e-01 5.0592084387524461e-01 0 1 0 0 0 0 -P 315 22 -4.1706123551801033e-01 9.3333285929744852e-02 5.3717810433809960e+00 5.3887552138190218e+00 0 1 0 0 0 0 -V -103 0 -2.8663356649283047e-05 7.9115884245727316e-06 6.7397580072297365e-04 6.7540547063320853e-04 0 2 0 -P 316 22 -1.4492624902482243e-01 2.8380174303346873e-02 2.6356982873021977e+00 2.6398322889224670e+00 0 1 0 0 0 0 -P 317 22 2.5240978913187006e-02 4.6550563290277975e-03 1.7852116177452235e-01 1.8035681791173727e-01 0 1 0 0 0 0 -V -104 0 -5.0220982389912621e-04 2.2160674326314827e-04 4.1840244562597866e-03 4.2201110684245468e-03 0 2 0 -P 318 22 -5.4063197640540028e-01 2.1622423351256712e-01 3.9809929604217249e+00 4.0233494508925567e+00 0 1 0 0 0 0 -P 319 22 -9.9347804282512375e-01 4.6072215222226937e-01 8.8000271104699053e+00 8.8679050890347977e+00 0 1 0 0 0 0 -V -105 0 -8.7423611880936946e+01 -3.6126385262244547e+01 3.0603430416013998e+02 3.2827571422449716e+02 0 2 0 -P 320 -2212 -1.2471878380698003e+00 -5.8148956872730395e-01 4.2864941247651371e+00 4.5986943904236481e+00 9.3827000000000005e-01 1 0 0 0 0 -P 321 211 -1.1064351208874038e-01 2.0387854652763094e-02 4.6671800491127502e-01 4.9996313103371370e-01 1.3957000000000000e-01 1 0 0 0 0 -V -106 0 -4.0330373995144954e-04 5.1041555013131883e-05 4.1814369434113808e-04 5.8518806325543013e-04 0 2 0 -P 322 22 -6.6701805187467311e-01 1.7389112972455496e-02 6.7968573557433076e-01 9.5246425755503927e-01 0 1 0 0 0 0 -P 323 22 -4.5792166884553959e-01 1.2498167845266275e-01 4.8664723914508007e-01 6.7980748018439574e-01 0 1 0 0 0 0 -V -107 0 -6.3235648545427708e-04 5.8780562177968304e-05 4.9684663912939536e-04 8.0910028321579759e-04 0 2 0 -P 324 22 -5.8725927969364689e-01 4.2508583447097834e-02 3.7714975811299251e-01 6.9922984868901916e-01 0 1 0 0 0 0 -P 325 22 -6.9129603308469112e-01 7.6339252843770522e-02 6.2741953896410996e-01 9.3668199766906590e-01 0 1 0 0 0 0 -V -108 0 -4.1370582402169445e-05 2.3641332843672301e-05 -4.3564824109938025e-05 7.3872132712754089e-05 0 2 0 -P 326 22 9.3824316308741933e-03 3.0669441389115419e-02 -7.5056453382808377e-02 8.1621785405822295e-02 0 1 0 0 0 0 -P 327 22 -1.6493420608249607e-01 5.8221046989452609e-02 -8.8745584212347600e-02 1.9613454913860082e-01 0 1 0 0 0 0 -V -109 0 4.6124625705683339e-05 3.1832261632231989e-05 9.6598352337218242e-06 7.4110358974856751e-05 0 2 0 -P 328 22 1.1229413325862778e-01 1.1712115941134178e-01 5.1212087590440727e-02 1.7014704305845085e-01 0 1 0 0 0 0 -P 329 22 1.8719174672564270e-02 -2.6704167802973904e-02 -2.3774098692370686e-02 4.0357500506175224e-02 0 1 0 0 0 0 -V -110 0 1.6839083418133907e+02 3.1648099143667501e+01 -9.8155650633128566e+00 1.7256806749881488e+02 0 2 0 -P 330 -211 3.3855716052889000e+00 7.5517900606175214e-01 -3.2190843642233902e-01 3.4864731824688899e+00 1.3957000000000000e-01 1 0 0 0 0 -P 331 211 1.2535932196400428e+00 1.1672562602205658e-01 5.1489773792014568e-02 1.2677743544506974e+00 1.3957000000000000e-01 1 0 0 0 0 -V -111 0 2.8845818951176322e-05 -2.7495107403999699e-05 -1.8369212665482548e-05 4.5775054719574976e-05 0 2 0 -P 332 22 2.7030395986030997e-01 -2.9002381019296813e-01 -1.9934251311767295e-01 4.4375159575046091e-01 0 1 0 0 0 0 -P 333 22 2.8440430632540273e-02 5.2681886990469471e-03 9.1000640864471617e-03 3.0321989926628289e-02 0 1 0 0 0 0 -V -112 0 1.3628206968224917e-04 -2.7003120695176234e-06 -6.1509002492339389e-06 1.3659618133936836e-04 0 2 0 -P 334 22 1.8626901422113438e+00 2.7688122150641023e-02 -8.2117109705569513e-02 1.8647049143781296e+00 0 1 0 0 0 0 -P 335 22 1.0246907154836133e+00 -8.4899091998007395e-02 -4.8200779350839988e-02 1.0293309639520400e+00 0 1 0 0 0 0 -V -113 0 -1.2886014039213245e-05 4.9643921958561860e-06 -3.4195863645979687e-04 3.4228819896250966e-04 0 2 0 -P 336 22 -1.0943481290995041e-01 -2.2126551863527927e-02 -2.1629656728282032e+00 2.1658453463733665e+00 0 1 0 0 0 0 -P 337 22 -1.8538134664903849e-01 1.3570574223792362e-01 -5.6606275362368574e+00 5.6652878476000419e+00 0 1 0 0 0 0 -V -114 0 -1.8756333083447605e-04 2.7795536553286909e-04 -1.0918770904720895e-02 1.0923957781981871e-02 0 2 0 -P 338 22 -6.4454009407804935e-01 1.0195210531070349e+00 -4.0546413266977950e+01 4.0564349913774876e+01 0 1 0 0 0 0 -P 339 22 -2.2060320357166030e-01 2.6255908732698097e-01 -9.8168503025321545e+00 9.8228383326862136e+00 0 1 0 0 0 0 -V -115 0 0 0 0 0 0 1 0 -P 340 310 -2.1609164566645891e+00 -2.4014342910428788e+00 -4.6611982375210808e+00 5.6930563869726507e+00 4.9767000000000000e-01 2 0 0 -144 0 -V -116 0 4.6647014059706234e-04 4.0174175072356605e-04 -1.8177659679026900e-01 1.8177767628387106e-01 0 2 0 -P 341 22 5.0612377474012493e-01 4.3386844717429307e-01 -2.0411988422196481e+02 2.0412097280263274e+02 0 1 0 0 0 0 -P 342 22 3.6515589074457233e-02 3.3473123180800382e-02 -7.3387457182011460e+00 7.3389129000579238e+00 0 1 0 0 0 0 -V -117 0 -3.9679966035151650e-06 -4.7018239803615207e-05 2.8211964547665943e-02 2.8212008404318353e-02 0 2 0 -P 343 22 -6.4946256002850131e-02 -9.4207688108994117e-02 5.6256023690559296e+01 5.6256140061129656e+01 0 1 0 0 0 0 -P 344 22 3.0942924365591040e-02 -3.0871019736151784e-01 1.8550345407790874e+02 1.8550371353233157e+02 0 1 0 0 0 0 -V -118 0 7.1394658205115038e-06 1.7849484044905112e-05 9.5544360100083161e-04 9.5576856408141815e-04 0 2 0 -P 345 22 4.9543228363903562e-02 1.4447608620664792e-01 8.0641017625724594e+00 8.0655480351980131e+00 0 1 0 0 0 0 -P 346 22 1.1223862360092251e-02 7.4486156690947375e-03 6.8093200372141963e-02 6.9412829495597211e-02 0 1 0 0 0 0 -V -119 0 -1.0479404296005302e-06 -9.0389728160656921e-07 5.0505876581810914e-05 5.0639862845471187e-05 0 2 0 -P 347 22 -1.9649059503414921e-02 -4.1995057254422583e-02 2.0580015458011841e-01 2.1095822808881290e-01 0 1 0 0 0 0 -P 348 22 -2.1816430663347673e-02 6.2291465370471460e-03 1.7926444798778951e+00 1.7927880494219495e+00 0 1 0 0 0 0 -V -120 0 -2.7048403984485163e-05 -2.0116331802263564e-05 8.4117688963188434e-04 8.4259995311128431e-04 0 2 0 -P 349 22 -1.9642405802245206e-02 -9.2859174775794529e-02 2.0999420753842948e+00 2.1020859569520560e+00 0 1 0 0 0 0 -P 350 22 -8.3219283532173879e-02 1.6359286886682384e-02 1.0989481787777651e+00 1.1022160292147887e+00 0 1 0 0 0 0 -V -121 0 -4.3697548852092644e-06 1.0180537782309538e-05 7.9137024098687022e-04 7.9155795130203402e-04 0 2 0 -P 351 22 1.5286718904049673e-02 1.0121571509495164e-01 3.4164405283291086e+00 3.4179736962660661e+00 0 1 0 0 0 0 -P 352 22 -5.9951059525466630e-02 2.8420682734860746e-03 4.6723495593551112e+00 4.6727350247682775e+00 0 1 0 0 0 0 -V -122 0 -3.9128110223879112e-05 5.0130931781456886e-05 3.1682709221014086e-03 3.1690053675884522e-03 0 2 0 -P 353 22 -1.6779084043867753e-02 6.1438708636000997e-02 5.8657625123023784e+00 5.8661082587446449e+00 0 1 0 0 0 0 -P 354 22 -1.9701672792787284e-01 2.1247646906597906e-01 1.1445655045598098e+01 1.1449322305875373e+01 0 1 0 0 0 0 -V -123 0 8.8138363471338031e-05 -4.9929214254940152e-06 1.3105393744311845e-03 1.3137442676021075e-03 0 2 0 -P 355 22 -5.9221845589798100e-03 -9.3634280590004035e-03 8.7044995957186830e-02 8.7747235718017694e-02 0 1 0 0 0 0 -P 356 22 4.8477764023430803e-01 -1.7763098576969477e-02 7.0331113651009813e+00 7.0498213000085883e+00 0 1 0 0 0 0 -V -124 0 -3.1128397509633289e-06 9.7235280142512896e-06 1.4935694140095549e-03 1.4936344936374668e-03 0 2 0 -P 357 22 -6.0821289540813332e-02 1.1730330566840588e-01 2.0518413827214008e+01 2.0518839277103105e+01 0 1 0 0 0 0 -P 358 22 1.6572976597038779e-02 2.0914445617698917e-02 7.1233755145640765e-01 7.1283719375723653e-01 0 1 0 0 0 0 -V -125 0 -1.9515749056143327e-04 2.7480648777391942e-05 4.6732544138254686e-03 4.6777255789813401e-03 0 2 0 -P 359 22 -4.0023515920812236e-01 8.6281187916333033e-02 1.0367007136428276e+01 1.0375088895658166e+01 0 1 0 0 0 0 -P 360 22 -8.3282326790722602e-02 -1.8195796101566498e-02 1.2113351506416694e+00 1.2143310422333451e+00 0 1 0 0 0 0 -V -126 0 4.8454558846432039e-06 -1.0220515911640566e-05 2.5159500646974626e-05 2.7896794388778152e-05 0 2 0 -P 361 22 7.4423022937854688e-02 -2.8130602976180735e-01 5.5912723271329023e-01 6.3031351808856284e-01 0 1 0 0 0 0 -P 362 22 8.2854054207988859e-02 -5.0438373195187056e-02 2.5751681862275960e-01 2.7517946083031813e-01 0 1 0 0 0 0 -V -127 0 1.7487216930583767e-05 -1.9160098842285034e-05 1.4650951698096147e-04 1.4982562794983061e-04 0 2 0 -P 363 22 4.5214485644001358e-02 -3.4494364021055254e-02 9.6759820543419181e-02 1.1223490425381649e-01 0 1 0 0 0 0 -P 364 22 8.8898795765316174e-02 -1.1244861370181165e-01 1.0268536256674834e+00 1.0368105203741129e+00 0 1 0 0 0 0 -V -128 0 -7.3439902585215092e-06 3.9738804160137968e-06 -6.9310149993812259e-06 1.1364292459897351e-05 0 2 0 -P 365 22 -6.5906669162900097e-02 -1.1544111646086784e-02 -1.7213513211336788e-02 6.9088787736666518e-02 0 1 0 0 0 0 -P 366 22 -2.2791738499094746e-01 1.7053419924879248e-01 -2.6008790670221665e-01 3.8558263278742178e-01 0 1 0 0 0 0 -V -129 0 -6.5385547125916253e-05 1.7591311186985337e-06 -4.3327993280389105e-05 8.3982872788221195e-05 0 2 0 -P 367 22 -7.0058961208586297e-03 -2.3646751404207671e-02 -4.7549279496351946e-02 5.3564777728007648e-02 0 1 0 0 0 0 -P 368 22 -2.8760418411723598e-01 3.1572933608220874e-02 -1.4767526381608859e-01 3.2483996121401310e-01 0 1 0 0 0 0 -V -130 0 -6.6891221062580290e-05 -7.9566451089120833e-06 -2.8450332395157243e-05 7.4823417599693525e-05 0 2 0 -P 369 22 -1.6731181439017095e-01 1.4345447539424376e-02 -1.6892072469241130e-02 1.6877315311370919e-01 0 1 0 0 0 0 -P 370 22 -4.0216266385833066e-01 -8.2083877934753996e-02 -2.2531815989549669e-01 4.6823161405134645e-01 0 1 0 0 0 0 -V -131 0 4.0004438564436408e-06 -8.8733800974629270e-06 -1.1446929262908617e-05 1.5689694162488194e-05 0 2 0 -P 371 22 -2.7787464980002757e-02 -3.9536920145469653e-02 -3.1512507197267656e-02 5.7691848422995934e-02 0 1 0 0 0 0 -P 372 22 1.4735894064874117e-01 -2.2568443790815346e-01 -3.1063108310384269e-01 4.1126608502684042e-01 0 1 0 0 0 0 -V -132 0 -1.7190259592768666e+02 1.1083735870402483e+01 -8.5422204997653452e+01 2.0462328450321920e+02 0 2 0 -P 373 -211 -7.0116200068741419e-01 2.3007912747604026e-01 -2.5557192099985926e-01 7.9332297824509768e-01 1.3957000000000000e-01 1 0 0 0 0 -P 374 211 -5.2094392724806982e-01 -1.5128160125026907e-01 -3.5171956602845583e-01 6.6140391308241664e-01 1.3957000000000000e-01 1 0 0 0 0 -V -133 0 0 0 0 0 0 1 0 -P 375 310 6.1455156080652751e-01 -1.6499131271689300e-02 -2.1080593895117539e+00 2.2515629373462178e+00 4.9767000000000000e-01 2 0 0 -145 0 -V -134 0 1.2422833674547942e-04 -1.3509013664050564e-04 -5.1776043610738624e-04 5.5164953701517157e-04 0 2 0 -P 376 22 1.7293581745775335e-01 -1.5989646707223276e-01 -4.7684903414621088e-01 5.3184459996143318e-01 0 1 0 0 0 0 -P 377 22 1.5852178443479484e-01 -2.0054185081282136e-01 -9.0460415924719695e-01 9.4002918837403693e-01 0 1 0 0 0 0 -V -135 0 -3.0421302276829038e-05 2.2861135473366665e-06 -1.2315570169442151e-02 1.2315641212460739e-02 0 2 0 -P 379 22 -8.0253989160968833e-02 6.2876484874701419e-02 -4.2260171878810738e+01 4.2260294856777207e+01 0 1 0 0 0 0 -P 378 22 -6.3213644028068727e-02 -5.2095115397050848e-02 -1.5820369430860998e+01 1.5820581493572236e+01 0 1 0 0 0 0 -V -136 0 -2.2626919204406364e-05 -1.4251163751589497e-05 -5.4657781078933680e-03 5.4658557071155340e-03 0 2 0 -P 380 22 -7.2231888147834891e-02 9.0709435203236623e-03 -9.2446848491878608e+00 9.2449714812153534e+00 0 1 0 0 0 0 -P 381 22 -1.9238729045382397e-01 -1.7573663989709587e-01 -5.4676952041087944e+01 5.4677572922904659e+01 0 1 0 0 0 0 -V -137 0 -1.4712307122146771e-05 7.6678869480818771e-06 -3.9235264585132075e-03 3.9236871020138959e-03 0 2 0 -P 382 22 -7.3391735447519918e-03 5.7884281344822895e-02 -1.3555871924925388e+01 1.3555997495517444e+01 0 1 0 0 0 0 -P 383 22 -5.5924405626760355e-02 -2.4912024241247683e-02 -3.3154674699699282e+00 3.3160326736214896e+00 0 1 0 0 0 0 -V -138 0 0 0 0 0 0 1 0 -P 384 130 1.1053483946443671e-01 2.3990656324443796e-01 -9.0517810821029947e+00 9.0692992726583253e+00 4.9767000000000000e-01 1 0 0 0 0 -V -139 0 0 0 0 0 0 2 0 -P 385 -211 1.9994195185511940e-01 4.2490055020102374e-01 -1.6472487730842742e+00 1.7185533355122891e+00 1.3957000000000000e-01 1 0 0 0 0 -P 386 211 -3.8005634452398301e-01 -1.4412602541072891e-01 -9.1373216249149591e-01 1.0097531311588057e+00 1.3957000000000000e-01 1 0 0 0 0 -V -140 0 1.1290931347859454e-05 1.9492777513552132e-04 -5.9277195213696494e-04 6.2505117884745329e-04 0 2 0 -P 387 22 -1.8864812224141009e-02 3.1518847790773763e-01 -7.8454208373630496e-01 8.4569849172110512e-01 0 1 0 0 0 0 -P 388 22 6.3118015182099169e-02 4.4880327170562045e-01 -1.5387434537915861e+00 1.6041008936848880e+00 0 1 0 0 0 0 -V -141 0 -2.2062332681418194e-05 -3.3787800437129711e-05 -1.7314881218831880e-04 1.8452512119060968e-04 0 2 0 -P 389 22 2.4873558701757840e-02 -5.2976666599621790e-03 -1.3627493951424749e-02 2.8852517843785962e-02 0 1 0 0 0 0 -P 390 22 -8.5152879382827049e-02 -8.7018304052106268e-02 -4.5945451991180614e-01 4.7531216476614546e-01 0 1 0 0 0 0 -V -142 0 -4.1677118704622027e-05 1.4862109679246677e-06 -2.0980181557823914e-03 2.0985831772341542e-03 0 2 0 -P 391 22 -1.5643583805594760e-01 5.2378617282550582e-02 -5.5116465463091462e+00 5.5141149192248653e+00 0 1 0 0 0 0 -P 392 22 -6.7341384605742141e-02 -4.4398695132734589e-02 -5.7532558890580363e+00 5.7538212894728558e+00 0 1 0 0 0 0 -V -143 0 0 0 0 0 0 1 0 -P 393 310 -2.8878157481450778e-01 4.5737313947049302e-01 -1.9055191875712950e+01 1.9069362806234462e+01 4.9767000000000000e-01 2 0 0 -146 0 -V -144 0 -1.0043507998486164e+02 -1.1161386843781975e+02 -2.1664318227892988e+02 2.6460188769466896e+02 0 2 0 -P 394 -211 -1.1691333412424345e+00 -1.3186003706581355e+00 -2.1817307937141353e+00 2.8080257741418579e+00 1.3957000000000000e-01 1 0 0 0 0 -P 395 211 -9.9178311542215425e-01 -1.0828339203847432e+00 -2.4794674438069451e+00 2.8850306128307914e+00 1.3957000000000000e-01 1 0 0 0 0 -V -145 0 1.4136025654935059e+01 -3.7951598826736549e-01 -4.8489961644807160e+01 5.1790856090669863e+01 0 2 0 -P 396 -211 2.2123670885310345e-01 -1.8774985570499705e-01 -1.1205504408707445e+00 1.1658939767822030e+00 1.3957000000000000e-01 1 0 0 0 0 -P 397 211 3.9331485195342403e-01 1.7125072443330774e-01 -9.8750894864100902e-01 1.0856689605640144e+00 1.3957000000000000e-01 1 0 0 0 0 -V -146 0 -1.0106759107552426e+01 1.6007115917497323e+01 -6.6689238799159602e+02 6.6738834131272722e+02 0 2 0 -P 398 211 -1.3082730519347252e-01 3.3475366485323066e-01 -6.2686630319197212e+00 6.2805088800648798e+00 1.3957000000000000e-01 1 0 0 0 0 -P 399 -211 -1.5795426962103520e-01 1.2261947461726234e-01 -1.2786528843793228e+01 1.2788853926169581e+01 1.3957000000000000e-01 1 0 0 0 0 -BlockType GenEvent -E 8 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 186 0 0 -V -1 0 0 0 0 0 1 2 0 -P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -1 0 -P 41 2203 -3.5096158275163236e-01 -6.5324073291532936e-01 6.4120718804435573e+03 6.4120719697163750e+03 7.7132999999999996e-01 2 0 0 -13 0 -P 3 1 3.5096158275163236e-01 6.5324073291532936e-01 4.1594615987003954e+02 4.1594682088954704e+02 0 3 0 0 -3 0 -V -2 0 0 0 0 0 1 2 0 -P 2 2212 0 0 -6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -2 0 -P 4 2 2.7501906829241841e-02 -1.2146878480571459e-01 -2.4425191616079805e+03 2.4425191647831903e+03 0 3 0 0 -4 0 -P 25 2103 -2.7501906829241841e-02 1.2146878480571459e-01 -4.3752498996173417e+03 4.3752499693803265e+03 7.7132999999999996e-01 2 0 0 -11 0 -V -3 0 0 0 0 0 0 3 0 -P 5 1 -4.9399896685999328e-01 1.2324525037290512e+00 2.6907605385966201e+02 2.6907932981713935e+02 0 3 0 0 -5 0 -P 39 21 5.6879342880917538e-01 7.5338012753840347e-02 1.3882129535590456e+01 1.3893981510846166e+01 0 2 0 0 -13 0 -P 40 21 4.0353127377792430e-01 -1.0794042666778709e+00 2.4382432099069892e+01 2.4409648627655276e+01 0 2 0 0 -13 0 -V -4 0 0 0 0 0 0 27 0 -P 6 -2 -2.5309383529199383e+01 2.5605502229007829e+01 3.5459450278646557e+01 5.0532952150964263e+01 0 3 0 0 -5 0 -P 11 2 1.6176455215218464e+00 -3.5208120614031763e-01 -8.1690576640657608e-01 1.8753594962580435e+00 3.3000000000000002e-01 2 0 0 -9 0 -P 12 21 3.6714966898125962e+00 -2.8959215128987843e+00 -1.0957485461237511e+00 4.8028027471995083e+00 0 2 0 0 -9 0 -P 13 21 9.0366392277633989e-02 -5.2691266877741805e-01 1.9123724213929416e-01 5.6778052815543023e-01 0 2 0 0 -9 0 -P 14 21 -5.4742252565373975e-02 9.9812434983835754e-02 5.6673941239040604e-01 5.7805951073393502e-01 0 2 0 0 -9 0 -P 15 21 -4.2785424343628164e-01 -3.2385695231399270e-01 -3.5095687498530953e-02 5.3774927844631759e-01 0 2 0 0 -9 0 -P 16 -4 2.9718367737999309e+00 -5.2406590168947231e-01 -2.3934560712361521e+00 4.1334115261319404e+00 1.5000000000000000e+00 2 0 0 -9 0 -P 17 4 3.7194740649112351e-02 1.2081735484703142e+00 -1.0381037228237732e+01 1.0558266936671616e+01 1.5000000000000000e+00 2 0 0 -11 0 -P 18 21 -3.8063394485410336e+00 5.6572199649196686e-01 -5.4033256081716328e+00 6.6335653311592448e+00 0 2 0 0 -11 0 -P 19 21 1.4421971897575430e+00 -1.4182830615990176e+00 5.7062472324337099e-01 2.1016831711130513e+00 0 2 0 0 -11 0 -P 20 21 2.7303036205130007e+00 -7.3316197951629114e-01 9.1820481918052266e-01 2.9724038148207561e+00 0 2 0 0 -11 0 -P 21 21 -2.0182388692079840e+00 1.5399105798395493e-01 -1.0724900871680109e+01 1.0914233829567960e+01 0 2 0 0 -11 0 -P 22 21 1.2491774325410158e-01 -5.4800394801420538e-01 -7.6805684279456621e+00 7.7011066831965493e+00 0 2 0 0 -11 0 -P 31 21 3.5609178221999949e-01 -1.2821539734905008e+00 -1.5993658274378207e+01 1.6048919750771034e+01 0 2 0 0 -13 0 -P 32 21 -5.7321384139990961e-01 1.8778171682794662e-01 1.6282864814338351e+00 1.7364195768210722e+00 0 2 0 0 -13 0 -P 33 21 3.1657101493395272e+00 -1.6119295557286719e+00 4.4063722475163161e+00 5.6600489420096816e+00 0 2 0 0 -13 0 -P 34 21 2.6326825731670658e+00 -1.7437994078856278e+00 2.2174731113567527e+00 3.8586319992440359e+00 0 2 0 0 -13 0 -P 35 21 6.8425955467206965e+00 -4.4447064866609622e+00 1.5000198384257514e+01 1.7075786398747489e+01 0 2 0 0 -13 0 -P 36 21 4.0164782232489156e+00 -5.4148487689946281e+00 1.3344639617162901e+01 1.4950989633494801e+01 0 2 0 0 -13 0 -P 37 21 3.9627824931833042e+00 -7.3524675138650126e+00 1.5839388268499249e+01 1.7906664802553045e+01 0 2 0 0 -13 0 -P 23 21 6.3545309142797402e-01 5.0932772066100540e-01 -1.0519858948403776e+01 1.0551333927648679e+01 0 2 0 0 -11 0 -P 24 21 -1.3293995544884336e+00 5.4471300945374300e-02 -2.4605532627938929e+00 2.7972473357117349e+00 0 2 0 0 -11 0 -P 26 2 -9.0376759228672943e-01 8.5542850621349587e-01 -2.0776141357023594e+03 2.0776145345862528e+03 3.3000000000000002e-01 2 0 0 -13 0 -P 27 21 4.5222474530545992e-01 3.0982198771832353e-01 -1.3647713867247677e+02 1.3647823957360674e+02 0 2 0 0 -13 0 -P 28 21 -9.6670908210745185e-02 -1.0947679481510482e+00 -1.0578578360202395e+02 1.0579149244820697e+02 0 2 0 0 -13 0 -P 29 21 -4.8393908701574007e-01 2.0274532889938918e-01 -2.1573305980675745e+01 2.1579685670653127e+01 0 2 0 0 -13 0 -P 30 21 1.5370980407646048e-01 8.1756875564613984e-01 -1.5100758824998671e+01 1.5123655724223996e+01 0 2 0 0 -13 0 -V -5 0 0 0 0 0 0 2 0 -P 7 -24 -1.9947058501930567e+01 2.7030936827831496e+01 2.9618547273355034e+02 3.0941145860556639e+02 8.2952153494395972e+01 3 0 0 -6 0 -P 8 22 -5.8563239941287950e+00 -1.9298209509462974e-01 8.3500314047580435e+00 1.0200823362537069e+01 0 3 0 0 -7 0 -V -6 0 0 0 0 0 0 1 0 -P 9 -24 -1.9947058501930567e+01 2.7030936827831496e+01 2.9618547273355034e+02 3.0941145860556639e+02 8.2952153494395972e+01 2 0 0 -8 0 -V -7 0 0 0 0 0 0 1 0 -P 10 22 -5.8563239941287950e+00 -1.9298209509462974e-01 8.3500314047580435e+00 1.0200823362537033e+01 0 1 0 0 0 0 -V -8 0 0 0 0 0 0 10 0 -P 42 -2 -3.0517819564912308e+01 1.0428844168876985e+01 7.4912511307218153e+01 8.1560354045635137e+01 3.3000000000000002e-01 2 0 0 -15 0 -P 43 21 -5.7206370395985298e+00 5.4834348217882312e-01 1.3778163054100464e+01 1.4928635096975666e+01 0 2 0 0 -15 0 -P 44 2 -2.2525958537263930e+00 1.3998775512003811e-01 5.1363462708508241e+00 5.6200300413691791e+00 3.3000000000000002e-01 2 0 0 -15 0 -P 45 -2 -3.3632312463497884e+00 3.1506842882115055e-01 4.6744576577204295e+00 5.7766813072113079e+00 3.3000000000000002e-01 2 0 0 -17 0 -P 46 21 -3.7285968742864894e+00 2.8910858542250293e+00 1.1679555837123013e+01 1.2596540660828801e+01 0 2 0 0 -17 0 -P 47 21 -1.8023297258181672e+00 2.5930887493787522e+00 1.4214934742857999e+01 1.4561485894181056e+01 0 2 0 0 -17 0 -P 48 21 4.5585582966435784e-01 6.8325648113844262e-01 4.4766795478450598e+00 4.5514067858796050e+00 0 2 0 0 -17 0 -P 49 21 1.8795211728249670e+00 2.1980346924035365e+00 1.6255259634668267e+01 1.6510524587019709e+01 0 2 0 0 -17 0 -P 50 21 1.0534179425365028e+01 3.0060939727642277e+00 5.9681656292270027e+01 6.0678708250320625e+01 0 2 0 0 -17 0 -P 51 1 1.4568595374906375e+01 4.2271332429249249e+00 9.1375908388900839e+01 9.2627091936149995e+01 3.3000000000000002e-01 2 0 0 -17 0 -V -9 0 0 0 0 0 0 1 0 -P 63 92 7.8687488814103510e+00 -4.5230258068361495e+00 -3.5832294167353105e+00 1.2495163086925176e+01 7.8047803369408015e+00 2 0 0 -10 0 -V -10 0 0 0 0 0 0 6 0 -P 64 321 1.7132926485905779e+00 -1.1048478524837397e+00 -3.9254690998346925e-01 2.1339621630642891e+00 4.9359999999999998e-01 1 0 0 0 0 -P 65 -311 7.0071389671228546e-01 -5.7580058229065734e-01 -6.8836441564177575e-01 1.2426050350911262e+00 4.9767000000000000e-01 2 0 0 -23 0 -P 66 -211 1.0077824213790697e-01 -4.4819776346861628e-01 6.6159383291203300e-01 8.1744949318836269e-01 1.3957000000000000e-01 1 0 0 0 0 -P 67 213 2.9009203059815278e+00 -1.7893295104458362e+00 -1.1484922938389688e+00 3.6608745191428511e+00 6.8258990418377041e-01 2 0 0 -24 0 -P 68 2112 5.5409088873312584e-01 1.6103136011254437e-01 -4.0047552306756740e-01 1.1730815152379661e+00 9.3957000000000002e-01 1 0 0 0 0 -P 69 -4122 1.8989528992549274e+00 -7.6588145825984388e-01 -1.6149441071155617e+00 3.4671903612005783e+00 2.2848999999999999e+00 2 0 0 -25 0 -V -11 0 0 0 0 0 0 1 0 -P 70 92 -2.2114133934649618e+00 -8.6294579771183808e-02 -4.4209313144221505e+03 4.4294798104102165e+03 2.7505055207618193e+02 2 0 0 -12 0 -V -12 0 0 0 0 0 0 28 0 -P 71 433 -1.0247884433601786e+00 1.2618214732734563e+00 -8.6694897878898782e+00 9.0699874159992895e+00 2.1124000000000001e+00 2 0 0 -26 0 -P 72 -311 1.5493234368667361e-01 -5.2903668164922500e-02 -2.2756098012880561e+00 2.3351398728649673e+00 4.9767000000000000e-01 2 0 0 -27 0 -P 73 311 -1.0479399410759047e+00 3.5508361290150353e-01 -1.2285977863989042e+00 1.7266703338789495e+00 4.9767000000000000e-01 2 0 0 -28 0 -P 74 -321 7.1709044630839699e-02 -8.0540288172282606e-02 -1.1040623347056104e+00 1.2141760679639282e+00 4.9359999999999998e-01 1 0 0 0 0 -P 75 323 -9.5436433963787692e-01 -2.9602351803484112e-01 -1.0976303074658433e+00 1.7459894215858962e+00 9.1937236874953221e-01 2 0 0 -29 0 -P 76 -313 4.5229065483994757e-01 8.1631980606907503e-02 -5.8961679501597064e-01 1.1604642453115961e+00 8.8758024029850513e-01 2 0 0 -30 0 -P 77 113 -2.4190544648866458e-01 -1.5219642166406071e-02 2.7578108978004551e-01 9.1680871617924098e-01 8.4007924032998516e-01 2 0 0 -31 0 -P 78 -211 9.1225699860842469e-01 -2.2413756750953776e-01 -9.7235135008989171e-02 9.5466482969645439e-01 1.3957000000000000e-01 1 0 0 0 0 -P 92 -213 -3.7677031801546979e-01 -2.2171436967981403e-01 -7.8528785468690341e+00 7.8980386958816329e+00 7.2124935737075968e-01 2 0 0 -41 0 -P 93 111 6.5806093929116216e-01 1.7165685794549929e-01 -8.5486801528223268e+01 8.5489613201855903e+01 1.3497999999999999e-01 2 0 0 -42 0 -P 94 323 -4.8433024369999383e-01 -1.4687330505886736e-01 -8.3957716820012237e+01 8.3964255353447285e+01 9.1750524621514085e-01 2 0 0 -43 0 -P 95 331 3.5807589393682532e-01 -1.5224080954598848e-01 -4.3981009527858146e+02 4.3981131055034541e+02 9.5790576133122218e-01 2 0 0 -44 0 -P 96 -313 -4.8374978977586536e-01 -3.5240006944584942e-02 -6.3924051825900631e+02 6.3924131911008010e+02 8.8804157285665164e-01 2 0 0 -45 0 -P 97 2114 2.5503907680222165e-01 4.3505021898565793e-01 -1.9084717226924338e+03 1.9084721994174818e+03 1.2511271521563039e+00 2 0 0 -46 0 -P 98 223 -8.2278535331352418e-02 -1.5371015913753452e-01 -1.2132425478781010e+03 1.2132428143693633e+03 7.8500992134931347e-01 2 0 0 -47 0 -P 79 211 -1.6019746019187674e-02 -1.0962764287148888e-01 -3.9451013408667096e-01 4.3288899632718902e-01 1.3957000000000000e-01 1 0 0 0 0 -P 80 -211 2.2284319500814491e-02 -1.1912520537149757e-01 8.0408625454810090e-02 2.0157563691564462e-01 1.3957000000000000e-01 1 0 0 0 0 -P 81 111 2.6147842628995627e-01 -5.3714869055077885e-01 3.2448827889606002e-01 6.9311754177514195e-01 1.3497999999999999e-01 2 0 0 -32 0 -P 82 223 8.0109014259129629e-01 -6.0688849198709971e-01 -2.0305333370163012e-01 1.2882559187308529e+00 7.7994461185036024e-01 2 0 0 -33 0 -P 83 211 1.0621591005162476e+00 -2.6715583755681332e-01 -2.2047937637000264e-01 1.1258974805259456e+00 1.3957000000000000e-01 1 0 0 0 0 -P 84 -213 -3.9080845150093041e-01 2.6753344288388836e-01 -1.4175065470742074e+00 1.6446536225973012e+00 6.8648039920912651e-01 2 0 0 -34 0 -P 85 213 -7.0973282225719359e-01 3.4100256795269435e-01 -4.5663121010528904e+00 4.6984477584393929e+00 7.7730412595238718e-01 2 0 0 -35 0 -P 86 113 -2.3157800835597475e-01 -5.5195889026928313e-01 -5.6838651946392025e+00 5.7714335617292285e+00 8.0301607463498115e-01 2 0 0 -36 0 -P 87 111 -4.6066273585814793e-01 3.9227103753437581e-01 -4.7966952888036269e+00 4.8365888823764545e+00 1.3497999999999999e-01 2 0 0 -37 0 -P 88 311 2.7517509894565889e-01 -1.1487381757051843e-01 -2.1239959178119161e+00 2.2018063985792806e+00 4.9767000000000000e-01 2 0 0 -38 0 -P 89 -323 -7.0371163798211422e-01 -2.0006265444806237e-01 -4.1983731881486621e+00 4.3521687974762546e+00 8.8306323648086882e-01 2 0 0 -39 0 -P 90 211 -1.0761954765935261e-01 -1.6382379153854643e-01 -2.3860134843071883e+00 2.3981159967583294e+00 1.3957000000000000e-01 1 0 0 0 0 -P 91 111 -1.7970542608682286e-01 6.5692258472370091e-01 -2.4966648992850491e+00 2.5914082160491692e+00 1.3497999999999999e-01 2 0 0 -40 0 -V -13 0 0 0 0 0 1 1 0 -P 38 21 1.1792977287052229e+00 3.1505474039551125e+00 1.2907478596245630e+02 1.2911861625393684e+02 0 2 0 0 -13 0 -P 99 92 2.1325344736888994e+01 -1.9078086942355402e+01 4.2593028050939884e+03 9.0133192852153970e+03 7.9433900450641822e+03 2 0 0 -14 0 -V -14 0 0 0 0 0 0 39 0 -P 100 211 -6.4145635586214866e-01 7.4210211658539504e-01 -1.2602904261354940e+03 1.2602908155939158e+03 1.3957000000000000e-01 1 0 0 0 0 -P 101 -213 2.5952690952053969e-01 1.7113996608260679e-01 -5.5927702746122156e+02 5.5927759069273088e+02 7.3031643899164966e-01 2 0 0 -48 0 -P 102 211 4.2014540449212504e-02 -3.5537589858044005e-01 -7.2949847678164119e+01 7.2950858893526046e+01 1.3957000000000000e-01 1 0 0 0 0 -P 103 223 -6.3998361774731272e-01 2.5907507037149113e-02 -1.3487047205365673e+02 1.3487424091129336e+02 7.7870353248628366e-01 2 0 0 -49 0 -P 104 -213 -1.2839848855141253e-01 -2.0565346315218563e-01 -7.5718320753566431e+01 7.5722517718575858e+01 7.5948165303639892e-01 2 0 0 -50 0 -P 120 213 1.6442662451119143e+00 -1.1808050207330052e+00 3.0613568265944324e+00 3.7231193798014286e+00 6.2593954557443632e-01 2 0 0 -61 0 -P 121 -211 2.3285071815343761e+00 -1.4930049131139151e+00 3.7980187414499524e+00 4.7005782102146254e+00 1.3957000000000000e-01 1 0 0 0 0 -P 122 113 2.0705991745434469e+00 -2.1281647954902798e+00 5.8472746169042855e+00 6.6028251690195514e+00 7.6825349251449815e-01 2 0 0 -62 0 -P 123 213 1.6982439540579044e+00 -2.0586767864933027e+00 5.4934725034644734e+00 6.1605691667856659e+00 8.0758261106179852e-01 2 0 0 -63 0 -P 124 113 2.9418564684892945e+00 -3.1012166205676479e+00 5.9093890342429791e+00 7.3452154730835240e+00 8.7134813887281681e-01 2 0 0 -64 0 -P 125 2112 2.3972505494101850e+00 -3.1969828230803983e+00 9.5256435215448363e+00 1.0372472494645029e+01 9.3957000000000002e-01 1 0 0 0 0 -P 126 -2112 3.4184366439918845e+00 -3.6749985902842326e+00 9.6543481666732056e+00 1.0921563717518836e+01 9.3957000000000002e-01 1 0 0 0 0 -P 127 313 7.2107705342681427e-01 -1.9937173017311436e+00 4.6809918289416128e+00 5.2178012042881861e+00 9.0493320673532929e-01 2 0 0 -65 0 -P 128 -313 2.7935483674053357e-01 -8.1871255653283084e-02 1.1718388726820061e+01 1.1756180517434442e+01 8.9577004768472279e-01 2 0 0 -66 0 -P 129 113 -8.2708674444163105e-02 3.4522701208939077e-01 6.1206736781408893e+00 6.1737560715212680e+00 7.2566889257740352e-01 2 0 0 -67 0 -P 130 311 2.4695926864221421e-01 4.1868501205522318e-01 1.8281949053007391e+01 1.8295180311364682e+01 4.9767000000000000e-01 2 0 0 -68 0 -P 131 -311 2.9376002073213692e-01 5.4077841199444876e-01 2.3165952234661379e+01 2.3179468384934378e+01 4.9767000000000000e-01 2 0 0 -69 0 -P 132 -211 8.2622565565000405e-01 2.0025688618269719e-01 1.2637005194543391e+01 1.2666338528806758e+01 1.3957000000000000e-01 1 0 0 0 0 -P 133 221 -1.9997941753530871e-01 6.5041493910278059e-01 4.3772957762713439e+01 4.3781669271045850e+01 5.4744999999999999e-01 2 0 0 -70 0 -P 134 2224 1.1786850791080654e+00 3.2621875180768561e-01 6.7450236130820841e+01 6.7471056333264244e+01 1.1460241852960338e+00 2 0 0 -71 0 -P 105 323 -1.9872082796055467e-02 2.6794098698287805e-01 -6.8108399991638535e+01 6.8114172641420211e+01 8.4509048745704018e-01 2 0 0 -51 0 -P 106 -321 2.7142152013196741e-01 5.2993467515270787e-01 -2.6160140573056200e+01 2.6171570380158332e+01 4.9359999999999998e-01 1 0 0 0 0 -P 107 211 2.9437631694032651e-01 -4.6347150711519880e-01 -6.0143844523795785e+01 6.0146512593344127e+01 1.3957000000000000e-01 1 0 0 0 0 -P 108 -213 2.4619007605199436e-01 -6.0434473709003467e-01 -5.8018576150880186e+01 5.8030267612341916e+01 9.6485152730442514e-01 2 0 0 -52 0 -P 109 323 -9.9384342697108385e-02 -5.3376492002751497e-01 -2.0781667217870002e+01 2.0807229643207261e+01 8.7654482683159274e-01 2 0 0 -53 0 -P 110 -323 -2.7981634786068688e-01 3.1851689070453132e-01 -2.3479670779247950e+01 2.3502171437618404e+01 9.3668147368348154e-01 2 0 0 -54 0 -P 111 213 6.3127980478257359e-04 8.7114195588813836e-01 -3.8001408612870264e+00 3.9658129295852458e+00 7.2643851840290274e-01 2 0 0 -55 0 -P 112 223 1.1771085064566952e-01 -1.8207163509755123e-01 -9.8029417254923035e-01 1.2741930596758400e+00 7.8459248271014903e-01 2 0 0 -56 0 -P 113 2112 1.9209205934717882e-01 -5.3351059012014823e-01 -4.1646177314502335e+00 4.3067813437698792e+00 9.3957000000000002e-01 1 0 0 0 0 -P 114 113 -2.7598565373989276e-01 3.7960657283068916e-01 -4.9916024639480350e-01 1.0051155152174889e+00 7.3540942076064020e-01 2 0 0 -57 0 -P 115 -2112 -9.9845269053552094e-02 -3.5876231396345826e-01 -1.8622805531032363e+00 2.1188582111692340e+00 9.3957000000000002e-01 1 0 0 0 0 -P 116 -213 3.7849030650847143e-01 3.7784357170711968e-03 -9.0606253780559282e-02 1.0192850428959987e+00 9.4205271442207850e-01 2 0 0 -58 0 -P 117 321 5.8085707824128519e-01 -9.7162071509718617e-01 3.6764844693599641e-01 1.2885061505027517e+00 4.9359999999999998e-01 1 0 0 0 0 -P 118 333 4.7060519423644726e-01 1.3602005935586783e-01 1.1809574745448215e+00 1.6340056336417663e+00 1.0175181318778792e+00 2 0 0 -59 0 -P 119 -323 1.4599984686426251e+00 -7.3997071978743245e-01 2.5814573561830843e+00 3.1906207354049889e+00 9.1486960864539102e-01 2 0 0 -60 0 -P 135 -213 -6.0071912138819927e-01 -1.7948907599716118e-01 5.4158753007648563e+01 5.4167324041288985e+01 7.3170120904424785e-01 2 0 0 -72 0 -P 136 -2214 4.8755136324043447e-01 -5.7626612657803589e-01 1.5857152644493947e+03 1.5857159489133173e+03 1.2652830783436040e+00 2 0 0 -73 0 -P 137 113 -4.1376307441085342e-01 -8.6244447369672600e-02 1.4358186673828980e+03 1.4358189407957868e+03 7.7878414697202980e-01 2 0 0 -74 0 -P 138 2224 -3.9430912224019385e-02 -3.0577286480143262e-01 3.3195578920930161e+03 3.3195581504912811e+03 1.2729824133344914e+00 2 0 0 -75 0 -V -15 0 0 0 0 0 0 1 0 -P 139 92 -3.8491052458237228e+01 1.1117175406175845e+01 9.3827020632169436e+01 1.0210901918397998e+02 4.1939587087132457e+00 2 0 0 -16 0 -V -16 0 0 0 0 0 0 5 0 -P 140 -211 -1.9166473046608434e+01 6.1868455401856188e+00 4.6556411760049734e+01 5.0726223026563673e+01 1.3957000000000000e-01 1 0 0 0 0 -P 141 211 -3.8214210133710984e+00 4.1209563848882319e-01 8.8452891185503653e+00 9.6452942283966223e+00 1.3957000000000000e-01 1 0 0 0 0 -P 142 -211 -1.9337263835215596e-01 3.8299880626085796e-02 7.4065220340539428e-01 7.7904128865453037e-01 1.3957000000000000e-01 1 0 0 0 0 -P 143 -313 -8.2556654128106732e+00 2.7128082773100708e+00 2.0430817739322297e+01 2.2220577016158007e+01 9.0575342995889496e-01 2 0 0 -76 0 -P 144 323 -7.0541203470947975e+00 1.7671260695652278e+00 1.7253849810841484e+01 1.8737883624206951e+01 7.2773690452967910e-01 2 0 0 -77 0 -V -17 0 0 0 0 0 0 1 0 -P 145 92 1.8543993956306284e+01 1.5913761421656066e+01 2.0235845210138564e+02 2.0730243942159109e+02 3.7791940130625008e+01 2 0 0 -18 0 -V -18 0 0 0 0 0 0 14 0 -P 151 2212 5.8338973945168648e-01 1.6779417880182423e+00 1.4261748231538144e+01 1.4402556906492567e+01 9.3827000000000005e-01 1 0 0 0 0 -P 152 111 1.4165244960744796e+00 4.6731499980347514e-02 6.0300599428003485e+00 6.1958508693507808e+00 1.3497999999999999e-01 2 0 0 -79 0 -P 153 -211 -8.8908673032611560e-03 7.5389806891575817e-01 4.3882568137415596e+00 4.4547411814925377e+00 1.3957000000000000e-01 1 0 0 0 0 -P 154 113 1.8185267740322264e+00 1.0824417118785685e+00 1.1430218213996847e+01 1.1643291552010357e+01 6.6153613510060250e-01 2 0 0 -80 0 -P 155 213 1.5036150668328048e+00 3.5431629391135439e-01 8.4987502245096724e+00 8.6550697519553221e+00 5.4321149405278735e-01 2 0 0 -81 0 -P 156 223 4.6405083798304085e+00 1.6629892500258932e+00 3.0667601777968951e+01 3.1071117824765778e+01 7.8275973287819944e-01 2 0 0 -82 0 -P 157 -213 3.9970063450751039e+00 1.4686799434037365e+00 2.8332911049604355e+01 2.8661754230859430e+01 7.8052965777654093e-01 2 0 0 -83 0 -P 158 113 9.3580203216703879e+00 3.1521852498297869e+00 5.4878039383787858e+01 5.5765298071186237e+01 8.1267839249976626e-01 2 0 0 -84 0 -P 159 221 2.8855367459185346e+00 6.9662349745004337e-01 1.5936383535813000e+01 1.6219729600467367e+01 5.4744999999999999e-01 2 0 0 -85 0 -P 146 -2112 -2.6743483898333138e+00 8.2173272799491937e-01 3.9048032086408360e+00 4.8946566651373811e+00 9.3957000000000002e-01 1 0 0 0 0 -P 147 -211 -3.4761870385601772e+00 1.5018145990736227e+00 1.0041938198918368e+01 1.0733094893498349e+01 1.3957000000000000e-01 1 0 0 0 0 -P 148 2212 -1.5117020725326820e+00 1.9137806911799142e+00 8.1880940760776273e+00 8.5949424012979971e+00 9.3827000000000005e-01 1 0 0 0 0 -P 149 113 -1.2447883978844071e-01 2.5267362074443822e-01 1.5280844145927219e+00 1.6030732744200233e+00 3.9428797199936710e-01 2 0 0 -78 0 -P 150 -2212 1.3647329543852704e-01 5.2795247924943911e-01 4.2715630293953559e+00 4.4072621986569747e+00 9.3827000000000005e-01 1 0 0 0 0 -V -19 0 0 0 0 0 9 1 0 -P 52 3 1.0101998152855945e+01 6.4603650197245228e+00 2.6444321311193690e+01 2.9035991673749287e+01 0 2 0 0 -19 0 -P 53 21 -1.1792977287052229e+00 -3.1505474039551125e+00 3.5604699631516148e+00 4.8983301681289770e+00 0 2 0 0 -19 0 -P 54 21 5.4393098289857278e+00 1.2064682052724261e-01 -6.0927087448274282e+00 8.1683380757838790e+00 0 2 0 0 -19 0 -P 55 21 4.3229282211027176e+00 8.4560344871155246e-01 -3.2960883103994504e+01 3.3253910575937830e+01 0 2 0 0 -19 0 -P 56 21 2.9321949272632235e+00 6.6737924249356242e+00 -6.4867381486965698e+01 6.5275680413138062e+01 0 2 0 0 -19 0 -P 57 21 -4.3229282211027176e+00 -8.4560344871155246e-01 -3.3185882553128543e+01 3.3476940637210568e+01 0 2 0 0 -19 0 -P 58 21 -2.9321949272632235e+00 -6.6737924249356242e+00 -1.3725188086854727e+01 1.5540851342257129e+01 0 2 0 0 -19 0 -P 59 21 -5.4393098289857278e+00 -1.2064682052724261e-01 -6.8094310938794118e+00 8.7160196703137292e+00 0 2 0 0 -19 0 -P 60 -3 -1.0101998152855945e+01 -6.4603650197245228e+00 -1.0742083072280693e+01 1.6099038219724946e+01 0 2 0 0 -19 0 -P 160 92 -1.1792977287052206e+00 -3.1505474039551116e+00 -1.3837876686758571e+02 2.1446510077624441e+02 1.6381477234698198e+02 2 0 0 -20 0 -V -20 0 0 0 0 0 0 36 0 -P 161 -313 8.2000806394988448e+00 5.4003406550455937e+00 2.2177543996883074e+01 2.4268717313332942e+01 8.4981210626819303e-01 2 0 0 -86 0 -P 162 3214 1.1200777844798961e+00 4.1111180711726349e-02 3.7259896703360691e+00 4.1247208876059354e+00 1.3689627477534603e+00 2 0 0 -87 0 -P 163 -3122 5.4889822392614185e-01 6.7168289205653042e-02 1.2394553573684344e+00 1.7569269434479631e+00 1.1156800000000000e+00 2 0 0 -88 0 -P 164 -211 -1.8246867227292973e-01 -7.4395915930269774e-01 9.3316746363469338e-01 1.2153400129831278e+00 1.3957000000000000e-01 1 0 0 0 0 -P 165 213 -2.4505059959837305e-01 -1.9411646561574297e-01 4.9179202248504200e-01 1.1013212363778255e+00 9.3451488684246398e-01 2 0 0 -89 0 -P 166 111 1.0831519365169956e-01 -8.5977649139333909e-02 -1.2164921808366023e-01 2.2834725745604548e-01 1.3497999999999999e-01 2 0 0 -90 0 -P 167 2112 2.1446758121909784e-01 -3.2834007745682020e-01 2.5652908362645738e-01 1.0499535730233749e+00 9.3957000000000002e-01 1 0 0 0 0 -P 168 -3122 -1.6966076865868715e-01 -3.3109432038849090e-01 -2.5618579747388798e-01 1.2036532933709381e+00 1.1156800000000000e+00 2 0 0 -91 0 -P 169 -323 1.8511690574403743e+00 7.7549450304113823e-02 -1.7771148289683374e+00 2.7167454062741467e+00 8.8866624258231075e-01 2 0 0 -92 0 -P 190 3322 -8.9819328650589736e-01 -1.4101551478664545e+00 -4.9514548113054522e+00 5.3889846427113186e+00 1.3149000000000000e+00 2 0 0 -104 0 -P 191 311 -9.8211331445284256e-01 -7.9298343389061809e-01 -1.4504485608208735e+00 1.9861635746679696e+00 4.9767000000000000e-01 2 0 0 -105 0 -P 192 -3212 -1.7421317431910346e+00 -8.2221491446806805e-01 -3.7329995940397152e+00 4.3667518646939678e+00 1.1925500000000000e+00 2 0 0 -106 0 -P 193 211 -1.4263310139354122e+00 -6.0848557736261411e-01 -2.6734691732657865e+00 3.0937989696285668e+00 1.3957000000000000e-01 1 0 0 0 0 -P 194 -211 -2.5524022272364206e+00 -5.2387494780839883e-01 -2.0619036105597894e+00 3.3256771302521524e+00 1.3957000000000000e-01 1 0 0 0 0 -P 195 211 -2.0644196153139507e-01 1.6631552161324753e-02 -9.1057393117718233e-01 9.4420313547863910e-01 1.3957000000000000e-01 1 0 0 0 0 -P 196 311 -9.4646039874614889e+00 -5.6457554838761190e+00 -1.0111196049899565e+01 1.4964532889856393e+01 4.9767000000000000e-01 2 0 0 -107 0 -P 170 221 1.1371300019760869e-01 -4.0058843868012450e-01 -1.2195001765893660e+00 1.4001013987635382e+00 5.4744999999999999e-01 2 0 0 -93 0 -P 171 2212 1.2523629043783191e-01 1.5016324154887450e-01 -1.0511017569858179e+00 1.4224621696177961e+00 9.3827000000000005e-01 1 0 0 0 0 -P 172 -211 5.5214282633985745e-01 1.1107501711974165e-01 -2.9656055335364906e+00 3.0218364160802897e+00 1.3957000000000000e-01 1 0 0 0 0 -P 173 -3114 2.4243956428752380e+00 1.3862290434432972e-01 -3.4795719084528560e+00 4.4684697068205574e+00 1.4010318739691290e+00 2 0 0 -94 0 -P 174 -321 9.7258158118116156e-01 -3.2442714147895962e-01 -5.7679095353058232e+00 5.8790806483371956e+00 4.9359999999999998e-01 1 0 0 0 0 -P 175 321 1.1597250287476084e+00 4.0770177789498285e-01 -8.7674225604355964e+00 8.8669342049683344e+00 4.9359999999999998e-01 1 0 0 0 0 -P 176 -321 1.2473896171875081e+00 5.8064712076131186e-01 -7.6950130852787115e+00 7.8326240353106558e+00 4.9359999999999998e-01 1 0 0 0 0 -P 177 211 4.6411646485160624e-01 -3.1056116558930160e-03 -6.8807161452354304e+00 6.8977639995852016e+00 1.3957000000000000e-01 1 0 0 0 0 -P 178 113 1.1429721118154468e+00 2.0039644079081445e+00 -1.8192672029751531e+01 1.8365275501470027e+01 9.9386622150112869e-01 2 0 0 -95 0 -P 179 113 -3.7950464568590037e-01 6.9483727246069926e-01 -1.1395936644018100e+01 1.1448140272842123e+01 7.5214433514938095e-01 2 0 0 -96 0 -P 180 -211 1.1066748123962553e+00 1.5207401839636081e+00 -2.0061478070674706e+01 2.0149932059750874e+01 1.3957000000000000e-01 1 0 0 0 0 -P 181 211 2.4841143236311466e-02 2.3230814679517509e-01 -4.8359467720177013e-01 5.5491238423969202e-01 1.3957000000000000e-01 1 0 0 0 0 -P 182 221 -4.2542141885817947e-01 5.9981854143176938e-01 -9.4453389518417676e+00 9.4897257644226993e+00 5.4744999999999999e-01 2 0 0 -97 0 -P 183 111 -3.2417120919680359e-01 -3.9808752168111899e-01 -7.9310594479818883e+00 7.9488039487468249e+00 1.3497999999999999e-01 2 0 0 -98 0 -P 184 111 -5.0210374058263441e-01 1.5238011936667630e+00 -8.2367846286676585e+00 8.3926705442060054e+00 1.3497999999999999e-01 2 0 0 -99 0 -P 185 -211 2.4005831721027357e-01 -3.1272585897954058e-01 -3.1418638717544294e+00 3.1695762858893386e+00 1.3957000000000000e-01 1 0 0 0 0 -P 186 111 -7.1801802285008720e-01 -1.5663690926018516e+00 -4.6475347856871210e+00 4.9585140112706885e+00 1.3497999999999999e-01 2 0 0 -100 0 -P 187 213 -8.7754060313250792e-01 1.0687002965254111e-01 -7.7721991707009082e+00 7.8598301364746987e+00 7.6704048902773225e-01 2 0 0 -101 0 -P 188 -213 -1.7607285674592426e+00 -2.1828765548774491e+00 -9.9325807070362337e+00 1.0374911328171784e+01 1.0571236557461503e+00 2 0 0 -102 0 -P 189 111 6.0732737211851184e-02 -1.4876097180116929e-01 -8.8365199189003499e-02 2.2769782811477235e-01 1.3497999999999999e-01 2 0 0 -103 0 -V -21 0 0 0 0 0 2 1 0 -P 61 1 2.6048674114218304e+00 1.3071749066125802e+00 -4.9087263234386977e+00 5.7087331857413925e+00 0 2 0 0 -21 0 -P 62 -1 -2.6048674114218304e+00 -1.3071749066125802e+00 3.9636024064472406e+00 4.9197748428113490e+00 0 2 0 0 -21 0 -P 197 92 0 0 -9.4512391699145715e-01 1.0628508028552741e+01 1.0586402774056010e+01 2 0 0 -22 0 -V -22 0 0 0 0 0 0 7 0 -P 198 2112 8.8440371644850424e-01 7.2509545653771157e-01 -1.6825725857017333e+00 2.2409318699627123e+00 9.3957000000000002e-01 1 0 0 0 0 -P 199 111 1.2648914843620779e-01 -7.9047867519565176e-02 -4.6372272917197632e-01 5.0547644849410533e-01 1.3497999999999999e-01 2 0 0 -108 0 -P 200 -2112 7.9792227079239864e-01 4.2225813261826067e-01 -1.8859938515610912e+00 2.2923233789792832e+00 9.3957000000000002e-01 1 0 0 0 0 -P 201 313 -3.4282732844273572e-01 -3.3700984327477074e-01 4.3482101578220667e-01 1.2094706287093313e+00 1.0210992480427190e+00 2 0 0 -109 0 -P 202 -321 3.5673637654704443e-01 4.8759571964329723e-01 3.3223694327211195e-01 8.4795800287583600e-01 4.9359999999999998e-01 1 0 0 0 0 -P 203 321 -1.2446271985425277e+00 -6.2023897699434571e-01 1.2956105175346537e+00 1.9636804284509302e+00 4.9359999999999998e-01 1 0 0 0 0 -P 204 -313 -5.7809698523889164e-01 -5.9865262101058792e-01 1.0244967728543724e+00 1.5686672710805456e+00 8.4766873528821429e-01 2 0 0 -110 0 -V -23 0 0 0 0 0 0 1 0 -P 205 130 7.0071389671228546e-01 -5.7580058229065734e-01 -6.8836441564177575e-01 1.2426050350911262e+00 4.9767000000000000e-01 1 0 0 0 0 -V -24 0 0 0 0 0 0 2 0 -P 206 211 2.3601805446980989e-01 -2.6618733465545696e-01 -2.6116918438156855e-01 4.6287076699357904e-01 1.3957000000000000e-01 1 0 0 0 0 -P 207 111 2.6649022515117178e+00 -1.5231421757903791e+00 -8.8732310945740023e-01 3.1980037521492721e+00 1.3497999999999999e-01 2 0 0 -111 0 -V -25 0 5.6566919601848354e-03 -2.2814444155476094e-03 -4.8106729505785935e-03 1.0328232916324018e-02 0 3 0 -P 210 -2214 7.5977813013376927e-01 -1.0292071107408740e-01 -1.0394990117134257e+00 1.7454207711993177e+00 1.1739165189157490e+00 2 0 0 -114 0 -P 208 311 9.8128386922335242e-01 -7.1757193254617169e-01 -6.8412429949797804e-01 1.4810567161454691e+00 4.9767000000000000e-01 2 0 0 -112 0 -P 209 111 1.5789089989780553e-01 5.4611185360415225e-02 1.0867920409584220e-01 2.4071287385579151e-01 1.3497999999999999e-01 2 0 0 -113 0 -V -26 0 0 0 0 0 0 2 0 -P 211 431 -8.9544496400355400e-01 1.0812584738803073e+00 -7.5166320522356385e+00 7.8959287756155350e+00 1.9684999999999999e+00 2 0 0 -115 0 -P 212 22 -1.2934347935662455e-01 1.8056299939314888e-01 -1.1528577356542393e+00 1.1740586403837536e+00 0 1 0 0 0 0 -V -27 0 0 0 0 0 0 1 0 -P 213 130 1.5493234368667361e-01 -5.2903668164922500e-02 -2.2756098012880561e+00 2.3351398728649673e+00 4.9767000000000000e-01 1 0 0 0 0 -V -28 0 0 0 0 0 0 1 0 -P 214 310 -1.0479399410759047e+00 3.5508361290150353e-01 -1.2285977863989042e+00 1.7266703338789495e+00 4.9767000000000000e-01 2 0 0 -116 0 -V -29 0 0 0 0 0 0 2 0 -P 215 311 -6.3303113772774122e-01 -2.0717802444266725e-01 -3.2448067298090227e-01 8.9253251547659829e-01 4.9767000000000000e-01 2 0 0 -117 0 -P 216 211 -3.2133320191013570e-01 -8.8845493592173877e-02 -7.7314963448494112e-01 8.5345690610929803e-01 1.3957000000000000e-01 1 0 0 0 0 -V -30 0 0 0 0 0 0 2 0 -P 217 -311 2.9210454944064679e-01 -1.6108553023224306e-01 -1.5223884321452796e-01 6.1816317436209656e-01 4.9767000000000000e-01 2 0 0 -118 0 -P 218 111 1.6018610539930081e-01 2.4271751083915055e-01 -4.3737795180144273e-01 5.4230107094949964e-01 1.3497999999999999e-01 2 0 0 -119 0 -V -31 0 0 0 0 0 0 2 0 -P 219 -211 1.9395608964315619e-02 -2.0304028947714121e-03 5.1617951780191884e-01 5.3507138933158549e-01 1.3957000000000000e-01 1 0 0 0 0 -P 220 211 -2.6130105545298021e-01 -1.3189239271634661e-02 -2.4039842802187339e-01 3.8173732684765543e-01 1.3957000000000000e-01 1 0 0 0 0 -V -32 0 8.0482296730048227e-05 -1.6533279978182732e-04 9.9876545526457765e-05 2.1333955713841350e-04 0 2 0 -P 221 22 5.4686178191785839e-02 -5.8094679943429033e-02 2.1759714948860068e-03 7.9814189057458726e-02 0 1 0 0 0 0 -P 222 22 2.0679224809817040e-01 -4.7905401060734981e-01 3.2231230740117400e-01 6.1330335271768321e-01 0 1 0 0 0 0 -V -33 0 0 0 0 0 0 3 0 -P 223 -211 4.2801781509197134e-01 -1.0403622668171376e-01 -1.1956260927992245e-01 4.7728166624761242e-01 1.3957000000000000e-01 1 0 0 0 0 -P 224 211 3.2705663503245730e-01 -4.8246898921629483e-01 -1.9339384413010952e-01 6.2978038388121327e-01 1.3957000000000000e-01 1 0 0 0 0 -P 225 111 4.6015692466867701e-02 -2.0383276089091178e-02 1.0990311970840183e-01 1.8119386860202738e-01 1.3497999999999999e-01 2 0 0 -120 0 -V -34 0 0 0 0 0 0 2 0 -P 226 -211 -2.1866773818747592e-01 3.1579766966145423e-01 -1.3502781361186795e+00 1.4107709160837443e+00 1.3957000000000000e-01 1 0 0 0 0 -P 227 111 -1.7214071331345446e-01 -4.8264226777565866e-02 -6.7228410955527756e-02 2.3388270651355680e-01 1.3497999999999999e-01 2 0 0 -121 0 -V -35 0 0 0 0 0 0 2 0 -P 228 211 -3.9269766283052082e-01 -1.2163004153164388e-01 -1.0675916516465207e+00 1.1524916663303422e+00 1.3957000000000000e-01 1 0 0 0 0 -P 229 111 -3.1703515942667282e-01 4.6263260948433826e-01 -3.4987204494063704e+00 3.5459560921090518e+00 1.3497999999999999e-01 2 0 0 -122 0 -V -36 0 0 0 0 0 0 2 0 -P 230 -211 -2.5667807075318744e-01 -1.0146763652409606e-01 -7.0052877713175954e-01 7.6576737052259081e-01 1.3957000000000000e-01 1 0 0 0 0 -P 231 211 2.5100062397212689e-02 -4.5049125374518711e-01 -4.9833364175074433e+00 5.0056661912066387e+00 1.3957000000000000e-01 1 0 0 0 0 -V -37 0 -2.1056308062828918e-04 1.7930210471794663e-04 -2.1925084410489518e-03 2.2107432955447886e-03 0 2 0 -P 232 22 -2.3018986810834105e-01 2.7063917719313463e-01 -3.0344545295281806e+00 3.0551836657369069e+00 0 1 0 0 0 0 -P 233 22 -2.3047286774980685e-01 1.2163186034124118e-01 -1.7622407592754459e+00 1.7814052166395471e+00 0 1 0 0 0 0 -V -38 0 0 0 0 0 0 1 0 -P 234 310 2.7517509894565889e-01 -1.1487381757051843e-01 -2.1239959178119161e+00 2.2018063985792806e+00 4.9767000000000000e-01 2 0 0 -123 0 -V -39 0 0 0 0 0 0 2 0 -P 235 -321 -2.9230515250873707e-01 6.8174647361061602e-02 -1.5259649802190853e+00 1.6316556516560088e+00 4.9359999999999998e-01 1 0 0 0 0 -P 236 111 -4.1140648547337716e-01 -2.6823730180912397e-01 -2.6724082079295770e+00 2.7205131458202456e+00 1.3497999999999999e-01 2 0 0 -124 0 -V -40 0 -4.3948076794121348e-05 1.6065449346688851e-04 -6.1057488976406712e-04 6.3374495564102974e-04 0 2 0 -P 237 22 -2.3452133138899382e-02 1.5314581901608029e-01 -3.8829621787147561e-01 4.1806410662022048e-01 0 1 0 0 0 0 -P 238 22 -1.5625329294792351e-01 5.0377676570762064e-01 -2.1083686814135736e+00 2.1733441094289487e+00 0 1 0 0 0 0 -V -41 0 0 0 0 0 0 2 0 -P 239 -211 -1.5863681543682859e-01 3.1354292411407046e-02 -6.1213933937085041e-01 6.4833871284224542e-01 1.3957000000000000e-01 1 0 0 0 0 -P 240 111 -2.1813350257864123e-01 -2.5306866209122109e-01 -7.2407392074981836e+00 7.2496999830393873e+00 1.3497999999999999e-01 2 0 0 -125 0 -V -42 0 3.5910695792528850e-04 9.3673956898613795e-05 -4.6650550741745643e-02 4.6652085085306563e-02 0 2 0 -P 241 22 3.4522379636973621e-01 1.5547952859967618e-01 -4.9535364031978155e+01 4.9536810990757047e+01 0 1 0 0 0 0 -P 242 22 3.1283714292142595e-01 1.6177329345823128e-02 -3.5951437496245113e+01 3.5952802211098856e+01 0 1 0 0 0 0 -V -43 0 0 0 0 0 0 2 0 -P 243 311 -3.9600823279035513e-01 8.5430585125442424e-02 -3.6195759503890365e+01 3.6201447517988591e+01 4.9767000000000000e-01 2 0 0 -126 0 -P 244 211 -8.8322010909638760e-02 -2.3230389018430980e-01 -4.7761957316121880e+01 4.7762807835458695e+01 1.3957000000000000e-01 1 0 0 0 0 -V -44 0 0 0 0 0 0 3 0 -P 245 111 5.2116772754951829e-02 1.2637830758610888e-01 -7.9018190793191891e+01 7.9018424329167104e+01 1.3497999999999999e-01 2 0 0 -127 0 -P 246 111 -5.2246677240471596e-03 -1.4230926848259157e-01 -7.6470870445203118e+01 7.6471122166949328e+01 1.3497999999999999e-01 2 0 0 -128 0 -P 247 221 3.1118378890592058e-01 -1.3630984864950577e-01 -2.8432103404018636e+02 2.8432176405422894e+02 5.4744999999999999e-01 2 0 0 -129 0 -V -45 0 0 0 0 0 0 2 0 -P 248 -311 -5.5517974597127173e-01 -1.4786398120312963e-01 -3.9774196700709734e+02 3.9774269331115448e+02 4.9767000000000000e-01 2 0 0 -130 0 -P 249 111 7.1429956195406319e-02 1.1262397425854469e-01 -2.4149855125190902e+02 2.4149862579892570e+02 1.3497999999999999e-01 2 0 0 -131 0 -V -46 0 0 0 0 0 0 2 0 -P 250 2112 2.2151623266281140e-01 2.2948599839512826e-01 -1.1254541776645710e+03 1.1254546150545946e+03 9.3957000000000002e-01 1 0 0 0 0 -P 251 111 3.3522844139410250e-02 2.0556422059052964e-01 -7.8301754502786298e+02 7.8301758436288753e+02 1.3497999999999999e-01 2 0 0 -132 0 -V -47 0 0 0 0 0 0 3 0 -P 252 -211 -5.8614752007926270e-02 -3.3655372812363318e-02 -8.2483134952050921e+02 8.2483136409813051e+02 1.3957000000000000e-01 1 0 0 0 0 -P 253 211 -1.0931233412869321e-01 5.8050394161407254e-02 -2.2407062653002762e+02 2.2407070418146742e+02 1.3957000000000000e-01 1 0 0 0 0 -P 254 111 8.5648550805267079e-02 -1.7810518048657847e-01 -1.6434057182756410e+02 1.6434074608976536e+02 1.3497999999999999e-01 2 0 0 -133 0 -V -48 0 0 0 0 0 0 2 0 -P 255 -211 -1.9543881906526395e-01 2.2757020818337852e-02 -2.9277793211329066e+02 2.9277803149576221e+02 1.3957000000000000e-01 1 0 0 0 0 -P 256 111 4.5496572858580364e-01 1.4838294526426893e-01 -2.6649909534793096e+02 2.6649955919696873e+02 1.3497999999999999e-01 2 0 0 -134 0 -V -49 0 0 0 0 0 0 2 0 -P 258 111 -4.9286609976579326e-01 8.2167204288579737e-02 -3.6771637985725704e+01 3.6775280395877665e+01 1.3497999999999999e-01 2 0 0 -135 0 -P 257 22 -1.4711751798151942e-01 -5.6259697251430631e-02 -9.8098834067931008e+01 9.8098960515415683e+01 0 1 0 0 0 0 -V -50 0 0 0 0 0 0 2 0 -P 259 -211 -2.3197224114737774e-01 2.0693030568941703e-01 -3.8896053948983713e+01 3.8897546501794004e+01 1.3957000000000000e-01 1 0 0 0 0 -P 260 111 1.0357375259596519e-01 -4.1258376884160269e-01 -3.6822266804582732e+01 3.6824971216781876e+01 1.3497999999999999e-01 2 0 0 -136 0 -V -51 0 0 0 0 0 0 2 0 -P 261 311 -1.6443516368771718e-01 3.8717781180786159e-01 -4.8340509295770076e+01 4.8344901075339337e+01 4.9767000000000000e-01 2 0 0 -137 0 -P 262 211 1.4456308089166173e-01 -1.1923682482498356e-01 -1.9767890695868459e+01 1.9769271566080882e+01 1.3957000000000000e-01 1 0 0 0 0 -V -52 0 0 0 0 0 0 2 0 -P 263 -211 1.8683106059886168e-01 -2.5164614323774132e-01 -5.7120358611063180e+00 5.7223303898040978e+00 1.3957000000000000e-01 1 0 0 0 0 -P 264 111 5.9359015453132734e-02 -3.5269859385229346e-01 -5.2306540289773871e+01 5.2307937222537824e+01 1.3497999999999999e-01 2 0 0 -138 0 -V -53 0 0 0 0 0 0 2 0 -P 265 321 -2.7060017363760236e-01 -2.0970188485683577e-01 -9.6242418100430420e+00 9.6429700151284194e+00 4.9359999999999998e-01 1 0 0 0 0 -P 266 111 1.7121583094049395e-01 -3.2406303517067925e-01 -1.1157425407826961e+01 1.1164259628078851e+01 1.3497999999999999e-01 2 0 0 -139 0 -V -54 0 0 0 0 0 0 2 0 -P 267 -321 -4.0442913609014586e-01 -1.6147687955186629e-02 -1.3223821966351727e+01 1.3239219464595010e+01 4.9359999999999998e-01 1 0 0 0 0 -P 268 111 1.2461278822945901e-01 3.3466457865971788e-01 -1.0255848812896222e+01 1.0262951973023387e+01 1.3497999999999999e-01 2 0 0 -140 0 -V -55 0 0 0 0 0 0 2 0 -P 269 211 1.4409689320731370e-01 5.6493751537046411e-01 -3.2584013389051369e+00 3.3130918159905778e+00 1.3957000000000000e-01 1 0 0 0 0 -P 270 111 -1.4346561340253111e-01 3.0620444051767443e-01 -5.4173952238189038e-01 6.5272111359466933e-01 1.3497999999999999e-01 2 0 0 -141 0 -V -56 0 0 0 0 0 0 3 0 -P 271 -211 -1.1482207741060419e-02 -1.8312117192440214e-01 -6.4775573213280524e-01 6.8755543639220962e-01 1.3957000000000000e-01 1 0 0 0 0 -P 272 211 5.9785090683486621e-02 -1.8030085794299547e-01 -1.0356062916028855e-01 2.5746309493806629e-01 1.3957000000000000e-01 1 0 0 0 0 -P 273 111 6.9407967703243298e-02 1.8135039476984641e-01 -2.2897781125613634e-01 3.2917452834556382e-01 1.3497999999999999e-01 2 0 0 -142 0 -V -57 0 0 0 0 0 0 2 0 -P 274 -211 -4.3837163049861572e-01 2.9152299187613313e-02 -2.8462395439024579e-01 5.4176574576719017e-01 1.3957000000000000e-01 1 0 0 0 0 -P 275 211 1.6238597675872291e-01 3.5045427364307591e-01 -2.1453629200455779e-01 4.6334976945029910e-01 1.3957000000000000e-01 1 0 0 0 0 -V -58 0 0 0 0 0 0 2 0 -P 276 -211 2.0464411704977142e-01 2.3284289266599723e-01 -4.3412562821404987e-01 5.5139810779544129e-01 1.3957000000000000e-01 1 0 0 0 0 -P 277 111 1.7384618945869995e-01 -2.2906445694892602e-01 3.4351937443349062e-01 4.6788693510055751e-01 1.3497999999999999e-01 2 0 0 -143 0 -V -59 0 0 0 0 0 0 2 0 -P 278 213 4.3992394891943581e-01 2.2880560970011726e-01 1.0362837885132530e+00 1.4104866020206339e+00 8.1835400425562832e-01 2 0 0 -144 0 -P 279 -211 3.0681245317011434e-02 -9.2785550344249429e-02 1.4467368603156844e-01 2.2351903162113226e-01 1.3957000000000000e-01 1 0 0 0 0 -V -60 0 0 0 0 0 0 2 0 -P 280 -311 8.9352434965555338e-01 -6.9110102864767708e-01 1.3634045967932928e+00 1.8391720742449138e+00 4.9767000000000000e-01 2 0 0 -145 0 -P 281 -211 5.6647411898707156e-01 -4.8869691139755277e-02 1.2180527593897912e+00 1.3514486611600747e+00 1.3957000000000000e-01 1 0 0 0 0 -V -61 0 0 0 0 0 0 2 0 -P 282 211 3.3902061508967224e-01 -3.9965183653292830e-01 1.1898441795454691e+00 1.3076182640197989e+00 1.3957000000000000e-01 1 0 0 0 0 -P 283 111 1.3052456300222421e+00 -7.8115318420007707e-01 1.8715126470489638e+00 2.4155011157816300e+00 1.3497999999999999e-01 2 0 0 -146 0 -V -62 0 0 0 0 0 0 2 0 -P 284 211 1.4070112479551919e-01 -1.0793828470377013e-02 3.5863792581214382e-01 4.0989542566685100e-01 1.3957000000000000e-01 1 0 0 0 0 -P 285 -211 1.9298980497479277e+00 -2.1173709670199026e+00 5.4886366910921414e+00 6.1929297433527006e+00 1.3957000000000000e-01 1 0 0 0 0 -V -63 0 0 0 0 0 0 2 0 -P 286 211 6.1961341303921946e-01 -3.1792097930846813e-01 1.0711169548656323e+00 1.2852104289194011e+00 1.3957000000000000e-01 1 0 0 0 0 -P 287 111 1.0786305410186852e+00 -1.7407558071848346e+00 4.4223555485988415e+00 4.8753587378662653e+00 1.3497999999999999e-01 2 0 0 -147 0 -V -64 0 0 0 0 0 0 2 0 -P 288 211 1.0422416969481501e+00 -1.3006721691053791e+00 1.6880434592323161e+00 2.3763388545196276e+00 1.3957000000000000e-01 1 0 0 0 0 -P 289 -211 1.8996147715411444e+00 -1.8005444514622688e+00 4.2213455750106634e+00 4.9688766185638968e+00 1.3957000000000000e-01 1 0 0 0 0 -V -65 0 0 0 0 0 0 2 0 -P 290 321 4.0566606545034806e-01 -6.9985854291668093e-01 1.6213274746742699e+00 1.8779538537687956e+00 4.9359999999999998e-01 1 0 0 0 0 -P 291 -211 3.1541098797646633e-01 -1.2938587588144628e+00 3.0596643542673432e+00 3.3398473505193902e+00 1.3957000000000000e-01 1 0 0 0 0 -V -66 0 0 0 0 0 0 2 0 -P 292 -311 2.5175435783133765e-01 2.1313109775713732e-01 6.3817070071050166e+00 6.4095760292667956e+00 4.9767000000000000e-01 2 0 0 -148 0 -P 293 111 2.7600478909195956e-02 -2.9500235341042041e-01 5.3366817197150453e+00 5.3466044881676478e+00 1.3497999999999999e-01 2 0 0 -149 0 -V -67 0 0 0 0 0 0 2 0 -P 294 -211 2.7565212559822333e-01 1.2963583969597678e-01 3.5266895443427737e+00 3.5425708845917452e+00 1.3957000000000000e-01 1 0 0 0 0 -P 295 211 -3.5836080004238641e-01 2.1559117239341402e-01 2.5939841337981151e+00 2.6311851869295220e+00 1.3957000000000000e-01 1 0 0 0 0 -V -68 0 0 0 0 0 0 1 0 -P 296 310 2.4695926864221421e-01 4.1868501205522318e-01 1.8281949053007391e+01 1.8295180311364678e+01 4.9767000000000000e-01 2 0 0 -150 0 -V -69 0 0 0 0 0 0 1 0 -P 297 310 2.9376002073213692e-01 5.4077841199444876e-01 2.3165952234661379e+01 2.3179468384934378e+01 4.9767000000000000e-01 2 0 0 -151 0 -V -70 0 0 0 0 0 0 3 0 -P 298 111 -7.3014847317132536e-02 3.6666985674012392e-01 2.2327277065206818e+01 2.2330815003010546e+01 1.3497999999999999e-01 2 0 0 -152 0 -P 299 111 -6.8709360746503190e-02 2.8337710712952435e-01 1.3589332359602992e+01 1.3593130512919101e+01 1.3497999999999999e-01 2 0 0 -153 0 -P 300 111 -5.8255209471673002e-02 3.6797523313229671e-04 7.8563483379036310e+00 7.8577237551162042e+00 1.3497999999999999e-01 2 0 0 -154 0 -V -71 0 0 0 0 0 0 2 0 -P 301 2212 1.0317604671954461e+00 2.0632794933723184e-01 5.2326524268660144e+01 5.2345511684536277e+01 9.3827000000000005e-01 1 0 0 0 0 -P 302 211 1.4692461191261935e-01 1.1989080247045376e-01 1.5123711862160690e+01 1.5125544648727947e+01 1.3957000000000000e-01 1 0 0 0 0 -V -72 0 0 0 0 0 0 2 0 -P 303 -211 -3.2198747189268129e-01 -9.6850833808676623e-02 4.6988507635577655e+01 4.6989917914587856e+01 1.3957000000000000e-01 1 0 0 0 0 -P 304 111 -2.7873164949551793e-01 -8.2638242188484548e-02 7.1702453720709034e+00 7.1774061267011149e+00 1.3497999999999999e-01 2 0 0 -155 0 -V -73 0 0 0 0 0 0 2 0 -P 305 -2212 2.5338377157655873e-01 -6.0579834534973953e-01 1.4196072898296641e+03 1.4196077517691594e+03 9.3827000000000005e-01 1 0 0 0 0 -P 306 111 2.3416759166387574e-01 2.9532218771703617e-02 1.6610797461973073e+02 1.6610819714415794e+02 1.3497999999999999e-01 2 0 0 -156 0 -V -74 0 0 0 0 0 0 2 0 -P 307 -211 5.8030238191292306e-02 2.4649524600033157e-01 4.1657029500783335e+02 4.1657039535967152e+02 1.3957000000000000e-01 1 0 0 0 0 -P 308 211 -4.7179331260214574e-01 -3.3273969337000420e-01 1.0192483723750648e+03 1.0192485454361155e+03 1.3957000000000000e-01 1 0 0 0 0 -V -75 0 0 0 0 0 0 2 0 -P 309 2212 -2.6758753905159788e-01 -2.7884430113976838e-01 2.3144541620770879e+03 2.3144543845286262e+03 9.3827000000000005e-01 1 0 0 0 0 -P 310 211 2.2815662682757848e-01 -2.6928563661664261e-02 1.0051037300159285e+03 1.0051037659626548e+03 1.3957000000000000e-01 1 0 0 0 0 -V -76 0 0 0 0 0 0 2 0 -P 311 -321 -4.5347624236370176e+00 1.1907450897810774e+00 1.0993094460568804e+01 1.1961342353041172e+01 4.9359999999999998e-01 1 0 0 0 0 -P 312 211 -3.7209029891736556e+00 1.5220631875289932e+00 9.4377232787534950e+00 1.0259234663116835e+01 1.3957000000000000e-01 1 0 0 0 0 -V -77 0 0 0 0 0 0 2 0 -P 313 311 -3.5596336877401362e+00 8.8923992828974985e-01 8.7633501659252779e+00 9.5134494900893749e+00 4.9767000000000000e-01 2 0 0 -157 0 -P 314 211 -3.4944866593546617e+00 8.7788614127547804e-01 8.4904996449162073e+00 9.2244341341175780e+00 1.3957000000000000e-01 1 0 0 0 0 -V -78 0 0 0 0 0 0 2 0 -P 315 -211 -4.7673302181934996e-02 1.6089739047097859e-01 1.2551797364767447e+00 1.2740159613455126e+00 1.3957000000000000e-01 1 0 0 0 0 -P 316 211 -7.6805537606505728e-02 9.1776230273459644e-02 2.7290467811597724e-01 3.2905731307451080e-01 1.3957000000000000e-01 1 0 0 0 0 -V -79 0 9.0412383846874141e-05 2.9827273200513847e-06 3.8488010315316091e-04 3.9546202597281295e-04 0 2 0 -P 317 22 1.3001177241993309e+00 7.6588306497609115e-02 5.4468358006212130e+00 5.6003742825277634e+00 0 1 0 0 0 0 -P 318 22 1.1640677187514868e-01 -2.9856806517261601e-02 5.8322414217913543e-01 5.9547658682301741e-01 0 1 0 0 0 0 -V -80 0 0 0 0 0 0 2 0 -P 319 -211 1.2815868877039274e+00 5.8886373999562425e-01 8.6631621951294644e+00 8.7783303913122701e+00 1.3957000000000000e-01 1 0 0 0 0 -P 320 211 5.3693988632829892e-01 4.9357797188294417e-01 2.7670560188673816e+00 2.8649611606980869e+00 1.3957000000000000e-01 1 0 0 0 0 -V -81 0 0 0 0 0 0 2 0 -P 321 211 1.2611864020975216e-01 1.2389612141421584e-01 1.5268330665860421e+00 1.5433584024556255e+00 1.3957000000000000e-01 1 0 0 0 0 -P 322 111 1.3774964266230527e+00 2.3042017249713853e-01 6.9719171579236301e+00 7.1117113494996964e+00 1.3497999999999999e-01 2 0 0 -158 0 -V -82 0 0 0 0 0 0 2 0 -P 323 22 3.8757047271998544e+00 1.0974957903932110e+00 2.5137272071142927e+01 2.5457965969830195e+01 0 1 0 0 0 0 -P 324 111 7.6480365263055428e-01 5.6549345963268216e-01 5.5303297068260200e+00 5.6131518549355803e+00 1.3497999999999999e-01 2 0 0 -159 0 -V -83 0 0 0 0 0 0 2 0 -P 325 -211 3.8588647504390106e+00 1.3164304993742422e+00 2.6975321409456164e+01 2.7282068677983851e+01 1.3957000000000000e-01 1 0 0 0 0 -P 326 111 1.3814159463609341e-01 1.5224944402949425e-01 1.3575896401481926e+00 1.3796855528755789e+00 1.3497999999999999e-01 2 0 0 -160 0 -V -84 0 0 0 0 0 0 2 0 -P 327 211 4.4402643587743125e+00 1.2312481262739294e+00 2.3969983537631109e+01 2.4409250502697965e+01 1.3957000000000000e-01 1 0 0 0 0 -P 328 -211 4.9177559628960754e+00 1.9209371235558570e+00 3.0908055846156746e+01 3.1356047568488268e+01 1.3957000000000000e-01 1 0 0 0 0 -V -85 0 0 0 0 0 0 2 0 -P 329 22 2.3023456618513665e+00 4.3664135995883580e-01 1.3453062152332874e+01 1.3655633727454896e+01 0 1 0 0 0 0 -P 330 22 5.8319108406716824e-01 2.5998213749120752e-01 2.4833213834801269e+00 2.5640958730124712e+00 0 1 0 0 0 0 -V -86 0 0 0 0 0 0 2 0 -P 331 -321 3.8129236036372465e+00 2.3916504287804465e+00 9.7796113830415905e+00 1.0776957731381170e+01 4.9359999999999998e-01 1 0 0 0 0 -P 332 211 4.3871570358615983e+00 3.0086902262651471e+00 1.2397932613841485e+01 1.3491759581951781e+01 1.3957000000000000e-01 1 0 0 0 0 -V -87 0 0 0 0 0 0 2 0 -P 333 3122 1.1609162906290964e+00 -1.4066122912385346e-02 3.5008612023205194e+00 3.8534005125310915e+00 1.1156800000000000e+00 2 0 0 -161 0 -P 334 111 -4.0838506149200336e-02 5.5177303624111697e-02 2.2512846801554973e-01 2.7132037507484408e-01 1.3497999999999999e-01 2 0 0 -162 0 -V -88 0 1.0975634495181953e+02 1.3430806656920803e+01 2.4783845861744948e+02 3.5131081000941208e+02 0 2 0 -P 335 -2212 4.3598416274050478e-01 5.6969389177054186e-02 1.1732545494018880e+00 1.5653129182549963e+00 9.3827000000000005e-01 1 0 0 0 0 -P 336 211 1.1291406118563700e-01 1.0198900028598853e-02 6.6200807966546288e-02 1.9161402519296616e-01 1.3957000000000000e-01 1 0 0 0 0 -V -89 0 0 0 0 0 0 2 0 -P 337 211 2.1870704015585739e-02 -4.7659285060522572e-01 4.7808091053954144e-01 6.8968124149092913e-01 1.3957000000000000e-01 1 0 0 0 0 -P 338 111 -2.6692130361395883e-01 2.8247638498948274e-01 1.3711111945500606e-02 4.1163999488689595e-01 1.3497999999999999e-01 2 0 0 -163 0 -V -90 0 8.5034176885997429e-06 -6.7497812436783921e-06 -9.5502217000439534e-06 1.7926682700109905e-05 0 2 0 -P 339 22 1.8935384391547218e-02 -1.1026659860805992e-02 2.9922270718085193e-02 3.7087441198712261e-02 0 1 0 0 0 0 -P 340 22 8.9379809260152335e-02 -7.4950989278527919e-02 -1.5157148880174542e-01 1.9125981625733321e-01 0 1 0 0 0 0 -V -91 0 -2.6421968631437817e+01 -5.1562678965288278e+01 -3.9896866896154776e+01 1.8744987313214875e+02 0 2 0 -P 341 -2212 -7.3950672556528596e-02 -2.6360618044473205e-01 -2.8746064573095914e-01 1.0187939615468300e+00 9.3827000000000005e-01 1 0 0 0 0 -P 342 211 -9.5710096102158526e-02 -6.7488139943758838e-02 3.1274848257071206e-02 1.8485933182410788e-01 1.3957000000000000e-01 1 0 0 0 0 -V -92 0 0 0 0 0 0 2 0 -P 343 -311 1.1140884226725156e+00 1.6365689466410080e-01 -1.4262615386176185e+00 1.8841109304241952e+00 4.9767000000000000e-01 2 0 0 -164 0 -P 344 -211 7.3708063476785890e-01 -8.6107444359986976e-02 -3.5085329035071899e-01 8.3263447584995176e-01 1.3957000000000000e-01 1 0 0 0 0 -V -93 0 0 0 0 0 0 2 0 -P 345 22 -5.7123332739010456e-02 -3.3479252640843915e-01 -2.7213051787595932e-01 4.3520584743497520e-01 0 1 0 0 0 0 -P 346 22 1.7083633293661915e-01 -6.5795912271685339e-02 -9.4736965871340673e-01 9.6489555132856297e-01 0 1 0 0 0 0 -V -94 0 0 0 0 0 0 2 0 -P 347 -3212 1.9971148756783932e+00 8.2087761602473608e-02 -2.6812799831652443e+00 3.5505836249669493e+00 1.1925500000000000e+00 2 0 0 -165 0 -P 348 211 4.2728076719684455e-01 5.6535142741856115e-02 -7.9829192528761195e-01 9.1788608185360798e-01 1.3957000000000000e-01 1 0 0 0 0 -V -95 0 0 0 0 0 0 2 0 -P 349 211 6.1625006614860123e-01 3.3726744154614779e-01 -3.8762194687017835e+00 3.9418359460533079e+00 1.3957000000000000e-01 1 0 0 0 0 -P 350 -211 5.2672204566684544e-01 1.6666969663619966e+00 -1.4316452561049747e+01 1.4423439555416719e+01 1.3957000000000000e-01 1 0 0 0 0 -V -96 0 0 0 0 0 0 2 0 -P 351 211 -2.6966608895498762e-01 -6.5970053751465196e-02 -3.2902343026367840e+00 3.3048741880247143e+00 1.3957000000000000e-01 1 0 0 0 0 -P 352 -211 -1.0983855673091272e-01 7.6080732621216451e-01 -8.1057023413813170e+00 8.1432660848174052e+00 1.3957000000000000e-01 1 0 0 0 0 -V -97 0 0 0 0 0 0 3 0 -P 353 -211 -9.5798582554692188e-02 6.9395665012517205e-02 -2.6561900193963992e+00 2.6624834892977387e+00 1.3957000000000000e-01 1 0 0 0 0 -P 354 211 -1.0201638753756302e-01 7.8384892820417440e-02 -1.4266697985266141e+00 1.4392421733942666e+00 1.3957000000000000e-01 1 0 0 0 0 -P 355 111 -2.2760644876592431e-01 4.5203798359883485e-01 -5.3624791339187565e+00 5.3880001017306958e+00 1.3497999999999999e-01 2 0 0 -166 0 -V -98 0 -3.9923320403745477e-04 -4.9026487318803503e-04 -9.7674999660659484e-03 9.7893532142676720e-03 0 2 0 -P 356 22 -1.4843256441632337e-02 -9.8178167278801382e-02 -1.6499349459668522e+00 1.6529200224798102e+00 0 1 0 0 0 0 -P 357 22 -3.0932795275517122e-01 -2.9990935440231759e-01 -6.2811245020150359e+00 6.2958839262670150e+00 0 1 0 0 0 0 -V -99 0 -1.7845130097297728e-05 5.4156996543876026e-05 -2.9274128312893144e-04 2.9828158131490031e-04 0 2 0 -P 358 22 -4.1125557872182977e-01 1.3713585033970590e+00 -7.2366302516774024e+00 7.3768945156726886e+00 0 1 0 0 0 0 -P 359 22 -9.0848161860804577e-02 1.5244269026970386e-01 -1.0001543769902554e+00 1.0157760285333168e+00 0 1 0 0 0 0 -V -100 0 -1.7464889567159729e-05 -3.8099967344991282e-05 -1.1304546572434142e-04 1.2060964609259914e-04 0 2 0 -P 360 22 -3.0645574781966489e-01 -8.1589910932750886e-01 -2.2644604052437702e+00 2.4263939104955554e+00 0 1 0 0 0 0 -P 361 22 -4.1156227503042225e-01 -7.5046998327434278e-01 -2.3830743804433507e+00 2.5321201007751331e+00 0 1 0 0 0 0 -V -101 0 0 0 0 0 0 2 0 -P 362 211 -3.5384588913819282e-01 -2.4715825133371802e-01 -4.6086448568373415e+00 4.6309158182605330e+00 1.3957000000000000e-01 1 0 0 0 0 -P 363 111 -5.2369471399431522e-01 3.5402828098625916e-01 -3.1635543138635680e+00 3.2289143182141680e+00 1.3497999999999999e-01 2 0 0 -167 0 -V -102 0 0 0 0 0 0 2 0 -P 364 -211 -1.7431049169384474e+00 -1.7742747005688735e+00 -7.4560336745052949e+00 7.8611947822701023e+00 1.3957000000000000e-01 1 0 0 0 0 -P 365 111 -1.7623650520795352e-02 -4.0860185430857604e-01 -2.4765470325309402e+00 2.5137165459016839e+00 1.3497999999999999e-01 2 0 0 -168 0 -V -103 0 3.7599471820826971e-07 -9.2097511557332473e-07 -5.4706653600331399e-07 1.4096710382080819e-06 0 2 0 -P 366 22 -9.0039096884929875e-03 -2.1160661174125472e-02 3.1671981710379361e-02 3.9140240117649924e-02 0 1 0 0 0 0 -P 367 22 6.9736646900344174e-02 -1.2760031062704383e-01 -1.2003718089938287e-01 1.8855758799712244e-01 0 1 0 0 0 0 -V -104 0 -3.8731844410967580e+02 -6.0808637297836094e+02 -2.1351637808991841e+03 2.3238351683362093e+03 0 2 0 -P 368 3122 -8.6514155217381961e-01 -1.3957847305443358e+00 -4.6801671989749298e+00 5.0838363262480524e+00 1.1156800000000000e+00 2 0 0 -169 0 -P 369 111 -3.3051734332077809e-02 -1.4370417322118634e-02 -2.7128761233052251e-01 3.0514831646326673e-01 1.3497999999999999e-01 2 0 0 -170 0 -V -105 0 0 0 0 0 0 1 0 -P 370 130 -9.8211331445284256e-01 -7.9298343389061809e-01 -1.4504485608208735e+00 1.9861635746679696e+00 4.9767000000000000e-01 1 0 0 0 0 -V -106 0 0 0 0 0 0 2 0 -P 371 -3122 -1.6814953787803824e+00 -7.7260118861255445e-01 -3.6931903303234876e+00 4.2788708772175195e+00 1.1156800000000000e+00 2 0 0 -171 0 -P 372 22 -6.0636364410652108e-02 -4.9613725855513595e-02 -3.9809263716227318e-02 8.7880987476447889e-02 0 1 0 0 0 0 -V -107 0 0 0 0 0 0 1 0 -P 373 130 -9.4646039874614889e+00 -5.6457554838761190e+00 -1.0111196049899565e+01 1.4964532889856393e+01 4.9767000000000000e-01 1 0 0 0 0 -V -108 0 6.1241494302732311e-06 -3.8272133129143903e-06 -2.2451785965620250e-05 2.4473350815725669e-05 0 2 0 -P 374 22 9.7949275500252477e-03 -8.2164757971790112e-02 -1.6085439852995365e-01 1.8088981614426572e-01 0 1 0 0 0 0 -P 375 22 1.1669422088618255e-01 3.1168904522249487e-03 -3.0286833064202273e-01 3.2458663234983964e-01 0 1 0 0 0 0 -V -109 0 0 0 0 0 0 2 0 -P 376 321 -3.1631630540514204e-02 -2.4636611909620174e-01 6.0355908816096149e-01 8.1830395183627624e-01 4.9359999999999998e-01 1 0 0 0 0 -P 377 -211 -3.1119569790222151e-01 -9.0643724178569043e-02 -1.6873807237875477e-01 3.9116667687305512e-01 1.3957000000000000e-01 1 0 0 0 0 -V -110 0 0 0 0 0 0 2 0 -P 378 -321 -5.0002061820812771e-01 -6.6876333827903711e-01 9.9856599175467453e-01 1.3921350585156445e+00 4.9359999999999998e-01 1 0 0 0 0 -P 379 211 -7.8076367030763885e-02 7.0110717268449307e-02 2.5930781099697733e-02 1.7653221256490112e-01 1.3957000000000000e-01 1 0 0 0 0 -V -111 0 5.7242773048955394e-05 -3.2717478414302510e-05 -1.9059924373192351e-05 6.8693927850502852e-05 0 2 0 -P 380 22 1.7977262661769522e+00 -9.7971204743102736e-01 -6.4165230874684842e-01 2.1455472750103133e+00 0 1 0 0 0 0 -P 381 22 8.6717598533476581e-01 -5.4343012835935178e-01 -2.4567080071055178e-01 1.0524564771389584e+00 0 1 0 0 0 0 -V -112 0 5.6566919601848354e-03 -2.2814444155476094e-03 -4.8106729505785935e-03 1.0328232916324018e-02 0 1 0 -P 382 130 9.8128386922335242e-01 -7.1757193254617169e-01 -6.8412429949797804e-01 1.4810567161454691e+00 4.9767000000000000e-01 1 0 0 0 0 -V -113 0 5.6927899618635560e-03 -2.2689588659554980e-03 -4.7858260335337677e-03 1.0383266193923678e-02 0 2 0 -P 383 22 1.0727648575389558e-01 4.4401346708756603e-02 -4.6291163569520894e-03 1.1619446072641836e-01 0 1 0 0 0 0 -P 384 22 5.0614414143909950e-02 1.0209838651658623e-02 1.1330832045279429e-01 1.2451841312937319e-01 0 1 0 0 0 0 -V -114 0 5.6566919601848354e-03 -2.2814444155476094e-03 -4.8106729505785935e-03 1.0328232916324018e-02 0 2 0 -P 385 -2212 7.7903213016385631e-01 -1.3109001191938108e-01 -1.0369975033227592e+00 1.6061724894451079e+00 9.3827000000000005e-01 1 0 0 0 0 -P 386 111 -1.9254000030087138e-02 2.8169300845293684e-02 -2.5015083906664392e-03 1.3924828175420992e-01 1.3497999999999999e-01 2 0 0 -172 0 -V -115 0 -2.5371547209646385e-02 3.0636389190498072e-02 -2.1297633314969514e-01 2.2372333057617133e-01 0 3 0 -P 387 -11 -2.7872666759670595e-01 4.0869513283640058e-01 -7.5930543668767891e-01 9.0623687472823267e-01 5.1000000000000004e-04 1 0 0 0 0 -P 388 12 2.1061848626626939e-01 -1.0932717228124468e-01 -5.7973006096139035e-01 6.2641800815302651e-01 0 1 0 0 0 0 -P 389 333 -8.2733678267311739e-01 7.8189051332515147e-01 -6.1775965545865690e+00 6.3632738927342753e+00 1.0162266065804424e+00 2 0 0 -173 0 -V -116 0 -1.6652958063643953e+02 5.6426826413973046e+01 -1.9523816787611872e+02 2.7438756299624157e+02 0 2 0 -P 390 111 -5.5063191197028871e-01 1.7973867556858722e-03 -7.4723439495187260e-01 9.3796459127106524e-01 1.3497999999999999e-01 2 0 0 -174 0 -P 391 111 -4.9730802910561589e-01 3.5328622614581767e-01 -4.8136339144703161e-01 7.8870574260788417e-01 1.3497999999999999e-01 2 0 0 -175 0 -V -117 0 0 0 0 0 0 1 0 -P 392 130 -6.3303113772774122e-01 -2.0717802444266725e-01 -3.2448067298090227e-01 8.9253251547659829e-01 4.9767000000000000e-01 1 0 0 0 0 -V -118 0 0 0 0 0 0 1 0 -P 393 310 2.9210454944064679e-01 -1.6108553023224306e-01 -1.5223884321452796e-01 6.1816317436209656e-01 4.9767000000000000e-01 2 0 0 -176 0 -V -119 0 3.0128146157781292e-05 4.5650829848109356e-05 -8.2262982954840020e-05 1.0199714816937651e-04 0 2 0 -P 394 22 1.7327331324276590e-01 2.5107595073573147e-01 -4.1746127939969052e-01 5.1704612358860558e-01 0 1 0 0 0 0 -P 395 22 -1.3087207843465083e-02 -8.3584398965809228e-03 -1.9916672401752208e-02 2.5254947360894051e-02 0 1 0 0 0 0 -V -120 0 1.0816420442246132e-06 -4.7912803730757445e-07 2.5833759896941966e-06 4.2591319597499850e-06 0 2 0 -P 396 22 -3.7013800308679519e-02 2.0425699872580520e-02 6.6978992311673077e-02 7.9204899088772901e-02 0 1 0 0 0 0 -P 397 22 8.3029492775547220e-02 -4.0808975961671698e-02 4.2924127396728746e-02 1.0198896951325444e-01 0 1 0 0 0 0 -V -121 0 -8.0635541185482363e-05 -2.2608318341409421e-05 -3.1491674433623302e-05 1.0955722356805153e-04 0 2 0 -P 398 22 6.1605732605138725e-03 2.0252052130026385e-02 1.4978030975011219e-02 2.5931442116933264e-02 0 1 0 0 0 0 -P 399 22 -1.7830128657396835e-01 -6.8516278907592251e-02 -8.2206441930538970e-02 2.0795126439662356e-01 0 1 0 0 0 0 -V -122 0 -1.1689491264961073e-04 1.7057855214648910e-04 -1.2900229175160562e-03 1.3074393023033567e-03 0 2 0 -P 400 22 -1.0971836549544467e-01 2.1286683469193721e-01 -1.1299214575560315e+00 1.1550207397637076e+00 0 1 0 0 0 0 -P 401 22 -2.0731679393122815e-01 2.4976577479240111e-01 -2.3687989918503392e+00 2.3909353523453438e+00 0 1 0 0 0 0 -V -123 0 8.7532349491237973e+00 -3.6541006746257270e+00 -6.7563654454282670e+01 7.0038781826892503e+01 0 2 0 -P 402 -211 1.3178166664474288e-02 1.0972312838034502e-01 -3.9607722339418833e-01 4.3424622136508695e-01 1.3957000000000000e-01 1 0 0 0 0 -P 403 211 2.6199693228118459e-01 -2.2459694595086344e-01 -1.7279186944177274e+00 1.7675601772141933e+00 1.3957000000000000e-01 1 0 0 0 0 -V -124 0 -5.1006948095061883e-05 -3.3256564039807341e-05 -3.3133018453473608e-04 3.3729432500588654e-04 0 2 0 -P 404 22 -1.2481427652994612e-01 -4.0398131487697303e-02 -9.9515989211106448e-01 1.0037698060411546e+00 0 1 0 0 0 0 -P 405 22 -2.8659220894343101e-01 -2.2783917032142667e-01 -1.6772483158185125e+00 1.7167433397790914e+00 0 1 0 0 0 0 -V -125 0 -6.6771289255523520e-05 -7.7465041537621302e-05 -2.2164109883733708e-03 2.2191539074048012e-03 0 2 0 -P 406 22 -1.9030878728761155e-01 -1.4045162333880731e-01 -5.5124814429757212e+00 5.5175534208713453e+00 0 1 0 0 0 0 -P 407 22 -2.7824715291029679e-02 -1.1261703875241377e-01 -1.7282577645224619e+00 1.7321465621680421e+00 0 1 0 0 0 0 -V -126 0 0 0 0 0 0 1 0 -P 408 130 -3.9600823279035513e-01 8.5430585125442424e-02 -3.6195759503890365e+01 3.6201447517988591e+01 4.9767000000000000e-01 1 0 0 0 0 -V -127 0 2.2759620483605243e-07 5.5189954518948540e-07 -3.4507586304512335e-04 3.4507688290684615e-04 0 2 0 -P 409 22 3.0856412353213424e-02 5.9777091246928050e-03 -3.6768297434222319e+00 3.6769640756069517e+00 0 1 0 0 0 0 -P 410 22 2.1260360401738412e-02 1.2040059846141607e-01 -7.5341361049769660e+01 7.5341460253560143e+01 0 1 0 0 0 0 -V -128 0 -1.4546449214941991e-06 -3.9621554061126310e-05 -2.1290916324375901e-02 2.1290986408404031e-02 0 2 0 -P 411 22 3.8619005530965513e-02 5.6053830183775341e-03 -2.1420869175201346e+01 2.1420904721066243e+01 0 1 0 0 0 0 -P 412 22 -4.3843673255012677e-02 -1.4791465150096908e-01 -5.5050001270001772e+01 5.5050217445883071e+01 0 1 0 0 0 0 -V -129 0 0 0 0 0 0 2 0 -P 413 22 4.4122106100820724e-01 -2.1533581732208446e-01 -2.0951066441389207e+02 2.0951123967150164e+02 0 1 0 0 0 0 -P 414 22 -1.3003727210228663e-01 7.9025968672578689e-02 -7.4810369626294275e+01 7.4810524382727280e+01 0 1 0 0 0 0 -V -130 0 0 0 0 0 0 1 0 -P 415 130 -5.5517974597127173e-01 -1.4786398120312963e-01 -3.9774196700709734e+02 3.9774269331115448e+02 4.9767000000000000e-01 1 0 0 0 0 -V -131 0 3.1162561148663985e-05 4.9134168233791584e-05 -1.0535794464319381e-01 1.0535797716562684e-01 0 2 0 -P 416 22 -1.0407303676525636e-02 3.1435820824456277e-02 -1.4769705612958035e+02 1.4769705984164750e+02 0 1 0 0 0 0 -P 417 22 8.1837259871931953e-02 8.1188153434088417e-02 -9.3801495122328660e+01 9.3801565957278186e+01 0 1 0 0 0 0 -V -132 0 2.6061695549965017e-06 1.5981198106929131e-05 -6.0874205016532332e-02 6.0874208074558754e-02 0 2 0 -P 418 22 6.6075216703169640e-02 6.9070271124056309e-02 -2.0477358048603864e+02 2.0477360279515705e+02 0 1 0 0 0 0 -P 419 22 -3.2552372563759389e-02 1.3649394946647336e-01 -5.7824396454182443e+02 5.7824398156773043e+02 0 1 0 0 0 0 -V -133 0 6.6869850793435513e-05 -1.3905508888006766e-04 -1.2830841169050197e-01 1.2830854774519626e-01 0 2 0 -P 420 22 4.6019185382323302e-02 9.8218810952675831e-03 -2.9691019717235697e+01 2.9691057005166559e+01 0 1 0 0 0 0 -P 421 22 3.9629365422943770e-02 -1.8792706158184605e-01 -1.3464955211032841e+02 1.3464968908459880e+02 0 1 0 0 0 0 -V -134 0 9.0991403364029891e-05 2.9676020800185506e-05 -5.3298798475057925e-02 5.3298891243089092e-02 0 2 0 -P 422 22 3.9077415047769848e-02 4.8750449525309471e-02 -5.1996999227038948e+01 5.1997036764294414e+01 0 1 0 0 0 0 -P 423 22 4.1588831353803374e-01 9.9632495738959437e-02 -2.1450209612089199e+02 2.1450252243267425e+02 0 1 0 0 0 0 -V -135 0 -1.2095638437121250e-05 2.0165006173806986e-06 -9.0242854606434981e-04 9.0251793601480227e-04 0 2 0 -P 424 22 -3.5447452752054448e-01 9.8399755132051580e-03 -2.8089725048300163e+01 2.8091963304562395e+01 0 1 0 0 0 0 -P 425 22 -1.3839157224524873e-01 7.2327228775374577e-02 -8.6819129374255386e+00 8.6833170913152617e+00 0 1 0 0 0 0 -V -136 0 1.0813245780814463e-05 -4.3074327093877904e-05 -3.8442965634151380e-03 3.8445789078611868e-03 0 2 0 -P 426 22 1.0313626454632320e-01 -3.8557612802981556e-01 -3.0050256643978344e+01 3.0052907187301116e+01 0 1 0 0 0 0 -P 427 22 4.3748804964200425e-04 -2.7007640811787147e-02 -6.7720101606043936e+00 6.7720640294807559e+00 0 1 0 0 0 0 -V -137 0 0 0 0 0 0 1 0 -P 428 130 -1.6443516368771718e-01 3.8717781180786159e-01 -4.8340509295770076e+01 4.8344901075339337e+01 4.9767000000000000e-01 1 0 0 0 0 -V -138 0 1.2358140420271945e-05 -7.3429431327083619e-05 -1.0889863399267724e-02 1.0890154231100478e-02 0 2 0 -P 429 22 5.4301957071902614e-02 -2.3699319567331695e-01 -2.5848595506596457e+01 2.5849738956921321e+01 0 1 0 0 0 0 -P 430 22 5.0570583812301105e-03 -1.1570539817897650e-01 -2.6457944783177410e+01 2.6458198265616499e+01 0 1 0 0 0 0 -V -139 0 1.8563265975374583e-05 -3.5135000552321780e-05 -1.2096910332893111e-03 1.2104320012685755e-03 0 2 0 -P 431 22 -2.0573197242309865e-02 -6.4597219190626887e-02 -2.0488562601975113e+00 2.0499775686876340e+00 0 1 0 0 0 0 -P 432 22 1.9178902818280380e-01 -2.5946581598005236e-01 -9.1085691476294492e+00 9.1142820593912131e+00 0 1 0 0 0 0 -V -140 0 7.3023607112404456e-06 1.9611482138964182e-05 -6.0099696424263584e-04 6.0141321235147990e-04 0 2 0 -P 433 22 8.5228359671132362e-03 2.1369962414334492e-01 -5.5669311705913973e+00 5.5710378589805023e+00 0 1 0 0 0 0 -P 434 22 1.1608995226234577e-01 1.2096495451637290e-01 -4.6889176423048236e+00 4.6919141140428886e+00 0 1 0 0 0 0 -V -141 0 -2.3365100375587745e-05 4.9869075372593264e-05 -8.8228795860378044e-05 1.0630348258864234e-04 0 2 0 -P 435 22 -2.1041114039385373e-02 1.8088591190867334e-01 -2.1317543175488898e-01 2.8036798374802724e-01 0 1 0 0 0 0 -P 436 22 -1.2242449936314574e-01 1.2531852860900106e-01 -3.2856409062700143e-01 3.7235312984664198e-01 0 1 0 0 0 0 -V -142 0 4.2726307465371662e-06 1.1163606978137926e-05 -1.4095465823616622e-05 2.0263397090077968e-05 0 2 0 -P 437 22 1.0186902240864532e-01 1.7539794796065869e-01 -2.0495815398301412e-01 2.8835669362688277e-01 0 1 0 0 0 0 -P 438 22 -3.2461054705402004e-02 5.9524468091877421e-03 -2.4019657273122230e-02 4.0817834718681036e-02 0 1 0 0 0 0 -V -143 0 4.2281042290289621e-05 -5.5710648715487775e-05 8.3547170307156796e-05 1.1379454074695370e-04 0 2 0 -P 439 22 -2.2282498559312240e-02 -1.7643232610581851e-02 4.1478065186052578e-02 5.0281440816421281e-02 0 1 0 0 0 0 -P 440 22 1.9612868801801220e-01 -2.1142122433834418e-01 3.0204130924743805e-01 4.1760549428413618e-01 0 1 0 0 0 0 -V -144 0 0 0 0 0 0 2 0 -P 441 211 1.7357088956032946e-01 -1.8008964314199971e-01 3.5114064368815236e-02 2.8856873650185011e-01 1.3957000000000000e-01 1 0 0 0 0 -P 442 111 2.6635305935910647e-01 4.0889525284211697e-01 1.0011697241444379e+00 1.1219178655187840e+00 1.3497999999999999e-01 2 0 0 -177 0 -V -145 0 0 0 0 0 0 1 0 -P 443 310 8.9352434965555338e-01 -6.9110102864767708e-01 1.3634045967932928e+00 1.8391720742449138e+00 4.9767000000000000e-01 2 0 0 -178 0 -V -146 0 5.7833814820138906e-04 -3.4611928637845181e-04 8.2924403938539407e-04 1.0702785821667389e-03 0 2 0 -P 444 22 2.6959401219222473e-01 -1.8065595805513682e-01 4.8652922632802997e-01 5.8483176611917398e-01 0 1 0 0 0 0 -P 445 22 1.0356516178300175e+00 -6.0049722614494039e-01 1.3849834207209339e+00 1.8306693496624562e+00 0 1 0 0 0 0 -V -147 0 5.5018284876725698e-05 -8.8791662444546657e-05 2.2557345462255435e-04 2.4868003057175941e-04 0 2 0 -P 446 22 9.0519481106229416e-01 -1.5401715592524401e+00 3.8907227545652390e+00 4.2812649568551482e+00 0 1 0 0 0 0 -P 447 22 1.7343572995639095e-01 -2.0058424793239438e-01 5.3163279403360253e-01 5.9409378101111721e-01 0 1 0 0 0 0 -V -148 0 0 0 0 0 0 1 0 -P 448 130 2.5175435783133765e-01 2.1313109775713732e-01 6.3817070071050166e+00 6.4095760292667956e+00 4.9767000000000000e-01 1 0 0 0 0 -V -149 0 1.8668185865974611e-05 -1.9953127561604650e-04 3.6095810720876997e-03 3.6162925529423487e-03 0 2 0 -P 449 22 7.2766800981078810e-03 2.7433684711522560e-03 8.3729214991090684e-01 8.3732826325536569e-01 0 1 0 0 0 0 -P 450 22 2.0323798811088076e-02 -2.9774572188157267e-01 4.4993895698041380e+00 4.5092762249122815e+00 0 1 0 0 0 0 -V -150 0 1.3696078707448002e+01 2.3219792114969632e+01 1.0138959939920347e+03 1.0146297844541476e+03 0 2 0 -P 451 111 7.0206635722018476e-02 6.5462957243239944e-02 1.1020395065887524e+01 1.1021639686503478e+01 1.3497999999999999e-01 2 0 0 -179 0 -P 452 111 1.7675263292019575e-01 3.5322205481198321e-01 7.2615539871198669e+00 7.2735406248611998e+00 1.3497999999999999e-01 2 0 0 -180 0 -V -151 0 1.5467461870827629e+01 2.8473818347520936e+01 1.2197659912945378e+03 1.2204776624690801e+03 0 2 0 -P 453 211 -5.2601173246719701e-02 3.3039934938404780e-01 1.0273766610755112e+01 1.0280160055693049e+01 1.3957000000000000e-01 1 0 0 0 0 -P 454 -211 3.4636119397885656e-01 2.1037906261040085e-01 1.2892185623906263e+01 1.2899308329241325e+01 1.3957000000000000e-01 1 0 0 0 0 -V -152 0 -8.6330281890986453e-06 4.3353801666958921e-05 2.6399016004587045e-03 2.6403199142388894e-03 0 2 0 -P 455 22 2.6083272253419752e-02 1.5952465080702885e-01 7.3460499969475057e+00 7.3478281831408516e+00 0 1 0 0 0 0 -P 456 22 -9.9098119570552284e-02 2.0714520593309504e-01 1.4981227068259312e+01 1.4982986819869694e+01 0 1 0 0 0 0 -V -153 0 -1.3713360241077502e-05 5.6557830140187285e-05 2.7122273887907147e-03 2.7129854433572071e-03 0 2 0 -P 457 22 -3.2139365825025600e-02 1.3537777065909119e-02 3.3379524226511128e+00 3.3381345967659777e+00 0 1 0 0 0 0 -P 458 22 -3.6569994921477583e-02 2.6983933006361521e-01 1.0251379936951878e+01 1.0254995916153122e+01 0 1 0 0 0 0 -V -154 0 -1.8577981731263623e-05 1.1734979962630551e-07 2.5054428130927703e-03 2.5058814429780593e-03 0 2 0 -P 459 22 -3.2575852346062410e-02 6.3591920058035073e-02 5.2340628634658524e+00 5.2345505229355744e+00 0 1 0 0 0 0 -P 460 22 -2.5679357125610595e-02 -6.3223944824902775e-02 2.6222854744377790e+00 2.6231732321806303e+00 0 1 0 0 0 0 -V -155 0 -5.1794463602787913e-05 -1.5356000780595467e-05 1.3323891047857367e-03 1.3337197303021943e-03 0 2 0 -P 461 22 -2.4156328517547213e-01 -1.1451197786655225e-01 6.4209768595352923e+00 6.4265394766162753e+00 0 1 0 0 0 0 -P 462 22 -3.7168364320045832e-02 3.1873735678067699e-02 7.4926851253561166e-01 7.5086665008484121e-01 0 1 0 0 0 0 -V -156 0 7.5943080969019332e-05 9.5776177456424032e-06 5.3870611541554550e-02 5.3870683708631448e-02 0 2 0 -P 463 22 -1.5680821504989124e-02 -5.4140422597006924e-03 1.8017934436852070e+01 1.8017942073686338e+01 0 1 0 0 0 0 -P 464 22 2.4984841316886486e-01 3.4946261031404309e-02 1.4809004018287865e+02 1.4809025507047161e+02 0 1 0 0 0 0 -V -157 0 0 0 0 0 0 1 0 -P 465 130 -3.5596336877401362e+00 8.8923992828974985e-01 8.7633501659252779e+00 9.5134494900893749e+00 4.9767000000000000e-01 1 0 0 0 0 -V -158 0 1.3287239623354180e-04 2.2226177773322776e-05 6.7250652793784471e-04 6.8599098340012060e-04 0 2 0 -P 466 22 1.1106353772405320e+00 1.4436855076860167e-01 5.3887210357718693e+00 5.5038775078120601e+00 0 1 0 0 0 0 -P 467 22 2.6686104938252070e-01 8.6051621728536865e-02 1.5831961221517605e+00 1.6078338416876363e+00 0 1 0 0 0 0 -V -159 0 5.7037006887288153e-05 4.2172986806283377e-05 4.1243716932087290e-04 4.1861382317954235e-04 0 2 0 -P 468 22 3.2331850119604405e-01 1.6744575558836336e-01 2.2859616585715821e+00 2.3147772330700751e+00 0 1 0 0 0 0 -P 469 22 4.4148515143451034e-01 3.9804770404431883e-01 3.2443680482544379e+00 3.2983746218655052e+00 0 1 0 0 0 0 -V -160 0 1.1983470401006283e-05 1.3207294377217294e-05 1.1776782592010122e-04 1.1968459629508770e-04 0 2 0 -P 470 22 -2.4301340066221078e-02 4.3907283769436582e-02 2.4401938288657385e-01 2.4912620079262698e-01 0 1 0 0 0 0 -P 471 22 1.6244293470231447e-01 1.0834216026005766e-01 1.1135702572616186e+00 1.1305593520829520e+00 0 1 0 0 0 0 -V -161 0 3.4630075284514206e+01 -4.1959174778499408e-01 1.0443051577069147e+02 1.1494674588296520e+02 0 2 0 -P 472 2212 1.1005933998556439e+00 -6.1749009761674328e-02 3.0746031880408422e+00 3.3983310799307449e+00 9.3827000000000005e-01 1 0 0 0 0 -P 473 -211 6.0322890773452480e-02 4.7682886849288987e-02 4.2625801427967658e-01 4.5506943260034610e-01 1.3957000000000000e-01 1 0 0 0 0 -V -162 0 -4.7357584723182360e-06 6.3985294212991023e-06 2.6106587882268586e-05 3.1463143149236232e-05 0 2 0 -P 474 22 4.3973266892092941e-04 5.6365207826361091e-02 1.6625948052190604e-02 5.8767781707013016e-02 0 1 0 0 0 0 -P 475 22 -4.1278238818121267e-02 -1.1879042022493941e-03 2.0850251996335911e-01 2.1255259336783106e-01 0 1 0 0 0 0 -V -163 0 -5.7563317206079826e-06 6.0917871793002808e-06 2.9568905721680543e-07 8.8772845327675524e-06 0 2 0 -P 476 22 2.1872890559984882e-03 -1.0401663083794799e-02 8.9124295742047579e-03 1.3871201434570646e-02 0 1 0 0 0 0 -P 477 22 -2.6910859266995735e-01 2.9287804807327755e-01 4.7986823712958485e-03 3.9776879345232552e-01 0 1 0 0 0 0 -V -164 0 0 0 0 0 0 1 0 -P 478 130 1.1140884226725156e+00 1.6365689466410080e-01 -1.4262615386176185e+00 1.8841109304241952e+00 4.9767000000000000e-01 1 0 0 0 0 -V -165 0 0 0 0 0 0 2 0 -P 479 -3122 2.0131910069921948e+00 6.7764893728527717e-02 -2.6715368988585211e+00 3.5269507192217597e+00 1.1156800000000000e+00 2 0 0 -181 0 -P 480 22 -1.6076131313801340e-02 1.4322867873945886e-02 -9.7430843067236299e-03 2.3632905745189673e-02 0 1 0 0 0 0 -V -166 0 -2.3588379760226790e-05 4.6847721938416594e-05 -5.5574960618648883e-04 5.5839451490441211e-04 0 2 0 -P 481 22 -1.1949049708917285e-01 1.3519180044689011e-01 -2.3681807243708217e+00 2.3750441564493485e+00 0 1 0 0 0 0 -P 482 22 -1.0811595167675146e-01 3.1684618315194474e-01 -2.9942984095479352e+00 3.0129559452813477e+00 0 1 0 0 0 0 -V -167 0 -1.5531878903456809e-04 1.0499866127610461e-04 -9.3825546056534588e-04 9.5764010672608495e-04 0 2 0 -P 483 22 -4.9585461648451970e-02 9.0657133681034840e-02 -5.6380526423615873e-01 5.7319613560678850e-01 0 1 0 0 0 0 -P 484 22 -4.7410925234586326e-01 2.6337114730522432e-01 -2.5997490496274094e+00 2.6557181826073788e+00 0 1 0 0 0 0 -V -168 0 -2.3742914991980702e-06 -5.5047613892291266e-05 -3.3364509581962891e-04 3.3865264289515399e-04 0 2 0 -P 485 22 -5.1346047785156834e-02 -1.6412250976727824e-01 -7.3990671605158653e-01 7.5962791108127992e-01 0 1 0 0 0 0 -P 486 22 3.3722397264361485e-02 -2.4447934454129777e-01 -1.7366403164793534e+00 1.7540886348204032e+00 0 1 0 0 0 0 -V -169 0 -3.9442071647588028e+02 -6.1954489476130664e+02 -2.1735850335635319e+03 2.3655702926791487e+03 0 2 0 -P 487 2112 -8.5269966598634783e-01 -1.2482982212205354e+00 -4.0873634023688021e+00 4.4581023471202919e+00 9.3957000000000002e-01 1 0 0 0 0 -P 488 111 -1.2441886187471768e-02 -1.4748650932380047e-01 -5.9280379660612814e-01 6.2573397912776096e-01 1.3497999999999999e-01 2 0 0 -182 0 -V -170 0 -3.8731845683595071e+02 -6.0808637851156175e+02 -2.1351638853560548e+03 2.3238352858308413e+03 0 2 0 -P 489 22 -2.4294136801933316e-02 3.4539658646784890e-02 -1.6139449553526541e-02 4.5207023063660166e-02 0 1 0 0 0 0 -P 490 22 -8.7575975301444949e-03 -4.8910075968903524e-02 -2.5514816277699598e-01 2.5994129339960659e-01 0 1 0 0 0 0 -V -171 0 -1.0933195237963346e+02 -5.0235045203099851e+01 -2.4013370147750371e+02 2.7821504173616125e+02 0 2 0 -P 491 -2112 -1.5658670185772878e+00 -7.6716146142654740e-01 -3.3317517907494221e+00 3.8760595980748569e+00 9.3957000000000002e-01 1 0 0 0 0 -P 492 111 -1.1562836020309447e-01 -5.4397271860069998e-03 -3.6143853957406552e-01 4.0281127914266263e-01 1.3497999999999999e-01 2 0 0 -183 0 -V -172 0 5.6564325317259301e-03 -2.2810648622965798e-03 -4.8107066559107698e-03 1.0330109148124387e-02 0 2 0 -P 493 22 8.3504725860153537e-03 -6.1686271916450621e-03 6.1045606206374968e-02 6.1922115523802154e-02 0 1 0 0 0 0 -P 494 22 -2.7604472616102490e-02 3.4337928036938747e-02 -6.3547114597041404e-02 7.7326166230407709e-02 0 1 0 0 0 0 -V -173 0 -2.5371547209646385e-02 3.0636389190498072e-02 -2.1297633314969514e-01 2.2372333057617133e-01 0 2 0 -P 495 130 -3.8381231838876934e-01 4.9594078006557590e-01 -3.2339673281313233e+00 3.3315895997856435e+00 4.9767000000000000e-01 1 0 0 0 0 -P 496 310 -4.4352446428434805e-01 2.8594973325957562e-01 -2.9436292264552462e+00 3.0316842929486327e+00 4.9767000000000000e-01 2 0 0 -184 0 -V -174 0 -1.6652989478516312e+02 5.6426827439425338e+01 -1.9523859419127828e+02 2.7438809812755659e+02 0 2 0 -P 497 22 -4.9611896691106377e-01 -3.9673980701964699e-02 -6.7175137907101601e-01 8.3603706219129592e-01 0 1 0 0 0 0 -P 498 22 -5.4512945059224993e-02 4.1471367457650572e-02 -7.5483015880856680e-02 1.0192752907976933e-01 0 1 0 0 0 0 -V -175 0 -1.6653019204785372e+02 5.6427260758923254e+01 -1.9523875968452452e+02 2.7438853266426469e+02 0 2 0 -P 499 22 -3.5393953143123574e-01 1.7673538127712854e-01 -2.7700993705699223e-01 4.8295247399019869e-01 0 1 0 0 0 0 -P 500 22 -1.4336849767438012e-01 1.7655084486868911e-01 -2.0435345439003930e-01 3.0575326861768554e-01 0 1 0 0 0 0 -V -176 0 1.6356688133589280e+01 -9.0201463342084711e+00 -8.5247671939611500e+00 3.4614668885069442e+01 0 2 0 -P 501 211 4.6978346947700922e-02 -2.6100259924274977e-01 -6.8335267097857338e-02 3.0737406449267235e-01 1.3957000000000000e-01 1 0 0 0 0 -P 502 -211 2.4512620249294581e-01 9.9917069010506745e-02 -8.3903576116670597e-02 3.1078910986942410e-01 1.3957000000000000e-01 1 0 0 0 0 -V -177 0 2.9469706054036896e-04 4.5240790314715406e-04 1.1077093520806618e-03 1.2413069252204430e-03 0 2 0 -P 503 22 3.6126609958871479e-02 1.4057616038319654e-01 2.0926363458958655e-01 2.5467245154677925e-01 0 1 0 0 0 0 -P 504 22 2.3022644940023498e-01 2.6831909245892044e-01 7.9190608955485142e-01 8.6724541397200472e-01 0 1 0 0 0 0 -V -178 0 4.9225703194877646e+01 -3.8073874681758369e+01 7.5112166828078713e+01 1.0132296751172809e+02 0 2 0 -P 505 111 6.6272058382572374e-01 -5.4061401949282739e-01 1.2309991175446522e+00 1.5050051555041968e+00 1.3497999999999999e-01 2 0 0 -185 0 -P 506 111 2.3080376582982970e-01 -1.5048700915484961e-01 1.3240547924864057e-01 3.3416691874071680e-01 1.3497999999999999e-01 2 0 0 -186 0 -V -179 0 1.3696084322539210e+01 2.3219797350663836e+01 1.0138968753976570e+03 1.0146306659593140e+03 0 2 0 -P 507 22 2.8921549282624782e-02 5.7479359671112923e-02 1.8015767429731999e+00 1.8027254626323534e+00 0 1 0 0 0 0 -P 508 22 4.1285086439393701e-02 7.9835975721270214e-03 9.2188183229143235e+00 9.2189142238711259e+00 0 1 0 0 0 0 -V -180 0 1.3696084629698909e+01 2.3219803949982214e+01 1.0138962372967254e+03 1.0146300281604611e+03 0 2 0 -P 509 22 1.6307939697786111e-01 3.2581921906134687e-01 5.6713531296788773e+00 5.6830449034603641e+00 0 1 0 0 0 0 -P 510 22 1.3673235942334631e-02 2.7402835750636373e-02 1.5902008574409892e+00 1.5904957214008373e+00 0 1 0 0 0 0 -V -181 0 8.8043644790361924e+01 2.9635877628943978e+00 -1.1683533502310971e+02 1.5424547161086937e+02 0 2 0 -P 511 -2212 1.7770563282207339e+00 -3.4186617193049003e-02 -2.3164858133551092e+00 3.0668477358421207e+00 9.3827000000000005e-01 1 0 0 0 0 -P 512 211 2.3613467877146080e-01 1.0195151092157670e-01 -3.5505108550341169e-01 4.6010298337963895e-01 1.3957000000000000e-01 1 0 0 0 0 -V -182 0 -3.9442072465575706e+02 -6.1954499172582257e+02 -2.1735854233004197e+03 2.3655707040658758e+03 0 2 0 -P 513 22 4.0197117264212073e-02 -1.3040481351109726e-01 -3.2880641676034111e-01 3.5599843163417444e-01 0 1 0 0 0 0 -P 514 22 -5.2639003451683840e-02 -1.7081695812703201e-02 -2.6399737984578697e-01 2.6973554749358647e-01 0 1 0 0 0 0 -V -183 0 -1.0933195723816462e+02 -5.0235045431669072e+01 -2.4013371666461182e+02 2.7821505866169014e+02 0 2 0 -P 515 22 -1.2710329868660584e-02 -1.5687834458189054e-02 6.0244861742229771e-03 2.1070241313784526e-02 0 1 0 0 0 0 -P 516 22 -1.0291803033443389e-01 1.0248107272182054e-02 -3.6746302574828849e-01 3.8174103782887814e-01 0 1 0 0 0 0 -V -184 0 -4.0011104427493628e+01 2.5810295848911871e+01 -2.6559444100062234e+02 2.7354374979360034e+02 0 2 0 -P 517 211 -1.1916503545197171e-01 1.2306843499863213e-01 -1.9838673343442541e+00 1.9961351483668279e+00 1.3957000000000000e-01 1 0 0 0 0 -P 518 -211 -3.2435942883237623e-01 1.6288129826094347e-01 -9.5976189211099172e-01 1.0355491445818044e+00 1.3957000000000000e-01 1 0 0 0 0 -V -185 0 4.9226282621175962e+01 -3.8074347348501760e+01 7.5113243108609780e+01 1.0132428335974532e+02 0 2 0 -P 519 22 4.4143146561474261e-01 -4.2964177430910294e-01 8.2724985573673759e-01 1.0314049238212444e+00 0 1 0 0 0 0 -P 520 22 2.2128911821098113e-01 -1.1097224518372439e-01 4.0374926180791465e-01 4.7360023168295245e-01 0 1 0 0 0 0 -V -186 0 4.9225767848899054e+01 -3.8073916837007772e+01 7.5112203918230421e+01 1.0132306112040489e+02 0 2 0 -P 521 22 4.9356772561742791e-02 -1.0513068125950643e-01 7.6076014406641593e-02 1.3883843526847706e-01 0 1 0 0 0 0 -P 522 22 1.8144699326808689e-01 -4.5356327895343163e-02 5.6329464841998966e-02 1.9532848347223983e-01 0 1 0 0 0 0 -BlockType GenEvent -E 9 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 115 0 0 -V -1 0 0 0 0 0 1 3 0 -P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -1 0 -P 3 -2 -1.3063956680622808e+00 1.2879304852865372e+00 5.1893828474231309e+00 5.5041010995066388e+00 0 3 0 0 -3 0 -P 14 2224 6.2629672068355446e-01 -5.5829354058455705e-01 1.9862339814540292e+03 1.9862345051592931e+03 1.1732277688871249e+00 2 0 0 -9 0 -P 20 1 6.8009894737872634e-01 -7.2963694470198015e-01 2.2511960482291925e+03 2.2511962933887798e+03 3.3000000000000002e-01 2 0 0 -14 0 -V -2 0 0 0 0 0 1 2 0 -P 2 2212 0 0 -6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -2 0 -P 4 1 7.0565678882479643e-01 -1.5984513018320162e-01 -1.0981823600478867e+03 1.0981825983971498e+03 0 3 0 0 -4 0 -P 28 2203 -7.0565678882479643e-01 1.5984513018320162e-01 -4.3114475678564886e+03 4.3114476975637281e+03 7.7132999999999996e-01 2 0 0 -14 0 -V -3 0 0 0 0 0 0 1 0 -P 5 -2 -1.3063956680622806e+00 1.2879304852865372e+00 5.1893828474231309e+00 5.5041010995066388e+00 0 3 0 0 -5 0 -V -4 0 0 0 0 0 0 1 0 -P 6 1 7.0565678882479621e-01 -1.5984513018320196e-01 -1.0981823600478865e+03 1.0981825983971496e+03 0 3 0 0 -5 0 -V -5 0 0 0 0 0 0 2 0 -P 7 22 -2.9723146839427486e+00 2.9479669518244265e+00 2.6457283967879142e+00 4.9522764946033000e+00 0 3 0 0 -6 0 -P 8 -24 2.3715758047052646e+00 -1.8198815967210915e+00 -1.0956387055972511e+03 1.0987344230020528e+03 8.2366393304613624e+01 3 0 0 -7 0 -V -6 0 0 0 0 0 0 1 0 -P 9 22 -2.9723146839427486e+00 2.9479669518244265e+00 2.6457283967879142e+00 4.9522764946033284e+00 0 1 0 0 0 0 -V -7 0 0 0 0 0 0 1 0 -P 10 -24 2.3715758047052646e+00 -1.8198815967210915e+00 -1.0956387055972511e+03 1.0987344230020528e+03 8.2366393304613624e+01 2 0 0 -8 0 -V -8 0 0 0 0 0 0 3 0 -P 11 -12 -5.4134620057879408e+00 2.7818509720381723e+01 -1.5330074559902630e+02 1.5589834397827471e+02 0 1 0 0 0 0 -P 12 11 7.7686205977028244e+00 -2.9576059382324004e+01 -9.4035688046136852e+02 9.4085395114538073e+02 5.1000000000000004e-04 1 0 0 0 0 -P 13 22 1.6417212790378732e-02 -6.2331934778808794e-02 -1.9810795368566805e+00 1.9821278783976966e+00 0 1 0 0 0 0 -V -9 0 0 0 0 0 0 2 0 -P 31 2212 3.9845666526000445e-01 -4.2000187219924662e-01 1.7208369731688658e+03 1.7208373263457715e+03 9.3827000000000005e-01 1 0 0 0 0 -P 32 211 2.2784005542354996e-01 -1.3829166838531035e-01 2.6539700828516311e+02 2.6539717881352135e+02 1.3957000000000000e-01 1 0 0 0 0 -V -10 0 0 0 0 0 2 1 0 -P 15 2 -5.8774466266559076e+00 -9.3245626556735572e-01 -1.6938612621707563e+02 1.6949062985417058e+02 0 2 0 0 -10 0 -P 16 -2 5.8774466266559076e+00 9.3245626556735572e-01 -2.6116865900135838e+02 2.6123644902291909e+02 0 2 0 0 -10 0 -P 33 92 0 0 -4.3055478521843401e+02 4.3072707887708964e+02 1.2181683114363196e+01 2 0 0 -11 0 -V -11 0 0 0 0 0 0 7 0 -P 34 211 -3.4223096422762840e+00 -1.1755942505505563e+00 -1.0212463398588793e+02 1.0218881823206500e+02 1.3957000000000000e-01 1 0 0 0 0 -P 35 313 -1.4318407714997392e+00 1.0448174597780837e+00 -7.2468641710313307e+01 7.2496138880553076e+01 9.1886328226238245e-01 2 0 0 -18 0 -P 36 -313 1.0440864295074967e+00 -4.5871170804924338e-01 -4.5617120785926659e+01 4.5640092033581006e+01 8.9205332382051472e-01 2 0 0 -19 0 -P 37 -213 3.2409711340366965e-01 2.3335471252859891e-01 -4.0111237075385660e+01 4.0121708510378014e+01 8.2502164406168854e-01 2 0 0 -20 0 -P 38 111 1.2936126903917291e+00 4.7104501694792161e-01 -5.4152907899216984e+01 5.4170572922410656e+01 1.3497999999999999e-01 2 0 0 -21 0 -P 39 213 1.2548924127288779e+00 -4.7071757914042800e-01 -7.1343007544735329e+01 7.1361058743643341e+01 8.8297762073342168e-01 2 0 0 -22 0 -P 40 -211 9.3746176774424972e-01 3.5580634848562342e-01 -4.4737236216968142e+01 4.4748689554458579e+01 1.3957000000000000e-01 1 0 0 0 0 -V -12 0 0 0 0 0 3 1 0 -P 17 2 -1.2925484085993182e+00 -2.9944775922487810e+00 -1.1193505744225627e+03 1.1193553260862077e+03 0 2 0 0 -12 0 -P 18 21 1.4025793372001376e+00 -2.7884933102773206e+00 9.4380500095915245e+00 9.9408104157635311e+00 0 2 0 0 -12 0 -P 19 -2 1.2925484085993182e+00 2.9944775922487810e+00 6.0026559409271556e+02 6.0027445475292370e+02 0 2 0 0 -12 0 -P 41 92 1.4025793372001376e+00 -2.7884933102773206e+00 -5.0964693032025559e+02 1.7295705912548949e+03 1.6527748466216472e+03 2 0 0 -13 0 -V -13 0 0 0 0 0 0 24 0 -P 42 2212 -6.4915649404280318e-01 -4.2701824006267358e-01 -3.3481058142234315e+02 3.3481279774180007e+02 9.3827000000000005e-01 1 0 0 0 0 -P 43 -2212 -4.9702749607820934e-01 -1.9489755847429249e+00 -5.5795580111420406e+02 5.5796021532878854e+02 9.3827000000000005e-01 1 0 0 0 0 -P 44 113 1.6533916537684344e-02 -2.9412170960257544e-01 -7.6806020852310596e+01 7.6812204400634272e+01 9.2904508437107169e-01 2 0 0 -23 0 -P 45 221 -1.4972892483807126e-01 4.5696574621284011e-03 -1.0055577843303921e+02 1.0055738022348076e+02 5.4744999999999999e-01 2 0 0 -24 0 -P 46 221 3.0200268424734572e-01 2.8534525335404792e-01 -2.8870835357085056e+01 2.8879014236177056e+01 5.4744999999999999e-01 2 0 0 -25 0 -P 47 211 -6.4308952739707492e-01 -7.2529706032234698e-01 -5.7806554947847131e+00 5.8630263260746780e+00 1.3957000000000000e-01 1 0 0 0 0 -P 48 -213 3.3534244198776286e-01 1.3819689112114653e-01 -4.9513827912839794e+00 4.9961422616793758e+00 5.6008304652229868e-01 2 0 0 -26 0 -P 49 213 3.8463247216398370e-02 -2.6825695664888762e-02 -6.2305386932288869e+00 6.2750941019503417e+00 7.4497955755530509e-01 2 0 0 -27 0 -P 50 -211 -3.0493494659552672e-01 4.0145043880181042e-01 -5.0694511698343381e-01 7.2843730890360803e-01 1.3957000000000000e-01 1 0 0 0 0 -P 51 213 4.5194685326190176e-01 -3.3844629401524673e-01 -1.5162335922911572e+00 1.8063449324268250e+00 8.0319104601952163e-01 2 0 0 -28 0 -P 52 113 2.7127567356955044e-02 -3.5096115077676360e-01 -2.0560156402869595e-01 8.5167643807785465e-01 7.4777745204083745e-01 2 0 0 -29 0 -P 53 313 1.5417297555815859e-01 -2.8232887295282283e-01 9.8735536340780428e-01 1.3695271653989567e+00 8.9289145153275806e-01 2 0 0 -30 0 -P 54 -321 1.6551837760939633e-01 -1.1656322834342046e+00 1.9035451055119379e+00 2.2919903756841866e+00 4.9359999999999998e-01 1 0 0 0 0 -P 55 223 2.7048492858539253e-01 6.4531024760498323e-01 4.8493013060375016e+00 4.9634403118180437e+00 7.9399569267567460e-01 2 0 0 -31 0 -P 56 211 3.8312833002830518e-02 -6.7146029886687178e-02 -3.8093840362958112e-02 1.6403471606902364e-01 1.3957000000000000e-01 1 0 0 0 0 -P 57 113 -1.9506129454061361e-01 -4.4996827569324266e-01 9.0912943373856825e-01 1.1300284456403529e+00 4.5817857098333514e-01 2 0 0 -32 0 -P 58 311 2.5486600266519988e-01 -5.5963768406031345e-01 7.0488897796228791e+00 7.0931427146862651e+00 4.9767000000000000e-01 2 0 0 -33 0 -P 59 -323 5.8984323195972610e-01 5.0704121519152545e-01 1.2620140238622938e+01 1.2677108878334321e+01 9.1440911983714146e-01 2 0 0 -34 0 -P 60 113 4.7159765669982140e-01 -9.8137013413514440e-01 2.4370406619890971e+01 2.4406162239602889e+01 7.4735851973126655e-01 2 0 0 -35 0 -P 61 113 -3.7486729996664692e-01 7.1444064961249365e-01 3.2438220987768268e+01 3.2455915309327651e+01 7.0519981604898474e-01 2 0 0 -36 0 -P 62 223 1.4179614786791939e-01 3.7607095473386615e-01 9.2454157450938268e+01 9.2458324597560690e+01 7.8039856128934548e-01 2 0 0 -37 0 -P 63 223 -2.5333004221869093e-01 -1.7482317991745372e-01 4.1049255544223520e+01 4.1057845264441667e+01 7.8136916329073203e-01 2 0 0 -38 0 -P 64 321 8.9930855079187644e-01 4.6279031139923948e-01 1.3433665469657635e+02 1.3434136878403856e+02 4.9359999999999998e-01 1 0 0 0 0 -P 65 -321 3.1245794752940531e-01 1.4688432657087267e+00 2.5561448142535130e+02 2.5561936915229936e+02 4.9359999999999998e-01 1 0 0 0 0 -V -14 0 0 0 0 0 7 1 0 -P 21 21 4.5189465118581147e+00 3.0246444971641862e-01 7.5589346639934547e+01 7.5724907974672121e+01 0 2 0 0 -14 0 -P 22 21 2.3306161753086991e+00 2.5263018388499852e+00 1.6213072005400015e+01 1.6573402685926418e+01 0 2 0 0 -14 0 -P 23 21 -2.3306161753086991e+00 -2.5263018388499852e+00 1.7097855225215859e+01 1.7439914737177720e+01 0 2 0 0 -14 0 -P 24 21 -4.5189465118581147e+00 -3.0246444971641862e-01 -3.2145610931228710e+00 5.5538964107909132e+00 0 2 0 0 -14 0 -P 25 21 3.3444552178150491e+00 -3.3682323125838081e+00 -1.2861369300978330e+01 1.3709310336835030e+01 0 2 0 0 -14 0 -P 26 21 -1.4025793372001376e+00 2.7884933102773206e+00 -5.6917899608951075e+00 6.4914864782689392e+00 0 2 0 0 -14 0 -P 27 21 -3.3444552178150491e+00 3.3682323125838081e+00 -1.4040682664225221e+01 1.4821306936062644e+01 0 2 0 0 -14 0 -P 66 92 -1.4281371786462076e+00 2.2187014957585420e+00 -1.9871596487759671e+03 6.7129582165122420e+03 6.4120977522729381e+03 2 0 0 -15 0 -V -15 0 0 0 0 0 0 35 0 -P 67 -213 5.4216260460293231e-01 -7.8759029792302415e-01 1.9393385450254702e+03 1.9393389087263906e+03 7.0458483531368932e-01 2 0 0 -39 0 -P 68 211 1.0135732704315257e-02 5.3514575211682114e-01 2.3409980209226654e+02 2.3410045558078767e+02 1.3957000000000000e-01 1 0 0 0 0 -P 69 1114 8.9641438172015775e-01 -3.6392129443568710e-01 4.4812864618973961e+01 4.4840773987411758e+01 1.2514707265275640e+00 2 0 0 -40 0 -P 70 211 3.8473184386194154e-01 1.7416136993019182e-01 7.6482609489049134e+00 7.6611830745584788e+00 1.3957000000000000e-01 1 0 0 0 0 -P 71 -2212 1.3570820383715327e+00 -3.4833837508799126e-01 5.9400969475256197e+01 5.9424898287465744e+01 9.3827000000000005e-01 1 0 0 0 0 -P 72 223 5.3513808491869197e-01 5.6258841694084194e-01 1.3497984646533387e+01 1.3542742700934161e+01 7.7936631236407006e-01 2 0 0 -41 0 -P 73 111 1.4249126471823113e+00 -8.7326689179198683e-02 2.6487334767795783e+01 2.6526121554128995e+01 1.3497999999999999e-01 2 0 0 -42 0 -P 74 113 1.0243223484583437e+00 8.9460184235475726e-01 7.8398598406213731e+00 8.0044033243370425e+00 8.7035712680161426e-01 2 0 0 -43 0 -P 75 213 7.8146511190515611e-01 8.1085897447583399e-01 9.7004079181519618e+00 9.7985969509811213e+00 8.0399529328116248e-01 2 0 0 -44 0 -P 76 223 -6.0070864720254791e-01 -7.5020685309669766e-01 4.3286489963019363e+00 4.5018892429835349e+00 7.7855213161865244e-01 2 0 0 -45 0 -P 77 -213 2.0007537718930121e-01 -8.0481277249238786e-02 2.7952951677960907e+00 2.9524405521698647e+00 9.2559318625830767e-01 2 0 0 -46 0 -P 78 113 -4.2184079371557825e-01 6.6478556099176161e-02 2.1918020937664431e+00 2.2875634621838854e+00 4.9656935227230686e-01 2 0 0 -47 0 -P 79 213 -6.8390630107822026e-01 -1.2031666983062672e+00 6.5479758970760322e+00 6.7835848615007661e+00 1.1071121406280251e+00 2 0 0 -48 0 -P 80 111 -5.9823858771689586e-01 -1.2013185150743945e-01 9.0499212497479931e-01 1.0997960793922275e+00 1.3497999999999999e-01 2 0 0 -49 0 -P 81 -211 -1.8659891773971918e-01 3.9874400471142490e-01 -3.5494610553090200e-01 5.8247957914977033e-01 1.3957000000000000e-01 1 0 0 0 0 -P 82 113 -9.1461437410828916e-01 -4.4389801834541065e-01 -7.0381543247325407e-01 1.5379185055407165e+00 9.1447923031668488e-01 2 0 0 -50 0 -P 83 213 -1.2615073893577071e+00 1.7769459083209821e-01 -8.9289455873395662e-01 1.7351143047719249e+00 7.6836495013266204e-01 2 0 0 -51 0 -P 84 -211 -8.7219080940381755e-01 -1.8926094685784717e-01 -5.3480327737921796e-01 1.0497765688037612e+00 1.3957000000000000e-01 1 0 0 0 0 -P 85 113 6.2141214984468351e-01 -8.6421893286914353e-02 -2.4332734261172653e+00 2.6283177307616250e+00 7.7046266877350866e-01 2 0 0 -52 0 -P 86 211 -3.5446434481312317e-01 -1.2268348898738159e+00 -1.2253959392308320e+00 1.7753432939966589e+00 1.3957000000000000e-01 1 0 0 0 0 -P 87 2112 9.1472463744437760e-01 -1.2569570091894453e-01 -3.6476223116165620e+00 3.8782033062592536e+00 9.3957000000000002e-01 1 0 0 0 0 -P 88 -2212 8.6361312614816066e-01 -9.1836205712359598e-01 -4.8715921735632639e+00 5.1187867115208592e+00 9.3827000000000005e-01 1 0 0 0 0 -P 89 113 2.0594892520170244e-02 2.0438980965336340e-01 -5.7002702256806792e-01 9.3915477322444918e-01 7.1755246339511269e-01 2 0 0 -53 0 -P 90 213 -6.4584413784606176e-01 7.8022036598574573e-01 -3.1474571005361729e+00 3.4019473481372686e+00 8.0056298308975271e-01 2 0 0 -54 0 -P 91 113 -1.0973380029073554e+00 7.4299977704846509e-01 -5.3024187721700224e+00 5.5125660457410666e+00 7.1870732003888060e-01 2 0 0 -55 0 -P 92 313 -5.3612158238681562e-01 9.9278532523932750e-01 -3.4650732050135691e+00 3.7239560285499427e+00 7.6685535360910795e-01 2 0 0 -56 0 -P 93 -321 -1.2221331636647612e+00 1.5690691103915120e+00 -4.6853289562246045e+00 5.1138572262970730e+00 4.9359999999999998e-01 1 0 0 0 0 -P 94 221 -6.2878961836263358e-01 3.9774130133513302e-01 -4.6596960331790589e+00 4.7503729486297237e+00 5.4744999999999999e-01 2 0 0 -57 0 -P 95 213 -1.5227279129650367e-01 7.2806206429657749e-01 -2.1391236973384483e+01 2.1421593665725354e+01 8.6394129170691092e-01 2 0 0 -58 0 -P 96 113 3.0209002088422593e-01 -3.9448441998462064e-01 -1.0899232925753084e+01 1.0936206424161766e+01 7.4863625595375760e-01 2 0 0 -59 0 -P 97 111 -8.0811401894910795e-01 4.0766228483193984e-01 -2.8448690697297046e+01 2.8463405607849737e+01 1.3497999999999999e-01 2 0 0 -60 0 -P 98 -213 1.2089810072332315e-01 -5.2079050430329710e-01 -1.1939975039352846e+02 1.1940300095633448e+02 7.0028868431575408e-01 2 0 0 -61 0 -P 99 223 5.4114373167817453e-01 2.7085749567615108e-01 -4.2861438876063943e+02 4.2861551326973716e+02 7.7315102171666417e-01 2 0 0 -62 0 -P 100 2212 -8.2348818137401925e-01 8.9103884396884103e-02 -1.7961757953324147e+03 1.7961762313762292e+03 9.3827000000000005e-01 1 0 0 0 0 -P 101 213 -1.6088234688084649e-01 6.2448336922287219e-02 -1.9053309529925027e+03 1.9053311124555951e+03 7.6018223594688406e-01 2 0 0 -63 0 -V -16 0 0 0 0 0 2 1 0 -P 29 21 1.7182462671114402e+00 2.3426872894360549e+00 2.1255453864254928e-01 2.9130282186112093e+00 0 2 0 0 -16 0 -P 30 21 -1.7182462671114402e+00 -2.3426872894360549e+00 2.0339078055224470e+03 2.0339098804812140e+03 0 2 0 0 -16 0 -P 102 92 0 0 2.0341203600610895e+03 2.0368229086998253e+03 1.0489004809494854e+02 2 0 0 -17 0 -V -17 0 0 0 0 0 0 20 0 -P 103 -211 -6.0384089246498240e-02 -2.1593397066779253e-02 6.7328643487245954e-01 6.9058447804325818e-01 1.3957000000000000e-01 1 0 0 0 0 -P 104 111 3.0137821631491024e-01 6.9978369862249840e-02 2.1411449928155655e+00 2.1675902016241224e+00 1.3497999999999999e-01 2 0 0 -64 0 -P 105 211 -7.4504913328202721e-02 1.3535438527297250e-01 7.5149850953364265e+01 7.5150139387026329e+01 1.3957000000000000e-01 1 0 0 0 0 -P 106 311 -3.0824762001330436e-01 -1.4402182869475991e-01 3.9741975944594941e+02 3.9742021668806382e+02 4.9767000000000000e-01 2 0 0 -65 0 -P 107 333 -9.1866028181973891e-01 -2.0597240947952193e+00 9.9285414260558821e+02 9.9285721752589359e+02 1.0097049676208800e+00 2 0 0 -66 0 -P 108 -323 -2.3490715754350402e-01 8.3095883242977953e-02 4.9572324857581219e+02 4.9572416549705343e+02 9.2032216914309117e-01 2 0 0 -67 0 -P 109 111 4.1806436528339791e-01 -2.2899116272598369e-01 6.4652151043041934e+00 6.4841684672322852e+00 1.3497999999999999e-01 2 0 0 -68 0 -P 110 3222 -5.6454807151714115e-01 3.0038362700044496e-01 1.5559636563150063e+01 1.5618125233927406e+01 1.1893700000000000e+00 2 0 0 -69 0 -P 111 -3212 -1.2459659851310380e-01 1.4248779043166906e-01 1.5027023583236335e+01 1.5075458213813077e+01 1.1925500000000000e+00 2 0 0 -70 0 -P 112 -213 3.7655640018993020e-01 -3.8287574679571718e-01 1.8935226661500398e+01 1.8955778084047072e+01 7.0023245371471732e-01 2 0 0 -71 0 -P 113 211 -1.4243498041231339e-01 3.1036147917840962e-01 3.6873645553705686e-01 5.2159211070040012e-01 1.3957000000000000e-01 1 0 0 0 0 -P 114 113 3.8953818738287976e-01 3.5983308392962821e-03 2.9199479223354214e+00 3.0414263991854740e+00 7.5658821369157259e-01 2 0 0 -72 0 -P 115 111 -9.0634448722506072e-03 6.1399994260374857e-01 8.6138652128429471e-01 1.0664353777893050e+00 1.3497999999999999e-01 2 0 0 -73 0 -P 116 -213 2.1126425569031212e-01 7.2662728626688444e-01 1.7631477856117816e-01 1.0907967455146763e+00 7.6559182336697773e-01 2 0 0 -74 0 -P 117 211 1.8890292053918842e-01 -3.9217829654797970e-01 4.2376063239215755e-01 6.2333056088797001e-01 1.3957000000000000e-01 1 0 0 0 0 -P 118 -211 -5.8451538057038684e-02 1.9531982712468343e-01 3.1711758377891242e-01 4.0200716910401635e-01 1.3957000000000000e-01 1 0 0 0 0 -P 119 221 9.1656294346312978e-02 -7.2250132436744510e-02 4.2083038462435490e-01 7.0030041628825801e-01 5.4744999999999999e-01 2 0 0 -75 0 -P 120 323 3.2393892176032707e-01 5.9901412523414366e-01 3.2048749331960464e+00 3.3826342799303069e+00 8.4097383257149705e-01 2 0 0 -76 0 -P 121 -323 8.3047607121168998e-01 3.6045783335863357e-01 4.3175731064757974e+00 4.4982902518816132e+00 8.7952106622028725e-01 2 0 0 -77 0 -P 122 211 -6.3597693739585281e-01 -2.3904422135293027e-01 1.1612828223115010e+00 1.3526516118193193e+00 1.3957000000000000e-01 1 0 0 0 0 -V -18 0 0 0 0 0 0 2 0 -P 123 311 -8.8835934438628372e-01 6.8074086066904238e-01 -5.6890766581735761e+01 5.6903950549417800e+01 4.9767000000000000e-01 2 0 0 -78 0 -P 124 111 -5.4348142711345571e-01 3.6407659910904144e-01 -1.5577875128577560e+01 1.5592188331135288e+01 1.3497999999999999e-01 2 0 0 -79 0 -V -19 0 0 0 0 0 0 2 0 -P 125 -321 1.0773689084100895e+00 -5.1649738648580301e-01 -4.0378564311746878e+01 4.0399252346459754e+01 4.9359999999999998e-01 1 0 0 0 0 -P 126 211 -3.3282478902592651e-02 5.7785678436559643e-02 -5.2385564741797834e+00 5.2408396871212544e+00 1.3957000000000000e-01 1 0 0 0 0 -V -20 0 0 0 0 0 0 2 0 -P 127 -211 2.3663845137153569e-01 3.6141929721200028e-01 -3.7375453158979781e+01 3.7378210233892375e+01 1.3957000000000000e-01 1 0 0 0 0 -P 128 111 8.7458662032133927e-02 -1.2806458468340143e-01 -2.7357839164058722e+00 2.7434982764856324e+00 1.3497999999999999e-01 2 0 0 -80 0 -V -21 0 1.8697213022662409e-04 6.8082425988507642e-05 -7.8269830089690295e-03 7.8295362206386096e-03 0 2 0 -P 129 22 1.1490964488537836e-01 8.5213701923610385e-02 -5.5616412847888865e+00 5.5634808692177042e+00 0 1 0 0 0 0 -P 130 22 1.1787030455063505e+00 3.8583131502431123e-01 -4.8591266614428093e+01 4.8607092053192950e+01 0 1 0 0 0 0 -V -22 0 0 0 0 0 0 2 0 -P 131 211 9.2572302897073211e-01 -2.0288737845322695e-02 -3.1494950736642860e+01 3.1508868219085731e+01 1.3957000000000000e-01 1 0 0 0 0 -P 132 111 3.2916938375814553e-01 -4.5042884129510524e-01 -3.9848056808092458e+01 3.9852190524557592e+01 1.3497999999999999e-01 2 0 0 -81 0 -V -23 0 0 0 0 0 0 2 0 -P 133 211 5.5628915281980412e-02 -1.7240521926811242e-01 -4.4020576842464809e+00 4.4079938493808974e+00 1.3957000000000000e-01 1 0 0 0 0 -P 134 -211 -3.9094998744296061e-02 -1.2171649033446306e-01 -7.2403963168064124e+01 7.2404210551253385e+01 1.3957000000000000e-01 1 0 0 0 0 -V -24 0 0 0 0 0 0 2 0 -P 135 22 -1.5444404052236614e-02 -1.2303691275080576e-01 -5.4080212553685936e+00 5.4094427171414141e+00 0 1 0 0 0 0 -P 136 22 -1.3428452078583464e-01 1.2760657021293417e-01 -9.5147757177670613e+01 9.5147937506339346e+01 0 1 0 0 0 0 -V -25 0 0 0 0 0 0 3 0 -P 137 111 9.2311480631191989e-02 1.8010222032173673e-01 -1.5022100885582585e+01 1.5024070448325322e+01 1.3497999999999999e-01 2 0 0 -82 0 -P 138 111 1.5389951085199688e-01 1.3360790730478667e-01 -6.2955950525981503e+00 6.3003391019081789e+00 1.3497999999999999e-01 2 0 0 -83 0 -P 139 111 5.5791692764156894e-02 -2.8364874272475478e-02 -7.5531394189043217e+00 7.5546046859435538e+00 1.3497999999999999e-01 2 0 0 -84 0 -V -26 0 0 0 0 0 0 2 0 -P 140 -211 3.4795871222769470e-01 1.2913562700567929e-01 -4.6335489000911831e+00 4.6504845414229168e+00 1.3957000000000000e-01 1 0 0 0 0 -P 141 111 -1.2616270239931780e-02 9.0612641154672498e-03 -3.1783389119279665e-01 3.4565772025645797e-01 1.3497999999999999e-01 2 0 0 -85 0 -V -27 0 0 0 0 0 0 2 0 -P 142 211 -2.6507126648343393e-01 1.6611475780357760e-01 -3.6620259310433121e+00 3.6780117718148904e+00 1.3957000000000000e-01 1 0 0 0 0 -P 143 111 3.0353451369983231e-01 -1.9294045346846636e-01 -2.5685127621855748e+00 2.5970823301354509e+00 1.3497999999999999e-01 2 0 0 -86 0 -V -28 0 0 0 0 0 0 2 0 -P 144 211 4.2568471861282581e-01 -5.3585815142727589e-01 -8.6305498665514868e-01 1.1102680455646092e+00 1.3957000000000000e-01 1 0 0 0 0 -P 145 111 2.6262134649075942e-02 1.9741185741202916e-01 -6.5317860563600838e-01 6.9607688686221558e-01 1.3497999999999999e-01 2 0 0 -87 0 -V -29 0 0 0 0 0 0 2 0 -P 146 211 2.7491546942463990e-01 1.5012758060953384e-02 6.4340006694604740e-02 3.1531463587189956e-01 1.3957000000000000e-01 1 0 0 0 0 -P 147 -211 -2.4778790206768489e-01 -3.6597390883771697e-01 -2.6994157072330072e-01 5.3636180220595964e-01 1.3957000000000000e-01 1 0 0 0 0 -V -30 0 0 0 0 0 0 2 0 -P 148 321 -3.4500238693339409e-02 -1.0597931797356490e-01 9.4631402810185450e-01 1.0731137321320592e+00 4.9359999999999998e-01 1 0 0 0 0 -P 149 -211 1.8867321425149802e-01 -1.7634955497925797e-01 4.1041335305949819e-02 2.9641343326689734e-01 1.3957000000000000e-01 1 0 0 0 0 -V -31 0 0 0 0 0 0 3 0 -P 150 -211 1.7372815870072264e-01 3.9816647204593414e-01 1.3106575762200228e+00 1.3878116153102316e+00 1.3957000000000000e-01 1 0 0 0 0 -P 151 211 2.2174429060384263e-02 -7.0700764257547011e-02 9.6535187332727646e-01 9.7819953363679191e-01 1.3957000000000000e-01 1 0 0 0 0 -P 152 111 7.4582340824285623e-02 3.1784453981659611e-01 2.5732918564902025e+00 2.5974291628710198e+00 1.3497999999999999e-01 2 0 0 -88 0 -V -32 0 0 0 0 0 0 2 0 -P 153 -211 3.3962108465623669e-02 -1.2136739619253469e-02 3.0383058001969304e-01 3.3629381724188662e-01 1.3957000000000000e-01 1 0 0 0 0 -P 154 211 -2.2902340300623730e-01 -4.3783153607398917e-01 6.0529885371887526e-01 7.9373462839846587e-01 1.3957000000000000e-01 1 0 0 0 0 -V -33 0 0 0 0 0 0 1 0 -P 155 130 2.5486600266519988e-01 -5.5963768406031345e-01 7.0488897796228791e+00 7.0931427146862633e+00 4.9767000000000000e-01 1 0 0 0 0 -V -34 0 0 0 0 0 0 2 0 -P 156 -311 6.3629118454362399e-01 2.6066327066419842e-01 7.2899009219783402e+00 7.3391513605703720e+00 4.9767000000000000e-01 2 0 0 -89 0 -P 157 -211 -4.6447952583897813e-02 2.4637794452732709e-01 5.3302393166445974e+00 5.3379575177639449e+00 1.3957000000000000e-01 1 0 0 0 0 -V -35 0 0 0 0 0 0 2 0 -P 158 -211 -1.3843969334754791e-01 -1.1573951633130124e-01 2.7775781205311443e+00 2.7869304234027963e+00 1.3957000000000000e-01 1 0 0 0 0 -P 159 211 6.1003735004736936e-01 -8.6563061780384321e-01 2.1592828499359829e+01 2.1619231816200092e+01 1.3957000000000000e-01 1 0 0 0 0 -V -36 0 0 0 0 0 0 2 0 -P 160 -211 -5.3563447701898401e-02 6.6112470805366741e-01 1.6778003219314172e+01 1.6791689216238652e+01 1.3957000000000000e-01 1 0 0 0 0 -P 161 211 -3.2130385226474850e-01 5.3315941558826262e-02 1.5660217768454098e+01 1.5664226093088988e+01 1.3957000000000000e-01 1 0 0 0 0 -V -37 0 0 0 0 0 0 3 0 -P 162 211 -6.6907931039927135e-02 1.2175756451401197e-01 1.3514430333249674e+01 1.3515865070091197e+01 1.3957000000000000e-01 1 0 0 0 0 -P 163 -211 1.5997741131462320e-01 -8.4859508363502090e-02 1.5752145709471709e+01 1.5753804878365688e+01 1.3957000000000000e-01 1 0 0 0 0 -P 164 111 4.8726667593223340e-02 3.3917289858335631e-01 6.3187581408216893e+01 6.3188654649103782e+01 1.3497999999999999e-01 2 0 0 -90 0 -V -38 0 0 0 0 0 0 3 0 -P 165 -211 -2.2781057367096993e-01 -1.8076023205047512e-01 2.2204623661144236e+01 2.2206966556396523e+01 1.3957000000000000e-01 1 0 0 0 0 -P 166 211 -8.8088472241610968e-02 1.2956137830090980e-01 4.4468232102231378e+00 4.4517706789061249e+00 1.3957000000000000e-01 1 0 0 0 0 -P 167 111 6.2569003693889999e-02 -1.2362432616788839e-01 1.4397808672856140e+01 1.4399108029138999e+01 1.3497999999999999e-01 2 0 0 -91 0 -V -39 0 0 0 0 0 0 2 0 -P 168 -211 1.1575661872227846e-01 -5.9566096362919352e-01 7.2921715829360608e+02 7.2921742412065646e+02 1.3957000000000000e-01 1 0 0 0 0 -P 169 111 4.2640598588065382e-01 -1.9192933429383069e-01 1.2101213867318643e+03 1.2101214846057335e+03 1.3497999999999999e-01 2 0 0 -92 0 -V -40 0 0 0 0 0 0 2 0 -P 170 2112 5.7730953717981204e-01 -4.9267549823692297e-01 3.3126349100956851e+01 3.3148360622987781e+01 9.3957000000000002e-01 1 0 0 0 0 -P 171 -211 3.1910484454034588e-01 1.2875420380123584e-01 1.1686515518017115e+01 1.1692413364423977e+01 1.3957000000000000e-01 1 0 0 0 0 -V -41 0 0 0 0 0 0 3 0 -P 172 -211 9.5487207154282661e-02 -6.2863114436684478e-02 1.2548498161728181e+00 1.2677529033434551e+00 1.3957000000000000e-01 1 0 0 0 0 -P 173 211 2.1429886442208966e-02 1.3131790882612157e-01 1.6489652622608375e+00 1.6602017510695333e+00 1.3957000000000000e-01 1 0 0 0 0 -P 174 111 4.1822099132220031e-01 4.9413362255140486e-01 1.0594169568099732e+01 1.0614788046521172e+01 1.3497999999999999e-01 2 0 0 -93 0 -V -42 0 1.8062935474981218e-04 -1.1069986325174275e-05 3.3576726247816625e-03 3.3625894399998031e-03 0 2 0 -P 175 22 6.7619288638646513e-01 -9.1896050652983813e-02 1.1803182198575048e+01 1.1822892696649337e+01 0 1 0 0 0 0 -P 176 22 7.4871976079584612e-01 4.5693614737851275e-03 1.4684152569220737e+01 1.4703228857479658e+01 0 1 0 0 0 0 -V -43 0 0 0 0 0 0 2 0 -P 177 -211 1.8255094262342417e-01 4.9281267235300757e-01 4.5388757870887497e+00 4.5713304816218363e+00 1.3957000000000000e-01 1 0 0 0 0 -P 178 211 8.4177140583491938e-01 4.0178917000174957e-01 3.3009840535326229e+00 3.4330728427152049e+00 1.3957000000000000e-01 1 0 0 0 0 -V -44 0 0 0 0 0 0 2 0 -P 179 211 6.4478111510714742e-01 7.1330192574342022e-01 9.2323181717291547e+00 9.2833033416240607e+00 1.3957000000000000e-01 1 0 0 0 0 -P 180 111 1.3668399679800877e-01 9.7557048732413817e-02 4.6808974642280660e-01 5.1529360935705770e-01 1.3497999999999999e-01 2 0 0 -94 0 -V -45 0 0 0 0 0 0 3 0 -P 181 -211 -3.3985093605444544e-01 -3.3839691300994644e-02 1.0124513152340913e+00 1.0775811960421686e+00 1.3957000000000000e-01 1 0 0 0 0 -P 182 211 -1.2829685354263031e-02 -1.2856125071302602e-01 5.3883610377089486e-01 5.7141642226854616e-01 1.3957000000000000e-01 1 0 0 0 0 -P 183 111 -2.4802802579383956e-01 -5.8780591108267710e-01 2.7773615772969507e+00 2.8528916246728215e+00 1.3497999999999999e-01 2 0 0 -95 0 -V -46 0 0 0 0 0 0 2 0 -P 184 -211 1.3358989959828704e-01 3.8645547651348672e-01 1.6675168582308439e+00 1.7225813054790797e+00 1.3957000000000000e-01 1 0 0 0 0 -P 185 111 6.6485477591014169e-02 -4.6693675376272548e-01 1.1277783095652469e+00 1.2298592466907843e+00 1.3497999999999999e-01 2 0 0 -96 0 -V -47 0 0 0 0 0 0 2 0 -P 186 211 -9.3953505824433764e-02 -1.5916621156773283e-01 8.5366541626208947e-01 8.8452561974396915e-01 1.3957000000000000e-01 1 0 0 0 0 -P 187 -211 -3.2788728789114446e-01 2.2564476766690900e-01 1.3381366775043535e+00 1.4030378424399157e+00 1.3957000000000000e-01 1 0 0 0 0 -V -48 0 0 0 0 0 0 2 0 -P 188 211 -3.1297297759670162e-01 -1.2700760300481633e+00 5.6378957412772790e+00 5.7893344506273889e+00 1.3957000000000000e-01 1 0 0 0 0 -P 189 111 -3.7093332348151864e-01 6.6909331741895992e-02 9.1008015579875357e-01 9.9425041087337529e-01 1.3497999999999999e-01 2 0 0 -97 0 -V -49 0 -1.4965826533362982e-04 -3.0052766366232216e-05 2.2639721733967781e-04 2.7513031897644541e-04 0 2 0 -P 190 22 -3.0753609678583916e-02 -4.0951860957295985e-02 6.0453254742586303e-02 7.9230268414921035e-02 0 1 0 0 0 0 -P 191 22 -5.6748497803831199e-01 -7.9179990550143464e-02 8.4453887023221308e-01 1.0205658109773066e+00 0 1 0 0 0 0 -V -50 0 0 0 0 0 0 2 0 -P 192 211 -3.7395809242150829e-01 -5.4704665311005618e-01 -6.9450929608971679e-01 9.7001424877239883e-01 1.3957000000000000e-01 1 0 0 0 0 -P 193 -211 -5.4065628168678093e-01 1.0314863476464556e-01 -9.3061363835372987e-03 5.6790425676831746e-01 1.3957000000000000e-01 1 0 0 0 0 -V -51 0 0 0 0 0 0 2 0 -P 194 211 -1.0036870681900585e+00 6.0908344293775021e-02 -9.7858835208038319e-01 1.4100398948199884e+00 1.3957000000000000e-01 1 0 0 0 0 -P 195 111 -2.5782032116764880e-01 1.1678624653832320e-01 8.5693793346426558e-02 3.2507440995193648e-01 1.3497999999999999e-01 2 0 0 -98 0 -V -52 0 0 0 0 0 0 2 0 -P 196 -211 -4.1290701932326097e-02 -2.0666261137288519e-01 -1.0930205176097356e+00 1.1218680821831855e+00 1.3957000000000000e-01 1 0 0 0 0 -P 197 211 6.6270285177700960e-01 1.2024071808597084e-01 -1.3402529085075296e+00 1.5064496485784395e+00 1.3957000000000000e-01 1 0 0 0 0 -V -53 0 0 0 0 0 0 2 0 -P 198 -211 -3.1658924960087986e-01 1.5111911254455840e-01 -2.9258169938081902e-01 4.7765005480128553e-01 1.3957000000000000e-01 1 0 0 0 0 -P 199 211 3.3718414212105013e-01 5.3270697108805012e-02 -2.7744532318724890e-01 4.6150471842316365e-01 1.3957000000000000e-01 1 0 0 0 0 -V -54 0 0 0 0 0 0 2 0 -P 200 211 7.8603340975565442e-02 2.4826114704283447e-02 -1.3818930413805391e-01 2.1300443624955517e-01 1.3957000000000000e-01 1 0 0 0 0 -P 201 111 -7.2444747882162719e-01 7.5539425128146231e-01 -3.0092677963981189e+00 3.1889429118877124e+00 1.3497999999999999e-01 2 0 0 -99 0 -V -55 0 0 0 0 0 0 2 0 -P 202 211 -7.1336812839619990e-01 1.2156278646260546e-01 -2.1215576393421842e+00 2.2459203457859389e+00 1.3957000000000000e-01 1 0 0 0 0 -P 203 -211 -3.8396987451115550e-01 6.2143699058585955e-01 -3.1808611328278378e+00 3.2666456999551263e+00 1.3957000000000000e-01 1 0 0 0 0 -V -56 0 0 0 0 0 0 2 0 -P 204 321 -1.7893673284703560e-01 6.0568524101514520e-01 -1.7601004507644631e+00 1.9340288318240793e+00 4.9359999999999998e-01 1 0 0 0 0 -P 205 -211 -3.5718484953977997e-01 3.8710008422418218e-01 -1.7049727542491055e+00 1.7899271967258628e+00 1.3957000000000000e-01 1 0 0 0 0 -V -57 0 0 0 0 0 0 3 0 -P 206 111 -2.9554292158215627e-02 6.8699727020969506e-02 -6.7667418059625295e-01 6.9404658039885136e-01 1.3497999999999999e-01 2 0 0 -100 0 -P 207 111 -8.3861532678087297e-02 5.2894938783996322e-02 -8.9880718379003643e-01 9.1427817716746196e-01 1.3497999999999999e-01 2 0 0 -101 0 -P 208 111 -5.1537379352633073e-01 2.7614663553016722e-01 -3.0842146687927694e+00 3.1420481910634095e+00 1.3497999999999999e-01 2 0 0 -102 0 -V -58 0 0 0 0 0 0 2 0 -P 209 211 -2.8787457288157677e-02 2.4879370258541306e-01 -1.6687893171284660e+01 1.6690356056874656e+01 1.3957000000000000e-01 1 0 0 0 0 -P 210 111 -1.2348533400834598e-01 4.7926836171116444e-01 -4.7033438020998224e+00 4.7312376088506980e+00 1.3497999999999999e-01 2 0 0 -103 0 -V -59 0 0 0 0 0 0 2 0 -P 211 -211 3.0913726888285875e-01 -2.4912078764392806e-01 -2.5465295938249941e+00 2.5810695021589738e+00 1.3957000000000000e-01 1 0 0 0 0 -P 212 211 -7.0472479986327845e-03 -1.4536363234069261e-01 -8.3527033319280903e+00 8.3551369220027905e+00 1.3957000000000000e-01 1 0 0 0 0 -V -60 0 -2.5008859253652064e-05 1.2616002773522305e-05 -8.8040707736340902e-04 8.8086246251737634e-04 0 2 0 -P 213 22 -3.0216804572784750e-01 1.8884543693933467e-01 -1.3003859249159436e+01 1.3008740273326284e+01 0 1 0 0 0 0 -P 214 22 -5.0594597322126056e-01 2.1881684789260519e-01 -1.5444831448137609e+01 1.5454665334523453e+01 0 1 0 0 0 0 -V -61 0 0 0 0 0 0 2 0 -P 215 -211 -2.2421009461650029e-01 -6.5249877864224176e-02 -5.1189059483439948e+01 5.1189782362275601e+01 1.3957000000000000e-01 1 0 0 0 0 -P 216 111 3.4510819533982345e-01 -4.5554062643907289e-01 -6.8210690910088516e+01 6.8213218594058873e+01 1.3497999999999999e-01 2 0 0 -104 0 -V -62 0 0 0 0 0 0 3 0 -P 217 211 3.1996614273406238e-01 2.2698112849886470e-01 -2.1384580773417935e+02 2.1384621311595322e+02 1.3957000000000000e-01 1 0 0 0 0 -P 218 -211 2.0155403003524568e-02 1.0084712989668214e-01 -1.6553192481345258e+02 1.6553201560005030e+02 1.3957000000000000e-01 1 0 0 0 0 -P 219 111 2.0102218594058774e-01 -5.6970762719395704e-02 -4.9236656213007620e+01 4.9237284553733737e+01 1.3497999999999999e-01 2 0 0 -105 0 -V -63 0 0 0 0 0 0 2 0 -P 220 211 -1.1965928167053523e-02 -1.7609060069797053e-01 -1.5658354689143539e+03 1.5658354850817191e+03 1.3957000000000000e-01 1 0 0 0 0 -P 221 111 -1.4891641871379296e-01 2.3853893762025774e-01 -3.3949548407814893e+02 3.3949562737387589e+02 1.3497999999999999e-01 2 0 0 -106 0 -V -64 0 1.7224079361358685e-05 3.9993368161236640e-06 1.2236866927998514e-04 1.2388004054236708e-04 0 2 0 -P 222 22 3.4213945668553833e-02 6.0764556174071421e-02 3.9702505912805364e-01 4.0310274489375181e-01 0 1 0 0 0 0 -P 223 22 2.6716427064635639e-01 9.2138136881784183e-03 1.7441199336875117e+00 1.7644874567303706e+00 0 1 0 0 0 0 -V -65 0 0 0 0 0 0 1 0 -P 224 130 -3.0824762001330436e-01 -1.4402182869475991e-01 3.9741975944594941e+02 3.9742021668806376e+02 4.9767000000000000e-01 1 0 0 0 0 -V -66 0 0 0 0 0 0 2 0 -P 225 130 -5.6718967892915073e-01 -1.1431034690863549e+00 5.6205241242334318e+02 5.6205408136228459e+02 4.9767000000000000e-01 1 0 0 0 0 -P 226 310 -3.5147060289058818e-01 -9.1662062570886449e-01 4.3080173018224508e+02 4.3080313616360888e+02 4.9767000000000000e-01 2 0 0 -107 0 -V -67 0 0 0 0 0 0 2 0 -P 227 -311 -2.4546654743398341e-01 -2.3146159829648183e-01 2.8342132256983007e+02 2.8342196031881150e+02 4.9767000000000000e-01 2 0 0 -108 0 -P 228 -211 1.0559389890479413e-02 3.1455748153945978e-01 2.1230192600598207e+02 2.1230220517824185e+02 1.3957000000000000e-01 1 0 0 0 0 -V -68 0 4.8796540959387777e-05 -2.6727885893172615e-05 7.5462096233572576e-04 7.5683320195057979e-04 0 2 0 -P 229 22 2.6685060975905711e-01 -1.4011960385428618e-01 4.8753534441163167e+00 4.8846610892025959e+00 0 1 0 0 0 0 -P 230 22 1.5121375552434085e-01 -8.8871558871697537e-02 1.5898616601878772e+00 1.5995073780296898e+00 0 1 0 0 0 0 -V -69 0 -1.2542959339478501e+00 6.6738331238764326e-01 3.4569932764836054e+01 3.4699881135292600e+01 0 2 0 -P 231 2112 -4.8062679974778633e-01 3.6572879428995364e-01 1.4593581181314528e+01 1.4636261925509741e+01 9.3957000000000002e-01 1 0 0 0 0 -P 232 211 -8.3921271769354780e-02 -6.5345167289508649e-02 9.6605538183553463e-01 9.8186330841766378e-01 1.3957000000000000e-01 1 0 0 0 0 -V -70 0 0 0 0 0 0 2 0 -P 233 -3122 -6.4332980426235087e-02 1.6435334128651716e-01 1.4602391787438231e+01 1.4646014424730232e+01 1.1156800000000000e+00 2 0 0 -109 0 -P 234 22 -6.0263618086868719e-02 -2.1865550854848093e-02 4.2463179579810417e-01 4.2944378908284236e-01 0 1 0 0 0 0 -V -71 0 0 0 0 0 0 2 0 -P 235 -211 1.2164753959102612e-01 -4.5521551591701886e-01 7.1835598725210605e+00 7.2003494024120069e+00 1.3957000000000000e-01 1 0 0 0 0 -P 236 111 2.5490886059890411e-01 7.2339769121301689e-02 1.1751666788979339e+01 1.1755428681635065e+01 1.3497999999999999e-01 2 0 0 -110 0 -V -72 0 0 0 0 0 0 2 0 -P 237 -211 1.1930293579631301e-01 2.0049976557463289e-01 2.3525837282285753e+00 2.3682405557102864e+00 1.3957000000000000e-01 1 0 0 0 0 -P 238 211 2.7023525158656675e-01 -1.9690143473533661e-01 5.6736419410684646e-01 6.7318584347518806e-01 1.3957000000000000e-01 1 0 0 0 0 -V -73 0 -1.4041331718659690e-06 9.5122516778726869e-05 1.3344830860466966e-04 1.6521502703569109e-04 0 2 0 -P 239 22 -3.4840433826297368e-02 2.3835644419272761e-01 4.3776599393873217e-01 4.9966660461408824e-01 0 1 0 0 0 0 -P 240 22 2.5776988954046759e-02 3.7564349841102102e-01 4.2362052734556249e-01 5.6676877317521679e-01 0 1 0 0 0 0 -V -74 0 0 0 0 0 0 2 0 -P 241 -211 -4.8632585458811266e-02 5.7613097737265306e-01 -1.6428978489932830e-01 6.1705992397744047e-01 1.3957000000000000e-01 1 0 0 0 0 -P 242 111 2.5989684114912343e-01 1.5049630889423141e-01 3.4060456346050649e-01 4.7373682153723579e-01 1.3497999999999999e-01 2 0 0 -111 0 -V -75 0 0 0 0 0 0 2 0 -P 243 22 -8.2029197985667976e-02 -1.7893268748394126e-01 4.5302511305727694e-01 4.9394073433252722e-01 0 1 0 0 0 0 -P 244 22 1.7368549233198097e-01 1.0668255504719676e-01 -3.2194728432922044e-02 2.0635968195573082e-01 0 1 0 0 0 0 -V -76 0 0 0 0 0 0 2 0 -P 245 321 3.1196765661891573e-01 5.2753774638899031e-01 3.0966105128831014e+00 3.1950363880775470e+00 4.9359999999999998e-01 1 0 0 0 0 -P 246 111 1.1971265141411374e-02 7.1476378845153385e-02 1.0826442031294552e-01 1.8759789185276041e-01 1.3497999999999999e-01 2 0 0 -112 0 -V -77 0 0 0 0 0 0 2 0 -P 247 -321 3.7146363264552096e-01 2.5233125086536835e-02 1.5308117489269486e+00 1.6509535158909296e+00 4.9359999999999998e-01 1 0 0 0 0 -P 248 111 4.5901243856616902e-01 3.3522470827209677e-01 2.7867613575488490e+00 2.8473367359906829e+00 1.3497999999999999e-01 2 0 0 -113 0 -V -78 0 0 0 0 0 0 1 0 -P 249 130 -8.8835934438628372e-01 6.8074086066904238e-01 -5.6890766581735761e+01 5.6903950549417793e+01 4.9767000000000000e-01 1 0 0 0 0 -V -79 0 -4.4817862219771405e-06 3.0023353222897988e-06 -1.2846199085357989e-04 1.2858002379972176e-04 0 2 0 -P 250 22 -4.3665145174182041e-01 3.4929125535303568e-01 -1.3346660737281969e+01 1.3358368976318870e+01 0 1 0 0 0 0 -P 251 22 -1.0682997537163530e-01 1.4785343756005780e-02 -2.2312143912955911e+00 2.2338193548164194e+00 0 1 0 0 0 0 -V -80 0 1.1498498947914117e-05 -1.6837102901323914e-05 -3.5968316635069550e-04 3.6069740049514610e-04 0 2 0 -P 252 22 2.1038819336212194e-02 -3.0885983525310211e-02 -1.3571303869921980e-01 1.4076435902018464e-01 0 1 0 0 0 0 -P 253 22 6.6419842695921730e-02 -9.7178601158091210e-02 -2.6000708777066524e+00 2.6027339174654478e+00 0 1 0 0 0 0 -V -81 0 1.4686859594192499e-04 -2.0097206713904554e-04 -1.7779381811276310e-02 1.7781226190380851e-02 0 2 0 -P 254 22 1.3160148159474916e-01 -1.7607773501339169e-01 -1.1351519572335821e+01 1.1353647824371190e+01 0 1 0 0 0 0 -P 255 22 1.9756790216339634e-01 -2.7435110628171355e-01 -2.8496537235756634e+01 2.8498542700186409e+01 0 1 0 0 0 0 -V -82 0 5.4468947599719818e-06 1.0627040465845464e-05 -8.8638815061755207e-04 8.8650436585870627e-04 0 2 0 -P 256 22 7.4170914151783521e-02 1.1931245135626149e-01 -1.3390197719027501e+01 1.3390934685084687e+01 0 1 0 0 0 0 -P 257 22 1.8140566479408472e-02 6.0789768965475235e-02 -1.6319031665550834e+00 1.6331357632406374e+00 0 1 0 0 0 0 -V -83 0 1.1901070929278200e-05 1.0331918358570022e-05 -4.8683925535694022e-04 4.8720611336069926e-04 0 2 0 -P 258 22 5.7800358510051483e-02 1.0610466901086330e-01 -4.7377783347524538e+00 4.7393187940335411e+00 0 1 0 0 0 0 -P 259 22 9.6099152341945396e-02 2.7503238293923368e-02 -1.5578167178456963e+00 1.5610203078746385e+00 0 1 0 0 0 0 -V -84 0 1.9717825146052879e-05 -1.0024675780293960e-05 -2.6694203919439990e-03 2.6699382446536131e-03 0 2 0 -P 260 22 -3.1659375525207083e-02 2.9139435087521169e-02 -1.8076191689495109e+00 1.8081312127966784e+00 0 1 0 0 0 0 -P 261 22 8.7451068289363970e-02 -5.7504309359996640e-02 -5.7455202499548106e+00 5.7464734731468763e+00 0 1 0 0 0 0 -V -85 0 -1.1098678875795688e-05 7.9712988635923251e-06 -2.7960215080273293e-04 3.0407909509766429e-04 0 2 0 -P 262 22 -1.2404392105220950e-02 1.3072052856764920e-02 -3.3120578315562949e-01 3.3169567121854948e-01 0 1 0 0 0 0 -P 263 22 -2.1187813471082882e-04 -4.0107887412976712e-03 1.3371891962832829e-02 1.3962049037908679e-02 0 1 0 0 0 0 -V -86 0 4.3701901577387691e-05 -2.7778932303276074e-05 -3.6980602490661738e-04 3.7391937739307860e-04 0 2 0 -P 264 22 6.2980374428364197e-02 -1.0968065014364305e-01 -7.0367021794103213e-01 7.1494625545998147e-01 0 1 0 0 0 0 -P 265 22 2.4055413927146813e-01 -8.3259803324823314e-02 -1.8648425442445429e+00 1.8821360746754701e+00 0 1 0 0 0 0 -V -87 0 4.8701731099785062e-07 3.6608978379173926e-06 -1.2112849635753707e-05 1.2908375431671910e-05 0 2 0 -P 266 22 -2.7090617015867346e-02 1.4244131973944305e-01 -5.4202119215789846e-01 5.6107967691557348e-01 0 1 0 0 0 0 -P 267 22 5.3352751664943285e-02 5.4970537672586084e-02 -1.1115741347810988e-01 1.3499720994664230e-01 0 1 0 0 0 0 -V -88 0 5.7146814384201549e-06 2.4354026327390962e-05 1.9717191825030330e-04 1.9902137772319508e-04 0 2 0 -P 268 22 -2.7936966043945702e-02 1.5190345905548287e-02 3.2316443733638378e-01 3.2472522883110322e-01 0 1 0 0 0 0 -P 269 22 1.0251930686823132e-01 3.0265419391104781e-01 2.2501274191538188e+00 2.2727039340399169e+00 0 1 0 0 0 0 -V -89 0 0 0 0 0 0 1 0 -P 270 310 6.3629118454362399e-01 2.6066327066419842e-01 7.2899009219783402e+00 7.3391513605703720e+00 4.9767000000000000e-01 2 0 0 -114 0 -V -90 0 7.9367802508350484e-06 5.5245739059513326e-05 1.0292227500665664e-02 1.0292402314119905e-02 0 2 0 -P 271 22 7.8535141648213305e-02 9.9560856692336122e-02 2.1477224930174994e+01 2.1477599280040344e+01 0 1 0 0 0 0 -P 272 22 -2.9808474054989965e-02 2.3961204189102020e-01 4.1710356478041902e+01 4.1711055369063452e+01 0 1 0 0 0 0 -V -91 0 5.5297266074583105e-05 -1.0925677018674232e-04 1.2724502710143248e-02 1.2725651055903247e-02 0 2 0 -P 273 22 6.8440360627038010e-02 -7.5865663977273692e-02 4.4101211349196099e+00 4.4113045810279425e+00 0 1 0 0 0 0 -P 274 22 -5.8713569331480097e-03 -4.7758662190614712e-02 9.9876875379365302e+00 9.9878034481110625e+00 0 1 0 0 0 0 -V -92 0 8.1925385454488015e-05 -3.6875384522501292e-05 2.3250063164562518e-01 2.3250065045013255e-01 0 2 0 -P 275 22 1.6711452594100847e-02 1.6870653625057283e-02 3.6019552965433256e+01 3.6019560793008758e+01 0 1 0 0 0 0 -P 276 22 4.0969453328655292e-01 -2.0879998791888793e-01 1.1741018337664309e+03 1.1741019238127251e+03 0 1 0 0 0 0 -V -93 0 2.5961841133729550e-05 3.0674258044667582e-05 6.5765265966504665e-04 6.5893258982709882e-04 0 2 0 -P 277 22 1.3018449916600637e-02 3.4011182350692962e-02 2.7215110360084871e-01 2.7457688131793440e-01 0 1 0 0 0 0 -P 278 22 4.0520254140559964e-01 4.6012244020071186e-01 1.0322018464498882e+01 1.0340211165203236e+01 0 1 0 0 0 0 -V -94 0 3.8901737926929142e-05 2.7765787009590177e-05 1.3322338436249194e-04 1.4665811226059863e-04 0 2 0 -P 279 22 8.0063088182418432e-02 3.1238773946188861e-02 7.9613488602169380e-02 1.1715061525393101e-01 0 1 0 0 0 0 -P 280 22 5.6620908615590333e-02 6.6318274786224957e-02 3.8847625782063722e-01 3.9814299410312703e-01 0 1 0 0 0 0 -V -95 0 -2.0261701110488303e-04 -4.8018556141857103e-04 2.2688593345382702e-03 2.3305607184803791e-03 0 2 0 -P 281 22 -1.5904416100449204e-01 -5.0608925283349793e-01 2.3153084317170132e+00 2.3753051406004837e+00 0 1 0 0 0 0 -P 282 22 -8.8983864789347528e-02 -8.1716658249179147e-02 4.6205314557993754e-01 4.7758648407233734e-01 0 1 0 0 0 0 -V -96 0 5.8495528174864427e-06 -4.1082222803042357e-05 9.9224658184738723e-05 1.0820598546116414e-04 0 2 0 -P 283 22 9.1972477577124914e-02 -4.4592456889574522e-01 1.0769225359730650e+00 1.1692176043248705e+00 0 1 0 0 0 0 -P 284 22 -2.5486999986110755e-02 -2.1012184866980223e-02 5.0855773592181873e-02 6.0641642365914170e-02 0 1 0 0 0 0 -V -97 0 -4.3582543869767395e-05 7.8614637762069199e-06 1.0692921289149186e-04 1.1681873643143345e-04 0 2 0 -P 285 22 -1.8371320086265014e-01 7.4984574553145597e-02 5.9982550796311540e-01 6.3179416473668593e-01 0 1 0 0 0 0 -P 286 22 -1.8722012261886847e-01 -8.0752428112496038e-03 3.1025464783563805e-01 3.6245624613668997e-01 0 1 0 0 0 0 -V -98 0 -3.1549862434167774e-05 1.4291309528277945e-05 1.0486479030424113e-05 3.9779846943029794e-05 0 2 0 -P 287 22 -4.5641294538943424e-02 8.0409127662733962e-02 -2.3546345316033672e-03 9.2489458223355650e-02 0 1 0 0 0 0 -P 288 22 -2.1217902662870536e-01 3.6377118875589240e-02 8.8048427878029925e-02 2.3258495172858076e-01 0 1 0 0 0 0 -V -99 0 -2.0055761571577863e-04 2.0912498751302585e-04 -8.3309224193529549e-04 8.8283389170218331e-04 0 2 0 -P 289 22 -1.9843402797534637e-01 2.8458700251599517e-01 -8.9233754423776901e-01 9.5740906529855474e-01 0 1 0 0 0 0 -P 290 22 -5.2601345084628082e-01 4.7080724876546715e-01 -2.1169302521603504e+00 2.2315338465891585e+00 0 1 0 0 0 0 -V -100 0 -7.0205171904481768e-06 1.6319376283750368e-05 -1.6074154954470244e-04 1.6486830144931802e-04 0 2 0 -P 291 22 -4.8089177585023853e-02 1.0362587097307130e-01 -4.7632411591871276e-01 4.8983216874912877e-01 0 1 0 0 0 0 -P 292 22 1.8534885426808229e-02 -3.4926143952101800e-02 -2.0035006467754016e-01 2.0421441164972265e-01 0 1 0 0 0 0 -V -101 0 -2.9445537543939600e-06 1.8572518962028519e-06 -3.1558999495805265e-05 3.2102218420846526e-05 0 2 0 -P 293 22 3.5666402381186346e-02 2.3073588652214965e-02 -2.9391385055853259e-01 2.9696773276275618e-01 0 1 0 0 0 0 -P 294 22 -1.1952793505927364e-01 2.9821350131781360e-02 -6.0489333323150396e-01 6.1731044440470606e-01 0 1 0 0 0 0 -V -102 0 -8.7759702361641637e-05 4.7023241861943939e-05 -5.2519116174042308e-04 5.3503926182768037e-04 0 2 0 -P 295 22 -2.1472465776296304e-01 4.2117950914751449e-02 -1.0811445000066504e+00 1.1030657416198317e+00 0 1 0 0 0 0 -P 296 22 -3.0064913576336771e-01 2.3402868461541579e-01 -2.0030701687861194e+00 2.0389824494435782e+00 0 1 0 0 0 0 -V -103 0 -4.0051840698321302e-05 1.5544825812030132e-04 -1.5255056661093622e-03 1.5345528806099953e-03 0 2 0 -P 297 22 -5.4313704046613225e-02 4.0017399337820786e-01 -3.9524382331551000e+00 3.9730161326540991e+00 0 1 0 0 0 0 -P 298 22 -6.9171629961732761e-02 7.9094368332956660e-02 -7.5090556894472305e-01 7.5822147619659941e-01 0 1 0 0 0 0 -V -104 0 1.1538667519395299e-04 -1.5230967855984055e-04 -2.2806195109471177e-02 2.2807040238776183e-02 0 2 0 -P 299 22 4.9612560842926725e-03 -4.1366033271512226e-02 -2.5491239845056692e+00 2.5494644243747766e+00 0 1 0 0 0 0 -P 300 22 3.4014693925553080e-01 -4.1417459316756067e-01 -6.5661566925582846e+01 6.5663754169684097e+01 0 1 0 0 0 0 -V -105 0 7.5620785956994322e-05 -2.1431335219304692e-05 -1.8521909028600417e-02 1.8522145398627614e-02 0 2 0 -P 301 22 -1.0974672239015704e-03 -4.5233445978568466e-02 -1.0867124610184147e+01 1.0867218805303377e+01 0 1 0 0 0 0 -P 302 22 2.0211965316448932e-01 -1.1737316740827236e-02 -3.8369531602823471e+01 3.8370065748430363e+01 0 1 0 0 0 0 -V -106 0 -6.2050380654414509e-06 9.9394224008864708e-06 -1.4146072138620869e-02 1.4146078109456379e-02 0 2 0 -P 303 22 -9.4033662273491525e-02 4.0317931435716235e-02 -8.8853780567535210e+01 8.8853839472523276e+01 0 1 0 0 0 0 -P 304 22 -5.4882756440301453e-02 1.9822100618454153e-01 -2.5064170351061375e+02 2.5064178790135270e+02 0 1 0 0 0 0 -V -107 0 -2.2144550003270545e+01 -5.7752059811266328e+01 2.7142840331616411e+04 2.7142928916050954e+04 0 2 0 -P 305 211 -2.3773313121780820e-01 -8.7164593426833892e-01 3.6426137340252683e+02 3.6426252060369370e+02 1.3957000000000000e-01 1 0 0 0 0 -P 306 -211 -1.1373747167277996e-01 -4.4974691440525599e-02 6.6540356779718223e+01 6.6540615559915182e+01 1.3957000000000000e-01 1 0 0 0 0 -V -108 0 0 0 0 0 0 1 0 -P 307 310 -2.4546654743398341e-01 -2.3146159829648183e-01 2.8342132256983007e+02 2.8342196031881150e+02 4.9767000000000000e-01 2 0 0 -115 0 -V -109 0 -5.6270946127520340e-03 1.4375702714435555e-02 1.2772459726874328e+00 1.2810615693794176e+00 0 2 0 -P 308 -2212 4.0919391927145221e-02 1.1725248601390804e-01 1.2564638925178782e+01 1.2600235095232547e+01 9.3827000000000005e-01 1 0 0 0 0 -P 309 211 -1.0525237235338031e-01 4.7100855272609099e-02 2.0377528622594481e+00 2.0457793294976856e+00 1.3957000000000000e-01 1 0 0 0 0 -V -110 0 1.1450288377146512e-04 3.2494406652989600e-05 5.2787483859840093e-03 5.2804381960459557e-03 0 2 0 -P 310 22 -6.3766087007953286e-03 3.0788902609582693e-02 9.4162923456893888e-01 9.4215403892214522e-01 0 1 0 0 0 0 -P 311 22 2.6128546929969942e-01 4.1550866511718992e-02 1.0810037554410400e+01 1.0813274642712919e+01 0 1 0 0 0 0 -V -111 0 5.7894541595921829e-05 3.3524512174853601e-05 7.5872969366759844e-05 1.0552947084212687e-04 0 2 0 -P 312 22 1.8493418015052648e-01 6.9153434526408500e-02 1.3164339122203578e-01 2.3730324681129761e-01 0 1 0 0 0 0 -P 313 22 7.4962660998596956e-02 8.1342874367822907e-02 2.0896117223847074e-01 2.3643357472593826e-01 0 1 0 0 0 0 -V -112 0 6.9261092346014606e-07 4.1353457778057710e-06 6.2637590300657296e-06 1.0853685686557134e-05 0 2 0 -P 314 22 5.9945933835984077e-03 7.3910957463011503e-02 1.3827374467382689e-01 1.5690249599371084e-01 0 1 0 0 0 0 -P 315 22 5.9766717578129680e-03 -2.4345786178581225e-03 -3.0009324360881350e-02 3.0695395859049578e-02 0 1 0 0 0 0 -V -113 0 5.8480414582225960e-05 4.2709256374829027e-05 3.5504693519910010e-04 3.6276453269127142e-04 0 2 0 -P 316 22 4.6099053514328703e-01 3.2869887519126678e-01 2.7819803904781000e+00 2.8390086504004146e+00 0 1 0 0 0 0 -P 317 22 -1.9780965771179549e-03 6.5258330808300215e-03 4.7809670707489029e-03 8.3280855902691311e-03 0 1 0 0 0 0 -V -114 0 3.0355799215239374e+00 1.2435567393166538e+00 3.4778223250929109e+01 3.5013184297298878e+01 0 2 0 -P 318 -211 2.5778681463971853e-01 3.2771288396927750e-01 3.8506537962191199e+00 3.8756759693449960e+00 1.3957000000000000e-01 1 0 0 0 0 -P 319 211 3.7850436990390546e-01 -6.7049613305079067e-02 3.4392471257592194e+00 3.4634753912253751e+00 1.3957000000000000e-01 1 0 0 0 0 -V -115 0 -3.3015133249945685e+00 -3.1131474287994143e+00 3.8120032356080346e+03 3.8120118133013384e+03 0 2 0 -P 320 211 -2.0869993064495407e-01 7.4933172581466437e-02 1.1763461578134871e+02 1.1763490757616057e+02 1.3957000000000000e-01 1 0 0 0 0 -P 321 -211 -3.6766616789029316e-02 -3.0639477087794825e-01 1.6578670678848133e+02 1.6578705274265090e+02 1.3957000000000000e-01 1 0 0 0 0 -BlockType GenEvent -E 10 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 136 0 0 -V -1 0 0 0 0 0 1 3 0 -P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -1 0 -P 16 2103 -4.3597932309017928e-02 -1.9178552605452839e-01 5.7710271643278456e+03 5.7710272192255625e+03 7.7132999999999996e-01 2 0 0 -9 0 -P 3 21 -6.5511378777462237e-01 -2.6708088178667958e-03 1.3902379475140679e+01 1.3917806446382523e+01 0 3 0 0 -3 0 -P 28 2 6.9871172008364035e-01 1.9445633487239519e-01 5.4217114364762290e+02 5.4217172917398170e+02 3.3000000000000002e-01 2 0 0 -13 0 -V -2 0 0 0 0 0 1 2 0 -P 2 2212 0 0 -6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -2 0 -P 4 2 1.5554951969939107e-01 -1.1414155502218004e+00 -2.5318090541773952e+02 2.5318352610953531e+02 0 3 0 0 -4 0 -P 31 2103 -1.5554951969939107e-01 1.1414155502218004e+00 -3.0079396582618142e+03 3.0079399777454469e+03 7.7132999999999996e-01 2 0 0 -13 0 -V -3 0 0 0 0 0 0 6 0 -P 5 -1 -2.6336683162149233e+00 1.2040498771434778e+00 7.5527386554890201e+00 8.0888692723150033e+00 0 3 0 0 -5 0 -P 11 1 1.1257705880566493e+00 -9.6356028506991842e-01 3.2813867683361453e+00 3.6155507136961815e+00 3.3000000000000002e-01 2 0 0 -9 0 -P 12 21 -9.6370912240519885e-02 2.1371062251800688e-01 2.0354592242001850e+00 2.0489152828471759e+00 0 2 0 0 -9 0 -P 13 21 9.5280060735029493e-01 -3.6665346932772618e-02 2.4849955628758677e-02 9.5382957876527541e-01 0 2 0 0 -9 0 -P 14 21 1.8560548483485220e-02 -1.7257190047342610e-01 -1.8018846212308559e-01 2.5018680355946143e-01 0 2 0 0 -9 0 -P 15 21 7.9695242284356750e-05 -2.5824124117734876e-01 -4.6415843771256871e-01 5.3116061628844602e-01 0 2 0 0 -9 0 -V -4 0 0 0 0 0 0 2 0 -P 6 2 1.2812912648480181e+00 -6.4858594580034412e-01 -2.4187105165040478e+02 2.4187531498172203e+02 0 3 0 0 -5 0 -P 30 21 -1.1480277436005311e+00 -4.8222213924733737e-01 -9.6575619960129195e+00 9.7375053067246053e+00 0 2 0 0 -13 0 -V -5 0 0 0 0 0 0 2 0 -P 7 24 -2.7038131088254236e+00 4.3210603841580824e+00 -1.9039627432725470e+02 2.0586031167139001e+02 7.8113663821200973e+01 3 0 0 -6 0 -P 8 22 1.3514360574585182e+00 -3.7655964528149486e+00 -4.3922038667661063e+01 4.4103872582647035e+01 0 3 0 0 -7 0 -V -6 0 0 0 0 0 0 1 0 -P 9 24 -2.7038131088254236e+00 4.3210603841580824e+00 -1.9039627432725470e+02 2.0586031167139001e+02 7.8113663821200973e+01 2 0 0 -8 0 -V -7 0 0 0 0 0 0 1 0 -P 10 22 1.3514360574585182e+00 -3.7655964528149486e+00 -4.3922038667661063e+01 4.4103872582647043e+01 0 1 0 0 0 0 -V -8 0 0 0 0 0 0 11 0 -P 17 4 1.2527727551424732e+01 -2.0291998608611124e+00 -5.0600275742191691e+01 5.2189074669550124e+01 1.5000000000000000e+00 2 0 0 -11 0 -P 18 21 8.4413619755245706e-01 -5.9573077753593484e-01 -9.7003942899011300e+00 9.7552606556087653e+00 0 2 0 0 -11 0 -P 19 21 1.3955327171164982e+00 -1.7699729137026712e+00 -8.4370450330890154e+00 8.7329287510064866e+00 0 2 0 0 -11 0 -P 20 21 1.7406612186275408e+00 -4.8453470359648625e+00 -2.0800170594403422e+01 2.1427888046498008e+01 0 2 0 0 -11 0 -P 21 21 4.3275523129907159e+00 -8.8306149160675105e+00 -5.6722222314980336e+01 5.7568376502795338e+01 0 2 0 0 -11 0 -P 22 21 5.0727116372506353e-01 5.3006276683040177e-01 -4.1876929772878206e+00 4.2514777480721468e+00 0 2 0 0 -11 0 -P 23 21 -1.4242475998353649e-02 2.6112816047433607e-01 -9.0335618313322297e-01 9.4044838131622055e-01 0 2 0 0 -11 0 -P 24 21 -2.1919670271754521e+00 3.5035232013803053e+00 -4.8234484426313431e+00 6.3517752754294783e+00 0 2 0 0 -11 0 -P 25 21 -1.7594584975864209e+00 2.2946842674852479e+00 -5.0312742416153835e+00 5.8030156458961768e+00 0 2 0 0 -11 0 -P 26 21 -1.6358735708068866e+00 1.9697163809587677e+00 -2.8994328596137606e+00 3.8681488943020028e+00 0 2 0 0 -11 0 -P 27 -3 -1.8445152698695317e+01 1.3832811111161117e+01 -2.6290961648407542e+01 3.4971917100915213e+01 5.0000000000000000e-01 2 0 0 -11 0 -V -9 0 0 0 0 0 0 1 0 -P 39 92 1.9572425945831762e+00 -1.4091136771899875e+00 5.7757245133761753e+03 5.7784268622207192e+03 1.7668483585073082e+02 2 0 0 -10 0 -V -10 0 0 0 0 0 0 16 0 -P 40 -211 7.4997996932615019e-01 -6.4116142761545669e-01 1.9858860190347392e+00 2.2218868099320424e+00 1.3957000000000000e-01 1 0 0 0 0 -P 41 223 2.8112506374623569e-01 5.4000903387299448e-01 5.8416822415061209e-01 1.1500024027454310e+00 7.8141663284205498e-01 2 0 0 -19 0 -P 42 2214 4.4881519761355032e-01 -1.3187483483780489e+00 2.3761689627847922e+00 3.0194592377826033e+00 1.2371026072926299e+00 2 0 0 -20 0 -P 43 223 4.4098049591794489e-02 3.6975571581476430e-01 1.2240256589844973e+00 1.5000787933206947e+00 7.8315620725532742e-01 2 0 0 -21 0 -P 44 -3122 5.1854209512044214e-01 2.8340706828298096e-01 1.4726857248798244e+00 1.9397810643032543e+00 1.1156800000000000e+00 2 0 0 -22 0 -P 45 -313 2.7417269706128827e-01 4.4906334318631121e-02 2.5317079951813390e+00 2.6984767938152476e+00 8.9165261577505939e-01 2 0 0 -23 0 -P 46 -213 -4.0680312455968282e-01 -2.5441007810341781e-01 1.5500120461449101e+00 1.7845955709874386e+00 7.4298771107034045e-01 2 0 0 -24 0 -P 47 111 1.0967169427730127e-01 -4.8556656735419729e-01 1.5733209930176220e+00 1.6557056862038457e+00 1.3497999999999999e-01 2 0 0 -25 0 -P 48 211 -2.0496925059681456e-01 3.5773003283645954e-01 8.1445332873483611e+00 8.1561562898039721e+00 1.3957000000000000e-01 1 0 0 0 0 -P 49 -211 2.9397211730379580e-01 -2.7463569397919968e-01 7.6207890473349726e+00 7.6326764544974779e+00 1.3957000000000000e-01 1 0 0 0 0 -P 50 223 -2.5509337878352928e-01 2.6149346255806938e-01 1.3907466962922905e+02 1.3907740332277268e+02 7.9178978467983019e-01 2 0 0 -26 0 -P 51 213 -3.6699974497245429e-02 -1.8001381623673610e-01 1.8723285347838268e+02 1.8723606959241326e+02 1.0819347925577454e+00 2 0 0 -27 0 -P 52 311 -2.0826395264017022e-01 -3.8873428077532614e-02 7.7769704741499027e+02 7.7769723550906360e+02 4.9767000000000000e-01 2 0 0 -28 0 -P 53 -321 2.9365263740186642e-01 -1.5350918725169876e-01 9.7138769739024906e+02 9.7138787931445381e+02 4.9359999999999998e-01 1 0 0 0 0 -P 54 2212 7.1090572027448316e-03 3.1651971253956951e-01 1.4534367235662871e+03 1.4534370608997706e+03 9.3827000000000005e-01 1 0 0 0 0 -P 55 113 4.7933697015449042e-02 -2.3601649041716902e-01 2.2178322239381737e+03 2.2178323944788513e+03 8.3573909078354769e-01 2 0 0 -29 0 -V -11 0 0 0 0 0 0 1 0 -P 56 92 -2.7038131088254218e+00 4.3210603841580841e+00 -1.9039627432725467e+02 2.0586031167138998e+02 7.8113663821201015e+01 2 0 0 -12 0 -V -12 0 0 0 0 0 0 20 0 -P 57 423 9.9248375242903197e+00 -1.8312835036795285e+00 -4.1176681461967789e+01 4.2442925679844130e+01 2.0066999999999999e+00 2 0 0 -30 0 -P 58 213 3.1593705763741533e+00 -9.7376654979652177e-01 -1.3392766193005166e+01 1.3814953051794681e+01 7.4625584783485499e-01 2 0 0 -31 0 -P 59 113 9.3523891341231291e-01 -2.2812398079724634e+00 -1.3732909593833934e+01 1.3984515733375392e+01 9.4612234830851460e-01 2 0 0 -32 0 -P 60 -213 1.0751687044528315e+00 -1.8471396089324810e+00 -1.0247617174688440e+01 1.0494828426213823e+01 7.4823355897352140e-01 2 0 0 -33 0 -P 61 211 1.0910074909423624e+00 -1.6408161014628322e+00 -1.4658262289795276e+01 1.4790764279287474e+01 1.3957000000000000e-01 1 0 0 0 0 -P 62 2112 1.8670048695663655e+00 -2.5858616180543601e+00 -1.5263383116042007e+01 1.5621332959215980e+01 9.3957000000000002e-01 1 0 0 0 0 -P 63 111 3.8895094638623819e-02 -6.8899625648955701e-02 -4.4678720222461937e-01 4.7339031599011050e-01 1.3497999999999999e-01 2 0 0 -34 0 -P 64 -2214 1.1524734474439160e+00 -3.9869224263739502e+00 -2.0153218017127685e+01 2.0618217127901126e+01 1.3171695435320887e+00 2 0 0 -35 0 -P 65 221 8.6263433165107117e-01 -6.4053962327754621e-01 -6.5229053808755504e+00 6.6334323776976012e+00 5.4744999999999999e-01 2 0 0 -36 0 -P 66 211 2.7687726878260471e-01 -4.4854367382269267e-01 -5.0833022953049456e+00 5.1124646169579897e+00 1.3957000000000000e-01 1 0 0 0 0 -P 67 -211 3.6317039313948940e-01 -6.1629174309821100e-01 -4.9883909457620250e+00 5.0413522253185885e+00 1.3957000000000000e-01 1 0 0 0 0 -P 68 111 -3.8693244171548362e-03 -6.3946170356676169e-01 -1.8470751031459909e+00 1.9592938215238989e+00 1.3497999999999999e-01 2 0 0 -37 0 -P 69 321 3.3833666963563275e-01 5.4299664689447102e-01 -3.1762619017227935e+00 3.2774376712447890e+00 4.9359999999999998e-01 1 0 0 0 0 -P 70 -323 -1.3745959258300033e+00 1.5798806728773855e+00 -2.7160124589975716e+00 3.5482417244696087e+00 9.0981248507430379e-01 2 0 0 -38 0 -P 71 211 -1.0294428816501737e+00 9.5496503398017951e-01 -2.7208975408319782e+00 3.0650406319183578e+00 1.3957000000000000e-01 1 0 0 0 0 -P 72 -211 -3.6822566989713057e-01 1.1035290774262612e+00 -1.2321916930023735e+00 1.7003360614597640e+00 1.3957000000000000e-01 1 0 0 0 0 -P 73 213 -1.6161918040002012e+00 1.2552448784983889e+00 -1.7897181449593560e+00 2.7573168640824823e+00 4.6042328160403989e-01 2 0 0 -39 0 -P 74 2112 -3.2740868421481886e+00 2.8787612972034244e+00 -6.5131664185879137e+00 7.8937342137498883e+00 9.3957000000000002e-01 1 0 0 0 0 -P 75 -2112 -2.6281380275611408e+00 3.1441450497976531e+00 -4.6117236755707163e+00 6.2404763144169966e+00 9.3957000000000002e-01 1 0 0 0 0 -P 76 313 -1.3494277917651111e+01 1.0422303713166622e+01 -2.0123003719808548e+01 2.6390257574927315e+01 8.8908096104164602e-01 2 0 0 -40 0 -V -13 0 0 0 0 0 1 1 0 -P 29 21 1.5824732804086550e+00 3.3756291283162567e+00 -3.7328965916562061e+03 3.7328984533592948e+03 0 2 0 0 -13 0 -P 77 92 9.7760773719237326e-01 4.2292788741631151e+00 -6.2083226682664099e+03 7.2927476655854471e+03 3.8263401989466056e+03 2 0 0 -14 0 -V -14 0 0 0 0 0 0 30 0 -P 78 211 3.8125690076946724e-02 1.8129069100767256e-01 4.0322325983256000e+01 4.0322993097831421e+01 1.3957000000000000e-01 1 0 0 0 0 -P 79 -213 8.1415453961843220e-01 -1.3658531520860595e-01 1.8147547255500226e+02 1.8147807889488487e+02 5.1427342333104598e-01 2 0 0 -41 0 -P 80 213 -3.1343969057550247e-01 -6.8751614116676532e-02 2.3490909782090895e+02 2.3491051292454674e+02 7.4958136047652402e-01 2 0 0 -42 0 -P 81 -211 2.4510416203644247e-01 1.9103572210561356e-01 4.9160055436805315e+01 4.9161235755746112e+01 1.3957000000000000e-01 1 0 0 0 0 -P 82 2212 5.9834549250678958e-02 2.2658407019457144e-01 9.6037237171125334e+00 9.6522940455458546e+00 9.3827000000000005e-01 1 0 0 0 0 -P 83 331 -4.4228289654992226e-01 -2.6644076626223800e-01 1.5250029814397761e+01 1.5288792292206974e+01 9.5768239605797145e-01 2 0 0 -43 0 -P 84 -2212 4.0600120601960499e-01 1.1341309506958630e-01 5.8544874327854846e+00 5.9441629522554207e+00 9.3827000000000005e-01 1 0 0 0 0 -P 85 211 3.1262473932432039e-01 6.7353189834058402e-01 1.8631926232668552e+00 2.0105586243668481e+00 1.3957000000000000e-01 1 0 0 0 0 -P 86 -213 -4.0230691978361560e-01 -7.2916784443047689e-01 1.2727585532551626e+00 1.6552834098551243e+00 6.5307903733029116e-01 2 0 0 -44 0 -P 87 111 -1.0918019607099445e-01 9.2778953753129487e-02 8.7863240603013404e-01 9.0041254700272333e-01 1.3497999999999999e-01 2 0 0 -45 0 -P 88 211 -1.3970682706965667e-01 -6.9289838877254262e-02 1.0396580156519743e-01 2.3368301627760824e-01 1.3957000000000000e-01 1 0 0 0 0 -P 89 311 3.4248690127551151e-01 -3.5064896127775863e-01 6.5641413010847338e-01 9.5854416210028415e-01 4.9767000000000000e-01 2 0 0 -46 0 -P 90 -311 3.4345529704259643e-02 4.2425337653113343e-01 -1.1177846011983017e+00 1.2954877021742741e+00 4.9767000000000000e-01 2 0 0 -47 0 -P 91 221 -2.2059027947856552e-02 6.8777216446446396e-02 -2.5995327345599137e+00 2.6575343547665886e+00 5.4744999999999999e-01 2 0 0 -48 0 -P 107 -213 5.1568029838271176e-02 1.0489281204351286e+00 -2.8682166939055642e+03 2.8682169478887886e+03 5.9501970391005188e-01 2 0 0 -60 0 -P 92 -211 7.8520032410541465e-02 8.6029665973671565e-02 -1.7637091485257692e-01 2.5328439237984829e-01 1.3957000000000000e-01 1 0 0 0 0 -P 93 211 9.1990315018622704e-02 -2.4519229699912645e-01 -1.7635783993765985e+00 1.7883707770517441e+00 1.3957000000000000e-01 1 0 0 0 0 -P 94 113 2.3916994123891654e-02 3.2774863600096921e-01 -2.1964548095601693e+00 2.3336785531389950e+00 7.1669426391767155e-01 2 0 0 -49 0 -P 95 -211 -2.2116319795837658e-01 -7.0985668931981008e-02 -1.4721936080260471e+02 1.4721961019863397e+02 1.3957000000000000e-01 1 0 0 0 0 -P 96 213 5.5418235924584147e-01 1.7536325683372644e+00 -1.7140605218064102e+03 1.7140616606041549e+03 7.2221363743955924e-01 2 0 0 -50 0 -P 97 113 -6.1783849261428873e-02 1.4046889857876368e-01 -1.0047869804122965e+02 1.0048130714945734e+02 7.0765644735339350e-01 2 0 0 -51 0 -P 98 221 5.3919364001689940e-01 -4.4261608605164110e-01 -1.6979921711826634e+02 1.6980153260279991e+02 5.4744999999999999e-01 2 0 0 -52 0 -P 99 1114 -2.0186593100368855e-01 5.2273469161686792e-01 -6.6287974334912337e+02 6.6288096452226989e+02 1.1423580713372095e+00 2 0 0 -53 0 -P 100 223 5.4569932897003848e-01 4.9089417068522490e-01 -5.5137637879476370e+02 5.5137741731893857e+02 7.7876288546928918e-01 2 0 0 -54 0 -P 101 -2114 -3.7116038230162590e-01 4.2691750743684054e-01 -3.0183378648302647e+02 3.0183654713177589e+02 1.1603892295315890e+00 2 0 0 -55 0 -P 102 213 1.2718626065914557e-01 -4.3273443653089196e-02 -2.0958549985729146e+01 2.0973175423021143e+01 7.7150559601649060e-01 2 0 0 -56 0 -P 103 111 -4.7798486804409918e-01 9.0585383083558874e-02 -8.5228987495888582e+00 8.5378391845859252e+00 1.3497999999999999e-01 2 0 0 -57 0 -P 104 113 1.5181900039448251e-01 4.9030903333713738e-02 -9.3885028370079510e+01 9.3887609752929094e+01 6.7768726512342226e-01 2 0 0 -58 0 -P 105 -211 -2.9881524415693622e-01 -4.2409333153494246e-02 -1.6592385765903004e+00 1.6922297540891829e+00 1.3957000000000000e-01 1 0 0 0 0 -P 106 2224 -3.7739651006785435e-01 -2.1399552580528344e-01 -1.0092898709838120e+02 1.0093591655187358e+02 1.1002687175001074e+00 2 0 0 -59 0 -V -15 0 0 0 0 0 2 1 0 -P 32 21 1.9264630307413937e+00 -4.3605697082707904e+00 -3.8703467637965021e+00 6.1404732766727497e+00 0 2 0 0 -15 0 -P 33 21 -1.9264630307413937e+00 4.3605697082707904e+00 1.0934871286863569e+01 1.1928840599562703e+01 0 2 0 0 -15 0 -P 108 92 0 0 7.0645245230670666e+00 1.8069313876235451e+01 1.6631073243206497e+01 2 0 0 -16 0 -V -16 0 0 0 0 0 0 12 0 -P 109 221 -2.7330901053064516e-01 1.7937353255594365e-01 6.5560086158529540e-01 9.1454178233157846e-01 5.4744999999999999e-01 2 0 0 -61 0 -P 110 211 -3.8949504695687842e-01 6.3318573167586201e-01 2.8287487702745040e-01 8.0754476244672213e-01 1.3957000000000000e-01 1 0 0 0 0 -P 111 -3214 1.3070293253442316e-02 6.8191945199945314e-01 3.6368408201980333e+00 3.9512642278438408e+00 1.3858906433044105e+00 2 0 0 -62 0 -P 112 111 -5.1252162865341999e-01 2.2292822157692199e-01 -3.3826285438294201e-01 6.6709577338512560e-01 1.3497999999999999e-01 2 0 0 -63 0 -P 113 3312 -2.8307230829558164e-02 7.4361433324065440e-01 2.8196795987175673e+00 3.2015918392796796e+00 1.3212999999999999e+00 2 0 0 -64 0 -P 114 321 1.7310712184575286e-01 2.5372564212865023e-01 -3.7818935156200967e-02 5.8259248962174692e-01 4.9359999999999998e-01 1 0 0 0 0 -P 115 -211 -1.7176330612558119e-01 2.3528839325019374e-01 6.2378220828836273e-01 7.0245803405367480e-01 1.3957000000000000e-01 1 0 0 0 0 -P 116 -2114 -2.3785732100599724e-01 -4.3066782908091966e-01 9.2976032860807897e-02 1.3554702372103349e+00 1.2596047543237858e+00 2 0 0 -65 0 -P 117 2214 6.0515337633293520e-01 -9.5121595517125890e-01 -9.1396794922064373e-01 1.8612896641441454e+00 1.1653494752166464e+00 2 0 0 -66 0 -P 118 221 1.5610406892865505e-01 -4.1180279740384002e-01 2.4550193443675206e-01 7.4425985152895202e-01 5.4744999999999999e-01 2 0 0 -67 0 -P 119 223 -1.6654532327853938e-01 2.6409934496084531e-01 9.2003618590961966e-01 1.2501855628480039e+00 7.8677287030995102e-01 2 0 0 -68 0 -P 120 -213 8.3236400701983415e-01 -1.4204480697325057e+00 -9.2271825719703426e-01 2.0310196515416505e+00 7.5041940526262951e-01 2 0 0 -69 0 -V -17 0 0 0 0 0 5 1 0 -P 34 21 -1.2874686984272923e+00 -4.5354152466705555e+00 2.9174823306294378e+01 2.9553305772157866e+01 0 2 0 0 -17 0 -P 35 21 -1.5824732804086550e+00 -3.3756291283162567e+00 1.8613755585412271e+01 1.8983439906629435e+01 0 2 0 0 -17 0 -P 36 21 1.2874686984272923e+00 4.5354152466705555e+00 7.6246561156214881e+01 7.6392183207822896e+01 0 2 0 0 -17 0 -P 37 21 -2.4549304752250420e+00 1.9106102320850373e+00 1.4255136986869084e+02 1.4258530838251687e+02 0 2 0 0 -17 0 -P 38 21 2.4549304752250420e+00 -1.9106102320850373e+00 3.9326543344547179e+02 3.9327773679443379e+02 0 2 0 0 -17 0 -P 121 92 -1.5824732804086552e+00 -3.3756291283162563e+00 6.5985194336208417e+02 6.6079197406356082e+02 3.5036363030476608e+01 2 0 0 -18 0 -V -18 0 0 0 0 0 0 21 0 -P 122 -213 2.4470237977472631e-01 9.0661371500187479e-02 1.0957930773391942e+01 1.0984198835469098e+01 7.1293652152266018e-01 2 0 0 -70 0 -P 123 211 1.4542095804863758e-01 8.3928851259360959e-01 1.4793046030567339e+01 1.4818206474124844e+01 1.3957000000000000e-01 1 0 0 0 0 -P 124 -211 1.6346163015651471e-01 6.7768762034861363e-01 3.6385442177273340e+01 3.6392387424238997e+01 1.3957000000000000e-01 1 0 0 0 0 -P 125 111 -3.2068447332136946e-01 3.8594024532024324e-01 2.9733721957725852e+00 3.0184350613158366e+00 1.3497999999999999e-01 2 0 0 -71 0 -P 126 321 3.3497849686451375e-01 1.2223626454055394e+00 2.9996662117980971e+01 3.0027483414541404e+01 4.9359999999999998e-01 1 0 0 0 0 -P 127 221 -5.8214749389140619e-01 5.7231243477632643e-01 4.5061968638670571e+01 4.5072687476149831e+01 5.4744999999999999e-01 2 0 0 -72 0 -P 128 -313 -9.2056140784737284e-02 1.1853320044069728e+00 4.0445501109361459e+01 4.0472952620159873e+01 8.9880337817518030e-01 2 0 0 -73 0 -P 129 -211 -6.8690343434950507e-02 -2.4724652780047213e-01 1.0978301805670297e+01 1.0982187374565884e+01 1.3957000000000000e-01 1 0 0 0 0 -P 130 3222 -5.6571475378204539e-01 -1.8495675331422309e-02 7.6655798754955228e+01 7.6667114586566711e+01 1.1893700000000000e+00 2 0 0 -74 0 -P 131 -3222 8.9269875728812620e-01 -2.0156941201723866e-01 1.7491908481387679e+02 1.7492552236429151e+02 1.1893700000000000e+00 2 0 0 -75 0 -P 132 111 5.4105896816734045e-01 -3.9755607846732188e-01 3.4247692832522112e+01 3.4254539547244640e+01 1.3497999999999999e-01 2 0 0 -76 0 -P 133 221 4.7159087264181826e-01 1.2020772703630062e-01 4.8034580061584379e+01 4.8040164769118533e+01 5.4744999999999999e-01 2 0 0 -77 0 -P 134 223 -3.9429121872598855e-01 -3.4625309703953722e-01 2.6395512218946230e+01 2.6411912261172318e+01 7.6856178603350211e-01 2 0 0 -78 0 -P 135 213 3.9795313085803385e-01 -6.1677401758222283e-01 3.1845668885775709e+01 3.1863855985015093e+01 7.8734653628175211e-01 2 0 0 -79 0 -P 136 313 1.0265114771882194e-01 -2.2622249924026197e-01 2.3452325229467018e+01 2.3473299881761864e+01 9.6048674802712919e-01 2 0 0 -80 0 -P 137 -313 -5.5700154512051092e-01 -1.6396713032419616e+00 1.3646660379336359e+01 1.3785980020161174e+01 9.0726672119751850e-01 2 0 0 -81 0 -P 138 111 -5.4077088808668135e-02 -2.3831882224430384e-01 3.8434254226100957e+00 3.8535514492654079e+00 1.3497999999999999e-01 2 0 0 -82 0 -P 139 -213 -5.8266223094836611e-01 -1.4614386039001783e+00 9.6551877108618420e+00 9.8199075697669720e+00 8.5594209993767068e-01 2 0 0 -83 0 -P 140 111 -7.2162541386152523e-01 -9.6677069323893028e-01 7.6826305172722131e+00 7.7779444634529762e+00 1.3497999999999999e-01 2 0 0 -84 0 -P 141 323 -9.0562613680950854e-01 -1.6754637359482516e+00 1.0954221378986349e+01 1.1149779322154751e+01 8.3383180723566952e-01 2 0 0 -85 0 -P 142 -313 -3.2412782438111951e-02 -4.3364122365194685e-01 6.9269303072013768e+00 6.9998631630231944e+00 9.0918948570052072e-01 2 0 0 -86 0 -V -19 0 0 0 0 0 0 3 0 -P 143 211 8.5723244854931269e-02 6.0053586839736363e-02 3.4776255196298755e-01 3.8906745616741811e-01 1.3957000000000000e-01 1 0 0 0 0 -P 144 -211 1.8531506706893134e-02 1.1294735671448289e-01 -1.0826952941544615e-01 2.1048182351323930e-01 1.3957000000000000e-01 1 0 0 0 0 -P 145 111 1.7687031218441127e-01 3.6700809031877518e-01 3.4467520160307075e-01 5.5045312306477356e-01 1.3497999999999999e-01 2 0 0 -87 0 -V -20 0 0 0 0 0 0 2 0 -P 146 2112 2.4934049273082956e-01 -1.0034513778020797e+00 2.1420894051923574e+00 2.5574252977683418e+00 9.3957000000000002e-01 1 0 0 0 0 -P 147 211 1.9947470488272068e-01 -3.1529697057596912e-01 2.3407955759243465e-01 4.6203394001426124e-01 1.3957000000000000e-01 1 0 0 0 0 -V -21 0 0 0 0 0 0 3 0 -P 148 211 2.4202018503168082e-01 1.4484617014986720e-01 6.7976534371923969e-01 7.4907602444050325e-01 1.3957000000000000e-01 1 0 0 0 0 -P 149 -211 -6.6861426897547510e-02 -6.1023832547298297e-02 2.4621632999211213e-01 2.9714747954563148e-01 1.3957000000000000e-01 1 0 0 0 0 -P 150 111 -1.3106070854233884e-01 2.8593337821219544e-01 2.9804398527314574e-01 4.5385528933456026e-01 1.3497999999999999e-01 2 0 0 -88 0 -V -22 0 9.6563352047872456e+01 5.2776306427173331e+01 2.7424479409799136e+02 3.6122768733868139e+02 0 2 0 -P 151 -2212 3.3107085829399807e-01 2.5462012600502582e-01 1.1978746459665013e+00 1.5778762886005071e+00 9.3827000000000005e-01 1 0 0 0 0 -P 152 211 1.8747123682644409e-01 2.8786942277955141e-02 2.7481107891332301e-01 3.6190477570274704e-01 1.3957000000000000e-01 1 0 0 0 0 -V -23 0 0 0 0 0 0 2 0 -P 153 -321 1.1436683630808112e-01 1.7624680147292271e-01 8.9963936691443347e-01 1.0474419596229463e+00 4.9359999999999998e-01 1 0 0 0 0 -P 154 211 1.5980586075320719e-01 -1.3134046715429157e-01 1.6320686282669057e+00 1.6510348341923013e+00 1.3957000000000000e-01 1 0 0 0 0 -V -24 0 0 0 0 0 0 2 0 -P 156 111 -2.7875872913594103e-02 -4.1177083616346186e-02 1.2016647573442882e+00 1.2102439448099500e+00 1.3497999999999999e-01 2 0 0 -89 0 -P 155 -211 -3.7892725164608876e-01 -2.1323299448707161e-01 3.4834728880062177e-01 5.7435162617748858e-01 1.3957000000000000e-01 1 0 0 0 0 -V -25 0 1.9645533442150538e-05 -8.6979728910064382e-05 2.8182960414027593e-04 2.9658720641656587e-04 0 2 0 -P 157 22 6.3688804206746011e-02 -1.4462149743960712e-01 3.3361177481488985e-01 3.6914557778483581e-01 0 1 0 0 0 0 -P 158 22 4.5982890070555262e-02 -3.4094506991459012e-01 1.2397092182027323e+00 1.2865601084190099e+00 0 1 0 0 0 0 -V -26 0 0 0 0 0 0 3 0 -P 159 -211 -9.6603613340956990e-02 8.1396753813179970e-02 1.3365449629037009e+01 1.3366775275318552e+01 1.3957000000000000e-01 1 0 0 0 0 -P 160 211 -1.1685871788492098e-01 3.0883905152444485e-01 5.6084708578525380e+01 5.6085854309644873e+01 1.3957000000000000e-01 1 0 0 0 0 -P 161 111 -4.1631047557651339e-02 -1.2874234277955540e-01 6.9624511421666696e+01 6.9624773737809306e+01 1.3497999999999999e-01 2 0 0 -90 0 -V -27 0 0 0 0 0 0 2 0 -P 162 211 4.9615297183541651e-01 -1.7952305223659404e-01 8.7694255163022987e+01 8.7695953525120132e+01 1.3957000000000000e-01 1 0 0 0 0 -P 163 111 -5.3285294633266200e-01 -4.9076400014206613e-04 9.9538598315359692e+01 9.9540116067293155e+01 1.3497999999999999e-01 2 0 0 -91 0 -V -28 0 0 0 0 0 0 1 0 -P 164 130 -2.0826395264017022e-01 -3.8873428077532614e-02 7.7769704741499027e+02 7.7769723550906360e+02 4.9767000000000000e-01 1 0 0 0 0 -V -29 0 0 0 0 0 0 2 0 -P 165 211 4.9099984147424301e-03 1.9716298245156322e-01 1.5278552690721040e+03 1.5278552881763790e+03 1.3957000000000000e-01 1 0 0 0 0 -P 166 -211 4.3023698600706616e-02 -4.3317947286873226e-01 6.8997695486606995e+02 6.8997710630247286e+02 1.3957000000000000e-01 1 0 0 0 0 -V -30 0 0 0 0 0 0 2 0 -P 167 421 8.7573421888733503e+00 -1.5584005896471986e+00 -3.6683661548972424e+01 3.7792684999883136e+01 1.8645000000000000e+00 2 0 0 -92 0 -P 168 22 1.1674953354169699e+00 -2.7288291403232995e-01 -4.4930199129953658e+00 4.6502406799609899e+00 0 1 0 0 0 0 -V -31 0 0 0 0 0 0 2 0 -P 169 211 4.2875839023686985e-01 -2.0671583581217681e-01 -3.0239811985057781e+00 3.0643934583846248e+00 1.3957000000000000e-01 1 0 0 0 0 -P 170 111 2.7306121861372836e+00 -7.6705071398434499e-01 -1.0368784994499388e+01 1.0750559593410056e+01 1.3497999999999999e-01 2 0 0 -93 0 -V -32 0 0 0 0 0 0 2 0 -P 171 -211 6.6913532265409348e-01 -1.1497333163713761e+00 -9.4612474426376263e+00 9.5553289705019964e+00 1.3957000000000000e-01 1 0 0 0 0 -P 172 211 2.6610359075821943e-01 -1.1315064916010875e+00 -4.2716621511963080e+00 4.4291867628733934e+00 1.3957000000000000e-01 1 0 0 0 0 -V -33 0 0 0 0 0 0 2 0 -P 173 -211 9.8073095541060518e-01 -1.0256404175782887e+00 -6.3296668889138790e+00 6.4882920851779993e+00 1.3957000000000000e-01 1 0 0 0 0 -P 174 111 9.4437749042226293e-02 -8.2149919135419225e-01 -3.9179502857745612e+00 4.0065363410358232e+00 1.3497999999999999e-01 2 0 0 -94 0 -V -34 0 5.6807710352650527e-07 -1.0063042688640729e-06 -6.5254907358017688e-06 6.9140389564218331e-06 0 2 0 -P 175 22 -3.1320614758231377e-02 -6.7555428947804044e-02 -1.3895740843388496e-01 1.5765112827955549e-01 0 1 0 0 0 0 -P 176 22 7.0215709396855189e-02 -1.3441967011516463e-03 -3.0782979379073439e-01 3.1573918771055498e-01 0 1 0 0 0 0 -V -35 0 0 0 0 0 0 2 0 -P 177 -2112 1.0158607703232485e+00 -2.5256186969806884e+00 -1.3305053132739511e+01 1.3613153696228572e+01 9.3957000000000002e-01 1 0 0 0 0 -P 178 -211 1.3661267712066744e-01 -1.4613037293932616e+00 -6.8481648843881722e+00 7.0050634316725500e+00 1.3957000000000000e-01 1 0 0 0 0 -V -36 0 0 0 0 0 0 3 0 -P 179 111 2.0577497595879218e-01 -9.0184808666137053e-02 -1.4114507077389808e+00 1.4355797927046268e+00 1.3497999999999999e-01 2 0 0 -95 0 -P 180 111 4.1762967717743038e-01 -1.7457001757955024e-01 -2.2827569132806103e+00 2.3311130311135639e+00 1.3497999999999999e-01 2 0 0 -96 0 -P 181 111 2.3922967851484872e-01 -3.7578479703185902e-01 -2.8286977598559608e+00 2.8667395538794112e+00 1.3497999999999999e-01 2 0 0 -97 0 -V -37 0 -1.4153395206062958e-06 -2.3390528252416852e-04 -6.7563174062637891e-04 7.1667962649706767e-04 0 2 0 -P 182 22 -5.2764102271312105e-02 -2.7285017863169636e-01 -6.6581425086460921e-01 7.2148450234377659e-01 0 1 0 0 0 0 -P 183 22 4.8894777854157266e-02 -3.6661152493506532e-01 -1.1812608522813814e+00 1.2378093191801220e+00 0 1 0 0 0 0 -V -38 0 0 0 0 0 0 2 0 -P 184 -311 -4.6100841314703395e-01 9.2307915799673013e-01 -1.4688030567429675e+00 1.8627028043458205e+00 4.9767000000000000e-01 2 0 0 -98 0 -P 185 -211 -9.1358751268296934e-01 6.5680151488065541e-01 -1.2472094022546043e+00 1.6855389201237880e+00 1.3957000000000000e-01 1 0 0 0 0 -V -39 0 0 0 0 0 0 2 0 -P 186 211 -2.9732466916018679e-01 3.8062348944596097e-01 -5.2622083077712678e-01 7.2778042516476327e-01 1.3957000000000000e-01 1 0 0 0 0 -P 187 111 -1.3188671348400147e+00 8.7462138905242814e-01 -1.2634973141822292e+00 2.0295364389177188e+00 1.3497999999999999e-01 2 0 0 -99 0 -V -40 0 0 0 0 0 0 2 0 -P 188 321 -1.0177148179868251e+01 7.8877952464503291e+00 -1.5602898362297932e+01 2.0235753931818788e+01 4.9359999999999998e-01 1 0 0 0 0 -P 189 -211 -3.3171297377828615e+00 2.5345084667162929e+00 -4.5201053575106149e+00 6.1545036431085274e+00 1.3957000000000000e-01 1 0 0 0 0 -V -41 0 0 0 0 0 0 2 0 -P 190 -211 6.5734504515515368e-01 -8.4783501213816281e-02 1.6242754517480276e+02 1.6242895739999059e+02 1.3957000000000000e-01 1 0 0 0 0 -P 191 111 1.5680949446327844e-01 -5.1801813994789669e-02 1.9047927380199486e+01 1.9049121494894198e+01 1.3497999999999999e-01 2 0 0 -100 0 -V -42 0 0 0 0 0 0 2 0 -P 192 211 -5.0619922995651788e-02 -2.7314198696764880e-01 1.7851834426888692e+02 1.7851861496553065e+02 1.3957000000000000e-01 1 0 0 0 0 -P 193 111 -2.6281976757985070e-01 2.0439037285097228e-01 5.6390753552022026e+01 5.6391897959015616e+01 1.3497999999999999e-01 2 0 0 -101 0 -V -43 0 0 0 0 0 0 3 0 -P 195 -211 4.1840956779000425e-02 1.1065370009422846e-02 2.3223399295776672e+00 2.3269326680177986e+00 1.3957000000000000e-01 1 0 0 0 0 -P 196 221 -4.7666894429362194e-01 -2.2991460991983190e-01 9.2810980530629781e+00 9.3122798810698342e+00 5.4744999999999999e-01 2 0 0 -102 0 -P 194 211 -7.4549090353008274e-03 -4.7591526351828985e-02 3.6465918317571173e+00 3.6495797431193293e+00 1.3957000000000000e-01 1 0 0 0 0 -V -44 0 0 0 0 0 0 2 0 -P 197 -211 3.2159859847224199e-02 5.1524931983974856e-02 2.2591055305043298e-01 2.7240491566948427e-01 1.3957000000000000e-01 1 0 0 0 0 -P 198 111 -4.3446677963083974e-01 -7.8069277641445167e-01 1.0468480002047293e+00 1.3828784941856385e+00 1.3497999999999999e-01 2 0 0 -103 0 -V -45 0 -3.5529310722325376e-06 3.0192034773813072e-06 2.8592368293834157e-05 2.9301135473266580e-05 0 2 0 -P 199 22 1.0875639270421181e-02 -2.5150996814891705e-02 1.6074224664701259e-01 1.6306109906244409e-01 0 1 0 0 0 0 -P 200 22 -1.2005583534141563e-01 1.1792995056802119e-01 7.1789015938312140e-01 7.3735144794027918e-01 0 1 0 0 0 0 -V -46 0 0 0 0 0 0 1 0 -P 201 130 3.4248690127551151e-01 -3.5064896127775863e-01 6.5641413010847338e-01 9.5854416210028470e-01 4.9767000000000000e-01 1 0 0 0 0 -V -47 0 0 0 0 0 0 1 0 -P 202 130 3.4345529704259643e-02 4.2425337653113343e-01 -1.1177846011983017e+00 1.2954877021742739e+00 4.9767000000000000e-01 1 0 0 0 0 -V -48 0 0 0 0 0 0 3 0 -P 203 -211 3.7755731400707987e-03 1.0039370246368491e-01 -9.8458836148270468e-01 9.9949346016574825e-01 1.3957000000000000e-01 1 0 0 0 0 -P 204 211 -9.9161576416783720e-02 -1.0551044999043914e-01 -9.9295638064943059e-01 1.0131177779839140e+00 1.3957000000000000e-01 1 0 0 0 0 -P 205 111 7.3326975328856361e-02 7.3893963973200610e-02 -6.2198799242777869e-01 6.4492311661692658e-01 1.3497999999999999e-01 2 0 0 -104 0 -V -49 0 0 0 0 0 0 2 0 -P 206 -211 -1.4056740735774267e-01 4.3090739428138275e-01 -9.2027408298128321e-01 1.0352895977284280e+00 1.3957000000000000e-01 1 0 0 0 0 -P 207 211 1.6448440148163432e-01 -1.0315875828041352e-01 -1.2761807265788860e+00 1.2983889554105663e+00 1.3957000000000000e-01 1 0 0 0 0 -V -50 0 0 0 0 0 0 2 0 -P 208 211 -1.4298661753468034e-01 3.7573616782950625e-01 -3.6032083344042366e+02 3.6032108474779415e+02 1.3957000000000000e-01 1 0 0 0 0 -P 209 111 6.9716897678052181e-01 1.3778964005077581e+00 -1.3537396883659865e+03 1.3537405758563607e+03 1.3497999999999999e-01 2 0 0 -105 0 -V -51 0 0 0 0 0 0 2 0 -P 210 211 -2.9078012283491389e-01 -1.1660259005217517e-01 -4.0121417247561617e+01 4.0122883133963313e+01 1.3957000000000000e-01 1 0 0 0 0 -P 211 -211 2.2899627357348501e-01 2.5707148863093887e-01 -6.0357280793668032e+01 6.0358424015494023e+01 1.3957000000000000e-01 1 0 0 0 0 -V -52 0 0 0 0 0 0 3 0 -P 212 -211 2.6751267029558212e-01 -1.2905333117748891e-01 -6.3913699019142889e+01 6.3914541537005043e+01 1.3957000000000000e-01 1 0 0 0 0 -P 213 211 -1.1274188888036062e-02 -1.4725853542175005e-01 -4.0564276257440682e+01 4.0564785223866963e+01 1.3957000000000000e-01 1 0 0 0 0 -P 214 111 2.8295515860935339e-01 -1.6630421945240220e-01 -6.5321241841682792e+01 6.5322205841927925e+01 1.3497999999999999e-01 2 0 0 -106 0 -V -53 0 0 0 0 0 0 2 0 -P 215 2112 -2.1845128615593268e-01 4.4798446087771526e-01 -4.9336036526094443e+02 4.9336151168614583e+02 9.3957000000000002e-01 1 0 0 0 0 -P 216 -211 1.6585355152244120e-02 7.4750230739152670e-02 -1.6951937808817900e+02 1.6951945283612403e+02 1.3957000000000000e-01 1 0 0 0 0 -V -54 0 0 0 0 0 0 3 0 -P 217 -211 1.9855211504001832e-01 2.6538607577308887e-01 -1.3606712490783372e+02 1.3606760015955496e+02 1.3957000000000000e-01 1 0 0 0 0 -P 218 211 3.7148306018183180e-01 3.1989607288807170e-01 -3.3769988231507233e+02 3.3770026699509737e+02 1.3957000000000000e-01 1 0 0 0 0 -P 219 111 -2.4335846251811649e-02 -9.4387977975935594e-02 -7.7609371571857679e+01 7.7609550164286290e+01 1.3497999999999999e-01 2 0 0 -107 0 -V -55 0 0 0 0 0 0 2 0 -P 220 -2112 -4.2947348594333151e-01 4.2878118755364686e-01 -2.4264944626776290e+02 2.4265202423762878e+02 9.3957000000000002e-01 1 0 0 0 0 -P 221 111 5.8313103641705534e-02 -1.8636801168062198e-03 -5.9184340215263624e+01 5.9184522894147172e+01 1.3497999999999999e-01 2 0 0 -108 0 -V -56 0 0 0 0 0 0 2 0 -P 222 211 2.1682504245500336e-01 -3.0690088139902211e-01 -1.5974570443628508e+01 1.5979598927801305e+01 1.3957000000000000e-01 1 0 0 0 0 -P 223 111 -8.9638781795857811e-02 2.6362743774593289e-01 -4.9839795421006370e+00 4.9935764952198349e+00 1.3497999999999999e-01 2 0 0 -109 0 -V -57 0 -4.7599329251464510e-06 9.0207949310365042e-07 -8.4873871722890296e-05 8.5022653563515400e-05 0 2 0 -P 224 22 -3.7654176681799945e-01 1.0398317559965164e-01 -7.3943111915591366e+00 7.4046224887284371e+00 0 1 0 0 0 0 -P 225 22 -1.0144310122609973e-01 -1.3397792516092778e-02 -1.1285875580297213e+00 1.1332166958574881e+00 0 1 0 0 0 0 -V -58 0 0 0 0 0 0 2 0 -P 226 211 3.4496114997444949e-01 1.7950342099730848e-01 -4.8049026935169458e+01 4.8050803207383346e+01 1.3957000000000000e-01 1 0 0 0 0 -P 227 -211 -1.9314214957996700e-01 -1.3047251766359474e-01 -4.5836001434910052e+01 4.5836806545545755e+01 1.3957000000000000e-01 1 0 0 0 0 -V -59 0 0 0 0 0 0 2 0 -P 228 2212 -3.3167235353726043e-01 -1.2810071106104892e-01 -8.1283552071314276e+01 8.1289744766884553e+01 9.3827000000000005e-01 1 0 0 0 0 -P 229 211 -4.5724156530593883e-02 -8.5894814744234493e-02 -1.9645435027066917e+01 1.9646171784989004e+01 1.3957000000000000e-01 1 0 0 0 0 -V -60 0 0 0 0 0 0 2 0 -P 230 -211 5.0134055720976158e-02 4.0626914941326336e-01 -5.8639213486603819e+02 5.8639229435641471e+02 1.3957000000000000e-01 1 0 0 0 0 -P 231 111 1.4339741172950205e-03 6.4265897102186520e-01 -2.2818245590395259e+03 2.2818246535323738e+03 1.3497999999999999e-01 2 0 0 -110 0 -V -61 0 0 0 0 0 0 3 0 -P 232 22 -3.0900926286086272e-01 3.2953746163256012e-02 3.5998311172387848e-01 4.7556336554281858e-01 0 1 0 0 0 0 -P 233 211 3.2072488781638424e-02 7.4310750623015523e-02 1.9183184940054263e-01 2.5065908229951850e-01 1.3957000000000000e-01 1 0 0 0 0 -P 234 -211 3.6277635485791552e-03 7.2109035769672120e-02 1.0378590046087431e-01 1.8831933448924135e-01 1.3957000000000000e-01 1 0 0 0 0 -V -62 0 0 0 0 0 0 2 0 -P 235 -3112 8.3232122072788059e-02 5.2781217484367471e-01 3.2795184750343456e+00 3.5319424202200054e+00 1.1974400000000001e+00 2 0 0 -111 0 -P 236 -211 -7.0161828819345753e-02 1.5410727715577854e-01 3.5732234516368805e-01 4.1932180762383553e-01 1.3957000000000000e-01 1 0 0 0 0 -V -63 0 -1.8944492746949275e-05 8.2401636158269830e-06 -1.2503312705566621e-05 2.4658063843313472e-05 0 2 0 -P 237 22 -6.0517711111023132e-03 6.5087741414458159e-04 -3.6556075964248064e-02 3.7059334382760996e-02 0 1 0 0 0 0 -P 238 22 -5.0646985754231766e-01 2.2227734416277739e-01 -3.0170677841869392e-01 6.3003643900236450e-01 0 1 0 0 0 0 -V -64 0 -7.8563955847677602e-01 2.0638289911218017e+01 7.8257454723169033e+01 8.8857056141573736e+01 0 2 0 -P 239 3122 5.1931187238816325e-02 4.9930613611396391e-01 2.3055770821192110e+00 2.6100634110615828e+00 1.1156800000000000e+00 2 0 0 -112 0 -P 240 -211 -8.0238418068374492e-02 2.4430819712669047e-01 5.1410251659835626e-01 5.9152842821809692e-01 1.3957000000000000e-01 1 0 0 0 0 -V -65 0 0 0 0 0 0 2 0 -P 241 -2112 3.0395501563056263e-02 -2.4405351662998401e-01 -5.3666462824919672e-02 9.7270647146344724e-01 9.3957000000000002e-01 1 0 0 0 0 -P 242 111 -2.6825282256905353e-01 -1.8661431245093574e-01 1.4664249568572760e-01 3.8276376574688753e-01 1.3497999999999999e-01 2 0 0 -113 0 -V -66 0 0 0 0 0 0 2 0 -P 243 2112 5.0572982604360539e-01 -5.8752637152712439e-01 -6.5446855545169724e-01 1.3827764711496053e+00 9.3957000000000002e-01 1 0 0 0 0 -P 244 211 9.9423550289329768e-02 -3.6368958364413451e-01 -2.5949939376894660e-01 4.7851319299453970e-01 1.3957000000000000e-01 1 0 0 0 0 -V -67 0 0 0 0 0 0 3 0 -P 245 111 8.1991508324625768e-03 -2.2739275841531278e-01 -6.9069109264228244e-03 2.6465448885791415e-01 1.3497999999999999e-01 2 0 0 -114 0 -P 246 111 1.4009134464458384e-01 -4.0884284586234554e-02 6.9315279214559475e-02 2.1052628791447428e-01 1.3497999999999999e-01 2 0 0 -115 0 -P 247 111 7.8135734516086748e-03 -1.4352575440229270e-01 1.8309356614861544e-01 2.6907907475656356e-01 1.3497999999999999e-01 2 0 0 -116 0 -V -68 0 0 0 0 0 0 3 0 -P 248 211 -1.7564763129426919e-01 3.9036294667704030e-01 5.7373381789943145e-01 7.2930487398558319e-01 1.3957000000000000e-01 1 0 0 0 0 -P 249 -211 9.8183549295323566e-02 -9.0366883444205459e-02 2.8497224847354313e-01 3.4423124535072736e-01 1.3957000000000000e-01 1 0 0 0 0 -P 250 111 -8.9081241279593756e-02 -3.5896718271989543e-02 6.1330119536645196e-02 1.7664944351169345e-01 1.3497999999999999e-01 2 0 0 -117 0 -V -69 0 0 0 0 0 0 2 0 -P 251 -211 3.2224716368830358e-01 -8.0081349545995439e-01 -1.1081394023791091e-01 8.8142214816000508e-01 1.3957000000000000e-01 1 0 0 0 0 -P 252 111 5.1011684333153062e-01 -6.1963457427255142e-01 -8.1190431695912335e-01 1.1495975033816452e+00 1.3497999999999999e-01 2 0 0 -118 0 -V -70 0 0 0 0 0 0 2 0 -P 253 -211 -1.3608073804842804e-02 3.4069193915745993e-01 4.6360081699615536e+00 4.6506244434408828e+00 1.3957000000000000e-01 1 0 0 0 0 -P 254 111 2.5831045357956911e-01 -2.5003056765727244e-01 6.3219226034303873e+00 6.3335743920282130e+00 1.3497999999999999e-01 2 0 0 -119 0 -V -71 0 -2.2191327105470943e-05 2.6707018703971986e-05 2.0575699945590383e-04 2.0887534434869823e-04 0 2 0 -P 255 22 -3.3464530112944861e-02 1.3062552833387439e-01 7.1639911157906921e-01 7.2897914270537523e-01 0 1 0 0 0 0 -P 256 22 -2.8721994320842464e-01 2.5531471698636882e-01 2.2569730841935161e+00 2.2894559186104617e+00 0 1 0 0 0 0 -V -72 0 0 0 0 0 0 3 0 -P 257 -211 -2.5370115195927556e-01 2.4389521354651730e-01 1.1941656171072713e+01 1.1947655880661921e+01 1.3957000000000000e-01 1 0 0 0 0 -P 258 211 -1.2411261561070656e-01 1.6023975462299647e-01 1.1180974600038915e+01 1.1183682466519279e+01 1.3957000000000000e-01 1 0 0 0 0 -P 259 111 -2.0433372632142410e-01 1.6817746660681263e-01 2.1939337867558944e+01 2.1941349128968632e+01 1.3497999999999999e-01 2 0 0 -120 0 -V -73 0 0 0 0 0 0 2 0 -P 260 -311 -2.2181622425943659e-01 8.2064928378335456e-01 3.4099179264428734e+01 3.4113404544560858e+01 4.9767000000000000e-01 2 0 0 -121 0 -P 261 111 1.2976008347469933e-01 3.6468272062361839e-01 6.3463218449327279e+00 6.3595480755990161e+00 1.3497999999999999e-01 2 0 0 -122 0 -V -74 0 -1.0001014862923057e+01 -3.2697666563000749e-01 1.3551631410569682e+03 1.3553631885179477e+03 0 2 0 -P 263 211 -2.9869529476092338e-01 -5.0875432558458403e-02 2.2946836256989762e+01 2.2949261015961937e+01 1.3957000000000000e-01 1 0 0 0 0 -P 262 2112 -2.6701945902112212e-01 3.2379757227036086e-02 5.3708962497965480e+01 5.3717853570604774e+01 9.3957000000000002e-01 1 0 0 0 0 -V -75 0 3.8177060219193604e+00 -8.6202960607973977e-01 7.4805709987901992e+02 7.4808463063873478e+02 0 2 0 -P 264 -2212 5.6058624701577420e-01 -8.4272389450154115e-03 1.2543095886015534e+02 1.2543572106513193e+02 9.3827000000000005e-01 1 0 0 0 0 -P 265 111 3.3211251027235189e-01 -1.9314217307222326e-01 4.9488125953721443e+01 4.9489801299159566e+01 1.3497999999999999e-01 2 0 0 -123 0 -V -76 0 4.0150324535365861e-04 -2.9501415761643132e-04 2.5414161167512602e-02 2.5419241904258205e-02 0 2 0 -P 266 22 2.1495426154852360e-01 -2.1249167000350005e-01 1.7862096858763419e+01 1.7864653991505818e+01 0 1 0 0 0 0 -P 267 22 3.2610470661881691e-01 -1.8506440846382186e-01 1.6385595973758694e+01 1.6389885555738825e+01 0 1 0 0 0 0 -V -77 0 0 0 0 0 0 3 0 -P 268 111 2.1756652006665286e-01 4.4921344540010552e-02 2.8253044127043143e+01 2.8254239950189710e+01 1.3497999999999999e-01 2 0 0 -124 0 -P 269 111 2.1168570079863799e-01 1.5888476958365427e-02 1.4419743327632153e+01 1.4421937474376135e+01 1.3497999999999999e-01 2 0 0 -125 0 -P 270 111 4.2338651776527382e-02 5.9397905537924622e-02 5.3617926069090789e+00 5.3639873445526884e+00 1.3497999999999999e-01 2 0 0 -126 0 -V -78 0 0 0 0 0 0 3 0 -P 271 211 -1.6517201415503185e-01 -2.4079978785390410e-01 5.3890218212193854e+00 5.3987315460735052e+00 1.3957000000000000e-01 1 0 0 0 0 -P 272 -211 6.1921227808798385e-02 6.5909961337744488e-02 6.8540815103096717e+00 6.8560988540368788e+00 1.3957000000000000e-01 1 0 0 0 0 -P 273 111 -2.9104043237975502e-01 -1.7136327052337760e-01 1.4152408887417174e+01 1.4157081861061936e+01 1.3497999999999999e-01 2 0 0 -127 0 -V -79 0 0 0 0 0 0 2 0 -P 274 211 -5.2151867703930009e-02 -4.6577522637422542e-01 9.3560383894911787e+00 9.3688099836287453e+00 1.3957000000000000e-01 1 0 0 0 0 -P 275 111 4.5010499856196384e-01 -1.5099879120799736e-01 2.2489630496284530e+01 2.2495046001386349e+01 1.3497999999999999e-01 2 0 0 -128 0 -V -80 0 0 0 0 0 0 2 0 -P 276 321 -2.0352232346411694e-01 -3.1853415646239830e-01 1.2546225242926846e+01 1.2561619885637212e+01 4.9359999999999998e-01 1 0 0 0 0 -P 277 -211 3.0617347118293892e-01 9.2311657222136315e-02 1.0906099986540170e+01 1.0911679996124647e+01 1.3957000000000000e-01 1 0 0 0 0 -V -81 0 0 0 0 0 0 2 0 -P 278 -321 -7.0220195411522102e-01 -1.2527226016438842e+00 1.0523045321644643e+01 1.0632051791748376e+01 4.9359999999999998e-01 1 0 0 0 0 -P 279 211 1.4520040899471007e-01 -3.8694870159807759e-01 3.1236150576917168e+00 3.1539282284127990e+00 1.3957000000000000e-01 1 0 0 0 0 -V -82 0 -7.3070249558822658e-06 -3.2202206515903731e-05 5.1933279134994169e-04 5.2070104417390720e-04 0 2 0 -P 280 22 1.2505542083726177e-02 -1.7814709059026052e-01 3.0137330713764303e+00 3.0190196753212120e+00 0 1 0 0 0 0 -P 281 22 -6.6582630892394315e-02 -6.0171731654043326e-02 8.2969235123366514e-01 8.3453177394419598e-01 0 1 0 0 0 0 -V -83 0 0 0 0 0 0 2 0 -P 282 -211 5.1916430522214251e-02 -8.9640749655295293e-01 4.1885959318955983e+00 4.2860304923351693e+00 1.3957000000000000e-01 1 0 0 0 0 -P 283 111 -6.3457866147058040e-01 -5.6503110734722573e-01 5.4665917789662455e+00 5.5338770774318045e+00 1.3497999999999999e-01 2 0 0 -129 0 -V -84 0 -1.3711706269638147e-04 -1.8369746299331976e-04 1.4597874604678092e-03 1.4778981978161132e-03 0 2 0 -P 284 22 -5.2667737066255793e-01 -6.6014242113744759e-01 5.7128746555838257e+00 5.7749557486932526e+00 0 1 0 0 0 0 -P 285 22 -1.9494804319896730e-01 -3.0662827210148269e-01 1.9697558616883879e+00 2.0029887147597236e+00 0 1 0 0 0 0 -V -85 0 0 0 0 0 0 2 0 -P 286 311 -8.8640989536248971e-01 -1.6453928479315294e+00 1.0105514131225380e+01 1.0288932471929078e+01 4.9767000000000000e-01 2 0 0 -130 0 -P 287 211 -1.9216241447018820e-02 -3.0070888016722131e-02 8.4870724776096818e-01 8.6084685022567276e-01 1.3957000000000000e-01 1 0 0 0 0 -V -86 0 0 0 0 0 0 2 0 -P 288 -321 -3.0096672158605109e-01 -3.2856288480682283e-01 5.3121460379397503e+00 5.3536035550994834e+00 4.9359999999999998e-01 1 0 0 0 0 -P 289 211 2.6855393914793912e-01 -1.0507833884512403e-01 1.6147842692616270e+00 1.6462596079237115e+00 1.3957000000000000e-01 1 0 0 0 0 -V -87 0 4.4109844203045144e-05 9.1528473519848896e-05 8.5958854573134038e-05 1.3727799312159968e-04 0 2 0 -P 290 22 -8.7160338195142774e-03 1.0407506512888258e-01 1.1322702962452645e-01 1.5403878948082347e-01 0 1 0 0 0 0 -P 291 22 1.8558634600392554e-01 2.6293302518989264e-01 2.3144817197854431e-01 3.9641433358395012e-01 0 1 0 0 0 0 -V -88 0 -3.5053496386335686e-05 7.6475739764950647e-05 7.9714842662904328e-05 1.2138813319072600e-04 0 2 0 -P 292 22 -1.3461824233850531e-01 2.0304834831798538e-01 1.5577729727085340e-01 2.8916650786351850e-01 0 1 0 0 0 0 -P 293 22 3.5575337961664942e-03 8.2885029894210052e-02 1.4226668800229234e-01 1.6468878147104177e-01 0 1 0 0 0 0 -V -89 0 -4.4554774813408138e-06 -6.5814465924921522e-06 1.9206538511148803e-04 1.9343662025378980e-04 0 2 0 -P 294 22 1.8693463926493268e-02 -3.1342886660051500e-02 1.0632171065932128e+00 1.0638432393403643e+00 0 1 0 0 0 0 -P 295 22 -4.6569336840087371e-02 -9.8341969562946805e-03 1.3844765075107546e-01 1.4640070546958606e-01 0 1 0 0 0 0 -V -90 0 -1.1519603842379508e-05 -3.5623912285813612e-05 1.9265592300701549e-02 1.9265664885424284e-02 0 2 0 -P 296 22 -8.3815127063187972e-02 -1.2256295385089019e-01 5.3865030303772741e+01 5.3865234950564684e+01 0 1 0 0 0 0 -P 297 22 4.2184079505536640e-02 -6.1793889286651952e-03 1.5759481117893948e+01 1.5759538787244599e+01 0 1 0 0 0 0 -V -91 0 -1.5697360852585788e-04 -1.4457458960692370e-07 2.9323161432635091e-02 2.9323608548484745e-02 0 2 0 -P 298 22 -4.9644516570737324e-01 -3.7151389408233211e-02 8.9402750785785713e+01 8.9404136851118892e+01 0 1 0 0 0 0 -P 299 22 -3.6407780625288773e-02 3.6660625408091146e-02 1.0135847529573983e+01 1.0135979216174251e+01 0 1 0 0 0 0 -V -92 0 1.8966305837442445e-02 -3.3751224473166320e-03 -7.9448025344839107e-02 8.1849904533435089e-02 0 4 0 -P 300 -311 2.6183277643501564e+00 6.1386138582397727e-02 -9.6191913944512102e+00 9.9817797537093131e+00 4.9767000000000000e-01 2 0 0 -131 0 -P 301 211 8.8637402086832295e-01 -3.1039363085465904e-01 -3.8525417889436788e+00 3.9678156624776282e+00 1.3957000000000000e-01 1 0 0 0 0 -P 302 -211 1.5690167489104487e+00 -1.3700604791982612e-01 -6.5896015529868883e+00 6.7766446437418670e+00 1.3957000000000000e-01 1 0 0 0 0 -P 303 111 3.6836236547444208e+00 -1.1723870494551110e+00 -1.6622326812590639e+01 1.7066444939954319e+01 1.3497999999999999e-01 2 0 0 -132 0 -V -93 0 7.4128442659675373e-04 -2.0823270018832646e-04 -2.8148335666901884e-03 2.9184746351946975e-03 0 2 0 -P 304 22 8.1742943599848239e-01 -1.6584406973187246e-01 -3.0563856276486878e+00 3.1681521811932414e+00 0 1 0 0 0 0 -P 305 22 1.9131827501388010e+00 -6.0120664425247261e-01 -7.3123993668507001e+00 7.5824074122168170e+00 0 1 0 0 0 0 -V -94 0 1.4833994199896756e-05 -1.2903859275933336e-04 -6.1541970667552427e-04 6.2933453462583595e-04 0 2 0 -P 306 22 5.6644467513777601e-02 -3.9192437164538596e-01 -2.1953408676426514e+00 2.2307700091967217e+00 0 1 0 0 0 0 -P 307 22 3.7793281528448693e-02 -4.2957481970880629e-01 -1.7226094181319094e+00 1.7757663318391017e+00 0 1 0 0 0 0 -V -95 0 4.5181862789650803e-06 -1.9801813276266907e-06 -3.0991121206199972e-05 3.1520921781356387e-05 0 2 0 -P 308 22 8.6260522514302745e-02 2.2530582118513855e-02 -3.3478032046315359e-01 3.4644821812855597e-01 0 1 0 0 0 0 -P 309 22 1.1951445344448942e-01 -1.1271539078465091e-01 -1.0766703872758272e+00 1.0891315745760710e+00 0 1 0 0 0 0 -V -96 0 8.5116093559703892e-05 -3.5578692705565099e-05 -4.6524316068253217e-04 4.7509850400360835e-04 0 2 0 -P 310 22 4.1443767343060667e-01 -1.4967313990932649e-01 -2.2238064740485206e+00 2.2670412144442822e+00 0 1 0 0 0 0 -P 311 22 3.1920037468237635e-03 -2.4896877670223756e-02 -5.8950439232089813e-02 6.4071816669282453e-02 0 1 0 0 0 0 -V -97 0 3.0282600980360872e-06 -4.7568266335714519e-06 -3.5806730204857039e-05 3.6288277676784827e-05 0 2 0 -P 312 22 9.3367976806222705e-02 -2.3060951027911883e-01 -1.2351119821318959e+00 1.2599206061216093e+00 0 1 0 0 0 0 -P 313 22 1.4586170170862600e-01 -1.4517528675274019e-01 -1.5935857777240650e+00 1.6068189477578019e+00 0 1 0 0 0 0 -V -98 0 0 0 0 0 0 1 0 -P 314 130 -4.6100841314703395e-01 9.2307915799673013e-01 -1.4688030567429675e+00 1.8627028043458205e+00 4.9767000000000000e-01 1 0 0 0 0 -V -99 0 -6.0749677413030187e-04 4.0286823319709669e-04 -5.8199231917407284e-04 9.3484537376994871e-04 0 2 0 -P 315 22 -5.8507372946487168e-01 3.1792411425789363e-01 -4.8939393290153504e-01 8.2637366420853020e-01 0 1 0 0 0 0 -P 316 22 -7.3379340537514304e-01 5.5669727479453446e-01 -7.7410338128069411e-01 1.2031627747091891e+00 0 1 0 0 0 0 -V -100 0 1.3016547532871910e-04 -4.2999996681327984e-05 1.5811431125117299e-02 1.5812422343840164e-02 0 2 0 -P 317 22 1.5804746333869230e-01 -3.9281593826614072e-02 1.8887316070568861e+01 1.8888018170095304e+01 0 1 0 0 0 0 -P 318 22 -1.2379688754138632e-03 -1.2520220168175604e-02 1.6061130963062439e-01 1.6110332479890169e-01 0 1 0 0 0 0 -V -101 0 -3.1320010615501288e-05 2.4357028797134874e-05 6.7200386642486745e-03 6.7201750422674266e-03 0 2 0 -P 319 22 -2.0941596228200959e-01 1.9785744195153840e-01 3.9131333015929883e+01 3.9132393566151876e+01 0 1 0 0 0 0 -P 320 22 -5.3403805297841091e-02 6.5329308994338591e-03 1.7259420536092140e+01 1.7259504392863857e+01 0 1 0 0 0 0 -V -102 0 0 0 0 0 0 3 0 -P 321 -211 -6.0151917037470526e-02 7.9311722353406680e-02 2.2910866605242663e+00 2.2974913434783999e+00 1.3957000000000000e-01 1 0 0 0 0 -P 322 211 -1.8066085545057711e-01 -1.2250346517093816e-01 3.1803689410937466e+00 3.1909045473101791e+00 1.3957000000000000e-01 1 0 0 0 0 -P 323 111 -2.3585617180557428e-01 -1.8672286710230040e-01 3.8096424514449647e+00 3.8238839902812538e+00 1.3497999999999999e-01 2 0 0 -133 0 -V -103 0 -1.9160483241735818e-05 -3.4429446762634630e-05 4.6167197366874553e-05 6.0986527521654494e-05 0 2 0 -P 324 22 -4.2152681502119949e-01 -7.5137863584649212e-01 1.0392920720559295e+00 1.3499565627185053e+00 0 1 0 0 0 0 -P 325 22 -1.2939964609640288e-02 -2.9314140567959529e-02 7.5559281487998032e-03 3.2921931467134069e-02 0 1 0 0 0 0 -V -104 0 2.9830838171712643e-05 3.0061500167775855e-05 -2.5303679939952156e-04 2.6236725350684323e-04 0 2 0 -P 326 22 3.5218510592828343e-02 1.0791532602972706e-01 -4.9896979581793105e-01 5.1171956990041656e-01 0 1 0 0 0 0 -P 327 22 3.8108464736028018e-02 -3.4021362056526450e-02 -1.2301819660984770e-01 1.3320354671651011e-01 0 1 0 0 0 0 -V -105 0 4.2377491725209733e-04 8.3755581868205121e-04 -8.2287213505597279e-01 8.2287267451795754e-01 0 2 0 -P 328 22 4.5179522665667199e-01 1.0179315933320865e+00 -9.5340158429428311e+02 9.5340223475640357e+02 0 1 0 0 0 0 -P 329 22 2.4537375012384985e-01 3.5996480717567148e-01 -4.0033810407170330e+02 4.0033834109995706e+02 0 1 0 0 0 0 -V -106 0 2.7213670290870733e-05 -1.5994577439058151e-05 -6.2823761447091137e-03 6.2824688589927487e-03 0 2 0 -P 330 22 2.2167340558834825e-01 -9.7157200552894965e-02 -5.5547760321911738e+01 5.5548287600977559e+01 0 1 0 0 0 0 -P 331 22 6.1281753021005136e-02 -6.9147018899507251e-02 -9.7734815197710532e+00 9.7739182409503673e+00 0 1 0 0 0 0 -V -107 0 -5.8316299800032171e-06 -2.2618311951053398e-05 -1.8597633026793233e-02 1.8597675823125447e-02 0 2 0 -P 332 22 -1.7984737530842031e-02 -2.1226756412069968e-02 -2.7141048367785494e+00 2.7142474262669105e+00 0 1 0 0 0 0 -P 333 22 -6.3511087209696176e-03 -7.3161221563865633e-02 -7.4895266735079133e+01 7.4895302738019382e+01 0 1 0 0 0 0 -V -108 0 5.8868838727987346e-06 -1.8814413465442004e-07 -5.9748378353555037e-03 5.9748562773403457e-03 0 2 0 -P 334 22 6.9648943109769781e-02 2.9835063326280664e-02 -1.6959451898039372e+01 1.6959621156977278e+01 0 1 0 0 0 0 -P 335 22 -1.1335839468064239e-02 -3.1698743443086888e-02 -4.2224888317224256e+01 4.2224901737169894e+01 0 1 0 0 0 0 -V -109 0 -1.1760798667907243e-05 3.4588480081390835e-05 -6.5390870765183397e-04 6.5516784829608410e-04 0 2 0 -P 336 22 -6.1848075575125581e-02 1.9449485808627826e-01 -2.4447993736844960e+00 2.4533033672667659e+00 0 1 0 0 0 0 -P 337 22 -2.7790706220732229e-02 6.9132579659654650e-02 -2.5391801684161410e+00 2.5402731279530690e+00 0 1 0 0 0 0 -V -110 0 1.1133139557567718e-07 4.9894987127144138e-05 -1.7715711152160191e-01 1.7715711885787144e-01 0 2 0 -P 338 22 5.1210149305939139e-02 5.3680022191438881e-01 -1.8410429184390396e+03 1.8410429974097549e+03 0 1 0 0 0 0 -P 339 22 -4.9776175188644113e-02 1.0585874910747640e-01 -4.4078164060048624e+02 4.4078165612261887e+02 0 1 0 0 0 0 -V -111 0 8.3651444920921989e+00 5.3047128888430507e+01 3.2960406661453277e+02 3.5497363213991264e+02 0 2 0 -P 340 -2112 2.4959979502932808e-01 4.1483457435636895e-01 2.8145873045782719e+00 3.0065064878947614e+00 9.3957000000000002e-01 1 0 0 0 0 -P 341 211 -1.6636767295654004e-01 1.1297760048730578e-01 4.6493117045607391e-01 5.2543593232524399e-01 1.3957000000000000e-01 1 0 0 0 0 -V -112 0 5.6116033604361382e-01 3.3587453741407344e+01 1.3805102263693735e+02 1.5654726916412105e+02 0 2 0 -P 342 2212 1.1992793272742071e-01 4.4331641651508663e-01 2.1078582809441220e+00 2.3525155216586264e+00 9.3827000000000005e-01 1 0 0 0 0 -P 343 -211 -6.7996745488604390e-02 5.5989719598877254e-02 1.9771880117508914e-01 2.5754788940295620e-01 1.3957000000000000e-01 1 0 0 0 0 -V -113 0 -1.9934912146134204e-05 -1.3868036460130835e-05 1.0897575057695162e-05 2.8444666377829044e-05 0 2 0 -P 344 22 -7.6471623616945908e-03 -4.7325606667598510e-02 -9.0136760118943275e-03 4.8779488454572417e-02 0 1 0 0 0 0 -P 345 22 -2.6060566020735898e-01 -1.3928870578333724e-01 1.5565617169762194e-01 3.3398427729231522e-01 0 1 0 0 0 0 -V -114 0 2.1360272638227475e-06 -5.9239931243597419e-05 -1.7993753681444694e-06 6.8947286767231003e-05 0 2 0 -P 346 22 -4.6502144541311519e-02 -2.4623793396686189e-02 1.1401113821310007e-02 5.3840189863615641e-02 0 1 0 0 0 0 -P 347 22 5.4701295373774099e-02 -2.0276896501862660e-01 -1.8308024747732833e-02 2.1081429899429852e-01 0 1 0 0 0 0 -V -115 0 4.8539793062532255e-05 -1.4165862411844778e-05 2.4016825005729855e-05 7.2944566814726108e-05 0 2 0 -P 348 22 -1.5453741505853599e-02 -1.0327941204819121e-03 4.5670963822391386e-02 4.8225737181418267e-02 0 1 0 0 0 0 -P 349 22 1.5554508615043744e-01 -3.9851490465752641e-02 2.3644315392168085e-02 1.6230055073305602e-01 0 1 0 0 0 0 -V -116 0 1.1104293133444440e-06 -2.0397223612887224e-05 2.6020420003133673e-05 3.8240287119304297e-05 0 2 0 -P 350 22 5.0771406605997528e-02 -4.0452964763788126e-03 5.4032352941951377e-02 7.4253587905076579e-02 0 1 0 0 0 0 -P 351 22 -4.2957833154388850e-02 -1.3948045792591390e-01 1.2906121320666405e-01 1.9482548685148704e-01 0 1 0 0 0 0 -V -117 0 -2.6036576342430157e-05 -1.0491857009467409e-05 1.7925506161217156e-05 5.1630923141319130e-05 0 2 0 -P 352 22 -1.0270748918179354e-01 -7.3080935605012304e-02 4.7240148627235183e-02 1.3461531534433765e-01 0 1 0 0 0 0 -P 353 22 1.3626247902199785e-02 3.7184217333022761e-02 1.4089970909410013e-02 4.2034128167355814e-02 0 1 0 0 0 0 -V -118 0 1.0691248272362538e-04 -1.2986567995721066e-04 -1.7016239984005995e-04 2.4093759072278827e-04 0 2 0 -P 354 22 2.0070538345311324e-02 -3.6272560866489251e-02 -8.3680527288135988e-03 4.2291245994366115e-02 0 1 0 0 0 0 -P 355 22 4.9004630498621926e-01 -5.8336201340606209e-01 -8.0353626423030966e-01 1.1073062573872792e+00 0 1 0 0 0 0 -V -119 0 2.7525122215137944e-05 -2.6642831665992929e-05 6.7365331090041411e-04 6.7489490565872043e-04 0 2 0 -P 356 22 -1.3261749120023297e-02 1.7702328450182473e-03 2.6929989477908284e-01 2.6963204750562036e-01 0 1 0 0 0 0 -P 357 22 2.7157220269959242e-01 -2.5180080050229070e-01 6.0526227086513051e+00 6.0639423445225926e+00 0 1 0 0 0 0 -V -120 0 -3.1715703820054426e-05 2.6103702096238404e-05 3.4053191039106886e-03 3.4056312822883005e-03 0 2 0 -P 358 22 -1.2742245539164479e-01 1.6454266915182736e-01 1.2849928685755119e+01 1.2851613828663774e+01 0 1 0 0 0 0 -P 359 22 -7.6911270929779313e-02 3.6347974549852820e-03 9.0894091818038234e+00 9.0897353003048575e+00 0 1 0 0 0 0 -V -121 0 0 0 0 0 0 1 0 -P 360 130 -2.2181622425943659e-01 8.2064928378335456e-01 3.4099179264428734e+01 3.4113404544560858e+01 4.9767000000000000e-01 1 0 0 0 0 -V -122 0 1.6365951152252307e-05 4.5995497474848116e-05 8.0042791688625977e-04 8.0209607121551534e-04 0 2 0 -P 361 22 1.6457473104822637e-02 1.2357630669817704e-01 3.0214087375441823e+00 3.0239796148959881e+00 0 1 0 0 0 0 -P 362 22 1.1330261036987670e-01 2.4110641392544135e-01 3.3249131073885452e+00 3.3355684607030280e+00 0 1 0 0 0 0 -V -123 0 3.8177543412316921e+00 -8.6205770648757274e-01 7.4806429994568623e+02 7.4809183094914840e+02 0 2 0 -P 363 22 2.8847555483102255e-01 -1.8442581482610237e-01 3.6678513532652126e+01 3.6680111586414981e+01 0 1 0 0 0 0 -P 364 22 4.3636955441329298e-02 -8.7163582461208516e-03 1.2809612421069319e+01 1.2809689712744593e+01 0 1 0 0 0 0 -V -124 0 1.8055353550502218e-05 3.7279208096233577e-06 2.3446562478244642e-03 2.3447554864834664e-03 0 2 0 -P 365 22 3.2840553761882885e-02 3.3487323111844082e-02 1.2824422473230022e+01 1.2824508242995824e+01 0 1 0 0 0 0 -P 366 22 1.8472596630477001e-01 1.1434021428166474e-02 1.5428621653813121e+01 1.5429731707193888e+01 0 1 0 0 0 0 -V -125 0 1.5000494737206010e-05 1.1258909510514894e-06 1.0218133916554050e-03 1.0219688735163036e-03 0 2 0 -P 367 22 2.0590072325621228e-01 1.6406750822116400e-02 1.4396424714445700e+01 1.4397906405030316e+01 0 1 0 0 0 0 -P 368 22 5.7849775424257200e-03 -5.1827386375097220e-04 2.3318613186452682e-02 2.4031069345820253e-02 0 1 0 0 0 0 -V -126 0 1.1025628596229910e-05 1.5468117627169742e-05 1.3962923100580519e-03 1.3968638531069975e-03 0 2 0 -P 369 22 -4.6518556081000337e-03 8.8937831391877178e-02 2.3566496719389329e+00 2.3583318794993993e+00 0 1 0 0 0 0 -P 370 22 4.6990507384627421e-02 -2.9539925853952553e-02 3.0051429349701460e+00 3.0056554650532892e+00 0 1 0 0 0 0 -V -127 0 -5.5259884809614866e-05 -3.2536766497669014e-05 2.6871197190801157e-03 2.6880069771947918e-03 0 2 0 -P 371 22 -1.0110895637559562e-01 -5.3295271113881944e-02 2.6031718919982696e+00 2.6056798165300958e+00 0 1 0 0 0 0 -P 372 22 -1.8993147600415941e-01 -1.1806799940949568e-01 1.1549236995418905e+01 1.1551402044531839e+01 0 1 0 0 0 0 -V -128 0 3.9393832255598700e-05 -1.3215629843371153e-05 1.9683245778019608e-03 1.9687985505421920e-03 0 2 0 -P 373 22 4.0519797499710603e-01 -1.6100216218666105e-01 1.8439347310789309e+01 1.8444501520590993e+01 0 1 0 0 0 0 -P 374 22 4.4907023564857852e-02 1.0003370978663674e-02 4.0502831854952213e+00 4.0505444807953541e+00 0 1 0 0 0 0 -V -129 0 -2.0539396101361708e-04 -1.8288351670226675e-04 1.7693707760742391e-03 1.7911489965044658e-03 0 2 0 -P 375 22 -2.7639354994895160e-01 -2.6866740687512319e-01 2.9022806969822539e+00 2.9277651569151142e+00 0 1 0 0 0 0 -P 376 22 -3.5818511152162880e-01 -2.9636370047210259e-01 2.5643110819839920e+00 2.6061119205166898e+00 0 1 0 0 0 0 -V -130 0 0 0 0 0 0 1 0 -P 377 310 -8.8640989536248971e-01 -1.6453928479315294e+00 1.0105514131225380e+01 1.0288932471929078e+01 4.9767000000000000e-01 2 0 0 -134 0 -V -131 0 1.8966305837442445e-02 -3.3751224473166320e-03 -7.9448025344839107e-02 8.1849904533435089e-02 0 1 0 -P 378 130 2.6183277643501564e+00 6.1386138582397727e-02 -9.6191913944512102e+00 9.9817797537093131e+00 4.9767000000000000e-01 1 0 0 0 0 -V -132 0 2.0149870341415778e-02 -3.7518155698254710e-03 -8.4788852159078762e-02 8.7333428458016546e-02 0 2 0 -P 379 22 2.8921594225230942e+00 -9.1550660519293359e-01 -1.2794645715543083e+01 1.3149361104468387e+01 0 1 0 0 0 0 -P 380 22 7.9146423222132656e-01 -2.5688044426217738e-01 -3.8276810970475545e+00 3.9170838354859354e+00 0 1 0 0 0 0 -V -133 0 -1.1231803604738254e-05 -8.8920063263619592e-06 1.8142054749441223e-04 1.8209874966319139e-04 0 2 0 -P 381 22 -1.1488886556337818e-01 -1.3618640965757867e-01 2.8158840839305816e+00 2.8215154374448228e+00 0 1 0 0 0 0 -P 382 22 -1.2096730624219609e-01 -5.0536457444721711e-02 9.9375836751438251e-01 1.0023685528364348e+00 0 1 0 0 0 0 -V -134 0 -5.4534669499812850e+01 -1.0122964063099396e+02 6.2172238391663780e+02 6.3300684570210751e+02 0 2 0 -P 383 111 -2.7057189871723214e-01 -3.1393099110360240e-01 1.6814506090419195e+00 1.7370254950915891e+00 1.3497999999999999e-01 2 0 0 -135 0 -P 384 111 -6.1583799664525751e-01 -1.3314618568279268e+00 8.4240635221834612e+00 8.5519069768374898e+00 1.3497999999999999e-01 2 0 0 -136 0 -V -135 0 -5.4534759776515948e+01 -1.0122974537452058e+02 6.2172294493505149e+02 6.3300742526316185e+02 0 2 0 -P 385 22 -1.0129816071137022e-01 -2.0517523717889224e-01 1.0348101654081705e+00 1.0598067152773691e+00 0 1 0 0 0 0 -P 386 22 -1.6927373800586196e-01 -1.0875575392471017e-01 6.4664044363374906e-01 6.7721877981422007e-01 0 1 0 0 0 0 -V -136 0 -5.4534805123554811e+01 -1.0122993385395240e+02 6.2172423911723217e+02 6.3300872905719666e+02 0 2 0 -P 387 22 -3.0111265749682459e-01 -7.1575180908117086e-01 4.0963761753010273e+00 4.1693245561219676e+00 0 1 0 0 0 0 -P 388 22 -3.1472533914843293e-01 -6.1571004774675597e-01 4.3276873468824339e+00 4.3825824207155222e+00 0 1 0 0 0 0 diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/hepmcEx01-clhep.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/hepmcEx01-clhep.cc deleted file mode 100644 index 95ba8fab52..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/hepmcEx01-clhep.cc +++ /dev/null @@ -1,113 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: hepmcEx01-clhep.cc,v 1.3 2006/06/29 17:06:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// -// -------------------------------------------------------------- -// GEANT 4 - exampleN04 -// -// -------------------------------------------------------------- -// Comments -// -// -// -------------------------------------------------------------- - - -#include "G4RunManager.hh" -#include "G4UImanager.hh" -#include "G4UIterminal.hh" -#include "G4UItcsh.hh" - -#include "ExN04DetectorConstruction.hh" -#include "ExN04PhysicsList.hh" -#include "ExN04PrimaryGeneratorAction.hh" -#include "ExN04RunAction.hh" -#include "ExN04EventAction.hh" -#include "ExN04StackingAction.hh" -#include "ExN04TrackingAction.hh" -#include "ExN04SteppingAction.hh" -#include "ExN04SteppingVerbose.hh" - -#ifdef G4VIS_USE -#include "G4VisExecutive.hh" -#endif - -int main(int argc,char** argv) -{ - G4VSteppingVerbose::SetInstance(new ExN04SteppingVerbose); - - G4RunManager* runManager = new G4RunManager; - - runManager->SetUserInitialization(new ExN04DetectorConstruction); - runManager->SetUserInitialization(new ExN04PhysicsList); - -#ifdef G4VIS_USE - // Visualization, if you choose to have it! - G4VisManager* visManager = new G4VisExecutive; - visManager->Initialize(); -#endif - - runManager->Initialize(); - - runManager->SetUserAction(new ExN04PrimaryGeneratorAction); - runManager->SetUserAction(new ExN04RunAction); - runManager->SetUserAction(new ExN04EventAction); - runManager->SetUserAction(new ExN04StackingAction); - runManager->SetUserAction(new ExN04TrackingAction); - runManager->SetUserAction(new ExN04SteppingAction); - - //get the pointer to the User Interface manager - G4UImanager* UImanager = G4UImanager::GetUIpointer(); - - if(argc==1) - { - // G4UIterminal is a (dumb) terminal. -#ifdef G4UI_USE_TCSH - G4UIsession* session = new G4UIterminal(new G4UItcsh); -#else - G4UIsession* session = new G4UIterminal(); -#endif - UImanager->ApplyCommand("/control/execute vis.mac"); - session->SessionStart(); - delete session; - } - else - { - G4String command = "/control/execute "; - G4String fileName = argv[1]; - UImanager->ApplyCommand(command+fileName); - } - - delete runManager; -#ifdef G4VIS_USE - delete visManager; -#endif - - return 0; -} - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/hepmc_ascii.in b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/hepmc_ascii.in deleted file mode 100644 index e9614c8430..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/hepmc_ascii.in +++ /dev/null @@ -1,5 +0,0 @@ -/generator/select hepmcAscii -/generator/hepmcAscii/open data/example_MyPythia.dat -/generator/hepmcAscii/verbose 1 -/run/beamOn 3 - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/hepmc_ascii.out b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/hepmc_ascii.out deleted file mode 100644 index a82d79d577..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/hepmc_ascii.out +++ /dev/null @@ -1,2073 +0,0 @@ -********************************************** - Geant4 version $Name: geant4-08-01 $ - (31-Jul-2002) - Copyright : Geant4 Collaboration -********************************************** - -phot: Total cross sections from Sandia parametrisation. -MuonMinusCaptureAtRest is created - -compt: Total cross sections from a parametrisation. Good description from 10 KeV to (100/Z) GeV. - Scattered gamma energy according Klein-Nishina. - PhysicsTables from 1 keV to 100 GeV in 80 bins. - -conv: Total cross sections from a parametrisation. Good description from 1.5 MeV to 100 GeV for all Z. - e+e- energies according Bethe-Heitler - PhysicsTables from 1.022 MeV to 100 GeV in 100 bins. - -eBrem: Total cross sections from a NEW parametrisation based on the EEDL data library. - Good description from 1 KeV to 100 GeV. - log scale extrapolation above 100 GeV - Gamma energy sampled from a parametrised formula. - PhysicsTables from 1 keV to 100 TeV in 100 bins. - -eIoni: delta cross sections from Moller+Bhabha. Good description from 1 KeV to 100 GeV. - delta ray energy sampled from differential Xsection. - PhysicsTables from 1 keV to 100 TeV in 100 bins. - -msc: Tables of transport mean free paths. - New model of MSC , computes the lateral - displacement of the particle , too. - PhysicsTables from 100 eV to 100 TeV in 100 bins. - -annihil: Total cross section from Heilter formula(annihilation into 2 photons). - gamma energies sampled according Heitler - PhysicsTables from 10 keV to 10 TeV in 100 bins. - -annihil: Total cross section from Heilter formula(annihilation into 2 photons). - gamma energies sampled according Heitler - PhysicsTables from 10 keV to 10 TeV in 100 bins. - -hIoni: Knock-on electron cross sections . - Good description above the mean excitation energy. - delta ray energy sampled from differential Xsection. - PhysicsTables from 1 keV to 100 TeV in 100 bins. - -msc: Tables of transport mean free paths. - New model of MSC , computes the lateral - displacement of the particle , too. - PhysicsTables from 100 eV to 100 TeV in 100 bins. - -MuIoni: Knock-on electron cross sections . - Good description above the mean excitation energy. - delta ray energy sampled from differential Xsection. - PhysicsTables from 1 keV to 1000 PeV in 150 bins. - -MuBrems: theoretical cross section - Good description up to 1000 PeV. - PhysicsTables from 1 keV to 1000 PeV in 150 bins. - -MuPairProd: theoretical cross sections - Good description up to 1000 PeV. - PhysicsTables from 1 keV to 1000 PeV in 150 bins. - -msc: Tables of transport mean free paths. - New model of MSC , computes the lateral - displacement of the particle , too. - PhysicsTables from 100 eV to 100 TeV in 100 bins. -current generator type: hepmcAscii -HepMC Ascii inputfile: data/example_MyPythia.dat -________________________________________________________________________________ -GenEvent: #1 ID=20 SignalProcessGenVertex Barcode: 0 - Current Memory Usage: 1 events, 78 vertices, 210 particles. - Entries this event: 78 vertices, 210 particles. - RndmState(0)= - Wgts(0)= - EventScale -1 GeV alphaQCD=-1 alphaQED=-1 - GenParticle Legend - Barcode PDG ID ( Px, Py, Pz, E ) Stat DecayVtx -________________________________________________________________________________ -GenVertex: -1 ID: 0 (X,cT):0 - I: 1 1 2212 +0.00e+00,+0.00e+00,+7.00e+03,+7.00e+03 3 -1 - O: 2 3 2 -7.76e-01,-9.12e-01,+1.88e+03,+1.88e+03 3 -3 - 20 2101 +7.76e-01,+9.12e-01,+4.45e+03,+4.45e+03 2 -16 -GenVertex: -2 ID: 0 (X,cT):0 - I: 1 2 2212 +0.00e+00,+0.00e+00,-7.00e+03,+7.00e+03 3 -2 - O: 3 4 -1 -1.01e+00,-1.27e-02,-4.15e+00,+4.27e+00 3 -4 - 13 2214 +1.00e-00,+2.73e-02,-4.08e+03,+4.08e+03 2 -9 - 26 1 +8.08e-03,-1.46e-02,-2.46e+03,+2.46e+03 2 -16 -GenVertex: -3 ID: 0 (X,cT):0 - I: 1 3 2 -7.76e-01,-9.12e-01,+1.88e+03,+1.88e+03 3 -3 - O: 4 5 2 -5.02e+00,+1.15e+00,+1.48e+03,+1.48e+03 3 -5 - 21 21 +1.46e+00,-3.91e-01,+1.09e+02,+1.09e+02 2 -16 - 22 21 +3.11e+00,+2.32e-01,+1.46e+02,+1.47e+02 2 -16 - 23 21 -1.09e-01,-1.87e+00,+8.61e+01,+8.61e+01 2 -16 -GenVertex: -4 ID: 0 (X,cT):0 - I: 1 4 -1 -1.01e+00,-1.27e-02,-4.15e+00,+4.27e+00 3 -4 - O: 3 6 -1 +2.54e-02,+8.35e+00,+6.60e-01,+8.37e+00 3 -5 - 24 21 -5.37e-01,-6.68e+00,+4.75e+01,+4.79e+01 2 -16 - 25 21 -7.11e-01,-1.71e+00,+1.08e+01,+1.10e+01 2 -16 -GenVertex: -5 ID: 0 (X,cT):0 - I: 2 5 2 -5.02e+00,+1.15e+00,+1.48e+03,+1.48e+03 3 -5 - 6 -1 +2.54e-02,+8.35e+00,+6.60e-01,+8.37e+00 3 -5 - O: 2 7 22 -4.03e+00,-1.23e+00,+2.46e+02,+2.46e+02 3 -6 - 8 24 -9.67e-01,+1.07e+01,+1.23e+03,+1.24e+03 3 -7 -GenVertex: -6 ID: 0 (X,cT):0 - I: 1 7 22 -4.03e+00,-1.23e+00,+2.46e+02,+2.46e+02 3 -6 - O: 1 9 22 -4.03e+00,-1.23e+00,+2.46e+02,+2.46e+02 1 (nil) -GenVertex: -7 ID: 0 (X,cT):0 - I: 1 8 24 -9.67e-01,+1.07e+01,+1.23e+03,+1.24e+03 3 -7 - O: 1 10 24 -9.67e-01,+1.07e+01,+1.23e+03,+1.24e+03 2 -8 -GenVertex: -8 ID: 0 (X,cT):0 - I: 1 10 24 -9.67e-01,+1.07e+01,+1.23e+03,+1.24e+03 2 -8 - O: 2 11 -13 -2.56e+01,+4.70e+01,+2.09e+02,+2.16e+02 1 (nil) - 12 14 +2.47e+01,-3.63e+01,+1.02e+03,+1.02e+03 1 (nil) -GenVertex: -9 ID: 0 (X,cT):0 - I: 1 13 2214 +1.00e-00,+2.73e-02,-4.08e+03,+4.08e+03 2 -9 - O: 2 29 2212 +1.02e+00,+1.18e-01,-3.74e+03,+3.74e+03 1 (nil) - 30 111 -2.46e-02,-9.09e-02,-3.46e+02,+3.46e+02 2 -20 -GenVertex: -10 ID: 0 (X,cT):0 - I: 2 14 1 +2.31e+00,+5.82e+00,+1.51e+02,+1.51e+02 2 -10 - 15 -1 -2.31e+00,-5.82e+00,+4.62e+01,+4.66e+01 2 -10 - O: 1 31 92 +0.00e+00,+0.00e+00,+1.97e+02,+1.97e+02 2 -11 -GenVertex: -11 ID: 0 (X,cT):0 - I: 1 31 92 +0.00e+00,+0.00e+00,+1.97e+02,+1.97e+02 2 -11 - O: 8 38 -213 -1.18e+00,-2.20e+00,+1.67e+01,+1.70e+01 2 -23 - 39 211 -8.40e-02,-1.67e+00,+1.53e+01,+1.54e+01 1 (nil) - 33 211 +1.83e-01,-2.25e-01,+8.98e+00,+8.99e+00 1 (nil) - 34 -211 +1.65e+00,+3.36e+00,+8.55e+01,+8.56e+01 1 (nil) - 35 221 +1.53e-01,+1.01e-01,+1.68e+01,+1.68e+01 2 -21 - 36 211 -5.43e-01,+7.13e-02,+3.10e+00,+3.15e+00 1 (nil) - 37 221 -4.39e-01,-1.09e+00,+1.62e+01,+1.63e+01 2 -22 - 32 -211 +2.54e-01,+1.65e+00,+3.42e+01,+3.42e+01 1 (nil) -GenVertex: -12 ID: 0 (X,cT):0 - I: 2 16 2 -3.95e+00,-1.33e+00,+3.41e+01,+3.44e+01 2 -12 - 17 -2 +3.95e+00,+1.33e+00,+4.38e+02,+4.38e+02 2 -12 - O: 1 40 92 +0.00e+00,+0.00e+00,+4.72e+02,+4.72e+02 2 -13 -GenVertex: -13 ID: 0 (X,cT):0 - I: 1 40 92 +0.00e+00,+0.00e+00,+4.72e+02,+4.72e+02 2 -13 - O: 8 41 221 -2.68e+00,-7.41e-01,+2.70e+01,+2.71e+01 2 -24 - 43 223 +7.31e-01,-2.42e-01,+2.97e+01,+2.97e+01 2 -25 - 44 -213 +6.83e-02,+2.16e-01,+2.67e+01,+2.67e+01 2 -26 - 42 211 -1.08e+00,-1.77e-01,+8.94e+00,+9.00e+00 1 (nil) - 45 211 -7.62e-02,+3.34e-01,+9.98e+00,+9.98e+00 1 (nil) - 46 223 +1.18e+00,+7.67e-03,+1.59e+02,+1.59e+02 2 -27 - 47 -213 +4.18e-01,+2.70e-01,+5.63e+01,+5.63e+01 2 -28 - 48 111 +1.44e+00,+3.32e-01,+1.54e+02,+1.54e+02 2 -29 -GenVertex: -14 ID: 0 (X,cT):0 - I: 2 18 2 +1.54e+00,+3.04e+00,-6.32e+01,+6.33e+01 2 -14 - 19 -2 -1.54e+00,-3.04e+00,-3.11e+02,+3.11e+02 2 -14 - O: 1 49 92 +0.00e+00,+0.00e+00,-3.75e+02,+3.75e+02 2 -15 -GenVertex: -15 ID: 0 (X,cT):0 - I: 1 49 92 +0.00e+00,+0.00e+00,-3.75e+02,+3.75e+02 2 -15 - O: 3 50 113 +1.57e+00,+2.83e+00,-6.11e+01,+6.12e+01 2 -30 - 51 211 +2.02e-01,+1.20e-01,-2.70e+01,+2.70e+01 1 (nil) - 52 -211 -1.77e+00,-2.95e+00,-2.86e+02,+2.86e+02 1 (nil) -GenVertex: -16 ID: 0 (X,cT):0 - I: 7 20 2101 +7.76e-01,+9.12e-01,+4.45e+03,+4.45e+03 2 -16 - 26 1 +8.08e-03,-1.46e-02,-2.46e+03,+2.46e+03 2 -16 - 21 21 +1.46e+00,-3.91e-01,+1.09e+02,+1.09e+02 2 -16 - 22 21 +3.11e+00,+2.32e-01,+1.46e+02,+1.47e+02 2 -16 - 23 21 -1.09e-01,-1.87e+00,+8.61e+01,+8.61e+01 2 -16 - 24 21 -5.37e-01,-6.68e+00,+4.75e+01,+4.79e+01 2 -16 - 25 21 -7.11e-01,-1.71e+00,+1.08e+01,+1.10e+01 2 -16 - O: 1 53 92 +3.99e+00,-9.52e+00,+2.38e+03,+7.31e+03 2 -17 -GenVertex: -17 ID: 0 (X,cT):0 - I: 1 53 92 +3.99e+00,-9.52e+00,+2.38e+03,+7.31e+03 2 -17 - O:31 54 2212 +8.22e-01,+7.58e-01,+2.86e+03,+2.86e+03 1 (nil) - 55 113 -3.60e-01,-1.69e-01,+8.62e+02,+8.62e+02 2 -31 - 56 -2214 +1.03e+00,+9.30e-02,+4.53e+02,+4.53e+02 2 -32 - 57 223 -3.60e-01,+4.04e-01,+1.25e+02,+1.25e+02 2 -33 - 58 2212 +1.68e+00,-6.25e-01,+1.57e+02,+1.57e+02 1 (nil) - 59 -213 +5.56e-01,+3.45e-01,+9.14e+01,+9.14e+01 2 -34 - 60 -311 +6.88e-02,-2.98e-02,+3.77e+01,+3.77e+01 2 -35 - 61 311 +5.59e-01,-2.32e-01,+5.88e+01,+5.88e+01 2 -36 - 62 211 +3.24e-01,-1.11e+00,+5.03e+01,+5.03e+01 1 (nil) - 63 113 -1.65e-02,-7.81e-02,+4.91e+00,+4.95e+00 2 -37 - 64 -211 +7.06e-01,-6.40e-01,+6.56e+01,+6.56e+01 1 (nil) - 65 213 +4.72e-01,-4.39e-01,+1.44e+01,+1.44e+01 2 -38 - 66 -213 -3.00e-01,-3.82e-01,+1.62e+01,+1.63e+01 2 -39 - 67 211 -4.39e-01,-3.19e+00,+2.48e+01,+2.50e+01 1 (nil) - 68 -211 -1.40e-01,-1.20e-01,+4.92e-01,+5.44e-01 1 (nil) - 69 -311 -2.66e-01,-2.65e+00,+2.07e+01,+2.08e+01 2 -40 - 70 323 +1.09e-01,-8.86e-01,+4.66e+00,+4.83e+00 2 -41 - 71 113 -4.98e-01,-2.28e-01,+1.70e+00,+1.96e+00 2 -42 - 72 -323 -2.90e-01,-2.30e-01,+6.43e-01,+1.16e+00 2 -43 - 73 311 +7.90e-02,-3.23e-02,-8.47e-01,+9.86e-01 2 -44 - 74 113 +1.28e-01,+1.79e-01,-7.07e-01,+1.09e+00 2 -45 - 75 -2112 +2.40e-01,-6.43e-01,-2.35e+00,+2.62e+00 1 (nil) - 76 2112 +1.43e-01,-2.20e-01,-2.23e+00,+2.43e+00 1 (nil) - 77 221 -1.58e-01,+9.23e-01,-1.12e+01,+1.12e+01 2 -46 - 78 211 -3.97e-01,-5.01e-01,-1.11e+00,+1.29e+00 1 (nil) - 79 111 +2.87e-01,+2.82e-01,-1.04e+00,+1.12e+00 2 -47 - 80 223 +4.06e-01,-2.45e-01,-3.51e+01,+3.51e+01 2 -48 - 81 -321 -6.14e-01,+2.77e-01,-2.28e+02,+2.28e+02 1 (nil) - 82 323 +1.26e-01,-3.07e-01,-1.50e+03,+1.50e+03 2 -49 - 83 -321 +1.94e-01,+2.93e-01,-1.69e+02,+1.69e+02 1 (nil) - 84 311 -9.36e-02,-1.11e-01,-5.09e+02,+5.09e+02 2 -50 -GenVertex: -18 ID: 0 (X,cT):0 - I: 2 27 21 -1.37e-01,-5.99e+00,-1.38e+01,+1.51e+01 2 -18 - 28 21 +1.37e-01,+5.99e+00,-6.12e+01,+6.15e+01 2 -18 - O: 1 85 92 +0.00e+00,+0.00e+00,-7.51e+01,+7.66e+01 2 -19 -GenVertex: -19 ID: 0 (X,cT):0 - I: 1 85 92 +0.00e+00,+0.00e+00,-7.51e+01,+7.66e+01 2 -19 - O: 9 86 -2112 -3.84e-02,-2.48e+00,-7.98e+00,+8.41e+00 1 (nil) - 87 2212 +1.88e-01,-2.14e+00,-4.49e+00,+5.07e+00 1 (nil) - 88 -213 +2.00e-01,-1.11e-01,-1.66e+00,+1.83e+00 2 -51 - 89 -313 -6.26e-01,+1.37e+00,-1.29e+01,+1.30e+01 2 -52 - 90 321 +7.89e-02,+7.45e-01,-1.09e+01,+1.10e+01 1 (nil) - 91 -211 +4.23e-02,+3.92e-01,-8.74e+00,+8.75e+00 1 (nil) - 92 211 +6.44e-02,+3.67e-01,-1.38e+00,+1.43e+00 1 (nil) - 93 -2212 +4.16e-02,+5.64e-01,-1.20e+01,+1.20e+01 1 (nil) - 94 2112 +4.92e-02,+1.30e+00,-1.50e+01,+1.51e+01 1 (nil) -Vertex: -20 ID: 0 (X,cT)=-7.43e-06,-2.74e-05,-1.04e-01,+1.04e-01 - I: 1 30 111 -2.46e-02,-9.09e-02,-3.46e+02,+3.46e+02 2 -20 - O: 2 95 22 -4.57e-02,-1.20e-01,-2.72e+02,+2.72e+02 1 (nil) - 96 22 +2.11e-02,+2.92e-02,-7.38e+01,+7.38e+01 1 (nil) -GenVertex: -21 ID: 0 (X,cT):0 - I: 1 35 221 +1.53e-01,+1.01e-01,+1.68e+01,+1.68e+01 2 -21 - O: 3 97 211 +1.91e-01,+1.34e-01,+6.86e+00,+6.86e+00 1 (nil) - 98 -211 -4.99e-02,-5.38e-02,+4.31e+00,+4.31e+00 1 (nil) - 99 111 +1.27e-02,+2.08e-02,+5.61e+00,+5.61e+00 2 -53 -GenVertex: -22 ID: 0 (X,cT):0 - I: 1 37 221 -4.39e-01,-1.09e+00,+1.62e+01,+1.63e+01 2 -22 - O: 3 100 111 +2.02e-02,-1.98e-01,+2.68e+00,+2.69e+00 2 -54 - 101 111 -1.94e-01,-3.08e-01,+5.97e+00,+5.98e+00 2 -55 - 102 111 -2.65e-01,-5.85e-01,+7.55e+00,+7.58e+00 2 -56 -GenVertex: -23 ID: 0 (X,cT):0 - I: 1 38 -213 -1.18e+00,-2.20e+00,+1.67e+01,+1.70e+01 2 -23 - O: 2 103 -211 +5.93e-02,-7.99e-01,+3.99e+00,+4.07e+00 1 (nil) - 104 111 -1.24e+00,-1.40e+00,+1.27e+01,+1.29e+01 2 -57 -GenVertex: -24 ID: 0 (X,cT):0 - I: 1 41 221 -2.68e+00,-7.41e-01,+2.70e+01,+2.71e+01 2 -24 - O: 2 105 22 -6.34e-03,-7.93e-02,+8.01e-01,+8.05e-01 1 (nil) - 106 22 -2.67e+00,-6.61e-01,+2.62e+01,+2.63e+01 1 (nil) -GenVertex: -25 ID: 0 (X,cT):0 - I: 1 43 223 +7.31e-01,-2.42e-01,+2.97e+01,+2.97e+01 2 -25 - O: 3 107 -211 +1.76e-02,+3.37e-02,+3.20e+00,+3.21e+00 1 (nil) - 108 211 +3.94e-01,+9.73e-02,+1.40e+01,+1.40e+01 1 (nil) - 109 111 +3.20e-01,-3.73e-01,+1.25e+01,+1.25e+01 2 -58 -GenVertex: -26 ID: 0 (X,cT):0 - I: 1 44 -213 +6.83e-02,+2.16e-01,+2.67e+01,+2.67e+01 2 -26 - O: 2 110 -211 -8.41e-02,-1.88e-01,+1.75e+01,+1.75e+01 1 (nil) - 111 111 +1.52e-01,+4.04e-01,+9.17e+00,+9.18e+00 2 -59 -GenVertex: -27 ID: 0 (X,cT):0 - I: 1 46 223 +1.18e+00,+7.67e-03,+1.59e+02,+1.59e+02 2 -27 - O: 3 112 -211 +4.71e-01,+6.85e-02,+4.92e+01,+4.92e+01 1 (nil) - 113 211 +5.97e-01,-1.23e-01,+1.01e+02,+1.01e+02 1 (nil) - 114 111 +1.09e-01,+6.20e-02,+9.26e+00,+9.26e+00 2 -60 -GenVertex: -28 ID: 0 (X,cT):0 - I: 1 47 -213 +4.18e-01,+2.70e-01,+5.63e+01,+5.63e+01 2 -28 - O: 2 115 -211 +4.07e-02,+6.55e-03,+6.59e+00,+6.59e+00 1 (nil) - 116 111 +3.77e-01,+2.64e-01,+4.98e+01,+4.98e+01 2 -61 -Vertex: -29 ID: 0 (X,cT)=+3.69e-04,+8.53e-05,+3.95e-02,+3.95e-02 - I: 1 48 111 +1.44e+00,+3.32e-01,+1.54e+02,+1.54e+02 2 -29 - O: 2 117 22 +4.72e-01,+4.59e-02,+5.06e+01,+5.06e+01 1 (nil) - 118 22 +9.67e-01,+2.86e-01,+1.03e+02,+1.03e+02 1 (nil) -GenVertex: -30 ID: 0 (X,cT):0 - I: 1 50 113 +1.57e+00,+2.83e+00,-6.11e+01,+6.12e+01 2 -30 - O: 2 119 -211 +9.16e-01,+2.13e+00,-4.37e+01,+4.38e+01 1 (nil) - 120 211 +6.49e-01,+7.08e-01,-1.74e+01,+1.75e+01 1 (nil) -GenVertex: -31 ID: 0 (X,cT):0 - I: 1 55 113 -3.60e-01,-1.69e-01,+8.62e+02,+8.62e+02 2 -31 - O: 2 121 211 -1.07e-01,+4.26e-02,+1.56e+02,+1.56e+02 1 (nil) - 122 -211 -2.53e-01,-2.12e-01,+7.07e+02,+7.07e+02 1 (nil) -GenVertex: -32 ID: 0 (X,cT):0 - I: 1 56 -2214 +1.03e+00,+9.30e-02,+4.53e+02,+4.53e+02 2 -32 - O: 2 123 -2212 +4.99e-01,+1.49e-01,+3.29e+02,+3.29e+02 1 (nil) - 124 111 +5.28e-01,-5.58e-02,+1.24e+02,+1.24e+02 2 -62 -GenVertex: -33 ID: 0 (X,cT):0 - I: 1 57 223 -3.60e-01,+4.04e-01,+1.25e+02,+1.25e+02 2 -33 - O: 3 125 211 -1.22e-01,+3.51e-01,+3.18e+01,+3.18e+01 1 (nil) - 126 -211 -2.21e-01,+7.11e-02,+8.21e+01,+8.21e+01 1 (nil) - 127 111 -1.66e-02,-1.80e-02,+1.09e+01,+1.09e+01 2 -63 -GenVertex: -34 ID: 0 (X,cT):0 - I: 1 59 -213 +5.56e-01,+3.45e-01,+9.14e+01,+9.14e+01 2 -34 - O: 2 128 -211 +3.11e-01,+3.56e-01,+3.44e+01,+3.44e+01 1 (nil) - 129 111 +2.45e-01,-1.18e-02,+5.70e+01,+5.70e+01 2 -64 -GenVertex: -35 ID: 0 (X,cT):0 - I: 1 60 -311 +6.88e-02,-2.98e-02,+3.77e+01,+3.77e+01 2 -35 - O: 1 130 310 +6.88e-02,-2.98e-02,+3.77e+01,+3.77e+01 2 -65 -GenVertex: -36 ID: 0 (X,cT):0 - I: 1 61 311 +5.59e-01,-2.32e-01,+5.88e+01,+5.88e+01 2 -36 - O: 1 131 130 +5.59e-01,-2.32e-01,+5.88e+01,+5.88e+01 1 (nil) -GenVertex: -37 ID: 0 (X,cT):0 - I: 1 63 113 -1.65e-02,-7.81e-02,+4.91e+00,+4.95e+00 2 -37 - O: 2 132 211 +1.08e-01,-5.14e-02,+4.37e+00,+4.38e+00 1 (nil) - 133 -211 -1.25e-01,-2.68e-02,+5.37e-01,+5.69e-01 1 (nil) -GenVertex: -38 ID: 0 (X,cT):0 - I: 1 65 213 +4.72e-01,-4.39e-01,+1.44e+01,+1.44e+01 2 -38 - O: 2 134 211 +1.82e-01,-5.33e-01,+1.18e+01,+1.18e+01 1 (nil) - 135 111 +2.91e-01,+9.43e-02,+2.56e+00,+2.58e+00 2 -66 -GenVertex: -39 ID: 0 (X,cT):0 - I: 1 66 -213 -3.00e-01,-3.82e-01,+1.62e+01,+1.63e+01 2 -39 - O: 2 136 -211 -4.94e-01,-2.13e-01,+6.74e+00,+6.77e+00 1 (nil) - 137 111 +1.93e-01,-1.69e-01,+9.48e+00,+9.49e+00 2 -67 -GenVertex: -40 ID: 0 (X,cT):0 - I: 1 69 -311 -2.66e-01,-2.65e+00,+2.07e+01,+2.08e+01 2 -40 - O: 1 138 130 -2.66e-01,-2.65e+00,+2.07e+01,+2.08e+01 1 (nil) -GenVertex: -41 ID: 0 (X,cT):0 - I: 1 70 323 +1.09e-01,-8.86e-01,+4.66e+00,+4.83e+00 2 -41 - O: 2 139 311 -4.56e-02,-1.94e-01,+1.85e+00,+1.93e+00 2 -68 - 140 211 +1.54e-01,-6.92e-01,+2.81e+00,+2.90e+00 1 (nil) -GenVertex: -42 ID: 0 (X,cT):0 - I: 1 71 113 -4.98e-01,-2.28e-01,+1.70e+00,+1.96e+00 2 -42 - O: 2 141 211 +7.24e-02,-1.33e-01,+6.29e-02,+2.15e-01 1 (nil) - 142 -211 -5.70e-01,-9.51e-02,+1.64e+00,+1.75e+00 1 (nil) -GenVertex: -43 ID: 0 (X,cT):0 - I: 1 72 -323 -2.90e-01,-2.30e-01,+6.43e-01,+1.16e+00 2 -43 - O: 2 143 -311 -1.02e-01,-3.76e-01,+2.53e-01,+6.81e-01 2 -69 - 144 -211 -1.88e-01,+1.45e-01,+3.90e-01,+4.77e-01 1 (nil) -GenVertex: -44 ID: 0 (X,cT):0 - I: 1 73 311 +7.90e-02,-3.23e-02,-8.47e-01,+9.86e-01 2 -44 - O: 1 145 310 +7.90e-02,-3.23e-02,-8.47e-01,+9.86e-01 2 -70 -GenVertex: -45 ID: 0 (X,cT):0 - I: 1 74 113 +1.28e-01,+1.79e-01,-7.07e-01,+1.09e+00 2 -45 - O: 2 146 -211 -7.31e-02,+3.05e-01,-7.33e-01,+8.10e-01 1 (nil) - 147 211 +2.01e-01,-1.27e-01,+2.56e-02,+2.77e-01 1 (nil) -GenVertex: -46 ID: 0 (X,cT):0 - I: 1 77 221 -1.58e-01,+9.23e-01,-1.12e+01,+1.12e+01 2 -46 - O: 3 148 -211 -1.37e-01,+2.12e-01,-2.48e+00,+2.50e+00 1 (nil) - 149 211 -6.29e-02,+5.66e-01,-6.65e+00,+6.68e+00 1 (nil) - 150 111 +4.20e-02,+1.44e-01,-2.05e+00,+2.06e+00 2 -71 -Vertex: -47 ID: 0 (X,cT)=+2.15e-05,+2.11e-05,-7.77e-05,+8.40e-05 - I: 1 79 111 +2.87e-01,+2.82e-01,-1.04e+00,+1.12e+00 2 -47 - O: 2 151 22 +1.31e-01,+1.64e-01,-6.99e-01,+7.30e-01 1 (nil) - 152 22 +1.57e-01,+1.18e-01,-3.38e-01,+3.91e-01 1 (nil) -GenVertex: -48 ID: 0 (X,cT):0 - I: 1 80 223 +4.06e-01,-2.45e-01,-3.51e+01,+3.51e+01 2 -48 - O: 2 153 -211 -6.79e-02,+2.16e-01,-6.21e+00,+6.22e+00 1 (nil) - 154 211 +4.74e-01,-4.61e-01,-2.89e+01,+2.89e+01 1 (nil) -GenVertex: -49 ID: 0 (X,cT):0 - I: 1 82 323 +1.26e-01,-3.07e-01,-1.50e+03,+1.50e+03 2 -49 - O: 2 155 321 +2.70e-01,-1.79e-01,-6.57e+02,+6.57e+02 1 (nil) - 156 111 -1.45e-01,-1.29e-01,-8.42e+02,+8.42e+02 2 -72 -GenVertex: -50 ID: 0 (X,cT):0 - I: 1 84 311 -9.36e-02,-1.11e-01,-5.09e+02,+5.09e+02 2 -50 - O: 1 157 130 -9.36e-02,-1.11e-01,-5.09e+02,+5.09e+02 1 (nil) -GenVertex: -51 ID: 0 (X,cT):0 - I: 1 88 -213 +2.00e-01,-1.11e-01,-1.66e+00,+1.83e+00 2 -51 - O: 2 158 -211 -1.33e-01,-2.94e-01,-9.51e-01,+1.01e+00 1 (nil) - 159 111 +3.33e-01,+1.83e-01,-7.05e-01,+8.13e-01 2 -73 -GenVertex: -52 ID: 0 (X,cT):0 - I: 1 89 -313 -6.26e-01,+1.37e+00,-1.29e+01,+1.30e+01 2 -52 - O: 2 160 -311 -2.82e-02,+5.68e-01,-5.71e+00,+5.76e+00 2 -74 - 161 111 -5.98e-01,+7.99e-01,-7.16e+00,+7.23e+00 2 -75 -Vertex: -53 ID: 0 (X,cT)=+6.33e-07,+1.04e-06,+2.79e-04,+2.79e-04 - I: 1 99 111 +1.27e-02,+2.08e-02,+5.61e+00,+5.61e+00 2 -53 - O: 2 162 22 +5.81e-02,+5.34e-02,+3.78e+00,+3.78e+00 1 (nil) - 163 22 -4.54e-02,-3.26e-02,+1.83e+00,+1.83e+00 1 (nil) -Vertex: -54 ID: 0 (X,cT)=+3.79e-06,-3.71e-05,+5.03e-04,+5.05e-04 - I: 1 100 111 +2.02e-02,-1.98e-01,+2.68e+00,+2.69e+00 2 -54 - O: 2 164 22 +2.39e-02,-9.50e-02,+2.06e+00,+2.06e+00 1 (nil) - 165 22 -3.65e-03,-1.03e-01,+6.27e-01,+6.35e-01 1 (nil) -Vertex: -55 ID: 0 (X,cT)=-2.82e-05,-4.46e-05,+8.64e-04,+8.66e-04 - I: 1 101 111 -1.94e-01,-3.08e-01,+5.97e+00,+5.98e+00 2 -55 - O: 2 166 22 -2.13e-01,-2.53e-01,+5.08e+00,+5.10e+00 1 (nil) - 167 22 +1.82e-02,-5.48e-02,+8.85e-01,+8.87e-01 1 (nil) -Vertex: -56 ID: 0 (X,cT)=-1.01e-04,-2.22e-04,+2.87e-03,+2.88e-03 - I: 1 102 111 -2.65e-01,-5.85e-01,+7.55e+00,+7.58e+00 2 -56 - O: 2 168 22 -2.34e-01,-3.64e-01,+4.90e+00,+4.92e+00 1 (nil) - 169 22 -3.04e-02,-2.21e-01,+2.65e+00,+2.66e+00 1 (nil) -Vertex: -57 ID: 0 (X,cT)=-2.73e-04,-3.09e-04,+2.81e-03,+2.84e-03 - I: 1 104 111 -1.24e+00,-1.40e+00,+1.27e+01,+1.29e+01 2 -57 - O: 2 170 22 -1.22e-02,-1.70e-02,+7.27e-02,+7.56e-02 1 (nil) - 171 22 -1.22e+00,-1.38e+00,+1.27e+01,+1.28e+01 1 (nil) -Vertex: -58 ID: 0 (X,cT)=+7.51e-05,-8.77e-05,+2.93e-03,+2.94e-03 - I: 1 109 111 +3.20e-01,-3.73e-01,+1.25e+01,+1.25e+01 2 -58 - O: 2 172 22 +3.26e-01,-3.46e-01,+1.21e+01,+1.21e+01 1 (nil) - 173 22 -6.46e-03,-2.66e-02,+3.50e-01,+3.51e-01 1 (nil) -Vertex: -59 ID: 0 (X,cT)=+1.45e-06,+3.84e-06,+8.70e-05,+8.71e-05 - I: 1 111 111 +1.52e-01,+4.04e-01,+9.17e+00,+9.18e+00 2 -59 - O: 2 174 22 -2.15e-02,+1.49e-02,+4.86e-01,+4.86e-01 1 (nil) - 175 22 +1.74e-01,+3.89e-01,+8.68e+00,+8.69e+00 1 (nil) -Vertex: -60 ID: 0 (X,cT)=+1.34e-05,+7.65e-06,+1.14e-03,+1.14e-03 - I: 1 114 111 +1.09e-01,+6.20e-02,+9.26e+00,+9.26e+00 2 -60 - O: 2 176 22 -1.64e-02,+4.04e-02,+4.24e+00,+4.24e+00 1 (nil) - 177 22 +1.25e-01,+2.17e-02,+5.02e+00,+5.02e+00 1 (nil) -Vertex: -61 ID: 0 (X,cT)=+1.85e-05,+1.29e-05,+2.43e-03,+2.43e-03 - I: 1 116 111 +3.77e-01,+2.64e-01,+4.98e+01,+4.98e+01 2 -61 - O: 2 178 22 +1.08e-01,+2.89e-02,+7.90e+00,+7.91e+00 1 (nil) - 179 22 +2.70e-01,+2.35e-01,+4.19e+01,+4.19e+01 1 (nil) -Vertex: -62 ID: 0 (X,cT)=+5.58e-05,-5.89e-06,+1.31e-02,+1.31e-02 - I: 1 124 111 +5.28e-01,-5.58e-02,+1.24e+02,+1.24e+02 2 -62 - O: 2 180 22 +2.10e-01,+4.29e-02,+4.58e+01,+4.58e+01 1 (nil) - 181 22 +3.18e-01,-9.86e-02,+7.82e+01,+7.82e+01 1 (nil) -Vertex: -63 ID: 0 (X,cT)=-7.71e-06,-8.34e-06,+5.03e-03,+5.03e-03 - I: 1 127 111 -1.66e-02,-1.80e-02,+1.09e+01,+1.09e+01 2 -63 - O: 2 182 22 -6.61e-02,-4.57e-02,+6.07e+00,+6.07e+00 1 (nil) - 183 22 +4.94e-02,+2.77e-02,+4.78e+00,+4.78e+00 1 (nil) -Vertex: -64 ID: 0 (X,cT)=+1.66e-05,-7.99e-07,+3.86e-03,+3.86e-03 - I: 1 129 111 +2.45e-01,-1.18e-02,+5.70e+01,+5.70e+01 2 -64 - O: 2 184 22 +1.69e-01,+5.36e-02,+3.26e+01,+3.26e+01 1 (nil) - 185 22 +7.62e-02,-6.54e-02,+2.44e+01,+2.44e+01 1 (nil) -Vertex: -65 ID: 0 (X,cT)=+7.56e+00,-3.28e+00,+4.14e+03,+4.14e+03 - I: 1 130 310 +6.88e-02,-2.98e-02,+3.77e+01,+3.77e+01 2 -65 - O: 2 186 211 +1.58e-01,-6.43e-02,+3.22e+01,+3.22e+01 1 (nil) - 187 -211 -8.94e-02,+3.44e-02,+5.50e+00,+5.50e+00 1 (nil) -Vertex: -66 ID: 0 (X,cT)=+2.53e-06,+8.21e-07,+2.23e-05,+2.25e-05 - I: 1 135 111 +2.91e-01,+9.43e-02,+2.56e+00,+2.58e+00 2 -66 - O: 2 188 22 +1.27e-02,-2.62e-02,+3.17e-01,+3.18e-01 1 (nil) - 189 22 +2.78e-01,+1.20e-01,+2.24e+00,+2.26e+00 1 (nil) -Vertex: -67 ID: 0 (X,cT)=+1.37e-04,-1.19e-04,+6.70e-03,+6.70e-03 - I: 1 137 111 +1.93e-01,-1.69e-01,+9.48e+00,+9.49e+00 2 -67 - O: 2 190 22 +3.61e-04,+4.27e-04,-3.17e-04,+6.42e-04 1 (nil) - 191 22 +1.93e-01,-1.69e-01,+9.49e+00,+9.49e+00 1 (nil) -GenVertex: -68 ID: 0 (X,cT):0 - I: 1 139 311 -4.56e-02,-1.94e-01,+1.85e+00,+1.93e+00 2 -68 - O: 1 192 310 -4.56e-02,-1.94e-01,+1.85e+00,+1.93e+00 2 -76 -GenVertex: -69 ID: 0 (X,cT):0 - I: 1 143 -311 -1.02e-01,-3.76e-01,+2.53e-01,+6.81e-01 2 -69 - O: 1 193 310 -1.02e-01,-3.76e-01,+2.53e-01,+6.81e-01 2 -77 -Vertex: -70 ID: 0 (X,cT)=+5.44e+00,-2.22e+00,-5.83e+01,+6.79e+01 - I: 1 145 310 +7.90e-02,-3.23e-02,-8.47e-01,+9.86e-01 2 -70 - O: 2 194 211 +3.78e-02,+1.72e-01,-5.70e-01,+6.12e-01 1 (nil) - 195 -211 +4.12e-02,-2.04e-01,-2.77e-01,+3.74e-01 1 (nil) -Vertex: -71 ID: 0 (X,cT)=+8.77e-06,+3.01e-05,-4.27e-04,+4.30e-04 - I: 1 150 111 +4.20e-02,+1.44e-01,-2.05e+00,+2.06e+00 2 -71 - O: 2 196 22 +2.27e-02,+1.42e-01,-1.05e+00,+1.06e+00 1 (nil) - 197 22 +1.93e-02,+2.42e-03,-9.95e-01,+9.95e-01 1 (nil) -Vertex: -72 ID: 0 (X,cT)=-6.15e-05,-5.48e-05,-3.58e-01,+3.58e-01 - I: 1 156 111 -1.45e-01,-1.29e-01,-8.42e+02,+8.42e+02 2 -72 - O: 2 198 22 -1.62e-01,-1.30e-01,-6.73e+02,+6.73e+02 1 (nil) - 199 22 +1.77e-02,+1.35e-03,-1.69e+02,+1.69e+02 1 (nil) -Vertex: -73 ID: 0 (X,cT)=+1.59e-06,+8.76e-07,-3.37e-06,+3.89e-06 - I: 1 159 111 +3.33e-01,+1.83e-01,-7.05e-01,+8.13e-01 2 -73 - O: 2 200 22 +1.34e-01,+3.84e-02,-1.48e-01,+2.03e-01 1 (nil) - 201 22 +1.99e-01,+1.45e-01,-5.58e-01,+6.10e-01 1 (nil) -GenVertex: -74 ID: 0 (X,cT):0 - I: 1 160 -311 -2.82e-02,+5.68e-01,-5.71e+00,+5.76e+00 2 -74 - O: 1 202 310 -2.82e-02,+5.68e-01,-5.71e+00,+5.76e+00 2 -78 -Vertex: -75 ID: 0 (X,cT)=-2.71e-05,+3.62e-05,-3.25e-04,+3.28e-04 - I: 1 161 111 -5.98e-01,+7.99e-01,-7.16e+00,+7.23e+00 2 -75 - O: 2 203 22 -4.61e-01,+6.62e-01,-6.07e+00,+6.13e+00 1 (nil) - 204 22 -1.37e-01,+1.37e-01,-1.09e+00,+1.10e+00 1 (nil) -Vertex: -76 ID: 0 (X,cT)=-2.44e+00,-1.04e+01,+9.94e+01,+1.04e+02 - I: 1 192 310 -4.56e-02,-1.94e-01,+1.85e+00,+1.93e+00 2 -76 - O: 2 205 -211 -6.12e-02,+7.90e-02,+2.98e-01,+3.44e-01 1 (nil) - 206 211 +1.56e-02,-2.73e-01,+1.56e+00,+1.59e+00 1 (nil) -Vertex: -77 ID: 0 (X,cT)=-1.49e+01,-5.46e+01,+3.68e+01,+9.90e+01 - I: 1 193 310 -1.02e-01,-3.76e-01,+2.53e-01,+6.81e-01 2 -77 - O: 2 207 -211 -2.41e-01,-3.27e-01,+1.77e-01,+4.65e-01 1 (nil) - 208 211 +1.38e-01,-4.84e-02,+7.57e-02,+2.16e-01 1 (nil) -Vertex: -78 ID: 0 (X,cT)=-1.33e-01,+2.68e+00,-2.69e+01,+2.71e+01 - I: 1 202 310 -2.82e-02,+5.68e-01,-5.71e+00,+5.76e+00 2 -78 - O: 2 209 211 +5.42e-02,+4.89e-01,-5.04e+00,+5.07e+00 1 (nil) - 210 -211 -8.24e-02,+7.87e-02,-6.67e-01,+6.91e-01 1 (nil) -________________________________________________________________________________ -Stage 0->1 : 0 hits found in the muon chamber. -++++++++ event aborted ->>> Event 0 - 0 hits are stored in ExN04TrackerHitsCollection. - 0 hits are stored in ExN04CalorimeterHitsCollection. - Total energy deposition in calorimeter : 0 (GeV) - 0 hits are stored in ExN04MuonHitsCollection. -________________________________________________________________________________ -GenEvent: #2 ID=20 SignalProcessGenVertex Barcode: 0 - Current Memory Usage: 1 events, 224 vertices, 624 particles. - Entries this event: 224 vertices, 624 particles. - RndmState(0)= - Wgts(0)= - EventScale -1 GeV alphaQCD=-1 alphaQED=-1 - GenParticle Legend - Barcode PDG ID ( Px, Py, Pz, E ) Stat DecayVtx -________________________________________________________________________________ -GenVertex: -1 ID: 0 (X,cT):0 - I: 1 1 2212 +0.00e+00,+0.00e+00,+7.00e+03,+7.00e+03 3 -1 - O: 3 3 21 +2.24e-03,-3.47e-01,+8.58e+00,+8.58e+00 3 -3 - 41 2203 +1.57e-01,+9.19e-02,+4.12e+03,+4.12e+03 2 -13 - 13 1 -1.60e-01,+2.55e-01,+4.51e+02,+4.51e+02 2 -9 -GenVertex: -2 ID: 0 (X,cT):0 - I: 1 2 2212 +0.00e+00,+0.00e+00,-7.00e+03,+7.00e+03 3 -2 - O: 2 4 1 +1.81e-01,-9.21e-01,-1.91e+03,+1.91e+03 3 -4 - 39 2203 -1.81e-01,+9.21e-01,-4.33e+03,+4.33e+03 2 -11 -GenVertex: -3 ID: 0 (X,cT):0 - I: 1 3 21 +2.24e-03,-3.47e-01,+8.58e+00,+8.58e+00 3 -3 - O: 8 14 4 +1.07e+01,-5.18e+00,-2.71e+01,+2.96e+01 2 -11 - 12 21 +1.85e+00,+6.48e+00,-3.61e+01,+3.67e+01 2 -9 - 17 21 -3.76e-02,-1.65e-01,-9.73e-01,+9.88e-01 2 -11 - 40 2 -5.76e-01,-2.17e+00,+2.82e+00,+3.62e+00 2 -13 - 15 21 +3.52e-01,-6.45e-01,-1.11e+00,+1.33e+00 2 -11 - 16 21 +3.32e-02,+9.61e-02,-6.60e-02,+1.21e-01 2 -11 - 11 -4 +1.95e+00,-1.06e+00,-8.18e+00,+8.61e+00 2 -9 - 5 -2 -1.22e+01,+1.16e+00,-1.11e+01,+1.65e+01 3 -5 -GenVertex: -4 ID: 0 (X,cT):0 - I: 1 4 1 +1.81e-01,-9.21e-01,-1.91e+03,+1.91e+03 3 -4 - O:12 35 21 -3.17e+00,-1.74e+00,-8.38e+01,+8.39e+01 2 -11 - 36 21 -3.72e-01,-3.53e+00,-1.09e+02,+1.09e+02 2 -11 - 37 21 -3.12e-01,+2.46e-01,-7.86e+01,+7.86e+01 2 -11 - 38 21 +2.18e+00,-6.98e-01,-1.55e+02,+1.55e+02 2 -11 - 6 1 -1.04e+01,-7.53e+00,-8.52e+02,+8.53e+02 3 -5 - 28 21 +8.30e-01,+1.28e+00,-3.84e+01,+3.84e+01 2 -11 - 29 21 +1.45e+00,+3.41e+00,-3.48e+01,+3.50e+01 2 -11 - 31 21 +7.05e+00,+5.30e+00,-7.09e+01,+7.14e+01 2 -11 - 32 21 +6.43e-05,-2.87e-01,-2.01e+00,+2.03e+00 2 -11 - 33 21 -2.01e+00,+1.84e-01,-1.00e+02,+1.00e+02 2 -11 - 34 21 -1.92e+00,-1.52e+00,-2.29e+02,+2.29e+02 2 -11 - 30 21 +4.75e+00,+5.08e+00,-7.07e+01,+7.11e+01 2 -11 -GenVertex: -5 ID: 0 (X,cT):0 - I: 2 6 1 -1.04e+01,-7.53e+00,-8.52e+02,+8.53e+02 3 -5 - 5 -2 -1.22e+01,+1.16e+00,-1.11e+01,+1.65e+01 3 -5 - O: 2 7 22 -1.33e+01,-8.08e+00,-1.04e+02,+1.05e+02 3 -6 - 8 -24 -9.28e+00,+1.71e+00,-7.59e+02,+7.64e+02 3 -7 -GenVertex: -6 ID: 0 (X,cT):0 - I: 1 7 22 -1.33e+01,-8.08e+00,-1.04e+02,+1.05e+02 3 -6 - O: 1 9 22 -1.33e+01,-8.08e+00,-1.04e+02,+1.05e+02 1 (nil) -GenVertex: -7 ID: 0 (X,cT):0 - I: 1 8 -24 -9.28e+00,+1.71e+00,-7.59e+02,+7.64e+02 3 -7 - O: 1 10 -24 -9.28e+00,+1.71e+00,-7.59e+02,+7.64e+02 2 -8 -GenVertex: -8 ID: 0 (X,cT):0 - I: 1 10 -24 -9.28e+00,+1.71e+00,-7.59e+02,+7.64e+02 2 -8 - O: 6 43 21 -1.27e+00,-7.35e-02,-1.13e+01,+1.14e+01 2 -15 - 46 21 +2.59e+00,-1.54e+00,-4.01e+01,+4.02e+01 2 -15 - 42 -4 -3.64e+01,+2.35e+01,-3.49e+02,+3.52e+02 2 -15 - 44 21 -4.16e-02,-2.47e-01,-1.97e+00,+1.98e+00 2 -15 - 45 21 +9.29e-01,-5.25e-01,-8.27e+00,+8.34e+00 2 -15 - 47 3 +2.49e+01,-1.94e+01,-3.48e+02,+3.50e+02 2 -15 -GenVertex: -9 ID: 0 (X,cT):0 - I: 3 12 21 +1.85e+00,+6.48e+00,-3.61e+01,+3.67e+01 2 -9 - 11 -4 +1.95e+00,-1.06e+00,-8.18e+00,+8.61e+00 2 -9 - 13 1 -1.60e-01,+2.55e-01,+4.51e+02,+4.51e+02 2 -9 - O: 1 52 92 +3.65e+00,+5.68e+00,+4.07e+02,+4.96e+02 2 -10 -GenVertex: -10 ID: 0 (X,cT):0 - I: 1 52 92 +3.65e+00,+5.68e+00,+4.07e+02,+4.96e+02 2 -10 - O:17 68 113 -9.06e-02,+1.63e-01,+1.67e+02,+1.67e+02 2 -35 - 69 221 +1.73e-01,+4.07e-01,+2.06e+02,+2.06e+02 2 -36 - 56 113 +3.14e-01,+1.06e+00,-3.82e+00,+4.04e+00 2 -24 - 57 223 +8.27e-03,+4.69e-01,-5.55e+00,+5.62e+00 2 -25 - 58 213 +1.90e-01,+8.19e-01,-3.63e+00,+3.80e+00 2 -26 - 59 223 +4.76e-01,+3.30e-01,-1.30e+00,+1.62e+00 2 -27 - 60 -323 -1.01e-01,+5.65e-03,+1.73e-01,+8.22e-01 2 -28 - 61 313 -7.71e-02,+3.71e-01,+6.58e-01,+1.14e+00 2 -29 - 62 213 -3.58e-01,-1.85e-01,+2.02e-01,+7.59e-01 2 -30 - 63 221 +5.37e-01,+2.24e-01,+7.68e+00,+7.72e+00 2 -31 - 65 211 -9.70e-03,-2.00e-01,+9.73e-01,+1.00e+00 1 (nil) - 66 -213 +3.60e-01,-1.91e-02,+2.45e+01,+2.45e+01 2 -33 - 67 113 -3.73e-01,+1.18e-02,+3.83e+01,+3.84e+01 2 -34 - 54 -323 +5.03e-01,+1.51e+00,-6.41e+00,+6.67e+00 2 -22 - 55 313 +6.48e-01,+1.70e+00,-1.25e+01,+1.27e+01 2 -23 - 53 -423 +1.80e+00,-7.41e-01,-9.90e+00,+1.03e+01 2 -21 - 64 -213 -3.57e-01,-2.47e-01,+4.39e+00,+4.44e+00 2 -32 -GenVertex: -11 ID: 0 (X,cT):0 - I:26 35 21 -3.17e+00,-1.74e+00,-8.38e+01,+8.39e+01 2 -11 - 36 21 -3.72e-01,-3.53e+00,-1.09e+02,+1.09e+02 2 -11 - 37 21 -3.12e-01,+2.46e-01,-7.86e+01,+7.86e+01 2 -11 - 38 21 +2.18e+00,-6.98e-01,-1.55e+02,+1.55e+02 2 -11 - 28 21 +8.30e-01,+1.28e+00,-3.84e+01,+3.84e+01 2 -11 - 29 21 +1.45e+00,+3.41e+00,-3.48e+01,+3.50e+01 2 -11 - 31 21 +7.05e+00,+5.30e+00,-7.09e+01,+7.14e+01 2 -11 - 14 4 +1.07e+01,-5.18e+00,-2.71e+01,+2.96e+01 2 -11 - 17 21 -3.76e-02,-1.65e-01,-9.73e-01,+9.88e-01 2 -11 - 32 21 +6.43e-05,-2.87e-01,-2.01e+00,+2.03e+00 2 -11 - 33 21 -2.01e+00,+1.84e-01,-1.00e+02,+1.00e+02 2 -11 - 34 21 -1.92e+00,-1.52e+00,-2.29e+02,+2.29e+02 2 -11 - 18 21 -3.89e+00,-1.90e+00,+4.34e+01,+4.36e+01 2 -11 - 19 21 -3.91e+00,+3.13e+00,+7.89e+02,+7.89e+02 2 -11 - 20 21 +3.89e+00,+1.90e+00,+1.42e+03,+1.42e+03 2 -11 - 21 21 +4.37e+00,+6.72e+00,+8.31e+01,+8.35e+01 2 -11 - 22 21 +3.91e+00,-3.13e+00,+3.66e+01,+3.69e+01 2 -11 - 23 21 -1.76e+00,-3.29e+00,+9.66e+00,+1.04e+01 2 -11 - 24 21 -4.37e+00,-6.72e+00,+8.76e-01,+8.07e+00 2 -11 - 26 21 +1.76e+00,+3.29e+00,-4.65e+00,+5.96e+00 2 -11 - 27 21 +2.35e+00,+1.77e+00,-7.28e+02,+7.28e+02 2 -11 - 25 21 -2.35e+00,-1.77e+00,-4.88e+00,+5.70e+00 2 -11 - 15 21 +3.52e-01,-6.45e-01,-1.11e+00,+1.33e+00 2 -11 - 16 21 +3.32e-02,+9.61e-02,-6.60e-02,+1.21e-01 2 -11 - 30 21 +4.75e+00,+5.08e+00,-7.07e+01,+7.11e+01 2 -11 - 39 2203 -1.81e-01,+9.21e-01,-4.33e+03,+4.33e+03 2 -11 - O: 1 70 92 +1.93e+01,+2.76e+00,-3.69e+03,+8.47e+03 2 -12 -GenVertex: -12 ID: 0 (X,cT):0 - I: 1 70 92 +1.93e+01,+2.76e+00,-3.69e+03,+8.47e+03 2 -12 - O:90 157 211 +7.13e-01,-3.28e-01,-1.35e+02,+1.35e+02 1 (nil) - 158 113 -8.56e-01,+4.51e-01,-3.86e+02,+3.86e+02 2 -101 - 159 -211 +8.50e-01,-2.44e-01,-2.40e+03,+2.40e+03 1 (nil) - 160 2224 -1.90e-03,+7.51e-01,-1.39e+03,+1.39e+03 2 -102 - 72 213 +1.08e+00,-6.60e-01,-2.31e+00,+2.70e+00 2 -38 - 73 331 +8.84e-01,-9.17e-01,-1.33e+00,+2.07e+00 2 -39 - 74 -213 +1.67e+00,-6.02e-01,-4.33e+00,+4.71e+00 2 -40 - 75 111 -2.29e-01,-5.45e-02,-1.11e+00,+1.15e+00 2 -41 - 76 211 +1.91e-01,-3.77e-01,+3.30e-01,+5.54e-01 1 (nil) - 77 -211 +2.15e-01,+4.10e-01,+1.16e-01,+4.98e-01 1 (nil) - 78 211 +1.18e-01,-7.30e-01,-1.31e+00,+1.51e+00 1 (nil) - 79 3112 -1.25e-01,-5.92e-02,+4.02e+00,+4.19e+00 2 -42 - 80 311 -1.08e-01,-3.01e-02,+1.70e+00,+1.77e+00 2 -43 - 81 -1114 -5.93e-01,-4.62e-01,+7.53e+00,+7.69e+00 2 -44 - 82 -211 -3.95e-01,+3.08e-01,+9.39e+00,+9.40e+00 1 (nil) - 83 211 -3.13e-01,-7.22e-01,+8.53e+00,+8.56e+00 1 (nil) - 84 -213 -1.27e-01,-1.01e-01,+5.15e+00,+5.19e+00 2 -45 - 85 213 -1.20e+00,-1.22e-01,+2.34e+01,+2.35e+01 2 -46 - 86 223 -7.42e-02,+1.42e-01,+1.52e+01,+1.52e+01 2 -47 - 87 -213 -9.01e-01,-6.04e-01,+2.49e+01,+2.49e+01 2 -48 - 88 323 -3.96e-01,+4.77e-01,+8.35e+01,+8.35e+01 2 -49 - 89 -313 -1.18e+00,+4.38e-01,+2.34e+02,+2.34e+02 2 -50 - 90 111 -2.10e-02,+1.47e-01,+2.20e+01,+2.20e+01 2 -51 - 71 423 +6.74e+00,-3.13e+00,-1.81e+01,+1.96e+01 2 -37 - 91 -213 -1.47e+00,+1.82e+00,+3.92e+02,+3.92e+02 2 -52 - 92 213 +1.75e+00,+1.50e+00,+6.91e+02,+6.91e+02 2 -53 - 93 -211 -8.94e-02,-3.08e-01,+1.41e+02,+1.41e+02 1 (nil) - 94 111 +7.06e-01,+3.83e-01,+1.68e+02,+1.68e+02 2 -54 - 95 223 +1.83e-01,+6.58e-01,+2.64e+02,+2.64e+02 2 -55 - 96 113 +1.17e+00,-6.49e-01,+1.09e+02,+1.09e+02 2 -56 - 97 213 -3.59e-02,+9.92e-01,+3.73e+01,+3.74e+01 2 -57 - 98 221 +4.22e-01,+3.30e-01,+8.56e+00,+8.60e+00 2 -58 - 100 111 +1.28e+00,+5.91e-01,+1.83e+01,+1.84e+01 2 -60 - 101 331 +1.59e+00,+2.22e+00,+3.03e+01,+3.04e+01 2 -61 - 102 213 +1.77e+00,-1.58e+00,+1.71e+01,+1.73e+01 2 -62 - 103 -211 -1.88e-01,-1.28e-01,+3.87e+00,+3.88e+00 1 (nil) - 104 211 +6.95e-01,-7.43e-02,+2.83e+00,+2.91e+00 1 (nil) - 105 311 +6.37e-01,-2.90e-01,+6.13e+00,+6.19e+00 2 -63 - 106 333 +8.72e-02,-2.03e+00,+7.62e+00,+7.95e+00 2 -64 - 107 -323 -1.98e-01,-1.55e-01,+2.64e+00,+2.79e+00 2 -65 - 108 113 -1.10e+00,-1.90e+00,+5.32e+00,+5.81e+00 2 -66 - 109 213 -7.23e-01,-7.70e-01,+6.13e-01,+1.63e+00 2 -67 - 110 -211 -4.35e-01,-8.15e-01,+1.78e-01,+9.51e-01 1 (nil) - 111 213 -5.97e-01,-1.22e+00,+2.67e-01,+1.55e+00 2 -68 - 112 -211 -1.43e+00,-1.65e+00,+4.83e-01,+2.24e+00 1 (nil) - 113 111 +4.36e-02,-2.43e-01,+6.27e-02,+2.89e-01 2 -69 - 129 -211 -4.91e-02,+3.02e-01,-5.27e+01,+5.27e+01 1 (nil) - 155 -321 +3.69e-01,-3.68e-01,-5.25e+01,+5.25e+01 1 (nil) - 156 221 -4.10e-01,-2.74e-01,-4.88e+01,+4.88e+01 2 -100 - 116 321 +3.64e-01,+4.39e-01,+9.92e-02,+7.61e-01 1 (nil) - 117 -321 -1.27e-01,-1.02e+00,-1.45e+00,+1.85e+00 1 (nil) - 118 211 -2.01e-01,+3.58e-01,-1.79e+00,+1.84e+00 1 (nil) - 119 311 -2.88e-01,+7.23e-01,-1.33e+00,+1.62e+00 2 -72 - 120 -321 +1.03e-01,-1.31e-01,-8.45e-01,+9.93e-01 1 (nil) - 121 113 -2.01e-02,+9.67e-01,-2.76e+00,+3.05e+00 2 -73 - 122 213 +6.99e-01,+4.88e-01,-2.14e+00,+2.37e+00 2 -74 - 123 223 +1.59e-01,-2.33e-01,-7.42e+00,+7.46e+00 2 -75 - 124 223 -3.07e-01,+5.68e-01,-1.77e+01,+1.77e+01 2 -76 - 125 1114 +7.70e-01,-3.47e-01,-1.94e+02,+1.94e+02 2 -77 - 126 111 +6.52e-01,+1.56e+00,-1.11e+02,+1.11e+02 2 -78 - 127 -2112 +1.08e-01,+9.33e-02,-7.63e+01,+7.63e+01 1 (nil) - 128 211 +3.93e-01,-4.83e-01,-5.97e+01,+5.97e+01 1 (nil) - 130 113 +7.74e-01,+8.64e-01,-8.89e+01,+8.89e+01 2 -79 - 131 223 +1.70e-02,+2.83e-01,-9.69e+01,+9.69e+01 2 -80 - 132 223 +3.02e-01,+2.43e-01,-3.21e+01,+3.21e+01 2 -81 - 133 221 +6.52e-01,-1.30e-02,-7.49e+00,+7.53e+00 2 -82 - 134 213 +1.25e+00,+2.45e+00,-3.91e+01,+3.93e+01 2 -83 - 135 221 +8.86e-01,+9.16e-01,-1.24e+01,+1.25e+01 2 -84 - 136 -211 +1.82e+00,+1.89e+00,-2.77e+01,+2.78e+01 1 (nil) - 137 111 +7.22e-01,+1.16e+00,-1.29e+01,+1.29e+01 2 -85 - 138 113 +1.21e+00,+1.68e+00,-1.89e+01,+1.90e+01 2 -86 - 139 211 +1.12e+00,+5.04e-01,-1.16e+01,+1.17e+01 1 (nil) - 140 -213 +4.58e-01,+1.15e+00,-1.84e+01,+1.85e+01 2 -87 - 141 213 +2.08e+00,+1.68e+00,-2.61e+01,+2.63e+01 2 -88 - 142 313 +1.78e+00,+1.24e+00,-2.26e+01,+2.27e+01 2 -89 - 143 -313 +1.42e+00,+6.47e-01,-1.81e+01,+1.82e+01 2 -90 - 144 2112 -1.12e+00,+5.37e-01,-5.10e+01,+5.10e+01 1 (nil) - 145 -213 -5.75e-01,-4.78e-01,-9.45e+01,+9.45e+01 2 -91 - 146 -1114 -8.04e-01,-7.43e-01,-3.40e+01,+3.40e+01 2 -92 - 147 -213 -1.80e-01,+6.29e-02,-4.32e+01,+4.32e+01 2 -93 - 148 211 -1.19e+00,-2.34e-01,-3.93e+01,+3.93e+01 1 (nil) - 149 311 -1.41e+00,-2.18e+00,-7.90e+01,+7.90e+01 2 -94 - 150 -323 -3.04e-01,-3.92e-01,-7.88e+01,+7.88e+01 2 -95 - 151 213 -1.80e+00,-1.21e+00,-8.93e+01,+8.94e+01 2 -96 - 152 113 +4.91e-01,-9.72e-01,-5.04e+01,+5.05e+01 2 -97 - 153 221 +2.67e-01,-2.61e-01,-2.16e+01,+2.16e+01 2 -98 - 154 311 +4.13e-01,+1.80e-01,-8.91e+01,+8.91e+01 2 -99 - 99 -213 +9.75e-01,+2.54e+00,+3.20e+01,+3.22e+01 2 -59 - 114 213 -1.15e+00,-1.72e+00,-2.01e+00,+2.97e+00 2 -70 - 115 -213 -9.95e-01,-3.87e-01,-1.11e+00,+1.63e+00 2 -71 -GenVertex: -13 ID: 0 (X,cT):0 - I: 2 40 2 -5.76e-01,-2.17e+00,+2.82e+00,+3.62e+00 2 -13 - 41 2203 +1.57e-01,+9.19e-02,+4.12e+03,+4.12e+03 2 -13 - O: 1 161 92 -4.19e-01,-2.08e+00,+4.13e+03,+4.13e+03 2 -14 -GenVertex: -14 ID: 0 (X,cT):0 - I: 1 161 92 -4.19e-01,-2.08e+00,+4.13e+03,+4.13e+03 2 -14 - O:14 162 211 -3.13e-01,-1.66e+00,+2.96e+00,+3.41e+00 1 (nil) - 163 223 -1.35e-02,+1.05e-01,+2.90e+00,+3.01e+00 2 -103 - 164 -213 -7.67e-02,-1.58e-01,+2.83e+00,+2.94e+00 2 -104 - 167 331 +7.92e-02,-2.14e-01,+1.65e+01,+1.65e+01 2 -107 - 168 211 +1.55e-01,-4.55e-02,+2.09e+01,+2.09e+01 1 (nil) - 169 113 -9.07e-02,+1.70e-01,+7.69e+00,+7.71e+00 2 -108 - 170 -211 +1.96e-02,-3.42e-02,+4.36e+00,+4.36e+00 1 (nil) - 171 211 +1.50e-01,-7.36e-02,+6.14e+01,+6.14e+01 1 (nil) - 172 313 -9.79e-02,+5.68e-01,+7.20e+01,+7.20e+01 2 -109 - 173 -313 -1.30e-01,-7.96e-01,+2.37e+02,+2.37e+02 2 -110 - 174 2112 +5.28e-01,-1.88e-01,+1.06e+03,+1.06e+03 1 (nil) - 175 211 -3.22e-01,+5.25e-01,+2.61e+03,+2.61e+03 1 (nil) - 165 113 -3.96e-01,-2.46e-01,+7.66e+00,+7.72e+00 2 -105 - 166 223 +8.97e-02,-2.51e-02,+1.83e+01,+1.83e+01 2 -106 -GenVertex: -15 ID: 0 (X,cT):0 - I: 6 43 21 -1.27e+00,-7.35e-02,-1.13e+01,+1.14e+01 2 -15 - 46 21 +2.59e+00,-1.54e+00,-4.01e+01,+4.02e+01 2 -15 - 42 -4 -3.64e+01,+2.35e+01,-3.49e+02,+3.52e+02 2 -15 - 44 21 -4.16e-02,-2.47e-01,-1.97e+00,+1.98e+00 2 -15 - 45 21 +9.29e-01,-5.25e-01,-8.27e+00,+8.34e+00 2 -15 - 47 3 +2.49e+01,-1.94e+01,-3.48e+02,+3.50e+02 2 -15 - O: 1 176 92 -9.28e+00,+1.71e+00,-7.59e+02,+7.64e+02 2 -16 -GenVertex: -16 ID: 0 (X,cT):0 - I: 1 176 92 -9.28e+00,+1.71e+00,-7.59e+02,+7.64e+02 2 -16 - O:10 177 -411 -2.64e+01,+1.68e+01,-2.54e+02,+2.56e+02 2 -111 - 178 -2112 -3.30e+00,+1.95e+00,-3.12e+01,+3.14e+01 1 (nil) - 179 2112 -3.69e+00,+2.38e+00,-3.47e+01,+3.50e+01 1 (nil) - 180 -313 -1.69e+00,+9.52e-01,-1.93e+01,+1.94e+01 2 -112 - 181 323 -1.07e+00,+1.14e+00,-1.19e+01,+1.20e+01 2 -113 - 182 -323 -1.04e+00,-2.43e-02,-1.56e+01,+1.57e+01 2 -114 - 183 321 +9.73e-01,-7.75e-01,-1.20e+01,+1.21e+01 1 (nil) - 184 113 +9.16e+00,-6.89e+00,-1.32e+02,+1.32e+02 2 -115 - 185 111 +1.57e+00,-1.44e+00,-2.40e+01,+2.41e+01 2 -116 - 186 -321 +1.62e+01,-1.24e+01,-2.25e+02,+2.26e+02 1 (nil) -GenVertex: -17 ID: 0 (X,cT):0 - I: 2 48 3 +2.68e+00,-2.13e+00,-4.93e+00,+6.00e+00 2 -17 - 49 -3 -2.68e+00,+2.13e+00,+2.54e+01,+2.56e+01 2 -17 - O: 1 187 92 +0.00e+00,+0.00e+00,+2.05e+01,+3.16e+01 2 -18 -GenVertex: -18 ID: 0 (X,cT):0 - I: 1 187 92 +0.00e+00,+0.00e+00,+2.05e+01,+3.16e+01 2 -18 - O:11 188 -321 +2.32e+00,-1.47e+00,-3.73e+00,+4.66e+00 1 (nil) - 189 213 -1.88e-01,-4.78e-01,-1.86e-02,+8.02e-01 2 -117 - 190 -211 +5.28e-01,-6.99e-02,+3.78e-01,+6.68e-01 1 (nil) - 191 213 -1.69e-01,+6.66e-02,+1.66e+00,+1.95e+00 2 -118 - 192 113 -7.42e-01,+4.97e-01,+2.71e+00,+2.94e+00 2 -119 - 193 -213 +2.70e-02,+3.31e-01,+2.97e-01,+7.93e-01 2 -120 - 194 211 -6.87e-03,-3.65e-01,+8.22e-01,+9.10e-01 1 (nil) - 195 113 -1.79e-01,+4.58e-01,+4.36e+00,+4.46e+00 2 -121 - 196 -213 -8.75e-02,+1.16e-01,+1.21e+00,+1.46e+00 2 -122 - 197 323 -7.63e-01,+6.20e-01,+7.15e+00,+7.28e+00 2 -123 - 198 221 -7.36e-01,+2.91e-01,+5.63e+00,+5.72e+00 2 -124 -GenVertex: -19 ID: 0 (X,cT):0 - I: 2 50 21 +1.28e+00,-2.63e+00,+9.77e-01,+3.09e+00 2 -19 - 51 21 -1.28e+00,+2.63e+00,+2.15e+00,+3.63e+00 2 -19 - O: 1 199 92 +0.00e+00,+0.00e+00,+3.12e+00,+6.71e+00 2 -20 -GenVertex: -20 ID: 0 (X,cT):0 - I: 1 199 92 +0.00e+00,+0.00e+00,+3.12e+00,+6.71e+00 2 -20 - O: 5 200 213 +4.69e-02,-1.77e-01,-3.64e-01,+1.10e+00 2 -125 - 201 111 +3.73e-01,-3.78e-02,+1.18e+00,+1.24e+00 2 -126 - 202 -213 -7.72e-01,+1.13e+00,+1.14e+00,+1.96e+00 2 -127 - 203 223 +4.07e-01,-5.29e-01,+1.12e-01,+1.04e+00 2 -128 - 204 223 -5.49e-02,-3.91e-01,+1.06e+00,+1.37e+00 2 -129 -GenVertex: -21 ID: 0 (X,cT):0 - I: 1 53 -423 +1.80e+00,-7.41e-01,-9.90e+00,+1.03e+01 2 -21 - O: 2 205 -421 +1.62e+00,-6.80e-01,-9.14e+00,+9.49e+00 2 -130 - 206 111 +1.80e-01,-6.13e-02,-7.60e-01,+7.95e-01 2 -131 -GenVertex: -22 ID: 0 (X,cT):0 - I: 1 54 -323 +5.03e-01,+1.51e+00,-6.41e+00,+6.67e+00 2 -22 - O: 2 207 -311 +3.84e-01,+6.75e-01,-2.32e+00,+2.49e+00 2 -132 - 208 -211 +1.19e-01,+8.35e-01,-4.09e+00,+4.18e+00 1 (nil) -GenVertex: -23 ID: 0 (X,cT):0 - I: 1 55 313 +6.48e-01,+1.70e+00,-1.25e+01,+1.27e+01 2 -23 - O: 2 209 311 +4.92e-01,+1.67e+00,-1.03e+01,+1.05e+01 2 -133 - 210 111 +1.56e-01,+3.28e-02,-2.20e+00,+2.21e+00 2 -134 -GenVertex: -24 ID: 0 (X,cT):0 - I: 1 56 113 +3.14e-01,+1.06e+00,-3.82e+00,+4.04e+00 2 -24 - O: 2 211 -211 +2.07e-01,-7.41e-03,-8.44e-01,+8.80e-01 1 (nil) - 212 211 +1.07e-01,+1.07e+00,-2.97e+00,+3.16e+00 1 (nil) -GenVertex: -25 ID: 0 (X,cT):0 - I: 1 57 223 +8.27e-03,+4.69e-01,-5.55e+00,+5.62e+00 2 -25 - O: 3 213 211 +1.65e-01,+9.37e-02,-1.12e+00,+1.14e+00 1 (nil) - 214 -211 -3.30e-02,+9.79e-02,-3.21e+00,+3.22e+00 1 (nil) - 215 111 -1.24e-01,+2.78e-01,-1.22e+00,+1.26e+00 2 -135 -GenVertex: -26 ID: 0 (X,cT):0 - I: 1 58 213 +1.90e-01,+8.19e-01,-3.63e+00,+3.80e+00 2 -26 - O: 2 216 211 +2.62e-01,+8.26e-01,-2.45e+00,+2.61e+00 1 (nil) - 217 111 -7.15e-02,-6.31e-03,-1.18e+00,+1.19e+00 2 -136 -GenVertex: -27 ID: 0 (X,cT):0 - I: 1 59 223 +4.76e-01,+3.30e-01,-1.30e+00,+1.62e+00 2 -27 - O: 3 218 -211 +1.28e-01,-6.04e-02,-2.75e-01,+3.39e-01 1 (nil) - 219 211 +2.00e-01,+3.04e-01,-9.82e-01,+1.06e+00 1 (nil) - 220 111 +1.49e-01,+8.68e-02,-4.65e-02,+2.24e-01 2 -137 -GenVertex: -28 ID: 0 (X,cT):0 - I: 1 60 -323 -1.01e-01,+5.65e-03,+1.73e-01,+8.22e-01 2 -28 - O: 2 221 -311 -8.28e-02,+1.40e-01,+2.87e-01,+5.97e-01 2 -138 - 222 -211 -1.84e-02,-1.34e-01,-1.14e-01,+2.25e-01 1 (nil) -GenVertex: -29 ID: 0 (X,cT):0 - I: 1 61 313 -7.71e-02,+3.71e-01,+6.58e-01,+1.14e+00 2 -29 - O: 2 223 321 -1.86e-02,+1.84e-02,+1.85e-01,+5.28e-01 1 (nil) - 224 -211 -5.85e-02,+3.52e-01,+4.73e-01,+6.09e-01 1 (nil) -GenVertex: -30 ID: 0 (X,cT):0 - I: 1 62 213 -3.58e-01,-1.85e-01,+2.02e-01,+7.59e-01 2 -30 - O: 2 225 211 +1.06e-01,-2.99e-02,+1.77e-01,+2.51e-01 1 (nil) - 226 111 -4.64e-01,-1.55e-01,+2.53e-02,+5.08e-01 2 -139 -GenVertex: -31 ID: 0 (X,cT):0 - I: 1 63 221 +5.37e-01,+2.24e-01,+7.68e+00,+7.72e+00 2 -31 - O: 3 227 22 +9.24e-02,+1.22e-01,+1.51e+00,+1.52e+00 1 (nil) - 228 -211 +1.64e-01,-1.14e-01,+3.22e+00,+3.23e+00 1 (nil) - 229 211 +2.81e-01,+2.16e-01,+2.94e+00,+2.97e+00 1 (nil) -GenVertex: -32 ID: 0 (X,cT):0 - I: 1 64 -213 -3.57e-01,-2.47e-01,+4.39e+00,+4.44e+00 2 -32 - O: 2 230 -211 -3.46e-01,-7.92e-02,+3.34e+00,+3.37e+00 1 (nil) - 231 111 -1.13e-02,-1.68e-01,+1.05e+00,+1.07e+00 2 -140 -GenVertex: -33 ID: 0 (X,cT):0 - I: 1 66 -213 +3.60e-01,-1.91e-02,+2.45e+01,+2.45e+01 2 -33 - O: 2 232 -211 +2.45e-01,+2.11e-01,+2.06e+01,+2.06e+01 1 (nil) - 233 111 +1.15e-01,-2.30e-01,+3.89e+00,+3.90e+00 2 -141 -GenVertex: -34 ID: 0 (X,cT):0 - I: 1 67 113 -3.73e-01,+1.18e-02,+3.83e+01,+3.84e+01 2 -34 - O: 2 234 -211 +1.07e-02,+2.95e-01,+1.86e+01,+1.86e+01 1 (nil) - 235 211 -3.83e-01,-2.83e-01,+1.98e+01,+1.98e+01 1 (nil) -GenVertex: -35 ID: 0 (X,cT):0 - I: 1 68 113 -9.06e-02,+1.63e-01,+1.67e+02,+1.67e+02 2 -35 - O: 2 236 211 -2.00e-02,-2.69e-01,+6.04e+01,+6.04e+01 1 (nil) - 237 -211 -7.06e-02,+4.32e-01,+1.07e+02,+1.07e+02 1 (nil) -GenVertex: -36 ID: 0 (X,cT):0 - I: 1 69 221 +1.73e-01,+4.07e-01,+2.06e+02,+2.06e+02 2 -36 - O: 3 239 -211 +1.52e-01,+2.49e-01,+1.36e+02,+1.36e+02 1 (nil) - 240 111 -1.84e-03,+5.13e-02,+2.10e+01,+2.10e+01 2 -142 - 238 211 +2.30e-02,+1.07e-01,+4.89e+01,+4.89e+01 1 (nil) -GenVertex: -37 ID: 0 (X,cT):0 - I: 1 71 423 +6.74e+00,-3.13e+00,-1.81e+01,+1.96e+01 2 -37 - O: 2 241 421 +6.24e+00,-2.87e+00,-1.68e+01,+1.82e+01 2 -143 - 242 111 +4.94e-01,-2.63e-01,-1.28e+00,+1.40e+00 2 -144 -GenVertex: -38 ID: 0 (X,cT):0 - I: 1 72 213 +1.08e+00,-6.60e-01,-2.31e+00,+2.70e+00 2 -38 - O: 2 243 211 +2.70e-01,-4.65e-01,-9.32e-01,+1.08e+00 1 (nil) - 244 111 +8.10e-01,-1.96e-01,-1.38e+00,+1.62e+00 2 -145 -GenVertex: -39 ID: 0 (X,cT):0 - I: 1 73 331 +8.84e-01,-9.17e-01,-1.33e+00,+2.07e+00 2 -39 - O: 3 245 211 +4.27e-01,-3.13e-01,-3.45e-01,+6.47e-01 1 (nil) - 246 -211 +6.70e-02,-6.53e-02,-1.12e-01,+2.02e-01 1 (nil) - 247 221 +3.89e-01,-5.39e-01,-8.71e-01,+1.22e+00 2 -146 -GenVertex: -40 ID: 0 (X,cT):0 - I: 1 74 -213 +1.67e+00,-6.02e-01,-4.33e+00,+4.71e+00 2 -40 - O: 2 248 -211 +8.95e-01,-3.43e-01,-1.67e+00,+1.93e+00 1 (nil) - 249 111 +7.72e-01,-2.59e-01,-2.66e+00,+2.78e+00 2 -147 -Vertex: -41 ID: 0 (X,cT)=-1.15e-05,-2.74e-06,-5.60e-05,+5.77e-05 - I: 1 75 111 -2.29e-01,-5.45e-02,-1.11e+00,+1.15e+00 2 -41 - O: 2 250 22 -1.87e-01,-7.34e-02,-6.48e-01,+6.78e-01 1 (nil) - 251 22 -4.27e-02,+1.89e-02,-4.65e-01,+4.68e-01 1 (nil) -Vertex: -42 ID: 0 (X,cT)=-9.58e+00,-4.54e+00,+3.08e+02,+3.22e+02 - I: 1 79 3112 -1.25e-01,-5.92e-02,+4.02e+00,+4.19e+00 2 -42 - O: 2 252 2112 +2.35e-02,-7.71e-02,+3.69e+00,+3.81e+00 1 (nil) - 253 -211 -1.48e-01,+1.79e-02,+3.30e-01,+3.88e-01 1 (nil) -GenVertex: -43 ID: 0 (X,cT):0 - I: 1 80 311 -1.08e-01,-3.01e-02,+1.70e+00,+1.77e+00 2 -43 - O: 1 254 310 -1.08e-01,-3.01e-02,+1.70e+00,+1.77e+00 2 -148 -GenVertex: -44 ID: 0 (X,cT):0 - I: 1 81 -1114 -5.93e-01,-4.62e-01,+7.53e+00,+7.69e+00 2 -44 - O: 2 255 -2112 -7.16e-01,-5.94e-01,+6.69e+00,+6.82e+00 1 (nil) - 256 211 +1.23e-01,+1.32e-01,+8.42e-01,+8.72e-01 1 (nil) -GenVertex: -45 ID: 0 (X,cT):0 - I: 1 84 -213 -1.27e-01,-1.01e-01,+5.15e+00,+5.19e+00 2 -45 - O: 2 257 -211 +1.09e-01,-2.00e-01,+3.92e+00,+3.93e+00 1 (nil) - 258 111 -2.36e-01,+9.89e-02,+1.22e+00,+1.25e+00 2 -149 -GenVertex: -46 ID: 0 (X,cT):0 - I: 1 85 213 -1.20e+00,-1.22e-01,+2.34e+01,+2.35e+01 2 -46 - O: 2 259 211 -9.25e-02,+6.68e-02,+1.06e+00,+1.07e+00 1 (nil) - 260 111 -1.11e+00,-1.89e-01,+2.24e+01,+2.24e+01 2 -150 -GenVertex: -47 ID: 0 (X,cT):0 - I: 1 86 223 -7.42e-02,+1.42e-01,+1.52e+01,+1.52e+01 2 -47 - O: 3 261 211 -8.80e-02,-1.85e-01,+7.90e+00,+7.90e+00 1 (nil) - 262 -211 -9.38e-02,+7.23e-02,+3.34e+00,+3.35e+00 1 (nil) - 263 111 +1.08e-01,+2.55e-01,+3.93e+00,+3.94e+00 2 -151 -GenVertex: -48 ID: 0 (X,cT):0 - I: 1 87 -213 -9.01e-01,-6.04e-01,+2.49e+01,+2.49e+01 2 -48 - O: 2 264 -211 -5.80e-01,-4.05e-01,+2.11e+01,+2.11e+01 1 (nil) - 265 111 -3.21e-01,-1.99e-01,+3.80e+00,+3.82e+00 2 -152 -GenVertex: -49 ID: 0 (X,cT):0 - I: 1 88 323 -3.96e-01,+4.77e-01,+8.35e+01,+8.35e+01 2 -49 - O: 2 266 321 -2.79e-01,+6.38e-01,+6.43e+01,+6.43e+01 1 (nil) - 267 111 -1.18e-01,-1.61e-01,+1.92e+01,+1.92e+01 2 -153 -GenVertex: -50 ID: 0 (X,cT):0 - I: 1 89 -313 -1.18e+00,+4.38e-01,+2.34e+02,+2.34e+02 2 -50 - O: 2 268 -321 -8.94e-01,+2.08e-02,+1.54e+02,+1.54e+02 1 (nil) - 269 211 -2.85e-01,+4.17e-01,+8.01e+01,+8.01e+01 1 (nil) -Vertex: -51 ID: 0 (X,cT)=-6.60e-06,+4.63e-05,+6.91e-03,+6.91e-03 - I: 1 90 111 -2.10e-02,+1.47e-01,+2.20e+01,+2.20e+01 2 -51 - O: 2 270 22 +3.30e-03,+1.38e-01,+2.13e+01,+2.13e+01 1 (nil) - 271 22 -2.43e-02,+9.55e-03,+7.24e-01,+7.25e-01 1 (nil) -GenVertex: -52 ID: 0 (X,cT):0 - I: 1 91 -213 -1.47e+00,+1.82e+00,+3.92e+02,+3.92e+02 2 -52 - O: 2 272 -211 -2.85e-01,+9.40e-01,+1.43e+02,+1.43e+02 1 (nil) - 273 111 -1.19e+00,+8.85e-01,+2.49e+02,+2.49e+02 2 -154 -GenVertex: -53 ID: 0 (X,cT):0 - I: 1 92 213 +1.75e+00,+1.50e+00,+6.91e+02,+6.91e+02 2 -53 - O: 2 274 211 +1.79e+00,+1.29e+00,+6.18e+02,+6.18e+02 1 (nil) - 275 111 -3.94e-02,+2.10e-01,+7.29e+01,+7.29e+01 2 -155 -Vertex: -54 ID: 0 (X,cT)=+1.07e-04,+5.79e-05,+2.54e-02,+2.54e-02 - I: 1 94 111 +7.06e-01,+3.83e-01,+1.68e+02,+1.68e+02 2 -54 - O: 2 276 22 +2.50e-01,+1.51e-01,+4.86e+01,+4.86e+01 1 (nil) - 277 22 +4.56e-01,+2.32e-01,+1.20e+02,+1.20e+02 1 (nil) -GenVertex: -55 ID: 0 (X,cT):0 - I: 1 95 223 +1.83e-01,+6.58e-01,+2.64e+02,+2.64e+02 2 -55 - O: 3 278 211 +2.62e-01,+6.67e-02,+8.45e+01,+8.45e+01 1 (nil) - 279 -211 +3.03e-02,+5.27e-01,+1.40e+02,+1.40e+02 1 (nil) - 280 111 -1.09e-01,+6.39e-02,+3.93e+01,+3.93e+01 2 -156 -GenVertex: -56 ID: 0 (X,cT):0 - I: 1 96 113 +1.17e+00,-6.49e-01,+1.09e+02,+1.09e+02 2 -56 - O: 2 281 -211 +1.05e+00,-3.90e-01,+9.92e+01,+9.92e+01 1 (nil) - 282 211 +1.20e-01,-2.59e-01,+1.03e+01,+1.03e+01 1 (nil) -GenVertex: -57 ID: 0 (X,cT):0 - I: 1 97 213 -3.59e-02,+9.92e-01,+3.73e+01,+3.74e+01 2 -57 - O: 2 283 211 -1.62e-01,+3.10e-02,+2.19e+00,+2.20e+00 1 (nil) - 284 111 +1.27e-01,+9.61e-01,+3.52e+01,+3.52e+01 2 -157 -GenVertex: -58 ID: 0 (X,cT):0 - I: 1 98 221 +4.22e-01,+3.30e-01,+8.56e+00,+8.60e+00 2 -58 - O: 3 285 111 +2.92e-01,+2.10e-01,+3.56e+00,+3.58e+00 2 -158 - 286 111 +7.22e-02,+1.09e-01,+1.73e+00,+1.74e+00 2 -159 - 287 111 +5.73e-02,+1.07e-02,+3.27e+00,+3.27e+00 2 -160 -GenVertex: -59 ID: 0 (X,cT):0 - I: 1 99 -213 +9.75e-01,+2.54e+00,+3.20e+01,+3.22e+01 2 -59 - O: 2 288 -211 +5.56e-01,+1.36e+00,+1.23e+01,+1.24e+01 1 (nil) - 289 111 +4.18e-01,+1.18e+00,+1.97e+01,+1.98e+01 2 -161 -Vertex: -60 ID: 0 (X,cT)=+3.89e-05,+1.80e-05,+5.58e-04,+5.60e-04 - I: 1 100 111 +1.28e+00,+5.91e-01,+1.83e+01,+1.84e+01 2 -60 - O: 2 290 22 +1.23e+00,+5.60e-01,+1.78e+01,+1.79e+01 1 (nil) - 291 22 +5.03e-02,+3.14e-02,+4.95e-01,+4.99e-01 1 (nil) -GenVertex: -61 ID: 0 (X,cT):0 - I: 1 101 331 +1.59e+00,+2.22e+00,+3.03e+01,+3.04e+01 2 -61 - O: 3 292 211 +3.32e-01,+2.48e-01,+4.45e+00,+4.47e+00 1 (nil) - 293 -211 +3.06e-01,+6.92e-01,+8.24e+00,+8.28e+00 1 (nil) - 294 221 +9.56e-01,+1.28e+00,+1.76e+01,+1.77e+01 2 -162 -GenVertex: -62 ID: 0 (X,cT):0 - I: 1 102 213 +1.77e+00,-1.58e+00,+1.71e+01,+1.73e+01 2 -62 - O: 2 295 211 +8.03e-02,+2.02e-02,+5.69e-01,+5.92e-01 1 (nil) - 296 111 +1.69e+00,-1.60e+00,+1.65e+01,+1.67e+01 2 -163 -GenVertex: -63 ID: 0 (X,cT):0 - I: 1 105 311 +6.37e-01,-2.90e-01,+6.13e+00,+6.19e+00 2 -63 - O: 1 297 310 +6.37e-01,-2.90e-01,+6.13e+00,+6.19e+00 2 -164 -GenVertex: -64 ID: 0 (X,cT):0 - I: 1 106 333 +8.72e-02,-2.03e+00,+7.62e+00,+7.95e+00 2 -64 - O: 2 298 130 +1.44e-01,-1.08e+00,+4.20e+00,+4.37e+00 1 (nil) - 299 310 -5.64e-02,-9.48e-01,+3.42e+00,+3.58e+00 2 -165 -GenVertex: -65 ID: 0 (X,cT):0 - I: 1 107 -323 -1.98e-01,-1.55e-01,+2.64e+00,+2.79e+00 2 -65 - O: 2 300 -321 -2.21e-01,+1.56e-01,+1.65e+00,+1.74e+00 1 (nil) - 301 111 +2.32e-02,-3.11e-01,+9.92e-01,+1.05e+00 2 -166 -GenVertex: -66 ID: 0 (X,cT):0 - I: 1 108 113 -1.10e+00,-1.90e+00,+5.32e+00,+5.81e+00 2 -66 - O: 2 302 -211 -1.16e+00,-1.76e+00,+5.02e+00,+5.45e+00 1 (nil) - 303 211 +5.82e-02,-1.40e-01,+3.02e-01,+3.65e-01 1 (nil) -GenVertex: -67 ID: 0 (X,cT):0 - I: 1 109 213 -7.23e-01,-7.70e-01,+6.13e-01,+1.63e+00 2 -67 - O: 2 304 211 +1.49e-03,+1.26e-01,-1.51e-01,+2.41e-01 1 (nil) - 305 111 -7.25e-01,-8.95e-01,+7.64e-01,+1.39e+00 2 -167 -GenVertex: -68 ID: 0 (X,cT):0 - I: 1 111 213 -5.97e-01,-1.22e+00,+2.67e-01,+1.55e+00 2 -68 - O: 2 306 211 +1.06e-01,-2.72e-01,-4.01e-02,+3.26e-01 1 (nil) - 307 111 -7.03e-01,-9.49e-01,+3.08e-01,+1.23e+00 2 -168 -Vertex: -69 ID: 0 (X,cT)=+1.27e-05,-7.07e-05,+1.82e-05,+8.39e-05 - I: 1 113 111 +4.36e-02,-2.43e-01,+6.27e-02,+2.89e-01 2 -69 - O: 2 308 22 +5.40e-02,-1.99e-02,+1.91e-02,+6.07e-02 1 (nil) - 309 22 -1.04e-02,-2.23e-01,+4.36e-02,+2.28e-01 1 (nil) -GenVertex: -70 ID: 0 (X,cT):0 - I: 1 114 213 -1.15e+00,-1.72e+00,-2.01e+00,+2.97e+00 2 -70 - O: 2 310 211 -4.37e-02,-6.49e-02,-3.59e-02,+1.64e-01 1 (nil) - 311 111 -1.10e+00,-1.65e+00,-1.97e+00,+2.80e+00 2 -169 -GenVertex: -71 ID: 0 (X,cT):0 - I: 1 115 -213 -9.95e-01,-3.87e-01,-1.11e+00,+1.63e+00 2 -71 - O: 2 312 -211 -7.40e-01,-4.72e-01,-9.20e-01,+1.28e+00 1 (nil) - 313 111 -2.55e-01,+8.51e-02,-1.87e-01,+3.54e-01 2 -170 -GenVertex: -72 ID: 0 (X,cT):0 - I: 1 119 311 -2.88e-01,+7.23e-01,-1.33e+00,+1.62e+00 2 -72 - O: 1 314 310 -2.88e-01,+7.23e-01,-1.33e+00,+1.62e+00 2 -171 -GenVertex: -73 ID: 0 (X,cT):0 - I: 1 121 113 -2.01e-02,+9.67e-01,-2.76e+00,+3.05e+00 2 -73 - O: 2 315 -211 -5.02e-03,+1.03e+00,-2.68e+00,+2.88e+00 1 (nil) - 316 211 -1.50e-02,-6.21e-02,-7.50e-02,+1.71e-01 1 (nil) -GenVertex: -74 ID: 0 (X,cT):0 - I: 1 122 213 +6.99e-01,+4.88e-01,-2.14e+00,+2.37e+00 2 -74 - O: 2 317 211 +2.31e-01,+4.39e-01,-1.27e+00,+1.37e+00 1 (nil) - 318 111 +4.68e-01,+4.92e-02,-8.74e-01,+1.00e+00 2 -172 -GenVertex: -75 ID: 0 (X,cT):0 - I: 1 123 223 +1.59e-01,-2.33e-01,-7.42e+00,+7.46e+00 2 -75 - O: 2 319 -211 +2.57e-01,+5.62e-02,-5.93e+00,+5.93e+00 1 (nil) - 320 211 -9.87e-02,-2.90e-01,-1.49e+00,+1.53e+00 1 (nil) -GenVertex: -76 ID: 0 (X,cT):0 - I: 1 124 223 -3.07e-01,+5.68e-01,-1.77e+01,+1.77e+01 2 -76 - O: 2 321 -211 -1.81e-01,+2.32e-01,-1.48e+01,+1.48e+01 1 (nil) - 322 211 -1.26e-01,+3.36e-01,-2.88e+00,+2.90e+00 1 (nil) -GenVertex: -77 ID: 0 (X,cT):0 - I: 1 125 1114 +7.70e-01,-3.47e-01,-1.94e+02,+1.94e+02 2 -77 - O: 2 323 2112 +6.85e-01,-3.51e-01,-1.63e+02,+1.63e+02 1 (nil) - 324 -211 +8.47e-02,+3.52e-03,-3.06e+01,+3.06e+01 1 (nil) -Vertex: -78 ID: 0 (X,cT)=+9.27e-06,+2.22e-05,-1.58e-03,+1.58e-03 - I: 1 126 111 +6.52e-01,+1.56e+00,-1.11e+02,+1.11e+02 2 -78 - O: 2 325 22 +6.52e-01,+1.50e+00,-1.08e+02,+1.08e+02 1 (nil) - 326 22 -1.55e-04,+6.21e-02,-3.67e+00,+3.67e+00 1 (nil) -GenVertex: -79 ID: 0 (X,cT):0 - I: 1 130 113 +7.74e-01,+8.64e-01,-8.89e+01,+8.89e+01 2 -79 - O: 2 327 -211 +6.68e-01,+7.08e-01,-4.84e+01,+4.84e+01 1 (nil) - 328 211 +1.06e-01,+1.56e-01,-4.05e+01,+4.05e+01 1 (nil) -GenVertex: -80 ID: 0 (X,cT):0 - I: 1 131 223 +1.70e-02,+2.83e-01,-9.69e+01,+9.69e+01 2 -80 - O: 3 329 211 -1.62e-01,+5.36e-02,-3.29e+01,+3.29e+01 1 (nil) - 330 -211 +6.38e-02,-3.43e-02,-4.30e+01,+4.30e+01 1 (nil) - 331 111 +1.15e-01,+2.64e-01,-2.11e+01,+2.11e+01 2 -173 -GenVertex: -81 ID: 0 (X,cT):0 - I: 1 132 223 +3.02e-01,+2.43e-01,-3.21e+01,+3.21e+01 2 -81 - O: 3 332 -211 +5.67e-02,-4.99e-02,-1.78e+01,+1.78e+01 1 (nil) - 333 211 +8.54e-02,+2.91e-01,-8.16e+00,+8.17e+00 1 (nil) - 334 111 +1.60e-01,+1.64e-03,-6.16e+00,+6.16e+00 2 -174 -GenVertex: -82 ID: 0 (X,cT):0 - I: 1 133 221 +6.52e-01,-1.30e-02,-7.49e+00,+7.53e+00 2 -82 - O: 3 335 111 +3.20e-01,-1.06e-01,-2.80e+00,+2.83e+00 2 -175 - 336 111 +2.91e-01,+8.79e-02,-3.67e+00,+3.68e+00 2 -176 - 337 111 +4.06e-02,+5.17e-03,-1.02e+00,+1.02e+00 2 -177 -GenVertex: -83 ID: 0 (X,cT):0 - I: 1 134 213 +1.25e+00,+2.45e+00,-3.91e+01,+3.93e+01 2 -83 - O: 2 338 211 +6.58e-01,+5.66e-01,-1.72e+01,+1.72e+01 1 (nil) - 339 111 +5.88e-01,+1.89e+00,-2.20e+01,+2.20e+01 2 -178 -GenVertex: -84 ID: 0 (X,cT):0 - I: 1 135 221 +8.86e-01,+9.16e-01,-1.24e+01,+1.25e+01 2 -84 - O: 2 340 22 +6.66e-01,+6.36e-01,-6.31e+00,+6.38e+00 1 (nil) - 341 22 +2.20e-01,+2.80e-01,-6.11e+00,+6.12e+00 1 (nil) -Vertex: -85 ID: 0 (X,cT)=+3.02e-04,+4.87e-04,-5.38e-03,+5.41e-03 - I: 1 137 111 +7.22e-01,+1.16e+00,-1.29e+01,+1.29e+01 2 -85 - O: 2 342 22 +5.79e-02,+1.36e-01,-1.76e+00,+1.76e+00 1 (nil) - 343 22 +6.65e-01,+1.03e+00,-1.11e+01,+1.12e+01 1 (nil) -GenVertex: -86 ID: 0 (X,cT):0 - I: 1 138 113 +1.21e+00,+1.68e+00,-1.89e+01,+1.90e+01 2 -86 - O: 2 344 -211 +4.13e-01,+1.29e-01,-3.64e+00,+3.67e+00 1 (nil) - 345 211 +8.01e-01,+1.55e+00,-1.52e+01,+1.53e+01 1 (nil) -GenVertex: -87 ID: 0 (X,cT):0 - I: 1 140 -213 +4.58e-01,+1.15e+00,-1.84e+01,+1.85e+01 2 -87 - O: 2 346 -211 +4.43e-01,+4.32e-01,-3.36e+00,+3.42e+00 1 (nil) - 347 111 +1.51e-02,+7.22e-01,-1.51e+01,+1.51e+01 2 -179 -GenVertex: -88 ID: 0 (X,cT):0 - I: 1 141 213 +2.08e+00,+1.68e+00,-2.61e+01,+2.63e+01 2 -88 - O: 2 348 211 +2.03e+00,+1.63e+00,-2.51e+01,+2.52e+01 1 (nil) - 349 111 +5.56e-02,+5.31e-02,-1.06e+00,+1.07e+00 2 -180 -GenVertex: -89 ID: 0 (X,cT):0 - I: 1 142 313 +1.78e+00,+1.24e+00,-2.26e+01,+2.27e+01 2 -89 - O: 2 350 321 +5.53e-01,+4.44e-01,-6.45e+00,+6.51e+00 1 (nil) - 351 -211 +1.23e+00,+7.92e-01,-1.62e+01,+1.62e+01 1 (nil) -GenVertex: -90 ID: 0 (X,cT):0 - I: 1 143 -313 +1.42e+00,+6.47e-01,-1.81e+01,+1.82e+01 2 -90 - O: 2 352 -311 +4.98e-01,+5.10e-01,-7.52e+00,+7.57e+00 2 -181 - 353 111 +9.21e-01,+1.38e-01,-1.06e+01,+1.06e+01 2 -182 -GenVertex: -91 ID: 0 (X,cT):0 - I: 1 145 -213 -5.75e-01,-4.78e-01,-9.45e+01,+9.45e+01 2 -91 - O: 2 354 -211 -4.16e-01,-6.42e-04,-4.57e+01,+4.57e+01 1 (nil) - 355 111 -1.59e-01,-4.77e-01,-4.88e+01,+4.88e+01 2 -183 -GenVertex: -92 ID: 0 (X,cT):0 - I: 1 146 -1114 -8.04e-01,-7.43e-01,-3.40e+01,+3.40e+01 2 -92 - O: 2 356 -2112 -5.09e-01,-4.51e-01,-2.85e+01,+2.85e+01 1 (nil) - 357 211 -2.95e-01,-2.92e-01,-5.48e+00,+5.50e+00 1 (nil) -GenVertex: -93 ID: 0 (X,cT):0 - I: 1 147 -213 -1.80e-01,+6.29e-02,-4.32e+01,+4.32e+01 2 -93 - O: 2 358 -211 -2.49e-01,+3.34e-01,-2.84e+01,+2.84e+01 1 (nil) - 359 111 +6.89e-02,-2.71e-01,-1.49e+01,+1.49e+01 2 -184 -GenVertex: -94 ID: 0 (X,cT):0 - I: 1 149 311 -1.41e+00,-2.18e+00,-7.90e+01,+7.90e+01 2 -94 - O: 1 360 130 -1.41e+00,-2.18e+00,-7.90e+01,+7.90e+01 1 (nil) -GenVertex: -95 ID: 0 (X,cT):0 - I: 1 150 -323 -3.04e-01,-3.92e-01,-7.88e+01,+7.88e+01 2 -95 - O: 2 361 -321 -3.90e-02,+2.37e-02,-4.50e+01,+4.50e+01 1 (nil) - 362 111 -2.65e-01,-4.16e-01,-3.38e+01,+3.38e+01 2 -185 -GenVertex: -96 ID: 0 (X,cT):0 - I: 1 151 213 -1.80e+00,-1.21e+00,-8.93e+01,+8.94e+01 2 -96 - O: 2 363 211 -1.88e+00,-1.09e+00,-8.20e+01,+8.20e+01 1 (nil) - 364 111 +7.55e-02,-1.18e-01,-7.35e+00,+7.36e+00 2 -186 -GenVertex: -97 ID: 0 (X,cT):0 - I: 1 152 113 +4.91e-01,-9.72e-01,-5.04e+01,+5.05e+01 2 -97 - O: 2 365 -211 +3.30e-01,-1.08e+00,-4.62e+01,+4.62e+01 1 (nil) - 366 211 +1.61e-01,+1.05e-01,-4.23e+00,+4.23e+00 1 (nil) -GenVertex: -98 ID: 0 (X,cT):0 - I: 1 153 221 +2.67e-01,-2.61e-01,-2.16e+01,+2.16e+01 2 -98 - O: 2 367 22 -1.53e-01,-5.63e-02,-3.12e+00,+3.12e+00 1 (nil) - 368 22 +4.20e-01,-2.04e-01,-1.84e+01,+1.85e+01 1 (nil) -GenVertex: -99 ID: 0 (X,cT):0 - I: 1 154 311 +4.13e-01,+1.80e-01,-8.91e+01,+8.91e+01 2 -99 - O: 1 369 130 +4.13e-01,+1.80e-01,-8.91e+01,+8.91e+01 1 (nil) -GenVertex: -100 ID: 0 (X,cT):0 - I: 1 156 221 -4.10e-01,-2.74e-01,-4.88e+01,+4.88e+01 2 -100 - O: 3 370 211 -2.54e-01,-1.08e-01,-2.26e+01,+2.26e+01 1 (nil) - 371 -211 -9.47e-02,-7.03e-02,-6.26e+00,+6.26e+00 1 (nil) - 372 111 -6.13e-02,-9.53e-02,-1.99e+01,+1.99e+01 2 -187 -GenVertex: -101 ID: 0 (X,cT):0 - I: 1 158 113 -8.56e-01,+4.51e-01,-3.86e+02,+3.86e+02 2 -101 - O: 2 373 211 -5.66e-01,+1.70e-01,-3.23e+02,+3.23e+02 1 (nil) - 374 -211 -2.90e-01,+2.81e-01,-6.32e+01,+6.32e+01 1 (nil) -GenVertex: -102 ID: 0 (X,cT):0 - I: 1 160 2224 -1.90e-03,+7.51e-01,-1.39e+03,+1.39e+03 2 -102 - O: 2 375 2212 +9.56e-04,+8.62e-01,-1.17e+03,+1.17e+03 1 (nil) - 376 211 -2.86e-03,-1.12e-01,-2.17e+02,+2.17e+02 1 (nil) -GenVertex: -103 ID: 0 (X,cT):0 - I: 1 163 223 -1.35e-02,+1.05e-01,+2.90e+00,+3.01e+00 2 -103 - O: 3 377 -211 +6.98e-02,+4.75e-02,+2.34e+00,+2.34e+00 1 (nil) - 378 211 -3.36e-03,-3.94e-02,+1.39e-01,+2.01e-01 1 (nil) - 379 111 -7.99e-02,+9.68e-02,+4.23e-01,+4.62e-01 2 -188 -GenVertex: -104 ID: 0 (X,cT):0 - I: 1 164 -213 -7.67e-02,-1.58e-01,+2.83e+00,+2.94e+00 2 -104 - O: 2 380 -211 +2.46e-01,-2.54e-01,+9.52e-01,+1.02e+00 1 (nil) - 381 111 -3.23e-01,+9.61e-02,+1.88e+00,+1.91e+00 2 -189 -GenVertex: -105 ID: 0 (X,cT):0 - I: 1 165 113 -3.96e-01,-2.46e-01,+7.66e+00,+7.72e+00 2 -105 - O: 2 382 -211 -4.58e-01,-1.09e-01,+2.26e+00,+2.31e+00 1 (nil) - 383 211 +6.19e-02,-1.38e-01,+5.40e+00,+5.41e+00 1 (nil) -GenVertex: -106 ID: 0 (X,cT):0 - I: 1 166 223 +8.97e-02,-2.51e-02,+1.83e+01,+1.83e+01 2 -106 - O: 3 384 211 +1.54e-02,+2.33e-01,+6.44e+00,+6.45e+00 1 (nil) - 385 -211 -1.25e-01,-1.91e-01,+6.30e+00,+6.31e+00 1 (nil) - 386 111 +1.99e-01,-6.72e-02,+5.57e+00,+5.57e+00 2 -190 -GenVertex: -107 ID: 0 (X,cT):0 - I: 1 167 331 +7.92e-02,-2.14e-01,+1.65e+01,+1.65e+01 2 -107 - O: 2 388 113 +8.30e-02,-2.83e-01,+1.61e+01,+1.61e+01 2 -191 - 387 22 -3.78e-03,+6.83e-02,+3.46e-01,+3.53e-01 1 (nil) -GenVertex: -108 ID: 0 (X,cT):0 - I: 1 169 113 -9.07e-02,+1.70e-01,+7.69e+00,+7.71e+00 2 -108 - O: 2 389 211 -1.47e-01,+1.94e-03,+5.31e+00,+5.31e+00 1 (nil) - 390 -211 +5.60e-02,+1.68e-01,+2.38e+00,+2.39e+00 1 (nil) -GenVertex: -109 ID: 0 (X,cT):0 - I: 1 172 313 -9.79e-02,+5.68e-01,+7.20e+01,+7.20e+01 2 -109 - O: 2 391 321 +1.98e-01,+2.04e-01,+3.95e+01,+3.95e+01 1 (nil) - 392 -211 -2.96e-01,+3.65e-01,+3.25e+01,+3.25e+01 1 (nil) -GenVertex: -110 ID: 0 (X,cT):0 - I: 1 173 -313 -1.30e-01,-7.96e-01,+2.37e+02,+2.37e+02 2 -110 - O: 2 393 -321 +8.77e-02,-3.77e-01,+1.73e+02,+1.73e+02 1 (nil) - 394 211 -2.18e-01,-4.20e-01,+6.41e+01,+6.41e+01 1 (nil) -Vertex: -111 ID: 0 (X,cT)=-3.81e+00,+2.43e+00,-3.67e+01,+3.70e+01 - I: 1 177 -411 -2.64e+01,+1.68e+01,-2.54e+02,+2.56e+02 2 -111 - O: 4 395 13 -1.41e+00,+1.04e+00,-1.32e+01,+1.33e+01 1 (nil) - 397 323 -2.16e+01,+1.35e+01,-2.09e+02,+2.11e+02 2 -192 - 396 -14 -1.31e+00,+1.05e+00,-1.23e+01,+1.24e+01 1 (nil) - 398 -211 -2.09e+00,+1.24e+00,-1.91e+01,+1.92e+01 1 (nil) -GenVertex: -112 ID: 0 (X,cT):0 - I: 1 180 -313 -1.69e+00,+9.52e-01,-1.93e+01,+1.94e+01 2 -112 - O: 2 399 -311 -4.47e-01,+3.05e-01,-6.33e+00,+6.37e+00 2 -193 - 400 111 -1.24e+00,+6.47e-01,-1.29e+01,+1.30e+01 2 -194 -GenVertex: -113 ID: 0 (X,cT):0 - I: 1 181 323 -1.07e+00,+1.14e+00,-1.19e+01,+1.20e+01 2 -113 - O: 2 401 311 -9.33e-01,+9.63e-01,-1.12e+01,+1.13e+01 2 -195 - 402 211 -1.36e-01,+1.77e-01,-7.16e-01,+7.63e-01 1 (nil) -GenVertex: -114 ID: 0 (X,cT):0 - I: 1 182 -323 -1.04e+00,-2.43e-02,-1.56e+01,+1.57e+01 2 -114 - O: 2 403 -321 -9.22e-01,-9.25e-02,-1.49e+01,+1.49e+01 1 (nil) - 404 111 -1.17e-01,+6.82e-02,-7.01e-01,+7.26e-01 2 -196 -GenVertex: -115 ID: 0 (X,cT):0 - I: 1 184 113 +9.16e+00,-6.89e+00,-1.32e+02,+1.32e+02 2 -115 - O: 2 405 -211 +8.07e+00,-6.29e+00,-1.19e+02,+1.20e+02 1 (nil) - 406 211 +1.09e+00,-5.97e-01,-1.23e+01,+1.24e+01 1 (nil) -Vertex: -116 ID: 0 (X,cT)=+1.87e-03,-1.71e-03,-2.84e-02,+2.85e-02 - I: 1 185 111 +1.57e+00,-1.44e+00,-2.40e+01,+2.41e+01 2 -116 - O: 2 407 22 +1.03e+00,-8.53e-01,-1.49e+01,+1.50e+01 1 (nil) - 408 22 +5.46e-01,-5.88e-01,-9.04e+00,+9.08e+00 1 (nil) -GenVertex: -117 ID: 0 (X,cT):0 - I: 1 189 213 -1.88e-01,-4.78e-01,-1.86e-02,+8.02e-01 2 -117 - O: 2 409 211 +6.32e-02,-4.07e-02,-1.95e-01,+2.51e-01 1 (nil) - 410 111 -2.51e-01,-4.37e-01,+1.76e-01,+5.51e-01 2 -197 -GenVertex: -118 ID: 0 (X,cT):0 - I: 1 191 213 -1.69e-01,+6.66e-02,+1.66e+00,+1.95e+00 2 -118 - O: 2 411 211 -8.99e-02,-4.44e-01,+8.88e-01,+1.01e+00 1 (nil) - 412 111 -7.90e-02,+5.11e-01,+7.72e-01,+9.39e-01 2 -198 -GenVertex: -119 ID: 0 (X,cT):0 - I: 1 192 113 -7.42e-01,+4.97e-01,+2.71e+00,+2.94e+00 2 -119 - O: 2 413 -211 -6.65e-02,+8.33e-02,+1.29e+00,+1.30e+00 1 (nil) - 414 211 -6.76e-01,+4.14e-01,+1.43e+00,+1.64e+00 1 (nil) -GenVertex: -120 ID: 0 (X,cT):0 - I: 1 193 -213 +2.70e-02,+3.31e-01,+2.97e-01,+7.93e-01 2 -120 - O: 2 415 -211 -1.79e-01,+3.73e-02,+3.36e-01,+4.08e-01 1 (nil) - 416 111 +2.06e-01,+2.93e-01,-3.94e-02,+3.85e-01 2 -199 -GenVertex: -121 ID: 0 (X,cT):0 - I: 1 195 113 -1.79e-01,+4.58e-01,+4.36e+00,+4.46e+00 2 -121 - O: 2 417 -211 -4.09e-01,+9.88e-02,+1.62e+00,+1.68e+00 1 (nil) - 418 211 +2.30e-01,+3.59e-01,+2.75e+00,+2.78e+00 1 (nil) -GenVertex: -122 ID: 0 (X,cT):0 - I: 1 196 -213 -8.75e-02,+1.16e-01,+1.21e+00,+1.46e+00 2 -122 - O: 2 419 -211 +1.71e-01,-8.56e-03,+1.11e+00,+1.13e+00 1 (nil) - 420 111 -2.59e-01,+1.24e-01,+1.06e-01,+3.34e-01 2 -200 -GenVertex: -123 ID: 0 (X,cT):0 - I: 1 197 323 -7.63e-01,+6.20e-01,+7.15e+00,+7.28e+00 2 -123 - O: 2 421 321 -4.34e-01,+3.13e-01,+2.39e+00,+2.49e+00 1 (nil) - 422 111 -3.29e-01,+3.07e-01,+4.76e+00,+4.78e+00 2 -201 -GenVertex: -124 ID: 0 (X,cT):0 - I: 1 198 221 -7.36e-01,+2.91e-01,+5.63e+00,+5.72e+00 2 -124 - O: 3 424 211 -2.05e-01,+1.05e-01,+1.26e+00,+1.28e+00 1 (nil) - 423 22 -3.68e-01,+1.74e-01,+3.63e+00,+3.66e+00 1 (nil) - 425 -211 -1.63e-01,+1.25e-02,+7.47e-01,+7.77e-01 1 (nil) -GenVertex: -125 ID: 0 (X,cT):0 - I: 1 200 213 +4.69e-02,-1.77e-01,-3.64e-01,+1.10e+00 2 -125 - O: 2 426 211 -3.67e-01,-1.30e-01,-4.96e-01,+6.46e-01 1 (nil) - 427 111 +4.14e-01,-4.69e-02,+1.31e-01,+4.58e-01 2 -202 -Vertex: -126 ID: 0 (X,cT)=+6.94e-05,-7.03e-06,+2.19e-04,+2.31e-04 - I: 1 201 111 +3.73e-01,-3.78e-02,+1.18e+00,+1.24e+00 2 -126 - O: 2 428 22 +1.73e-01,-3.58e-02,+3.54e-01,+3.96e-01 1 (nil) - 429 22 +2.00e-01,-2.02e-03,+8.22e-01,+8.46e-01 1 (nil) -GenVertex: -127 ID: 0 (X,cT):0 - I: 1 202 -213 -7.72e-01,+1.13e+00,+1.14e+00,+1.96e+00 2 -127 - O: 2 430 -211 -3.73e-02,+7.08e-01,+6.44e-01,+9.68e-01 1 (nil) - 431 111 -7.34e-01,+4.26e-01,+4.97e-01,+9.93e-01 2 -203 -GenVertex: -128 ID: 0 (X,cT):0 - I: 1 203 223 +4.07e-01,-5.29e-01,+1.12e-01,+1.04e+00 2 -128 - O: 3 432 211 +3.59e-01,-2.82e-01,+1.18e-01,+4.92e-01 1 (nil) - 433 -211 -1.50e-02,+9.43e-02,+3.19e-02,+1.72e-01 1 (nil) - 434 111 +6.29e-02,-3.41e-01,-3.80e-02,+3.74e-01 2 -204 -GenVertex: -129 ID: 0 (X,cT):0 - I: 1 204 223 -5.49e-02,-3.91e-01,+1.06e+00,+1.37e+00 2 -129 - O: 3 435 -211 +6.25e-02,-1.04e-01,+1.78e-01,+2.57e-01 1 (nil) - 436 211 +2.00e-02,-2.71e-01,+8.68e-01,+9.20e-01 1 (nil) - 437 111 -1.37e-01,-1.63e-02,+1.18e-02,+1.94e-01 2 -205 -Vertex: -130 ID: 0 (X,cT)=+1.58e-01,-6.64e-02,-8.93e-01,+9.27e-01 - I: 1 205 -421 +1.62e+00,-6.80e-01,-9.14e+00,+9.49e+00 2 -130 - O: 2 438 10323 +8.73e-01,-6.30e-01,-7.46e+00,+7.64e+00 2 -206 - 439 -211 +7.49e-01,-4.97e-02,-1.68e+00,+1.85e+00 1 (nil) -Vertex: -131 ID: 0 (X,cT)=+6.33e-05,-2.16e-05,-2.68e-04,+2.80e-04 - I: 1 206 111 +1.80e-01,-6.13e-02,-7.60e-01,+7.95e-01 2 -131 - O: 2 440 22 +1.83e-01,-8.44e-02,-7.27e-01,+7.54e-01 1 (nil) - 441 22 -3.44e-03,+2.31e-02,-3.29e-02,+4.04e-02 1 (nil) -GenVertex: -132 ID: 0 (X,cT):0 - I: 1 207 -311 +3.84e-01,+6.75e-01,-2.32e+00,+2.49e+00 2 -132 - O: 1 442 310 +3.84e-01,+6.75e-01,-2.32e+00,+2.49e+00 2 -207 -GenVertex: -133 ID: 0 (X,cT):0 - I: 1 209 311 +4.92e-01,+1.67e+00,-1.03e+01,+1.05e+01 2 -133 - O: 1 443 310 +4.92e-01,+1.67e+00,-1.03e+01,+1.05e+01 2 -208 -Vertex: -134 ID: 0 (X,cT)=+9.60e-06,+2.02e-06,-1.35e-04,+1.36e-04 - I: 1 210 111 +1.56e-01,+3.28e-02,-2.20e+00,+2.21e+00 2 -134 - O: 2 444 22 +1.58e-01,+4.61e-02,-2.17e+00,+2.18e+00 1 (nil) - 445 22 -2.08e-03,-1.33e-02,-2.27e-02,+2.64e-02 1 (nil) -Vertex: -135 ID: 0 (X,cT)=-6.11e-05,+1.37e-04,-6.02e-04,+6.24e-04 - I: 1 215 111 -1.24e-01,+2.78e-01,-1.22e+00,+1.26e+00 2 -135 - O: 2 446 22 -2.52e-02,+2.45e-02,-3.81e-01,+3.83e-01 1 (nil) - 447 22 -9.85e-02,+2.53e-01,-8.38e-01,+8.81e-01 1 (nil) -Vertex: -136 ID: 0 (X,cT)=-4.44e-05,-3.92e-06,-7.34e-04,+7.40e-04 - I: 1 217 111 -7.15e-02,-6.31e-03,-1.18e+00,+1.19e+00 2 -136 - O: 2 448 22 -9.35e-02,-3.77e-02,-1.03e+00,+1.04e+00 1 (nil) - 449 22 +2.21e-02,+3.14e-02,-1.46e-01,+1.51e-01 1 (nil) -Vertex: -137 ID: 0 (X,cT)=+3.41e-05,+1.99e-05,-1.06e-05,+5.12e-05 - I: 1 220 111 +1.49e-01,+8.68e-02,-4.65e-02,+2.24e-01 2 -137 - O: 2 450 22 +1.62e-01,+9.36e-02,-6.67e-02,+1.99e-01 1 (nil) - 451 22 -1.32e-02,-6.86e-03,+2.02e-02,+2.51e-02 1 (nil) -GenVertex: -138 ID: 0 (X,cT):0 - I: 1 221 -311 -8.28e-02,+1.40e-01,+2.87e-01,+5.97e-01 2 -138 - O: 1 452 130 -8.28e-02,+1.40e-01,+2.87e-01,+5.97e-01 1 (nil) -Vertex: -139 ID: 0 (X,cT)=-3.00e-05,-1.01e-05,+1.64e-06,+3.29e-05 - I: 1 226 111 -4.64e-01,-1.55e-01,+2.53e-02,+5.08e-01 2 -139 - O: 2 453 22 -2.22e-01,-3.76e-02,-4.59e-02,+2.30e-01 1 (nil) - 454 22 -2.42e-01,-1.18e-01,+7.12e-02,+2.78e-01 1 (nil) -Vertex: -140 ID: 0 (X,cT)=-5.23e-07,-7.76e-06,+4.86e-05,+4.96e-05 - I: 1 231 111 -1.13e-02,-1.68e-01,+1.05e+00,+1.07e+00 2 -140 - O: 2 455 22 +4.72e-02,-1.23e-01,+8.16e-01,+8.27e-01 1 (nil) - 456 22 -5.85e-02,-4.52e-02,+2.34e-01,+2.45e-01 1 (nil) -Vertex: -141 ID: 0 (X,cT)=+3.06e-05,-6.13e-05,+1.04e-03,+1.04e-03 - I: 1 233 111 +1.15e-01,-2.30e-01,+3.89e+00,+3.90e+00 2 -141 - O: 2 457 22 +4.00e-02,+3.07e-04,+9.61e-01,+9.62e-01 1 (nil) - 458 22 +7.48e-02,-2.30e-01,+2.93e+00,+2.94e+00 1 (nil) -Vertex: -142 ID: 0 (X,cT)=-4.86e-07,+1.36e-05,+5.54e-03,+5.54e-03 - I: 1 240 111 -1.84e-03,+5.13e-02,+2.10e+01,+2.10e+01 2 -142 - O: 2 459 22 +6.53e-02,+3.07e-02,+8.88e+00,+8.88e+00 1 (nil) - 460 22 -6.72e-02,+2.07e-02,+1.21e+01,+1.21e+01 1 (nil) -Vertex: -143 ID: 0 (X,cT)=+9.00e-01,-4.13e-01,-2.42e+00,+2.63e+00 - I: 1 241 421 +6.24e+00,-2.87e+00,-1.68e+01,+1.82e+01 2 -143 - O: 2 461 -313 +3.33e+00,-1.55e+00,-7.24e+00,+8.16e+00 2 -209 - 462 111 +2.92e+00,-1.31e+00,-9.56e+00,+1.01e+01 2 -210 -Vertex: -144 ID: 0 (X,cT)=+1.11e-04,-5.90e-05,-2.87e-04,+3.15e-04 - I: 1 242 111 +4.94e-01,-2.63e-01,-1.28e+00,+1.40e+00 2 -144 - O: 2 463 22 +3.13e-01,-2.24e-01,-9.52e-01,+1.03e+00 1 (nil) - 464 22 +1.81e-01,-3.87e-02,-3.28e-01,+3.76e-01 1 (nil) -Vertex: -145 ID: 0 (X,cT)=+2.18e-05,-5.26e-06,-3.70e-05,+4.34e-05 - I: 1 244 111 +8.10e-01,-1.96e-01,-1.38e+00,+1.62e+00 2 -145 - O: 2 465 22 +6.12e-01,-2.00e-01,-1.10e+00,+1.28e+00 1 (nil) - 466 22 +1.98e-01,+3.77e-03,-2.74e-01,+3.39e-01 1 (nil) -GenVertex: -146 ID: 0 (X,cT):0 - I: 1 247 221 +3.89e-01,-5.39e-01,-8.71e-01,+1.22e+00 2 -146 - O: 3 467 -211 +1.74e-01,-1.31e-01,-4.30e-01,+5.02e-01 1 (nil) - 468 211 +5.41e-02,-2.04e-01,-3.15e-01,+4.04e-01 1 (nil) - 469 111 +1.61e-01,-2.04e-01,-1.26e-01,+3.19e-01 2 -211 -Vertex: -147 ID: 0 (X,cT)=+1.07e-04,-3.60e-05,-3.69e-04,+3.86e-04 - I: 1 249 111 +7.72e-01,-2.59e-01,-2.66e+00,+2.78e+00 2 -147 - O: 2 470 22 +2.51e-02,-3.16e-02,-2.06e-01,+2.10e-01 1 (nil) - 471 22 +7.47e-01,-2.27e-01,-2.45e+00,+2.57e+00 1 (nil) -Vertex: -148 ID: 0 (X,cT)=-8.22e+00,-2.29e+00,+1.29e+02,+1.35e+02 - I: 1 254 310 -1.08e-01,-3.01e-02,+1.70e+00,+1.77e+00 2 -148 - O: 2 472 211 +1.20e-02,+1.80e-01,+6.79e-01,+7.16e-01 1 (nil) - 473 -211 -1.20e-01,-2.10e-01,+1.02e+00,+1.05e+00 1 (nil) -Vertex: -149 ID: 0 (X,cT)=-9.20e-06,+3.86e-06,+4.76e-05,+4.89e-05 - I: 1 258 111 -2.36e-01,+9.89e-02,+1.22e+00,+1.25e+00 2 -149 - O: 2 474 22 -1.60e-01,+3.34e-03,+8.26e-01,+8.41e-01 1 (nil) - 475 22 -7.61e-02,+9.56e-02,+3.95e-01,+4.13e-01 1 (nil) -Vertex: -150 ID: 0 (X,cT)=-5.14e-04,-8.73e-05,+1.03e-02,+1.04e-02 - I: 1 260 111 -1.11e+00,-1.89e-01,+2.24e+01,+2.24e+01 2 -150 - O: 2 476 22 -9.81e-01,-1.35e-01,+2.02e+01,+2.02e+01 1 (nil) - 477 22 -1.30e-01,-5.37e-02,+2.22e+00,+2.22e+00 1 (nil) -Vertex: -151 ID: 0 (X,cT)=+1.88e-05,+4.46e-05,+6.87e-04,+6.89e-04 - I: 1 263 111 +1.08e-01,+2.55e-01,+3.93e+00,+3.94e+00 2 -151 - O: 2 478 22 +1.10e-01,+2.16e-01,+2.55e+00,+2.56e+00 1 (nil) - 479 22 -2.65e-03,+3.91e-02,+1.38e+00,+1.38e+00 1 (nil) -Vertex: -152 ID: 0 (X,cT)=-6.14e-05,-3.82e-05,+7.27e-04,+7.31e-04 - I: 1 265 111 -3.21e-01,-1.99e-01,+3.80e+00,+3.82e+00 2 -152 - O: 2 480 22 -2.34e-01,-1.54e-01,+3.28e+00,+3.29e+00 1 (nil) - 481 22 -8.72e-02,-4.50e-02,+5.19e-01,+5.28e-01 1 (nil) -Vertex: -153 ID: 0 (X,cT)=-2.19e-06,-3.00e-06,+3.58e-04,+3.58e-04 - I: 1 267 111 -1.18e-01,-1.61e-01,+1.92e+01,+1.92e+01 2 -153 - O: 2 482 22 -9.69e-02,-1.72e-01,+1.33e+01,+1.34e+01 1 (nil) - 483 22 -2.08e-02,+1.15e-02,+5.82e+00,+5.82e+00 1 (nil) -Vertex: -154 ID: 0 (X,cT)=-9.00e-04,+6.71e-04,+1.89e-01,+1.89e-01 - I: 1 273 111 -1.19e+00,+8.85e-01,+2.49e+02,+2.49e+02 2 -154 - O: 2 484 22 -5.91e-01,+4.58e-01,+1.37e+02,+1.37e+02 1 (nil) - 485 22 -5.96e-01,+4.27e-01,+1.12e+02,+1.12e+02 1 (nil) -Vertex: -155 ID: 0 (X,cT)=-5.19e-06,+2.77e-05,+9.61e-03,+9.61e-03 - I: 1 275 111 -3.94e-02,+2.10e-01,+7.29e+01,+7.29e+01 2 -155 - O: 2 486 22 -5.34e-02,+1.01e-01,+2.01e+01,+2.01e+01 1 (nil) - 487 22 +1.40e-02,+1.09e-01,+5.28e+01,+5.28e+01 1 (nil) -Vertex: -156 ID: 0 (X,cT)=-3.80e-05,+2.22e-05,+1.37e-02,+1.37e-02 - I: 1 280 111 -1.09e-01,+6.39e-02,+3.93e+01,+3.93e+01 2 -156 - O: 2 488 22 -5.83e-02,+1.46e-02,+3.27e+01,+3.27e+01 1 (nil) - 489 22 -5.08e-02,+4.93e-02,+6.60e+00,+6.60e+00 1 (nil) -Vertex: -157 ID: 0 (X,cT)=+6.48e-05,+4.92e-04,+1.80e-02,+1.80e-02 - I: 1 284 111 +1.27e-01,+9.61e-01,+3.52e+01,+3.52e+01 2 -157 - O: 2 490 22 -2.52e-02,+2.35e-01,+8.00e+00,+8.00e+00 1 (nil) - 491 22 +1.52e-01,+7.26e-01,+2.72e+01,+2.72e+01 1 (nil) -Vertex: -158 ID: 0 (X,cT)=+1.48e-04,+1.07e-04,+1.80e-03,+1.81e-03 - I: 1 285 111 +2.92e-01,+2.10e-01,+3.56e+00,+3.58e+00 2 -158 - O: 2 492 22 +2.42e-01,+1.03e-01,+2.23e+00,+2.25e+00 1 (nil) - 493 22 +5.02e-02,+1.07e-01,+1.33e+00,+1.33e+00 1 (nil) -Vertex: -159 ID: 0 (X,cT)=+2.50e-05,+3.78e-05,+5.99e-04,+6.03e-04 - I: 1 286 111 +7.22e-02,+1.09e-01,+1.73e+00,+1.74e+00 2 -159 - O: 2 494 22 +2.13e-02,+6.88e-02,+1.49e+00,+1.49e+00 1 (nil) - 495 22 +5.09e-02,+4.05e-02,+2.47e-01,+2.55e-01 1 (nil) -Vertex: -160 ID: 0 (X,cT)=+2.02e-05,+3.78e-06,+1.16e-03,+1.16e-03 - I: 1 287 111 +5.73e-02,+1.07e-02,+3.27e+00,+3.27e+00 2 -160 - O: 2 496 22 -1.28e-02,-2.31e-02,+1.49e-01,+1.51e-01 1 (nil) - 497 22 +7.01e-02,+3.38e-02,+3.12e+00,+3.12e+00 1 (nil) -Vertex: -161 ID: 0 (X,cT)=+9.91e-05,+2.78e-04,+4.67e-03,+4.68e-03 - I: 1 289 111 +4.18e-01,+1.18e+00,+1.97e+01,+1.98e+01 2 -161 - O: 2 498 22 +2.65e-01,+6.35e-01,+1.17e+01,+1.18e+01 1 (nil) - 499 22 +1.54e-01,+5.40e-01,+7.99e+00,+8.01e+00 1 (nil) -GenVertex: -162 ID: 0 (X,cT):0 - I: 1 294 221 +9.56e-01,+1.28e+00,+1.76e+01,+1.77e+01 2 -162 - O: 3 500 111 +3.73e-01,+4.04e-01,+4.84e+00,+4.87e+00 2 -212 - 501 111 +4.30e-01,+7.17e-01,+9.92e+00,+9.96e+00 2 -213 - 502 111 +1.53e-01,+1.59e-01,+2.85e+00,+2.86e+00 2 -214 -Vertex: -163 ID: 0 (X,cT)=+2.58e-04,-2.44e-04,+2.53e-03,+2.55e-03 - I: 1 296 111 +1.69e+00,-1.60e+00,+1.65e+01,+1.67e+01 2 -163 - O: 2 503 22 +1.04e+00,-1.02e+00,+1.08e+01,+1.09e+01 1 (nil) - 504 22 +6.52e-01,-5.77e-01,+5.78e+00,+5.84e+00 1 (nil) -Vertex: -164 ID: 0 (X,cT)=+2.91e+01,-1.32e+01,+2.80e+02,+2.82e+02 - I: 1 297 310 +6.37e-01,-2.90e-01,+6.13e+00,+6.19e+00 2 -164 - O: 2 505 -211 +1.68e-01,+3.96e-04,+7.88e-01,+8.18e-01 1 (nil) - 506 211 +4.69e-01,-2.90e-01,+5.34e+00,+5.37e+00 1 (nil) -Vertex: -165 ID: 0 (X,cT)=-3.01e+00,-5.05e+01,+1.82e+02,+1.91e+02 - I: 1 299 310 -5.64e-02,-9.48e-01,+3.42e+00,+3.58e+00 2 -165 - O: 2 507 211 -9.80e-03,-8.77e-01,+3.10e+00,+3.22e+00 1 (nil) - 508 -211 -4.66e-02,-7.14e-02,+3.18e-01,+3.57e-01 1 (nil) -Vertex: -166 ID: 0 (X,cT)=+5.65e-06,-7.57e-05,+2.42e-04,+2.55e-04 - I: 1 301 111 +2.32e-02,-3.11e-01,+9.92e-01,+1.05e+00 2 -166 - O: 2 509 22 -1.58e-02,-2.94e-01,+9.06e-01,+9.53e-01 1 (nil) - 510 22 +3.90e-02,-1.71e-02,+8.60e-02,+9.59e-02 1 (nil) -Vertex: -167 ID: 0 (X,cT)=-1.40e-04,-1.73e-04,+1.47e-04,+2.68e-04 - I: 1 305 111 -7.25e-01,-8.95e-01,+7.64e-01,+1.39e+00 2 -167 - O: 2 511 22 -1.23e-01,-1.25e-01,+1.74e-01,+2.47e-01 1 (nil) - 512 22 -6.01e-01,-7.71e-01,+5.90e-01,+1.14e+00 1 (nil) -Vertex: -168 ID: 0 (X,cT)=-2.82e-04,-3.80e-04,+1.23e-04,+4.92e-04 - I: 1 307 111 -7.03e-01,-9.49e-01,+3.08e-01,+1.23e+00 2 -168 - O: 2 513 22 -4.88e-01,-5.82e-01,+1.49e-01,+7.74e-01 1 (nil) - 514 22 -2.15e-01,-3.67e-01,+1.58e-01,+4.54e-01 1 (nil) -Vertex: -169 ID: 0 (X,cT)=-3.47e-04,-5.20e-04,-6.20e-04,+8.81e-04 - I: 1 311 111 -1.10e+00,-1.65e+00,-1.97e+00,+2.80e+00 2 -169 - O: 2 515 22 -1.08e+00,-1.63e+00,-1.96e+00,+2.76e+00 1 (nil) - 516 22 -2.45e-02,-2.46e-02,-1.45e-02,+3.76e-02 1 (nil) -Vertex: -170 ID: 0 (X,cT)=-3.29e-06,+1.10e-06,-2.41e-06,+4.57e-06 - I: 1 313 111 -2.55e-01,+8.51e-02,-1.87e-01,+3.54e-01 2 -170 - O: 2 517 22 -1.13e-01,-2.84e-02,-9.56e-02,+1.51e-01 1 (nil) - 518 22 -1.42e-01,+1.13e-01,-9.12e-02,+2.04e-01 1 (nil) -Vertex: -171 ID: 0 (X,cT)=-2.73e+00,+6.86e+00,-1.26e+01,+1.53e+01 - I: 1 314 310 -2.88e-01,+7.23e-01,-1.33e+00,+1.62e+00 2 -171 - O: 2 519 -211 -3.73e-01,+4.98e-01,-1.02e+00,+1.20e+00 1 (nil) - 520 211 +8.58e-02,+2.25e-01,-3.14e-01,+4.20e-01 1 (nil) -Vertex: -172 ID: 0 (X,cT)=+3.20e-04,+3.36e-05,-5.97e-04,+6.84e-04 - I: 1 318 111 +4.68e-01,+4.92e-02,-8.74e-01,+1.00e+00 2 -172 - O: 2 521 22 +1.99e-02,+1.62e-02,-1.31e-01,+1.33e-01 1 (nil) - 522 22 +4.48e-01,+3.29e-02,-7.43e-01,+8.69e-01 1 (nil) -Vertex: -173 ID: 0 (X,cT)=+1.96e-05,+4.48e-05,-3.57e-03,+3.57e-03 - I: 1 331 111 +1.15e-01,+2.64e-01,-2.11e+01,+2.11e+01 2 -173 - O: 2 523 22 +5.11e-03,+1.71e-01,-1.28e+01,+1.28e+01 1 (nil) - 524 22 +1.10e-01,+9.28e-02,-8.25e+00,+8.26e+00 1 (nil) -Vertex: -174 ID: 0 (X,cT)=+5.52e-05,+5.68e-07,-2.13e-03,+2.13e-03 - I: 1 334 111 +1.60e-01,+1.64e-03,-6.16e+00,+6.16e+00 2 -174 - O: 2 525 22 +9.75e-02,+6.03e-02,-2.60e+00,+2.61e+00 1 (nil) - 526 22 +6.22e-02,-5.86e-02,-3.55e+00,+3.56e+00 1 (nil) -Vertex: -175 ID: 0 (X,cT)=+5.38e-05,-1.78e-05,-4.71e-04,+4.74e-04 - I: 1 335 111 +3.20e-01,-1.06e-01,-2.80e+00,+2.83e+00 2 -175 - O: 2 527 22 +5.30e-02,+1.88e-02,-7.85e-01,+7.87e-01 1 (nil) - 528 22 +2.67e-01,-1.25e-01,-2.02e+00,+2.04e+00 1 (nil) -Vertex: -176 ID: 0 (X,cT)=+2.93e-05,+8.83e-06,-3.69e-04,+3.70e-04 - I: 1 336 111 +2.91e-01,+8.79e-02,-3.67e+00,+3.68e+00 2 -176 - O: 2 529 22 +2.68e-01,+3.23e-02,-2.79e+00,+2.81e+00 1 (nil) - 530 22 +2.34e-02,+5.56e-02,-8.74e-01,+8.76e-01 1 (nil) -Vertex: -177 ID: 0 (X,cT)=+1.18e-05,+1.50e-06,-2.95e-04,+2.98e-04 - I: 1 337 111 +4.06e-02,+5.17e-03,-1.02e+00,+1.02e+00 2 -177 - O: 2 531 22 -1.54e-02,-5.04e-02,-2.38e-01,+2.44e-01 1 (nil) - 532 22 +5.60e-02,+5.56e-02,-7.77e-01,+7.81e-01 1 (nil) -Vertex: -178 ID: 0 (X,cT)=+3.27e-04,+1.05e-03,-1.22e-02,+1.23e-02 - I: 1 339 111 +5.88e-01,+1.89e+00,-2.20e+01,+2.20e+01 2 -178 - O: 2 533 22 +9.44e-02,+2.34e-01,-3.28e+00,+3.29e+00 1 (nil) - 534 22 +4.93e-01,+1.65e+00,-1.87e+01,+1.88e+01 1 (nil) -Vertex: -179 ID: 0 (X,cT)=+1.73e-05,+8.31e-04,-1.74e-02,+1.74e-02 - I: 1 347 111 +1.51e-02,+7.22e-01,-1.51e+01,+1.51e+01 2 -179 - O: 2 535 22 -3.85e-02,+1.69e-01,-2.84e+00,+2.85e+00 1 (nil) - 536 22 +5.35e-02,+5.53e-01,-1.22e+01,+1.23e+01 1 (nil) -Vertex: -180 ID: 0 (X,cT)=+1.08e-05,+1.04e-05,-2.06e-04,+2.08e-04 - I: 1 349 111 +5.56e-02,+5.31e-02,-1.06e+00,+1.07e+00 2 -180 - O: 2 537 22 -2.80e-02,+6.26e-02,-5.73e-01,+5.77e-01 1 (nil) - 538 22 +8.36e-02,-9.58e-03,-4.84e-01,+4.91e-01 1 (nil) -GenVertex: -181 ID: 0 (X,cT):0 - I: 1 352 -311 +4.98e-01,+5.10e-01,-7.52e+00,+7.57e+00 2 -181 - O: 1 539 310 +4.98e-01,+5.10e-01,-7.52e+00,+7.57e+00 2 -215 -Vertex: -182 ID: 0 (X,cT)=+8.78e-05,+1.31e-05,-1.01e-03,+1.01e-03 - I: 1 353 111 +9.21e-01,+1.38e-01,-1.06e+01,+1.06e+01 2 -182 - O: 2 540 22 +2.76e-01,+8.46e-03,-3.75e+00,+3.76e+00 1 (nil) - 541 22 +6.45e-01,+1.29e-01,-6.82e+00,+6.85e+00 1 (nil) -Vertex: -183 ID: 0 (X,cT)=-2.61e-05,-7.86e-05,-8.03e-03,+8.03e-03 - I: 1 355 111 -1.59e-01,-4.77e-01,-4.88e+01,+4.88e+01 2 -183 - O: 2 542 22 -7.47e-03,+4.92e-03,-2.71e-01,+2.71e-01 1 (nil) - 543 22 -1.51e-01,-4.82e-01,-4.85e+01,+4.85e+01 1 (nil) -Vertex: -184 ID: 0 (X,cT)=+3.04e-05,-1.20e-04,-6.56e-03,+6.56e-03 - I: 1 359 111 +6.89e-02,-2.71e-01,-1.49e+01,+1.49e+01 2 -184 - O: 2 544 22 +1.36e-02,-6.16e-02,-1.31e+00,+1.31e+00 1 (nil) - 545 22 +5.54e-02,-2.10e-01,-1.35e+01,+1.35e+01 1 (nil) -Vertex: -185 ID: 0 (X,cT)=-3.11e-05,-4.88e-05,-3.97e-03,+3.97e-03 - I: 1 362 111 -2.65e-01,-4.16e-01,-3.38e+01,+3.38e+01 2 -185 - O: 2 546 22 -2.39e-02,-6.37e-02,-2.40e+00,+2.40e+00 1 (nil) - 547 22 -2.41e-01,-3.52e-01,-3.14e+01,+3.14e+01 1 (nil) -Vertex: -186 ID: 0 (X,cT)=+4.99e-06,-7.81e-06,-4.87e-04,+4.87e-04 - I: 1 364 111 +7.55e-02,-1.18e-01,-7.35e+00,+7.36e+00 2 -186 - O: 3 549 11 +3.80e-02,-5.45e-02,-1.98e+00,+1.99e+00 1 (nil) - 548 22 -7.69e-03,-3.50e-03,-3.43e+00,+3.43e+00 1 (nil) - 550 -11 +4.52e-02,-6.00e-02,-1.94e+00,+1.94e+00 1 (nil) -Vertex: -187 ID: 0 (X,cT)=-3.39e-06,-5.26e-06,-1.10e-03,+1.10e-03 - I: 1 372 111 -6.13e-02,-9.53e-02,-1.99e+01,+1.99e+01 2 -187 - O: 2 551 22 +3.73e-02,+2.39e-03,-4.50e+00,+4.50e+00 1 (nil) - 552 22 -9.86e-02,-9.77e-02,-1.54e+01,+1.54e+01 1 (nil) -Vertex: -188 ID: 0 (X,cT)=-4.64e-06,+5.62e-06,+2.46e-05,+2.68e-05 - I: 1 379 111 -7.99e-02,+9.68e-02,+4.23e-01,+4.62e-01 2 -188 - O: 2 553 22 -6.55e-03,+1.04e-01,+1.84e-01,+2.11e-01 1 (nil) - 554 22 -7.33e-02,-6.90e-03,+2.39e-01,+2.50e-01 1 (nil) -Vertex: -189 ID: 0 (X,cT)=-4.97e-05,+1.48e-05,+2.90e-04,+2.95e-04 - I: 1 381 111 -3.23e-01,+9.61e-02,+1.88e+00,+1.91e+00 2 -189 - O: 2 555 22 -1.22e-01,-2.90e-02,+7.14e-01,+7.25e-01 1 (nil) - 556 22 -2.00e-01,+1.25e-01,+1.16e+00,+1.19e+00 1 (nil) -Vertex: -190 ID: 0 (X,cT)=+4.11e-06,-1.39e-06,+1.15e-04,+1.15e-04 - I: 1 386 111 +1.99e-01,-6.72e-02,+5.57e+00,+5.57e+00 2 -190 - O: 2 557 22 +9.39e-02,+3.48e-02,+1.85e+00,+1.85e+00 1 (nil) - 558 22 +1.05e-01,-1.02e-01,+3.72e+00,+3.72e+00 1 (nil) -GenVertex: -191 ID: 0 (X,cT):0 - I: 1 388 113 +8.30e-02,-2.83e-01,+1.61e+01,+1.61e+01 2 -191 - O: 2 559 211 +2.80e-01,-4.59e-01,+9.99e+00,+1.00e+01 1 (nil) - 560 -211 -1.97e-01,+1.77e-01,+6.12e+00,+6.13e+00 1 (nil) -Vertex: -192 ID: 0 (X,cT)=-3.81e+00,+2.43e+00,-3.67e+01,+3.70e+01 - I: 1 397 323 -2.16e+01,+1.35e+01,-2.09e+02,+2.11e+02 2 -192 - O: 2 561 311 -1.87e+01,+1.16e+01,-1.82e+02,+1.84e+02 2 -216 - 562 211 -2.87e+00,+1.93e+00,-2.71e+01,+2.73e+01 1 (nil) -GenVertex: -193 ID: 0 (X,cT):0 - I: 1 399 -311 -4.47e-01,+3.05e-01,-6.33e+00,+6.37e+00 2 -193 - O: 1 563 310 -4.47e-01,+3.05e-01,-6.33e+00,+6.37e+00 2 -217 -Vertex: -194 ID: 0 (X,cT)=-3.15e-04,+1.64e-04,-3.28e-03,+3.30e-03 - I: 1 400 111 -1.24e+00,+6.47e-01,-1.29e+01,+1.30e+01 2 -194 - O: 2 564 22 -2.94e-01,+1.77e-01,-3.70e+00,+3.71e+00 1 (nil) - 565 22 -9.48e-01,+4.69e-01,-9.23e+00,+9.29e+00 1 (nil) -GenVertex: -195 ID: 0 (X,cT):0 - I: 1 401 311 -9.33e-01,+9.63e-01,-1.12e+01,+1.13e+01 2 -195 - O: 1 566 310 -9.33e-01,+9.63e-01,-1.12e+01,+1.13e+01 2 -218 -Vertex: -196 ID: 0 (X,cT)=-6.57e-06,+3.84e-06,-3.95e-05,+4.09e-05 - I: 1 404 111 -1.17e-01,+6.82e-02,-7.01e-01,+7.26e-01 2 -196 - O: 2 567 22 +1.75e-02,+4.41e-02,-2.82e-01,+2.86e-01 1 (nil) - 568 22 -1.34e-01,+2.41e-02,-4.19e-01,+4.40e-01 1 (nil) -Vertex: -197 ID: 0 (X,cT)=-4.47e-05,-7.78e-05,+3.13e-05,+9.80e-05 - I: 1 410 111 -2.51e-01,-4.37e-01,+1.76e-01,+5.51e-01 2 -197 - O: 2 569 22 -1.16e-01,-2.11e-01,+1.32e-02,+2.41e-01 1 (nil) - 570 22 -1.36e-01,-2.27e-01,+1.63e-01,+3.10e-01 1 (nil) -Vertex: -198 ID: 0 (X,cT)=-4.20e-06,+2.71e-05,+4.10e-05,+4.99e-05 - I: 1 412 111 -7.90e-02,+5.11e-01,+7.72e-01,+9.39e-01 2 -198 - O: 2 571 22 -9.13e-02,+4.77e-01,+7.59e-01,+9.01e-01 1 (nil) - 572 22 +1.23e-02,+3.33e-02,+1.37e-02,+3.81e-02 1 (nil) -Vertex: -199 ID: 0 (X,cT)=+2.92e-05,+4.15e-05,-5.58e-06,+5.45e-05 - I: 1 416 111 +2.06e-01,+2.93e-01,-3.94e-02,+3.85e-01 2 -199 - O: 2 573 22 +2.03e-01,+2.67e-01,-7.22e-02,+3.43e-01 1 (nil) - 574 22 +3.43e-03,+2.63e-02,+3.28e-02,+4.22e-02 1 (nil) -Vertex: -200 ID: 0 (X,cT)=-2.16e-05,+1.04e-05,+8.87e-06,+2.79e-05 - I: 1 420 111 -2.59e-01,+1.24e-01,+1.06e-01,+3.34e-01 2 -200 - O: 2 575 22 -3.89e-02,+8.36e-02,+4.53e-02,+1.03e-01 1 (nil) - 576 22 -2.20e-01,+4.05e-02,+6.09e-02,+2.32e-01 1 (nil) -Vertex: -201 ID: 0 (X,cT)=-5.59e-05,+5.21e-05,+8.09e-04,+8.13e-04 - I: 1 422 111 -3.29e-01,+3.07e-01,+4.76e+00,+4.78e+00 2 -201 - O: 2 577 22 -2.64e-01,+1.59e-01,+3.14e+00,+3.16e+00 1 (nil) - 578 22 -6.51e-02,+1.48e-01,+1.62e+00,+1.62e+00 1 (nil) -Vertex: -202 ID: 0 (X,cT)=+2.56e-05,-2.90e-06,+8.11e-06,+2.82e-05 - I: 1 427 111 +4.14e-01,-4.69e-02,+1.31e-01,+4.58e-01 2 -202 - O: 2 579 22 +4.15e-01,-2.52e-02,+1.20e-01,+4.33e-01 1 (nil) - 580 22 -9.68e-04,-2.17e-02,+1.13e-02,+2.45e-02 1 (nil) -Vertex: -203 ID: 0 (X,cT)=-9.79e-05,+5.68e-05,+6.63e-05,+1.32e-04 - I: 1 431 111 -7.34e-01,+4.26e-01,+4.97e-01,+9.93e-01 2 -203 - O: 2 581 22 -3.41e-01,+2.71e-01,+2.25e-01,+4.90e-01 1 (nil) - 582 22 -3.94e-01,+1.56e-01,+2.73e-01,+5.03e-01 1 (nil) -Vertex: -204 ID: 0 (X,cT)=+1.01e-05,-5.45e-05,-6.08e-06,+5.98e-05 - I: 1 434 111 +6.29e-02,-3.41e-01,-3.80e-02,+3.74e-01 2 -204 - O: 2 583 22 +5.58e-02,-8.25e-02,+3.46e-02,+1.05e-01 1 (nil) - 584 22 +7.11e-03,-2.58e-01,-7.26e-02,+2.69e-01 1 (nil) -Vertex: -205 ID: 0 (X,cT)=-3.75e-05,-4.46e-06,+3.21e-06,+5.29e-05 - I: 1 437 111 -1.37e-01,-1.63e-02,+1.18e-02,+1.94e-01 2 -205 - O: 2 585 22 -9.46e-02,+4.14e-02,+4.73e-02,+1.14e-01 1 (nil) - 586 22 -4.29e-02,-5.77e-02,-3.55e-02,+8.02e-02 1 (nil) -Vertex: -206 ID: 0 (X,cT)=+1.58e-01,-6.64e-02,-8.93e-01,+9.27e-01 - I: 1 438 10323 +8.73e-01,-6.30e-01,-7.46e+00,+7.64e+00 2 -206 - O: 2 587 321 +3.86e-01,-2.73e-01,-2.92e+00,+3.00e+00 1 (nil) - 588 223 +4.87e-01,-3.58e-01,-4.53e+00,+4.64e+00 2 -219 -Vertex: -207 ID: 0 (X,cT)=+6.34e+00,+1.12e+01,-3.83e+01,+4.12e+01 - I: 1 442 310 +3.84e-01,+6.75e-01,-2.32e+00,+2.49e+00 2 -207 - O: 2 589 -211 +1.48e-01,+5.93e-01,-1.74e+00,+1.85e+00 1 (nil) - 590 211 +2.36e-01,+8.15e-02,-5.72e-01,+6.40e-01 1 (nil) -Vertex: -208 ID: 0 (X,cT)=+6.83e+00,+2.32e+01,-1.43e+02,+1.45e+02 - I: 1 443 310 +4.92e-01,+1.67e+00,-1.03e+01,+1.05e+01 2 -208 - O: 2 591 211 +2.44e-01,+1.36e+00,-7.90e+00,+8.02e+00 1 (nil) - 592 -211 +2.48e-01,+3.05e-01,-2.40e+00,+2.43e+00 1 (nil) -Vertex: -209 ID: 0 (X,cT)=+9.00e-01,-4.13e-01,-2.42e+00,+2.63e+00 - I: 1 461 -313 +3.33e+00,-1.55e+00,-7.24e+00,+8.16e+00 2 -209 - O: 2 593 -321 +2.28e+00,-1.05e+00,-5.51e+00,+6.07e+00 1 (nil) - 594 211 +1.05e+00,-5.07e-01,-1.73e+00,+2.09e+00 1 (nil) -Vertex: -210 ID: 0 (X,cT)=+9.00e-01,-4.13e-01,-2.42e+00,+2.63e+00 - I: 1 462 111 +2.92e+00,-1.31e+00,-9.56e+00,+1.01e+01 2 -210 - O: 2 595 22 +2.61e+00,-1.13e+00,-8.44e+00,+8.90e+00 1 (nil) - 596 22 +3.12e-01,-1.85e-01,-1.12e+00,+1.18e+00 1 (nil) -Vertex: -211 ID: 0 (X,cT)=+1.16e-05,-1.47e-05,-9.04e-06,+2.29e-05 - I: 1 469 111 +1.61e-01,-2.04e-01,-1.26e-01,+3.19e-01 2 -211 - O: 2 597 22 +1.53e-02,-6.02e-02,-9.24e-02,+1.11e-01 1 (nil) - 598 22 +1.46e-01,-1.44e-01,-3.35e-02,+2.08e-01 1 (nil) -Vertex: -212 ID: 0 (X,cT)=+4.54e-05,+4.92e-05,+5.89e-04,+5.93e-04 - I: 1 500 111 +3.73e-01,+4.04e-01,+4.84e+00,+4.87e+00 2 -212 - O: 2 599 22 +6.24e-02,+9.07e-02,+5.92e-01,+6.02e-01 1 (nil) - 600 22 +3.10e-01,+3.13e-01,+4.25e+00,+4.27e+00 1 (nil) -Vertex: -213 ID: 0 (X,cT)=+1.06e-05,+1.77e-05,+2.45e-04,+2.46e-04 - I: 1 501 111 +4.30e-01,+7.17e-01,+9.92e+00,+9.96e+00 2 -213 - O: 2 601 22 +2.70e-01,+3.42e-01,+4.68e+00,+4.70e+00 1 (nil) - 602 22 +1.60e-01,+3.75e-01,+5.24e+00,+5.26e+00 1 (nil) -Vertex: -214 ID: 0 (X,cT)=+3.42e-05,+3.55e-05,+6.36e-04,+6.39e-04 - I: 1 502 111 +1.53e-01,+1.59e-01,+2.85e+00,+2.86e+00 2 -214 - O: 2 603 22 +1.66e-01,+9.32e-02,+2.21e+00,+2.21e+00 1 (nil) - 604 22 -1.33e-02,+6.57e-02,+6.40e-01,+6.43e-01 1 (nil) -Vertex: -215 ID: 0 (X,cT)=+2.34e+01,+2.39e+01,-3.53e+02,+3.55e+02 - I: 1 539 310 +4.98e-01,+5.10e-01,-7.52e+00,+7.57e+00 2 -215 - O: 2 605 -211 -2.61e-02,+1.43e-01,-1.27e+00,+1.29e+00 1 (nil) - 606 211 +5.24e-01,+3.67e-01,-6.25e+00,+6.28e+00 1 (nil) -Vertex: -216 ID: 0 (X,cT)=-3.81e+00,+2.43e+00,-3.67e+01,+3.70e+01 - I: 1 561 311 -1.87e+01,+1.16e+01,-1.82e+02,+1.84e+02 2 -216 - O: 1 607 130 -1.87e+01,+1.16e+01,-1.82e+02,+1.84e+02 1 (nil) -Vertex: -217 ID: 0 (X,cT)=-8.57e+01,+5.84e+01,-1.21e+03,+1.22e+03 - I: 1 563 310 -4.47e-01,+3.05e-01,-6.33e+00,+6.37e+00 2 -217 - O: 2 608 111 -3.60e-01,+3.29e-01,-3.33e+00,+3.37e+00 2 -220 - 609 111 -8.72e-02,-2.40e-02,-2.99e+00,+3.00e+00 2 -221 -Vertex: -218 ID: 0 (X,cT)=-1.70e+00,+1.75e+00,-2.03e+01,+2.05e+01 - I: 1 566 310 -9.33e-01,+9.63e-01,-1.12e+01,+1.13e+01 2 -218 - O: 2 610 111 -1.61e-01,+2.25e-01,-1.49e+00,+1.52e+00 2 -222 - 611 111 -7.72e-01,+7.38e-01,-9.69e+00,+9.75e+00 2 -223 -Vertex: -219 ID: 0 (X,cT)=+1.58e-01,-6.64e-02,-8.93e-01,+9.27e-01 - I: 1 588 223 +4.87e-01,-3.58e-01,-4.53e+00,+4.64e+00 2 -219 - O: 3 612 -211 +3.21e-01,-2.23e-01,-1.77e+00,+1.82e+00 1 (nil) - 613 211 +1.03e-01,-2.97e-01,-2.00e+00,+2.03e+00 1 (nil) - 614 111 +6.30e-02,+1.63e-01,-7.63e-01,+7.94e-01 2 -224 -Vertex: -220 ID: 0 (X,cT)=-8.57e+01,+5.84e+01,-1.21e+03,+1.22e+03 - I: 1 608 111 -3.60e-01,+3.29e-01,-3.33e+00,+3.37e+00 2 -220 - O: 2 615 22 -3.26e-01,+2.76e-01,-3.12e+00,+3.15e+00 1 (nil) - 616 22 -3.41e-02,+5.33e-02,-2.15e-01,+2.24e-01 1 (nil) -Vertex: -221 ID: 0 (X,cT)=-8.57e+01,+5.84e+01,-1.21e+03,+1.22e+03 - I: 1 609 111 -8.72e-02,-2.40e-02,-2.99e+00,+3.00e+00 2 -221 - O: 2 617 22 -1.01e-01,+2.75e-02,-2.29e+00,+2.30e+00 1 (nil) - 618 22 +1.37e-02,-5.15e-02,-7.01e-01,+7.03e-01 1 (nil) -Vertex: -222 ID: 0 (X,cT)=-1.70e+00,+1.75e+00,-2.03e+01,+2.05e+01 - I: 1 610 111 -1.61e-01,+2.25e-01,-1.49e+00,+1.52e+00 2 -222 - O: 2 619 22 -7.30e-02,+2.04e-01,-1.01e+00,+1.03e+00 1 (nil) - 620 22 -8.76e-02,+2.04e-02,-4.77e-01,+4.85e-01 1 (nil) -Vertex: -223 ID: 0 (X,cT)=-1.70e+00,+1.75e+00,-2.03e+01,+2.05e+01 - I: 1 611 111 -7.72e-01,+7.38e-01,-9.69e+00,+9.75e+00 2 -223 - O: 2 621 22 -6.72e-01,+5.71e-01,-7.86e+00,+7.91e+00 1 (nil) - 622 22 -1.00e-01,+1.67e-01,-1.82e+00,+1.83e+00 1 (nil) -Vertex: -224 ID: 0 (X,cT)=+1.58e-01,-6.64e-02,-8.93e-01,+9.27e-01 - I: 1 614 111 +6.30e-02,+1.63e-01,-7.63e-01,+7.94e-01 2 -224 - O: 2 623 22 -8.72e-03,-2.00e-02,-1.18e-01,+1.20e-01 1 (nil) - 624 22 +7.17e-02,+1.83e-01,-6.45e-01,+6.74e-01 1 (nil) -________________________________________________________________________________ -Stage 0->1 : 0 hits found in the muon chamber. -++++++++ event aborted ->>> Event 1 - 0 hits are stored in ExN04TrackerHitsCollection. - 0 hits are stored in ExN04CalorimeterHitsCollection. - Total energy deposition in calorimeter : 0 (GeV) - 0 hits are stored in ExN04MuonHitsCollection. -________________________________________________________________________________ -GenEvent: #3 ID=20 SignalProcessGenVertex Barcode: 0 - Current Memory Usage: 1 events, 102 vertices, 280 particles. - Entries this event: 102 vertices, 280 particles. - RndmState(0)= - Wgts(0)= - EventScale -1 GeV alphaQCD=-1 alphaQED=-1 - GenParticle Legend - Barcode PDG ID ( Px, Py, Pz, E ) Stat DecayVtx -________________________________________________________________________________ -GenVertex: -1 ID: 0 (X,cT):0 - I: 1 1 2212 +0.00e+00,+0.00e+00,+7.00e+03,+7.00e+03 3 -1 - O: 3 3 21 +5.50e-01,+2.26e-01,+5.57e+01,+5.57e+01 3 -3 - 14 2101 -9.42e-01,+2.17e-01,+6.53e+03,+6.53e+03 2 -9 - 15 2 +3.93e-01,-4.42e-01,+2.02e+01,+2.03e+01 2 -11 -GenVertex: -2 ID: 0 (X,cT):0 - I: 1 2 2212 +0.00e+00,+0.00e+00,-7.00e+03,+7.00e+03 3 -2 - O: 2 29 2203 +2.49e+00,+5.11e-01,-5.57e+03,+5.57e+03 2 -11 - 4 1 -2.49e+00,-5.11e-01,-1.27e+03,+1.27e+03 3 -4 -GenVertex: -3 ID: 0 (X,cT):0 - I: 1 3 21 +5.50e-01,+2.26e-01,+5.57e+01,+5.57e+01 3 -3 - O: 4 16 21 +1.28e+00,-8.74e-01,+5.02e+01,+5.02e+01 2 -11 - 13 2 -1.06e+00,+5.40e-01,+6.25e-01,+1.38e+00 2 -9 - 17 21 -1.67e-01,+9.43e-01,-4.22e+00,+4.33e+00 2 -11 - 5 -2 +5.15e-01,-3.71e-01,+4.37e+00,+4.41e+00 3 -5 -GenVertex: -4 ID: 0 (X,cT):0 - I: 1 4 1 -2.49e+00,-5.11e-01,-1.27e+03,+1.27e+03 3 -4 - O: 7 27 21 -8.57e-01,+1.30e+00,-8.64e+01,+8.64e+01 2 -11 - 28 21 +2.10e-01,-2.36e-01,-5.04e+02,+5.04e+02 2 -11 - 6 1 +2.57e+00,+4.38e-01,-4.63e+02,+4.63e+02 3 -5 - 25 21 -4.72e-02,-2.81e-01,-7.30e+00,+7.31e+00 2 -11 - 26 21 -3.65e+00,+1.06e+00,-1.44e+02,+1.44e+02 2 -11 - 23 21 -6.21e-01,-2.83e+00,-4.24e+01,+4.25e+01 2 -11 - 24 21 -1.09e-01,+2.50e-02,-1.28e+01,+1.28e+01 2 -11 -GenVertex: -5 ID: 0 (X,cT):0 - I: 2 6 1 +2.57e+00,+4.38e-01,-4.63e+02,+4.63e+02 3 -5 - 5 -2 +5.15e-01,-3.71e-01,+4.37e+00,+4.41e+00 3 -5 - O: 2 8 -24 +2.48e+00,-4.66e+00,-4.53e+02,+4.60e+02 3 -7 - 7 22 +6.11e-01,+4.73e+00,-5.78e+00,+7.50e+00 3 -6 -GenVertex: -6 ID: 0 (X,cT):0 - I: 1 7 22 +6.11e-01,+4.73e+00,-5.78e+00,+7.50e+00 3 -6 - O: 1 9 22 +6.11e-01,+4.73e+00,-5.78e+00,+7.50e+00 1 (nil) -GenVertex: -7 ID: 0 (X,cT):0 - I: 1 8 -24 +2.48e+00,-4.66e+00,-4.53e+02,+4.60e+02 3 -7 - O: 1 10 -24 +2.48e+00,-4.66e+00,-4.53e+02,+4.60e+02 2 -8 -GenVertex: -8 ID: 0 (X,cT):0 - I: 1 10 -24 +2.48e+00,-4.66e+00,-4.53e+02,+4.60e+02 2 -8 - O: 2 11 13 +1.17e+01,+3.45e+01,-2.85e+02,+2.87e+02 1 (nil) - 12 -14 -9.19e+00,-3.92e+01,-1.68e+02,+1.73e+02 1 (nil) -GenVertex: -9 ID: 0 (X,cT):0 - I: 2 13 2 -1.06e+00,+5.40e-01,+6.25e-01,+1.38e+00 2 -9 - 14 2101 -9.42e-01,+2.17e-01,+6.53e+03,+6.53e+03 2 -9 - O: 1 35 92 -2.00e+00,+7.56e-01,+6.53e+03,+6.54e+03 2 -10 -GenVertex: -10 ID: 0 (X,cT):0 - I: 1 35 92 -2.00e+00,+7.56e-01,+6.53e+03,+6.54e+03 2 -10 - O: 9 44 2112 -3.44e-01,+2.18e-02,+5.44e+03,+5.44e+03 1 (nil) - 40 333 +4.67e-02,-1.10e-02,+6.10e+01,+6.10e+01 2 -19 - 41 -313 +6.61e-02,+2.00e-01,+1.02e+02,+1.02e+02 2 -20 - 38 -321 +5.75e-01,-1.63e-01,+3.07e+00,+3.17e+00 1 (nil) - 39 323 -4.93e-01,+1.18e-01,+1.14e+01,+1.14e+01 2 -18 - 36 321 -2.73e-01,+1.76e-01,+9.69e-01,+1.13e+00 1 (nil) - 37 333 -1.11e+00,+1.44e-01,+2.44e+00,+2.87e+00 2 -17 - 42 -211 +6.62e-01,+2.34e-03,+1.91e+01,+1.92e+01 1 (nil) - 43 213 -1.13e+00,+2.68e-01,+8.99e+02,+8.99e+02 2 -21 -GenVertex: -11 ID: 0 (X,cT):0 - I:15 16 21 +1.28e+00,-8.74e-01,+5.02e+01,+5.02e+01 2 -11 - 29 2203 +2.49e+00,+5.11e-01,-5.57e+03,+5.57e+03 2 -11 - 18 21 +9.34e-01,+2.91e+00,+1.97e+01,+2.00e+01 2 -11 - 22 21 -2.68e+00,+1.72e+00,-1.05e+02,+1.05e+02 2 -11 - 20 21 +2.14e+00,-4.17e+00,-7.24e+00,+8.62e+00 2 -11 - 27 21 -8.57e-01,+1.30e+00,-8.64e+01,+8.64e+01 2 -11 - 28 21 +2.10e-01,-2.36e-01,-5.04e+02,+5.04e+02 2 -11 - 25 21 -4.72e-02,-2.81e-01,-7.30e+00,+7.31e+00 2 -11 - 26 21 -3.65e+00,+1.06e+00,-1.44e+02,+1.44e+02 2 -11 - 15 2 +3.93e-01,-4.42e-01,+2.02e+01,+2.03e+01 2 -11 - 21 21 +2.68e+00,-1.72e+00,-3.07e+01,+3.09e+01 2 -11 - 17 21 -1.67e-01,+9.43e-01,-4.22e+00,+4.33e+00 2 -11 - 23 21 -6.21e-01,-2.83e+00,-4.24e+01,+4.25e+01 2 -11 - 24 21 -1.09e-01,+2.50e-02,-1.28e+01,+1.28e+01 2 -11 - 19 21 -2.14e+00,+4.17e+00,-2.51e+00,+5.32e+00 2 -11 - O: 1 45 92 -1.50e-01,+2.09e+00,-6.43e+03,+6.61e+03 2 -12 -GenVertex: -12 ID: 0 (X,cT):0 - I: 1 45 92 -1.50e-01,+2.09e+00,-6.43e+03,+6.61e+03 2 -12 - O:44 70 323 +1.48e+00,-9.63e-01,-1.55e+01,+1.56e+01 2 -39 - 71 -321 -2.78e-01,+3.30e-01,-8.84e+00,+8.87e+00 1 (nil) - 72 213 +4.81e-01,-1.41e-01,-1.37e+01,+1.37e+01 2 -40 - 73 111 -6.69e-01,+1.78e-01,-1.87e+01,+1.87e+01 2 -41 - 53 113 -2.30e-01,+1.48e-01,-1.62e+00,+1.84e+00 2 -27 - 54 223 +3.60e-01,+7.58e-01,+8.72e-01,+1.44e+00 2 -28 - 55 113 +1.21e-01,+1.16e-01,+9.83e-01,+1.26e+00 2 -29 - 46 211 +1.39e+00,-8.14e-01,+3.12e+01,+3.13e+01 1 (nil) - 49 113 +6.00e-01,-2.67e-01,+2.22e+00,+2.44e+00 2 -23 - 51 -313 +1.43e-02,+4.68e-01,-3.88e-01,+1.12e+00 2 -25 - 66 2114 +9.53e-01,-6.69e-01,-3.09e+00,+3.53e+00 2 -38 - 67 211 -1.36e-01,-6.50e-01,-8.86e-01,+1.12e+00 1 (nil) - 68 -2212 +8.49e-01,-2.09e+00,-5.29e+00,+5.82e+00 1 (nil) - 69 -211 +1.20e-01,+2.39e-01,-1.06e+00,+1.10e+00 1 (nil) - 50 323 -3.07e-01,-6.12e-02,-1.42e-02,+9.76e-01 2 -24 - 58 -321 +1.93e-01,+1.97e-01,+6.13e+00,+6.16e+00 1 (nil) - 59 223 -2.63e-01,+7.90e-01,+6.47e-01,+1.31e+00 2 -32 - 60 213 +1.35e-01,+1.08e+00,+5.74e-01,+1.37e+00 2 -33 - 89 223 +1.23e+00,+3.33e-01,-2.87e+03,+2.87e+03 2 -50 - 57 323 +1.76e-01,+4.23e-01,+1.93e+00,+2.16e+00 2 -31 - 62 213 -9.08e-02,+5.82e-01,-1.54e+00,+1.76e+00 2 -34 - 47 113 +6.88e-02,-1.41e-01,+2.65e+01,+2.66e+01 2 -22 - 48 -211 -3.37e-01,-1.68e-01,+9.43e+00,+9.44e+00 1 (nil) - 78 311 -2.78e-01,+5.33e-02,-1.90e+01,+1.90e+01 2 -44 - 79 -2112 -1.86e+00,+2.64e-01,-6.69e+01,+6.69e+01 1 (nil) - 80 -211 -4.20e-01,-6.99e-02,-4.46e+01,+4.47e+01 1 (nil) - 81 211 -1.23e+00,+5.35e-01,-3.48e+01,+3.49e+01 1 (nil) - 82 311 -1.74e-02,+2.33e-01,-6.04e+01,+6.04e+01 2 -45 - 83 -323 -5.63e-01,-7.34e-02,-1.48e+02,+1.48e+02 2 -46 - 84 211 -1.34e-01,-9.12e-02,-7.11e+00,+7.11e+00 1 (nil) - 85 113 +1.80e-02,+8.34e-01,-6.47e+02,+6.47e+02 2 -47 - 86 -211 +2.67e-01,-2.79e-01,-5.20e+02,+5.20e+02 1 (nil) - 87 213 +3.40e-01,+1.94e-01,-1.02e+03,+1.02e+03 2 -48 - 88 2214 +5.67e-01,+9.88e-02,-8.80e+02,+8.80e+02 2 -49 - 61 -211 -1.05e+00,+1.11e+00,-1.21e-01,+1.54e+00 1 (nil) - 63 221 +1.94e-01,-2.74e-01,-2.66e-01,+6.95e-01 2 -35 - 64 -213 +2.31e-01,+2.74e-01,-1.31e+00,+1.58e+00 2 -36 - 65 213 -4.52e-01,+2.86e-01,-1.23e+00,+1.57e+00 2 -37 - 74 -213 -3.45e-01,-1.71e-01,-1.77e+01,+1.77e+01 2 -42 - 75 2212 -3.93e-01,+8.27e-02,-3.98e+01,+3.98e+01 1 (nil) - 76 -2212 -6.65e-01,+6.91e-02,-2.61e+01,+2.61e+01 1 (nil) - 77 3224 -4.07e-01,-1.66e+00,-3.45e+01,+3.46e+01 2 -43 - 52 111 +8.08e-02,-1.35e-02,-7.15e-01,+7.33e-01 2 -26 - 56 -213 +8.69e-02,+1.01e+00,+7.42e+00,+7.52e+00 2 -30 -GenVertex: -13 ID: 0 (X,cT):0 - I: 3 31 21 -9.34e-01,-2.91e+00,+1.02e+02,+1.02e+02 2 -13 - 32 21 +3.00e+00,-2.35e+00,+2.97e+01,+3.00e+01 2 -13 - 30 21 -3.00e+00,+2.35e+00,+2.36e+02,+2.36e+02 2 -13 - O: 1 90 92 -9.34e-01,-2.91e+00,+3.67e+02,+3.67e+02 2 -14 -GenVertex: -14 ID: 0 (X,cT):0 - I: 1 90 92 -9.34e-01,-2.91e+00,+3.67e+02,+3.67e+02 2 -14 - O:11 93 -311 -2.08e-02,-2.14e-01,+2.11e+01,+2.11e+01 2 -51 - 94 313 -3.62e-01,+5.42e-01,+5.03e+01,+5.03e+01 2 -52 - 95 213 -8.94e-01,-3.47e-01,+5.52e+01,+5.52e+01 2 -53 - 96 113 -1.28e-01,-1.56e-01,+3.41e+01,+3.41e+01 2 -54 - 97 -211 -5.72e-01,-9.49e-01,+3.99e+01,+3.99e+01 1 (nil) - 98 111 +4.23e-01,-2.45e-01,+3.08e+00,+3.12e+00 2 -55 - 99 -2112 +1.14e+00,-1.49e+00,+2.49e+01,+2.50e+01 1 (nil) - 100 2112 +5.39e-01,-8.02e-01,+1.40e+01,+1.41e+01 1 (nil) - 91 211 -8.24e-01,-1.45e-02,+1.59e+01,+1.59e+01 1 (nil) - 92 -211 -1.30e+00,+8.92e-01,+8.32e+01,+8.33e+01 1 (nil) - 101 223 +1.06e+00,-1.22e-01,+2.53e+01,+2.53e+01 2 -56 -GenVertex: -15 ID: 0 (X,cT):0 - I: 2 33 21 +1.02e+00,-2.88e+00,-9.85e+00,+1.03e+01 2 -15 - 34 21 -1.02e+00,+2.88e+00,-7.45e+00,+8.05e+00 2 -15 - O: 1 102 92 +0.00e+00,+0.00e+00,-1.73e+01,+1.84e+01 2 -16 -GenVertex: -16 ID: 0 (X,cT):0 - I: 1 102 92 +0.00e+00,+0.00e+00,-1.73e+01,+1.84e+01 2 -16 - O: 7 107 -211 -2.88e-01,+5.23e-01,-3.10e+00,+3.16e+00 1 (nil) - 108 223 +2.53e-01,-1.38e-01,-2.52e+00,+2.66e+00 2 -61 - 109 113 -5.13e-01,+2.04e-01,-2.60e+00,+2.77e+00 2 -62 - 106 111 +1.94e-01,-8.30e-01,-1.78e+00,+1.98e+00 2 -60 - 103 113 +2.54e-01,-1.28e-01,-3.69e+00,+3.77e+00 2 -57 - 104 223 -7.85e-02,+4.34e-02,-9.82e-01,+1.26e+00 2 -58 - 105 213 +1.78e-01,+3.27e-01,-2.62e+00,+2.77e+00 2 -59 -GenVertex: -17 ID: 0 (X,cT):0 - I: 1 37 333 -1.11e+00,+1.44e-01,+2.44e+00,+2.87e+00 2 -17 - O: 2 110 321 -5.35e-01,-4.15e-03,+1.39e+00,+1.57e+00 1 (nil) - 111 -321 -5.74e-01,+1.48e-01,+1.05e+00,+1.30e+00 1 (nil) -GenVertex: -18 ID: 0 (X,cT):0 - I: 1 39 323 -4.93e-01,+1.18e-01,+1.14e+01,+1.14e+01 2 -18 - O: 2 112 311 -1.65e-01,+7.95e-02,+8.26e+00,+8.27e+00 2 -63 - 113 211 -3.29e-01,+3.86e-02,+3.09e+00,+3.12e+00 1 (nil) -GenVertex: -19 ID: 0 (X,cT):0 - I: 1 40 333 +4.67e-02,-1.10e-02,+6.10e+01,+6.10e+01 2 -19 - O: 2 114 321 -8.91e-02,+3.84e-02,+3.21e+01,+3.21e+01 1 (nil) - 115 -321 +1.36e-01,-4.94e-02,+2.89e+01,+2.89e+01 1 (nil) -GenVertex: -20 ID: 0 (X,cT):0 - I: 1 41 -313 +6.61e-02,+2.00e-01,+1.02e+02,+1.02e+02 2 -20 - O: 2 116 -311 -2.08e-01,+2.83e-01,+4.52e+01,+4.53e+01 2 -64 - 117 111 +2.74e-01,-8.21e-02,+5.65e+01,+5.65e+01 2 -65 -GenVertex: -21 ID: 0 (X,cT):0 - I: 1 43 213 -1.13e+00,+2.68e-01,+8.99e+02,+8.99e+02 2 -21 - O: 2 118 211 -1.03e+00,+4.32e-01,+6.38e+02,+6.38e+02 1 (nil) - 119 111 -1.00e-01,-1.65e-01,+2.61e+02,+2.61e+02 2 -66 -GenVertex: -22 ID: 0 (X,cT):0 - I: 1 47 113 +6.88e-02,-1.41e-01,+2.65e+01,+2.66e+01 2 -22 - O: 2 121 211 -1.86e-01,-1.31e-01,+3.23e+00,+3.24e+00 1 (nil) - 120 -211 +2.55e-01,-1.00e-02,+2.33e+01,+2.33e+01 1 (nil) -GenVertex: -23 ID: 0 (X,cT):0 - I: 1 49 113 +6.00e-01,-2.67e-01,+2.22e+00,+2.44e+00 2 -23 - O: 2 122 211 +7.62e-01,-2.15e-01,+1.64e+00,+1.83e+00 1 (nil) - 123 -211 -1.62e-01,-5.17e-02,+5.74e-01,+6.14e-01 1 (nil) -GenVertex: -24 ID: 0 (X,cT):0 - I: 1 50 323 -3.07e-01,-6.12e-02,-1.42e-02,+9.76e-01 2 -24 - O: 2 124 311 -4.48e-01,-2.27e-01,-7.65e-02,+7.11e-01 2 -67 - 125 211 +1.40e-01,+1.66e-01,+6.23e-02,+2.65e-01 1 (nil) -GenVertex: -25 ID: 0 (X,cT):0 - I: 1 51 -313 +1.43e-02,+4.68e-01,-3.88e-01,+1.12e+00 2 -25 - O: 2 126 -321 -2.60e-02,+2.92e-01,+9.54e-02,+5.82e-01 1 (nil) - 127 211 +4.03e-02,+1.76e-01,-4.83e-01,+5.35e-01 1 (nil) -Vertex: -26 ID: 0 (X,cT)=+4.64e-05,-7.72e-06,-4.10e-04,+4.20e-04 - I: 1 52 111 +8.08e-02,-1.35e-02,-7.15e-01,+7.33e-01 2 -26 - O: 2 128 22 -1.68e-02,+2.28e-02,-3.88e-02,+4.80e-02 1 (nil) - 129 22 +9.76e-02,-3.63e-02,-6.77e-01,+6.85e-01 1 (nil) -GenVertex: -27 ID: 0 (X,cT):0 - I: 1 53 113 -2.30e-01,+1.48e-01,-1.62e+00,+1.84e+00 2 -27 - O: 2 130 -211 -8.09e-02,+2.95e-01,-1.97e-01,+3.90e-01 1 (nil) - 131 211 -1.49e-01,-1.47e-01,-1.43e+00,+1.45e+00 1 (nil) -GenVertex: -28 ID: 0 (X,cT):0 - I: 1 54 223 +3.60e-01,+7.58e-01,+8.72e-01,+1.44e+00 2 -28 - O: 3 132 211 +1.97e-01,+3.51e-01,+6.75e-01,+7.98e-01 1 (nil) - 133 -211 -3.88e-02,+1.47e-01,+2.00e-01,+2.87e-01 1 (nil) - 134 111 +2.02e-01,+2.60e-01,-3.27e-03,+3.56e-01 2 -68 -GenVertex: -29 ID: 0 (X,cT):0 - I: 1 55 113 +1.21e-01,+1.16e-01,+9.83e-01,+1.26e+00 2 -29 - O: 2 135 -211 +1.15e-01,+2.71e-01,+9.97e-01,+1.05e+00 1 (nil) - 136 211 +5.83e-03,-1.56e-01,-1.47e-02,+2.10e-01 1 (nil) -GenVertex: -30 ID: 0 (X,cT):0 - I: 1 56 -213 +8.69e-02,+1.01e+00,+7.42e+00,+7.52e+00 2 -30 - O: 2 137 -211 -8.49e-03,+1.28e-01,+3.83e-01,+4.28e-01 1 (nil) - 138 111 +9.53e-02,+8.80e-01,+7.03e+00,+7.09e+00 2 -69 -GenVertex: -31 ID: 0 (X,cT):0 - I: 1 57 323 +1.76e-01,+4.23e-01,+1.93e+00,+2.16e+00 2 -31 - O: 2 139 311 +6.63e-02,+5.21e-01,+1.76e+00,+1.90e+00 2 -70 - 140 211 +1.10e-01,-9.78e-02,+1.66e-01,+2.62e-01 1 (nil) -GenVertex: -32 ID: 0 (X,cT):0 - I: 1 59 223 -2.63e-01,+7.90e-01,+6.47e-01,+1.31e+00 2 -32 - O: 3 143 111 +1.43e-01,+4.38e-02,+1.63e-01,+2.59e-01 2 -71 - 141 211 -1.81e-01,+4.47e-01,+1.25e-01,+5.17e-01 1 (nil) - 142 -211 -2.25e-01,+2.99e-01,+3.59e-01,+5.38e-01 1 (nil) -GenVertex: -33 ID: 0 (X,cT):0 - I: 1 60 213 +1.35e-01,+1.08e+00,+5.74e-01,+1.37e+00 2 -33 - O: 2 144 211 +6.61e-02,+1.08e+00,+5.00e-01,+1.20e+00 1 (nil) - 145 111 +6.86e-02,-8.01e-04,+7.43e-02,+1.69e-01 2 -72 -GenVertex: -34 ID: 0 (X,cT):0 - I: 1 62 213 -9.08e-02,+5.82e-01,-1.54e+00,+1.76e+00 2 -34 - O: 2 146 211 -4.09e-02,-5.32e-02,-5.87e-01,+6.07e-01 1 (nil) - 147 111 -4.99e-02,+6.35e-01,-9.56e-01,+1.16e+00 2 -73 -GenVertex: -35 ID: 0 (X,cT):0 - I: 1 63 221 +1.94e-01,-2.74e-01,-2.66e-01,+6.95e-01 2 -35 - O: 3 148 111 -8.07e-02,-5.76e-02,-3.25e-02,+1.71e-01 2 -74 - 149 111 +2.01e-01,-6.40e-02,-9.60e-02,+2.68e-01 2 -75 - 150 111 +7.41e-02,-1.52e-01,-1.38e-01,+2.57e-01 2 -76 -GenVertex: -36 ID: 0 (X,cT):0 - I: 1 64 -213 +2.31e-01,+2.74e-01,-1.31e+00,+1.58e+00 2 -36 - O: 2 151 -211 +4.35e-01,+4.07e-01,-8.38e-01,+1.04e+00 1 (nil) - 152 111 -2.04e-01,-1.33e-01,-4.69e-01,+5.45e-01 2 -77 -GenVertex: -37 ID: 0 (X,cT):0 - I: 1 65 213 -4.52e-01,+2.86e-01,-1.23e+00,+1.57e+00 2 -37 - O: 2 153 211 -1.15e-01,-2.61e-01,-4.89e-01,+5.83e-01 1 (nil) - 154 111 -3.37e-01,+5.47e-01,-7.40e-01,+9.89e-01 2 -78 -GenVertex: -38 ID: 0 (X,cT):0 - I: 1 66 2114 +9.53e-01,-6.69e-01,-3.09e+00,+3.53e+00 2 -38 - O: 2 155 2212 +6.04e-01,-7.13e-01,-2.45e+00,+2.79e+00 1 (nil) - 156 -211 +3.49e-01,+4.35e-02,-6.38e-01,+7.42e-01 1 (nil) -GenVertex: -39 ID: 0 (X,cT):0 - I: 1 70 323 +1.48e+00,-9.63e-01,-1.55e+01,+1.56e+01 2 -39 - O: 2 157 311 +5.39e-01,-2.99e-01,-4.42e+00,+4.49e+00 2 -79 - 158 211 +9.45e-01,-6.64e-01,-1.11e+01,+1.11e+01 1 (nil) -GenVertex: -40 ID: 0 (X,cT):0 - I: 1 72 213 +4.81e-01,-1.41e-01,-1.37e+01,+1.37e+01 2 -40 - O: 2 160 111 +4.80e-01,+2.17e-01,-7.34e+00,+7.36e+00 2 -80 - 159 211 +1.18e-04,-3.58e-01,-6.34e+00,+6.36e+00 1 (nil) -Vertex: -41 ID: 0 (X,cT)=-1.16e-04,+3.09e-05,-3.23e-03,+3.24e-03 - I: 1 73 111 -6.69e-01,+1.78e-01,-1.87e+01,+1.87e+01 2 -41 - O: 2 161 22 -5.04e-01,+7.96e-02,-1.28e+01,+1.28e+01 1 (nil) - 162 22 -1.65e-01,+9.88e-02,-5.90e+00,+5.90e+00 1 (nil) -GenVertex: -42 ID: 0 (X,cT):0 - I: 1 74 -213 -3.45e-01,-1.71e-01,-1.77e+01,+1.77e+01 2 -42 - O: 2 163 -211 +1.33e-01,+1.21e-01,-7.19e+00,+7.19e+00 1 (nil) - 164 111 -4.77e-01,-2.92e-01,-1.05e+01,+1.05e+01 2 -81 -GenVertex: -43 ID: 0 (X,cT):0 - I: 1 77 3224 -4.07e-01,-1.66e+00,-3.45e+01,+3.46e+01 2 -43 - O: 2 165 3122 -4.69e-01,-1.62e+00,-3.09e+01,+3.09e+01 2 -82 - 166 211 +6.12e-02,-3.83e-02,-3.63e+00,+3.64e+00 1 (nil) -GenVertex: -44 ID: 0 (X,cT):0 - I: 1 78 311 -2.78e-01,+5.33e-02,-1.90e+01,+1.90e+01 2 -44 - O: 1 167 130 -2.78e-01,+5.33e-02,-1.90e+01,+1.90e+01 1 (nil) -GenVertex: -45 ID: 0 (X,cT):0 - I: 1 82 311 -1.74e-02,+2.33e-01,-6.04e+01,+6.04e+01 2 -45 - O: 1 168 310 -1.74e-02,+2.33e-01,-6.04e+01,+6.04e+01 2 -83 -GenVertex: -46 ID: 0 (X,cT):0 - I: 1 83 -323 -5.63e-01,-7.34e-02,-1.48e+02,+1.48e+02 2 -46 - O: 2 169 -311 -5.45e-01,+2.59e-01,-8.99e+01,+8.99e+01 2 -84 - 170 -211 -1.76e-02,-3.32e-01,-5.80e+01,+5.80e+01 1 (nil) -GenVertex: -47 ID: 0 (X,cT):0 - I: 1 85 113 +1.80e-02,+8.34e-01,-6.47e+02,+6.47e+02 2 -47 - O: 2 171 211 +9.30e-02,-1.09e-02,-3.29e+01,+3.29e+01 1 (nil) - 172 -211 -7.50e-02,+8.45e-01,-6.14e+02,+6.14e+02 1 (nil) -GenVertex: -48 ID: 0 (X,cT):0 - I: 1 87 213 +3.40e-01,+1.94e-01,-1.02e+03,+1.02e+03 2 -48 - O: 2 173 211 +8.59e-02,+3.47e-01,-6.99e+02,+6.99e+02 1 (nil) - 174 111 +2.54e-01,-1.53e-01,-3.24e+02,+3.24e+02 2 -85 -GenVertex: -49 ID: 0 (X,cT):0 - I: 1 88 2214 +5.67e-01,+9.88e-02,-8.80e+02,+8.80e+02 2 -49 - O: 2 175 2212 +3.83e-01,+1.63e-01,-5.77e+02,+5.77e+02 1 (nil) - 176 111 +1.84e-01,-6.41e-02,-3.04e+02,+3.04e+02 2 -86 -GenVertex: -50 ID: 0 (X,cT):0 - I: 1 89 223 +1.23e+00,+3.33e-01,-2.87e+03,+2.87e+03 2 -50 - O: 3 177 211 +5.33e-01,+7.46e-02,-1.01e+03,+1.01e+03 1 (nil) - 178 -211 +4.00e-01,-1.62e-02,-1.32e+03,+1.32e+03 1 (nil) - 179 111 +2.98e-01,+2.74e-01,-5.41e+02,+5.41e+02 2 -87 -GenVertex: -51 ID: 0 (X,cT):0 - I: 1 93 -311 -2.08e-02,-2.14e-01,+2.11e+01,+2.11e+01 2 -51 - O: 1 180 130 -2.08e-02,-2.14e-01,+2.11e+01,+2.11e+01 1 (nil) -GenVertex: -52 ID: 0 (X,cT):0 - I: 1 94 313 -3.62e-01,+5.42e-01,+5.03e+01,+5.03e+01 2 -52 - O: 2 181 321 -3.90e-01,+2.06e-01,+3.09e+01,+3.09e+01 1 (nil) - 182 -211 +2.79e-02,+3.36e-01,+1.94e+01,+1.94e+01 1 (nil) -GenVertex: -53 ID: 0 (X,cT):0 - I: 1 95 213 -8.94e-01,-3.47e-01,+5.52e+01,+5.52e+01 2 -53 - O: 2 183 211 -8.91e-01,-1.82e-01,+3.63e+01,+3.63e+01 1 (nil) - 184 111 -2.63e-03,-1.65e-01,+1.89e+01,+1.89e+01 2 -88 -GenVertex: -54 ID: 0 (X,cT):0 - I: 1 96 113 -1.28e-01,-1.56e-01,+3.41e+01,+3.41e+01 2 -54 - O: 2 185 -211 -1.20e-02,-3.34e-01,+2.86e+01,+2.86e+01 1 (nil) - 186 211 -1.16e-01,+1.78e-01,+5.45e+00,+5.46e+00 1 (nil) -Vertex: -55 ID: 0 (X,cT)=+4.23e-05,-2.45e-05,+3.08e-04,+3.12e-04 - I: 1 98 111 +4.23e-01,-2.45e-01,+3.08e+00,+3.12e+00 2 -55 - O: 2 188 22 +1.35e-01,-1.49e-01,+1.38e+00,+1.40e+00 1 (nil) - 187 22 +2.88e-01,-9.56e-02,+1.70e+00,+1.72e+00 1 (nil) -GenVertex: -56 ID: 0 (X,cT):0 - I: 1 101 223 +1.06e+00,-1.22e-01,+2.53e+01,+2.53e+01 2 -56 - O: 3 189 211 +5.04e-01,-1.97e-01,+8.76e+00,+8.77e+00 1 (nil) - 190 -211 +2.54e-02,-9.08e-02,+3.85e+00,+3.86e+00 1 (nil) - 191 111 +5.32e-01,+1.66e-01,+1.27e+01,+1.27e+01 2 -89 -GenVertex: -57 ID: 0 (X,cT):0 - I: 1 103 113 +2.54e-01,-1.28e-01,-3.69e+00,+3.77e+00 2 -57 - O: 2 192 -211 -1.71e-01,-5.67e-02,-2.24e+00,+2.25e+00 1 (nil) - 193 211 +4.26e-01,-7.15e-02,-1.45e+00,+1.52e+00 1 (nil) -GenVertex: -58 ID: 0 (X,cT):0 - I: 1 104 223 -7.85e-02,+4.34e-02,-9.82e-01,+1.26e+00 2 -58 - O: 3 194 -211 +7.65e-02,-8.75e-02,-7.83e-01,+8.04e-01 1 (nil) - 195 211 -1.94e-01,+1.20e-01,-1.32e-01,+2.98e-01 1 (nil) - 196 111 +3.92e-02,+1.08e-02,-6.72e-02,+1.56e-01 2 -90 -GenVertex: -59 ID: 0 (X,cT):0 - I: 1 105 213 +1.78e-01,+3.27e-01,-2.62e+00,+2.77e+00 2 -59 - O: 2 197 211 -2.80e-01,+2.51e-01,-1.39e+00,+1.44e+00 1 (nil) - 198 111 +4.58e-01,+7.63e-02,-1.24e+00,+1.33e+00 2 -91 -Vertex: -60 ID: 0 (X,cT)=+9.83e-05,-4.21e-04,-9.04e-04,+1.00e-03 - I: 1 106 111 +1.94e-01,-8.30e-01,-1.78e+00,+1.98e+00 2 -60 - O: 2 199 22 +1.08e-01,-5.84e-01,-1.11e+00,+1.25e+00 1 (nil) - 200 22 +8.65e-02,-2.46e-01,-6.78e-01,+7.27e-01 1 (nil) -GenVertex: -61 ID: 0 (X,cT):0 - I: 1 108 223 +2.53e-01,-1.38e-01,-2.52e+00,+2.66e+00 2 -61 - O: 3 202 211 +1.25e-01,+2.93e-02,-2.70e-01,+3.30e-01 1 (nil) - 203 111 +1.70e-01,-2.62e-01,-1.93e+00,+1.96e+00 2 -92 - 201 -211 -4.19e-02,+9.47e-02,-3.16e-01,+3.61e-01 1 (nil) -GenVertex: -62 ID: 0 (X,cT):0 - I: 1 109 113 -5.13e-01,+2.04e-01,-2.60e+00,+2.77e+00 2 -62 - O: 2 204 211 -6.28e-01,+1.34e-01,-1.31e+00,+1.46e+00 1 (nil) - 205 -211 +1.15e-01,+6.97e-02,-1.29e+00,+1.30e+00 1 (nil) -GenVertex: -63 ID: 0 (X,cT):0 - I: 1 112 311 -1.65e-01,+7.95e-02,+8.26e+00,+8.27e+00 2 -63 - O: 1 206 310 -1.65e-01,+7.95e-02,+8.26e+00,+8.27e+00 2 -93 -GenVertex: -64 ID: 0 (X,cT):0 - I: 1 116 -311 -2.08e-01,+2.83e-01,+4.52e+01,+4.53e+01 2 -64 - O: 1 207 310 -2.08e-01,+2.83e-01,+4.52e+01,+4.53e+01 2 -94 -Vertex: -65 ID: 0 (X,cT)=+7.38e-05,-2.21e-05,+1.52e-02,+1.52e-02 - I: 1 117 111 +2.74e-01,-8.21e-02,+5.65e+01,+5.65e+01 2 -65 - O: 2 208 22 +3.27e-02,-6.35e-02,+1.64e+01,+1.64e+01 1 (nil) - 209 22 +2.41e-01,-1.86e-02,+4.01e+01,+4.01e+01 1 (nil) -Vertex: -66 ID: 0 (X,cT)=-2.41e-05,-3.97e-05,+6.29e-02,+6.29e-02 - I: 1 119 111 -1.00e-01,-1.65e-01,+2.61e+02,+2.61e+02 2 -66 - O: 2 210 22 -3.55e-02,-4.32e-03,+1.12e+02,+1.12e+02 1 (nil) - 211 22 -6.45e-02,-1.60e-01,+1.49e+02,+1.49e+02 1 (nil) -GenVertex: -67 ID: 0 (X,cT):0 - I: 1 124 311 -4.48e-01,-2.27e-01,-7.65e-02,+7.11e-01 2 -67 - O: 1 212 310 -4.48e-01,-2.27e-01,-7.65e-02,+7.11e-01 2 -95 -Vertex: -68 ID: 0 (X,cT)=+5.62e-07,+7.23e-07,-9.08e-09,+9.90e-07 - I: 1 134 111 +2.02e-01,+2.60e-01,-3.27e-03,+3.56e-01 2 -68 - O: 2 213 22 +5.96e-02,+3.17e-04,-3.48e-03,+5.97e-02 1 (nil) - 214 22 +1.43e-01,+2.60e-01,+2.13e-04,+2.96e-01 1 (nil) -Vertex: -69 ID: 0 (X,cT)=+6.81e-05,+6.29e-04,+5.02e-03,+5.07e-03 - I: 1 138 111 +9.53e-02,+8.80e-01,+7.03e+00,+7.09e+00 2 -69 - O: 2 215 22 +9.82e-02,+6.35e-01,+5.48e+00,+5.52e+00 1 (nil) - 216 22 -2.90e-03,+2.45e-01,+1.55e+00,+1.57e+00 1 (nil) -GenVertex: -70 ID: 0 (X,cT):0 - I: 1 139 311 +6.63e-02,+5.21e-01,+1.76e+00,+1.90e+00 2 -70 - O: 1 217 310 +6.63e-02,+5.21e-01,+1.76e+00,+1.90e+00 2 -96 -Vertex: -71 ID: 0 (X,cT)=+2.07e-05,+6.35e-06,+2.36e-05,+3.76e-05 - I: 1 143 111 +1.43e-01,+4.38e-02,+1.63e-01,+2.59e-01 2 -71 - O: 2 219 22 -2.87e-03,+5.32e-02,+2.80e-02,+6.02e-02 1 (nil) - 218 22 +1.46e-01,-9.35e-03,+1.35e-01,+1.99e-01 1 (nil) -Vertex: -72 ID: 0 (X,cT)=+3.76e-05,-4.39e-07,+4.07e-05,+9.25e-05 - I: 1 145 111 +6.86e-02,-8.01e-04,+7.43e-02,+1.69e-01 2 -72 - O: 2 221 22 +4.44e-02,-6.53e-02,+5.76e-02,+9.78e-02 1 (nil) - 220 22 +2.42e-02,+6.45e-02,+1.68e-02,+7.09e-02 1 (nil) -Vertex: -73 ID: 0 (X,cT)=-5.91e-06,+7.52e-05,-1.13e-04,+1.37e-04 - I: 1 147 111 -4.99e-02,+6.35e-01,-9.56e-01,+1.16e+00 2 -73 - O: 2 222 22 -6.98e-02,+2.12e-01,-3.96e-01,+4.55e-01 1 (nil) - 223 22 +1.99e-02,+4.23e-01,-5.60e-01,+7.02e-01 1 (nil) -Vertex: -74 ID: 0 (X,cT)=-3.84e-05,-2.74e-05,-1.55e-05,+8.12e-05 - I: 1 148 111 -8.07e-02,-5.76e-02,-3.25e-02,+1.71e-01 2 -74 - O: 2 224 22 -1.12e-01,-6.36e-02,-5.73e-03,+1.29e-01 1 (nil) - 225 22 +3.13e-02,+6.07e-03,-2.68e-02,+4.17e-02 1 (nil) -Vertex: -75 ID: 0 (X,cT)=+4.38e-07,-1.40e-07,-2.10e-07,+5.85e-07 - I: 1 149 111 +2.01e-01,-6.40e-02,-9.60e-02,+2.68e-01 2 -75 - O: 2 226 22 +1.78e-01,-9.49e-02,-1.07e-01,+2.28e-01 1 (nil) - 227 22 +2.25e-02,+3.09e-02,+1.06e-02,+3.97e-02 1 (nil) -Vertex: -76 ID: 0 (X,cT)=+2.78e-06,-5.71e-06,-5.17e-06,+9.63e-06 - I: 1 150 111 +7.41e-02,-1.52e-01,-1.38e-01,+2.57e-01 2 -76 - O: 2 228 22 +2.08e-02,-3.01e-03,-8.82e-02,+9.06e-02 1 (nil) - 229 22 +5.32e-02,-1.49e-01,-4.97e-02,+1.66e-01 1 (nil) -Vertex: -77 ID: 0 (X,cT)=-1.62e-04,-1.05e-04,-3.72e-04,+4.33e-04 - I: 1 152 111 -2.04e-01,-1.33e-01,-4.69e-01,+5.45e-01 2 -77 - O: 2 230 22 -5.35e-02,-1.09e-01,-1.58e-01,+1.99e-01 1 (nil) - 231 22 -1.50e-01,-2.43e-02,-3.11e-01,+3.46e-01 1 (nil) -Vertex: -78 ID: 0 (X,cT)=-3.66e-05,+5.95e-05,-8.05e-05,+1.08e-04 - I: 1 154 111 -3.37e-01,+5.47e-01,-7.40e-01,+9.89e-01 2 -78 - O: 2 232 22 -2.19e-01,+4.46e-01,-6.11e-01,+7.88e-01 1 (nil) - 233 22 -1.17e-01,+1.01e-01,-1.29e-01,+2.01e-01 1 (nil) -GenVertex: -79 ID: 0 (X,cT):0 - I: 1 157 311 +5.39e-01,-2.99e-01,-4.42e+00,+4.49e+00 2 -79 - O: 1 234 130 +5.39e-01,-2.99e-01,-4.42e+00,+4.49e+00 1 (nil) -Vertex: -80 ID: 0 (X,cT)=+1.61e-05,+7.28e-06,-2.46e-04,+2.47e-04 - I: 1 160 111 +4.80e-01,+2.17e-01,-7.34e+00,+7.36e+00 2 -80 - O: 2 235 22 +2.66e-01,+1.44e-01,-3.31e+00,+3.33e+00 1 (nil) - 236 22 +2.15e-01,+7.28e-02,-4.03e+00,+4.03e+00 1 (nil) -Vertex: -81 ID: 0 (X,cT)=-3.45e-05,-2.11e-05,-7.57e-04,+7.58e-04 - I: 1 164 111 -4.77e-01,-2.92e-01,-1.05e+01,+1.05e+01 2 -81 - O: 2 237 22 -1.85e-01,-4.71e-02,-2.98e+00,+2.99e+00 1 (nil) - 238 22 -2.92e-01,-2.45e-01,-7.48e+00,+7.49e+00 1 (nil) -Vertex: -82 ID: 0 (X,cT)=-9.53e+01,-3.29e+02,-6.28e+03,+6.29e+03 - I: 1 165 3122 -4.69e-01,-1.62e+00,-3.09e+01,+3.09e+01 2 -82 - O: 2 239 2212 -4.74e-01,-1.44e+00,-2.62e+01,+2.62e+01 1 (nil) - 240 -211 +5.01e-03,-1.82e-01,-4.71e+00,+4.71e+00 1 (nil) -Vertex: -83 ID: 0 (X,cT)=-1.49e+00,+1.99e+01,-5.17e+03,+5.17e+03 - I: 1 168 310 -1.74e-02,+2.33e-01,-6.04e+01,+6.04e+01 2 -83 - O: 2 241 -211 -1.84e-01,-3.33e-04,-2.55e+01,+2.55e+01 1 (nil) - 242 211 +1.67e-01,+2.33e-01,-3.49e+01,+3.49e+01 1 (nil) -GenVertex: -84 ID: 0 (X,cT):0 - I: 1 169 -311 -5.45e-01,+2.59e-01,-8.99e+01,+8.99e+01 2 -84 - O: 1 243 130 -5.45e-01,+2.59e-01,-8.99e+01,+8.99e+01 1 (nil) -Vertex: -85 ID: 0 (X,cT)=+5.73e-06,-3.45e-06,-7.31e-03,+7.31e-03 - I: 1 174 111 +2.54e-01,-1.53e-01,-3.24e+02,+3.24e+02 2 -85 - O: 2 244 22 +1.63e-01,-5.83e-02,-2.39e+02,+2.39e+02 1 (nil) - 245 22 +9.09e-02,-9.45e-02,-8.53e+01,+8.53e+01 1 (nil) -Vertex: -86 ID: 0 (X,cT)=+4.34e-06,-1.51e-06,-7.14e-03,+7.14e-03 - I: 1 176 111 +1.84e-01,-6.41e-02,-3.04e+02,+3.04e+02 2 -86 - O: 2 246 22 +3.56e-02,-7.99e-02,-1.18e+02,+1.18e+02 1 (nil) - 247 22 +1.49e-01,+1.58e-02,-1.86e+02,+1.86e+02 1 (nil) -Vertex: -87 ID: 0 (X,cT)=+7.08e-05,+6.51e-05,-1.28e-01,+1.28e-01 - I: 1 179 111 +2.98e-01,+2.74e-01,-5.41e+02,+5.41e+02 2 -87 - O: 2 248 22 +1.81e-01,+2.40e-01,-4.18e+02,+4.18e+02 1 (nil) - 249 22 +1.17e-01,+3.44e-02,-1.23e+02,+1.23e+02 1 (nil) -Vertex: -88 ID: 0 (X,cT)=-6.24e-07,-3.92e-05,+4.48e-03,+4.48e-03 - I: 1 184 111 -2.63e-03,-1.65e-01,+1.89e+01,+1.89e+01 2 -88 - O: 2 250 22 -1.32e-02,-1.02e-02,+2.51e-01,+2.52e-01 1 (nil) - 251 22 +1.06e-02,-1.55e-01,+1.86e+01,+1.86e+01 1 (nil) -Vertex: -89 ID: 0 (X,cT)=+1.36e-04,+4.24e-05,+3.24e-03,+3.24e-03 - I: 1 191 111 +5.32e-01,+1.66e-01,+1.27e+01,+1.27e+01 2 -89 - O: 2 252 22 +1.83e-01,+1.10e-01,+5.73e+00,+5.73e+00 1 (nil) - 253 22 +3.49e-01,+5.63e-02,+6.96e+00,+6.97e+00 1 (nil) -Vertex: -90 ID: 0 (X,cT)=+3.53e-05,+9.71e-06,-6.05e-05,+1.41e-04 - I: 1 196 111 +3.92e-02,+1.08e-02,-6.72e-02,+1.56e-01 2 -90 - O: 2 254 22 +7.69e-02,+3.56e-02,-7.15e-02,+1.11e-01 1 (nil) - 255 22 -3.77e-02,-2.48e-02,+4.24e-03,+4.53e-02 1 (nil) -Vertex: -91 ID: 0 (X,cT)=+4.08e-05,+6.79e-06,-1.10e-04,+1.18e-04 - I: 1 198 111 +4.58e-01,+7.63e-02,-1.24e+00,+1.33e+00 2 -91 - O: 2 256 22 +1.21e-01,-3.91e-02,-3.40e-01,+3.63e-01 1 (nil) - 257 22 +3.37e-01,+1.15e-01,-8.96e-01,+9.65e-01 1 (nil) -Vertex: -92 ID: 0 (X,cT)=+5.61e-06,-8.66e-06,-6.40e-05,+6.49e-05 - I: 1 203 111 +1.70e-01,-2.62e-01,-1.93e+00,+1.96e+00 2 -92 - O: 3 258 22 +3.78e-02,-1.90e-02,-5.69e-01,+5.70e-01 1 (nil) - 259 11 +1.27e-01,-2.18e-01,-1.21e+00,+1.24e+00 1 (nil) - 260 -11 +4.80e-03,-2.48e-02,-1.54e-01,+1.56e-01 1 (nil) -Vertex: -93 ID: 0 (X,cT)=-1.44e+01,+6.94e+00,+7.21e+02,+7.22e+02 - I: 1 206 310 -1.65e-01,+7.95e-02,+8.26e+00,+8.27e+00 2 -93 - O: 2 261 111 +9.20e-02,+1.32e-01,+2.25e+00,+2.26e+00 2 -97 - 262 111 -2.57e-01,-5.26e-02,+6.00e+00,+6.01e+00 2 -98 -Vertex: -94 ID: 0 (X,cT)=-7.78e+00,+1.06e+01,+1.70e+03,+1.70e+03 - I: 1 207 310 -2.08e-01,+2.83e-01,+4.52e+01,+4.53e+01 2 -94 - O: 2 263 111 -2.89e-01,+1.56e-01,+3.66e+01,+3.66e+01 2 -99 - 264 111 +8.17e-02,+1.26e-01,+8.62e+00,+8.62e+00 2 -100 -Vertex: -95 ID: 0 (X,cT)=-1.37e+01,-6.92e+00,-2.33e+00,+2.17e+01 - I: 1 212 310 -4.48e-01,-2.27e-01,-7.65e-02,+7.11e-01 2 -95 - O: 2 266 -211 -1.52e-01,-1.35e-01,-2.31e-01,+3.38e-01 1 (nil) - 265 211 -2.95e-01,-9.17e-02,+1.55e-01,+3.73e-01 1 (nil) -Vertex: -96 ID: 0 (X,cT)=+5.58e+00,+4.38e+01,+1.48e+02,+1.60e+02 - I: 1 217 310 +6.63e-02,+5.21e-01,+1.76e+00,+1.90e+00 2 -96 - O: 2 267 111 +1.60e-01,+1.55e-01,+1.10e+00,+1.13e+00 2 -101 - 268 111 -9.38e-02,+3.66e-01,+6.60e-01,+7.72e-01 2 -102 -Vertex: -97 ID: 0 (X,cT)=-1.44e+01,+6.94e+00,+7.21e+02,+7.22e+02 - I: 1 261 111 +9.20e-02,+1.32e-01,+2.25e+00,+2.26e+00 2 -97 - O: 2 269 22 +1.66e-02,-2.70e-02,+2.39e-01,+2.41e-01 1 (nil) - 270 22 +7.54e-02,+1.59e-01,+2.02e+00,+2.02e+00 1 (nil) -Vertex: -98 ID: 0 (X,cT)=-1.44e+01,+6.94e+00,+7.21e+02,+7.22e+02 - I: 1 262 111 -2.57e-01,-5.26e-02,+6.00e+00,+6.01e+00 2 -98 - O: 2 271 22 -7.17e-02,-3.17e-02,+3.25e+00,+3.25e+00 1 (nil) - 272 22 -1.85e-01,-2.09e-02,+2.76e+00,+2.76e+00 1 (nil) -Vertex: -99 ID: 0 (X,cT)=-7.78e+00,+1.06e+01,+1.70e+03,+1.70e+03 - I: 1 263 111 -2.89e-01,+1.56e-01,+3.66e+01,+3.66e+01 2 -99 - O: 2 273 22 -9.96e-02,+2.50e-02,+6.20e+00,+6.20e+00 1 (nil) - 274 22 -1.90e-01,+1.31e-01,+3.04e+01,+3.04e+01 1 (nil) -Vertex: -100 ID: 0 (X,cT)=-7.78e+00,+1.06e+01,+1.70e+03,+1.70e+03 - I: 1 264 111 +8.17e-02,+1.26e-01,+8.62e+00,+8.62e+00 2 -100 - O: 2 275 22 +7.76e-02,+2.39e-03,+3.60e+00,+3.60e+00 1 (nil) - 276 22 +4.09e-03,+1.24e-01,+5.01e+00,+5.02e+00 1 (nil) -Vertex: -101 ID: 0 (X,cT)=+5.58e+00,+4.38e+01,+1.48e+02,+1.60e+02 - I: 1 267 111 +1.60e-01,+1.55e-01,+1.10e+00,+1.13e+00 2 -101 - O: 2 277 22 +1.49e-01,+9.93e-02,+5.70e-01,+5.98e-01 1 (nil) - 278 22 +1.13e-02,+5.56e-02,+5.29e-01,+5.32e-01 1 (nil) -Vertex: -102 ID: 0 (X,cT)=+5.58e+00,+4.38e+01,+1.48e+02,+1.60e+02 - I: 1 268 111 -9.38e-02,+3.66e-01,+6.60e-01,+7.72e-01 2 -102 - O: 2 280 22 -2.77e-02,+3.15e-01,+4.91e-01,+5.84e-01 1 (nil) - 279 22 -6.60e-02,+5.16e-02,+1.69e-01,+1.89e-01 1 (nil) -________________________________________________________________________________ -Stage 0->1 : 0 hits found in the muon chamber. -++++++++ event aborted ->>> Event 2 - 0 hits are stored in ExN04TrackerHitsCollection. - 0 hits are stored in ExN04CalorimeterHitsCollection. - Total energy deposition in calorimeter : 0 (GeV) - 0 hits are stored in ExN04MuonHitsCollection. diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/hepmc_pygen.in b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/hepmc_pygen.in deleted file mode 100644 index 3881261753..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/hepmc_pygen.in +++ /dev/null @@ -1,7 +0,0 @@ -/mydet/RoIangle 10 deg -/mydet/reqmuon 1 -/mydet/isomuon 1 -/control/execute pyset.mac -/run/beamOn 5 -/generator/pythia/pystat 1 - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/hepmc_pygen.out b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/hepmc_pygen.out deleted file mode 100644 index dd01dc88de..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/hepmc_pygen.out +++ /dev/null @@ -1,224 +0,0 @@ -********************************************** - Geant4 version $Name: geant4-08-01 $ - (31-Jul-2002) - Copyright : Geant4 Collaboration -********************************************** - -phot: Total cross sections from Sandia parametrisation. -MuonMinusCaptureAtRest is created - -compt: Total cross sections from a parametrisation. Good description from 10 KeV to (100/Z) GeV. - Scattered gamma energy according Klein-Nishina. - PhysicsTables from 1 keV to 100 GeV in 80 bins. - -conv: Total cross sections from a parametrisation. Good description from 1.5 MeV to 100 GeV for all Z. - e+e- energies according Bethe-Heitler - PhysicsTables from 1.022 MeV to 100 GeV in 100 bins. - -eBrem: Total cross sections from a NEW parametrisation based on the EEDL data library. - Good description from 1 KeV to 100 GeV. - log scale extrapolation above 100 GeV - Gamma energy sampled from a parametrised formula. - PhysicsTables from 1 keV to 100 TeV in 100 bins. - -eIoni: delta cross sections from Moller+Bhabha. Good description from 1 KeV to 100 GeV. - delta ray energy sampled from differential Xsection. - PhysicsTables from 1 keV to 100 TeV in 100 bins. - -msc: Tables of transport mean free paths. - New model of MSC , computes the lateral - displacement of the particle , too. - PhysicsTables from 100 eV to 100 TeV in 100 bins. - -annihil: Total cross section from Heilter formula(annihilation into 2 photons). - gamma energies sampled according Heitler - PhysicsTables from 10 keV to 10 TeV in 100 bins. - -annihil: Total cross section from Heilter formula(annihilation into 2 photons). - gamma energies sampled according Heitler - PhysicsTables from 10 keV to 10 TeV in 100 bins. - -hIoni: Knock-on electron cross sections . - Good description above the mean excitation energy. - delta ray energy sampled from differential Xsection. - PhysicsTables from 1 keV to 100 TeV in 100 bins. - -msc: Tables of transport mean free paths. - New model of MSC , computes the lateral - displacement of the particle , too. - PhysicsTables from 100 eV to 100 TeV in 100 bins. - -MuIoni: Knock-on electron cross sections . - Good description above the mean excitation energy. - delta ray energy sampled from differential Xsection. - PhysicsTables from 1 keV to 1000 PeV in 150 bins. - -MuBrems: theoretical cross section - Good description up to 1000 PeV. - PhysicsTables from 1 keV to 1000 PeV in 150 bins. - -MuPairProd: theoretical cross sections - Good description up to 1000 PeV. - PhysicsTables from 1 keV to 1000 PeV in 150 bins. - -msc: Tables of transport mean free paths. - New model of MSC , computes the lateral - displacement of the particle , too. - PhysicsTables from 100 eV to 100 TeV in 100 bins. -current generator type: pythia -1 - ****************************************************************************** - ****************************************************************************** - ** ** - ** ** - ** *......* Welcome to the Lund Monte Carlo! ** - ** *:::!!:::::::::::* ** - ** *::::::!!::::::::::::::* PPP Y Y TTTTT H H III A ** - ** *::::::::!!::::::::::::::::* P P Y Y T H H I A A ** - ** *:::::::::!!:::::::::::::::::* PPP Y T HHHHH I AAAAA ** - ** *:::::::::!!:::::::::::::::::* P Y T H H I A A ** - ** *::::::::!!::::::::::::::::*! P Y T H H III A A ** - ** *::::::!!::::::::::::::* !! ** - ** !! *:::!!:::::::::::* !! This is PYTHIA version 6.205 ** - ** !! !* -><- * !! Last date of change: 1 Mar 2002 ** - ** !! !! !! ** - ** !! !! !! Now is 0 Jan 2000 at 0:00:00 ** - ** !! !! ** - ** !! lh !! Disclaimer: this program comes ** - ** !! !! without any guarantees. Beware ** - ** !! hh !! of errors and use common sense ** - ** !! ll !! when interpreting results. ** - ** !! !! ** - ** !! Copyright T. Sjostrand (2001) ** - ** ** - ** An archive of program versions and documentation is found on the web: ** - ** http://www.thep.lu.se/~torbjorn/Pythia.html ** - ** ** - ** When you cite this program, currently the official reference is ** - ** T. Sjostrand, P. Eden, C. Friberg, L. Lonnblad, G. Miu, S. Mrenna and ** - ** E. Norrbin, Computer Physics Commun. 135 (2001) 238. ** - ** The large manual is ** - ** T. Sjostrand, L. Lonnblad and S. Mrenna, LU TP 01-21 [hep-ph/0108264]. ** - ** Also remember that the program, to a large extent, represents original ** - ** physics research. Other publications of special relevance to your ** - ** studies may therefore deserve separate mention. ** - ** ** - ** Main author: Torbjorn Sjostrand; Department of Theoretical Physics 2, ** - ** Lund University, Solvegatan 14A, S-223 62 Lund, Sweden; ** - ** phone: + 46 - 46 - 222 48 16; e-mail: torbjorn@thep.lu.se ** - ** Author: Leif Lonnblad; Department of Theoretical Physics 2, ** - ** Lund University, Solvegatan 14A, S-223 62 Lund, Sweden; ** - ** phone: + 46 - 46 - 222 77 80; e-mail: leif@thep.lu.se ** - ** Author: Stephen Mrenna; Computing Division, Simulations Group, ** - ** Fermi National Accelerator Laboratory, MS 234, Batavia, IL 60510, USA; ** - ** phone: + 1 - 630 - 840 - 2556; e-mail: mrenna@fnal.gov ** - ** Author: Peter Skands; Department of Theoretical Physics 2, ** - ** Lund University, Solvegatan 14A, S-223 62 Lund, Sweden; ** - ** phone: + 46 - 46 - 222 31 92; e-mail: zeiler@thep.lu.se ** - ** ** - ** ** - ****************************************************************************** - ****************************************************************************** - PMAS(6,1) changed from 175.00000 to 174.30000 - PMAS(25,1) changed from 115.00000 to 200.00000 - MSEL changed from 1 to 0 - MSUB(102) changed from 0 to 1 - MSUB(123) changed from 0 to 1 - MSUB(124) changed from 0 to 1 - MDME(210,1) changed from 1 to 0 - MDME(211,1) changed from 1 to 0 - MDME(212,1) changed from 1 to 0 - MDME(213,1) changed from 1 to 0 - MDME(214,1) changed from 1 to 0 - MDME(215,1) changed from 1 to 0 - MDME(218,1) changed from 1 to 0 - MDME(219,1) changed from 1 to 0 - MDME(220,1) changed from 1 to 0 - MDME(222,1) changed from 1 to 0 - MDME(223,1) changed from 1 to 0 - MDME(224,1) changed from 1 to 0 - MDME(225,1) changed from 1 to 1 - MDME(226,1) changed from 1 to 0 - MDME(216,1) changed from -1 to -1 - MDME(217,1) changed from -1 to -1 - MDME(218,1) changed from 0 to -1 - MDME(174,1) changed from 1 to 0 - MDME(175,1) changed from 1 to 0 - MDME(176,1) changed from 1 to 0 - MDME(177,1) changed from 1 to 0 - MDME(178,1) changed from 1 to 0 - MDME(179,1) changed from 1 to 0 - MDME(182,1) changed from 1 to 0 - MDME(183,1) changed from 1 to 0 - MDME(184,1) changed from 1 to 1 - MDME(185,1) changed from 1 to 0 - MDME(186,1) changed from 1 to 0 - MDME(187,1) changed from 1 to 0 - MDME(180,1) changed from -1 to -1 - MDME(181,1) changed from -1 to -1 - MDME(188,1) changed from -1 to -1 - MDME(189,1) changed from -1 to -1 - MSTP(61) changed from 2 to 1 - MSTP(71) changed from 1 to 1 - MSTP(81) changed from 1 to 1 - MSTP(111) changed from 1 to 1 -1****************** PYINIT: initialization of PYTHIA routines ***************** - - ============================================================================== - I I - I PYTHIA will be initialized for a p on p collider I - I at 14000.000 GeV center-of-mass energy I - I I - ============================================================================== - - ******** PYMAXI: summary of differential cross-section maximum search ******** - - ========================================================== - I I I - I ISUB Subprocess name I Maximum value I - I I I - ========================================================== - I I I - I 96 Semihard QCD 2 -> 2 I 1.8679E+03 I - I 102 g + g -> h0 I 5.1617E-12 I - I 123 f + f' -> f + f' + h0 I 4.0000E-12 I - I 124 f + f' -> f" + f"' + h0 I 8.9419E-12 I - I I I - ========================================================== - - ********************** PYINIT: initialization completed ********************** -Stage 0->1 : 1 hits found in the muon chamber. -Stage 1->2 : 1 isolated muon found. ->>> Event 0 - 107 hits are stored in ExN04TrackerHitsCollection. - 62 hits are stored in ExN04CalorimeterHitsCollection. - Total energy deposition in calorimeter : 0.997834 (GeV) - 1 hits are stored in ExN04MuonHitsCollection. -Stage 0->1 : 1 hits found in the muon chamber. -Stage 1->2 : 1 isolated muon found. ->>> Event 1 - 203 hits are stored in ExN04TrackerHitsCollection. - 74 hits are stored in ExN04CalorimeterHitsCollection. - Total energy deposition in calorimeter : 1.21037 (GeV) - 1 hits are stored in ExN04MuonHitsCollection. -Stage 0->1 : 1 hits found in the muon chamber. -Stage 1->2 : 1 isolated muon found. ->>> Event 2 - 147 hits are stored in ExN04TrackerHitsCollection. - 95 hits are stored in ExN04CalorimeterHitsCollection. - Total energy deposition in calorimeter : 1.49571 (GeV) - 1 hits are stored in ExN04MuonHitsCollection. -Stage 0->1 : 1 hits found in the muon chamber. -Stage 1->2 : 1 isolated muon found. ->>> Event 3 - 108 hits are stored in ExN04TrackerHitsCollection. - 78 hits are stored in ExN04CalorimeterHitsCollection. - Total energy deposition in calorimeter : 1.01149 (GeV) - 1 hits are stored in ExN04MuonHitsCollection. -Stage 0->1 : 1 hits found in the muon chamber. -Stage 1->2 : 1 isolated muon found. ->>> Event 4 - 367 hits are stored in ExN04TrackerHitsCollection. - 136 hits are stored in ExN04CalorimeterHitsCollection. - Total energy deposition in calorimeter : 2.04765 (GeV) - 1 hits are stored in ExN04MuonHitsCollection. diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04CalorimeterHit.hh b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04CalorimeterHit.hh deleted file mode 100644 index efe0450d3e..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04CalorimeterHit.hh +++ /dev/null @@ -1,108 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// - -#ifndef ExN04CalorimeterHit_h -#define ExN04CalorimeterHit_h 1 - -#include "G4VHit.hh" -#include "G4THitsCollection.hh" -#include "G4Allocator.hh" -#include "G4ThreeVector.hh" -#include "G4LogicalVolume.hh" -#include "G4Transform3D.hh" -#include "G4RotationMatrix.hh" - -class ExN04CalorimeterHit : public G4VHit -{ - public: - - ExN04CalorimeterHit(); - ExN04CalorimeterHit(G4LogicalVolume* logVol,G4int z,G4int phi); - ~ExN04CalorimeterHit(); - ExN04CalorimeterHit(const ExN04CalorimeterHit &right); - const ExN04CalorimeterHit& operator=(const ExN04CalorimeterHit &right); - G4int operator==(const ExN04CalorimeterHit &right) const; - - inline void *operator new(size_t); - inline void operator delete(void *aHit); - - void Draw(); - void Print(); - - private: - G4int ZCellID; - G4int PhiCellID; - G4double edep; - G4ThreeVector pos; - G4RotationMatrix rot; - const G4LogicalVolume* pLogV; - - public: - inline void SetCellID(G4int z,G4int phi) - { - ZCellID = z; - PhiCellID = phi; - } - inline G4int GetZ() { return ZCellID; } - inline G4int GetPhi() { return PhiCellID; } - inline void SetEdep(G4double de) - { edep = de; } - inline void AddEdep(G4double de) - { edep += de; } - inline G4double GetEdep() - { return edep; } - inline void SetPos(G4ThreeVector xyz) - { pos = xyz; } - inline G4ThreeVector GetPos() - { return pos; } - inline void SetRot(G4RotationMatrix rmat) - { rot = rmat; } - inline G4RotationMatrix GetRot() - { return rot; } - inline const G4LogicalVolume * GetLogV() - { return pLogV; } - -}; - -typedef G4THitsCollection ExN04CalorimeterHitsCollection; - -extern G4Allocator ExN04CalorimeterHitAllocator; - -inline void* ExN04CalorimeterHit::operator new(size_t) -{ - void *aHit; - aHit = (void *) ExN04CalorimeterHitAllocator.MallocSingle(); - return aHit; -} - -inline void ExN04CalorimeterHit::operator delete(void *aHit) -{ - ExN04CalorimeterHitAllocator.FreeSingle((ExN04CalorimeterHit*) aHit); -} - -#endif - - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04CalorimeterParametrisation.hh b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04CalorimeterParametrisation.hh deleted file mode 100644 index dc9ac559bd..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04CalorimeterParametrisation.hh +++ /dev/null @@ -1,81 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// - -#ifndef ExN04CalorimeterParametrisation_H -#define ExN04CalorimeterParametrisation_H 1 - -#include "globals.hh" -#include "G4VPVParameterisation.hh" - -class G4VPhysicalVolume; -class G4Tubs; - -// Dummy declarations to get rid of warnings ... -class G4Trd; -class G4Trap; -class G4Cons; -class G4Orb; -class G4Sphere; -class G4Torus; -class G4Para; -class G4Hype; -class G4Box; -class G4Polycone; -class G4Polyhedra; - -class ExN04CalorimeterParametrisation : public G4VPVParameterisation -{ - public: - - ExN04CalorimeterParametrisation(); - virtual ~ExN04CalorimeterParametrisation(); - void ComputeTransformation(const G4int copyNo, - G4VPhysicalVolume *physVol) const; - void ComputeDimensions( G4Tubs & calorimeterLayer, - const G4int copyNo, - const G4VPhysicalVolume * physVol) const; - - private: // Dummy declarations to get rid of warnings ... - - void ComputeDimensions (G4Trd&,const G4int,const G4VPhysicalVolume*) const {} - void ComputeDimensions (G4Trap&,const G4int,const G4VPhysicalVolume*) const {} - void ComputeDimensions (G4Cons&,const G4int,const G4VPhysicalVolume*) const {} - void ComputeDimensions (G4Orb&,const G4int,const G4VPhysicalVolume*) const {} - void ComputeDimensions (G4Sphere&,const G4int,const G4VPhysicalVolume*) const {} - void ComputeDimensions (G4Torus&,const G4int,const G4VPhysicalVolume*) const {} - void ComputeDimensions (G4Para&,const G4int,const G4VPhysicalVolume*) const {} - void ComputeDimensions (G4Hype&,const G4int,const G4VPhysicalVolume*) const {} - void ComputeDimensions (G4Box&,const G4int,const G4VPhysicalVolume*) const {} - void ComputeDimensions (G4Polycone&,const G4int,const G4VPhysicalVolume*) const {} - void ComputeDimensions (G4Polyhedra&,const G4int,const G4VPhysicalVolume*) const {} - - private: - -#include "ExN04DetectorParameterDef.hh" - -}; - -#endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04DetectorParameterDef.hh b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04DetectorParameterDef.hh deleted file mode 100644 index 2f34985d07..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04DetectorParameterDef.hh +++ /dev/null @@ -1,72 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// - - G4double expHall_x; - G4double expHall_y; - G4double expHall_z; - - G4double trkTubs_rmax; - G4double trkTubs_rmin; - G4double trkTubs_dz; - G4double trkTubs_sphi; - G4double trkTubs_dphi; - - G4int notrkLayers; - G4double tracker_radius[5]; - G4double tracker_thick; - G4double tracker_length[5]; - - G4double caloTubs_rmax; - G4double caloTubs_rmin; - G4double caloTubs_dz; - G4double caloTubs_sphi; - G4double caloTubs_dphi; - - G4int nocaloLayers; - G4double absorber_thick; - G4double scinti_thick; - - G4int segmentsinZ; - G4double caloRing_rmax; - G4double caloRing_rmin; - G4double caloRing_dz; - G4double caloRing_sphi; - G4double caloRing_dphi; - - G4int segmentsinPhi; - G4double caloCell_rmax; - G4double caloCell_rmin; - G4double caloCell_dz; - G4double caloCell_sphi; - G4double caloCell_dphi; - - G4int nomucounter; - G4double muBox_radius; - G4double muBox_width; - G4double muBox_thick; - G4double muBox_length; - - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04EMPhysics.hh b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04EMPhysics.hh deleted file mode 100644 index 7b8d151301..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04EMPhysics.hh +++ /dev/null @@ -1,96 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: ExN04EMPhysics.hh,v 1.2 2006/06/29 17:07:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// -// ------------------------------------------------------------ -// GEANT 4 class header file -// Class Description: -// This class is an derived class of G4VPhysicsConstructor -// -// ------------------------------------------- -// History -// first version 12 Nov. 2000 by H.Kurashige -// ------------------------------------------------------------ -#ifndef ExN04EMPhysics_h -#define ExN04EMPhysics_h 1 - -#include "globals.hh" -#include "G4ios.hh" - -#include "G4VPhysicsConstructor.hh" - -#include "G4PhotoElectricEffect.hh" -#include "G4ComptonScattering.hh" -#include "G4GammaConversion.hh" -#include "G4MultipleScattering.hh" -#include "G4eIonisation.hh" -#include "G4eBremsstrahlung.hh" -#include "G4eplusAnnihilation.hh" - -class ExN04EMPhysics : public G4VPhysicsConstructor -{ - public: - ExN04EMPhysics(const G4String& name ="EM"); - virtual ~ExN04EMPhysics(); - - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); - - protected: - // Gamma physics - G4PhotoElectricEffect thePhotoEffect; - G4ComptonScattering theComptonEffect; - G4GammaConversion thePairProduction; - - // Electron physics - G4MultipleScattering theElectronMultipleScattering; - G4eIonisation theElectronIonisation; - G4eBremsstrahlung theElectronBremsStrahlung; - - //Positron physics - G4MultipleScattering thePositronMultipleScattering; - G4eIonisation thePositronIonisation; - G4eBremsstrahlung thePositronBremsStrahlung; - G4eplusAnnihilation theAnnihilation; -}; - - -#endif - - - - - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04GeneralPhysics.hh b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04GeneralPhysics.hh deleted file mode 100644 index 66d99ae291..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04GeneralPhysics.hh +++ /dev/null @@ -1,80 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: ExN04GeneralPhysics.hh,v 1.2 2006/06/29 17:07:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// -// ------------------------------------------------------------ -// GEANT 4 class header file -// Class Description: -// This class is an derived class of G4VPhysicsConstructor -// -// ------------------------------------------- -// History -// first version 12 Nov. 2000 by H.Kurashige -// ------------------------------------------------------------ -#ifndef ExN04GeneralPhysics_h -#define ExN04GeneralPhysics_h 1 - -#include "globals.hh" -#include "G4ios.hh" - -#include "G4VPhysicsConstructor.hh" - - -#include "G4Decay.hh" - -class ExN04GeneralPhysics : public G4VPhysicsConstructor -{ - public: - ExN04GeneralPhysics(const G4String& name = "general"); - virtual ~ExN04GeneralPhysics(); - - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); - - protected: - G4Decay fDecayProcess; -}; - - -#endif - - - - - - - - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04HadronPhysics.hh b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04HadronPhysics.hh deleted file mode 100644 index 07b2058e8b..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04HadronPhysics.hh +++ /dev/null @@ -1,347 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// $Id: ExN04HadronPhysics.hh,v 1.6 2006/06/29 17:07:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// ------------------------------------------------------------ -// GEANT 4 class header file -// -// This class is an derived class of G4VPhysicsConstructor -// -// ------------------------------------------------------------ -#ifndef ExN04HadronPhysics_h -#define ExN04HadronPhysics_h 1 - -#include "globals.hh" -#include "G4ios.hh" -#include - -#include "G4VPhysicsConstructor.hh" - -#include "G4MultipleScattering.hh" -#include "G4hIonisation.hh" - -#include "G4HadronElasticProcess.hh" -#include "G4HadronFissionProcess.hh" -#include "G4HadronCaptureProcess.hh" - -#include "G4PionPlusInelasticProcess.hh" -#include "G4PionMinusInelasticProcess.hh" -#include "G4KaonPlusInelasticProcess.hh" -#include "G4KaonZeroSInelasticProcess.hh" -#include "G4KaonZeroLInelasticProcess.hh" -#include "G4KaonMinusInelasticProcess.hh" -#include "G4ProtonInelasticProcess.hh" -#include "G4AntiProtonInelasticProcess.hh" -#include "G4NeutronInelasticProcess.hh" -#include "G4AntiNeutronInelasticProcess.hh" -#include "G4LambdaInelasticProcess.hh" -#include "G4AntiLambdaInelasticProcess.hh" -#include "G4SigmaPlusInelasticProcess.hh" -#include "G4SigmaMinusInelasticProcess.hh" -#include "G4AntiSigmaPlusInelasticProcess.hh" -#include "G4AntiSigmaMinusInelasticProcess.hh" -#include "G4XiZeroInelasticProcess.hh" -#include "G4XiMinusInelasticProcess.hh" -#include "G4AntiXiZeroInelasticProcess.hh" -#include "G4AntiXiMinusInelasticProcess.hh" -#include "G4DeuteronInelasticProcess.hh" -#include "G4TritonInelasticProcess.hh" -#include "G4AlphaInelasticProcess.hh" -#include "G4OmegaMinusInelasticProcess.hh" -#include "G4AntiOmegaMinusInelasticProcess.hh" - -// Low-energy Models -#include "G4LElastic.hh" -#include "G4LFission.hh" -#include "G4LCapture.hh" - -#include "G4LEPionPlusInelastic.hh" -#include "G4LEPionMinusInelastic.hh" -#include "G4LEKaonPlusInelastic.hh" -#include "G4LEKaonZeroSInelastic.hh" -#include "G4LEKaonZeroLInelastic.hh" -#include "G4LEKaonMinusInelastic.hh" -#include "G4LEProtonInelastic.hh" -#include "G4LEAntiProtonInelastic.hh" -#include "G4LENeutronInelastic.hh" -#include "G4LEAntiNeutronInelastic.hh" -#include "G4LELambdaInelastic.hh" -#include "G4LEAntiLambdaInelastic.hh" -#include "G4LESigmaPlusInelastic.hh" -#include "G4LESigmaMinusInelastic.hh" -#include "G4LEAntiSigmaPlusInelastic.hh" -#include "G4LEAntiSigmaMinusInelastic.hh" -#include "G4LEXiZeroInelastic.hh" -#include "G4LEXiMinusInelastic.hh" -#include "G4LEAntiXiZeroInelastic.hh" -#include "G4LEAntiXiMinusInelastic.hh" -#include "G4LEDeuteronInelastic.hh" -#include "G4LETritonInelastic.hh" -#include "G4LEAlphaInelastic.hh" -#include "G4LEOmegaMinusInelastic.hh" -#include "G4LEAntiOmegaMinusInelastic.hh" - -// High-energy Models - -#include "G4HEPionPlusInelastic.hh" -#include "G4HEPionMinusInelastic.hh" -#include "G4HEKaonPlusInelastic.hh" -#include "G4HEKaonZeroInelastic.hh" -#include "G4HEKaonZeroInelastic.hh" -#include "G4HEKaonMinusInelastic.hh" -#include "G4HEProtonInelastic.hh" -#include "G4HEAntiProtonInelastic.hh" -#include "G4HENeutronInelastic.hh" -#include "G4HEAntiNeutronInelastic.hh" -#include "G4HELambdaInelastic.hh" -#include "G4HEAntiLambdaInelastic.hh" -#include "G4HESigmaPlusInelastic.hh" -#include "G4HESigmaMinusInelastic.hh" -#include "G4HEAntiSigmaPlusInelastic.hh" -#include "G4HEAntiSigmaMinusInelastic.hh" -#include "G4HEXiZeroInelastic.hh" -#include "G4HEXiMinusInelastic.hh" -#include "G4HEAntiXiZeroInelastic.hh" -#include "G4HEAntiXiMinusInelastic.hh" -#include "G4HEOmegaMinusInelastic.hh" -#include "G4HEAntiOmegaMinusInelastic.hh" - -// Stopping processes -#include "G4AntiProtonAnnihilationAtRest.hh" -#include "G4AntiNeutronAnnihilationAtRest.hh" - -#ifdef TRIUMF_STOP_PIMINUS -#include "G4PionMinusAbsorptionAtRest.hh" -#else -#include "G4PiMinusAbsorptionAtRest.hh" -#endif -#ifdef TRIUMF_STOP_KMINUS -#include "G4KaonMinusAbsorption.hh" -#else -#include "G4KaonMinusAbsorptionAtRest.hh" -#endif - -// quark gluon string model with chips afterburner. -#include "G4TheoFSGenerator.hh" -#include "G4ExcitationHandler.hh" -#include "G4PreCompoundModel.hh" -#include "G4GeneratorPrecompoundInterface.hh" -#include "G4QGSModel.hh" -#include "G4QGSParticipants.hh" -#include "G4QGSMFragmentation.hh" -#include "G4ExcitedStringDecay.hh" - -class ExN04HadronPhysics : public G4VPhysicsConstructor -{ - public: - ExN04HadronPhysics(const G4String& name ="hadron"); - virtual ~ExN04HadronPhysics(); - - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); - - protected: - // Elastic Process - G4HadronElasticProcess theElasticProcess; - G4LElastic* theElasticModel; - - // Pi + - G4PionPlusInelasticProcess thePionPlusInelastic; - G4LEPionPlusInelastic* theLEPionPlusModel; - G4MultipleScattering thePionPlusMult; - G4hIonisation thePionPlusIonisation; - - // Pi - - G4PionMinusInelasticProcess thePionMinusInelastic; - G4LEPionMinusInelastic* theLEPionMinusModel; - G4MultipleScattering thePionMinusMult; - G4hIonisation thePionMinusIonisation; -#ifdef TRIUMF_STOP_PIMINUS - G4PionMinusAbsorptionAtRest thePionMinusAbsorption; -#else - G4PiMinusAbsorptionAtRest thePionMinusAbsorption; -#endif - - // pi+ and pi- - - G4TheoFSGenerator theTheoModel; - G4ExcitationHandler theHandler; - G4PreCompoundModel * thePreEquilib; - G4GeneratorPrecompoundInterface theCascade; - G4QGSModel< G4QGSParticipants > theStringModel; - G4QGSMFragmentation theFragmentation; - G4ExcitedStringDecay * theStringDecay; - - // K + - G4KaonPlusInelasticProcess theKaonPlusInelastic; - G4LEKaonPlusInelastic* theLEKaonPlusModel; - G4HEKaonPlusInelastic* theHEKaonPlusModel; - G4MultipleScattering theKaonPlusMult; - G4hIonisation theKaonPlusIonisation; - - // K - - G4KaonMinusInelasticProcess theKaonMinusInelastic; - G4LEKaonMinusInelastic* theLEKaonMinusModel; - G4HEKaonMinusInelastic* theHEKaonMinusModel; - G4MultipleScattering theKaonMinusMult; - G4hIonisation theKaonMinusIonisation; -#ifdef TRIUMF_STOP_KMINUS - G4KaonMinusAbsorption theKaonMinusAbsorption; -#else - G4PiMinusAbsorptionAtRest theKaonMinusAbsorption; -#endif - - // K0L - G4KaonZeroLInelasticProcess theKaonZeroLInelastic; - G4LEKaonZeroLInelastic* theLEKaonZeroLModel; - G4HEKaonZeroInelastic* theHEKaonZeroLModel; - - // K0S - G4KaonZeroSInelasticProcess theKaonZeroSInelastic; - G4LEKaonZeroSInelastic* theLEKaonZeroSModel; - G4HEKaonZeroInelastic* theHEKaonZeroSModel; - - // Proton - G4ProtonInelasticProcess theProtonInelastic; - G4LEProtonInelastic* theLEProtonModel; - G4HEProtonInelastic* theHEProtonModel; - G4MultipleScattering theProtonMult; - G4hIonisation theProtonIonisation; - - // anti-proton - G4AntiProtonInelasticProcess theAntiProtonInelastic; - G4LEAntiProtonInelastic* theLEAntiProtonModel; - G4HEAntiProtonInelastic* theHEAntiProtonModel; - G4MultipleScattering theAntiProtonMult; - G4hIonisation theAntiProtonIonisation; - G4AntiProtonAnnihilationAtRest theAntiProtonAnnihilation; - - // neutron - G4NeutronInelasticProcess theNeutronInelastic; - G4LENeutronInelastic* theLENeutronModel; - G4HENeutronInelastic* theHENeutronModel; - G4HadronFissionProcess theNeutronFission; - G4LFission* theNeutronFissionModel; - G4HadronCaptureProcess theNeutronCapture; - G4LCapture* theNeutronCaptureModel; - - - // anti-neutron - G4AntiNeutronInelasticProcess theAntiNeutronInelastic; - G4LEAntiNeutronInelastic* theLEAntiNeutronModel; - G4HEAntiNeutronInelastic* theHEAntiNeutronModel; - G4AntiNeutronAnnihilationAtRest theAntiNeutronAnnihilation; - - // Lambda - G4LambdaInelasticProcess theLambdaInelastic; - G4LELambdaInelastic* theLELambdaModel; - G4HELambdaInelastic* theHELambdaModel; - - // AntiLambda - G4AntiLambdaInelasticProcess theAntiLambdaInelastic; - G4LEAntiLambdaInelastic* theLEAntiLambdaModel; - G4HEAntiLambdaInelastic* theHEAntiLambdaModel; - - // SigmaMinus - G4SigmaMinusInelasticProcess theSigmaMinusInelastic; - G4LESigmaMinusInelastic* theLESigmaMinusModel; - G4HESigmaMinusInelastic* theHESigmaMinusModel; - G4MultipleScattering theSigmaMinusMult; - G4hIonisation theSigmaMinusIonisation; - - // AntiSigmaMinus - G4AntiSigmaMinusInelasticProcess theAntiSigmaMinusInelastic; - G4LEAntiSigmaMinusInelastic* theLEAntiSigmaMinusModel; - G4HEAntiSigmaMinusInelastic* theHEAntiSigmaMinusModel; - G4MultipleScattering theAntiSigmaMinusMult; - G4hIonisation theAntiSigmaMinusIonisation; - - // SigmaPlus - G4SigmaPlusInelasticProcess theSigmaPlusInelastic; - G4LESigmaPlusInelastic* theLESigmaPlusModel; - G4HESigmaPlusInelastic* theHESigmaPlusModel; - G4MultipleScattering theSigmaPlusMult; - G4hIonisation theSigmaPlusIonisation; - - // AntiSigmaPlus - G4AntiSigmaPlusInelasticProcess theAntiSigmaPlusInelastic; - G4LEAntiSigmaPlusInelastic* theLEAntiSigmaPlusModel; - G4HEAntiSigmaPlusInelastic* theHEAntiSigmaPlusModel; - G4MultipleScattering theAntiSigmaPlusMult; - G4hIonisation theAntiSigmaPlusIonisation; - - // XiZero - G4XiZeroInelasticProcess theXiZeroInelastic; - G4LEXiZeroInelastic* theLEXiZeroModel; - G4HEXiZeroInelastic* theHEXiZeroModel; - - // AntiXiZero - G4AntiXiZeroInelasticProcess theAntiXiZeroInelastic; - G4LEAntiXiZeroInelastic* theLEAntiXiZeroModel; - G4HEAntiXiZeroInelastic* theHEAntiXiZeroModel; - - // XiMinus - G4XiMinusInelasticProcess theXiMinusInelastic; - G4LEXiMinusInelastic* theLEXiMinusModel; - G4HEXiMinusInelastic* theHEXiMinusModel; - G4MultipleScattering theXiMinusMult; - G4hIonisation theXiMinusIonisation; - - // AntiXiMinus - G4AntiXiMinusInelasticProcess theAntiXiMinusInelastic; - G4LEAntiXiMinusInelastic* theLEAntiXiMinusModel; - G4HEAntiXiMinusInelastic* theHEAntiXiMinusModel; - G4MultipleScattering theAntiXiMinusMult; - G4hIonisation theAntiXiMinusIonisation; - - // OmegaMinus - G4OmegaMinusInelasticProcess theOmegaMinusInelastic; - G4LEOmegaMinusInelastic* theLEOmegaMinusModel; - G4HEOmegaMinusInelastic* theHEOmegaMinusModel; - G4MultipleScattering theOmegaMinusMult; - G4hIonisation theOmegaMinusIonisation; - - // AntiOmegaMinus - G4AntiOmegaMinusInelasticProcess theAntiOmegaMinusInelastic; - G4LEAntiOmegaMinusInelastic* theLEAntiOmegaMinusModel; - G4HEAntiOmegaMinusInelastic* theHEAntiOmegaMinusModel; - G4MultipleScattering theAntiOmegaMinusMult; - G4hIonisation theAntiOmegaMinusIonisation; - - -}; - - -#endif - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04IonPhysics.hh b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04IonPhysics.hh deleted file mode 100644 index 9bb0c962c3..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04IonPhysics.hh +++ /dev/null @@ -1,115 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: ExN04IonPhysics.hh,v 1.3 2006/06/29 17:07:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// -// ------------------------------------------------------------ -// GEANT 4 class header file -// Class Description: -// This class is an derived class of G4VPhysicsConstructor -// -// ------------------------------------------- -// History -// first version 12 Nov. 2000 by H.Kurashige -// ------------------------------------------------------------ -#ifndef ExN04IonPhysics_h -#define ExN04IonPhysics_h 1 - -#include "globals.hh" -#include "G4ios.hh" - -#include "G4VPhysicsConstructor.hh" - -#include "G4HadronElasticProcess.hh" -#include "G4LElastic.hh" - -#include "G4DeuteronInelasticProcess.hh" -#include "G4LEDeuteronInelastic.hh" - -#include "G4TritonInelasticProcess.hh" -#include "G4LETritonInelastic.hh" - -#include "G4AlphaInelasticProcess.hh" -#include "G4LEAlphaInelastic.hh" - -#include "G4hIonisation.hh" -#include "G4ionIonisation.hh" -#include "G4MultipleScattering.hh" - -class ExN04IonPhysics : public G4VPhysicsConstructor -{ - public: - ExN04IonPhysics(const G4String& name="ion"); - virtual ~ExN04IonPhysics(); - - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); - - protected: - // Elastic Process - G4HadronElasticProcess theElasticProcess; - G4LElastic* theElasticModel; - - // Generic Ion physics - G4MultipleScattering fIonMultipleScattering; - G4ionIonisation fIonIonisation; - - // Deuteron physics - G4MultipleScattering fDeuteronMultipleScattering; - G4hIonisation fDeuteronIonisation; - G4DeuteronInelasticProcess fDeuteronProcess; - G4LEDeuteronInelastic* fDeuteronModel; - - // Triton physics - G4MultipleScattering fTritonMultipleScattering; - G4hIonisation fTritonIonisation; - G4TritonInelasticProcess fTritonProcess; - G4LETritonInelastic* fTritonModel; - - // Alpha physics - G4MultipleScattering fAlphaMultipleScattering; - G4hIonisation fAlphaIonisation; - G4AlphaInelasticProcess fAlphaProcess; - G4LEAlphaInelastic* fAlphaModel; - - // He3 physics - G4MultipleScattering fHe3MultipleScattering; - G4hIonisation fHe3Ionisation; - -}; - - -#endif - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04MuonPhysics.hh b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04MuonPhysics.hh deleted file mode 100644 index 6fa20e168b..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04MuonPhysics.hh +++ /dev/null @@ -1,96 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: ExN04MuonPhysics.hh,v 1.3 2006/06/29 17:07:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// -// ------------------------------------------------------------ -// GEANT 4 class header file -// Class Description: -// This class is an derived class of G4VPhysicsConstructor -// -// ------------------------------------------- -// History -// first version 12 Nov. 2000 by H.Kurashige -// ------------------------------------------------------------ -#ifndef ExN04MuonPhysics_h -#define ExN04MuonPhysics_h 1 - -#include "globals.hh" -#include "G4ios.hh" - -#include "G4VPhysicsConstructor.hh" -#include "G4MultipleScattering.hh" -#include "G4MuBremsstrahlung.hh" -#include "G4MuPairProduction.hh" -#include "G4MuIonisation.hh" -#include "G4hIonisation.hh" - -#include "G4MuonMinusCaptureAtRest.hh" - -class ExN04MuonPhysics : public G4VPhysicsConstructor -{ - public: - ExN04MuonPhysics(const G4String& name="muon"); - virtual ~ExN04MuonPhysics(); - - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); - - protected: - // Muon physics - G4MuIonisation fMuPlusIonisation; - G4MultipleScattering fMuPlusMultipleScattering; - G4MuBremsstrahlung fMuPlusBremsstrahlung ; - G4MuPairProduction fMuPlusPairProduction; - - G4MuIonisation fMuMinusIonisation; - G4MultipleScattering fMuMinusMultipleScattering; - G4MuBremsstrahlung fMuMinusBremsstrahlung ; - G4MuPairProduction fMuMinusPairProduction; - - G4MuonMinusCaptureAtRest fMuMinusCaptureAtRest; - - // Tau physics - G4MultipleScattering fTauPlusMultipleScattering; - G4hIonisation fTauPlusIonisation; - - G4MultipleScattering fTauMinusMultipleScattering; - G4hIonisation fTauMinusIonisation; - -}; - - -#endif - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04PrimaryGeneratorAction.hh b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04PrimaryGeneratorAction.hh deleted file mode 100644 index 5aade966a9..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04PrimaryGeneratorAction.hh +++ /dev/null @@ -1,97 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// ==================================================================== -// -// ExN04PrimaryGeneratorAction.hh -// $Id: ExN04PrimaryGeneratorAction.hh,v 1.5 2006/06/29 17:07:33 gunter Exp $ -// -// ==================================================================== -#ifndef EXN04_PRIMARY_GENERATOR_ACTION_H -#define EXN04_PRIMARY_GENERATOR_ACTION_H - -#include -#include "globals.hh" -#include "G4VUserPrimaryGeneratorAction.hh" - -class G4Event; -class G4VPrimaryGenerator; -class ExN04PrimaryGeneratorMessenger; - -class ExN04PrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction { -private: - G4VPrimaryGenerator* particleGun; - G4VPrimaryGenerator* hepmcAscii; - G4VPrimaryGenerator* pythiaGen; - - G4VPrimaryGenerator* currentGenerator; - G4String currentGeneratorName; - std::map gentypeMap; - - ExN04PrimaryGeneratorMessenger* messenger; - -public: - ExN04PrimaryGeneratorAction(); - ~ExN04PrimaryGeneratorAction(); - - virtual void GeneratePrimaries(G4Event* anEvent); - - void SetGenerator(G4VPrimaryGenerator* gen); - void SetGenerator(G4String genname); - - G4VPrimaryGenerator* GetGenerator() const; - G4String GetGeneratorName() const; -}; - -// ==================================================================== -// inline functions -// ==================================================================== - -inline void ExN04PrimaryGeneratorAction::SetGenerator -(G4VPrimaryGenerator* gen) -{ - currentGenerator= gen; -} - -inline void ExN04PrimaryGeneratorAction::SetGenerator(G4String genname) -{ - std::map::iterator pos= gentypeMap.find(genname); - if(pos != gentypeMap.end()) { - currentGenerator= pos->second; - currentGeneratorName= genname; - } -} - -inline G4VPrimaryGenerator* ExN04PrimaryGeneratorAction::GetGenerator() const -{ - return currentGenerator; -} - -inline G4String ExN04PrimaryGeneratorAction::GetGeneratorName() const -{ - return currentGeneratorName; -} - -#endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04TrackerHit.hh b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04TrackerHit.hh deleted file mode 100644 index 4f10cbc766..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04TrackerHit.hh +++ /dev/null @@ -1,83 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// - -#ifndef ExN04TrackerHit_h -#define ExN04TrackerHit_h 1 - -#include "G4VHit.hh" -#include "G4THitsCollection.hh" -#include "G4Allocator.hh" -#include "G4ThreeVector.hh" - -class ExN04TrackerHit : public G4VHit -{ - public: - - ExN04TrackerHit(); - ~ExN04TrackerHit(); - ExN04TrackerHit(const ExN04TrackerHit &right); - const ExN04TrackerHit& operator=(const ExN04TrackerHit &right); - G4int operator==(const ExN04TrackerHit &right) const; - - inline void *operator new(size_t); - inline void operator delete(void *aHit); - - void Draw(); - void Print(); - - private: - G4double edep; - G4ThreeVector pos; - - public: - inline void SetEdep(G4double de) - { edep = de; } - inline G4double GetEdep() - { return edep; } - inline void SetPos(G4ThreeVector xyz) - { pos = xyz; } - inline G4ThreeVector GetPos() - { return pos; } - -}; - -typedef G4THitsCollection ExN04TrackerHitsCollection; - -extern G4Allocator ExN04TrackerHitAllocator; - -inline void* ExN04TrackerHit::operator new(size_t) -{ - void *aHit; - aHit = (void *) ExN04TrackerHitAllocator.MallocSingle(); - return aHit; -} - -inline void ExN04TrackerHit::operator delete(void *aHit) -{ - ExN04TrackerHitAllocator.FreeSingle((ExN04TrackerHit*) aHit); -} - -#endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04TrackerParametrisation.hh b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04TrackerParametrisation.hh deleted file mode 100644 index ae9c7ff4dc..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04TrackerParametrisation.hh +++ /dev/null @@ -1,81 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// - -#ifndef ExN04TrackerParametrisation_H -#define ExN04TrackerParametrisation_H 1 - -#include "globals.hh" -#include "G4VPVParameterisation.hh" - -class G4VPhysicalVolume; -class G4Tubs; - -// Dummy declarations to get rid of warnings ... -class G4Trd; -class G4Trap; -class G4Cons; -class G4Orb; -class G4Sphere; -class G4Torus; -class G4Para; -class G4Hype; -class G4Box; -class G4Polycone; -class G4Polyhedra; - -class ExN04TrackerParametrisation : public G4VPVParameterisation -{ - public: - - ExN04TrackerParametrisation(); - virtual ~ExN04TrackerParametrisation(); - void ComputeTransformation(const G4int copyNo, - G4VPhysicalVolume *physVol) const; - void ComputeDimensions( G4Tubs & trackerLayer, - const G4int copyNo, - const G4VPhysicalVolume * physVol) const; - - private: // Dummy declarations to get rid of warnings ... - - void ComputeDimensions (G4Trd&,const G4int,const G4VPhysicalVolume*) const {} - void ComputeDimensions (G4Trap&,const G4int,const G4VPhysicalVolume*) const {} - void ComputeDimensions (G4Cons&,const G4int,const G4VPhysicalVolume*) const {} - void ComputeDimensions (G4Orb&,const G4int,const G4VPhysicalVolume*) const {} - void ComputeDimensions (G4Sphere&,const G4int,const G4VPhysicalVolume*) const {} - void ComputeDimensions (G4Torus&,const G4int,const G4VPhysicalVolume*) const {} - void ComputeDimensions (G4Para&,const G4int,const G4VPhysicalVolume*) const {} - void ComputeDimensions (G4Hype&,const G4int,const G4VPhysicalVolume*) const {} - void ComputeDimensions (G4Box&,const G4int,const G4VPhysicalVolume*) const {} - void ComputeDimensions (G4Polycone&,const G4int,const G4VPhysicalVolume*) const {} - void ComputeDimensions (G4Polyhedra&,const G4int,const G4VPhysicalVolume*) const {} - - private: - -#include "ExN04DetectorParameterDef.hh" - -}; - -#endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/G4HepMCInterface.hh b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/G4HepMCInterface.hh deleted file mode 100644 index 3220b06438..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/G4HepMCInterface.hh +++ /dev/null @@ -1,82 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// ==================================================================== -// -// G4HepMCInterface.hh -// $Id: G4HepMCInterface.hh,v 1.3 2006/06/29 17:08:04 gunter Exp $ -// -// A base class for primary generation via HepMC object. -// This class is derived from G4VPrimaryGenerator. -// -// ==================================================================== -#ifndef G4_HEPMC_INTERFACE_H -#define G4_HEPMC_INTERFACE_H - -#include "G4VPrimaryGenerator.hh" -#include - -class G4HepMCInterface : public G4VPrimaryGenerator -{ -public: - // static service method for conversion from HepMC::GenEvent to G4Event - static void HepMC2G4(const HepMC::GenEvent* hepmcevt, G4Event* g4event); - - // static service method for checking a point is included in the (current) world - // static G4bool CheckVertexInsideWorld(const G4ThreeVector& pos); - // ------------> This method has been moved to the base class - -protected: - // Note that the life of HepMC event object must be handled by users. - // In the default implementation, a current HepMC event will be - // deleted at GeneratePrimaryVertex() in the next event. - HepMC::GenEvent* hepmcEvent; // (care for single event case only) - - // Implement this method in his/her own concrete class. - // An empty event will be created in default. - virtual HepMC::GenEvent* GenerateHepMCEvent(); - -public: - G4HepMCInterface(); - virtual ~G4HepMCInterface(); - - // set/get methods - HepMC::GenEvent* GetHepMCGenEvent() const; - - // The default behavior is that a single HepMC event generated by - // GenerateHepMCEvent() will be converted to G4Event through HepMC2G4(). - virtual void GeneratePrimaryVertex(G4Event* anEvent); -}; - -// ==================================================================== -// inline functions -// ==================================================================== - -inline HepMC::GenEvent* G4HepMCInterface::GetHepMCGenEvent() const -{ - return hepmcEvent; -} - -#endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/H01PythiaMessenger.hh b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/H01PythiaMessenger.hh deleted file mode 100644 index bc743565bc..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/H01PythiaMessenger.hh +++ /dev/null @@ -1,68 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// ==================================================================== -// -// H01PythiaMessenger.hh -// $Id: H01PythiaMessenger.hh,v 1.3 2006/06/29 17:08:08 gunter Exp $ -// -// ==================================================================== -#ifndef H01_PYTHIA_MESSENGER_H -#define H01_PYTHIA_MESSENGER_H - -#include "G4UImessenger.hh" - -class H01PythiaInterface; -class G4UIdirectory; -class G4UIcmdWithoutParameter; -class G4UIcmdWithAString; -class G4UIcmdWithAnInteger; - -class H01PythiaMessenger : public G4UImessenger { -private: - H01PythiaInterface* gen; - - G4UIdirectory* dir; - G4UIcmdWithAnInteger* verbose; - G4UIcmdWithAnInteger* mpylist; - G4UIcmdWithoutParameter* print; - G4UIcommand* cpyinit; - G4UIcmdWithAnInteger* cpystat; - G4UIcommand* cpygive; - G4UIcommand* setUserParameters; - G4UIcmdWithAnInteger* setSeed; - G4UIcommand* cpyrget; - G4UIcommand* cpyrset; - G4UIcmdWithAString* printRandomStatus; - -public: - H01PythiaMessenger(H01PythiaInterface* agen); - ~H01PythiaMessenger(); - - void SetNewValue(G4UIcommand* command, G4String newValues); - G4String GetCurrentValue(G4UIcommand* command); -}; - -#endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/pyh4mu.mac b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/pyh4mu.mac deleted file mode 100644 index d4b3e63e60..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/pyh4mu.mac +++ /dev/null @@ -1,47 +0,0 @@ -/generator/pythia/pygive PMAS(6,1)=174.3D0 -/generator/pythia/pygive PMAS(25,1)=200.D0 - -/generator/pythia/pygive MSEL=0 -/generator/pythia/pygive MSUB(102)=1 -/generator/pythia/pygive MSUB(123)=1 -/generator/pythia/pygive MSUB(124)=1 - -/generator/pythia/pygive MDME(210,1)=0 -/generator/pythia/pygive MDME(211,1)=0 -/generator/pythia/pygive MDME(212,1)=0 -/generator/pythia/pygive MDME(213,1)=0 -/generator/pythia/pygive MDME(214,1)=0 -/generator/pythia/pygive MDME(215,1)=0 -/generator/pythia/pygive MDME(218,1)=0 -/generator/pythia/pygive MDME(219,1)=0 -/generator/pythia/pygive MDME(220,1)=0 -/generator/pythia/pygive MDME(222,1)=0 -/generator/pythia/pygive MDME(223,1)=0 -/generator/pythia/pygive MDME(224,1)=0 -/generator/pythia/pygive MDME(225,1)=1 -/generator/pythia/pygive MDME(226,1)=0 -/generator/pythia/pygive MDME(216,1)=-1 -/generator/pythia/pygive MDME(217,1)=-1 -/generator/pythia/pygive MDME(218,1)=-1 - -/generator/pythia/pygive MDME(174,1)=0 -/generator/pythia/pygive MDME(175,1)=0 -/generator/pythia/pygive MDME(176,1)=0 -/generator/pythia/pygive MDME(177,1)=0 -/generator/pythia/pygive MDME(178,1)=0 -/generator/pythia/pygive MDME(179,1)=0 -/generator/pythia/pygive MDME(182,1)=0 -/generator/pythia/pygive MDME(183,1)=0 -/generator/pythia/pygive MDME(184,1)=1 -/generator/pythia/pygive MDME(185,1)=0 -/generator/pythia/pygive MDME(186,1)=0 -/generator/pythia/pygive MDME(187,1)=0 -/generator/pythia/pygive MDME(180,1)=-1 -/generator/pythia/pygive MDME(181,1)=-1 -/generator/pythia/pygive MDME(188,1)=-1 -/generator/pythia/pygive MDME(189,1)=-1 - -/generator/pythia/pygive MSTP(61)=1 -/generator/pythia/pygive MSTP(71)=1 -/generator/pythia/pygive MSTP(81)=1 -/generator/pythia/pygive MSTP(111)=1 diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/pyset.mac b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/pyset.mac deleted file mode 100644 index c4177f91fa..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/pyset.mac +++ /dev/null @@ -1,4 +0,0 @@ -/generator/select pythia -/control/execute pyh4mu.mac -/generator/pythia/pyinit cms p p 14000 - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04CalorimeterHit.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04CalorimeterHit.cc deleted file mode 100644 index 83356b4fa6..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04CalorimeterHit.cc +++ /dev/null @@ -1,93 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// - -#include "ExN04CalorimeterHit.hh" -#include "G4ios.hh" -#include "G4VVisManager.hh" -#include "G4Colour.hh" -#include "G4VisAttributes.hh" -#include "G4LogicalVolume.hh" - -G4Allocator ExN04CalorimeterHitAllocator; - -ExN04CalorimeterHit::ExN04CalorimeterHit() -{pLogV=0;} - -ExN04CalorimeterHit::ExN04CalorimeterHit(G4LogicalVolume* logVol,G4int z,G4int phi) -: ZCellID(z), PhiCellID(phi), pLogV(logVol) -{;} - -ExN04CalorimeterHit::~ExN04CalorimeterHit() -{;} - -ExN04CalorimeterHit::ExN04CalorimeterHit(const ExN04CalorimeterHit &right) - : G4VHit() -{ - ZCellID = right.ZCellID; - PhiCellID = right.PhiCellID; - edep = right.edep; - pos = right.pos; - rot = right.rot; - pLogV = right.pLogV; -} - -const ExN04CalorimeterHit& ExN04CalorimeterHit::operator=(const ExN04CalorimeterHit &right) -{ - ZCellID = right.ZCellID; - PhiCellID = right.PhiCellID; - edep = right.edep; - pos = right.pos; - rot = right.rot; - pLogV = right.pLogV; - return *this; -} - -G4int ExN04CalorimeterHit::operator==(const ExN04CalorimeterHit &right) const -{ - return ((ZCellID==right.ZCellID)&&(PhiCellID==right.PhiCellID)); -} - -void ExN04CalorimeterHit::Draw() -{ - G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance(); - if(pVVisManager) - { - G4Transform3D trans(rot,pos); - G4VisAttributes attribs; - const G4VisAttributes* pVA = pLogV->GetVisAttributes(); - if(pVA) attribs = *pVA; - G4Colour colour(1.,0.,0.); - attribs.SetColour(colour); - attribs.SetForceWireframe(false); - attribs.SetForceSolid(true); - pVVisManager->Draw(*pLogV,attribs,trans); - } -} - -void ExN04CalorimeterHit::Print() -{;} - - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04CalorimeterROGeometry.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04CalorimeterROGeometry.cc deleted file mode 100644 index 34a6036755..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04CalorimeterROGeometry.cc +++ /dev/null @@ -1,112 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -#include "ExN04CalorimeterROGeometry.hh" -#include "ExN04DummySD.hh" - -#include "G4LogicalVolume.hh" -#include "G4VPhysicalVolume.hh" -#include "G4PVPlacement.hh" -#include "G4PVReplica.hh" -#include "G4SDManager.hh" -#include "G4Box.hh" -#include "G4Tubs.hh" -#include "G4ThreeVector.hh" -#include "G4Material.hh" - - -ExN04CalorimeterROGeometry::ExN04CalorimeterROGeometry() - : G4VReadOutGeometry() -{ -#include "ExN04DetectorParameterDef.icc" -} - - -ExN04CalorimeterROGeometry::ExN04CalorimeterROGeometry(G4String aString) - : G4VReadOutGeometry(aString) -{ -#include "ExN04DetectorParameterDef.icc" -} - -ExN04CalorimeterROGeometry::~ExN04CalorimeterROGeometry() -{ -} - -G4VPhysicalVolume* ExN04CalorimeterROGeometry::Build() -{ - // A dummy material is used to fill the volumes of the readout geometry. - // ( It will be allowed to set a NULL pointer in volumes of such virtual - // division in future, since this material is irrelevant for tracking.) - G4Material* dummyMat = new G4Material(name="dummyMat", 1., 1.*g/mole, 1.*g/cm3); - - //Builds the ReadOut World: - G4Box *ROWorldBox = new G4Box("ROWorldBox", expHall_x, expHall_y, expHall_z); - G4LogicalVolume *ROWorldLog = new G4LogicalVolume(ROWorldBox, dummyMat, - "ROWorldLogical", 0, 0, 0); - G4PVPlacement *ROWorldPhys = new G4PVPlacement(0,G4ThreeVector(), - "ROWorldPhysical", - ROWorldLog, - 0,false,0); - // Calorimeter volume: - G4VSolid * caloROtub - = new G4Tubs("caloROtub",caloTubs_rmin,caloTubs_rmax, - caloTubs_dz,caloTubs_sphi,caloTubs_dphi); - G4LogicalVolume * caloROlog - = new G4LogicalVolume(caloROtub,dummyMat,"caloROlogical",0,0,0); - G4VPhysicalVolume * caloROphys - = new G4PVPlacement(0,G4ThreeVector(),"calROphysical",caloROlog, - ROWorldPhys,false,0); - - // ------------------------------- - // Calorimeter readout division: - // ------------------------------- - // Phi division first: 48 sectors - G4VSolid * caloROphiDivisionTub - = new G4Tubs("caloROphiDivision", caloCell_rmin, caloCell_rmax, - caloCell_dz, caloCell_sphi, caloCell_dphi); - G4LogicalVolume * caloROphiDivisionLog - = new G4LogicalVolume(caloROphiDivisionTub, dummyMat, "caloROphiDivisionLogical",0,0,0); - G4VPhysicalVolume * caloROphiDivisionPhys - = new G4PVReplica("caloROphiDivisionPhysical", caloROphiDivisionLog, caloROphys, - kPhi, segmentsinPhi, caloCell_dphi); - // then z division: 20 slices: - G4VSolid * caloROcellTub - = new G4Tubs("caloROcellTub", caloRing_rmin, caloRing_rmax, - caloRing_dz, caloRing_sphi, caloRing_dphi); - G4LogicalVolume * caloROcellLog - = new G4LogicalVolume(caloROcellTub, dummyMat, "caloROcellLogical",0,0,0); -// G4VPhysicalVolume * caloROcellPhys = - new G4PVReplica("caloROcellPhysical", caloROcellLog, caloROphiDivisionPhys, - kZAxis, segmentsinZ,2.*caloRing_dz); - - - //Flags the cells as sensitive .The pointer here serves - // as a flag only to check for sensitivity. - // (Could we make it by a simple cast of a non-NULL value ?) - ExN04DummySD * dummySensi = new ExN04DummySD; - caloROcellLog->SetSensitiveDetector(dummySensi); - - return ROWorldPhys; -} diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04CalorimeterSD.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04CalorimeterSD.cc deleted file mode 100644 index e532b5170f..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04CalorimeterSD.cc +++ /dev/null @@ -1,118 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// - -#include "ExN04CalorimeterSD.hh" -#include "ExN04CalorimeterHit.hh" -#include "G4VPhysicalVolume.hh" -#include "G4LogicalVolume.hh" -#include "G4Track.hh" -#include "G4Step.hh" -#include "G4ParticleDefinition.hh" -#include "G4VTouchable.hh" -#include "G4TouchableHistory.hh" -#include "G4ios.hh" - -ExN04CalorimeterSD::ExN04CalorimeterSD(G4String name) -:G4VSensitiveDetector(name), - numberOfCellsInZ(20),numberOfCellsInPhi(48) -{ - G4String HCname; - collectionName.insert(HCname="calCollection"); -} - -ExN04CalorimeterSD::~ExN04CalorimeterSD() -{;} - -void ExN04CalorimeterSD::Initialize(G4HCofThisEvent*) -{ - CalCollection = new ExN04CalorimeterHitsCollection - (SensitiveDetectorName,collectionName[0]); - for(int j=0;jGetTotalEnergyDeposit(); - if(edep==0.) return false; - - G4VPhysicalVolume* physVol = ROhist->GetVolume(); - //ROhist->MoveUpHistory(); - //G4VPhysicalVolume* mothVol = ROhist->GetVolume(1); - int copyIDinZ = ROhist->GetReplicaNumber(); - int copyIDinPhi = ROhist->GetReplicaNumber(1); - - if(CellID[copyIDinZ][copyIDinPhi]==-1) - { - ExN04CalorimeterHit* calHit - = new ExN04CalorimeterHit - (physVol->GetLogicalVolume(),copyIDinZ,copyIDinPhi); - G4RotationMatrix rotM; - if(physVol->GetObjectRotation()) rotM = *(physVol->GetObjectRotation()); - calHit->SetEdep( edep ); - calHit->SetPos( physVol->GetTranslation() ); - calHit->SetRot( rotM ); - int icell = CalCollection->insert( calHit ); - CellID[copyIDinZ][copyIDinPhi] = icell - 1; - if(verboseLevel>0) - { G4cout << " New Calorimeter Hit on CellID " - << copyIDinZ << " " << copyIDinPhi << G4endl; } - } - else - { - (*CalCollection)[CellID[copyIDinZ][copyIDinPhi]]->AddEdep(edep); - if(verboseLevel>0) - { G4cout << " Energy added to CellID " - << copyIDinZ << " " << copyIDinPhi << G4endl; } - } - - return true; -} - -void ExN04CalorimeterSD::EndOfEvent(G4HCofThisEvent*HCE) -{ - static G4int HCID = -1; - if(HCID<0) - { HCID = GetCollectionID(0); } - HCE->AddHitsCollection( HCID, CalCollection ); -} - -void ExN04CalorimeterSD::clear() -{ -} - -void ExN04CalorimeterSD::DrawAll() -{ -} - -void ExN04CalorimeterSD::PrintAll() -{ -} - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04DetectorConstruction.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04DetectorConstruction.cc deleted file mode 100644 index e2d3627e9a..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04DetectorConstruction.cc +++ /dev/null @@ -1,257 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// - -#include "ExN04DetectorConstruction.hh" -#include "ExN04TrackerSD.hh" -#include "ExN04CalorimeterSD.hh" -#include "ExN04CalorimeterROGeometry.hh" -#include "ExN04MuonSD.hh" -#include "ExN04TrackerParametrisation.hh" -#include "ExN04CalorimeterParametrisation.hh" -#include "ExN04Field.hh" - -#include "G4Material.hh" -#include "G4MaterialTable.hh" -#include "G4Element.hh" -#include "G4ElementTable.hh" -#include "G4Box.hh" -#include "G4Tubs.hh" -#include "G4LogicalVolume.hh" -#include "G4ThreeVector.hh" -#include "G4PVPlacement.hh" -#include "G4PVParameterised.hh" -#include "G4Transform3D.hh" -#include "G4RotationMatrix.hh" -#include "G4FieldManager.hh" -#include "G4TransportationManager.hh" -#include "G4SDManager.hh" -#include "G4VisAttributes.hh" -#include "G4Colour.hh" - -ExN04DetectorConstruction::ExN04DetectorConstruction() -{ - -#include "ExN04DetectorParameterDef.icc" - DefineMaterials(); - -} - -ExN04DetectorConstruction::~ExN04DetectorConstruction() -{;} - -void ExN04DetectorConstruction::DefineMaterials() -{ - //------------------------------------------------------------------------- - // Materials - //------------------------------------------------------------------------- - - G4double a, z, density; - G4int nel; - - G4Element* H = new G4Element("Hydrogen", "H", z=1., a= 1.01*g/mole); - G4Element* C = new G4Element("Carbon", "C", z=6., a= 12.01*g/mole); - G4Element* N = new G4Element("Nitrogen", "N", z=7., a= 14.01*g/mole); - G4Element* O = new G4Element("Oxygen", "O", z=8., a= 16.00*g/mole); - - Air = new G4Material("Air", density= 1.29*mg/cm3, nel=2); - Air->AddElement(N, 70.*perCent); - Air->AddElement(O, 30.*perCent); - - Lead = - new G4Material("Lead", z=82., a= 207.19*g/mole, density= 11.35*g/cm3); - - Ar = - new G4Material("ArgonGas",z=18., a= 39.95*g/mole, density=1.782*mg/cm3); - - Silicon = - new G4Material("Silicon", z=14., a= 28.09*g/mole, density= 2.33*g/cm3); - - Scinti = new G4Material("Scintillator", density= 1.032*g/cm3, nel=2); - Scinti->AddElement(C, 9); - Scinti->AddElement(H, 10); -} - -G4VPhysicalVolume* ExN04DetectorConstruction::Construct() -{ - //------------------------------------------------------------------------- - // Magnetic field - //------------------------------------------------------------------------- - - static G4bool fieldIsInitialized = false; - if(!fieldIsInitialized) - { - ExN04Field* myField = new ExN04Field; - G4FieldManager* fieldMgr - = G4TransportationManager::GetTransportationManager() - ->GetFieldManager(); - fieldMgr->SetDetectorField(myField); - fieldMgr->CreateChordFinder(myField); - fieldIsInitialized = true; - } - - - //------------------------------------------------------------------------- - // Detector geometry - //------------------------------------------------------------------------- - - //------------------------------ experimental hall - G4Box * experimentalHall_box - = new G4Box("expHall_b",expHall_x,expHall_y,expHall_z); - G4LogicalVolume * experimentalHall_log - = new G4LogicalVolume(experimentalHall_box,Air,"expHall_L",0,0,0); - G4VPhysicalVolume * experimentalHall_phys - = new G4PVPlacement(0,G4ThreeVector(),experimentalHall_log,"expHall_P", - 0,false,0); - G4VisAttributes* experimentalHallVisAtt - = new G4VisAttributes(G4Colour(1.0,1.0,1.0)); - experimentalHallVisAtt->SetForceWireframe(true); - experimentalHall_log->SetVisAttributes(experimentalHallVisAtt); - - //------------------------------ tracker - G4VSolid * tracker_tubs - = new G4Tubs("trkTubs_tubs",trkTubs_rmin,trkTubs_rmax,trkTubs_dz, - trkTubs_sphi,trkTubs_dphi); - G4LogicalVolume * tracker_log - = new G4LogicalVolume(tracker_tubs,Ar,"trackerT_L",0,0,0); - // G4VPhysicalVolume * tracker_phys = - new G4PVPlacement(0,G4ThreeVector(),tracker_log,"tracker_phys", - experimentalHall_log,false,0); - G4VisAttributes* tracker_logVisAtt - = new G4VisAttributes(G4Colour(1.0,0.0,1.0)); - tracker_logVisAtt->SetForceWireframe(true); - tracker_log->SetVisAttributes(tracker_logVisAtt); - - //------------------------------ tracker layers - // As an example for Parameterised volume - // dummy values for G4Tubs -- modified by parameterised volume - G4VSolid * trackerLayer_tubs - = new G4Tubs("trackerLayer_tubs",trkTubs_rmin,trkTubs_rmax,trkTubs_dz, - trkTubs_sphi,trkTubs_dphi); - G4LogicalVolume * trackerLayer_log - = new G4LogicalVolume(trackerLayer_tubs,Silicon,"trackerB_L",0,0,0); - G4VPVParameterisation * trackerParam - = new ExN04TrackerParametrisation; - // dummy value : kXAxis -- modified by parameterised volume - // G4VPhysicalVolume *trackerLayer_phys = - new G4PVParameterised("trackerLayer_phys",trackerLayer_log,tracker_log, - kXAxis, notrkLayers, trackerParam); - G4VisAttributes* trackerLayer_logVisAtt - = new G4VisAttributes(G4Colour(0.5,0.0,1.0)); - trackerLayer_logVisAtt->SetForceWireframe(true); - trackerLayer_log->SetVisAttributes(trackerLayer_logVisAtt); - - //------------------------------ calorimeter - G4VSolid * calorimeter_tubs - = new G4Tubs("calorimeter_tubs",caloTubs_rmin,caloTubs_rmax, - caloTubs_dz,caloTubs_sphi,caloTubs_dphi); - G4LogicalVolume * calorimeter_log - = new G4LogicalVolume(calorimeter_tubs,Scinti,"caloT_L",0,0,0); - // G4VPhysicalVolume * calorimeter_phys = - new G4PVPlacement(0,G4ThreeVector(),calorimeter_log,"caloM_P", - experimentalHall_log,false,0); - G4VisAttributes* calorimeter_logVisATT - = new G4VisAttributes(G4Colour(1.0,1.0,0.0)); - calorimeter_logVisATT->SetForceWireframe(true); - calorimeter_log->SetVisAttributes(calorimeter_logVisATT); - - //------------------------------- Lead layers - // As an example for Parameterised volume - // dummy values for G4Tubs -- modified by parameterised volume - G4VSolid * caloLayer_tubs - = new G4Tubs("caloLayer_tubs",caloRing_rmin,caloRing_rmax, - caloRing_dz,caloRing_sphi,caloRing_dphi); - G4LogicalVolume * caloLayer_log - = new G4LogicalVolume(caloLayer_tubs,Lead,"caloR_L",0,0,0); - G4VPVParameterisation * calorimeterParam - = new ExN04CalorimeterParametrisation; - // dummy value : kXAxis -- modified by parameterised volume - // G4VPhysicalVolume * caloLayer_phys = - new G4PVParameterised("caloLayer_phys",caloLayer_log,calorimeter_log, - kXAxis, nocaloLayers, calorimeterParam); - G4VisAttributes* caloLayer_logVisAtt - = new G4VisAttributes(G4Colour(0.7,1.0,0.0)); - caloLayer_logVisAtt->SetForceWireframe(true); - caloLayer_log->SetVisAttributes(caloLayer_logVisAtt); - - //------------------------------ muon counters - // As an example of CSG volumes with rotation - G4VSolid * muoncounter_box - = new G4Box("muoncounter_box",muBox_width,muBox_thick, - muBox_length); - G4LogicalVolume * muoncounter_log - = new G4LogicalVolume(muoncounter_box,Scinti,"mucounter_L",0,0,0); - G4VPhysicalVolume * muoncounter_phys; - for(int i=0; iSetForceWireframe(true); - muoncounter_log->SetVisAttributes(muoncounter_logVisAtt); - - //------------------------------------------------------------------ - // Sensitive Detector - //------------------------------------------------------------------ - - G4SDManager* SDman = G4SDManager::GetSDMpointer(); - - G4String trackerSDname = "/mydet/tracker"; - ExN04TrackerSD * trackerSD = new ExN04TrackerSD(trackerSDname); - SDman->AddNewDetector(trackerSD); - trackerLayer_log->SetSensitiveDetector(trackerSD); - - G4String calorimeterSDname = "/mydet/calorimeter"; - ExN04CalorimeterSD * calorimeterSD = new ExN04CalorimeterSD(calorimeterSDname); - G4String ROgeometryName = "CalorimeterROGeom"; - G4VReadOutGeometry* calRO = new ExN04CalorimeterROGeometry(ROgeometryName); - calRO->BuildROGeometry(); - calorimeterSD->SetROgeometry(calRO); - SDman->AddNewDetector(calorimeterSD); - calorimeter_log->SetSensitiveDetector(calorimeterSD); - - G4String muonSDname = "/mydet/muon"; - ExN04MuonSD * muonSD = new ExN04MuonSD(muonSDname); - SDman->AddNewDetector(muonSD); - muoncounter_log->SetSensitiveDetector(muonSD); - - //------------------------------------------------------------------ - // Digitizer modules - //------------------------------------------------------------------ - - return experimentalHall_phys; -} - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04DetectorParameterDef.icc b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04DetectorParameterDef.icc deleted file mode 100644 index fa5ee2b6c2..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04DetectorParameterDef.icc +++ /dev/null @@ -1,79 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// - - expHall_x = 600.*cm; - expHall_y = 600.*cm; - expHall_z = 600.*cm; - - trkTubs_rmax = 50.*cm; - trkTubs_rmin = 20.*cm; - trkTubs_dz = 100.*cm; - trkTubs_sphi = 0.*deg; - trkTubs_dphi = 360.*deg; - - notrkLayers = 5; - tracker_radius[0] = 25.*cm; - tracker_radius[1] = 30.*cm; - tracker_radius[2] = 35.*cm; - tracker_radius[3] = 40.*cm; - tracker_radius[4] = 45.*cm; - - tracker_thick = 0.5*cm; - for(int il=0;il<5;il++) - { - tracker_length[il] = tracker_radius[il]; - } - - caloTubs_rmax = 300.*cm; - caloTubs_rmin = 50.*cm; - caloTubs_dz = 200.*cm; - caloTubs_sphi = 0.*deg; - caloTubs_dphi = 360.*deg; - - absorber_thick = 3.*cm; - scinti_thick = 2.*cm; - nocaloLayers = int((caloTubs_rmax-caloTubs_rmin)/(absorber_thick+scinti_thick)); - - segmentsinPhi = 48; - caloCell_rmax = caloTubs_rmax; - caloCell_rmin = caloTubs_rmin; - caloCell_dz = caloTubs_dz; - caloCell_sphi = caloTubs_sphi; - caloCell_dphi = caloTubs_dphi/segmentsinPhi; - - segmentsinZ = 20; - caloRing_rmax = caloCell_rmax; - caloRing_rmin = caloCell_rmin; - caloRing_dz = caloCell_dz/segmentsinZ ; - caloRing_sphi = caloCell_sphi; - caloRing_dphi = caloCell_dphi; - - nomucounter = 4; - muBox_radius = 350.*cm; - muBox_width = muBox_radius - 5.*cm; - muBox_thick = 1.*cm; - muBox_length = expHall_z - 10.*cm; - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04EMPhysics.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04EMPhysics.cc deleted file mode 100644 index 5615169f76..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04EMPhysics.cc +++ /dev/null @@ -1,104 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: ExN04EMPhysics.cc,v 1.4 2006/06/29 17:08:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// - -#include "ExN04EMPhysics.hh" - -#include "globals.hh" -#include "G4ios.hh" -#include - - -ExN04EMPhysics::ExN04EMPhysics(const G4String& name) - : G4VPhysicsConstructor(name) -{ -} - -ExN04EMPhysics::~ExN04EMPhysics() -{ -} - -#include "G4ParticleDefinition.hh" -#include "G4ParticleTable.hh" - -#include "G4Gamma.hh" - -#include "G4Electron.hh" -#include "G4Positron.hh" - -#include "G4NeutrinoE.hh" -#include "G4AntiNeutrinoE.hh" - -void ExN04EMPhysics::ConstructParticle() -{ - // gamma - G4Gamma::GammaDefinition(); - - // electron - G4Electron::ElectronDefinition(); - G4Positron::PositronDefinition(); - G4NeutrinoE::NeutrinoEDefinition(); - G4AntiNeutrinoE::AntiNeutrinoEDefinition(); -} - - -#include "G4ProcessManager.hh" - - -void ExN04EMPhysics::ConstructProcess() -{ - G4ProcessManager * pManager = 0; - - // Gamma Physics - pManager = G4Gamma::Gamma()->GetProcessManager(); - pManager->AddDiscreteProcess(&thePhotoEffect); - pManager->AddDiscreteProcess(&theComptonEffect); - pManager->AddDiscreteProcess(&thePairProduction); - - // Electron Physics - pManager = G4Electron::Electron()->GetProcessManager(); - - pManager->AddProcess(&theElectronMultipleScattering, -1, 1, 1); - pManager->AddProcess(&theElectronIonisation, -1, 2, 2); - pManager->AddProcess(&theElectronBremsStrahlung, -1, 3, 3); - - - //Positron Physics - pManager = G4Positron::Positron()->GetProcessManager(); - - pManager->AddProcess(&thePositronMultipleScattering, -1, 1, 1); - pManager->AddProcess(&thePositronIonisation, -1, 2, 2); - pManager->AddProcess(&thePositronBremsStrahlung, -1, 3, 3); - pManager->AddProcess(&theAnnihilation, 0,-1, 4); - -} - - - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04EventAction.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04EventAction.cc deleted file mode 100644 index f6e4f4ba73..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04EventAction.cc +++ /dev/null @@ -1,125 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// - -#include "ExN04EventAction.hh" - -#include "ExN04TrackerHit.hh" -#include "ExN04CalorimeterHit.hh" -#include "ExN04MuonHit.hh" - -#include "G4Event.hh" -#include "G4EventManager.hh" -#include "G4HCofThisEvent.hh" -#include "G4VHitsCollection.hh" -#include "G4TrajectoryContainer.hh" -#include "G4Trajectory.hh" -#include "G4VVisManager.hh" -#include "G4SDManager.hh" -#include "G4UImanager.hh" -#include "G4ios.hh" - -ExN04EventAction::ExN04EventAction() -{ - trackerCollID = -1; - calorimeterCollID = -1; - muonCollID = -1; -} - -ExN04EventAction::~ExN04EventAction() -{;} - -void ExN04EventAction::BeginOfEventAction(const G4Event*) -{ - G4SDManager * SDman = G4SDManager::GetSDMpointer(); - if(trackerCollID<0||calorimeterCollID<0||muonCollID<0) - { - G4String colNam; - trackerCollID = SDman->GetCollectionID(colNam="trackerCollection"); - calorimeterCollID = SDman->GetCollectionID(colNam="calCollection"); - muonCollID = SDman->GetCollectionID(colNam="muonCollection"); - } -} - -void ExN04EventAction::EndOfEventAction(const G4Event* evt) -{ - G4cout << ">>> Event " << evt->GetEventID() << G4endl; - - // get number of stored trajectories - // - G4TrajectoryContainer* trajectoryContainer = evt->GetTrajectoryContainer(); - G4int n_trajectories = 0; - if (trajectoryContainer) n_trajectories = trajectoryContainer->entries(); - - // extract the trajectories and draw them - // - if (G4VVisManager::GetConcreteInstance()) - { - for (G4int i=0; iGetTrajectoryContainer()))[i]); - trj->DrawTrajectory(50); - } - } - - - if(trackerCollID<0||calorimeterCollID<0||muonCollID<0) return; - - G4HCofThisEvent * HCE = evt->GetHCofThisEvent(); - ExN04TrackerHitsCollection* THC = 0; - ExN04CalorimeterHitsCollection* CHC = 0; - ExN04MuonHitsCollection* MHC = 0; - if(HCE) - { - THC = (ExN04TrackerHitsCollection*)(HCE->GetHC(trackerCollID)); - CHC = (ExN04CalorimeterHitsCollection*)(HCE->GetHC(calorimeterCollID)); - MHC = (ExN04MuonHitsCollection*)(HCE->GetHC(muonCollID)); - } - - if(THC) - { - int n_hit = THC->entries(); - G4cout << " " << n_hit - << " hits are stored in ExN04TrackerHitsCollection." << G4endl; - } - if(CHC) - { - int n_hit = CHC->entries(); - G4cout << " " << n_hit - << " hits are stored in ExN04CalorimeterHitsCollection." << G4endl; - G4double totE = 0; - for(int i=0;iGetEdep(); } - G4cout << " Total energy deposition in calorimeter : " - << totE / GeV << " (GeV)" << G4endl; - } - if(MHC) - { - int n_hit = MHC->entries(); - G4cout << " " << n_hit - << " hits are stored in ExN04MuonHitsCollection." << G4endl; - } -} - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04HadronPhysics.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04HadronPhysics.cc deleted file mode 100644 index 0cab2da1bc..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04HadronPhysics.cc +++ /dev/null @@ -1,441 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: ExN04HadronPhysics.cc,v 1.6 2006/06/29 17:08:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// - -#include "ExN04HadronPhysics.hh" - -#include "globals.hh" -#include "G4ios.hh" -#include - - -ExN04HadronPhysics::ExN04HadronPhysics(const G4String& name) - : G4VPhysicsConstructor(name) -{ -} - -ExN04HadronPhysics::~ExN04HadronPhysics() -{ -delete theStringDecay; -} - -#include "G4ParticleDefinition.hh" -#include "G4ParticleTable.hh" - -// Nuclei -#include "G4MesonConstructor.hh" -#include "G4BaryonConstructor.hh" -#include "G4ShortLivedConstructor.hh" - -void ExN04HadronPhysics::ConstructParticle() -{ - // Construct all mesons - G4MesonConstructor pMesonConstructor; - pMesonConstructor.ConstructParticle(); - - // Construct all barions - G4BaryonConstructor pBaryonConstructor; - pBaryonConstructor.ConstructParticle(); - - // Construct resonaces and quarks - G4ShortLivedConstructor pShortLivedConstructor; - pShortLivedConstructor.ConstructParticle(); - -} - - -#include "G4ProcessManager.hh" - - -void ExN04HadronPhysics::ConstructProcess() -{ - G4ProcessManager * pManager = 0; - G4cout << "" << G4endl; - G4cout << "You are using the ExN04HadronPhysics" << G4endl; - G4cout << " - Note that this hadronic physics list is not optimized for any particular usage" << G4endl; - G4cout << " - If you wish to have a starting point tailored for a particular area of work," << G4endl; - G4cout << " please use one of the available physics lists by use-case." << G4endl; - G4cout << " More information can also be found from the Geant4 HyperNews." << G4endl; - G4cout << "" << G4endl; - // Elastic Process - theElasticModel = new G4LElastic(); - theElasticProcess.RegisterMe(theElasticModel); - - // pi+ and pi- - - thePreEquilib = new G4PreCompoundModel(&theHandler); - theCascade.SetDeExcitation(thePreEquilib); - theTheoModel.SetTransport(&theCascade); - theTheoModel.SetHighEnergyGenerator(&theStringModel); - theStringDecay = new G4ExcitedStringDecay(&theFragmentation); - theStringModel.SetFragmentationModel(theStringDecay); - theTheoModel.SetMinEnergy(15*GeV); - theTheoModel.SetMaxEnergy(100*TeV); - - // PionPlus - pManager = G4PionPlus::PionPlus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEPionPlusModel = new G4LEPionPlusInelastic(); - thePionPlusInelastic.RegisterMe(theLEPionPlusModel); - thePionPlusInelastic.RegisterMe(&theTheoModel); - pManager->AddDiscreteProcess(&thePionPlusInelastic); - - pManager->AddProcess(&thePionPlusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&thePionPlusMult); - pManager->SetProcessOrdering(&thePionPlusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&thePionPlusMult, idxPostStep, 1); - - // PionMinus - pManager = G4PionMinus::PionMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEPionMinusModel = new G4LEPionMinusInelastic(); - thePionMinusInelastic.RegisterMe(theLEPionMinusModel); - thePionMinusInelastic.RegisterMe(&theTheoModel); - pManager->AddDiscreteProcess(&thePionMinusInelastic); - - pManager->AddProcess(&thePionMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&thePionMinusMult); - pManager->SetProcessOrdering(&thePionMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&thePionMinusMult, idxPostStep, 1); - - pManager->AddRestProcess(&thePionMinusAbsorption, ordDefault); - - // KaonPlus - pManager = G4KaonPlus::KaonPlus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEKaonPlusModel = new G4LEKaonPlusInelastic(); - theHEKaonPlusModel = new G4HEKaonPlusInelastic(); - theKaonPlusInelastic.RegisterMe(theLEKaonPlusModel); - theKaonPlusInelastic.RegisterMe(&theTheoModel); - pManager->AddDiscreteProcess(&theKaonPlusInelastic); - - pManager->AddProcess(&theKaonPlusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theKaonPlusMult); - pManager->SetProcessOrdering(&theKaonPlusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theKaonPlusMult, idxPostStep, 1); - - // KaonMinus - pManager = G4KaonMinus::KaonMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEKaonMinusModel = new G4LEKaonMinusInelastic(); - theHEKaonMinusModel = new G4HEKaonMinusInelastic(); - theKaonMinusInelastic.RegisterMe(theLEKaonMinusModel); - theKaonMinusInelastic.RegisterMe(theHEKaonMinusModel); - pManager->AddDiscreteProcess(&theKaonMinusInelastic); - - pManager->AddProcess(&theKaonMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theKaonMinusMult); - pManager->SetProcessOrdering(&theKaonMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theKaonMinusMult, idxPostStep, 1); - - pManager->AddRestProcess(&theKaonMinusAbsorption, ordDefault); - - // KaonZeroL - pManager = G4KaonZeroLong::KaonZeroLong()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEKaonZeroLModel = new G4LEKaonZeroLInelastic(); - theHEKaonZeroLModel = new G4HEKaonZeroInelastic(); - theKaonZeroLInelastic.RegisterMe(theLEKaonZeroLModel); - theKaonZeroLInelastic.RegisterMe(theHEKaonZeroLModel); - pManager->AddDiscreteProcess(&theKaonZeroLInelastic); - - // KaonZeroS - pManager = G4KaonZeroShort::KaonZeroShort()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEKaonZeroSModel = new G4LEKaonZeroSInelastic(); - theHEKaonZeroSModel = new G4HEKaonZeroInelastic(); - theKaonZeroSInelastic.RegisterMe(theLEKaonZeroSModel); - theKaonZeroSInelastic.RegisterMe(theHEKaonZeroSModel); - pManager->AddDiscreteProcess(&theKaonZeroSInelastic); - - // Proton - pManager = G4Proton::Proton()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEProtonModel = new G4LEProtonInelastic(); - theHEProtonModel = new G4HEProtonInelastic(); - theProtonInelastic.RegisterMe(theLEProtonModel); - theProtonInelastic.RegisterMe(&theTheoModel); - pManager->AddDiscreteProcess(&theProtonInelastic); - - pManager->AddProcess(&theProtonIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theProtonMult); - pManager->SetProcessOrdering(&theProtonMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theProtonMult, idxPostStep, 1); - - // anti-Proton - pManager = G4AntiProton::AntiProton()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiProtonModel = new G4LEAntiProtonInelastic(); - theHEAntiProtonModel = new G4HEAntiProtonInelastic(); - theAntiProtonInelastic.RegisterMe(theLEAntiProtonModel); - theAntiProtonInelastic.RegisterMe(theHEAntiProtonModel); - pManager->AddDiscreteProcess(&theAntiProtonInelastic); - - pManager->AddProcess(&theAntiProtonIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theAntiProtonMult); - pManager->SetProcessOrdering(&theAntiProtonMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theAntiProtonMult, idxPostStep, 1); - - pManager->AddRestProcess(&theAntiProtonAnnihilation); - - // Neutron - pManager = G4Neutron::Neutron()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLENeutronModel = new G4LENeutronInelastic(); - theHENeutronModel = new G4HENeutronInelastic(); - theNeutronInelastic.RegisterMe(theLENeutronModel); - theNeutronInelastic.RegisterMe(&theTheoModel); - pManager->AddDiscreteProcess(&theNeutronInelastic); - - theNeutronFissionModel = new G4LFission(); - theNeutronFission.RegisterMe(theNeutronFissionModel); - pManager->AddDiscreteProcess(&theNeutronFission); - - theNeutronCaptureModel = new G4LCapture(); - theNeutronCapture.RegisterMe(theNeutronCaptureModel); - pManager->AddDiscreteProcess(&theNeutronCapture); - - // AntiNeutron - pManager = G4AntiNeutron::AntiNeutron()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiNeutronModel = new G4LEAntiNeutronInelastic(); - theHEAntiNeutronModel = new G4HEAntiNeutronInelastic(); - theAntiNeutronInelastic.RegisterMe(theLEAntiNeutronModel); - theAntiNeutronInelastic.RegisterMe(theHEAntiNeutronModel); - pManager->AddDiscreteProcess(&theAntiNeutronInelastic); - - pManager->AddRestProcess(&theAntiNeutronAnnihilation); - - // Lambda - pManager = G4Lambda::Lambda()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLELambdaModel = new G4LELambdaInelastic(); - theHELambdaModel = new G4HELambdaInelastic(); - theLambdaInelastic.RegisterMe(theLELambdaModel); - theLambdaInelastic.RegisterMe(theHELambdaModel); - pManager->AddDiscreteProcess(&theLambdaInelastic); - - // AntiLambda - pManager = G4AntiLambda::AntiLambda()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiLambdaModel = new G4LEAntiLambdaInelastic(); - theHEAntiLambdaModel = new G4HEAntiLambdaInelastic(); - theAntiLambdaInelastic.RegisterMe(theLEAntiLambdaModel); - theAntiLambdaInelastic.RegisterMe(theHEAntiLambdaModel); - pManager->AddDiscreteProcess(&theAntiLambdaInelastic); - - // SigmaMinus - pManager = G4SigmaMinus::SigmaMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLESigmaMinusModel = new G4LESigmaMinusInelastic(); - theHESigmaMinusModel = new G4HESigmaMinusInelastic(); - theSigmaMinusInelastic.RegisterMe(theLESigmaMinusModel); - theSigmaMinusInelastic.RegisterMe(theHESigmaMinusModel); - pManager->AddDiscreteProcess(&theSigmaMinusInelastic); - - pManager->AddProcess(&theSigmaMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theSigmaMinusMult); - pManager->SetProcessOrdering(&theSigmaMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theSigmaMinusMult, idxPostStep, 1); - - // anti-SigmaMinus - pManager = G4AntiSigmaMinus::AntiSigmaMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiSigmaMinusModel = new G4LEAntiSigmaMinusInelastic(); - theHEAntiSigmaMinusModel = new G4HEAntiSigmaMinusInelastic(); - theAntiSigmaMinusInelastic.RegisterMe(theLEAntiSigmaMinusModel); - theAntiSigmaMinusInelastic.RegisterMe(theHEAntiSigmaMinusModel); - pManager->AddDiscreteProcess(&theAntiSigmaMinusInelastic); - - pManager->AddProcess(&theAntiSigmaMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theAntiSigmaMinusMult); - pManager->SetProcessOrdering(&theAntiSigmaMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theAntiSigmaMinusMult, idxPostStep, 1); - - // SigmaPlus - pManager = G4SigmaPlus::SigmaPlus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLESigmaPlusModel = new G4LESigmaPlusInelastic(); - theHESigmaPlusModel = new G4HESigmaPlusInelastic(); - theSigmaPlusInelastic.RegisterMe(theLESigmaPlusModel); - theSigmaPlusInelastic.RegisterMe(theHESigmaPlusModel); - pManager->AddDiscreteProcess(&theSigmaPlusInelastic); - - pManager->AddProcess(&theSigmaPlusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theSigmaPlusMult); - pManager->SetProcessOrdering(&theSigmaPlusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theSigmaPlusMult, idxPostStep, 1); - - // anti-SigmaPlus - pManager = G4AntiSigmaPlus::AntiSigmaPlus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiSigmaPlusModel = new G4LEAntiSigmaPlusInelastic(); - theHEAntiSigmaPlusModel = new G4HEAntiSigmaPlusInelastic(); - theAntiSigmaPlusInelastic.RegisterMe(theLEAntiSigmaPlusModel); - theAntiSigmaPlusInelastic.RegisterMe(theHEAntiSigmaPlusModel); - pManager->AddDiscreteProcess(&theAntiSigmaPlusInelastic); - - pManager->AddProcess(&theAntiSigmaPlusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theAntiSigmaPlusMult); - pManager->SetProcessOrdering(&theAntiSigmaPlusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theAntiSigmaPlusMult, idxPostStep, 1); - - // XiMinus - pManager = G4XiMinus::XiMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEXiMinusModel = new G4LEXiMinusInelastic(); - theHEXiMinusModel = new G4HEXiMinusInelastic(); - theXiMinusInelastic.RegisterMe(theLEXiMinusModel); - theXiMinusInelastic.RegisterMe(theHEXiMinusModel); - pManager->AddDiscreteProcess(&theXiMinusInelastic); - - pManager->AddProcess(&theXiMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theXiMinusMult); - pManager->SetProcessOrdering(&theXiMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theXiMinusMult, idxPostStep, 1); - - // anti-XiMinus - pManager = G4AntiXiMinus::AntiXiMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiXiMinusModel = new G4LEAntiXiMinusInelastic(); - theHEAntiXiMinusModel = new G4HEAntiXiMinusInelastic(); - theAntiXiMinusInelastic.RegisterMe(theLEAntiXiMinusModel); - theAntiXiMinusInelastic.RegisterMe(theHEAntiXiMinusModel); - pManager->AddDiscreteProcess(&theAntiXiMinusInelastic); - - pManager->AddProcess(&theAntiXiMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theAntiXiMinusMult); - pManager->SetProcessOrdering(&theAntiXiMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theAntiXiMinusMult, idxPostStep, 1); - - // XiZero - pManager = G4XiZero::XiZero()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEXiZeroModel = new G4LEXiZeroInelastic(); - theHEXiZeroModel = new G4HEXiZeroInelastic(); - theXiZeroInelastic.RegisterMe(theLEXiZeroModel); - theXiZeroInelastic.RegisterMe(theHEXiZeroModel); - pManager->AddDiscreteProcess(&theXiZeroInelastic); - - // anti-XiZero - pManager = G4AntiXiZero::AntiXiZero()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiXiZeroModel = new G4LEAntiXiZeroInelastic(); - theHEAntiXiZeroModel = new G4HEAntiXiZeroInelastic(); - theAntiXiZeroInelastic.RegisterMe(theLEAntiXiZeroModel); - theAntiXiZeroInelastic.RegisterMe(theHEAntiXiZeroModel); - pManager->AddDiscreteProcess(&theAntiXiZeroInelastic); - - // OmegaMinus - pManager = G4OmegaMinus::OmegaMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEOmegaMinusModel = new G4LEOmegaMinusInelastic(); - theHEOmegaMinusModel = new G4HEOmegaMinusInelastic(); - theOmegaMinusInelastic.RegisterMe(theLEOmegaMinusModel); - theOmegaMinusInelastic.RegisterMe(theHEOmegaMinusModel); - pManager->AddDiscreteProcess(&theOmegaMinusInelastic); - - pManager->AddProcess(&theOmegaMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theOmegaMinusMult); - pManager->SetProcessOrdering(&theOmegaMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theOmegaMinusMult, idxPostStep, 1); - - // anti-OmegaMinus - pManager = G4AntiOmegaMinus::AntiOmegaMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiOmegaMinusModel = new G4LEAntiOmegaMinusInelastic(); - theHEAntiOmegaMinusModel = new G4HEAntiOmegaMinusInelastic(); - theAntiOmegaMinusInelastic.RegisterMe(theLEAntiOmegaMinusModel); - theAntiOmegaMinusInelastic.RegisterMe(theHEAntiOmegaMinusModel); - pManager->AddDiscreteProcess(&theAntiOmegaMinusInelastic); - - pManager->AddProcess(&theAntiOmegaMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theAntiOmegaMinusMult); - pManager->SetProcessOrdering(&theAntiOmegaMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theAntiOmegaMinusMult, idxPostStep, 1); - -} diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04IonPhysics.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04IonPhysics.cc deleted file mode 100644 index ed243c2ee3..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04IonPhysics.cc +++ /dev/null @@ -1,129 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: ExN04IonPhysics.cc,v 1.4 2006/06/29 17:08:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// - -#include "ExN04IonPhysics.hh" - -#include "globals.hh" -#include "G4ios.hh" -#include - - -ExN04IonPhysics::ExN04IonPhysics(const G4String& name) - : G4VPhysicsConstructor(name) -{ -} - -ExN04IonPhysics::~ExN04IonPhysics() -{ -} - -#include "G4ParticleDefinition.hh" -#include "G4ParticleTable.hh" - -// Nuclei -#include "G4IonConstructor.hh" - -void ExN04IonPhysics::ConstructParticle() -{ - // Construct light ions - G4IonConstructor pConstructor; - pConstructor.ConstructParticle(); -} - - -#include "G4ProcessManager.hh" - - -void ExN04IonPhysics::ConstructProcess() -{ - G4ProcessManager * pManager = 0; - - // Elastic Process - theElasticModel = new G4LElastic(); - theElasticProcess.RegisterMe(theElasticModel); - - // Generic Ion - pManager = G4GenericIon::GenericIon()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - pManager->AddProcess(&fIonMultipleScattering, -1, 1, 1); - pManager->AddProcess(&fIonIonisation, -1, 2, 2); - - // Deuteron - pManager = G4Deuteron::Deuteron()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - fDeuteronModel = new G4LEDeuteronInelastic(); - fDeuteronProcess.RegisterMe(fDeuteronModel); - pManager->AddDiscreteProcess(&fDeuteronProcess); - - pManager->AddProcess(&fDeuteronMultipleScattering, -1, 1, 1); - pManager->AddProcess(&fDeuteronIonisation, -1, 2, 2); - - // Triton - pManager = G4Triton::Triton()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - fTritonModel = new G4LETritonInelastic(); - fTritonProcess.RegisterMe(fTritonModel); - pManager->AddDiscreteProcess(&fTritonProcess); - - pManager->AddProcess(&fTritonMultipleScattering, -1, 1, 1); - pManager->AddProcess(&fTritonIonisation, -1, 2, 2); - - // Alpha - pManager = G4Alpha::Alpha()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - fAlphaModel = new G4LEAlphaInelastic(); - fAlphaProcess.RegisterMe(fAlphaModel); - pManager->AddDiscreteProcess(&fAlphaProcess); - - pManager->AddProcess(&fAlphaMultipleScattering, -1, 1, 1); - pManager->AddProcess(&fAlphaIonisation, -1, 2, 2); - - // He3 - pManager = G4He3::He3()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - pManager->AddProcess(&fHe3MultipleScattering, -1, 1, 1); - pManager->AddProcess(&fHe3Ionisation, -1, 2, 2); - - -} - - - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04MuonPhysics.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04MuonPhysics.cc deleted file mode 100644 index 081fbc2910..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04MuonPhysics.cc +++ /dev/null @@ -1,117 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: ExN04MuonPhysics.cc,v 1.4 2006/06/29 17:08:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// - -#include "ExN04MuonPhysics.hh" - -#include "globals.hh" -#include "G4ios.hh" -#include - - -ExN04MuonPhysics::ExN04MuonPhysics(const G4String& name) - : G4VPhysicsConstructor(name) -{ -} - -ExN04MuonPhysics::~ExN04MuonPhysics() -{ -} - -#include "G4ParticleDefinition.hh" -#include "G4ParticleTable.hh" - -#include "G4MuonPlus.hh" -#include "G4MuonMinus.hh" -#include "G4TauMinus.hh" -#include "G4TauPlus.hh" -#include "G4NeutrinoTau.hh" -#include "G4AntiNeutrinoTau.hh" -#include "G4NeutrinoMu.hh" -#include "G4AntiNeutrinoMu.hh" - -void ExN04MuonPhysics::ConstructParticle() -{ - // Mu - G4MuonPlus::MuonPlusDefinition(); - G4MuonMinus::MuonMinusDefinition(); - G4NeutrinoMu::NeutrinoMuDefinition(); - G4AntiNeutrinoMu::AntiNeutrinoMuDefinition(); - - // Tau - G4TauMinus::TauMinusDefinition(); - G4TauPlus::TauPlusDefinition(); - G4NeutrinoTau::NeutrinoTauDefinition(); - G4AntiNeutrinoTau::AntiNeutrinoTauDefinition(); - -} - - -#include "G4ProcessManager.hh" - -void ExN04MuonPhysics::ConstructProcess() -{ - G4ProcessManager * pManager = 0; - - // Muon Plus Physics - pManager = G4MuonPlus::MuonPlus()->GetProcessManager(); - - pManager->AddProcess(&fMuPlusMultipleScattering,-1, 1, 1); - pManager->AddProcess(&fMuPlusIonisation, -1, 2, 2); - pManager->AddProcess(&fMuPlusBremsstrahlung, -1, 3, 3); - pManager->AddProcess(&fMuPlusPairProduction, -1, 4, 4); - - // Muon Minus Physics - pManager = G4MuonMinus::MuonMinus()->GetProcessManager(); - - pManager->AddProcess(&fMuMinusMultipleScattering,-1, 1, 1); - pManager->AddProcess(&fMuMinusIonisation, -1, 2, 2); - pManager->AddProcess(&fMuMinusBremsstrahlung, -1, 3, 3); - pManager->AddProcess(&fMuMinusPairProduction, -1, 4, 4); - - - pManager->AddRestProcess(&fMuMinusCaptureAtRest); - - // Tau Plus Physics - pManager = G4TauPlus::TauPlus()->GetProcessManager(); - - pManager->AddProcess(&fTauPlusMultipleScattering, -1, 1, 1); - pManager->AddProcess(&fTauPlusIonisation, -1, 2, 2); - - // Tau Minus Physics - pManager = G4TauMinus::TauMinus()->GetProcessManager(); - - pManager->AddProcess(&fTauMinusMultipleScattering, -1, 1, 1); - pManager->AddProcess(&fTauMinusIonisation, -1, 2, 2); - -} - - - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04PrimaryGeneratorMessenger.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04PrimaryGeneratorMessenger.cc deleted file mode 100644 index 8c843044af..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04PrimaryGeneratorMessenger.cc +++ /dev/null @@ -1,97 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// ==================================================================== -// -// ExN04PrimaryGeneratorMessenger.cc -// $Id: ExN04PrimaryGeneratorMessenger.cc,v 1.3 2006/06/29 17:08:50 gunter Exp $ -// -// ==================================================================== -#include "G4UIcommand.hh" -#include "G4UIparameter.hh" -#include "G4UIcmdWithoutParameter.hh" -#include "G4UIcmdWithABool.hh" -#include "G4UIcmdWithAnInteger.hh" -#include "G4UIcmdWithAString.hh" -#include "G4UIdirectory.hh" - -#include "ExN04PrimaryGeneratorMessenger.hh" -#include "ExN04PrimaryGeneratorAction.hh" - -//////////////////////////////////////////////////////////////////// -ExN04PrimaryGeneratorMessenger::ExN04PrimaryGeneratorMessenger - (ExN04PrimaryGeneratorAction* genaction) - : primaryAction(genaction) -//////////////////////////////////////////////////////////////////// -{ - mydetdir = new G4UIdirectory("/mydet/"); - mydetdir-> SetGuidance("ExN04 detector control commands."); - - dir= new G4UIdirectory("/generator/"); - dir-> SetGuidance("Control commands for primary generator"); - - select= new G4UIcmdWithAString("/generator/select", this); - select-> SetGuidance("select generator type"); - select-> SetParameterName("generator_type", false, false); - select-> SetCandidates("particleGun pythia hepmcAscii"); - select-> SetDefaultValue("particleGun"); -} - -///////////////////////////////////////////////////////////////// -ExN04PrimaryGeneratorMessenger::~ExN04PrimaryGeneratorMessenger() -///////////////////////////////////////////////////////////////// -{ - delete select; - - delete mydetdir; - delete dir; -} - -////////////////////////////////////////////////////////////////////// -void ExN04PrimaryGeneratorMessenger::SetNewValue(G4UIcommand* command, - G4String newValues) -////////////////////////////////////////////////////////////////////// -{ - if ( command==select) { - primaryAction-> SetGenerator(newValues); - G4cout << "current generator type: " - << primaryAction-> GetGeneratorName() << G4endl; - } else { - } -} - - -////////////////////////////////////////////////////////////////////////////// -G4String ExN04PrimaryGeneratorMessenger::GetCurrentValue(G4UIcommand* command) -////////////////////////////////////////////////////////////////////////////// -{ - G4String cv, st; - if (command == select) { - cv= primaryAction-> GetGeneratorName(); - } - - return cv; -} - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04StackingAction.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04StackingAction.cc deleted file mode 100644 index f8f7da3e6d..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04StackingAction.cc +++ /dev/null @@ -1,206 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// - -#include "ExN04StackingAction.hh" -#include "G4SDManager.hh" -#include "G4RunManager.hh" -#include "G4Event.hh" -#include "G4HCofThisEvent.hh" -#include "G4Track.hh" -#include "G4TrackStatus.hh" -#include "G4ParticleDefinition.hh" -#include "G4ParticleTypes.hh" -#include "ExN04StackingActionMessenger.hh" -#include "G4ios.hh" - -ExN04StackingAction::ExN04StackingAction() - : trkHits(0), muonHits(0), stage(0) -{ - angRoI = 30.0*deg; - reqMuon = 2; - reqIso = 10; - theMessenger = new ExN04StackingActionMessenger(this); -} - -ExN04StackingAction::~ExN04StackingAction() -{ delete theMessenger; } - -G4ClassificationOfNewTrack -ExN04StackingAction::ClassifyNewTrack(const G4Track * aTrack) -{ - G4ClassificationOfNewTrack classification = fWaiting; - switch(stage) - { - case 0: // Stage 0 : Primary muons only - if(aTrack->GetParentID()==0) - { - G4ParticleDefinition * particleType = aTrack->GetDefinition(); - if((particleType==G4MuonPlus::MuonPlusDefinition()) - ||(particleType==G4MuonMinus::MuonMinusDefinition())) - { classification = fUrgent; } - } - break; - - case 1: // Stage 1 : Charged primaries only - // Suspended tracks will be sent to the waiting stack - if(aTrack->GetParentID()!=0) { break; } - if(aTrack->GetTrackStatus()==fSuspend) { break; } - if(aTrack->GetDefinition()->GetPDGCharge()==0.) { break; } - classification = fUrgent; - break; - - default: // Stage 2 : Accept all primaries - // Accept all secondaries in RoI - // Kill secondaries outside RoI - if(aTrack->GetParentID()==0) - { - classification = fUrgent; - break; - } - if((angRoI<0.)||InsideRoI(aTrack,angRoI)) - { - classification = fUrgent; - break; - } - classification = fKill; - } - return classification; -} - -G4bool ExN04StackingAction::InsideRoI(const G4Track * aTrack,G4double ang) -{ - if(!muonHits) - { muonHits = (ExN04MuonHitsCollection*)GetCollection("muonCollection"); } - if(!muonHits) - { G4cerr << "muonCollection NOT FOUND" << G4endl; - return true; } - - G4int nhits = muonHits->entries(); - - const G4ThreeVector trPos = aTrack->GetPosition(); - for(G4int i=0;iGetPos(); - G4double angl = muHitPos.angle(trPos); - if(anglGetCollectionID(colName); - if(colID>=0) - { - const G4Event* currentEvent = runMan->GetCurrentEvent(); - G4HCofThisEvent* HCE = currentEvent->GetHCofThisEvent(); - return HCE->GetHC(colID); - } - return 0; -} - -void ExN04StackingAction::NewStage() -{ - stage++; - G4int nhits; - if(stage==1) - { - // Stage 0->1 : check if at least "reqMuon" hits on muon chamber - // otherwise abort current event - if(!muonHits) - { muonHits = (ExN04MuonHitsCollection*)GetCollection("muonCollection"); } - if(!muonHits) - { G4cerr << "muonCollection NOT FOUND" << G4endl; - return; } - nhits = muonHits->entries(); - G4cout << "Stage 0->1 : " << nhits << " hits found in the muon chamber." - << G4endl; - if(nhitsclear(); - G4cout << "++++++++ event aborted" << G4endl; - return; - } - stackManager->ReClassify(); - return; - } - - else if(stage==2) - { - // Stage 1->2 : check the isolation of muon tracks - // at least "reqIsoMuon" isolated muons - // otherwise abort current event. - // Isolation requires "reqIso" or less hits - // (including own hits) in the RoI region - // in the tracker layers. - nhits = muonHits->entries(); - if(!trkHits) - { trkHits = (ExN04TrackerHitsCollection*)GetCollection("trackerCollection"); } - if(!trkHits) - { G4cerr << "trackerCollection NOT FOUND" << G4endl; - return; } - G4int nTrkhits = trkHits->entries(); - G4int isoMuon = 0; - for(G4int j=0;jGetPos(); - G4int nhitIn = 0; - for(G4int jj=0;(jjGetPos(); - if(trkhitPos.angle(hitPos)2 : " << isoMuon << " isolated muon found." << G4endl; - if(isoMuonclear(); - G4cout << "++++++++ event aborted" << G4endl; - return; - } - stackManager->ReClassify(); - return; - } - - else - { - // Other stage change : just re-classify - stackManager->ReClassify(); - } -} - -void ExN04StackingAction::PrepareNewEvent() -{ - stage = 0; - trkHits = 0; - muonHits = 0; -} - - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04StackingActionMessenger.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04StackingActionMessenger.cc deleted file mode 100644 index 7bd5c2ffd4..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04StackingActionMessenger.cc +++ /dev/null @@ -1,96 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// - -#include "ExN04StackingActionMessenger.hh" -#include "ExN04StackingAction.hh" -#include "G4UIcmdWithAnInteger.hh" -#include "G4UIcmdWithADoubleAndUnit.hh" -#include "G4ios.hh" - -ExN04StackingActionMessenger::ExN04StackingActionMessenger(ExN04StackingAction * msa) -:myAction(msa) -{ - muonCmd = new G4UIcmdWithAnInteger("/mydet/reqmuon",this); - muonCmd->SetGuidance("Number of muon for the trigger."); - muonCmd->SetParameterName("N",true); - muonCmd->SetDefaultValue(2); - muonCmd->SetRange("N>=0"); - - isomuonCmd = new G4UIcmdWithAnInteger("/mydet/isomuon",this); - isomuonCmd->SetGuidance("Number of isolated muon for the trigger."); - isomuonCmd->SetParameterName("N",true); - isomuonCmd->SetDefaultValue(2); - isomuonCmd->SetRange("N>=0"); - - isoCmd = new G4UIcmdWithAnInteger("/mydet/isolation",this); - isoCmd->SetGuidance("Maximum allowed number of hits in tracker"); - isoCmd->SetGuidance(" for an isolated muon track (includes hits by muon)"); - isoCmd->SetParameterName("N",true); - isoCmd->SetDefaultValue(10); - isoCmd->SetRange("N>=0"); - - roiCmd = new G4UIcmdWithADoubleAndUnit("/mydet/RoIangle",this); - roiCmd->SetGuidance("Define RoI angle"); - roiCmd->SetParameterName("theta",true,true); - roiCmd->SetDefaultUnit("deg"); -} - -ExN04StackingActionMessenger::~ExN04StackingActionMessenger() -{ - delete muonCmd; - delete isomuonCmd; - delete isoCmd; - delete roiCmd; -} - -void ExN04StackingActionMessenger::SetNewValue(G4UIcommand * command,G4String newValue) -{ - if( command==muonCmd ) - { myAction->SetNRequestMuon(muonCmd->GetNewIntValue(newValue)); } - else if( command==isomuonCmd ) - { myAction->SetNRequestIsoMuon(isomuonCmd->GetNewIntValue(newValue)); } - else if( command==isoCmd ) - { myAction->SetNIsolation(isoCmd->GetNewIntValue(newValue)); } - else if( command==roiCmd ) - { myAction->SetRoIAngle(roiCmd->GetNewDoubleValue(newValue)); } -} - -G4String ExN04StackingActionMessenger::GetCurrentValue(G4UIcommand * command) -{ - G4String cv; - - if( command==muonCmd ) - { cv = muonCmd->ConvertToString(myAction->GetNRequestMuon()); } - else if( command==isomuonCmd ) - { cv = isomuonCmd->ConvertToString(myAction->GetNRequestIsoMuon()); } - else if( command==isoCmd ) - { cv = isoCmd->ConvertToString(myAction->GetNIsolation()); } - else if( command==roiCmd ) - { cv = roiCmd->ConvertToString(myAction->GetRoIAngle(),"deg"); } - - return cv; -} - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04SteppingAction.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04SteppingAction.cc deleted file mode 100644 index db3baf0514..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04SteppingAction.cc +++ /dev/null @@ -1,73 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// - -#include "ExN04SteppingAction.hh" -#include "G4SteppingManager.hh" -#include "G4Track.hh" -#include "G4Step.hh" -#include "G4StepPoint.hh" -#include "G4TrackStatus.hh" -#include "G4VPhysicalVolume.hh" -#include "G4ParticleDefinition.hh" -#include "G4ParticleTypes.hh" - -ExN04SteppingAction::ExN04SteppingAction() -{;} - -ExN04SteppingAction::~ExN04SteppingAction() -{;} - -void ExN04SteppingAction::UserSteppingAction(const G4Step * theStep) -{ - G4Track * theTrack = theStep->GetTrack(); - - // check if it is alive - if(theTrack->GetTrackStatus()!=fAlive) { return; } - - // check if it is primary - if(theTrack->GetParentID()!=0) { return; } - - // check if it is NOT muon - G4ParticleDefinition * particleType = theTrack->GetDefinition(); - if((particleType==G4MuonPlus::MuonPlusDefinition()) - ||(particleType==G4MuonMinus::MuonMinusDefinition())) - { return; } - - // check if it is entering to the calorimeter volume - G4StepPoint * thePrePoint = theStep->GetPreStepPoint(); - G4VPhysicalVolume * thePrePV = thePrePoint->GetPhysicalVolume(); - G4String thePrePVname = thePrePV->GetName(); - if(thePrePVname(0,4)=="calo") { return; } - G4StepPoint * thePostPoint = theStep->GetPostStepPoint(); - G4VPhysicalVolume * thePostPV = thePostPoint->GetPhysicalVolume(); - G4String thePostPVname = thePostPV->GetName(); - if(thePostPVname(0,4)!="calo") { return; } - - // then suspend the track - theTrack->SetTrackStatus(fSuspend); -} - - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04SteppingVerbose.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04SteppingVerbose.cc deleted file mode 100644 index ee8782ebbf..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04SteppingVerbose.cc +++ /dev/null @@ -1,181 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: ExN04SteppingVerbose.cc,v 1.4 2006/06/29 17:09:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#include "ExN04SteppingVerbose.hh" - -#include "G4SteppingManager.hh" -#include "G4UnitsTable.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -ExN04SteppingVerbose::ExN04SteppingVerbose() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -ExN04SteppingVerbose::~ExN04SteppingVerbose() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void ExN04SteppingVerbose::StepInfo() -{ - CopyState(); - - G4int prec = G4cout.precision(3); - - if( verboseLevel >= 1 ){ - if( verboseLevel >= 4 ) VerboseTrack(); - if( verboseLevel >= 3 ){ - G4cout << G4endl; - G4cout << std::setw( 5) << "#Step#" << " " - << std::setw( 6) << "X" << " " - << std::setw( 6) << "Y" << " " - << std::setw( 6) << "Z" << " " - << std::setw( 9) << "KineE" << " " - << std::setw( 9) << "dEStep" << " " - << std::setw(10) << "StepLeng" - << std::setw(10) << "TrakLeng" - << std::setw(10) << "Volume" << " " - << std::setw(10) << "Process" << G4endl; - } - - G4cout << std::setw(5) << fTrack->GetCurrentStepNumber() << " " - << std::setw(6) << G4BestUnit(fTrack->GetPosition().x(),"Length") - << std::setw(6) << G4BestUnit(fTrack->GetPosition().y(),"Length") - << std::setw(6) << G4BestUnit(fTrack->GetPosition().z(),"Length") - << std::setw(6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy") - << std::setw(6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy") - << std::setw(6) << G4BestUnit(fStep->GetStepLength(),"Length") - << std::setw(6) << G4BestUnit(fTrack->GetTrackLength(),"Length") - << " "; - - // if( fStepStatus != fWorldBoundary){ - if( fTrack->GetNextVolume() != 0 ) { - G4cout << std::setw(10) << fTrack->GetVolume()->GetName(); - } else { - G4cout << std::setw(10) << "OutOfWorld"; - } - - if(fStep->GetPostStepPoint()->GetProcessDefinedStep() != NULL){ - G4cout << " " - << std::setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep() - ->GetProcessName(); - } else { - G4cout << " UserLimit"; - } - - G4cout << G4endl; - - if( verboseLevel == 2 ){ - G4int tN2ndariesTot = fN2ndariesAtRestDoIt + - fN2ndariesAlongStepDoIt + - fN2ndariesPostStepDoIt; - if(tN2ndariesTot>0){ - G4cout << " :----- List of 2ndaries - " - << "#SpawnInStep=" << std::setw(3) << tN2ndariesTot - << "(Rest=" << std::setw(2) << fN2ndariesAtRestDoIt - << ",Along=" << std::setw(2) << fN2ndariesAlongStepDoIt - << ",Post=" << std::setw(2) << fN2ndariesPostStepDoIt - << "), " - << "#SpawnTotal=" << std::setw(3) << (*fSecondary).size() - << " ---------------" - << G4endl; - - for(size_t lp1=(*fSecondary).size()-tN2ndariesTot; - lp1<(*fSecondary).size(); lp1++){ - G4cout << " : " - << std::setw(6) - << G4BestUnit((*fSecondary)[lp1]->GetPosition().x(),"Length") - << std::setw(6) - << G4BestUnit((*fSecondary)[lp1]->GetPosition().y(),"Length") - << std::setw(6) - << G4BestUnit((*fSecondary)[lp1]->GetPosition().z(),"Length") - << std::setw(6) - << G4BestUnit((*fSecondary)[lp1]->GetKineticEnergy(),"Energy") - << std::setw(10) - << (*fSecondary)[lp1]->GetDefinition()->GetParticleName(); - G4cout << G4endl; - } - - G4cout << " :-----------------------------" - << "----------------------------------" - << "-- EndOf2ndaries Info ---------------" - << G4endl; - } - } - - } - G4cout.precision(prec); -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void ExN04SteppingVerbose::TrackingStarted() -{ - - CopyState(); -G4int prec = G4cout.precision(3); - if( verboseLevel > 0 ){ - - G4cout << std::setw( 5) << "Step#" << " " - << std::setw( 6) << "X" << " " - << std::setw( 6) << "Y" << " " - << std::setw( 6) << "Z" << " " - << std::setw( 9) << "KineE" << " " - << std::setw( 9) << "dEStep" << " " - << std::setw(10) << "StepLeng" - << std::setw(10) << "TrakLeng" - << std::setw(10) << "Volume" << " " - << std::setw(10) << "Process" << G4endl; - - G4cout << std::setw(5) << fTrack->GetCurrentStepNumber() << " " - << std::setw(6) << G4BestUnit(fTrack->GetPosition().x(),"Length") - << std::setw(6) << G4BestUnit(fTrack->GetPosition().y(),"Length") - << std::setw(6) << G4BestUnit(fTrack->GetPosition().z(),"Length") - << std::setw(6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy") - << std::setw(6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy") - << std::setw(6) << G4BestUnit(fStep->GetStepLength(),"Length") - << std::setw(6) << G4BestUnit(fTrack->GetTrackLength(),"Length") - << " "; - - if(fTrack->GetNextVolume()){ - G4cout << std::setw(10) << fTrack->GetVolume()->GetName(); - } else { - G4cout << std::setw(10) << "OutOfWorld"; - } - G4cout << " initStep" << G4endl; - } - G4cout.precision(prec); -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/G4HepMCAsciiReader.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/G4HepMCAsciiReader.cc deleted file mode 100644 index 90f27cc647..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/G4HepMCAsciiReader.cc +++ /dev/null @@ -1,79 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// ==================================================================== -// -// G4HepMCAsciiReader.cc -// $Id: G4HepMCAsciiReader.cc,v 1.2 2006/06/29 17:09:16 gunter Exp $ -// -// ==================================================================== - -#ifndef WIN32 // Temporarly disabled on Windows, until CLHEP - // will support the HepMC module - -#include "G4HepMCAsciiReader.hh" -#include "G4HepMCAsciiReaderMessenger.hh" - -//#include "g4std/iostream" - -//////////////////////////////////////// -G4HepMCAsciiReader::G4HepMCAsciiReader() - : filename("xxx.dat"), verbose(0) -//////////////////////////////////////// -{ - messenger= new G4HepMCAsciiReaderMessenger(this); -} - -///////////////////////////////////////// -G4HepMCAsciiReader::~G4HepMCAsciiReader() -///////////////////////////////////////// -{ - delete messenger; -} - -///////////////////////////////////// -void G4HepMCAsciiReader::Initialize() -///////////////////////////////////// -{ - from.close(); - from.open(filename.c_str(), std::ios::in); -} - -///////////////////////////////////////////////////////// -HepMC::GenEvent* G4HepMCAsciiReader::GenerateHepMCEvent() -///////////////////////////////////////////////////////// -{ - HepMC::GenEvent* evt= HepMC::readGenEvent(from); - if(evt==0) { - return 0; // no more event - from.close(); - } - - if(verbose>0) evt-> print(); - - return evt; -} - -#endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/G4HepMCAsciiReaderMessenger.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/G4HepMCAsciiReaderMessenger.cc deleted file mode 100644 index 9d8915b56d..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/G4HepMCAsciiReaderMessenger.cc +++ /dev/null @@ -1,105 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// ==================================================================== -// -// G4HepMCAsciiReaderMessenger.cc -// $Id: G4HepMCAsciiReaderMessenger.cc,v 1.2 2006/06/29 17:09:19 gunter Exp $ -// -// ==================================================================== - -#ifndef WIN32 // Temporarly disabled on Windows, until CLHEP - // will support the HepMC module - -#include "G4HepMCAsciiReaderMessenger.hh" -#include "G4HepMCAsciiReader.hh" - -#include "G4UIdirectory.hh" -#include "G4UIcmdWithoutParameter.hh" -#include "G4UIcmdWithAString.hh" -#include "G4UIcmdWithAnInteger.hh" - -//////////////////////////////////////////////////////// -G4HepMCAsciiReaderMessenger::G4HepMCAsciiReaderMessenger - (G4HepMCAsciiReader* agen) - : gen(agen) -//////////////////////////////////////////////////////// -{ - dir= new G4UIdirectory("/generator/hepmcAscii/"); - dir-> SetGuidance("Reading HepMC event from an Ascii file"); - - verbose= - new G4UIcmdWithAnInteger("/generator/hepmcAscii/verbose", this); - verbose-> SetGuidance("Set verbose level"); - verbose-> SetParameterName("verboseLevel", false, false); - verbose-> SetRange("verboseLevel>=0 && verboseLevel<=1"); - - open= new G4UIcmdWithAString("/generator/hepmcAscii/open", this); - open-> SetGuidance("(re)open data file (HepMC Ascii format)"); - open-> SetParameterName("input ascii file", true, true); -} - -/////////////////////////////////////////////////////////// -G4HepMCAsciiReaderMessenger::~G4HepMCAsciiReaderMessenger() -/////////////////////////////////////////////////////////// -{ - delete verbose; - delete open; - - delete dir; -} - -/////////////////////////////////////////////////////////////////// -void G4HepMCAsciiReaderMessenger::SetNewValue(G4UIcommand* command, - G4String newValues) -/////////////////////////////////////////////////////////////////// -{ - if (command==verbose) { - int level= verbose-> GetNewIntValue(newValues); - gen-> SetVerboseLevel(level); - } else if (command==open) { - gen-> SetFileName(newValues); - G4cout << "HepMC Ascii inputfile: " - << gen-> GetFileName() << G4endl; - gen-> Initialize(); - } -} - - -/////////////////////////////////////////////////////////////////////////// -G4String G4HepMCAsciiReaderMessenger::GetCurrentValue(G4UIcommand* command) -/////////////////////////////////////////////////////////////////////////// -{ - G4String cv; - - if (command == verbose) { - cv= verbose-> ConvertToString(gen-> GetVerboseLevel()); - } else if (command == open) { - cv= gen-> GetFileName(); - } - return cv; -} - -#endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/G4HepMCInterface.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/G4HepMCInterface.cc deleted file mode 100644 index 2f449983a6..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/G4HepMCInterface.cc +++ /dev/null @@ -1,131 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// ==================================================================== -// -// G4HepMCInterface.cc -// $Id: G4HepMCInterface.cc,v 1.2 2006/06/29 17:09:21 gunter Exp $ -// -// ==================================================================== - -#ifndef WIN32 // Temporarly disabled on Windows, until CLHEP - // will support the HepMC module - -#include "G4HepMCInterface.hh" - -#include "globals.hh" -#include "G4LorentzVector.hh" -#include "G4Event.hh" -#include "G4PrimaryParticle.hh" -#include "G4PrimaryVertex.hh" - -//////////////////////////////////// -G4HepMCInterface::G4HepMCInterface() - : hepmcEvent(0) -//////////////////////////////////// -{ -} - -///////////////////////////////////// -G4HepMCInterface::~G4HepMCInterface() -///////////////////////////////////// -{ - delete hepmcEvent; -} - -//////////////////////////////////////////////////////////////// -void G4HepMCInterface::HepMC2G4(const HepMC::GenEvent* hepmcevt, - G4Event* g4event) -//////////////////////////////////////////////////////////////// -{ - for(HepMC::GenEvent::vertex_const_iterator vitr= hepmcevt->vertices_begin(); - vitr != hepmcevt->vertices_end(); ++vitr ) { // loop for vertex ... - - // real vertex? - G4bool qvtx=false; - for (HepMC::GenVertex::particle_iterator - pitr= (*vitr)->particles_begin(HepMC::children); - pitr != (*vitr)->particles_end(HepMC::children); ++pitr) { - - if (!(*pitr)->end_vertex() && (*pitr)->status()==1) { - qvtx=true; - break; - } - } - if (!qvtx) continue; - - // check world boundary - G4LorentzVector xvtx= (*vitr)-> position(); - if (! CheckVertexInsideWorld(xvtx.vect()*mm)) continue; - - // create G4PrimaryVertex and associated G4PrimaryParticles - G4PrimaryVertex* g4vtx= - new G4PrimaryVertex(xvtx.x()*mm, xvtx.y()*mm, xvtx.z()*mm, - xvtx.t()*mm/c_light); - - for (HepMC::GenVertex::particle_iterator - vpitr= (*vitr)->particles_begin(HepMC::children); - vpitr != (*vitr)->particles_end(HepMC::children); ++vpitr) { - - if( (*vpitr)->status() != 1 ) continue; - - G4int pdgcode= (*vpitr)-> pdg_id(); - G4LorentzVector p= (*vpitr)-> momentum(); - G4PrimaryParticle* g4prim= - new G4PrimaryParticle(pdgcode, p.x()*GeV, p.y()*GeV, p.z()*GeV); - - g4vtx-> SetPrimary(g4prim); - } - g4event-> AddPrimaryVertex(g4vtx); - } -} - - -/////////////////////////////////////////////////////// -HepMC::GenEvent* G4HepMCInterface::GenerateHepMCEvent() -/////////////////////////////////////////////////////// -{ - HepMC::GenEvent* aevent= new HepMC::GenEvent(); - return aevent; -} - -////////////////////////////////////////////////////////////// -void G4HepMCInterface::GeneratePrimaryVertex(G4Event* anEvent) -////////////////////////////////////////////////////////////// -{ - // delete previous event object - delete hepmcEvent; - - // generate next event - hepmcEvent= GenerateHepMCEvent(); - if(! hepmcEvent) { - G4Exception("G4HepMCInterface","GeneratePrimaryVertex",RunMustBeAborted, - "HepMCInterface: no generated particles. run terminated..." ); - return; - } - HepMC2G4(hepmcEvent, anEvent); -} - -#endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/H01PythiaInterface.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/H01PythiaInterface.cc deleted file mode 100644 index 42ab772098..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/H01PythiaInterface.cc +++ /dev/null @@ -1,191 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// ==================================================================== -// -// H01PythiaInterface.cc -// $Id: H01PythiaInterface.cc,v 1.5 2006/06/29 17:09:24 gunter Exp $ -// -// ==================================================================== -#include "H01PythiaInterface.hh" -#include "H01PythiaMessenger.hh" - -#include -#include - -// additional pythia calls -#define pygive pygive_ -#define pyrget pyrget_ -#define pyrset pyrset_ - -extern "C" { - void pygive(const char*, int); - void pyrget(int*, int*); - void pyrset(int*, int*); -} - -void call_pygive(G4String s) { pygive(s.c_str(), s.length()); } -void call_pyrget(int a, int b) { pyrget(&a, &b); } -void call_pyrset(int a, int b) { pyrset(&a, &b); } - -// global parameters -hepev2_t hepev2_; -hepev3_t hepev3_; -hepev4_t hepev4_; -hepev5_t hepev5_; - -//////////////////////////////////////// -H01PythiaInterface::H01PythiaInterface() - : verbose(0), mpylist(0) -//////////////////////////////////////// -{ - hepevtio= new HepMC::CBhepevt; - messenger= new H01PythiaMessenger(this); -} - -///////////////////////////////////////// -H01PythiaInterface::~H01PythiaInterface() -///////////////////////////////////////// -{ - delete hepevtio; - delete messenger; -} - -///////////////////////////////////////////////// -void H01PythiaInterface::CallPygive(G4String par) -///////////////////////////////////////////////// -{ - call_pygive(par); -} - -////////////////////////////////////////////////////////////////////// -void H01PythiaInterface::CallPyinit(G4String frame, G4String beam, - G4String target, G4double win) -////////////////////////////////////////////////////////////////////// -{ - call_pyinit(frame.c_str(), beam.c_str(), target.c_str(), win); -} - -//////////////////////////////////////////////// -void H01PythiaInterface::CallPystat(G4int istat) -//////////////////////////////////////////////// -{ - call_pystat(istat); -} - - -////////////////////////////////////////////////////////// -void H01PythiaInterface::CallPyrget(G4int lun, G4int move) -////////////////////////////////////////////////////////// -{ - call_pyrget(lun, move); -} - -////////////////////////////////////////////////////////// -void H01PythiaInterface::CallPyrset(G4int lun, G4int move) -////////////////////////////////////////////////////////// -{ - call_pyrset(lun, move); -} - - -///////////////////////////////////// -void H01PythiaInterface::CallPyevnt() -///////////////////////////////////// -{ - call_pyevnt(); -} - -/////////////////////////////////////////////// -void H01PythiaInterface::CallPylist(G4int mode) -/////////////////////////////////////////////// -{ - call_pylist(mode); -} - -/////////////////////////////////////////////// -void H01PythiaInterface::CallPyhepc(G4int mode) -/////////////////////////////////////////////// -{ - call_pyhepc(mode); -} - - -/////////////////////////////////////////////////// -void H01PythiaInterface::SetRandomSeed(G4int iseed) -/////////////////////////////////////////////////// -{ - pydatr.mrpy[1-1]= iseed; -} - -////////////////////////////////////////////////////////////////////// -void H01PythiaInterface::PrintRandomStatus(std::ostream& ostr) const -////////////////////////////////////////////////////////////////////// -{ - ostr << "# Pythia random numbers status" << G4endl; - for (G4int j=0; j<6; j++) { - ostr << "pydatr.mrpy[" << j << "]= " << pydatr.mrpy[j] << G4endl; - } - for (G4int k=0; k<100; k++) { - ostr << "pydatr.rrpy[" << k << "]= " << pydatr.rrpy[k] << G4endl; - } -} - -//////////////////////////////////////////// -void H01PythiaInterface::SetUserParameters() -//////////////////////////////////////////// -{ - G4cout << "set user parameters of PYTHIA common." << G4endl - << "nothing to be done in default." - << G4endl; -} - -///////////////////////////////////////////////////////// -HepMC::GenEvent* H01PythiaInterface::GenerateHepMCEvent() -///////////////////////////////////////////////////////// -{ - static G4int nevent= 0; // event counter - - CallPyevnt(); // generate one event with Pythia - if(mpylist >=1 && mpylist<= 3) CallPylist(mpylist); - - CallPyhepc(1); - - HepMC::GenEvent* evt= new HepMC::GenEvent(); - hepevtio-> toGenEvent(evt, false); - hepevtio-> clean(); // clear HEPEVT common - evt-> set_event_number(nevent++); - if(verbose>0) evt-> print(); - - return evt; -} - -////////////////////////////////////// -void H01PythiaInterface::Print() const -////////////////////////////////////// -{ - G4cout << "PythiaInterface::Print()..." << G4endl; -} - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/H01PythiaMessenger.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/H01PythiaMessenger.cc deleted file mode 100644 index f66c83197d..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/H01PythiaMessenger.cc +++ /dev/null @@ -1,217 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// ==================================================================== -// -// H01PythiaMessenger.cc -// $Id: H01PythiaMessenger.cc,v 1.5 2006/06/29 17:09:26 gunter Exp $ -// -// ==================================================================== -#include "H01PythiaMessenger.hh" -#include "H01PythiaInterface.hh" - -#include -#include - -#include "G4UIdirectory.hh" -#include "G4UIcmdWithoutParameter.hh" -#include "G4UIcmdWithAString.hh" -#include "G4UIcmdWithAnInteger.hh" - -//////////////////////////////////////////////////////////////// -H01PythiaMessenger::H01PythiaMessenger(H01PythiaInterface* agen) - : gen(agen) -//////////////////////////////////////////////////////////////// -{ - dir= new G4UIdirectory("/generator/pythia/"); - dir-> SetGuidance("Commands for Pythia event generation"); - - verbose= new G4UIcmdWithAnInteger("/generator/pythia/verbose",this); - verbose-> SetGuidance("set verbose level"); - verbose-> SetParameterName("verboseLevel", false, false); - verbose-> SetRange("verboseLevel>=0 && verboseLevel<=2"); - - mpylist= new G4UIcmdWithAnInteger("/generator/pythia/pylist",this); - mpylist-> SetGuidance("set argument of pylist (not called if mlist=0)"); - mpylist-> SetParameterName("mlist", false, false); - mpylist-> SetRange("mlist>=0 && mlist<=3"); - - print= new G4UIcmdWithoutParameter("/generator/pythia/print", this); - print-> SetGuidance("print user information."); - - cpyinit= new G4UIcommand("/generator/pythia/pyinit", this); - cpyinit-> SetGuidance("call PYINIT"); - G4UIparameter* frame= - new G4UIparameter("frame of the experiment", 's', false); - cpyinit-> SetParameter(frame); - G4UIparameter* beam= new G4UIparameter("beam particle", 's', false); - cpyinit-> SetParameter(beam); - G4UIparameter* target= new G4UIparameter("target particle", 's', false); - cpyinit-> SetParameter(target); - G4UIparameter* win= new G4UIparameter("energy of system (GeV)", 'd', false); - cpyinit-> SetParameter(win); - - cpystat= new G4UIcmdWithAnInteger("/generator/pythia/pystat", this); - cpystat-> SetGuidance("call PYSTAT"); - cpystat-> SetParameterName("mstat", false, false); - cpystat-> SetRange("mstat>=1 && mstat<=5"); - - cpygive= new G4UIcommand("/generator/pythia/pygive",this); - cpygive-> SetGuidance("call PYGIVE"); - G4UIparameter* parameter= new G4UIparameter ("Parameter", 's', false); - cpygive-> SetParameter(parameter); - - setUserParameters= - new G4UIcmdWithoutParameter("/generator/pythia/setUserParameters",this); - setUserParameters-> - SetGuidance("Set user parameters in the Pythia common blocks"); - - setSeed= new G4UIcmdWithAnInteger("/generator/pythia/setSeed", this); - setSeed-> SetGuidance("set initial seed."); - - cpyrget= new G4UIcommand("/generator/pythia/pyrget", this); - cpyrget-> SetGuidance("call PYRGET"); - G4UIparameter* lun, *move; - lun= new G4UIparameter("logical file number", 'i', false); - cpyrget-> SetParameter(lun); - move= new G4UIparameter("choice of adding a new record", 'i', true); - move-> SetDefaultValue(-1); - cpyrget-> SetParameter(move); - - cpyrset= new G4UIcommand("/generator/pythia/pyrset", this); - cpyrset-> SetGuidance("call PYRSET"); - lun= new G4UIparameter("logical file number", 'i', false); - cpyrset-> SetParameter(lun); - move= new G4UIparameter("choice of adding a new record", 'i', true); - move-> SetDefaultValue(0); - cpyrset-> SetParameter(move); - - printRandomStatus= - new G4UIcmdWithAString("/generator/pythia/printRandomStatus", this); - printRandomStatus-> SetGuidance("print random number status."); - printRandomStatus-> SetParameterName("filename", true, false); - printRandomStatus-> SetDefaultValue("G4cout"); -} - -///////////////////////////////////////// -H01PythiaMessenger::~H01PythiaMessenger() -///////////////////////////////////////// -{ - delete verbose; - delete mpylist; - delete print; - delete cpyinit; - delete cpystat; - delete cpygive; - delete setUserParameters; - delete setSeed; - delete cpyrget; - delete cpyrset; - delete printRandomStatus; - - delete dir; -} - -//////////////////////////////////////////////////////////// -void H01PythiaMessenger::SetNewValue(G4UIcommand* command, - G4String newValues) -//////////////////////////////////////////////////////////// -{ - if(command == verbose) { // /verbose ... - G4int level= verbose-> GetNewIntValue(newValues); - gen-> SetVerboseLevel(level); - - } else if (command == mpylist) { // /mpylist ... - G4int mlist= mpylist-> GetNewIntValue(newValues); - gen-> SetPylist(mlist); - - } else if (command == print) { // /print ... - gen-> Print(); - - } else if (command == cpyinit) { // /pyinit ... - const char* strvaluelist= newValues.c_str(); - std::istringstream is(strvaluelist); - G4String sframe, sbeam, starget; G4double dwin; - is >> sframe >> sbeam >> starget >> dwin; - gen-> CallPyinit(sframe, sbeam, starget, dwin); - - } else if (command == cpystat) { // /pystat ... - G4int imod= cpystat-> GetNewIntValue(newValues); - gen-> CallPystat(imod); - - } else if (command == cpygive) { // /pygive ... - G4String s= newValues; - gen-> CallPygive(s); - - } else if (command == setUserParameters) { // /setUserParameters ... - gen-> SetUserParameters(); - - } else if (command == setSeed) { // /setSeed ... - G4int iseed= setSeed-> GetNewIntValue(newValues); - gen-> SetRandomSeed(iseed); - - } else if (command == cpyrget) { // /pyrget ... - const char* strvaluelist= newValues.c_str(); - std::istringstream is(strvaluelist); - G4int lun, move; - is >> lun >> move; - gen-> CallPyrget(lun, move); - - } else if (command == cpyrset) { // /pyrset ... - const char* strvaluelist= newValues.c_str(); - std::istringstream is(strvaluelist); - G4int lun, move; - is >> lun >> move; - gen-> CallPyrset(lun, move); - - } else if (command == printRandomStatus) { // /printRandomStatus ... - G4String s= newValues; - if (newValues == "G4cout") { - gen-> PrintRandomStatus(); - } else { - // to a file (overwrite mode) - std::ofstream ofs; - ofs.open(s.c_str(), std::ios::out); - //ofs.open(randomStatusFileName.c_str(), std::ios::out|std::ios::app); - ofs.setf(std::ios::fixed | std::ios::showpoint); - gen-> PrintRandomStatus(ofs); - ofs.close(); - } - } -} - -////////////////////////////////////////////////////////////////////// -G4String H01PythiaMessenger::GetCurrentValue(G4UIcommand* command) -////////////////////////////////////////////////////////////////////// -{ - G4String cv; - if (command == verbose) { - cv= verbose-> ConvertToString(gen->GetVerboseLevel()); - } else if (command == mpylist) { - cv= verbose-> ConvertToString(gen->GetPylist()); - } - return cv; -} - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/vis.mac b/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/vis.mac deleted file mode 100644 index aacc1b037b..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/vis.mac +++ /dev/null @@ -1,31 +0,0 @@ -# -# Macro file for the initialization phase of "exampleN02.cc" -# when runing in interactive mode -# -# Sets some default verbose -# -/control/verbose 2 -/run/verbose 2 -# -# create empty scene -# -/vis/scene/create -# -# Create a scene handler for a specific graphics system -# (Edit the next line(s) to choose another graphic system) -# -/vis/open OGLIX -# -####/vis/open DAWNFILE -# -# draw scene -# -/vis/viewer/set/viewpointThetaPhi 90 180 deg -/vis/viewer/zoom 1.4 -/vis/viewer/flush -# -# for drawing the tracks -# (if too many tracks cause core dump => storeTrajectory 0) -/tracking/storeTrajectory 1 -/vis/scene/endOfEventAction accumulate - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01/GNUmakefile b/examples/extended/eventgenerator/HepMC/HepMCEx01/GNUmakefile index 742eed7dac..517d8a2c89 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01/GNUmakefile +++ b/examples/extended/eventgenerator/HepMC/HepMCEx01/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.2 2002/05/28 14:05:16 murakami Exp $ +# $Id: GNUmakefile,v 1.6 2006/11/22 15:09:21 gcosmo Exp $ # -------------------------------------------------------------- # GNUmakefile for examples module. Gabriele Cosmo, 06/04/98. # -------------------------------------------------------------- @@ -6,70 +6,42 @@ name := hepmcEx01 G4TARGET := $(name) G4EXLIB := true -#ifndef G4WORKDIR -# G4WORKDIR := . -#endif +ifndef G4INSTALL + G4INSTALL = ../../../../.. +endif .PHONY: all + +ifdef HEPMC_DIR all : lib bin + include $(G4INSTALL)/config/binmake.gmk -include $(G4INSTALL)/config/binmake.gmk + # ----------------------------------------------------------------- + # HepMC and PYTHIA -# ----------------------------------------------------------------- -# HepMC and PYTHIA - -# if you donnot use Pythia library, comment out. -USE_PYTHIA := 1 - -# HepMC -HEPMC_DIR := /opt/heplib/HepMC/1.21 -INCFLAGS += -I$(HEPMC_DIR) - -# check gcc -USE_GCC := 0 -ifeq ($(G4SYSTEM),Linux-g++) - USE_GCC := 1 -endif -ifeq ($(G4SYSTEM),Linux-egcs) - USE_GCC := 1 -endif - -ifeq ($(USE_GCC),1) - LDLIBS1 += -Wl,-rpath $(HEPMC_DIR) -endif - -ifdef USE_PYTHIA - LDLIBS1 += -L$(HEPMC_DIR) -lHepMC -else - LDLIBS1 += -L$(HEPMC_DIR) -lHepMC $(G4TMPDIR)/HEPEvtcom.o -endif - -ifdef USE_PYTHIA - CERNLIB_DIR := /cern/pro/lib - LDLIBS1 += -L$(CERNLIB_DIR) -lpythia6 - - # if you get pythia initialization errors, try the next flag. - #NEED_INITPYDATA := 1 - ifdef NEED_INITPYDATA - CXXFLAGS += -DNEED_INITPYDATA - LDLIBS1 += $(HepMC_DIR)/src/initpydata.o - #LDLIBS1 += external/initpydata.o + # if you do not use Pythia library, comment out the next line. + # + G4LIB_USE_PYTHIA := 1 + ifdef G4LIB_USE_PYTHIA + CPPFLAGS += -DG4LIB_USE_PYTHIA endif - LDLIBS1 += $(FCLIBS) -endif -# ----------------------------------------------------------------- + INCFLAGS += -I$(HEPMC_DIR)/include -CXXFLAGS_WITHOUT_O := $(filter-out -O% , $(CXXFLAGS)) -CXXFLAGS_WITHOUT_O := $(filter-out +O% , $(CXXFLAGS_WITHOUT_O)) + ifdef G4LIB_USE_PYTHIA + LDLIBS1 += -L$(HEPMC_DIR)/lib -lHepMC -lHepMCfio + else + LDLIBS1 += -L$(HEPMC_DIR)/lib -lHepMC -lHepMCfio $(G4TMPDIR)/HEPEvtcom.o + endif -# On HP-acc optimization has to be turned off to compile ExN04HadronPhysics. -# -ifeq ($(G4SYSTEM),HP-aCC) - COMPILER := $(shell aCC -V 2>&1) -ifeq ($(COMPILER), aCC: HP ANSI C++ B3910B A.01.15) -$(G4TMP)/$(G4SYSTEM)/$(name)/XXHadronPhysics.o: src/XXHadronPhysics.cc - $(CXX) $(CXXFLAGS_WITHOUT_O) $(CPPFLAGS) -c $(OUT_OBJ)$@ src/XXHadronPhysics.cc + # Path for PYTHIA Fortran library. Based on CERNLIB-2005. + # Add "/cern/pro/bin" to $PATH first ! + # + ifdef G4LIB_USE_PYTHIA + LDLIBS1 += $(shell cernlib -v pro pythia6205 pdflib804 mathlib) -lg2c + endif +else +all: + @echo 'ERROR - HEPMC_DIR not defined in the environment !' + @echo ' Requires HepMC release 1.27.' endif -endif - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01/History b/examples/extended/eventgenerator/HepMC/HepMCEx01/History index 68fec0ca9e..1bdeb63524 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01/History +++ b/examples/extended/eventgenerator/HepMC/HepMCEx01/History @@ -1,4 +1,4 @@ -$Id: History,v 1.7 2005/05/03 10:05:49 allison Exp $ +$Id: History,v 1.12 2006/11/22 15:09:21 gcosmo Exp $ ------------------------------------------------------------------- ========================================================= @@ -15,27 +15,41 @@ track of all tags. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- -3rd May 2005 John Allison (examples-V07-00-03) +November, 22nd 2006 G.Cosmo +- Corrected GNUmakefile. + +November 20th 2006 K.Murakami +- GNUmakefile was modified for new place for physics list package + +October 18th 2006 J.Allison +- Migrate to new trajectory modeling commands. + +July 5th, 2006 G.Cosmo +- Updated to current version of exampleN04. Now working with release series 8. +- Corrected GNUmakefile, now requiring CERNLIB 2005 for PYTHIA-8.0.4 and + HepMC 1.27 or greater. + +May 3rd, 2005 John Allison - Replaced vis manager with G4VisExecutive. -Dec. 2nd, 2003 G.Cosmo +December 2nd, 2003 G.Cosmo - Brought up-to-date with examples/novice/N04. -Nov. 13th, 2003 J.Allison +November 13th, 2003 J.Allison - Removed OPACS from Vis Manager. -Jul. 04, 2003 G.Cosmo (exHepMC-V05-02-00) +July 4th, 2003 G.Cosmo - fixed compilation errors due to incorrect code migration from g4std wrappers. - fixed pedantic compilation warnings on Linux-g++. -Nov. 19, 2002 K.Murakami +November 19th, 2002 K.Murakami - modified as is ExN04. (physics lists and vis. manager) - "std" namespace left/not cared was modified to "G4std". -May. 28, 2002 K.Murakami +May 28th, 2002 K.Murakami - renamed classes and filenames. -Apr. 15, 2002 K.Murakami +April 15th, 2002 K.Murakami - Creared from examples/novice/N04. - Replace N04PrimaryGeneatorAction with HepMC-interface version. - Resize the world volume. diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01/README b/examples/extended/eventgenerator/HepMC/HepMCEx01/README index d4783a19af..aff1564afa 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01/README +++ b/examples/extended/eventgenerator/HepMC/HepMCEx01/README @@ -1,4 +1,4 @@ -$Id: README,v 1.2 2002/05/28 14:05:17 murakami Exp $ +$Id: README,v 1.3 2006/07/05 11:53:02 gcosmo Exp $ ------------------------------------------------------------------- ========================================================= @@ -48,5 +48,7 @@ At the third stage, all particles in the RoI (Region of Interest) along the isolated muons are tracked. All these examinations are applied in ExN04StackingAction. - - +NOTE: it requires the installation of: + - CERNLIB 2005 and proper access to the "/cern/pro/bin" path included + in $PATH. + - HepMC, version 1.27 or greater and proper path defined in $HEPMC_DIR. diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01/hepmcEx01.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01/hepmcEx01.cc index 2da569a457..1cd19a7715 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01/hepmcEx01.cc +++ b/examples/extended/eventgenerator/HepMC/HepMCEx01/hepmcEx01.cc @@ -24,19 +24,13 @@ // ******************************************************************** // // -// $Id: hepmcEx01.cc,v 1.4 2006/06/29 17:04:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: hepmcEx01.cc,v 1.5 2006/07/05 11:06:36 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- -// GEANT 4 - exampleN04 -// +// GEANT 4 - example derived from novice exampleN04 // -------------------------------------------------------------- -// Comments -// -// -// -------------------------------------------------------------- - #include "G4RunManager.hh" #include "G4UImanager.hh" @@ -44,7 +38,7 @@ #include "G4UItcsh.hh" #include "ExN04DetectorConstruction.hh" -#include "ExN04PhysicsList.hh" +#include "QGSP.hh" #include "ExN04PrimaryGeneratorAction.hh" #include "ExN04RunAction.hh" #include "ExN04EventAction.hh" @@ -59,12 +53,22 @@ int main(int argc,char** argv) { - G4VSteppingVerbose::SetInstance(new ExN04SteppingVerbose); + // User Verbose output class + // + G4VSteppingVerbose* verbosity = new ExN04SteppingVerbose; + G4VSteppingVerbose::SetInstance(verbosity); + // Run manager + // G4RunManager* runManager = new G4RunManager; - runManager->SetUserInitialization(new ExN04DetectorConstruction); - runManager->SetUserInitialization(new ExN04PhysicsList); + // User Initialization classes (mandatory) + // + G4VUserDetectorConstruction* detector = new ExN04DetectorConstruction; + runManager->SetUserInitialization(detector); + // + G4VUserPhysicsList* physics = new QGSP; + runManager->SetUserInitialization(physics); #ifdef G4VIS_USE // Visualization, if you choose to have it! @@ -74,19 +78,33 @@ int main(int argc,char** argv) runManager->Initialize(); - runManager->SetUserAction(new ExN04PrimaryGeneratorAction); - runManager->SetUserAction(new ExN04RunAction); - runManager->SetUserAction(new ExN04EventAction); - runManager->SetUserAction(new ExN04StackingAction); - runManager->SetUserAction(new ExN04TrackingAction); - runManager->SetUserAction(new ExN04SteppingAction); + // User Action classes + // + G4VUserPrimaryGeneratorAction* gen_action = new ExN04PrimaryGeneratorAction; + runManager->SetUserAction(gen_action); + // + G4UserRunAction* run_action = new ExN04RunAction; + runManager->SetUserAction(run_action); + // + G4UserEventAction* event_action = new ExN04EventAction; + runManager->SetUserAction(event_action); + // + G4UserStackingAction* stacking_action = new ExN04StackingAction; + runManager->SetUserAction(stacking_action); + // + G4UserTrackingAction* tracking_action = new ExN04TrackingAction; + runManager->SetUserAction(tracking_action); + // + G4UserSteppingAction* stepping_action = new ExN04SteppingAction; + runManager->SetUserAction(stepping_action); //get the pointer to the User Interface manager G4UImanager* UImanager = G4UImanager::GetUIpointer(); if(argc==1) { - // G4UIterminal is a (dumb) terminal. + // G4UIterminal is a (dumb) terminal + // #ifdef G4UI_USE_TCSH G4UIsession* session = new G4UIterminal(new G4UItcsh); #else @@ -96,17 +114,22 @@ int main(int argc,char** argv) session->SessionStart(); delete session; } - else + else // Batch mode { G4String command = "/control/execute "; G4String fileName = argv[1]; UImanager->ApplyCommand(command+fileName); } - delete runManager; + // Free the store: user actions, physics_list and detector_description are + // owned and deleted by the run manager, so they should not + // be deleted in the main() program ! + #ifdef G4VIS_USE delete visManager; #endif + delete runManager; + delete verbosity; return 0; } diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01/hepmc_ascii.out b/examples/extended/eventgenerator/HepMC/HepMCEx01/hepmc_ascii.out index 64eee1aa1a..181be9d763 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01/hepmc_ascii.out +++ b/examples/extended/eventgenerator/HepMC/HepMCEx01/hepmc_ascii.out @@ -1,81 +1,200 @@ -********************************************** - Geant4 version $Name: geant4-08-01 $ - (31-Jul-2002) - Copyright : Geant4 Collaboration -********************************************** -phot: Total cross sections from Sandia parametrisation. -MuonMinusCaptureAtRest is created +************************************************************* + Geant4 version Name: geant4-08-01-ref-00 (30-June-2006) + Copyright : Geant4 Collaboration + Reference : NIM A 506 (2003), 250-303 + WWW : http://cern.ch/geant4 +************************************************************* -compt: Total cross sections from a parametrisation. Good description from 10 KeV to (100/Z) GeV. - Scattered gamma energy according Klein-Nishina. - PhysicsTables from 1 keV to 100 GeV in 80 bins. -conv: Total cross sections from a parametrisation. Good description from 1.5 MeV to 100 GeV for all Z. - e+e- energies according Bethe-Heitler - PhysicsTables from 1.022 MeV to 100 GeV in 100 bins. +<<< Geant4 Physics List engine packaging library: PACK 5.1 +<<< Geant4 Physics List simulation engine: QGSP 3.1 -eBrem: Total cross sections from a NEW parametrisation based on the EEDL data library. - Good description from 1 KeV to 100 GeV. - log scale extrapolation above 100 GeV - Gamma energy sampled from a parametrised formula. - PhysicsTables from 1 keV to 100 TeV in 100 bins. +Visualization Manager instantiating... +Visualization Manager initialising... +Registering graphics systems... -eIoni: delta cross sections from Moller+Bhabha. Good description from 1 KeV to 100 GeV. - delta ray energy sampled from differential Xsection. - PhysicsTables from 1 keV to 100 TeV in 100 bins. +You have successfully registered the following graphics systems. +Current available graphics systems are: + ASCIITree (ATree) + DAWNFILE (DAWNFILE) + GAGTree (GAGTree) + G4HepRep (HepRepXML) + G4HepRepFile (HepRepFile) + RayTracer (RayTracer) + VRML1FILE (VRML1FILE) + VRML2FILE (VRML2FILE) + FukuiRenderer (DAWN) + OpenGLImmediateX (OGLIX) + OpenGLStoredX (OGLSX) + OpenGLImmediateXm (OGLIXm) + OpenGLStoredXm (OGLSXm) + OpenInventorXt (OIX) + RayTracerX (RayTracerX) + VRML1 (VRML1) + VRML2 (VRML2) -msc: Tables of transport mean free paths. - New model of MSC , computes the lateral - displacement of the particle , too. - PhysicsTables from 100 eV to 100 TeV in 100 bins. +Registering model factories... -annihil: Total cross section from Heilter formula(annihilation into 2 photons). - gamma energies sampled according Heitler - PhysicsTables from 10 keV to 10 TeV in 100 bins. +You have successfully registered the following model factories. +Registered model factories: + generic + drawByCharge + drawByParticleID + drawByOriginVolume -annihil: Total cross section from Heilter formula(annihilation into 2 photons). - gamma energies sampled according Heitler - PhysicsTables from 10 keV to 10 TeV in 100 bins. +Registered models: + None -hIoni: Knock-on electron cross sections . - Good description above the mean excitation energy. - delta ray energy sampled from differential Xsection. - PhysicsTables from 1 keV to 100 TeV in 100 bins. +Registered filter factories: + chargeFilter + particleFilter + originVolumeFilter -msc: Tables of transport mean free paths. - New model of MSC , computes the lateral - displacement of the particle , too. - PhysicsTables from 100 eV to 100 TeV in 100 bins. +Registered filters: + None -MuIoni: Knock-on electron cross sections . - Good description above the mean excitation energy. - delta ray energy sampled from differential Xsection. - PhysicsTables from 1 keV to 1000 PeV in 150 bins. - -MuBrems: theoretical cross section - Good description up to 1000 PeV. - PhysicsTables from 1 keV to 1000 PeV in 150 bins. - -MuPairProd: theoretical cross sections - Good description up to 1000 PeV. - PhysicsTables from 1 keV to 1000 PeV in 150 bins. - -msc: Tables of transport mean free paths. - New model of MSC , computes the lateral - displacement of the particle , too. - PhysicsTables from 100 eV to 100 TeV in 100 bins. current generator type: hepmcAscii HepMC Ascii inputfile: data/example_MyPythia.dat IO_Ascii: unformated ascii file IO for machine reading. - File openmode: 1 file state: 0 bad:0 eof:0 fail:0 good:0 + File openmode: 8 file state: 0 bad:0 eof:0 fail:0 good:0 + +phot: Total cross sections from Sandia parametrisation. + +compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV + Sampling according Klein-Nishina model + tables are built for gamma + Lambda tables from 100 eV to 100 GeV in 90 bins. + +conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; + sampling secondary e+e- according to the Bethe-Heitler model + tables are built for gamma + Lambda tables from 1.022 MeV to 100 GeV in 100 bins. + +msc: Model variant of multiple scattering for e- + Lambda tables from 100 eV to 100 TeV in 120 bins. + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +eIoni: tables are built for e- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +eBrem: tables are built for e- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Total cross sections from a parametrisation based on the EEDL data library. + Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. + +eIoni: tables are built for e+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +eBrem: tables are built for e+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Total cross sections from a parametrisation based on the EEDL data library. + Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. + +annihil: Heilter model of formula of annihilation into 2 photons + tables are built for e+ + Lambda tables from 100 eV to 100 TeV in 120 bins. + +msc: Model variant of multiple scattering for proton + Lambda tables from 100 eV to 100 TeV in 120 bins. + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +hIoni: tables are built for proton + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +msc: Model variant of multiple scattering for GenericIon + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +ionIoni: tables are built for GenericIon + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for alpha particles below. + Stopping Power data for 8 ion/material pairs are used. + Step function: finalRange(mm)= 0.1, dRoverRange= 0.1, integral: 1 + +hIoni: tables are built for anti_proton + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +msc: Model variant of multiple scattering for mu+ + Lambda tables from 100 eV to 100 TeV in 120 bins. + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +muIoni: tables are built for mu+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Bether-Bloch model for E > 0.2 MeV, parametrisation of Bragg peak below, + radiative corrections for E > 1 GeV + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +muBrems: tables are built for mu+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Parametrised model + +muPairProd: tables are built for mu+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Parametrised model + +muIoni: tables are built for mu- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Bether-Bloch model for E > 0.2 MeV, parametrisation of Bragg peak below, + radiative corrections for E > 1 GeV + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +muBrems: tables are built for mu- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Parametrised model + +muPairProd: tables are built for mu- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Parametrised model + +hIoni: tables are built for pi+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 0.297504 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +msc: Model variant of multiple scattering for pi- + Lambda tables from 100 eV to 100 TeV in 120 bins. + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +hIoni: tables are built for pi- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 0.297504 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 +### Run 0 start. ________________________________________________________________________________ GenEvent: #1 ID=20 SignalProcessGenVertex Barcode: 0 Current Memory Usage: 1 events, 78 vertices, 210 particles. Entries this event: 78 vertices, 210 particles. RndmState(0)= Wgts(0)= - EventScale -1 GeV alphaQCD=-1 alphaQED=-1 + EventScale -1 [energy] alphaQCD=-1 alphaQED=-1 GenParticle Legend Barcode PDG ID ( Px, Py, Pz, E ) Stat DecayVtx ________________________________________________________________________________ @@ -106,17 +225,17 @@ GenVertex: -5 ID: 0 (X,cT):0 8 24 -9.67e-01,+1.07e+01,+1.23e+03,+1.24e+03 3 -7 GenVertex: -6 ID: 0 (X,cT):0 I: 1 7 22 -4.03e+00,-1.23e+00,+2.46e+02,+2.46e+02 3 -6 - O: 1 9 22 -4.03e+00,-1.23e+00,+2.46e+02,+2.46e+02 1 (nil) + O: 1 9 22 -4.03e+00,-1.23e+00,+2.46e+02,+2.46e+02 1 GenVertex: -7 ID: 0 (X,cT):0 I: 1 8 24 -9.67e-01,+1.07e+01,+1.23e+03,+1.24e+03 3 -7 O: 1 10 24 -9.67e-01,+1.07e+01,+1.23e+03,+1.24e+03 2 -8 GenVertex: -8 ID: 0 (X,cT):0 I: 1 10 24 -9.67e-01,+1.07e+01,+1.23e+03,+1.24e+03 2 -8 - O: 2 11 -13 -2.56e+01,+4.70e+01,+2.09e+02,+2.16e+02 1 (nil) - 12 14 +2.47e+01,-3.63e+01,+1.02e+03,+1.02e+03 1 (nil) + O: 2 11 -13 -2.56e+01,+4.70e+01,+2.09e+02,+2.16e+02 1 + 12 14 +2.47e+01,-3.63e+01,+1.02e+03,+1.02e+03 1 GenVertex: -9 ID: 0 (X,cT):0 I: 1 13 2214 +1.00e-00,+2.73e-02,-4.08e+03,+4.08e+03 2 -9 - O: 2 29 2212 +1.02e+00,+1.18e-01,-3.74e+03,+3.74e+03 1 (nil) + O: 2 29 2212 +1.02e+00,+1.18e-01,-3.74e+03,+3.74e+03 1 30 111 -2.46e-02,-9.09e-02,-3.46e+02,+3.46e+02 2 -20 GenVertex: -10 ID: 0 (X,cT):0 I: 2 14 1 +2.31e+00,+5.82e+00,+1.51e+02,+1.51e+02 2 -10 @@ -124,28 +243,28 @@ GenVertex: -10 ID: 0 (X,cT):0 O: 1 31 92 +0.00e+00,+0.00e+00,+1.97e+02,+1.97e+02 2 -11 GenVertex: -11 ID: 0 (X,cT):0 I: 1 31 92 +0.00e+00,+0.00e+00,+1.97e+02,+1.97e+02 2 -11 - O: 8 32 -211 +2.54e-01,+1.65e+00,+3.42e+01,+3.42e+01 1 (nil) - 33 211 +1.83e-01,-2.25e-01,+8.98e+00,+8.99e+00 1 (nil) - 34 -211 +1.65e+00,+3.36e+00,+8.55e+01,+8.56e+01 1 (nil) + O: 8 32 -211 +2.54e-01,+1.65e+00,+3.42e+01,+3.42e+01 1 + 33 211 +1.83e-01,-2.25e-01,+8.98e+00,+8.99e+00 1 + 34 -211 +1.65e+00,+3.36e+00,+8.55e+01,+8.56e+01 1 35 221 +1.53e-01,+1.01e-01,+1.68e+01,+1.68e+01 2 -21 - 36 211 -5.43e-01,+7.13e-02,+3.10e+00,+3.15e+00 1 (nil) + 36 211 -5.43e-01,+7.13e-02,+3.10e+00,+3.15e+00 1 37 221 -4.39e-01,-1.09e+00,+1.62e+01,+1.63e+01 2 -22 38 -213 -1.18e+00,-2.20e+00,+1.67e+01,+1.70e+01 2 -23 - 39 211 -8.40e-02,-1.67e+00,+1.53e+01,+1.54e+01 1 (nil) + 39 211 -8.40e-02,-1.67e+00,+1.53e+01,+1.54e+01 1 GenVertex: -12 ID: 0 (X,cT):0 - I: 2 17 -2 +3.95e+00,+1.33e+00,+4.38e+02,+4.38e+02 2 -12 - 16 2 -3.95e+00,-1.33e+00,+3.41e+01,+3.44e+01 2 -12 + I: 2 16 2 -3.95e+00,-1.33e+00,+3.41e+01,+3.44e+01 2 -12 + 17 -2 +3.95e+00,+1.33e+00,+4.38e+02,+4.38e+02 2 -12 O: 1 40 92 +0.00e+00,+0.00e+00,+4.72e+02,+4.72e+02 2 -13 GenVertex: -13 ID: 0 (X,cT):0 I: 1 40 92 +0.00e+00,+0.00e+00,+4.72e+02,+4.72e+02 2 -13 - O: 8 47 -213 +4.18e-01,+2.70e-01,+5.63e+01,+5.63e+01 2 -28 - 48 111 +1.44e+00,+3.32e-01,+1.54e+02,+1.54e+02 2 -29 - 41 221 -2.68e+00,-7.41e-01,+2.70e+01,+2.71e+01 2 -24 - 42 211 -1.08e+00,-1.77e-01,+8.94e+00,+9.00e+00 1 (nil) + O: 8 41 221 -2.68e+00,-7.41e-01,+2.70e+01,+2.71e+01 2 -24 + 42 211 -1.08e+00,-1.77e-01,+8.94e+00,+9.00e+00 1 43 223 +7.31e-01,-2.42e-01,+2.97e+01,+2.97e+01 2 -25 44 -213 +6.83e-02,+2.16e-01,+2.67e+01,+2.67e+01 2 -26 - 45 211 -7.62e-02,+3.34e-01,+9.98e+00,+9.98e+00 1 (nil) + 45 211 -7.62e-02,+3.34e-01,+9.98e+00,+9.98e+00 1 46 223 +1.18e+00,+7.67e-03,+1.59e+02,+1.59e+02 2 -27 + 47 -213 +4.18e-01,+2.70e-01,+5.63e+01,+5.63e+01 2 -28 + 48 111 +1.44e+00,+3.32e-01,+1.54e+02,+1.54e+02 2 -29 GenVertex: -14 ID: 0 (X,cT):0 I: 2 18 2 +1.54e+00,+3.04e+00,-6.32e+01,+6.33e+01 2 -14 19 -2 -1.54e+00,-3.04e+00,-3.11e+02,+3.11e+02 2 -14 @@ -153,49 +272,49 @@ GenVertex: -14 ID: 0 (X,cT):0 GenVertex: -15 ID: 0 (X,cT):0 I: 1 49 92 +0.00e+00,+0.00e+00,-3.75e+02,+3.75e+02 2 -15 O: 3 50 113 +1.57e+00,+2.83e+00,-6.11e+01,+6.12e+01 2 -30 - 51 211 +2.02e-01,+1.20e-01,-2.70e+01,+2.70e+01 1 (nil) - 52 -211 -1.77e+00,-2.95e+00,-2.86e+02,+2.86e+02 1 (nil) + 51 211 +2.02e-01,+1.20e-01,-2.70e+01,+2.70e+01 1 + 52 -211 -1.77e+00,-2.95e+00,-2.86e+02,+2.86e+02 1 GenVertex: -16 ID: 0 (X,cT):0 - I: 7 20 2101 +7.76e-01,+9.12e-01,+4.45e+03,+4.45e+03 2 -16 - 26 1 +8.08e-03,-1.46e-02,-2.46e+03,+2.46e+03 2 -16 + I: 7 26 1 +8.08e-03,-1.46e-02,-2.46e+03,+2.46e+03 2 -16 21 21 +1.46e+00,-3.91e-01,+1.09e+02,+1.09e+02 2 -16 22 21 +3.11e+00,+2.32e-01,+1.46e+02,+1.47e+02 2 -16 23 21 -1.09e-01,-1.87e+00,+8.61e+01,+8.61e+01 2 -16 24 21 -5.37e-01,-6.68e+00,+4.75e+01,+4.79e+01 2 -16 25 21 -7.11e-01,-1.71e+00,+1.08e+01,+1.10e+01 2 -16 + 20 2101 +7.76e-01,+9.12e-01,+4.45e+03,+4.45e+03 2 -16 O: 1 53 92 +3.99e+00,-9.52e+00,+2.38e+03,+7.31e+03 2 -17 GenVertex: -17 ID: 0 (X,cT):0 I: 1 53 92 +3.99e+00,-9.52e+00,+2.38e+03,+7.31e+03 2 -17 - O:31 54 2212 +8.22e-01,+7.58e-01,+2.86e+03,+2.86e+03 1 (nil) + O:31 54 2212 +8.22e-01,+7.58e-01,+2.86e+03,+2.86e+03 1 55 113 -3.60e-01,-1.69e-01,+8.62e+02,+8.62e+02 2 -31 56 -2214 +1.03e+00,+9.30e-02,+4.53e+02,+4.53e+02 2 -32 57 223 -3.60e-01,+4.04e-01,+1.25e+02,+1.25e+02 2 -33 - 58 2212 +1.68e+00,-6.25e-01,+1.57e+02,+1.57e+02 1 (nil) + 58 2212 +1.68e+00,-6.25e-01,+1.57e+02,+1.57e+02 1 59 -213 +5.56e-01,+3.45e-01,+9.14e+01,+9.14e+01 2 -34 60 -311 +6.88e-02,-2.98e-02,+3.77e+01,+3.77e+01 2 -35 61 311 +5.59e-01,-2.32e-01,+5.88e+01,+5.88e+01 2 -36 - 62 211 +3.24e-01,-1.11e+00,+5.03e+01,+5.03e+01 1 (nil) + 62 211 +3.24e-01,-1.11e+00,+5.03e+01,+5.03e+01 1 63 113 -1.65e-02,-7.81e-02,+4.91e+00,+4.95e+00 2 -37 - 64 -211 +7.06e-01,-6.40e-01,+6.56e+01,+6.56e+01 1 (nil) + 64 -211 +7.06e-01,-6.40e-01,+6.56e+01,+6.56e+01 1 65 213 +4.72e-01,-4.39e-01,+1.44e+01,+1.44e+01 2 -38 66 -213 -3.00e-01,-3.82e-01,+1.62e+01,+1.63e+01 2 -39 - 67 211 -4.39e-01,-3.19e+00,+2.48e+01,+2.50e+01 1 (nil) - 68 -211 -1.40e-01,-1.20e-01,+4.92e-01,+5.44e-01 1 (nil) + 67 211 -4.39e-01,-3.19e+00,+2.48e+01,+2.50e+01 1 + 68 -211 -1.40e-01,-1.20e-01,+4.92e-01,+5.44e-01 1 69 -311 -2.66e-01,-2.65e+00,+2.07e+01,+2.08e+01 2 -40 70 323 +1.09e-01,-8.86e-01,+4.66e+00,+4.83e+00 2 -41 71 113 -4.98e-01,-2.28e-01,+1.70e+00,+1.96e+00 2 -42 72 -323 -2.90e-01,-2.30e-01,+6.43e-01,+1.16e+00 2 -43 73 311 +7.90e-02,-3.23e-02,-8.47e-01,+9.86e-01 2 -44 74 113 +1.28e-01,+1.79e-01,-7.07e-01,+1.09e+00 2 -45 - 75 -2112 +2.40e-01,-6.43e-01,-2.35e+00,+2.62e+00 1 (nil) - 76 2112 +1.43e-01,-2.20e-01,-2.23e+00,+2.43e+00 1 (nil) + 75 -2112 +2.40e-01,-6.43e-01,-2.35e+00,+2.62e+00 1 + 76 2112 +1.43e-01,-2.20e-01,-2.23e+00,+2.43e+00 1 77 221 -1.58e-01,+9.23e-01,-1.12e+01,+1.12e+01 2 -46 - 78 211 -3.97e-01,-5.01e-01,-1.11e+00,+1.29e+00 1 (nil) + 78 211 -3.97e-01,-5.01e-01,-1.11e+00,+1.29e+00 1 79 111 +2.87e-01,+2.82e-01,-1.04e+00,+1.12e+00 2 -47 80 223 +4.06e-01,-2.45e-01,-3.51e+01,+3.51e+01 2 -48 - 81 -321 -6.14e-01,+2.77e-01,-2.28e+02,+2.28e+02 1 (nil) + 81 -321 -6.14e-01,+2.77e-01,-2.28e+02,+2.28e+02 1 82 323 +1.26e-01,-3.07e-01,-1.50e+03,+1.50e+03 2 -49 - 83 -321 +1.94e-01,+2.93e-01,-1.69e+02,+1.69e+02 1 (nil) + 83 -321 +1.94e-01,+2.93e-01,-1.69e+02,+1.69e+02 1 84 311 -9.36e-02,-1.11e-01,-5.09e+02,+5.09e+02 2 -50 GenVertex: -18 ID: 0 (X,cT):0 I: 2 27 21 -1.37e-01,-5.99e+00,-1.38e+01,+1.51e+01 2 -18 @@ -203,23 +322,23 @@ GenVertex: -18 ID: 0 (X,cT):0 O: 1 85 92 +0.00e+00,+0.00e+00,-7.51e+01,+7.66e+01 2 -19 GenVertex: -19 ID: 0 (X,cT):0 I: 1 85 92 +0.00e+00,+0.00e+00,-7.51e+01,+7.66e+01 2 -19 - O: 9 86 -2112 -3.84e-02,-2.48e+00,-7.98e+00,+8.41e+00 1 (nil) - 87 2212 +1.88e-01,-2.14e+00,-4.49e+00,+5.07e+00 1 (nil) + O: 9 86 -2112 -3.84e-02,-2.48e+00,-7.98e+00,+8.41e+00 1 + 87 2212 +1.88e-01,-2.14e+00,-4.49e+00,+5.07e+00 1 88 -213 +2.00e-01,-1.11e-01,-1.66e+00,+1.83e+00 2 -51 89 -313 -6.26e-01,+1.37e+00,-1.29e+01,+1.30e+01 2 -52 - 90 321 +7.89e-02,+7.45e-01,-1.09e+01,+1.10e+01 1 (nil) - 91 -211 +4.23e-02,+3.92e-01,-8.74e+00,+8.75e+00 1 (nil) - 92 211 +6.44e-02,+3.67e-01,-1.38e+00,+1.43e+00 1 (nil) - 93 -2212 +4.16e-02,+5.64e-01,-1.20e+01,+1.20e+01 1 (nil) - 94 2112 +4.92e-02,+1.30e+00,-1.50e+01,+1.51e+01 1 (nil) + 90 321 +7.89e-02,+7.45e-01,-1.09e+01,+1.10e+01 1 + 91 -211 +4.23e-02,+3.92e-01,-8.74e+00,+8.75e+00 1 + 92 211 +6.44e-02,+3.67e-01,-1.38e+00,+1.43e+00 1 + 93 -2212 +4.16e-02,+5.64e-01,-1.20e+01,+1.20e+01 1 + 94 2112 +4.92e-02,+1.30e+00,-1.50e+01,+1.51e+01 1 Vertex: -20 ID: 0 (X,cT)=-7.43e-06,-2.74e-05,-1.04e-01,+1.04e-01 I: 1 30 111 -2.46e-02,-9.09e-02,-3.46e+02,+3.46e+02 2 -20 - O: 2 95 22 -4.57e-02,-1.20e-01,-2.72e+02,+2.72e+02 1 (nil) - 96 22 +2.11e-02,+2.92e-02,-7.38e+01,+7.38e+01 1 (nil) + O: 2 95 22 -4.57e-02,-1.20e-01,-2.72e+02,+2.72e+02 1 + 96 22 +2.11e-02,+2.92e-02,-7.38e+01,+7.38e+01 1 GenVertex: -21 ID: 0 (X,cT):0 I: 1 35 221 +1.53e-01,+1.01e-01,+1.68e+01,+1.68e+01 2 -21 - O: 3 97 211 +1.91e-01,+1.34e-01,+6.86e+00,+6.86e+00 1 (nil) - 98 -211 -4.99e-02,-5.38e-02,+4.31e+00,+4.31e+00 1 (nil) + O: 3 97 211 +1.91e-01,+1.34e-01,+6.86e+00,+6.86e+00 1 + 98 -211 -4.99e-02,-5.38e-02,+4.31e+00,+4.31e+00 1 99 111 +1.27e-02,+2.08e-02,+5.61e+00,+5.61e+00 2 -53 GenVertex: -22 ID: 0 (X,cT):0 I: 1 37 221 -4.39e-01,-1.09e+00,+1.62e+01,+1.63e+01 2 -22 @@ -228,118 +347,118 @@ GenVertex: -22 ID: 0 (X,cT):0 102 111 -2.65e-01,-5.85e-01,+7.55e+00,+7.58e+00 2 -56 GenVertex: -23 ID: 0 (X,cT):0 I: 1 38 -213 -1.18e+00,-2.20e+00,+1.67e+01,+1.70e+01 2 -23 - O: 2 103 -211 +5.93e-02,-7.99e-01,+3.99e+00,+4.07e+00 1 (nil) + O: 2 103 -211 +5.93e-02,-7.99e-01,+3.99e+00,+4.07e+00 1 104 111 -1.24e+00,-1.40e+00,+1.27e+01,+1.29e+01 2 -57 GenVertex: -24 ID: 0 (X,cT):0 I: 1 41 221 -2.68e+00,-7.41e-01,+2.70e+01,+2.71e+01 2 -24 - O: 2 105 22 -6.34e-03,-7.93e-02,+8.01e-01,+8.05e-01 1 (nil) - 106 22 -2.67e+00,-6.61e-01,+2.62e+01,+2.63e+01 1 (nil) + O: 2 105 22 -6.34e-03,-7.93e-02,+8.01e-01,+8.05e-01 1 + 106 22 -2.67e+00,-6.61e-01,+2.62e+01,+2.63e+01 1 GenVertex: -25 ID: 0 (X,cT):0 I: 1 43 223 +7.31e-01,-2.42e-01,+2.97e+01,+2.97e+01 2 -25 - O: 3 107 -211 +1.76e-02,+3.37e-02,+3.20e+00,+3.21e+00 1 (nil) - 108 211 +3.94e-01,+9.73e-02,+1.40e+01,+1.40e+01 1 (nil) + O: 3 107 -211 +1.76e-02,+3.37e-02,+3.20e+00,+3.21e+00 1 + 108 211 +3.94e-01,+9.73e-02,+1.40e+01,+1.40e+01 1 109 111 +3.20e-01,-3.73e-01,+1.25e+01,+1.25e+01 2 -58 GenVertex: -26 ID: 0 (X,cT):0 I: 1 44 -213 +6.83e-02,+2.16e-01,+2.67e+01,+2.67e+01 2 -26 - O: 2 110 -211 -8.41e-02,-1.88e-01,+1.75e+01,+1.75e+01 1 (nil) + O: 2 110 -211 -8.41e-02,-1.88e-01,+1.75e+01,+1.75e+01 1 111 111 +1.52e-01,+4.04e-01,+9.17e+00,+9.18e+00 2 -59 GenVertex: -27 ID: 0 (X,cT):0 I: 1 46 223 +1.18e+00,+7.67e-03,+1.59e+02,+1.59e+02 2 -27 - O: 3 112 -211 +4.71e-01,+6.85e-02,+4.92e+01,+4.92e+01 1 (nil) - 113 211 +5.97e-01,-1.23e-01,+1.01e+02,+1.01e+02 1 (nil) + O: 3 112 -211 +4.71e-01,+6.85e-02,+4.92e+01,+4.92e+01 1 + 113 211 +5.97e-01,-1.23e-01,+1.01e+02,+1.01e+02 1 114 111 +1.09e-01,+6.20e-02,+9.26e+00,+9.26e+00 2 -60 GenVertex: -28 ID: 0 (X,cT):0 I: 1 47 -213 +4.18e-01,+2.70e-01,+5.63e+01,+5.63e+01 2 -28 - O: 2 115 -211 +4.07e-02,+6.55e-03,+6.59e+00,+6.59e+00 1 (nil) + O: 2 115 -211 +4.07e-02,+6.55e-03,+6.59e+00,+6.59e+00 1 116 111 +3.77e-01,+2.64e-01,+4.98e+01,+4.98e+01 2 -61 Vertex: -29 ID: 0 (X,cT)=+3.69e-04,+8.53e-05,+3.95e-02,+3.95e-02 I: 1 48 111 +1.44e+00,+3.32e-01,+1.54e+02,+1.54e+02 2 -29 - O: 2 117 22 +4.72e-01,+4.59e-02,+5.06e+01,+5.06e+01 1 (nil) - 118 22 +9.67e-01,+2.86e-01,+1.03e+02,+1.03e+02 1 (nil) + O: 2 117 22 +4.72e-01,+4.59e-02,+5.06e+01,+5.06e+01 1 + 118 22 +9.67e-01,+2.86e-01,+1.03e+02,+1.03e+02 1 GenVertex: -30 ID: 0 (X,cT):0 I: 1 50 113 +1.57e+00,+2.83e+00,-6.11e+01,+6.12e+01 2 -30 - O: 2 119 -211 +9.16e-01,+2.13e+00,-4.37e+01,+4.38e+01 1 (nil) - 120 211 +6.49e-01,+7.08e-01,-1.74e+01,+1.75e+01 1 (nil) + O: 2 119 -211 +9.16e-01,+2.13e+00,-4.37e+01,+4.38e+01 1 + 120 211 +6.49e-01,+7.08e-01,-1.74e+01,+1.75e+01 1 GenVertex: -31 ID: 0 (X,cT):0 I: 1 55 113 -3.60e-01,-1.69e-01,+8.62e+02,+8.62e+02 2 -31 - O: 2 121 211 -1.07e-01,+4.26e-02,+1.56e+02,+1.56e+02 1 (nil) - 122 -211 -2.53e-01,-2.12e-01,+7.07e+02,+7.07e+02 1 (nil) + O: 2 121 211 -1.07e-01,+4.26e-02,+1.56e+02,+1.56e+02 1 + 122 -211 -2.53e-01,-2.12e-01,+7.07e+02,+7.07e+02 1 GenVertex: -32 ID: 0 (X,cT):0 I: 1 56 -2214 +1.03e+00,+9.30e-02,+4.53e+02,+4.53e+02 2 -32 - O: 2 123 -2212 +4.99e-01,+1.49e-01,+3.29e+02,+3.29e+02 1 (nil) + O: 2 123 -2212 +4.99e-01,+1.49e-01,+3.29e+02,+3.29e+02 1 124 111 +5.28e-01,-5.58e-02,+1.24e+02,+1.24e+02 2 -62 GenVertex: -33 ID: 0 (X,cT):0 I: 1 57 223 -3.60e-01,+4.04e-01,+1.25e+02,+1.25e+02 2 -33 - O: 3 125 211 -1.22e-01,+3.51e-01,+3.18e+01,+3.18e+01 1 (nil) - 126 -211 -2.21e-01,+7.11e-02,+8.21e+01,+8.21e+01 1 (nil) + O: 3 125 211 -1.22e-01,+3.51e-01,+3.18e+01,+3.18e+01 1 + 126 -211 -2.21e-01,+7.11e-02,+8.21e+01,+8.21e+01 1 127 111 -1.66e-02,-1.80e-02,+1.09e+01,+1.09e+01 2 -63 GenVertex: -34 ID: 0 (X,cT):0 I: 1 59 -213 +5.56e-01,+3.45e-01,+9.14e+01,+9.14e+01 2 -34 - O: 2 128 -211 +3.11e-01,+3.56e-01,+3.44e+01,+3.44e+01 1 (nil) + O: 2 128 -211 +3.11e-01,+3.56e-01,+3.44e+01,+3.44e+01 1 129 111 +2.45e-01,-1.18e-02,+5.70e+01,+5.70e+01 2 -64 GenVertex: -35 ID: 0 (X,cT):0 I: 1 60 -311 +6.88e-02,-2.98e-02,+3.77e+01,+3.77e+01 2 -35 O: 1 130 310 +6.88e-02,-2.98e-02,+3.77e+01,+3.77e+01 2 -65 GenVertex: -36 ID: 0 (X,cT):0 I: 1 61 311 +5.59e-01,-2.32e-01,+5.88e+01,+5.88e+01 2 -36 - O: 1 131 130 +5.59e-01,-2.32e-01,+5.88e+01,+5.88e+01 1 (nil) + O: 1 131 130 +5.59e-01,-2.32e-01,+5.88e+01,+5.88e+01 1 GenVertex: -37 ID: 0 (X,cT):0 I: 1 63 113 -1.65e-02,-7.81e-02,+4.91e+00,+4.95e+00 2 -37 - O: 2 132 211 +1.08e-01,-5.14e-02,+4.37e+00,+4.38e+00 1 (nil) - 133 -211 -1.25e-01,-2.68e-02,+5.37e-01,+5.69e-01 1 (nil) + O: 2 132 211 +1.08e-01,-5.14e-02,+4.37e+00,+4.38e+00 1 + 133 -211 -1.25e-01,-2.68e-02,+5.37e-01,+5.69e-01 1 GenVertex: -38 ID: 0 (X,cT):0 I: 1 65 213 +4.72e-01,-4.39e-01,+1.44e+01,+1.44e+01 2 -38 - O: 2 134 211 +1.82e-01,-5.33e-01,+1.18e+01,+1.18e+01 1 (nil) + O: 2 134 211 +1.82e-01,-5.33e-01,+1.18e+01,+1.18e+01 1 135 111 +2.91e-01,+9.43e-02,+2.56e+00,+2.58e+00 2 -66 GenVertex: -39 ID: 0 (X,cT):0 I: 1 66 -213 -3.00e-01,-3.82e-01,+1.62e+01,+1.63e+01 2 -39 - O: 2 136 -211 -4.94e-01,-2.13e-01,+6.74e+00,+6.77e+00 1 (nil) + O: 2 136 -211 -4.94e-01,-2.13e-01,+6.74e+00,+6.77e+00 1 137 111 +1.93e-01,-1.69e-01,+9.48e+00,+9.49e+00 2 -67 GenVertex: -40 ID: 0 (X,cT):0 I: 1 69 -311 -2.66e-01,-2.65e+00,+2.07e+01,+2.08e+01 2 -40 - O: 1 138 130 -2.66e-01,-2.65e+00,+2.07e+01,+2.08e+01 1 (nil) + O: 1 138 130 -2.66e-01,-2.65e+00,+2.07e+01,+2.08e+01 1 GenVertex: -41 ID: 0 (X,cT):0 I: 1 70 323 +1.09e-01,-8.86e-01,+4.66e+00,+4.83e+00 2 -41 O: 2 139 311 -4.56e-02,-1.94e-01,+1.85e+00,+1.93e+00 2 -68 - 140 211 +1.54e-01,-6.92e-01,+2.81e+00,+2.90e+00 1 (nil) + 140 211 +1.54e-01,-6.92e-01,+2.81e+00,+2.90e+00 1 GenVertex: -42 ID: 0 (X,cT):0 I: 1 71 113 -4.98e-01,-2.28e-01,+1.70e+00,+1.96e+00 2 -42 - O: 2 141 211 +7.24e-02,-1.33e-01,+6.29e-02,+2.15e-01 1 (nil) - 142 -211 -5.70e-01,-9.51e-02,+1.64e+00,+1.75e+00 1 (nil) + O: 2 141 211 +7.24e-02,-1.33e-01,+6.29e-02,+2.15e-01 1 + 142 -211 -5.70e-01,-9.51e-02,+1.64e+00,+1.75e+00 1 GenVertex: -43 ID: 0 (X,cT):0 I: 1 72 -323 -2.90e-01,-2.30e-01,+6.43e-01,+1.16e+00 2 -43 O: 2 143 -311 -1.02e-01,-3.76e-01,+2.53e-01,+6.81e-01 2 -69 - 144 -211 -1.88e-01,+1.45e-01,+3.90e-01,+4.77e-01 1 (nil) + 144 -211 -1.88e-01,+1.45e-01,+3.90e-01,+4.77e-01 1 GenVertex: -44 ID: 0 (X,cT):0 I: 1 73 311 +7.90e-02,-3.23e-02,-8.47e-01,+9.86e-01 2 -44 O: 1 145 310 +7.90e-02,-3.23e-02,-8.47e-01,+9.86e-01 2 -70 GenVertex: -45 ID: 0 (X,cT):0 I: 1 74 113 +1.28e-01,+1.79e-01,-7.07e-01,+1.09e+00 2 -45 - O: 2 146 -211 -7.31e-02,+3.05e-01,-7.33e-01,+8.10e-01 1 (nil) - 147 211 +2.01e-01,-1.27e-01,+2.56e-02,+2.77e-01 1 (nil) + O: 2 146 -211 -7.31e-02,+3.05e-01,-7.33e-01,+8.10e-01 1 + 147 211 +2.01e-01,-1.27e-01,+2.56e-02,+2.77e-01 1 GenVertex: -46 ID: 0 (X,cT):0 I: 1 77 221 -1.58e-01,+9.23e-01,-1.12e+01,+1.12e+01 2 -46 - O: 3 148 -211 -1.37e-01,+2.12e-01,-2.48e+00,+2.50e+00 1 (nil) - 149 211 -6.29e-02,+5.66e-01,-6.65e+00,+6.68e+00 1 (nil) + O: 3 148 -211 -1.37e-01,+2.12e-01,-2.48e+00,+2.50e+00 1 + 149 211 -6.29e-02,+5.66e-01,-6.65e+00,+6.68e+00 1 150 111 +4.20e-02,+1.44e-01,-2.05e+00,+2.06e+00 2 -71 Vertex: -47 ID: 0 (X,cT)=+2.15e-05,+2.11e-05,-7.77e-05,+8.40e-05 I: 1 79 111 +2.87e-01,+2.82e-01,-1.04e+00,+1.12e+00 2 -47 - O: 2 151 22 +1.31e-01,+1.64e-01,-6.99e-01,+7.30e-01 1 (nil) - 152 22 +1.57e-01,+1.18e-01,-3.38e-01,+3.91e-01 1 (nil) + O: 2 151 22 +1.31e-01,+1.64e-01,-6.99e-01,+7.30e-01 1 + 152 22 +1.57e-01,+1.18e-01,-3.38e-01,+3.91e-01 1 GenVertex: -48 ID: 0 (X,cT):0 I: 1 80 223 +4.06e-01,-2.45e-01,-3.51e+01,+3.51e+01 2 -48 - O: 2 153 -211 -6.79e-02,+2.16e-01,-6.21e+00,+6.22e+00 1 (nil) - 154 211 +4.74e-01,-4.61e-01,-2.89e+01,+2.89e+01 1 (nil) + O: 2 153 -211 -6.79e-02,+2.16e-01,-6.21e+00,+6.22e+00 1 + 154 211 +4.74e-01,-4.61e-01,-2.89e+01,+2.89e+01 1 GenVertex: -49 ID: 0 (X,cT):0 I: 1 82 323 +1.26e-01,-3.07e-01,-1.50e+03,+1.50e+03 2 -49 - O: 2 155 321 +2.70e-01,-1.79e-01,-6.57e+02,+6.57e+02 1 (nil) + O: 2 155 321 +2.70e-01,-1.79e-01,-6.57e+02,+6.57e+02 1 156 111 -1.45e-01,-1.29e-01,-8.42e+02,+8.42e+02 2 -72 GenVertex: -50 ID: 0 (X,cT):0 I: 1 84 311 -9.36e-02,-1.11e-01,-5.09e+02,+5.09e+02 2 -50 - O: 1 157 130 -9.36e-02,-1.11e-01,-5.09e+02,+5.09e+02 1 (nil) + O: 1 157 130 -9.36e-02,-1.11e-01,-5.09e+02,+5.09e+02 1 GenVertex: -51 ID: 0 (X,cT):0 I: 1 88 -213 +2.00e-01,-1.11e-01,-1.66e+00,+1.83e+00 2 -51 - O: 2 158 -211 -1.33e-01,-2.94e-01,-9.51e-01,+1.01e+00 1 (nil) + O: 2 158 -211 -1.33e-01,-2.94e-01,-9.51e-01,+1.01e+00 1 159 111 +3.33e-01,+1.83e-01,-7.05e-01,+8.13e-01 2 -73 GenVertex: -52 ID: 0 (X,cT):0 I: 1 89 -313 -6.26e-01,+1.37e+00,-1.29e+01,+1.30e+01 2 -52 @@ -347,64 +466,64 @@ GenVertex: -52 ID: 0 (X,cT):0 161 111 -5.98e-01,+7.99e-01,-7.16e+00,+7.23e+00 2 -75 Vertex: -53 ID: 0 (X,cT)=+6.33e-07,+1.04e-06,+2.79e-04,+2.79e-04 I: 1 99 111 +1.27e-02,+2.08e-02,+5.61e+00,+5.61e+00 2 -53 - O: 2 162 22 +5.81e-02,+5.34e-02,+3.78e+00,+3.78e+00 1 (nil) - 163 22 -4.54e-02,-3.26e-02,+1.83e+00,+1.83e+00 1 (nil) + O: 2 162 22 +5.81e-02,+5.34e-02,+3.78e+00,+3.78e+00 1 + 163 22 -4.54e-02,-3.26e-02,+1.83e+00,+1.83e+00 1 Vertex: -54 ID: 0 (X,cT)=+3.79e-06,-3.71e-05,+5.03e-04,+5.05e-04 I: 1 100 111 +2.02e-02,-1.98e-01,+2.68e+00,+2.69e+00 2 -54 - O: 2 164 22 +2.39e-02,-9.50e-02,+2.06e+00,+2.06e+00 1 (nil) - 165 22 -3.65e-03,-1.03e-01,+6.27e-01,+6.35e-01 1 (nil) + O: 2 164 22 +2.39e-02,-9.50e-02,+2.06e+00,+2.06e+00 1 + 165 22 -3.65e-03,-1.03e-01,+6.27e-01,+6.35e-01 1 Vertex: -55 ID: 0 (X,cT)=-2.82e-05,-4.46e-05,+8.64e-04,+8.66e-04 I: 1 101 111 -1.94e-01,-3.08e-01,+5.97e+00,+5.98e+00 2 -55 - O: 2 166 22 -2.13e-01,-2.53e-01,+5.08e+00,+5.10e+00 1 (nil) - 167 22 +1.82e-02,-5.48e-02,+8.85e-01,+8.87e-01 1 (nil) + O: 2 166 22 -2.13e-01,-2.53e-01,+5.08e+00,+5.10e+00 1 + 167 22 +1.82e-02,-5.48e-02,+8.85e-01,+8.87e-01 1 Vertex: -56 ID: 0 (X,cT)=-1.01e-04,-2.22e-04,+2.87e-03,+2.88e-03 I: 1 102 111 -2.65e-01,-5.85e-01,+7.55e+00,+7.58e+00 2 -56 - O: 2 168 22 -2.34e-01,-3.64e-01,+4.90e+00,+4.92e+00 1 (nil) - 169 22 -3.04e-02,-2.21e-01,+2.65e+00,+2.66e+00 1 (nil) + O: 2 168 22 -2.34e-01,-3.64e-01,+4.90e+00,+4.92e+00 1 + 169 22 -3.04e-02,-2.21e-01,+2.65e+00,+2.66e+00 1 Vertex: -57 ID: 0 (X,cT)=-2.73e-04,-3.09e-04,+2.81e-03,+2.84e-03 I: 1 104 111 -1.24e+00,-1.40e+00,+1.27e+01,+1.29e+01 2 -57 - O: 2 170 22 -1.22e-02,-1.70e-02,+7.27e-02,+7.56e-02 1 (nil) - 171 22 -1.22e+00,-1.38e+00,+1.27e+01,+1.28e+01 1 (nil) + O: 2 170 22 -1.22e-02,-1.70e-02,+7.27e-02,+7.56e-02 1 + 171 22 -1.22e+00,-1.38e+00,+1.27e+01,+1.28e+01 1 Vertex: -58 ID: 0 (X,cT)=+7.51e-05,-8.77e-05,+2.93e-03,+2.94e-03 I: 1 109 111 +3.20e-01,-3.73e-01,+1.25e+01,+1.25e+01 2 -58 - O: 2 172 22 +3.26e-01,-3.46e-01,+1.21e+01,+1.21e+01 1 (nil) - 173 22 -6.46e-03,-2.66e-02,+3.50e-01,+3.51e-01 1 (nil) + O: 2 172 22 +3.26e-01,-3.46e-01,+1.21e+01,+1.21e+01 1 + 173 22 -6.46e-03,-2.66e-02,+3.50e-01,+3.51e-01 1 Vertex: -59 ID: 0 (X,cT)=+1.45e-06,+3.84e-06,+8.70e-05,+8.71e-05 I: 1 111 111 +1.52e-01,+4.04e-01,+9.17e+00,+9.18e+00 2 -59 - O: 2 174 22 -2.15e-02,+1.49e-02,+4.86e-01,+4.86e-01 1 (nil) - 175 22 +1.74e-01,+3.89e-01,+8.68e+00,+8.69e+00 1 (nil) + O: 2 174 22 -2.15e-02,+1.49e-02,+4.86e-01,+4.86e-01 1 + 175 22 +1.74e-01,+3.89e-01,+8.68e+00,+8.69e+00 1 Vertex: -60 ID: 0 (X,cT)=+1.34e-05,+7.65e-06,+1.14e-03,+1.14e-03 I: 1 114 111 +1.09e-01,+6.20e-02,+9.26e+00,+9.26e+00 2 -60 - O: 2 176 22 -1.64e-02,+4.04e-02,+4.24e+00,+4.24e+00 1 (nil) - 177 22 +1.25e-01,+2.17e-02,+5.02e+00,+5.02e+00 1 (nil) + O: 2 176 22 -1.64e-02,+4.04e-02,+4.24e+00,+4.24e+00 1 + 177 22 +1.25e-01,+2.17e-02,+5.02e+00,+5.02e+00 1 Vertex: -61 ID: 0 (X,cT)=+1.85e-05,+1.29e-05,+2.43e-03,+2.43e-03 I: 1 116 111 +3.77e-01,+2.64e-01,+4.98e+01,+4.98e+01 2 -61 - O: 2 178 22 +1.08e-01,+2.89e-02,+7.90e+00,+7.91e+00 1 (nil) - 179 22 +2.70e-01,+2.35e-01,+4.19e+01,+4.19e+01 1 (nil) + O: 2 178 22 +1.08e-01,+2.89e-02,+7.90e+00,+7.91e+00 1 + 179 22 +2.70e-01,+2.35e-01,+4.19e+01,+4.19e+01 1 Vertex: -62 ID: 0 (X,cT)=+5.58e-05,-5.89e-06,+1.31e-02,+1.31e-02 I: 1 124 111 +5.28e-01,-5.58e-02,+1.24e+02,+1.24e+02 2 -62 - O: 2 180 22 +2.10e-01,+4.29e-02,+4.58e+01,+4.58e+01 1 (nil) - 181 22 +3.18e-01,-9.86e-02,+7.82e+01,+7.82e+01 1 (nil) + O: 2 180 22 +2.10e-01,+4.29e-02,+4.58e+01,+4.58e+01 1 + 181 22 +3.18e-01,-9.86e-02,+7.82e+01,+7.82e+01 1 Vertex: -63 ID: 0 (X,cT)=-7.71e-06,-8.34e-06,+5.03e-03,+5.03e-03 I: 1 127 111 -1.66e-02,-1.80e-02,+1.09e+01,+1.09e+01 2 -63 - O: 2 182 22 -6.61e-02,-4.57e-02,+6.07e+00,+6.07e+00 1 (nil) - 183 22 +4.94e-02,+2.77e-02,+4.78e+00,+4.78e+00 1 (nil) + O: 2 182 22 -6.61e-02,-4.57e-02,+6.07e+00,+6.07e+00 1 + 183 22 +4.94e-02,+2.77e-02,+4.78e+00,+4.78e+00 1 Vertex: -64 ID: 0 (X,cT)=+1.66e-05,-7.99e-07,+3.86e-03,+3.86e-03 I: 1 129 111 +2.45e-01,-1.18e-02,+5.70e+01,+5.70e+01 2 -64 - O: 2 184 22 +1.69e-01,+5.36e-02,+3.26e+01,+3.26e+01 1 (nil) - 185 22 +7.62e-02,-6.54e-02,+2.44e+01,+2.44e+01 1 (nil) + O: 2 184 22 +1.69e-01,+5.36e-02,+3.26e+01,+3.26e+01 1 + 185 22 +7.62e-02,-6.54e-02,+2.44e+01,+2.44e+01 1 Vertex: -65 ID: 0 (X,cT)=+7.56e+00,-3.28e+00,+4.14e+03,+4.14e+03 I: 1 130 310 +6.88e-02,-2.98e-02,+3.77e+01,+3.77e+01 2 -65 - O: 2 186 211 +1.58e-01,-6.43e-02,+3.22e+01,+3.22e+01 1 (nil) - 187 -211 -8.94e-02,+3.44e-02,+5.50e+00,+5.50e+00 1 (nil) + O: 2 186 211 +1.58e-01,-6.43e-02,+3.22e+01,+3.22e+01 1 + 187 -211 -8.94e-02,+3.44e-02,+5.50e+00,+5.50e+00 1 Vertex: -66 ID: 0 (X,cT)=+2.53e-06,+8.21e-07,+2.23e-05,+2.25e-05 I: 1 135 111 +2.91e-01,+9.43e-02,+2.56e+00,+2.58e+00 2 -66 - O: 2 188 22 +1.27e-02,-2.62e-02,+3.17e-01,+3.18e-01 1 (nil) - 189 22 +2.78e-01,+1.20e-01,+2.24e+00,+2.26e+00 1 (nil) + O: 2 188 22 +1.27e-02,-2.62e-02,+3.17e-01,+3.18e-01 1 + 189 22 +2.78e-01,+1.20e-01,+2.24e+00,+2.26e+00 1 Vertex: -67 ID: 0 (X,cT)=+1.37e-04,-1.19e-04,+6.70e-03,+6.70e-03 I: 1 137 111 +1.93e-01,-1.69e-01,+9.48e+00,+9.49e+00 2 -67 - O: 2 190 22 +3.61e-04,+4.27e-04,-3.17e-04,+6.42e-04 1 (nil) - 191 22 +1.93e-01,-1.69e-01,+9.49e+00,+9.49e+00 1 (nil) + O: 2 190 22 +3.61e-04,+4.27e-04,-3.17e-04,+6.42e-04 1 + 191 22 +1.93e-01,-1.69e-01,+9.49e+00,+9.49e+00 1 GenVertex: -68 ID: 0 (X,cT):0 I: 1 139 311 -4.56e-02,-1.94e-01,+1.85e+00,+1.93e+00 2 -68 O: 1 192 310 -4.56e-02,-1.94e-01,+1.85e+00,+1.93e+00 2 -76 @@ -413,39 +532,39 @@ GenVertex: -69 ID: 0 (X,cT):0 O: 1 193 310 -1.02e-01,-3.76e-01,+2.53e-01,+6.81e-01 2 -77 Vertex: -70 ID: 0 (X,cT)=+5.44e+00,-2.22e+00,-5.83e+01,+6.79e+01 I: 1 145 310 +7.90e-02,-3.23e-02,-8.47e-01,+9.86e-01 2 -70 - O: 2 194 211 +3.78e-02,+1.72e-01,-5.70e-01,+6.12e-01 1 (nil) - 195 -211 +4.12e-02,-2.04e-01,-2.77e-01,+3.74e-01 1 (nil) + O: 2 194 211 +3.78e-02,+1.72e-01,-5.70e-01,+6.12e-01 1 + 195 -211 +4.12e-02,-2.04e-01,-2.77e-01,+3.74e-01 1 Vertex: -71 ID: 0 (X,cT)=+8.77e-06,+3.01e-05,-4.27e-04,+4.30e-04 I: 1 150 111 +4.20e-02,+1.44e-01,-2.05e+00,+2.06e+00 2 -71 - O: 2 196 22 +2.27e-02,+1.42e-01,-1.05e+00,+1.06e+00 1 (nil) - 197 22 +1.93e-02,+2.42e-03,-9.95e-01,+9.95e-01 1 (nil) + O: 2 196 22 +2.27e-02,+1.42e-01,-1.05e+00,+1.06e+00 1 + 197 22 +1.93e-02,+2.42e-03,-9.95e-01,+9.95e-01 1 Vertex: -72 ID: 0 (X,cT)=-6.15e-05,-5.48e-05,-3.58e-01,+3.58e-01 I: 1 156 111 -1.45e-01,-1.29e-01,-8.42e+02,+8.42e+02 2 -72 - O: 2 198 22 -1.62e-01,-1.30e-01,-6.73e+02,+6.73e+02 1 (nil) - 199 22 +1.77e-02,+1.35e-03,-1.69e+02,+1.69e+02 1 (nil) + O: 2 198 22 -1.62e-01,-1.30e-01,-6.73e+02,+6.73e+02 1 + 199 22 +1.77e-02,+1.35e-03,-1.69e+02,+1.69e+02 1 Vertex: -73 ID: 0 (X,cT)=+1.59e-06,+8.76e-07,-3.37e-06,+3.89e-06 I: 1 159 111 +3.33e-01,+1.83e-01,-7.05e-01,+8.13e-01 2 -73 - O: 2 200 22 +1.34e-01,+3.84e-02,-1.48e-01,+2.03e-01 1 (nil) - 201 22 +1.99e-01,+1.45e-01,-5.58e-01,+6.10e-01 1 (nil) + O: 2 200 22 +1.34e-01,+3.84e-02,-1.48e-01,+2.03e-01 1 + 201 22 +1.99e-01,+1.45e-01,-5.58e-01,+6.10e-01 1 GenVertex: -74 ID: 0 (X,cT):0 I: 1 160 -311 -2.82e-02,+5.68e-01,-5.71e+00,+5.76e+00 2 -74 O: 1 202 310 -2.82e-02,+5.68e-01,-5.71e+00,+5.76e+00 2 -78 Vertex: -75 ID: 0 (X,cT)=-2.71e-05,+3.62e-05,-3.25e-04,+3.28e-04 I: 1 161 111 -5.98e-01,+7.99e-01,-7.16e+00,+7.23e+00 2 -75 - O: 2 203 22 -4.61e-01,+6.62e-01,-6.07e+00,+6.13e+00 1 (nil) - 204 22 -1.37e-01,+1.37e-01,-1.09e+00,+1.10e+00 1 (nil) + O: 2 203 22 -4.61e-01,+6.62e-01,-6.07e+00,+6.13e+00 1 + 204 22 -1.37e-01,+1.37e-01,-1.09e+00,+1.10e+00 1 Vertex: -76 ID: 0 (X,cT)=-2.44e+00,-1.04e+01,+9.94e+01,+1.04e+02 I: 1 192 310 -4.56e-02,-1.94e-01,+1.85e+00,+1.93e+00 2 -76 - O: 2 205 -211 -6.12e-02,+7.90e-02,+2.98e-01,+3.44e-01 1 (nil) - 206 211 +1.56e-02,-2.73e-01,+1.56e+00,+1.59e+00 1 (nil) + O: 2 205 -211 -6.12e-02,+7.90e-02,+2.98e-01,+3.44e-01 1 + 206 211 +1.56e-02,-2.73e-01,+1.56e+00,+1.59e+00 1 Vertex: -77 ID: 0 (X,cT)=-1.49e+01,-5.46e+01,+3.68e+01,+9.90e+01 I: 1 193 310 -1.02e-01,-3.76e-01,+2.53e-01,+6.81e-01 2 -77 - O: 2 207 -211 -2.41e-01,-3.27e-01,+1.77e-01,+4.65e-01 1 (nil) - 208 211 +1.38e-01,-4.84e-02,+7.57e-02,+2.16e-01 1 (nil) + O: 2 207 -211 -2.41e-01,-3.27e-01,+1.77e-01,+4.65e-01 1 + 208 211 +1.38e-01,-4.84e-02,+7.57e-02,+2.16e-01 1 Vertex: -78 ID: 0 (X,cT)=-1.33e-01,+2.68e+00,-2.69e+01,+2.71e+01 I: 1 202 310 -2.82e-02,+5.68e-01,-5.71e+00,+5.76e+00 2 -78 - O: 2 209 211 +5.42e-02,+4.89e-01,-5.04e+00,+5.07e+00 1 (nil) - 210 -211 -8.24e-02,+7.87e-02,-6.67e-01,+6.91e-01 1 (nil) + O: 2 209 211 +5.42e-02,+4.89e-01,-5.04e+00,+5.07e+00 1 + 210 -211 -8.24e-02,+7.87e-02,-6.67e-01,+6.91e-01 1 ________________________________________________________________________________ Stage 0->1 : 0 hits found in the muon chamber. ++++++++ event aborted @@ -460,51 +579,51 @@ GenEvent: #2 ID=20 SignalProcessGenVertex Barcode: 0 Entries this event: 224 vertices, 624 particles. RndmState(0)= Wgts(0)= - EventScale -1 GeV alphaQCD=-1 alphaQED=-1 + EventScale -1 [energy] alphaQCD=-1 alphaQED=-1 GenParticle Legend Barcode PDG ID ( Px, Py, Pz, E ) Stat DecayVtx ________________________________________________________________________________ GenVertex: -1 ID: 0 (X,cT):0 I: 1 1 2212 +0.00e+00,+0.00e+00,+7.00e+03,+7.00e+03 3 -1 - O: 3 41 2203 +1.57e-01,+9.19e-02,+4.12e+03,+4.12e+03 2 -13 + O: 3 3 21 +2.24e-03,-3.47e-01,+8.58e+00,+8.58e+00 3 -3 13 1 -1.60e-01,+2.55e-01,+4.51e+02,+4.51e+02 2 -9 - 3 21 +2.24e-03,-3.47e-01,+8.58e+00,+8.58e+00 3 -3 + 41 2203 +1.57e-01,+9.19e-02,+4.12e+03,+4.12e+03 2 -13 GenVertex: -2 ID: 0 (X,cT):0 I: 1 2 2212 +0.00e+00,+0.00e+00,-7.00e+03,+7.00e+03 3 -2 - O: 2 4 1 +1.81e-01,-9.21e-01,-1.91e+03,+1.91e+03 3 -4 - 39 2203 -1.81e-01,+9.21e-01,-4.33e+03,+4.33e+03 2 -11 + O: 2 39 2203 -1.81e-01,+9.21e-01,-4.33e+03,+4.33e+03 2 -11 + 4 1 +1.81e-01,-9.21e-01,-1.91e+03,+1.91e+03 3 -4 GenVertex: -3 ID: 0 (X,cT):0 I: 1 3 21 +2.24e-03,-3.47e-01,+8.58e+00,+8.58e+00 3 -3 - O: 8 15 21 +3.52e-01,-6.45e-01,-1.11e+00,+1.33e+00 2 -11 - 40 2 -5.76e-01,-2.17e+00,+2.82e+00,+3.62e+00 2 -13 + O: 8 11 -4 +1.95e+00,-1.06e+00,-8.18e+00,+8.61e+00 2 -9 5 -2 -1.22e+01,+1.16e+00,-1.11e+01,+1.65e+01 3 -5 - 11 -4 +1.95e+00,-1.06e+00,-8.18e+00,+8.61e+00 2 -9 12 21 +1.85e+00,+6.48e+00,-3.61e+01,+3.67e+01 2 -9 14 4 +1.07e+01,-5.18e+00,-2.71e+01,+2.96e+01 2 -11 16 21 +3.32e-02,+9.61e-02,-6.60e-02,+1.21e-01 2 -11 17 21 -3.76e-02,-1.65e-01,-9.73e-01,+9.88e-01 2 -11 + 15 21 +3.52e-01,-6.45e-01,-1.11e+00,+1.33e+00 2 -11 + 40 2 -5.76e-01,-2.17e+00,+2.82e+00,+3.62e+00 2 -13 GenVertex: -4 ID: 0 (X,cT):0 I: 1 4 1 +1.81e-01,-9.21e-01,-1.91e+03,+1.91e+03 3 -4 - O:12 6 1 -1.04e+01,-7.53e+00,-8.52e+02,+8.53e+02 3 -5 + O:12 35 21 -3.17e+00,-1.74e+00,-8.38e+01,+8.39e+01 2 -11 + 36 21 -3.72e-01,-3.53e+00,-1.09e+02,+1.09e+02 2 -11 + 37 21 -3.12e-01,+2.46e-01,-7.86e+01,+7.86e+01 2 -11 + 38 21 +2.18e+00,-6.98e-01,-1.55e+02,+1.55e+02 2 -11 28 21 +8.30e-01,+1.28e+00,-3.84e+01,+3.84e+01 2 -11 + 6 1 -1.04e+01,-7.53e+00,-8.52e+02,+8.53e+02 3 -5 29 21 +1.45e+00,+3.41e+00,-3.48e+01,+3.50e+01 2 -11 30 21 +4.75e+00,+5.08e+00,-7.07e+01,+7.11e+01 2 -11 31 21 +7.05e+00,+5.30e+00,-7.09e+01,+7.14e+01 2 -11 32 21 +6.43e-05,-2.87e-01,-2.01e+00,+2.03e+00 2 -11 33 21 -2.01e+00,+1.84e-01,-1.00e+02,+1.00e+02 2 -11 34 21 -1.92e+00,-1.52e+00,-2.29e+02,+2.29e+02 2 -11 - 35 21 -3.17e+00,-1.74e+00,-8.38e+01,+8.39e+01 2 -11 - 36 21 -3.72e-01,-3.53e+00,-1.09e+02,+1.09e+02 2 -11 - 37 21 -3.12e-01,+2.46e-01,-7.86e+01,+7.86e+01 2 -11 - 38 21 +2.18e+00,-6.98e-01,-1.55e+02,+1.55e+02 2 -11 GenVertex: -5 ID: 0 (X,cT):0 - I: 2 6 1 -1.04e+01,-7.53e+00,-8.52e+02,+8.53e+02 3 -5 - 5 -2 -1.22e+01,+1.16e+00,-1.11e+01,+1.65e+01 3 -5 + I: 2 5 -2 -1.22e+01,+1.16e+00,-1.11e+01,+1.65e+01 3 -5 + 6 1 -1.04e+01,-7.53e+00,-8.52e+02,+8.53e+02 3 -5 O: 2 7 22 -1.33e+01,-8.08e+00,-1.04e+02,+1.05e+02 3 -6 8 -24 -9.28e+00,+1.71e+00,-7.59e+02,+7.64e+02 3 -7 GenVertex: -6 ID: 0 (X,cT):0 I: 1 7 22 -1.33e+01,-8.08e+00,-1.04e+02,+1.05e+02 3 -6 - O: 1 9 22 -1.33e+01,-8.08e+00,-1.04e+02,+1.05e+02 1 (nil) + O: 1 9 22 -1.33e+01,-8.08e+00,-1.04e+02,+1.05e+02 1 GenVertex: -7 ID: 0 (X,cT):0 I: 1 8 -24 -9.28e+00,+1.71e+00,-7.59e+02,+7.64e+02 3 -7 O: 1 10 -24 -9.28e+00,+1.71e+00,-7.59e+02,+7.64e+02 2 -8 @@ -518,13 +637,16 @@ GenVertex: -8 ID: 0 (X,cT):0 47 3 +2.49e+01,-1.94e+01,-3.48e+02,+3.50e+02 2 -15 GenVertex: -9 ID: 0 (X,cT):0 I: 3 11 -4 +1.95e+00,-1.06e+00,-8.18e+00,+8.61e+00 2 -9 - 12 21 +1.85e+00,+6.48e+00,-3.61e+01,+3.67e+01 2 -9 13 1 -1.60e-01,+2.55e-01,+4.51e+02,+4.51e+02 2 -9 + 12 21 +1.85e+00,+6.48e+00,-3.61e+01,+3.67e+01 2 -9 O: 1 52 92 +3.65e+00,+5.68e+00,+4.07e+02,+4.96e+02 2 -10 GenVertex: -10 ID: 0 (X,cT):0 I: 1 52 92 +3.65e+00,+5.68e+00,+4.07e+02,+4.96e+02 2 -10 - O:17 53 -423 +1.80e+00,-7.41e-01,-9.90e+00,+1.03e+01 2 -21 + O:17 64 -213 -3.57e-01,-2.47e-01,+4.39e+00,+4.44e+00 2 -32 + 67 113 -3.73e-01,+1.18e-02,+3.83e+01,+3.84e+01 2 -34 + 68 113 -9.06e-02,+1.63e-01,+1.67e+02,+1.67e+02 2 -35 54 -323 +5.03e-01,+1.51e+00,-6.41e+00,+6.67e+00 2 -22 + 53 -423 +1.80e+00,-7.41e-01,-9.90e+00,+1.03e+01 2 -21 55 313 +6.48e-01,+1.70e+00,-1.25e+01,+1.27e+01 2 -23 56 113 +3.14e-01,+1.06e+00,-3.82e+00,+4.04e+00 2 -24 57 223 +8.27e-03,+4.69e-01,-5.55e+00,+5.62e+00 2 -25 @@ -534,29 +656,27 @@ GenVertex: -10 ID: 0 (X,cT):0 61 313 -7.71e-02,+3.71e-01,+6.58e-01,+1.14e+00 2 -29 62 213 -3.58e-01,-1.85e-01,+2.02e-01,+7.59e-01 2 -30 63 221 +5.37e-01,+2.24e-01,+7.68e+00,+7.72e+00 2 -31 - 64 -213 -3.57e-01,-2.47e-01,+4.39e+00,+4.44e+00 2 -32 - 65 211 -9.70e-03,-2.00e-01,+9.73e-01,+1.00e+00 1 (nil) + 65 211 -9.70e-03,-2.00e-01,+9.73e-01,+1.00e+00 1 66 -213 +3.60e-01,-1.91e-02,+2.45e+01,+2.45e+01 2 -33 - 67 113 -3.73e-01,+1.18e-02,+3.83e+01,+3.84e+01 2 -34 - 68 113 -9.06e-02,+1.63e-01,+1.67e+02,+1.67e+02 2 -35 69 221 +1.73e-01,+4.07e-01,+2.06e+02,+2.06e+02 2 -36 GenVertex: -11 ID: 0 (X,cT):0 - I:26 15 21 +3.52e-01,-6.45e-01,-1.11e+00,+1.33e+00 2 -11 + I:26 35 21 -3.17e+00,-1.74e+00,-8.38e+01,+8.39e+01 2 -11 + 36 21 -3.72e-01,-3.53e+00,-1.09e+02,+1.09e+02 2 -11 + 37 21 -3.12e-01,+2.46e-01,-7.86e+01,+7.86e+01 2 -11 + 38 21 +2.18e+00,-6.98e-01,-1.55e+02,+1.55e+02 2 -11 + 39 2203 -1.81e-01,+9.21e-01,-4.33e+03,+4.33e+03 2 -11 + 14 4 +1.07e+01,-5.18e+00,-2.71e+01,+2.96e+01 2 -11 28 21 +8.30e-01,+1.28e+00,-3.84e+01,+3.84e+01 2 -11 + 16 21 +3.32e-02,+9.61e-02,-6.60e-02,+1.21e-01 2 -11 + 17 21 -3.76e-02,-1.65e-01,-9.73e-01,+9.88e-01 2 -11 + 15 21 +3.52e-01,-6.45e-01,-1.11e+00,+1.33e+00 2 -11 + 23 21 -1.76e+00,-3.29e+00,+9.66e+00,+1.04e+01 2 -11 29 21 +1.45e+00,+3.41e+00,-3.48e+01,+3.50e+01 2 -11 30 21 +4.75e+00,+5.08e+00,-7.07e+01,+7.11e+01 2 -11 31 21 +7.05e+00,+5.30e+00,-7.09e+01,+7.14e+01 2 -11 32 21 +6.43e-05,-2.87e-01,-2.01e+00,+2.03e+00 2 -11 - 14 4 +1.07e+01,-5.18e+00,-2.71e+01,+2.96e+01 2 -11 - 16 21 +3.32e-02,+9.61e-02,-6.60e-02,+1.21e-01 2 -11 - 17 21 -3.76e-02,-1.65e-01,-9.73e-01,+9.88e-01 2 -11 33 21 -2.01e+00,+1.84e-01,-1.00e+02,+1.00e+02 2 -11 34 21 -1.92e+00,-1.52e+00,-2.29e+02,+2.29e+02 2 -11 - 35 21 -3.17e+00,-1.74e+00,-8.38e+01,+8.39e+01 2 -11 - 36 21 -3.72e-01,-3.53e+00,-1.09e+02,+1.09e+02 2 -11 - 37 21 -3.12e-01,+2.46e-01,-7.86e+01,+7.86e+01 2 -11 - 38 21 +2.18e+00,-6.98e-01,-1.55e+02,+1.55e+02 2 -11 - 23 21 -1.76e+00,-3.29e+00,+9.66e+00,+1.04e+01 2 -11 24 21 -4.37e+00,-6.72e+00,+8.76e-01,+8.07e+00 2 -11 25 21 -2.35e+00,-1.77e+00,-4.88e+00,+5.70e+00 2 -11 26 21 +1.76e+00,+3.29e+00,-4.65e+00,+5.96e+00 2 -11 @@ -566,120 +686,119 @@ GenVertex: -11 ID: 0 (X,cT):0 21 21 +4.37e+00,+6.72e+00,+8.31e+01,+8.35e+01 2 -11 22 21 +3.91e+00,-3.13e+00,+3.66e+01,+3.69e+01 2 -11 18 21 -3.89e+00,-1.90e+00,+4.34e+01,+4.36e+01 2 -11 - 39 2203 -1.81e-01,+9.21e-01,-4.33e+03,+4.33e+03 2 -11 O: 1 70 92 +1.93e+01,+2.76e+00,-3.69e+03,+8.47e+03 2 -12 GenVertex: -12 ID: 0 (X,cT):0 I: 1 70 92 +1.93e+01,+2.76e+00,-3.69e+03,+8.47e+03 2 -12 - O:90 104 211 +6.95e-01,-7.43e-02,+2.83e+00,+2.91e+00 1 (nil) - 105 311 +6.37e-01,-2.90e-01,+6.13e+00,+6.19e+00 2 -63 + O:90 75 111 -2.29e-01,-5.45e-02,-1.11e+00,+1.15e+00 2 -41 + 77 -211 +2.15e-01,+4.10e-01,+1.16e-01,+4.98e-01 1 + 80 311 -1.08e-01,-3.01e-02,+1.70e+00,+1.77e+00 2 -43 + 96 113 +1.17e+00,-6.49e-01,+1.09e+02,+1.09e+02 2 -56 + 98 221 +4.22e-01,+3.30e-01,+8.56e+00,+8.60e+00 2 -58 + 101 331 +1.59e+00,+2.22e+00,+3.03e+01,+3.04e+01 2 -61 106 333 +8.72e-02,-2.03e+00,+7.62e+00,+7.95e+00 2 -64 - 107 -323 -1.98e-01,-1.55e-01,+2.64e+00,+2.79e+00 2 -65 - 108 113 -1.10e+00,-1.90e+00,+5.32e+00,+5.81e+00 2 -66 109 213 -7.23e-01,-7.70e-01,+6.13e-01,+1.63e+00 2 -67 - 110 -211 -4.35e-01,-8.15e-01,+1.78e-01,+9.51e-01 1 (nil) - 111 213 -5.97e-01,-1.22e+00,+2.67e-01,+1.55e+00 2 -68 - 112 -211 -1.43e+00,-1.65e+00,+4.83e-01,+2.24e+00 1 (nil) - 113 111 +4.36e-02,-2.43e-01,+6.27e-02,+2.89e-01 2 -69 - 114 213 -1.15e+00,-1.72e+00,-2.01e+00,+2.97e+00 2 -70 - 115 -213 -9.95e-01,-3.87e-01,-1.11e+00,+1.63e+00 2 -71 - 116 321 +3.64e-01,+4.39e-01,+9.92e-02,+7.61e-01 1 (nil) - 117 -321 -1.27e-01,-1.02e+00,-1.45e+00,+1.85e+00 1 (nil) - 118 211 -2.01e-01,+3.58e-01,-1.79e+00,+1.84e+00 1 (nil) - 119 311 -2.88e-01,+7.23e-01,-1.33e+00,+1.62e+00 2 -72 - 120 -321 +1.03e-01,-1.31e-01,-8.45e-01,+9.93e-01 1 (nil) - 121 113 -2.01e-02,+9.67e-01,-2.76e+00,+3.05e+00 2 -73 - 122 213 +6.99e-01,+4.88e-01,-2.14e+00,+2.37e+00 2 -74 + 120 -321 +1.03e-01,-1.31e-01,-8.45e-01,+9.93e-01 1 123 223 +1.59e-01,-2.33e-01,-7.42e+00,+7.46e+00 2 -75 - 124 223 -3.07e-01,+5.68e-01,-1.77e+01,+1.77e+01 2 -76 - 125 1114 +7.70e-01,-3.47e-01,-1.94e+02,+1.94e+02 2 -77 - 126 111 +6.52e-01,+1.56e+00,-1.11e+02,+1.11e+02 2 -78 - 127 -2112 +1.08e-01,+9.33e-02,-7.63e+01,+7.63e+01 1 (nil) - 128 211 +3.93e-01,-4.83e-01,-5.97e+01,+5.97e+01 1 (nil) - 129 -211 -4.91e-02,+3.02e-01,-5.27e+01,+5.27e+01 1 (nil) - 130 113 +7.74e-01,+8.64e-01,-8.89e+01,+8.89e+01 2 -79 - 131 223 +1.70e-02,+2.83e-01,-9.69e+01,+9.69e+01 2 -80 - 132 223 +3.02e-01,+2.43e-01,-3.21e+01,+3.21e+01 2 -81 - 133 221 +6.52e-01,-1.30e-02,-7.49e+00,+7.53e+00 2 -82 - 134 213 +1.25e+00,+2.45e+00,-3.91e+01,+3.93e+01 2 -83 - 135 221 +8.86e-01,+9.16e-01,-1.24e+01,+1.25e+01 2 -84 - 136 -211 +1.82e+00,+1.89e+00,-2.77e+01,+2.78e+01 1 (nil) - 137 111 +7.22e-01,+1.16e+00,-1.29e+01,+1.29e+01 2 -85 - 138 113 +1.21e+00,+1.68e+00,-1.89e+01,+1.90e+01 2 -86 - 139 211 +1.12e+00,+5.04e-01,-1.16e+01,+1.17e+01 1 (nil) - 140 -213 +4.58e-01,+1.15e+00,-1.84e+01,+1.85e+01 2 -87 - 141 213 +2.08e+00,+1.68e+00,-2.61e+01,+2.63e+01 2 -88 - 142 313 +1.78e+00,+1.24e+00,-2.26e+01,+2.27e+01 2 -89 - 143 -313 +1.42e+00,+6.47e-01,-1.81e+01,+1.82e+01 2 -90 - 144 2112 -1.12e+00,+5.37e-01,-5.10e+01,+5.10e+01 1 (nil) - 145 -213 -5.75e-01,-4.78e-01,-9.45e+01,+9.45e+01 2 -91 - 146 -1114 -8.04e-01,-7.43e-01,-3.40e+01,+3.40e+01 2 -92 - 147 -213 -1.80e-01,+6.29e-02,-4.32e+01,+4.32e+01 2 -93 - 148 211 -1.19e+00,-2.34e-01,-3.93e+01,+3.93e+01 1 (nil) - 149 311 -1.41e+00,-2.18e+00,-7.90e+01,+7.90e+01 2 -94 - 150 -323 -3.04e-01,-3.92e-01,-7.88e+01,+7.88e+01 2 -95 - 151 213 -1.80e+00,-1.21e+00,-8.93e+01,+8.94e+01 2 -96 - 152 113 +4.91e-01,-9.72e-01,-5.04e+01,+5.05e+01 2 -97 - 153 221 +2.67e-01,-2.61e-01,-2.16e+01,+2.16e+01 2 -98 - 154 311 +4.13e-01,+1.80e-01,-8.91e+01,+8.91e+01 2 -99 - 155 -321 +3.69e-01,-3.68e-01,-5.25e+01,+5.25e+01 1 (nil) - 156 221 -4.10e-01,-2.74e-01,-4.88e+01,+4.88e+01 2 -100 - 157 211 +7.13e-01,-3.28e-01,-1.35e+02,+1.35e+02 1 (nil) + 157 211 +7.13e-01,-3.28e-01,-1.35e+02,+1.35e+02 1 158 113 -8.56e-01,+4.51e-01,-3.86e+02,+3.86e+02 2 -101 - 159 -211 +8.50e-01,-2.44e-01,-2.40e+03,+2.40e+03 1 (nil) + 159 -211 +8.50e-01,-2.44e-01,-2.40e+03,+2.40e+03 1 160 2224 -1.90e-03,+7.51e-01,-1.39e+03,+1.39e+03 2 -102 71 423 +6.74e+00,-3.13e+00,-1.81e+01,+1.96e+01 2 -37 72 213 +1.08e+00,-6.60e-01,-2.31e+00,+2.70e+00 2 -38 73 331 +8.84e-01,-9.17e-01,-1.33e+00,+2.07e+00 2 -39 74 -213 +1.67e+00,-6.02e-01,-4.33e+00,+4.71e+00 2 -40 - 75 111 -2.29e-01,-5.45e-02,-1.11e+00,+1.15e+00 2 -41 - 76 211 +1.91e-01,-3.77e-01,+3.30e-01,+5.54e-01 1 (nil) - 77 -211 +2.15e-01,+4.10e-01,+1.16e-01,+4.98e-01 1 (nil) - 78 211 +1.18e-01,-7.30e-01,-1.31e+00,+1.51e+00 1 (nil) + 132 223 +3.02e-01,+2.43e-01,-3.21e+01,+3.21e+01 2 -81 + 76 211 +1.91e-01,-3.77e-01,+3.30e-01,+5.54e-01 1 + 78 211 +1.18e-01,-7.30e-01,-1.31e+00,+1.51e+00 1 79 3112 -1.25e-01,-5.92e-02,+4.02e+00,+4.19e+00 2 -42 - 80 311 -1.08e-01,-3.01e-02,+1.70e+00,+1.77e+00 2 -43 81 -1114 -5.93e-01,-4.62e-01,+7.53e+00,+7.69e+00 2 -44 - 82 -211 -3.95e-01,+3.08e-01,+9.39e+00,+9.40e+00 1 (nil) - 83 211 -3.13e-01,-7.22e-01,+8.53e+00,+8.56e+00 1 (nil) + 82 -211 -3.95e-01,+3.08e-01,+9.39e+00,+9.40e+00 1 + 83 211 -3.13e-01,-7.22e-01,+8.53e+00,+8.56e+00 1 + 137 111 +7.22e-01,+1.16e+00,-1.29e+01,+1.29e+01 2 -85 84 -213 -1.27e-01,-1.01e-01,+5.15e+00,+5.19e+00 2 -45 85 213 -1.20e+00,-1.22e-01,+2.34e+01,+2.35e+01 2 -46 86 223 -7.42e-02,+1.42e-01,+1.52e+01,+1.52e+01 2 -47 + 138 113 +1.21e+00,+1.68e+00,-1.89e+01,+1.90e+01 2 -86 87 -213 -9.01e-01,-6.04e-01,+2.49e+01,+2.49e+01 2 -48 + 141 213 +2.08e+00,+1.68e+00,-2.61e+01,+2.63e+01 2 -88 88 323 -3.96e-01,+4.77e-01,+8.35e+01,+8.35e+01 2 -49 89 -313 -1.18e+00,+4.38e-01,+2.34e+02,+2.34e+02 2 -50 90 111 -2.10e-02,+1.47e-01,+2.20e+01,+2.20e+01 2 -51 91 -213 -1.47e+00,+1.82e+00,+3.92e+02,+3.92e+02 2 -52 92 213 +1.75e+00,+1.50e+00,+6.91e+02,+6.91e+02 2 -53 - 93 -211 -8.94e-02,-3.08e-01,+1.41e+02,+1.41e+02 1 (nil) + 93 -211 -8.94e-02,-3.08e-01,+1.41e+02,+1.41e+02 1 94 111 +7.06e-01,+3.83e-01,+1.68e+02,+1.68e+02 2 -54 95 223 +1.83e-01,+6.58e-01,+2.64e+02,+2.64e+02 2 -55 - 96 113 +1.17e+00,-6.49e-01,+1.09e+02,+1.09e+02 2 -56 97 213 -3.59e-02,+9.92e-01,+3.73e+01,+3.74e+01 2 -57 - 98 221 +4.22e-01,+3.30e-01,+8.56e+00,+8.60e+00 2 -58 99 -213 +9.75e-01,+2.54e+00,+3.20e+01,+3.22e+01 2 -59 100 111 +1.28e+00,+5.91e-01,+1.83e+01,+1.84e+01 2 -60 - 101 331 +1.59e+00,+2.22e+00,+3.03e+01,+3.04e+01 2 -61 + 148 211 -1.19e+00,-2.34e-01,-3.93e+01,+3.93e+01 1 + 149 311 -1.41e+00,-2.18e+00,-7.90e+01,+7.90e+01 2 -94 102 213 +1.77e+00,-1.58e+00,+1.71e+01,+1.73e+01 2 -62 - 103 -211 -1.88e-01,-1.28e-01,+3.87e+00,+3.88e+00 1 (nil) + 103 -211 -1.88e-01,-1.28e-01,+3.87e+00,+3.88e+00 1 + 104 211 +6.95e-01,-7.43e-02,+2.83e+00,+2.91e+00 1 + 105 311 +6.37e-01,-2.90e-01,+6.13e+00,+6.19e+00 2 -63 + 107 -323 -1.98e-01,-1.55e-01,+2.64e+00,+2.79e+00 2 -65 + 108 113 -1.10e+00,-1.90e+00,+5.32e+00,+5.81e+00 2 -66 + 110 -211 -4.35e-01,-8.15e-01,+1.78e-01,+9.51e-01 1 + 111 213 -5.97e-01,-1.22e+00,+2.67e-01,+1.55e+00 2 -68 + 112 -211 -1.43e+00,-1.65e+00,+4.83e-01,+2.24e+00 1 + 113 111 +4.36e-02,-2.43e-01,+6.27e-02,+2.89e-01 2 -69 + 114 213 -1.15e+00,-1.72e+00,-2.01e+00,+2.97e+00 2 -70 + 115 -213 -9.95e-01,-3.87e-01,-1.11e+00,+1.63e+00 2 -71 + 116 321 +3.64e-01,+4.39e-01,+9.92e-02,+7.61e-01 1 + 117 -321 -1.27e-01,-1.02e+00,-1.45e+00,+1.85e+00 1 + 118 211 -2.01e-01,+3.58e-01,-1.79e+00,+1.84e+00 1 + 119 311 -2.88e-01,+7.23e-01,-1.33e+00,+1.62e+00 2 -72 + 121 113 -2.01e-02,+9.67e-01,-2.76e+00,+3.05e+00 2 -73 + 122 213 +6.99e-01,+4.88e-01,-2.14e+00,+2.37e+00 2 -74 + 124 223 -3.07e-01,+5.68e-01,-1.77e+01,+1.77e+01 2 -76 + 125 1114 +7.70e-01,-3.47e-01,-1.94e+02,+1.94e+02 2 -77 + 126 111 +6.52e-01,+1.56e+00,-1.11e+02,+1.11e+02 2 -78 + 127 -2112 +1.08e-01,+9.33e-02,-7.63e+01,+7.63e+01 1 + 128 211 +3.93e-01,-4.83e-01,-5.97e+01,+5.97e+01 1 + 129 -211 -4.91e-02,+3.02e-01,-5.27e+01,+5.27e+01 1 + 130 113 +7.74e-01,+8.64e-01,-8.89e+01,+8.89e+01 2 -79 + 131 223 +1.70e-02,+2.83e-01,-9.69e+01,+9.69e+01 2 -80 + 133 221 +6.52e-01,-1.30e-02,-7.49e+00,+7.53e+00 2 -82 + 134 213 +1.25e+00,+2.45e+00,-3.91e+01,+3.93e+01 2 -83 + 135 221 +8.86e-01,+9.16e-01,-1.24e+01,+1.25e+01 2 -84 + 136 -211 +1.82e+00,+1.89e+00,-2.77e+01,+2.78e+01 1 + 154 311 +4.13e-01,+1.80e-01,-8.91e+01,+8.91e+01 2 -99 + 139 211 +1.12e+00,+5.04e-01,-1.16e+01,+1.17e+01 1 + 140 -213 +4.58e-01,+1.15e+00,-1.84e+01,+1.85e+01 2 -87 + 142 313 +1.78e+00,+1.24e+00,-2.26e+01,+2.27e+01 2 -89 + 143 -313 +1.42e+00,+6.47e-01,-1.81e+01,+1.82e+01 2 -90 + 144 2112 -1.12e+00,+5.37e-01,-5.10e+01,+5.10e+01 1 + 145 -213 -5.75e-01,-4.78e-01,-9.45e+01,+9.45e+01 2 -91 + 146 -1114 -8.04e-01,-7.43e-01,-3.40e+01,+3.40e+01 2 -92 + 147 -213 -1.80e-01,+6.29e-02,-4.32e+01,+4.32e+01 2 -93 + 150 -323 -3.04e-01,-3.92e-01,-7.88e+01,+7.88e+01 2 -95 + 151 213 -1.80e+00,-1.21e+00,-8.93e+01,+8.94e+01 2 -96 + 152 113 +4.91e-01,-9.72e-01,-5.04e+01,+5.05e+01 2 -97 + 153 221 +2.67e-01,-2.61e-01,-2.16e+01,+2.16e+01 2 -98 + 155 -321 +3.69e-01,-3.68e-01,-5.25e+01,+5.25e+01 1 + 156 221 -4.10e-01,-2.74e-01,-4.88e+01,+4.88e+01 2 -100 GenVertex: -13 ID: 0 (X,cT):0 I: 2 41 2203 +1.57e-01,+9.19e-02,+4.12e+03,+4.12e+03 2 -13 40 2 -5.76e-01,-2.17e+00,+2.82e+00,+3.62e+00 2 -13 O: 1 161 92 -4.19e-01,-2.08e+00,+4.13e+03,+4.13e+03 2 -14 GenVertex: -14 ID: 0 (X,cT):0 I: 1 161 92 -4.19e-01,-2.08e+00,+4.13e+03,+4.13e+03 2 -14 - O:14 162 211 -3.13e-01,-1.66e+00,+2.96e+00,+3.41e+00 1 (nil) - 163 223 -1.35e-02,+1.05e-01,+2.90e+00,+3.01e+00 2 -103 - 164 -213 -7.67e-02,-1.58e-01,+2.83e+00,+2.94e+00 2 -104 + O:14 164 -213 -7.67e-02,-1.58e-01,+2.83e+00,+2.94e+00 2 -104 165 113 -3.96e-01,-2.46e-01,+7.66e+00,+7.72e+00 2 -105 166 223 +8.97e-02,-2.51e-02,+1.83e+01,+1.83e+01 2 -106 167 331 +7.92e-02,-2.14e-01,+1.65e+01,+1.65e+01 2 -107 - 168 211 +1.55e-01,-4.55e-02,+2.09e+01,+2.09e+01 1 (nil) + 168 211 +1.55e-01,-4.55e-02,+2.09e+01,+2.09e+01 1 169 113 -9.07e-02,+1.70e-01,+7.69e+00,+7.71e+00 2 -108 - 170 -211 +1.96e-02,-3.42e-02,+4.36e+00,+4.36e+00 1 (nil) - 171 211 +1.50e-01,-7.36e-02,+6.14e+01,+6.14e+01 1 (nil) + 170 -211 +1.96e-02,-3.42e-02,+4.36e+00,+4.36e+00 1 + 171 211 +1.50e-01,-7.36e-02,+6.14e+01,+6.14e+01 1 172 313 -9.79e-02,+5.68e-01,+7.20e+01,+7.20e+01 2 -109 173 -313 -1.30e-01,-7.96e-01,+2.37e+02,+2.37e+02 2 -110 - 174 2112 +5.28e-01,-1.88e-01,+1.06e+03,+1.06e+03 1 (nil) - 175 211 -3.22e-01,+5.25e-01,+2.61e+03,+2.61e+03 1 (nil) + 174 2112 +5.28e-01,-1.88e-01,+1.06e+03,+1.06e+03 1 + 175 211 -3.22e-01,+5.25e-01,+2.61e+03,+2.61e+03 1 + 163 223 -1.35e-02,+1.05e-01,+2.90e+00,+3.01e+00 2 -103 + 162 211 -3.13e-01,-1.66e+00,+2.96e+00,+3.41e+00 1 GenVertex: -15 ID: 0 (X,cT):0 I: 6 42 -4 -3.64e+01,+2.35e+01,-3.49e+02,+3.52e+02 2 -15 43 21 -1.27e+00,-7.35e-02,-1.13e+01,+1.14e+01 2 -15 @@ -691,35 +810,35 @@ GenVertex: -15 ID: 0 (X,cT):0 GenVertex: -16 ID: 0 (X,cT):0 I: 1 176 92 -9.28e+00,+1.71e+00,-7.59e+02,+7.64e+02 2 -16 O:10 177 -411 -2.64e+01,+1.68e+01,-2.54e+02,+2.56e+02 2 -111 - 178 -2112 -3.30e+00,+1.95e+00,-3.12e+01,+3.14e+01 1 (nil) - 179 2112 -3.69e+00,+2.38e+00,-3.47e+01,+3.50e+01 1 (nil) + 178 -2112 -3.30e+00,+1.95e+00,-3.12e+01,+3.14e+01 1 + 179 2112 -3.69e+00,+2.38e+00,-3.47e+01,+3.50e+01 1 180 -313 -1.69e+00,+9.52e-01,-1.93e+01,+1.94e+01 2 -112 181 323 -1.07e+00,+1.14e+00,-1.19e+01,+1.20e+01 2 -113 182 -323 -1.04e+00,-2.43e-02,-1.56e+01,+1.57e+01 2 -114 - 183 321 +9.73e-01,-7.75e-01,-1.20e+01,+1.21e+01 1 (nil) + 183 321 +9.73e-01,-7.75e-01,-1.20e+01,+1.21e+01 1 184 113 +9.16e+00,-6.89e+00,-1.32e+02,+1.32e+02 2 -115 185 111 +1.57e+00,-1.44e+00,-2.40e+01,+2.41e+01 2 -116 - 186 -321 +1.62e+01,-1.24e+01,-2.25e+02,+2.26e+02 1 (nil) + 186 -321 +1.62e+01,-1.24e+01,-2.25e+02,+2.26e+02 1 GenVertex: -17 ID: 0 (X,cT):0 I: 2 48 3 +2.68e+00,-2.13e+00,-4.93e+00,+6.00e+00 2 -17 49 -3 -2.68e+00,+2.13e+00,+2.54e+01,+2.56e+01 2 -17 O: 1 187 92 +0.00e+00,+0.00e+00,+2.05e+01,+3.16e+01 2 -18 GenVertex: -18 ID: 0 (X,cT):0 I: 1 187 92 +0.00e+00,+0.00e+00,+2.05e+01,+3.16e+01 2 -18 - O:11 188 -321 +2.32e+00,-1.47e+00,-3.73e+00,+4.66e+00 1 (nil) + O:11 188 -321 +2.32e+00,-1.47e+00,-3.73e+00,+4.66e+00 1 189 213 -1.88e-01,-4.78e-01,-1.86e-02,+8.02e-01 2 -117 - 190 -211 +5.28e-01,-6.99e-02,+3.78e-01,+6.68e-01 1 (nil) + 190 -211 +5.28e-01,-6.99e-02,+3.78e-01,+6.68e-01 1 191 213 -1.69e-01,+6.66e-02,+1.66e+00,+1.95e+00 2 -118 192 113 -7.42e-01,+4.97e-01,+2.71e+00,+2.94e+00 2 -119 193 -213 +2.70e-02,+3.31e-01,+2.97e-01,+7.93e-01 2 -120 - 194 211 -6.87e-03,-3.65e-01,+8.22e-01,+9.10e-01 1 (nil) + 194 211 -6.87e-03,-3.65e-01,+8.22e-01,+9.10e-01 1 195 113 -1.79e-01,+4.58e-01,+4.36e+00,+4.46e+00 2 -121 196 -213 -8.75e-02,+1.16e-01,+1.21e+00,+1.46e+00 2 -122 197 323 -7.63e-01,+6.20e-01,+7.15e+00,+7.28e+00 2 -123 198 221 -7.36e-01,+2.91e-01,+5.63e+00,+5.72e+00 2 -124 GenVertex: -19 ID: 0 (X,cT):0 - I: 2 50 21 +1.28e+00,-2.63e+00,+9.77e-01,+3.09e+00 2 -19 - 51 21 -1.28e+00,+2.63e+00,+2.15e+00,+3.63e+00 2 -19 + I: 2 51 21 -1.28e+00,+2.63e+00,+2.15e+00,+3.63e+00 2 -19 + 50 21 +1.28e+00,-2.63e+00,+9.77e-01,+3.09e+00 2 -19 O: 1 199 92 +0.00e+00,+0.00e+00,+3.12e+00,+6.71e+00 2 -20 GenVertex: -20 ID: 0 (X,cT):0 I: 1 199 92 +0.00e+00,+0.00e+00,+3.12e+00,+6.71e+00 2 -20 @@ -735,66 +854,66 @@ GenVertex: -21 ID: 0 (X,cT):0 GenVertex: -22 ID: 0 (X,cT):0 I: 1 54 -323 +5.03e-01,+1.51e+00,-6.41e+00,+6.67e+00 2 -22 O: 2 207 -311 +3.84e-01,+6.75e-01,-2.32e+00,+2.49e+00 2 -132 - 208 -211 +1.19e-01,+8.35e-01,-4.09e+00,+4.18e+00 1 (nil) + 208 -211 +1.19e-01,+8.35e-01,-4.09e+00,+4.18e+00 1 GenVertex: -23 ID: 0 (X,cT):0 I: 1 55 313 +6.48e-01,+1.70e+00,-1.25e+01,+1.27e+01 2 -23 O: 2 209 311 +4.92e-01,+1.67e+00,-1.03e+01,+1.05e+01 2 -133 210 111 +1.56e-01,+3.28e-02,-2.20e+00,+2.21e+00 2 -134 GenVertex: -24 ID: 0 (X,cT):0 I: 1 56 113 +3.14e-01,+1.06e+00,-3.82e+00,+4.04e+00 2 -24 - O: 2 211 -211 +2.07e-01,-7.41e-03,-8.44e-01,+8.80e-01 1 (nil) - 212 211 +1.07e-01,+1.07e+00,-2.97e+00,+3.16e+00 1 (nil) + O: 2 211 -211 +2.07e-01,-7.41e-03,-8.44e-01,+8.80e-01 1 + 212 211 +1.07e-01,+1.07e+00,-2.97e+00,+3.16e+00 1 GenVertex: -25 ID: 0 (X,cT):0 I: 1 57 223 +8.27e-03,+4.69e-01,-5.55e+00,+5.62e+00 2 -25 - O: 3 213 211 +1.65e-01,+9.37e-02,-1.12e+00,+1.14e+00 1 (nil) - 214 -211 -3.30e-02,+9.79e-02,-3.21e+00,+3.22e+00 1 (nil) + O: 3 213 211 +1.65e-01,+9.37e-02,-1.12e+00,+1.14e+00 1 + 214 -211 -3.30e-02,+9.79e-02,-3.21e+00,+3.22e+00 1 215 111 -1.24e-01,+2.78e-01,-1.22e+00,+1.26e+00 2 -135 GenVertex: -26 ID: 0 (X,cT):0 I: 1 58 213 +1.90e-01,+8.19e-01,-3.63e+00,+3.80e+00 2 -26 - O: 2 216 211 +2.62e-01,+8.26e-01,-2.45e+00,+2.61e+00 1 (nil) + O: 2 216 211 +2.62e-01,+8.26e-01,-2.45e+00,+2.61e+00 1 217 111 -7.15e-02,-6.31e-03,-1.18e+00,+1.19e+00 2 -136 GenVertex: -27 ID: 0 (X,cT):0 I: 1 59 223 +4.76e-01,+3.30e-01,-1.30e+00,+1.62e+00 2 -27 - O: 3 218 -211 +1.28e-01,-6.04e-02,-2.75e-01,+3.39e-01 1 (nil) - 219 211 +2.00e-01,+3.04e-01,-9.82e-01,+1.06e+00 1 (nil) + O: 3 218 -211 +1.28e-01,-6.04e-02,-2.75e-01,+3.39e-01 1 + 219 211 +2.00e-01,+3.04e-01,-9.82e-01,+1.06e+00 1 220 111 +1.49e-01,+8.68e-02,-4.65e-02,+2.24e-01 2 -137 GenVertex: -28 ID: 0 (X,cT):0 I: 1 60 -323 -1.01e-01,+5.65e-03,+1.73e-01,+8.22e-01 2 -28 - O: 2 221 -311 -8.28e-02,+1.40e-01,+2.87e-01,+5.97e-01 2 -138 - 222 -211 -1.84e-02,-1.34e-01,-1.14e-01,+2.25e-01 1 (nil) + O: 2 222 -211 -1.84e-02,-1.34e-01,-1.14e-01,+2.25e-01 1 + 221 -311 -8.28e-02,+1.40e-01,+2.87e-01,+5.97e-01 2 -138 GenVertex: -29 ID: 0 (X,cT):0 I: 1 61 313 -7.71e-02,+3.71e-01,+6.58e-01,+1.14e+00 2 -29 - O: 2 223 321 -1.86e-02,+1.84e-02,+1.85e-01,+5.28e-01 1 (nil) - 224 -211 -5.85e-02,+3.52e-01,+4.73e-01,+6.09e-01 1 (nil) + O: 2 223 321 -1.86e-02,+1.84e-02,+1.85e-01,+5.28e-01 1 + 224 -211 -5.85e-02,+3.52e-01,+4.73e-01,+6.09e-01 1 GenVertex: -30 ID: 0 (X,cT):0 I: 1 62 213 -3.58e-01,-1.85e-01,+2.02e-01,+7.59e-01 2 -30 - O: 2 225 211 +1.06e-01,-2.99e-02,+1.77e-01,+2.51e-01 1 (nil) + O: 2 225 211 +1.06e-01,-2.99e-02,+1.77e-01,+2.51e-01 1 226 111 -4.64e-01,-1.55e-01,+2.53e-02,+5.08e-01 2 -139 GenVertex: -31 ID: 0 (X,cT):0 I: 1 63 221 +5.37e-01,+2.24e-01,+7.68e+00,+7.72e+00 2 -31 - O: 3 227 22 +9.24e-02,+1.22e-01,+1.51e+00,+1.52e+00 1 (nil) - 228 -211 +1.64e-01,-1.14e-01,+3.22e+00,+3.23e+00 1 (nil) - 229 211 +2.81e-01,+2.16e-01,+2.94e+00,+2.97e+00 1 (nil) + O: 3 229 211 +2.81e-01,+2.16e-01,+2.94e+00,+2.97e+00 1 + 227 22 +9.24e-02,+1.22e-01,+1.51e+00,+1.52e+00 1 + 228 -211 +1.64e-01,-1.14e-01,+3.22e+00,+3.23e+00 1 GenVertex: -32 ID: 0 (X,cT):0 I: 1 64 -213 -3.57e-01,-2.47e-01,+4.39e+00,+4.44e+00 2 -32 - O: 2 230 -211 -3.46e-01,-7.92e-02,+3.34e+00,+3.37e+00 1 (nil) + O: 2 230 -211 -3.46e-01,-7.92e-02,+3.34e+00,+3.37e+00 1 231 111 -1.13e-02,-1.68e-01,+1.05e+00,+1.07e+00 2 -140 GenVertex: -33 ID: 0 (X,cT):0 I: 1 66 -213 +3.60e-01,-1.91e-02,+2.45e+01,+2.45e+01 2 -33 - O: 2 232 -211 +2.45e-01,+2.11e-01,+2.06e+01,+2.06e+01 1 (nil) + O: 2 232 -211 +2.45e-01,+2.11e-01,+2.06e+01,+2.06e+01 1 233 111 +1.15e-01,-2.30e-01,+3.89e+00,+3.90e+00 2 -141 GenVertex: -34 ID: 0 (X,cT):0 I: 1 67 113 -3.73e-01,+1.18e-02,+3.83e+01,+3.84e+01 2 -34 - O: 2 234 -211 +1.07e-02,+2.95e-01,+1.86e+01,+1.86e+01 1 (nil) - 235 211 -3.83e-01,-2.83e-01,+1.98e+01,+1.98e+01 1 (nil) + O: 2 234 -211 +1.07e-02,+2.95e-01,+1.86e+01,+1.86e+01 1 + 235 211 -3.83e-01,-2.83e-01,+1.98e+01,+1.98e+01 1 GenVertex: -35 ID: 0 (X,cT):0 I: 1 68 113 -9.06e-02,+1.63e-01,+1.67e+02,+1.67e+02 2 -35 - O: 2 236 211 -2.00e-02,-2.69e-01,+6.04e+01,+6.04e+01 1 (nil) - 237 -211 -7.06e-02,+4.32e-01,+1.07e+02,+1.07e+02 1 (nil) + O: 2 236 211 -2.00e-02,-2.69e-01,+6.04e+01,+6.04e+01 1 + 237 -211 -7.06e-02,+4.32e-01,+1.07e+02,+1.07e+02 1 GenVertex: -36 ID: 0 (X,cT):0 I: 1 69 221 +1.73e-01,+4.07e-01,+2.06e+02,+2.06e+02 2 -36 - O: 3 238 211 +2.30e-02,+1.07e-01,+4.89e+01,+4.89e+01 1 (nil) - 239 -211 +1.52e-01,+2.49e-01,+1.36e+02,+1.36e+02 1 (nil) + O: 3 238 211 +2.30e-02,+1.07e-01,+4.89e+01,+4.89e+01 1 + 239 -211 +1.52e-01,+2.49e-01,+1.36e+02,+1.36e+02 1 240 111 -1.84e-03,+5.13e-02,+2.10e+01,+2.10e+01 2 -142 GenVertex: -37 ID: 0 (X,cT):0 I: 1 71 423 +6.74e+00,-3.13e+00,-1.81e+01,+1.96e+01 2 -37 @@ -802,85 +921,85 @@ GenVertex: -37 ID: 0 (X,cT):0 242 111 +4.94e-01,-2.63e-01,-1.28e+00,+1.40e+00 2 -144 GenVertex: -38 ID: 0 (X,cT):0 I: 1 72 213 +1.08e+00,-6.60e-01,-2.31e+00,+2.70e+00 2 -38 - O: 2 243 211 +2.70e-01,-4.65e-01,-9.32e-01,+1.08e+00 1 (nil) + O: 2 243 211 +2.70e-01,-4.65e-01,-9.32e-01,+1.08e+00 1 244 111 +8.10e-01,-1.96e-01,-1.38e+00,+1.62e+00 2 -145 GenVertex: -39 ID: 0 (X,cT):0 I: 1 73 331 +8.84e-01,-9.17e-01,-1.33e+00,+2.07e+00 2 -39 - O: 3 245 211 +4.27e-01,-3.13e-01,-3.45e-01,+6.47e-01 1 (nil) - 246 -211 +6.70e-02,-6.53e-02,-1.12e-01,+2.02e-01 1 (nil) + O: 3 245 211 +4.27e-01,-3.13e-01,-3.45e-01,+6.47e-01 1 + 246 -211 +6.70e-02,-6.53e-02,-1.12e-01,+2.02e-01 1 247 221 +3.89e-01,-5.39e-01,-8.71e-01,+1.22e+00 2 -146 GenVertex: -40 ID: 0 (X,cT):0 I: 1 74 -213 +1.67e+00,-6.02e-01,-4.33e+00,+4.71e+00 2 -40 - O: 2 248 -211 +8.95e-01,-3.43e-01,-1.67e+00,+1.93e+00 1 (nil) + O: 2 248 -211 +8.95e-01,-3.43e-01,-1.67e+00,+1.93e+00 1 249 111 +7.72e-01,-2.59e-01,-2.66e+00,+2.78e+00 2 -147 Vertex: -41 ID: 0 (X,cT)=-1.15e-05,-2.74e-06,-5.60e-05,+5.77e-05 I: 1 75 111 -2.29e-01,-5.45e-02,-1.11e+00,+1.15e+00 2 -41 - O: 2 250 22 -1.87e-01,-7.34e-02,-6.48e-01,+6.78e-01 1 (nil) - 251 22 -4.27e-02,+1.89e-02,-4.65e-01,+4.68e-01 1 (nil) + O: 2 250 22 -1.87e-01,-7.34e-02,-6.48e-01,+6.78e-01 1 + 251 22 -4.27e-02,+1.89e-02,-4.65e-01,+4.68e-01 1 Vertex: -42 ID: 0 (X,cT)=-9.58e+00,-4.54e+00,+3.08e+02,+3.22e+02 I: 1 79 3112 -1.25e-01,-5.92e-02,+4.02e+00,+4.19e+00 2 -42 - O: 2 252 2112 +2.35e-02,-7.71e-02,+3.69e+00,+3.81e+00 1 (nil) - 253 -211 -1.48e-01,+1.79e-02,+3.30e-01,+3.88e-01 1 (nil) + O: 2 252 2112 +2.35e-02,-7.71e-02,+3.69e+00,+3.81e+00 1 + 253 -211 -1.48e-01,+1.79e-02,+3.30e-01,+3.88e-01 1 GenVertex: -43 ID: 0 (X,cT):0 I: 1 80 311 -1.08e-01,-3.01e-02,+1.70e+00,+1.77e+00 2 -43 O: 1 254 310 -1.08e-01,-3.01e-02,+1.70e+00,+1.77e+00 2 -148 GenVertex: -44 ID: 0 (X,cT):0 I: 1 81 -1114 -5.93e-01,-4.62e-01,+7.53e+00,+7.69e+00 2 -44 - O: 2 255 -2112 -7.16e-01,-5.94e-01,+6.69e+00,+6.82e+00 1 (nil) - 256 211 +1.23e-01,+1.32e-01,+8.42e-01,+8.72e-01 1 (nil) + O: 2 255 -2112 -7.16e-01,-5.94e-01,+6.69e+00,+6.82e+00 1 + 256 211 +1.23e-01,+1.32e-01,+8.42e-01,+8.72e-01 1 GenVertex: -45 ID: 0 (X,cT):0 I: 1 84 -213 -1.27e-01,-1.01e-01,+5.15e+00,+5.19e+00 2 -45 - O: 2 257 -211 +1.09e-01,-2.00e-01,+3.92e+00,+3.93e+00 1 (nil) + O: 2 257 -211 +1.09e-01,-2.00e-01,+3.92e+00,+3.93e+00 1 258 111 -2.36e-01,+9.89e-02,+1.22e+00,+1.25e+00 2 -149 GenVertex: -46 ID: 0 (X,cT):0 I: 1 85 213 -1.20e+00,-1.22e-01,+2.34e+01,+2.35e+01 2 -46 - O: 2 259 211 -9.25e-02,+6.68e-02,+1.06e+00,+1.07e+00 1 (nil) + O: 2 259 211 -9.25e-02,+6.68e-02,+1.06e+00,+1.07e+00 1 260 111 -1.11e+00,-1.89e-01,+2.24e+01,+2.24e+01 2 -150 GenVertex: -47 ID: 0 (X,cT):0 I: 1 86 223 -7.42e-02,+1.42e-01,+1.52e+01,+1.52e+01 2 -47 - O: 3 261 211 -8.80e-02,-1.85e-01,+7.90e+00,+7.90e+00 1 (nil) - 262 -211 -9.38e-02,+7.23e-02,+3.34e+00,+3.35e+00 1 (nil) + O: 3 261 211 -8.80e-02,-1.85e-01,+7.90e+00,+7.90e+00 1 + 262 -211 -9.38e-02,+7.23e-02,+3.34e+00,+3.35e+00 1 263 111 +1.08e-01,+2.55e-01,+3.93e+00,+3.94e+00 2 -151 GenVertex: -48 ID: 0 (X,cT):0 I: 1 87 -213 -9.01e-01,-6.04e-01,+2.49e+01,+2.49e+01 2 -48 - O: 2 264 -211 -5.80e-01,-4.05e-01,+2.11e+01,+2.11e+01 1 (nil) + O: 2 264 -211 -5.80e-01,-4.05e-01,+2.11e+01,+2.11e+01 1 265 111 -3.21e-01,-1.99e-01,+3.80e+00,+3.82e+00 2 -152 GenVertex: -49 ID: 0 (X,cT):0 I: 1 88 323 -3.96e-01,+4.77e-01,+8.35e+01,+8.35e+01 2 -49 - O: 2 266 321 -2.79e-01,+6.38e-01,+6.43e+01,+6.43e+01 1 (nil) + O: 2 266 321 -2.79e-01,+6.38e-01,+6.43e+01,+6.43e+01 1 267 111 -1.18e-01,-1.61e-01,+1.92e+01,+1.92e+01 2 -153 GenVertex: -50 ID: 0 (X,cT):0 I: 1 89 -313 -1.18e+00,+4.38e-01,+2.34e+02,+2.34e+02 2 -50 - O: 2 268 -321 -8.94e-01,+2.08e-02,+1.54e+02,+1.54e+02 1 (nil) - 269 211 -2.85e-01,+4.17e-01,+8.01e+01,+8.01e+01 1 (nil) + O: 2 268 -321 -8.94e-01,+2.08e-02,+1.54e+02,+1.54e+02 1 + 269 211 -2.85e-01,+4.17e-01,+8.01e+01,+8.01e+01 1 Vertex: -51 ID: 0 (X,cT)=-6.60e-06,+4.63e-05,+6.91e-03,+6.91e-03 I: 1 90 111 -2.10e-02,+1.47e-01,+2.20e+01,+2.20e+01 2 -51 - O: 2 270 22 +3.30e-03,+1.38e-01,+2.13e+01,+2.13e+01 1 (nil) - 271 22 -2.43e-02,+9.55e-03,+7.24e-01,+7.25e-01 1 (nil) + O: 2 270 22 +3.30e-03,+1.38e-01,+2.13e+01,+2.13e+01 1 + 271 22 -2.43e-02,+9.55e-03,+7.24e-01,+7.25e-01 1 GenVertex: -52 ID: 0 (X,cT):0 I: 1 91 -213 -1.47e+00,+1.82e+00,+3.92e+02,+3.92e+02 2 -52 - O: 2 272 -211 -2.85e-01,+9.40e-01,+1.43e+02,+1.43e+02 1 (nil) + O: 2 272 -211 -2.85e-01,+9.40e-01,+1.43e+02,+1.43e+02 1 273 111 -1.19e+00,+8.85e-01,+2.49e+02,+2.49e+02 2 -154 GenVertex: -53 ID: 0 (X,cT):0 I: 1 92 213 +1.75e+00,+1.50e+00,+6.91e+02,+6.91e+02 2 -53 - O: 2 274 211 +1.79e+00,+1.29e+00,+6.18e+02,+6.18e+02 1 (nil) + O: 2 274 211 +1.79e+00,+1.29e+00,+6.18e+02,+6.18e+02 1 275 111 -3.94e-02,+2.10e-01,+7.29e+01,+7.29e+01 2 -155 Vertex: -54 ID: 0 (X,cT)=+1.07e-04,+5.79e-05,+2.54e-02,+2.54e-02 I: 1 94 111 +7.06e-01,+3.83e-01,+1.68e+02,+1.68e+02 2 -54 - O: 2 276 22 +2.50e-01,+1.51e-01,+4.86e+01,+4.86e+01 1 (nil) - 277 22 +4.56e-01,+2.32e-01,+1.20e+02,+1.20e+02 1 (nil) + O: 2 276 22 +2.50e-01,+1.51e-01,+4.86e+01,+4.86e+01 1 + 277 22 +4.56e-01,+2.32e-01,+1.20e+02,+1.20e+02 1 GenVertex: -55 ID: 0 (X,cT):0 I: 1 95 223 +1.83e-01,+6.58e-01,+2.64e+02,+2.64e+02 2 -55 - O: 3 278 211 +2.62e-01,+6.67e-02,+8.45e+01,+8.45e+01 1 (nil) - 279 -211 +3.03e-02,+5.27e-01,+1.40e+02,+1.40e+02 1 (nil) + O: 3 278 211 +2.62e-01,+6.67e-02,+8.45e+01,+8.45e+01 1 + 279 -211 +3.03e-02,+5.27e-01,+1.40e+02,+1.40e+02 1 280 111 -1.09e-01,+6.39e-02,+3.93e+01,+3.93e+01 2 -156 GenVertex: -56 ID: 0 (X,cT):0 I: 1 96 113 +1.17e+00,-6.49e-01,+1.09e+02,+1.09e+02 2 -56 - O: 2 281 -211 +1.05e+00,-3.90e-01,+9.92e+01,+9.92e+01 1 (nil) - 282 211 +1.20e-01,-2.59e-01,+1.03e+01,+1.03e+01 1 (nil) + O: 2 281 -211 +1.05e+00,-3.90e-01,+9.92e+01,+9.92e+01 1 + 282 211 +1.20e-01,-2.59e-01,+1.03e+01,+1.03e+01 1 GenVertex: -57 ID: 0 (X,cT):0 I: 1 97 213 -3.59e-02,+9.92e-01,+3.73e+01,+3.74e+01 2 -57 - O: 2 283 211 -1.62e-01,+3.10e-02,+2.19e+00,+2.20e+00 1 (nil) + O: 2 283 211 -1.62e-01,+3.10e-02,+2.19e+00,+2.20e+00 1 284 111 +1.27e-01,+9.61e-01,+3.52e+01,+3.52e+01 2 -157 GenVertex: -58 ID: 0 (X,cT):0 I: 1 98 221 +4.22e-01,+3.30e-01,+8.56e+00,+8.60e+00 2 -58 @@ -889,96 +1008,96 @@ GenVertex: -58 ID: 0 (X,cT):0 287 111 +5.73e-02,+1.07e-02,+3.27e+00,+3.27e+00 2 -160 GenVertex: -59 ID: 0 (X,cT):0 I: 1 99 -213 +9.75e-01,+2.54e+00,+3.20e+01,+3.22e+01 2 -59 - O: 2 288 -211 +5.56e-01,+1.36e+00,+1.23e+01,+1.24e+01 1 (nil) + O: 2 288 -211 +5.56e-01,+1.36e+00,+1.23e+01,+1.24e+01 1 289 111 +4.18e-01,+1.18e+00,+1.97e+01,+1.98e+01 2 -161 Vertex: -60 ID: 0 (X,cT)=+3.89e-05,+1.80e-05,+5.58e-04,+5.60e-04 I: 1 100 111 +1.28e+00,+5.91e-01,+1.83e+01,+1.84e+01 2 -60 - O: 2 290 22 +1.23e+00,+5.60e-01,+1.78e+01,+1.79e+01 1 (nil) - 291 22 +5.03e-02,+3.14e-02,+4.95e-01,+4.99e-01 1 (nil) + O: 2 290 22 +1.23e+00,+5.60e-01,+1.78e+01,+1.79e+01 1 + 291 22 +5.03e-02,+3.14e-02,+4.95e-01,+4.99e-01 1 GenVertex: -61 ID: 0 (X,cT):0 I: 1 101 331 +1.59e+00,+2.22e+00,+3.03e+01,+3.04e+01 2 -61 - O: 3 292 211 +3.32e-01,+2.48e-01,+4.45e+00,+4.47e+00 1 (nil) - 293 -211 +3.06e-01,+6.92e-01,+8.24e+00,+8.28e+00 1 (nil) + O: 3 292 211 +3.32e-01,+2.48e-01,+4.45e+00,+4.47e+00 1 + 293 -211 +3.06e-01,+6.92e-01,+8.24e+00,+8.28e+00 1 294 221 +9.56e-01,+1.28e+00,+1.76e+01,+1.77e+01 2 -162 GenVertex: -62 ID: 0 (X,cT):0 I: 1 102 213 +1.77e+00,-1.58e+00,+1.71e+01,+1.73e+01 2 -62 - O: 2 295 211 +8.03e-02,+2.02e-02,+5.69e-01,+5.92e-01 1 (nil) + O: 2 295 211 +8.03e-02,+2.02e-02,+5.69e-01,+5.92e-01 1 296 111 +1.69e+00,-1.60e+00,+1.65e+01,+1.67e+01 2 -163 GenVertex: -63 ID: 0 (X,cT):0 I: 1 105 311 +6.37e-01,-2.90e-01,+6.13e+00,+6.19e+00 2 -63 O: 1 297 310 +6.37e-01,-2.90e-01,+6.13e+00,+6.19e+00 2 -164 GenVertex: -64 ID: 0 (X,cT):0 I: 1 106 333 +8.72e-02,-2.03e+00,+7.62e+00,+7.95e+00 2 -64 - O: 2 298 130 +1.44e-01,-1.08e+00,+4.20e+00,+4.37e+00 1 (nil) + O: 2 298 130 +1.44e-01,-1.08e+00,+4.20e+00,+4.37e+00 1 299 310 -5.64e-02,-9.48e-01,+3.42e+00,+3.58e+00 2 -165 GenVertex: -65 ID: 0 (X,cT):0 I: 1 107 -323 -1.98e-01,-1.55e-01,+2.64e+00,+2.79e+00 2 -65 - O: 2 300 -321 -2.21e-01,+1.56e-01,+1.65e+00,+1.74e+00 1 (nil) + O: 2 300 -321 -2.21e-01,+1.56e-01,+1.65e+00,+1.74e+00 1 301 111 +2.32e-02,-3.11e-01,+9.92e-01,+1.05e+00 2 -166 GenVertex: -66 ID: 0 (X,cT):0 I: 1 108 113 -1.10e+00,-1.90e+00,+5.32e+00,+5.81e+00 2 -66 - O: 2 302 -211 -1.16e+00,-1.76e+00,+5.02e+00,+5.45e+00 1 (nil) - 303 211 +5.82e-02,-1.40e-01,+3.02e-01,+3.65e-01 1 (nil) + O: 2 302 -211 -1.16e+00,-1.76e+00,+5.02e+00,+5.45e+00 1 + 303 211 +5.82e-02,-1.40e-01,+3.02e-01,+3.65e-01 1 GenVertex: -67 ID: 0 (X,cT):0 I: 1 109 213 -7.23e-01,-7.70e-01,+6.13e-01,+1.63e+00 2 -67 - O: 2 304 211 +1.49e-03,+1.26e-01,-1.51e-01,+2.41e-01 1 (nil) + O: 2 304 211 +1.49e-03,+1.26e-01,-1.51e-01,+2.41e-01 1 305 111 -7.25e-01,-8.95e-01,+7.64e-01,+1.39e+00 2 -167 GenVertex: -68 ID: 0 (X,cT):0 I: 1 111 213 -5.97e-01,-1.22e+00,+2.67e-01,+1.55e+00 2 -68 - O: 2 306 211 +1.06e-01,-2.72e-01,-4.01e-02,+3.26e-01 1 (nil) + O: 2 306 211 +1.06e-01,-2.72e-01,-4.01e-02,+3.26e-01 1 307 111 -7.03e-01,-9.49e-01,+3.08e-01,+1.23e+00 2 -168 Vertex: -69 ID: 0 (X,cT)=+1.27e-05,-7.07e-05,+1.82e-05,+8.39e-05 I: 1 113 111 +4.36e-02,-2.43e-01,+6.27e-02,+2.89e-01 2 -69 - O: 2 308 22 +5.40e-02,-1.99e-02,+1.91e-02,+6.07e-02 1 (nil) - 309 22 -1.04e-02,-2.23e-01,+4.36e-02,+2.28e-01 1 (nil) + O: 2 308 22 +5.40e-02,-1.99e-02,+1.91e-02,+6.07e-02 1 + 309 22 -1.04e-02,-2.23e-01,+4.36e-02,+2.28e-01 1 GenVertex: -70 ID: 0 (X,cT):0 I: 1 114 213 -1.15e+00,-1.72e+00,-2.01e+00,+2.97e+00 2 -70 - O: 2 310 211 -4.37e-02,-6.49e-02,-3.59e-02,+1.64e-01 1 (nil) + O: 2 310 211 -4.37e-02,-6.49e-02,-3.59e-02,+1.64e-01 1 311 111 -1.10e+00,-1.65e+00,-1.97e+00,+2.80e+00 2 -169 GenVertex: -71 ID: 0 (X,cT):0 I: 1 115 -213 -9.95e-01,-3.87e-01,-1.11e+00,+1.63e+00 2 -71 - O: 2 312 -211 -7.40e-01,-4.72e-01,-9.20e-01,+1.28e+00 1 (nil) + O: 2 312 -211 -7.40e-01,-4.72e-01,-9.20e-01,+1.28e+00 1 313 111 -2.55e-01,+8.51e-02,-1.87e-01,+3.54e-01 2 -170 GenVertex: -72 ID: 0 (X,cT):0 I: 1 119 311 -2.88e-01,+7.23e-01,-1.33e+00,+1.62e+00 2 -72 O: 1 314 310 -2.88e-01,+7.23e-01,-1.33e+00,+1.62e+00 2 -171 GenVertex: -73 ID: 0 (X,cT):0 I: 1 121 113 -2.01e-02,+9.67e-01,-2.76e+00,+3.05e+00 2 -73 - O: 2 315 -211 -5.02e-03,+1.03e+00,-2.68e+00,+2.88e+00 1 (nil) - 316 211 -1.50e-02,-6.21e-02,-7.50e-02,+1.71e-01 1 (nil) + O: 2 315 -211 -5.02e-03,+1.03e+00,-2.68e+00,+2.88e+00 1 + 316 211 -1.50e-02,-6.21e-02,-7.50e-02,+1.71e-01 1 GenVertex: -74 ID: 0 (X,cT):0 I: 1 122 213 +6.99e-01,+4.88e-01,-2.14e+00,+2.37e+00 2 -74 - O: 2 317 211 +2.31e-01,+4.39e-01,-1.27e+00,+1.37e+00 1 (nil) + O: 2 317 211 +2.31e-01,+4.39e-01,-1.27e+00,+1.37e+00 1 318 111 +4.68e-01,+4.92e-02,-8.74e-01,+1.00e+00 2 -172 GenVertex: -75 ID: 0 (X,cT):0 I: 1 123 223 +1.59e-01,-2.33e-01,-7.42e+00,+7.46e+00 2 -75 - O: 2 319 -211 +2.57e-01,+5.62e-02,-5.93e+00,+5.93e+00 1 (nil) - 320 211 -9.87e-02,-2.90e-01,-1.49e+00,+1.53e+00 1 (nil) + O: 2 319 -211 +2.57e-01,+5.62e-02,-5.93e+00,+5.93e+00 1 + 320 211 -9.87e-02,-2.90e-01,-1.49e+00,+1.53e+00 1 GenVertex: -76 ID: 0 (X,cT):0 I: 1 124 223 -3.07e-01,+5.68e-01,-1.77e+01,+1.77e+01 2 -76 - O: 2 321 -211 -1.81e-01,+2.32e-01,-1.48e+01,+1.48e+01 1 (nil) - 322 211 -1.26e-01,+3.36e-01,-2.88e+00,+2.90e+00 1 (nil) + O: 2 321 -211 -1.81e-01,+2.32e-01,-1.48e+01,+1.48e+01 1 + 322 211 -1.26e-01,+3.36e-01,-2.88e+00,+2.90e+00 1 GenVertex: -77 ID: 0 (X,cT):0 I: 1 125 1114 +7.70e-01,-3.47e-01,-1.94e+02,+1.94e+02 2 -77 - O: 2 323 2112 +6.85e-01,-3.51e-01,-1.63e+02,+1.63e+02 1 (nil) - 324 -211 +8.47e-02,+3.52e-03,-3.06e+01,+3.06e+01 1 (nil) + O: 2 323 2112 +6.85e-01,-3.51e-01,-1.63e+02,+1.63e+02 1 + 324 -211 +8.47e-02,+3.52e-03,-3.06e+01,+3.06e+01 1 Vertex: -78 ID: 0 (X,cT)=+9.27e-06,+2.22e-05,-1.58e-03,+1.58e-03 I: 1 126 111 +6.52e-01,+1.56e+00,-1.11e+02,+1.11e+02 2 -78 - O: 2 325 22 +6.52e-01,+1.50e+00,-1.08e+02,+1.08e+02 1 (nil) - 326 22 -1.55e-04,+6.21e-02,-3.67e+00,+3.67e+00 1 (nil) + O: 2 325 22 +6.52e-01,+1.50e+00,-1.08e+02,+1.08e+02 1 + 326 22 -1.55e-04,+6.21e-02,-3.67e+00,+3.67e+00 1 GenVertex: -79 ID: 0 (X,cT):0 I: 1 130 113 +7.74e-01,+8.64e-01,-8.89e+01,+8.89e+01 2 -79 - O: 2 327 -211 +6.68e-01,+7.08e-01,-4.84e+01,+4.84e+01 1 (nil) - 328 211 +1.06e-01,+1.56e-01,-4.05e+01,+4.05e+01 1 (nil) + O: 2 327 -211 +6.68e-01,+7.08e-01,-4.84e+01,+4.84e+01 1 + 328 211 +1.06e-01,+1.56e-01,-4.05e+01,+4.05e+01 1 GenVertex: -80 ID: 0 (X,cT):0 I: 1 131 223 +1.70e-02,+2.83e-01,-9.69e+01,+9.69e+01 2 -80 - O: 3 329 211 -1.62e-01,+5.36e-02,-3.29e+01,+3.29e+01 1 (nil) - 330 -211 +6.38e-02,-3.43e-02,-4.30e+01,+4.30e+01 1 (nil) + O: 3 329 211 -1.62e-01,+5.36e-02,-3.29e+01,+3.29e+01 1 + 330 -211 +6.38e-02,-3.43e-02,-4.30e+01,+4.30e+01 1 331 111 +1.15e-01,+2.64e-01,-2.11e+01,+2.11e+01 2 -173 GenVertex: -81 ID: 0 (X,cT):0 I: 1 132 223 +3.02e-01,+2.43e-01,-3.21e+01,+3.21e+01 2 -81 - O: 3 332 -211 +5.67e-02,-4.99e-02,-1.78e+01,+1.78e+01 1 (nil) - 333 211 +8.54e-02,+2.91e-01,-8.16e+00,+8.17e+00 1 (nil) + O: 3 332 -211 +5.67e-02,-4.99e-02,-1.78e+01,+1.78e+01 1 + 333 211 +8.54e-02,+2.91e-01,-8.16e+00,+8.17e+00 1 334 111 +1.60e-01,+1.64e-03,-6.16e+00,+6.16e+00 2 -174 GenVertex: -82 ID: 0 (X,cT):0 I: 1 133 221 +6.52e-01,-1.30e-02,-7.49e+00,+7.53e+00 2 -82 @@ -987,123 +1106,123 @@ GenVertex: -82 ID: 0 (X,cT):0 337 111 +4.06e-02,+5.17e-03,-1.02e+00,+1.02e+00 2 -177 GenVertex: -83 ID: 0 (X,cT):0 I: 1 134 213 +1.25e+00,+2.45e+00,-3.91e+01,+3.93e+01 2 -83 - O: 2 338 211 +6.58e-01,+5.66e-01,-1.72e+01,+1.72e+01 1 (nil) + O: 2 338 211 +6.58e-01,+5.66e-01,-1.72e+01,+1.72e+01 1 339 111 +5.88e-01,+1.89e+00,-2.20e+01,+2.20e+01 2 -178 GenVertex: -84 ID: 0 (X,cT):0 I: 1 135 221 +8.86e-01,+9.16e-01,-1.24e+01,+1.25e+01 2 -84 - O: 2 340 22 +6.66e-01,+6.36e-01,-6.31e+00,+6.38e+00 1 (nil) - 341 22 +2.20e-01,+2.80e-01,-6.11e+00,+6.12e+00 1 (nil) + O: 2 340 22 +6.66e-01,+6.36e-01,-6.31e+00,+6.38e+00 1 + 341 22 +2.20e-01,+2.80e-01,-6.11e+00,+6.12e+00 1 Vertex: -85 ID: 0 (X,cT)=+3.02e-04,+4.87e-04,-5.38e-03,+5.41e-03 I: 1 137 111 +7.22e-01,+1.16e+00,-1.29e+01,+1.29e+01 2 -85 - O: 2 342 22 +5.79e-02,+1.36e-01,-1.76e+00,+1.76e+00 1 (nil) - 343 22 +6.65e-01,+1.03e+00,-1.11e+01,+1.12e+01 1 (nil) + O: 2 342 22 +5.79e-02,+1.36e-01,-1.76e+00,+1.76e+00 1 + 343 22 +6.65e-01,+1.03e+00,-1.11e+01,+1.12e+01 1 GenVertex: -86 ID: 0 (X,cT):0 I: 1 138 113 +1.21e+00,+1.68e+00,-1.89e+01,+1.90e+01 2 -86 - O: 2 344 -211 +4.13e-01,+1.29e-01,-3.64e+00,+3.67e+00 1 (nil) - 345 211 +8.01e-01,+1.55e+00,-1.52e+01,+1.53e+01 1 (nil) + O: 2 344 -211 +4.13e-01,+1.29e-01,-3.64e+00,+3.67e+00 1 + 345 211 +8.01e-01,+1.55e+00,-1.52e+01,+1.53e+01 1 GenVertex: -87 ID: 0 (X,cT):0 I: 1 140 -213 +4.58e-01,+1.15e+00,-1.84e+01,+1.85e+01 2 -87 - O: 2 346 -211 +4.43e-01,+4.32e-01,-3.36e+00,+3.42e+00 1 (nil) + O: 2 346 -211 +4.43e-01,+4.32e-01,-3.36e+00,+3.42e+00 1 347 111 +1.51e-02,+7.22e-01,-1.51e+01,+1.51e+01 2 -179 GenVertex: -88 ID: 0 (X,cT):0 I: 1 141 213 +2.08e+00,+1.68e+00,-2.61e+01,+2.63e+01 2 -88 - O: 2 348 211 +2.03e+00,+1.63e+00,-2.51e+01,+2.52e+01 1 (nil) + O: 2 348 211 +2.03e+00,+1.63e+00,-2.51e+01,+2.52e+01 1 349 111 +5.56e-02,+5.31e-02,-1.06e+00,+1.07e+00 2 -180 GenVertex: -89 ID: 0 (X,cT):0 I: 1 142 313 +1.78e+00,+1.24e+00,-2.26e+01,+2.27e+01 2 -89 - O: 2 350 321 +5.53e-01,+4.44e-01,-6.45e+00,+6.51e+00 1 (nil) - 351 -211 +1.23e+00,+7.92e-01,-1.62e+01,+1.62e+01 1 (nil) + O: 2 350 321 +5.53e-01,+4.44e-01,-6.45e+00,+6.51e+00 1 + 351 -211 +1.23e+00,+7.92e-01,-1.62e+01,+1.62e+01 1 GenVertex: -90 ID: 0 (X,cT):0 I: 1 143 -313 +1.42e+00,+6.47e-01,-1.81e+01,+1.82e+01 2 -90 O: 2 352 -311 +4.98e-01,+5.10e-01,-7.52e+00,+7.57e+00 2 -181 353 111 +9.21e-01,+1.38e-01,-1.06e+01,+1.06e+01 2 -182 GenVertex: -91 ID: 0 (X,cT):0 I: 1 145 -213 -5.75e-01,-4.78e-01,-9.45e+01,+9.45e+01 2 -91 - O: 2 354 -211 -4.16e-01,-6.42e-04,-4.57e+01,+4.57e+01 1 (nil) + O: 2 354 -211 -4.16e-01,-6.42e-04,-4.57e+01,+4.57e+01 1 355 111 -1.59e-01,-4.77e-01,-4.88e+01,+4.88e+01 2 -183 GenVertex: -92 ID: 0 (X,cT):0 I: 1 146 -1114 -8.04e-01,-7.43e-01,-3.40e+01,+3.40e+01 2 -92 - O: 2 356 -2112 -5.09e-01,-4.51e-01,-2.85e+01,+2.85e+01 1 (nil) - 357 211 -2.95e-01,-2.92e-01,-5.48e+00,+5.50e+00 1 (nil) + O: 2 356 -2112 -5.09e-01,-4.51e-01,-2.85e+01,+2.85e+01 1 + 357 211 -2.95e-01,-2.92e-01,-5.48e+00,+5.50e+00 1 GenVertex: -93 ID: 0 (X,cT):0 I: 1 147 -213 -1.80e-01,+6.29e-02,-4.32e+01,+4.32e+01 2 -93 - O: 2 358 -211 -2.49e-01,+3.34e-01,-2.84e+01,+2.84e+01 1 (nil) + O: 2 358 -211 -2.49e-01,+3.34e-01,-2.84e+01,+2.84e+01 1 359 111 +6.89e-02,-2.71e-01,-1.49e+01,+1.49e+01 2 -184 GenVertex: -94 ID: 0 (X,cT):0 I: 1 149 311 -1.41e+00,-2.18e+00,-7.90e+01,+7.90e+01 2 -94 - O: 1 360 130 -1.41e+00,-2.18e+00,-7.90e+01,+7.90e+01 1 (nil) + O: 1 360 130 -1.41e+00,-2.18e+00,-7.90e+01,+7.90e+01 1 GenVertex: -95 ID: 0 (X,cT):0 I: 1 150 -323 -3.04e-01,-3.92e-01,-7.88e+01,+7.88e+01 2 -95 - O: 2 361 -321 -3.90e-02,+2.37e-02,-4.50e+01,+4.50e+01 1 (nil) + O: 2 361 -321 -3.90e-02,+2.37e-02,-4.50e+01,+4.50e+01 1 362 111 -2.65e-01,-4.16e-01,-3.38e+01,+3.38e+01 2 -185 GenVertex: -96 ID: 0 (X,cT):0 I: 1 151 213 -1.80e+00,-1.21e+00,-8.93e+01,+8.94e+01 2 -96 - O: 2 363 211 -1.88e+00,-1.09e+00,-8.20e+01,+8.20e+01 1 (nil) + O: 2 363 211 -1.88e+00,-1.09e+00,-8.20e+01,+8.20e+01 1 364 111 +7.55e-02,-1.18e-01,-7.35e+00,+7.36e+00 2 -186 GenVertex: -97 ID: 0 (X,cT):0 I: 1 152 113 +4.91e-01,-9.72e-01,-5.04e+01,+5.05e+01 2 -97 - O: 2 365 -211 +3.30e-01,-1.08e+00,-4.62e+01,+4.62e+01 1 (nil) - 366 211 +1.61e-01,+1.05e-01,-4.23e+00,+4.23e+00 1 (nil) + O: 2 365 -211 +3.30e-01,-1.08e+00,-4.62e+01,+4.62e+01 1 + 366 211 +1.61e-01,+1.05e-01,-4.23e+00,+4.23e+00 1 GenVertex: -98 ID: 0 (X,cT):0 I: 1 153 221 +2.67e-01,-2.61e-01,-2.16e+01,+2.16e+01 2 -98 - O: 2 367 22 -1.53e-01,-5.63e-02,-3.12e+00,+3.12e+00 1 (nil) - 368 22 +4.20e-01,-2.04e-01,-1.84e+01,+1.85e+01 1 (nil) + O: 2 367 22 -1.53e-01,-5.63e-02,-3.12e+00,+3.12e+00 1 + 368 22 +4.20e-01,-2.04e-01,-1.84e+01,+1.85e+01 1 GenVertex: -99 ID: 0 (X,cT):0 I: 1 154 311 +4.13e-01,+1.80e-01,-8.91e+01,+8.91e+01 2 -99 - O: 1 369 130 +4.13e-01,+1.80e-01,-8.91e+01,+8.91e+01 1 (nil) + O: 1 369 130 +4.13e-01,+1.80e-01,-8.91e+01,+8.91e+01 1 GenVertex: -100 ID: 0 (X,cT):0 I: 1 156 221 -4.10e-01,-2.74e-01,-4.88e+01,+4.88e+01 2 -100 - O: 3 370 211 -2.54e-01,-1.08e-01,-2.26e+01,+2.26e+01 1 (nil) - 371 -211 -9.47e-02,-7.03e-02,-6.26e+00,+6.26e+00 1 (nil) + O: 3 370 211 -2.54e-01,-1.08e-01,-2.26e+01,+2.26e+01 1 + 371 -211 -9.47e-02,-7.03e-02,-6.26e+00,+6.26e+00 1 372 111 -6.13e-02,-9.53e-02,-1.99e+01,+1.99e+01 2 -187 GenVertex: -101 ID: 0 (X,cT):0 I: 1 158 113 -8.56e-01,+4.51e-01,-3.86e+02,+3.86e+02 2 -101 - O: 2 373 211 -5.66e-01,+1.70e-01,-3.23e+02,+3.23e+02 1 (nil) - 374 -211 -2.90e-01,+2.81e-01,-6.32e+01,+6.32e+01 1 (nil) + O: 2 373 211 -5.66e-01,+1.70e-01,-3.23e+02,+3.23e+02 1 + 374 -211 -2.90e-01,+2.81e-01,-6.32e+01,+6.32e+01 1 GenVertex: -102 ID: 0 (X,cT):0 I: 1 160 2224 -1.90e-03,+7.51e-01,-1.39e+03,+1.39e+03 2 -102 - O: 2 375 2212 +9.56e-04,+8.62e-01,-1.17e+03,+1.17e+03 1 (nil) - 376 211 -2.86e-03,-1.12e-01,-2.17e+02,+2.17e+02 1 (nil) + O: 2 375 2212 +9.56e-04,+8.62e-01,-1.17e+03,+1.17e+03 1 + 376 211 -2.86e-03,-1.12e-01,-2.17e+02,+2.17e+02 1 GenVertex: -103 ID: 0 (X,cT):0 I: 1 163 223 -1.35e-02,+1.05e-01,+2.90e+00,+3.01e+00 2 -103 - O: 3 377 -211 +6.98e-02,+4.75e-02,+2.34e+00,+2.34e+00 1 (nil) - 378 211 -3.36e-03,-3.94e-02,+1.39e-01,+2.01e-01 1 (nil) + O: 3 377 -211 +6.98e-02,+4.75e-02,+2.34e+00,+2.34e+00 1 + 378 211 -3.36e-03,-3.94e-02,+1.39e-01,+2.01e-01 1 379 111 -7.99e-02,+9.68e-02,+4.23e-01,+4.62e-01 2 -188 GenVertex: -104 ID: 0 (X,cT):0 I: 1 164 -213 -7.67e-02,-1.58e-01,+2.83e+00,+2.94e+00 2 -104 - O: 2 380 -211 +2.46e-01,-2.54e-01,+9.52e-01,+1.02e+00 1 (nil) + O: 2 380 -211 +2.46e-01,-2.54e-01,+9.52e-01,+1.02e+00 1 381 111 -3.23e-01,+9.61e-02,+1.88e+00,+1.91e+00 2 -189 GenVertex: -105 ID: 0 (X,cT):0 I: 1 165 113 -3.96e-01,-2.46e-01,+7.66e+00,+7.72e+00 2 -105 - O: 2 382 -211 -4.58e-01,-1.09e-01,+2.26e+00,+2.31e+00 1 (nil) - 383 211 +6.19e-02,-1.38e-01,+5.40e+00,+5.41e+00 1 (nil) + O: 2 382 -211 -4.58e-01,-1.09e-01,+2.26e+00,+2.31e+00 1 + 383 211 +6.19e-02,-1.38e-01,+5.40e+00,+5.41e+00 1 GenVertex: -106 ID: 0 (X,cT):0 I: 1 166 223 +8.97e-02,-2.51e-02,+1.83e+01,+1.83e+01 2 -106 - O: 3 384 211 +1.54e-02,+2.33e-01,+6.44e+00,+6.45e+00 1 (nil) - 385 -211 -1.25e-01,-1.91e-01,+6.30e+00,+6.31e+00 1 (nil) + O: 3 384 211 +1.54e-02,+2.33e-01,+6.44e+00,+6.45e+00 1 + 385 -211 -1.25e-01,-1.91e-01,+6.30e+00,+6.31e+00 1 386 111 +1.99e-01,-6.72e-02,+5.57e+00,+5.57e+00 2 -190 GenVertex: -107 ID: 0 (X,cT):0 I: 1 167 331 +7.92e-02,-2.14e-01,+1.65e+01,+1.65e+01 2 -107 - O: 2 387 22 -3.78e-03,+6.83e-02,+3.46e-01,+3.53e-01 1 (nil) + O: 2 387 22 -3.78e-03,+6.83e-02,+3.46e-01,+3.53e-01 1 388 113 +8.30e-02,-2.83e-01,+1.61e+01,+1.61e+01 2 -191 GenVertex: -108 ID: 0 (X,cT):0 I: 1 169 113 -9.07e-02,+1.70e-01,+7.69e+00,+7.71e+00 2 -108 - O: 2 389 211 -1.47e-01,+1.94e-03,+5.31e+00,+5.31e+00 1 (nil) - 390 -211 +5.60e-02,+1.68e-01,+2.38e+00,+2.39e+00 1 (nil) + O: 2 389 211 -1.47e-01,+1.94e-03,+5.31e+00,+5.31e+00 1 + 390 -211 +5.60e-02,+1.68e-01,+2.38e+00,+2.39e+00 1 GenVertex: -109 ID: 0 (X,cT):0 I: 1 172 313 -9.79e-02,+5.68e-01,+7.20e+01,+7.20e+01 2 -109 - O: 2 391 321 +1.98e-01,+2.04e-01,+3.95e+01,+3.95e+01 1 (nil) - 392 -211 -2.96e-01,+3.65e-01,+3.25e+01,+3.25e+01 1 (nil) + O: 2 391 321 +1.98e-01,+2.04e-01,+3.95e+01,+3.95e+01 1 + 392 -211 -2.96e-01,+3.65e-01,+3.25e+01,+3.25e+01 1 GenVertex: -110 ID: 0 (X,cT):0 I: 1 173 -313 -1.30e-01,-7.96e-01,+2.37e+02,+2.37e+02 2 -110 - O: 2 393 -321 +8.77e-02,-3.77e-01,+1.73e+02,+1.73e+02 1 (nil) - 394 211 -2.18e-01,-4.20e-01,+6.41e+01,+6.41e+01 1 (nil) + O: 2 393 -321 +8.77e-02,-3.77e-01,+1.73e+02,+1.73e+02 1 + 394 211 -2.18e-01,-4.20e-01,+6.41e+01,+6.41e+01 1 Vertex: -111 ID: 0 (X,cT)=-3.81e+00,+2.43e+00,-3.67e+01,+3.70e+01 I: 1 177 -411 -2.64e+01,+1.68e+01,-2.54e+02,+2.56e+02 2 -111 - O: 4 395 13 -1.41e+00,+1.04e+00,-1.32e+01,+1.33e+01 1 (nil) - 396 -14 -1.31e+00,+1.05e+00,-1.23e+01,+1.24e+01 1 (nil) + O: 4 395 13 -1.41e+00,+1.04e+00,-1.32e+01,+1.33e+01 1 + 396 -14 -1.31e+00,+1.05e+00,-1.23e+01,+1.24e+01 1 397 323 -2.16e+01,+1.35e+01,-2.09e+02,+2.11e+02 2 -192 - 398 -211 -2.09e+00,+1.24e+00,-1.91e+01,+1.92e+01 1 (nil) + 398 -211 -2.09e+00,+1.24e+00,-1.91e+01,+1.92e+01 1 GenVertex: -112 ID: 0 (X,cT):0 I: 1 180 -313 -1.69e+00,+9.52e-01,-1.93e+01,+1.94e+01 2 -112 O: 2 399 -311 -4.47e-01,+3.05e-01,-6.33e+00,+6.37e+00 2 -193 @@ -1111,82 +1230,82 @@ GenVertex: -112 ID: 0 (X,cT):0 GenVertex: -113 ID: 0 (X,cT):0 I: 1 181 323 -1.07e+00,+1.14e+00,-1.19e+01,+1.20e+01 2 -113 O: 2 401 311 -9.33e-01,+9.63e-01,-1.12e+01,+1.13e+01 2 -195 - 402 211 -1.36e-01,+1.77e-01,-7.16e-01,+7.63e-01 1 (nil) + 402 211 -1.36e-01,+1.77e-01,-7.16e-01,+7.63e-01 1 GenVertex: -114 ID: 0 (X,cT):0 I: 1 182 -323 -1.04e+00,-2.43e-02,-1.56e+01,+1.57e+01 2 -114 - O: 2 403 -321 -9.22e-01,-9.25e-02,-1.49e+01,+1.49e+01 1 (nil) + O: 2 403 -321 -9.22e-01,-9.25e-02,-1.49e+01,+1.49e+01 1 404 111 -1.17e-01,+6.82e-02,-7.01e-01,+7.26e-01 2 -196 GenVertex: -115 ID: 0 (X,cT):0 I: 1 184 113 +9.16e+00,-6.89e+00,-1.32e+02,+1.32e+02 2 -115 - O: 2 405 -211 +8.07e+00,-6.29e+00,-1.19e+02,+1.20e+02 1 (nil) - 406 211 +1.09e+00,-5.97e-01,-1.23e+01,+1.24e+01 1 (nil) + O: 2 405 -211 +8.07e+00,-6.29e+00,-1.19e+02,+1.20e+02 1 + 406 211 +1.09e+00,-5.97e-01,-1.23e+01,+1.24e+01 1 Vertex: -116 ID: 0 (X,cT)=+1.87e-03,-1.71e-03,-2.84e-02,+2.85e-02 I: 1 185 111 +1.57e+00,-1.44e+00,-2.40e+01,+2.41e+01 2 -116 - O: 2 407 22 +1.03e+00,-8.53e-01,-1.49e+01,+1.50e+01 1 (nil) - 408 22 +5.46e-01,-5.88e-01,-9.04e+00,+9.08e+00 1 (nil) + O: 2 407 22 +1.03e+00,-8.53e-01,-1.49e+01,+1.50e+01 1 + 408 22 +5.46e-01,-5.88e-01,-9.04e+00,+9.08e+00 1 GenVertex: -117 ID: 0 (X,cT):0 I: 1 189 213 -1.88e-01,-4.78e-01,-1.86e-02,+8.02e-01 2 -117 - O: 2 409 211 +6.32e-02,-4.07e-02,-1.95e-01,+2.51e-01 1 (nil) + O: 2 409 211 +6.32e-02,-4.07e-02,-1.95e-01,+2.51e-01 1 410 111 -2.51e-01,-4.37e-01,+1.76e-01,+5.51e-01 2 -197 GenVertex: -118 ID: 0 (X,cT):0 I: 1 191 213 -1.69e-01,+6.66e-02,+1.66e+00,+1.95e+00 2 -118 - O: 2 411 211 -8.99e-02,-4.44e-01,+8.88e-01,+1.01e+00 1 (nil) + O: 2 411 211 -8.99e-02,-4.44e-01,+8.88e-01,+1.01e+00 1 412 111 -7.90e-02,+5.11e-01,+7.72e-01,+9.39e-01 2 -198 GenVertex: -119 ID: 0 (X,cT):0 I: 1 192 113 -7.42e-01,+4.97e-01,+2.71e+00,+2.94e+00 2 -119 - O: 2 413 -211 -6.65e-02,+8.33e-02,+1.29e+00,+1.30e+00 1 (nil) - 414 211 -6.76e-01,+4.14e-01,+1.43e+00,+1.64e+00 1 (nil) + O: 2 413 -211 -6.65e-02,+8.33e-02,+1.29e+00,+1.30e+00 1 + 414 211 -6.76e-01,+4.14e-01,+1.43e+00,+1.64e+00 1 GenVertex: -120 ID: 0 (X,cT):0 I: 1 193 -213 +2.70e-02,+3.31e-01,+2.97e-01,+7.93e-01 2 -120 - O: 2 415 -211 -1.79e-01,+3.73e-02,+3.36e-01,+4.08e-01 1 (nil) + O: 2 415 -211 -1.79e-01,+3.73e-02,+3.36e-01,+4.08e-01 1 416 111 +2.06e-01,+2.93e-01,-3.94e-02,+3.85e-01 2 -199 GenVertex: -121 ID: 0 (X,cT):0 I: 1 195 113 -1.79e-01,+4.58e-01,+4.36e+00,+4.46e+00 2 -121 - O: 2 417 -211 -4.09e-01,+9.88e-02,+1.62e+00,+1.68e+00 1 (nil) - 418 211 +2.30e-01,+3.59e-01,+2.75e+00,+2.78e+00 1 (nil) + O: 2 417 -211 -4.09e-01,+9.88e-02,+1.62e+00,+1.68e+00 1 + 418 211 +2.30e-01,+3.59e-01,+2.75e+00,+2.78e+00 1 GenVertex: -122 ID: 0 (X,cT):0 I: 1 196 -213 -8.75e-02,+1.16e-01,+1.21e+00,+1.46e+00 2 -122 - O: 2 419 -211 +1.71e-01,-8.56e-03,+1.11e+00,+1.13e+00 1 (nil) + O: 2 419 -211 +1.71e-01,-8.56e-03,+1.11e+00,+1.13e+00 1 420 111 -2.59e-01,+1.24e-01,+1.06e-01,+3.34e-01 2 -200 GenVertex: -123 ID: 0 (X,cT):0 I: 1 197 323 -7.63e-01,+6.20e-01,+7.15e+00,+7.28e+00 2 -123 - O: 2 421 321 -4.34e-01,+3.13e-01,+2.39e+00,+2.49e+00 1 (nil) + O: 2 421 321 -4.34e-01,+3.13e-01,+2.39e+00,+2.49e+00 1 422 111 -3.29e-01,+3.07e-01,+4.76e+00,+4.78e+00 2 -201 GenVertex: -124 ID: 0 (X,cT):0 I: 1 198 221 -7.36e-01,+2.91e-01,+5.63e+00,+5.72e+00 2 -124 - O: 3 423 22 -3.68e-01,+1.74e-01,+3.63e+00,+3.66e+00 1 (nil) - 424 211 -2.05e-01,+1.05e-01,+1.26e+00,+1.28e+00 1 (nil) - 425 -211 -1.63e-01,+1.25e-02,+7.47e-01,+7.77e-01 1 (nil) + O: 3 423 22 -3.68e-01,+1.74e-01,+3.63e+00,+3.66e+00 1 + 424 211 -2.05e-01,+1.05e-01,+1.26e+00,+1.28e+00 1 + 425 -211 -1.63e-01,+1.25e-02,+7.47e-01,+7.77e-01 1 GenVertex: -125 ID: 0 (X,cT):0 I: 1 200 213 +4.69e-02,-1.77e-01,-3.64e-01,+1.10e+00 2 -125 - O: 2 426 211 -3.67e-01,-1.30e-01,-4.96e-01,+6.46e-01 1 (nil) + O: 2 426 211 -3.67e-01,-1.30e-01,-4.96e-01,+6.46e-01 1 427 111 +4.14e-01,-4.69e-02,+1.31e-01,+4.58e-01 2 -202 Vertex: -126 ID: 0 (X,cT)=+6.94e-05,-7.03e-06,+2.19e-04,+2.31e-04 I: 1 201 111 +3.73e-01,-3.78e-02,+1.18e+00,+1.24e+00 2 -126 - O: 2 428 22 +1.73e-01,-3.58e-02,+3.54e-01,+3.96e-01 1 (nil) - 429 22 +2.00e-01,-2.02e-03,+8.22e-01,+8.46e-01 1 (nil) + O: 2 428 22 +1.73e-01,-3.58e-02,+3.54e-01,+3.96e-01 1 + 429 22 +2.00e-01,-2.02e-03,+8.22e-01,+8.46e-01 1 GenVertex: -127 ID: 0 (X,cT):0 I: 1 202 -213 -7.72e-01,+1.13e+00,+1.14e+00,+1.96e+00 2 -127 - O: 2 430 -211 -3.73e-02,+7.08e-01,+6.44e-01,+9.68e-01 1 (nil) + O: 2 430 -211 -3.73e-02,+7.08e-01,+6.44e-01,+9.68e-01 1 431 111 -7.34e-01,+4.26e-01,+4.97e-01,+9.93e-01 2 -203 GenVertex: -128 ID: 0 (X,cT):0 I: 1 203 223 +4.07e-01,-5.29e-01,+1.12e-01,+1.04e+00 2 -128 - O: 3 432 211 +3.59e-01,-2.82e-01,+1.18e-01,+4.92e-01 1 (nil) - 433 -211 -1.50e-02,+9.43e-02,+3.19e-02,+1.72e-01 1 (nil) + O: 3 432 211 +3.59e-01,-2.82e-01,+1.18e-01,+4.92e-01 1 + 433 -211 -1.50e-02,+9.43e-02,+3.19e-02,+1.72e-01 1 434 111 +6.29e-02,-3.41e-01,-3.80e-02,+3.74e-01 2 -204 GenVertex: -129 ID: 0 (X,cT):0 I: 1 204 223 -5.49e-02,-3.91e-01,+1.06e+00,+1.37e+00 2 -129 - O: 3 435 -211 +6.25e-02,-1.04e-01,+1.78e-01,+2.57e-01 1 (nil) - 436 211 +2.00e-02,-2.71e-01,+8.68e-01,+9.20e-01 1 (nil) + O: 3 435 -211 +6.25e-02,-1.04e-01,+1.78e-01,+2.57e-01 1 + 436 211 +2.00e-02,-2.71e-01,+8.68e-01,+9.20e-01 1 437 111 -1.37e-01,-1.63e-02,+1.18e-02,+1.94e-01 2 -205 Vertex: -130 ID: 0 (X,cT)=+1.58e-01,-6.64e-02,-8.93e-01,+9.27e-01 I: 1 205 -421 +1.62e+00,-6.80e-01,-9.14e+00,+9.49e+00 2 -130 O: 2 438 10323 +8.73e-01,-6.30e-01,-7.46e+00,+7.64e+00 2 -206 - 439 -211 +7.49e-01,-4.97e-02,-1.68e+00,+1.85e+00 1 (nil) + 439 -211 +7.49e-01,-4.97e-02,-1.68e+00,+1.85e+00 1 Vertex: -131 ID: 0 (X,cT)=+6.33e-05,-2.16e-05,-2.68e-04,+2.80e-04 I: 1 206 111 +1.80e-01,-6.13e-02,-7.60e-01,+7.95e-01 2 -131 - O: 2 440 22 +1.83e-01,-8.44e-02,-7.27e-01,+7.54e-01 1 (nil) - 441 22 -3.44e-03,+2.31e-02,-3.29e-02,+4.04e-02 1 (nil) + O: 2 440 22 +1.83e-01,-8.44e-02,-7.27e-01,+7.54e-01 1 + 441 22 -3.44e-03,+2.31e-02,-3.29e-02,+4.04e-02 1 GenVertex: -132 ID: 0 (X,cT):0 I: 1 207 -311 +3.84e-01,+6.75e-01,-2.32e+00,+2.49e+00 2 -132 O: 1 442 310 +3.84e-01,+6.75e-01,-2.32e+00,+2.49e+00 2 -207 @@ -1195,116 +1314,116 @@ GenVertex: -133 ID: 0 (X,cT):0 O: 1 443 310 +4.92e-01,+1.67e+00,-1.03e+01,+1.05e+01 2 -208 Vertex: -134 ID: 0 (X,cT)=+9.60e-06,+2.02e-06,-1.35e-04,+1.36e-04 I: 1 210 111 +1.56e-01,+3.28e-02,-2.20e+00,+2.21e+00 2 -134 - O: 2 444 22 +1.58e-01,+4.61e-02,-2.17e+00,+2.18e+00 1 (nil) - 445 22 -2.08e-03,-1.33e-02,-2.27e-02,+2.64e-02 1 (nil) + O: 2 444 22 +1.58e-01,+4.61e-02,-2.17e+00,+2.18e+00 1 + 445 22 -2.08e-03,-1.33e-02,-2.27e-02,+2.64e-02 1 Vertex: -135 ID: 0 (X,cT)=-6.11e-05,+1.37e-04,-6.02e-04,+6.24e-04 I: 1 215 111 -1.24e-01,+2.78e-01,-1.22e+00,+1.26e+00 2 -135 - O: 2 446 22 -2.52e-02,+2.45e-02,-3.81e-01,+3.83e-01 1 (nil) - 447 22 -9.85e-02,+2.53e-01,-8.38e-01,+8.81e-01 1 (nil) + O: 2 446 22 -2.52e-02,+2.45e-02,-3.81e-01,+3.83e-01 1 + 447 22 -9.85e-02,+2.53e-01,-8.38e-01,+8.81e-01 1 Vertex: -136 ID: 0 (X,cT)=-4.44e-05,-3.92e-06,-7.34e-04,+7.40e-04 I: 1 217 111 -7.15e-02,-6.31e-03,-1.18e+00,+1.19e+00 2 -136 - O: 2 448 22 -9.35e-02,-3.77e-02,-1.03e+00,+1.04e+00 1 (nil) - 449 22 +2.21e-02,+3.14e-02,-1.46e-01,+1.51e-01 1 (nil) + O: 2 448 22 -9.35e-02,-3.77e-02,-1.03e+00,+1.04e+00 1 + 449 22 +2.21e-02,+3.14e-02,-1.46e-01,+1.51e-01 1 Vertex: -137 ID: 0 (X,cT)=+3.41e-05,+1.99e-05,-1.06e-05,+5.12e-05 I: 1 220 111 +1.49e-01,+8.68e-02,-4.65e-02,+2.24e-01 2 -137 - O: 2 450 22 +1.62e-01,+9.36e-02,-6.67e-02,+1.99e-01 1 (nil) - 451 22 -1.32e-02,-6.86e-03,+2.02e-02,+2.51e-02 1 (nil) + O: 2 450 22 +1.62e-01,+9.36e-02,-6.67e-02,+1.99e-01 1 + 451 22 -1.32e-02,-6.86e-03,+2.02e-02,+2.51e-02 1 GenVertex: -138 ID: 0 (X,cT):0 I: 1 221 -311 -8.28e-02,+1.40e-01,+2.87e-01,+5.97e-01 2 -138 - O: 1 452 130 -8.28e-02,+1.40e-01,+2.87e-01,+5.97e-01 1 (nil) + O: 1 452 130 -8.28e-02,+1.40e-01,+2.87e-01,+5.97e-01 1 Vertex: -139 ID: 0 (X,cT)=-3.00e-05,-1.01e-05,+1.64e-06,+3.29e-05 I: 1 226 111 -4.64e-01,-1.55e-01,+2.53e-02,+5.08e-01 2 -139 - O: 2 453 22 -2.22e-01,-3.76e-02,-4.59e-02,+2.30e-01 1 (nil) - 454 22 -2.42e-01,-1.18e-01,+7.12e-02,+2.78e-01 1 (nil) + O: 2 453 22 -2.22e-01,-3.76e-02,-4.59e-02,+2.30e-01 1 + 454 22 -2.42e-01,-1.18e-01,+7.12e-02,+2.78e-01 1 Vertex: -140 ID: 0 (X,cT)=-5.23e-07,-7.76e-06,+4.86e-05,+4.96e-05 I: 1 231 111 -1.13e-02,-1.68e-01,+1.05e+00,+1.07e+00 2 -140 - O: 2 455 22 +4.72e-02,-1.23e-01,+8.16e-01,+8.27e-01 1 (nil) - 456 22 -5.85e-02,-4.52e-02,+2.34e-01,+2.45e-01 1 (nil) + O: 2 455 22 +4.72e-02,-1.23e-01,+8.16e-01,+8.27e-01 1 + 456 22 -5.85e-02,-4.52e-02,+2.34e-01,+2.45e-01 1 Vertex: -141 ID: 0 (X,cT)=+3.06e-05,-6.13e-05,+1.04e-03,+1.04e-03 I: 1 233 111 +1.15e-01,-2.30e-01,+3.89e+00,+3.90e+00 2 -141 - O: 2 457 22 +4.00e-02,+3.07e-04,+9.61e-01,+9.62e-01 1 (nil) - 458 22 +7.48e-02,-2.30e-01,+2.93e+00,+2.94e+00 1 (nil) + O: 2 457 22 +4.00e-02,+3.07e-04,+9.61e-01,+9.62e-01 1 + 458 22 +7.48e-02,-2.30e-01,+2.93e+00,+2.94e+00 1 Vertex: -142 ID: 0 (X,cT)=-4.86e-07,+1.36e-05,+5.54e-03,+5.54e-03 I: 1 240 111 -1.84e-03,+5.13e-02,+2.10e+01,+2.10e+01 2 -142 - O: 2 459 22 +6.53e-02,+3.07e-02,+8.88e+00,+8.88e+00 1 (nil) - 460 22 -6.72e-02,+2.07e-02,+1.21e+01,+1.21e+01 1 (nil) + O: 2 459 22 +6.53e-02,+3.07e-02,+8.88e+00,+8.88e+00 1 + 460 22 -6.72e-02,+2.07e-02,+1.21e+01,+1.21e+01 1 Vertex: -143 ID: 0 (X,cT)=+9.00e-01,-4.13e-01,-2.42e+00,+2.63e+00 I: 1 241 421 +6.24e+00,-2.87e+00,-1.68e+01,+1.82e+01 2 -143 O: 2 461 -313 +3.33e+00,-1.55e+00,-7.24e+00,+8.16e+00 2 -209 462 111 +2.92e+00,-1.31e+00,-9.56e+00,+1.01e+01 2 -210 Vertex: -144 ID: 0 (X,cT)=+1.11e-04,-5.90e-05,-2.87e-04,+3.15e-04 I: 1 242 111 +4.94e-01,-2.63e-01,-1.28e+00,+1.40e+00 2 -144 - O: 2 463 22 +3.13e-01,-2.24e-01,-9.52e-01,+1.03e+00 1 (nil) - 464 22 +1.81e-01,-3.87e-02,-3.28e-01,+3.76e-01 1 (nil) + O: 2 463 22 +3.13e-01,-2.24e-01,-9.52e-01,+1.03e+00 1 + 464 22 +1.81e-01,-3.87e-02,-3.28e-01,+3.76e-01 1 Vertex: -145 ID: 0 (X,cT)=+2.18e-05,-5.26e-06,-3.70e-05,+4.34e-05 I: 1 244 111 +8.10e-01,-1.96e-01,-1.38e+00,+1.62e+00 2 -145 - O: 2 465 22 +6.12e-01,-2.00e-01,-1.10e+00,+1.28e+00 1 (nil) - 466 22 +1.98e-01,+3.77e-03,-2.74e-01,+3.39e-01 1 (nil) + O: 2 465 22 +6.12e-01,-2.00e-01,-1.10e+00,+1.28e+00 1 + 466 22 +1.98e-01,+3.77e-03,-2.74e-01,+3.39e-01 1 GenVertex: -146 ID: 0 (X,cT):0 I: 1 247 221 +3.89e-01,-5.39e-01,-8.71e-01,+1.22e+00 2 -146 - O: 3 467 -211 +1.74e-01,-1.31e-01,-4.30e-01,+5.02e-01 1 (nil) - 468 211 +5.41e-02,-2.04e-01,-3.15e-01,+4.04e-01 1 (nil) + O: 3 467 -211 +1.74e-01,-1.31e-01,-4.30e-01,+5.02e-01 1 + 468 211 +5.41e-02,-2.04e-01,-3.15e-01,+4.04e-01 1 469 111 +1.61e-01,-2.04e-01,-1.26e-01,+3.19e-01 2 -211 Vertex: -147 ID: 0 (X,cT)=+1.07e-04,-3.60e-05,-3.69e-04,+3.86e-04 I: 1 249 111 +7.72e-01,-2.59e-01,-2.66e+00,+2.78e+00 2 -147 - O: 2 470 22 +2.51e-02,-3.16e-02,-2.06e-01,+2.10e-01 1 (nil) - 471 22 +7.47e-01,-2.27e-01,-2.45e+00,+2.57e+00 1 (nil) + O: 2 470 22 +2.51e-02,-3.16e-02,-2.06e-01,+2.10e-01 1 + 471 22 +7.47e-01,-2.27e-01,-2.45e+00,+2.57e+00 1 Vertex: -148 ID: 0 (X,cT)=-8.22e+00,-2.29e+00,+1.29e+02,+1.35e+02 I: 1 254 310 -1.08e-01,-3.01e-02,+1.70e+00,+1.77e+00 2 -148 - O: 2 472 211 +1.20e-02,+1.80e-01,+6.79e-01,+7.16e-01 1 (nil) - 473 -211 -1.20e-01,-2.10e-01,+1.02e+00,+1.05e+00 1 (nil) + O: 2 472 211 +1.20e-02,+1.80e-01,+6.79e-01,+7.16e-01 1 + 473 -211 -1.20e-01,-2.10e-01,+1.02e+00,+1.05e+00 1 Vertex: -149 ID: 0 (X,cT)=-9.20e-06,+3.86e-06,+4.76e-05,+4.89e-05 I: 1 258 111 -2.36e-01,+9.89e-02,+1.22e+00,+1.25e+00 2 -149 - O: 2 474 22 -1.60e-01,+3.34e-03,+8.26e-01,+8.41e-01 1 (nil) - 475 22 -7.61e-02,+9.56e-02,+3.95e-01,+4.13e-01 1 (nil) + O: 2 474 22 -1.60e-01,+3.34e-03,+8.26e-01,+8.41e-01 1 + 475 22 -7.61e-02,+9.56e-02,+3.95e-01,+4.13e-01 1 Vertex: -150 ID: 0 (X,cT)=-5.14e-04,-8.73e-05,+1.03e-02,+1.04e-02 I: 1 260 111 -1.11e+00,-1.89e-01,+2.24e+01,+2.24e+01 2 -150 - O: 2 476 22 -9.81e-01,-1.35e-01,+2.02e+01,+2.02e+01 1 (nil) - 477 22 -1.30e-01,-5.37e-02,+2.22e+00,+2.22e+00 1 (nil) + O: 2 476 22 -9.81e-01,-1.35e-01,+2.02e+01,+2.02e+01 1 + 477 22 -1.30e-01,-5.37e-02,+2.22e+00,+2.22e+00 1 Vertex: -151 ID: 0 (X,cT)=+1.88e-05,+4.46e-05,+6.87e-04,+6.89e-04 I: 1 263 111 +1.08e-01,+2.55e-01,+3.93e+00,+3.94e+00 2 -151 - O: 2 478 22 +1.10e-01,+2.16e-01,+2.55e+00,+2.56e+00 1 (nil) - 479 22 -2.65e-03,+3.91e-02,+1.38e+00,+1.38e+00 1 (nil) + O: 2 478 22 +1.10e-01,+2.16e-01,+2.55e+00,+2.56e+00 1 + 479 22 -2.65e-03,+3.91e-02,+1.38e+00,+1.38e+00 1 Vertex: -152 ID: 0 (X,cT)=-6.14e-05,-3.82e-05,+7.27e-04,+7.31e-04 I: 1 265 111 -3.21e-01,-1.99e-01,+3.80e+00,+3.82e+00 2 -152 - O: 2 480 22 -2.34e-01,-1.54e-01,+3.28e+00,+3.29e+00 1 (nil) - 481 22 -8.72e-02,-4.50e-02,+5.19e-01,+5.28e-01 1 (nil) + O: 2 480 22 -2.34e-01,-1.54e-01,+3.28e+00,+3.29e+00 1 + 481 22 -8.72e-02,-4.50e-02,+5.19e-01,+5.28e-01 1 Vertex: -153 ID: 0 (X,cT)=-2.19e-06,-3.00e-06,+3.58e-04,+3.58e-04 I: 1 267 111 -1.18e-01,-1.61e-01,+1.92e+01,+1.92e+01 2 -153 - O: 2 482 22 -9.69e-02,-1.72e-01,+1.33e+01,+1.34e+01 1 (nil) - 483 22 -2.08e-02,+1.15e-02,+5.82e+00,+5.82e+00 1 (nil) + O: 2 482 22 -9.69e-02,-1.72e-01,+1.33e+01,+1.34e+01 1 + 483 22 -2.08e-02,+1.15e-02,+5.82e+00,+5.82e+00 1 Vertex: -154 ID: 0 (X,cT)=-9.00e-04,+6.71e-04,+1.89e-01,+1.89e-01 I: 1 273 111 -1.19e+00,+8.85e-01,+2.49e+02,+2.49e+02 2 -154 - O: 2 484 22 -5.91e-01,+4.58e-01,+1.37e+02,+1.37e+02 1 (nil) - 485 22 -5.96e-01,+4.27e-01,+1.12e+02,+1.12e+02 1 (nil) + O: 2 484 22 -5.91e-01,+4.58e-01,+1.37e+02,+1.37e+02 1 + 485 22 -5.96e-01,+4.27e-01,+1.12e+02,+1.12e+02 1 Vertex: -155 ID: 0 (X,cT)=-5.19e-06,+2.77e-05,+9.61e-03,+9.61e-03 I: 1 275 111 -3.94e-02,+2.10e-01,+7.29e+01,+7.29e+01 2 -155 - O: 2 486 22 -5.34e-02,+1.01e-01,+2.01e+01,+2.01e+01 1 (nil) - 487 22 +1.40e-02,+1.09e-01,+5.28e+01,+5.28e+01 1 (nil) + O: 2 486 22 -5.34e-02,+1.01e-01,+2.01e+01,+2.01e+01 1 + 487 22 +1.40e-02,+1.09e-01,+5.28e+01,+5.28e+01 1 Vertex: -156 ID: 0 (X,cT)=-3.80e-05,+2.22e-05,+1.37e-02,+1.37e-02 I: 1 280 111 -1.09e-01,+6.39e-02,+3.93e+01,+3.93e+01 2 -156 - O: 2 488 22 -5.83e-02,+1.46e-02,+3.27e+01,+3.27e+01 1 (nil) - 489 22 -5.08e-02,+4.93e-02,+6.60e+00,+6.60e+00 1 (nil) + O: 2 488 22 -5.83e-02,+1.46e-02,+3.27e+01,+3.27e+01 1 + 489 22 -5.08e-02,+4.93e-02,+6.60e+00,+6.60e+00 1 Vertex: -157 ID: 0 (X,cT)=+6.48e-05,+4.92e-04,+1.80e-02,+1.80e-02 I: 1 284 111 +1.27e-01,+9.61e-01,+3.52e+01,+3.52e+01 2 -157 - O: 2 490 22 -2.52e-02,+2.35e-01,+8.00e+00,+8.00e+00 1 (nil) - 491 22 +1.52e-01,+7.26e-01,+2.72e+01,+2.72e+01 1 (nil) + O: 2 490 22 -2.52e-02,+2.35e-01,+8.00e+00,+8.00e+00 1 + 491 22 +1.52e-01,+7.26e-01,+2.72e+01,+2.72e+01 1 Vertex: -158 ID: 0 (X,cT)=+1.48e-04,+1.07e-04,+1.80e-03,+1.81e-03 I: 1 285 111 +2.92e-01,+2.10e-01,+3.56e+00,+3.58e+00 2 -158 - O: 2 492 22 +2.42e-01,+1.03e-01,+2.23e+00,+2.25e+00 1 (nil) - 493 22 +5.02e-02,+1.07e-01,+1.33e+00,+1.33e+00 1 (nil) + O: 2 492 22 +2.42e-01,+1.03e-01,+2.23e+00,+2.25e+00 1 + 493 22 +5.02e-02,+1.07e-01,+1.33e+00,+1.33e+00 1 Vertex: -159 ID: 0 (X,cT)=+2.50e-05,+3.78e-05,+5.99e-04,+6.03e-04 I: 1 286 111 +7.22e-02,+1.09e-01,+1.73e+00,+1.74e+00 2 -159 - O: 2 494 22 +2.13e-02,+6.88e-02,+1.49e+00,+1.49e+00 1 (nil) - 495 22 +5.09e-02,+4.05e-02,+2.47e-01,+2.55e-01 1 (nil) + O: 2 494 22 +2.13e-02,+6.88e-02,+1.49e+00,+1.49e+00 1 + 495 22 +5.09e-02,+4.05e-02,+2.47e-01,+2.55e-01 1 Vertex: -160 ID: 0 (X,cT)=+2.02e-05,+3.78e-06,+1.16e-03,+1.16e-03 I: 1 287 111 +5.73e-02,+1.07e-02,+3.27e+00,+3.27e+00 2 -160 - O: 2 496 22 -1.28e-02,-2.31e-02,+1.49e-01,+1.51e-01 1 (nil) - 497 22 +7.01e-02,+3.38e-02,+3.12e+00,+3.12e+00 1 (nil) + O: 2 496 22 -1.28e-02,-2.31e-02,+1.49e-01,+1.51e-01 1 + 497 22 +7.01e-02,+3.38e-02,+3.12e+00,+3.12e+00 1 Vertex: -161 ID: 0 (X,cT)=+9.91e-05,+2.78e-04,+4.67e-03,+4.68e-03 I: 1 289 111 +4.18e-01,+1.18e+00,+1.97e+01,+1.98e+01 2 -161 - O: 2 498 22 +2.65e-01,+6.35e-01,+1.17e+01,+1.18e+01 1 (nil) - 499 22 +1.54e-01,+5.40e-01,+7.99e+00,+8.01e+00 1 (nil) + O: 2 498 22 +2.65e-01,+6.35e-01,+1.17e+01,+1.18e+01 1 + 499 22 +1.54e-01,+5.40e-01,+7.99e+00,+8.01e+00 1 GenVertex: -162 ID: 0 (X,cT):0 I: 1 294 221 +9.56e-01,+1.28e+00,+1.76e+01,+1.77e+01 2 -162 O: 3 500 111 +3.73e-01,+4.04e-01,+4.84e+00,+4.87e+00 2 -212 @@ -1312,217 +1431,217 @@ GenVertex: -162 ID: 0 (X,cT):0 502 111 +1.53e-01,+1.59e-01,+2.85e+00,+2.86e+00 2 -214 Vertex: -163 ID: 0 (X,cT)=+2.58e-04,-2.44e-04,+2.53e-03,+2.55e-03 I: 1 296 111 +1.69e+00,-1.60e+00,+1.65e+01,+1.67e+01 2 -163 - O: 2 503 22 +1.04e+00,-1.02e+00,+1.08e+01,+1.09e+01 1 (nil) - 504 22 +6.52e-01,-5.77e-01,+5.78e+00,+5.84e+00 1 (nil) + O: 2 503 22 +1.04e+00,-1.02e+00,+1.08e+01,+1.09e+01 1 + 504 22 +6.52e-01,-5.77e-01,+5.78e+00,+5.84e+00 1 Vertex: -164 ID: 0 (X,cT)=+2.91e+01,-1.32e+01,+2.80e+02,+2.82e+02 I: 1 297 310 +6.37e-01,-2.90e-01,+6.13e+00,+6.19e+00 2 -164 - O: 2 505 -211 +1.68e-01,+3.96e-04,+7.88e-01,+8.18e-01 1 (nil) - 506 211 +4.69e-01,-2.90e-01,+5.34e+00,+5.37e+00 1 (nil) + O: 2 505 -211 +1.68e-01,+3.96e-04,+7.88e-01,+8.18e-01 1 + 506 211 +4.69e-01,-2.90e-01,+5.34e+00,+5.37e+00 1 Vertex: -165 ID: 0 (X,cT)=-3.01e+00,-5.05e+01,+1.82e+02,+1.91e+02 I: 1 299 310 -5.64e-02,-9.48e-01,+3.42e+00,+3.58e+00 2 -165 - O: 2 507 211 -9.80e-03,-8.77e-01,+3.10e+00,+3.22e+00 1 (nil) - 508 -211 -4.66e-02,-7.14e-02,+3.18e-01,+3.57e-01 1 (nil) + O: 2 507 211 -9.80e-03,-8.77e-01,+3.10e+00,+3.22e+00 1 + 508 -211 -4.66e-02,-7.14e-02,+3.18e-01,+3.57e-01 1 Vertex: -166 ID: 0 (X,cT)=+5.65e-06,-7.57e-05,+2.42e-04,+2.55e-04 I: 1 301 111 +2.32e-02,-3.11e-01,+9.92e-01,+1.05e+00 2 -166 - O: 2 509 22 -1.58e-02,-2.94e-01,+9.06e-01,+9.53e-01 1 (nil) - 510 22 +3.90e-02,-1.71e-02,+8.60e-02,+9.59e-02 1 (nil) + O: 2 509 22 -1.58e-02,-2.94e-01,+9.06e-01,+9.53e-01 1 + 510 22 +3.90e-02,-1.71e-02,+8.60e-02,+9.59e-02 1 Vertex: -167 ID: 0 (X,cT)=-1.40e-04,-1.73e-04,+1.47e-04,+2.68e-04 I: 1 305 111 -7.25e-01,-8.95e-01,+7.64e-01,+1.39e+00 2 -167 - O: 2 511 22 -1.23e-01,-1.25e-01,+1.74e-01,+2.47e-01 1 (nil) - 512 22 -6.01e-01,-7.71e-01,+5.90e-01,+1.14e+00 1 (nil) + O: 2 511 22 -1.23e-01,-1.25e-01,+1.74e-01,+2.47e-01 1 + 512 22 -6.01e-01,-7.71e-01,+5.90e-01,+1.14e+00 1 Vertex: -168 ID: 0 (X,cT)=-2.82e-04,-3.80e-04,+1.23e-04,+4.92e-04 I: 1 307 111 -7.03e-01,-9.49e-01,+3.08e-01,+1.23e+00 2 -168 - O: 2 513 22 -4.88e-01,-5.82e-01,+1.49e-01,+7.74e-01 1 (nil) - 514 22 -2.15e-01,-3.67e-01,+1.58e-01,+4.54e-01 1 (nil) + O: 2 513 22 -4.88e-01,-5.82e-01,+1.49e-01,+7.74e-01 1 + 514 22 -2.15e-01,-3.67e-01,+1.58e-01,+4.54e-01 1 Vertex: -169 ID: 0 (X,cT)=-3.47e-04,-5.20e-04,-6.20e-04,+8.81e-04 I: 1 311 111 -1.10e+00,-1.65e+00,-1.97e+00,+2.80e+00 2 -169 - O: 2 515 22 -1.08e+00,-1.63e+00,-1.96e+00,+2.76e+00 1 (nil) - 516 22 -2.45e-02,-2.46e-02,-1.45e-02,+3.76e-02 1 (nil) + O: 2 515 22 -1.08e+00,-1.63e+00,-1.96e+00,+2.76e+00 1 + 516 22 -2.45e-02,-2.46e-02,-1.45e-02,+3.76e-02 1 Vertex: -170 ID: 0 (X,cT)=-3.29e-06,+1.10e-06,-2.41e-06,+4.57e-06 I: 1 313 111 -2.55e-01,+8.51e-02,-1.87e-01,+3.54e-01 2 -170 - O: 2 517 22 -1.13e-01,-2.84e-02,-9.56e-02,+1.51e-01 1 (nil) - 518 22 -1.42e-01,+1.13e-01,-9.12e-02,+2.04e-01 1 (nil) + O: 2 517 22 -1.13e-01,-2.84e-02,-9.56e-02,+1.51e-01 1 + 518 22 -1.42e-01,+1.13e-01,-9.12e-02,+2.04e-01 1 Vertex: -171 ID: 0 (X,cT)=-2.73e+00,+6.86e+00,-1.26e+01,+1.53e+01 I: 1 314 310 -2.88e-01,+7.23e-01,-1.33e+00,+1.62e+00 2 -171 - O: 2 519 -211 -3.73e-01,+4.98e-01,-1.02e+00,+1.20e+00 1 (nil) - 520 211 +8.58e-02,+2.25e-01,-3.14e-01,+4.20e-01 1 (nil) + O: 2 519 -211 -3.73e-01,+4.98e-01,-1.02e+00,+1.20e+00 1 + 520 211 +8.58e-02,+2.25e-01,-3.14e-01,+4.20e-01 1 Vertex: -172 ID: 0 (X,cT)=+3.20e-04,+3.36e-05,-5.97e-04,+6.84e-04 I: 1 318 111 +4.68e-01,+4.92e-02,-8.74e-01,+1.00e+00 2 -172 - O: 2 521 22 +1.99e-02,+1.62e-02,-1.31e-01,+1.33e-01 1 (nil) - 522 22 +4.48e-01,+3.29e-02,-7.43e-01,+8.69e-01 1 (nil) + O: 2 521 22 +1.99e-02,+1.62e-02,-1.31e-01,+1.33e-01 1 + 522 22 +4.48e-01,+3.29e-02,-7.43e-01,+8.69e-01 1 Vertex: -173 ID: 0 (X,cT)=+1.96e-05,+4.48e-05,-3.57e-03,+3.57e-03 I: 1 331 111 +1.15e-01,+2.64e-01,-2.11e+01,+2.11e+01 2 -173 - O: 2 523 22 +5.11e-03,+1.71e-01,-1.28e+01,+1.28e+01 1 (nil) - 524 22 +1.10e-01,+9.28e-02,-8.25e+00,+8.26e+00 1 (nil) + O: 2 523 22 +5.11e-03,+1.71e-01,-1.28e+01,+1.28e+01 1 + 524 22 +1.10e-01,+9.28e-02,-8.25e+00,+8.26e+00 1 Vertex: -174 ID: 0 (X,cT)=+5.52e-05,+5.68e-07,-2.13e-03,+2.13e-03 I: 1 334 111 +1.60e-01,+1.64e-03,-6.16e+00,+6.16e+00 2 -174 - O: 2 525 22 +9.75e-02,+6.03e-02,-2.60e+00,+2.61e+00 1 (nil) - 526 22 +6.22e-02,-5.86e-02,-3.55e+00,+3.56e+00 1 (nil) + O: 2 525 22 +9.75e-02,+6.03e-02,-2.60e+00,+2.61e+00 1 + 526 22 +6.22e-02,-5.86e-02,-3.55e+00,+3.56e+00 1 Vertex: -175 ID: 0 (X,cT)=+5.38e-05,-1.78e-05,-4.71e-04,+4.74e-04 I: 1 335 111 +3.20e-01,-1.06e-01,-2.80e+00,+2.83e+00 2 -175 - O: 2 527 22 +5.30e-02,+1.88e-02,-7.85e-01,+7.87e-01 1 (nil) - 528 22 +2.67e-01,-1.25e-01,-2.02e+00,+2.04e+00 1 (nil) + O: 2 527 22 +5.30e-02,+1.88e-02,-7.85e-01,+7.87e-01 1 + 528 22 +2.67e-01,-1.25e-01,-2.02e+00,+2.04e+00 1 Vertex: -176 ID: 0 (X,cT)=+2.93e-05,+8.83e-06,-3.69e-04,+3.70e-04 I: 1 336 111 +2.91e-01,+8.79e-02,-3.67e+00,+3.68e+00 2 -176 - O: 2 529 22 +2.68e-01,+3.23e-02,-2.79e+00,+2.81e+00 1 (nil) - 530 22 +2.34e-02,+5.56e-02,-8.74e-01,+8.76e-01 1 (nil) + O: 2 529 22 +2.68e-01,+3.23e-02,-2.79e+00,+2.81e+00 1 + 530 22 +2.34e-02,+5.56e-02,-8.74e-01,+8.76e-01 1 Vertex: -177 ID: 0 (X,cT)=+1.18e-05,+1.50e-06,-2.95e-04,+2.98e-04 I: 1 337 111 +4.06e-02,+5.17e-03,-1.02e+00,+1.02e+00 2 -177 - O: 2 531 22 -1.54e-02,-5.04e-02,-2.38e-01,+2.44e-01 1 (nil) - 532 22 +5.60e-02,+5.56e-02,-7.77e-01,+7.81e-01 1 (nil) + O: 2 531 22 -1.54e-02,-5.04e-02,-2.38e-01,+2.44e-01 1 + 532 22 +5.60e-02,+5.56e-02,-7.77e-01,+7.81e-01 1 Vertex: -178 ID: 0 (X,cT)=+3.27e-04,+1.05e-03,-1.22e-02,+1.23e-02 I: 1 339 111 +5.88e-01,+1.89e+00,-2.20e+01,+2.20e+01 2 -178 - O: 2 533 22 +9.44e-02,+2.34e-01,-3.28e+00,+3.29e+00 1 (nil) - 534 22 +4.93e-01,+1.65e+00,-1.87e+01,+1.88e+01 1 (nil) + O: 2 533 22 +9.44e-02,+2.34e-01,-3.28e+00,+3.29e+00 1 + 534 22 +4.93e-01,+1.65e+00,-1.87e+01,+1.88e+01 1 Vertex: -179 ID: 0 (X,cT)=+1.73e-05,+8.31e-04,-1.74e-02,+1.74e-02 I: 1 347 111 +1.51e-02,+7.22e-01,-1.51e+01,+1.51e+01 2 -179 - O: 2 535 22 -3.85e-02,+1.69e-01,-2.84e+00,+2.85e+00 1 (nil) - 536 22 +5.35e-02,+5.53e-01,-1.22e+01,+1.23e+01 1 (nil) + O: 2 535 22 -3.85e-02,+1.69e-01,-2.84e+00,+2.85e+00 1 + 536 22 +5.35e-02,+5.53e-01,-1.22e+01,+1.23e+01 1 Vertex: -180 ID: 0 (X,cT)=+1.08e-05,+1.04e-05,-2.06e-04,+2.08e-04 I: 1 349 111 +5.56e-02,+5.31e-02,-1.06e+00,+1.07e+00 2 -180 - O: 2 537 22 -2.80e-02,+6.26e-02,-5.73e-01,+5.77e-01 1 (nil) - 538 22 +8.36e-02,-9.58e-03,-4.84e-01,+4.91e-01 1 (nil) + O: 2 537 22 -2.80e-02,+6.26e-02,-5.73e-01,+5.77e-01 1 + 538 22 +8.36e-02,-9.58e-03,-4.84e-01,+4.91e-01 1 GenVertex: -181 ID: 0 (X,cT):0 I: 1 352 -311 +4.98e-01,+5.10e-01,-7.52e+00,+7.57e+00 2 -181 O: 1 539 310 +4.98e-01,+5.10e-01,-7.52e+00,+7.57e+00 2 -215 Vertex: -182 ID: 0 (X,cT)=+8.78e-05,+1.31e-05,-1.01e-03,+1.01e-03 I: 1 353 111 +9.21e-01,+1.38e-01,-1.06e+01,+1.06e+01 2 -182 - O: 2 540 22 +2.76e-01,+8.46e-03,-3.75e+00,+3.76e+00 1 (nil) - 541 22 +6.45e-01,+1.29e-01,-6.82e+00,+6.85e+00 1 (nil) + O: 2 540 22 +2.76e-01,+8.46e-03,-3.75e+00,+3.76e+00 1 + 541 22 +6.45e-01,+1.29e-01,-6.82e+00,+6.85e+00 1 Vertex: -183 ID: 0 (X,cT)=-2.61e-05,-7.86e-05,-8.03e-03,+8.03e-03 I: 1 355 111 -1.59e-01,-4.77e-01,-4.88e+01,+4.88e+01 2 -183 - O: 2 542 22 -7.47e-03,+4.92e-03,-2.71e-01,+2.71e-01 1 (nil) - 543 22 -1.51e-01,-4.82e-01,-4.85e+01,+4.85e+01 1 (nil) + O: 2 542 22 -7.47e-03,+4.92e-03,-2.71e-01,+2.71e-01 1 + 543 22 -1.51e-01,-4.82e-01,-4.85e+01,+4.85e+01 1 Vertex: -184 ID: 0 (X,cT)=+3.04e-05,-1.20e-04,-6.56e-03,+6.56e-03 I: 1 359 111 +6.89e-02,-2.71e-01,-1.49e+01,+1.49e+01 2 -184 - O: 2 544 22 +1.36e-02,-6.16e-02,-1.31e+00,+1.31e+00 1 (nil) - 545 22 +5.54e-02,-2.10e-01,-1.35e+01,+1.35e+01 1 (nil) + O: 2 544 22 +1.36e-02,-6.16e-02,-1.31e+00,+1.31e+00 1 + 545 22 +5.54e-02,-2.10e-01,-1.35e+01,+1.35e+01 1 Vertex: -185 ID: 0 (X,cT)=-3.11e-05,-4.88e-05,-3.97e-03,+3.97e-03 I: 1 362 111 -2.65e-01,-4.16e-01,-3.38e+01,+3.38e+01 2 -185 - O: 2 546 22 -2.39e-02,-6.37e-02,-2.40e+00,+2.40e+00 1 (nil) - 547 22 -2.41e-01,-3.52e-01,-3.14e+01,+3.14e+01 1 (nil) + O: 2 546 22 -2.39e-02,-6.37e-02,-2.40e+00,+2.40e+00 1 + 547 22 -2.41e-01,-3.52e-01,-3.14e+01,+3.14e+01 1 Vertex: -186 ID: 0 (X,cT)=+4.99e-06,-7.81e-06,-4.87e-04,+4.87e-04 I: 1 364 111 +7.55e-02,-1.18e-01,-7.35e+00,+7.36e+00 2 -186 - O: 3 548 22 -7.69e-03,-3.50e-03,-3.43e+00,+3.43e+00 1 (nil) - 549 11 +3.80e-02,-5.45e-02,-1.98e+00,+1.99e+00 1 (nil) - 550 -11 +4.52e-02,-6.00e-02,-1.94e+00,+1.94e+00 1 (nil) + O: 3 548 22 -7.69e-03,-3.50e-03,-3.43e+00,+3.43e+00 1 + 549 11 +3.80e-02,-5.45e-02,-1.98e+00,+1.99e+00 1 + 550 -11 +4.52e-02,-6.00e-02,-1.94e+00,+1.94e+00 1 Vertex: -187 ID: 0 (X,cT)=-3.39e-06,-5.26e-06,-1.10e-03,+1.10e-03 I: 1 372 111 -6.13e-02,-9.53e-02,-1.99e+01,+1.99e+01 2 -187 - O: 2 551 22 +3.73e-02,+2.39e-03,-4.50e+00,+4.50e+00 1 (nil) - 552 22 -9.86e-02,-9.77e-02,-1.54e+01,+1.54e+01 1 (nil) + O: 2 551 22 +3.73e-02,+2.39e-03,-4.50e+00,+4.50e+00 1 + 552 22 -9.86e-02,-9.77e-02,-1.54e+01,+1.54e+01 1 Vertex: -188 ID: 0 (X,cT)=-4.64e-06,+5.62e-06,+2.46e-05,+2.68e-05 I: 1 379 111 -7.99e-02,+9.68e-02,+4.23e-01,+4.62e-01 2 -188 - O: 2 553 22 -6.55e-03,+1.04e-01,+1.84e-01,+2.11e-01 1 (nil) - 554 22 -7.33e-02,-6.90e-03,+2.39e-01,+2.50e-01 1 (nil) + O: 2 553 22 -6.55e-03,+1.04e-01,+1.84e-01,+2.11e-01 1 + 554 22 -7.33e-02,-6.90e-03,+2.39e-01,+2.50e-01 1 Vertex: -189 ID: 0 (X,cT)=-4.97e-05,+1.48e-05,+2.90e-04,+2.95e-04 I: 1 381 111 -3.23e-01,+9.61e-02,+1.88e+00,+1.91e+00 2 -189 - O: 2 555 22 -1.22e-01,-2.90e-02,+7.14e-01,+7.25e-01 1 (nil) - 556 22 -2.00e-01,+1.25e-01,+1.16e+00,+1.19e+00 1 (nil) + O: 2 555 22 -1.22e-01,-2.90e-02,+7.14e-01,+7.25e-01 1 + 556 22 -2.00e-01,+1.25e-01,+1.16e+00,+1.19e+00 1 Vertex: -190 ID: 0 (X,cT)=+4.11e-06,-1.39e-06,+1.15e-04,+1.15e-04 I: 1 386 111 +1.99e-01,-6.72e-02,+5.57e+00,+5.57e+00 2 -190 - O: 2 557 22 +9.39e-02,+3.48e-02,+1.85e+00,+1.85e+00 1 (nil) - 558 22 +1.05e-01,-1.02e-01,+3.72e+00,+3.72e+00 1 (nil) + O: 2 557 22 +9.39e-02,+3.48e-02,+1.85e+00,+1.85e+00 1 + 558 22 +1.05e-01,-1.02e-01,+3.72e+00,+3.72e+00 1 GenVertex: -191 ID: 0 (X,cT):0 I: 1 388 113 +8.30e-02,-2.83e-01,+1.61e+01,+1.61e+01 2 -191 - O: 2 559 211 +2.80e-01,-4.59e-01,+9.99e+00,+1.00e+01 1 (nil) - 560 -211 -1.97e-01,+1.77e-01,+6.12e+00,+6.13e+00 1 (nil) + O: 2 559 211 +2.80e-01,-4.59e-01,+9.99e+00,+1.00e+01 1 + 560 -211 -1.97e-01,+1.77e-01,+6.12e+00,+6.13e+00 1 Vertex: -192 ID: 0 (X,cT)=-3.81e+00,+2.43e+00,-3.67e+01,+3.70e+01 I: 1 397 323 -2.16e+01,+1.35e+01,-2.09e+02,+2.11e+02 2 -192 O: 2 561 311 -1.87e+01,+1.16e+01,-1.82e+02,+1.84e+02 2 -216 - 562 211 -2.87e+00,+1.93e+00,-2.71e+01,+2.73e+01 1 (nil) + 562 211 -2.87e+00,+1.93e+00,-2.71e+01,+2.73e+01 1 GenVertex: -193 ID: 0 (X,cT):0 I: 1 399 -311 -4.47e-01,+3.05e-01,-6.33e+00,+6.37e+00 2 -193 O: 1 563 310 -4.47e-01,+3.05e-01,-6.33e+00,+6.37e+00 2 -217 Vertex: -194 ID: 0 (X,cT)=-3.15e-04,+1.64e-04,-3.28e-03,+3.30e-03 I: 1 400 111 -1.24e+00,+6.47e-01,-1.29e+01,+1.30e+01 2 -194 - O: 2 564 22 -2.94e-01,+1.77e-01,-3.70e+00,+3.71e+00 1 (nil) - 565 22 -9.48e-01,+4.69e-01,-9.23e+00,+9.29e+00 1 (nil) + O: 2 564 22 -2.94e-01,+1.77e-01,-3.70e+00,+3.71e+00 1 + 565 22 -9.48e-01,+4.69e-01,-9.23e+00,+9.29e+00 1 GenVertex: -195 ID: 0 (X,cT):0 I: 1 401 311 -9.33e-01,+9.63e-01,-1.12e+01,+1.13e+01 2 -195 O: 1 566 310 -9.33e-01,+9.63e-01,-1.12e+01,+1.13e+01 2 -218 Vertex: -196 ID: 0 (X,cT)=-6.57e-06,+3.84e-06,-3.95e-05,+4.09e-05 I: 1 404 111 -1.17e-01,+6.82e-02,-7.01e-01,+7.26e-01 2 -196 - O: 2 567 22 +1.75e-02,+4.41e-02,-2.82e-01,+2.86e-01 1 (nil) - 568 22 -1.34e-01,+2.41e-02,-4.19e-01,+4.40e-01 1 (nil) + O: 2 567 22 +1.75e-02,+4.41e-02,-2.82e-01,+2.86e-01 1 + 568 22 -1.34e-01,+2.41e-02,-4.19e-01,+4.40e-01 1 Vertex: -197 ID: 0 (X,cT)=-4.47e-05,-7.78e-05,+3.13e-05,+9.80e-05 I: 1 410 111 -2.51e-01,-4.37e-01,+1.76e-01,+5.51e-01 2 -197 - O: 2 569 22 -1.16e-01,-2.11e-01,+1.32e-02,+2.41e-01 1 (nil) - 570 22 -1.36e-01,-2.27e-01,+1.63e-01,+3.10e-01 1 (nil) + O: 2 569 22 -1.16e-01,-2.11e-01,+1.32e-02,+2.41e-01 1 + 570 22 -1.36e-01,-2.27e-01,+1.63e-01,+3.10e-01 1 Vertex: -198 ID: 0 (X,cT)=-4.20e-06,+2.71e-05,+4.10e-05,+4.99e-05 I: 1 412 111 -7.90e-02,+5.11e-01,+7.72e-01,+9.39e-01 2 -198 - O: 2 571 22 -9.13e-02,+4.77e-01,+7.59e-01,+9.01e-01 1 (nil) - 572 22 +1.23e-02,+3.33e-02,+1.37e-02,+3.81e-02 1 (nil) + O: 2 571 22 -9.13e-02,+4.77e-01,+7.59e-01,+9.01e-01 1 + 572 22 +1.23e-02,+3.33e-02,+1.37e-02,+3.81e-02 1 Vertex: -199 ID: 0 (X,cT)=+2.92e-05,+4.15e-05,-5.58e-06,+5.45e-05 I: 1 416 111 +2.06e-01,+2.93e-01,-3.94e-02,+3.85e-01 2 -199 - O: 2 573 22 +2.03e-01,+2.67e-01,-7.22e-02,+3.43e-01 1 (nil) - 574 22 +3.43e-03,+2.63e-02,+3.28e-02,+4.22e-02 1 (nil) + O: 2 573 22 +2.03e-01,+2.67e-01,-7.22e-02,+3.43e-01 1 + 574 22 +3.43e-03,+2.63e-02,+3.28e-02,+4.22e-02 1 Vertex: -200 ID: 0 (X,cT)=-2.16e-05,+1.04e-05,+8.87e-06,+2.79e-05 I: 1 420 111 -2.59e-01,+1.24e-01,+1.06e-01,+3.34e-01 2 -200 - O: 2 575 22 -3.89e-02,+8.36e-02,+4.53e-02,+1.03e-01 1 (nil) - 576 22 -2.20e-01,+4.05e-02,+6.09e-02,+2.32e-01 1 (nil) + O: 2 575 22 -3.89e-02,+8.36e-02,+4.53e-02,+1.03e-01 1 + 576 22 -2.20e-01,+4.05e-02,+6.09e-02,+2.32e-01 1 Vertex: -201 ID: 0 (X,cT)=-5.59e-05,+5.21e-05,+8.09e-04,+8.13e-04 I: 1 422 111 -3.29e-01,+3.07e-01,+4.76e+00,+4.78e+00 2 -201 - O: 2 577 22 -2.64e-01,+1.59e-01,+3.14e+00,+3.16e+00 1 (nil) - 578 22 -6.51e-02,+1.48e-01,+1.62e+00,+1.62e+00 1 (nil) + O: 2 577 22 -2.64e-01,+1.59e-01,+3.14e+00,+3.16e+00 1 + 578 22 -6.51e-02,+1.48e-01,+1.62e+00,+1.62e+00 1 Vertex: -202 ID: 0 (X,cT)=+2.56e-05,-2.90e-06,+8.11e-06,+2.82e-05 I: 1 427 111 +4.14e-01,-4.69e-02,+1.31e-01,+4.58e-01 2 -202 - O: 2 579 22 +4.15e-01,-2.52e-02,+1.20e-01,+4.33e-01 1 (nil) - 580 22 -9.68e-04,-2.17e-02,+1.13e-02,+2.45e-02 1 (nil) + O: 2 579 22 +4.15e-01,-2.52e-02,+1.20e-01,+4.33e-01 1 + 580 22 -9.68e-04,-2.17e-02,+1.13e-02,+2.45e-02 1 Vertex: -203 ID: 0 (X,cT)=-9.79e-05,+5.68e-05,+6.63e-05,+1.32e-04 I: 1 431 111 -7.34e-01,+4.26e-01,+4.97e-01,+9.93e-01 2 -203 - O: 2 581 22 -3.41e-01,+2.71e-01,+2.25e-01,+4.90e-01 1 (nil) - 582 22 -3.94e-01,+1.56e-01,+2.73e-01,+5.03e-01 1 (nil) + O: 2 581 22 -3.41e-01,+2.71e-01,+2.25e-01,+4.90e-01 1 + 582 22 -3.94e-01,+1.56e-01,+2.73e-01,+5.03e-01 1 Vertex: -204 ID: 0 (X,cT)=+1.01e-05,-5.45e-05,-6.08e-06,+5.98e-05 I: 1 434 111 +6.29e-02,-3.41e-01,-3.80e-02,+3.74e-01 2 -204 - O: 2 583 22 +5.58e-02,-8.25e-02,+3.46e-02,+1.05e-01 1 (nil) - 584 22 +7.11e-03,-2.58e-01,-7.26e-02,+2.69e-01 1 (nil) + O: 2 583 22 +5.58e-02,-8.25e-02,+3.46e-02,+1.05e-01 1 + 584 22 +7.11e-03,-2.58e-01,-7.26e-02,+2.69e-01 1 Vertex: -205 ID: 0 (X,cT)=-3.75e-05,-4.46e-06,+3.21e-06,+5.29e-05 I: 1 437 111 -1.37e-01,-1.63e-02,+1.18e-02,+1.94e-01 2 -205 - O: 2 585 22 -9.46e-02,+4.14e-02,+4.73e-02,+1.14e-01 1 (nil) - 586 22 -4.29e-02,-5.77e-02,-3.55e-02,+8.02e-02 1 (nil) + O: 2 585 22 -9.46e-02,+4.14e-02,+4.73e-02,+1.14e-01 1 + 586 22 -4.29e-02,-5.77e-02,-3.55e-02,+8.02e-02 1 Vertex: -206 ID: 0 (X,cT)=+1.58e-01,-6.64e-02,-8.93e-01,+9.27e-01 I: 1 438 10323 +8.73e-01,-6.30e-01,-7.46e+00,+7.64e+00 2 -206 - O: 2 587 321 +3.86e-01,-2.73e-01,-2.92e+00,+3.00e+00 1 (nil) + O: 2 587 321 +3.86e-01,-2.73e-01,-2.92e+00,+3.00e+00 1 588 223 +4.87e-01,-3.58e-01,-4.53e+00,+4.64e+00 2 -219 Vertex: -207 ID: 0 (X,cT)=+6.34e+00,+1.12e+01,-3.83e+01,+4.12e+01 I: 1 442 310 +3.84e-01,+6.75e-01,-2.32e+00,+2.49e+00 2 -207 - O: 2 589 -211 +1.48e-01,+5.93e-01,-1.74e+00,+1.85e+00 1 (nil) - 590 211 +2.36e-01,+8.15e-02,-5.72e-01,+6.40e-01 1 (nil) + O: 2 589 -211 +1.48e-01,+5.93e-01,-1.74e+00,+1.85e+00 1 + 590 211 +2.36e-01,+8.15e-02,-5.72e-01,+6.40e-01 1 Vertex: -208 ID: 0 (X,cT)=+6.83e+00,+2.32e+01,-1.43e+02,+1.45e+02 I: 1 443 310 +4.92e-01,+1.67e+00,-1.03e+01,+1.05e+01 2 -208 - O: 2 591 211 +2.44e-01,+1.36e+00,-7.90e+00,+8.02e+00 1 (nil) - 592 -211 +2.48e-01,+3.05e-01,-2.40e+00,+2.43e+00 1 (nil) + O: 2 591 211 +2.44e-01,+1.36e+00,-7.90e+00,+8.02e+00 1 + 592 -211 +2.48e-01,+3.05e-01,-2.40e+00,+2.43e+00 1 Vertex: -209 ID: 0 (X,cT)=+9.00e-01,-4.13e-01,-2.42e+00,+2.63e+00 I: 1 461 -313 +3.33e+00,-1.55e+00,-7.24e+00,+8.16e+00 2 -209 - O: 2 593 -321 +2.28e+00,-1.05e+00,-5.51e+00,+6.07e+00 1 (nil) - 594 211 +1.05e+00,-5.07e-01,-1.73e+00,+2.09e+00 1 (nil) + O: 2 593 -321 +2.28e+00,-1.05e+00,-5.51e+00,+6.07e+00 1 + 594 211 +1.05e+00,-5.07e-01,-1.73e+00,+2.09e+00 1 Vertex: -210 ID: 0 (X,cT)=+9.00e-01,-4.13e-01,-2.42e+00,+2.63e+00 I: 1 462 111 +2.92e+00,-1.31e+00,-9.56e+00,+1.01e+01 2 -210 - O: 2 595 22 +2.61e+00,-1.13e+00,-8.44e+00,+8.90e+00 1 (nil) - 596 22 +3.12e-01,-1.85e-01,-1.12e+00,+1.18e+00 1 (nil) + O: 2 595 22 +2.61e+00,-1.13e+00,-8.44e+00,+8.90e+00 1 + 596 22 +3.12e-01,-1.85e-01,-1.12e+00,+1.18e+00 1 Vertex: -211 ID: 0 (X,cT)=+1.16e-05,-1.47e-05,-9.04e-06,+2.29e-05 I: 1 469 111 +1.61e-01,-2.04e-01,-1.26e-01,+3.19e-01 2 -211 - O: 2 597 22 +1.53e-02,-6.02e-02,-9.24e-02,+1.11e-01 1 (nil) - 598 22 +1.46e-01,-1.44e-01,-3.35e-02,+2.08e-01 1 (nil) + O: 2 597 22 +1.53e-02,-6.02e-02,-9.24e-02,+1.11e-01 1 + 598 22 +1.46e-01,-1.44e-01,-3.35e-02,+2.08e-01 1 Vertex: -212 ID: 0 (X,cT)=+4.54e-05,+4.92e-05,+5.89e-04,+5.93e-04 I: 1 500 111 +3.73e-01,+4.04e-01,+4.84e+00,+4.87e+00 2 -212 - O: 2 599 22 +6.24e-02,+9.07e-02,+5.92e-01,+6.02e-01 1 (nil) - 600 22 +3.10e-01,+3.13e-01,+4.25e+00,+4.27e+00 1 (nil) + O: 2 599 22 +6.24e-02,+9.07e-02,+5.92e-01,+6.02e-01 1 + 600 22 +3.10e-01,+3.13e-01,+4.25e+00,+4.27e+00 1 Vertex: -213 ID: 0 (X,cT)=+1.06e-05,+1.77e-05,+2.45e-04,+2.46e-04 I: 1 501 111 +4.30e-01,+7.17e-01,+9.92e+00,+9.96e+00 2 -213 - O: 2 601 22 +2.70e-01,+3.42e-01,+4.68e+00,+4.70e+00 1 (nil) - 602 22 +1.60e-01,+3.75e-01,+5.24e+00,+5.26e+00 1 (nil) + O: 2 601 22 +2.70e-01,+3.42e-01,+4.68e+00,+4.70e+00 1 + 602 22 +1.60e-01,+3.75e-01,+5.24e+00,+5.26e+00 1 Vertex: -214 ID: 0 (X,cT)=+3.42e-05,+3.55e-05,+6.36e-04,+6.39e-04 I: 1 502 111 +1.53e-01,+1.59e-01,+2.85e+00,+2.86e+00 2 -214 - O: 2 603 22 +1.66e-01,+9.32e-02,+2.21e+00,+2.21e+00 1 (nil) - 604 22 -1.33e-02,+6.57e-02,+6.40e-01,+6.43e-01 1 (nil) + O: 2 603 22 +1.66e-01,+9.32e-02,+2.21e+00,+2.21e+00 1 + 604 22 -1.33e-02,+6.57e-02,+6.40e-01,+6.43e-01 1 Vertex: -215 ID: 0 (X,cT)=+2.34e+01,+2.39e+01,-3.53e+02,+3.55e+02 I: 1 539 310 +4.98e-01,+5.10e-01,-7.52e+00,+7.57e+00 2 -215 - O: 2 605 -211 -2.61e-02,+1.43e-01,-1.27e+00,+1.29e+00 1 (nil) - 606 211 +5.24e-01,+3.67e-01,-6.25e+00,+6.28e+00 1 (nil) + O: 2 605 -211 -2.61e-02,+1.43e-01,-1.27e+00,+1.29e+00 1 + 606 211 +5.24e-01,+3.67e-01,-6.25e+00,+6.28e+00 1 Vertex: -216 ID: 0 (X,cT)=-3.81e+00,+2.43e+00,-3.67e+01,+3.70e+01 I: 1 561 311 -1.87e+01,+1.16e+01,-1.82e+02,+1.84e+02 2 -216 - O: 1 607 130 -1.87e+01,+1.16e+01,-1.82e+02,+1.84e+02 1 (nil) + O: 1 607 130 -1.87e+01,+1.16e+01,-1.82e+02,+1.84e+02 1 Vertex: -217 ID: 0 (X,cT)=-8.57e+01,+5.84e+01,-1.21e+03,+1.22e+03 I: 1 563 310 -4.47e-01,+3.05e-01,-6.33e+00,+6.37e+00 2 -217 O: 2 608 111 -3.60e-01,+3.29e-01,-3.33e+00,+3.37e+00 2 -220 @@ -1533,29 +1652,29 @@ Vertex: -218 ID: 0 (X,cT)=-1.70e+00,+1.75e+00,-2.03e+01,+2.05e+01 611 111 -7.72e-01,+7.38e-01,-9.69e+00,+9.75e+00 2 -223 Vertex: -219 ID: 0 (X,cT)=+1.58e-01,-6.64e-02,-8.93e-01,+9.27e-01 I: 1 588 223 +4.87e-01,-3.58e-01,-4.53e+00,+4.64e+00 2 -219 - O: 3 612 -211 +3.21e-01,-2.23e-01,-1.77e+00,+1.82e+00 1 (nil) - 613 211 +1.03e-01,-2.97e-01,-2.00e+00,+2.03e+00 1 (nil) + O: 3 612 -211 +3.21e-01,-2.23e-01,-1.77e+00,+1.82e+00 1 + 613 211 +1.03e-01,-2.97e-01,-2.00e+00,+2.03e+00 1 614 111 +6.30e-02,+1.63e-01,-7.63e-01,+7.94e-01 2 -224 Vertex: -220 ID: 0 (X,cT)=-8.57e+01,+5.84e+01,-1.21e+03,+1.22e+03 I: 1 608 111 -3.60e-01,+3.29e-01,-3.33e+00,+3.37e+00 2 -220 - O: 2 615 22 -3.26e-01,+2.76e-01,-3.12e+00,+3.15e+00 1 (nil) - 616 22 -3.41e-02,+5.33e-02,-2.15e-01,+2.24e-01 1 (nil) + O: 2 615 22 -3.26e-01,+2.76e-01,-3.12e+00,+3.15e+00 1 + 616 22 -3.41e-02,+5.33e-02,-2.15e-01,+2.24e-01 1 Vertex: -221 ID: 0 (X,cT)=-8.57e+01,+5.84e+01,-1.21e+03,+1.22e+03 I: 1 609 111 -8.72e-02,-2.40e-02,-2.99e+00,+3.00e+00 2 -221 - O: 2 617 22 -1.01e-01,+2.75e-02,-2.29e+00,+2.30e+00 1 (nil) - 618 22 +1.37e-02,-5.15e-02,-7.01e-01,+7.03e-01 1 (nil) + O: 2 617 22 -1.01e-01,+2.75e-02,-2.29e+00,+2.30e+00 1 + 618 22 +1.37e-02,-5.15e-02,-7.01e-01,+7.03e-01 1 Vertex: -222 ID: 0 (X,cT)=-1.70e+00,+1.75e+00,-2.03e+01,+2.05e+01 I: 1 610 111 -1.61e-01,+2.25e-01,-1.49e+00,+1.52e+00 2 -222 - O: 2 619 22 -7.30e-02,+2.04e-01,-1.01e+00,+1.03e+00 1 (nil) - 620 22 -8.76e-02,+2.04e-02,-4.77e-01,+4.85e-01 1 (nil) + O: 2 619 22 -7.30e-02,+2.04e-01,-1.01e+00,+1.03e+00 1 + 620 22 -8.76e-02,+2.04e-02,-4.77e-01,+4.85e-01 1 Vertex: -223 ID: 0 (X,cT)=-1.70e+00,+1.75e+00,-2.03e+01,+2.05e+01 I: 1 611 111 -7.72e-01,+7.38e-01,-9.69e+00,+9.75e+00 2 -223 - O: 2 621 22 -6.72e-01,+5.71e-01,-7.86e+00,+7.91e+00 1 (nil) - 622 22 -1.00e-01,+1.67e-01,-1.82e+00,+1.83e+00 1 (nil) + O: 2 621 22 -6.72e-01,+5.71e-01,-7.86e+00,+7.91e+00 1 + 622 22 -1.00e-01,+1.67e-01,-1.82e+00,+1.83e+00 1 Vertex: -224 ID: 0 (X,cT)=+1.58e-01,-6.64e-02,-8.93e-01,+9.27e-01 I: 1 614 111 +6.30e-02,+1.63e-01,-7.63e-01,+7.94e-01 2 -224 - O: 2 623 22 -8.72e-03,-2.00e-02,-1.18e-01,+1.20e-01 1 (nil) - 624 22 +7.17e-02,+1.83e-01,-6.45e-01,+6.74e-01 1 (nil) + O: 2 623 22 -8.72e-03,-2.00e-02,-1.18e-01,+1.20e-01 1 + 624 22 +7.17e-02,+1.83e-01,-6.45e-01,+6.74e-01 1 ________________________________________________________________________________ Stage 0->1 : 0 hits found in the muon chamber. ++++++++ event aborted @@ -1570,7 +1689,7 @@ GenEvent: #3 ID=20 SignalProcessGenVertex Barcode: 0 Entries this event: 102 vertices, 280 particles. RndmState(0)= Wgts(0)= - EventScale -1 GeV alphaQCD=-1 alphaQED=-1 + EventScale -1 [energy] alphaQCD=-1 alphaQED=-1 GenParticle Legend Barcode PDG ID ( Px, Py, Pz, E ) Stat DecayVtx ________________________________________________________________________________ @@ -1585,71 +1704,88 @@ GenVertex: -2 ID: 0 (X,cT):0 4 1 -2.49e+00,-5.11e-01,-1.27e+03,+1.27e+03 3 -4 GenVertex: -3 ID: 0 (X,cT):0 I: 1 3 21 +5.50e-01,+2.26e-01,+5.57e+01,+5.57e+01 3 -3 - O: 4 13 2 -1.06e+00,+5.40e-01,+6.25e-01,+1.38e+00 2 -9 + O: 4 17 21 -1.67e-01,+9.43e-01,-4.22e+00,+4.33e+00 2 -11 + 13 2 -1.06e+00,+5.40e-01,+6.25e-01,+1.38e+00 2 -9 16 21 +1.28e+00,-8.74e-01,+5.02e+01,+5.02e+01 2 -11 5 -2 +5.15e-01,-3.71e-01,+4.37e+00,+4.41e+00 3 -5 - 17 21 -1.67e-01,+9.43e-01,-4.22e+00,+4.33e+00 2 -11 GenVertex: -4 ID: 0 (X,cT):0 I: 1 4 1 -2.49e+00,-5.11e-01,-1.27e+03,+1.27e+03 3 -4 - O: 7 23 21 -6.21e-01,-2.83e+00,-4.24e+01,+4.25e+01 2 -11 - 24 21 -1.09e-01,+2.50e-02,-1.28e+01,+1.28e+01 2 -11 - 25 21 -4.72e-02,-2.81e-01,-7.30e+00,+7.31e+00 2 -11 - 26 21 -3.65e+00,+1.06e+00,-1.44e+02,+1.44e+02 2 -11 + O: 7 26 21 -3.65e+00,+1.06e+00,-1.44e+02,+1.44e+02 2 -11 27 21 -8.57e-01,+1.30e+00,-8.64e+01,+8.64e+01 2 -11 28 21 +2.10e-01,-2.36e-01,-5.04e+02,+5.04e+02 2 -11 6 1 +2.57e+00,+4.38e-01,-4.63e+02,+4.63e+02 3 -5 + 23 21 -6.21e-01,-2.83e+00,-4.24e+01,+4.25e+01 2 -11 + 25 21 -4.72e-02,-2.81e-01,-7.30e+00,+7.31e+00 2 -11 + 24 21 -1.09e-01,+2.50e-02,-1.28e+01,+1.28e+01 2 -11 GenVertex: -5 ID: 0 (X,cT):0 - I: 2 5 -2 +5.15e-01,-3.71e-01,+4.37e+00,+4.41e+00 3 -5 - 6 1 +2.57e+00,+4.38e-01,-4.63e+02,+4.63e+02 3 -5 + I: 2 6 1 +2.57e+00,+4.38e-01,-4.63e+02,+4.63e+02 3 -5 + 5 -2 +5.15e-01,-3.71e-01,+4.37e+00,+4.41e+00 3 -5 O: 2 8 -24 +2.48e+00,-4.66e+00,-4.53e+02,+4.60e+02 3 -7 7 22 +6.11e-01,+4.73e+00,-5.78e+00,+7.50e+00 3 -6 GenVertex: -6 ID: 0 (X,cT):0 I: 1 7 22 +6.11e-01,+4.73e+00,-5.78e+00,+7.50e+00 3 -6 - O: 1 9 22 +6.11e-01,+4.73e+00,-5.78e+00,+7.50e+00 1 (nil) + O: 1 9 22 +6.11e-01,+4.73e+00,-5.78e+00,+7.50e+00 1 GenVertex: -7 ID: 0 (X,cT):0 I: 1 8 -24 +2.48e+00,-4.66e+00,-4.53e+02,+4.60e+02 3 -7 O: 1 10 -24 +2.48e+00,-4.66e+00,-4.53e+02,+4.60e+02 2 -8 GenVertex: -8 ID: 0 (X,cT):0 I: 1 10 -24 +2.48e+00,-4.66e+00,-4.53e+02,+4.60e+02 2 -8 - O: 2 12 -14 -9.19e+00,-3.92e+01,-1.68e+02,+1.73e+02 1 (nil) - 11 13 +1.17e+01,+3.45e+01,-2.85e+02,+2.87e+02 1 (nil) + O: 2 12 -14 -9.19e+00,-3.92e+01,-1.68e+02,+1.73e+02 1 + 11 13 +1.17e+01,+3.45e+01,-2.85e+02,+2.87e+02 1 GenVertex: -9 ID: 0 (X,cT):0 - I: 2 14 2101 -9.42e-01,+2.17e-01,+6.53e+03,+6.53e+03 2 -9 - 13 2 -1.06e+00,+5.40e-01,+6.25e-01,+1.38e+00 2 -9 + I: 2 13 2 -1.06e+00,+5.40e-01,+6.25e-01,+1.38e+00 2 -9 + 14 2101 -9.42e-01,+2.17e-01,+6.53e+03,+6.53e+03 2 -9 O: 1 35 92 -2.00e+00,+7.56e-01,+6.53e+03,+6.54e+03 2 -10 GenVertex: -10 ID: 0 (X,cT):0 I: 1 35 92 -2.00e+00,+7.56e-01,+6.53e+03,+6.54e+03 2 -10 O: 9 37 333 -1.11e+00,+1.44e-01,+2.44e+00,+2.87e+00 2 -17 - 38 -321 +5.75e-01,-1.63e-01,+3.07e+00,+3.17e+00 1 (nil) + 38 -321 +5.75e-01,-1.63e-01,+3.07e+00,+3.17e+00 1 39 323 -4.93e-01,+1.18e-01,+1.14e+01,+1.14e+01 2 -18 40 333 +4.67e-02,-1.10e-02,+6.10e+01,+6.10e+01 2 -19 41 -313 +6.61e-02,+2.00e-01,+1.02e+02,+1.02e+02 2 -20 - 42 -211 +6.62e-01,+2.34e-03,+1.91e+01,+1.92e+01 1 (nil) + 42 -211 +6.62e-01,+2.34e-03,+1.91e+01,+1.92e+01 1 43 213 -1.13e+00,+2.68e-01,+8.99e+02,+8.99e+02 2 -21 - 44 2112 -3.44e-01,+2.18e-02,+5.44e+03,+5.44e+03 1 (nil) - 36 321 -2.73e-01,+1.76e-01,+9.69e-01,+1.13e+00 1 (nil) + 44 2112 -3.44e-01,+2.18e-02,+5.44e+03,+5.44e+03 1 + 36 321 -2.73e-01,+1.76e-01,+9.69e-01,+1.13e+00 1 GenVertex: -11 ID: 0 (X,cT):0 - I:15 29 2203 +2.49e+00,+5.11e-01,-5.57e+03,+5.57e+03 2 -11 - 23 21 -6.21e-01,-2.83e+00,-4.24e+01,+4.25e+01 2 -11 - 24 21 -1.09e-01,+2.50e-02,-1.28e+01,+1.28e+01 2 -11 - 25 21 -4.72e-02,-2.81e-01,-7.30e+00,+7.31e+00 2 -11 + I:15 17 21 -1.67e-01,+9.43e-01,-4.22e+00,+4.33e+00 2 -11 26 21 -3.65e+00,+1.06e+00,-1.44e+02,+1.44e+02 2 -11 + 15 2 +3.93e-01,-4.42e-01,+2.02e+01,+2.03e+01 2 -11 27 21 -8.57e-01,+1.30e+00,-8.64e+01,+8.64e+01 2 -11 28 21 +2.10e-01,-2.36e-01,-5.04e+02,+5.04e+02 2 -11 - 15 2 +3.93e-01,-4.42e-01,+2.02e+01,+2.03e+01 2 -11 + 23 21 -6.21e-01,-2.83e+00,-4.24e+01,+4.25e+01 2 -11 + 29 2203 +2.49e+00,+5.11e-01,-5.57e+03,+5.57e+03 2 -11 + 16 21 +1.28e+00,-8.74e-01,+5.02e+01,+5.02e+01 2 -11 + 25 21 -4.72e-02,-2.81e-01,-7.30e+00,+7.31e+00 2 -11 + 24 21 -1.09e-01,+2.50e-02,-1.28e+01,+1.28e+01 2 -11 18 21 +9.34e-01,+2.91e+00,+1.97e+01,+2.00e+01 2 -11 19 21 -2.14e+00,+4.17e+00,-2.51e+00,+5.32e+00 2 -11 20 21 +2.14e+00,-4.17e+00,-7.24e+00,+8.62e+00 2 -11 21 21 +2.68e+00,-1.72e+00,-3.07e+01,+3.09e+01 2 -11 22 21 -2.68e+00,+1.72e+00,-1.05e+02,+1.05e+02 2 -11 - 16 21 +1.28e+00,-8.74e-01,+5.02e+01,+5.02e+01 2 -11 - 17 21 -1.67e-01,+9.43e-01,-4.22e+00,+4.33e+00 2 -11 O: 1 45 92 -1.50e-01,+2.09e+00,-6.43e+03,+6.61e+03 2 -12 GenVertex: -12 ID: 0 (X,cT):0 I: 1 45 92 -1.50e-01,+2.09e+00,-6.43e+03,+6.61e+03 2 -12 - O:44 46 211 +1.39e+00,-8.14e-01,+3.12e+01,+3.13e+01 1 (nil) + O:44 82 311 -1.74e-02,+2.33e-01,-6.04e+01,+6.04e+01 2 -45 + 84 211 -1.34e-01,-9.12e-02,-7.11e+00,+7.11e+00 1 + 72 213 +4.81e-01,-1.41e-01,-1.37e+01,+1.37e+01 2 -40 + 73 111 -6.69e-01,+1.78e-01,-1.87e+01,+1.87e+01 2 -41 + 83 -323 -5.63e-01,-7.34e-02,-1.48e+02,+1.48e+02 2 -46 + 86 -211 +2.67e-01,-2.79e-01,-5.20e+02,+5.20e+02 1 47 113 +6.88e-02,-1.41e-01,+2.65e+01,+2.66e+01 2 -22 - 48 -211 -3.37e-01,-1.68e-01,+9.43e+00,+9.44e+00 1 (nil) + 76 -2212 -6.65e-01,+6.91e-02,-2.61e+01,+2.61e+01 1 + 77 3224 -4.07e-01,-1.66e+00,-3.45e+01,+3.46e+01 2 -43 + 78 311 -2.78e-01,+5.33e-02,-1.90e+01,+1.90e+01 2 -44 + 79 -2112 -1.86e+00,+2.64e-01,-6.69e+01,+6.69e+01 1 + 80 -211 -4.20e-01,-6.99e-02,-4.46e+01,+4.47e+01 1 + 81 211 -1.23e+00,+5.35e-01,-3.48e+01,+3.49e+01 1 + 85 113 +1.80e-02,+8.34e-01,-6.47e+02,+6.47e+02 2 -47 + 88 2214 +5.67e-01,+9.88e-02,-8.80e+02,+8.80e+02 2 -49 + 87 213 +3.40e-01,+1.94e-01,-1.02e+03,+1.02e+03 2 -48 + 89 223 +1.23e+00,+3.33e-01,-2.87e+03,+2.87e+03 2 -50 + 48 -211 -3.37e-01,-1.68e-01,+9.43e+00,+9.44e+00 1 + 46 211 +1.39e+00,-8.14e-01,+3.12e+01,+3.13e+01 1 + 71 -321 -2.78e-01,+3.30e-01,-8.84e+00,+8.87e+00 1 49 113 +6.00e-01,-2.67e-01,+2.22e+00,+2.44e+00 2 -23 50 323 -3.07e-01,-6.12e-02,-1.42e-02,+9.76e-01 2 -24 51 -313 +1.43e-02,+4.68e-01,-3.88e-01,+1.12e+00 2 -25 @@ -1659,38 +1795,21 @@ GenVertex: -12 ID: 0 (X,cT):0 55 113 +1.21e-01,+1.16e-01,+9.83e-01,+1.26e+00 2 -29 56 -213 +8.69e-02,+1.01e+00,+7.42e+00,+7.52e+00 2 -30 57 323 +1.76e-01,+4.23e-01,+1.93e+00,+2.16e+00 2 -31 - 58 -321 +1.93e-01,+1.97e-01,+6.13e+00,+6.16e+00 1 (nil) + 58 -321 +1.93e-01,+1.97e-01,+6.13e+00,+6.16e+00 1 59 223 -2.63e-01,+7.90e-01,+6.47e-01,+1.31e+00 2 -32 60 213 +1.35e-01,+1.08e+00,+5.74e-01,+1.37e+00 2 -33 - 61 -211 -1.05e+00,+1.11e+00,-1.21e-01,+1.54e+00 1 (nil) + 61 -211 -1.05e+00,+1.11e+00,-1.21e-01,+1.54e+00 1 62 213 -9.08e-02,+5.82e-01,-1.54e+00,+1.76e+00 2 -34 63 221 +1.94e-01,-2.74e-01,-2.66e-01,+6.95e-01 2 -35 64 -213 +2.31e-01,+2.74e-01,-1.31e+00,+1.58e+00 2 -36 65 213 -4.52e-01,+2.86e-01,-1.23e+00,+1.57e+00 2 -37 66 2114 +9.53e-01,-6.69e-01,-3.09e+00,+3.53e+00 2 -38 - 67 211 -1.36e-01,-6.50e-01,-8.86e-01,+1.12e+00 1 (nil) - 68 -2212 +8.49e-01,-2.09e+00,-5.29e+00,+5.82e+00 1 (nil) - 69 -211 +1.20e-01,+2.39e-01,-1.06e+00,+1.10e+00 1 (nil) + 67 211 -1.36e-01,-6.50e-01,-8.86e-01,+1.12e+00 1 + 68 -2212 +8.49e-01,-2.09e+00,-5.29e+00,+5.82e+00 1 + 69 -211 +1.20e-01,+2.39e-01,-1.06e+00,+1.10e+00 1 70 323 +1.48e+00,-9.63e-01,-1.55e+01,+1.56e+01 2 -39 - 71 -321 -2.78e-01,+3.30e-01,-8.84e+00,+8.87e+00 1 (nil) - 72 213 +4.81e-01,-1.41e-01,-1.37e+01,+1.37e+01 2 -40 - 73 111 -6.69e-01,+1.78e-01,-1.87e+01,+1.87e+01 2 -41 + 75 2212 -3.93e-01,+8.27e-02,-3.98e+01,+3.98e+01 1 74 -213 -3.45e-01,-1.71e-01,-1.77e+01,+1.77e+01 2 -42 - 75 2212 -3.93e-01,+8.27e-02,-3.98e+01,+3.98e+01 1 (nil) - 76 -2212 -6.65e-01,+6.91e-02,-2.61e+01,+2.61e+01 1 (nil) - 77 3224 -4.07e-01,-1.66e+00,-3.45e+01,+3.46e+01 2 -43 - 78 311 -2.78e-01,+5.33e-02,-1.90e+01,+1.90e+01 2 -44 - 79 -2112 -1.86e+00,+2.64e-01,-6.69e+01,+6.69e+01 1 (nil) - 80 -211 -4.20e-01,-6.99e-02,-4.46e+01,+4.47e+01 1 (nil) - 81 211 -1.23e+00,+5.35e-01,-3.48e+01,+3.49e+01 1 (nil) - 82 311 -1.74e-02,+2.33e-01,-6.04e+01,+6.04e+01 2 -45 - 83 -323 -5.63e-01,-7.34e-02,-1.48e+02,+1.48e+02 2 -46 - 84 211 -1.34e-01,-9.12e-02,-7.11e+00,+7.11e+00 1 (nil) - 85 113 +1.80e-02,+8.34e-01,-6.47e+02,+6.47e+02 2 -47 - 86 -211 +2.67e-01,-2.79e-01,-5.20e+02,+5.20e+02 1 (nil) - 87 213 +3.40e-01,+1.94e-01,-1.02e+03,+1.02e+03 2 -48 - 88 2214 +5.67e-01,+9.88e-02,-8.80e+02,+8.80e+02 2 -49 - 89 223 +1.23e+00,+3.33e-01,-2.87e+03,+2.87e+03 2 -50 GenVertex: -13 ID: 0 (X,cT):0 I: 3 30 21 -3.00e+00,+2.35e+00,+2.36e+02,+2.36e+02 2 -13 31 21 -9.34e-01,-2.91e+00,+1.02e+02,+1.02e+02 2 -13 @@ -1698,218 +1817,218 @@ GenVertex: -13 ID: 0 (X,cT):0 O: 1 90 92 -9.34e-01,-2.91e+00,+3.67e+02,+3.67e+02 2 -14 GenVertex: -14 ID: 0 (X,cT):0 I: 1 90 92 -9.34e-01,-2.91e+00,+3.67e+02,+3.67e+02 2 -14 - O:11 91 211 -8.24e-01,-1.45e-02,+1.59e+01,+1.59e+01 1 (nil) - 92 -211 -1.30e+00,+8.92e-01,+8.32e+01,+8.33e+01 1 (nil) + O:11 96 113 -1.28e-01,-1.56e-01,+3.41e+01,+3.41e+01 2 -54 + 100 2112 +5.39e-01,-8.02e-01,+1.40e+01,+1.41e+01 1 + 92 -211 -1.30e+00,+8.92e-01,+8.32e+01,+8.33e+01 1 + 95 213 -8.94e-01,-3.47e-01,+5.52e+01,+5.52e+01 2 -53 + 97 -211 -5.72e-01,-9.49e-01,+3.99e+01,+3.99e+01 1 + 98 111 +4.23e-01,-2.45e-01,+3.08e+00,+3.12e+00 2 -55 + 99 -2112 +1.14e+00,-1.49e+00,+2.49e+01,+2.50e+01 1 + 101 223 +1.06e+00,-1.22e-01,+2.53e+01,+2.53e+01 2 -56 + 91 211 -8.24e-01,-1.45e-02,+1.59e+01,+1.59e+01 1 93 -311 -2.08e-02,-2.14e-01,+2.11e+01,+2.11e+01 2 -51 94 313 -3.62e-01,+5.42e-01,+5.03e+01,+5.03e+01 2 -52 - 95 213 -8.94e-01,-3.47e-01,+5.52e+01,+5.52e+01 2 -53 - 96 113 -1.28e-01,-1.56e-01,+3.41e+01,+3.41e+01 2 -54 - 97 -211 -5.72e-01,-9.49e-01,+3.99e+01,+3.99e+01 1 (nil) - 98 111 +4.23e-01,-2.45e-01,+3.08e+00,+3.12e+00 2 -55 - 99 -2112 +1.14e+00,-1.49e+00,+2.49e+01,+2.50e+01 1 (nil) - 100 2112 +5.39e-01,-8.02e-01,+1.40e+01,+1.41e+01 1 (nil) - 101 223 +1.06e+00,-1.22e-01,+2.53e+01,+2.53e+01 2 -56 GenVertex: -15 ID: 0 (X,cT):0 I: 2 33 21 +1.02e+00,-2.88e+00,-9.85e+00,+1.03e+01 2 -15 34 21 -1.02e+00,+2.88e+00,-7.45e+00,+8.05e+00 2 -15 O: 1 102 92 +0.00e+00,+0.00e+00,-1.73e+01,+1.84e+01 2 -16 GenVertex: -16 ID: 0 (X,cT):0 I: 1 102 92 +0.00e+00,+0.00e+00,-1.73e+01,+1.84e+01 2 -16 - O: 7 106 111 +1.94e-01,-8.30e-01,-1.78e+00,+1.98e+00 2 -60 - 107 -211 -2.88e-01,+5.23e-01,-3.10e+00,+3.16e+00 1 (nil) - 108 223 +2.53e-01,-1.38e-01,-2.52e+00,+2.66e+00 2 -61 + O: 7 103 113 +2.54e-01,-1.28e-01,-3.69e+00,+3.77e+00 2 -57 109 113 -5.13e-01,+2.04e-01,-2.60e+00,+2.77e+00 2 -62 - 103 113 +2.54e-01,-1.28e-01,-3.69e+00,+3.77e+00 2 -57 104 223 -7.85e-02,+4.34e-02,-9.82e-01,+1.26e+00 2 -58 105 213 +1.78e-01,+3.27e-01,-2.62e+00,+2.77e+00 2 -59 + 106 111 +1.94e-01,-8.30e-01,-1.78e+00,+1.98e+00 2 -60 + 107 -211 -2.88e-01,+5.23e-01,-3.10e+00,+3.16e+00 1 + 108 223 +2.53e-01,-1.38e-01,-2.52e+00,+2.66e+00 2 -61 GenVertex: -17 ID: 0 (X,cT):0 I: 1 37 333 -1.11e+00,+1.44e-01,+2.44e+00,+2.87e+00 2 -17 - O: 2 110 321 -5.35e-01,-4.15e-03,+1.39e+00,+1.57e+00 1 (nil) - 111 -321 -5.74e-01,+1.48e-01,+1.05e+00,+1.30e+00 1 (nil) + O: 2 111 -321 -5.74e-01,+1.48e-01,+1.05e+00,+1.30e+00 1 + 110 321 -5.35e-01,-4.15e-03,+1.39e+00,+1.57e+00 1 GenVertex: -18 ID: 0 (X,cT):0 I: 1 39 323 -4.93e-01,+1.18e-01,+1.14e+01,+1.14e+01 2 -18 O: 2 112 311 -1.65e-01,+7.95e-02,+8.26e+00,+8.27e+00 2 -63 - 113 211 -3.29e-01,+3.86e-02,+3.09e+00,+3.12e+00 1 (nil) + 113 211 -3.29e-01,+3.86e-02,+3.09e+00,+3.12e+00 1 GenVertex: -19 ID: 0 (X,cT):0 I: 1 40 333 +4.67e-02,-1.10e-02,+6.10e+01,+6.10e+01 2 -19 - O: 2 114 321 -8.91e-02,+3.84e-02,+3.21e+01,+3.21e+01 1 (nil) - 115 -321 +1.36e-01,-4.94e-02,+2.89e+01,+2.89e+01 1 (nil) + O: 2 114 321 -8.91e-02,+3.84e-02,+3.21e+01,+3.21e+01 1 + 115 -321 +1.36e-01,-4.94e-02,+2.89e+01,+2.89e+01 1 GenVertex: -20 ID: 0 (X,cT):0 I: 1 41 -313 +6.61e-02,+2.00e-01,+1.02e+02,+1.02e+02 2 -20 O: 2 116 -311 -2.08e-01,+2.83e-01,+4.52e+01,+4.53e+01 2 -64 117 111 +2.74e-01,-8.21e-02,+5.65e+01,+5.65e+01 2 -65 GenVertex: -21 ID: 0 (X,cT):0 I: 1 43 213 -1.13e+00,+2.68e-01,+8.99e+02,+8.99e+02 2 -21 - O: 2 118 211 -1.03e+00,+4.32e-01,+6.38e+02,+6.38e+02 1 (nil) + O: 2 118 211 -1.03e+00,+4.32e-01,+6.38e+02,+6.38e+02 1 119 111 -1.00e-01,-1.65e-01,+2.61e+02,+2.61e+02 2 -66 GenVertex: -22 ID: 0 (X,cT):0 I: 1 47 113 +6.88e-02,-1.41e-01,+2.65e+01,+2.66e+01 2 -22 - O: 2 120 -211 +2.55e-01,-1.00e-02,+2.33e+01,+2.33e+01 1 (nil) - 121 211 -1.86e-01,-1.31e-01,+3.23e+00,+3.24e+00 1 (nil) + O: 2 120 -211 +2.55e-01,-1.00e-02,+2.33e+01,+2.33e+01 1 + 121 211 -1.86e-01,-1.31e-01,+3.23e+00,+3.24e+00 1 GenVertex: -23 ID: 0 (X,cT):0 I: 1 49 113 +6.00e-01,-2.67e-01,+2.22e+00,+2.44e+00 2 -23 - O: 2 122 211 +7.62e-01,-2.15e-01,+1.64e+00,+1.83e+00 1 (nil) - 123 -211 -1.62e-01,-5.17e-02,+5.74e-01,+6.14e-01 1 (nil) + O: 2 122 211 +7.62e-01,-2.15e-01,+1.64e+00,+1.83e+00 1 + 123 -211 -1.62e-01,-5.17e-02,+5.74e-01,+6.14e-01 1 GenVertex: -24 ID: 0 (X,cT):0 I: 1 50 323 -3.07e-01,-6.12e-02,-1.42e-02,+9.76e-01 2 -24 O: 2 124 311 -4.48e-01,-2.27e-01,-7.65e-02,+7.11e-01 2 -67 - 125 211 +1.40e-01,+1.66e-01,+6.23e-02,+2.65e-01 1 (nil) + 125 211 +1.40e-01,+1.66e-01,+6.23e-02,+2.65e-01 1 GenVertex: -25 ID: 0 (X,cT):0 I: 1 51 -313 +1.43e-02,+4.68e-01,-3.88e-01,+1.12e+00 2 -25 - O: 2 126 -321 -2.60e-02,+2.92e-01,+9.54e-02,+5.82e-01 1 (nil) - 127 211 +4.03e-02,+1.76e-01,-4.83e-01,+5.35e-01 1 (nil) + O: 2 126 -321 -2.60e-02,+2.92e-01,+9.54e-02,+5.82e-01 1 + 127 211 +4.03e-02,+1.76e-01,-4.83e-01,+5.35e-01 1 Vertex: -26 ID: 0 (X,cT)=+4.64e-05,-7.72e-06,-4.10e-04,+4.20e-04 I: 1 52 111 +8.08e-02,-1.35e-02,-7.15e-01,+7.33e-01 2 -26 - O: 2 128 22 -1.68e-02,+2.28e-02,-3.88e-02,+4.80e-02 1 (nil) - 129 22 +9.76e-02,-3.63e-02,-6.77e-01,+6.85e-01 1 (nil) + O: 2 129 22 +9.76e-02,-3.63e-02,-6.77e-01,+6.85e-01 1 + 128 22 -1.68e-02,+2.28e-02,-3.88e-02,+4.80e-02 1 GenVertex: -27 ID: 0 (X,cT):0 I: 1 53 113 -2.30e-01,+1.48e-01,-1.62e+00,+1.84e+00 2 -27 - O: 2 130 -211 -8.09e-02,+2.95e-01,-1.97e-01,+3.90e-01 1 (nil) - 131 211 -1.49e-01,-1.47e-01,-1.43e+00,+1.45e+00 1 (nil) + O: 2 130 -211 -8.09e-02,+2.95e-01,-1.97e-01,+3.90e-01 1 + 131 211 -1.49e-01,-1.47e-01,-1.43e+00,+1.45e+00 1 GenVertex: -28 ID: 0 (X,cT):0 I: 1 54 223 +3.60e-01,+7.58e-01,+8.72e-01,+1.44e+00 2 -28 - O: 3 132 211 +1.97e-01,+3.51e-01,+6.75e-01,+7.98e-01 1 (nil) - 133 -211 -3.88e-02,+1.47e-01,+2.00e-01,+2.87e-01 1 (nil) + O: 3 132 211 +1.97e-01,+3.51e-01,+6.75e-01,+7.98e-01 1 + 133 -211 -3.88e-02,+1.47e-01,+2.00e-01,+2.87e-01 1 134 111 +2.02e-01,+2.60e-01,-3.27e-03,+3.56e-01 2 -68 GenVertex: -29 ID: 0 (X,cT):0 I: 1 55 113 +1.21e-01,+1.16e-01,+9.83e-01,+1.26e+00 2 -29 - O: 2 135 -211 +1.15e-01,+2.71e-01,+9.97e-01,+1.05e+00 1 (nil) - 136 211 +5.83e-03,-1.56e-01,-1.47e-02,+2.10e-01 1 (nil) + O: 2 135 -211 +1.15e-01,+2.71e-01,+9.97e-01,+1.05e+00 1 + 136 211 +5.83e-03,-1.56e-01,-1.47e-02,+2.10e-01 1 GenVertex: -30 ID: 0 (X,cT):0 I: 1 56 -213 +8.69e-02,+1.01e+00,+7.42e+00,+7.52e+00 2 -30 - O: 2 137 -211 -8.49e-03,+1.28e-01,+3.83e-01,+4.28e-01 1 (nil) + O: 2 137 -211 -8.49e-03,+1.28e-01,+3.83e-01,+4.28e-01 1 138 111 +9.53e-02,+8.80e-01,+7.03e+00,+7.09e+00 2 -69 GenVertex: -31 ID: 0 (X,cT):0 I: 1 57 323 +1.76e-01,+4.23e-01,+1.93e+00,+2.16e+00 2 -31 O: 2 139 311 +6.63e-02,+5.21e-01,+1.76e+00,+1.90e+00 2 -70 - 140 211 +1.10e-01,-9.78e-02,+1.66e-01,+2.62e-01 1 (nil) + 140 211 +1.10e-01,-9.78e-02,+1.66e-01,+2.62e-01 1 GenVertex: -32 ID: 0 (X,cT):0 I: 1 59 223 -2.63e-01,+7.90e-01,+6.47e-01,+1.31e+00 2 -32 - O: 3 141 211 -1.81e-01,+4.47e-01,+1.25e-01,+5.17e-01 1 (nil) - 142 -211 -2.25e-01,+2.99e-01,+3.59e-01,+5.38e-01 1 (nil) - 143 111 +1.43e-01,+4.38e-02,+1.63e-01,+2.59e-01 2 -71 + O: 3 143 111 +1.43e-01,+4.38e-02,+1.63e-01,+2.59e-01 2 -71 + 141 211 -1.81e-01,+4.47e-01,+1.25e-01,+5.17e-01 1 + 142 -211 -2.25e-01,+2.99e-01,+3.59e-01,+5.38e-01 1 GenVertex: -33 ID: 0 (X,cT):0 I: 1 60 213 +1.35e-01,+1.08e+00,+5.74e-01,+1.37e+00 2 -33 - O: 2 144 211 +6.61e-02,+1.08e+00,+5.00e-01,+1.20e+00 1 (nil) + O: 2 144 211 +6.61e-02,+1.08e+00,+5.00e-01,+1.20e+00 1 145 111 +6.86e-02,-8.01e-04,+7.43e-02,+1.69e-01 2 -72 GenVertex: -34 ID: 0 (X,cT):0 I: 1 62 213 -9.08e-02,+5.82e-01,-1.54e+00,+1.76e+00 2 -34 - O: 2 146 211 -4.09e-02,-5.32e-02,-5.87e-01,+6.07e-01 1 (nil) + O: 2 146 211 -4.09e-02,-5.32e-02,-5.87e-01,+6.07e-01 1 147 111 -4.99e-02,+6.35e-01,-9.56e-01,+1.16e+00 2 -73 GenVertex: -35 ID: 0 (X,cT):0 I: 1 63 221 +1.94e-01,-2.74e-01,-2.66e-01,+6.95e-01 2 -35 - O: 3 148 111 -8.07e-02,-5.76e-02,-3.25e-02,+1.71e-01 2 -74 - 149 111 +2.01e-01,-6.40e-02,-9.60e-02,+2.68e-01 2 -75 + O: 3 149 111 +2.01e-01,-6.40e-02,-9.60e-02,+2.68e-01 2 -75 + 148 111 -8.07e-02,-5.76e-02,-3.25e-02,+1.71e-01 2 -74 150 111 +7.41e-02,-1.52e-01,-1.38e-01,+2.57e-01 2 -76 GenVertex: -36 ID: 0 (X,cT):0 I: 1 64 -213 +2.31e-01,+2.74e-01,-1.31e+00,+1.58e+00 2 -36 - O: 2 151 -211 +4.35e-01,+4.07e-01,-8.38e-01,+1.04e+00 1 (nil) + O: 2 151 -211 +4.35e-01,+4.07e-01,-8.38e-01,+1.04e+00 1 152 111 -2.04e-01,-1.33e-01,-4.69e-01,+5.45e-01 2 -77 GenVertex: -37 ID: 0 (X,cT):0 I: 1 65 213 -4.52e-01,+2.86e-01,-1.23e+00,+1.57e+00 2 -37 - O: 2 153 211 -1.15e-01,-2.61e-01,-4.89e-01,+5.83e-01 1 (nil) + O: 2 153 211 -1.15e-01,-2.61e-01,-4.89e-01,+5.83e-01 1 154 111 -3.37e-01,+5.47e-01,-7.40e-01,+9.89e-01 2 -78 GenVertex: -38 ID: 0 (X,cT):0 I: 1 66 2114 +9.53e-01,-6.69e-01,-3.09e+00,+3.53e+00 2 -38 - O: 2 155 2212 +6.04e-01,-7.13e-01,-2.45e+00,+2.79e+00 1 (nil) - 156 -211 +3.49e-01,+4.35e-02,-6.38e-01,+7.42e-01 1 (nil) + O: 2 155 2212 +6.04e-01,-7.13e-01,-2.45e+00,+2.79e+00 1 + 156 -211 +3.49e-01,+4.35e-02,-6.38e-01,+7.42e-01 1 GenVertex: -39 ID: 0 (X,cT):0 I: 1 70 323 +1.48e+00,-9.63e-01,-1.55e+01,+1.56e+01 2 -39 O: 2 157 311 +5.39e-01,-2.99e-01,-4.42e+00,+4.49e+00 2 -79 - 158 211 +9.45e-01,-6.64e-01,-1.11e+01,+1.11e+01 1 (nil) + 158 211 +9.45e-01,-6.64e-01,-1.11e+01,+1.11e+01 1 GenVertex: -40 ID: 0 (X,cT):0 I: 1 72 213 +4.81e-01,-1.41e-01,-1.37e+01,+1.37e+01 2 -40 - O: 2 159 211 +1.18e-04,-3.58e-01,-6.34e+00,+6.36e+00 1 (nil) - 160 111 +4.80e-01,+2.17e-01,-7.34e+00,+7.36e+00 2 -80 + O: 2 160 111 +4.80e-01,+2.17e-01,-7.34e+00,+7.36e+00 2 -80 + 159 211 +1.18e-04,-3.58e-01,-6.34e+00,+6.36e+00 1 Vertex: -41 ID: 0 (X,cT)=-1.16e-04,+3.09e-05,-3.23e-03,+3.24e-03 I: 1 73 111 -6.69e-01,+1.78e-01,-1.87e+01,+1.87e+01 2 -41 - O: 2 161 22 -5.04e-01,+7.96e-02,-1.28e+01,+1.28e+01 1 (nil) - 162 22 -1.65e-01,+9.88e-02,-5.90e+00,+5.90e+00 1 (nil) + O: 2 161 22 -5.04e-01,+7.96e-02,-1.28e+01,+1.28e+01 1 + 162 22 -1.65e-01,+9.88e-02,-5.90e+00,+5.90e+00 1 GenVertex: -42 ID: 0 (X,cT):0 I: 1 74 -213 -3.45e-01,-1.71e-01,-1.77e+01,+1.77e+01 2 -42 - O: 2 163 -211 +1.33e-01,+1.21e-01,-7.19e+00,+7.19e+00 1 (nil) + O: 2 163 -211 +1.33e-01,+1.21e-01,-7.19e+00,+7.19e+00 1 164 111 -4.77e-01,-2.92e-01,-1.05e+01,+1.05e+01 2 -81 GenVertex: -43 ID: 0 (X,cT):0 I: 1 77 3224 -4.07e-01,-1.66e+00,-3.45e+01,+3.46e+01 2 -43 - O: 2 165 3122 -4.69e-01,-1.62e+00,-3.09e+01,+3.09e+01 2 -82 - 166 211 +6.12e-02,-3.83e-02,-3.63e+00,+3.64e+00 1 (nil) + O: 2 166 211 +6.12e-02,-3.83e-02,-3.63e+00,+3.64e+00 1 + 165 3122 -4.69e-01,-1.62e+00,-3.09e+01,+3.09e+01 2 -82 GenVertex: -44 ID: 0 (X,cT):0 I: 1 78 311 -2.78e-01,+5.33e-02,-1.90e+01,+1.90e+01 2 -44 - O: 1 167 130 -2.78e-01,+5.33e-02,-1.90e+01,+1.90e+01 1 (nil) + O: 1 167 130 -2.78e-01,+5.33e-02,-1.90e+01,+1.90e+01 1 GenVertex: -45 ID: 0 (X,cT):0 I: 1 82 311 -1.74e-02,+2.33e-01,-6.04e+01,+6.04e+01 2 -45 O: 1 168 310 -1.74e-02,+2.33e-01,-6.04e+01,+6.04e+01 2 -83 GenVertex: -46 ID: 0 (X,cT):0 I: 1 83 -323 -5.63e-01,-7.34e-02,-1.48e+02,+1.48e+02 2 -46 O: 2 169 -311 -5.45e-01,+2.59e-01,-8.99e+01,+8.99e+01 2 -84 - 170 -211 -1.76e-02,-3.32e-01,-5.80e+01,+5.80e+01 1 (nil) + 170 -211 -1.76e-02,-3.32e-01,-5.80e+01,+5.80e+01 1 GenVertex: -47 ID: 0 (X,cT):0 I: 1 85 113 +1.80e-02,+8.34e-01,-6.47e+02,+6.47e+02 2 -47 - O: 2 171 211 +9.30e-02,-1.09e-02,-3.29e+01,+3.29e+01 1 (nil) - 172 -211 -7.50e-02,+8.45e-01,-6.14e+02,+6.14e+02 1 (nil) + O: 2 171 211 +9.30e-02,-1.09e-02,-3.29e+01,+3.29e+01 1 + 172 -211 -7.50e-02,+8.45e-01,-6.14e+02,+6.14e+02 1 GenVertex: -48 ID: 0 (X,cT):0 I: 1 87 213 +3.40e-01,+1.94e-01,-1.02e+03,+1.02e+03 2 -48 - O: 2 173 211 +8.59e-02,+3.47e-01,-6.99e+02,+6.99e+02 1 (nil) + O: 2 173 211 +8.59e-02,+3.47e-01,-6.99e+02,+6.99e+02 1 174 111 +2.54e-01,-1.53e-01,-3.24e+02,+3.24e+02 2 -85 GenVertex: -49 ID: 0 (X,cT):0 I: 1 88 2214 +5.67e-01,+9.88e-02,-8.80e+02,+8.80e+02 2 -49 - O: 2 175 2212 +3.83e-01,+1.63e-01,-5.77e+02,+5.77e+02 1 (nil) + O: 2 175 2212 +3.83e-01,+1.63e-01,-5.77e+02,+5.77e+02 1 176 111 +1.84e-01,-6.41e-02,-3.04e+02,+3.04e+02 2 -86 GenVertex: -50 ID: 0 (X,cT):0 I: 1 89 223 +1.23e+00,+3.33e-01,-2.87e+03,+2.87e+03 2 -50 - O: 3 177 211 +5.33e-01,+7.46e-02,-1.01e+03,+1.01e+03 1 (nil) - 178 -211 +4.00e-01,-1.62e-02,-1.32e+03,+1.32e+03 1 (nil) + O: 3 177 211 +5.33e-01,+7.46e-02,-1.01e+03,+1.01e+03 1 + 178 -211 +4.00e-01,-1.62e-02,-1.32e+03,+1.32e+03 1 179 111 +2.98e-01,+2.74e-01,-5.41e+02,+5.41e+02 2 -87 GenVertex: -51 ID: 0 (X,cT):0 I: 1 93 -311 -2.08e-02,-2.14e-01,+2.11e+01,+2.11e+01 2 -51 - O: 1 180 130 -2.08e-02,-2.14e-01,+2.11e+01,+2.11e+01 1 (nil) + O: 1 180 130 -2.08e-02,-2.14e-01,+2.11e+01,+2.11e+01 1 GenVertex: -52 ID: 0 (X,cT):0 I: 1 94 313 -3.62e-01,+5.42e-01,+5.03e+01,+5.03e+01 2 -52 - O: 2 181 321 -3.90e-01,+2.06e-01,+3.09e+01,+3.09e+01 1 (nil) - 182 -211 +2.79e-02,+3.36e-01,+1.94e+01,+1.94e+01 1 (nil) + O: 2 181 321 -3.90e-01,+2.06e-01,+3.09e+01,+3.09e+01 1 + 182 -211 +2.79e-02,+3.36e-01,+1.94e+01,+1.94e+01 1 GenVertex: -53 ID: 0 (X,cT):0 I: 1 95 213 -8.94e-01,-3.47e-01,+5.52e+01,+5.52e+01 2 -53 - O: 2 183 211 -8.91e-01,-1.82e-01,+3.63e+01,+3.63e+01 1 (nil) + O: 2 183 211 -8.91e-01,-1.82e-01,+3.63e+01,+3.63e+01 1 184 111 -2.63e-03,-1.65e-01,+1.89e+01,+1.89e+01 2 -88 GenVertex: -54 ID: 0 (X,cT):0 I: 1 96 113 -1.28e-01,-1.56e-01,+3.41e+01,+3.41e+01 2 -54 - O: 2 185 -211 -1.20e-02,-3.34e-01,+2.86e+01,+2.86e+01 1 (nil) - 186 211 -1.16e-01,+1.78e-01,+5.45e+00,+5.46e+00 1 (nil) + O: 2 185 -211 -1.20e-02,-3.34e-01,+2.86e+01,+2.86e+01 1 + 186 211 -1.16e-01,+1.78e-01,+5.45e+00,+5.46e+00 1 Vertex: -55 ID: 0 (X,cT)=+4.23e-05,-2.45e-05,+3.08e-04,+3.12e-04 I: 1 98 111 +4.23e-01,-2.45e-01,+3.08e+00,+3.12e+00 2 -55 - O: 2 187 22 +2.88e-01,-9.56e-02,+1.70e+00,+1.72e+00 1 (nil) - 188 22 +1.35e-01,-1.49e-01,+1.38e+00,+1.40e+00 1 (nil) + O: 2 188 22 +1.35e-01,-1.49e-01,+1.38e+00,+1.40e+00 1 + 187 22 +2.88e-01,-9.56e-02,+1.70e+00,+1.72e+00 1 GenVertex: -56 ID: 0 (X,cT):0 I: 1 101 223 +1.06e+00,-1.22e-01,+2.53e+01,+2.53e+01 2 -56 - O: 3 189 211 +5.04e-01,-1.97e-01,+8.76e+00,+8.77e+00 1 (nil) - 190 -211 +2.54e-02,-9.08e-02,+3.85e+00,+3.86e+00 1 (nil) - 191 111 +5.32e-01,+1.66e-01,+1.27e+01,+1.27e+01 2 -89 + O: 3 191 111 +5.32e-01,+1.66e-01,+1.27e+01,+1.27e+01 2 -89 + 189 211 +5.04e-01,-1.97e-01,+8.76e+00,+8.77e+00 1 + 190 -211 +2.54e-02,-9.08e-02,+3.85e+00,+3.86e+00 1 GenVertex: -57 ID: 0 (X,cT):0 I: 1 103 113 +2.54e-01,-1.28e-01,-3.69e+00,+3.77e+00 2 -57 - O: 2 192 -211 -1.71e-01,-5.67e-02,-2.24e+00,+2.25e+00 1 (nil) - 193 211 +4.26e-01,-7.15e-02,-1.45e+00,+1.52e+00 1 (nil) + O: 2 192 -211 -1.71e-01,-5.67e-02,-2.24e+00,+2.25e+00 1 + 193 211 +4.26e-01,-7.15e-02,-1.45e+00,+1.52e+00 1 GenVertex: -58 ID: 0 (X,cT):0 I: 1 104 223 -7.85e-02,+4.34e-02,-9.82e-01,+1.26e+00 2 -58 - O: 3 194 -211 +7.65e-02,-8.75e-02,-7.83e-01,+8.04e-01 1 (nil) - 195 211 -1.94e-01,+1.20e-01,-1.32e-01,+2.98e-01 1 (nil) + O: 3 194 -211 +7.65e-02,-8.75e-02,-7.83e-01,+8.04e-01 1 + 195 211 -1.94e-01,+1.20e-01,-1.32e-01,+2.98e-01 1 196 111 +3.92e-02,+1.08e-02,-6.72e-02,+1.56e-01 2 -90 GenVertex: -59 ID: 0 (X,cT):0 I: 1 105 213 +1.78e-01,+3.27e-01,-2.62e+00,+2.77e+00 2 -59 - O: 2 197 211 -2.80e-01,+2.51e-01,-1.39e+00,+1.44e+00 1 (nil) + O: 2 197 211 -2.80e-01,+2.51e-01,-1.39e+00,+1.44e+00 1 198 111 +4.58e-01,+7.63e-02,-1.24e+00,+1.33e+00 2 -91 Vertex: -60 ID: 0 (X,cT)=+9.83e-05,-4.21e-04,-9.04e-04,+1.00e-03 I: 1 106 111 +1.94e-01,-8.30e-01,-1.78e+00,+1.98e+00 2 -60 - O: 2 199 22 +1.08e-01,-5.84e-01,-1.11e+00,+1.25e+00 1 (nil) - 200 22 +8.65e-02,-2.46e-01,-6.78e-01,+7.27e-01 1 (nil) + O: 2 199 22 +1.08e-01,-5.84e-01,-1.11e+00,+1.25e+00 1 + 200 22 +8.65e-02,-2.46e-01,-6.78e-01,+7.27e-01 1 GenVertex: -61 ID: 0 (X,cT):0 I: 1 108 223 +2.53e-01,-1.38e-01,-2.52e+00,+2.66e+00 2 -61 - O: 3 201 -211 -4.19e-02,+9.47e-02,-3.16e-01,+3.61e-01 1 (nil) - 202 211 +1.25e-01,+2.93e-02,-2.70e-01,+3.30e-01 1 (nil) + O: 3 201 -211 -4.19e-02,+9.47e-02,-3.16e-01,+3.61e-01 1 + 202 211 +1.25e-01,+2.93e-02,-2.70e-01,+3.30e-01 1 203 111 +1.70e-01,-2.62e-01,-1.93e+00,+1.96e+00 2 -92 GenVertex: -62 ID: 0 (X,cT):0 I: 1 109 113 -5.13e-01,+2.04e-01,-2.60e+00,+2.77e+00 2 -62 - O: 2 204 211 -6.28e-01,+1.34e-01,-1.31e+00,+1.46e+00 1 (nil) - 205 -211 +1.15e-01,+6.97e-02,-1.29e+00,+1.30e+00 1 (nil) + O: 2 204 211 -6.28e-01,+1.34e-01,-1.31e+00,+1.46e+00 1 + 205 -211 +1.15e-01,+6.97e-02,-1.29e+00,+1.30e+00 1 GenVertex: -63 ID: 0 (X,cT):0 I: 1 112 311 -1.65e-01,+7.95e-02,+8.26e+00,+8.27e+00 2 -63 O: 1 206 310 -1.65e-01,+7.95e-02,+8.26e+00,+8.27e+00 2 -93 @@ -1918,153 +2037,153 @@ GenVertex: -64 ID: 0 (X,cT):0 O: 1 207 310 -2.08e-01,+2.83e-01,+4.52e+01,+4.53e+01 2 -94 Vertex: -65 ID: 0 (X,cT)=+7.38e-05,-2.21e-05,+1.52e-02,+1.52e-02 I: 1 117 111 +2.74e-01,-8.21e-02,+5.65e+01,+5.65e+01 2 -65 - O: 2 208 22 +3.27e-02,-6.35e-02,+1.64e+01,+1.64e+01 1 (nil) - 209 22 +2.41e-01,-1.86e-02,+4.01e+01,+4.01e+01 1 (nil) + O: 2 208 22 +3.27e-02,-6.35e-02,+1.64e+01,+1.64e+01 1 + 209 22 +2.41e-01,-1.86e-02,+4.01e+01,+4.01e+01 1 Vertex: -66 ID: 0 (X,cT)=-2.41e-05,-3.97e-05,+6.29e-02,+6.29e-02 I: 1 119 111 -1.00e-01,-1.65e-01,+2.61e+02,+2.61e+02 2 -66 - O: 2 210 22 -3.55e-02,-4.32e-03,+1.12e+02,+1.12e+02 1 (nil) - 211 22 -6.45e-02,-1.60e-01,+1.49e+02,+1.49e+02 1 (nil) + O: 2 210 22 -3.55e-02,-4.32e-03,+1.12e+02,+1.12e+02 1 + 211 22 -6.45e-02,-1.60e-01,+1.49e+02,+1.49e+02 1 GenVertex: -67 ID: 0 (X,cT):0 I: 1 124 311 -4.48e-01,-2.27e-01,-7.65e-02,+7.11e-01 2 -67 O: 1 212 310 -4.48e-01,-2.27e-01,-7.65e-02,+7.11e-01 2 -95 Vertex: -68 ID: 0 (X,cT)=+5.62e-07,+7.23e-07,-9.08e-09,+9.90e-07 I: 1 134 111 +2.02e-01,+2.60e-01,-3.27e-03,+3.56e-01 2 -68 - O: 2 213 22 +5.96e-02,+3.17e-04,-3.48e-03,+5.97e-02 1 (nil) - 214 22 +1.43e-01,+2.60e-01,+2.13e-04,+2.96e-01 1 (nil) + O: 2 213 22 +5.96e-02,+3.17e-04,-3.48e-03,+5.97e-02 1 + 214 22 +1.43e-01,+2.60e-01,+2.13e-04,+2.96e-01 1 Vertex: -69 ID: 0 (X,cT)=+6.81e-05,+6.29e-04,+5.02e-03,+5.07e-03 I: 1 138 111 +9.53e-02,+8.80e-01,+7.03e+00,+7.09e+00 2 -69 - O: 2 215 22 +9.82e-02,+6.35e-01,+5.48e+00,+5.52e+00 1 (nil) - 216 22 -2.90e-03,+2.45e-01,+1.55e+00,+1.57e+00 1 (nil) + O: 2 215 22 +9.82e-02,+6.35e-01,+5.48e+00,+5.52e+00 1 + 216 22 -2.90e-03,+2.45e-01,+1.55e+00,+1.57e+00 1 GenVertex: -70 ID: 0 (X,cT):0 I: 1 139 311 +6.63e-02,+5.21e-01,+1.76e+00,+1.90e+00 2 -70 O: 1 217 310 +6.63e-02,+5.21e-01,+1.76e+00,+1.90e+00 2 -96 Vertex: -71 ID: 0 (X,cT)=+2.07e-05,+6.35e-06,+2.36e-05,+3.76e-05 I: 1 143 111 +1.43e-01,+4.38e-02,+1.63e-01,+2.59e-01 2 -71 - O: 2 219 22 -2.87e-03,+5.32e-02,+2.80e-02,+6.02e-02 1 (nil) - 218 22 +1.46e-01,-9.35e-03,+1.35e-01,+1.99e-01 1 (nil) + O: 2 219 22 -2.87e-03,+5.32e-02,+2.80e-02,+6.02e-02 1 + 218 22 +1.46e-01,-9.35e-03,+1.35e-01,+1.99e-01 1 Vertex: -72 ID: 0 (X,cT)=+3.76e-05,-4.39e-07,+4.07e-05,+9.25e-05 I: 1 145 111 +6.86e-02,-8.01e-04,+7.43e-02,+1.69e-01 2 -72 - O: 2 220 22 +2.42e-02,+6.45e-02,+1.68e-02,+7.09e-02 1 (nil) - 221 22 +4.44e-02,-6.53e-02,+5.76e-02,+9.78e-02 1 (nil) + O: 2 220 22 +2.42e-02,+6.45e-02,+1.68e-02,+7.09e-02 1 + 221 22 +4.44e-02,-6.53e-02,+5.76e-02,+9.78e-02 1 Vertex: -73 ID: 0 (X,cT)=-5.91e-06,+7.52e-05,-1.13e-04,+1.37e-04 I: 1 147 111 -4.99e-02,+6.35e-01,-9.56e-01,+1.16e+00 2 -73 - O: 2 222 22 -6.98e-02,+2.12e-01,-3.96e-01,+4.55e-01 1 (nil) - 223 22 +1.99e-02,+4.23e-01,-5.60e-01,+7.02e-01 1 (nil) + O: 2 222 22 -6.98e-02,+2.12e-01,-3.96e-01,+4.55e-01 1 + 223 22 +1.99e-02,+4.23e-01,-5.60e-01,+7.02e-01 1 Vertex: -74 ID: 0 (X,cT)=-3.84e-05,-2.74e-05,-1.55e-05,+8.12e-05 I: 1 148 111 -8.07e-02,-5.76e-02,-3.25e-02,+1.71e-01 2 -74 - O: 2 224 22 -1.12e-01,-6.36e-02,-5.73e-03,+1.29e-01 1 (nil) - 225 22 +3.13e-02,+6.07e-03,-2.68e-02,+4.17e-02 1 (nil) + O: 2 224 22 -1.12e-01,-6.36e-02,-5.73e-03,+1.29e-01 1 + 225 22 +3.13e-02,+6.07e-03,-2.68e-02,+4.17e-02 1 Vertex: -75 ID: 0 (X,cT)=+4.38e-07,-1.40e-07,-2.10e-07,+5.85e-07 I: 1 149 111 +2.01e-01,-6.40e-02,-9.60e-02,+2.68e-01 2 -75 - O: 2 226 22 +1.78e-01,-9.49e-02,-1.07e-01,+2.28e-01 1 (nil) - 227 22 +2.25e-02,+3.09e-02,+1.06e-02,+3.97e-02 1 (nil) + O: 2 226 22 +1.78e-01,-9.49e-02,-1.07e-01,+2.28e-01 1 + 227 22 +2.25e-02,+3.09e-02,+1.06e-02,+3.97e-02 1 Vertex: -76 ID: 0 (X,cT)=+2.78e-06,-5.71e-06,-5.17e-06,+9.63e-06 I: 1 150 111 +7.41e-02,-1.52e-01,-1.38e-01,+2.57e-01 2 -76 - O: 2 228 22 +2.08e-02,-3.01e-03,-8.82e-02,+9.06e-02 1 (nil) - 229 22 +5.32e-02,-1.49e-01,-4.97e-02,+1.66e-01 1 (nil) + O: 2 228 22 +2.08e-02,-3.01e-03,-8.82e-02,+9.06e-02 1 + 229 22 +5.32e-02,-1.49e-01,-4.97e-02,+1.66e-01 1 Vertex: -77 ID: 0 (X,cT)=-1.62e-04,-1.05e-04,-3.72e-04,+4.33e-04 I: 1 152 111 -2.04e-01,-1.33e-01,-4.69e-01,+5.45e-01 2 -77 - O: 2 230 22 -5.35e-02,-1.09e-01,-1.58e-01,+1.99e-01 1 (nil) - 231 22 -1.50e-01,-2.43e-02,-3.11e-01,+3.46e-01 1 (nil) + O: 2 230 22 -5.35e-02,-1.09e-01,-1.58e-01,+1.99e-01 1 + 231 22 -1.50e-01,-2.43e-02,-3.11e-01,+3.46e-01 1 Vertex: -78 ID: 0 (X,cT)=-3.66e-05,+5.95e-05,-8.05e-05,+1.08e-04 I: 1 154 111 -3.37e-01,+5.47e-01,-7.40e-01,+9.89e-01 2 -78 - O: 2 232 22 -2.19e-01,+4.46e-01,-6.11e-01,+7.88e-01 1 (nil) - 233 22 -1.17e-01,+1.01e-01,-1.29e-01,+2.01e-01 1 (nil) + O: 2 232 22 -2.19e-01,+4.46e-01,-6.11e-01,+7.88e-01 1 + 233 22 -1.17e-01,+1.01e-01,-1.29e-01,+2.01e-01 1 GenVertex: -79 ID: 0 (X,cT):0 I: 1 157 311 +5.39e-01,-2.99e-01,-4.42e+00,+4.49e+00 2 -79 - O: 1 234 130 +5.39e-01,-2.99e-01,-4.42e+00,+4.49e+00 1 (nil) + O: 1 234 130 +5.39e-01,-2.99e-01,-4.42e+00,+4.49e+00 1 Vertex: -80 ID: 0 (X,cT)=+1.61e-05,+7.28e-06,-2.46e-04,+2.47e-04 I: 1 160 111 +4.80e-01,+2.17e-01,-7.34e+00,+7.36e+00 2 -80 - O: 2 235 22 +2.66e-01,+1.44e-01,-3.31e+00,+3.33e+00 1 (nil) - 236 22 +2.15e-01,+7.28e-02,-4.03e+00,+4.03e+00 1 (nil) + O: 2 235 22 +2.66e-01,+1.44e-01,-3.31e+00,+3.33e+00 1 + 236 22 +2.15e-01,+7.28e-02,-4.03e+00,+4.03e+00 1 Vertex: -81 ID: 0 (X,cT)=-3.45e-05,-2.11e-05,-7.57e-04,+7.58e-04 I: 1 164 111 -4.77e-01,-2.92e-01,-1.05e+01,+1.05e+01 2 -81 - O: 2 237 22 -1.85e-01,-4.71e-02,-2.98e+00,+2.99e+00 1 (nil) - 238 22 -2.92e-01,-2.45e-01,-7.48e+00,+7.49e+00 1 (nil) + O: 2 237 22 -1.85e-01,-4.71e-02,-2.98e+00,+2.99e+00 1 + 238 22 -2.92e-01,-2.45e-01,-7.48e+00,+7.49e+00 1 Vertex: -82 ID: 0 (X,cT)=-9.53e+01,-3.29e+02,-6.28e+03,+6.29e+03 I: 1 165 3122 -4.69e-01,-1.62e+00,-3.09e+01,+3.09e+01 2 -82 - O: 2 239 2212 -4.74e-01,-1.44e+00,-2.62e+01,+2.62e+01 1 (nil) - 240 -211 +5.01e-03,-1.82e-01,-4.71e+00,+4.71e+00 1 (nil) + O: 2 240 -211 +5.01e-03,-1.82e-01,-4.71e+00,+4.71e+00 1 + 239 2212 -4.74e-01,-1.44e+00,-2.62e+01,+2.62e+01 1 Vertex: -83 ID: 0 (X,cT)=-1.49e+00,+1.99e+01,-5.17e+03,+5.17e+03 I: 1 168 310 -1.74e-02,+2.33e-01,-6.04e+01,+6.04e+01 2 -83 - O: 2 241 -211 -1.84e-01,-3.33e-04,-2.55e+01,+2.55e+01 1 (nil) - 242 211 +1.67e-01,+2.33e-01,-3.49e+01,+3.49e+01 1 (nil) + O: 2 241 -211 -1.84e-01,-3.33e-04,-2.55e+01,+2.55e+01 1 + 242 211 +1.67e-01,+2.33e-01,-3.49e+01,+3.49e+01 1 GenVertex: -84 ID: 0 (X,cT):0 I: 1 169 -311 -5.45e-01,+2.59e-01,-8.99e+01,+8.99e+01 2 -84 - O: 1 243 130 -5.45e-01,+2.59e-01,-8.99e+01,+8.99e+01 1 (nil) + O: 1 243 130 -5.45e-01,+2.59e-01,-8.99e+01,+8.99e+01 1 Vertex: -85 ID: 0 (X,cT)=+5.73e-06,-3.45e-06,-7.31e-03,+7.31e-03 I: 1 174 111 +2.54e-01,-1.53e-01,-3.24e+02,+3.24e+02 2 -85 - O: 2 244 22 +1.63e-01,-5.83e-02,-2.39e+02,+2.39e+02 1 (nil) - 245 22 +9.09e-02,-9.45e-02,-8.53e+01,+8.53e+01 1 (nil) + O: 2 245 22 +9.09e-02,-9.45e-02,-8.53e+01,+8.53e+01 1 + 244 22 +1.63e-01,-5.83e-02,-2.39e+02,+2.39e+02 1 Vertex: -86 ID: 0 (X,cT)=+4.34e-06,-1.51e-06,-7.14e-03,+7.14e-03 I: 1 176 111 +1.84e-01,-6.41e-02,-3.04e+02,+3.04e+02 2 -86 - O: 2 246 22 +3.56e-02,-7.99e-02,-1.18e+02,+1.18e+02 1 (nil) - 247 22 +1.49e-01,+1.58e-02,-1.86e+02,+1.86e+02 1 (nil) + O: 2 246 22 +3.56e-02,-7.99e-02,-1.18e+02,+1.18e+02 1 + 247 22 +1.49e-01,+1.58e-02,-1.86e+02,+1.86e+02 1 Vertex: -87 ID: 0 (X,cT)=+7.08e-05,+6.51e-05,-1.28e-01,+1.28e-01 I: 1 179 111 +2.98e-01,+2.74e-01,-5.41e+02,+5.41e+02 2 -87 - O: 2 248 22 +1.81e-01,+2.40e-01,-4.18e+02,+4.18e+02 1 (nil) - 249 22 +1.17e-01,+3.44e-02,-1.23e+02,+1.23e+02 1 (nil) + O: 2 248 22 +1.81e-01,+2.40e-01,-4.18e+02,+4.18e+02 1 + 249 22 +1.17e-01,+3.44e-02,-1.23e+02,+1.23e+02 1 Vertex: -88 ID: 0 (X,cT)=-6.24e-07,-3.92e-05,+4.48e-03,+4.48e-03 I: 1 184 111 -2.63e-03,-1.65e-01,+1.89e+01,+1.89e+01 2 -88 - O: 2 250 22 -1.32e-02,-1.02e-02,+2.51e-01,+2.52e-01 1 (nil) - 251 22 +1.06e-02,-1.55e-01,+1.86e+01,+1.86e+01 1 (nil) + O: 2 250 22 -1.32e-02,-1.02e-02,+2.51e-01,+2.52e-01 1 + 251 22 +1.06e-02,-1.55e-01,+1.86e+01,+1.86e+01 1 Vertex: -89 ID: 0 (X,cT)=+1.36e-04,+4.24e-05,+3.24e-03,+3.24e-03 I: 1 191 111 +5.32e-01,+1.66e-01,+1.27e+01,+1.27e+01 2 -89 - O: 2 252 22 +1.83e-01,+1.10e-01,+5.73e+00,+5.73e+00 1 (nil) - 253 22 +3.49e-01,+5.63e-02,+6.96e+00,+6.97e+00 1 (nil) + O: 2 252 22 +1.83e-01,+1.10e-01,+5.73e+00,+5.73e+00 1 + 253 22 +3.49e-01,+5.63e-02,+6.96e+00,+6.97e+00 1 Vertex: -90 ID: 0 (X,cT)=+3.53e-05,+9.71e-06,-6.05e-05,+1.41e-04 I: 1 196 111 +3.92e-02,+1.08e-02,-6.72e-02,+1.56e-01 2 -90 - O: 2 254 22 +7.69e-02,+3.56e-02,-7.15e-02,+1.11e-01 1 (nil) - 255 22 -3.77e-02,-2.48e-02,+4.24e-03,+4.53e-02 1 (nil) + O: 2 254 22 +7.69e-02,+3.56e-02,-7.15e-02,+1.11e-01 1 + 255 22 -3.77e-02,-2.48e-02,+4.24e-03,+4.53e-02 1 Vertex: -91 ID: 0 (X,cT)=+4.08e-05,+6.79e-06,-1.10e-04,+1.18e-04 I: 1 198 111 +4.58e-01,+7.63e-02,-1.24e+00,+1.33e+00 2 -91 - O: 2 257 22 +3.37e-01,+1.15e-01,-8.96e-01,+9.65e-01 1 (nil) - 256 22 +1.21e-01,-3.91e-02,-3.40e-01,+3.63e-01 1 (nil) + O: 2 256 22 +1.21e-01,-3.91e-02,-3.40e-01,+3.63e-01 1 + 257 22 +3.37e-01,+1.15e-01,-8.96e-01,+9.65e-01 1 Vertex: -92 ID: 0 (X,cT)=+5.61e-06,-8.66e-06,-6.40e-05,+6.49e-05 I: 1 203 111 +1.70e-01,-2.62e-01,-1.93e+00,+1.96e+00 2 -92 - O: 3 258 22 +3.78e-02,-1.90e-02,-5.69e-01,+5.70e-01 1 (nil) - 259 11 +1.27e-01,-2.18e-01,-1.21e+00,+1.24e+00 1 (nil) - 260 -11 +4.80e-03,-2.48e-02,-1.54e-01,+1.56e-01 1 (nil) + O: 3 260 -11 +4.80e-03,-2.48e-02,-1.54e-01,+1.56e-01 1 + 258 22 +3.78e-02,-1.90e-02,-5.69e-01,+5.70e-01 1 + 259 11 +1.27e-01,-2.18e-01,-1.21e+00,+1.24e+00 1 Vertex: -93 ID: 0 (X,cT)=-1.44e+01,+6.94e+00,+7.21e+02,+7.22e+02 I: 1 206 310 -1.65e-01,+7.95e-02,+8.26e+00,+8.27e+00 2 -93 - O: 2 261 111 +9.20e-02,+1.32e-01,+2.25e+00,+2.26e+00 2 -97 - 262 111 -2.57e-01,-5.26e-02,+6.00e+00,+6.01e+00 2 -98 + O: 2 262 111 -2.57e-01,-5.26e-02,+6.00e+00,+6.01e+00 2 -98 + 261 111 +9.20e-02,+1.32e-01,+2.25e+00,+2.26e+00 2 -97 Vertex: -94 ID: 0 (X,cT)=-7.78e+00,+1.06e+01,+1.70e+03,+1.70e+03 I: 1 207 310 -2.08e-01,+2.83e-01,+4.52e+01,+4.53e+01 2 -94 O: 2 263 111 -2.89e-01,+1.56e-01,+3.66e+01,+3.66e+01 2 -99 264 111 +8.17e-02,+1.26e-01,+8.62e+00,+8.62e+00 2 -100 Vertex: -95 ID: 0 (X,cT)=-1.37e+01,-6.92e+00,-2.33e+00,+2.17e+01 I: 1 212 310 -4.48e-01,-2.27e-01,-7.65e-02,+7.11e-01 2 -95 - O: 2 265 211 -2.95e-01,-9.17e-02,+1.55e-01,+3.73e-01 1 (nil) - 266 -211 -1.52e-01,-1.35e-01,-2.31e-01,+3.38e-01 1 (nil) + O: 2 265 211 -2.95e-01,-9.17e-02,+1.55e-01,+3.73e-01 1 + 266 -211 -1.52e-01,-1.35e-01,-2.31e-01,+3.38e-01 1 Vertex: -96 ID: 0 (X,cT)=+5.58e+00,+4.38e+01,+1.48e+02,+1.60e+02 I: 1 217 310 +6.63e-02,+5.21e-01,+1.76e+00,+1.90e+00 2 -96 O: 2 267 111 +1.60e-01,+1.55e-01,+1.10e+00,+1.13e+00 2 -101 268 111 -9.38e-02,+3.66e-01,+6.60e-01,+7.72e-01 2 -102 Vertex: -97 ID: 0 (X,cT)=-1.44e+01,+6.94e+00,+7.21e+02,+7.22e+02 I: 1 261 111 +9.20e-02,+1.32e-01,+2.25e+00,+2.26e+00 2 -97 - O: 2 269 22 +1.66e-02,-2.70e-02,+2.39e-01,+2.41e-01 1 (nil) - 270 22 +7.54e-02,+1.59e-01,+2.02e+00,+2.02e+00 1 (nil) + O: 2 269 22 +1.66e-02,-2.70e-02,+2.39e-01,+2.41e-01 1 + 270 22 +7.54e-02,+1.59e-01,+2.02e+00,+2.02e+00 1 Vertex: -98 ID: 0 (X,cT)=-1.44e+01,+6.94e+00,+7.21e+02,+7.22e+02 I: 1 262 111 -2.57e-01,-5.26e-02,+6.00e+00,+6.01e+00 2 -98 - O: 2 271 22 -7.17e-02,-3.17e-02,+3.25e+00,+3.25e+00 1 (nil) - 272 22 -1.85e-01,-2.09e-02,+2.76e+00,+2.76e+00 1 (nil) + O: 2 271 22 -7.17e-02,-3.17e-02,+3.25e+00,+3.25e+00 1 + 272 22 -1.85e-01,-2.09e-02,+2.76e+00,+2.76e+00 1 Vertex: -99 ID: 0 (X,cT)=-7.78e+00,+1.06e+01,+1.70e+03,+1.70e+03 I: 1 263 111 -2.89e-01,+1.56e-01,+3.66e+01,+3.66e+01 2 -99 - O: 2 273 22 -9.96e-02,+2.50e-02,+6.20e+00,+6.20e+00 1 (nil) - 274 22 -1.90e-01,+1.31e-01,+3.04e+01,+3.04e+01 1 (nil) + O: 2 273 22 -9.96e-02,+2.50e-02,+6.20e+00,+6.20e+00 1 + 274 22 -1.90e-01,+1.31e-01,+3.04e+01,+3.04e+01 1 Vertex: -100 ID: 0 (X,cT)=-7.78e+00,+1.06e+01,+1.70e+03,+1.70e+03 I: 1 264 111 +8.17e-02,+1.26e-01,+8.62e+00,+8.62e+00 2 -100 - O: 2 275 22 +7.76e-02,+2.39e-03,+3.60e+00,+3.60e+00 1 (nil) - 276 22 +4.09e-03,+1.24e-01,+5.01e+00,+5.02e+00 1 (nil) + O: 2 275 22 +7.76e-02,+2.39e-03,+3.60e+00,+3.60e+00 1 + 276 22 +4.09e-03,+1.24e-01,+5.01e+00,+5.02e+00 1 Vertex: -101 ID: 0 (X,cT)=+5.58e+00,+4.38e+01,+1.48e+02,+1.60e+02 I: 1 267 111 +1.60e-01,+1.55e-01,+1.10e+00,+1.13e+00 2 -101 - O: 2 277 22 +1.49e-01,+9.93e-02,+5.70e-01,+5.98e-01 1 (nil) - 278 22 +1.13e-02,+5.56e-02,+5.29e-01,+5.32e-01 1 (nil) + O: 2 277 22 +1.49e-01,+9.93e-02,+5.70e-01,+5.98e-01 1 + 278 22 +1.13e-02,+5.56e-02,+5.29e-01,+5.32e-01 1 Vertex: -102 ID: 0 (X,cT)=+5.58e+00,+4.38e+01,+1.48e+02,+1.60e+02 I: 1 268 111 -9.38e-02,+3.66e-01,+6.60e-01,+7.72e-01 2 -102 - O: 2 279 22 -6.60e-02,+5.16e-02,+1.69e-01,+1.89e-01 1 (nil) - 280 22 -2.77e-02,+3.15e-01,+4.91e-01,+5.84e-01 1 (nil) + O: 2 279 22 -6.60e-02,+5.16e-02,+1.69e-01,+1.89e-01 1 + 280 22 -2.77e-02,+3.15e-01,+4.91e-01,+5.84e-01 1 ________________________________________________________________________________ Stage 0->1 : 0 hits found in the muon chamber. ++++++++ event aborted @@ -2073,3 +2192,5 @@ Stage 0->1 : 0 hits found in the muon chamber. 0 hits are stored in ExN04CalorimeterHitsCollection. Total energy deposition in calorimeter : 0 (GeV) 0 hits are stored in ExN04MuonHitsCollection. +Graphics systems deleted. +Visualization Manager deleting... diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01/hepmc_pygen.out b/examples/extended/eventgenerator/HepMC/HepMCEx01/hepmc_pygen.out index c3f49b72be..8a8f32ee15 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01/hepmc_pygen.out +++ b/examples/extended/eventgenerator/HepMC/HepMCEx01/hepmc_pygen.out @@ -1,70 +1,59 @@ -********************************************** - Geant4 version $Name: geant4-08-01 $ - (31-Jul-2002) - Copyright : Geant4 Collaboration -********************************************** -phot: Total cross sections from Sandia parametrisation. -MuonMinusCaptureAtRest is created +************************************************************* + Geant4 version Name: geant4-08-01-ref-00 (30-June-2006) + Copyright : Geant4 Collaboration + Reference : NIM A 506 (2003), 250-303 + WWW : http://cern.ch/geant4 +************************************************************* -compt: Total cross sections from a parametrisation. Good description from 10 KeV to (100/Z) GeV. - Scattered gamma energy according Klein-Nishina. - PhysicsTables from 1 keV to 100 GeV in 80 bins. -conv: Total cross sections from a parametrisation. Good description from 1.5 MeV to 100 GeV for all Z. - e+e- energies according Bethe-Heitler - PhysicsTables from 1.022 MeV to 100 GeV in 100 bins. +<<< Geant4 Physics List engine packaging library: PACK 5.1 +<<< Geant4 Physics List simulation engine: QGSP 3.1 -eBrem: Total cross sections from a NEW parametrisation based on the EEDL data library. - Good description from 1 KeV to 100 GeV. - log scale extrapolation above 100 GeV - Gamma energy sampled from a parametrised formula. - PhysicsTables from 1 keV to 100 TeV in 100 bins. +Visualization Manager instantiating... +Visualization Manager initialising... +Registering graphics systems... -eIoni: delta cross sections from Moller+Bhabha. Good description from 1 KeV to 100 GeV. - delta ray energy sampled from differential Xsection. - PhysicsTables from 1 keV to 100 TeV in 100 bins. +You have successfully registered the following graphics systems. +Current available graphics systems are: + ASCIITree (ATree) + DAWNFILE (DAWNFILE) + GAGTree (GAGTree) + G4HepRep (HepRepXML) + G4HepRepFile (HepRepFile) + RayTracer (RayTracer) + VRML1FILE (VRML1FILE) + VRML2FILE (VRML2FILE) + FukuiRenderer (DAWN) + OpenGLImmediateX (OGLIX) + OpenGLStoredX (OGLSX) + OpenGLImmediateXm (OGLIXm) + OpenGLStoredXm (OGLSXm) + OpenInventorXt (OIX) + RayTracerX (RayTracerX) + VRML1 (VRML1) + VRML2 (VRML2) -msc: Tables of transport mean free paths. - New model of MSC , computes the lateral - displacement of the particle , too. - PhysicsTables from 100 eV to 100 TeV in 100 bins. +Registering model factories... -annihil: Total cross section from Heilter formula(annihilation into 2 photons). - gamma energies sampled according Heitler - PhysicsTables from 10 keV to 10 TeV in 100 bins. +You have successfully registered the following model factories. +Registered model factories: + generic + drawByCharge + drawByParticleID + drawByOriginVolume -annihil: Total cross section from Heilter formula(annihilation into 2 photons). - gamma energies sampled according Heitler - PhysicsTables from 10 keV to 10 TeV in 100 bins. +Registered models: + None -hIoni: Knock-on electron cross sections . - Good description above the mean excitation energy. - delta ray energy sampled from differential Xsection. - PhysicsTables from 1 keV to 100 TeV in 100 bins. +Registered filter factories: + chargeFilter + particleFilter + originVolumeFilter -msc: Tables of transport mean free paths. - New model of MSC , computes the lateral - displacement of the particle , too. - PhysicsTables from 100 eV to 100 TeV in 100 bins. +Registered filters: + None -MuIoni: Knock-on electron cross sections . - Good description above the mean excitation energy. - delta ray energy sampled from differential Xsection. - PhysicsTables from 1 keV to 1000 PeV in 150 bins. - -MuBrems: theoretical cross section - Good description up to 1000 PeV. - PhysicsTables from 1 keV to 1000 PeV in 150 bins. - -MuPairProd: theoretical cross sections - Good description up to 1000 PeV. - PhysicsTables from 1 keV to 1000 PeV in 150 bins. - -msc: Tables of transport mean free paths. - New model of MSC , computes the lateral - displacement of the particle , too. - PhysicsTables from 100 eV to 100 TeV in 100 bins. current generator type: pythia 1 ****************************************************************************** @@ -187,38 +176,193 @@ current generator type: pythia ========================================================== ********************** PYINIT: initialization completed ********************** + +phot: Total cross sections from Sandia parametrisation. + +compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV + Sampling according Klein-Nishina model + tables are built for gamma + Lambda tables from 100 eV to 100 GeV in 90 bins. + +conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; + sampling secondary e+e- according to the Bethe-Heitler model + tables are built for gamma + Lambda tables from 1.022 MeV to 100 GeV in 100 bins. + +msc: Model variant of multiple scattering for e- + Lambda tables from 100 eV to 100 TeV in 120 bins. + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +eIoni: tables are built for e- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +eBrem: tables are built for e- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Total cross sections from a parametrisation based on the EEDL data library. + Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. + +eIoni: tables are built for e+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +eBrem: tables are built for e+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Total cross sections from a parametrisation based on the EEDL data library. + Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. + +annihil: Heilter model of formula of annihilation into 2 photons + tables are built for e+ + Lambda tables from 100 eV to 100 TeV in 120 bins. + +msc: Model variant of multiple scattering for proton + Lambda tables from 100 eV to 100 TeV in 120 bins. + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +hIoni: tables are built for proton + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +msc: Model variant of multiple scattering for GenericIon + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +ionIoni: tables are built for GenericIon + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for alpha particles below. + Stopping Power data for 8 ion/material pairs are used. + Step function: finalRange(mm)= 0.1, dRoverRange= 0.1, integral: 1 + +hIoni: tables are built for anti_proton + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +msc: Model variant of multiple scattering for mu+ + Lambda tables from 100 eV to 100 TeV in 120 bins. + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +muIoni: tables are built for mu+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Bether-Bloch model for E > 0.2 MeV, parametrisation of Bragg peak below, + radiative corrections for E > 1 GeV + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +muBrems: tables are built for mu+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Parametrised model + +muPairProd: tables are built for mu+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Parametrised model + +muIoni: tables are built for mu- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Bether-Bloch model for E > 0.2 MeV, parametrisation of Bragg peak below, + radiative corrections for E > 1 GeV + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +muBrems: tables are built for mu- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Parametrised model + +muPairProd: tables are built for mu- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Parametrised model + +hIoni: tables are built for pi+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 0.297504 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +msc: Model variant of multiple scattering for pi- + Lambda tables from 100 eV to 100 TeV in 120 bins. + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +hIoni: tables are built for pi- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 0.297504 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 +### Run 0 start. Stage 0->1 : 1 hits found in the muon chamber. -Stage 1->2 : 1 isolated muon found. +Stage 1->2 : 0 isolated muon found. +++++++++ event aborted >>> Event 0 - 107 hits are stored in ExN04TrackerHitsCollection. - 45 hits are stored in ExN04CalorimeterHitsCollection. - Total energy deposition in calorimeter : 0.892332 (GeV) + 213 hits are stored in ExN04TrackerHitsCollection. + 21 hits are stored in ExN04CalorimeterHitsCollection. + Total energy deposition in calorimeter : 0.49951823 (GeV) 1 hits are stored in ExN04MuonHitsCollection. -Stage 0->1 : 1 hits found in the muon chamber. -Stage 1->2 : 1 isolated muon found. +Stage 0->1 : 0 hits found in the muon chamber. +++++++++ event aborted >>> Event 1 - 179 hits are stored in ExN04TrackerHitsCollection. - 67 hits are stored in ExN04CalorimeterHitsCollection. - Total energy deposition in calorimeter : 1.15456 (GeV) - 1 hits are stored in ExN04MuonHitsCollection. + 0 hits are stored in ExN04TrackerHitsCollection. + 14 hits are stored in ExN04CalorimeterHitsCollection. + Total energy deposition in calorimeter : 0.20789644 (GeV) + 0 hits are stored in ExN04MuonHitsCollection. Stage 0->1 : 1 hits found in the muon chamber. Stage 1->2 : 1 isolated muon found. >>> Event 2 - 176 hits are stored in ExN04TrackerHitsCollection. - 84 hits are stored in ExN04CalorimeterHitsCollection. - Total energy deposition in calorimeter : 1.33361 (GeV) + 129 hits are stored in ExN04TrackerHitsCollection. + 45 hits are stored in ExN04CalorimeterHitsCollection. + Total energy deposition in calorimeter : 1.808844 (GeV) 1 hits are stored in ExN04MuonHitsCollection. Stage 0->1 : 1 hits found in the muon chamber. -Stage 1->2 : 1 isolated muon found. +Stage 1->2 : 0 isolated muon found. +++++++++ event aborted >>> Event 3 - 90 hits are stored in ExN04TrackerHitsCollection. - 80 hits are stored in ExN04CalorimeterHitsCollection. - Total energy deposition in calorimeter : 0.953729 (GeV) + 166 hits are stored in ExN04TrackerHitsCollection. + 21 hits are stored in ExN04CalorimeterHitsCollection. + Total energy deposition in calorimeter : 0.45672857 (GeV) 1 hits are stored in ExN04MuonHitsCollection. Stage 0->1 : 1 hits found in the muon chamber. Stage 1->2 : 1 isolated muon found. >>> Event 4 - 346 hits are stored in ExN04TrackerHitsCollection. - 167 hits are stored in ExN04CalorimeterHitsCollection. - Total energy deposition in calorimeter : 2.95158 (GeV) + 177 hits are stored in ExN04TrackerHitsCollection. + 35 hits are stored in ExN04CalorimeterHitsCollection. + Total energy deposition in calorimeter : 0.78347475 (GeV) 1 hits are stored in ExN04MuonHitsCollection. +1********* PYSTAT: Statistics on Number of Events and Cross-sections ********* + + ============================================================================== + I I I I + I Subprocess I Number of points I Sigma I + I I I I + I----------------------------------I----------------------------I (mb) I + I I I I + I N:o Type I Generated Tried I I + I I I I + ============================================================================== + I I I I + I 0 All included subprocesses I 5 10 I 6.034E-12 I + I 102 g + g -> h0 I 2 4 I 2.874E-12 I + I 123 f + f' -> f + f' + h0 I 1 1 I 6.634E-13 I + I 124 f + f' -> f" + f"' + h0 I 2 5 I 2.497E-12 I + I I I I + ============================================================================== + + ********* Fraction of events that fail fragmentation cuts = 0.00000 ********* + +Graphics systems deleted. +Visualization Manager deleting... diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04EMPhysics.hh b/examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04EMPhysics.hh deleted file mode 100644 index d68f8e5140..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04EMPhysics.hh +++ /dev/null @@ -1,96 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: ExN04EMPhysics.hh,v 1.3 2006/06/29 17:04:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// -// ------------------------------------------------------------ -// GEANT 4 class header file -// Class Description: -// This class is an derived class of G4VPhysicsConstructor -// -// ------------------------------------------- -// History -// first version 12 Nov. 2000 by H.Kurashige -// ------------------------------------------------------------ -#ifndef ExN04EMPhysics_h -#define ExN04EMPhysics_h 1 - -#include "globals.hh" -#include "G4ios.hh" - -#include "G4VPhysicsConstructor.hh" - -#include "G4PhotoElectricEffect.hh" -#include "G4ComptonScattering.hh" -#include "G4GammaConversion.hh" -#include "G4MultipleScattering.hh" -#include "G4eIonisation.hh" -#include "G4eBremsstrahlung.hh" -#include "G4eplusAnnihilation.hh" - -class ExN04EMPhysics : public G4VPhysicsConstructor -{ - public: - ExN04EMPhysics(const G4String& name ="EM"); - virtual ~ExN04EMPhysics(); - - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); - - protected: - // Gamma physics - G4PhotoElectricEffect thePhotoEffect; - G4ComptonScattering theComptonEffect; - G4GammaConversion thePairProduction; - - // Electron physics - G4MultipleScattering theElectronMultipleScattering; - G4eIonisation theElectronIonisation; - G4eBremsstrahlung theElectronBremsStrahlung; - - //Positron physics - G4MultipleScattering thePositronMultipleScattering; - G4eIonisation thePositronIonisation; - G4eBremsstrahlung thePositronBremsStrahlung; - G4eplusAnnihilation theAnnihilation; -}; - - -#endif - - - - - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04GeneralPhysics.hh b/examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04GeneralPhysics.hh deleted file mode 100644 index 1337e1988d..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04GeneralPhysics.hh +++ /dev/null @@ -1,80 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: ExN04GeneralPhysics.hh,v 1.3 2006/06/29 17:04:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// -// ------------------------------------------------------------ -// GEANT 4 class header file -// Class Description: -// This class is an derived class of G4VPhysicsConstructor -// -// ------------------------------------------- -// History -// first version 12 Nov. 2000 by H.Kurashige -// ------------------------------------------------------------ -#ifndef ExN04GeneralPhysics_h -#define ExN04GeneralPhysics_h 1 - -#include "globals.hh" -#include "G4ios.hh" - -#include "G4VPhysicsConstructor.hh" - - -#include "G4Decay.hh" - -class ExN04GeneralPhysics : public G4VPhysicsConstructor -{ - public: - ExN04GeneralPhysics(const G4String& name = "general"); - virtual ~ExN04GeneralPhysics(); - - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); - - protected: - G4Decay fDecayProcess; -}; - - -#endif - - - - - - - - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04HadronPhysics.hh b/examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04HadronPhysics.hh deleted file mode 100644 index 08a62f232f..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04HadronPhysics.hh +++ /dev/null @@ -1,347 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// $Id: ExN04HadronPhysics.hh,v 1.7 2006/06/29 17:04:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// ------------------------------------------------------------ -// GEANT 4 class header file -// -// This class is an derived class of G4VPhysicsConstructor -// -// ------------------------------------------------------------ -#ifndef ExN04HadronPhysics_h -#define ExN04HadronPhysics_h 1 - -#include "globals.hh" -#include "G4ios.hh" -#include - -#include "G4VPhysicsConstructor.hh" - -#include "G4MultipleScattering.hh" -#include "G4hIonisation.hh" - -#include "G4HadronElasticProcess.hh" -#include "G4HadronFissionProcess.hh" -#include "G4HadronCaptureProcess.hh" - -#include "G4PionPlusInelasticProcess.hh" -#include "G4PionMinusInelasticProcess.hh" -#include "G4KaonPlusInelasticProcess.hh" -#include "G4KaonZeroSInelasticProcess.hh" -#include "G4KaonZeroLInelasticProcess.hh" -#include "G4KaonMinusInelasticProcess.hh" -#include "G4ProtonInelasticProcess.hh" -#include "G4AntiProtonInelasticProcess.hh" -#include "G4NeutronInelasticProcess.hh" -#include "G4AntiNeutronInelasticProcess.hh" -#include "G4LambdaInelasticProcess.hh" -#include "G4AntiLambdaInelasticProcess.hh" -#include "G4SigmaPlusInelasticProcess.hh" -#include "G4SigmaMinusInelasticProcess.hh" -#include "G4AntiSigmaPlusInelasticProcess.hh" -#include "G4AntiSigmaMinusInelasticProcess.hh" -#include "G4XiZeroInelasticProcess.hh" -#include "G4XiMinusInelasticProcess.hh" -#include "G4AntiXiZeroInelasticProcess.hh" -#include "G4AntiXiMinusInelasticProcess.hh" -#include "G4DeuteronInelasticProcess.hh" -#include "G4TritonInelasticProcess.hh" -#include "G4AlphaInelasticProcess.hh" -#include "G4OmegaMinusInelasticProcess.hh" -#include "G4AntiOmegaMinusInelasticProcess.hh" - -// Low-energy Models -#include "G4LElastic.hh" -#include "G4LFission.hh" -#include "G4LCapture.hh" - -#include "G4LEPionPlusInelastic.hh" -#include "G4LEPionMinusInelastic.hh" -#include "G4LEKaonPlusInelastic.hh" -#include "G4LEKaonZeroSInelastic.hh" -#include "G4LEKaonZeroLInelastic.hh" -#include "G4LEKaonMinusInelastic.hh" -#include "G4LEProtonInelastic.hh" -#include "G4LEAntiProtonInelastic.hh" -#include "G4LENeutronInelastic.hh" -#include "G4LEAntiNeutronInelastic.hh" -#include "G4LELambdaInelastic.hh" -#include "G4LEAntiLambdaInelastic.hh" -#include "G4LESigmaPlusInelastic.hh" -#include "G4LESigmaMinusInelastic.hh" -#include "G4LEAntiSigmaPlusInelastic.hh" -#include "G4LEAntiSigmaMinusInelastic.hh" -#include "G4LEXiZeroInelastic.hh" -#include "G4LEXiMinusInelastic.hh" -#include "G4LEAntiXiZeroInelastic.hh" -#include "G4LEAntiXiMinusInelastic.hh" -#include "G4LEDeuteronInelastic.hh" -#include "G4LETritonInelastic.hh" -#include "G4LEAlphaInelastic.hh" -#include "G4LEOmegaMinusInelastic.hh" -#include "G4LEAntiOmegaMinusInelastic.hh" - -// High-energy Models - -#include "G4HEPionPlusInelastic.hh" -#include "G4HEPionMinusInelastic.hh" -#include "G4HEKaonPlusInelastic.hh" -#include "G4HEKaonZeroInelastic.hh" -#include "G4HEKaonZeroInelastic.hh" -#include "G4HEKaonMinusInelastic.hh" -#include "G4HEProtonInelastic.hh" -#include "G4HEAntiProtonInelastic.hh" -#include "G4HENeutronInelastic.hh" -#include "G4HEAntiNeutronInelastic.hh" -#include "G4HELambdaInelastic.hh" -#include "G4HEAntiLambdaInelastic.hh" -#include "G4HESigmaPlusInelastic.hh" -#include "G4HESigmaMinusInelastic.hh" -#include "G4HEAntiSigmaPlusInelastic.hh" -#include "G4HEAntiSigmaMinusInelastic.hh" -#include "G4HEXiZeroInelastic.hh" -#include "G4HEXiMinusInelastic.hh" -#include "G4HEAntiXiZeroInelastic.hh" -#include "G4HEAntiXiMinusInelastic.hh" -#include "G4HEOmegaMinusInelastic.hh" -#include "G4HEAntiOmegaMinusInelastic.hh" - -// Stopping processes -#include "G4AntiProtonAnnihilationAtRest.hh" -#include "G4AntiNeutronAnnihilationAtRest.hh" - -#ifdef TRIUMF_STOP_PIMINUS -#include "G4PionMinusAbsorptionAtRest.hh" -#else -#include "G4PiMinusAbsorptionAtRest.hh" -#endif -#ifdef TRIUMF_STOP_KMINUS -#include "G4KaonMinusAbsorption.hh" -#else -#include "G4KaonMinusAbsorptionAtRest.hh" -#endif - -// quark gluon string model with chips afterburner. -#include "G4TheoFSGenerator.hh" -#include "G4ExcitationHandler.hh" -#include "G4PreCompoundModel.hh" -#include "G4GeneratorPrecompoundInterface.hh" -#include "G4QGSModel.hh" -#include "G4QGSParticipants.hh" -#include "G4QGSMFragmentation.hh" -#include "G4ExcitedStringDecay.hh" - -class ExN04HadronPhysics : public G4VPhysicsConstructor -{ - public: - ExN04HadronPhysics(const G4String& name ="hadron"); - virtual ~ExN04HadronPhysics(); - - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); - - protected: - // Elastic Process - G4HadronElasticProcess theElasticProcess; - G4LElastic* theElasticModel; - - // Pi + - G4PionPlusInelasticProcess thePionPlusInelastic; - G4LEPionPlusInelastic* theLEPionPlusModel; - G4MultipleScattering thePionPlusMult; - G4hIonisation thePionPlusIonisation; - - // Pi - - G4PionMinusInelasticProcess thePionMinusInelastic; - G4LEPionMinusInelastic* theLEPionMinusModel; - G4MultipleScattering thePionMinusMult; - G4hIonisation thePionMinusIonisation; -#ifdef TRIUMF_STOP_PIMINUS - G4PionMinusAbsorptionAtRest thePionMinusAbsorption; -#else - G4PiMinusAbsorptionAtRest thePionMinusAbsorption; -#endif - - // pi+ and pi- - - G4TheoFSGenerator theTheoModel; - G4ExcitationHandler theHandler; - G4PreCompoundModel * thePreEquilib; - G4GeneratorPrecompoundInterface theCascade; - G4QGSModel< G4QGSParticipants > theStringModel; - G4QGSMFragmentation theFragmentation; - G4ExcitedStringDecay * theStringDecay; - - // K + - G4KaonPlusInelasticProcess theKaonPlusInelastic; - G4LEKaonPlusInelastic* theLEKaonPlusModel; - G4HEKaonPlusInelastic* theHEKaonPlusModel; - G4MultipleScattering theKaonPlusMult; - G4hIonisation theKaonPlusIonisation; - - // K - - G4KaonMinusInelasticProcess theKaonMinusInelastic; - G4LEKaonMinusInelastic* theLEKaonMinusModel; - G4HEKaonMinusInelastic* theHEKaonMinusModel; - G4MultipleScattering theKaonMinusMult; - G4hIonisation theKaonMinusIonisation; -#ifdef TRIUMF_STOP_KMINUS - G4KaonMinusAbsorption theKaonMinusAbsorption; -#else - G4PiMinusAbsorptionAtRest theKaonMinusAbsorption; -#endif - - // K0L - G4KaonZeroLInelasticProcess theKaonZeroLInelastic; - G4LEKaonZeroLInelastic* theLEKaonZeroLModel; - G4HEKaonZeroInelastic* theHEKaonZeroLModel; - - // K0S - G4KaonZeroSInelasticProcess theKaonZeroSInelastic; - G4LEKaonZeroSInelastic* theLEKaonZeroSModel; - G4HEKaonZeroInelastic* theHEKaonZeroSModel; - - // Proton - G4ProtonInelasticProcess theProtonInelastic; - G4LEProtonInelastic* theLEProtonModel; - G4HEProtonInelastic* theHEProtonModel; - G4MultipleScattering theProtonMult; - G4hIonisation theProtonIonisation; - - // anti-proton - G4AntiProtonInelasticProcess theAntiProtonInelastic; - G4LEAntiProtonInelastic* theLEAntiProtonModel; - G4HEAntiProtonInelastic* theHEAntiProtonModel; - G4MultipleScattering theAntiProtonMult; - G4hIonisation theAntiProtonIonisation; - G4AntiProtonAnnihilationAtRest theAntiProtonAnnihilation; - - // neutron - G4NeutronInelasticProcess theNeutronInelastic; - G4LENeutronInelastic* theLENeutronModel; - G4HENeutronInelastic* theHENeutronModel; - G4HadronFissionProcess theNeutronFission; - G4LFission* theNeutronFissionModel; - G4HadronCaptureProcess theNeutronCapture; - G4LCapture* theNeutronCaptureModel; - - - // anti-neutron - G4AntiNeutronInelasticProcess theAntiNeutronInelastic; - G4LEAntiNeutronInelastic* theLEAntiNeutronModel; - G4HEAntiNeutronInelastic* theHEAntiNeutronModel; - G4AntiNeutronAnnihilationAtRest theAntiNeutronAnnihilation; - - // Lambda - G4LambdaInelasticProcess theLambdaInelastic; - G4LELambdaInelastic* theLELambdaModel; - G4HELambdaInelastic* theHELambdaModel; - - // AntiLambda - G4AntiLambdaInelasticProcess theAntiLambdaInelastic; - G4LEAntiLambdaInelastic* theLEAntiLambdaModel; - G4HEAntiLambdaInelastic* theHEAntiLambdaModel; - - // SigmaMinus - G4SigmaMinusInelasticProcess theSigmaMinusInelastic; - G4LESigmaMinusInelastic* theLESigmaMinusModel; - G4HESigmaMinusInelastic* theHESigmaMinusModel; - G4MultipleScattering theSigmaMinusMult; - G4hIonisation theSigmaMinusIonisation; - - // AntiSigmaMinus - G4AntiSigmaMinusInelasticProcess theAntiSigmaMinusInelastic; - G4LEAntiSigmaMinusInelastic* theLEAntiSigmaMinusModel; - G4HEAntiSigmaMinusInelastic* theHEAntiSigmaMinusModel; - G4MultipleScattering theAntiSigmaMinusMult; - G4hIonisation theAntiSigmaMinusIonisation; - - // SigmaPlus - G4SigmaPlusInelasticProcess theSigmaPlusInelastic; - G4LESigmaPlusInelastic* theLESigmaPlusModel; - G4HESigmaPlusInelastic* theHESigmaPlusModel; - G4MultipleScattering theSigmaPlusMult; - G4hIonisation theSigmaPlusIonisation; - - // AntiSigmaPlus - G4AntiSigmaPlusInelasticProcess theAntiSigmaPlusInelastic; - G4LEAntiSigmaPlusInelastic* theLEAntiSigmaPlusModel; - G4HEAntiSigmaPlusInelastic* theHEAntiSigmaPlusModel; - G4MultipleScattering theAntiSigmaPlusMult; - G4hIonisation theAntiSigmaPlusIonisation; - - // XiZero - G4XiZeroInelasticProcess theXiZeroInelastic; - G4LEXiZeroInelastic* theLEXiZeroModel; - G4HEXiZeroInelastic* theHEXiZeroModel; - - // AntiXiZero - G4AntiXiZeroInelasticProcess theAntiXiZeroInelastic; - G4LEAntiXiZeroInelastic* theLEAntiXiZeroModel; - G4HEAntiXiZeroInelastic* theHEAntiXiZeroModel; - - // XiMinus - G4XiMinusInelasticProcess theXiMinusInelastic; - G4LEXiMinusInelastic* theLEXiMinusModel; - G4HEXiMinusInelastic* theHEXiMinusModel; - G4MultipleScattering theXiMinusMult; - G4hIonisation theXiMinusIonisation; - - // AntiXiMinus - G4AntiXiMinusInelasticProcess theAntiXiMinusInelastic; - G4LEAntiXiMinusInelastic* theLEAntiXiMinusModel; - G4HEAntiXiMinusInelastic* theHEAntiXiMinusModel; - G4MultipleScattering theAntiXiMinusMult; - G4hIonisation theAntiXiMinusIonisation; - - // OmegaMinus - G4OmegaMinusInelasticProcess theOmegaMinusInelastic; - G4LEOmegaMinusInelastic* theLEOmegaMinusModel; - G4HEOmegaMinusInelastic* theHEOmegaMinusModel; - G4MultipleScattering theOmegaMinusMult; - G4hIonisation theOmegaMinusIonisation; - - // AntiOmegaMinus - G4AntiOmegaMinusInelasticProcess theAntiOmegaMinusInelastic; - G4LEAntiOmegaMinusInelastic* theLEAntiOmegaMinusModel; - G4HEAntiOmegaMinusInelastic* theHEAntiOmegaMinusModel; - G4MultipleScattering theAntiOmegaMinusMult; - G4hIonisation theAntiOmegaMinusIonisation; - - -}; - - -#endif - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04IonPhysics.hh b/examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04IonPhysics.hh deleted file mode 100644 index f54565afda..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04IonPhysics.hh +++ /dev/null @@ -1,115 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: ExN04IonPhysics.hh,v 1.4 2006/06/29 17:04:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// -// ------------------------------------------------------------ -// GEANT 4 class header file -// Class Description: -// This class is an derived class of G4VPhysicsConstructor -// -// ------------------------------------------- -// History -// first version 12 Nov. 2000 by H.Kurashige -// ------------------------------------------------------------ -#ifndef ExN04IonPhysics_h -#define ExN04IonPhysics_h 1 - -#include "globals.hh" -#include "G4ios.hh" - -#include "G4VPhysicsConstructor.hh" - -#include "G4HadronElasticProcess.hh" -#include "G4LElastic.hh" - -#include "G4DeuteronInelasticProcess.hh" -#include "G4LEDeuteronInelastic.hh" - -#include "G4TritonInelasticProcess.hh" -#include "G4LETritonInelastic.hh" - -#include "G4AlphaInelasticProcess.hh" -#include "G4LEAlphaInelastic.hh" - -#include "G4hIonisation.hh" -#include "G4ionIonisation.hh" -#include "G4MultipleScattering.hh" - -class ExN04IonPhysics : public G4VPhysicsConstructor -{ - public: - ExN04IonPhysics(const G4String& name="ion"); - virtual ~ExN04IonPhysics(); - - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); - - protected: - // Elastic Process - G4HadronElasticProcess theElasticProcess; - G4LElastic* theElasticModel; - - // Generic Ion physics - G4MultipleScattering fIonMultipleScattering; - G4ionIonisation fIonIonisation; - - // Deuteron physics - G4MultipleScattering fDeuteronMultipleScattering; - G4hIonisation fDeuteronIonisation; - G4DeuteronInelasticProcess fDeuteronProcess; - G4LEDeuteronInelastic* fDeuteronModel; - - // Triton physics - G4MultipleScattering fTritonMultipleScattering; - G4hIonisation fTritonIonisation; - G4TritonInelasticProcess fTritonProcess; - G4LETritonInelastic* fTritonModel; - - // Alpha physics - G4MultipleScattering fAlphaMultipleScattering; - G4hIonisation fAlphaIonisation; - G4AlphaInelasticProcess fAlphaProcess; - G4LEAlphaInelastic* fAlphaModel; - - // He3 physics - G4MultipleScattering fHe3MultipleScattering; - G4hIonisation fHe3Ionisation; - -}; - - -#endif - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04MuonPhysics.hh b/examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04MuonPhysics.hh deleted file mode 100644 index d09678e2d0..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04MuonPhysics.hh +++ /dev/null @@ -1,96 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: ExN04MuonPhysics.hh,v 1.4 2006/06/29 17:04:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// -// ------------------------------------------------------------ -// GEANT 4 class header file -// Class Description: -// This class is an derived class of G4VPhysicsConstructor -// -// ------------------------------------------- -// History -// first version 12 Nov. 2000 by H.Kurashige -// ------------------------------------------------------------ -#ifndef ExN04MuonPhysics_h -#define ExN04MuonPhysics_h 1 - -#include "globals.hh" -#include "G4ios.hh" - -#include "G4VPhysicsConstructor.hh" -#include "G4MultipleScattering.hh" -#include "G4MuBremsstrahlung.hh" -#include "G4MuPairProduction.hh" -#include "G4MuIonisation.hh" -#include "G4hIonisation.hh" - -#include "G4MuonMinusCaptureAtRest.hh" - -class ExN04MuonPhysics : public G4VPhysicsConstructor -{ - public: - ExN04MuonPhysics(const G4String& name="muon"); - virtual ~ExN04MuonPhysics(); - - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); - - protected: - // Muon physics - G4MuIonisation fMuPlusIonisation; - G4MultipleScattering fMuPlusMultipleScattering; - G4MuBremsstrahlung fMuPlusBremsstrahlung ; - G4MuPairProduction fMuPlusPairProduction; - - G4MuIonisation fMuMinusIonisation; - G4MultipleScattering fMuMinusMultipleScattering; - G4MuBremsstrahlung fMuMinusBremsstrahlung ; - G4MuPairProduction fMuMinusPairProduction; - - G4MuonMinusCaptureAtRest fMuMinusCaptureAtRest; - - // Tau physics - G4MultipleScattering fTauPlusMultipleScattering; - G4hIonisation fTauPlusIonisation; - - G4MultipleScattering fTauMinusMultipleScattering; - G4hIonisation fTauMinusIonisation; - -}; - - -#endif - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04RunAction.hh b/examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04RunAction.hh index 234255386b..2aa87e0a1d 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04RunAction.hh +++ b/examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04RunAction.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: ExN04RunAction.hh,v 1.2 2006/06/29 17:04:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: ExN04RunAction.hh,v 1.3 2006/07/05 11:06:36 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -48,7 +48,6 @@ class ExN04RunAction : public G4UserRunAction public: void BeginOfRunAction(const G4Run*); - void EndOfRunAction(const G4Run*); }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04SteppingVerbose.hh b/examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04SteppingVerbose.hh index 218547bde0..b45cedf703 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04SteppingVerbose.hh +++ b/examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04SteppingVerbose.hh @@ -25,7 +25,7 @@ // // // $Id: ExN04SteppingVerbose.hh,v 1.2 2006/06/29 17:05:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // This class manages the verbose outputs in G4SteppingManager. // It inherits from G4SteppingVerbose. diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04CalorimeterSD.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04CalorimeterSD.cc index fd5fc04e22..82811ea6b9 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04CalorimeterSD.cc +++ b/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04CalorimeterSD.cc @@ -76,11 +76,11 @@ G4bool ExN04CalorimeterSD::ProcessHits(G4Step*aStep,G4TouchableHistory*ROhist) ExN04CalorimeterHit* calHit = new ExN04CalorimeterHit (physVol->GetLogicalVolume(),copyIDinZ,copyIDinPhi); - G4RotationMatrix rotM; - if(physVol->GetObjectRotation()) rotM = *(physVol->GetObjectRotation()); calHit->SetEdep( edep ); - calHit->SetPos( physVol->GetTranslation() ); - calHit->SetRot( rotM ); + G4AffineTransform aTrans = ROhist->GetHistory()->GetTopTransform(); + aTrans.Invert(); + calHit->SetPos(aTrans.NetTranslation()); + calHit->SetRot(aTrans.NetRotation()); G4int icell = CalCollection->insert( calHit ); CellID[copyIDinZ][copyIDinPhi] = icell - 1; if(verboseLevel>0) diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04EMPhysics.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04EMPhysics.cc deleted file mode 100644 index 0117cbe444..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04EMPhysics.cc +++ /dev/null @@ -1,104 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: ExN04EMPhysics.cc,v 1.5 2006/06/29 17:05:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// - -#include "ExN04EMPhysics.hh" - -#include "globals.hh" -#include "G4ios.hh" -#include - - -ExN04EMPhysics::ExN04EMPhysics(const G4String& name) - : G4VPhysicsConstructor(name) -{ -} - -ExN04EMPhysics::~ExN04EMPhysics() -{ -} - -#include "G4ParticleDefinition.hh" -#include "G4ParticleTable.hh" - -#include "G4Gamma.hh" - -#include "G4Electron.hh" -#include "G4Positron.hh" - -#include "G4NeutrinoE.hh" -#include "G4AntiNeutrinoE.hh" - -void ExN04EMPhysics::ConstructParticle() -{ - // gamma - G4Gamma::GammaDefinition(); - - // electron - G4Electron::ElectronDefinition(); - G4Positron::PositronDefinition(); - G4NeutrinoE::NeutrinoEDefinition(); - G4AntiNeutrinoE::AntiNeutrinoEDefinition(); -} - - -#include "G4ProcessManager.hh" - - -void ExN04EMPhysics::ConstructProcess() -{ - G4ProcessManager * pManager = 0; - - // Gamma Physics - pManager = G4Gamma::Gamma()->GetProcessManager(); - pManager->AddDiscreteProcess(&thePhotoEffect); - pManager->AddDiscreteProcess(&theComptonEffect); - pManager->AddDiscreteProcess(&thePairProduction); - - // Electron Physics - pManager = G4Electron::Electron()->GetProcessManager(); - - pManager->AddProcess(&theElectronMultipleScattering, -1, 1, 1); - pManager->AddProcess(&theElectronIonisation, -1, 2, 2); - pManager->AddProcess(&theElectronBremsStrahlung, -1, 3, 3); - - - //Positron Physics - pManager = G4Positron::Positron()->GetProcessManager(); - - pManager->AddProcess(&thePositronMultipleScattering, -1, 1, 1); - pManager->AddProcess(&thePositronIonisation, -1, 2, 2); - pManager->AddProcess(&thePositronBremsStrahlung, -1, 3, 3); - pManager->AddProcess(&theAnnihilation, 0,-1, 4); - -} - - - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04EventAction.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04EventAction.cc index f6e4f4ba73..a45a9cd5bb 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04EventAction.cc +++ b/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04EventAction.cc @@ -67,24 +67,6 @@ void ExN04EventAction::EndOfEventAction(const G4Event* evt) { G4cout << ">>> Event " << evt->GetEventID() << G4endl; - // get number of stored trajectories - // - G4TrajectoryContainer* trajectoryContainer = evt->GetTrajectoryContainer(); - G4int n_trajectories = 0; - if (trajectoryContainer) n_trajectories = trajectoryContainer->entries(); - - // extract the trajectories and draw them - // - if (G4VVisManager::GetConcreteInstance()) - { - for (G4int i=0; iGetTrajectoryContainer()))[i]); - trj->DrawTrajectory(50); - } - } - - if(trackerCollID<0||calorimeterCollID<0||muonCollID<0) return; G4HCofThisEvent * HCE = evt->GetHCofThisEvent(); diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04HadronPhysics.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04HadronPhysics.cc deleted file mode 100644 index 59c3041299..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04HadronPhysics.cc +++ /dev/null @@ -1,441 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: ExN04HadronPhysics.cc,v 1.7 2006/06/29 17:05:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// - -#include "ExN04HadronPhysics.hh" - -#include "globals.hh" -#include "G4ios.hh" -#include - - -ExN04HadronPhysics::ExN04HadronPhysics(const G4String& name) - : G4VPhysicsConstructor(name) -{ -} - -ExN04HadronPhysics::~ExN04HadronPhysics() -{ -delete theStringDecay; -} - -#include "G4ParticleDefinition.hh" -#include "G4ParticleTable.hh" - -// Nuclei -#include "G4MesonConstructor.hh" -#include "G4BaryonConstructor.hh" -#include "G4ShortLivedConstructor.hh" - -void ExN04HadronPhysics::ConstructParticle() -{ - // Construct all mesons - G4MesonConstructor pMesonConstructor; - pMesonConstructor.ConstructParticle(); - - // Construct all barions - G4BaryonConstructor pBaryonConstructor; - pBaryonConstructor.ConstructParticle(); - - // Construct resonaces and quarks - G4ShortLivedConstructor pShortLivedConstructor; - pShortLivedConstructor.ConstructParticle(); - -} - - -#include "G4ProcessManager.hh" - - -void ExN04HadronPhysics::ConstructProcess() -{ - G4ProcessManager * pManager = 0; - G4cout << "" << G4endl; - G4cout << "You are using the ExN04HadronPhysics" << G4endl; - G4cout << " - Note that this hadronic physics list is not optimized for any particular usage" << G4endl; - G4cout << " - If you wish to have a starting point tailored for a particular area of work," << G4endl; - G4cout << " please use one of the available physics lists by use-case." << G4endl; - G4cout << " More information can also be found from the Geant4 HyperNews." << G4endl; - G4cout << "" << G4endl; - // Elastic Process - theElasticModel = new G4LElastic(); - theElasticProcess.RegisterMe(theElasticModel); - - // pi+ and pi- - - thePreEquilib = new G4PreCompoundModel(&theHandler); - theCascade.SetDeExcitation(thePreEquilib); - theTheoModel.SetTransport(&theCascade); - theTheoModel.SetHighEnergyGenerator(&theStringModel); - theStringDecay = new G4ExcitedStringDecay(&theFragmentation); - theStringModel.SetFragmentationModel(theStringDecay); - theTheoModel.SetMinEnergy(15*GeV); - theTheoModel.SetMaxEnergy(100*TeV); - - // PionPlus - pManager = G4PionPlus::PionPlus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEPionPlusModel = new G4LEPionPlusInelastic(); - thePionPlusInelastic.RegisterMe(theLEPionPlusModel); - thePionPlusInelastic.RegisterMe(&theTheoModel); - pManager->AddDiscreteProcess(&thePionPlusInelastic); - - pManager->AddProcess(&thePionPlusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&thePionPlusMult); - pManager->SetProcessOrdering(&thePionPlusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&thePionPlusMult, idxPostStep, 1); - - // PionMinus - pManager = G4PionMinus::PionMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEPionMinusModel = new G4LEPionMinusInelastic(); - thePionMinusInelastic.RegisterMe(theLEPionMinusModel); - thePionMinusInelastic.RegisterMe(&theTheoModel); - pManager->AddDiscreteProcess(&thePionMinusInelastic); - - pManager->AddProcess(&thePionMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&thePionMinusMult); - pManager->SetProcessOrdering(&thePionMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&thePionMinusMult, idxPostStep, 1); - - pManager->AddRestProcess(&thePionMinusAbsorption, ordDefault); - - // KaonPlus - pManager = G4KaonPlus::KaonPlus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEKaonPlusModel = new G4LEKaonPlusInelastic(); - theHEKaonPlusModel = new G4HEKaonPlusInelastic(); - theKaonPlusInelastic.RegisterMe(theLEKaonPlusModel); - theKaonPlusInelastic.RegisterMe(&theTheoModel); - pManager->AddDiscreteProcess(&theKaonPlusInelastic); - - pManager->AddProcess(&theKaonPlusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theKaonPlusMult); - pManager->SetProcessOrdering(&theKaonPlusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theKaonPlusMult, idxPostStep, 1); - - // KaonMinus - pManager = G4KaonMinus::KaonMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEKaonMinusModel = new G4LEKaonMinusInelastic(); - theHEKaonMinusModel = new G4HEKaonMinusInelastic(); - theKaonMinusInelastic.RegisterMe(theLEKaonMinusModel); - theKaonMinusInelastic.RegisterMe(theHEKaonMinusModel); - pManager->AddDiscreteProcess(&theKaonMinusInelastic); - - pManager->AddProcess(&theKaonMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theKaonMinusMult); - pManager->SetProcessOrdering(&theKaonMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theKaonMinusMult, idxPostStep, 1); - - pManager->AddRestProcess(&theKaonMinusAbsorption, ordDefault); - - // KaonZeroL - pManager = G4KaonZeroLong::KaonZeroLong()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEKaonZeroLModel = new G4LEKaonZeroLInelastic(); - theHEKaonZeroLModel = new G4HEKaonZeroInelastic(); - theKaonZeroLInelastic.RegisterMe(theLEKaonZeroLModel); - theKaonZeroLInelastic.RegisterMe(theHEKaonZeroLModel); - pManager->AddDiscreteProcess(&theKaonZeroLInelastic); - - // KaonZeroS - pManager = G4KaonZeroShort::KaonZeroShort()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEKaonZeroSModel = new G4LEKaonZeroSInelastic(); - theHEKaonZeroSModel = new G4HEKaonZeroInelastic(); - theKaonZeroSInelastic.RegisterMe(theLEKaonZeroSModel); - theKaonZeroSInelastic.RegisterMe(theHEKaonZeroSModel); - pManager->AddDiscreteProcess(&theKaonZeroSInelastic); - - // Proton - pManager = G4Proton::Proton()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEProtonModel = new G4LEProtonInelastic(); - theHEProtonModel = new G4HEProtonInelastic(); - theProtonInelastic.RegisterMe(theLEProtonModel); - theProtonInelastic.RegisterMe(&theTheoModel); - pManager->AddDiscreteProcess(&theProtonInelastic); - - pManager->AddProcess(&theProtonIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theProtonMult); - pManager->SetProcessOrdering(&theProtonMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theProtonMult, idxPostStep, 1); - - // anti-Proton - pManager = G4AntiProton::AntiProton()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiProtonModel = new G4LEAntiProtonInelastic(); - theHEAntiProtonModel = new G4HEAntiProtonInelastic(); - theAntiProtonInelastic.RegisterMe(theLEAntiProtonModel); - theAntiProtonInelastic.RegisterMe(theHEAntiProtonModel); - pManager->AddDiscreteProcess(&theAntiProtonInelastic); - - pManager->AddProcess(&theAntiProtonIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theAntiProtonMult); - pManager->SetProcessOrdering(&theAntiProtonMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theAntiProtonMult, idxPostStep, 1); - - pManager->AddRestProcess(&theAntiProtonAnnihilation); - - // Neutron - pManager = G4Neutron::Neutron()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLENeutronModel = new G4LENeutronInelastic(); - theHENeutronModel = new G4HENeutronInelastic(); - theNeutronInelastic.RegisterMe(theLENeutronModel); - theNeutronInelastic.RegisterMe(&theTheoModel); - pManager->AddDiscreteProcess(&theNeutronInelastic); - - theNeutronFissionModel = new G4LFission(); - theNeutronFission.RegisterMe(theNeutronFissionModel); - pManager->AddDiscreteProcess(&theNeutronFission); - - theNeutronCaptureModel = new G4LCapture(); - theNeutronCapture.RegisterMe(theNeutronCaptureModel); - pManager->AddDiscreteProcess(&theNeutronCapture); - - // AntiNeutron - pManager = G4AntiNeutron::AntiNeutron()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiNeutronModel = new G4LEAntiNeutronInelastic(); - theHEAntiNeutronModel = new G4HEAntiNeutronInelastic(); - theAntiNeutronInelastic.RegisterMe(theLEAntiNeutronModel); - theAntiNeutronInelastic.RegisterMe(theHEAntiNeutronModel); - pManager->AddDiscreteProcess(&theAntiNeutronInelastic); - - pManager->AddRestProcess(&theAntiNeutronAnnihilation); - - // Lambda - pManager = G4Lambda::Lambda()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLELambdaModel = new G4LELambdaInelastic(); - theHELambdaModel = new G4HELambdaInelastic(); - theLambdaInelastic.RegisterMe(theLELambdaModel); - theLambdaInelastic.RegisterMe(theHELambdaModel); - pManager->AddDiscreteProcess(&theLambdaInelastic); - - // AntiLambda - pManager = G4AntiLambda::AntiLambda()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiLambdaModel = new G4LEAntiLambdaInelastic(); - theHEAntiLambdaModel = new G4HEAntiLambdaInelastic(); - theAntiLambdaInelastic.RegisterMe(theLEAntiLambdaModel); - theAntiLambdaInelastic.RegisterMe(theHEAntiLambdaModel); - pManager->AddDiscreteProcess(&theAntiLambdaInelastic); - - // SigmaMinus - pManager = G4SigmaMinus::SigmaMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLESigmaMinusModel = new G4LESigmaMinusInelastic(); - theHESigmaMinusModel = new G4HESigmaMinusInelastic(); - theSigmaMinusInelastic.RegisterMe(theLESigmaMinusModel); - theSigmaMinusInelastic.RegisterMe(theHESigmaMinusModel); - pManager->AddDiscreteProcess(&theSigmaMinusInelastic); - - pManager->AddProcess(&theSigmaMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theSigmaMinusMult); - pManager->SetProcessOrdering(&theSigmaMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theSigmaMinusMult, idxPostStep, 1); - - // anti-SigmaMinus - pManager = G4AntiSigmaMinus::AntiSigmaMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiSigmaMinusModel = new G4LEAntiSigmaMinusInelastic(); - theHEAntiSigmaMinusModel = new G4HEAntiSigmaMinusInelastic(); - theAntiSigmaMinusInelastic.RegisterMe(theLEAntiSigmaMinusModel); - theAntiSigmaMinusInelastic.RegisterMe(theHEAntiSigmaMinusModel); - pManager->AddDiscreteProcess(&theAntiSigmaMinusInelastic); - - pManager->AddProcess(&theAntiSigmaMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theAntiSigmaMinusMult); - pManager->SetProcessOrdering(&theAntiSigmaMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theAntiSigmaMinusMult, idxPostStep, 1); - - // SigmaPlus - pManager = G4SigmaPlus::SigmaPlus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLESigmaPlusModel = new G4LESigmaPlusInelastic(); - theHESigmaPlusModel = new G4HESigmaPlusInelastic(); - theSigmaPlusInelastic.RegisterMe(theLESigmaPlusModel); - theSigmaPlusInelastic.RegisterMe(theHESigmaPlusModel); - pManager->AddDiscreteProcess(&theSigmaPlusInelastic); - - pManager->AddProcess(&theSigmaPlusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theSigmaPlusMult); - pManager->SetProcessOrdering(&theSigmaPlusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theSigmaPlusMult, idxPostStep, 1); - - // anti-SigmaPlus - pManager = G4AntiSigmaPlus::AntiSigmaPlus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiSigmaPlusModel = new G4LEAntiSigmaPlusInelastic(); - theHEAntiSigmaPlusModel = new G4HEAntiSigmaPlusInelastic(); - theAntiSigmaPlusInelastic.RegisterMe(theLEAntiSigmaPlusModel); - theAntiSigmaPlusInelastic.RegisterMe(theHEAntiSigmaPlusModel); - pManager->AddDiscreteProcess(&theAntiSigmaPlusInelastic); - - pManager->AddProcess(&theAntiSigmaPlusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theAntiSigmaPlusMult); - pManager->SetProcessOrdering(&theAntiSigmaPlusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theAntiSigmaPlusMult, idxPostStep, 1); - - // XiMinus - pManager = G4XiMinus::XiMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEXiMinusModel = new G4LEXiMinusInelastic(); - theHEXiMinusModel = new G4HEXiMinusInelastic(); - theXiMinusInelastic.RegisterMe(theLEXiMinusModel); - theXiMinusInelastic.RegisterMe(theHEXiMinusModel); - pManager->AddDiscreteProcess(&theXiMinusInelastic); - - pManager->AddProcess(&theXiMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theXiMinusMult); - pManager->SetProcessOrdering(&theXiMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theXiMinusMult, idxPostStep, 1); - - // anti-XiMinus - pManager = G4AntiXiMinus::AntiXiMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiXiMinusModel = new G4LEAntiXiMinusInelastic(); - theHEAntiXiMinusModel = new G4HEAntiXiMinusInelastic(); - theAntiXiMinusInelastic.RegisterMe(theLEAntiXiMinusModel); - theAntiXiMinusInelastic.RegisterMe(theHEAntiXiMinusModel); - pManager->AddDiscreteProcess(&theAntiXiMinusInelastic); - - pManager->AddProcess(&theAntiXiMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theAntiXiMinusMult); - pManager->SetProcessOrdering(&theAntiXiMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theAntiXiMinusMult, idxPostStep, 1); - - // XiZero - pManager = G4XiZero::XiZero()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEXiZeroModel = new G4LEXiZeroInelastic(); - theHEXiZeroModel = new G4HEXiZeroInelastic(); - theXiZeroInelastic.RegisterMe(theLEXiZeroModel); - theXiZeroInelastic.RegisterMe(theHEXiZeroModel); - pManager->AddDiscreteProcess(&theXiZeroInelastic); - - // anti-XiZero - pManager = G4AntiXiZero::AntiXiZero()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiXiZeroModel = new G4LEAntiXiZeroInelastic(); - theHEAntiXiZeroModel = new G4HEAntiXiZeroInelastic(); - theAntiXiZeroInelastic.RegisterMe(theLEAntiXiZeroModel); - theAntiXiZeroInelastic.RegisterMe(theHEAntiXiZeroModel); - pManager->AddDiscreteProcess(&theAntiXiZeroInelastic); - - // OmegaMinus - pManager = G4OmegaMinus::OmegaMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEOmegaMinusModel = new G4LEOmegaMinusInelastic(); - theHEOmegaMinusModel = new G4HEOmegaMinusInelastic(); - theOmegaMinusInelastic.RegisterMe(theLEOmegaMinusModel); - theOmegaMinusInelastic.RegisterMe(theHEOmegaMinusModel); - pManager->AddDiscreteProcess(&theOmegaMinusInelastic); - - pManager->AddProcess(&theOmegaMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theOmegaMinusMult); - pManager->SetProcessOrdering(&theOmegaMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theOmegaMinusMult, idxPostStep, 1); - - // anti-OmegaMinus - pManager = G4AntiOmegaMinus::AntiOmegaMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiOmegaMinusModel = new G4LEAntiOmegaMinusInelastic(); - theHEAntiOmegaMinusModel = new G4HEAntiOmegaMinusInelastic(); - theAntiOmegaMinusInelastic.RegisterMe(theLEAntiOmegaMinusModel); - theAntiOmegaMinusInelastic.RegisterMe(theHEAntiOmegaMinusModel); - pManager->AddDiscreteProcess(&theAntiOmegaMinusInelastic); - - pManager->AddProcess(&theAntiOmegaMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theAntiOmegaMinusMult); - pManager->SetProcessOrdering(&theAntiOmegaMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theAntiOmegaMinusMult, idxPostStep, 1); - -} diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04IonPhysics.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04IonPhysics.cc deleted file mode 100644 index 36d4c76479..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04IonPhysics.cc +++ /dev/null @@ -1,129 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: ExN04IonPhysics.cc,v 1.5 2006/06/29 17:05:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// - -#include "ExN04IonPhysics.hh" - -#include "globals.hh" -#include "G4ios.hh" -#include - - -ExN04IonPhysics::ExN04IonPhysics(const G4String& name) - : G4VPhysicsConstructor(name) -{ -} - -ExN04IonPhysics::~ExN04IonPhysics() -{ -} - -#include "G4ParticleDefinition.hh" -#include "G4ParticleTable.hh" - -// Nuclei -#include "G4IonConstructor.hh" - -void ExN04IonPhysics::ConstructParticle() -{ - // Construct light ions - G4IonConstructor pConstructor; - pConstructor.ConstructParticle(); -} - - -#include "G4ProcessManager.hh" - - -void ExN04IonPhysics::ConstructProcess() -{ - G4ProcessManager * pManager = 0; - - // Elastic Process - theElasticModel = new G4LElastic(); - theElasticProcess.RegisterMe(theElasticModel); - - // Generic Ion - pManager = G4GenericIon::GenericIon()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - pManager->AddProcess(&fIonMultipleScattering, -1, 1, 1); - pManager->AddProcess(&fIonIonisation, -1, 2, 2); - - // Deuteron - pManager = G4Deuteron::Deuteron()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - fDeuteronModel = new G4LEDeuteronInelastic(); - fDeuteronProcess.RegisterMe(fDeuteronModel); - pManager->AddDiscreteProcess(&fDeuteronProcess); - - pManager->AddProcess(&fDeuteronMultipleScattering, -1, 1, 1); - pManager->AddProcess(&fDeuteronIonisation, -1, 2, 2); - - // Triton - pManager = G4Triton::Triton()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - fTritonModel = new G4LETritonInelastic(); - fTritonProcess.RegisterMe(fTritonModel); - pManager->AddDiscreteProcess(&fTritonProcess); - - pManager->AddProcess(&fTritonMultipleScattering, -1, 1, 1); - pManager->AddProcess(&fTritonIonisation, -1, 2, 2); - - // Alpha - pManager = G4Alpha::Alpha()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - fAlphaModel = new G4LEAlphaInelastic(); - fAlphaProcess.RegisterMe(fAlphaModel); - pManager->AddDiscreteProcess(&fAlphaProcess); - - pManager->AddProcess(&fAlphaMultipleScattering, -1, 1, 1); - pManager->AddProcess(&fAlphaIonisation, -1, 2, 2); - - // He3 - pManager = G4He3::He3()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - pManager->AddProcess(&fHe3MultipleScattering, -1, 1, 1); - pManager->AddProcess(&fHe3Ionisation, -1, 2, 2); - - -} - - - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04MuonPhysics.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04MuonPhysics.cc deleted file mode 100644 index 8d6e55ecbb..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04MuonPhysics.cc +++ /dev/null @@ -1,117 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: ExN04MuonPhysics.cc,v 1.5 2006/06/29 17:06:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// - -#include "ExN04MuonPhysics.hh" - -#include "globals.hh" -#include "G4ios.hh" -#include - - -ExN04MuonPhysics::ExN04MuonPhysics(const G4String& name) - : G4VPhysicsConstructor(name) -{ -} - -ExN04MuonPhysics::~ExN04MuonPhysics() -{ -} - -#include "G4ParticleDefinition.hh" -#include "G4ParticleTable.hh" - -#include "G4MuonPlus.hh" -#include "G4MuonMinus.hh" -#include "G4TauMinus.hh" -#include "G4TauPlus.hh" -#include "G4NeutrinoTau.hh" -#include "G4AntiNeutrinoTau.hh" -#include "G4NeutrinoMu.hh" -#include "G4AntiNeutrinoMu.hh" - -void ExN04MuonPhysics::ConstructParticle() -{ - // Mu - G4MuonPlus::MuonPlusDefinition(); - G4MuonMinus::MuonMinusDefinition(); - G4NeutrinoMu::NeutrinoMuDefinition(); - G4AntiNeutrinoMu::AntiNeutrinoMuDefinition(); - - // Tau - G4TauMinus::TauMinusDefinition(); - G4TauPlus::TauPlusDefinition(); - G4NeutrinoTau::NeutrinoTauDefinition(); - G4AntiNeutrinoTau::AntiNeutrinoTauDefinition(); - -} - - -#include "G4ProcessManager.hh" - -void ExN04MuonPhysics::ConstructProcess() -{ - G4ProcessManager * pManager = 0; - - // Muon Plus Physics - pManager = G4MuonPlus::MuonPlus()->GetProcessManager(); - - pManager->AddProcess(&fMuPlusMultipleScattering,-1, 1, 1); - pManager->AddProcess(&fMuPlusIonisation, -1, 2, 2); - pManager->AddProcess(&fMuPlusBremsstrahlung, -1, 3, 3); - pManager->AddProcess(&fMuPlusPairProduction, -1, 4, 4); - - // Muon Minus Physics - pManager = G4MuonMinus::MuonMinus()->GetProcessManager(); - - pManager->AddProcess(&fMuMinusMultipleScattering,-1, 1, 1); - pManager->AddProcess(&fMuMinusIonisation, -1, 2, 2); - pManager->AddProcess(&fMuMinusBremsstrahlung, -1, 3, 3); - pManager->AddProcess(&fMuMinusPairProduction, -1, 4, 4); - - - pManager->AddRestProcess(&fMuMinusCaptureAtRest); - - // Tau Plus Physics - pManager = G4TauPlus::TauPlus()->GetProcessManager(); - - pManager->AddProcess(&fTauPlusMultipleScattering, -1, 1, 1); - pManager->AddProcess(&fTauPlusIonisation, -1, 2, 2); - - // Tau Minus Physics - pManager = G4TauMinus::TauMinus()->GetProcessManager(); - - pManager->AddProcess(&fTauMinusMultipleScattering, -1, 1, 1); - pManager->AddProcess(&fTauMinusIonisation, -1, 2, 2); - -} - - - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04PrimaryGeneratorAction.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04PrimaryGeneratorAction.cc index efe1438211..16b6382394 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04PrimaryGeneratorAction.cc +++ b/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04PrimaryGeneratorAction.cc @@ -26,7 +26,7 @@ // ==================================================================== // // ExN04PrimaryGeneratorAction.cc -// $Id: ExN04PrimaryGeneratorAction.cc,v 1.4 2006/06/29 17:06:08 gunter Exp $ +// $Id: ExN04PrimaryGeneratorAction.cc,v 1.5 2006/07/05 11:06:36 gcosmo Exp $ // // ==================================================================== #include "ExN04PrimaryGeneratorAction.hh" @@ -45,8 +45,11 @@ ExN04PrimaryGeneratorAction::ExN04PrimaryGeneratorAction() currentGenerator= particleGun= new G4ParticleGun(); currentGeneratorName= "particleGun"; hepmcAscii= new HepMCG4AsciiReader(); +#ifdef G4LIB_USE_PYTHIA pythiaGen= new HepMCG4PythiaInterface(); - +#else + pythiaGen= 0; +#endif gentypeMap["particleGun"]= particleGun; gentypeMap["hepmcAscii"]= hepmcAscii; gentypeMap["pythia"]= pythiaGen; diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04RunAction.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04RunAction.cc index ccdb6da817..8c2cef2f2e 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04RunAction.cc +++ b/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04RunAction.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: ExN04RunAction.cc,v 1.2 2006/06/29 17:06:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: ExN04RunAction.cc,v 1.3 2006/07/05 11:06:36 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -55,22 +55,6 @@ void ExN04RunAction::BeginOfRunAction(const G4Run* aRun) G4cout << "### Run " << aRun->GetRunID() << " start." << G4endl; G4RunManager::GetRunManager()->SetRandomNumberStore(true); - - if (G4VVisManager::GetConcreteInstance()) - { - G4UImanager* UI = G4UImanager::GetUIpointer(); - UI->ApplyCommand("/vis/scene/notifyHandlers"); - } -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void ExN04RunAction::EndOfRunAction(const G4Run*) -{ - if (G4VVisManager::GetConcreteInstance()) - { - G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/update"); - } } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04SteppingVerbose.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04SteppingVerbose.cc index 042c37d5af..68f742c0f8 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04SteppingVerbose.cc +++ b/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04SteppingVerbose.cc @@ -25,7 +25,7 @@ // // // $Id: ExN04SteppingVerbose.cc,v 1.4 2006/06/29 17:06:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01/src/HepMCG4PythiaInterface.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01/src/HepMCG4PythiaInterface.cc index 97115e45c0..77fc7cf60a 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01/src/HepMCG4PythiaInterface.cc +++ b/examples/extended/eventgenerator/HepMC/HepMCEx01/src/HepMCG4PythiaInterface.cc @@ -26,9 +26,12 @@ // ==================================================================== // // HepMCG4PythiaInterface.cc -// $Id: HepMCG4PythiaInterface.cc,v 1.4 2006/06/29 17:06:43 gunter Exp $ +// $Id: HepMCG4PythiaInterface.cc,v 1.5 2006/07/05 11:06:36 gcosmo Exp $ // // ==================================================================== + +#ifdef G4LIB_USE_PYTHIA + #include "HepMCG4PythiaInterface.hh" #include "HepMCG4PythiaMessenger.hh" @@ -162,3 +165,4 @@ void HepMCG4PythiaInterface::Print() const G4cout << "PythiaInterface::Print()..." << G4endl; } +#endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01/src/HepMCG4PythiaMessenger.cc b/examples/extended/eventgenerator/HepMC/HepMCEx01/src/HepMCG4PythiaMessenger.cc index c3063c6617..156b7e98af 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01/src/HepMCG4PythiaMessenger.cc +++ b/examples/extended/eventgenerator/HepMC/HepMCEx01/src/HepMCG4PythiaMessenger.cc @@ -26,9 +26,12 @@ // ==================================================================== // // HepMCG4PythiaMessenger.cc -// $Id: HepMCG4PythiaMessenger.cc,v 1.5 2006/06/29 17:06:45 gunter Exp $ +// $Id: HepMCG4PythiaMessenger.cc,v 1.6 2006/07/05 11:06:36 gcosmo Exp $ // // ==================================================================== + +#ifdef G4LIB_USE_PYTHIA + #include "HepMCG4PythiaMessenger.hh" #include "HepMCG4PythiaInterface.hh" @@ -215,3 +218,4 @@ G4String HepMCG4PythiaMessenger::GetCurrentValue(G4UIcommand* command) return cv; } +#endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01/vis.mac b/examples/extended/eventgenerator/HepMC/HepMCEx01/vis.mac index aacc1b037b..6042210241 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01/vis.mac +++ b/examples/extended/eventgenerator/HepMC/HepMCEx01/vis.mac @@ -25,7 +25,17 @@ /vis/viewer/flush # # for drawing the tracks +# Draw trajectories at end of event, showing trajectory points as +# markers of size 2 pixels +/vis/scene/add/trajectories +/vis/modeling/trajectories/create/drawByCharge +/vis/modeling/trajectories/drawByCharge-0/default/setDrawStepPts true +/vis/modeling/trajectories/drawByCharge-0/default/setStepPtsSize 2 # (if too many tracks cause core dump => storeTrajectory 0) -/tracking/storeTrajectory 1 -/vis/scene/endOfEventAction accumulate +/vis/scene/endOfEventAction accumulate +# +# Refresh ready for run +/vis/viewer/refresh +# +# Now ready for /run/beamOn. diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/GNUmakefile b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/GNUmakefile deleted file mode 100644 index c27f28030c..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/GNUmakefile +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: GNUmakefile,v 1.1 2002/11/19 10:37:08 murakami Exp $ -# -------------------------------------------------------------- -# GNUmakefile for examples module. Gabriele Cosmo, 06/04/98. -# -------------------------------------------------------------- -name := hepmcEx02-clhep -G4TARGET := $(name) -G4EXLIB := true - -ifndef G4INSTALL - G4INSTALL = ../../../../.. -endif - -.PHONY: all -all : lib bin - -include $(G4INSTALL)/config/binmake.gmk - -# check gcc -USE_GCC := 0 -ifeq ($(G4SYSTEM),Linux-g++) - USE_GCC := 1 -endif -ifeq ($(G4SYSTEM),Linux-egcs) - USE_GCC := 1 -endif - -# PYTHIA - CERNLIB_DIR := /cern/pro/lib - -ifeq ($(USE_GCC),1) - LDLIBS1 += -L$(CERNLIB_DIR) -lpythia6 -lg2c -else - LDLIBS1 += -L$(CERNLIB_DIR) -lpythia6 # and something? -endif - -CXXFLAGS_WITHOUT_O := $(filter-out -O% , $(CXXFLAGS)) -CXXFLAGS_WITHOUT_O := $(filter-out +O% , $(CXXFLAGS_WITHOUT_O)) - -# On HP-acc optimization has to be turned off to compile ExN04HadronPhysics. -# -ifeq ($(G4SYSTEM),HP-aCC) - COMPILER := $(shell aCC -V 2>&1) -ifeq ($(COMPILER), aCC: HP ANSI C++ B3910B A.01.15) -$(G4TMP)/$(G4SYSTEM)/$(name)/XXHadronPhysics.o: src/XXHadronPhysics.cc - $(CXX) $(CXXFLAGS_WITHOUT_O) $(CPPFLAGS) -c $(OUT_OBJ)$@ src/XXHadronPhysics.cc -endif -endif - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/History b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/History deleted file mode 100644 index 1d285c7d15..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/History +++ /dev/null @@ -1,43 +0,0 @@ -$Id: History,v 1.6 2005/12/06 13:50:16 gcosmo Exp $ -------------------------------------------------------------------- - - ========================================================= - Geant4 - an Object-Oriented Toolkit for Simulation in HEP - ========================================================= - - Example HepMCEx02 History file - ----- ------------------------ -This file should be used by the G4 example coordinator to briefly -summarize all major modifications introduced in the code and keep -track of all tags. - - ---------------------------------------------------------- - * Reverse chronological order (last date on top), please * - ---------------------------------------------------------- - -Dec. 6th, 2005 G.Cosmo -- Trivial changes for support of CLHEP-2.0.X series. - -May 3rd, 2005 J.Allison (examples-V07-00-03) -- Replaced vis manager with G4VisExecutive. - -Dec, 3rd, 2004 G.Cosmo -- Implemented migration to . - -Nov 13th, 2003 J.Allison -- Reconstructed Vis Manager. - -Jul. 4th, 2003 G.Cosmo (exHepMC-V05-02-00) -- fixed compilation errors due to incorrect code migration from g4std wrappers. -- fixed pedantic compilation warnings on Linux-g++. - -Nov. 19th, 2002 K.Murakami -- modified physics lists as is ExN04. -- "std" namespace left/not cared was modified to "G4std". - -May. 28th, 2002 K.Murakami -- rename classes and filenames. - -Apr. 15th, 02 K.Murakami - -- Created. diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/README b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/README deleted file mode 100644 index 98cb62a824..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/README +++ /dev/null @@ -1,42 +0,0 @@ -$Id: README,v 1.1 2002/11/19 10:38:06 murakami Exp $ -------------------------------------------------------------------- - - ========================================================= - Geant4 - an Object-Oriented Toolkit for Simulation in HEP - ========================================================= - - HepMCEx02 - --------- - - This example demonstrates how to interface primary particles in Geant4 -with various event generators via the HepMC Monte Carlo event interface. -This is another example having the same generator action as HepMCEx01, -but much simpler user control. - -1. Primary Generator - - H02PrimaryGeneratorAction has G4HepMCInterface as the generator. -There are two types of generators provided as samples. One generator reads -primary information from a HepMC Ascii file (data/example_MyPythia.dat). -The other one generates primaries directly invoking PYTHIA routines -in every event. - -2. Geometry - - A simplified collider-type geometry, which consists of - - endcap calorimeter (a set of tubes filled with lead), - - barrel calorimeter (tube filled with lead), - - barrel muon detector (8 sets of plates filled with Ar), - - endcap muon detecror, (a set of tubes filled with Ar) and - - uniform magnetic field along the z axis of 3 Tesla at the - central region. - -3. Physics List - - Full set of "ordinary" physics processes, which is the same one as -ExN04PhysicsList. - -4. User actions - - All particles except muons are killed in the calorimeter section. - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/data/GNUmakefile b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/data/GNUmakefile deleted file mode 100644 index d6d63cab9e..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/data/GNUmakefile +++ /dev/null @@ -1,20 +0,0 @@ -# // CLHEP -CLHEPD := $(CLHEP_BASE_DIR) -CLHEPINC := -I$(CLHEPD)/include -CLHEPLIB := -L$(CLHEPD)/lib -lCLHEP - -# // CERN libraries -CLIBD := /cern/pro/lib -CLIB := -L$(CLIBD) -lpythia6 - -CXXFLAGS := $(CLHEPINC) -LOPT := $(CLHEPLIB) $(CLIB) -lg2c - -%.o: %.cc - $(CXX) -c -o $@ $(CXXFLAGS) $*.cc - -example_MyPythia : example_MyPythia.o - $(CXX) -o $@ example_MyPythia.o $(LOPT) - -example_MyPythia.o : example_MyPythia.cc - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/data/example_MyPythia.cc b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/data/example_MyPythia.cc deleted file mode 100644 index 2dcab69859..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/data/example_MyPythia.cc +++ /dev/null @@ -1,98 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// $Id: example_MyPythia.cc,v 1.5 2006/06/29 17:12:32 gunter Exp $ -// ==================================================================== -// example_MyPythia.cc -// -// sample event generation using Pythia and HepMC(CLHEP) -// ==================================================================== - -#include "CLHEP/HepMC/CBhepevt.h" -#include "CLHEP/HepMC/WriteHepMC.h" -#include "CLHEP/HepMC/ReadHepMC.h" -#include "CLHEP/HepMC/include/PythiaWrapper6_2.h" - -#include -#include - -// global parameters -hepev2_t hepev2_; -hepev3_t hepev3_; -hepev4_t hepev4_; -hepev5_t hepev5_; - -int main() { - // initialize Pythia... - // select W+gamma process (process number 20) - pysubs.msel= 0; - pysubs.msub[20-1]= 1; - // set random number seed (mandatory!) - pydatr.mrpy[0]= 55122 ; - // tell Pythia not to write multiple copies of particles in event record. - pypars.mstp[128-1]= 2; - // example of setting a Pythia parameter: set the top mass - pydat2.pmas[1-1][6-1]= 175; - // call pythia initialization - call_pyinit( "CMS", "p", "p", 14000. ); - - // prepare HepMC-HEPEVT interface... - HepMC::CBhepevt* hepevtio= new HepMC::CBhepevt; - - std::ofstream to; - std::string fname= "example_MyPythia.dat"; - to.open(fname.c_str(), std::ios::out); - - HepMC::writeComment(to, "generate sample pythia events..."); - for ( int i = 1; i <= 10; i++ ) { - if ( i%50==1 ) std::cout << "Processing Event Number " - << i << std::endl; - call_pyevnt(); // generate one event with Pythia - // pythia pyhepc routine converts common PYJETS in common HEPEVT - call_pyhepc( 1 ); - - HepMC::GenEvent* evt= new HepMC::GenEvent(); - hepevtio-> toGenEvent(evt, false); - hepevtio-> clean(); // clear HEPEVT - - // add some information to the event - evt-> set_event_number(i); - evt-> set_signal_process_id(20); - - // write the event out to the ascii file - to << evt; - - // we also need to delete the created event from memory - delete evt; - } - - // write out some information from Pythia to the screen - call_pystat(1); - to.close(); - delete hepevtio; - - return 0; -} - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/data/example_MyPythia.dat b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/data/example_MyPythia.dat deleted file mode 100644 index 3417cca269..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/data/example_MyPythia.dat +++ /dev/null @@ -1,5901 +0,0 @@ -BlockType Comment -generate sample pythia events... -BlockType GenEvent -E 1 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 78 0 0 -V -1 0 0 0 0 0 1 2 0 -P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -1 0 -P 3 2 -7.7594698288360897e-01 -9.1232539665921930e-01 1.8833052220885656e+03 1.8833056029166935e+03 0 3 0 0 -3 0 -P 20 2101 7.7594698288360897e-01 9.1232539665921930e-01 4.4469502845870420e+03 4.4469504836059705e+03 5.7933000000000001e-01 2 0 0 -16 0 -V -2 0 0 0 0 0 1 3 0 -P 2 2212 0 0 -6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -2 0 -P 4 -1 -1.0077355308447375e+00 -1.2716278982991639e-02 -4.1454166842423659e+00 4.2661659707370658e+00 0 3 0 0 -4 0 -P 13 2214 9.9965263761245238e-01 2.7342497748314848e-02 -4.0826017593891916e+03 4.0826020585869046e+03 1.2012315772156326e+00 2 0 0 -9 0 -P 26 1 8.0828932322852265e-03 -1.4626218765323211e-02 -2.4623230582064652e+03 2.4623230803764359e+03 3.3000000000000002e-01 2 0 0 -16 0 -V -3 0 0 0 0 0 0 4 0 -P 5 2 -5.0183078832283403e+00 1.1490196188676447e+00 1.4784133950691614e+03 1.4784223585904062e+03 0 3 0 0 -5 0 -P 21 21 1.4581184692651741e+00 -3.9123134860507047e-01 1.0923177669273832e+02 1.0924220892535446e+02 0 2 0 0 -16 0 -P 22 21 3.1078318510719791e+00 2.3161265926755781e-01 1.4647261850356662e+02 1.4650576860495917e+02 0 2 0 0 -16 0 -P 23 21 -1.0916504553308495e-01 -1.8718066652841989e+00 8.6094190154962845e+01 8.6114604775486654e+01 0 2 0 0 -16 0 -V -4 0 0 0 0 0 0 3 0 -P 6 -1 2.5393345338288575e-02 8.3451451612681318e+00 6.6003848774206497e-01 8.3712450322473053e+00 0 3 0 0 -5 0 -P 24 21 -5.3671673260814667e-01 -6.6758503288897897e+00 4.7470952833050397e+01 4.7941072217280407e+01 0 2 0 0 -16 0 -P 25 21 -7.1083651803421799e-01 -1.7119307722665538e+00 1.0816833663101894e+01 1.0974510741696802e+01 0 2 0 0 -16 0 -V -5 0 0 0 0 0 0 2 0 -P 7 22 -4.0262403277658469e+00 -1.2288309207825838e+00 2.4575369641175027e+02 2.4578974741971544e+02 0 3 0 0 -6 0 -P 8 24 -9.6667421012420562e-01 1.0722995700918359e+01 1.2333197371451533e+03 1.2410038562029381e+03 1.3746665043908820e+02 3 0 0 -7 0 -V -6 0 0 0 0 0 0 1 0 -P 9 22 -4.0262403277658469e+00 -1.2288309207825838e+00 2.4575369641175027e+02 2.4578974741971544e+02 0 1 0 0 0 0 -V -7 0 0 0 0 0 0 1 0 -P 10 24 -9.6667421012420562e-01 1.0722995700918359e+01 1.2333197371451533e+03 1.2410038562029381e+03 1.3746665043908820e+02 2 0 0 -8 0 -V -8 0 0 0 0 0 0 2 0 -P 11 -13 -2.5622328442447461e+01 4.7040178447927353e+01 2.0936799887850253e+02 2.1611166609336419e+02 1.0566000000000000e-01 1 0 0 0 0 -P 12 14 2.4655654232323258e+01 -3.6317182747008992e+01 1.0239517382666510e+03 1.0248921901095741e+03 0 1 0 0 0 0 -V -9 0 0 0 0 0 0 2 0 -P 29 2212 1.0242368375894155e+00 1.1819305384951433e-01 -3.7370902170825884e+03 3.7370904770952066e+03 9.3827000000000005e-01 1 0 0 0 0 -P 30 111 -2.4584199976963136e-02 -9.0850556101199478e-02 -3.4551154230660296e+02 3.4551158149169805e+02 1.3497999999999999e-01 2 0 0 -20 0 -V -10 0 0 0 0 0 2 1 0 -P 14 1 2.3065048155050207e+00 5.8203193328752807e+00 1.5053434005803197e+02 1.5066447364361579e+02 0 2 0 0 -10 0 -P 15 -1 -2.3065048155050207e+00 -5.8203193328752807e+00 4.6213780965918581e+01 4.6635926416942638e+01 0 2 0 0 -10 0 -P 31 92 0 0 1.9674812102395055e+02 1.9730040006055842e+02 1.4752109598335721e+01 2 0 0 -11 0 -V -11 0 0 0 0 0 0 8 0 -P 32 -211 2.5433561751902267e-01 1.6471020112402412e+00 3.4162682623605711e+01 3.4203596235891361e+01 1.3957000000000000e-01 1 0 0 0 0 -P 33 211 1.8267397603378879e-01 -2.2451207083727245e-01 8.9833818072340854e+00 8.9891269838019312e+00 1.3957000000000000e-01 1 0 0 0 0 -P 34 -211 1.6527958883141400e+00 3.3636085038226837e+00 8.5511074879269898e+01 8.5593276623858827e+01 1.3957000000000000e-01 1 0 0 0 0 -P 35 221 1.5340695778001462e-01 1.0080214339909595e-01 1.6778513363366923e+01 1.6788445638414284e+01 5.4744999999999999e-01 2 0 0 -21 0 -P 36 211 -5.4270097089667468e-01 7.1269909168117845e-02 3.1032133671979825e+00 3.1542061966557080e+00 1.3957000000000000e-01 1 0 0 0 0 -P 37 221 -4.3895349893169139e-01 -1.0908000994225866e+00 1.6203900382989026e+01 1.6255725580713296e+01 5.4744999999999999e-01 2 0 0 -22 0 -P 38 -213 -1.1775778049994057e+00 -2.1994908478570685e+00 1.6736113732474852e+01 1.6955085170015739e+01 1.0737601126508725e+00 2 0 0 -23 0 -P 39 211 -8.3980164819194153e-02 -1.6679795495132113e+00 1.5269240867812080e+01 1.5360937631207282e+01 1.3957000000000000e-01 1 0 0 0 0 -V -12 0 0 0 0 0 2 1 0 -P 16 2 -3.9452709365158856e+00 -1.3309715048590964e+00 3.4100364633141048e+01 3.4353624496149465e+01 0 2 0 0 -12 0 -P 17 -2 3.9452709365158856e+00 1.3309715048590964e+00 4.3760023670797966e+02 4.3762004503311903e+02 0 2 0 0 -12 0 -P 40 92 0 0 4.7170060134112072e+02 4.7197366952926848e+02 1.6052645369166928e+01 2 0 0 -13 0 -V -13 0 0 0 0 0 0 8 0 -P 41 221 -2.6764857527202399e+00 -7.4082656853446693e-01 2.6999649559108772e+01 2.7147618271339081e+01 5.4744999999999999e-01 2 0 0 -24 0 -P 42 211 -1.0793700584347439e+00 -1.7691740782741042e-01 8.9362513158609644e+00 9.0040217046253623e+00 1.3957000000000000e-01 1 0 0 0 0 -P 43 223 7.3128413379081270e-01 -2.4207212017445862e-01 2.9711160638588780e+01 2.9731384214780988e+01 7.8023422073180737e-01 2 0 0 -25 0 -P 44 -213 6.8313854697846552e-02 2.1615069868878325e-01 2.6710541480290658e+01 2.6723469313128675e+01 7.9962369406794465e-01 2 0 0 -26 0 -P 45 211 -7.6171122821958814e-02 3.3362556819896899e-01 9.9768132257362261e+00 9.9836561432089255e+00 1.3957000000000000e-01 1 0 0 0 0 -P 46 223 1.1759907015886510e+00 7.6699830168521430e-03 1.5941193545306197e+02 1.5941819661887365e+02 7.8309345789913631e-01 2 0 0 -27 0 -P 47 -213 4.1784646533132969e-01 2.7042442905701480e-01 5.6342534981914696e+01 5.6346454491891919e+01 4.4040955728183379e-01 2 0 0 -28 0 -P 48 111 1.4385917785683024e+00 3.3194541757471685e-01 1.5361171468655868e+02 1.5361886877141990e+02 1.3497999999999999e-01 2 0 0 -29 0 -V -14 0 0 0 0 0 2 1 0 -P 18 2 1.5410660823344702e+00 3.0415562160378746e+00 -6.3245198112592114e+01 6.3337043135802176e+01 0 2 0 0 -14 0 -P 19 -2 -1.5410660823344702e+00 -3.0415562160378746e+00 -3.1131552297791711e+02 3.1133419471028151e+02 0 2 0 0 -14 0 -P 49 92 0 0 -3.7456072109050922e+02 3.7467123784608367e+02 9.0995980831222933e+00 2 0 0 -15 0 -V -15 0 0 0 0 0 0 3 0 -P 50 113 1.5650691169710587e+00 2.8328826851235629e+00 -6.1146078921515716e+01 6.1234504633574247e+01 5.8900305128951691e-01 2 0 0 -30 0 -P 51 211 2.0243674382169874e-01 1.1974235089754615e-01 -2.6986180398301357e+01 2.6987566232256142e+01 1.3957000000000000e-01 1 0 0 0 0 -P 52 -211 -1.7675058607927574e+00 -2.9526250360211090e+00 -2.8642846177069208e+02 2.8644916698025321e+02 1.3957000000000000e-01 1 0 0 0 0 -V -16 0 0 0 0 0 0 1 0 -P 53 92 3.9932619002775978e+00 -9.5215072778841598e+00 2.3847135982279970e+03 7.3100517292471832e+03 6.9101295742883694e+03 2 0 0 -17 0 -V -17 0 0 0 0 0 0 31 0 -P 54 2212 8.2215700554402904e-01 7.5777360143587646e-01 2.8563381940988261e+03 2.8563385670437092e+03 9.3827000000000005e-01 1 0 0 0 0 -P 55 113 -3.6038310812821978e-01 -1.6892929069557774e-01 8.6247137938804929e+02 8.6247157540874730e+02 4.2392385196816618e-01 2 0 0 -31 0 -P 56 -2214 1.0274054900145733e+00 9.2951858077602798e-02 4.5344312824574462e+02 4.5344608664771232e+02 1.2722974294659994e+00 2 0 0 -32 0 -P 57 223 -3.5950138267252507e-01 4.0383168579159467e-01 1.2478306984250651e+02 1.2478685771933476e+02 8.0809583036116783e-01 2 0 0 -33 0 -P 58 2212 1.6784465902779000e+00 -6.2450245543458038e-01 1.5667821954585344e+02 1.5669126337139798e+02 9.3827000000000005e-01 1 0 0 0 0 -P 59 -213 5.5576917486158994e-01 3.4454408402510756e-01 9.1366431045160198e+01 9.1370656398000975e+01 5.8697416466134156e-01 2 0 0 -34 0 -P 60 -311 6.8837804480312736e-02 -2.9839760512711585e-02 3.7650473956009833e+01 3.7653837700767077e+01 4.9767000000000000e-01 2 0 0 -35 0 -P 61 311 5.5852191137677354e-01 -2.3170010256673915e-01 5.8824232435728810e+01 5.8829445252735184e+01 4.9767000000000000e-01 2 0 0 -36 0 -P 62 211 3.2384754659479414e-01 -1.1095603539042695e+00 5.0326870381868780e+01 5.0340335354770062e+01 1.3957000000000000e-01 1 0 0 0 0 -P 63 113 -1.6488951177897816e-02 -7.8122143799785340e-02 4.9112488643673986e+00 4.9474711292126861e+00 5.9222479834954955e-01 2 0 0 -37 0 -P 64 -211 7.0648600777312476e-01 -6.4021847151240463e-01 6.5555221578401913e+01 6.5562302874050388e+01 1.3957000000000000e-01 1 0 0 0 0 -P 65 213 4.7207901564054866e-01 -4.3912457471518479e-01 1.4382616336991193e+01 1.4418576507834425e+01 7.8740512194284817e-01 2 0 0 -38 0 -P 66 -213 -3.0042801873910607e-01 -3.8199301959389176e-01 1.6229684769106441e+01 1.6256964556636262e+01 8.0625878581263533e-01 2 0 0 -39 0 -P 67 211 -4.3941675941743208e-01 -3.1906445983026024e+00 2.4837368567595707e+01 2.5045711353216259e+01 1.3957000000000000e-01 1 0 0 0 0 -P 68 -211 -1.3996633591260657e-01 -1.2032611277813125e-01 4.9245854481282014e-01 5.4411777389114624e-01 1.3957000000000000e-01 1 0 0 0 0 -P 69 -311 -2.6561371175678439e-01 -2.6535883073847484e+00 2.0655232762662497e+01 2.0832628193716424e+01 4.9767000000000000e-01 2 0 0 -40 0 -P 70 323 1.0866371896259655e-01 -8.8626238190570616e-01 4.6627917510728158e+00 4.8302466865539628e+00 8.9016140429299728e-01 2 0 0 -41 0 -P 71 113 -4.9783662946179669e-01 -2.2840858695582428e-01 1.7034444868848415e+00 1.9604937252009362e+00 8.0112466846605357e-01 2 0 0 -42 0 -P 72 -323 -2.9015742650522380e-01 -2.3021536904469947e-01 6.4282764365011924e-01 1.1577885131594590e+00 8.8885117621720233e-01 2 0 0 -43 0 -P 73 311 7.9013389939514289e-02 -3.2312546676672708e-02 -8.4688302464291099e-01 9.8598859161290120e-01 4.9767000000000000e-01 2 0 0 -44 0 -P 74 113 1.2774634435977392e-01 1.7876746229795942e-01 -7.0745137977013928e-01 1.0861776738766289e+00 7.9436613121131461e-01 2 0 0 -45 0 -P 75 -2112 2.3991231535880583e-01 -6.4340230480703609e-01 -2.3473851019465588e+00 2.6200253904556892e+00 9.3957000000000002e-01 1 0 0 0 0 -P 76 2112 1.4332258420217242e-01 -2.1997217583827630e-01 -2.2266533235780592e+00 2.4309886732740313e+00 9.3957000000000002e-01 1 0 0 0 0 -P 77 221 -1.5764236109767513e-01 9.2260932887338432e-01 -1.1183066194239037e+01 1.1235512008581036e+01 5.4744999999999999e-01 2 0 0 -46 0 -P 78 211 -3.9688019773273309e-01 -5.0114132735548866e-01 -1.1139586968129358e+00 1.2919134198703757e+00 1.3957000000000000e-01 1 0 0 0 0 -P 79 111 2.8720505725726897e-01 2.8206480950685814e-01 -1.0371931167428463e+00 1.1207303259460017e+00 1.3497999999999999e-01 2 0 0 -47 0 -P 80 223 4.0600347620418453e-01 -2.4511798802410625e-01 -3.5094643591439350e+01 3.5108232820041870e+01 8.5386256819630568e-01 2 0 0 -48 0 -P 81 -321 -6.1416080466482037e-01 2.7652838022953574e-01 -2.2846185259167453e+02 2.2846337866717087e+02 4.9359999999999998e-01 1 0 0 0 0 -P 82 323 1.2565639040248300e-01 -3.0746308740674749e-01 -1.4994406836076098e+03 1.4994409818689087e+03 8.8550960455907635e-01 2 0 0 -49 0 -P 83 -321 1.9429284964222532e-01 2.9316952731129947e-01 -1.6936871917454789e+02 1.6936980360698905e+02 4.9359999999999998e-01 1 0 0 0 0 -P 84 311 -9.3629085348251956e-02 -1.1090305621819395e-01 -5.0941280621429246e+02 5.0941306998980963e+02 4.9767000000000000e-01 2 0 0 -50 0 -V -18 0 0 0 0 0 2 1 0 -P 27 21 -1.3650212674856288e-01 -5.9889764280123572e+00 -1.3829130975861951e+01 1.5070877049244315e+01 0 2 0 0 -18 0 -P 28 21 1.3650212674856288e-01 5.9889764280123572e+00 -6.1244142694407962e+01 6.1536424058104799e+01 0 2 0 0 -18 0 -P 85 92 0 0 -7.5073273670269913e+01 7.6607301107349116e+01 1.5253922884976552e+01 2 0 0 -19 0 -V -19 0 0 0 0 0 0 9 0 -P 86 -2112 -3.8391846582458374e-02 -2.4829965966375998e+00 -7.9823040467504578e+00 8.4122955079137967e+00 9.3957000000000002e-01 1 0 0 0 0 -P 87 2212 1.8826721276030065e-01 -2.1411823793389910e+00 -4.4940750564267944e+00 5.0692373914317530e+00 9.3827000000000005e-01 1 0 0 0 0 -P 88 -213 2.0012868143999138e-01 -1.1118139792674885e-01 -1.6567370969599078e+00 1.8269381912397860e+00 7.3519558879763558e-01 2 0 0 -51 0 -P 89 -313 -6.2630872275736982e-01 1.3663451184419380e+00 -1.2866054962931736e+01 1.2986301018153689e+01 9.2167360059140557e-01 2 0 0 -52 0 -P 90 321 7.8884764052036593e-02 7.4459657794075773e-01 -1.0937413012935250e+01 1.0974119155786763e+01 4.9359999999999998e-01 1 0 0 0 0 -P 91 -211 4.2278301863584250e-02 3.9247341077632097e-01 -8.7403526103734830e+00 8.7503752131858565e+00 1.3957000000000000e-01 1 0 0 0 0 -P 92 211 6.4367355561099904e-02 3.6656271279001679e-01 -1.3767381548990618e+00 1.4329686357086739e+00 1.3957000000000000e-01 1 0 0 0 0 -P 93 -2212 4.1585942036274817e-02 5.6395536708324689e-01 -1.1971979631427098e+01 1.2021997418683901e+01 9.3827000000000005e-01 1 0 0 0 0 -P 94 2112 4.9188311626540610e-02 1.3014271868710594e+00 -1.5047619097566116e+01 1.5133068575244886e+01 9.3957000000000002e-01 1 0 0 0 0 -V -20 0 -7.4269769026061745e-06 -2.7446285922861489e-05 -1.0438030306862014e-01 1.0438031490658096e-01 0 2 0 -P 95 22 -4.5719298565037564e-02 -1.2006795010764217e-01 -2.7170906130817190e+02 2.7170909168361442e+02 0 1 0 0 0 0 -P 96 22 2.1135098588074424e-02 2.9217394006442684e-02 -7.3802480998431093e+01 7.3802489808083607e+01 0 1 0 0 0 0 -V -21 0 0 0 0 0 0 3 0 -P 97 211 1.9058278725344435e-01 1.3383881894953986e-01 6.8583567178648615e+00 6.8637286719855979e+00 1.3957000000000000e-01 1 0 0 0 0 -P 98 -211 -4.9893773724282060e-02 -5.3826599477990789e-02 4.3098583175285032e+00 4.3127421895514972e+00 1.3957000000000000e-01 1 0 0 0 0 -P 99 111 1.2717944250852329e-02 2.0789923927546888e-02 5.6102983279735579e+00 5.6119747768771902e+00 1.3497999999999999e-01 2 0 0 -53 0 -V -22 0 0 0 0 0 0 3 0 -P 100 111 2.0228195634579012e-02 -1.9810461285380357e-01 2.6837098683979255e+00 2.6944707969597661e+00 1.3497999999999999e-01 2 0 0 -54 0 -P 101 111 -1.9448733826450373e-01 -3.0772173043153522e-01 5.9693477937278034e+00 5.9819604370981914e+00 1.3497999999999999e-01 2 0 0 -55 0 -P 102 111 -2.6469435630176663e-01 -5.8497375613724767e-01 7.5508427208632973e+00 7.5792943466553382e+00 1.3497999999999999e-01 2 0 0 -56 0 -V -23 0 0 0 0 0 0 2 0 -P 103 -211 5.9300840341949650e-02 -7.9895912928811963e-01 3.9895681488508994e+00 4.0716073090566693e+00 1.3957000000000000e-01 1 0 0 0 0 -P 104 111 -1.2368786453413552e+00 -1.4005317185689488e+00 1.2746545583623952e+01 1.2883477860959070e+01 1.3497999999999999e-01 2 0 0 -57 0 -V -24 0 0 0 0 0 0 2 0 -P 105 22 -6.3422905570294317e-03 -7.9336321700606463e-02 8.0076038030440988e-01 8.0470594831637421e-01 0 1 0 0 0 0 -P 106 22 -2.6701434621632107e+00 -6.6149024683386048e-01 2.6198889178804361e+01 2.6342912323022706e+01 0 1 0 0 0 0 -V -25 0 0 0 0 0 0 3 0 -P 107 -211 1.7586778974385729e-02 3.3676945404653977e-02 3.2030504088469960e+00 3.2063148844056766e+00 1.3957000000000000e-01 1 0 0 0 0 -P 108 211 3.9410357646856603e-01 9.7313149537317151e-02 1.4025732004537366e+01 1.4032299367033970e+01 1.3957000000000000e-01 1 0 0 0 0 -P 109 111 3.1959377834786096e-01 -3.7306221511642979e-01 1.2482378225204421e+01 1.2492769963341344e+01 1.3497999999999999e-01 2 0 0 -58 0 -V -26 0 0 0 0 0 0 2 0 -P 110 -211 -8.4080503689870231e-02 -1.8799913200941373e-01 1.7544692223771495e+01 1.7546456001611979e+01 1.3957000000000000e-01 1 0 0 0 0 -P 111 111 1.5239435838771678e-01 4.0414983069819693e-01 9.1658492565191594e+00 9.1770133115166939e+00 1.3497999999999999e-01 2 0 0 -59 0 -V -27 0 0 0 0 0 0 3 0 -P 112 -211 4.7070025031333157e-01 6.8525031471775202e-02 4.9225309974297012e+01 4.9227805925676876e+01 1.3957000000000000e-01 1 0 0 0 0 -P 113 211 5.9651172498042482e-01 -1.2288599138979327e-01 1.0093129545527971e+02 1.0093322946022674e+02 1.3957000000000000e-01 1 0 0 0 0 -P 114 111 1.0877872629489453e-01 6.2030942934870215e-02 9.2553300234852465e+00 9.2571612329700255e+00 1.3497999999999999e-01 2 0 0 -60 0 -V -28 0 0 0 0 0 0 2 0 -P 115 -211 4.0683649987303769e-02 6.5512868154666238e-03 6.5875064226277624e+00 6.5891136529731558e+00 1.3957000000000000e-01 1 0 0 0 0 -P 116 111 3.7716281534402596e-01 2.6387314224154818e-01 4.9755028559286941e+01 4.9757340838918765e+01 1.3497999999999999e-01 2 0 0 -61 0 -V -29 0 3.6949163916019824e-04 8.5257720973118501e-05 3.9454030739861111e-02 3.9455868213549919e-02 0 2 0 -P 117 22 4.7151597958341473e-01 4.5921772870311794e-02 5.0588381905928500e+01 5.0590600114925508e+01 0 1 0 0 0 0 -P 118 22 9.6707579898488760e-01 2.8602364470440500e-01 1.0302333278063017e+02 1.0302826865649438e+02 0 1 0 0 0 0 -V -30 0 0 0 0 0 0 2 0 -P 119 -211 9.1583466897251198e-01 2.1251086350657316e+00 -4.3722848514166444e+01 4.3784264317553273e+01 1.3957000000000000e-01 1 0 0 0 0 -P 120 211 6.4923444799854679e-01 7.0777405005783134e-01 -1.7423230407349280e+01 1.7450240316020970e+01 1.3957000000000000e-01 1 0 0 0 0 -V -31 0 0 0 0 0 0 2 0 -P 121 211 -1.0733243092126835e-01 4.2644543258701532e-02 1.5591728243781708e+02 1.5591738768138310e+02 1.3957000000000000e-01 1 0 0 0 0 -P 122 -211 -2.5305067720695146e-01 -2.1157383395427928e-01 7.0655409695023229e+02 7.0655418772736425e+02 1.3957000000000000e-01 1 0 0 0 0 -V -32 0 0 0 0 0 0 2 0 -P 123 -2212 4.9944981990249282e-01 1.4870720522775491e-01 3.2948710527509917e+02 3.2948885331238847e+02 9.3827000000000005e-01 1 0 0 0 0 -P 124 111 5.2795567011208044e-01 -5.5755347150152117e-02 1.2395602297064545e+02 1.2395723333532385e+02 1.3497999999999999e-01 2 0 0 -62 0 -V -33 0 0 0 0 0 0 3 0 -P 125 211 -1.2188920384027405e-01 3.5075345690126225e-01 3.1795559830185887e+01 3.1798034367950663e+01 1.3957000000000000e-01 1 0 0 0 0 -P 126 -211 -2.2097435527052245e-01 7.1076741178384292e-02 8.2130801390093922e+01 8.2131248001797573e+01 1.3957000000000000e-01 1 0 0 0 0 -P 127 111 -1.6637823561728583e-02 -1.7998512288051847e-02 1.0856708622226705e+01 1.0857575349586533e+01 1.3497999999999999e-01 2 0 0 -63 0 -V -34 0 0 0 0 0 0 2 0 -P 128 -211 3.1091271140052751e-01 3.5632832396911990e-01 3.4350353332907815e+01 3.4353891926084358e+01 1.3957000000000000e-01 1 0 0 0 0 -P 129 111 2.4485646346106241e-01 -1.1784239944012394e-02 5.7016077712252383e+01 5.7016764471916609e+01 1.3497999999999999e-01 2 0 0 -64 0 -V -35 0 0 0 0 0 0 1 0 -P 130 310 6.8837804480312736e-02 -2.9839760512711585e-02 3.7650473956009833e+01 3.7653837700767077e+01 4.9767000000000000e-01 2 0 0 -65 0 -V -36 0 0 0 0 0 0 1 0 -P 131 130 5.5852191137677354e-01 -2.3170010256673915e-01 5.8824232435728810e+01 5.8829445252735191e+01 4.9767000000000000e-01 1 0 0 0 0 -V -37 0 0 0 0 0 0 2 0 -P 132 211 1.0828998400047013e-01 -5.1351427865948790e-02 4.3747265017350578e+00 4.3785928606872950e+00 1.3957000000000000e-01 1 0 0 0 0 -P 133 -211 -1.2477893517836794e-01 -2.6770715933836557e-02 5.3652236263234054e-01 5.6887826852539047e-01 1.3957000000000000e-01 1 0 0 0 0 -V -38 0 0 0 0 0 0 2 0 -P 134 211 1.8156078434278519e-01 -5.3337778057810092e-01 1.1827166973830426e+01 1.1841402559958460e+01 1.3957000000000000e-01 1 0 0 0 0 -P 135 111 2.9051823129776339e-01 9.4253205862916190e-02 2.5554493631607658e+00 2.5771739478759641e+00 1.3497999999999999e-01 2 0 0 -66 0 -V -39 0 0 0 0 0 0 2 0 -P 136 -211 -4.9377802104061563e-01 -2.1311641152282343e-01 6.7449678075376100e+00 6.7678139637952421e+00 1.3957000000000000e-01 1 0 0 0 0 -P 137 111 1.9335000230150959e-01 -1.6887660807106833e-01 9.4847169615688305e+00 9.4891505928410194e+00 1.3497999999999999e-01 2 0 0 -67 0 -V -40 0 0 0 0 0 0 1 0 -P 138 130 -2.6561371175678439e-01 -2.6535883073847484e+00 2.0655232762662497e+01 2.0832628193716424e+01 4.9767000000000000e-01 1 0 0 0 0 -V -41 0 0 0 0 0 0 2 0 -P 139 311 -4.5567411934308917e-02 -1.9406127316992008e-01 1.8546771679191969e+00 1.9306058616080843e+00 4.9767000000000000e-01 2 0 0 -68 0 -P 140 211 1.5423113089690546e-01 -6.9220110873578600e-01 2.8081145831536185e+00 2.8996408249458776e+00 1.3957000000000000e-01 1 0 0 0 0 -V -42 0 0 0 0 0 0 2 0 -P 141 211 7.2357677730123915e-02 -1.3328084686398270e-01 6.2898311502468995e-02 2.1548874717056224e-01 1.3957000000000000e-01 1 0 0 0 0 -P 142 -211 -5.7019430719192066e-01 -9.5127740091841564e-02 1.6405461753823727e+00 1.7450049780303740e+00 1.3957000000000000e-01 1 0 0 0 0 -V -43 0 0 0 0 0 0 2 0 -P 143 -311 -1.0247389161942042e-01 -3.7550445704827762e-01 2.5312077640729019e-01 6.8062475129529332e-01 4.9767000000000000e-01 2 0 0 -69 0 -P 144 -211 -1.8768353488580339e-01 1.4528908800357815e-01 3.8970686724282899e-01 4.7716376186416543e-01 1.3957000000000000e-01 1 0 0 0 0 -V -44 0 0 0 0 0 0 1 0 -P 145 310 7.9013389939514289e-02 -3.2312546676672708e-02 -8.4688302464291099e-01 9.8598859161290064e-01 4.9767000000000000e-01 2 0 0 -70 0 -V -45 0 0 0 0 0 0 2 0 -P 146 -211 -7.3050709928776256e-02 3.0537971459793700e-01 -7.3307859769912698e-01 8.0961545909989518e-01 1.3957000000000000e-01 1 0 0 0 0 -P 147 211 2.0079705428855016e-01 -1.2661225229997761e-01 2.5627217928987662e-02 2.7656221477673332e-01 1.3957000000000000e-01 1 0 0 0 0 -V -46 0 0 0 0 0 0 3 0 -P 148 -211 -1.3676538015193693e-01 2.1243887536093334e-01 -2.4816336935736563e+00 2.4983635882218485e+00 1.3957000000000000e-01 1 0 0 0 0 -P 149 211 -6.2902915281313837e-02 5.6601656520515309e-01 -6.6535918753555769e+00 6.6793784259866031e+00 1.3957000000000000e-01 1 0 0 0 0 -P 150 111 4.2025934335575603e-02 1.4415388830729814e-01 -2.0478406253098065e+00 2.0577699943725856e+00 1.3497999999999999e-01 2 0 0 -71 0 -V -47 0 2.1528371579891772e-05 2.1143067906480407e-05 -7.7746119899777387e-05 8.4007917995002846e-05 0 2 0 -P 151 22 1.3065354257831752e-01 1.6396812327723584e-01 -6.9933227768013839e-01 7.3008323377859696e-01 0 1 0 0 0 0 -P 152 22 1.5655151467895148e-01 1.1809668622962230e-01 -3.3786083906270786e-01 3.9064709216740479e-01 0 1 0 0 0 0 -V -48 0 0 0 0 0 0 2 0 -P 153 -211 -6.7869057726822266e-02 2.1587332720713015e-01 -6.2122541431505294e+00 6.2179408831531298e+00 1.3957000000000000e-01 1 0 0 0 0 -P 154 211 4.7387253393100676e-01 -4.6099131523123638e-01 -2.8882389448288819e+01 2.8890291936888733e+01 1.3957000000000000e-01 1 0 0 0 0 -V -49 0 0 0 0 0 0 2 0 -P 155 321 2.7028747166747208e-01 -1.7866346638866426e-01 -6.5733789914797921e+02 6.5733816432121944e+02 4.9359999999999998e-01 1 0 0 0 0 -P 156 111 -1.4463108126498905e-01 -1.2879962101808320e-01 -8.4210278445963058e+02 8.4210281754768846e+02 1.3497999999999999e-01 2 0 0 -72 0 -V -50 0 0 0 0 0 0 1 0 -P 157 130 -9.3629085348251956e-02 -1.1090305621819395e-01 -5.0941280621429246e+02 5.0941306998980963e+02 4.9767000000000000e-01 1 0 0 0 0 -V -51 0 0 0 0 0 0 2 0 -P 158 -211 -1.3297904895597815e-01 -2.9438247842001541e-01 -9.5132803387557174e-01 1.0143220809977018e+00 1.3957000000000000e-01 1 0 0 0 0 -P 159 111 3.3310773039596953e-01 1.8320108049326658e-01 -7.0540906308433615e-01 8.1261611024208424e-01 1.3497999999999999e-01 2 0 0 -73 0 -V -52 0 0 0 0 0 0 2 0 -P 160 -311 -2.8181023933901379e-02 5.6769404948908375e-01 -5.7061728336847795e+00 5.7559668641087107e+00 4.9767000000000000e-01 2 0 0 -74 0 -P 161 111 -5.9812769882346839e-01 7.9865106895285420e-01 -7.1598821292469550e+00 7.2303341540449777e+00 1.3497999999999999e-01 2 0 0 -75 0 -V -53 0 6.3322798099678783e-07 1.0351328244606082e-06 2.7933743165875751e-04 2.7942090225223967e-04 0 2 0 -P 162 22 5.8096471301070769e-02 5.3428646123028153e-02 3.7765134140627472e+00 3.7773381350893178e+00 0 1 0 0 0 0 -P 163 22 -4.5378527050218442e-02 -3.2638722195481272e-02 1.8337849139108104e+00 1.8346366417878721e+00 0 1 0 0 0 0 -V -54 0 3.7908084154555169e-06 -3.7125240783364860e-05 5.0293314033274142e-04 5.0494976204667260e-04 0 2 0 -P 164 22 2.3879476083673905e-02 -9.5043452643842410e-02 2.0569871554342769e+00 2.0593201899874849e+00 0 1 0 0 0 0 -P 165 22 -3.6512804490948913e-03 -1.0306116020996116e-01 6.2672271296364868e-01 6.3515060697228121e-01 0 1 0 0 0 0 -V -55 0 -2.8163829617978358e-05 -4.4561370745053719e-05 8.6442488078252821e-04 8.6625132533200738e-04 0 2 0 -P 166 22 -2.1272696263621679e-01 -2.5289224126334287e-01 5.0842833699721055e+00 5.0950117401727875e+00 0 1 0 0 0 0 -P 167 22 1.8239624371713066e-02 -5.4829489168192323e-02 8.8506442375569738e-01 8.8694869692540323e-01 0 1 0 0 0 0 -V -56 0 -1.0050177887851955e-04 -2.2210863847062044e-04 2.8669788660454984e-03 2.8777816615566582e-03 0 2 0 -P 168 22 -2.3432702581842058e-01 -3.6425243249658318e-01 4.8985588570153329e+00 4.9176689462846062e+00 0 1 0 0 0 0 -P 169 22 -3.0367330483346080e-02 -2.2072132364066455e-01 2.6522838638479649e+00 2.6616254003707325e+00 0 1 0 0 0 0 -V -57 0 -2.7250250929128789e-04 -3.0855768194360781e-04 2.8082509706315608e-03 2.8384191599824990e-03 0 2 0 -P 170 22 -1.2172414307179868e-02 -1.7033656066235661e-02 7.2692940643269088e-02 7.5647714627834581e-02 0 1 0 0 0 0 -P 171 22 -1.2247062310341752e+00 -1.3834980625027131e+00 1.2673852642980682e+01 1.2807830146331236e+01 0 1 0 0 0 0 -V -58 0 7.5098213197226507e-05 -8.7662237705231396e-05 2.9331118584683597e-03 2.9355537112795457e-03 0 2 0 -P 172 22 3.2605188375907718e-01 -3.4647857601151411e-01 1.2132012012470367e+01 1.2141337352419752e+01 0 1 0 0 0 0 -P 173 22 -6.4581054112161709e-03 -2.6583639104915669e-02 3.5036621273405388e-01 3.5143261092159195e-01 0 1 0 0 0 0 -V -59 0 1.4467157300980747e-06 3.8366900426852168e-06 8.7013577401450696e-05 8.7119560419112813e-05 0 2 0 -P 174 22 -2.1452482341985615e-02 1.4905556420087129e-02 4.8556153445010763e-01 4.8626370247877698e-01 0 1 0 0 0 0 -P 175 22 1.7384684072970241e-01 3.8924427427810981e-01 8.6802877220690533e+00 8.6907496090379173e+00 0 1 0 0 0 0 -V -60 0 1.3419342637882059e-05 7.6523646281469803e-06 1.1417714569953998e-03 1.1419973617136749e-03 0 2 0 -P 176 22 -1.6355529844852102e-02 4.0361833523059554e-02 4.2397615259600352e+00 4.2399851860558204e+00 0 1 0 0 0 0 -P 177 22 1.2513425613974663e-01 2.1669109411810668e-02 5.0155684975252131e+00 5.0171760469142059e+00 0 1 0 0 0 0 -V -61 0 1.8450118173567006e-05 1.2908193647738750e-05 2.4339254011843977e-03 2.4340385136936960e-03 0 2 0 -P 178 22 1.0751210652606756e-01 2.8884350394443786e-02 7.9047322108340383e+00 7.9055160795323509e+00 0 1 0 0 0 0 -P 179 22 2.6965070881795838e-01 2.3498879184710436e-01 4.1850296348452900e+01 4.1851824759386410e+01 0 1 0 0 0 0 -V -62 0 5.5808110402548016e-05 -5.8936777184863162e-06 1.3102902017394719e-02 1.3103029960268379e-02 0 2 0 -P 180 22 2.0951224553846201e-01 4.2892218244458290e-02 4.5755572283853013e+01 4.5756072057665904e+01 0 1 0 0 0 0 -P 181 22 3.1844342457361852e-01 -9.8647565394610406e-02 7.8200450686792436e+01 7.8201161277657945e+01 0 1 0 0 0 0 -V -63 0 -7.7083740048796682e-06 -8.3387868451053499e-06 5.0299590094601649e-03 5.0303605679107057e-03 0 2 0 -P 182 22 -6.6083273365725573e-02 -4.5663363344813121e-02 6.0722671538732644e+00 6.0727984101054098e+00 0 1 0 0 0 0 -P 183 22 4.9445449803996989e-02 2.7664851056761277e-02 4.7844414683534406e+00 4.7847769394811230e+00 0 1 0 0 0 0 -V -64 0 1.6595430708072929e-05 -7.9869052535450839e-07 3.8643307738137509e-03 3.8643773197462525e-03 0 2 0 -P 184 22 1.6865708784952835e-01 5.3640703946320818e-02 3.2632464854177648e+01 3.2632944779739709e+01 0 1 0 0 0 0 -P 185 22 7.6199375611534031e-02 -6.5424943890333209e-02 2.4383612858074731e+01 2.4383819692176896e+01 0 1 0 0 0 0 -V -65 0 7.5637609908900192e+00 -3.2787335134736542e+00 4.1369591657798037e+03 4.1373287673609439e+03 0 2 0 -P 186 211 1.5828490107324933e-01 -6.4280458726054257e-02 3.2153714760343846e+01 3.2154471520485849e+01 1.3957000000000000e-01 1 0 0 0 0 -P 187 -211 -8.9447096592936592e-02 3.4440698213342676e-02 5.4967591956659874e+00 5.4993661802812257e+00 1.3957000000000000e-01 1 0 0 0 0 -V -66 0 2.5320261325297056e-06 8.2146851594660370e-07 2.2272146360575985e-05 2.2461488062029682e-05 0 2 0 -P 188 22 1.2669605830908041e-02 -2.6208921583066511e-02 3.1664036093791548e-01 3.1797569821819927e-01 0 1 0 0 0 0 -P 189 22 2.7784862546685535e-01 1.2046212744598270e-01 2.2388090022228502e+00 2.2591982496577647e+00 0 1 0 0 0 0 -V -67 0 1.3660190168239829e-04 -1.1931143282950388e-04 6.7009586679455911e-03 6.7040910313070105e-03 0 2 0 -P 190 22 3.6058703115079364e-04 4.2662265957210021e-04 -3.1743476677878273e-04 6.4249103640209230e-04 0 1 0 0 0 0 -P 191 22 1.9298941527035879e-01 -1.6930323073064041e-01 9.4850343963356085e+00 9.4885081018046158e+00 0 1 0 0 0 0 -V -68 0 0 0 0 0 0 1 0 -P 192 310 -4.5567411934308917e-02 -1.9406127316992008e-01 1.8546771679191969e+00 1.9306058616080843e+00 4.9767000000000000e-01 2 0 0 -76 0 -V -69 0 0 0 0 0 0 1 0 -P 193 310 -1.0247389161942042e-01 -3.7550445704827762e-01 2.5312077640729019e-01 6.8062475129529332e-01 4.9767000000000000e-01 2 0 0 -77 0 -V -70 0 5.4385624976392712e+00 -2.2241015692846111e+00 -5.8291718166200262e+01 6.7866479106276032e+01 0 2 0 -P 194 211 3.7783620486313486e-02 1.7172654641153431e-01 -5.6951638254031056e-01 6.1216525840763614e-01 1.3957000000000000e-01 1 0 0 0 0 -P 195 -211 4.1229769453200796e-02 -2.0403909308820700e-01 -2.7736664210260031e-01 3.7382333320526429e-01 1.3957000000000000e-01 1 0 0 0 0 -V -71 0 8.7730673005939703e-06 3.0092650734755197e-05 -4.2749421067659666e-04 4.2956700273743739e-04 0 2 0 -P 196 22 2.2729804313198435e-02 1.4173360040581309e-01 -1.0529592182762286e+00 1.0626985333767038e+00 0 1 0 0 0 0 -P 197 22 1.9296130022377168e-02 2.4202879014850413e-03 -9.9488140703357786e-01 9.9507146099588162e-01 0 1 0 0 0 0 -V -72 0 -6.1533975488663230e-05 -5.4798406078115862e-05 -3.5827660033139480e-01 3.5827661440886521e-01 0 2 0 -P 198 22 -1.6235924682431213e-01 -1.3015266567446149e-01 -6.7338370639108132e+02 6.7338373854232020e+02 0 1 0 0 0 0 -P 199 22 1.7728165559323081e-02 1.3530446563782706e-03 -1.6871907806854932e+02 1.6871907900536871e+02 0 1 0 0 0 0 -V -73 0 1.5932823142593387e-06 8.7626618918794967e-07 -3.3740309274555397e-06 3.8868112583033451e-06 0 2 0 -P 200 22 1.3362069744752528e-01 3.8397322366062157e-02 -1.4759414341141447e-01 2.0276310394298949e-01 0 1 0 0 0 0 -P 201 22 1.9948703294844422e-01 1.4480375812720442e-01 -5.5781491967292174e-01 6.0985300629909467e-01 0 1 0 0 0 0 -V -74 0 0 0 0 0 0 1 0 -P 202 310 -2.8181023933901379e-02 5.6769404948908375e-01 -5.7061728336847795e+00 5.7559668641087107e+00 4.9767000000000000e-01 2 0 0 -78 0 -V -75 0 -2.7124016605470135e-05 3.6217391200682724e-05 -3.2468779183593861e-04 3.2788266459349427e-04 0 2 0 -P 203 22 -4.6115329401590260e-01 6.6198954161011503e-01 -6.0743062014745783e+00 6.1276494957736771e+00 0 1 0 0 0 0 -P 204 22 -1.3697440480756579e-01 1.3666152734273918e-01 -1.0855759277723773e+00 1.1026846582713004e+00 0 1 0 0 0 0 -V -76 0 -2.4429198574998088e+00 -1.0403841641959659e+01 9.9431314846080440e+01 1.0350193693526136e+02 0 2 0 -P 205 -211 -6.1157976329956530e-02 7.9033809450869533e-02 2.9779915054099509e-01 3.4373065046345536e-01 1.3957000000000000e-01 1 0 0 0 0 -P 206 211 1.5590564395647613e-02 -2.7309508262078958e-01 1.5568780173782018e+00 1.5868752111446289e+00 1.3957000000000000e-01 1 0 0 0 0 -V -77 0 -1.4903509094708578e+01 -5.4612291992451460e+01 3.6813160246280908e+01 9.8988113076509521e+01 0 2 0 -P 207 -211 -2.4069686163035753e-01 -3.2706064871694290e-01 1.7742951834380868e-01 4.6461238254868642e-01 1.3957000000000000e-01 1 0 0 0 0 -P 208 211 1.3822297001093711e-01 -4.8443808331334694e-02 7.5691258063481481e-02 2.1601236874660687e-01 1.3957000000000000e-01 1 0 0 0 0 -V -78 0 -1.3280346540154400e-01 2.6752660668688737e+00 -2.6890418469921691e+01 2.7125073527598740e+01 0 2 0 -P 209 211 5.4187093550292845e-02 4.8896006520894103e-01 -5.0394127666042294e+00 5.0652916010423583e+00 1.3957000000000000e-01 1 0 0 0 0 -P 210 -211 -8.2368117484194217e-02 7.8733984280142638e-02 -6.6676006708054880e-01 6.9067526306635141e-01 1.3957000000000000e-01 1 0 0 0 0 -BlockType GenEvent -E 2 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 224 0 0 -V -1 0 0 0 0 0 1 3 0 -P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -1 0 -P 3 21 2.2381466690269431e-03 -3.4720102421292970e-01 8.5760509831394440e+00 8.5830766060849815e+00 0 3 0 0 -3 0 -P 13 1 -1.5953315142106061e-01 2.5534284672707136e-01 4.5110225338059212e+02 4.5110247456187125e+02 3.3000000000000002e-01 2 0 0 -9 0 -P 41 2203 1.5729500475203367e-01 9.1858177485858339e-02 4.1239913742420931e+03 4.1239914503976361e+03 7.7132999999999996e-01 2 0 0 -13 0 -V -2 0 0 0 0 0 1 2 0 -P 2 2212 0 0 -6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -2 0 -P 4 1 1.8117451391948236e-01 -9.2107013792072212e-01 -1.9146656945590603e+03 1.9146659246760862e+03 0 3 0 0 -4 0 -P 39 2203 -1.8117451391948236e-01 9.2107013792072212e-01 -4.3349283892041103e+03 4.3349285594657858e+03 7.7132999999999996e-01 2 0 0 -11 0 -V -3 0 0 0 0 0 0 8 0 -P 5 -2 -1.2188640529118391e+01 1.1628197337501724e+00 -1.1080748662284646e+01 1.6513573162643777e+01 0 3 0 0 -5 0 -P 11 -4 1.9522097387122794e+00 -1.0579566003536176e+00 -8.1797583597675185e+00 8.6074875461043483e+00 1.5000000000000000e+00 2 0 0 -9 0 -P 12 21 1.8528631058109368e+00 6.4833945342773376e+00 -3.6105831959994241e+01 3.6730077700698025e+01 0 2 0 0 -9 0 -P 14 4 1.0685515977985798e+01 -5.1823216653895150e+00 -2.7066366488563993e+01 2.9595183805014884e+01 1.5000000000000000e+00 2 0 0 -11 0 -P 15 21 3.5171262487128507e-01 -6.4498578844444887e-01 -1.1127260710033722e+00 1.3333670713197316e+00 0 2 0 0 -11 0 -P 16 21 3.3207848203048465e-02 9.6085117788368979e-02 -6.6003952661133902e-02 1.2120904590654386e-01 0 2 0 0 -11 0 -P 17 21 -3.7579969777487718e-02 -1.6462158612486150e-01 -9.7318874051882720e-01 9.8772913565377995e-01 0 2 0 0 -11 0 -P 40 2 -5.7580659856764782e-01 -2.1687633978359599e+00 2.8191957870207176e+00 3.6182665463315975e+00 3.3000000000000002e-01 2 0 0 -13 0 -V -4 0 0 0 0 0 0 12 0 -P 6 1 -1.0356250591506910e+01 -7.5276061205649762e+00 -8.5247158145293622e+02 8.5256771811105455e+02 0 3 0 0 -5 0 -P 28 21 8.2987543073312353e-01 1.2838272062790441e+00 -3.8410647385758452e+01 3.8441055372078296e+01 0 2 0 0 -11 0 -P 29 21 1.4485320516326545e+00 3.4111844708869525e+00 -3.4836760966940879e+01 3.5033331832225194e+01 0 2 0 0 -11 0 -P 30 21 4.7483608911375708e+00 5.0805058534361418e+00 -7.0730773803904057e+01 7.1071800552528032e+01 0 2 0 0 -11 0 -P 31 21 7.0471823787681096e+00 5.3004641843654632e+00 -7.0878720555638282e+01 7.1425140725473000e+01 0 2 0 0 -11 0 -P 32 21 6.4330986433301513e-05 -2.8659752464543387e-01 -2.0138946295725479e+00 2.0341852728531187e+00 0 2 0 0 -11 0 -P 33 21 -2.0101138190485397e+00 1.8374935910906517e-01 -1.0007919765693144e+02 1.0009955107315744e+02 0 2 0 0 -11 0 -P 34 21 -1.9229525710899356e+00 -1.5157785543803595e+00 -2.2906932968426068e+02 2.2908241559144841e+02 0 2 0 0 -11 0 -P 35 21 -3.1664534528418580e+00 -1.7416366637989906e+00 -8.3806850645725774e+01 8.3884730081777633e+01 0 2 0 0 -11 0 -P 36 21 -3.7168946513508216e-01 -3.5284021138698476e+00 -1.0878664867278101e+02 1.0884448862478403e+02 0 2 0 0 -11 0 -P 37 21 -3.1241121155591017e-01 2.4591674095968902e-01 -7.8556145968468542e+01 7.8557152094687893e+01 0 2 0 0 -11 0 -P 38 21 2.1757864903890276e+00 -6.9754834757800643e-01 -1.5468366370543001e+02 1.5470053793663271e+02 0 2 0 0 -11 0 -V -5 0 0 0 0 0 0 2 0 -P 7 22 -1.3261813212669724e+01 -8.0763106975450007e+00 -1.0418644172499936e+02 1.0533715927196684e+02 0 3 0 0 -6 0 -P 8 -24 -9.2830779079555814e+00 1.7115243107301954e+00 -7.5936588839022193e+02 7.6374413200173183e+02 8.1113758792799615e+01 3 0 0 -7 0 -V -6 0 0 0 0 0 0 1 0 -P 9 22 -1.3261813212669724e+01 -8.0763106975450007e+00 -1.0418644172499936e+02 1.0533715927196684e+02 0 1 0 0 0 0 -V -7 0 0 0 0 0 0 1 0 -P 10 -24 -9.2830779079555814e+00 1.7115243107301954e+00 -7.5936588839022193e+02 7.6374413200173183e+02 8.1113758792799615e+01 2 0 0 -8 0 -V -8 0 0 0 0 0 0 6 0 -P 42 -4 -3.6405680130529461e+01 2.3505435732580519e+01 -3.4936432423810379e+02 3.5204482684040653e+02 1.5000000000000000e+00 2 0 0 -15 0 -P 43 21 -1.2696872981433902e+00 -7.3488203514654904e-02 -1.1342868074612710e+01 1.1413945965755696e+01 0 2 0 0 -15 0 -P 44 21 -4.1552470502532822e-02 -2.4740042534493506e-01 -1.9652301256829328e+00 1.9811771816668682e+00 0 2 0 0 -15 0 -P 45 21 9.2875684016986071e-01 -5.2482893316735224e-01 -8.2669188038171093e+00 8.3354652651280841e+00 0 2 0 0 -15 0 -P 46 21 2.5933060912540751e+00 -1.5432000571134972e+00 -4.0105536618336508e+01 4.0218910606130805e+01 0 2 0 0 -15 0 -P 47 3 2.4911779059795872e+01 -1.9404993802709878e+01 -3.4832101052966868e+02 3.4974980614264371e+02 5.0000000000000000e-01 2 0 0 -15 0 -V -9 0 0 0 0 0 0 1 0 -P 52 92 3.6455396931021555e+00 5.6807807806507915e+00 4.0681666306083036e+02 4.9644003980867365e+02 2.8444218138552606e+02 2 0 0 -10 0 -V -10 0 0 0 0 0 0 17 0 -P 53 -423 1.8014118894544171e+00 -7.4135744726077624e-01 -9.8985325423010675e+00 1.0286033591286305e+01 2.0066999999999999e+00 2 0 0 -21 0 -P 54 -323 5.0264419845508967e-01 1.5096096593072483e+00 -6.4075559093590417e+00 6.6727104662027399e+00 9.6784281807288342e-01 2 0 0 -22 0 -P 55 313 6.4824466837653216e-01 1.7028313815609744e+00 -1.2490128522047499e+01 1.2658108385343498e+01 9.5107388447566010e-01 2 0 0 -23 0 -P 56 113 3.1373653839431187e-01 1.0591234964860790e+00 -3.8183528211076077e+00 4.0448247418494256e+00 7.4874276589783129e-01 2 0 0 -24 0 -P 57 223 8.2692544173461439e-03 4.6939097115965078e-01 -5.5469163366739194e+00 5.6207627549321177e+00 7.7736531746492565e-01 2 0 0 -25 0 -P 58 213 1.9044107216389983e-01 8.1937027750395064e-01 -3.6346431429697050e+00 3.7966133083889493e+00 7.0427720613090783e-01 2 0 0 -26 0 -P 59 223 4.7623181452657998e-01 3.2991099537503743e-01 -1.3035235691380478e+00 1.6193069146444774e+00 7.6638318254016657e-01 2 0 0 -27 0 -P 60 -323 -1.0115943353617618e-01 5.6476717758048370e-03 1.7300715275273690e-01 8.2205819328193652e-01 7.9723463989499699e-01 2 0 0 -28 0 -P 61 313 -7.7118065121252105e-02 3.7088297201745679e-01 6.5831368662425160e-01 1.1370141416373667e+00 8.4612225676080488e-01 2 0 0 -29 0 -P 62 213 -3.5806889091875166e-01 -1.8533975814985065e-01 2.0214743365951066e-01 7.5874614723662881e-01 6.1013766841301631e-01 2 0 0 -30 0 -P 63 221 5.3742504319834894e-01 2.2371832414580742e-01 7.6764387006558730e+00 7.7179199395330977e+00 5.4744999999999999e-01 2 0 0 -31 0 -P 64 -213 -3.5723363435424654e-01 -2.4687075875660527e-01 4.3946274554500251e+00 4.4381896913330143e+00 4.4296300411712430e-01 2 0 0 -32 0 -P 65 211 -9.6962110337190308e-03 -1.9969339915386206e-01 9.7285408505103610e-01 1.0029438298701092e+00 1.3957000000000000e-01 1 0 0 0 0 -P 66 -213 3.6007407932397151e-01 -1.9108983779111039e-02 2.4483370677350226e+01 2.4497188617868417e+01 7.3945382481060740e-01 2 0 0 -33 0 -P 67 113 -3.7252120952480011e-01 1.1767633929689882e-02 3.8343277541438461e+01 3.8352383249490323e+01 7.4796909511894960e-01 2 0 0 -34 0 -P 68 113 -9.0606939026123462e-02 1.6342699333927246e-01 1.6719221309737839e+02 1.6719396525633584e+02 7.4228009410397144e-01 2 0 0 -35 0 -P 69 221 1.7346551830672804e-01 4.0747075115002573e-01 2.0582006607406680e+02 2.0582127057943939e+02 5.4744999999999999e-01 2 0 0 -36 0 -V -11 0 0 0 0 0 10 1 0 -P 18 21 -3.8916892480043179e+00 -1.8950634673498339e+00 4.3405633505207952e+01 4.3620929961851424e+01 0 2 0 0 -11 0 -P 19 21 -3.9110823174159708e+00 3.1313981445182435e+00 7.8933491919030098e+02 7.8935081989720652e+02 0 2 0 0 -11 0 -P 20 21 3.8916892480043179e+00 1.8950634673498339e+00 1.4168700767391088e+03 1.4168766886604622e+03 0 2 0 0 -11 0 -P 21 21 4.3740574207816687e+00 6.7194450447463385e+00 8.3124634883261848e+01 8.3510408001070459e+01 0 2 0 0 -11 0 -P 22 21 3.9110823174159708e+00 -3.1313981445182435e+00 3.6591766345710994e+01 3.6933177273722393e+01 0 2 0 0 -11 0 -P 23 21 -1.7556414536864717e+00 -3.2948210135311675e+00 9.6577188877003675e+00 1.0354209604743055e+01 0 2 0 0 -11 0 -P 24 21 -4.3740574207816687e+00 -6.7194450447463385e+00 8.7596980484749754e-01 8.0653978902882315e+00 0 2 0 0 -11 0 -P 25 21 -2.3472186202550427e+00 -1.7652302001002413e+00 -4.8822773731482902e+00 5.6975525674603205e+00 0 2 0 0 -11 0 -P 26 21 1.7556414536864717e+00 3.2948210135311675e+00 -4.6484359802172142e+00 5.9620532945694862e+00 0 2 0 0 -11 0 -P 27 21 2.3472186202550427e+00 1.7652302001002413e+00 -7.2800433838180606e+02 7.2801026241093734e+02 0 2 0 0 -11 0 -P 70 92 1.9317863021338749e+01 2.7609108265139839e+00 -3.6936736405113015e+03 8.4685219372436368e+03 7.6205156017495565e+03 2 0 0 -12 0 -V -12 0 0 0 0 0 0 90 0 -P 91 -213 -1.4723087124553025e+00 1.8245140592851474e+00 3.9234982586875026e+02 3.9235769486019092e+02 8.2359715080257312e-01 2 0 0 -52 0 -P 92 213 1.7539750249024346e+00 1.4987779798051035e+00 6.9123026432414906e+02 6.9123466203199087e+02 8.7000748675694395e-01 2 0 0 -53 0 -P 93 -211 -8.9424661017914325e-02 -3.0761209203019885e-01 1.4068666240461201e+02 1.4068709635323111e+02 1.3957000000000000e-01 1 0 0 0 0 -P 94 111 7.0564265001932358e-01 3.8262897153753883e-01 1.6816678510920750e+02 1.6816875503507225e+02 1.3497999999999999e-01 2 0 0 -54 0 -P 95 223 1.8302919870385345e-01 6.5783452518379060e-01 2.6383157492994411e+02 2.6383362307134547e+02 7.8389220432534346e-01 2 0 0 -55 0 -P 96 113 1.1656756707026841e+00 -6.4896512612338464e-01 1.0945955049891027e+02 1.0947082232861229e+02 8.2933128176902648e-01 2 0 0 -56 0 -P 97 213 -3.5903158855632840e-02 9.9198943525646954e-01 3.7343100725470698e+01 3.7367385916754081e+01 9.1050885910361523e-01 2 0 0 -57 0 -P 98 221 4.2162092047841054e-01 3.3016782868221339e-01 8.5630844493739087e+00 8.5972607140467154e+00 5.4744999999999999e-01 2 0 0 -58 0 -P 99 -213 9.7457004419126791e-01 2.5386776349576827e+00 3.2029157610337023e+01 3.2157623407268844e+01 9.2256981884626144e-01 2 0 0 -59 0 -P 100 111 1.2787995261416203e+00 5.9131216608945592e-01 1.8321222064458190e+01 1.8375809528872868e+01 1.3497999999999999e-01 2 0 0 -60 0 -P 101 331 1.5941076518656097e+00 2.2203899316199833e+00 3.0301907248901987e+01 3.0440010892784585e+01 9.5779412068020275e-01 2 0 0 -61 0 -P 102 213 1.7703923967892532e+00 -1.5783757695402438e+00 1.7113365104763496e+01 1.7299350723397684e+01 8.8017664914626426e-01 2 0 0 -62 0 -P 103 -211 -1.8759452428865081e-01 -1.2769116703025019e-01 3.8721698603132602e+00 3.8813239946826195e+00 1.3957000000000000e-01 1 0 0 0 0 -P 104 211 6.9482022183564407e-01 -7.4276553322659658e-02 2.8254613298076237e+00 2.9139326790753919e+00 1.3957000000000000e-01 1 0 0 0 0 -P 105 311 6.3686850058466904e-01 -2.8985459322238305e-01 6.1254602664267574e+00 6.1853501175537389e+00 4.9767000000000000e-01 2 0 0 -63 0 -P 106 333 8.7207094479077651e-02 -2.0295472311855449e+00 7.6184364527955317e+00 7.9504887791525123e+00 1.0212887942231736e+00 2 0 0 -64 0 -P 107 -323 -1.9822568338569455e-01 -1.5507438333859327e-01 2.6398270078375625e+00 2.7898910808615089e+00 8.6687030508629537e-01 2 0 0 -65 0 -P 108 113 -1.1042506848572424e+00 -1.9030565630970109e+00 5.3217383054275196e+00 5.8133432539368144e+00 7.9565528923260520e-01 2 0 0 -66 0 -P 109 213 -7.2310463393123914e-01 -7.6975522680298714e-01 6.1285789995101991e-01 1.6294860676683323e+00 1.0789933356557311e+00 2 0 0 -67 0 -P 110 -211 -4.3482640295969677e-01 -8.1532294744635425e-01 1.7768661421435300e-01 9.5125066471169373e-01 1.3957000000000000e-01 1 0 0 0 0 -P 111 213 -5.9736000021821500e-01 -1.2204809639168086e+00 2.6747136936349564e-01 1.5533645053088498e+00 7.0355355146585397e-01 2 0 0 -68 0 -P 112 -211 -1.4286103486218285e+00 -1.6452141393289603e+00 4.8302563621898731e-01 2.2361687419741094e+00 1.3957000000000000e-01 1 0 0 0 0 -P 113 111 4.3583065059189477e-02 -2.4339437891750076e-01 6.2664394827260231e-02 2.8859441094320626e-01 1.3497999999999999e-01 2 0 0 -69 0 -P 114 213 -1.1457523430575574e+00 -1.7185955494709606e+00 -2.0075212146900698e+00 2.9665875925104452e+00 7.1005733734910470e-01 2 0 0 -70 0 -P 115 -213 -9.9510244241403112e-01 -3.8721112665348262e-01 -1.1073021899671061e+00 1.6337817612725141e+00 5.5042108976504500e-01 2 0 0 -71 0 -P 116 321 3.6387094509041512e-01 4.3920647350883402e-01 9.9248798190379642e-02 7.6078622161241372e-01 4.9359999999999998e-01 1 0 0 0 0 -P 117 -321 -1.2747399230810363e-01 -1.0200080057828731e+00 -1.4513610769384608e+00 1.8457399291959007e+00 4.9359999999999998e-01 1 0 0 0 0 -P 118 211 -2.0133216812193178e-01 3.5802685432120634e-01 -1.7925786519980291e+00 1.8443253180593948e+00 1.3957000000000000e-01 1 0 0 0 0 -P 119 311 -2.8765138987802308e-01 7.2322394316508809e-01 -1.3293539465693636e+00 1.6188432716682488e+00 4.9767000000000000e-01 2 0 0 -72 0 -P 120 -321 1.0298266079353463e-01 -1.3133623038629999e-01 -8.4534917780111540e-01 9.9303113055191838e-01 4.9359999999999998e-01 1 0 0 0 0 -P 121 113 -2.0064710281109285e-02 9.6668445379680457e-01 -2.7580016928497004e+00 3.0477179748732270e+00 8.6436687279907831e-01 2 0 0 -73 0 -P 122 213 6.9914421880252642e-01 4.8815033788881651e-01 -2.1395488946251060e+00 2.3683512678933512e+00 5.5165647333695911e-01 2 0 0 -74 0 -P 123 223 1.5872029432710627e-01 -2.3339814721712135e-01 -7.4179222929870310e+00 7.4628850957322737e+00 7.6773431625352861e-01 2 0 0 -75 0 -P 124 223 -3.0717425565275075e-01 5.6842261363386204e-01 -1.7694534053195312e+01 1.7723823647209741e+01 7.8735571800585269e-01 2 0 0 -76 0 -P 125 1114 7.6998734838977989e-01 -3.4728630806103294e-01 -1.9364499157932190e+02 1.9364995150560429e+02 1.0988476103652125e+00 2 0 0 -77 0 -P 126 111 6.5158363716255141e-01 1.5605607263941090e+00 -1.1121050811925711e+02 1.1122344737851247e+02 1.3497999999999999e-01 2 0 0 -78 0 -P 127 -2112 1.0813888713417015e-01 9.3320687480095546e-02 -7.6290462496469246e+01 7.6296381712894501e+01 9.3957000000000002e-01 1 0 0 0 0 -P 128 211 3.9294549049558353e-01 -4.8295703118897615e-01 -5.9670507038186024e+01 5.9673918453806799e+01 1.3957000000000000e-01 1 0 0 0 0 -P 129 -211 -4.9079394553889405e-02 3.0193103218666079e-01 -5.2738809586108296e+01 5.2739881375291844e+01 1.3957000000000000e-01 1 0 0 0 0 -P 130 113 7.7374346420721107e-01 8.6434540604482102e-01 -8.8859763366085502e+01 8.8870436517698323e+01 7.4240786646212009e-01 2 0 0 -79 0 -P 131 223 1.6985777384718924e-02 2.8325881170135603e-01 -9.6927730933742907e+01 9.6931159023301547e+01 7.6422612195160899e-01 2 0 0 -80 0 -P 132 223 3.0185368861046491e-01 2.4293189269126073e-01 -3.2090245504750932e+01 3.2101336386389761e+01 7.4953964748340296e-01 2 0 0 -81 0 -P 133 221 6.5201407902947539e-01 -1.2988330070145512e-02 -7.4859939959601558e+00 7.5342616536739797e+00 5.4744999999999999e-01 2 0 0 -82 0 -P 134 213 1.2458254485181726e+00 2.4534172247832897e+00 -3.9148897598913670e+01 3.9260611329490111e+01 1.0899915724536897e+00 2 0 0 -83 0 -P 135 221 8.8556817596659831e-01 9.1587012185965244e-01 -1.2421218347891800e+01 1.2498376527489638e+01 5.4744999999999999e-01 2 0 0 -84 0 -P 136 -211 1.8161190527346487e+00 1.8932700926893988e+00 -2.7662401209321924e+01 2.7786879646840031e+01 1.3957000000000000e-01 1 0 0 0 0 -P 137 111 7.2247895685888563e-01 1.1632455888028332e+00 -1.2867988035904569e+01 1.2941346600549585e+01 1.3497999999999999e-01 2 0 0 -85 0 -P 138 113 1.2139941660877747e+00 1.6756779361740803e+00 -1.8860823514754017e+01 1.8989026284653107e+01 7.5549798376482546e-01 2 0 0 -86 0 -P 139 211 1.1157147548814101e+00 5.0436447513334515e-01 -1.1621107696187737e+01 1.1686266589862242e+01 1.3957000000000000e-01 1 0 0 0 0 -P 140 -213 4.5823331418939195e-01 1.1538176266903686e+00 -1.8447864138782936e+01 1.8525111286873642e+01 1.1466403194399666e+00 2 0 0 -87 0 -P 141 213 2.0821117255183093e+00 1.6804026242358250e+00 -2.6142179810664658e+01 2.6288201716404078e+01 7.0501206525005999e-01 2 0 0 -88 0 -P 142 313 1.7813828024493763e+00 1.2357154576419902e+00 -2.2601396009113010e+01 2.2725602197916988e+01 9.6414538120668236e-01 2 0 0 -89 0 -P 143 -313 1.4186766512402984e+00 6.4743845122084742e-01 -1.8091956801791984e+01 1.8183781843473593e+01 9.4826221280775747e-01 2 0 0 -90 0 -P 144 2112 -1.1231017999695494e+00 5.3690695272926670e-01 -5.0961864079027272e+01 5.0985723579479917e+01 9.3957000000000002e-01 1 0 0 0 0 -P 145 -213 -5.7530555364241898e-01 -4.7810186265971222e-01 -9.4505926829143817e+01 9.4510818189169768e+01 6.0414491613054433e-01 2 0 0 -91 0 -P 146 -1114 -8.0379050531219987e-01 -7.4317351469684056e-01 -3.3976739042042894e+01 3.4017782197130039e+01 1.2618730645032841e+00 2 0 0 -92 0 -P 147 -213 -1.7993965627187491e-01 6.2933882558033644e-02 -4.3212693477627020e+01 4.3219348613222635e+01 7.3408310595441117e-01 2 0 0 -93 0 -P 148 211 -1.1857733256197995e+00 -2.3402786696214123e-01 -3.9319959891382794e+01 3.9338779252375360e+01 1.3957000000000000e-01 1 0 0 0 0 -P 149 311 -1.4096245121895092e+00 -2.1826091973706498e+00 -7.8978356177349141e+01 7.9022650196503378e+01 4.9767000000000000e-01 2 0 0 -94 0 -P 150 -323 -3.0387368245023250e-01 -3.9194042956116942e-01 -7.8833271694584482e+01 7.8839861573241009e+01 8.9055617476780402e-01 2 0 0 -95 0 -P 151 213 -1.8006034881526349e+00 -1.2055027990336920e+00 -8.9338286707006162e+01 8.9369650117474464e+01 9.5366684777524879e-01 2 0 0 -96 0 -P 152 113 4.9137946671111676e-01 -9.7164155725422818e-01 -5.0430982625195028e+01 5.0451579348850466e+01 9.4462116985729094e-01 2 0 0 -97 0 -P 153 221 2.6692022391655834e-01 -2.6056453113669759e-01 -2.1564701043027426e+01 2.1574873646408001e+01 5.4744999999999999e-01 2 0 0 -98 0 -P 154 311 4.1329176006341922e-01 1.8028596136298070e-01 -8.9119644403072215e+01 8.9122174609160766e+01 4.9767000000000000e-01 2 0 0 -99 0 -P 155 -321 3.6881058325853905e-01 -3.6759956648503250e-01 -5.2482305038393726e+01 5.2487209239876819e+01 4.9359999999999998e-01 1 0 0 0 0 -P 156 221 -4.0997910950580485e-01 -2.7374853556398043e-01 -4.8760304863457051e+01 4.8765869755503466e+01 5.4744999999999999e-01 2 0 0 -100 0 -P 157 211 7.1285808765427905e-01 -3.2842857210290849e-01 -1.3495391606091425e+02 1.3495627059140784e+02 1.3957000000000000e-01 1 0 0 0 0 -P 158 113 -8.5570937057012242e-01 4.5138982048336918e-01 -3.8575888425787775e+02 3.8576089945786532e+02 7.8662275684624183e-01 2 0 0 -101 0 -P 159 -211 8.5048282385916807e-01 -2.4394986791084675e-01 -2.3972504452141907e+03 2.3972506125543050e+03 1.3957000000000000e-01 1 0 0 0 0 -P 160 2224 -1.9025691153649760e-03 7.5090832178153066e-01 -1.3897064940632451e+03 1.3897072600852762e+03 1.2510896217992251e+00 2 0 0 -102 0 -P 72 213 1.0805121219025640e+00 -6.6038780518628226e-01 -2.3089962780132609e+00 2.7002122967490942e+00 5.9671109996278038e-01 2 0 0 -38 0 -P 73 331 8.8350480325607927e-01 -9.1723208806001100e-01 -1.3273651063348788e+00 2.0738588580152020e+00 9.5765181392258825e-01 2 0 0 -39 0 -P 74 -213 1.6671177452769768e+00 -6.0237742035546349e-01 -4.3269280810687976e+00 4.7129738478160546e+00 5.8964034655445841e-01 2 0 0 -40 0 -P 75 111 -2.2944867559712592e-01 -5.4494370034286373e-02 -1.1132060518150413e+00 1.1458898923091787e+00 1.3497999999999999e-01 2 0 0 -41 0 -P 76 211 1.9057714121074421e-01 -3.7678379479520874e-01 3.2988192916386494e-01 5.5370348279671411e-01 1.3957000000000000e-01 1 0 0 0 0 -P 77 -211 2.1514156450681340e-01 4.1042646895793555e-01 1.1603516057783952e-01 4.9767431377362004e-01 1.3957000000000000e-01 1 0 0 0 0 -P 78 211 1.1821640765841486e-01 -7.3020341573840120e-01 -1.3087805912292785e+00 1.5098207073272469e+00 1.3957000000000000e-01 1 0 0 0 0 -P 79 3112 -1.2499623449219958e-01 -5.9241869360866006e-02 4.0162992375308786e+00 4.1932869895481408e+00 1.1974400000000001e+00 2 0 0 -42 0 -P 80 311 -1.0795922983869366e-01 -3.0104120411989399e-02 1.6962385074932020e+00 1.7712882195102833e+00 4.9767000000000000e-01 2 0 0 -43 0 -P 81 -1114 -5.9337323488907867e-01 -4.6246084613168187e-01 7.5339721507890793e+00 7.6936474040793801e+00 1.3658375376831626e+00 2 0 0 -44 0 -P 82 -211 -3.9495796561206009e-01 3.0833169972538993e-01 9.3878856442942862e+00 9.4022835995784941e+00 1.3957000000000000e-01 1 0 0 0 0 -P 83 211 -3.1344790463608746e-01 -7.2171857255188154e-01 8.5253322989485287e+00 8.5627038883335214e+00 1.3957000000000000e-01 1 0 0 0 0 -P 84 -213 -1.2690227290925465e-01 -1.0105632908426881e-01 5.1452653640166943e+00 5.1881794411189812e+00 6.4585886893524336e-01 2 0 0 -45 0 -P 85 213 -1.2041062649028871e+00 -1.2215218528395928e-01 2.3429585452245682e+01 2.3473631837985316e+01 7.7532196386217789e-01 2 0 0 -46 0 -P 86 223 -7.4237011822675184e-02 1.4248179815169867e-01 1.5165880769368950e+01 1.5186849387363358e+01 7.8143624628963737e-01 2 0 0 -47 0 -P 87 -213 -9.0074449059785699e-01 -6.0424612216057405e-01 2.4880423729369195e+01 2.4913870228144820e+01 6.9927875585816668e-01 2 0 0 -48 0 -P 88 323 -3.9622224355221425e-01 4.7691198706436511e-01 8.3475162278290014e+01 8.3482329557234976e+01 9.0121795712962360e-01 2 0 0 -49 0 -P 89 -313 -1.1785958161298775e+00 4.3758697222424819e-01 2.3405851550380999e+02 2.3406361463389302e+02 8.9802292856965138e-01 2 0 0 -50 0 -P 90 111 -2.1010818134776000e-02 1.4739930625154105e-01 2.2010537086033544e+01 2.2011454527723057e+01 1.3497999999999999e-01 2 0 0 -51 0 -P 71 423 6.7375280292117559e+00 -3.1280786052117606e+00 -1.8078833346658740e+01 1.9648160722343899e+01 2.0066999999999999e+00 2 0 0 -37 0 -V -13 0 0 0 0 0 0 1 0 -P 161 92 -4.1851159381561415e-01 -2.0769052203501017e+00 4.1268105700291135e+03 4.1276097169439681e+03 8.1191168355921960e+01 2 0 0 -14 0 -V -14 0 0 0 0 0 0 14 0 -P 162 211 -3.1267035370541174e-01 -1.6630336354906903e+00 2.9600402088397786e+00 3.4124421527269715e+00 1.3957000000000000e-01 1 0 0 0 0 -P 163 223 -1.3456644959131422e-02 1.0490675531334205e-01 2.8997985766568299e+00 3.0056909067982369e+00 7.8368331194730689e-01 2 0 0 -103 0 -P 164 -213 -7.6664826358880125e-02 -1.5791348259790233e-01 2.8310851989334567e+00 2.9388621741173262e+00 7.6879991626605593e-01 2 0 0 -104 0 -P 165 113 -3.9648671529754964e-01 -2.4605982607667140e-01 7.6583440010326704e+00 7.7151393693837971e+00 8.0956500507766405e-01 2 0 0 -105 0 -P 166 223 8.9691194834938370e-02 -2.5125974088198971e-02 1.8317488091703201e+01 1.8334490887220280e+01 7.8390706009713318e-01 2 0 0 -106 0 -P 167 331 7.9224066352126379e-02 -2.1422931649456503e-01 1.6453778503957725e+01 1.6483212902440073e+01 9.5776295456158800e-01 2 0 0 -107 0 -P 168 211 1.5527914687816030e-01 -4.5548875201547573e-02 2.0928087163014524e+01 2.0929178158760095e+01 1.3957000000000000e-01 1 0 0 0 0 -P 169 113 -9.0692399597892714e-02 1.6957858902038977e-01 7.6922069406224782e+00 7.7066837587922024e+00 4.3121332478473434e-01 2 0 0 -108 0 -P 170 -211 1.9561892851724411e-02 -3.4229386330714748e-02 4.3617570241825661e+00 4.3641675542360279e+00 1.3957000000000000e-01 1 0 0 0 0 -P 171 211 1.4955539305015297e-01 -7.3620802444243974e-02 6.1402424512466673e+01 6.1402809403415823e+01 1.3957000000000000e-01 1 0 0 0 0 -P 172 313 -9.7870346573322886e-02 5.6843447855507345e-01 7.2008545829421976e+01 7.2016348838853801e+01 8.8945559212654413e-01 2 0 0 -109 0 -P 173 -313 -1.3048017096509981e-01 -7.9611017480924984e-01 2.3671747454399076e+02 2.3672050958431549e+02 8.8661541134793842e-01 2 0 0 -110 0 -P 174 2112 5.2848587189431351e-01 -1.8847878506702731e-01 1.0586464613615185e+03 1.0586470269955985e+03 9.3957000000000002e-01 1 0 0 0 0 -P 175 211 -3.2198770221974171e-01 5.2452521536190455e-01 2.6139330780727728e+03 2.6139331542573095e+03 1.3957000000000000e-01 1 0 0 0 0 -V -15 0 0 0 0 0 0 1 0 -P 176 92 -9.2830779079555690e+00 1.7115243107302014e+00 -7.5936588839022170e+02 7.6374413200173171e+02 8.1113758792800169e+01 2 0 0 -16 0 -V -16 0 0 0 0 0 0 10 0 -P 177 -411 -2.6390450740240546e+01 1.6827024890099779e+01 -2.5400527191191205e+02 2.5593314966697744e+02 1.8693000000000000e+00 2 0 0 -111 0 -P 178 -2112 -3.3029260138577476e+00 1.9451764508002454e+00 -3.1157827697945482e+01 3.1406783507986372e+01 9.3957000000000002e-01 1 0 0 0 0 -P 179 2112 -3.6871070129151744e+00 2.3786739914127644e+00 -3.4678443322119684e+01 3.4967557408439028e+01 9.3957000000000002e-01 1 0 0 0 0 -P 180 -313 -1.6887882543152506e+00 9.5163004863946332e-01 -1.9256191761625256e+01 1.9375050572033444e+01 9.1326775426620022e-01 2 0 0 -112 0 -P 181 323 -1.0684585629853891e+00 1.1397180800571156e+00 -1.1888673019374792e+01 1.2026652906041873e+01 9.2696977187468266e-01 2 0 0 -113 0 -P 182 -323 -1.0389598140931948e+00 -2.4279557457761929e-02 -1.5588480592748905e+01 1.5651040269879616e+01 9.3504403461721142e-01 2 0 0 -114 0 -P 183 321 9.7335278175105699e-01 -7.7540269787809635e-01 -1.2014313647022332e+01 1.2088673969904482e+01 4.9359999999999998e-01 1 0 0 0 0 -P 184 113 9.1572165877639158e+00 -6.8871050884448293e+00 -1.3173902282931255e+02 1.3223974804671991e+02 9.4551324862806529e-01 2 0 0 -115 0 -P 185 111 1.5749182160948232e+00 -1.4409120111312630e+00 -2.3979729812343567e+01 2.4074930036961863e+01 1.3497999999999999e-01 2 0 0 -116 0 -P 186 -321 1.6188124904841935e+01 -1.2402999795367213e+01 -2.2505793379581706e+02 2.2598054561678759e+02 4.9359999999999998e-01 1 0 0 0 0 -V -17 0 0 0 0 0 2 1 0 -P 48 3 2.6809949063516858e+00 -2.1334338920576483e+00 -4.9258539041941329e+00 6.0002758724185767e+00 0 2 0 0 -17 0 -P 49 -3 -2.6809949063516858e+00 2.1334338920576483e+00 2.5402154973416849e+01 2.5632181942884813e+01 0 2 0 0 -17 0 -P 187 92 0 0 2.0476301069222714e+01 3.1632457815303390e+01 2.4110858175508753e+01 2 0 0 -18 0 -V -18 0 0 0 0 0 0 11 0 -P 188 -321 2.3165815711701914e+00 -1.4668486212149290e+00 -3.7345492849367883e+00 4.6592589942036238e+00 4.9359999999999998e-01 1 0 0 0 0 -P 189 213 -1.8805628523845630e-01 -4.7820853896800425e-01 -1.8580072096583751e-02 8.0239109587132929e-01 6.1598512846892473e-01 2 0 0 -117 0 -P 190 -211 5.2779424626199234e-01 -6.9896042852539919e-02 3.7768327334195961e-01 6.6751529050352554e-01 1.3957000000000000e-01 1 0 0 0 0 -P 191 213 -1.6891692283320525e-01 6.6648603572310589e-02 1.6599824117289130e+00 1.9453974090260178e+00 9.9802530459814820e-01 2 0 0 -118 0 -P 192 113 -7.4221913151521435e-01 4.9737556351137047e-01 2.7144616154803280e+00 2.9374218163653363e+00 6.7961266540398446e-01 2 0 0 -119 0 -P 193 -213 2.6977494445296846e-02 3.3051528732393581e-01 2.9686265628592207e-01 7.9252551915710912e-01 6.5574470753239167e-01 2 0 0 -120 0 -P 194 211 -6.8694313677862559e-03 -3.6465893769440583e-01 8.2207140953389746e-01 9.1011236515101712e-01 1.3957000000000000e-01 1 0 0 0 0 -P 195 113 -1.7926234409549882e-01 4.5811796288984646e-01 4.3631920667074748e+00 4.4594263972685484e+00 7.7912240741974559e-01 2 0 0 -121 0 -P 196 -213 -8.7517280978279891e-02 1.1556616042151517e-01 1.2143912094050173e+00 1.4643347407834515e+00 8.0530454592083023e-01 2 0 0 -122 0 -P 197 323 -7.6278088917320597e-01 6.2000960206627131e-01 7.1458893862408148e+00 7.2776101788726990e+00 9.6624438094104526e-01 2 0 0 -123 0 -P 198 221 -7.3573102667583368e-01 2.9137896094462912e-01 5.6348963975317616e+00 5.7164640081007310e+00 5.4744999999999999e-01 2 0 0 -124 0 -V -19 0 0 0 0 0 2 1 0 -P 50 21 1.2797607567819380e+00 -2.6322105018962016e+00 9.7689792994647917e-01 3.0855549397840010e+00 0 2 0 0 -19 0 -P 51 21 -1.2797607567819380e+00 2.6322105018962016e+00 2.1455385372104661e+00 3.6290019751368225e+00 0 2 0 0 -19 0 -P 199 92 0 0 3.1224364671569451e+00 6.7145569149208235e+00 5.9443809662806357e+00 2 0 0 -20 0 -V -20 0 0 0 0 0 0 5 0 -P 200 213 4.6881355005877492e-02 -1.7685658006218710e-01 -3.6436198676174875e-01 1.1033453735196406e+00 1.0252488695491191e+00 2 0 0 -125 0 -P 201 111 3.7295347928756839e-01 -3.7777914400943240e-02 1.1758598639554589e+00 1.2415262738220798e+00 1.3497999999999999e-01 2 0 0 -126 0 -P 202 -213 -7.7174053973165080e-01 1.1344979778855320e+00 1.1415247517969562e+00 1.9615336994911579e+00 8.1355182550511485e-01 2 0 0 -127 0 -P 203 223 4.0683186443833641e-01 -5.2896991332825460e-01 1.1174071860398992e-01 1.0379283489087789e+00 7.8707555809178420e-01 2 0 0 -128 0 -P 204 223 -5.4926159000131487e-02 -3.9089357009414699e-01 1.0576731195622895e+00 1.3702232191791681e+00 7.7654657068951227e-01 2 0 0 -129 0 -V -21 0 0 0 0 0 0 2 0 -P 205 -421 1.6217223175989148e+00 -6.8010125330790361e-01 -9.1387443651518652e+00 9.4913397269165518e+00 1.8645000000000000e+00 2 0 0 -130 0 -P 206 111 1.7968957185550219e-01 -6.1256193952872552e-02 -7.5978817714920155e-01 7.9469386436974088e-01 1.3497999999999999e-01 2 0 0 -131 0 -V -22 0 0 0 0 0 0 2 0 -P 207 -311 3.8379010207120906e-01 6.7470718262439966e-01 -2.3156482330478920e+00 2.4924740305268194e+00 4.9767000000000000e-01 2 0 0 -132 0 -P 208 -211 1.1885409638388056e-01 8.3490247668284856e-01 -4.0919076763111493e+00 4.1802364356759165e+00 1.3957000000000000e-01 1 0 0 0 0 -V -23 0 0 0 0 0 0 2 0 -P 209 311 4.9216148712404084e-01 1.6700552201381169e+00 -1.0293091901049095e+01 1.0451158963486355e+01 4.9767000000000000e-01 2 0 0 -133 0 -P 210 111 1.5608318125249132e-01 3.2776161422857351e-02 -2.1970366209984036e+00 2.2069494218571477e+00 1.3497999999999999e-01 2 0 0 -134 0 -V -24 0 0 0 0 0 0 2 0 -P 211 -211 2.0686418792920924e-01 -7.4052015170417047e-03 -8.4407254316637448e-01 8.8021921831125127e-01 1.3957000000000000e-01 1 0 0 0 0 -P 212 211 1.0687235046510266e-01 1.0665286980031208e+00 -2.9742802779412334e+00 3.1646055235381785e+00 1.3957000000000000e-01 1 0 0 0 0 -V -25 0 0 0 0 0 0 3 0 -P 213 211 1.6494907868686517e-01 9.3669242179650447e-02 -1.1169618990498749e+00 1.1415190731298617e+00 1.3957000000000000e-01 1 0 0 0 0 -P 214 -211 -3.2961684312823265e-02 9.7904714471502771e-02 -3.2110680804773697e+00 3.2157596004846356e+00 1.3957000000000000e-01 1 0 0 0 0 -P 215 111 -1.2371813995669578e-01 2.7781701450849755e-01 -1.2188863571466753e+00 1.2634840813176285e+00 1.3497999999999999e-01 2 0 0 -135 0 -V -26 0 0 0 0 0 0 2 0 -P 216 211 2.6192308140908338e-01 8.2567800152099802e-01 -2.4544236849886327e+00 2.6065347250907127e+00 1.3957000000000000e-01 1 0 0 0 0 -P 217 111 -7.1482009245183581e-02 -6.3077240170473347e-03 -1.1802194579810725e+00 1.1900785832982377e+00 1.3497999999999999e-01 2 0 0 -136 0 -V -27 0 0 0 0 0 0 3 0 -P 218 -211 1.2750107324969964e-01 -6.0407306768978437e-02 -2.7535093013034662e-01 3.3941639031513160e-01 1.3957000000000000e-01 1 0 0 0 0 -P 219 211 1.9975853129734369e-01 3.0355779618777118e-01 -9.8170033356441933e-01 1.0560616157558897e+00 1.3957000000000000e-01 1 0 0 0 0 -P 220 111 1.4897220997953661e-01 8.6760505956244627e-02 -4.6472305443281688e-02 2.2382890857345566e-01 1.3497999999999999e-01 2 0 0 -137 0 -V -28 0 0 0 0 0 0 2 0 -P 221 -311 -8.2754245304295648e-02 1.3966417583534083e-01 2.8673365676272389e-01 5.9686343994935065e-01 4.9767000000000000e-01 2 0 0 -138 0 -P 222 -211 -1.8405188231880528e-02 -1.3401650405953600e-01 -1.1372650400998702e-01 2.2519475333258582e-01 1.3957000000000000e-01 1 0 0 0 0 -V -29 0 0 0 0 0 0 2 0 -P 223 321 -1.8606728549463221e-02 1.8438159657958669e-02 1.8496301802780613e-01 5.2776742426644740e-01 4.9359999999999998e-01 1 0 0 0 0 -P 224 -211 -5.8511336571788884e-02 3.5244481235949815e-01 4.7335066859644559e-01 6.0924671737091951e-01 1.3957000000000000e-01 1 0 0 0 0 -V -30 0 0 0 0 0 0 2 0 -P 225 211 1.0573260084598722e-01 -2.9908689762051261e-02 1.7688449051444560e-01 2.5068270879638765e-01 1.3957000000000000e-01 1 0 0 0 0 -P 226 111 -4.6380149176473889e-01 -1.5543106838779938e-01 2.5262943145065019e-02 5.0806343844024116e-01 1.3497999999999999e-01 2 0 0 -139 0 -V -31 0 0 0 0 0 0 3 0 -P 227 22 9.2357515717230873e-02 1.2167869364811841e-01 1.5090349685127447e+00 1.5167472272569451e+00 0 1 0 0 0 0 -P 228 -211 1.6376765932694964e-01 -1.1407305807929946e-01 3.2242673069684358e+00 3.2334520192058642e+00 1.3957000000000000e-01 1 0 0 0 0 -P 229 211 2.8129986815416846e-01 2.1611268857698845e-01 2.9431364251746919e+00 2.9677206930702882e+00 1.3957000000000000e-01 1 0 0 0 0 -V -32 0 0 0 0 0 0 2 0 -P 230 -211 -3.4592648683826727e-01 -7.9172091937077929e-02 3.3441833061786439e+00 3.3658542934390199e+00 1.3957000000000000e-01 1 0 0 0 0 -P 231 111 -1.1307147515979296e-02 -1.6769866681952736e-01 1.0504441492713814e+00 1.0723353978939945e+00 1.3497999999999999e-01 2 0 0 -140 0 -V -33 0 0 0 0 0 0 2 0 -P 232 -211 2.4529482978165587e-01 2.1068895148048891e-01 2.0592913103800264e+01 2.0595924579230772e+01 1.3957000000000000e-01 1 0 0 0 0 -P 233 111 1.1477924954231560e-01 -2.2979793525959996e-01 3.8904575735499605e+00 3.9012640386376463e+00 1.3497999999999999e-01 2 0 0 -141 0 -V -34 0 0 0 0 0 0 2 0 -P 234 -211 1.0683530591018791e-02 2.9505319405206820e-01 1.8571534555359463e+01 1.8574405671540525e+01 1.3957000000000000e-01 1 0 0 0 0 -P 235 211 -3.8320474011581890e-01 -2.8328556012237832e-01 1.9771742986078998e+01 1.9777977577949802e+01 1.3957000000000000e-01 1 0 0 0 0 -V -35 0 0 0 0 0 0 2 0 -P 236 211 -2.0039518369288894e-02 -2.6884321977876424e-01 6.0433873079858088e+01 6.0434635545160802e+01 1.3957000000000000e-01 1 0 0 0 0 -P 237 -211 -7.0567420656834565e-02 4.3227021311803671e-01 1.0675834001752031e+02 1.0675932971117506e+02 1.3957000000000000e-01 1 0 0 0 0 -V -36 0 0 0 0 0 0 3 0 -P 238 211 2.3019840431794759e-02 1.0722469130411325e-01 4.8915482888414573e+01 4.8915804941134901e+01 1.3957000000000000e-01 1 0 0 0 0 -P 239 -211 1.5228297752088477e-01 2.4892222450875526e-01 1.3594839004485266e+02 1.3594877486741612e+02 1.3957000000000000e-01 1 0 0 0 0 -P 240 111 -1.8372996459514808e-03 5.1323835337157217e-02 2.0956193140799577e+01 2.0956690770888397e+01 1.3497999999999999e-01 2 0 0 -142 0 -V -37 0 0 0 0 0 0 2 0 -P 241 421 6.2436518356625337e+00 -2.8651113247762519e+00 -1.6799099320280089e+01 1.8244948598748316e+01 1.8645000000000000e+00 2 0 0 -143 0 -P 242 111 4.9387619354922196e-01 -2.6296728043550860e-01 -1.2797340263786521e+00 1.4032121235955854e+00 1.3497999999999999e-01 2 0 0 -144 0 -V -38 0 0 0 0 0 0 2 0 -P 243 211 2.7007673122422310e-01 -4.6451763092717235e-01 -9.3209210659772479e-01 1.0848933358965471e+00 1.3957000000000000e-01 1 0 0 0 0 -P 244 111 8.1043539067834081e-01 -1.9587017425910982e-01 -1.3769041714155361e+00 1.6153189608525471e+00 1.3497999999999999e-01 2 0 0 -145 0 -V -39 0 0 0 0 0 0 3 0 -P 245 211 4.2743761782097450e-01 -3.1321195981240602e-01 -3.4462938877908883e-01 6.4734368723904778e-01 1.3957000000000000e-01 1 0 0 0 0 -P 246 -211 6.6967622594905324e-02 -6.5307943664755175e-02 -1.1166100354230166e-01 2.0173684490892191e-01 1.3957000000000000e-01 1 0 0 0 0 -P 247 221 3.8909956284019970e-01 -5.3871218458285008e-01 -8.7107471401348857e-01 1.2247783258672331e+00 5.4744999999999999e-01 2 0 0 -146 0 -V -40 0 0 0 0 0 0 2 0 -P 248 -211 8.9544666103778403e-01 -3.4343535149518389e-01 -1.6695180355689065e+00 1.9304255539673623e+00 1.3957000000000000e-01 1 0 0 0 0 -P 249 111 7.7167108423919306e-01 -2.5894206886027965e-01 -2.6574100454998915e+00 2.7825482938486923e+00 1.3497999999999999e-01 2 0 0 -147 0 -V -41 0 -1.1546839958446812e-05 -2.7423900695209169e-06 -5.6021295776194672e-05 5.7666086596760802e-05 0 2 0 -P 250 22 -1.8671110918704986e-01 -7.3362208509199348e-02 -6.4793461233395855e-01 6.7827893509349302e-01 0 1 0 0 0 0 -P 251 22 -4.2737566410076068e-02 1.8867838474912971e-02 -4.6527143948108279e-01 4.6761095721568580e-01 0 1 0 0 0 0 -V -42 0 -9.5849625824338869e+00 -4.5427856562572915e+00 3.0797790083823350e+02 3.2154967752035753e+02 0 2 0 -P 252 2112 2.3494946269770597e-02 -7.7140433032913139e-02 3.6864044468885173e+00 3.8051113242385117e+00 9.3957000000000002e-01 1 0 0 0 0 -P 253 -211 -1.4849118076197018e-01 1.7898563672047136e-02 3.2989479064236149e-01 3.8817566530963010e-01 1.3957000000000000e-01 1 0 0 0 0 -V -43 0 0 0 0 0 0 1 0 -P 254 310 -1.0795922983869366e-01 -3.0104120411989399e-02 1.6962385074932020e+00 1.7712882195102833e+00 4.9767000000000000e-01 2 0 0 -148 0 -V -44 0 0 0 0 0 0 2 0 -P 255 -2112 -7.1620069765306504e-01 -5.9406387712284348e-01 6.6924011570619157e+00 6.8217945118102632e+00 9.3957000000000002e-01 1 0 0 0 0 -P 256 211 1.2282746276398639e-01 1.3160303099116163e-01 8.4157099372716293e-01 8.7185289226911644e-01 1.3957000000000000e-01 1 0 0 0 0 -V -45 0 0 0 0 0 0 2 0 -P 257 -211 1.0917582350152771e-01 -1.9998037871313329e-01 3.9245082818393935e+00 3.9335933383400823e+00 1.3957000000000000e-01 1 0 0 0 0 -P 258 111 -2.3607809641078237e-01 9.8924049628864474e-02 1.2207570821773017e+00 1.2545861027789014e+00 1.3497999999999999e-01 2 0 0 -149 0 -V -46 0 0 0 0 0 0 2 0 -P 259 211 -9.2512366564428780e-02 6.6785049859374487e-02 1.0583879226240367e+00 1.0736310169273680e+00 1.3957000000000000e-01 1 0 0 0 0 -P 260 111 -1.1115938983384583e+00 -1.8893723514333377e-01 2.2371197529621647e+01 2.2400000821057944e+01 1.3497999999999999e-01 2 0 0 -150 0 -V -47 0 0 0 0 0 0 3 0 -P 261 211 -8.7979223122396005e-02 -1.8498323078029286e-01 7.8982483377437287e+00 7.9021367824748960e+00 1.3957000000000000e-01 1 0 0 0 0 -P 262 -211 -9.3830291977028552e-02 7.2250537096242073e-02 3.3416130761211456e+00 3.3466224763494039e+00 1.3957000000000000e-01 1 0 0 0 0 -P 263 111 1.0757250327674936e-01 2.5521449183574951e-01 3.9260193555040792e+00 3.9380901285390704e+00 1.3497999999999999e-01 2 0 0 -151 0 -V -48 0 0 0 0 0 0 2 0 -P 264 -211 -5.8001042529546454e-01 -4.0485193410956233e-01 2.1083579793599277e+01 2.1095903248734608e+01 1.3957000000000000e-01 1 0 0 0 0 -P 265 111 -3.2073406530239251e-01 -1.9939418805101175e-01 3.7968439357699193e+00 3.8179669794102113e+00 1.3497999999999999e-01 2 0 0 -152 0 -V -49 0 0 0 0 0 0 2 0 -P 266 321 -2.7856704535459481e-01 6.3755292333151825e-01 6.4308924492340807e+01 6.4314582200698453e+01 4.9359999999999998e-01 1 0 0 0 0 -P 267 111 -1.1765519819761945e-01 -1.6064093626715317e-01 1.9166237785949200e+01 1.9167747356536566e+01 1.3497999999999999e-01 2 0 0 -153 0 -V -50 0 0 0 0 0 0 2 0 -P 268 -321 -8.9367168692652132e-01 2.0771029167550126e-02 1.5400335786204033e+02 1.5400674321036507e+02 4.9359999999999998e-01 1 0 0 0 0 -P 269 211 -2.8492412920335630e-01 4.1681594305669806e-01 8.0055157641769668e+01 8.0056871423527923e+01 1.3957000000000000e-01 1 0 0 0 0 -V -51 0 -6.6002531619560156e-06 4.6303420024687618e-05 6.9143008171581527e-03 6.9145890185681727e-03 0 2 0 -P 270 22 3.2985399197000089e-03 1.3785210455256494e-01 2.1286406525307036e+01 2.1286853145632609e+01 0 1 0 0 0 0 -P 271 22 -2.4309358054476007e-02 9.5472016989760957e-03 7.2413056072650817e-01 7.2460138209044855e-01 0 1 0 0 0 0 -V -52 0 0 0 0 0 0 2 0 -P 272 -211 -2.8540776280327329e-01 9.3966682333239981e-01 1.4340676176985525e+02 1.4341019221948926e+02 1.3957000000000000e-01 1 0 0 0 0 -P 273 111 -1.1869009496520293e+00 8.8484723595274772e-01 2.4894306409889506e+02 2.4894750264070180e+02 1.3497999999999999e-01 2 0 0 -154 0 -V -53 0 0 0 0 0 0 2 0 -P 274 211 1.7933401902204655e+00 1.2885124651880893e+00 6.1833606751116611e+02 6.1834002635958245e+02 1.3957000000000000e-01 1 0 0 0 0 -P 275 111 -3.9365165318030595e-02 2.1026551461701451e-01 7.2894196812983083e+01 7.2894635672408640e+01 1.3497999999999999e-01 2 0 0 -155 0 -V -54 0 1.0676767945586468e-04 5.7893903355371724e-05 2.5444575107770855e-02 2.5444873168571566e-02 0 2 0 -P 276 22 2.4999471933883968e-01 1.5059317622941079e-01 4.8566265682726126e+01 4.8567142576329971e+01 0 1 0 0 0 0 -P 277 22 4.5564793068048387e-01 2.3203579530812810e-01 1.1960051942648138e+02 1.1960161245874228e+02 0 1 0 0 0 0 -V -55 0 0 0 0 0 0 3 0 -P 278 211 2.6192602171711871e-01 6.6663279626861305e-02 8.4515411988941139e+01 8.4515959396311999e+01 1.3957000000000000e-01 1 0 0 0 0 -P 279 -211 3.0260190289747680e-02 5.2722368310901424e-01 1.3997838615805080e+02 1.3997945189094159e+02 1.3957000000000000e-01 1 0 0 0 0 -P 280 111 -1.0915701330301296e-01 6.3947562447915010e-02 3.9337776782952176e+01 3.9338211784091911e+01 1.3497999999999999e-01 2 0 0 -156 0 -V -56 0 0 0 0 0 0 2 0 -P 281 -211 1.0460657961309405e+00 -3.9020867461042025e-01 9.9157631500447565e+01 9.9164015050939852e+01 1.3957000000000000e-01 1 0 0 0 0 -P 282 211 1.1960987457174342e-01 -2.5875645151296439e-01 1.0301918998462718e+01 1.0306807277672448e+01 1.3957000000000000e-01 1 0 0 0 0 -V -57 0 0 0 0 0 0 2 0 -P 283 211 -1.6242543744049195e-01 3.1007645455399614e-02 2.1896606379610399e+00 2.2003265646581580e+00 1.3957000000000000e-01 1 0 0 0 0 -P 284 111 1.2652227858485912e-01 9.6098178980106996e-01 3.5153440087509658e+01 3.5167059352095940e+01 1.3497999999999999e-01 2 0 0 -157 0 -V -58 0 0 0 0 0 0 3 0 -P 285 111 2.9219528435810188e-01 2.1022194446087650e-01 3.5594569879955653e+00 3.5801571194466431e+00 1.3497999999999999e-01 2 0 0 -158 0 -P 286 111 7.2165970952666164e-02 1.0925849693542053e-01 1.7329492789665644e+00 1.7431231024763754e+00 1.3497999999999999e-01 2 0 0 -159 0 -P 287 111 5.7259665167642498e-02 1.0687387285916360e-02 3.2706781824117788e+00 3.2739804921236972e+00 1.3497999999999999e-01 2 0 0 -160 0 -V -59 0 0 0 0 0 0 2 0 -P 288 -211 5.5626398321002368e-01 1.3631010577680165e+00 1.2299140896707550e+01 1.2387728633396405e+01 1.3957000000000000e-01 1 0 0 0 0 -P 289 111 4.1830606098124423e-01 1.1755765771896662e+00 1.9730016713629471e+01 1.9769894773872441e+01 1.3497999999999999e-01 2 0 0 -161 0 -V -60 0 3.8941374669982273e-05 1.8006347465645076e-05 5.5790884985439169e-04 5.5957112049228436e-04 0 2 0 -P 290 22 1.2285446892288159e+00 5.5994878566880602e-01 1.7826169650336105e+01 1.7877225430658086e+01 0 1 0 0 0 0 -P 291 22 5.0254836912804378e-02 3.1363380420649907e-02 4.9505241412208734e-01 4.9858409821478411e-01 0 1 0 0 0 0 -V -61 0 0 0 0 0 0 3 0 -P 292 211 3.3246427160202974e-01 2.4826372883767425e-01 4.4532204940244178e+00 4.4746865727386238e+00 1.3957000000000000e-01 1 0 0 0 0 -P 293 -211 3.0564376993854531e-01 6.9193900353716309e-01 8.2429344382337373e+00 8.2787466223238155e+00 1.3957000000000000e-01 1 0 0 0 0 -P 294 221 9.5599961032503467e-01 1.2801871992451461e+00 1.7605752316643834e+01 1.7686577697722150e+01 5.4744999999999999e-01 2 0 0 -162 0 -V -62 0 0 0 0 0 0 2 0 -P 295 211 8.0273279393105107e-02 2.0186889552187660e-02 5.6907814730655848e-01 5.9176095894894998e-01 1.3957000000000000e-01 1 0 0 0 0 -P 296 111 1.6901191173961481e+00 -1.5985626590924316e+00 1.6544286957456936e+01 1.6707589764448741e+01 1.3497999999999999e-01 2 0 0 -163 0 -V -63 0 0 0 0 0 0 1 0 -P 297 310 6.3686850058466904e-01 -2.8985459322238305e-01 6.1254602664267574e+00 6.1853501175537380e+00 4.9767000000000000e-01 2 0 0 -164 0 -V -64 0 0 0 0 0 0 2 0 -P 298 130 1.4358399666748303e-01 -1.0812535661317952e+00 4.2011710653840471e+00 4.3688945269818387e+00 4.9767000000000000e-01 1 0 0 0 0 -P 299 310 -5.6376902188405402e-02 -9.4829366505374968e-01 3.4172653874114838e+00 3.5815942521706718e+00 4.9767000000000000e-01 2 0 0 -165 0 -V -65 0 0 0 0 0 0 2 0 -P 300 -321 -2.2142072696580159e-01 1.5578586639161984e-01 1.6476923364331792e+00 1.7412143377649063e+00 4.9359999999999998e-01 1 0 0 0 0 -P 301 111 2.3195043580107069e-02 -3.1086024973021309e-01 9.9213467140438327e-01 1.0486767430966022e+00 1.3497999999999999e-01 2 0 0 -166 0 -V -66 0 0 0 0 0 0 2 0 -P 302 -211 -1.1624801152423032e+00 -1.7625857585222973e+00 5.0201713535008983e+00 5.4479049898002465e+00 1.3957000000000000e-01 1 0 0 0 0 -P 303 211 5.8229430385060822e-02 -1.4047080457471348e-01 3.0156695192662147e-01 3.6543826413656960e-01 1.3957000000000000e-01 1 0 0 0 0 -V -67 0 0 0 0 0 0 2 0 -P 304 211 1.4948479945856540e-03 1.2568218777132778e-01 -1.5080220659718138e-01 2.4087203513088271e-01 1.3957000000000000e-01 1 0 0 0 0 -P 305 111 -7.2459948192582480e-01 -8.9543741457431492e-01 7.6366010654820127e-01 1.3886140325374496e+00 1.3497999999999999e-01 2 0 0 -167 0 -V -68 0 0 0 0 0 0 2 0 -P 306 211 1.0563433052605793e-01 -2.7158694112764570e-01 -4.0122677357734220e-02 3.2558822539384402e-01 1.3957000000000000e-01 1 0 0 0 0 -P 307 111 -7.0299433074427298e-01 -9.4889402278916302e-01 3.0759404672122986e-01 1.2277762799150060e+00 1.3497999999999999e-01 2 0 0 -168 0 -V -69 0 1.2667704663510530e-05 -7.0744177920900302e-05 1.8213818727785282e-05 8.3881864673891209e-05 0 2 0 -P 308 22 5.4027065630195055e-02 -1.9904590108705426e-02 1.9071272126093892e-02 6.0653358921930293e-02 0 1 0 0 0 0 -P 309 22 -1.0444000571005583e-02 -2.2348978880879536e-01 4.3593122701166338e-02 2.2794105202127599e-01 0 1 0 0 0 0 -V -70 0 0 0 0 0 0 2 0 -P 310 211 -4.3737588677301271e-02 -6.4946955578646784e-02 -3.5924173334191872e-02 1.6401650780328356e-01 1.3957000000000000e-01 1 0 0 0 0 -P 311 111 -1.1020147543802561e+00 -1.6536485938923138e+00 -1.9715970413558779e+00 2.8025710847072287e+00 1.3497999999999999e-01 2 0 0 -169 0 -V -71 0 0 0 0 0 0 2 0 -P 312 -211 -7.4010583846387956e-01 -4.7229998155360581e-01 -9.2048603238071680e-01 1.2796867762901407e+00 1.3957000000000000e-01 1 0 0 0 0 -P 313 111 -2.5499660395015161e-01 8.5088854900123176e-02 -1.8681615758638939e-01 3.5409498498237357e-01 1.3497999999999999e-01 2 0 0 -170 0 -V -72 0 0 0 0 0 0 1 0 -P 314 310 -2.8765138987802308e-01 7.2322394316508809e-01 -1.3293539465693636e+00 1.6188432716682486e+00 4.9767000000000000e-01 2 0 0 -171 0 -V -73 0 0 0 0 0 0 2 0 -P 315 -211 -5.0232272700335232e-03 1.0288006080287391e+00 -2.6829806284030435e+00 2.8768595310126805e+00 1.3957000000000000e-01 1 0 0 0 0 -P 316 211 -1.5041483011075760e-02 -6.2116154231934534e-02 -7.5021064446656849e-02 1.7085844386054616e-01 1.3957000000000000e-01 1 0 0 0 0 -V -74 0 0 0 0 0 0 2 0 -P 317 211 2.3075821910509536e-01 4.3897541651857841e-01 -1.2656582782473587e+00 1.3664989696989467e+00 1.3957000000000000e-01 1 0 0 0 0 -P 318 111 4.6838599969743122e-01 4.9174921370238156e-02 -8.7389061637774768e-01 1.0018522981944049e+00 1.3497999999999999e-01 2 0 0 -172 0 -V -75 0 0 0 0 0 0 2 0 -P 319 -211 2.5742640827553703e-01 5.6243178021327091e-02 -5.9271374260145144e+00 5.9346330554225126e+00 1.3957000000000000e-01 1 0 0 0 0 -P 320 211 -9.8706113948430804e-02 -2.8964132523844838e-01 -1.4907848669725159e+00 1.5282520403097610e+00 1.3957000000000000e-01 1 0 0 0 0 -V -76 0 0 0 0 0 0 2 0 -P 321 -211 -1.8116809968197792e-01 2.3195288966429489e-01 -1.4818039389156070e+01 1.4821619181008760e+01 1.3957000000000000e-01 1 0 0 0 0 -P 322 211 -1.2600615597077278e-01 3.3646972396956704e-01 -2.8764946640392428e+00 2.9022044662009816e+00 1.3957000000000000e-01 1 0 0 0 0 -V -77 0 0 0 0 0 0 2 0 -P 323 2112 6.8523780701355297e-01 -3.5080743538294351e-01 -1.6307557677702232e+02 1.6308010040974429e+02 9.3957000000000002e-01 1 0 0 0 0 -P 324 -211 8.4749541376226964e-02 3.5211273219105275e-03 -3.0569414802299615e+01 3.0569851095860052e+01 1.3957000000000000e-01 1 0 0 0 0 -V -78 0 9.2659059340455155e-06 2.2192099479511942e-05 -1.5814794116037168e-03 1.5816634155477668e-03 0 2 0 -P 325 22 6.5173830040521086e-01 1.4984807920980339e+00 -1.0754272896002473e+02 1.0755514287873845e+02 0 1 0 0 0 0 -P 326 22 -1.5466324265940194e-04 6.2079934296075334e-02 -3.6677791592323956e+00 3.6683044997740333e+00 0 1 0 0 0 0 -V -79 0 0 0 0 0 0 2 0 -P 327 -211 6.6823265779759167e-01 7.0798190000280858e-01 -4.8392336668505656e+01 4.8402329502603237e+01 1.3957000000000000e-01 1 0 0 0 0 -P 328 211 1.0551080640961935e-01 1.5636350604201216e-01 -4.0467426697579832e+01 4.0468107015095086e+01 1.3957000000000000e-01 1 0 0 0 0 -V -80 0 0 0 0 0 0 3 0 -P 329 211 -1.6210443044946699e-01 5.3631565721785644e-02 -3.2851753809151361e+01 3.2852494004461882e+01 1.3957000000000000e-01 1 0 0 0 0 -P 330 -211 6.3753390431136939e-02 -3.4266989260422084e-02 -4.3006183481217263e+01 4.3006470863422045e+01 1.3957000000000000e-01 1 0 0 0 0 -P 331 111 1.1533681740304895e-01 2.6389423523999250e-01 -2.1069793643374290e+01 2.1072194155417638e+01 1.3497999999999999e-01 2 0 0 -173 0 -V -81 0 0 0 0 0 0 3 0 -P 332 -211 5.6711449398208394e-02 -4.9900954611827149e-02 -1.7771001367628735e+01 1.7771709982073371e+01 1.3957000000000000e-01 1 0 0 0 0 -P 333 211 8.5429989515703270e-02 2.9119120815685540e-01 -8.1609305243617207e+00 8.1677633052859324e+00 1.3957000000000000e-01 1 0 0 0 0 -P 334 111 1.5971224969655323e-01 1.6416391462325010e-03 -6.1583136127604776e+00 6.1618630990304570e+00 1.3497999999999999e-01 2 0 0 -174 0 -V -82 0 0 0 0 0 0 3 0 -P 335 111 3.2030294786127822e-01 -1.0601635141293821e-01 -2.8028052211989629e+00 2.8262643460150190e+00 1.3497999999999999e-01 2 0 0 -175 0 -P 336 111 2.9110855186201823e-01 8.7859720184946685e-02 -3.6679991381187156e+00 3.6830559046853768e+00 1.3497999999999999e-01 2 0 0 -176 0 -P 337 111 4.0602579306178992e-02 5.1683011578460081e-03 -1.0151896366424780e+00 1.0249414029735842e+00 1.3497999999999999e-01 2 0 0 -177 0 -V -83 0 0 0 0 0 0 2 0 -P 338 211 6.5793571993552347e-01 5.6569505409351306e-01 -1.7197107586476218e+01 1.7219549338804743e+01 1.3957000000000000e-01 1 0 0 0 0 -P 339 111 5.8788972858264898e-01 1.8877221706897764e+00 -2.1951790012437453e+01 2.2041061990685371e+01 1.3497999999999999e-01 2 0 0 -178 0 -V -84 0 0 0 0 0 0 2 0 -P 340 22 6.6593323470164767e-01 6.3569398019847445e-01 -6.3111210203307069e+00 6.3779167792313567e+00 0 1 0 0 0 0 -P 341 22 2.1963494126495064e-01 2.8017614166117788e-01 -6.1100973275610935e+00 6.1204597482582805e+00 0 1 0 0 0 0 -V -85 0 3.0223187720401600e-04 4.8661610779874898e-04 -5.3830165474146501e-03 5.4137043570611056e-03 0 2 0 -P 342 22 5.7856337531910038e-02 1.3626196294686996e-01 -1.7555647494935451e+00 1.7617951833295136e+00 0 1 0 0 0 0 -P 343 22 6.6462261932697564e-01 1.0269836258559635e+00 -1.1112423286411024e+01 1.1179551417220072e+01 0 1 0 0 0 0 -V -86 0 0 0 0 0 0 2 0 -P 344 -211 4.1265547372750555e-01 1.2949869224888536e-01 -3.6370992906819448e+00 3.6653820382697559e+00 1.3957000000000000e-01 1 0 0 0 0 -P 345 211 8.0133869236026911e-01 1.5461792439251949e+00 -1.5223724224072070e+01 1.5323644246383349e+01 1.3957000000000000e-01 1 0 0 0 0 -V -87 0 0 0 0 0 0 2 0 -P 346 -211 4.4315996363918092e-01 4.3179607305874240e-01 -3.3584103881800651e+00 3.4177827201882520e+00 1.3957000000000000e-01 1 0 0 0 0 -P 347 111 1.5073350550211109e-02 7.2202155363162623e-01 -1.5089453750602873e+01 1.5107328566685394e+01 1.3497999999999999e-01 2 0 0 -179 0 -V -88 0 0 0 0 0 0 2 0 -P 348 211 2.0265472465231706e+00 1.6273344433143688e+00 -2.5085446979218137e+01 2.5220115801971495e+01 1.3957000000000000e-01 1 0 0 0 0 -P 349 111 5.5564478995138736e-02 5.3068180921456376e-02 -1.0567328314465232e+00 1.0680859144325889e+00 1.3497999999999999e-01 2 0 0 -180 0 -V -89 0 0 0 0 0 0 2 0 -P 350 321 5.5334359353845797e-01 4.4390121636406382e-01 -6.4488659797201224e+00 6.5065160267835447e+00 4.9359999999999998e-01 1 0 0 0 0 -P 351 -211 1.2280392089109184e+00 7.9181424127792643e-01 -1.6152530029392889e+01 1.6219086171133444e+01 1.3957000000000000e-01 1 0 0 0 0 -V -90 0 0 0 0 0 0 2 0 -P 352 -311 4.9782761336762366e-01 5.0953796112831118e-01 -7.5199540324803458e+00 7.5699963900902567e+00 4.9767000000000000e-01 2 0 0 -181 0 -P 353 111 9.2084903787267469e-01 1.3790049009253627e-01 -1.0572002769311638e+01 1.0613785453383338e+01 1.3497999999999999e-01 2 0 0 -182 0 -V -91 0 0 0 0 0 0 2 0 -P 354 -211 -4.1646899766105938e-01 -6.4165585437284340e-04 -4.5711127402477864e+01 4.5713237634499237e+01 1.3957000000000000e-01 1 0 0 0 0 -P 355 111 -1.5883655598135957e-01 -4.7746020680533935e-01 -4.8794799426665946e+01 4.8797580554670517e+01 1.3497999999999999e-01 2 0 0 -183 0 -V -92 0 0 0 0 0 0 2 0 -P 356 -2112 -5.0910243761024854e-01 -4.5126876099486196e-01 -2.8494746972763384e+01 2.8518348928599259e+01 9.3957000000000002e-01 1 0 0 0 0 -P 357 211 -2.9468806770195133e-01 -2.9190475370197855e-01 -5.4819920692795092e+00 5.4994332685307823e+00 1.3957000000000000e-01 1 0 0 0 0 -V -93 0 0 0 0 0 0 2 0 -P 358 -211 -2.4885074976450763e-01 3.3424025035342403e-01 -2.8357333619216721e+01 2.8360738583772349e+01 1.3957000000000000e-01 1 0 0 0 0 -P 359 111 6.8911093492632733e-02 -2.7130636779539036e-01 -1.4855359858410299e+01 1.4858610029450290e+01 1.3497999999999999e-01 2 0 0 -184 0 -V -94 0 0 0 0 0 0 1 0 -P 360 130 -1.4096245121895092e+00 -2.1826091973706498e+00 -7.8978356177349141e+01 7.9022650196503378e+01 4.9767000000000000e-01 1 0 0 0 0 -V -95 0 0 0 0 0 0 2 0 -P 361 -321 -3.8980393264709728e-02 2.3659798443371793e-02 -4.5021650566010770e+01 4.5024379395002207e+01 4.9359999999999998e-01 1 0 0 0 0 -P 362 111 -2.6489328918552280e-01 -4.1560022800454127e-01 -3.3811621128573726e+01 3.3815482178238803e+01 1.3497999999999999e-01 2 0 0 -185 0 -V -96 0 0 0 0 0 0 2 0 -P 363 211 -1.8760543427401080e+00 -1.0875370782743450e+00 -8.1985678412572810e+01 8.2014469829099326e+01 1.3957000000000000e-01 1 0 0 0 0 -P 364 111 7.5450854587473110e-02 -1.1796572075934705e-01 -7.3526082944333560e+00 7.3551802883751556e+00 1.3497999999999999e-01 2 0 0 -186 0 -V -97 0 0 0 0 0 0 2 0 -P 365 -211 3.3024357657183534e-01 -1.0764108627154867e+00 -4.6204481583885297e+01 4.6218408879857975e+01 1.3957000000000000e-01 1 0 0 0 0 -P 366 211 1.6113589013928148e-01 1.0476930546125837e-01 -4.2265010413097350e+00 4.2331704689924887e+00 1.3957000000000000e-01 1 0 0 0 0 -V -98 0 0 0 0 0 0 2 0 -P 367 22 -1.5306529296572205e-01 -5.6288475914386925e-02 -3.1187132731459890e+00 3.1229745206338810e+00 0 1 0 0 0 0 -P 368 22 4.1998551688228036e-01 -2.0427605522231063e-01 -1.8445987769881434e+01 1.8451899125774119e+01 0 1 0 0 0 0 -V -99 0 0 0 0 0 0 1 0 -P 369 130 4.1329176006341922e-01 1.8028596136298070e-01 -8.9119644403072215e+01 8.9122174609160780e+01 4.9767000000000000e-01 1 0 0 0 0 -V -100 0 0 0 0 0 0 3 0 -P 370 211 -2.5393868742732295e-01 -1.0813557949514663e-01 -2.2588965411228937e+01 2.2591082672043903e+01 1.3957000000000000e-01 1 0 0 0 0 -P 371 -211 -9.4699960295409211e-02 -7.0342706977206501e-02 -6.2577223207694175e+00 6.2603901322250373e+00 1.3957000000000000e-01 1 0 0 0 0 -P 372 111 -6.1340461783072626e-02 -9.5270249091627290e-02 -1.9913617131458697e+01 1.9914396951234526e+01 1.3497999999999999e-01 2 0 0 -187 0 -V -101 0 0 0 0 0 0 2 0 -P 373 211 -5.6588712441174915e-01 1.7007007181064696e-01 -3.2251333498529675e+02 3.2251390648341049e+02 1.3957000000000000e-01 1 0 0 0 0 -P 374 -211 -2.8982224615837326e-01 2.8131974867272219e-01 -6.3245549272580966e+01 6.3246992974454749e+01 1.3957000000000000e-01 1 0 0 0 0 -V -102 0 0 0 0 0 0 2 0 -P 375 2212 9.5560807623884438e-04 8.6244164763986575e-01 -1.1728103150663380e+03 1.1728110074871845e+03 9.3827000000000005e-01 1 0 0 0 0 -P 376 211 -2.8581771916038204e-03 -1.1153332585833524e-01 -2.1689617899690685e+02 2.1689625259809148e+02 1.3957000000000000e-01 1 0 0 0 0 -V -103 0 0 0 0 0 0 3 0 -P 377 -211 6.9777075380562020e-02 4.7507027834957305e-02 2.3372071430252870e+00 2.3428919676866879e+00 1.3957000000000000e-01 1 0 0 0 0 -P 378 211 -3.3611510436482870e-03 -3.9382859649498635e-02 1.3924281785635231e-01 2.0107375312329462e-01 1.3957000000000000e-01 1 0 0 0 0 -P 379 111 -7.9872569296045165e-02 9.6782587127883388e-02 4.2334861577519067e-01 4.6172518598825418e-01 1.3497999999999999e-01 2 0 0 -188 0 -V -104 0 0 0 0 0 0 2 0 -P 380 -211 2.4592593317047373e-01 -2.5402408844388685e-01 9.5163384838481568e-01 1.0247412202147479e+00 1.3957000000000000e-01 1 0 0 0 0 -P 381 111 -3.2259075952935390e-01 9.6110605845984534e-02 1.8794513505486412e+00 1.9141209539025790e+00 1.3497999999999999e-01 2 0 0 -189 0 -V -105 0 0 0 0 0 0 2 0 -P 382 -211 -4.5837447734990650e-01 -1.0851873872112007e-01 2.2553461445730871e+00 2.3082351472239804e+00 1.3957000000000000e-01 1 0 0 0 0 -P 383 211 6.1887762052356861e-02 -1.3754108735555134e-01 5.4029978564595833e+00 5.4069042221598167e+00 1.3957000000000000e-01 1 0 0 0 0 -V -106 0 0 0 0 0 0 3 0 -P 384 211 1.5445020817728534e-02 2.3301757642101320e-01 6.4439298137185208e+00 6.4496702992183712e+00 1.3957000000000000e-01 1 0 0 0 0 -P 385 -211 -1.2475197802699829e-01 -1.9095926689690346e-01 6.3048485731892709e+00 6.3105169212499730e+00 1.3957000000000000e-01 1 0 0 0 0 -P 386 111 1.9899815204420815e-01 -6.7184283612308757e-02 5.5687097047954106e+00 5.5743036667519377e+00 1.3497999999999999e-01 2 0 0 -190 0 -V -107 0 0 0 0 0 0 2 0 -P 387 22 -3.7754050692170192e-03 6.8280684928958862e-02 3.4642925362567140e-01 3.5311433472098541e-01 0 1 0 0 0 0 -P 388 113 8.2999471421343396e-02 -2.8251000142352389e-01 1.6107349250332053e+01 1.6130098567719088e+01 8.0416361457125063e-01 2 0 0 -191 0 -V -108 0 0 0 0 0 0 2 0 -P 389 211 -1.4673680780120973e-01 1.9405519317056662e-03 5.3082618403845041e+00 5.3121237756181632e+00 1.3957000000000000e-01 1 0 0 0 0 -P 390 -211 5.6044408203317006e-02 1.6763803708868413e-01 2.3839451002379750e+00 2.3945599831740396e+00 1.3957000000000000e-01 1 0 0 0 0 -V -109 0 0 0 0 0 0 2 0 -P 391 321 1.9846678448419963e-01 2.0386347738843802e-01 3.9517065449383580e+01 3.9521172200136242e+01 4.9359999999999998e-01 1 0 0 0 0 -P 392 -211 -2.9633713105752252e-01 3.6457100116663532e-01 3.2491480380038389e+01 3.2495176638717545e+01 1.3957000000000000e-01 1 0 0 0 0 -V -110 0 0 0 0 0 0 2 0 -P 393 -321 8.7679693769441944e-02 -3.7650460777736888e-01 1.7261252844619153e+02 1.7261366707475875e+02 4.9359999999999998e-01 1 0 0 0 0 -P 394 211 -2.1815986473454180e-01 -4.1960556703188107e-01 6.4104946097799257e+01 6.4106842509556756e+01 1.3957000000000000e-01 1 0 0 0 0 -V -111 0 -3.8117306469070869e+00 2.4304278506338637e+00 -3.6687500677897781e+01 3.6965955593079201e+01 0 4 0 -P 395 13 -1.4149561259899173e+00 1.0402134060499841e+00 -1.3160839701082471e+01 1.3277914385994174e+01 1.0566000000000000e-01 1 0 0 0 0 -P 396 -14 -1.3089155169219182e+00 1.0462816645268493e+00 -1.2289940437364569e+01 1.2403652732398342e+01 0 1 0 0 0 0 -P 397 323 -2.1581479174280773e+01 1.3503790177823028e+01 -2.0949493928636579e+02 2.1103796270682068e+02 8.8290675088899884e-01 2 0 0 -192 0 -P 398 -211 -2.0850999230479355e+00 1.2367396416999163e+00 -1.9059552487099179e+01 1.9213619841764203e+01 1.3957000000000000e-01 1 0 0 0 0 -V -112 0 0 0 0 0 0 2 0 -P 399 -311 -4.4690407303060170e-01 3.0479452171944948e-01 -6.3255618455358773e+00 6.3681261797769668e+00 4.9767000000000000e-01 2 0 0 -193 0 -P 400 111 -1.2418841812846488e+00 6.4683552692001378e-01 -1.2930629916089380e+01 1.3006924392256479e+01 1.3497999999999999e-01 2 0 0 -194 0 -V -113 0 0 0 0 0 0 2 0 -P 401 311 -9.3258822715903111e-01 9.6253600257025262e-01 -1.1172693777377827e+01 1.1263789683300944e+01 4.9767000000000000e-01 2 0 0 -195 0 -P 402 211 -1.3587033582635805e-01 1.7718207748686304e-01 -7.1597924199696528e-01 7.6286322274092955e-01 1.3957000000000000e-01 1 0 0 0 0 -V -114 0 0 0 0 0 0 2 0 -P 403 -321 -9.2232459910796916e-01 -9.2465403799705914e-02 -1.4887975269241240e+01 1.4924968378343664e+01 4.9359999999999998e-01 1 0 0 0 0 -P 404 111 -1.1663521498522561e-01 6.8185846341943981e-02 -7.0050532350766603e-01 7.2607189153595308e-01 1.3497999999999999e-01 2 0 0 -196 0 -V -115 0 0 0 0 0 0 2 0 -P 405 -211 8.0700028232659307e+00 -6.2899386723757056e+00 -1.1945209016908863e+02 1.1988957252246230e+02 1.3957000000000000e-01 1 0 0 0 0 -P 406 211 1.0872137644979858e+00 -5.9716641606912368e-01 -1.2286932660223906e+01 1.2350175524257606e+01 1.3957000000000000e-01 1 0 0 0 0 -V -116 0 1.8675243735831720e-03 -1.7086209769348198e-03 -2.8434955821092834e-02 2.8547843422511342e-02 0 2 0 -P 407 22 1.0284917633797830e+00 -8.5251486620572126e-01 -1.4939793795464507e+01 1.4999400506534974e+01 0 1 0 0 0 0 -P 408 22 5.4642645271504009e-01 -5.8839714492554174e-01 -9.0399360168790608e+00 9.0755295304268895e+00 0 1 0 0 0 0 -V -117 0 0 0 0 0 0 2 0 -P 409 211 6.3239069735772049e-02 -4.0712194024407136e-02 -1.9482115859367102e-01 2.5118067485200196e-01 1.3957000000000000e-01 1 0 0 0 0 -P 410 111 -2.5129535497422834e-01 -4.3749634494359707e-01 1.7624108649708728e-01 5.5121042101932738e-01 1.3497999999999999e-01 2 0 0 -197 0 -V -118 0 0 0 0 0 0 2 0 -P 411 211 -8.9867935841088972e-02 -4.4410153793443752e-01 8.8775575440297683e-01 1.0064255989707680e+00 1.3957000000000000e-01 1 0 0 0 0 -P 412 111 -7.9048986992116252e-02 5.1075014150674813e-01 7.7222665732593598e-01 9.3897181005524955e-01 1.3497999999999999e-01 2 0 0 -198 0 -V -119 0 0 0 0 0 0 2 0 -P 413 -211 -6.6518601310751921e-02 8.3313999049881182e-02 1.2857659839509159e+00 1.2977056280772190e+00 1.3957000000000000e-01 1 0 0 0 0 -P 414 211 -6.7570053020446241e-01 4.1406156446148923e-01 1.4286956315294119e+00 1.6397161882881173e+00 1.3957000000000000e-01 1 0 0 0 0 -V -120 0 0 0 0 0 0 2 0 -P 415 -211 -1.7917883923619066e-01 3.7320756329498238e-02 3.3628350035695148e-01 4.0750984380178873e-01 1.3957000000000000e-01 1 0 0 0 0 -P 416 111 2.0615633368148753e-01 2.9319453099443760e-01 -3.9420844071029401e-02 3.8501567535532039e-01 1.3497999999999999e-01 2 0 0 -199 0 -V -121 0 0 0 0 0 0 2 0 -P 417 -211 -4.0949193990631622e-01 9.8784294800820266e-02 1.6177062253094043e+00 1.6774669004342038e+00 1.3957000000000000e-01 1 0 0 0 0 -P 418 211 2.3022959581081737e-01 3.5933366808902623e-01 2.7454858413980707e+00 2.7819594968343444e+00 1.3957000000000000e-01 1 0 0 0 0 -V -122 0 0 0 0 0 0 2 0 -P 419 -211 1.7106562716093260e-01 -8.5567367789404127e-03 1.1082111017219458e+00 1.1300213703377633e+00 1.3957000000000000e-01 1 0 0 0 0 -P 420 111 -2.5858290813921248e-01 1.2412289720045558e-01 1.0618010768307151e-01 3.3431337044568815e-01 1.3497999999999999e-01 2 0 0 -200 0 -V -123 0 0 0 0 0 0 2 0 -P 421 321 -4.3364031456645963e-01 3.1333513178025424e-01 2.3850228401197859e+00 2.4936314353003528e+00 4.9359999999999998e-01 1 0 0 0 0 -P 422 111 -3.2914057460674639e-01 3.0667447028601713e-01 4.7608665461210302e+00 4.7839787435723471e+00 1.3497999999999999e-01 2 0 0 -201 0 -V -124 0 0 0 0 0 0 3 0 -P 423 22 -3.6801339550226492e-01 1.7380726639585706e-01 3.6329416264764558e+00 3.6556678851485542e+00 0 1 0 0 0 0 -P 424 211 -2.0485179035825907e-01 1.0503476392148384e-01 1.2552849482286934e+00 1.2838288997349061e+00 1.3957000000000000e-01 1 0 0 0 0 -P 425 -211 -1.6286584081530955e-01 1.2536930627288169e-02 7.4666982282661187e-01 7.7696722321727008e-01 1.3957000000000000e-01 1 0 0 0 0 -V -125 0 0 0 0 0 0 2 0 -P 426 211 -3.6738729491780953e-01 -1.2990768478039541e-01 -4.9576508877336578e-01 6.4584227113010451e-01 1.3957000000000000e-01 1 0 0 0 0 -P 427 111 4.1426864992368700e-01 -4.6948895281791733e-02 1.3140310201161695e-01 4.5750310238953612e-01 1.3497999999999999e-01 2 0 0 -202 0 -V -126 0 6.9426357033436299e-05 -7.0324668325621512e-06 2.1888967731901427e-04 2.3111366735984392e-04 0 2 0 -P 428 22 1.7329754036781519e-01 -3.5760193007135399e-02 3.5401094689066487e-01 3.9577086732081140e-01 0 1 0 0 0 0 -P 429 22 1.9965593891975320e-01 -2.0177213938078393e-03 8.2184891706479402e-01 8.4575540650126857e-01 0 1 0 0 0 0 -V -127 0 0 0 0 0 0 2 0 -P 430 -211 -3.7279482875192040e-02 7.0816911438682062e-01 6.4425103332057665e-01 9.6821094460323387e-01 1.3957000000000000e-01 1 0 0 0 0 -P 431 111 -7.3446105685645879e-01 4.2632886349871141e-01 4.9727371847637947e-01 9.9332275488792399e-01 1.3497999999999999e-01 2 0 0 -203 0 -V -128 0 0 0 0 0 0 3 0 -P 432 211 3.5893828107734344e-01 -2.8226148103218018e-01 1.1790620111171650e-01 4.9182302757987484e-01 1.3957000000000000e-01 1 0 0 0 0 -P 433 -211 -1.5008674707049818e-02 9.4286417803348802e-02 3.1852852341836643e-02 1.7207433858934496e-01 1.3957000000000000e-01 1 0 0 0 0 -P 434 111 6.2902258068042838e-02 -3.4099485009942332e-01 -3.8018334849563219e-02 3.7403098273955909e-01 1.3497999999999999e-01 2 0 0 -204 0 -V -129 0 0 0 0 0 0 3 0 -P 435 -211 6.2512878218440995e-02 -1.0363521755860323e-01 1.7834621769483228e-01 2.5677865278800954e-01 1.3957000000000000e-01 1 0 0 0 0 -P 436 211 2.0006607633586731e-02 -2.7092422208840949e-01 8.6756397153503473e-01 9.1975389538118113e-01 1.3957000000000000e-01 1 0 0 0 0 -P 437 111 -1.3744564485215921e-01 -1.6334130447134231e-02 1.1762930332422402e-02 1.9369067100997739e-01 1.3497999999999999e-01 2 0 0 -205 0 -V -130 0 1.5843923112336528e-01 -6.6444617855219837e-02 -8.9283819735022774e-01 9.2728610338778894e-01 0 2 0 -P 438 10323 8.7256927989165967e-01 -6.3042634964667288e-01 -7.4558774953617020e+00 7.6433087325073386e+00 1.2927662681406757e+00 2 0 0 -206 0 -P 439 -211 7.4915303770725516e-01 -4.9674903661230729e-02 -1.6828668697901639e+00 1.8480309944092130e+00 1.3957000000000000e-01 1 0 0 0 0 -V -131 0 6.3341395332392340e-05 -2.1593088333733440e-05 -2.6782880498143764e-04 2.8013321925965200e-04 0 2 0 -P 440 22 1.8312594343566238e-01 -8.4377915874067108e-02 -7.2688918009528936e-01 7.5433588273795882e-01 0 1 0 0 0 0 -P 441 22 -3.4363715801602034e-03 2.3121721921194556e-02 -3.2898997053912235e-02 4.0357981631782891e-02 0 1 0 0 0 0 -V -132 0 0 0 0 0 0 1 0 -P 442 310 3.8379010207120906e-01 6.7470718262439966e-01 -2.3156482330478920e+00 2.4924740305268194e+00 4.9767000000000000e-01 2 0 0 -207 0 -V -133 0 0 0 0 0 0 1 0 -P 443 310 4.9216148712404084e-01 1.6700552201381169e+00 -1.0293091901049095e+01 1.0451158963486355e+01 4.9767000000000000e-01 2 0 0 -208 0 -V -134 0 9.6048817494557951e-06 2.0169447607449687e-06 -1.3519891620979356e-04 1.3580891966622047e-04 0 2 0 -P 444 22 1.5816391710962158e-01 4.6061575462403102e-02 -2.1743161685814321e+00 2.1805477051337747e+00 0 1 0 0 0 0 -P 445 22 -2.0807358571302472e-03 -1.3285414039545751e-02 -2.2720452416971754e-02 2.6401716723371889e-02 0 1 0 0 0 0 -V -135 0 -6.1063190212079914e-05 1.3712130821739223e-04 -6.0160207306227294e-04 6.2361403763779813e-04 0 2 0 -P 446 22 -2.5237797460208114e-02 2.4511377645867576e-02 -3.8105441354096364e-01 3.8267508428664126e-01 0 1 0 0 0 0 -P 447 22 -9.8480342496487655e-02 2.5330563686262997e-01 -8.3783194360571156e-01 8.8080899703098514e-01 0 1 0 0 0 0 -V -136 0 -4.4426904102195735e-05 -3.9203241902067923e-06 -7.3352018546965340e-04 7.3964774707043087e-04 0 2 0 -P 448 22 -9.3539797166090302e-02 -3.7702636311332943e-02 -1.0340724780016020e+00 1.0389788603234766e+00 0 1 0 0 0 0 -P 449 22 2.2057787920906725e-02 3.1394912294285607e-02 -1.4614697997947071e-01 1.5109972297476049e-01 0 1 0 0 0 0 -V -137 0 3.4098188860393095e-05 1.9858577100558979e-05 -1.0637027187826258e-05 5.1232108310682472e-05 0 2 0 -P 450 22 1.6215511123058321e-01 9.3620873556322176e-02 -6.6667187162900293e-02 1.9875528145904667e-01 0 1 0 0 0 0 -P 451 22 -1.3182901251046604e-02 -6.8603676000775432e-03 2.0194881719618613e-02 2.5073627114409011e-02 0 1 0 0 0 0 -V -138 0 0 0 0 0 0 1 0 -P 452 130 -8.2754245304295648e-02 1.3966417583534083e-01 2.8673365676272389e-01 5.9686343994935065e-01 4.9767000000000000e-01 1 0 0 0 0 -V -139 0 -3.0024804301746423e-05 -1.0062036223726178e-05 1.6354301085376340e-06 3.2890160085510046e-05 0 2 0 -P 453 22 -2.2227458161680197e-01 -3.7647953140759721e-02 -4.5941596270482596e-02 2.3007387569320689e-01 0 1 0 0 0 0 -P 454 22 -2.4152691014793695e-01 -1.1778311524703966e-01 7.1204539415547607e-02 2.7798956274703429e-01 0 1 0 0 0 0 -V -140 0 -5.2312039080510034e-07 -7.7585077934244670e-06 4.8598353661629399e-05 4.9611143007349821e-05 0 2 0 -P 455 22 4.7206675991752704e-02 -1.2250638112759871e-01 8.1646707124802609e-01 8.2695511492915996e-01 0 1 0 0 0 0 -P 456 22 -5.8513823507732002e-02 -4.5192285691928666e-02 2.3397707802335543e-01 2.4538028296483455e-01 0 1 0 0 0 0 -V -141 0 3.0596166820026153e-05 -6.1256159019476770e-05 1.0370610489371156e-03 1.0399416777082222e-03 0 2 0 -P 457 22 4.0001623016009347e-02 3.0748574500628228e-04 9.6083364275377592e-01 9.6166600929786894e-01 0 1 0 0 0 0 -P 458 22 7.4777626526306248e-02 -2.3010542100460624e-01 2.9296239307961844e+00 2.9395980293397774e+00 0 1 0 0 0 0 -V -142 0 -4.8576316925451316e-07 1.3569495300677073e-05 5.5406023824234275e-03 5.5407339507114817e-03 0 2 0 -P 459 22 6.5319363905594258e-02 3.0658385922958279e-02 8.8762098019672298e+00 8.8765030842369192e+00 0 1 0 0 0 0 -P 460 22 -6.7156663551545731e-02 2.0665449414198934e-02 1.2079983338832347e+01 1.2080187686651476e+01 0 1 0 0 0 0 -V -143 0 9.0037533931825553e-01 -4.1316775008103196e-01 -2.4225397489886213e+00 2.6310406502189263e+00 0 2 0 -P 461 -313 3.3260378225084786e+00 -1.5544554022213999e+00 -7.2364383456584944e+00 8.1606541269951336e+00 8.6681985191492394e-01 2 0 0 -209 0 -P 462 111 2.9176140131540547e+00 -1.3106559225548522e+00 -9.5626609746215951e+00 1.0084294471753186e+01 1.3497999999999999e-01 2 0 0 -210 0 -V -144 0 1.1084488636694684e-04 -5.9020010882937835e-05 -2.8722172598448888e-04 3.1493497848296892e-04 0 2 0 -P 463 22 3.1314551809140151e-01 -2.2424078531812608e-01 -9.5181719689775401e-01 1.0267911285218234e+00 0 1 0 0 0 0 -P 464 22 1.8073067545782046e-01 -3.8726495117382520e-02 -3.2791682948089795e-01 3.7642099507376175e-01 0 1 0 0 0 0 -V -145 0 2.1762554097457766e-05 -5.2596854880985613e-06 -3.6973893122269703e-05 4.3376025620967871e-05 0 2 0 -P 465 22 6.1212626343456389e-01 -1.9963698177142020e-01 -1.1024657025825368e+00 1.2767083113413062e+00 0 1 0 0 0 0 -P 466 22 1.9830912724377689e-01 3.7668075123103504e-03 -2.7443846883299938e-01 3.3861064951124098e-01 0 1 0 0 0 0 -V -146 0 0 0 0 0 0 3 0 -P 467 -211 1.7393789155705139e-01 -1.3065291375810584e-01 -4.3049883216363505e-01 5.0212907044608479e-01 1.3957000000000000e-01 1 0 0 0 0 -P 468 211 5.4061889742620196e-02 -2.0391370194446679e-01 -3.1469861234019963e-01 4.0375547955673285e-01 1.3957000000000000e-01 1 0 0 0 0 -P 469 111 1.6109978154052820e-01 -2.0414556888027760e-01 -1.2587726950965411e-01 3.1889377586441564e-01 1.3497999999999999e-01 2 0 0 -211 0 -V -147 0 1.0714041926560731e-04 -3.5952055726626964e-05 -3.6896034107096622e-04 3.8633479589775667e-04 0 2 0 -P 470 22 2.5050241289919523e-02 -3.1553935481967076e-02 -2.0563051401164908e-01 2.0954014824319075e-01 0 1 0 0 0 0 -P 471 22 7.4662084294927367e-01 -2.2738813337831260e-01 -2.4517795314882425e+00 2.5730081456055021e+00 0 1 0 0 0 0 -V -148 0 -8.2236368158045554e+00 -2.2931374491773147e+00 1.2920849342338417e+02 1.3492529573552881e+02 0 2 0 -P 472 211 1.1959041323412727e-02 1.8026949323956257e-01 6.7905858545809583e-01 7.1640802357774702e-01 1.3957000000000000e-01 1 0 0 0 0 -P 473 -211 -1.1991827116210638e-01 -2.1037361365155197e-01 1.0171799220351061e+00 1.0548801959325360e+00 1.3957000000000000e-01 1 0 0 0 0 -V -149 0 -9.2045643512728860e-06 3.8569981482441684e-06 4.7596694869231805e-05 4.8915671097022722e-05 0 2 0 -P 474 22 -1.6000027299236894e-01 3.3406489255377600e-03 8.2592413992356950e-01 8.4128588018661254e-01 0 1 0 0 0 0 -P 475 22 -7.6077823418413418e-02 9.5583400703326729e-02 3.9483294225373233e-01 4.1330022259228810e-01 0 1 0 0 0 0 -V -150 0 -5.1376001790767983e-04 -8.7323614726347900e-05 1.0339591518642124e-02 1.0352903915864018e-02 0 2 0 -P 476 22 -9.8141079344267446e-01 -1.3524648836133710e-01 2.0155938367930911e+01 2.0180270321527644e+01 0 1 0 0 0 0 -P 477 22 -1.3018310489578394e-01 -5.3690746781996687e-02 2.2152591616907351e+00 2.2197304995303044e+00 0 1 0 0 0 0 -V -151 0 1.8812133423387019e-05 4.4631564068415145e-05 6.8657693823981141e-04 6.8868785865107516e-04 0 2 0 -P 478 22 1.1022166047224506e-01 2.1611844596084642e-01 2.5503585056497373e+00 2.5618712895970677e+00 0 1 0 0 0 0 -P 479 22 -2.6491571954957035e-03 3.9096045874903049e-02 1.3756608498543419e+00 1.3762188389420000e+00 0 1 0 0 0 0 -V -152 0 -6.1390506341479101e-05 -3.8165294835329746e-05 7.2673967916918672e-04 7.3078276184993679e-04 0 2 0 -P 480 22 -2.3353319762731059e-01 -1.5443990800084420e-01 3.2775654162838568e+00 3.2895021656167542e+00 0 1 0 0 0 0 -P 481 22 -8.7200867675081895e-02 -4.4954280050167550e-02 5.1927851948606241e-01 5.2846481379345667e-01 0 1 0 0 0 0 -V -153 0 -2.1949467253790887e-06 -2.9968781866244220e-06 3.5756066464182236e-04 3.5758882682307923e-04 0 2 0 -P 482 22 -9.6872819742027924e-02 -1.7212501507269221e-01 1.3349169664484013e+01 1.3350630775180569e+01 0 1 0 0 0 0 -P 483 22 -2.0782378455591517e-02 1.1484078805539037e-02 5.8170681214651880e+00 5.8171165813559886e+00 0 1 0 0 0 0 -V -154 0 -8.9986340215037180e-04 6.7085770245716900e-04 1.8873921422629708e-01 1.8874257936079455e-01 0 2 0 -P 484 22 -5.9132218144870774e-01 4.5823878854928546e-01 1.3682075425726194e+02 1.3682279941674801e+02 0 1 0 0 0 0 -P 485 22 -5.9557876820332156e-01 4.2660844740346221e-01 1.1212230984163310e+02 1.1212470322395373e+02 0 1 0 0 0 0 -V -155 0 -5.1873522246844111e-06 2.7707778595899736e-05 9.6056467932884703e-03 9.6057046240736067e-03 0 2 0 -P 486 22 -5.3358764522310233e-02 1.0089755553224661e-01 2.0124549509027762e+01 2.0124873177632029e+01 0 1 0 0 0 0 -P 487 22 1.3993599204279632e-02 1.0936795908476790e-01 5.2769647303955324e+01 5.2769762494776600e+01 0 1 0 0 0 0 -V -156 0 -3.7961104939160116e-05 2.2238792132853197e-05 1.3680343821661578e-02 1.3680495100296034e-02 0 2 0 -P 488 22 -5.8340790011343790e-02 1.4637676680264345e-02 3.2736459456784488e+01 3.2736514714841775e+01 0 1 0 0 0 0 -P 489 22 -5.0816223291669176e-02 4.9309885767650677e-02 6.6013173261676918e+00 6.6016970692501333e+00 0 1 0 0 0 0 -V -157 0 6.4821581940860607e-05 4.9234301285117272e-04 1.8010279475067351e-02 1.8017257078420904e-02 0 2 0 -P 490 22 -2.5234079465957855e-02 2.3544476449702920e-01 7.9958679452732673e+00 7.9993734250967465e+00 0 1 0 0 0 0 -P 491 22 1.5175635805081697e-01 7.2553702530404074e-01 2.7157572142236390e+01 2.7167685926999180e+01 0 1 0 0 0 0 -V -158 0 1.4804463480565830e-04 1.0651174971634308e-04 1.8034463186217421e-03 1.8139343160849324e-03 0 2 0 -P 492 22 2.4200308501046050e-01 1.0332693936441227e-01 2.2320018200418206e+00 2.2474594710968643e+00 0 1 0 0 0 0 -P 493 22 5.0192199347641360e-02 1.0689500509646421e-01 1.3274551679537445e+00 1.3326976483497788e+00 0 1 0 0 0 0 -V -159 0 2.4952594602505824e-05 3.7777957462761067e-05 5.9919627289598465e-04 6.0271404297856631e-04 0 2 0 -P 494 22 2.1275464521165535e-02 6.8760375565027509e-02 1.4863415101773401e+00 1.4880832367561605e+00 0 1 0 0 0 0 -P 495 22 5.0890506431500629e-02 4.0498121370393020e-02 2.4660776878922408e-01 2.5503986572021459e-01 0 1 0 0 0 0 -V -160 0 2.0236519733306777e-05 3.7771007405603190e-06 1.1559121658481918e-03 1.1570792571236135e-03 0 2 0 -P 496 22 -1.2833830815182560e-02 -2.3124364578967924e-02 1.4876882759176302e-01 1.5110131539335275e-01 0 1 0 0 0 0 -P 497 22 7.0093495982825063e-02 3.3811751864884283e-02 3.1219093548200161e+00 3.1228791767303448e+00 0 1 0 0 0 0 -V -161 0 9.9092870836126360e-05 2.7848331350535774e-04 4.6738600755917839e-03 4.6833068224631591e-03 0 2 0 -P 498 22 2.6456748621759857e-01 6.3513480445463311e-01 1.1741987252901410e+01 1.1762128073690251e+01 0 1 0 0 0 0 -P 499 22 1.5373857476364564e-01 5.4044177273503313e-01 7.9880294607280593e+00 8.0077667001821897e+00 0 1 0 0 0 0 -V -162 0 0 0 0 0 0 3 0 -P 500 111 3.7256730615539213e-01 4.0392989421236170e-01 4.8383474581306611e+00 4.8713233810796961e+00 1.3497999999999999e-01 2 0 0 -212 0 -P 501 111 4.3040406011067917e-01 7.1737842978781352e-01 9.9218515099128535e+00 9.9579735112945826e+00 1.3497999999999999e-01 2 0 0 -213 0 -P 502 111 1.5302824405896340e-01 1.5887887524497102e-01 2.8455533486003191e+00 2.8572808053478687e+00 1.3497999999999999e-01 2 0 0 -214 0 -V -163 0 2.5839849297056158e-04 -2.4440063293579029e-04 2.5294186504828259e-03 2.5543856476549264e-03 0 2 0 -P 503 22 1.0377695069292572e+00 -1.0215680356798684e+00 1.0766543901355142e+01 1.0864577045648971e+01 0 1 0 0 0 0 -P 504 22 6.5234961046689088e-01 -5.7699462341256325e-01 5.7777430561017944e+00 5.8430127187997627e+00 0 1 0 0 0 0 -V -164 0 2.9081685912101332e+01 -1.3235793939462669e+01 2.7971035052250431e+02 2.8244513460775647e+02 0 2 0 -P 505 -211 1.6762062809584813e-01 3.9634778053940575e-04 7.8798055709064896e-01 8.1761236249686153e-01 1.3957000000000000e-01 1 0 0 0 0 -P 506 211 4.6924787248882088e-01 -2.9025094100292242e-01 5.3374797093361082e+00 5.3677377550568766e+00 1.3957000000000000e-01 1 0 0 0 0 -V -165 0 -3.0050263375036868e+00 -5.0546364354167757e+01 1.8214857668293783e+02 1.9090770581995881e+02 0 2 0 -P 507 211 -9.7967500090645355e-03 -8.7693414903352140e-01 3.0997225316964849e+00 3.2244176274885290e+00 1.3957000000000000e-01 1 0 0 0 0 -P 508 -211 -4.6580152179340854e-02 -7.1359516020228234e-02 3.1754285571499852e-01 3.5717662468214256e-01 1.3957000000000000e-01 1 0 0 0 0 -V -166 0 5.6480984727818789e-06 -7.5695882859026960e-05 2.4158929915350398e-04 2.5535755044692415e-04 0 2 0 -P 509 22 -1.5831173828552911e-02 -2.9378876913681856e-01 9.0618464764577900e-01 9.5275027292812764e-01 0 1 0 0 0 0 -P 510 22 3.9026217408659976e-02 -1.7071480593394573e-02 8.5950023758604277e-02 9.5926470168474803e-02 0 1 0 0 0 0 -V -167 0 -1.3980777099787572e-04 -1.7277007798433808e-04 1.4734431911646548e-04 2.6792598878135266e-04 0 2 0 -P 511 22 -1.2336930388478158e-01 -1.2478121246765621e-01 1.7383616081680370e-01 2.4700070229341370e-01 0 1 0 0 0 0 -P 512 22 -6.0123017804104317e-01 -7.7065620210665875e-01 5.8982394573139763e-01 1.1416133302440359e+00 0 1 0 0 0 0 -V -168 0 -2.8186737865916890e-04 -3.8046149041595802e-04 1.2333062138451006e-04 4.9228004617499265e-04 0 2 0 -P 513 22 -4.8768644239564540e-01 -5.8187949922834425e-01 1.4921470252584854e-01 7.7374856715125973e-01 0 1 0 0 0 0 -P 514 22 -2.1530788834862755e-01 -3.6701452356081865e-01 1.5837934419538133e-01 4.5402771276374626e-01 0 1 0 0 0 0 -V -169 0 -3.4658007413822462e-04 -5.2006713158035483e-04 -6.2006088942802176e-04 8.8139953703405920e-04 0 2 0 -P 515 22 -1.0775610701610787e+00 -1.6290514307907258e+00 -1.9570560690361336e+00 2.7649620036157683e+00 0 1 0 0 0 0 -P 516 22 -2.4453684219177260e-02 -2.4597163101588097e-02 -1.4540972319744369e-02 3.7609081091414698e-02 0 1 0 0 0 0 -V -170 0 -3.2936317532428194e-06 1.0990395558401315e-06 -2.4129875422404844e-06 4.5736236017871529e-06 0 2 0 -P 517 22 -1.1277518702680793e-01 -2.8406275204800626e-02 -9.5641457125978296e-02 1.5057372812387532e-01 0 1 0 0 0 0 -P 518 22 -1.4222141692334364e-01 1.1349513010492379e-01 -9.1174700460411068e-02 2.0352125685849817e-01 0 1 0 0 0 0 -V -171 0 -2.7271832796903617e+00 6.8567867727248952e+00 -1.2603422001234511e+01 1.5348030492065396e+01 0 2 0 -P 519 -211 -3.7348317016183979e-01 4.9790328223054242e-01 -1.0151019995738311e+00 1.1988783137953889e+00 1.3957000000000000e-01 1 0 0 0 0 -P 520 211 8.5831780283816786e-02 2.2532066093454553e-01 -3.1425194699553238e-01 4.1996495787285959e-01 1.3957000000000000e-01 1 0 0 0 0 -V -172 0 3.1974236939944823e-04 3.3569120093488014e-05 -5.9655894167858436e-04 6.8391161951871296e-04 0 2 0 -P 521 22 1.9897288125315632e-02 1.6243576481117575e-02 -1.3069032052262358e-01 1.3319052417475438e-01 0 1 0 0 0 0 -P 522 22 4.4848871157211562e-01 3.2931344889120584e-02 -7.4320029585512404e-01 8.6866177401965050e-01 0 1 0 0 0 0 -V -173 0 1.9560921305414770e-05 4.4755997995360398e-05 -3.5733999312562766e-03 3.5738070538753140e-03 0 2 0 -P 523 22 5.1120391576480297e-03 1.7106579289460694e-01 -1.2815304960687456e+01 1.2816447669844537e+01 0 1 0 0 0 0 -P 524 22 1.1022477824540093e-01 9.2828442345385592e-02 -8.2544886826868353e+00 8.2557464855730984e+00 0 1 0 0 0 0 -V -174 0 5.5231096619475536e-05 5.6770554839812856e-07 -2.1296451261918815e-03 2.1308725963420996e-03 0 2 0 -P 525 22 9.7472420846883984e-02 6.0287687292296423e-02 -2.6041322266357367e+00 2.6066530516867035e+00 0 1 0 0 0 0 -P 526 22 6.2239828849669235e-02 -5.8646048146063924e-02 -3.5541813861247409e+00 3.5552100473437531e+00 0 1 0 0 0 0 -V -175 0 5.3769907760083674e-05 -1.7797180683467078e-05 -4.7051261694481660e-04 4.7445074797331378e-04 0 2 0 -P 527 22 5.3037730429285952e-02 1.8802208065621582e-02 -7.8476669872783666e-01 7.8678160585350465e-01 0 1 0 0 0 0 -P 528 22 2.6726521743199222e-01 -1.2481855947855978e-01 -2.0180385224711261e+00 2.0394827401615143e+00 0 1 0 0 0 0 -V -176 0 2.9254383701421145e-05 8.8292904820199445e-06 -3.6860838857756469e-04 3.7012148884077044e-04 0 2 0 -P 529 22 2.6766648875802562e-01 3.2296618557240302e-02 -2.7936079938788474e+00 2.8065876156354146e+00 0 1 0 0 0 0 -P 530 22 2.3442063103992584e-02 5.5563101627706384e-02 -8.7439114423986819e-01 8.7646828904996255e-01 0 1 0 0 0 0 -V -177 0 1.1791599049523860e-05 1.5009523055407391e-06 -2.9482632283654421e-04 2.9765838229104172e-04 0 2 0 -P 531 22 -1.5428123271640134e-02 -5.0390978815312924e-02 -2.3845419747560437e-01 2.4420827591911123e-01 0 1 0 0 0 0 -P 532 22 5.6030702577819128e-02 5.5559279973158932e-02 -7.7673543916687360e-01 7.8073312705447295e-01 0 1 0 0 0 0 -V -178 0 3.2723311563305957e-04 1.0507501276705404e-03 -1.2218877606198402e-02 1.2268568468549786e-02 0 2 0 -P 533 22 9.4401096396448003e-02 2.3410779978091101e-01 -3.2781170771961121e+00 3.2878214064519824e+00 0 1 0 0 0 0 -P 534 22 4.9348863218620098e-01 1.6536143709088655e+00 -1.8673672935241342e+01 1.8753240584233389e+01 0 1 0 0 0 0 -V -179 0 1.7342743189630799e-05 8.3072667488889255e-04 -1.7361270833368348e-02 1.7381836821258590e-02 0 2 0 -P 535 22 -3.8453506099116352e-02 1.6907034517103431e-01 -2.8447753591404483e+00 2.8500544376766270e+00 0 1 0 0 0 0 -P 536 22 5.3526856649327458e-02 5.5295120846059187e-01 -1.2244678391462424e+01 1.2257274129008765e+01 0 1 0 0 0 0 -V -180 0 1.0839912633860633e-05 1.0352917101532169e-05 -2.0615493526385194e-04 2.0836977521051438e-04 0 2 0 -P 537 22 -2.8004400899389711e-02 6.2646397586995417e-02 -5.7297679271081736e-01 5.7707124567555479e-01 0 1 0 0 0 0 -P 538 22 8.3568879894528450e-02 -9.5782166655390463e-03 -4.8375603873570577e-01 4.9101466875703387e-01 0 1 0 0 0 0 -V -181 0 0 0 0 0 0 1 0 -P 539 310 4.9782761336762366e-01 5.0953796112831118e-01 -7.5199540324803458e+00 7.5699963900902567e+00 4.9767000000000000e-01 2 0 0 -215 0 -V -182 0 8.7757799449387813e-05 1.3142049408522492e-05 -1.0075220374350941e-03 1.0115039674349258e-03 0 2 0 -P 540 22 2.7618616299673959e-01 8.4600539789103923e-03 -3.7511108822759187e+00 3.7612741485131078e+00 0 1 0 0 0 0 -P 541 22 6.4466287487593510e-01 1.2944043611362591e-01 -6.8208918870357209e+00 6.8525113048702293e+00 0 1 0 0 0 0 -V -183 0 -2.6136531610599666e-05 -7.8566005859732383e-05 -8.0291769723185909e-03 8.0296346065171897e-03 0 2 0 -P 542 22 -7.4716552899476629e-03 4.9182992465864129e-03 -2.7131229900018922e-01 2.7145971872272112e-01 0 1 0 0 0 0 -P 543 22 -1.5136490069141190e-01 -4.8237850605192573e-01 -4.8523487127665760e+01 4.8526120835947800e+01 0 1 0 0 0 0 -V -184 0 3.0415448928081571e-05 -1.1974711988028776e-04 -6.5567445846735376e-03 6.5581791201926257e-03 0 2 0 -P 544 22 1.3556393099985419e-02 -6.1583833433596850e-02 -1.3131200271624943e+00 1.3146332378536185e+00 0 1 0 0 0 0 -P 545 22 5.5354700392647317e-02 -2.0972253436179353e-01 -1.3542239831247805e+01 1.3543976791596672e+01 0 1 0 0 0 0 -V -185 0 -3.1088009732033299e-05 -4.8775051918327588e-05 -3.9681488720718049e-03 3.9686020068036556e-03 0 2 0 -P 546 22 -2.3880690879437318e-02 -6.3743256993639932e-02 -2.3974399240098516e+00 2.3984060705905081e+00 0 1 0 0 0 0 -P 547 22 -2.4101259830608548e-01 -3.5185697101090135e-01 -3.1414181204563874e+01 3.1417076107648302e+01 0 1 0 0 0 0 -V -186 0 4.9936185293428575e-06 -7.8074106944437902e-06 -4.8662299743094315e-04 4.8679322156790417e-04 0 3 0 -P 548 22 -7.6945087736918416e-03 -3.4952019188524259e-03 -3.4251266665547355e+00 3.4251370927082716e+00 0 1 0 0 0 0 -P 549 11 3.7993073439308529e-02 -5.4461719288112491e-02 -1.9843239859383353e+00 1.9854348374518325e+00 5.1000000000000004e-04 1 0 0 0 0 -P 550 -11 4.5152289921856444e-02 -6.0008799552382155e-02 -1.9431576419402867e+00 1.9446083582150522e+00 5.1000000000000004e-04 1 0 0 0 0 -V -187 0 -3.3864176965536530e-06 -5.2595766008398732e-06 -1.0993693802770681e-03 1.0994124317216158e-03 0 2 0 -P 551 22 3.7271706047568784e-02 2.3949720321528242e-03 -4.4966347495633086e+00 4.4967898535447492e+00 0 1 0 0 0 0 -P 552 22 -9.8612167830641417e-02 -9.7665221123780122e-02 -1.5416982381895389e+01 1.5417607097689778e+01 0 1 0 0 0 0 -V -188 0 -4.6383230818921369e-06 5.6203138543926335e-06 2.4584505964231955e-05 2.6813092486387573e-05 0 2 0 -P 553 22 -6.5476919329221801e-03 1.0368115961250647e-01 1.8400605847919932e-01 2.1130755946083196e-01 0 1 0 0 0 0 -P 554 22 -7.3324877363122987e-02 -6.8985724846230816e-03 2.3934255729599138e-01 2.5041762652742228e-01 0 1 0 0 0 0 -V -189 0 -4.9726058411939644e-05 1.4815060441523449e-05 2.8970980996520599e-04 2.9505398883757013e-04 0 2 0 -P 555 22 -1.2227550286838383e-01 -2.9022998042734331e-02 7.1445373986730298e-01 7.2542248340362359e-01 0 1 0 0 0 0 -P 556 22 -2.0031525666097008e-01 1.2513360388871886e-01 1.1649976106813382e+00 1.1886984704989552e+00 0 1 0 0 0 0 -V -190 0 4.1144825782597785e-06 -1.3891011630816487e-06 1.1513855193327027e-04 1.1525421260035257e-04 0 2 0 -P 557 22 9.3887241474577124e-02 3.4826553659132765e-02 1.8468116251162237e+00 1.8495245014911006e+00 0 1 0 0 0 0 -P 558 22 1.0511091056963101e-01 -1.0201083727144152e-01 3.7218980796791872e+00 3.7247791652608369e+00 0 1 0 0 0 0 -V -191 0 0 0 0 0 0 2 0 -P 559 211 2.7960965099084567e-01 -4.5946947899938018e-01 9.9891123687115861e+00 1.0004555935108064e+01 1.3957000000000000e-01 1 0 0 0 0 -P 560 -211 -1.9661017956950227e-01 1.7695947757585628e-01 6.1182368816204669e+00 6.1255426326110252e+00 1.3957000000000000e-01 1 0 0 0 0 -V -192 0 -3.8117306469070869e+00 2.4304278506338637e+00 -3.6687500677897781e+01 3.6965955593079201e+01 0 2 0 -P 561 311 -1.8715297405296983e+01 1.1577069668267237e+01 -1.8242722485100242e+02 1.8375045834320991e+02 4.9767000000000000e-01 2 0 0 -216 0 -P 562 211 -2.8661817689837927e+00 1.9267205095557918e+00 -2.7067714435363381e+01 2.7287504363610779e+01 1.3957000000000000e-01 1 0 0 0 0 -V -193 0 0 0 0 0 0 1 0 -P 563 310 -4.4690407303060170e-01 3.0479452171944948e-01 -6.3255618455358773e+00 6.3681261797769668e+00 4.9767000000000000e-01 2 0 0 -217 0 -V -194 0 -3.1527778681318056e-04 1.6421247362094913e-04 -3.2827057816517463e-03 3.3020747002308936e-03 0 2 0 -P 564 22 -2.9431917300519211e-01 1.7742963419472862e-01 -3.6976505269072799e+00 3.7135864699541625e+00 0 1 0 0 0 0 -P 565 22 -9.4756500827945667e-01 4.6940589272528510e-01 -9.2329793891821001e+00 9.2933379223023156e+00 0 1 0 0 0 0 -V -195 0 0 0 0 0 0 1 0 -P 566 310 -9.3258822715903111e-01 9.6253600257025262e-01 -1.1172693777377827e+01 1.1263789683300944e+01 4.9767000000000000e-01 2 0 0 -218 0 -V -196 0 -6.5693861061007710e-06 3.8405137903525116e-06 -3.9455407529225346e-05 4.0895424224071609e-05 0 2 0 -P 567 22 1.7454219099767260e-02 4.4134073479361206e-02 -2.8161765485158968e-01 2.8558881233405026e-01 0 1 0 0 0 0 -P 568 22 -1.3408943408499285e-01 2.4051772862582772e-02 -4.1888766865607635e-01 4.4048307920190266e-01 0 1 0 0 0 0 -V -197 0 -4.4674668139318611e-05 -7.7777020687567041e-05 3.1331705484877706e-05 9.7992828544315845e-05 0 2 0 -P 569 22 -1.1564015998464669e-01 -2.1072831940990802e-01 1.3246041090625361e-02 2.4073746863995532e-01 0 1 0 0 0 0 -P 570 22 -1.3565519498958165e-01 -2.2676802553368905e-01 1.6299504540646192e-01 3.1047295237937217e-01 0 1 0 0 0 0 -V -198 0 -4.1994933803133881e-06 2.7133704299912539e-05 4.1024696949819633e-05 4.9883066825652891e-05 0 2 0 -P 571 22 -9.1327603613570452e-02 4.7743485030051019e-01 7.5852594270345663e-01 9.0091418748815133e-01 0 1 0 0 0 0 -P 572 22 1.2278616621454207e-02 3.3315291206237996e-02 1.3700714622479238e-02 3.8057622567098298e-02 0 1 0 0 0 0 -V -199 0 2.9180616181076244e-05 4.1500529828774420e-05 -5.5798650462421432e-06 5.4497450772478213e-05 0 2 0 -P 573 22 2.0272262046875161e-01 2.6691626730043372e-01 -7.2202577647962327e-02 3.4286143967836935e-01 0 1 0 0 0 0 -P 574 22 3.4337132127359193e-03 2.6278263694003868e-02 3.2781733576932932e-02 4.2154235676950993e-02 0 1 0 0 0 0 -V -200 0 -2.1589576501028010e-05 1.0363255653369697e-05 8.8651781906517996e-06 2.7912456157651145e-05 0 2 0 -P 575 22 -3.8865980834170609e-02 8.3634946299046928e-02 4.5307746193725261e-02 1.0275291029358541e-01 0 1 0 0 0 0 -P 576 22 -2.1971692730504189e-01 4.0487950901408658e-02 6.0872361489346244e-02 2.3156046015210280e-01 0 1 0 0 0 0 -V -201 0 -5.5928360981912877e-05 5.2110866302600545e-05 8.0897793623986721e-04 8.1290521662359661e-04 0 2 0 -P 577 22 -2.6406015212804240e-01 1.5887290229264120e-01 3.1439228369676688e+00 3.1589902133168448e+00 0 1 0 0 0 0 -P 578 22 -6.5080422478704020e-02 1.4780156799337593e-01 1.6169437091533618e+00 1.6249885302555025e+00 0 1 0 0 0 0 -V -202 0 2.5577613621733289e-05 -2.8987004054158923e-06 8.1130391415557820e-06 2.8246978345620541e-05 0 2 0 -P 579 22 4.1523619773097542e-01 -2.5212523152159896e-02 1.2013330443018896e-01 4.3299974834068033e-01 0 1 0 0 0 0 -P 580 22 -9.6754780728841897e-04 -2.1736372129631837e-02 1.1269797581427982e-02 2.4503354048855987e-02 0 1 0 0 0 0 -V -203 0 -9.7897731963963699e-05 5.6826197138257549e-05 6.6282573799741188e-05 1.3240190736311445e-04 0 2 0 -P 581 22 -3.4078459999881455e-01 2.7082520501007290e-01 2.2460587057992729e-01 4.8982469554328012e-01 0 1 0 0 0 0 -P 582 22 -3.9367645685764430e-01 1.5550365848863854e-01 2.7266784789645226e-01 5.0349805934464398e-01 0 1 0 0 0 0 -V -204 0 1.0051858600423073e-05 -5.4491398591193902e-05 -6.0753769080588552e-06 5.9770613427078703e-05 0 2 0 -P 583 22 5.5789906689558660e-02 -8.2513813655285095e-02 3.4609669383240317e-02 1.0544606368748895e-01 0 1 0 0 0 0 -P 584 22 7.1123513784841722e-03 -2.5848103644413822e-01 -7.2628004232803536e-02 2.6858491905207016e-01 0 1 0 0 0 0 -V -205 0 -3.7511928053308099e-05 -4.4579420963488085e-06 3.2103614254240428e-06 5.2862428077211607e-05 0 2 0 -P 585 22 -9.4580225870565235e-02 4.1353138776709604e-02 4.7263360195968919e-02 1.1353116941803613e-01 0 1 0 0 0 0 -P 586 22 -4.2865418981593975e-02 -5.7687269223843832e-02 -3.5500429863546519e-02 8.0159501591941129e-02 0 1 0 0 0 0 -V -206 0 1.5843923112336528e-01 -6.6444617855219837e-02 -8.9283819735022774e-01 9.2728610338778894e-01 0 2 0 -P 587 321 3.8552872954303585e-01 -2.7291260034918019e-01 -2.9224624236940806e+00 3.0012566145926773e+00 4.9359999999999998e-01 1 0 0 0 0 -P 588 223 4.8704055034862392e-01 -3.5751374929749274e-01 -4.5334150716676227e+00 4.6420521179146625e+00 7.9484028256763894e-01 2 0 0 -219 0 -V -207 0 6.3429893183150927e+00 1.1151044358051168e+01 -3.8271263192902083e+01 4.1193704752906903e+01 0 2 0 -P 589 -211 1.4786817700154750e-01 5.9321872089188232e-01 -1.7433086461786294e+00 1.8526678788513411e+00 1.3957000000000000e-01 1 0 0 0 0 -P 590 211 2.3592192506966145e-01 8.1488461732517337e-02 -5.7233958686926234e-01 6.3980615167547805e-01 1.3957000000000000e-01 1 0 0 0 0 -V -208 0 6.8329392612838751e+00 2.3186263413004074e+01 -1.4290446044786810e+02 1.4509898940858528e+02 0 2 0 -P 591 211 2.4410696810169960e-01 1.3645749729262360e+00 -7.8972249366110239e+00 8.0191829105553794e+00 1.3957000000000000e-01 1 0 0 0 0 -P 592 -211 2.4805451902234124e-01 3.0548024721188094e-01 -2.3958669644380710e+00 2.4319760529309771e+00 1.3957000000000000e-01 1 0 0 0 0 -V -209 0 9.0037533931825553e-01 -4.1316775008103196e-01 -2.4225397489886213e+00 2.6310406502189263e+00 0 2 0 -P 593 -321 2.2771576165304452e+00 -1.0470309598375531e+00 -5.5075471687666786e+00 6.0711150061229135e+00 4.9359999999999998e-01 1 0 0 0 0 -P 594 211 1.0488802059780338e+00 -5.0742444238384699e-01 -1.7288911768918163e+00 2.0895391208722200e+00 1.3957000000000000e-01 1 0 0 0 0 -V -210 0 9.0046542976216415e-01 -4.1320822067561436e-01 -2.4228350260089080e+00 2.6313520343024166e+00 0 2 0 -P 595 22 2.6060905464746402e+00 -1.1260542878061872e+00 -8.4399332612949678e+00 8.9046156374446763e+00 0 1 0 0 0 0 -P 596 22 3.1152346667941438e-01 -1.8460163474866495e-01 -1.1227277133266274e+00 1.1796788343085065e+00 0 1 0 0 0 0 -V -211 0 1.1569229356777967e-05 -1.4660522105994798e-05 -9.0397577689810670e-06 2.2901056712458870e-05 0 2 0 -P 597 22 1.5315840728112597e-02 -6.0222579655507182e-02 -9.2350984073855877e-02 1.1131054908220694e-01 0 1 0 0 0 0 -P 598 22 1.4578394081241561e-01 -1.4392298922477043e-01 -3.3526285435798248e-02 2.0758322678220872e-01 0 1 0 0 0 0 -V -212 0 4.5366605022425090e-05 4.9185550274341878e-05 5.8915367630974652e-04 5.9316907338555658e-04 0 2 0 -P 599 22 6.2412753514439541e-02 9.0724804124025227e-02 5.9158564124042290e-01 6.0174738288291663e-01 0 1 0 0 0 0 -P 600 22 3.1015455264095260e-01 3.1320509008833647e-01 4.2467618168902384e+00 4.2695759981967800e+00 0 1 0 0 0 0 -V -213 0 1.0618662664215143e-05 1.7698716751283111e-05 2.4478578143780885e-04 2.4567696110588694e-04 0 2 0 -P 601 22 2.7037667242088931e-01 3.4218773845439160e-01 4.6801937946366561e+00 4.7004691200659314e+00 0 1 0 0 0 0 -P 602 22 1.6002738768978980e-01 3.7519069133342203e-01 5.2416577152761965e+00 5.2575043912286512e+00 0 1 0 0 0 0 -V -214 0 3.4213984360743327e-05 3.5522065787995497e-05 6.3620750774059183e-04 6.3882952712151966e-04 0 2 0 -P 603 22 1.6633397364096600e-01 9.3159794517856359e-02 2.2056974914033418e+00 2.2139212184910280e+00 0 1 0 0 0 0 -P 604 22 -1.3305729582002584e-02 6.5719080727114673e-02 6.3985585719697713e-01 6.4335958685684069e-01 0 1 0 0 0 0 -V -215 0 2.3355944705345006e+01 2.3905344191100344e+01 -3.5280411502535122e+02 3.5515188864392519e+02 0 2 0 -P 605 -211 -2.6117036784758577e-02 1.4271093127076998e-01 -1.2708986814665231e+00 1.2867446339378819e+00 1.3957000000000000e-01 1 0 0 0 0 -P 606 211 5.2394465015238212e-01 3.6682702985754118e-01 -6.2490553510138218e+00 6.2832517561523735e+00 1.3957000000000000e-01 1 0 0 0 0 -V -216 0 -3.8117306469070869e+00 2.4304278506338637e+00 -3.6687500677897781e+01 3.6965955593079201e+01 0 1 0 -P 607 130 -1.8715297405296983e+01 1.1577069668267237e+01 -1.8242722485100242e+02 1.8375045834320991e+02 4.9767000000000000e-01 1 0 0 0 0 -V -217 0 -8.5683490912819821e+01 5.8437280409922408e+01 -1.2127797744938878e+03 1.2209404983857619e+03 0 2 0 -P 608 111 -3.5967176370115622e-01 3.2878999327079506e-01 -3.3312469013489321e+00 3.3694053118355725e+00 1.3497999999999999e-01 2 0 0 -220 0 -P 609 111 -8.7232309329445451e-02 -2.3995471551345536e-02 -2.9943149441869452e+00 2.9987208679413939e+00 1.3497999999999999e-01 2 0 0 -221 0 -V -218 0 -1.6982282479171256e+00 1.7527626680229260e+00 -2.0345296697419474e+01 2.0511180885320400e+01 0 2 0 -P 610 111 -1.6065970337379756e-01 2.2472617477739559e-01 -1.4854185479765942e+00 1.5169051575464865e+00 1.3497999999999999e-01 2 0 0 -222 0 -P 611 111 -7.7192852378523358e-01 7.3780982779285698e-01 -9.6872752294012336e+00 9.7468845257544565e+00 1.3497999999999999e-01 2 0 0 -223 0 -V -219 0 1.5843923112336528e-01 -6.6444617855219837e-02 -8.9283819735022774e-01 9.2728610338778894e-01 0 3 0 -P 612 -211 3.2073970588280426e-01 -2.2344149637641733e-01 -1.7720504229152780e+00 1.8200116888325020e+00 1.3957000000000000e-01 1 0 0 0 0 -P 613 211 1.0327478319521827e-01 -2.9696360012404494e-01 -1.9981974224513948e+00 2.0275911285646449e+00 1.3957000000000000e-01 1 0 0 0 0 -P 614 111 6.3026061270601327e-02 1.6289134720296952e-01 -7.6316722630094946e-01 7.9444930051751483e-01 1.3497999999999999e-01 2 0 0 -224 0 -V -220 0 -8.5683537123124310e+01 5.8437322652564823e+01 -1.2127802024894916e+03 1.2209409312839239e+03 0 2 0 -P 615 22 -3.2562028377162922e-01 2.7551611057831837e-01 -3.1161850712685530e+00 3.1452419771440030e+00 0 1 0 0 0 0 -P 616 22 -3.4051479929526993e-02 5.3273882692476640e-02 -2.1506183008037907e-01 2.2416333469156946e-01 0 1 0 0 0 0 -V -221 0 -8.5683519961278023e+01 5.8437272419403094e+01 -1.2127807716041691e+03 1.2209414969632207e+03 0 2 0 -P 617 22 -1.0095930423421715e-01 2.7455429715276092e-02 -2.2937984531900248e+00 2.2961833388449753e+00 0 1 0 0 0 0 -P 618 22 1.3726994904771693e-02 -5.1450901266621621e-02 -7.0051649099692037e-01 7.0253752909641898e-01 0 1 0 0 0 0 -V -222 0 -1.6982374833223159e+00 1.7527755862422265e+00 -2.0345382085615018e+01 2.0511268083500596e+01 0 2 0 -P 619 22 -7.3037469158247367e-02 2.0430474030481502e-01 -1.0086454152325899e+00 1.0317172444433522e+00 0 1 0 0 0 0 -P 620 22 -8.7622234215550196e-02 2.0421434472580581e-02 -4.7677313274400424e-01 4.8518791310313425e-01 0 1 0 0 0 0 -V -223 0 -1.6983640114226690e+00 1.7528924308773342e+00 -2.0347000454184229e+01 2.0512895125914664e+01 0 2 0 -P 621 22 -6.7157134859009704e-01 5.7128422133885581e-01 -7.8635746548436938e+00 7.9128490501271402e+00 0 1 0 0 0 0 -P 622 22 -1.0035717519513651e-01 1.6652560645400125e-01 -1.8237005745575405e+00 1.8340354756273183e+00 0 1 0 0 0 0 -V -224 0 1.5844801754335897e-01 -6.6421909284177794e-02 -8.9294458997005066e-01 9.2739685702013275e-01 0 2 0 -P 623 22 -8.7214544347417808e-03 -2.0043855121139119e-02 -1.1849558188276470e-01 1.2049490786464623e-01 0 1 0 0 0 0 -P 624 22 7.1747515705343115e-02 1.8293520232410862e-01 -6.4467164441818470e-01 6.7395439265287005e-01 0 1 0 0 0 0 -BlockType GenEvent -E 3 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 102 0 0 -V -1 0 0 0 0 0 1 3 0 -P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -1 0 -P 3 21 5.4969932515599695e-01 2.2550476873687056e-01 5.5705531929900893e+01 5.5708700481541165e+01 0 3 0 0 -3 0 -P 14 2101 -9.4236956683619111e-01 2.1652326170818870e-01 6.5343226954385455e+03 6.5343227926610143e+03 5.7933000000000001e-01 2 0 0 -9 0 -P 15 2 3.9267024168019415e-01 -4.4202803044505923e-01 2.0241152885643043e+01 2.0252475128694172e+01 3.3000000000000002e-01 2 0 0 -11 0 -V -2 0 0 0 0 0 1 2 0 -P 2 2212 0 0 -6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -2 0 -P 4 1 -2.4852244145458005e+00 -5.1082941165122786e-01 -1.2650126797311423e+03 1.2650152240853247e+03 0 3 0 0 -4 0 -P 29 2203 2.4852244145458005e+00 5.1082941165122786e-01 -5.5694416402834304e+03 5.5694422716067393e+03 7.7132999999999996e-01 2 0 0 -11 0 -V -3 0 0 0 0 0 0 4 0 -P 13 2 -1.0608618276380355e+00 5.3963075851129338e-01 6.2467108078944122e-01 1.3841037287882854e+00 3.3000000000000002e-01 2 0 0 -9 0 -P 16 21 1.2784868462321570e+00 -8.7405515584658322e-01 5.0158545116382854e+01 5.0182448617257258e+01 0 2 0 0 -11 0 -P 17 21 -1.6686180664312625e-01 9.4299371379547992e-01 -4.2196845113635542e+00 4.3269871021549715e+00 0 2 0 0 -11 0 -P 5 -2 5.1478982848448318e-01 -3.7127142663721519e-01 4.3686552602229858e+00 4.4145214715099570e+00 0 3 0 0 -5 0 -V -4 0 0 0 0 0 0 7 0 -P 6 1 2.5722674946760922e+00 4.3788611284604106e-01 -4.6269073817910544e+02 4.6269809541539877e+02 0 3 0 0 -5 0 -P 23 21 -6.2117781148280848e-01 -2.8319314770868491e+00 -4.2435587401747085e+01 4.2534512761940860e+01 0 2 0 0 -11 0 -P 24 21 -1.0853374093767046e-01 2.4951738842432462e-02 -1.2807245422014727e+01 1.2807729598250830e+01 0 2 0 0 -11 0 -P 25 21 -4.7236154263853830e-02 -2.8124786400644658e-01 -7.3009915305624826e+00 7.3065593095945598e+00 0 2 0 0 -11 0 -P 26 21 -3.6487430314729372e+00 1.0613239469355105e+00 -1.4428971573317793e+02 1.4433974435543163e+02 0 2 0 0 -11 0 -P 27 21 -8.5735899903395096e-01 1.3023755707753566e+00 -8.6410163495004923e+01 8.6424230409151221e+01 0 2 0 0 -11 0 -P 28 21 2.0970411268715061e-01 -2.3598056104377471e-01 -5.0430489298734267e+02 5.0430499179922384e+02 0 2 0 0 -11 0 -V -5 0 0 0 0 0 0 2 0 -P 7 22 6.1062538570560743e-01 4.7283777698592582e+00 -5.7841992636145454e+00 7.4958242253514973e+00 0 3 0 0 -6 0 -P 8 -24 2.4764319374549677e+00 -4.6617630836504320e+00 -4.5253788365526782e+02 4.5961679266155716e+02 8.0182262397111174e+01 3 0 0 -7 0 -V -6 0 0 0 0 0 0 1 0 -P 9 22 6.1062538570560743e-01 4.7283777698592582e+00 -5.7841992636145454e+00 7.4958242253514982e+00 0 1 0 0 0 0 -V -7 0 0 0 0 0 0 1 0 -P 10 -24 2.4764319374549677e+00 -4.6617630836504320e+00 -4.5253788365526782e+02 4.5961679266155716e+02 8.0182262397111174e+01 2 0 0 -8 0 -V -8 0 0 0 0 0 0 2 0 -P 11 13 1.1665477362123605e+01 3.4513182507826755e+01 -2.8476888728061687e+02 2.8708983516659214e+02 1.0566000000000000e-01 1 0 0 0 0 -P 12 -14 -9.1890454246686382e+00 -3.9174945591477190e+01 -1.6776899637465104e+02 1.7252695749496510e+02 0 1 0 0 0 0 -V -9 0 0 0 0 0 0 1 0 -P 35 92 -2.0032313944742266e+00 7.5615402021948208e-01 6.5349473665193345e+03 6.5357068963898028e+03 9.9614093552669928e+01 2 0 0 -10 0 -V -10 0 0 0 0 0 0 9 0 -P 36 321 -2.7347780861062648e-01 1.7597531166764313e-01 9.6890202910053802e-01 1.1349755610206478e+00 4.9359999999999998e-01 1 0 0 0 0 -P 37 333 -1.1091211096030533e+00 1.4407005271255402e-01 2.4365019278869586e+00 2.8692745467802063e+00 1.0223937423264025e+00 2 0 0 -17 0 -P 38 -321 5.7487835922576980e-01 -1.6335008561432823e-01 3.0727085777785232e+00 3.1689662892385013e+00 4.9359999999999998e-01 1 0 0 0 0 -P 39 323 -4.9346996389094194e-01 1.1818828175705887e-01 1.1352455312350665e+01 1.1390232114301151e+01 7.7567062825092892e-01 2 0 0 -18 0 -P 40 333 4.6705005789470379e-02 -1.1036790308186785e-02 6.0989748896587884e+01 6.0998269072082245e+01 1.0183595401409025e+00 2 0 0 -19 0 -P 41 -313 6.6116839338003747e-02 2.0047724383885190e-01 1.0174249585391416e+02 1.0174747600392061e+02 9.8430077868461274e-01 2 0 0 -20 0 -P 42 -211 6.6195102743584266e-01 2.3352413161979789e-03 1.9139236560226081e+01 1.9151189010327013e+01 1.3957000000000000e-01 1 0 0 0 0 -P 43 213 -1.1330549383455299e+00 2.6772966756529654e-01 8.9903421865118207e+02 8.9903532297395714e+02 7.9382395898092395e-01 2 0 0 -21 0 -P 44 2112 -3.4375880581316148e-01 2.1765097284394738e-02 5.4362110987103097e+03 5.4362111908181760e+03 9.3957000000000002e-01 1 0 0 0 0 -V -11 0 0 0 0 0 5 1 0 -P 18 21 9.3397002995552358e-01 2.9110210203548919e+00 1.9719566949430803e+01 1.9955141294184987e+01 0 2 0 0 -11 0 -P 19 21 -2.1357165232265416e+00 4.1733949000175592e+00 -2.5122523216850832e+00 5.3188271063165358e+00 0 2 0 0 -11 0 -P 20 21 2.1357165232265416e+00 -4.1733949000175592e+00 -7.2379746050422105e+00 8.6236179438975249e+00 0 2 0 0 -11 0 -P 21 21 2.6814323415953143e+00 -1.7234320325764891e+00 -3.0705360378789067e+01 3.0870365293672400e+01 0 2 0 0 -11 0 -P 22 21 -2.6814323415953143e+00 1.7234320325764891e+00 -1.0476850460974710e+02 1.0481698266758141e+02 0 2 0 0 -11 0 -P 45 92 -1.4985589873352057e-01 2.0882523139261866e+00 -6.4263147483284502e+03 6.6115068849940917e+03 1.5538653939405463e+03 2 0 0 -12 0 -V -12 0 0 0 0 0 0 44 0 -P 46 211 1.3949741497349764e+00 -8.1413890613658435e-01 3.1237954613440834e+01 3.1279994617218282e+01 1.3957000000000000e-01 1 0 0 0 0 -P 47 113 6.8753804353602468e-02 -1.4130704072596839e-01 2.6547465088091574e+01 2.6560329224240288e+01 8.1147466457031847e-01 2 0 0 -22 0 -P 48 -211 -3.3705321336487631e-01 -1.6764450883023393e-01 9.4322808686628328e+00 9.4408215596006979e+00 1.3957000000000000e-01 1 0 0 0 0 -P 49 113 5.9981396172818402e-01 -2.6687872216516484e-01 2.2150499557325571e+00 2.4423648313647601e+00 7.9227433510622125e-01 2 0 0 -23 0 -P 50 323 -3.0748077012799063e-01 -6.1187613112430157e-02 -1.4211926385251549e-02 9.7630268316421653e-01 9.2448721046057525e-01 2 0 0 -24 0 -P 51 -313 1.4293786442054000e-02 4.6772668279335211e-01 -3.8804113875347573e-01 1.1164769507355792e+00 9.3646798879139526e-01 2 0 0 -25 0 -P 52 111 8.0828878413878216e-02 -1.3461691433235596e-02 -7.1537625213290668e-01 7.3259627847649700e-01 1.3497999999999999e-01 2 0 0 -26 0 -P 53 113 -2.3019258837112086e-01 1.4760214205834568e-01 -1.6237023486867372e+00 1.8378775046348748e+00 8.1646150235689630e-01 2 0 0 -27 0 -P 54 223 3.6047327332852880e-01 7.5799280465086738e-01 8.7170208350794642e-01 1.4416890830588578e+00 7.8365095363453574e-01 2 0 0 -28 0 -P 55 113 1.2071093866836292e-01 1.1591242726102904e-01 9.8276244825033521e-01 1.2590091097043403e+00 7.6894413784082705e-01 2 0 0 -29 0 -P 56 -213 8.6853791013771414e-02 1.0081227171470937e+00 7.4151556572422583e+00 7.5162670018422455e+00 6.9705181156703200e-01 2 0 0 -30 0 -P 57 323 1.7595879809624551e-01 4.2346453954444735e-01 1.9254698599629185e+00 2.1644899849972110e+00 8.7595604835439056e-01 2 0 0 -31 0 -P 58 -321 1.9281037659969705e-01 1.9746412913081476e-01 6.1305191305880840e+00 6.1565472217895207e+00 4.9359999999999998e-01 1 0 0 0 0 -P 59 223 -2.6288378130564161e-01 7.8988896286242360e-01 6.4711248501236418e-01 1.3136617569823170e+00 7.8353059121744273e-01 2 0 0 -32 0 -P 60 213 1.3477705105748747e-01 1.0791582261049506e+00 5.7410962076755911e-01 1.3686690060033124e+00 6.0075424332623606e-01 2 0 0 -33 0 -P 61 -211 -1.0477191658271894e+00 1.1109784504404854e+00 -1.2067512533016968e-01 1.5381907679342692e+00 1.3957000000000000e-01 1 0 0 0 0 -P 62 213 -9.0771555535794080e-02 5.8156740475700852e-01 -1.5429989954783372e+00 1.7635958777355596e+00 6.1884117376634729e-01 2 0 0 -34 0 -P 63 221 1.9394945996907104e-01 -2.7378498648517408e-01 -2.6641812525406994e-01 6.9516525503715665e-01 5.4744999999999999e-01 2 0 0 -35 0 -P 64 -213 2.3145858795471871e-01 2.7432639064021358e-01 -1.3070279086378056e+00 1.5830182128523671e+00 8.1779989100299288e-01 2 0 0 -36 0 -P 65 213 -4.5215145872547829e-01 2.8618967307221177e-01 -1.2291118677569723e+00 1.5726626222361686e+00 8.2231762070197112e-01 2 0 0 -37 0 -P 66 2114 9.5337951957865841e-01 -6.6930286811799566e-01 -3.0888059546382411e+00 3.5274937030638558e+00 1.2432179061304942e+00 2 0 0 -38 0 -P 67 211 -1.3638801371095294e-01 -6.4982930487435098e-01 -8.8570463039764313e-01 1.1157205263708860e+00 1.3957000000000000e-01 1 0 0 0 0 -P 68 -2212 8.4949812677802405e-01 -2.0925593127370514e+00 -5.2863706614781849e+00 5.8246473634168812e+00 9.3827000000000005e-01 1 0 0 0 0 -P 69 -211 1.1996322072747415e-01 2.3947821917494630e-01 -1.0577767107781229e+00 1.1000510654288269e+00 1.3957000000000000e-01 1 0 0 0 0 -P 70 323 1.4839074584839513e+00 -9.6300995788224397e-01 -1.5468440231889129e+01 1.5599973376532240e+01 9.7834381311676155e-01 2 0 0 -39 0 -P 71 -321 -2.7807528173586266e-01 3.2958209552231060e-01 -8.8436515986138815e+00 8.8679064484052397e+00 4.9359999999999998e-01 1 0 0 0 0 -P 72 213 4.8061490063831430e-01 -1.4112979134958886e-01 -1.3685006725010053e+01 1.3716801676932008e+01 7.8761086838132732e-01 2 0 0 -40 0 -P 73 111 -6.6907029234828486e-01 1.7831713785343023e-01 -1.8676644255472887e+01 1.8689962875930050e+01 1.3497999999999999e-01 2 0 0 -41 0 -P 74 -213 -3.4452308143729315e-01 -1.7121136884034183e-01 -1.7652850045181019e+01 1.7672257910595317e+01 7.3319537265859602e-01 2 0 0 -42 0 -P 75 2212 -3.9310532187388653e-01 8.2724580957524885e-02 -3.9775536449638281e+01 3.9788629350604467e+01 9.3827000000000005e-01 1 0 0 0 0 -P 76 -2212 -6.6472940215998422e-01 6.9112739079230504e-02 -2.6053725752692522e+01 2.6079179778862152e+01 9.3827000000000005e-01 1 0 0 0 0 -P 77 3224 -4.0748859480073829e-01 -1.6567442175761489e+00 -3.4492491111585458e+01 3.4561985780104671e+01 1.3740704581611196e+00 2 0 0 -43 0 -P 78 311 -2.7836629784373346e-01 5.3322922791229938e-02 -1.9006813991509159e+01 1.9015440690833291e+01 4.9767000000000000e-01 2 0 0 -44 0 -P 79 -2112 -1.8554501644645200e+00 2.6350454241754517e-01 -6.6852567158069846e+01 6.6885429335288151e+01 9.3957000000000002e-01 1 0 0 0 0 -P 80 -211 -4.2046149174458702e-01 -6.9882022956308021e-02 -4.4649768696748026e+01 4.4652021184053616e+01 1.3957000000000000e-01 1 0 0 0 0 -P 81 211 -1.2259199970940475e+00 5.3487296324306122e-01 -3.4837579454291500e+01 3.4863525222574047e+01 1.3957000000000000e-01 1 0 0 0 0 -P 82 311 -1.7383101241416014e-02 2.3283172203271379e-01 -6.0426993477096801e+01 6.0429493865934312e+01 4.9767000000000000e-01 2 0 0 -45 0 -P 83 -323 -5.6275410327378561e-01 -7.3372721057032519e-02 -1.4782442541338469e+02 1.4782894973592141e+02 1.0077477319741224e+00 2 0 0 -46 0 -P 84 211 -1.3376613799881737e-01 -9.1221013772773460e-02 -7.1076645245746004e+00 7.1108782461679887e+00 1.3957000000000000e-01 1 0 0 0 0 -P 85 113 1.7962314176801067e-02 8.3402302003156015e-01 -6.4704726517325719e+02 6.4704829538644378e+02 7.9829647914481627e-01 2 0 0 -47 0 -P 86 -211 2.6669980751781586e-01 -2.7900006105441300e-01 -5.1992006516225081e+02 5.1992022715790301e+02 1.3957000000000000e-01 1 0 0 0 0 -P 87 213 3.4004774827278034e-01 1.9424841399564963e-01 -1.0234108895905553e+03 1.0234111585835141e+03 6.3025058636637177e-01 2 0 0 -48 0 -P 88 2214 5.6694851511787103e-01 9.8756119003734349e-02 -8.8006311174153848e+02 8.8006411796473139e+02 1.1999572706375610e+00 2 0 0 -49 0 -P 89 223 1.2311994476002099e+00 3.3274939646704554e-01 -2.8709726179406398e+03 2.8709730082148681e+03 7.8381066483662754e-01 2 0 0 -50 0 -V -13 0 0 0 0 0 3 1 0 -P 31 21 -9.3397002995552358e-01 -2.9110210203548919e+00 1.0151020105427864e+02 1.0155622709355579e+02 0 2 0 0 -13 0 -P 32 21 3.0018432040494889e+00 -2.3510280488458859e+00 2.9747792961823656e+01 2.9991158390560429e+01 0 2 0 0 -13 0 -P 30 21 -3.0018432040494889e+00 2.3510280488458859e+00 2.3572952493951814e+02 2.3576035994992682e+02 0 2 0 0 -13 0 -P 90 92 -9.3397002995552336e-01 -2.9110210203548919e+00 3.6698751895562049e+02 3.6730774543404306e+02 1.5026458106954815e+01 2 0 0 -14 0 -V -14 0 0 0 0 0 0 11 0 -P 91 211 -8.2406320068481598e-01 -1.4474846551483079e-02 1.5925371343061592e+01 1.5947295127362915e+01 1.3957000000000000e-01 1 0 0 0 0 -P 92 -211 -1.2971269419881442e+00 8.9201364509882908e-01 8.3237290846445731e+01 8.3252293024801261e+01 1.3957000000000000e-01 1 0 0 0 0 -P 93 -311 -2.0800376351271022e-02 -2.1447848449823942e-01 2.1067216961652552e+01 2.1074196060922706e+01 4.9767000000000000e-01 2 0 0 -51 0 -P 94 313 -3.6169721163227725e-01 5.4167305000773069e-01 5.0328382832671906e+01 5.0338889823024189e+01 7.9591173918767333e-01 2 0 0 -52 0 -P 95 213 -8.9383792146133589e-01 -3.4747707496988950e-01 5.5172517965309702e+01 5.5185392155323349e+01 7.0787156810377283e-01 2 0 0 -53 0 -P 96 113 -1.2750819481863768e-01 -1.5623904654280926e-01 3.4052323819224185e+01 3.4060522483400433e+01 7.1955915219897681e-01 2 0 0 -54 0 -P 97 -211 -5.7174412643767436e-01 -9.4910638921379709e-01 3.9932536181067732e+01 3.9948149142624189e+01 1.3957000000000000e-01 1 0 0 0 0 -P 98 111 4.2301035938398712e-01 -2.4488475692500022e-01 3.0794121251526874e+00 3.1208820780762889e+00 1.3497999999999999e-01 2 0 0 -55 0 -P 99 -2112 1.1392327237977038e+00 -1.4946995580917366e+00 2.4907483094827445e+01 2.4995949349283496e+01 9.3957000000000002e-01 1 0 0 0 0 -P 100 2112 5.3941297703374469e-01 -8.0160103815638795e-01 1.3991639212989071e+01 1.4056396772840444e+01 9.3957000000000002e-01 1 0 0 0 0 -P 101 223 1.0611518832031974e+00 -1.2174652051210852e-01 2.5293344573217894e+01 2.5327779416383844e+01 7.7605729877600649e-01 2 0 0 -56 0 -V -15 0 0 0 0 0 2 1 0 -P 33 21 1.0190408349472695e+00 -2.8843457133167565e+00 -9.8491291741771736e+00 1.0313255543563667e+01 0 2 0 0 -15 0 -P 34 21 -1.0190408349472695e+00 2.8843457133167565e+00 -7.4489250551266313e+00 8.0526007534281785e+00 0 2 0 0 -15 0 -P 102 92 0 0 -1.7298054229303805e+01 1.8365856296991847e+01 6.1710612865065464e+00 2 0 0 -16 0 -V -16 0 0 0 0 0 0 7 0 -P 103 113 2.5426454423078015e-01 -1.2821686593910947e-01 -3.6908260328296461e+00 3.7716166626566090e+00 7.2236100548951021e-01 2 0 0 -57 0 -P 104 223 -7.8492867790755053e-02 4.3394394227840256e-02 -9.8224104521300815e-01 1.2585985464264791e+00 7.8181111940243286e-01 2 0 0 -58 0 -P 105 213 1.7802555916136972e-01 3.2682068270571213e-01 -2.6219971626667316e+00 2.7700960092936304e+00 8.1243948778549657e-01 2 0 0 -59 0 -P 106 111 1.9399017214205891e-01 -8.3030313783991927e-01 -1.7838453636238722e+00 1.9817566372581945e+00 1.3497999999999999e-01 2 0 0 -60 0 -P 107 -211 -2.8807161077252330e-01 5.2270945259205381e-01 -3.1028538235201237e+00 3.1628139464400387e+00 1.3957000000000000e-01 1 0 0 0 0 -P 108 223 2.5327277586763380e-01 -1.3809611761063298e-01 -2.5208029155085732e+00 2.6552334264970665e+00 7.8268740481497745e-01 2 0 0 -61 0 -P 109 113 -5.1298857283856425e-01 2.0369159186405553e-01 -2.5954878859418495e+00 2.7657410684198265e+00 7.7981969134800333e-01 2 0 0 -62 0 -V -17 0 0 0 0 0 0 2 0 -P 110 321 -5.3517797822608215e-01 -4.1546823888825380e-03 1.3908700471651065e+00 1.5699022829032940e+00 4.9359999999999998e-01 1 0 0 0 0 -P 111 -321 -5.7394313137697117e-01 1.4822473510143655e-01 1.0456318807218525e+00 1.2993722638769123e+00 4.9359999999999998e-01 1 0 0 0 0 -V -18 0 0 0 0 0 0 2 0 -P 112 311 -1.6481661079814763e-01 7.9549466215372497e-02 8.2576997208588896e+00 8.2747068069837457e+00 4.9767000000000000e-01 2 0 0 -63 0 -P 113 211 -3.2865335309279431e-01 3.8638815541686355e-02 3.0947555914917761e+00 3.1155253073174056e+00 1.3957000000000000e-01 1 0 0 0 0 -V -19 0 0 0 0 0 0 2 0 -P 114 321 -8.9052577900346819e-02 3.8384145837852435e-02 3.2135901794444422e+01 3.2139838655576021e+01 4.9359999999999998e-01 1 0 0 0 0 -P 115 -321 1.3575758368981719e-01 -4.9420936146039221e-02 2.8853847102143465e+01 2.8858430416506227e+01 4.9359999999999998e-01 1 0 0 0 0 -V -20 0 0 0 0 0 0 2 0 -P 116 -311 -2.0774100376841340e-01 2.8253422511277831e-01 4.5249454551591235e+01 4.5253550076855042e+01 4.9767000000000000e-01 2 0 0 -64 0 -P 117 111 2.7385784310641714e-01 -8.2056981273926410e-02 5.6493041302322936e+01 5.6493925927065568e+01 1.3497999999999999e-01 2 0 0 -65 0 -V -21 0 0 0 0 0 0 2 0 -P 118 211 -1.0330625473694905e+00 4.3248162283071701e-01 6.3795354712657922e+02 6.3795454542604386e+02 1.3957000000000000e-01 1 0 0 0 0 -P 119 111 -9.9992390976039472e-02 -1.6475195526542039e-01 2.6108067152460302e+02 2.6108077754791344e+02 1.3497999999999999e-01 2 0 0 -66 0 -V -22 0 0 0 0 0 0 2 0 -P 120 -211 2.5499953205520359e-01 -1.0027654595046133e-02 2.3322262674548515e+01 2.3324076431034285e+01 1.3957000000000000e-01 1 0 0 0 0 -P 121 211 -1.8624572770160111e-01 -1.3127938613092227e-01 3.2252024135430615e+00 3.2362527932060021e+00 1.3957000000000000e-01 1 0 0 0 0 -V -23 0 0 0 0 0 0 2 0 -P 122 211 7.6228828054477105e-01 -2.1517928961636448e-01 1.6414979312633347e+00 1.8279444172560420e+00 1.3957000000000000e-01 1 0 0 0 0 -P 123 -211 -1.6247431881658703e-01 -5.1699432548800363e-02 5.7355202446922249e-01 6.1442041410871839e-01 1.3957000000000000e-01 1 0 0 0 0 -V -24 0 0 0 0 0 0 2 0 -P 124 311 -4.4770508064804587e-01 -2.2677035333779219e-01 -7.6463961108518649e-02 7.1090561865793589e-01 4.9767000000000000e-01 2 0 0 -67 0 -P 125 211 1.4022431052005524e-01 1.6558274022536204e-01 6.2252034723267097e-02 2.6539706450628059e-01 1.3957000000000000e-01 1 0 0 0 0 -V -25 0 0 0 0 0 0 2 0 -P 126 -321 -2.5986605631982164e-02 2.9198614472084311e-01 9.5408561624206661e-02 5.8195787305647173e-01 4.9359999999999998e-01 1 0 0 0 0 -P 127 211 4.0280392074036164e-02 1.7574053807250894e-01 -4.8344970037768237e-01 5.3451907767910722e-01 1.3957000000000000e-01 1 0 0 0 0 -V -26 0 4.6370571701477952e-05 -7.7228131835718235e-06 -4.1040289614321631e-04 4.2028182162054536e-04 0 2 0 -P 128 22 -1.6794961432842453e-02 2.2822192504643863e-02 -3.8769689788982341e-02 4.8020954244825338e-02 0 1 0 0 0 0 -P 129 22 9.7623839846720670e-02 -3.6283883937879464e-02 -6.7660656234392436e-01 6.8457532423167167e-01 0 1 0 0 0 0 -V -27 0 0 0 0 0 0 2 0 -P 130 -211 -8.0905401518794953e-02 2.9454613008823682e-01 -1.9743357093526082e-01 3.8956758922826545e-01 1.3957000000000000e-01 1 0 0 0 0 -P 131 211 -1.4928718685232592e-01 -1.4694398802989114e-01 -1.4262687777514764e+00 1.4483099154066095e+00 1.3957000000000000e-01 1 0 0 0 0 -V -28 0 0 0 0 0 0 3 0 -P 132 211 1.9697316487609509e-01 3.5057333972336180e-01 6.7516622935079007e-01 7.9814116317971096e-01 1.3957000000000000e-01 1 0 0 0 0 -P 133 -211 -3.8819295397041619e-02 1.4724962955523235e-01 1.9980284787495695e-01 2.8738537544248732e-01 1.3957000000000000e-01 1 0 0 0 0 -P 134 111 2.0231940384947528e-01 2.6016983537227312e-01 -3.2669937178005843e-03 3.5616254443665946e-01 1.3497999999999999e-01 2 0 0 -68 0 -V -29 0 0 0 0 0 0 2 0 -P 135 -211 1.1488257758393901e-01 2.7148426262030395e-01 9.9743688408424791e-01 1.0494102315655771e+00 1.3957000000000000e-01 1 0 0 0 0 -P 136 211 5.8283610844239242e-03 -1.5557183535927488e-01 -1.4674435833912692e-02 2.0959887813876332e-01 1.3957000000000000e-01 1 0 0 0 0 -V -30 0 0 0 0 0 0 2 0 -P 137 -211 -8.4860032327779208e-03 1.2798646073174491e-01 3.8322629520223433e-01 4.2754499718268074e-01 1.3957000000000000e-01 1 0 0 0 0 -P 138 111 9.5339794246549328e-02 8.8013625641534876e-01 7.0319293620400245e+00 7.0887220046595649e+00 1.3497999999999999e-01 2 0 0 -69 0 -V -31 0 0 0 0 0 0 2 0 -P 139 311 6.6329685576106023e-02 5.2124166663591132e-01 1.7596312276628496e+00 1.9026481515225586e+00 4.9767000000000000e-01 2 0 0 -70 0 -P 140 211 1.0962911252013950e-01 -9.7777127091463953e-02 1.6583863230006918e-01 2.6184183347465939e-01 1.3957000000000000e-01 1 0 0 0 0 -V -32 0 0 0 0 0 0 3 0 -P 141 211 -1.8053057003619555e-01 4.4658535224822332e-01 1.2486955297486922e-01 5.1681907251997494e-01 1.3957000000000000e-01 1 0 0 0 0 -P 142 -211 -2.2545152457920553e-01 2.9947362949028894e-01 3.5940892111084544e-01 5.3774287737657378e-01 1.3957000000000000e-01 1 0 0 0 0 -P 143 111 1.4309831330975950e-01 4.3829981123911323e-02 1.6283401092664959e-01 2.5909980708576519e-01 1.3497999999999999e-01 2 0 0 -71 0 -V -33 0 0 0 0 0 0 2 0 -P 144 211 6.6134181730062705e-02 1.0799589201098942e+00 4.9977866601512050e-01 1.1999764576948531e+00 1.3957000000000000e-01 1 0 0 0 0 -P 145 111 6.8642869327424763e-02 -8.0069400494364870e-04 7.4330954752438616e-02 1.6869254830845534e-01 1.3497999999999999e-01 2 0 0 -72 0 -V -34 0 0 0 0 0 0 2 0 -P 146 211 -4.0874140835117249e-02 -5.3240879661743137e-02 -5.8665739429170261e-01 6.0675528002094503e-01 1.3957000000000000e-01 1 0 0 0 0 -P 147 111 -4.9897414700676830e-02 6.3480828441875170e-01 -9.5634160118663458e-01 1.1568405977146143e+00 1.3497999999999999e-01 2 0 0 -73 0 -V -35 0 0 0 0 0 0 3 0 -P 148 111 -8.0692078035366516e-02 -5.7579150443156604e-02 -3.2542865426087308e-02 1.7060248683287640e-01 1.3497999999999999e-01 2 0 0 -74 0 -P 149 111 2.0056546976702694e-01 -6.3971292668162691e-02 -9.6007889896875975e-02 2.6787300959774685e-01 1.3497999999999999e-01 2 0 0 -75 0 -P 150 111 7.4076068237410586e-02 -1.5223454337385475e-01 -1.3786736993110663e-01 2.5668975860653298e-01 1.3497999999999999e-01 2 0 0 -76 0 -V -36 0 0 0 0 0 0 2 0 -P 151 -211 4.3518580826092879e-01 4.0714118730605248e-01 -8.3812731381468930e-01 1.0378284122025792e+00 1.3957000000000000e-01 1 0 0 0 0 -P 152 111 -2.0372722030621004e-01 -1.3281479666583887e-01 -4.6890059482311636e-01 5.4518980064978795e-01 1.3497999999999999e-01 2 0 0 -77 0 -V -37 0 0 0 0 0 0 2 0 -P 153 211 -1.1547174774767054e-01 -2.6117390082266756e-01 -4.8927985529292894e-01 5.8345530479574848e-01 1.3957000000000000e-01 1 0 0 0 0 -P 154 111 -3.3667971097780769e-01 5.4736357389487933e-01 -7.3983201246404340e-01 9.8920731744041990e-01 1.3497999999999999e-01 2 0 0 -78 0 -V -38 0 0 0 0 0 0 2 0 -P 155 2212 6.0433317807337594e-01 -7.1283905966837302e-01 -2.4506791222575126e+00 2.7855945268969080e+00 9.3827000000000005e-01 1 0 0 0 0 -P 156 -211 3.4904634150528252e-01 4.3536191550377301e-02 -6.3812683238072887e-01 7.4189917616694812e-01 1.3957000000000000e-01 1 0 0 0 0 -V -39 0 0 0 0 0 0 2 0 -P 157 311 5.3882428291032602e-01 -2.9867949202148447e-01 -4.4165576592752496e+00 4.4870032352797464e+00 4.9767000000000000e-01 2 0 0 -79 0 -P 158 211 9.4508317557362542e-01 -6.6433046586075961e-01 -1.1051882572613879e+01 1.1112970141252495e+01 1.3957000000000000e-01 1 0 0 0 0 -V -40 0 0 0 0 0 0 2 0 -P 160 111 4.8049692547880568e-01 2.1718022336522114e-01 -7.3403587397017889e+00 7.3605115700426689e+00 1.3497999999999999e-01 2 0 0 -80 0 -P 159 211 1.1797515950852807e-04 -3.5831001471481000e-01 -6.3446479853082618e+00 6.3562901068893360e+00 1.3957000000000000e-01 1 0 0 0 0 -V -41 0 -1.1583593514972181e-04 3.0871991557086950e-05 -3.2334817096694663e-03 3.2357875583571205e-03 0 2 0 -P 161 22 -5.0398876263600001e-01 7.9556733552219663e-02 -1.2778281559309137e+01 1.2788464081182569e+01 0 1 0 0 0 0 -P 162 22 -1.6508152971228482e-01 9.8760404301210553e-02 -5.8983626961637485e+00 5.9014987947474795e+00 0 1 0 0 0 0 -V -42 0 0 0 0 0 0 2 0 -P 163 -211 1.3279309858393523e-01 1.2066647820448219e-01 -7.1877811768646929e+00 7.1913748641955930e+00 1.3957000000000000e-01 1 0 0 0 0 -P 164 111 -4.7731618002122833e-01 -2.9187784704482400e-01 -1.0465068868316324e+01 1.0480883046399720e+01 1.3497999999999999e-01 2 0 0 -81 0 -V -43 0 0 0 0 0 0 2 0 -P 165 3122 -4.6866358421255944e-01 -1.6184680144817571e+00 -3.0858384900186707e+01 3.0924484551557821e+01 1.1156800000000000e+00 2 0 0 -82 0 -P 166 211 6.1174989411821111e-02 -3.8276203094391698e-02 -3.6341062113987506e+00 3.6375012285468498e+00 1.3957000000000000e-01 1 0 0 0 0 -V -44 0 0 0 0 0 0 1 0 -P 167 130 -2.7836629784373346e-01 5.3322922791229938e-02 -1.9006813991509159e+01 1.9015440690833294e+01 4.9767000000000000e-01 1 0 0 0 0 -V -45 0 0 0 0 0 0 1 0 -P 168 310 -1.7383101241416014e-02 2.3283172203271379e-01 -6.0426993477096801e+01 6.0429493865934312e+01 4.9767000000000000e-01 2 0 0 -83 0 -V -46 0 0 0 0 0 0 2 0 -P 169 -311 -5.4517775501888455e-01 2.5850199343546754e-01 -8.9865234716413994e+01 8.9868638178901193e+01 4.9767000000000000e-01 2 0 0 -84 0 -P 170 -211 -1.7576348254901095e-02 -3.3187471449250006e-01 -5.7959190696970708e+01 5.7960311557020233e+01 1.3957000000000000e-01 1 0 0 0 0 -V -47 0 0 0 0 0 0 2 0 -P 171 211 9.2955499979074457e-02 -1.0866822487967489e-02 -3.2945012188350809e+01 3.2945440757232113e+01 1.3957000000000000e-01 1 0 0 0 0 -P 172 -211 -7.4993185802273390e-02 8.4488984251952770e-01 -6.1410225298490639e+02 6.1410285462921172e+02 1.3957000000000000e-01 1 0 0 0 0 -V -48 0 0 0 0 0 0 2 0 -P 173 211 8.5949161239965377e-02 3.4709531138046762e-01 -6.9899167123526638e+02 6.9899177663150601e+02 1.3957000000000000e-01 1 0 0 0 0 -P 174 111 2.5409858703281496e-01 -1.5284689738481802e-01 -3.2441921835528876e+02 3.2441938195200805e+02 1.3497999999999999e-01 2 0 0 -85 0 -V -49 0 0 0 0 0 0 2 0 -P 175 2212 3.8253495145818550e-01 1.6289928814342811e-01 -5.7652974840092349e+02 5.7653066181339580e+02 9.3827000000000005e-01 1 0 0 0 0 -P 176 111 1.8441356365968553e-01 -6.4143169139693756e-02 -3.0353336334061498e+02 3.0353345615133566e+02 1.3497999999999999e-01 2 0 0 -86 0 -V -50 0 0 0 0 0 0 3 0 -P 177 211 5.3333410812648374e-01 7.4617552270279233e-02 -1.0059322469405662e+03 1.0059324007743916e+03 1.3957000000000000e-01 1 0 0 0 0 -P 178 -211 3.9966223398528372e-01 -1.6207176715030084e-02 -1.3243593232465137e+03 1.3243593910046934e+03 1.3957000000000000e-01 1 0 0 0 0 -P 179 111 2.9820310548844248e-01 2.7433902091179635e-01 -5.4068104775355994e+02 5.4068121643578320e+02 1.3497999999999999e-01 2 0 0 -87 0 -V -51 0 0 0 0 0 0 1 0 -P 180 130 -2.0800376351271022e-02 -2.1447848449823942e-01 2.1067216961652552e+01 2.1074196060922702e+01 4.9767000000000000e-01 1 0 0 0 0 -V -52 0 0 0 0 0 0 2 0 -P 181 321 -3.8962671843311852e-01 2.0566888018468360e-01 3.0940913755190643e+01 3.0947986907618706e+01 4.9359999999999998e-01 1 0 0 0 0 -P 182 -211 2.7929506800841261e-02 3.3600416982304704e-01 1.9387469077481260e+01 1.9390902915405476e+01 1.3957000000000000e-01 1 0 0 0 0 -V -53 0 0 0 0 0 0 2 0 -P 183 211 -8.9120775201636582e-01 -1.8208840020122474e-01 3.6286732442122407e+01 3.6298399944816033e+01 1.3957000000000000e-01 1 0 0 0 0 -P 184 111 -2.6301694449702272e-03 -1.6538867476866476e-01 1.8885785523187302e+01 1.8886992210507319e+01 1.3497999999999999e-01 2 0 0 -88 0 -V -54 0 0 0 0 0 0 2 0 -P 185 -211 -1.1987217934407324e-02 -3.3403146114971544e-01 2.8599290261216566e+01 2.8601583941115017e+01 1.3957000000000000e-01 1 0 0 0 0 -P 186 211 -1.1552097688423035e-01 1.7779241460690620e-01 5.4530335580076184e+00 5.4589385422854200e+00 1.3957000000000000e-01 1 0 0 0 0 -V -55 0 4.2254465579185501e-05 -2.4461515664588543e-05 3.0760219167180113e-04 3.1174462142442600e-04 0 2 0 -P 187 22 2.8751370315703634e-01 -9.5574760408875581e-02 1.6953251489157042e+00 1.7221864082834764e+00 0 1 0 0 0 0 -P 188 22 1.3549665622695076e-01 -1.4930999651612464e-01 1.3840869762369830e+00 1.3986956697928123e+00 0 1 0 0 0 0 -V -56 0 0 0 0 0 0 3 0 -P 189 211 5.0375258570605386e-01 -1.9695435251561838e-01 8.7561249240525978e+00 8.7739250712036227e+00 1.3957000000000000e-01 1 0 0 0 0 -P 190 -211 2.5412965478975740e-02 -9.0827288189110802e-02 3.8528483651797676e+00 3.8565289737097310e+00 1.3957000000000000e-01 1 0 0 0 0 -P 191 111 5.3198633201816781e-01 1.6603512019262065e-01 1.2684371283985527e+01 1.2697325371470487e+01 1.3497999999999999e-01 2 0 0 -89 0 -V -57 0 0 0 0 0 0 2 0 -P 192 -211 -1.7141939419169341e-01 -5.6722519524079404e-02 -2.2381290066936166e+00 2.2497340483776216e+00 1.3957000000000000e-01 1 0 0 0 0 -P 193 211 4.2568393842247360e-01 -7.1494346415030066e-02 -1.4526970261360295e+00 1.5218826142789872e+00 1.3957000000000000e-01 1 0 0 0 0 -V -58 0 0 0 0 0 0 3 0 -P 194 -211 7.6459071874841397e-02 -8.7541130858253866e-02 -7.8342648501977918e-01 8.0420537277137760e-01 1.3957000000000000e-01 1 0 0 0 0 -P 195 211 -1.9416584560678463e-01 1.2013959035912780e-01 -1.3157418602565010e-01 2.9820370235825233e-01 1.3957000000000000e-01 1 0 0 0 0 -P 196 111 3.9213905941188162e-02 1.0795934726966315e-02 -6.7240374167578831e-02 1.5618947129684915e-01 1.3497999999999999e-01 2 0 0 -90 0 -V -59 0 0 0 0 0 0 2 0 -P 197 211 -2.8016474706981570e-01 2.5051985090551032e-01 -1.3859234437513488e+00 1.4427460130036787e+00 1.3957000000000000e-01 1 0 0 0 0 -P 198 111 4.5819030623118540e-01 7.6300831800201821e-02 -1.2360737189153828e+00 1.3273499962899518e+00 1.3497999999999999e-01 2 0 0 -91 0 -V -60 0 9.8262426864790465e-05 -4.2057595215624915e-04 -9.0357657115137360e-04 1.0038251653789662e-03 0 2 0 -P 199 22 1.0753811039473163e-01 -5.8421054425128616e-01 -1.1054519305528825e+00 1.2549463637800418e+00 0 1 0 0 0 0 -P 200 22 8.6452061747327294e-02 -2.4609259358863311e-01 -6.7839343307098976e-01 7.2681027347815286e-01 0 1 0 0 0 0 -V -61 0 0 0 0 0 0 3 0 -P 201 -211 -4.1923779688965344e-02 9.4741716713696952e-02 -3.1625212825159438e-01 3.6087226232135133e-01 1.3957000000000000e-01 1 0 0 0 0 -P 202 211 1.2543443318519545e-01 2.9266802084010526e-02 -2.6988866705562498e-01 3.3001518182922718e-01 1.3957000000000000e-01 1 0 0 0 0 -P 203 111 1.6976212237140365e-01 -2.6210463640834042e-01 -1.9346621202013536e+00 1.9643459823464879e+00 1.3497999999999999e-01 2 0 0 -92 0 -V -62 0 0 0 0 0 0 2 0 -P 204 211 -6.2798117767117945e-01 1.3395368585235701e-01 -1.3083434892807686e+00 1.4640855235627768e+00 1.3957000000000000e-01 1 0 0 0 0 -P 205 -211 1.1499260483261517e-01 6.9737906011698547e-02 -1.2871443966610814e+00 1.3016555448570508e+00 1.3957000000000000e-01 1 0 0 0 0 -V -63 0 0 0 0 0 0 1 0 -P 206 310 -1.6481661079814763e-01 7.9549466215372497e-02 8.2576997208588896e+00 8.2747068069837439e+00 4.9767000000000000e-01 2 0 0 -93 0 -V -64 0 0 0 0 0 0 1 0 -P 207 310 -2.0774100376841340e-01 2.8253422511277831e-01 4.5249454551591235e+01 4.5253550076855049e+01 4.9767000000000000e-01 2 0 0 -94 0 -V -65 0 7.3754023811518823e-05 -2.2099175550823247e-05 1.5214423169825254e-02 1.5214661412533925e-02 0 2 0 -P 208 22 3.2723447556854225e-02 -6.3493276229220436e-02 1.6358826635059781e+01 1.6358982581324781e+01 0 1 0 0 0 0 -P 209 22 2.4113439554956292e-01 -1.8563705044705985e-02 4.0134214667263159e+01 4.0134943345740787e+01 0 1 0 0 0 0 -V -66 0 -2.4091747932102252e-05 -3.9694646150891612e-05 6.2903683639507407e-02 6.2903709184319812e-02 0 2 0 -P 210 22 -3.5501503450890148e-02 -4.3221742365836700e-03 1.1206888944609352e+02 1.1206889515257420e+02 0 1 0 0 0 0 -P 211 22 -6.4490887525149324e-02 -1.6042978102883673e-01 1.4901178207850950e+02 1.4901188239533926e+02 0 1 0 0 0 0 -V -67 0 0 0 0 0 0 1 0 -P 212 310 -4.4770508064804587e-01 -2.2677035333779219e-01 -7.6463961108518649e-02 7.1090561865793789e-01 4.9767000000000000e-01 2 0 0 -95 0 -V -68 0 5.6216918348570056e-07 7.2291367578196445e-07 -9.0777412143587177e-09 9.8964114654623947e-07 0 2 0 -P 213 22 5.9588311079569842e-02 3.1727756685069239e-04 -3.4800397785193422e-03 5.9690687374414804e-02 0 1 0 0 0 0 -P 214 22 1.4273109276990548e-01 2.5985255780542243e-01 2.1304606071875768e-04 2.9647185706224466e-01 0 1 0 0 0 0 -V -69 0 6.8125667432656671e-05 6.2890706209118587e-04 5.0247106668746657e-03 5.0652922174674346e-03 0 2 0 -P 215 22 9.8238845130149910e-02 6.3480873157616224e-01 5.4797247598160750e+00 5.5172471795016902e+00 0 1 0 0 0 0 -P 216 22 -2.8990508836005870e-03 2.4532752483918649e-01 1.5522046022239493e+00 1.5714748251578743e+00 0 1 0 0 0 0 -V -70 0 0 0 0 0 0 1 0 -P 217 310 6.6329685576106023e-02 5.2124166663591132e-01 1.7596312276628496e+00 1.9026481515225759e+00 4.9767000000000000e-01 2 0 0 -96 0 -V -71 0 2.0742689619148677e-05 6.3533362024919996e-06 2.3603460236328297e-05 3.7557583695116871e-05 0 2 0 -P 219 22 -2.8722140438245738e-03 5.3180710552864677e-02 2.8023708625927783e-02 6.0181108610361057e-02 0 1 0 0 0 0 -P 218 22 1.4597052735358410e-01 -9.3507294289533575e-03 1.3481030230072180e-01 1.9891869847540525e-01 0 1 0 0 0 0 -V -72 0 3.7626593470519508e-05 -4.3890047303515130e-07 4.0744517881454282e-05 9.2468831779623026e-05 0 2 0 -P 220 22 2.4209710898237435e-02 6.4530876697482267e-02 1.6755104325429430e-02 7.0930090018820904e-02 0 1 0 0 0 0 -P 221 22 4.4433158429187325e-02 -6.5331570702425915e-02 5.7575850427009183e-02 9.7762458289636103e-02 0 1 0 0 0 0 -V -73 0 -5.9090765758585417e-06 7.5176856078054691e-05 -1.1325427956519639e-04 1.3699827373751485e-04 0 2 0 -P 222 22 -6.9815720431071801e-02 2.1207143051907135e-01 -3.9649262793632423e-01 4.5503288943720027e-01 0 1 0 0 0 0 -P 223 22 1.9918305730394971e-02 4.2273685389968030e-01 -5.5984897325031024e-01 7.0180770827741401e-01 0 1 0 0 0 0 -V -74 0 -3.8400536521541616e-05 -2.7401330134324772e-05 -1.5486817575355602e-05 8.1187982585110302e-05 0 2 0 -P 224 22 -1.1199399900954692e-01 -6.3644204944269311e-02 -5.7287936449814218e-03 1.2894207891051448e-01 0 1 0 0 0 0 -P 225 22 3.1301920974180393e-02 6.0650545011126985e-03 -2.6814071781105887e-02 4.1660407922362044e-02 0 1 0 0 0 0 -V -75 0 4.3814671092180448e-07 -1.3974893838171328e-07 -2.0973471270863068e-07 5.8518387156228786e-07 0 2 0 -P 226 22 1.7806955474676234e-01 -9.4868783602879855e-02 -1.0662617316560713e-01 2.2820603242233170e-01 0 1 0 0 0 0 -P 227 22 2.2495915020264604e-02 3.0897490934717161e-02 1.0618283268731158e-02 3.9666977175415293e-02 0 1 0 0 0 0 -V -76 0 2.7804071585685933e-06 -5.7140453624173457e-06 -5.1747808895705093e-06 9.6347181936474378e-06 0 2 0 -P 228 22 2.0833233827278030e-02 -3.0122302260885887e-03 -8.8160895834764164e-02 9.0639068381273363e-02 0 1 0 0 0 0 -P 229 22 5.3242834410132556e-02 -1.4922231314776616e-01 -4.9706474096342455e-02 1.6605069022525973e-01 0 1 0 0 0 0 -V -77 0 -1.6175287979886273e-04 -1.0545068944792832e-04 -3.7229203558581531e-04 4.3286321857002722e-04 0 2 0 -P 230 22 -5.3478825919207371e-02 -1.0851873814833554e-01 -1.5766115696858526e-01 1.9872931783628903e-01 0 1 0 0 0 0 -P 231 22 -1.5024839438700266e-01 -2.4296058517503317e-02 -3.1123943785453106e-01 3.4646048281349889e-01 0 1 0 0 0 0 -V -78 0 -3.6620022303480086e-05 5.9535711926116886e-05 -8.0470143919802894e-05 1.0759422931137554e-04 0 2 0 -P 232 22 -2.1948986096420983e-01 4.4633454790483357e-01 -6.1110621067207616e-01 7.8793472346475779e-01 0 1 0 0 0 0 -P 233 22 -1.1718985001359787e-01 1.0102902599004575e-01 -1.2872580179196724e-01 2.0127259397566213e-01 0 1 0 0 0 0 -V -79 0 0 0 0 0 0 1 0 -P 234 130 5.3882428291032602e-01 -2.9867949202148447e-01 -4.4165576592752496e+00 4.4870032352797464e+00 4.9767000000000000e-01 1 0 0 0 0 -V -80 0 1.6108302389358591e-05 7.2808056107108974e-06 -2.4608007243264460e-04 2.4675568109509100e-04 0 2 0 -P 235 22 2.6570728735577170e-01 1.4441211255928108e-01 -3.3133962149639591e+00 3.3271684204658607e+00 0 1 0 0 0 0 -P 236 22 2.1478963812303389e-01 7.2768110805940062e-02 -4.0269625247378293e+00 4.0333431495768082e+00 0 1 0 0 0 0 -V -81 0 -3.4512069906198131e-05 -2.1104058657373751e-05 -7.5667074252636459e-04 7.5781417751216165e-04 0 2 0 -P 237 22 -1.8517356431284140e-01 -4.7137481113194234e-02 -2.9821525694305429e+00 2.9882679161024384e+00 0 1 0 0 0 0 -P 238 22 -2.9214261570838684e-01 -2.4474036593162976e-01 -7.4829162988857805e+00 7.4926151302972830e+00 0 1 0 0 0 0 -V -82 0 -9.5308150963195587e+01 -3.2913415731351159e+02 -6.2754088553496240e+03 6.2888509826317713e+03 0 2 0 -P 239 2212 -4.7367594868960872e-01 -1.4369308345140306e+00 -2.6150068211133135e+01 2.6210600091706407e+01 9.3827000000000005e-01 1 0 0 0 0 -P 240 -211 5.0123644770492803e-03 -1.8153717996772661e-01 -4.7083166890535697e+00 4.7138844598514140e+00 1.3957000000000000e-01 1 0 0 0 0 -V -83 0 -1.4864983960191469e+00 1.9910370223202563e+01 -5.1673534907541507e+03 5.1675673089874317e+03 0 2 0 -P 241 -211 -1.8400658600957862e-01 -3.3309345305199931e-04 -2.5499791367105406e+01 2.5500837203618424e+01 1.3957000000000000e-01 1 0 0 0 0 -P 242 211 1.6662348476816261e-01 2.3316481548576576e-01 -3.4927202109991391e+01 3.4928656662315888e+01 1.3957000000000000e-01 1 0 0 0 0 -V -84 0 0 0 0 0 0 1 0 -P 243 130 -5.4517775501888455e-01 2.5850199343546754e-01 -8.9865234716413994e+01 8.9868638178901193e+01 4.9767000000000000e-01 1 0 0 0 0 -V -85 0 5.7272233467841676e-06 -3.4450735417619763e-06 -7.3122064282472015e-03 7.3122101156150102e-03 0 2 0 -P 244 22 1.6319053796774280e-01 -5.8337248729609763e-02 -2.3911426643792683e+02 2.3911432924133621e+02 0 1 0 0 0 0 -P 245 22 9.0908049065072161e-02 -9.4509648655208264e-02 -8.5304951917361947e+01 8.5305052710671873e+01 0 1 0 0 0 0 -V -86 0 4.3353964989961207e-06 -1.5079480348632104e-06 -7.1357955165588264e-03 7.1357976984551316e-03 0 2 0 -P 246 22 3.5587885991872119e-02 -7.9942846660418745e-02 -1.1802533908101961e+02 1.1802537152047441e+02 0 1 0 0 0 0 -P 247 22 1.4882567766781341e-01 1.5799677520724986e-02 -1.8550802425959540e+02 1.8550808463086122e+02 0 1 0 0 0 0 -V -87 0 7.0770676303012794e-05 6.5107162497295579e-05 -1.2831644845235862e-01 1.2831648848465474e-01 0 2 0 -P 248 22 1.8114845821850648e-01 2.3989936867935877e-01 -4.1762092695334275e+02 4.1762103514530997e+02 0 1 0 0 0 0 -P 249 22 1.1705464726993600e-01 3.4439652232437577e-02 -1.2306012080021719e+02 1.2306018129047324e+02 0 1 0 0 0 0 -V -88 0 -6.2417076750674925e-07 -3.9248716946618685e-05 4.4818235066635065e-03 4.4821098680430417e-03 0 2 0 -P 250 22 -1.3241355407539917e-02 -1.0246241139417403e-02 2.5096339222582625e-01 2.5152125792467273e-01 0 1 0 0 0 0 -P 251 22 1.0611185962569689e-02 -1.5514243362924734e-01 1.8634822130961478e+01 1.8635470952582644e+01 0 1 0 0 0 0 -V -89 0 1.3582222174720734e-04 4.2390673510491999e-05 3.2384657002777202e-03 3.2417730276224663e-03 0 2 0 -P 252 22 1.8270933871487663e-01 1.0969751742799415e-01 5.7283206751857012e+00 5.7322834896351260e+00 0 1 0 0 0 0 -P 253 22 3.4927699330329121e-01 5.6337602764626502e-02 6.9560506087998260e+00 6.9650418818353623e+00 0 1 0 0 0 0 -V -90 0 3.5279272098553364e-05 9.7126952709604466e-06 -6.0493628454770447e-05 1.4051777614489206e-04 0 2 0 -P 254 22 7.6896925214123460e-02 3.5622213305934604e-02 -7.1477115362458474e-02 1.1086504051655867e-01 0 1 0 0 0 0 -P 255 22 -3.7683019272935298e-02 -2.4826278578968294e-02 4.2367411948796398e-03 4.5324430780290477e-02 0 1 0 0 0 0 -V -91 0 4.0801170434363689e-05 6.7944764440148752e-06 -1.1007054009880686e-04 1.1819855786593737e-04 0 2 0 -P 256 22 1.2083898222827490e-01 -3.9112841475455871e-02 -3.3967101043474301e-01 3.6264068900774049e-01 0 1 0 0 0 0 -P 257 22 3.3735132400291051e-01 1.1541367327565770e-01 -8.9640270848063985e-01 9.6470930728221138e-01 0 1 0 0 0 0 -V -92 0 5.6114899634550859e-06 -8.6638734014096062e-06 -6.3950290668699704e-05 6.4931491257954731e-05 0 3 0 -P 258 22 3.7763112644272664e-02 -1.9003168856709707e-02 -5.6880931194233830e-01 5.7037812585643310e-01 0 1 0 0 0 0 -P 259 11 1.2719536651632049e-01 -2.1827911800405031e-01 -1.2119610200457922e+00 1.2380122005983156e+00 5.1000000000000004e-04 1 0 0 0 0 -P 260 -11 4.8036432108104722e-03 -2.4822349547580416e-02 -1.5389178821322286e-01 1.5595565589173888e-01 5.1000000000000004e-04 1 0 0 0 0 -V -93 0 -1.4381524495815356e+01 6.9413064099863986e+00 7.2054819134743707e+02 7.2203219119746802e+02 0 2 0 -P 261 111 9.2014239650662466e-02 1.3215606270806735e-01 2.2548623593500721e+00 2.2646314722759553e+00 1.3497999999999999e-01 2 0 0 -97 0 -P 262 111 -2.5683085044881010e-01 -5.2606596492694856e-02 6.0028373615088171e+00 6.0100753347077882e+00 1.3497999999999999e-01 2 0 0 -98 0 -V -94 0 -7.7825606900085225e+00 1.0584524547671682e+01 1.6951714868486924e+03 1.6953249167125366e+03 0 2 0 -P 263 111 -2.8943395680254397e-01 1.5615697178674603e-01 3.6631605117101834e+01 3.6633330043429979e+01 1.3497999999999999e-01 2 0 0 -99 0 -P 264 111 8.1692953034130586e-02 1.2637725332603228e-01 8.6178494344894041e+00 8.6202200334250758e+00 1.3497999999999999e-01 2 0 0 -100 0 -V -95 0 -1.3657774741477642e+01 -6.9178987190624293e+00 -2.3326238673673467e+00 2.1687019472789341e+01 0 2 0 -P 265 211 -2.9529816783651242e-01 -9.1672761735730857e-02 1.5454665700808420e-01 3.7278594027166795e-01 1.3957000000000000e-01 1 0 0 0 0 -P 266 -211 -1.5240691281153346e-01 -1.3509759160206133e-01 -2.3101061811660287e-01 3.3811967838627000e-01 1.3957000000000000e-01 1 0 0 0 0 -V -96 0 5.5767429881696557e+00 4.3823979931555911e+01 1.4794297644263381e+02 1.5996728532329485e+02 0 2 0 -P 267 111 1.6009544349417862e-01 1.5482137875335267e-01 1.0998242066687225e+00 1.1302358587132031e+00 1.3497999999999999e-01 2 0 0 -101 0 -P 268 111 -9.3765757918072581e-02 3.6642028788255870e-01 6.5980702099412725e-01 7.7241229280937296e-01 1.3497999999999999e-01 2 0 0 -102 0 -V -97 0 -1.4381499058109947e+01 6.9413429450597066e+00 7.2054881471317537e+02 7.2203281726391674e+02 0 2 0 -P 269 22 1.6608090838720359e-02 -2.6977769960342162e-02 2.3862848367837755e-01 2.4072220914569153e-01 0 1 0 0 0 0 -P 270 22 7.5406148811942117e-02 1.5913383266840953e-01 2.0162338756716944e+00 2.0239092631302644e+00 0 1 0 0 0 0 -V -98 0 -1.4381537586881612e+01 6.9413037285466928e+00 7.2054849732135528e+02 7.2203249754031685e+02 0 2 0 -P 271 22 -7.1650056340312379e-02 -3.1679388923150559e-02 3.2465350796190910e+00 3.2474801519722116e+00 0 1 0 0 0 0 -P 272 22 -1.8518079410849772e-01 -2.0927207569544297e-02 2.7563022818897256e+00 2.7625951827355784e+00 0 1 0 0 0 0 -V -99 0 -7.7826677342413646e+00 1.0584582300754398e+01 1.6951850346787774e+03 1.6953384651805682e+03 0 2 0 -P 273 22 -9.9605722022381674e-02 2.5022940238770892e-02 6.2018655777368492e+00 6.2027158641771596e+00 0 1 0 0 0 0 -P 274 22 -1.8982823478016234e-01 1.3113403154797515e-01 3.0429739539364984e+01 3.0430614179252810e+01 0 1 0 0 0 0 -V -100 0 -7.7825535982837781e+00 1.0584535518418377e+01 1.6951722349599286e+03 1.6953256650295632e+03 0 2 0 -P 275 22 7.7600359093490293e-02 2.3880769340730748e-03 3.6033115788038983e+00 3.6041478677469825e+00 0 1 0 0 0 0 -P 276 22 4.0925939406402977e-03 1.2398917639195919e-01 5.0145378556855054e+00 5.0160721656780911e+00 0 1 0 0 0 0 -V -101 0 5.5767505180503374e+00 4.3823987213377826e+01 1.4794302817143299e+02 1.5996733848246649e+02 0 2 0 -P 277 22 1.4877919418107663e-01 9.9270607473697217e-02 5.7038285808899925e-01 5.9776793735624267e-01 0 1 0 0 0 0 -P 278 22 1.1316249313101989e-02 5.5550771279655430e-02 5.2944134857972314e-01 5.3246792135695076e-01 0 1 0 0 0 0 -V -102 0 5.5767344317322669e+00 4.3824013368626339e+01 1.4794303665221980e+02 1.5996735580848653e+02 0 2 0 -P 279 22 -6.6030914697511434e-02 5.1578189162365749e-02 1.6923379462356794e-01 1.8883979595347436e-01 0 1 0 0 0 0 -P 280 22 -2.7734843220561155e-02 3.1484209872019292e-01 4.9057322637055928e-01 5.8357249685589085e-01 0 1 0 0 0 0 -BlockType GenEvent -E 4 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 189 0 0 -V -1 0 0 0 0 0 1 2 0 -P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -1 0 -P 3 2 -9.2820880453940977e-02 1.6078548997780676e-01 2.3716619521660218e+03 2.3716619594325907e+03 0 3 0 0 -3 0 -P 31 2103 9.2820880453940977e-02 -1.6078548997780676e-01 4.2732759596864398e+03 4.2732760333322394e+03 7.7132999999999996e-01 2 0 0 -11 0 -V -2 0 0 0 0 0 1 3 0 -P 2 2212 0 0 -6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -2 0 -P 4 21 2.8438240035156620e-01 -3.1515117320208030e-01 -3.8035697500337951e+03 3.8035697737212290e+03 0 3 0 0 -4 0 -P 14 2203 -1.4352353535702972e-01 4.4026544033137993e-01 -2.9147371774374851e+03 2.9147373162806402e+03 7.7132999999999996e-01 2 0 0 -9 0 -P 33 1 -1.4085886499453648e-01 -1.2511426712929963e-01 -8.4457632655431709e+01 8.4458487486809346e+01 3.3000000000000002e-01 2 0 0 -13 0 -V -3 0 0 0 0 0 0 5 0 -P 5 2 1.8330374025472010e-01 6.4045820926453234e-01 1.8525053358893920e+03 1.8525054556696041e+03 0 3 0 0 -5 0 -P 27 21 1.9372450554350890e-01 -5.2219821644400299e-01 1.2126803157754753e+02 1.2126931063898388e+02 0 2 0 0 -11 0 -P 28 21 -2.3795161344271451e-01 7.1609049465699426e-01 1.0167002308049599e+02 1.0167282330965078e+02 0 2 0 0 -11 0 -P 29 21 3.4192681965240401e-01 2.4291397251790178e-01 3.1944822354571826e+01 3.1947575751740445e+01 0 2 0 0 -11 0 -P 30 21 -5.9675894419355358e-01 -9.5050198748863479e-01 1.7993365505285936e+02 1.7993715512908133e+02 0 2 0 0 -11 0 -V -4 0 0 0 0 0 0 15 0 -P 6 -1 -5.7988882832211965e+00 -1.9327729931963271e+00 2.4200413742942017e+00 6.5741400211589776e+00 0 3 0 0 -5 0 -P 11 1 -9.8845705950266671e-01 -4.9594742583225058e+00 1.9044643416753072e+01 1.9707378698059269e+01 3.3000000000000002e-01 2 0 0 -9 0 -P 12 21 2.6044264833858743e-01 -3.1030363873699462e+00 1.1727671819750038e+01 1.2134041021282840e+01 0 2 0 0 -9 0 -P 13 21 7.5691010065949327e-01 -5.4011599026484958e-01 5.1524452837099819e+00 5.2356786174330239e+00 0 2 0 0 -9 0 -P 15 2 -1.8311360214351913e-01 -1.4805571719661075e+00 -2.1411903451828903e+03 2.1411908903188796e+03 3.3000000000000002e-01 2 0 0 -11 0 -P 16 21 4.3968109830755170e-01 -2.9544412986812052e-01 -3.1326029880598599e-01 6.1541751428642444e-01 0 2 0 0 -11 0 -P 17 21 2.7322936418785587e-01 -3.3048055802107390e-01 -7.6828223487860681e-01 8.7984616673284832e-01 0 2 0 0 -11 0 -P 18 21 2.9260573411497637e-01 1.3800589535119959e-01 -2.1582422861451325e+00 2.1823550372232328e+00 0 2 0 0 -11 0 -P 19 21 1.0223538075759215e+00 -1.4522275427264191e+00 -2.4692904014076042e+01 2.4756689616992229e+01 0 2 0 0 -11 0 -P 20 21 1.2063407328190996e+00 -7.4888083722587195e-01 -1.1210724096630058e+01 1.1300283856734948e+01 0 2 0 0 -11 0 -P 21 21 -5.4913410279006636e-01 1.0519596533332111e-01 3.4138908785026851e+00 3.4593735537367594e+00 0 2 0 0 -11 0 -P 22 21 6.4314231442077185e-01 3.1223541119268439e+00 7.5129505920112933e+00 8.1613205938051365e+00 0 2 0 0 -11 0 -P 23 21 1.2086144926726743e+00 3.4136643559921347e+00 6.3113339858338602e+00 7.2764544943269689e+00 0 2 0 0 -11 0 -P 24 21 2.4400337609788756e+00 6.9128514496625586e+00 2.4435124802319205e+01 2.5511107463705560e+01 0 2 0 0 -11 0 -P 32 -2 -7.1644398238490137e-01 8.6978994307757240e-01 -1.6189139599034304e+03 1.6189143857217191e+03 3.3000000000000002e-01 2 0 0 -13 0 -V -5 0 0 0 0 0 0 2 0 -P 7 22 1.3643288924243656e+01 -1.0581519988970058e+01 9.9183478070503759e+02 9.9198505034811774e+02 0 3 0 0 -6 0 -P 8 24 -1.9258873467210137e+01 9.2892052050382574e+00 8.6309059655865008e+02 8.6709454534264773e+02 8.0438667035438414e+01 3 0 0 -7 0 -V -6 0 0 0 0 0 0 1 0 -P 9 22 1.3643288924243656e+01 -1.0581519988970058e+01 9.9183478070503759e+02 9.9198505034811762e+02 0 1 0 0 0 0 -V -7 0 0 0 0 0 0 1 0 -P 10 24 -1.9258873467210137e+01 9.2892052050382574e+00 8.6309059655865008e+02 8.6709454534264773e+02 8.0438667035438414e+01 2 0 0 -8 0 -V -8 0 0 0 0 0 0 9 0 -P 34 4 -2.2700858926615656e+01 -1.6386334061858157e+01 3.4828459595439756e+02 3.4941129163080990e+02 1.5000000000000000e+00 2 0 0 -15 0 -P 35 21 -7.4503781777991165e+00 -8.5245909374436160e+00 1.2403122509900038e+02 1.2454686501555096e+02 0 2 0 0 -15 0 -P 36 21 -2.0027042250268927e+00 -1.0978633289287578e+00 2.1859513177439908e+01 2.1978499595209318e+01 0 2 0 0 -15 0 -P 40 21 3.3737992516561754e-01 1.9913397179993726e+00 1.8847206960760861e+01 1.8955117232772242e+01 0 2 0 0 -15 0 -P 41 21 9.3276664365375481e+00 2.1890146052654789e+01 2.2925649830527726e+02 2.3048801676129600e+02 0 2 0 0 -15 0 -P 42 -3 4.2852829509391617e+00 8.3218012077022046e+00 8.9256848114117304e+01 8.9747707271978427e+01 5.0000000000000000e-01 2 0 0 -15 0 -P 37 21 -1.0274145350843458e+00 -2.5975390684764665e-01 3.0272901154602945e+00 3.2074192370485028e+00 0 2 0 0 -15 0 -P 38 21 -2.6505880313310659e-01 5.5852304317418111e-01 2.2691371688433564e+00 2.3518477097595722e+00 0 2 0 0 -15 0 -P 39 21 2.3721188780666763e-01 2.7959374185858841e+00 2.6258281663350946e+01 2.6407780888220010e+01 0 2 0 0 -15 0 -V -9 0 0 0 0 0 0 1 0 -P 51 92 -1.1462784586161573e-01 -8.1623611956259214e+00 -2.8788124169172720e+03 2.9518144146174154e+03 6.5236551814627580e+02 2 0 0 -10 0 -V -10 0 0 0 0 0 0 16 0 -P 52 -213 3.0616585418758002e-01 -2.5300431240125230e+00 1.2105798622634046e+01 1.2400251650786375e+01 8.4913189283512225e-01 2 0 0 -25 0 -P 53 213 -1.5404831881885364e-01 -1.7509696799112910e+00 5.5613068929310039e+00 5.8606722227440304e+00 5.7421149464447840e-01 2 0 0 -26 0 -P 54 223 -5.1151607297610935e-01 -1.4176238804041423e+00 5.9722475655096865e+00 6.2094845467470412e+00 7.8654382798990441e-01 2 0 0 -27 0 -P 55 223 2.1595395219106844e-01 -1.8737275125004771e+00 7.0985598228311808e+00 7.3857993220666733e+00 7.7652377102120052e-01 2 0 0 -28 0 -P 64 -211 4.4026111693685754e-01 6.5311510758350333e-01 -3.0666546764622510e+01 3.0676977677837161e+01 1.3957000000000000e-01 1 0 0 0 0 -P 65 211 4.5884509599108031e-02 -7.3354084743733938e-01 -5.8516434437769988e+02 5.8516482259132022e+02 1.3957000000000000e-01 1 0 0 0 0 -P 66 2214 -4.9851835496356245e-01 6.3248545172766857e-01 -1.2651382944982172e+03 1.2651390770952955e+03 1.1539624265769346e+00 2 0 0 -33 0 -P 67 111 2.6622991607876895e-01 4.8781176567800157e-02 -9.9923848265446202e+02 9.9923852842810425e+02 1.3497999999999999e-01 2 0 0 -34 0 -P 56 113 -4.7677120078934182e-02 -1.0152067643004612e+00 2.4368651745900176e+00 2.7334250167134941e+00 7.0737724080239639e-01 2 0 0 -29 0 -P 57 -211 2.1984336478833474e-01 4.7825007839895524e-03 2.2352079885760445e+00 2.2503307566776294e+00 1.3957000000000000e-01 1 0 0 0 0 -P 58 211 -3.3498969538027201e-01 6.9648415330084867e-02 -1.1066497586449596e-01 3.8574022288587678e-01 1.3957000000000000e-01 1 0 0 0 0 -P 59 113 1.3909780482065315e-01 -3.3069396730450967e-01 -1.7329298988899207e+00 1.9541788674726714e+00 8.2889221994938656e-01 2 0 0 -30 0 -P 60 -211 -2.8599753074680223e-01 6.4799383066966643e-01 -3.4804982825084108e+00 3.5545799571290018e+00 1.3957000000000000e-01 1 0 0 0 0 -P 61 111 4.1381767414316867e-01 -3.0024085245337195e-01 -3.1398849342385469e+00 3.1840990307421961e+00 1.3497999999999999e-01 2 0 0 -31 0 -P 62 211 5.4968392420735113e-01 1.4756230968950473e-01 -1.8166962247609939e+00 1.9088719207253644e+00 1.3957000000000000e-01 1 0 0 0 0 -P 63 113 -8.7881886984997282e-01 -4.1468335965402653e-01 -2.3734060373081363e+01 2.3767575310168922e+01 8.0481639937447114e-01 2 0 0 -32 0 -V -11 0 0 0 0 0 2 1 0 -P 25 21 -8.0759531061318546e-01 -3.3406171290107096e+00 1.9645698208408786e+00 3.9587204459677277e+00 0 2 0 0 -11 0 -P 26 21 8.0759531061318546e-01 3.3406171290107096e+00 -1.6092526703563814e+02 1.6096196290888045e+02 0 2 0 0 -11 0 -P 68 92 6.5875152481577262e+00 8.7100003117229168e+00 2.4104713366823571e+03 7.0983573201329691e+03 6.6765399212358125e+03 2 0 0 -12 0 -V -12 0 0 0 0 0 0 59 0 -P 69 323 2.6965373089886259e-02 -7.8436620352785036e-01 -6.3251215118341054e+02 6.3251328488303113e+02 9.0454484922708100e-01 2 0 0 -35 0 -P 70 -311 -5.1319872938403244e-01 -3.5703956672451648e-01 -6.6805309680723667e+02 6.6805357470741524e+02 4.9767000000000000e-01 2 0 0 -36 0 -P 71 -211 5.7620530575271300e-01 6.1421445206986870e-02 -3.3565202145218319e+02 3.3565255066790428e+02 1.3957000000000000e-01 1 0 0 0 0 -P 72 213 2.7459733564460981e-01 -4.6031431506940862e-01 -3.8571257213471154e+02 3.8571373935139655e+02 7.8302534873042506e-01 2 0 0 -37 0 -P 73 223 -5.7926526471571715e-01 -1.9525945624624185e-02 -8.4084403531743789e+01 8.4090163084732680e+01 7.9541235743155470e-01 2 0 0 -38 0 -P 74 -213 -7.3223666424297493e-02 3.6563852853395723e-01 -1.6810679233890163e+01 1.6836622172984743e+01 8.5665433648741185e-01 2 0 0 -39 0 -P 75 211 6.4146448505876097e-01 -6.3543078272220832e-01 -1.6981265495312542e+01 1.7005825665706883e+01 1.3957000000000000e-01 1 0 0 0 0 -P 76 -211 -1.5924531765929986e-01 1.8172819723608069e-02 -3.3819669982319928e-01 3.9943224111784109e-01 1.3957000000000000e-01 1 0 0 0 0 -P 77 331 -2.1878967436288869e-02 -2.4374301737778187e-01 -4.9639779751442061e+00 5.0614320935167747e+00 9.5766808019706395e-01 2 0 0 -40 0 -P 78 211 3.8160876729373411e-01 4.9824059133778851e-03 -3.9596912966490905e+00 3.9804880385830423e+00 1.3957000000000000e-01 1 0 0 0 0 -P 79 -211 8.2763694246190667e-01 -4.7171503722470046e-02 -5.3206398228798824e+00 5.3866405086107614e+00 1.3957000000000000e-01 1 0 0 0 0 -P 80 213 -9.2963436667075124e-03 -9.3331491880418926e-01 -5.7858987283250789e+00 5.9114736383731179e+00 7.7313215110905542e-01 2 0 0 -41 0 -P 81 111 6.8908760945870035e-02 -7.4336047790866958e-02 -3.2488145678831243e-01 3.6611723081706654e-01 1.3497999999999999e-01 2 0 0 -42 0 -P 82 311 8.0944838552899079e-01 -2.2401821592795629e-01 -2.2078412448770441e+00 2.4140483096622667e+00 4.9767000000000000e-01 2 0 0 -43 0 -P 83 -311 2.0825369584158310e-01 -2.9899435700293758e-01 -7.9825277911540260e+00 8.0063220390387535e+00 4.9767000000000000e-01 2 0 0 -44 0 -P 84 221 4.8600128562752809e-02 -2.9412330619311078e-01 -1.2557942635204722e+00 1.4019954445479514e+00 5.4744999999999999e-01 2 0 0 -45 0 -P 85 221 2.4321537069915566e-01 2.7897521224850303e-02 -2.0466306405757497e+00 2.1326815209210972e+00 5.4744999999999999e-01 2 0 0 -46 0 -P 86 113 -1.4242560875299726e-01 2.0098755311294011e-01 -9.3281640560500445e-01 1.1994889447031605e+00 7.1270346664252460e-01 2 0 0 -47 0 -P 87 -213 6.2995506969133175e-01 -5.3351618156801850e-01 -3.0268003767966487e+00 3.2877827626531611e+00 9.8311345611693934e-01 2 0 0 -48 0 -P 88 213 -4.4470514704296038e-01 2.6740585629040976e-02 -1.1790528923872898e+00 1.4643031719074535e+00 7.4534577847138228e-01 2 0 0 -49 0 -P 89 2112 -5.6465354678112804e-02 4.1816050990651149e-01 8.1955389032907600e-01 1.3162472839013655e+00 9.3957000000000002e-01 1 0 0 0 0 -P 90 -2212 -3.0528283048302102e-02 -4.0769401042822612e-01 1.4135481591829637e+00 1.7451691532440265e+00 9.3827000000000005e-01 1 0 0 0 0 -P 91 211 3.5221781060737328e-01 1.2088893752373304e+00 9.4706264424757203e-01 1.5817327033035504e+00 1.3957000000000000e-01 1 0 0 0 0 -P 92 -213 -2.9970119748950869e-01 5.7605009045793187e-01 1.9803888278068278e+00 2.1668024374217025e+00 5.9282238404204501e-01 2 0 0 -50 0 -P 93 323 5.3610594923405364e-01 1.5427556638110751e+00 4.1323311180303905e+00 4.5365775346539055e+00 9.1480633571205505e-01 2 0 0 -51 0 -P 94 -323 1.6764230184000011e+00 4.2661339477853915e+00 1.1422857768230408e+01 1.2340341966212989e+01 8.8998160249935854e-01 2 0 0 -52 0 -P 95 221 1.6521720620708708e-01 1.7305666862956806e+00 5.3795959051527014e+00 5.6799569880571275e+00 5.4744999999999999e-01 2 0 0 -53 0 -P 96 111 3.4091599571513381e-01 4.2578712335088759e-01 7.7507818540955942e-01 9.5733180478016111e-01 1.3497999999999999e-01 2 0 0 -54 0 -P 97 111 1.8636424148468736e-01 1.4599342475026946e+00 5.4281639450086834e+00 5.6257731070340586e+00 1.3497999999999999e-01 2 0 0 -55 0 -P 98 223 1.0069287360881967e+00 1.3509470596584172e+00 6.7582433289884696e+00 7.0091592256500288e+00 7.8453598970226335e-01 2 0 0 -56 0 -P 99 211 -3.4146209562673929e-01 1.5158950380356184e-01 5.2424511386917438e-01 6.5870210621260206e-01 1.3957000000000000e-01 1 0 0 0 0 -P 100 2112 -2.1154881148046689e-01 -1.0735068025792132e+00 7.0201326895106064e-01 1.6039900777454950e+00 9.3957000000000002e-01 1 0 0 0 0 -P 101 -2212 4.7469686931938010e-02 2.7754353367769968e-01 1.0039073590343506e+00 1.4026633105228941e+00 9.3827000000000005e-01 1 0 0 0 0 -P 102 111 1.7437178164815947e-01 -5.6048963315392508e-01 1.2589521396946993e-01 6.1532377851712639e-01 1.3497999999999999e-01 2 0 0 -57 0 -P 103 113 -3.1883151078144545e-01 -8.4606752962111467e-02 1.3914257241876302e-01 9.7271600632710076e-01 9.0443570174538301e-01 2 0 0 -58 0 -P 104 111 -1.1927545843921665e-01 -2.6335718259241964e-01 1.5515874628685319e-01 3.5479216107209921e-01 1.3497999999999999e-01 2 0 0 -59 0 -P 105 211 2.9312098402116255e-01 -6.2323282486230425e-01 -2.6684020281172388e-01 7.5167981481212065e-01 1.3957000000000000e-01 1 0 0 0 0 -P 106 1114 -4.4062914350054427e-01 2.4638804826043872e-01 -2.3241854935092199e+01 2.3280385473541951e+01 1.2400265563311581e+00 2 0 0 -60 0 -P 107 211 1.6813770838362588e-01 1.0298303158833499e-01 -3.2163782230045408e+00 3.2254370947351405e+00 1.3957000000000000e-01 1 0 0 0 0 -P 108 -2212 3.4457685450197267e-01 1.2186713305630190e+00 -5.3030716885410776e+01 5.3054134400573211e+01 9.3827000000000005e-01 1 0 0 0 0 -P 109 2214 1.2020287573136482e-01 3.7479987432403911e-01 -1.0966878173055145e+01 1.1045072570427967e+01 1.2515141015024636e+00 2 0 0 -61 0 -P 110 211 2.1009296797946009e-01 4.0052377799798089e-01 -1.6589816940124287e+01 1.6596567845300751e+01 1.3957000000000000e-01 1 0 0 0 0 -P 111 -2224 1.9658035577195881e-01 5.1914185814482328e-01 -3.0401238446225552e+01 3.0431387801714855e+01 1.2352782556752151e+00 2 0 0 -62 0 -P 112 323 -7.0406239463945264e-01 -1.9001858472173550e-01 -1.3737092732247977e+01 1.3787611740640099e+01 9.2666599061989985e-01 2 0 0 -63 0 -P 113 333 8.2916907628090986e-01 6.4319863963863733e-01 -5.3961951740099057e+00 5.5928926174794418e+00 1.0297085158212156e+00 2 0 0 -64 0 -P 114 -323 -4.4426618158725512e-01 -1.3800261314922405e-02 -1.0646399753717462e+00 1.4542717828265139e+00 8.8537294619351015e-01 2 0 0 -65 0 -P 115 213 4.6955864160020383e-01 -2.2138569541027434e-01 2.7803521001940323e-01 1.1481484305370542e+00 9.8561873790043575e-01 2 0 0 -66 0 -P 116 223 2.8564258373702955e-01 -7.0418327707246611e-02 -7.3250403882459747e-01 1.1252011437712499e+00 8.0185099646301594e-01 2 0 0 -67 0 -P 117 -213 -2.1467687225524573e-01 4.2741287912168013e-01 -7.4289123826589104e-04 1.0126576271927121e+00 8.9258444379442525e-01 2 0 0 -68 0 -P 118 113 1.7395230303924547e-01 -4.1608763137866295e-01 1.2004688227692567e+01 1.2053458057779810e+01 9.8484688446354629e-01 2 0 0 -69 0 -P 119 221 -1.9567117285229671e-01 2.8889340409270481e-01 5.3075723066706981e+00 5.3471274437637426e+00 5.4744999999999999e-01 2 0 0 -70 0 -P 120 111 -1.9087267842121336e-01 5.4252206762536037e-01 6.2318609039251946e+01 6.2321408960009578e+01 1.3497999999999999e-01 2 0 0 -71 0 -P 121 323 1.3070310306706950e-01 -6.1697493783128776e-01 2.9221144136450206e+01 2.9240305127864819e+01 8.4996350061396719e-01 2 0 0 -72 0 -P 122 -311 -4.9885948856357186e-02 1.2822300091927889e-02 4.5329270329114166e+00 4.5604556717363289e+00 4.9767000000000000e-01 2 0 0 -73 0 -P 123 2112 -4.7863725043095502e-02 -1.0825222107858737e-01 1.4718621532001902e+02 1.4718926177372941e+02 9.3957000000000002e-01 1 0 0 0 0 -P 124 -2112 1.9344894382294975e-01 -6.5018197886060145e-03 2.1812090513132770e+02 2.1812301463133616e+02 9.3957000000000002e-01 1 0 0 0 0 -P 125 313 -5.9342554539725090e-01 -3.3850796627627300e-01 5.9882469556753961e+02 5.9882576075663053e+02 8.9943464447186261e-01 2 0 0 -74 0 -P 126 3224 3.5223036811653632e-02 -3.4414941922204685e-02 2.5172332877548356e+03 2.5172336781781446e+03 1.4011239061029810e+00 2 0 0 -75 0 -P 127 -213 1.1663718569999987e-01 -2.4641154449404332e-01 1.1115119089591544e+03 1.1115121550661386e+03 6.8758916911370760e-01 2 0 0 -76 0 -V -13 0 0 0 0 0 0 1 0 -P 128 92 -8.5730284737943785e-01 7.4467567594827277e-01 -1.7033715925588622e+03 1.7033728732085285e+03 1.7530933029711124e+00 2 0 0 -14 0 -V -14 0 0 0 0 0 0 2 0 -P 129 113 -7.8533622992976027e-01 8.6523895857592903e-01 -1.6750124441451264e+03 1.6750130337654648e+03 7.8093002700065262e-01 2 0 0 -77 0 -P 130 -211 -7.1966617449677556e-02 -1.2056328262765621e-01 -2.8359148413735429e+01 2.8359839443063105e+01 1.3957000000000000e-01 1 0 0 0 0 -V -15 0 0 0 0 0 0 1 0 -P 131 92 -1.9258873467210122e+01 9.2892052050382539e+00 8.6309059655864780e+02 8.6709454534264501e+02 8.0438667035440048e+01 2 0 0 -16 0 -V -16 0 0 0 0 0 0 12 0 -P 132 423 -1.9137366351719628e+01 -1.4131846763827689e+01 2.9493587085754592e+02 2.9590056209345943e+02 2.0066999999999999e+00 2 0 0 -78 0 -P 133 211 -4.5604000871635657e+00 -4.7377185099919146e+00 7.2689922512815102e+01 7.2986899785775833e+01 1.3957000000000000e-01 1 0 0 0 0 -P 134 113 -5.1617104439380377e+00 -3.6881619942643642e+00 7.3158252581438703e+01 7.3436922903472933e+01 7.7841580023243062e-01 2 0 0 -79 0 -P 135 111 -1.0963849349911059e-01 -3.7173119868868731e-02 3.1818045250357909e+00 3.1867698498692643e+00 1.3497999999999999e-01 2 0 0 -80 0 -P 136 -213 -1.8575628946181175e+00 -2.6189368213267570e+00 3.1084349603980588e+01 3.1260260648800589e+01 8.1100896844567072e-01 2 0 0 -81 0 -P 137 113 -1.9702196225596913e+00 -7.5035350425204206e-01 1.8597051073293592e+01 1.8730245499430811e+01 7.2594221794524227e-01 2 0 0 -82 0 -P 138 331 -1.8481053319477775e-01 -3.7946619601020762e-02 3.7006231730721044e+00 3.8272144972627773e+00 9.5779124022995710e-01 2 0 0 -83 0 -P 139 323 5.4756376576753629e-01 3.2204856220182068e+00 3.6360592290988627e+01 3.6518541749074082e+01 9.1644203753305542e-01 2 0 0 -84 0 -P 140 -323 1.3311259853615089e+00 3.7379512567484707e+00 3.4112393141607136e+01 3.4353366987544497e+01 8.6849383798280422e-01 2 0 0 -85 0 -P 141 113 4.4805357982732119e-01 3.0030852094344707e+00 2.9362369493599097e+01 2.9533424673175375e+01 9.2474745847981388e-01 2 0 0 -86 0 -P 142 213 4.7752867246856443e+00 1.0891165458689070e+01 1.1393626861842178e+02 1.1455865944632977e+02 8.9011184662167564e-01 2 0 0 -87 0 -P 143 313 6.6208049038407921e+00 1.4438654991280693e+01 1.5197109868684942e+02 1.5280167720844955e+02 9.0989345262094001e-01 2 0 0 -88 0 -V -17 0 0 0 0 0 2 1 0 -P 43 2 2.1378197802742376e+00 2.3547451315414101e+00 -5.4651779492327037e+00 6.3232324063115968e+00 0 2 0 0 -17 0 -P 44 -2 -2.1378197802742376e+00 -2.3547451315414101e+00 -2.4068773120863955e+01 2.4277992865784292e+01 0 2 0 0 -17 0 -P 144 92 0 0 -2.9533951070096659e+01 3.0601225272095888e+01 8.0112871838860240e+00 2 0 0 -18 0 -V -18 0 0 0 0 0 0 4 0 -P 145 323 1.8776251777286357e+00 1.8318837713470195e+00 -4.9994852273624932e+00 5.7335457349190850e+00 9.9870901469245166e-01 2 0 0 -89 0 -P 146 -321 3.7073773471981229e-02 1.7044744097734246e-01 -1.6359966049568000e+00 1.7177172777396612e+00 4.9359999999999998e-01 1 0 0 0 0 -P 147 323 -4.7852083980675375e-01 -6.4107933193332411e-01 -5.4042107535842536e+00 5.5372300715771994e+00 9.0302718257077641e-01 2 0 0 -90 0 -P 148 -321 -1.4361781113938632e+00 -1.3612518803910378e+00 -1.7494258484193114e+01 1.7612732187859947e+01 4.9359999999999998e-01 1 0 0 0 0 -V -19 0 0 0 0 0 2 1 0 -P 45 1 1.8673293224089542e+00 2.3063057798131541e+00 2.4390505988349268e+01 2.4570363194630016e+01 0 2 0 0 -19 0 -P 46 -1 -1.8673293224089542e+00 -2.3063057798131541e+00 -3.0519906661080940e+00 4.2568312362999272e+00 0 2 0 0 -19 0 -P 149 92 0 0 2.1338515322241175e+01 2.8827194430929943e+01 1.9382334807786108e+01 2 0 0 -20 0 -V -20 0 0 0 0 0 0 8 0 -P 150 -211 1.1192865003182519e+00 9.7257533806658769e-01 1.0060654115125574e+01 1.0170297245759494e+01 1.3957000000000000e-01 1 0 0 0 0 -P 151 213 -2.0771851785387677e-01 4.2519322630392231e-01 6.3745975039723319e+00 6.4406040423465116e+00 7.8863859294723537e-01 2 0 0 -91 0 -P 152 311 3.6602657683902218e-01 2.7637537539729494e-02 1.1512728067232807e+00 1.3068449765883683e+00 4.9767000000000000e-01 2 0 0 -92 0 -P 153 -313 6.6372648031348541e-02 5.1378838214452516e-01 4.7850741764275320e+00 4.9115056800953063e+00 9.7855472083141659e-01 2 0 0 -93 0 -P 154 111 1.4261163265033819e-01 2.7035572090208759e-01 1.0157832817158920e-01 3.4923924571247367e-01 1.3497999999999999e-01 2 0 0 -94 0 -P 155 -213 2.4227172397104807e-01 -2.6403356349582480e-01 1.3501615848246171e+00 1.6600803924695697e+00 8.9695110983686888e-01 2 0 0 -95 0 -P 156 223 -1.1140200512928606e+00 -8.1846412592718654e-01 -1.3130036485215084e+00 2.0628775198106455e+00 7.8775686642327825e-01 2 0 0 -96 0 -P 157 213 -6.1483051266327160e-01 -1.1270525155338409e+00 -1.1718195444822426e+00 1.9257453281475732e+00 8.2889691275736610e-01 2 0 0 -97 0 -V -21 0 0 0 0 0 2 1 0 -P 47 21 -1.6032500697232532e-01 4.0174652936366986e+00 7.5678264791499856e+00 8.5695816182565032e+00 0 2 0 0 -21 0 -P 48 21 1.6032500697232532e-01 -4.0174652936366986e+00 2.9067715926331368e+02 2.9070496495396026e+02 0 2 0 0 -21 0 -P 158 92 0 0 2.9824498574246365e+02 2.9927454657221676e+02 2.4802876959812384e+01 2 0 0 -22 0 -V -22 0 0 0 0 0 0 11 0 -P 159 2112 1.7964317510379571e-01 2.3175583066793864e-01 5.5679324197099680e+00 5.6542590717765355e+00 9.3957000000000002e-01 1 0 0 0 0 -P 160 -2212 -1.5090219905010202e-01 6.0109050142401987e-01 3.2508753296939252e+00 3.4398578846651389e+00 9.3827000000000005e-01 1 0 0 0 0 -P 161 213 -1.3185920968150541e-01 5.1253454596483206e-01 2.8515148690980490e+00 3.0007314728969532e+00 7.7017777932231246e-01 2 0 0 -98 0 -P 162 2112 -2.9589184870575446e-02 8.1735278132525635e-01 3.9016671878094096e+00 4.0956977083678945e+00 9.3957000000000002e-01 1 0 0 0 0 -P 163 111 -1.6746154439354902e-02 7.6768893592516851e-01 2.2228509364031699e+00 2.3556130034237106e+00 1.3497999999999999e-01 2 0 0 -99 0 -P 164 -2112 1.5035799035598119e-01 2.6606398705642531e-01 4.0650357319587354e+00 4.1833843784038702e+00 9.3957000000000002e-01 1 0 0 0 0 -P 165 -213 1.6067245661882737e-01 -1.2470285603911700e-01 4.7366324423320982e+00 4.8109860944668297e+00 8.1763920330425799e-01 2 0 0 -100 0 -P 166 3222 -3.8764262791963577e-01 -4.9242591697810201e-01 5.0258807822997092e+01 5.0276785049131227e+01 1.1893700000000000e+00 2 0 0 -101 0 -P 167 -3322 -1.2309526187710051e-01 -2.5079778996359208e+00 1.8364860958891464e+02 1.8367048176432749e+02 1.3149000000000000e+00 2 0 0 -102 0 -P 168 -313 2.7382092931236746e-01 1.3620019933979283e-01 1.7228910752887057e+01 1.7258673294130080e+01 9.6587253141499774e-01 2 0 0 -103 0 -P 169 223 7.5340086447302335e-02 -2.0758010905029387e-01 2.0512148660659509e+01 2.0528076850627027e+01 7.7777302470221710e-01 2 0 0 -104 0 -V -23 0 0 0 0 0 2 1 0 -P 49 21 -2.6546407805414689e+00 1.5019300198250121e+00 2.4952404169620731e+01 2.5138126129492459e+01 0 2 0 0 -23 0 -P 50 21 2.6546407805414689e+00 -1.5019300198250121e+00 1.7863101526357177e+00 3.5346591659698707e+00 0 2 0 0 -23 0 -P 170 92 0 0 2.6738714322256449e+01 2.8672785295462329e+01 1.0352283467546599e+01 2 0 0 -24 0 -V -24 0 0 0 0 0 0 9 0 -P 171 113 2.2244165301205804e-01 3.1494817743372011e-01 1.4782187353346177e+00 1.6863066829397060e+00 7.1402167752056300e-01 2 0 0 -105 0 -P 172 111 3.4623449760310282e-01 -1.0264048500571971e-01 9.3540089980756547e-01 1.0117350642601477e+00 1.3497999999999999e-01 2 0 0 -106 0 -P 173 -3222 -8.2595480421942175e-02 1.6978619896754682e-01 3.9520196416308315e+00 4.1314294876570097e+00 1.1893700000000000e+00 2 0 0 -107 0 -P 174 3222 -6.9310081431249626e-01 6.6149599980748386e-01 1.1548527819325548e+01 1.1649079855816854e+01 1.1893700000000000e+00 2 0 0 -108 0 -P 175 -211 -1.7560637096079756e-01 -5.6685470235918856e-01 2.1835043271014025e+00 2.2670096564592077e+00 1.3957000000000000e-01 1 0 0 0 0 -P 176 -2112 -1.9019072817495811e-01 1.9359363989648683e-02 1.6880525050363864e+00 1.9413552850309042e+00 9.3957000000000002e-01 1 0 0 0 0 -P 177 223 2.4540057371541862e-01 -2.8376756848088225e-01 2.3218440550203154e+00 2.4773736223134661e+00 7.7825109971008344e-01 2 0 0 -109 0 -P 178 3212 8.6531980859782553e-01 -4.4081003261827684e-01 1.9558781200763713e+00 2.4881170750393125e+00 1.1925500000000000e+00 2 0 0 -110 0 -P 179 321 -5.3790313905821097e-01 2.2848304826566801e-01 6.7526821892341016e-01 1.0203785659457194e+00 4.9359999999999998e-01 1 0 0 0 0 -V -25 0 0 0 0 0 0 2 0 -P 180 -211 -1.4955554398415169e-01 -5.6951699534149869e-01 4.0889018315438204e+00 4.1334385735875658e+00 1.3957000000000000e-01 1 0 0 0 0 -P 181 111 4.5572139817173168e-01 -1.9605261286710240e+00 8.0168967910902253e+00 8.2668130771988633e+00 1.3497999999999999e-01 2 0 0 -111 0 -V -26 0 0 0 0 0 0 2 0 -P 182 211 1.8489337684983235e-02 -7.6473513145543626e-01 1.7001134900440293e+00 1.8694992219361533e+00 1.3957000000000000e-01 1 0 0 0 0 -P 183 111 -1.7253765650383687e-01 -9.8623454845585490e-01 3.8611934028869754e+00 3.9911730008078652e+00 1.3497999999999999e-01 2 0 0 -112 0 -V -27 0 0 0 0 0 0 3 0 -P 184 -211 -2.5172946512403243e-02 -7.7548570243937753e-01 3.0753336193267011e+00 3.1747706069864448e+00 1.3957000000000000e-01 1 0 0 0 0 -P 185 211 -3.7700741046237424e-01 -6.0130878108935260e-01 2.2322285260513164e+00 2.3464933017539047e+00 1.3957000000000000e-01 1 0 0 0 0 -P 186 111 -1.0933571600133193e-01 -4.0829396875412233e-02 6.6468542013166909e-01 6.8822063800669864e-01 1.3497999999999999e-01 2 0 0 -113 0 -V -28 0 0 0 0 0 0 3 0 -P 187 -211 1.1038114308213799e-01 -1.2888105525180060e-01 6.0684971341572025e-01 6.4539963024755354e-01 1.3957000000000000e-01 1 0 0 0 0 -P 188 211 8.5502102732195953e-02 -1.0434887961818418e+00 3.1241617499531409e+00 3.2978850650225713e+00 1.3957000000000000e-01 1 0 0 0 0 -P 189 111 2.0070706376734491e-02 -7.0135766106683461e-01 3.3675483594623192e+00 3.4425146267966618e+00 1.3497999999999999e-01 2 0 0 -114 0 -V -29 0 0 0 0 0 0 2 0 -P 190 211 6.0515548805711243e-02 -7.5842708879401355e-01 1.0059791141196675e+00 1.2689946980223401e+00 1.3957000000000000e-01 1 0 0 0 0 -P 191 -211 -1.0819266888464543e-01 -2.5677967550644770e-01 1.4308860604703502e+00 1.4644303186911753e+00 1.3957000000000000e-01 1 0 0 0 0 -V -30 0 0 0 0 0 0 2 0 -P 192 211 3.2630837518369948e-01 1.2528291854798834e-01 -9.1079671575371779e-01 9.8549652851884084e-01 1.3957000000000000e-01 1 0 0 0 0 -P 193 -211 -1.8721057036304636e-01 -4.5597688585249807e-01 -8.2213318313620309e-01 9.6868233895383105e-01 1.3957000000000000e-01 1 0 0 0 0 -V -31 0 1.9363804248396288e-05 -1.4049194748185942e-05 -1.4692489235742219e-04 1.4899380618883134e-04 0 2 0 -P 194 22 2.3644587135507725e-01 -1.2558235327998157e-01 -1.9632153706257331e+00 1.9813864259647422e+00 0 1 0 0 0 0 -P 195 22 1.7737180278809139e-01 -1.7465849917339041e-01 -1.1766695636128137e+00 1.2027126047774541e+00 0 1 0 0 0 0 -V -32 0 0 0 0 0 0 2 0 -P 196 -211 -7.0389269565655677e-01 -3.1919107716430056e-02 -1.8774282217689745e+01 1.8788018424804608e+01 1.3957000000000000e-01 1 0 0 0 0 -P 197 211 -1.7492617419341611e-01 -3.8276425193759644e-01 -4.9597781553916187e+00 4.9795568853643175e+00 1.3957000000000000e-01 1 0 0 0 0 -V -33 0 0 0 0 0 0 2 0 -P 198 2212 -5.1743590343267754e-01 4.2825914755438255e-01 -1.0893061128262852e+03 1.0893067239933462e+03 9.3827000000000005e-01 1 0 0 0 0 -P 199 111 1.8917548469115111e-02 2.0422630417328605e-01 -1.7583218167193181e+02 1.7583235310194934e+02 1.3497999999999999e-01 2 0 0 -115 0 -V -34 0 3.2334201386706010e-05 5.9245798152790670e-06 -1.2135968341715789e-01 1.2135968897646612e-01 0 2 0 -P 200 22 1.6703387848561871e-01 5.7069751590140542e-02 -4.1826167954092972e+02 4.1826171678707635e+02 0 1 0 0 0 0 -P 201 22 9.9196037593150224e-02 -8.2885750223403894e-03 -5.8097680311353236e+02 5.8097681164102789e+02 0 1 0 0 0 0 -V -35 0 0 0 0 0 0 2 0 -P 202 311 -2.5901715207887410e-01 -6.0542629745708865e-01 -4.0542979190677522e+02 4.0543063213315133e+02 4.9767000000000000e-01 2 0 0 -116 0 -P 203 211 2.8598252516876038e-01 -1.7893990607076177e-01 -2.2708235927663534e+02 2.2708265274987977e+02 1.3957000000000000e-01 1 0 0 0 0 -V -36 0 0 0 0 0 0 1 0 -P 204 130 -5.1319872938403244e-01 -3.5703956672451648e-01 -6.6805309680723667e+02 6.6805357470741524e+02 4.9767000000000000e-01 1 0 0 0 0 -V -37 0 0 0 0 0 0 2 0 -P 205 211 5.0113066374848658e-01 -1.7917812277643974e-01 -1.9423655414467504e+02 1.9423733339016991e+02 1.3957000000000000e-01 1 0 0 0 0 -P 206 111 -2.2653332810387683e-01 -2.8113619229296893e-01 -1.9147601799003647e+02 1.9147640596122679e+02 1.3497999999999999e-01 2 0 0 -117 0 -V -38 0 0 0 0 0 0 3 0 -P 207 211 -1.2953975496923764e-01 -6.3100220954130662e-02 -6.4093109045566621e+00 6.4124494728746901e+00 1.3957000000000000e-01 1 0 0 0 0 -P 208 -211 -6.5502456608810988e-02 -1.0670875197924584e-01 -3.2314799704027415e+01 3.2315343677978753e+01 1.3957000000000000e-01 1 0 0 0 0 -P 209 111 -3.8422305313766852e-01 1.5028302730875231e-01 -4.5360292923159719e+01 4.5362369933879265e+01 1.3497999999999999e-01 2 0 0 -118 0 -V -39 0 0 0 0 0 0 2 0 -P 210 -211 2.5359517635261491e-01 -7.4343477557339457e-02 -3.1117407054990411e+00 3.1260594155076933e+00 1.3957000000000000e-01 1 0 0 0 0 -P 211 111 -3.2681884277691242e-01 4.3998200609129667e-01 -1.3698938528391123e+01 1.3710562757477057e+01 1.3497999999999999e-01 2 0 0 -119 0 -V -40 0 0 0 0 0 0 3 0 -P 212 111 -7.8940863078874490e-02 -1.7382885204461537e-01 -1.5695053597983348e+00 1.5868253856371490e+00 1.3497999999999999e-01 2 0 0 -120 0 -P 213 111 -7.8383943780866334e-03 -2.5856424870530047e-02 -1.3381901875049935e+00 1.3452518624659702e+00 1.3497999999999999e-01 2 0 0 -121 0 -P 214 221 6.4900290020672255e-02 -4.4057740462636476e-02 -2.0562824278408782e+00 2.1293548454136566e+00 5.4744999999999999e-01 2 0 0 -122 0 -V -41 0 0 0 0 0 0 2 0 -P 215 211 -1.8048202178105321e-02 -1.0093102102911666e+00 -5.4042555680151514e+00 5.4994991469698977e+00 1.3957000000000000e-01 1 0 0 0 0 -P 216 111 8.7518585113978108e-03 7.5995291486977395e-02 -3.8164316030992712e-01 4.1197449140322134e-01 1.3497999999999999e-01 2 0 0 -123 0 -V -42 0 6.0737920994850714e-07 -6.5521668592152024e-07 -2.8635871526700522e-06 3.2270496719116053e-06 0 2 0 -P 217 22 3.6690098624894099e-02 3.2104328088457951e-02 -5.1174608902313651e-02 7.0680208088407345e-02 0 1 0 0 0 0 -P 218 22 3.2218662320975935e-02 -1.0644037587932491e-01 -2.7370684788599875e-01 2.9543702272865918e-01 0 1 0 0 0 0 -V -43 0 0 0 0 0 0 1 0 -P 219 310 8.0944838552899079e-01 -2.2401821592795629e-01 -2.2078412448770441e+00 2.4140483096622671e+00 4.9767000000000000e-01 2 0 0 -124 0 -V -44 0 0 0 0 0 0 1 0 -P 220 130 2.0825369584158310e-01 -2.9899435700293758e-01 -7.9825277911540260e+00 8.0063220390387517e+00 4.9767000000000000e-01 1 0 0 0 0 -V -45 0 0 0 0 0 0 3 0 -P 221 -211 2.0336907664022314e-02 -6.8795029656673473e-02 -1.2781071680927664e-01 2.0238999518281200e-01 1.3957000000000000e-01 1 0 0 0 0 -P 222 211 -6.8179243585667487e-02 -8.9502122733327735e-02 -3.5872734119120031e-01 4.0102883867347155e-01 1.3957000000000000e-01 1 0 0 0 0 -P 223 111 9.6442464484397972e-02 -1.3582615380310958e-01 -7.6925620551999541e-01 7.9857661069166797e-01 1.3497999999999999e-01 2 0 0 -125 0 -V -46 0 0 0 0 0 0 3 0 -P 224 111 2.6160440603946145e-01 3.8824481999259884e-02 -1.0269049807729116e+00 1.0689703670345518e+00 1.3497999999999999e-01 2 0 0 -126 0 -P 225 111 -1.7096717800365663e-02 2.3430492041171140e-02 -2.9482920802539647e-01 3.2555360237865472e-01 1.3497999999999999e-01 2 0 0 -127 0 -P 226 111 -1.2923175399401406e-03 -3.4357452815580718e-02 -7.2489645177744166e-01 7.3815755150789031e-01 1.3497999999999999e-01 2 0 0 -128 0 -V -47 0 0 0 0 0 0 2 0 -P 227 -211 4.0983186168897998e-02 4.1316543328976252e-01 -4.9254568519727593e-01 6.5914060239111794e-01 1.3957000000000000e-01 1 0 0 0 0 -P 228 211 -1.8340879492189527e-01 -2.1217788017682243e-01 -4.4027072040772847e-01 5.4034834231204232e-01 1.3957000000000000e-01 1 0 0 0 0 -V -48 0 0 0 0 0 0 2 0 -P 229 -211 1.4311547145631315e-01 -6.9370880998933593e-01 -2.0936733660680962e+00 2.2146471276277619e+00 1.3957000000000000e-01 1 0 0 0 0 -P 230 111 4.8683959823501871e-01 1.6019262842131735e-01 -9.3312701072855297e-01 1.0731356350254004e+00 1.3497999999999999e-01 2 0 0 -129 0 -V -49 0 0 0 0 0 0 2 0 -P 231 211 -5.9605235147848823e-01 3.4238597371628854e-03 -1.0703021959451100e+00 1.2330112343622257e+00 1.3957000000000000e-01 1 0 0 0 0 -P 232 111 1.5134720443552790e-01 2.3316725891878089e-02 -1.0875069644217970e-01 2.3129193754522784e-01 1.3497999999999999e-01 2 0 0 -130 0 -V -50 0 0 0 0 0 0 2 0 -P 233 -211 -1.9269073508976683e-01 1.6767418600061659e-01 1.4340467581323610e+00 1.4632888441624703e+00 1.3957000000000000e-01 1 0 0 0 0 -P 234 111 -1.0701046239974184e-01 4.0837590445731536e-01 5.4634206967446686e-01 7.0351359325923257e-01 1.3497999999999999e-01 2 0 0 -131 0 -V -51 0 0 0 0 0 0 2 0 -P 235 311 6.3943275598408489e-01 1.2113139656898524e+00 3.6184751514319600e+00 3.9009221503807563e+00 4.9767000000000000e-01 2 0 0 -132 0 -P 236 211 -1.0332680675003121e-01 3.3144169812122276e-01 5.1385596659843058e-01 6.3565538427314960e-01 1.3957000000000000e-01 1 0 0 0 0 -V -52 0 0 0 0 0 0 2 0 -P 237 -321 6.0112350196689945e-01 1.3754851910638788e+00 3.6979799224894263e+00 4.0214432039490360e+00 4.9359999999999998e-01 1 0 0 0 0 -P 238 111 1.0752995164331018e+00 2.8906487567215131e+00 7.7248778457409824e+00 8.3188987622639523e+00 1.3497999999999999e-01 2 0 0 -133 0 -V -53 0 0 0 0 0 0 3 0 -P 239 111 2.8770026660581679e-03 5.7529118234130172e-01 2.0142417965499644e+00 2.0991326392090666e+00 1.3497999999999999e-01 2 0 0 -134 0 -P 240 111 -3.1779121290212139e-02 5.5540485052736488e-01 1.4046209535474936e+00 1.5167940150475190e+00 1.3497999999999999e-01 2 0 0 -135 0 -P 241 111 1.9411932483124106e-01 5.9987065342701418e-01 1.9607331550552445e+00 2.0640303338005435e+00 1.3497999999999999e-01 2 0 0 -136 0 -V -54 0 5.4954611087139647e-05 6.8635576106003366e-05 1.2494022215636810e-04 1.5431894564725410e-04 0 2 0 -P 242 22 2.7045544910683439e-01 2.8952946094327370e-01 4.6146839849127375e-01 6.0821586752713319e-01 0 1 0 0 0 0 -P 243 22 7.0460546608299382e-02 1.3625766240761386e-01 3.1360978691828562e-01 3.4911593725302786e-01 0 1 0 0 0 0 -V -55 0 9.6240369574681310e-05 7.5392473585625148e-04 2.8031584815723328e-03 2.9052058412651406e-03 0 2 0 -P 244 22 8.6498389738220507e-02 2.8849502818976608e-01 1.1962677619018982e+00 1.2335995747742843e+00 0 1 0 0 0 0 -P 245 22 9.9865851746466866e-02 1.1714392193129286e+00 4.2318961831067856e+00 4.3921735322597746e+00 0 1 0 0 0 0 -V -56 0 0 0 0 0 0 3 0 -P 246 -211 4.9508715212394944e-01 7.9494983361117566e-01 2.6140269814839323e+00 2.7802290141250303e+00 1.3957000000000000e-01 1 0 0 0 0 -P 247 211 2.9246050150768399e-01 2.7688149449938243e-01 1.5693519673596861e+00 1.6262047501142205e+00 1.3957000000000000e-01 1 0 0 0 0 -P 248 111 2.1938108245656321e-01 2.7911573154785918e-01 2.5748643801448514e+00 2.6027254614107957e+00 1.3497999999999999e-01 2 0 0 -137 0 -V -57 0 8.3373127297123383e-06 -2.6798931049491529e-05 6.0194818227837910e-06 2.9420739543035361e-05 0 2 0 -P 249 22 7.9399386678645364e-02 -1.3411768106791125e-01 -1.4409354255737384e-02 1.5652298383958299e-01 0 1 0 0 0 0 -P 250 22 9.4972394969514082e-02 -4.2637195208601375e-01 1.4030456822520732e-01 4.5880079467754337e-01 0 1 0 0 0 0 -V -58 0 0 0 0 0 0 2 0 -P 251 -211 -2.5832734309574518e-02 -4.0424593103120743e-01 -1.2480732107260117e-01 4.4624965569792446e-01 1.3957000000000000e-01 1 0 0 0 0 -P 252 211 -2.9299877647187089e-01 3.1963917806909597e-01 2.6394989349136422e-01 5.2646635062917657e-01 1.3957000000000000e-01 1 0 0 0 0 -V -59 0 -5.4768382651334292e-05 -1.2092719775668951e-04 7.1245113617988620e-05 1.6291191074476475e-04 0 2 0 -P 253 22 1.7493171764315394e-02 -1.3904813024503002e-02 -1.1450675993148609e-02 2.5109218711905378e-02 0 1 0 0 0 0 -P 254 22 -1.3676863020353203e-01 -2.4945236956791661e-01 1.6660942228000178e-01 3.2968294236019380e-01 0 1 0 0 0 0 -V -60 0 0 0 0 0 0 2 0 -P 255 2112 -1.9138160467729162e-01 3.0369538458739065e-01 -1.5191645722299414e+01 1.5224905561020293e+01 9.3957000000000002e-01 1 0 0 0 0 -P 256 -211 -2.4924753882325268e-01 -5.7307336326951931e-02 -8.0502092127927884e+00 8.0554799125216761e+00 1.3957000000000000e-01 1 0 0 0 0 -V -61 0 0 0 0 0 0 2 0 -P 257 2112 8.3027060514221970e-02 1.0739718499538585e-01 -9.4824633945358805e+00 9.5298652383827278e+00 9.3957000000000002e-01 1 0 0 0 0 -P 258 211 3.7175815217142839e-02 2.6740268932865324e-01 -1.4844147785192647e+00 1.5152073320452397e+00 1.3957000000000000e-01 1 0 0 0 0 -V -62 0 0 0 0 0 0 2 0 -P 259 -2212 1.9997999199392005e-01 5.2159092633940130e-01 -2.9420638804998770e+01 2.9440896511124400e+01 9.3827000000000005e-01 1 0 0 0 0 -P 260 -211 -3.3996362219612538e-03 -2.4490681945780598e-03 -9.8059964122678123e-01 9.9049129059046015e-01 1.3957000000000000e-01 1 0 0 0 0 -V -63 0 0 0 0 0 0 2 0 -P 261 311 -3.7995269441653340e-01 1.6535799088428479e-01 -6.1483584577768262e+00 6.1823696483920711e+00 4.9767000000000000e-01 2 0 0 -138 0 -P 262 211 -3.2410970022291918e-01 -3.5537657560602026e-01 -7.5887342744711495e+00 7.6052420922480319e+00 1.3957000000000000e-01 1 0 0 0 0 -V -64 0 0 0 0 0 0 2 0 -P 263 -321 2.6631810341032058e-01 1.7773913266626884e-01 -2.2183705565824408e+00 2.2950654495671614e+00 4.9359999999999998e-01 1 0 0 0 0 -P 264 321 5.6285097287058927e-01 4.6545950697236843e-01 -3.1778246174274649e+00 3.2978271679122821e+00 4.9359999999999998e-01 1 0 0 0 0 -V -65 0 0 0 0 0 0 2 0 -P 265 -311 -3.9453058218165832e-01 2.5328290511276014e-01 -7.7255254295189668e-01 1.0316586018738949e+00 4.9767000000000000e-01 2 0 0 -139 0 -P 266 -211 -4.9735599405596756e-02 -2.6708316642768254e-01 -2.9208743241984952e-01 4.2261318095261929e-01 1.3957000000000000e-01 1 0 0 0 0 -V -66 0 0 0 0 0 0 2 0 -P 267 211 4.6420703636526520e-02 -3.1935185958196421e-01 -2.6465407149408987e-01 4.4007051071727998e-01 1.3957000000000000e-01 1 0 0 0 0 -P 268 111 4.2313793796367721e-01 9.7966164171689893e-02 5.4268928151349305e-01 7.0807791981977419e-01 1.3497999999999999e-01 2 0 0 -140 0 -V -67 0 0 0 0 0 0 3 0 -P 269 -211 1.6386205957906591e-01 -2.8797173352374816e-01 -3.9627447208558847e-01 5.3506236646289917e-01 1.3957000000000000e-01 1 0 0 0 0 -P 270 211 -1.4271113813788025e-02 -1.6982856077004688e-02 -5.1470645008149614e-03 1.4141555523701732e-01 1.3957000000000000e-01 1 0 0 0 0 -P 271 111 1.3605163797175168e-01 2.3453626189350621e-01 -3.3108250223819413e-01 4.4872322207133397e-01 1.3497999999999999e-01 2 0 0 -141 0 -V -68 0 0 0 0 0 0 2 0 -P 272 -211 -3.7696463658742585e-01 4.6783841638839324e-01 2.6462046064315636e-01 6.7117724497876563e-01 1.3957000000000000e-01 1 0 0 0 0 -P 273 111 1.6228776433218009e-01 -4.0425537266713100e-02 -2.6536335188142224e-01 3.4148038221394672e-01 1.3497999999999999e-01 2 0 0 -142 0 -V -69 0 0 0 0 0 0 2 0 -P 274 -211 4.5889677578228821e-01 -5.1523219110723040e-01 9.6187324222664792e+00 9.6444566284284221e+00 1.3957000000000000e-01 1 0 0 0 0 -P 275 211 -2.8494447274304274e-01 9.9144559728567477e-02 2.3859558054260877e+00 2.4090014293513886e+00 1.3957000000000000e-01 1 0 0 0 0 -V -70 0 0 0 0 0 0 3 0 -P 276 111 -2.9460756327081435e-03 9.2886448846853601e-03 1.7698034532282698e+00 1.7749700903801551e+00 1.3497999999999999e-01 2 0 0 -143 0 -P 277 111 -1.4355787675334006e-01 2.4399905742791486e-01 2.9250863072903583e+00 2.9418521223034277e+00 1.3497999999999999e-01 2 0 0 -144 0 -P 278 111 -4.9167220466248530e-02 3.5605701780104602e-02 6.1268254615206985e-01 6.3030523108015979e-01 1.3497999999999999e-01 2 0 0 -145 0 -V -71 0 -7.5868240100300521e-05 2.1564214861322876e-04 2.4770455533049511e-02 2.4771568448014918e-02 0 2 0 -P 279 22 1.2440521239830230e-02 1.3976757843603155e-02 4.1819631103660040e+00 4.1820049704406896e+00 0 1 0 0 0 0 -P 280 22 -2.0331319966104358e-01 5.2854530978175718e-01 5.8136645928885947e+01 5.8139403989568891e+01 0 1 0 0 0 0 -V -72 0 0 0 0 0 0 2 0 -P 281 321 2.1642746277190641e-01 -6.7327959002127669e-01 2.1482677626049064e+01 2.1499981981335011e+01 4.9359999999999998e-01 1 0 0 0 0 -P 282 111 -8.5724359704836925e-02 5.6304652189988848e-02 7.7384665104011416e+00 7.7403231465298052e+00 1.3497999999999999e-01 2 0 0 -146 0 -V -73 0 0 0 0 0 0 1 0 -P 283 310 -4.9885948856357186e-02 1.2822300091927889e-02 4.5329270329114166e+00 4.5604556717363280e+00 4.9767000000000000e-01 2 0 0 -147 0 -V -74 0 0 0 0 0 0 2 0 -P 284 321 -2.7920309589361664e-01 -2.9417814389614927e-01 2.2570322131419886e+02 2.2570412545568442e+02 4.9359999999999998e-01 1 0 0 0 0 -P 285 -211 -3.1422244950363426e-01 -4.4329822380123687e-02 3.7312147425334075e+02 3.7312163530094614e+02 1.3957000000000000e-01 1 0 0 0 0 -V -75 0 0 0 0 0 0 2 0 -P 286 3122 7.4262577958025780e-02 -2.4548660956187812e-01 2.0956003441221887e+03 2.0956006568059443e+03 1.1156800000000000e+00 2 0 0 -148 0 -P 287 211 -3.9039541146372155e-02 2.1107166763967344e-01 4.2163294363264680e+02 4.2163302137220023e+02 1.3957000000000000e-01 1 0 0 0 0 -V -76 0 0 0 0 0 0 2 0 -P 288 -211 -2.0057133852812120e-01 6.3358175356901622e-02 5.3623025438152285e+02 5.3623031379900362e+02 1.3957000000000000e-01 1 0 0 0 0 -P 289 111 3.1720852422812107e-01 -3.0976971985094492e-01 5.7528165457763157e+02 5.7528184126713484e+02 1.3497999999999999e-01 2 0 0 -149 0 -V -77 0 0 0 0 0 0 2 0 -P 290 -211 -3.5297618575010037e-01 5.2153555934991228e-02 -8.0473046163509775e+02 8.0473055284076520e+02 1.3957000000000000e-01 1 0 0 0 0 -P 291 211 -4.3236004417965990e-01 8.1308540264093787e-01 -8.7028198251002880e+02 8.7028248092469994e+02 1.3957000000000000e-01 1 0 0 0 0 -V -78 0 0 0 0 0 0 2 0 -P 292 421 -1.7659721204514614e+01 -1.3074065417320448e+01 2.7202781467015444e+02 2.7292014446359110e+02 1.8645000000000000e+00 2 0 0 -150 0 -P 293 111 -1.4776451472050109e+00 -1.0577813465072390e+00 2.2908056187391484e+01 2.2980417629868313e+01 1.3497999999999999e-01 2 0 0 -151 0 -V -79 0 0 0 0 0 0 2 0 -P 294 -211 -1.1583166595630789e+00 -1.0356886852578260e+00 2.0998472633156180e+01 2.1056345391518004e+01 1.3957000000000000e-01 1 0 0 0 0 -P 295 211 -4.0033937843749587e+00 -2.6524733090065382e+00 5.2159779948282527e+01 5.2380577511954947e+01 1.3957000000000000e-01 1 0 0 0 0 -V -80 0 -1.4431088124816109e-05 -4.8928852593760701e-06 4.1880274008966248e-04 4.1945629741203458e-04 0 2 0 -P 296 22 -8.5756643853515627e-02 3.5367132902272655e-02 1.2404140135934969e+00 1.2438777918967254e+00 0 1 0 0 0 0 -P 297 22 -2.3881849645594963e-02 -7.2540252771141386e-02 1.9413905114422942e+00 1.9428920579725391e+00 0 1 0 0 0 0 -V -81 0 0 0 0 0 0 2 0 -P 298 -211 -3.7116803471142029e-01 -1.5843331213655415e-01 3.3881934198240016e+00 3.4149965240721345e+00 1.3957000000000000e-01 1 0 0 0 0 -P 299 111 -1.4863948599066970e+00 -2.4605035091902030e+00 2.7696156184156585e+01 2.7845264124728452e+01 1.3497999999999999e-01 2 0 0 -152 0 -V -82 0 0 0 0 0 0 2 0 -P 300 211 -1.3102071172472114e+00 -6.6653559707336441e-01 1.4736991379972928e+01 1.4810783473893188e+01 1.3957000000000000e-01 1 0 0 0 0 -P 301 -211 -6.6001250531248001e-01 -8.3817907178677653e-02 3.8600596933206637e+00 3.9194620255376229e+00 1.3957000000000000e-01 1 0 0 0 0 -V -83 0 0 0 0 0 0 3 0 -P 302 111 -1.0129607511280893e-01 1.7331886710189474e-02 1.1003937127586700e+00 1.1133944550827461e+00 1.3497999999999999e-01 2 0 0 -153 0 -P 303 111 2.6736441445761979e-02 -6.4664089522388349e-02 2.1034626839622458e-01 2.5954081529339207e-01 1.3497999999999999e-01 2 0 0 -154 0 -P 304 221 -1.1025089952773082e-01 9.3855832111780987e-03 2.3898831919172103e+00 2.4542792268866394e+00 5.4744999999999999e-01 2 0 0 -155 0 -V -84 0 0 0 0 0 0 2 0 -P 305 311 2.1723555449960955e-01 2.5511909827769035e+00 2.9876035175259780e+01 2.9989680224020404e+01 4.9767000000000000e-01 2 0 0 -156 0 -P 306 211 3.3032821126792672e-01 6.6929463924130272e-01 6.4845571157288475e+00 6.5288615250536779e+00 1.3957000000000000e-01 1 0 0 0 0 -V -85 0 0 0 0 0 0 2 0 -P 307 -311 7.4141747198539887e-01 1.8100047541943822e+00 1.5235835672865862e+01 1.5368935589605529e+01 4.9767000000000000e-01 2 0 0 -157 0 -P 308 -211 5.8970851337611008e-01 1.9279465025540885e+00 1.8876557468741275e+01 1.8984431397938966e+01 1.3957000000000000e-01 1 0 0 0 0 -V -86 0 0 0 0 0 0 2 0 -P 309 -211 5.6503765038489062e-01 2.3392525032674194e+00 1.9776469739542058e+01 1.9922841287434835e+01 1.3957000000000000e-01 1 0 0 0 0 -P 310 211 -1.1698407055756944e-01 6.6383270616705115e-01 9.5858997540570403e+00 9.6105833857405401e+00 1.3957000000000000e-01 1 0 0 0 0 -V -87 0 0 0 0 0 0 2 0 -P 311 211 1.3668928578316808e+00 3.5273910635892820e+00 3.2919426948257488e+01 3.3136370262701405e+01 1.3957000000000000e-01 1 0 0 0 0 -P 312 111 3.4083938668539631e+00 7.3637743950997869e+00 8.1016841670164283e+01 8.1422289183628351e+01 1.3497999999999999e-01 2 0 0 -158 0 -V -88 0 0 0 0 0 0 2 0 -P 313 321 5.1398658600433409e+00 1.0815446396235405e+01 1.1230433937571154e+02 1.1294202222992146e+02 4.9359999999999998e-01 1 0 0 0 0 -P 314 -211 1.4809390437974521e+00 3.6232085950452890e+00 3.9666759311137888e+01 3.9859654978528077e+01 1.3957000000000000e-01 1 0 0 0 0 -V -89 0 0 0 0 0 0 2 0 -P 315 311 8.3836765391802071e-01 1.1061415327090975e+00 -2.0993031465343575e+00 2.5653768813702778e+00 4.9767000000000000e-01 2 0 0 -159 0 -P 316 211 1.0392575238106148e+00 7.2574223863792198e-01 -2.9001820808281353e+00 3.1681688535488077e+00 1.3957000000000000e-01 1 0 0 0 0 -V -90 0 0 0 0 0 0 2 0 -P 317 311 1.6058894356953304e-02 -3.9658053507255009e-01 -2.7554049904710340e+00 2.8279791546790221e+00 4.9767000000000000e-01 2 0 0 -160 0 -P 318 211 -4.9457973416370704e-01 -2.4449879686077405e-01 -2.6488057631132196e+00 2.7092509168981773e+00 1.3957000000000000e-01 1 0 0 0 0 -V -91 0 0 0 0 0 0 2 0 -P 319 211 5.5367043874559790e-02 5.2998456753257217e-01 5.0211679739135224e+00 5.0512925829459654e+00 1.3957000000000000e-01 1 0 0 0 0 -P 320 111 -2.6308556172843650e-01 -1.0479134122864993e-01 1.3534295300588093e+00 1.3893114594005462e+00 1.3497999999999999e-01 2 0 0 -161 0 -V -92 0 0 0 0 0 0 1 0 -P 321 130 3.6602657683902218e-01 2.7637537539729494e-02 1.1512728067232807e+00 1.3068449765883683e+00 4.9767000000000000e-01 1 0 0 0 0 -V -93 0 0 0 0 0 0 2 0 -P 322 -321 -1.8424422202606633e-01 1.0267733119375648e-01 3.3182378596813287e+00 3.3613735319231615e+00 4.9359999999999998e-01 1 0 0 0 0 -P 323 211 2.5061687005741484e-01 4.1111105095076861e-01 1.4668363167462029e+00 1.5501321481721444e+00 1.3957000000000000e-01 1 0 0 0 0 -V -94 0 4.9204414482214235e-05 9.3279171563236449e-05 3.5046945812757313e-05 1.2049586895639305e-04 0 2 0 -P 324 22 1.4638419996119670e-03 5.3436389585819963e-02 -2.7413433695101901e-02 6.0075676544863857e-02 0 1 0 0 0 0 -P 325 22 1.4114779065072622e-01 2.1691933131626764e-01 1.2899176186669112e-01 2.8916356916760982e-01 0 1 0 0 0 0 -V -95 0 0 0 0 0 0 2 0 -P 326 -211 -1.7165868603711240e-01 -4.4258740952734626e-01 6.6513282107305505e-01 8.2899443552578533e-01 1.3957000000000000e-01 1 0 0 0 0 -P 327 111 4.1393041000816050e-01 1.7855384603152144e-01 6.8502876375156219e-01 8.3108595694378429e-01 1.3497999999999999e-01 2 0 0 -162 0 -V -96 0 0 0 0 0 0 3 0 -P 328 -211 -3.9561090808922145e-01 -2.1572664482033080e-01 -2.0918580262695435e-01 5.1602757756276807e-01 1.3957000000000000e-01 1 0 0 0 0 -P 329 211 -7.2592869091610646e-01 -5.6546117318346967e-01 -8.6889461933755874e-01 1.2732542743250301e+00 1.3957000000000000e-01 1 0 0 0 0 -P 330 111 7.5195477124670789e-03 -3.7276307923386154e-02 -2.3492322655699543e-01 2.7359566792284662e-01 1.3497999999999999e-01 2 0 0 -163 0 -V -97 0 0 0 0 0 0 2 0 -P 331 211 -2.1245054419147788e-01 -9.4426467212448351e-01 -1.0757049671517334e+00 1.4537509986254611e+00 1.3957000000000000e-01 1 0 0 0 0 -P 332 111 -4.0237996847179375e-01 -1.8278784340935744e-01 -9.6114577330509182e-02 4.7199432952211190e-01 1.3497999999999999e-01 2 0 0 -164 0 -V -98 0 0 0 0 0 0 2 0 -P 333 211 2.0149439122852938e-01 -5.3302766918694060e-02 5.7020627225908882e-01 6.2294153215317916e-01 1.3957000000000000e-01 1 0 0 0 0 -P 334 111 -3.3335360091003480e-01 5.6583731288352612e-01 2.2813085968389601e+00 2.3777899407437744e+00 1.3497999999999999e-01 2 0 0 -165 0 -V -99 0 -3.5153111932296456e-07 1.6115135681743178e-05 4.6661535374685549e-05 4.9448443747731639e-05 0 2 0 -P 335 22 -9.2603642081564800e-03 7.6483303944505310e-01 2.1439769219474183e+00 2.2763330982997969e+00 0 1 0 0 0 0 -P 336 22 -7.4857902311984215e-03 2.8558964801153959e-03 7.8874014455751498e-02 7.9279905123913585e-02 0 1 0 0 0 0 -V -100 0 0 0 0 0 0 2 0 -P 337 -211 9.3383194809242093e-02 -2.6183692551778537e-01 6.6393712447782982e-01 7.3319253051110411e-01 1.3957000000000000e-01 1 0 0 0 0 -P 338 111 6.7289261809585277e-02 1.3713406947866838e-01 4.0726953178542686e+00 4.0777935639557263e+00 1.3497999999999999e-01 2 0 0 -166 0 -V -101 0 -1.9219786930458220e+00 -2.4415068214109641e+00 2.4918920370571573e+02 2.4927833695139438e+02 0 2 0 -P 339 2112 -3.3088369099467252e-01 -5.7444073773084292e-01 3.9933593320707132e+01 3.9950145600068296e+01 9.3957000000000002e-01 1 0 0 0 0 -P 340 211 -5.6758936924963282e-02 8.2014820752740830e-02 1.0325214502289962e+01 1.0326639449062938e+01 1.3957000000000000e-01 1 0 0 0 0 -V -102 0 -2.1522575615476658e+01 -4.3850708113160948e+02 3.2110018097210530e+04 3.2113842334975812e+04 0 2 0 -P 341 -3122 -6.1950855666021008e-02 -1.8608321980917468e+00 1.4056162772703544e+02 1.4057838548480370e+02 1.1156800000000000e+00 2 0 0 -167 0 -P 342 111 -6.1144406211079527e-02 -6.4714570154417439e-01 4.3086981861879245e+01 4.3092096279523801e+01 1.3497999999999999e-01 2 0 0 -168 0 -V -103 0 0 0 0 0 0 2 0 -P 343 -311 2.3049720807893612e-01 2.8623903870378370e-01 1.6043582351245217e+01 1.6055505966499382e+01 4.9767000000000000e-01 2 0 0 -169 0 -P 344 111 4.3323721233431339e-02 -1.5003883936399090e-01 1.1853284016418417e+00 1.2031673276307036e+00 1.3497999999999999e-01 2 0 0 -170 0 -V -104 0 0 0 0 0 0 3 0 -P 345 211 -9.5026966603014729e-03 1.0472305562351994e-01 5.4539722523898408e+00 5.4567710538707095e+00 1.3957000000000000e-01 1 0 0 0 0 -P 346 -211 1.5951683483820989e-01 -1.9899631133411760e-01 1.3219014899412011e+01 1.3222211609571907e+01 1.3957000000000000e-01 1 0 0 0 0 -P 347 111 -7.4674051730606081e-02 -1.1330685333969616e-01 1.8391615088576583e+00 1.8490941871844135e+00 1.3497999999999999e-01 2 0 0 -171 0 -V -105 0 0 0 0 0 0 2 0 -P 348 211 9.4240763765740421e-02 -2.0039207547628959e-01 4.4634358422556447e-01 5.1743664882589113e-01 1.3957000000000000e-01 1 0 0 0 0 -P 349 -211 1.2820088924631756e-01 5.1534025291000973e-01 1.0318751511090531e+00 1.1688700341138147e+00 1.3957000000000000e-01 1 0 0 0 0 -V -106 0 1.7283871159768377e-04 -5.1237670737495545e-05 4.6694794270726891e-04 5.0505361596110525e-04 0 2 0 -P 350 22 2.0590099653440450e-01 -1.0805686291631406e-01 4.5142756285929947e-01 5.0779754873991134e-01 0 1 0 0 0 0 -P 351 22 1.4033350106869832e-01 5.4163779105943517e-03 4.8397333694826589e-01 5.0393751552023625e-01 0 1 0 0 0 0 -V -107 0 -5.9571695161317901e+00 1.2245768940169006e+01 2.8503800469478131e+02 2.9797787574076551e+02 0 2 0 -P 352 -2212 -2.0445056851432947e-01 3.2050366895688145e-02 2.9022963766333598e+00 3.0572049508829320e+00 9.3827000000000005e-01 1 0 0 0 0 -P 353 111 1.2185508809238729e-01 1.3773583207185866e-01 1.0497232649974710e+00 1.0742245367740775e+00 1.3497999999999999e-01 2 0 0 -172 0 -V -108 0 -9.6322276038832619e+00 9.1930061220952801e+00 1.6049331662647239e+02 1.6189071810331086e+02 0 2 0 -P 354 2212 -4.0557945128879624e-01 6.3010018115544275e-01 8.6263887815885774e+00 8.7095611217567726e+00 9.3827000000000005e-01 1 0 0 0 0 -P 355 111 -2.8752136302370007e-01 3.1395818652041142e-02 2.9221390377369709e+00 2.9395187340600821e+00 1.3497999999999999e-01 2 0 0 -173 0 -V -109 0 0 0 0 0 0 2 0 -P 356 22 8.2860331849337263e-02 2.5946703798069704e-01 5.8422378213656290e-01 6.4459786379308515e-01 0 1 0 0 0 0 -P 357 111 1.6254024186608135e-01 -5.4323460646157928e-01 1.7376202728837526e+00 1.8327757585203810e+00 1.3497999999999999e-01 2 0 0 -174 0 -V -110 0 0 0 0 0 0 2 0 -P 358 3122 8.2287967470987355e-01 -4.8977375048154131e-01 1.9007652783367175e+00 2.4030521824217304e+00 1.1156800000000000e+00 2 0 0 -175 0 -P 359 22 4.2440133887952043e-02 4.8963717863264443e-02 5.5112841739653869e-02 8.5064892617582183e-02 0 1 0 0 0 0 -V -111 0 1.9575759832658340e-06 -8.4215463207310107e-06 3.4437014986610818e-05 3.5510543948550919e-05 0 2 0 -P 360 22 3.8993041770294784e-01 -1.7748547164591819e+00 7.3603534731863398e+00 7.5813559635089769e+00 0 1 0 0 0 0 -P 361 22 6.5790980468783872e-02 -1.8567141221184214e-01 6.5654331790388576e-01 6.8545711368985129e-01 0 1 0 0 0 0 -V -112 0 -1.9123820769240353e-05 -1.0931279074538166e-04 4.2796901319070433e-04 4.4237576117062659e-04 0 2 0 -P 362 22 -2.8016866721716417e-02 -2.9039021747390238e-02 1.1296536115102888e-01 1.1995575194600025e-01 0 1 0 0 0 0 -P 363 22 -1.4452078978212046e-01 -9.5719552670846475e-01 3.7482280417359468e+00 3.8712172488618730e+00 0 1 0 0 0 0 -V -113 0 -5.2829075954546687e-05 -1.9728039359830118e-05 3.2116418888762709e-04 3.3253598813309538e-04 0 2 0 -P 364 22 -9.2677622365995471e-02 3.5763487191755067e-02 4.0184387193941451e-01 4.1394041372978913e-01 0 1 0 0 0 0 -P 365 22 -1.6658093635336459e-02 -7.6592884067167299e-02 2.6284154819225458e-01 2.7428022427690846e-01 0 1 0 0 0 0 -V -114 0 1.9026721056032020e-06 -6.6487627924737098e-05 3.1923840683783920e-04 3.2634509371974645e-04 0 2 0 -P 366 22 -5.2922013066489092e-03 -1.8495279301222559e-01 1.1983795218151989e+00 1.2125794907319167e+00 0 1 0 0 0 0 -P 367 22 2.5362907683383399e-02 -5.1640486805460895e-01 2.1691688376471201e+00 2.2299351360646953e+00 0 1 0 0 0 0 -V -115 0 8.3080161206741342e-07 8.9690026702319606e-06 -7.7220185387585991e-03 7.7220260674473792e-03 0 2 0 -P 368 22 1.2807334442024216e-02 1.6872475428951880e-01 -8.7236246335492766e+01 8.7236410441840746e+01 0 1 0 0 0 0 -P 369 22 6.1102140270908939e-03 3.5501549883767261e-02 -8.8595935336439027e+01 8.8595942660108562e+01 0 1 0 0 0 0 -V -116 0 0 0 0 0 0 1 0 -P 370 130 -2.5901715207887410e-01 -6.0542629745708865e-01 -4.0542979190677522e+02 4.0543063213315133e+02 4.9767000000000000e-01 1 0 0 0 0 -V -117 0 -2.5932220974105986e-05 -3.2182840041165912e-05 -2.1919063527299769e-02 2.1919107939990485e-02 0 2 0 -P 371 22 -1.3648486710504911e-02 -2.4201149018738738e-02 -4.4727716633536524e+01 4.4727725263272021e+01 0 1 0 0 0 0 -P 372 22 -2.1288484139337188e-01 -2.5693504327423017e-01 -1.4674830135649992e+02 1.4674868069795471e+02 0 1 0 0 0 0 -V -118 0 -6.3426606413962393e-05 2.4808356359595279e-05 -7.4879667489093568e-03 7.4883096167834978e-03 0 2 0 -P 373 22 -2.0640267653597780e-01 9.1527235463937567e-02 -3.1540598860155647e+01 3.1541407003444920e+01 0 1 0 0 0 0 -P 374 22 -1.7782037660169078e-01 5.8755791844814761e-02 -1.3819694063004073e+01 1.3820962930434334e+01 0 1 0 0 0 0 -V -119 0 -7.6594382175148806e-05 1.0311568830732706e-04 -3.2105301032281353e-03 3.2132543973279917e-03 0 2 0 -P 375 22 -1.4532360372654066e-01 1.8123345408859942e-01 -4.2544899258831723e+00 4.2608272722702969e+00 0 1 0 0 0 0 -P 376 22 -1.8149523905037179e-01 2.5874855200269725e-01 -9.4444486025079506e+00 9.4497354852067552e+00 0 1 0 0 0 0 -V -120 0 -2.6945611630769845e-05 -5.9334602571253519e-05 -5.3573371544319063e-04 5.4164571933427151e-04 0 2 0 -P 377 22 -5.1425758174186931e-02 -1.9143430287238708e-01 -1.4218012667249478e+00 1.4355523476978096e+00 0 1 0 0 0 0 -P 378 22 -2.7515104904687560e-02 1.7605450827771700e-02 -1.4770409307338708e-01 1.5127303793933949e-01 0 1 0 0 0 0 -V -121 0 -3.9050402682915103e-07 -1.2881513157305690e-06 -6.6667818902411055e-05 6.7019627241645576e-05 0 2 0 -P 379 22 -3.0608461630266422e-02 4.7117413463821520e-02 -7.5238235400289355e-01 7.5447739209987430e-01 0 1 0 0 0 0 -P 380 22 2.2770067252179792e-02 -7.2973838334351560e-02 -5.8580783350209997e-01 5.9077447036609565e-01 0 1 0 0 0 0 -V -122 0 0 0 0 0 0 3 0 -P 381 111 2.9839928828064254e-02 1.0831091175723169e-01 -6.6841704714606320e-01 6.9110247016893900e-01 1.3497999999999999e-01 2 0 0 -176 0 -P 382 111 9.4051595670043689e-02 -1.5755662152753916e-01 -9.1611447140274083e-01 9.4401012534229567e-01 1.3497999999999999e-01 2 0 0 -177 0 -P 383 111 -5.8991234477435692e-02 5.1879693076710056e-03 -4.7175090929207414e-01 4.9424224990242172e-01 1.3497999999999999e-01 2 0 0 -178 0 -V -123 0 1.5187813460115701e-06 1.3188082387851436e-05 -6.6229648474863657e-05 7.1493291597544587e-05 0 2 0 -P 384 22 5.5902947386336610e-02 8.1294574520283755e-02 -3.1554495833037971e-01 3.3060938900859188e-01 0 1 0 0 0 0 -P 385 22 -4.7151088874938803e-02 -5.2992830333063673e-03 -6.6098201979547425e-02 8.1365102394629227e-02 0 1 0 0 0 0 -V -124 0 1.3941114862900531e+02 -3.8582616698811592e+01 -3.8025609716628168e+02 4.1577110253421068e+02 0 2 0 -P 386 211 3.9155250151203191e-01 -2.1528995768384931e-01 -1.5735145062373210e+00 1.6416731750135662e+00 1.3957000000000000e-01 1 0 0 0 0 -P 387 -211 4.1789588401695882e-01 -8.7282582441069474e-03 -6.3432673863972289e-01 7.7237513464870078e-01 1.3957000000000000e-01 1 0 0 0 0 -V -125 0 8.4498806531586952e-06 -1.1900512863807261e-05 -6.7398973710353891e-05 6.9967903545644137e-05 0 2 0 -P 388 22 -2.6630265638253693e-02 -6.5818770699674248e-02 -3.0798444672715158e-01 3.1606281187480750e-01 0 1 0 0 0 0 -P 389 22 1.2307273012265166e-01 -7.0007383103435336e-02 -4.6127175879284371e-01 4.8251379881686041e-01 0 1 0 0 0 0 -V -126 0 7.8004833521485510e-05 1.1576629387707435e-05 -3.0620108155017886e-04 3.1874407920848768e-04 0 2 0 -P 390 22 1.9933684671653129e-01 7.6146875018833646e-02 -6.2136899240287891e-01 6.5698778508720601e-01 0 1 0 0 0 0 -P 391 22 6.2267559322930169e-02 -3.7322393019573769e-02 -4.0553598837003274e-01 4.1198258194734583e-01 0 1 0 0 0 0 -V -127 0 -8.7813863521750088e-06 1.2034602514798763e-05 -1.5143311212175529e-04 1.6721408133485042e-04 0 2 0 -P 392 22 -2.3942903281016213e-03 -3.0130749814585231e-02 -5.2283330825283574e-03 3.0674585203165079e-02 0 1 0 0 0 0 -P 393 22 -1.4702427472264043e-02 5.3561241855756364e-02 -2.8960087494286813e-01 2.9487901717548981e-01 0 1 0 0 0 0 -V -128 0 -2.1423274294986983e-09 -5.6955749109414071e-08 -1.2016903773209067e-06 1.2236738425450761e-06 0 2 0 -P 394 22 2.9979179212612915e-02 -5.2589578798866686e-02 -6.6790136325526994e-01 6.7063898337537198e-01 0 1 0 0 0 0 -P 395 22 -3.1271496752553057e-02 1.8232125983285968e-02 -5.6995088522171715e-02 6.7518568132518497e-02 0 1 0 0 0 0 -V -129 0 6.4230189101412486e-04 2.1134687592085452e-04 -1.2311020831505474e-03 1.4158196050410717e-03 0 2 0 -P 396 22 4.7543339096574699e-01 1.2513612268912652e-01 -8.8650115517581829e-01 1.0136963335116276e+00 0 1 0 0 0 0 -P 397 22 1.1406207269271662e-02 3.5056505732190810e-02 -4.6625855552734644e-02 5.9439301513772705e-02 0 1 0 0 0 0 -V -130 0 6.1987795725867684e-06 9.5499117210155789e-07 -4.4541397254386405e-06 9.4731035377011082e-06 0 2 0 -P 398 22 3.1268929850001737e-02 -1.5940111577112004e-02 2.8161984871342943e-02 4.4999228026143444e-02 0 1 0 0 0 0 -P 399 22 1.2007827458552617e-01 3.9256837468990093e-02 -1.3691268131352266e-01 1.8629270951908428e-01 0 1 0 0 0 0 -V -131 0 -6.1020743762232836e-06 2.3286883231540951e-05 3.1154149503248974e-05 4.0116565936475085e-05 0 2 0 -P 400 22 9.8091349468157167e-03 2.8377074072342766e-02 2.8749442920756804e-03 3.0161942344527581e-02 0 1 0 0 0 0 -P 401 22 -1.1681959734655756e-01 3.7999883038497267e-01 5.4346712538239117e-01 6.7335165091470495e-01 0 1 0 0 0 0 -V -132 0 0 0 0 0 0 1 0 -P 402 310 6.3943275598408489e-01 1.2113139656898524e+00 3.6184751514319600e+00 3.9009221503807563e+00 4.9767000000000000e-01 2 0 0 -179 0 -V -133 0 2.1682042467538229e-04 5.8286243176109223e-04 1.5576230338453930e-03 1.6773997708551909e-03 0 2 0 -P 403 22 2.4201269272194240e-02 6.6012324731882441e-02 2.3795568295198377e-01 2.4812544307272844e-01 0 1 0 0 0 0 -P 404 22 1.0510982471609078e+00 2.8246364319896307e+00 7.4869221627889990e+00 8.0707733191912254e+00 0 1 0 0 0 0 -V -134 0 3.4028799303023395e-07 6.8044664732665194e-05 2.3824180161942965e-04 2.4828257593497463e-04 0 2 0 -P 405 22 -1.8724816343446530e-02 1.8332032364017255e-02 1.8532644632463863e-01 1.8716990640861672e-01 0 1 0 0 0 0 -P 406 22 2.1601819009504697e-02 5.5695914997728446e-01 1.8289153502253255e+00 1.9119627328004498e+00 0 1 0 0 0 0 -V -135 0 -2.8410493234902523e-07 4.9653121634296811e-06 1.2557293115166877e-05 1.3560118830762203e-05 0 2 0 -P 407 22 -4.4743249094535947e-02 1.9716395208185372e-01 6.6189268680366531e-01 6.9208201189183216e-01 0 1 0 0 0 0 -P 408 22 1.2964127804323806e-02 3.5824089844551110e-01 7.4272826674382830e-01 8.2471200315568660e-01 0 1 0 0 0 0 -V -136 0 1.2820883171547144e-04 3.9619298966311092e-04 1.2949937227216559e-03 1.3632177937560695e-03 0 2 0 -P 409 22 9.5401467154298369e-02 1.4201353519440010e-01 4.1464312309795665e-01 4.4855122744902953e-01 0 1 0 0 0 0 -P 410 22 9.8717857676942675e-02 4.5785711823261399e-01 1.5460900319572877e+00 1.6154791063515139e+00 0 1 0 0 0 0 -V -137 0 2.1777252934043211e-04 2.7706919009262037e-04 2.5559848756957063e-03 2.5836416730343919e-03 0 2 0 -P 411 22 2.2477690016267710e-01 2.0485754477111837e-01 1.9801073036459287e+00 2.0033262845698210e+00 0 1 0 0 0 0 -P 412 22 -5.3958177061138798e-03 7.4258186776740800e-02 5.9475707649892273e-01 5.9939917684096833e-01 0 1 0 0 0 0 -V -138 0 0 0 0 0 0 1 0 -P 413 130 -3.7995269441653340e-01 1.6535799088428479e-01 -6.1483584577768262e+00 6.1823696483920711e+00 4.9767000000000000e-01 1 0 0 0 0 -V -139 0 0 0 0 0 0 1 0 -P 414 130 -3.9453058218165832e-01 2.5328290511276014e-01 -7.7255254295189668e-01 1.0316586018738949e+00 4.9767000000000000e-01 1 0 0 0 0 -V -140 0 5.1667498257619163e-05 1.1962214121015359e-05 6.6265382966993475e-05 8.6460256588212749e-05 0 2 0 -P 415 22 1.3628231428135446e-01 -3.0848081013764246e-02 1.8460013377020124e-01 2.3152037205414516e-01 0 1 0 0 0 0 -P 416 22 2.8685562368232276e-01 1.2881424518545415e-01 3.5808914774329187e-01 4.7655754776562892e-01 0 1 0 0 0 0 -V -141 0 1.4713679733888919e-04 2.5364571091757474e-04 -3.5805830609983571e-04 4.8528410808895716e-04 0 2 0 -P 417 22 1.5170505358038230e-01 1.4788339243534807e-01 -2.0395109752352847e-01 2.9407477148008737e-01 0 1 0 0 0 0 -P 418 22 -1.5653415608630622e-02 8.6652869458158130e-02 -1.2713140471466566e-01 1.5464845059124649e-01 0 1 0 0 0 0 -V -142 0 9.7597729456307835e-06 -2.4311387032276793e-06 -1.5958603367984514e-05 2.0536181575424412e-05 0 2 0 -P 419 22 1.7652769046773198e-01 -5.0690402920813803e-02 -2.6675987154484626e-01 3.2387091798549728e-01 0 1 0 0 0 0 -P 420 22 -1.4239926135551901e-02 1.0264865654100702e-02 1.3965196634240379e-03 1.7609464228449393e-02 0 1 0 0 0 0 -V -143 0 -2.1652244280857262e-08 6.8267089224883744e-08 1.3007207375452835e-05 1.3045179682912007e-05 0 2 0 -P 421 22 4.6650114506723746e-02 -3.2179447089061786e-02 1.2307133927841611e+00 1.2320175344437061e+00 0 1 0 0 0 0 -P 422 22 -4.9596190139431888e-02 4.1468091973747144e-02 5.3909006044410879e-01 5.4295255593644887e-01 0 1 0 0 0 0 -V -144 0 -3.5047386073016382e-05 5.9568512439212194e-05 7.1411357862754014e-04 7.1820668730872685e-04 0 2 0 -P 423 22 -1.6211167583281016e-02 1.6029005891738021e-01 1.5450176957825907e+00 1.5533947937415964e+00 0 1 0 0 0 0 -P 424 22 -1.2734670917005905e-01 8.3708998510534635e-02 1.3800686115077676e+00 1.3884573285618313e+00 0 1 0 0 0 0 -V -145 0 -7.8293712475779411e-06 5.6698396843146972e-06 9.7563357563170913e-05 1.0036958783961753e-04 0 2 0 -P 425 22 -4.4907714662178962e-04 2.5252550384878151e-03 5.2306614750949010e-01 5.2307243595291153e-01 0 1 0 0 0 0 -P 426 22 -4.8718143319626740e-02 3.3080446741616781e-02 8.9616398642579656e-02 1.0723279512724822e-01 0 1 0 0 0 0 -V -146 0 -5.4416939621261388e-05 3.5741612642758141e-05 4.9122987480755935e-03 4.9134773215459586e-03 0 2 0 -P 427 22 -2.6387009064352013e-02 8.4004864299616053e-02 5.9618585584390296e+00 5.9625087473567762e+00 0 1 0 0 0 0 -P 428 22 -5.9337350640484919e-02 -2.7700212109627198e-02 1.7766079519621116e+00 1.7778143991730293e+00 0 1 0 0 0 0 -V -147 0 -4.8810730286750834e+00 1.2545934191710093e+00 4.4352264291904982e+02 4.4621617285212420e+02 0 2 0 -P 429 211 -1.7457052418593882e-01 1.4834074360287047e-01 2.2901757748054155e+00 2.3058327581446125e+00 1.3957000000000000e-01 1 0 0 0 0 -P 430 -211 1.2468457532958163e-01 -1.3551844351094258e-01 2.2427512581060007e+00 2.2546229135917155e+00 1.3957000000000000e-01 1 0 0 0 0 -V -148 0 3.3734014604774782e+00 -1.1151308101528222e+01 9.5193318840002597e+04 9.5193333043762643e+04 0 2 0 -P 431 2212 8.1826167453099480e-02 -1.1732909246796693e-01 1.8196620878460528e+03 1.8196623353678799e+03 9.3827000000000005e-01 1 0 0 0 0 -P 432 -211 -7.5635894950737050e-03 -1.2815751709391118e-01 2.7593825627613575e+02 2.7593832143806401e+02 1.3957000000000000e-01 1 0 0 0 0 -V -149 0 5.5860599777425171e-05 -5.4550622136858487e-05 1.0130742338609310e-01 1.0130745626221979e-01 0 2 0 -P 433 22 5.3127991794322899e-02 -3.2276297017659527e-03 4.3064051628352409e+01 4.3064084521216841e+01 0 1 0 0 0 0 -P 434 22 2.6408053243379820e-01 -3.0654209014917899e-01 5.3221760294927924e+02 5.3221775674591811e+02 0 1 0 0 0 0 -V -150 0 -1.5319121601429257e+00 -1.1341243479074379e+00 2.3597355380886921e+01 2.3674761521425197e+01 0 3 0 -P 435 -11 -3.4448541147224727e+00 -2.1673819217200201e+00 5.1935029434568854e+01 5.2094259250861342e+01 5.1000000000000004e-04 1 0 0 0 0 -P 436 12 -4.2238184423944363e+00 -2.9424417727589072e+00 5.8151692879242468e+01 5.8379088640900576e+01 0 1 0 0 0 0 -P 437 -323 -9.9910486473977098e+00 -7.9642417228415239e+00 1.6194109235634318e+02 1.6244679657182928e+02 8.9113612264994757e-01 2 0 0 -180 0 -V -151 0 -3.0267907484688106e-04 -2.1667467318300509e-04 4.6924589888549329e-03 4.7072814206849970e-03 0 2 0 -P 438 22 -3.8616153777891304e-01 -3.2085121577077497e-01 6.9505767564859688e+00 6.9686859223044602e+00 0 1 0 0 0 0 -P 439 22 -1.0914836094260980e+00 -7.3693013073646418e-01 1.5957479430905517e+01 1.6011731707563854e+01 0 1 0 0 0 0 -V -152 0 -1.7062890829058920e-05 -2.8245053783665636e-05 3.1793469023735265e-04 3.1964635688822040e-04 0 2 0 -P 440 22 -1.0435465547979850e+00 -1.7996058853758738e+00 1.9566723582087082e+01 1.9676997801811968e+01 0 1 0 0 0 0 -P 441 22 -4.4284830510871187e-01 -6.6089762381432915e-01 8.1294326020695031e+00 8.1682663229164856e+00 0 1 0 0 0 0 -V -153 0 -3.1542001895608145e-05 5.3968764619798570e-06 3.4264526572323572e-04 3.4669349205948460e-04 0 2 0 -P 442 22 -8.0791166844111639e-02 -3.2189915652128150e-02 3.3426949576462373e-01 3.4539759569003958e-01 0 1 0 0 0 0 -P 443 22 -2.0504908268697278e-02 4.9521802362317624e-02 7.6612421699404609e-01 7.6799685939270645e-01 0 1 0 0 0 0 -V -154 0 9.1194079493466010e-06 -2.2055972303718910e-05 7.1746026337098247e-05 8.8525564591978662e-05 0 2 0 -P 444 22 4.4375559630183692e-02 -8.1141214280723017e-02 6.7063784646850977e-02 1.1423938969813084e-01 0 1 0 0 0 0 -P 445 22 -1.7639118184421713e-02 1.6477124758334672e-02 1.4328248374937363e-01 1.4530142559526124e-01 0 1 0 0 0 0 -V -155 0 0 0 0 0 0 3 0 -P 446 -211 -1.2083893186628652e-02 -3.0447187204953679e-03 2.1866051202995368e-01 2.5970655595851694e-01 1.3957000000000000e-01 1 0 0 0 0 -P 447 211 -3.9017277570356779e-02 6.7873350480066846e-02 9.7799031246865564e-01 9.9099645601633257e-01 1.3957000000000000e-01 1 0 0 0 0 -P 448 111 -5.9149728770745383e-02 -5.5443048548393381e-02 1.1932323674186009e+00 1.2035762149117901e+00 1.3497999999999999e-01 2 0 0 -181 0 -V -156 0 0 0 0 0 0 1 0 -P 449 130 2.1723555449960955e-01 2.5511909827769035e+00 2.9876035175259780e+01 2.9989680224020404e+01 4.9767000000000000e-01 1 0 0 0 0 -V -157 0 0 0 0 0 0 1 0 -P 450 130 7.4141747198539887e-01 1.8100047541943822e+00 1.5235835672865862e+01 1.5368935589605529e+01 4.9767000000000000e-01 1 0 0 0 0 -V -158 0 1.7351913697729272e-03 3.7488501266216717e-03 4.1245152398448455e-02 4.1451563116734411e-02 0 2 0 -P 451 22 1.0308594459127123e+00 2.3659970894042619e+00 2.5530134555087137e+01 2.5660249099047178e+01 0 1 0 0 0 0 -P 452 22 2.3775344209412506e+00 4.9977773056955250e+00 5.5486707115077145e+01 5.5762040084581187e+01 0 1 0 0 0 0 -V -159 0 0 0 0 0 0 1 0 -P 453 310 8.3836765391802071e-01 1.1061415327090975e+00 -2.0993031465343575e+00 2.5653768813702778e+00 4.9767000000000000e-01 2 0 0 -182 0 -V -160 0 0 0 0 0 0 1 0 -P 454 130 1.6058894356953304e-02 -3.9658053507255009e-01 -2.7554049904710340e+00 2.8279791546790221e+00 4.9767000000000000e-01 1 0 0 0 0 -V -161 0 -1.9621188813682868e-04 -7.8154448263063547e-05 1.0094015110836691e-03 1.0361626189904641e-03 0 2 0 -P 455 22 -2.3254182817736807e-01 -1.2491575400732739e-01 1.0094632796952816e+00 1.0434058464971556e+00 0 1 0 0 0 0 -P 456 22 -3.0543733551068413e-02 2.0124412778677454e-02 3.4396625036352763e-01 3.4590561290339050e-01 0 1 0 0 0 0 -V -162 0 8.3568869810553821e-05 3.6048434114535610e-05 1.3830121728265946e-04 1.6778886609429203e-04 0 2 0 -P 457 22 2.4288492612237900e-01 9.0668436853967346e-02 2.7353811306807857e-01 3.7687790075813715e-01 0 1 0 0 0 0 -P 458 22 1.7104548388578150e-01 8.7885409177554094e-02 4.1149065068348356e-01 4.5420805618564708e-01 0 1 0 0 0 0 -V -163 0 1.3216006764163915e-07 -6.5515102303526367e-07 -4.1289011918747853e-06 4.8085900059113686e-06 0 2 0 -P 459 22 -3.5887241341837671e-03 -8.6583539240239468e-02 -1.1971285349112167e-01 1.4778618169255256e-01 0 1 0 0 0 0 -P 460 22 1.1108271846650846e-02 4.9307231316853314e-02 -1.1521037306587376e-01 1.2580948623029431e-01 0 1 0 0 0 0 -V -164 0 -1.5055072319461211e-05 -6.8390188808296272e-06 -3.5961330733259308e-06 1.7659698101569677e-05 0 2 0 -P 461 22 -4.0993083371611022e-01 -1.7677142719017691e-01 -1.0529647981044868e-01 4.5867066023728786e-01 0 1 0 0 0 0 -P 462 22 7.5508652443164728e-03 -6.0164162191805306e-03 9.1819024799394983e-03 1.3323669284824168e-02 0 1 0 0 0 0 -V -165 0 -2.7392401929328713e-06 4.6496102213396840e-06 1.8746016793834067e-05 1.9538825314188313e-05 0 2 0 -P 463 22 -1.0003731834853867e-01 2.5283097632200424e-01 1.1235326616057013e+00 1.1559656609714217e+00 0 1 0 0 0 0 -P 464 22 -2.3331628256149614e-01 3.1300633656152188e-01 1.1577759352332588e+00 1.2218242797723524e+00 0 1 0 0 0 0 -V -166 0 8.0199826021123069e-06 1.6344552188550145e-05 4.8541096624487993e-04 4.8601860918723636e-04 0 2 0 -P 465 22 8.3203992980317998e-03 1.3075378695986642e-01 2.0217898032967851e+00 2.0260305502542839e+00 0 1 0 0 0 0 -P 466 22 5.8968862511553477e-02 6.3802825188019703e-03 2.0509055145574835e+00 2.0517630137014415e+00 0 1 0 0 0 0 -V -167 0 -2.2176502920647817e+01 -4.5814924703217315e+02 3.3593727812626566e+04 3.3597728938269509e+04 0 2 0 -P 467 -2112 1.7006220476968738e-02 -1.4198676287057894e+00 1.1029194055578076e+02 1.1030508264191346e+02 9.3957000000000002e-01 1 0 0 0 0 -P 468 111 -7.8957076142989746e-02 -4.4096456938595763e-01 3.0269687171254702e+01 3.0273302842890274e+01 1.3497999999999999e-01 2 0 0 -183 0 -V -168 0 -2.1522583089730073e+01 -4.3850716023828937e+02 3.2110023364135854e+04 3.2113847602526319e+04 0 2 0 -P 469 22 -5.9972763472978974e-02 -9.9333440691246874e-02 7.7279221313918729e+00 7.7287932003421123e+00 0 1 0 0 0 0 -P 470 22 -1.1716427381005567e-03 -5.4781226085292756e-01 3.5359059730487374e+01 3.5363303079181698e+01 0 1 0 0 0 0 -V -169 0 0 0 0 0 0 1 0 -P 471 310 2.3049720807893612e-01 2.8623903870378370e-01 1.6043582351245217e+01 1.6055505966499382e+01 4.9767000000000000e-01 2 0 0 -184 0 -V -170 0 3.4914532678784311e-06 -1.2091611271883410e-05 9.5525467425175406e-05 9.6963104236280875e-05 0 2 0 -P 472 22 -2.8578799884222700e-03 -9.5650782111636912e-02 1.0001698534411347e+00 1.0047372668160850e+00 0 1 0 0 0 0 -P 473 22 4.6181601221853615e-02 -5.4388057252354009e-02 1.8515854820070704e-01 1.9843006081461845e-01 0 1 0 0 0 0 -V -171 0 -9.1930787284703778e-06 -1.3949140284832638e-05 2.2641809508738701e-04 2.2764090129283901e-04 0 2 0 -P 474 22 -5.6083499290132392e-02 -1.8008624103932162e-02 1.2949529474570507e+00 1.2962919445720726e+00 0 1 0 0 0 0 -P 475 22 -1.8590552440473678e-02 -9.5298229235763990e-02 5.4420856140060736e-01 5.5280224261234023e-01 0 1 0 0 0 0 -V -172 0 -5.9571323110808398e+00 1.2245810993961999e+01 2.8503832519848919e+02 2.9797820372525308e+02 0 2 0 -P 476 22 8.5402691888110185e-02 9.3794685734850029e-04 4.4832020929371880e-01 4.5638307329173206e-01 0 1 0 0 0 0 -P 477 22 3.6452396204277100e-02 1.3679788521451017e-01 6.0140305570375219e-01 6.1784146348234537e-01 0 1 0 0 0 0 -V -173 0 -9.6322483005437558e+00 9.1930083820616098e+00 1.6049352697091061e+02 1.6189092969879238e+02 0 2 0 -P 478 22 -2.5840597269925236e-01 2.3419710580106768e-02 2.8430324580141546e+00 2.8548477519637201e+00 0 1 0 0 0 0 -P 479 22 -2.9115390324447706e-02 7.9761080719343742e-03 7.9106579722816081e-02 8.4670982096361508e-02 0 1 0 0 0 0 -V -174 0 1.9362453383904747e-06 -6.4712311384416142e-06 2.0699238014152610e-05 2.1832768783954246e-05 0 2 0 -P 480 22 7.9982585631339087e-02 -3.0055554413619706e-01 7.3899963334118335e-01 8.0178008655346600e-01 0 1 0 0 0 0 -P 481 22 8.2557656234742274e-02 -2.4267906232538228e-01 9.9862063954256941e-01 1.0309956719669151e+00 0 1 0 0 0 0 -V -175 0 5.9189417978298913e+00 -3.5229237181331476e+00 1.3672131417971420e+01 1.7285061767891126e+01 0 2 0 -P 482 2112 6.4235137517222740e-01 -4.9497879877226753e-01 1.6667267978295450e+00 2.0780734597031976e+00 9.3957000000000002e-01 1 0 0 0 0 -P 483 111 1.8052829953764615e-01 5.2050482907261431e-03 2.3403848050717271e-01 3.2497872271853295e-01 1.3497999999999999e-01 2 0 0 -185 0 -V -176 0 3.2368107173649057e-05 1.1748751882197927e-04 -7.2504846587870763e-04 7.4965590405039033e-04 0 2 0 -P 484 22 3.3096438086071843e-02 9.5270032922071729e-02 -6.7001799393867234e-01 6.7756613373792551e-01 0 1 0 0 0 0 -P 485 22 -3.2565092580075930e-03 1.3040878835159950e-02 1.6009467926091832e-03 1.3536336431013284e-02 0 1 0 0 0 0 -V -177 0 1.7771818971166606e-05 -2.9771613501586606e-05 -1.7310732929777555e-04 1.7837844148214842e-04 0 2 0 -P 486 22 6.1558622792612913e-02 -1.6626655517397546e-01 -5.8726617661499658e-01 6.1344567290473251e-01 0 1 0 0 0 0 -P 487 22 3.2492972877430783e-02 8.7099336464362964e-03 -3.2884829478774430e-01 3.3056445243756311e-01 0 1 0 0 0 0 -V -178 0 -9.0319580215618126e-06 7.9431328093258927e-07 -7.2228263183565165e-05 7.5671839946126528e-05 0 2 0 -P 488 22 2.9573892989124079e-02 1.8632854481216092e-02 -3.9234195500013468e-02 5.2546365327999708e-02 0 1 0 0 0 0 -P 489 22 -8.8565127466559770e-02 -1.3444885173545086e-02 -4.3251671379206064e-01 4.4169588457442188e-01 0 1 0 0 0 0 -V -179 0 3.8965967184924509e+01 7.3815455645638423e+01 2.2050384921737077e+02 2.3771569892247584e+02 0 2 0 -P 490 -211 3.4370582722418813e-01 9.0073938794577968e-01 2.0637289851098379e+00 2.2820872572159208e+00 1.3957000000000000e-01 1 0 0 0 0 -P 491 211 2.9572692875989670e-01 3.1057457774407260e-01 1.5547461663221218e+00 1.6188348931648355e+00 1.3957000000000000e-01 1 0 0 0 0 -V -180 0 -1.5319121601429257e+00 -1.1341243479074379e+00 2.3597355380886921e+01 2.3674761521425197e+01 0 2 0 -P 492 -311 -5.3510513540338858e+00 -4.2539020075613285e+00 9.0128199084237636e+01 9.0388436088253655e+01 4.9767000000000000e-01 2 0 0 -186 0 -P 493 -211 -4.6399972933638240e+00 -3.7103397152801953e+00 7.1812893272105555e+01 7.2058360483575626e+01 1.3957000000000000e-01 1 0 0 0 0 -V -181 0 -6.5602296668407379e-06 -6.1491259464092745e-06 1.3234005529448296e-04 1.3348727974680637e-04 0 2 0 -P 494 22 1.9370444762873518e-02 5.2687557162780880e-03 2.9877395026023861e-02 3.5994897564105149e-02 0 1 0 0 0 0 -P 495 22 -7.8520173533618898e-02 -6.0711804264671466e-02 1.1633549723925771e+00 1.1675813173476850e+00 0 1 0 0 0 0 -V -182 0 5.7856733218161665e+01 7.6336122058612588e+01 -1.4487536765697124e+02 1.7703966169953557e+02 0 2 0 -P 496 -211 7.3723989960307834e-01 1.0190140014707236e+00 -1.6758967864123988e+00 2.1000052448428641e+00 1.3957000000000000e-01 1 0 0 0 0 -P 497 211 1.0112775431494231e-01 8.7127531238373843e-02 -4.2340636012195859e-01 4.6537163652741326e-01 1.3957000000000000e-01 1 0 0 0 0 -V -183 0 -2.2176503811378527e+01 -4.5814925200678346e+02 3.3593728154105018e+04 3.3597729279788749e+04 0 2 0 -P 498 22 -1.6452711791992366e-02 -3.6019051458233342e-01 2.5273229778463250e+01 2.5275801695169278e+01 0 1 0 0 0 0 -P 499 22 -6.2504364350997391e-02 -8.0774054803624262e-02 4.9964573927914531e+00 4.9975011477210005e+00 0 1 0 0 0 0 -V -184 0 8.3204896062159062e+00 1.0332658544013446e+01 5.7914133239431510e+02 5.7957175112961193e+02 0 2 0 -P 500 111 2.3112168034984848e-01 1.3399634313306413e-01 4.4107569879031141e+00 4.4209013852196390e+00 1.3497999999999999e-01 2 0 0 -187 0 -P 501 111 -6.2447227091235033e-04 1.5224269557071959e-01 1.1632825363342103e+01 1.1634604581279744e+01 1.3497999999999999e-01 2 0 0 -188 0 -V -185 0 5.9191423123642126e+00 -3.5229179368354964e+00 1.3672391366783058e+01 1.7285422724912362e+01 0 2 0 -P 502 22 1.3849160653925421e-01 4.8985762220871587e-02 9.9620470836708538e-02 1.7749300885361896e-01 0 1 0 0 0 0 -P 503 22 4.2036692998391960e-02 -4.3780713930145439e-02 1.3441800967046419e-01 1.4748571386491399e-01 0 1 0 0 0 0 -V -186 0 -1.5319121601429257e+00 -1.1341243479074379e+00 2.3597355380886921e+01 2.3674761521425197e+01 0 1 0 -P 504 310 -5.3510513540338858e+00 -4.2539020075613285e+00 9.0128199084237636e+01 9.0388436088253655e+01 4.9767000000000000e-01 2 0 0 -189 0 -V -187 0 8.3205058018096860e+00 1.0332667933657628e+01 5.7914164147318786e+02 5.7957206091934199e+02 0 2 0 -P 505 22 1.4556432632519314e-01 1.1477835496819101e-01 2.0062005312401254e+00 2.0147465387526720e+00 0 1 0 0 0 0 -P 506 22 8.5557354024655349e-02 1.9217988164873117e-02 2.4045564566629887e+00 2.4061548464669662e+00 0 1 0 0 0 0 -V -188 0 8.3204895606801834e+00 1.0332669645357106e+01 5.7914218064513989e+02 5.7957259951017500e+02 0 2 0 -P 507 22 -5.3429310476486372e-02 1.0250131131284537e-01 4.7891381981192582e+00 4.7905329443313311e+00 0 1 0 0 0 0 -P 508 22 5.2804838205574023e-02 4.9741384257874215e-02 6.8436871652228444e+00 6.8440716369484100e+00 0 1 0 0 0 0 -V -189 0 -3.2981548940590801e+02 -2.6210829108664274e+02 5.5529047098669216e+03 5.5689474897177488e+03 0 2 0 -P 509 -211 -1.7367273505747305e+00 -1.5458641657711161e+00 2.8848140564360470e+01 2.8942021555434749e+01 1.3957000000000000e-01 1 0 0 0 0 -P 510 211 -3.6143240034591551e+00 -2.7080378417902127e+00 6.1280058519877166e+01 6.1446414532818906e+01 1.3957000000000000e-01 1 0 0 0 0 -BlockType GenEvent -E 5 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 218 0 0 -V -1 0 0 0 0 0 1 3 0 -P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -1 0 -P 3 21 3.2992939111429004e-01 -7.1181912190923491e-01 9.0096214824555136e+02 9.0096248984688827e+02 0 3 0 0 -3 0 -P 14 2 -5.5365822308336554e-01 3.4509673924388229e-01 2.5091064739376443e+00 2.6134545117488437e+00 3.3000000000000002e-01 2 0 0 -9 0 -P 29 2101 2.2372883196907553e-01 3.6672238266535262e-01 5.3966101099142470e+03 5.3966101581077546e+03 5.7933000000000001e-01 2 0 0 -25 0 -V -2 0 0 0 0 0 1 3 0 -P 2 2212 0 0 -6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -2 0 -P 4 21 -4.4604738137447780e-01 -4.4508489499117149e-01 -3.3991077613470765e+01 3.3996917744924559e+01 0 3 0 0 -4 0 -P 16 2203 2.3781727192142083e-01 1.3771298185638053e-01 -6.2853045277091305e+03 6.2853045810455988e+03 7.7132999999999996e-01 2 0 0 -11 0 -P 37 1 2.0823010945305698e-01 3.0737191313479095e-01 -7.4415207898946619e+01 7.4416865722193066e+01 3.3000000000000002e-01 2 0 0 -25 0 -V -3 0 0 0 0 0 0 5 0 -P 5 1 -3.0085522013949689e-01 1.1399974905881729e+00 5.0422379313784262e+02 5.0422517159941145e+02 0 3 0 0 -5 0 -P 13 -1 1.2673117148687165e+00 -1.3842638091505211e+00 7.8698417845006162e+01 7.8721484593363400e+01 3.3000000000000002e-01 2 0 0 -9 0 -P 30 21 -4.6149507887473545e-01 -2.2715799945074164e-01 5.7059132312250952e+01 5.7061450723684736e+01 0 2 0 0 -25 0 -P 31 21 -4.0362956554163681e-01 1.1673687347620827e+00 1.4998499597455123e+02 1.4999008195235854e+02 0 2 0 0 -25 0 -P 32 21 2.5074276787416866e-01 -1.3942091873039719e+00 1.0761474191487194e+02 1.0762406500684733e+02 0 2 0 0 -25 0 -V -4 0 0 0 0 0 0 4 0 -P 6 -2 3.6455143299337252e+00 3.8342312877411899e+00 -1.8047247107697999e+00 5.5900031824060150e+00 0 3 0 0 -5 0 -P 15 2 -4.1159171909325689e+00 -3.0147215458824776e+00 -2.9604825409076863e+01 3.0043034264596933e+01 3.3000000000000002e-01 2 0 0 -11 0 -P 35 21 -1.6212560032512757e-01 -8.5363446188281877e-01 8.8578769426193138e-01 1.2408047163436402e+00 0 2 0 0 -25 0 -P 36 21 1.6433585287674621e-01 -4.2451452632135017e-01 -8.6248126834592029e-02 4.6331155282492553e-01 0 2 0 0 -25 0 -V -5 0 0 0 0 0 0 2 0 -P 7 -24 -9.0579211800333426e-01 3.7016351602104836e+00 4.9106971928988440e+02 4.9762938157847765e+02 8.0442586013329560e+01 3 0 0 -6 0 -P 8 22 4.2504512277975630e+00 1.2725936181188806e+00 1.1349349137188561e+01 1.2185793203339950e+01 0 3 0 0 -7 0 -V -6 0 0 0 0 0 0 1 0 -P 9 -24 -9.0579211800333426e-01 3.7016351602104836e+00 4.9106971928988440e+02 4.9762938157847765e+02 8.0442586013329560e+01 2 0 0 -8 0 -V -7 0 0 0 0 0 0 1 0 -P 10 22 4.2504512277975630e+00 1.2725936181188806e+00 1.1349349137188561e+01 1.2185793203339923e+01 0 1 0 0 0 0 -V -8 0 0 0 0 0 0 2 0 -P 11 11 -3.1560318019062390e+01 2.6910330199055338e+01 2.8518798748746264e+02 2.8818814644654589e+02 5.1000000000000004e-04 1 0 0 0 0 -P 12 -12 3.0654525901059060e+01 -2.3208695038844859e+01 2.0588173180242171e+02 2.0944123513193171e+02 0 1 0 0 0 0 -V -9 0 0 0 0 0 0 1 0 -P 46 92 7.1365349178535098e-01 -1.0391670699066387e+00 8.1207524318943811e+01 8.1334939105112241e+01 4.3727730006198762e+00 2 0 0 -10 0 -V -10 0 0 0 0 0 0 5 0 -P 47 111 -1.2987933502875690e-01 -2.5113340363148784e-01 2.5317152752162979e+00 2.5510269428703771e+00 1.3497999999999999e-01 2 0 0 -35 0 -P 48 213 7.4830653663342495e-01 -1.7382372879353764e-02 4.3774839145295914e+01 4.3790551134415779e+01 9.0308451414957169e-01 2 0 0 -36 0 -P 49 -213 -2.9117511823875525e-01 -4.3939165795158736e-01 1.4260854072619713e+01 1.4288861360745033e+01 7.2232411525528162e-01 2 0 0 -37 0 -P 50 213 -2.1069355383734140e-01 -2.7656697558868826e-01 1.5627412790254821e+01 1.5654259573374869e+01 8.4789811178222296e-01 2 0 0 -38 0 -P 51 111 5.9709496225677960e-01 -5.4692659855521464e-02 5.0127030355570623e+00 5.0502400937061882e+00 1.3497999999999999e-01 2 0 0 -39 0 -V -11 0 0 0 0 0 0 1 0 -P 52 92 -3.8780999190111483e+00 -2.8770085640260969e+00 -6.3149093531182070e+03 6.3153476153101956e+03 7.4243163100063839e+01 2 0 0 -12 0 -V -12 0 0 0 0 0 0 10 0 -P 53 113 -2.6442133118282958e+00 -2.3165293324998335e+00 -2.2580063872574136e+01 2.2865503691765191e+01 7.8345542426979031e-01 2 0 0 -40 0 -P 54 221 -5.1630481154154895e-01 1.5967696321760094e-02 -2.0035205258790207e+01 2.0049338564902872e+01 5.4744999999999999e-01 2 0 0 -41 0 -P 55 211 -8.7519077897546693e-01 -6.7220077889196328e-01 -6.5156567288365199e+00 6.6099224790975617e+00 1.3957000000000000e-01 1 0 0 0 0 -P 56 111 1.9202974635290213e-01 2.5211810958452568e-01 -9.4217139466307191e+00 9.4280089232669173e+00 1.3497999999999999e-01 2 0 0 -42 0 -P 57 -213 9.4326428486984373e-02 -4.8155754348202640e-01 -4.3195836080971688e+01 4.3206533032295752e+01 8.2670840923091482e-01 2 0 0 -43 0 -P 58 321 -4.2092082351619076e-01 7.6023322511133951e-01 -5.4832750693731569e+01 5.4841857358199974e+01 4.9359999999999998e-01 1 0 0 0 0 -P 59 -323 5.3330045068290033e-01 -4.0351878893496296e-01 -6.3591499500441905e+01 6.3601150529299844e+01 8.8334769611541319e-01 2 0 0 -44 0 -P 60 111 -4.7209376929507818e-01 -5.2551861933480060e-01 -3.3238644448347941e+01 3.3246424570325850e+01 1.3497999999999999e-01 2 0 0 -45 0 -P 61 2224 6.8188613475259922e-03 3.7782727808420416e-02 -9.1247280998350175e+02 9.1247367669780419e+02 1.2570732634256450e+00 2 0 0 -46 0 -P 62 111 2.2414808927512009e-01 4.5621474029144382e-01 -5.1490251726043825e+03 5.1490251994632381e+03 1.3497999999999999e-01 2 0 0 -47 0 -V -13 0 0 0 0 0 2 1 0 -P 17 2 -3.6919233007313528e+00 8.1942682496522661e+00 2.9565764077792278e+02 2.9579421373680213e+02 0 2 0 0 -13 0 -P 18 -2 3.6919233007313528e+00 -8.1942682496522661e+00 1.0292203617146285e+02 1.0331370605822661e+02 0 2 0 0 -13 0 -P 63 92 0 0 3.9857967694938566e+02 3.9910791979502875e+02 2.0527366271357579e+01 2 0 0 -14 0 -V -14 0 0 0 0 0 0 7 0 -P 64 213 -1.5835447595257053e+00 3.0390962863600426e+00 1.0583303842892066e+02 1.0589013999419520e+02 5.8822159912046279e-01 2 0 0 -48 0 -P 65 -213 -1.1443922070689834e+00 2.4049085538196557e+00 9.6289570725061836e+01 9.6329373550777277e+01 7.5733717238090137e-01 2 0 0 -49 0 -P 66 213 -3.0046508081645801e-01 1.7803118867427987e+00 5.7444662891378144e+01 5.7478363119977544e+01 7.8303420682014024e-01 2 0 0 -50 0 -P 67 -213 -2.5016439277491315e-01 3.1350862441051930e-01 4.0612390002610852e+01 4.0622507641923903e+01 8.1304090487992176e-01 2 0 0 -51 0 -P 68 213 3.3250187937355535e-01 -8.3151583915031479e-01 6.8897046607273635e+00 6.9760920973408034e+00 6.2916972907766511e-01 2 0 0 -52 0 -P 69 223 1.8182876739207015e+00 -4.9227019655990896e+00 6.7504589614192298e+01 6.7712745517919686e+01 7.7918026591325340e-01 2 0 0 -53 0 -P 70 -211 1.1277768868918030e+00 -1.7836075465836119e+00 2.4005720626494561e+01 2.4098697872894373e+01 1.3957000000000000e-01 1 0 0 0 0 -V -15 0 0 0 0 0 2 1 0 -P 19 1 4.0721905699000063e+00 -5.2481001487683923e+00 5.1379595964107374e+01 5.1807221240325212e+01 0 2 0 0 -15 0 -P 20 -1 -4.0721905699000063e+00 5.2481001487683923e+00 3.4479876218613377e+01 3.5113916831649327e+01 0 2 0 0 -15 0 -P 71 92 0 0 8.5859472182720751e+01 8.6921138071974539e+01 1.3543828123239873e+01 2 0 0 -16 0 -V -16 0 0 0 0 0 0 8 0 -P 72 -211 4.1720297738051321e-01 -9.7235207672939661e-01 7.5602071648272782e+00 7.6351646377442872e+00 1.3957000000000000e-01 1 0 0 0 0 -P 73 211 2.6665249123579446e+00 -2.9349752846126558e+00 3.2950695340201079e+01 3.3188736616767464e+01 1.3957000000000000e-01 1 0 0 0 0 -P 74 111 3.6072230697643126e-01 -6.2146570580823457e-01 3.1338517615404928e+00 3.2180097373930638e+00 1.3497999999999999e-01 2 0 0 -54 0 -P 75 113 -4.4948408298591003e-01 -3.3788088157719054e-03 8.4523847160801058e+00 8.4982551917835956e+00 7.5860830396560419e-01 2 0 0 -55 0 -P 76 -213 -2.7928243095832456e-01 3.3421120888543193e-01 4.9816177588983468e+00 5.0588216417181506e+00 7.6515691106980155e-01 2 0 0 -56 0 -P 77 213 -3.0578817058647956e-01 7.0283103003245251e-01 4.1808064202695698e+00 4.3325688354318341e+00 8.3936435946542598e-01 2 0 0 -57 0 -P 78 -211 -3.2872639824348276e-01 9.2343958879558319e-01 4.7634610442269851e+00 4.8652690186489309e+00 1.3957000000000000e-01 1 0 0 0 0 -P 79 213 -2.0811691139406925e+00 2.5716900482525915e+00 1.9836447976676894e+01 2.0124312392487205e+01 7.4727930113389407e-01 2 0 0 -58 0 -V -17 0 0 0 0 0 2 1 0 -P 21 3 -1.8652550805155896e+00 -4.6351934290813315e+00 -2.5073948479495525e+00 5.5902793815615270e+00 0 2 0 0 -17 0 -P 22 -3 1.8652550805155896e+00 4.6351934290813315e+00 -3.8523971426252422e+02 3.8527211375820042e+02 0 2 0 0 -17 0 -P 80 92 0 0 -3.8774710911047379e+02 3.9086239313976193e+02 4.9250276622696788e+01 2 0 0 -18 0 -V -18 0 0 0 0 0 0 10 0 -P 81 -313 -1.6233937553850981e+00 -4.1954492475589094e+00 -2.4490241228785110e+00 5.1978988434783595e+00 8.8500370548764440e-01 2 0 0 -59 0 -P 82 -211 -4.2766056399724119e-02 2.0905450136158240e-02 -1.4002124745972655e-01 2.0335119391229980e-01 1.3957000000000000e-01 1 0 0 0 0 -P 83 323 -4.4702319815240105e-01 -4.8462854486530810e-01 -3.3690973393284223e+00 3.5379978508332535e+00 8.5552167970554593e-01 2 0 0 -60 0 -P 84 333 2.9235882051604356e-01 4.1909099446358361e-01 -1.1614528740318077e+01 1.1670274542743341e+01 1.0182922477141036e+00 2 0 0 -61 0 -P 85 -313 -1.9559777497210154e-01 3.2725284319419412e-01 -4.0791168457425862e+01 4.0802601861674923e+01 8.8743543275557690e-01 2 0 0 -62 0 -P 86 -213 4.2480750680325324e-01 4.0902356994726946e-01 -2.7722906134034435e+01 2.7734649552550263e+01 5.5090796661843766e-01 2 0 0 -63 0 -P 87 113 3.6771897497445705e-01 4.4681480751080627e-01 -2.0704917165556715e+01 2.0730406353871473e+01 8.4928914234349040e-01 2 0 0 -64 0 -P 88 211 -2.8978227338924745e-01 -7.0628302343640245e-02 -1.4183290555585218e+01 1.4187112916027539e+01 1.3957000000000000e-01 1 0 0 0 0 -P 89 -211 -1.9540105972758251e-02 2.5692526030371343e-01 -1.4545461008205347e+01 1.4548412563961943e+01 1.3957000000000000e-01 1 0 0 0 0 -P 90 323 1.5332178619775767e+00 2.8706931692121325e+00 -2.5222669433968153e+02 2.5224968746070860e+02 1.0039174358388165e+00 2 0 0 -65 0 -V -19 0 0 0 0 0 2 1 0 -P 23 3 1.3025773740614568e-01 -4.3032393523974077e+00 2.5316489086932532e+00 4.9944050896041228e+00 0 2 0 0 -19 0 -P 24 -3 -1.3025773740614568e-01 4.3032393523974077e+00 -3.3157804489828713e+01 3.3436130676079749e+01 0 2 0 0 -19 0 -P 91 92 0 0 -3.0626155581135460e+01 3.8430535765683871e+01 2.3215181962620765e+01 2 0 0 -20 0 -V -20 0 0 0 0 0 0 9 0 -P 92 -311 2.2891228831712537e-01 -1.3418287413741594e+00 9.8860382248171286e-01 1.7543996561917701e+00 4.9767000000000000e-01 2 0 0 -66 0 -P 93 -213 -3.7639146848800681e-01 -1.5406289235386026e+00 1.6502657513639488e-01 1.7867414552349492e+00 8.0622778404095086e-01 2 0 0 -67 0 -P 94 2114 1.6153252959411044e-01 -1.2772848818918856e+00 5.2372112884638644e-01 1.9163288714391824e+00 1.3192736998381318e+00 2 0 0 -68 0 -P 95 211 2.5979025784637988e-01 2.2354774310929568e-01 -6.7894811146840361e-01 7.7324956804880274e-01 1.3957000000000000e-01 1 0 0 0 0 -P 96 -2214 -1.8636538951424170e-01 2.9256938238575925e-01 -4.5902650063153603e+00 4.7327213645256432e+00 1.0989948972200578e+00 2 0 0 -69 0 -P 97 111 2.4447109857296742e-01 3.3083128753819330e-01 -2.0318743236789594e+00 2.0774860592739199e+00 1.3497999999999999e-01 2 0 0 -70 0 -P 98 213 -2.7401510515621635e-01 2.8125233782844189e-01 -1.7321877321484938e+00 1.8713869334189455e+00 5.8942985993049790e-01 2 0 0 -71 0 -P 99 111 -1.0109282624214720e-01 5.2155147439574179e-01 -1.7600692215106526e+00 1.8434475758402007e+00 1.3497999999999999e-01 2 0 0 -72 0 -P 100 313 4.3158615070028994e-02 2.5099903215472157e+00 -2.1510162712478085e+01 2.1674774281710462e+01 8.9823502798501531e-01 2 0 0 -73 0 -V -21 0 0 0 0 0 2 1 0 -P 25 2 -2.8388113750031851e+00 2.9291876839233497e+00 -2.8168940832775746e+00 4.9572051386744045e+00 0 2 0 0 -21 0 -P 26 -2 2.8388113750031851e+00 -2.9291876839233497e+00 6.3131813241358550e+01 6.3263455751739258e+01 0 2 0 0 -21 0 -P 101 92 0 0 6.0314919158080976e+01 6.8220660890413654e+01 3.1877407348763036e+01 2 0 0 -22 0 -V -22 0 0 0 0 0 0 10 0 -P 102 213 -1.2382245544498864e+00 1.4759587873216322e+00 -1.5264135160047374e+00 2.5739330296056240e+00 7.6389700217915013e-01 2 0 0 -74 0 -P 103 221 -8.9982101828616334e-01 5.4142902707731055e-01 -5.3645233237309187e-01 1.3001176345700249e+00 5.4744999999999999e-01 2 0 0 -75 0 -P 104 -211 -8.6753321823725624e-03 5.6832963889609747e-02 9.7176499890667928e-02 1.7952243370663501e-01 1.3957000000000000e-01 1 0 0 0 0 -P 105 321 -4.0054756700537497e-01 4.1344381052312046e-01 1.2388557587843947e-01 7.6835065810119207e-01 4.9359999999999998e-01 1 0 0 0 0 -P 106 -313 -4.3881953299186965e-01 1.5849794511534281e-02 1.5502399495560006e+00 1.8454355154493816e+00 8.9976360337661621e-01 2 0 0 -76 0 -P 107 -213 2.6975585621736647e-01 -2.0224994353228565e-01 1.4308574448043745e-01 8.2389832737315261e-01 7.3801196599538910e-01 2 0 0 -77 0 -P 108 213 7.7555631014750070e-01 1.3582975137081782e-01 4.8071584803948841e+00 4.9465123732681642e+00 8.5981084646306349e-01 2 0 0 -78 0 -P 109 -211 1.6084505806401775e-01 -9.8786281136593837e-02 1.3415766842308592e+01 1.3417820598522365e+01 1.3957000000000000e-01 1 0 0 0 0 -P 110 211 3.3737414580549596e-01 -7.4336572542037649e-01 6.7542972105104546e+00 6.8048824022753731e+00 1.3957000000000000e-01 1 0 0 0 0 -P 111 -213 1.4425566346812861e+00 -1.5949421846047691e+00 3.5486174703439339e+01 3.5560187917541761e+01 7.9596446614794569e-01 2 0 0 -79 0 -V -23 0 0 0 0 0 2 1 0 -P 27 2 -3.5408957207564704e+00 1.3337324649314468e+00 1.4937252408811208e+01 1.5409032880678133e+01 0 2 0 0 -23 0 -P 28 -2 3.5408957207564704e+00 -1.3337324649314468e+00 4.7168621002604638e+00 6.0469474006441590e+00 0 2 0 0 -23 0 -P 112 92 0 0 1.9654114509071672e+01 2.1455980281322294e+01 8.6066760539008023e+00 2 0 0 -24 0 -V -24 0 0 0 0 0 0 8 0 -P 113 223 -1.7834465290486393e-01 1.0779146855581252e-01 2.9797667718739342e+00 3.0863604647422442e+00 7.7664991318275456e-01 2 0 0 -80 0 -P 114 113 -1.0902801693616622e+00 4.5065934647299072e-01 4.8491888434946748e+00 5.1024990374205057e+00 1.0625720176709026e+00 2 0 0 -81 0 -P 115 111 -3.3248940486964124e-01 2.3166493925117712e-01 5.1260100030508238e-01 6.6723102021907743e-01 1.3497999999999999e-01 2 0 0 -82 0 -P 116 213 5.4395505009151517e-02 -3.5753673771347694e-01 3.6959306688638129e+00 3.7765891594248417e+00 6.8697218303008856e-01 2 0 0 -83 0 -P 117 223 -3.6940382873256322e-01 -2.0534285256312060e-01 1.5468769853517426e+00 1.7802756873006378e+00 7.7325819698327591e-01 2 0 0 -84 0 -P 118 113 -2.1983674369034181e-01 6.1736195755313583e-01 1.8723689218941149e+00 2.0935892371951130e+00 6.6924325466460510e-01 2 0 0 -85 0 -P 119 111 1.1404511704074396e+00 -2.7154403133829735e-01 1.2971289847431351e+00 1.7536043557484422e+00 1.3497999999999999e-01 2 0 0 -86 0 -P 120 -213 9.9550812414248135e-01 -5.7305409021822129e-01 2.9002523325451683e+00 3.1958313192714209e+00 6.9458391375909678e-01 2 0 0 -87 0 -V -25 0 0 0 0 0 2 1 0 -P 33 21 8.8527156785984806e-01 -5.7553602736705196e+00 -2.4199878604494717e+01 2.4890600677783713e+01 0 2 0 0 -25 0 -P 34 21 -8.8527156785984806e-01 5.7553602736705196e+00 -6.2954009301687258e+01 6.3222742464919470e+01 0 2 0 0 -25 0 -P 121 92 -1.8021268256845246e-01 -1.0580531443966563e+00 5.5504994238782192e+03 5.8755200809247099e+03 1.9270939818607703e+03 2 0 0 -26 0 -V -26 0 0 0 0 0 0 37 0 -P 122 221 1.1563614818692559e-01 -3.1187647073665451e-02 5.3420846984279729e+02 5.3420876377842535e+02 5.4744999999999999e-01 2 0 0 -88 0 -P 123 2212 -6.2791982027313717e-02 7.6867611752465992e-01 2.9853349842085568e+03 2.9853352312756942e+03 9.3827000000000005e-01 1 0 0 0 0 -P 124 -211 -6.3737058678301636e-02 -6.4464644421178707e-01 1.9900387741310286e+02 1.9900498068310966e+02 1.3957000000000000e-01 1 0 0 0 0 -P 125 113 1.5027328344524130e-01 2.0693100318503993e-01 1.2269984836524957e+03 1.2269987428070176e+03 7.5535553100313535e-01 2 0 0 -89 0 -P 126 113 -9.9821919675496071e-02 5.0103807635626529e-01 2.1777529106655865e+02 2.1777760470222898e+02 8.6412218253814066e-01 2 0 0 -90 0 -P 127 -313 -9.1855261829841561e-01 -4.5271496597028515e-01 1.9852981625081372e+02 1.9853426767512232e+02 8.4782720070859996e-01 2 0 0 -91 0 -P 128 323 7.1450236264555178e-01 1.5079031761695599e-01 1.0405513205706657e+02 1.0406120895549580e+02 8.5524880571797579e-01 2 0 0 -92 0 -P 129 -213 -2.6371613026223212e-01 -3.3569803118640140e-01 1.5291910085517253e+02 1.5292119444523502e+02 6.7680487398242095e-01 2 0 0 -93 0 -P 130 211 3.0711481321928247e-01 5.6434962399740579e-02 1.7469094645523576e+01 1.7472442643564186e+01 1.3957000000000000e-01 1 0 0 0 0 -P 131 -211 -1.3416783174028993e-01 4.7853828154534966e-01 4.9650636537858709e+01 4.9653320012799036e+01 1.3957000000000000e-01 1 0 0 0 0 -P 132 211 -4.4171694323995486e-01 -8.0515863604828064e-01 1.9039571188948941e+01 1.9062217739053946e+01 1.3957000000000000e-01 1 0 0 0 0 -P 133 -2114 -1.3488630166892554e-01 -2.6020823766813067e-01 1.8719458121583301e+00 2.1920492447609377e+00 1.1022686271828712e+00 2 0 0 -94 0 -P 134 221 5.9907600476643053e-01 3.1183801267853273e-01 3.6841720694354785e-01 9.4422865160420322e-01 5.4744999999999999e-01 2 0 0 -95 0 -P 135 1114 -7.9078364399711776e-02 -5.3473729042418372e-02 2.4990460379589137e+00 2.8511181245797439e+00 1.3691349944600548e+00 2 0 0 -96 0 -P 136 223 -1.3331819562169198e-01 -3.1501969795261053e-01 -4.3131521562232121e-02 8.5408332284258204e-01 7.8140056489842125e-01 2 0 0 -97 0 -P 137 211 3.0231113463725909e-02 -2.1285675831915882e-01 -2.3543486414109713e-01 3.4803919310407555e-01 1.3957000000000000e-01 1 0 0 0 0 -P 138 111 -3.6331973746602270e-02 7.4355670744629440e-02 -7.6645288247255569e-02 1.7590588022778733e-01 1.3497999999999999e-01 2 0 0 -98 0 -P 139 113 1.6627168576861587e-01 -2.5512952828724614e-03 -1.1719602585717434e-01 7.9896620060520418e-01 7.7263141188851436e-01 2 0 0 -99 0 -P 140 -213 1.8246870701846693e-01 -6.4142436952788440e-01 -2.3077172616991168e+00 2.5247664616293304e+00 7.7728159309153089e-01 2 0 0 -100 0 -P 141 113 -9.2484989919595070e-02 -1.1964227291138891e+00 -5.3193696218967101e+00 5.5240094460187201e+00 8.8261337246030414e-01 2 0 0 -101 0 -P 142 221 4.3290844393668704e-01 -2.2932482823933737e+00 -1.1118240214783999e+01 1.1373713746251170e+01 5.4744999999999999e-01 2 0 0 -102 0 -P 143 211 1.4314659529045259e-01 3.3792954234072853e-01 -4.8759767464944481e+00 4.8917600452786267e+00 1.3957000000000000e-01 1 0 0 0 0 -P 144 -211 -1.5173971936078676e-01 1.2638509867730544e-01 -2.3517255215454607e+00 2.3641258107781722e+00 1.3957000000000000e-01 1 0 0 0 0 -P 145 111 2.8806011104816087e-01 1.8808112209402078e-01 -6.9861950017284147e-01 7.9034292714425880e-01 1.3497999999999999e-01 2 0 0 -103 0 -P 146 111 -2.9325266533451849e-01 -2.1300619373632457e-01 -6.2084500620099243e+00 6.2204855547752071e+00 1.3497999999999999e-01 2 0 0 -104 0 -P 147 213 -6.9858610278359504e-02 1.2685306871492477e+00 -1.8500623011952744e+01 1.8556331415289904e+01 6.7106887426753614e-01 2 0 0 -105 0 -P 148 223 5.5063662683315945e-02 1.1997527113990876e-01 -3.0076947242410959e+00 3.1107144834006855e+00 7.8287353408961513e-01 2 0 0 -106 0 -P 149 -2214 -1.8794218320233000e-01 1.5241617555512106e+00 -1.9106462282427337e+01 1.9207265750409690e+01 1.2262810998017089e+00 2 0 0 -107 0 -P 150 2214 -2.8650488155922194e-01 2.9534757115427968e-01 -7.5922854307518755e+00 7.7042773613584803e+00 1.2424879732977692e+00 2 0 0 -108 0 -P 151 -213 -1.3395677309501619e-01 2.8646169779760616e-01 -7.1516780777701350e-01 1.1477456820086733e+00 8.4014905577871046e-01 2 0 0 -109 0 -P 152 221 1.5464435260082576e-01 -3.5154860600178450e-01 -2.3517657972875368e-02 6.6914563505238200e-01 5.4744999999999999e-01 2 0 0 -110 0 -P 153 -311 9.3352618998182743e-02 4.0984422314125646e-01 -2.9781253674948460e+00 3.0485395080484676e+00 4.9767000000000000e-01 2 0 0 -111 0 -P 154 333 -3.2368338848019457e-01 -4.2702770182420224e-01 -9.2713163076349650e-02 1.1654977849741417e+00 1.0308568096824740e+00 2 0 0 -112 0 -P 155 333 -1.0877256872155437e-01 3.7570467122067591e-01 -1.1471981162283685e+01 1.1523662684436765e+01 1.0175777145777671e+00 2 0 0 -113 0 -P 156 321 6.2410157985014460e-02 -5.2815613120594274e-01 -2.4718281324740081e+00 2.5761248423242393e+00 4.9359999999999998e-01 1 0 0 0 0 -P 157 113 1.7841524909498518e-01 -2.1422710011190485e-01 -4.1990941872267165e+01 4.1999942208294883e+01 8.2354169806912858e-01 2 0 0 -114 0 -P 158 -211 1.6252710659019495e-01 4.3949932995684760e-01 -1.7920595656609230e+01 1.7927264241762899e+01 1.3957000000000000e-01 1 0 0 0 0 -V -27 0 0 0 0 0 2 1 0 -P 38 21 -6.3139095306073623e+00 7.0920315162380083e+00 2.2607817567288038e+01 2.4520925344362215e+01 0 2 0 0 -27 0 -P 39 21 6.3139095306073623e+00 -7.0920315162380083e+00 -3.5928099200277863e+00 1.0152371531295421e+01 0 2 0 0 -27 0 -P 159 92 0 0 1.9015007647260251e+01 3.4673296875657634e+01 2.8994258059176538e+01 2 0 0 -28 0 -V -28 0 0 0 0 0 0 17 0 -P 160 213 -5.1422483611792558e-01 1.5560370109051272e-01 1.4202938423971254e+00 1.7497322796917145e+00 8.6930360517508554e-01 2 0 0 -115 0 -P 161 -213 1.2736655420832138e-01 8.1992574492073922e-01 1.5226761082985145e+00 1.8398587605528547e+00 6.1484734827861653e-01 2 0 0 -116 0 -P 162 223 -1.7023916178032368e+00 2.0795757104791130e+00 6.5575562691596261e+00 7.1299160716087355e+00 7.8191214916280161e-01 2 0 0 -117 0 -P 163 211 -2.9059822685827419e-01 -2.9736811450474465e-02 1.1929840970980694e+00 1.2361320512944036e+00 1.3957000000000000e-01 1 0 0 0 0 -P 164 -211 -1.0881062221915685e+00 1.2539725263908137e+00 2.4746291473983963e+00 2.9832350644507852e+00 1.3957000000000000e-01 1 0 0 0 0 -P 165 211 -1.2852746139432256e+00 1.4134826699002714e+00 5.3384294397887020e+00 5.6716992832711099e+00 1.3957000000000000e-01 1 0 0 0 0 -P 166 -2212 1.4237307138452032e-01 -3.5996864709774652e-02 5.6565571914432167e-01 1.1053880998206356e+00 9.3827000000000005e-01 1 0 0 0 0 -P 167 211 -1.7998566349533646e-01 -1.5840940836931164e-01 5.4777086598057086e-02 2.8278736506418189e-01 1.3957000000000000e-01 1 0 0 0 0 -P 168 2114 3.5739987847657645e-01 2.2720806770406607e-01 3.6523500098511946e-01 1.3004119985260876e+00 1.1740172830078466e+00 2 0 0 -118 0 -P 169 111 -5.1434735918982422e-01 -7.7300339775299809e-01 1.1148117917540183e-01 9.4484660794944053e-01 1.3497999999999999e-01 2 0 0 -119 0 -P 170 -211 1.5714668856322211e+00 -6.0581539196193168e-01 -5.4913199377787304e-02 1.6908624149062295e+00 1.3957000000000000e-01 1 0 0 0 0 -P 171 -1114 8.8585869246348492e-01 -1.5968024045320024e+00 -4.2221015967941866e-01 2.3027386541183241e+00 1.3378416752747129e+00 2 0 0 -120 0 -P 172 3112 1.2493548114864377e+00 -1.2508727455032398e+00 -6.8508891720731258e-01 2.2424940241854410e+00 1.1974400000000001e+00 2 0 0 -121 0 -P 173 313 6.8179411573870519e-01 -3.6752254254946726e-01 5.4549415498849577e-02 1.1551152151744939e+00 8.5521896965537603e-01 2 0 0 -122 0 -P 174 213 8.7514099172343518e-01 -9.1457541533900566e-01 -1.9944632590699943e-01 1.6271978862616123e+00 1.0028330760397095e+00 2 0 0 -123 0 -P 175 -211 7.3183821062345222e-02 7.1751877688641233e-02 -4.4579470420669780e-02 1.7880525076215875e-01 1.3957000000000000e-01 1 0 0 0 0 -P 176 113 -3.8901028257665571e-01 -2.8878531600595153e-01 7.6297841431025348e-01 1.2320758480194269e+00 8.3734632970974121e-01 2 0 0 -124 0 -V -29 0 0 0 0 0 2 1 0 -P 40 21 4.0592867731266056e+00 -2.6703314664466724e+00 -1.8206386794109676e+01 1.8843593058222922e+01 0 2 0 0 -29 0 -P 41 21 -4.0592867731266056e+00 2.6703314664466724e+00 6.5387013204165399e+01 6.5567293485463281e+01 0 2 0 0 -29 0 -P 177 92 0 0 4.7180626410055723e+01 8.4410886543686203e+01 6.9994187320418376e+01 2 0 0 -30 0 -V -30 0 0 0 0 0 0 15 0 -P 178 -321 -3.3623874390774883e-02 2.4690994028450861e-01 -2.6951601874273334e-01 6.1512188052391659e-01 4.9359999999999998e-01 1 0 0 0 0 -P 179 211 9.2022143347366359e-01 -9.0492262529110890e-01 -3.4802493120833939e+00 3.7144727086822180e+00 1.3957000000000000e-01 1 0 0 0 0 -P 180 331 2.8547714123264654e+00 -1.3978162152551836e+00 -1.1295889724261475e+01 1.1773753288764665e+01 9.5944351253944427e-01 2 0 0 -125 0 -P 181 -211 -2.1966458442153422e-01 -7.8242988024705071e-02 -3.6872339754814093e-01 4.5805155127295866e-01 1.3957000000000000e-01 1 0 0 0 0 -P 182 211 2.9560049319651122e-01 -2.0553784478372053e-01 2.0154644030530203e-01 4.3557572213806423e-01 1.3957000000000000e-01 1 0 0 0 0 -P 183 -213 4.8499322815683815e-01 -2.4176671902283986e-01 -1.2630218756659783e+00 1.5443904458672615e+00 7.0444872992306051e-01 2 0 0 -126 0 -P 184 223 -4.9798993623797905e-01 -7.9872460916706869e-02 1.4542593319776393e+00 1.7271969649830978e+00 7.8355954757476942e-01 2 0 0 -127 0 -P 185 111 -8.1435240888755867e-02 2.1770867381234621e-01 -4.8166487593616319e-01 5.5158808745506804e-01 1.3497999999999999e-01 2 0 0 -128 0 -P 186 211 -4.0963834077238803e-02 -8.1786285732019265e-02 -7.3954640395227589e-02 1.8252700066602331e-01 1.3957000000000000e-01 1 0 0 0 0 -P 187 -213 -1.9208712477878448e-01 1.0153734892728536e+00 1.0093633192296094e+01 1.0172602378103548e+01 7.2974470614907838e-01 2 0 0 -129 0 -P 188 113 -4.0460519527275640e-01 -1.8742290283792634e-01 1.4460803220046335e+01 1.4483694098040059e+01 6.8097888964938624e-01 2 0 0 -130 0 -P 189 323 -1.8174133915270314e+00 8.5518474033833691e-01 1.5636980567886377e+01 1.5790404265907304e+01 8.8734053469796670e-01 2 0 0 -131 0 -P 190 -313 -6.1300964784639689e-01 4.4874979596463827e-01 1.5814169758309760e+01 1.5858292211205139e+01 9.0570939246514259e-01 2 0 0 -132 0 -P 191 2112 -2.0875628243328179e-01 2.2254556192762173e-01 2.8276378449769140e+00 2.9952350959206409e+00 9.3957000000000002e-01 1 0 0 0 0 -P 192 -3122 -4.4603745527894489e-01 1.7089584026390511e-01 3.9246158988903992e+00 4.1079808441562280e+00 1.1156800000000000e+00 2 0 0 -133 0 -V -31 0 0 0 0 0 2 1 0 -P 42 21 -3.5966403857613591e+00 9.8909210856074747e-01 -6.8991601771054407e+00 7.8429928224539607e+00 0 2 0 0 -31 0 -P 43 21 3.5966403857613591e+00 -9.8909210856074747e-01 -5.4062667533947362e+01 5.4191199895830252e+01 0 2 0 0 -31 0 -P 193 92 0 0 -6.0961827711052806e+01 6.2034192718284217e+01 1.1484625737791408e+01 2 0 0 -32 0 -V -32 0 0 0 0 0 0 9 0 -P 194 -313 9.9449836339841191e-01 -6.3495009228094301e-01 -1.4642299615826484e+01 1.4717074686290321e+01 8.9619231626098039e-01 2 0 0 -134 0 -P 195 -213 6.9761486862091593e-01 -2.0191774573662452e-01 -9.7431391037408730e+00 9.7889921005604528e+00 6.0676970015494547e-01 2 0 0 -135 0 -P 196 321 9.0124089448534161e-01 -4.4767419129957531e-01 -8.9439134555301649e+00 9.0138713209953245e+00 4.9359999999999998e-01 1 0 0 0 0 -P 197 -321 -6.3603380049890879e-01 1.4504099316767780e-01 -4.6266617828900456e+00 4.6984269812705879e+00 4.9359999999999998e-01 1 0 0 0 0 -P 198 113 3.6907253066300794e-01 -1.4699212866480399e-01 -8.5021209501925501e+00 8.5375578909228391e+00 6.6784195014715297e-01 2 0 0 -136 0 -P 199 221 -1.1158814362096265e+00 7.2491333857959150e-01 -2.4507253306324639e+00 2.8419090198019128e+00 5.4744999999999999e-01 2 0 0 -137 0 -P 200 211 -3.4212525303292468e-01 -2.2696230407884616e-01 -6.7469338663752003e+00 6.7608548245304183e+00 1.3957000000000000e-01 1 0 0 0 0 -P 201 -213 -1.7598972275668995e-01 3.3505003289999202e-01 -1.7733387402423706e+00 1.9326147762775303e+00 6.6860951143368275e-01 2 0 0 -138 0 -P 202 323 -6.9239644466952743e-01 4.5349209741353164e-01 -3.5326948656226587e+00 3.7428911176348358e+00 9.1882152013627227e-01 2 0 0 -139 0 -V -33 0 0 0 0 0 2 1 0 -P 44 21 1.6002652901426460e+00 -2.4352657274836234e+00 2.8688832362561115e+01 2.8836443443833804e+01 0 2 0 0 -33 0 -P 45 21 -1.6002652901426460e+00 2.4352657274836234e+00 8.2577967751982451e-01 3.0287423525444375e+00 0 2 0 0 -33 0 -P 203 92 0 0 2.9514612040080941e+01 3.1865185796378242e+01 1.2011567006898593e+01 2 0 0 -34 0 -V -34 0 0 0 0 0 0 9 0 -P 204 111 1.0518787012931753e-01 -1.5995524457287180e-01 7.7600686419646514e-01 8.1059016893171143e-01 1.3497999999999999e-01 2 0 0 -140 0 -P 205 111 1.2478783609177713e-01 -3.6358255829143427e-02 2.1168354202844193e+00 2.1251131084660222e+00 1.3497999999999999e-01 2 0 0 -141 0 -P 206 -2224 -5.5186870172860858e-01 1.0329040235764173e+00 8.5442774549095424e-01 1.9723301257490100e+00 1.3373816085188170e+00 2 0 0 -142 0 -P 207 2224 -4.4972267469397098e-01 7.1644814273694990e-01 1.8328017645199988e+00 2.3811516687914014e+00 1.2630013999973755e+00 2 0 0 -143 0 -P 208 -213 -5.0716668288443600e-01 -5.4504576392598904e-02 1.3018912898240806e+00 1.5715730784703104e+00 7.1744840746711636e-01 2 0 0 -144 0 -P 209 211 1.1243572544296603e+00 -1.1191386976602283e-01 4.6556363922388408e+00 4.7928210848594484e+00 1.3957000000000000e-01 1 0 0 0 0 -P 210 -211 3.7004756859602959e-03 -8.3816613942284957e-01 6.7174081650278819e+00 6.7709370408591569e+00 1.3957000000000000e-01 1 0 0 0 0 -P 211 213 2.3150705552517567e-01 -5.3768853904646212e-03 3.2265766557190916e+00 3.3703104910732882e+00 9.4581788064766070e-01 2 0 0 -145 0 -P 212 221 -8.0782432554875203e-02 -5.4307719493941597e-01 8.0330277427792112e+00 8.0703590291778973e+00 5.4744999999999999e-01 2 0 0 -146 0 -V -35 0 -1.6215267168984296e-05 -3.1353680968872467e-05 3.1608138103218157e-04 3.1849241778733736e-04 0 2 0 -P 213 22 1.5032738330306678e-02 -1.0610389672991376e-01 7.6971546215477149e-01 7.7713957099295439e-01 0 1 0 0 0 0 -P 214 22 -1.4491207335906356e-01 -1.4502950690157407e-01 1.7619998130615260e+00 1.7738873718774226e+00 0 1 0 0 0 0 -V -36 0 0 0 0 0 0 2 0 -P 215 211 7.8196068794107787e-02 -3.3495008531546488e-01 9.1794139134572532e+00 9.1869160094288596e+00 1.3957000000000000e-01 1 0 0 0 0 -P 216 111 6.7011046783931716e-01 3.1756771243611115e-01 3.4595425231838661e+01 3.4603635124986923e+01 1.3497999999999999e-01 2 0 0 -147 0 -V -37 0 0 0 0 0 0 2 0 -P 217 -211 -4.9685789383140927e-01 -3.6267488655702912e-01 1.0819762776427670e+01 1.0838133933619364e+01 1.3957000000000000e-01 1 0 0 0 0 -P 218 111 2.0568277559265397e-01 -7.6716771394558292e-02 3.4410912961920448e+00 3.4507274271256705e+00 1.3497999999999999e-01 2 0 0 -148 0 -V -38 0 0 0 0 0 0 2 0 -P 219 211 1.5091075346411628e-01 -4.4759866324261638e-01 8.8874577707197915e+00 8.9010956645839556e+00 1.3957000000000000e-01 1 0 0 0 0 -P 220 111 -3.6160430730145765e-01 1.7103168765392807e-01 6.7399550195350288e+00 6.7531639087909117e+00 1.3497999999999999e-01 2 0 0 -149 0 -V -39 0 6.6134868952544265e-05 -6.0578167977499482e-06 5.5521228499667028e-04 5.5936992922159148e-04 0 2 0 -P 221 22 3.9890753756978531e-01 -8.3411821985644619e-02 2.9894333750092708e+00 3.0170841319386961e+00 0 1 0 0 0 0 -P 222 22 1.9818742468699430e-01 2.8719162130123162e-02 2.0232696605477911e+00 2.0331559617674917e+00 0 1 0 0 0 0 -V -40 0 0 0 0 0 0 2 0 -P 223 -211 -8.0116535432035585e-01 -4.3595563284300476e-01 -4.4464390949206933e+00 4.5411698546200583e+00 1.3957000000000000e-01 1 0 0 0 0 -P 224 211 -1.8430479575079395e+00 -1.8805736996568283e+00 -1.8133624777653438e+01 1.8324333837145126e+01 1.3957000000000000e-01 1 0 0 0 0 -V -41 0 0 0 0 0 0 2 0 -P 225 22 -5.5928768554192265e-01 -1.5147257359489372e-01 -1.5692017076727673e+01 1.5702711440769178e+01 0 1 0 0 0 0 -P 226 22 4.2982874000373740e-02 1.6744026991665381e-01 -4.3431881820625335e+00 4.3466271241336942e+00 0 1 0 0 0 0 -V -42 0 7.6394153622048107e-05 1.0029878162263965e-04 -3.7481894148792775e-03 3.7506937113298347e-03 0 3 0 -P 227 22 1.1629338988407917e-01 8.9272709148877694e-02 -2.8532131053532828e+00 2.8569772126653779e+00 0 1 0 0 0 0 -P 228 -11 1.5797118386348692e-02 1.4711735030322620e-02 -1.0283381816186061e+00 1.0285648545286661e+00 5.1000000000000004e-04 1 0 0 0 0 -P 229 11 5.9939238082474242e-02 1.4813366540532533e-01 -5.5401626596588285e+00 5.5424668560728723e+00 5.1000000000000004e-04 1 0 0 0 0 -V -43 0 0 0 0 0 0 2 0 -P 230 -211 1.4467675491244145e-01 1.8856155472397737e-01 -1.1886630144118609e+01 1.1889825179173203e+01 1.3957000000000000e-01 1 0 0 0 0 -P 231 111 -5.0350326425457087e-02 -6.7011909820600379e-01 -3.1309205936853076e+01 3.1316707853122548e+01 1.3497999999999999e-01 2 0 0 -150 0 -V -44 0 0 0 0 0 0 2 0 -P 232 -311 5.3036395409351500e-01 -1.2314697068839459e-01 -3.4041141413635536e+01 3.4049132665491257e+01 4.9767000000000000e-01 2 0 0 -151 0 -P 233 -211 2.9364965893852782e-03 -2.8037181824656832e-01 -2.9550358086806355e+01 2.9552017863808569e+01 1.3957000000000000e-01 1 0 0 0 0 -V -45 0 -4.8872289253927846e-05 -5.4402958994364631e-05 -3.4409448959975063e-03 3.4417503130490870e-03 0 2 0 -P 234 22 -4.4188958398665414e-02 -3.6742753102171405e-03 -2.1044367148210967e+00 2.1049038103985716e+00 0 1 0 0 0 0 -P 235 22 -4.2790481089641280e-01 -5.2184434402458346e-01 -3.1134207733526843e+01 3.1141520759927278e+01 0 1 0 0 0 0 -V -46 0 0 0 0 0 0 2 0 -P 236 2212 1.2977839391996976e-01 -1.4318504925871164e-01 -6.0637712423823552e+02 6.0637788094093207e+02 9.3827000000000005e-01 1 0 0 0 0 -P 237 211 -1.2295953257244377e-01 1.8096777706713205e-01 -3.0609568574526622e+02 3.0609579575687195e+02 1.3957000000000000e-01 1 0 0 0 0 -V -47 0 4.2169714021909966e-05 8.5829172994005684e-05 -9.6870296651885690e-01 9.6870297157190144e-01 0 2 0 -P 238 22 9.2913107559837393e-02 1.9693827307980796e-01 -2.8833621000331136e+03 2.8833621082557238e+03 0 1 0 0 0 0 -P 239 22 1.3123498171528272e-01 2.5927646721163589e-01 -2.2656630725712694e+03 2.2656630912075148e+03 0 1 0 0 0 0 -V -48 0 0 0 0 0 0 2 0 -P 240 211 -9.2822980160143120e-01 1.2804318498963387e+00 5.1973118949309658e+01 5.1997362331091381e+01 1.3957000000000000e-01 1 0 0 0 0 -P 241 111 -6.5531495792427386e-01 1.7586644364637036e+00 5.3859919479611001e+01 5.3892777663103821e+01 1.3497999999999999e-01 2 0 0 -152 0 -V -49 0 0 0 0 0 0 2 0 -P 242 -211 -7.6039881533248244e-01 2.0320687957741885e+00 6.9082683121476649e+01 6.9116887205634285e+01 1.3957000000000000e-01 1 0 0 0 0 -P 243 111 -3.8399339173650116e-01 3.7283975804546754e-01 2.7206887603585198e+01 2.7212486345143006e+01 1.3497999999999999e-01 2 0 0 -153 0 -V -50 0 0 0 0 0 0 2 0 -P 244 211 1.0973573194578165e-01 1.1879012864271921e+00 3.0285434690618651e+01 3.0309242576840955e+01 1.3957000000000000e-01 1 0 0 0 0 -P 245 111 -4.1020081276223969e-01 5.9241060031560666e-01 2.7159228200759497e+01 2.7169120543136597e+01 1.3497999999999999e-01 2 0 0 -154 0 -V -51 0 0 0 0 0 0 2 0 -P 246 -211 -3.1659081224093022e-01 -4.3498967383643228e-02 7.7575986968116100e+00 7.7654323271941532e+00 1.3957000000000000e-01 1 0 0 0 0 -P 247 111 6.6426419466017059e-02 3.5700759179416253e-01 3.2854791305799246e+01 3.2857075314729755e+01 1.3497999999999999e-01 2 0 0 -155 0 -V -52 0 0 0 0 0 0 2 0 -P 248 211 2.8109806984337099e-02 -7.3137418999519999e-01 4.8717155060388739e+00 4.9283658674777211e+00 1.3957000000000000e-01 1 0 0 0 0 -P 249 111 3.0439207238921828e-01 -1.0014164915511482e-01 2.0179891546884896e+00 2.0477262298630827e+00 1.3497999999999999e-01 2 0 0 -156 0 -V -53 0 0 0 0 0 0 3 0 -P 250 -211 5.7751284344357268e-01 -1.6610167022038862e+00 2.0077346456800402e+01 2.0154697172139258e+01 1.3957000000000000e-01 1 0 0 0 0 -P 251 211 5.8128837571324521e-01 -1.9934568518397549e+00 2.9607592755877548e+01 2.9680646808630684e+01 1.3957000000000000e-01 1 0 0 0 0 -P 252 111 6.5948645476388301e-01 -1.2682284115554467e+00 1.7819650401514330e+01 1.7877401537149723e+01 1.3497999999999999e-01 2 0 0 -157 0 -V -54 0 5.1864047261200106e-06 -8.9353295080138478e-06 4.5057994120876729e-05 4.6268003358622562e-05 0 2 0 -P 253 22 2.7757152045232775e-01 -5.5879187093033122e-01 2.7799486518070124e+00 2.8491066688819608e+00 0 1 0 0 0 0 -P 254 22 8.3150786524103473e-02 -6.2673834877903317e-02 3.5390310973347999e-01 3.6890306851110266e-01 0 1 0 0 0 0 -V -55 0 0 0 0 0 0 2 0 -P 255 211 -3.4537287284459200e-01 2.0534899061500686e-01 2.2461602796552680e+00 2.2860810169468100e+00 1.3957000000000000e-01 1 0 0 0 0 -P 256 -211 -1.0411121014131801e-01 -2.0872779943077877e-01 6.2062244364248373e+00 6.2121741748367851e+00 1.3957000000000000e-01 1 0 0 0 0 -V -56 0 0 0 0 0 0 2 0 -P 257 -211 1.2850549764079238e-03 3.2229511813417006e-01 9.1196910591118752e-01 9.7726313220946881e-01 1.3957000000000000e-01 1 0 0 0 0 -P 258 111 -2.8056748593473252e-01 1.1916090751261861e-02 4.0696486529871594e+00 4.0815585095086817e+00 1.3497999999999999e-01 2 0 0 -158 0 -V -57 0 0 0 0 0 0 2 0 -P 259 211 7.8085905486046631e-02 1.9157586059214773e-02 2.0788278036794767e+00 2.0850585708775737e+00 1.3957000000000000e-01 1 0 0 0 0 -P 260 111 -3.8387407607252627e-01 6.8367344397323782e-01 2.1019786165900940e+00 2.2475102645542622e+00 1.3497999999999999e-01 2 0 0 -159 0 -V -58 0 0 0 0 0 0 2 0 -P 261 211 -1.9218849411493319e-01 1.1374276734294492e-01 1.0045138277378207e+00 1.0384611930204639e+00 1.3957000000000000e-01 1 0 0 0 0 -P 262 111 -1.8889806198257593e+00 2.4579472809096470e+00 1.8831934148939073e+01 1.9085851199466742e+01 1.3497999999999999e-01 2 0 0 -160 0 -V -59 0 0 0 0 0 0 2 0 -P 263 -311 -1.4318375653716335e+00 -3.5863038245912704e+00 -2.3209274506000757e+00 4.5327821032712690e+00 4.9767000000000000e-01 2 0 0 -161 0 -P 264 111 -1.9155619001346455e-01 -6.0914542296763896e-01 -1.2809667227843524e-01 6.6511674020709111e-01 1.3497999999999999e-01 2 0 0 -162 0 -V -60 0 0 0 0 0 0 2 0 -P 265 311 -2.9659176075774984e-01 -4.6221487895696203e-02 -1.5427574353175526e+00 1.6485991118583883e+00 4.9767000000000000e-01 2 0 0 -163 0 -P 266 211 -1.5043143739465120e-01 -4.3840705696961185e-01 -1.8263399040108697e+00 1.8893987389748650e+00 1.3957000000000000e-01 1 0 0 0 0 -V -61 0 0 0 0 0 0 2 0 -P 267 -321 1.3117237531214782e-01 2.2171635567557227e-01 -7.0771807964257647e+00 7.0990487616100166e+00 4.9359999999999998e-01 1 0 0 0 0 -P 268 321 1.6118644520389575e-01 1.9737463878801137e-01 -4.5373479438923123e+00 4.5712257811333235e+00 4.9359999999999998e-01 1 0 0 0 0 -V -62 0 0 0 0 0 0 2 0 -P 269 -321 7.0076510378991513e-02 1.6115182850873450e-01 -1.4990960823910882e+01 1.5000114266670419e+01 4.9359999999999998e-01 1 0 0 0 0 -P 270 211 -2.6567428535109305e-01 1.6610101468545962e-01 -2.5800207633514976e+01 2.5802487595004493e+01 1.3957000000000000e-01 1 0 0 0 0 -V -63 0 0 0 0 0 0 2 0 -P 271 -211 4.8599111099490840e-02 -7.4756967766754417e-02 -8.1617511091659747e+00 8.1634313515029557e+00 1.3957000000000000e-01 1 0 0 0 0 -P 272 111 3.7620839570376235e-01 4.8378053771402385e-01 -1.9561155024868459e+01 1.9571218201047309e+01 1.3497999999999999e-01 2 0 0 -164 0 -V -64 0 0 0 0 0 0 2 0 -P 273 -211 5.3030438115813272e-01 2.8459142744427268e-01 -8.4553036392123389e+00 8.4778449168068466e+00 1.3957000000000000e-01 1 0 0 0 0 -P 274 211 -1.6258540618367565e-01 1.6222338006653356e-01 -1.2249613526344374e+01 1.2252561437064626e+01 1.3957000000000000e-01 1 0 0 0 0 -V -65 0 0 0 0 0 0 2 0 -P 275 311 8.0055295557585249e-01 1.1955698343636345e+00 -1.3612825986589098e+02 1.3613677343689312e+02 4.9767000000000000e-01 2 0 0 -165 0 -P 276 211 7.3266490640172433e-01 1.6751233348484984e+00 -1.1609843447379056e+02 1.1611291402381548e+02 1.3957000000000000e-01 1 0 0 0 0 -V -66 0 0 0 0 0 0 1 0 -P 277 130 2.2891228831712537e-01 -1.3418287413741594e+00 9.8860382248171286e-01 1.7543996561917690e+00 4.9767000000000000e-01 1 0 0 0 0 -V -67 0 0 0 0 0 0 2 0 -P 278 -211 -3.8537250695572384e-01 -9.0184159113101237e-01 4.3277868687666932e-01 1.0810214620097742e+00 1.3957000000000000e-01 1 0 0 0 0 -P 279 111 8.9810384677170528e-03 -6.3878733240759011e-01 -2.6775211174027441e-01 7.0571999322517431e-01 1.3497999999999999e-01 2 0 0 -166 0 -V -68 0 0 0 0 0 0 2 0 -P 280 2112 2.4694209341644854e-01 -8.4716433213517051e-01 6.4556864532723501e-01 1.4416027413516419e+00 9.3957000000000002e-01 1 0 0 0 0 -P 281 111 -8.5409563822338136e-02 -4.3012054975671515e-01 -1.2184751648084854e-01 4.7472613008753961e-01 1.3497999999999999e-01 2 0 0 -167 0 -V -69 0 0 0 0 0 0 2 0 -P 282 -2212 -1.1996124512738150e-01 2.3026123610330118e-01 -3.6071253594137636e+00 3.7361898892602081e+00 9.3827000000000005e-01 1 0 0 0 0 -P 283 111 -6.6404144386860195e-02 6.2308146282458045e-02 -9.8313964690159639e-01 9.9653147526543429e-01 1.3497999999999999e-01 2 0 0 -168 0 -V -70 0 2.2607956805941250e-06 3.0594289068836569e-06 -1.8790166695767641e-05 1.9211970399434110e-05 0 2 0 -P 284 22 1.5503350124231352e-01 9.7732231082630405e-02 -8.5706126698882723e-01 8.7643652985959741e-01 0 1 0 0 0 0 -P 285 22 8.9437597330653915e-02 2.3309905645556292e-01 -1.1748130566901320e+00 1.2010495294143226e+00 0 1 0 0 0 0 -V -71 0 0 0 0 0 0 2 0 -P 286 211 -3.1925262209964905e-01 1.3821580424106233e-01 -5.1157300993405530e-01 6.3420231366062840e-01 1.3957000000000000e-01 1 0 0 0 0 -P 287 111 4.5237516943432650e-02 1.4303653358737961e-01 -1.2206147222144386e+00 1.2371846197583172e+00 1.3497999999999999e-01 2 0 0 -169 0 -V -72 0 -9.3894008003613711e-06 4.8441180380011681e-05 -1.6347347256430333e-04 1.7121757089428238e-04 0 2 0 -P 288 22 -9.1259807998499157e-02 1.5539919386615769e-01 -5.1519193076376746e-01 5.4580215054016890e-01 0 1 0 0 0 0 -P 289 22 -9.8330182436480451e-03 3.6615228052958404e-01 -1.2448772907468852e+00 1.2976454253000318e+00 0 1 0 0 0 0 -V -73 0 0 0 0 0 0 2 0 -P 290 311 2.9288036009376067e-01 1.2928728715900386e+00 -1.1628140700302700e+01 1.1714035630061840e+01 4.9767000000000000e-01 2 0 0 -170 0 -P 291 111 -2.4972174502373165e-01 1.2171174499571773e+00 -9.8820220121753870e+00 9.9607386516486240e+00 1.3497999999999999e-01 2 0 0 -171 0 -V -74 0 0 0 0 0 0 2 0 -P 292 211 -8.1826523521756611e-01 7.8243572685105356e-01 -1.2828767012552214e+00 1.7166875304906464e+00 1.3957000000000000e-01 1 0 0 0 0 -P 293 111 -4.1995931923232044e-01 6.9352306047057866e-01 -2.4353681474951611e-01 8.5724549911498049e-01 1.3497999999999999e-01 2 0 0 -172 0 -V -75 0 0 0 0 0 0 2 0 -P 294 22 -2.3993756374341146e-01 1.6870365091332759e-01 -4.5024786003822342e-01 5.3735843884283452e-01 0 1 0 0 0 0 -P 295 22 -6.5988345454275177e-01 3.7272537616398288e-01 -8.6204472334868429e-02 7.6275919572719031e-01 0 1 0 0 0 0 -V -76 0 0 0 0 0 0 2 0 -P 296 -321 2.9684402714531981e-02 1.0172982955755167e-01 7.8543908048649558e-01 9.3369461342657356e-01 4.9359999999999998e-01 1 0 0 0 0 -P 297 211 -4.6850393570640159e-01 -8.5880035046017392e-02 7.6480086906950495e-01 9.1174090202280789e-01 1.3957000000000000e-01 1 0 0 0 0 -V -77 0 0 0 0 0 0 2 0 -P 298 -211 -1.2939988042445941e-01 -9.9234300444954626e-02 2.9453547623268478e-01 3.6444849718208244e-01 1.3957000000000000e-01 1 0 0 0 0 -P 299 111 3.9915573664182591e-01 -1.0301564308733102e-01 -1.5144973175224732e-01 4.5944983019106961e-01 1.3497999999999999e-01 2 0 0 -173 0 -V -78 0 0 0 0 0 0 2 0 -P 300 211 2.0689198584967584e-02 -2.5828734371727674e-01 1.5152033244273926e+00 1.5435223659275032e+00 1.3957000000000000e-01 1 0 0 0 0 -P 301 111 7.5486711156253306e-01 3.9411709508809456e-01 3.2919551559674907e+00 3.4029900073406600e+00 1.3497999999999999e-01 2 0 0 -174 0 -V -79 0 0 0 0 0 0 2 0 -P 302 -211 1.1757002829753060e+00 -7.7106228617607020e-01 2.2873454234941420e+01 2.2917050347446786e+01 1.3957000000000000e-01 1 0 0 0 0 -P 303 111 2.6685635170597993e-01 -8.2387989842869880e-01 1.2612720468497917e+01 1.2643137570094973e+01 1.3497999999999999e-01 2 0 0 -175 0 -V -80 0 0 0 0 0 0 3 0 -P 304 211 -3.0013898117931026e-01 2.2241352690799113e-01 1.2558660560100285e+00 1.3176610036398551e+00 1.3957000000000000e-01 1 0 0 0 0 -P 305 -211 -2.8515883010338406e-02 -1.2080898873270086e-01 9.9053262633137185e-01 1.0079894027564984e+00 1.3957000000000000e-01 1 0 0 0 0 -P 306 111 1.5031021128478475e-01 6.1869303805222545e-03 7.3336808953253430e-01 7.6071005834589123e-01 1.3497999999999999e-01 2 0 0 -176 0 -V -81 0 0 0 0 0 0 2 0 -P 307 211 5.1240948779819634e-02 3.3106285181225731e-01 6.2296340656530647e-01 7.2096562851593138e-01 1.3957000000000000e-01 1 0 0 0 0 -P 308 -211 -1.1415211181414819e+00 1.1959649466073342e-01 4.2262254369293686e+00 4.3815334089045752e+00 1.3957000000000000e-01 1 0 0 0 0 -V -82 0 -5.1481558743536353e-05 3.5870232266659004e-05 7.9369441921158649e-05 1.0331184230181930e-04 0 2 0 -P 309 22 -8.3041828422767416e-02 1.3659289369937574e-01 1.7956183625056635e-01 2.4040802173521689e-01 0 1 0 0 0 0 -P 310 22 -2.4944757644687382e-01 9.5072045551801362e-02 3.3303916405451600e-01 4.2682299848386052e-01 0 1 0 0 0 0 -V -83 0 0 0 0 0 0 2 0 -P 311 211 1.0309018758041712e-01 4.2724264587845878e-03 2.2631018679628315e-01 2.8520505947647545e-01 1.3957000000000000e-01 1 0 0 0 0 -P 312 111 -4.8694682571265593e-02 -3.6180916417226161e-01 3.4696204820675303e+00 3.4913840999483670e+00 1.3497999999999999e-01 2 0 0 -177 0 -V -84 0 0 0 0 0 0 3 0 -P 313 -211 3.0574739693101170e-02 -4.3491576202209295e-02 4.0806616924722747e-02 1.5482666693013367e-01 1.3957000000000000e-01 1 0 0 0 0 -P 314 211 -1.5562677085262105e-01 -2.3620058456930920e-01 9.0884352597140916e-01 9.6202221780842523e-01 1.3957000000000000e-01 1 0 0 0 0 -P 315 111 -2.4435179757304334e-01 7.4349308208397899e-02 5.9722684245561075e-01 6.6342680256207898e-01 1.3497999999999999e-01 2 0 0 -178 0 -V -85 0 0 0 0 0 0 2 0 -P 316 111 -3.6392887739340002e-01 6.7496682775182959e-01 1.4962438007820593e+00 1.6867096840135030e+00 1.3497999999999999e-01 2 0 0 -179 0 -P 317 22 1.4409213370305821e-01 -5.7604870198693786e-02 3.7612512111205554e-01 4.0687955318161023e-01 0 1 0 0 0 0 -V -86 0 3.5647739613994551e-04 -8.4878083113578028e-05 4.0545108369145441e-04 5.4813422162874350e-04 0 2 0 -P 318 22 1.0473665451576206e+00 -2.7870050354220938e-01 1.2250032599908525e+00 1.6356294316190043e+00 0 1 0 0 0 0 -P 319 22 9.3084625249818934e-02 7.1564722039120275e-03 7.2125724752282516e-02 1.1797492412943782e-01 0 1 0 0 0 0 -V -87 0 0 0 0 0 0 2 0 -P 320 -211 9.3744393824816696e-01 -6.7184195479951447e-01 2.5898309235071864e+00 2.8384638005162497e+00 1.3957000000000000e-01 1 0 0 0 0 -P 321 111 5.8064185894314453e-02 9.8787864581293211e-02 3.1042140903798182e-01 3.5736751875517092e-01 1.3497999999999999e-01 2 0 0 -180 0 -V -88 0 0 0 0 0 0 3 0 -P 322 -211 8.3735586764706563e-02 -1.0421123019306522e-01 2.4974112587102385e+02 2.4974120065127514e+02 1.3957000000000000e-01 1 0 0 0 0 -P 323 211 6.6821925997163825e-04 -1.0568054772206613e-03 2.1333331792164230e+02 2.1333336358105069e+02 1.3957000000000000e-01 1 0 0 0 0 -P 324 111 3.1232342162247389e-02 7.4080388596620431e-02 7.1134026050131084e+01 7.1134199546099481e+01 1.3497999999999999e-01 2 0 0 -181 0 -V -89 0 0 0 0 0 0 2 0 -P 325 211 1.2309113191819084e-01 2.0477190657215033e-01 1.1824104023206878e+03 1.1824104346963943e+03 1.3957000000000000e-01 1 0 0 0 0 -P 326 -211 2.7182151527050440e-02 2.1590966128895990e-03 4.4588081331807786e+01 4.4588308110623188e+01 1.3957000000000000e-01 1 0 0 0 0 -V -90 0 0 0 0 0 0 2 0 -P 327 211 3.8045312551576935e-02 4.4176323178469101e-01 2.0603934105508088e+02 2.0603986542510555e+02 1.3957000000000000e-01 1 0 0 0 0 -P 328 -211 -1.3786723222707301e-01 5.9274844571574309e-02 1.1735950011477758e+01 1.1737739277123415e+01 1.3957000000000000e-01 1 0 0 0 0 -V -91 0 0 0 0 0 0 2 0 -P 329 -321 -8.3627361383984444e-01 -5.2573367818186700e-01 1.4711426769101732e+02 1.4711841199755347e+02 4.9359999999999998e-01 1 0 0 0 0 -P 330 211 -8.2279004458571267e-02 7.3018712211581877e-02 5.1415548559796406e+01 5.1415855677568857e+01 1.3957000000000000e-01 1 0 0 0 0 -V -92 0 0 0 0 0 0 2 0 -P 331 311 1.8498251272975502e-01 2.1534491855260202e-01 5.4113827121414495e+01 5.4116860155770283e+01 4.9767000000000000e-01 2 0 0 -182 0 -P 332 211 5.2951984991579670e-01 -6.4554600935646037e-02 4.9941304935652070e+01 4.9944348799725510e+01 1.3957000000000000e-01 1 0 0 0 0 -V -93 0 0 0 0 0 0 2 0 -P 333 -211 -7.6476777911200444e-02 -4.0287232681542129e-01 1.3202657166015865e+02 1.3202728225230263e+02 1.3957000000000000e-01 1 0 0 0 0 -P 334 111 -1.8723935235103165e-01 6.7174295629019873e-02 2.0892529195013871e+01 2.0893912192932397e+01 1.3497999999999999e-01 2 0 0 -183 0 -V -94 0 0 0 0 0 0 2 0 -P 335 -2212 -1.2935100172353481e-01 -1.5203835057338125e-01 1.5037893482216367e+00 1.7836984998639236e+00 9.3827000000000005e-01 1 0 0 0 0 -P 336 211 -5.5352999453907193e-03 -1.0816988709474940e-01 3.6815646393669343e-01 4.0835074489701390e-01 1.3957000000000000e-01 1 0 0 0 0 -V -95 0 0 0 0 0 0 2 0 -P 337 22 4.6738825445375309e-01 1.6146085191757137e-01 5.0134341685598127e-01 7.0417796665907206e-01 0 1 0 0 0 0 -P 338 22 1.3168775031267746e-01 1.5037716076096133e-01 -1.3292620991243345e-01 2.4005068494513118e-01 0 1 0 0 0 0 -V -96 0 0 0 0 0 0 2 0 -P 339 2112 1.8167414076157981e-01 -1.5341709619492785e-01 1.3596341969857564e+00 1.6697123205329250e+00 9.3957000000000002e-01 1 0 0 0 0 -P 340 -211 -2.6075250516129161e-01 9.9943367152509469e-02 1.1394118409731577e+00 1.1814058040468192e+00 1.3957000000000000e-01 1 0 0 0 0 -V -97 0 0 0 0 0 0 3 0 -P 341 211 4.5932154060343913e-02 1.3436313571120873e-01 -2.6773721114820626e-02 2.0089756608059256e-01 1.3957000000000000e-01 1 0 0 0 0 -P 342 -211 -2.3240549013258138e-01 -1.2739824390148866e-01 -1.7172491484146121e-02 3.0002883820846565e-01 1.3957000000000000e-01 1 0 0 0 0 -P 343 111 5.3155140450545445e-02 -3.2198458976233074e-01 8.1469103673461631e-04 3.5315691855352199e-01 1.3497999999999999e-01 2 0 0 -184 0 -V -98 0 -5.3456041917950884e-06 1.0940115392255510e-05 -1.1276991913333317e-05 2.5881423818737699e-05 0 2 0 -P 344 22 2.8925221694516508e-02 7.6693657802626408e-02 -9.9535856321624535e-03 8.2569119313216199e-02 0 1 0 0 0 0 -P 345 22 -6.5257195441118784e-02 -2.3379870579969641e-03 -6.6691702615093121e-02 9.3336760914571146e-02 0 1 0 0 0 0 -V -99 0 0 0 0 0 0 2 0 -P 346 211 -1.6181000821158892e-01 -1.6963424504261243e-01 -2.6313301097208053e-01 3.7904751972786288e-01 1.3957000000000000e-01 1 0 0 0 0 -P 347 -211 3.2808169398020481e-01 1.6708294975973997e-01 1.4593698511490616e-01 4.1991868087733947e-01 1.3957000000000000e-01 1 0 0 0 0 -V -100 0 0 0 0 0 0 2 0 -P 348 -211 4.6420365845633227e-01 -4.0847882605596070e-01 -1.4697255584821705e+00 1.6005976977416989e+00 1.3957000000000000e-01 1 0 0 0 0 -P 349 111 -2.8173495143786537e-01 -2.3294554347192373e-01 -8.3799170321694616e-01 9.2416876388761626e-01 1.3497999999999999e-01 2 0 0 -185 0 -V -101 0 0 0 0 0 0 2 0 -P 350 211 -4.3713138842513549e-01 -8.0193348901581640e-01 -2.8575036213923499e+00 3.0031629830433717e+00 1.3957000000000000e-01 1 0 0 0 0 -P 351 -211 3.4464639850554046e-01 -3.9448924009807262e-01 -2.4618660005043602e+00 2.5208464629753493e+00 1.3957000000000000e-01 1 0 0 0 0 -V -102 0 0 0 0 0 0 2 0 -P 352 22 3.2856276203468715e-01 -2.2653644571307425e+00 -1.0628501612512524e+01 1.0872206590172965e+01 0 1 0 0 0 0 -P 353 22 1.0434568190199986e-01 -2.7883825262630772e-02 -4.8973860227147370e-01 5.0150715607820417e-01 0 1 0 0 0 0 -V -103 0 4.9037358891567776e-06 3.2017628026642254e-06 -1.1892814674675885e-05 1.3454250789796279e-05 0 2 0 -P 354 22 2.2354910027528657e-01 1.6029891550903602e-01 -6.4738274096045079e-01 7.0340198737330506e-01 0 1 0 0 0 0 -P 355 22 6.4511010772874300e-02 2.7782206584984766e-02 -5.1236759212390626e-02 8.6940939770953726e-02 0 1 0 0 0 0 -V -104 0 -1.3726373686040436e-04 -9.9702507710567058e-05 -2.9060095827281827e-03 2.9116430753003118e-03 0 2 0 -P 356 22 -2.5303124530879706e-01 -1.9767059562620412e-01 -4.4765459960137299e+00 4.4880466274209283e+00 0 1 0 0 0 0 -P 357 22 -4.0221420025721384e-02 -1.5335598110120413e-02 -1.7319040659961942e+00 1.7324389273542784e+00 0 1 0 0 0 0 -V -105 0 0 0 0 0 0 2 0 -P 358 211 -2.3305194831128404e-01 3.5257524413723085e-01 -3.8645950116748433e+00 3.8901409874903243e+00 1.3957000000000000e-01 1 0 0 0 0 -P 359 111 1.6319333803292452e-01 9.1595544301201692e-01 -1.4636028000277902e+01 1.4666190427799593e+01 1.3497999999999999e-01 2 0 0 -186 0 -V -106 0 0 0 0 0 0 3 0 -P 360 211 -5.1068619640013913e-02 -1.1688780893563810e-01 -1.4247259084409054e+00 1.4372176115232076e+00 1.3957000000000000e-01 1 0 0 0 0 -P 361 -211 -3.9918742821603924e-02 2.3757962531374108e-01 -4.9884072044398658e-01 5.7127877053654863e-01 1.3957000000000000e-01 1 0 0 0 0 -P 362 111 1.4605102514493379e-01 -7.1654523819423611e-04 -1.0841280953562038e+00 1.1022181013409436e+00 1.3497999999999999e-01 2 0 0 -187 0 -V -107 0 0 0 0 0 0 2 0 -P 363 -2212 -1.1406253960346636e-01 1.3050504356992600e+00 -1.3746559005676280e+01 1.3840679246052170e+01 9.3827000000000005e-01 1 0 0 0 0 -P 364 111 -7.3879643598863620e-02 2.1911131985195054e-01 -5.3599032767510568e+00 5.3665865043575209e+00 1.3497999999999999e-01 2 0 0 -188 0 -V -108 0 0 0 0 0 0 2 0 -P 366 111 -1.9383253021003571e-01 2.6263377003627869e-01 -2.5692229458455249e+00 2.5933903857287377e+00 1.3497999999999999e-01 2 0 0 -189 0 -P 365 2212 -9.2672351349186208e-02 3.2713801118000992e-02 -5.0230624849063501e+00 5.1108869756297421e+00 9.3827000000000005e-01 1 0 0 0 0 -V -109 0 0 0 0 0 0 2 0 -P 367 -211 -8.9256978629664779e-02 4.9532478206519792e-01 -7.2657351357255473e-01 8.9481970445850134e-01 1.3957000000000000e-01 1 0 0 0 0 -P 368 111 -4.4699794465351418e-02 -2.0886308426759173e-01 1.1405705795541135e-02 2.5292597755017221e-01 1.3497999999999999e-01 2 0 0 -190 0 -V -110 0 0 0 0 0 0 3 0 -P 369 -211 5.2655584360949588e-02 -2.6070291359845066e-01 -2.7865206099874709e-02 3.0165356675183341e-01 1.3957000000000000e-01 1 0 0 0 0 -P 370 211 1.1822125040940321e-01 -3.6410489305205150e-02 -7.4902779595835356e-02 2.0097810594935350e-01 1.3957000000000000e-01 1 0 0 0 0 -P 371 111 -1.6232482169526979e-02 -5.4435203098128715e-02 7.9250327722834704e-02 1.6651396235119514e-01 1.3497999999999999e-01 2 0 0 -191 0 -V -111 0 0 0 0 0 0 1 0 -P 372 130 9.3352618998182743e-02 4.0984422314125646e-01 -2.9781253674948460e+00 3.0485395080484676e+00 4.9767000000000000e-01 1 0 0 0 0 -V -112 0 0 0 0 0 0 2 0 -P 373 130 -2.2310089003166997e-01 -9.6246577399157734e-02 -1.0045105369445986e-02 5.5390770335486272e-01 4.9767000000000000e-01 1 0 0 0 0 -P 374 310 -1.0058249844852461e-01 -3.3078112442504448e-01 -8.2668057706903650e-02 6.1159008161927886e-01 4.9767000000000000e-01 2 0 0 -192 0 -V -113 0 0 0 0 0 0 2 0 -P 375 -321 5.8939484155127987e-02 2.3553953346591427e-01 -5.9125978676033464e+00 5.9381316286021688e+00 4.9359999999999998e-01 1 0 0 0 0 -P 376 321 -1.6771205287668237e-01 1.4016513775476167e-01 -5.5593832946803383e+00 5.5855310558345961e+00 4.9359999999999998e-01 1 0 0 0 0 -V -114 0 0 0 0 0 0 2 0 -P 377 211 4.4626469507733829e-01 -2.9876737728109021e-01 -2.7747433142093183e+01 2.7752980738717618e+01 1.3957000000000000e-01 1 0 0 0 0 -P 378 -211 -2.6784944598235311e-01 8.4540277169185385e-02 -1.4243508730173986e+01 1.4246961469577274e+01 1.3957000000000000e-01 1 0 0 0 0 -V -115 0 0 0 0 0 0 2 0 -P 379 211 -4.7708602474535206e-01 4.2323427871643926e-01 1.2306474356724806e+00 1.3930941194029927e+00 1.3957000000000000e-01 1 0 0 0 0 -P 380 111 -3.7138811372573445e-02 -2.6763057762592657e-01 1.8964640672464467e-01 3.5663816028872181e-01 1.3497999999999999e-01 2 0 0 -193 0 -V -116 0 0 0 0 0 0 2 0 -P 381 -211 1.8239573851947732e-01 8.5172318449127438e-01 1.2672881147092623e+00 1.5440853405862578e+00 1.3957000000000000e-01 1 0 0 0 0 -P 382 111 -5.5029184311155943e-02 -3.1797439570535158e-02 2.5538799358925224e-01 2.9577341996659695e-01 1.3497999999999999e-01 2 0 0 -194 0 -V -117 0 0 0 0 0 0 3 0 -P 383 211 -6.2243035013886994e-01 4.2244827222762471e-01 1.4918178951339065e+00 1.6765686686276411e+00 1.3957000000000000e-01 1 0 0 0 0 -P 384 -211 -5.3662832160087004e-01 7.6596039196045107e-01 2.0066624387491827e+00 2.2182964647637142e+00 1.3957000000000000e-01 1 0 0 0 0 -P 385 111 -5.4333294606349714e-01 8.9116704629103738e-01 3.0590759352765375e+00 3.2350509382173804e+00 1.3497999999999999e-01 2 0 0 -195 0 -V -118 0 0 0 0 0 0 2 0 -P 386 2212 1.5566891027165103e-01 1.9712389042807388e-01 1.7138534409912462e-01 9.8631342223181673e-01 9.3827000000000005e-01 1 0 0 0 0 -P 387 -211 2.0173096820492542e-01 3.0084177275992156e-02 1.9384965688599484e-01 3.1409857629427085e-01 1.3957000000000000e-01 1 0 0 0 0 -V -119 0 -7.1660461754768958e-05 -1.0769721945931413e-04 1.5531901999572816e-05 1.3163894594449711e-04 0 2 0 -P 388 22 -1.1697413369043864e-01 -9.6649254231599702e-02 4.1343221873855411e-02 1.5726820495912039e-01 0 1 0 0 0 0 -P 389 22 -3.9737322549938564e-01 -6.7635414352139833e-01 7.0137957301546427e-02 7.8757840299032089e-01 0 1 0 0 0 0 -V -120 0 0 0 0 0 0 2 0 -P 390 -2112 3.0284788000153912e-01 -8.9128481759035616e-01 -3.4314384176045293e-01 1.3735519449684543e+00 9.3957000000000002e-01 1 0 0 0 0 -P 391 211 5.8301081246194575e-01 -7.0551758694164624e-01 -7.9066317918965748e-02 9.2918670914986956e-01 1.3957000000000000e-01 1 0 0 0 0 -V -121 0 2.2874989631111603e+01 -2.2902782156161990e+01 -1.2543595889194581e+01 4.1058814581296019e+01 0 2 0 -P 392 2112 7.2363470358385507e-01 -8.6288876686327309e-01 -4.4761632740272878e-01 1.5334198282490092e+00 9.3957000000000002e-01 1 0 0 0 0 -P 393 -211 5.2572010790258272e-01 -3.8798397863996692e-01 -2.3747258980458383e-01 7.0907419593643206e-01 1.3957000000000000e-01 1 0 0 0 0 -V -122 0 0 0 0 0 0 2 0 -P 394 311 5.7209538578317543e-01 -9.1601292232158002e-02 -1.3829998035577337e-01 7.7619987157909842e-01 4.9767000000000000e-01 2 0 0 -196 0 -P 395 111 1.0969872995552975e-01 -2.7592125031730930e-01 1.9284939585462296e-01 3.7891534359539542e-01 1.3497999999999999e-01 2 0 0 -197 0 -V -123 0 0 0 0 0 0 2 0 -P 396 211 1.2768453337087937e-01 -7.3004776309065877e-01 1.5341155177660637e-01 7.6960247243256708e-01 1.3957000000000000e-01 1 0 0 0 0 -P 397 111 7.4745645835255581e-01 -1.8452765224834686e-01 -3.5285787768360583e-01 8.5759541382904525e-01 1.3497999999999999e-01 2 0 0 -198 0 -V -124 0 0 0 0 0 0 2 0 -P 398 -211 -5.1931286949743072e-01 -4.0616083780816176e-01 7.4895484048546535e-01 1.0075046504018192e+00 1.3957000000000000e-01 1 0 0 0 0 -P 399 211 1.3030258692077507e-01 1.1737552180221024e-01 1.4023573824788065e-02 2.2457119761760758e-01 1.3957000000000000e-01 1 0 0 0 0 -V -125 0 0 0 0 0 0 3 0 -P 400 -211 4.3941879075108720e-01 -2.1455387542550161e-01 -1.6625524305449231e+00 1.7385863821898757e+00 1.3957000000000000e-01 1 0 0 0 0 -P 401 211 7.2245244435792022e-01 -5.5562326516907601e-01 -3.3678421544139758e+00 3.4917753806772347e+00 1.3957000000000000e-01 1 0 0 0 0 -P 402 221 1.6929001772174577e+00 -6.2763907466060598e-01 -6.2654951393025753e+00 6.5433915258975537e+00 5.4744999999999999e-01 2 0 0 -199 0 -V -126 0 0 0 0 0 0 2 0 -P 403 -211 5.4351932812512205e-01 4.2529626811621611e-02 -8.8825094786447778e-01 1.0515186924084912e+00 1.3957000000000000e-01 1 0 0 0 0 -P 404 111 -5.8526099968283993e-02 -2.8429634583446145e-01 -3.7477092780150040e-01 4.9287175345877016e-01 1.3497999999999999e-01 2 0 0 -200 0 -V -127 0 0 0 0 0 0 3 0 -P 405 211 -1.7994431618017598e-01 -1.4981023610554228e-01 1.8335551296569244e-01 3.2851498109288968e-01 1.3957000000000000e-01 1 0 0 0 0 -P 406 -211 -3.4015018251631030e-01 1.0007639479731749e-01 5.8171857101285707e-01 6.9540902512316316e-01 1.3957000000000000e-01 1 0 0 0 0 -P 407 111 2.2104562458507233e-02 -3.0138619608482096e-02 6.8918524799908965e-01 7.0327295876704488e-01 1.3497999999999999e-01 2 0 0 -201 0 -V -128 0 -9.5716033249145031e-06 2.5588689164333307e-05 -5.6613145337201016e-05 6.4831666416758084e-05 0 2 0 -P 408 22 -8.8748848813062955e-02 2.1752980276142420e-01 -4.8819357581726175e-01 5.4178274310309327e-01 0 1 0 0 0 0 -P 409 22 7.3136079243070681e-03 1.7887105092202264e-04 6.5286998810985524e-03 9.8053443519745542e-03 0 1 0 0 0 0 -V -129 0 0 0 0 0 0 2 0 -P 410 -211 -1.3210591454662315e-01 -4.1453641988988016e-02 1.7499835301972946e+00 1.7609919130859564e+00 1.3957000000000000e-01 1 0 0 0 0 -P 411 111 -5.9981210232161325e-02 1.0568271312618416e+00 8.3436496620987999e+00 8.4116104650175920e+00 1.3497999999999999e-01 2 0 0 -202 0 -V -130 0 0 0 0 0 0 2 0 -P 412 -211 2.1039382235683586e-02 1.7495114851534666e-01 2.9952412067790757e+00 3.0036644672231736e+00 1.3957000000000000e-01 1 0 0 0 0 -P 413 211 -4.2564457750844004e-01 -3.6237405135327300e-01 1.1465562013267260e+01 1.1480029630816887e+01 1.3957000000000000e-01 1 0 0 0 0 -V -131 0 0 0 0 0 0 2 0 -P 414 311 -7.8781697561949271e-01 5.4422089375246685e-01 9.1458600181790075e+00 9.2093030609974118e+00 4.9767000000000000e-01 2 0 0 -203 0 -P 415 211 -1.0295964159075386e+00 3.1096384658587001e-01 6.4911205497073698e+00 6.5811012049098920e+00 1.3957000000000000e-01 1 0 0 0 0 -V -132 0 0 0 0 0 0 2 0 -P 416 -311 -7.2639469362242060e-01 3.6391099384214726e-01 1.1382133321844409e+01 1.1421940064958441e+01 4.9767000000000000e-01 2 0 0 -204 0 -P 417 111 1.1338504577602361e-01 8.4838802122491092e-02 4.4320364364653537e+00 4.4363521462467022e+00 1.3497999999999999e-01 2 0 0 -205 0 -V -133 0 -3.6644226869673425e+01 1.4039955316751673e+01 3.2242699278545501e+02 3.3749134797523197e+02 0 2 0 -P 418 -2212 -4.4069160658852696e-01 7.0169749752342234e-02 3.4521641169690143e+00 3.6051242099664664e+00 9.3827000000000005e-01 1 0 0 0 0 -P 419 211 -5.3458486904178924e-03 1.0072609051156285e-01 4.7245178192138493e-01 5.0285663418976212e-01 1.3957000000000000e-01 1 0 0 0 0 -V -134 0 0 0 0 0 0 2 0 -P 420 -321 8.2738509392200044e-01 -4.4400280839202599e-01 -1.3379709157489843e+01 1.3421697459208426e+01 4.9359999999999998e-01 1 0 0 0 0 -P 421 211 1.6711326947641161e-01 -1.9094728388891710e-01 -1.2625904583366416e+00 1.2953772270818957e+00 1.3957000000000000e-01 1 0 0 0 0 -V -135 0 0 0 0 0 0 2 0 -P 422 -211 -4.5648702994576327e-03 8.5062884111795842e-02 -2.3933131666525642e+00 2.3988922924689202e+00 1.3957000000000000e-01 1 0 0 0 0 -P 423 111 7.0217973892037344e-01 -2.8698062984842038e-01 -7.3498259370883083e+00 7.3900998080915326e+00 1.3497999999999999e-01 2 0 0 -206 0 -V -136 0 0 0 0 0 0 2 0 -P 424 211 4.6755588266707993e-01 6.7144388467335656e-02 -6.1051702587828593e+00 6.1250061670128959e+00 1.3957000000000000e-01 1 0 0 0 0 -P 425 -211 -9.8483352004072017e-02 -2.1413651713213966e-01 -2.3969506914096916e+00 2.4125517239099432e+00 1.3957000000000000e-01 1 0 0 0 0 -V -137 0 0 0 0 0 0 3 0 -P 426 111 -1.4763122465585482e-01 1.5578289972556411e-01 -6.3575580169438950e-01 6.8444746338076856e-01 1.3497999999999999e-01 2 0 0 -207 0 -P 427 111 -5.9749928543227060e-01 4.0523346497645923e-01 -1.0521574728239369e+00 1.2831502270771551e+00 1.3497999999999999e-01 2 0 0 -208 0 -P 428 111 -3.7075092612150112e-01 1.6389697387756819e-01 -7.6281205611413760e-01 8.7431132934398903e-01 1.3497999999999999e-01 2 0 0 -209 0 -V -138 0 0 0 0 0 0 2 0 -P 429 -211 1.4873964520465802e-01 2.9361212237253576e-01 -5.2603507832528784e-01 6.3602220793648723e-01 1.3957000000000000e-01 1 0 0 0 0 -P 430 111 -3.2472936796134794e-01 4.1437910527456240e-02 -1.2473036619170828e+00 1.2965925683410431e+00 1.3497999999999999e-01 2 0 0 -210 0 -V -139 0 0 0 0 0 0 2 0 -P 431 321 -1.3937482792474679e-01 4.2593421262169195e-01 -1.9171899663819201e+00 2.0298038386347144e+00 4.9359999999999998e-01 1 0 0 0 0 -P 432 111 -5.5302161674478068e-01 2.7557884791839724e-02 -1.6155048992407390e+00 1.7130872790001219e+00 1.3497999999999999e-01 2 0 0 -211 0 -V -140 0 1.8598834508787614e-05 -2.8282549299325688e-05 1.3720995802205736e-04 1.4332481861146809e-04 0 2 0 -P 433 22 7.3486303836907945e-03 -7.2423525982247119e-02 1.1094367272080649e-01 1.3269388833325652e-01 0 1 0 0 0 0 -P 434 22 9.7839239745626749e-02 -8.7531718590624669e-02 6.6506319147565862e-01 6.7789628059845486e-01 0 1 0 0 0 0 -V -141 0 7.9626809661280000e-06 -2.3200113145596084e-06 1.3507474476220213e-04 1.3560294199833913e-04 0 2 0 -P 435 22 8.0733491049569533e-02 4.1269360133104692e-02 1.3628764571598302e+00 1.3658891954120498e+00 0 1 0 0 0 0 -P 436 22 4.4054345042207586e-02 -7.7627615962248125e-02 7.5395896312458921e-01 7.5922391305397241e-01 0 1 0 0 0 0 -V -142 0 0 0 0 0 0 2 0 -P 437 -2212 -3.3636249934798157e-01 6.3185487895276859e-01 9.1363404725172559e-01 1.4924671132797558e+00 9.3827000000000005e-01 1 0 0 0 0 -P 438 -211 -2.1550620238062704e-01 4.0104914462364860e-01 -5.9206301760771352e-02 4.7986301246925406e-01 1.3957000000000000e-01 1 0 0 0 0 -V -143 0 0 0 0 0 0 2 0 -P 439 2212 -3.1316133468193180e-01 6.3226783732812875e-01 1.0670883973236167e+00 1.5864617487547701e+00 9.3827000000000005e-01 1 0 0 0 0 -P 440 211 -1.3656134001203910e-01 8.4180305408821043e-02 7.6571336719638172e-01 7.9468992003663097e-01 1.3957000000000000e-01 1 0 0 0 0 -V -144 0 0 0 0 0 0 2 0 -P 441 -211 1.0685444223770994e-01 -1.6539225620957393e-01 3.8242266590415475e-01 4.5221604409537064e-01 1.3957000000000000e-01 1 0 0 0 0 -P 442 111 -6.1402112512214591e-01 1.1088767981697505e-01 9.1946862391992579e-01 1.1193570343749397e+00 1.3497999999999999e-01 2 0 0 -212 0 -V -145 0 0 0 0 0 0 2 0 -P 443 211 9.7606484216440248e-02 3.9484400593725694e-01 2.3399496935609863e+00 2.3791328605359197e+00 1.3957000000000000e-01 1 0 0 0 0 -P 444 111 1.3390057130873545e-01 -4.0022089132772154e-01 8.8662696215810521e-01 9.9117763053736829e-01 1.3497999999999999e-01 2 0 0 -213 0 -V -146 0 0 0 0 0 0 2 0 -P 445 22 4.4521386228282923e-02 6.9294890896827888e-02 2.7189184044015768e-01 2.8409348572965798e-01 0 1 0 0 0 0 -P 446 22 -1.2530381878315813e-01 -6.1237208583624381e-01 7.7611359023390527e+00 7.7862655434482386e+00 0 1 0 0 0 0 -V -147 0 5.6913008971348268e-04 2.6971275534858177e-04 2.9382166688662489e-02 2.9389139415471353e-02 0 2 0 -P 447 22 4.2233155950894929e-01 2.7013379931995773e-01 2.3306869194700617e+01 2.3312260462567259e+01 0 1 0 0 0 0 -P 448 22 2.4777890833036781e-01 4.7433913116153387e-02 1.1288556037138038e+01 1.1291374662419651e+01 0 1 0 0 0 0 -V -148 0 7.2343549030833013e-05 -2.6983122416924707e-05 1.2103140682944620e-03 1.2137033258959099e-03 0 2 0 -P 449 22 -8.2133726674077593e-03 8.9676039303206116e-03 6.5846311157447568e-01 6.5857539182326363e-01 0 1 0 0 0 0 -P 450 22 2.1389614826006173e-01 -8.5684375324878909e-02 2.7826281846175691e+00 2.7921520353024070e+00 0 1 0 0 0 0 -V -149 0 -7.5113701994512593e-05 3.5527295882971153e-05 1.4000468538991121e-03 1.4027906502289988e-03 0 2 0 -P 451 22 -3.5454234029793569e-01 1.4220281432805057e-01 6.5246306076120621e+00 6.5358034301266219e+00 0 1 0 0 0 0 -P 452 22 -7.0619670035219672e-03 2.8828873325877486e-02 2.1532441192296625e-01 2.1736047866429073e-01 0 1 0 0 0 0 -V -150 0 -5.0929560966308059e-06 -6.7782820668099025e-05 -3.1669389769068959e-03 3.1676977988036627e-03 0 2 0 -P 453 22 -5.5002501226308863e-02 -1.3676652957384980e-01 -8.4032580701003532e+00 8.4045509428796699e+00 0 1 0 0 0 0 -P 454 22 4.6521748008517740e-03 -5.3335256863215397e-01 -2.2905947866752722e+01 2.2912156910242874e+01 0 1 0 0 0 0 -V -151 0 0 0 0 0 0 1 0 -P 455 310 5.3036395409351500e-01 -1.2314697068839459e-01 -3.4041141413635536e+01 3.4049132665491257e+01 4.9767000000000000e-01 2 0 0 -214 0 -V -152 0 -4.4479064681634288e-05 1.1936817293250047e-04 3.6557060285476724e-03 3.6579362557860790e-03 0 2 0 -P 456 22 -3.6430534851601371e-01 8.0739446461353415e-01 2.4463146973768701e+01 2.4479178173881873e+01 0 1 0 0 0 0 -P 457 22 -2.9100960940826009e-01 9.5126997185016959e-01 2.9396772505842296e+01 2.9413599489221941e+01 0 1 0 0 0 0 -V -153 0 -3.2688397628246890e-06 3.1738916671182650e-06 2.3160543367457004e-04 2.3165309436201878e-04 0 2 0 -P 458 22 -3.6863888541709272e-01 3.2058557735849108e-01 2.2617594353889025e+01 2.2622869935030884e+01 0 1 0 0 0 0 -P 459 22 -1.5354506319408460e-02 5.2254180686976508e-02 4.5892932496961736e+00 4.5896164101121171e+00 0 1 0 0 0 0 -V -154 0 -4.2854531593272900e-05 6.1890366858268527e-05 2.8373810259926832e-03 2.8384144995640204e-03 0 2 0 -P 460 22 -2.8096998668766182e-01 3.1168131470771288e-01 1.4142709945501387e+01 1.4148934022672554e+01 0 1 0 0 0 0 -P 461 22 -1.2923082607457784e-01 2.8072928560789373e-01 1.3016518255258111e+01 1.3020186520464037e+01 0 1 0 0 0 0 -V -155 0 4.8419069681422279e-05 2.6022741558005558e-04 2.3948279049090002e-02 2.3949943892512968e-02 0 2 0 -P 462 22 -1.3484395339657791e-02 2.2805801648532943e-02 6.3682372456238570e+00 6.3682923574579586e+00 0 1 0 0 0 0 -P 463 22 7.9910814805674857e-02 3.3420179014562956e-01 2.6486554060175386e+01 2.6488782957271795e+01 0 1 0 0 0 0 -V -156 0 6.4458166593028880e-05 -2.1206028966113369e-05 4.2733005526343507e-04 4.3362718820302870e-04 0 2 0 -P 464 22 1.3203767002721134e-01 -4.0120215621858198e-02 4.9619347728990221e-01 5.1502577111519743e-01 0 1 0 0 0 0 -P 465 22 1.7235440236200694e-01 -6.0021433533256625e-02 1.5217956773985872e+00 1.5327004587478847e+00 0 1 0 0 0 0 -V -157 0 1.3825358825667505e-05 -2.6586918860885477e-05 3.7356803793201702e-04 3.7477872265037859e-04 0 2 0 -P 466 22 2.0055595174990928e-01 -3.1804893931032557e-01 4.0786477119442743e+00 4.0959425015162259e+00 0 1 0 0 0 0 -P 467 22 4.5893050301397365e-01 -9.5017947224512112e-01 1.3741002689570054e+01 1.3781459035633496e+01 0 1 0 0 0 0 -V -158 0 -3.6148472811710377e-05 1.5352758396390464e-06 5.2433582314645737e-04 5.2587029576442771e-04 0 2 0 -P 468 22 -1.1858415852348296e-01 2.7338446840418432e-02 9.6412493381788344e-01 9.7177491289789286e-01 0 1 0 0 0 0 -P 469 22 -1.6198332741124952e-01 -1.5422356089156571e-02 3.1055237191692759e+00 3.1097835966107890e+00 0 1 0 0 0 0 -V -159 0 -4.4031131225084997e-05 7.8418723750972992e-05 2.4110118934396308e-04 2.5779396306412045e-04 0 2 0 -P 470 22 -6.4845192110584787e-02 1.0986152109814992e-01 2.2013532446554113e-01 2.5442879914704414e-01 0 1 0 0 0 0 -P 471 22 -3.1902888396194151e-01 5.7381192287508798e-01 1.8818432921245529e+00 1.9930814654072178e+00 0 1 0 0 0 0 -V -160 0 -2.1425183974074652e-06 2.7878514019335631e-06 2.1359544375097700e-05 2.1647542010680192e-05 0 2 0 -P 472 22 -1.0106649381417249e-01 1.1138815142136117e-01 7.6457489296899328e-01 7.7922815876192886e-01 0 1 0 0 0 0 -P 473 22 -1.7879141260115867e+00 2.3465591294882859e+00 1.8067359255970079e+01 1.8306623040704810e+01 0 1 0 0 0 0 -V -161 0 0 0 0 0 0 1 0 -P 474 130 -1.4318375653716335e+00 -3.5863038245912704e+00 -2.3209274506000757e+00 4.5327821032712690e+00 4.9767000000000000e-01 1 0 0 0 0 -V -162 0 -6.6832389808381253e-07 -2.1252586175838513e-06 -4.4691882492897211e-07 2.3205379709460523e-06 0 2 0 -P 475 22 -8.9978113978881197e-02 -4.2173754181458945e-01 -1.3491536512632196e-01 4.5184153297165791e-01 0 1 0 0 0 0 -P 476 22 -1.0157807603458334e-01 -1.8740788115304952e-01 6.8186928478867403e-03 2.1327520723543308e-01 0 1 0 0 0 0 -V -163 0 0 0 0 0 0 1 0 -P 477 310 -2.9659176075774984e-01 -4.6221487895696203e-02 -1.5427574353175526e+00 1.6485991118583883e+00 4.9767000000000000e-01 2 0 0 -215 0 -V -164 0 4.3951762908156004e-06 5.6519226407509845e-06 -2.2852952185035586e-04 2.2864708816162558e-04 0 2 0 -P 478 22 1.2883066985740826e-01 8.7348139542502687e-02 -3.9328723885587951e+00 3.9359512527044345e+00 0 1 0 0 0 0 -P 479 22 2.4737772584635406e-01 3.9643239817152115e-01 -1.5628282636309663e+01 1.5635266948342874e+01 0 1 0 0 0 0 -V -165 0 0 0 0 0 0 1 0 -P 480 130 8.0055295557585249e-01 1.1955698343636345e+00 -1.3612825986589098e+02 1.3613677343689312e+02 4.9767000000000000e-01 1 0 0 0 0 -V -166 0 4.3515025435173503e-07 -3.0950593427809659e-05 -1.2973154490519804e-05 3.4193622002278503e-05 0 2 0 -P 481 22 -2.4004418795421954e-02 -6.1969176712752407e-02 5.3372209402327469e-03 6.6669910090888906e-02 0 1 0 0 0 0 -P 482 22 3.2985457263139006e-02 -5.7681815569483774e-01 -2.7308933268050717e-01 6.3905008313428557e-01 0 1 0 0 0 0 -V -167 0 -1.3223933000948637e-05 -6.6595414819650182e-05 -1.8865608512255433e-05 7.3501681277001948e-05 0 2 0 -P 483 22 -3.7755194341771034e-02 -4.2694828777757612e-02 -5.4028993871350510e-02 7.8533020334744422e-02 0 1 0 0 0 0 -P 484 22 -4.7654369480567102e-02 -3.8742572097895756e-01 -6.7818522609498041e-02 3.9619310975279542e-01 0 1 0 0 0 0 -V -168 0 -3.2646319843143344e-06 3.0632601190069616e-06 -4.8334168988367450e-05 4.8992552461397858e-05 0 2 0 -P 485 22 -9.1214787830148150e-03 3.2607644996470279e-02 -8.2554522871056302e-01 8.2623930222071917e-01 0 1 0 0 0 0 -P 486 22 -5.7282665603845380e-02 2.9700501285987765e-02 -1.5759441819103331e-01 1.7029217304471525e-01 0 1 0 0 0 0 -V -169 0 5.0024187811615822e-05 1.5817151124905720e-04 -1.3497703728087306e-03 1.3680935638846403e-03 0 2 0 -P 487 22 -3.6296416944126709e-03 5.0920677562811878e-02 -8.6736175513884239e-01 8.6886276475621793e-01 0 1 0 0 0 0 -P 488 22 4.8867158637845319e-02 9.2115856024567719e-02 -3.5325296707559606e-01 3.6832185500209919e-01 0 1 0 0 0 0 -V -170 0 0 0 0 0 0 1 0 -P 489 130 2.9288036009376067e-01 1.2928728715900386e+00 -1.1628140700302700e+01 1.1714035630061840e+01 4.9767000000000000e-01 1 0 0 0 0 -V -171 0 -6.0930955149452699e-06 2.9697104970938514e-05 -2.4111678378370367e-04 2.4303743351679105e-04 0 2 0 -P 490 22 -9.4973743741273875e-02 6.4498168710204640e-01 -4.7230425563942617e+00 4.7678247008681511e+00 0 1 0 0 0 0 -P 491 22 -1.5474800128245778e-01 5.7213576285513090e-01 -5.1589794557811262e+00 5.1929139507804729e+00 0 1 0 0 0 0 -V -172 0 -1.1660551399751801e-05 1.9256296796349287e-05 -6.7620205483465163e-06 2.3802198800847105e-05 0 2 0 -P 492 22 -3.7027549960274636e-01 6.2212464289035718e-01 -2.5897423070960202e-01 7.6890224935888085e-01 0 1 0 0 0 0 -P 493 22 -4.9683819629574119e-02 7.1398417580221585e-02 1.5437415960085871e-02 8.8343249756098599e-02 0 1 0 0 0 0 -V -173 0 3.5746214235745734e-05 -9.2255200399066187e-06 -1.3563013280753561e-05 4.1145824932297914e-05 0 2 0 -P 494 22 3.2749523814777576e-01 -4.6886764491434571e-02 -7.1889393460914761e-02 3.3855514260770275e-01 0 1 0 0 0 0 -P 495 22 7.1660498494050137e-02 -5.6128878595896443e-02 -7.9560338291332564e-02 1.2089468758336715e-01 0 1 0 0 0 0 -V -174 0 1.1296287249582715e-05 5.8978061805748885e-06 4.9262804651243690e-05 5.0924397210535035e-05 0 2 0 -P 496 22 4.4736495198225906e-01 2.4974300382315295e-01 1.7169319940927230e+00 1.7917484311587706e+00 0 1 0 0 0 0 -P 497 22 3.0750215958027394e-01 1.4437409126494161e-01 1.5750231618747674e+00 1.6112415761818897e+00 0 1 0 0 0 0 -V -175 0 1.3475981409980000e-04 -4.1605118725126302e-04 6.3692988934369579e-03 6.3846592284279354e-03 0 2 0 -P 498 22 1.2364083130382091e-01 -2.9386391435205311e-01 5.5204694179527154e+00 5.5296677702982304e+00 0 1 0 0 0 0 -P 499 22 1.4321552040215901e-01 -5.3001598407664563e-01 7.0922510505452010e+00 7.1134697997967420e+00 0 1 0 0 0 0 -V -176 0 4.7324747145545989e-05 1.9479376242148272e-06 2.3089887975729631e-04 2.3950742171524708e-04 0 2 0 -P 500 22 1.4135983992053097e-01 -4.0296581708771914e-02 6.3148368395046228e-01 6.4836568534694761e-01 0 1 0 0 0 0 -P 501 22 8.9503713642537751e-03 4.6483512089294167e-02 1.0188440558207200e-01 1.1234437299894350e-01 0 1 0 0 0 0 -V -177 0 -9.0223456025112655e-07 -6.7037449449237448e-06 6.4286516403409821e-05 6.4689761422605756e-05 0 2 0 -P 502 22 2.4050370315804339e-02 -2.6635670283075513e-01 2.2348889868834592e+00 2.2508338670697521e+00 0 1 0 0 0 0 -P 503 22 -7.2745052887069936e-02 -9.5452461341506492e-02 1.2347314951840711e+00 1.2405502328786151e+00 0 1 0 0 0 0 -V -178 0 -1.1141606101247371e-05 3.3900741233981917e-06 2.7231501048168288e-05 3.0249992775056765e-05 0 2 0 -P 504 22 -1.5484032034025672e-01 3.3070965672253198e-02 2.0512268590893062e-01 2.5912261547009452e-01 0 1 0 0 0 0 -P 505 22 -8.9511477232786629e-02 4.1278342536144701e-02 3.9210415654668013e-01 4.0430418709198446e-01 0 1 0 0 0 0 -V -179 0 -5.7452969269882372e-05 1.0655611802714043e-04 2.3621002466825029e-04 2.6627862107816958e-04 0 2 0 -P 506 22 -1.5904748085006137e-01 4.2641811118253042e-01 9.2542971764623405e-01 1.0312849601405114e+00 0 1 0 0 0 0 -P 507 22 -2.0488139654333862e-01 2.4854871656929914e-01 5.7081408313582516e-01 6.5542472387299155e-01 0 1 0 0 0 0 -V -180 0 1.2541142567955775e-05 2.1336951076054253e-05 6.7047166629993952e-05 7.7186942912155069e-05 0 2 0 -P 508 22 -3.7656617144148925e-02 1.4185309883022947e-02 3.3350767109029379e-02 5.2263921570995034e-02 0 1 0 0 0 0 -P 509 22 9.5720803038463378e-02 8.4602554698270271e-02 2.7707064192895242e-01 3.0510359718417601e-01 0 1 0 0 0 0 -V -181 0 1.2584156716671960e-05 2.9848520962308407e-05 2.8661370545072881e-02 2.8661440450187415e-02 0 2 0 -P 510 22 -4.0194037712829624e-02 4.7510012834891861e-02 1.6029784814713764e+01 1.6029905613197329e+01 0 1 0 0 0 0 -P 511 22 7.1426379875077009e-02 2.6570375761728566e-02 5.5104241235417319e+01 5.5104293932902152e+01 0 1 0 0 0 0 -V -182 0 0 0 0 0 0 1 0 -P 512 130 1.8498251272975502e-01 2.1534491855260202e-01 5.4113827121414495e+01 5.4116860155770283e+01 4.9767000000000000e-01 1 0 0 0 0 -V -183 0 -2.2239658429523491e-05 7.9787361538852465e-06 2.4815441155492533e-03 2.4817083833750635e-03 0 2 0 -P 513 22 -2.6447337141224440e-02 -3.9309724692202258e-02 3.8222339420741900e+00 3.8225275700825549e+00 0 1 0 0 0 0 -P 514 22 -1.6079201520980721e-01 1.0648402032122213e-01 1.7070295252939683e+01 1.7071384622849845e+01 0 1 0 0 0 0 -V -184 0 3.4803808964272598e-06 -2.1082232229174461e-05 5.3342632466181025e-08 2.3123268650157156e-05 0 2 0 -P 515 22 7.1813325473446363e-02 -2.2554379405664721e-01 5.2069084583338858e-02 2.4235995197715629e-01 0 1 0 0 0 0 -P 516 22 -1.8658185022900918e-02 -9.6440795705683577e-02 -5.1254393546604243e-02 1.1079696657636637e-01 0 1 0 0 0 0 -V -185 0 -5.3747799410516562e-05 -4.4440032307684720e-05 -1.5986731409189337e-04 1.7630768596296016e-04 0 2 0 -P 517 22 -1.9710479787187180e-01 -2.3282431232600628e-01 -6.5389094601821218e-01 7.2154752514216858e-01 0 1 0 0 0 0 -P 518 22 -8.4630153565993557e-02 -1.2123114591746497e-04 -1.8410075719873392e-01 2.0262123874545424e-01 0 1 0 0 0 0 -V -186 0 7.6865554396668605e-05 4.3142338883686831e-04 -6.8937030148838192e-03 6.9079097940412853e-03 0 2 0 -P 519 22 9.1906525835010915e-04 -1.4789438215505925e-03 -2.5924226335474737e-01 2.5924811101542949e-01 0 1 0 0 0 0 -P 520 22 1.6227427277457440e-01 9.1743438683356748e-01 -1.4376785736923154e+01 1.4406942316784155e+01 0 1 0 0 0 0 -V -187 0 9.6604711234698149e-06 -4.7395522046942198e-08 -7.1709104054133583e-05 7.2905658342372988e-05 0 2 0 -P 521 22 8.5947444322755293e-02 -6.6719307979624706e-02 -6.4429326409960863e-01 6.5341582427043943e-01 0 1 0 0 0 0 -P 522 22 6.0103580822178510e-02 6.6002762741430479e-02 -4.3983483125659523e-01 4.4880227707049974e-01 0 1 0 0 0 0 -V -188 0 -4.4469111055583206e-06 1.3188593151499278e-05 -3.2261949631913662e-04 3.2302176841489226e-04 0 2 0 -P 523 22 -3.1712032262728999e-02 -2.0883585220431546e-03 -3.0080324114774448e-01 3.0247744397977422e-01 0 1 0 0 0 0 -P 524 22 -4.2167611336134614e-02 2.2119967837399371e-01 -5.0591000356033122e+00 5.0641090603777545e+00 0 1 0 0 0 0 -V -189 0 -4.3236035757693638e-05 5.8582752132276060e-05 -5.7308757738288424e-04 5.7847833554835050e-04 0 2 0 -P 525 22 -1.9920557528452923e-01 2.2951795799458932e-01 -1.9774628498852040e+00 2.0006800536174132e+00 0 1 0 0 0 0 -P 526 22 5.3730450744935102e-03 3.3115812041689355e-02 -5.9176009596032075e-01 5.9271033211132973e-01 0 1 0 0 0 0 -V -190 0 -4.6563360052264990e-06 -2.1757073182779297e-05 1.1881217619907731e-06 2.6347063784305840e-05 0 2 0 -P 527 22 2.6481780274558765e-02 3.2840805847918842e-03 -9.1585090480877599e-03 2.8212553230456044e-02 0 1 0 0 0 0 -P 528 22 -7.1181574739910172e-02 -2.1214716485238358e-01 2.0564214843628897e-02 2.2471342431971594e-01 0 1 0 0 0 0 -V -191 0 -6.7958182803273389e-06 -2.2789598315534417e-05 3.3178587244766811e-05 6.9711989667256509e-05 0 2 0 -P 529 22 4.4007402269560576e-02 1.9050423208921346e-02 4.4254119127109588e-02 6.5253330479526792e-02 0 1 0 0 0 0 -P 530 22 -6.0239884439087552e-02 -7.3485626307050064e-02 3.4996208595725116e-02 1.0126063187166835e-01 0 1 0 0 0 0 -V -192 0 -9.2399879437066819e+00 -3.0387131447697538e+01 -7.5942819906423047e+00 5.6183581317030246e+01 0 2 0 -P 531 -211 7.2339661850637116e-02 -3.2521430738104773e-01 2.9845760368060501e-02 3.6244713644053916e-01 1.3957000000000000e-01 1 0 0 0 0 -P 532 211 -1.7292216029916171e-01 -5.5668170439967064e-03 -1.1251381807496415e-01 2.4914294517873958e-01 1.3957000000000000e-01 1 0 0 0 0 -V -193 0 -3.3735231507927859e-06 -2.4310362020575016e-05 1.7226629499045319e-05 3.2395411854205048e-05 0 2 0 -P 534 22 4.6605103750219246e-03 -4.7604324203406684e-02 -1.8116794935990260e-02 5.1147925652673905e-02 0 1 0 0 0 0 -P 533 22 -4.1799321747595368e-02 -2.2002625342251989e-01 2.0776320166063492e-01 3.0549023463604780e-01 0 1 0 0 0 0 -V -194 0 -1.7223995802044271e-06 -9.9525183324882429e-07 7.9935797423441558e-06 9.2576333951367783e-06 0 2 0 -P 535 22 1.0874576406073361e-03 -1.8699332423074717e-02 2.3331489504831751e-01 2.3406556314117663e-01 0 1 0 0 0 0 -P 536 22 -5.6116641951763281e-02 -1.3098107147460443e-02 2.2073098540934744e-02 6.1707856825420224e-02 0 1 0 0 0 0 -V -195 0 -1.0561297718282755e-04 1.7322491781130437e-04 5.9462272496750264e-04 6.2882871984594924e-04 0 2 0 -P 537 22 -2.1748912590842331e-01 4.0316638854421255e-01 1.5358537367294918e+00 1.6027137477934530e+00 0 1 0 0 0 0 -P 538 22 -3.2584382015507379e-01 4.8800065774682477e-01 1.5232221985470455e+00 1.6323371904239272e+00 0 1 0 0 0 0 -V -196 0 0 0 0 0 0 1 0 -P 539 310 5.7209538578317543e-01 -9.1601292232158002e-02 -1.3829998035577337e-01 7.7619987157909842e-01 4.9767000000000000e-01 2 0 0 -216 0 -V -197 0 2.4019926994931783e-07 -6.0416454152739986e-07 4.2226818955174602e-07 8.2968315987892530e-07 0 2 0 -P 540 22 6.6848277001447187e-02 -6.0958209970164400e-02 5.6178057143901434e-03 9.0643009889750908e-02 0 1 0 0 0 0 -P 541 22 4.2850452954082546e-02 -2.1496304034714489e-01 1.8723159014023277e-01 2.8827233370564426e-01 0 1 0 0 0 0 -V -198 0 6.5287521213597090e-06 -1.6117799071818023e-06 -3.0820813596859984e-06 7.4907746327396357e-06 0 2 0 -P 542 22 2.3363370799508734e-01 -5.5730263288117409e-03 -1.4570219730322215e-01 2.7539952511393773e-01 0 1 0 0 0 0 -P 543 22 5.1382275035746849e-01 -1.7895462591953512e-01 -2.0715568038038368e-01 5.8219588871510730e-01 0 1 0 0 0 0 -V -199 0 0 0 0 0 0 3 0 -P 544 211 7.2039523215605261e-01 -3.6736437975442332e-01 -2.9003951596164219e+00 3.0142491179150896e+00 1.3957000000000000e-01 1 0 0 0 0 -P 545 -211 2.0811046164856656e-01 -9.7076490529901388e-02 -9.3664893491201751e-01 9.7443564253007409e-01 1.3957000000000000e-01 1 0 0 0 0 -P 546 111 7.6439448341283889e-01 -1.6319820437628141e-01 -2.4284510447741372e+00 2.5547067654523916e+00 1.3497999999999999e-01 2 0 0 -217 0 -V -200 0 -1.6432909207964205e-05 -7.9824489275475590e-05 -1.0522786643367612e-04 1.3838811709899012e-04 0 2 0 -P 547 22 2.0913225215301631e-02 3.6758058149488726e-03 -2.1306516927539914e-02 3.0080595088506565e-02 0 1 0 0 0 0 -P 548 22 -7.9439325183585624e-02 -2.8797215164941031e-01 -3.5346441087396047e-01 4.6279115837026358e-01 0 1 0 0 0 0 -V -201 0 1.6164268726202693e-07 -2.2039284754121565e-07 5.0397629773053878e-06 5.1427813216031760e-06 0 2 0 -P 549 22 -5.6717912031914300e-02 -1.7745651231293166e-02 2.5677103342421997e-01 2.6355870937729325e-01 0 1 0 0 0 0 -P 550 22 7.8822474490421540e-02 -1.2392968377188934e-02 4.3241421457486973e-01 4.3971424938975157e-01 0 1 0 0 0 0 -V -202 0 -3.8148426826111342e-05 6.7214870004697462e-04 5.3066136439277271e-03 5.3498371418724423e-03 0 2 0 -P 551 22 -7.0179649086229604e-02 3.3943873319233780e-01 3.0226410969029458e+00 3.0424501700806421e+00 0 1 0 0 0 0 -P 552 22 1.0198438854068275e-02 7.1738839806950361e-01 5.3210085651958536e+00 5.3691602949369495e+00 0 1 0 0 0 0 -V -203 0 0 0 0 0 0 1 0 -P 553 130 -7.8781697561949271e-01 5.4422089375246685e-01 9.1458600181790075e+00 9.2093030609974118e+00 4.9767000000000000e-01 1 0 0 0 0 -V -204 0 0 0 0 0 0 1 0 -P 554 310 -7.2639469362242060e-01 3.6391099384214726e-01 1.1382133321844409e+01 1.1421940064958441e+01 4.9767000000000000e-01 2 0 0 -218 0 -V -205 0 1.1779236187810234e-05 8.8136515821122369e-06 4.6043112317678921e-04 4.6087946946870634e-04 0 2 0 -P 555 22 7.9864146623307694e-02 1.2156376086533430e-01 3.1649610887278126e+00 3.1683015517833417e+00 0 1 0 0 0 0 -P 556 22 3.3520899152715923e-02 -3.6724958742843213e-02 1.2670753477375407e+00 1.2680505944633595e+00 0 1 0 0 0 0 -V -206 0 3.9918137703655458e-05 -1.6314529835601096e-05 -4.1782943538884980e-04 4.2011896019205453e-04 0 2 0 -P 557 22 4.8444453326069842e-01 -1.7062202826696454e-01 -4.3743293539038568e+00 4.4043791479345922e+00 0 1 0 0 0 0 -P 558 22 2.1773520565967508e-01 -1.1635860158145582e-01 -2.9754965831844515e+00 2.9857206601569413e+00 0 1 0 0 0 0 -V -207 0 -9.8382711082984495e-05 1.0381505708631199e-04 -4.2367310508488541e-04 4.5612164498563096e-04 0 2 0 -P 559 22 -1.1820584450122643e-02 -1.6060206837071978e-02 -1.1815502929093931e-02 2.3178925123038745e-02 0 1 0 0 0 0 -P 560 22 -1.3581064020573216e-01 1.7184310656263610e-01 -6.2394029876529555e-01 6.6126853825772958e-01 0 1 0 0 0 0 -V -208 0 -4.3921776029805596e-05 2.9788443136967845e-05 -7.7343397718084210e-05 9.4323521818948618e-05 0 2 0 -P 561 22 -3.7219271349381805e-01 3.1341750210245684e-01 -6.3166726390592265e-01 7.9734652372254633e-01 0 1 0 0 0 0 -P 562 22 -2.2530657193845258e-01 9.1815962874002371e-02 -4.2049020891801436e-01 4.8580370335460860e-01 0 1 0 0 0 0 -V -209 0 -4.5476606945718249e-05 2.0103734705655713e-05 -9.3567140646843043e-05 1.0724373122600039e-04 0 2 0 -P 563 22 -2.9119152917936542e-01 1.1654730397796420e-01 -6.8492021847390561e-01 7.5332030797310356e-01 0 1 0 0 0 0 -P 564 22 -7.9559396942135666e-02 4.7349669899603999e-02 -7.7891837640231998e-02 1.2099102137088527e-01 0 1 0 0 0 0 -V -210 0 -3.1513825920006135e-05 4.0214012888618100e-06 -1.2104636768091706e-04 1.2582968009452371e-04 0 2 0 -P 565 22 -2.0821687003115755e-01 -3.5550488162903690e-03 -9.7529066000740405e-01 9.9727567644826054e-01 0 1 0 0 0 0 -P 566 22 -1.1651249793019035e-01 4.4992959343746600e-02 -2.7201300190967870e-01 2.9931689189278221e-01 0 1 0 0 0 0 -V -211 0 -7.6322960167519920e-05 3.8032859468481829e-06 -2.2295713646956259e-04 2.3642455954656021e-04 0 2 0 -P 567 22 -2.3596479193032335e-01 7.8693352480712103e-02 -7.1353458927233204e-01 7.5564782593706314e-01 0 1 0 0 0 0 -P 568 22 -3.1705682481445735e-01 -5.1135467688872380e-02 -9.0197030996840699e-01 9.5743945306305900e-01 0 1 0 0 0 0 -V -212 0 -1.8139484355414673e-04 3.2758568898555692e-05 2.7163050319436966e-04 3.3068177270168745e-04 0 2 0 -P 569 22 -2.5438740051631026e-01 4.5020203517792519e-02 5.0087060048465426e-01 5.6356998384946588e-01 0 1 0 0 0 0 -P 570 22 -3.5963372460583565e-01 6.5867476299182534e-02 4.1859802343527158e-01 5.5578705052547384e-01 0 1 0 0 0 0 -V -213 0 2.4428922970138252e-05 -7.3016606499326774e-05 1.6175690327614769e-04 1.8083120743594527e-04 0 2 0 -P 571 22 2.9367307545180181e-02 -1.9052347198993341e-01 5.3467463287475814e-01 5.6836484336323057e-01 0 1 0 0 0 0 -P 572 22 1.0453326376355529e-01 -2.0969741933778815e-01 3.5195232928334702e-01 4.2281278717413778e-01 0 1 0 0 0 0 -V -214 0 4.9579155221870880e-01 -1.1511948969643888e-01 -3.1822129333071317e+01 3.1829599665719567e+01 0 2 0 -P 573 211 3.7577127580332814e-01 -7.2432832855482146e-02 -2.9616994036592914e+01 2.9619795173422023e+01 1.3957000000000000e-01 1 0 0 0 0 -P 574 -211 1.5459267829018677e-01 -5.0714137832912419e-02 -4.4241473770426190e+00 4.4293374920692319e+00 1.3957000000000000e-01 1 0 0 0 0 -V -215 0 -4.7708493299121385e-01 -7.4349925969399086e-02 -2.4816142086001607e+00 2.6518666425556883e+00 0 2 0 -P 575 211 -1.8710039471863932e-01 -7.5516186697918888e-02 -1.3934778944835580e+00 1.4149097778556750e+00 1.3957000000000000e-01 1 0 0 0 0 -P 576 -211 -1.0949136603911050e-01 2.9294698802222685e-02 -1.4927954083399445e-01 2.3368933400271319e-01 1.3957000000000000e-01 1 0 0 0 0 -V -216 0 1.0046434401596073e+01 -1.6085890506737788e+00 -2.4286538834502935e+00 1.3630665945105468e+01 0 2 0 -P 577 211 4.2277088197502372e-01 1.2823578574380656e-01 -9.4354533417582487e-02 4.7282364393896442e-01 1.3957000000000000e-01 1 0 0 0 0 -P 578 -211 1.4932450380815165e-01 -2.1983707797596455e-01 -4.3945446938190864e-02 3.0337622764013394e-01 1.3957000000000000e-01 1 0 0 0 0 -V -217 0 2.4449966258954613e-05 -5.2200672258999185e-06 -7.7676575897242336e-05 8.1714998697994160e-05 0 2 0 -P 579 22 7.4264847022229474e-01 -1.4651608537616675e-01 -2.3931683946888840e+00 2.5100296171430410e+00 0 1 0 0 0 0 -P 580 22 2.1746013190544179e-02 -1.6682119000114660e-02 -3.5282650085253067e-02 4.4677148309350663e-02 0 1 0 0 0 0 -V -218 0 -3.3167578833116316e+01 1.6616374930143870e+01 5.1971443012433133e+02 5.2153202777739250e+02 0 2 0 -P 581 211 -4.1414101287442306e-01 3.9477834598429262e-01 8.2622830335795356e+00 8.2832459478684441e+00 1.3957000000000000e-01 1 0 0 0 0 -P 582 -211 -3.1225368074799753e-01 -3.0867352142145359e-02 3.1198502882648715e+00 3.1386941170899947e+00 1.3957000000000000e-01 1 0 0 0 0 -BlockType GenEvent -E 6 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 168 0 0 -V -1 0 0 0 0 0 1 2 0 -P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -1 0 -P 3 2 5.1553292069003653e-01 3.8485835711180655e-01 1.7290951843317296e+03 1.7290953040157517e+03 0 3 0 0 -3 0 -P 34 2101 -5.1553292069003653e-01 -3.8485835711180655e-01 4.2219673894488587e+03 4.2219674782123802e+03 5.7933000000000001e-01 2 0 0 -13 0 -V -2 0 0 0 0 0 1 3 0 -P 2 2212 0 0 -6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -2 0 -P 4 21 -4.9797130516589477e-01 1.0933883123411841e+00 -1.3097958796984543e+02 1.3098509815308313e+02 0 3 0 0 -4 0 -P 19 2103 2.9142878896144259e-01 -6.5062234924971918e-01 -6.7718730985476304e+03 6.7718731800014712e+03 7.7132999999999996e-01 2 0 0 -9 0 -P 47 2 2.0654251620445219e-01 -4.4276596309146488e-01 -5.7621689243983575e+01 5.7624705403492385e+01 3.3000000000000002e-01 2 0 0 -13 0 -V -3 0 0 0 0 0 0 4 0 -P 5 2 -3.1543729466487069e+00 -4.6848142715162355e+00 8.5430129997171412e+02 8.5431996856377293e+02 0 3 0 0 -5 0 -P 35 21 -5.5465777356364798e-01 9.8068482118457034e-01 7.0650666253777854e+02 7.0650756089247534e+02 0 2 0 0 -13 0 -P 36 21 3.9295485495835827e+00 2.0268615205012281e+00 5.6968906941557279e+01 5.7140229939532411e+01 0 2 0 0 -13 0 -P 37 21 7.2056915500682295e-01 2.7350626169661183e+00 3.1393811690569535e+01 3.1520964450486176e+01 0 2 0 0 -13 0 -V -4 0 0 0 0 0 0 14 0 -P 6 -1 2.6542267443335232e+00 4.7733493416006816e+00 -9.5183018160378474e-01 5.5439845095298299e+00 0 3 0 0 -5 0 -P 11 1 1.0452289512758353e+00 1.6158783855979435e+00 -6.1449917248529795e+00 6.4477430017130333e+00 3.3000000000000002e-01 2 0 0 -9 0 -P 12 21 2.0507170473914881e-02 -8.9170706750033535e-01 6.3770653890766849e-01 1.0964632543028934e+00 0 2 0 0 -9 0 -P 13 21 2.4396972905842967e-01 -1.4625120878663037e-01 1.0957508431732279e+00 1.1320691476598213e+00 0 2 0 0 -9 0 -P 14 21 2.2404339997558728e-01 3.9772174914434660e-02 2.5679435268111024e+00 2.5780052808055083e+00 0 2 0 0 -9 0 -P 15 21 2.2907916028215539e-01 5.6145433093357851e-02 2.9566325145909338e+00 2.9660251849350718e+00 0 2 0 0 -9 0 -P 16 21 -6.4153613197677273e-01 -7.0041909254235180e-01 1.0594798881277963e+00 1.4229030701972845e+00 0 2 0 0 -9 0 -P 17 21 -6.0129688723679253e-01 1.0936253434099126e+00 -4.3678739538393438e+00 4.5426751166000470e+00 0 2 0 0 -9 0 -P 18 21 -3.0305601865621408e+00 -1.6350966724517046e+00 -5.7074862415394945e+00 6.6658259330709209e+00 0 2 0 0 -9 0 -P 44 21 4.9246236874230154e-01 -5.4861752836502131e-01 4.3982393709953467e+00 4.4595975089272537e+00 0 2 0 0 -13 0 -P 45 21 4.3766303360700642e-01 2.8042708174598313e-01 -4.3159676870355774e+00 4.3471560076327940e+00 0 2 0 0 -13 0 -P 46 21 -1.4413565938367516e+00 2.1405263273210222e+00 -1.0566874068613508e+02 1.0570024654645897e+02 0 2 0 0 -13 0 -P 42 21 -6.7308225475211777e-03 8.7119620191138739e-02 7.4004359099556938e-02 1.1450666950073547e-01 0 2 0 0 -13 0 -P 43 21 -5.4922530444249185e-01 -5.7443001559112279e+00 6.3312048654001273e+01 6.3574477091698256e+01 0 2 0 0 -13 0 -V -5 0 0 0 0 0 0 2 0 -P 7 22 1.3362652386696274e+01 -5.2304954478332810e+00 3.2435236228283662e+02 3.2466963744688843e+02 0 3 0 0 -6 0 -P 8 24 -1.3862798589011460e+01 5.3190305179177280e+00 5.2899710750727365e+02 5.3519431562641421e+02 7.9840756868868453e+01 3 0 0 -7 0 -V -6 0 0 0 0 0 0 1 0 -P 9 22 1.3362652386696274e+01 -5.2304954478332810e+00 3.2435236228283662e+02 3.2466963744688843e+02 0 1 0 0 0 0 -V -7 0 0 0 0 0 0 1 0 -P 10 24 -1.3862798589011460e+01 5.3190305179177280e+00 5.2899710750727365e+02 5.3519431562641421e+02 7.9840756868868453e+01 2 0 0 -8 0 -V -8 0 0 0 0 0 0 14 0 -P 20 -3 7.5856117110311561e-01 2.0869673719529196e+01 5.4238786725784678e+01 5.8122411182736293e+01 5.0000000000000000e-01 2 0 0 -11 0 -P 21 21 8.7653865698945155e-01 1.9452440200741499e+00 3.7291978086873669e+00 4.2964183468500563e+00 0 2 0 0 -11 0 -P 22 21 -2.0857452765265194e-01 -7.8097599171663326e-02 5.4489705676514189e-01 5.8865556232250016e-01 0 2 0 0 -11 0 -P 23 21 4.3330618320281716e-01 -2.4374988476555451e-01 8.2552704145238334e+00 8.2702271958899356e+00 0 2 0 0 -11 0 -P 24 21 2.6578215572600017e-01 -6.1069772931963884e-01 4.5356490599717514e+00 4.5842888506420660e+00 0 2 0 0 -11 0 -P 25 21 1.6304916049466662e+00 -3.6620941265445184e-01 9.3379838052457362e+00 9.4863351066020183e+00 0 2 0 0 -11 0 -P 26 21 2.6494131576136009e+00 -1.8737085154722346e+00 9.4375769353402248e+00 9.9798813665872306e+00 0 2 0 0 -11 0 -P 27 21 4.8537372653729438e-01 -5.1150354578642432e-01 3.0414025015288576e+01 3.0422198164537093e+01 0 2 0 0 -11 0 -P 28 21 -5.8689790026581257e-01 -6.6235167154779151e-01 4.0123127325052408e+01 4.0132885583078945e+01 0 2 0 0 -11 0 -P 29 21 4.1758121948632577e-02 4.2034989308576348e-01 1.8538918442599272e+01 1.8543730336550770e+01 0 2 0 0 -11 0 -P 30 21 -2.5101750377319743e+00 -1.9382973720472618e+00 6.5945986831567893e+01 6.6022201982453325e+01 0 2 0 0 -11 0 -P 31 21 8.7123477679498865e-02 -8.9409756075726099e-01 2.1265649086936058e+01 2.1284614913998784e+01 0 2 0 0 -11 0 -P 32 21 -1.4970574855498966e+00 -4.0178069904057806e-01 2.0564942822669387e+01 2.0623275252607758e+01 0 2 0 0 -11 0 -P 33 4 -1.6288441893558204e+01 -1.0335743124208518e+01 2.4206509617684176e+02 2.4283719178155783e+02 1.5000000000000000e+00 2 0 0 -11 0 -V -9 0 0 0 0 0 0 1 0 -P 54 92 -2.2191360057483411e+00 -1.2186750535150928e+00 -6.7797759371562515e+03 6.7987248899907554e+03 5.0723955090606091e+02 2 0 0 -10 0 -V -10 0 0 0 0 0 0 28 0 -P 55 223 4.3914986813415746e-01 3.6830815462664462e-01 -2.8127082215870023e+00 2.9747272598040237e+00 7.8049421970396760e-01 2 0 0 -19 0 -P 56 2214 9.3832780090047519e-03 9.1663704029871862e-01 -1.5328564926592643e+00 2.1740194902635626e+00 1.2395161182511469e+00 2 0 0 -20 0 -P 57 -2214 1.8785147040946842e-01 2.0187292697287215e-01 -1.2056659478163527e+00 1.7030569421445392e+00 1.1707825233078986e+00 2 0 0 -21 0 -P 58 -211 4.3147175131205556e-02 -2.3557373365294690e-02 2.1335388761743965e-01 2.5964648047518357e-01 1.3957000000000000e-01 1 0 0 0 0 -P 59 213 5.4943604442193794e-01 -4.4949867669686494e-01 1.8435024615148028e+00 2.2056789519361231e+00 9.8111634689298655e-01 2 0 0 -22 0 -P 68 -213 -5.2211437200382105e-01 7.9286955835134260e-02 -8.5790184370084488e-01 1.2011011581202928e+00 6.5403255254922366e-01 2 0 0 -29 0 -P 69 223 -9.5592288677932846e-01 -1.7918868574715585e-01 -3.0639090063121457e+00 3.3077794403724048e+00 7.7972384638497683e-01 2 0 0 -30 0 -P 70 211 7.0967562238259174e-02 3.8996758193883674e-01 -2.7910900605680138e+00 2.8225475409556564e+00 1.3957000000000000e-01 1 0 0 0 0 -P 71 221 -7.9420492103182139e-01 -1.1446092486693100e+00 -5.8237902163823607e+00 6.0130795584011185e+00 5.4744999999999999e-01 2 0 0 -31 0 -P 72 -211 -2.2868738909695571e-01 5.3871835020221159e-01 -8.0709761702752125e+00 8.0933708372239366e+00 1.3957000000000000e-01 1 0 0 0 0 -P 73 323 -3.7655233898013341e-01 -5.2497601208213923e-02 -9.3341650875051556e+00 9.3805406988977769e+00 8.5050470942461276e-01 2 0 0 -32 0 -P 74 -323 4.7081490132332504e-01 -1.5865648494546025e-02 -3.2261583443112883e+01 3.2277241798891765e+01 8.8806165162095285e-01 2 0 0 -33 0 -P 75 211 -9.1757958893698033e-02 3.2181918311161262e-01 -1.6614336925585420e+01 1.6618292883789543e+01 1.3957000000000000e-01 1 0 0 0 0 -P 76 -211 -5.6452720769387055e-01 -4.8762420703273973e-01 -5.1472406189058162e+01 5.1478000612026534e+01 1.3957000000000000e-01 1 0 0 0 0 -P 77 2212 4.1629393788876684e-01 4.8136660226161482e-01 -2.2629571529474541e+02 2.2629855528880839e+02 9.3827000000000005e-01 1 0 0 0 0 -P 78 -2212 1.6931670804072943e-01 -2.7905712401517913e-01 -3.0378841559864082e+02 3.0379003990182349e+02 9.3827000000000005e-01 1 0 0 0 0 -P 79 113 -3.4822564064186329e-01 -1.3279027021738696e-01 -5.8612314068012904e+02 5.8612361777362742e+02 6.4836483108520382e-01 2 0 0 -34 0 -P 80 223 3.1115346594947385e-01 9.5015147249963641e-02 -1.6070126147938757e+02 1.6070340807922597e+02 7.6425313486313373e-01 2 0 0 -35 0 -P 81 111 -3.0700454395497856e-01 -2.6156960683994035e-01 -8.8893536417835003e+02 8.8893546592367738e+02 1.3497999999999999e-01 2 0 0 -36 0 -P 82 2214 4.7537093601289926e-01 -3.4129421297560109e-01 -4.4813354731965437e+03 4.4813356767779196e+03 1.2174455488125147e+00 2 0 0 -37 0 -P 60 313 -7.8106864351388319e-02 -2.9683058321885142e-01 1.5358913398195986e+00 1.7943222638789789e+00 8.7545479696332307e-01 2 0 0 -23 0 -P 61 -313 -2.8127679350961809e-01 -4.0985048763141485e-01 1.3613208314607497e+00 1.6998147557129637e+00 8.8830273037505358e-01 2 0 0 -24 0 -P 62 111 5.2287976246185208e-01 3.1551855841571058e-01 1.6575473956800690e+00 1.7716202121286238e+00 1.3497999999999999e-01 2 0 0 -25 0 -P 63 223 4.2062353527572627e-01 -5.3534021227090882e-02 -5.1902760003831150e-01 1.0278601073623364e+00 7.7930526807457901e-01 2 0 0 -26 0 -P 64 313 -1.0164883296342317e+00 3.0317113360459302e-01 -4.7102726088297031e-01 1.4817262414936587e+00 9.2113229978235245e-01 2 0 0 -27 0 -P 65 -311 -5.9377456944595330e-01 4.5203893895285015e-02 -9.6189558945220821e-01 1.2359329210161991e+00 4.9767000000000000e-01 2 0 0 -28 0 -P 66 -211 -1.4391794255819610e-02 -7.1461790982322015e-01 -2.6658286748581150e-01 7.7552052901194535e-01 1.3957000000000000e-01 1 0 0 0 0 -P 67 211 -1.3248904077166496e-01 -4.3317492476548036e-01 -1.1482597221245971e+00 1.2422455617645944e+00 1.3957000000000000e-01 1 0 0 0 0 -V -11 0 0 0 0 0 0 1 0 -P 83 92 -1.3862798589011463e+01 5.3190305179177262e+00 5.2899710750727411e+02 5.3519431562641466e+02 7.9840756868868667e+01 2 0 0 -12 0 -V -12 0 0 0 0 0 0 21 0 -P 84 311 2.5888648514865614e-01 6.8942858996681888e+00 1.8438621810969973e+01 1.9693365634025938e+01 4.9767000000000000e-01 2 0 0 -38 0 -P 85 -2214 5.9843068834265156e-01 7.0360055489560640e+00 1.7358883624012101e+01 1.8783497498949131e+01 1.2749291146342472e+00 2 0 0 -39 0 -P 86 2212 3.4886119643935054e-01 4.9862993156252911e+00 1.2320349332712045e+01 1.3328775010192965e+01 9.3827000000000005e-01 1 0 0 0 0 -P 87 213 -1.7633909923617705e-01 5.5008275946494822e-01 3.1366704522030666e+00 3.2788845202711485e+00 7.6072048176052942e-01 2 0 0 -40 0 -P 88 -213 9.3596281426276295e-01 3.1300597444033751e+00 1.2279947128812188e+01 1.2716588374863234e+01 4.9113950774381010e-01 2 0 0 -41 0 -P 89 223 2.1870910397305326e-01 -5.2382770779191845e-01 2.3985226478001938e+00 2.5828193483021984e+00 7.7189102491382144e-01 2 0 0 -42 0 -P 90 213 6.1204214328732109e-01 -1.6796573188674388e-01 4.5599062798313206e+00 4.6552912175547361e+00 6.9006011850357374e-01 2 0 0 -43 0 -P 91 221 5.4269273511143312e-01 7.7987872353382517e-02 1.0780774373457542e+00 1.3276106267994858e+00 5.4744999999999999e-01 2 0 0 -44 0 -P 92 -211 8.0098137319982554e-01 -5.7398530539559300e-01 6.2237539585614439e+00 6.3028266208608654e+00 1.3957000000000000e-01 1 0 0 0 0 -P 93 213 5.5057551623275680e-01 -1.0534036535349371e+00 9.4814928549044328e+00 9.5835615561107037e+00 7.3017305195649951e-01 2 0 0 -45 0 -P 94 -321 1.5575020040762801e+00 -8.3099763629883872e-01 8.8844400576506484e+00 9.0715646755244688e+00 4.9359999999999998e-01 1 0 0 0 0 -P 95 313 3.3279971362282484e-01 -1.8260757454558951e-01 7.4157827342161626e+00 7.4614577188472992e+00 7.3172163653847266e-01 2 0 0 -46 0 -P 96 -1114 -5.0615240179884302e-01 -3.3322629949875109e-02 2.3237572673526984e+01 2.3276087644739984e+01 1.2386168239838844e+00 2 0 0 -47 0 -P 97 -211 1.7928451814409808e-02 -8.9954836115038374e-03 3.5726096339188897e+00 3.5753911295660967e+00 1.3957000000000000e-01 1 0 0 0 0 -P 98 3122 -6.5369447377612477e-01 -1.0702310712709195e+00 2.9383501117182917e+01 2.9431404838655745e+01 1.1156800000000000e+00 2 0 0 -48 0 -P 99 321 -2.4057580701681808e-01 -2.6944576020956384e-01 4.7340903611494610e+01 4.7344854772714633e+01 4.9359999999999998e-01 1 0 0 0 0 -P 100 -211 5.7342976079554991e-02 -6.8530273376454165e-01 2.0599804297672083e+01 2.0611752592661787e+01 1.3957000000000000e-01 1 0 0 0 0 -P 101 223 -2.3410430059255853e+00 -1.1503275478832635e+00 4.4285266064355085e+01 4.4369010681721200e+01 7.8777069059294114e-01 2 0 0 -49 0 -P 102 223 -3.1953002833548410e+00 -2.9014902189151588e+00 5.7122129530076670e+01 5.7290619886004976e+01 8.0551566129046692e-01 2 0 0 -50 0 -P 103 111 -9.4229307627474845e-01 -2.6009023256420677e-01 1.3944330755467364e+01 1.3979203946897107e+01 1.3497999999999999e-01 2 0 0 -51 0 -P 104 411 -1.2640115643219200e+01 -7.6436973349308683e+00 1.8593454150456017e+02 1.8652974733115090e+02 1.8693000000000000e+00 2 0 0 -52 0 -V -13 0 0 0 0 0 4 1 0 -P 38 21 -3.6780928056629758e+00 1.8218289456156361e-01 2.3176136987604477e+02 2.3179062561742003e+02 0 2 0 0 -13 0 -P 39 21 1.9326626594872165e+00 3.0361539888006712e+00 4.1524606600260074e+02 4.1526166298688753e+02 0 2 0 0 -13 0 -P 40 21 3.6780928056629758e+00 -1.8218289456156361e-01 5.0306149033881333e+01 5.0440759192474694e+01 0 2 0 0 -13 0 -P 41 21 -3.1335321392207005e-01 3.6624933692512527e+00 2.9580619506280872e+01 2.9808138121859425e+01 0 2 0 0 -13 0 -P 105 92 4.3385916536288640e+00 7.8287873414824647e+00 5.6439088698045143e+03 5.9802581086412247e+03 1.9772960329759103e+03 2 0 0 -14 0 -V -14 0 0 0 0 0 0 44 0 -P 106 2212 -3.4160521964083146e-01 -4.2707439382586243e-01 3.8512250996931152e+03 3.8512252528180561e+03 9.3827000000000005e-01 1 0 0 0 0 -P 107 223 -2.5910643630590879e-01 2.6822308539292211e-01 3.3980500829705886e+02 3.3980610932012291e+02 7.8050480217877360e-01 2 0 0 -53 0 -P 108 -213 -8.4375493495365134e-02 9.5940084333554179e-02 4.2717554323319206e+02 4.2717675743312810e+02 1.0104606796748297e+00 2 0 0 -54 0 -P 109 113 -3.4570270925533353e-01 3.3786281887310854e-01 1.4073143387350351e+02 1.4073480152132342e+02 8.4511390146478793e-01 2 0 0 -55 0 -P 110 213 2.4695902556986107e-01 1.2962129105176443e-01 1.2135495094371257e+02 1.2135708944265656e+02 6.6426576206931942e-01 2 0 0 -56 0 -P 111 -213 7.1828294249699365e-01 2.4088172256065112e-02 1.8213566215684704e+01 1.8242281874573358e+01 7.2824657412961591e-01 2 0 0 -57 0 -P 112 211 3.2873577492781386e-01 9.7272501560572222e-01 3.9426955314388032e+01 3.9440569802087708e+01 1.3957000000000000e-01 1 0 0 0 0 -P 113 111 3.6542984071301632e-02 -1.2598519400611854e-01 1.0816686858157469e+00 1.0979227682619390e+00 1.3497999999999999e-01 2 0 0 -58 0 -P 114 -323 8.6173923366826966e-01 1.1984057445008052e+00 3.0606103245405613e+01 3.0655843761329539e+01 9.3189592515667330e-01 2 0 0 -59 0 -P 115 321 9.6888861415451444e-03 7.5096383158525493e-01 1.2274824797803829e+01 1.2307680745276246e+01 4.9359999999999998e-01 1 0 0 0 0 -P 129 113 -1.8452176626646558e-01 6.0381110882112632e-01 1.3101634256941848e+01 1.3132355266544623e+01 6.3819942549986375e-01 2 0 0 -69 0 -P 130 -3112 1.4055290907999738e+00 4.7729917439304131e-01 2.0435320259645351e+01 2.0524120034603992e+01 1.1974400000000001e+00 2 0 0 -70 0 -P 131 3122 5.3829758889303592e-01 4.0787393536340916e-01 1.1614299998698201e+01 1.1687293603033934e+01 1.1156800000000000e+00 2 0 0 -71 0 -P 132 113 3.0711687734085993e-03 -8.8265073989745946e-01 1.3713684841961960e+01 1.3753831262363400e+01 5.6889426802210974e-01 2 0 0 -72 0 -P 133 221 -7.5480206365605290e-02 1.8124278719185263e-01 5.6912987989439365e+00 5.7209378366508021e+00 5.4744999999999999e-01 2 0 0 -73 0 -P 134 -323 3.4119607349226949e-02 2.9236525030979216e-01 9.4123046873792351e+00 9.4590213924699373e+00 8.9160786669277803e-01 2 0 0 -74 0 -P 135 311 3.1370849344690394e-01 -1.6502140696154801e+00 1.7013060483686480e+01 1.7103026689591879e+01 4.9767000000000000e-01 2 0 0 -75 0 -P 136 111 -4.0944263992706453e-01 4.8640258974619648e-02 1.8573871902464190e+00 1.9073845771304352e+00 1.3497999999999999e-01 2 0 0 -76 0 -P 137 211 4.2521983009641312e-01 1.0095857429967137e-01 1.7231640563937192e+00 1.7831933960676001e+00 1.3957000000000000e-01 1 0 0 0 0 -P 138 331 -6.4813629763747049e-01 -1.8623822616724834e+00 1.5746494503179859e+01 1.5898343095215896e+01 9.5743181773845276e-01 2 0 0 -77 0 -P 139 223 2.6048232688869083e-01 -7.5634998087022398e-01 9.4625709838721264e+00 9.5283224643966609e+00 7.8023267332483393e-01 2 0 0 -78 0 -P 140 -213 1.8439421727607613e-01 -1.4205338969033782e-02 4.9823217426385797e+00 5.0459413515342293e+00 7.7703999699749782e-01 2 0 0 -79 0 -P 141 223 2.2982888723697886e-02 -2.4721922626951739e-01 7.1905766008958572e-01 1.0910344129213754e+00 7.8209117923282823e-01 2 0 0 -80 0 -P 116 113 1.7372162770218658e+00 5.9807209762691627e-01 1.9986477309083451e+01 2.0086000654430649e+01 7.8264706999466116e-01 2 0 0 -60 0 -P 117 111 3.0531402020407761e-01 1.8264305008182584e+00 4.1855045772255252e+01 4.1896206764135989e+01 1.3497999999999999e-01 2 0 0 -61 0 -P 118 -211 -3.5077119331308954e-01 -4.5694813801297091e-01 4.3816705499162680e+01 4.3820714309743344e+01 1.3957000000000000e-01 1 0 0 0 0 -P 119 211 -3.7029195227841366e-01 2.5395295815850005e-01 1.0279729792404048e+01 1.0290477764643340e+01 1.3957000000000000e-01 1 0 0 0 0 -P 120 -323 -7.3509947734007886e-01 2.6814421430056673e-01 6.0116876101422612e+01 6.0128892408855542e+01 9.1248975921951503e-01 2 0 0 -62 0 -P 121 311 -6.9510494917716592e-01 3.2581753110533535e-01 7.2855221980526849e+01 7.2860966046400250e+01 4.9767000000000000e-01 2 0 0 -63 0 -P 122 113 -5.2905073522641244e-01 3.1400871973230815e-01 7.3063252128309969e+01 7.3071887443745908e+01 9.3990790504694877e-01 2 0 0 -64 0 -P 123 211 6.6028226411728730e-01 4.7432898901159826e-01 8.6408369660818963e+01 8.6412306923746485e+01 1.3957000000000000e-01 1 0 0 0 0 -P 124 -323 3.0867648137115933e-01 4.2956262666170625e-01 1.9432116829669465e+02 1.9432395791775645e+02 8.9686532393962448e-01 2 0 0 -65 0 -P 125 323 6.2311833999943100e-01 6.5723937948714817e-01 2.0539373968623146e+01 2.0576811112060657e+01 8.4795781196740605e-01 2 0 0 -66 0 -P 126 -213 8.2345550936719503e-01 5.3491978714712018e-01 3.7603445724436263e+01 3.7621593707277178e+01 6.3321763259171782e-01 2 0 0 -67 0 -P 127 213 9.8022239868273831e-01 8.7532758950826225e-02 3.4555170316705698e+01 3.4579992236556180e+01 8.6462103200085083e-01 2 0 0 -68 0 -P 128 -211 -5.4933402605629666e-01 6.9404217019334813e-01 8.2074041622333471e+00 8.2561749783622673e+00 1.3957000000000000e-01 1 0 0 0 0 -P 142 211 -2.5858770326589875e-01 3.7058982588567041e-01 -1.3267284914603703e+00 1.4085072574477475e+00 1.3957000000000000e-01 1 0 0 0 0 -P 143 113 3.8294560107957676e-01 -4.0649528732935525e-01 -2.2779494568707106e+00 2.5112020323957029e+00 8.9732723542952919e-01 2 0 0 -81 0 -P 144 -213 -1.7928345872764893e-02 -4.4205911706645860e-02 -7.7159032233104536e+00 7.7555350485384382e+00 7.8159180484414870e-01 2 0 0 -82 0 -P 145 -2112 1.2412666094555554e-01 6.0949944184229277e-01 -5.5543953322427688e+00 5.6675388211554232e+00 9.3957000000000002e-01 1 0 0 0 0 -P 146 2212 -6.3965319906624407e-01 -1.8727663295352737e-02 -7.6895933419740139e+00 7.7730112117685382e+00 9.3827000000000005e-01 1 0 0 0 0 -P 147 223 -1.7596507607359885e-02 5.0768816135776895e-01 -3.0916304915378632e+01 3.0930486957261824e+01 7.8680168175708287e-01 2 0 0 -83 0 -P 148 -213 -6.6424238417843881e-02 1.1248577022620441e+00 -6.6508630910885344e+01 6.6523631467643838e+01 8.5196301137017705e-01 2 0 0 -84 0 -P 149 213 -4.1830686176762299e-01 -2.4546245054114987e-01 -4.5077618999398048e+01 4.5083098707959479e+01 5.0874552725374045e-01 2 0 0 -85 0 -V -15 0 0 0 0 0 4 1 0 -P 48 21 1.5946597234291504e+00 -9.2504118596319991e+00 -1.3340867622115992e+01 1.6312320745901555e+01 0 2 0 0 -15 0 -P 49 21 3.1335321392207005e-01 -3.6624933692512527e+00 -1.5996227394120206e+01 1.6413145303715751e+01 0 2 0 0 -15 0 -P 50 21 -1.5946597234291504e+00 9.2504118596319991e+00 3.4553214778277602e-01 9.3932130643086573e+00 0 2 0 0 -15 0 -P 51 21 -1.9326626594872165e+00 -3.0361539888006712e+00 -2.2403930493388815e+00 4.2394312135724528e+00 0 2 0 0 -15 0 -P 150 92 -1.6193094455651464e+00 -6.6986473580519243e+00 -3.1231955917792302e+01 4.6358110327498416e+01 3.3558088193125087e+01 2 0 0 -16 0 -V -16 0 0 0 0 0 0 16 0 -P 157 -211 3.7929530102443287e-01 -1.7398661940045272e+00 -1.6262506930350391e+00 2.4156097366743579e+00 1.3957000000000000e-01 1 0 0 0 0 -P 158 211 3.5929042858649445e-02 -2.5352917615846560e-01 -5.9214749380134923e-01 6.6006543508924009e-01 1.3957000000000000e-01 1 0 0 0 0 -P 159 113 -1.8124205568734308e-01 -3.1612383038769862e+00 -1.1255356346808174e+01 1.1743159345237892e+01 1.0920021141756768e+00 2 0 0 -91 0 -P 160 -211 2.8532095261363383e-01 1.0522733295491603e-02 -1.4240332868527008e+00 1.4590645499363166e+00 1.3957000000000000e-01 1 0 0 0 0 -P 161 111 8.0154759639689030e-02 -3.4769109444583562e-01 -8.8595154092897399e-01 9.6459505281971181e-01 1.3497999999999999e-01 2 0 0 -92 0 -P 162 211 3.8450845074859470e-02 2.0662978645006660e-01 -7.8432525673484271e-02 2.6420783886723115e-01 1.3957000000000000e-01 1 0 0 0 0 -P 163 2112 -6.2517197323617857e-01 3.1384370147711613e+00 1.1380234215497604e-02 3.3351983728762726e+00 9.3957000000000002e-01 1 0 0 0 0 -P 164 -2212 4.7227611869119018e-01 9.0023711940114270e-01 -1.4423015082082278e+00 1.9985134067384713e+00 9.3827000000000005e-01 1 0 0 0 0 -P 165 213 -8.8060853310417464e-01 -2.2704271380420674e-01 -3.0207510516881181e-01 1.2785039593373555e+00 8.4634698700419575e-01 2 0 0 -93 0 -P 166 113 -5.6015858000582994e-02 1.9712923875091308e+00 2.0121776569014715e-01 2.1471534595610358e+00 8.2501390065658908e-01 2 0 0 -94 0 -P 151 -213 -9.1575437638018786e-01 1.9786173531659450e+00 1.0038490462694034e-01 2.3689498194545235e+00 9.2103930964307001e-01 2 0 0 -86 0 -P 152 221 -1.1496652822320098e-01 -7.9300120639953120e-01 -1.4401545991065330e+00 1.7366102003012958e+00 5.4744999999999999e-01 2 0 0 -87 0 -P 153 213 -7.2057087624760130e-01 -1.4035436254698561e+00 -1.4434746483930367e+00 2.3576881056684051e+00 9.9293355606685296e-01 2 0 0 -88 0 -P 154 311 -4.2407341657881786e-01 -1.1323088737363824e+00 -4.2536503779649254e-01 1.3749809062203735e+00 4.9767000000000000e-01 2 0 0 -89 0 -P 155 -323 6.8739672657553341e-01 -3.4637271310558235e+00 -5.6861873569991586e+00 6.7553227489313796e+00 9.1199719583656946e-01 2 0 0 -90 0 -P 156 211 3.2027042541495282e-01 -2.3824354336932485e+00 -4.9432086795529084e+00 5.4984873897845601e+00 1.3957000000000000e-01 1 0 0 0 0 -V -17 0 0 0 0 0 2 1 0 -P 52 21 -3.0362721334232550e+00 7.6960555799361619e-01 3.0949052196359327e+02 3.0950637219042926e+02 0 2 0 0 -17 0 -P 53 21 3.0362721334232550e+00 -7.6960555799361619e-01 4.2639680730324301e+00 5.2908094759627442e+00 0 2 0 0 -17 0 -P 167 92 0 0 3.1375449003662573e+02 3.1479718166639202e+02 2.5600499349824197e+01 2 0 0 -18 0 -V -18 0 0 0 0 0 0 14 0 -P 168 213 3.2999323989997326e-01 5.6942160313396906e-01 1.1610979057575713e+01 1.1657922862124975e+01 8.1190780467921042e-01 2 0 0 -95 0 -P 169 311 -3.9549707014260671e-01 -2.8851686492632728e-01 8.4163752596000130e+00 8.4452772514077648e+00 4.9767000000000000e-01 2 0 0 -96 0 -P 170 -323 5.2128742450140031e-01 9.7134097701761499e-02 8.3960820516559060e+00 8.4589041202825257e+00 8.8186704559962104e-01 2 0 0 -97 0 -P 171 113 3.8591072460653691e-01 -2.7644757220945215e-01 4.7314982713787517e+00 4.8147268927460747e+00 7.5443277508689677e-01 2 0 0 -98 0 -P 172 213 6.0325469359176376e-01 -3.0740340709509106e-01 1.4598324375000185e+00 1.7877548921809201e+00 7.7880917361405333e-01 2 0 0 -99 0 -P 173 1114 3.6710399464270077e-01 1.2951245679680667e-01 3.1121459445196282e+00 3.3467359928685627e+00 1.1677545147092263e+00 2 0 0 -100 0 -P 174 -1114 9.7380249513257433e-01 -6.3457340363777717e-02 1.2276570613075052e+01 1.2375786282599574e+01 1.2221219092993045e+00 2 0 0 -101 0 -P 175 2112 -3.2151359419442543e-01 -3.9573049090654866e-01 1.2203622044795935e+01 1.2250353317754321e+01 9.3957000000000002e-01 1 0 0 0 0 -P 176 211 -2.6031509045536677e-01 -2.5957138973744100e-02 2.1813184663724797e+01 2.1815199808345582e+01 1.3957000000000000e-01 1 0 0 0 0 -P 177 -3222 -1.3419797779501037e+00 1.0195367754860356e+00 7.0658805821816856e+01 7.0688908649965128e+01 1.1893700000000000e+00 2 0 0 -102 0 -P 178 -323 6.5303950764476326e-01 4.5843110713109797e-01 4.3702629036619392e+01 4.3720185385460475e+01 9.4773717249732448e-01 2 0 0 -103 0 -P 179 113 -1.2053222613750429e+00 -6.5261496518697781e-01 8.2787798768823720e+01 8.2800346532049119e+01 4.4615332971601729e-01 2 0 0 -104 0 -P 180 213 2.0228441721426238e-01 1.5934395893829920e-01 2.2925780883396051e+01 2.2952070100818403e+01 1.0676063491270991e+00 2 0 0 -105 0 -P 181 -211 -5.1204870311642947e-01 -4.2325221952605135e-01 9.6591851821438173e+00 9.6830095777884910e+00 1.3957000000000000e-01 1 0 0 0 0 -V -19 0 0 0 0 0 0 2 0 -P 182 22 1.8587946456084625e-01 -2.1984404913873207e-01 -1.2052101682909502e+00 1.2391182877510287e+00 0 1 0 0 0 0 -P 183 111 2.5327040357331115e-01 5.8815220376537669e-01 -1.6074980532960521e+00 1.7356089720529952e+00 1.3497999999999999e-01 2 0 0 -106 0 -V -20 0 0 0 0 0 0 2 0 -P 184 2212 -1.8155431084997567e-01 5.7356379733320284e-01 -9.9133230842357767e-01 1.4916526861249948e+00 9.3827000000000005e-01 1 0 0 0 0 -P 185 111 1.9093758885898043e-01 3.4307324296551578e-01 -5.4152418423568671e-01 6.8236680413856798e-01 1.3497999999999999e-01 2 0 0 -107 0 -V -21 0 0 0 0 0 0 2 0 -P 186 -2212 3.1520905862425908e-01 2.1080784939947769e-01 -1.0716835086387424e+00 1.4739921423113049e+00 9.3827000000000005e-01 1 0 0 0 0 -P 187 111 -1.2735758821479068e-01 -8.9349224266055422e-03 -1.3398243917761030e-01 2.2906479983323427e-01 1.3497999999999999e-01 2 0 0 -108 0 -V -22 0 0 0 0 0 0 2 0 -P 188 211 7.9805875536976001e-01 -3.2097636430674814e-01 1.5504153910727283e+00 1.7785362726807428e+00 1.3957000000000000e-01 1 0 0 0 0 -P 189 111 -2.4862271094782207e-01 -1.2852231239011683e-01 2.9308707044207477e-01 4.2714267925538041e-01 1.3497999999999999e-01 2 0 0 -109 0 -V -23 0 0 0 0 0 0 2 0 -P 190 321 -1.5072910497911379e-01 -4.2818751301287367e-01 1.3882161311751551e+00 1.5417032127627126e+00 4.9359999999999998e-01 1 0 0 0 0 -P 191 -211 7.2622240627725473e-02 1.3135692979402222e-01 1.4767520864444364e-01 2.5261905111626654e-01 1.3957000000000000e-01 1 0 0 0 0 -V -24 0 0 0 0 0 0 2 0 -P 192 -321 -7.3081843994436652e-02 -3.2872056572966601e-02 1.0091837996890252e+00 1.1262834588058825e+00 4.9359999999999998e-01 1 0 0 0 0 -P 193 211 -2.0819494951518142e-01 -3.7697843105844819e-01 3.5213703177172428e-01 5.7353129690708116e-01 1.3957000000000000e-01 1 0 0 0 0 -V -25 0 1.4713437953703780e-06 8.8784517316833685e-07 4.6642120258844947e-06 4.9852042362384955e-06 0 2 0 -P 194 22 2.7205036877184846e-01 2.1002866456737385e-01 7.6826252672454298e-01 8.4163576032511367e-01 0 1 0 0 0 0 -P 195 22 2.5082939369000368e-01 1.0548989384833672e-01 8.8928486895552616e-01 9.2998445180351008e-01 0 1 0 0 0 0 -V -26 0 0 0 0 0 0 3 0 -P 196 211 4.8097144381577590e-02 -3.3729039691863125e-02 -1.4857572844262404e-01 2.1214503387648262e-01 1.3957000000000000e-01 1 0 0 0 0 -P 197 -211 3.7753509906070848e-01 -2.8072898252255268e-02 -4.9028060511515958e-01 6.3496117620776427e-01 1.3957000000000000e-01 1 0 0 0 0 -P 198 111 -5.0087081665597831e-03 8.2679167170274983e-03 1.1982873351947212e-01 1.8075389727808949e-01 1.3497999999999999e-01 2 0 0 -110 0 -V -27 0 0 0 0 0 0 2 0 -P 199 311 -8.4559749187529187e-01 9.9710033077653488e-03 -5.2448860633214933e-01 1.1126087660291861e+00 4.9767000000000000e-01 2 0 0 -111 0 -P 200 111 -1.7089083775893985e-01 2.9320013029682768e-01 5.3461345449179000e-02 3.6911747546447249e-01 1.3497999999999999e-01 2 0 0 -112 0 -V -28 0 0 0 0 0 0 1 0 -P 201 310 -5.9377456944595330e-01 4.5203893895285015e-02 -9.6189558945220821e-01 1.2359329210161991e+00 4.9767000000000000e-01 2 0 0 -113 0 -V -29 0 0 0 0 0 0 2 0 -P 202 -211 5.7565215324936768e-02 -1.1132129032450142e-01 -3.4466881494030727e-01 3.9240611690858496e-01 1.3957000000000000e-01 1 0 0 0 0 -P 203 111 -5.7967958732875779e-01 1.9060824615963567e-01 -5.1323302876053767e-01 8.0869504121170799e-01 1.3497999999999999e-01 2 0 0 -114 0 -V -30 0 0 0 0 0 0 3 0 -P 206 111 -3.4573985065176793e-01 2.1582774372736507e-01 -9.4505589920380773e-01 1.0380115183903642e+00 1.3497999999999999e-01 2 0 0 -115 0 -P 204 211 -2.9500658243202599e-01 -2.2831491421237085e-01 -7.6054280475650438e-01 8.5852299124538090e-01 1.3957000000000000e-01 1 0 0 0 0 -P 205 -211 -3.1517645369553471e-01 -1.6670151526215007e-01 -1.3583103023518337e+00 1.4112449307366599e+00 1.3957000000000000e-01 1 0 0 0 0 -V -31 0 0 0 0 0 0 2 0 -P 207 22 -2.7296924447765503e-01 -1.1720991606231085e-01 -6.8344889887257443e-01 7.4521994754848742e-01 0 1 0 0 0 0 -P 208 22 -5.2123567655416625e-01 -1.0273993326069992e+00 -5.1403413175097858e+00 5.2678596108526312e+00 0 1 0 0 0 0 -V -32 0 0 0 0 0 0 2 0 -P 209 311 -1.7100390911822591e-01 -2.6586260149101487e-01 -5.1674196262737446e+00 5.2009447490532308e+00 4.9767000000000000e-01 2 0 0 -116 0 -P 210 211 -2.0554842986190747e-01 2.1336500028280095e-01 -4.1667454612314101e+00 4.1795959498445461e+00 1.3957000000000000e-01 1 0 0 0 0 -V -33 0 0 0 0 0 0 2 0 -P 211 -321 5.0202951655587369e-01 -1.0818066855080209e-01 -1.7205959210260328e+01 1.7220697140292657e+01 4.9359999999999998e-01 1 0 0 0 0 -P 212 111 -3.1214615232548548e-02 9.2315020056256067e-02 -1.5055624232852555e+01 1.5056544658599103e+01 1.3497999999999999e-01 2 0 0 -117 0 -V -34 0 0 0 0 0 0 2 0 -P 213 211 9.1259248721195466e-02 -4.6924362818728679e-02 -3.3138429820366952e+02 3.3138434348331810e+02 1.3957000000000000e-01 1 0 0 0 0 -P 214 -211 -4.3948488936305879e-01 -8.5865907398658278e-02 -2.5473884247645952e+02 2.5473927429030923e+02 1.3957000000000000e-01 1 0 0 0 0 -V -35 0 0 0 0 0 0 3 0 -P 215 -211 -1.2003912619075557e-02 1.5417261170584987e-01 -3.7414862979715281e+01 3.7415442866066513e+01 1.3957000000000000e-01 1 0 0 0 0 -P 216 211 7.5480641148820526e-02 -1.0982597901254602e-01 -1.5712350184328226e+01 1.5713535158350382e+01 1.3957000000000000e-01 1 0 0 0 0 -P 217 111 2.4767673741972890e-01 5.0668514556659799e-02 -1.0757404831534404e+02 1.0757443005480903e+02 1.3497999999999999e-01 2 0 0 -118 0 -V -36 0 -7.0045040781826522e-05 -5.9678770686458553e-05 -2.0281626139517797e-01 2.0281628460902201e-01 0 2 0 -P 218 22 -2.0306043592456660e-01 -1.0355072122695697e-01 -5.7088734079546225e+02 5.7088738630031651e+02 0 1 0 0 0 0 -P 219 22 -1.0394410803041193e-01 -1.5801888561298336e-01 -3.1804802338288772e+02 3.1804807962336088e+02 0 1 0 0 0 0 -V -37 0 0 0 0 0 0 2 0 -P 220 2212 1.9744570739179240e-01 -2.9511038265664724e-01 -2.9201396219359308e+03 2.9201397942608260e+03 9.3827000000000005e-01 1 0 0 0 0 -P 221 111 2.7792522862110680e-01 -4.6183830318953831e-02 -1.5611958512606125e+03 1.5611958825170939e+03 1.3497999999999999e-01 2 0 0 -119 0 -V -38 0 0 0 0 0 0 1 0 -P 222 130 2.5888648514865614e-01 6.8942858996681888e+00 1.8438621810969973e+01 1.9693365634025938e+01 4.9767000000000000e-01 1 0 0 0 0 -V -39 0 0 0 0 0 0 2 0 -P 223 -2212 6.4080126117661795e-01 6.6596959653282841e+00 1.6651831163988486e+01 1.7970142133934655e+01 9.3827000000000005e-01 1 0 0 0 0 -P 224 111 -4.2370572833966343e-02 3.7630958362777911e-01 7.0705246002361244e-01 8.1335536501447692e-01 1.3497999999999999e-01 2 0 0 -120 0 -V -40 0 0 0 0 0 0 2 0 -P 225 211 7.1578317760274915e-02 -4.5300168548451349e-02 1.5812339005719036e+00 1.5896402089975410e+00 1.3957000000000000e-01 1 0 0 0 0 -P 226 111 -2.4791741699645198e-01 5.9538292801339954e-01 1.5554365516311630e+00 1.6892443112736077e+00 1.3497999999999999e-01 2 0 0 -121 0 -V -41 0 0 0 0 0 0 2 0 -P 227 -211 8.3215158992368088e-01 2.4641162172429856e+00 1.0127048332028291e+01 1.0456621476596988e+01 1.3957000000000000e-01 1 0 0 0 0 -P 228 111 1.0381122433908205e-01 6.6594352716038974e-01 2.1528987967838971e+00 2.2599668982662449e+00 1.3497999999999999e-01 2 0 0 -122 0 -V -42 0 0 0 0 0 0 3 0 -P 229 211 1.4965349692285381e-02 -2.3653199756728413e-01 1.4382398007146437e+00 1.4643035398524038e+00 1.3957000000000000e-01 1 0 0 0 0 -P 230 -211 2.2523982939715814e-01 -2.3702484908296056e-02 5.6148232442395496e-01 6.2131873791011349e-01 1.3957000000000000e-01 1 0 0 0 0 -P 231 111 -2.1496075116390248e-02 -2.6359322531633833e-01 3.9880052266159505e-01 4.9719707053968126e-01 1.3497999999999999e-01 2 0 0 -123 0 -V -43 0 0 0 0 0 0 2 0 -P 232 211 2.3913424705178085e-01 -1.1677536002552498e-01 3.6380966329753557e+00 3.6504860729208013e+00 1.3957000000000000e-01 1 0 0 0 0 -P 233 111 3.7290789623554016e-01 -5.1190371861218900e-02 9.2180964685596467e-01 1.0048051446339359e+00 1.3497999999999999e-01 2 0 0 -124 0 -V -44 0 0 0 0 0 0 3 0 -P 234 111 2.5665924518427391e-01 -7.3737349265815239e-02 3.8717337870206897e-01 4.8931992641919431e-01 1.3497999999999999e-01 2 0 0 -125 0 -P 235 111 1.6865575199696520e-01 1.3369711769649753e-01 2.2670061612841966e-01 3.4048854858132604e-01 1.3497999999999999e-01 2 0 0 -126 0 -P 236 111 1.1737773793019404e-01 1.8028103922700229e-02 4.6420344251526557e-01 4.9780215179896570e-01 1.3497999999999999e-01 2 0 0 -127 0 -V -45 0 0 0 0 0 0 2 0 -P 237 211 4.0644969833856254e-01 -1.1066065128461260e+00 8.3074841847963157e+00 8.3918742005045495e+00 1.3957000000000000e-01 1 0 0 0 0 -P 238 111 1.4412581789419426e-01 5.3202859311188878e-02 1.1740086701081160e+00 1.1916873556061522e+00 1.3497999999999999e-01 2 0 0 -128 0 -V -46 0 0 0 0 0 0 2 0 -P 239 311 2.5178180326027377e-01 -3.2242494783834660e-02 4.0106627287096375e+00 4.0493857073985327e+00 4.9767000000000000e-01 2 0 0 -129 0 -P 240 111 8.1017910362551057e-02 -1.5036507976175487e-01 3.4051200055065252e+00 3.4120720114487666e+00 1.3497999999999999e-01 2 0 0 -130 0 -V -47 0 0 0 0 0 0 2 0 -P 241 -2112 -2.6558420839918023e-01 -4.1394355142160610e-02 1.3870983886355736e+01 1.3905367101404735e+01 9.3957000000000002e-01 1 0 0 0 0 -P 242 211 -2.4056819339966279e-01 8.0717251922855018e-03 9.3665887871712474e+00 9.3707205433352510e+00 1.3957000000000000e-01 1 0 0 0 0 -V -48 0 -1.7671461207839840e+01 -2.8931783299526622e+01 7.9433041118326389e+02 7.9562540263520054e+02 0 2 0 -P 243 2212 -6.4323292945979427e-01 -9.6342862692646503e-01 2.7198319694383319e+01 2.7239142572986808e+01 9.3827000000000005e-01 1 0 0 0 0 -P 244 -211 -1.0461544316330479e-02 -1.0680244434445450e-01 2.1851814227995972e+00 2.1922622656689379e+00 1.3957000000000000e-01 1 0 0 0 0 -V -49 0 0 0 0 0 0 3 0 -P 245 211 -1.0658262219708090e+00 -8.2252278997220341e-01 2.1555528495606971e+01 2.1597981798892423e+01 1.3957000000000000e-01 1 0 0 0 0 -P 246 -211 -4.9088454070215592e-01 -3.0027745336315973e-02 7.2664188190925962e+00 7.2843799693009830e+00 1.3957000000000000e-01 1 0 0 0 0 -P 247 111 -7.8433224325262052e-01 -2.9777701257474420e-01 1.5463318749655521e+01 1.5486648913527794e+01 1.3497999999999999e-01 2 0 0 -131 0 -V -50 0 0 0 0 0 0 3 0 -P 248 -211 -1.2188640219493940e+00 -9.3422180369870000e-01 2.0922904541008972e+01 2.0979652382715557e+01 1.3957000000000000e-01 1 0 0 0 0 -P 249 211 -1.0146380362055605e+00 -1.1421994186045756e+00 1.6785995231936074e+01 1.6855955195949480e+01 1.3957000000000000e-01 1 0 0 0 0 -P 250 111 -9.6179822519988656e-01 -8.2506899661188349e-01 1.9413229757131628e+01 1.9455012307339945e+01 1.3497999999999999e-01 2 0 0 -132 0 -V -51 0 -6.7612250962819850e-05 -1.8662225712865060e-05 1.0005460236156168e-03 1.0030482758662050e-03 0 2 0 -P 251 22 -5.4111388577644548e-01 -1.7745401666901453e-01 8.9546946112744887e+00 8.9727838348307714e+00 0 1 0 0 0 0 -P 252 22 -4.0117919049830292e-01 -8.2636215895192267e-02 4.9896361441928754e+00 5.0064201120663352e+00 0 1 0 0 0 0 -V -52 0 -1.0031594106859512e+00 -6.0662790835180747e-01 1.4756351155848559e+01 1.4803588565939812e+01 0 4 0 -P 253 -13 -2.6618575532310844e+00 -1.6167266063331194e+00 3.6143438395162441e+01 3.6277521878069642e+01 1.0566000000000000e-01 1 0 0 0 0 -P 254 14 -1.7622608552463395e+00 -6.1124567981443900e-01 2.3767021479078203e+01 2.3840102654770387e+01 0 1 0 0 0 0 -P 255 -323 -7.3856701894561985e+00 -4.9147012895514184e+00 1.1208276364753114e+02 1.1243641907035618e+02 8.3666814418099522e-01 2 0 0 -133 0 -P 256 211 -8.3032704528557788e-01 -5.0102375923189180e-01 1.3941317982788394e+01 1.3975703727954690e+01 1.3957000000000000e-01 1 0 0 0 0 -V -53 0 0 0 0 0 0 3 0 -P 257 -211 1.3857831485530528e-01 2.6488289772950824e-01 1.2033220667879797e+02 1.2033265895372175e+02 1.3957000000000000e-01 1 0 0 0 0 -P 258 211 -1.7979563690597777e-01 3.7159338534362971e-02 6.0674676874761047e+01 6.0675115170299051e+01 1.3957000000000000e-01 1 0 0 0 0 -P 259 111 -2.1788911425523635e-01 -3.3819150870949083e-02 1.5879812474349990e+02 1.5879833519610222e+02 1.3497999999999999e-01 2 0 0 -134 0 -V -54 0 0 0 0 0 0 2 0 -P 260 -211 -3.1834604045503856e-01 3.0376945733427041e-01 3.6415849333717392e+02 3.6415878592925657e+02 1.3957000000000000e-01 1 0 0 0 0 -P 261 111 2.3397054695967343e-01 -2.0782937300071624e-01 6.3017049896018172e+01 6.3017971503871578e+01 1.3497999999999999e-01 2 0 0 -135 0 -V -55 0 0 0 0 0 0 2 0 -P 262 211 -3.2804553869109360e-01 -2.0500235184311433e-01 6.3497741005976408e+01 6.3499072689974568e+01 1.3957000000000000e-01 1 0 0 0 0 -P 263 -211 -1.7657170564239925e-02 5.4286517071622287e-01 7.7233692867527111e+01 7.7235728831348879e+01 1.3957000000000000e-01 1 0 0 0 0 -V -56 0 0 0 0 0 0 2 0 -P 265 111 1.3819210244527837e-02 -1.2966282475160049e-01 1.1780976594232847e+01 1.1782471410232937e+01 1.3497999999999999e-01 2 0 0 -136 0 -P 264 211 2.3313981532533326e-01 2.5928411580336491e-01 1.0957397434947973e+02 1.0957461803242364e+02 1.3957000000000000e-01 1 0 0 0 0 -V -57 0 0 0 0 0 0 2 0 -P 266 -211 4.5549648708790008e-01 2.2808652686664740e-01 5.9317208860832444e+00 5.9551904225460079e+00 1.3957000000000000e-01 1 0 0 0 0 -P 267 111 2.6278645540909368e-01 -2.0399835461058230e-01 1.2281845329601460e+01 1.2287091452027347e+01 1.3497999999999999e-01 2 0 0 -137 0 -V -58 0 2.1464610372068443e-05 -7.4001157013187091e-05 6.3535032736792402e-04 6.4489764692951892e-04 0 2 0 -P 268 22 -4.6675719704953711e-02 -1.7936313484327244e-02 2.2709027355224920e-01 2.3253027005837071e-01 0 1 0 0 0 0 -P 269 22 8.3218703776255343e-02 -1.0804888052179129e-01 8.5457841226349773e-01 8.6539249820356823e-01 0 1 0 0 0 0 -V -59 0 0 0 0 0 0 2 0 -P 270 -311 7.4489573882419291e-01 8.6535957172601397e-01 1.7511148478823699e+01 1.7555389865406173e+01 4.9767000000000000e-01 2 0 0 -138 0 -P 271 -211 1.1684349484407686e-01 3.3304617277479132e-01 1.3094954766581912e+01 1.3100453895923364e+01 1.3957000000000000e-01 1 0 0 0 0 -V -60 0 0 0 0 0 0 2 0 -P 272 -211 1.4834296209480378e+00 5.9292167637229842e-01 1.8632553603080105e+01 1.8701434520142339e+01 1.3957000000000000e-01 1 0 0 0 0 -P 273 211 2.5378665607382822e-01 5.1504212546178629e-03 1.3539237060033491e+00 1.3845661342883115e+00 1.3957000000000000e-01 1 0 0 0 0 -V -61 0 2.9762149049519281e-06 1.7804127290848588e-05 4.0800488294499739e-04 4.0840612215915523e-04 0 2 0 -P 274 22 1.6410544409971853e-01 1.1774821168325287e+00 2.5564031639197310e+01 2.5591660914878588e+01 0 1 0 0 0 0 -P 275 22 1.4120857610435908e-01 6.4894838398572974e-01 1.6291014133057946e+01 1.6304545849257401e+01 0 1 0 0 0 0 -V -62 0 0 0 0 0 0 2 0 -P 276 -311 -4.7598331792509141e-01 -8.4343084301410715e-02 2.7348337649344273e+01 2.7357136573228090e+01 4.9767000000000000e-01 2 0 0 -139 0 -P 277 -211 -2.5911615941498739e-01 3.5248729860197742e-01 3.2768538452078332e+01 3.2771755835627452e+01 1.3957000000000000e-01 1 0 0 0 0 -V -63 0 0 0 0 0 0 1 0 -P 278 310 -6.9510494917716592e-01 3.2581753110533535e-01 7.2855221980526849e+01 7.2860966046400236e+01 4.9767000000000000e-01 2 0 0 -140 0 -V -64 0 0 0 0 0 0 2 0 -P 279 -211 -3.5884084719608189e-01 -1.6833740109714063e-01 5.2889439384711885e+01 5.2891108727726980e+01 1.3957000000000000e-01 1 0 0 0 0 -P 280 211 -1.7020988803033060e-01 4.8234612082944878e-01 2.0173812743598088e+01 2.0180778716018942e+01 1.3957000000000000e-01 1 0 0 0 0 -V -65 0 0 0 0 0 0 2 0 -P 281 -321 3.4124973471434705e-01 1.1009176865102556e-01 1.5639404073440900e+02 1.5639523071300783e+02 4.9359999999999998e-01 1 0 0 0 0 -P 282 111 -3.2573253343187690e-02 3.1947085801068070e-01 3.7927127562285655e+01 3.7928727204748640e+01 1.3497999999999999e-01 2 0 0 -141 0 -V -66 0 0 0 0 0 0 2 0 -P 283 321 4.9926846924895973e-01 5.0291971801674606e-01 1.8932076706358586e+01 1.8951764208711591e+01 4.9359999999999998e-01 1 0 0 0 0 -P 284 111 1.2384987075047131e-01 1.5431966147040221e-01 1.6072972622645629e+00 1.6250469033490718e+00 1.3497999999999999e-01 2 0 0 -142 0 -V -67 0 0 0 0 0 0 2 0 -P 285 -211 1.7859206659747753e-01 1.1537889269107618e-01 3.5102971391524509e+00 3.5194989991719074e+00 1.3957000000000000e-01 1 0 0 0 0 -P 286 111 6.4486344276971752e-01 4.1954089445604403e-01 3.4093148585283814e+01 3.4102094708105270e+01 1.3497999999999999e-01 2 0 0 -143 0 -V -68 0 0 0 0 0 0 2 0 -P 287 211 1.5204545582315820e-01 -2.7098259271716346e-01 5.5290903643553468e+00 5.5395730366427456e+00 1.3957000000000000e-01 1 0 0 0 0 -P 288 111 8.2817694285958010e-01 3.5851535166798970e-01 2.9026079952350351e+01 2.9040419199913433e+01 1.3497999999999999e-01 2 0 0 -144 0 -V -69 0 0 0 0 0 0 2 0 -P 289 -211 2.2195516193061104e-02 5.9812657288889171e-01 7.4880607642605312e+00 7.5132404348784751e+00 1.3957000000000000e-01 1 0 0 0 0 -P 290 211 -2.0671728245952670e-01 5.6845359322346689e-03 5.6135734926813177e+00 5.6191148316661534e+00 1.3957000000000000e-01 1 0 0 0 0 -V -70 0 2.8328565239901664e+01 9.6200077887030560e+00 4.1187571780827233e+02 4.1366548525931290e+02 0 2 0 -P 291 -2112 8.7074311781260816e-01 2.9303660553681032e-01 1.5105424132384448e+01 1.5162476513865569e+01 9.3957000000000002e-01 1 0 0 0 0 -P 292 211 5.3478597298736574e-01 1.8426256885623099e-01 5.3298961272609038e+00 5.3616435207384239e+00 1.3957000000000000e-01 1 0 0 0 0 -V -71 0 2.3556324247227142e+01 1.7848882981569922e+01 5.0825086777096664e+02 5.1144512508733749e+02 0 2 0 -P 293 2212 4.2293484863058523e-01 2.9818090643247958e-01 8.7896810414164062e+00 8.8547517831886218e+00 9.3827000000000005e-01 1 0 0 0 0 -P 294 -211 1.1536274026245073e-01 1.0969302893092955e-01 2.8246189572817935e+00 2.8325418198453116e+00 1.3957000000000000e-01 1 0 0 0 0 -V -72 0 0 0 0 0 0 2 0 -P 295 211 1.8426627916469118e-01 -7.5048765015658725e-01 1.0044347862878006e+01 1.0074998240698443e+01 1.3957000000000000e-01 1 0 0 0 0 -P 296 -211 -1.8119511039128258e-01 -1.3216308974087224e-01 3.6693369790839530e+00 3.6788330216649565e+00 1.3957000000000000e-01 1 0 0 0 0 -V -73 0 0 0 0 0 0 3 0 -P 297 -211 -9.2330691001946449e-02 1.3153518843286626e-02 1.6918771409868543e+00 1.7001841125750792e+00 1.3957000000000000e-01 1 0 0 0 0 -P 298 211 9.0350579840365638e-02 1.9611894399870142e-01 2.5597390976925207e+00 2.5726192684943445e+00 1.3957000000000000e-01 1 0 0 0 0 -P 299 111 -7.3500095204024493e-02 -2.8029675650135422e-02 1.4396825602645615e+00 1.4481344555813784e+00 1.3497999999999999e-01 2 0 0 -145 0 -V -74 0 0 0 0 0 0 2 0 -P 300 -321 -1.6702756185750384e-01 1.3389650322075297e-01 3.6488781901075438e+00 3.6883301758705538e+00 4.9359999999999998e-01 1 0 0 0 0 -P 301 111 2.0114716920673079e-01 1.5846874708903921e-01 5.7634264972716922e+00 5.7706912165993858e+00 1.3497999999999999e-01 2 0 0 -146 0 -V -75 0 0 0 0 0 0 1 0 -P 302 310 3.1370849344690394e-01 -1.6502140696154801e+00 1.7013060483686480e+01 1.7103026689591879e+01 4.9767000000000000e-01 2 0 0 -147 0 -V -76 0 -4.4060919108810952e-05 5.2342729044881510e-06 1.9987704934143461e-04 2.0525736542072959e-04 0 2 0 -P 303 22 -1.7794066347471776e-01 -1.3349370806625340e-02 5.5028936743970702e-01 5.7849760011252294e-01 0 1 0 0 0 0 -P 304 22 -2.3150197645234680e-01 6.1989629781244990e-02 1.3070978228067121e+00 1.3288869770179124e+00 0 1 0 0 0 0 -V -77 0 0 0 0 0 0 2 0 -P 305 22 -4.8147715868567109e-01 -1.0464340696446410e+00 7.7587519913374754e+00 7.8437922575456005e+00 0 1 0 0 0 0 -P 306 113 -1.6665913895179937e-01 -8.1594819202784230e-01 7.9877425118423817e+00 8.0545508376702948e+00 6.1498946369148655e-01 2 0 0 -148 0 -V -78 0 0 0 0 0 0 3 0 -P 307 211 -1.8184679283982430e-01 -2.8499906586894308e-01 3.0136790064542227e+00 3.0357920980289825e+00 1.3957000000000000e-01 1 0 0 0 0 -P 308 -211 3.5179468682444448e-01 -2.3385890449493285e-01 3.1756943767047940e+00 3.2067061056517057e+00 1.3957000000000000e-01 1 0 0 0 0 -P 309 111 9.0534432904070691e-02 -2.3749201050634819e-01 3.2731976007131105e+00 3.2858242607159731e+00 1.3497999999999999e-01 2 0 0 -149 0 -V -79 0 0 0 0 0 0 2 0 -P 310 -211 2.7856484699452511e-01 2.8577154471696598e-01 3.4544645566440200e+00 3.4802397773372986e+00 1.3957000000000000e-01 1 0 0 0 0 -P 311 111 -9.4170629718448959e-02 -2.9997688368599973e-01 1.5278571859945593e+00 1.5657015741969307e+00 1.3497999999999999e-01 2 0 0 -150 0 -V -80 0 0 0 0 0 0 3 0 -P 313 -211 7.9426483332274311e-02 -1.5467016237984951e-01 9.7427050026002354e-02 2.4331716002351791e-01 1.3957000000000000e-01 1 0 0 0 0 -P 314 111 1.8971003374894185e-01 4.4985653465487427e-02 1.4939175240432037e-01 2.8026969513162736e-01 1.3497999999999999e-01 2 0 0 -151 0 -P 312 211 -2.4615362835751831e-01 -1.3753471735515529e-01 4.7223885765926288e-01 5.6744755776623024e-01 1.3957000000000000e-01 1 0 0 0 0 -V -81 0 0 0 0 0 0 2 0 -P 315 211 5.7720189775931130e-01 -3.9507585597671829e-01 -1.1132509901501841e+00 1.3221401267350796e+00 1.3957000000000000e-01 1 0 0 0 0 -P 316 -211 -1.9425629667973457e-01 -1.1419431352636915e-02 -1.1646984667205262e+00 1.1890619056606293e+00 1.3957000000000000e-01 1 0 0 0 0 -V -82 0 0 0 0 0 0 2 0 -P 317 -211 -2.9021697517593742e-01 1.1988738882319924e-01 -2.0078266346984845e+00 2.0370190128184267e+00 1.3957000000000000e-01 1 0 0 0 0 -P 318 111 2.7228862930317249e-01 -1.6409330052984511e-01 -5.7080765886119700e+00 5.7185160357199880e+00 1.3497999999999999e-01 2 0 0 -152 0 -V -83 0 0 0 0 0 0 3 0 -P 319 211 2.6159158905174562e-01 1.1976908035329931e-01 -1.4753856976310765e+01 1.4757321920131888e+01 1.3957000000000000e-01 1 0 0 0 0 -P 320 -211 -2.6126819940006357e-01 2.3461403354789964e-01 -1.1509852823941991e+01 1.1516053865385521e+01 1.3957000000000000e-01 1 0 0 0 0 -P 321 111 -1.7919897259041917e-02 1.5330504745657006e-01 -4.6525951151258740e+00 4.6571111717444085e+00 1.3497999999999999e-01 2 0 0 -153 0 -V -84 0 0 0 0 0 0 2 0 -P 322 -211 1.1189448533215496e-01 1.1139057069963787e+00 -4.6227315661100803e+01 4.6241080213549104e+01 1.3957000000000000e-01 1 0 0 0 0 -P 323 111 -1.7831872374999885e-01 1.0951995265665338e-02 -2.0281315249784544e+01 2.0282551254094816e+01 1.3497999999999999e-01 2 0 0 -154 0 -V -85 0 0 0 0 0 0 2 0 -P 324 211 -1.8870258535806511e-01 9.9084535100534471e-02 -1.2736262200082729e+01 1.2738810031748375e+01 1.3957000000000000e-01 1 0 0 0 0 -P 325 111 -2.2960427640955786e-01 -3.4454698564168434e-01 -3.2341356799315314e+01 3.2344288676211129e+01 1.3497999999999999e-01 2 0 0 -155 0 -V -86 0 0 0 0 0 0 2 0 -P 326 -211 -1.0197116374969704e+00 1.5402199673687851e+00 -1.0565560002434418e-01 1.8554601214374720e+00 1.3957000000000000e-01 1 0 0 0 0 -P 327 111 1.0395726111678255e-01 4.3839738579715976e-01 2.0604050465128451e-01 5.1348969801705135e-01 1.3497999999999999e-01 2 0 0 -156 0 -V -87 0 0 0 0 0 0 3 0 -P 328 22 6.5303627407064125e-03 -1.3036945355560819e-01 -9.6430844554637241e-02 1.6228908724690547e-01 0 1 0 0 0 0 -P 329 -211 -1.2443340358908676e-01 -5.8991175846200250e-01 -1.2399150957152332e+00 1.3857664969911101e+00 1.3957000000000000e-01 1 0 0 0 0 -P 330 211 2.9365126251793771e-03 -7.2719994381920436e-02 -1.0380865883666240e-01 1.8855461606328006e-01 1.3957000000000000e-01 1 0 0 0 0 -V -88 0 0 0 0 0 0 2 0 -P 331 211 -2.3181192257978658e-01 -3.5965984364971582e-01 6.4686117305103930e-02 4.5470435368081163e-01 1.3957000000000000e-01 1 0 0 0 0 -P 332 111 -4.8875895366781463e-01 -1.0438837818201401e+00 -1.5081607656981406e+00 1.9029837519875930e+00 1.3497999999999999e-01 2 0 0 -157 0 -V -89 0 0 0 0 0 0 1 0 -P 333 130 -4.2407341657881786e-01 -1.1323088737363824e+00 -4.2536503779649254e-01 1.3749809062203728e+00 4.9767000000000000e-01 1 0 0 0 0 -V -90 0 0 0 0 0 0 2 0 -P 334 -311 5.4533423118825564e-01 -2.1932503402815775e+00 -4.1527351550146987e+00 4.7540110617715117e+00 4.9767000000000000e-01 2 0 0 -158 0 -P 335 -211 1.4206249538727772e-01 -1.2704767907742456e+00 -1.5334522019844594e+00 2.0013116871598671e+00 1.3957000000000000e-01 1 0 0 0 0 -V -91 0 0 0 0 0 0 2 0 -P 336 211 -1.2225698895883293e-01 -3.1496728462498411e+00 -1.0197663615851679e+01 1.0674605792099211e+01 1.3957000000000000e-01 1 0 0 0 0 -P 337 -211 -5.8985066728510137e-02 -1.1565457627145266e-02 -1.0576927309564947e+00 1.0685535531386812e+00 1.3957000000000000e-01 1 0 0 0 0 -V -92 0 3.8527617637917094e-05 -1.6712307045937573e-04 -4.2584623006883233e-04 4.6364744324007163e-04 0 2 0 -P 338 22 1.4995858064857176e-02 -1.9939694528972410e-01 -3.3316020649286715e-01 3.8856111583680686e-01 0 1 0 0 0 0 -P 339 22 6.5158901574831854e-02 -1.4829414915611150e-01 -5.5279133443610673e-01 5.7603393698290495e-01 0 1 0 0 0 0 -V -93 0 0 0 0 0 0 2 0 -P 340 211 8.5893108070628790e-02 -1.6165390012367403e-01 5.6069209211904635e-02 2.3692435620019278e-01 1.3957000000000000e-01 1 0 0 0 0 -P 341 111 -9.6650164117480342e-01 -6.5388813680532676e-02 -3.5814431438071642e-01 1.0415796031371627e+00 1.3497999999999999e-01 2 0 0 -159 0 -V -94 0 0 0 0 0 0 2 0 -P 342 211 -3.3890199253143205e-01 8.2436823164178752e-01 -1.3217187365235175e-01 9.1180410778124699e-01 1.3957000000000000e-01 1 0 0 0 0 -P 343 -211 2.8288613453084904e-01 1.1469241558673431e+00 3.3338963934249888e-01 1.2353493517797889e+00 1.3957000000000000e-01 1 0 0 0 0 -V -95 0 0 0 0 0 0 2 0 -P 344 211 1.0363531280713142e-01 -1.6220264472005022e-01 4.0741120327917821e+00 4.0810438145961632e+00 1.3957000000000000e-01 1 0 0 0 0 -P 345 111 2.2635792709284186e-01 7.3162424785401936e-01 7.5368670247839322e+00 7.5768790475288128e+00 1.3497999999999999e-01 2 0 0 -160 0 -V -96 0 0 0 0 0 0 1 0 -P 346 130 -3.9549707014260671e-01 -2.8851686492632728e-01 8.4163752596000130e+00 8.4452772514077648e+00 4.9767000000000000e-01 1 0 0 0 0 -V -97 0 0 0 0 0 0 2 0 -P 347 -311 5.0093079509551341e-01 -1.6736784839411437e-01 6.2499799234045614e+00 6.2919685417213573e+00 4.9767000000000000e-01 2 0 0 -161 0 -P 348 -211 2.0356629405886905e-02 2.6450194609587585e-01 2.1461021282513455e+00 2.1669355785611693e+00 1.3957000000000000e-01 1 0 0 0 0 -V -98 0 0 0 0 0 0 2 0 -P 349 -211 3.6607738155790637e-01 -4.3044115371221930e-01 4.2533118453167278e+00 4.2929516273199475e+00 1.3957000000000000e-01 1 0 0 0 0 -P 350 211 1.9833343048630526e-02 1.5399358150276715e-01 4.7818642606202344e-01 5.2177526542612684e-01 1.3957000000000000e-01 1 0 0 0 0 -V -99 0 0 0 0 0 0 2 0 -P 351 211 1.5940818450812536e-01 -1.9127479523860261e-01 1.2196341057309632e+00 1.2525909760747569e+00 1.3957000000000000e-01 1 0 0 0 0 -P 352 111 4.4384650908363849e-01 -1.1612861185648843e-01 2.4019833176905525e-01 5.3516391610616321e-01 1.3497999999999999e-01 2 0 0 -162 0 -V -100 0 0 0 0 0 0 2 0 -P 353 2112 2.4461206701185767e-01 -3.6870254613733507e-02 2.2892535780963792e+00 2.4868993161626327e+00 9.3957000000000002e-01 1 0 0 0 0 -P 354 -211 1.2249192763084313e-01 1.6638271141054020e-01 8.2289236642324926e-01 8.5983667670593000e-01 1.3957000000000000e-01 1 0 0 0 0 -V -101 0 0 0 0 0 0 2 0 -P 355 -2112 1.0306418575496812e+00 -1.2658702532810939e-01 1.1049846019117362e+01 1.1138228573010105e+01 9.3957000000000002e-01 1 0 0 0 0 -P 356 211 -5.6839362417106777e-02 6.3129684964331675e-02 1.2267245939576892e+00 1.2375577095894705e+00 1.3957000000000000e-01 1 0 0 0 0 -V -102 0 -3.0012621268697615e+01 2.2801365277584146e+01 1.5802443623017721e+03 1.5809175950845424e+03 0 2 0 -P 357 -2112 -1.1378581036056166e+00 9.7861646295080473e-01 5.6072853838445951e+01 5.6100803386565886e+01 9.3957000000000002e-01 1 0 0 0 0 -P 358 -211 -2.0412167434448733e-01 4.0920312535230922e-02 1.4585951983370913e+01 1.4588105263399255e+01 1.3957000000000000e-01 1 0 0 0 0 -V -103 0 0 0 0 0 0 2 0 -P 359 -311 4.7336032540883582e-01 1.9957792363092278e-01 3.8244208976342740e+01 3.8250896682304671e+01 4.9767000000000000e-01 2 0 0 -163 0 -P 360 -211 1.7967918223592744e-01 2.5885318350017517e-01 5.4584200602766515e+00 5.4692887031558053e+00 1.3957000000000000e-01 1 0 0 0 0 -V -104 0 0 0 0 0 0 2 0 -P 361 -211 -3.2092342397034901e-01 -3.5332105099211819e-01 2.8100859079842962e+01 2.8105259088277762e+01 1.3957000000000000e-01 1 0 0 0 0 -P 362 211 -8.8439883740469394e-01 -2.9929391419485957e-01 5.4686939688980750e+01 5.4695087443771357e+01 1.3957000000000000e-01 1 0 0 0 0 -V -105 0 0 0 0 0 0 2 0 -P 363 211 9.3368745682880214e-02 -3.7681332268505119e-01 1.5272857477423360e+01 1.5278427972583108e+01 1.3957000000000000e-01 1 0 0 0 0 -P 364 111 1.0891567153138218e-01 5.3615728162335041e-01 7.6529234059726923e+00 7.6736421282352971e+00 1.3497999999999999e-01 2 0 0 -164 0 -V -106 0 3.8458390904380503e-05 8.9309240418746158e-05 -2.4409401035204432e-04 2.6354728923169718e-04 0 2 0 -P 365 22 2.1224395554242417e-01 4.8081206587306669e-01 -1.4361207927576540e+00 1.5292712874909715e+00 0 1 0 0 0 0 -P 366 22 4.1026448030886967e-02 1.0734013789231003e-01 -1.7137726053839816e-01 2.0633768456202375e-01 0 1 0 0 0 0 -V -107 0 4.3736281292517583e-06 7.8584567595844059e-06 -1.2404186200301000e-05 1.5630335896051612e-05 0 2 0 -P 367 22 6.0632728091395464e-02 2.9953596761870191e-02 -4.5605230561117767e-02 8.1568270358703371e-02 0 1 0 0 0 0 -P 368 22 1.3030486076758502e-01 3.1311964620364563e-01 -4.9591895367456895e-01 6.0079853377986470e-01 0 1 0 0 0 0 -V -108 0 -1.3697641095364497e-05 -9.6097423271048161e-07 -1.4410161111415212e-05 2.4636517224285515e-05 0 2 0 -P 369 22 2.7690702351260706e-02 1.0286881774652524e-02 -2.0116122984700145e-02 3.5738681247177738e-02 0 1 0 0 0 0 -P 370 22 -1.5504829056605138e-01 -1.9221804201258064e-02 -1.1386631619291016e-01 1.9332611858605653e-01 0 1 0 0 0 0 -V -109 0 -1.2153169023578906e-05 -6.2824244005050017e-06 1.4326674711770995e-05 2.0879577567088964e-05 0 2 0 -P 371 22 -1.8133550327440726e-01 -2.1084177871680054e-02 1.5281630107905045e-01 2.3807546950450442e-01 0 1 0 0 0 0 -P 372 22 -6.7287207673414770e-02 -1.0743813451843676e-01 1.4027076936302429e-01 1.8906720975087596e-01 0 1 0 0 0 0 -V -110 0 -5.9930910720649131e-07 9.8928458623747859e-07 1.4337918863531024e-05 2.1627823622279452e-05 0 2 0 -P 373 22 1.3368502630494792e-03 7.1193937795053341e-02 5.3178847259601876e-02 8.8872682772896006e-02 0 1 0 0 0 0 -P 374 22 -6.3455584296092616e-03 -6.2926021078025848e-02 6.6649886259870242e-02 9.1881214505193501e-02 0 1 0 0 0 0 -V -111 0 0 0 0 0 0 1 0 -P 375 130 -8.4559749187529187e-01 9.9710033077653488e-03 -5.2448860633214933e-01 1.1126087660291861e+00 4.9767000000000000e-01 1 0 0 0 0 -V -112 0 -3.8983732874524748e-05 6.6885010970516116e-05 1.2195638089406324e-05 8.4203326822728840e-05 0 2 0 -P 376 22 -6.9501739814868346e-02 5.8747270131682114e-02 6.7485383437181481e-02 1.1329611892241456e-01 0 1 0 0 0 0 -P 377 22 -1.0138909794407150e-01 2.3445286016514555e-01 -1.4024037988002492e-02 2.5582135654205801e-01 0 1 0 0 0 0 -V -113 0 -1.1912408123196776e+02 9.0688833868512901e+00 -1.9297715704041471e+02 2.4795500052785277e+02 0 2 0 -P 378 -211 -4.6643829830683509e-01 -1.1593546915583072e-01 -7.8530117194117199e-01 9.3122684383985455e-01 1.3957000000000000e-01 1 0 0 0 0 -P 379 211 -1.2733627113911816e-01 1.6113936305111573e-01 -1.7659441751103602e-01 3.0470607717634451e-01 1.3957000000000000e-01 1 0 0 0 0 -V -114 0 -1.5133275992010396e-04 4.9760717101996210e-05 -1.3398603715268880e-04 2.1112016913381942e-04 0 2 0 -P 380 22 -1.1176794650841664e-01 1.9471339867306089e-02 -3.6632243387093595e-02 1.1921882484955004e-01 0 1 0 0 0 0 -P 381 22 -4.6791164082034109e-01 1.7113690629232955e-01 -4.7660078537344397e-01 6.8947621636215795e-01 0 1 0 0 0 0 -V -115 0 -2.3405923657104216e-04 1.4611123604191701e-04 -6.3978468743944869e-04 7.0271385577448068e-04 0 2 0 -P 382 22 -1.5654606706326107e-02 5.9193877959733618e-02 -1.8136750724565426e-01 1.9142401778132240e-01 0 1 0 0 0 0 -P 383 22 -3.3008524394544181e-01 1.5663386576763144e-01 -7.6368839195815341e-01 8.4658750060904175e-01 0 1 0 0 0 0 -V -116 0 0 0 0 0 0 1 0 -P 384 130 -1.7100390911822591e-01 -2.6586260149101487e-01 -5.1674196262737446e+00 5.2009447490532308e+00 4.9767000000000000e-01 1 0 0 0 0 -V -117 0 -1.5719477175582176e-05 4.6489243577943278e-05 -7.5819144246790952e-03 7.5823779450975570e-03 0 2 0 -P 385 22 -4.6933693407794318e-02 2.8454853467780084e-02 -1.9950342681093154e+00 1.9957891124047258e+00 0 1 0 0 0 0 -P 386 22 1.5719078175245767e-02 6.3860166588475972e-02 -1.3060589964743238e+01 1.3060755546194381e+01 0 1 0 0 0 0 -V -118 0 4.6249141509978390e-06 9.4614267138868386e-07 -2.0087503716210106e-03 2.0087574999136074e-03 0 2 0 -P 387 22 2.3741658257604767e-01 7.3640089833744204e-02 -8.3863686540923268e+01 8.3864054932555888e+01 0 1 0 0 0 0 -P 388 22 1.0260154843681210e-02 -2.2971575277084405e-02 -2.3710361774420765e+01 2.3710375122253165e+01 0 1 0 0 0 0 -V -119 0 8.0119424837326258e-05 -1.3313731683508782e-05 -4.5005670871262882e-01 4.5005671772315053e-01 0 2 0 -P 389 22 4.2401624770675016e-02 -5.3374706122119440e-02 -5.2723836697148852e+02 5.2723837137818316e+02 0 1 0 0 0 0 -P 390 22 2.3552360385043181e-01 7.1908758031656028e-03 -1.0339574842891241e+03 1.0339575111389108e+03 0 1 0 0 0 0 -V -120 0 -1.0574775438722866e-05 9.3918705274453874e-05 1.7646494932804896e-04 2.0299584739183731e-04 0 2 0 -P 391 22 -8.5106936416403350e-02 2.7456829559547896e-01 5.6036665343756142e-01 6.2979498716423898e-01 0 1 0 0 0 0 -P 392 22 4.2736363582437008e-02 1.0174128803230018e-01 1.4668580658605107e-01 1.8356037785023779e-01 0 1 0 0 0 0 -V -121 0 -4.3851597869865436e-05 1.0531124861711626e-04 2.7512539861286188e-04 2.9879329632975386e-04 0 2 0 -P 393 22 -2.2168226147523581e-01 5.3450139560674614e-01 1.2608632340692663e+00 1.3873034498572918e+00 0 1 0 0 0 0 -P 394 22 -2.6235155521216191e-02 6.0881532406653491e-02 2.9457331756189681e-01 3.0194086141631588e-01 0 1 0 0 0 0 -V -122 0 3.4877577943497759e-05 2.2373782240192860e-04 7.2331191609908019e-04 7.5928371084947772e-04 0 2 0 -P 395 22 -4.0112956797155415e-03 1.5481676149413653e-01 6.7269609638733785e-01 6.9029295101958354e-01 0 1 0 0 0 0 -P 396 22 1.0782252001879759e-01 5.1112676566625326e-01 1.4802027003965594e+00 1.5696739472466619e+00 0 1 0 0 0 0 -V -123 0 -3.1383658047148092e-07 -3.8483860900566085e-06 5.8223741610822792e-06 7.2589357635634373e-06 0 2 0 -P 397 22 -3.4203777351233013e-02 -7.7314876934825694e-02 2.3165639285197370e-01 2.4660124275787404e-01 0 1 0 0 0 0 -P 398 22 1.2707702234842765e-02 -1.8627834838151267e-01 1.6714412980962137e-01 2.5059582778180722e-01 0 1 0 0 0 0 -V -124 0 3.2236808159334187e-05 -4.4252594647466681e-06 7.9687775574346266e-05 8.6862496107126174e-05 0 2 0 -P 399 22 2.8048142698490619e-01 -1.6909267864752442e-03 5.3537686917943428e-01 6.0440142469161939e-01 0 1 0 0 0 0 -P 400 22 9.2426469250633983e-02 -4.9499445074743652e-02 3.8643277767653045e-01 4.0040371994231605e-01 0 1 0 0 0 0 -V -125 0 4.2009406464945751e-05 -1.2069163044297390e-05 6.3371665519486119e-05 8.0090782101313509e-05 0 2 0 -P 401 22 1.5677840685418869e-02 1.9658044984528937e-04 1.2369344343658331e-01 1.2468320368690350e-01 0 1 0 0 0 0 -P 402 22 2.4098140449885502e-01 -7.3933929715660526e-02 2.6347993526548569e-01 3.6463672273229075e-01 0 1 0 0 0 0 -V -126 0 4.1067867362733860e-05 3.2555400164699854e-05 5.5201857772271590e-05 8.2909348694607668e-05 0 2 0 -P 403 22 -4.8371529729373045e-03 6.8203982431913487e-02 6.7555697751643287e-02 9.6119475483211703e-02 0 1 0 0 0 0 -P 404 22 1.7349290496990249e-01 6.5493135264584043e-02 1.5914491837677636e-01 2.4436907309811426e-01 0 1 0 0 0 0 -V -127 0 2.2996903462980960e-06 3.5321056006164265e-07 9.0947755025366818e-06 9.7530487726669384e-06 0 2 0 -P 405 22 7.5194678532599424e-02 1.6444172407965130e-02 4.4468114488586097e-01 4.5129366392937964e-01 0 1 0 0 0 0 -P 406 22 4.2183059397594619e-02 1.5839315147350983e-03 1.9522297629404592e-02 4.6508487869585918e-02 0 1 0 0 0 0 -V -128 0 4.2478406964594337e-05 1.5680554272100167e-05 3.4601724241679823e-04 3.5122770649711978e-04 0 2 0 -P 407 22 7.0751074460728869e-02 5.8688867322594630e-02 2.8102517910808417e-01 2.9567760986873448e-01 0 1 0 0 0 0 -P 408 22 7.3374743433465395e-02 -5.4860080114057562e-03 8.9298349100003183e-01 8.9600974573741798e-01 0 1 0 0 0 0 -V -129 0 0 0 0 0 0 1 0 -P 409 130 2.5178180326027377e-01 -3.2242494783834660e-02 4.0106627287096375e+00 4.0493857073985327e+00 4.9767000000000000e-01 1 0 0 0 0 -V -130 0 9.7296294408389538e-05 -1.8057692433404323e-04 4.0892878755954612e-03 4.0976367013533495e-03 0 2 0 -P 410 22 2.2610663559113998e-02 1.5843981511661730e-02 1.7624472459684748e-01 1.7839416135329073e-01 0 1 0 0 0 0 -P 411 22 5.8407246803437063e-02 -1.6620906127341661e-01 3.2288752809096777e+00 3.2336778500954755e+00 0 1 0 0 0 0 -V -131 0 -5.9918336999371855e-06 -2.2748399729338936e-06 1.1813059477552841e-04 1.1830882340672078e-04 0 2 0 -P 412 22 -6.4079677880824115e-01 -2.9594268267928575e-01 1.2675721449920001e+01 1.2695358083139070e+01 0 1 0 0 0 0 -P 413 22 -1.4353546444437934e-01 -1.8343298954584674e-03 2.7875972997355194e+00 2.7912908303887272e+00 0 1 0 0 0 0 -V -132 0 -2.1628437162218839e-04 -1.8553738695043266e-04 4.3655499554553336e-03 4.3749458062479468e-03 0 2 0 -P 414 22 -1.8975057145655388e-01 -2.3624605238895813e-01 4.4154025237974253e+00 4.4257877178864025e+00 0 1 0 0 0 0 -P 415 22 -7.7204765374333273e-01 -5.8882294422292536e-01 1.4997827233334203e+01 1.5029224589453543e+01 0 1 0 0 0 0 -V -133 0 -1.0031594106859512e+00 -6.0662790835180747e-01 1.4756351155848559e+01 1.4803588565939812e+01 0 2 0 -P 416 -311 -5.7533254882839175e+00 -4.0301381457755010e+00 9.0395852379808090e+01 9.0669733486699556e+01 4.9767000000000000e-01 2 0 0 -165 0 -P 417 -211 -1.6323447011722816e+00 -8.8456314377591827e-01 2.1686911267723048e+01 2.1766685583656617e+01 1.3957000000000000e-01 1 0 0 0 0 -V -134 0 -2.3360926691629899e-05 -3.6259117715442567e-06 1.7025501083802078e-02 1.7025523647425003e-02 0 2 0 -P 418 22 -7.2611311153853525e-02 3.7197986780457486e-02 8.1779099887878104e+01 8.1779140583429168e+01 0 1 0 0 0 0 -P 419 22 -1.4527780310138280e-01 -7.1017137651406562e-02 7.7019024855621765e+01 7.7019194612673004e+01 0 1 0 0 0 0 -V -135 0 1.2076169997944896e-05 -1.0726917860116507e-05 3.2525658344699942e-03 3.2526134023936229e-03 0 2 0 -P 420 22 7.5246657878530437e-02 -1.4550284380572404e-01 3.7015590489964843e+01 3.7015952945424132e+01 0 1 0 0 0 0 -P 421 22 1.5872388908114299e-01 -6.2326529194992208e-02 2.6001459406053321e+01 2.6002018558447446e+01 0 1 0 0 0 0 -V -136 0 3.2332819614426833e-06 -3.0337223685055661e-05 2.7563962365646020e-03 2.7567459788091471e-03 0 2 0 -P 422 22 5.2995067612266689e-02 -1.0388453409721403e-01 1.0481693098366938e+01 1.0482341851035432e+01 0 1 0 0 0 0 -P 423 22 -3.9175857367738848e-02 -2.5778290654386461e-02 1.2992834958659103e+00 1.3001295591975057e+00 0 1 0 0 0 0 -V -137 0 3.1210382498907047e-05 -2.4228290863135666e-05 1.4586790248855876e-03 1.4593020915778690e-03 0 2 0 -P 424 22 1.4570887631797527e-01 -1.2616945494337359e-01 4.7114504656630327e+00 4.7153913197522614e+00 0 1 0 0 0 0 -P 425 22 1.1707757909111839e-01 -7.7828899667208698e-02 7.5703948639384269e+00 7.5717001322750876e+00 0 1 0 0 0 0 -V -138 0 0 0 0 0 0 1 0 -P 426 130 7.4489573882419291e-01 8.6535957172601397e-01 1.7511148478823699e+01 1.7555389865406173e+01 4.9767000000000000e-01 1 0 0 0 0 -V -139 0 0 0 0 0 0 1 0 -P 427 310 -4.7598331792509141e-01 -8.4343084301410715e-02 2.7348337649344273e+01 2.7357136573228090e+01 4.9767000000000000e-01 2 0 0 -166 0 -V -140 0 -8.3925193175608200e+01 3.9338375119302427e+01 8.7963531058230437e+03 8.7970466296407194e+03 0 2 0 -P 428 -211 -4.8915716729371289e-01 3.5379275820838541e-01 4.0094024505926598e+01 4.0098812013784375e+01 1.3957000000000000e-01 1 0 0 0 0 -P 429 211 -2.0594778188345286e-01 -2.7975227103050119e-02 3.2761197474600237e+01 3.2762154032615854e+01 1.3957000000000000e-01 1 0 0 0 0 -V -141 0 -2.3066035847172713e-06 2.2622629018241768e-05 2.6857264600342206e-03 2.6858397352112653e-03 0 2 0 -P 430 22 5.3127791655494534e-02 1.2374417391665785e-01 1.4536463780597019e+01 1.4537087549692799e+01 0 1 0 0 0 0 -P 431 22 -8.5701044998682224e-02 1.9572668409402283e-01 2.3390663781688637e+01 2.3391639655055833e+01 0 1 0 0 0 0 -V -142 0 7.4745864093440425e-06 9.3134989752651984e-06 9.7003591521736574e-05 9.8074817718559216e-05 0 2 0 -P 432 22 -5.3080603537296158e-03 6.2270797239337615e-02 7.9227269487634211e-01 7.9473382383044622e-01 0 1 0 0 0 0 -P 433 22 1.2915793110420093e-01 9.2048864231064606e-02 8.1502456738822093e-01 8.3031307951862532e-01 0 1 0 0 0 0 -V -143 0 1.6683368743087236e-04 1.0854011843115621e-04 8.8202948366584450e-03 8.8226093028841972e-03 0 2 0 -P 434 22 4.7366546711335589e-01 2.6593638108134854e-01 2.6023432393861224e+01 2.6029101303951776e+01 0 1 0 0 0 0 -P 435 22 1.7119797565636166e-01 1.5360451337469549e-01 8.0697161914225859e+00 8.0729934041534896e+00 0 1 0 0 0 0 -V -144 0 1.7954480389756124e-04 7.7724415131910377e-05 6.2927154370721232e-03 6.2958241174259407e-03 0 2 0 -P 436 22 1.1422002392478928e-01 6.4918508167836715e-03 4.3441170283238124e+00 4.3456232135063573e+00 0 1 0 0 0 0 -P 437 22 7.1395691893479074e-01 3.5202350085120604e-01 2.4681962924026539e+01 2.4694795986407076e+01 0 1 0 0 0 0 -V -145 0 -1.9609651427977344e-05 -7.4782511180791459e-06 3.8410389939440802e-04 3.8635884505955950e-04 0 2 0 -P 438 22 -1.0729773963663858e-01 -3.0268391562004265e-02 8.2224722500628999e-01 8.2977073911377908e-01 0 1 0 0 0 0 -P 439 22 3.3797644432614085e-02 2.2387159118688409e-03 6.1743533525827154e-01 6.1836371646759947e-01 0 1 0 0 0 0 -V -146 0 5.2131973766054339e-06 4.1070866662282870e-06 1.4937262112277159e-04 1.4956090324421662e-04 0 2 0 -P 440 22 1.8118299159397690e-02 2.9575529460455215e-02 2.1818118251376073e+00 2.1820874925212306e+00 0 1 0 0 0 0 -P 441 22 1.8302887004733309e-01 1.2889321762858399e-01 3.5816146721340854e+00 3.5886037240781548e+00 0 1 0 0 0 0 -V -147 0 6.1675119851635953e+00 -3.2443224410695379e+01 3.3447693202227225e+02 3.3624566849186726e+02 0 2 0 -P 442 -211 1.7168112378432487e-01 -6.2348686049339996e-01 4.8195537594747444e+00 4.8647495823360636e+00 1.3957000000000000e-01 1 0 0 0 0 -P 443 211 1.4202736966257906e-01 -1.0267272091220803e+00 1.2193506724211735e+01 1.2238277107255811e+01 1.3957000000000000e-01 1 0 0 0 0 -V -148 0 0 0 0 0 0 2 0 -P 444 211 -1.8843760989747041e-01 -5.7132487376221974e-01 7.0005634871052020e+00 7.0277514018421163e+00 1.3957000000000000e-01 1 0 0 0 0 -P 445 -211 2.1778470945671029e-02 -2.4462331826562256e-01 9.8717902473717956e-01 1.0267994358281778e+00 1.3957000000000000e-01 1 0 0 0 0 -V -149 0 3.3815872655375920e-05 -8.8706576341638220e-05 1.2225849291934955e-03 1.2273011627084497e-03 0 2 0 -P 446 22 4.1946401175051981e-02 -2.3452337052872346e-01 2.8068387162995183e+00 2.8169317157527307e+00 0 1 0 0 0 0 -P 447 22 4.8588031729018710e-02 -2.9686399776247515e-03 4.6635888441359208e-01 4.6889254496324323e-01 0 1 0 0 0 0 -V -150 0 -2.2719145518260682e-06 -7.2370955710423777e-06 3.6860335163427627e-05 3.7773350362741714e-05 0 2 0 -P 448 22 -2.8163592205792350e-03 -2.1581075512772691e-01 1.0509549888338077e+00 1.0728879729322758e+00 0 1 0 0 0 0 -P 449 22 -9.1354270497869719e-02 -8.4166128558272837e-02 4.7690219716075166e-01 4.9281360126465479e-01 0 1 0 0 0 0 -V -151 0 5.9843090047528281e-05 1.4190501461534226e-05 4.7124887992592318e-05 8.8409686466827799e-05 0 2 0 -P 450 22 2.0924146209939254e-01 4.3206977463747263e-02 1.2033302804903956e-01 2.4521188797139343e-01 0 1 0 0 0 0 -P 451 22 -1.9531428350450693e-02 1.7786760017401684e-03 2.9058724355280816e-02 3.5057807160233830e-02 0 1 0 0 0 0 -V -152 0 1.0195251485624900e-05 -6.1441143182856532e-06 -2.1372642871293361e-04 2.1411731095032145e-04 0 2 0 -P 452 22 1.9533270339594799e-01 -1.0471989149621931e-01 -4.8287806447212560e+00 4.8338642549750723e+00 0 1 0 0 0 0 -P 453 22 7.6955925907224484e-02 -5.9373409033625792e-02 -8.7929594389071397e-01 8.8465178074493211e-01 0 1 0 0 0 0 -V -153 0 -4.3180098738504445e-06 3.6940653122024246e-05 -1.1210974792840959e-03 1.1221856762077622e-03 0 2 0 -P 454 22 -7.1590286058456104e-02 5.2136269562120231e-02 -1.7161269640007177e+00 1.7184106366733500e+00 0 1 0 0 0 0 -P 455 22 5.3670388799414187e-02 1.0116877789444984e-01 -2.9364681511251565e+00 2.9387005350710602e+00 0 1 0 0 0 0 -V -154 0 -6.2729864115820472e-05 3.8527483842666313e-06 -7.1346638364952423e-03 7.1350986443538779e-03 0 2 0 -P 456 22 -6.4640508041547584e-02 -3.2289955193366408e-02 -3.2563504549031794e+00 3.2571520261778351e+00 0 1 0 0 0 0 -P 457 22 -1.1367821570845126e-01 4.3241950459031744e-02 -1.7024964794881363e+01 1.7025399227916957e+01 0 1 0 0 0 0 -V -155 0 -3.5839923770696304e-05 -5.3781827995199834e-05 -5.0483021503518492e-03 5.0487597996870161e-03 0 2 0 -P 458 22 -1.7396435578211061e-01 -1.7417492837193710e-01 -1.5179023412587368e+01 1.5181019473758385e+01 0 1 0 0 0 0 -P 459 22 -5.5639920627447256e-02 -1.7037205726974725e-01 -1.7162333386727944e+01 1.7163269202452724e+01 0 1 0 0 0 0 -V -156 0 4.5507577628584387e-06 1.9190966414477778e-05 9.0194798894498126e-06 2.2478153082292885e-05 0 2 0 -P 460 22 5.3961060971557492e-02 7.9158052349659946e-02 -1.0977173258833227e-03 9.5807089175567753e-02 0 1 0 0 0 0 -P 461 22 4.9996200145225052e-02 3.5923933344749981e-01 2.0713822197716783e-01 4.1768260884148362e-01 0 1 0 0 0 0 -V -157 0 -5.1581249311847977e-06 -1.1016643111822161e-05 -1.5916397208488843e-05 2.0083167502314703e-05 0 2 0 -P 462 22 -3.1716501142518883e-01 -5.8150051590051388e-01 -7.7670585418244320e-01 1.0207881652851305e+00 0 1 0 0 0 0 -P 463 22 -1.7159394224262578e-01 -4.6238326591962625e-01 -7.3145491151569741e-01 8.8219558670246279e-01 0 1 0 0 0 0 -V -158 0 0 0 0 0 0 1 0 -P 464 310 5.4533423118825564e-01 -2.1932503402815775e+00 -4.1527351550146987e+00 4.7540110617715117e+00 4.9767000000000000e-01 2 0 0 -167 0 -V -159 0 -2.9899249577558377e-04 -2.0228382203658472e-05 -1.1079387539825041e-04 3.2221826826116836e-04 0 2 0 -P 465 22 -8.3346775443643040e-01 -4.8634651175075268e-02 -3.5562649196823404e-01 9.0747122751625553e-01 0 1 0 0 0 0 -P 466 22 -1.3303388673837305e-01 -1.6754162505457412e-02 -2.5178224124823680e-03 1.3410837562090722e-01 0 1 0 0 0 0 -V -160 0 3.8723550913267867e-05 1.2516057721069469e-04 1.2893485008857004e-03 1.2961934460564023e-03 0 2 0 -P 467 22 9.4494307196249280e-02 1.2938868819578370e-01 1.7092391437658199e+00 1.7167320866421871e+00 0 1 0 0 0 0 -P 468 22 1.3186361989659259e-01 6.0223555965823572e-01 5.8276278810181124e+00 5.8601469608866257e+00 0 1 0 0 0 0 -V -161 0 0 0 0 0 0 1 0 -P 469 130 5.0093079509551341e-01 -1.6736784839411437e-01 6.2499799234045614e+00 6.2919685417213573e+00 4.9767000000000000e-01 1 0 0 0 0 -V -162 0 1.1030443660979173e-04 -2.8860204694531712e-05 5.9693928234557251e-05 1.3299857732767785e-04 0 2 0 -P 470 22 2.5718881712629815e-01 -1.7110260067217876e-02 7.9616960930951566e-02 2.6977344035740969e-01 0 1 0 0 0 0 -P 471 22 1.8665769195734039e-01 -9.9018351789270556e-02 1.6058137083810370e-01 2.6539047574875341e-01 0 1 0 0 0 0 -V -163 0 0 0 0 0 0 1 0 -P 472 310 4.7336032540883582e-01 1.9957792363092278e-01 3.8244208976342740e+01 3.8250896682304671e+01 4.9767000000000000e-01 2 0 0 -168 0 -V -164 0 5.0645331992271131e-05 2.4931089480602684e-04 3.5585773943948317e-03 3.5682115136422437e-03 0 2 0 -P 473 22 5.6913977335912823e-02 7.9267004492891840e-02 9.6228112476905237e-01 9.6721632632222521e-01 0 1 0 0 0 0 -P 474 22 5.2001694195469371e-02 4.5689027713045866e-01 6.6906422812036404e+00 6.7064258019130722e+00 0 1 0 0 0 0 -V -165 0 -1.0031594106859512e+00 -6.0662790835180747e-01 1.4756351155848559e+01 1.4803588565939812e+01 0 1 0 -P 475 130 -5.7533254882839175e+00 -4.0301381457755010e+00 9.0395852379808090e+01 9.0669733486699556e+01 4.9767000000000000e-01 1 0 0 0 0 -V -166 0 -2.1954338730932741e+00 -3.8902553359153652e-01 1.2614195621370837e+02 1.2618254052583406e+02 0 2 0 -P 476 -211 -3.8419677861900481e-01 1.0373514257599888e-01 1.3727450016645596e+01 1.3733926310014542e+01 1.3957000000000000e-01 1 0 0 0 0 -P 477 211 -9.1786539306086476e-02 -1.8807822687740958e-01 1.3620887632698674e+01 1.3623210263213544e+01 1.3957000000000000e-01 1 0 0 0 0 -V -167 0 6.0843234933367697e+01 -2.4470212594333566e+02 -4.6332290584815917e+02 5.3040758376185750e+02 0 2 0 -P 478 211 4.3923811914830291e-01 -1.9192225167157120e+00 -3.3556575631746446e+00 3.8931045015736121e+00 1.3957000000000000e-01 1 0 0 0 0 -P 479 -211 1.0609611203995273e-01 -2.7402782356586536e-01 -7.9707759184005411e-01 8.6090656019789924e-01 1.3957000000000000e-01 1 0 0 0 0 -V -168 0 1.7832638234533317e+01 7.5185872593688456e+00 1.4407526500071178e+03 1.4410045922055583e+03 0 2 0 -P 480 211 -1.6780378320731124e-02 1.2970062371486263e-02 4.2224922518224925e+00 4.2248515246355689e+00 1.3957000000000000e-01 1 0 0 0 0 -P 481 -211 4.9014070372956692e-01 1.8660786125943651e-01 3.4021716724520246e+01 3.4026045157669103e+01 1.3957000000000000e-01 1 0 0 0 0 -BlockType GenEvent -E 7 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 146 0 0 -V -1 0 0 0 0 0 1 2 0 -P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -1 0 -P 3 2 9.5585977786327769e-02 7.9414932775068517e-02 2.4315489624226007e+02 2.4315492799858069e+02 0 3 0 0 -3 0 -P 24 2101 -9.5585977786327769e-02 -7.9414932775068517e-02 6.5004858943937879e+03 6.5004859213968966e+03 5.7933000000000001e-01 2 0 0 -17 0 -V -2 0 0 0 0 0 1 3 0 -P 2 2212 0 0 -6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -2 0 -P 4 21 -3.1839018050093307e-03 5.0554804870918790e-01 -2.5725369994220681e+01 2.5730337158815754e+01 0 3 0 0 -4 0 -P 12 2101 3.8701429021918715e-01 -2.0438006852161128e-01 -5.1057965796384815e+03 5.1057966312635817e+03 5.7933000000000001e-01 2 0 0 -9 0 -P 33 2 -3.8383038841417783e-01 -3.0116798018757662e-01 -1.4059242432952470e+02 1.4059365813141250e+02 3.3000000000000002e-01 2 0 0 -17 0 -V -3 0 0 0 0 0 0 3 0 -P 5 2 -2.1264769648708381e-01 8.3899334394629999e-01 2.3005421402360733e+02 2.3005584217509832e+02 0 3 0 0 -5 0 -P 25 21 -3.6511185605667584e-03 -1.4425395575640334e+00 8.1652186717378754e+00 8.2916662778419035e+00 0 2 0 0 -17 0 -P 26 21 2.9593935486652639e-01 6.8709099958216890e-01 4.0361549279216140e+00 4.1049020384963599e+00 0 2 0 0 -17 0 -V -4 0 0 0 0 0 0 4 0 -P 6 -3 -1.9831035912957480e+00 8.3830206726540324e-01 -1.1595024534665217e+01 1.1793220262900215e+01 0 3 0 0 -5 0 -P 11 3 -2.8557959363283214e-01 -1.4780078065351945e+00 -1.0810465318999622e+01 1.0926217240828231e+01 5.0000000000000000e-01 2 0 0 -9 0 -P 31 21 1.2172273336784700e+00 -4.7627796523471329e-02 -9.7231787370062306e-01 1.5586253033918638e+00 0 2 0 0 -17 0 -P 32 21 1.0642173874125529e+00 1.1887517313130824e+00 -1.4482536478625649e+00 2.1547918588388710e+00 0 2 0 0 -17 0 -V -5 0 0 0 0 0 0 2 0 -P 7 22 1.4000883323926923e+00 -8.2378971281789837e-02 8.3381755872705611e+01 8.3393550386399113e+01 0 3 0 0 -6 0 -P 8 24 -3.5958396201755241e+00 1.7596743824934931e+00 1.3507743361623650e+02 1.5845551205159941e+02 8.2741825642653993e+01 3 0 0 -7 0 -V -6 0 0 0 0 0 0 1 0 -P 9 22 1.4000883323926923e+00 -8.2378971281789837e-02 8.3381755872705611e+01 8.3393550386399113e+01 0 1 0 0 0 0 -V -7 0 0 0 0 0 0 1 0 -P 10 24 -3.5958396201755241e+00 1.7596743824934931e+00 1.3507743361623650e+02 1.5845551205159941e+02 8.2741825642653993e+01 2 0 0 -8 0 -V -8 0 0 0 0 0 0 7 0 -P 13 2 -4.9357754672154250e+00 1.4347517927759370e+00 5.9322107559486689e+01 5.9545291480258513e+01 3.3000000000000002e-01 2 0 0 -11 0 -P 14 21 -6.6611694690988275e+00 2.4614122585280231e+00 7.0400917686742488e+01 7.0758172249839646e+01 0 2 0 0 -11 0 -P 15 21 -1.1364538745352168e+00 -8.4363652633784314e-01 1.5206113213728849e+00 2.0773802704860946e+00 0 2 0 0 -11 0 -P 16 21 -7.0207935266386619e+00 -9.6120038752047388e-01 5.9385495803026025e+00 9.2456378388066369e+00 0 2 0 0 -11 0 -P 17 21 1.9233062830932506e+00 -9.9992930184166651e-01 2.0384347101481007e-01 2.1772730255856527e+00 0 2 0 0 -11 0 -P 18 21 6.5191036641582967e+00 1.4569596471037023e+00 -1.4166998204938244e+00 6.8285051349997472e+00 0 2 0 0 -11 0 -P 19 -3 7.7159427700610506e+00 -7.8868310021418342e-01 -8.9189618218918798e-01 7.8232520516230650e+00 5.0000000000000000e-01 2 0 0 -11 0 -V -9 0 0 0 0 0 0 1 0 -P 38 92 1.0143469658635501e-01 -1.6823878750568058e+00 -5.1166070449574809e+03 5.1167228485044097e+03 3.4383356156668995e+01 2 0 0 -10 0 -V -10 0 0 0 0 0 0 8 0 -P 39 -313 -2.1040013596164128e-01 -5.8425235058654956e-01 -1.1872843281185203e+01 1.1925692262405972e+01 9.3386794122427452e-01 2 0 0 -23 0 -P 40 113 -2.6276647691303950e-01 -5.6521457952856013e-01 -1.1962401435561386e+01 1.1993068060118460e+01 5.8831934084434256e-01 2 0 0 -24 0 -P 41 -211 2.1202252232348538e-02 1.2037186058540997e-01 -3.8928936098051310e+01 3.8929378166513047e+01 1.3957000000000000e-01 1 0 0 0 0 -P 42 2114 -3.0865407405585576e-01 -4.5752156743261424e-01 -6.0439787274539817e+01 6.0455579370402425e+01 1.2667272387158715e+00 2 0 0 -25 0 -P 43 223 7.5934744704867152e-01 -4.5802192101885630e-02 -7.5778630043207073e+01 7.5786642607491785e+01 7.9732057812523760e-01 2 0 0 -26 0 -P 44 -3114 -4.7130125309522669e-01 -3.6998042550758815e-02 -1.6236037253483892e+02 1.6236696425649211e+02 1.3845643686705831e+00 2 0 0 -27 0 -P 45 -311 3.9338164815186982e-01 1.5120222274855744e-01 -1.5841292434872400e+02 1.5841426667878346e+02 4.9767000000000000e-01 2 0 0 -28 0 -P 46 2112 1.8062528917922832e-01 -2.6417322619040490e-01 -4.5968511499413735e+03 4.5968512571022029e+03 9.3957000000000002e-01 1 0 0 0 0 -V -11 0 0 0 0 0 0 1 0 -P 47 92 -3.5958396201755329e+00 1.7596743824934951e+00 1.3507743361623648e+02 1.5845551205159936e+02 8.2741825642653964e+01 2 0 0 -12 0 -V -12 0 0 0 0 0 0 19 0 -P 48 213 -4.6020701303904872e+00 1.4837736955946597e+00 4.4190052474360535e+01 4.4457621785313627e+01 5.8203372280644805e-01 2 0 0 -29 0 -P 49 111 6.6697298340082936e-02 -2.7309372095162640e-02 1.5613189066221931e+00 1.5687991139677566e+00 1.3497999999999999e-01 2 0 0 -30 0 -P 50 -213 -1.2537860530518419e+00 6.3570399222428886e-01 2.3101138766532216e+01 2.3148198586365478e+01 4.4764545197942257e-01 2 0 0 -31 0 -P 51 223 -4.9718024532112670e+00 1.2416775214387061e+00 4.4371163546531150e+01 4.4672913013609495e+01 7.8001278675560926e-01 2 0 0 -32 0 -P 52 211 2.0193990881854440e-01 1.9756624416254592e-01 8.6476093093118023e-01 9.2038220331072151e-01 1.3957000000000000e-01 1 0 0 0 0 -P 53 3112 -7.0584972907924126e-01 -6.5661601113311763e-02 9.0004313706404595e+00 9.1073685934583164e+00 1.1974400000000001e+00 2 0 0 -33 0 -P 54 -3212 -1.3667402501295773e+00 -6.0384937118763382e-01 5.0703170378781293e+00 5.4187547777607730e+00 1.1925500000000000e+00 2 0 0 -34 0 -P 55 211 -2.6364081709202364e-01 7.3413299932848253e-01 2.6874106938374962e+00 2.8018054470987304e+00 1.3957000000000000e-01 1 0 0 0 0 -P 56 -213 -3.4695940866764934e+00 -5.0692299600103696e-01 3.4058985381402325e+00 4.9419726631930434e+00 7.2656376283600244e-01 2 0 0 -35 0 -P 57 111 -2.2664032636498591e-01 -6.4174781661402613e-01 5.5446080822234844e-01 8.8817368004139652e-01 1.3497999999999999e-01 2 0 0 -36 0 -P 58 113 -5.0290045956692175e-01 -2.2402253400552827e-02 4.2604824703776056e-01 1.0487762353368946e+00 8.1547762066989726e-01 2 0 0 -37 0 -P 59 213 -1.2005200767227959e+00 6.2152297680195367e-02 1.6050487128422106e+00 2.2598983813267526e+00 1.0420402874195425e+00 2 0 0 -38 0 -P 60 -213 -2.9276047393825264e-02 -5.2442944213790954e-01 9.3491138108836302e-02 9.6897732639620227e-01 8.0888388501252917e-01 2 0 0 -39 0 -P 61 213 4.8741035118588283e-01 -5.4382265811505015e-01 -2.1420018845659008e-01 9.8970129623833414e-01 6.3270451327498556e-01 2 0 0 -40 0 -P 62 -211 1.8697788601233423e-01 4.2760734454290197e-02 -2.6920172278503485e-01 3.5880156454388884e-01 1.3957000000000000e-01 1 0 0 0 0 -P 63 211 1.2983839367590966e-01 -2.1540737154801419e-02 3.5452183158205530e-01 4.0309741477440403e-01 1.3957000000000000e-01 1 0 0 0 0 -P 64 311 4.6391648249289439e+00 8.7190463208380886e-01 -2.7041866263032449e-01 4.7542475369195865e+00 4.9767000000000000e-01 2 0 0 -41 0 -P 65 -323 2.2512956578581989e+00 -8.1702811801166697e-01 -6.8930905945599441e-01 2.6161470913906841e+00 7.9574590142266011e-01 2 0 0 -42 0 -P 66 323 7.0336564886840316e+00 2.6471663135766954e-01 -7.6549975370238721e-01 7.1298753405532898e+00 8.4067473090788580e-01 2 0 0 -43 0 -V -13 0 0 0 0 0 2 1 0 -P 20 3 2.9480913835759774e+00 -4.2454566557718891e+00 -4.1875620167901211e+01 4.2193396514955836e+01 0 2 0 0 -13 0 -P 21 -3 -2.9480913835759774e+00 4.2454566557718891e+00 -1.4413638757204703e+02 1.4422903094502612e+02 0 2 0 0 -13 0 -P 67 92 0 0 -1.8601200773994825e+02 1.8642242745998198e+02 1.2363431426010967e+01 2 0 0 -14 0 -V -14 0 0 0 0 0 0 7 0 -P 68 -313 6.7124336041434551e-01 -1.0017568531182413e+00 -1.2051454636583410e+01 1.2140615058432582e+01 8.3838576904817708e-01 2 0 0 -44 0 -P 69 111 1.8807531206737291e+00 -2.0970278275644705e+00 -2.6588570500903835e+01 2.6737708557249952e+01 1.3497999999999999e-01 2 0 0 -45 0 -P 70 113 -1.1068971892740748e-01 -5.1341043207208503e-01 -9.0115038018838742e+00 9.0608170742198180e+00 7.8445063290764161e-01 2 0 0 -46 0 -P 71 223 -2.0672406052829917e-01 1.7379335103852600e-01 -1.3130580146872006e+01 1.3156750961396625e+01 7.8423332032961013e-01 2 0 0 -47 0 -P 72 113 -4.4140526611159947e-01 5.7742869906215955e-01 -2.4813075874939347e+01 2.4836133069027387e+01 7.8518082980101878e-01 2 0 0 -48 0 -P 73 -211 7.7896309901419436e-02 -3.6602920137854170e-02 -1.3397448490641568e+00 1.3497420695647062e+00 1.3957000000000000e-01 1 0 0 0 0 -P 74 323 -1.8710737454221880e+00 2.8975759827919654e+00 -9.9077077929701588e+01 9.9140660670090867e+01 8.4045432777846174e-01 2 0 0 -49 0 -V -15 0 0 0 0 0 2 1 0 -P 22 3 -2.3797373606868244e+00 -2.4917871101526390e+00 -4.3280761946634883e+00 5.5321240455167233e+00 0 2 0 0 -15 0 -P 23 -3 2.3797373606868244e+00 2.4917871101526390e+00 -9.6661085500222009e+02 9.6661699610602295e+02 0 2 0 0 -15 0 -P 75 92 0 0 -9.7093893119688357e+02 9.7214912015153971e+02 4.8492305551150785e+01 2 0 0 -16 0 -V -16 0 0 0 0 0 0 9 0 -P 76 -323 -2.2398361126526320e+00 -2.4341442137074423e+00 -4.8632735500917565e+00 5.9530803627759008e+00 9.1968055213627808e-01 2 0 0 -50 0 -P 77 111 -6.7528675734192661e-02 -1.2563759364867366e-01 -1.7655103539140375e+00 1.7763984173495295e+00 1.3497999999999999e-01 2 0 0 -51 0 -P 78 113 1.5354061763556762e-01 6.2318321309839064e-01 -1.0151106705392891e+01 1.0185911304933418e+01 5.4395747016322149e-01 2 0 0 -52 0 -P 79 111 -1.6671670434852973e-01 -5.1368748512571094e-01 -7.9559061682556891e+00 7.9753577882357432e+00 1.3497999999999999e-01 2 0 0 -53 0 -P 80 211 -9.6736485997603927e-02 5.1279243800840213e-01 -4.1217511496160233e+00 4.1569972764560212e+00 1.3957000000000000e-01 1 0 0 0 0 -P 81 111 4.4784540883304857e-02 -6.3293049003740509e-01 -2.8876930883969312e+01 2.8884216512452983e+01 1.3497999999999999e-01 2 0 0 -54 0 -P 82 -211 -1.1552696499474494e-01 2.9652397766424610e-01 -1.5381300035866197e+01 1.5385224844870098e+01 1.3957000000000000e-01 1 0 0 0 0 -P 83 213 1.3734383108429742e+00 1.9976391213286977e+00 -5.6939502407682789e+02 5.6940054246694490e+02 6.3829722452204496e-01 2 0 0 -55 0 -P 84 313 1.1145814743658564e+00 2.7626103241949523e-01 -3.2842812827294995e+02 3.2843139117752128e+02 9.0810677110516835e-01 2 0 0 -56 0 -V -17 0 0 0 0 0 4 1 0 -P 27 21 -3.2798144322212153e+00 8.7986496652623636e-01 2.4766780065185029e+02 2.4769107942110830e+02 0 2 0 0 -17 0 -P 28 21 3.2798144322212153e+00 -8.7986496652623636e-01 5.5985508273586087e+00 6.5479093179154937e+00 0 2 0 0 -17 0 -P 29 21 -3.7733390949497778e+00 9.0629369874865717e-01 -3.3241294584168473e+00 5.1097253204240456e+00 0 2 0 0 -17 0 -P 30 21 3.7733390949497778e+00 -9.0629369874865717e-01 -1.2185775397046967e+01 1.2788767658423664e+01 0 2 0 0 -17 0 -P 85 92 2.0943165911964767e+00 5.0924638451013138e-03 6.6074307187661043e+03 6.9293270467247485e+03 2.0874453839536136e+03 2 0 0 -18 0 -V -18 0 0 0 0 0 0 36 0 -P 86 113 2.9356129599336628e-01 -4.3313617556154632e-01 1.5897828498253559e+03 1.5897830714807062e+03 6.5649266342745860e-01 2 0 0 -57 0 -P 87 2112 -1.1641820817776909e-01 7.5916177472945279e-01 1.5838148551780225e+03 1.5838153200907500e+03 9.3957000000000002e-01 1 0 0 0 0 -P 88 113 2.7160958203151061e-02 -4.0515716778460686e-01 1.6165720701806258e+03 1.6165722765277476e+03 7.0870302833514009e-01 2 0 0 -58 0 -P 89 111 -1.4385672069497962e-01 9.5872413866507322e-01 7.8787988037092839e+02 7.8788048837348356e+02 1.3497999999999999e-01 2 0 0 -59 0 -P 90 -2214 -3.6919767591725938e-01 -8.0507840752899340e-01 8.0872498075085002e+02 8.0872637466061587e+02 1.2124863189911272e+00 2 0 0 -60 0 -P 91 211 3.5761092944521689e-01 -5.0085597321715558e-01 3.0003167406315214e+01 3.0009803006335137e+01 1.3957000000000000e-01 1 0 0 0 0 -P 92 2114 -9.8516795397972409e-02 -1.4151599991198704e-01 6.0200362965077282e+01 6.0212675769296112e+01 1.2053587989159509e+00 2 0 0 -61 0 -P 93 223 -6.6801252072040476e-02 3.4914305837557824e-01 1.7318687060519537e+01 1.7340112417543374e+01 7.8499291101563418e-01 2 0 0 -62 0 -P 94 223 1.0880283197397357e-01 -1.1874086178082427e-01 5.9048803867980695e+00 5.9574951798301630e+00 7.7343324650876888e-01 2 0 0 -63 0 -P 95 223 -1.1326999883260454e-01 -3.7014701840945025e-01 2.2018767133093363e+01 2.2035600678331608e+01 7.6925436990825247e-01 2 0 0 -64 0 -P 96 211 1.7074748485127106e-02 3.1351296613888224e-01 1.0137555013396343e+01 1.0143376329482720e+01 1.3957000000000000e-01 1 0 0 0 0 -P 97 221 -2.4049267933068028e-01 -5.2371012095719160e-01 1.4536298958950805e+01 1.4558014904034785e+01 5.4744999999999999e-01 2 0 0 -65 0 -P 98 -211 -2.7609773133260801e-01 -5.7044915366057758e-01 6.8816596070175269e+00 6.9121893004977597e+00 1.3957000000000000e-01 1 0 0 0 0 -P 99 211 -3.2003753499352694e-01 5.9754365375792062e-01 1.9274593244220643e+01 1.9287013946098735e+01 1.3957000000000000e-01 1 0 0 0 0 -P 100 223 -3.4604842053761919e-01 3.1486430485676520e-01 6.2632131591575501e+01 6.2638853372545277e+01 7.8940172470456005e-01 2 0 0 -66 0 -P 101 111 2.2948981413776891e-02 5.5605194404662266e-02 1.1648969035652028e+00 1.1742329367414746e+00 1.3497999999999999e-01 2 0 0 -67 0 -P 102 111 -2.9172378240014335e-01 3.0693544637119191e-01 5.3046712918767929e+00 5.3232573908011185e+00 1.3497999999999999e-01 2 0 0 -68 0 -P 103 -213 3.2106496746452690e-01 2.1715005346640492e-01 1.8335690284947212e+01 1.8357740097185115e+01 8.1169353282945367e-01 2 0 0 -69 0 -P 104 211 -4.1566685736877346e-01 -2.4857973476376449e-01 7.6291201423937034e+00 7.6457520724142878e+00 1.3957000000000000e-01 1 0 0 0 0 -P 105 221 -2.5513573334891759e-01 3.0928061930424477e-01 4.8173473574429913e+01 4.8178252422360707e+01 5.4744999999999999e-01 2 0 0 -70 0 -P 106 223 -7.4215211736769937e-01 -2.4846169610654173e-01 2.0946282884976224e+01 2.0974976715559247e+01 7.6834792969024879e-01 2 0 0 -71 0 -P 107 113 2.4449291316315186e-01 -4.2766229921875031e-02 1.6107139368476123e+01 1.6128248722013453e+01 7.8667812261840997e-01 2 0 0 -72 0 -P 108 223 4.7207387017201917e-02 -3.2716583505686320e-01 2.1203916701555983e+00 2.2765517765484846e+00 7.5984283600187197e-01 2 0 0 -73 0 -P 109 -2212 9.4887946882507612e-01 4.1648238312682367e-01 3.2378432709009703e+00 3.5267278689504029e+00 9.3827000000000005e-01 1 0 0 0 0 -P 110 223 1.6600334088172941e-01 -4.1616381624079307e-01 2.6794215643440502e+00 2.8255103226053060e+00 7.7682638507277058e-01 2 0 0 -74 0 -P 111 2212 1.5707280006131925e+00 1.9053939806349487e-01 4.0977610121829917e+00 4.4917132165791367e+00 9.3827000000000005e-01 1 0 0 0 0 -P 112 221 -1.1579086126404439e+00 9.9177839411389315e-02 -7.1473619559073187e-01 1.4700809266311647e+00 5.4744999999999999e-01 2 0 0 -75 0 -P 113 -213 -1.0802536131659559e+00 -4.3742284486781746e-02 -8.7239930641296504e-01 1.8065991907361469e+00 1.1549280626638436e+00 2 0 0 -76 0 -P 114 -311 -1.2221059279354842e+00 7.8797526225771200e-02 -6.0729148702831515e-01 1.4547268913275133e+00 4.9767000000000000e-01 2 0 0 -77 0 -P 115 323 1.7061356136889678e+00 -2.9014219266128297e-02 -5.6916355500633795e+00 6.0003241000917313e+00 8.3512484945562682e-01 2 0 0 -78 0 -P 116 -213 5.0727937246066324e-01 -4.7763269349581511e-01 -1.4192395564892897e+00 1.7279116972796664e+00 6.9711732389306924e-01 2 0 0 -79 0 -P 117 113 1.8377335751287966e+00 3.7435212119187783e-01 -6.4021253801990987e+00 6.7571572558931825e+00 1.0745048130573336e+00 2 0 0 -80 0 -P 118 113 1.1595987846627662e+00 3.3781193392132147e-01 -1.7297809040002605e+00 2.3075689039392140e+00 9.3485080440263357e-01 2 0 0 -81 0 -P 119 211 2.7239080429789903e-01 -2.2711690982550835e-02 -1.2958981254113522e-01 3.3314542708521427e-01 1.3957000000000000e-01 1 0 0 0 0 -P 120 113 2.1267666995458101e-01 1.7395120076323969e-01 -1.6083970877226670e+00 1.8184518290999967e+00 8.0270509950570113e-01 2 0 0 -82 0 -P 121 221 -4.7135039096220882e-01 -1.2291206979554646e-01 -1.3887351759484287e+02 1.3887545092360841e+02 5.4744999999999999e-01 2 0 0 -83 0 -V -19 0 0 0 0 0 2 1 0 -P 34 21 -1.7804898284392838e+00 -2.5209727458596531e+00 -1.6027171333206104e+02 1.6030142713653206e+02 0 2 0 0 -19 0 -P 35 21 1.7804898284392838e+00 2.5209727458596531e+00 -3.9047632682122253e+00 4.9772104431420550e+00 0 2 0 0 -19 0 -P 122 92 0 0 -1.6417647660027328e+02 1.6527863757967410e+02 1.9055512885072925e+01 2 0 0 -20 0 -V -20 0 0 0 0 0 0 12 0 -P 123 -211 -6.0070155236750178e-01 3.1318832669430013e-01 -2.3722419674713313e+00 2.4710202387124545e+00 1.3957000000000000e-01 1 0 0 0 0 -P 124 -313 -5.5418962740188848e-01 5.6022873335349721e-01 -2.6963373036122778e+01 2.6989313170610149e+01 8.8235908753902637e-01 2 0 0 -84 0 -P 125 -3122 7.8192980547996760e-01 -1.0098791190461021e+00 -2.5752937819053422e+01 2.5808715935323384e+01 1.1156800000000000e+00 2 0 0 -85 0 -P 126 2112 -5.2911926360048755e-01 -7.0628422357488740e-01 -3.1365989018949879e+01 3.1392465075577743e+01 9.3957000000000002e-01 1 0 0 0 0 -P 127 -313 -6.6375047799976095e-01 -5.2431994602761678e-01 -3.0745812034728321e+01 3.0766432948134987e+01 7.4361453347412232e-01 2 0 0 -86 0 -P 128 323 -1.0010822452572499e-01 2.3468051859673056e-01 -2.0435238020895113e+01 2.0455561586261695e+01 8.7518582957059732e-01 2 0 0 -87 0 -P 129 -2212 7.6440809257191722e-01 -3.6826018672418046e-03 -3.6284282265723400e+00 3.8249412128597280e+00 9.3827000000000005e-01 1 0 0 0 0 -P 130 331 -2.1598897730547920e-01 3.8740437897781693e-01 -2.8085273570100782e+00 3.0002184788953326e+00 9.5747146947695072e-01 2 0 0 -88 0 -P 131 2114 3.7114271301432933e-01 1.6103528252915164e-01 -3.1873923166002567e+00 3.4301830299056255e+00 1.2012520814081056e+00 2 0 0 -89 0 -P 132 213 1.4340847993733810e-01 8.3134947437200180e-01 -7.5071475809012984e+00 7.6369252082162546e+00 1.1196668673315859e+00 2 0 0 -90 0 -P 133 111 2.5133273495763248e-01 1.9971281449766987e-01 -1.8807651137350476e+00 1.9127337413708869e+00 1.3497999999999999e-01 2 0 0 -91 0 -P 134 223 3.5163629723965795e-01 -4.4343363850532036e-01 -7.5286241082333785e+00 7.5901269538058527e+00 7.8074626769700195e-01 2 0 0 -92 0 -V -21 0 0 0 0 0 2 1 0 -P 36 21 -7.9835767352754738e-01 2.8310917836013409e+00 -4.9511789036910145e+01 4.9599089803115852e+01 0 2 0 0 -21 0 -P 37 21 7.9835767352754738e-01 -2.8310917836013409e+00 -3.3864087660105230e+02 3.3865365162772304e+02 0 2 0 0 -21 0 -P 135 92 0 0 -3.8815266563796246e+02 3.8825274143083885e+02 8.8147255604432342e+00 2 0 0 -22 0 -V -22 0 0 0 0 0 0 9 0 -P 136 2114 -1.4960565618058827e-01 -3.7983243334584205e-01 -6.0084225372661976e+01 6.0097896107156856e+01 1.2150404701074575e+00 2 0 0 -93 0 -P 137 -211 2.9811563003694558e-01 5.4783511804293061e-01 -4.4437689646128113e+01 4.4442285462337956e+01 1.3957000000000000e-01 1 0 0 0 0 -P 138 -3112 2.3307186571895475e-01 1.4326900914430873e-01 -2.7582276932951583e+01 2.7609612671372336e+01 1.1974400000000001e+00 2 0 0 -94 0 -P 139 -323 -2.7304396428318978e-01 8.3408142249412254e-01 -4.6194743956008772e+01 4.6211892601868342e+01 9.0244327224705545e-01 2 0 0 -95 0 -P 140 113 -1.2438472963311790e-01 -5.3617617384831562e-01 -3.5265788970736466e+01 3.5278430062698547e+01 7.6733272432928068e-01 2 0 0 -96 0 -P 141 321 1.7857873999080959e-01 3.3202431338286048e-01 -2.0117667576333965e+01 2.0127253170339291e+01 4.9359999999999998e-01 1 0 0 0 0 -P 142 -321 -8.8311177964749923e-02 -9.5005248461867819e-01 -1.2922147930037769e+02 1.2922594457819073e+02 4.9359999999999998e-01 1 0 0 0 0 -P 143 111 -1.3174275413026160e-01 -1.9950654911601931e-01 -4.1534180411145236e+00 4.1624824373277072e+00 1.3497999999999999e-01 2 0 0 -97 0 -P 144 211 5.7322046445197547e-02 2.0835777786463264e-01 -2.1095375841649318e+01 2.1096944339547068e+01 1.3957000000000000e-01 1 0 0 0 0 -V -23 0 0 0 0 0 0 2 0 -P 145 -321 4.7317159073082486e-03 -6.3950612894738934e-01 -1.0249740682428344e+01 1.0281527877466626e+01 4.9359999999999998e-01 1 0 0 0 0 -P 146 211 -2.1513185186894951e-01 5.5253778360839806e-02 -1.6231025987568579e+00 1.6441643849393461e+00 1.3957000000000000e-01 1 0 0 0 0 -V -24 0 0 0 0 0 0 2 0 -P 147 -211 -4.0628598070699080e-02 -3.7486371473267571e-01 -3.2698973194384027e+00 3.2945229931167308e+00 1.3957000000000000e-01 1 0 0 0 0 -P 148 211 -2.2213787884234046e-01 -1.9035086479588445e-01 -8.6925041161229846e+00 8.6985450670017315e+00 1.3957000000000000e-01 1 0 0 0 0 -V -25 0 0 0 0 0 0 2 0 -P 149 2112 -5.0305378851233962e-01 -3.5001326226330570e-01 -4.8922578174780284e+01 4.8935437256146848e+01 9.3957000000000002e-01 1 0 0 0 0 -P 150 111 1.9439971445648394e-01 -1.0750830516930852e-01 -1.1517209099759532e+01 1.1520142114255574e+01 1.3497999999999999e-01 2 0 0 -98 0 -V -26 0 0 0 0 0 0 3 0 -P 151 211 5.5467664486743833e-02 -8.8581067293380639e-02 -8.8067473190807988e+00 8.8084732726121882e+00 1.3957000000000000e-01 1 0 0 0 0 -P 152 -211 3.2763508143091863e-01 2.6975363668793567e-01 -2.7798223999518537e+01 2.7801813773266648e+01 1.3957000000000000e-01 1 0 0 0 0 -P 153 111 3.7624470113100927e-01 -2.2697476149644069e-01 -3.9173658724607755e+01 3.9176355561612958e+01 1.3497999999999999e-01 2 0 0 -99 0 -V -27 0 0 0 0 0 0 2 0 -P 154 -3122 -3.4471300641577951e-01 -9.3043940044976126e-02 -1.5322034894383646e+02 1.5322482682830801e+02 1.1156800000000000e+00 2 0 0 -100 0 -P 155 211 -1.2658824667944718e-01 5.6045897494217310e-02 -9.1400235910024410e+00 9.1421374281840926e+00 1.3957000000000000e-01 1 0 0 0 0 -V -28 0 0 0 0 0 0 1 0 -P 156 310 3.9338164815186982e-01 1.5120222274855744e-01 -1.5841292434872400e+02 1.5841426667878343e+02 4.9767000000000000e-01 2 0 0 -101 0 -V -29 0 0 0 0 0 0 2 0 -P 157 211 -4.1204788433400203e+00 1.3492927461039024e+00 3.8318172798207833e+01 3.8562945727619358e+01 1.3957000000000000e-01 1 0 0 0 0 -P 158 111 -4.8159128705046694e-01 1.3448094949075709e-01 5.8718796761526999e+00 5.8946760576942649e+00 1.3497999999999999e-01 2 0 0 -102 0 -V -30 0 3.6262632367244094e-07 -1.4847823601754692e-07 8.4887296679066190e-06 8.5293987828113712e-06 0 2 0 -P 159 22 9.2329242767276706e-02 1.8864949736969224e-02 1.1925858469138277e+00 1.1963032966843019e+00 0 1 0 0 0 0 -P 160 22 -2.5631944427193760e-02 -4.6174321832131868e-02 3.6873305970836540e-01 3.7249581728345482e-01 0 1 0 0 0 0 -V -31 0 0 0 0 0 0 2 0 -P 161 -211 -1.1341007829402066e+00 6.0266876159191429e-01 2.0286919317455499e+01 2.0328009479531275e+01 1.3957000000000000e-01 1 0 0 0 0 -P 162 111 -1.1968527011163542e-01 3.3035230632374672e-02 2.8142194490767198e+00 2.8201891068342042e+00 1.3497999999999999e-01 2 0 0 -103 0 -V -32 0 0 0 0 0 0 2 0 -P 163 22 -3.4376924339807431e+00 5.6473113570386968e-01 3.1590143475639518e+01 3.1781658473682139e+01 0 1 0 0 0 0 -P 164 111 -1.5341100192305239e+00 6.7694638573483645e-01 1.2781020070891630e+01 1.2891254539927354e+01 1.3497999999999999e-01 2 0 0 -104 0 -V -33 0 -2.7789154446939715e+01 -2.5850833391285808e+00 3.5434507819968331e+02 3.5855517402969622e+02 0 2 0 -P 165 2112 -5.1909013901515177e-01 -3.4217945727699796e-02 5.8209743622944101e+00 5.9192195221685608e+00 9.3957000000000002e-01 1 0 0 0 0 -P 166 -211 -1.8675959006408943e-01 -3.1443655385611960e-02 3.1794570083460498e+00 3.1881490712897551e+00 1.3957000000000000e-01 1 0 0 0 0 -V -34 0 0 0 0 0 0 2 0 -P 167 -3122 -1.3578313501585406e+00 -5.6110171407454090e-01 4.7532121296764123e+00 5.0986575214573620e+00 1.1156800000000000e+00 2 0 0 -105 0 -P 168 22 -8.9088999710365789e-03 -4.2747657113092849e-02 3.1710490820171716e-01 3.2009725630341157e-01 0 1 0 0 0 0 -V -35 0 0 0 0 0 0 2 0 -P 169 -211 -2.3446543659562806e+00 -6.4929378742615518e-01 2.2395655634208214e+00 3.3097009254536083e+00 1.3957000000000000e-01 1 0 0 0 0 -P 170 111 -1.1249397207202128e+00 1.4237079142511824e-01 1.1663329747194109e+00 1.6322717377394349e+00 1.3497999999999999e-01 2 0 0 -106 0 -V -36 0 -6.7418093062859160e-05 -1.9089901041571765e-04 1.6493397696685196e-04 2.6420265438809298e-04 0 2 0 -P 171 22 -2.1187394174684773e-01 -5.9635452415112900e-01 5.5296385850315732e-01 8.4041556058747868e-01 0 1 0 0 0 0 -P 172 22 -1.4766384618138196e-02 -4.5393292462897188e-02 1.4969497191911496e-03 4.7758119453917933e-02 0 1 0 0 0 0 -V -37 0 0 0 0 0 0 2 0 -P 173 -211 -4.0255782642450305e-02 -2.7831301333626307e-01 3.9015845799110332e-01 5.0078145799386653e-01 1.3957000000000000e-01 1 0 0 0 0 -P 174 211 -4.6264467692447137e-01 2.5591075993571022e-01 3.5889789046657225e-02 5.4799477734302793e-01 1.3957000000000000e-01 1 0 0 0 0 -V -38 0 0 0 0 0 0 2 0 -P 175 211 7.8035236055542037e-02 -5.6695538610673002e-02 6.0047941576510799e-01 6.2398653496866729e-01 1.3957000000000000e-01 1 0 0 0 0 -P 176 111 -1.2785553127783380e+00 1.1884783629086837e-01 1.0045692970771025e+00 1.6359118463580851e+00 1.3497999999999999e-01 2 0 0 -107 0 -V -39 0 0 0 0 0 0 2 0 -P 177 -211 1.2627572705779661e-01 -6.1331993051647760e-01 2.5729317570399224e-01 6.9122099185177921e-01 1.3957000000000000e-01 1 0 0 0 0 -P 178 111 -1.5555177445162185e-01 8.8890488378568028e-02 -1.6380203759515596e-01 2.7775633454442306e-01 1.3497999999999999e-01 2 0 0 -108 0 -V -40 0 0 0 0 0 0 2 0 -P 179 211 3.5639704325469085e-01 -6.3423964972341818e-01 -2.4163817735466017e-01 7.7919675267370847e-01 1.3957000000000000e-01 1 0 0 0 0 -P 180 111 1.3101330793119204e-01 9.0416991608367872e-02 2.7437988898070045e-02 2.1050454356462622e-01 1.3497999999999999e-01 2 0 0 -109 0 -V -41 0 0 0 0 0 0 1 0 -P 181 310 4.6391648249289439e+00 8.7190463208380886e-01 -2.7041866263032449e-01 4.7542475369195882e+00 4.9767000000000000e-01 2 0 0 -110 0 -V -42 0 0 0 0 0 0 2 0 -P 182 -321 1.9525512673653487e+00 -5.3227249651774589e-01 -4.9906661042476869e-01 2.1420735057135949e+00 4.9359999999999998e-01 1 0 0 0 0 -P 183 111 2.9874439049285023e-01 -2.8475562149392120e-01 -1.9024244903122581e-01 4.7407358567708918e-01 1.3497999999999999e-01 2 0 0 -111 0 -V -43 0 0 0 0 0 0 2 0 -P 184 321 4.1462756309890736e+00 3.2192760120503588e-01 -6.3518186464597759e-01 4.2358394622231152e+00 4.9359999999999998e-01 1 0 0 0 0 -P 185 111 2.8873808576949571e+00 -5.7210969847366372e-02 -1.3031788905640951e-01 2.8940358783301670e+00 1.3497999999999999e-01 2 0 0 -112 0 -V -44 0 0 0 0 0 0 2 0 -P 186 -321 7.4632910485972637e-01 -9.0683090050122783e-01 -1.0937761687495565e+01 1.1011703823991564e+01 4.9359999999999998e-01 1 0 0 0 0 -P 187 211 -7.5085744445380881e-02 -9.4925952617013309e-02 -1.1136929490878451e+00 1.1289112344410193e+00 1.3957000000000000e-01 1 0 0 0 0 -V -45 0 5.4870443770135152e-04 -6.1180197566582301e-04 -7.7571407249639283e-03 7.8006513337980929e-03 0 2 0 -P 188 22 1.6307255770237250e+00 -1.7467424291525475e+00 -2.2610684940145120e+01 2.2736610312090640e+01 0 1 0 0 0 0 -P 189 22 2.5002754365000407e-01 -3.5028539841192269e-01 -3.9778855607587129e+00 4.0010982451593105e+00 0 1 0 0 0 0 -V -46 0 0 0 0 0 0 2 0 -P 190 -211 -3.4771060598395914e-01 -2.2516011178622557e-02 -4.1162097602971910e+00 4.1332883049624050e+00 1.3957000000000000e-01 1 0 0 0 0 -P 191 211 2.3702088705655167e-01 -4.9089442089346247e-01 -4.8952940415866841e+00 4.9275287692574148e+00 1.3957000000000000e-01 1 0 0 0 0 -V -47 0 0 0 0 0 0 3 0 -P 192 211 7.5704020926990898e-02 1.9439819800615879e-01 -3.0400693063104991e+00 3.0504135670829546e+00 1.3957000000000000e-01 1 0 0 0 0 -P 193 -211 1.2388078103698906e-02 -1.3418403734202855e-01 -2.2669176314964452e+00 2.2752042003402604e+00 1.3957000000000000e-01 1 0 0 0 0 -P 194 111 -2.9481615955898893e-01 1.1357919037439569e-01 -7.8235932090650602e+00 7.8311331939734075e+00 1.3497999999999999e-01 2 0 0 -113 0 -V -48 0 0 0 0 0 0 2 0 -P 195 -211 -2.5840149143461150e-01 4.9160936948202588e-01 -7.6888525573623507e+00 7.7101481527072950e+00 1.3957000000000000e-01 1 0 0 0 0 -P 196 211 -1.8300377467698797e-01 8.5819329580133663e-02 -1.7124223317576995e+01 1.7125984916320089e+01 1.3957000000000000e-01 1 0 0 0 0 -V -49 0 0 0 0 0 0 2 0 -P 197 321 -1.0059304477724786e+00 1.6154958423579500e+00 -4.8713814360191492e+01 4.8753472423629795e+01 4.9359999999999998e-01 1 0 0 0 0 -P 198 111 -8.6514329764970965e-01 1.2820801404340156e+00 -5.0363263569510103e+01 5.0387188246461093e+01 1.3497999999999999e-01 2 0 0 -114 0 -V -50 0 0 0 0 0 0 2 0 -P 199 -311 -2.1609164566645891e+00 -2.4014342910428788e+00 -4.6611982375210808e+00 5.6930563869726507e+00 4.9767000000000000e-01 2 0 0 -115 0 -P 200 -211 -7.8919655988042958e-02 -3.2709922664563601e-02 -2.0207531257067607e-01 2.6002397580325015e-01 1.3957000000000000e-01 1 0 0 0 0 -V -51 0 -1.5071098302075203e-05 -2.8039888295285812e-05 -3.9402786753742279e-04 3.9645787334712418e-04 0 2 0 -P 201 22 -1.6628700951457295e-03 2.7466545158185005e-02 -1.7085866096558761e-01 1.7306027350849057e-01 0 1 0 0 0 0 -P 202 22 -6.5865805639046926e-02 -1.5310413880685866e-01 -1.5946516929484500e+00 1.6033381438410388e+00 0 1 0 0 0 0 -V -52 0 0 0 0 0 0 2 0 -P 203 -211 2.0587461757273046e-01 1.6855553016750627e-01 -2.1998932359118348e+00 2.2203164997858775e+00 1.3957000000000000e-01 1 0 0 0 0 -P 204 211 -5.2333999937162846e-02 4.5462768293088435e-01 -7.9512134694810550e+00 7.9655948051475409e+00 1.3957000000000000e-01 1 0 0 0 0 -V -53 0 -5.1634935389906184e-06 -1.5909755539324514e-05 -2.4640764257625601e-04 2.4701009158988296e-04 0 2 0 -P 205 22 -1.9369005581290913e-02 -2.6993645287572443e-01 -3.6129505223448715e+00 3.6230722217312223e+00 0 1 0 0 0 0 -P 206 22 -1.4734769876723883e-01 -2.4375103224998654e-01 -4.3429556459108172e+00 4.3522855665045208e+00 0 1 0 0 0 0 -V -54 0 1.6507694663061706e-06 -2.3329977412751538e-05 -1.0644109517188483e-03 1.0646795018213276e-03 0 2 0 -P 207 22 3.2699543974523036e-04 -1.6531900817126896e-01 -5.2016361454811575e+00 5.2042625867037895e+00 0 1 0 0 0 0 -P 208 22 4.4457545443559635e-02 -4.6761148186613616e-01 -2.3675294738488155e+01 2.3679953925749196e+01 0 1 0 0 0 0 -V -55 0 0 0 0 0 0 2 0 -P 209 211 8.3079894702839219e-01 1.5302975509736045e+00 -3.5793639413666205e+02 3.5794065676425424e+02 1.3957000000000000e-01 1 0 0 0 0 -P 210 111 5.4263936381458211e-01 4.6734157035509338e-01 -2.1145862994016593e+02 2.1145988570269063e+02 1.3497999999999999e-01 2 0 0 -116 0 -V -56 0 0 0 0 0 0 2 0 -P 211 321 1.0977767389319530e+00 3.1868442334370795e-01 -2.4770380304560078e+02 2.4770693239742806e+02 4.9359999999999998e-01 1 0 0 0 0 -P 212 -211 1.6804735433903449e-02 -4.2423390924212670e-02 -8.0724325227349169e+01 8.0724458780093229e+01 1.3957000000000000e-01 1 0 0 0 0 -V -57 0 0 0 0 0 0 2 0 -P 213 211 4.8735411154823403e-02 -4.3391527553418574e-01 5.7573302557377576e+02 5.7573320806926313e+02 1.3957000000000000e-01 1 0 0 0 0 -P 214 -211 2.4482588483854287e-01 7.7909997263942679e-04 1.0140498242515802e+03 1.0140498634114431e+03 1.3957000000000000e-01 1 0 0 0 0 -V -58 0 0 0 0 0 0 2 0 -P 215 -211 2.2644715345669786e-01 -1.8312403295315868e-01 3.1678254960143175e+02 3.1678271421353344e+02 1.3957000000000000e-01 1 0 0 0 0 -P 216 211 -1.9928619525354679e-01 -2.2203313483144810e-01 1.2997895205791938e+03 1.2997895623142140e+03 1.3957000000000000e-01 1 0 0 0 0 -V -59 0 -1.5147243004817694e-05 1.0094785584425737e-04 8.2958988283135748e-02 8.2959052302129133e-02 0 2 0 -P 217 22 -9.8281010852660555e-02 2.5143009431644470e-01 2.1253074378795648e+02 2.1253091523661075e+02 0 1 0 0 0 0 -P 218 22 -4.5575709842319061e-02 7.0729404434862853e-01 5.7534913658297194e+02 5.7534957313687289e+02 0 1 0 0 0 0 -V -60 0 0 0 0 0 0 2 0 -P 219 -2212 -3.3519434428000028e-01 -4.0216052205848135e-01 5.6696550298238196e+02 5.6696652106715453e+02 9.3827000000000005e-01 1 0 0 0 0 -P 220 111 -3.4003331637259090e-02 -4.0291788547051194e-01 2.4175947776846803e+02 2.4175985359346117e+02 1.3497999999999999e-01 2 0 0 -117 0 -V -61 0 0 0 0 0 0 2 0 -P 221 2112 -1.5928388612196823e-01 -2.9344070178772974e-01 5.2068168002132694e+01 5.2077714904602516e+01 9.3957000000000002e-01 1 0 0 0 0 -P 222 111 6.0767090723995811e-02 1.5192470187574267e-01 8.1321949629446006e+00 8.1349608646936105e+00 1.3497999999999999e-01 2 0 0 -118 0 -V -62 0 0 0 0 0 0 3 0 -P 223 -211 -2.0855792861887895e-01 3.0026778285653749e-01 1.2281199215305971e+01 1.2287432242008229e+01 1.3957000000000000e-01 1 0 0 0 0 -P 224 211 1.8322216671360106e-01 8.4641186236416213e-02 3.0390432107555543e+00 3.0489338980243836e+00 1.3957000000000000e-01 1 0 0 0 0 -P 225 111 -4.1465490166762591e-02 -3.5765910717375442e-02 1.9984446344580136e+00 2.0037462775107624e+00 1.3497999999999999e-01 2 0 0 -119 0 -V -63 0 0 0 0 0 0 3 0 -P 226 211 2.5229722362814772e-01 7.8453898573060024e-02 2.0068040102688629e+00 2.0289285408271467e+00 1.3957000000000000e-01 1 0 0 0 0 -P 227 -211 -4.0632702319755090e-02 -1.2069487246477217e-01 6.9918612236714750e-01 7.2426465283617236e-01 1.3957000000000000e-01 1 0 0 0 0 -P 228 111 -1.0286168933441908e-01 -7.6499887889112148e-02 3.1988902541620599e+00 3.2043019861668447e+00 1.3497999999999999e-01 2 0 0 -120 0 -V -64 0 0 0 0 0 0 3 0 -P 229 -211 -1.6757424870507753e-01 -2.0645190227526286e-01 8.7703893221804687e+00 8.7755291671955220e+00 1.3957000000000000e-01 1 0 0 0 0 -P 230 211 9.8968590493889952e-02 -2.6775289950262515e-01 5.1595877232286771e+00 5.1693627901017445e+00 1.3957000000000000e-01 1 0 0 0 0 -P 231 111 -4.4664340621416956e-02 1.0405778336843771e-01 8.0887900876842203e+00 8.0907087210343445e+00 1.3497999999999999e-01 2 0 0 -121 0 -V -65 0 0 0 0 0 0 3 0 -P 232 22 4.3201839353883581e-02 2.1195937699919901e-02 3.1454940200310616e-01 3.1820903978210507e-01 0 1 0 0 0 0 -P 233 211 -1.0483563972662920e-01 -3.3980469291825055e-01 5.8420066258245038e+00 5.8544836614140072e+00 1.3957000000000000e-01 1 0 0 0 0 -P 234 -211 -1.7885887895793467e-01 -2.0510136573886101e-01 8.3797429311231948e+00 8.3853222028386707e+00 1.3957000000000000e-01 1 0 0 0 0 -V -66 0 0 0 0 0 0 3 0 -P 235 211 -6.2449587517871177e-02 -1.5860535579672613e-01 1.4572062057648969e+01 1.4573727320309697e+01 1.3957000000000000e-01 1 0 0 0 0 -P 236 -211 -6.9803021048007466e-02 1.9955448295151124e-01 3.0748651976026064e+01 3.0749695487615565e+01 1.3957000000000000e-01 1 0 0 0 0 -P 237 111 -2.1379581197174061e-01 2.7391517770198009e-01 1.7311417557900477e+01 1.7315430564620016e+01 1.3497999999999999e-01 2 0 0 -122 0 -V -67 0 9.9012612323046163e-06 2.3990675043343193e-05 5.0259087072063646e-04 5.0661887099154334e-04 0 2 0 -P 238 22 7.2226354217322569e-02 2.8177786734834089e-02 9.0357006333380763e-01 9.0689001166727001e-01 0 1 0 0 0 0 -P 239 22 -4.9277372803545674e-02 2.7427407669828176e-02 2.6132684023139513e-01 2.6734292507420448e-01 0 1 0 0 0 0 -V -68 0 -1.8040088071645551e-05 1.8980771602814036e-05 3.2803886097063062e-04 3.2918821827960463e-04 0 2 0 -P 240 22 -2.6219607110444487e-01 2.0044463067522406e-01 3.6450568212061958e+00 3.6599677675480899e+00 0 1 0 0 0 0 -P 241 22 -2.9527711295698492e-02 1.0649081569596784e-01 1.6596144706705973e+00 1.6632896232530285e+00 0 1 0 0 0 0 -V -69 0 0 0 0 0 0 2 0 -P 242 -211 -1.5779048821080130e-01 2.4427658010237480e-01 1.1215533923889044e+01 1.1220171561458509e+01 1.3957000000000000e-01 1 0 0 0 0 -P 243 111 4.7885545567532817e-01 -2.7126526635969879e-02 7.1201563610581680e+00 7.1375685357266061e+00 1.3497999999999999e-01 2 0 0 -123 0 -V -70 0 0 0 0 0 0 3 0 -P 244 -211 1.4447474134589635e-02 1.0331254294609675e-01 1.3021878060525166e+01 1.3023043815449808e+01 1.3957000000000000e-01 1 0 0 0 0 -P 245 211 -2.2533489453973266e-01 6.7750325072043191e-02 1.3920844135234320e+01 1.3923532136050548e+01 1.3957000000000000e-01 1 0 0 0 0 -P 246 111 -4.4248312943774556e-02 1.3821775128610481e-01 2.1230751378670416e+01 2.1231676470860343e+01 1.3497999999999999e-01 2 0 0 -124 0 -V -71 0 0 0 0 0 0 3 0 -P 247 -211 4.3968497828360605e-02 -8.9581304918981322e-02 2.7716342830236234e+00 2.7769397585695201e+00 1.3957000000000000e-01 1 0 0 0 0 -P 248 211 -3.0260312919721499e-01 -2.2696578300232692e-01 6.5963063148826535e+00 6.6086170190982152e+00 1.3957000000000000e-01 1 0 0 0 0 -P 249 111 -4.8351748599884498e-01 6.8085391814766527e-02 1.1578342287069946e+01 1.1589419937891513e+01 1.3497999999999999e-01 2 0 0 -125 0 -V -72 0 0 0 0 0 0 2 0 -P 250 211 2.7918293477948802e-01 -1.1595431069407330e-01 1.5372053925904542e+01 1.5375659667118606e+01 1.3957000000000000e-01 1 0 0 0 0 -P 251 -211 -3.4690021616336185e-02 7.3188080772198266e-02 7.3508544257158037e-01 7.5258905489484496e-01 1.3957000000000000e-01 1 0 0 0 0 -V -73 0 0 0 0 0 0 3 0 -P 252 211 6.9604979207269713e-02 6.4059599095633635e-02 3.4643965893791207e-01 3.8529041975080902e-01 1.3957000000000000e-01 1 0 0 0 0 -P 253 -211 -1.7967466933591134e-01 -5.9481031195502451e-02 9.5730795988163619e-01 9.8576837787879446e-01 1.3957000000000000e-01 1 0 0 0 0 -P 254 111 1.5727707714584355e-01 -3.3174440295699437e-01 8.1664405133604978e-01 9.0549297891888092e-01 1.3497999999999999e-01 2 0 0 -126 0 -V -74 0 0 0 0 0 0 3 0 -P 255 -211 -2.6768527911412210e-02 -3.1628709299904190e-01 1.4372749842883532e+00 1.4785104817502697e+00 1.3957000000000000e-01 1 0 0 0 0 -P 256 211 5.8658587383824110e-02 4.7066254481115677e-02 1.1853313384479452e-01 1.9795441622710730e-01 1.3957000000000000e-01 1 0 0 0 0 -P 257 111 1.3411328140931753e-01 -1.4694297772286691e-01 1.1236134462109026e+00 1.1490454246279296e+00 1.3497999999999999e-01 2 0 0 -127 0 -V -75 0 0 0 0 0 0 3 0 -P 258 111 -2.9382405415384755e-01 1.5899008760270572e-01 -2.7730141991355345e-01 4.5467142052408799e-01 1.3497999999999999e-01 2 0 0 -128 0 -P 259 111 -2.9461008023809460e-01 7.9261822040132043e-03 -1.9522454331244052e-01 3.7840473894202054e-01 1.3497999999999999e-01 2 0 0 -129 0 -P 260 111 -5.6947447824850161e-01 -6.7738430395329619e-02 -2.4221023236473779e-01 6.3700476716505527e-01 1.3497999999999999e-01 2 0 0 -130 0 -V -76 0 0 0 0 0 0 2 0 -P 261 -211 -1.1998250888346944e+00 2.2147907356684138e-01 -5.3025571611185474e-01 1.3376412572863117e+00 1.3957000000000000e-01 1 0 0 0 0 -P 262 111 1.1957147566873839e-01 -2.6522135805362312e-01 -3.4214359030111036e-01 4.6895793344983716e-01 1.3497999999999999e-01 2 0 0 -131 0 -V -77 0 0 0 0 0 0 1 0 -P 263 310 -1.2221059279354842e+00 7.8797526225771200e-02 -6.0729148702831515e-01 1.4547268913275146e+00 4.9767000000000000e-01 2 0 0 -132 0 -V -78 0 0 0 0 0 0 2 0 -P 264 311 6.1455156080652751e-01 -1.6499131271689300e-02 -2.1080593895117539e+00 2.2515629373462178e+00 4.9767000000000000e-01 2 0 0 -133 0 -P 265 211 1.0915840528824405e+00 -1.2515087994438999e-02 -3.5835761605516261e+00 3.7487611627454607e+00 1.3957000000000000e-01 1 0 0 0 0 -V -79 0 0 0 0 0 0 2 0 -P 266 -211 1.7582177056811502e-01 -1.1719437561076100e-01 -3.7786363095881875e-02 2.5603790894419687e-01 1.3957000000000000e-01 1 0 0 0 0 -P 267 111 3.3145760189254819e-01 -3.6043831788505409e-01 -1.3814531933934078e+00 1.4718737883354707e+00 1.3497999999999999e-01 2 0 0 -134 0 -V -80 0 0 0 0 0 0 2 0 -P 268 -211 1.4142297312131940e+00 3.0559262664089600e-02 -3.1393293993058156e+00 3.4461352938368117e+00 1.3957000000000000e-01 1 0 0 0 0 -P 269 211 4.2350384391560253e-01 3.4379285852778824e-01 -3.2627959808932827e+00 3.3110219620563313e+00 1.3957000000000000e-01 1 0 0 0 0 -V -81 0 0 0 0 0 0 2 0 -P 270 211 2.2262437178167788e-01 2.2164126913244933e-01 -1.1281504278306380e+00 1.1793598415277167e+00 1.3957000000000000e-01 1 0 0 0 0 -P 271 -211 9.3697441288108851e-01 1.1617066478887220e-01 -6.0163047616962251e-01 1.1282090624115000e+00 1.3957000000000000e-01 1 0 0 0 0 -V -82 0 0 0 0 0 0 2 0 -P 272 -211 2.3127343736279543e-01 4.0719281310637140e-01 -1.3765569924613603e+00 1.4607129520440862e+00 1.3957000000000000e-01 1 0 0 0 0 -P 273 211 -1.8596767408214455e-02 -2.3324161234313170e-01 -2.3184009526130650e-01 3.5773887705591995e-01 1.3957000000000000e-01 1 0 0 0 0 -V -83 0 0 0 0 0 0 3 0 -P 274 111 -1.4346763318903757e-01 1.0781369477650569e-02 -5.8080541309671737e+01 5.8080876350349484e+01 1.3497999999999999e-01 2 0 0 -135 0 -P 275 111 -2.6461917860165884e-01 -1.6666569637677223e-01 -6.3921636890275806e+01 6.3922544404120060e+01 1.3497999999999999e-01 2 0 0 -136 0 -P 276 111 -6.3263579171512346e-02 3.2972257103575209e-02 -1.6871339394895315e+01 1.6872030169138945e+01 1.3497999999999999e-01 2 0 0 -137 0 -V -84 0 0 0 0 0 0 2 0 -P 277 -321 -1.9241511971658415e-01 6.8333986075057515e-02 -1.5062462347721974e+01 1.5071931065676043e+01 4.9359999999999998e-01 1 0 0 0 0 -P 278 211 -3.6177450768530445e-01 4.9189474727843974e-01 -1.1900910688400808e+01 1.1917382104934106e+01 1.3957000000000000e-01 1 0 0 0 0 -V -85 0 3.5965274506955190e+01 -4.6449923613080180e+01 -1.1845199806065368e+03 1.1870855245326934e+03 0 2 0 -P 279 -2212 7.0831682930111939e-01 -9.1340702772143101e-01 -2.1316092442071589e+01 2.1368017519667180e+01 9.3827000000000005e-01 1 0 0 0 0 -P 280 211 7.3612976178848225e-02 -9.6472091324671175e-02 -4.4368453769818323e+00 4.4406984156562039e+00 1.3957000000000000e-01 1 0 0 0 0 -V -86 0 0 0 0 0 0 2 0 -P 281 -321 -4.4123751089775892e-01 -4.2768077428762763e-01 -1.7597613328393198e+01 1.7615255808570037e+01 4.9359999999999998e-01 1 0 0 0 0 -P 282 211 -2.2251296710200200e-01 -9.6639171739989163e-02 -1.3148198706335124e+01 1.3151177139564950e+01 1.3957000000000000e-01 1 0 0 0 0 -V -87 0 0 0 0 0 0 2 0 -P 283 311 1.1053483946443671e-01 2.3990656324443796e-01 -9.0517810821029947e+00 9.0692992726583253e+00 4.9767000000000000e-01 2 0 0 -138 0 -P 284 211 -2.1064306399016169e-01 -5.2260446477074120e-03 -1.1383456938792117e+01 1.1386262313603362e+01 1.3957000000000000e-01 1 0 0 0 0 -V -88 0 0 0 0 0 0 2 0 -P 285 22 -3.5874584636615608e-02 1.0662985418752213e-01 -2.4754642143430844e-01 2.7191201222423805e-01 0 1 0 0 0 0 -P 286 113 -1.8011439266886359e-01 2.8077452479029485e-01 -2.5609809355757700e+00 2.7283064666710946e+00 8.7963475117748524e-01 2 0 0 -139 0 -V -89 0 0 0 0 0 0 2 0 -P 287 2212 3.2237536636423531e-01 1.2209256343323748e-02 -2.9549510500184519e+00 3.1170757519964258e+00 9.3827000000000005e-01 1 0 0 0 0 -P 288 -211 4.8767346650093954e-02 1.4882602618582788e-01 -2.3244126658180475e-01 3.1310727790919962e-01 1.3957000000000000e-01 1 0 0 0 0 -V -90 0 0 0 0 0 0 2 0 -P 289 211 9.9155276979379939e-02 6.7357724758643656e-02 -5.1838620433734066e+00 5.1871258228102608e+00 1.3957000000000000e-01 1 0 0 0 0 -P 290 111 4.4253202957958163e-02 7.6399174961335814e-01 -2.3232855375278914e+00 2.4497993854059930e+00 1.3497999999999999e-01 2 0 0 -140 0 -V -91 0 9.6383408543088094e-06 7.6587722623014910e-06 -7.2125325163580596e-05 7.3351287749992734e-05 0 2 0 -P 291 22 -1.2269390628257775e-02 -2.5957213503575527e-04 -1.5849465772618179e-01 1.5896905941667261e-01 0 1 0 0 0 0 -P 292 22 2.6360212558589025e-01 1.9997238663270561e-01 -1.7222704560088657e+00 1.7537646819542143e+00 0 1 0 0 0 0 -V -92 0 0 0 0 0 0 3 0 -P 293 211 2.4603887976188546e-01 -2.1260457138838254e-01 -2.7393540734610169e+00 2.7621144724317976e+00 1.3957000000000000e-01 1 0 0 0 0 -P 294 -211 1.6587673815884174e-01 -1.3851309640486942e-01 -4.3161880209091308e+00 4.3238477987641240e+00 1.3957000000000000e-01 1 0 0 0 0 -P 295 111 -6.0279320681069205e-02 -9.2315970712068443e-02 -4.7308201386323090e-01 5.0416468260993141e-01 1.3497999999999999e-01 2 0 0 -141 0 -V -93 0 0 0 0 0 0 2 0 -P 296 2112 7.4171566481101445e-02 -3.8781235549565807e-01 -4.8819322937294800e+01 4.8829959898459137e+01 9.3957000000000002e-01 1 0 0 0 0 -P 297 111 -2.2377722266168973e-01 7.9799221498159933e-03 -1.1264902435367182e+01 1.1267936208697719e+01 1.3497999999999999e-01 2 0 0 -142 0 -V -94 0 5.0154104234163355e-01 3.0829670479462740e-01 -5.9353555524325564e+01 5.9412378560295316e+01 0 2 0 -P 298 -2112 3.2040808606255766e-01 2.1628229926567114e-01 -2.5231223973342530e+01 2.5251671119996491e+01 9.3957000000000002e-01 1 0 0 0 0 -P 299 211 -8.7336220343602930e-02 -7.3013290121362429e-02 -2.3510529596090493e+00 2.3579415513758439e+00 1.3957000000000000e-01 1 0 0 0 0 -V -95 0 0 0 0 0 0 2 0 -P 300 -311 -2.8878157481450778e-01 4.5737313947049302e-01 -1.9055191875712950e+01 1.9069362806234462e+01 4.9767000000000000e-01 2 0 0 -143 0 -P 301 -211 1.5737610531318013e-02 3.7670828302362941e-01 -2.7139552080295822e+01 2.7142529795633884e+01 1.3957000000000000e-01 1 0 0 0 0 -V -96 0 0 0 0 0 0 2 0 -P 302 -211 2.0611775579728736e-01 -5.2708370551699557e-01 -2.3061051418638730e+01 2.3068417242625809e+01 1.3957000000000000e-01 1 0 0 0 0 -P 303 211 -3.3050248543040528e-01 -9.0924683313200385e-03 -1.2204737552097738e+01 1.2210012820072743e+01 1.3957000000000000e-01 1 0 0 0 0 -V -97 0 -7.4282491859497750e-06 -1.1249076815240985e-05 -2.3418839530493129e-04 2.3469948674397263e-04 0 2 0 -P 304 22 -1.3782377984232405e-01 -1.7354840433172641e-01 -4.0358135637561290e+00 4.0418938091362637e+00 0 1 0 0 0 0 -P 305 22 6.0810257120624319e-03 -2.5958144784292918e-02 -1.1760447735839455e-01 1.2058862819144350e-01 0 1 0 0 0 0 -V -98 0 1.1329499597191234e-05 -6.2655200061162853e-06 -6.7121608805501367e-04 6.7138702239328879e-04 0 2 0 -P 306 22 8.3512273166797750e-04 -7.8008196154925541e-03 -3.4118096618637224e+00 3.4118186820233136e+00 0 1 0 0 0 0 -P 307 22 1.9356459172481594e-01 -9.9707485553815978e-02 -8.1053994378958087e+00 8.1083234322322628e+00 0 1 0 0 0 0 -V -99 0 2.0041229932726539e-04 -1.2090146041663490e-04 -2.0866428136954773e-02 2.0867864647033187e-02 0 2 0 -P 308 22 3.4255432656942236e-01 -2.0736141795750798e-01 -3.0756055443747755e+01 3.0758662010614099e+01 0 1 0 0 0 0 -P 309 22 3.3690374561586876e-02 -1.9613343538932699e-02 -8.4176032808599981e+00 8.4176935509988660e+00 0 1 0 0 0 0 -V -100 0 -1.4655426294584716e+01 -3.9557503781629491e+00 -6.5141421674948333e+03 6.5143325441403531e+03 0 2 0 -P 310 -2212 -2.9021401161431271e-01 -1.7933607075051763e-01 -1.2972263526808578e+02 1.2972647700869905e+02 9.3827000000000005e-01 1 0 0 0 0 -P 311 211 -5.4498994801466791e-02 8.6292130705541509e-02 -2.3497713675750649e+01 2.3498349819608933e+01 1.3957000000000000e-01 1 0 0 0 0 -V -101 0 6.2882302674241096e+01 2.4169769943670968e+01 -2.5322405107628230e+04 2.5322619679928397e+04 0 2 0 -P 312 -211 -3.0454181678031815e-02 -9.4438048079860462e-03 -1.9166526513342280e+01 1.9167061199207968e+01 1.3957000000000000e-01 1 0 0 0 0 -P 313 211 4.2383582982990159e-01 1.6064602755654347e-01 -1.3924639783538171e+02 1.3924720547957548e+02 1.3957000000000000e-01 1 0 0 0 0 -V -102 0 -6.8085613147043767e-05 1.9012424329253531e-05 8.3014485275483495e-04 8.3336772172386763e-04 0 2 0 -P 314 22 -6.4530051532456653e-02 4.1147663561012245e-02 5.0009863277170408e-01 5.0592084387524461e-01 0 1 0 0 0 0 -P 315 22 -4.1706123551801033e-01 9.3333285929744852e-02 5.3717810433809960e+00 5.3887552138190218e+00 0 1 0 0 0 0 -V -103 0 -2.8663356649283047e-05 7.9115884245727316e-06 6.7397580072297365e-04 6.7540547063320853e-04 0 2 0 -P 316 22 -1.4492624902482243e-01 2.8380174303346873e-02 2.6356982873021977e+00 2.6398322889224670e+00 0 1 0 0 0 0 -P 317 22 2.5240978913187006e-02 4.6550563290277975e-03 1.7852116177452235e-01 1.8035681791173727e-01 0 1 0 0 0 0 -V -104 0 -5.0220982389912621e-04 2.2160674326314827e-04 4.1840244562597866e-03 4.2201110684245468e-03 0 2 0 -P 318 22 -5.4063197640540028e-01 2.1622423351256712e-01 3.9809929604217249e+00 4.0233494508925567e+00 0 1 0 0 0 0 -P 319 22 -9.9347804282512375e-01 4.6072215222226937e-01 8.8000271104699053e+00 8.8679050890347977e+00 0 1 0 0 0 0 -V -105 0 -8.7423611880936946e+01 -3.6126385262244547e+01 3.0603430416013998e+02 3.2827571422449716e+02 0 2 0 -P 320 -2212 -1.2471878380698003e+00 -5.8148956872730395e-01 4.2864941247651371e+00 4.5986943904236481e+00 9.3827000000000005e-01 1 0 0 0 0 -P 321 211 -1.1064351208874038e-01 2.0387854652763094e-02 4.6671800491127502e-01 4.9996313103371370e-01 1.3957000000000000e-01 1 0 0 0 0 -V -106 0 -4.0330373995144954e-04 5.1041555013131883e-05 4.1814369434113808e-04 5.8518806325543013e-04 0 2 0 -P 322 22 -6.6701805187467311e-01 1.7389112972455496e-02 6.7968573557433076e-01 9.5246425755503927e-01 0 1 0 0 0 0 -P 323 22 -4.5792166884553959e-01 1.2498167845266275e-01 4.8664723914508007e-01 6.7980748018439574e-01 0 1 0 0 0 0 -V -107 0 -6.3235648545427708e-04 5.8780562177968304e-05 4.9684663912939536e-04 8.0910028321579759e-04 0 2 0 -P 324 22 -5.8725927969364689e-01 4.2508583447097834e-02 3.7714975811299251e-01 6.9922984868901916e-01 0 1 0 0 0 0 -P 325 22 -6.9129603308469112e-01 7.6339252843770522e-02 6.2741953896410996e-01 9.3668199766906590e-01 0 1 0 0 0 0 -V -108 0 -4.1370582402169445e-05 2.3641332843672301e-05 -4.3564824109938025e-05 7.3872132712754089e-05 0 2 0 -P 326 22 9.3824316308741933e-03 3.0669441389115419e-02 -7.5056453382808377e-02 8.1621785405822295e-02 0 1 0 0 0 0 -P 327 22 -1.6493420608249607e-01 5.8221046989452609e-02 -8.8745584212347600e-02 1.9613454913860082e-01 0 1 0 0 0 0 -V -109 0 4.6124625705683339e-05 3.1832261632231989e-05 9.6598352337218242e-06 7.4110358974856751e-05 0 2 0 -P 328 22 1.1229413325862778e-01 1.1712115941134178e-01 5.1212087590440727e-02 1.7014704305845085e-01 0 1 0 0 0 0 -P 329 22 1.8719174672564270e-02 -2.6704167802973904e-02 -2.3774098692370686e-02 4.0357500506175224e-02 0 1 0 0 0 0 -V -110 0 1.6839083418133907e+02 3.1648099143667501e+01 -9.8155650633128566e+00 1.7256806749881488e+02 0 2 0 -P 330 -211 3.3855716052889000e+00 7.5517900606175214e-01 -3.2190843642233902e-01 3.4864731824688899e+00 1.3957000000000000e-01 1 0 0 0 0 -P 331 211 1.2535932196400428e+00 1.1672562602205658e-01 5.1489773792014568e-02 1.2677743544506974e+00 1.3957000000000000e-01 1 0 0 0 0 -V -111 0 2.8845818951176322e-05 -2.7495107403999699e-05 -1.8369212665482548e-05 4.5775054719574976e-05 0 2 0 -P 332 22 2.7030395986030997e-01 -2.9002381019296813e-01 -1.9934251311767295e-01 4.4375159575046091e-01 0 1 0 0 0 0 -P 333 22 2.8440430632540273e-02 5.2681886990469471e-03 9.1000640864471617e-03 3.0321989926628289e-02 0 1 0 0 0 0 -V -112 0 1.3628206968224917e-04 -2.7003120695176234e-06 -6.1509002492339389e-06 1.3659618133936836e-04 0 2 0 -P 334 22 1.8626901422113438e+00 2.7688122150641023e-02 -8.2117109705569513e-02 1.8647049143781296e+00 0 1 0 0 0 0 -P 335 22 1.0246907154836133e+00 -8.4899091998007395e-02 -4.8200779350839988e-02 1.0293309639520400e+00 0 1 0 0 0 0 -V -113 0 -1.2886014039213245e-05 4.9643921958561860e-06 -3.4195863645979687e-04 3.4228819896250966e-04 0 2 0 -P 336 22 -1.0943481290995041e-01 -2.2126551863527927e-02 -2.1629656728282032e+00 2.1658453463733665e+00 0 1 0 0 0 0 -P 337 22 -1.8538134664903849e-01 1.3570574223792362e-01 -5.6606275362368574e+00 5.6652878476000419e+00 0 1 0 0 0 0 -V -114 0 -1.8756333083447605e-04 2.7795536553286909e-04 -1.0918770904720895e-02 1.0923957781981871e-02 0 2 0 -P 338 22 -6.4454009407804935e-01 1.0195210531070349e+00 -4.0546413266977950e+01 4.0564349913774876e+01 0 1 0 0 0 0 -P 339 22 -2.2060320357166030e-01 2.6255908732698097e-01 -9.8168503025321545e+00 9.8228383326862136e+00 0 1 0 0 0 0 -V -115 0 0 0 0 0 0 1 0 -P 340 310 -2.1609164566645891e+00 -2.4014342910428788e+00 -4.6611982375210808e+00 5.6930563869726507e+00 4.9767000000000000e-01 2 0 0 -144 0 -V -116 0 4.6647014059706234e-04 4.0174175072356605e-04 -1.8177659679026900e-01 1.8177767628387106e-01 0 2 0 -P 341 22 5.0612377474012493e-01 4.3386844717429307e-01 -2.0411988422196481e+02 2.0412097280263274e+02 0 1 0 0 0 0 -P 342 22 3.6515589074457233e-02 3.3473123180800382e-02 -7.3387457182011460e+00 7.3389129000579238e+00 0 1 0 0 0 0 -V -117 0 -3.9679966035151650e-06 -4.7018239803615207e-05 2.8211964547665943e-02 2.8212008404318353e-02 0 2 0 -P 343 22 -6.4946256002850131e-02 -9.4207688108994117e-02 5.6256023690559296e+01 5.6256140061129656e+01 0 1 0 0 0 0 -P 344 22 3.0942924365591040e-02 -3.0871019736151784e-01 1.8550345407790874e+02 1.8550371353233157e+02 0 1 0 0 0 0 -V -118 0 7.1394658205115038e-06 1.7849484044905112e-05 9.5544360100083161e-04 9.5576856408141815e-04 0 2 0 -P 345 22 4.9543228363903562e-02 1.4447608620664792e-01 8.0641017625724594e+00 8.0655480351980131e+00 0 1 0 0 0 0 -P 346 22 1.1223862360092251e-02 7.4486156690947375e-03 6.8093200372141963e-02 6.9412829495597211e-02 0 1 0 0 0 0 -V -119 0 -1.0479404296005302e-06 -9.0389728160656921e-07 5.0505876581810914e-05 5.0639862845471187e-05 0 2 0 -P 347 22 -1.9649059503414921e-02 -4.1995057254422583e-02 2.0580015458011841e-01 2.1095822808881290e-01 0 1 0 0 0 0 -P 348 22 -2.1816430663347673e-02 6.2291465370471460e-03 1.7926444798778951e+00 1.7927880494219495e+00 0 1 0 0 0 0 -V -120 0 -2.7048403984485163e-05 -2.0116331802263564e-05 8.4117688963188434e-04 8.4259995311128431e-04 0 2 0 -P 349 22 -1.9642405802245206e-02 -9.2859174775794529e-02 2.0999420753842948e+00 2.1020859569520560e+00 0 1 0 0 0 0 -P 350 22 -8.3219283532173879e-02 1.6359286886682384e-02 1.0989481787777651e+00 1.1022160292147887e+00 0 1 0 0 0 0 -V -121 0 -4.3697548852092644e-06 1.0180537782309538e-05 7.9137024098687022e-04 7.9155795130203402e-04 0 2 0 -P 351 22 1.5286718904049673e-02 1.0121571509495164e-01 3.4164405283291086e+00 3.4179736962660661e+00 0 1 0 0 0 0 -P 352 22 -5.9951059525466630e-02 2.8420682734860746e-03 4.6723495593551112e+00 4.6727350247682775e+00 0 1 0 0 0 0 -V -122 0 -3.9128110223879112e-05 5.0130931781456886e-05 3.1682709221014086e-03 3.1690053675884522e-03 0 2 0 -P 353 22 -1.6779084043867753e-02 6.1438708636000997e-02 5.8657625123023784e+00 5.8661082587446449e+00 0 1 0 0 0 0 -P 354 22 -1.9701672792787284e-01 2.1247646906597906e-01 1.1445655045598098e+01 1.1449322305875373e+01 0 1 0 0 0 0 -V -123 0 8.8138363471338031e-05 -4.9929214254940152e-06 1.3105393744311845e-03 1.3137442676021075e-03 0 2 0 -P 355 22 -5.9221845589798100e-03 -9.3634280590004035e-03 8.7044995957186830e-02 8.7747235718017694e-02 0 1 0 0 0 0 -P 356 22 4.8477764023430803e-01 -1.7763098576969477e-02 7.0331113651009813e+00 7.0498213000085883e+00 0 1 0 0 0 0 -V -124 0 -3.1128397509633289e-06 9.7235280142512896e-06 1.4935694140095549e-03 1.4936344936374668e-03 0 2 0 -P 357 22 -6.0821289540813332e-02 1.1730330566840588e-01 2.0518413827214008e+01 2.0518839277103105e+01 0 1 0 0 0 0 -P 358 22 1.6572976597038779e-02 2.0914445617698917e-02 7.1233755145640765e-01 7.1283719375723653e-01 0 1 0 0 0 0 -V -125 0 -1.9515749056143327e-04 2.7480648777391942e-05 4.6732544138254686e-03 4.6777255789813401e-03 0 2 0 -P 359 22 -4.0023515920812236e-01 8.6281187916333033e-02 1.0367007136428276e+01 1.0375088895658166e+01 0 1 0 0 0 0 -P 360 22 -8.3282326790722602e-02 -1.8195796101566498e-02 1.2113351506416694e+00 1.2143310422333451e+00 0 1 0 0 0 0 -V -126 0 4.8454558846432039e-06 -1.0220515911640566e-05 2.5159500646974626e-05 2.7896794388778152e-05 0 2 0 -P 361 22 7.4423022937854688e-02 -2.8130602976180735e-01 5.5912723271329023e-01 6.3031351808856284e-01 0 1 0 0 0 0 -P 362 22 8.2854054207988859e-02 -5.0438373195187056e-02 2.5751681862275960e-01 2.7517946083031813e-01 0 1 0 0 0 0 -V -127 0 1.7487216930583767e-05 -1.9160098842285034e-05 1.4650951698096147e-04 1.4982562794983061e-04 0 2 0 -P 363 22 4.5214485644001358e-02 -3.4494364021055254e-02 9.6759820543419181e-02 1.1223490425381649e-01 0 1 0 0 0 0 -P 364 22 8.8898795765316174e-02 -1.1244861370181165e-01 1.0268536256674834e+00 1.0368105203741129e+00 0 1 0 0 0 0 -V -128 0 -7.3439902585215092e-06 3.9738804160137968e-06 -6.9310149993812259e-06 1.1364292459897351e-05 0 2 0 -P 365 22 -6.5906669162900097e-02 -1.1544111646086784e-02 -1.7213513211336788e-02 6.9088787736666518e-02 0 1 0 0 0 0 -P 366 22 -2.2791738499094746e-01 1.7053419924879248e-01 -2.6008790670221665e-01 3.8558263278742178e-01 0 1 0 0 0 0 -V -129 0 -6.5385547125916253e-05 1.7591311186985337e-06 -4.3327993280389105e-05 8.3982872788221195e-05 0 2 0 -P 367 22 -7.0058961208586297e-03 -2.3646751404207671e-02 -4.7549279496351946e-02 5.3564777728007648e-02 0 1 0 0 0 0 -P 368 22 -2.8760418411723598e-01 3.1572933608220874e-02 -1.4767526381608859e-01 3.2483996121401310e-01 0 1 0 0 0 0 -V -130 0 -6.6891221062580290e-05 -7.9566451089120833e-06 -2.8450332395157243e-05 7.4823417599693525e-05 0 2 0 -P 369 22 -1.6731181439017095e-01 1.4345447539424376e-02 -1.6892072469241130e-02 1.6877315311370919e-01 0 1 0 0 0 0 -P 370 22 -4.0216266385833066e-01 -8.2083877934753996e-02 -2.2531815989549669e-01 4.6823161405134645e-01 0 1 0 0 0 0 -V -131 0 4.0004438564436408e-06 -8.8733800974629270e-06 -1.1446929262908617e-05 1.5689694162488194e-05 0 2 0 -P 371 22 -2.7787464980002757e-02 -3.9536920145469653e-02 -3.1512507197267656e-02 5.7691848422995934e-02 0 1 0 0 0 0 -P 372 22 1.4735894064874117e-01 -2.2568443790815346e-01 -3.1063108310384269e-01 4.1126608502684042e-01 0 1 0 0 0 0 -V -132 0 -1.7190259592768666e+02 1.1083735870402483e+01 -8.5422204997653452e+01 2.0462328450321920e+02 0 2 0 -P 373 -211 -7.0116200068741419e-01 2.3007912747604026e-01 -2.5557192099985926e-01 7.9332297824509768e-01 1.3957000000000000e-01 1 0 0 0 0 -P 374 211 -5.2094392724806982e-01 -1.5128160125026907e-01 -3.5171956602845583e-01 6.6140391308241664e-01 1.3957000000000000e-01 1 0 0 0 0 -V -133 0 0 0 0 0 0 1 0 -P 375 310 6.1455156080652751e-01 -1.6499131271689300e-02 -2.1080593895117539e+00 2.2515629373462178e+00 4.9767000000000000e-01 2 0 0 -145 0 -V -134 0 1.2422833674547942e-04 -1.3509013664050564e-04 -5.1776043610738624e-04 5.5164953701517157e-04 0 2 0 -P 376 22 1.7293581745775335e-01 -1.5989646707223276e-01 -4.7684903414621088e-01 5.3184459996143318e-01 0 1 0 0 0 0 -P 377 22 1.5852178443479484e-01 -2.0054185081282136e-01 -9.0460415924719695e-01 9.4002918837403693e-01 0 1 0 0 0 0 -V -135 0 -3.0421302276829038e-05 2.2861135473366665e-06 -1.2315570169442151e-02 1.2315641212460739e-02 0 2 0 -P 379 22 -8.0253989160968833e-02 6.2876484874701419e-02 -4.2260171878810738e+01 4.2260294856777207e+01 0 1 0 0 0 0 -P 378 22 -6.3213644028068727e-02 -5.2095115397050848e-02 -1.5820369430860998e+01 1.5820581493572236e+01 0 1 0 0 0 0 -V -136 0 -2.2626919204406364e-05 -1.4251163751589497e-05 -5.4657781078933680e-03 5.4658557071155340e-03 0 2 0 -P 380 22 -7.2231888147834891e-02 9.0709435203236623e-03 -9.2446848491878608e+00 9.2449714812153534e+00 0 1 0 0 0 0 -P 381 22 -1.9238729045382397e-01 -1.7573663989709587e-01 -5.4676952041087944e+01 5.4677572922904659e+01 0 1 0 0 0 0 -V -137 0 -1.4712307122146771e-05 7.6678869480818771e-06 -3.9235264585132075e-03 3.9236871020138959e-03 0 2 0 -P 382 22 -7.3391735447519918e-03 5.7884281344822895e-02 -1.3555871924925388e+01 1.3555997495517444e+01 0 1 0 0 0 0 -P 383 22 -5.5924405626760355e-02 -2.4912024241247683e-02 -3.3154674699699282e+00 3.3160326736214896e+00 0 1 0 0 0 0 -V -138 0 0 0 0 0 0 1 0 -P 384 130 1.1053483946443671e-01 2.3990656324443796e-01 -9.0517810821029947e+00 9.0692992726583253e+00 4.9767000000000000e-01 1 0 0 0 0 -V -139 0 0 0 0 0 0 2 0 -P 385 -211 1.9994195185511940e-01 4.2490055020102374e-01 -1.6472487730842742e+00 1.7185533355122891e+00 1.3957000000000000e-01 1 0 0 0 0 -P 386 211 -3.8005634452398301e-01 -1.4412602541072891e-01 -9.1373216249149591e-01 1.0097531311588057e+00 1.3957000000000000e-01 1 0 0 0 0 -V -140 0 1.1290931347859454e-05 1.9492777513552132e-04 -5.9277195213696494e-04 6.2505117884745329e-04 0 2 0 -P 387 22 -1.8864812224141009e-02 3.1518847790773763e-01 -7.8454208373630496e-01 8.4569849172110512e-01 0 1 0 0 0 0 -P 388 22 6.3118015182099169e-02 4.4880327170562045e-01 -1.5387434537915861e+00 1.6041008936848880e+00 0 1 0 0 0 0 -V -141 0 -2.2062332681418194e-05 -3.3787800437129711e-05 -1.7314881218831880e-04 1.8452512119060968e-04 0 2 0 -P 389 22 2.4873558701757840e-02 -5.2976666599621790e-03 -1.3627493951424749e-02 2.8852517843785962e-02 0 1 0 0 0 0 -P 390 22 -8.5152879382827049e-02 -8.7018304052106268e-02 -4.5945451991180614e-01 4.7531216476614546e-01 0 1 0 0 0 0 -V -142 0 -4.1677118704622027e-05 1.4862109679246677e-06 -2.0980181557823914e-03 2.0985831772341542e-03 0 2 0 -P 391 22 -1.5643583805594760e-01 5.2378617282550582e-02 -5.5116465463091462e+00 5.5141149192248653e+00 0 1 0 0 0 0 -P 392 22 -6.7341384605742141e-02 -4.4398695132734589e-02 -5.7532558890580363e+00 5.7538212894728558e+00 0 1 0 0 0 0 -V -143 0 0 0 0 0 0 1 0 -P 393 310 -2.8878157481450778e-01 4.5737313947049302e-01 -1.9055191875712950e+01 1.9069362806234462e+01 4.9767000000000000e-01 2 0 0 -146 0 -V -144 0 -1.0043507998486164e+02 -1.1161386843781975e+02 -2.1664318227892988e+02 2.6460188769466896e+02 0 2 0 -P 394 -211 -1.1691333412424345e+00 -1.3186003706581355e+00 -2.1817307937141353e+00 2.8080257741418579e+00 1.3957000000000000e-01 1 0 0 0 0 -P 395 211 -9.9178311542215425e-01 -1.0828339203847432e+00 -2.4794674438069451e+00 2.8850306128307914e+00 1.3957000000000000e-01 1 0 0 0 0 -V -145 0 1.4136025654935059e+01 -3.7951598826736549e-01 -4.8489961644807160e+01 5.1790856090669863e+01 0 2 0 -P 396 -211 2.2123670885310345e-01 -1.8774985570499705e-01 -1.1205504408707445e+00 1.1658939767822030e+00 1.3957000000000000e-01 1 0 0 0 0 -P 397 211 3.9331485195342403e-01 1.7125072443330774e-01 -9.8750894864100902e-01 1.0856689605640144e+00 1.3957000000000000e-01 1 0 0 0 0 -V -146 0 -1.0106759107552426e+01 1.6007115917497323e+01 -6.6689238799159602e+02 6.6738834131272722e+02 0 2 0 -P 398 211 -1.3082730519347252e-01 3.3475366485323066e-01 -6.2686630319197212e+00 6.2805088800648798e+00 1.3957000000000000e-01 1 0 0 0 0 -P 399 -211 -1.5795426962103520e-01 1.2261947461726234e-01 -1.2786528843793228e+01 1.2788853926169581e+01 1.3957000000000000e-01 1 0 0 0 0 -BlockType GenEvent -E 8 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 186 0 0 -V -1 0 0 0 0 0 1 2 0 -P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -1 0 -P 41 2203 -3.5096158275163236e-01 -6.5324073291532936e-01 6.4120718804435573e+03 6.4120719697163750e+03 7.7132999999999996e-01 2 0 0 -13 0 -P 3 1 3.5096158275163236e-01 6.5324073291532936e-01 4.1594615987003954e+02 4.1594682088954704e+02 0 3 0 0 -3 0 -V -2 0 0 0 0 0 1 2 0 -P 2 2212 0 0 -6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -2 0 -P 4 2 2.7501906829241841e-02 -1.2146878480571459e-01 -2.4425191616079805e+03 2.4425191647831903e+03 0 3 0 0 -4 0 -P 25 2103 -2.7501906829241841e-02 1.2146878480571459e-01 -4.3752498996173417e+03 4.3752499693803265e+03 7.7132999999999996e-01 2 0 0 -11 0 -V -3 0 0 0 0 0 0 3 0 -P 5 1 -4.9399896685999328e-01 1.2324525037290512e+00 2.6907605385966201e+02 2.6907932981713935e+02 0 3 0 0 -5 0 -P 39 21 5.6879342880917538e-01 7.5338012753840347e-02 1.3882129535590456e+01 1.3893981510846166e+01 0 2 0 0 -13 0 -P 40 21 4.0353127377792430e-01 -1.0794042666778709e+00 2.4382432099069892e+01 2.4409648627655276e+01 0 2 0 0 -13 0 -V -4 0 0 0 0 0 0 27 0 -P 6 -2 -2.5309383529199383e+01 2.5605502229007829e+01 3.5459450278646557e+01 5.0532952150964263e+01 0 3 0 0 -5 0 -P 11 2 1.6176455215218464e+00 -3.5208120614031763e-01 -8.1690576640657608e-01 1.8753594962580435e+00 3.3000000000000002e-01 2 0 0 -9 0 -P 12 21 3.6714966898125962e+00 -2.8959215128987843e+00 -1.0957485461237511e+00 4.8028027471995083e+00 0 2 0 0 -9 0 -P 13 21 9.0366392277633989e-02 -5.2691266877741805e-01 1.9123724213929416e-01 5.6778052815543023e-01 0 2 0 0 -9 0 -P 14 21 -5.4742252565373975e-02 9.9812434983835754e-02 5.6673941239040604e-01 5.7805951073393502e-01 0 2 0 0 -9 0 -P 15 21 -4.2785424343628164e-01 -3.2385695231399270e-01 -3.5095687498530953e-02 5.3774927844631759e-01 0 2 0 0 -9 0 -P 16 -4 2.9718367737999309e+00 -5.2406590168947231e-01 -2.3934560712361521e+00 4.1334115261319404e+00 1.5000000000000000e+00 2 0 0 -9 0 -P 17 4 3.7194740649112351e-02 1.2081735484703142e+00 -1.0381037228237732e+01 1.0558266936671616e+01 1.5000000000000000e+00 2 0 0 -11 0 -P 18 21 -3.8063394485410336e+00 5.6572199649196686e-01 -5.4033256081716328e+00 6.6335653311592448e+00 0 2 0 0 -11 0 -P 19 21 1.4421971897575430e+00 -1.4182830615990176e+00 5.7062472324337099e-01 2.1016831711130513e+00 0 2 0 0 -11 0 -P 20 21 2.7303036205130007e+00 -7.3316197951629114e-01 9.1820481918052266e-01 2.9724038148207561e+00 0 2 0 0 -11 0 -P 21 21 -2.0182388692079840e+00 1.5399105798395493e-01 -1.0724900871680109e+01 1.0914233829567960e+01 0 2 0 0 -11 0 -P 22 21 1.2491774325410158e-01 -5.4800394801420538e-01 -7.6805684279456621e+00 7.7011066831965493e+00 0 2 0 0 -11 0 -P 31 21 3.5609178221999949e-01 -1.2821539734905008e+00 -1.5993658274378207e+01 1.6048919750771034e+01 0 2 0 0 -13 0 -P 32 21 -5.7321384139990961e-01 1.8778171682794662e-01 1.6282864814338351e+00 1.7364195768210722e+00 0 2 0 0 -13 0 -P 33 21 3.1657101493395272e+00 -1.6119295557286719e+00 4.4063722475163161e+00 5.6600489420096816e+00 0 2 0 0 -13 0 -P 34 21 2.6326825731670658e+00 -1.7437994078856278e+00 2.2174731113567527e+00 3.8586319992440359e+00 0 2 0 0 -13 0 -P 35 21 6.8425955467206965e+00 -4.4447064866609622e+00 1.5000198384257514e+01 1.7075786398747489e+01 0 2 0 0 -13 0 -P 36 21 4.0164782232489156e+00 -5.4148487689946281e+00 1.3344639617162901e+01 1.4950989633494801e+01 0 2 0 0 -13 0 -P 37 21 3.9627824931833042e+00 -7.3524675138650126e+00 1.5839388268499249e+01 1.7906664802553045e+01 0 2 0 0 -13 0 -P 23 21 6.3545309142797402e-01 5.0932772066100540e-01 -1.0519858948403776e+01 1.0551333927648679e+01 0 2 0 0 -11 0 -P 24 21 -1.3293995544884336e+00 5.4471300945374300e-02 -2.4605532627938929e+00 2.7972473357117349e+00 0 2 0 0 -11 0 -P 26 2 -9.0376759228672943e-01 8.5542850621349587e-01 -2.0776141357023594e+03 2.0776145345862528e+03 3.3000000000000002e-01 2 0 0 -13 0 -P 27 21 4.5222474530545992e-01 3.0982198771832353e-01 -1.3647713867247677e+02 1.3647823957360674e+02 0 2 0 0 -13 0 -P 28 21 -9.6670908210745185e-02 -1.0947679481510482e+00 -1.0578578360202395e+02 1.0579149244820697e+02 0 2 0 0 -13 0 -P 29 21 -4.8393908701574007e-01 2.0274532889938918e-01 -2.1573305980675745e+01 2.1579685670653127e+01 0 2 0 0 -13 0 -P 30 21 1.5370980407646048e-01 8.1756875564613984e-01 -1.5100758824998671e+01 1.5123655724223996e+01 0 2 0 0 -13 0 -V -5 0 0 0 0 0 0 2 0 -P 7 -24 -1.9947058501930567e+01 2.7030936827831496e+01 2.9618547273355034e+02 3.0941145860556639e+02 8.2952153494395972e+01 3 0 0 -6 0 -P 8 22 -5.8563239941287950e+00 -1.9298209509462974e-01 8.3500314047580435e+00 1.0200823362537069e+01 0 3 0 0 -7 0 -V -6 0 0 0 0 0 0 1 0 -P 9 -24 -1.9947058501930567e+01 2.7030936827831496e+01 2.9618547273355034e+02 3.0941145860556639e+02 8.2952153494395972e+01 2 0 0 -8 0 -V -7 0 0 0 0 0 0 1 0 -P 10 22 -5.8563239941287950e+00 -1.9298209509462974e-01 8.3500314047580435e+00 1.0200823362537033e+01 0 1 0 0 0 0 -V -8 0 0 0 0 0 0 10 0 -P 42 -2 -3.0517819564912308e+01 1.0428844168876985e+01 7.4912511307218153e+01 8.1560354045635137e+01 3.3000000000000002e-01 2 0 0 -15 0 -P 43 21 -5.7206370395985298e+00 5.4834348217882312e-01 1.3778163054100464e+01 1.4928635096975666e+01 0 2 0 0 -15 0 -P 44 2 -2.2525958537263930e+00 1.3998775512003811e-01 5.1363462708508241e+00 5.6200300413691791e+00 3.3000000000000002e-01 2 0 0 -15 0 -P 45 -2 -3.3632312463497884e+00 3.1506842882115055e-01 4.6744576577204295e+00 5.7766813072113079e+00 3.3000000000000002e-01 2 0 0 -17 0 -P 46 21 -3.7285968742864894e+00 2.8910858542250293e+00 1.1679555837123013e+01 1.2596540660828801e+01 0 2 0 0 -17 0 -P 47 21 -1.8023297258181672e+00 2.5930887493787522e+00 1.4214934742857999e+01 1.4561485894181056e+01 0 2 0 0 -17 0 -P 48 21 4.5585582966435784e-01 6.8325648113844262e-01 4.4766795478450598e+00 4.5514067858796050e+00 0 2 0 0 -17 0 -P 49 21 1.8795211728249670e+00 2.1980346924035365e+00 1.6255259634668267e+01 1.6510524587019709e+01 0 2 0 0 -17 0 -P 50 21 1.0534179425365028e+01 3.0060939727642277e+00 5.9681656292270027e+01 6.0678708250320625e+01 0 2 0 0 -17 0 -P 51 1 1.4568595374906375e+01 4.2271332429249249e+00 9.1375908388900839e+01 9.2627091936149995e+01 3.3000000000000002e-01 2 0 0 -17 0 -V -9 0 0 0 0 0 0 1 0 -P 63 92 7.8687488814103510e+00 -4.5230258068361495e+00 -3.5832294167353105e+00 1.2495163086925176e+01 7.8047803369408015e+00 2 0 0 -10 0 -V -10 0 0 0 0 0 0 6 0 -P 64 321 1.7132926485905779e+00 -1.1048478524837397e+00 -3.9254690998346925e-01 2.1339621630642891e+00 4.9359999999999998e-01 1 0 0 0 0 -P 65 -311 7.0071389671228546e-01 -5.7580058229065734e-01 -6.8836441564177575e-01 1.2426050350911262e+00 4.9767000000000000e-01 2 0 0 -23 0 -P 66 -211 1.0077824213790697e-01 -4.4819776346861628e-01 6.6159383291203300e-01 8.1744949318836269e-01 1.3957000000000000e-01 1 0 0 0 0 -P 67 213 2.9009203059815278e+00 -1.7893295104458362e+00 -1.1484922938389688e+00 3.6608745191428511e+00 6.8258990418377041e-01 2 0 0 -24 0 -P 68 2112 5.5409088873312584e-01 1.6103136011254437e-01 -4.0047552306756740e-01 1.1730815152379661e+00 9.3957000000000002e-01 1 0 0 0 0 -P 69 -4122 1.8989528992549274e+00 -7.6588145825984388e-01 -1.6149441071155617e+00 3.4671903612005783e+00 2.2848999999999999e+00 2 0 0 -25 0 -V -11 0 0 0 0 0 0 1 0 -P 70 92 -2.2114133934649618e+00 -8.6294579771183808e-02 -4.4209313144221505e+03 4.4294798104102165e+03 2.7505055207618193e+02 2 0 0 -12 0 -V -12 0 0 0 0 0 0 28 0 -P 71 433 -1.0247884433601786e+00 1.2618214732734563e+00 -8.6694897878898782e+00 9.0699874159992895e+00 2.1124000000000001e+00 2 0 0 -26 0 -P 72 -311 1.5493234368667361e-01 -5.2903668164922500e-02 -2.2756098012880561e+00 2.3351398728649673e+00 4.9767000000000000e-01 2 0 0 -27 0 -P 73 311 -1.0479399410759047e+00 3.5508361290150353e-01 -1.2285977863989042e+00 1.7266703338789495e+00 4.9767000000000000e-01 2 0 0 -28 0 -P 74 -321 7.1709044630839699e-02 -8.0540288172282606e-02 -1.1040623347056104e+00 1.2141760679639282e+00 4.9359999999999998e-01 1 0 0 0 0 -P 75 323 -9.5436433963787692e-01 -2.9602351803484112e-01 -1.0976303074658433e+00 1.7459894215858962e+00 9.1937236874953221e-01 2 0 0 -29 0 -P 76 -313 4.5229065483994757e-01 8.1631980606907503e-02 -5.8961679501597064e-01 1.1604642453115961e+00 8.8758024029850513e-01 2 0 0 -30 0 -P 77 113 -2.4190544648866458e-01 -1.5219642166406071e-02 2.7578108978004551e-01 9.1680871617924098e-01 8.4007924032998516e-01 2 0 0 -31 0 -P 78 -211 9.1225699860842469e-01 -2.2413756750953776e-01 -9.7235135008989171e-02 9.5466482969645439e-01 1.3957000000000000e-01 1 0 0 0 0 -P 92 -213 -3.7677031801546979e-01 -2.2171436967981403e-01 -7.8528785468690341e+00 7.8980386958816329e+00 7.2124935737075968e-01 2 0 0 -41 0 -P 93 111 6.5806093929116216e-01 1.7165685794549929e-01 -8.5486801528223268e+01 8.5489613201855903e+01 1.3497999999999999e-01 2 0 0 -42 0 -P 94 323 -4.8433024369999383e-01 -1.4687330505886736e-01 -8.3957716820012237e+01 8.3964255353447285e+01 9.1750524621514085e-01 2 0 0 -43 0 -P 95 331 3.5807589393682532e-01 -1.5224080954598848e-01 -4.3981009527858146e+02 4.3981131055034541e+02 9.5790576133122218e-01 2 0 0 -44 0 -P 96 -313 -4.8374978977586536e-01 -3.5240006944584942e-02 -6.3924051825900631e+02 6.3924131911008010e+02 8.8804157285665164e-01 2 0 0 -45 0 -P 97 2114 2.5503907680222165e-01 4.3505021898565793e-01 -1.9084717226924338e+03 1.9084721994174818e+03 1.2511271521563039e+00 2 0 0 -46 0 -P 98 223 -8.2278535331352418e-02 -1.5371015913753452e-01 -1.2132425478781010e+03 1.2132428143693633e+03 7.8500992134931347e-01 2 0 0 -47 0 -P 79 211 -1.6019746019187674e-02 -1.0962764287148888e-01 -3.9451013408667096e-01 4.3288899632718902e-01 1.3957000000000000e-01 1 0 0 0 0 -P 80 -211 2.2284319500814491e-02 -1.1912520537149757e-01 8.0408625454810090e-02 2.0157563691564462e-01 1.3957000000000000e-01 1 0 0 0 0 -P 81 111 2.6147842628995627e-01 -5.3714869055077885e-01 3.2448827889606002e-01 6.9311754177514195e-01 1.3497999999999999e-01 2 0 0 -32 0 -P 82 223 8.0109014259129629e-01 -6.0688849198709971e-01 -2.0305333370163012e-01 1.2882559187308529e+00 7.7994461185036024e-01 2 0 0 -33 0 -P 83 211 1.0621591005162476e+00 -2.6715583755681332e-01 -2.2047937637000264e-01 1.1258974805259456e+00 1.3957000000000000e-01 1 0 0 0 0 -P 84 -213 -3.9080845150093041e-01 2.6753344288388836e-01 -1.4175065470742074e+00 1.6446536225973012e+00 6.8648039920912651e-01 2 0 0 -34 0 -P 85 213 -7.0973282225719359e-01 3.4100256795269435e-01 -4.5663121010528904e+00 4.6984477584393929e+00 7.7730412595238718e-01 2 0 0 -35 0 -P 86 113 -2.3157800835597475e-01 -5.5195889026928313e-01 -5.6838651946392025e+00 5.7714335617292285e+00 8.0301607463498115e-01 2 0 0 -36 0 -P 87 111 -4.6066273585814793e-01 3.9227103753437581e-01 -4.7966952888036269e+00 4.8365888823764545e+00 1.3497999999999999e-01 2 0 0 -37 0 -P 88 311 2.7517509894565889e-01 -1.1487381757051843e-01 -2.1239959178119161e+00 2.2018063985792806e+00 4.9767000000000000e-01 2 0 0 -38 0 -P 89 -323 -7.0371163798211422e-01 -2.0006265444806237e-01 -4.1983731881486621e+00 4.3521687974762546e+00 8.8306323648086882e-01 2 0 0 -39 0 -P 90 211 -1.0761954765935261e-01 -1.6382379153854643e-01 -2.3860134843071883e+00 2.3981159967583294e+00 1.3957000000000000e-01 1 0 0 0 0 -P 91 111 -1.7970542608682286e-01 6.5692258472370091e-01 -2.4966648992850491e+00 2.5914082160491692e+00 1.3497999999999999e-01 2 0 0 -40 0 -V -13 0 0 0 0 0 1 1 0 -P 38 21 1.1792977287052229e+00 3.1505474039551125e+00 1.2907478596245630e+02 1.2911861625393684e+02 0 2 0 0 -13 0 -P 99 92 2.1325344736888994e+01 -1.9078086942355402e+01 4.2593028050939884e+03 9.0133192852153970e+03 7.9433900450641822e+03 2 0 0 -14 0 -V -14 0 0 0 0 0 0 39 0 -P 100 211 -6.4145635586214866e-01 7.4210211658539504e-01 -1.2602904261354940e+03 1.2602908155939158e+03 1.3957000000000000e-01 1 0 0 0 0 -P 101 -213 2.5952690952053969e-01 1.7113996608260679e-01 -5.5927702746122156e+02 5.5927759069273088e+02 7.3031643899164966e-01 2 0 0 -48 0 -P 102 211 4.2014540449212504e-02 -3.5537589858044005e-01 -7.2949847678164119e+01 7.2950858893526046e+01 1.3957000000000000e-01 1 0 0 0 0 -P 103 223 -6.3998361774731272e-01 2.5907507037149113e-02 -1.3487047205365673e+02 1.3487424091129336e+02 7.7870353248628366e-01 2 0 0 -49 0 -P 104 -213 -1.2839848855141253e-01 -2.0565346315218563e-01 -7.5718320753566431e+01 7.5722517718575858e+01 7.5948165303639892e-01 2 0 0 -50 0 -P 120 213 1.6442662451119143e+00 -1.1808050207330052e+00 3.0613568265944324e+00 3.7231193798014286e+00 6.2593954557443632e-01 2 0 0 -61 0 -P 121 -211 2.3285071815343761e+00 -1.4930049131139151e+00 3.7980187414499524e+00 4.7005782102146254e+00 1.3957000000000000e-01 1 0 0 0 0 -P 122 113 2.0705991745434469e+00 -2.1281647954902798e+00 5.8472746169042855e+00 6.6028251690195514e+00 7.6825349251449815e-01 2 0 0 -62 0 -P 123 213 1.6982439540579044e+00 -2.0586767864933027e+00 5.4934725034644734e+00 6.1605691667856659e+00 8.0758261106179852e-01 2 0 0 -63 0 -P 124 113 2.9418564684892945e+00 -3.1012166205676479e+00 5.9093890342429791e+00 7.3452154730835240e+00 8.7134813887281681e-01 2 0 0 -64 0 -P 125 2112 2.3972505494101850e+00 -3.1969828230803983e+00 9.5256435215448363e+00 1.0372472494645029e+01 9.3957000000000002e-01 1 0 0 0 0 -P 126 -2112 3.4184366439918845e+00 -3.6749985902842326e+00 9.6543481666732056e+00 1.0921563717518836e+01 9.3957000000000002e-01 1 0 0 0 0 -P 127 313 7.2107705342681427e-01 -1.9937173017311436e+00 4.6809918289416128e+00 5.2178012042881861e+00 9.0493320673532929e-01 2 0 0 -65 0 -P 128 -313 2.7935483674053357e-01 -8.1871255653283084e-02 1.1718388726820061e+01 1.1756180517434442e+01 8.9577004768472279e-01 2 0 0 -66 0 -P 129 113 -8.2708674444163105e-02 3.4522701208939077e-01 6.1206736781408893e+00 6.1737560715212680e+00 7.2566889257740352e-01 2 0 0 -67 0 -P 130 311 2.4695926864221421e-01 4.1868501205522318e-01 1.8281949053007391e+01 1.8295180311364682e+01 4.9767000000000000e-01 2 0 0 -68 0 -P 131 -311 2.9376002073213692e-01 5.4077841199444876e-01 2.3165952234661379e+01 2.3179468384934378e+01 4.9767000000000000e-01 2 0 0 -69 0 -P 132 -211 8.2622565565000405e-01 2.0025688618269719e-01 1.2637005194543391e+01 1.2666338528806758e+01 1.3957000000000000e-01 1 0 0 0 0 -P 133 221 -1.9997941753530871e-01 6.5041493910278059e-01 4.3772957762713439e+01 4.3781669271045850e+01 5.4744999999999999e-01 2 0 0 -70 0 -P 134 2224 1.1786850791080654e+00 3.2621875180768561e-01 6.7450236130820841e+01 6.7471056333264244e+01 1.1460241852960338e+00 2 0 0 -71 0 -P 105 323 -1.9872082796055467e-02 2.6794098698287805e-01 -6.8108399991638535e+01 6.8114172641420211e+01 8.4509048745704018e-01 2 0 0 -51 0 -P 106 -321 2.7142152013196741e-01 5.2993467515270787e-01 -2.6160140573056200e+01 2.6171570380158332e+01 4.9359999999999998e-01 1 0 0 0 0 -P 107 211 2.9437631694032651e-01 -4.6347150711519880e-01 -6.0143844523795785e+01 6.0146512593344127e+01 1.3957000000000000e-01 1 0 0 0 0 -P 108 -213 2.4619007605199436e-01 -6.0434473709003467e-01 -5.8018576150880186e+01 5.8030267612341916e+01 9.6485152730442514e-01 2 0 0 -52 0 -P 109 323 -9.9384342697108385e-02 -5.3376492002751497e-01 -2.0781667217870002e+01 2.0807229643207261e+01 8.7654482683159274e-01 2 0 0 -53 0 -P 110 -323 -2.7981634786068688e-01 3.1851689070453132e-01 -2.3479670779247950e+01 2.3502171437618404e+01 9.3668147368348154e-01 2 0 0 -54 0 -P 111 213 6.3127980478257359e-04 8.7114195588813836e-01 -3.8001408612870264e+00 3.9658129295852458e+00 7.2643851840290274e-01 2 0 0 -55 0 -P 112 223 1.1771085064566952e-01 -1.8207163509755123e-01 -9.8029417254923035e-01 1.2741930596758400e+00 7.8459248271014903e-01 2 0 0 -56 0 -P 113 2112 1.9209205934717882e-01 -5.3351059012014823e-01 -4.1646177314502335e+00 4.3067813437698792e+00 9.3957000000000002e-01 1 0 0 0 0 -P 114 113 -2.7598565373989276e-01 3.7960657283068916e-01 -4.9916024639480350e-01 1.0051155152174889e+00 7.3540942076064020e-01 2 0 0 -57 0 -P 115 -2112 -9.9845269053552094e-02 -3.5876231396345826e-01 -1.8622805531032363e+00 2.1188582111692340e+00 9.3957000000000002e-01 1 0 0 0 0 -P 116 -213 3.7849030650847143e-01 3.7784357170711968e-03 -9.0606253780559282e-02 1.0192850428959987e+00 9.4205271442207850e-01 2 0 0 -58 0 -P 117 321 5.8085707824128519e-01 -9.7162071509718617e-01 3.6764844693599641e-01 1.2885061505027517e+00 4.9359999999999998e-01 1 0 0 0 0 -P 118 333 4.7060519423644726e-01 1.3602005935586783e-01 1.1809574745448215e+00 1.6340056336417663e+00 1.0175181318778792e+00 2 0 0 -59 0 -P 119 -323 1.4599984686426251e+00 -7.3997071978743245e-01 2.5814573561830843e+00 3.1906207354049889e+00 9.1486960864539102e-01 2 0 0 -60 0 -P 135 -213 -6.0071912138819927e-01 -1.7948907599716118e-01 5.4158753007648563e+01 5.4167324041288985e+01 7.3170120904424785e-01 2 0 0 -72 0 -P 136 -2214 4.8755136324043447e-01 -5.7626612657803589e-01 1.5857152644493947e+03 1.5857159489133173e+03 1.2652830783436040e+00 2 0 0 -73 0 -P 137 113 -4.1376307441085342e-01 -8.6244447369672600e-02 1.4358186673828980e+03 1.4358189407957868e+03 7.7878414697202980e-01 2 0 0 -74 0 -P 138 2224 -3.9430912224019385e-02 -3.0577286480143262e-01 3.3195578920930161e+03 3.3195581504912811e+03 1.2729824133344914e+00 2 0 0 -75 0 -V -15 0 0 0 0 0 0 1 0 -P 139 92 -3.8491052458237228e+01 1.1117175406175845e+01 9.3827020632169436e+01 1.0210901918397998e+02 4.1939587087132457e+00 2 0 0 -16 0 -V -16 0 0 0 0 0 0 5 0 -P 140 -211 -1.9166473046608434e+01 6.1868455401856188e+00 4.6556411760049734e+01 5.0726223026563673e+01 1.3957000000000000e-01 1 0 0 0 0 -P 141 211 -3.8214210133710984e+00 4.1209563848882319e-01 8.8452891185503653e+00 9.6452942283966223e+00 1.3957000000000000e-01 1 0 0 0 0 -P 142 -211 -1.9337263835215596e-01 3.8299880626085796e-02 7.4065220340539428e-01 7.7904128865453037e-01 1.3957000000000000e-01 1 0 0 0 0 -P 143 -313 -8.2556654128106732e+00 2.7128082773100708e+00 2.0430817739322297e+01 2.2220577016158007e+01 9.0575342995889496e-01 2 0 0 -76 0 -P 144 323 -7.0541203470947975e+00 1.7671260695652278e+00 1.7253849810841484e+01 1.8737883624206951e+01 7.2773690452967910e-01 2 0 0 -77 0 -V -17 0 0 0 0 0 0 1 0 -P 145 92 1.8543993956306284e+01 1.5913761421656066e+01 2.0235845210138564e+02 2.0730243942159109e+02 3.7791940130625008e+01 2 0 0 -18 0 -V -18 0 0 0 0 0 0 14 0 -P 151 2212 5.8338973945168648e-01 1.6779417880182423e+00 1.4261748231538144e+01 1.4402556906492567e+01 9.3827000000000005e-01 1 0 0 0 0 -P 152 111 1.4165244960744796e+00 4.6731499980347514e-02 6.0300599428003485e+00 6.1958508693507808e+00 1.3497999999999999e-01 2 0 0 -79 0 -P 153 -211 -8.8908673032611560e-03 7.5389806891575817e-01 4.3882568137415596e+00 4.4547411814925377e+00 1.3957000000000000e-01 1 0 0 0 0 -P 154 113 1.8185267740322264e+00 1.0824417118785685e+00 1.1430218213996847e+01 1.1643291552010357e+01 6.6153613510060250e-01 2 0 0 -80 0 -P 155 213 1.5036150668328048e+00 3.5431629391135439e-01 8.4987502245096724e+00 8.6550697519553221e+00 5.4321149405278735e-01 2 0 0 -81 0 -P 156 223 4.6405083798304085e+00 1.6629892500258932e+00 3.0667601777968951e+01 3.1071117824765778e+01 7.8275973287819944e-01 2 0 0 -82 0 -P 157 -213 3.9970063450751039e+00 1.4686799434037365e+00 2.8332911049604355e+01 2.8661754230859430e+01 7.8052965777654093e-01 2 0 0 -83 0 -P 158 113 9.3580203216703879e+00 3.1521852498297869e+00 5.4878039383787858e+01 5.5765298071186237e+01 8.1267839249976626e-01 2 0 0 -84 0 -P 159 221 2.8855367459185346e+00 6.9662349745004337e-01 1.5936383535813000e+01 1.6219729600467367e+01 5.4744999999999999e-01 2 0 0 -85 0 -P 146 -2112 -2.6743483898333138e+00 8.2173272799491937e-01 3.9048032086408360e+00 4.8946566651373811e+00 9.3957000000000002e-01 1 0 0 0 0 -P 147 -211 -3.4761870385601772e+00 1.5018145990736227e+00 1.0041938198918368e+01 1.0733094893498349e+01 1.3957000000000000e-01 1 0 0 0 0 -P 148 2212 -1.5117020725326820e+00 1.9137806911799142e+00 8.1880940760776273e+00 8.5949424012979971e+00 9.3827000000000005e-01 1 0 0 0 0 -P 149 113 -1.2447883978844071e-01 2.5267362074443822e-01 1.5280844145927219e+00 1.6030732744200233e+00 3.9428797199936710e-01 2 0 0 -78 0 -P 150 -2212 1.3647329543852704e-01 5.2795247924943911e-01 4.2715630293953559e+00 4.4072621986569747e+00 9.3827000000000005e-01 1 0 0 0 0 -V -19 0 0 0 0 0 9 1 0 -P 52 3 1.0101998152855945e+01 6.4603650197245228e+00 2.6444321311193690e+01 2.9035991673749287e+01 0 2 0 0 -19 0 -P 53 21 -1.1792977287052229e+00 -3.1505474039551125e+00 3.5604699631516148e+00 4.8983301681289770e+00 0 2 0 0 -19 0 -P 54 21 5.4393098289857278e+00 1.2064682052724261e-01 -6.0927087448274282e+00 8.1683380757838790e+00 0 2 0 0 -19 0 -P 55 21 4.3229282211027176e+00 8.4560344871155246e-01 -3.2960883103994504e+01 3.3253910575937830e+01 0 2 0 0 -19 0 -P 56 21 2.9321949272632235e+00 6.6737924249356242e+00 -6.4867381486965698e+01 6.5275680413138062e+01 0 2 0 0 -19 0 -P 57 21 -4.3229282211027176e+00 -8.4560344871155246e-01 -3.3185882553128543e+01 3.3476940637210568e+01 0 2 0 0 -19 0 -P 58 21 -2.9321949272632235e+00 -6.6737924249356242e+00 -1.3725188086854727e+01 1.5540851342257129e+01 0 2 0 0 -19 0 -P 59 21 -5.4393098289857278e+00 -1.2064682052724261e-01 -6.8094310938794118e+00 8.7160196703137292e+00 0 2 0 0 -19 0 -P 60 -3 -1.0101998152855945e+01 -6.4603650197245228e+00 -1.0742083072280693e+01 1.6099038219724946e+01 0 2 0 0 -19 0 -P 160 92 -1.1792977287052206e+00 -3.1505474039551116e+00 -1.3837876686758571e+02 2.1446510077624441e+02 1.6381477234698198e+02 2 0 0 -20 0 -V -20 0 0 0 0 0 0 36 0 -P 161 -313 8.2000806394988448e+00 5.4003406550455937e+00 2.2177543996883074e+01 2.4268717313332942e+01 8.4981210626819303e-01 2 0 0 -86 0 -P 162 3214 1.1200777844798961e+00 4.1111180711726349e-02 3.7259896703360691e+00 4.1247208876059354e+00 1.3689627477534603e+00 2 0 0 -87 0 -P 163 -3122 5.4889822392614185e-01 6.7168289205653042e-02 1.2394553573684344e+00 1.7569269434479631e+00 1.1156800000000000e+00 2 0 0 -88 0 -P 164 -211 -1.8246867227292973e-01 -7.4395915930269774e-01 9.3316746363469338e-01 1.2153400129831278e+00 1.3957000000000000e-01 1 0 0 0 0 -P 165 213 -2.4505059959837305e-01 -1.9411646561574297e-01 4.9179202248504200e-01 1.1013212363778255e+00 9.3451488684246398e-01 2 0 0 -89 0 -P 166 111 1.0831519365169956e-01 -8.5977649139333909e-02 -1.2164921808366023e-01 2.2834725745604548e-01 1.3497999999999999e-01 2 0 0 -90 0 -P 167 2112 2.1446758121909784e-01 -3.2834007745682020e-01 2.5652908362645738e-01 1.0499535730233749e+00 9.3957000000000002e-01 1 0 0 0 0 -P 168 -3122 -1.6966076865868715e-01 -3.3109432038849090e-01 -2.5618579747388798e-01 1.2036532933709381e+00 1.1156800000000000e+00 2 0 0 -91 0 -P 169 -323 1.8511690574403743e+00 7.7549450304113823e-02 -1.7771148289683374e+00 2.7167454062741467e+00 8.8866624258231075e-01 2 0 0 -92 0 -P 190 3322 -8.9819328650589736e-01 -1.4101551478664545e+00 -4.9514548113054522e+00 5.3889846427113186e+00 1.3149000000000000e+00 2 0 0 -104 0 -P 191 311 -9.8211331445284256e-01 -7.9298343389061809e-01 -1.4504485608208735e+00 1.9861635746679696e+00 4.9767000000000000e-01 2 0 0 -105 0 -P 192 -3212 -1.7421317431910346e+00 -8.2221491446806805e-01 -3.7329995940397152e+00 4.3667518646939678e+00 1.1925500000000000e+00 2 0 0 -106 0 -P 193 211 -1.4263310139354122e+00 -6.0848557736261411e-01 -2.6734691732657865e+00 3.0937989696285668e+00 1.3957000000000000e-01 1 0 0 0 0 -P 194 -211 -2.5524022272364206e+00 -5.2387494780839883e-01 -2.0619036105597894e+00 3.3256771302521524e+00 1.3957000000000000e-01 1 0 0 0 0 -P 195 211 -2.0644196153139507e-01 1.6631552161324753e-02 -9.1057393117718233e-01 9.4420313547863910e-01 1.3957000000000000e-01 1 0 0 0 0 -P 196 311 -9.4646039874614889e+00 -5.6457554838761190e+00 -1.0111196049899565e+01 1.4964532889856393e+01 4.9767000000000000e-01 2 0 0 -107 0 -P 170 221 1.1371300019760869e-01 -4.0058843868012450e-01 -1.2195001765893660e+00 1.4001013987635382e+00 5.4744999999999999e-01 2 0 0 -93 0 -P 171 2212 1.2523629043783191e-01 1.5016324154887450e-01 -1.0511017569858179e+00 1.4224621696177961e+00 9.3827000000000005e-01 1 0 0 0 0 -P 172 -211 5.5214282633985745e-01 1.1107501711974165e-01 -2.9656055335364906e+00 3.0218364160802897e+00 1.3957000000000000e-01 1 0 0 0 0 -P 173 -3114 2.4243956428752380e+00 1.3862290434432972e-01 -3.4795719084528560e+00 4.4684697068205574e+00 1.4010318739691290e+00 2 0 0 -94 0 -P 174 -321 9.7258158118116156e-01 -3.2442714147895962e-01 -5.7679095353058232e+00 5.8790806483371956e+00 4.9359999999999998e-01 1 0 0 0 0 -P 175 321 1.1597250287476084e+00 4.0770177789498285e-01 -8.7674225604355964e+00 8.8669342049683344e+00 4.9359999999999998e-01 1 0 0 0 0 -P 176 -321 1.2473896171875081e+00 5.8064712076131186e-01 -7.6950130852787115e+00 7.8326240353106558e+00 4.9359999999999998e-01 1 0 0 0 0 -P 177 211 4.6411646485160624e-01 -3.1056116558930160e-03 -6.8807161452354304e+00 6.8977639995852016e+00 1.3957000000000000e-01 1 0 0 0 0 -P 178 113 1.1429721118154468e+00 2.0039644079081445e+00 -1.8192672029751531e+01 1.8365275501470027e+01 9.9386622150112869e-01 2 0 0 -95 0 -P 179 113 -3.7950464568590037e-01 6.9483727246069926e-01 -1.1395936644018100e+01 1.1448140272842123e+01 7.5214433514938095e-01 2 0 0 -96 0 -P 180 -211 1.1066748123962553e+00 1.5207401839636081e+00 -2.0061478070674706e+01 2.0149932059750874e+01 1.3957000000000000e-01 1 0 0 0 0 -P 181 211 2.4841143236311466e-02 2.3230814679517509e-01 -4.8359467720177013e-01 5.5491238423969202e-01 1.3957000000000000e-01 1 0 0 0 0 -P 182 221 -4.2542141885817947e-01 5.9981854143176938e-01 -9.4453389518417676e+00 9.4897257644226993e+00 5.4744999999999999e-01 2 0 0 -97 0 -P 183 111 -3.2417120919680359e-01 -3.9808752168111899e-01 -7.9310594479818883e+00 7.9488039487468249e+00 1.3497999999999999e-01 2 0 0 -98 0 -P 184 111 -5.0210374058263441e-01 1.5238011936667630e+00 -8.2367846286676585e+00 8.3926705442060054e+00 1.3497999999999999e-01 2 0 0 -99 0 -P 185 -211 2.4005831721027357e-01 -3.1272585897954058e-01 -3.1418638717544294e+00 3.1695762858893386e+00 1.3957000000000000e-01 1 0 0 0 0 -P 186 111 -7.1801802285008720e-01 -1.5663690926018516e+00 -4.6475347856871210e+00 4.9585140112706885e+00 1.3497999999999999e-01 2 0 0 -100 0 -P 187 213 -8.7754060313250792e-01 1.0687002965254111e-01 -7.7721991707009082e+00 7.8598301364746987e+00 7.6704048902773225e-01 2 0 0 -101 0 -P 188 -213 -1.7607285674592426e+00 -2.1828765548774491e+00 -9.9325807070362337e+00 1.0374911328171784e+01 1.0571236557461503e+00 2 0 0 -102 0 -P 189 111 6.0732737211851184e-02 -1.4876097180116929e-01 -8.8365199189003499e-02 2.2769782811477235e-01 1.3497999999999999e-01 2 0 0 -103 0 -V -21 0 0 0 0 0 2 1 0 -P 61 1 2.6048674114218304e+00 1.3071749066125802e+00 -4.9087263234386977e+00 5.7087331857413925e+00 0 2 0 0 -21 0 -P 62 -1 -2.6048674114218304e+00 -1.3071749066125802e+00 3.9636024064472406e+00 4.9197748428113490e+00 0 2 0 0 -21 0 -P 197 92 0 0 -9.4512391699145715e-01 1.0628508028552741e+01 1.0586402774056010e+01 2 0 0 -22 0 -V -22 0 0 0 0 0 0 7 0 -P 198 2112 8.8440371644850424e-01 7.2509545653771157e-01 -1.6825725857017333e+00 2.2409318699627123e+00 9.3957000000000002e-01 1 0 0 0 0 -P 199 111 1.2648914843620779e-01 -7.9047867519565176e-02 -4.6372272917197632e-01 5.0547644849410533e-01 1.3497999999999999e-01 2 0 0 -108 0 -P 200 -2112 7.9792227079239864e-01 4.2225813261826067e-01 -1.8859938515610912e+00 2.2923233789792832e+00 9.3957000000000002e-01 1 0 0 0 0 -P 201 313 -3.4282732844273572e-01 -3.3700984327477074e-01 4.3482101578220667e-01 1.2094706287093313e+00 1.0210992480427190e+00 2 0 0 -109 0 -P 202 -321 3.5673637654704443e-01 4.8759571964329723e-01 3.3223694327211195e-01 8.4795800287583600e-01 4.9359999999999998e-01 1 0 0 0 0 -P 203 321 -1.2446271985425277e+00 -6.2023897699434571e-01 1.2956105175346537e+00 1.9636804284509302e+00 4.9359999999999998e-01 1 0 0 0 0 -P 204 -313 -5.7809698523889164e-01 -5.9865262101058792e-01 1.0244967728543724e+00 1.5686672710805456e+00 8.4766873528821429e-01 2 0 0 -110 0 -V -23 0 0 0 0 0 0 1 0 -P 205 130 7.0071389671228546e-01 -5.7580058229065734e-01 -6.8836441564177575e-01 1.2426050350911262e+00 4.9767000000000000e-01 1 0 0 0 0 -V -24 0 0 0 0 0 0 2 0 -P 206 211 2.3601805446980989e-01 -2.6618733465545696e-01 -2.6116918438156855e-01 4.6287076699357904e-01 1.3957000000000000e-01 1 0 0 0 0 -P 207 111 2.6649022515117178e+00 -1.5231421757903791e+00 -8.8732310945740023e-01 3.1980037521492721e+00 1.3497999999999999e-01 2 0 0 -111 0 -V -25 0 5.6566919601848354e-03 -2.2814444155476094e-03 -4.8106729505785935e-03 1.0328232916324018e-02 0 3 0 -P 210 -2214 7.5977813013376927e-01 -1.0292071107408740e-01 -1.0394990117134257e+00 1.7454207711993177e+00 1.1739165189157490e+00 2 0 0 -114 0 -P 208 311 9.8128386922335242e-01 -7.1757193254617169e-01 -6.8412429949797804e-01 1.4810567161454691e+00 4.9767000000000000e-01 2 0 0 -112 0 -P 209 111 1.5789089989780553e-01 5.4611185360415225e-02 1.0867920409584220e-01 2.4071287385579151e-01 1.3497999999999999e-01 2 0 0 -113 0 -V -26 0 0 0 0 0 0 2 0 -P 211 431 -8.9544496400355400e-01 1.0812584738803073e+00 -7.5166320522356385e+00 7.8959287756155350e+00 1.9684999999999999e+00 2 0 0 -115 0 -P 212 22 -1.2934347935662455e-01 1.8056299939314888e-01 -1.1528577356542393e+00 1.1740586403837536e+00 0 1 0 0 0 0 -V -27 0 0 0 0 0 0 1 0 -P 213 130 1.5493234368667361e-01 -5.2903668164922500e-02 -2.2756098012880561e+00 2.3351398728649673e+00 4.9767000000000000e-01 1 0 0 0 0 -V -28 0 0 0 0 0 0 1 0 -P 214 310 -1.0479399410759047e+00 3.5508361290150353e-01 -1.2285977863989042e+00 1.7266703338789495e+00 4.9767000000000000e-01 2 0 0 -116 0 -V -29 0 0 0 0 0 0 2 0 -P 215 311 -6.3303113772774122e-01 -2.0717802444266725e-01 -3.2448067298090227e-01 8.9253251547659829e-01 4.9767000000000000e-01 2 0 0 -117 0 -P 216 211 -3.2133320191013570e-01 -8.8845493592173877e-02 -7.7314963448494112e-01 8.5345690610929803e-01 1.3957000000000000e-01 1 0 0 0 0 -V -30 0 0 0 0 0 0 2 0 -P 217 -311 2.9210454944064679e-01 -1.6108553023224306e-01 -1.5223884321452796e-01 6.1816317436209656e-01 4.9767000000000000e-01 2 0 0 -118 0 -P 218 111 1.6018610539930081e-01 2.4271751083915055e-01 -4.3737795180144273e-01 5.4230107094949964e-01 1.3497999999999999e-01 2 0 0 -119 0 -V -31 0 0 0 0 0 0 2 0 -P 219 -211 1.9395608964315619e-02 -2.0304028947714121e-03 5.1617951780191884e-01 5.3507138933158549e-01 1.3957000000000000e-01 1 0 0 0 0 -P 220 211 -2.6130105545298021e-01 -1.3189239271634661e-02 -2.4039842802187339e-01 3.8173732684765543e-01 1.3957000000000000e-01 1 0 0 0 0 -V -32 0 8.0482296730048227e-05 -1.6533279978182732e-04 9.9876545526457765e-05 2.1333955713841350e-04 0 2 0 -P 221 22 5.4686178191785839e-02 -5.8094679943429033e-02 2.1759714948860068e-03 7.9814189057458726e-02 0 1 0 0 0 0 -P 222 22 2.0679224809817040e-01 -4.7905401060734981e-01 3.2231230740117400e-01 6.1330335271768321e-01 0 1 0 0 0 0 -V -33 0 0 0 0 0 0 3 0 -P 223 -211 4.2801781509197134e-01 -1.0403622668171376e-01 -1.1956260927992245e-01 4.7728166624761242e-01 1.3957000000000000e-01 1 0 0 0 0 -P 224 211 3.2705663503245730e-01 -4.8246898921629483e-01 -1.9339384413010952e-01 6.2978038388121327e-01 1.3957000000000000e-01 1 0 0 0 0 -P 225 111 4.6015692466867701e-02 -2.0383276089091178e-02 1.0990311970840183e-01 1.8119386860202738e-01 1.3497999999999999e-01 2 0 0 -120 0 -V -34 0 0 0 0 0 0 2 0 -P 226 -211 -2.1866773818747592e-01 3.1579766966145423e-01 -1.3502781361186795e+00 1.4107709160837443e+00 1.3957000000000000e-01 1 0 0 0 0 -P 227 111 -1.7214071331345446e-01 -4.8264226777565866e-02 -6.7228410955527756e-02 2.3388270651355680e-01 1.3497999999999999e-01 2 0 0 -121 0 -V -35 0 0 0 0 0 0 2 0 -P 228 211 -3.9269766283052082e-01 -1.2163004153164388e-01 -1.0675916516465207e+00 1.1524916663303422e+00 1.3957000000000000e-01 1 0 0 0 0 -P 229 111 -3.1703515942667282e-01 4.6263260948433826e-01 -3.4987204494063704e+00 3.5459560921090518e+00 1.3497999999999999e-01 2 0 0 -122 0 -V -36 0 0 0 0 0 0 2 0 -P 230 -211 -2.5667807075318744e-01 -1.0146763652409606e-01 -7.0052877713175954e-01 7.6576737052259081e-01 1.3957000000000000e-01 1 0 0 0 0 -P 231 211 2.5100062397212689e-02 -4.5049125374518711e-01 -4.9833364175074433e+00 5.0056661912066387e+00 1.3957000000000000e-01 1 0 0 0 0 -V -37 0 -2.1056308062828918e-04 1.7930210471794663e-04 -2.1925084410489518e-03 2.2107432955447886e-03 0 2 0 -P 232 22 -2.3018986810834105e-01 2.7063917719313463e-01 -3.0344545295281806e+00 3.0551836657369069e+00 0 1 0 0 0 0 -P 233 22 -2.3047286774980685e-01 1.2163186034124118e-01 -1.7622407592754459e+00 1.7814052166395471e+00 0 1 0 0 0 0 -V -38 0 0 0 0 0 0 1 0 -P 234 310 2.7517509894565889e-01 -1.1487381757051843e-01 -2.1239959178119161e+00 2.2018063985792806e+00 4.9767000000000000e-01 2 0 0 -123 0 -V -39 0 0 0 0 0 0 2 0 -P 235 -321 -2.9230515250873707e-01 6.8174647361061602e-02 -1.5259649802190853e+00 1.6316556516560088e+00 4.9359999999999998e-01 1 0 0 0 0 -P 236 111 -4.1140648547337716e-01 -2.6823730180912397e-01 -2.6724082079295770e+00 2.7205131458202456e+00 1.3497999999999999e-01 2 0 0 -124 0 -V -40 0 -4.3948076794121348e-05 1.6065449346688851e-04 -6.1057488976406712e-04 6.3374495564102974e-04 0 2 0 -P 237 22 -2.3452133138899382e-02 1.5314581901608029e-01 -3.8829621787147561e-01 4.1806410662022048e-01 0 1 0 0 0 0 -P 238 22 -1.5625329294792351e-01 5.0377676570762064e-01 -2.1083686814135736e+00 2.1733441094289487e+00 0 1 0 0 0 0 -V -41 0 0 0 0 0 0 2 0 -P 239 -211 -1.5863681543682859e-01 3.1354292411407046e-02 -6.1213933937085041e-01 6.4833871284224542e-01 1.3957000000000000e-01 1 0 0 0 0 -P 240 111 -2.1813350257864123e-01 -2.5306866209122109e-01 -7.2407392074981836e+00 7.2496999830393873e+00 1.3497999999999999e-01 2 0 0 -125 0 -V -42 0 3.5910695792528850e-04 9.3673956898613795e-05 -4.6650550741745643e-02 4.6652085085306563e-02 0 2 0 -P 241 22 3.4522379636973621e-01 1.5547952859967618e-01 -4.9535364031978155e+01 4.9536810990757047e+01 0 1 0 0 0 0 -P 242 22 3.1283714292142595e-01 1.6177329345823128e-02 -3.5951437496245113e+01 3.5952802211098856e+01 0 1 0 0 0 0 -V -43 0 0 0 0 0 0 2 0 -P 243 311 -3.9600823279035513e-01 8.5430585125442424e-02 -3.6195759503890365e+01 3.6201447517988591e+01 4.9767000000000000e-01 2 0 0 -126 0 -P 244 211 -8.8322010909638760e-02 -2.3230389018430980e-01 -4.7761957316121880e+01 4.7762807835458695e+01 1.3957000000000000e-01 1 0 0 0 0 -V -44 0 0 0 0 0 0 3 0 -P 245 111 5.2116772754951829e-02 1.2637830758610888e-01 -7.9018190793191891e+01 7.9018424329167104e+01 1.3497999999999999e-01 2 0 0 -127 0 -P 246 111 -5.2246677240471596e-03 -1.4230926848259157e-01 -7.6470870445203118e+01 7.6471122166949328e+01 1.3497999999999999e-01 2 0 0 -128 0 -P 247 221 3.1118378890592058e-01 -1.3630984864950577e-01 -2.8432103404018636e+02 2.8432176405422894e+02 5.4744999999999999e-01 2 0 0 -129 0 -V -45 0 0 0 0 0 0 2 0 -P 248 -311 -5.5517974597127173e-01 -1.4786398120312963e-01 -3.9774196700709734e+02 3.9774269331115448e+02 4.9767000000000000e-01 2 0 0 -130 0 -P 249 111 7.1429956195406319e-02 1.1262397425854469e-01 -2.4149855125190902e+02 2.4149862579892570e+02 1.3497999999999999e-01 2 0 0 -131 0 -V -46 0 0 0 0 0 0 2 0 -P 250 2112 2.2151623266281140e-01 2.2948599839512826e-01 -1.1254541776645710e+03 1.1254546150545946e+03 9.3957000000000002e-01 1 0 0 0 0 -P 251 111 3.3522844139410250e-02 2.0556422059052964e-01 -7.8301754502786298e+02 7.8301758436288753e+02 1.3497999999999999e-01 2 0 0 -132 0 -V -47 0 0 0 0 0 0 3 0 -P 252 -211 -5.8614752007926270e-02 -3.3655372812363318e-02 -8.2483134952050921e+02 8.2483136409813051e+02 1.3957000000000000e-01 1 0 0 0 0 -P 253 211 -1.0931233412869321e-01 5.8050394161407254e-02 -2.2407062653002762e+02 2.2407070418146742e+02 1.3957000000000000e-01 1 0 0 0 0 -P 254 111 8.5648550805267079e-02 -1.7810518048657847e-01 -1.6434057182756410e+02 1.6434074608976536e+02 1.3497999999999999e-01 2 0 0 -133 0 -V -48 0 0 0 0 0 0 2 0 -P 255 -211 -1.9543881906526395e-01 2.2757020818337852e-02 -2.9277793211329066e+02 2.9277803149576221e+02 1.3957000000000000e-01 1 0 0 0 0 -P 256 111 4.5496572858580364e-01 1.4838294526426893e-01 -2.6649909534793096e+02 2.6649955919696873e+02 1.3497999999999999e-01 2 0 0 -134 0 -V -49 0 0 0 0 0 0 2 0 -P 258 111 -4.9286609976579326e-01 8.2167204288579737e-02 -3.6771637985725704e+01 3.6775280395877665e+01 1.3497999999999999e-01 2 0 0 -135 0 -P 257 22 -1.4711751798151942e-01 -5.6259697251430631e-02 -9.8098834067931008e+01 9.8098960515415683e+01 0 1 0 0 0 0 -V -50 0 0 0 0 0 0 2 0 -P 259 -211 -2.3197224114737774e-01 2.0693030568941703e-01 -3.8896053948983713e+01 3.8897546501794004e+01 1.3957000000000000e-01 1 0 0 0 0 -P 260 111 1.0357375259596519e-01 -4.1258376884160269e-01 -3.6822266804582732e+01 3.6824971216781876e+01 1.3497999999999999e-01 2 0 0 -136 0 -V -51 0 0 0 0 0 0 2 0 -P 261 311 -1.6443516368771718e-01 3.8717781180786159e-01 -4.8340509295770076e+01 4.8344901075339337e+01 4.9767000000000000e-01 2 0 0 -137 0 -P 262 211 1.4456308089166173e-01 -1.1923682482498356e-01 -1.9767890695868459e+01 1.9769271566080882e+01 1.3957000000000000e-01 1 0 0 0 0 -V -52 0 0 0 0 0 0 2 0 -P 263 -211 1.8683106059886168e-01 -2.5164614323774132e-01 -5.7120358611063180e+00 5.7223303898040978e+00 1.3957000000000000e-01 1 0 0 0 0 -P 264 111 5.9359015453132734e-02 -3.5269859385229346e-01 -5.2306540289773871e+01 5.2307937222537824e+01 1.3497999999999999e-01 2 0 0 -138 0 -V -53 0 0 0 0 0 0 2 0 -P 265 321 -2.7060017363760236e-01 -2.0970188485683577e-01 -9.6242418100430420e+00 9.6429700151284194e+00 4.9359999999999998e-01 1 0 0 0 0 -P 266 111 1.7121583094049395e-01 -3.2406303517067925e-01 -1.1157425407826961e+01 1.1164259628078851e+01 1.3497999999999999e-01 2 0 0 -139 0 -V -54 0 0 0 0 0 0 2 0 -P 267 -321 -4.0442913609014586e-01 -1.6147687955186629e-02 -1.3223821966351727e+01 1.3239219464595010e+01 4.9359999999999998e-01 1 0 0 0 0 -P 268 111 1.2461278822945901e-01 3.3466457865971788e-01 -1.0255848812896222e+01 1.0262951973023387e+01 1.3497999999999999e-01 2 0 0 -140 0 -V -55 0 0 0 0 0 0 2 0 -P 269 211 1.4409689320731370e-01 5.6493751537046411e-01 -3.2584013389051369e+00 3.3130918159905778e+00 1.3957000000000000e-01 1 0 0 0 0 -P 270 111 -1.4346561340253111e-01 3.0620444051767443e-01 -5.4173952238189038e-01 6.5272111359466933e-01 1.3497999999999999e-01 2 0 0 -141 0 -V -56 0 0 0 0 0 0 3 0 -P 271 -211 -1.1482207741060419e-02 -1.8312117192440214e-01 -6.4775573213280524e-01 6.8755543639220962e-01 1.3957000000000000e-01 1 0 0 0 0 -P 272 211 5.9785090683486621e-02 -1.8030085794299547e-01 -1.0356062916028855e-01 2.5746309493806629e-01 1.3957000000000000e-01 1 0 0 0 0 -P 273 111 6.9407967703243298e-02 1.8135039476984641e-01 -2.2897781125613634e-01 3.2917452834556382e-01 1.3497999999999999e-01 2 0 0 -142 0 -V -57 0 0 0 0 0 0 2 0 -P 274 -211 -4.3837163049861572e-01 2.9152299187613313e-02 -2.8462395439024579e-01 5.4176574576719017e-01 1.3957000000000000e-01 1 0 0 0 0 -P 275 211 1.6238597675872291e-01 3.5045427364307591e-01 -2.1453629200455779e-01 4.6334976945029910e-01 1.3957000000000000e-01 1 0 0 0 0 -V -58 0 0 0 0 0 0 2 0 -P 276 -211 2.0464411704977142e-01 2.3284289266599723e-01 -4.3412562821404987e-01 5.5139810779544129e-01 1.3957000000000000e-01 1 0 0 0 0 -P 277 111 1.7384618945869995e-01 -2.2906445694892602e-01 3.4351937443349062e-01 4.6788693510055751e-01 1.3497999999999999e-01 2 0 0 -143 0 -V -59 0 0 0 0 0 0 2 0 -P 278 213 4.3992394891943581e-01 2.2880560970011726e-01 1.0362837885132530e+00 1.4104866020206339e+00 8.1835400425562832e-01 2 0 0 -144 0 -P 279 -211 3.0681245317011434e-02 -9.2785550344249429e-02 1.4467368603156844e-01 2.2351903162113226e-01 1.3957000000000000e-01 1 0 0 0 0 -V -60 0 0 0 0 0 0 2 0 -P 280 -311 8.9352434965555338e-01 -6.9110102864767708e-01 1.3634045967932928e+00 1.8391720742449138e+00 4.9767000000000000e-01 2 0 0 -145 0 -P 281 -211 5.6647411898707156e-01 -4.8869691139755277e-02 1.2180527593897912e+00 1.3514486611600747e+00 1.3957000000000000e-01 1 0 0 0 0 -V -61 0 0 0 0 0 0 2 0 -P 282 211 3.3902061508967224e-01 -3.9965183653292830e-01 1.1898441795454691e+00 1.3076182640197989e+00 1.3957000000000000e-01 1 0 0 0 0 -P 283 111 1.3052456300222421e+00 -7.8115318420007707e-01 1.8715126470489638e+00 2.4155011157816300e+00 1.3497999999999999e-01 2 0 0 -146 0 -V -62 0 0 0 0 0 0 2 0 -P 284 211 1.4070112479551919e-01 -1.0793828470377013e-02 3.5863792581214382e-01 4.0989542566685100e-01 1.3957000000000000e-01 1 0 0 0 0 -P 285 -211 1.9298980497479277e+00 -2.1173709670199026e+00 5.4886366910921414e+00 6.1929297433527006e+00 1.3957000000000000e-01 1 0 0 0 0 -V -63 0 0 0 0 0 0 2 0 -P 286 211 6.1961341303921946e-01 -3.1792097930846813e-01 1.0711169548656323e+00 1.2852104289194011e+00 1.3957000000000000e-01 1 0 0 0 0 -P 287 111 1.0786305410186852e+00 -1.7407558071848346e+00 4.4223555485988415e+00 4.8753587378662653e+00 1.3497999999999999e-01 2 0 0 -147 0 -V -64 0 0 0 0 0 0 2 0 -P 288 211 1.0422416969481501e+00 -1.3006721691053791e+00 1.6880434592323161e+00 2.3763388545196276e+00 1.3957000000000000e-01 1 0 0 0 0 -P 289 -211 1.8996147715411444e+00 -1.8005444514622688e+00 4.2213455750106634e+00 4.9688766185638968e+00 1.3957000000000000e-01 1 0 0 0 0 -V -65 0 0 0 0 0 0 2 0 -P 290 321 4.0566606545034806e-01 -6.9985854291668093e-01 1.6213274746742699e+00 1.8779538537687956e+00 4.9359999999999998e-01 1 0 0 0 0 -P 291 -211 3.1541098797646633e-01 -1.2938587588144628e+00 3.0596643542673432e+00 3.3398473505193902e+00 1.3957000000000000e-01 1 0 0 0 0 -V -66 0 0 0 0 0 0 2 0 -P 292 -311 2.5175435783133765e-01 2.1313109775713732e-01 6.3817070071050166e+00 6.4095760292667956e+00 4.9767000000000000e-01 2 0 0 -148 0 -P 293 111 2.7600478909195956e-02 -2.9500235341042041e-01 5.3366817197150453e+00 5.3466044881676478e+00 1.3497999999999999e-01 2 0 0 -149 0 -V -67 0 0 0 0 0 0 2 0 -P 294 -211 2.7565212559822333e-01 1.2963583969597678e-01 3.5266895443427737e+00 3.5425708845917452e+00 1.3957000000000000e-01 1 0 0 0 0 -P 295 211 -3.5836080004238641e-01 2.1559117239341402e-01 2.5939841337981151e+00 2.6311851869295220e+00 1.3957000000000000e-01 1 0 0 0 0 -V -68 0 0 0 0 0 0 1 0 -P 296 310 2.4695926864221421e-01 4.1868501205522318e-01 1.8281949053007391e+01 1.8295180311364678e+01 4.9767000000000000e-01 2 0 0 -150 0 -V -69 0 0 0 0 0 0 1 0 -P 297 310 2.9376002073213692e-01 5.4077841199444876e-01 2.3165952234661379e+01 2.3179468384934378e+01 4.9767000000000000e-01 2 0 0 -151 0 -V -70 0 0 0 0 0 0 3 0 -P 298 111 -7.3014847317132536e-02 3.6666985674012392e-01 2.2327277065206818e+01 2.2330815003010546e+01 1.3497999999999999e-01 2 0 0 -152 0 -P 299 111 -6.8709360746503190e-02 2.8337710712952435e-01 1.3589332359602992e+01 1.3593130512919101e+01 1.3497999999999999e-01 2 0 0 -153 0 -P 300 111 -5.8255209471673002e-02 3.6797523313229671e-04 7.8563483379036310e+00 7.8577237551162042e+00 1.3497999999999999e-01 2 0 0 -154 0 -V -71 0 0 0 0 0 0 2 0 -P 301 2212 1.0317604671954461e+00 2.0632794933723184e-01 5.2326524268660144e+01 5.2345511684536277e+01 9.3827000000000005e-01 1 0 0 0 0 -P 302 211 1.4692461191261935e-01 1.1989080247045376e-01 1.5123711862160690e+01 1.5125544648727947e+01 1.3957000000000000e-01 1 0 0 0 0 -V -72 0 0 0 0 0 0 2 0 -P 303 -211 -3.2198747189268129e-01 -9.6850833808676623e-02 4.6988507635577655e+01 4.6989917914587856e+01 1.3957000000000000e-01 1 0 0 0 0 -P 304 111 -2.7873164949551793e-01 -8.2638242188484548e-02 7.1702453720709034e+00 7.1774061267011149e+00 1.3497999999999999e-01 2 0 0 -155 0 -V -73 0 0 0 0 0 0 2 0 -P 305 -2212 2.5338377157655873e-01 -6.0579834534973953e-01 1.4196072898296641e+03 1.4196077517691594e+03 9.3827000000000005e-01 1 0 0 0 0 -P 306 111 2.3416759166387574e-01 2.9532218771703617e-02 1.6610797461973073e+02 1.6610819714415794e+02 1.3497999999999999e-01 2 0 0 -156 0 -V -74 0 0 0 0 0 0 2 0 -P 307 -211 5.8030238191292306e-02 2.4649524600033157e-01 4.1657029500783335e+02 4.1657039535967152e+02 1.3957000000000000e-01 1 0 0 0 0 -P 308 211 -4.7179331260214574e-01 -3.3273969337000420e-01 1.0192483723750648e+03 1.0192485454361155e+03 1.3957000000000000e-01 1 0 0 0 0 -V -75 0 0 0 0 0 0 2 0 -P 309 2212 -2.6758753905159788e-01 -2.7884430113976838e-01 2.3144541620770879e+03 2.3144543845286262e+03 9.3827000000000005e-01 1 0 0 0 0 -P 310 211 2.2815662682757848e-01 -2.6928563661664261e-02 1.0051037300159285e+03 1.0051037659626548e+03 1.3957000000000000e-01 1 0 0 0 0 -V -76 0 0 0 0 0 0 2 0 -P 311 -321 -4.5347624236370176e+00 1.1907450897810774e+00 1.0993094460568804e+01 1.1961342353041172e+01 4.9359999999999998e-01 1 0 0 0 0 -P 312 211 -3.7209029891736556e+00 1.5220631875289932e+00 9.4377232787534950e+00 1.0259234663116835e+01 1.3957000000000000e-01 1 0 0 0 0 -V -77 0 0 0 0 0 0 2 0 -P 313 311 -3.5596336877401362e+00 8.8923992828974985e-01 8.7633501659252779e+00 9.5134494900893749e+00 4.9767000000000000e-01 2 0 0 -157 0 -P 314 211 -3.4944866593546617e+00 8.7788614127547804e-01 8.4904996449162073e+00 9.2244341341175780e+00 1.3957000000000000e-01 1 0 0 0 0 -V -78 0 0 0 0 0 0 2 0 -P 315 -211 -4.7673302181934996e-02 1.6089739047097859e-01 1.2551797364767447e+00 1.2740159613455126e+00 1.3957000000000000e-01 1 0 0 0 0 -P 316 211 -7.6805537606505728e-02 9.1776230273459644e-02 2.7290467811597724e-01 3.2905731307451080e-01 1.3957000000000000e-01 1 0 0 0 0 -V -79 0 9.0412383846874141e-05 2.9827273200513847e-06 3.8488010315316091e-04 3.9546202597281295e-04 0 2 0 -P 317 22 1.3001177241993309e+00 7.6588306497609115e-02 5.4468358006212130e+00 5.6003742825277634e+00 0 1 0 0 0 0 -P 318 22 1.1640677187514868e-01 -2.9856806517261601e-02 5.8322414217913543e-01 5.9547658682301741e-01 0 1 0 0 0 0 -V -80 0 0 0 0 0 0 2 0 -P 319 -211 1.2815868877039274e+00 5.8886373999562425e-01 8.6631621951294644e+00 8.7783303913122701e+00 1.3957000000000000e-01 1 0 0 0 0 -P 320 211 5.3693988632829892e-01 4.9357797188294417e-01 2.7670560188673816e+00 2.8649611606980869e+00 1.3957000000000000e-01 1 0 0 0 0 -V -81 0 0 0 0 0 0 2 0 -P 321 211 1.2611864020975216e-01 1.2389612141421584e-01 1.5268330665860421e+00 1.5433584024556255e+00 1.3957000000000000e-01 1 0 0 0 0 -P 322 111 1.3774964266230527e+00 2.3042017249713853e-01 6.9719171579236301e+00 7.1117113494996964e+00 1.3497999999999999e-01 2 0 0 -158 0 -V -82 0 0 0 0 0 0 2 0 -P 323 22 3.8757047271998544e+00 1.0974957903932110e+00 2.5137272071142927e+01 2.5457965969830195e+01 0 1 0 0 0 0 -P 324 111 7.6480365263055428e-01 5.6549345963268216e-01 5.5303297068260200e+00 5.6131518549355803e+00 1.3497999999999999e-01 2 0 0 -159 0 -V -83 0 0 0 0 0 0 2 0 -P 325 -211 3.8588647504390106e+00 1.3164304993742422e+00 2.6975321409456164e+01 2.7282068677983851e+01 1.3957000000000000e-01 1 0 0 0 0 -P 326 111 1.3814159463609341e-01 1.5224944402949425e-01 1.3575896401481926e+00 1.3796855528755789e+00 1.3497999999999999e-01 2 0 0 -160 0 -V -84 0 0 0 0 0 0 2 0 -P 327 211 4.4402643587743125e+00 1.2312481262739294e+00 2.3969983537631109e+01 2.4409250502697965e+01 1.3957000000000000e-01 1 0 0 0 0 -P 328 -211 4.9177559628960754e+00 1.9209371235558570e+00 3.0908055846156746e+01 3.1356047568488268e+01 1.3957000000000000e-01 1 0 0 0 0 -V -85 0 0 0 0 0 0 2 0 -P 329 22 2.3023456618513665e+00 4.3664135995883580e-01 1.3453062152332874e+01 1.3655633727454896e+01 0 1 0 0 0 0 -P 330 22 5.8319108406716824e-01 2.5998213749120752e-01 2.4833213834801269e+00 2.5640958730124712e+00 0 1 0 0 0 0 -V -86 0 0 0 0 0 0 2 0 -P 331 -321 3.8129236036372465e+00 2.3916504287804465e+00 9.7796113830415905e+00 1.0776957731381170e+01 4.9359999999999998e-01 1 0 0 0 0 -P 332 211 4.3871570358615983e+00 3.0086902262651471e+00 1.2397932613841485e+01 1.3491759581951781e+01 1.3957000000000000e-01 1 0 0 0 0 -V -87 0 0 0 0 0 0 2 0 -P 333 3122 1.1609162906290964e+00 -1.4066122912385346e-02 3.5008612023205194e+00 3.8534005125310915e+00 1.1156800000000000e+00 2 0 0 -161 0 -P 334 111 -4.0838506149200336e-02 5.5177303624111697e-02 2.2512846801554973e-01 2.7132037507484408e-01 1.3497999999999999e-01 2 0 0 -162 0 -V -88 0 1.0975634495181953e+02 1.3430806656920803e+01 2.4783845861744948e+02 3.5131081000941208e+02 0 2 0 -P 335 -2212 4.3598416274050478e-01 5.6969389177054186e-02 1.1732545494018880e+00 1.5653129182549963e+00 9.3827000000000005e-01 1 0 0 0 0 -P 336 211 1.1291406118563700e-01 1.0198900028598853e-02 6.6200807966546288e-02 1.9161402519296616e-01 1.3957000000000000e-01 1 0 0 0 0 -V -89 0 0 0 0 0 0 2 0 -P 337 211 2.1870704015585739e-02 -4.7659285060522572e-01 4.7808091053954144e-01 6.8968124149092913e-01 1.3957000000000000e-01 1 0 0 0 0 -P 338 111 -2.6692130361395883e-01 2.8247638498948274e-01 1.3711111945500606e-02 4.1163999488689595e-01 1.3497999999999999e-01 2 0 0 -163 0 -V -90 0 8.5034176885997429e-06 -6.7497812436783921e-06 -9.5502217000439534e-06 1.7926682700109905e-05 0 2 0 -P 339 22 1.8935384391547218e-02 -1.1026659860805992e-02 2.9922270718085193e-02 3.7087441198712261e-02 0 1 0 0 0 0 -P 340 22 8.9379809260152335e-02 -7.4950989278527919e-02 -1.5157148880174542e-01 1.9125981625733321e-01 0 1 0 0 0 0 -V -91 0 -2.6421968631437817e+01 -5.1562678965288278e+01 -3.9896866896154776e+01 1.8744987313214875e+02 0 2 0 -P 341 -2212 -7.3950672556528596e-02 -2.6360618044473205e-01 -2.8746064573095914e-01 1.0187939615468300e+00 9.3827000000000005e-01 1 0 0 0 0 -P 342 211 -9.5710096102158526e-02 -6.7488139943758838e-02 3.1274848257071206e-02 1.8485933182410788e-01 1.3957000000000000e-01 1 0 0 0 0 -V -92 0 0 0 0 0 0 2 0 -P 343 -311 1.1140884226725156e+00 1.6365689466410080e-01 -1.4262615386176185e+00 1.8841109304241952e+00 4.9767000000000000e-01 2 0 0 -164 0 -P 344 -211 7.3708063476785890e-01 -8.6107444359986976e-02 -3.5085329035071899e-01 8.3263447584995176e-01 1.3957000000000000e-01 1 0 0 0 0 -V -93 0 0 0 0 0 0 2 0 -P 345 22 -5.7123332739010456e-02 -3.3479252640843915e-01 -2.7213051787595932e-01 4.3520584743497520e-01 0 1 0 0 0 0 -P 346 22 1.7083633293661915e-01 -6.5795912271685339e-02 -9.4736965871340673e-01 9.6489555132856297e-01 0 1 0 0 0 0 -V -94 0 0 0 0 0 0 2 0 -P 347 -3212 1.9971148756783932e+00 8.2087761602473608e-02 -2.6812799831652443e+00 3.5505836249669493e+00 1.1925500000000000e+00 2 0 0 -165 0 -P 348 211 4.2728076719684455e-01 5.6535142741856115e-02 -7.9829192528761195e-01 9.1788608185360798e-01 1.3957000000000000e-01 1 0 0 0 0 -V -95 0 0 0 0 0 0 2 0 -P 349 211 6.1625006614860123e-01 3.3726744154614779e-01 -3.8762194687017835e+00 3.9418359460533079e+00 1.3957000000000000e-01 1 0 0 0 0 -P 350 -211 5.2672204566684544e-01 1.6666969663619966e+00 -1.4316452561049747e+01 1.4423439555416719e+01 1.3957000000000000e-01 1 0 0 0 0 -V -96 0 0 0 0 0 0 2 0 -P 351 211 -2.6966608895498762e-01 -6.5970053751465196e-02 -3.2902343026367840e+00 3.3048741880247143e+00 1.3957000000000000e-01 1 0 0 0 0 -P 352 -211 -1.0983855673091272e-01 7.6080732621216451e-01 -8.1057023413813170e+00 8.1432660848174052e+00 1.3957000000000000e-01 1 0 0 0 0 -V -97 0 0 0 0 0 0 3 0 -P 353 -211 -9.5798582554692188e-02 6.9395665012517205e-02 -2.6561900193963992e+00 2.6624834892977387e+00 1.3957000000000000e-01 1 0 0 0 0 -P 354 211 -1.0201638753756302e-01 7.8384892820417440e-02 -1.4266697985266141e+00 1.4392421733942666e+00 1.3957000000000000e-01 1 0 0 0 0 -P 355 111 -2.2760644876592431e-01 4.5203798359883485e-01 -5.3624791339187565e+00 5.3880001017306958e+00 1.3497999999999999e-01 2 0 0 -166 0 -V -98 0 -3.9923320403745477e-04 -4.9026487318803503e-04 -9.7674999660659484e-03 9.7893532142676720e-03 0 2 0 -P 356 22 -1.4843256441632337e-02 -9.8178167278801382e-02 -1.6499349459668522e+00 1.6529200224798102e+00 0 1 0 0 0 0 -P 357 22 -3.0932795275517122e-01 -2.9990935440231759e-01 -6.2811245020150359e+00 6.2958839262670150e+00 0 1 0 0 0 0 -V -99 0 -1.7845130097297728e-05 5.4156996543876026e-05 -2.9274128312893144e-04 2.9828158131490031e-04 0 2 0 -P 358 22 -4.1125557872182977e-01 1.3713585033970590e+00 -7.2366302516774024e+00 7.3768945156726886e+00 0 1 0 0 0 0 -P 359 22 -9.0848161860804577e-02 1.5244269026970386e-01 -1.0001543769902554e+00 1.0157760285333168e+00 0 1 0 0 0 0 -V -100 0 -1.7464889567159729e-05 -3.8099967344991282e-05 -1.1304546572434142e-04 1.2060964609259914e-04 0 2 0 -P 360 22 -3.0645574781966489e-01 -8.1589910932750886e-01 -2.2644604052437702e+00 2.4263939104955554e+00 0 1 0 0 0 0 -P 361 22 -4.1156227503042225e-01 -7.5046998327434278e-01 -2.3830743804433507e+00 2.5321201007751331e+00 0 1 0 0 0 0 -V -101 0 0 0 0 0 0 2 0 -P 362 211 -3.5384588913819282e-01 -2.4715825133371802e-01 -4.6086448568373415e+00 4.6309158182605330e+00 1.3957000000000000e-01 1 0 0 0 0 -P 363 111 -5.2369471399431522e-01 3.5402828098625916e-01 -3.1635543138635680e+00 3.2289143182141680e+00 1.3497999999999999e-01 2 0 0 -167 0 -V -102 0 0 0 0 0 0 2 0 -P 364 -211 -1.7431049169384474e+00 -1.7742747005688735e+00 -7.4560336745052949e+00 7.8611947822701023e+00 1.3957000000000000e-01 1 0 0 0 0 -P 365 111 -1.7623650520795352e-02 -4.0860185430857604e-01 -2.4765470325309402e+00 2.5137165459016839e+00 1.3497999999999999e-01 2 0 0 -168 0 -V -103 0 3.7599471820826971e-07 -9.2097511557332473e-07 -5.4706653600331399e-07 1.4096710382080819e-06 0 2 0 -P 366 22 -9.0039096884929875e-03 -2.1160661174125472e-02 3.1671981710379361e-02 3.9140240117649924e-02 0 1 0 0 0 0 -P 367 22 6.9736646900344174e-02 -1.2760031062704383e-01 -1.2003718089938287e-01 1.8855758799712244e-01 0 1 0 0 0 0 -V -104 0 -3.8731844410967580e+02 -6.0808637297836094e+02 -2.1351637808991841e+03 2.3238351683362093e+03 0 2 0 -P 368 3122 -8.6514155217381961e-01 -1.3957847305443358e+00 -4.6801671989749298e+00 5.0838363262480524e+00 1.1156800000000000e+00 2 0 0 -169 0 -P 369 111 -3.3051734332077809e-02 -1.4370417322118634e-02 -2.7128761233052251e-01 3.0514831646326673e-01 1.3497999999999999e-01 2 0 0 -170 0 -V -105 0 0 0 0 0 0 1 0 -P 370 130 -9.8211331445284256e-01 -7.9298343389061809e-01 -1.4504485608208735e+00 1.9861635746679696e+00 4.9767000000000000e-01 1 0 0 0 0 -V -106 0 0 0 0 0 0 2 0 -P 371 -3122 -1.6814953787803824e+00 -7.7260118861255445e-01 -3.6931903303234876e+00 4.2788708772175195e+00 1.1156800000000000e+00 2 0 0 -171 0 -P 372 22 -6.0636364410652108e-02 -4.9613725855513595e-02 -3.9809263716227318e-02 8.7880987476447889e-02 0 1 0 0 0 0 -V -107 0 0 0 0 0 0 1 0 -P 373 130 -9.4646039874614889e+00 -5.6457554838761190e+00 -1.0111196049899565e+01 1.4964532889856393e+01 4.9767000000000000e-01 1 0 0 0 0 -V -108 0 6.1241494302732311e-06 -3.8272133129143903e-06 -2.2451785965620250e-05 2.4473350815725669e-05 0 2 0 -P 374 22 9.7949275500252477e-03 -8.2164757971790112e-02 -1.6085439852995365e-01 1.8088981614426572e-01 0 1 0 0 0 0 -P 375 22 1.1669422088618255e-01 3.1168904522249487e-03 -3.0286833064202273e-01 3.2458663234983964e-01 0 1 0 0 0 0 -V -109 0 0 0 0 0 0 2 0 -P 376 321 -3.1631630540514204e-02 -2.4636611909620174e-01 6.0355908816096149e-01 8.1830395183627624e-01 4.9359999999999998e-01 1 0 0 0 0 -P 377 -211 -3.1119569790222151e-01 -9.0643724178569043e-02 -1.6873807237875477e-01 3.9116667687305512e-01 1.3957000000000000e-01 1 0 0 0 0 -V -110 0 0 0 0 0 0 2 0 -P 378 -321 -5.0002061820812771e-01 -6.6876333827903711e-01 9.9856599175467453e-01 1.3921350585156445e+00 4.9359999999999998e-01 1 0 0 0 0 -P 379 211 -7.8076367030763885e-02 7.0110717268449307e-02 2.5930781099697733e-02 1.7653221256490112e-01 1.3957000000000000e-01 1 0 0 0 0 -V -111 0 5.7242773048955394e-05 -3.2717478414302510e-05 -1.9059924373192351e-05 6.8693927850502852e-05 0 2 0 -P 380 22 1.7977262661769522e+00 -9.7971204743102736e-01 -6.4165230874684842e-01 2.1455472750103133e+00 0 1 0 0 0 0 -P 381 22 8.6717598533476581e-01 -5.4343012835935178e-01 -2.4567080071055178e-01 1.0524564771389584e+00 0 1 0 0 0 0 -V -112 0 5.6566919601848354e-03 -2.2814444155476094e-03 -4.8106729505785935e-03 1.0328232916324018e-02 0 1 0 -P 382 130 9.8128386922335242e-01 -7.1757193254617169e-01 -6.8412429949797804e-01 1.4810567161454691e+00 4.9767000000000000e-01 1 0 0 0 0 -V -113 0 5.6927899618635560e-03 -2.2689588659554980e-03 -4.7858260335337677e-03 1.0383266193923678e-02 0 2 0 -P 383 22 1.0727648575389558e-01 4.4401346708756603e-02 -4.6291163569520894e-03 1.1619446072641836e-01 0 1 0 0 0 0 -P 384 22 5.0614414143909950e-02 1.0209838651658623e-02 1.1330832045279429e-01 1.2451841312937319e-01 0 1 0 0 0 0 -V -114 0 5.6566919601848354e-03 -2.2814444155476094e-03 -4.8106729505785935e-03 1.0328232916324018e-02 0 2 0 -P 385 -2212 7.7903213016385631e-01 -1.3109001191938108e-01 -1.0369975033227592e+00 1.6061724894451079e+00 9.3827000000000005e-01 1 0 0 0 0 -P 386 111 -1.9254000030087138e-02 2.8169300845293684e-02 -2.5015083906664392e-03 1.3924828175420992e-01 1.3497999999999999e-01 2 0 0 -172 0 -V -115 0 -2.5371547209646385e-02 3.0636389190498072e-02 -2.1297633314969514e-01 2.2372333057617133e-01 0 3 0 -P 387 -11 -2.7872666759670595e-01 4.0869513283640058e-01 -7.5930543668767891e-01 9.0623687472823267e-01 5.1000000000000004e-04 1 0 0 0 0 -P 388 12 2.1061848626626939e-01 -1.0932717228124468e-01 -5.7973006096139035e-01 6.2641800815302651e-01 0 1 0 0 0 0 -P 389 333 -8.2733678267311739e-01 7.8189051332515147e-01 -6.1775965545865690e+00 6.3632738927342753e+00 1.0162266065804424e+00 2 0 0 -173 0 -V -116 0 -1.6652958063643953e+02 5.6426826413973046e+01 -1.9523816787611872e+02 2.7438756299624157e+02 0 2 0 -P 390 111 -5.5063191197028871e-01 1.7973867556858722e-03 -7.4723439495187260e-01 9.3796459127106524e-01 1.3497999999999999e-01 2 0 0 -174 0 -P 391 111 -4.9730802910561589e-01 3.5328622614581767e-01 -4.8136339144703161e-01 7.8870574260788417e-01 1.3497999999999999e-01 2 0 0 -175 0 -V -117 0 0 0 0 0 0 1 0 -P 392 130 -6.3303113772774122e-01 -2.0717802444266725e-01 -3.2448067298090227e-01 8.9253251547659829e-01 4.9767000000000000e-01 1 0 0 0 0 -V -118 0 0 0 0 0 0 1 0 -P 393 310 2.9210454944064679e-01 -1.6108553023224306e-01 -1.5223884321452796e-01 6.1816317436209656e-01 4.9767000000000000e-01 2 0 0 -176 0 -V -119 0 3.0128146157781292e-05 4.5650829848109356e-05 -8.2262982954840020e-05 1.0199714816937651e-04 0 2 0 -P 394 22 1.7327331324276590e-01 2.5107595073573147e-01 -4.1746127939969052e-01 5.1704612358860558e-01 0 1 0 0 0 0 -P 395 22 -1.3087207843465083e-02 -8.3584398965809228e-03 -1.9916672401752208e-02 2.5254947360894051e-02 0 1 0 0 0 0 -V -120 0 1.0816420442246132e-06 -4.7912803730757445e-07 2.5833759896941966e-06 4.2591319597499850e-06 0 2 0 -P 396 22 -3.7013800308679519e-02 2.0425699872580520e-02 6.6978992311673077e-02 7.9204899088772901e-02 0 1 0 0 0 0 -P 397 22 8.3029492775547220e-02 -4.0808975961671698e-02 4.2924127396728746e-02 1.0198896951325444e-01 0 1 0 0 0 0 -V -121 0 -8.0635541185482363e-05 -2.2608318341409421e-05 -3.1491674433623302e-05 1.0955722356805153e-04 0 2 0 -P 398 22 6.1605732605138725e-03 2.0252052130026385e-02 1.4978030975011219e-02 2.5931442116933264e-02 0 1 0 0 0 0 -P 399 22 -1.7830128657396835e-01 -6.8516278907592251e-02 -8.2206441930538970e-02 2.0795126439662356e-01 0 1 0 0 0 0 -V -122 0 -1.1689491264961073e-04 1.7057855214648910e-04 -1.2900229175160562e-03 1.3074393023033567e-03 0 2 0 -P 400 22 -1.0971836549544467e-01 2.1286683469193721e-01 -1.1299214575560315e+00 1.1550207397637076e+00 0 1 0 0 0 0 -P 401 22 -2.0731679393122815e-01 2.4976577479240111e-01 -2.3687989918503392e+00 2.3909353523453438e+00 0 1 0 0 0 0 -V -123 0 8.7532349491237973e+00 -3.6541006746257270e+00 -6.7563654454282670e+01 7.0038781826892503e+01 0 2 0 -P 402 -211 1.3178166664474288e-02 1.0972312838034502e-01 -3.9607722339418833e-01 4.3424622136508695e-01 1.3957000000000000e-01 1 0 0 0 0 -P 403 211 2.6199693228118459e-01 -2.2459694595086344e-01 -1.7279186944177274e+00 1.7675601772141933e+00 1.3957000000000000e-01 1 0 0 0 0 -V -124 0 -5.1006948095061883e-05 -3.3256564039807341e-05 -3.3133018453473608e-04 3.3729432500588654e-04 0 2 0 -P 404 22 -1.2481427652994612e-01 -4.0398131487697303e-02 -9.9515989211106448e-01 1.0037698060411546e+00 0 1 0 0 0 0 -P 405 22 -2.8659220894343101e-01 -2.2783917032142667e-01 -1.6772483158185125e+00 1.7167433397790914e+00 0 1 0 0 0 0 -V -125 0 -6.6771289255523520e-05 -7.7465041537621302e-05 -2.2164109883733708e-03 2.2191539074048012e-03 0 2 0 -P 406 22 -1.9030878728761155e-01 -1.4045162333880731e-01 -5.5124814429757212e+00 5.5175534208713453e+00 0 1 0 0 0 0 -P 407 22 -2.7824715291029679e-02 -1.1261703875241377e-01 -1.7282577645224619e+00 1.7321465621680421e+00 0 1 0 0 0 0 -V -126 0 0 0 0 0 0 1 0 -P 408 130 -3.9600823279035513e-01 8.5430585125442424e-02 -3.6195759503890365e+01 3.6201447517988591e+01 4.9767000000000000e-01 1 0 0 0 0 -V -127 0 2.2759620483605243e-07 5.5189954518948540e-07 -3.4507586304512335e-04 3.4507688290684615e-04 0 2 0 -P 409 22 3.0856412353213424e-02 5.9777091246928050e-03 -3.6768297434222319e+00 3.6769640756069517e+00 0 1 0 0 0 0 -P 410 22 2.1260360401738412e-02 1.2040059846141607e-01 -7.5341361049769660e+01 7.5341460253560143e+01 0 1 0 0 0 0 -V -128 0 -1.4546449214941991e-06 -3.9621554061126310e-05 -2.1290916324375901e-02 2.1290986408404031e-02 0 2 0 -P 411 22 3.8619005530965513e-02 5.6053830183775341e-03 -2.1420869175201346e+01 2.1420904721066243e+01 0 1 0 0 0 0 -P 412 22 -4.3843673255012677e-02 -1.4791465150096908e-01 -5.5050001270001772e+01 5.5050217445883071e+01 0 1 0 0 0 0 -V -129 0 0 0 0 0 0 2 0 -P 413 22 4.4122106100820724e-01 -2.1533581732208446e-01 -2.0951066441389207e+02 2.0951123967150164e+02 0 1 0 0 0 0 -P 414 22 -1.3003727210228663e-01 7.9025968672578689e-02 -7.4810369626294275e+01 7.4810524382727280e+01 0 1 0 0 0 0 -V -130 0 0 0 0 0 0 1 0 -P 415 130 -5.5517974597127173e-01 -1.4786398120312963e-01 -3.9774196700709734e+02 3.9774269331115448e+02 4.9767000000000000e-01 1 0 0 0 0 -V -131 0 3.1162561148663985e-05 4.9134168233791584e-05 -1.0535794464319381e-01 1.0535797716562684e-01 0 2 0 -P 416 22 -1.0407303676525636e-02 3.1435820824456277e-02 -1.4769705612958035e+02 1.4769705984164750e+02 0 1 0 0 0 0 -P 417 22 8.1837259871931953e-02 8.1188153434088417e-02 -9.3801495122328660e+01 9.3801565957278186e+01 0 1 0 0 0 0 -V -132 0 2.6061695549965017e-06 1.5981198106929131e-05 -6.0874205016532332e-02 6.0874208074558754e-02 0 2 0 -P 418 22 6.6075216703169640e-02 6.9070271124056309e-02 -2.0477358048603864e+02 2.0477360279515705e+02 0 1 0 0 0 0 -P 419 22 -3.2552372563759389e-02 1.3649394946647336e-01 -5.7824396454182443e+02 5.7824398156773043e+02 0 1 0 0 0 0 -V -133 0 6.6869850793435513e-05 -1.3905508888006766e-04 -1.2830841169050197e-01 1.2830854774519626e-01 0 2 0 -P 420 22 4.6019185382323302e-02 9.8218810952675831e-03 -2.9691019717235697e+01 2.9691057005166559e+01 0 1 0 0 0 0 -P 421 22 3.9629365422943770e-02 -1.8792706158184605e-01 -1.3464955211032841e+02 1.3464968908459880e+02 0 1 0 0 0 0 -V -134 0 9.0991403364029891e-05 2.9676020800185506e-05 -5.3298798475057925e-02 5.3298891243089092e-02 0 2 0 -P 422 22 3.9077415047769848e-02 4.8750449525309471e-02 -5.1996999227038948e+01 5.1997036764294414e+01 0 1 0 0 0 0 -P 423 22 4.1588831353803374e-01 9.9632495738959437e-02 -2.1450209612089199e+02 2.1450252243267425e+02 0 1 0 0 0 0 -V -135 0 -1.2095638437121250e-05 2.0165006173806986e-06 -9.0242854606434981e-04 9.0251793601480227e-04 0 2 0 -P 424 22 -3.5447452752054448e-01 9.8399755132051580e-03 -2.8089725048300163e+01 2.8091963304562395e+01 0 1 0 0 0 0 -P 425 22 -1.3839157224524873e-01 7.2327228775374577e-02 -8.6819129374255386e+00 8.6833170913152617e+00 0 1 0 0 0 0 -V -136 0 1.0813245780814463e-05 -4.3074327093877904e-05 -3.8442965634151380e-03 3.8445789078611868e-03 0 2 0 -P 426 22 1.0313626454632320e-01 -3.8557612802981556e-01 -3.0050256643978344e+01 3.0052907187301116e+01 0 1 0 0 0 0 -P 427 22 4.3748804964200425e-04 -2.7007640811787147e-02 -6.7720101606043936e+00 6.7720640294807559e+00 0 1 0 0 0 0 -V -137 0 0 0 0 0 0 1 0 -P 428 130 -1.6443516368771718e-01 3.8717781180786159e-01 -4.8340509295770076e+01 4.8344901075339337e+01 4.9767000000000000e-01 1 0 0 0 0 -V -138 0 1.2358140420271945e-05 -7.3429431327083619e-05 -1.0889863399267724e-02 1.0890154231100478e-02 0 2 0 -P 429 22 5.4301957071902614e-02 -2.3699319567331695e-01 -2.5848595506596457e+01 2.5849738956921321e+01 0 1 0 0 0 0 -P 430 22 5.0570583812301105e-03 -1.1570539817897650e-01 -2.6457944783177410e+01 2.6458198265616499e+01 0 1 0 0 0 0 -V -139 0 1.8563265975374583e-05 -3.5135000552321780e-05 -1.2096910332893111e-03 1.2104320012685755e-03 0 2 0 -P 431 22 -2.0573197242309865e-02 -6.4597219190626887e-02 -2.0488562601975113e+00 2.0499775686876340e+00 0 1 0 0 0 0 -P 432 22 1.9178902818280380e-01 -2.5946581598005236e-01 -9.1085691476294492e+00 9.1142820593912131e+00 0 1 0 0 0 0 -V -140 0 7.3023607112404456e-06 1.9611482138964182e-05 -6.0099696424263584e-04 6.0141321235147990e-04 0 2 0 -P 433 22 8.5228359671132362e-03 2.1369962414334492e-01 -5.5669311705913973e+00 5.5710378589805023e+00 0 1 0 0 0 0 -P 434 22 1.1608995226234577e-01 1.2096495451637290e-01 -4.6889176423048236e+00 4.6919141140428886e+00 0 1 0 0 0 0 -V -141 0 -2.3365100375587745e-05 4.9869075372593264e-05 -8.8228795860378044e-05 1.0630348258864234e-04 0 2 0 -P 435 22 -2.1041114039385373e-02 1.8088591190867334e-01 -2.1317543175488898e-01 2.8036798374802724e-01 0 1 0 0 0 0 -P 436 22 -1.2242449936314574e-01 1.2531852860900106e-01 -3.2856409062700143e-01 3.7235312984664198e-01 0 1 0 0 0 0 -V -142 0 4.2726307465371662e-06 1.1163606978137926e-05 -1.4095465823616622e-05 2.0263397090077968e-05 0 2 0 -P 437 22 1.0186902240864532e-01 1.7539794796065869e-01 -2.0495815398301412e-01 2.8835669362688277e-01 0 1 0 0 0 0 -P 438 22 -3.2461054705402004e-02 5.9524468091877421e-03 -2.4019657273122230e-02 4.0817834718681036e-02 0 1 0 0 0 0 -V -143 0 4.2281042290289621e-05 -5.5710648715487775e-05 8.3547170307156796e-05 1.1379454074695370e-04 0 2 0 -P 439 22 -2.2282498559312240e-02 -1.7643232610581851e-02 4.1478065186052578e-02 5.0281440816421281e-02 0 1 0 0 0 0 -P 440 22 1.9612868801801220e-01 -2.1142122433834418e-01 3.0204130924743805e-01 4.1760549428413618e-01 0 1 0 0 0 0 -V -144 0 0 0 0 0 0 2 0 -P 441 211 1.7357088956032946e-01 -1.8008964314199971e-01 3.5114064368815236e-02 2.8856873650185011e-01 1.3957000000000000e-01 1 0 0 0 0 -P 442 111 2.6635305935910647e-01 4.0889525284211697e-01 1.0011697241444379e+00 1.1219178655187840e+00 1.3497999999999999e-01 2 0 0 -177 0 -V -145 0 0 0 0 0 0 1 0 -P 443 310 8.9352434965555338e-01 -6.9110102864767708e-01 1.3634045967932928e+00 1.8391720742449138e+00 4.9767000000000000e-01 2 0 0 -178 0 -V -146 0 5.7833814820138906e-04 -3.4611928637845181e-04 8.2924403938539407e-04 1.0702785821667389e-03 0 2 0 -P 444 22 2.6959401219222473e-01 -1.8065595805513682e-01 4.8652922632802997e-01 5.8483176611917398e-01 0 1 0 0 0 0 -P 445 22 1.0356516178300175e+00 -6.0049722614494039e-01 1.3849834207209339e+00 1.8306693496624562e+00 0 1 0 0 0 0 -V -147 0 5.5018284876725698e-05 -8.8791662444546657e-05 2.2557345462255435e-04 2.4868003057175941e-04 0 2 0 -P 446 22 9.0519481106229416e-01 -1.5401715592524401e+00 3.8907227545652390e+00 4.2812649568551482e+00 0 1 0 0 0 0 -P 447 22 1.7343572995639095e-01 -2.0058424793239438e-01 5.3163279403360253e-01 5.9409378101111721e-01 0 1 0 0 0 0 -V -148 0 0 0 0 0 0 1 0 -P 448 130 2.5175435783133765e-01 2.1313109775713732e-01 6.3817070071050166e+00 6.4095760292667956e+00 4.9767000000000000e-01 1 0 0 0 0 -V -149 0 1.8668185865974611e-05 -1.9953127561604650e-04 3.6095810720876997e-03 3.6162925529423487e-03 0 2 0 -P 449 22 7.2766800981078810e-03 2.7433684711522560e-03 8.3729214991090684e-01 8.3732826325536569e-01 0 1 0 0 0 0 -P 450 22 2.0323798811088076e-02 -2.9774572188157267e-01 4.4993895698041380e+00 4.5092762249122815e+00 0 1 0 0 0 0 -V -150 0 1.3696078707448002e+01 2.3219792114969632e+01 1.0138959939920347e+03 1.0146297844541476e+03 0 2 0 -P 451 111 7.0206635722018476e-02 6.5462957243239944e-02 1.1020395065887524e+01 1.1021639686503478e+01 1.3497999999999999e-01 2 0 0 -179 0 -P 452 111 1.7675263292019575e-01 3.5322205481198321e-01 7.2615539871198669e+00 7.2735406248611998e+00 1.3497999999999999e-01 2 0 0 -180 0 -V -151 0 1.5467461870827629e+01 2.8473818347520936e+01 1.2197659912945378e+03 1.2204776624690801e+03 0 2 0 -P 453 211 -5.2601173246719701e-02 3.3039934938404780e-01 1.0273766610755112e+01 1.0280160055693049e+01 1.3957000000000000e-01 1 0 0 0 0 -P 454 -211 3.4636119397885656e-01 2.1037906261040085e-01 1.2892185623906263e+01 1.2899308329241325e+01 1.3957000000000000e-01 1 0 0 0 0 -V -152 0 -8.6330281890986453e-06 4.3353801666958921e-05 2.6399016004587045e-03 2.6403199142388894e-03 0 2 0 -P 455 22 2.6083272253419752e-02 1.5952465080702885e-01 7.3460499969475057e+00 7.3478281831408516e+00 0 1 0 0 0 0 -P 456 22 -9.9098119570552284e-02 2.0714520593309504e-01 1.4981227068259312e+01 1.4982986819869694e+01 0 1 0 0 0 0 -V -153 0 -1.3713360241077502e-05 5.6557830140187285e-05 2.7122273887907147e-03 2.7129854433572071e-03 0 2 0 -P 457 22 -3.2139365825025600e-02 1.3537777065909119e-02 3.3379524226511128e+00 3.3381345967659777e+00 0 1 0 0 0 0 -P 458 22 -3.6569994921477583e-02 2.6983933006361521e-01 1.0251379936951878e+01 1.0254995916153122e+01 0 1 0 0 0 0 -V -154 0 -1.8577981731263623e-05 1.1734979962630551e-07 2.5054428130927703e-03 2.5058814429780593e-03 0 2 0 -P 459 22 -3.2575852346062410e-02 6.3591920058035073e-02 5.2340628634658524e+00 5.2345505229355744e+00 0 1 0 0 0 0 -P 460 22 -2.5679357125610595e-02 -6.3223944824902775e-02 2.6222854744377790e+00 2.6231732321806303e+00 0 1 0 0 0 0 -V -155 0 -5.1794463602787913e-05 -1.5356000780595467e-05 1.3323891047857367e-03 1.3337197303021943e-03 0 2 0 -P 461 22 -2.4156328517547213e-01 -1.1451197786655225e-01 6.4209768595352923e+00 6.4265394766162753e+00 0 1 0 0 0 0 -P 462 22 -3.7168364320045832e-02 3.1873735678067699e-02 7.4926851253561166e-01 7.5086665008484121e-01 0 1 0 0 0 0 -V -156 0 7.5943080969019332e-05 9.5776177456424032e-06 5.3870611541554550e-02 5.3870683708631448e-02 0 2 0 -P 463 22 -1.5680821504989124e-02 -5.4140422597006924e-03 1.8017934436852070e+01 1.8017942073686338e+01 0 1 0 0 0 0 -P 464 22 2.4984841316886486e-01 3.4946261031404309e-02 1.4809004018287865e+02 1.4809025507047161e+02 0 1 0 0 0 0 -V -157 0 0 0 0 0 0 1 0 -P 465 130 -3.5596336877401362e+00 8.8923992828974985e-01 8.7633501659252779e+00 9.5134494900893749e+00 4.9767000000000000e-01 1 0 0 0 0 -V -158 0 1.3287239623354180e-04 2.2226177773322776e-05 6.7250652793784471e-04 6.8599098340012060e-04 0 2 0 -P 466 22 1.1106353772405320e+00 1.4436855076860167e-01 5.3887210357718693e+00 5.5038775078120601e+00 0 1 0 0 0 0 -P 467 22 2.6686104938252070e-01 8.6051621728536865e-02 1.5831961221517605e+00 1.6078338416876363e+00 0 1 0 0 0 0 -V -159 0 5.7037006887288153e-05 4.2172986806283377e-05 4.1243716932087290e-04 4.1861382317954235e-04 0 2 0 -P 468 22 3.2331850119604405e-01 1.6744575558836336e-01 2.2859616585715821e+00 2.3147772330700751e+00 0 1 0 0 0 0 -P 469 22 4.4148515143451034e-01 3.9804770404431883e-01 3.2443680482544379e+00 3.2983746218655052e+00 0 1 0 0 0 0 -V -160 0 1.1983470401006283e-05 1.3207294377217294e-05 1.1776782592010122e-04 1.1968459629508770e-04 0 2 0 -P 470 22 -2.4301340066221078e-02 4.3907283769436582e-02 2.4401938288657385e-01 2.4912620079262698e-01 0 1 0 0 0 0 -P 471 22 1.6244293470231447e-01 1.0834216026005766e-01 1.1135702572616186e+00 1.1305593520829520e+00 0 1 0 0 0 0 -V -161 0 3.4630075284514206e+01 -4.1959174778499408e-01 1.0443051577069147e+02 1.1494674588296520e+02 0 2 0 -P 472 2212 1.1005933998556439e+00 -6.1749009761674328e-02 3.0746031880408422e+00 3.3983310799307449e+00 9.3827000000000005e-01 1 0 0 0 0 -P 473 -211 6.0322890773452480e-02 4.7682886849288987e-02 4.2625801427967658e-01 4.5506943260034610e-01 1.3957000000000000e-01 1 0 0 0 0 -V -162 0 -4.7357584723182360e-06 6.3985294212991023e-06 2.6106587882268586e-05 3.1463143149236232e-05 0 2 0 -P 474 22 4.3973266892092941e-04 5.6365207826361091e-02 1.6625948052190604e-02 5.8767781707013016e-02 0 1 0 0 0 0 -P 475 22 -4.1278238818121267e-02 -1.1879042022493941e-03 2.0850251996335911e-01 2.1255259336783106e-01 0 1 0 0 0 0 -V -163 0 -5.7563317206079826e-06 6.0917871793002808e-06 2.9568905721680543e-07 8.8772845327675524e-06 0 2 0 -P 476 22 2.1872890559984882e-03 -1.0401663083794799e-02 8.9124295742047579e-03 1.3871201434570646e-02 0 1 0 0 0 0 -P 477 22 -2.6910859266995735e-01 2.9287804807327755e-01 4.7986823712958485e-03 3.9776879345232552e-01 0 1 0 0 0 0 -V -164 0 0 0 0 0 0 1 0 -P 478 130 1.1140884226725156e+00 1.6365689466410080e-01 -1.4262615386176185e+00 1.8841109304241952e+00 4.9767000000000000e-01 1 0 0 0 0 -V -165 0 0 0 0 0 0 2 0 -P 479 -3122 2.0131910069921948e+00 6.7764893728527717e-02 -2.6715368988585211e+00 3.5269507192217597e+00 1.1156800000000000e+00 2 0 0 -181 0 -P 480 22 -1.6076131313801340e-02 1.4322867873945886e-02 -9.7430843067236299e-03 2.3632905745189673e-02 0 1 0 0 0 0 -V -166 0 -2.3588379760226790e-05 4.6847721938416594e-05 -5.5574960618648883e-04 5.5839451490441211e-04 0 2 0 -P 481 22 -1.1949049708917285e-01 1.3519180044689011e-01 -2.3681807243708217e+00 2.3750441564493485e+00 0 1 0 0 0 0 -P 482 22 -1.0811595167675146e-01 3.1684618315194474e-01 -2.9942984095479352e+00 3.0129559452813477e+00 0 1 0 0 0 0 -V -167 0 -1.5531878903456809e-04 1.0499866127610461e-04 -9.3825546056534588e-04 9.5764010672608495e-04 0 2 0 -P 483 22 -4.9585461648451970e-02 9.0657133681034840e-02 -5.6380526423615873e-01 5.7319613560678850e-01 0 1 0 0 0 0 -P 484 22 -4.7410925234586326e-01 2.6337114730522432e-01 -2.5997490496274094e+00 2.6557181826073788e+00 0 1 0 0 0 0 -V -168 0 -2.3742914991980702e-06 -5.5047613892291266e-05 -3.3364509581962891e-04 3.3865264289515399e-04 0 2 0 -P 485 22 -5.1346047785156834e-02 -1.6412250976727824e-01 -7.3990671605158653e-01 7.5962791108127992e-01 0 1 0 0 0 0 -P 486 22 3.3722397264361485e-02 -2.4447934454129777e-01 -1.7366403164793534e+00 1.7540886348204032e+00 0 1 0 0 0 0 -V -169 0 -3.9442071647588028e+02 -6.1954489476130664e+02 -2.1735850335635319e+03 2.3655702926791487e+03 0 2 0 -P 487 2112 -8.5269966598634783e-01 -1.2482982212205354e+00 -4.0873634023688021e+00 4.4581023471202919e+00 9.3957000000000002e-01 1 0 0 0 0 -P 488 111 -1.2441886187471768e-02 -1.4748650932380047e-01 -5.9280379660612814e-01 6.2573397912776096e-01 1.3497999999999999e-01 2 0 0 -182 0 -V -170 0 -3.8731845683595071e+02 -6.0808637851156175e+02 -2.1351638853560548e+03 2.3238352858308413e+03 0 2 0 -P 489 22 -2.4294136801933316e-02 3.4539658646784890e-02 -1.6139449553526541e-02 4.5207023063660166e-02 0 1 0 0 0 0 -P 490 22 -8.7575975301444949e-03 -4.8910075968903524e-02 -2.5514816277699598e-01 2.5994129339960659e-01 0 1 0 0 0 0 -V -171 0 -1.0933195237963346e+02 -5.0235045203099851e+01 -2.4013370147750371e+02 2.7821504173616125e+02 0 2 0 -P 491 -2112 -1.5658670185772878e+00 -7.6716146142654740e-01 -3.3317517907494221e+00 3.8760595980748569e+00 9.3957000000000002e-01 1 0 0 0 0 -P 492 111 -1.1562836020309447e-01 -5.4397271860069998e-03 -3.6143853957406552e-01 4.0281127914266263e-01 1.3497999999999999e-01 2 0 0 -183 0 -V -172 0 5.6564325317259301e-03 -2.2810648622965798e-03 -4.8107066559107698e-03 1.0330109148124387e-02 0 2 0 -P 493 22 8.3504725860153537e-03 -6.1686271916450621e-03 6.1045606206374968e-02 6.1922115523802154e-02 0 1 0 0 0 0 -P 494 22 -2.7604472616102490e-02 3.4337928036938747e-02 -6.3547114597041404e-02 7.7326166230407709e-02 0 1 0 0 0 0 -V -173 0 -2.5371547209646385e-02 3.0636389190498072e-02 -2.1297633314969514e-01 2.2372333057617133e-01 0 2 0 -P 495 130 -3.8381231838876934e-01 4.9594078006557590e-01 -3.2339673281313233e+00 3.3315895997856435e+00 4.9767000000000000e-01 1 0 0 0 0 -P 496 310 -4.4352446428434805e-01 2.8594973325957562e-01 -2.9436292264552462e+00 3.0316842929486327e+00 4.9767000000000000e-01 2 0 0 -184 0 -V -174 0 -1.6652989478516312e+02 5.6426827439425338e+01 -1.9523859419127828e+02 2.7438809812755659e+02 0 2 0 -P 497 22 -4.9611896691106377e-01 -3.9673980701964699e-02 -6.7175137907101601e-01 8.3603706219129592e-01 0 1 0 0 0 0 -P 498 22 -5.4512945059224993e-02 4.1471367457650572e-02 -7.5483015880856680e-02 1.0192752907976933e-01 0 1 0 0 0 0 -V -175 0 -1.6653019204785372e+02 5.6427260758923254e+01 -1.9523875968452452e+02 2.7438853266426469e+02 0 2 0 -P 499 22 -3.5393953143123574e-01 1.7673538127712854e-01 -2.7700993705699223e-01 4.8295247399019869e-01 0 1 0 0 0 0 -P 500 22 -1.4336849767438012e-01 1.7655084486868911e-01 -2.0435345439003930e-01 3.0575326861768554e-01 0 1 0 0 0 0 -V -176 0 1.6356688133589280e+01 -9.0201463342084711e+00 -8.5247671939611500e+00 3.4614668885069442e+01 0 2 0 -P 501 211 4.6978346947700922e-02 -2.6100259924274977e-01 -6.8335267097857338e-02 3.0737406449267235e-01 1.3957000000000000e-01 1 0 0 0 0 -P 502 -211 2.4512620249294581e-01 9.9917069010506745e-02 -8.3903576116670597e-02 3.1078910986942410e-01 1.3957000000000000e-01 1 0 0 0 0 -V -177 0 2.9469706054036896e-04 4.5240790314715406e-04 1.1077093520806618e-03 1.2413069252204430e-03 0 2 0 -P 503 22 3.6126609958871479e-02 1.4057616038319654e-01 2.0926363458958655e-01 2.5467245154677925e-01 0 1 0 0 0 0 -P 504 22 2.3022644940023498e-01 2.6831909245892044e-01 7.9190608955485142e-01 8.6724541397200472e-01 0 1 0 0 0 0 -V -178 0 4.9225703194877646e+01 -3.8073874681758369e+01 7.5112166828078713e+01 1.0132296751172809e+02 0 2 0 -P 505 111 6.6272058382572374e-01 -5.4061401949282739e-01 1.2309991175446522e+00 1.5050051555041968e+00 1.3497999999999999e-01 2 0 0 -185 0 -P 506 111 2.3080376582982970e-01 -1.5048700915484961e-01 1.3240547924864057e-01 3.3416691874071680e-01 1.3497999999999999e-01 2 0 0 -186 0 -V -179 0 1.3696084322539210e+01 2.3219797350663836e+01 1.0138968753976570e+03 1.0146306659593140e+03 0 2 0 -P 507 22 2.8921549282624782e-02 5.7479359671112923e-02 1.8015767429731999e+00 1.8027254626323534e+00 0 1 0 0 0 0 -P 508 22 4.1285086439393701e-02 7.9835975721270214e-03 9.2188183229143235e+00 9.2189142238711259e+00 0 1 0 0 0 0 -V -180 0 1.3696084629698909e+01 2.3219803949982214e+01 1.0138962372967254e+03 1.0146300281604611e+03 0 2 0 -P 509 22 1.6307939697786111e-01 3.2581921906134687e-01 5.6713531296788773e+00 5.6830449034603641e+00 0 1 0 0 0 0 -P 510 22 1.3673235942334631e-02 2.7402835750636373e-02 1.5902008574409892e+00 1.5904957214008373e+00 0 1 0 0 0 0 -V -181 0 8.8043644790361924e+01 2.9635877628943978e+00 -1.1683533502310971e+02 1.5424547161086937e+02 0 2 0 -P 511 -2212 1.7770563282207339e+00 -3.4186617193049003e-02 -2.3164858133551092e+00 3.0668477358421207e+00 9.3827000000000005e-01 1 0 0 0 0 -P 512 211 2.3613467877146080e-01 1.0195151092157670e-01 -3.5505108550341169e-01 4.6010298337963895e-01 1.3957000000000000e-01 1 0 0 0 0 -V -182 0 -3.9442072465575706e+02 -6.1954499172582257e+02 -2.1735854233004197e+03 2.3655707040658758e+03 0 2 0 -P 513 22 4.0197117264212073e-02 -1.3040481351109726e-01 -3.2880641676034111e-01 3.5599843163417444e-01 0 1 0 0 0 0 -P 514 22 -5.2639003451683840e-02 -1.7081695812703201e-02 -2.6399737984578697e-01 2.6973554749358647e-01 0 1 0 0 0 0 -V -183 0 -1.0933195723816462e+02 -5.0235045431669072e+01 -2.4013371666461182e+02 2.7821505866169014e+02 0 2 0 -P 515 22 -1.2710329868660584e-02 -1.5687834458189054e-02 6.0244861742229771e-03 2.1070241313784526e-02 0 1 0 0 0 0 -P 516 22 -1.0291803033443389e-01 1.0248107272182054e-02 -3.6746302574828849e-01 3.8174103782887814e-01 0 1 0 0 0 0 -V -184 0 -4.0011104427493628e+01 2.5810295848911871e+01 -2.6559444100062234e+02 2.7354374979360034e+02 0 2 0 -P 517 211 -1.1916503545197171e-01 1.2306843499863213e-01 -1.9838673343442541e+00 1.9961351483668279e+00 1.3957000000000000e-01 1 0 0 0 0 -P 518 -211 -3.2435942883237623e-01 1.6288129826094347e-01 -9.5976189211099172e-01 1.0355491445818044e+00 1.3957000000000000e-01 1 0 0 0 0 -V -185 0 4.9226282621175962e+01 -3.8074347348501760e+01 7.5113243108609780e+01 1.0132428335974532e+02 0 2 0 -P 519 22 4.4143146561474261e-01 -4.2964177430910294e-01 8.2724985573673759e-01 1.0314049238212444e+00 0 1 0 0 0 0 -P 520 22 2.2128911821098113e-01 -1.1097224518372439e-01 4.0374926180791465e-01 4.7360023168295245e-01 0 1 0 0 0 0 -V -186 0 4.9225767848899054e+01 -3.8073916837007772e+01 7.5112203918230421e+01 1.0132306112040489e+02 0 2 0 -P 521 22 4.9356772561742791e-02 -1.0513068125950643e-01 7.6076014406641593e-02 1.3883843526847706e-01 0 1 0 0 0 0 -P 522 22 1.8144699326808689e-01 -4.5356327895343163e-02 5.6329464841998966e-02 1.9532848347223983e-01 0 1 0 0 0 0 -BlockType GenEvent -E 9 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 115 0 0 -V -1 0 0 0 0 0 1 3 0 -P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -1 0 -P 3 -2 -1.3063956680622808e+00 1.2879304852865372e+00 5.1893828474231309e+00 5.5041010995066388e+00 0 3 0 0 -3 0 -P 14 2224 6.2629672068355446e-01 -5.5829354058455705e-01 1.9862339814540292e+03 1.9862345051592931e+03 1.1732277688871249e+00 2 0 0 -9 0 -P 20 1 6.8009894737872634e-01 -7.2963694470198015e-01 2.2511960482291925e+03 2.2511962933887798e+03 3.3000000000000002e-01 2 0 0 -14 0 -V -2 0 0 0 0 0 1 2 0 -P 2 2212 0 0 -6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -2 0 -P 4 1 7.0565678882479643e-01 -1.5984513018320162e-01 -1.0981823600478867e+03 1.0981825983971498e+03 0 3 0 0 -4 0 -P 28 2203 -7.0565678882479643e-01 1.5984513018320162e-01 -4.3114475678564886e+03 4.3114476975637281e+03 7.7132999999999996e-01 2 0 0 -14 0 -V -3 0 0 0 0 0 0 1 0 -P 5 -2 -1.3063956680622806e+00 1.2879304852865372e+00 5.1893828474231309e+00 5.5041010995066388e+00 0 3 0 0 -5 0 -V -4 0 0 0 0 0 0 1 0 -P 6 1 7.0565678882479621e-01 -1.5984513018320196e-01 -1.0981823600478865e+03 1.0981825983971496e+03 0 3 0 0 -5 0 -V -5 0 0 0 0 0 0 2 0 -P 7 22 -2.9723146839427486e+00 2.9479669518244265e+00 2.6457283967879142e+00 4.9522764946033000e+00 0 3 0 0 -6 0 -P 8 -24 2.3715758047052646e+00 -1.8198815967210915e+00 -1.0956387055972511e+03 1.0987344230020528e+03 8.2366393304613624e+01 3 0 0 -7 0 -V -6 0 0 0 0 0 0 1 0 -P 9 22 -2.9723146839427486e+00 2.9479669518244265e+00 2.6457283967879142e+00 4.9522764946033284e+00 0 1 0 0 0 0 -V -7 0 0 0 0 0 0 1 0 -P 10 -24 2.3715758047052646e+00 -1.8198815967210915e+00 -1.0956387055972511e+03 1.0987344230020528e+03 8.2366393304613624e+01 2 0 0 -8 0 -V -8 0 0 0 0 0 0 3 0 -P 11 -12 -5.4134620057879408e+00 2.7818509720381723e+01 -1.5330074559902630e+02 1.5589834397827471e+02 0 1 0 0 0 0 -P 12 11 7.7686205977028244e+00 -2.9576059382324004e+01 -9.4035688046136852e+02 9.4085395114538073e+02 5.1000000000000004e-04 1 0 0 0 0 -P 13 22 1.6417212790378732e-02 -6.2331934778808794e-02 -1.9810795368566805e+00 1.9821278783976966e+00 0 1 0 0 0 0 -V -9 0 0 0 0 0 0 2 0 -P 31 2212 3.9845666526000445e-01 -4.2000187219924662e-01 1.7208369731688658e+03 1.7208373263457715e+03 9.3827000000000005e-01 1 0 0 0 0 -P 32 211 2.2784005542354996e-01 -1.3829166838531035e-01 2.6539700828516311e+02 2.6539717881352135e+02 1.3957000000000000e-01 1 0 0 0 0 -V -10 0 0 0 0 0 2 1 0 -P 15 2 -5.8774466266559076e+00 -9.3245626556735572e-01 -1.6938612621707563e+02 1.6949062985417058e+02 0 2 0 0 -10 0 -P 16 -2 5.8774466266559076e+00 9.3245626556735572e-01 -2.6116865900135838e+02 2.6123644902291909e+02 0 2 0 0 -10 0 -P 33 92 0 0 -4.3055478521843401e+02 4.3072707887708964e+02 1.2181683114363196e+01 2 0 0 -11 0 -V -11 0 0 0 0 0 0 7 0 -P 34 211 -3.4223096422762840e+00 -1.1755942505505563e+00 -1.0212463398588793e+02 1.0218881823206500e+02 1.3957000000000000e-01 1 0 0 0 0 -P 35 313 -1.4318407714997392e+00 1.0448174597780837e+00 -7.2468641710313307e+01 7.2496138880553076e+01 9.1886328226238245e-01 2 0 0 -18 0 -P 36 -313 1.0440864295074967e+00 -4.5871170804924338e-01 -4.5617120785926659e+01 4.5640092033581006e+01 8.9205332382051472e-01 2 0 0 -19 0 -P 37 -213 3.2409711340366965e-01 2.3335471252859891e-01 -4.0111237075385660e+01 4.0121708510378014e+01 8.2502164406168854e-01 2 0 0 -20 0 -P 38 111 1.2936126903917291e+00 4.7104501694792161e-01 -5.4152907899216984e+01 5.4170572922410656e+01 1.3497999999999999e-01 2 0 0 -21 0 -P 39 213 1.2548924127288779e+00 -4.7071757914042800e-01 -7.1343007544735329e+01 7.1361058743643341e+01 8.8297762073342168e-01 2 0 0 -22 0 -P 40 -211 9.3746176774424972e-01 3.5580634848562342e-01 -4.4737236216968142e+01 4.4748689554458579e+01 1.3957000000000000e-01 1 0 0 0 0 -V -12 0 0 0 0 0 3 1 0 -P 17 2 -1.2925484085993182e+00 -2.9944775922487810e+00 -1.1193505744225627e+03 1.1193553260862077e+03 0 2 0 0 -12 0 -P 18 21 1.4025793372001376e+00 -2.7884933102773206e+00 9.4380500095915245e+00 9.9408104157635311e+00 0 2 0 0 -12 0 -P 19 -2 1.2925484085993182e+00 2.9944775922487810e+00 6.0026559409271556e+02 6.0027445475292370e+02 0 2 0 0 -12 0 -P 41 92 1.4025793372001376e+00 -2.7884933102773206e+00 -5.0964693032025559e+02 1.7295705912548949e+03 1.6527748466216472e+03 2 0 0 -13 0 -V -13 0 0 0 0 0 0 24 0 -P 42 2212 -6.4915649404280318e-01 -4.2701824006267358e-01 -3.3481058142234315e+02 3.3481279774180007e+02 9.3827000000000005e-01 1 0 0 0 0 -P 43 -2212 -4.9702749607820934e-01 -1.9489755847429249e+00 -5.5795580111420406e+02 5.5796021532878854e+02 9.3827000000000005e-01 1 0 0 0 0 -P 44 113 1.6533916537684344e-02 -2.9412170960257544e-01 -7.6806020852310596e+01 7.6812204400634272e+01 9.2904508437107169e-01 2 0 0 -23 0 -P 45 221 -1.4972892483807126e-01 4.5696574621284011e-03 -1.0055577843303921e+02 1.0055738022348076e+02 5.4744999999999999e-01 2 0 0 -24 0 -P 46 221 3.0200268424734572e-01 2.8534525335404792e-01 -2.8870835357085056e+01 2.8879014236177056e+01 5.4744999999999999e-01 2 0 0 -25 0 -P 47 211 -6.4308952739707492e-01 -7.2529706032234698e-01 -5.7806554947847131e+00 5.8630263260746780e+00 1.3957000000000000e-01 1 0 0 0 0 -P 48 -213 3.3534244198776286e-01 1.3819689112114653e-01 -4.9513827912839794e+00 4.9961422616793758e+00 5.6008304652229868e-01 2 0 0 -26 0 -P 49 213 3.8463247216398370e-02 -2.6825695664888762e-02 -6.2305386932288869e+00 6.2750941019503417e+00 7.4497955755530509e-01 2 0 0 -27 0 -P 50 -211 -3.0493494659552672e-01 4.0145043880181042e-01 -5.0694511698343381e-01 7.2843730890360803e-01 1.3957000000000000e-01 1 0 0 0 0 -P 51 213 4.5194685326190176e-01 -3.3844629401524673e-01 -1.5162335922911572e+00 1.8063449324268250e+00 8.0319104601952163e-01 2 0 0 -28 0 -P 52 113 2.7127567356955044e-02 -3.5096115077676360e-01 -2.0560156402869595e-01 8.5167643807785465e-01 7.4777745204083745e-01 2 0 0 -29 0 -P 53 313 1.5417297555815859e-01 -2.8232887295282283e-01 9.8735536340780428e-01 1.3695271653989567e+00 8.9289145153275806e-01 2 0 0 -30 0 -P 54 -321 1.6551837760939633e-01 -1.1656322834342046e+00 1.9035451055119379e+00 2.2919903756841866e+00 4.9359999999999998e-01 1 0 0 0 0 -P 55 223 2.7048492858539253e-01 6.4531024760498323e-01 4.8493013060375016e+00 4.9634403118180437e+00 7.9399569267567460e-01 2 0 0 -31 0 -P 56 211 3.8312833002830518e-02 -6.7146029886687178e-02 -3.8093840362958112e-02 1.6403471606902364e-01 1.3957000000000000e-01 1 0 0 0 0 -P 57 113 -1.9506129454061361e-01 -4.4996827569324266e-01 9.0912943373856825e-01 1.1300284456403529e+00 4.5817857098333514e-01 2 0 0 -32 0 -P 58 311 2.5486600266519988e-01 -5.5963768406031345e-01 7.0488897796228791e+00 7.0931427146862651e+00 4.9767000000000000e-01 2 0 0 -33 0 -P 59 -323 5.8984323195972610e-01 5.0704121519152545e-01 1.2620140238622938e+01 1.2677108878334321e+01 9.1440911983714146e-01 2 0 0 -34 0 -P 60 113 4.7159765669982140e-01 -9.8137013413514440e-01 2.4370406619890971e+01 2.4406162239602889e+01 7.4735851973126655e-01 2 0 0 -35 0 -P 61 113 -3.7486729996664692e-01 7.1444064961249365e-01 3.2438220987768268e+01 3.2455915309327651e+01 7.0519981604898474e-01 2 0 0 -36 0 -P 62 223 1.4179614786791939e-01 3.7607095473386615e-01 9.2454157450938268e+01 9.2458324597560690e+01 7.8039856128934548e-01 2 0 0 -37 0 -P 63 223 -2.5333004221869093e-01 -1.7482317991745372e-01 4.1049255544223520e+01 4.1057845264441667e+01 7.8136916329073203e-01 2 0 0 -38 0 -P 64 321 8.9930855079187644e-01 4.6279031139923948e-01 1.3433665469657635e+02 1.3434136878403856e+02 4.9359999999999998e-01 1 0 0 0 0 -P 65 -321 3.1245794752940531e-01 1.4688432657087267e+00 2.5561448142535130e+02 2.5561936915229936e+02 4.9359999999999998e-01 1 0 0 0 0 -V -14 0 0 0 0 0 7 1 0 -P 21 21 4.5189465118581147e+00 3.0246444971641862e-01 7.5589346639934547e+01 7.5724907974672121e+01 0 2 0 0 -14 0 -P 22 21 2.3306161753086991e+00 2.5263018388499852e+00 1.6213072005400015e+01 1.6573402685926418e+01 0 2 0 0 -14 0 -P 23 21 -2.3306161753086991e+00 -2.5263018388499852e+00 1.7097855225215859e+01 1.7439914737177720e+01 0 2 0 0 -14 0 -P 24 21 -4.5189465118581147e+00 -3.0246444971641862e-01 -3.2145610931228710e+00 5.5538964107909132e+00 0 2 0 0 -14 0 -P 25 21 3.3444552178150491e+00 -3.3682323125838081e+00 -1.2861369300978330e+01 1.3709310336835030e+01 0 2 0 0 -14 0 -P 26 21 -1.4025793372001376e+00 2.7884933102773206e+00 -5.6917899608951075e+00 6.4914864782689392e+00 0 2 0 0 -14 0 -P 27 21 -3.3444552178150491e+00 3.3682323125838081e+00 -1.4040682664225221e+01 1.4821306936062644e+01 0 2 0 0 -14 0 -P 66 92 -1.4281371786462076e+00 2.2187014957585420e+00 -1.9871596487759671e+03 6.7129582165122420e+03 6.4120977522729381e+03 2 0 0 -15 0 -V -15 0 0 0 0 0 0 35 0 -P 67 -213 5.4216260460293231e-01 -7.8759029792302415e-01 1.9393385450254702e+03 1.9393389087263906e+03 7.0458483531368932e-01 2 0 0 -39 0 -P 68 211 1.0135732704315257e-02 5.3514575211682114e-01 2.3409980209226654e+02 2.3410045558078767e+02 1.3957000000000000e-01 1 0 0 0 0 -P 69 1114 8.9641438172015775e-01 -3.6392129443568710e-01 4.4812864618973961e+01 4.4840773987411758e+01 1.2514707265275640e+00 2 0 0 -40 0 -P 70 211 3.8473184386194154e-01 1.7416136993019182e-01 7.6482609489049134e+00 7.6611830745584788e+00 1.3957000000000000e-01 1 0 0 0 0 -P 71 -2212 1.3570820383715327e+00 -3.4833837508799126e-01 5.9400969475256197e+01 5.9424898287465744e+01 9.3827000000000005e-01 1 0 0 0 0 -P 72 223 5.3513808491869197e-01 5.6258841694084194e-01 1.3497984646533387e+01 1.3542742700934161e+01 7.7936631236407006e-01 2 0 0 -41 0 -P 73 111 1.4249126471823113e+00 -8.7326689179198683e-02 2.6487334767795783e+01 2.6526121554128995e+01 1.3497999999999999e-01 2 0 0 -42 0 -P 74 113 1.0243223484583437e+00 8.9460184235475726e-01 7.8398598406213731e+00 8.0044033243370425e+00 8.7035712680161426e-01 2 0 0 -43 0 -P 75 213 7.8146511190515611e-01 8.1085897447583399e-01 9.7004079181519618e+00 9.7985969509811213e+00 8.0399529328116248e-01 2 0 0 -44 0 -P 76 223 -6.0070864720254791e-01 -7.5020685309669766e-01 4.3286489963019363e+00 4.5018892429835349e+00 7.7855213161865244e-01 2 0 0 -45 0 -P 77 -213 2.0007537718930121e-01 -8.0481277249238786e-02 2.7952951677960907e+00 2.9524405521698647e+00 9.2559318625830767e-01 2 0 0 -46 0 -P 78 113 -4.2184079371557825e-01 6.6478556099176161e-02 2.1918020937664431e+00 2.2875634621838854e+00 4.9656935227230686e-01 2 0 0 -47 0 -P 79 213 -6.8390630107822026e-01 -1.2031666983062672e+00 6.5479758970760322e+00 6.7835848615007661e+00 1.1071121406280251e+00 2 0 0 -48 0 -P 80 111 -5.9823858771689586e-01 -1.2013185150743945e-01 9.0499212497479931e-01 1.0997960793922275e+00 1.3497999999999999e-01 2 0 0 -49 0 -P 81 -211 -1.8659891773971918e-01 3.9874400471142490e-01 -3.5494610553090200e-01 5.8247957914977033e-01 1.3957000000000000e-01 1 0 0 0 0 -P 82 113 -9.1461437410828916e-01 -4.4389801834541065e-01 -7.0381543247325407e-01 1.5379185055407165e+00 9.1447923031668488e-01 2 0 0 -50 0 -P 83 213 -1.2615073893577071e+00 1.7769459083209821e-01 -8.9289455873395662e-01 1.7351143047719249e+00 7.6836495013266204e-01 2 0 0 -51 0 -P 84 -211 -8.7219080940381755e-01 -1.8926094685784717e-01 -5.3480327737921796e-01 1.0497765688037612e+00 1.3957000000000000e-01 1 0 0 0 0 -P 85 113 6.2141214984468351e-01 -8.6421893286914353e-02 -2.4332734261172653e+00 2.6283177307616250e+00 7.7046266877350866e-01 2 0 0 -52 0 -P 86 211 -3.5446434481312317e-01 -1.2268348898738159e+00 -1.2253959392308320e+00 1.7753432939966589e+00 1.3957000000000000e-01 1 0 0 0 0 -P 87 2112 9.1472463744437760e-01 -1.2569570091894453e-01 -3.6476223116165620e+00 3.8782033062592536e+00 9.3957000000000002e-01 1 0 0 0 0 -P 88 -2212 8.6361312614816066e-01 -9.1836205712359598e-01 -4.8715921735632639e+00 5.1187867115208592e+00 9.3827000000000005e-01 1 0 0 0 0 -P 89 113 2.0594892520170244e-02 2.0438980965336340e-01 -5.7002702256806792e-01 9.3915477322444918e-01 7.1755246339511269e-01 2 0 0 -53 0 -P 90 213 -6.4584413784606176e-01 7.8022036598574573e-01 -3.1474571005361729e+00 3.4019473481372686e+00 8.0056298308975271e-01 2 0 0 -54 0 -P 91 113 -1.0973380029073554e+00 7.4299977704846509e-01 -5.3024187721700224e+00 5.5125660457410666e+00 7.1870732003888060e-01 2 0 0 -55 0 -P 92 313 -5.3612158238681562e-01 9.9278532523932750e-01 -3.4650732050135691e+00 3.7239560285499427e+00 7.6685535360910795e-01 2 0 0 -56 0 -P 93 -321 -1.2221331636647612e+00 1.5690691103915120e+00 -4.6853289562246045e+00 5.1138572262970730e+00 4.9359999999999998e-01 1 0 0 0 0 -P 94 221 -6.2878961836263358e-01 3.9774130133513302e-01 -4.6596960331790589e+00 4.7503729486297237e+00 5.4744999999999999e-01 2 0 0 -57 0 -P 95 213 -1.5227279129650367e-01 7.2806206429657749e-01 -2.1391236973384483e+01 2.1421593665725354e+01 8.6394129170691092e-01 2 0 0 -58 0 -P 96 113 3.0209002088422593e-01 -3.9448441998462064e-01 -1.0899232925753084e+01 1.0936206424161766e+01 7.4863625595375760e-01 2 0 0 -59 0 -P 97 111 -8.0811401894910795e-01 4.0766228483193984e-01 -2.8448690697297046e+01 2.8463405607849737e+01 1.3497999999999999e-01 2 0 0 -60 0 -P 98 -213 1.2089810072332315e-01 -5.2079050430329710e-01 -1.1939975039352846e+02 1.1940300095633448e+02 7.0028868431575408e-01 2 0 0 -61 0 -P 99 223 5.4114373167817453e-01 2.7085749567615108e-01 -4.2861438876063943e+02 4.2861551326973716e+02 7.7315102171666417e-01 2 0 0 -62 0 -P 100 2212 -8.2348818137401925e-01 8.9103884396884103e-02 -1.7961757953324147e+03 1.7961762313762292e+03 9.3827000000000005e-01 1 0 0 0 0 -P 101 213 -1.6088234688084649e-01 6.2448336922287219e-02 -1.9053309529925027e+03 1.9053311124555951e+03 7.6018223594688406e-01 2 0 0 -63 0 -V -16 0 0 0 0 0 2 1 0 -P 29 21 1.7182462671114402e+00 2.3426872894360549e+00 2.1255453864254928e-01 2.9130282186112093e+00 0 2 0 0 -16 0 -P 30 21 -1.7182462671114402e+00 -2.3426872894360549e+00 2.0339078055224470e+03 2.0339098804812140e+03 0 2 0 0 -16 0 -P 102 92 0 0 2.0341203600610895e+03 2.0368229086998253e+03 1.0489004809494854e+02 2 0 0 -17 0 -V -17 0 0 0 0 0 0 20 0 -P 103 -211 -6.0384089246498240e-02 -2.1593397066779253e-02 6.7328643487245954e-01 6.9058447804325818e-01 1.3957000000000000e-01 1 0 0 0 0 -P 104 111 3.0137821631491024e-01 6.9978369862249840e-02 2.1411449928155655e+00 2.1675902016241224e+00 1.3497999999999999e-01 2 0 0 -64 0 -P 105 211 -7.4504913328202721e-02 1.3535438527297250e-01 7.5149850953364265e+01 7.5150139387026329e+01 1.3957000000000000e-01 1 0 0 0 0 -P 106 311 -3.0824762001330436e-01 -1.4402182869475991e-01 3.9741975944594941e+02 3.9742021668806382e+02 4.9767000000000000e-01 2 0 0 -65 0 -P 107 333 -9.1866028181973891e-01 -2.0597240947952193e+00 9.9285414260558821e+02 9.9285721752589359e+02 1.0097049676208800e+00 2 0 0 -66 0 -P 108 -323 -2.3490715754350402e-01 8.3095883242977953e-02 4.9572324857581219e+02 4.9572416549705343e+02 9.2032216914309117e-01 2 0 0 -67 0 -P 109 111 4.1806436528339791e-01 -2.2899116272598369e-01 6.4652151043041934e+00 6.4841684672322852e+00 1.3497999999999999e-01 2 0 0 -68 0 -P 110 3222 -5.6454807151714115e-01 3.0038362700044496e-01 1.5559636563150063e+01 1.5618125233927406e+01 1.1893700000000000e+00 2 0 0 -69 0 -P 111 -3212 -1.2459659851310380e-01 1.4248779043166906e-01 1.5027023583236335e+01 1.5075458213813077e+01 1.1925500000000000e+00 2 0 0 -70 0 -P 112 -213 3.7655640018993020e-01 -3.8287574679571718e-01 1.8935226661500398e+01 1.8955778084047072e+01 7.0023245371471732e-01 2 0 0 -71 0 -P 113 211 -1.4243498041231339e-01 3.1036147917840962e-01 3.6873645553705686e-01 5.2159211070040012e-01 1.3957000000000000e-01 1 0 0 0 0 -P 114 113 3.8953818738287976e-01 3.5983308392962821e-03 2.9199479223354214e+00 3.0414263991854740e+00 7.5658821369157259e-01 2 0 0 -72 0 -P 115 111 -9.0634448722506072e-03 6.1399994260374857e-01 8.6138652128429471e-01 1.0664353777893050e+00 1.3497999999999999e-01 2 0 0 -73 0 -P 116 -213 2.1126425569031212e-01 7.2662728626688444e-01 1.7631477856117816e-01 1.0907967455146763e+00 7.6559182336697773e-01 2 0 0 -74 0 -P 117 211 1.8890292053918842e-01 -3.9217829654797970e-01 4.2376063239215755e-01 6.2333056088797001e-01 1.3957000000000000e-01 1 0 0 0 0 -P 118 -211 -5.8451538057038684e-02 1.9531982712468343e-01 3.1711758377891242e-01 4.0200716910401635e-01 1.3957000000000000e-01 1 0 0 0 0 -P 119 221 9.1656294346312978e-02 -7.2250132436744510e-02 4.2083038462435490e-01 7.0030041628825801e-01 5.4744999999999999e-01 2 0 0 -75 0 -P 120 323 3.2393892176032707e-01 5.9901412523414366e-01 3.2048749331960464e+00 3.3826342799303069e+00 8.4097383257149705e-01 2 0 0 -76 0 -P 121 -323 8.3047607121168998e-01 3.6045783335863357e-01 4.3175731064757974e+00 4.4982902518816132e+00 8.7952106622028725e-01 2 0 0 -77 0 -P 122 211 -6.3597693739585281e-01 -2.3904422135293027e-01 1.1612828223115010e+00 1.3526516118193193e+00 1.3957000000000000e-01 1 0 0 0 0 -V -18 0 0 0 0 0 0 2 0 -P 123 311 -8.8835934438628372e-01 6.8074086066904238e-01 -5.6890766581735761e+01 5.6903950549417800e+01 4.9767000000000000e-01 2 0 0 -78 0 -P 124 111 -5.4348142711345571e-01 3.6407659910904144e-01 -1.5577875128577560e+01 1.5592188331135288e+01 1.3497999999999999e-01 2 0 0 -79 0 -V -19 0 0 0 0 0 0 2 0 -P 125 -321 1.0773689084100895e+00 -5.1649738648580301e-01 -4.0378564311746878e+01 4.0399252346459754e+01 4.9359999999999998e-01 1 0 0 0 0 -P 126 211 -3.3282478902592651e-02 5.7785678436559643e-02 -5.2385564741797834e+00 5.2408396871212544e+00 1.3957000000000000e-01 1 0 0 0 0 -V -20 0 0 0 0 0 0 2 0 -P 127 -211 2.3663845137153569e-01 3.6141929721200028e-01 -3.7375453158979781e+01 3.7378210233892375e+01 1.3957000000000000e-01 1 0 0 0 0 -P 128 111 8.7458662032133927e-02 -1.2806458468340143e-01 -2.7357839164058722e+00 2.7434982764856324e+00 1.3497999999999999e-01 2 0 0 -80 0 -V -21 0 1.8697213022662409e-04 6.8082425988507642e-05 -7.8269830089690295e-03 7.8295362206386096e-03 0 2 0 -P 129 22 1.1490964488537836e-01 8.5213701923610385e-02 -5.5616412847888865e+00 5.5634808692177042e+00 0 1 0 0 0 0 -P 130 22 1.1787030455063505e+00 3.8583131502431123e-01 -4.8591266614428093e+01 4.8607092053192950e+01 0 1 0 0 0 0 -V -22 0 0 0 0 0 0 2 0 -P 131 211 9.2572302897073211e-01 -2.0288737845322695e-02 -3.1494950736642860e+01 3.1508868219085731e+01 1.3957000000000000e-01 1 0 0 0 0 -P 132 111 3.2916938375814553e-01 -4.5042884129510524e-01 -3.9848056808092458e+01 3.9852190524557592e+01 1.3497999999999999e-01 2 0 0 -81 0 -V -23 0 0 0 0 0 0 2 0 -P 133 211 5.5628915281980412e-02 -1.7240521926811242e-01 -4.4020576842464809e+00 4.4079938493808974e+00 1.3957000000000000e-01 1 0 0 0 0 -P 134 -211 -3.9094998744296061e-02 -1.2171649033446306e-01 -7.2403963168064124e+01 7.2404210551253385e+01 1.3957000000000000e-01 1 0 0 0 0 -V -24 0 0 0 0 0 0 2 0 -P 135 22 -1.5444404052236614e-02 -1.2303691275080576e-01 -5.4080212553685936e+00 5.4094427171414141e+00 0 1 0 0 0 0 -P 136 22 -1.3428452078583464e-01 1.2760657021293417e-01 -9.5147757177670613e+01 9.5147937506339346e+01 0 1 0 0 0 0 -V -25 0 0 0 0 0 0 3 0 -P 137 111 9.2311480631191989e-02 1.8010222032173673e-01 -1.5022100885582585e+01 1.5024070448325322e+01 1.3497999999999999e-01 2 0 0 -82 0 -P 138 111 1.5389951085199688e-01 1.3360790730478667e-01 -6.2955950525981503e+00 6.3003391019081789e+00 1.3497999999999999e-01 2 0 0 -83 0 -P 139 111 5.5791692764156894e-02 -2.8364874272475478e-02 -7.5531394189043217e+00 7.5546046859435538e+00 1.3497999999999999e-01 2 0 0 -84 0 -V -26 0 0 0 0 0 0 2 0 -P 140 -211 3.4795871222769470e-01 1.2913562700567929e-01 -4.6335489000911831e+00 4.6504845414229168e+00 1.3957000000000000e-01 1 0 0 0 0 -P 141 111 -1.2616270239931780e-02 9.0612641154672498e-03 -3.1783389119279665e-01 3.4565772025645797e-01 1.3497999999999999e-01 2 0 0 -85 0 -V -27 0 0 0 0 0 0 2 0 -P 142 211 -2.6507126648343393e-01 1.6611475780357760e-01 -3.6620259310433121e+00 3.6780117718148904e+00 1.3957000000000000e-01 1 0 0 0 0 -P 143 111 3.0353451369983231e-01 -1.9294045346846636e-01 -2.5685127621855748e+00 2.5970823301354509e+00 1.3497999999999999e-01 2 0 0 -86 0 -V -28 0 0 0 0 0 0 2 0 -P 144 211 4.2568471861282581e-01 -5.3585815142727589e-01 -8.6305498665514868e-01 1.1102680455646092e+00 1.3957000000000000e-01 1 0 0 0 0 -P 145 111 2.6262134649075942e-02 1.9741185741202916e-01 -6.5317860563600838e-01 6.9607688686221558e-01 1.3497999999999999e-01 2 0 0 -87 0 -V -29 0 0 0 0 0 0 2 0 -P 146 211 2.7491546942463990e-01 1.5012758060953384e-02 6.4340006694604740e-02 3.1531463587189956e-01 1.3957000000000000e-01 1 0 0 0 0 -P 147 -211 -2.4778790206768489e-01 -3.6597390883771697e-01 -2.6994157072330072e-01 5.3636180220595964e-01 1.3957000000000000e-01 1 0 0 0 0 -V -30 0 0 0 0 0 0 2 0 -P 148 321 -3.4500238693339409e-02 -1.0597931797356490e-01 9.4631402810185450e-01 1.0731137321320592e+00 4.9359999999999998e-01 1 0 0 0 0 -P 149 -211 1.8867321425149802e-01 -1.7634955497925797e-01 4.1041335305949819e-02 2.9641343326689734e-01 1.3957000000000000e-01 1 0 0 0 0 -V -31 0 0 0 0 0 0 3 0 -P 150 -211 1.7372815870072264e-01 3.9816647204593414e-01 1.3106575762200228e+00 1.3878116153102316e+00 1.3957000000000000e-01 1 0 0 0 0 -P 151 211 2.2174429060384263e-02 -7.0700764257547011e-02 9.6535187332727646e-01 9.7819953363679191e-01 1.3957000000000000e-01 1 0 0 0 0 -P 152 111 7.4582340824285623e-02 3.1784453981659611e-01 2.5732918564902025e+00 2.5974291628710198e+00 1.3497999999999999e-01 2 0 0 -88 0 -V -32 0 0 0 0 0 0 2 0 -P 153 -211 3.3962108465623669e-02 -1.2136739619253469e-02 3.0383058001969304e-01 3.3629381724188662e-01 1.3957000000000000e-01 1 0 0 0 0 -P 154 211 -2.2902340300623730e-01 -4.3783153607398917e-01 6.0529885371887526e-01 7.9373462839846587e-01 1.3957000000000000e-01 1 0 0 0 0 -V -33 0 0 0 0 0 0 1 0 -P 155 130 2.5486600266519988e-01 -5.5963768406031345e-01 7.0488897796228791e+00 7.0931427146862633e+00 4.9767000000000000e-01 1 0 0 0 0 -V -34 0 0 0 0 0 0 2 0 -P 156 -311 6.3629118454362399e-01 2.6066327066419842e-01 7.2899009219783402e+00 7.3391513605703720e+00 4.9767000000000000e-01 2 0 0 -89 0 -P 157 -211 -4.6447952583897813e-02 2.4637794452732709e-01 5.3302393166445974e+00 5.3379575177639449e+00 1.3957000000000000e-01 1 0 0 0 0 -V -35 0 0 0 0 0 0 2 0 -P 158 -211 -1.3843969334754791e-01 -1.1573951633130124e-01 2.7775781205311443e+00 2.7869304234027963e+00 1.3957000000000000e-01 1 0 0 0 0 -P 159 211 6.1003735004736936e-01 -8.6563061780384321e-01 2.1592828499359829e+01 2.1619231816200092e+01 1.3957000000000000e-01 1 0 0 0 0 -V -36 0 0 0 0 0 0 2 0 -P 160 -211 -5.3563447701898401e-02 6.6112470805366741e-01 1.6778003219314172e+01 1.6791689216238652e+01 1.3957000000000000e-01 1 0 0 0 0 -P 161 211 -3.2130385226474850e-01 5.3315941558826262e-02 1.5660217768454098e+01 1.5664226093088988e+01 1.3957000000000000e-01 1 0 0 0 0 -V -37 0 0 0 0 0 0 3 0 -P 162 211 -6.6907931039927135e-02 1.2175756451401197e-01 1.3514430333249674e+01 1.3515865070091197e+01 1.3957000000000000e-01 1 0 0 0 0 -P 163 -211 1.5997741131462320e-01 -8.4859508363502090e-02 1.5752145709471709e+01 1.5753804878365688e+01 1.3957000000000000e-01 1 0 0 0 0 -P 164 111 4.8726667593223340e-02 3.3917289858335631e-01 6.3187581408216893e+01 6.3188654649103782e+01 1.3497999999999999e-01 2 0 0 -90 0 -V -38 0 0 0 0 0 0 3 0 -P 165 -211 -2.2781057367096993e-01 -1.8076023205047512e-01 2.2204623661144236e+01 2.2206966556396523e+01 1.3957000000000000e-01 1 0 0 0 0 -P 166 211 -8.8088472241610968e-02 1.2956137830090980e-01 4.4468232102231378e+00 4.4517706789061249e+00 1.3957000000000000e-01 1 0 0 0 0 -P 167 111 6.2569003693889999e-02 -1.2362432616788839e-01 1.4397808672856140e+01 1.4399108029138999e+01 1.3497999999999999e-01 2 0 0 -91 0 -V -39 0 0 0 0 0 0 2 0 -P 168 -211 1.1575661872227846e-01 -5.9566096362919352e-01 7.2921715829360608e+02 7.2921742412065646e+02 1.3957000000000000e-01 1 0 0 0 0 -P 169 111 4.2640598588065382e-01 -1.9192933429383069e-01 1.2101213867318643e+03 1.2101214846057335e+03 1.3497999999999999e-01 2 0 0 -92 0 -V -40 0 0 0 0 0 0 2 0 -P 170 2112 5.7730953717981204e-01 -4.9267549823692297e-01 3.3126349100956851e+01 3.3148360622987781e+01 9.3957000000000002e-01 1 0 0 0 0 -P 171 -211 3.1910484454034588e-01 1.2875420380123584e-01 1.1686515518017115e+01 1.1692413364423977e+01 1.3957000000000000e-01 1 0 0 0 0 -V -41 0 0 0 0 0 0 3 0 -P 172 -211 9.5487207154282661e-02 -6.2863114436684478e-02 1.2548498161728181e+00 1.2677529033434551e+00 1.3957000000000000e-01 1 0 0 0 0 -P 173 211 2.1429886442208966e-02 1.3131790882612157e-01 1.6489652622608375e+00 1.6602017510695333e+00 1.3957000000000000e-01 1 0 0 0 0 -P 174 111 4.1822099132220031e-01 4.9413362255140486e-01 1.0594169568099732e+01 1.0614788046521172e+01 1.3497999999999999e-01 2 0 0 -93 0 -V -42 0 1.8062935474981218e-04 -1.1069986325174275e-05 3.3576726247816625e-03 3.3625894399998031e-03 0 2 0 -P 175 22 6.7619288638646513e-01 -9.1896050652983813e-02 1.1803182198575048e+01 1.1822892696649337e+01 0 1 0 0 0 0 -P 176 22 7.4871976079584612e-01 4.5693614737851275e-03 1.4684152569220737e+01 1.4703228857479658e+01 0 1 0 0 0 0 -V -43 0 0 0 0 0 0 2 0 -P 177 -211 1.8255094262342417e-01 4.9281267235300757e-01 4.5388757870887497e+00 4.5713304816218363e+00 1.3957000000000000e-01 1 0 0 0 0 -P 178 211 8.4177140583491938e-01 4.0178917000174957e-01 3.3009840535326229e+00 3.4330728427152049e+00 1.3957000000000000e-01 1 0 0 0 0 -V -44 0 0 0 0 0 0 2 0 -P 179 211 6.4478111510714742e-01 7.1330192574342022e-01 9.2323181717291547e+00 9.2833033416240607e+00 1.3957000000000000e-01 1 0 0 0 0 -P 180 111 1.3668399679800877e-01 9.7557048732413817e-02 4.6808974642280660e-01 5.1529360935705770e-01 1.3497999999999999e-01 2 0 0 -94 0 -V -45 0 0 0 0 0 0 3 0 -P 181 -211 -3.3985093605444544e-01 -3.3839691300994644e-02 1.0124513152340913e+00 1.0775811960421686e+00 1.3957000000000000e-01 1 0 0 0 0 -P 182 211 -1.2829685354263031e-02 -1.2856125071302602e-01 5.3883610377089486e-01 5.7141642226854616e-01 1.3957000000000000e-01 1 0 0 0 0 -P 183 111 -2.4802802579383956e-01 -5.8780591108267710e-01 2.7773615772969507e+00 2.8528916246728215e+00 1.3497999999999999e-01 2 0 0 -95 0 -V -46 0 0 0 0 0 0 2 0 -P 184 -211 1.3358989959828704e-01 3.8645547651348672e-01 1.6675168582308439e+00 1.7225813054790797e+00 1.3957000000000000e-01 1 0 0 0 0 -P 185 111 6.6485477591014169e-02 -4.6693675376272548e-01 1.1277783095652469e+00 1.2298592466907843e+00 1.3497999999999999e-01 2 0 0 -96 0 -V -47 0 0 0 0 0 0 2 0 -P 186 211 -9.3953505824433764e-02 -1.5916621156773283e-01 8.5366541626208947e-01 8.8452561974396915e-01 1.3957000000000000e-01 1 0 0 0 0 -P 187 -211 -3.2788728789114446e-01 2.2564476766690900e-01 1.3381366775043535e+00 1.4030378424399157e+00 1.3957000000000000e-01 1 0 0 0 0 -V -48 0 0 0 0 0 0 2 0 -P 188 211 -3.1297297759670162e-01 -1.2700760300481633e+00 5.6378957412772790e+00 5.7893344506273889e+00 1.3957000000000000e-01 1 0 0 0 0 -P 189 111 -3.7093332348151864e-01 6.6909331741895992e-02 9.1008015579875357e-01 9.9425041087337529e-01 1.3497999999999999e-01 2 0 0 -97 0 -V -49 0 -1.4965826533362982e-04 -3.0052766366232216e-05 2.2639721733967781e-04 2.7513031897644541e-04 0 2 0 -P 190 22 -3.0753609678583916e-02 -4.0951860957295985e-02 6.0453254742586303e-02 7.9230268414921035e-02 0 1 0 0 0 0 -P 191 22 -5.6748497803831199e-01 -7.9179990550143464e-02 8.4453887023221308e-01 1.0205658109773066e+00 0 1 0 0 0 0 -V -50 0 0 0 0 0 0 2 0 -P 192 211 -3.7395809242150829e-01 -5.4704665311005618e-01 -6.9450929608971679e-01 9.7001424877239883e-01 1.3957000000000000e-01 1 0 0 0 0 -P 193 -211 -5.4065628168678093e-01 1.0314863476464556e-01 -9.3061363835372987e-03 5.6790425676831746e-01 1.3957000000000000e-01 1 0 0 0 0 -V -51 0 0 0 0 0 0 2 0 -P 194 211 -1.0036870681900585e+00 6.0908344293775021e-02 -9.7858835208038319e-01 1.4100398948199884e+00 1.3957000000000000e-01 1 0 0 0 0 -P 195 111 -2.5782032116764880e-01 1.1678624653832320e-01 8.5693793346426558e-02 3.2507440995193648e-01 1.3497999999999999e-01 2 0 0 -98 0 -V -52 0 0 0 0 0 0 2 0 -P 196 -211 -4.1290701932326097e-02 -2.0666261137288519e-01 -1.0930205176097356e+00 1.1218680821831855e+00 1.3957000000000000e-01 1 0 0 0 0 -P 197 211 6.6270285177700960e-01 1.2024071808597084e-01 -1.3402529085075296e+00 1.5064496485784395e+00 1.3957000000000000e-01 1 0 0 0 0 -V -53 0 0 0 0 0 0 2 0 -P 198 -211 -3.1658924960087986e-01 1.5111911254455840e-01 -2.9258169938081902e-01 4.7765005480128553e-01 1.3957000000000000e-01 1 0 0 0 0 -P 199 211 3.3718414212105013e-01 5.3270697108805012e-02 -2.7744532318724890e-01 4.6150471842316365e-01 1.3957000000000000e-01 1 0 0 0 0 -V -54 0 0 0 0 0 0 2 0 -P 200 211 7.8603340975565442e-02 2.4826114704283447e-02 -1.3818930413805391e-01 2.1300443624955517e-01 1.3957000000000000e-01 1 0 0 0 0 -P 201 111 -7.2444747882162719e-01 7.5539425128146231e-01 -3.0092677963981189e+00 3.1889429118877124e+00 1.3497999999999999e-01 2 0 0 -99 0 -V -55 0 0 0 0 0 0 2 0 -P 202 211 -7.1336812839619990e-01 1.2156278646260546e-01 -2.1215576393421842e+00 2.2459203457859389e+00 1.3957000000000000e-01 1 0 0 0 0 -P 203 -211 -3.8396987451115550e-01 6.2143699058585955e-01 -3.1808611328278378e+00 3.2666456999551263e+00 1.3957000000000000e-01 1 0 0 0 0 -V -56 0 0 0 0 0 0 2 0 -P 204 321 -1.7893673284703560e-01 6.0568524101514520e-01 -1.7601004507644631e+00 1.9340288318240793e+00 4.9359999999999998e-01 1 0 0 0 0 -P 205 -211 -3.5718484953977997e-01 3.8710008422418218e-01 -1.7049727542491055e+00 1.7899271967258628e+00 1.3957000000000000e-01 1 0 0 0 0 -V -57 0 0 0 0 0 0 3 0 -P 206 111 -2.9554292158215627e-02 6.8699727020969506e-02 -6.7667418059625295e-01 6.9404658039885136e-01 1.3497999999999999e-01 2 0 0 -100 0 -P 207 111 -8.3861532678087297e-02 5.2894938783996322e-02 -8.9880718379003643e-01 9.1427817716746196e-01 1.3497999999999999e-01 2 0 0 -101 0 -P 208 111 -5.1537379352633073e-01 2.7614663553016722e-01 -3.0842146687927694e+00 3.1420481910634095e+00 1.3497999999999999e-01 2 0 0 -102 0 -V -58 0 0 0 0 0 0 2 0 -P 209 211 -2.8787457288157677e-02 2.4879370258541306e-01 -1.6687893171284660e+01 1.6690356056874656e+01 1.3957000000000000e-01 1 0 0 0 0 -P 210 111 -1.2348533400834598e-01 4.7926836171116444e-01 -4.7033438020998224e+00 4.7312376088506980e+00 1.3497999999999999e-01 2 0 0 -103 0 -V -59 0 0 0 0 0 0 2 0 -P 211 -211 3.0913726888285875e-01 -2.4912078764392806e-01 -2.5465295938249941e+00 2.5810695021589738e+00 1.3957000000000000e-01 1 0 0 0 0 -P 212 211 -7.0472479986327845e-03 -1.4536363234069261e-01 -8.3527033319280903e+00 8.3551369220027905e+00 1.3957000000000000e-01 1 0 0 0 0 -V -60 0 -2.5008859253652064e-05 1.2616002773522305e-05 -8.8040707736340902e-04 8.8086246251737634e-04 0 2 0 -P 213 22 -3.0216804572784750e-01 1.8884543693933467e-01 -1.3003859249159436e+01 1.3008740273326284e+01 0 1 0 0 0 0 -P 214 22 -5.0594597322126056e-01 2.1881684789260519e-01 -1.5444831448137609e+01 1.5454665334523453e+01 0 1 0 0 0 0 -V -61 0 0 0 0 0 0 2 0 -P 215 -211 -2.2421009461650029e-01 -6.5249877864224176e-02 -5.1189059483439948e+01 5.1189782362275601e+01 1.3957000000000000e-01 1 0 0 0 0 -P 216 111 3.4510819533982345e-01 -4.5554062643907289e-01 -6.8210690910088516e+01 6.8213218594058873e+01 1.3497999999999999e-01 2 0 0 -104 0 -V -62 0 0 0 0 0 0 3 0 -P 217 211 3.1996614273406238e-01 2.2698112849886470e-01 -2.1384580773417935e+02 2.1384621311595322e+02 1.3957000000000000e-01 1 0 0 0 0 -P 218 -211 2.0155403003524568e-02 1.0084712989668214e-01 -1.6553192481345258e+02 1.6553201560005030e+02 1.3957000000000000e-01 1 0 0 0 0 -P 219 111 2.0102218594058774e-01 -5.6970762719395704e-02 -4.9236656213007620e+01 4.9237284553733737e+01 1.3497999999999999e-01 2 0 0 -105 0 -V -63 0 0 0 0 0 0 2 0 -P 220 211 -1.1965928167053523e-02 -1.7609060069797053e-01 -1.5658354689143539e+03 1.5658354850817191e+03 1.3957000000000000e-01 1 0 0 0 0 -P 221 111 -1.4891641871379296e-01 2.3853893762025774e-01 -3.3949548407814893e+02 3.3949562737387589e+02 1.3497999999999999e-01 2 0 0 -106 0 -V -64 0 1.7224079361358685e-05 3.9993368161236640e-06 1.2236866927998514e-04 1.2388004054236708e-04 0 2 0 -P 222 22 3.4213945668553833e-02 6.0764556174071421e-02 3.9702505912805364e-01 4.0310274489375181e-01 0 1 0 0 0 0 -P 223 22 2.6716427064635639e-01 9.2138136881784183e-03 1.7441199336875117e+00 1.7644874567303706e+00 0 1 0 0 0 0 -V -65 0 0 0 0 0 0 1 0 -P 224 130 -3.0824762001330436e-01 -1.4402182869475991e-01 3.9741975944594941e+02 3.9742021668806376e+02 4.9767000000000000e-01 1 0 0 0 0 -V -66 0 0 0 0 0 0 2 0 -P 225 130 -5.6718967892915073e-01 -1.1431034690863549e+00 5.6205241242334318e+02 5.6205408136228459e+02 4.9767000000000000e-01 1 0 0 0 0 -P 226 310 -3.5147060289058818e-01 -9.1662062570886449e-01 4.3080173018224508e+02 4.3080313616360888e+02 4.9767000000000000e-01 2 0 0 -107 0 -V -67 0 0 0 0 0 0 2 0 -P 227 -311 -2.4546654743398341e-01 -2.3146159829648183e-01 2.8342132256983007e+02 2.8342196031881150e+02 4.9767000000000000e-01 2 0 0 -108 0 -P 228 -211 1.0559389890479413e-02 3.1455748153945978e-01 2.1230192600598207e+02 2.1230220517824185e+02 1.3957000000000000e-01 1 0 0 0 0 -V -68 0 4.8796540959387777e-05 -2.6727885893172615e-05 7.5462096233572576e-04 7.5683320195057979e-04 0 2 0 -P 229 22 2.6685060975905711e-01 -1.4011960385428618e-01 4.8753534441163167e+00 4.8846610892025959e+00 0 1 0 0 0 0 -P 230 22 1.5121375552434085e-01 -8.8871558871697537e-02 1.5898616601878772e+00 1.5995073780296898e+00 0 1 0 0 0 0 -V -69 0 -1.2542959339478501e+00 6.6738331238764326e-01 3.4569932764836054e+01 3.4699881135292600e+01 0 2 0 -P 231 2112 -4.8062679974778633e-01 3.6572879428995364e-01 1.4593581181314528e+01 1.4636261925509741e+01 9.3957000000000002e-01 1 0 0 0 0 -P 232 211 -8.3921271769354780e-02 -6.5345167289508649e-02 9.6605538183553463e-01 9.8186330841766378e-01 1.3957000000000000e-01 1 0 0 0 0 -V -70 0 0 0 0 0 0 2 0 -P 233 -3122 -6.4332980426235087e-02 1.6435334128651716e-01 1.4602391787438231e+01 1.4646014424730232e+01 1.1156800000000000e+00 2 0 0 -109 0 -P 234 22 -6.0263618086868719e-02 -2.1865550854848093e-02 4.2463179579810417e-01 4.2944378908284236e-01 0 1 0 0 0 0 -V -71 0 0 0 0 0 0 2 0 -P 235 -211 1.2164753959102612e-01 -4.5521551591701886e-01 7.1835598725210605e+00 7.2003494024120069e+00 1.3957000000000000e-01 1 0 0 0 0 -P 236 111 2.5490886059890411e-01 7.2339769121301689e-02 1.1751666788979339e+01 1.1755428681635065e+01 1.3497999999999999e-01 2 0 0 -110 0 -V -72 0 0 0 0 0 0 2 0 -P 237 -211 1.1930293579631301e-01 2.0049976557463289e-01 2.3525837282285753e+00 2.3682405557102864e+00 1.3957000000000000e-01 1 0 0 0 0 -P 238 211 2.7023525158656675e-01 -1.9690143473533661e-01 5.6736419410684646e-01 6.7318584347518806e-01 1.3957000000000000e-01 1 0 0 0 0 -V -73 0 -1.4041331718659690e-06 9.5122516778726869e-05 1.3344830860466966e-04 1.6521502703569109e-04 0 2 0 -P 239 22 -3.4840433826297368e-02 2.3835644419272761e-01 4.3776599393873217e-01 4.9966660461408824e-01 0 1 0 0 0 0 -P 240 22 2.5776988954046759e-02 3.7564349841102102e-01 4.2362052734556249e-01 5.6676877317521679e-01 0 1 0 0 0 0 -V -74 0 0 0 0 0 0 2 0 -P 241 -211 -4.8632585458811266e-02 5.7613097737265306e-01 -1.6428978489932830e-01 6.1705992397744047e-01 1.3957000000000000e-01 1 0 0 0 0 -P 242 111 2.5989684114912343e-01 1.5049630889423141e-01 3.4060456346050649e-01 4.7373682153723579e-01 1.3497999999999999e-01 2 0 0 -111 0 -V -75 0 0 0 0 0 0 2 0 -P 243 22 -8.2029197985667976e-02 -1.7893268748394126e-01 4.5302511305727694e-01 4.9394073433252722e-01 0 1 0 0 0 0 -P 244 22 1.7368549233198097e-01 1.0668255504719676e-01 -3.2194728432922044e-02 2.0635968195573082e-01 0 1 0 0 0 0 -V -76 0 0 0 0 0 0 2 0 -P 245 321 3.1196765661891573e-01 5.2753774638899031e-01 3.0966105128831014e+00 3.1950363880775470e+00 4.9359999999999998e-01 1 0 0 0 0 -P 246 111 1.1971265141411374e-02 7.1476378845153385e-02 1.0826442031294552e-01 1.8759789185276041e-01 1.3497999999999999e-01 2 0 0 -112 0 -V -77 0 0 0 0 0 0 2 0 -P 247 -321 3.7146363264552096e-01 2.5233125086536835e-02 1.5308117489269486e+00 1.6509535158909296e+00 4.9359999999999998e-01 1 0 0 0 0 -P 248 111 4.5901243856616902e-01 3.3522470827209677e-01 2.7867613575488490e+00 2.8473367359906829e+00 1.3497999999999999e-01 2 0 0 -113 0 -V -78 0 0 0 0 0 0 1 0 -P 249 130 -8.8835934438628372e-01 6.8074086066904238e-01 -5.6890766581735761e+01 5.6903950549417793e+01 4.9767000000000000e-01 1 0 0 0 0 -V -79 0 -4.4817862219771405e-06 3.0023353222897988e-06 -1.2846199085357989e-04 1.2858002379972176e-04 0 2 0 -P 250 22 -4.3665145174182041e-01 3.4929125535303568e-01 -1.3346660737281969e+01 1.3358368976318870e+01 0 1 0 0 0 0 -P 251 22 -1.0682997537163530e-01 1.4785343756005780e-02 -2.2312143912955911e+00 2.2338193548164194e+00 0 1 0 0 0 0 -V -80 0 1.1498498947914117e-05 -1.6837102901323914e-05 -3.5968316635069550e-04 3.6069740049514610e-04 0 2 0 -P 252 22 2.1038819336212194e-02 -3.0885983525310211e-02 -1.3571303869921980e-01 1.4076435902018464e-01 0 1 0 0 0 0 -P 253 22 6.6419842695921730e-02 -9.7178601158091210e-02 -2.6000708777066524e+00 2.6027339174654478e+00 0 1 0 0 0 0 -V -81 0 1.4686859594192499e-04 -2.0097206713904554e-04 -1.7779381811276310e-02 1.7781226190380851e-02 0 2 0 -P 254 22 1.3160148159474916e-01 -1.7607773501339169e-01 -1.1351519572335821e+01 1.1353647824371190e+01 0 1 0 0 0 0 -P 255 22 1.9756790216339634e-01 -2.7435110628171355e-01 -2.8496537235756634e+01 2.8498542700186409e+01 0 1 0 0 0 0 -V -82 0 5.4468947599719818e-06 1.0627040465845464e-05 -8.8638815061755207e-04 8.8650436585870627e-04 0 2 0 -P 256 22 7.4170914151783521e-02 1.1931245135626149e-01 -1.3390197719027501e+01 1.3390934685084687e+01 0 1 0 0 0 0 -P 257 22 1.8140566479408472e-02 6.0789768965475235e-02 -1.6319031665550834e+00 1.6331357632406374e+00 0 1 0 0 0 0 -V -83 0 1.1901070929278200e-05 1.0331918358570022e-05 -4.8683925535694022e-04 4.8720611336069926e-04 0 2 0 -P 258 22 5.7800358510051483e-02 1.0610466901086330e-01 -4.7377783347524538e+00 4.7393187940335411e+00 0 1 0 0 0 0 -P 259 22 9.6099152341945396e-02 2.7503238293923368e-02 -1.5578167178456963e+00 1.5610203078746385e+00 0 1 0 0 0 0 -V -84 0 1.9717825146052879e-05 -1.0024675780293960e-05 -2.6694203919439990e-03 2.6699382446536131e-03 0 2 0 -P 260 22 -3.1659375525207083e-02 2.9139435087521169e-02 -1.8076191689495109e+00 1.8081312127966784e+00 0 1 0 0 0 0 -P 261 22 8.7451068289363970e-02 -5.7504309359996640e-02 -5.7455202499548106e+00 5.7464734731468763e+00 0 1 0 0 0 0 -V -85 0 -1.1098678875795688e-05 7.9712988635923251e-06 -2.7960215080273293e-04 3.0407909509766429e-04 0 2 0 -P 262 22 -1.2404392105220950e-02 1.3072052856764920e-02 -3.3120578315562949e-01 3.3169567121854948e-01 0 1 0 0 0 0 -P 263 22 -2.1187813471082882e-04 -4.0107887412976712e-03 1.3371891962832829e-02 1.3962049037908679e-02 0 1 0 0 0 0 -V -86 0 4.3701901577387691e-05 -2.7778932303276074e-05 -3.6980602490661738e-04 3.7391937739307860e-04 0 2 0 -P 264 22 6.2980374428364197e-02 -1.0968065014364305e-01 -7.0367021794103213e-01 7.1494625545998147e-01 0 1 0 0 0 0 -P 265 22 2.4055413927146813e-01 -8.3259803324823314e-02 -1.8648425442445429e+00 1.8821360746754701e+00 0 1 0 0 0 0 -V -87 0 4.8701731099785062e-07 3.6608978379173926e-06 -1.2112849635753707e-05 1.2908375431671910e-05 0 2 0 -P 266 22 -2.7090617015867346e-02 1.4244131973944305e-01 -5.4202119215789846e-01 5.6107967691557348e-01 0 1 0 0 0 0 -P 267 22 5.3352751664943285e-02 5.4970537672586084e-02 -1.1115741347810988e-01 1.3499720994664230e-01 0 1 0 0 0 0 -V -88 0 5.7146814384201549e-06 2.4354026327390962e-05 1.9717191825030330e-04 1.9902137772319508e-04 0 2 0 -P 268 22 -2.7936966043945702e-02 1.5190345905548287e-02 3.2316443733638378e-01 3.2472522883110322e-01 0 1 0 0 0 0 -P 269 22 1.0251930686823132e-01 3.0265419391104781e-01 2.2501274191538188e+00 2.2727039340399169e+00 0 1 0 0 0 0 -V -89 0 0 0 0 0 0 1 0 -P 270 310 6.3629118454362399e-01 2.6066327066419842e-01 7.2899009219783402e+00 7.3391513605703720e+00 4.9767000000000000e-01 2 0 0 -114 0 -V -90 0 7.9367802508350484e-06 5.5245739059513326e-05 1.0292227500665664e-02 1.0292402314119905e-02 0 2 0 -P 271 22 7.8535141648213305e-02 9.9560856692336122e-02 2.1477224930174994e+01 2.1477599280040344e+01 0 1 0 0 0 0 -P 272 22 -2.9808474054989965e-02 2.3961204189102020e-01 4.1710356478041902e+01 4.1711055369063452e+01 0 1 0 0 0 0 -V -91 0 5.5297266074583105e-05 -1.0925677018674232e-04 1.2724502710143248e-02 1.2725651055903247e-02 0 2 0 -P 273 22 6.8440360627038010e-02 -7.5865663977273692e-02 4.4101211349196099e+00 4.4113045810279425e+00 0 1 0 0 0 0 -P 274 22 -5.8713569331480097e-03 -4.7758662190614712e-02 9.9876875379365302e+00 9.9878034481110625e+00 0 1 0 0 0 0 -V -92 0 8.1925385454488015e-05 -3.6875384522501292e-05 2.3250063164562518e-01 2.3250065045013255e-01 0 2 0 -P 275 22 1.6711452594100847e-02 1.6870653625057283e-02 3.6019552965433256e+01 3.6019560793008758e+01 0 1 0 0 0 0 -P 276 22 4.0969453328655292e-01 -2.0879998791888793e-01 1.1741018337664309e+03 1.1741019238127251e+03 0 1 0 0 0 0 -V -93 0 2.5961841133729550e-05 3.0674258044667582e-05 6.5765265966504665e-04 6.5893258982709882e-04 0 2 0 -P 277 22 1.3018449916600637e-02 3.4011182350692962e-02 2.7215110360084871e-01 2.7457688131793440e-01 0 1 0 0 0 0 -P 278 22 4.0520254140559964e-01 4.6012244020071186e-01 1.0322018464498882e+01 1.0340211165203236e+01 0 1 0 0 0 0 -V -94 0 3.8901737926929142e-05 2.7765787009590177e-05 1.3322338436249194e-04 1.4665811226059863e-04 0 2 0 -P 279 22 8.0063088182418432e-02 3.1238773946188861e-02 7.9613488602169380e-02 1.1715061525393101e-01 0 1 0 0 0 0 -P 280 22 5.6620908615590333e-02 6.6318274786224957e-02 3.8847625782063722e-01 3.9814299410312703e-01 0 1 0 0 0 0 -V -95 0 -2.0261701110488303e-04 -4.8018556141857103e-04 2.2688593345382702e-03 2.3305607184803791e-03 0 2 0 -P 281 22 -1.5904416100449204e-01 -5.0608925283349793e-01 2.3153084317170132e+00 2.3753051406004837e+00 0 1 0 0 0 0 -P 282 22 -8.8983864789347528e-02 -8.1716658249179147e-02 4.6205314557993754e-01 4.7758648407233734e-01 0 1 0 0 0 0 -V -96 0 5.8495528174864427e-06 -4.1082222803042357e-05 9.9224658184738723e-05 1.0820598546116414e-04 0 2 0 -P 283 22 9.1972477577124914e-02 -4.4592456889574522e-01 1.0769225359730650e+00 1.1692176043248705e+00 0 1 0 0 0 0 -P 284 22 -2.5486999986110755e-02 -2.1012184866980223e-02 5.0855773592181873e-02 6.0641642365914170e-02 0 1 0 0 0 0 -V -97 0 -4.3582543869767395e-05 7.8614637762069199e-06 1.0692921289149186e-04 1.1681873643143345e-04 0 2 0 -P 285 22 -1.8371320086265014e-01 7.4984574553145597e-02 5.9982550796311540e-01 6.3179416473668593e-01 0 1 0 0 0 0 -P 286 22 -1.8722012261886847e-01 -8.0752428112496038e-03 3.1025464783563805e-01 3.6245624613668997e-01 0 1 0 0 0 0 -V -98 0 -3.1549862434167774e-05 1.4291309528277945e-05 1.0486479030424113e-05 3.9779846943029794e-05 0 2 0 -P 287 22 -4.5641294538943424e-02 8.0409127662733962e-02 -2.3546345316033672e-03 9.2489458223355650e-02 0 1 0 0 0 0 -P 288 22 -2.1217902662870536e-01 3.6377118875589240e-02 8.8048427878029925e-02 2.3258495172858076e-01 0 1 0 0 0 0 -V -99 0 -2.0055761571577863e-04 2.0912498751302585e-04 -8.3309224193529549e-04 8.8283389170218331e-04 0 2 0 -P 289 22 -1.9843402797534637e-01 2.8458700251599517e-01 -8.9233754423776901e-01 9.5740906529855474e-01 0 1 0 0 0 0 -P 290 22 -5.2601345084628082e-01 4.7080724876546715e-01 -2.1169302521603504e+00 2.2315338465891585e+00 0 1 0 0 0 0 -V -100 0 -7.0205171904481768e-06 1.6319376283750368e-05 -1.6074154954470244e-04 1.6486830144931802e-04 0 2 0 -P 291 22 -4.8089177585023853e-02 1.0362587097307130e-01 -4.7632411591871276e-01 4.8983216874912877e-01 0 1 0 0 0 0 -P 292 22 1.8534885426808229e-02 -3.4926143952101800e-02 -2.0035006467754016e-01 2.0421441164972265e-01 0 1 0 0 0 0 -V -101 0 -2.9445537543939600e-06 1.8572518962028519e-06 -3.1558999495805265e-05 3.2102218420846526e-05 0 2 0 -P 293 22 3.5666402381186346e-02 2.3073588652214965e-02 -2.9391385055853259e-01 2.9696773276275618e-01 0 1 0 0 0 0 -P 294 22 -1.1952793505927364e-01 2.9821350131781360e-02 -6.0489333323150396e-01 6.1731044440470606e-01 0 1 0 0 0 0 -V -102 0 -8.7759702361641637e-05 4.7023241861943939e-05 -5.2519116174042308e-04 5.3503926182768037e-04 0 2 0 -P 295 22 -2.1472465776296304e-01 4.2117950914751449e-02 -1.0811445000066504e+00 1.1030657416198317e+00 0 1 0 0 0 0 -P 296 22 -3.0064913576336771e-01 2.3402868461541579e-01 -2.0030701687861194e+00 2.0389824494435782e+00 0 1 0 0 0 0 -V -103 0 -4.0051840698321302e-05 1.5544825812030132e-04 -1.5255056661093622e-03 1.5345528806099953e-03 0 2 0 -P 297 22 -5.4313704046613225e-02 4.0017399337820786e-01 -3.9524382331551000e+00 3.9730161326540991e+00 0 1 0 0 0 0 -P 298 22 -6.9171629961732761e-02 7.9094368332956660e-02 -7.5090556894472305e-01 7.5822147619659941e-01 0 1 0 0 0 0 -V -104 0 1.1538667519395299e-04 -1.5230967855984055e-04 -2.2806195109471177e-02 2.2807040238776183e-02 0 2 0 -P 299 22 4.9612560842926725e-03 -4.1366033271512226e-02 -2.5491239845056692e+00 2.5494644243747766e+00 0 1 0 0 0 0 -P 300 22 3.4014693925553080e-01 -4.1417459316756067e-01 -6.5661566925582846e+01 6.5663754169684097e+01 0 1 0 0 0 0 -V -105 0 7.5620785956994322e-05 -2.1431335219304692e-05 -1.8521909028600417e-02 1.8522145398627614e-02 0 2 0 -P 301 22 -1.0974672239015704e-03 -4.5233445978568466e-02 -1.0867124610184147e+01 1.0867218805303377e+01 0 1 0 0 0 0 -P 302 22 2.0211965316448932e-01 -1.1737316740827236e-02 -3.8369531602823471e+01 3.8370065748430363e+01 0 1 0 0 0 0 -V -106 0 -6.2050380654414509e-06 9.9394224008864708e-06 -1.4146072138620869e-02 1.4146078109456379e-02 0 2 0 -P 303 22 -9.4033662273491525e-02 4.0317931435716235e-02 -8.8853780567535210e+01 8.8853839472523276e+01 0 1 0 0 0 0 -P 304 22 -5.4882756440301453e-02 1.9822100618454153e-01 -2.5064170351061375e+02 2.5064178790135270e+02 0 1 0 0 0 0 -V -107 0 -2.2144550003270545e+01 -5.7752059811266328e+01 2.7142840331616411e+04 2.7142928916050954e+04 0 2 0 -P 305 211 -2.3773313121780820e-01 -8.7164593426833892e-01 3.6426137340252683e+02 3.6426252060369370e+02 1.3957000000000000e-01 1 0 0 0 0 -P 306 -211 -1.1373747167277996e-01 -4.4974691440525599e-02 6.6540356779718223e+01 6.6540615559915182e+01 1.3957000000000000e-01 1 0 0 0 0 -V -108 0 0 0 0 0 0 1 0 -P 307 310 -2.4546654743398341e-01 -2.3146159829648183e-01 2.8342132256983007e+02 2.8342196031881150e+02 4.9767000000000000e-01 2 0 0 -115 0 -V -109 0 -5.6270946127520340e-03 1.4375702714435555e-02 1.2772459726874328e+00 1.2810615693794176e+00 0 2 0 -P 308 -2212 4.0919391927145221e-02 1.1725248601390804e-01 1.2564638925178782e+01 1.2600235095232547e+01 9.3827000000000005e-01 1 0 0 0 0 -P 309 211 -1.0525237235338031e-01 4.7100855272609099e-02 2.0377528622594481e+00 2.0457793294976856e+00 1.3957000000000000e-01 1 0 0 0 0 -V -110 0 1.1450288377146512e-04 3.2494406652989600e-05 5.2787483859840093e-03 5.2804381960459557e-03 0 2 0 -P 310 22 -6.3766087007953286e-03 3.0788902609582693e-02 9.4162923456893888e-01 9.4215403892214522e-01 0 1 0 0 0 0 -P 311 22 2.6128546929969942e-01 4.1550866511718992e-02 1.0810037554410400e+01 1.0813274642712919e+01 0 1 0 0 0 0 -V -111 0 5.7894541595921829e-05 3.3524512174853601e-05 7.5872969366759844e-05 1.0552947084212687e-04 0 2 0 -P 312 22 1.8493418015052648e-01 6.9153434526408500e-02 1.3164339122203578e-01 2.3730324681129761e-01 0 1 0 0 0 0 -P 313 22 7.4962660998596956e-02 8.1342874367822907e-02 2.0896117223847074e-01 2.3643357472593826e-01 0 1 0 0 0 0 -V -112 0 6.9261092346014606e-07 4.1353457778057710e-06 6.2637590300657296e-06 1.0853685686557134e-05 0 2 0 -P 314 22 5.9945933835984077e-03 7.3910957463011503e-02 1.3827374467382689e-01 1.5690249599371084e-01 0 1 0 0 0 0 -P 315 22 5.9766717578129680e-03 -2.4345786178581225e-03 -3.0009324360881350e-02 3.0695395859049578e-02 0 1 0 0 0 0 -V -113 0 5.8480414582225960e-05 4.2709256374829027e-05 3.5504693519910010e-04 3.6276453269127142e-04 0 2 0 -P 316 22 4.6099053514328703e-01 3.2869887519126678e-01 2.7819803904781000e+00 2.8390086504004146e+00 0 1 0 0 0 0 -P 317 22 -1.9780965771179549e-03 6.5258330808300215e-03 4.7809670707489029e-03 8.3280855902691311e-03 0 1 0 0 0 0 -V -114 0 3.0355799215239374e+00 1.2435567393166538e+00 3.4778223250929109e+01 3.5013184297298878e+01 0 2 0 -P 318 -211 2.5778681463971853e-01 3.2771288396927750e-01 3.8506537962191199e+00 3.8756759693449960e+00 1.3957000000000000e-01 1 0 0 0 0 -P 319 211 3.7850436990390546e-01 -6.7049613305079067e-02 3.4392471257592194e+00 3.4634753912253751e+00 1.3957000000000000e-01 1 0 0 0 0 -V -115 0 -3.3015133249945685e+00 -3.1131474287994143e+00 3.8120032356080346e+03 3.8120118133013384e+03 0 2 0 -P 320 211 -2.0869993064495407e-01 7.4933172581466437e-02 1.1763461578134871e+02 1.1763490757616057e+02 1.3957000000000000e-01 1 0 0 0 0 -P 321 -211 -3.6766616789029316e-02 -3.0639477087794825e-01 1.6578670678848133e+02 1.6578705274265090e+02 1.3957000000000000e-01 1 0 0 0 0 -BlockType GenEvent -E 10 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 136 0 0 -V -1 0 0 0 0 0 1 3 0 -P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -1 0 -P 16 2103 -4.3597932309017928e-02 -1.9178552605452839e-01 5.7710271643278456e+03 5.7710272192255625e+03 7.7132999999999996e-01 2 0 0 -9 0 -P 3 21 -6.5511378777462237e-01 -2.6708088178667958e-03 1.3902379475140679e+01 1.3917806446382523e+01 0 3 0 0 -3 0 -P 28 2 6.9871172008364035e-01 1.9445633487239519e-01 5.4217114364762290e+02 5.4217172917398170e+02 3.3000000000000002e-01 2 0 0 -13 0 -V -2 0 0 0 0 0 1 2 0 -P 2 2212 0 0 -6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0 -2 0 -P 4 2 1.5554951969939107e-01 -1.1414155502218004e+00 -2.5318090541773952e+02 2.5318352610953531e+02 0 3 0 0 -4 0 -P 31 2103 -1.5554951969939107e-01 1.1414155502218004e+00 -3.0079396582618142e+03 3.0079399777454469e+03 7.7132999999999996e-01 2 0 0 -13 0 -V -3 0 0 0 0 0 0 6 0 -P 5 -1 -2.6336683162149233e+00 1.2040498771434778e+00 7.5527386554890201e+00 8.0888692723150033e+00 0 3 0 0 -5 0 -P 11 1 1.1257705880566493e+00 -9.6356028506991842e-01 3.2813867683361453e+00 3.6155507136961815e+00 3.3000000000000002e-01 2 0 0 -9 0 -P 12 21 -9.6370912240519885e-02 2.1371062251800688e-01 2.0354592242001850e+00 2.0489152828471759e+00 0 2 0 0 -9 0 -P 13 21 9.5280060735029493e-01 -3.6665346932772618e-02 2.4849955628758677e-02 9.5382957876527541e-01 0 2 0 0 -9 0 -P 14 21 1.8560548483485220e-02 -1.7257190047342610e-01 -1.8018846212308559e-01 2.5018680355946143e-01 0 2 0 0 -9 0 -P 15 21 7.9695242284356750e-05 -2.5824124117734876e-01 -4.6415843771256871e-01 5.3116061628844602e-01 0 2 0 0 -9 0 -V -4 0 0 0 0 0 0 2 0 -P 6 2 1.2812912648480181e+00 -6.4858594580034412e-01 -2.4187105165040478e+02 2.4187531498172203e+02 0 3 0 0 -5 0 -P 30 21 -1.1480277436005311e+00 -4.8222213924733737e-01 -9.6575619960129195e+00 9.7375053067246053e+00 0 2 0 0 -13 0 -V -5 0 0 0 0 0 0 2 0 -P 7 24 -2.7038131088254236e+00 4.3210603841580824e+00 -1.9039627432725470e+02 2.0586031167139001e+02 7.8113663821200973e+01 3 0 0 -6 0 -P 8 22 1.3514360574585182e+00 -3.7655964528149486e+00 -4.3922038667661063e+01 4.4103872582647035e+01 0 3 0 0 -7 0 -V -6 0 0 0 0 0 0 1 0 -P 9 24 -2.7038131088254236e+00 4.3210603841580824e+00 -1.9039627432725470e+02 2.0586031167139001e+02 7.8113663821200973e+01 2 0 0 -8 0 -V -7 0 0 0 0 0 0 1 0 -P 10 22 1.3514360574585182e+00 -3.7655964528149486e+00 -4.3922038667661063e+01 4.4103872582647043e+01 0 1 0 0 0 0 -V -8 0 0 0 0 0 0 11 0 -P 17 4 1.2527727551424732e+01 -2.0291998608611124e+00 -5.0600275742191691e+01 5.2189074669550124e+01 1.5000000000000000e+00 2 0 0 -11 0 -P 18 21 8.4413619755245706e-01 -5.9573077753593484e-01 -9.7003942899011300e+00 9.7552606556087653e+00 0 2 0 0 -11 0 -P 19 21 1.3955327171164982e+00 -1.7699729137026712e+00 -8.4370450330890154e+00 8.7329287510064866e+00 0 2 0 0 -11 0 -P 20 21 1.7406612186275408e+00 -4.8453470359648625e+00 -2.0800170594403422e+01 2.1427888046498008e+01 0 2 0 0 -11 0 -P 21 21 4.3275523129907159e+00 -8.8306149160675105e+00 -5.6722222314980336e+01 5.7568376502795338e+01 0 2 0 0 -11 0 -P 22 21 5.0727116372506353e-01 5.3006276683040177e-01 -4.1876929772878206e+00 4.2514777480721468e+00 0 2 0 0 -11 0 -P 23 21 -1.4242475998353649e-02 2.6112816047433607e-01 -9.0335618313322297e-01 9.4044838131622055e-01 0 2 0 0 -11 0 -P 24 21 -2.1919670271754521e+00 3.5035232013803053e+00 -4.8234484426313431e+00 6.3517752754294783e+00 0 2 0 0 -11 0 -P 25 21 -1.7594584975864209e+00 2.2946842674852479e+00 -5.0312742416153835e+00 5.8030156458961768e+00 0 2 0 0 -11 0 -P 26 21 -1.6358735708068866e+00 1.9697163809587677e+00 -2.8994328596137606e+00 3.8681488943020028e+00 0 2 0 0 -11 0 -P 27 -3 -1.8445152698695317e+01 1.3832811111161117e+01 -2.6290961648407542e+01 3.4971917100915213e+01 5.0000000000000000e-01 2 0 0 -11 0 -V -9 0 0 0 0 0 0 1 0 -P 39 92 1.9572425945831762e+00 -1.4091136771899875e+00 5.7757245133761753e+03 5.7784268622207192e+03 1.7668483585073082e+02 2 0 0 -10 0 -V -10 0 0 0 0 0 0 16 0 -P 40 -211 7.4997996932615019e-01 -6.4116142761545669e-01 1.9858860190347392e+00 2.2218868099320424e+00 1.3957000000000000e-01 1 0 0 0 0 -P 41 223 2.8112506374623569e-01 5.4000903387299448e-01 5.8416822415061209e-01 1.1500024027454310e+00 7.8141663284205498e-01 2 0 0 -19 0 -P 42 2214 4.4881519761355032e-01 -1.3187483483780489e+00 2.3761689627847922e+00 3.0194592377826033e+00 1.2371026072926299e+00 2 0 0 -20 0 -P 43 223 4.4098049591794489e-02 3.6975571581476430e-01 1.2240256589844973e+00 1.5000787933206947e+00 7.8315620725532742e-01 2 0 0 -21 0 -P 44 -3122 5.1854209512044214e-01 2.8340706828298096e-01 1.4726857248798244e+00 1.9397810643032543e+00 1.1156800000000000e+00 2 0 0 -22 0 -P 45 -313 2.7417269706128827e-01 4.4906334318631121e-02 2.5317079951813390e+00 2.6984767938152476e+00 8.9165261577505939e-01 2 0 0 -23 0 -P 46 -213 -4.0680312455968282e-01 -2.5441007810341781e-01 1.5500120461449101e+00 1.7845955709874386e+00 7.4298771107034045e-01 2 0 0 -24 0 -P 47 111 1.0967169427730127e-01 -4.8556656735419729e-01 1.5733209930176220e+00 1.6557056862038457e+00 1.3497999999999999e-01 2 0 0 -25 0 -P 48 211 -2.0496925059681456e-01 3.5773003283645954e-01 8.1445332873483611e+00 8.1561562898039721e+00 1.3957000000000000e-01 1 0 0 0 0 -P 49 -211 2.9397211730379580e-01 -2.7463569397919968e-01 7.6207890473349726e+00 7.6326764544974779e+00 1.3957000000000000e-01 1 0 0 0 0 -P 50 223 -2.5509337878352928e-01 2.6149346255806938e-01 1.3907466962922905e+02 1.3907740332277268e+02 7.9178978467983019e-01 2 0 0 -26 0 -P 51 213 -3.6699974497245429e-02 -1.8001381623673610e-01 1.8723285347838268e+02 1.8723606959241326e+02 1.0819347925577454e+00 2 0 0 -27 0 -P 52 311 -2.0826395264017022e-01 -3.8873428077532614e-02 7.7769704741499027e+02 7.7769723550906360e+02 4.9767000000000000e-01 2 0 0 -28 0 -P 53 -321 2.9365263740186642e-01 -1.5350918725169876e-01 9.7138769739024906e+02 9.7138787931445381e+02 4.9359999999999998e-01 1 0 0 0 0 -P 54 2212 7.1090572027448316e-03 3.1651971253956951e-01 1.4534367235662871e+03 1.4534370608997706e+03 9.3827000000000005e-01 1 0 0 0 0 -P 55 113 4.7933697015449042e-02 -2.3601649041716902e-01 2.2178322239381737e+03 2.2178323944788513e+03 8.3573909078354769e-01 2 0 0 -29 0 -V -11 0 0 0 0 0 0 1 0 -P 56 92 -2.7038131088254218e+00 4.3210603841580841e+00 -1.9039627432725467e+02 2.0586031167138998e+02 7.8113663821201015e+01 2 0 0 -12 0 -V -12 0 0 0 0 0 0 20 0 -P 57 423 9.9248375242903197e+00 -1.8312835036795285e+00 -4.1176681461967789e+01 4.2442925679844130e+01 2.0066999999999999e+00 2 0 0 -30 0 -P 58 213 3.1593705763741533e+00 -9.7376654979652177e-01 -1.3392766193005166e+01 1.3814953051794681e+01 7.4625584783485499e-01 2 0 0 -31 0 -P 59 113 9.3523891341231291e-01 -2.2812398079724634e+00 -1.3732909593833934e+01 1.3984515733375392e+01 9.4612234830851460e-01 2 0 0 -32 0 -P 60 -213 1.0751687044528315e+00 -1.8471396089324810e+00 -1.0247617174688440e+01 1.0494828426213823e+01 7.4823355897352140e-01 2 0 0 -33 0 -P 61 211 1.0910074909423624e+00 -1.6408161014628322e+00 -1.4658262289795276e+01 1.4790764279287474e+01 1.3957000000000000e-01 1 0 0 0 0 -P 62 2112 1.8670048695663655e+00 -2.5858616180543601e+00 -1.5263383116042007e+01 1.5621332959215980e+01 9.3957000000000002e-01 1 0 0 0 0 -P 63 111 3.8895094638623819e-02 -6.8899625648955701e-02 -4.4678720222461937e-01 4.7339031599011050e-01 1.3497999999999999e-01 2 0 0 -34 0 -P 64 -2214 1.1524734474439160e+00 -3.9869224263739502e+00 -2.0153218017127685e+01 2.0618217127901126e+01 1.3171695435320887e+00 2 0 0 -35 0 -P 65 221 8.6263433165107117e-01 -6.4053962327754621e-01 -6.5229053808755504e+00 6.6334323776976012e+00 5.4744999999999999e-01 2 0 0 -36 0 -P 66 211 2.7687726878260471e-01 -4.4854367382269267e-01 -5.0833022953049456e+00 5.1124646169579897e+00 1.3957000000000000e-01 1 0 0 0 0 -P 67 -211 3.6317039313948940e-01 -6.1629174309821100e-01 -4.9883909457620250e+00 5.0413522253185885e+00 1.3957000000000000e-01 1 0 0 0 0 -P 68 111 -3.8693244171548362e-03 -6.3946170356676169e-01 -1.8470751031459909e+00 1.9592938215238989e+00 1.3497999999999999e-01 2 0 0 -37 0 -P 69 321 3.3833666963563275e-01 5.4299664689447102e-01 -3.1762619017227935e+00 3.2774376712447890e+00 4.9359999999999998e-01 1 0 0 0 0 -P 70 -323 -1.3745959258300033e+00 1.5798806728773855e+00 -2.7160124589975716e+00 3.5482417244696087e+00 9.0981248507430379e-01 2 0 0 -38 0 -P 71 211 -1.0294428816501737e+00 9.5496503398017951e-01 -2.7208975408319782e+00 3.0650406319183578e+00 1.3957000000000000e-01 1 0 0 0 0 -P 72 -211 -3.6822566989713057e-01 1.1035290774262612e+00 -1.2321916930023735e+00 1.7003360614597640e+00 1.3957000000000000e-01 1 0 0 0 0 -P 73 213 -1.6161918040002012e+00 1.2552448784983889e+00 -1.7897181449593560e+00 2.7573168640824823e+00 4.6042328160403989e-01 2 0 0 -39 0 -P 74 2112 -3.2740868421481886e+00 2.8787612972034244e+00 -6.5131664185879137e+00 7.8937342137498883e+00 9.3957000000000002e-01 1 0 0 0 0 -P 75 -2112 -2.6281380275611408e+00 3.1441450497976531e+00 -4.6117236755707163e+00 6.2404763144169966e+00 9.3957000000000002e-01 1 0 0 0 0 -P 76 313 -1.3494277917651111e+01 1.0422303713166622e+01 -2.0123003719808548e+01 2.6390257574927315e+01 8.8908096104164602e-01 2 0 0 -40 0 -V -13 0 0 0 0 0 1 1 0 -P 29 21 1.5824732804086550e+00 3.3756291283162567e+00 -3.7328965916562061e+03 3.7328984533592948e+03 0 2 0 0 -13 0 -P 77 92 9.7760773719237326e-01 4.2292788741631151e+00 -6.2083226682664099e+03 7.2927476655854471e+03 3.8263401989466056e+03 2 0 0 -14 0 -V -14 0 0 0 0 0 0 30 0 -P 78 211 3.8125690076946724e-02 1.8129069100767256e-01 4.0322325983256000e+01 4.0322993097831421e+01 1.3957000000000000e-01 1 0 0 0 0 -P 79 -213 8.1415453961843220e-01 -1.3658531520860595e-01 1.8147547255500226e+02 1.8147807889488487e+02 5.1427342333104598e-01 2 0 0 -41 0 -P 80 213 -3.1343969057550247e-01 -6.8751614116676532e-02 2.3490909782090895e+02 2.3491051292454674e+02 7.4958136047652402e-01 2 0 0 -42 0 -P 81 -211 2.4510416203644247e-01 1.9103572210561356e-01 4.9160055436805315e+01 4.9161235755746112e+01 1.3957000000000000e-01 1 0 0 0 0 -P 82 2212 5.9834549250678958e-02 2.2658407019457144e-01 9.6037237171125334e+00 9.6522940455458546e+00 9.3827000000000005e-01 1 0 0 0 0 -P 83 331 -4.4228289654992226e-01 -2.6644076626223800e-01 1.5250029814397761e+01 1.5288792292206974e+01 9.5768239605797145e-01 2 0 0 -43 0 -P 84 -2212 4.0600120601960499e-01 1.1341309506958630e-01 5.8544874327854846e+00 5.9441629522554207e+00 9.3827000000000005e-01 1 0 0 0 0 -P 85 211 3.1262473932432039e-01 6.7353189834058402e-01 1.8631926232668552e+00 2.0105586243668481e+00 1.3957000000000000e-01 1 0 0 0 0 -P 86 -213 -4.0230691978361560e-01 -7.2916784443047689e-01 1.2727585532551626e+00 1.6552834098551243e+00 6.5307903733029116e-01 2 0 0 -44 0 -P 87 111 -1.0918019607099445e-01 9.2778953753129487e-02 8.7863240603013404e-01 9.0041254700272333e-01 1.3497999999999999e-01 2 0 0 -45 0 -P 88 211 -1.3970682706965667e-01 -6.9289838877254262e-02 1.0396580156519743e-01 2.3368301627760824e-01 1.3957000000000000e-01 1 0 0 0 0 -P 89 311 3.4248690127551151e-01 -3.5064896127775863e-01 6.5641413010847338e-01 9.5854416210028415e-01 4.9767000000000000e-01 2 0 0 -46 0 -P 90 -311 3.4345529704259643e-02 4.2425337653113343e-01 -1.1177846011983017e+00 1.2954877021742741e+00 4.9767000000000000e-01 2 0 0 -47 0 -P 91 221 -2.2059027947856552e-02 6.8777216446446396e-02 -2.5995327345599137e+00 2.6575343547665886e+00 5.4744999999999999e-01 2 0 0 -48 0 -P 107 -213 5.1568029838271176e-02 1.0489281204351286e+00 -2.8682166939055642e+03 2.8682169478887886e+03 5.9501970391005188e-01 2 0 0 -60 0 -P 92 -211 7.8520032410541465e-02 8.6029665973671565e-02 -1.7637091485257692e-01 2.5328439237984829e-01 1.3957000000000000e-01 1 0 0 0 0 -P 93 211 9.1990315018622704e-02 -2.4519229699912645e-01 -1.7635783993765985e+00 1.7883707770517441e+00 1.3957000000000000e-01 1 0 0 0 0 -P 94 113 2.3916994123891654e-02 3.2774863600096921e-01 -2.1964548095601693e+00 2.3336785531389950e+00 7.1669426391767155e-01 2 0 0 -49 0 -P 95 -211 -2.2116319795837658e-01 -7.0985668931981008e-02 -1.4721936080260471e+02 1.4721961019863397e+02 1.3957000000000000e-01 1 0 0 0 0 -P 96 213 5.5418235924584147e-01 1.7536325683372644e+00 -1.7140605218064102e+03 1.7140616606041549e+03 7.2221363743955924e-01 2 0 0 -50 0 -P 97 113 -6.1783849261428873e-02 1.4046889857876368e-01 -1.0047869804122965e+02 1.0048130714945734e+02 7.0765644735339350e-01 2 0 0 -51 0 -P 98 221 5.3919364001689940e-01 -4.4261608605164110e-01 -1.6979921711826634e+02 1.6980153260279991e+02 5.4744999999999999e-01 2 0 0 -52 0 -P 99 1114 -2.0186593100368855e-01 5.2273469161686792e-01 -6.6287974334912337e+02 6.6288096452226989e+02 1.1423580713372095e+00 2 0 0 -53 0 -P 100 223 5.4569932897003848e-01 4.9089417068522490e-01 -5.5137637879476370e+02 5.5137741731893857e+02 7.7876288546928918e-01 2 0 0 -54 0 -P 101 -2114 -3.7116038230162590e-01 4.2691750743684054e-01 -3.0183378648302647e+02 3.0183654713177589e+02 1.1603892295315890e+00 2 0 0 -55 0 -P 102 213 1.2718626065914557e-01 -4.3273443653089196e-02 -2.0958549985729146e+01 2.0973175423021143e+01 7.7150559601649060e-01 2 0 0 -56 0 -P 103 111 -4.7798486804409918e-01 9.0585383083558874e-02 -8.5228987495888582e+00 8.5378391845859252e+00 1.3497999999999999e-01 2 0 0 -57 0 -P 104 113 1.5181900039448251e-01 4.9030903333713738e-02 -9.3885028370079510e+01 9.3887609752929094e+01 6.7768726512342226e-01 2 0 0 -58 0 -P 105 -211 -2.9881524415693622e-01 -4.2409333153494246e-02 -1.6592385765903004e+00 1.6922297540891829e+00 1.3957000000000000e-01 1 0 0 0 0 -P 106 2224 -3.7739651006785435e-01 -2.1399552580528344e-01 -1.0092898709838120e+02 1.0093591655187358e+02 1.1002687175001074e+00 2 0 0 -59 0 -V -15 0 0 0 0 0 2 1 0 -P 32 21 1.9264630307413937e+00 -4.3605697082707904e+00 -3.8703467637965021e+00 6.1404732766727497e+00 0 2 0 0 -15 0 -P 33 21 -1.9264630307413937e+00 4.3605697082707904e+00 1.0934871286863569e+01 1.1928840599562703e+01 0 2 0 0 -15 0 -P 108 92 0 0 7.0645245230670666e+00 1.8069313876235451e+01 1.6631073243206497e+01 2 0 0 -16 0 -V -16 0 0 0 0 0 0 12 0 -P 109 221 -2.7330901053064516e-01 1.7937353255594365e-01 6.5560086158529540e-01 9.1454178233157846e-01 5.4744999999999999e-01 2 0 0 -61 0 -P 110 211 -3.8949504695687842e-01 6.3318573167586201e-01 2.8287487702745040e-01 8.0754476244672213e-01 1.3957000000000000e-01 1 0 0 0 0 -P 111 -3214 1.3070293253442316e-02 6.8191945199945314e-01 3.6368408201980333e+00 3.9512642278438408e+00 1.3858906433044105e+00 2 0 0 -62 0 -P 112 111 -5.1252162865341999e-01 2.2292822157692199e-01 -3.3826285438294201e-01 6.6709577338512560e-01 1.3497999999999999e-01 2 0 0 -63 0 -P 113 3312 -2.8307230829558164e-02 7.4361433324065440e-01 2.8196795987175673e+00 3.2015918392796796e+00 1.3212999999999999e+00 2 0 0 -64 0 -P 114 321 1.7310712184575286e-01 2.5372564212865023e-01 -3.7818935156200967e-02 5.8259248962174692e-01 4.9359999999999998e-01 1 0 0 0 0 -P 115 -211 -1.7176330612558119e-01 2.3528839325019374e-01 6.2378220828836273e-01 7.0245803405367480e-01 1.3957000000000000e-01 1 0 0 0 0 -P 116 -2114 -2.3785732100599724e-01 -4.3066782908091966e-01 9.2976032860807897e-02 1.3554702372103349e+00 1.2596047543237858e+00 2 0 0 -65 0 -P 117 2214 6.0515337633293520e-01 -9.5121595517125890e-01 -9.1396794922064373e-01 1.8612896641441454e+00 1.1653494752166464e+00 2 0 0 -66 0 -P 118 221 1.5610406892865505e-01 -4.1180279740384002e-01 2.4550193443675206e-01 7.4425985152895202e-01 5.4744999999999999e-01 2 0 0 -67 0 -P 119 223 -1.6654532327853938e-01 2.6409934496084531e-01 9.2003618590961966e-01 1.2501855628480039e+00 7.8677287030995102e-01 2 0 0 -68 0 -P 120 -213 8.3236400701983415e-01 -1.4204480697325057e+00 -9.2271825719703426e-01 2.0310196515416505e+00 7.5041940526262951e-01 2 0 0 -69 0 -V -17 0 0 0 0 0 5 1 0 -P 34 21 -1.2874686984272923e+00 -4.5354152466705555e+00 2.9174823306294378e+01 2.9553305772157866e+01 0 2 0 0 -17 0 -P 35 21 -1.5824732804086550e+00 -3.3756291283162567e+00 1.8613755585412271e+01 1.8983439906629435e+01 0 2 0 0 -17 0 -P 36 21 1.2874686984272923e+00 4.5354152466705555e+00 7.6246561156214881e+01 7.6392183207822896e+01 0 2 0 0 -17 0 -P 37 21 -2.4549304752250420e+00 1.9106102320850373e+00 1.4255136986869084e+02 1.4258530838251687e+02 0 2 0 0 -17 0 -P 38 21 2.4549304752250420e+00 -1.9106102320850373e+00 3.9326543344547179e+02 3.9327773679443379e+02 0 2 0 0 -17 0 -P 121 92 -1.5824732804086552e+00 -3.3756291283162563e+00 6.5985194336208417e+02 6.6079197406356082e+02 3.5036363030476608e+01 2 0 0 -18 0 -V -18 0 0 0 0 0 0 21 0 -P 122 -213 2.4470237977472631e-01 9.0661371500187479e-02 1.0957930773391942e+01 1.0984198835469098e+01 7.1293652152266018e-01 2 0 0 -70 0 -P 123 211 1.4542095804863758e-01 8.3928851259360959e-01 1.4793046030567339e+01 1.4818206474124844e+01 1.3957000000000000e-01 1 0 0 0 0 -P 124 -211 1.6346163015651471e-01 6.7768762034861363e-01 3.6385442177273340e+01 3.6392387424238997e+01 1.3957000000000000e-01 1 0 0 0 0 -P 125 111 -3.2068447332136946e-01 3.8594024532024324e-01 2.9733721957725852e+00 3.0184350613158366e+00 1.3497999999999999e-01 2 0 0 -71 0 -P 126 321 3.3497849686451375e-01 1.2223626454055394e+00 2.9996662117980971e+01 3.0027483414541404e+01 4.9359999999999998e-01 1 0 0 0 0 -P 127 221 -5.8214749389140619e-01 5.7231243477632643e-01 4.5061968638670571e+01 4.5072687476149831e+01 5.4744999999999999e-01 2 0 0 -72 0 -P 128 -313 -9.2056140784737284e-02 1.1853320044069728e+00 4.0445501109361459e+01 4.0472952620159873e+01 8.9880337817518030e-01 2 0 0 -73 0 -P 129 -211 -6.8690343434950507e-02 -2.4724652780047213e-01 1.0978301805670297e+01 1.0982187374565884e+01 1.3957000000000000e-01 1 0 0 0 0 -P 130 3222 -5.6571475378204539e-01 -1.8495675331422309e-02 7.6655798754955228e+01 7.6667114586566711e+01 1.1893700000000000e+00 2 0 0 -74 0 -P 131 -3222 8.9269875728812620e-01 -2.0156941201723866e-01 1.7491908481387679e+02 1.7492552236429151e+02 1.1893700000000000e+00 2 0 0 -75 0 -P 132 111 5.4105896816734045e-01 -3.9755607846732188e-01 3.4247692832522112e+01 3.4254539547244640e+01 1.3497999999999999e-01 2 0 0 -76 0 -P 133 221 4.7159087264181826e-01 1.2020772703630062e-01 4.8034580061584379e+01 4.8040164769118533e+01 5.4744999999999999e-01 2 0 0 -77 0 -P 134 223 -3.9429121872598855e-01 -3.4625309703953722e-01 2.6395512218946230e+01 2.6411912261172318e+01 7.6856178603350211e-01 2 0 0 -78 0 -P 135 213 3.9795313085803385e-01 -6.1677401758222283e-01 3.1845668885775709e+01 3.1863855985015093e+01 7.8734653628175211e-01 2 0 0 -79 0 -P 136 313 1.0265114771882194e-01 -2.2622249924026197e-01 2.3452325229467018e+01 2.3473299881761864e+01 9.6048674802712919e-01 2 0 0 -80 0 -P 137 -313 -5.5700154512051092e-01 -1.6396713032419616e+00 1.3646660379336359e+01 1.3785980020161174e+01 9.0726672119751850e-01 2 0 0 -81 0 -P 138 111 -5.4077088808668135e-02 -2.3831882224430384e-01 3.8434254226100957e+00 3.8535514492654079e+00 1.3497999999999999e-01 2 0 0 -82 0 -P 139 -213 -5.8266223094836611e-01 -1.4614386039001783e+00 9.6551877108618420e+00 9.8199075697669720e+00 8.5594209993767068e-01 2 0 0 -83 0 -P 140 111 -7.2162541386152523e-01 -9.6677069323893028e-01 7.6826305172722131e+00 7.7779444634529762e+00 1.3497999999999999e-01 2 0 0 -84 0 -P 141 323 -9.0562613680950854e-01 -1.6754637359482516e+00 1.0954221378986349e+01 1.1149779322154751e+01 8.3383180723566952e-01 2 0 0 -85 0 -P 142 -313 -3.2412782438111951e-02 -4.3364122365194685e-01 6.9269303072013768e+00 6.9998631630231944e+00 9.0918948570052072e-01 2 0 0 -86 0 -V -19 0 0 0 0 0 0 3 0 -P 143 211 8.5723244854931269e-02 6.0053586839736363e-02 3.4776255196298755e-01 3.8906745616741811e-01 1.3957000000000000e-01 1 0 0 0 0 -P 144 -211 1.8531506706893134e-02 1.1294735671448289e-01 -1.0826952941544615e-01 2.1048182351323930e-01 1.3957000000000000e-01 1 0 0 0 0 -P 145 111 1.7687031218441127e-01 3.6700809031877518e-01 3.4467520160307075e-01 5.5045312306477356e-01 1.3497999999999999e-01 2 0 0 -87 0 -V -20 0 0 0 0 0 0 2 0 -P 146 2112 2.4934049273082956e-01 -1.0034513778020797e+00 2.1420894051923574e+00 2.5574252977683418e+00 9.3957000000000002e-01 1 0 0 0 0 -P 147 211 1.9947470488272068e-01 -3.1529697057596912e-01 2.3407955759243465e-01 4.6203394001426124e-01 1.3957000000000000e-01 1 0 0 0 0 -V -21 0 0 0 0 0 0 3 0 -P 148 211 2.4202018503168082e-01 1.4484617014986720e-01 6.7976534371923969e-01 7.4907602444050325e-01 1.3957000000000000e-01 1 0 0 0 0 -P 149 -211 -6.6861426897547510e-02 -6.1023832547298297e-02 2.4621632999211213e-01 2.9714747954563148e-01 1.3957000000000000e-01 1 0 0 0 0 -P 150 111 -1.3106070854233884e-01 2.8593337821219544e-01 2.9804398527314574e-01 4.5385528933456026e-01 1.3497999999999999e-01 2 0 0 -88 0 -V -22 0 9.6563352047872456e+01 5.2776306427173331e+01 2.7424479409799136e+02 3.6122768733868139e+02 0 2 0 -P 151 -2212 3.3107085829399807e-01 2.5462012600502582e-01 1.1978746459665013e+00 1.5778762886005071e+00 9.3827000000000005e-01 1 0 0 0 0 -P 152 211 1.8747123682644409e-01 2.8786942277955141e-02 2.7481107891332301e-01 3.6190477570274704e-01 1.3957000000000000e-01 1 0 0 0 0 -V -23 0 0 0 0 0 0 2 0 -P 153 -321 1.1436683630808112e-01 1.7624680147292271e-01 8.9963936691443347e-01 1.0474419596229463e+00 4.9359999999999998e-01 1 0 0 0 0 -P 154 211 1.5980586075320719e-01 -1.3134046715429157e-01 1.6320686282669057e+00 1.6510348341923013e+00 1.3957000000000000e-01 1 0 0 0 0 -V -24 0 0 0 0 0 0 2 0 -P 156 111 -2.7875872913594103e-02 -4.1177083616346186e-02 1.2016647573442882e+00 1.2102439448099500e+00 1.3497999999999999e-01 2 0 0 -89 0 -P 155 -211 -3.7892725164608876e-01 -2.1323299448707161e-01 3.4834728880062177e-01 5.7435162617748858e-01 1.3957000000000000e-01 1 0 0 0 0 -V -25 0 1.9645533442150538e-05 -8.6979728910064382e-05 2.8182960414027593e-04 2.9658720641656587e-04 0 2 0 -P 157 22 6.3688804206746011e-02 -1.4462149743960712e-01 3.3361177481488985e-01 3.6914557778483581e-01 0 1 0 0 0 0 -P 158 22 4.5982890070555262e-02 -3.4094506991459012e-01 1.2397092182027323e+00 1.2865601084190099e+00 0 1 0 0 0 0 -V -26 0 0 0 0 0 0 3 0 -P 159 -211 -9.6603613340956990e-02 8.1396753813179970e-02 1.3365449629037009e+01 1.3366775275318552e+01 1.3957000000000000e-01 1 0 0 0 0 -P 160 211 -1.1685871788492098e-01 3.0883905152444485e-01 5.6084708578525380e+01 5.6085854309644873e+01 1.3957000000000000e-01 1 0 0 0 0 -P 161 111 -4.1631047557651339e-02 -1.2874234277955540e-01 6.9624511421666696e+01 6.9624773737809306e+01 1.3497999999999999e-01 2 0 0 -90 0 -V -27 0 0 0 0 0 0 2 0 -P 162 211 4.9615297183541651e-01 -1.7952305223659404e-01 8.7694255163022987e+01 8.7695953525120132e+01 1.3957000000000000e-01 1 0 0 0 0 -P 163 111 -5.3285294633266200e-01 -4.9076400014206613e-04 9.9538598315359692e+01 9.9540116067293155e+01 1.3497999999999999e-01 2 0 0 -91 0 -V -28 0 0 0 0 0 0 1 0 -P 164 130 -2.0826395264017022e-01 -3.8873428077532614e-02 7.7769704741499027e+02 7.7769723550906360e+02 4.9767000000000000e-01 1 0 0 0 0 -V -29 0 0 0 0 0 0 2 0 -P 165 211 4.9099984147424301e-03 1.9716298245156322e-01 1.5278552690721040e+03 1.5278552881763790e+03 1.3957000000000000e-01 1 0 0 0 0 -P 166 -211 4.3023698600706616e-02 -4.3317947286873226e-01 6.8997695486606995e+02 6.8997710630247286e+02 1.3957000000000000e-01 1 0 0 0 0 -V -30 0 0 0 0 0 0 2 0 -P 167 421 8.7573421888733503e+00 -1.5584005896471986e+00 -3.6683661548972424e+01 3.7792684999883136e+01 1.8645000000000000e+00 2 0 0 -92 0 -P 168 22 1.1674953354169699e+00 -2.7288291403232995e-01 -4.4930199129953658e+00 4.6502406799609899e+00 0 1 0 0 0 0 -V -31 0 0 0 0 0 0 2 0 -P 169 211 4.2875839023686985e-01 -2.0671583581217681e-01 -3.0239811985057781e+00 3.0643934583846248e+00 1.3957000000000000e-01 1 0 0 0 0 -P 170 111 2.7306121861372836e+00 -7.6705071398434499e-01 -1.0368784994499388e+01 1.0750559593410056e+01 1.3497999999999999e-01 2 0 0 -93 0 -V -32 0 0 0 0 0 0 2 0 -P 171 -211 6.6913532265409348e-01 -1.1497333163713761e+00 -9.4612474426376263e+00 9.5553289705019964e+00 1.3957000000000000e-01 1 0 0 0 0 -P 172 211 2.6610359075821943e-01 -1.1315064916010875e+00 -4.2716621511963080e+00 4.4291867628733934e+00 1.3957000000000000e-01 1 0 0 0 0 -V -33 0 0 0 0 0 0 2 0 -P 173 -211 9.8073095541060518e-01 -1.0256404175782887e+00 -6.3296668889138790e+00 6.4882920851779993e+00 1.3957000000000000e-01 1 0 0 0 0 -P 174 111 9.4437749042226293e-02 -8.2149919135419225e-01 -3.9179502857745612e+00 4.0065363410358232e+00 1.3497999999999999e-01 2 0 0 -94 0 -V -34 0 5.6807710352650527e-07 -1.0063042688640729e-06 -6.5254907358017688e-06 6.9140389564218331e-06 0 2 0 -P 175 22 -3.1320614758231377e-02 -6.7555428947804044e-02 -1.3895740843388496e-01 1.5765112827955549e-01 0 1 0 0 0 0 -P 176 22 7.0215709396855189e-02 -1.3441967011516463e-03 -3.0782979379073439e-01 3.1573918771055498e-01 0 1 0 0 0 0 -V -35 0 0 0 0 0 0 2 0 -P 177 -2112 1.0158607703232485e+00 -2.5256186969806884e+00 -1.3305053132739511e+01 1.3613153696228572e+01 9.3957000000000002e-01 1 0 0 0 0 -P 178 -211 1.3661267712066744e-01 -1.4613037293932616e+00 -6.8481648843881722e+00 7.0050634316725500e+00 1.3957000000000000e-01 1 0 0 0 0 -V -36 0 0 0 0 0 0 3 0 -P 179 111 2.0577497595879218e-01 -9.0184808666137053e-02 -1.4114507077389808e+00 1.4355797927046268e+00 1.3497999999999999e-01 2 0 0 -95 0 -P 180 111 4.1762967717743038e-01 -1.7457001757955024e-01 -2.2827569132806103e+00 2.3311130311135639e+00 1.3497999999999999e-01 2 0 0 -96 0 -P 181 111 2.3922967851484872e-01 -3.7578479703185902e-01 -2.8286977598559608e+00 2.8667395538794112e+00 1.3497999999999999e-01 2 0 0 -97 0 -V -37 0 -1.4153395206062958e-06 -2.3390528252416852e-04 -6.7563174062637891e-04 7.1667962649706767e-04 0 2 0 -P 182 22 -5.2764102271312105e-02 -2.7285017863169636e-01 -6.6581425086460921e-01 7.2148450234377659e-01 0 1 0 0 0 0 -P 183 22 4.8894777854157266e-02 -3.6661152493506532e-01 -1.1812608522813814e+00 1.2378093191801220e+00 0 1 0 0 0 0 -V -38 0 0 0 0 0 0 2 0 -P 184 -311 -4.6100841314703395e-01 9.2307915799673013e-01 -1.4688030567429675e+00 1.8627028043458205e+00 4.9767000000000000e-01 2 0 0 -98 0 -P 185 -211 -9.1358751268296934e-01 6.5680151488065541e-01 -1.2472094022546043e+00 1.6855389201237880e+00 1.3957000000000000e-01 1 0 0 0 0 -V -39 0 0 0 0 0 0 2 0 -P 186 211 -2.9732466916018679e-01 3.8062348944596097e-01 -5.2622083077712678e-01 7.2778042516476327e-01 1.3957000000000000e-01 1 0 0 0 0 -P 187 111 -1.3188671348400147e+00 8.7462138905242814e-01 -1.2634973141822292e+00 2.0295364389177188e+00 1.3497999999999999e-01 2 0 0 -99 0 -V -40 0 0 0 0 0 0 2 0 -P 188 321 -1.0177148179868251e+01 7.8877952464503291e+00 -1.5602898362297932e+01 2.0235753931818788e+01 4.9359999999999998e-01 1 0 0 0 0 -P 189 -211 -3.3171297377828615e+00 2.5345084667162929e+00 -4.5201053575106149e+00 6.1545036431085274e+00 1.3957000000000000e-01 1 0 0 0 0 -V -41 0 0 0 0 0 0 2 0 -P 190 -211 6.5734504515515368e-01 -8.4783501213816281e-02 1.6242754517480276e+02 1.6242895739999059e+02 1.3957000000000000e-01 1 0 0 0 0 -P 191 111 1.5680949446327844e-01 -5.1801813994789669e-02 1.9047927380199486e+01 1.9049121494894198e+01 1.3497999999999999e-01 2 0 0 -100 0 -V -42 0 0 0 0 0 0 2 0 -P 192 211 -5.0619922995651788e-02 -2.7314198696764880e-01 1.7851834426888692e+02 1.7851861496553065e+02 1.3957000000000000e-01 1 0 0 0 0 -P 193 111 -2.6281976757985070e-01 2.0439037285097228e-01 5.6390753552022026e+01 5.6391897959015616e+01 1.3497999999999999e-01 2 0 0 -101 0 -V -43 0 0 0 0 0 0 3 0 -P 195 -211 4.1840956779000425e-02 1.1065370009422846e-02 2.3223399295776672e+00 2.3269326680177986e+00 1.3957000000000000e-01 1 0 0 0 0 -P 196 221 -4.7666894429362194e-01 -2.2991460991983190e-01 9.2810980530629781e+00 9.3122798810698342e+00 5.4744999999999999e-01 2 0 0 -102 0 -P 194 211 -7.4549090353008274e-03 -4.7591526351828985e-02 3.6465918317571173e+00 3.6495797431193293e+00 1.3957000000000000e-01 1 0 0 0 0 -V -44 0 0 0 0 0 0 2 0 -P 197 -211 3.2159859847224199e-02 5.1524931983974856e-02 2.2591055305043298e-01 2.7240491566948427e-01 1.3957000000000000e-01 1 0 0 0 0 -P 198 111 -4.3446677963083974e-01 -7.8069277641445167e-01 1.0468480002047293e+00 1.3828784941856385e+00 1.3497999999999999e-01 2 0 0 -103 0 -V -45 0 -3.5529310722325376e-06 3.0192034773813072e-06 2.8592368293834157e-05 2.9301135473266580e-05 0 2 0 -P 199 22 1.0875639270421181e-02 -2.5150996814891705e-02 1.6074224664701259e-01 1.6306109906244409e-01 0 1 0 0 0 0 -P 200 22 -1.2005583534141563e-01 1.1792995056802119e-01 7.1789015938312140e-01 7.3735144794027918e-01 0 1 0 0 0 0 -V -46 0 0 0 0 0 0 1 0 -P 201 130 3.4248690127551151e-01 -3.5064896127775863e-01 6.5641413010847338e-01 9.5854416210028470e-01 4.9767000000000000e-01 1 0 0 0 0 -V -47 0 0 0 0 0 0 1 0 -P 202 130 3.4345529704259643e-02 4.2425337653113343e-01 -1.1177846011983017e+00 1.2954877021742739e+00 4.9767000000000000e-01 1 0 0 0 0 -V -48 0 0 0 0 0 0 3 0 -P 203 -211 3.7755731400707987e-03 1.0039370246368491e-01 -9.8458836148270468e-01 9.9949346016574825e-01 1.3957000000000000e-01 1 0 0 0 0 -P 204 211 -9.9161576416783720e-02 -1.0551044999043914e-01 -9.9295638064943059e-01 1.0131177779839140e+00 1.3957000000000000e-01 1 0 0 0 0 -P 205 111 7.3326975328856361e-02 7.3893963973200610e-02 -6.2198799242777869e-01 6.4492311661692658e-01 1.3497999999999999e-01 2 0 0 -104 0 -V -49 0 0 0 0 0 0 2 0 -P 206 -211 -1.4056740735774267e-01 4.3090739428138275e-01 -9.2027408298128321e-01 1.0352895977284280e+00 1.3957000000000000e-01 1 0 0 0 0 -P 207 211 1.6448440148163432e-01 -1.0315875828041352e-01 -1.2761807265788860e+00 1.2983889554105663e+00 1.3957000000000000e-01 1 0 0 0 0 -V -50 0 0 0 0 0 0 2 0 -P 208 211 -1.4298661753468034e-01 3.7573616782950625e-01 -3.6032083344042366e+02 3.6032108474779415e+02 1.3957000000000000e-01 1 0 0 0 0 -P 209 111 6.9716897678052181e-01 1.3778964005077581e+00 -1.3537396883659865e+03 1.3537405758563607e+03 1.3497999999999999e-01 2 0 0 -105 0 -V -51 0 0 0 0 0 0 2 0 -P 210 211 -2.9078012283491389e-01 -1.1660259005217517e-01 -4.0121417247561617e+01 4.0122883133963313e+01 1.3957000000000000e-01 1 0 0 0 0 -P 211 -211 2.2899627357348501e-01 2.5707148863093887e-01 -6.0357280793668032e+01 6.0358424015494023e+01 1.3957000000000000e-01 1 0 0 0 0 -V -52 0 0 0 0 0 0 3 0 -P 212 -211 2.6751267029558212e-01 -1.2905333117748891e-01 -6.3913699019142889e+01 6.3914541537005043e+01 1.3957000000000000e-01 1 0 0 0 0 -P 213 211 -1.1274188888036062e-02 -1.4725853542175005e-01 -4.0564276257440682e+01 4.0564785223866963e+01 1.3957000000000000e-01 1 0 0 0 0 -P 214 111 2.8295515860935339e-01 -1.6630421945240220e-01 -6.5321241841682792e+01 6.5322205841927925e+01 1.3497999999999999e-01 2 0 0 -106 0 -V -53 0 0 0 0 0 0 2 0 -P 215 2112 -2.1845128615593268e-01 4.4798446087771526e-01 -4.9336036526094443e+02 4.9336151168614583e+02 9.3957000000000002e-01 1 0 0 0 0 -P 216 -211 1.6585355152244120e-02 7.4750230739152670e-02 -1.6951937808817900e+02 1.6951945283612403e+02 1.3957000000000000e-01 1 0 0 0 0 -V -54 0 0 0 0 0 0 3 0 -P 217 -211 1.9855211504001832e-01 2.6538607577308887e-01 -1.3606712490783372e+02 1.3606760015955496e+02 1.3957000000000000e-01 1 0 0 0 0 -P 218 211 3.7148306018183180e-01 3.1989607288807170e-01 -3.3769988231507233e+02 3.3770026699509737e+02 1.3957000000000000e-01 1 0 0 0 0 -P 219 111 -2.4335846251811649e-02 -9.4387977975935594e-02 -7.7609371571857679e+01 7.7609550164286290e+01 1.3497999999999999e-01 2 0 0 -107 0 -V -55 0 0 0 0 0 0 2 0 -P 220 -2112 -4.2947348594333151e-01 4.2878118755364686e-01 -2.4264944626776290e+02 2.4265202423762878e+02 9.3957000000000002e-01 1 0 0 0 0 -P 221 111 5.8313103641705534e-02 -1.8636801168062198e-03 -5.9184340215263624e+01 5.9184522894147172e+01 1.3497999999999999e-01 2 0 0 -108 0 -V -56 0 0 0 0 0 0 2 0 -P 222 211 2.1682504245500336e-01 -3.0690088139902211e-01 -1.5974570443628508e+01 1.5979598927801305e+01 1.3957000000000000e-01 1 0 0 0 0 -P 223 111 -8.9638781795857811e-02 2.6362743774593289e-01 -4.9839795421006370e+00 4.9935764952198349e+00 1.3497999999999999e-01 2 0 0 -109 0 -V -57 0 -4.7599329251464510e-06 9.0207949310365042e-07 -8.4873871722890296e-05 8.5022653563515400e-05 0 2 0 -P 224 22 -3.7654176681799945e-01 1.0398317559965164e-01 -7.3943111915591366e+00 7.4046224887284371e+00 0 1 0 0 0 0 -P 225 22 -1.0144310122609973e-01 -1.3397792516092778e-02 -1.1285875580297213e+00 1.1332166958574881e+00 0 1 0 0 0 0 -V -58 0 0 0 0 0 0 2 0 -P 226 211 3.4496114997444949e-01 1.7950342099730848e-01 -4.8049026935169458e+01 4.8050803207383346e+01 1.3957000000000000e-01 1 0 0 0 0 -P 227 -211 -1.9314214957996700e-01 -1.3047251766359474e-01 -4.5836001434910052e+01 4.5836806545545755e+01 1.3957000000000000e-01 1 0 0 0 0 -V -59 0 0 0 0 0 0 2 0 -P 228 2212 -3.3167235353726043e-01 -1.2810071106104892e-01 -8.1283552071314276e+01 8.1289744766884553e+01 9.3827000000000005e-01 1 0 0 0 0 -P 229 211 -4.5724156530593883e-02 -8.5894814744234493e-02 -1.9645435027066917e+01 1.9646171784989004e+01 1.3957000000000000e-01 1 0 0 0 0 -V -60 0 0 0 0 0 0 2 0 -P 230 -211 5.0134055720976158e-02 4.0626914941326336e-01 -5.8639213486603819e+02 5.8639229435641471e+02 1.3957000000000000e-01 1 0 0 0 0 -P 231 111 1.4339741172950205e-03 6.4265897102186520e-01 -2.2818245590395259e+03 2.2818246535323738e+03 1.3497999999999999e-01 2 0 0 -110 0 -V -61 0 0 0 0 0 0 3 0 -P 232 22 -3.0900926286086272e-01 3.2953746163256012e-02 3.5998311172387848e-01 4.7556336554281858e-01 0 1 0 0 0 0 -P 233 211 3.2072488781638424e-02 7.4310750623015523e-02 1.9183184940054263e-01 2.5065908229951850e-01 1.3957000000000000e-01 1 0 0 0 0 -P 234 -211 3.6277635485791552e-03 7.2109035769672120e-02 1.0378590046087431e-01 1.8831933448924135e-01 1.3957000000000000e-01 1 0 0 0 0 -V -62 0 0 0 0 0 0 2 0 -P 235 -3112 8.3232122072788059e-02 5.2781217484367471e-01 3.2795184750343456e+00 3.5319424202200054e+00 1.1974400000000001e+00 2 0 0 -111 0 -P 236 -211 -7.0161828819345753e-02 1.5410727715577854e-01 3.5732234516368805e-01 4.1932180762383553e-01 1.3957000000000000e-01 1 0 0 0 0 -V -63 0 -1.8944492746949275e-05 8.2401636158269830e-06 -1.2503312705566621e-05 2.4658063843313472e-05 0 2 0 -P 237 22 -6.0517711111023132e-03 6.5087741414458159e-04 -3.6556075964248064e-02 3.7059334382760996e-02 0 1 0 0 0 0 -P 238 22 -5.0646985754231766e-01 2.2227734416277739e-01 -3.0170677841869392e-01 6.3003643900236450e-01 0 1 0 0 0 0 -V -64 0 -7.8563955847677602e-01 2.0638289911218017e+01 7.8257454723169033e+01 8.8857056141573736e+01 0 2 0 -P 239 3122 5.1931187238816325e-02 4.9930613611396391e-01 2.3055770821192110e+00 2.6100634110615828e+00 1.1156800000000000e+00 2 0 0 -112 0 -P 240 -211 -8.0238418068374492e-02 2.4430819712669047e-01 5.1410251659835626e-01 5.9152842821809692e-01 1.3957000000000000e-01 1 0 0 0 0 -V -65 0 0 0 0 0 0 2 0 -P 241 -2112 3.0395501563056263e-02 -2.4405351662998401e-01 -5.3666462824919672e-02 9.7270647146344724e-01 9.3957000000000002e-01 1 0 0 0 0 -P 242 111 -2.6825282256905353e-01 -1.8661431245093574e-01 1.4664249568572760e-01 3.8276376574688753e-01 1.3497999999999999e-01 2 0 0 -113 0 -V -66 0 0 0 0 0 0 2 0 -P 243 2112 5.0572982604360539e-01 -5.8752637152712439e-01 -6.5446855545169724e-01 1.3827764711496053e+00 9.3957000000000002e-01 1 0 0 0 0 -P 244 211 9.9423550289329768e-02 -3.6368958364413451e-01 -2.5949939376894660e-01 4.7851319299453970e-01 1.3957000000000000e-01 1 0 0 0 0 -V -67 0 0 0 0 0 0 3 0 -P 245 111 8.1991508324625768e-03 -2.2739275841531278e-01 -6.9069109264228244e-03 2.6465448885791415e-01 1.3497999999999999e-01 2 0 0 -114 0 -P 246 111 1.4009134464458384e-01 -4.0884284586234554e-02 6.9315279214559475e-02 2.1052628791447428e-01 1.3497999999999999e-01 2 0 0 -115 0 -P 247 111 7.8135734516086748e-03 -1.4352575440229270e-01 1.8309356614861544e-01 2.6907907475656356e-01 1.3497999999999999e-01 2 0 0 -116 0 -V -68 0 0 0 0 0 0 3 0 -P 248 211 -1.7564763129426919e-01 3.9036294667704030e-01 5.7373381789943145e-01 7.2930487398558319e-01 1.3957000000000000e-01 1 0 0 0 0 -P 249 -211 9.8183549295323566e-02 -9.0366883444205459e-02 2.8497224847354313e-01 3.4423124535072736e-01 1.3957000000000000e-01 1 0 0 0 0 -P 250 111 -8.9081241279593756e-02 -3.5896718271989543e-02 6.1330119536645196e-02 1.7664944351169345e-01 1.3497999999999999e-01 2 0 0 -117 0 -V -69 0 0 0 0 0 0 2 0 -P 251 -211 3.2224716368830358e-01 -8.0081349545995439e-01 -1.1081394023791091e-01 8.8142214816000508e-01 1.3957000000000000e-01 1 0 0 0 0 -P 252 111 5.1011684333153062e-01 -6.1963457427255142e-01 -8.1190431695912335e-01 1.1495975033816452e+00 1.3497999999999999e-01 2 0 0 -118 0 -V -70 0 0 0 0 0 0 2 0 -P 253 -211 -1.3608073804842804e-02 3.4069193915745993e-01 4.6360081699615536e+00 4.6506244434408828e+00 1.3957000000000000e-01 1 0 0 0 0 -P 254 111 2.5831045357956911e-01 -2.5003056765727244e-01 6.3219226034303873e+00 6.3335743920282130e+00 1.3497999999999999e-01 2 0 0 -119 0 -V -71 0 -2.2191327105470943e-05 2.6707018703971986e-05 2.0575699945590383e-04 2.0887534434869823e-04 0 2 0 -P 255 22 -3.3464530112944861e-02 1.3062552833387439e-01 7.1639911157906921e-01 7.2897914270537523e-01 0 1 0 0 0 0 -P 256 22 -2.8721994320842464e-01 2.5531471698636882e-01 2.2569730841935161e+00 2.2894559186104617e+00 0 1 0 0 0 0 -V -72 0 0 0 0 0 0 3 0 -P 257 -211 -2.5370115195927556e-01 2.4389521354651730e-01 1.1941656171072713e+01 1.1947655880661921e+01 1.3957000000000000e-01 1 0 0 0 0 -P 258 211 -1.2411261561070656e-01 1.6023975462299647e-01 1.1180974600038915e+01 1.1183682466519279e+01 1.3957000000000000e-01 1 0 0 0 0 -P 259 111 -2.0433372632142410e-01 1.6817746660681263e-01 2.1939337867558944e+01 2.1941349128968632e+01 1.3497999999999999e-01 2 0 0 -120 0 -V -73 0 0 0 0 0 0 2 0 -P 260 -311 -2.2181622425943659e-01 8.2064928378335456e-01 3.4099179264428734e+01 3.4113404544560858e+01 4.9767000000000000e-01 2 0 0 -121 0 -P 261 111 1.2976008347469933e-01 3.6468272062361839e-01 6.3463218449327279e+00 6.3595480755990161e+00 1.3497999999999999e-01 2 0 0 -122 0 -V -74 0 -1.0001014862923057e+01 -3.2697666563000749e-01 1.3551631410569682e+03 1.3553631885179477e+03 0 2 0 -P 263 211 -2.9869529476092338e-01 -5.0875432558458403e-02 2.2946836256989762e+01 2.2949261015961937e+01 1.3957000000000000e-01 1 0 0 0 0 -P 262 2112 -2.6701945902112212e-01 3.2379757227036086e-02 5.3708962497965480e+01 5.3717853570604774e+01 9.3957000000000002e-01 1 0 0 0 0 -V -75 0 3.8177060219193604e+00 -8.6202960607973977e-01 7.4805709987901992e+02 7.4808463063873478e+02 0 2 0 -P 264 -2212 5.6058624701577420e-01 -8.4272389450154115e-03 1.2543095886015534e+02 1.2543572106513193e+02 9.3827000000000005e-01 1 0 0 0 0 -P 265 111 3.3211251027235189e-01 -1.9314217307222326e-01 4.9488125953721443e+01 4.9489801299159566e+01 1.3497999999999999e-01 2 0 0 -123 0 -V -76 0 4.0150324535365861e-04 -2.9501415761643132e-04 2.5414161167512602e-02 2.5419241904258205e-02 0 2 0 -P 266 22 2.1495426154852360e-01 -2.1249167000350005e-01 1.7862096858763419e+01 1.7864653991505818e+01 0 1 0 0 0 0 -P 267 22 3.2610470661881691e-01 -1.8506440846382186e-01 1.6385595973758694e+01 1.6389885555738825e+01 0 1 0 0 0 0 -V -77 0 0 0 0 0 0 3 0 -P 268 111 2.1756652006665286e-01 4.4921344540010552e-02 2.8253044127043143e+01 2.8254239950189710e+01 1.3497999999999999e-01 2 0 0 -124 0 -P 269 111 2.1168570079863799e-01 1.5888476958365427e-02 1.4419743327632153e+01 1.4421937474376135e+01 1.3497999999999999e-01 2 0 0 -125 0 -P 270 111 4.2338651776527382e-02 5.9397905537924622e-02 5.3617926069090789e+00 5.3639873445526884e+00 1.3497999999999999e-01 2 0 0 -126 0 -V -78 0 0 0 0 0 0 3 0 -P 271 211 -1.6517201415503185e-01 -2.4079978785390410e-01 5.3890218212193854e+00 5.3987315460735052e+00 1.3957000000000000e-01 1 0 0 0 0 -P 272 -211 6.1921227808798385e-02 6.5909961337744488e-02 6.8540815103096717e+00 6.8560988540368788e+00 1.3957000000000000e-01 1 0 0 0 0 -P 273 111 -2.9104043237975502e-01 -1.7136327052337760e-01 1.4152408887417174e+01 1.4157081861061936e+01 1.3497999999999999e-01 2 0 0 -127 0 -V -79 0 0 0 0 0 0 2 0 -P 274 211 -5.2151867703930009e-02 -4.6577522637422542e-01 9.3560383894911787e+00 9.3688099836287453e+00 1.3957000000000000e-01 1 0 0 0 0 -P 275 111 4.5010499856196384e-01 -1.5099879120799736e-01 2.2489630496284530e+01 2.2495046001386349e+01 1.3497999999999999e-01 2 0 0 -128 0 -V -80 0 0 0 0 0 0 2 0 -P 276 321 -2.0352232346411694e-01 -3.1853415646239830e-01 1.2546225242926846e+01 1.2561619885637212e+01 4.9359999999999998e-01 1 0 0 0 0 -P 277 -211 3.0617347118293892e-01 9.2311657222136315e-02 1.0906099986540170e+01 1.0911679996124647e+01 1.3957000000000000e-01 1 0 0 0 0 -V -81 0 0 0 0 0 0 2 0 -P 278 -321 -7.0220195411522102e-01 -1.2527226016438842e+00 1.0523045321644643e+01 1.0632051791748376e+01 4.9359999999999998e-01 1 0 0 0 0 -P 279 211 1.4520040899471007e-01 -3.8694870159807759e-01 3.1236150576917168e+00 3.1539282284127990e+00 1.3957000000000000e-01 1 0 0 0 0 -V -82 0 -7.3070249558822658e-06 -3.2202206515903731e-05 5.1933279134994169e-04 5.2070104417390720e-04 0 2 0 -P 280 22 1.2505542083726177e-02 -1.7814709059026052e-01 3.0137330713764303e+00 3.0190196753212120e+00 0 1 0 0 0 0 -P 281 22 -6.6582630892394315e-02 -6.0171731654043326e-02 8.2969235123366514e-01 8.3453177394419598e-01 0 1 0 0 0 0 -V -83 0 0 0 0 0 0 2 0 -P 282 -211 5.1916430522214251e-02 -8.9640749655295293e-01 4.1885959318955983e+00 4.2860304923351693e+00 1.3957000000000000e-01 1 0 0 0 0 -P 283 111 -6.3457866147058040e-01 -5.6503110734722573e-01 5.4665917789662455e+00 5.5338770774318045e+00 1.3497999999999999e-01 2 0 0 -129 0 -V -84 0 -1.3711706269638147e-04 -1.8369746299331976e-04 1.4597874604678092e-03 1.4778981978161132e-03 0 2 0 -P 284 22 -5.2667737066255793e-01 -6.6014242113744759e-01 5.7128746555838257e+00 5.7749557486932526e+00 0 1 0 0 0 0 -P 285 22 -1.9494804319896730e-01 -3.0662827210148269e-01 1.9697558616883879e+00 2.0029887147597236e+00 0 1 0 0 0 0 -V -85 0 0 0 0 0 0 2 0 -P 286 311 -8.8640989536248971e-01 -1.6453928479315294e+00 1.0105514131225380e+01 1.0288932471929078e+01 4.9767000000000000e-01 2 0 0 -130 0 -P 287 211 -1.9216241447018820e-02 -3.0070888016722131e-02 8.4870724776096818e-01 8.6084685022567276e-01 1.3957000000000000e-01 1 0 0 0 0 -V -86 0 0 0 0 0 0 2 0 -P 288 -321 -3.0096672158605109e-01 -3.2856288480682283e-01 5.3121460379397503e+00 5.3536035550994834e+00 4.9359999999999998e-01 1 0 0 0 0 -P 289 211 2.6855393914793912e-01 -1.0507833884512403e-01 1.6147842692616270e+00 1.6462596079237115e+00 1.3957000000000000e-01 1 0 0 0 0 -V -87 0 4.4109844203045144e-05 9.1528473519848896e-05 8.5958854573134038e-05 1.3727799312159968e-04 0 2 0 -P 290 22 -8.7160338195142774e-03 1.0407506512888258e-01 1.1322702962452645e-01 1.5403878948082347e-01 0 1 0 0 0 0 -P 291 22 1.8558634600392554e-01 2.6293302518989264e-01 2.3144817197854431e-01 3.9641433358395012e-01 0 1 0 0 0 0 -V -88 0 -3.5053496386335686e-05 7.6475739764950647e-05 7.9714842662904328e-05 1.2138813319072600e-04 0 2 0 -P 292 22 -1.3461824233850531e-01 2.0304834831798538e-01 1.5577729727085340e-01 2.8916650786351850e-01 0 1 0 0 0 0 -P 293 22 3.5575337961664942e-03 8.2885029894210052e-02 1.4226668800229234e-01 1.6468878147104177e-01 0 1 0 0 0 0 -V -89 0 -4.4554774813408138e-06 -6.5814465924921522e-06 1.9206538511148803e-04 1.9343662025378980e-04 0 2 0 -P 294 22 1.8693463926493268e-02 -3.1342886660051500e-02 1.0632171065932128e+00 1.0638432393403643e+00 0 1 0 0 0 0 -P 295 22 -4.6569336840087371e-02 -9.8341969562946805e-03 1.3844765075107546e-01 1.4640070546958606e-01 0 1 0 0 0 0 -V -90 0 -1.1519603842379508e-05 -3.5623912285813612e-05 1.9265592300701549e-02 1.9265664885424284e-02 0 2 0 -P 296 22 -8.3815127063187972e-02 -1.2256295385089019e-01 5.3865030303772741e+01 5.3865234950564684e+01 0 1 0 0 0 0 -P 297 22 4.2184079505536640e-02 -6.1793889286651952e-03 1.5759481117893948e+01 1.5759538787244599e+01 0 1 0 0 0 0 -V -91 0 -1.5697360852585788e-04 -1.4457458960692370e-07 2.9323161432635091e-02 2.9323608548484745e-02 0 2 0 -P 298 22 -4.9644516570737324e-01 -3.7151389408233211e-02 8.9402750785785713e+01 8.9404136851118892e+01 0 1 0 0 0 0 -P 299 22 -3.6407780625288773e-02 3.6660625408091146e-02 1.0135847529573983e+01 1.0135979216174251e+01 0 1 0 0 0 0 -V -92 0 1.8966305837442445e-02 -3.3751224473166320e-03 -7.9448025344839107e-02 8.1849904533435089e-02 0 4 0 -P 300 -311 2.6183277643501564e+00 6.1386138582397727e-02 -9.6191913944512102e+00 9.9817797537093131e+00 4.9767000000000000e-01 2 0 0 -131 0 -P 301 211 8.8637402086832295e-01 -3.1039363085465904e-01 -3.8525417889436788e+00 3.9678156624776282e+00 1.3957000000000000e-01 1 0 0 0 0 -P 302 -211 1.5690167489104487e+00 -1.3700604791982612e-01 -6.5896015529868883e+00 6.7766446437418670e+00 1.3957000000000000e-01 1 0 0 0 0 -P 303 111 3.6836236547444208e+00 -1.1723870494551110e+00 -1.6622326812590639e+01 1.7066444939954319e+01 1.3497999999999999e-01 2 0 0 -132 0 -V -93 0 7.4128442659675373e-04 -2.0823270018832646e-04 -2.8148335666901884e-03 2.9184746351946975e-03 0 2 0 -P 304 22 8.1742943599848239e-01 -1.6584406973187246e-01 -3.0563856276486878e+00 3.1681521811932414e+00 0 1 0 0 0 0 -P 305 22 1.9131827501388010e+00 -6.0120664425247261e-01 -7.3123993668507001e+00 7.5824074122168170e+00 0 1 0 0 0 0 -V -94 0 1.4833994199896756e-05 -1.2903859275933336e-04 -6.1541970667552427e-04 6.2933453462583595e-04 0 2 0 -P 306 22 5.6644467513777601e-02 -3.9192437164538596e-01 -2.1953408676426514e+00 2.2307700091967217e+00 0 1 0 0 0 0 -P 307 22 3.7793281528448693e-02 -4.2957481970880629e-01 -1.7226094181319094e+00 1.7757663318391017e+00 0 1 0 0 0 0 -V -95 0 4.5181862789650803e-06 -1.9801813276266907e-06 -3.0991121206199972e-05 3.1520921781356387e-05 0 2 0 -P 308 22 8.6260522514302745e-02 2.2530582118513855e-02 -3.3478032046315359e-01 3.4644821812855597e-01 0 1 0 0 0 0 -P 309 22 1.1951445344448942e-01 -1.1271539078465091e-01 -1.0766703872758272e+00 1.0891315745760710e+00 0 1 0 0 0 0 -V -96 0 8.5116093559703892e-05 -3.5578692705565099e-05 -4.6524316068253217e-04 4.7509850400360835e-04 0 2 0 -P 310 22 4.1443767343060667e-01 -1.4967313990932649e-01 -2.2238064740485206e+00 2.2670412144442822e+00 0 1 0 0 0 0 -P 311 22 3.1920037468237635e-03 -2.4896877670223756e-02 -5.8950439232089813e-02 6.4071816669282453e-02 0 1 0 0 0 0 -V -97 0 3.0282600980360872e-06 -4.7568266335714519e-06 -3.5806730204857039e-05 3.6288277676784827e-05 0 2 0 -P 312 22 9.3367976806222705e-02 -2.3060951027911883e-01 -1.2351119821318959e+00 1.2599206061216093e+00 0 1 0 0 0 0 -P 313 22 1.4586170170862600e-01 -1.4517528675274019e-01 -1.5935857777240650e+00 1.6068189477578019e+00 0 1 0 0 0 0 -V -98 0 0 0 0 0 0 1 0 -P 314 130 -4.6100841314703395e-01 9.2307915799673013e-01 -1.4688030567429675e+00 1.8627028043458205e+00 4.9767000000000000e-01 1 0 0 0 0 -V -99 0 -6.0749677413030187e-04 4.0286823319709669e-04 -5.8199231917407284e-04 9.3484537376994871e-04 0 2 0 -P 315 22 -5.8507372946487168e-01 3.1792411425789363e-01 -4.8939393290153504e-01 8.2637366420853020e-01 0 1 0 0 0 0 -P 316 22 -7.3379340537514304e-01 5.5669727479453446e-01 -7.7410338128069411e-01 1.2031627747091891e+00 0 1 0 0 0 0 -V -100 0 1.3016547532871910e-04 -4.2999996681327984e-05 1.5811431125117299e-02 1.5812422343840164e-02 0 2 0 -P 317 22 1.5804746333869230e-01 -3.9281593826614072e-02 1.8887316070568861e+01 1.8888018170095304e+01 0 1 0 0 0 0 -P 318 22 -1.2379688754138632e-03 -1.2520220168175604e-02 1.6061130963062439e-01 1.6110332479890169e-01 0 1 0 0 0 0 -V -101 0 -3.1320010615501288e-05 2.4357028797134874e-05 6.7200386642486745e-03 6.7201750422674266e-03 0 2 0 -P 319 22 -2.0941596228200959e-01 1.9785744195153840e-01 3.9131333015929883e+01 3.9132393566151876e+01 0 1 0 0 0 0 -P 320 22 -5.3403805297841091e-02 6.5329308994338591e-03 1.7259420536092140e+01 1.7259504392863857e+01 0 1 0 0 0 0 -V -102 0 0 0 0 0 0 3 0 -P 321 -211 -6.0151917037470526e-02 7.9311722353406680e-02 2.2910866605242663e+00 2.2974913434783999e+00 1.3957000000000000e-01 1 0 0 0 0 -P 322 211 -1.8066085545057711e-01 -1.2250346517093816e-01 3.1803689410937466e+00 3.1909045473101791e+00 1.3957000000000000e-01 1 0 0 0 0 -P 323 111 -2.3585617180557428e-01 -1.8672286710230040e-01 3.8096424514449647e+00 3.8238839902812538e+00 1.3497999999999999e-01 2 0 0 -133 0 -V -103 0 -1.9160483241735818e-05 -3.4429446762634630e-05 4.6167197366874553e-05 6.0986527521654494e-05 0 2 0 -P 324 22 -4.2152681502119949e-01 -7.5137863584649212e-01 1.0392920720559295e+00 1.3499565627185053e+00 0 1 0 0 0 0 -P 325 22 -1.2939964609640288e-02 -2.9314140567959529e-02 7.5559281487998032e-03 3.2921931467134069e-02 0 1 0 0 0 0 -V -104 0 2.9830838171712643e-05 3.0061500167775855e-05 -2.5303679939952156e-04 2.6236725350684323e-04 0 2 0 -P 326 22 3.5218510592828343e-02 1.0791532602972706e-01 -4.9896979581793105e-01 5.1171956990041656e-01 0 1 0 0 0 0 -P 327 22 3.8108464736028018e-02 -3.4021362056526450e-02 -1.2301819660984770e-01 1.3320354671651011e-01 0 1 0 0 0 0 -V -105 0 4.2377491725209733e-04 8.3755581868205121e-04 -8.2287213505597279e-01 8.2287267451795754e-01 0 2 0 -P 328 22 4.5179522665667199e-01 1.0179315933320865e+00 -9.5340158429428311e+02 9.5340223475640357e+02 0 1 0 0 0 0 -P 329 22 2.4537375012384985e-01 3.5996480717567148e-01 -4.0033810407170330e+02 4.0033834109995706e+02 0 1 0 0 0 0 -V -106 0 2.7213670290870733e-05 -1.5994577439058151e-05 -6.2823761447091137e-03 6.2824688589927487e-03 0 2 0 -P 330 22 2.2167340558834825e-01 -9.7157200552894965e-02 -5.5547760321911738e+01 5.5548287600977559e+01 0 1 0 0 0 0 -P 331 22 6.1281753021005136e-02 -6.9147018899507251e-02 -9.7734815197710532e+00 9.7739182409503673e+00 0 1 0 0 0 0 -V -107 0 -5.8316299800032171e-06 -2.2618311951053398e-05 -1.8597633026793233e-02 1.8597675823125447e-02 0 2 0 -P 332 22 -1.7984737530842031e-02 -2.1226756412069968e-02 -2.7141048367785494e+00 2.7142474262669105e+00 0 1 0 0 0 0 -P 333 22 -6.3511087209696176e-03 -7.3161221563865633e-02 -7.4895266735079133e+01 7.4895302738019382e+01 0 1 0 0 0 0 -V -108 0 5.8868838727987346e-06 -1.8814413465442004e-07 -5.9748378353555037e-03 5.9748562773403457e-03 0 2 0 -P 334 22 6.9648943109769781e-02 2.9835063326280664e-02 -1.6959451898039372e+01 1.6959621156977278e+01 0 1 0 0 0 0 -P 335 22 -1.1335839468064239e-02 -3.1698743443086888e-02 -4.2224888317224256e+01 4.2224901737169894e+01 0 1 0 0 0 0 -V -109 0 -1.1760798667907243e-05 3.4588480081390835e-05 -6.5390870765183397e-04 6.5516784829608410e-04 0 2 0 -P 336 22 -6.1848075575125581e-02 1.9449485808627826e-01 -2.4447993736844960e+00 2.4533033672667659e+00 0 1 0 0 0 0 -P 337 22 -2.7790706220732229e-02 6.9132579659654650e-02 -2.5391801684161410e+00 2.5402731279530690e+00 0 1 0 0 0 0 -V -110 0 1.1133139557567718e-07 4.9894987127144138e-05 -1.7715711152160191e-01 1.7715711885787144e-01 0 2 0 -P 338 22 5.1210149305939139e-02 5.3680022191438881e-01 -1.8410429184390396e+03 1.8410429974097549e+03 0 1 0 0 0 0 -P 339 22 -4.9776175188644113e-02 1.0585874910747640e-01 -4.4078164060048624e+02 4.4078165612261887e+02 0 1 0 0 0 0 -V -111 0 8.3651444920921989e+00 5.3047128888430507e+01 3.2960406661453277e+02 3.5497363213991264e+02 0 2 0 -P 340 -2112 2.4959979502932808e-01 4.1483457435636895e-01 2.8145873045782719e+00 3.0065064878947614e+00 9.3957000000000002e-01 1 0 0 0 0 -P 341 211 -1.6636767295654004e-01 1.1297760048730578e-01 4.6493117045607391e-01 5.2543593232524399e-01 1.3957000000000000e-01 1 0 0 0 0 -V -112 0 5.6116033604361382e-01 3.3587453741407344e+01 1.3805102263693735e+02 1.5654726916412105e+02 0 2 0 -P 342 2212 1.1992793272742071e-01 4.4331641651508663e-01 2.1078582809441220e+00 2.3525155216586264e+00 9.3827000000000005e-01 1 0 0 0 0 -P 343 -211 -6.7996745488604390e-02 5.5989719598877254e-02 1.9771880117508914e-01 2.5754788940295620e-01 1.3957000000000000e-01 1 0 0 0 0 -V -113 0 -1.9934912146134204e-05 -1.3868036460130835e-05 1.0897575057695162e-05 2.8444666377829044e-05 0 2 0 -P 344 22 -7.6471623616945908e-03 -4.7325606667598510e-02 -9.0136760118943275e-03 4.8779488454572417e-02 0 1 0 0 0 0 -P 345 22 -2.6060566020735898e-01 -1.3928870578333724e-01 1.5565617169762194e-01 3.3398427729231522e-01 0 1 0 0 0 0 -V -114 0 2.1360272638227475e-06 -5.9239931243597419e-05 -1.7993753681444694e-06 6.8947286767231003e-05 0 2 0 -P 346 22 -4.6502144541311519e-02 -2.4623793396686189e-02 1.1401113821310007e-02 5.3840189863615641e-02 0 1 0 0 0 0 -P 347 22 5.4701295373774099e-02 -2.0276896501862660e-01 -1.8308024747732833e-02 2.1081429899429852e-01 0 1 0 0 0 0 -V -115 0 4.8539793062532255e-05 -1.4165862411844778e-05 2.4016825005729855e-05 7.2944566814726108e-05 0 2 0 -P 348 22 -1.5453741505853599e-02 -1.0327941204819121e-03 4.5670963822391386e-02 4.8225737181418267e-02 0 1 0 0 0 0 -P 349 22 1.5554508615043744e-01 -3.9851490465752641e-02 2.3644315392168085e-02 1.6230055073305602e-01 0 1 0 0 0 0 -V -116 0 1.1104293133444440e-06 -2.0397223612887224e-05 2.6020420003133673e-05 3.8240287119304297e-05 0 2 0 -P 350 22 5.0771406605997528e-02 -4.0452964763788126e-03 5.4032352941951377e-02 7.4253587905076579e-02 0 1 0 0 0 0 -P 351 22 -4.2957833154388850e-02 -1.3948045792591390e-01 1.2906121320666405e-01 1.9482548685148704e-01 0 1 0 0 0 0 -V -117 0 -2.6036576342430157e-05 -1.0491857009467409e-05 1.7925506161217156e-05 5.1630923141319130e-05 0 2 0 -P 352 22 -1.0270748918179354e-01 -7.3080935605012304e-02 4.7240148627235183e-02 1.3461531534433765e-01 0 1 0 0 0 0 -P 353 22 1.3626247902199785e-02 3.7184217333022761e-02 1.4089970909410013e-02 4.2034128167355814e-02 0 1 0 0 0 0 -V -118 0 1.0691248272362538e-04 -1.2986567995721066e-04 -1.7016239984005995e-04 2.4093759072278827e-04 0 2 0 -P 354 22 2.0070538345311324e-02 -3.6272560866489251e-02 -8.3680527288135988e-03 4.2291245994366115e-02 0 1 0 0 0 0 -P 355 22 4.9004630498621926e-01 -5.8336201340606209e-01 -8.0353626423030966e-01 1.1073062573872792e+00 0 1 0 0 0 0 -V -119 0 2.7525122215137944e-05 -2.6642831665992929e-05 6.7365331090041411e-04 6.7489490565872043e-04 0 2 0 -P 356 22 -1.3261749120023297e-02 1.7702328450182473e-03 2.6929989477908284e-01 2.6963204750562036e-01 0 1 0 0 0 0 -P 357 22 2.7157220269959242e-01 -2.5180080050229070e-01 6.0526227086513051e+00 6.0639423445225926e+00 0 1 0 0 0 0 -V -120 0 -3.1715703820054426e-05 2.6103702096238404e-05 3.4053191039106886e-03 3.4056312822883005e-03 0 2 0 -P 358 22 -1.2742245539164479e-01 1.6454266915182736e-01 1.2849928685755119e+01 1.2851613828663774e+01 0 1 0 0 0 0 -P 359 22 -7.6911270929779313e-02 3.6347974549852820e-03 9.0894091818038234e+00 9.0897353003048575e+00 0 1 0 0 0 0 -V -121 0 0 0 0 0 0 1 0 -P 360 130 -2.2181622425943659e-01 8.2064928378335456e-01 3.4099179264428734e+01 3.4113404544560858e+01 4.9767000000000000e-01 1 0 0 0 0 -V -122 0 1.6365951152252307e-05 4.5995497474848116e-05 8.0042791688625977e-04 8.0209607121551534e-04 0 2 0 -P 361 22 1.6457473104822637e-02 1.2357630669817704e-01 3.0214087375441823e+00 3.0239796148959881e+00 0 1 0 0 0 0 -P 362 22 1.1330261036987670e-01 2.4110641392544135e-01 3.3249131073885452e+00 3.3355684607030280e+00 0 1 0 0 0 0 -V -123 0 3.8177543412316921e+00 -8.6205770648757274e-01 7.4806429994568623e+02 7.4809183094914840e+02 0 2 0 -P 363 22 2.8847555483102255e-01 -1.8442581482610237e-01 3.6678513532652126e+01 3.6680111586414981e+01 0 1 0 0 0 0 -P 364 22 4.3636955441329298e-02 -8.7163582461208516e-03 1.2809612421069319e+01 1.2809689712744593e+01 0 1 0 0 0 0 -V -124 0 1.8055353550502218e-05 3.7279208096233577e-06 2.3446562478244642e-03 2.3447554864834664e-03 0 2 0 -P 365 22 3.2840553761882885e-02 3.3487323111844082e-02 1.2824422473230022e+01 1.2824508242995824e+01 0 1 0 0 0 0 -P 366 22 1.8472596630477001e-01 1.1434021428166474e-02 1.5428621653813121e+01 1.5429731707193888e+01 0 1 0 0 0 0 -V -125 0 1.5000494737206010e-05 1.1258909510514894e-06 1.0218133916554050e-03 1.0219688735163036e-03 0 2 0 -P 367 22 2.0590072325621228e-01 1.6406750822116400e-02 1.4396424714445700e+01 1.4397906405030316e+01 0 1 0 0 0 0 -P 368 22 5.7849775424257200e-03 -5.1827386375097220e-04 2.3318613186452682e-02 2.4031069345820253e-02 0 1 0 0 0 0 -V -126 0 1.1025628596229910e-05 1.5468117627169742e-05 1.3962923100580519e-03 1.3968638531069975e-03 0 2 0 -P 369 22 -4.6518556081000337e-03 8.8937831391877178e-02 2.3566496719389329e+00 2.3583318794993993e+00 0 1 0 0 0 0 -P 370 22 4.6990507384627421e-02 -2.9539925853952553e-02 3.0051429349701460e+00 3.0056554650532892e+00 0 1 0 0 0 0 -V -127 0 -5.5259884809614866e-05 -3.2536766497669014e-05 2.6871197190801157e-03 2.6880069771947918e-03 0 2 0 -P 371 22 -1.0110895637559562e-01 -5.3295271113881944e-02 2.6031718919982696e+00 2.6056798165300958e+00 0 1 0 0 0 0 -P 372 22 -1.8993147600415941e-01 -1.1806799940949568e-01 1.1549236995418905e+01 1.1551402044531839e+01 0 1 0 0 0 0 -V -128 0 3.9393832255598700e-05 -1.3215629843371153e-05 1.9683245778019608e-03 1.9687985505421920e-03 0 2 0 -P 373 22 4.0519797499710603e-01 -1.6100216218666105e-01 1.8439347310789309e+01 1.8444501520590993e+01 0 1 0 0 0 0 -P 374 22 4.4907023564857852e-02 1.0003370978663674e-02 4.0502831854952213e+00 4.0505444807953541e+00 0 1 0 0 0 0 -V -129 0 -2.0539396101361708e-04 -1.8288351670226675e-04 1.7693707760742391e-03 1.7911489965044658e-03 0 2 0 -P 375 22 -2.7639354994895160e-01 -2.6866740687512319e-01 2.9022806969822539e+00 2.9277651569151142e+00 0 1 0 0 0 0 -P 376 22 -3.5818511152162880e-01 -2.9636370047210259e-01 2.5643110819839920e+00 2.6061119205166898e+00 0 1 0 0 0 0 -V -130 0 0 0 0 0 0 1 0 -P 377 310 -8.8640989536248971e-01 -1.6453928479315294e+00 1.0105514131225380e+01 1.0288932471929078e+01 4.9767000000000000e-01 2 0 0 -134 0 -V -131 0 1.8966305837442445e-02 -3.3751224473166320e-03 -7.9448025344839107e-02 8.1849904533435089e-02 0 1 0 -P 378 130 2.6183277643501564e+00 6.1386138582397727e-02 -9.6191913944512102e+00 9.9817797537093131e+00 4.9767000000000000e-01 1 0 0 0 0 -V -132 0 2.0149870341415778e-02 -3.7518155698254710e-03 -8.4788852159078762e-02 8.7333428458016546e-02 0 2 0 -P 379 22 2.8921594225230942e+00 -9.1550660519293359e-01 -1.2794645715543083e+01 1.3149361104468387e+01 0 1 0 0 0 0 -P 380 22 7.9146423222132656e-01 -2.5688044426217738e-01 -3.8276810970475545e+00 3.9170838354859354e+00 0 1 0 0 0 0 -V -133 0 -1.1231803604738254e-05 -8.8920063263619592e-06 1.8142054749441223e-04 1.8209874966319139e-04 0 2 0 -P 381 22 -1.1488886556337818e-01 -1.3618640965757867e-01 2.8158840839305816e+00 2.8215154374448228e+00 0 1 0 0 0 0 -P 382 22 -1.2096730624219609e-01 -5.0536457444721711e-02 9.9375836751438251e-01 1.0023685528364348e+00 0 1 0 0 0 0 -V -134 0 -5.4534669499812850e+01 -1.0122964063099396e+02 6.2172238391663780e+02 6.3300684570210751e+02 0 2 0 -P 383 111 -2.7057189871723214e-01 -3.1393099110360240e-01 1.6814506090419195e+00 1.7370254950915891e+00 1.3497999999999999e-01 2 0 0 -135 0 -P 384 111 -6.1583799664525751e-01 -1.3314618568279268e+00 8.4240635221834612e+00 8.5519069768374898e+00 1.3497999999999999e-01 2 0 0 -136 0 -V -135 0 -5.4534759776515948e+01 -1.0122974537452058e+02 6.2172294493505149e+02 6.3300742526316185e+02 0 2 0 -P 385 22 -1.0129816071137022e-01 -2.0517523717889224e-01 1.0348101654081705e+00 1.0598067152773691e+00 0 1 0 0 0 0 -P 386 22 -1.6927373800586196e-01 -1.0875575392471017e-01 6.4664044363374906e-01 6.7721877981422007e-01 0 1 0 0 0 0 -V -136 0 -5.4534805123554811e+01 -1.0122993385395240e+02 6.2172423911723217e+02 6.3300872905719666e+02 0 2 0 -P 387 22 -3.0111265749682459e-01 -7.1575180908117086e-01 4.0963761753010273e+00 4.1693245561219676e+00 0 1 0 0 0 0 -P 388 22 -3.1472533914843293e-01 -6.1571004774675597e-01 4.3276873468824339e+00 4.3825824207155222e+00 0 1 0 0 0 0 diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/hepmc_ascii.in b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/hepmc_ascii.in deleted file mode 100644 index e9614c8430..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/hepmc_ascii.in +++ /dev/null @@ -1,5 +0,0 @@ -/generator/select hepmcAscii -/generator/hepmcAscii/open data/example_MyPythia.dat -/generator/hepmcAscii/verbose 1 -/run/beamOn 3 - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/hepmc_ascii.out b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/hepmc_ascii.out deleted file mode 100644 index 2ae055e7ea..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/hepmc_ascii.out +++ /dev/null @@ -1,2106 +0,0 @@ -********************************************** - Geant4 version $Name: geant4-08-01 $ - (31-Jul-2002) - Copyright : Geant4 Collaboration -********************************************** - -phot: Total cross sections from Sandia parametrisation. -MuonMinusCaptureAtRest is created - -compt: Total cross sections from a parametrisation. Good description from 10 KeV to (100/Z) GeV. - Scattered gamma energy according Klein-Nishina. - PhysicsTables from 1 keV to 100 GeV in 80 bins. - -conv: Total cross sections from a parametrisation. Good description from 1.5 MeV to 100 GeV for all Z. - e+e- energies according Bethe-Heitler - PhysicsTables from 1.022 MeV to 100 GeV in 100 bins. - -eBrem: Total cross sections from a NEW parametrisation based on the EEDL data library. - Good description from 1 KeV to 100 GeV. - log scale extrapolation above 100 GeV - Gamma energy sampled from a parametrised formula. - PhysicsTables from 1 keV to 100 TeV in 100 bins. - -eIoni: delta cross sections from Moller+Bhabha. Good description from 1 KeV to 100 GeV. - delta ray energy sampled from differential Xsection. - PhysicsTables from 1 keV to 100 TeV in 100 bins. - -msc: Tables of transport mean free paths. - New model of MSC , computes the lateral - displacement of the particle , too. - PhysicsTables from 100 eV to 100 TeV in 100 bins. - -annihil: Total cross section from Heilter formula(annihilation into 2 photons). - gamma energies sampled according Heitler - PhysicsTables from 10 keV to 10 TeV in 100 bins. - -annihil: Total cross section from Heilter formula(annihilation into 2 photons). - gamma energies sampled according Heitler - PhysicsTables from 10 keV to 10 TeV in 100 bins. - -hIoni: Knock-on electron cross sections . - Good description above the mean excitation energy. - delta ray energy sampled from differential Xsection. - PhysicsTables from 1 keV to 100 TeV in 100 bins. - -msc: Tables of transport mean free paths. - New model of MSC , computes the lateral - displacement of the particle , too. - PhysicsTables from 100 eV to 100 TeV in 100 bins. - -MuIoni: Knock-on electron cross sections . - Good description above the mean excitation energy. - delta ray energy sampled from differential Xsection. - PhysicsTables from 1 keV to 1000 PeV in 150 bins. - -MuBrems: theoretical cross section - Good description up to 1000 PeV. - PhysicsTables from 1 keV to 1000 PeV in 150 bins. - -MuPairProd: theoretical cross sections - Good description up to 1000 PeV. - PhysicsTables from 1 keV to 1000 PeV in 150 bins. - -msc: Tables of transport mean free paths. - New model of MSC , computes the lateral - displacement of the particle , too. - PhysicsTables from 100 eV to 100 TeV in 100 bins. -Visualization Manager instantiating... -Visualization Manager initialising... -Registering graphics systems... -* Visualizaton Driver: DAWN -* Visualizaton Driver: VRML1/2 -* Visualizaton Driver: VRML1/2 File - -You have successfully chosen to use the following graphics systems. -Current available graphics systems are: - ASCIITree (ATree) - DAWNFILE (DAWNFILE) - OpenGLImmediateX (OGLIX) - OpenGLStoredX (OGLSX) - OpenGLImmediateXm (OGLIXm) - OpenGLStoredXm (OGLSXm) - VRML1 (VRML1) - VRML2 (VRML2) - VRML1FILE (VRML1FILE) - VRML2FILE (VRML2FILE) - -current generator type: hepmcAscii -HepMC Ascii inputfile: data/example_MyPythia.dat -________________________________________________________________________________ -GenEvent: #1 ID=20 SignalProcessGenVertex Barcode: 0 - Current Memory Usage: 1 events, 78 vertices, 210 particles. - Entries this event: 78 vertices, 210 particles. - RndmState(0)= - Wgts(0)= - EventScale -1 GeV alphaQCD=-1 alphaQED=-1 - GenParticle Legend - Barcode PDG ID ( Px, Py, Pz, E ) Stat DecayVtx -________________________________________________________________________________ -GenVertex: -1 ID: 0 (X,cT):0 - I: 1 1 2212 +0.00e+00,+0.00e+00,+7.00e+03,+7.00e+03 3 -1 - O: 2 20 2101 +7.76e-01,+9.12e-01,+4.45e+03,+4.45e+03 2 -16 - 3 2 -7.76e-01,-9.12e-01,+1.88e+03,+1.88e+03 3 -3 -GenVertex: -2 ID: 0 (X,cT):0 - I: 1 2 2212 +0.00e+00,+0.00e+00,-7.00e+03,+7.00e+03 3 -2 - O: 3 13 2214 +1.00e-00,+2.73e-02,-4.08e+03,+4.08e+03 2 -9 - 4 -1 -1.01e+00,-1.27e-02,-4.15e+00,+4.27e+00 3 -4 - 26 1 +8.08e-03,-1.46e-02,-2.46e+03,+2.46e+03 2 -16 -GenVertex: -3 ID: 0 (X,cT):0 - I: 1 3 2 -7.76e-01,-9.12e-01,+1.88e+03,+1.88e+03 3 -3 - O: 4 5 2 -5.02e+00,+1.15e+00,+1.48e+03,+1.48e+03 3 -5 - 21 21 +1.46e+00,-3.91e-01,+1.09e+02,+1.09e+02 2 -16 - 22 21 +3.11e+00,+2.32e-01,+1.46e+02,+1.47e+02 2 -16 - 23 21 -1.09e-01,-1.87e+00,+8.61e+01,+8.61e+01 2 -16 -GenVertex: -4 ID: 0 (X,cT):0 - I: 1 4 -1 -1.01e+00,-1.27e-02,-4.15e+00,+4.27e+00 3 -4 - O: 3 6 -1 +2.54e-02,+8.35e+00,+6.60e-01,+8.37e+00 3 -5 - 24 21 -5.37e-01,-6.68e+00,+4.75e+01,+4.79e+01 2 -16 - 25 21 -7.11e-01,-1.71e+00,+1.08e+01,+1.10e+01 2 -16 -GenVertex: -5 ID: 0 (X,cT):0 - I: 2 5 2 -5.02e+00,+1.15e+00,+1.48e+03,+1.48e+03 3 -5 - 6 -1 +2.54e-02,+8.35e+00,+6.60e-01,+8.37e+00 3 -5 - O: 2 8 24 -9.67e-01,+1.07e+01,+1.23e+03,+1.24e+03 3 -7 - 7 22 -4.03e+00,-1.23e+00,+2.46e+02,+2.46e+02 3 -6 -GenVertex: -6 ID: 0 (X,cT):0 - I: 1 7 22 -4.03e+00,-1.23e+00,+2.46e+02,+2.46e+02 3 -6 - O: 1 9 22 -4.03e+00,-1.23e+00,+2.46e+02,+2.46e+02 1 (nil) -GenVertex: -7 ID: 0 (X,cT):0 - I: 1 8 24 -9.67e-01,+1.07e+01,+1.23e+03,+1.24e+03 3 -7 - O: 1 10 24 -9.67e-01,+1.07e+01,+1.23e+03,+1.24e+03 2 -8 -GenVertex: -8 ID: 0 (X,cT):0 - I: 1 10 24 -9.67e-01,+1.07e+01,+1.23e+03,+1.24e+03 2 -8 - O: 2 11 -13 -2.56e+01,+4.70e+01,+2.09e+02,+2.16e+02 1 (nil) - 12 14 +2.47e+01,-3.63e+01,+1.02e+03,+1.02e+03 1 (nil) -GenVertex: -9 ID: 0 (X,cT):0 - I: 1 13 2214 +1.00e-00,+2.73e-02,-4.08e+03,+4.08e+03 2 -9 - O: 2 29 2212 +1.02e+00,+1.18e-01,-3.74e+03,+3.74e+03 1 (nil) - 30 111 -2.46e-02,-9.09e-02,-3.46e+02,+3.46e+02 2 -20 -GenVertex: -10 ID: 0 (X,cT):0 - I: 2 14 1 +2.31e+00,+5.82e+00,+1.51e+02,+1.51e+02 2 -10 - 15 -1 -2.31e+00,-5.82e+00,+4.62e+01,+4.66e+01 2 -10 - O: 1 31 92 +0.00e+00,+0.00e+00,+1.97e+02,+1.97e+02 2 -11 -GenVertex: -11 ID: 0 (X,cT):0 - I: 1 31 92 +0.00e+00,+0.00e+00,+1.97e+02,+1.97e+02 2 -11 - O: 8 32 -211 +2.54e-01,+1.65e+00,+3.42e+01,+3.42e+01 1 (nil) - 33 211 +1.83e-01,-2.25e-01,+8.98e+00,+8.99e+00 1 (nil) - 34 -211 +1.65e+00,+3.36e+00,+8.55e+01,+8.56e+01 1 (nil) - 35 221 +1.53e-01,+1.01e-01,+1.68e+01,+1.68e+01 2 -21 - 36 211 -5.43e-01,+7.13e-02,+3.10e+00,+3.15e+00 1 (nil) - 37 221 -4.39e-01,-1.09e+00,+1.62e+01,+1.63e+01 2 -22 - 38 -213 -1.18e+00,-2.20e+00,+1.67e+01,+1.70e+01 2 -23 - 39 211 -8.40e-02,-1.67e+00,+1.53e+01,+1.54e+01 1 (nil) -GenVertex: -12 ID: 0 (X,cT):0 - I: 2 16 2 -3.95e+00,-1.33e+00,+3.41e+01,+3.44e+01 2 -12 - 17 -2 +3.95e+00,+1.33e+00,+4.38e+02,+4.38e+02 2 -12 - O: 1 40 92 +0.00e+00,+0.00e+00,+4.72e+02,+4.72e+02 2 -13 -GenVertex: -13 ID: 0 (X,cT):0 - I: 1 40 92 +0.00e+00,+0.00e+00,+4.72e+02,+4.72e+02 2 -13 - O: 8 41 221 -2.68e+00,-7.41e-01,+2.70e+01,+2.71e+01 2 -24 - 42 211 -1.08e+00,-1.77e-01,+8.94e+00,+9.00e+00 1 (nil) - 43 223 +7.31e-01,-2.42e-01,+2.97e+01,+2.97e+01 2 -25 - 44 -213 +6.83e-02,+2.16e-01,+2.67e+01,+2.67e+01 2 -26 - 45 211 -7.62e-02,+3.34e-01,+9.98e+00,+9.98e+00 1 (nil) - 46 223 +1.18e+00,+7.67e-03,+1.59e+02,+1.59e+02 2 -27 - 47 -213 +4.18e-01,+2.70e-01,+5.63e+01,+5.63e+01 2 -28 - 48 111 +1.44e+00,+3.32e-01,+1.54e+02,+1.54e+02 2 -29 -GenVertex: -14 ID: 0 (X,cT):0 - I: 2 18 2 +1.54e+00,+3.04e+00,-6.32e+01,+6.33e+01 2 -14 - 19 -2 -1.54e+00,-3.04e+00,-3.11e+02,+3.11e+02 2 -14 - O: 1 49 92 +0.00e+00,+0.00e+00,-3.75e+02,+3.75e+02 2 -15 -GenVertex: -15 ID: 0 (X,cT):0 - I: 1 49 92 +0.00e+00,+0.00e+00,-3.75e+02,+3.75e+02 2 -15 - O: 3 50 113 +1.57e+00,+2.83e+00,-6.11e+01,+6.12e+01 2 -30 - 51 211 +2.02e-01,+1.20e-01,-2.70e+01,+2.70e+01 1 (nil) - 52 -211 -1.77e+00,-2.95e+00,-2.86e+02,+2.86e+02 1 (nil) -GenVertex: -16 ID: 0 (X,cT):0 - I: 7 20 2101 +7.76e-01,+9.12e-01,+4.45e+03,+4.45e+03 2 -16 - 26 1 +8.08e-03,-1.46e-02,-2.46e+03,+2.46e+03 2 -16 - 21 21 +1.46e+00,-3.91e-01,+1.09e+02,+1.09e+02 2 -16 - 22 21 +3.11e+00,+2.32e-01,+1.46e+02,+1.47e+02 2 -16 - 23 21 -1.09e-01,-1.87e+00,+8.61e+01,+8.61e+01 2 -16 - 24 21 -5.37e-01,-6.68e+00,+4.75e+01,+4.79e+01 2 -16 - 25 21 -7.11e-01,-1.71e+00,+1.08e+01,+1.10e+01 2 -16 - O: 1 53 92 +3.99e+00,-9.52e+00,+2.38e+03,+7.31e+03 2 -17 -GenVertex: -17 ID: 0 (X,cT):0 - I: 1 53 92 +3.99e+00,-9.52e+00,+2.38e+03,+7.31e+03 2 -17 - O:31 54 2212 +8.22e-01,+7.58e-01,+2.86e+03,+2.86e+03 1 (nil) - 55 113 -3.60e-01,-1.69e-01,+8.62e+02,+8.62e+02 2 -31 - 56 -2214 +1.03e+00,+9.30e-02,+4.53e+02,+4.53e+02 2 -32 - 57 223 -3.60e-01,+4.04e-01,+1.25e+02,+1.25e+02 2 -33 - 58 2212 +1.68e+00,-6.25e-01,+1.57e+02,+1.57e+02 1 (nil) - 59 -213 +5.56e-01,+3.45e-01,+9.14e+01,+9.14e+01 2 -34 - 60 -311 +6.88e-02,-2.98e-02,+3.77e+01,+3.77e+01 2 -35 - 61 311 +5.59e-01,-2.32e-01,+5.88e+01,+5.88e+01 2 -36 - 62 211 +3.24e-01,-1.11e+00,+5.03e+01,+5.03e+01 1 (nil) - 63 113 -1.65e-02,-7.81e-02,+4.91e+00,+4.95e+00 2 -37 - 64 -211 +7.06e-01,-6.40e-01,+6.56e+01,+6.56e+01 1 (nil) - 65 213 +4.72e-01,-4.39e-01,+1.44e+01,+1.44e+01 2 -38 - 66 -213 -3.00e-01,-3.82e-01,+1.62e+01,+1.63e+01 2 -39 - 67 211 -4.39e-01,-3.19e+00,+2.48e+01,+2.50e+01 1 (nil) - 68 -211 -1.40e-01,-1.20e-01,+4.92e-01,+5.44e-01 1 (nil) - 69 -311 -2.66e-01,-2.65e+00,+2.07e+01,+2.08e+01 2 -40 - 70 323 +1.09e-01,-8.86e-01,+4.66e+00,+4.83e+00 2 -41 - 71 113 -4.98e-01,-2.28e-01,+1.70e+00,+1.96e+00 2 -42 - 72 -323 -2.90e-01,-2.30e-01,+6.43e-01,+1.16e+00 2 -43 - 73 311 +7.90e-02,-3.23e-02,-8.47e-01,+9.86e-01 2 -44 - 74 113 +1.28e-01,+1.79e-01,-7.07e-01,+1.09e+00 2 -45 - 75 -2112 +2.40e-01,-6.43e-01,-2.35e+00,+2.62e+00 1 (nil) - 76 2112 +1.43e-01,-2.20e-01,-2.23e+00,+2.43e+00 1 (nil) - 77 221 -1.58e-01,+9.23e-01,-1.12e+01,+1.12e+01 2 -46 - 78 211 -3.97e-01,-5.01e-01,-1.11e+00,+1.29e+00 1 (nil) - 79 111 +2.87e-01,+2.82e-01,-1.04e+00,+1.12e+00 2 -47 - 80 223 +4.06e-01,-2.45e-01,-3.51e+01,+3.51e+01 2 -48 - 81 -321 -6.14e-01,+2.77e-01,-2.28e+02,+2.28e+02 1 (nil) - 82 323 +1.26e-01,-3.07e-01,-1.50e+03,+1.50e+03 2 -49 - 83 -321 +1.94e-01,+2.93e-01,-1.69e+02,+1.69e+02 1 (nil) - 84 311 -9.36e-02,-1.11e-01,-5.09e+02,+5.09e+02 2 -50 -GenVertex: -18 ID: 0 (X,cT):0 - I: 2 27 21 -1.37e-01,-5.99e+00,-1.38e+01,+1.51e+01 2 -18 - 28 21 +1.37e-01,+5.99e+00,-6.12e+01,+6.15e+01 2 -18 - O: 1 85 92 +0.00e+00,+0.00e+00,-7.51e+01,+7.66e+01 2 -19 -GenVertex: -19 ID: 0 (X,cT):0 - I: 1 85 92 +0.00e+00,+0.00e+00,-7.51e+01,+7.66e+01 2 -19 - O: 9 86 -2112 -3.84e-02,-2.48e+00,-7.98e+00,+8.41e+00 1 (nil) - 87 2212 +1.88e-01,-2.14e+00,-4.49e+00,+5.07e+00 1 (nil) - 88 -213 +2.00e-01,-1.11e-01,-1.66e+00,+1.83e+00 2 -51 - 89 -313 -6.26e-01,+1.37e+00,-1.29e+01,+1.30e+01 2 -52 - 90 321 +7.89e-02,+7.45e-01,-1.09e+01,+1.10e+01 1 (nil) - 91 -211 +4.23e-02,+3.92e-01,-8.74e+00,+8.75e+00 1 (nil) - 92 211 +6.44e-02,+3.67e-01,-1.38e+00,+1.43e+00 1 (nil) - 93 -2212 +4.16e-02,+5.64e-01,-1.20e+01,+1.20e+01 1 (nil) - 94 2112 +4.92e-02,+1.30e+00,-1.50e+01,+1.51e+01 1 (nil) -Vertex: -20 ID: 0 (X,cT)=-7.43e-06,-2.74e-05,-1.04e-01,+1.04e-01 - I: 1 30 111 -2.46e-02,-9.09e-02,-3.46e+02,+3.46e+02 2 -20 - O: 2 95 22 -4.57e-02,-1.20e-01,-2.72e+02,+2.72e+02 1 (nil) - 96 22 +2.11e-02,+2.92e-02,-7.38e+01,+7.38e+01 1 (nil) -GenVertex: -21 ID: 0 (X,cT):0 - I: 1 35 221 +1.53e-01,+1.01e-01,+1.68e+01,+1.68e+01 2 -21 - O: 3 97 211 +1.91e-01,+1.34e-01,+6.86e+00,+6.86e+00 1 (nil) - 98 -211 -4.99e-02,-5.38e-02,+4.31e+00,+4.31e+00 1 (nil) - 99 111 +1.27e-02,+2.08e-02,+5.61e+00,+5.61e+00 2 -53 -GenVertex: -22 ID: 0 (X,cT):0 - I: 1 37 221 -4.39e-01,-1.09e+00,+1.62e+01,+1.63e+01 2 -22 - O: 3 100 111 +2.02e-02,-1.98e-01,+2.68e+00,+2.69e+00 2 -54 - 101 111 -1.94e-01,-3.08e-01,+5.97e+00,+5.98e+00 2 -55 - 102 111 -2.65e-01,-5.85e-01,+7.55e+00,+7.58e+00 2 -56 -GenVertex: -23 ID: 0 (X,cT):0 - I: 1 38 -213 -1.18e+00,-2.20e+00,+1.67e+01,+1.70e+01 2 -23 - O: 2 103 -211 +5.93e-02,-7.99e-01,+3.99e+00,+4.07e+00 1 (nil) - 104 111 -1.24e+00,-1.40e+00,+1.27e+01,+1.29e+01 2 -57 -GenVertex: -24 ID: 0 (X,cT):0 - I: 1 41 221 -2.68e+00,-7.41e-01,+2.70e+01,+2.71e+01 2 -24 - O: 2 105 22 -6.34e-03,-7.93e-02,+8.01e-01,+8.05e-01 1 (nil) - 106 22 -2.67e+00,-6.61e-01,+2.62e+01,+2.63e+01 1 (nil) -GenVertex: -25 ID: 0 (X,cT):0 - I: 1 43 223 +7.31e-01,-2.42e-01,+2.97e+01,+2.97e+01 2 -25 - O: 3 107 -211 +1.76e-02,+3.37e-02,+3.20e+00,+3.21e+00 1 (nil) - 108 211 +3.94e-01,+9.73e-02,+1.40e+01,+1.40e+01 1 (nil) - 109 111 +3.20e-01,-3.73e-01,+1.25e+01,+1.25e+01 2 -58 -GenVertex: -26 ID: 0 (X,cT):0 - I: 1 44 -213 +6.83e-02,+2.16e-01,+2.67e+01,+2.67e+01 2 -26 - O: 2 110 -211 -8.41e-02,-1.88e-01,+1.75e+01,+1.75e+01 1 (nil) - 111 111 +1.52e-01,+4.04e-01,+9.17e+00,+9.18e+00 2 -59 -GenVertex: -27 ID: 0 (X,cT):0 - I: 1 46 223 +1.18e+00,+7.67e-03,+1.59e+02,+1.59e+02 2 -27 - O: 3 112 -211 +4.71e-01,+6.85e-02,+4.92e+01,+4.92e+01 1 (nil) - 113 211 +5.97e-01,-1.23e-01,+1.01e+02,+1.01e+02 1 (nil) - 114 111 +1.09e-01,+6.20e-02,+9.26e+00,+9.26e+00 2 -60 -GenVertex: -28 ID: 0 (X,cT):0 - I: 1 47 -213 +4.18e-01,+2.70e-01,+5.63e+01,+5.63e+01 2 -28 - O: 2 115 -211 +4.07e-02,+6.55e-03,+6.59e+00,+6.59e+00 1 (nil) - 116 111 +3.77e-01,+2.64e-01,+4.98e+01,+4.98e+01 2 -61 -Vertex: -29 ID: 0 (X,cT)=+3.69e-04,+8.53e-05,+3.95e-02,+3.95e-02 - I: 1 48 111 +1.44e+00,+3.32e-01,+1.54e+02,+1.54e+02 2 -29 - O: 2 117 22 +4.72e-01,+4.59e-02,+5.06e+01,+5.06e+01 1 (nil) - 118 22 +9.67e-01,+2.86e-01,+1.03e+02,+1.03e+02 1 (nil) -GenVertex: -30 ID: 0 (X,cT):0 - I: 1 50 113 +1.57e+00,+2.83e+00,-6.11e+01,+6.12e+01 2 -30 - O: 2 119 -211 +9.16e-01,+2.13e+00,-4.37e+01,+4.38e+01 1 (nil) - 120 211 +6.49e-01,+7.08e-01,-1.74e+01,+1.75e+01 1 (nil) -GenVertex: -31 ID: 0 (X,cT):0 - I: 1 55 113 -3.60e-01,-1.69e-01,+8.62e+02,+8.62e+02 2 -31 - O: 2 121 211 -1.07e-01,+4.26e-02,+1.56e+02,+1.56e+02 1 (nil) - 122 -211 -2.53e-01,-2.12e-01,+7.07e+02,+7.07e+02 1 (nil) -GenVertex: -32 ID: 0 (X,cT):0 - I: 1 56 -2214 +1.03e+00,+9.30e-02,+4.53e+02,+4.53e+02 2 -32 - O: 2 123 -2212 +4.99e-01,+1.49e-01,+3.29e+02,+3.29e+02 1 (nil) - 124 111 +5.28e-01,-5.58e-02,+1.24e+02,+1.24e+02 2 -62 -GenVertex: -33 ID: 0 (X,cT):0 - I: 1 57 223 -3.60e-01,+4.04e-01,+1.25e+02,+1.25e+02 2 -33 - O: 3 125 211 -1.22e-01,+3.51e-01,+3.18e+01,+3.18e+01 1 (nil) - 126 -211 -2.21e-01,+7.11e-02,+8.21e+01,+8.21e+01 1 (nil) - 127 111 -1.66e-02,-1.80e-02,+1.09e+01,+1.09e+01 2 -63 -GenVertex: -34 ID: 0 (X,cT):0 - I: 1 59 -213 +5.56e-01,+3.45e-01,+9.14e+01,+9.14e+01 2 -34 - O: 2 128 -211 +3.11e-01,+3.56e-01,+3.44e+01,+3.44e+01 1 (nil) - 129 111 +2.45e-01,-1.18e-02,+5.70e+01,+5.70e+01 2 -64 -GenVertex: -35 ID: 0 (X,cT):0 - I: 1 60 -311 +6.88e-02,-2.98e-02,+3.77e+01,+3.77e+01 2 -35 - O: 1 130 310 +6.88e-02,-2.98e-02,+3.77e+01,+3.77e+01 2 -65 -GenVertex: -36 ID: 0 (X,cT):0 - I: 1 61 311 +5.59e-01,-2.32e-01,+5.88e+01,+5.88e+01 2 -36 - O: 1 131 130 +5.59e-01,-2.32e-01,+5.88e+01,+5.88e+01 1 (nil) -GenVertex: -37 ID: 0 (X,cT):0 - I: 1 63 113 -1.65e-02,-7.81e-02,+4.91e+00,+4.95e+00 2 -37 - O: 2 132 211 +1.08e-01,-5.14e-02,+4.37e+00,+4.38e+00 1 (nil) - 133 -211 -1.25e-01,-2.68e-02,+5.37e-01,+5.69e-01 1 (nil) -GenVertex: -38 ID: 0 (X,cT):0 - I: 1 65 213 +4.72e-01,-4.39e-01,+1.44e+01,+1.44e+01 2 -38 - O: 2 134 211 +1.82e-01,-5.33e-01,+1.18e+01,+1.18e+01 1 (nil) - 135 111 +2.91e-01,+9.43e-02,+2.56e+00,+2.58e+00 2 -66 -GenVertex: -39 ID: 0 (X,cT):0 - I: 1 66 -213 -3.00e-01,-3.82e-01,+1.62e+01,+1.63e+01 2 -39 - O: 2 136 -211 -4.94e-01,-2.13e-01,+6.74e+00,+6.77e+00 1 (nil) - 137 111 +1.93e-01,-1.69e-01,+9.48e+00,+9.49e+00 2 -67 -GenVertex: -40 ID: 0 (X,cT):0 - I: 1 69 -311 -2.66e-01,-2.65e+00,+2.07e+01,+2.08e+01 2 -40 - O: 1 138 130 -2.66e-01,-2.65e+00,+2.07e+01,+2.08e+01 1 (nil) -GenVertex: -41 ID: 0 (X,cT):0 - I: 1 70 323 +1.09e-01,-8.86e-01,+4.66e+00,+4.83e+00 2 -41 - O: 2 139 311 -4.56e-02,-1.94e-01,+1.85e+00,+1.93e+00 2 -68 - 140 211 +1.54e-01,-6.92e-01,+2.81e+00,+2.90e+00 1 (nil) -GenVertex: -42 ID: 0 (X,cT):0 - I: 1 71 113 -4.98e-01,-2.28e-01,+1.70e+00,+1.96e+00 2 -42 - O: 2 141 211 +7.24e-02,-1.33e-01,+6.29e-02,+2.15e-01 1 (nil) - 142 -211 -5.70e-01,-9.51e-02,+1.64e+00,+1.75e+00 1 (nil) -GenVertex: -43 ID: 0 (X,cT):0 - I: 1 72 -323 -2.90e-01,-2.30e-01,+6.43e-01,+1.16e+00 2 -43 - O: 2 143 -311 -1.02e-01,-3.76e-01,+2.53e-01,+6.81e-01 2 -69 - 144 -211 -1.88e-01,+1.45e-01,+3.90e-01,+4.77e-01 1 (nil) -GenVertex: -44 ID: 0 (X,cT):0 - I: 1 73 311 +7.90e-02,-3.23e-02,-8.47e-01,+9.86e-01 2 -44 - O: 1 145 310 +7.90e-02,-3.23e-02,-8.47e-01,+9.86e-01 2 -70 -GenVertex: -45 ID: 0 (X,cT):0 - I: 1 74 113 +1.28e-01,+1.79e-01,-7.07e-01,+1.09e+00 2 -45 - O: 2 146 -211 -7.31e-02,+3.05e-01,-7.33e-01,+8.10e-01 1 (nil) - 147 211 +2.01e-01,-1.27e-01,+2.56e-02,+2.77e-01 1 (nil) -GenVertex: -46 ID: 0 (X,cT):0 - I: 1 77 221 -1.58e-01,+9.23e-01,-1.12e+01,+1.12e+01 2 -46 - O: 3 148 -211 -1.37e-01,+2.12e-01,-2.48e+00,+2.50e+00 1 (nil) - 149 211 -6.29e-02,+5.66e-01,-6.65e+00,+6.68e+00 1 (nil) - 150 111 +4.20e-02,+1.44e-01,-2.05e+00,+2.06e+00 2 -71 -Vertex: -47 ID: 0 (X,cT)=+2.15e-05,+2.11e-05,-7.77e-05,+8.40e-05 - I: 1 79 111 +2.87e-01,+2.82e-01,-1.04e+00,+1.12e+00 2 -47 - O: 2 151 22 +1.31e-01,+1.64e-01,-6.99e-01,+7.30e-01 1 (nil) - 152 22 +1.57e-01,+1.18e-01,-3.38e-01,+3.91e-01 1 (nil) -GenVertex: -48 ID: 0 (X,cT):0 - I: 1 80 223 +4.06e-01,-2.45e-01,-3.51e+01,+3.51e+01 2 -48 - O: 2 153 -211 -6.79e-02,+2.16e-01,-6.21e+00,+6.22e+00 1 (nil) - 154 211 +4.74e-01,-4.61e-01,-2.89e+01,+2.89e+01 1 (nil) -GenVertex: -49 ID: 0 (X,cT):0 - I: 1 82 323 +1.26e-01,-3.07e-01,-1.50e+03,+1.50e+03 2 -49 - O: 2 155 321 +2.70e-01,-1.79e-01,-6.57e+02,+6.57e+02 1 (nil) - 156 111 -1.45e-01,-1.29e-01,-8.42e+02,+8.42e+02 2 -72 -GenVertex: -50 ID: 0 (X,cT):0 - I: 1 84 311 -9.36e-02,-1.11e-01,-5.09e+02,+5.09e+02 2 -50 - O: 1 157 130 -9.36e-02,-1.11e-01,-5.09e+02,+5.09e+02 1 (nil) -GenVertex: -51 ID: 0 (X,cT):0 - I: 1 88 -213 +2.00e-01,-1.11e-01,-1.66e+00,+1.83e+00 2 -51 - O: 2 158 -211 -1.33e-01,-2.94e-01,-9.51e-01,+1.01e+00 1 (nil) - 159 111 +3.33e-01,+1.83e-01,-7.05e-01,+8.13e-01 2 -73 -GenVertex: -52 ID: 0 (X,cT):0 - I: 1 89 -313 -6.26e-01,+1.37e+00,-1.29e+01,+1.30e+01 2 -52 - O: 2 160 -311 -2.82e-02,+5.68e-01,-5.71e+00,+5.76e+00 2 -74 - 161 111 -5.98e-01,+7.99e-01,-7.16e+00,+7.23e+00 2 -75 -Vertex: -53 ID: 0 (X,cT)=+6.33e-07,+1.04e-06,+2.79e-04,+2.79e-04 - I: 1 99 111 +1.27e-02,+2.08e-02,+5.61e+00,+5.61e+00 2 -53 - O: 2 162 22 +5.81e-02,+5.34e-02,+3.78e+00,+3.78e+00 1 (nil) - 163 22 -4.54e-02,-3.26e-02,+1.83e+00,+1.83e+00 1 (nil) -Vertex: -54 ID: 0 (X,cT)=+3.79e-06,-3.71e-05,+5.03e-04,+5.05e-04 - I: 1 100 111 +2.02e-02,-1.98e-01,+2.68e+00,+2.69e+00 2 -54 - O: 2 164 22 +2.39e-02,-9.50e-02,+2.06e+00,+2.06e+00 1 (nil) - 165 22 -3.65e-03,-1.03e-01,+6.27e-01,+6.35e-01 1 (nil) -Vertex: -55 ID: 0 (X,cT)=-2.82e-05,-4.46e-05,+8.64e-04,+8.66e-04 - I: 1 101 111 -1.94e-01,-3.08e-01,+5.97e+00,+5.98e+00 2 -55 - O: 2 166 22 -2.13e-01,-2.53e-01,+5.08e+00,+5.10e+00 1 (nil) - 167 22 +1.82e-02,-5.48e-02,+8.85e-01,+8.87e-01 1 (nil) -Vertex: -56 ID: 0 (X,cT)=-1.01e-04,-2.22e-04,+2.87e-03,+2.88e-03 - I: 1 102 111 -2.65e-01,-5.85e-01,+7.55e+00,+7.58e+00 2 -56 - O: 2 168 22 -2.34e-01,-3.64e-01,+4.90e+00,+4.92e+00 1 (nil) - 169 22 -3.04e-02,-2.21e-01,+2.65e+00,+2.66e+00 1 (nil) -Vertex: -57 ID: 0 (X,cT)=-2.73e-04,-3.09e-04,+2.81e-03,+2.84e-03 - I: 1 104 111 -1.24e+00,-1.40e+00,+1.27e+01,+1.29e+01 2 -57 - O: 2 170 22 -1.22e-02,-1.70e-02,+7.27e-02,+7.56e-02 1 (nil) - 171 22 -1.22e+00,-1.38e+00,+1.27e+01,+1.28e+01 1 (nil) -Vertex: -58 ID: 0 (X,cT)=+7.51e-05,-8.77e-05,+2.93e-03,+2.94e-03 - I: 1 109 111 +3.20e-01,-3.73e-01,+1.25e+01,+1.25e+01 2 -58 - O: 2 172 22 +3.26e-01,-3.46e-01,+1.21e+01,+1.21e+01 1 (nil) - 173 22 -6.46e-03,-2.66e-02,+3.50e-01,+3.51e-01 1 (nil) -Vertex: -59 ID: 0 (X,cT)=+1.45e-06,+3.84e-06,+8.70e-05,+8.71e-05 - I: 1 111 111 +1.52e-01,+4.04e-01,+9.17e+00,+9.18e+00 2 -59 - O: 2 174 22 -2.15e-02,+1.49e-02,+4.86e-01,+4.86e-01 1 (nil) - 175 22 +1.74e-01,+3.89e-01,+8.68e+00,+8.69e+00 1 (nil) -Vertex: -60 ID: 0 (X,cT)=+1.34e-05,+7.65e-06,+1.14e-03,+1.14e-03 - I: 1 114 111 +1.09e-01,+6.20e-02,+9.26e+00,+9.26e+00 2 -60 - O: 2 176 22 -1.64e-02,+4.04e-02,+4.24e+00,+4.24e+00 1 (nil) - 177 22 +1.25e-01,+2.17e-02,+5.02e+00,+5.02e+00 1 (nil) -Vertex: -61 ID: 0 (X,cT)=+1.85e-05,+1.29e-05,+2.43e-03,+2.43e-03 - I: 1 116 111 +3.77e-01,+2.64e-01,+4.98e+01,+4.98e+01 2 -61 - O: 2 178 22 +1.08e-01,+2.89e-02,+7.90e+00,+7.91e+00 1 (nil) - 179 22 +2.70e-01,+2.35e-01,+4.19e+01,+4.19e+01 1 (nil) -Vertex: -62 ID: 0 (X,cT)=+5.58e-05,-5.89e-06,+1.31e-02,+1.31e-02 - I: 1 124 111 +5.28e-01,-5.58e-02,+1.24e+02,+1.24e+02 2 -62 - O: 2 180 22 +2.10e-01,+4.29e-02,+4.58e+01,+4.58e+01 1 (nil) - 181 22 +3.18e-01,-9.86e-02,+7.82e+01,+7.82e+01 1 (nil) -Vertex: -63 ID: 0 (X,cT)=-7.71e-06,-8.34e-06,+5.03e-03,+5.03e-03 - I: 1 127 111 -1.66e-02,-1.80e-02,+1.09e+01,+1.09e+01 2 -63 - O: 2 182 22 -6.61e-02,-4.57e-02,+6.07e+00,+6.07e+00 1 (nil) - 183 22 +4.94e-02,+2.77e-02,+4.78e+00,+4.78e+00 1 (nil) -Vertex: -64 ID: 0 (X,cT)=+1.66e-05,-7.99e-07,+3.86e-03,+3.86e-03 - I: 1 129 111 +2.45e-01,-1.18e-02,+5.70e+01,+5.70e+01 2 -64 - O: 2 184 22 +1.69e-01,+5.36e-02,+3.26e+01,+3.26e+01 1 (nil) - 185 22 +7.62e-02,-6.54e-02,+2.44e+01,+2.44e+01 1 (nil) -Vertex: -65 ID: 0 (X,cT)=+7.56e+00,-3.28e+00,+4.14e+03,+4.14e+03 - I: 1 130 310 +6.88e-02,-2.98e-02,+3.77e+01,+3.77e+01 2 -65 - O: 2 186 211 +1.58e-01,-6.43e-02,+3.22e+01,+3.22e+01 1 (nil) - 187 -211 -8.94e-02,+3.44e-02,+5.50e+00,+5.50e+00 1 (nil) -Vertex: -66 ID: 0 (X,cT)=+2.53e-06,+8.21e-07,+2.23e-05,+2.25e-05 - I: 1 135 111 +2.91e-01,+9.43e-02,+2.56e+00,+2.58e+00 2 -66 - O: 2 188 22 +1.27e-02,-2.62e-02,+3.17e-01,+3.18e-01 1 (nil) - 189 22 +2.78e-01,+1.20e-01,+2.24e+00,+2.26e+00 1 (nil) -Vertex: -67 ID: 0 (X,cT)=+1.37e-04,-1.19e-04,+6.70e-03,+6.70e-03 - I: 1 137 111 +1.93e-01,-1.69e-01,+9.48e+00,+9.49e+00 2 -67 - O: 2 190 22 +3.61e-04,+4.27e-04,-3.17e-04,+6.42e-04 1 (nil) - 191 22 +1.93e-01,-1.69e-01,+9.49e+00,+9.49e+00 1 (nil) -GenVertex: -68 ID: 0 (X,cT):0 - I: 1 139 311 -4.56e-02,-1.94e-01,+1.85e+00,+1.93e+00 2 -68 - O: 1 192 310 -4.56e-02,-1.94e-01,+1.85e+00,+1.93e+00 2 -76 -GenVertex: -69 ID: 0 (X,cT):0 - I: 1 143 -311 -1.02e-01,-3.76e-01,+2.53e-01,+6.81e-01 2 -69 - O: 1 193 310 -1.02e-01,-3.76e-01,+2.53e-01,+6.81e-01 2 -77 -Vertex: -70 ID: 0 (X,cT)=+5.44e+00,-2.22e+00,-5.83e+01,+6.79e+01 - I: 1 145 310 +7.90e-02,-3.23e-02,-8.47e-01,+9.86e-01 2 -70 - O: 2 194 211 +3.78e-02,+1.72e-01,-5.70e-01,+6.12e-01 1 (nil) - 195 -211 +4.12e-02,-2.04e-01,-2.77e-01,+3.74e-01 1 (nil) -Vertex: -71 ID: 0 (X,cT)=+8.77e-06,+3.01e-05,-4.27e-04,+4.30e-04 - I: 1 150 111 +4.20e-02,+1.44e-01,-2.05e+00,+2.06e+00 2 -71 - O: 2 196 22 +2.27e-02,+1.42e-01,-1.05e+00,+1.06e+00 1 (nil) - 197 22 +1.93e-02,+2.42e-03,-9.95e-01,+9.95e-01 1 (nil) -Vertex: -72 ID: 0 (X,cT)=-6.15e-05,-5.48e-05,-3.58e-01,+3.58e-01 - I: 1 156 111 -1.45e-01,-1.29e-01,-8.42e+02,+8.42e+02 2 -72 - O: 2 198 22 -1.62e-01,-1.30e-01,-6.73e+02,+6.73e+02 1 (nil) - 199 22 +1.77e-02,+1.35e-03,-1.69e+02,+1.69e+02 1 (nil) -Vertex: -73 ID: 0 (X,cT)=+1.59e-06,+8.76e-07,-3.37e-06,+3.89e-06 - I: 1 159 111 +3.33e-01,+1.83e-01,-7.05e-01,+8.13e-01 2 -73 - O: 2 200 22 +1.34e-01,+3.84e-02,-1.48e-01,+2.03e-01 1 (nil) - 201 22 +1.99e-01,+1.45e-01,-5.58e-01,+6.10e-01 1 (nil) -GenVertex: -74 ID: 0 (X,cT):0 - I: 1 160 -311 -2.82e-02,+5.68e-01,-5.71e+00,+5.76e+00 2 -74 - O: 1 202 310 -2.82e-02,+5.68e-01,-5.71e+00,+5.76e+00 2 -78 -Vertex: -75 ID: 0 (X,cT)=-2.71e-05,+3.62e-05,-3.25e-04,+3.28e-04 - I: 1 161 111 -5.98e-01,+7.99e-01,-7.16e+00,+7.23e+00 2 -75 - O: 2 203 22 -4.61e-01,+6.62e-01,-6.07e+00,+6.13e+00 1 (nil) - 204 22 -1.37e-01,+1.37e-01,-1.09e+00,+1.10e+00 1 (nil) -Vertex: -76 ID: 0 (X,cT)=-2.44e+00,-1.04e+01,+9.94e+01,+1.04e+02 - I: 1 192 310 -4.56e-02,-1.94e-01,+1.85e+00,+1.93e+00 2 -76 - O: 2 205 -211 -6.12e-02,+7.90e-02,+2.98e-01,+3.44e-01 1 (nil) - 206 211 +1.56e-02,-2.73e-01,+1.56e+00,+1.59e+00 1 (nil) -Vertex: -77 ID: 0 (X,cT)=-1.49e+01,-5.46e+01,+3.68e+01,+9.90e+01 - I: 1 193 310 -1.02e-01,-3.76e-01,+2.53e-01,+6.81e-01 2 -77 - O: 2 207 -211 -2.41e-01,-3.27e-01,+1.77e-01,+4.65e-01 1 (nil) - 208 211 +1.38e-01,-4.84e-02,+7.57e-02,+2.16e-01 1 (nil) -Vertex: -78 ID: 0 (X,cT)=-1.33e-01,+2.68e+00,-2.69e+01,+2.71e+01 - I: 1 202 310 -2.82e-02,+5.68e-01,-5.71e+00,+5.76e+00 2 -78 - O: 2 209 211 +5.42e-02,+4.89e-01,-5.04e+00,+5.07e+00 1 (nil) - 210 -211 -8.24e-02,+7.87e-02,-6.67e-01,+6.91e-01 1 (nil) -________________________________________________________________________________ - Print out hit information ------------------------------------------- -*** Muon System Hit (#hits=3) -E1 : e- : pT=0.00117 : TOF=28.3 : x=(-0.279,1.77,-7.9) -E0 : pi+ : pT=3.22 : TOF=26.6 : x=(-0.175,-1.01,7.9) -E0 : mu+ : pT=52 : TOF=27.2 : x=(-0.96,1.78,7.9) - -________________________________________________________________________________ -GenEvent: #2 ID=20 SignalProcessGenVertex Barcode: 0 - Current Memory Usage: 1 events, 224 vertices, 624 particles. - Entries this event: 224 vertices, 624 particles. - RndmState(0)= - Wgts(0)= - EventScale -1 GeV alphaQCD=-1 alphaQED=-1 - GenParticle Legend - Barcode PDG ID ( Px, Py, Pz, E ) Stat DecayVtx -________________________________________________________________________________ -GenVertex: -1 ID: 0 (X,cT):0 - I: 1 1 2212 +0.00e+00,+0.00e+00,+7.00e+03,+7.00e+03 3 -1 - O: 3 3 21 +2.24e-03,-3.47e-01,+8.58e+00,+8.58e+00 3 -3 - 13 1 -1.60e-01,+2.55e-01,+4.51e+02,+4.51e+02 2 -9 - 41 2203 +1.57e-01,+9.19e-02,+4.12e+03,+4.12e+03 2 -13 -GenVertex: -2 ID: 0 (X,cT):0 - I: 1 2 2212 +0.00e+00,+0.00e+00,-7.00e+03,+7.00e+03 3 -2 - O: 2 4 1 +1.81e-01,-9.21e-01,-1.91e+03,+1.91e+03 3 -4 - 39 2203 -1.81e-01,+9.21e-01,-4.33e+03,+4.33e+03 2 -11 -GenVertex: -3 ID: 0 (X,cT):0 - I: 1 3 21 +2.24e-03,-3.47e-01,+8.58e+00,+8.58e+00 3 -3 - O: 8 5 -2 -1.22e+01,+1.16e+00,-1.11e+01,+1.65e+01 3 -5 - 11 -4 +1.95e+00,-1.06e+00,-8.18e+00,+8.61e+00 2 -9 - 12 21 +1.85e+00,+6.48e+00,-3.61e+01,+3.67e+01 2 -9 - 14 4 +1.07e+01,-5.18e+00,-2.71e+01,+2.96e+01 2 -11 - 15 21 +3.52e-01,-6.45e-01,-1.11e+00,+1.33e+00 2 -11 - 16 21 +3.32e-02,+9.61e-02,-6.60e-02,+1.21e-01 2 -11 - 17 21 -3.76e-02,-1.65e-01,-9.73e-01,+9.88e-01 2 -11 - 40 2 -5.76e-01,-2.17e+00,+2.82e+00,+3.62e+00 2 -13 -GenVertex: -4 ID: 0 (X,cT):0 - I: 1 4 1 +1.81e-01,-9.21e-01,-1.91e+03,+1.91e+03 3 -4 - O:12 35 21 -3.17e+00,-1.74e+00,-8.38e+01,+8.39e+01 2 -11 - 38 21 +2.18e+00,-6.98e-01,-1.55e+02,+1.55e+02 2 -11 - 36 21 -3.72e-01,-3.53e+00,-1.09e+02,+1.09e+02 2 -11 - 6 1 -1.04e+01,-7.53e+00,-8.52e+02,+8.53e+02 3 -5 - 28 21 +8.30e-01,+1.28e+00,-3.84e+01,+3.84e+01 2 -11 - 29 21 +1.45e+00,+3.41e+00,-3.48e+01,+3.50e+01 2 -11 - 30 21 +4.75e+00,+5.08e+00,-7.07e+01,+7.11e+01 2 -11 - 31 21 +7.05e+00,+5.30e+00,-7.09e+01,+7.14e+01 2 -11 - 32 21 +6.43e-05,-2.87e-01,-2.01e+00,+2.03e+00 2 -11 - 33 21 -2.01e+00,+1.84e-01,-1.00e+02,+1.00e+02 2 -11 - 34 21 -1.92e+00,-1.52e+00,-2.29e+02,+2.29e+02 2 -11 - 37 21 -3.12e-01,+2.46e-01,-7.86e+01,+7.86e+01 2 -11 -GenVertex: -5 ID: 0 (X,cT):0 - I: 2 5 -2 -1.22e+01,+1.16e+00,-1.11e+01,+1.65e+01 3 -5 - 6 1 -1.04e+01,-7.53e+00,-8.52e+02,+8.53e+02 3 -5 - O: 2 7 22 -1.33e+01,-8.08e+00,-1.04e+02,+1.05e+02 3 -6 - 8 -24 -9.28e+00,+1.71e+00,-7.59e+02,+7.64e+02 3 -7 -GenVertex: -6 ID: 0 (X,cT):0 - I: 1 7 22 -1.33e+01,-8.08e+00,-1.04e+02,+1.05e+02 3 -6 - O: 1 9 22 -1.33e+01,-8.08e+00,-1.04e+02,+1.05e+02 1 (nil) -GenVertex: -7 ID: 0 (X,cT):0 - I: 1 8 -24 -9.28e+00,+1.71e+00,-7.59e+02,+7.64e+02 3 -7 - O: 1 10 -24 -9.28e+00,+1.71e+00,-7.59e+02,+7.64e+02 2 -8 -GenVertex: -8 ID: 0 (X,cT):0 - I: 1 10 -24 -9.28e+00,+1.71e+00,-7.59e+02,+7.64e+02 2 -8 - O: 6 43 21 -1.27e+00,-7.35e-02,-1.13e+01,+1.14e+01 2 -15 - 44 21 -4.16e-02,-2.47e-01,-1.97e+00,+1.98e+00 2 -15 - 45 21 +9.29e-01,-5.25e-01,-8.27e+00,+8.34e+00 2 -15 - 42 -4 -3.64e+01,+2.35e+01,-3.49e+02,+3.52e+02 2 -15 - 46 21 +2.59e+00,-1.54e+00,-4.01e+01,+4.02e+01 2 -15 - 47 3 +2.49e+01,-1.94e+01,-3.48e+02,+3.50e+02 2 -15 -GenVertex: -9 ID: 0 (X,cT):0 - I: 3 13 1 -1.60e-01,+2.55e-01,+4.51e+02,+4.51e+02 2 -9 - 11 -4 +1.95e+00,-1.06e+00,-8.18e+00,+8.61e+00 2 -9 - 12 21 +1.85e+00,+6.48e+00,-3.61e+01,+3.67e+01 2 -9 - O: 1 52 92 +3.65e+00,+5.68e+00,+4.07e+02,+4.96e+02 2 -10 -GenVertex: -10 ID: 0 (X,cT):0 - I: 1 52 92 +3.65e+00,+5.68e+00,+4.07e+02,+4.96e+02 2 -10 - O:17 54 -323 +5.03e-01,+1.51e+00,-6.41e+00,+6.67e+00 2 -22 - 64 -213 -3.57e-01,-2.47e-01,+4.39e+00,+4.44e+00 2 -32 - 65 211 -9.70e-03,-2.00e-01,+9.73e-01,+1.00e+00 1 (nil) - 66 -213 +3.60e-01,-1.91e-02,+2.45e+01,+2.45e+01 2 -33 - 55 313 +6.48e-01,+1.70e+00,-1.25e+01,+1.27e+01 2 -23 - 58 213 +1.90e-01,+8.19e-01,-3.63e+00,+3.80e+00 2 -26 - 59 223 +4.76e-01,+3.30e-01,-1.30e+00,+1.62e+00 2 -27 - 60 -323 -1.01e-01,+5.65e-03,+1.73e-01,+8.22e-01 2 -28 - 68 113 -9.06e-02,+1.63e-01,+1.67e+02,+1.67e+02 2 -35 - 56 113 +3.14e-01,+1.06e+00,-3.82e+00,+4.04e+00 2 -24 - 57 223 +8.27e-03,+4.69e-01,-5.55e+00,+5.62e+00 2 -25 - 67 113 -3.73e-01,+1.18e-02,+3.83e+01,+3.84e+01 2 -34 - 61 313 -7.71e-02,+3.71e-01,+6.58e-01,+1.14e+00 2 -29 - 62 213 -3.58e-01,-1.85e-01,+2.02e-01,+7.59e-01 2 -30 - 63 221 +5.37e-01,+2.24e-01,+7.68e+00,+7.72e+00 2 -31 - 69 221 +1.73e-01,+4.07e-01,+2.06e+02,+2.06e+02 2 -36 - 53 -423 +1.80e+00,-7.41e-01,-9.90e+00,+1.03e+01 2 -21 -GenVertex: -11 ID: 0 (X,cT):0 - I:26 35 21 -3.17e+00,-1.74e+00,-8.38e+01,+8.39e+01 2 -11 - 18 21 -3.89e+00,-1.90e+00,+4.34e+01,+4.36e+01 2 -11 - 19 21 -3.91e+00,+3.13e+00,+7.89e+02,+7.89e+02 2 -11 - 20 21 +3.89e+00,+1.90e+00,+1.42e+03,+1.42e+03 2 -11 - 38 21 +2.18e+00,-6.98e-01,-1.55e+02,+1.55e+02 2 -11 - 21 21 +4.37e+00,+6.72e+00,+8.31e+01,+8.35e+01 2 -11 - 22 21 +3.91e+00,-3.13e+00,+3.66e+01,+3.69e+01 2 -11 - 23 21 -1.76e+00,-3.29e+00,+9.66e+00,+1.04e+01 2 -11 - 24 21 -4.37e+00,-6.72e+00,+8.76e-01,+8.07e+00 2 -11 - 25 21 -2.35e+00,-1.77e+00,-4.88e+00,+5.70e+00 2 -11 - 26 21 +1.76e+00,+3.29e+00,-4.65e+00,+5.96e+00 2 -11 - 27 21 +2.35e+00,+1.77e+00,-7.28e+02,+7.28e+02 2 -11 - 36 21 -3.72e-01,-3.53e+00,-1.09e+02,+1.09e+02 2 -11 - 39 2203 -1.81e-01,+9.21e-01,-4.33e+03,+4.33e+03 2 -11 - 14 4 +1.07e+01,-5.18e+00,-2.71e+01,+2.96e+01 2 -11 - 15 21 +3.52e-01,-6.45e-01,-1.11e+00,+1.33e+00 2 -11 - 16 21 +3.32e-02,+9.61e-02,-6.60e-02,+1.21e-01 2 -11 - 17 21 -3.76e-02,-1.65e-01,-9.73e-01,+9.88e-01 2 -11 - 28 21 +8.30e-01,+1.28e+00,-3.84e+01,+3.84e+01 2 -11 - 29 21 +1.45e+00,+3.41e+00,-3.48e+01,+3.50e+01 2 -11 - 30 21 +4.75e+00,+5.08e+00,-7.07e+01,+7.11e+01 2 -11 - 31 21 +7.05e+00,+5.30e+00,-7.09e+01,+7.14e+01 2 -11 - 32 21 +6.43e-05,-2.87e-01,-2.01e+00,+2.03e+00 2 -11 - 33 21 -2.01e+00,+1.84e-01,-1.00e+02,+1.00e+02 2 -11 - 34 21 -1.92e+00,-1.52e+00,-2.29e+02,+2.29e+02 2 -11 - 37 21 -3.12e-01,+2.46e-01,-7.86e+01,+7.86e+01 2 -11 - O: 1 70 92 +1.93e+01,+2.76e+00,-3.69e+03,+8.47e+03 2 -12 -GenVertex: -12 ID: 0 (X,cT):0 - I: 1 70 92 +1.93e+01,+2.76e+00,-3.69e+03,+8.47e+03 2 -12 - O:90 100 111 +1.28e+00,+5.91e-01,+1.83e+01,+1.84e+01 2 -60 - 101 331 +1.59e+00,+2.22e+00,+3.03e+01,+3.04e+01 2 -61 - 102 213 +1.77e+00,-1.58e+00,+1.71e+01,+1.73e+01 2 -62 - 103 -211 -1.88e-01,-1.28e-01,+3.87e+00,+3.88e+00 1 (nil) - 104 211 +6.95e-01,-7.43e-02,+2.83e+00,+2.91e+00 1 (nil) - 105 311 +6.37e-01,-2.90e-01,+6.13e+00,+6.19e+00 2 -63 - 106 333 +8.72e-02,-2.03e+00,+7.62e+00,+7.95e+00 2 -64 - 107 -323 -1.98e-01,-1.55e-01,+2.64e+00,+2.79e+00 2 -65 - 108 113 -1.10e+00,-1.90e+00,+5.32e+00,+5.81e+00 2 -66 - 109 213 -7.23e-01,-7.70e-01,+6.13e-01,+1.63e+00 2 -67 - 122 213 +6.99e-01,+4.88e-01,-2.14e+00,+2.37e+00 2 -74 - 123 223 +1.59e-01,-2.33e-01,-7.42e+00,+7.46e+00 2 -75 - 112 -211 -1.43e+00,-1.65e+00,+4.83e-01,+2.24e+00 1 (nil) - 113 111 +4.36e-02,-2.43e-01,+6.27e-02,+2.89e-01 2 -69 - 114 213 -1.15e+00,-1.72e+00,-2.01e+00,+2.97e+00 2 -70 - 115 -213 -9.95e-01,-3.87e-01,-1.11e+00,+1.63e+00 2 -71 - 116 321 +3.64e-01,+4.39e-01,+9.92e-02,+7.61e-01 1 (nil) - 117 -321 -1.27e-01,-1.02e+00,-1.45e+00,+1.85e+00 1 (nil) - 118 211 -2.01e-01,+3.58e-01,-1.79e+00,+1.84e+00 1 (nil) - 119 311 -2.88e-01,+7.23e-01,-1.33e+00,+1.62e+00 2 -72 - 120 -321 +1.03e-01,-1.31e-01,-8.45e-01,+9.93e-01 1 (nil) - 121 113 -2.01e-02,+9.67e-01,-2.76e+00,+3.05e+00 2 -73 - 124 223 -3.07e-01,+5.68e-01,-1.77e+01,+1.77e+01 2 -76 - 125 1114 +7.70e-01,-3.47e-01,-1.94e+02,+1.94e+02 2 -77 - 126 111 +6.52e-01,+1.56e+00,-1.11e+02,+1.11e+02 2 -78 - 127 -2112 +1.08e-01,+9.33e-02,-7.63e+01,+7.63e+01 1 (nil) - 128 211 +3.93e-01,-4.83e-01,-5.97e+01,+5.97e+01 1 (nil) - 129 -211 -4.91e-02,+3.02e-01,-5.27e+01,+5.27e+01 1 (nil) - 130 113 +7.74e-01,+8.64e-01,-8.89e+01,+8.89e+01 2 -79 - 131 223 +1.70e-02,+2.83e-01,-9.69e+01,+9.69e+01 2 -80 - 132 223 +3.02e-01,+2.43e-01,-3.21e+01,+3.21e+01 2 -81 - 133 221 +6.52e-01,-1.30e-02,-7.49e+00,+7.53e+00 2 -82 - 134 213 +1.25e+00,+2.45e+00,-3.91e+01,+3.93e+01 2 -83 - 148 211 -1.19e+00,-2.34e-01,-3.93e+01,+3.93e+01 1 (nil) - 149 311 -1.41e+00,-2.18e+00,-7.90e+01,+7.90e+01 2 -94 - 137 111 +7.22e-01,+1.16e+00,-1.29e+01,+1.29e+01 2 -85 - 138 113 +1.21e+00,+1.68e+00,-1.89e+01,+1.90e+01 2 -86 - 139 211 +1.12e+00,+5.04e-01,-1.16e+01,+1.17e+01 1 (nil) - 140 -213 +4.58e-01,+1.15e+00,-1.84e+01,+1.85e+01 2 -87 - 141 213 +2.08e+00,+1.68e+00,-2.61e+01,+2.63e+01 2 -88 - 142 313 +1.78e+00,+1.24e+00,-2.26e+01,+2.27e+01 2 -89 - 143 -313 +1.42e+00,+6.47e-01,-1.81e+01,+1.82e+01 2 -90 - 144 2112 -1.12e+00,+5.37e-01,-5.10e+01,+5.10e+01 1 (nil) - 145 -213 -5.75e-01,-4.78e-01,-9.45e+01,+9.45e+01 2 -91 - 146 -1114 -8.04e-01,-7.43e-01,-3.40e+01,+3.40e+01 2 -92 - 147 -213 -1.80e-01,+6.29e-02,-4.32e+01,+4.32e+01 2 -93 - 73 331 +8.84e-01,-9.17e-01,-1.33e+00,+2.07e+00 2 -39 - 74 -213 +1.67e+00,-6.02e-01,-4.33e+00,+4.71e+00 2 -40 - 75 111 -2.29e-01,-5.45e-02,-1.11e+00,+1.15e+00 2 -41 - 150 -323 -3.04e-01,-3.92e-01,-7.88e+01,+7.88e+01 2 -95 - 151 213 -1.80e+00,-1.21e+00,-8.93e+01,+8.94e+01 2 -96 - 152 113 +4.91e-01,-9.72e-01,-5.04e+01,+5.05e+01 2 -97 - 153 221 +2.67e-01,-2.61e-01,-2.16e+01,+2.16e+01 2 -98 - 154 311 +4.13e-01,+1.80e-01,-8.91e+01,+8.91e+01 2 -99 - 155 -321 +3.69e-01,-3.68e-01,-5.25e+01,+5.25e+01 1 (nil) - 156 221 -4.10e-01,-2.74e-01,-4.88e+01,+4.88e+01 2 -100 - 157 211 +7.13e-01,-3.28e-01,-1.35e+02,+1.35e+02 1 (nil) - 158 113 -8.56e-01,+4.51e-01,-3.86e+02,+3.86e+02 2 -101 - 159 -211 +8.50e-01,-2.44e-01,-2.40e+03,+2.40e+03 1 (nil) - 160 2224 -1.90e-03,+7.51e-01,-1.39e+03,+1.39e+03 2 -102 - 72 213 +1.08e+00,-6.60e-01,-2.31e+00,+2.70e+00 2 -38 - 88 323 -3.96e-01,+4.77e-01,+8.35e+01,+8.35e+01 2 -49 - 89 -313 -1.18e+00,+4.38e-01,+2.34e+02,+2.34e+02 2 -50 - 76 211 +1.91e-01,-3.77e-01,+3.30e-01,+5.54e-01 1 (nil) - 77 -211 +2.15e-01,+4.10e-01,+1.16e-01,+4.98e-01 1 (nil) - 78 211 +1.18e-01,-7.30e-01,-1.31e+00,+1.51e+00 1 (nil) - 79 3112 -1.25e-01,-5.92e-02,+4.02e+00,+4.19e+00 2 -42 - 80 311 -1.08e-01,-3.01e-02,+1.70e+00,+1.77e+00 2 -43 - 81 -1114 -5.93e-01,-4.62e-01,+7.53e+00,+7.69e+00 2 -44 - 82 -211 -3.95e-01,+3.08e-01,+9.39e+00,+9.40e+00 1 (nil) - 83 211 -3.13e-01,-7.22e-01,+8.53e+00,+8.56e+00 1 (nil) - 84 -213 -1.27e-01,-1.01e-01,+5.15e+00,+5.19e+00 2 -45 - 85 213 -1.20e+00,-1.22e-01,+2.34e+01,+2.35e+01 2 -46 - 86 223 -7.42e-02,+1.42e-01,+1.52e+01,+1.52e+01 2 -47 - 87 -213 -9.01e-01,-6.04e-01,+2.49e+01,+2.49e+01 2 -48 - 90 111 -2.10e-02,+1.47e-01,+2.20e+01,+2.20e+01 2 -51 - 110 -211 -4.35e-01,-8.15e-01,+1.78e-01,+9.51e-01 1 (nil) - 111 213 -5.97e-01,-1.22e+00,+2.67e-01,+1.55e+00 2 -68 - 71 423 +6.74e+00,-3.13e+00,-1.81e+01,+1.96e+01 2 -37 - 91 -213 -1.47e+00,+1.82e+00,+3.92e+02,+3.92e+02 2 -52 - 92 213 +1.75e+00,+1.50e+00,+6.91e+02,+6.91e+02 2 -53 - 93 -211 -8.94e-02,-3.08e-01,+1.41e+02,+1.41e+02 1 (nil) - 94 111 +7.06e-01,+3.83e-01,+1.68e+02,+1.68e+02 2 -54 - 95 223 +1.83e-01,+6.58e-01,+2.64e+02,+2.64e+02 2 -55 - 96 113 +1.17e+00,-6.49e-01,+1.09e+02,+1.09e+02 2 -56 - 97 213 -3.59e-02,+9.92e-01,+3.73e+01,+3.74e+01 2 -57 - 98 221 +4.22e-01,+3.30e-01,+8.56e+00,+8.60e+00 2 -58 - 99 -213 +9.75e-01,+2.54e+00,+3.20e+01,+3.22e+01 2 -59 - 135 221 +8.86e-01,+9.16e-01,-1.24e+01,+1.25e+01 2 -84 - 136 -211 +1.82e+00,+1.89e+00,-2.77e+01,+2.78e+01 1 (nil) -GenVertex: -13 ID: 0 (X,cT):0 - I: 2 41 2203 +1.57e-01,+9.19e-02,+4.12e+03,+4.12e+03 2 -13 - 40 2 -5.76e-01,-2.17e+00,+2.82e+00,+3.62e+00 2 -13 - O: 1 161 92 -4.19e-01,-2.08e+00,+4.13e+03,+4.13e+03 2 -14 -GenVertex: -14 ID: 0 (X,cT):0 - I: 1 161 92 -4.19e-01,-2.08e+00,+4.13e+03,+4.13e+03 2 -14 - O:14 174 2112 +5.28e-01,-1.88e-01,+1.06e+03,+1.06e+03 1 (nil) - 175 211 -3.22e-01,+5.25e-01,+2.61e+03,+2.61e+03 1 (nil) - 162 211 -3.13e-01,-1.66e+00,+2.96e+00,+3.41e+00 1 (nil) - 163 223 -1.35e-02,+1.05e-01,+2.90e+00,+3.01e+00 2 -103 - 164 -213 -7.67e-02,-1.58e-01,+2.83e+00,+2.94e+00 2 -104 - 165 113 -3.96e-01,-2.46e-01,+7.66e+00,+7.72e+00 2 -105 - 166 223 +8.97e-02,-2.51e-02,+1.83e+01,+1.83e+01 2 -106 - 167 331 +7.92e-02,-2.14e-01,+1.65e+01,+1.65e+01 2 -107 - 168 211 +1.55e-01,-4.55e-02,+2.09e+01,+2.09e+01 1 (nil) - 169 113 -9.07e-02,+1.70e-01,+7.69e+00,+7.71e+00 2 -108 - 170 -211 +1.96e-02,-3.42e-02,+4.36e+00,+4.36e+00 1 (nil) - 171 211 +1.50e-01,-7.36e-02,+6.14e+01,+6.14e+01 1 (nil) - 172 313 -9.79e-02,+5.68e-01,+7.20e+01,+7.20e+01 2 -109 - 173 -313 -1.30e-01,-7.96e-01,+2.37e+02,+2.37e+02 2 -110 -GenVertex: -15 ID: 0 (X,cT):0 - I: 6 43 21 -1.27e+00,-7.35e-02,-1.13e+01,+1.14e+01 2 -15 - 44 21 -4.16e-02,-2.47e-01,-1.97e+00,+1.98e+00 2 -15 - 45 21 +9.29e-01,-5.25e-01,-8.27e+00,+8.34e+00 2 -15 - 42 -4 -3.64e+01,+2.35e+01,-3.49e+02,+3.52e+02 2 -15 - 46 21 +2.59e+00,-1.54e+00,-4.01e+01,+4.02e+01 2 -15 - 47 3 +2.49e+01,-1.94e+01,-3.48e+02,+3.50e+02 2 -15 - O: 1 176 92 -9.28e+00,+1.71e+00,-7.59e+02,+7.64e+02 2 -16 -GenVertex: -16 ID: 0 (X,cT):0 - I: 1 176 92 -9.28e+00,+1.71e+00,-7.59e+02,+7.64e+02 2 -16 - O:10 177 -411 -2.64e+01,+1.68e+01,-2.54e+02,+2.56e+02 2 -111 - 178 -2112 -3.30e+00,+1.95e+00,-3.12e+01,+3.14e+01 1 (nil) - 179 2112 -3.69e+00,+2.38e+00,-3.47e+01,+3.50e+01 1 (nil) - 180 -313 -1.69e+00,+9.52e-01,-1.93e+01,+1.94e+01 2 -112 - 181 323 -1.07e+00,+1.14e+00,-1.19e+01,+1.20e+01 2 -113 - 182 -323 -1.04e+00,-2.43e-02,-1.56e+01,+1.57e+01 2 -114 - 183 321 +9.73e-01,-7.75e-01,-1.20e+01,+1.21e+01 1 (nil) - 184 113 +9.16e+00,-6.89e+00,-1.32e+02,+1.32e+02 2 -115 - 185 111 +1.57e+00,-1.44e+00,-2.40e+01,+2.41e+01 2 -116 - 186 -321 +1.62e+01,-1.24e+01,-2.25e+02,+2.26e+02 1 (nil) -GenVertex: -17 ID: 0 (X,cT):0 - I: 2 48 3 +2.68e+00,-2.13e+00,-4.93e+00,+6.00e+00 2 -17 - 49 -3 -2.68e+00,+2.13e+00,+2.54e+01,+2.56e+01 2 -17 - O: 1 187 92 +0.00e+00,+0.00e+00,+2.05e+01,+3.16e+01 2 -18 -GenVertex: -18 ID: 0 (X,cT):0 - I: 1 187 92 +0.00e+00,+0.00e+00,+2.05e+01,+3.16e+01 2 -18 - O:11 188 -321 +2.32e+00,-1.47e+00,-3.73e+00,+4.66e+00 1 (nil) - 189 213 -1.88e-01,-4.78e-01,-1.86e-02,+8.02e-01 2 -117 - 190 -211 +5.28e-01,-6.99e-02,+3.78e-01,+6.68e-01 1 (nil) - 191 213 -1.69e-01,+6.66e-02,+1.66e+00,+1.95e+00 2 -118 - 192 113 -7.42e-01,+4.97e-01,+2.71e+00,+2.94e+00 2 -119 - 193 -213 +2.70e-02,+3.31e-01,+2.97e-01,+7.93e-01 2 -120 - 194 211 -6.87e-03,-3.65e-01,+8.22e-01,+9.10e-01 1 (nil) - 195 113 -1.79e-01,+4.58e-01,+4.36e+00,+4.46e+00 2 -121 - 196 -213 -8.75e-02,+1.16e-01,+1.21e+00,+1.46e+00 2 -122 - 197 323 -7.63e-01,+6.20e-01,+7.15e+00,+7.28e+00 2 -123 - 198 221 -7.36e-01,+2.91e-01,+5.63e+00,+5.72e+00 2 -124 -GenVertex: -19 ID: 0 (X,cT):0 - I: 2 50 21 +1.28e+00,-2.63e+00,+9.77e-01,+3.09e+00 2 -19 - 51 21 -1.28e+00,+2.63e+00,+2.15e+00,+3.63e+00 2 -19 - O: 1 199 92 +0.00e+00,+0.00e+00,+3.12e+00,+6.71e+00 2 -20 -GenVertex: -20 ID: 0 (X,cT):0 - I: 1 199 92 +0.00e+00,+0.00e+00,+3.12e+00,+6.71e+00 2 -20 - O: 5 201 111 +3.73e-01,-3.78e-02,+1.18e+00,+1.24e+00 2 -126 - 202 -213 -7.72e-01,+1.13e+00,+1.14e+00,+1.96e+00 2 -127 - 203 223 +4.07e-01,-5.29e-01,+1.12e-01,+1.04e+00 2 -128 - 204 223 -5.49e-02,-3.91e-01,+1.06e+00,+1.37e+00 2 -129 - 200 213 +4.69e-02,-1.77e-01,-3.64e-01,+1.10e+00 2 -125 -GenVertex: -21 ID: 0 (X,cT):0 - I: 1 53 -423 +1.80e+00,-7.41e-01,-9.90e+00,+1.03e+01 2 -21 - O: 2 205 -421 +1.62e+00,-6.80e-01,-9.14e+00,+9.49e+00 2 -130 - 206 111 +1.80e-01,-6.13e-02,-7.60e-01,+7.95e-01 2 -131 -GenVertex: -22 ID: 0 (X,cT):0 - I: 1 54 -323 +5.03e-01,+1.51e+00,-6.41e+00,+6.67e+00 2 -22 - O: 2 207 -311 +3.84e-01,+6.75e-01,-2.32e+00,+2.49e+00 2 -132 - 208 -211 +1.19e-01,+8.35e-01,-4.09e+00,+4.18e+00 1 (nil) -GenVertex: -23 ID: 0 (X,cT):0 - I: 1 55 313 +6.48e-01,+1.70e+00,-1.25e+01,+1.27e+01 2 -23 - O: 2 209 311 +4.92e-01,+1.67e+00,-1.03e+01,+1.05e+01 2 -133 - 210 111 +1.56e-01,+3.28e-02,-2.20e+00,+2.21e+00 2 -134 -GenVertex: -24 ID: 0 (X,cT):0 - I: 1 56 113 +3.14e-01,+1.06e+00,-3.82e+00,+4.04e+00 2 -24 - O: 2 211 -211 +2.07e-01,-7.41e-03,-8.44e-01,+8.80e-01 1 (nil) - 212 211 +1.07e-01,+1.07e+00,-2.97e+00,+3.16e+00 1 (nil) -GenVertex: -25 ID: 0 (X,cT):0 - I: 1 57 223 +8.27e-03,+4.69e-01,-5.55e+00,+5.62e+00 2 -25 - O: 3 213 211 +1.65e-01,+9.37e-02,-1.12e+00,+1.14e+00 1 (nil) - 214 -211 -3.30e-02,+9.79e-02,-3.21e+00,+3.22e+00 1 (nil) - 215 111 -1.24e-01,+2.78e-01,-1.22e+00,+1.26e+00 2 -135 -GenVertex: -26 ID: 0 (X,cT):0 - I: 1 58 213 +1.90e-01,+8.19e-01,-3.63e+00,+3.80e+00 2 -26 - O: 2 216 211 +2.62e-01,+8.26e-01,-2.45e+00,+2.61e+00 1 (nil) - 217 111 -7.15e-02,-6.31e-03,-1.18e+00,+1.19e+00 2 -136 -GenVertex: -27 ID: 0 (X,cT):0 - I: 1 59 223 +4.76e-01,+3.30e-01,-1.30e+00,+1.62e+00 2 -27 - O: 3 218 -211 +1.28e-01,-6.04e-02,-2.75e-01,+3.39e-01 1 (nil) - 219 211 +2.00e-01,+3.04e-01,-9.82e-01,+1.06e+00 1 (nil) - 220 111 +1.49e-01,+8.68e-02,-4.65e-02,+2.24e-01 2 -137 -GenVertex: -28 ID: 0 (X,cT):0 - I: 1 60 -323 -1.01e-01,+5.65e-03,+1.73e-01,+8.22e-01 2 -28 - O: 2 221 -311 -8.28e-02,+1.40e-01,+2.87e-01,+5.97e-01 2 -138 - 222 -211 -1.84e-02,-1.34e-01,-1.14e-01,+2.25e-01 1 (nil) -GenVertex: -29 ID: 0 (X,cT):0 - I: 1 61 313 -7.71e-02,+3.71e-01,+6.58e-01,+1.14e+00 2 -29 - O: 2 223 321 -1.86e-02,+1.84e-02,+1.85e-01,+5.28e-01 1 (nil) - 224 -211 -5.85e-02,+3.52e-01,+4.73e-01,+6.09e-01 1 (nil) -GenVertex: -30 ID: 0 (X,cT):0 - I: 1 62 213 -3.58e-01,-1.85e-01,+2.02e-01,+7.59e-01 2 -30 - O: 2 225 211 +1.06e-01,-2.99e-02,+1.77e-01,+2.51e-01 1 (nil) - 226 111 -4.64e-01,-1.55e-01,+2.53e-02,+5.08e-01 2 -139 -GenVertex: -31 ID: 0 (X,cT):0 - I: 1 63 221 +5.37e-01,+2.24e-01,+7.68e+00,+7.72e+00 2 -31 - O: 3 227 22 +9.24e-02,+1.22e-01,+1.51e+00,+1.52e+00 1 (nil) - 228 -211 +1.64e-01,-1.14e-01,+3.22e+00,+3.23e+00 1 (nil) - 229 211 +2.81e-01,+2.16e-01,+2.94e+00,+2.97e+00 1 (nil) -GenVertex: -32 ID: 0 (X,cT):0 - I: 1 64 -213 -3.57e-01,-2.47e-01,+4.39e+00,+4.44e+00 2 -32 - O: 2 230 -211 -3.46e-01,-7.92e-02,+3.34e+00,+3.37e+00 1 (nil) - 231 111 -1.13e-02,-1.68e-01,+1.05e+00,+1.07e+00 2 -140 -GenVertex: -33 ID: 0 (X,cT):0 - I: 1 66 -213 +3.60e-01,-1.91e-02,+2.45e+01,+2.45e+01 2 -33 - O: 2 232 -211 +2.45e-01,+2.11e-01,+2.06e+01,+2.06e+01 1 (nil) - 233 111 +1.15e-01,-2.30e-01,+3.89e+00,+3.90e+00 2 -141 -GenVertex: -34 ID: 0 (X,cT):0 - I: 1 67 113 -3.73e-01,+1.18e-02,+3.83e+01,+3.84e+01 2 -34 - O: 2 234 -211 +1.07e-02,+2.95e-01,+1.86e+01,+1.86e+01 1 (nil) - 235 211 -3.83e-01,-2.83e-01,+1.98e+01,+1.98e+01 1 (nil) -GenVertex: -35 ID: 0 (X,cT):0 - I: 1 68 113 -9.06e-02,+1.63e-01,+1.67e+02,+1.67e+02 2 -35 - O: 2 236 211 -2.00e-02,-2.69e-01,+6.04e+01,+6.04e+01 1 (nil) - 237 -211 -7.06e-02,+4.32e-01,+1.07e+02,+1.07e+02 1 (nil) -GenVertex: -36 ID: 0 (X,cT):0 - I: 1 69 221 +1.73e-01,+4.07e-01,+2.06e+02,+2.06e+02 2 -36 - O: 3 238 211 +2.30e-02,+1.07e-01,+4.89e+01,+4.89e+01 1 (nil) - 239 -211 +1.52e-01,+2.49e-01,+1.36e+02,+1.36e+02 1 (nil) - 240 111 -1.84e-03,+5.13e-02,+2.10e+01,+2.10e+01 2 -142 -GenVertex: -37 ID: 0 (X,cT):0 - I: 1 71 423 +6.74e+00,-3.13e+00,-1.81e+01,+1.96e+01 2 -37 - O: 2 241 421 +6.24e+00,-2.87e+00,-1.68e+01,+1.82e+01 2 -143 - 242 111 +4.94e-01,-2.63e-01,-1.28e+00,+1.40e+00 2 -144 -GenVertex: -38 ID: 0 (X,cT):0 - I: 1 72 213 +1.08e+00,-6.60e-01,-2.31e+00,+2.70e+00 2 -38 - O: 2 243 211 +2.70e-01,-4.65e-01,-9.32e-01,+1.08e+00 1 (nil) - 244 111 +8.10e-01,-1.96e-01,-1.38e+00,+1.62e+00 2 -145 -GenVertex: -39 ID: 0 (X,cT):0 - I: 1 73 331 +8.84e-01,-9.17e-01,-1.33e+00,+2.07e+00 2 -39 - O: 3 245 211 +4.27e-01,-3.13e-01,-3.45e-01,+6.47e-01 1 (nil) - 246 -211 +6.70e-02,-6.53e-02,-1.12e-01,+2.02e-01 1 (nil) - 247 221 +3.89e-01,-5.39e-01,-8.71e-01,+1.22e+00 2 -146 -GenVertex: -40 ID: 0 (X,cT):0 - I: 1 74 -213 +1.67e+00,-6.02e-01,-4.33e+00,+4.71e+00 2 -40 - O: 2 248 -211 +8.95e-01,-3.43e-01,-1.67e+00,+1.93e+00 1 (nil) - 249 111 +7.72e-01,-2.59e-01,-2.66e+00,+2.78e+00 2 -147 -Vertex: -41 ID: 0 (X,cT)=-1.15e-05,-2.74e-06,-5.60e-05,+5.77e-05 - I: 1 75 111 -2.29e-01,-5.45e-02,-1.11e+00,+1.15e+00 2 -41 - O: 2 250 22 -1.87e-01,-7.34e-02,-6.48e-01,+6.78e-01 1 (nil) - 251 22 -4.27e-02,+1.89e-02,-4.65e-01,+4.68e-01 1 (nil) -Vertex: -42 ID: 0 (X,cT)=-9.58e+00,-4.54e+00,+3.08e+02,+3.22e+02 - I: 1 79 3112 -1.25e-01,-5.92e-02,+4.02e+00,+4.19e+00 2 -42 - O: 2 252 2112 +2.35e-02,-7.71e-02,+3.69e+00,+3.81e+00 1 (nil) - 253 -211 -1.48e-01,+1.79e-02,+3.30e-01,+3.88e-01 1 (nil) -GenVertex: -43 ID: 0 (X,cT):0 - I: 1 80 311 -1.08e-01,-3.01e-02,+1.70e+00,+1.77e+00 2 -43 - O: 1 254 310 -1.08e-01,-3.01e-02,+1.70e+00,+1.77e+00 2 -148 -GenVertex: -44 ID: 0 (X,cT):0 - I: 1 81 -1114 -5.93e-01,-4.62e-01,+7.53e+00,+7.69e+00 2 -44 - O: 2 255 -2112 -7.16e-01,-5.94e-01,+6.69e+00,+6.82e+00 1 (nil) - 256 211 +1.23e-01,+1.32e-01,+8.42e-01,+8.72e-01 1 (nil) -GenVertex: -45 ID: 0 (X,cT):0 - I: 1 84 -213 -1.27e-01,-1.01e-01,+5.15e+00,+5.19e+00 2 -45 - O: 2 257 -211 +1.09e-01,-2.00e-01,+3.92e+00,+3.93e+00 1 (nil) - 258 111 -2.36e-01,+9.89e-02,+1.22e+00,+1.25e+00 2 -149 -GenVertex: -46 ID: 0 (X,cT):0 - I: 1 85 213 -1.20e+00,-1.22e-01,+2.34e+01,+2.35e+01 2 -46 - O: 2 259 211 -9.25e-02,+6.68e-02,+1.06e+00,+1.07e+00 1 (nil) - 260 111 -1.11e+00,-1.89e-01,+2.24e+01,+2.24e+01 2 -150 -GenVertex: -47 ID: 0 (X,cT):0 - I: 1 86 223 -7.42e-02,+1.42e-01,+1.52e+01,+1.52e+01 2 -47 - O: 3 261 211 -8.80e-02,-1.85e-01,+7.90e+00,+7.90e+00 1 (nil) - 262 -211 -9.38e-02,+7.23e-02,+3.34e+00,+3.35e+00 1 (nil) - 263 111 +1.08e-01,+2.55e-01,+3.93e+00,+3.94e+00 2 -151 -GenVertex: -48 ID: 0 (X,cT):0 - I: 1 87 -213 -9.01e-01,-6.04e-01,+2.49e+01,+2.49e+01 2 -48 - O: 2 264 -211 -5.80e-01,-4.05e-01,+2.11e+01,+2.11e+01 1 (nil) - 265 111 -3.21e-01,-1.99e-01,+3.80e+00,+3.82e+00 2 -152 -GenVertex: -49 ID: 0 (X,cT):0 - I: 1 88 323 -3.96e-01,+4.77e-01,+8.35e+01,+8.35e+01 2 -49 - O: 2 266 321 -2.79e-01,+6.38e-01,+6.43e+01,+6.43e+01 1 (nil) - 267 111 -1.18e-01,-1.61e-01,+1.92e+01,+1.92e+01 2 -153 -GenVertex: -50 ID: 0 (X,cT):0 - I: 1 89 -313 -1.18e+00,+4.38e-01,+2.34e+02,+2.34e+02 2 -50 - O: 2 268 -321 -8.94e-01,+2.08e-02,+1.54e+02,+1.54e+02 1 (nil) - 269 211 -2.85e-01,+4.17e-01,+8.01e+01,+8.01e+01 1 (nil) -Vertex: -51 ID: 0 (X,cT)=-6.60e-06,+4.63e-05,+6.91e-03,+6.91e-03 - I: 1 90 111 -2.10e-02,+1.47e-01,+2.20e+01,+2.20e+01 2 -51 - O: 2 270 22 +3.30e-03,+1.38e-01,+2.13e+01,+2.13e+01 1 (nil) - 271 22 -2.43e-02,+9.55e-03,+7.24e-01,+7.25e-01 1 (nil) -GenVertex: -52 ID: 0 (X,cT):0 - I: 1 91 -213 -1.47e+00,+1.82e+00,+3.92e+02,+3.92e+02 2 -52 - O: 2 272 -211 -2.85e-01,+9.40e-01,+1.43e+02,+1.43e+02 1 (nil) - 273 111 -1.19e+00,+8.85e-01,+2.49e+02,+2.49e+02 2 -154 -GenVertex: -53 ID: 0 (X,cT):0 - I: 1 92 213 +1.75e+00,+1.50e+00,+6.91e+02,+6.91e+02 2 -53 - O: 2 274 211 +1.79e+00,+1.29e+00,+6.18e+02,+6.18e+02 1 (nil) - 275 111 -3.94e-02,+2.10e-01,+7.29e+01,+7.29e+01 2 -155 -Vertex: -54 ID: 0 (X,cT)=+1.07e-04,+5.79e-05,+2.54e-02,+2.54e-02 - I: 1 94 111 +7.06e-01,+3.83e-01,+1.68e+02,+1.68e+02 2 -54 - O: 2 276 22 +2.50e-01,+1.51e-01,+4.86e+01,+4.86e+01 1 (nil) - 277 22 +4.56e-01,+2.32e-01,+1.20e+02,+1.20e+02 1 (nil) -GenVertex: -55 ID: 0 (X,cT):0 - I: 1 95 223 +1.83e-01,+6.58e-01,+2.64e+02,+2.64e+02 2 -55 - O: 3 278 211 +2.62e-01,+6.67e-02,+8.45e+01,+8.45e+01 1 (nil) - 279 -211 +3.03e-02,+5.27e-01,+1.40e+02,+1.40e+02 1 (nil) - 280 111 -1.09e-01,+6.39e-02,+3.93e+01,+3.93e+01 2 -156 -GenVertex: -56 ID: 0 (X,cT):0 - I: 1 96 113 +1.17e+00,-6.49e-01,+1.09e+02,+1.09e+02 2 -56 - O: 2 281 -211 +1.05e+00,-3.90e-01,+9.92e+01,+9.92e+01 1 (nil) - 282 211 +1.20e-01,-2.59e-01,+1.03e+01,+1.03e+01 1 (nil) -GenVertex: -57 ID: 0 (X,cT):0 - I: 1 97 213 -3.59e-02,+9.92e-01,+3.73e+01,+3.74e+01 2 -57 - O: 2 283 211 -1.62e-01,+3.10e-02,+2.19e+00,+2.20e+00 1 (nil) - 284 111 +1.27e-01,+9.61e-01,+3.52e+01,+3.52e+01 2 -157 -GenVertex: -58 ID: 0 (X,cT):0 - I: 1 98 221 +4.22e-01,+3.30e-01,+8.56e+00,+8.60e+00 2 -58 - O: 3 285 111 +2.92e-01,+2.10e-01,+3.56e+00,+3.58e+00 2 -158 - 286 111 +7.22e-02,+1.09e-01,+1.73e+00,+1.74e+00 2 -159 - 287 111 +5.73e-02,+1.07e-02,+3.27e+00,+3.27e+00 2 -160 -GenVertex: -59 ID: 0 (X,cT):0 - I: 1 99 -213 +9.75e-01,+2.54e+00,+3.20e+01,+3.22e+01 2 -59 - O: 2 288 -211 +5.56e-01,+1.36e+00,+1.23e+01,+1.24e+01 1 (nil) - 289 111 +4.18e-01,+1.18e+00,+1.97e+01,+1.98e+01 2 -161 -Vertex: -60 ID: 0 (X,cT)=+3.89e-05,+1.80e-05,+5.58e-04,+5.60e-04 - I: 1 100 111 +1.28e+00,+5.91e-01,+1.83e+01,+1.84e+01 2 -60 - O: 2 290 22 +1.23e+00,+5.60e-01,+1.78e+01,+1.79e+01 1 (nil) - 291 22 +5.03e-02,+3.14e-02,+4.95e-01,+4.99e-01 1 (nil) -GenVertex: -61 ID: 0 (X,cT):0 - I: 1 101 331 +1.59e+00,+2.22e+00,+3.03e+01,+3.04e+01 2 -61 - O: 3 292 211 +3.32e-01,+2.48e-01,+4.45e+00,+4.47e+00 1 (nil) - 293 -211 +3.06e-01,+6.92e-01,+8.24e+00,+8.28e+00 1 (nil) - 294 221 +9.56e-01,+1.28e+00,+1.76e+01,+1.77e+01 2 -162 -GenVertex: -62 ID: 0 (X,cT):0 - I: 1 102 213 +1.77e+00,-1.58e+00,+1.71e+01,+1.73e+01 2 -62 - O: 2 295 211 +8.03e-02,+2.02e-02,+5.69e-01,+5.92e-01 1 (nil) - 296 111 +1.69e+00,-1.60e+00,+1.65e+01,+1.67e+01 2 -163 -GenVertex: -63 ID: 0 (X,cT):0 - I: 1 105 311 +6.37e-01,-2.90e-01,+6.13e+00,+6.19e+00 2 -63 - O: 1 297 310 +6.37e-01,-2.90e-01,+6.13e+00,+6.19e+00 2 -164 -GenVertex: -64 ID: 0 (X,cT):0 - I: 1 106 333 +8.72e-02,-2.03e+00,+7.62e+00,+7.95e+00 2 -64 - O: 2 298 130 +1.44e-01,-1.08e+00,+4.20e+00,+4.37e+00 1 (nil) - 299 310 -5.64e-02,-9.48e-01,+3.42e+00,+3.58e+00 2 -165 -GenVertex: -65 ID: 0 (X,cT):0 - I: 1 107 -323 -1.98e-01,-1.55e-01,+2.64e+00,+2.79e+00 2 -65 - O: 2 300 -321 -2.21e-01,+1.56e-01,+1.65e+00,+1.74e+00 1 (nil) - 301 111 +2.32e-02,-3.11e-01,+9.92e-01,+1.05e+00 2 -166 -GenVertex: -66 ID: 0 (X,cT):0 - I: 1 108 113 -1.10e+00,-1.90e+00,+5.32e+00,+5.81e+00 2 -66 - O: 2 302 -211 -1.16e+00,-1.76e+00,+5.02e+00,+5.45e+00 1 (nil) - 303 211 +5.82e-02,-1.40e-01,+3.02e-01,+3.65e-01 1 (nil) -GenVertex: -67 ID: 0 (X,cT):0 - I: 1 109 213 -7.23e-01,-7.70e-01,+6.13e-01,+1.63e+00 2 -67 - O: 2 304 211 +1.49e-03,+1.26e-01,-1.51e-01,+2.41e-01 1 (nil) - 305 111 -7.25e-01,-8.95e-01,+7.64e-01,+1.39e+00 2 -167 -GenVertex: -68 ID: 0 (X,cT):0 - I: 1 111 213 -5.97e-01,-1.22e+00,+2.67e-01,+1.55e+00 2 -68 - O: 2 306 211 +1.06e-01,-2.72e-01,-4.01e-02,+3.26e-01 1 (nil) - 307 111 -7.03e-01,-9.49e-01,+3.08e-01,+1.23e+00 2 -168 -Vertex: -69 ID: 0 (X,cT)=+1.27e-05,-7.07e-05,+1.82e-05,+8.39e-05 - I: 1 113 111 +4.36e-02,-2.43e-01,+6.27e-02,+2.89e-01 2 -69 - O: 2 308 22 +5.40e-02,-1.99e-02,+1.91e-02,+6.07e-02 1 (nil) - 309 22 -1.04e-02,-2.23e-01,+4.36e-02,+2.28e-01 1 (nil) -GenVertex: -70 ID: 0 (X,cT):0 - I: 1 114 213 -1.15e+00,-1.72e+00,-2.01e+00,+2.97e+00 2 -70 - O: 2 310 211 -4.37e-02,-6.49e-02,-3.59e-02,+1.64e-01 1 (nil) - 311 111 -1.10e+00,-1.65e+00,-1.97e+00,+2.80e+00 2 -169 -GenVertex: -71 ID: 0 (X,cT):0 - I: 1 115 -213 -9.95e-01,-3.87e-01,-1.11e+00,+1.63e+00 2 -71 - O: 2 312 -211 -7.40e-01,-4.72e-01,-9.20e-01,+1.28e+00 1 (nil) - 313 111 -2.55e-01,+8.51e-02,-1.87e-01,+3.54e-01 2 -170 -GenVertex: -72 ID: 0 (X,cT):0 - I: 1 119 311 -2.88e-01,+7.23e-01,-1.33e+00,+1.62e+00 2 -72 - O: 1 314 310 -2.88e-01,+7.23e-01,-1.33e+00,+1.62e+00 2 -171 -GenVertex: -73 ID: 0 (X,cT):0 - I: 1 121 113 -2.01e-02,+9.67e-01,-2.76e+00,+3.05e+00 2 -73 - O: 2 315 -211 -5.02e-03,+1.03e+00,-2.68e+00,+2.88e+00 1 (nil) - 316 211 -1.50e-02,-6.21e-02,-7.50e-02,+1.71e-01 1 (nil) -GenVertex: -74 ID: 0 (X,cT):0 - I: 1 122 213 +6.99e-01,+4.88e-01,-2.14e+00,+2.37e+00 2 -74 - O: 2 317 211 +2.31e-01,+4.39e-01,-1.27e+00,+1.37e+00 1 (nil) - 318 111 +4.68e-01,+4.92e-02,-8.74e-01,+1.00e+00 2 -172 -GenVertex: -75 ID: 0 (X,cT):0 - I: 1 123 223 +1.59e-01,-2.33e-01,-7.42e+00,+7.46e+00 2 -75 - O: 2 319 -211 +2.57e-01,+5.62e-02,-5.93e+00,+5.93e+00 1 (nil) - 320 211 -9.87e-02,-2.90e-01,-1.49e+00,+1.53e+00 1 (nil) -GenVertex: -76 ID: 0 (X,cT):0 - I: 1 124 223 -3.07e-01,+5.68e-01,-1.77e+01,+1.77e+01 2 -76 - O: 2 321 -211 -1.81e-01,+2.32e-01,-1.48e+01,+1.48e+01 1 (nil) - 322 211 -1.26e-01,+3.36e-01,-2.88e+00,+2.90e+00 1 (nil) -GenVertex: -77 ID: 0 (X,cT):0 - I: 1 125 1114 +7.70e-01,-3.47e-01,-1.94e+02,+1.94e+02 2 -77 - O: 2 323 2112 +6.85e-01,-3.51e-01,-1.63e+02,+1.63e+02 1 (nil) - 324 -211 +8.47e-02,+3.52e-03,-3.06e+01,+3.06e+01 1 (nil) -Vertex: -78 ID: 0 (X,cT)=+9.27e-06,+2.22e-05,-1.58e-03,+1.58e-03 - I: 1 126 111 +6.52e-01,+1.56e+00,-1.11e+02,+1.11e+02 2 -78 - O: 2 325 22 +6.52e-01,+1.50e+00,-1.08e+02,+1.08e+02 1 (nil) - 326 22 -1.55e-04,+6.21e-02,-3.67e+00,+3.67e+00 1 (nil) -GenVertex: -79 ID: 0 (X,cT):0 - I: 1 130 113 +7.74e-01,+8.64e-01,-8.89e+01,+8.89e+01 2 -79 - O: 2 327 -211 +6.68e-01,+7.08e-01,-4.84e+01,+4.84e+01 1 (nil) - 328 211 +1.06e-01,+1.56e-01,-4.05e+01,+4.05e+01 1 (nil) -GenVertex: -80 ID: 0 (X,cT):0 - I: 1 131 223 +1.70e-02,+2.83e-01,-9.69e+01,+9.69e+01 2 -80 - O: 3 329 211 -1.62e-01,+5.36e-02,-3.29e+01,+3.29e+01 1 (nil) - 330 -211 +6.38e-02,-3.43e-02,-4.30e+01,+4.30e+01 1 (nil) - 331 111 +1.15e-01,+2.64e-01,-2.11e+01,+2.11e+01 2 -173 -GenVertex: -81 ID: 0 (X,cT):0 - I: 1 132 223 +3.02e-01,+2.43e-01,-3.21e+01,+3.21e+01 2 -81 - O: 3 332 -211 +5.67e-02,-4.99e-02,-1.78e+01,+1.78e+01 1 (nil) - 333 211 +8.54e-02,+2.91e-01,-8.16e+00,+8.17e+00 1 (nil) - 334 111 +1.60e-01,+1.64e-03,-6.16e+00,+6.16e+00 2 -174 -GenVertex: -82 ID: 0 (X,cT):0 - I: 1 133 221 +6.52e-01,-1.30e-02,-7.49e+00,+7.53e+00 2 -82 - O: 3 335 111 +3.20e-01,-1.06e-01,-2.80e+00,+2.83e+00 2 -175 - 336 111 +2.91e-01,+8.79e-02,-3.67e+00,+3.68e+00 2 -176 - 337 111 +4.06e-02,+5.17e-03,-1.02e+00,+1.02e+00 2 -177 -GenVertex: -83 ID: 0 (X,cT):0 - I: 1 134 213 +1.25e+00,+2.45e+00,-3.91e+01,+3.93e+01 2 -83 - O: 2 338 211 +6.58e-01,+5.66e-01,-1.72e+01,+1.72e+01 1 (nil) - 339 111 +5.88e-01,+1.89e+00,-2.20e+01,+2.20e+01 2 -178 -GenVertex: -84 ID: 0 (X,cT):0 - I: 1 135 221 +8.86e-01,+9.16e-01,-1.24e+01,+1.25e+01 2 -84 - O: 2 340 22 +6.66e-01,+6.36e-01,-6.31e+00,+6.38e+00 1 (nil) - 341 22 +2.20e-01,+2.80e-01,-6.11e+00,+6.12e+00 1 (nil) -Vertex: -85 ID: 0 (X,cT)=+3.02e-04,+4.87e-04,-5.38e-03,+5.41e-03 - I: 1 137 111 +7.22e-01,+1.16e+00,-1.29e+01,+1.29e+01 2 -85 - O: 2 342 22 +5.79e-02,+1.36e-01,-1.76e+00,+1.76e+00 1 (nil) - 343 22 +6.65e-01,+1.03e+00,-1.11e+01,+1.12e+01 1 (nil) -GenVertex: -86 ID: 0 (X,cT):0 - I: 1 138 113 +1.21e+00,+1.68e+00,-1.89e+01,+1.90e+01 2 -86 - O: 2 344 -211 +4.13e-01,+1.29e-01,-3.64e+00,+3.67e+00 1 (nil) - 345 211 +8.01e-01,+1.55e+00,-1.52e+01,+1.53e+01 1 (nil) -GenVertex: -87 ID: 0 (X,cT):0 - I: 1 140 -213 +4.58e-01,+1.15e+00,-1.84e+01,+1.85e+01 2 -87 - O: 2 346 -211 +4.43e-01,+4.32e-01,-3.36e+00,+3.42e+00 1 (nil) - 347 111 +1.51e-02,+7.22e-01,-1.51e+01,+1.51e+01 2 -179 -GenVertex: -88 ID: 0 (X,cT):0 - I: 1 141 213 +2.08e+00,+1.68e+00,-2.61e+01,+2.63e+01 2 -88 - O: 2 348 211 +2.03e+00,+1.63e+00,-2.51e+01,+2.52e+01 1 (nil) - 349 111 +5.56e-02,+5.31e-02,-1.06e+00,+1.07e+00 2 -180 -GenVertex: -89 ID: 0 (X,cT):0 - I: 1 142 313 +1.78e+00,+1.24e+00,-2.26e+01,+2.27e+01 2 -89 - O: 2 350 321 +5.53e-01,+4.44e-01,-6.45e+00,+6.51e+00 1 (nil) - 351 -211 +1.23e+00,+7.92e-01,-1.62e+01,+1.62e+01 1 (nil) -GenVertex: -90 ID: 0 (X,cT):0 - I: 1 143 -313 +1.42e+00,+6.47e-01,-1.81e+01,+1.82e+01 2 -90 - O: 2 352 -311 +4.98e-01,+5.10e-01,-7.52e+00,+7.57e+00 2 -181 - 353 111 +9.21e-01,+1.38e-01,-1.06e+01,+1.06e+01 2 -182 -GenVertex: -91 ID: 0 (X,cT):0 - I: 1 145 -213 -5.75e-01,-4.78e-01,-9.45e+01,+9.45e+01 2 -91 - O: 2 354 -211 -4.16e-01,-6.42e-04,-4.57e+01,+4.57e+01 1 (nil) - 355 111 -1.59e-01,-4.77e-01,-4.88e+01,+4.88e+01 2 -183 -GenVertex: -92 ID: 0 (X,cT):0 - I: 1 146 -1114 -8.04e-01,-7.43e-01,-3.40e+01,+3.40e+01 2 -92 - O: 2 356 -2112 -5.09e-01,-4.51e-01,-2.85e+01,+2.85e+01 1 (nil) - 357 211 -2.95e-01,-2.92e-01,-5.48e+00,+5.50e+00 1 (nil) -GenVertex: -93 ID: 0 (X,cT):0 - I: 1 147 -213 -1.80e-01,+6.29e-02,-4.32e+01,+4.32e+01 2 -93 - O: 2 358 -211 -2.49e-01,+3.34e-01,-2.84e+01,+2.84e+01 1 (nil) - 359 111 +6.89e-02,-2.71e-01,-1.49e+01,+1.49e+01 2 -184 -GenVertex: -94 ID: 0 (X,cT):0 - I: 1 149 311 -1.41e+00,-2.18e+00,-7.90e+01,+7.90e+01 2 -94 - O: 1 360 130 -1.41e+00,-2.18e+00,-7.90e+01,+7.90e+01 1 (nil) -GenVertex: -95 ID: 0 (X,cT):0 - I: 1 150 -323 -3.04e-01,-3.92e-01,-7.88e+01,+7.88e+01 2 -95 - O: 2 361 -321 -3.90e-02,+2.37e-02,-4.50e+01,+4.50e+01 1 (nil) - 362 111 -2.65e-01,-4.16e-01,-3.38e+01,+3.38e+01 2 -185 -GenVertex: -96 ID: 0 (X,cT):0 - I: 1 151 213 -1.80e+00,-1.21e+00,-8.93e+01,+8.94e+01 2 -96 - O: 2 363 211 -1.88e+00,-1.09e+00,-8.20e+01,+8.20e+01 1 (nil) - 364 111 +7.55e-02,-1.18e-01,-7.35e+00,+7.36e+00 2 -186 -GenVertex: -97 ID: 0 (X,cT):0 - I: 1 152 113 +4.91e-01,-9.72e-01,-5.04e+01,+5.05e+01 2 -97 - O: 2 365 -211 +3.30e-01,-1.08e+00,-4.62e+01,+4.62e+01 1 (nil) - 366 211 +1.61e-01,+1.05e-01,-4.23e+00,+4.23e+00 1 (nil) -GenVertex: -98 ID: 0 (X,cT):0 - I: 1 153 221 +2.67e-01,-2.61e-01,-2.16e+01,+2.16e+01 2 -98 - O: 2 367 22 -1.53e-01,-5.63e-02,-3.12e+00,+3.12e+00 1 (nil) - 368 22 +4.20e-01,-2.04e-01,-1.84e+01,+1.85e+01 1 (nil) -GenVertex: -99 ID: 0 (X,cT):0 - I: 1 154 311 +4.13e-01,+1.80e-01,-8.91e+01,+8.91e+01 2 -99 - O: 1 369 130 +4.13e-01,+1.80e-01,-8.91e+01,+8.91e+01 1 (nil) -GenVertex: -100 ID: 0 (X,cT):0 - I: 1 156 221 -4.10e-01,-2.74e-01,-4.88e+01,+4.88e+01 2 -100 - O: 3 370 211 -2.54e-01,-1.08e-01,-2.26e+01,+2.26e+01 1 (nil) - 371 -211 -9.47e-02,-7.03e-02,-6.26e+00,+6.26e+00 1 (nil) - 372 111 -6.13e-02,-9.53e-02,-1.99e+01,+1.99e+01 2 -187 -GenVertex: -101 ID: 0 (X,cT):0 - I: 1 158 113 -8.56e-01,+4.51e-01,-3.86e+02,+3.86e+02 2 -101 - O: 2 373 211 -5.66e-01,+1.70e-01,-3.23e+02,+3.23e+02 1 (nil) - 374 -211 -2.90e-01,+2.81e-01,-6.32e+01,+6.32e+01 1 (nil) -GenVertex: -102 ID: 0 (X,cT):0 - I: 1 160 2224 -1.90e-03,+7.51e-01,-1.39e+03,+1.39e+03 2 -102 - O: 2 375 2212 +9.56e-04,+8.62e-01,-1.17e+03,+1.17e+03 1 (nil) - 376 211 -2.86e-03,-1.12e-01,-2.17e+02,+2.17e+02 1 (nil) -GenVertex: -103 ID: 0 (X,cT):0 - I: 1 163 223 -1.35e-02,+1.05e-01,+2.90e+00,+3.01e+00 2 -103 - O: 3 377 -211 +6.98e-02,+4.75e-02,+2.34e+00,+2.34e+00 1 (nil) - 378 211 -3.36e-03,-3.94e-02,+1.39e-01,+2.01e-01 1 (nil) - 379 111 -7.99e-02,+9.68e-02,+4.23e-01,+4.62e-01 2 -188 -GenVertex: -104 ID: 0 (X,cT):0 - I: 1 164 -213 -7.67e-02,-1.58e-01,+2.83e+00,+2.94e+00 2 -104 - O: 2 380 -211 +2.46e-01,-2.54e-01,+9.52e-01,+1.02e+00 1 (nil) - 381 111 -3.23e-01,+9.61e-02,+1.88e+00,+1.91e+00 2 -189 -GenVertex: -105 ID: 0 (X,cT):0 - I: 1 165 113 -3.96e-01,-2.46e-01,+7.66e+00,+7.72e+00 2 -105 - O: 2 382 -211 -4.58e-01,-1.09e-01,+2.26e+00,+2.31e+00 1 (nil) - 383 211 +6.19e-02,-1.38e-01,+5.40e+00,+5.41e+00 1 (nil) -GenVertex: -106 ID: 0 (X,cT):0 - I: 1 166 223 +8.97e-02,-2.51e-02,+1.83e+01,+1.83e+01 2 -106 - O: 3 384 211 +1.54e-02,+2.33e-01,+6.44e+00,+6.45e+00 1 (nil) - 385 -211 -1.25e-01,-1.91e-01,+6.30e+00,+6.31e+00 1 (nil) - 386 111 +1.99e-01,-6.72e-02,+5.57e+00,+5.57e+00 2 -190 -GenVertex: -107 ID: 0 (X,cT):0 - I: 1 167 331 +7.92e-02,-2.14e-01,+1.65e+01,+1.65e+01 2 -107 - O: 2 388 113 +8.30e-02,-2.83e-01,+1.61e+01,+1.61e+01 2 -191 - 387 22 -3.78e-03,+6.83e-02,+3.46e-01,+3.53e-01 1 (nil) -GenVertex: -108 ID: 0 (X,cT):0 - I: 1 169 113 -9.07e-02,+1.70e-01,+7.69e+00,+7.71e+00 2 -108 - O: 2 389 211 -1.47e-01,+1.94e-03,+5.31e+00,+5.31e+00 1 (nil) - 390 -211 +5.60e-02,+1.68e-01,+2.38e+00,+2.39e+00 1 (nil) -GenVertex: -109 ID: 0 (X,cT):0 - I: 1 172 313 -9.79e-02,+5.68e-01,+7.20e+01,+7.20e+01 2 -109 - O: 2 391 321 +1.98e-01,+2.04e-01,+3.95e+01,+3.95e+01 1 (nil) - 392 -211 -2.96e-01,+3.65e-01,+3.25e+01,+3.25e+01 1 (nil) -GenVertex: -110 ID: 0 (X,cT):0 - I: 1 173 -313 -1.30e-01,-7.96e-01,+2.37e+02,+2.37e+02 2 -110 - O: 2 393 -321 +8.77e-02,-3.77e-01,+1.73e+02,+1.73e+02 1 (nil) - 394 211 -2.18e-01,-4.20e-01,+6.41e+01,+6.41e+01 1 (nil) -Vertex: -111 ID: 0 (X,cT)=-3.81e+00,+2.43e+00,-3.67e+01,+3.70e+01 - I: 1 177 -411 -2.64e+01,+1.68e+01,-2.54e+02,+2.56e+02 2 -111 - O: 4 395 13 -1.41e+00,+1.04e+00,-1.32e+01,+1.33e+01 1 (nil) - 397 323 -2.16e+01,+1.35e+01,-2.09e+02,+2.11e+02 2 -192 - 396 -14 -1.31e+00,+1.05e+00,-1.23e+01,+1.24e+01 1 (nil) - 398 -211 -2.09e+00,+1.24e+00,-1.91e+01,+1.92e+01 1 (nil) -GenVertex: -112 ID: 0 (X,cT):0 - I: 1 180 -313 -1.69e+00,+9.52e-01,-1.93e+01,+1.94e+01 2 -112 - O: 2 399 -311 -4.47e-01,+3.05e-01,-6.33e+00,+6.37e+00 2 -193 - 400 111 -1.24e+00,+6.47e-01,-1.29e+01,+1.30e+01 2 -194 -GenVertex: -113 ID: 0 (X,cT):0 - I: 1 181 323 -1.07e+00,+1.14e+00,-1.19e+01,+1.20e+01 2 -113 - O: 2 401 311 -9.33e-01,+9.63e-01,-1.12e+01,+1.13e+01 2 -195 - 402 211 -1.36e-01,+1.77e-01,-7.16e-01,+7.63e-01 1 (nil) -GenVertex: -114 ID: 0 (X,cT):0 - I: 1 182 -323 -1.04e+00,-2.43e-02,-1.56e+01,+1.57e+01 2 -114 - O: 2 403 -321 -9.22e-01,-9.25e-02,-1.49e+01,+1.49e+01 1 (nil) - 404 111 -1.17e-01,+6.82e-02,-7.01e-01,+7.26e-01 2 -196 -GenVertex: -115 ID: 0 (X,cT):0 - I: 1 184 113 +9.16e+00,-6.89e+00,-1.32e+02,+1.32e+02 2 -115 - O: 2 405 -211 +8.07e+00,-6.29e+00,-1.19e+02,+1.20e+02 1 (nil) - 406 211 +1.09e+00,-5.97e-01,-1.23e+01,+1.24e+01 1 (nil) -Vertex: -116 ID: 0 (X,cT)=+1.87e-03,-1.71e-03,-2.84e-02,+2.85e-02 - I: 1 185 111 +1.57e+00,-1.44e+00,-2.40e+01,+2.41e+01 2 -116 - O: 2 407 22 +1.03e+00,-8.53e-01,-1.49e+01,+1.50e+01 1 (nil) - 408 22 +5.46e-01,-5.88e-01,-9.04e+00,+9.08e+00 1 (nil) -GenVertex: -117 ID: 0 (X,cT):0 - I: 1 189 213 -1.88e-01,-4.78e-01,-1.86e-02,+8.02e-01 2 -117 - O: 2 409 211 +6.32e-02,-4.07e-02,-1.95e-01,+2.51e-01 1 (nil) - 410 111 -2.51e-01,-4.37e-01,+1.76e-01,+5.51e-01 2 -197 -GenVertex: -118 ID: 0 (X,cT):0 - I: 1 191 213 -1.69e-01,+6.66e-02,+1.66e+00,+1.95e+00 2 -118 - O: 2 411 211 -8.99e-02,-4.44e-01,+8.88e-01,+1.01e+00 1 (nil) - 412 111 -7.90e-02,+5.11e-01,+7.72e-01,+9.39e-01 2 -198 -GenVertex: -119 ID: 0 (X,cT):0 - I: 1 192 113 -7.42e-01,+4.97e-01,+2.71e+00,+2.94e+00 2 -119 - O: 2 413 -211 -6.65e-02,+8.33e-02,+1.29e+00,+1.30e+00 1 (nil) - 414 211 -6.76e-01,+4.14e-01,+1.43e+00,+1.64e+00 1 (nil) -GenVertex: -120 ID: 0 (X,cT):0 - I: 1 193 -213 +2.70e-02,+3.31e-01,+2.97e-01,+7.93e-01 2 -120 - O: 2 415 -211 -1.79e-01,+3.73e-02,+3.36e-01,+4.08e-01 1 (nil) - 416 111 +2.06e-01,+2.93e-01,-3.94e-02,+3.85e-01 2 -199 -GenVertex: -121 ID: 0 (X,cT):0 - I: 1 195 113 -1.79e-01,+4.58e-01,+4.36e+00,+4.46e+00 2 -121 - O: 2 417 -211 -4.09e-01,+9.88e-02,+1.62e+00,+1.68e+00 1 (nil) - 418 211 +2.30e-01,+3.59e-01,+2.75e+00,+2.78e+00 1 (nil) -GenVertex: -122 ID: 0 (X,cT):0 - I: 1 196 -213 -8.75e-02,+1.16e-01,+1.21e+00,+1.46e+00 2 -122 - O: 2 419 -211 +1.71e-01,-8.56e-03,+1.11e+00,+1.13e+00 1 (nil) - 420 111 -2.59e-01,+1.24e-01,+1.06e-01,+3.34e-01 2 -200 -GenVertex: -123 ID: 0 (X,cT):0 - I: 1 197 323 -7.63e-01,+6.20e-01,+7.15e+00,+7.28e+00 2 -123 - O: 2 421 321 -4.34e-01,+3.13e-01,+2.39e+00,+2.49e+00 1 (nil) - 422 111 -3.29e-01,+3.07e-01,+4.76e+00,+4.78e+00 2 -201 -GenVertex: -124 ID: 0 (X,cT):0 - I: 1 198 221 -7.36e-01,+2.91e-01,+5.63e+00,+5.72e+00 2 -124 - O: 3 424 211 -2.05e-01,+1.05e-01,+1.26e+00,+1.28e+00 1 (nil) - 423 22 -3.68e-01,+1.74e-01,+3.63e+00,+3.66e+00 1 (nil) - 425 -211 -1.63e-01,+1.25e-02,+7.47e-01,+7.77e-01 1 (nil) -GenVertex: -125 ID: 0 (X,cT):0 - I: 1 200 213 +4.69e-02,-1.77e-01,-3.64e-01,+1.10e+00 2 -125 - O: 2 426 211 -3.67e-01,-1.30e-01,-4.96e-01,+6.46e-01 1 (nil) - 427 111 +4.14e-01,-4.69e-02,+1.31e-01,+4.58e-01 2 -202 -Vertex: -126 ID: 0 (X,cT)=+6.94e-05,-7.03e-06,+2.19e-04,+2.31e-04 - I: 1 201 111 +3.73e-01,-3.78e-02,+1.18e+00,+1.24e+00 2 -126 - O: 2 428 22 +1.73e-01,-3.58e-02,+3.54e-01,+3.96e-01 1 (nil) - 429 22 +2.00e-01,-2.02e-03,+8.22e-01,+8.46e-01 1 (nil) -GenVertex: -127 ID: 0 (X,cT):0 - I: 1 202 -213 -7.72e-01,+1.13e+00,+1.14e+00,+1.96e+00 2 -127 - O: 2 430 -211 -3.73e-02,+7.08e-01,+6.44e-01,+9.68e-01 1 (nil) - 431 111 -7.34e-01,+4.26e-01,+4.97e-01,+9.93e-01 2 -203 -GenVertex: -128 ID: 0 (X,cT):0 - I: 1 203 223 +4.07e-01,-5.29e-01,+1.12e-01,+1.04e+00 2 -128 - O: 3 432 211 +3.59e-01,-2.82e-01,+1.18e-01,+4.92e-01 1 (nil) - 433 -211 -1.50e-02,+9.43e-02,+3.19e-02,+1.72e-01 1 (nil) - 434 111 +6.29e-02,-3.41e-01,-3.80e-02,+3.74e-01 2 -204 -GenVertex: -129 ID: 0 (X,cT):0 - I: 1 204 223 -5.49e-02,-3.91e-01,+1.06e+00,+1.37e+00 2 -129 - O: 3 435 -211 +6.25e-02,-1.04e-01,+1.78e-01,+2.57e-01 1 (nil) - 436 211 +2.00e-02,-2.71e-01,+8.68e-01,+9.20e-01 1 (nil) - 437 111 -1.37e-01,-1.63e-02,+1.18e-02,+1.94e-01 2 -205 -Vertex: -130 ID: 0 (X,cT)=+1.58e-01,-6.64e-02,-8.93e-01,+9.27e-01 - I: 1 205 -421 +1.62e+00,-6.80e-01,-9.14e+00,+9.49e+00 2 -130 - O: 2 438 10323 +8.73e-01,-6.30e-01,-7.46e+00,+7.64e+00 2 -206 - 439 -211 +7.49e-01,-4.97e-02,-1.68e+00,+1.85e+00 1 (nil) -Vertex: -131 ID: 0 (X,cT)=+6.33e-05,-2.16e-05,-2.68e-04,+2.80e-04 - I: 1 206 111 +1.80e-01,-6.13e-02,-7.60e-01,+7.95e-01 2 -131 - O: 2 440 22 +1.83e-01,-8.44e-02,-7.27e-01,+7.54e-01 1 (nil) - 441 22 -3.44e-03,+2.31e-02,-3.29e-02,+4.04e-02 1 (nil) -GenVertex: -132 ID: 0 (X,cT):0 - I: 1 207 -311 +3.84e-01,+6.75e-01,-2.32e+00,+2.49e+00 2 -132 - O: 1 442 310 +3.84e-01,+6.75e-01,-2.32e+00,+2.49e+00 2 -207 -GenVertex: -133 ID: 0 (X,cT):0 - I: 1 209 311 +4.92e-01,+1.67e+00,-1.03e+01,+1.05e+01 2 -133 - O: 1 443 310 +4.92e-01,+1.67e+00,-1.03e+01,+1.05e+01 2 -208 -Vertex: -134 ID: 0 (X,cT)=+9.60e-06,+2.02e-06,-1.35e-04,+1.36e-04 - I: 1 210 111 +1.56e-01,+3.28e-02,-2.20e+00,+2.21e+00 2 -134 - O: 2 444 22 +1.58e-01,+4.61e-02,-2.17e+00,+2.18e+00 1 (nil) - 445 22 -2.08e-03,-1.33e-02,-2.27e-02,+2.64e-02 1 (nil) -Vertex: -135 ID: 0 (X,cT)=-6.11e-05,+1.37e-04,-6.02e-04,+6.24e-04 - I: 1 215 111 -1.24e-01,+2.78e-01,-1.22e+00,+1.26e+00 2 -135 - O: 2 446 22 -2.52e-02,+2.45e-02,-3.81e-01,+3.83e-01 1 (nil) - 447 22 -9.85e-02,+2.53e-01,-8.38e-01,+8.81e-01 1 (nil) -Vertex: -136 ID: 0 (X,cT)=-4.44e-05,-3.92e-06,-7.34e-04,+7.40e-04 - I: 1 217 111 -7.15e-02,-6.31e-03,-1.18e+00,+1.19e+00 2 -136 - O: 2 448 22 -9.35e-02,-3.77e-02,-1.03e+00,+1.04e+00 1 (nil) - 449 22 +2.21e-02,+3.14e-02,-1.46e-01,+1.51e-01 1 (nil) -Vertex: -137 ID: 0 (X,cT)=+3.41e-05,+1.99e-05,-1.06e-05,+5.12e-05 - I: 1 220 111 +1.49e-01,+8.68e-02,-4.65e-02,+2.24e-01 2 -137 - O: 2 450 22 +1.62e-01,+9.36e-02,-6.67e-02,+1.99e-01 1 (nil) - 451 22 -1.32e-02,-6.86e-03,+2.02e-02,+2.51e-02 1 (nil) -GenVertex: -138 ID: 0 (X,cT):0 - I: 1 221 -311 -8.28e-02,+1.40e-01,+2.87e-01,+5.97e-01 2 -138 - O: 1 452 130 -8.28e-02,+1.40e-01,+2.87e-01,+5.97e-01 1 (nil) -Vertex: -139 ID: 0 (X,cT)=-3.00e-05,-1.01e-05,+1.64e-06,+3.29e-05 - I: 1 226 111 -4.64e-01,-1.55e-01,+2.53e-02,+5.08e-01 2 -139 - O: 2 453 22 -2.22e-01,-3.76e-02,-4.59e-02,+2.30e-01 1 (nil) - 454 22 -2.42e-01,-1.18e-01,+7.12e-02,+2.78e-01 1 (nil) -Vertex: -140 ID: 0 (X,cT)=-5.23e-07,-7.76e-06,+4.86e-05,+4.96e-05 - I: 1 231 111 -1.13e-02,-1.68e-01,+1.05e+00,+1.07e+00 2 -140 - O: 2 455 22 +4.72e-02,-1.23e-01,+8.16e-01,+8.27e-01 1 (nil) - 456 22 -5.85e-02,-4.52e-02,+2.34e-01,+2.45e-01 1 (nil) -Vertex: -141 ID: 0 (X,cT)=+3.06e-05,-6.13e-05,+1.04e-03,+1.04e-03 - I: 1 233 111 +1.15e-01,-2.30e-01,+3.89e+00,+3.90e+00 2 -141 - O: 2 457 22 +4.00e-02,+3.07e-04,+9.61e-01,+9.62e-01 1 (nil) - 458 22 +7.48e-02,-2.30e-01,+2.93e+00,+2.94e+00 1 (nil) -Vertex: -142 ID: 0 (X,cT)=-4.86e-07,+1.36e-05,+5.54e-03,+5.54e-03 - I: 1 240 111 -1.84e-03,+5.13e-02,+2.10e+01,+2.10e+01 2 -142 - O: 2 459 22 +6.53e-02,+3.07e-02,+8.88e+00,+8.88e+00 1 (nil) - 460 22 -6.72e-02,+2.07e-02,+1.21e+01,+1.21e+01 1 (nil) -Vertex: -143 ID: 0 (X,cT)=+9.00e-01,-4.13e-01,-2.42e+00,+2.63e+00 - I: 1 241 421 +6.24e+00,-2.87e+00,-1.68e+01,+1.82e+01 2 -143 - O: 2 461 -313 +3.33e+00,-1.55e+00,-7.24e+00,+8.16e+00 2 -209 - 462 111 +2.92e+00,-1.31e+00,-9.56e+00,+1.01e+01 2 -210 -Vertex: -144 ID: 0 (X,cT)=+1.11e-04,-5.90e-05,-2.87e-04,+3.15e-04 - I: 1 242 111 +4.94e-01,-2.63e-01,-1.28e+00,+1.40e+00 2 -144 - O: 2 463 22 +3.13e-01,-2.24e-01,-9.52e-01,+1.03e+00 1 (nil) - 464 22 +1.81e-01,-3.87e-02,-3.28e-01,+3.76e-01 1 (nil) -Vertex: -145 ID: 0 (X,cT)=+2.18e-05,-5.26e-06,-3.70e-05,+4.34e-05 - I: 1 244 111 +8.10e-01,-1.96e-01,-1.38e+00,+1.62e+00 2 -145 - O: 2 465 22 +6.12e-01,-2.00e-01,-1.10e+00,+1.28e+00 1 (nil) - 466 22 +1.98e-01,+3.77e-03,-2.74e-01,+3.39e-01 1 (nil) -GenVertex: -146 ID: 0 (X,cT):0 - I: 1 247 221 +3.89e-01,-5.39e-01,-8.71e-01,+1.22e+00 2 -146 - O: 3 467 -211 +1.74e-01,-1.31e-01,-4.30e-01,+5.02e-01 1 (nil) - 468 211 +5.41e-02,-2.04e-01,-3.15e-01,+4.04e-01 1 (nil) - 469 111 +1.61e-01,-2.04e-01,-1.26e-01,+3.19e-01 2 -211 -Vertex: -147 ID: 0 (X,cT)=+1.07e-04,-3.60e-05,-3.69e-04,+3.86e-04 - I: 1 249 111 +7.72e-01,-2.59e-01,-2.66e+00,+2.78e+00 2 -147 - O: 2 470 22 +2.51e-02,-3.16e-02,-2.06e-01,+2.10e-01 1 (nil) - 471 22 +7.47e-01,-2.27e-01,-2.45e+00,+2.57e+00 1 (nil) -Vertex: -148 ID: 0 (X,cT)=-8.22e+00,-2.29e+00,+1.29e+02,+1.35e+02 - I: 1 254 310 -1.08e-01,-3.01e-02,+1.70e+00,+1.77e+00 2 -148 - O: 2 472 211 +1.20e-02,+1.80e-01,+6.79e-01,+7.16e-01 1 (nil) - 473 -211 -1.20e-01,-2.10e-01,+1.02e+00,+1.05e+00 1 (nil) -Vertex: -149 ID: 0 (X,cT)=-9.20e-06,+3.86e-06,+4.76e-05,+4.89e-05 - I: 1 258 111 -2.36e-01,+9.89e-02,+1.22e+00,+1.25e+00 2 -149 - O: 2 474 22 -1.60e-01,+3.34e-03,+8.26e-01,+8.41e-01 1 (nil) - 475 22 -7.61e-02,+9.56e-02,+3.95e-01,+4.13e-01 1 (nil) -Vertex: -150 ID: 0 (X,cT)=-5.14e-04,-8.73e-05,+1.03e-02,+1.04e-02 - I: 1 260 111 -1.11e+00,-1.89e-01,+2.24e+01,+2.24e+01 2 -150 - O: 2 476 22 -9.81e-01,-1.35e-01,+2.02e+01,+2.02e+01 1 (nil) - 477 22 -1.30e-01,-5.37e-02,+2.22e+00,+2.22e+00 1 (nil) -Vertex: -151 ID: 0 (X,cT)=+1.88e-05,+4.46e-05,+6.87e-04,+6.89e-04 - I: 1 263 111 +1.08e-01,+2.55e-01,+3.93e+00,+3.94e+00 2 -151 - O: 2 478 22 +1.10e-01,+2.16e-01,+2.55e+00,+2.56e+00 1 (nil) - 479 22 -2.65e-03,+3.91e-02,+1.38e+00,+1.38e+00 1 (nil) -Vertex: -152 ID: 0 (X,cT)=-6.14e-05,-3.82e-05,+7.27e-04,+7.31e-04 - I: 1 265 111 -3.21e-01,-1.99e-01,+3.80e+00,+3.82e+00 2 -152 - O: 2 480 22 -2.34e-01,-1.54e-01,+3.28e+00,+3.29e+00 1 (nil) - 481 22 -8.72e-02,-4.50e-02,+5.19e-01,+5.28e-01 1 (nil) -Vertex: -153 ID: 0 (X,cT)=-2.19e-06,-3.00e-06,+3.58e-04,+3.58e-04 - I: 1 267 111 -1.18e-01,-1.61e-01,+1.92e+01,+1.92e+01 2 -153 - O: 2 482 22 -9.69e-02,-1.72e-01,+1.33e+01,+1.34e+01 1 (nil) - 483 22 -2.08e-02,+1.15e-02,+5.82e+00,+5.82e+00 1 (nil) -Vertex: -154 ID: 0 (X,cT)=-9.00e-04,+6.71e-04,+1.89e-01,+1.89e-01 - I: 1 273 111 -1.19e+00,+8.85e-01,+2.49e+02,+2.49e+02 2 -154 - O: 2 484 22 -5.91e-01,+4.58e-01,+1.37e+02,+1.37e+02 1 (nil) - 485 22 -5.96e-01,+4.27e-01,+1.12e+02,+1.12e+02 1 (nil) -Vertex: -155 ID: 0 (X,cT)=-5.19e-06,+2.77e-05,+9.61e-03,+9.61e-03 - I: 1 275 111 -3.94e-02,+2.10e-01,+7.29e+01,+7.29e+01 2 -155 - O: 2 486 22 -5.34e-02,+1.01e-01,+2.01e+01,+2.01e+01 1 (nil) - 487 22 +1.40e-02,+1.09e-01,+5.28e+01,+5.28e+01 1 (nil) -Vertex: -156 ID: 0 (X,cT)=-3.80e-05,+2.22e-05,+1.37e-02,+1.37e-02 - I: 1 280 111 -1.09e-01,+6.39e-02,+3.93e+01,+3.93e+01 2 -156 - O: 2 488 22 -5.83e-02,+1.46e-02,+3.27e+01,+3.27e+01 1 (nil) - 489 22 -5.08e-02,+4.93e-02,+6.60e+00,+6.60e+00 1 (nil) -Vertex: -157 ID: 0 (X,cT)=+6.48e-05,+4.92e-04,+1.80e-02,+1.80e-02 - I: 1 284 111 +1.27e-01,+9.61e-01,+3.52e+01,+3.52e+01 2 -157 - O: 2 490 22 -2.52e-02,+2.35e-01,+8.00e+00,+8.00e+00 1 (nil) - 491 22 +1.52e-01,+7.26e-01,+2.72e+01,+2.72e+01 1 (nil) -Vertex: -158 ID: 0 (X,cT)=+1.48e-04,+1.07e-04,+1.80e-03,+1.81e-03 - I: 1 285 111 +2.92e-01,+2.10e-01,+3.56e+00,+3.58e+00 2 -158 - O: 2 492 22 +2.42e-01,+1.03e-01,+2.23e+00,+2.25e+00 1 (nil) - 493 22 +5.02e-02,+1.07e-01,+1.33e+00,+1.33e+00 1 (nil) -Vertex: -159 ID: 0 (X,cT)=+2.50e-05,+3.78e-05,+5.99e-04,+6.03e-04 - I: 1 286 111 +7.22e-02,+1.09e-01,+1.73e+00,+1.74e+00 2 -159 - O: 2 494 22 +2.13e-02,+6.88e-02,+1.49e+00,+1.49e+00 1 (nil) - 495 22 +5.09e-02,+4.05e-02,+2.47e-01,+2.55e-01 1 (nil) -Vertex: -160 ID: 0 (X,cT)=+2.02e-05,+3.78e-06,+1.16e-03,+1.16e-03 - I: 1 287 111 +5.73e-02,+1.07e-02,+3.27e+00,+3.27e+00 2 -160 - O: 2 496 22 -1.28e-02,-2.31e-02,+1.49e-01,+1.51e-01 1 (nil) - 497 22 +7.01e-02,+3.38e-02,+3.12e+00,+3.12e+00 1 (nil) -Vertex: -161 ID: 0 (X,cT)=+9.91e-05,+2.78e-04,+4.67e-03,+4.68e-03 - I: 1 289 111 +4.18e-01,+1.18e+00,+1.97e+01,+1.98e+01 2 -161 - O: 2 498 22 +2.65e-01,+6.35e-01,+1.17e+01,+1.18e+01 1 (nil) - 499 22 +1.54e-01,+5.40e-01,+7.99e+00,+8.01e+00 1 (nil) -GenVertex: -162 ID: 0 (X,cT):0 - I: 1 294 221 +9.56e-01,+1.28e+00,+1.76e+01,+1.77e+01 2 -162 - O: 3 500 111 +3.73e-01,+4.04e-01,+4.84e+00,+4.87e+00 2 -212 - 501 111 +4.30e-01,+7.17e-01,+9.92e+00,+9.96e+00 2 -213 - 502 111 +1.53e-01,+1.59e-01,+2.85e+00,+2.86e+00 2 -214 -Vertex: -163 ID: 0 (X,cT)=+2.58e-04,-2.44e-04,+2.53e-03,+2.55e-03 - I: 1 296 111 +1.69e+00,-1.60e+00,+1.65e+01,+1.67e+01 2 -163 - O: 2 503 22 +1.04e+00,-1.02e+00,+1.08e+01,+1.09e+01 1 (nil) - 504 22 +6.52e-01,-5.77e-01,+5.78e+00,+5.84e+00 1 (nil) -Vertex: -164 ID: 0 (X,cT)=+2.91e+01,-1.32e+01,+2.80e+02,+2.82e+02 - I: 1 297 310 +6.37e-01,-2.90e-01,+6.13e+00,+6.19e+00 2 -164 - O: 2 505 -211 +1.68e-01,+3.96e-04,+7.88e-01,+8.18e-01 1 (nil) - 506 211 +4.69e-01,-2.90e-01,+5.34e+00,+5.37e+00 1 (nil) -Vertex: -165 ID: 0 (X,cT)=-3.01e+00,-5.05e+01,+1.82e+02,+1.91e+02 - I: 1 299 310 -5.64e-02,-9.48e-01,+3.42e+00,+3.58e+00 2 -165 - O: 2 507 211 -9.80e-03,-8.77e-01,+3.10e+00,+3.22e+00 1 (nil) - 508 -211 -4.66e-02,-7.14e-02,+3.18e-01,+3.57e-01 1 (nil) -Vertex: -166 ID: 0 (X,cT)=+5.65e-06,-7.57e-05,+2.42e-04,+2.55e-04 - I: 1 301 111 +2.32e-02,-3.11e-01,+9.92e-01,+1.05e+00 2 -166 - O: 2 509 22 -1.58e-02,-2.94e-01,+9.06e-01,+9.53e-01 1 (nil) - 510 22 +3.90e-02,-1.71e-02,+8.60e-02,+9.59e-02 1 (nil) -Vertex: -167 ID: 0 (X,cT)=-1.40e-04,-1.73e-04,+1.47e-04,+2.68e-04 - I: 1 305 111 -7.25e-01,-8.95e-01,+7.64e-01,+1.39e+00 2 -167 - O: 2 511 22 -1.23e-01,-1.25e-01,+1.74e-01,+2.47e-01 1 (nil) - 512 22 -6.01e-01,-7.71e-01,+5.90e-01,+1.14e+00 1 (nil) -Vertex: -168 ID: 0 (X,cT)=-2.82e-04,-3.80e-04,+1.23e-04,+4.92e-04 - I: 1 307 111 -7.03e-01,-9.49e-01,+3.08e-01,+1.23e+00 2 -168 - O: 2 513 22 -4.88e-01,-5.82e-01,+1.49e-01,+7.74e-01 1 (nil) - 514 22 -2.15e-01,-3.67e-01,+1.58e-01,+4.54e-01 1 (nil) -Vertex: -169 ID: 0 (X,cT)=-3.47e-04,-5.20e-04,-6.20e-04,+8.81e-04 - I: 1 311 111 -1.10e+00,-1.65e+00,-1.97e+00,+2.80e+00 2 -169 - O: 2 515 22 -1.08e+00,-1.63e+00,-1.96e+00,+2.76e+00 1 (nil) - 516 22 -2.45e-02,-2.46e-02,-1.45e-02,+3.76e-02 1 (nil) -Vertex: -170 ID: 0 (X,cT)=-3.29e-06,+1.10e-06,-2.41e-06,+4.57e-06 - I: 1 313 111 -2.55e-01,+8.51e-02,-1.87e-01,+3.54e-01 2 -170 - O: 2 517 22 -1.13e-01,-2.84e-02,-9.56e-02,+1.51e-01 1 (nil) - 518 22 -1.42e-01,+1.13e-01,-9.12e-02,+2.04e-01 1 (nil) -Vertex: -171 ID: 0 (X,cT)=-2.73e+00,+6.86e+00,-1.26e+01,+1.53e+01 - I: 1 314 310 -2.88e-01,+7.23e-01,-1.33e+00,+1.62e+00 2 -171 - O: 2 519 -211 -3.73e-01,+4.98e-01,-1.02e+00,+1.20e+00 1 (nil) - 520 211 +8.58e-02,+2.25e-01,-3.14e-01,+4.20e-01 1 (nil) -Vertex: -172 ID: 0 (X,cT)=+3.20e-04,+3.36e-05,-5.97e-04,+6.84e-04 - I: 1 318 111 +4.68e-01,+4.92e-02,-8.74e-01,+1.00e+00 2 -172 - O: 2 521 22 +1.99e-02,+1.62e-02,-1.31e-01,+1.33e-01 1 (nil) - 522 22 +4.48e-01,+3.29e-02,-7.43e-01,+8.69e-01 1 (nil) -Vertex: -173 ID: 0 (X,cT)=+1.96e-05,+4.48e-05,-3.57e-03,+3.57e-03 - I: 1 331 111 +1.15e-01,+2.64e-01,-2.11e+01,+2.11e+01 2 -173 - O: 2 523 22 +5.11e-03,+1.71e-01,-1.28e+01,+1.28e+01 1 (nil) - 524 22 +1.10e-01,+9.28e-02,-8.25e+00,+8.26e+00 1 (nil) -Vertex: -174 ID: 0 (X,cT)=+5.52e-05,+5.68e-07,-2.13e-03,+2.13e-03 - I: 1 334 111 +1.60e-01,+1.64e-03,-6.16e+00,+6.16e+00 2 -174 - O: 2 525 22 +9.75e-02,+6.03e-02,-2.60e+00,+2.61e+00 1 (nil) - 526 22 +6.22e-02,-5.86e-02,-3.55e+00,+3.56e+00 1 (nil) -Vertex: -175 ID: 0 (X,cT)=+5.38e-05,-1.78e-05,-4.71e-04,+4.74e-04 - I: 1 335 111 +3.20e-01,-1.06e-01,-2.80e+00,+2.83e+00 2 -175 - O: 2 527 22 +5.30e-02,+1.88e-02,-7.85e-01,+7.87e-01 1 (nil) - 528 22 +2.67e-01,-1.25e-01,-2.02e+00,+2.04e+00 1 (nil) -Vertex: -176 ID: 0 (X,cT)=+2.93e-05,+8.83e-06,-3.69e-04,+3.70e-04 - I: 1 336 111 +2.91e-01,+8.79e-02,-3.67e+00,+3.68e+00 2 -176 - O: 2 529 22 +2.68e-01,+3.23e-02,-2.79e+00,+2.81e+00 1 (nil) - 530 22 +2.34e-02,+5.56e-02,-8.74e-01,+8.76e-01 1 (nil) -Vertex: -177 ID: 0 (X,cT)=+1.18e-05,+1.50e-06,-2.95e-04,+2.98e-04 - I: 1 337 111 +4.06e-02,+5.17e-03,-1.02e+00,+1.02e+00 2 -177 - O: 2 531 22 -1.54e-02,-5.04e-02,-2.38e-01,+2.44e-01 1 (nil) - 532 22 +5.60e-02,+5.56e-02,-7.77e-01,+7.81e-01 1 (nil) -Vertex: -178 ID: 0 (X,cT)=+3.27e-04,+1.05e-03,-1.22e-02,+1.23e-02 - I: 1 339 111 +5.88e-01,+1.89e+00,-2.20e+01,+2.20e+01 2 -178 - O: 2 533 22 +9.44e-02,+2.34e-01,-3.28e+00,+3.29e+00 1 (nil) - 534 22 +4.93e-01,+1.65e+00,-1.87e+01,+1.88e+01 1 (nil) -Vertex: -179 ID: 0 (X,cT)=+1.73e-05,+8.31e-04,-1.74e-02,+1.74e-02 - I: 1 347 111 +1.51e-02,+7.22e-01,-1.51e+01,+1.51e+01 2 -179 - O: 2 535 22 -3.85e-02,+1.69e-01,-2.84e+00,+2.85e+00 1 (nil) - 536 22 +5.35e-02,+5.53e-01,-1.22e+01,+1.23e+01 1 (nil) -Vertex: -180 ID: 0 (X,cT)=+1.08e-05,+1.04e-05,-2.06e-04,+2.08e-04 - I: 1 349 111 +5.56e-02,+5.31e-02,-1.06e+00,+1.07e+00 2 -180 - O: 2 537 22 -2.80e-02,+6.26e-02,-5.73e-01,+5.77e-01 1 (nil) - 538 22 +8.36e-02,-9.58e-03,-4.84e-01,+4.91e-01 1 (nil) -GenVertex: -181 ID: 0 (X,cT):0 - I: 1 352 -311 +4.98e-01,+5.10e-01,-7.52e+00,+7.57e+00 2 -181 - O: 1 539 310 +4.98e-01,+5.10e-01,-7.52e+00,+7.57e+00 2 -215 -Vertex: -182 ID: 0 (X,cT)=+8.78e-05,+1.31e-05,-1.01e-03,+1.01e-03 - I: 1 353 111 +9.21e-01,+1.38e-01,-1.06e+01,+1.06e+01 2 -182 - O: 2 540 22 +2.76e-01,+8.46e-03,-3.75e+00,+3.76e+00 1 (nil) - 541 22 +6.45e-01,+1.29e-01,-6.82e+00,+6.85e+00 1 (nil) -Vertex: -183 ID: 0 (X,cT)=-2.61e-05,-7.86e-05,-8.03e-03,+8.03e-03 - I: 1 355 111 -1.59e-01,-4.77e-01,-4.88e+01,+4.88e+01 2 -183 - O: 2 542 22 -7.47e-03,+4.92e-03,-2.71e-01,+2.71e-01 1 (nil) - 543 22 -1.51e-01,-4.82e-01,-4.85e+01,+4.85e+01 1 (nil) -Vertex: -184 ID: 0 (X,cT)=+3.04e-05,-1.20e-04,-6.56e-03,+6.56e-03 - I: 1 359 111 +6.89e-02,-2.71e-01,-1.49e+01,+1.49e+01 2 -184 - O: 2 544 22 +1.36e-02,-6.16e-02,-1.31e+00,+1.31e+00 1 (nil) - 545 22 +5.54e-02,-2.10e-01,-1.35e+01,+1.35e+01 1 (nil) -Vertex: -185 ID: 0 (X,cT)=-3.11e-05,-4.88e-05,-3.97e-03,+3.97e-03 - I: 1 362 111 -2.65e-01,-4.16e-01,-3.38e+01,+3.38e+01 2 -185 - O: 2 546 22 -2.39e-02,-6.37e-02,-2.40e+00,+2.40e+00 1 (nil) - 547 22 -2.41e-01,-3.52e-01,-3.14e+01,+3.14e+01 1 (nil) -Vertex: -186 ID: 0 (X,cT)=+4.99e-06,-7.81e-06,-4.87e-04,+4.87e-04 - I: 1 364 111 +7.55e-02,-1.18e-01,-7.35e+00,+7.36e+00 2 -186 - O: 3 549 11 +3.80e-02,-5.45e-02,-1.98e+00,+1.99e+00 1 (nil) - 548 22 -7.69e-03,-3.50e-03,-3.43e+00,+3.43e+00 1 (nil) - 550 -11 +4.52e-02,-6.00e-02,-1.94e+00,+1.94e+00 1 (nil) -Vertex: -187 ID: 0 (X,cT)=-3.39e-06,-5.26e-06,-1.10e-03,+1.10e-03 - I: 1 372 111 -6.13e-02,-9.53e-02,-1.99e+01,+1.99e+01 2 -187 - O: 2 551 22 +3.73e-02,+2.39e-03,-4.50e+00,+4.50e+00 1 (nil) - 552 22 -9.86e-02,-9.77e-02,-1.54e+01,+1.54e+01 1 (nil) -Vertex: -188 ID: 0 (X,cT)=-4.64e-06,+5.62e-06,+2.46e-05,+2.68e-05 - I: 1 379 111 -7.99e-02,+9.68e-02,+4.23e-01,+4.62e-01 2 -188 - O: 2 553 22 -6.55e-03,+1.04e-01,+1.84e-01,+2.11e-01 1 (nil) - 554 22 -7.33e-02,-6.90e-03,+2.39e-01,+2.50e-01 1 (nil) -Vertex: -189 ID: 0 (X,cT)=-4.97e-05,+1.48e-05,+2.90e-04,+2.95e-04 - I: 1 381 111 -3.23e-01,+9.61e-02,+1.88e+00,+1.91e+00 2 -189 - O: 2 555 22 -1.22e-01,-2.90e-02,+7.14e-01,+7.25e-01 1 (nil) - 556 22 -2.00e-01,+1.25e-01,+1.16e+00,+1.19e+00 1 (nil) -Vertex: -190 ID: 0 (X,cT)=+4.11e-06,-1.39e-06,+1.15e-04,+1.15e-04 - I: 1 386 111 +1.99e-01,-6.72e-02,+5.57e+00,+5.57e+00 2 -190 - O: 2 557 22 +9.39e-02,+3.48e-02,+1.85e+00,+1.85e+00 1 (nil) - 558 22 +1.05e-01,-1.02e-01,+3.72e+00,+3.72e+00 1 (nil) -GenVertex: -191 ID: 0 (X,cT):0 - I: 1 388 113 +8.30e-02,-2.83e-01,+1.61e+01,+1.61e+01 2 -191 - O: 2 559 211 +2.80e-01,-4.59e-01,+9.99e+00,+1.00e+01 1 (nil) - 560 -211 -1.97e-01,+1.77e-01,+6.12e+00,+6.13e+00 1 (nil) -Vertex: -192 ID: 0 (X,cT)=-3.81e+00,+2.43e+00,-3.67e+01,+3.70e+01 - I: 1 397 323 -2.16e+01,+1.35e+01,-2.09e+02,+2.11e+02 2 -192 - O: 2 561 311 -1.87e+01,+1.16e+01,-1.82e+02,+1.84e+02 2 -216 - 562 211 -2.87e+00,+1.93e+00,-2.71e+01,+2.73e+01 1 (nil) -GenVertex: -193 ID: 0 (X,cT):0 - I: 1 399 -311 -4.47e-01,+3.05e-01,-6.33e+00,+6.37e+00 2 -193 - O: 1 563 310 -4.47e-01,+3.05e-01,-6.33e+00,+6.37e+00 2 -217 -Vertex: -194 ID: 0 (X,cT)=-3.15e-04,+1.64e-04,-3.28e-03,+3.30e-03 - I: 1 400 111 -1.24e+00,+6.47e-01,-1.29e+01,+1.30e+01 2 -194 - O: 2 564 22 -2.94e-01,+1.77e-01,-3.70e+00,+3.71e+00 1 (nil) - 565 22 -9.48e-01,+4.69e-01,-9.23e+00,+9.29e+00 1 (nil) -GenVertex: -195 ID: 0 (X,cT):0 - I: 1 401 311 -9.33e-01,+9.63e-01,-1.12e+01,+1.13e+01 2 -195 - O: 1 566 310 -9.33e-01,+9.63e-01,-1.12e+01,+1.13e+01 2 -218 -Vertex: -196 ID: 0 (X,cT)=-6.57e-06,+3.84e-06,-3.95e-05,+4.09e-05 - I: 1 404 111 -1.17e-01,+6.82e-02,-7.01e-01,+7.26e-01 2 -196 - O: 2 567 22 +1.75e-02,+4.41e-02,-2.82e-01,+2.86e-01 1 (nil) - 568 22 -1.34e-01,+2.41e-02,-4.19e-01,+4.40e-01 1 (nil) -Vertex: -197 ID: 0 (X,cT)=-4.47e-05,-7.78e-05,+3.13e-05,+9.80e-05 - I: 1 410 111 -2.51e-01,-4.37e-01,+1.76e-01,+5.51e-01 2 -197 - O: 2 569 22 -1.16e-01,-2.11e-01,+1.32e-02,+2.41e-01 1 (nil) - 570 22 -1.36e-01,-2.27e-01,+1.63e-01,+3.10e-01 1 (nil) -Vertex: -198 ID: 0 (X,cT)=-4.20e-06,+2.71e-05,+4.10e-05,+4.99e-05 - I: 1 412 111 -7.90e-02,+5.11e-01,+7.72e-01,+9.39e-01 2 -198 - O: 2 571 22 -9.13e-02,+4.77e-01,+7.59e-01,+9.01e-01 1 (nil) - 572 22 +1.23e-02,+3.33e-02,+1.37e-02,+3.81e-02 1 (nil) -Vertex: -199 ID: 0 (X,cT)=+2.92e-05,+4.15e-05,-5.58e-06,+5.45e-05 - I: 1 416 111 +2.06e-01,+2.93e-01,-3.94e-02,+3.85e-01 2 -199 - O: 2 573 22 +2.03e-01,+2.67e-01,-7.22e-02,+3.43e-01 1 (nil) - 574 22 +3.43e-03,+2.63e-02,+3.28e-02,+4.22e-02 1 (nil) -Vertex: -200 ID: 0 (X,cT)=-2.16e-05,+1.04e-05,+8.87e-06,+2.79e-05 - I: 1 420 111 -2.59e-01,+1.24e-01,+1.06e-01,+3.34e-01 2 -200 - O: 2 575 22 -3.89e-02,+8.36e-02,+4.53e-02,+1.03e-01 1 (nil) - 576 22 -2.20e-01,+4.05e-02,+6.09e-02,+2.32e-01 1 (nil) -Vertex: -201 ID: 0 (X,cT)=-5.59e-05,+5.21e-05,+8.09e-04,+8.13e-04 - I: 1 422 111 -3.29e-01,+3.07e-01,+4.76e+00,+4.78e+00 2 -201 - O: 2 577 22 -2.64e-01,+1.59e-01,+3.14e+00,+3.16e+00 1 (nil) - 578 22 -6.51e-02,+1.48e-01,+1.62e+00,+1.62e+00 1 (nil) -Vertex: -202 ID: 0 (X,cT)=+2.56e-05,-2.90e-06,+8.11e-06,+2.82e-05 - I: 1 427 111 +4.14e-01,-4.69e-02,+1.31e-01,+4.58e-01 2 -202 - O: 2 579 22 +4.15e-01,-2.52e-02,+1.20e-01,+4.33e-01 1 (nil) - 580 22 -9.68e-04,-2.17e-02,+1.13e-02,+2.45e-02 1 (nil) -Vertex: -203 ID: 0 (X,cT)=-9.79e-05,+5.68e-05,+6.63e-05,+1.32e-04 - I: 1 431 111 -7.34e-01,+4.26e-01,+4.97e-01,+9.93e-01 2 -203 - O: 2 581 22 -3.41e-01,+2.71e-01,+2.25e-01,+4.90e-01 1 (nil) - 582 22 -3.94e-01,+1.56e-01,+2.73e-01,+5.03e-01 1 (nil) -Vertex: -204 ID: 0 (X,cT)=+1.01e-05,-5.45e-05,-6.08e-06,+5.98e-05 - I: 1 434 111 +6.29e-02,-3.41e-01,-3.80e-02,+3.74e-01 2 -204 - O: 2 583 22 +5.58e-02,-8.25e-02,+3.46e-02,+1.05e-01 1 (nil) - 584 22 +7.11e-03,-2.58e-01,-7.26e-02,+2.69e-01 1 (nil) -Vertex: -205 ID: 0 (X,cT)=-3.75e-05,-4.46e-06,+3.21e-06,+5.29e-05 - I: 1 437 111 -1.37e-01,-1.63e-02,+1.18e-02,+1.94e-01 2 -205 - O: 2 585 22 -9.46e-02,+4.14e-02,+4.73e-02,+1.14e-01 1 (nil) - 586 22 -4.29e-02,-5.77e-02,-3.55e-02,+8.02e-02 1 (nil) -Vertex: -206 ID: 0 (X,cT)=+1.58e-01,-6.64e-02,-8.93e-01,+9.27e-01 - I: 1 438 10323 +8.73e-01,-6.30e-01,-7.46e+00,+7.64e+00 2 -206 - O: 2 587 321 +3.86e-01,-2.73e-01,-2.92e+00,+3.00e+00 1 (nil) - 588 223 +4.87e-01,-3.58e-01,-4.53e+00,+4.64e+00 2 -219 -Vertex: -207 ID: 0 (X,cT)=+6.34e+00,+1.12e+01,-3.83e+01,+4.12e+01 - I: 1 442 310 +3.84e-01,+6.75e-01,-2.32e+00,+2.49e+00 2 -207 - O: 2 589 -211 +1.48e-01,+5.93e-01,-1.74e+00,+1.85e+00 1 (nil) - 590 211 +2.36e-01,+8.15e-02,-5.72e-01,+6.40e-01 1 (nil) -Vertex: -208 ID: 0 (X,cT)=+6.83e+00,+2.32e+01,-1.43e+02,+1.45e+02 - I: 1 443 310 +4.92e-01,+1.67e+00,-1.03e+01,+1.05e+01 2 -208 - O: 2 591 211 +2.44e-01,+1.36e+00,-7.90e+00,+8.02e+00 1 (nil) - 592 -211 +2.48e-01,+3.05e-01,-2.40e+00,+2.43e+00 1 (nil) -Vertex: -209 ID: 0 (X,cT)=+9.00e-01,-4.13e-01,-2.42e+00,+2.63e+00 - I: 1 461 -313 +3.33e+00,-1.55e+00,-7.24e+00,+8.16e+00 2 -209 - O: 2 593 -321 +2.28e+00,-1.05e+00,-5.51e+00,+6.07e+00 1 (nil) - 594 211 +1.05e+00,-5.07e-01,-1.73e+00,+2.09e+00 1 (nil) -Vertex: -210 ID: 0 (X,cT)=+9.00e-01,-4.13e-01,-2.42e+00,+2.63e+00 - I: 1 462 111 +2.92e+00,-1.31e+00,-9.56e+00,+1.01e+01 2 -210 - O: 2 595 22 +2.61e+00,-1.13e+00,-8.44e+00,+8.90e+00 1 (nil) - 596 22 +3.12e-01,-1.85e-01,-1.12e+00,+1.18e+00 1 (nil) -Vertex: -211 ID: 0 (X,cT)=+1.16e-05,-1.47e-05,-9.04e-06,+2.29e-05 - I: 1 469 111 +1.61e-01,-2.04e-01,-1.26e-01,+3.19e-01 2 -211 - O: 2 597 22 +1.53e-02,-6.02e-02,-9.24e-02,+1.11e-01 1 (nil) - 598 22 +1.46e-01,-1.44e-01,-3.35e-02,+2.08e-01 1 (nil) -Vertex: -212 ID: 0 (X,cT)=+4.54e-05,+4.92e-05,+5.89e-04,+5.93e-04 - I: 1 500 111 +3.73e-01,+4.04e-01,+4.84e+00,+4.87e+00 2 -212 - O: 2 599 22 +6.24e-02,+9.07e-02,+5.92e-01,+6.02e-01 1 (nil) - 600 22 +3.10e-01,+3.13e-01,+4.25e+00,+4.27e+00 1 (nil) -Vertex: -213 ID: 0 (X,cT)=+1.06e-05,+1.77e-05,+2.45e-04,+2.46e-04 - I: 1 501 111 +4.30e-01,+7.17e-01,+9.92e+00,+9.96e+00 2 -213 - O: 2 601 22 +2.70e-01,+3.42e-01,+4.68e+00,+4.70e+00 1 (nil) - 602 22 +1.60e-01,+3.75e-01,+5.24e+00,+5.26e+00 1 (nil) -Vertex: -214 ID: 0 (X,cT)=+3.42e-05,+3.55e-05,+6.36e-04,+6.39e-04 - I: 1 502 111 +1.53e-01,+1.59e-01,+2.85e+00,+2.86e+00 2 -214 - O: 2 603 22 +1.66e-01,+9.32e-02,+2.21e+00,+2.21e+00 1 (nil) - 604 22 -1.33e-02,+6.57e-02,+6.40e-01,+6.43e-01 1 (nil) -Vertex: -215 ID: 0 (X,cT)=+2.34e+01,+2.39e+01,-3.53e+02,+3.55e+02 - I: 1 539 310 +4.98e-01,+5.10e-01,-7.52e+00,+7.57e+00 2 -215 - O: 2 605 -211 -2.61e-02,+1.43e-01,-1.27e+00,+1.29e+00 1 (nil) - 606 211 +5.24e-01,+3.67e-01,-6.25e+00,+6.28e+00 1 (nil) -Vertex: -216 ID: 0 (X,cT)=-3.81e+00,+2.43e+00,-3.67e+01,+3.70e+01 - I: 1 561 311 -1.87e+01,+1.16e+01,-1.82e+02,+1.84e+02 2 -216 - O: 1 607 130 -1.87e+01,+1.16e+01,-1.82e+02,+1.84e+02 1 (nil) -Vertex: -217 ID: 0 (X,cT)=-8.57e+01,+5.84e+01,-1.21e+03,+1.22e+03 - I: 1 563 310 -4.47e-01,+3.05e-01,-6.33e+00,+6.37e+00 2 -217 - O: 2 608 111 -3.60e-01,+3.29e-01,-3.33e+00,+3.37e+00 2 -220 - 609 111 -8.72e-02,-2.40e-02,-2.99e+00,+3.00e+00 2 -221 -Vertex: -218 ID: 0 (X,cT)=-1.70e+00,+1.75e+00,-2.03e+01,+2.05e+01 - I: 1 566 310 -9.33e-01,+9.63e-01,-1.12e+01,+1.13e+01 2 -218 - O: 2 610 111 -1.61e-01,+2.25e-01,-1.49e+00,+1.52e+00 2 -222 - 611 111 -7.72e-01,+7.38e-01,-9.69e+00,+9.75e+00 2 -223 -Vertex: -219 ID: 0 (X,cT)=+1.58e-01,-6.64e-02,-8.93e-01,+9.27e-01 - I: 1 588 223 +4.87e-01,-3.58e-01,-4.53e+00,+4.64e+00 2 -219 - O: 3 612 -211 +3.21e-01,-2.23e-01,-1.77e+00,+1.82e+00 1 (nil) - 613 211 +1.03e-01,-2.97e-01,-2.00e+00,+2.03e+00 1 (nil) - 614 111 +6.30e-02,+1.63e-01,-7.63e-01,+7.94e-01 2 -224 -Vertex: -220 ID: 0 (X,cT)=-8.57e+01,+5.84e+01,-1.21e+03,+1.22e+03 - I: 1 608 111 -3.60e-01,+3.29e-01,-3.33e+00,+3.37e+00 2 -220 - O: 2 615 22 -3.26e-01,+2.76e-01,-3.12e+00,+3.15e+00 1 (nil) - 616 22 -3.41e-02,+5.33e-02,-2.15e-01,+2.24e-01 1 (nil) -Vertex: -221 ID: 0 (X,cT)=-8.57e+01,+5.84e+01,-1.21e+03,+1.22e+03 - I: 1 609 111 -8.72e-02,-2.40e-02,-2.99e+00,+3.00e+00 2 -221 - O: 2 617 22 -1.01e-01,+2.75e-02,-2.29e+00,+2.30e+00 1 (nil) - 618 22 +1.37e-02,-5.15e-02,-7.01e-01,+7.03e-01 1 (nil) -Vertex: -222 ID: 0 (X,cT)=-1.70e+00,+1.75e+00,-2.03e+01,+2.05e+01 - I: 1 610 111 -1.61e-01,+2.25e-01,-1.49e+00,+1.52e+00 2 -222 - O: 2 619 22 -7.30e-02,+2.04e-01,-1.01e+00,+1.03e+00 1 (nil) - 620 22 -8.76e-02,+2.04e-02,-4.77e-01,+4.85e-01 1 (nil) -Vertex: -223 ID: 0 (X,cT)=-1.70e+00,+1.75e+00,-2.03e+01,+2.05e+01 - I: 1 611 111 -7.72e-01,+7.38e-01,-9.69e+00,+9.75e+00 2 -223 - O: 2 621 22 -6.72e-01,+5.71e-01,-7.86e+00,+7.91e+00 1 (nil) - 622 22 -1.00e-01,+1.67e-01,-1.82e+00,+1.83e+00 1 (nil) -Vertex: -224 ID: 0 (X,cT)=+1.58e-01,-6.64e-02,-8.93e-01,+9.27e-01 - I: 1 614 111 +6.30e-02,+1.63e-01,-7.63e-01,+7.94e-01 2 -224 - O: 2 623 22 -8.72e-03,-2.00e-02,-1.18e-01,+1.20e-01 1 (nil) - 624 22 +7.17e-02,+1.83e-01,-6.45e-01,+6.74e-01 1 (nil) -________________________________________________________________________________ - Print out hit information ------------------------------------------- -*** Muon System Hit (#hits=12) -E1 : pi+ : pT=3.46 : TOF=26.6 : x=(-0.819,0.587,-7.9) -E0 : e+ : pT=1.19 : TOF=26.6 : x=(0.761,-0.75,7.9) -E0 : e- : pT=0.265 : TOF=26.6 : x=(0.76,-0.748,7.9) -E0 : pi- : pT=0.171 : TOF=26.9 : x=(0.912,0.794,7.9) -E0 : pi+ : pT=0.414 : TOF=26.7 : x=(0.944,0.786,7.9) -E1 : pi- : pT=2.42 : TOF=26.6 : x=(-0.884,0.476,-7.9) -E1 : mu- : pT=1.76 : TOF=26.6 : x=(-0.887,0.569,-7.9) -E1 : e- : pT=0.000515 : TOF=29.9 : x=(1.92,0.339,-7.9) -E1 : pi+ : pT=0.359 : TOF=27 : x=(-0.0642,0.998,-8.03) -E0 : pi+ : pT=0.082 : TOF=27.4 : x=(0.362,-1.03,7.9) -E0 : e- : pT=0.00165 : TOF=29.1 : x=(-0.412,-1.68,7.9) -E0 : pi- : pT=0.259 : TOF=26.7 : x=(-0.2,1.05,7.9) - -________________________________________________________________________________ -GenEvent: #3 ID=20 SignalProcessGenVertex Barcode: 0 - Current Memory Usage: 1 events, 102 vertices, 280 particles. - Entries this event: 102 vertices, 280 particles. - RndmState(0)= - Wgts(0)= - EventScale -1 GeV alphaQCD=-1 alphaQED=-1 - GenParticle Legend - Barcode PDG ID ( Px, Py, Pz, E ) Stat DecayVtx -________________________________________________________________________________ -GenVertex: -1 ID: 0 (X,cT):0 - I: 1 1 2212 +0.00e+00,+0.00e+00,+7.00e+03,+7.00e+03 3 -1 - O: 3 15 2 +3.93e-01,-4.42e-01,+2.02e+01,+2.03e+01 2 -11 - 3 21 +5.50e-01,+2.26e-01,+5.57e+01,+5.57e+01 3 -3 - 14 2101 -9.42e-01,+2.17e-01,+6.53e+03,+6.53e+03 2 -9 -GenVertex: -2 ID: 0 (X,cT):0 - I: 1 2 2212 +0.00e+00,+0.00e+00,-7.00e+03,+7.00e+03 3 -2 - O: 2 4 1 -2.49e+00,-5.11e-01,-1.27e+03,+1.27e+03 3 -4 - 29 2203 +2.49e+00,+5.11e-01,-5.57e+03,+5.57e+03 2 -11 -GenVertex: -3 ID: 0 (X,cT):0 - I: 1 3 21 +5.50e-01,+2.26e-01,+5.57e+01,+5.57e+01 3 -3 - O: 4 13 2 -1.06e+00,+5.40e-01,+6.25e-01,+1.38e+00 2 -9 - 16 21 +1.28e+00,-8.74e-01,+5.02e+01,+5.02e+01 2 -11 - 17 21 -1.67e-01,+9.43e-01,-4.22e+00,+4.33e+00 2 -11 - 5 -2 +5.15e-01,-3.71e-01,+4.37e+00,+4.41e+00 3 -5 -GenVertex: -4 ID: 0 (X,cT):0 - I: 1 4 1 -2.49e+00,-5.11e-01,-1.27e+03,+1.27e+03 3 -4 - O: 7 6 1 +2.57e+00,+4.38e-01,-4.63e+02,+4.63e+02 3 -5 - 23 21 -6.21e-01,-2.83e+00,-4.24e+01,+4.25e+01 2 -11 - 24 21 -1.09e-01,+2.50e-02,-1.28e+01,+1.28e+01 2 -11 - 25 21 -4.72e-02,-2.81e-01,-7.30e+00,+7.31e+00 2 -11 - 26 21 -3.65e+00,+1.06e+00,-1.44e+02,+1.44e+02 2 -11 - 27 21 -8.57e-01,+1.30e+00,-8.64e+01,+8.64e+01 2 -11 - 28 21 +2.10e-01,-2.36e-01,-5.04e+02,+5.04e+02 2 -11 -GenVertex: -5 ID: 0 (X,cT):0 - I: 2 5 -2 +5.15e-01,-3.71e-01,+4.37e+00,+4.41e+00 3 -5 - 6 1 +2.57e+00,+4.38e-01,-4.63e+02,+4.63e+02 3 -5 - O: 2 7 22 +6.11e-01,+4.73e+00,-5.78e+00,+7.50e+00 3 -6 - 8 -24 +2.48e+00,-4.66e+00,-4.53e+02,+4.60e+02 3 -7 -GenVertex: -6 ID: 0 (X,cT):0 - I: 1 7 22 +6.11e-01,+4.73e+00,-5.78e+00,+7.50e+00 3 -6 - O: 1 9 22 +6.11e-01,+4.73e+00,-5.78e+00,+7.50e+00 1 (nil) -GenVertex: -7 ID: 0 (X,cT):0 - I: 1 8 -24 +2.48e+00,-4.66e+00,-4.53e+02,+4.60e+02 3 -7 - O: 1 10 -24 +2.48e+00,-4.66e+00,-4.53e+02,+4.60e+02 2 -8 -GenVertex: -8 ID: 0 (X,cT):0 - I: 1 10 -24 +2.48e+00,-4.66e+00,-4.53e+02,+4.60e+02 2 -8 - O: 2 11 13 +1.17e+01,+3.45e+01,-2.85e+02,+2.87e+02 1 (nil) - 12 -14 -9.19e+00,-3.92e+01,-1.68e+02,+1.73e+02 1 (nil) -GenVertex: -9 ID: 0 (X,cT):0 - I: 2 14 2101 -9.42e-01,+2.17e-01,+6.53e+03,+6.53e+03 2 -9 - 13 2 -1.06e+00,+5.40e-01,+6.25e-01,+1.38e+00 2 -9 - O: 1 35 92 -2.00e+00,+7.56e-01,+6.53e+03,+6.54e+03 2 -10 -GenVertex: -10 ID: 0 (X,cT):0 - I: 1 35 92 -2.00e+00,+7.56e-01,+6.53e+03,+6.54e+03 2 -10 - O: 9 36 321 -2.73e-01,+1.76e-01,+9.69e-01,+1.13e+00 1 (nil) - 37 333 -1.11e+00,+1.44e-01,+2.44e+00,+2.87e+00 2 -17 - 38 -321 +5.75e-01,-1.63e-01,+3.07e+00,+3.17e+00 1 (nil) - 39 323 -4.93e-01,+1.18e-01,+1.14e+01,+1.14e+01 2 -18 - 40 333 +4.67e-02,-1.10e-02,+6.10e+01,+6.10e+01 2 -19 - 41 -313 +6.61e-02,+2.00e-01,+1.02e+02,+1.02e+02 2 -20 - 42 -211 +6.62e-01,+2.34e-03,+1.91e+01,+1.92e+01 1 (nil) - 43 213 -1.13e+00,+2.68e-01,+8.99e+02,+8.99e+02 2 -21 - 44 2112 -3.44e-01,+2.18e-02,+5.44e+03,+5.44e+03 1 (nil) -GenVertex: -11 ID: 0 (X,cT):0 - I:15 20 21 +2.14e+00,-4.17e+00,-7.24e+00,+8.62e+00 2 -11 - 15 2 +3.93e-01,-4.42e-01,+2.02e+01,+2.03e+01 2 -11 - 19 21 -2.14e+00,+4.17e+00,-2.51e+00,+5.32e+00 2 -11 - 21 21 +2.68e+00,-1.72e+00,-3.07e+01,+3.09e+01 2 -11 - 22 21 -2.68e+00,+1.72e+00,-1.05e+02,+1.05e+02 2 -11 - 29 2203 +2.49e+00,+5.11e-01,-5.57e+03,+5.57e+03 2 -11 - 16 21 +1.28e+00,-8.74e-01,+5.02e+01,+5.02e+01 2 -11 - 17 21 -1.67e-01,+9.43e-01,-4.22e+00,+4.33e+00 2 -11 - 23 21 -6.21e-01,-2.83e+00,-4.24e+01,+4.25e+01 2 -11 - 24 21 -1.09e-01,+2.50e-02,-1.28e+01,+1.28e+01 2 -11 - 25 21 -4.72e-02,-2.81e-01,-7.30e+00,+7.31e+00 2 -11 - 26 21 -3.65e+00,+1.06e+00,-1.44e+02,+1.44e+02 2 -11 - 27 21 -8.57e-01,+1.30e+00,-8.64e+01,+8.64e+01 2 -11 - 28 21 +2.10e-01,-2.36e-01,-5.04e+02,+5.04e+02 2 -11 - 18 21 +9.34e-01,+2.91e+00,+1.97e+01,+2.00e+01 2 -11 - O: 1 45 92 -1.50e-01,+2.09e+00,-6.43e+03,+6.61e+03 2 -12 -GenVertex: -12 ID: 0 (X,cT):0 - I: 1 45 92 -1.50e-01,+2.09e+00,-6.43e+03,+6.61e+03 2 -12 - O:44 63 221 +1.94e-01,-2.74e-01,-2.66e-01,+6.95e-01 2 -35 - 64 -213 +2.31e-01,+2.74e-01,-1.31e+00,+1.58e+00 2 -36 - 79 -2112 -1.86e+00,+2.64e-01,-6.69e+01,+6.69e+01 1 (nil) - 80 -211 -4.20e-01,-6.99e-02,-4.46e+01,+4.47e+01 1 (nil) - 81 211 -1.23e+00,+5.35e-01,-3.48e+01,+3.49e+01 1 (nil) - 61 -211 -1.05e+00,+1.11e+00,-1.21e-01,+1.54e+00 1 (nil) - 62 213 -9.08e-02,+5.82e-01,-1.54e+00,+1.76e+00 2 -34 - 46 211 +1.39e+00,-8.14e-01,+3.12e+01,+3.13e+01 1 (nil) - 73 111 -6.69e-01,+1.78e-01,-1.87e+01,+1.87e+01 2 -41 - 74 -213 -3.45e-01,-1.71e-01,-1.77e+01,+1.77e+01 2 -42 - 75 2212 -3.93e-01,+8.27e-02,-3.98e+01,+3.98e+01 1 (nil) - 65 213 -4.52e-01,+2.86e-01,-1.23e+00,+1.57e+00 2 -37 - 66 2114 +9.53e-01,-6.69e-01,-3.09e+00,+3.53e+00 2 -38 - 67 211 -1.36e-01,-6.50e-01,-8.86e-01,+1.12e+00 1 (nil) - 68 -2212 +8.49e-01,-2.09e+00,-5.29e+00,+5.82e+00 1 (nil) - 69 -211 +1.20e-01,+2.39e-01,-1.06e+00,+1.10e+00 1 (nil) - 47 113 +6.88e-02,-1.41e-01,+2.65e+01,+2.66e+01 2 -22 - 87 213 +3.40e-01,+1.94e-01,-1.02e+03,+1.02e+03 2 -48 - 76 -2212 -6.65e-01,+6.91e-02,-2.61e+01,+2.61e+01 1 (nil) - 77 3224 -4.07e-01,-1.66e+00,-3.45e+01,+3.46e+01 2 -43 - 78 311 -2.78e-01,+5.33e-02,-1.90e+01,+1.90e+01 2 -44 - 58 -321 +1.93e-01,+1.97e-01,+6.13e+00,+6.16e+00 1 (nil) - 59 223 -2.63e-01,+7.90e-01,+6.47e-01,+1.31e+00 2 -32 - 60 213 +1.35e-01,+1.08e+00,+5.74e-01,+1.37e+00 2 -33 - 89 223 +1.23e+00,+3.33e-01,-2.87e+03,+2.87e+03 2 -50 - 49 113 +6.00e-01,-2.67e-01,+2.22e+00,+2.44e+00 2 -23 - 51 -313 +1.43e-02,+4.68e-01,-3.88e-01,+1.12e+00 2 -25 - 48 -211 -3.37e-01,-1.68e-01,+9.43e+00,+9.44e+00 1 (nil) - 88 2214 +5.67e-01,+9.88e-02,-8.80e+02,+8.80e+02 2 -49 - 82 311 -1.74e-02,+2.33e-01,-6.04e+01,+6.04e+01 2 -45 - 83 -323 -5.63e-01,-7.34e-02,-1.48e+02,+1.48e+02 2 -46 - 84 211 -1.34e-01,-9.12e-02,-7.11e+00,+7.11e+00 1 (nil) - 50 323 -3.07e-01,-6.12e-02,-1.42e-02,+9.76e-01 2 -24 - 70 323 +1.48e+00,-9.63e-01,-1.55e+01,+1.56e+01 2 -39 - 71 -321 -2.78e-01,+3.30e-01,-8.84e+00,+8.87e+00 1 (nil) - 72 213 +4.81e-01,-1.41e-01,-1.37e+01,+1.37e+01 2 -40 - 52 111 +8.08e-02,-1.35e-02,-7.15e-01,+7.33e-01 2 -26 - 53 113 -2.30e-01,+1.48e-01,-1.62e+00,+1.84e+00 2 -27 - 54 223 +3.60e-01,+7.58e-01,+8.72e-01,+1.44e+00 2 -28 - 55 113 +1.21e-01,+1.16e-01,+9.83e-01,+1.26e+00 2 -29 - 56 -213 +8.69e-02,+1.01e+00,+7.42e+00,+7.52e+00 2 -30 - 57 323 +1.76e-01,+4.23e-01,+1.93e+00,+2.16e+00 2 -31 - 85 113 +1.80e-02,+8.34e-01,-6.47e+02,+6.47e+02 2 -47 - 86 -211 +2.67e-01,-2.79e-01,-5.20e+02,+5.20e+02 1 (nil) -GenVertex: -13 ID: 0 (X,cT):0 - I: 3 31 21 -9.34e-01,-2.91e+00,+1.02e+02,+1.02e+02 2 -13 - 32 21 +3.00e+00,-2.35e+00,+2.97e+01,+3.00e+01 2 -13 - 30 21 -3.00e+00,+2.35e+00,+2.36e+02,+2.36e+02 2 -13 - O: 1 90 92 -9.34e-01,-2.91e+00,+3.67e+02,+3.67e+02 2 -14 -GenVertex: -14 ID: 0 (X,cT):0 - I: 1 90 92 -9.34e-01,-2.91e+00,+3.67e+02,+3.67e+02 2 -14 - O:11 99 -2112 +1.14e+00,-1.49e+00,+2.49e+01,+2.50e+01 1 (nil) - 91 211 -8.24e-01,-1.45e-02,+1.59e+01,+1.59e+01 1 (nil) - 100 2112 +5.39e-01,-8.02e-01,+1.40e+01,+1.41e+01 1 (nil) - 101 223 +1.06e+00,-1.22e-01,+2.53e+01,+2.53e+01 2 -56 - 94 313 -3.62e-01,+5.42e-01,+5.03e+01,+5.03e+01 2 -52 - 93 -311 -2.08e-02,-2.14e-01,+2.11e+01,+2.11e+01 2 -51 - 92 -211 -1.30e+00,+8.92e-01,+8.32e+01,+8.33e+01 1 (nil) - 96 113 -1.28e-01,-1.56e-01,+3.41e+01,+3.41e+01 2 -54 - 95 213 -8.94e-01,-3.47e-01,+5.52e+01,+5.52e+01 2 -53 - 98 111 +4.23e-01,-2.45e-01,+3.08e+00,+3.12e+00 2 -55 - 97 -211 -5.72e-01,-9.49e-01,+3.99e+01,+3.99e+01 1 (nil) -GenVertex: -15 ID: 0 (X,cT):0 - I: 2 34 21 -1.02e+00,+2.88e+00,-7.45e+00,+8.05e+00 2 -15 - 33 21 +1.02e+00,-2.88e+00,-9.85e+00,+1.03e+01 2 -15 - O: 1 102 92 +0.00e+00,+0.00e+00,-1.73e+01,+1.84e+01 2 -16 -GenVertex: -16 ID: 0 (X,cT):0 - I: 1 102 92 +0.00e+00,+0.00e+00,-1.73e+01,+1.84e+01 2 -16 - O: 7 107 -211 -2.88e-01,+5.23e-01,-3.10e+00,+3.16e+00 1 (nil) - 108 223 +2.53e-01,-1.38e-01,-2.52e+00,+2.66e+00 2 -61 - 105 213 +1.78e-01,+3.27e-01,-2.62e+00,+2.77e+00 2 -59 - 106 111 +1.94e-01,-8.30e-01,-1.78e+00,+1.98e+00 2 -60 - 103 113 +2.54e-01,-1.28e-01,-3.69e+00,+3.77e+00 2 -57 - 104 223 -7.85e-02,+4.34e-02,-9.82e-01,+1.26e+00 2 -58 - 109 113 -5.13e-01,+2.04e-01,-2.60e+00,+2.77e+00 2 -62 -GenVertex: -17 ID: 0 (X,cT):0 - I: 1 37 333 -1.11e+00,+1.44e-01,+2.44e+00,+2.87e+00 2 -17 - O: 2 110 321 -5.35e-01,-4.15e-03,+1.39e+00,+1.57e+00 1 (nil) - 111 -321 -5.74e-01,+1.48e-01,+1.05e+00,+1.30e+00 1 (nil) -GenVertex: -18 ID: 0 (X,cT):0 - I: 1 39 323 -4.93e-01,+1.18e-01,+1.14e+01,+1.14e+01 2 -18 - O: 2 112 311 -1.65e-01,+7.95e-02,+8.26e+00,+8.27e+00 2 -63 - 113 211 -3.29e-01,+3.86e-02,+3.09e+00,+3.12e+00 1 (nil) -GenVertex: -19 ID: 0 (X,cT):0 - I: 1 40 333 +4.67e-02,-1.10e-02,+6.10e+01,+6.10e+01 2 -19 - O: 2 114 321 -8.91e-02,+3.84e-02,+3.21e+01,+3.21e+01 1 (nil) - 115 -321 +1.36e-01,-4.94e-02,+2.89e+01,+2.89e+01 1 (nil) -GenVertex: -20 ID: 0 (X,cT):0 - I: 1 41 -313 +6.61e-02,+2.00e-01,+1.02e+02,+1.02e+02 2 -20 - O: 2 116 -311 -2.08e-01,+2.83e-01,+4.52e+01,+4.53e+01 2 -64 - 117 111 +2.74e-01,-8.21e-02,+5.65e+01,+5.65e+01 2 -65 -GenVertex: -21 ID: 0 (X,cT):0 - I: 1 43 213 -1.13e+00,+2.68e-01,+8.99e+02,+8.99e+02 2 -21 - O: 2 119 111 -1.00e-01,-1.65e-01,+2.61e+02,+2.61e+02 2 -66 - 118 211 -1.03e+00,+4.32e-01,+6.38e+02,+6.38e+02 1 (nil) -GenVertex: -22 ID: 0 (X,cT):0 - I: 1 47 113 +6.88e-02,-1.41e-01,+2.65e+01,+2.66e+01 2 -22 - O: 2 120 -211 +2.55e-01,-1.00e-02,+2.33e+01,+2.33e+01 1 (nil) - 121 211 -1.86e-01,-1.31e-01,+3.23e+00,+3.24e+00 1 (nil) -GenVertex: -23 ID: 0 (X,cT):0 - I: 1 49 113 +6.00e-01,-2.67e-01,+2.22e+00,+2.44e+00 2 -23 - O: 2 122 211 +7.62e-01,-2.15e-01,+1.64e+00,+1.83e+00 1 (nil) - 123 -211 -1.62e-01,-5.17e-02,+5.74e-01,+6.14e-01 1 (nil) -GenVertex: -24 ID: 0 (X,cT):0 - I: 1 50 323 -3.07e-01,-6.12e-02,-1.42e-02,+9.76e-01 2 -24 - O: 2 124 311 -4.48e-01,-2.27e-01,-7.65e-02,+7.11e-01 2 -67 - 125 211 +1.40e-01,+1.66e-01,+6.23e-02,+2.65e-01 1 (nil) -GenVertex: -25 ID: 0 (X,cT):0 - I: 1 51 -313 +1.43e-02,+4.68e-01,-3.88e-01,+1.12e+00 2 -25 - O: 2 126 -321 -2.60e-02,+2.92e-01,+9.54e-02,+5.82e-01 1 (nil) - 127 211 +4.03e-02,+1.76e-01,-4.83e-01,+5.35e-01 1 (nil) -Vertex: -26 ID: 0 (X,cT)=+4.64e-05,-7.72e-06,-4.10e-04,+4.20e-04 - I: 1 52 111 +8.08e-02,-1.35e-02,-7.15e-01,+7.33e-01 2 -26 - O: 2 129 22 +9.76e-02,-3.63e-02,-6.77e-01,+6.85e-01 1 (nil) - 128 22 -1.68e-02,+2.28e-02,-3.88e-02,+4.80e-02 1 (nil) -GenVertex: -27 ID: 0 (X,cT):0 - I: 1 53 113 -2.30e-01,+1.48e-01,-1.62e+00,+1.84e+00 2 -27 - O: 2 130 -211 -8.09e-02,+2.95e-01,-1.97e-01,+3.90e-01 1 (nil) - 131 211 -1.49e-01,-1.47e-01,-1.43e+00,+1.45e+00 1 (nil) -GenVertex: -28 ID: 0 (X,cT):0 - I: 1 54 223 +3.60e-01,+7.58e-01,+8.72e-01,+1.44e+00 2 -28 - O: 3 132 211 +1.97e-01,+3.51e-01,+6.75e-01,+7.98e-01 1 (nil) - 133 -211 -3.88e-02,+1.47e-01,+2.00e-01,+2.87e-01 1 (nil) - 134 111 +2.02e-01,+2.60e-01,-3.27e-03,+3.56e-01 2 -68 -GenVertex: -29 ID: 0 (X,cT):0 - I: 1 55 113 +1.21e-01,+1.16e-01,+9.83e-01,+1.26e+00 2 -29 - O: 2 135 -211 +1.15e-01,+2.71e-01,+9.97e-01,+1.05e+00 1 (nil) - 136 211 +5.83e-03,-1.56e-01,-1.47e-02,+2.10e-01 1 (nil) -GenVertex: -30 ID: 0 (X,cT):0 - I: 1 56 -213 +8.69e-02,+1.01e+00,+7.42e+00,+7.52e+00 2 -30 - O: 2 137 -211 -8.49e-03,+1.28e-01,+3.83e-01,+4.28e-01 1 (nil) - 138 111 +9.53e-02,+8.80e-01,+7.03e+00,+7.09e+00 2 -69 -GenVertex: -31 ID: 0 (X,cT):0 - I: 1 57 323 +1.76e-01,+4.23e-01,+1.93e+00,+2.16e+00 2 -31 - O: 2 139 311 +6.63e-02,+5.21e-01,+1.76e+00,+1.90e+00 2 -70 - 140 211 +1.10e-01,-9.78e-02,+1.66e-01,+2.62e-01 1 (nil) -GenVertex: -32 ID: 0 (X,cT):0 - I: 1 59 223 -2.63e-01,+7.90e-01,+6.47e-01,+1.31e+00 2 -32 - O: 3 141 211 -1.81e-01,+4.47e-01,+1.25e-01,+5.17e-01 1 (nil) - 142 -211 -2.25e-01,+2.99e-01,+3.59e-01,+5.38e-01 1 (nil) - 143 111 +1.43e-01,+4.38e-02,+1.63e-01,+2.59e-01 2 -71 -GenVertex: -33 ID: 0 (X,cT):0 - I: 1 60 213 +1.35e-01,+1.08e+00,+5.74e-01,+1.37e+00 2 -33 - O: 2 144 211 +6.61e-02,+1.08e+00,+5.00e-01,+1.20e+00 1 (nil) - 145 111 +6.86e-02,-8.01e-04,+7.43e-02,+1.69e-01 2 -72 -GenVertex: -34 ID: 0 (X,cT):0 - I: 1 62 213 -9.08e-02,+5.82e-01,-1.54e+00,+1.76e+00 2 -34 - O: 2 146 211 -4.09e-02,-5.32e-02,-5.87e-01,+6.07e-01 1 (nil) - 147 111 -4.99e-02,+6.35e-01,-9.56e-01,+1.16e+00 2 -73 -GenVertex: -35 ID: 0 (X,cT):0 - I: 1 63 221 +1.94e-01,-2.74e-01,-2.66e-01,+6.95e-01 2 -35 - O: 3 150 111 +7.41e-02,-1.52e-01,-1.38e-01,+2.57e-01 2 -76 - 148 111 -8.07e-02,-5.76e-02,-3.25e-02,+1.71e-01 2 -74 - 149 111 +2.01e-01,-6.40e-02,-9.60e-02,+2.68e-01 2 -75 -GenVertex: -36 ID: 0 (X,cT):0 - I: 1 64 -213 +2.31e-01,+2.74e-01,-1.31e+00,+1.58e+00 2 -36 - O: 2 151 -211 +4.35e-01,+4.07e-01,-8.38e-01,+1.04e+00 1 (nil) - 152 111 -2.04e-01,-1.33e-01,-4.69e-01,+5.45e-01 2 -77 -GenVertex: -37 ID: 0 (X,cT):0 - I: 1 65 213 -4.52e-01,+2.86e-01,-1.23e+00,+1.57e+00 2 -37 - O: 2 153 211 -1.15e-01,-2.61e-01,-4.89e-01,+5.83e-01 1 (nil) - 154 111 -3.37e-01,+5.47e-01,-7.40e-01,+9.89e-01 2 -78 -GenVertex: -38 ID: 0 (X,cT):0 - I: 1 66 2114 +9.53e-01,-6.69e-01,-3.09e+00,+3.53e+00 2 -38 - O: 2 155 2212 +6.04e-01,-7.13e-01,-2.45e+00,+2.79e+00 1 (nil) - 156 -211 +3.49e-01,+4.35e-02,-6.38e-01,+7.42e-01 1 (nil) -GenVertex: -39 ID: 0 (X,cT):0 - I: 1 70 323 +1.48e+00,-9.63e-01,-1.55e+01,+1.56e+01 2 -39 - O: 2 157 311 +5.39e-01,-2.99e-01,-4.42e+00,+4.49e+00 2 -79 - 158 211 +9.45e-01,-6.64e-01,-1.11e+01,+1.11e+01 1 (nil) -GenVertex: -40 ID: 0 (X,cT):0 - I: 1 72 213 +4.81e-01,-1.41e-01,-1.37e+01,+1.37e+01 2 -40 - O: 2 160 111 +4.80e-01,+2.17e-01,-7.34e+00,+7.36e+00 2 -80 - 159 211 +1.18e-04,-3.58e-01,-6.34e+00,+6.36e+00 1 (nil) -Vertex: -41 ID: 0 (X,cT)=-1.16e-04,+3.09e-05,-3.23e-03,+3.24e-03 - I: 1 73 111 -6.69e-01,+1.78e-01,-1.87e+01,+1.87e+01 2 -41 - O: 2 161 22 -5.04e-01,+7.96e-02,-1.28e+01,+1.28e+01 1 (nil) - 162 22 -1.65e-01,+9.88e-02,-5.90e+00,+5.90e+00 1 (nil) -GenVertex: -42 ID: 0 (X,cT):0 - I: 1 74 -213 -3.45e-01,-1.71e-01,-1.77e+01,+1.77e+01 2 -42 - O: 2 163 -211 +1.33e-01,+1.21e-01,-7.19e+00,+7.19e+00 1 (nil) - 164 111 -4.77e-01,-2.92e-01,-1.05e+01,+1.05e+01 2 -81 -GenVertex: -43 ID: 0 (X,cT):0 - I: 1 77 3224 -4.07e-01,-1.66e+00,-3.45e+01,+3.46e+01 2 -43 - O: 2 165 3122 -4.69e-01,-1.62e+00,-3.09e+01,+3.09e+01 2 -82 - 166 211 +6.12e-02,-3.83e-02,-3.63e+00,+3.64e+00 1 (nil) -GenVertex: -44 ID: 0 (X,cT):0 - I: 1 78 311 -2.78e-01,+5.33e-02,-1.90e+01,+1.90e+01 2 -44 - O: 1 167 130 -2.78e-01,+5.33e-02,-1.90e+01,+1.90e+01 1 (nil) -GenVertex: -45 ID: 0 (X,cT):0 - I: 1 82 311 -1.74e-02,+2.33e-01,-6.04e+01,+6.04e+01 2 -45 - O: 1 168 310 -1.74e-02,+2.33e-01,-6.04e+01,+6.04e+01 2 -83 -GenVertex: -46 ID: 0 (X,cT):0 - I: 1 83 -323 -5.63e-01,-7.34e-02,-1.48e+02,+1.48e+02 2 -46 - O: 2 169 -311 -5.45e-01,+2.59e-01,-8.99e+01,+8.99e+01 2 -84 - 170 -211 -1.76e-02,-3.32e-01,-5.80e+01,+5.80e+01 1 (nil) -GenVertex: -47 ID: 0 (X,cT):0 - I: 1 85 113 +1.80e-02,+8.34e-01,-6.47e+02,+6.47e+02 2 -47 - O: 2 171 211 +9.30e-02,-1.09e-02,-3.29e+01,+3.29e+01 1 (nil) - 172 -211 -7.50e-02,+8.45e-01,-6.14e+02,+6.14e+02 1 (nil) -GenVertex: -48 ID: 0 (X,cT):0 - I: 1 87 213 +3.40e-01,+1.94e-01,-1.02e+03,+1.02e+03 2 -48 - O: 2 173 211 +8.59e-02,+3.47e-01,-6.99e+02,+6.99e+02 1 (nil) - 174 111 +2.54e-01,-1.53e-01,-3.24e+02,+3.24e+02 2 -85 -GenVertex: -49 ID: 0 (X,cT):0 - I: 1 88 2214 +5.67e-01,+9.88e-02,-8.80e+02,+8.80e+02 2 -49 - O: 2 175 2212 +3.83e-01,+1.63e-01,-5.77e+02,+5.77e+02 1 (nil) - 176 111 +1.84e-01,-6.41e-02,-3.04e+02,+3.04e+02 2 -86 -GenVertex: -50 ID: 0 (X,cT):0 - I: 1 89 223 +1.23e+00,+3.33e-01,-2.87e+03,+2.87e+03 2 -50 - O: 3 177 211 +5.33e-01,+7.46e-02,-1.01e+03,+1.01e+03 1 (nil) - 178 -211 +4.00e-01,-1.62e-02,-1.32e+03,+1.32e+03 1 (nil) - 179 111 +2.98e-01,+2.74e-01,-5.41e+02,+5.41e+02 2 -87 -GenVertex: -51 ID: 0 (X,cT):0 - I: 1 93 -311 -2.08e-02,-2.14e-01,+2.11e+01,+2.11e+01 2 -51 - O: 1 180 130 -2.08e-02,-2.14e-01,+2.11e+01,+2.11e+01 1 (nil) -GenVertex: -52 ID: 0 (X,cT):0 - I: 1 94 313 -3.62e-01,+5.42e-01,+5.03e+01,+5.03e+01 2 -52 - O: 2 181 321 -3.90e-01,+2.06e-01,+3.09e+01,+3.09e+01 1 (nil) - 182 -211 +2.79e-02,+3.36e-01,+1.94e+01,+1.94e+01 1 (nil) -GenVertex: -53 ID: 0 (X,cT):0 - I: 1 95 213 -8.94e-01,-3.47e-01,+5.52e+01,+5.52e+01 2 -53 - O: 2 183 211 -8.91e-01,-1.82e-01,+3.63e+01,+3.63e+01 1 (nil) - 184 111 -2.63e-03,-1.65e-01,+1.89e+01,+1.89e+01 2 -88 -GenVertex: -54 ID: 0 (X,cT):0 - I: 1 96 113 -1.28e-01,-1.56e-01,+3.41e+01,+3.41e+01 2 -54 - O: 2 185 -211 -1.20e-02,-3.34e-01,+2.86e+01,+2.86e+01 1 (nil) - 186 211 -1.16e-01,+1.78e-01,+5.45e+00,+5.46e+00 1 (nil) -Vertex: -55 ID: 0 (X,cT)=+4.23e-05,-2.45e-05,+3.08e-04,+3.12e-04 - I: 1 98 111 +4.23e-01,-2.45e-01,+3.08e+00,+3.12e+00 2 -55 - O: 2 187 22 +2.88e-01,-9.56e-02,+1.70e+00,+1.72e+00 1 (nil) - 188 22 +1.35e-01,-1.49e-01,+1.38e+00,+1.40e+00 1 (nil) -GenVertex: -56 ID: 0 (X,cT):0 - I: 1 101 223 +1.06e+00,-1.22e-01,+2.53e+01,+2.53e+01 2 -56 - O: 3 189 211 +5.04e-01,-1.97e-01,+8.76e+00,+8.77e+00 1 (nil) - 190 -211 +2.54e-02,-9.08e-02,+3.85e+00,+3.86e+00 1 (nil) - 191 111 +5.32e-01,+1.66e-01,+1.27e+01,+1.27e+01 2 -89 -GenVertex: -57 ID: 0 (X,cT):0 - I: 1 103 113 +2.54e-01,-1.28e-01,-3.69e+00,+3.77e+00 2 -57 - O: 2 192 -211 -1.71e-01,-5.67e-02,-2.24e+00,+2.25e+00 1 (nil) - 193 211 +4.26e-01,-7.15e-02,-1.45e+00,+1.52e+00 1 (nil) -GenVertex: -58 ID: 0 (X,cT):0 - I: 1 104 223 -7.85e-02,+4.34e-02,-9.82e-01,+1.26e+00 2 -58 - O: 3 196 111 +3.92e-02,+1.08e-02,-6.72e-02,+1.56e-01 2 -90 - 195 211 -1.94e-01,+1.20e-01,-1.32e-01,+2.98e-01 1 (nil) - 194 -211 +7.65e-02,-8.75e-02,-7.83e-01,+8.04e-01 1 (nil) -GenVertex: -59 ID: 0 (X,cT):0 - I: 1 105 213 +1.78e-01,+3.27e-01,-2.62e+00,+2.77e+00 2 -59 - O: 2 198 111 +4.58e-01,+7.63e-02,-1.24e+00,+1.33e+00 2 -91 - 197 211 -2.80e-01,+2.51e-01,-1.39e+00,+1.44e+00 1 (nil) -Vertex: -60 ID: 0 (X,cT)=+9.83e-05,-4.21e-04,-9.04e-04,+1.00e-03 - I: 1 106 111 +1.94e-01,-8.30e-01,-1.78e+00,+1.98e+00 2 -60 - O: 2 199 22 +1.08e-01,-5.84e-01,-1.11e+00,+1.25e+00 1 (nil) - 200 22 +8.65e-02,-2.46e-01,-6.78e-01,+7.27e-01 1 (nil) -GenVertex: -61 ID: 0 (X,cT):0 - I: 1 108 223 +2.53e-01,-1.38e-01,-2.52e+00,+2.66e+00 2 -61 - O: 3 201 -211 -4.19e-02,+9.47e-02,-3.16e-01,+3.61e-01 1 (nil) - 202 211 +1.25e-01,+2.93e-02,-2.70e-01,+3.30e-01 1 (nil) - 203 111 +1.70e-01,-2.62e-01,-1.93e+00,+1.96e+00 2 -92 -GenVertex: -62 ID: 0 (X,cT):0 - I: 1 109 113 -5.13e-01,+2.04e-01,-2.60e+00,+2.77e+00 2 -62 - O: 2 204 211 -6.28e-01,+1.34e-01,-1.31e+00,+1.46e+00 1 (nil) - 205 -211 +1.15e-01,+6.97e-02,-1.29e+00,+1.30e+00 1 (nil) -GenVertex: -63 ID: 0 (X,cT):0 - I: 1 112 311 -1.65e-01,+7.95e-02,+8.26e+00,+8.27e+00 2 -63 - O: 1 206 310 -1.65e-01,+7.95e-02,+8.26e+00,+8.27e+00 2 -93 -GenVertex: -64 ID: 0 (X,cT):0 - I: 1 116 -311 -2.08e-01,+2.83e-01,+4.52e+01,+4.53e+01 2 -64 - O: 1 207 310 -2.08e-01,+2.83e-01,+4.52e+01,+4.53e+01 2 -94 -Vertex: -65 ID: 0 (X,cT)=+7.38e-05,-2.21e-05,+1.52e-02,+1.52e-02 - I: 1 117 111 +2.74e-01,-8.21e-02,+5.65e+01,+5.65e+01 2 -65 - O: 2 208 22 +3.27e-02,-6.35e-02,+1.64e+01,+1.64e+01 1 (nil) - 209 22 +2.41e-01,-1.86e-02,+4.01e+01,+4.01e+01 1 (nil) -Vertex: -66 ID: 0 (X,cT)=-2.41e-05,-3.97e-05,+6.29e-02,+6.29e-02 - I: 1 119 111 -1.00e-01,-1.65e-01,+2.61e+02,+2.61e+02 2 -66 - O: 2 210 22 -3.55e-02,-4.32e-03,+1.12e+02,+1.12e+02 1 (nil) - 211 22 -6.45e-02,-1.60e-01,+1.49e+02,+1.49e+02 1 (nil) -GenVertex: -67 ID: 0 (X,cT):0 - I: 1 124 311 -4.48e-01,-2.27e-01,-7.65e-02,+7.11e-01 2 -67 - O: 1 212 310 -4.48e-01,-2.27e-01,-7.65e-02,+7.11e-01 2 -95 -Vertex: -68 ID: 0 (X,cT)=+5.62e-07,+7.23e-07,-9.08e-09,+9.90e-07 - I: 1 134 111 +2.02e-01,+2.60e-01,-3.27e-03,+3.56e-01 2 -68 - O: 2 213 22 +5.96e-02,+3.17e-04,-3.48e-03,+5.97e-02 1 (nil) - 214 22 +1.43e-01,+2.60e-01,+2.13e-04,+2.96e-01 1 (nil) -Vertex: -69 ID: 0 (X,cT)=+6.81e-05,+6.29e-04,+5.02e-03,+5.07e-03 - I: 1 138 111 +9.53e-02,+8.80e-01,+7.03e+00,+7.09e+00 2 -69 - O: 2 216 22 -2.90e-03,+2.45e-01,+1.55e+00,+1.57e+00 1 (nil) - 215 22 +9.82e-02,+6.35e-01,+5.48e+00,+5.52e+00 1 (nil) -GenVertex: -70 ID: 0 (X,cT):0 - I: 1 139 311 +6.63e-02,+5.21e-01,+1.76e+00,+1.90e+00 2 -70 - O: 1 217 310 +6.63e-02,+5.21e-01,+1.76e+00,+1.90e+00 2 -96 -Vertex: -71 ID: 0 (X,cT)=+2.07e-05,+6.35e-06,+2.36e-05,+3.76e-05 - I: 1 143 111 +1.43e-01,+4.38e-02,+1.63e-01,+2.59e-01 2 -71 - O: 2 219 22 -2.87e-03,+5.32e-02,+2.80e-02,+6.02e-02 1 (nil) - 218 22 +1.46e-01,-9.35e-03,+1.35e-01,+1.99e-01 1 (nil) -Vertex: -72 ID: 0 (X,cT)=+3.76e-05,-4.39e-07,+4.07e-05,+9.25e-05 - I: 1 145 111 +6.86e-02,-8.01e-04,+7.43e-02,+1.69e-01 2 -72 - O: 2 220 22 +2.42e-02,+6.45e-02,+1.68e-02,+7.09e-02 1 (nil) - 221 22 +4.44e-02,-6.53e-02,+5.76e-02,+9.78e-02 1 (nil) -Vertex: -73 ID: 0 (X,cT)=-5.91e-06,+7.52e-05,-1.13e-04,+1.37e-04 - I: 1 147 111 -4.99e-02,+6.35e-01,-9.56e-01,+1.16e+00 2 -73 - O: 2 222 22 -6.98e-02,+2.12e-01,-3.96e-01,+4.55e-01 1 (nil) - 223 22 +1.99e-02,+4.23e-01,-5.60e-01,+7.02e-01 1 (nil) -Vertex: -74 ID: 0 (X,cT)=-3.84e-05,-2.74e-05,-1.55e-05,+8.12e-05 - I: 1 148 111 -8.07e-02,-5.76e-02,-3.25e-02,+1.71e-01 2 -74 - O: 2 225 22 +3.13e-02,+6.07e-03,-2.68e-02,+4.17e-02 1 (nil) - 224 22 -1.12e-01,-6.36e-02,-5.73e-03,+1.29e-01 1 (nil) -Vertex: -75 ID: 0 (X,cT)=+4.38e-07,-1.40e-07,-2.10e-07,+5.85e-07 - I: 1 149 111 +2.01e-01,-6.40e-02,-9.60e-02,+2.68e-01 2 -75 - O: 2 226 22 +1.78e-01,-9.49e-02,-1.07e-01,+2.28e-01 1 (nil) - 227 22 +2.25e-02,+3.09e-02,+1.06e-02,+3.97e-02 1 (nil) -Vertex: -76 ID: 0 (X,cT)=+2.78e-06,-5.71e-06,-5.17e-06,+9.63e-06 - I: 1 150 111 +7.41e-02,-1.52e-01,-1.38e-01,+2.57e-01 2 -76 - O: 2 228 22 +2.08e-02,-3.01e-03,-8.82e-02,+9.06e-02 1 (nil) - 229 22 +5.32e-02,-1.49e-01,-4.97e-02,+1.66e-01 1 (nil) -Vertex: -77 ID: 0 (X,cT)=-1.62e-04,-1.05e-04,-3.72e-04,+4.33e-04 - I: 1 152 111 -2.04e-01,-1.33e-01,-4.69e-01,+5.45e-01 2 -77 - O: 2 230 22 -5.35e-02,-1.09e-01,-1.58e-01,+1.99e-01 1 (nil) - 231 22 -1.50e-01,-2.43e-02,-3.11e-01,+3.46e-01 1 (nil) -Vertex: -78 ID: 0 (X,cT)=-3.66e-05,+5.95e-05,-8.05e-05,+1.08e-04 - I: 1 154 111 -3.37e-01,+5.47e-01,-7.40e-01,+9.89e-01 2 -78 - O: 2 232 22 -2.19e-01,+4.46e-01,-6.11e-01,+7.88e-01 1 (nil) - 233 22 -1.17e-01,+1.01e-01,-1.29e-01,+2.01e-01 1 (nil) -GenVertex: -79 ID: 0 (X,cT):0 - I: 1 157 311 +5.39e-01,-2.99e-01,-4.42e+00,+4.49e+00 2 -79 - O: 1 234 130 +5.39e-01,-2.99e-01,-4.42e+00,+4.49e+00 1 (nil) -Vertex: -80 ID: 0 (X,cT)=+1.61e-05,+7.28e-06,-2.46e-04,+2.47e-04 - I: 1 160 111 +4.80e-01,+2.17e-01,-7.34e+00,+7.36e+00 2 -80 - O: 2 235 22 +2.66e-01,+1.44e-01,-3.31e+00,+3.33e+00 1 (nil) - 236 22 +2.15e-01,+7.28e-02,-4.03e+00,+4.03e+00 1 (nil) -Vertex: -81 ID: 0 (X,cT)=-3.45e-05,-2.11e-05,-7.57e-04,+7.58e-04 - I: 1 164 111 -4.77e-01,-2.92e-01,-1.05e+01,+1.05e+01 2 -81 - O: 2 237 22 -1.85e-01,-4.71e-02,-2.98e+00,+2.99e+00 1 (nil) - 238 22 -2.92e-01,-2.45e-01,-7.48e+00,+7.49e+00 1 (nil) -Vertex: -82 ID: 0 (X,cT)=-9.53e+01,-3.29e+02,-6.28e+03,+6.29e+03 - I: 1 165 3122 -4.69e-01,-1.62e+00,-3.09e+01,+3.09e+01 2 -82 - O: 2 239 2212 -4.74e-01,-1.44e+00,-2.62e+01,+2.62e+01 1 (nil) - 240 -211 +5.01e-03,-1.82e-01,-4.71e+00,+4.71e+00 1 (nil) -Vertex: -83 ID: 0 (X,cT)=-1.49e+00,+1.99e+01,-5.17e+03,+5.17e+03 - I: 1 168 310 -1.74e-02,+2.33e-01,-6.04e+01,+6.04e+01 2 -83 - O: 2 241 -211 -1.84e-01,-3.33e-04,-2.55e+01,+2.55e+01 1 (nil) - 242 211 +1.67e-01,+2.33e-01,-3.49e+01,+3.49e+01 1 (nil) -GenVertex: -84 ID: 0 (X,cT):0 - I: 1 169 -311 -5.45e-01,+2.59e-01,-8.99e+01,+8.99e+01 2 -84 - O: 1 243 130 -5.45e-01,+2.59e-01,-8.99e+01,+8.99e+01 1 (nil) -Vertex: -85 ID: 0 (X,cT)=+5.73e-06,-3.45e-06,-7.31e-03,+7.31e-03 - I: 1 174 111 +2.54e-01,-1.53e-01,-3.24e+02,+3.24e+02 2 -85 - O: 2 244 22 +1.63e-01,-5.83e-02,-2.39e+02,+2.39e+02 1 (nil) - 245 22 +9.09e-02,-9.45e-02,-8.53e+01,+8.53e+01 1 (nil) -Vertex: -86 ID: 0 (X,cT)=+4.34e-06,-1.51e-06,-7.14e-03,+7.14e-03 - I: 1 176 111 +1.84e-01,-6.41e-02,-3.04e+02,+3.04e+02 2 -86 - O: 2 246 22 +3.56e-02,-7.99e-02,-1.18e+02,+1.18e+02 1 (nil) - 247 22 +1.49e-01,+1.58e-02,-1.86e+02,+1.86e+02 1 (nil) -Vertex: -87 ID: 0 (X,cT)=+7.08e-05,+6.51e-05,-1.28e-01,+1.28e-01 - I: 1 179 111 +2.98e-01,+2.74e-01,-5.41e+02,+5.41e+02 2 -87 - O: 2 248 22 +1.81e-01,+2.40e-01,-4.18e+02,+4.18e+02 1 (nil) - 249 22 +1.17e-01,+3.44e-02,-1.23e+02,+1.23e+02 1 (nil) -Vertex: -88 ID: 0 (X,cT)=-6.24e-07,-3.92e-05,+4.48e-03,+4.48e-03 - I: 1 184 111 -2.63e-03,-1.65e-01,+1.89e+01,+1.89e+01 2 -88 - O: 2 251 22 +1.06e-02,-1.55e-01,+1.86e+01,+1.86e+01 1 (nil) - 250 22 -1.32e-02,-1.02e-02,+2.51e-01,+2.52e-01 1 (nil) -Vertex: -89 ID: 0 (X,cT)=+1.36e-04,+4.24e-05,+3.24e-03,+3.24e-03 - I: 1 191 111 +5.32e-01,+1.66e-01,+1.27e+01,+1.27e+01 2 -89 - O: 2 252 22 +1.83e-01,+1.10e-01,+5.73e+00,+5.73e+00 1 (nil) - 253 22 +3.49e-01,+5.63e-02,+6.96e+00,+6.97e+00 1 (nil) -Vertex: -90 ID: 0 (X,cT)=+3.53e-05,+9.71e-06,-6.05e-05,+1.41e-04 - I: 1 196 111 +3.92e-02,+1.08e-02,-6.72e-02,+1.56e-01 2 -90 - O: 2 254 22 +7.69e-02,+3.56e-02,-7.15e-02,+1.11e-01 1 (nil) - 255 22 -3.77e-02,-2.48e-02,+4.24e-03,+4.53e-02 1 (nil) -Vertex: -91 ID: 0 (X,cT)=+4.08e-05,+6.79e-06,-1.10e-04,+1.18e-04 - I: 1 198 111 +4.58e-01,+7.63e-02,-1.24e+00,+1.33e+00 2 -91 - O: 2 256 22 +1.21e-01,-3.91e-02,-3.40e-01,+3.63e-01 1 (nil) - 257 22 +3.37e-01,+1.15e-01,-8.96e-01,+9.65e-01 1 (nil) -Vertex: -92 ID: 0 (X,cT)=+5.61e-06,-8.66e-06,-6.40e-05,+6.49e-05 - I: 1 203 111 +1.70e-01,-2.62e-01,-1.93e+00,+1.96e+00 2 -92 - O: 3 258 22 +3.78e-02,-1.90e-02,-5.69e-01,+5.70e-01 1 (nil) - 259 11 +1.27e-01,-2.18e-01,-1.21e+00,+1.24e+00 1 (nil) - 260 -11 +4.80e-03,-2.48e-02,-1.54e-01,+1.56e-01 1 (nil) -Vertex: -93 ID: 0 (X,cT)=-1.44e+01,+6.94e+00,+7.21e+02,+7.22e+02 - I: 1 206 310 -1.65e-01,+7.95e-02,+8.26e+00,+8.27e+00 2 -93 - O: 2 261 111 +9.20e-02,+1.32e-01,+2.25e+00,+2.26e+00 2 -97 - 262 111 -2.57e-01,-5.26e-02,+6.00e+00,+6.01e+00 2 -98 -Vertex: -94 ID: 0 (X,cT)=-7.78e+00,+1.06e+01,+1.70e+03,+1.70e+03 - I: 1 207 310 -2.08e-01,+2.83e-01,+4.52e+01,+4.53e+01 2 -94 - O: 2 263 111 -2.89e-01,+1.56e-01,+3.66e+01,+3.66e+01 2 -99 - 264 111 +8.17e-02,+1.26e-01,+8.62e+00,+8.62e+00 2 -100 -Vertex: -95 ID: 0 (X,cT)=-1.37e+01,-6.92e+00,-2.33e+00,+2.17e+01 - I: 1 212 310 -4.48e-01,-2.27e-01,-7.65e-02,+7.11e-01 2 -95 - O: 2 265 211 -2.95e-01,-9.17e-02,+1.55e-01,+3.73e-01 1 (nil) - 266 -211 -1.52e-01,-1.35e-01,-2.31e-01,+3.38e-01 1 (nil) -Vertex: -96 ID: 0 (X,cT)=+5.58e+00,+4.38e+01,+1.48e+02,+1.60e+02 - I: 1 217 310 +6.63e-02,+5.21e-01,+1.76e+00,+1.90e+00 2 -96 - O: 2 267 111 +1.60e-01,+1.55e-01,+1.10e+00,+1.13e+00 2 -101 - 268 111 -9.38e-02,+3.66e-01,+6.60e-01,+7.72e-01 2 -102 -Vertex: -97 ID: 0 (X,cT)=-1.44e+01,+6.94e+00,+7.21e+02,+7.22e+02 - I: 1 261 111 +9.20e-02,+1.32e-01,+2.25e+00,+2.26e+00 2 -97 - O: 2 269 22 +1.66e-02,-2.70e-02,+2.39e-01,+2.41e-01 1 (nil) - 270 22 +7.54e-02,+1.59e-01,+2.02e+00,+2.02e+00 1 (nil) -Vertex: -98 ID: 0 (X,cT)=-1.44e+01,+6.94e+00,+7.21e+02,+7.22e+02 - I: 1 262 111 -2.57e-01,-5.26e-02,+6.00e+00,+6.01e+00 2 -98 - O: 2 272 22 -1.85e-01,-2.09e-02,+2.76e+00,+2.76e+00 1 (nil) - 271 22 -7.17e-02,-3.17e-02,+3.25e+00,+3.25e+00 1 (nil) -Vertex: -99 ID: 0 (X,cT)=-7.78e+00,+1.06e+01,+1.70e+03,+1.70e+03 - I: 1 263 111 -2.89e-01,+1.56e-01,+3.66e+01,+3.66e+01 2 -99 - O: 2 274 22 -1.90e-01,+1.31e-01,+3.04e+01,+3.04e+01 1 (nil) - 273 22 -9.96e-02,+2.50e-02,+6.20e+00,+6.20e+00 1 (nil) -Vertex: -100 ID: 0 (X,cT)=-7.78e+00,+1.06e+01,+1.70e+03,+1.70e+03 - I: 1 264 111 +8.17e-02,+1.26e-01,+8.62e+00,+8.62e+00 2 -100 - O: 2 275 22 +7.76e-02,+2.39e-03,+3.60e+00,+3.60e+00 1 (nil) - 276 22 +4.09e-03,+1.24e-01,+5.01e+00,+5.02e+00 1 (nil) -Vertex: -101 ID: 0 (X,cT)=+5.58e+00,+4.38e+01,+1.48e+02,+1.60e+02 - I: 1 267 111 +1.60e-01,+1.55e-01,+1.10e+00,+1.13e+00 2 -101 - O: 2 277 22 +1.49e-01,+9.93e-02,+5.70e-01,+5.98e-01 1 (nil) - 278 22 +1.13e-02,+5.56e-02,+5.29e-01,+5.32e-01 1 (nil) -Vertex: -102 ID: 0 (X,cT)=+5.58e+00,+4.38e+01,+1.48e+02,+1.60e+02 - I: 1 268 111 -9.38e-02,+3.66e-01,+6.60e-01,+7.72e-01 2 -102 - O: 2 279 22 -6.60e-02,+5.16e-02,+1.69e-01,+1.89e-01 1 (nil) - 280 22 -2.77e-02,+3.15e-01,+4.91e-01,+5.84e-01 1 (nil) -________________________________________________________________________________ - Print out hit information ------------------------------------------- -*** Muon System Hit (#hits=5) -E1 : e+ : pT=0.0228 : TOF=26.7 : x=(0.593,-0.903,-7.9) -E1 : pi- : pT=0.116 : TOF=27.1 : x=(1.11,0.264,-7.9) -E1 : e- : pT=0.00033 : TOF=27.3 : x=(1.09,0.2,-7.9) -E1 : pi+ : pT=0.21 : TOF=26.8 : x=(-1.14,-0.214,-7.9) -E1 : mu- : pT=36.4 : TOF=26.6 : x=(0.321,0.958,-7.9) - -Graphics systems deleted. -Visualization Manager deleting... diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/hepmc_pygen.in b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/hepmc_pygen.in deleted file mode 100644 index 73f5852bb4..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/hepmc_pygen.in +++ /dev/null @@ -1,4 +0,0 @@ -/control/execute pyset.mac -/run/beamOn 10 -/generator/pythia/pystat 1 - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/hepmc_pygen.out b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/hepmc_pygen.out deleted file mode 100644 index d5c1911b74..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/hepmc_pygen.out +++ /dev/null @@ -1,415 +0,0 @@ -********************************************** - Geant4 version $Name: geant4-08-01 $ - (31-Jul-2002) - Copyright : Geant4 Collaboration -********************************************** - -phot: Total cross sections from Sandia parametrisation. -MuonMinusCaptureAtRest is created - -compt: Total cross sections from a parametrisation. Good description from 10 KeV to (100/Z) GeV. - Scattered gamma energy according Klein-Nishina. - PhysicsTables from 1 keV to 100 GeV in 80 bins. - -conv: Total cross sections from a parametrisation. Good description from 1.5 MeV to 100 GeV for all Z. - e+e- energies according Bethe-Heitler - PhysicsTables from 1.022 MeV to 100 GeV in 100 bins. - -eBrem: Total cross sections from a NEW parametrisation based on the EEDL data library. - Good description from 1 KeV to 100 GeV. - log scale extrapolation above 100 GeV - Gamma energy sampled from a parametrised formula. - PhysicsTables from 1 keV to 100 TeV in 100 bins. - -eIoni: delta cross sections from Moller+Bhabha. Good description from 1 KeV to 100 GeV. - delta ray energy sampled from differential Xsection. - PhysicsTables from 1 keV to 100 TeV in 100 bins. - -msc: Tables of transport mean free paths. - New model of MSC , computes the lateral - displacement of the particle , too. - PhysicsTables from 100 eV to 100 TeV in 100 bins. - -annihil: Total cross section from Heilter formula(annihilation into 2 photons). - gamma energies sampled according Heitler - PhysicsTables from 10 keV to 10 TeV in 100 bins. - -annihil: Total cross section from Heilter formula(annihilation into 2 photons). - gamma energies sampled according Heitler - PhysicsTables from 10 keV to 10 TeV in 100 bins. - -hIoni: Knock-on electron cross sections . - Good description above the mean excitation energy. - delta ray energy sampled from differential Xsection. - PhysicsTables from 1 keV to 100 TeV in 100 bins. - -msc: Tables of transport mean free paths. - New model of MSC , computes the lateral - displacement of the particle , too. - PhysicsTables from 100 eV to 100 TeV in 100 bins. - -MuIoni: Knock-on electron cross sections . - Good description above the mean excitation energy. - delta ray energy sampled from differential Xsection. - PhysicsTables from 1 keV to 1000 PeV in 150 bins. - -MuBrems: theoretical cross section - Good description up to 1000 PeV. - PhysicsTables from 1 keV to 1000 PeV in 150 bins. - -MuPairProd: theoretical cross sections - Good description up to 1000 PeV. - PhysicsTables from 1 keV to 1000 PeV in 150 bins. - -msc: Tables of transport mean free paths. - New model of MSC , computes the lateral - displacement of the particle , too. - PhysicsTables from 100 eV to 100 TeV in 100 bins. -Visualization Manager instantiating... -Visualization Manager initialising... -Registering graphics systems... -* Visualizaton Driver: DAWN -* Visualizaton Driver: VRML1/2 -* Visualizaton Driver: VRML1/2 File - -You have successfully chosen to use the following graphics systems. -Current available graphics systems are: - ASCIITree (ATree) - DAWNFILE (DAWNFILE) - OpenGLImmediateX (OGLIX) - OpenGLStoredX (OGLSX) - OpenGLImmediateXm (OGLIXm) - OpenGLStoredXm (OGLSXm) - VRML1 (VRML1) - VRML2 (VRML2) - VRML1FILE (VRML1FILE) - VRML2FILE (VRML2FILE) - -current generator type: pythia -1 - ****************************************************************************** - ****************************************************************************** - ** ** - ** ** - ** *......* Welcome to the Lund Monte Carlo! ** - ** *:::!!:::::::::::* ** - ** *::::::!!::::::::::::::* PPP Y Y TTTTT H H III A ** - ** *::::::::!!::::::::::::::::* P P Y Y T H H I A A ** - ** *:::::::::!!:::::::::::::::::* PPP Y T HHHHH I AAAAA ** - ** *:::::::::!!:::::::::::::::::* P Y T H H I A A ** - ** *::::::::!!::::::::::::::::*! P Y T H H III A A ** - ** *::::::!!::::::::::::::* !! ** - ** !! *:::!!:::::::::::* !! This is PYTHIA version 6.205 ** - ** !! !* -><- * !! Last date of change: 1 Mar 2002 ** - ** !! !! !! ** - ** !! !! !! Now is 0 Jan 2000 at 0:00:00 ** - ** !! !! ** - ** !! lh !! Disclaimer: this program comes ** - ** !! !! without any guarantees. Beware ** - ** !! hh !! of errors and use common sense ** - ** !! ll !! when interpreting results. ** - ** !! !! ** - ** !! Copyright T. Sjostrand (2001) ** - ** ** - ** An archive of program versions and documentation is found on the web: ** - ** http://www.thep.lu.se/~torbjorn/Pythia.html ** - ** ** - ** When you cite this program, currently the official reference is ** - ** T. Sjostrand, P. Eden, C. Friberg, L. Lonnblad, G. Miu, S. Mrenna and ** - ** E. Norrbin, Computer Physics Commun. 135 (2001) 238. ** - ** The large manual is ** - ** T. Sjostrand, L. Lonnblad and S. Mrenna, LU TP 01-21 [hep-ph/0108264]. ** - ** Also remember that the program, to a large extent, represents original ** - ** physics research. Other publications of special relevance to your ** - ** studies may therefore deserve separate mention. ** - ** ** - ** Main author: Torbjorn Sjostrand; Department of Theoretical Physics 2, ** - ** Lund University, Solvegatan 14A, S-223 62 Lund, Sweden; ** - ** phone: + 46 - 46 - 222 48 16; e-mail: torbjorn@thep.lu.se ** - ** Author: Leif Lonnblad; Department of Theoretical Physics 2, ** - ** Lund University, Solvegatan 14A, S-223 62 Lund, Sweden; ** - ** phone: + 46 - 46 - 222 77 80; e-mail: leif@thep.lu.se ** - ** Author: Stephen Mrenna; Computing Division, Simulations Group, ** - ** Fermi National Accelerator Laboratory, MS 234, Batavia, IL 60510, USA; ** - ** phone: + 1 - 630 - 840 - 2556; e-mail: mrenna@fnal.gov ** - ** Author: Peter Skands; Department of Theoretical Physics 2, ** - ** Lund University, Solvegatan 14A, S-223 62 Lund, Sweden; ** - ** phone: + 46 - 46 - 222 31 92; e-mail: zeiler@thep.lu.se ** - ** ** - ** ** - ****************************************************************************** - ****************************************************************************** - PMAS(6,1) changed from 175.00000 to 174.30000 - PMAS(25,1) changed from 115.00000 to 200.00000 - MSEL changed from 1 to 0 - MSUB(102) changed from 0 to 1 - MSUB(123) changed from 0 to 1 - MSUB(124) changed from 0 to 1 - MDME(210,1) changed from 1 to 0 - MDME(211,1) changed from 1 to 0 - MDME(212,1) changed from 1 to 0 - MDME(213,1) changed from 1 to 0 - MDME(214,1) changed from 1 to 0 - MDME(215,1) changed from 1 to 0 - MDME(218,1) changed from 1 to 0 - MDME(219,1) changed from 1 to 0 - MDME(220,1) changed from 1 to 0 - MDME(222,1) changed from 1 to 0 - MDME(223,1) changed from 1 to 0 - MDME(224,1) changed from 1 to 0 - MDME(225,1) changed from 1 to 1 - MDME(226,1) changed from 1 to 0 - MDME(216,1) changed from -1 to -1 - MDME(217,1) changed from -1 to -1 - MDME(218,1) changed from 0 to -1 - MDME(174,1) changed from 1 to 0 - MDME(175,1) changed from 1 to 0 - MDME(176,1) changed from 1 to 0 - MDME(177,1) changed from 1 to 0 - MDME(178,1) changed from 1 to 0 - MDME(179,1) changed from 1 to 0 - MDME(182,1) changed from 1 to 0 - MDME(183,1) changed from 1 to 0 - MDME(184,1) changed from 1 to 1 - MDME(185,1) changed from 1 to 0 - MDME(186,1) changed from 1 to 0 - MDME(187,1) changed from 1 to 0 - MDME(180,1) changed from -1 to -1 - MDME(181,1) changed from -1 to -1 - MDME(188,1) changed from -1 to -1 - MDME(189,1) changed from -1 to -1 - MSTP(61) changed from 2 to 1 - MSTP(71) changed from 1 to 1 - MSTP(81) changed from 1 to 1 - MSTP(111) changed from 1 to 1 -1****************** PYINIT: initialization of PYTHIA routines ***************** - - ============================================================================== - I I - I PYTHIA will be initialized for a p on p collider I - I at 14000.000 GeV center-of-mass energy I - I I - ============================================================================== - - ******** PYMAXI: summary of differential cross-section maximum search ******** - - ========================================================== - I I I - I ISUB Subprocess name I Maximum value I - I I I - ========================================================== - I I I - I 96 Semihard QCD 2 -> 2 I 1.8679E+03 I - I 102 g + g -> h0 I 5.1617E-12 I - I 123 f + f' -> f + f' + h0 I 4.0000E-12 I - I 124 f + f' -> f" + f"' + h0 I 8.9419E-12 I - I I I - ========================================================== - - ********************** PYINIT: initialization completed ********************** - Print out hit information ------------------------------------------- -*** Muon System Hit (#hits=18) -E0 : pi+ : pT=0.118 : TOF=27 : x=(-0.322,1.06,7.9) -E0 : pi- : pT=0.324 : TOF=26.7 : x=(1.15,0.339,7.9) -E1 : pi- : pT=0.301 : TOF=26.7 : x=(1.05,0.415,-7.9) -E1 : mu- : pT=0.356 : TOF=26.6 : x=(-0.985,0.19,-7.9) -E1 : pi+ : pT=0.536 : TOF=26.6 : x=(-0.529,0.882,-7.9) -E1 : pi+ : pT=1.14 : TOF=27 : x=(-0.652,0.758,-8.02) -E0 : e- : pT=0.000369 : TOF=29.1 : x=(-0.823,0.569,7.94) -E1 : mu- : pT=1.29 : TOF=27.8 : x=(-0.151,-2.68,-7.9) -E1 : e- : pT=0.000702 : TOF=31 : x=(0.345,-1.69,-7.9) -E1 : e- : pT=0.00121 : TOF=28.1 : x=(-1.62,-0.29,-7.9) -E0 : pi- : pT=0.298 : TOF=26.6 : x=(0.353,-0.963,7.9) -E0 : mu- : pT=0.0257 : TOF=28.2 : x=(-1.12,-0.828,7.9) -E0 : pi+ : pT=0.226 : TOF=26.7 : x=(-0.35,0.973,7.9) -E1 : e- : pT=0.00205 : TOF=27.6 : x=(1.22,0.311,-7.9) -B3 : mu+ : pT=42 : TOF=15 : x=(-4.04,1.97,-0.0268) -B1 : mu- : pT=58.3 : TOF=21.4 : x=(2.07,3.94,-4.63) -B4 : mu+ : pT=22.9 : TOF=24.1 : x=(-4.25,-1.09,5.75) -E1 : mu- : pT=26.5 : TOF=28.6 : x=(-1.86,2.74,-7.9) - - Print out hit information ------------------------------------------- -*** Muon System Hit (#hits=9) -E1 : pi- : pT=0.11 : TOF=27 : x=(-0.612,-0.904,-7.9) -E1 : e- : pT=0.0024 : TOF=27.6 : x=(-1.01,-1.34,-7.9) -E1 : pi- : pT=0.359 : TOF=26.6 : x=(-0.15,1.02,-7.9) -E1 : e- : pT=0.00115 : TOF=28 : x=(-0.153,-1.18,-7.9) -E1 : e- : pT=0.00182 : TOF=27.4 : x=(-1.44,-0.518,-7.9) -B6 : mu+ : pT=25.6 : TOF=16.8 : x=(-0.273,-4.25,-2.71) -E0 : mu- : pT=19.4 : TOF=27.9 : x=(2.63,-0.623,7.9) -E1 : mu- : pT=7.96 : TOF=26.9 : x=(-1.44,0.67,-7.9) -B4 : mu+ : pT=51.7 : TOF=17.3 : x=(-4.25,0.68,2.91) - - Print out hit information ------------------------------------------- -*** Muon System Hit (#hits=22) -E0 : pi- : pT=0.538 : TOF=26.7 : x=(0.758,-0.963,7.9) -E1 : pi- : pT=1.23 : TOF=26.6 : x=(-1.05,0.00395,-7.9) -E1 : pi+ : pT=0.204 : TOF=26.7 : x=(0.438,0.986,-7.9) -E0 : pi- : pT=3.4 : TOF=26.6 : x=(0.696,-0.81,7.9) -E0 : pi- : pT=0.583 : TOF=27 : x=(-0.8,-0.599,8.03) -E0 : kaon+ : pT=0.531 : TOF=26.8 : x=(0.141,1.04,7.9) -E0 : pi- : pT=0.298 : TOF=26.6 : x=(0.136,1.05,7.9) -E1 : pi- : pT=0.421 : TOF=26.6 : x=(-0.0951,1.05,-7.9) -E0 : kaon- : pT=0.22 : TOF=27.9 : x=(-1.1,-0.0225,7.9) -E0 : e- : pT=0.00133 : TOF=27.7 : x=(-0.836,-0.549,7.99) -E1 : kaon+ : pT=2.03 : TOF=26.6 : x=(0.373,0.992,-7.9) -E1 : mu+ : pT=0.9 : TOF=27.8 : x=(-2.58,0.167,-7.9) -E1 : kaon+ : pT=2.37 : TOF=26.8 : x=(1.43,-0.379,-7.9) -E0 : pi+ : pT=1.7 : TOF=26.7 : x=(-0.925,0.785,7.9) -E1 : pi+ : pT=1.19 : TOF=26.7 : x=(-0.867,-0.815,-7.9) -E0 : e- : pT=0.00166 : TOF=29.4 : x=(-0.977,1.06,7.9) -E1 : pi+ : pT=0.302 : TOF=27 : x=(-0.874,-0.486,-8.02) -E1 : mu- : pT=0.0717 : TOF=28.1 : x=(1.5,1.95,-7.9) -B6 : mu- : pT=40.4 : TOF=14.9 : x=(-1.28,-4.25,0.423) -E1 : mu+ : pT=24.4 : TOF=27.9 : x=(-2.65,0.752,-7.9) -B7 : mu+ : pT=42.5 : TOF=17.2 : x=(2.1,-3.91,-2.61) -B2 : mu- : pT=52.3 : TOF=22.1 : x=(1.47,4.25,-4.85) - - Print out hit information ------------------------------------------- -*** Muon System Hit (#hits=20) -E1 : mu- : pT=0.392 : TOF=26.7 : x=(1.19,0.48,-7.9) -E0 : e- : pT=0.000597 : TOF=39 : x=(-1.84,2.29,8.1) -E1 : pi+ : pT=0.426 : TOF=26.6 : x=(-0.675,0.797,-7.9) -E1 : e- : pT=2.13e-05 : TOF=26.6 : x=(-0.675,0.797,-7.9) -E0 : e- : pT=0.000367 : TOF=37.7 : x=(0.778,1.11,7.9) -E1 : pi- : pT=0.29 : TOF=26.7 : x=(0.0726,-1.09,-7.9) -E1 : pi- : pT=0.831 : TOF=26.6 : x=(-0.0968,1.01,-7.9) -E1 : pi+ : pT=1.9 : TOF=26.6 : x=(0.496,0.974,-7.9) -E1 : pi- : pT=0.59 : TOF=26.7 : x=(0.857,0.961,-7.9) -E1 : pi- : pT=13 : TOF=26.7 : x=(0.375,1.15,-7.9) -E1 : pi+ : pT=0.0802 : TOF=27.4 : x=(0.698,1.32,-7.9) -E1 : pi- : pT=2.59 : TOF=26.6 : x=(0.232,1.09,-7.9) -E1 : pi- : pT=1.06 : TOF=26.6 : x=(0.00739,1.1,-7.9) -E1 : pi+ : pT=0.698 : TOF=26.6 : x=(0.698,0.894,-7.9) -E1 : pi- : pT=0.547 : TOF=26.6 : x=(0.679,-0.885,-7.9) -E1 : pi- : pT=0.31 : TOF=26.7 : x=(-0.983,0.185,-7.94) -E1 : pi+ : pT=6.23 : TOF=26.7 : x=(0.479,1.14,-7.9) -B6 : mu- : pT=42.7 : TOF=25.2 : x=(1.54,-4.25,-6.05) -E1 : mu+ : pT=29.3 : TOF=26.9 : x=(1.59,0.0382,-7.9) -E1 : mu- : pT=69.8 : TOF=26.6 : x=(-1.14,-0.105,-7.9) - - Print out hit information ------------------------------------------- -*** Muon System Hit (#hits=13) -E1 : e- : pT=0.000657 : TOF=31.4 : x=(-1.13,2.25,-7.9) -E0 : pi- : pT=0.19 : TOF=26.7 : x=(-0.765,0.666,7.9) -E1 : pi+ : pT=0.148 : TOF=26.9 : x=(-0.79,-0.841,-7.9) -E0 : anti_proton : pT=0.652 : TOF=27.1 : x=(0.921,-0.592,7.9) -E1 : mu- : pT=0.112 : TOF=28 : x=(-0.00993,2.61,-7.9) -B1 : mu- : pT=0.474 : TOF=19.4 : x=(2.64,3.37,3.78) -E1 : e- : pT=0.000675 : TOF=27.6 : x=(-0.903,-0.54,-7.9) -E1 : pi- : pT=0.796 : TOF=26.6 : x=(-0.271,-1.05,-7.9) -E1 : kaon+ : pT=0.466 : TOF=26.8 : x=(0.613,-0.803,-7.9) -B5 : mu- : pT=15.6 : TOF=22.2 : x=(-2.88,-3.13,-5.12) -B4 : mu+ : pT=74.1 : TOF=20.4 : x=(-4.25,1.12,4.24) -E0 : mu- : pT=23.6 : TOF=27.5 : x=(-1.05,2.14,7.9) -B5 : mu+ : pT=64.7 : TOF=15.9 : x=(-2.56,-3.45,2.09) - - Print out hit information ------------------------------------------- -*** Muon System Hit (#hits=10) -E1 : pi- : pT=0.168 : TOF=26.9 : x=(-0.195,1.19,-7.9) -E1 : e- : pT=0.00145 : TOF=27.5 : x=(0.0163,1.28,-7.9) -E0 : e- : pT=0.00184 : TOF=27 : x=(-0.747,-0.943,7.9) -E0 : pi+ : pT=0.373 : TOF=26.7 : x=(0.699,0.91,7.9) -E0 : e- : pT=0.00126 : TOF=28.9 : x=(0.923,-0.384,7.93) -E0 : e- : pT=0.000846 : TOF=35.5 : x=(2.17,-1.42,7.9) -B5 : mu+ : pT=16.2 : TOF=15.1 : x=(-4.08,-1.93,0.167) -B1 : mu- : pT=99.2 : TOF=14.3 : x=(3.37,2.64,0.176) -B1 : mu+ : pT=63.1 : TOF=17.9 : x=(3.08,2.93,3.27) -B4 : mu- : pT=30.6 : TOF=19.3 : x=(-4.25,-0.434,3.88) - - Print out hit information ------------------------------------------- -*** Muon System Hit (#hits=15) -E1 : mu+ : pT=0.106 : TOF=27.5 : x=(1.25,-0.911,-7.9) -E0 : e+ : pT=0.0376 : TOF=26.6 : x=(-0.859,0.675,7.9) -E1 : mu+ : pT=0.153 : TOF=27.5 : x=(0.989,-0.15,-8.1) -E1 : pi- : pT=0.642 : TOF=26.6 : x=(-0.552,0.844,-7.9) -E1 : e- : pT=0.000328 : TOF=28.4 : x=(-0.538,1.07,-8.1) -E0 : pi+ : pT=0.634 : TOF=26.7 : x=(-0.732,-0.927,7.9) -E0 : pi+ : pT=0.693 : TOF=26.6 : x=(-0.166,-0.999,7.9) -E0 : e- : pT=0.000121 : TOF=26.7 : x=(-0.178,-1.01,7.9) -E1 : pi- : pT=0.912 : TOF=26.6 : x=(1.02,0.466,-7.9) -E0 : mu+ : pT=0.265 : TOF=27.3 : x=(-0.679,0.734,8.1) -E1 : kaon- : pT=0.811 : TOF=26.7 : x=(0.161,-1.16,-7.9) -E0 : mu+ : pT=4.37 : TOF=27.5 : x=(-2.22,-0.931,7.9) -E1 : mu- : pT=24.6 : TOF=27 : x=(0.369,1.72,-7.9) -E1 : mu+ : pT=21.7 : TOF=28.6 : x=(3.31,-0.634,-7.9) -B5 : mu- : pT=22.1 : TOF=23.4 : x=(-3.64,-2.37,5.5) - - Print out hit information ------------------------------------------- -*** Muon System Hit (#hits=7) -E1 : e- : pT=0.000993 : TOF=28.6 : x=(-0.999,-0.0531,-8.03) -E1 : e- : pT=0.0016 : TOF=34.5 : x=(-3.34,-1.7,-7.9) -E0 : pi+ : pT=0.0712 : TOF=28 : x=(-1.22,-0.224,7.9) -B1 : mu- : pT=19.7 : TOF=21.5 : x=(1.89,4.12,4.58) -E1 : mu+ : pT=11.3 : TOF=26.7 : x=(-1.15,-0.41,-7.9) -B6 : mu+ : pT=15.3 : TOF=18.8 : x=(0.00684,-4.25,3.69) -E1 : mu- : pT=40.2 : TOF=27.7 : x=(-0.927,-2.4,-7.9) - - Print out hit information ------------------------------------------- -*** Muon System Hit (#hits=12) -E1 : e- : pT=0.000952 : TOF=28.9 : x=(0.967,-0.254,-7.99) -E1 : e- : pT=6.09e-05 : TOF=33.4 : x=(1.19,-0.587,-7.9) -E1 : pi- : pT=0.88 : TOF=26.6 : x=(0.99,-0.532,-7.9) -E1 : pi+ : pT=0.353 : TOF=26.7 : x=(0.446,-1.1,-7.9) -E0 : e- : pT=0.00106 : TOF=29.2 : x=(-1.34,-0.637,7.9) -E0 : e- : pT=0.000573 : TOF=30.4 : x=(-0.986,0.168,8.03) -E0 : pi- : pT=0.603 : TOF=26.8 : x=(-0.371,-1.08,7.9) -E0 : e- : pT=0.00118 : TOF=30.1 : x=(-1.24,-0.77,7.9) -B1 : mu+ : pT=29.8 : TOF=15.6 : x=(4.04,1.97,-1.32) -B4 : mu- : pT=67.6 : TOF=14.7 : x=(-4.25,0.691,-1.01) -B1 : mu- : pT=44.5 : TOF=14.3 : x=(3.15,2.86,0.518) -B4 : mu+ : pT=33.7 : TOF=20.1 : x=(-4.25,-0.737,4.2) - - Print out hit information ------------------------------------------- -*** Muon System Hit (#hits=17) -E0 : pi- : pT=0.15 : TOF=26.8 : x=(0.187,-1.01,7.9) -E0 : pi- : pT=0.483 : TOF=26.7 : x=(0.122,-1.15,7.9) -E1 : pi- : pT=0.314 : TOF=26.7 : x=(1.19,-0.189,-7.9) -E0 : pi+ : pT=0.272 : TOF=26.6 : x=(0.697,-0.776,7.9) -E0 : e- : pT=0.00231 : TOF=28.5 : x=(0.0574,-1.96,7.9) -E0 : e- : pT=8.52e-05 : TOF=37.5 : x=(1.2,-3.83,7.9) -E0 : pi- : pT=1.08 : TOF=26.6 : x=(0.413,-0.943,7.9) -E0 : pi+ : pT=1.21 : TOF=26.6 : x=(0.752,-0.669,7.9) -E0 : proton : pT=0.537 : TOF=27.5 : x=(0.932,-0.698,7.9) -E0 : pi- : pT=2 : TOF=26.7 : x=(0.67,0.991,7.9) -E0 : pi+ : pT=0.585 : TOF=26.7 : x=(-1.12,-0.465,7.9) -E0 : pi+ : pT=0.667 : TOF=26.6 : x=(0.104,1.03,7.9) -E0 : pi+ : pT=0.193 : TOF=27 : x=(-1.22,-0.344,7.9) -E0 : pi+ : pT=0.237 : TOF=27 : x=(-1.2,0.225,7.9) -E0 : mu- : pT=29.5 : TOF=27.4 : x=(-2.23,-0.524,7.9) -B7 : mu- : pT=55.5 : TOF=15.7 : x=(1.93,-4.08,1.28) -E0 : mu+ : pT=18.3 : TOF=27.2 : x=(1.27,1.59,7.9) - -1********* PYSTAT: Statistics on Number of Events and Cross-sections ********* - - ============================================================================== - I I I I - I Subprocess I Number of points I Sigma I - I I I I - I----------------------------------I----------------------------I (mb) I - I I I I - I N:o Type I Generated Tried I I - I I I I - ============================================================================== - I I I I - I 0 All included subprocesses I 10 43 I 3.988E-12 I - I 102 g + g -> h0 I 7 13 I 2.929E-12 I - I 123 f + f' -> f + f' + h0 I 1 9 I 3.282E-13 I - I 124 f + f' -> f" + f"' + h0 I 2 21 I 7.305E-13 I - I I I I - ============================================================================== - - ********* Fraction of events that fail fragmentation cuts = 0.00000 ********* - -Graphics systems deleted. -Visualization Manager deleting... diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/G4HepMCInterface.hh b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/G4HepMCInterface.hh deleted file mode 100644 index ea39bc09df..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/G4HepMCInterface.hh +++ /dev/null @@ -1,82 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// ==================================================================== -// -// G4HepMCInterface.hh -// $Id: G4HepMCInterface.hh,v 1.3 2006/06/29 17:12:51 gunter Exp $ -// -// A base class for primary generation via HepMC object. -// This class is derived from G4VPrimaryGenerator. -// -// ==================================================================== -#ifndef G4_HEPMC_INTERFACE_H -#define G4_HEPMC_INTERFACE_H - -#include "G4VPrimaryGenerator.hh" -#include - -class G4HepMCInterface : public G4VPrimaryGenerator -{ -public: - // static service method for conversion from HepMC::GenEvent to G4Event - static void HepMC2G4(const HepMC::GenEvent* hepmcevt, G4Event* g4event); - - // static service method for checking a point is included in the (current) world - // static G4bool CheckVertexInsideWorld(const G4ThreeVector& pos); - // ------------> This method has been moved to the base class - -protected: - // Note that the life of HepMC event object must be handled by users. - // In the default implementation, a current HepMC event will be - // deleted at GeneratePrimaryVertex() in the next event. - HepMC::GenEvent* hepmcEvent; // (care for single event case only) - - // Implement this method in his/her own concrete class. - // An empty event will be created in default. - virtual HepMC::GenEvent* GenerateHepMCEvent(); - -public: - G4HepMCInterface(); - virtual ~G4HepMCInterface(); - - // set/get methods - HepMC::GenEvent* GetHepMCGenEvent() const; - - // The default behavior is that a single HepMC event generated by - // GenerateHepMCEvent() will be converted to G4Event through HepMC2G4(). - virtual void GeneratePrimaryVertex(G4Event* anEvent); -}; - -// ==================================================================== -// inline functions -// ==================================================================== - -inline HepMC::GenEvent* G4HepMCInterface::GetHepMCGenEvent() const -{ - return hepmcEvent; -} - -#endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02EMPhysics.hh b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02EMPhysics.hh deleted file mode 100644 index fbe6fc584d..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02EMPhysics.hh +++ /dev/null @@ -1,96 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: H02EMPhysics.hh,v 1.2 2006/06/29 17:12:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// -// ------------------------------------------------------------ -// GEANT 4 class header file -// Class Description: -// This class is an derived class of G4VPhysicsConstructor -// -// ------------------------------------------- -// History -// first version 12 Nov. 2000 by H.Kurashige -// ------------------------------------------------------------ -#ifndef H02EMPhysics_h -#define H02EMPhysics_h 1 - -#include "globals.hh" -#include "G4ios.hh" - -#include "G4VPhysicsConstructor.hh" - -#include "G4PhotoElectricEffect.hh" -#include "G4ComptonScattering.hh" -#include "G4GammaConversion.hh" -#include "G4MultipleScattering.hh" -#include "G4eIonisation.hh" -#include "G4eBremsstrahlung.hh" -#include "G4eplusAnnihilation.hh" - -class H02EMPhysics : public G4VPhysicsConstructor -{ - public: - H02EMPhysics(const G4String& name ="EM"); - virtual ~H02EMPhysics(); - - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); - - protected: - // Gamma physics - G4PhotoElectricEffect thePhotoEffect; - G4ComptonScattering theComptonEffect; - G4GammaConversion thePairProduction; - - // Electron physics - G4MultipleScattering theElectronMultipleScattering; - G4eIonisation theElectronIonisation; - G4eBremsstrahlung theElectronBremsStrahlung; - - //Positron physics - G4MultipleScattering thePositronMultipleScattering; - G4eIonisation thePositronIonisation; - G4eBremsstrahlung thePositronBremsStrahlung; - G4eplusAnnihilation theAnnihilation; -}; - - -#endif - - - - - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02HadronPhysics.hh b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02HadronPhysics.hh deleted file mode 100644 index eabc361c95..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02HadronPhysics.hh +++ /dev/null @@ -1,341 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -//======================== -// taken from example N04 of G4 distribution -//======================== -#ifndef H02HadronPhysics_h -#define H02HadronPhysics_h 1 - -#include "globals.hh" -#include "G4ios.hh" -#include - -#include "G4VPhysicsConstructor.hh" - -#include "G4MultipleScattering.hh" -#include "G4hIonisation.hh" - -#include "G4HadronElasticProcess.hh" -#include "G4HadronFissionProcess.hh" -#include "G4HadronCaptureProcess.hh" - -#include "G4PionPlusInelasticProcess.hh" -#include "G4PionMinusInelasticProcess.hh" -#include "G4KaonPlusInelasticProcess.hh" -#include "G4KaonZeroSInelasticProcess.hh" -#include "G4KaonZeroLInelasticProcess.hh" -#include "G4KaonMinusInelasticProcess.hh" -#include "G4ProtonInelasticProcess.hh" -#include "G4AntiProtonInelasticProcess.hh" -#include "G4NeutronInelasticProcess.hh" -#include "G4AntiNeutronInelasticProcess.hh" -#include "G4LambdaInelasticProcess.hh" -#include "G4AntiLambdaInelasticProcess.hh" -#include "G4SigmaPlusInelasticProcess.hh" -#include "G4SigmaMinusInelasticProcess.hh" -#include "G4AntiSigmaPlusInelasticProcess.hh" -#include "G4AntiSigmaMinusInelasticProcess.hh" -#include "G4XiZeroInelasticProcess.hh" -#include "G4XiMinusInelasticProcess.hh" -#include "G4AntiXiZeroInelasticProcess.hh" -#include "G4AntiXiMinusInelasticProcess.hh" -#include "G4DeuteronInelasticProcess.hh" -#include "G4TritonInelasticProcess.hh" -#include "G4AlphaInelasticProcess.hh" -#include "G4OmegaMinusInelasticProcess.hh" -#include "G4AntiOmegaMinusInelasticProcess.hh" - -// Low-energy Models -#include "G4LElastic.hh" -#include "G4LFission.hh" -#include "G4LCapture.hh" - -#include "G4LEPionPlusInelastic.hh" -#include "G4LEPionMinusInelastic.hh" -#include "G4LEKaonPlusInelastic.hh" -#include "G4LEKaonZeroSInelastic.hh" -#include "G4LEKaonZeroLInelastic.hh" -#include "G4LEKaonMinusInelastic.hh" -#include "G4LEProtonInelastic.hh" -#include "G4LEAntiProtonInelastic.hh" -#include "G4LENeutronInelastic.hh" -#include "G4LEAntiNeutronInelastic.hh" -#include "G4LELambdaInelastic.hh" -#include "G4LEAntiLambdaInelastic.hh" -#include "G4LESigmaPlusInelastic.hh" -#include "G4LESigmaMinusInelastic.hh" -#include "G4LEAntiSigmaPlusInelastic.hh" -#include "G4LEAntiSigmaMinusInelastic.hh" -#include "G4LEXiZeroInelastic.hh" -#include "G4LEXiMinusInelastic.hh" -#include "G4LEAntiXiZeroInelastic.hh" -#include "G4LEAntiXiMinusInelastic.hh" -#include "G4LEDeuteronInelastic.hh" -#include "G4LETritonInelastic.hh" -#include "G4LEAlphaInelastic.hh" -#include "G4LEOmegaMinusInelastic.hh" -#include "G4LEAntiOmegaMinusInelastic.hh" - -// High-energy Models - -#include "G4HEPionPlusInelastic.hh" -#include "G4HEPionMinusInelastic.hh" -#include "G4HEKaonPlusInelastic.hh" -#include "G4HEKaonZeroInelastic.hh" -#include "G4HEKaonZeroInelastic.hh" -#include "G4HEKaonMinusInelastic.hh" -#include "G4HEProtonInelastic.hh" -#include "G4HEAntiProtonInelastic.hh" -#include "G4HENeutronInelastic.hh" -#include "G4HEAntiNeutronInelastic.hh" -#include "G4HELambdaInelastic.hh" -#include "G4HEAntiLambdaInelastic.hh" -#include "G4HESigmaPlusInelastic.hh" -#include "G4HESigmaMinusInelastic.hh" -#include "G4HEAntiSigmaPlusInelastic.hh" -#include "G4HEAntiSigmaMinusInelastic.hh" -#include "G4HEXiZeroInelastic.hh" -#include "G4HEXiMinusInelastic.hh" -#include "G4HEAntiXiZeroInelastic.hh" -#include "G4HEAntiXiMinusInelastic.hh" -#include "G4HEOmegaMinusInelastic.hh" -#include "G4HEAntiOmegaMinusInelastic.hh" - -// Stopping processes -#include "G4AntiProtonAnnihilationAtRest.hh" -#include "G4AntiNeutronAnnihilationAtRest.hh" - -#ifdef TRIUMF_STOP_PIMINUS -#include "G4PionMinusAbsorptionAtRest.hh" -#else -#include "G4PiMinusAbsorptionAtRest.hh" -#endif -#ifdef TRIUMF_STOP_KMINUS -#include "G4KaonMinusAbsorption.hh" -#else -#include "G4KaonMinusAbsorptionAtRest.hh" -#endif - -// quark gluon string model with chips afterburner. -#include "G4TheoFSGenerator.hh" -#include "G4ExcitationHandler.hh" -#include "G4PreCompoundModel.hh" -#include "G4GeneratorPrecompoundInterface.hh" -#include "G4QGSModel.hh" -#include "G4QGSParticipants.hh" -#include "G4QGSMFragmentation.hh" -#include "G4ExcitedStringDecay.hh" - -class H02HadronPhysics : public G4VPhysicsConstructor -{ - public: - H02HadronPhysics(const G4String& name ="hadron"); - virtual ~H02HadronPhysics(); - - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); - - protected: - // Elastic Process - G4HadronElasticProcess theElasticProcess; - G4LElastic* theElasticModel; - - // Pi + - G4PionPlusInelasticProcess thePionPlusInelastic; - G4LEPionPlusInelastic* theLEPionPlusModel; - G4MultipleScattering thePionPlusMult; - G4hIonisation thePionPlusIonisation; - - // Pi - - G4PionMinusInelasticProcess thePionMinusInelastic; - G4LEPionMinusInelastic* theLEPionMinusModel; - G4MultipleScattering thePionMinusMult; - G4hIonisation thePionMinusIonisation; -#ifdef TRIUMF_STOP_PIMINUS - G4PionMinusAbsorptionAtRest thePionMinusAbsorption; -#else - G4PiMinusAbsorptionAtRest thePionMinusAbsorption; -#endif - - // pi+ and pi- - - G4TheoFSGenerator theTheoModel; - G4ExcitationHandler theHandler; - G4PreCompoundModel * thePreEquilib; - G4GeneratorPrecompoundInterface theCascade; - G4QGSModel< G4QGSParticipants > theStringModel; - G4QGSMFragmentation theFragmentation; - G4ExcitedStringDecay * theStringDecay; - - // K + - G4KaonPlusInelasticProcess theKaonPlusInelastic; - G4LEKaonPlusInelastic* theLEKaonPlusModel; - G4HEKaonPlusInelastic* theHEKaonPlusModel; - G4MultipleScattering theKaonPlusMult; - G4hIonisation theKaonPlusIonisation; - - // K - - G4KaonMinusInelasticProcess theKaonMinusInelastic; - G4LEKaonMinusInelastic* theLEKaonMinusModel; - G4HEKaonMinusInelastic* theHEKaonMinusModel; - G4MultipleScattering theKaonMinusMult; - G4hIonisation theKaonMinusIonisation; -#ifdef TRIUMF_STOP_KMINUS - G4KaonMinusAbsorption theKaonMinusAbsorption; -#else - G4PiMinusAbsorptionAtRest theKaonMinusAbsorption; -#endif - - // K0L - G4KaonZeroLInelasticProcess theKaonZeroLInelastic; - G4LEKaonZeroLInelastic* theLEKaonZeroLModel; - G4HEKaonZeroInelastic* theHEKaonZeroLModel; - - // K0S - G4KaonZeroSInelasticProcess theKaonZeroSInelastic; - G4LEKaonZeroSInelastic* theLEKaonZeroSModel; - G4HEKaonZeroInelastic* theHEKaonZeroSModel; - - // Proton - G4ProtonInelasticProcess theProtonInelastic; - G4LEProtonInelastic* theLEProtonModel; - G4HEProtonInelastic* theHEProtonModel; - G4MultipleScattering theProtonMult; - G4hIonisation theProtonIonisation; - - // anti-proton - G4AntiProtonInelasticProcess theAntiProtonInelastic; - G4LEAntiProtonInelastic* theLEAntiProtonModel; - G4HEAntiProtonInelastic* theHEAntiProtonModel; - G4MultipleScattering theAntiProtonMult; - G4hIonisation theAntiProtonIonisation; - G4AntiProtonAnnihilationAtRest theAntiProtonAnnihilation; - - // neutron - G4NeutronInelasticProcess theNeutronInelastic; - G4LENeutronInelastic* theLENeutronModel; - G4HENeutronInelastic* theHENeutronModel; - G4HadronFissionProcess theNeutronFission; - G4LFission* theNeutronFissionModel; - G4HadronCaptureProcess theNeutronCapture; - G4LCapture* theNeutronCaptureModel; - - - // anti-neutron - G4AntiNeutronInelasticProcess theAntiNeutronInelastic; - G4LEAntiNeutronInelastic* theLEAntiNeutronModel; - G4HEAntiNeutronInelastic* theHEAntiNeutronModel; - G4AntiNeutronAnnihilationAtRest theAntiNeutronAnnihilation; - - // Lambda - G4LambdaInelasticProcess theLambdaInelastic; - G4LELambdaInelastic* theLELambdaModel; - G4HELambdaInelastic* theHELambdaModel; - - // AntiLambda - G4AntiLambdaInelasticProcess theAntiLambdaInelastic; - G4LEAntiLambdaInelastic* theLEAntiLambdaModel; - G4HEAntiLambdaInelastic* theHEAntiLambdaModel; - - // SigmaMinus - G4SigmaMinusInelasticProcess theSigmaMinusInelastic; - G4LESigmaMinusInelastic* theLESigmaMinusModel; - G4HESigmaMinusInelastic* theHESigmaMinusModel; - G4MultipleScattering theSigmaMinusMult; - G4hIonisation theSigmaMinusIonisation; - - // AntiSigmaMinus - G4AntiSigmaMinusInelasticProcess theAntiSigmaMinusInelastic; - G4LEAntiSigmaMinusInelastic* theLEAntiSigmaMinusModel; - G4HEAntiSigmaMinusInelastic* theHEAntiSigmaMinusModel; - G4MultipleScattering theAntiSigmaMinusMult; - G4hIonisation theAntiSigmaMinusIonisation; - - // SigmaPlus - G4SigmaPlusInelasticProcess theSigmaPlusInelastic; - G4LESigmaPlusInelastic* theLESigmaPlusModel; - G4HESigmaPlusInelastic* theHESigmaPlusModel; - G4MultipleScattering theSigmaPlusMult; - G4hIonisation theSigmaPlusIonisation; - - // AntiSigmaPlus - G4AntiSigmaPlusInelasticProcess theAntiSigmaPlusInelastic; - G4LEAntiSigmaPlusInelastic* theLEAntiSigmaPlusModel; - G4HEAntiSigmaPlusInelastic* theHEAntiSigmaPlusModel; - G4MultipleScattering theAntiSigmaPlusMult; - G4hIonisation theAntiSigmaPlusIonisation; - - // XiZero - G4XiZeroInelasticProcess theXiZeroInelastic; - G4LEXiZeroInelastic* theLEXiZeroModel; - G4HEXiZeroInelastic* theHEXiZeroModel; - - // AntiXiZero - G4AntiXiZeroInelasticProcess theAntiXiZeroInelastic; - G4LEAntiXiZeroInelastic* theLEAntiXiZeroModel; - G4HEAntiXiZeroInelastic* theHEAntiXiZeroModel; - - // XiMinus - G4XiMinusInelasticProcess theXiMinusInelastic; - G4LEXiMinusInelastic* theLEXiMinusModel; - G4HEXiMinusInelastic* theHEXiMinusModel; - G4MultipleScattering theXiMinusMult; - G4hIonisation theXiMinusIonisation; - - // AntiXiMinus - G4AntiXiMinusInelasticProcess theAntiXiMinusInelastic; - G4LEAntiXiMinusInelastic* theLEAntiXiMinusModel; - G4HEAntiXiMinusInelastic* theHEAntiXiMinusModel; - G4MultipleScattering theAntiXiMinusMult; - G4hIonisation theAntiXiMinusIonisation; - - // OmegaMinus - G4OmegaMinusInelasticProcess theOmegaMinusInelastic; - G4LEOmegaMinusInelastic* theLEOmegaMinusModel; - G4HEOmegaMinusInelastic* theHEOmegaMinusModel; - G4MultipleScattering theOmegaMinusMult; - G4hIonisation theOmegaMinusIonisation; - - // AntiOmegaMinus - G4AntiOmegaMinusInelasticProcess theAntiOmegaMinusInelastic; - G4LEAntiOmegaMinusInelastic* theLEAntiOmegaMinusModel; - G4HEAntiOmegaMinusInelastic* theHEAntiOmegaMinusModel; - G4MultipleScattering theAntiOmegaMinusMult; - G4hIonisation theAntiOmegaMinusIonisation; - - -}; - - -#endif - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02IonPhysics.hh b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02IonPhysics.hh deleted file mode 100644 index b0ed26ec51..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02IonPhysics.hh +++ /dev/null @@ -1,114 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: H02IonPhysics.hh,v 1.2 2006/06/29 17:13:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// -// ------------------------------------------------------------ -// GEANT 4 class header file -// Class Description: -// This class is an derived class of G4VPhysicsConstructor -// -// ------------------------------------------- -// History -// first version 12 Nov. 2000 by H.Kurashige -// ------------------------------------------------------------ -#ifndef H02IonPhysics_h -#define H02IonPhysics_h 1 - -#include "globals.hh" -#include "G4ios.hh" - -#include "G4VPhysicsConstructor.hh" - -#include "G4HadronElasticProcess.hh" -#include "G4LElastic.hh" - -#include "G4DeuteronInelasticProcess.hh" -#include "G4LEDeuteronInelastic.hh" - -#include "G4TritonInelasticProcess.hh" -#include "G4LETritonInelastic.hh" - -#include "G4AlphaInelasticProcess.hh" -#include "G4LEAlphaInelastic.hh" - -#include "G4hIonisation.hh" -#include "G4MultipleScattering.hh" - -class H02IonPhysics : public G4VPhysicsConstructor -{ - public: - H02IonPhysics(const G4String& name="ion"); - virtual ~H02IonPhysics(); - - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); - - protected: - // Elastic Process - G4HadronElasticProcess theElasticProcess; - G4LElastic* theElasticModel; - - // Generic Ion physics - G4MultipleScattering fIonMultipleScattering; - G4hIonisation fIonIonisation; - - // Deuteron physics - G4MultipleScattering fDeuteronMultipleScattering; - G4hIonisation fDeuteronIonisation; - G4DeuteronInelasticProcess fDeuteronProcess; - G4LEDeuteronInelastic* fDeuteronModel; - - // Triton physics - G4MultipleScattering fTritonMultipleScattering; - G4hIonisation fTritonIonisation; - G4TritonInelasticProcess fTritonProcess; - G4LETritonInelastic* fTritonModel; - - // Alpha physics - G4MultipleScattering fAlphaMultipleScattering; - G4hIonisation fAlphaIonisation; - G4AlphaInelasticProcess fAlphaProcess; - G4LEAlphaInelastic* fAlphaModel; - - // He3 physics - G4MultipleScattering fHe3MultipleScattering; - G4hIonisation fHe3Ionisation; - -}; - - -#endif - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02MuonHit.hh b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02MuonHit.hh deleted file mode 100644 index 680aecb804..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02MuonHit.hh +++ /dev/null @@ -1,117 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// ==================================================================== -// -// H02MuonHit.hh -// $Id: H02MuonHit.hh,v 1.4 2006/06/29 17:13:11 gunter Exp $ -// -// ==================================================================== -#ifndef H02_MUON_HIT_H -#define H02_MUON_HIT_H - -#include "G4VHit.hh" -#include "G4THitsCollection.hh" -#include "G4Allocator.hh" -#include "G4ThreeVector.hh" - -class H02MuonHit : public G4VHit { -private: - G4int moduleID; - G4String pname; - G4ThreeVector momentum; - G4ThreeVector position; - G4double tof; - -public: - H02MuonHit(); - H02MuonHit(G4int imod, G4String aname, const G4ThreeVector& pxyz, - const G4ThreeVector& xyz, G4double atof); - ~H02MuonHit(); - - H02MuonHit(const H02MuonHit& right); - const H02MuonHit& operator=(const H02MuonHit& right); - G4int operator==(const H02MuonHit& right) const; - - void* operator new(size_t); - void operator delete(void* aHit); - - // set/get functions... - void SetModuleID(G4int i); - G4int GetModuleID() const; - - void SetParticle(G4String aname); - G4String GetParticle() const; - - void SetMomentum(const G4ThreeVector& pxyz); - G4ThreeVector GetMomentum() const; - - void SetPosition(const G4ThreeVector& xyz); - G4ThreeVector GetPosition() const; - - void SetTOF(G4double atof); - G4double GetTOF() const; - - // methods... - virtual void Draw(); - virtual void Print(); -}; - -// ==================================================================== -// inline functions -// ==================================================================== - -inline void H02MuonHit::SetModuleID(G4int i) { moduleID=i; } -inline G4int H02MuonHit::GetModuleID() const { return moduleID; } - -inline void H02MuonHit::SetParticle(G4String aname) { pname=aname; } -inline G4String H02MuonHit::GetParticle() const { return pname; } - -inline void H02MuonHit::SetMomentum(const G4ThreeVector& pxyz) -{ momentum=pxyz; } -inline G4ThreeVector H02MuonHit::GetMomentum() const { return momentum; } - -inline void H02MuonHit::SetPosition(const G4ThreeVector& xyz) { position=xyz; } -inline G4ThreeVector H02MuonHit::GetPosition() const { return position; } - -inline void H02MuonHit::SetTOF(G4double atof) { tof=atof; } -inline G4double H02MuonHit::GetTOF() const { return tof; } - -typedef G4THitsCollection H02MuonHitsCollection; -extern G4Allocator H02MuonHitAllocator; - -inline void* H02MuonHit::operator new(size_t) -{ - void* aHit; - aHit= (void*)H02MuonHitAllocator.MallocSingle(); - return aHit; -} - -inline void H02MuonHit::operator delete(void* aHit) -{ - H02MuonHitAllocator.FreeSingle((H02MuonHit*) aHit); -} - -#endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02MuonPhysics.hh b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02MuonPhysics.hh deleted file mode 100644 index e2c35d476b..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02MuonPhysics.hh +++ /dev/null @@ -1,96 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: H02MuonPhysics.hh,v 1.2 2006/06/29 17:13:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// -// ------------------------------------------------------------ -// GEANT 4 class header file -// Class Description: -// This class is an derived class of G4VPhysicsConstructor -// -// ------------------------------------------- -// History -// first version 12 Nov. 2000 by H.Kurashige -// ------------------------------------------------------------ -#ifndef H02MuonPhysics_h -#define H02MuonPhysics_h 1 - -#include "globals.hh" -#include "G4ios.hh" - -#include "G4VPhysicsConstructor.hh" -#include "G4MultipleScattering.hh" -#include "G4MuBremsstrahlung.hh" -#include "G4MuPairProduction.hh" -#include "G4MuIonisation.hh" -#include "G4hIonisation.hh" - -#include "G4MuonMinusCaptureAtRest.hh" - -class H02MuonPhysics : public G4VPhysicsConstructor -{ - public: - H02MuonPhysics(const G4String& name="muon"); - virtual ~H02MuonPhysics(); - - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); - - protected: - // Muon physics - G4MultipleScattering fMuPlusMultipleScattering; - G4MuBremsstrahlung fMuPlusBremsstrahlung ; - G4MuPairProduction fMuPlusPairProduction; - G4MuIonisation fMuPlusIonisation; - - G4MultipleScattering fMuMinusMultipleScattering; - G4MuBremsstrahlung fMuMinusBremsstrahlung ; - G4MuPairProduction fMuMinusPairProduction; - G4MuIonisation fMuMinusIonisation; - - G4MuonMinusCaptureAtRest fMuMinusCaptureAtRest; - - // Tau physics - G4MultipleScattering fTauPlusMultipleScattering; - G4hIonisation fTauPlusIonisation; - - G4MultipleScattering fTauMinusMultipleScattering; - G4hIonisation fTauMinusIonisation; - -}; - - -#endif - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02PrimaryGeneratorAction.hh b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02PrimaryGeneratorAction.hh deleted file mode 100644 index b87a90a7b3..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02PrimaryGeneratorAction.hh +++ /dev/null @@ -1,96 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// ==================================================================== -// -// H02PrimaryGeneratorAction.hh -// $Id: H02PrimaryGeneratorAction.hh,v 1.5 2006/06/29 17:13:19 gunter Exp $ -// -// ==================================================================== -#ifndef H02_PRIMARY_GENERATOR_ACTION_H -#define H02_PRIMARY_GENERATOR_ACTION_H - -#include -#include "globals.hh" -#include "G4VUserPrimaryGeneratorAction.hh" - -class G4Event; -class G4VPrimaryGenerator; -class H02PrimaryGeneratorMessenger; - -class H02PrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction { -private: - G4VPrimaryGenerator* particleGun; - G4VPrimaryGenerator* hepmcAscii; - G4VPrimaryGenerator* pythiaGen; - - G4VPrimaryGenerator* currentGenerator; - G4String currentGeneratorName; - std::map gentypeMap; - - H02PrimaryGeneratorMessenger* messenger; - -public: - H02PrimaryGeneratorAction(); - ~H02PrimaryGeneratorAction(); - - virtual void GeneratePrimaries(G4Event* anEvent); - - void SetGenerator(G4VPrimaryGenerator* gen); - void SetGenerator(G4String genname); - - G4VPrimaryGenerator* GetGenerator() const; - G4String GetGeneratorName() const; -}; - -// ==================================================================== -// inline functions -// ==================================================================== - -inline void H02PrimaryGeneratorAction::SetGenerator(G4VPrimaryGenerator* gen) -{ - currentGenerator= gen; -} - -inline void H02PrimaryGeneratorAction::SetGenerator(G4String genname) -{ - std::map::iterator pos= gentypeMap.find(genname); - if(pos != gentypeMap.end()) { - currentGenerator= pos->second; - currentGeneratorName= genname; - } -} - -inline G4VPrimaryGenerator* H02PrimaryGeneratorAction::GetGenerator() const -{ - return currentGenerator; -} - -inline G4String H02PrimaryGeneratorAction::GetGeneratorName() const -{ - return currentGeneratorName; -} - -#endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02PythiaInterface.hh b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02PythiaInterface.hh deleted file mode 100644 index aab59f9120..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02PythiaInterface.hh +++ /dev/null @@ -1,113 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// ==================================================================== -// -// H02PythiaInterface.hh -// $Id: H02PythiaInterface.hh,v 1.4 2006/06/29 17:13:24 gunter Exp $ -// -// A generic interface class with Pythia event generator via HepMC. -// -// ==================================================================== -#ifndef H02_PYTHIA_INTERFACE_H -#define H02_PYTHIA_INTERFACE_H - -#include "G4HepMCInterface.hh" - -namespace HepMC { - class CBhepevt; -} -class H02PythiaMessenger; - -class H02PythiaInterface : public G4HepMCInterface { -protected: - G4int verbose; - G4int mpylist; - HepMC::CBhepevt* hepevtio; - - H02PythiaMessenger* messenger; - - // In default, this is automatic conversion, Pythia->HEPEVT->HepMC, - // by HepMC utilities. - virtual HepMC::GenEvent* GenerateHepMCEvent(); - -public: - H02PythiaInterface(); - ~H02PythiaInterface(); - - // set/get methods - void SetVerboseLevel(G4int i); - G4int GetVerboseLevel() const; - - void SetPylist(G4int i); - G4int GetPylist() const; - - // call pyxxx - void CallPyinit(G4String frame, G4String beam, - G4String target, G4double win); - void CallPystat(G4int istat); - void CallPygive(G4String par); - void CallPyrget(G4int lun, G4int move); - void CallPyrset(G4int lun, G4int move); - void CallPyevnt(); - void CallPylist(G4int mode); - void CallPyhepc(G4int mode); - - // random numbers operations - void SetRandomSeed(G4int iseed); - void PrintRandomStatus(std::ostream& ostr=G4cout) const; - - // setup user parameters (empty in default). - // Implement your parameters in a delived class if you want. - virtual void SetUserParameters(); - - virtual void Print() const; -}; - -// ==================================================================== -// inline functions -// ==================================================================== - -inline void H02PythiaInterface::SetVerboseLevel(G4int i) -{ - verbose= i; -} - -inline G4int H02PythiaInterface::GetVerboseLevel() const -{ - return verbose; -} - -inline void H02PythiaInterface::SetPylist(G4int i) -{ - mpylist= i; -} - -inline G4int H02PythiaInterface::GetPylist() const -{ - return mpylist; -} - -#endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02PythiaMessenger.hh b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02PythiaMessenger.hh deleted file mode 100644 index d592e381dc..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02PythiaMessenger.hh +++ /dev/null @@ -1,68 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// ==================================================================== -// -// HepMCG4GenericPythiaMessenger.hh -// $Id: H02PythiaMessenger.hh,v 1.3 2006/06/29 17:13:26 gunter Exp $ -// -// ==================================================================== -#ifndef H02_PYTHIA_MESSENGER_H -#define H02_PYTHIA_MESSENGER_H - -#include "G4UImessenger.hh" - -class H02PythiaInterface; -class G4UIdirectory; -class G4UIcmdWithoutParameter; -class G4UIcmdWithAString; -class G4UIcmdWithAnInteger; - -class H02PythiaMessenger : public G4UImessenger { -private: - H02PythiaInterface* gen; - - G4UIdirectory* dir; - G4UIcmdWithAnInteger* verbose; - G4UIcmdWithAnInteger* mpylist; - G4UIcmdWithoutParameter* print; - G4UIcommand* cpyinit; - G4UIcmdWithAnInteger* cpystat; - G4UIcommand* cpygive; - G4UIcommand* setUserParameters; - G4UIcmdWithAnInteger* setSeed; - G4UIcommand* cpyrget; - G4UIcommand* cpyrset; - G4UIcmdWithAString* printRandomStatus; - -public: - H02PythiaMessenger(H02PythiaInterface* agen); - ~H02PythiaMessenger(); - - void SetNewValue(G4UIcommand* command, G4String newValues); - G4String GetCurrentValue(G4UIcommand* command); -}; - -#endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/pyh4mu.mac b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/pyh4mu.mac deleted file mode 100644 index d4b3e63e60..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/pyh4mu.mac +++ /dev/null @@ -1,47 +0,0 @@ -/generator/pythia/pygive PMAS(6,1)=174.3D0 -/generator/pythia/pygive PMAS(25,1)=200.D0 - -/generator/pythia/pygive MSEL=0 -/generator/pythia/pygive MSUB(102)=1 -/generator/pythia/pygive MSUB(123)=1 -/generator/pythia/pygive MSUB(124)=1 - -/generator/pythia/pygive MDME(210,1)=0 -/generator/pythia/pygive MDME(211,1)=0 -/generator/pythia/pygive MDME(212,1)=0 -/generator/pythia/pygive MDME(213,1)=0 -/generator/pythia/pygive MDME(214,1)=0 -/generator/pythia/pygive MDME(215,1)=0 -/generator/pythia/pygive MDME(218,1)=0 -/generator/pythia/pygive MDME(219,1)=0 -/generator/pythia/pygive MDME(220,1)=0 -/generator/pythia/pygive MDME(222,1)=0 -/generator/pythia/pygive MDME(223,1)=0 -/generator/pythia/pygive MDME(224,1)=0 -/generator/pythia/pygive MDME(225,1)=1 -/generator/pythia/pygive MDME(226,1)=0 -/generator/pythia/pygive MDME(216,1)=-1 -/generator/pythia/pygive MDME(217,1)=-1 -/generator/pythia/pygive MDME(218,1)=-1 - -/generator/pythia/pygive MDME(174,1)=0 -/generator/pythia/pygive MDME(175,1)=0 -/generator/pythia/pygive MDME(176,1)=0 -/generator/pythia/pygive MDME(177,1)=0 -/generator/pythia/pygive MDME(178,1)=0 -/generator/pythia/pygive MDME(179,1)=0 -/generator/pythia/pygive MDME(182,1)=0 -/generator/pythia/pygive MDME(183,1)=0 -/generator/pythia/pygive MDME(184,1)=1 -/generator/pythia/pygive MDME(185,1)=0 -/generator/pythia/pygive MDME(186,1)=0 -/generator/pythia/pygive MDME(187,1)=0 -/generator/pythia/pygive MDME(180,1)=-1 -/generator/pythia/pygive MDME(181,1)=-1 -/generator/pythia/pygive MDME(188,1)=-1 -/generator/pythia/pygive MDME(189,1)=-1 - -/generator/pythia/pygive MSTP(61)=1 -/generator/pythia/pygive MSTP(71)=1 -/generator/pythia/pygive MSTP(81)=1 -/generator/pythia/pygive MSTP(111)=1 diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/pyset.mac b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/pyset.mac deleted file mode 100644 index c4177f91fa..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/pyset.mac +++ /dev/null @@ -1,4 +0,0 @@ -/generator/select pythia -/control/execute pyh4mu.mac -/generator/pythia/pyinit cms p p 14000 - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/G4HepMCAsciiReader.cc b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/G4HepMCAsciiReader.cc deleted file mode 100644 index 5126618d1a..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/G4HepMCAsciiReader.cc +++ /dev/null @@ -1,79 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// ==================================================================== -// -// G4HepMCAsciiReader.cc -// $Id: G4HepMCAsciiReader.cc,v 1.2 2006/06/29 17:13:33 gunter Exp $ -// -// ==================================================================== - -#ifndef WIN32 // Temporarly disabled on Windows, until CLHEP - // will support the HepMC module - -#include "G4HepMCAsciiReader.hh" -#include "G4HepMCAsciiReaderMessenger.hh" - -//#include "g4std/iostream" - -//////////////////////////////////////// -G4HepMCAsciiReader::G4HepMCAsciiReader() - : filename("xxx.dat"), verbose(0) -//////////////////////////////////////// -{ - messenger= new G4HepMCAsciiReaderMessenger(this); -} - -///////////////////////////////////////// -G4HepMCAsciiReader::~G4HepMCAsciiReader() -///////////////////////////////////////// -{ - delete messenger; -} - -///////////////////////////////////// -void G4HepMCAsciiReader::Initialize() -///////////////////////////////////// -{ - from.close(); - from.open(filename.c_str(), std::ios::in); -} - -///////////////////////////////////////////////////////// -HepMC::GenEvent* G4HepMCAsciiReader::GenerateHepMCEvent() -///////////////////////////////////////////////////////// -{ - HepMC::GenEvent* evt= HepMC::readGenEvent(from); - if(evt==0) { - return 0; // no more event - from.close(); - } - - if(verbose>0) evt-> print(); - - return evt; -} - -#endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/G4HepMCAsciiReaderMessenger.cc b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/G4HepMCAsciiReaderMessenger.cc deleted file mode 100644 index b9a7981de3..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/G4HepMCAsciiReaderMessenger.cc +++ /dev/null @@ -1,105 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// ==================================================================== -// -// G4HepMCAsciiReaderMessenger.cc -// $Id: G4HepMCAsciiReaderMessenger.cc,v 1.2 2006/06/29 17:13:36 gunter Exp $ -// -// ==================================================================== - -#ifndef WIN32 // Temporarly disabled on Windows, until CLHEP - // will support the HepMC module - -#include "G4HepMCAsciiReaderMessenger.hh" -#include "G4HepMCAsciiReader.hh" - -#include "G4UIdirectory.hh" -#include "G4UIcmdWithoutParameter.hh" -#include "G4UIcmdWithAString.hh" -#include "G4UIcmdWithAnInteger.hh" - -//////////////////////////////////////////////////////// -G4HepMCAsciiReaderMessenger::G4HepMCAsciiReaderMessenger - (G4HepMCAsciiReader* agen) - : gen(agen) -//////////////////////////////////////////////////////// -{ - dir= new G4UIdirectory("/generator/hepmcAscii/"); - dir-> SetGuidance("Reading HepMC event from an Ascii file"); - - verbose= - new G4UIcmdWithAnInteger("/generator/hepmcAscii/verbose", this); - verbose-> SetGuidance("Set verbose level"); - verbose-> SetParameterName("verboseLevel", false, false); - verbose-> SetRange("verboseLevel>=0 && verboseLevel<=1"); - - open= new G4UIcmdWithAString("/generator/hepmcAscii/open", this); - open-> SetGuidance("(re)open data file (HepMC Ascii format)"); - open-> SetParameterName("input ascii file", true, true); -} - -/////////////////////////////////////////////////////////// -G4HepMCAsciiReaderMessenger::~G4HepMCAsciiReaderMessenger() -/////////////////////////////////////////////////////////// -{ - delete verbose; - delete open; - - delete dir; -} - -/////////////////////////////////////////////////////////////////// -void G4HepMCAsciiReaderMessenger::SetNewValue(G4UIcommand* command, - G4String newValues) -/////////////////////////////////////////////////////////////////// -{ - if (command==verbose) { - int level= verbose-> GetNewIntValue(newValues); - gen-> SetVerboseLevel(level); - } else if (command==open) { - gen-> SetFileName(newValues); - G4cout << "HepMC Ascii inputfile: " - << gen-> GetFileName() << G4endl; - gen-> Initialize(); - } -} - - -/////////////////////////////////////////////////////////////////////////// -G4String G4HepMCAsciiReaderMessenger::GetCurrentValue(G4UIcommand* command) -/////////////////////////////////////////////////////////////////////////// -{ - G4String cv; - - if (command == verbose) { - cv= verbose-> ConvertToString(gen-> GetVerboseLevel()); - } else if (command == open) { - cv= gen-> GetFileName(); - } - return cv; -} - -#endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/G4HepMCInterface.cc b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/G4HepMCInterface.cc deleted file mode 100644 index d4c820a5b9..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/G4HepMCInterface.cc +++ /dev/null @@ -1,131 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// ==================================================================== -// -// G4HepMCInterface.cc -// $Id: G4HepMCInterface.cc,v 1.2 2006/06/29 17:13:38 gunter Exp $ -// -// ==================================================================== - -#ifndef WIN32 // Temporarly disabled on Windows, until CLHEP - // will support the HepMC module - -#include "G4HepMCInterface.hh" - -#include "globals.hh" -#include "G4LorentzVector.hh" -#include "G4Event.hh" -#include "G4PrimaryParticle.hh" -#include "G4PrimaryVertex.hh" - -//////////////////////////////////// -G4HepMCInterface::G4HepMCInterface() - : hepmcEvent(0) -//////////////////////////////////// -{ -} - -///////////////////////////////////// -G4HepMCInterface::~G4HepMCInterface() -///////////////////////////////////// -{ - delete hepmcEvent; -} - -//////////////////////////////////////////////////////////////// -void G4HepMCInterface::HepMC2G4(const HepMC::GenEvent* hepmcevt, - G4Event* g4event) -//////////////////////////////////////////////////////////////// -{ - for(HepMC::GenEvent::vertex_const_iterator vitr= hepmcevt->vertices_begin(); - vitr != hepmcevt->vertices_end(); ++vitr ) { // loop for vertex ... - - // real vertex? - G4bool qvtx=false; - for (HepMC::GenVertex::particle_iterator - pitr= (*vitr)->particles_begin(HepMC::children); - pitr != (*vitr)->particles_end(HepMC::children); ++pitr) { - - if (!(*pitr)->end_vertex() && (*pitr)->status()==1) { - qvtx=true; - break; - } - } - if (!qvtx) continue; - - // check world boundary - G4LorentzVector xvtx= (*vitr)-> position(); - if (! CheckVertexInsideWorld(xvtx.vect()*mm)) continue; - - // create G4PrimaryVertex and associated G4PrimaryParticles - G4PrimaryVertex* g4vtx= - new G4PrimaryVertex(xvtx.x()*mm, xvtx.y()*mm, xvtx.z()*mm, - xvtx.t()*mm/c_light); - - for (HepMC::GenVertex::particle_iterator - vpitr= (*vitr)->particles_begin(HepMC::children); - vpitr != (*vitr)->particles_end(HepMC::children); ++vpitr) { - - if( (*vpitr)->status() != 1 ) continue; - - G4int pdgcode= (*vpitr)-> pdg_id(); - G4LorentzVector p= (*vpitr)-> momentum(); - G4PrimaryParticle* g4prim= - new G4PrimaryParticle(pdgcode, p.x()*GeV, p.y()*GeV, p.z()*GeV); - - g4vtx-> SetPrimary(g4prim); - } - g4event-> AddPrimaryVertex(g4vtx); - } -} - - -/////////////////////////////////////////////////////// -HepMC::GenEvent* G4HepMCInterface::GenerateHepMCEvent() -/////////////////////////////////////////////////////// -{ - HepMC::GenEvent* aevent= new HepMC::GenEvent(); - return aevent; -} - -////////////////////////////////////////////////////////////// -void G4HepMCInterface::GeneratePrimaryVertex(G4Event* anEvent) -////////////////////////////////////////////////////////////// -{ - // delete previous event object - delete hepmcEvent; - - // generate next event - hepmcEvent= GenerateHepMCEvent(); - if(! hepmcEvent) { - G4Exception("G4HepMCInterface","GeneratePrimaryVertex",RunMustBeAborted, - "HepMCInterface: no generated particles. run terminated..." ); - return; - } - HepMC2G4(hepmcEvent, anEvent); -} - -#endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02DetectorConstruction.cc b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02DetectorConstruction.cc deleted file mode 100644 index 82e05700fe..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02DetectorConstruction.cc +++ /dev/null @@ -1,257 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// ==================================================================== -// H02DetectorConstruction.cc -// $Id: H02DetectorConstruction.cc,v 1.5 2006/06/29 17:13:40 gunter Exp $ -// -// ==================================================================== -#include "H02DetectorConstruction.hh" - -#include "G4Element.hh" -#include "G4Material.hh" - -#include "G4LogicalVolume.hh" -#include "G4PVPlacement.hh" -#include "G4VisAttributes.hh" -#include "G4Tubs.hh" -#include "G4Box.hh" - -#include "G4SDManager.hh" -#include "H02MuonSD.hh" - -// for magnetic field -#include "G4FieldManager.hh" -#include "G4TransportationManager.hh" -#include "G4ChordFinder.hh" -#include "H02Field.hh" - -// ==================================================================== -// -// constants (detector parameters) -// -// ==================================================================== -// [experimental hall] -static const G4double R_EXPHALL= 5.*m; -static const G4double DZ_EXPHALL= 10.*m; - -// [calorimeter] -static const G4double RIN_BARREL_CAL= 2.*m; -static const G4double ROUT_BARREL_CAL= 3.*m; -static const G4double DZ_BARREL_CAL= 5.*m; - -static const G4double RIN_ENDCAP_CAL= 1.*m; -static const G4double ROUT_ENDCAP_CAL= 3.*m; -static const G4double DZ_ENDCAP_CAL= 0.5*m; - -// [muon system] -static const G4double RIN_BARREL_MUON= 4.3*m; -static const G4double ROUT_BARREL_MUON= 4.5*m; -static const G4double DX_BARREL_MUON= RIN_BARREL_MUON*std::cos(67.5*deg)-5.*cm; -static const G4double DY_BARREL_MUON= 10.*cm; -static const G4double DZ_BARREL_MUON= 7.*m; - -static const G4double RIN_ENDCAP_MUON= 1.*m; -static const G4double ROUT_ENDCAP_MUON= 4.5*m; -static const G4double DZ_ENDCAP_MUON= 10.*cm; - -// ==================================================================== -// -// class description -// -// ==================================================================== - -//////////////////////////////////////////////// -H02DetectorConstruction::H02DetectorConstruction() -//////////////////////////////////////////////// -{ -} - -///////////////////////////////////////////////// -H02DetectorConstruction::~H02DetectorConstruction() -///////////////////////////////////////////////// -{ -} - - -////////////////////////////////////////////////////// -G4VPhysicalVolume* H02DetectorConstruction::Construct() -////////////////////////////////////////////////////// -{ - // ============================================================== - // Materials - // ============================================================== - - G4double a, iz, z, density; - G4String name, symbol; - G4int nel; - - a= 1.01*g/mole; - G4Element* elH= new G4Element(name="Hydrogen", symbol="H", iz=1., a); - - a= 12.01*g/mole; - G4Element* elC= new G4Element(name="Carbon", symbol="C", iz=6., a); - - 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); - - density= 1.032*g/cm3; - G4Material* Scinti= new G4Material(name="Scintillator", density, nel=2); - Scinti-> AddElement(elC, 9); - Scinti-> AddElement(elH, 10); - - - // ============================================================== - // Experimental Hall (world) - // ============================================================== - G4Tubs* expHallSolid= - new G4Tubs("EXP_HALL", 0., R_EXPHALL, DZ_EXPHALL, 0., 360.*deg); - - G4LogicalVolume* expHallLV= - new G4LogicalVolume(expHallSolid, Air, "EXP_HALL_LV"); - - // visualization attributes - G4VisAttributes* expHallVisAtt= - new G4VisAttributes(false, G4Colour(1., 1., 1.)); - //expHallVisAtt-> SetForceWireframe(TRUE); - expHallLV-> SetVisAttributes(expHallVisAtt); - - G4PVPlacement* expHall= new G4PVPlacement(0, G4ThreeVector(), "EXP_HALL_PV", - expHallLV, 0, FALSE, 0); - // ... MV, MANY, copy# - - // ============================================================== - // each detector component - // ============================================================== - // calorimeter system - G4Tubs* barrelCalSolid= - new G4Tubs("BARREL_CAL", RIN_BARREL_CAL, ROUT_BARREL_CAL, - DZ_BARREL_CAL, 0., 360.*deg); - - G4Tubs* endcapCalSolid= - new G4Tubs("ENDCAP_CAL", RIN_ENDCAP_CAL, ROUT_ENDCAP_CAL, - DZ_ENDCAP_CAL, 0., 360.*deg); - - G4LogicalVolume* barrelCalLV= - new G4LogicalVolume(barrelCalSolid, Lead, "BARREL_CAL_LV"); - - G4LogicalVolume* endcapCalLV= - new G4LogicalVolume(endcapCalSolid, Lead, "ENDCAP_CAL_LV"); - - G4VisAttributes* calVisAtt= - new G4VisAttributes(true, G4Colour(0., 1., 1.)); - barrelCalLV-> SetVisAttributes(calVisAtt); - endcapCalLV-> SetVisAttributes(calVisAtt); - - // G4PVPlacement* barrelCal= - new G4PVPlacement(0, G4ThreeVector(), "BARREL_CAL_PV", - barrelCalLV, expHall, FALSE, 0); - - G4ThreeVector posCal(0.,0.,6.*m); - // G4PVPlacement* endcapCal1= - new G4PVPlacement(0, posCal, "ENDCAP_CAL_PV", - endcapCalLV, expHall, FALSE, 0); - - // G4PVPlacement* endcapCal2= - new G4PVPlacement(0, -posCal, "ENDCAP_CAL_PV", - endcapCalLV, expHall, FALSE, 1); - - // muon system - G4Box* barrelMuonSolid= new G4Box("BARREL_MUON", DX_BARREL_MUON, - DY_BARREL_MUON, DZ_BARREL_MUON); - G4Tubs* endcapMuonSolid= - new G4Tubs("ENDCAP_MUON", RIN_ENDCAP_MUON, ROUT_ENDCAP_MUON, - DZ_ENDCAP_MUON, 0., 360.*deg); - - G4LogicalVolume* barrelMuonLV= - new G4LogicalVolume(barrelMuonSolid, Ar, "BARREL_MUON_LV"); - - G4LogicalVolume* endcapMuonLV= - new G4LogicalVolume(endcapMuonSolid, Ar, "ENDCAP_MUON_LV"); - - G4VisAttributes* muonVisAtt= - new G4VisAttributes(true, G4Colour(1., 1., 0.5)); - //muonVisAtt-> SetForceWireframe(TRUE); - barrelMuonLV-> SetVisAttributes(muonVisAtt); - endcapMuonLV-> SetVisAttributes(muonVisAtt); - - const G4double dangle= 45.*deg; - G4ThreeVector posM(RIN_BARREL_MUON+DY_BARREL_MUON/2., 0., 0.); - G4RotationMatrix* rotM= new G4RotationMatrix; - rotM->rotateZ(90.*deg); - - for (G4int k=0; k<8; k++) { - G4Transform3D transformM(*rotM, posM); - new G4PVPlacement(transformM, "BARREL_MUON_PV", - barrelMuonLV, expHall, FALSE, k); - rotM->rotateZ(dangle); - posM.rotateZ(dangle); - } - - G4ThreeVector posMuon(0.,0.,8.*m); - // G4PVPlacement* endcapMuon1= - new G4PVPlacement(0, posMuon, "ENDCAP_MUON_PV", - endcapMuonLV, expHall, FALSE, 0); - - // G4PVPlacement* endcapMuon2= - new G4PVPlacement(0, -posMuon, "ENDCAP_MUON_PV", - endcapMuonLV, expHall, FALSE, 1); - - - // sensitive Detectors - G4SDManager* SDman= G4SDManager::GetSDMpointer(); - - G4String muonSDname= "/mydet/muon"; - H02MuonSD* muonSD= new H02MuonSD(muonSDname); - SDman-> AddNewDetector(muonSD); - barrelMuonLV-> SetSensitiveDetector(muonSD); - endcapMuonLV-> SetSensitiveDetector(muonSD); - - // magnetic field - H02Field* myfield = new H02Field; - G4FieldManager* fieldMgr= - G4TransportationManager::GetTransportationManager()-> GetFieldManager(); - fieldMgr-> SetDetectorField(myfield); - fieldMgr-> CreateChordFinder(myfield); - - return expHall; -} - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02EMPhysics.cc b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02EMPhysics.cc deleted file mode 100644 index d6338afd0c..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02EMPhysics.cc +++ /dev/null @@ -1,114 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: H02EMPhysics.cc,v 1.3 2006/06/29 17:13:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// - -#include "H02EMPhysics.hh" - -#include "globals.hh" -#include "G4ios.hh" -#include - - -H02EMPhysics::H02EMPhysics(const G4String& name) - : G4VPhysicsConstructor(name) -{ -} - -H02EMPhysics::~H02EMPhysics() -{ -} - -#include "G4ParticleDefinition.hh" -#include "G4ParticleTable.hh" - -#include "G4Gamma.hh" - -#include "G4Electron.hh" -#include "G4Positron.hh" - -#include "G4NeutrinoE.hh" -#include "G4AntiNeutrinoE.hh" - -void H02EMPhysics::ConstructParticle() -{ - // gamma - G4Gamma::GammaDefinition(); - - // electron - G4Electron::ElectronDefinition(); - G4Positron::PositronDefinition(); - G4NeutrinoE::NeutrinoEDefinition(); - G4AntiNeutrinoE::AntiNeutrinoEDefinition(); -} - - -#include "G4ProcessManager.hh" - - -void H02EMPhysics::ConstructProcess() -{ - G4ProcessManager * pManager = 0; - - // Gamma Physics - pManager = G4Gamma::Gamma()->GetProcessManager(); - pManager->AddDiscreteProcess(&thePhotoEffect); - pManager->AddDiscreteProcess(&theComptonEffect); - pManager->AddDiscreteProcess(&thePairProduction); - - // Electron Physics - pManager = G4Electron::Electron()->GetProcessManager(); - // add processes - pManager->AddDiscreteProcess(&theElectronBremsStrahlung); - - pManager->AddProcess(&theElectronIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theElectronMultipleScattering); - pManager->SetProcessOrdering(&theElectronMultipleScattering, idxAlongStep, 1); - pManager->SetProcessOrdering(&theElectronMultipleScattering, idxPostStep, 1); - - //Positron Physics - pManager = G4Positron::Positron()->GetProcessManager(); - // add processes - pManager->AddDiscreteProcess(&thePositronBremsStrahlung); - - pManager->AddDiscreteProcess(&theAnnihilation); - - pManager->AddRestProcess(&theAnnihilation); - - pManager->AddProcess(&thePositronIonisation, ordInActive,2, 2); - - pManager->AddProcess(&thePositronMultipleScattering); - pManager->SetProcessOrdering(&thePositronMultipleScattering, idxAlongStep, 1); - pManager->SetProcessOrdering(&thePositronMultipleScattering, idxPostStep, 1); - -} - - - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02HadronPhysics.cc b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02HadronPhysics.cc deleted file mode 100644 index f6476a0bf0..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02HadronPhysics.cc +++ /dev/null @@ -1,435 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -#include "H02HadronPhysics.hh" - -#include "globals.hh" -#include "G4ios.hh" -#include - - -H02HadronPhysics::H02HadronPhysics(const G4String& name) - : G4VPhysicsConstructor(name) -{ -} - -H02HadronPhysics::~H02HadronPhysics() -{ -delete theStringDecay; -} - -#include "G4ParticleDefinition.hh" -#include "G4ParticleTable.hh" - -// Nuclei -#include "G4MesonConstructor.hh" -#include "G4BaryonConstructor.hh" -#include "G4ShortLivedConstructor.hh" - -void H02HadronPhysics::ConstructParticle() -{ - // Construct all mesons - G4MesonConstructor pMesonConstructor; - pMesonConstructor.ConstructParticle(); - - // Construct all barions - G4BaryonConstructor pBaryonConstructor; - pBaryonConstructor.ConstructParticle(); - - // Construct resonaces and quarks - G4ShortLivedConstructor pShortLivedConstructor; - pShortLivedConstructor.ConstructParticle(); - -} - - -#include "G4ProcessManager.hh" - - -void H02HadronPhysics::ConstructProcess() -{ - G4ProcessManager * pManager = 0; - - // Elastic Process - theElasticModel = new G4LElastic(); - theElasticProcess.RegisterMe(theElasticModel); - - // pi+ and pi- - - thePreEquilib = new G4PreCompoundModel(&theHandler); - theCascade.SetDeExcitation(thePreEquilib); - theTheoModel.SetTransport(&theCascade); - theTheoModel.SetHighEnergyGenerator(&theStringModel); - theStringDecay = new G4ExcitedStringDecay(&theFragmentation); - theStringModel.SetFragmentationModel(theStringDecay); - theTheoModel.SetMinEnergy(15*GeV); - theTheoModel.SetMaxEnergy(100*TeV); - - // PionPlus - pManager = G4PionPlus::PionPlus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEPionPlusModel = new G4LEPionPlusInelastic(); - thePionPlusInelastic.RegisterMe(theLEPionPlusModel); - thePionPlusInelastic.RegisterMe(&theTheoModel); - pManager->AddDiscreteProcess(&thePionPlusInelastic); - - pManager->AddProcess(&thePionPlusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&thePionPlusMult); - pManager->SetProcessOrdering(&thePionPlusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&thePionPlusMult, idxPostStep, 1); - - // PionMinus - pManager = G4PionMinus::PionMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEPionMinusModel = new G4LEPionMinusInelastic(); - thePionMinusInelastic.RegisterMe(theLEPionMinusModel); - thePionMinusInelastic.RegisterMe(&theTheoModel); - pManager->AddDiscreteProcess(&thePionMinusInelastic); - - pManager->AddProcess(&thePionMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&thePionMinusMult); - pManager->SetProcessOrdering(&thePionMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&thePionMinusMult, idxPostStep, 1); - - pManager->AddRestProcess(&thePionMinusAbsorption, ordDefault); - - // KaonPlus - pManager = G4KaonPlus::KaonPlus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEKaonPlusModel = new G4LEKaonPlusInelastic(); - theHEKaonPlusModel = new G4HEKaonPlusInelastic(); - theKaonPlusInelastic.RegisterMe(theLEKaonPlusModel); - theKaonPlusInelastic.RegisterMe(&theTheoModel); - pManager->AddDiscreteProcess(&theKaonPlusInelastic); - - pManager->AddProcess(&theKaonPlusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theKaonPlusMult); - pManager->SetProcessOrdering(&theKaonPlusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theKaonPlusMult, idxPostStep, 1); - - // KaonMinus - pManager = G4KaonMinus::KaonMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEKaonMinusModel = new G4LEKaonMinusInelastic(); - theHEKaonMinusModel = new G4HEKaonMinusInelastic(); - theKaonMinusInelastic.RegisterMe(theLEKaonMinusModel); - theKaonMinusInelastic.RegisterMe(theHEKaonMinusModel); - pManager->AddDiscreteProcess(&theKaonMinusInelastic); - - pManager->AddProcess(&theKaonMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theKaonMinusMult); - pManager->SetProcessOrdering(&theKaonMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theKaonMinusMult, idxPostStep, 1); - - pManager->AddRestProcess(&theKaonMinusAbsorption, ordDefault); - - // KaonZeroL - pManager = G4KaonZeroLong::KaonZeroLong()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEKaonZeroLModel = new G4LEKaonZeroLInelastic(); - theHEKaonZeroLModel = new G4HEKaonZeroInelastic(); - theKaonZeroLInelastic.RegisterMe(theLEKaonZeroLModel); - theKaonZeroLInelastic.RegisterMe(theHEKaonZeroLModel); - pManager->AddDiscreteProcess(&theKaonZeroLInelastic); - - // KaonZeroS - pManager = G4KaonZeroShort::KaonZeroShort()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEKaonZeroSModel = new G4LEKaonZeroSInelastic(); - theHEKaonZeroSModel = new G4HEKaonZeroInelastic(); - theKaonZeroSInelastic.RegisterMe(theLEKaonZeroSModel); - theKaonZeroSInelastic.RegisterMe(theHEKaonZeroSModel); - pManager->AddDiscreteProcess(&theKaonZeroSInelastic); - - // Proton - pManager = G4Proton::Proton()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEProtonModel = new G4LEProtonInelastic(); - theHEProtonModel = new G4HEProtonInelastic(); - theProtonInelastic.RegisterMe(theLEProtonModel); - theProtonInelastic.RegisterMe(&theTheoModel); - pManager->AddDiscreteProcess(&theProtonInelastic); - - pManager->AddProcess(&theProtonIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theProtonMult); - pManager->SetProcessOrdering(&theProtonMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theProtonMult, idxPostStep, 1); - - // anti-Proton - pManager = G4AntiProton::AntiProton()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiProtonModel = new G4LEAntiProtonInelastic(); - theHEAntiProtonModel = new G4HEAntiProtonInelastic(); - theAntiProtonInelastic.RegisterMe(theLEAntiProtonModel); - theAntiProtonInelastic.RegisterMe(theHEAntiProtonModel); - pManager->AddDiscreteProcess(&theAntiProtonInelastic); - - pManager->AddProcess(&theAntiProtonIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theAntiProtonMult); - pManager->SetProcessOrdering(&theAntiProtonMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theAntiProtonMult, idxPostStep, 1); - - pManager->AddRestProcess(&theAntiProtonAnnihilation); - - // Neutron - pManager = G4Neutron::Neutron()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLENeutronModel = new G4LENeutronInelastic(); - theHENeutronModel = new G4HENeutronInelastic(); - theNeutronInelastic.RegisterMe(theLENeutronModel); - theNeutronInelastic.RegisterMe(&theTheoModel); - pManager->AddDiscreteProcess(&theNeutronInelastic); - - //theNeutronFissionModel = new G4LFission(); - //theNeutronFission.RegisterMe(theNeutronFissionModel); - //pManager->AddDiscreteProcess(&NeutronFission); - - //theNeutronCaptureModel = new G4LCapture(); - //theNeutronCapture.RegisterMe(theNeutronCaptureModel); - //pManager->AddDiscreteProcess(&theNeutronCapture); - - // AntiNeutron - pManager = G4AntiNeutron::AntiNeutron()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiNeutronModel = new G4LEAntiNeutronInelastic(); - theHEAntiNeutronModel = new G4HEAntiNeutronInelastic(); - theAntiNeutronInelastic.RegisterMe(theLEAntiNeutronModel); - theAntiNeutronInelastic.RegisterMe(theHEAntiNeutronModel); - pManager->AddDiscreteProcess(&theAntiNeutronInelastic); - - pManager->AddRestProcess(&theAntiNeutronAnnihilation); - - // Lambda - pManager = G4Lambda::Lambda()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLELambdaModel = new G4LELambdaInelastic(); - theHELambdaModel = new G4HELambdaInelastic(); - theLambdaInelastic.RegisterMe(theLELambdaModel); - theLambdaInelastic.RegisterMe(theHELambdaModel); - pManager->AddDiscreteProcess(&theLambdaInelastic); - - // AntiLambda - pManager = G4AntiLambda::AntiLambda()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiLambdaModel = new G4LEAntiLambdaInelastic(); - theHEAntiLambdaModel = new G4HEAntiLambdaInelastic(); - theAntiLambdaInelastic.RegisterMe(theLEAntiLambdaModel); - theAntiLambdaInelastic.RegisterMe(theHEAntiLambdaModel); - pManager->AddDiscreteProcess(&theAntiLambdaInelastic); - - // SigmaMinus - pManager = G4SigmaMinus::SigmaMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLESigmaMinusModel = new G4LESigmaMinusInelastic(); - theHESigmaMinusModel = new G4HESigmaMinusInelastic(); - theSigmaMinusInelastic.RegisterMe(theLESigmaMinusModel); - theSigmaMinusInelastic.RegisterMe(theHESigmaMinusModel); - pManager->AddDiscreteProcess(&theSigmaMinusInelastic); - - pManager->AddProcess(&theSigmaMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theSigmaMinusMult); - pManager->SetProcessOrdering(&theSigmaMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theSigmaMinusMult, idxPostStep, 1); - - // anti-SigmaMinus - pManager = G4AntiSigmaMinus::AntiSigmaMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiSigmaMinusModel = new G4LEAntiSigmaMinusInelastic(); - theHEAntiSigmaMinusModel = new G4HEAntiSigmaMinusInelastic(); - theAntiSigmaMinusInelastic.RegisterMe(theLEAntiSigmaMinusModel); - theAntiSigmaMinusInelastic.RegisterMe(theHEAntiSigmaMinusModel); - pManager->AddDiscreteProcess(&theAntiSigmaMinusInelastic); - - pManager->AddProcess(&theAntiSigmaMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theAntiSigmaMinusMult); - pManager->SetProcessOrdering(&theAntiSigmaMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theAntiSigmaMinusMult, idxPostStep, 1); - - // SigmaPlus - pManager = G4SigmaPlus::SigmaPlus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLESigmaPlusModel = new G4LESigmaPlusInelastic(); - theHESigmaPlusModel = new G4HESigmaPlusInelastic(); - theSigmaPlusInelastic.RegisterMe(theLESigmaPlusModel); - theSigmaPlusInelastic.RegisterMe(theHESigmaPlusModel); - pManager->AddDiscreteProcess(&theSigmaPlusInelastic); - - pManager->AddProcess(&theSigmaPlusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theSigmaPlusMult); - pManager->SetProcessOrdering(&theSigmaPlusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theSigmaPlusMult, idxPostStep, 1); - - // anti-SigmaPlus - pManager = G4AntiSigmaPlus::AntiSigmaPlus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiSigmaPlusModel = new G4LEAntiSigmaPlusInelastic(); - theHEAntiSigmaPlusModel = new G4HEAntiSigmaPlusInelastic(); - theAntiSigmaPlusInelastic.RegisterMe(theLEAntiSigmaPlusModel); - theAntiSigmaPlusInelastic.RegisterMe(theHEAntiSigmaPlusModel); - pManager->AddDiscreteProcess(&theAntiSigmaPlusInelastic); - - pManager->AddProcess(&theAntiSigmaPlusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theAntiSigmaPlusMult); - pManager->SetProcessOrdering(&theAntiSigmaPlusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theAntiSigmaPlusMult, idxPostStep, 1); - - // XiMinus - pManager = G4XiMinus::XiMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEXiMinusModel = new G4LEXiMinusInelastic(); - theHEXiMinusModel = new G4HEXiMinusInelastic(); - theXiMinusInelastic.RegisterMe(theLEXiMinusModel); - theXiMinusInelastic.RegisterMe(theHEXiMinusModel); - pManager->AddDiscreteProcess(&theXiMinusInelastic); - - pManager->AddProcess(&theXiMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theXiMinusMult); - pManager->SetProcessOrdering(&theXiMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theXiMinusMult, idxPostStep, 1); - - // anti-XiMinus - pManager = G4AntiXiMinus::AntiXiMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiXiMinusModel = new G4LEAntiXiMinusInelastic(); - theHEAntiXiMinusModel = new G4HEAntiXiMinusInelastic(); - theAntiXiMinusInelastic.RegisterMe(theLEAntiXiMinusModel); - theAntiXiMinusInelastic.RegisterMe(theHEAntiXiMinusModel); - pManager->AddDiscreteProcess(&theAntiXiMinusInelastic); - - pManager->AddProcess(&theAntiXiMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theAntiXiMinusMult); - pManager->SetProcessOrdering(&theAntiXiMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theAntiXiMinusMult, idxPostStep, 1); - - // XiZero - pManager = G4XiZero::XiZero()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEXiZeroModel = new G4LEXiZeroInelastic(); - theHEXiZeroModel = new G4HEXiZeroInelastic(); - theXiZeroInelastic.RegisterMe(theLEXiZeroModel); - theXiZeroInelastic.RegisterMe(theHEXiZeroModel); - pManager->AddDiscreteProcess(&theXiZeroInelastic); - - // anti-XiZero - pManager = G4AntiXiZero::AntiXiZero()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiXiZeroModel = new G4LEAntiXiZeroInelastic(); - theHEAntiXiZeroModel = new G4HEAntiXiZeroInelastic(); - theAntiXiZeroInelastic.RegisterMe(theLEAntiXiZeroModel); - theAntiXiZeroInelastic.RegisterMe(theHEAntiXiZeroModel); - pManager->AddDiscreteProcess(&theAntiXiZeroInelastic); - - // OmegaMinus - pManager = G4OmegaMinus::OmegaMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEOmegaMinusModel = new G4LEOmegaMinusInelastic(); - theHEOmegaMinusModel = new G4HEOmegaMinusInelastic(); - theOmegaMinusInelastic.RegisterMe(theLEOmegaMinusModel); - theOmegaMinusInelastic.RegisterMe(theHEOmegaMinusModel); - pManager->AddDiscreteProcess(&theOmegaMinusInelastic); - - pManager->AddProcess(&theOmegaMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theOmegaMinusMult); - pManager->SetProcessOrdering(&theOmegaMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theOmegaMinusMult, idxPostStep, 1); - - // anti-OmegaMinus - pManager = G4AntiOmegaMinus::AntiOmegaMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiOmegaMinusModel = new G4LEAntiOmegaMinusInelastic(); - theHEAntiOmegaMinusModel = new G4HEAntiOmegaMinusInelastic(); - theAntiOmegaMinusInelastic.RegisterMe(theLEAntiOmegaMinusModel); - theAntiOmegaMinusInelastic.RegisterMe(theHEAntiOmegaMinusModel); - pManager->AddDiscreteProcess(&theAntiOmegaMinusInelastic); - - pManager->AddProcess(&theAntiOmegaMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theAntiOmegaMinusMult); - pManager->SetProcessOrdering(&theAntiOmegaMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theAntiOmegaMinusMult, idxPostStep, 1); - -} - - - - - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02IonPhysics.cc b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02IonPhysics.cc deleted file mode 100644 index febadb0953..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02IonPhysics.cc +++ /dev/null @@ -1,143 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: H02IonPhysics.cc,v 1.3 2006/06/29 17:13:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// - -#include "H02IonPhysics.hh" - -#include "globals.hh" -#include "G4ios.hh" -#include - - -H02IonPhysics::H02IonPhysics(const G4String& name) - : G4VPhysicsConstructor(name) -{ -} - -H02IonPhysics::~H02IonPhysics() -{ -} - -#include "G4ParticleDefinition.hh" -#include "G4ParticleTable.hh" - -// Nuclei -#include "G4IonConstructor.hh" - -void H02IonPhysics::ConstructParticle() -{ - // Construct light ions - G4IonConstructor pConstructor; - pConstructor.ConstructParticle(); -} - - -#include "G4ProcessManager.hh" - - -void H02IonPhysics::ConstructProcess() -{ - G4ProcessManager * pManager = 0; - - // Elastic Process - theElasticModel = new G4LElastic(); - theElasticProcess.RegisterMe(theElasticModel); - - // Generic Ion - pManager = G4GenericIon::GenericIon()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - pManager->AddProcess(&fIonIonisation, ordInActive, 2, 2); - - pManager->AddProcess(&fIonMultipleScattering); - pManager->SetProcessOrdering(&fIonMultipleScattering, idxAlongStep, 1); - pManager->SetProcessOrdering(&fIonMultipleScattering, idxPostStep, 1); - - // Deuteron - pManager = G4Deuteron::Deuteron()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - fDeuteronModel = new G4LEDeuteronInelastic(); - fDeuteronProcess.RegisterMe(fDeuteronModel); - pManager->AddDiscreteProcess(&fDeuteronProcess); - - pManager->AddProcess(&fDeuteronIonisation, ordInActive, 2, 2); - - pManager->AddProcess(&fDeuteronMultipleScattering); - pManager->SetProcessOrdering(&fDeuteronMultipleScattering, idxAlongStep, 1); - pManager->SetProcessOrdering(&fDeuteronMultipleScattering, idxPostStep, 1); - - // Triton - pManager = G4Triton::Triton()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - fTritonModel = new G4LETritonInelastic(); - fTritonProcess.RegisterMe(fTritonModel); - pManager->AddDiscreteProcess(&fTritonProcess); - - pManager->AddProcess(&fTritonIonisation, ordInActive, 2, 2); - - pManager->AddProcess(&fTritonMultipleScattering); - pManager->SetProcessOrdering(&fTritonMultipleScattering, idxAlongStep, 1); - pManager->SetProcessOrdering(&fTritonMultipleScattering, idxPostStep, 1); - - // Alpha - pManager = G4Alpha::Alpha()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - fAlphaModel = new G4LEAlphaInelastic(); - fAlphaProcess.RegisterMe(fAlphaModel); - pManager->AddDiscreteProcess(&fAlphaProcess); - - pManager->AddProcess(&fAlphaIonisation, ordInActive, 2, 2); - - pManager->AddProcess(&fAlphaMultipleScattering); - pManager->SetProcessOrdering(&fAlphaMultipleScattering, idxAlongStep, 1); - pManager->SetProcessOrdering(&fAlphaMultipleScattering, idxPostStep, 1); - - // He3 - pManager = G4He3::He3()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - pManager->AddProcess(&fHe3Ionisation, ordInActive, 2, 2); - - pManager->AddProcess(&fHe3MultipleScattering); - pManager->SetProcessOrdering(&fHe3MultipleScattering, idxAlongStep, 1); - pManager->SetProcessOrdering(&fHe3MultipleScattering, idxPostStep, 1); - -} - - - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02MuonHit.cc b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02MuonHit.cc deleted file mode 100644 index ddbea561e6..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02MuonHit.cc +++ /dev/null @@ -1,129 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// ==================================================================== -// -// H02MuonHit.cc -// $Id: H02MuonHit.cc,v 1.5 2006/06/29 17:13:57 gunter Exp $ -// -// ==================================================================== -#include "H02MuonHit.hh" -#include "G4VVisManager.hh" -#include "G4Circle.hh" -#include "G4Colour.hh" -#include "G4VisAttributes.hh" -#include - -G4Allocator H02MuonHitAllocator; - -//////////////////////// -H02MuonHit::H02MuonHit() - : moduleID(-1) -//////////////////////// -{ -} - -///////////////////////////////////////////////////////////// -H02MuonHit::H02MuonHit(G4int imod, G4String aname, - const G4ThreeVector& pxyz, - const G4ThreeVector& xyz, G4double atof) - : moduleID(imod), pname(aname), momentum(pxyz), - position(xyz), tof(atof) -///////////////////////////////////////////////////////////// -{ -} - -//////////////////////// -H02MuonHit::~H02MuonHit() -//////////////////////// -{ -} - -///////////////////////////////////////////// -H02MuonHit::H02MuonHit(const H02MuonHit& right) -///////////////////////////////////////////// - : G4VHit() -{ - *this= right; -} - -//////////////////////////////////////////////////////////////// -const H02MuonHit& H02MuonHit::operator=(const H02MuonHit& right) -//////////////////////////////////////////////////////////////// -{ - moduleID= right.moduleID; - pname= right.pname; - momentum= right.momentum; - position= right.position; - tof= right.tof; - - return *this; -} - -///////////////////////////////////////////////////////// -G4int H02MuonHit::operator==(const H02MuonHit& right) const -///////////////////////////////////////////////////////// -{ - return (this==&right) ? 1 : 0; -} - -/////////////////////// -void H02MuonHit::Draw() -/////////////////////// -{ - const G4double pt_min=20.*GeV; - - G4VVisManager* pVVisManager= G4VVisManager::GetConcreteInstance(); - if(pVVisManager) { - G4Circle circle(position); - circle.SetScreenSize(5.); - circle.SetFillStyle(G4Circle::filled); - - G4Color color, goodColor(1.,0.,0.), badColor(0.,0.,1.); - if(momentum.perp()>pt_min) color=goodColor; - else color=badColor; - - G4VisAttributes attribs(color); - circle.SetVisAttributes(attribs); - pVVisManager->Draw(circle); - } -} - -//////////////////////// -void H02MuonHit::Print() -//////////////////////// -{ - G4int id= moduleID; - G4String tag="B"; - if(moduleID >=10) { - id -=10; - tag="E"; - } - G4cout << tag << id << " :" << std::setw(12) << pname.c_str() - << " : pT=" << std::setprecision(3) << momentum.perp()/GeV - << " : TOF=" << std::setprecision(3) << tof/ns - << " : x=" << std::setprecision(3) << position*(1./m) - << G4endl; -} diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02MuonPhysics.cc b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02MuonPhysics.cc deleted file mode 100644 index d9268b5022..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02MuonPhysics.cc +++ /dev/null @@ -1,131 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: H02MuonPhysics.cc,v 1.3 2006/06/29 17:14:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// - -#include "H02MuonPhysics.hh" - -#include "globals.hh" -#include "G4ios.hh" -#include - - -H02MuonPhysics::H02MuonPhysics(const G4String& name) - : G4VPhysicsConstructor(name) -{ -} - -H02MuonPhysics::~H02MuonPhysics() -{ -} - -#include "G4ParticleDefinition.hh" -#include "G4ParticleTable.hh" - -#include "G4MuonPlus.hh" -#include "G4MuonMinus.hh" -#include "G4TauMinus.hh" -#include "G4TauPlus.hh" -#include "G4NeutrinoTau.hh" -#include "G4AntiNeutrinoTau.hh" -#include "G4NeutrinoMu.hh" -#include "G4AntiNeutrinoMu.hh" - -void H02MuonPhysics::ConstructParticle() -{ - // Mu - G4MuonPlus::MuonPlusDefinition(); - G4MuonMinus::MuonMinusDefinition(); - G4NeutrinoMu::NeutrinoMuDefinition(); - G4AntiNeutrinoMu::AntiNeutrinoMuDefinition(); - - // Tau - G4TauMinus::TauMinusDefinition(); - G4TauPlus::TauPlusDefinition(); - G4NeutrinoTau::NeutrinoTauDefinition(); - G4AntiNeutrinoTau::AntiNeutrinoTauDefinition(); - -} - - -#include "G4ProcessManager.hh" - -void H02MuonPhysics::ConstructProcess() -{ - G4ProcessManager * pManager = 0; - - // Muon Plus Physics - pManager = G4MuonPlus::MuonPlus()->GetProcessManager(); - // add processes - pManager->AddProcess(&fMuPlusIonisation, ordInActive,2, 2); - - pManager->AddDiscreteProcess(&fMuPlusBremsstrahlung); - - pManager->AddDiscreteProcess(&fMuPlusPairProduction); - - pManager->AddProcess(&fMuPlusMultipleScattering); - pManager->SetProcessOrdering(&fMuPlusMultipleScattering, idxAlongStep, 1); - pManager->SetProcessOrdering(&fMuPlusMultipleScattering, idxPostStep, 1); - - // Muon Minus Physics - pManager = G4MuonMinus::MuonMinus()->GetProcessManager(); - // add processes - pManager->AddProcess(&fMuMinusIonisation, ordInActive,2, 2); - - pManager->AddDiscreteProcess(&fMuMinusBremsstrahlung); - - pManager->AddDiscreteProcess(&fMuMinusPairProduction); - - pManager->AddProcess(&fMuMinusMultipleScattering); - pManager->SetProcessOrdering(&fMuMinusMultipleScattering, idxAlongStep, 1); - pManager->SetProcessOrdering(&fMuMinusMultipleScattering, idxPostStep, 1); - pManager->AddRestProcess(&fMuMinusCaptureAtRest); - - // Tau Plus Physics - pManager = G4TauPlus::TauPlus()->GetProcessManager(); - // add processes - pManager->AddProcess(&fTauPlusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&fTauPlusMultipleScattering); - pManager->SetProcessOrdering(&fTauPlusMultipleScattering, idxAlongStep, 1); - pManager->SetProcessOrdering(&fTauPlusMultipleScattering, idxPostStep, 1); - - // Tau Minus Physics - pManager = G4TauMinus::TauMinus()->GetProcessManager(); - // add processes - pManager->AddProcess(&fTauMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&fTauMinusMultipleScattering); - pManager->SetProcessOrdering(&fTauMinusMultipleScattering, idxAlongStep, 1); - pManager->SetProcessOrdering(&fTauMinusMultipleScattering, idxPostStep, 1); - -} - - - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02MuonSD.cc b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02MuonSD.cc deleted file mode 100644 index 1a972276d9..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02MuonSD.cc +++ /dev/null @@ -1,122 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// ==================================================================== -// -// H02MuonSD.cc -// $Id: H02MuonSD.cc,v 1.4 2006/06/29 17:14:03 gunter Exp $ -// -// ==================================================================== - -#include "H02MuonSD.hh" -#include "H02MuonHit.hh" -#include "G4HCofThisEvent.hh" -#include "G4TouchableHistory.hh" -#include "G4VPhysicalVolume.hh" -#include "G4Track.hh" -#include "G4Step.hh" -#include "G4ios.hh" - -///////////////////////////////// -H02MuonSD::H02MuonSD(G4String name) - : G4VSensitiveDetector(name) -///////////////////////////////// -{ - G4String HCname; - collectionName.insert("muonHit"); -} - -/////////////////////////////////////////////// -H02MuonSD::~H02MuonSD() -/////////////////////////////////////////////// -{ -} - -/////////////////////////////////////////////// -void H02MuonSD::Initialize(G4HCofThisEvent* HCE) -/////////////////////////////////////////////// -{ - static int HCID=-1; - hitCollection= new H02MuonHitsCollection(SensitiveDetectorName, - collectionName[0]); - if(HCID<0) HCID= GetCollectionID(0); - HCE-> AddHitsCollection(HCID, hitCollection); -} - -/////////////////////////////////////////////////////////////////////// -G4bool H02MuonSD::ProcessHits(G4Step* astep, G4TouchableHistory*) -/////////////////////////////////////////////////////////////////////// -{ - G4ParticleDefinition* particle= astep-> GetTrack()-> GetDefinition(); - if(particle-> GetPDGCharge() == 0.) return false; - - G4StepPoint* prestep= astep-> GetPreStepPoint(); - - if(prestep-> GetStepStatus() != fGeomBoundary) return false; - - G4ThreeVector vmom= prestep-> GetMomentum(); - G4ThreeVector vpos= prestep-> GetPosition(); - G4double tof= prestep-> GetGlobalTime(); - - G4VPhysicalVolume* volume= prestep-> GetPhysicalVolume(); - G4int id= volume-> GetCopyNo(); - if(volume-> GetName() == "ENDCAP_MUON_PV") id +=10; - - H02MuonHit* aHit= - new H02MuonHit(id, particle-> GetParticleName(), vmom, vpos, tof); - hitCollection-> insert(aHit); - return true; - -} - -/////////////////////////////////////////////// -void H02MuonSD::EndOfEvent(G4HCofThisEvent*) -/////////////////////////////////////////////// -{ -} - -////////////////////// -void H02MuonSD::clear() -////////////////////// -{ -} - -//////////////////////// -void H02MuonSD::DrawAll() -//////////////////////// -{ - hitCollection-> DrawAllHits(); -} - -///////////////////////// -void H02MuonSD::PrintAll() -///////////////////////// -{ - G4int nHit= hitCollection-> entries(); - G4cout << "------------------------------------------" << G4endl - << "*** Muon System Hit (#hits=" << nHit << ")" << G4endl; - hitCollection-> PrintAllHits(); -} - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02PrimaryGeneratorMessenger.cc b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02PrimaryGeneratorMessenger.cc deleted file mode 100644 index 2635e56bb9..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02PrimaryGeneratorMessenger.cc +++ /dev/null @@ -1,100 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// ==================================================================== -// -// H02PrimaryGeneratorMessenger.cc -// $Id: H02PrimaryGeneratorMessenger.cc,v 1.3 2006/06/29 17:14:10 gunter Exp $ -// -// ==================================================================== -#include "G4UIcommand.hh" -#include "G4UIparameter.hh" -#include "G4UIcmdWithoutParameter.hh" -#include "G4UIcmdWithABool.hh" -#include "G4UIcmdWithAnInteger.hh" -#include "G4UIcmdWithAString.hh" -#include "G4UIdirectory.hh" - -#include "H02PrimaryGeneratorMessenger.hh" -#include "H02PrimaryGeneratorAction.hh" - -///////////////////////////////////////////////////////////////// -H02PrimaryGeneratorMessenger::H02PrimaryGeneratorMessenger - (H02PrimaryGeneratorAction* genaction) - : primaryAction(genaction) -///////////////////////////////////////////////////////////////// -{ - dir= new G4UIdirectory("/generator/"); - dir-> SetGuidance("Control commands for primary generator"); - - //verbose= new G4UIcmdWithAnInteger("/generator/verbose", this); - //verbose-> SetGuidance("set verbose level (0,1,2)"); - //verbose-> SetParameterName("verbose", false, false); - //verbose-> SetDefaultValue(0); - //verbose-> SetRange("verbose>=0 && verbose<=2"); - - select= new G4UIcmdWithAString("/generator/select", this); - select-> SetGuidance("select generator type"); - select-> SetParameterName("generator_type", false, false); - select-> SetCandidates("particleGun pythia hepmcAscii"); - select-> SetDefaultValue("particleGun"); -} - -/////////////////////////////////////////////////////////// -H02PrimaryGeneratorMessenger::~H02PrimaryGeneratorMessenger() -/////////////////////////////////////////////////////////// -{ - //delete verbose; - delete select; - - delete dir; -} - -/////////////////////////////////////////////////////////////////// -void H02PrimaryGeneratorMessenger::SetNewValue(G4UIcommand* command, - G4String newValues) -/////////////////////////////////////////////////////////////////// -{ - if ( command==select) { - primaryAction-> SetGenerator(newValues); - G4cout << "current generator type: " - << primaryAction-> GetGeneratorName() << G4endl; - } else { - } -} - - -/////////////////////////////////////////////////////////////////////////// -G4String H02PrimaryGeneratorMessenger::GetCurrentValue(G4UIcommand* command) -/////////////////////////////////////////////////////////////////////////// -{ - G4String cv, st; - if (command == select) { - cv= primaryAction-> GetGeneratorName(); - } - - return cv; -} - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02PythiaInterface.cc b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02PythiaInterface.cc deleted file mode 100644 index 3e72f27c15..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02PythiaInterface.cc +++ /dev/null @@ -1,191 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// ==================================================================== -// -// H02PythiaInterface.cc -// $Id: H02PythiaInterface.cc,v 1.5 2006/06/29 17:14:12 gunter Exp $ -// -// ==================================================================== -#include "H02PythiaInterface.hh" -#include "H02PythiaMessenger.hh" - -#include -#include - -// additional pythia calls -#define pygive pygive_ -#define pyrget pyrget_ -#define pyrset pyrset_ - -extern "C" { - void pygive(const char*, int); - void pyrget(int*, int*); - void pyrset(int*, int*); -} - -void call_pygive(G4String s) { pygive(s.c_str(), s.length()); } -void call_pyrget(int a, int b) { pyrget(&a, &b); } -void call_pyrset(int a, int b) { pyrset(&a, &b); } - -// global parameters -hepev2_t hepev2_; -hepev3_t hepev3_; -hepev4_t hepev4_; -hepev5_t hepev5_; - -//////////////////////////////////////// -H02PythiaInterface::H02PythiaInterface() - : verbose(0), mpylist(0) -//////////////////////////////////////// -{ - hepevtio= new HepMC::CBhepevt; - messenger= new H02PythiaMessenger(this); -} - -///////////////////////////////////////// -H02PythiaInterface::~H02PythiaInterface() -///////////////////////////////////////// -{ - delete hepevtio; - delete messenger; -} - -///////////////////////////////////////////////// -void H02PythiaInterface::CallPygive(G4String par) -///////////////////////////////////////////////// -{ - call_pygive(par); -} - -////////////////////////////////////////////////////////////////////// -void H02PythiaInterface::CallPyinit(G4String frame, G4String beam, - G4String target, G4double win) -////////////////////////////////////////////////////////////////////// -{ - call_pyinit(frame.c_str(), beam.c_str(), target.c_str(), win); -} - -//////////////////////////////////////////////// -void H02PythiaInterface::CallPystat(G4int istat) -//////////////////////////////////////////////// -{ - call_pystat(istat); -} - - -////////////////////////////////////////////////////////// -void H02PythiaInterface::CallPyrget(G4int lun, G4int move) -////////////////////////////////////////////////////////// -{ - call_pyrget(lun, move); -} - -////////////////////////////////////////////////////////// -void H02PythiaInterface::CallPyrset(G4int lun, G4int move) -////////////////////////////////////////////////////////// -{ - call_pyrset(lun, move); -} - - -///////////////////////////////////// -void H02PythiaInterface::CallPyevnt() -///////////////////////////////////// -{ - call_pyevnt(); -} - -/////////////////////////////////////////////// -void H02PythiaInterface::CallPylist(G4int mode) -/////////////////////////////////////////////// -{ - call_pylist(mode); -} - -/////////////////////////////////////////////// -void H02PythiaInterface::CallPyhepc(G4int mode) -/////////////////////////////////////////////// -{ - call_pyhepc(mode); -} - - -/////////////////////////////////////////////////// -void H02PythiaInterface::SetRandomSeed(G4int iseed) -/////////////////////////////////////////////////// -{ - pydatr.mrpy[1-1]= iseed; -} - -////////////////////////////////////////////////////////////////////// -void H02PythiaInterface::PrintRandomStatus(std::ostream& ostr) const -////////////////////////////////////////////////////////////////////// -{ - ostr << "# Pythia random numbers status" << G4endl; - for (G4int j=0; j<6; j++) { - ostr << "pydatr.mrpy[" << j << "]= " << pydatr.mrpy[j] << G4endl; - } - for (G4int k=0; k<100; k++) { - ostr << "pydatr.rrpy[" << k << "]= " << pydatr.rrpy[k] << G4endl; - } -} - -//////////////////////////////////////////// -void H02PythiaInterface::SetUserParameters() -//////////////////////////////////////////// -{ - G4cout << "set user parameters of PYTHIA common." << G4endl - << "nothing to be done in default." - << G4endl; -} - -///////////////////////////////////////////////////////// -HepMC::GenEvent* H02PythiaInterface::GenerateHepMCEvent() -///////////////////////////////////////////////////////// -{ - static G4int nevent= 0; // event counter - - CallPyevnt(); // generate one event with Pythia - if(mpylist >=1 && mpylist<= 3) CallPylist(mpylist); - - CallPyhepc(1); - - HepMC::GenEvent* evt= new HepMC::GenEvent(); - hepevtio-> toGenEvent(evt, false); - hepevtio-> clean(); // clear HEPEVT common - evt-> set_event_number(nevent++); - if(verbose>0) evt-> print(); - - return evt; -} - -////////////////////////////////////// -void H02PythiaInterface::Print() const -////////////////////////////////////// -{ - G4cout << "PythiaInterface::Print()..." << G4endl; -} - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02PythiaMessenger.cc b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02PythiaMessenger.cc deleted file mode 100644 index 98d7d3364a..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02PythiaMessenger.cc +++ /dev/null @@ -1,217 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// ==================================================================== -// -// H02PythiaMessenger.cc -// $Id: H02PythiaMessenger.cc,v 1.5 2006/06/29 17:14:14 gunter Exp $ -// -// ==================================================================== -#include "H02PythiaMessenger.hh" -#include "H02PythiaInterface.hh" - -#include -#include - -#include "G4UIdirectory.hh" -#include "G4UIcmdWithoutParameter.hh" -#include "G4UIcmdWithAString.hh" -#include "G4UIcmdWithAnInteger.hh" - -//////////////////////////////////////////////////////////////// -H02PythiaMessenger::H02PythiaMessenger(H02PythiaInterface* agen) - : gen(agen) -//////////////////////////////////////////////////////////////// -{ - dir= new G4UIdirectory("/generator/pythia/"); - dir-> SetGuidance("Commands for Pythia event generation"); - - verbose= new G4UIcmdWithAnInteger("/generator/pythia/verbose",this); - verbose-> SetGuidance("set verbose level"); - verbose-> SetParameterName("verboseLevel", false, false); - verbose-> SetRange("verboseLevel>=0 && verboseLevel<=2"); - - mpylist= new G4UIcmdWithAnInteger("/generator/pythia/pylist",this); - mpylist-> SetGuidance("set argument of pylist (not called if mlist=0)"); - mpylist-> SetParameterName("mlist", false, false); - mpylist-> SetRange("mlist>=0 && mlist<=3"); - - print= new G4UIcmdWithoutParameter("/generator/pythia/print", this); - print-> SetGuidance("print user information."); - - cpyinit= new G4UIcommand("/generator/pythia/pyinit", this); - cpyinit-> SetGuidance("call PYINIT"); - G4UIparameter* frame= - new G4UIparameter("frame of the experiment", 's', false); - cpyinit-> SetParameter(frame); - G4UIparameter* beam= new G4UIparameter("beam particle", 's', false); - cpyinit-> SetParameter(beam); - G4UIparameter* target= new G4UIparameter("target particle", 's', false); - cpyinit-> SetParameter(target); - G4UIparameter* win= new G4UIparameter("energy of system (GeV)", 'd', false); - cpyinit-> SetParameter(win); - - cpystat= new G4UIcmdWithAnInteger("/generator/pythia/pystat", this); - cpystat-> SetGuidance("call PYSTAT"); - cpystat-> SetParameterName("mstat", false, false); - cpystat-> SetRange("mstat>=1 && mstat<=5"); - - cpygive= new G4UIcommand("/generator/pythia/pygive",this); - cpygive-> SetGuidance("call PYGIVE"); - G4UIparameter* parameter= new G4UIparameter ("Parameter", 's', false); - cpygive-> SetParameter(parameter); - - setUserParameters= - new G4UIcmdWithoutParameter("/generator/pythia/setUserParameters",this); - setUserParameters-> - SetGuidance("Set user parameters in the Pythia common blocks"); - - setSeed= new G4UIcmdWithAnInteger("/generator/pythia/setSeed", this); - setSeed-> SetGuidance("set initial seed."); - - cpyrget= new G4UIcommand("/generator/pythia/pyrget", this); - cpyrget-> SetGuidance("call PYRGET"); - G4UIparameter* lun, *move; - lun= new G4UIparameter("logical file number", 'i', false); - cpyrget-> SetParameter(lun); - move= new G4UIparameter("choice of adding a new record", 'i', true); - move-> SetDefaultValue(-1); - cpyrget-> SetParameter(move); - - cpyrset= new G4UIcommand("/generator/pythia/pyrset", this); - cpyrset-> SetGuidance("call PYRSET"); - lun= new G4UIparameter("logical file number", 'i', false); - cpyrset-> SetParameter(lun); - move= new G4UIparameter("choice of adding a new record", 'i', true); - move-> SetDefaultValue(0); - cpyrset-> SetParameter(move); - - printRandomStatus= - new G4UIcmdWithAString("/generator/pythia/printRandomStatus", this); - printRandomStatus-> SetGuidance("print random number status."); - printRandomStatus-> SetParameterName("filename", true, false); - printRandomStatus-> SetDefaultValue("G4cout"); -} - -///////////////////////////////////////// -H02PythiaMessenger::~H02PythiaMessenger() -///////////////////////////////////////// -{ - delete verbose; - delete mpylist; - delete print; - delete cpyinit; - delete cpystat; - delete cpygive; - delete setUserParameters; - delete setSeed; - delete cpyrget; - delete cpyrset; - delete printRandomStatus; - - delete dir; -} - -//////////////////////////////////////////////////////////// -void H02PythiaMessenger::SetNewValue(G4UIcommand* command, - G4String newValues) -//////////////////////////////////////////////////////////// -{ - if(command == verbose) { // /verbose ... - G4int level= verbose-> GetNewIntValue(newValues); - gen-> SetVerboseLevel(level); - - } else if (command == mpylist) { // /mpylist ... - G4int mlist= mpylist-> GetNewIntValue(newValues); - gen-> SetPylist(mlist); - - } else if (command == print) { // /print ... - gen-> Print(); - - } else if (command == cpyinit) { // /pyinit ... - const char* strvaluelist= newValues.c_str(); - std::istringstream is(strvaluelist); - G4String sframe, sbeam, starget; G4double dwin; - is >> sframe >> sbeam >> starget >> dwin; - gen-> CallPyinit(sframe, sbeam, starget, dwin); - - } else if (command == cpystat) { // /pystat ... - G4int imod= cpystat-> GetNewIntValue(newValues); - gen-> CallPystat(imod); - - } else if (command == cpygive) { // /pygive ... - G4String s= newValues; - gen-> CallPygive(s); - - } else if (command == setUserParameters) { // /setUserParameters ... - gen-> SetUserParameters(); - - } else if (command == setSeed) { // /setSeed ... - G4int iseed= setSeed-> GetNewIntValue(newValues); - gen-> SetRandomSeed(iseed); - - } else if (command == cpyrget) { // /pyrget ... - const char* strvaluelist= newValues.c_str(); - std::istringstream is(strvaluelist); - G4int lun, move; - is >> lun >> move; - gen-> CallPyrget(lun, move); - - } else if (command == cpyrset) { // /pyrset ... - const char* strvaluelist= newValues.c_str(); - std::istringstream is(strvaluelist); - G4int lun, move; - is >> lun >> move; - gen-> CallPyrset(lun, move); - - } else if (command == printRandomStatus) { // /printRandomStatus ... - G4String s= newValues; - if (newValues == "G4cout") { - gen-> PrintRandomStatus(); - } else { - // to a file (overwrite mode) - std::ofstream ofs; - ofs.open(s.c_str(), std::ios::out); - //ofs.open(randomStatusFileName.c_str(), std::ios::out|std::ios::app); - ofs.setf(std::ios::fixed | std::ios::showpoint); - gen-> PrintRandomStatus(ofs); - ofs.close(); - } - } -} - -////////////////////////////////////////////////////////////////////// -G4String H02PythiaMessenger::GetCurrentValue(G4UIcommand* command) -////////////////////////////////////////////////////////////////////// -{ - G4String cv; - if (command == verbose) { - cv= verbose-> ConvertToString(gen->GetVerboseLevel()); - } else if (command == mpylist) { - cv= verbose-> ConvertToString(gen->GetPylist()); - } - return cv; -} - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02SteppingAction.cc b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02SteppingAction.cc deleted file mode 100644 index 0cbf381fdc..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02SteppingAction.cc +++ /dev/null @@ -1,75 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// ==================================================================== -// -// H02SteppingAction.cc -// $Id: H02SteppingAction.cc,v 1.3 2006/06/29 17:14:16 gunter Exp $ -// -// ==================================================================== - -#include "H02SteppingAction.hh" -#include "G4SteppingManager.hh" -#include "G4Track.hh" -#include "G4Step.hh" -#include "G4StepPoint.hh" -#include "G4TrackStatus.hh" -#include "G4VPhysicalVolume.hh" -#include "G4ParticleDefinition.hh" -#include "G4ParticleTypes.hh" - -//////////////////////////////////// -H02SteppingAction::H02SteppingAction() -//////////////////////////////////// -{ -} - -///////////////////////////////////// -H02SteppingAction::~H02SteppingAction() -///////////////////////////////////// -{ -} - -////////////////////////////////////////////////////////////// -void H02SteppingAction::UserSteppingAction(const G4Step* astep) - ////////////////////////////////////////////////////////////// -{ - G4Track* atrack= astep-> GetTrack(); - - if(atrack-> GetTrackStatus() != fAlive) return; - if(atrack-> GetParentID() == 0) return; - - G4ParticleDefinition* particleType= atrack-> GetDefinition(); - if((particleType == G4MuonPlus::MuonPlusDefinition()) - || (particleType == G4MuonMinus::MuonMinusDefinition())) return; - - G4StepPoint* prestep= astep-> GetPreStepPoint(); - G4VPhysicalVolume* pv= prestep-> GetPhysicalVolume(); - G4String pvname= pv-> GetName(); - if(pvname=="BARREL_CAL_PV" || pvname=="ENDCAP_CAL_PV" ) { - atrack-> SetTrackStatus(fKillTrackAndSecondaries); - } -} - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/vis.mac b/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/vis.mac deleted file mode 100644 index edafc0775c..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/vis.mac +++ /dev/null @@ -1,32 +0,0 @@ -# -# Macro file for the initialization phase of "exampleN02.cc" -# when runing in interactive mode -# -# Sets some default verbose -# -/control/verbose 2 -/run/verbose 2 -# -# create empty scene -# -/vis/scene/create -# -# Create a scene handler for a specific graphics system -# (Edit the next line(s) to choose another graphic system) -# -/vis/open OGLIX -# -####/vis/open DAWNFILE -# -# draw scene -# -/vis/viewer/set/viewpointThetaPhi 90 180 deg -/vis/viewer/zoom 1.4 -/vis/viewer/flush -# -# for drawing the tracks -# (if too many tracks cause core dump => storeTrajectory 0) -/tracking/storeTrajectory 1 -/vis/scene/add/trajectories -/vis/scene/endOfEventAction accumulate - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02/GNUmakefile b/examples/extended/eventgenerator/HepMC/HepMCEx02/GNUmakefile index fed8b6056b..cb4e311708 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02/GNUmakefile +++ b/examples/extended/eventgenerator/HepMC/HepMCEx02/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.2 2002/05/28 14:19:07 murakami Exp $ +# $Id: GNUmakefile,v 1.4 2006/11/22 15:09:07 gcosmo Exp $ # -------------------------------------------------------------- # GNUmakefile for examples module. Gabriele Cosmo, 06/04/98. # -------------------------------------------------------------- @@ -6,70 +6,42 @@ name := hepmcEx02 G4TARGET := $(name) G4EXLIB := true -#ifndef G4WORKDIR -# G4WORKDIR := . -#endif +ifndef G4INSTALL + G4INSTALL = ../../../../.. +endif .PHONY: all +ifdef HEPMC_DIR all : lib bin -include $(G4INSTALL)/config/binmake.gmk + include $(G4INSTALL)/config/binmake.gmk -# ----------------------------------------------------------------- -# HepMC and PYTHIA + # ----------------------------------------------------------------- + # HepMC and PYTHIA -# if you donnot use Pythia library, comment out. -USE_PYTHIA := 1 - -# HepMC -HEPMC_DIR := /opt/heplib/HepMC/1.21 -INCFLAGS += -I$(HEPMC_DIR) - -# check gcc -USE_GCC := 0 -ifeq ($(G4SYSTEM),Linux-g++) - USE_GCC := 1 -endif -ifeq ($(G4SYSTEM),Linux-egcs) - USE_GCC := 1 -endif - -ifeq ($(USE_GCC),1) - LDLIBS1 += -Wl,-rpath $(HEPMC_DIR) -endif - -ifdef USE_PYTHIA - LDLIBS1 += -L$(HEPMC_DIR) -lHepMC -else - LDLIBS1 += -L$(HEPMC_DIR) -lHepMC $(G4TMPDIR)/HEPEvtcom.o -endif - -ifdef USE_PYTHIA - CERNLIB_DIR := /cern/pro/lib - LDLIBS1 += -L$(CERNLIB_DIR) -lpythia6 - - # if you get pythia initialization errors, try the next flag. - #NEED_INITPYDATA := 1 - ifdef NEED_INITPYDATA - CXXFLAGS += -DNEED_INITPYDATA - LDLIBS1 += $(HepMC_DIR)/src/initpydata.o - #LDLIBS1 += external/initpydata.o + # if you do not use Pythia library, comment out the next line. + # + G4LIB_USE_PYTHIA := 1 + ifdef G4LIB_USE_PYTHIA + CPPFLAGS += -DG4LIB_USE_PYTHIA endif - LDLIBS1 += $(FCLIBS) -endif -# ----------------------------------------------------------------- + INCFLAGS += -I$(HEPMC_DIR)/include -CXXFLAGS_WITHOUT_O := $(filter-out -O% , $(CXXFLAGS)) -CXXFLAGS_WITHOUT_O := $(filter-out +O% , $(CXXFLAGS_WITHOUT_O)) + ifdef G4LIB_USE_PYTHIA + LDLIBS1 += -L$(HEPMC_DIR)/lib -lHepMC -lHepMCfio + else + LDLIBS1 += -L$(HEPMC_DIR)/lib -lHepMC -lHepMCfio $(G4TMPDIR)/HEPEvtcom.o + endif -# On HP-acc optimization has to be turned off to compile ExN04HadronPhysics. -# -ifeq ($(G4SYSTEM),HP-aCC) - COMPILER := $(shell aCC -V 2>&1) -ifeq ($(COMPILER), aCC: HP ANSI C++ B3910B A.01.15) -$(G4TMP)/$(G4SYSTEM)/$(name)/XXHadronPhysics.o: src/XXHadronPhysics.cc - $(CXX) $(CXXFLAGS_WITHOUT_O) $(CPPFLAGS) -c $(OUT_OBJ)$@ src/XXHadronPhysics.cc + # Path for PYTHIA Fortran library. Based on CERNLIB-2005. + # Add "/cern/pro/bin" to $PATH first ! + # + ifdef G4LIB_USE_PYTHIA + LDLIBS1 += $(shell cernlib -v pro pythia6205 pdflib804 mathlib) -lg2c + endif +else +all: + @echo 'ERROR - HEPMC_DIR not defined in the environment !' + @echo ' Requires HepMC release 1.27.' endif -endif - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02/History b/examples/extended/eventgenerator/HepMC/HepMCEx02/History index d377fd542f..130c87a2eb 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02/History +++ b/examples/extended/eventgenerator/HepMC/HepMCEx02/History @@ -1,4 +1,4 @@ -$Id: History,v 1.6 2005/05/03 10:05:49 allison Exp $ +$Id: History,v 1.8 2006/11/22 15:09:07 gcosmo Exp $ ------------------------------------------------------------------- ========================================================= @@ -15,23 +15,31 @@ track of all tags. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- -3rd May 2005 John Allison (examples-V07-00-03) +Nov, 22nd, 2006 G.Cosmo +- Corrected GNUmakefile. + +Jul, 5th, 2006 G.Cosmo +- Updated to current version of exampleN02 for the physics-lists. + Now working with release series 8. +- Corrected GNUmakefile, now requiring CERNLIB 2005 for PYTHIA-8.0.4 + and HepMC 1.27 or greater. + +May, 3rd, 2005 John Allison - Replaced vis manager with G4VisExecutive. -Nov. 13, 2003 John Allison +Nov, 13th, 2003 John Allison - Reconstructed Vis Manager. -Jul. 04, 2003 G.Cosmo (exHepMC-V05-02-00) -- fixed compilation errors due to incorrect code migration from g4std wrappers. -- fixed pedantic compilation warnings on Linux-g++. +Jul, 4th, 2003 G.Cosmo +- Fixed compilation errors due to incorrect code migration from g4std wrappers. +- Fixed pedantic compilation warnings on Linux-g++. -Nov. 19, 2002 K.Murakami -- modified physics lists as is ExN04. -- "std" namespace left/not cared was modified to "G4std". +Nov, 19th, 2002 K.Murakami +- Modified physics lists as is ExN02. +- "std" namespace modified to "G4std". -May. 28, 2002 K.Murakami -- rename classes and filenames. - -April 15, 02 K.Murakami +May, 28th, 2002 K.Murakami +- Renamed classes and filenames. +Apr, 15th, 2002 K.Murakami - Created. diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02/hepmcEx02.cc b/examples/extended/eventgenerator/HepMC/HepMCEx02/hepmcEx02.cc index ef091782e5..f7cb60e9a3 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02/hepmcEx02.cc +++ b/examples/extended/eventgenerator/HepMC/HepMCEx02/hepmcEx02.cc @@ -24,17 +24,12 @@ // ******************************************************************** // // -// $Id: hepmcEx02.cc,v 1.4 2006/06/29 17:09:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: hepmcEx02.cc,v 1.5 2006/07/05 12:04:07 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- // GEANT 4 - example of HepMC-interface -// -// -------------------------------------------------------------- -// Comments -// -// // -------------------------------------------------------------- #include "G4RunManager.hh" @@ -56,25 +51,37 @@ int main(int argc, char** argv) { G4RunManager* runManager= new G4RunManager; - runManager-> SetUserInitialization(new H02DetectorConstruction); - runManager-> SetUserInitialization(new H02PhysicsList); + // User Initialization classes (mandatory) + // + G4VUserDetectorConstruction* detector = new H02DetectorConstruction; + runManager-> SetUserInitialization(detector); + // + G4VUserPhysicsList* physics = new H02PhysicsList; + runManager-> SetUserInitialization(physics); runManager-> Initialize(); - runManager-> SetUserAction(new H02PrimaryGeneratorAction); - runManager-> SetUserAction(new H02EventAction); - runManager-> SetUserAction(new H02SteppingAction); + // User Action classes + // + G4VUserPrimaryGeneratorAction* gen_action = new H02PrimaryGeneratorAction; + runManager-> SetUserAction(gen_action); + // + G4UserEventAction* event_action = new H02EventAction; + runManager-> SetUserAction(event_action); + // + G4UserSteppingAction* stepping_action = new H02SteppingAction; + runManager-> SetUserAction(stepping_action); #ifdef G4VIS_USE - // initialize visualization package + // Initialize visualization package + // G4VisManager* visManager= new G4VisExecutive; visManager-> Initialize(); G4cout << G4endl; #endif - if(argc==1) { - // G4UIterminal is a (dumb) terminal. - + if(argc==1) // G4UIterminal is a (dumb) terminal + { #ifdef QERAUOY G4UItcsh* tcsh= new G4UItcsh("hepmcEx02(%s)[%/]:"); @@ -87,13 +94,19 @@ int main(int argc, char** argv) session->SessionStart(); delete session; - } else { + } + else // Batch mode + { G4UImanager* UImanager= G4UImanager::GetUIpointer(); G4String command= "/control/execute "; G4String fileName= argv[1]; UImanager-> ApplyCommand(command+fileName); } + // Free the store: user actions, physics_list and detector_description are + // owned and deleted by the run manager, so they should not + // be deleted in the main() program ! + #ifdef G4VIS_USE delete visManager; #endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02/hepmc_ascii.out b/examples/extended/eventgenerator/HepMC/HepMCEx02/hepmc_ascii.out index f81e38ab96..da401d70f8 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02/hepmc_ascii.out +++ b/examples/extended/eventgenerator/HepMC/HepMCEx02/hepmc_ascii.out @@ -1,101 +1,211 @@ -********************************************** - Geant4 version $Name: geant4-08-01 $ - (31-Jul-2002) - Copyright : Geant4 Collaboration -********************************************** -phot: Total cross sections from Sandia parametrisation. -MuonMinusCaptureAtRest is created +************************************************************* + Geant4 version Name: geant4-08-01-ref-00 (30-June-2006) + Copyright : Geant4 Collaboration + Reference : NIM A 506 (2003), 250-303 + WWW : http://cern.ch/geant4 +************************************************************* -compt: Total cross sections from a parametrisation. Good description from 10 KeV to (100/Z) GeV. - Scattered gamma energy according Klein-Nishina. - PhysicsTables from 1 keV to 100 GeV in 80 bins. - -conv: Total cross sections from a parametrisation. Good description from 1.5 MeV to 100 GeV for all Z. - e+e- energies according Bethe-Heitler - PhysicsTables from 1.022 MeV to 100 GeV in 100 bins. - -eBrem: Total cross sections from a NEW parametrisation based on the EEDL data library. - Good description from 1 KeV to 100 GeV. - log scale extrapolation above 100 GeV - Gamma energy sampled from a parametrised formula. - PhysicsTables from 1 keV to 100 TeV in 100 bins. - -eIoni: delta cross sections from Moller+Bhabha. Good description from 1 KeV to 100 GeV. - delta ray energy sampled from differential Xsection. - PhysicsTables from 1 keV to 100 TeV in 100 bins. - -msc: Tables of transport mean free paths. - New model of MSC , computes the lateral - displacement of the particle , too. - PhysicsTables from 100 eV to 100 TeV in 100 bins. - -annihil: Total cross section from Heilter formula(annihilation into 2 photons). - gamma energies sampled according Heitler - PhysicsTables from 10 keV to 10 TeV in 100 bins. - -annihil: Total cross section from Heilter formula(annihilation into 2 photons). - gamma energies sampled according Heitler - PhysicsTables from 10 keV to 10 TeV in 100 bins. - -hIoni: Knock-on electron cross sections . - Good description above the mean excitation energy. - delta ray energy sampled from differential Xsection. - PhysicsTables from 1 keV to 100 TeV in 100 bins. - -msc: Tables of transport mean free paths. - New model of MSC , computes the lateral - displacement of the particle , too. - PhysicsTables from 100 eV to 100 TeV in 100 bins. - -MuIoni: Knock-on electron cross sections . - Good description above the mean excitation energy. - delta ray energy sampled from differential Xsection. - PhysicsTables from 1 keV to 1000 PeV in 150 bins. - -MuBrems: theoretical cross section - Good description up to 1000 PeV. - PhysicsTables from 1 keV to 1000 PeV in 150 bins. - -MuPairProd: theoretical cross sections - Good description up to 1000 PeV. - PhysicsTables from 1 keV to 1000 PeV in 150 bins. - -msc: Tables of transport mean free paths. - New model of MSC , computes the lateral - displacement of the particle , too. - PhysicsTables from 100 eV to 100 TeV in 100 bins. Visualization Manager instantiating... Visualization Manager initialising... Registering graphics systems... -* Visualizaton Driver: DAWN -* Visualizaton Driver: VRML1/2 -* Visualizaton Driver: VRML1/2 File -You have successfully chosen to use the following graphics systems. +You have successfully registered the following graphics systems. Current available graphics systems are: ASCIITree (ATree) DAWNFILE (DAWNFILE) + GAGTree (GAGTree) + G4HepRep (HepRepXML) + G4HepRepFile (HepRepFile) + RayTracer (RayTracer) + VRML1FILE (VRML1FILE) + VRML2FILE (VRML2FILE) + FukuiRenderer (DAWN) OpenGLImmediateX (OGLIX) OpenGLStoredX (OGLSX) OpenGLImmediateXm (OGLIXm) OpenGLStoredXm (OGLSXm) + OpenInventorXt (OIX) + RayTracerX (RayTracerX) VRML1 (VRML1) VRML2 (VRML2) - VRML1FILE (VRML1FILE) - VRML2FILE (VRML2FILE) + +Registering model factories... + +You have successfully registered the following model factories. +Registered model factories: + generic + drawByCharge + drawByParticleID + drawByOriginVolume + +Registered models: + None + +Registered filter factories: + chargeFilter + particleFilter + originVolumeFilter + +Registered filters: + None + current generator type: hepmcAscii HepMC Ascii inputfile: data/example_MyPythia.dat IO_Ascii: unformated ascii file IO for machine reading. - File openmode: 1 file state: 0 bad:0 eof:0 fail:0 good:0 + File openmode: 8 file state: 0 bad:0 eof:0 fail:0 good:0 + +phot: Total cross sections from Sandia parametrisation. + +compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV + Sampling according Klein-Nishina model + tables are built for gamma + Lambda tables from 100 eV to 100 GeV in 90 bins. + +conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; + sampling secondary e+e- according to the Bethe-Heitler model + tables are built for gamma + Lambda tables from 1.022 MeV to 100 GeV in 100 bins. + +msc: Model variant of multiple scattering for e- + Lambda tables from 100 eV to 100 TeV in 120 bins. + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +eIoni: tables are built for e- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +eBrem: tables are built for e- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Total cross sections from a parametrisation based on the EEDL data library. + Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. + +eIoni: tables are built for e+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +eBrem: tables are built for e+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Total cross sections from a parametrisation based on the EEDL data library. + Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. + +annihil: Heilter model of formula of annihilation into 2 photons + tables are built for e+ + Lambda tables from 100 eV to 100 TeV in 120 bins. + +msc: Model variant of multiple scattering for proton + Lambda tables from 100 eV to 100 TeV in 120 bins. + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +hIoni: tables are built for proton + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +hIoni: tables are built for anti_proton + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +msc: Model variant of multiple scattering for mu+ + Lambda tables from 100 eV to 100 TeV in 120 bins. + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +muIoni: tables are built for mu+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Bether-Bloch model for E > 0.2 MeV, parametrisation of Bragg peak below, + radiative corrections for E > 1 GeV + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +muBrems: tables are built for mu+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Parametrised model + +muPairProd: tables are built for mu+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Parametrised model + +muIoni: tables are built for mu- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Bether-Bloch model for E > 0.2 MeV, parametrisation of Bragg peak below, + radiative corrections for E > 1 GeV + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +muBrems: tables are built for mu- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Parametrised model + +muPairProd: tables are built for mu- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Parametrised model + +hIoni: tables are built for pi+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 0.297504 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +msc: Model variant of multiple scattering for pi- + Lambda tables from 100 eV to 100 TeV in 120 bins. + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +hIoni: tables are built for pi- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 0.297504 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +========= Table of registered couples ============================== + +Index : 0 used in the geometry : Yes recalculation needed : No + Material : Air + Range cuts : gamma 1 cm e- 1 cm e+ 1 cm + Energy thresholds : gamma 990 eV e- 8.07135 keV e+ 8.07135 keV + Region(s) which use this couple : + DefaultRegionForTheWorld + +Index : 1 used in the geometry : Yes recalculation needed : No + Material : Lead + Range cuts : gamma 1 cm e- 1 cm e+ 1 cm + Energy thresholds : gamma 282.478 keV e- 15.0137 MeV e+ 13.9447 MeV + Region(s) which use this couple : + DefaultRegionForTheWorld + +Index : 2 used in the geometry : Yes recalculation needed : No + Material : ArgonGas + Range cuts : gamma 1 cm e- 1 cm e+ 1 cm + Energy thresholds : gamma 990 eV e- 10.3667 keV e+ 10.2399 keV + Region(s) which use this couple : + DefaultRegionForTheWorld + +==================================================================== + ________________________________________________________________________________ GenEvent: #1 ID=20 SignalProcessGenVertex Barcode: 0 Current Memory Usage: 1 events, 78 vertices, 210 particles. Entries this event: 78 vertices, 210 particles. RndmState(0)= Wgts(0)= - EventScale -1 GeV alphaQCD=-1 alphaQED=-1 + EventScale -1 [energy] alphaQCD=-1 alphaQED=-1 GenParticle Legend Barcode PDG ID ( Px, Py, Pz, E ) Stat DecayVtx ________________________________________________________________________________ @@ -105,9 +215,9 @@ GenVertex: -1 ID: 0 (X,cT):0 20 2101 +7.76e-01,+9.12e-01,+4.45e+03,+4.45e+03 2 -16 GenVertex: -2 ID: 0 (X,cT):0 I: 1 2 2212 +0.00e+00,+0.00e+00,-7.00e+03,+7.00e+03 3 -2 - O: 3 4 -1 -1.01e+00,-1.27e-02,-4.15e+00,+4.27e+00 3 -4 + O: 3 26 1 +8.08e-03,-1.46e-02,-2.46e+03,+2.46e+03 2 -16 + 4 -1 -1.01e+00,-1.27e-02,-4.15e+00,+4.27e+00 3 -4 13 2214 +1.00e-00,+2.73e-02,-4.08e+03,+4.08e+03 2 -9 - 26 1 +8.08e-03,-1.46e-02,-2.46e+03,+2.46e+03 2 -16 GenVertex: -3 ID: 0 (X,cT):0 I: 1 3 2 -7.76e-01,-9.12e-01,+1.88e+03,+1.88e+03 3 -3 O: 4 5 2 -5.02e+00,+1.15e+00,+1.48e+03,+1.48e+03 3 -5 @@ -126,17 +236,17 @@ GenVertex: -5 ID: 0 (X,cT):0 8 24 -9.67e-01,+1.07e+01,+1.23e+03,+1.24e+03 3 -7 GenVertex: -6 ID: 0 (X,cT):0 I: 1 7 22 -4.03e+00,-1.23e+00,+2.46e+02,+2.46e+02 3 -6 - O: 1 9 22 -4.03e+00,-1.23e+00,+2.46e+02,+2.46e+02 1 (nil) + O: 1 9 22 -4.03e+00,-1.23e+00,+2.46e+02,+2.46e+02 1 GenVertex: -7 ID: 0 (X,cT):0 I: 1 8 24 -9.67e-01,+1.07e+01,+1.23e+03,+1.24e+03 3 -7 O: 1 10 24 -9.67e-01,+1.07e+01,+1.23e+03,+1.24e+03 2 -8 GenVertex: -8 ID: 0 (X,cT):0 I: 1 10 24 -9.67e-01,+1.07e+01,+1.23e+03,+1.24e+03 2 -8 - O: 2 11 -13 -2.56e+01,+4.70e+01,+2.09e+02,+2.16e+02 1 (nil) - 12 14 +2.47e+01,-3.63e+01,+1.02e+03,+1.02e+03 1 (nil) + O: 2 11 -13 -2.56e+01,+4.70e+01,+2.09e+02,+2.16e+02 1 + 12 14 +2.47e+01,-3.63e+01,+1.02e+03,+1.02e+03 1 GenVertex: -9 ID: 0 (X,cT):0 I: 1 13 2214 +1.00e-00,+2.73e-02,-4.08e+03,+4.08e+03 2 -9 - O: 2 29 2212 +1.02e+00,+1.18e-01,-3.74e+03,+3.74e+03 1 (nil) + O: 2 29 2212 +1.02e+00,+1.18e-01,-3.74e+03,+3.74e+03 1 30 111 -2.46e-02,-9.09e-02,-3.46e+02,+3.46e+02 2 -20 GenVertex: -10 ID: 0 (X,cT):0 I: 2 14 1 +2.31e+00,+5.82e+00,+1.51e+02,+1.51e+02 2 -10 @@ -144,14 +254,14 @@ GenVertex: -10 ID: 0 (X,cT):0 O: 1 31 92 +0.00e+00,+0.00e+00,+1.97e+02,+1.97e+02 2 -11 GenVertex: -11 ID: 0 (X,cT):0 I: 1 31 92 +0.00e+00,+0.00e+00,+1.97e+02,+1.97e+02 2 -11 - O: 8 32 -211 +2.54e-01,+1.65e+00,+3.42e+01,+3.42e+01 1 (nil) - 33 211 +1.83e-01,-2.25e-01,+8.98e+00,+8.99e+00 1 (nil) - 34 -211 +1.65e+00,+3.36e+00,+8.55e+01,+8.56e+01 1 (nil) + O: 8 32 -211 +2.54e-01,+1.65e+00,+3.42e+01,+3.42e+01 1 + 33 211 +1.83e-01,-2.25e-01,+8.98e+00,+8.99e+00 1 + 34 -211 +1.65e+00,+3.36e+00,+8.55e+01,+8.56e+01 1 35 221 +1.53e-01,+1.01e-01,+1.68e+01,+1.68e+01 2 -21 - 36 211 -5.43e-01,+7.13e-02,+3.10e+00,+3.15e+00 1 (nil) + 36 211 -5.43e-01,+7.13e-02,+3.10e+00,+3.15e+00 1 37 221 -4.39e-01,-1.09e+00,+1.62e+01,+1.63e+01 2 -22 38 -213 -1.18e+00,-2.20e+00,+1.67e+01,+1.70e+01 2 -23 - 39 211 -8.40e-02,-1.67e+00,+1.53e+01,+1.54e+01 1 (nil) + 39 211 -8.40e-02,-1.67e+00,+1.53e+01,+1.54e+01 1 GenVertex: -12 ID: 0 (X,cT):0 I: 2 16 2 -3.95e+00,-1.33e+00,+3.41e+01,+3.44e+01 2 -12 17 -2 +3.95e+00,+1.33e+00,+4.38e+02,+4.38e+02 2 -12 @@ -159,10 +269,10 @@ GenVertex: -12 ID: 0 (X,cT):0 GenVertex: -13 ID: 0 (X,cT):0 I: 1 40 92 +0.00e+00,+0.00e+00,+4.72e+02,+4.72e+02 2 -13 O: 8 41 221 -2.68e+00,-7.41e-01,+2.70e+01,+2.71e+01 2 -24 - 42 211 -1.08e+00,-1.77e-01,+8.94e+00,+9.00e+00 1 (nil) + 42 211 -1.08e+00,-1.77e-01,+8.94e+00,+9.00e+00 1 43 223 +7.31e-01,-2.42e-01,+2.97e+01,+2.97e+01 2 -25 44 -213 +6.83e-02,+2.16e-01,+2.67e+01,+2.67e+01 2 -26 - 45 211 -7.62e-02,+3.34e-01,+9.98e+00,+9.98e+00 1 (nil) + 45 211 -7.62e-02,+3.34e-01,+9.98e+00,+9.98e+00 1 46 223 +1.18e+00,+7.67e-03,+1.59e+02,+1.59e+02 2 -27 47 -213 +4.18e-01,+2.70e-01,+5.63e+01,+5.63e+01 2 -28 48 111 +1.44e+00,+3.32e-01,+1.54e+02,+1.54e+02 2 -29 @@ -173,49 +283,49 @@ GenVertex: -14 ID: 0 (X,cT):0 GenVertex: -15 ID: 0 (X,cT):0 I: 1 49 92 +0.00e+00,+0.00e+00,-3.75e+02,+3.75e+02 2 -15 O: 3 50 113 +1.57e+00,+2.83e+00,-6.11e+01,+6.12e+01 2 -30 - 51 211 +2.02e-01,+1.20e-01,-2.70e+01,+2.70e+01 1 (nil) - 52 -211 -1.77e+00,-2.95e+00,-2.86e+02,+2.86e+02 1 (nil) + 51 211 +2.02e-01,+1.20e-01,-2.70e+01,+2.70e+01 1 + 52 -211 -1.77e+00,-2.95e+00,-2.86e+02,+2.86e+02 1 GenVertex: -16 ID: 0 (X,cT):0 - I: 7 20 2101 +7.76e-01,+9.12e-01,+4.45e+03,+4.45e+03 2 -16 - 26 1 +8.08e-03,-1.46e-02,-2.46e+03,+2.46e+03 2 -16 + I: 7 26 1 +8.08e-03,-1.46e-02,-2.46e+03,+2.46e+03 2 -16 21 21 +1.46e+00,-3.91e-01,+1.09e+02,+1.09e+02 2 -16 22 21 +3.11e+00,+2.32e-01,+1.46e+02,+1.47e+02 2 -16 23 21 -1.09e-01,-1.87e+00,+8.61e+01,+8.61e+01 2 -16 24 21 -5.37e-01,-6.68e+00,+4.75e+01,+4.79e+01 2 -16 25 21 -7.11e-01,-1.71e+00,+1.08e+01,+1.10e+01 2 -16 + 20 2101 +7.76e-01,+9.12e-01,+4.45e+03,+4.45e+03 2 -16 O: 1 53 92 +3.99e+00,-9.52e+00,+2.38e+03,+7.31e+03 2 -17 GenVertex: -17 ID: 0 (X,cT):0 I: 1 53 92 +3.99e+00,-9.52e+00,+2.38e+03,+7.31e+03 2 -17 - O:31 54 2212 +8.22e-01,+7.58e-01,+2.86e+03,+2.86e+03 1 (nil) + O:31 54 2212 +8.22e-01,+7.58e-01,+2.86e+03,+2.86e+03 1 55 113 -3.60e-01,-1.69e-01,+8.62e+02,+8.62e+02 2 -31 56 -2214 +1.03e+00,+9.30e-02,+4.53e+02,+4.53e+02 2 -32 57 223 -3.60e-01,+4.04e-01,+1.25e+02,+1.25e+02 2 -33 - 58 2212 +1.68e+00,-6.25e-01,+1.57e+02,+1.57e+02 1 (nil) + 58 2212 +1.68e+00,-6.25e-01,+1.57e+02,+1.57e+02 1 59 -213 +5.56e-01,+3.45e-01,+9.14e+01,+9.14e+01 2 -34 60 -311 +6.88e-02,-2.98e-02,+3.77e+01,+3.77e+01 2 -35 61 311 +5.59e-01,-2.32e-01,+5.88e+01,+5.88e+01 2 -36 - 62 211 +3.24e-01,-1.11e+00,+5.03e+01,+5.03e+01 1 (nil) + 62 211 +3.24e-01,-1.11e+00,+5.03e+01,+5.03e+01 1 63 113 -1.65e-02,-7.81e-02,+4.91e+00,+4.95e+00 2 -37 - 64 -211 +7.06e-01,-6.40e-01,+6.56e+01,+6.56e+01 1 (nil) + 64 -211 +7.06e-01,-6.40e-01,+6.56e+01,+6.56e+01 1 65 213 +4.72e-01,-4.39e-01,+1.44e+01,+1.44e+01 2 -38 66 -213 -3.00e-01,-3.82e-01,+1.62e+01,+1.63e+01 2 -39 - 67 211 -4.39e-01,-3.19e+00,+2.48e+01,+2.50e+01 1 (nil) - 68 -211 -1.40e-01,-1.20e-01,+4.92e-01,+5.44e-01 1 (nil) + 67 211 -4.39e-01,-3.19e+00,+2.48e+01,+2.50e+01 1 + 68 -211 -1.40e-01,-1.20e-01,+4.92e-01,+5.44e-01 1 69 -311 -2.66e-01,-2.65e+00,+2.07e+01,+2.08e+01 2 -40 70 323 +1.09e-01,-8.86e-01,+4.66e+00,+4.83e+00 2 -41 71 113 -4.98e-01,-2.28e-01,+1.70e+00,+1.96e+00 2 -42 72 -323 -2.90e-01,-2.30e-01,+6.43e-01,+1.16e+00 2 -43 73 311 +7.90e-02,-3.23e-02,-8.47e-01,+9.86e-01 2 -44 74 113 +1.28e-01,+1.79e-01,-7.07e-01,+1.09e+00 2 -45 - 75 -2112 +2.40e-01,-6.43e-01,-2.35e+00,+2.62e+00 1 (nil) - 76 2112 +1.43e-01,-2.20e-01,-2.23e+00,+2.43e+00 1 (nil) + 75 -2112 +2.40e-01,-6.43e-01,-2.35e+00,+2.62e+00 1 + 76 2112 +1.43e-01,-2.20e-01,-2.23e+00,+2.43e+00 1 77 221 -1.58e-01,+9.23e-01,-1.12e+01,+1.12e+01 2 -46 - 78 211 -3.97e-01,-5.01e-01,-1.11e+00,+1.29e+00 1 (nil) + 78 211 -3.97e-01,-5.01e-01,-1.11e+00,+1.29e+00 1 79 111 +2.87e-01,+2.82e-01,-1.04e+00,+1.12e+00 2 -47 80 223 +4.06e-01,-2.45e-01,-3.51e+01,+3.51e+01 2 -48 - 81 -321 -6.14e-01,+2.77e-01,-2.28e+02,+2.28e+02 1 (nil) + 81 -321 -6.14e-01,+2.77e-01,-2.28e+02,+2.28e+02 1 82 323 +1.26e-01,-3.07e-01,-1.50e+03,+1.50e+03 2 -49 - 83 -321 +1.94e-01,+2.93e-01,-1.69e+02,+1.69e+02 1 (nil) + 83 -321 +1.94e-01,+2.93e-01,-1.69e+02,+1.69e+02 1 84 311 -9.36e-02,-1.11e-01,-5.09e+02,+5.09e+02 2 -50 GenVertex: -18 ID: 0 (X,cT):0 I: 2 27 21 -1.37e-01,-5.99e+00,-1.38e+01,+1.51e+01 2 -18 @@ -223,23 +333,23 @@ GenVertex: -18 ID: 0 (X,cT):0 O: 1 85 92 +0.00e+00,+0.00e+00,-7.51e+01,+7.66e+01 2 -19 GenVertex: -19 ID: 0 (X,cT):0 I: 1 85 92 +0.00e+00,+0.00e+00,-7.51e+01,+7.66e+01 2 -19 - O: 9 86 -2112 -3.84e-02,-2.48e+00,-7.98e+00,+8.41e+00 1 (nil) - 87 2212 +1.88e-01,-2.14e+00,-4.49e+00,+5.07e+00 1 (nil) + O: 9 86 -2112 -3.84e-02,-2.48e+00,-7.98e+00,+8.41e+00 1 + 87 2212 +1.88e-01,-2.14e+00,-4.49e+00,+5.07e+00 1 88 -213 +2.00e-01,-1.11e-01,-1.66e+00,+1.83e+00 2 -51 89 -313 -6.26e-01,+1.37e+00,-1.29e+01,+1.30e+01 2 -52 - 90 321 +7.89e-02,+7.45e-01,-1.09e+01,+1.10e+01 1 (nil) - 91 -211 +4.23e-02,+3.92e-01,-8.74e+00,+8.75e+00 1 (nil) - 92 211 +6.44e-02,+3.67e-01,-1.38e+00,+1.43e+00 1 (nil) - 93 -2212 +4.16e-02,+5.64e-01,-1.20e+01,+1.20e+01 1 (nil) - 94 2112 +4.92e-02,+1.30e+00,-1.50e+01,+1.51e+01 1 (nil) + 90 321 +7.89e-02,+7.45e-01,-1.09e+01,+1.10e+01 1 + 91 -211 +4.23e-02,+3.92e-01,-8.74e+00,+8.75e+00 1 + 92 211 +6.44e-02,+3.67e-01,-1.38e+00,+1.43e+00 1 + 93 -2212 +4.16e-02,+5.64e-01,-1.20e+01,+1.20e+01 1 + 94 2112 +4.92e-02,+1.30e+00,-1.50e+01,+1.51e+01 1 Vertex: -20 ID: 0 (X,cT)=-7.43e-06,-2.74e-05,-1.04e-01,+1.04e-01 I: 1 30 111 -2.46e-02,-9.09e-02,-3.46e+02,+3.46e+02 2 -20 - O: 2 95 22 -4.57e-02,-1.20e-01,-2.72e+02,+2.72e+02 1 (nil) - 96 22 +2.11e-02,+2.92e-02,-7.38e+01,+7.38e+01 1 (nil) + O: 2 95 22 -4.57e-02,-1.20e-01,-2.72e+02,+2.72e+02 1 + 96 22 +2.11e-02,+2.92e-02,-7.38e+01,+7.38e+01 1 GenVertex: -21 ID: 0 (X,cT):0 I: 1 35 221 +1.53e-01,+1.01e-01,+1.68e+01,+1.68e+01 2 -21 - O: 3 97 211 +1.91e-01,+1.34e-01,+6.86e+00,+6.86e+00 1 (nil) - 98 -211 -4.99e-02,-5.38e-02,+4.31e+00,+4.31e+00 1 (nil) + O: 3 97 211 +1.91e-01,+1.34e-01,+6.86e+00,+6.86e+00 1 + 98 -211 -4.99e-02,-5.38e-02,+4.31e+00,+4.31e+00 1 99 111 +1.27e-02,+2.08e-02,+5.61e+00,+5.61e+00 2 -53 GenVertex: -22 ID: 0 (X,cT):0 I: 1 37 221 -4.39e-01,-1.09e+00,+1.62e+01,+1.63e+01 2 -22 @@ -248,118 +358,118 @@ GenVertex: -22 ID: 0 (X,cT):0 102 111 -2.65e-01,-5.85e-01,+7.55e+00,+7.58e+00 2 -56 GenVertex: -23 ID: 0 (X,cT):0 I: 1 38 -213 -1.18e+00,-2.20e+00,+1.67e+01,+1.70e+01 2 -23 - O: 2 103 -211 +5.93e-02,-7.99e-01,+3.99e+00,+4.07e+00 1 (nil) + O: 2 103 -211 +5.93e-02,-7.99e-01,+3.99e+00,+4.07e+00 1 104 111 -1.24e+00,-1.40e+00,+1.27e+01,+1.29e+01 2 -57 GenVertex: -24 ID: 0 (X,cT):0 I: 1 41 221 -2.68e+00,-7.41e-01,+2.70e+01,+2.71e+01 2 -24 - O: 2 105 22 -6.34e-03,-7.93e-02,+8.01e-01,+8.05e-01 1 (nil) - 106 22 -2.67e+00,-6.61e-01,+2.62e+01,+2.63e+01 1 (nil) + O: 2 105 22 -6.34e-03,-7.93e-02,+8.01e-01,+8.05e-01 1 + 106 22 -2.67e+00,-6.61e-01,+2.62e+01,+2.63e+01 1 GenVertex: -25 ID: 0 (X,cT):0 I: 1 43 223 +7.31e-01,-2.42e-01,+2.97e+01,+2.97e+01 2 -25 - O: 3 107 -211 +1.76e-02,+3.37e-02,+3.20e+00,+3.21e+00 1 (nil) - 108 211 +3.94e-01,+9.73e-02,+1.40e+01,+1.40e+01 1 (nil) + O: 3 107 -211 +1.76e-02,+3.37e-02,+3.20e+00,+3.21e+00 1 + 108 211 +3.94e-01,+9.73e-02,+1.40e+01,+1.40e+01 1 109 111 +3.20e-01,-3.73e-01,+1.25e+01,+1.25e+01 2 -58 GenVertex: -26 ID: 0 (X,cT):0 I: 1 44 -213 +6.83e-02,+2.16e-01,+2.67e+01,+2.67e+01 2 -26 - O: 2 110 -211 -8.41e-02,-1.88e-01,+1.75e+01,+1.75e+01 1 (nil) + O: 2 110 -211 -8.41e-02,-1.88e-01,+1.75e+01,+1.75e+01 1 111 111 +1.52e-01,+4.04e-01,+9.17e+00,+9.18e+00 2 -59 GenVertex: -27 ID: 0 (X,cT):0 I: 1 46 223 +1.18e+00,+7.67e-03,+1.59e+02,+1.59e+02 2 -27 - O: 3 112 -211 +4.71e-01,+6.85e-02,+4.92e+01,+4.92e+01 1 (nil) - 113 211 +5.97e-01,-1.23e-01,+1.01e+02,+1.01e+02 1 (nil) + O: 3 112 -211 +4.71e-01,+6.85e-02,+4.92e+01,+4.92e+01 1 + 113 211 +5.97e-01,-1.23e-01,+1.01e+02,+1.01e+02 1 114 111 +1.09e-01,+6.20e-02,+9.26e+00,+9.26e+00 2 -60 GenVertex: -28 ID: 0 (X,cT):0 I: 1 47 -213 +4.18e-01,+2.70e-01,+5.63e+01,+5.63e+01 2 -28 - O: 2 115 -211 +4.07e-02,+6.55e-03,+6.59e+00,+6.59e+00 1 (nil) + O: 2 115 -211 +4.07e-02,+6.55e-03,+6.59e+00,+6.59e+00 1 116 111 +3.77e-01,+2.64e-01,+4.98e+01,+4.98e+01 2 -61 Vertex: -29 ID: 0 (X,cT)=+3.69e-04,+8.53e-05,+3.95e-02,+3.95e-02 I: 1 48 111 +1.44e+00,+3.32e-01,+1.54e+02,+1.54e+02 2 -29 - O: 2 117 22 +4.72e-01,+4.59e-02,+5.06e+01,+5.06e+01 1 (nil) - 118 22 +9.67e-01,+2.86e-01,+1.03e+02,+1.03e+02 1 (nil) + O: 2 117 22 +4.72e-01,+4.59e-02,+5.06e+01,+5.06e+01 1 + 118 22 +9.67e-01,+2.86e-01,+1.03e+02,+1.03e+02 1 GenVertex: -30 ID: 0 (X,cT):0 I: 1 50 113 +1.57e+00,+2.83e+00,-6.11e+01,+6.12e+01 2 -30 - O: 2 119 -211 +9.16e-01,+2.13e+00,-4.37e+01,+4.38e+01 1 (nil) - 120 211 +6.49e-01,+7.08e-01,-1.74e+01,+1.75e+01 1 (nil) + O: 2 119 -211 +9.16e-01,+2.13e+00,-4.37e+01,+4.38e+01 1 + 120 211 +6.49e-01,+7.08e-01,-1.74e+01,+1.75e+01 1 GenVertex: -31 ID: 0 (X,cT):0 I: 1 55 113 -3.60e-01,-1.69e-01,+8.62e+02,+8.62e+02 2 -31 - O: 2 121 211 -1.07e-01,+4.26e-02,+1.56e+02,+1.56e+02 1 (nil) - 122 -211 -2.53e-01,-2.12e-01,+7.07e+02,+7.07e+02 1 (nil) + O: 2 121 211 -1.07e-01,+4.26e-02,+1.56e+02,+1.56e+02 1 + 122 -211 -2.53e-01,-2.12e-01,+7.07e+02,+7.07e+02 1 GenVertex: -32 ID: 0 (X,cT):0 I: 1 56 -2214 +1.03e+00,+9.30e-02,+4.53e+02,+4.53e+02 2 -32 - O: 2 123 -2212 +4.99e-01,+1.49e-01,+3.29e+02,+3.29e+02 1 (nil) + O: 2 123 -2212 +4.99e-01,+1.49e-01,+3.29e+02,+3.29e+02 1 124 111 +5.28e-01,-5.58e-02,+1.24e+02,+1.24e+02 2 -62 GenVertex: -33 ID: 0 (X,cT):0 I: 1 57 223 -3.60e-01,+4.04e-01,+1.25e+02,+1.25e+02 2 -33 - O: 3 125 211 -1.22e-01,+3.51e-01,+3.18e+01,+3.18e+01 1 (nil) - 126 -211 -2.21e-01,+7.11e-02,+8.21e+01,+8.21e+01 1 (nil) + O: 3 125 211 -1.22e-01,+3.51e-01,+3.18e+01,+3.18e+01 1 + 126 -211 -2.21e-01,+7.11e-02,+8.21e+01,+8.21e+01 1 127 111 -1.66e-02,-1.80e-02,+1.09e+01,+1.09e+01 2 -63 GenVertex: -34 ID: 0 (X,cT):0 I: 1 59 -213 +5.56e-01,+3.45e-01,+9.14e+01,+9.14e+01 2 -34 - O: 2 128 -211 +3.11e-01,+3.56e-01,+3.44e+01,+3.44e+01 1 (nil) + O: 2 128 -211 +3.11e-01,+3.56e-01,+3.44e+01,+3.44e+01 1 129 111 +2.45e-01,-1.18e-02,+5.70e+01,+5.70e+01 2 -64 GenVertex: -35 ID: 0 (X,cT):0 I: 1 60 -311 +6.88e-02,-2.98e-02,+3.77e+01,+3.77e+01 2 -35 O: 1 130 310 +6.88e-02,-2.98e-02,+3.77e+01,+3.77e+01 2 -65 GenVertex: -36 ID: 0 (X,cT):0 I: 1 61 311 +5.59e-01,-2.32e-01,+5.88e+01,+5.88e+01 2 -36 - O: 1 131 130 +5.59e-01,-2.32e-01,+5.88e+01,+5.88e+01 1 (nil) + O: 1 131 130 +5.59e-01,-2.32e-01,+5.88e+01,+5.88e+01 1 GenVertex: -37 ID: 0 (X,cT):0 I: 1 63 113 -1.65e-02,-7.81e-02,+4.91e+00,+4.95e+00 2 -37 - O: 2 132 211 +1.08e-01,-5.14e-02,+4.37e+00,+4.38e+00 1 (nil) - 133 -211 -1.25e-01,-2.68e-02,+5.37e-01,+5.69e-01 1 (nil) + O: 2 132 211 +1.08e-01,-5.14e-02,+4.37e+00,+4.38e+00 1 + 133 -211 -1.25e-01,-2.68e-02,+5.37e-01,+5.69e-01 1 GenVertex: -38 ID: 0 (X,cT):0 I: 1 65 213 +4.72e-01,-4.39e-01,+1.44e+01,+1.44e+01 2 -38 - O: 2 134 211 +1.82e-01,-5.33e-01,+1.18e+01,+1.18e+01 1 (nil) + O: 2 134 211 +1.82e-01,-5.33e-01,+1.18e+01,+1.18e+01 1 135 111 +2.91e-01,+9.43e-02,+2.56e+00,+2.58e+00 2 -66 GenVertex: -39 ID: 0 (X,cT):0 I: 1 66 -213 -3.00e-01,-3.82e-01,+1.62e+01,+1.63e+01 2 -39 - O: 2 136 -211 -4.94e-01,-2.13e-01,+6.74e+00,+6.77e+00 1 (nil) + O: 2 136 -211 -4.94e-01,-2.13e-01,+6.74e+00,+6.77e+00 1 137 111 +1.93e-01,-1.69e-01,+9.48e+00,+9.49e+00 2 -67 GenVertex: -40 ID: 0 (X,cT):0 I: 1 69 -311 -2.66e-01,-2.65e+00,+2.07e+01,+2.08e+01 2 -40 - O: 1 138 130 -2.66e-01,-2.65e+00,+2.07e+01,+2.08e+01 1 (nil) + O: 1 138 130 -2.66e-01,-2.65e+00,+2.07e+01,+2.08e+01 1 GenVertex: -41 ID: 0 (X,cT):0 I: 1 70 323 +1.09e-01,-8.86e-01,+4.66e+00,+4.83e+00 2 -41 O: 2 139 311 -4.56e-02,-1.94e-01,+1.85e+00,+1.93e+00 2 -68 - 140 211 +1.54e-01,-6.92e-01,+2.81e+00,+2.90e+00 1 (nil) + 140 211 +1.54e-01,-6.92e-01,+2.81e+00,+2.90e+00 1 GenVertex: -42 ID: 0 (X,cT):0 I: 1 71 113 -4.98e-01,-2.28e-01,+1.70e+00,+1.96e+00 2 -42 - O: 2 141 211 +7.24e-02,-1.33e-01,+6.29e-02,+2.15e-01 1 (nil) - 142 -211 -5.70e-01,-9.51e-02,+1.64e+00,+1.75e+00 1 (nil) + O: 2 141 211 +7.24e-02,-1.33e-01,+6.29e-02,+2.15e-01 1 + 142 -211 -5.70e-01,-9.51e-02,+1.64e+00,+1.75e+00 1 GenVertex: -43 ID: 0 (X,cT):0 I: 1 72 -323 -2.90e-01,-2.30e-01,+6.43e-01,+1.16e+00 2 -43 O: 2 143 -311 -1.02e-01,-3.76e-01,+2.53e-01,+6.81e-01 2 -69 - 144 -211 -1.88e-01,+1.45e-01,+3.90e-01,+4.77e-01 1 (nil) + 144 -211 -1.88e-01,+1.45e-01,+3.90e-01,+4.77e-01 1 GenVertex: -44 ID: 0 (X,cT):0 I: 1 73 311 +7.90e-02,-3.23e-02,-8.47e-01,+9.86e-01 2 -44 O: 1 145 310 +7.90e-02,-3.23e-02,-8.47e-01,+9.86e-01 2 -70 GenVertex: -45 ID: 0 (X,cT):0 I: 1 74 113 +1.28e-01,+1.79e-01,-7.07e-01,+1.09e+00 2 -45 - O: 2 146 -211 -7.31e-02,+3.05e-01,-7.33e-01,+8.10e-01 1 (nil) - 147 211 +2.01e-01,-1.27e-01,+2.56e-02,+2.77e-01 1 (nil) + O: 2 146 -211 -7.31e-02,+3.05e-01,-7.33e-01,+8.10e-01 1 + 147 211 +2.01e-01,-1.27e-01,+2.56e-02,+2.77e-01 1 GenVertex: -46 ID: 0 (X,cT):0 I: 1 77 221 -1.58e-01,+9.23e-01,-1.12e+01,+1.12e+01 2 -46 - O: 3 148 -211 -1.37e-01,+2.12e-01,-2.48e+00,+2.50e+00 1 (nil) - 149 211 -6.29e-02,+5.66e-01,-6.65e+00,+6.68e+00 1 (nil) + O: 3 148 -211 -1.37e-01,+2.12e-01,-2.48e+00,+2.50e+00 1 + 149 211 -6.29e-02,+5.66e-01,-6.65e+00,+6.68e+00 1 150 111 +4.20e-02,+1.44e-01,-2.05e+00,+2.06e+00 2 -71 Vertex: -47 ID: 0 (X,cT)=+2.15e-05,+2.11e-05,-7.77e-05,+8.40e-05 I: 1 79 111 +2.87e-01,+2.82e-01,-1.04e+00,+1.12e+00 2 -47 - O: 2 151 22 +1.31e-01,+1.64e-01,-6.99e-01,+7.30e-01 1 (nil) - 152 22 +1.57e-01,+1.18e-01,-3.38e-01,+3.91e-01 1 (nil) + O: 2 151 22 +1.31e-01,+1.64e-01,-6.99e-01,+7.30e-01 1 + 152 22 +1.57e-01,+1.18e-01,-3.38e-01,+3.91e-01 1 GenVertex: -48 ID: 0 (X,cT):0 I: 1 80 223 +4.06e-01,-2.45e-01,-3.51e+01,+3.51e+01 2 -48 - O: 2 153 -211 -6.79e-02,+2.16e-01,-6.21e+00,+6.22e+00 1 (nil) - 154 211 +4.74e-01,-4.61e-01,-2.89e+01,+2.89e+01 1 (nil) + O: 2 153 -211 -6.79e-02,+2.16e-01,-6.21e+00,+6.22e+00 1 + 154 211 +4.74e-01,-4.61e-01,-2.89e+01,+2.89e+01 1 GenVertex: -49 ID: 0 (X,cT):0 I: 1 82 323 +1.26e-01,-3.07e-01,-1.50e+03,+1.50e+03 2 -49 - O: 2 155 321 +2.70e-01,-1.79e-01,-6.57e+02,+6.57e+02 1 (nil) + O: 2 155 321 +2.70e-01,-1.79e-01,-6.57e+02,+6.57e+02 1 156 111 -1.45e-01,-1.29e-01,-8.42e+02,+8.42e+02 2 -72 GenVertex: -50 ID: 0 (X,cT):0 I: 1 84 311 -9.36e-02,-1.11e-01,-5.09e+02,+5.09e+02 2 -50 - O: 1 157 130 -9.36e-02,-1.11e-01,-5.09e+02,+5.09e+02 1 (nil) + O: 1 157 130 -9.36e-02,-1.11e-01,-5.09e+02,+5.09e+02 1 GenVertex: -51 ID: 0 (X,cT):0 I: 1 88 -213 +2.00e-01,-1.11e-01,-1.66e+00,+1.83e+00 2 -51 - O: 2 158 -211 -1.33e-01,-2.94e-01,-9.51e-01,+1.01e+00 1 (nil) + O: 2 158 -211 -1.33e-01,-2.94e-01,-9.51e-01,+1.01e+00 1 159 111 +3.33e-01,+1.83e-01,-7.05e-01,+8.13e-01 2 -73 GenVertex: -52 ID: 0 (X,cT):0 I: 1 89 -313 -6.26e-01,+1.37e+00,-1.29e+01,+1.30e+01 2 -52 @@ -367,64 +477,64 @@ GenVertex: -52 ID: 0 (X,cT):0 161 111 -5.98e-01,+7.99e-01,-7.16e+00,+7.23e+00 2 -75 Vertex: -53 ID: 0 (X,cT)=+6.33e-07,+1.04e-06,+2.79e-04,+2.79e-04 I: 1 99 111 +1.27e-02,+2.08e-02,+5.61e+00,+5.61e+00 2 -53 - O: 2 162 22 +5.81e-02,+5.34e-02,+3.78e+00,+3.78e+00 1 (nil) - 163 22 -4.54e-02,-3.26e-02,+1.83e+00,+1.83e+00 1 (nil) + O: 2 162 22 +5.81e-02,+5.34e-02,+3.78e+00,+3.78e+00 1 + 163 22 -4.54e-02,-3.26e-02,+1.83e+00,+1.83e+00 1 Vertex: -54 ID: 0 (X,cT)=+3.79e-06,-3.71e-05,+5.03e-04,+5.05e-04 I: 1 100 111 +2.02e-02,-1.98e-01,+2.68e+00,+2.69e+00 2 -54 - O: 2 164 22 +2.39e-02,-9.50e-02,+2.06e+00,+2.06e+00 1 (nil) - 165 22 -3.65e-03,-1.03e-01,+6.27e-01,+6.35e-01 1 (nil) + O: 2 164 22 +2.39e-02,-9.50e-02,+2.06e+00,+2.06e+00 1 + 165 22 -3.65e-03,-1.03e-01,+6.27e-01,+6.35e-01 1 Vertex: -55 ID: 0 (X,cT)=-2.82e-05,-4.46e-05,+8.64e-04,+8.66e-04 I: 1 101 111 -1.94e-01,-3.08e-01,+5.97e+00,+5.98e+00 2 -55 - O: 2 166 22 -2.13e-01,-2.53e-01,+5.08e+00,+5.10e+00 1 (nil) - 167 22 +1.82e-02,-5.48e-02,+8.85e-01,+8.87e-01 1 (nil) + O: 2 166 22 -2.13e-01,-2.53e-01,+5.08e+00,+5.10e+00 1 + 167 22 +1.82e-02,-5.48e-02,+8.85e-01,+8.87e-01 1 Vertex: -56 ID: 0 (X,cT)=-1.01e-04,-2.22e-04,+2.87e-03,+2.88e-03 I: 1 102 111 -2.65e-01,-5.85e-01,+7.55e+00,+7.58e+00 2 -56 - O: 2 168 22 -2.34e-01,-3.64e-01,+4.90e+00,+4.92e+00 1 (nil) - 169 22 -3.04e-02,-2.21e-01,+2.65e+00,+2.66e+00 1 (nil) + O: 2 168 22 -2.34e-01,-3.64e-01,+4.90e+00,+4.92e+00 1 + 169 22 -3.04e-02,-2.21e-01,+2.65e+00,+2.66e+00 1 Vertex: -57 ID: 0 (X,cT)=-2.73e-04,-3.09e-04,+2.81e-03,+2.84e-03 I: 1 104 111 -1.24e+00,-1.40e+00,+1.27e+01,+1.29e+01 2 -57 - O: 2 170 22 -1.22e-02,-1.70e-02,+7.27e-02,+7.56e-02 1 (nil) - 171 22 -1.22e+00,-1.38e+00,+1.27e+01,+1.28e+01 1 (nil) + O: 2 170 22 -1.22e-02,-1.70e-02,+7.27e-02,+7.56e-02 1 + 171 22 -1.22e+00,-1.38e+00,+1.27e+01,+1.28e+01 1 Vertex: -58 ID: 0 (X,cT)=+7.51e-05,-8.77e-05,+2.93e-03,+2.94e-03 I: 1 109 111 +3.20e-01,-3.73e-01,+1.25e+01,+1.25e+01 2 -58 - O: 2 172 22 +3.26e-01,-3.46e-01,+1.21e+01,+1.21e+01 1 (nil) - 173 22 -6.46e-03,-2.66e-02,+3.50e-01,+3.51e-01 1 (nil) + O: 2 172 22 +3.26e-01,-3.46e-01,+1.21e+01,+1.21e+01 1 + 173 22 -6.46e-03,-2.66e-02,+3.50e-01,+3.51e-01 1 Vertex: -59 ID: 0 (X,cT)=+1.45e-06,+3.84e-06,+8.70e-05,+8.71e-05 I: 1 111 111 +1.52e-01,+4.04e-01,+9.17e+00,+9.18e+00 2 -59 - O: 2 174 22 -2.15e-02,+1.49e-02,+4.86e-01,+4.86e-01 1 (nil) - 175 22 +1.74e-01,+3.89e-01,+8.68e+00,+8.69e+00 1 (nil) + O: 2 174 22 -2.15e-02,+1.49e-02,+4.86e-01,+4.86e-01 1 + 175 22 +1.74e-01,+3.89e-01,+8.68e+00,+8.69e+00 1 Vertex: -60 ID: 0 (X,cT)=+1.34e-05,+7.65e-06,+1.14e-03,+1.14e-03 I: 1 114 111 +1.09e-01,+6.20e-02,+9.26e+00,+9.26e+00 2 -60 - O: 2 176 22 -1.64e-02,+4.04e-02,+4.24e+00,+4.24e+00 1 (nil) - 177 22 +1.25e-01,+2.17e-02,+5.02e+00,+5.02e+00 1 (nil) + O: 2 176 22 -1.64e-02,+4.04e-02,+4.24e+00,+4.24e+00 1 + 177 22 +1.25e-01,+2.17e-02,+5.02e+00,+5.02e+00 1 Vertex: -61 ID: 0 (X,cT)=+1.85e-05,+1.29e-05,+2.43e-03,+2.43e-03 I: 1 116 111 +3.77e-01,+2.64e-01,+4.98e+01,+4.98e+01 2 -61 - O: 2 178 22 +1.08e-01,+2.89e-02,+7.90e+00,+7.91e+00 1 (nil) - 179 22 +2.70e-01,+2.35e-01,+4.19e+01,+4.19e+01 1 (nil) + O: 2 178 22 +1.08e-01,+2.89e-02,+7.90e+00,+7.91e+00 1 + 179 22 +2.70e-01,+2.35e-01,+4.19e+01,+4.19e+01 1 Vertex: -62 ID: 0 (X,cT)=+5.58e-05,-5.89e-06,+1.31e-02,+1.31e-02 I: 1 124 111 +5.28e-01,-5.58e-02,+1.24e+02,+1.24e+02 2 -62 - O: 2 180 22 +2.10e-01,+4.29e-02,+4.58e+01,+4.58e+01 1 (nil) - 181 22 +3.18e-01,-9.86e-02,+7.82e+01,+7.82e+01 1 (nil) + O: 2 180 22 +2.10e-01,+4.29e-02,+4.58e+01,+4.58e+01 1 + 181 22 +3.18e-01,-9.86e-02,+7.82e+01,+7.82e+01 1 Vertex: -63 ID: 0 (X,cT)=-7.71e-06,-8.34e-06,+5.03e-03,+5.03e-03 I: 1 127 111 -1.66e-02,-1.80e-02,+1.09e+01,+1.09e+01 2 -63 - O: 2 182 22 -6.61e-02,-4.57e-02,+6.07e+00,+6.07e+00 1 (nil) - 183 22 +4.94e-02,+2.77e-02,+4.78e+00,+4.78e+00 1 (nil) + O: 2 182 22 -6.61e-02,-4.57e-02,+6.07e+00,+6.07e+00 1 + 183 22 +4.94e-02,+2.77e-02,+4.78e+00,+4.78e+00 1 Vertex: -64 ID: 0 (X,cT)=+1.66e-05,-7.99e-07,+3.86e-03,+3.86e-03 I: 1 129 111 +2.45e-01,-1.18e-02,+5.70e+01,+5.70e+01 2 -64 - O: 2 184 22 +1.69e-01,+5.36e-02,+3.26e+01,+3.26e+01 1 (nil) - 185 22 +7.62e-02,-6.54e-02,+2.44e+01,+2.44e+01 1 (nil) + O: 2 184 22 +1.69e-01,+5.36e-02,+3.26e+01,+3.26e+01 1 + 185 22 +7.62e-02,-6.54e-02,+2.44e+01,+2.44e+01 1 Vertex: -65 ID: 0 (X,cT)=+7.56e+00,-3.28e+00,+4.14e+03,+4.14e+03 I: 1 130 310 +6.88e-02,-2.98e-02,+3.77e+01,+3.77e+01 2 -65 - O: 2 186 211 +1.58e-01,-6.43e-02,+3.22e+01,+3.22e+01 1 (nil) - 187 -211 -8.94e-02,+3.44e-02,+5.50e+00,+5.50e+00 1 (nil) + O: 2 186 211 +1.58e-01,-6.43e-02,+3.22e+01,+3.22e+01 1 + 187 -211 -8.94e-02,+3.44e-02,+5.50e+00,+5.50e+00 1 Vertex: -66 ID: 0 (X,cT)=+2.53e-06,+8.21e-07,+2.23e-05,+2.25e-05 I: 1 135 111 +2.91e-01,+9.43e-02,+2.56e+00,+2.58e+00 2 -66 - O: 2 188 22 +1.27e-02,-2.62e-02,+3.17e-01,+3.18e-01 1 (nil) - 189 22 +2.78e-01,+1.20e-01,+2.24e+00,+2.26e+00 1 (nil) + O: 2 188 22 +1.27e-02,-2.62e-02,+3.17e-01,+3.18e-01 1 + 189 22 +2.78e-01,+1.20e-01,+2.24e+00,+2.26e+00 1 Vertex: -67 ID: 0 (X,cT)=+1.37e-04,-1.19e-04,+6.70e-03,+6.70e-03 I: 1 137 111 +1.93e-01,-1.69e-01,+9.48e+00,+9.49e+00 2 -67 - O: 2 190 22 +3.61e-04,+4.27e-04,-3.17e-04,+6.42e-04 1 (nil) - 191 22 +1.93e-01,-1.69e-01,+9.49e+00,+9.49e+00 1 (nil) + O: 2 190 22 +3.61e-04,+4.27e-04,-3.17e-04,+6.42e-04 1 + 191 22 +1.93e-01,-1.69e-01,+9.49e+00,+9.49e+00 1 GenVertex: -68 ID: 0 (X,cT):0 I: 1 139 311 -4.56e-02,-1.94e-01,+1.85e+00,+1.93e+00 2 -68 O: 1 192 310 -4.56e-02,-1.94e-01,+1.85e+00,+1.93e+00 2 -76 @@ -433,46 +543,53 @@ GenVertex: -69 ID: 0 (X,cT):0 O: 1 193 310 -1.02e-01,-3.76e-01,+2.53e-01,+6.81e-01 2 -77 Vertex: -70 ID: 0 (X,cT)=+5.44e+00,-2.22e+00,-5.83e+01,+6.79e+01 I: 1 145 310 +7.90e-02,-3.23e-02,-8.47e-01,+9.86e-01 2 -70 - O: 2 194 211 +3.78e-02,+1.72e-01,-5.70e-01,+6.12e-01 1 (nil) - 195 -211 +4.12e-02,-2.04e-01,-2.77e-01,+3.74e-01 1 (nil) + O: 2 194 211 +3.78e-02,+1.72e-01,-5.70e-01,+6.12e-01 1 + 195 -211 +4.12e-02,-2.04e-01,-2.77e-01,+3.74e-01 1 Vertex: -71 ID: 0 (X,cT)=+8.77e-06,+3.01e-05,-4.27e-04,+4.30e-04 I: 1 150 111 +4.20e-02,+1.44e-01,-2.05e+00,+2.06e+00 2 -71 - O: 2 196 22 +2.27e-02,+1.42e-01,-1.05e+00,+1.06e+00 1 (nil) - 197 22 +1.93e-02,+2.42e-03,-9.95e-01,+9.95e-01 1 (nil) + O: 2 196 22 +2.27e-02,+1.42e-01,-1.05e+00,+1.06e+00 1 + 197 22 +1.93e-02,+2.42e-03,-9.95e-01,+9.95e-01 1 Vertex: -72 ID: 0 (X,cT)=-6.15e-05,-5.48e-05,-3.58e-01,+3.58e-01 I: 1 156 111 -1.45e-01,-1.29e-01,-8.42e+02,+8.42e+02 2 -72 - O: 2 198 22 -1.62e-01,-1.30e-01,-6.73e+02,+6.73e+02 1 (nil) - 199 22 +1.77e-02,+1.35e-03,-1.69e+02,+1.69e+02 1 (nil) + O: 2 198 22 -1.62e-01,-1.30e-01,-6.73e+02,+6.73e+02 1 + 199 22 +1.77e-02,+1.35e-03,-1.69e+02,+1.69e+02 1 Vertex: -73 ID: 0 (X,cT)=+1.59e-06,+8.76e-07,-3.37e-06,+3.89e-06 I: 1 159 111 +3.33e-01,+1.83e-01,-7.05e-01,+8.13e-01 2 -73 - O: 2 200 22 +1.34e-01,+3.84e-02,-1.48e-01,+2.03e-01 1 (nil) - 201 22 +1.99e-01,+1.45e-01,-5.58e-01,+6.10e-01 1 (nil) + O: 2 200 22 +1.34e-01,+3.84e-02,-1.48e-01,+2.03e-01 1 + 201 22 +1.99e-01,+1.45e-01,-5.58e-01,+6.10e-01 1 GenVertex: -74 ID: 0 (X,cT):0 I: 1 160 -311 -2.82e-02,+5.68e-01,-5.71e+00,+5.76e+00 2 -74 O: 1 202 310 -2.82e-02,+5.68e-01,-5.71e+00,+5.76e+00 2 -78 Vertex: -75 ID: 0 (X,cT)=-2.71e-05,+3.62e-05,-3.25e-04,+3.28e-04 I: 1 161 111 -5.98e-01,+7.99e-01,-7.16e+00,+7.23e+00 2 -75 - O: 2 203 22 -4.61e-01,+6.62e-01,-6.07e+00,+6.13e+00 1 (nil) - 204 22 -1.37e-01,+1.37e-01,-1.09e+00,+1.10e+00 1 (nil) + O: 2 203 22 -4.61e-01,+6.62e-01,-6.07e+00,+6.13e+00 1 + 204 22 -1.37e-01,+1.37e-01,-1.09e+00,+1.10e+00 1 Vertex: -76 ID: 0 (X,cT)=-2.44e+00,-1.04e+01,+9.94e+01,+1.04e+02 I: 1 192 310 -4.56e-02,-1.94e-01,+1.85e+00,+1.93e+00 2 -76 - O: 2 205 -211 -6.12e-02,+7.90e-02,+2.98e-01,+3.44e-01 1 (nil) - 206 211 +1.56e-02,-2.73e-01,+1.56e+00,+1.59e+00 1 (nil) + O: 2 205 -211 -6.12e-02,+7.90e-02,+2.98e-01,+3.44e-01 1 + 206 211 +1.56e-02,-2.73e-01,+1.56e+00,+1.59e+00 1 Vertex: -77 ID: 0 (X,cT)=-1.49e+01,-5.46e+01,+3.68e+01,+9.90e+01 I: 1 193 310 -1.02e-01,-3.76e-01,+2.53e-01,+6.81e-01 2 -77 - O: 2 207 -211 -2.41e-01,-3.27e-01,+1.77e-01,+4.65e-01 1 (nil) - 208 211 +1.38e-01,-4.84e-02,+7.57e-02,+2.16e-01 1 (nil) + O: 2 207 -211 -2.41e-01,-3.27e-01,+1.77e-01,+4.65e-01 1 + 208 211 +1.38e-01,-4.84e-02,+7.57e-02,+2.16e-01 1 Vertex: -78 ID: 0 (X,cT)=-1.33e-01,+2.68e+00,-2.69e+01,+2.71e+01 I: 1 202 310 -2.82e-02,+5.68e-01,-5.71e+00,+5.76e+00 2 -78 - O: 2 209 211 +5.42e-02,+4.89e-01,-5.04e+00,+5.07e+00 1 (nil) - 210 -211 -8.24e-02,+7.87e-02,-6.67e-01,+6.91e-01 1 (nil) + O: 2 209 211 +5.42e-02,+4.89e-01,-5.04e+00,+5.07e+00 1 + 210 -211 -8.24e-02,+7.87e-02,-6.67e-01,+6.91e-01 1 ________________________________________________________________________________ Print out hit information ------------------------------------------ -*** Muon System Hit (#hits=3) -E1 : e- : pT=0.00117 : TOF=28.3 : x=(-0.279,1.77,-7.9) -E0 : pi+ : pT=3.22 : TOF=26.6 : x=(-0.175,-1.01,7.9) -E0 : mu+ : pT=52 : TOF=27.2 : x=(-0.96,1.78,7.9) +*** Muon System Hit (#hits=10) +E0 : pi+ : pT=0.139 : TOF=27.3 : x=(-0.214,-1.45,7.9) +E0 : e- : pT=0.000553 : TOF=29.8 : x=(1.86,0.407,7.9) +E1 : e- : pT=0.000991 : TOF=28.7 : x=(-0.81,-0.78,-7.9) +E0 : pi- : pT=0.0424 : TOF=30 : x=(-1.19,-1.24,7.9) +E0 : pi+ : pT=0.0881 : TOF=27 : x=(-0.215,-1.52,7.9) +E0 : pi- : pT=0.472 : TOF=26.9 : x=(0.169,-1.5,7.9) +E1 : proton : pT=1.4 : TOF=30.5 : x=(-0.567,-3.97,-7.9) +E0 : pi+ : pT=3.22 : TOF=26.6 : x=(-0.174,-1.01,7.9) +E0 : pi+ : pT=0.38 : TOF=26.8 : x=(-1.31,0.622,7.9) +E0 : mu+ : pT=52.3 : TOF=27.2 : x=(-0.962,1.78,7.9) ________________________________________________________________________________ GenEvent: #2 ID=20 SignalProcessGenVertex Barcode: 0 @@ -480,39 +597,39 @@ GenEvent: #2 ID=20 SignalProcessGenVertex Barcode: 0 Entries this event: 224 vertices, 624 particles. RndmState(0)= Wgts(0)= - EventScale -1 GeV alphaQCD=-1 alphaQED=-1 + EventScale -1 [energy] alphaQCD=-1 alphaQED=-1 GenParticle Legend Barcode PDG ID ( Px, Py, Pz, E ) Stat DecayVtx ________________________________________________________________________________ GenVertex: -1 ID: 0 (X,cT):0 I: 1 1 2212 +0.00e+00,+0.00e+00,+7.00e+03,+7.00e+03 3 -1 O: 3 3 21 +2.24e-03,-3.47e-01,+8.58e+00,+8.58e+00 3 -3 - 13 1 -1.60e-01,+2.55e-01,+4.51e+02,+4.51e+02 2 -9 41 2203 +1.57e-01,+9.19e-02,+4.12e+03,+4.12e+03 2 -13 + 13 1 -1.60e-01,+2.55e-01,+4.51e+02,+4.51e+02 2 -9 GenVertex: -2 ID: 0 (X,cT):0 I: 1 2 2212 +0.00e+00,+0.00e+00,-7.00e+03,+7.00e+03 3 -2 O: 2 4 1 +1.81e-01,-9.21e-01,-1.91e+03,+1.91e+03 3 -4 39 2203 -1.81e-01,+9.21e-01,-4.33e+03,+4.33e+03 2 -11 GenVertex: -3 ID: 0 (X,cT):0 I: 1 3 21 +2.24e-03,-3.47e-01,+8.58e+00,+8.58e+00 3 -3 - O: 8 5 -2 -1.22e+01,+1.16e+00,-1.11e+01,+1.65e+01 3 -5 + O: 8 16 21 +3.32e-02,+9.61e-02,-6.60e-02,+1.21e-01 2 -11 + 5 -2 -1.22e+01,+1.16e+00,-1.11e+01,+1.65e+01 3 -5 11 -4 +1.95e+00,-1.06e+00,-8.18e+00,+8.61e+00 2 -9 12 21 +1.85e+00,+6.48e+00,-3.61e+01,+3.67e+01 2 -9 14 4 +1.07e+01,-5.18e+00,-2.71e+01,+2.96e+01 2 -11 - 16 21 +3.32e-02,+9.61e-02,-6.60e-02,+1.21e-01 2 -11 17 21 -3.76e-02,-1.65e-01,-9.73e-01,+9.88e-01 2 -11 15 21 +3.52e-01,-6.45e-01,-1.11e+00,+1.33e+00 2 -11 40 2 -5.76e-01,-2.17e+00,+2.82e+00,+3.62e+00 2 -13 GenVertex: -4 ID: 0 (X,cT):0 I: 1 4 1 +1.81e-01,-9.21e-01,-1.91e+03,+1.91e+03 3 -4 - O:12 6 1 -1.04e+01,-7.53e+00,-8.52e+02,+8.53e+02 3 -5 - 28 21 +8.30e-01,+1.28e+00,-3.84e+01,+3.84e+01 2 -11 + O:12 28 21 +8.30e-01,+1.28e+00,-3.84e+01,+3.84e+01 2 -11 29 21 +1.45e+00,+3.41e+00,-3.48e+01,+3.50e+01 2 -11 30 21 +4.75e+00,+5.08e+00,-7.07e+01,+7.11e+01 2 -11 31 21 +7.05e+00,+5.30e+00,-7.09e+01,+7.14e+01 2 -11 32 21 +6.43e-05,-2.87e-01,-2.01e+00,+2.03e+00 2 -11 33 21 -2.01e+00,+1.84e-01,-1.00e+02,+1.00e+02 2 -11 34 21 -1.92e+00,-1.52e+00,-2.29e+02,+2.29e+02 2 -11 + 6 1 -1.04e+01,-7.53e+00,-8.52e+02,+8.53e+02 3 -5 35 21 -3.17e+00,-1.74e+00,-8.38e+01,+8.39e+01 2 -11 36 21 -3.72e-01,-3.53e+00,-1.09e+02,+1.09e+02 2 -11 37 21 -3.12e-01,+2.46e-01,-7.86e+01,+7.86e+01 2 -11 @@ -524,18 +641,18 @@ GenVertex: -5 ID: 0 (X,cT):0 8 -24 -9.28e+00,+1.71e+00,-7.59e+02,+7.64e+02 3 -7 GenVertex: -6 ID: 0 (X,cT):0 I: 1 7 22 -1.33e+01,-8.08e+00,-1.04e+02,+1.05e+02 3 -6 - O: 1 9 22 -1.33e+01,-8.08e+00,-1.04e+02,+1.05e+02 1 (nil) + O: 1 9 22 -1.33e+01,-8.08e+00,-1.04e+02,+1.05e+02 1 GenVertex: -7 ID: 0 (X,cT):0 I: 1 8 -24 -9.28e+00,+1.71e+00,-7.59e+02,+7.64e+02 3 -7 O: 1 10 -24 -9.28e+00,+1.71e+00,-7.59e+02,+7.64e+02 2 -8 GenVertex: -8 ID: 0 (X,cT):0 I: 1 10 -24 -9.28e+00,+1.71e+00,-7.59e+02,+7.64e+02 2 -8 - O: 6 46 21 +2.59e+00,-1.54e+00,-4.01e+01,+4.02e+01 2 -15 - 47 3 +2.49e+01,-1.94e+01,-3.48e+02,+3.50e+02 2 -15 + O: 6 45 21 +9.29e-01,-5.25e-01,-8.27e+00,+8.34e+00 2 -15 42 -4 -3.64e+01,+2.35e+01,-3.49e+02,+3.52e+02 2 -15 43 21 -1.27e+00,-7.35e-02,-1.13e+01,+1.14e+01 2 -15 44 21 -4.16e-02,-2.47e-01,-1.97e+00,+1.98e+00 2 -15 - 45 21 +9.29e-01,-5.25e-01,-8.27e+00,+8.34e+00 2 -15 + 46 21 +2.59e+00,-1.54e+00,-4.01e+01,+4.02e+01 2 -15 + 47 3 +2.49e+01,-1.94e+01,-3.48e+02,+3.50e+02 2 -15 GenVertex: -9 ID: 0 (X,cT):0 I: 3 13 1 -1.60e-01,+2.55e-01,+4.51e+02,+4.51e+02 2 -9 11 -4 +1.95e+00,-1.06e+00,-8.18e+00,+8.61e+00 2 -9 @@ -543,15 +660,9 @@ GenVertex: -9 ID: 0 (X,cT):0 O: 1 52 92 +3.65e+00,+5.68e+00,+4.07e+02,+4.96e+02 2 -10 GenVertex: -10 ID: 0 (X,cT):0 I: 1 52 92 +3.65e+00,+5.68e+00,+4.07e+02,+4.96e+02 2 -10 - O:17 61 313 -7.71e-02,+3.71e-01,+6.58e-01,+1.14e+00 2 -29 - 62 213 -3.58e-01,-1.85e-01,+2.02e-01,+7.59e-01 2 -30 + O:17 60 -323 -1.01e-01,+5.65e-03,+1.73e-01,+8.22e-01 2 -28 63 221 +5.37e-01,+2.24e-01,+7.68e+00,+7.72e+00 2 -31 - 64 -213 -3.57e-01,-2.47e-01,+4.39e+00,+4.44e+00 2 -32 - 65 211 -9.70e-03,-2.00e-01,+9.73e-01,+1.00e+00 1 (nil) - 66 -213 +3.60e-01,-1.91e-02,+2.45e+01,+2.45e+01 2 -33 - 67 113 -3.73e-01,+1.18e-02,+3.83e+01,+3.84e+01 2 -34 - 68 113 -9.06e-02,+1.63e-01,+1.67e+02,+1.67e+02 2 -35 - 69 221 +1.73e-01,+4.07e-01,+2.06e+02,+2.06e+02 2 -36 + 65 211 -9.70e-03,-2.00e-01,+9.73e-01,+1.00e+00 1 53 -423 +1.80e+00,-7.41e-01,-9.90e+00,+1.03e+01 2 -21 54 -323 +5.03e-01,+1.51e+00,-6.41e+00,+6.67e+00 2 -22 55 313 +6.48e-01,+1.70e+00,-1.25e+01,+1.27e+01 2 -23 @@ -559,180 +670,186 @@ GenVertex: -10 ID: 0 (X,cT):0 57 223 +8.27e-03,+4.69e-01,-5.55e+00,+5.62e+00 2 -25 58 213 +1.90e-01,+8.19e-01,-3.63e+00,+3.80e+00 2 -26 59 223 +4.76e-01,+3.30e-01,-1.30e+00,+1.62e+00 2 -27 - 60 -323 -1.01e-01,+5.65e-03,+1.73e-01,+8.22e-01 2 -28 + 61 313 -7.71e-02,+3.71e-01,+6.58e-01,+1.14e+00 2 -29 + 62 213 -3.58e-01,-1.85e-01,+2.02e-01,+7.59e-01 2 -30 + 64 -213 -3.57e-01,-2.47e-01,+4.39e+00,+4.44e+00 2 -32 + 66 -213 +3.60e-01,-1.91e-02,+2.45e+01,+2.45e+01 2 -33 + 67 113 -3.73e-01,+1.18e-02,+3.83e+01,+3.84e+01 2 -34 + 68 113 -9.06e-02,+1.63e-01,+1.67e+02,+1.67e+02 2 -35 + 69 221 +1.73e-01,+4.07e-01,+2.06e+02,+2.06e+02 2 -36 GenVertex: -11 ID: 0 (X,cT):0 - I:26 23 21 -1.76e+00,-3.29e+00,+9.66e+00,+1.04e+01 2 -11 - 24 21 -4.37e+00,-6.72e+00,+8.76e-01,+8.07e+00 2 -11 - 25 21 -2.35e+00,-1.77e+00,-4.88e+00,+5.70e+00 2 -11 - 26 21 +1.76e+00,+3.29e+00,-4.65e+00,+5.96e+00 2 -11 - 27 21 +2.35e+00,+1.77e+00,-7.28e+02,+7.28e+02 2 -11 - 19 21 -3.91e+00,+3.13e+00,+7.89e+02,+7.89e+02 2 -11 - 20 21 +3.89e+00,+1.90e+00,+1.42e+03,+1.42e+03 2 -11 - 21 21 +4.37e+00,+6.72e+00,+8.31e+01,+8.35e+01 2 -11 - 22 21 +3.91e+00,-3.13e+00,+3.66e+01,+3.69e+01 2 -11 - 18 21 -3.89e+00,-1.90e+00,+4.34e+01,+4.36e+01 2 -11 - 39 2203 -1.81e-01,+9.21e-01,-4.33e+03,+4.33e+03 2 -11 - 14 4 +1.07e+01,-5.18e+00,-2.71e+01,+2.96e+01 2 -11 - 16 21 +3.32e-02,+9.61e-02,-6.60e-02,+1.21e-01 2 -11 - 17 21 -3.76e-02,-1.65e-01,-9.73e-01,+9.88e-01 2 -11 - 15 21 +3.52e-01,-6.45e-01,-1.11e+00,+1.33e+00 2 -11 - 28 21 +8.30e-01,+1.28e+00,-3.84e+01,+3.84e+01 2 -11 + I:26 28 21 +8.30e-01,+1.28e+00,-3.84e+01,+3.84e+01 2 -11 29 21 +1.45e+00,+3.41e+00,-3.48e+01,+3.50e+01 2 -11 30 21 +4.75e+00,+5.08e+00,-7.07e+01,+7.11e+01 2 -11 31 21 +7.05e+00,+5.30e+00,-7.09e+01,+7.14e+01 2 -11 32 21 +6.43e-05,-2.87e-01,-2.01e+00,+2.03e+00 2 -11 33 21 -2.01e+00,+1.84e-01,-1.00e+02,+1.00e+02 2 -11 34 21 -1.92e+00,-1.52e+00,-2.29e+02,+2.29e+02 2 -11 + 16 21 +3.32e-02,+9.61e-02,-6.60e-02,+1.21e-01 2 -11 + 39 2203 -1.81e-01,+9.21e-01,-4.33e+03,+4.33e+03 2 -11 + 14 4 +1.07e+01,-5.18e+00,-2.71e+01,+2.96e+01 2 -11 + 17 21 -3.76e-02,-1.65e-01,-9.73e-01,+9.88e-01 2 -11 + 15 21 +3.52e-01,-6.45e-01,-1.11e+00,+1.33e+00 2 -11 + 26 21 +1.76e+00,+3.29e+00,-4.65e+00,+5.96e+00 2 -11 + 21 21 +4.37e+00,+6.72e+00,+8.31e+01,+8.35e+01 2 -11 35 21 -3.17e+00,-1.74e+00,-8.38e+01,+8.39e+01 2 -11 36 21 -3.72e-01,-3.53e+00,-1.09e+02,+1.09e+02 2 -11 37 21 -3.12e-01,+2.46e-01,-7.86e+01,+7.86e+01 2 -11 38 21 +2.18e+00,-6.98e-01,-1.55e+02,+1.55e+02 2 -11 + 23 21 -1.76e+00,-3.29e+00,+9.66e+00,+1.04e+01 2 -11 + 24 21 -4.37e+00,-6.72e+00,+8.76e-01,+8.07e+00 2 -11 + 25 21 -2.35e+00,-1.77e+00,-4.88e+00,+5.70e+00 2 -11 + 27 21 +2.35e+00,+1.77e+00,-7.28e+02,+7.28e+02 2 -11 + 19 21 -3.91e+00,+3.13e+00,+7.89e+02,+7.89e+02 2 -11 + 20 21 +3.89e+00,+1.90e+00,+1.42e+03,+1.42e+03 2 -11 + 22 21 +3.91e+00,-3.13e+00,+3.66e+01,+3.69e+01 2 -11 + 18 21 -3.89e+00,-1.90e+00,+4.34e+01,+4.36e+01 2 -11 O: 1 70 92 +1.93e+01,+2.76e+00,-3.69e+03,+8.47e+03 2 -12 GenVertex: -12 ID: 0 (X,cT):0 I: 1 70 92 +1.93e+01,+2.76e+00,-3.69e+03,+8.47e+03 2 -12 - O:90 136 -211 +1.82e+00,+1.89e+00,-2.77e+01,+2.78e+01 1 (nil) - 137 111 +7.22e-01,+1.16e+00,-1.29e+01,+1.29e+01 2 -85 - 138 113 +1.21e+00,+1.68e+00,-1.89e+01,+1.90e+01 2 -86 - 139 211 +1.12e+00,+5.04e-01,-1.16e+01,+1.17e+01 1 (nil) - 140 -213 +4.58e-01,+1.15e+00,-1.84e+01,+1.85e+01 2 -87 - 141 213 +2.08e+00,+1.68e+00,-2.61e+01,+2.63e+01 2 -88 - 142 313 +1.78e+00,+1.24e+00,-2.26e+01,+2.27e+01 2 -89 - 143 -313 +1.42e+00,+6.47e-01,-1.81e+01,+1.82e+01 2 -90 - 144 2112 -1.12e+00,+5.37e-01,-5.10e+01,+5.10e+01 1 (nil) - 145 -213 -5.75e-01,-4.78e-01,-9.45e+01,+9.45e+01 2 -91 - 146 -1114 -8.04e-01,-7.43e-01,-3.40e+01,+3.40e+01 2 -92 - 147 -213 -1.80e-01,+6.29e-02,-4.32e+01,+4.32e+01 2 -93 - 148 211 -1.19e+00,-2.34e-01,-3.93e+01,+3.93e+01 1 (nil) - 149 311 -1.41e+00,-2.18e+00,-7.90e+01,+7.90e+01 2 -94 - 150 -323 -3.04e-01,-3.92e-01,-7.88e+01,+7.88e+01 2 -95 - 151 213 -1.80e+00,-1.21e+00,-8.93e+01,+8.94e+01 2 -96 - 152 113 +4.91e-01,-9.72e-01,-5.04e+01,+5.05e+01 2 -97 - 153 221 +2.67e-01,-2.61e-01,-2.16e+01,+2.16e+01 2 -98 - 154 311 +4.13e-01,+1.80e-01,-8.91e+01,+8.91e+01 2 -99 - 155 -321 +3.69e-01,-3.68e-01,-5.25e+01,+5.25e+01 1 (nil) - 156 221 -4.10e-01,-2.74e-01,-4.88e+01,+4.88e+01 2 -100 - 157 211 +7.13e-01,-3.28e-01,-1.35e+02,+1.35e+02 1 (nil) - 158 113 -8.56e-01,+4.51e-01,-3.86e+02,+3.86e+02 2 -101 - 159 -211 +8.50e-01,-2.44e-01,-2.40e+03,+2.40e+03 1 (nil) - 160 2224 -1.90e-03,+7.51e-01,-1.39e+03,+1.39e+03 2 -102 - 71 423 +6.74e+00,-3.13e+00,-1.81e+01,+1.96e+01 2 -37 - 72 213 +1.08e+00,-6.60e-01,-2.31e+00,+2.70e+00 2 -38 + O:90 158 113 -8.56e-01,+4.51e-01,-3.86e+02,+3.86e+02 2 -101 73 331 +8.84e-01,-9.17e-01,-1.33e+00,+2.07e+00 2 -39 74 -213 +1.67e+00,-6.02e-01,-4.33e+00,+4.71e+00 2 -40 - 75 111 -2.29e-01,-5.45e-02,-1.11e+00,+1.15e+00 2 -41 - 76 211 +1.91e-01,-3.77e-01,+3.30e-01,+5.54e-01 1 (nil) - 77 -211 +2.15e-01,+4.10e-01,+1.16e-01,+4.98e-01 1 (nil) - 78 211 +1.18e-01,-7.30e-01,-1.31e+00,+1.51e+00 1 (nil) - 79 3112 -1.25e-01,-5.92e-02,+4.02e+00,+4.19e+00 2 -42 + 78 211 +1.18e-01,-7.30e-01,-1.31e+00,+1.51e+00 1 80 311 -1.08e-01,-3.01e-02,+1.70e+00,+1.77e+00 2 -43 + 86 223 -7.42e-02,+1.42e-01,+1.52e+01,+1.52e+01 2 -47 + 94 111 +7.06e-01,+3.83e-01,+1.68e+02,+1.68e+02 2 -54 + 99 -213 +9.75e-01,+2.54e+00,+3.20e+01,+3.22e+01 2 -59 + 103 -211 -1.88e-01,-1.28e-01,+3.87e+00,+3.88e+00 1 + 106 333 +8.72e-02,-2.03e+00,+7.62e+00,+7.95e+00 2 -64 + 115 -213 -9.95e-01,-3.87e-01,-1.11e+00,+1.63e+00 2 -71 + 122 213 +6.99e-01,+4.88e-01,-2.14e+00,+2.37e+00 2 -74 + 157 211 +7.13e-01,-3.28e-01,-1.35e+02,+1.35e+02 1 + 159 -211 +8.50e-01,-2.44e-01,-2.40e+03,+2.40e+03 1 + 160 2224 -1.90e-03,+7.51e-01,-1.39e+03,+1.39e+03 2 -102 + 71 423 +6.74e+00,-3.13e+00,-1.81e+01,+1.96e+01 2 -37 + 127 -2112 +1.08e-01,+9.33e-02,-7.63e+01,+7.63e+01 1 + 72 213 +1.08e+00,-6.60e-01,-2.31e+00,+2.70e+00 2 -38 + 132 223 +3.02e-01,+2.43e-01,-3.21e+01,+3.21e+01 2 -81 + 75 111 -2.29e-01,-5.45e-02,-1.11e+00,+1.15e+00 2 -41 + 76 211 +1.91e-01,-3.77e-01,+3.30e-01,+5.54e-01 1 + 77 -211 +2.15e-01,+4.10e-01,+1.16e-01,+4.98e-01 1 + 79 3112 -1.25e-01,-5.92e-02,+4.02e+00,+4.19e+00 2 -42 81 -1114 -5.93e-01,-4.62e-01,+7.53e+00,+7.69e+00 2 -44 - 82 -211 -3.95e-01,+3.08e-01,+9.39e+00,+9.40e+00 1 (nil) - 83 211 -3.13e-01,-7.22e-01,+8.53e+00,+8.56e+00 1 (nil) + 137 111 +7.22e-01,+1.16e+00,-1.29e+01,+1.29e+01 2 -85 + 82 -211 -3.95e-01,+3.08e-01,+9.39e+00,+9.40e+00 1 + 138 113 +1.21e+00,+1.68e+00,-1.89e+01,+1.90e+01 2 -86 + 83 211 -3.13e-01,-7.22e-01,+8.53e+00,+8.56e+00 1 84 -213 -1.27e-01,-1.01e-01,+5.15e+00,+5.19e+00 2 -45 85 213 -1.20e+00,-1.22e-01,+2.34e+01,+2.35e+01 2 -46 - 86 223 -7.42e-02,+1.42e-01,+1.52e+01,+1.52e+01 2 -47 + 139 211 +1.12e+00,+5.04e-01,-1.16e+01,+1.17e+01 1 87 -213 -9.01e-01,-6.04e-01,+2.49e+01,+2.49e+01 2 -48 88 323 -3.96e-01,+4.77e-01,+8.35e+01,+8.35e+01 2 -49 89 -313 -1.18e+00,+4.38e-01,+2.34e+02,+2.34e+02 2 -50 90 111 -2.10e-02,+1.47e-01,+2.20e+01,+2.20e+01 2 -51 91 -213 -1.47e+00,+1.82e+00,+3.92e+02,+3.92e+02 2 -52 92 213 +1.75e+00,+1.50e+00,+6.91e+02,+6.91e+02 2 -53 - 93 -211 -8.94e-02,-3.08e-01,+1.41e+02,+1.41e+02 1 (nil) - 94 111 +7.06e-01,+3.83e-01,+1.68e+02,+1.68e+02 2 -54 + 93 -211 -8.94e-02,-3.08e-01,+1.41e+02,+1.41e+02 1 95 223 +1.83e-01,+6.58e-01,+2.64e+02,+2.64e+02 2 -55 96 113 +1.17e+00,-6.49e-01,+1.09e+02,+1.09e+02 2 -56 97 213 -3.59e-02,+9.92e-01,+3.73e+01,+3.74e+01 2 -57 + 146 -1114 -8.04e-01,-7.43e-01,-3.40e+01,+3.40e+01 2 -92 98 221 +4.22e-01,+3.30e-01,+8.56e+00,+8.60e+00 2 -58 - 99 -213 +9.75e-01,+2.54e+00,+3.20e+01,+3.22e+01 2 -59 100 111 +1.28e+00,+5.91e-01,+1.83e+01,+1.84e+01 2 -60 101 331 +1.59e+00,+2.22e+00,+3.03e+01,+3.04e+01 2 -61 102 213 +1.77e+00,-1.58e+00,+1.71e+01,+1.73e+01 2 -62 - 103 -211 -1.88e-01,-1.28e-01,+3.87e+00,+3.88e+00 1 (nil) - 104 211 +6.95e-01,-7.43e-02,+2.83e+00,+2.91e+00 1 (nil) + 104 211 +6.95e-01,-7.43e-02,+2.83e+00,+2.91e+00 1 105 311 +6.37e-01,-2.90e-01,+6.13e+00,+6.19e+00 2 -63 - 106 333 +8.72e-02,-2.03e+00,+7.62e+00,+7.95e+00 2 -64 107 -323 -1.98e-01,-1.55e-01,+2.64e+00,+2.79e+00 2 -65 108 113 -1.10e+00,-1.90e+00,+5.32e+00,+5.81e+00 2 -66 109 213 -7.23e-01,-7.70e-01,+6.13e-01,+1.63e+00 2 -67 - 110 -211 -4.35e-01,-8.15e-01,+1.78e-01,+9.51e-01 1 (nil) + 110 -211 -4.35e-01,-8.15e-01,+1.78e-01,+9.51e-01 1 111 213 -5.97e-01,-1.22e+00,+2.67e-01,+1.55e+00 2 -68 - 112 -211 -1.43e+00,-1.65e+00,+4.83e-01,+2.24e+00 1 (nil) + 112 -211 -1.43e+00,-1.65e+00,+4.83e-01,+2.24e+00 1 113 111 +4.36e-02,-2.43e-01,+6.27e-02,+2.89e-01 2 -69 114 213 -1.15e+00,-1.72e+00,-2.01e+00,+2.97e+00 2 -70 - 115 -213 -9.95e-01,-3.87e-01,-1.11e+00,+1.63e+00 2 -71 - 116 321 +3.64e-01,+4.39e-01,+9.92e-02,+7.61e-01 1 (nil) - 117 -321 -1.27e-01,-1.02e+00,-1.45e+00,+1.85e+00 1 (nil) - 118 211 -2.01e-01,+3.58e-01,-1.79e+00,+1.84e+00 1 (nil) + 116 321 +3.64e-01,+4.39e-01,+9.92e-02,+7.61e-01 1 + 117 -321 -1.27e-01,-1.02e+00,-1.45e+00,+1.85e+00 1 + 118 211 -2.01e-01,+3.58e-01,-1.79e+00,+1.84e+00 1 119 311 -2.88e-01,+7.23e-01,-1.33e+00,+1.62e+00 2 -72 - 120 -321 +1.03e-01,-1.31e-01,-8.45e-01,+9.93e-01 1 (nil) + 120 -321 +1.03e-01,-1.31e-01,-8.45e-01,+9.93e-01 1 121 113 -2.01e-02,+9.67e-01,-2.76e+00,+3.05e+00 2 -73 - 122 213 +6.99e-01,+4.88e-01,-2.14e+00,+2.37e+00 2 -74 123 223 +1.59e-01,-2.33e-01,-7.42e+00,+7.46e+00 2 -75 124 223 -3.07e-01,+5.68e-01,-1.77e+01,+1.77e+01 2 -76 125 1114 +7.70e-01,-3.47e-01,-1.94e+02,+1.94e+02 2 -77 126 111 +6.52e-01,+1.56e+00,-1.11e+02,+1.11e+02 2 -78 - 127 -2112 +1.08e-01,+9.33e-02,-7.63e+01,+7.63e+01 1 (nil) - 128 211 +3.93e-01,-4.83e-01,-5.97e+01,+5.97e+01 1 (nil) - 129 -211 -4.91e-02,+3.02e-01,-5.27e+01,+5.27e+01 1 (nil) + 128 211 +3.93e-01,-4.83e-01,-5.97e+01,+5.97e+01 1 + 129 -211 -4.91e-02,+3.02e-01,-5.27e+01,+5.27e+01 1 130 113 +7.74e-01,+8.64e-01,-8.89e+01,+8.89e+01 2 -79 131 223 +1.70e-02,+2.83e-01,-9.69e+01,+9.69e+01 2 -80 - 132 223 +3.02e-01,+2.43e-01,-3.21e+01,+3.21e+01 2 -81 133 221 +6.52e-01,-1.30e-02,-7.49e+00,+7.53e+00 2 -82 134 213 +1.25e+00,+2.45e+00,-3.91e+01,+3.93e+01 2 -83 135 221 +8.86e-01,+9.16e-01,-1.24e+01,+1.25e+01 2 -84 + 136 -211 +1.82e+00,+1.89e+00,-2.77e+01,+2.78e+01 1 + 155 -321 +3.69e-01,-3.68e-01,-5.25e+01,+5.25e+01 1 + 140 -213 +4.58e-01,+1.15e+00,-1.84e+01,+1.85e+01 2 -87 + 141 213 +2.08e+00,+1.68e+00,-2.61e+01,+2.63e+01 2 -88 + 142 313 +1.78e+00,+1.24e+00,-2.26e+01,+2.27e+01 2 -89 + 143 -313 +1.42e+00,+6.47e-01,-1.81e+01,+1.82e+01 2 -90 + 144 2112 -1.12e+00,+5.37e-01,-5.10e+01,+5.10e+01 1 + 145 -213 -5.75e-01,-4.78e-01,-9.45e+01,+9.45e+01 2 -91 + 147 -213 -1.80e-01,+6.29e-02,-4.32e+01,+4.32e+01 2 -93 + 148 211 -1.19e+00,-2.34e-01,-3.93e+01,+3.93e+01 1 + 149 311 -1.41e+00,-2.18e+00,-7.90e+01,+7.90e+01 2 -94 + 150 -323 -3.04e-01,-3.92e-01,-7.88e+01,+7.88e+01 2 -95 + 151 213 -1.80e+00,-1.21e+00,-8.93e+01,+8.94e+01 2 -96 + 152 113 +4.91e-01,-9.72e-01,-5.04e+01,+5.05e+01 2 -97 + 153 221 +2.67e-01,-2.61e-01,-2.16e+01,+2.16e+01 2 -98 + 154 311 +4.13e-01,+1.80e-01,-8.91e+01,+8.91e+01 2 -99 + 156 221 -4.10e-01,-2.74e-01,-4.88e+01,+4.88e+01 2 -100 GenVertex: -13 ID: 0 (X,cT):0 I: 2 41 2203 +1.57e-01,+9.19e-02,+4.12e+03,+4.12e+03 2 -13 40 2 -5.76e-01,-2.17e+00,+2.82e+00,+3.62e+00 2 -13 O: 1 161 92 -4.19e-01,-2.08e+00,+4.13e+03,+4.13e+03 2 -14 GenVertex: -14 ID: 0 (X,cT):0 I: 1 161 92 -4.19e-01,-2.08e+00,+4.13e+03,+4.13e+03 2 -14 - O:14 162 211 -3.13e-01,-1.66e+00,+2.96e+00,+3.41e+00 1 (nil) + O:14 162 211 -3.13e-01,-1.66e+00,+2.96e+00,+3.41e+00 1 163 223 -1.35e-02,+1.05e-01,+2.90e+00,+3.01e+00 2 -103 164 -213 -7.67e-02,-1.58e-01,+2.83e+00,+2.94e+00 2 -104 165 113 -3.96e-01,-2.46e-01,+7.66e+00,+7.72e+00 2 -105 166 223 +8.97e-02,-2.51e-02,+1.83e+01,+1.83e+01 2 -106 167 331 +7.92e-02,-2.14e-01,+1.65e+01,+1.65e+01 2 -107 - 168 211 +1.55e-01,-4.55e-02,+2.09e+01,+2.09e+01 1 (nil) + 168 211 +1.55e-01,-4.55e-02,+2.09e+01,+2.09e+01 1 169 113 -9.07e-02,+1.70e-01,+7.69e+00,+7.71e+00 2 -108 - 170 -211 +1.96e-02,-3.42e-02,+4.36e+00,+4.36e+00 1 (nil) - 171 211 +1.50e-01,-7.36e-02,+6.14e+01,+6.14e+01 1 (nil) + 170 -211 +1.96e-02,-3.42e-02,+4.36e+00,+4.36e+00 1 + 171 211 +1.50e-01,-7.36e-02,+6.14e+01,+6.14e+01 1 172 313 -9.79e-02,+5.68e-01,+7.20e+01,+7.20e+01 2 -109 173 -313 -1.30e-01,-7.96e-01,+2.37e+02,+2.37e+02 2 -110 - 174 2112 +5.28e-01,-1.88e-01,+1.06e+03,+1.06e+03 1 (nil) - 175 211 -3.22e-01,+5.25e-01,+2.61e+03,+2.61e+03 1 (nil) + 174 2112 +5.28e-01,-1.88e-01,+1.06e+03,+1.06e+03 1 + 175 211 -3.22e-01,+5.25e-01,+2.61e+03,+2.61e+03 1 GenVertex: -15 ID: 0 (X,cT):0 - I: 6 46 21 +2.59e+00,-1.54e+00,-4.01e+01,+4.02e+01 2 -15 - 47 3 +2.49e+01,-1.94e+01,-3.48e+02,+3.50e+02 2 -15 + I: 6 45 21 +9.29e-01,-5.25e-01,-8.27e+00,+8.34e+00 2 -15 42 -4 -3.64e+01,+2.35e+01,-3.49e+02,+3.52e+02 2 -15 43 21 -1.27e+00,-7.35e-02,-1.13e+01,+1.14e+01 2 -15 44 21 -4.16e-02,-2.47e-01,-1.97e+00,+1.98e+00 2 -15 - 45 21 +9.29e-01,-5.25e-01,-8.27e+00,+8.34e+00 2 -15 + 46 21 +2.59e+00,-1.54e+00,-4.01e+01,+4.02e+01 2 -15 + 47 3 +2.49e+01,-1.94e+01,-3.48e+02,+3.50e+02 2 -15 O: 1 176 92 -9.28e+00,+1.71e+00,-7.59e+02,+7.64e+02 2 -16 GenVertex: -16 ID: 0 (X,cT):0 I: 1 176 92 -9.28e+00,+1.71e+00,-7.59e+02,+7.64e+02 2 -16 O:10 177 -411 -2.64e+01,+1.68e+01,-2.54e+02,+2.56e+02 2 -111 - 178 -2112 -3.30e+00,+1.95e+00,-3.12e+01,+3.14e+01 1 (nil) - 179 2112 -3.69e+00,+2.38e+00,-3.47e+01,+3.50e+01 1 (nil) + 178 -2112 -3.30e+00,+1.95e+00,-3.12e+01,+3.14e+01 1 + 179 2112 -3.69e+00,+2.38e+00,-3.47e+01,+3.50e+01 1 180 -313 -1.69e+00,+9.52e-01,-1.93e+01,+1.94e+01 2 -112 181 323 -1.07e+00,+1.14e+00,-1.19e+01,+1.20e+01 2 -113 182 -323 -1.04e+00,-2.43e-02,-1.56e+01,+1.57e+01 2 -114 - 183 321 +9.73e-01,-7.75e-01,-1.20e+01,+1.21e+01 1 (nil) + 183 321 +9.73e-01,-7.75e-01,-1.20e+01,+1.21e+01 1 184 113 +9.16e+00,-6.89e+00,-1.32e+02,+1.32e+02 2 -115 185 111 +1.57e+00,-1.44e+00,-2.40e+01,+2.41e+01 2 -116 - 186 -321 +1.62e+01,-1.24e+01,-2.25e+02,+2.26e+02 1 (nil) + 186 -321 +1.62e+01,-1.24e+01,-2.25e+02,+2.26e+02 1 GenVertex: -17 ID: 0 (X,cT):0 I: 2 48 3 +2.68e+00,-2.13e+00,-4.93e+00,+6.00e+00 2 -17 49 -3 -2.68e+00,+2.13e+00,+2.54e+01,+2.56e+01 2 -17 O: 1 187 92 +0.00e+00,+0.00e+00,+2.05e+01,+3.16e+01 2 -18 GenVertex: -18 ID: 0 (X,cT):0 I: 1 187 92 +0.00e+00,+0.00e+00,+2.05e+01,+3.16e+01 2 -18 - O:11 188 -321 +2.32e+00,-1.47e+00,-3.73e+00,+4.66e+00 1 (nil) + O:11 188 -321 +2.32e+00,-1.47e+00,-3.73e+00,+4.66e+00 1 189 213 -1.88e-01,-4.78e-01,-1.86e-02,+8.02e-01 2 -117 - 190 -211 +5.28e-01,-6.99e-02,+3.78e-01,+6.68e-01 1 (nil) + 190 -211 +5.28e-01,-6.99e-02,+3.78e-01,+6.68e-01 1 191 213 -1.69e-01,+6.66e-02,+1.66e+00,+1.95e+00 2 -118 192 113 -7.42e-01,+4.97e-01,+2.71e+00,+2.94e+00 2 -119 193 -213 +2.70e-02,+3.31e-01,+2.97e-01,+7.93e-01 2 -120 - 194 211 -6.87e-03,-3.65e-01,+8.22e-01,+9.10e-01 1 (nil) + 194 211 -6.87e-03,-3.65e-01,+8.22e-01,+9.10e-01 1 195 113 -1.79e-01,+4.58e-01,+4.36e+00,+4.46e+00 2 -121 196 -213 -8.75e-02,+1.16e-01,+1.21e+00,+1.46e+00 2 -122 197 323 -7.63e-01,+6.20e-01,+7.15e+00,+7.28e+00 2 -123 @@ -755,66 +872,66 @@ GenVertex: -21 ID: 0 (X,cT):0 GenVertex: -22 ID: 0 (X,cT):0 I: 1 54 -323 +5.03e-01,+1.51e+00,-6.41e+00,+6.67e+00 2 -22 O: 2 207 -311 +3.84e-01,+6.75e-01,-2.32e+00,+2.49e+00 2 -132 - 208 -211 +1.19e-01,+8.35e-01,-4.09e+00,+4.18e+00 1 (nil) + 208 -211 +1.19e-01,+8.35e-01,-4.09e+00,+4.18e+00 1 GenVertex: -23 ID: 0 (X,cT):0 I: 1 55 313 +6.48e-01,+1.70e+00,-1.25e+01,+1.27e+01 2 -23 O: 2 209 311 +4.92e-01,+1.67e+00,-1.03e+01,+1.05e+01 2 -133 210 111 +1.56e-01,+3.28e-02,-2.20e+00,+2.21e+00 2 -134 GenVertex: -24 ID: 0 (X,cT):0 I: 1 56 113 +3.14e-01,+1.06e+00,-3.82e+00,+4.04e+00 2 -24 - O: 2 211 -211 +2.07e-01,-7.41e-03,-8.44e-01,+8.80e-01 1 (nil) - 212 211 +1.07e-01,+1.07e+00,-2.97e+00,+3.16e+00 1 (nil) + O: 2 211 -211 +2.07e-01,-7.41e-03,-8.44e-01,+8.80e-01 1 + 212 211 +1.07e-01,+1.07e+00,-2.97e+00,+3.16e+00 1 GenVertex: -25 ID: 0 (X,cT):0 I: 1 57 223 +8.27e-03,+4.69e-01,-5.55e+00,+5.62e+00 2 -25 - O: 3 213 211 +1.65e-01,+9.37e-02,-1.12e+00,+1.14e+00 1 (nil) - 214 -211 -3.30e-02,+9.79e-02,-3.21e+00,+3.22e+00 1 (nil) + O: 3 213 211 +1.65e-01,+9.37e-02,-1.12e+00,+1.14e+00 1 + 214 -211 -3.30e-02,+9.79e-02,-3.21e+00,+3.22e+00 1 215 111 -1.24e-01,+2.78e-01,-1.22e+00,+1.26e+00 2 -135 GenVertex: -26 ID: 0 (X,cT):0 I: 1 58 213 +1.90e-01,+8.19e-01,-3.63e+00,+3.80e+00 2 -26 - O: 2 216 211 +2.62e-01,+8.26e-01,-2.45e+00,+2.61e+00 1 (nil) + O: 2 216 211 +2.62e-01,+8.26e-01,-2.45e+00,+2.61e+00 1 217 111 -7.15e-02,-6.31e-03,-1.18e+00,+1.19e+00 2 -136 GenVertex: -27 ID: 0 (X,cT):0 I: 1 59 223 +4.76e-01,+3.30e-01,-1.30e+00,+1.62e+00 2 -27 - O: 3 218 -211 +1.28e-01,-6.04e-02,-2.75e-01,+3.39e-01 1 (nil) - 219 211 +2.00e-01,+3.04e-01,-9.82e-01,+1.06e+00 1 (nil) - 220 111 +1.49e-01,+8.68e-02,-4.65e-02,+2.24e-01 2 -137 + O: 3 220 111 +1.49e-01,+8.68e-02,-4.65e-02,+2.24e-01 2 -137 + 218 -211 +1.28e-01,-6.04e-02,-2.75e-01,+3.39e-01 1 + 219 211 +2.00e-01,+3.04e-01,-9.82e-01,+1.06e+00 1 GenVertex: -28 ID: 0 (X,cT):0 I: 1 60 -323 -1.01e-01,+5.65e-03,+1.73e-01,+8.22e-01 2 -28 - O: 2 221 -311 -8.28e-02,+1.40e-01,+2.87e-01,+5.97e-01 2 -138 - 222 -211 -1.84e-02,-1.34e-01,-1.14e-01,+2.25e-01 1 (nil) + O: 2 222 -211 -1.84e-02,-1.34e-01,-1.14e-01,+2.25e-01 1 + 221 -311 -8.28e-02,+1.40e-01,+2.87e-01,+5.97e-01 2 -138 GenVertex: -29 ID: 0 (X,cT):0 I: 1 61 313 -7.71e-02,+3.71e-01,+6.58e-01,+1.14e+00 2 -29 - O: 2 223 321 -1.86e-02,+1.84e-02,+1.85e-01,+5.28e-01 1 (nil) - 224 -211 -5.85e-02,+3.52e-01,+4.73e-01,+6.09e-01 1 (nil) + O: 2 224 -211 -5.85e-02,+3.52e-01,+4.73e-01,+6.09e-01 1 + 223 321 -1.86e-02,+1.84e-02,+1.85e-01,+5.28e-01 1 GenVertex: -30 ID: 0 (X,cT):0 I: 1 62 213 -3.58e-01,-1.85e-01,+2.02e-01,+7.59e-01 2 -30 - O: 2 225 211 +1.06e-01,-2.99e-02,+1.77e-01,+2.51e-01 1 (nil) + O: 2 225 211 +1.06e-01,-2.99e-02,+1.77e-01,+2.51e-01 1 226 111 -4.64e-01,-1.55e-01,+2.53e-02,+5.08e-01 2 -139 GenVertex: -31 ID: 0 (X,cT):0 I: 1 63 221 +5.37e-01,+2.24e-01,+7.68e+00,+7.72e+00 2 -31 - O: 3 227 22 +9.24e-02,+1.22e-01,+1.51e+00,+1.52e+00 1 (nil) - 228 -211 +1.64e-01,-1.14e-01,+3.22e+00,+3.23e+00 1 (nil) - 229 211 +2.81e-01,+2.16e-01,+2.94e+00,+2.97e+00 1 (nil) + O: 3 227 22 +9.24e-02,+1.22e-01,+1.51e+00,+1.52e+00 1 + 228 -211 +1.64e-01,-1.14e-01,+3.22e+00,+3.23e+00 1 + 229 211 +2.81e-01,+2.16e-01,+2.94e+00,+2.97e+00 1 GenVertex: -32 ID: 0 (X,cT):0 I: 1 64 -213 -3.57e-01,-2.47e-01,+4.39e+00,+4.44e+00 2 -32 - O: 2 230 -211 -3.46e-01,-7.92e-02,+3.34e+00,+3.37e+00 1 (nil) + O: 2 230 -211 -3.46e-01,-7.92e-02,+3.34e+00,+3.37e+00 1 231 111 -1.13e-02,-1.68e-01,+1.05e+00,+1.07e+00 2 -140 GenVertex: -33 ID: 0 (X,cT):0 I: 1 66 -213 +3.60e-01,-1.91e-02,+2.45e+01,+2.45e+01 2 -33 - O: 2 232 -211 +2.45e-01,+2.11e-01,+2.06e+01,+2.06e+01 1 (nil) + O: 2 232 -211 +2.45e-01,+2.11e-01,+2.06e+01,+2.06e+01 1 233 111 +1.15e-01,-2.30e-01,+3.89e+00,+3.90e+00 2 -141 GenVertex: -34 ID: 0 (X,cT):0 I: 1 67 113 -3.73e-01,+1.18e-02,+3.83e+01,+3.84e+01 2 -34 - O: 2 234 -211 +1.07e-02,+2.95e-01,+1.86e+01,+1.86e+01 1 (nil) - 235 211 -3.83e-01,-2.83e-01,+1.98e+01,+1.98e+01 1 (nil) + O: 2 234 -211 +1.07e-02,+2.95e-01,+1.86e+01,+1.86e+01 1 + 235 211 -3.83e-01,-2.83e-01,+1.98e+01,+1.98e+01 1 GenVertex: -35 ID: 0 (X,cT):0 I: 1 68 113 -9.06e-02,+1.63e-01,+1.67e+02,+1.67e+02 2 -35 - O: 2 236 211 -2.00e-02,-2.69e-01,+6.04e+01,+6.04e+01 1 (nil) - 237 -211 -7.06e-02,+4.32e-01,+1.07e+02,+1.07e+02 1 (nil) + O: 2 236 211 -2.00e-02,-2.69e-01,+6.04e+01,+6.04e+01 1 + 237 -211 -7.06e-02,+4.32e-01,+1.07e+02,+1.07e+02 1 GenVertex: -36 ID: 0 (X,cT):0 I: 1 69 221 +1.73e-01,+4.07e-01,+2.06e+02,+2.06e+02 2 -36 - O: 3 238 211 +2.30e-02,+1.07e-01,+4.89e+01,+4.89e+01 1 (nil) - 239 -211 +1.52e-01,+2.49e-01,+1.36e+02,+1.36e+02 1 (nil) + O: 3 238 211 +2.30e-02,+1.07e-01,+4.89e+01,+4.89e+01 1 + 239 -211 +1.52e-01,+2.49e-01,+1.36e+02,+1.36e+02 1 240 111 -1.84e-03,+5.13e-02,+2.10e+01,+2.10e+01 2 -142 GenVertex: -37 ID: 0 (X,cT):0 I: 1 71 423 +6.74e+00,-3.13e+00,-1.81e+01,+1.96e+01 2 -37 @@ -822,85 +939,85 @@ GenVertex: -37 ID: 0 (X,cT):0 242 111 +4.94e-01,-2.63e-01,-1.28e+00,+1.40e+00 2 -144 GenVertex: -38 ID: 0 (X,cT):0 I: 1 72 213 +1.08e+00,-6.60e-01,-2.31e+00,+2.70e+00 2 -38 - O: 2 243 211 +2.70e-01,-4.65e-01,-9.32e-01,+1.08e+00 1 (nil) + O: 2 243 211 +2.70e-01,-4.65e-01,-9.32e-01,+1.08e+00 1 244 111 +8.10e-01,-1.96e-01,-1.38e+00,+1.62e+00 2 -145 GenVertex: -39 ID: 0 (X,cT):0 I: 1 73 331 +8.84e-01,-9.17e-01,-1.33e+00,+2.07e+00 2 -39 - O: 3 245 211 +4.27e-01,-3.13e-01,-3.45e-01,+6.47e-01 1 (nil) - 246 -211 +6.70e-02,-6.53e-02,-1.12e-01,+2.02e-01 1 (nil) + O: 3 245 211 +4.27e-01,-3.13e-01,-3.45e-01,+6.47e-01 1 + 246 -211 +6.70e-02,-6.53e-02,-1.12e-01,+2.02e-01 1 247 221 +3.89e-01,-5.39e-01,-8.71e-01,+1.22e+00 2 -146 GenVertex: -40 ID: 0 (X,cT):0 I: 1 74 -213 +1.67e+00,-6.02e-01,-4.33e+00,+4.71e+00 2 -40 - O: 2 248 -211 +8.95e-01,-3.43e-01,-1.67e+00,+1.93e+00 1 (nil) + O: 2 248 -211 +8.95e-01,-3.43e-01,-1.67e+00,+1.93e+00 1 249 111 +7.72e-01,-2.59e-01,-2.66e+00,+2.78e+00 2 -147 Vertex: -41 ID: 0 (X,cT)=-1.15e-05,-2.74e-06,-5.60e-05,+5.77e-05 I: 1 75 111 -2.29e-01,-5.45e-02,-1.11e+00,+1.15e+00 2 -41 - O: 2 250 22 -1.87e-01,-7.34e-02,-6.48e-01,+6.78e-01 1 (nil) - 251 22 -4.27e-02,+1.89e-02,-4.65e-01,+4.68e-01 1 (nil) + O: 2 250 22 -1.87e-01,-7.34e-02,-6.48e-01,+6.78e-01 1 + 251 22 -4.27e-02,+1.89e-02,-4.65e-01,+4.68e-01 1 Vertex: -42 ID: 0 (X,cT)=-9.58e+00,-4.54e+00,+3.08e+02,+3.22e+02 I: 1 79 3112 -1.25e-01,-5.92e-02,+4.02e+00,+4.19e+00 2 -42 - O: 2 252 2112 +2.35e-02,-7.71e-02,+3.69e+00,+3.81e+00 1 (nil) - 253 -211 -1.48e-01,+1.79e-02,+3.30e-01,+3.88e-01 1 (nil) + O: 2 252 2112 +2.35e-02,-7.71e-02,+3.69e+00,+3.81e+00 1 + 253 -211 -1.48e-01,+1.79e-02,+3.30e-01,+3.88e-01 1 GenVertex: -43 ID: 0 (X,cT):0 I: 1 80 311 -1.08e-01,-3.01e-02,+1.70e+00,+1.77e+00 2 -43 O: 1 254 310 -1.08e-01,-3.01e-02,+1.70e+00,+1.77e+00 2 -148 GenVertex: -44 ID: 0 (X,cT):0 I: 1 81 -1114 -5.93e-01,-4.62e-01,+7.53e+00,+7.69e+00 2 -44 - O: 2 255 -2112 -7.16e-01,-5.94e-01,+6.69e+00,+6.82e+00 1 (nil) - 256 211 +1.23e-01,+1.32e-01,+8.42e-01,+8.72e-01 1 (nil) + O: 2 255 -2112 -7.16e-01,-5.94e-01,+6.69e+00,+6.82e+00 1 + 256 211 +1.23e-01,+1.32e-01,+8.42e-01,+8.72e-01 1 GenVertex: -45 ID: 0 (X,cT):0 I: 1 84 -213 -1.27e-01,-1.01e-01,+5.15e+00,+5.19e+00 2 -45 - O: 2 257 -211 +1.09e-01,-2.00e-01,+3.92e+00,+3.93e+00 1 (nil) + O: 2 257 -211 +1.09e-01,-2.00e-01,+3.92e+00,+3.93e+00 1 258 111 -2.36e-01,+9.89e-02,+1.22e+00,+1.25e+00 2 -149 GenVertex: -46 ID: 0 (X,cT):0 I: 1 85 213 -1.20e+00,-1.22e-01,+2.34e+01,+2.35e+01 2 -46 - O: 2 259 211 -9.25e-02,+6.68e-02,+1.06e+00,+1.07e+00 1 (nil) + O: 2 259 211 -9.25e-02,+6.68e-02,+1.06e+00,+1.07e+00 1 260 111 -1.11e+00,-1.89e-01,+2.24e+01,+2.24e+01 2 -150 GenVertex: -47 ID: 0 (X,cT):0 I: 1 86 223 -7.42e-02,+1.42e-01,+1.52e+01,+1.52e+01 2 -47 - O: 3 261 211 -8.80e-02,-1.85e-01,+7.90e+00,+7.90e+00 1 (nil) - 262 -211 -9.38e-02,+7.23e-02,+3.34e+00,+3.35e+00 1 (nil) + O: 3 261 211 -8.80e-02,-1.85e-01,+7.90e+00,+7.90e+00 1 + 262 -211 -9.38e-02,+7.23e-02,+3.34e+00,+3.35e+00 1 263 111 +1.08e-01,+2.55e-01,+3.93e+00,+3.94e+00 2 -151 GenVertex: -48 ID: 0 (X,cT):0 I: 1 87 -213 -9.01e-01,-6.04e-01,+2.49e+01,+2.49e+01 2 -48 - O: 2 264 -211 -5.80e-01,-4.05e-01,+2.11e+01,+2.11e+01 1 (nil) + O: 2 264 -211 -5.80e-01,-4.05e-01,+2.11e+01,+2.11e+01 1 265 111 -3.21e-01,-1.99e-01,+3.80e+00,+3.82e+00 2 -152 GenVertex: -49 ID: 0 (X,cT):0 I: 1 88 323 -3.96e-01,+4.77e-01,+8.35e+01,+8.35e+01 2 -49 - O: 2 266 321 -2.79e-01,+6.38e-01,+6.43e+01,+6.43e+01 1 (nil) + O: 2 266 321 -2.79e-01,+6.38e-01,+6.43e+01,+6.43e+01 1 267 111 -1.18e-01,-1.61e-01,+1.92e+01,+1.92e+01 2 -153 GenVertex: -50 ID: 0 (X,cT):0 I: 1 89 -313 -1.18e+00,+4.38e-01,+2.34e+02,+2.34e+02 2 -50 - O: 2 268 -321 -8.94e-01,+2.08e-02,+1.54e+02,+1.54e+02 1 (nil) - 269 211 -2.85e-01,+4.17e-01,+8.01e+01,+8.01e+01 1 (nil) + O: 2 268 -321 -8.94e-01,+2.08e-02,+1.54e+02,+1.54e+02 1 + 269 211 -2.85e-01,+4.17e-01,+8.01e+01,+8.01e+01 1 Vertex: -51 ID: 0 (X,cT)=-6.60e-06,+4.63e-05,+6.91e-03,+6.91e-03 I: 1 90 111 -2.10e-02,+1.47e-01,+2.20e+01,+2.20e+01 2 -51 - O: 2 270 22 +3.30e-03,+1.38e-01,+2.13e+01,+2.13e+01 1 (nil) - 271 22 -2.43e-02,+9.55e-03,+7.24e-01,+7.25e-01 1 (nil) + O: 2 270 22 +3.30e-03,+1.38e-01,+2.13e+01,+2.13e+01 1 + 271 22 -2.43e-02,+9.55e-03,+7.24e-01,+7.25e-01 1 GenVertex: -52 ID: 0 (X,cT):0 I: 1 91 -213 -1.47e+00,+1.82e+00,+3.92e+02,+3.92e+02 2 -52 - O: 2 272 -211 -2.85e-01,+9.40e-01,+1.43e+02,+1.43e+02 1 (nil) + O: 2 272 -211 -2.85e-01,+9.40e-01,+1.43e+02,+1.43e+02 1 273 111 -1.19e+00,+8.85e-01,+2.49e+02,+2.49e+02 2 -154 GenVertex: -53 ID: 0 (X,cT):0 I: 1 92 213 +1.75e+00,+1.50e+00,+6.91e+02,+6.91e+02 2 -53 - O: 2 274 211 +1.79e+00,+1.29e+00,+6.18e+02,+6.18e+02 1 (nil) + O: 2 274 211 +1.79e+00,+1.29e+00,+6.18e+02,+6.18e+02 1 275 111 -3.94e-02,+2.10e-01,+7.29e+01,+7.29e+01 2 -155 Vertex: -54 ID: 0 (X,cT)=+1.07e-04,+5.79e-05,+2.54e-02,+2.54e-02 I: 1 94 111 +7.06e-01,+3.83e-01,+1.68e+02,+1.68e+02 2 -54 - O: 2 276 22 +2.50e-01,+1.51e-01,+4.86e+01,+4.86e+01 1 (nil) - 277 22 +4.56e-01,+2.32e-01,+1.20e+02,+1.20e+02 1 (nil) + O: 2 276 22 +2.50e-01,+1.51e-01,+4.86e+01,+4.86e+01 1 + 277 22 +4.56e-01,+2.32e-01,+1.20e+02,+1.20e+02 1 GenVertex: -55 ID: 0 (X,cT):0 I: 1 95 223 +1.83e-01,+6.58e-01,+2.64e+02,+2.64e+02 2 -55 - O: 3 278 211 +2.62e-01,+6.67e-02,+8.45e+01,+8.45e+01 1 (nil) - 279 -211 +3.03e-02,+5.27e-01,+1.40e+02,+1.40e+02 1 (nil) + O: 3 278 211 +2.62e-01,+6.67e-02,+8.45e+01,+8.45e+01 1 + 279 -211 +3.03e-02,+5.27e-01,+1.40e+02,+1.40e+02 1 280 111 -1.09e-01,+6.39e-02,+3.93e+01,+3.93e+01 2 -156 GenVertex: -56 ID: 0 (X,cT):0 I: 1 96 113 +1.17e+00,-6.49e-01,+1.09e+02,+1.09e+02 2 -56 - O: 2 281 -211 +1.05e+00,-3.90e-01,+9.92e+01,+9.92e+01 1 (nil) - 282 211 +1.20e-01,-2.59e-01,+1.03e+01,+1.03e+01 1 (nil) + O: 2 281 -211 +1.05e+00,-3.90e-01,+9.92e+01,+9.92e+01 1 + 282 211 +1.20e-01,-2.59e-01,+1.03e+01,+1.03e+01 1 GenVertex: -57 ID: 0 (X,cT):0 I: 1 97 213 -3.59e-02,+9.92e-01,+3.73e+01,+3.74e+01 2 -57 - O: 2 283 211 -1.62e-01,+3.10e-02,+2.19e+00,+2.20e+00 1 (nil) + O: 2 283 211 -1.62e-01,+3.10e-02,+2.19e+00,+2.20e+00 1 284 111 +1.27e-01,+9.61e-01,+3.52e+01,+3.52e+01 2 -157 GenVertex: -58 ID: 0 (X,cT):0 I: 1 98 221 +4.22e-01,+3.30e-01,+8.56e+00,+8.60e+00 2 -58 @@ -909,96 +1026,96 @@ GenVertex: -58 ID: 0 (X,cT):0 287 111 +5.73e-02,+1.07e-02,+3.27e+00,+3.27e+00 2 -160 GenVertex: -59 ID: 0 (X,cT):0 I: 1 99 -213 +9.75e-01,+2.54e+00,+3.20e+01,+3.22e+01 2 -59 - O: 2 288 -211 +5.56e-01,+1.36e+00,+1.23e+01,+1.24e+01 1 (nil) + O: 2 288 -211 +5.56e-01,+1.36e+00,+1.23e+01,+1.24e+01 1 289 111 +4.18e-01,+1.18e+00,+1.97e+01,+1.98e+01 2 -161 Vertex: -60 ID: 0 (X,cT)=+3.89e-05,+1.80e-05,+5.58e-04,+5.60e-04 I: 1 100 111 +1.28e+00,+5.91e-01,+1.83e+01,+1.84e+01 2 -60 - O: 2 290 22 +1.23e+00,+5.60e-01,+1.78e+01,+1.79e+01 1 (nil) - 291 22 +5.03e-02,+3.14e-02,+4.95e-01,+4.99e-01 1 (nil) + O: 2 290 22 +1.23e+00,+5.60e-01,+1.78e+01,+1.79e+01 1 + 291 22 +5.03e-02,+3.14e-02,+4.95e-01,+4.99e-01 1 GenVertex: -61 ID: 0 (X,cT):0 I: 1 101 331 +1.59e+00,+2.22e+00,+3.03e+01,+3.04e+01 2 -61 - O: 3 292 211 +3.32e-01,+2.48e-01,+4.45e+00,+4.47e+00 1 (nil) - 293 -211 +3.06e-01,+6.92e-01,+8.24e+00,+8.28e+00 1 (nil) + O: 3 292 211 +3.32e-01,+2.48e-01,+4.45e+00,+4.47e+00 1 + 293 -211 +3.06e-01,+6.92e-01,+8.24e+00,+8.28e+00 1 294 221 +9.56e-01,+1.28e+00,+1.76e+01,+1.77e+01 2 -162 GenVertex: -62 ID: 0 (X,cT):0 I: 1 102 213 +1.77e+00,-1.58e+00,+1.71e+01,+1.73e+01 2 -62 - O: 2 295 211 +8.03e-02,+2.02e-02,+5.69e-01,+5.92e-01 1 (nil) + O: 2 295 211 +8.03e-02,+2.02e-02,+5.69e-01,+5.92e-01 1 296 111 +1.69e+00,-1.60e+00,+1.65e+01,+1.67e+01 2 -163 GenVertex: -63 ID: 0 (X,cT):0 I: 1 105 311 +6.37e-01,-2.90e-01,+6.13e+00,+6.19e+00 2 -63 O: 1 297 310 +6.37e-01,-2.90e-01,+6.13e+00,+6.19e+00 2 -164 GenVertex: -64 ID: 0 (X,cT):0 I: 1 106 333 +8.72e-02,-2.03e+00,+7.62e+00,+7.95e+00 2 -64 - O: 2 298 130 +1.44e-01,-1.08e+00,+4.20e+00,+4.37e+00 1 (nil) + O: 2 298 130 +1.44e-01,-1.08e+00,+4.20e+00,+4.37e+00 1 299 310 -5.64e-02,-9.48e-01,+3.42e+00,+3.58e+00 2 -165 GenVertex: -65 ID: 0 (X,cT):0 I: 1 107 -323 -1.98e-01,-1.55e-01,+2.64e+00,+2.79e+00 2 -65 - O: 2 300 -321 -2.21e-01,+1.56e-01,+1.65e+00,+1.74e+00 1 (nil) + O: 2 300 -321 -2.21e-01,+1.56e-01,+1.65e+00,+1.74e+00 1 301 111 +2.32e-02,-3.11e-01,+9.92e-01,+1.05e+00 2 -166 GenVertex: -66 ID: 0 (X,cT):0 I: 1 108 113 -1.10e+00,-1.90e+00,+5.32e+00,+5.81e+00 2 -66 - O: 2 302 -211 -1.16e+00,-1.76e+00,+5.02e+00,+5.45e+00 1 (nil) - 303 211 +5.82e-02,-1.40e-01,+3.02e-01,+3.65e-01 1 (nil) + O: 2 302 -211 -1.16e+00,-1.76e+00,+5.02e+00,+5.45e+00 1 + 303 211 +5.82e-02,-1.40e-01,+3.02e-01,+3.65e-01 1 GenVertex: -67 ID: 0 (X,cT):0 I: 1 109 213 -7.23e-01,-7.70e-01,+6.13e-01,+1.63e+00 2 -67 - O: 2 304 211 +1.49e-03,+1.26e-01,-1.51e-01,+2.41e-01 1 (nil) + O: 2 304 211 +1.49e-03,+1.26e-01,-1.51e-01,+2.41e-01 1 305 111 -7.25e-01,-8.95e-01,+7.64e-01,+1.39e+00 2 -167 GenVertex: -68 ID: 0 (X,cT):0 I: 1 111 213 -5.97e-01,-1.22e+00,+2.67e-01,+1.55e+00 2 -68 - O: 2 306 211 +1.06e-01,-2.72e-01,-4.01e-02,+3.26e-01 1 (nil) + O: 2 306 211 +1.06e-01,-2.72e-01,-4.01e-02,+3.26e-01 1 307 111 -7.03e-01,-9.49e-01,+3.08e-01,+1.23e+00 2 -168 Vertex: -69 ID: 0 (X,cT)=+1.27e-05,-7.07e-05,+1.82e-05,+8.39e-05 I: 1 113 111 +4.36e-02,-2.43e-01,+6.27e-02,+2.89e-01 2 -69 - O: 2 308 22 +5.40e-02,-1.99e-02,+1.91e-02,+6.07e-02 1 (nil) - 309 22 -1.04e-02,-2.23e-01,+4.36e-02,+2.28e-01 1 (nil) + O: 2 308 22 +5.40e-02,-1.99e-02,+1.91e-02,+6.07e-02 1 + 309 22 -1.04e-02,-2.23e-01,+4.36e-02,+2.28e-01 1 GenVertex: -70 ID: 0 (X,cT):0 I: 1 114 213 -1.15e+00,-1.72e+00,-2.01e+00,+2.97e+00 2 -70 - O: 2 310 211 -4.37e-02,-6.49e-02,-3.59e-02,+1.64e-01 1 (nil) + O: 2 310 211 -4.37e-02,-6.49e-02,-3.59e-02,+1.64e-01 1 311 111 -1.10e+00,-1.65e+00,-1.97e+00,+2.80e+00 2 -169 GenVertex: -71 ID: 0 (X,cT):0 I: 1 115 -213 -9.95e-01,-3.87e-01,-1.11e+00,+1.63e+00 2 -71 - O: 2 312 -211 -7.40e-01,-4.72e-01,-9.20e-01,+1.28e+00 1 (nil) + O: 2 312 -211 -7.40e-01,-4.72e-01,-9.20e-01,+1.28e+00 1 313 111 -2.55e-01,+8.51e-02,-1.87e-01,+3.54e-01 2 -170 GenVertex: -72 ID: 0 (X,cT):0 I: 1 119 311 -2.88e-01,+7.23e-01,-1.33e+00,+1.62e+00 2 -72 O: 1 314 310 -2.88e-01,+7.23e-01,-1.33e+00,+1.62e+00 2 -171 GenVertex: -73 ID: 0 (X,cT):0 I: 1 121 113 -2.01e-02,+9.67e-01,-2.76e+00,+3.05e+00 2 -73 - O: 2 315 -211 -5.02e-03,+1.03e+00,-2.68e+00,+2.88e+00 1 (nil) - 316 211 -1.50e-02,-6.21e-02,-7.50e-02,+1.71e-01 1 (nil) + O: 2 315 -211 -5.02e-03,+1.03e+00,-2.68e+00,+2.88e+00 1 + 316 211 -1.50e-02,-6.21e-02,-7.50e-02,+1.71e-01 1 GenVertex: -74 ID: 0 (X,cT):0 I: 1 122 213 +6.99e-01,+4.88e-01,-2.14e+00,+2.37e+00 2 -74 - O: 2 317 211 +2.31e-01,+4.39e-01,-1.27e+00,+1.37e+00 1 (nil) + O: 2 317 211 +2.31e-01,+4.39e-01,-1.27e+00,+1.37e+00 1 318 111 +4.68e-01,+4.92e-02,-8.74e-01,+1.00e+00 2 -172 GenVertex: -75 ID: 0 (X,cT):0 I: 1 123 223 +1.59e-01,-2.33e-01,-7.42e+00,+7.46e+00 2 -75 - O: 2 319 -211 +2.57e-01,+5.62e-02,-5.93e+00,+5.93e+00 1 (nil) - 320 211 -9.87e-02,-2.90e-01,-1.49e+00,+1.53e+00 1 (nil) + O: 2 319 -211 +2.57e-01,+5.62e-02,-5.93e+00,+5.93e+00 1 + 320 211 -9.87e-02,-2.90e-01,-1.49e+00,+1.53e+00 1 GenVertex: -76 ID: 0 (X,cT):0 I: 1 124 223 -3.07e-01,+5.68e-01,-1.77e+01,+1.77e+01 2 -76 - O: 2 321 -211 -1.81e-01,+2.32e-01,-1.48e+01,+1.48e+01 1 (nil) - 322 211 -1.26e-01,+3.36e-01,-2.88e+00,+2.90e+00 1 (nil) + O: 2 321 -211 -1.81e-01,+2.32e-01,-1.48e+01,+1.48e+01 1 + 322 211 -1.26e-01,+3.36e-01,-2.88e+00,+2.90e+00 1 GenVertex: -77 ID: 0 (X,cT):0 I: 1 125 1114 +7.70e-01,-3.47e-01,-1.94e+02,+1.94e+02 2 -77 - O: 2 323 2112 +6.85e-01,-3.51e-01,-1.63e+02,+1.63e+02 1 (nil) - 324 -211 +8.47e-02,+3.52e-03,-3.06e+01,+3.06e+01 1 (nil) + O: 2 323 2112 +6.85e-01,-3.51e-01,-1.63e+02,+1.63e+02 1 + 324 -211 +8.47e-02,+3.52e-03,-3.06e+01,+3.06e+01 1 Vertex: -78 ID: 0 (X,cT)=+9.27e-06,+2.22e-05,-1.58e-03,+1.58e-03 I: 1 126 111 +6.52e-01,+1.56e+00,-1.11e+02,+1.11e+02 2 -78 - O: 2 325 22 +6.52e-01,+1.50e+00,-1.08e+02,+1.08e+02 1 (nil) - 326 22 -1.55e-04,+6.21e-02,-3.67e+00,+3.67e+00 1 (nil) + O: 2 325 22 +6.52e-01,+1.50e+00,-1.08e+02,+1.08e+02 1 + 326 22 -1.55e-04,+6.21e-02,-3.67e+00,+3.67e+00 1 GenVertex: -79 ID: 0 (X,cT):0 I: 1 130 113 +7.74e-01,+8.64e-01,-8.89e+01,+8.89e+01 2 -79 - O: 2 327 -211 +6.68e-01,+7.08e-01,-4.84e+01,+4.84e+01 1 (nil) - 328 211 +1.06e-01,+1.56e-01,-4.05e+01,+4.05e+01 1 (nil) + O: 2 327 -211 +6.68e-01,+7.08e-01,-4.84e+01,+4.84e+01 1 + 328 211 +1.06e-01,+1.56e-01,-4.05e+01,+4.05e+01 1 GenVertex: -80 ID: 0 (X,cT):0 I: 1 131 223 +1.70e-02,+2.83e-01,-9.69e+01,+9.69e+01 2 -80 - O: 3 329 211 -1.62e-01,+5.36e-02,-3.29e+01,+3.29e+01 1 (nil) - 330 -211 +6.38e-02,-3.43e-02,-4.30e+01,+4.30e+01 1 (nil) + O: 3 329 211 -1.62e-01,+5.36e-02,-3.29e+01,+3.29e+01 1 + 330 -211 +6.38e-02,-3.43e-02,-4.30e+01,+4.30e+01 1 331 111 +1.15e-01,+2.64e-01,-2.11e+01,+2.11e+01 2 -173 GenVertex: -81 ID: 0 (X,cT):0 I: 1 132 223 +3.02e-01,+2.43e-01,-3.21e+01,+3.21e+01 2 -81 - O: 3 332 -211 +5.67e-02,-4.99e-02,-1.78e+01,+1.78e+01 1 (nil) - 333 211 +8.54e-02,+2.91e-01,-8.16e+00,+8.17e+00 1 (nil) + O: 3 332 -211 +5.67e-02,-4.99e-02,-1.78e+01,+1.78e+01 1 + 333 211 +8.54e-02,+2.91e-01,-8.16e+00,+8.17e+00 1 334 111 +1.60e-01,+1.64e-03,-6.16e+00,+6.16e+00 2 -174 GenVertex: -82 ID: 0 (X,cT):0 I: 1 133 221 +6.52e-01,-1.30e-02,-7.49e+00,+7.53e+00 2 -82 @@ -1007,123 +1124,123 @@ GenVertex: -82 ID: 0 (X,cT):0 337 111 +4.06e-02,+5.17e-03,-1.02e+00,+1.02e+00 2 -177 GenVertex: -83 ID: 0 (X,cT):0 I: 1 134 213 +1.25e+00,+2.45e+00,-3.91e+01,+3.93e+01 2 -83 - O: 2 338 211 +6.58e-01,+5.66e-01,-1.72e+01,+1.72e+01 1 (nil) + O: 2 338 211 +6.58e-01,+5.66e-01,-1.72e+01,+1.72e+01 1 339 111 +5.88e-01,+1.89e+00,-2.20e+01,+2.20e+01 2 -178 GenVertex: -84 ID: 0 (X,cT):0 I: 1 135 221 +8.86e-01,+9.16e-01,-1.24e+01,+1.25e+01 2 -84 - O: 2 340 22 +6.66e-01,+6.36e-01,-6.31e+00,+6.38e+00 1 (nil) - 341 22 +2.20e-01,+2.80e-01,-6.11e+00,+6.12e+00 1 (nil) + O: 2 340 22 +6.66e-01,+6.36e-01,-6.31e+00,+6.38e+00 1 + 341 22 +2.20e-01,+2.80e-01,-6.11e+00,+6.12e+00 1 Vertex: -85 ID: 0 (X,cT)=+3.02e-04,+4.87e-04,-5.38e-03,+5.41e-03 I: 1 137 111 +7.22e-01,+1.16e+00,-1.29e+01,+1.29e+01 2 -85 - O: 2 342 22 +5.79e-02,+1.36e-01,-1.76e+00,+1.76e+00 1 (nil) - 343 22 +6.65e-01,+1.03e+00,-1.11e+01,+1.12e+01 1 (nil) + O: 2 342 22 +5.79e-02,+1.36e-01,-1.76e+00,+1.76e+00 1 + 343 22 +6.65e-01,+1.03e+00,-1.11e+01,+1.12e+01 1 GenVertex: -86 ID: 0 (X,cT):0 I: 1 138 113 +1.21e+00,+1.68e+00,-1.89e+01,+1.90e+01 2 -86 - O: 2 344 -211 +4.13e-01,+1.29e-01,-3.64e+00,+3.67e+00 1 (nil) - 345 211 +8.01e-01,+1.55e+00,-1.52e+01,+1.53e+01 1 (nil) + O: 2 344 -211 +4.13e-01,+1.29e-01,-3.64e+00,+3.67e+00 1 + 345 211 +8.01e-01,+1.55e+00,-1.52e+01,+1.53e+01 1 GenVertex: -87 ID: 0 (X,cT):0 I: 1 140 -213 +4.58e-01,+1.15e+00,-1.84e+01,+1.85e+01 2 -87 - O: 2 346 -211 +4.43e-01,+4.32e-01,-3.36e+00,+3.42e+00 1 (nil) + O: 2 346 -211 +4.43e-01,+4.32e-01,-3.36e+00,+3.42e+00 1 347 111 +1.51e-02,+7.22e-01,-1.51e+01,+1.51e+01 2 -179 GenVertex: -88 ID: 0 (X,cT):0 I: 1 141 213 +2.08e+00,+1.68e+00,-2.61e+01,+2.63e+01 2 -88 - O: 2 348 211 +2.03e+00,+1.63e+00,-2.51e+01,+2.52e+01 1 (nil) + O: 2 348 211 +2.03e+00,+1.63e+00,-2.51e+01,+2.52e+01 1 349 111 +5.56e-02,+5.31e-02,-1.06e+00,+1.07e+00 2 -180 GenVertex: -89 ID: 0 (X,cT):0 I: 1 142 313 +1.78e+00,+1.24e+00,-2.26e+01,+2.27e+01 2 -89 - O: 2 350 321 +5.53e-01,+4.44e-01,-6.45e+00,+6.51e+00 1 (nil) - 351 -211 +1.23e+00,+7.92e-01,-1.62e+01,+1.62e+01 1 (nil) + O: 2 350 321 +5.53e-01,+4.44e-01,-6.45e+00,+6.51e+00 1 + 351 -211 +1.23e+00,+7.92e-01,-1.62e+01,+1.62e+01 1 GenVertex: -90 ID: 0 (X,cT):0 I: 1 143 -313 +1.42e+00,+6.47e-01,-1.81e+01,+1.82e+01 2 -90 O: 2 352 -311 +4.98e-01,+5.10e-01,-7.52e+00,+7.57e+00 2 -181 353 111 +9.21e-01,+1.38e-01,-1.06e+01,+1.06e+01 2 -182 GenVertex: -91 ID: 0 (X,cT):0 I: 1 145 -213 -5.75e-01,-4.78e-01,-9.45e+01,+9.45e+01 2 -91 - O: 2 354 -211 -4.16e-01,-6.42e-04,-4.57e+01,+4.57e+01 1 (nil) + O: 2 354 -211 -4.16e-01,-6.42e-04,-4.57e+01,+4.57e+01 1 355 111 -1.59e-01,-4.77e-01,-4.88e+01,+4.88e+01 2 -183 GenVertex: -92 ID: 0 (X,cT):0 I: 1 146 -1114 -8.04e-01,-7.43e-01,-3.40e+01,+3.40e+01 2 -92 - O: 2 356 -2112 -5.09e-01,-4.51e-01,-2.85e+01,+2.85e+01 1 (nil) - 357 211 -2.95e-01,-2.92e-01,-5.48e+00,+5.50e+00 1 (nil) + O: 2 356 -2112 -5.09e-01,-4.51e-01,-2.85e+01,+2.85e+01 1 + 357 211 -2.95e-01,-2.92e-01,-5.48e+00,+5.50e+00 1 GenVertex: -93 ID: 0 (X,cT):0 I: 1 147 -213 -1.80e-01,+6.29e-02,-4.32e+01,+4.32e+01 2 -93 - O: 2 358 -211 -2.49e-01,+3.34e-01,-2.84e+01,+2.84e+01 1 (nil) + O: 2 358 -211 -2.49e-01,+3.34e-01,-2.84e+01,+2.84e+01 1 359 111 +6.89e-02,-2.71e-01,-1.49e+01,+1.49e+01 2 -184 GenVertex: -94 ID: 0 (X,cT):0 I: 1 149 311 -1.41e+00,-2.18e+00,-7.90e+01,+7.90e+01 2 -94 - O: 1 360 130 -1.41e+00,-2.18e+00,-7.90e+01,+7.90e+01 1 (nil) + O: 1 360 130 -1.41e+00,-2.18e+00,-7.90e+01,+7.90e+01 1 GenVertex: -95 ID: 0 (X,cT):0 I: 1 150 -323 -3.04e-01,-3.92e-01,-7.88e+01,+7.88e+01 2 -95 - O: 2 361 -321 -3.90e-02,+2.37e-02,-4.50e+01,+4.50e+01 1 (nil) + O: 2 361 -321 -3.90e-02,+2.37e-02,-4.50e+01,+4.50e+01 1 362 111 -2.65e-01,-4.16e-01,-3.38e+01,+3.38e+01 2 -185 GenVertex: -96 ID: 0 (X,cT):0 I: 1 151 213 -1.80e+00,-1.21e+00,-8.93e+01,+8.94e+01 2 -96 - O: 2 363 211 -1.88e+00,-1.09e+00,-8.20e+01,+8.20e+01 1 (nil) + O: 2 363 211 -1.88e+00,-1.09e+00,-8.20e+01,+8.20e+01 1 364 111 +7.55e-02,-1.18e-01,-7.35e+00,+7.36e+00 2 -186 GenVertex: -97 ID: 0 (X,cT):0 I: 1 152 113 +4.91e-01,-9.72e-01,-5.04e+01,+5.05e+01 2 -97 - O: 2 365 -211 +3.30e-01,-1.08e+00,-4.62e+01,+4.62e+01 1 (nil) - 366 211 +1.61e-01,+1.05e-01,-4.23e+00,+4.23e+00 1 (nil) + O: 2 365 -211 +3.30e-01,-1.08e+00,-4.62e+01,+4.62e+01 1 + 366 211 +1.61e-01,+1.05e-01,-4.23e+00,+4.23e+00 1 GenVertex: -98 ID: 0 (X,cT):0 I: 1 153 221 +2.67e-01,-2.61e-01,-2.16e+01,+2.16e+01 2 -98 - O: 2 367 22 -1.53e-01,-5.63e-02,-3.12e+00,+3.12e+00 1 (nil) - 368 22 +4.20e-01,-2.04e-01,-1.84e+01,+1.85e+01 1 (nil) + O: 2 367 22 -1.53e-01,-5.63e-02,-3.12e+00,+3.12e+00 1 + 368 22 +4.20e-01,-2.04e-01,-1.84e+01,+1.85e+01 1 GenVertex: -99 ID: 0 (X,cT):0 I: 1 154 311 +4.13e-01,+1.80e-01,-8.91e+01,+8.91e+01 2 -99 - O: 1 369 130 +4.13e-01,+1.80e-01,-8.91e+01,+8.91e+01 1 (nil) + O: 1 369 130 +4.13e-01,+1.80e-01,-8.91e+01,+8.91e+01 1 GenVertex: -100 ID: 0 (X,cT):0 I: 1 156 221 -4.10e-01,-2.74e-01,-4.88e+01,+4.88e+01 2 -100 - O: 3 370 211 -2.54e-01,-1.08e-01,-2.26e+01,+2.26e+01 1 (nil) - 371 -211 -9.47e-02,-7.03e-02,-6.26e+00,+6.26e+00 1 (nil) + O: 3 370 211 -2.54e-01,-1.08e-01,-2.26e+01,+2.26e+01 1 + 371 -211 -9.47e-02,-7.03e-02,-6.26e+00,+6.26e+00 1 372 111 -6.13e-02,-9.53e-02,-1.99e+01,+1.99e+01 2 -187 GenVertex: -101 ID: 0 (X,cT):0 I: 1 158 113 -8.56e-01,+4.51e-01,-3.86e+02,+3.86e+02 2 -101 - O: 2 373 211 -5.66e-01,+1.70e-01,-3.23e+02,+3.23e+02 1 (nil) - 374 -211 -2.90e-01,+2.81e-01,-6.32e+01,+6.32e+01 1 (nil) + O: 2 373 211 -5.66e-01,+1.70e-01,-3.23e+02,+3.23e+02 1 + 374 -211 -2.90e-01,+2.81e-01,-6.32e+01,+6.32e+01 1 GenVertex: -102 ID: 0 (X,cT):0 I: 1 160 2224 -1.90e-03,+7.51e-01,-1.39e+03,+1.39e+03 2 -102 - O: 2 375 2212 +9.56e-04,+8.62e-01,-1.17e+03,+1.17e+03 1 (nil) - 376 211 -2.86e-03,-1.12e-01,-2.17e+02,+2.17e+02 1 (nil) + O: 2 375 2212 +9.56e-04,+8.62e-01,-1.17e+03,+1.17e+03 1 + 376 211 -2.86e-03,-1.12e-01,-2.17e+02,+2.17e+02 1 GenVertex: -103 ID: 0 (X,cT):0 I: 1 163 223 -1.35e-02,+1.05e-01,+2.90e+00,+3.01e+00 2 -103 - O: 3 377 -211 +6.98e-02,+4.75e-02,+2.34e+00,+2.34e+00 1 (nil) - 378 211 -3.36e-03,-3.94e-02,+1.39e-01,+2.01e-01 1 (nil) + O: 3 377 -211 +6.98e-02,+4.75e-02,+2.34e+00,+2.34e+00 1 + 378 211 -3.36e-03,-3.94e-02,+1.39e-01,+2.01e-01 1 379 111 -7.99e-02,+9.68e-02,+4.23e-01,+4.62e-01 2 -188 GenVertex: -104 ID: 0 (X,cT):0 I: 1 164 -213 -7.67e-02,-1.58e-01,+2.83e+00,+2.94e+00 2 -104 - O: 2 380 -211 +2.46e-01,-2.54e-01,+9.52e-01,+1.02e+00 1 (nil) + O: 2 380 -211 +2.46e-01,-2.54e-01,+9.52e-01,+1.02e+00 1 381 111 -3.23e-01,+9.61e-02,+1.88e+00,+1.91e+00 2 -189 GenVertex: -105 ID: 0 (X,cT):0 I: 1 165 113 -3.96e-01,-2.46e-01,+7.66e+00,+7.72e+00 2 -105 - O: 2 382 -211 -4.58e-01,-1.09e-01,+2.26e+00,+2.31e+00 1 (nil) - 383 211 +6.19e-02,-1.38e-01,+5.40e+00,+5.41e+00 1 (nil) + O: 2 382 -211 -4.58e-01,-1.09e-01,+2.26e+00,+2.31e+00 1 + 383 211 +6.19e-02,-1.38e-01,+5.40e+00,+5.41e+00 1 GenVertex: -106 ID: 0 (X,cT):0 I: 1 166 223 +8.97e-02,-2.51e-02,+1.83e+01,+1.83e+01 2 -106 - O: 3 384 211 +1.54e-02,+2.33e-01,+6.44e+00,+6.45e+00 1 (nil) - 385 -211 -1.25e-01,-1.91e-01,+6.30e+00,+6.31e+00 1 (nil) + O: 3 384 211 +1.54e-02,+2.33e-01,+6.44e+00,+6.45e+00 1 + 385 -211 -1.25e-01,-1.91e-01,+6.30e+00,+6.31e+00 1 386 111 +1.99e-01,-6.72e-02,+5.57e+00,+5.57e+00 2 -190 GenVertex: -107 ID: 0 (X,cT):0 I: 1 167 331 +7.92e-02,-2.14e-01,+1.65e+01,+1.65e+01 2 -107 - O: 2 387 22 -3.78e-03,+6.83e-02,+3.46e-01,+3.53e-01 1 (nil) + O: 2 387 22 -3.78e-03,+6.83e-02,+3.46e-01,+3.53e-01 1 388 113 +8.30e-02,-2.83e-01,+1.61e+01,+1.61e+01 2 -191 GenVertex: -108 ID: 0 (X,cT):0 I: 1 169 113 -9.07e-02,+1.70e-01,+7.69e+00,+7.71e+00 2 -108 - O: 2 389 211 -1.47e-01,+1.94e-03,+5.31e+00,+5.31e+00 1 (nil) - 390 -211 +5.60e-02,+1.68e-01,+2.38e+00,+2.39e+00 1 (nil) + O: 2 389 211 -1.47e-01,+1.94e-03,+5.31e+00,+5.31e+00 1 + 390 -211 +5.60e-02,+1.68e-01,+2.38e+00,+2.39e+00 1 GenVertex: -109 ID: 0 (X,cT):0 I: 1 172 313 -9.79e-02,+5.68e-01,+7.20e+01,+7.20e+01 2 -109 - O: 2 391 321 +1.98e-01,+2.04e-01,+3.95e+01,+3.95e+01 1 (nil) - 392 -211 -2.96e-01,+3.65e-01,+3.25e+01,+3.25e+01 1 (nil) + O: 2 391 321 +1.98e-01,+2.04e-01,+3.95e+01,+3.95e+01 1 + 392 -211 -2.96e-01,+3.65e-01,+3.25e+01,+3.25e+01 1 GenVertex: -110 ID: 0 (X,cT):0 I: 1 173 -313 -1.30e-01,-7.96e-01,+2.37e+02,+2.37e+02 2 -110 - O: 2 393 -321 +8.77e-02,-3.77e-01,+1.73e+02,+1.73e+02 1 (nil) - 394 211 -2.18e-01,-4.20e-01,+6.41e+01,+6.41e+01 1 (nil) + O: 2 393 -321 +8.77e-02,-3.77e-01,+1.73e+02,+1.73e+02 1 + 394 211 -2.18e-01,-4.20e-01,+6.41e+01,+6.41e+01 1 Vertex: -111 ID: 0 (X,cT)=-3.81e+00,+2.43e+00,-3.67e+01,+3.70e+01 I: 1 177 -411 -2.64e+01,+1.68e+01,-2.54e+02,+2.56e+02 2 -111 - O: 4 395 13 -1.41e+00,+1.04e+00,-1.32e+01,+1.33e+01 1 (nil) - 396 -14 -1.31e+00,+1.05e+00,-1.23e+01,+1.24e+01 1 (nil) + O: 4 395 13 -1.41e+00,+1.04e+00,-1.32e+01,+1.33e+01 1 + 396 -14 -1.31e+00,+1.05e+00,-1.23e+01,+1.24e+01 1 397 323 -2.16e+01,+1.35e+01,-2.09e+02,+2.11e+02 2 -192 - 398 -211 -2.09e+00,+1.24e+00,-1.91e+01,+1.92e+01 1 (nil) + 398 -211 -2.09e+00,+1.24e+00,-1.91e+01,+1.92e+01 1 GenVertex: -112 ID: 0 (X,cT):0 I: 1 180 -313 -1.69e+00,+9.52e-01,-1.93e+01,+1.94e+01 2 -112 O: 2 399 -311 -4.47e-01,+3.05e-01,-6.33e+00,+6.37e+00 2 -193 @@ -1131,82 +1248,82 @@ GenVertex: -112 ID: 0 (X,cT):0 GenVertex: -113 ID: 0 (X,cT):0 I: 1 181 323 -1.07e+00,+1.14e+00,-1.19e+01,+1.20e+01 2 -113 O: 2 401 311 -9.33e-01,+9.63e-01,-1.12e+01,+1.13e+01 2 -195 - 402 211 -1.36e-01,+1.77e-01,-7.16e-01,+7.63e-01 1 (nil) + 402 211 -1.36e-01,+1.77e-01,-7.16e-01,+7.63e-01 1 GenVertex: -114 ID: 0 (X,cT):0 I: 1 182 -323 -1.04e+00,-2.43e-02,-1.56e+01,+1.57e+01 2 -114 - O: 2 403 -321 -9.22e-01,-9.25e-02,-1.49e+01,+1.49e+01 1 (nil) + O: 2 403 -321 -9.22e-01,-9.25e-02,-1.49e+01,+1.49e+01 1 404 111 -1.17e-01,+6.82e-02,-7.01e-01,+7.26e-01 2 -196 GenVertex: -115 ID: 0 (X,cT):0 I: 1 184 113 +9.16e+00,-6.89e+00,-1.32e+02,+1.32e+02 2 -115 - O: 2 405 -211 +8.07e+00,-6.29e+00,-1.19e+02,+1.20e+02 1 (nil) - 406 211 +1.09e+00,-5.97e-01,-1.23e+01,+1.24e+01 1 (nil) + O: 2 405 -211 +8.07e+00,-6.29e+00,-1.19e+02,+1.20e+02 1 + 406 211 +1.09e+00,-5.97e-01,-1.23e+01,+1.24e+01 1 Vertex: -116 ID: 0 (X,cT)=+1.87e-03,-1.71e-03,-2.84e-02,+2.85e-02 I: 1 185 111 +1.57e+00,-1.44e+00,-2.40e+01,+2.41e+01 2 -116 - O: 2 407 22 +1.03e+00,-8.53e-01,-1.49e+01,+1.50e+01 1 (nil) - 408 22 +5.46e-01,-5.88e-01,-9.04e+00,+9.08e+00 1 (nil) + O: 2 407 22 +1.03e+00,-8.53e-01,-1.49e+01,+1.50e+01 1 + 408 22 +5.46e-01,-5.88e-01,-9.04e+00,+9.08e+00 1 GenVertex: -117 ID: 0 (X,cT):0 I: 1 189 213 -1.88e-01,-4.78e-01,-1.86e-02,+8.02e-01 2 -117 - O: 2 409 211 +6.32e-02,-4.07e-02,-1.95e-01,+2.51e-01 1 (nil) + O: 2 409 211 +6.32e-02,-4.07e-02,-1.95e-01,+2.51e-01 1 410 111 -2.51e-01,-4.37e-01,+1.76e-01,+5.51e-01 2 -197 GenVertex: -118 ID: 0 (X,cT):0 I: 1 191 213 -1.69e-01,+6.66e-02,+1.66e+00,+1.95e+00 2 -118 - O: 2 411 211 -8.99e-02,-4.44e-01,+8.88e-01,+1.01e+00 1 (nil) + O: 2 411 211 -8.99e-02,-4.44e-01,+8.88e-01,+1.01e+00 1 412 111 -7.90e-02,+5.11e-01,+7.72e-01,+9.39e-01 2 -198 GenVertex: -119 ID: 0 (X,cT):0 I: 1 192 113 -7.42e-01,+4.97e-01,+2.71e+00,+2.94e+00 2 -119 - O: 2 413 -211 -6.65e-02,+8.33e-02,+1.29e+00,+1.30e+00 1 (nil) - 414 211 -6.76e-01,+4.14e-01,+1.43e+00,+1.64e+00 1 (nil) + O: 2 413 -211 -6.65e-02,+8.33e-02,+1.29e+00,+1.30e+00 1 + 414 211 -6.76e-01,+4.14e-01,+1.43e+00,+1.64e+00 1 GenVertex: -120 ID: 0 (X,cT):0 I: 1 193 -213 +2.70e-02,+3.31e-01,+2.97e-01,+7.93e-01 2 -120 - O: 2 415 -211 -1.79e-01,+3.73e-02,+3.36e-01,+4.08e-01 1 (nil) + O: 2 415 -211 -1.79e-01,+3.73e-02,+3.36e-01,+4.08e-01 1 416 111 +2.06e-01,+2.93e-01,-3.94e-02,+3.85e-01 2 -199 GenVertex: -121 ID: 0 (X,cT):0 I: 1 195 113 -1.79e-01,+4.58e-01,+4.36e+00,+4.46e+00 2 -121 - O: 2 417 -211 -4.09e-01,+9.88e-02,+1.62e+00,+1.68e+00 1 (nil) - 418 211 +2.30e-01,+3.59e-01,+2.75e+00,+2.78e+00 1 (nil) + O: 2 417 -211 -4.09e-01,+9.88e-02,+1.62e+00,+1.68e+00 1 + 418 211 +2.30e-01,+3.59e-01,+2.75e+00,+2.78e+00 1 GenVertex: -122 ID: 0 (X,cT):0 I: 1 196 -213 -8.75e-02,+1.16e-01,+1.21e+00,+1.46e+00 2 -122 - O: 2 419 -211 +1.71e-01,-8.56e-03,+1.11e+00,+1.13e+00 1 (nil) + O: 2 419 -211 +1.71e-01,-8.56e-03,+1.11e+00,+1.13e+00 1 420 111 -2.59e-01,+1.24e-01,+1.06e-01,+3.34e-01 2 -200 GenVertex: -123 ID: 0 (X,cT):0 I: 1 197 323 -7.63e-01,+6.20e-01,+7.15e+00,+7.28e+00 2 -123 - O: 2 421 321 -4.34e-01,+3.13e-01,+2.39e+00,+2.49e+00 1 (nil) + O: 2 421 321 -4.34e-01,+3.13e-01,+2.39e+00,+2.49e+00 1 422 111 -3.29e-01,+3.07e-01,+4.76e+00,+4.78e+00 2 -201 GenVertex: -124 ID: 0 (X,cT):0 I: 1 198 221 -7.36e-01,+2.91e-01,+5.63e+00,+5.72e+00 2 -124 - O: 3 423 22 -3.68e-01,+1.74e-01,+3.63e+00,+3.66e+00 1 (nil) - 424 211 -2.05e-01,+1.05e-01,+1.26e+00,+1.28e+00 1 (nil) - 425 -211 -1.63e-01,+1.25e-02,+7.47e-01,+7.77e-01 1 (nil) + O: 3 423 22 -3.68e-01,+1.74e-01,+3.63e+00,+3.66e+00 1 + 424 211 -2.05e-01,+1.05e-01,+1.26e+00,+1.28e+00 1 + 425 -211 -1.63e-01,+1.25e-02,+7.47e-01,+7.77e-01 1 GenVertex: -125 ID: 0 (X,cT):0 I: 1 200 213 +4.69e-02,-1.77e-01,-3.64e-01,+1.10e+00 2 -125 - O: 2 426 211 -3.67e-01,-1.30e-01,-4.96e-01,+6.46e-01 1 (nil) + O: 2 426 211 -3.67e-01,-1.30e-01,-4.96e-01,+6.46e-01 1 427 111 +4.14e-01,-4.69e-02,+1.31e-01,+4.58e-01 2 -202 Vertex: -126 ID: 0 (X,cT)=+6.94e-05,-7.03e-06,+2.19e-04,+2.31e-04 I: 1 201 111 +3.73e-01,-3.78e-02,+1.18e+00,+1.24e+00 2 -126 - O: 2 428 22 +1.73e-01,-3.58e-02,+3.54e-01,+3.96e-01 1 (nil) - 429 22 +2.00e-01,-2.02e-03,+8.22e-01,+8.46e-01 1 (nil) + O: 2 428 22 +1.73e-01,-3.58e-02,+3.54e-01,+3.96e-01 1 + 429 22 +2.00e-01,-2.02e-03,+8.22e-01,+8.46e-01 1 GenVertex: -127 ID: 0 (X,cT):0 I: 1 202 -213 -7.72e-01,+1.13e+00,+1.14e+00,+1.96e+00 2 -127 - O: 2 430 -211 -3.73e-02,+7.08e-01,+6.44e-01,+9.68e-01 1 (nil) + O: 2 430 -211 -3.73e-02,+7.08e-01,+6.44e-01,+9.68e-01 1 431 111 -7.34e-01,+4.26e-01,+4.97e-01,+9.93e-01 2 -203 GenVertex: -128 ID: 0 (X,cT):0 I: 1 203 223 +4.07e-01,-5.29e-01,+1.12e-01,+1.04e+00 2 -128 - O: 3 432 211 +3.59e-01,-2.82e-01,+1.18e-01,+4.92e-01 1 (nil) - 433 -211 -1.50e-02,+9.43e-02,+3.19e-02,+1.72e-01 1 (nil) + O: 3 432 211 +3.59e-01,-2.82e-01,+1.18e-01,+4.92e-01 1 + 433 -211 -1.50e-02,+9.43e-02,+3.19e-02,+1.72e-01 1 434 111 +6.29e-02,-3.41e-01,-3.80e-02,+3.74e-01 2 -204 GenVertex: -129 ID: 0 (X,cT):0 I: 1 204 223 -5.49e-02,-3.91e-01,+1.06e+00,+1.37e+00 2 -129 - O: 3 435 -211 +6.25e-02,-1.04e-01,+1.78e-01,+2.57e-01 1 (nil) - 436 211 +2.00e-02,-2.71e-01,+8.68e-01,+9.20e-01 1 (nil) + O: 3 435 -211 +6.25e-02,-1.04e-01,+1.78e-01,+2.57e-01 1 + 436 211 +2.00e-02,-2.71e-01,+8.68e-01,+9.20e-01 1 437 111 -1.37e-01,-1.63e-02,+1.18e-02,+1.94e-01 2 -205 Vertex: -130 ID: 0 (X,cT)=+1.58e-01,-6.64e-02,-8.93e-01,+9.27e-01 I: 1 205 -421 +1.62e+00,-6.80e-01,-9.14e+00,+9.49e+00 2 -130 O: 2 438 10323 +8.73e-01,-6.30e-01,-7.46e+00,+7.64e+00 2 -206 - 439 -211 +7.49e-01,-4.97e-02,-1.68e+00,+1.85e+00 1 (nil) + 439 -211 +7.49e-01,-4.97e-02,-1.68e+00,+1.85e+00 1 Vertex: -131 ID: 0 (X,cT)=+6.33e-05,-2.16e-05,-2.68e-04,+2.80e-04 I: 1 206 111 +1.80e-01,-6.13e-02,-7.60e-01,+7.95e-01 2 -131 - O: 2 440 22 +1.83e-01,-8.44e-02,-7.27e-01,+7.54e-01 1 (nil) - 441 22 -3.44e-03,+2.31e-02,-3.29e-02,+4.04e-02 1 (nil) + O: 2 440 22 +1.83e-01,-8.44e-02,-7.27e-01,+7.54e-01 1 + 441 22 -3.44e-03,+2.31e-02,-3.29e-02,+4.04e-02 1 GenVertex: -132 ID: 0 (X,cT):0 I: 1 207 -311 +3.84e-01,+6.75e-01,-2.32e+00,+2.49e+00 2 -132 O: 1 442 310 +3.84e-01,+6.75e-01,-2.32e+00,+2.49e+00 2 -207 @@ -1215,116 +1332,116 @@ GenVertex: -133 ID: 0 (X,cT):0 O: 1 443 310 +4.92e-01,+1.67e+00,-1.03e+01,+1.05e+01 2 -208 Vertex: -134 ID: 0 (X,cT)=+9.60e-06,+2.02e-06,-1.35e-04,+1.36e-04 I: 1 210 111 +1.56e-01,+3.28e-02,-2.20e+00,+2.21e+00 2 -134 - O: 2 444 22 +1.58e-01,+4.61e-02,-2.17e+00,+2.18e+00 1 (nil) - 445 22 -2.08e-03,-1.33e-02,-2.27e-02,+2.64e-02 1 (nil) + O: 2 444 22 +1.58e-01,+4.61e-02,-2.17e+00,+2.18e+00 1 + 445 22 -2.08e-03,-1.33e-02,-2.27e-02,+2.64e-02 1 Vertex: -135 ID: 0 (X,cT)=-6.11e-05,+1.37e-04,-6.02e-04,+6.24e-04 I: 1 215 111 -1.24e-01,+2.78e-01,-1.22e+00,+1.26e+00 2 -135 - O: 2 446 22 -2.52e-02,+2.45e-02,-3.81e-01,+3.83e-01 1 (nil) - 447 22 -9.85e-02,+2.53e-01,-8.38e-01,+8.81e-01 1 (nil) + O: 2 446 22 -2.52e-02,+2.45e-02,-3.81e-01,+3.83e-01 1 + 447 22 -9.85e-02,+2.53e-01,-8.38e-01,+8.81e-01 1 Vertex: -136 ID: 0 (X,cT)=-4.44e-05,-3.92e-06,-7.34e-04,+7.40e-04 I: 1 217 111 -7.15e-02,-6.31e-03,-1.18e+00,+1.19e+00 2 -136 - O: 2 448 22 -9.35e-02,-3.77e-02,-1.03e+00,+1.04e+00 1 (nil) - 449 22 +2.21e-02,+3.14e-02,-1.46e-01,+1.51e-01 1 (nil) + O: 2 448 22 -9.35e-02,-3.77e-02,-1.03e+00,+1.04e+00 1 + 449 22 +2.21e-02,+3.14e-02,-1.46e-01,+1.51e-01 1 Vertex: -137 ID: 0 (X,cT)=+3.41e-05,+1.99e-05,-1.06e-05,+5.12e-05 I: 1 220 111 +1.49e-01,+8.68e-02,-4.65e-02,+2.24e-01 2 -137 - O: 2 450 22 +1.62e-01,+9.36e-02,-6.67e-02,+1.99e-01 1 (nil) - 451 22 -1.32e-02,-6.86e-03,+2.02e-02,+2.51e-02 1 (nil) + O: 2 450 22 +1.62e-01,+9.36e-02,-6.67e-02,+1.99e-01 1 + 451 22 -1.32e-02,-6.86e-03,+2.02e-02,+2.51e-02 1 GenVertex: -138 ID: 0 (X,cT):0 I: 1 221 -311 -8.28e-02,+1.40e-01,+2.87e-01,+5.97e-01 2 -138 - O: 1 452 130 -8.28e-02,+1.40e-01,+2.87e-01,+5.97e-01 1 (nil) + O: 1 452 130 -8.28e-02,+1.40e-01,+2.87e-01,+5.97e-01 1 Vertex: -139 ID: 0 (X,cT)=-3.00e-05,-1.01e-05,+1.64e-06,+3.29e-05 I: 1 226 111 -4.64e-01,-1.55e-01,+2.53e-02,+5.08e-01 2 -139 - O: 2 453 22 -2.22e-01,-3.76e-02,-4.59e-02,+2.30e-01 1 (nil) - 454 22 -2.42e-01,-1.18e-01,+7.12e-02,+2.78e-01 1 (nil) + O: 2 453 22 -2.22e-01,-3.76e-02,-4.59e-02,+2.30e-01 1 + 454 22 -2.42e-01,-1.18e-01,+7.12e-02,+2.78e-01 1 Vertex: -140 ID: 0 (X,cT)=-5.23e-07,-7.76e-06,+4.86e-05,+4.96e-05 I: 1 231 111 -1.13e-02,-1.68e-01,+1.05e+00,+1.07e+00 2 -140 - O: 2 455 22 +4.72e-02,-1.23e-01,+8.16e-01,+8.27e-01 1 (nil) - 456 22 -5.85e-02,-4.52e-02,+2.34e-01,+2.45e-01 1 (nil) + O: 2 455 22 +4.72e-02,-1.23e-01,+8.16e-01,+8.27e-01 1 + 456 22 -5.85e-02,-4.52e-02,+2.34e-01,+2.45e-01 1 Vertex: -141 ID: 0 (X,cT)=+3.06e-05,-6.13e-05,+1.04e-03,+1.04e-03 I: 1 233 111 +1.15e-01,-2.30e-01,+3.89e+00,+3.90e+00 2 -141 - O: 2 457 22 +4.00e-02,+3.07e-04,+9.61e-01,+9.62e-01 1 (nil) - 458 22 +7.48e-02,-2.30e-01,+2.93e+00,+2.94e+00 1 (nil) + O: 2 457 22 +4.00e-02,+3.07e-04,+9.61e-01,+9.62e-01 1 + 458 22 +7.48e-02,-2.30e-01,+2.93e+00,+2.94e+00 1 Vertex: -142 ID: 0 (X,cT)=-4.86e-07,+1.36e-05,+5.54e-03,+5.54e-03 I: 1 240 111 -1.84e-03,+5.13e-02,+2.10e+01,+2.10e+01 2 -142 - O: 2 459 22 +6.53e-02,+3.07e-02,+8.88e+00,+8.88e+00 1 (nil) - 460 22 -6.72e-02,+2.07e-02,+1.21e+01,+1.21e+01 1 (nil) + O: 2 459 22 +6.53e-02,+3.07e-02,+8.88e+00,+8.88e+00 1 + 460 22 -6.72e-02,+2.07e-02,+1.21e+01,+1.21e+01 1 Vertex: -143 ID: 0 (X,cT)=+9.00e-01,-4.13e-01,-2.42e+00,+2.63e+00 I: 1 241 421 +6.24e+00,-2.87e+00,-1.68e+01,+1.82e+01 2 -143 O: 2 461 -313 +3.33e+00,-1.55e+00,-7.24e+00,+8.16e+00 2 -209 462 111 +2.92e+00,-1.31e+00,-9.56e+00,+1.01e+01 2 -210 Vertex: -144 ID: 0 (X,cT)=+1.11e-04,-5.90e-05,-2.87e-04,+3.15e-04 I: 1 242 111 +4.94e-01,-2.63e-01,-1.28e+00,+1.40e+00 2 -144 - O: 2 463 22 +3.13e-01,-2.24e-01,-9.52e-01,+1.03e+00 1 (nil) - 464 22 +1.81e-01,-3.87e-02,-3.28e-01,+3.76e-01 1 (nil) + O: 2 463 22 +3.13e-01,-2.24e-01,-9.52e-01,+1.03e+00 1 + 464 22 +1.81e-01,-3.87e-02,-3.28e-01,+3.76e-01 1 Vertex: -145 ID: 0 (X,cT)=+2.18e-05,-5.26e-06,-3.70e-05,+4.34e-05 I: 1 244 111 +8.10e-01,-1.96e-01,-1.38e+00,+1.62e+00 2 -145 - O: 2 465 22 +6.12e-01,-2.00e-01,-1.10e+00,+1.28e+00 1 (nil) - 466 22 +1.98e-01,+3.77e-03,-2.74e-01,+3.39e-01 1 (nil) + O: 2 465 22 +6.12e-01,-2.00e-01,-1.10e+00,+1.28e+00 1 + 466 22 +1.98e-01,+3.77e-03,-2.74e-01,+3.39e-01 1 GenVertex: -146 ID: 0 (X,cT):0 I: 1 247 221 +3.89e-01,-5.39e-01,-8.71e-01,+1.22e+00 2 -146 - O: 3 467 -211 +1.74e-01,-1.31e-01,-4.30e-01,+5.02e-01 1 (nil) - 468 211 +5.41e-02,-2.04e-01,-3.15e-01,+4.04e-01 1 (nil) + O: 3 467 -211 +1.74e-01,-1.31e-01,-4.30e-01,+5.02e-01 1 + 468 211 +5.41e-02,-2.04e-01,-3.15e-01,+4.04e-01 1 469 111 +1.61e-01,-2.04e-01,-1.26e-01,+3.19e-01 2 -211 Vertex: -147 ID: 0 (X,cT)=+1.07e-04,-3.60e-05,-3.69e-04,+3.86e-04 I: 1 249 111 +7.72e-01,-2.59e-01,-2.66e+00,+2.78e+00 2 -147 - O: 2 470 22 +2.51e-02,-3.16e-02,-2.06e-01,+2.10e-01 1 (nil) - 471 22 +7.47e-01,-2.27e-01,-2.45e+00,+2.57e+00 1 (nil) + O: 2 470 22 +2.51e-02,-3.16e-02,-2.06e-01,+2.10e-01 1 + 471 22 +7.47e-01,-2.27e-01,-2.45e+00,+2.57e+00 1 Vertex: -148 ID: 0 (X,cT)=-8.22e+00,-2.29e+00,+1.29e+02,+1.35e+02 I: 1 254 310 -1.08e-01,-3.01e-02,+1.70e+00,+1.77e+00 2 -148 - O: 2 472 211 +1.20e-02,+1.80e-01,+6.79e-01,+7.16e-01 1 (nil) - 473 -211 -1.20e-01,-2.10e-01,+1.02e+00,+1.05e+00 1 (nil) + O: 2 472 211 +1.20e-02,+1.80e-01,+6.79e-01,+7.16e-01 1 + 473 -211 -1.20e-01,-2.10e-01,+1.02e+00,+1.05e+00 1 Vertex: -149 ID: 0 (X,cT)=-9.20e-06,+3.86e-06,+4.76e-05,+4.89e-05 I: 1 258 111 -2.36e-01,+9.89e-02,+1.22e+00,+1.25e+00 2 -149 - O: 2 474 22 -1.60e-01,+3.34e-03,+8.26e-01,+8.41e-01 1 (nil) - 475 22 -7.61e-02,+9.56e-02,+3.95e-01,+4.13e-01 1 (nil) + O: 2 474 22 -1.60e-01,+3.34e-03,+8.26e-01,+8.41e-01 1 + 475 22 -7.61e-02,+9.56e-02,+3.95e-01,+4.13e-01 1 Vertex: -150 ID: 0 (X,cT)=-5.14e-04,-8.73e-05,+1.03e-02,+1.04e-02 I: 1 260 111 -1.11e+00,-1.89e-01,+2.24e+01,+2.24e+01 2 -150 - O: 2 476 22 -9.81e-01,-1.35e-01,+2.02e+01,+2.02e+01 1 (nil) - 477 22 -1.30e-01,-5.37e-02,+2.22e+00,+2.22e+00 1 (nil) + O: 2 476 22 -9.81e-01,-1.35e-01,+2.02e+01,+2.02e+01 1 + 477 22 -1.30e-01,-5.37e-02,+2.22e+00,+2.22e+00 1 Vertex: -151 ID: 0 (X,cT)=+1.88e-05,+4.46e-05,+6.87e-04,+6.89e-04 I: 1 263 111 +1.08e-01,+2.55e-01,+3.93e+00,+3.94e+00 2 -151 - O: 2 478 22 +1.10e-01,+2.16e-01,+2.55e+00,+2.56e+00 1 (nil) - 479 22 -2.65e-03,+3.91e-02,+1.38e+00,+1.38e+00 1 (nil) + O: 2 478 22 +1.10e-01,+2.16e-01,+2.55e+00,+2.56e+00 1 + 479 22 -2.65e-03,+3.91e-02,+1.38e+00,+1.38e+00 1 Vertex: -152 ID: 0 (X,cT)=-6.14e-05,-3.82e-05,+7.27e-04,+7.31e-04 I: 1 265 111 -3.21e-01,-1.99e-01,+3.80e+00,+3.82e+00 2 -152 - O: 2 480 22 -2.34e-01,-1.54e-01,+3.28e+00,+3.29e+00 1 (nil) - 481 22 -8.72e-02,-4.50e-02,+5.19e-01,+5.28e-01 1 (nil) + O: 2 480 22 -2.34e-01,-1.54e-01,+3.28e+00,+3.29e+00 1 + 481 22 -8.72e-02,-4.50e-02,+5.19e-01,+5.28e-01 1 Vertex: -153 ID: 0 (X,cT)=-2.19e-06,-3.00e-06,+3.58e-04,+3.58e-04 I: 1 267 111 -1.18e-01,-1.61e-01,+1.92e+01,+1.92e+01 2 -153 - O: 2 482 22 -9.69e-02,-1.72e-01,+1.33e+01,+1.34e+01 1 (nil) - 483 22 -2.08e-02,+1.15e-02,+5.82e+00,+5.82e+00 1 (nil) + O: 2 482 22 -9.69e-02,-1.72e-01,+1.33e+01,+1.34e+01 1 + 483 22 -2.08e-02,+1.15e-02,+5.82e+00,+5.82e+00 1 Vertex: -154 ID: 0 (X,cT)=-9.00e-04,+6.71e-04,+1.89e-01,+1.89e-01 I: 1 273 111 -1.19e+00,+8.85e-01,+2.49e+02,+2.49e+02 2 -154 - O: 2 484 22 -5.91e-01,+4.58e-01,+1.37e+02,+1.37e+02 1 (nil) - 485 22 -5.96e-01,+4.27e-01,+1.12e+02,+1.12e+02 1 (nil) + O: 2 484 22 -5.91e-01,+4.58e-01,+1.37e+02,+1.37e+02 1 + 485 22 -5.96e-01,+4.27e-01,+1.12e+02,+1.12e+02 1 Vertex: -155 ID: 0 (X,cT)=-5.19e-06,+2.77e-05,+9.61e-03,+9.61e-03 I: 1 275 111 -3.94e-02,+2.10e-01,+7.29e+01,+7.29e+01 2 -155 - O: 2 486 22 -5.34e-02,+1.01e-01,+2.01e+01,+2.01e+01 1 (nil) - 487 22 +1.40e-02,+1.09e-01,+5.28e+01,+5.28e+01 1 (nil) + O: 2 486 22 -5.34e-02,+1.01e-01,+2.01e+01,+2.01e+01 1 + 487 22 +1.40e-02,+1.09e-01,+5.28e+01,+5.28e+01 1 Vertex: -156 ID: 0 (X,cT)=-3.80e-05,+2.22e-05,+1.37e-02,+1.37e-02 I: 1 280 111 -1.09e-01,+6.39e-02,+3.93e+01,+3.93e+01 2 -156 - O: 2 488 22 -5.83e-02,+1.46e-02,+3.27e+01,+3.27e+01 1 (nil) - 489 22 -5.08e-02,+4.93e-02,+6.60e+00,+6.60e+00 1 (nil) + O: 2 488 22 -5.83e-02,+1.46e-02,+3.27e+01,+3.27e+01 1 + 489 22 -5.08e-02,+4.93e-02,+6.60e+00,+6.60e+00 1 Vertex: -157 ID: 0 (X,cT)=+6.48e-05,+4.92e-04,+1.80e-02,+1.80e-02 I: 1 284 111 +1.27e-01,+9.61e-01,+3.52e+01,+3.52e+01 2 -157 - O: 2 490 22 -2.52e-02,+2.35e-01,+8.00e+00,+8.00e+00 1 (nil) - 491 22 +1.52e-01,+7.26e-01,+2.72e+01,+2.72e+01 1 (nil) + O: 2 490 22 -2.52e-02,+2.35e-01,+8.00e+00,+8.00e+00 1 + 491 22 +1.52e-01,+7.26e-01,+2.72e+01,+2.72e+01 1 Vertex: -158 ID: 0 (X,cT)=+1.48e-04,+1.07e-04,+1.80e-03,+1.81e-03 I: 1 285 111 +2.92e-01,+2.10e-01,+3.56e+00,+3.58e+00 2 -158 - O: 2 492 22 +2.42e-01,+1.03e-01,+2.23e+00,+2.25e+00 1 (nil) - 493 22 +5.02e-02,+1.07e-01,+1.33e+00,+1.33e+00 1 (nil) + O: 2 492 22 +2.42e-01,+1.03e-01,+2.23e+00,+2.25e+00 1 + 493 22 +5.02e-02,+1.07e-01,+1.33e+00,+1.33e+00 1 Vertex: -159 ID: 0 (X,cT)=+2.50e-05,+3.78e-05,+5.99e-04,+6.03e-04 I: 1 286 111 +7.22e-02,+1.09e-01,+1.73e+00,+1.74e+00 2 -159 - O: 2 494 22 +2.13e-02,+6.88e-02,+1.49e+00,+1.49e+00 1 (nil) - 495 22 +5.09e-02,+4.05e-02,+2.47e-01,+2.55e-01 1 (nil) + O: 2 494 22 +2.13e-02,+6.88e-02,+1.49e+00,+1.49e+00 1 + 495 22 +5.09e-02,+4.05e-02,+2.47e-01,+2.55e-01 1 Vertex: -160 ID: 0 (X,cT)=+2.02e-05,+3.78e-06,+1.16e-03,+1.16e-03 I: 1 287 111 +5.73e-02,+1.07e-02,+3.27e+00,+3.27e+00 2 -160 - O: 2 496 22 -1.28e-02,-2.31e-02,+1.49e-01,+1.51e-01 1 (nil) - 497 22 +7.01e-02,+3.38e-02,+3.12e+00,+3.12e+00 1 (nil) + O: 2 496 22 -1.28e-02,-2.31e-02,+1.49e-01,+1.51e-01 1 + 497 22 +7.01e-02,+3.38e-02,+3.12e+00,+3.12e+00 1 Vertex: -161 ID: 0 (X,cT)=+9.91e-05,+2.78e-04,+4.67e-03,+4.68e-03 I: 1 289 111 +4.18e-01,+1.18e+00,+1.97e+01,+1.98e+01 2 -161 - O: 2 498 22 +2.65e-01,+6.35e-01,+1.17e+01,+1.18e+01 1 (nil) - 499 22 +1.54e-01,+5.40e-01,+7.99e+00,+8.01e+00 1 (nil) + O: 2 498 22 +2.65e-01,+6.35e-01,+1.17e+01,+1.18e+01 1 + 499 22 +1.54e-01,+5.40e-01,+7.99e+00,+8.01e+00 1 GenVertex: -162 ID: 0 (X,cT):0 I: 1 294 221 +9.56e-01,+1.28e+00,+1.76e+01,+1.77e+01 2 -162 O: 3 500 111 +3.73e-01,+4.04e-01,+4.84e+00,+4.87e+00 2 -212 @@ -1332,217 +1449,217 @@ GenVertex: -162 ID: 0 (X,cT):0 502 111 +1.53e-01,+1.59e-01,+2.85e+00,+2.86e+00 2 -214 Vertex: -163 ID: 0 (X,cT)=+2.58e-04,-2.44e-04,+2.53e-03,+2.55e-03 I: 1 296 111 +1.69e+00,-1.60e+00,+1.65e+01,+1.67e+01 2 -163 - O: 2 503 22 +1.04e+00,-1.02e+00,+1.08e+01,+1.09e+01 1 (nil) - 504 22 +6.52e-01,-5.77e-01,+5.78e+00,+5.84e+00 1 (nil) + O: 2 503 22 +1.04e+00,-1.02e+00,+1.08e+01,+1.09e+01 1 + 504 22 +6.52e-01,-5.77e-01,+5.78e+00,+5.84e+00 1 Vertex: -164 ID: 0 (X,cT)=+2.91e+01,-1.32e+01,+2.80e+02,+2.82e+02 I: 1 297 310 +6.37e-01,-2.90e-01,+6.13e+00,+6.19e+00 2 -164 - O: 2 505 -211 +1.68e-01,+3.96e-04,+7.88e-01,+8.18e-01 1 (nil) - 506 211 +4.69e-01,-2.90e-01,+5.34e+00,+5.37e+00 1 (nil) + O: 2 505 -211 +1.68e-01,+3.96e-04,+7.88e-01,+8.18e-01 1 + 506 211 +4.69e-01,-2.90e-01,+5.34e+00,+5.37e+00 1 Vertex: -165 ID: 0 (X,cT)=-3.01e+00,-5.05e+01,+1.82e+02,+1.91e+02 I: 1 299 310 -5.64e-02,-9.48e-01,+3.42e+00,+3.58e+00 2 -165 - O: 2 507 211 -9.80e-03,-8.77e-01,+3.10e+00,+3.22e+00 1 (nil) - 508 -211 -4.66e-02,-7.14e-02,+3.18e-01,+3.57e-01 1 (nil) + O: 2 507 211 -9.80e-03,-8.77e-01,+3.10e+00,+3.22e+00 1 + 508 -211 -4.66e-02,-7.14e-02,+3.18e-01,+3.57e-01 1 Vertex: -166 ID: 0 (X,cT)=+5.65e-06,-7.57e-05,+2.42e-04,+2.55e-04 I: 1 301 111 +2.32e-02,-3.11e-01,+9.92e-01,+1.05e+00 2 -166 - O: 2 509 22 -1.58e-02,-2.94e-01,+9.06e-01,+9.53e-01 1 (nil) - 510 22 +3.90e-02,-1.71e-02,+8.60e-02,+9.59e-02 1 (nil) + O: 2 509 22 -1.58e-02,-2.94e-01,+9.06e-01,+9.53e-01 1 + 510 22 +3.90e-02,-1.71e-02,+8.60e-02,+9.59e-02 1 Vertex: -167 ID: 0 (X,cT)=-1.40e-04,-1.73e-04,+1.47e-04,+2.68e-04 I: 1 305 111 -7.25e-01,-8.95e-01,+7.64e-01,+1.39e+00 2 -167 - O: 2 511 22 -1.23e-01,-1.25e-01,+1.74e-01,+2.47e-01 1 (nil) - 512 22 -6.01e-01,-7.71e-01,+5.90e-01,+1.14e+00 1 (nil) + O: 2 511 22 -1.23e-01,-1.25e-01,+1.74e-01,+2.47e-01 1 + 512 22 -6.01e-01,-7.71e-01,+5.90e-01,+1.14e+00 1 Vertex: -168 ID: 0 (X,cT)=-2.82e-04,-3.80e-04,+1.23e-04,+4.92e-04 I: 1 307 111 -7.03e-01,-9.49e-01,+3.08e-01,+1.23e+00 2 -168 - O: 2 513 22 -4.88e-01,-5.82e-01,+1.49e-01,+7.74e-01 1 (nil) - 514 22 -2.15e-01,-3.67e-01,+1.58e-01,+4.54e-01 1 (nil) + O: 2 513 22 -4.88e-01,-5.82e-01,+1.49e-01,+7.74e-01 1 + 514 22 -2.15e-01,-3.67e-01,+1.58e-01,+4.54e-01 1 Vertex: -169 ID: 0 (X,cT)=-3.47e-04,-5.20e-04,-6.20e-04,+8.81e-04 I: 1 311 111 -1.10e+00,-1.65e+00,-1.97e+00,+2.80e+00 2 -169 - O: 2 515 22 -1.08e+00,-1.63e+00,-1.96e+00,+2.76e+00 1 (nil) - 516 22 -2.45e-02,-2.46e-02,-1.45e-02,+3.76e-02 1 (nil) + O: 2 515 22 -1.08e+00,-1.63e+00,-1.96e+00,+2.76e+00 1 + 516 22 -2.45e-02,-2.46e-02,-1.45e-02,+3.76e-02 1 Vertex: -170 ID: 0 (X,cT)=-3.29e-06,+1.10e-06,-2.41e-06,+4.57e-06 I: 1 313 111 -2.55e-01,+8.51e-02,-1.87e-01,+3.54e-01 2 -170 - O: 2 517 22 -1.13e-01,-2.84e-02,-9.56e-02,+1.51e-01 1 (nil) - 518 22 -1.42e-01,+1.13e-01,-9.12e-02,+2.04e-01 1 (nil) + O: 2 517 22 -1.13e-01,-2.84e-02,-9.56e-02,+1.51e-01 1 + 518 22 -1.42e-01,+1.13e-01,-9.12e-02,+2.04e-01 1 Vertex: -171 ID: 0 (X,cT)=-2.73e+00,+6.86e+00,-1.26e+01,+1.53e+01 I: 1 314 310 -2.88e-01,+7.23e-01,-1.33e+00,+1.62e+00 2 -171 - O: 2 519 -211 -3.73e-01,+4.98e-01,-1.02e+00,+1.20e+00 1 (nil) - 520 211 +8.58e-02,+2.25e-01,-3.14e-01,+4.20e-01 1 (nil) + O: 2 519 -211 -3.73e-01,+4.98e-01,-1.02e+00,+1.20e+00 1 + 520 211 +8.58e-02,+2.25e-01,-3.14e-01,+4.20e-01 1 Vertex: -172 ID: 0 (X,cT)=+3.20e-04,+3.36e-05,-5.97e-04,+6.84e-04 I: 1 318 111 +4.68e-01,+4.92e-02,-8.74e-01,+1.00e+00 2 -172 - O: 2 521 22 +1.99e-02,+1.62e-02,-1.31e-01,+1.33e-01 1 (nil) - 522 22 +4.48e-01,+3.29e-02,-7.43e-01,+8.69e-01 1 (nil) + O: 2 521 22 +1.99e-02,+1.62e-02,-1.31e-01,+1.33e-01 1 + 522 22 +4.48e-01,+3.29e-02,-7.43e-01,+8.69e-01 1 Vertex: -173 ID: 0 (X,cT)=+1.96e-05,+4.48e-05,-3.57e-03,+3.57e-03 I: 1 331 111 +1.15e-01,+2.64e-01,-2.11e+01,+2.11e+01 2 -173 - O: 2 523 22 +5.11e-03,+1.71e-01,-1.28e+01,+1.28e+01 1 (nil) - 524 22 +1.10e-01,+9.28e-02,-8.25e+00,+8.26e+00 1 (nil) + O: 2 523 22 +5.11e-03,+1.71e-01,-1.28e+01,+1.28e+01 1 + 524 22 +1.10e-01,+9.28e-02,-8.25e+00,+8.26e+00 1 Vertex: -174 ID: 0 (X,cT)=+5.52e-05,+5.68e-07,-2.13e-03,+2.13e-03 I: 1 334 111 +1.60e-01,+1.64e-03,-6.16e+00,+6.16e+00 2 -174 - O: 2 525 22 +9.75e-02,+6.03e-02,-2.60e+00,+2.61e+00 1 (nil) - 526 22 +6.22e-02,-5.86e-02,-3.55e+00,+3.56e+00 1 (nil) + O: 2 525 22 +9.75e-02,+6.03e-02,-2.60e+00,+2.61e+00 1 + 526 22 +6.22e-02,-5.86e-02,-3.55e+00,+3.56e+00 1 Vertex: -175 ID: 0 (X,cT)=+5.38e-05,-1.78e-05,-4.71e-04,+4.74e-04 I: 1 335 111 +3.20e-01,-1.06e-01,-2.80e+00,+2.83e+00 2 -175 - O: 2 527 22 +5.30e-02,+1.88e-02,-7.85e-01,+7.87e-01 1 (nil) - 528 22 +2.67e-01,-1.25e-01,-2.02e+00,+2.04e+00 1 (nil) + O: 2 527 22 +5.30e-02,+1.88e-02,-7.85e-01,+7.87e-01 1 + 528 22 +2.67e-01,-1.25e-01,-2.02e+00,+2.04e+00 1 Vertex: -176 ID: 0 (X,cT)=+2.93e-05,+8.83e-06,-3.69e-04,+3.70e-04 I: 1 336 111 +2.91e-01,+8.79e-02,-3.67e+00,+3.68e+00 2 -176 - O: 2 529 22 +2.68e-01,+3.23e-02,-2.79e+00,+2.81e+00 1 (nil) - 530 22 +2.34e-02,+5.56e-02,-8.74e-01,+8.76e-01 1 (nil) + O: 2 529 22 +2.68e-01,+3.23e-02,-2.79e+00,+2.81e+00 1 + 530 22 +2.34e-02,+5.56e-02,-8.74e-01,+8.76e-01 1 Vertex: -177 ID: 0 (X,cT)=+1.18e-05,+1.50e-06,-2.95e-04,+2.98e-04 I: 1 337 111 +4.06e-02,+5.17e-03,-1.02e+00,+1.02e+00 2 -177 - O: 2 531 22 -1.54e-02,-5.04e-02,-2.38e-01,+2.44e-01 1 (nil) - 532 22 +5.60e-02,+5.56e-02,-7.77e-01,+7.81e-01 1 (nil) + O: 2 531 22 -1.54e-02,-5.04e-02,-2.38e-01,+2.44e-01 1 + 532 22 +5.60e-02,+5.56e-02,-7.77e-01,+7.81e-01 1 Vertex: -178 ID: 0 (X,cT)=+3.27e-04,+1.05e-03,-1.22e-02,+1.23e-02 I: 1 339 111 +5.88e-01,+1.89e+00,-2.20e+01,+2.20e+01 2 -178 - O: 2 533 22 +9.44e-02,+2.34e-01,-3.28e+00,+3.29e+00 1 (nil) - 534 22 +4.93e-01,+1.65e+00,-1.87e+01,+1.88e+01 1 (nil) + O: 2 533 22 +9.44e-02,+2.34e-01,-3.28e+00,+3.29e+00 1 + 534 22 +4.93e-01,+1.65e+00,-1.87e+01,+1.88e+01 1 Vertex: -179 ID: 0 (X,cT)=+1.73e-05,+8.31e-04,-1.74e-02,+1.74e-02 I: 1 347 111 +1.51e-02,+7.22e-01,-1.51e+01,+1.51e+01 2 -179 - O: 2 535 22 -3.85e-02,+1.69e-01,-2.84e+00,+2.85e+00 1 (nil) - 536 22 +5.35e-02,+5.53e-01,-1.22e+01,+1.23e+01 1 (nil) + O: 2 535 22 -3.85e-02,+1.69e-01,-2.84e+00,+2.85e+00 1 + 536 22 +5.35e-02,+5.53e-01,-1.22e+01,+1.23e+01 1 Vertex: -180 ID: 0 (X,cT)=+1.08e-05,+1.04e-05,-2.06e-04,+2.08e-04 I: 1 349 111 +5.56e-02,+5.31e-02,-1.06e+00,+1.07e+00 2 -180 - O: 2 537 22 -2.80e-02,+6.26e-02,-5.73e-01,+5.77e-01 1 (nil) - 538 22 +8.36e-02,-9.58e-03,-4.84e-01,+4.91e-01 1 (nil) + O: 2 537 22 -2.80e-02,+6.26e-02,-5.73e-01,+5.77e-01 1 + 538 22 +8.36e-02,-9.58e-03,-4.84e-01,+4.91e-01 1 GenVertex: -181 ID: 0 (X,cT):0 I: 1 352 -311 +4.98e-01,+5.10e-01,-7.52e+00,+7.57e+00 2 -181 O: 1 539 310 +4.98e-01,+5.10e-01,-7.52e+00,+7.57e+00 2 -215 Vertex: -182 ID: 0 (X,cT)=+8.78e-05,+1.31e-05,-1.01e-03,+1.01e-03 I: 1 353 111 +9.21e-01,+1.38e-01,-1.06e+01,+1.06e+01 2 -182 - O: 2 540 22 +2.76e-01,+8.46e-03,-3.75e+00,+3.76e+00 1 (nil) - 541 22 +6.45e-01,+1.29e-01,-6.82e+00,+6.85e+00 1 (nil) + O: 2 540 22 +2.76e-01,+8.46e-03,-3.75e+00,+3.76e+00 1 + 541 22 +6.45e-01,+1.29e-01,-6.82e+00,+6.85e+00 1 Vertex: -183 ID: 0 (X,cT)=-2.61e-05,-7.86e-05,-8.03e-03,+8.03e-03 I: 1 355 111 -1.59e-01,-4.77e-01,-4.88e+01,+4.88e+01 2 -183 - O: 2 542 22 -7.47e-03,+4.92e-03,-2.71e-01,+2.71e-01 1 (nil) - 543 22 -1.51e-01,-4.82e-01,-4.85e+01,+4.85e+01 1 (nil) + O: 2 542 22 -7.47e-03,+4.92e-03,-2.71e-01,+2.71e-01 1 + 543 22 -1.51e-01,-4.82e-01,-4.85e+01,+4.85e+01 1 Vertex: -184 ID: 0 (X,cT)=+3.04e-05,-1.20e-04,-6.56e-03,+6.56e-03 I: 1 359 111 +6.89e-02,-2.71e-01,-1.49e+01,+1.49e+01 2 -184 - O: 2 544 22 +1.36e-02,-6.16e-02,-1.31e+00,+1.31e+00 1 (nil) - 545 22 +5.54e-02,-2.10e-01,-1.35e+01,+1.35e+01 1 (nil) + O: 2 544 22 +1.36e-02,-6.16e-02,-1.31e+00,+1.31e+00 1 + 545 22 +5.54e-02,-2.10e-01,-1.35e+01,+1.35e+01 1 Vertex: -185 ID: 0 (X,cT)=-3.11e-05,-4.88e-05,-3.97e-03,+3.97e-03 I: 1 362 111 -2.65e-01,-4.16e-01,-3.38e+01,+3.38e+01 2 -185 - O: 2 546 22 -2.39e-02,-6.37e-02,-2.40e+00,+2.40e+00 1 (nil) - 547 22 -2.41e-01,-3.52e-01,-3.14e+01,+3.14e+01 1 (nil) + O: 2 546 22 -2.39e-02,-6.37e-02,-2.40e+00,+2.40e+00 1 + 547 22 -2.41e-01,-3.52e-01,-3.14e+01,+3.14e+01 1 Vertex: -186 ID: 0 (X,cT)=+4.99e-06,-7.81e-06,-4.87e-04,+4.87e-04 I: 1 364 111 +7.55e-02,-1.18e-01,-7.35e+00,+7.36e+00 2 -186 - O: 3 548 22 -7.69e-03,-3.50e-03,-3.43e+00,+3.43e+00 1 (nil) - 549 11 +3.80e-02,-5.45e-02,-1.98e+00,+1.99e+00 1 (nil) - 550 -11 +4.52e-02,-6.00e-02,-1.94e+00,+1.94e+00 1 (nil) + O: 3 548 22 -7.69e-03,-3.50e-03,-3.43e+00,+3.43e+00 1 + 549 11 +3.80e-02,-5.45e-02,-1.98e+00,+1.99e+00 1 + 550 -11 +4.52e-02,-6.00e-02,-1.94e+00,+1.94e+00 1 Vertex: -187 ID: 0 (X,cT)=-3.39e-06,-5.26e-06,-1.10e-03,+1.10e-03 I: 1 372 111 -6.13e-02,-9.53e-02,-1.99e+01,+1.99e+01 2 -187 - O: 2 551 22 +3.73e-02,+2.39e-03,-4.50e+00,+4.50e+00 1 (nil) - 552 22 -9.86e-02,-9.77e-02,-1.54e+01,+1.54e+01 1 (nil) + O: 2 551 22 +3.73e-02,+2.39e-03,-4.50e+00,+4.50e+00 1 + 552 22 -9.86e-02,-9.77e-02,-1.54e+01,+1.54e+01 1 Vertex: -188 ID: 0 (X,cT)=-4.64e-06,+5.62e-06,+2.46e-05,+2.68e-05 I: 1 379 111 -7.99e-02,+9.68e-02,+4.23e-01,+4.62e-01 2 -188 - O: 2 553 22 -6.55e-03,+1.04e-01,+1.84e-01,+2.11e-01 1 (nil) - 554 22 -7.33e-02,-6.90e-03,+2.39e-01,+2.50e-01 1 (nil) + O: 2 553 22 -6.55e-03,+1.04e-01,+1.84e-01,+2.11e-01 1 + 554 22 -7.33e-02,-6.90e-03,+2.39e-01,+2.50e-01 1 Vertex: -189 ID: 0 (X,cT)=-4.97e-05,+1.48e-05,+2.90e-04,+2.95e-04 I: 1 381 111 -3.23e-01,+9.61e-02,+1.88e+00,+1.91e+00 2 -189 - O: 2 555 22 -1.22e-01,-2.90e-02,+7.14e-01,+7.25e-01 1 (nil) - 556 22 -2.00e-01,+1.25e-01,+1.16e+00,+1.19e+00 1 (nil) + O: 2 555 22 -1.22e-01,-2.90e-02,+7.14e-01,+7.25e-01 1 + 556 22 -2.00e-01,+1.25e-01,+1.16e+00,+1.19e+00 1 Vertex: -190 ID: 0 (X,cT)=+4.11e-06,-1.39e-06,+1.15e-04,+1.15e-04 I: 1 386 111 +1.99e-01,-6.72e-02,+5.57e+00,+5.57e+00 2 -190 - O: 2 557 22 +9.39e-02,+3.48e-02,+1.85e+00,+1.85e+00 1 (nil) - 558 22 +1.05e-01,-1.02e-01,+3.72e+00,+3.72e+00 1 (nil) + O: 2 557 22 +9.39e-02,+3.48e-02,+1.85e+00,+1.85e+00 1 + 558 22 +1.05e-01,-1.02e-01,+3.72e+00,+3.72e+00 1 GenVertex: -191 ID: 0 (X,cT):0 I: 1 388 113 +8.30e-02,-2.83e-01,+1.61e+01,+1.61e+01 2 -191 - O: 2 559 211 +2.80e-01,-4.59e-01,+9.99e+00,+1.00e+01 1 (nil) - 560 -211 -1.97e-01,+1.77e-01,+6.12e+00,+6.13e+00 1 (nil) + O: 2 559 211 +2.80e-01,-4.59e-01,+9.99e+00,+1.00e+01 1 + 560 -211 -1.97e-01,+1.77e-01,+6.12e+00,+6.13e+00 1 Vertex: -192 ID: 0 (X,cT)=-3.81e+00,+2.43e+00,-3.67e+01,+3.70e+01 I: 1 397 323 -2.16e+01,+1.35e+01,-2.09e+02,+2.11e+02 2 -192 O: 2 561 311 -1.87e+01,+1.16e+01,-1.82e+02,+1.84e+02 2 -216 - 562 211 -2.87e+00,+1.93e+00,-2.71e+01,+2.73e+01 1 (nil) + 562 211 -2.87e+00,+1.93e+00,-2.71e+01,+2.73e+01 1 GenVertex: -193 ID: 0 (X,cT):0 I: 1 399 -311 -4.47e-01,+3.05e-01,-6.33e+00,+6.37e+00 2 -193 O: 1 563 310 -4.47e-01,+3.05e-01,-6.33e+00,+6.37e+00 2 -217 Vertex: -194 ID: 0 (X,cT)=-3.15e-04,+1.64e-04,-3.28e-03,+3.30e-03 I: 1 400 111 -1.24e+00,+6.47e-01,-1.29e+01,+1.30e+01 2 -194 - O: 2 564 22 -2.94e-01,+1.77e-01,-3.70e+00,+3.71e+00 1 (nil) - 565 22 -9.48e-01,+4.69e-01,-9.23e+00,+9.29e+00 1 (nil) + O: 2 564 22 -2.94e-01,+1.77e-01,-3.70e+00,+3.71e+00 1 + 565 22 -9.48e-01,+4.69e-01,-9.23e+00,+9.29e+00 1 GenVertex: -195 ID: 0 (X,cT):0 I: 1 401 311 -9.33e-01,+9.63e-01,-1.12e+01,+1.13e+01 2 -195 O: 1 566 310 -9.33e-01,+9.63e-01,-1.12e+01,+1.13e+01 2 -218 Vertex: -196 ID: 0 (X,cT)=-6.57e-06,+3.84e-06,-3.95e-05,+4.09e-05 I: 1 404 111 -1.17e-01,+6.82e-02,-7.01e-01,+7.26e-01 2 -196 - O: 2 567 22 +1.75e-02,+4.41e-02,-2.82e-01,+2.86e-01 1 (nil) - 568 22 -1.34e-01,+2.41e-02,-4.19e-01,+4.40e-01 1 (nil) + O: 2 567 22 +1.75e-02,+4.41e-02,-2.82e-01,+2.86e-01 1 + 568 22 -1.34e-01,+2.41e-02,-4.19e-01,+4.40e-01 1 Vertex: -197 ID: 0 (X,cT)=-4.47e-05,-7.78e-05,+3.13e-05,+9.80e-05 I: 1 410 111 -2.51e-01,-4.37e-01,+1.76e-01,+5.51e-01 2 -197 - O: 2 569 22 -1.16e-01,-2.11e-01,+1.32e-02,+2.41e-01 1 (nil) - 570 22 -1.36e-01,-2.27e-01,+1.63e-01,+3.10e-01 1 (nil) + O: 2 569 22 -1.16e-01,-2.11e-01,+1.32e-02,+2.41e-01 1 + 570 22 -1.36e-01,-2.27e-01,+1.63e-01,+3.10e-01 1 Vertex: -198 ID: 0 (X,cT)=-4.20e-06,+2.71e-05,+4.10e-05,+4.99e-05 I: 1 412 111 -7.90e-02,+5.11e-01,+7.72e-01,+9.39e-01 2 -198 - O: 2 571 22 -9.13e-02,+4.77e-01,+7.59e-01,+9.01e-01 1 (nil) - 572 22 +1.23e-02,+3.33e-02,+1.37e-02,+3.81e-02 1 (nil) + O: 2 571 22 -9.13e-02,+4.77e-01,+7.59e-01,+9.01e-01 1 + 572 22 +1.23e-02,+3.33e-02,+1.37e-02,+3.81e-02 1 Vertex: -199 ID: 0 (X,cT)=+2.92e-05,+4.15e-05,-5.58e-06,+5.45e-05 I: 1 416 111 +2.06e-01,+2.93e-01,-3.94e-02,+3.85e-01 2 -199 - O: 2 573 22 +2.03e-01,+2.67e-01,-7.22e-02,+3.43e-01 1 (nil) - 574 22 +3.43e-03,+2.63e-02,+3.28e-02,+4.22e-02 1 (nil) + O: 2 573 22 +2.03e-01,+2.67e-01,-7.22e-02,+3.43e-01 1 + 574 22 +3.43e-03,+2.63e-02,+3.28e-02,+4.22e-02 1 Vertex: -200 ID: 0 (X,cT)=-2.16e-05,+1.04e-05,+8.87e-06,+2.79e-05 I: 1 420 111 -2.59e-01,+1.24e-01,+1.06e-01,+3.34e-01 2 -200 - O: 2 575 22 -3.89e-02,+8.36e-02,+4.53e-02,+1.03e-01 1 (nil) - 576 22 -2.20e-01,+4.05e-02,+6.09e-02,+2.32e-01 1 (nil) + O: 2 575 22 -3.89e-02,+8.36e-02,+4.53e-02,+1.03e-01 1 + 576 22 -2.20e-01,+4.05e-02,+6.09e-02,+2.32e-01 1 Vertex: -201 ID: 0 (X,cT)=-5.59e-05,+5.21e-05,+8.09e-04,+8.13e-04 I: 1 422 111 -3.29e-01,+3.07e-01,+4.76e+00,+4.78e+00 2 -201 - O: 2 577 22 -2.64e-01,+1.59e-01,+3.14e+00,+3.16e+00 1 (nil) - 578 22 -6.51e-02,+1.48e-01,+1.62e+00,+1.62e+00 1 (nil) + O: 2 577 22 -2.64e-01,+1.59e-01,+3.14e+00,+3.16e+00 1 + 578 22 -6.51e-02,+1.48e-01,+1.62e+00,+1.62e+00 1 Vertex: -202 ID: 0 (X,cT)=+2.56e-05,-2.90e-06,+8.11e-06,+2.82e-05 I: 1 427 111 +4.14e-01,-4.69e-02,+1.31e-01,+4.58e-01 2 -202 - O: 2 579 22 +4.15e-01,-2.52e-02,+1.20e-01,+4.33e-01 1 (nil) - 580 22 -9.68e-04,-2.17e-02,+1.13e-02,+2.45e-02 1 (nil) + O: 2 579 22 +4.15e-01,-2.52e-02,+1.20e-01,+4.33e-01 1 + 580 22 -9.68e-04,-2.17e-02,+1.13e-02,+2.45e-02 1 Vertex: -203 ID: 0 (X,cT)=-9.79e-05,+5.68e-05,+6.63e-05,+1.32e-04 I: 1 431 111 -7.34e-01,+4.26e-01,+4.97e-01,+9.93e-01 2 -203 - O: 2 581 22 -3.41e-01,+2.71e-01,+2.25e-01,+4.90e-01 1 (nil) - 582 22 -3.94e-01,+1.56e-01,+2.73e-01,+5.03e-01 1 (nil) + O: 2 581 22 -3.41e-01,+2.71e-01,+2.25e-01,+4.90e-01 1 + 582 22 -3.94e-01,+1.56e-01,+2.73e-01,+5.03e-01 1 Vertex: -204 ID: 0 (X,cT)=+1.01e-05,-5.45e-05,-6.08e-06,+5.98e-05 I: 1 434 111 +6.29e-02,-3.41e-01,-3.80e-02,+3.74e-01 2 -204 - O: 2 583 22 +5.58e-02,-8.25e-02,+3.46e-02,+1.05e-01 1 (nil) - 584 22 +7.11e-03,-2.58e-01,-7.26e-02,+2.69e-01 1 (nil) + O: 2 583 22 +5.58e-02,-8.25e-02,+3.46e-02,+1.05e-01 1 + 584 22 +7.11e-03,-2.58e-01,-7.26e-02,+2.69e-01 1 Vertex: -205 ID: 0 (X,cT)=-3.75e-05,-4.46e-06,+3.21e-06,+5.29e-05 I: 1 437 111 -1.37e-01,-1.63e-02,+1.18e-02,+1.94e-01 2 -205 - O: 2 585 22 -9.46e-02,+4.14e-02,+4.73e-02,+1.14e-01 1 (nil) - 586 22 -4.29e-02,-5.77e-02,-3.55e-02,+8.02e-02 1 (nil) + O: 2 585 22 -9.46e-02,+4.14e-02,+4.73e-02,+1.14e-01 1 + 586 22 -4.29e-02,-5.77e-02,-3.55e-02,+8.02e-02 1 Vertex: -206 ID: 0 (X,cT)=+1.58e-01,-6.64e-02,-8.93e-01,+9.27e-01 I: 1 438 10323 +8.73e-01,-6.30e-01,-7.46e+00,+7.64e+00 2 -206 - O: 2 587 321 +3.86e-01,-2.73e-01,-2.92e+00,+3.00e+00 1 (nil) + O: 2 587 321 +3.86e-01,-2.73e-01,-2.92e+00,+3.00e+00 1 588 223 +4.87e-01,-3.58e-01,-4.53e+00,+4.64e+00 2 -219 Vertex: -207 ID: 0 (X,cT)=+6.34e+00,+1.12e+01,-3.83e+01,+4.12e+01 I: 1 442 310 +3.84e-01,+6.75e-01,-2.32e+00,+2.49e+00 2 -207 - O: 2 589 -211 +1.48e-01,+5.93e-01,-1.74e+00,+1.85e+00 1 (nil) - 590 211 +2.36e-01,+8.15e-02,-5.72e-01,+6.40e-01 1 (nil) + O: 2 589 -211 +1.48e-01,+5.93e-01,-1.74e+00,+1.85e+00 1 + 590 211 +2.36e-01,+8.15e-02,-5.72e-01,+6.40e-01 1 Vertex: -208 ID: 0 (X,cT)=+6.83e+00,+2.32e+01,-1.43e+02,+1.45e+02 I: 1 443 310 +4.92e-01,+1.67e+00,-1.03e+01,+1.05e+01 2 -208 - O: 2 591 211 +2.44e-01,+1.36e+00,-7.90e+00,+8.02e+00 1 (nil) - 592 -211 +2.48e-01,+3.05e-01,-2.40e+00,+2.43e+00 1 (nil) + O: 2 591 211 +2.44e-01,+1.36e+00,-7.90e+00,+8.02e+00 1 + 592 -211 +2.48e-01,+3.05e-01,-2.40e+00,+2.43e+00 1 Vertex: -209 ID: 0 (X,cT)=+9.00e-01,-4.13e-01,-2.42e+00,+2.63e+00 I: 1 461 -313 +3.33e+00,-1.55e+00,-7.24e+00,+8.16e+00 2 -209 - O: 2 593 -321 +2.28e+00,-1.05e+00,-5.51e+00,+6.07e+00 1 (nil) - 594 211 +1.05e+00,-5.07e-01,-1.73e+00,+2.09e+00 1 (nil) + O: 2 593 -321 +2.28e+00,-1.05e+00,-5.51e+00,+6.07e+00 1 + 594 211 +1.05e+00,-5.07e-01,-1.73e+00,+2.09e+00 1 Vertex: -210 ID: 0 (X,cT)=+9.00e-01,-4.13e-01,-2.42e+00,+2.63e+00 I: 1 462 111 +2.92e+00,-1.31e+00,-9.56e+00,+1.01e+01 2 -210 - O: 2 595 22 +2.61e+00,-1.13e+00,-8.44e+00,+8.90e+00 1 (nil) - 596 22 +3.12e-01,-1.85e-01,-1.12e+00,+1.18e+00 1 (nil) + O: 2 595 22 +2.61e+00,-1.13e+00,-8.44e+00,+8.90e+00 1 + 596 22 +3.12e-01,-1.85e-01,-1.12e+00,+1.18e+00 1 Vertex: -211 ID: 0 (X,cT)=+1.16e-05,-1.47e-05,-9.04e-06,+2.29e-05 I: 1 469 111 +1.61e-01,-2.04e-01,-1.26e-01,+3.19e-01 2 -211 - O: 2 597 22 +1.53e-02,-6.02e-02,-9.24e-02,+1.11e-01 1 (nil) - 598 22 +1.46e-01,-1.44e-01,-3.35e-02,+2.08e-01 1 (nil) + O: 2 597 22 +1.53e-02,-6.02e-02,-9.24e-02,+1.11e-01 1 + 598 22 +1.46e-01,-1.44e-01,-3.35e-02,+2.08e-01 1 Vertex: -212 ID: 0 (X,cT)=+4.54e-05,+4.92e-05,+5.89e-04,+5.93e-04 I: 1 500 111 +3.73e-01,+4.04e-01,+4.84e+00,+4.87e+00 2 -212 - O: 2 599 22 +6.24e-02,+9.07e-02,+5.92e-01,+6.02e-01 1 (nil) - 600 22 +3.10e-01,+3.13e-01,+4.25e+00,+4.27e+00 1 (nil) + O: 2 599 22 +6.24e-02,+9.07e-02,+5.92e-01,+6.02e-01 1 + 600 22 +3.10e-01,+3.13e-01,+4.25e+00,+4.27e+00 1 Vertex: -213 ID: 0 (X,cT)=+1.06e-05,+1.77e-05,+2.45e-04,+2.46e-04 I: 1 501 111 +4.30e-01,+7.17e-01,+9.92e+00,+9.96e+00 2 -213 - O: 2 601 22 +2.70e-01,+3.42e-01,+4.68e+00,+4.70e+00 1 (nil) - 602 22 +1.60e-01,+3.75e-01,+5.24e+00,+5.26e+00 1 (nil) + O: 2 601 22 +2.70e-01,+3.42e-01,+4.68e+00,+4.70e+00 1 + 602 22 +1.60e-01,+3.75e-01,+5.24e+00,+5.26e+00 1 Vertex: -214 ID: 0 (X,cT)=+3.42e-05,+3.55e-05,+6.36e-04,+6.39e-04 I: 1 502 111 +1.53e-01,+1.59e-01,+2.85e+00,+2.86e+00 2 -214 - O: 2 603 22 +1.66e-01,+9.32e-02,+2.21e+00,+2.21e+00 1 (nil) - 604 22 -1.33e-02,+6.57e-02,+6.40e-01,+6.43e-01 1 (nil) + O: 2 603 22 +1.66e-01,+9.32e-02,+2.21e+00,+2.21e+00 1 + 604 22 -1.33e-02,+6.57e-02,+6.40e-01,+6.43e-01 1 Vertex: -215 ID: 0 (X,cT)=+2.34e+01,+2.39e+01,-3.53e+02,+3.55e+02 I: 1 539 310 +4.98e-01,+5.10e-01,-7.52e+00,+7.57e+00 2 -215 - O: 2 605 -211 -2.61e-02,+1.43e-01,-1.27e+00,+1.29e+00 1 (nil) - 606 211 +5.24e-01,+3.67e-01,-6.25e+00,+6.28e+00 1 (nil) + O: 2 605 -211 -2.61e-02,+1.43e-01,-1.27e+00,+1.29e+00 1 + 606 211 +5.24e-01,+3.67e-01,-6.25e+00,+6.28e+00 1 Vertex: -216 ID: 0 (X,cT)=-3.81e+00,+2.43e+00,-3.67e+01,+3.70e+01 I: 1 561 311 -1.87e+01,+1.16e+01,-1.82e+02,+1.84e+02 2 -216 - O: 1 607 130 -1.87e+01,+1.16e+01,-1.82e+02,+1.84e+02 1 (nil) + O: 1 607 130 -1.87e+01,+1.16e+01,-1.82e+02,+1.84e+02 1 Vertex: -217 ID: 0 (X,cT)=-8.57e+01,+5.84e+01,-1.21e+03,+1.22e+03 I: 1 563 310 -4.47e-01,+3.05e-01,-6.33e+00,+6.37e+00 2 -217 O: 2 608 111 -3.60e-01,+3.29e-01,-3.33e+00,+3.37e+00 2 -220 @@ -1553,50 +1670,67 @@ Vertex: -218 ID: 0 (X,cT)=-1.70e+00,+1.75e+00,-2.03e+01,+2.05e+01 611 111 -7.72e-01,+7.38e-01,-9.69e+00,+9.75e+00 2 -223 Vertex: -219 ID: 0 (X,cT)=+1.58e-01,-6.64e-02,-8.93e-01,+9.27e-01 I: 1 588 223 +4.87e-01,-3.58e-01,-4.53e+00,+4.64e+00 2 -219 - O: 3 612 -211 +3.21e-01,-2.23e-01,-1.77e+00,+1.82e+00 1 (nil) - 613 211 +1.03e-01,-2.97e-01,-2.00e+00,+2.03e+00 1 (nil) + O: 3 612 -211 +3.21e-01,-2.23e-01,-1.77e+00,+1.82e+00 1 + 613 211 +1.03e-01,-2.97e-01,-2.00e+00,+2.03e+00 1 614 111 +6.30e-02,+1.63e-01,-7.63e-01,+7.94e-01 2 -224 Vertex: -220 ID: 0 (X,cT)=-8.57e+01,+5.84e+01,-1.21e+03,+1.22e+03 I: 1 608 111 -3.60e-01,+3.29e-01,-3.33e+00,+3.37e+00 2 -220 - O: 2 615 22 -3.26e-01,+2.76e-01,-3.12e+00,+3.15e+00 1 (nil) - 616 22 -3.41e-02,+5.33e-02,-2.15e-01,+2.24e-01 1 (nil) + O: 2 615 22 -3.26e-01,+2.76e-01,-3.12e+00,+3.15e+00 1 + 616 22 -3.41e-02,+5.33e-02,-2.15e-01,+2.24e-01 1 Vertex: -221 ID: 0 (X,cT)=-8.57e+01,+5.84e+01,-1.21e+03,+1.22e+03 I: 1 609 111 -8.72e-02,-2.40e-02,-2.99e+00,+3.00e+00 2 -221 - O: 2 617 22 -1.01e-01,+2.75e-02,-2.29e+00,+2.30e+00 1 (nil) - 618 22 +1.37e-02,-5.15e-02,-7.01e-01,+7.03e-01 1 (nil) + O: 2 617 22 -1.01e-01,+2.75e-02,-2.29e+00,+2.30e+00 1 + 618 22 +1.37e-02,-5.15e-02,-7.01e-01,+7.03e-01 1 Vertex: -222 ID: 0 (X,cT)=-1.70e+00,+1.75e+00,-2.03e+01,+2.05e+01 I: 1 610 111 -1.61e-01,+2.25e-01,-1.49e+00,+1.52e+00 2 -222 - O: 2 619 22 -7.30e-02,+2.04e-01,-1.01e+00,+1.03e+00 1 (nil) - 620 22 -8.76e-02,+2.04e-02,-4.77e-01,+4.85e-01 1 (nil) + O: 2 619 22 -7.30e-02,+2.04e-01,-1.01e+00,+1.03e+00 1 + 620 22 -8.76e-02,+2.04e-02,-4.77e-01,+4.85e-01 1 Vertex: -223 ID: 0 (X,cT)=-1.70e+00,+1.75e+00,-2.03e+01,+2.05e+01 I: 1 611 111 -7.72e-01,+7.38e-01,-9.69e+00,+9.75e+00 2 -223 - O: 2 621 22 -6.72e-01,+5.71e-01,-7.86e+00,+7.91e+00 1 (nil) - 622 22 -1.00e-01,+1.67e-01,-1.82e+00,+1.83e+00 1 (nil) + O: 2 621 22 -6.72e-01,+5.71e-01,-7.86e+00,+7.91e+00 1 + 622 22 -1.00e-01,+1.67e-01,-1.82e+00,+1.83e+00 1 Vertex: -224 ID: 0 (X,cT)=+1.58e-01,-6.64e-02,-8.93e-01,+9.27e-01 I: 1 614 111 +6.30e-02,+1.63e-01,-7.63e-01,+7.94e-01 2 -224 - O: 2 623 22 -8.72e-03,-2.00e-02,-1.18e-01,+1.20e-01 1 (nil) - 624 22 +7.17e-02,+1.83e-01,-6.45e-01,+6.74e-01 1 (nil) + O: 2 623 22 -8.72e-03,-2.00e-02,-1.18e-01,+1.20e-01 1 + 624 22 +7.17e-02,+1.83e-01,-6.45e-01,+6.74e-01 1 ________________________________________________________________________________ Print out hit information ------------------------------------------ -*** Muon System Hit (#hits=17) -E1 : pi+ : pT=3.46 : TOF=26.6 : x=(-0.819,0.587,-7.9) -E0 : e- : pT=0.00208 : TOF=27.2 : x=(-1.17,0.0548,7.9) -E0 : pi- : pT=0.171 : TOF=26.9 : x=(0.92,0.784,7.9) -E0 : pi+ : pT=0.438 : TOF=26.7 : x=(0.961,0.785,7.9) -E1 : pi- : pT=2.42 : TOF=26.6 : x=(-0.885,0.475,-7.9) -E1 : mu- : pT=1.76 : TOF=26.6 : x=(-0.885,0.57,-7.9) -E0 : pi- : pT=0.143 : TOF=29.1 : x=(-0.0854,-1.1,7.9) -E0 : proton : pT=0.67 : TOF=34 : x=(-0.0822,-1.86,7.9) -E1 : e- : pT=0.00124 : TOF=33 : x=(-0.325,0.946,-8) -E1 : pi+ : pT=0.358 : TOF=27 : x=(-0.0691,0.998,-8.03) -E0 : mu- : pT=0.0671 : TOF=27.5 : x=(-1.52,0.066,7.9) -E0 : e- : pT=0.00091 : TOF=27.6 : x=(-1.48,-0.00459,7.9) -E0 : e- : pT=0.000842 : TOF=37.5 : x=(-0.053,-1.79,8.1) -E0 : pi+ : pT=0.0821 : TOF=27.4 : x=(0.347,-1.04,7.9) -E0 : e- : pT=0.00124 : TOF=26.7 : x=(0.968,0.259,7.9) -E0 : e- : pT=0.00117 : TOF=32.7 : x=(-0.69,-1.28,8.1) -E1 : e- : pT=0.000873 : TOF=34.5 : x=(1.54,-0.746,-8.1) +*** Muon System Hit (#hits=34) +E1 : pi+ : pT=0.239 : TOF=26.7 : x=(-0.0908,-1.2,-7.9) +E1 : pi- : pT=0.194 : TOF=30.5 : x=(2.29,1.26,-7.9) +E1 : e- : pT=0.000396 : TOF=35.7 : x=(3.95,1.48,-7.9) +E1 : mu- : pT=0.96 : TOF=29.2 : x=(3.51,-1.01,-7.9) +E1 : pi- : pT=0.13 : TOF=26.7 : x=(0.493,1.02,-7.9) +E1 : pi+ : pT=1.55 : TOF=26.8 : x=(0.345,1.46,-7.9) +E1 : pi- : pT=0.0596 : TOF=28.3 : x=(-0.413,1.85,-7.9) +E1 : kaon+ : pT=0.407 : TOF=27.1 : x=(0.493,-1.02,-7.9) +E1 : pi+ : pT=3.45 : TOF=26.6 : x=(-0.82,0.586,-7.9) +E0 : pi+ : pT=0.346 : TOF=27.3 : x=(-0.408,-2.07,7.9) +E0 : kaon+ : pT=0.356 : TOF=28.3 : x=(-1.08,1.71,7.9) +E0 : pi- : pT=0.17 : TOF=26.9 : x=(0.916,0.779,7.9) +E0 : pi+ : pT=0.39 : TOF=26.7 : x=(0.936,0.768,7.9) +E0 : pi- : pT=0.108 : TOF=28.1 : x=(-1.12,-0.804,7.9) +E1 : pi- : pT=2.42 : TOF=26.6 : x=(-0.884,0.475,-7.9) +E1 : mu- : pT=1.75 : TOF=26.6 : x=(-0.885,0.571,-7.9) +E0 : pi- : pT=0.0974 : TOF=27 : x=(-1.04,-0.93,7.9) +E1 : pi- : pT=0.515 : TOF=27 : x=(0.613,1.51,-7.9) +E1 : e- : pT=0.000203 : TOF=27.8 : x=(0.615,1.58,-8.1) +E1 : pi+ : pT=0.355 : TOF=27.1 : x=(-0.0678,0.998,-8.06) +E1 : e- : pT=7.12e-05 : TOF=27.2 : x=(-0.0803,0.997,-8.04) +E1 : pi- : pT=0.391 : TOF=28.1 : x=(-0.769,2.77,-7.9) +E0 : pi- : pT=1.99 : TOF=29.8 : x=(-1.42,-3.77,7.9) +E0 : pi+ : pT=0.0878 : TOF=27.4 : x=(0.315,-1.11,7.9) +B5 : e- : pT=0.000483 : TOF=38.4 : x=(-2.11,-4.04,7) +E1 : pi+ : pT=0.565 : TOF=29 : x=(2.31,2.43,-7.9) +E1 : pi+ : pT=0.194 : TOF=27.6 : x=(1.73,-0.344,-7.9) +E1 : pi+ : pT=0.67 : TOF=28.3 : x=(0.898,2.9,-7.9) +E1 : pi- : pT=0.816 : TOF=27.1 : x=(0.205,1.74,-7.9) +B0 : kaon- : pT=1.1 : TOF=27.2 : x=(4.25,-1.34,-6.66) +E0 : e- : pT=0.00218 : TOF=26.8 : x=(1.07,-0.431,7.9) +E1 : pi+ : pT=0.0914 : TOF=27.6 : x=(0.255,1.81,-7.9) +B6 : pi- : pT=0.746 : TOF=15.3 : x=(-1.15,-4.25,0.915) +E0 : pi+ : pT=0.5 : TOF=27.4 : x=(1.15,-1.16,7.9) ________________________________________________________________________________ GenEvent: #3 ID=20 SignalProcessGenVertex Barcode: 0 @@ -1604,232 +1738,232 @@ GenEvent: #3 ID=20 SignalProcessGenVertex Barcode: 0 Entries this event: 102 vertices, 280 particles. RndmState(0)= Wgts(0)= - EventScale -1 GeV alphaQCD=-1 alphaQED=-1 + EventScale -1 [energy] alphaQCD=-1 alphaQED=-1 GenParticle Legend Barcode PDG ID ( Px, Py, Pz, E ) Stat DecayVtx ________________________________________________________________________________ GenVertex: -1 ID: 0 (X,cT):0 I: 1 1 2212 +0.00e+00,+0.00e+00,+7.00e+03,+7.00e+03 3 -1 - O: 3 3 21 +5.50e-01,+2.26e-01,+5.57e+01,+5.57e+01 3 -3 - 15 2 +3.93e-01,-4.42e-01,+2.02e+01,+2.03e+01 2 -11 + O: 3 15 2 +3.93e-01,-4.42e-01,+2.02e+01,+2.03e+01 2 -11 14 2101 -9.42e-01,+2.17e-01,+6.53e+03,+6.53e+03 2 -9 + 3 21 +5.50e-01,+2.26e-01,+5.57e+01,+5.57e+01 3 -3 GenVertex: -2 ID: 0 (X,cT):0 I: 1 2 2212 +0.00e+00,+0.00e+00,-7.00e+03,+7.00e+03 3 -2 O: 2 29 2203 +2.49e+00,+5.11e-01,-5.57e+03,+5.57e+03 2 -11 4 1 -2.49e+00,-5.11e-01,-1.27e+03,+1.27e+03 3 -4 GenVertex: -3 ID: 0 (X,cT):0 I: 1 3 21 +5.50e-01,+2.26e-01,+5.57e+01,+5.57e+01 3 -3 - O: 4 13 2 -1.06e+00,+5.40e-01,+6.25e-01,+1.38e+00 2 -9 + O: 4 17 21 -1.67e-01,+9.43e-01,-4.22e+00,+4.33e+00 2 -11 + 13 2 -1.06e+00,+5.40e-01,+6.25e-01,+1.38e+00 2 -9 16 21 +1.28e+00,-8.74e-01,+5.02e+01,+5.02e+01 2 -11 5 -2 +5.15e-01,-3.71e-01,+4.37e+00,+4.41e+00 3 -5 - 17 21 -1.67e-01,+9.43e-01,-4.22e+00,+4.33e+00 2 -11 GenVertex: -4 ID: 0 (X,cT):0 I: 1 4 1 -2.49e+00,-5.11e-01,-1.27e+03,+1.27e+03 3 -4 O: 7 26 21 -3.65e+00,+1.06e+00,-1.44e+02,+1.44e+02 2 -11 27 21 -8.57e-01,+1.30e+00,-8.64e+01,+8.64e+01 2 -11 - 23 21 -6.21e-01,-2.83e+00,-4.24e+01,+4.25e+01 2 -11 - 25 21 -4.72e-02,-2.81e-01,-7.30e+00,+7.31e+00 2 -11 28 21 +2.10e-01,-2.36e-01,-5.04e+02,+5.04e+02 2 -11 + 6 1 +2.57e+00,+4.38e-01,-4.63e+02,+4.63e+02 3 -5 + 23 21 -6.21e-01,-2.83e+00,-4.24e+01,+4.25e+01 2 -11 24 21 -1.09e-01,+2.50e-02,-1.28e+01,+1.28e+01 2 -11 - 6 1 +2.57e+00,+4.38e-01,-4.63e+02,+4.63e+02 3 -5 + 25 21 -4.72e-02,-2.81e-01,-7.30e+00,+7.31e+00 2 -11 GenVertex: -5 ID: 0 (X,cT):0 - I: 2 5 -2 +5.15e-01,-3.71e-01,+4.37e+00,+4.41e+00 3 -5 - 6 1 +2.57e+00,+4.38e-01,-4.63e+02,+4.63e+02 3 -5 + I: 2 6 1 +2.57e+00,+4.38e-01,-4.63e+02,+4.63e+02 3 -5 + 5 -2 +5.15e-01,-3.71e-01,+4.37e+00,+4.41e+00 3 -5 O: 2 8 -24 +2.48e+00,-4.66e+00,-4.53e+02,+4.60e+02 3 -7 7 22 +6.11e-01,+4.73e+00,-5.78e+00,+7.50e+00 3 -6 GenVertex: -6 ID: 0 (X,cT):0 I: 1 7 22 +6.11e-01,+4.73e+00,-5.78e+00,+7.50e+00 3 -6 - O: 1 9 22 +6.11e-01,+4.73e+00,-5.78e+00,+7.50e+00 1 (nil) + O: 1 9 22 +6.11e-01,+4.73e+00,-5.78e+00,+7.50e+00 1 GenVertex: -7 ID: 0 (X,cT):0 I: 1 8 -24 +2.48e+00,-4.66e+00,-4.53e+02,+4.60e+02 3 -7 O: 1 10 -24 +2.48e+00,-4.66e+00,-4.53e+02,+4.60e+02 2 -8 GenVertex: -8 ID: 0 (X,cT):0 I: 1 10 -24 +2.48e+00,-4.66e+00,-4.53e+02,+4.60e+02 2 -8 - O: 2 12 -14 -9.19e+00,-3.92e+01,-1.68e+02,+1.73e+02 1 (nil) - 11 13 +1.17e+01,+3.45e+01,-2.85e+02,+2.87e+02 1 (nil) + O: 2 12 -14 -9.19e+00,-3.92e+01,-1.68e+02,+1.73e+02 1 + 11 13 +1.17e+01,+3.45e+01,-2.85e+02,+2.87e+02 1 GenVertex: -9 ID: 0 (X,cT):0 - I: 2 13 2 -1.06e+00,+5.40e-01,+6.25e-01,+1.38e+00 2 -9 - 14 2101 -9.42e-01,+2.17e-01,+6.53e+03,+6.53e+03 2 -9 + I: 2 14 2101 -9.42e-01,+2.17e-01,+6.53e+03,+6.53e+03 2 -9 + 13 2 -1.06e+00,+5.40e-01,+6.25e-01,+1.38e+00 2 -9 O: 1 35 92 -2.00e+00,+7.56e-01,+6.53e+03,+6.54e+03 2 -10 GenVertex: -10 ID: 0 (X,cT):0 I: 1 35 92 -2.00e+00,+7.56e-01,+6.53e+03,+6.54e+03 2 -10 O: 9 37 333 -1.11e+00,+1.44e-01,+2.44e+00,+2.87e+00 2 -17 - 38 -321 +5.75e-01,-1.63e-01,+3.07e+00,+3.17e+00 1 (nil) + 38 -321 +5.75e-01,-1.63e-01,+3.07e+00,+3.17e+00 1 39 323 -4.93e-01,+1.18e-01,+1.14e+01,+1.14e+01 2 -18 40 333 +4.67e-02,-1.10e-02,+6.10e+01,+6.10e+01 2 -19 41 -313 +6.61e-02,+2.00e-01,+1.02e+02,+1.02e+02 2 -20 - 42 -211 +6.62e-01,+2.34e-03,+1.91e+01,+1.92e+01 1 (nil) + 42 -211 +6.62e-01,+2.34e-03,+1.91e+01,+1.92e+01 1 43 213 -1.13e+00,+2.68e-01,+8.99e+02,+8.99e+02 2 -21 - 44 2112 -3.44e-01,+2.18e-02,+5.44e+03,+5.44e+03 1 (nil) - 36 321 -2.73e-01,+1.76e-01,+9.69e-01,+1.13e+00 1 (nil) + 44 2112 -3.44e-01,+2.18e-02,+5.44e+03,+5.44e+03 1 + 36 321 -2.73e-01,+1.76e-01,+9.69e-01,+1.13e+00 1 GenVertex: -11 ID: 0 (X,cT):0 - I:15 29 2203 +2.49e+00,+5.11e-01,-5.57e+03,+5.57e+03 2 -11 - 26 21 -3.65e+00,+1.06e+00,-1.44e+02,+1.44e+02 2 -11 + I:15 26 21 -3.65e+00,+1.06e+00,-1.44e+02,+1.44e+02 2 -11 27 21 -8.57e-01,+1.30e+00,-8.64e+01,+8.64e+01 2 -11 - 23 21 -6.21e-01,-2.83e+00,-4.24e+01,+4.25e+01 2 -11 - 25 21 -4.72e-02,-2.81e-01,-7.30e+00,+7.31e+00 2 -11 28 21 +2.10e-01,-2.36e-01,-5.04e+02,+5.04e+02 2 -11 + 15 2 +3.93e-01,-4.42e-01,+2.02e+01,+2.03e+01 2 -11 + 17 21 -1.67e-01,+9.43e-01,-4.22e+00,+4.33e+00 2 -11 + 23 21 -6.21e-01,-2.83e+00,-4.24e+01,+4.25e+01 2 -11 + 24 21 -1.09e-01,+2.50e-02,-1.28e+01,+1.28e+01 2 -11 + 29 2203 +2.49e+00,+5.11e-01,-5.57e+03,+5.57e+03 2 -11 + 16 21 +1.28e+00,-8.74e-01,+5.02e+01,+5.02e+01 2 -11 + 25 21 -4.72e-02,-2.81e-01,-7.30e+00,+7.31e+00 2 -11 + 18 21 +9.34e-01,+2.91e+00,+1.97e+01,+2.00e+01 2 -11 + 19 21 -2.14e+00,+4.17e+00,-2.51e+00,+5.32e+00 2 -11 20 21 +2.14e+00,-4.17e+00,-7.24e+00,+8.62e+00 2 -11 21 21 +2.68e+00,-1.72e+00,-3.07e+01,+3.09e+01 2 -11 22 21 -2.68e+00,+1.72e+00,-1.05e+02,+1.05e+02 2 -11 - 24 21 -1.09e-01,+2.50e-02,-1.28e+01,+1.28e+01 2 -11 - 16 21 +1.28e+00,-8.74e-01,+5.02e+01,+5.02e+01 2 -11 - 17 21 -1.67e-01,+9.43e-01,-4.22e+00,+4.33e+00 2 -11 - 18 21 +9.34e-01,+2.91e+00,+1.97e+01,+2.00e+01 2 -11 - 19 21 -2.14e+00,+4.17e+00,-2.51e+00,+5.32e+00 2 -11 - 15 2 +3.93e-01,-4.42e-01,+2.02e+01,+2.03e+01 2 -11 O: 1 45 92 -1.50e-01,+2.09e+00,-6.43e+03,+6.61e+03 2 -12 GenVertex: -12 ID: 0 (X,cT):0 I: 1 45 92 -1.50e-01,+2.09e+00,-6.43e+03,+6.61e+03 2 -12 - O:44 53 113 -2.30e-01,+1.48e-01,-1.62e+00,+1.84e+00 2 -27 + O:44 72 213 +4.81e-01,-1.41e-01,-1.37e+01,+1.37e+01 2 -40 + 81 211 -1.23e+00,+5.35e-01,-3.48e+01,+3.49e+01 1 + 82 311 -1.74e-02,+2.33e-01,-6.04e+01,+6.04e+01 2 -45 + 83 -323 -5.63e-01,-7.34e-02,-1.48e+02,+1.48e+02 2 -46 + 73 111 -6.69e-01,+1.78e-01,-1.87e+01,+1.87e+01 2 -41 + 75 2212 -3.93e-01,+8.27e-02,-3.98e+01,+3.98e+01 1 + 47 113 +6.88e-02,-1.41e-01,+2.65e+01,+2.66e+01 2 -22 + 76 -2212 -6.65e-01,+6.91e-02,-2.61e+01,+2.61e+01 1 + 77 3224 -4.07e-01,-1.66e+00,-3.45e+01,+3.46e+01 2 -43 + 78 311 -2.78e-01,+5.33e-02,-1.90e+01,+1.90e+01 2 -44 + 79 -2112 -1.86e+00,+2.64e-01,-6.69e+01,+6.69e+01 1 + 80 -211 -4.20e-01,-6.99e-02,-4.46e+01,+4.47e+01 1 + 85 113 +1.80e-02,+8.34e-01,-6.47e+02,+6.47e+02 2 -47 + 84 211 -1.34e-01,-9.12e-02,-7.11e+00,+7.11e+00 1 + 86 -211 +2.67e-01,-2.79e-01,-5.20e+02,+5.20e+02 1 + 87 213 +3.40e-01,+1.94e-01,-1.02e+03,+1.02e+03 2 -48 + 48 -211 -3.37e-01,-1.68e-01,+9.43e+00,+9.44e+00 1 + 88 2214 +5.67e-01,+9.88e-02,-8.80e+02,+8.80e+02 2 -49 + 46 211 +1.39e+00,-8.14e-01,+3.12e+01,+3.13e+01 1 + 71 -321 -2.78e-01,+3.30e-01,-8.84e+00,+8.87e+00 1 + 49 113 +6.00e-01,-2.67e-01,+2.22e+00,+2.44e+00 2 -23 + 50 323 -3.07e-01,-6.12e-02,-1.42e-02,+9.76e-01 2 -24 + 51 -313 +1.43e-02,+4.68e-01,-3.88e-01,+1.12e+00 2 -25 + 89 223 +1.23e+00,+3.33e-01,-2.87e+03,+2.87e+03 2 -50 + 52 111 +8.08e-02,-1.35e-02,-7.15e-01,+7.33e-01 2 -26 + 53 113 -2.30e-01,+1.48e-01,-1.62e+00,+1.84e+00 2 -27 54 223 +3.60e-01,+7.58e-01,+8.72e-01,+1.44e+00 2 -28 55 113 +1.21e-01,+1.16e-01,+9.83e-01,+1.26e+00 2 -29 56 -213 +8.69e-02,+1.01e+00,+7.42e+00,+7.52e+00 2 -30 57 323 +1.76e-01,+4.23e-01,+1.93e+00,+2.16e+00 2 -31 - 58 -321 +1.93e-01,+1.97e-01,+6.13e+00,+6.16e+00 1 (nil) + 58 -321 +1.93e-01,+1.97e-01,+6.13e+00,+6.16e+00 1 59 223 -2.63e-01,+7.90e-01,+6.47e-01,+1.31e+00 2 -32 60 213 +1.35e-01,+1.08e+00,+5.74e-01,+1.37e+00 2 -33 - 61 -211 -1.05e+00,+1.11e+00,-1.21e-01,+1.54e+00 1 (nil) + 61 -211 -1.05e+00,+1.11e+00,-1.21e-01,+1.54e+00 1 62 213 -9.08e-02,+5.82e-01,-1.54e+00,+1.76e+00 2 -34 63 221 +1.94e-01,-2.74e-01,-2.66e-01,+6.95e-01 2 -35 64 -213 +2.31e-01,+2.74e-01,-1.31e+00,+1.58e+00 2 -36 65 213 -4.52e-01,+2.86e-01,-1.23e+00,+1.57e+00 2 -37 - 84 211 -1.34e-01,-9.12e-02,-7.11e+00,+7.11e+00 1 (nil) - 85 113 +1.80e-02,+8.34e-01,-6.47e+02,+6.47e+02 2 -47 - 86 -211 +2.67e-01,-2.79e-01,-5.20e+02,+5.20e+02 1 (nil) - 87 213 +3.40e-01,+1.94e-01,-1.02e+03,+1.02e+03 2 -48 - 88 2214 +5.67e-01,+9.88e-02,-8.80e+02,+8.80e+02 2 -49 - 89 223 +1.23e+00,+3.33e-01,-2.87e+03,+2.87e+03 2 -50 - 46 211 +1.39e+00,-8.14e-01,+3.12e+01,+3.13e+01 1 (nil) - 47 113 +6.88e-02,-1.41e-01,+2.65e+01,+2.66e+01 2 -22 - 48 -211 -3.37e-01,-1.68e-01,+9.43e+00,+9.44e+00 1 (nil) - 49 113 +6.00e-01,-2.67e-01,+2.22e+00,+2.44e+00 2 -23 - 50 323 -3.07e-01,-6.12e-02,-1.42e-02,+9.76e-01 2 -24 - 51 -313 +1.43e-02,+4.68e-01,-3.88e-01,+1.12e+00 2 -25 - 52 111 +8.08e-02,-1.35e-02,-7.15e-01,+7.33e-01 2 -26 66 2114 +9.53e-01,-6.69e-01,-3.09e+00,+3.53e+00 2 -38 - 67 211 -1.36e-01,-6.50e-01,-8.86e-01,+1.12e+00 1 (nil) - 68 -2212 +8.49e-01,-2.09e+00,-5.29e+00,+5.82e+00 1 (nil) - 69 -211 +1.20e-01,+2.39e-01,-1.06e+00,+1.10e+00 1 (nil) + 67 211 -1.36e-01,-6.50e-01,-8.86e-01,+1.12e+00 1 + 68 -2212 +8.49e-01,-2.09e+00,-5.29e+00,+5.82e+00 1 + 69 -211 +1.20e-01,+2.39e-01,-1.06e+00,+1.10e+00 1 70 323 +1.48e+00,-9.63e-01,-1.55e+01,+1.56e+01 2 -39 - 71 -321 -2.78e-01,+3.30e-01,-8.84e+00,+8.87e+00 1 (nil) - 72 213 +4.81e-01,-1.41e-01,-1.37e+01,+1.37e+01 2 -40 - 73 111 -6.69e-01,+1.78e-01,-1.87e+01,+1.87e+01 2 -41 74 -213 -3.45e-01,-1.71e-01,-1.77e+01,+1.77e+01 2 -42 - 75 2212 -3.93e-01,+8.27e-02,-3.98e+01,+3.98e+01 1 (nil) - 76 -2212 -6.65e-01,+6.91e-02,-2.61e+01,+2.61e+01 1 (nil) - 77 3224 -4.07e-01,-1.66e+00,-3.45e+01,+3.46e+01 2 -43 - 78 311 -2.78e-01,+5.33e-02,-1.90e+01,+1.90e+01 2 -44 - 79 -2112 -1.86e+00,+2.64e-01,-6.69e+01,+6.69e+01 1 (nil) - 80 -211 -4.20e-01,-6.99e-02,-4.46e+01,+4.47e+01 1 (nil) - 81 211 -1.23e+00,+5.35e-01,-3.48e+01,+3.49e+01 1 (nil) - 82 311 -1.74e-02,+2.33e-01,-6.04e+01,+6.04e+01 2 -45 - 83 -323 -5.63e-01,-7.34e-02,-1.48e+02,+1.48e+02 2 -46 GenVertex: -13 ID: 0 (X,cT):0 I: 3 30 21 -3.00e+00,+2.35e+00,+2.36e+02,+2.36e+02 2 -13 - 31 21 -9.34e-01,-2.91e+00,+1.02e+02,+1.02e+02 2 -13 32 21 +3.00e+00,-2.35e+00,+2.97e+01,+3.00e+01 2 -13 + 31 21 -9.34e-01,-2.91e+00,+1.02e+02,+1.02e+02 2 -13 O: 1 90 92 -9.34e-01,-2.91e+00,+3.67e+02,+3.67e+02 2 -14 GenVertex: -14 ID: 0 (X,cT):0 I: 1 90 92 -9.34e-01,-2.91e+00,+3.67e+02,+3.67e+02 2 -14 - O:11 91 211 -8.24e-01,-1.45e-02,+1.59e+01,+1.59e+01 1 (nil) - 92 -211 -1.30e+00,+8.92e-01,+8.32e+01,+8.33e+01 1 (nil) - 93 -311 -2.08e-02,-2.14e-01,+2.11e+01,+2.11e+01 2 -51 + O:11 93 -311 -2.08e-02,-2.14e-01,+2.11e+01,+2.11e+01 2 -51 94 313 -3.62e-01,+5.42e-01,+5.03e+01,+5.03e+01 2 -52 - 95 213 -8.94e-01,-3.47e-01,+5.52e+01,+5.52e+01 2 -53 - 96 113 -1.28e-01,-1.56e-01,+3.41e+01,+3.41e+01 2 -54 - 97 -211 -5.72e-01,-9.49e-01,+3.99e+01,+3.99e+01 1 (nil) 98 111 +4.23e-01,-2.45e-01,+3.08e+00,+3.12e+00 2 -55 - 99 -2112 +1.14e+00,-1.49e+00,+2.49e+01,+2.50e+01 1 (nil) - 100 2112 +5.39e-01,-8.02e-01,+1.40e+01,+1.41e+01 1 (nil) + 95 213 -8.94e-01,-3.47e-01,+5.52e+01,+5.52e+01 2 -53 + 92 -211 -1.30e+00,+8.92e-01,+8.32e+01,+8.33e+01 1 + 96 113 -1.28e-01,-1.56e-01,+3.41e+01,+3.41e+01 2 -54 + 97 -211 -5.72e-01,-9.49e-01,+3.99e+01,+3.99e+01 1 + 99 -2112 +1.14e+00,-1.49e+00,+2.49e+01,+2.50e+01 1 + 100 2112 +5.39e-01,-8.02e-01,+1.40e+01,+1.41e+01 1 101 223 +1.06e+00,-1.22e-01,+2.53e+01,+2.53e+01 2 -56 + 91 211 -8.24e-01,-1.45e-02,+1.59e+01,+1.59e+01 1 GenVertex: -15 ID: 0 (X,cT):0 - I: 2 33 21 +1.02e+00,-2.88e+00,-9.85e+00,+1.03e+01 2 -15 - 34 21 -1.02e+00,+2.88e+00,-7.45e+00,+8.05e+00 2 -15 + I: 2 34 21 -1.02e+00,+2.88e+00,-7.45e+00,+8.05e+00 2 -15 + 33 21 +1.02e+00,-2.88e+00,-9.85e+00,+1.03e+01 2 -15 O: 1 102 92 +0.00e+00,+0.00e+00,-1.73e+01,+1.84e+01 2 -16 GenVertex: -16 ID: 0 (X,cT):0 I: 1 102 92 +0.00e+00,+0.00e+00,-1.73e+01,+1.84e+01 2 -16 - O: 7 103 113 +2.54e-01,-1.28e-01,-3.69e+00,+3.77e+00 2 -57 - 104 223 -7.85e-02,+4.34e-02,-9.82e-01,+1.26e+00 2 -58 - 105 213 +1.78e-01,+3.27e-01,-2.62e+00,+2.77e+00 2 -59 + O: 7 105 213 +1.78e-01,+3.27e-01,-2.62e+00,+2.77e+00 2 -59 106 111 +1.94e-01,-8.30e-01,-1.78e+00,+1.98e+00 2 -60 - 107 -211 -2.88e-01,+5.23e-01,-3.10e+00,+3.16e+00 1 (nil) - 108 223 +2.53e-01,-1.38e-01,-2.52e+00,+2.66e+00 2 -61 109 113 -5.13e-01,+2.04e-01,-2.60e+00,+2.77e+00 2 -62 + 103 113 +2.54e-01,-1.28e-01,-3.69e+00,+3.77e+00 2 -57 + 104 223 -7.85e-02,+4.34e-02,-9.82e-01,+1.26e+00 2 -58 + 107 -211 -2.88e-01,+5.23e-01,-3.10e+00,+3.16e+00 1 + 108 223 +2.53e-01,-1.38e-01,-2.52e+00,+2.66e+00 2 -61 GenVertex: -17 ID: 0 (X,cT):0 I: 1 37 333 -1.11e+00,+1.44e-01,+2.44e+00,+2.87e+00 2 -17 - O: 2 110 321 -5.35e-01,-4.15e-03,+1.39e+00,+1.57e+00 1 (nil) - 111 -321 -5.74e-01,+1.48e-01,+1.05e+00,+1.30e+00 1 (nil) + O: 2 110 321 -5.35e-01,-4.15e-03,+1.39e+00,+1.57e+00 1 + 111 -321 -5.74e-01,+1.48e-01,+1.05e+00,+1.30e+00 1 GenVertex: -18 ID: 0 (X,cT):0 I: 1 39 323 -4.93e-01,+1.18e-01,+1.14e+01,+1.14e+01 2 -18 - O: 2 112 311 -1.65e-01,+7.95e-02,+8.26e+00,+8.27e+00 2 -63 - 113 211 -3.29e-01,+3.86e-02,+3.09e+00,+3.12e+00 1 (nil) + O: 2 113 211 -3.29e-01,+3.86e-02,+3.09e+00,+3.12e+00 1 + 112 311 -1.65e-01,+7.95e-02,+8.26e+00,+8.27e+00 2 -63 GenVertex: -19 ID: 0 (X,cT):0 I: 1 40 333 +4.67e-02,-1.10e-02,+6.10e+01,+6.10e+01 2 -19 - O: 2 114 321 -8.91e-02,+3.84e-02,+3.21e+01,+3.21e+01 1 (nil) - 115 -321 +1.36e-01,-4.94e-02,+2.89e+01,+2.89e+01 1 (nil) + O: 2 114 321 -8.91e-02,+3.84e-02,+3.21e+01,+3.21e+01 1 + 115 -321 +1.36e-01,-4.94e-02,+2.89e+01,+2.89e+01 1 GenVertex: -20 ID: 0 (X,cT):0 I: 1 41 -313 +6.61e-02,+2.00e-01,+1.02e+02,+1.02e+02 2 -20 O: 2 116 -311 -2.08e-01,+2.83e-01,+4.52e+01,+4.53e+01 2 -64 117 111 +2.74e-01,-8.21e-02,+5.65e+01,+5.65e+01 2 -65 GenVertex: -21 ID: 0 (X,cT):0 I: 1 43 213 -1.13e+00,+2.68e-01,+8.99e+02,+8.99e+02 2 -21 - O: 2 118 211 -1.03e+00,+4.32e-01,+6.38e+02,+6.38e+02 1 (nil) + O: 2 118 211 -1.03e+00,+4.32e-01,+6.38e+02,+6.38e+02 1 119 111 -1.00e-01,-1.65e-01,+2.61e+02,+2.61e+02 2 -66 GenVertex: -22 ID: 0 (X,cT):0 I: 1 47 113 +6.88e-02,-1.41e-01,+2.65e+01,+2.66e+01 2 -22 - O: 2 120 -211 +2.55e-01,-1.00e-02,+2.33e+01,+2.33e+01 1 (nil) - 121 211 -1.86e-01,-1.31e-01,+3.23e+00,+3.24e+00 1 (nil) + O: 2 120 -211 +2.55e-01,-1.00e-02,+2.33e+01,+2.33e+01 1 + 121 211 -1.86e-01,-1.31e-01,+3.23e+00,+3.24e+00 1 GenVertex: -23 ID: 0 (X,cT):0 I: 1 49 113 +6.00e-01,-2.67e-01,+2.22e+00,+2.44e+00 2 -23 - O: 2 122 211 +7.62e-01,-2.15e-01,+1.64e+00,+1.83e+00 1 (nil) - 123 -211 -1.62e-01,-5.17e-02,+5.74e-01,+6.14e-01 1 (nil) + O: 2 122 211 +7.62e-01,-2.15e-01,+1.64e+00,+1.83e+00 1 + 123 -211 -1.62e-01,-5.17e-02,+5.74e-01,+6.14e-01 1 GenVertex: -24 ID: 0 (X,cT):0 I: 1 50 323 -3.07e-01,-6.12e-02,-1.42e-02,+9.76e-01 2 -24 - O: 2 124 311 -4.48e-01,-2.27e-01,-7.65e-02,+7.11e-01 2 -67 - 125 211 +1.40e-01,+1.66e-01,+6.23e-02,+2.65e-01 1 (nil) + O: 2 125 211 +1.40e-01,+1.66e-01,+6.23e-02,+2.65e-01 1 + 124 311 -4.48e-01,-2.27e-01,-7.65e-02,+7.11e-01 2 -67 GenVertex: -25 ID: 0 (X,cT):0 I: 1 51 -313 +1.43e-02,+4.68e-01,-3.88e-01,+1.12e+00 2 -25 - O: 2 126 -321 -2.60e-02,+2.92e-01,+9.54e-02,+5.82e-01 1 (nil) - 127 211 +4.03e-02,+1.76e-01,-4.83e-01,+5.35e-01 1 (nil) + O: 2 126 -321 -2.60e-02,+2.92e-01,+9.54e-02,+5.82e-01 1 + 127 211 +4.03e-02,+1.76e-01,-4.83e-01,+5.35e-01 1 Vertex: -26 ID: 0 (X,cT)=+4.64e-05,-7.72e-06,-4.10e-04,+4.20e-04 I: 1 52 111 +8.08e-02,-1.35e-02,-7.15e-01,+7.33e-01 2 -26 - O: 2 128 22 -1.68e-02,+2.28e-02,-3.88e-02,+4.80e-02 1 (nil) - 129 22 +9.76e-02,-3.63e-02,-6.77e-01,+6.85e-01 1 (nil) + O: 2 128 22 -1.68e-02,+2.28e-02,-3.88e-02,+4.80e-02 1 + 129 22 +9.76e-02,-3.63e-02,-6.77e-01,+6.85e-01 1 GenVertex: -27 ID: 0 (X,cT):0 I: 1 53 113 -2.30e-01,+1.48e-01,-1.62e+00,+1.84e+00 2 -27 - O: 2 130 -211 -8.09e-02,+2.95e-01,-1.97e-01,+3.90e-01 1 (nil) - 131 211 -1.49e-01,-1.47e-01,-1.43e+00,+1.45e+00 1 (nil) + O: 2 130 -211 -8.09e-02,+2.95e-01,-1.97e-01,+3.90e-01 1 + 131 211 -1.49e-01,-1.47e-01,-1.43e+00,+1.45e+00 1 GenVertex: -28 ID: 0 (X,cT):0 I: 1 54 223 +3.60e-01,+7.58e-01,+8.72e-01,+1.44e+00 2 -28 - O: 3 132 211 +1.97e-01,+3.51e-01,+6.75e-01,+7.98e-01 1 (nil) - 133 -211 -3.88e-02,+1.47e-01,+2.00e-01,+2.87e-01 1 (nil) + O: 3 132 211 +1.97e-01,+3.51e-01,+6.75e-01,+7.98e-01 1 + 133 -211 -3.88e-02,+1.47e-01,+2.00e-01,+2.87e-01 1 134 111 +2.02e-01,+2.60e-01,-3.27e-03,+3.56e-01 2 -68 GenVertex: -29 ID: 0 (X,cT):0 I: 1 55 113 +1.21e-01,+1.16e-01,+9.83e-01,+1.26e+00 2 -29 - O: 2 135 -211 +1.15e-01,+2.71e-01,+9.97e-01,+1.05e+00 1 (nil) - 136 211 +5.83e-03,-1.56e-01,-1.47e-02,+2.10e-01 1 (nil) + O: 2 135 -211 +1.15e-01,+2.71e-01,+9.97e-01,+1.05e+00 1 + 136 211 +5.83e-03,-1.56e-01,-1.47e-02,+2.10e-01 1 GenVertex: -30 ID: 0 (X,cT):0 I: 1 56 -213 +8.69e-02,+1.01e+00,+7.42e+00,+7.52e+00 2 -30 - O: 2 137 -211 -8.49e-03,+1.28e-01,+3.83e-01,+4.28e-01 1 (nil) + O: 2 137 -211 -8.49e-03,+1.28e-01,+3.83e-01,+4.28e-01 1 138 111 +9.53e-02,+8.80e-01,+7.03e+00,+7.09e+00 2 -69 GenVertex: -31 ID: 0 (X,cT):0 I: 1 57 323 +1.76e-01,+4.23e-01,+1.93e+00,+2.16e+00 2 -31 - O: 2 139 311 +6.63e-02,+5.21e-01,+1.76e+00,+1.90e+00 2 -70 - 140 211 +1.10e-01,-9.78e-02,+1.66e-01,+2.62e-01 1 (nil) + O: 2 140 211 +1.10e-01,-9.78e-02,+1.66e-01,+2.62e-01 1 + 139 311 +6.63e-02,+5.21e-01,+1.76e+00,+1.90e+00 2 -70 GenVertex: -32 ID: 0 (X,cT):0 I: 1 59 223 -2.63e-01,+7.90e-01,+6.47e-01,+1.31e+00 2 -32 - O: 3 141 211 -1.81e-01,+4.47e-01,+1.25e-01,+5.17e-01 1 (nil) - 142 -211 -2.25e-01,+2.99e-01,+3.59e-01,+5.38e-01 1 (nil) + O: 3 141 211 -1.81e-01,+4.47e-01,+1.25e-01,+5.17e-01 1 + 142 -211 -2.25e-01,+2.99e-01,+3.59e-01,+5.38e-01 1 143 111 +1.43e-01,+4.38e-02,+1.63e-01,+2.59e-01 2 -71 GenVertex: -33 ID: 0 (X,cT):0 I: 1 60 213 +1.35e-01,+1.08e+00,+5.74e-01,+1.37e+00 2 -33 - O: 2 144 211 +6.61e-02,+1.08e+00,+5.00e-01,+1.20e+00 1 (nil) + O: 2 144 211 +6.61e-02,+1.08e+00,+5.00e-01,+1.20e+00 1 145 111 +6.86e-02,-8.01e-04,+7.43e-02,+1.69e-01 2 -72 GenVertex: -34 ID: 0 (X,cT):0 I: 1 62 213 -9.08e-02,+5.82e-01,-1.54e+00,+1.76e+00 2 -34 - O: 2 146 211 -4.09e-02,-5.32e-02,-5.87e-01,+6.07e-01 1 (nil) - 147 111 -4.99e-02,+6.35e-01,-9.56e-01,+1.16e+00 2 -73 + O: 2 147 111 -4.99e-02,+6.35e-01,-9.56e-01,+1.16e+00 2 -73 + 146 211 -4.09e-02,-5.32e-02,-5.87e-01,+6.07e-01 1 GenVertex: -35 ID: 0 (X,cT):0 I: 1 63 221 +1.94e-01,-2.74e-01,-2.66e-01,+6.95e-01 2 -35 O: 3 148 111 -8.07e-02,-5.76e-02,-3.25e-02,+1.71e-01 2 -74 @@ -1837,113 +1971,113 @@ GenVertex: -35 ID: 0 (X,cT):0 150 111 +7.41e-02,-1.52e-01,-1.38e-01,+2.57e-01 2 -76 GenVertex: -36 ID: 0 (X,cT):0 I: 1 64 -213 +2.31e-01,+2.74e-01,-1.31e+00,+1.58e+00 2 -36 - O: 2 151 -211 +4.35e-01,+4.07e-01,-8.38e-01,+1.04e+00 1 (nil) + O: 2 151 -211 +4.35e-01,+4.07e-01,-8.38e-01,+1.04e+00 1 152 111 -2.04e-01,-1.33e-01,-4.69e-01,+5.45e-01 2 -77 GenVertex: -37 ID: 0 (X,cT):0 I: 1 65 213 -4.52e-01,+2.86e-01,-1.23e+00,+1.57e+00 2 -37 - O: 2 153 211 -1.15e-01,-2.61e-01,-4.89e-01,+5.83e-01 1 (nil) + O: 2 153 211 -1.15e-01,-2.61e-01,-4.89e-01,+5.83e-01 1 154 111 -3.37e-01,+5.47e-01,-7.40e-01,+9.89e-01 2 -78 GenVertex: -38 ID: 0 (X,cT):0 I: 1 66 2114 +9.53e-01,-6.69e-01,-3.09e+00,+3.53e+00 2 -38 - O: 2 155 2212 +6.04e-01,-7.13e-01,-2.45e+00,+2.79e+00 1 (nil) - 156 -211 +3.49e-01,+4.35e-02,-6.38e-01,+7.42e-01 1 (nil) + O: 2 155 2212 +6.04e-01,-7.13e-01,-2.45e+00,+2.79e+00 1 + 156 -211 +3.49e-01,+4.35e-02,-6.38e-01,+7.42e-01 1 GenVertex: -39 ID: 0 (X,cT):0 I: 1 70 323 +1.48e+00,-9.63e-01,-1.55e+01,+1.56e+01 2 -39 - O: 2 157 311 +5.39e-01,-2.99e-01,-4.42e+00,+4.49e+00 2 -79 - 158 211 +9.45e-01,-6.64e-01,-1.11e+01,+1.11e+01 1 (nil) + O: 2 158 211 +9.45e-01,-6.64e-01,-1.11e+01,+1.11e+01 1 + 157 311 +5.39e-01,-2.99e-01,-4.42e+00,+4.49e+00 2 -79 GenVertex: -40 ID: 0 (X,cT):0 I: 1 72 213 +4.81e-01,-1.41e-01,-1.37e+01,+1.37e+01 2 -40 - O: 2 159 211 +1.18e-04,-3.58e-01,-6.34e+00,+6.36e+00 1 (nil) + O: 2 159 211 +1.18e-04,-3.58e-01,-6.34e+00,+6.36e+00 1 160 111 +4.80e-01,+2.17e-01,-7.34e+00,+7.36e+00 2 -80 Vertex: -41 ID: 0 (X,cT)=-1.16e-04,+3.09e-05,-3.23e-03,+3.24e-03 I: 1 73 111 -6.69e-01,+1.78e-01,-1.87e+01,+1.87e+01 2 -41 - O: 2 161 22 -5.04e-01,+7.96e-02,-1.28e+01,+1.28e+01 1 (nil) - 162 22 -1.65e-01,+9.88e-02,-5.90e+00,+5.90e+00 1 (nil) + O: 2 161 22 -5.04e-01,+7.96e-02,-1.28e+01,+1.28e+01 1 + 162 22 -1.65e-01,+9.88e-02,-5.90e+00,+5.90e+00 1 GenVertex: -42 ID: 0 (X,cT):0 I: 1 74 -213 -3.45e-01,-1.71e-01,-1.77e+01,+1.77e+01 2 -42 - O: 2 163 -211 +1.33e-01,+1.21e-01,-7.19e+00,+7.19e+00 1 (nil) - 164 111 -4.77e-01,-2.92e-01,-1.05e+01,+1.05e+01 2 -81 + O: 2 164 111 -4.77e-01,-2.92e-01,-1.05e+01,+1.05e+01 2 -81 + 163 -211 +1.33e-01,+1.21e-01,-7.19e+00,+7.19e+00 1 GenVertex: -43 ID: 0 (X,cT):0 I: 1 77 3224 -4.07e-01,-1.66e+00,-3.45e+01,+3.46e+01 2 -43 O: 2 165 3122 -4.69e-01,-1.62e+00,-3.09e+01,+3.09e+01 2 -82 - 166 211 +6.12e-02,-3.83e-02,-3.63e+00,+3.64e+00 1 (nil) + 166 211 +6.12e-02,-3.83e-02,-3.63e+00,+3.64e+00 1 GenVertex: -44 ID: 0 (X,cT):0 I: 1 78 311 -2.78e-01,+5.33e-02,-1.90e+01,+1.90e+01 2 -44 - O: 1 167 130 -2.78e-01,+5.33e-02,-1.90e+01,+1.90e+01 1 (nil) + O: 1 167 130 -2.78e-01,+5.33e-02,-1.90e+01,+1.90e+01 1 GenVertex: -45 ID: 0 (X,cT):0 I: 1 82 311 -1.74e-02,+2.33e-01,-6.04e+01,+6.04e+01 2 -45 O: 1 168 310 -1.74e-02,+2.33e-01,-6.04e+01,+6.04e+01 2 -83 GenVertex: -46 ID: 0 (X,cT):0 I: 1 83 -323 -5.63e-01,-7.34e-02,-1.48e+02,+1.48e+02 2 -46 O: 2 169 -311 -5.45e-01,+2.59e-01,-8.99e+01,+8.99e+01 2 -84 - 170 -211 -1.76e-02,-3.32e-01,-5.80e+01,+5.80e+01 1 (nil) + 170 -211 -1.76e-02,-3.32e-01,-5.80e+01,+5.80e+01 1 GenVertex: -47 ID: 0 (X,cT):0 I: 1 85 113 +1.80e-02,+8.34e-01,-6.47e+02,+6.47e+02 2 -47 - O: 2 172 -211 -7.50e-02,+8.45e-01,-6.14e+02,+6.14e+02 1 (nil) - 171 211 +9.30e-02,-1.09e-02,-3.29e+01,+3.29e+01 1 (nil) + O: 2 171 211 +9.30e-02,-1.09e-02,-3.29e+01,+3.29e+01 1 + 172 -211 -7.50e-02,+8.45e-01,-6.14e+02,+6.14e+02 1 GenVertex: -48 ID: 0 (X,cT):0 I: 1 87 213 +3.40e-01,+1.94e-01,-1.02e+03,+1.02e+03 2 -48 - O: 2 173 211 +8.59e-02,+3.47e-01,-6.99e+02,+6.99e+02 1 (nil) + O: 2 173 211 +8.59e-02,+3.47e-01,-6.99e+02,+6.99e+02 1 174 111 +2.54e-01,-1.53e-01,-3.24e+02,+3.24e+02 2 -85 GenVertex: -49 ID: 0 (X,cT):0 I: 1 88 2214 +5.67e-01,+9.88e-02,-8.80e+02,+8.80e+02 2 -49 - O: 2 175 2212 +3.83e-01,+1.63e-01,-5.77e+02,+5.77e+02 1 (nil) + O: 2 175 2212 +3.83e-01,+1.63e-01,-5.77e+02,+5.77e+02 1 176 111 +1.84e-01,-6.41e-02,-3.04e+02,+3.04e+02 2 -86 GenVertex: -50 ID: 0 (X,cT):0 I: 1 89 223 +1.23e+00,+3.33e-01,-2.87e+03,+2.87e+03 2 -50 - O: 3 177 211 +5.33e-01,+7.46e-02,-1.01e+03,+1.01e+03 1 (nil) - 178 -211 +4.00e-01,-1.62e-02,-1.32e+03,+1.32e+03 1 (nil) + O: 3 178 -211 +4.00e-01,-1.62e-02,-1.32e+03,+1.32e+03 1 + 177 211 +5.33e-01,+7.46e-02,-1.01e+03,+1.01e+03 1 179 111 +2.98e-01,+2.74e-01,-5.41e+02,+5.41e+02 2 -87 GenVertex: -51 ID: 0 (X,cT):0 I: 1 93 -311 -2.08e-02,-2.14e-01,+2.11e+01,+2.11e+01 2 -51 - O: 1 180 130 -2.08e-02,-2.14e-01,+2.11e+01,+2.11e+01 1 (nil) + O: 1 180 130 -2.08e-02,-2.14e-01,+2.11e+01,+2.11e+01 1 GenVertex: -52 ID: 0 (X,cT):0 I: 1 94 313 -3.62e-01,+5.42e-01,+5.03e+01,+5.03e+01 2 -52 - O: 2 181 321 -3.90e-01,+2.06e-01,+3.09e+01,+3.09e+01 1 (nil) - 182 -211 +2.79e-02,+3.36e-01,+1.94e+01,+1.94e+01 1 (nil) + O: 2 181 321 -3.90e-01,+2.06e-01,+3.09e+01,+3.09e+01 1 + 182 -211 +2.79e-02,+3.36e-01,+1.94e+01,+1.94e+01 1 GenVertex: -53 ID: 0 (X,cT):0 I: 1 95 213 -8.94e-01,-3.47e-01,+5.52e+01,+5.52e+01 2 -53 - O: 2 183 211 -8.91e-01,-1.82e-01,+3.63e+01,+3.63e+01 1 (nil) + O: 2 183 211 -8.91e-01,-1.82e-01,+3.63e+01,+3.63e+01 1 184 111 -2.63e-03,-1.65e-01,+1.89e+01,+1.89e+01 2 -88 GenVertex: -54 ID: 0 (X,cT):0 I: 1 96 113 -1.28e-01,-1.56e-01,+3.41e+01,+3.41e+01 2 -54 - O: 2 185 -211 -1.20e-02,-3.34e-01,+2.86e+01,+2.86e+01 1 (nil) - 186 211 -1.16e-01,+1.78e-01,+5.45e+00,+5.46e+00 1 (nil) + O: 2 186 211 -1.16e-01,+1.78e-01,+5.45e+00,+5.46e+00 1 + 185 -211 -1.20e-02,-3.34e-01,+2.86e+01,+2.86e+01 1 Vertex: -55 ID: 0 (X,cT)=+4.23e-05,-2.45e-05,+3.08e-04,+3.12e-04 I: 1 98 111 +4.23e-01,-2.45e-01,+3.08e+00,+3.12e+00 2 -55 - O: 2 187 22 +2.88e-01,-9.56e-02,+1.70e+00,+1.72e+00 1 (nil) - 188 22 +1.35e-01,-1.49e-01,+1.38e+00,+1.40e+00 1 (nil) + O: 2 187 22 +2.88e-01,-9.56e-02,+1.70e+00,+1.72e+00 1 + 188 22 +1.35e-01,-1.49e-01,+1.38e+00,+1.40e+00 1 GenVertex: -56 ID: 0 (X,cT):0 I: 1 101 223 +1.06e+00,-1.22e-01,+2.53e+01,+2.53e+01 2 -56 - O: 3 189 211 +5.04e-01,-1.97e-01,+8.76e+00,+8.77e+00 1 (nil) - 190 -211 +2.54e-02,-9.08e-02,+3.85e+00,+3.86e+00 1 (nil) + O: 3 189 211 +5.04e-01,-1.97e-01,+8.76e+00,+8.77e+00 1 + 190 -211 +2.54e-02,-9.08e-02,+3.85e+00,+3.86e+00 1 191 111 +5.32e-01,+1.66e-01,+1.27e+01,+1.27e+01 2 -89 GenVertex: -57 ID: 0 (X,cT):0 I: 1 103 113 +2.54e-01,-1.28e-01,-3.69e+00,+3.77e+00 2 -57 - O: 2 192 -211 -1.71e-01,-5.67e-02,-2.24e+00,+2.25e+00 1 (nil) - 193 211 +4.26e-01,-7.15e-02,-1.45e+00,+1.52e+00 1 (nil) + O: 2 192 -211 -1.71e-01,-5.67e-02,-2.24e+00,+2.25e+00 1 + 193 211 +4.26e-01,-7.15e-02,-1.45e+00,+1.52e+00 1 GenVertex: -58 ID: 0 (X,cT):0 I: 1 104 223 -7.85e-02,+4.34e-02,-9.82e-01,+1.26e+00 2 -58 - O: 3 194 -211 +7.65e-02,-8.75e-02,-7.83e-01,+8.04e-01 1 (nil) - 195 211 -1.94e-01,+1.20e-01,-1.32e-01,+2.98e-01 1 (nil) + O: 3 194 -211 +7.65e-02,-8.75e-02,-7.83e-01,+8.04e-01 1 + 195 211 -1.94e-01,+1.20e-01,-1.32e-01,+2.98e-01 1 196 111 +3.92e-02,+1.08e-02,-6.72e-02,+1.56e-01 2 -90 GenVertex: -59 ID: 0 (X,cT):0 I: 1 105 213 +1.78e-01,+3.27e-01,-2.62e+00,+2.77e+00 2 -59 - O: 2 197 211 -2.80e-01,+2.51e-01,-1.39e+00,+1.44e+00 1 (nil) + O: 2 197 211 -2.80e-01,+2.51e-01,-1.39e+00,+1.44e+00 1 198 111 +4.58e-01,+7.63e-02,-1.24e+00,+1.33e+00 2 -91 Vertex: -60 ID: 0 (X,cT)=+9.83e-05,-4.21e-04,-9.04e-04,+1.00e-03 I: 1 106 111 +1.94e-01,-8.30e-01,-1.78e+00,+1.98e+00 2 -60 - O: 2 199 22 +1.08e-01,-5.84e-01,-1.11e+00,+1.25e+00 1 (nil) - 200 22 +8.65e-02,-2.46e-01,-6.78e-01,+7.27e-01 1 (nil) + O: 2 199 22 +1.08e-01,-5.84e-01,-1.11e+00,+1.25e+00 1 + 200 22 +8.65e-02,-2.46e-01,-6.78e-01,+7.27e-01 1 GenVertex: -61 ID: 0 (X,cT):0 I: 1 108 223 +2.53e-01,-1.38e-01,-2.52e+00,+2.66e+00 2 -61 - O: 3 201 -211 -4.19e-02,+9.47e-02,-3.16e-01,+3.61e-01 1 (nil) - 202 211 +1.25e-01,+2.93e-02,-2.70e-01,+3.30e-01 1 (nil) + O: 3 201 -211 -4.19e-02,+9.47e-02,-3.16e-01,+3.61e-01 1 + 202 211 +1.25e-01,+2.93e-02,-2.70e-01,+3.30e-01 1 203 111 +1.70e-01,-2.62e-01,-1.93e+00,+1.96e+00 2 -92 GenVertex: -62 ID: 0 (X,cT):0 I: 1 109 113 -5.13e-01,+2.04e-01,-2.60e+00,+2.77e+00 2 -62 - O: 2 204 211 -6.28e-01,+1.34e-01,-1.31e+00,+1.46e+00 1 (nil) - 205 -211 +1.15e-01,+6.97e-02,-1.29e+00,+1.30e+00 1 (nil) + O: 2 204 211 -6.28e-01,+1.34e-01,-1.31e+00,+1.46e+00 1 + 205 -211 +1.15e-01,+6.97e-02,-1.29e+00,+1.30e+00 1 GenVertex: -63 ID: 0 (X,cT):0 I: 1 112 311 -1.65e-01,+7.95e-02,+8.26e+00,+8.27e+00 2 -63 O: 1 206 310 -1.65e-01,+7.95e-02,+8.26e+00,+8.27e+00 2 -93 @@ -1952,113 +2086,113 @@ GenVertex: -64 ID: 0 (X,cT):0 O: 1 207 310 -2.08e-01,+2.83e-01,+4.52e+01,+4.53e+01 2 -94 Vertex: -65 ID: 0 (X,cT)=+7.38e-05,-2.21e-05,+1.52e-02,+1.52e-02 I: 1 117 111 +2.74e-01,-8.21e-02,+5.65e+01,+5.65e+01 2 -65 - O: 2 208 22 +3.27e-02,-6.35e-02,+1.64e+01,+1.64e+01 1 (nil) - 209 22 +2.41e-01,-1.86e-02,+4.01e+01,+4.01e+01 1 (nil) + O: 2 208 22 +3.27e-02,-6.35e-02,+1.64e+01,+1.64e+01 1 + 209 22 +2.41e-01,-1.86e-02,+4.01e+01,+4.01e+01 1 Vertex: -66 ID: 0 (X,cT)=-2.41e-05,-3.97e-05,+6.29e-02,+6.29e-02 I: 1 119 111 -1.00e-01,-1.65e-01,+2.61e+02,+2.61e+02 2 -66 - O: 2 210 22 -3.55e-02,-4.32e-03,+1.12e+02,+1.12e+02 1 (nil) - 211 22 -6.45e-02,-1.60e-01,+1.49e+02,+1.49e+02 1 (nil) + O: 2 210 22 -3.55e-02,-4.32e-03,+1.12e+02,+1.12e+02 1 + 211 22 -6.45e-02,-1.60e-01,+1.49e+02,+1.49e+02 1 GenVertex: -67 ID: 0 (X,cT):0 I: 1 124 311 -4.48e-01,-2.27e-01,-7.65e-02,+7.11e-01 2 -67 O: 1 212 310 -4.48e-01,-2.27e-01,-7.65e-02,+7.11e-01 2 -95 Vertex: -68 ID: 0 (X,cT)=+5.62e-07,+7.23e-07,-9.08e-09,+9.90e-07 I: 1 134 111 +2.02e-01,+2.60e-01,-3.27e-03,+3.56e-01 2 -68 - O: 2 213 22 +5.96e-02,+3.17e-04,-3.48e-03,+5.97e-02 1 (nil) - 214 22 +1.43e-01,+2.60e-01,+2.13e-04,+2.96e-01 1 (nil) + O: 2 213 22 +5.96e-02,+3.17e-04,-3.48e-03,+5.97e-02 1 + 214 22 +1.43e-01,+2.60e-01,+2.13e-04,+2.96e-01 1 Vertex: -69 ID: 0 (X,cT)=+6.81e-05,+6.29e-04,+5.02e-03,+5.07e-03 I: 1 138 111 +9.53e-02,+8.80e-01,+7.03e+00,+7.09e+00 2 -69 - O: 2 215 22 +9.82e-02,+6.35e-01,+5.48e+00,+5.52e+00 1 (nil) - 216 22 -2.90e-03,+2.45e-01,+1.55e+00,+1.57e+00 1 (nil) + O: 2 215 22 +9.82e-02,+6.35e-01,+5.48e+00,+5.52e+00 1 + 216 22 -2.90e-03,+2.45e-01,+1.55e+00,+1.57e+00 1 GenVertex: -70 ID: 0 (X,cT):0 I: 1 139 311 +6.63e-02,+5.21e-01,+1.76e+00,+1.90e+00 2 -70 O: 1 217 310 +6.63e-02,+5.21e-01,+1.76e+00,+1.90e+00 2 -96 Vertex: -71 ID: 0 (X,cT)=+2.07e-05,+6.35e-06,+2.36e-05,+3.76e-05 I: 1 143 111 +1.43e-01,+4.38e-02,+1.63e-01,+2.59e-01 2 -71 - O: 2 219 22 -2.87e-03,+5.32e-02,+2.80e-02,+6.02e-02 1 (nil) - 218 22 +1.46e-01,-9.35e-03,+1.35e-01,+1.99e-01 1 (nil) + O: 2 219 22 -2.87e-03,+5.32e-02,+2.80e-02,+6.02e-02 1 + 218 22 +1.46e-01,-9.35e-03,+1.35e-01,+1.99e-01 1 Vertex: -72 ID: 0 (X,cT)=+3.76e-05,-4.39e-07,+4.07e-05,+9.25e-05 I: 1 145 111 +6.86e-02,-8.01e-04,+7.43e-02,+1.69e-01 2 -72 - O: 2 220 22 +2.42e-02,+6.45e-02,+1.68e-02,+7.09e-02 1 (nil) - 221 22 +4.44e-02,-6.53e-02,+5.76e-02,+9.78e-02 1 (nil) + O: 2 220 22 +2.42e-02,+6.45e-02,+1.68e-02,+7.09e-02 1 + 221 22 +4.44e-02,-6.53e-02,+5.76e-02,+9.78e-02 1 Vertex: -73 ID: 0 (X,cT)=-5.91e-06,+7.52e-05,-1.13e-04,+1.37e-04 I: 1 147 111 -4.99e-02,+6.35e-01,-9.56e-01,+1.16e+00 2 -73 - O: 2 222 22 -6.98e-02,+2.12e-01,-3.96e-01,+4.55e-01 1 (nil) - 223 22 +1.99e-02,+4.23e-01,-5.60e-01,+7.02e-01 1 (nil) + O: 2 222 22 -6.98e-02,+2.12e-01,-3.96e-01,+4.55e-01 1 + 223 22 +1.99e-02,+4.23e-01,-5.60e-01,+7.02e-01 1 Vertex: -74 ID: 0 (X,cT)=-3.84e-05,-2.74e-05,-1.55e-05,+8.12e-05 I: 1 148 111 -8.07e-02,-5.76e-02,-3.25e-02,+1.71e-01 2 -74 - O: 2 224 22 -1.12e-01,-6.36e-02,-5.73e-03,+1.29e-01 1 (nil) - 225 22 +3.13e-02,+6.07e-03,-2.68e-02,+4.17e-02 1 (nil) + O: 2 224 22 -1.12e-01,-6.36e-02,-5.73e-03,+1.29e-01 1 + 225 22 +3.13e-02,+6.07e-03,-2.68e-02,+4.17e-02 1 Vertex: -75 ID: 0 (X,cT)=+4.38e-07,-1.40e-07,-2.10e-07,+5.85e-07 I: 1 149 111 +2.01e-01,-6.40e-02,-9.60e-02,+2.68e-01 2 -75 - O: 2 226 22 +1.78e-01,-9.49e-02,-1.07e-01,+2.28e-01 1 (nil) - 227 22 +2.25e-02,+3.09e-02,+1.06e-02,+3.97e-02 1 (nil) + O: 2 226 22 +1.78e-01,-9.49e-02,-1.07e-01,+2.28e-01 1 + 227 22 +2.25e-02,+3.09e-02,+1.06e-02,+3.97e-02 1 Vertex: -76 ID: 0 (X,cT)=+2.78e-06,-5.71e-06,-5.17e-06,+9.63e-06 I: 1 150 111 +7.41e-02,-1.52e-01,-1.38e-01,+2.57e-01 2 -76 - O: 2 228 22 +2.08e-02,-3.01e-03,-8.82e-02,+9.06e-02 1 (nil) - 229 22 +5.32e-02,-1.49e-01,-4.97e-02,+1.66e-01 1 (nil) + O: 2 229 22 +5.32e-02,-1.49e-01,-4.97e-02,+1.66e-01 1 + 228 22 +2.08e-02,-3.01e-03,-8.82e-02,+9.06e-02 1 Vertex: -77 ID: 0 (X,cT)=-1.62e-04,-1.05e-04,-3.72e-04,+4.33e-04 I: 1 152 111 -2.04e-01,-1.33e-01,-4.69e-01,+5.45e-01 2 -77 - O: 2 230 22 -5.35e-02,-1.09e-01,-1.58e-01,+1.99e-01 1 (nil) - 231 22 -1.50e-01,-2.43e-02,-3.11e-01,+3.46e-01 1 (nil) + O: 2 230 22 -5.35e-02,-1.09e-01,-1.58e-01,+1.99e-01 1 + 231 22 -1.50e-01,-2.43e-02,-3.11e-01,+3.46e-01 1 Vertex: -78 ID: 0 (X,cT)=-3.66e-05,+5.95e-05,-8.05e-05,+1.08e-04 I: 1 154 111 -3.37e-01,+5.47e-01,-7.40e-01,+9.89e-01 2 -78 - O: 2 232 22 -2.19e-01,+4.46e-01,-6.11e-01,+7.88e-01 1 (nil) - 233 22 -1.17e-01,+1.01e-01,-1.29e-01,+2.01e-01 1 (nil) + O: 2 232 22 -2.19e-01,+4.46e-01,-6.11e-01,+7.88e-01 1 + 233 22 -1.17e-01,+1.01e-01,-1.29e-01,+2.01e-01 1 GenVertex: -79 ID: 0 (X,cT):0 I: 1 157 311 +5.39e-01,-2.99e-01,-4.42e+00,+4.49e+00 2 -79 - O: 1 234 130 +5.39e-01,-2.99e-01,-4.42e+00,+4.49e+00 1 (nil) + O: 1 234 130 +5.39e-01,-2.99e-01,-4.42e+00,+4.49e+00 1 Vertex: -80 ID: 0 (X,cT)=+1.61e-05,+7.28e-06,-2.46e-04,+2.47e-04 I: 1 160 111 +4.80e-01,+2.17e-01,-7.34e+00,+7.36e+00 2 -80 - O: 2 235 22 +2.66e-01,+1.44e-01,-3.31e+00,+3.33e+00 1 (nil) - 236 22 +2.15e-01,+7.28e-02,-4.03e+00,+4.03e+00 1 (nil) + O: 2 235 22 +2.66e-01,+1.44e-01,-3.31e+00,+3.33e+00 1 + 236 22 +2.15e-01,+7.28e-02,-4.03e+00,+4.03e+00 1 Vertex: -81 ID: 0 (X,cT)=-3.45e-05,-2.11e-05,-7.57e-04,+7.58e-04 I: 1 164 111 -4.77e-01,-2.92e-01,-1.05e+01,+1.05e+01 2 -81 - O: 2 237 22 -1.85e-01,-4.71e-02,-2.98e+00,+2.99e+00 1 (nil) - 238 22 -2.92e-01,-2.45e-01,-7.48e+00,+7.49e+00 1 (nil) + O: 2 237 22 -1.85e-01,-4.71e-02,-2.98e+00,+2.99e+00 1 + 238 22 -2.92e-01,-2.45e-01,-7.48e+00,+7.49e+00 1 Vertex: -82 ID: 0 (X,cT)=-9.53e+01,-3.29e+02,-6.28e+03,+6.29e+03 I: 1 165 3122 -4.69e-01,-1.62e+00,-3.09e+01,+3.09e+01 2 -82 - O: 2 239 2212 -4.74e-01,-1.44e+00,-2.62e+01,+2.62e+01 1 (nil) - 240 -211 +5.01e-03,-1.82e-01,-4.71e+00,+4.71e+00 1 (nil) + O: 2 240 -211 +5.01e-03,-1.82e-01,-4.71e+00,+4.71e+00 1 + 239 2212 -4.74e-01,-1.44e+00,-2.62e+01,+2.62e+01 1 Vertex: -83 ID: 0 (X,cT)=-1.49e+00,+1.99e+01,-5.17e+03,+5.17e+03 I: 1 168 310 -1.74e-02,+2.33e-01,-6.04e+01,+6.04e+01 2 -83 - O: 2 241 -211 -1.84e-01,-3.33e-04,-2.55e+01,+2.55e+01 1 (nil) - 242 211 +1.67e-01,+2.33e-01,-3.49e+01,+3.49e+01 1 (nil) + O: 2 241 -211 -1.84e-01,-3.33e-04,-2.55e+01,+2.55e+01 1 + 242 211 +1.67e-01,+2.33e-01,-3.49e+01,+3.49e+01 1 GenVertex: -84 ID: 0 (X,cT):0 I: 1 169 -311 -5.45e-01,+2.59e-01,-8.99e+01,+8.99e+01 2 -84 - O: 1 243 130 -5.45e-01,+2.59e-01,-8.99e+01,+8.99e+01 1 (nil) + O: 1 243 130 -5.45e-01,+2.59e-01,-8.99e+01,+8.99e+01 1 Vertex: -85 ID: 0 (X,cT)=+5.73e-06,-3.45e-06,-7.31e-03,+7.31e-03 I: 1 174 111 +2.54e-01,-1.53e-01,-3.24e+02,+3.24e+02 2 -85 - O: 2 244 22 +1.63e-01,-5.83e-02,-2.39e+02,+2.39e+02 1 (nil) - 245 22 +9.09e-02,-9.45e-02,-8.53e+01,+8.53e+01 1 (nil) + O: 2 244 22 +1.63e-01,-5.83e-02,-2.39e+02,+2.39e+02 1 + 245 22 +9.09e-02,-9.45e-02,-8.53e+01,+8.53e+01 1 Vertex: -86 ID: 0 (X,cT)=+4.34e-06,-1.51e-06,-7.14e-03,+7.14e-03 I: 1 176 111 +1.84e-01,-6.41e-02,-3.04e+02,+3.04e+02 2 -86 - O: 2 246 22 +3.56e-02,-7.99e-02,-1.18e+02,+1.18e+02 1 (nil) - 247 22 +1.49e-01,+1.58e-02,-1.86e+02,+1.86e+02 1 (nil) + O: 2 246 22 +3.56e-02,-7.99e-02,-1.18e+02,+1.18e+02 1 + 247 22 +1.49e-01,+1.58e-02,-1.86e+02,+1.86e+02 1 Vertex: -87 ID: 0 (X,cT)=+7.08e-05,+6.51e-05,-1.28e-01,+1.28e-01 I: 1 179 111 +2.98e-01,+2.74e-01,-5.41e+02,+5.41e+02 2 -87 - O: 2 248 22 +1.81e-01,+2.40e-01,-4.18e+02,+4.18e+02 1 (nil) - 249 22 +1.17e-01,+3.44e-02,-1.23e+02,+1.23e+02 1 (nil) + O: 2 248 22 +1.81e-01,+2.40e-01,-4.18e+02,+4.18e+02 1 + 249 22 +1.17e-01,+3.44e-02,-1.23e+02,+1.23e+02 1 Vertex: -88 ID: 0 (X,cT)=-6.24e-07,-3.92e-05,+4.48e-03,+4.48e-03 I: 1 184 111 -2.63e-03,-1.65e-01,+1.89e+01,+1.89e+01 2 -88 - O: 2 250 22 -1.32e-02,-1.02e-02,+2.51e-01,+2.52e-01 1 (nil) - 251 22 +1.06e-02,-1.55e-01,+1.86e+01,+1.86e+01 1 (nil) + O: 2 250 22 -1.32e-02,-1.02e-02,+2.51e-01,+2.52e-01 1 + 251 22 +1.06e-02,-1.55e-01,+1.86e+01,+1.86e+01 1 Vertex: -89 ID: 0 (X,cT)=+1.36e-04,+4.24e-05,+3.24e-03,+3.24e-03 I: 1 191 111 +5.32e-01,+1.66e-01,+1.27e+01,+1.27e+01 2 -89 - O: 2 252 22 +1.83e-01,+1.10e-01,+5.73e+00,+5.73e+00 1 (nil) - 253 22 +3.49e-01,+5.63e-02,+6.96e+00,+6.97e+00 1 (nil) + O: 2 253 22 +3.49e-01,+5.63e-02,+6.96e+00,+6.97e+00 1 + 252 22 +1.83e-01,+1.10e-01,+5.73e+00,+5.73e+00 1 Vertex: -90 ID: 0 (X,cT)=+3.53e-05,+9.71e-06,-6.05e-05,+1.41e-04 I: 1 196 111 +3.92e-02,+1.08e-02,-6.72e-02,+1.56e-01 2 -90 - O: 2 254 22 +7.69e-02,+3.56e-02,-7.15e-02,+1.11e-01 1 (nil) - 255 22 -3.77e-02,-2.48e-02,+4.24e-03,+4.53e-02 1 (nil) + O: 2 254 22 +7.69e-02,+3.56e-02,-7.15e-02,+1.11e-01 1 + 255 22 -3.77e-02,-2.48e-02,+4.24e-03,+4.53e-02 1 Vertex: -91 ID: 0 (X,cT)=+4.08e-05,+6.79e-06,-1.10e-04,+1.18e-04 I: 1 198 111 +4.58e-01,+7.63e-02,-1.24e+00,+1.33e+00 2 -91 - O: 2 257 22 +3.37e-01,+1.15e-01,-8.96e-01,+9.65e-01 1 (nil) - 256 22 +1.21e-01,-3.91e-02,-3.40e-01,+3.63e-01 1 (nil) + O: 2 257 22 +3.37e-01,+1.15e-01,-8.96e-01,+9.65e-01 1 + 256 22 +1.21e-01,-3.91e-02,-3.40e-01,+3.63e-01 1 Vertex: -92 ID: 0 (X,cT)=+5.61e-06,-8.66e-06,-6.40e-05,+6.49e-05 I: 1 203 111 +1.70e-01,-2.62e-01,-1.93e+00,+1.96e+00 2 -92 - O: 3 258 22 +3.78e-02,-1.90e-02,-5.69e-01,+5.70e-01 1 (nil) - 259 11 +1.27e-01,-2.18e-01,-1.21e+00,+1.24e+00 1 (nil) - 260 -11 +4.80e-03,-2.48e-02,-1.54e-01,+1.56e-01 1 (nil) + O: 3 258 22 +3.78e-02,-1.90e-02,-5.69e-01,+5.70e-01 1 + 259 11 +1.27e-01,-2.18e-01,-1.21e+00,+1.24e+00 1 + 260 -11 +4.80e-03,-2.48e-02,-1.54e-01,+1.56e-01 1 Vertex: -93 ID: 0 (X,cT)=-1.44e+01,+6.94e+00,+7.21e+02,+7.22e+02 I: 1 206 310 -1.65e-01,+7.95e-02,+8.26e+00,+8.27e+00 2 -93 O: 2 261 111 +9.20e-02,+1.32e-01,+2.25e+00,+2.26e+00 2 -97 @@ -2069,46 +2203,47 @@ Vertex: -94 ID: 0 (X,cT)=-7.78e+00,+1.06e+01,+1.70e+03,+1.70e+03 264 111 +8.17e-02,+1.26e-01,+8.62e+00,+8.62e+00 2 -100 Vertex: -95 ID: 0 (X,cT)=-1.37e+01,-6.92e+00,-2.33e+00,+2.17e+01 I: 1 212 310 -4.48e-01,-2.27e-01,-7.65e-02,+7.11e-01 2 -95 - O: 2 265 211 -2.95e-01,-9.17e-02,+1.55e-01,+3.73e-01 1 (nil) - 266 -211 -1.52e-01,-1.35e-01,-2.31e-01,+3.38e-01 1 (nil) + O: 2 265 211 -2.95e-01,-9.17e-02,+1.55e-01,+3.73e-01 1 + 266 -211 -1.52e-01,-1.35e-01,-2.31e-01,+3.38e-01 1 Vertex: -96 ID: 0 (X,cT)=+5.58e+00,+4.38e+01,+1.48e+02,+1.60e+02 I: 1 217 310 +6.63e-02,+5.21e-01,+1.76e+00,+1.90e+00 2 -96 O: 2 267 111 +1.60e-01,+1.55e-01,+1.10e+00,+1.13e+00 2 -101 268 111 -9.38e-02,+3.66e-01,+6.60e-01,+7.72e-01 2 -102 Vertex: -97 ID: 0 (X,cT)=-1.44e+01,+6.94e+00,+7.21e+02,+7.22e+02 I: 1 261 111 +9.20e-02,+1.32e-01,+2.25e+00,+2.26e+00 2 -97 - O: 2 269 22 +1.66e-02,-2.70e-02,+2.39e-01,+2.41e-01 1 (nil) - 270 22 +7.54e-02,+1.59e-01,+2.02e+00,+2.02e+00 1 (nil) + O: 2 269 22 +1.66e-02,-2.70e-02,+2.39e-01,+2.41e-01 1 + 270 22 +7.54e-02,+1.59e-01,+2.02e+00,+2.02e+00 1 Vertex: -98 ID: 0 (X,cT)=-1.44e+01,+6.94e+00,+7.21e+02,+7.22e+02 I: 1 262 111 -2.57e-01,-5.26e-02,+6.00e+00,+6.01e+00 2 -98 - O: 2 271 22 -7.17e-02,-3.17e-02,+3.25e+00,+3.25e+00 1 (nil) - 272 22 -1.85e-01,-2.09e-02,+2.76e+00,+2.76e+00 1 (nil) + O: 2 271 22 -7.17e-02,-3.17e-02,+3.25e+00,+3.25e+00 1 + 272 22 -1.85e-01,-2.09e-02,+2.76e+00,+2.76e+00 1 Vertex: -99 ID: 0 (X,cT)=-7.78e+00,+1.06e+01,+1.70e+03,+1.70e+03 I: 1 263 111 -2.89e-01,+1.56e-01,+3.66e+01,+3.66e+01 2 -99 - O: 2 273 22 -9.96e-02,+2.50e-02,+6.20e+00,+6.20e+00 1 (nil) - 274 22 -1.90e-01,+1.31e-01,+3.04e+01,+3.04e+01 1 (nil) + O: 2 273 22 -9.96e-02,+2.50e-02,+6.20e+00,+6.20e+00 1 + 274 22 -1.90e-01,+1.31e-01,+3.04e+01,+3.04e+01 1 Vertex: -100 ID: 0 (X,cT)=-7.78e+00,+1.06e+01,+1.70e+03,+1.70e+03 I: 1 264 111 +8.17e-02,+1.26e-01,+8.62e+00,+8.62e+00 2 -100 - O: 2 275 22 +7.76e-02,+2.39e-03,+3.60e+00,+3.60e+00 1 (nil) - 276 22 +4.09e-03,+1.24e-01,+5.01e+00,+5.02e+00 1 (nil) + O: 2 275 22 +7.76e-02,+2.39e-03,+3.60e+00,+3.60e+00 1 + 276 22 +4.09e-03,+1.24e-01,+5.01e+00,+5.02e+00 1 Vertex: -101 ID: 0 (X,cT)=+5.58e+00,+4.38e+01,+1.48e+02,+1.60e+02 I: 1 267 111 +1.60e-01,+1.55e-01,+1.10e+00,+1.13e+00 2 -101 - O: 2 277 22 +1.49e-01,+9.93e-02,+5.70e-01,+5.98e-01 1 (nil) - 278 22 +1.13e-02,+5.56e-02,+5.29e-01,+5.32e-01 1 (nil) + O: 2 277 22 +1.49e-01,+9.93e-02,+5.70e-01,+5.98e-01 1 + 278 22 +1.13e-02,+5.56e-02,+5.29e-01,+5.32e-01 1 Vertex: -102 ID: 0 (X,cT)=+5.58e+00,+4.38e+01,+1.48e+02,+1.60e+02 I: 1 268 111 -9.38e-02,+3.66e-01,+6.60e-01,+7.72e-01 2 -102 - O: 2 279 22 -6.60e-02,+5.16e-02,+1.69e-01,+1.89e-01 1 (nil) - 280 22 -2.77e-02,+3.15e-01,+4.91e-01,+5.84e-01 1 (nil) + O: 2 279 22 -6.60e-02,+5.16e-02,+1.69e-01,+1.89e-01 1 + 280 22 -2.77e-02,+3.15e-01,+4.91e-01,+5.84e-01 1 ________________________________________________________________________________ Print out hit information ------------------------------------------ -*** Muon System Hit (#hits=7) -E1 : e+ : pT=0.0261 : TOF=26.7 : x=(0.62,-0.926,-7.9) -E0 : e- : pT=0.000751 : TOF=35.4 : x=(1.18,1.87,8.1) -E1 : e- : pT=0.000339 : TOF=28.3 : x=(-0.849,0.529,-8) -E1 : pi+ : pT=0.208 : TOF=26.8 : x=(-1.13,-0.22,-7.9) -E0 : e- : pT=0.000418 : TOF=28.4 : x=(-0.898,-0.44,7.98) -E0 : e- : pT=0.000795 : TOF=27.4 : x=(-0.0466,0.999,8.03) +*** Muon System Hit (#hits=8) +E1 : e+ : pT=0.0265 : TOF=26.7 : x=(0.726,-0.887,-7.9) +E1 : pi- : pT=0.113 : TOF=27 : x=(1.11,0.247,-7.9) +E1 : proton : pT=0.378 : TOF=33.3 : x=(0.88,-3.14,-7.9) +E1 : pi+ : pT=0.21 : TOF=26.8 : x=(-1.13,-0.215,-7.9) +E1 : pi- : pT=0.223 : TOF=26.8 : x=(-1.09,0.807,-7.9) +E1 : anti_proton : pT=1.48 : TOF=29.1 : x=(1.84,-2.81,-7.9) +E1 : e- : pT=0.000165 : TOF=29.4 : x=(1.85,-2.8,-7.9) E1 : mu- : pT=36.4 : TOF=26.6 : x=(0.321,0.958,-7.9) Graphics systems deleted. diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02/hepmc_pygen.out b/examples/extended/eventgenerator/HepMC/HepMCEx02/hepmc_pygen.out index 0469b1ac3c..47012e8c74 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02/hepmc_pygen.out +++ b/examples/extended/eventgenerator/HepMC/HepMCEx02/hepmc_pygen.out @@ -1,89 +1,55 @@ -********************************************** - Geant4 version $Name: geant4-08-01 $ - (31-Jul-2002) - Copyright : Geant4 Collaboration -********************************************** -phot: Total cross sections from Sandia parametrisation. -MuonMinusCaptureAtRest is created +************************************************************* + Geant4 version Name: geant4-08-01-ref-00 (30-June-2006) + Copyright : Geant4 Collaboration + Reference : NIM A 506 (2003), 250-303 + WWW : http://cern.ch/geant4 +************************************************************* -compt: Total cross sections from a parametrisation. Good description from 10 KeV to (100/Z) GeV. - Scattered gamma energy according Klein-Nishina. - PhysicsTables from 1 keV to 100 GeV in 80 bins. - -conv: Total cross sections from a parametrisation. Good description from 1.5 MeV to 100 GeV for all Z. - e+e- energies according Bethe-Heitler - PhysicsTables from 1.022 MeV to 100 GeV in 100 bins. - -eBrem: Total cross sections from a NEW parametrisation based on the EEDL data library. - Good description from 1 KeV to 100 GeV. - log scale extrapolation above 100 GeV - Gamma energy sampled from a parametrised formula. - PhysicsTables from 1 keV to 100 TeV in 100 bins. - -eIoni: delta cross sections from Moller+Bhabha. Good description from 1 KeV to 100 GeV. - delta ray energy sampled from differential Xsection. - PhysicsTables from 1 keV to 100 TeV in 100 bins. - -msc: Tables of transport mean free paths. - New model of MSC , computes the lateral - displacement of the particle , too. - PhysicsTables from 100 eV to 100 TeV in 100 bins. - -annihil: Total cross section from Heilter formula(annihilation into 2 photons). - gamma energies sampled according Heitler - PhysicsTables from 10 keV to 10 TeV in 100 bins. - -annihil: Total cross section from Heilter formula(annihilation into 2 photons). - gamma energies sampled according Heitler - PhysicsTables from 10 keV to 10 TeV in 100 bins. - -hIoni: Knock-on electron cross sections . - Good description above the mean excitation energy. - delta ray energy sampled from differential Xsection. - PhysicsTables from 1 keV to 100 TeV in 100 bins. - -msc: Tables of transport mean free paths. - New model of MSC , computes the lateral - displacement of the particle , too. - PhysicsTables from 100 eV to 100 TeV in 100 bins. - -MuIoni: Knock-on electron cross sections . - Good description above the mean excitation energy. - delta ray energy sampled from differential Xsection. - PhysicsTables from 1 keV to 1000 PeV in 150 bins. - -MuBrems: theoretical cross section - Good description up to 1000 PeV. - PhysicsTables from 1 keV to 1000 PeV in 150 bins. - -MuPairProd: theoretical cross sections - Good description up to 1000 PeV. - PhysicsTables from 1 keV to 1000 PeV in 150 bins. - -msc: Tables of transport mean free paths. - New model of MSC , computes the lateral - displacement of the particle , too. - PhysicsTables from 100 eV to 100 TeV in 100 bins. Visualization Manager instantiating... Visualization Manager initialising... Registering graphics systems... -* Visualizaton Driver: DAWN -* Visualizaton Driver: VRML1/2 -* Visualizaton Driver: VRML1/2 File -You have successfully chosen to use the following graphics systems. +You have successfully registered the following graphics systems. Current available graphics systems are: ASCIITree (ATree) DAWNFILE (DAWNFILE) + GAGTree (GAGTree) + G4HepRep (HepRepXML) + G4HepRepFile (HepRepFile) + RayTracer (RayTracer) + VRML1FILE (VRML1FILE) + VRML2FILE (VRML2FILE) + FukuiRenderer (DAWN) OpenGLImmediateX (OGLIX) OpenGLStoredX (OGLSX) OpenGLImmediateXm (OGLIXm) OpenGLStoredXm (OGLSXm) + OpenInventorXt (OIX) + RayTracerX (RayTracerX) VRML1 (VRML1) VRML2 (VRML2) - VRML1FILE (VRML1FILE) - VRML2FILE (VRML2FILE) + +Registering model factories... + +You have successfully registered the following model factories. +Registered model factories: + generic + drawByCharge + drawByParticleID + drawByOriginVolume + +Registered models: + None + +Registered filter factories: + chargeFilter + particleFilter + originVolumeFilter + +Registered filters: + None + current generator type: pythia 1 @@ -207,181 +173,481 @@ current generator type: pythia ========================================================== ********************** PYINIT: initialization completed ********************** - Print out hit information ------------------------------------------- -*** Muon System Hit (#hits=18) -E0 : pi+ : pT=0.118 : TOF=27 : x=(-0.322,1.06,7.9) -E0 : pi- : pT=0.324 : TOF=26.7 : x=(1.15,0.339,7.9) -E1 : pi- : pT=0.301 : TOF=26.7 : x=(1.05,0.415,-7.9) -E1 : mu- : pT=0.356 : TOF=26.6 : x=(-0.985,0.19,-7.9) -E1 : pi+ : pT=0.536 : TOF=26.6 : x=(-0.529,0.882,-7.9) -E1 : pi+ : pT=1.14 : TOF=27 : x=(-0.652,0.758,-8.02) -E0 : e- : pT=0.000369 : TOF=29.1 : x=(-0.823,0.569,7.94) -E1 : mu- : pT=1.29 : TOF=27.8 : x=(-0.151,-2.68,-7.9) -E1 : e- : pT=0.000702 : TOF=31 : x=(0.345,-1.69,-7.9) -E1 : e- : pT=0.00121 : TOF=28.1 : x=(-1.62,-0.29,-7.9) -E0 : pi- : pT=0.298 : TOF=26.6 : x=(0.353,-0.963,7.9) -E0 : mu- : pT=0.0257 : TOF=28.2 : x=(-1.12,-0.828,7.9) -E0 : pi+ : pT=0.226 : TOF=26.7 : x=(-0.35,0.973,7.9) -E1 : e- : pT=0.00205 : TOF=27.6 : x=(1.22,0.311,-7.9) -B3 : mu+ : pT=42 : TOF=15 : x=(-4.04,1.97,-0.0268) -B1 : mu- : pT=58.3 : TOF=21.4 : x=(2.07,3.94,-4.63) -B4 : mu+ : pT=22.9 : TOF=24.1 : x=(-4.25,-1.09,5.75) -E1 : mu- : pT=26.5 : TOF=28.6 : x=(-1.86,2.74,-7.9) + +phot: Total cross sections from Sandia parametrisation. + +compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV + Sampling according Klein-Nishina model + tables are built for gamma + Lambda tables from 100 eV to 100 GeV in 90 bins. + +conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; + sampling secondary e+e- according to the Bethe-Heitler model + tables are built for gamma + Lambda tables from 1.022 MeV to 100 GeV in 100 bins. + +msc: Model variant of multiple scattering for e- + Lambda tables from 100 eV to 100 TeV in 120 bins. + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +eIoni: tables are built for e- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +eBrem: tables are built for e- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Total cross sections from a parametrisation based on the EEDL data library. + Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. + +eIoni: tables are built for e+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +eBrem: tables are built for e+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Total cross sections from a parametrisation based on the EEDL data library. + Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. + +annihil: Heilter model of formula of annihilation into 2 photons + tables are built for e+ + Lambda tables from 100 eV to 100 TeV in 120 bins. + +msc: Model variant of multiple scattering for proton + Lambda tables from 100 eV to 100 TeV in 120 bins. + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +hIoni: tables are built for proton + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +hIoni: tables are built for anti_proton + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +msc: Model variant of multiple scattering for mu+ + Lambda tables from 100 eV to 100 TeV in 120 bins. + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +muIoni: tables are built for mu+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Bether-Bloch model for E > 0.2 MeV, parametrisation of Bragg peak below, + radiative corrections for E > 1 GeV + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +muBrems: tables are built for mu+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Parametrised model + +muPairProd: tables are built for mu+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Parametrised model + +muIoni: tables are built for mu- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Bether-Bloch model for E > 0.2 MeV, parametrisation of Bragg peak below, + radiative corrections for E > 1 GeV + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +muBrems: tables are built for mu- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Parametrised model + +muPairProd: tables are built for mu- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Parametrised model + +hIoni: tables are built for pi+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 0.297504 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +msc: Model variant of multiple scattering for pi- + Lambda tables from 100 eV to 100 TeV in 120 bins. + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +hIoni: tables are built for pi- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 0.297504 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +========= Table of registered couples ============================== + +Index : 0 used in the geometry : Yes recalculation needed : No + Material : Air + Range cuts : gamma 1 cm e- 1 cm e+ 1 cm + Energy thresholds : gamma 990 eV e- 8.07135 keV e+ 8.07135 keV + Region(s) which use this couple : + DefaultRegionForTheWorld + +Index : 1 used in the geometry : Yes recalculation needed : No + Material : Lead + Range cuts : gamma 1 cm e- 1 cm e+ 1 cm + Energy thresholds : gamma 282.478 keV e- 15.0137 MeV e+ 13.9447 MeV + Region(s) which use this couple : + DefaultRegionForTheWorld + +Index : 2 used in the geometry : Yes recalculation needed : No + Material : ArgonGas + Range cuts : gamma 1 cm e- 1 cm e+ 1 cm + Energy thresholds : gamma 990 eV e- 10.3667 keV e+ 10.2399 keV + Region(s) which use this couple : + DefaultRegionForTheWorld + +==================================================================== Print out hit information ------------------------------------------ -*** Muon System Hit (#hits=10) -E1 : pi- : pT=0.11 : TOF=27 : x=(-0.612,-0.904,-7.9) -E1 : e- : pT=0.0024 : TOF=27.6 : x=(-1.01,-1.34,-7.9) -E1 : pi- : pT=0.359 : TOF=26.6 : x=(-0.15,1.02,-7.9) -E1 : e- : pT=0.00115 : TOF=28 : x=(-0.153,-1.18,-7.9) -E1 : e- : pT=0.00182 : TOF=27.4 : x=(-1.44,-0.518,-7.9) -B6 : mu+ : pT=28.4 : TOF=16.9 : x=(-0.237,-4.25,-2.74) -E0 : mu- : pT=18.9 : TOF=27.8 : x=(2.63,-0.612,7.9) -E1 : mu- : pT=8.45 : TOF=26.9 : x=(-1.44,0.674,-7.9) -E1 : e- : pT=0.00144 : TOF=27.1 : x=(-1.54,0.59,-7.9) -B4 : mu+ : pT=48.5 : TOF=17.3 : x=(-4.25,0.685,2.92) +*** Muon System Hit (#hits=33) +E1 : pi+ : pT=0.219 : TOF=26.7 : x=(-0.239,1.11,-7.9) +E1 : pi+ : pT=0.199 : TOF=27.7 : x=(1.79,0.178,-7.9) +E0 : proton : pT=0.577 : TOF=32.5 : x=(3.6,1.62,7.9) +E1 : pi- : pT=0.0915 : TOF=27.4 : x=(-1.05,0.742,-7.9) +E1 : pi+ : pT=0.272 : TOF=26.6 : x=(1.01,0.266,-7.9) +E1 : pi- : pT=0.276 : TOF=26.8 : x=(1.11,0.516,-7.9) +E0 : pi+ : pT=0.167 : TOF=26.8 : x=(-1.02,0.163,7.9) +E1 : pi+ : pT=1.39 : TOF=26.7 : x=(-0.908,0.911,-7.9) +E1 : mu+ : pT=0.607 : TOF=26.7 : x=(1.08,-0.543,-7.9) +E0 : e- : pT=0.00341 : TOF=28.4 : x=(0.252,2.08,7.9) +B3 : mu- : pT=0.126 : TOF=42.5 : x=(-3.28,2.73,6.81) +E1 : pi+ : pT=3.15 : TOF=27.8 : x=(-0.373,-2.65,-7.9) +E1 : pi- : pT=5.13 : TOF=27.9 : x=(-0.00786,-2.73,-7.9) +E1 : pi- : pT=3.61 : TOF=27.8 : x=(-0.0846,-2.66,-7.9) +E1 : pi+ : pT=1.15 : TOF=27.9 : x=(-1.12,-2.5,-7.9) +E1 : pi- : pT=1.28 : TOF=27.5 : x=(0.728,-2.26,-7.9) +E1 : pi- : pT=0.276 : TOF=26.6 : x=(0.174,1.03,-7.9) +E1 : pi- : pT=0.414 : TOF=26.6 : x=(-0.865,0.685,-7.9) +E1 : pi+ : pT=0.392 : TOF=26.6 : x=(0.889,-0.58,-7.9) +E1 : e- : pT=0.000651 : TOF=27.9 : x=(-0.906,-0.521,-7.9) +E0 : pi+ : pT=0.895 : TOF=27.1 : x=(-1.9,-0.128,7.9) +E1 : pi- : pT=2.61 : TOF=26.9 : x=(-1.31,0.997,-7.9) +E1 : e- : pT=8.28e-05 : TOF=29.8 : x=(-0.488,1.1,-7.9) +E1 : pi- : pT=0.38 : TOF=27.3 : x=(0.423,1.74,-7.9) +E1 : kaon- : pT=0.671 : TOF=27.2 : x=(1.35,0.533,-7.9) +E0 : e- : pT=0.000773 : TOF=36.9 : x=(-2.22,-2.28,7.9) +E0 : pi- : pT=0.238 : TOF=27.3 : x=(-1.65,1.08,7.9) +E0 : pi+ : pT=0.204 : TOF=27.6 : x=(2.07,0.791,7.9) +E1 : pi- : pT=8.96 : TOF=27.8 : x=(-0.113,-2.65,-7.9) +B3 : mu+ : pT=42.6 : TOF=15 : x=(-4.04,1.97,-0.0318) +B1 : mu- : pT=58.5 : TOF=21.4 : x=(2.07,3.94,-4.62) +B4 : mu+ : pT=22.2 : TOF=24.4 : x=(-4.25,-1.08,5.84) +E1 : mu- : pT=27.1 : TOF=28.6 : x=(-1.87,2.73,-7.9) Print out hit information ------------------------------------------ -*** Muon System Hit (#hits=21) -E0 : pi- : pT=0.536 : TOF=26.7 : x=(0.754,-0.961,7.9) -E1 : pi- : pT=1.23 : TOF=26.6 : x=(-1.05,0.00521,-7.9) -E1 : pi+ : pT=0.204 : TOF=26.7 : x=(0.449,0.975,-7.9) -E0 : pi- : pT=3.4 : TOF=26.6 : x=(0.695,-0.811,7.9) -E0 : pi- : pT=0.583 : TOF=27 : x=(-0.8,-0.6,8.03) -E0 : mu- : pT=0.506 : TOF=26.7 : x=(-0.712,0.755,7.9) -E0 : kaon+ : pT=0.532 : TOF=26.8 : x=(0.139,1.05,7.9) -E0 : mu- : pT=0.272 : TOF=26.7 : x=(0.208,1.08,7.9) -E1 : pi- : pT=0.425 : TOF=26.6 : x=(-0.0907,1.06,-7.9) -E0 : kaon- : pT=0.218 : TOF=27.9 : x=(-1.09,-0.0193,7.9) -E0 : e- : pT=0.000466 : TOF=31.8 : x=(1.47,0.409,7.9) -E0 : e- : pT=0.000277 : TOF=32.4 : x=(1.53,0.313,7.9) -E0 : e- : pT=9.85e-05 : TOF=31.8 : x=(1.47,0.413,7.9) -E1 : kaon+ : pT=2.03 : TOF=26.6 : x=(0.372,0.993,-7.9) -E0 : pi+ : pT=1.7 : TOF=26.7 : x=(-0.925,0.786,7.9) -E1 : pi+ : pT=1.19 : TOF=26.7 : x=(-0.866,-0.816,-7.9) -E1 : pi+ : pT=0.3 : TOF=27.1 : x=(-0.883,-0.469,-8.04) -B6 : mu- : pT=42.3 : TOF=14.8 : x=(-1.25,-4.25,0.423) -E1 : mu+ : pT=23.9 : TOF=27.9 : x=(-2.64,0.752,-7.9) -B7 : mu+ : pT=41.6 : TOF=17.2 : x=(2.1,-3.91,-2.61) -B2 : mu- : pT=51.3 : TOF=22.1 : x=(1.48,4.25,-4.85) +*** Muon System Hit (#hits=39) +E0 : pi+ : pT=0.0533 : TOF=28 : x=(-0.987,-1.73,7.9) +E0 : pi- : pT=0.0496 : TOF=29.7 : x=(1.63,-1.72,7.9) +E1 : pi+ : pT=0.312 : TOF=27.8 : x=(-1.79,-0.943,-7.9) +E1 : e- : pT=0.0975 : TOF=26.7 : x=(0.426,1.14,-7.9) +E0 : pi- : pT=0.631 : TOF=26.9 : x=(0.487,-0.874,7.99) +E0 : pi+ : pT=0.813 : TOF=26.7 : x=(1.03,-0.719,7.9) +E0 : pi+ : pT=0.877 : TOF=26.9 : x=(0.835,-1.35,7.9) +E0 : pi- : pT=0.173 : TOF=26.8 : x=(1.05,0.265,7.9) +E0 : pi- : pT=1.68 : TOF=27.2 : x=(1.89,0.511,7.9) +E0 : pi- : pT=0.197 : TOF=26.9 : x=(1.3,-0.579,7.9) +B5 : kaon- : pT=1.98 : TOF=21.3 : x=(-3.12,-2.89,4.7) +B5 : pi- : pT=1.51 : TOF=18.3 : x=(-1.97,-4.04,-2.88) +E1 : pi+ : pT=0.33 : TOF=28.3 : x=(2.76,0.816,-7.9) +E1 : e- : pT=0.000478 : TOF=30.8 : x=(1.27,-0.129,-7.9) +E0 : proton : pT=0.852 : TOF=30.2 : x=(-2.71,-2.34,7.9) +E0 : pi- : pT=0.863 : TOF=27.6 : x=(-0.883,-2.2,7.9) +E0 : pi+ : pT=0.445 : TOF=29.3 : x=(-2.91,-2.42,7.9) +E0 : pi+ : pT=1.39 : TOF=27.8 : x=(-0.196,-2.61,7.9) +B7 : pi- : pT=0.72 : TOF=27.6 : x=(3.86,-2.15,6.85) +E0 : pi+ : pT=0.149 : TOF=28.4 : x=(-0.986,-2.59,7.9) +E0 : pi+ : pT=0.638 : TOF=27.3 : x=(1.05,1.71,7.9) +E0 : pi- : pT=1.73 : TOF=27.3 : x=(1.47,1.5,7.9) +E0 : pi+ : pT=0.328 : TOF=27 : x=(1.46,0.325,7.9) +E0 : pi- : pT=6.71 : TOF=27 : x=(1.15,1.24,7.9) +E0 : pi- : pT=1.47 : TOF=26.6 : x=(1.12,-0.25,7.9) +E0 : pi+ : pT=0.721 : TOF=26.9 : x=(1.61,0.191,7.9) +E0 : pi+ : pT=0.223 : TOF=27.1 : x=(-0.146,1.76,7.9) +E0 : e- : pT=0.000828 : TOF=42.3 : x=(1.51,0.106,8.1) +E0 : e- : pT=0.000352 : TOF=47.2 : x=(2.31,0.8,8.1) +E1 : pi- : pT=0.374 : TOF=27.7 : x=(1.51,1.66,-7.9) +B6 : mu- : pT=0.219 : TOF=27.5 : x=(0.744,-4.25,6.34) +E0 : pi+ : pT=1.1 : TOF=27.2 : x=(0.0323,-1.97,7.9) +E0 : kaon- : pT=2.39 : TOF=27.1 : x=(0.807,-1.72,7.9) +E0 : pi+ : pT=4.05 : TOF=26.9 : x=(1.2,1.08,7.9) +E0 : pi+ : pT=43 : TOF=27 : x=(1.32,1.15,7.9) +E0 : mu+ : pT=57.6 : TOF=29.7 : x=(-3.59,-1.95,7.9) +E0 : mu- : pT=37.5 : TOF=29.6 : x=(3.98,-0.525,7.9) +E0 : mu+ : pT=73.3 : TOF=27.2 : x=(-1.96,0.632,7.9) +E0 : mu- : pT=26.8 : TOF=28.3 : x=(2.83,-1.23,7.9) Print out hit information ------------------------------------------ -*** Muon System Hit (#hits=21) -E1 : pi+ : pT=0.423 : TOF=26.6 : x=(-0.674,0.794,-7.9) -E1 : pi- : pT=0.292 : TOF=26.7 : x=(0.0581,-1.09,-7.9) -E1 : kaon+ : pT=0.239 : TOF=27 : x=(0.583,-1.16,-7.9) -E0 : mu- : pT=0.347 : TOF=26.7 : x=(-0.0869,-1.2,7.9) -E1 : pi- : pT=0.826 : TOF=26.6 : x=(-0.0928,1.01,-7.9) -E1 : pi+ : pT=1.89 : TOF=26.6 : x=(0.496,0.971,-7.9) -E1 : pi- : pT=0.498 : TOF=26.7 : x=(0.757,1.02,-7.9) -E1 : pi- : pT=13 : TOF=26.7 : x=(0.376,1.15,-7.9) -E1 : pi- : pT=2.59 : TOF=26.6 : x=(0.231,1.1,-7.9) -E1 : pi- : pT=1.06 : TOF=26.6 : x=(0.00287,1.1,-7.9) -E1 : pi+ : pT=0.698 : TOF=26.6 : x=(0.699,0.893,-7.9) -E1 : mu+ : pT=1.15 : TOF=27 : x=(0.0196,-1.75,-7.9) -E1 : pi- : pT=0.548 : TOF=26.6 : x=(0.681,-0.887,-7.9) -E1 : pi- : pT=0.312 : TOF=26.6 : x=(-0.985,0.187,-7.9) -E1 : mu+ : pT=1.7 : TOF=27.1 : x=(1.37,1.35,-7.9) -E1 : pi+ : pT=6.31 : TOF=26.7 : x=(0.481,1.15,-7.9) -E1 : e- : pT=0.000537 : TOF=27.1 : x=(0.328,1.2,-7.9) -E1 : e- : pT=9.91e-05 : TOF=29.2 : x=(0.181,1.12,-8.1) -B6 : mu- : pT=40.5 : TOF=25.2 : x=(1.49,-4.25,-6.05) -E1 : mu+ : pT=28.6 : TOF=26.9 : x=(1.58,0.0338,-7.9) -E1 : mu- : pT=69.8 : TOF=26.6 : x=(-1.14,-0.105,-7.9) +*** Muon System Hit (#hits=50) +E1 : pi- : pT=0.257 : TOF=26.7 : x=(0.113,1.15,-7.9) +E0 : mu- : pT=0.168 : TOF=27 : x=(-1.6,0.238,7.9) +E1 : mu+ : pT=0.0453 : TOF=27.4 : x=(0.289,1.09,-7.9) +E1 : pi+ : pT=0.445 : TOF=27.7 : x=(0.854,2.01,-7.9) +E1 : pi+ : pT=3.28 : TOF=27 : x=(0.565,1.65,-7.9) +E1 : pi- : pT=0.639 : TOF=26.9 : x=(0.502,1.46,-7.9) +E1 : pi- : pT=1.93 : TOF=27.4 : x=(0.483,2.13,-7.9) +E1 : pi+ : pT=1.62 : TOF=27.2 : x=(0.813,1.81,-7.9) +E1 : pi- : pT=0.271 : TOF=28.5 : x=(0.0364,2.55,-7.9) +E0 : pi- : pT=0.678 : TOF=27.2 : x=(-1.75,0.824,7.9) +E0 : pi- : pT=0.247 : TOF=27.3 : x=(-1.75,0.167,7.9) +E0 : pi+ : pT=0.289 : TOF=29.2 : x=(0.00123,3.13,7.9) +E0 : e- : pT=0.000578 : TOF=35.5 : x=(-0.924,4.35,7.9) +E0 : anti_proton : pT=0.875 : TOF=27.6 : x=(-1.82,0.455,7.9) +E1 : pi+ : pT=0.359 : TOF=26.8 : x=(0.607,1.16,-7.9) +E1 : pi- : pT=0.175 : TOF=28.3 : x=(-0.283,-2.56,-7.9) +E1 : pi+ : pT=1.17 : TOF=27.2 : x=(0.402,-2,-7.9) +E1 : kaon+ : pT=2.67 : TOF=27.8 : x=(0.129,-2.57,-7.9) +E1 : kaon- : pT=3.35 : TOF=27.6 : x=(0.422,-2.45,-7.9) +B7 : pi- : pT=0.515 : TOF=25.7 : x=(2.35,-3.66,5.97) +E1 : pi+ : pT=1.38 : TOF=27.4 : x=(0.16,2.18,-7.9) +E1 : pi- : pT=2.77 : TOF=26.9 : x=(0.577,1.57,-7.9) +E1 : pi- : pT=0.244 : TOF=27.1 : x=(0.412,1.68,-7.9) +E1 : pi+ : pT=0.774 : TOF=27.2 : x=(1.64,0.963,-7.9) +E1 : pi+ : pT=1.82 : TOF=27.1 : x=(0.84,1.73,-7.9) +E1 : e- : pT=0.000315 : TOF=28 : x=(0.927,1.4,-7.9) +E1 : e- : pT=0.000496 : TOF=29.7 : x=(0.755,1.47,-8.1) +E1 : e- : pT=0.000338 : TOF=30.4 : x=(0.635,1.5,-8.1) +E1 : kaon- : pT=6.61 : TOF=26.9 : x=(0.574,1.57,-7.9) +E1 : pi+ : pT=1.35 : TOF=27.1 : x=(0.705,1.8,-7.9) +E1 : pi- : pT=3.68 : TOF=27.1 : x=(0.463,1.85,-7.9) +E1 : pi+ : pT=1.12 : TOF=26.9 : x=(0.92,1.3,-7.9) +E1 : pi- : pT=0.207 : TOF=27.3 : x=(-0.372,1.92,-7.9) +E1 : pi+ : pT=4.28 : TOF=27.1 : x=(0.688,1.83,-7.9) +E1 : pi- : pT=0.61 : TOF=26.9 : x=(0.356,1.47,-7.9) +E1 : e- : pT=0.00209 : TOF=27.3 : x=(0.198,1.77,-7.9) +E1 : anti_proton : pT=3.58 : TOF=27 : x=(0.333,1.69,-7.9) +E1 : pi+ : pT=0.401 : TOF=27.7 : x=(1.49,1.95,-7.9) +E1 : pi+ : pT=1.45 : TOF=26.8 : x=(0.0317,1.45,-7.9) +E1 : pi- : pT=0.208 : TOF=27.5 : x=(0.342,-1.2,-7.9) +E1 : pi- : pT=0.487 : TOF=27.2 : x=(-0.534,-1.7,-7.9) +E0 : mu+ : pT=0.346 : TOF=27.5 : x=(-2.19,-0.5,7.9) +E0 : pi+ : pT=0.0835 : TOF=27 : x=(-0.684,1.08,7.9) +E1 : e- : pT=0.00053 : TOF=31.8 : x=(0.911,0.591,-8.1) +E1 : pi- : pT=1.09 : TOF=26.6 : x=(-0.905,-0.59,-7.9) +E1 : kaon- : pT=0.76 : TOF=29.4 : x=(1.71,-3.22,-7.9) +B4 : mu+ : pT=59 : TOF=22.3 : x=(-4.25,1.21,5) +E0 : mu- : pT=18.4 : TOF=28.6 : x=(1.01,3.2,7.9) +E0 : mu- : pT=70.2 : TOF=27.6 : x=(0.458,-2.41,7.9) +B1 : mu+ : pT=13.9 : TOF=14.6 : x=(3.76,2.25,0.263) Print out hit information ------------------------------------------ -*** Muon System Hit (#hits=11) -E1 : e- : pT=0.00163 : TOF=27.6 : x=(0.438,0.899,-8.05) -E1 : e- : pT=0.00153 : TOF=28.4 : x=(0.76,1.57,-7.9) -E0 : pi- : pT=0.19 : TOF=26.7 : x=(-0.77,0.661,7.9) -E1 : pi+ : pT=0.148 : TOF=26.9 : x=(-0.79,-0.845,-7.9) -E0 : anti_proton : pT=0.652 : TOF=27.1 : x=(0.922,-0.59,7.9) -E1 : mu- : pT=0.478 : TOF=26.9 : x=(1.49,-0.685,-7.9) -E1 : pi- : pT=0.799 : TOF=26.6 : x=(-0.266,-1.06,-7.9) -B5 : mu- : pT=16.7 : TOF=22.1 : x=(-2.87,-3.14,-5.09) -B4 : mu+ : pT=74.3 : TOF=20.4 : x=(-4.25,1.13,4.25) -E0 : mu- : pT=23.7 : TOF=27.5 : x=(-1.05,2.14,7.9) -B5 : mu+ : pT=64.4 : TOF=16 : x=(-2.56,-3.45,2.11) - - Print out hit information ------------------------------------------- -*** Muon System Hit (#hits=11) -E1 : pi- : pT=0.167 : TOF=26.9 : x=(-0.173,1.2,-7.9) -E1 : mu+ : pT=0.105 : TOF=26.9 : x=(-0.663,0.752,-7.9) -E1 : e- : pT=0.00222 : TOF=27.7 : x=(-1.31,0.361,-7.9) -E1 : mu- : pT=0.109 : TOF=26.9 : x=(0.614,-1.09,-7.9) -E1 : pi+ : pT=1.79 : TOF=27 : x=(-0.628,-1.63,-7.9) -E0 : e- : pT=0.000832 : TOF=27.6 : x=(0.338,1.45,7.9) -E0 : pi+ : pT=0.376 : TOF=26.7 : x=(0.699,0.914,7.9) -B5 : mu+ : pT=13.7 : TOF=15 : x=(-4.07,-1.94,0.171) -B1 : mu- : pT=97.2 : TOF=14.3 : x=(3.37,2.64,0.181) -B1 : mu+ : pT=63.1 : TOF=17.9 : x=(3.08,2.93,3.26) -B4 : mu- : pT=30.5 : TOF=19.3 : x=(-4.25,-0.438,3.89) - - Print out hit information ------------------------------------------- -*** Muon System Hit (#hits=14) -E1 : pi+ : pT=0.0724 : TOF=27.1 : x=(0.956,-0.621,-7.9) -E1 : pi- : pT=0.644 : TOF=26.6 : x=(-0.561,0.841,-7.9) -E1 : mu+ : pT=0.0492 : TOF=29.4 : x=(2.87,0.0326,-7.9) -E0 : mu- : pT=0.0373 : TOF=29.4 : x=(0.835,0.871,7.9) -E0 : pi+ : pT=0.632 : TOF=26.7 : x=(-0.725,-0.93,7.9) -E0 : pi+ : pT=0.688 : TOF=26.6 : x=(-0.165,-0.998,7.9) -E1 : pi- : pT=0.912 : TOF=26.6 : x=(1.02,0.465,-7.9) -E1 : mu+ : pT=0.0959 : TOF=27.1 : x=(-0.55,-1,-7.9) -E1 : e- : pT=0.000695 : TOF=27.6 : x=(-0.535,-1.14,-7.9) -E1 : kaon- : pT=0.812 : TOF=26.7 : x=(0.163,-1.16,-7.9) -E0 : mu+ : pT=4.41 : TOF=27.6 : x=(-2.26,-0.94,7.9) -E1 : mu- : pT=24.6 : TOF=27 : x=(0.37,1.72,-7.9) -E1 : mu+ : pT=21.9 : TOF=28.6 : x=(3.31,-0.627,-7.9) -B5 : mu- : pT=22.2 : TOF=23.4 : x=(-3.64,-2.37,5.53) +*** Muon System Hit (#hits=44) +E1 : e- : pT=0.00162 : TOF=27 : x=(0.126,-0.992,-7.92) +E0 : pi- : pT=1.79 : TOF=26.9 : x=(1.32,1.04,7.9) +E0 : pi+ : pT=2.58 : TOF=26.9 : x=(1.09,1.14,7.9) +B3 : anti_proton : pT=0.867 : TOF=26.5 : x=(-2.67,3.34,-5.88) +E1 : pi+ : pT=0.0861 : TOF=27.8 : x=(1.33,-1.55,-7.9) +E1 : pi- : pT=1.73 : TOF=27.6 : x=(1.13,-2.12,-7.9) +E1 : mu+ : pT=0.231 : TOF=27.9 : x=(1.44,-1.62,-7.9) +E1 : mu- : pT=0.114 : TOF=27.1 : x=(1.34,-0.92,-7.9) +E1 : pi+ : pT=0.0979 : TOF=26.9 : x=(-1.1,-0.866,-7.9) +E1 : pi+ : pT=0.42 : TOF=26.7 : x=(0.171,-1.27,-7.9) +B6 : anti_proton : pT=1.34 : TOF=28.9 : x=(0.926,-4.25,-6.77) +E1 : proton : pT=0.41 : TOF=29 : x=(-0.0289,-2.14,-7.9) +E1 : pi+ : pT=0.087 : TOF=28 : x=(0.171,-1.13,-7.9) +E1 : pi+ : pT=0.964 : TOF=26.7 : x=(-0.912,-0.964,-7.9) +E1 : pi- : pT=0.54 : TOF=26.6 : x=(0.753,-0.746,-7.9) +E1 : pi+ : pT=0.567 : TOF=26.6 : x=(-0.172,-1.03,-7.9) +E0 : pi+ : pT=0.483 : TOF=26.7 : x=(-0.438,-1.12,7.9) +E0 : pi+ : pT=0.258 : TOF=27.3 : x=(0.966,1.44,7.9) +E0 : mu- : pT=0.016 : TOF=30.7 : x=(-0.459,-1.04,7.9) +E0 : pi- : pT=9.78 : TOF=27 : x=(1.17,1.3,7.9) +E0 : kaon+ : pT=5.16 : TOF=26.9 : x=(1.18,1.14,7.9) +E0 : pi+ : pT=5.57 : TOF=27.1 : x=(1.46,1.26,7.9) +E0 : pi- : pT=8.93 : TOF=27.1 : x=(1.18,1.55,7.9) +E0 : pi+ : pT=10.4 : TOF=27.1 : x=(1.18,1.42,7.9) +E0 : pi+ : pT=2.55 : TOF=27.3 : x=(1.51,1.56,7.9) +E0 : pi- : pT=62.2 : TOF=27.2 : x=(1.26,1.55,7.9) +E0 : pi+ : pT=28 : TOF=27.2 : x=(1.28,1.53,7.9) +E1 : pi+ : pT=0.638 : TOF=26.7 : x=(0.318,-1.17,-7.9) +E1 : pi- : pT=0.815 : TOF=27.2 : x=(-1.3,-1.42,-7.9) +E1 : pi+ : pT=1.72 : TOF=27.6 : x=(-0.672,-2.41,-7.9) +E1 : pi- : pT=1.53 : TOF=28.2 : x=(1.34,-2.68,-7.9) +E1 : kaon- : pT=0.734 : TOF=27.1 : x=(0.408,-1.59,-7.9) +E1 : kaon+ : pT=2.35 : TOF=26.6 : x=(-0.145,-1.05,-7.9) +E1 : mu- : pT=0.28 : TOF=26.6 : x=(0.192,-1.07,-7.9) +E0 : anti_proton : pT=6.51 : TOF=27.1 : x=(1.39,1.27,7.9) +E0 : e- : pT=0.00108 : TOF=28.6 : x=(1.68,1.88,7.9) +E0 : pi+ : pT=3.26 : TOF=27 : x=(1.41,0.938,7.9) +E0 : kaon- : pT=5.08 : TOF=27.1 : x=(1.25,1.34,7.9) +E0 : pi- : pT=29.6 : TOF=27.2 : x=(1.28,1.52,7.9) +E0 : anti_proton : pT=26.3 : TOF=27.2 : x=(1.24,1.54,7.9) +B5 : mu+ : pT=58 : TOF=14.8 : x=(-2.26,-3.75,-0.68) +E1 : mu- : pT=63.5 : TOF=29.9 : x=(-2,-3.71,-7.9) +E1 : mu+ : pT=5.63 : TOF=29.5 : x=(2.29,3.28,-7.9) +B5 : mu- : pT=221 : TOF=24.7 : x=(-3.4,-2.61,-6.05) Print out hit information ------------------------------------------ *** Muon System Hit (#hits=7) -E0 : e- : pT=0.00108 : TOF=28.9 : x=(-0.109,1.36,7.9) -E1 : e- : pT=0.000312 : TOF=31.8 : x=(1.23,-0.241,-7.9) -E1 : pi- : pT=0.201 : TOF=35.1 : x=(2.99,-0.0553,-7.9) -B1 : mu- : pT=20.1 : TOF=21.6 : x=(1.88,4.13,4.6) -E1 : mu+ : pT=11.2 : TOF=26.7 : x=(-1.15,-0.41,-7.9) -B6 : mu+ : pT=15.4 : TOF=18.8 : x=(0.0482,-4.25,3.68) -E1 : mu- : pT=40.8 : TOF=27.7 : x=(-0.921,-2.41,-7.9) +E1 : e- : pT=0.000144 : TOF=31.4 : x=(1.47,0.297,-7.9) +E1 : e- : pT=9.85e-05 : TOF=35.5 : x=(1.64,0.645,-8.1) +E1 : pi- : pT=0.479 : TOF=26.7 : x=(1.22,0.118,-7.9) +E1 : proton : pT=4.62 : TOF=26.9 : x=(1.5,-0.603,-7.9) +B1 : mu+ : pT=26 : TOF=23.9 : x=(2.25,3.76,-5.67) +B6 : mu- : pT=69.1 : TOF=14.7 : x=(0.928,-4.25,-0.725) +E1 : mu- : pT=13.4 : TOF=27 : x=(1.57,0.897,-7.9) Print out hit information ------------------------------------------ -*** Muon System Hit (#hits=6) -E1 : pi- : pT=0.879 : TOF=26.6 : x=(0.986,-0.538,-7.9) -E1 : pi+ : pT=0.353 : TOF=26.7 : x=(0.449,-1.1,-7.9) -B1 : mu+ : pT=30 : TOF=15.6 : x=(4.04,1.97,-1.31) -B4 : mu- : pT=66.3 : TOF=14.8 : x=(-4.25,0.693,-1.01) -B1 : mu- : pT=44.3 : TOF=14.3 : x=(3.14,2.87,0.513) -B4 : mu+ : pT=33.5 : TOF=20.1 : x=(-4.25,-0.712,4.22) +*** Muon System Hit (#hits=30) +E1 : pi+ : pT=0.166 : TOF=26.7 : x=(1.12,-0.337,-7.9) +E1 : pi+ : pT=1.02 : TOF=26.7 : x=(0.697,-1.04,-7.9) +E1 : e- : pT=0.000289 : TOF=28.4 : x=(0.591,-1.27,-7.9) +E0 : e- : pT=0.000728 : TOF=30.8 : x=(-0.45,-1.41,7.9) +E0 : e- : pT=0.000719 : TOF=31.8 : x=(-0.644,-1.57,7.9) +E0 : e- : pT=0.000316 : TOF=31.7 : x=(0.00585,1.01,8.1) +E0 : e- : pT=9.28e-05 : TOF=32.3 : x=(0.0367,1.07,8.1) +E0 : pi+ : pT=0.494 : TOF=27.4 : x=(1.72,1.35,7.9) +E0 : pi- : pT=0.852 : TOF=27 : x=(0.608,1.57,7.9) +E0 : pi+ : pT=0.157 : TOF=26.9 : x=(0.824,-0.83,7.9) +E0 : pi+ : pT=1.12 : TOF=26.9 : x=(0.824,1.31,7.9) +E0 : pi- : pT=3.91 : TOF=27.1 : x=(0.862,1.62,7.9) +E0 : pi- : pT=5.64 : TOF=27 : x=(0.727,1.58,7.9) +E0 : pi+ : pT=8.16 : TOF=26.9 : x=(0.879,1.39,7.9) +E0 : pi- : pT=10.7 : TOF=26.9 : x=(0.657,1.47,7.9) +B1 : pi+ : pT=0.263 : TOF=19.4 : x=(2.33,3.68,-3.39) +E0 : pi- : pT=4.37 : TOF=26.8 : x=(0.612,1.32,7.9) +E0 : pi+ : pT=15.6 : TOF=26.8 : x=(0.604,1.27,7.9) +E1 : pi+ : pT=0.944 : TOF=26.9 : x=(1.53,0.126,-7.9) +E1 : pi- : pT=1.12 : TOF=26.7 : x=(1.17,-0.392,-7.9) +E0 : pi- : pT=0.469 : TOF=26.7 : x=(-1.16,-0.196,7.9) +E0 : pi+ : pT=0.296 : TOF=27.1 : x=(0.93,1.48,7.9) +E1 : pi- : pT=0.0886 : TOF=27.1 : x=(1.58,0.352,-7.9) +E1 : pi+ : pT=0.16 : TOF=27.5 : x=(0.884,1.03,-7.9) +E0 : anti_proton : pT=16.7 : TOF=26.8 : x=(0.597,1.37,7.9) +E0 : proton : pT=28.3 : TOF=26.7 : x=(0.579,1.24,7.9) +E0 : mu+ : pT=31.2 : TOF=27.2 : x=(-1.93,0.597,7.9) +E0 : mu- : pT=109 : TOF=27.2 : x=(-0.222,-2.01,7.9) +E0 : mu+ : pT=47.9 : TOF=28.6 : x=(-3.08,1.3,7.9) +B0 : mu- : pT=37.8 : TOF=27.2 : x=(4.25,-1.43,6.83) Print out hit information ------------------------------------------ -*** Muon System Hit (#hits=17) -E0 : pi- : pT=0.15 : TOF=26.8 : x=(0.18,-1.01,7.9) -E0 : e+ : pT=1.14 : TOF=26.6 : x=(-0.547,-1.04,7.9) -E0 : e- : pT=0.0657 : TOF=26.6 : x=(-0.551,-1.05,7.9) -E0 : pi- : pT=0.486 : TOF=26.7 : x=(0.123,-1.15,7.9) -E0 : e- : pT=0.00107 : TOF=26.7 : x=(0.187,-1.09,7.9) -E1 : proton : pT=0.184 : TOF=43.6 : x=(-0.412,1.19,-7.9) -E0 : pi+ : pT=0.276 : TOF=26.6 : x=(0.704,-0.78,7.9) -E0 : pi- : pT=1.09 : TOF=26.6 : x=(0.414,-0.945,7.9) -E0 : pi+ : pT=1.21 : TOF=26.6 : x=(0.75,-0.67,7.9) -E0 : mu+ : pT=0.321 : TOF=27.4 : x=(1.04,-1.72,7.9) -E0 : proton : pT=0.538 : TOF=27.5 : x=(0.935,-0.695,7.9) -E0 : pi- : pT=2 : TOF=26.7 : x=(0.671,0.992,7.9) -E0 : pi+ : pT=0.67 : TOF=26.6 : x=(0.105,1.03,7.9) -E0 : pi+ : pT=0.564 : TOF=26.7 : x=(-1.12,-0.466,7.9) -E0 : mu- : pT=29.9 : TOF=27.4 : x=(-2.24,-0.52,7.9) -B7 : mu- : pT=55.6 : TOF=15.7 : x=(1.92,-4.09,1.27) -E0 : mu+ : pT=17.8 : TOF=27.2 : x=(1.26,1.59,7.9) +*** Muon System Hit (#hits=20) +E1 : pi+ : pT=0.165 : TOF=29.3 : x=(1.32,-1.81,-7.9) +E1 : e- : pT=0.000597 : TOF=29.2 : x=(1.07,-1.39,-7.9) +E1 : pi+ : pT=0.0943 : TOF=26.7 : x=(0.439,1.03,-7.9) +E1 : anti_proton : pT=0.721 : TOF=27.2 : x=(-1.01,0.89,-7.9) +E1 : pi- : pT=0.611 : TOF=27.5 : x=(-2.17,0.675,-7.9) +E1 : kaon- : pT=1.47 : TOF=28.8 : x=(-3.38,0.16,-7.9) +E1 : pi- : pT=2.38 : TOF=27.6 : x=(2.18,-1.1,-7.9) +E1 : pi+ : pT=0.771 : TOF=27.7 : x=(-1.88,1.58,-7.9) +E1 : pi- : pT=2.16 : TOF=26.8 : x=(-1.12,1.04,-7.9) +E1 : pi+ : pT=2.15 : TOF=27.3 : x=(-1.67,1.33,-7.9) +E1 : pi+ : pT=0.386 : TOF=26.8 : x=(-1.35,-0.352,-7.9) +E1 : kaon- : pT=0.162 : TOF=28.1 : x=(-0.343,1.08,-7.9) +E0 : pi+ : pT=0.0659 : TOF=27.2 : x=(0.999,-0.516,7.9) +E1 : pi+ : pT=3.06 : TOF=28.1 : x=(-2.81,0.669,-7.9) +E1 : pi- : pT=0.469 : TOF=26.9 : x=(-0.826,-1.18,-7.9) +B0 : pi- : pT=0.513 : TOF=26.2 : x=(4.25,1.57,-6.02) +B1 : anti_proton : pT=1.87 : TOF=25.5 : x=(3.28,2.73,-6.11) +B1 : pi- : pT=0.252 : TOF=27.4 : x=(3.01,3,-6.82) +B4 : mu+ : pT=11.7 : TOF=19.7 : x=(-4.25,-0.112,-4.1) +E1 : mu+ : pT=56.4 : TOF=26.9 : x=(-1.46,-0.565,-7.9) + + Print out hit information +------------------------------------------ +*** Muon System Hit (#hits=28) +E1 : pi+ : pT=0.307 : TOF=26.6 : x=(-0.554,0.86,-7.9) +E1 : pi- : pT=0.959 : TOF=26.9 : x=(-0.985,-1.17,-7.9) +E0 : pi- : pT=0.596 : TOF=26.7 : x=(-1,-0.81,7.9) +E0 : pi+ : pT=0.309 : TOF=27.2 : x=(-1.76,0.865,7.9) +E0 : pi- : pT=0.214 : TOF=27.8 : x=(-0.206,-2.48,7.9) +E0 : pi- : pT=0.591 : TOF=26.8 : x=(1.25,-0.443,7.9) +E0 : pi- : pT=0.0599 : TOF=27 : x=(0.979,-0.514,7.9) +E0 : pi+ : pT=0.267 : TOF=26.9 : x=(-0.336,1.46,7.9) +B2 : kaon+ : pT=1.36 : TOF=17.2 : x=(-0.516,4.25,-2.62) +E1 : pi+ : pT=0.202 : TOF=27.9 : x=(-0.309,2.25,-7.9) +E1 : pi+ : pT=0.881 : TOF=26.7 : x=(-1.19,0.478,-7.9) +E1 : e- : pT=0.00131 : TOF=27.6 : x=(-1.76,0.594,-7.9) +E1 : proton : pT=0.943 : TOF=26.8 : x=(-0.992,0.124,-7.9) +E1 : pi+ : pT=0.635 : TOF=27.7 : x=(-2.42,0.676,-7.9) +E0 : pi- : pT=0.287 : TOF=26.6 : x=(0.973,-0.258,7.9) +E0 : pi+ : pT=0.265 : TOF=27.6 : x=(0.283,2.32,7.9) +E0 : pi+ : pT=0.327 : TOF=26.9 : x=(0.756,-1.42,7.9) +E0 : pi+ : pT=0.578 : TOF=26.6 : x=(0.742,-0.888,7.9) +E0 : kaon- : pT=1.56 : TOF=26.7 : x=(1.13,-0.183,7.9) +E1 : e- : pT=0.000292 : TOF=30.1 : x=(0.721,-0.693,-8.01) +E1 : pi- : pT=0.211 : TOF=27.6 : x=(-1.82,1.34,-7.9) +E1 : pi+ : pT=0.418 : TOF=26.8 : x=(-0.159,-1.37,-7.9) +E1 : pi- : pT=2.87 : TOF=27 : x=(-1.69,0.163,-7.9) +E1 : e- : pT=0.000833 : TOF=37.8 : x=(-3.32,-0.67,-8.1) +E0 : proton : pT=1.08 : TOF=29.9 : x=(-2.23,2.52,7.9) +B1 : mu- : pT=34.7 : TOF=14.7 : x=(2.31,3.7,-0.56) +B6 : mu+ : pT=49.6 : TOF=15.1 : x=(-1,-4.25,1.16) +B4 : mu- : pT=50.5 : TOF=19.7 : x=(-4.25,1.09,3.97) + + Print out hit information +------------------------------------------ +*** Muon System Hit (#hits=21) +E1 : pi+ : pT=0.27 : TOF=26.6 : x=(0.188,-1,-7.9) +E1 : pi- : pT=0.124 : TOF=27.1 : x=(-1.06,1.21,-7.9) +E1 : pi+ : pT=0.635 : TOF=27.9 : x=(-1.79,1.71,-7.9) +E1 : mu- : pT=0.717 : TOF=26.6 : x=(-0.547,-0.899,-7.9) +E1 : pi+ : pT=0.234 : TOF=26.8 : x=(0.923,-0.816,-7.9) +E1 : pi+ : pT=0.32 : TOF=26.7 : x=(-0.429,1.1,-7.9) +E1 : e- : pT=0.00383 : TOF=26.8 : x=(-0.353,1.24,-7.9) +E1 : anti_proton : pT=0.955 : TOF=26.8 : x=(-0.315,-1.04,-7.9) +E0 : pi+ : pT=0.165 : TOF=27.8 : x=(-2.01,1.34,7.9) +E0 : pi+ : pT=0.625 : TOF=26.6 : x=(0.946,-0.635,7.9) +E1 : pi+ : pT=1.52 : TOF=26.7 : x=(0.648,-1,-7.9) +E0 : pi- : pT=0.373 : TOF=28 : x=(2.69,0.635,7.9) +E0 : e- : pT=0.000599 : TOF=29.8 : x=(0.811,1.33,7.9) +E0 : mu+ : pT=0.17 : TOF=27 : x=(-0.497,1.42,7.9) +E1 : proton : pT=0.407 : TOF=32.5 : x=(-2.95,1.58,-7.9) +E0 : pi+ : pT=0.0365 : TOF=26.7 : x=(-0.879,-0.569,7.9) +E0 : pi+ : pT=0.26 : TOF=27.3 : x=(-1.5,-1.24,7.9) +E0 : mu+ : pT=4.39 : TOF=27.5 : x=(-2.21,-0.958,7.9) +E1 : mu- : pT=24.6 : TOF=27 : x=(0.371,1.72,-7.9) +E1 : mu+ : pT=22.1 : TOF=28.7 : x=(3.32,-0.631,-7.9) +B5 : mu- : pT=23.2 : TOF=23.4 : x=(-3.65,-2.36,5.51) + + Print out hit information +------------------------------------------ +*** Muon System Hit (#hits=20) +E1 : pi+ : pT=0.187 : TOF=26.8 : x=(-0.209,1.14,-7.9) +E1 : pi+ : pT=0.735 : TOF=26.8 : x=(0.0321,1.39,-7.9) +E0 : e- : pT=0.000674 : TOF=30.1 : x=(-0.555,0.832,8.06) +E0 : e- : pT=0.000153 : TOF=32.1 : x=(-0.593,0.805,7.99) +E0 : pi+ : pT=0.353 : TOF=26.7 : x=(1.1,-0.0897,7.9) +E0 : pi- : pT=0.394 : TOF=26.9 : x=(1.48,0.0201,7.9) +E0 : pi- : pT=0.548 : TOF=26.7 : x=(1.15,-0.0456,7.9) +E0 : e- : pT=0.00198 : TOF=27.4 : x=(1.1,0.864,7.9) +E0 : e- : pT=0.00186 : TOF=27.8 : x=(1.02,1.17,7.9) +E1 : pi- : pT=0.998 : TOF=26.7 : x=(1.21,-0.139,-7.9) +E1 : pi+ : pT=0.623 : TOF=26.6 : x=(0.885,0.548,-7.9) +B0 : proton : pT=2.12 : TOF=16.1 : x=(4.25,-1.3,-1.04) +E1 : pi+ : pT=0.182 : TOF=28.6 : x=(1.54,-2.38,-7.9) +E1 : pi+ : pT=1.05 : TOF=26.7 : x=(0.53,-0.848,-7.94) +E1 : pi- : pT=0.872 : TOF=26.6 : x=(0.467,-0.902,-7.9) +E1 : proton : pT=1.27 : TOF=26.7 : x=(-0.53,-0.878,-7.9) +E0 : anti_proton : pT=1.35 : TOF=26.8 : x=(0.734,0.98,7.9) +E0 : pi+ : pT=0.767 : TOF=26.9 : x=(0.887,-1.23,7.9) +E1 : anti_proton : pT=0.777 : TOF=27 : x=(-1.01,-0.448,-7.9) +E1 : mu- : pT=0.151 : TOF=30.9 : x=(-0.318,1.98,-7.9) 1********* PYSTAT: Statistics on Number of Events and Cross-sections ********* @@ -395,10 +661,10 @@ E0 : mu+ : pT=17.8 : TOF=27.2 : x=(1.26,1.59,7.9) I I I I ============================================================================== I I I I - I 0 All included subprocesses I 10 43 I 3.988E-12 I - I 102 g + g -> h0 I 7 13 I 2.929E-12 I - I 123 f + f' -> f + f' + h0 I 1 9 I 3.282E-13 I - I 124 f + f' -> f" + f"' + h0 I 2 21 I 7.305E-13 I + I 0 All included subprocesses I 10 36 I 4.123E-12 I + I 102 g + g -> h0 I 4 8 I 2.597E-12 I + I 123 f + f' -> f + f' + h0 I 2 4 I 3.981E-13 I + I 124 f + f' -> f" + f"' + h0 I 4 24 I 1.129E-12 I I I I I ============================================================================== diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02/include/H02EMPhysics.hh b/examples/extended/eventgenerator/HepMC/HepMCEx02/include/H02EMPhysics.hh deleted file mode 100644 index 5a6f301fb8..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02/include/H02EMPhysics.hh +++ /dev/null @@ -1,96 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: H02EMPhysics.hh,v 1.3 2006/06/29 17:09:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// -// ------------------------------------------------------------ -// GEANT 4 class header file -// Class Description: -// This class is an derived class of G4VPhysicsConstructor -// -// ------------------------------------------- -// History -// first version 12 Nov. 2000 by H.Kurashige -// ------------------------------------------------------------ -#ifndef H02EMPhysics_h -#define H02EMPhysics_h 1 - -#include "globals.hh" -#include "G4ios.hh" - -#include "G4VPhysicsConstructor.hh" - -#include "G4PhotoElectricEffect.hh" -#include "G4ComptonScattering.hh" -#include "G4GammaConversion.hh" -#include "G4MultipleScattering.hh" -#include "G4eIonisation.hh" -#include "G4eBremsstrahlung.hh" -#include "G4eplusAnnihilation.hh" - -class H02EMPhysics : public G4VPhysicsConstructor -{ - public: - H02EMPhysics(const G4String& name ="EM"); - virtual ~H02EMPhysics(); - - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); - - protected: - // Gamma physics - G4PhotoElectricEffect thePhotoEffect; - G4ComptonScattering theComptonEffect; - G4GammaConversion thePairProduction; - - // Electron physics - G4MultipleScattering theElectronMultipleScattering; - G4eIonisation theElectronIonisation; - G4eBremsstrahlung theElectronBremsStrahlung; - - //Positron physics - G4MultipleScattering thePositronMultipleScattering; - G4eIonisation thePositronIonisation; - G4eBremsstrahlung thePositronBremsStrahlung; - G4eplusAnnihilation theAnnihilation; -}; - - -#endif - - - - - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02/include/H02GeneralPhysics.hh b/examples/extended/eventgenerator/HepMC/HepMCEx02/include/H02GeneralPhysics.hh deleted file mode 100644 index 72da9c9bd3..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02/include/H02GeneralPhysics.hh +++ /dev/null @@ -1,80 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: H02GeneralPhysics.hh,v 1.3 2006/06/29 17:09:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// -// ------------------------------------------------------------ -// GEANT 4 class header file -// Class Description: -// This class is an derived class of G4VPhysicsConstructor -// -// ------------------------------------------- -// History -// first version 12 Nov. 2000 by H.Kurashige -// ------------------------------------------------------------ -#ifndef H02GeneralPhysics_h -#define H02GeneralPhysics_h 1 - -#include "globals.hh" -#include "G4ios.hh" - -#include "G4VPhysicsConstructor.hh" - - -#include "G4Decay.hh" - -class H02GeneralPhysics : public G4VPhysicsConstructor -{ - public: - H02GeneralPhysics(const G4String& name = "general"); - virtual ~H02GeneralPhysics(); - - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); - - protected: - G4Decay fDecayProcess; -}; - - -#endif - - - - - - - - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02/include/H02HadronPhysics.hh b/examples/extended/eventgenerator/HepMC/HepMCEx02/include/H02HadronPhysics.hh deleted file mode 100644 index eabc361c95..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02/include/H02HadronPhysics.hh +++ /dev/null @@ -1,341 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -//======================== -// taken from example N04 of G4 distribution -//======================== -#ifndef H02HadronPhysics_h -#define H02HadronPhysics_h 1 - -#include "globals.hh" -#include "G4ios.hh" -#include - -#include "G4VPhysicsConstructor.hh" - -#include "G4MultipleScattering.hh" -#include "G4hIonisation.hh" - -#include "G4HadronElasticProcess.hh" -#include "G4HadronFissionProcess.hh" -#include "G4HadronCaptureProcess.hh" - -#include "G4PionPlusInelasticProcess.hh" -#include "G4PionMinusInelasticProcess.hh" -#include "G4KaonPlusInelasticProcess.hh" -#include "G4KaonZeroSInelasticProcess.hh" -#include "G4KaonZeroLInelasticProcess.hh" -#include "G4KaonMinusInelasticProcess.hh" -#include "G4ProtonInelasticProcess.hh" -#include "G4AntiProtonInelasticProcess.hh" -#include "G4NeutronInelasticProcess.hh" -#include "G4AntiNeutronInelasticProcess.hh" -#include "G4LambdaInelasticProcess.hh" -#include "G4AntiLambdaInelasticProcess.hh" -#include "G4SigmaPlusInelasticProcess.hh" -#include "G4SigmaMinusInelasticProcess.hh" -#include "G4AntiSigmaPlusInelasticProcess.hh" -#include "G4AntiSigmaMinusInelasticProcess.hh" -#include "G4XiZeroInelasticProcess.hh" -#include "G4XiMinusInelasticProcess.hh" -#include "G4AntiXiZeroInelasticProcess.hh" -#include "G4AntiXiMinusInelasticProcess.hh" -#include "G4DeuteronInelasticProcess.hh" -#include "G4TritonInelasticProcess.hh" -#include "G4AlphaInelasticProcess.hh" -#include "G4OmegaMinusInelasticProcess.hh" -#include "G4AntiOmegaMinusInelasticProcess.hh" - -// Low-energy Models -#include "G4LElastic.hh" -#include "G4LFission.hh" -#include "G4LCapture.hh" - -#include "G4LEPionPlusInelastic.hh" -#include "G4LEPionMinusInelastic.hh" -#include "G4LEKaonPlusInelastic.hh" -#include "G4LEKaonZeroSInelastic.hh" -#include "G4LEKaonZeroLInelastic.hh" -#include "G4LEKaonMinusInelastic.hh" -#include "G4LEProtonInelastic.hh" -#include "G4LEAntiProtonInelastic.hh" -#include "G4LENeutronInelastic.hh" -#include "G4LEAntiNeutronInelastic.hh" -#include "G4LELambdaInelastic.hh" -#include "G4LEAntiLambdaInelastic.hh" -#include "G4LESigmaPlusInelastic.hh" -#include "G4LESigmaMinusInelastic.hh" -#include "G4LEAntiSigmaPlusInelastic.hh" -#include "G4LEAntiSigmaMinusInelastic.hh" -#include "G4LEXiZeroInelastic.hh" -#include "G4LEXiMinusInelastic.hh" -#include "G4LEAntiXiZeroInelastic.hh" -#include "G4LEAntiXiMinusInelastic.hh" -#include "G4LEDeuteronInelastic.hh" -#include "G4LETritonInelastic.hh" -#include "G4LEAlphaInelastic.hh" -#include "G4LEOmegaMinusInelastic.hh" -#include "G4LEAntiOmegaMinusInelastic.hh" - -// High-energy Models - -#include "G4HEPionPlusInelastic.hh" -#include "G4HEPionMinusInelastic.hh" -#include "G4HEKaonPlusInelastic.hh" -#include "G4HEKaonZeroInelastic.hh" -#include "G4HEKaonZeroInelastic.hh" -#include "G4HEKaonMinusInelastic.hh" -#include "G4HEProtonInelastic.hh" -#include "G4HEAntiProtonInelastic.hh" -#include "G4HENeutronInelastic.hh" -#include "G4HEAntiNeutronInelastic.hh" -#include "G4HELambdaInelastic.hh" -#include "G4HEAntiLambdaInelastic.hh" -#include "G4HESigmaPlusInelastic.hh" -#include "G4HESigmaMinusInelastic.hh" -#include "G4HEAntiSigmaPlusInelastic.hh" -#include "G4HEAntiSigmaMinusInelastic.hh" -#include "G4HEXiZeroInelastic.hh" -#include "G4HEXiMinusInelastic.hh" -#include "G4HEAntiXiZeroInelastic.hh" -#include "G4HEAntiXiMinusInelastic.hh" -#include "G4HEOmegaMinusInelastic.hh" -#include "G4HEAntiOmegaMinusInelastic.hh" - -// Stopping processes -#include "G4AntiProtonAnnihilationAtRest.hh" -#include "G4AntiNeutronAnnihilationAtRest.hh" - -#ifdef TRIUMF_STOP_PIMINUS -#include "G4PionMinusAbsorptionAtRest.hh" -#else -#include "G4PiMinusAbsorptionAtRest.hh" -#endif -#ifdef TRIUMF_STOP_KMINUS -#include "G4KaonMinusAbsorption.hh" -#else -#include "G4KaonMinusAbsorptionAtRest.hh" -#endif - -// quark gluon string model with chips afterburner. -#include "G4TheoFSGenerator.hh" -#include "G4ExcitationHandler.hh" -#include "G4PreCompoundModel.hh" -#include "G4GeneratorPrecompoundInterface.hh" -#include "G4QGSModel.hh" -#include "G4QGSParticipants.hh" -#include "G4QGSMFragmentation.hh" -#include "G4ExcitedStringDecay.hh" - -class H02HadronPhysics : public G4VPhysicsConstructor -{ - public: - H02HadronPhysics(const G4String& name ="hadron"); - virtual ~H02HadronPhysics(); - - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); - - protected: - // Elastic Process - G4HadronElasticProcess theElasticProcess; - G4LElastic* theElasticModel; - - // Pi + - G4PionPlusInelasticProcess thePionPlusInelastic; - G4LEPionPlusInelastic* theLEPionPlusModel; - G4MultipleScattering thePionPlusMult; - G4hIonisation thePionPlusIonisation; - - // Pi - - G4PionMinusInelasticProcess thePionMinusInelastic; - G4LEPionMinusInelastic* theLEPionMinusModel; - G4MultipleScattering thePionMinusMult; - G4hIonisation thePionMinusIonisation; -#ifdef TRIUMF_STOP_PIMINUS - G4PionMinusAbsorptionAtRest thePionMinusAbsorption; -#else - G4PiMinusAbsorptionAtRest thePionMinusAbsorption; -#endif - - // pi+ and pi- - - G4TheoFSGenerator theTheoModel; - G4ExcitationHandler theHandler; - G4PreCompoundModel * thePreEquilib; - G4GeneratorPrecompoundInterface theCascade; - G4QGSModel< G4QGSParticipants > theStringModel; - G4QGSMFragmentation theFragmentation; - G4ExcitedStringDecay * theStringDecay; - - // K + - G4KaonPlusInelasticProcess theKaonPlusInelastic; - G4LEKaonPlusInelastic* theLEKaonPlusModel; - G4HEKaonPlusInelastic* theHEKaonPlusModel; - G4MultipleScattering theKaonPlusMult; - G4hIonisation theKaonPlusIonisation; - - // K - - G4KaonMinusInelasticProcess theKaonMinusInelastic; - G4LEKaonMinusInelastic* theLEKaonMinusModel; - G4HEKaonMinusInelastic* theHEKaonMinusModel; - G4MultipleScattering theKaonMinusMult; - G4hIonisation theKaonMinusIonisation; -#ifdef TRIUMF_STOP_KMINUS - G4KaonMinusAbsorption theKaonMinusAbsorption; -#else - G4PiMinusAbsorptionAtRest theKaonMinusAbsorption; -#endif - - // K0L - G4KaonZeroLInelasticProcess theKaonZeroLInelastic; - G4LEKaonZeroLInelastic* theLEKaonZeroLModel; - G4HEKaonZeroInelastic* theHEKaonZeroLModel; - - // K0S - G4KaonZeroSInelasticProcess theKaonZeroSInelastic; - G4LEKaonZeroSInelastic* theLEKaonZeroSModel; - G4HEKaonZeroInelastic* theHEKaonZeroSModel; - - // Proton - G4ProtonInelasticProcess theProtonInelastic; - G4LEProtonInelastic* theLEProtonModel; - G4HEProtonInelastic* theHEProtonModel; - G4MultipleScattering theProtonMult; - G4hIonisation theProtonIonisation; - - // anti-proton - G4AntiProtonInelasticProcess theAntiProtonInelastic; - G4LEAntiProtonInelastic* theLEAntiProtonModel; - G4HEAntiProtonInelastic* theHEAntiProtonModel; - G4MultipleScattering theAntiProtonMult; - G4hIonisation theAntiProtonIonisation; - G4AntiProtonAnnihilationAtRest theAntiProtonAnnihilation; - - // neutron - G4NeutronInelasticProcess theNeutronInelastic; - G4LENeutronInelastic* theLENeutronModel; - G4HENeutronInelastic* theHENeutronModel; - G4HadronFissionProcess theNeutronFission; - G4LFission* theNeutronFissionModel; - G4HadronCaptureProcess theNeutronCapture; - G4LCapture* theNeutronCaptureModel; - - - // anti-neutron - G4AntiNeutronInelasticProcess theAntiNeutronInelastic; - G4LEAntiNeutronInelastic* theLEAntiNeutronModel; - G4HEAntiNeutronInelastic* theHEAntiNeutronModel; - G4AntiNeutronAnnihilationAtRest theAntiNeutronAnnihilation; - - // Lambda - G4LambdaInelasticProcess theLambdaInelastic; - G4LELambdaInelastic* theLELambdaModel; - G4HELambdaInelastic* theHELambdaModel; - - // AntiLambda - G4AntiLambdaInelasticProcess theAntiLambdaInelastic; - G4LEAntiLambdaInelastic* theLEAntiLambdaModel; - G4HEAntiLambdaInelastic* theHEAntiLambdaModel; - - // SigmaMinus - G4SigmaMinusInelasticProcess theSigmaMinusInelastic; - G4LESigmaMinusInelastic* theLESigmaMinusModel; - G4HESigmaMinusInelastic* theHESigmaMinusModel; - G4MultipleScattering theSigmaMinusMult; - G4hIonisation theSigmaMinusIonisation; - - // AntiSigmaMinus - G4AntiSigmaMinusInelasticProcess theAntiSigmaMinusInelastic; - G4LEAntiSigmaMinusInelastic* theLEAntiSigmaMinusModel; - G4HEAntiSigmaMinusInelastic* theHEAntiSigmaMinusModel; - G4MultipleScattering theAntiSigmaMinusMult; - G4hIonisation theAntiSigmaMinusIonisation; - - // SigmaPlus - G4SigmaPlusInelasticProcess theSigmaPlusInelastic; - G4LESigmaPlusInelastic* theLESigmaPlusModel; - G4HESigmaPlusInelastic* theHESigmaPlusModel; - G4MultipleScattering theSigmaPlusMult; - G4hIonisation theSigmaPlusIonisation; - - // AntiSigmaPlus - G4AntiSigmaPlusInelasticProcess theAntiSigmaPlusInelastic; - G4LEAntiSigmaPlusInelastic* theLEAntiSigmaPlusModel; - G4HEAntiSigmaPlusInelastic* theHEAntiSigmaPlusModel; - G4MultipleScattering theAntiSigmaPlusMult; - G4hIonisation theAntiSigmaPlusIonisation; - - // XiZero - G4XiZeroInelasticProcess theXiZeroInelastic; - G4LEXiZeroInelastic* theLEXiZeroModel; - G4HEXiZeroInelastic* theHEXiZeroModel; - - // AntiXiZero - G4AntiXiZeroInelasticProcess theAntiXiZeroInelastic; - G4LEAntiXiZeroInelastic* theLEAntiXiZeroModel; - G4HEAntiXiZeroInelastic* theHEAntiXiZeroModel; - - // XiMinus - G4XiMinusInelasticProcess theXiMinusInelastic; - G4LEXiMinusInelastic* theLEXiMinusModel; - G4HEXiMinusInelastic* theHEXiMinusModel; - G4MultipleScattering theXiMinusMult; - G4hIonisation theXiMinusIonisation; - - // AntiXiMinus - G4AntiXiMinusInelasticProcess theAntiXiMinusInelastic; - G4LEAntiXiMinusInelastic* theLEAntiXiMinusModel; - G4HEAntiXiMinusInelastic* theHEAntiXiMinusModel; - G4MultipleScattering theAntiXiMinusMult; - G4hIonisation theAntiXiMinusIonisation; - - // OmegaMinus - G4OmegaMinusInelasticProcess theOmegaMinusInelastic; - G4LEOmegaMinusInelastic* theLEOmegaMinusModel; - G4HEOmegaMinusInelastic* theHEOmegaMinusModel; - G4MultipleScattering theOmegaMinusMult; - G4hIonisation theOmegaMinusIonisation; - - // AntiOmegaMinus - G4AntiOmegaMinusInelasticProcess theAntiOmegaMinusInelastic; - G4LEAntiOmegaMinusInelastic* theLEAntiOmegaMinusModel; - G4HEAntiOmegaMinusInelastic* theHEAntiOmegaMinusModel; - G4MultipleScattering theAntiOmegaMinusMult; - G4hIonisation theAntiOmegaMinusIonisation; - - -}; - - -#endif - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02/include/H02IonPhysics.hh b/examples/extended/eventgenerator/HepMC/HepMCEx02/include/H02IonPhysics.hh deleted file mode 100644 index 6ebaec9933..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02/include/H02IonPhysics.hh +++ /dev/null @@ -1,114 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: H02IonPhysics.hh,v 1.3 2006/06/29 17:09:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// -// ------------------------------------------------------------ -// GEANT 4 class header file -// Class Description: -// This class is an derived class of G4VPhysicsConstructor -// -// ------------------------------------------- -// History -// first version 12 Nov. 2000 by H.Kurashige -// ------------------------------------------------------------ -#ifndef H02IonPhysics_h -#define H02IonPhysics_h 1 - -#include "globals.hh" -#include "G4ios.hh" - -#include "G4VPhysicsConstructor.hh" - -#include "G4HadronElasticProcess.hh" -#include "G4LElastic.hh" - -#include "G4DeuteronInelasticProcess.hh" -#include "G4LEDeuteronInelastic.hh" - -#include "G4TritonInelasticProcess.hh" -#include "G4LETritonInelastic.hh" - -#include "G4AlphaInelasticProcess.hh" -#include "G4LEAlphaInelastic.hh" - -#include "G4hIonisation.hh" -#include "G4MultipleScattering.hh" - -class H02IonPhysics : public G4VPhysicsConstructor -{ - public: - H02IonPhysics(const G4String& name="ion"); - virtual ~H02IonPhysics(); - - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); - - protected: - // Elastic Process - G4HadronElasticProcess theElasticProcess; - G4LElastic* theElasticModel; - - // Generic Ion physics - G4MultipleScattering fIonMultipleScattering; - G4hIonisation fIonIonisation; - - // Deuteron physics - G4MultipleScattering fDeuteronMultipleScattering; - G4hIonisation fDeuteronIonisation; - G4DeuteronInelasticProcess fDeuteronProcess; - G4LEDeuteronInelastic* fDeuteronModel; - - // Triton physics - G4MultipleScattering fTritonMultipleScattering; - G4hIonisation fTritonIonisation; - G4TritonInelasticProcess fTritonProcess; - G4LETritonInelastic* fTritonModel; - - // Alpha physics - G4MultipleScattering fAlphaMultipleScattering; - G4hIonisation fAlphaIonisation; - G4AlphaInelasticProcess fAlphaProcess; - G4LEAlphaInelastic* fAlphaModel; - - // He3 physics - G4MultipleScattering fHe3MultipleScattering; - G4hIonisation fHe3Ionisation; - -}; - - -#endif - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02/include/H02MuonPhysics.hh b/examples/extended/eventgenerator/HepMC/HepMCEx02/include/H02MuonPhysics.hh deleted file mode 100644 index 72c7b26722..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02/include/H02MuonPhysics.hh +++ /dev/null @@ -1,96 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: H02MuonPhysics.hh,v 1.3 2006/06/29 17:09:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// -// ------------------------------------------------------------ -// GEANT 4 class header file -// Class Description: -// This class is an derived class of G4VPhysicsConstructor -// -// ------------------------------------------- -// History -// first version 12 Nov. 2000 by H.Kurashige -// ------------------------------------------------------------ -#ifndef H02MuonPhysics_h -#define H02MuonPhysics_h 1 - -#include "globals.hh" -#include "G4ios.hh" - -#include "G4VPhysicsConstructor.hh" -#include "G4MultipleScattering.hh" -#include "G4MuBremsstrahlung.hh" -#include "G4MuPairProduction.hh" -#include "G4MuIonisation.hh" -#include "G4hIonisation.hh" - -#include "G4MuonMinusCaptureAtRest.hh" - -class H02MuonPhysics : public G4VPhysicsConstructor -{ - public: - H02MuonPhysics(const G4String& name="muon"); - virtual ~H02MuonPhysics(); - - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); - - protected: - // Muon physics - G4MultipleScattering fMuPlusMultipleScattering; - G4MuBremsstrahlung fMuPlusBremsstrahlung ; - G4MuPairProduction fMuPlusPairProduction; - G4MuIonisation fMuPlusIonisation; - - G4MultipleScattering fMuMinusMultipleScattering; - G4MuBremsstrahlung fMuMinusBremsstrahlung ; - G4MuPairProduction fMuMinusPairProduction; - G4MuIonisation fMuMinusIonisation; - - G4MuonMinusCaptureAtRest fMuMinusCaptureAtRest; - - // Tau physics - G4MultipleScattering fTauPlusMultipleScattering; - G4hIonisation fTauPlusIonisation; - - G4MultipleScattering fTauMinusMultipleScattering; - G4hIonisation fTauMinusIonisation; - -}; - - -#endif - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02/include/H02PhysicsList.hh b/examples/extended/eventgenerator/HepMC/HepMCEx02/include/H02PhysicsList.hh index f0147d52a0..c8d481ab5d 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02/include/H02PhysicsList.hh +++ b/examples/extended/eventgenerator/HepMC/HepMCEx02/include/H02PhysicsList.hh @@ -23,27 +23,50 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// +// $Id: H02PhysicsList.hh,v 1.3 2006/07/05 12:04:12 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + #ifndef H02PhysicsList_h #define H02PhysicsList_h 1 -#include "G4VModularPhysicsList.hh" +#include "G4VUserPhysicsList.hh" #include "globals.hh" -class H02PhysicsList: public G4VModularPhysicsList +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +class H02PhysicsList: public G4VUserPhysicsList { -public: - H02PhysicsList(); - virtual ~H02PhysicsList(); - -public: - // SetCuts() - virtual void SetCuts(); + public: + H02PhysicsList(); + ~H02PhysicsList(); + protected: + // Construct particle and physics + void ConstructParticle(); + void ConstructProcess(); + + void SetCuts(); + + protected: + // these methods Construct particles + void ConstructBosons(); + void ConstructLeptons(); + void ConstructMesons(); + void ConstructBaryons(); + + protected: + // these methods Construct physics processes and register them + void ConstructGeneral(); + void ConstructEM(); }; +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... #endif - - + diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02EMPhysics.cc b/examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02EMPhysics.cc deleted file mode 100644 index fac4bb00d4..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02EMPhysics.cc +++ /dev/null @@ -1,114 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: H02EMPhysics.cc,v 1.4 2006/06/29 17:10:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// - -#include "H02EMPhysics.hh" - -#include "globals.hh" -#include "G4ios.hh" -#include - - -H02EMPhysics::H02EMPhysics(const G4String& name) - : G4VPhysicsConstructor(name) -{ -} - -H02EMPhysics::~H02EMPhysics() -{ -} - -#include "G4ParticleDefinition.hh" -#include "G4ParticleTable.hh" - -#include "G4Gamma.hh" - -#include "G4Electron.hh" -#include "G4Positron.hh" - -#include "G4NeutrinoE.hh" -#include "G4AntiNeutrinoE.hh" - -void H02EMPhysics::ConstructParticle() -{ - // gamma - G4Gamma::GammaDefinition(); - - // electron - G4Electron::ElectronDefinition(); - G4Positron::PositronDefinition(); - G4NeutrinoE::NeutrinoEDefinition(); - G4AntiNeutrinoE::AntiNeutrinoEDefinition(); -} - - -#include "G4ProcessManager.hh" - - -void H02EMPhysics::ConstructProcess() -{ - G4ProcessManager * pManager = 0; - - // Gamma Physics - pManager = G4Gamma::Gamma()->GetProcessManager(); - pManager->AddDiscreteProcess(&thePhotoEffect); - pManager->AddDiscreteProcess(&theComptonEffect); - pManager->AddDiscreteProcess(&thePairProduction); - - // Electron Physics - pManager = G4Electron::Electron()->GetProcessManager(); - // add processes - pManager->AddDiscreteProcess(&theElectronBremsStrahlung); - - pManager->AddProcess(&theElectronIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theElectronMultipleScattering); - pManager->SetProcessOrdering(&theElectronMultipleScattering, idxAlongStep, 1); - pManager->SetProcessOrdering(&theElectronMultipleScattering, idxPostStep, 1); - - //Positron Physics - pManager = G4Positron::Positron()->GetProcessManager(); - // add processes - pManager->AddDiscreteProcess(&thePositronBremsStrahlung); - - pManager->AddDiscreteProcess(&theAnnihilation); - - pManager->AddRestProcess(&theAnnihilation); - - pManager->AddProcess(&thePositronIonisation, ordInActive,2, 2); - - pManager->AddProcess(&thePositronMultipleScattering); - pManager->SetProcessOrdering(&thePositronMultipleScattering, idxAlongStep, 1); - pManager->SetProcessOrdering(&thePositronMultipleScattering, idxPostStep, 1); - -} - - - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02HadronPhysics.cc b/examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02HadronPhysics.cc deleted file mode 100644 index f6476a0bf0..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02HadronPhysics.cc +++ /dev/null @@ -1,435 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -#include "H02HadronPhysics.hh" - -#include "globals.hh" -#include "G4ios.hh" -#include - - -H02HadronPhysics::H02HadronPhysics(const G4String& name) - : G4VPhysicsConstructor(name) -{ -} - -H02HadronPhysics::~H02HadronPhysics() -{ -delete theStringDecay; -} - -#include "G4ParticleDefinition.hh" -#include "G4ParticleTable.hh" - -// Nuclei -#include "G4MesonConstructor.hh" -#include "G4BaryonConstructor.hh" -#include "G4ShortLivedConstructor.hh" - -void H02HadronPhysics::ConstructParticle() -{ - // Construct all mesons - G4MesonConstructor pMesonConstructor; - pMesonConstructor.ConstructParticle(); - - // Construct all barions - G4BaryonConstructor pBaryonConstructor; - pBaryonConstructor.ConstructParticle(); - - // Construct resonaces and quarks - G4ShortLivedConstructor pShortLivedConstructor; - pShortLivedConstructor.ConstructParticle(); - -} - - -#include "G4ProcessManager.hh" - - -void H02HadronPhysics::ConstructProcess() -{ - G4ProcessManager * pManager = 0; - - // Elastic Process - theElasticModel = new G4LElastic(); - theElasticProcess.RegisterMe(theElasticModel); - - // pi+ and pi- - - thePreEquilib = new G4PreCompoundModel(&theHandler); - theCascade.SetDeExcitation(thePreEquilib); - theTheoModel.SetTransport(&theCascade); - theTheoModel.SetHighEnergyGenerator(&theStringModel); - theStringDecay = new G4ExcitedStringDecay(&theFragmentation); - theStringModel.SetFragmentationModel(theStringDecay); - theTheoModel.SetMinEnergy(15*GeV); - theTheoModel.SetMaxEnergy(100*TeV); - - // PionPlus - pManager = G4PionPlus::PionPlus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEPionPlusModel = new G4LEPionPlusInelastic(); - thePionPlusInelastic.RegisterMe(theLEPionPlusModel); - thePionPlusInelastic.RegisterMe(&theTheoModel); - pManager->AddDiscreteProcess(&thePionPlusInelastic); - - pManager->AddProcess(&thePionPlusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&thePionPlusMult); - pManager->SetProcessOrdering(&thePionPlusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&thePionPlusMult, idxPostStep, 1); - - // PionMinus - pManager = G4PionMinus::PionMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEPionMinusModel = new G4LEPionMinusInelastic(); - thePionMinusInelastic.RegisterMe(theLEPionMinusModel); - thePionMinusInelastic.RegisterMe(&theTheoModel); - pManager->AddDiscreteProcess(&thePionMinusInelastic); - - pManager->AddProcess(&thePionMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&thePionMinusMult); - pManager->SetProcessOrdering(&thePionMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&thePionMinusMult, idxPostStep, 1); - - pManager->AddRestProcess(&thePionMinusAbsorption, ordDefault); - - // KaonPlus - pManager = G4KaonPlus::KaonPlus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEKaonPlusModel = new G4LEKaonPlusInelastic(); - theHEKaonPlusModel = new G4HEKaonPlusInelastic(); - theKaonPlusInelastic.RegisterMe(theLEKaonPlusModel); - theKaonPlusInelastic.RegisterMe(&theTheoModel); - pManager->AddDiscreteProcess(&theKaonPlusInelastic); - - pManager->AddProcess(&theKaonPlusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theKaonPlusMult); - pManager->SetProcessOrdering(&theKaonPlusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theKaonPlusMult, idxPostStep, 1); - - // KaonMinus - pManager = G4KaonMinus::KaonMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEKaonMinusModel = new G4LEKaonMinusInelastic(); - theHEKaonMinusModel = new G4HEKaonMinusInelastic(); - theKaonMinusInelastic.RegisterMe(theLEKaonMinusModel); - theKaonMinusInelastic.RegisterMe(theHEKaonMinusModel); - pManager->AddDiscreteProcess(&theKaonMinusInelastic); - - pManager->AddProcess(&theKaonMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theKaonMinusMult); - pManager->SetProcessOrdering(&theKaonMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theKaonMinusMult, idxPostStep, 1); - - pManager->AddRestProcess(&theKaonMinusAbsorption, ordDefault); - - // KaonZeroL - pManager = G4KaonZeroLong::KaonZeroLong()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEKaonZeroLModel = new G4LEKaonZeroLInelastic(); - theHEKaonZeroLModel = new G4HEKaonZeroInelastic(); - theKaonZeroLInelastic.RegisterMe(theLEKaonZeroLModel); - theKaonZeroLInelastic.RegisterMe(theHEKaonZeroLModel); - pManager->AddDiscreteProcess(&theKaonZeroLInelastic); - - // KaonZeroS - pManager = G4KaonZeroShort::KaonZeroShort()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEKaonZeroSModel = new G4LEKaonZeroSInelastic(); - theHEKaonZeroSModel = new G4HEKaonZeroInelastic(); - theKaonZeroSInelastic.RegisterMe(theLEKaonZeroSModel); - theKaonZeroSInelastic.RegisterMe(theHEKaonZeroSModel); - pManager->AddDiscreteProcess(&theKaonZeroSInelastic); - - // Proton - pManager = G4Proton::Proton()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEProtonModel = new G4LEProtonInelastic(); - theHEProtonModel = new G4HEProtonInelastic(); - theProtonInelastic.RegisterMe(theLEProtonModel); - theProtonInelastic.RegisterMe(&theTheoModel); - pManager->AddDiscreteProcess(&theProtonInelastic); - - pManager->AddProcess(&theProtonIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theProtonMult); - pManager->SetProcessOrdering(&theProtonMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theProtonMult, idxPostStep, 1); - - // anti-Proton - pManager = G4AntiProton::AntiProton()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiProtonModel = new G4LEAntiProtonInelastic(); - theHEAntiProtonModel = new G4HEAntiProtonInelastic(); - theAntiProtonInelastic.RegisterMe(theLEAntiProtonModel); - theAntiProtonInelastic.RegisterMe(theHEAntiProtonModel); - pManager->AddDiscreteProcess(&theAntiProtonInelastic); - - pManager->AddProcess(&theAntiProtonIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theAntiProtonMult); - pManager->SetProcessOrdering(&theAntiProtonMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theAntiProtonMult, idxPostStep, 1); - - pManager->AddRestProcess(&theAntiProtonAnnihilation); - - // Neutron - pManager = G4Neutron::Neutron()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLENeutronModel = new G4LENeutronInelastic(); - theHENeutronModel = new G4HENeutronInelastic(); - theNeutronInelastic.RegisterMe(theLENeutronModel); - theNeutronInelastic.RegisterMe(&theTheoModel); - pManager->AddDiscreteProcess(&theNeutronInelastic); - - //theNeutronFissionModel = new G4LFission(); - //theNeutronFission.RegisterMe(theNeutronFissionModel); - //pManager->AddDiscreteProcess(&NeutronFission); - - //theNeutronCaptureModel = new G4LCapture(); - //theNeutronCapture.RegisterMe(theNeutronCaptureModel); - //pManager->AddDiscreteProcess(&theNeutronCapture); - - // AntiNeutron - pManager = G4AntiNeutron::AntiNeutron()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiNeutronModel = new G4LEAntiNeutronInelastic(); - theHEAntiNeutronModel = new G4HEAntiNeutronInelastic(); - theAntiNeutronInelastic.RegisterMe(theLEAntiNeutronModel); - theAntiNeutronInelastic.RegisterMe(theHEAntiNeutronModel); - pManager->AddDiscreteProcess(&theAntiNeutronInelastic); - - pManager->AddRestProcess(&theAntiNeutronAnnihilation); - - // Lambda - pManager = G4Lambda::Lambda()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLELambdaModel = new G4LELambdaInelastic(); - theHELambdaModel = new G4HELambdaInelastic(); - theLambdaInelastic.RegisterMe(theLELambdaModel); - theLambdaInelastic.RegisterMe(theHELambdaModel); - pManager->AddDiscreteProcess(&theLambdaInelastic); - - // AntiLambda - pManager = G4AntiLambda::AntiLambda()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiLambdaModel = new G4LEAntiLambdaInelastic(); - theHEAntiLambdaModel = new G4HEAntiLambdaInelastic(); - theAntiLambdaInelastic.RegisterMe(theLEAntiLambdaModel); - theAntiLambdaInelastic.RegisterMe(theHEAntiLambdaModel); - pManager->AddDiscreteProcess(&theAntiLambdaInelastic); - - // SigmaMinus - pManager = G4SigmaMinus::SigmaMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLESigmaMinusModel = new G4LESigmaMinusInelastic(); - theHESigmaMinusModel = new G4HESigmaMinusInelastic(); - theSigmaMinusInelastic.RegisterMe(theLESigmaMinusModel); - theSigmaMinusInelastic.RegisterMe(theHESigmaMinusModel); - pManager->AddDiscreteProcess(&theSigmaMinusInelastic); - - pManager->AddProcess(&theSigmaMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theSigmaMinusMult); - pManager->SetProcessOrdering(&theSigmaMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theSigmaMinusMult, idxPostStep, 1); - - // anti-SigmaMinus - pManager = G4AntiSigmaMinus::AntiSigmaMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiSigmaMinusModel = new G4LEAntiSigmaMinusInelastic(); - theHEAntiSigmaMinusModel = new G4HEAntiSigmaMinusInelastic(); - theAntiSigmaMinusInelastic.RegisterMe(theLEAntiSigmaMinusModel); - theAntiSigmaMinusInelastic.RegisterMe(theHEAntiSigmaMinusModel); - pManager->AddDiscreteProcess(&theAntiSigmaMinusInelastic); - - pManager->AddProcess(&theAntiSigmaMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theAntiSigmaMinusMult); - pManager->SetProcessOrdering(&theAntiSigmaMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theAntiSigmaMinusMult, idxPostStep, 1); - - // SigmaPlus - pManager = G4SigmaPlus::SigmaPlus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLESigmaPlusModel = new G4LESigmaPlusInelastic(); - theHESigmaPlusModel = new G4HESigmaPlusInelastic(); - theSigmaPlusInelastic.RegisterMe(theLESigmaPlusModel); - theSigmaPlusInelastic.RegisterMe(theHESigmaPlusModel); - pManager->AddDiscreteProcess(&theSigmaPlusInelastic); - - pManager->AddProcess(&theSigmaPlusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theSigmaPlusMult); - pManager->SetProcessOrdering(&theSigmaPlusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theSigmaPlusMult, idxPostStep, 1); - - // anti-SigmaPlus - pManager = G4AntiSigmaPlus::AntiSigmaPlus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiSigmaPlusModel = new G4LEAntiSigmaPlusInelastic(); - theHEAntiSigmaPlusModel = new G4HEAntiSigmaPlusInelastic(); - theAntiSigmaPlusInelastic.RegisterMe(theLEAntiSigmaPlusModel); - theAntiSigmaPlusInelastic.RegisterMe(theHEAntiSigmaPlusModel); - pManager->AddDiscreteProcess(&theAntiSigmaPlusInelastic); - - pManager->AddProcess(&theAntiSigmaPlusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theAntiSigmaPlusMult); - pManager->SetProcessOrdering(&theAntiSigmaPlusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theAntiSigmaPlusMult, idxPostStep, 1); - - // XiMinus - pManager = G4XiMinus::XiMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEXiMinusModel = new G4LEXiMinusInelastic(); - theHEXiMinusModel = new G4HEXiMinusInelastic(); - theXiMinusInelastic.RegisterMe(theLEXiMinusModel); - theXiMinusInelastic.RegisterMe(theHEXiMinusModel); - pManager->AddDiscreteProcess(&theXiMinusInelastic); - - pManager->AddProcess(&theXiMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theXiMinusMult); - pManager->SetProcessOrdering(&theXiMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theXiMinusMult, idxPostStep, 1); - - // anti-XiMinus - pManager = G4AntiXiMinus::AntiXiMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiXiMinusModel = new G4LEAntiXiMinusInelastic(); - theHEAntiXiMinusModel = new G4HEAntiXiMinusInelastic(); - theAntiXiMinusInelastic.RegisterMe(theLEAntiXiMinusModel); - theAntiXiMinusInelastic.RegisterMe(theHEAntiXiMinusModel); - pManager->AddDiscreteProcess(&theAntiXiMinusInelastic); - - pManager->AddProcess(&theAntiXiMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theAntiXiMinusMult); - pManager->SetProcessOrdering(&theAntiXiMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theAntiXiMinusMult, idxPostStep, 1); - - // XiZero - pManager = G4XiZero::XiZero()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEXiZeroModel = new G4LEXiZeroInelastic(); - theHEXiZeroModel = new G4HEXiZeroInelastic(); - theXiZeroInelastic.RegisterMe(theLEXiZeroModel); - theXiZeroInelastic.RegisterMe(theHEXiZeroModel); - pManager->AddDiscreteProcess(&theXiZeroInelastic); - - // anti-XiZero - pManager = G4AntiXiZero::AntiXiZero()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiXiZeroModel = new G4LEAntiXiZeroInelastic(); - theHEAntiXiZeroModel = new G4HEAntiXiZeroInelastic(); - theAntiXiZeroInelastic.RegisterMe(theLEAntiXiZeroModel); - theAntiXiZeroInelastic.RegisterMe(theHEAntiXiZeroModel); - pManager->AddDiscreteProcess(&theAntiXiZeroInelastic); - - // OmegaMinus - pManager = G4OmegaMinus::OmegaMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEOmegaMinusModel = new G4LEOmegaMinusInelastic(); - theHEOmegaMinusModel = new G4HEOmegaMinusInelastic(); - theOmegaMinusInelastic.RegisterMe(theLEOmegaMinusModel); - theOmegaMinusInelastic.RegisterMe(theHEOmegaMinusModel); - pManager->AddDiscreteProcess(&theOmegaMinusInelastic); - - pManager->AddProcess(&theOmegaMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theOmegaMinusMult); - pManager->SetProcessOrdering(&theOmegaMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theOmegaMinusMult, idxPostStep, 1); - - // anti-OmegaMinus - pManager = G4AntiOmegaMinus::AntiOmegaMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiOmegaMinusModel = new G4LEAntiOmegaMinusInelastic(); - theHEAntiOmegaMinusModel = new G4HEAntiOmegaMinusInelastic(); - theAntiOmegaMinusInelastic.RegisterMe(theLEAntiOmegaMinusModel); - theAntiOmegaMinusInelastic.RegisterMe(theHEAntiOmegaMinusModel); - pManager->AddDiscreteProcess(&theAntiOmegaMinusInelastic); - - pManager->AddProcess(&theAntiOmegaMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theAntiOmegaMinusMult); - pManager->SetProcessOrdering(&theAntiOmegaMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theAntiOmegaMinusMult, idxPostStep, 1); - -} - - - - - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02IonPhysics.cc b/examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02IonPhysics.cc deleted file mode 100644 index f660d167d6..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02IonPhysics.cc +++ /dev/null @@ -1,143 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: H02IonPhysics.cc,v 1.4 2006/06/29 17:10:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// - -#include "H02IonPhysics.hh" - -#include "globals.hh" -#include "G4ios.hh" -#include - - -H02IonPhysics::H02IonPhysics(const G4String& name) - : G4VPhysicsConstructor(name) -{ -} - -H02IonPhysics::~H02IonPhysics() -{ -} - -#include "G4ParticleDefinition.hh" -#include "G4ParticleTable.hh" - -// Nuclei -#include "G4IonConstructor.hh" - -void H02IonPhysics::ConstructParticle() -{ - // Construct light ions - G4IonConstructor pConstructor; - pConstructor.ConstructParticle(); -} - - -#include "G4ProcessManager.hh" - - -void H02IonPhysics::ConstructProcess() -{ - G4ProcessManager * pManager = 0; - - // Elastic Process - theElasticModel = new G4LElastic(); - theElasticProcess.RegisterMe(theElasticModel); - - // Generic Ion - pManager = G4GenericIon::GenericIon()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - pManager->AddProcess(&fIonIonisation, ordInActive, 2, 2); - - pManager->AddProcess(&fIonMultipleScattering); - pManager->SetProcessOrdering(&fIonMultipleScattering, idxAlongStep, 1); - pManager->SetProcessOrdering(&fIonMultipleScattering, idxPostStep, 1); - - // Deuteron - pManager = G4Deuteron::Deuteron()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - fDeuteronModel = new G4LEDeuteronInelastic(); - fDeuteronProcess.RegisterMe(fDeuteronModel); - pManager->AddDiscreteProcess(&fDeuteronProcess); - - pManager->AddProcess(&fDeuteronIonisation, ordInActive, 2, 2); - - pManager->AddProcess(&fDeuteronMultipleScattering); - pManager->SetProcessOrdering(&fDeuteronMultipleScattering, idxAlongStep, 1); - pManager->SetProcessOrdering(&fDeuteronMultipleScattering, idxPostStep, 1); - - // Triton - pManager = G4Triton::Triton()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - fTritonModel = new G4LETritonInelastic(); - fTritonProcess.RegisterMe(fTritonModel); - pManager->AddDiscreteProcess(&fTritonProcess); - - pManager->AddProcess(&fTritonIonisation, ordInActive, 2, 2); - - pManager->AddProcess(&fTritonMultipleScattering); - pManager->SetProcessOrdering(&fTritonMultipleScattering, idxAlongStep, 1); - pManager->SetProcessOrdering(&fTritonMultipleScattering, idxPostStep, 1); - - // Alpha - pManager = G4Alpha::Alpha()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - fAlphaModel = new G4LEAlphaInelastic(); - fAlphaProcess.RegisterMe(fAlphaModel); - pManager->AddDiscreteProcess(&fAlphaProcess); - - pManager->AddProcess(&fAlphaIonisation, ordInActive, 2, 2); - - pManager->AddProcess(&fAlphaMultipleScattering); - pManager->SetProcessOrdering(&fAlphaMultipleScattering, idxAlongStep, 1); - pManager->SetProcessOrdering(&fAlphaMultipleScattering, idxPostStep, 1); - - // He3 - pManager = G4He3::He3()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - pManager->AddProcess(&fHe3Ionisation, ordInActive, 2, 2); - - pManager->AddProcess(&fHe3MultipleScattering); - pManager->SetProcessOrdering(&fHe3MultipleScattering, idxAlongStep, 1); - pManager->SetProcessOrdering(&fHe3MultipleScattering, idxPostStep, 1); - -} - - - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02MuonPhysics.cc b/examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02MuonPhysics.cc deleted file mode 100644 index 22c69c43b8..0000000000 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02MuonPhysics.cc +++ /dev/null @@ -1,131 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: H02MuonPhysics.cc,v 1.4 2006/06/29 17:11:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// - -#include "H02MuonPhysics.hh" - -#include "globals.hh" -#include "G4ios.hh" -#include - - -H02MuonPhysics::H02MuonPhysics(const G4String& name) - : G4VPhysicsConstructor(name) -{ -} - -H02MuonPhysics::~H02MuonPhysics() -{ -} - -#include "G4ParticleDefinition.hh" -#include "G4ParticleTable.hh" - -#include "G4MuonPlus.hh" -#include "G4MuonMinus.hh" -#include "G4TauMinus.hh" -#include "G4TauPlus.hh" -#include "G4NeutrinoTau.hh" -#include "G4AntiNeutrinoTau.hh" -#include "G4NeutrinoMu.hh" -#include "G4AntiNeutrinoMu.hh" - -void H02MuonPhysics::ConstructParticle() -{ - // Mu - G4MuonPlus::MuonPlusDefinition(); - G4MuonMinus::MuonMinusDefinition(); - G4NeutrinoMu::NeutrinoMuDefinition(); - G4AntiNeutrinoMu::AntiNeutrinoMuDefinition(); - - // Tau - G4TauMinus::TauMinusDefinition(); - G4TauPlus::TauPlusDefinition(); - G4NeutrinoTau::NeutrinoTauDefinition(); - G4AntiNeutrinoTau::AntiNeutrinoTauDefinition(); - -} - - -#include "G4ProcessManager.hh" - -void H02MuonPhysics::ConstructProcess() -{ - G4ProcessManager * pManager = 0; - - // Muon Plus Physics - pManager = G4MuonPlus::MuonPlus()->GetProcessManager(); - // add processes - pManager->AddProcess(&fMuPlusIonisation, ordInActive,2, 2); - - pManager->AddDiscreteProcess(&fMuPlusBremsstrahlung); - - pManager->AddDiscreteProcess(&fMuPlusPairProduction); - - pManager->AddProcess(&fMuPlusMultipleScattering); - pManager->SetProcessOrdering(&fMuPlusMultipleScattering, idxAlongStep, 1); - pManager->SetProcessOrdering(&fMuPlusMultipleScattering, idxPostStep, 1); - - // Muon Minus Physics - pManager = G4MuonMinus::MuonMinus()->GetProcessManager(); - // add processes - pManager->AddProcess(&fMuMinusIonisation, ordInActive,2, 2); - - pManager->AddDiscreteProcess(&fMuMinusBremsstrahlung); - - pManager->AddDiscreteProcess(&fMuMinusPairProduction); - - pManager->AddProcess(&fMuMinusMultipleScattering); - pManager->SetProcessOrdering(&fMuMinusMultipleScattering, idxAlongStep, 1); - pManager->SetProcessOrdering(&fMuMinusMultipleScattering, idxPostStep, 1); - pManager->AddRestProcess(&fMuMinusCaptureAtRest); - - // Tau Plus Physics - pManager = G4TauPlus::TauPlus()->GetProcessManager(); - // add processes - pManager->AddProcess(&fTauPlusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&fTauPlusMultipleScattering); - pManager->SetProcessOrdering(&fTauPlusMultipleScattering, idxAlongStep, 1); - pManager->SetProcessOrdering(&fTauPlusMultipleScattering, idxPostStep, 1); - - // Tau Minus Physics - pManager = G4TauMinus::TauMinus()->GetProcessManager(); - // add processes - pManager->AddProcess(&fTauMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&fTauMinusMultipleScattering); - pManager->SetProcessOrdering(&fTauMinusMultipleScattering, idxAlongStep, 1); - pManager->SetProcessOrdering(&fTauMinusMultipleScattering, idxPostStep, 1); - -} - - - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02MuonSD.cc b/examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02MuonSD.cc index 6d60852495..c280e8804b 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02MuonSD.cc +++ b/examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02MuonSD.cc @@ -26,7 +26,7 @@ // ==================================================================== // // H02MuonSD.cc -// $Id: H02MuonSD.cc,v 1.4 2006/06/29 17:11:19 gunter Exp $ +// $Id: H02MuonSD.cc,v 1.5 2006/07/05 12:04:13 gcosmo Exp $ // // ==================================================================== @@ -107,7 +107,6 @@ void H02MuonSD::clear() void H02MuonSD::DrawAll() //////////////////////// { - hitCollection-> DrawAllHits(); } ///////////////////////// diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02PhysicsList.cc b/examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02PhysicsList.cc index c6fc62786d..4ff93444ea 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02PhysicsList.cc +++ b/examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02PhysicsList.cc @@ -24,66 +24,219 @@ // ******************************************************************** // // -// $Id: H02PhysicsList.cc,v 1.4 2006/06/29 17:11:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: H02PhysicsList.cc,v 1.5 2006/07/05 12:04:13 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // -// - -#include "H02PhysicsList.hh" +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... #include "globals.hh" -#include "G4ParticleDefinition.hh" -#include "G4ParticleWithCuts.hh" +#include "H02PhysicsList.hh" + #include "G4ProcessManager.hh" -#include "G4ProcessVector.hh" #include "G4ParticleTypes.hh" -#include "G4ParticleTable.hh" -#include "G4Material.hh" -#include "G4MaterialTable.hh" -#include "G4ios.hh" -#include +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#include "H02GeneralPhysics.hh" -#include "H02EMPhysics.hh" -#include "H02MuonPhysics.hh" -#include "H02HadronPhysics.hh" -#include "H02IonPhysics.hh" - -H02PhysicsList::H02PhysicsList(): G4VModularPhysicsList() +H02PhysicsList::H02PhysicsList(): G4VUserPhysicsList() { - // default cut value (1.0mm) - defaultCutValue = 1.0*mm; - SetVerboseLevel(1); - - // General Physics - RegisterPhysics( new H02GeneralPhysics("general") ); - - // EM Physics - RegisterPhysics( new H02EMPhysics("standard EM")); - - // Muon Physics - RegisterPhysics( new H02MuonPhysics("muon")); - - // Hadron Physics - RegisterPhysics( new H02HadronPhysics("hadron")); - - // Ion Physics - RegisterPhysics( new H02IonPhysics("ion")); - - + defaultCutValue = 1.0*cm; + SetVerboseLevel(1); } +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + H02PhysicsList::~H02PhysicsList() +{} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void H02PhysicsList::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(); + ConstructMesons(); + ConstructBaryons(); } +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void H02PhysicsList::ConstructBosons() +{ + // pseudo-particles + G4Geantino::GeantinoDefinition(); + G4ChargedGeantino::ChargedGeantinoDefinition(); + + // gamma + G4Gamma::GammaDefinition(); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void H02PhysicsList::ConstructLeptons() +{ + // leptons + // e+/- + G4Electron::ElectronDefinition(); + G4Positron::PositronDefinition(); + // mu+/- + G4MuonPlus::MuonPlusDefinition(); + G4MuonMinus::MuonMinusDefinition(); + // nu_e + G4NeutrinoE::NeutrinoEDefinition(); + G4AntiNeutrinoE::AntiNeutrinoEDefinition(); + // nu_mu + G4NeutrinoMu::NeutrinoMuDefinition(); + G4AntiNeutrinoMu::AntiNeutrinoMuDefinition(); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void H02PhysicsList::ConstructMesons() +{ + // mesons + // light mesons + G4PionPlus::PionPlusDefinition(); + G4PionMinus::PionMinusDefinition(); + G4PionZero::PionZeroDefinition(); + G4Eta::EtaDefinition(); + G4EtaPrime::EtaPrimeDefinition(); + G4KaonPlus::KaonPlusDefinition(); + G4KaonMinus::KaonMinusDefinition(); + G4KaonZero::KaonZeroDefinition(); + G4AntiKaonZero::AntiKaonZeroDefinition(); + G4KaonZeroLong::KaonZeroLongDefinition(); + G4KaonZeroShort::KaonZeroShortDefinition(); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void H02PhysicsList::ConstructBaryons() +{ + // barions + G4Proton::ProtonDefinition(); + G4AntiProton::AntiProtonDefinition(); + + G4Neutron::NeutronDefinition(); + G4AntiNeutron::AntiNeutronDefinition(); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void H02PhysicsList::ConstructProcess() +{ + AddTransportation(); + ConstructEM(); + ConstructGeneral(); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#include "G4ComptonScattering.hh" +#include "G4GammaConversion.hh" +#include "G4PhotoElectricEffect.hh" + +#include "G4MultipleScattering.hh" + +#include "G4eIonisation.hh" +#include "G4eBremsstrahlung.hh" +#include "G4eplusAnnihilation.hh" + +#include "G4MuIonisation.hh" +#include "G4MuBremsstrahlung.hh" +#include "G4MuPairProduction.hh" + +#include "G4hIonisation.hh" + +#include "G4StepLimiter.hh" +#include "G4UserSpecialCuts.hh" + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void H02PhysicsList::ConstructEM() +{ + theParticleIterator->reset(); + while( (*theParticleIterator)() ){ + G4ParticleDefinition* particle = theParticleIterator->value(); + G4ProcessManager* pmanager = particle->GetProcessManager(); + G4String particleName = particle->GetParticleName(); + + if (particleName == "gamma") { + // gamma + pmanager->AddDiscreteProcess(new G4PhotoElectricEffect); + pmanager->AddDiscreteProcess(new G4ComptonScattering); + pmanager->AddDiscreteProcess(new G4GammaConversion); + + } else if (particleName == "e-") { + //electron + pmanager->AddProcess(new G4MultipleScattering,-1, 1,1); + pmanager->AddProcess(new G4eIonisation, -1, 2,2); + pmanager->AddProcess(new G4eBremsstrahlung, -1, 3,3); + + } else if (particleName == "e+") { + //positron + pmanager->AddProcess(new G4MultipleScattering,-1, 1,1); + pmanager->AddProcess(new G4eIonisation, -1, 2,2); + pmanager->AddProcess(new G4eBremsstrahlung, -1, 3,3); + pmanager->AddProcess(new G4eplusAnnihilation, 0,-1,4); + + } else if( particleName == "mu+" || + particleName == "mu-" ) { + //muon + pmanager->AddProcess(new G4MultipleScattering,-1, 1,1); + pmanager->AddProcess(new G4MuIonisation, -1, 2,2); + pmanager->AddProcess(new G4MuBremsstrahlung, -1, 3,3); + pmanager->AddProcess(new G4MuPairProduction, -1, 4,4); + + } else if ((!particle->IsShortLived()) && + (particle->GetPDGCharge() != 0.0) && + (particle->GetParticleName() != "chargedgeantino")) { + //all others charged particles except geantino + pmanager->AddProcess(new G4MultipleScattering,-1, 1,1); + pmanager->AddProcess(new G4hIonisation, -1, 2,2); + //step limit + pmanager->AddProcess(new G4StepLimiter, -1,-1,3); + ///pmanager->AddProcess(new G4UserSpecialCuts, -1,-1,4); + } + } +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#include "G4Decay.hh" +void H02PhysicsList::ConstructGeneral() +{ + // Add Decay Process + G4Decay* theDecayProcess = new G4Decay(); + theParticleIterator->reset(); + while( (*theParticleIterator)() ){ + G4ParticleDefinition* particle = theParticleIterator->value(); + G4ProcessManager* pmanager = particle->GetProcessManager(); + if (theDecayProcess->IsApplicable(*particle)) { + pmanager ->AddProcess(theDecayProcess); + // set ordering for PostStepDoIt and AtRestDoIt + pmanager ->SetProcessOrdering(theDecayProcess, idxPostStep); + pmanager ->SetProcessOrdering(theDecayProcess, idxAtRest); + } + } +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + void H02PhysicsList::SetCuts() { - // " G4VUserPhysicsList::SetCutsWithDefault" method sets - // the default cut value for all particle types - SetCutsWithDefault(); + //G4VUserPhysicsList::SetCutsWithDefault method sets + //the default cut value for all particle types + // + SetCutsWithDefault(); + + if (verboseLevel>0) DumpCutValuesTable(); } - +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02PrimaryGeneratorAction.cc b/examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02PrimaryGeneratorAction.cc index 6878eb8fcb..6c1403bc92 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02PrimaryGeneratorAction.cc +++ b/examples/extended/eventgenerator/HepMC/HepMCEx02/src/H02PrimaryGeneratorAction.cc @@ -26,7 +26,7 @@ // ==================================================================== // // H02PrimaryGeneratorAction.cc -// $Id: H02PrimaryGeneratorAction.cc,v 1.3 2006/06/29 17:11:23 gunter Exp $ +// $Id: H02PrimaryGeneratorAction.cc,v 1.4 2006/07/05 12:04:13 gcosmo Exp $ // // ==================================================================== #include "H02PrimaryGeneratorAction.hh" @@ -45,7 +45,11 @@ H02PrimaryGeneratorAction::H02PrimaryGeneratorAction() currentGenerator= particleGun= new G4ParticleGun(); currentGeneratorName= "particleGun"; hepmcAscii= new HepMCG4AsciiReader(); +#ifdef G4LIB_USE_PYTHIA pythiaGen= new HepMCG4PythiaInterface(); +#else + pythiaGen= 0; +#endif gentypeMap["particleGun"]= particleGun; gentypeMap["hepmcAscii"]= hepmcAscii; diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02/src/HepMCG4PythiaInterface.cc b/examples/extended/eventgenerator/HepMC/HepMCEx02/src/HepMCG4PythiaInterface.cc index 3a9836aa51..9aee3b5632 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02/src/HepMCG4PythiaInterface.cc +++ b/examples/extended/eventgenerator/HepMC/HepMCEx02/src/HepMCG4PythiaInterface.cc @@ -26,9 +26,12 @@ // ==================================================================== // // HepMCG4PythiaInterface.cc -// $Id: HepMCG4PythiaInterface.cc,v 1.5 2006/06/29 17:12:26 gunter Exp $ +// $Id: HepMCG4PythiaInterface.cc,v 1.6 2006/07/05 12:04:13 gcosmo Exp $ // // ==================================================================== + +#ifdef G4LIB_USE_PYTHIA + #include "HepMCG4PythiaInterface.hh" #include "HepMCG4PythiaMessenger.hh" @@ -162,3 +165,4 @@ void HepMCG4PythiaInterface::Print() const G4cout << "PythiaInterface::Print()..." << G4endl; } +#endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02/src/HepMCG4PythiaMessenger.cc b/examples/extended/eventgenerator/HepMC/HepMCEx02/src/HepMCG4PythiaMessenger.cc index 4e5162a645..b86719b4c3 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02/src/HepMCG4PythiaMessenger.cc +++ b/examples/extended/eventgenerator/HepMC/HepMCEx02/src/HepMCG4PythiaMessenger.cc @@ -26,9 +26,12 @@ // ==================================================================== // // HepMCG4PythiaMessenger.cc -// $Id: HepMCG4PythiaMessenger.cc,v 1.6 2006/06/29 17:12:28 gunter Exp $ +// $Id: HepMCG4PythiaMessenger.cc,v 1.7 2006/07/05 12:04:13 gcosmo Exp $ // // ==================================================================== + +#ifdef G4LIB_USE_PYTHIA + #include "HepMCG4PythiaMessenger.hh" #include "HepMCG4PythiaInterface.hh" @@ -215,3 +218,4 @@ G4String HepMCG4PythiaMessenger::GetCurrentValue(G4UIcommand* command) return cv; } +#endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02/vis.mac b/examples/extended/eventgenerator/HepMC/HepMCEx02/vis.mac index edafc0775c..b68a0abdd6 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02/vis.mac +++ b/examples/extended/eventgenerator/HepMC/HepMCEx02/vis.mac @@ -1,5 +1,5 @@ # -# Macro file for the initialization phase of "exampleN02.cc" +# Macro file for the initialization phase # when runing in interactive mode # # Sets some default verbose diff --git a/examples/extended/eventgenerator/HepMC/History b/examples/extended/eventgenerator/HepMC/History index 5c061f4532..6ff387acaa 100644 --- a/examples/extended/eventgenerator/HepMC/History +++ b/examples/extended/eventgenerator/HepMC/History @@ -1,4 +1,4 @@ -$Id: History,v 1.12 2005/11/18 21:55:26 asaim Exp $ +$Id: History,v 1.18 2006/11/22 15:09:43 gcosmo Exp $ ------------------------------------------------------------------- ========================================================= @@ -15,6 +15,29 @@ track of all tags. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +Nov 22, 2006 G.Cosmo (exHepMC-V08-01-05) +- Added new example 'MCTruth' showing handling of MC truth information + through the HepMC package (W.Pokorski). +- Corrected GNUmakefiles for HepMCEx01 and HepMCEx02. + +Nov 20, 2006 K.Murakami (exHepMC-V08-01-04) +- HepMCEx01/GNUmakefile was modified for new place of physics list package. + +Nov 17, 2006 M.Asai (exHepMC-V08-01-03) +- Fix a bug in HepMCEx01/ExN04CalorimeterSD.cc. + +Nov 14, 2006 G.Cosmo (exHepMC-V08-01-02) +- Archived examples copies using CLHEP/HepMC. + +Oct 18, 2006 J.Allison (exHepMC-V08-01-01) +- Migrated to new trajectory modeling commands. + +Jul 05, 2006 G.Cosmo (exHepMC-V08-01-00) +- Updated to current version of exampleN04/N02. + Now working with release series 8. +- Corrected GNUmakefile, now requiring CERNLIB 2005 for PYTHIA-8.0.4 + and HepMC 1.27 or greater. + Nov 18, 2005 M.Asai (exHepMC-V07-01-01) - G4HepMC classes are moved from source/event. diff --git a/examples/extended/eventgenerator/HepMC/MCTruth/GNUmakefile b/examples/extended/eventgenerator/HepMC/MCTruth/GNUmakefile new file mode 100644 index 0000000000..1671b4e774 --- /dev/null +++ b/examples/extended/eventgenerator/HepMC/MCTruth/GNUmakefile @@ -0,0 +1,25 @@ +# $Id: GNUmakefile,v 1.1 2006/11/22 14:51:26 gcosmo Exp $ +# -------------------------------------------------------------- +# GNUmakefile for examples module. +# -------------------------------------------------------------- +name := mctruthex +G4TARGET := $(name) +G4EXLIB := true + +ifndef G4INSTALL + G4INSTALL = ../../../../.. +endif + +.PHONY: all + +ifdef HEPMC_DIR +all: lib bin + include $(G4INSTALL)/config/binmake.gmk + + INCFLAGS += -I$(HEPMC_DIR)/include + LDLIBS += -L$(HEPMC_DIR)/lib -lHepMC +else +all: + @echo 'ERROR - HEPMC_DIR not defined in the environment !' + @echo ' Requires HepMC release 1.27.' +endif diff --git a/examples/extended/eventgenerator/HepMC/MCTruth/History b/examples/extended/eventgenerator/HepMC/MCTruth/History new file mode 100644 index 0000000000..0bcfdb5307 --- /dev/null +++ b/examples/extended/eventgenerator/HepMC/MCTruth/History @@ -0,0 +1,19 @@ +$Id: History,v 1.1 2006/11/22 14:51:26 gcosmo Exp $ +------------------------------------------------------------------- + + ========================================================= + Geant4 - an Object-Oriented Toolkit for Simulation in HEP + ========================================================= + + Example MCTruth History file + ---------------------------- +This file should be used by the G4 example coordinator to briefly +summarize all major modifications introduced in the code and keep +track of all tags. + + ---------------------------------------------------------- + * Reverse chronological order (last date on top), please * + ---------------------------------------------------------- + +22 November 2006 G.Cosmo (mctruth-V08-01-00) +- Created from original example provided by W.Pokorski. diff --git a/examples/extended/eventgenerator/HepMC/MCTruth/README b/examples/extended/eventgenerator/HepMC/MCTruth/README new file mode 100644 index 0000000000..03a88ebe26 --- /dev/null +++ b/examples/extended/eventgenerator/HepMC/MCTruth/README @@ -0,0 +1,167 @@ +$Id: README,v 1.1 2006/11/22 14:51:26 gcosmo Exp $ +------------------------------------------------------------------- + + ========================================================= + Geant4 - an Object-Oriented Toolkit for Simulation in HEP + ========================================================= + + MCTRUTH using HepMC + ------------------- + +This example demonstrates a mechanism for Monte Carlo truth handling +using HepMC as the event record. The user does not interact directly +with the HepMC classes but with the MCTruthManager class which takes +care with storing all the necessary information about particles, +vertices and relations between them. A specialized tracking action is +used to test whether given particle is to be stored or not. The +decision criteria for storing particle are configurable via the +MCTruthConfig class. + +HOW TO BUILD THE EXAMPLE ? + +- install HepMC event record (version 1.27) + +- set HEPMC_DIR variable to point to the directory where HepMC is installed; + add the path "$HEPMC_DIR/lib" to your LD_LIBRARY_PATH variable. + +- compile and link to generate the executable: + % gmake + +- execute the application: + % mctruthex + +DESCRIPTION OF THE MCTRUTH HANDLING MECHANISM + +The main element of the MC truth handling machinery is the +MCTruthManager class. This class is responsible for all the +interaction with the HepMC event and does not depend on Geant4. It is +a singleton, therefore it is guaranteed to be instanciated only once +and the static 'GetInstance' method allows to access it from anywhere +in the code. It contains methods like 'NewEvent' to start a new event, +'AddParticle' to add particle to the current event, as well as +'PrintEvent' for the purpose of the debugging. The core of the +algorithm which deals with building up the MC truth event tree within +the HepMC event is implemented in AddParticle method. + +The AddParticle method is called with the following arguments: +four-momentum, production position and 'end' position of the particle, +PDG code of the particle, as well as the particle ID (unique identifier, +as we will see later, corresponding to Geant4 TrackID) and the ID of +the mother. Finally, there is a boolean flag specifying whether the +direct mother of the given particle has been stored, or not. + +The first step, which always takes place, is to instanciate a new +HepMC::GenParticle with the barcode corresponding to particle ID, as +well as to instanciate a new HepMC::GenVertex which will represent the +'end' vertex of the particle. The barcode of the 'end vertex' is equal +to minus the barcode of the particle. + +We can now distinguish several cases: + +1) the particle is a primary in the Geant4 language, i.e. its + mother ID is 0 + + This is the simplest case, we just instanciate a new 'primary' + (without any incoming particles) GenVertex, we add to it the + particle and we put it all in the event. Additionally we store the + ID of the particle in a special vector, where all the IDs of + primary particles will be stored, allowing quick access to each of + the main 'branches' of the event. We return from the method. + +2) the particle is not a primary + + We use the 'event->barcode_to_particle(motherID)' method to get the + pointer to its mother. + + We check if the 'end vertex' of the mother corresponds to the + 'production vertex' of the particle in question. + + 2.1) If the two vertices do match, we attach the new particle to + the 'end vertex' of the mother. We return from the method. + + 2.2) If the two vertices do not match, i.e. the new particle is not + a product of the 'end vertex' of the mother particle, we can + have two cases: + + 2.2.1) The boolean flag says that the direct mother of the + particle has _not_ been stored. This means that the + particle has been 'adopted' by one of its ancestors, or + in other words, the mother ID of the particle does not + correspond to its direct mother (so clearly the + vertices cannot match). This for instance could happen + if we decided not to store gamma coming from pi0 decay + but did decide to store e+/- coming from the gamma + conversion (so the gamma between pi0 and e+/- was + missing). In such a case we instanciate (or use one of + the existing ones, if vertices match) a 'dummy' + particle (with pdg = -999999) which then acts as the + link between the 'adopted' particle and the + (non-direct) mother. In such a way, the navigability up + in the event is still possible, but in the same time, + we can clearly see that the link is not a direct + one. We return from the method. + + 2.2.2) The boolean flag says that direct mother of the + particle _has_ been stored. Taking into account that + the vertices do not match, it can mean only one + thing. The new particle has been produced 'on the + flight', i.e. somewhere 'before' the 'end vertex' of + the mother. This can be the case, for instace, for + delta electrons, bremsstrahlung gammas, etc. In such a + situation, we 'split' the mother particle in two + particles and create a new vertex from which the + secondary will be going out. The complication, however, + arises when we have more than one generated 'on the + flight' particle attached to the same mother. In such a + case, for each secondary we need to locate the right + 'segment' of the mother particle (i.e. we need to find + between which two vertices we need to add a new + one). To keep track of those segmentations we introduce + a map where each particle ID we map into the number of + existing segments (in the normal case one). Each new + 'segment' gets barcode equal to the barcode of the + original particle + N*10000000, where N is the segment + number. In such a way, one can easily follow the + 'segmentation' (if any) of each particle. We return + from the method. + +This concludes the description of MCTruthManager. The MCTruthConfig +class is a collection of criteria (minimal energy, PDG, creator +process, etc) that we want to apply when deciding whether to store or +not given particle. These values are used by the +'MCTruthTrackingAction' which we describe below. This class can +certainly be extended with other members. + +The actual Geant4-dependent part of the MCTruth handling machinery +consists of a few 'G4 user actions' as well as an implementation of +G4VUserTrackInformation. The later one is, for the moment, used only +to store one boolean flag indicating whether the direct mother of the +given track has been stored or not. + +The first user action is MCTruthEventAction which is only reponsible +for calling MCTruthManager::GetInstance()->NewEvent() at the beginning +of each event. It can also be used for printing out events for the +purpose of debugging. + +The actual 'decision making' concerning which particle to store is +done in MCTruthTrackingAction. At the end of each track the method +trackToBeStored(track) is called to check for various characteristics +of the particle. These, for instance can be energy, particle ID, +creator process, etc. + +If the particle satisfies the conditions the +MCTruthManager::GetInstance()->AddParticle is called and all the +procedure described above is performed. The important element here is +that the Geant4 TrackID is used as the unique particle ID in +MCTruthManager and eventually as the barcode of the +HepMC::GenParticle. + +If the particle does not qualify to be stored, there are two actions +performed. First the 'ParentID' of the _daughters_ is set to the +'ParentID' of the currenly processed particle. In other words, the +'ParentID' of the daughters is set to the ID of the last stored +particle. Second, the 'directParent' flag from MCTruthTrackInformation +of the __daughters__ is set to FALSE. In such a way, one is still able +to navigate up in the event (to get the ancestors of the particle), +but in the same time, the particle is flagged as 'not having direct +parent'. diff --git a/examples/extended/eventgenerator/HepMC/MCTruth/include/DetectorConstruction.hh b/examples/extended/eventgenerator/HepMC/MCTruth/include/DetectorConstruction.hh new file mode 100644 index 0000000000..8a53bcf487 --- /dev/null +++ b/examples/extended/eventgenerator/HepMC/MCTruth/include/DetectorConstruction.hh @@ -0,0 +1,83 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: DetectorConstruction.hh,v 1.1 2006/11/22 14:51:27 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// +// -------------------------------------------------------------- +// GEANT 4 - DetectorConstruction class +// -------------------------------------------------------------- +// +// Author: Witold POKORSKI (Witold.Pokorski@cern.ch) +// Date : 2006-02-28 +// +// -------------------------------------------------------------- +#ifndef DetectorConstruction_H +#define DetectorConstruction_H 1 + +#include "G4VUserDetectorConstruction.hh" +#include "globals.hh" + +class G4LogicalVolume; +class G4VPhysicalVolume; +class G4Material; + +class DetectorConstruction : public G4VUserDetectorConstruction +{ +public: + + DetectorConstruction(); + ~DetectorConstruction(); + + G4VPhysicalVolume* Construct(); + +private: + + void PrintParameters(); + // Print the name of absorber and active materials. + + G4Material* Iron; + G4Material* Copper; + G4Material* Tungsten; + G4Material* Lead; + G4Material* Uranium; + G4Material* PbWO4; + G4Material* Polystyrene; + G4Material* LiquidArgon; + G4Material* theAbsorberMaterial; + + G4LogicalVolume* experimentalHall_log; + G4VPhysicalVolume* experimentalHall_phys; + // World envelope. + + G4LogicalVolume* logicAbsorber; + G4VPhysicalVolume* physiAbsorber; + // Absorber layer of the "calorimeter". + +}; + +#endif diff --git a/examples/extended/eventgenerator/HepMC/MCTruth/include/MCTruthConfig.hh b/examples/extended/eventgenerator/HepMC/MCTruth/include/MCTruthConfig.hh new file mode 100644 index 0000000000..71579145b8 --- /dev/null +++ b/examples/extended/eventgenerator/HepMC/MCTruth/include/MCTruthConfig.hh @@ -0,0 +1,77 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: MCTruthConfig.hh,v 1.1 2006/11/22 14:51:27 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// +// -------------------------------------------------------------- +// GEANT 4 - MCTruthConfig class +// -------------------------------------------------------------- +// +// Author: Witold POKORSKI (Witold.Pokorski@cern.ch) +// Date : 2006-03-06 +// +// -------------------------------------------------------------- +#ifndef INCLUDE_MCTRUTHCONFIG_H +#define INCLUDE_MCTRUTHCONFIG_H 1 + +#include +#include + +#include "globals.hh" + +class MCTruthConfig +{ +public: + + MCTruthConfig(); + + virtual ~MCTruthConfig(); + + void SetMinE(double e) {minE = e;} + G4double GetMinE() const {return minE;} + + void SetParticleTypes(std::vector& types) {particleTypes = types;} + void AddParticleType(G4int type) {particleTypes.push_back(type);} + std::vector& GetParticleTypes() {return particleTypes;} + + void SetCreatorProcesses(std::vector& processes) + {creatorProcesses = processes;} + void AddCreatorProcess(G4String& process) + {creatorProcesses.push_back(process);} + std::vector& GetCreatorProcesses() + {return creatorProcesses;} + +private: + + G4double minE; + std::vector particleTypes; + std::vector creatorProcesses; + +}; + +#endif // INCLUDE_MCTRUTHCONFIG_H diff --git a/examples/extended/eventgenerator/HepMC/MCTruth/include/MCTruthEventAction.hh b/examples/extended/eventgenerator/HepMC/MCTruth/include/MCTruthEventAction.hh new file mode 100644 index 0000000000..4a52ba88f3 --- /dev/null +++ b/examples/extended/eventgenerator/HepMC/MCTruth/include/MCTruthEventAction.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: MCTruthEventAction.hh,v 1.1 2006/11/22 14:51:27 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// +// -------------------------------------------------------------- +// GEANT 4 - MCTruthEventAction class +// -------------------------------------------------------------- +// +// Author: Witold POKORSKI (Witold.Pokorski@cern.ch) +// Date : 2005-08-29 +// +// -------------------------------------------------------------- +#ifndef INCLUDE_MCTRUTHEVENTACTION_H +#define INCLUDE_MCTRUTHEVENTACTION_H 1 + +#include "G4UserEventAction.hh" +#include "MCTruthManager.hh" + +class MCTruthEventAction : public G4UserEventAction +{ +public: + + MCTruthEventAction( ); + + virtual ~MCTruthEventAction( ); + + void BeginOfEventAction(const G4Event* anEvent); + void EndOfEventAction(const G4Event* anEvent); + +}; + +#endif // INCLUDE_MCTRUTHEVENTACTION_H diff --git a/examples/novice/N05/src/ExN05MaxTimeCuts.cc b/examples/extended/eventgenerator/HepMC/MCTruth/include/MCTruthManager.hh similarity index 54% rename from examples/novice/N05/src/ExN05MaxTimeCuts.cc rename to examples/extended/eventgenerator/HepMC/MCTruth/include/MCTruthManager.hh index 1c40ea8430..559418d482 100644 --- a/examples/novice/N05/src/ExN05MaxTimeCuts.cc +++ b/examples/extended/eventgenerator/HepMC/MCTruth/include/MCTruthManager.hh @@ -24,66 +24,73 @@ // ******************************************************************** // // -// $Id: ExN05MaxTimeCuts.cc,v 1.7 2006/06/29 17:53:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: MCTruthManager.hh,v 1.1 2006/11/22 14:51:28 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// // -// // -------------------------------------------------------------- -// GEANT 4 class implementation file +// GEANT 4 - MCTruthManager class // -------------------------------------------------------------- -// 15 April 1998 M.Maire +// +// Author: Witold POKORSKI (Witold.Pokorski@cern.ch) +// Date : 2006-02-28 +// // -------------------------------------------------------------- +#ifndef INCLUDE_MCTRUTHMANAGER_H +#define INCLUDE_MCTRUTHMANAGER_H 1 -#include "ExN05MaxTimeCuts.hh" +#include "G4Types.hh" +#include "G4LorentzVector.hh" -#include "G4Step.hh" -#include "G4UserLimits.hh" -#include "G4VParticleChange.hh" -#include "G4EnergyLossTables.hh" +#include "HepMC/GenEvent.h" +#include "HepMC/GenParticle.h" -ExN05MaxTimeCuts::ExN05MaxTimeCuts(const G4String& aName) - : ExN05SpecialCuts(aName) +#include "MCTruthConfig.hh" + +class MCTruthManager { - if (verboseLevel>1) { - G4cout << GetProcessName() << " is created "<< G4endl; - } - SetProcessType(fUserDefined); -} -ExN05MaxTimeCuts::~ExN05MaxTimeCuts() -{} +public: -ExN05MaxTimeCuts::ExN05MaxTimeCuts(ExN05MaxTimeCuts&) - : ExN05SpecialCuts() -{} + static MCTruthManager* GetInstance(); - -G4double ExN05MaxTimeCuts::PostStepGetPhysicalInteractionLength( - const G4Track& aTrack, - G4double , - G4ForceCondition* condition - ) -{ - // condition is set to "Not Forced" - *condition = NotForced; + void NewEvent(); + HepMC::GenEvent* GetCurrentEvent() const {return event;} + void PrintEvent(); - G4double proposedStep = DBL_MAX; - // get the pointer to UserLimits - G4UserLimits* pUserLimits = aTrack.GetVolume()->GetLogicalVolume()->GetUserLimits(); - const G4DynamicParticle* aParticle = aTrack.GetDynamicParticle(); + void AddParticle(G4LorentzVector&, G4LorentzVector&, G4LorentzVector&, + G4int, G4int, G4int, G4bool); + + void SetConfig(MCTruthConfig* c) {config=c;} + MCTruthConfig* GetConfig() const {return config;} + +protected: + + MCTruthManager( ); + + virtual ~MCTruthManager( ); + +private: + + HepMC::GenEvent* event; + + // vector containing barcodes of primary particles (not having any mother) + // + std::vector primarybarcodes; + + // map containing number of 'segmentations' for each particle (i.e. number + // of additional vertices introduced in order to attach secondary particles + // which were created 'in-flight', for instance bremstrahlung gammas, etc) + // + std::map segmentations; + + // different criteria for storing (or not) particles + // + MCTruthConfig* config; + + // recursive printing of the tree + // + void printTree(HepMC::GenParticle*, G4String); - if (pUserLimits) { - G4double temp = DBL_MAX; - //max time limit - G4double dTime= (pUserLimits->GetUserMaxTime(aTrack) - aTrack.GetGlobalTime()); - if (dTime < 0. ) { - proposedStep = 0.; - } else { - G4double beta = (aParticle->GetTotalMomentum())/(aParticle->GetTotalEnergy()); - temp = beta*c_light*dTime; - if (proposedStep > temp) proposedStep = temp; - } - - } - return proposedStep; -} +}; +#endif // INCLUDE_MCTRUTHMANAGER_H diff --git a/examples/extended/eventgenerator/HepMC/MCTruth/include/MCTruthTrackInformation.hh b/examples/extended/eventgenerator/HepMC/MCTruth/include/MCTruthTrackInformation.hh new file mode 100644 index 0000000000..9f1bb40257 --- /dev/null +++ b/examples/extended/eventgenerator/HepMC/MCTruth/include/MCTruthTrackInformation.hh @@ -0,0 +1,64 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: MCTruthTrackInformation.hh,v 1.1 2006/11/22 14:51:28 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// +// -------------------------------------------------------------- +// GEANT 4 - MCTruthTrackInformation class +// -------------------------------------------------------------- +// +// Author: Witold POKORSKI (Witold.Pokorski@cern.ch) +// Date : 2006-03-06 +// +// -------------------------------------------------------------- +#ifndef INCLUDE_MCTRUTHTRACKINFORMATION_H +#define INCLUDE_MCTRUTHTRACKINFORMATION_H 1 + +#include "G4Types.hh" +#include "G4VUserTrackInformation.hh" + +class MCTruthTrackInformation : public G4VUserTrackInformation +{ +public: + + MCTruthTrackInformation(); + + virtual ~MCTruthTrackInformation(); + + void Print() const {}; + + void SetDirectParent(G4bool value) { directParent = value; } + G4bool GetDirectParent() const { return directParent; } + +private: + + G4bool directParent; + +}; + +#endif // INCLUDE_MCTRUTHTRACKINFORMATION_H diff --git a/examples/extended/eventgenerator/HepMC/MCTruth/include/MCTruthTrackingAction.hh b/examples/extended/eventgenerator/HepMC/MCTruth/include/MCTruthTrackingAction.hh new file mode 100644 index 0000000000..b1381d25f3 --- /dev/null +++ b/examples/extended/eventgenerator/HepMC/MCTruth/include/MCTruthTrackingAction.hh @@ -0,0 +1,63 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: MCTruthTrackingAction.hh,v 1.1 2006/11/22 14:51:28 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// +// -------------------------------------------------------------- +// GEANT 4 - MCTruthTrackingAction class +// -------------------------------------------------------------- +// +// Author: Witold POKORSKI (Witold.Pokorski@cern.ch) +// Date : 2005-08-24 +// +// -------------------------------------------------------------- +#ifndef INCLUDE_MCTRUTHTRACKINGACTION_H +#define INCLUDE_MCTRUTHTRACKINGACTION_H 1 + +#include "G4UserTrackingAction.hh" +#include "MCTruthManager.hh" + +class MCTruthTrackingAction : public G4UserTrackingAction +{ +public: + + MCTruthTrackingAction( ); + + virtual ~MCTruthTrackingAction( ); + + void PreUserTrackingAction(const G4Track*); + void PostUserTrackingAction(const G4Track*); + +private: + + G4LorentzVector fmom; + G4bool trackToBeStored(const G4Track*); + +}; + +#endif // INCLUDE_MCTRUTHTRACKINGACTION_H diff --git a/examples/extended/eventgenerator/HepMC/MCTruth/include/PhysicsList.hh b/examples/extended/eventgenerator/HepMC/MCTruth/include/PhysicsList.hh new file mode 100644 index 0000000000..61a9480a0b --- /dev/null +++ b/examples/extended/eventgenerator/HepMC/MCTruth/include/PhysicsList.hh @@ -0,0 +1,76 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: PhysicsList.hh,v 1.1 2006/11/22 14:51:28 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// +// -------------------------------------------------------------- +// GEANT 4 - PhysicsList class +// -------------------------------------------------------------- +// +// Author: Witold POKORSKI (Witold.Pokorski@cern.ch) +// Date : 2006-02-28 +// +// -------------------------------------------------------------- +#ifndef PhysicsList_h +#define PhysicsList_h 1 + +#include "G4VUserPhysicsList.hh" +#include "globals.hh" + +class PhysicsList : public G4VUserPhysicsList +{ + public: + + PhysicsList(); + ~PhysicsList(); + + protected: + + // Construct particle and physics + + void ConstructParticle(); + void ConstructProcess(); + + void SetCuts(); + + protected: + + // these methods Construct particles + + void ConstructBosons(); + void ConstructLeptons(); + void ConstructMesons(); + void ConstructBaryons(); + + // these methods Construct physics processes and register them + + void ConstructGeneral(); + void ConstructEM(); +}; + +#endif diff --git a/examples/extended/eventgenerator/HepMC/MCTruth/include/PrimaryGeneratorAction.hh b/examples/extended/eventgenerator/HepMC/MCTruth/include/PrimaryGeneratorAction.hh new file mode 100644 index 0000000000..550e759bd4 --- /dev/null +++ b/examples/extended/eventgenerator/HepMC/MCTruth/include/PrimaryGeneratorAction.hh @@ -0,0 +1,63 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: PrimaryGeneratorAction.hh,v 1.1 2006/11/22 14:51:28 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// +// -------------------------------------------------------------- +// GEANT 4 - PrimaryGeneratorAction class +// -------------------------------------------------------------- +// +// Author: Witold POKORSKI (Witold.Pokorski@cern.ch) +// Date : 2006-02-28 +// +// -------------------------------------------------------------- +#ifndef PrimaryGeneratorAction_h +#define PrimaryGeneratorAction_h 1 + +#include "G4VUserPrimaryGeneratorAction.hh" + +class G4ParticleGun; +class G4Event; + +class PrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction +{ + public: + + PrimaryGeneratorAction(); + ~PrimaryGeneratorAction(); + + public: + + void GeneratePrimaries(G4Event*); + + private: + + G4ParticleGun* particleGun; +}; + +#endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04MuonHit.hh b/examples/extended/eventgenerator/HepMC/MCTruth/mctruthex.cc similarity index 55% rename from examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04MuonHit.hh rename to examples/extended/eventgenerator/HepMC/MCTruth/mctruthex.cc index 280be5dd09..551e6202e5 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04MuonHit.hh +++ b/examples/extended/eventgenerator/HepMC/MCTruth/mctruthex.cc @@ -23,66 +23,56 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +#include "G4RunManager.hh" +#include "G4UImanager.hh" -#ifndef ExN04MuonHit_h -#define ExN04MuonHit_h 1 +#include "PhysicsList.hh" +#include "PrimaryGeneratorAction.hh" +#include "DetectorConstruction.hh" -#include "G4VHit.hh" -#include "G4THitsCollection.hh" -#include "G4Allocator.hh" -#include "G4ThreeVector.hh" +#include "MCTruthTrackingAction.hh" +#include "MCTruthEventAction.hh" -class ExN04MuonHit : public G4VHit +#include "MCTruthManager.hh" + +int main() { - public: + // Construct the default run manager + G4RunManager* runManager = new G4RunManager; - ExN04MuonHit(); - ~ExN04MuonHit(); - ExN04MuonHit(const ExN04MuonHit &right); - const ExN04MuonHit& operator=(const ExN04MuonHit &right); - G4int operator==(const ExN04MuonHit &right) const; + // set mandatory initialization classes + runManager->SetUserInitialization(new DetectorConstruction); + runManager->SetUserInitialization(new PhysicsList); + // set mandatory user action class + runManager->SetUserAction(new PrimaryGeneratorAction); - inline void *operator new(size_t); - inline void operator delete(void *aHit); + // set MCTruth user action classes + runManager->SetUserAction(new MCTruthTrackingAction); + runManager->SetUserAction(new MCTruthEventAction); - void Draw(); - void Print(); + // Initialize G4 kernel + runManager->Initialize(); - private: - G4double edep; - G4ThreeVector pos; + // get the pointer to the UI manager and set verbosities + G4UImanager* UI = G4UImanager::GetUIpointer(); + UI->ApplyCommand("/run/verbose 1"); + UI->ApplyCommand("/event/verbose 1"); + UI->ApplyCommand("/tracking/verbose 1"); - public: - inline void SetEdep(G4double de) - { edep = de; } - inline void AddEdep(G4double de) - { edep += de; } - inline G4double GetEdep() - { return edep; } - inline void SetPos(G4ThreeVector xyz) - { pos = xyz; } - inline G4ThreeVector GetPos() - { return pos; } + // configure MCTruth handling + MCTruthConfig* config = new MCTruthConfig; + config->SetMinE(1000.0); + config->AddParticleType(11); + MCTruthManager::GetInstance()->SetConfig(config); -}; + // start a run + int numberOfEvent = 1; + runManager->BeamOn(numberOfEvent); -typedef G4THitsCollection ExN04MuonHitsCollection; - -extern G4Allocator ExN04MuonHitAllocator; - -inline void* ExN04MuonHit::operator new(size_t) -{ - void *aHit; - aHit = (void *) ExN04MuonHitAllocator.MallocSingle(); - return aHit; + // job termination + delete runManager; + return 0; } -inline void ExN04MuonHit::operator delete(void *aHit) -{ - ExN04MuonHitAllocator.FreeSingle((ExN04MuonHit*) aHit); -} - -#endif - diff --git a/examples/extended/eventgenerator/HepMC/MCTruth/src/DetectorConstruction.cc b/examples/extended/eventgenerator/HepMC/MCTruth/src/DetectorConstruction.cc new file mode 100644 index 0000000000..5544932d77 --- /dev/null +++ b/examples/extended/eventgenerator/HepMC/MCTruth/src/DetectorConstruction.cc @@ -0,0 +1,238 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: DetectorConstruction.cc,v 1.1 2006/11/22 14:51:29 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// +// -------------------------------------------------------------- +// GEANT 4 - DetectorConstruction class +// -------------------------------------------------------------- +// +// Author: Witold POKORSKI (Witold.Pokorski@cern.ch) +// +// -------------------------------------------------------------- + +#include "DetectorConstruction.hh" +#include "G4Material.hh" +#include "G4Box.hh" +#include "G4LogicalVolume.hh" +#include "G4ThreeVector.hh" +#include "G4PVPlacement.hh" +#include "globals.hh" + +DetectorConstruction::DetectorConstruction() : + Iron(0), Copper(0), Tungsten(0), Lead(0), Uranium(0), PbWO4(0), + Polystyrene(0), LiquidArgon(0), + theAbsorberMaterial(0), + logicAbsorber(0), physiAbsorber(0) {} + + +DetectorConstruction::~DetectorConstruction() {} + + +G4VPhysicalVolume* DetectorConstruction::Construct() +{ + //------------------- materials ------------------------ + + G4double a; // atomic mass + G4double z; // atomic number + G4double density, pressure, temperature, fractionmass; + G4String name, symbol; + G4int nel, natoms; + + //--- elements + + a = 1.01*g/mole; + G4Element* elH = new G4Element(name="Hydrogen", symbol="H2", z=1., a); + + a = 12.01*g/mole; + G4Element* elC = new G4Element(name="Carbon", symbol="C", z=6., a); + + a = 14.01*g/mole; + G4Element* elN = new G4Element(name="Nitrogen", symbol="N2", z=7., a); + + a = 16.00*g/mole; + G4Element* elO = new G4Element(name="Oxygen", symbol="O2", z=8., a); + + a = 183.85*g/mole; + G4Element* elW = new G4Element(name="Tungsten", symbol="W", z=74., a); + + a = 207.19*g/mole; + G4Element* elPb = new G4Element(name="Lead", symbol="Pb", z=82., a); + + //--- simple materials + + // Iron has a X0 = 1.7585 cm and lambda_I = 16.760 cm. + density = 7.87*g/cm3; + a = 55.85*g/mole; + Iron = new G4Material(name="Iron", z=26., a, density); + + // Copper has a X0 = 1.4353 cm and lambda_I = 15.056 cm. + density = 8.96*g/cm3; + a = 63.55*g/mole; + Copper = new G4Material(name="Copper", z=29., a, density); + + // Tungsten has a X0 = 0.35 cm and lambda_I = 9.5855 cm. + density = 19.30*g/cm3; + a = 183.85*g/mole; + Tungsten = new G4Material(name="Tungsten", z=74., a, density); + + // Lead has a X0 = 0.56120 cm and lambda_I = 17.092 cm. + density = 11.35*g/cm3; + a = 207.19*g/mole; + Lead = new G4Material(name="Lead", z=82., a, density); + + // Uranium has a X0 = 0.31662 cm and lambda_I = 10.501 cm. + density = 18.95*g/cm3; + a = 238.03*g/mole; + Uranium = new G4Material(name="Uranium", z=92., a, density); + + // Liquid Argon has a X0 = 10.971 cm and lambda_I = 65.769 cm. + density = 1.4*g/cm3; + a = 39.95*g/mole; + LiquidArgon = new G4Material(name="LiquidArgon", z=18., a, density); + + //--- mixtures + + density = 1.290*mg/cm3; + G4Material* Air = new G4Material(name="Air", density, nel=2); + Air->AddElement(elN, 0.7); + Air->AddElement(elO, 0.3); + + // 4-May-2006 : We rename "Vacuum" as "G4vacuum" to avoid + // problems with Flugg. + density = 1.e-5*g/cm3; + pressure = 2.e-2*bar; + temperature = STP_Temperature; // From PhysicalConstants.h . + G4Material* G4vacuum = new G4Material(name="G4vacuum", density, nel=1, + kStateGas, temperature, pressure); + G4vacuum->AddMaterial(Air, fractionmass=1.); + + // Plastic scintillator tiles (used both in CMS hadron calorimeter + // and ATLAS hadron barrel calorimeter): + // X0 = 42.4 cm and lambda_I = 79.360 cm. + density = 1.032*g/cm3; + Polystyrene = new G4Material(name="Polystyrene", density, nel=2); + Polystyrene->AddElement(elC, natoms=19); + Polystyrene->AddElement(elH, natoms=21); + + // PbWO4 CMS crystals. It has a X0 = 0.89 cm and lambda_I = 22.4 cm. + density = 8.28*g/cm3; + PbWO4 = new G4Material(name="PbWO4", density, nel=3); + PbWO4->AddElement(elPb, natoms=1); + PbWO4->AddElement(elW, natoms=1); + PbWO4->AddElement(elO, natoms=4); + + //------------------- volumes -------------------------- + + // --- experimental hall (world volume) + // beam line along z axis + + //***LOOKHERE*** + const G4double sizeExpHall = 4.0*m; // For normal calorimeter + //const G4double sizeExpHall = 10.0*m; // For Scintillator calorimeter + + G4double expHall_x = sizeExpHall / 2.0; // half dimension along x + G4double expHall_y = sizeExpHall / 2.0; // half dimension along y + G4double expHall_z = sizeExpHall / 2.0; // half dimension along z + + G4Box* experimentalHall_box + = new G4Box("expHall_box",expHall_x,expHall_y,expHall_z); + + experimentalHall_log = new G4LogicalVolume(experimentalHall_box, // solid + G4vacuum, // material + "expHall_log", // name + 0, // field manager + 0, // sensitive detector + 0); // user limits + + experimentalHall_phys = new G4PVPlacement(0, // rotation + G4ThreeVector(), // translation + "expHall", // name + experimentalHall_log, // logical volume + 0, // mother physical volume + false, // boolean operation + 0); // copy number + + // --- Detector + + //***LOOKHERE*** + const G4double sizeCalo = 2.0*m; // For normal calorimeter + //const G4double sizeCalo = 8.0*m; // For Scintillator calorimeter + + G4double xAbsorber = sizeCalo / 2.0; // half dimension along x + G4double yAbsorber = sizeCalo / 2.0; // half dimension along y + G4double zAbsorber = sizeCalo / 2.0; // half dimension along z + + G4Box* solidAbsorber = new G4Box("solidAbsorber", xAbsorber, yAbsorber, zAbsorber); + + logicAbsorber = new G4LogicalVolume(solidAbsorber, // solid + theAbsorberMaterial, // material + "logicAbsorber", // name + 0, // field manager + 0, // sensitive detector + 0); // user limits + + physiAbsorber = new G4PVPlacement(0, // rotation + G4ThreeVector(), // translation + "physiAbsorber", // its name + logicAbsorber, // logical volume + experimentalHall_phys, // mother physical volume + false, // boolean operation + 100); // copy number + + // --- Set default values ***LOOKHERE*** + theAbsorberMaterial = Iron; + //theAbsorberMaterial = Copper; + //theAbsorberMaterial = Tungsten; + //theAbsorberMaterial = Lead; + //theAbsorberMaterial = Uranium; + //theAbsorberMaterial = PbWO4; + //theAbsorberMaterial = Polystyrene; + //theAbsorberMaterial = LiquidArgon; + + logicAbsorber->SetMaterial( theAbsorberMaterial ); + + PrintParameters(); + + return experimentalHall_phys; +} + + +void DetectorConstruction::PrintParameters() +{ + G4cout << G4endl << G4endl + << " ------ DetectorConstruction::PrintParameters() ------ " << G4endl + << " Absorber Material = "; + if ( theAbsorberMaterial ) { + G4cout << theAbsorberMaterial->GetName(); + } else { + G4cout << " UNDEFINED "; + } + G4cout << G4endl << " -------------------------------------------------------- " + << G4endl << G4endl; +} diff --git a/examples/advanced/microbeam/include/MicrobeamVisManager.hh b/examples/extended/eventgenerator/HepMC/MCTruth/src/MCTruthConfig.cc old mode 100755 new mode 100644 similarity index 81% rename from examples/advanced/microbeam/include/MicrobeamVisManager.hh rename to examples/extended/eventgenerator/HepMC/MCTruth/src/MCTruthConfig.cc index fdc222f335..8120b3fac1 --- a/examples/advanced/microbeam/include/MicrobeamVisManager.hh +++ b/examples/extended/eventgenerator/HepMC/MCTruth/src/MCTruthConfig.cc @@ -23,25 +23,23 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// ------------------------------------------------------------------- -// $Id: MicrobeamVisManager.hh,v 1.5 2006/06/29 16:05:21 gunter Exp $ -// ------------------------------------------------------------------- +// +// $Id: MCTruthConfig.cc,v 1.1 2006/11/22 14:51:29 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// +// -------------------------------------------------------------- +// GEANT 4 - MCTruthConfig class +// -------------------------------------------------------------- +// +// Author: Witold POKORSKI (Witold.Pokorski@cern.ch) +// +// -------------------------------------------------------------- -#ifndef MicrobeamVisManager_h -#define MicrobeamVisManager_h 1 +#include "MCTruthConfig.hh" -#include "G4VisManager.hh" +MCTruthConfig::MCTruthConfig() +{} -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... - -class MicrobeamVisManager: public G4VisManager { - -public: - MicrobeamVisManager (); - -private: - void RegisterGraphicsSystems (); - -}; - -#endif +MCTruthConfig::~MCTruthConfig() +{} diff --git a/examples/extended/eventgenerator/HepMC/MCTruth/src/MCTruthEventAction.cc b/examples/extended/eventgenerator/HepMC/MCTruth/src/MCTruthEventAction.cc new file mode 100644 index 0000000000..bd9cad727a --- /dev/null +++ b/examples/extended/eventgenerator/HepMC/MCTruth/src/MCTruthEventAction.cc @@ -0,0 +1,57 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: MCTruthEventAction.cc,v 1.1 2006/11/22 14:51:29 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// +// -------------------------------------------------------------- +// GEANT 4 - MCTruthEventAction class +// -------------------------------------------------------------- +// +// Author: Witold POKORSKI (Witold.Pokorski@cern.ch) +// +// -------------------------------------------------------------- + +#include "MCTruthEventAction.hh" + +MCTruthEventAction::MCTruthEventAction() : G4UserEventAction() +{} + +MCTruthEventAction::~MCTruthEventAction() +{} + +void MCTruthEventAction::BeginOfEventAction(const G4Event*) +{ + // instanciating new event + MCTruthManager::GetInstance()->NewEvent(); +} + +void MCTruthEventAction::EndOfEventAction(const G4Event*) +{ + // printing event + MCTruthManager::GetInstance()->PrintEvent(); +} diff --git a/examples/extended/eventgenerator/HepMC/MCTruth/src/MCTruthManager.cc b/examples/extended/eventgenerator/HepMC/MCTruth/src/MCTruthManager.cc new file mode 100644 index 0000000000..8369e0b401 --- /dev/null +++ b/examples/extended/eventgenerator/HepMC/MCTruth/src/MCTruthManager.cc @@ -0,0 +1,279 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: MCTruthManager.cc,v 1.2 2006/12/13 15:42:36 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// +// -------------------------------------------------------------- +// GEANT 4 - MCTruthManager class +// -------------------------------------------------------------- +// +// Author: Witold POKORSKI (Witold.Pokorski@cern.ch) +// +// -------------------------------------------------------------- + +#include "MCTruthManager.hh" + +static MCTruthManager* instance = 0; + +MCTruthManager::MCTruthManager() : config(0) +{} + +MCTruthManager::~MCTruthManager() +{} + +MCTruthManager* MCTruthManager::GetInstance() +{ + if( instance == 0 ) + { + instance = new MCTruthManager(); + } + return instance; +} + +void MCTruthManager::NewEvent() +{ + // first delete the old event + delete event; + // and now instaciate a new one + event = new HepMC::GenEvent(); +} + +void MCTruthManager::AddParticle(G4LorentzVector& momentum, + G4LorentzVector& prodpos, + G4LorentzVector& endpos, + G4int pdg_id, G4int partID, G4int motherID, + G4bool directParent) +{ + // we create a new particle with barcode = partID + HepMC::GenParticle* particle = new HepMC::GenParticle(momentum, pdg_id); + particle->suggest_barcode(partID); + // we initialize the 'segmentations' map + // for the moment particle is not 'segmented' + segmentations[partID] = 1; + + // we create the GenVertex corresponding to the end point of the track + HepMC::GenVertex* endvertex = new HepMC::GenVertex(endpos); + + // barcode of the endvertex = - barcode of the track + endvertex->suggest_barcode(-partID); + endvertex->add_particle_in(particle); + event->add_vertex(endvertex); + + if(motherID) // not a primary + { + // here we could try to improve speed by searching only through particles which + // belong to the given primary tree + HepMC::GenParticle* mother = event->barcode_to_particle(motherID); + // + if(mother) + { + // we first check whether the mother's end vertex corresponds to the particle's + // production vertex + HepMC::GenVertex* motherendvtx = mother->end_vertex(); + G4LorentzVector motherendpos = motherendvtx->position(); + + if( motherendpos.x() == prodpos.x() && + motherendpos.y() == prodpos.y() && + motherendpos.z() == prodpos.z() ) // if yes, we attach the particle + { + motherendvtx->add_particle_out(particle); + } + else // if not, we check whether the mother is biological or adopted + { + if(!directParent) // adopted + { + G4bool found = false; + + // first check if any of the dummy particles + // has the end vertex at the right place + // + for(HepMC::GenVertex::particles_out_const_iterator + it=motherendvtx->particles_out_const_begin(); + it!=motherendvtx->particles_out_const_end();it++) + { + if((*it)->pdg_id()==-999999) + { + G4LorentzVector dummypos = (*it)->end_vertex()->position(); + + if( dummypos.x() == prodpos.x() && + dummypos.y() == prodpos.y() && + dummypos.z() == prodpos.z() ) + { + (*it)->end_vertex()->add_particle_out(particle); + found = true; + break; + } + } + } + + // and if not, create a dummy particle connecting + // to the end vertex of the mother + // + if(!found) + { + HepMC::GenVertex* childvtx = new HepMC::GenVertex(prodpos); + childvtx->add_particle_out(particle); + + // the dummy vertex gets the barcode -500000 + // minus the daughter particle barcode + // + childvtx->suggest_barcode(-500000-partID); + event->add_vertex(childvtx); + + HepMC::GenParticle* dummypart = + new HepMC::GenParticle(G4LorentzVector(),-999999); + + // the dummy particle gets the barcode 500000 + // plus the daughter particle barcode + // + dummypart->suggest_barcode(500000+partID); + childvtx->add_particle_in(dummypart); + motherendvtx->add_particle_out(dummypart); + } + } + else // biological + { + // in case mother was already 'split' we need to look for + // the right 'segment' to add the new daugther. + // We use Time coordinate to locate the place for the new vertex + + G4int number_of_segments = segmentations[motherID]; + G4int segment = 0; + + // we loop through the segments + // + while ( !((mother->end_vertex()->position().t()>prodpos.t()) && + (mother->production_vertex()->position().t()barcode_to_particle(segment*10000000 + motherID); + } + + // now, we 'split' the appropriate 'segment' of the mother particle + // into two particles and create a new vertex + // + HepMC::GenVertex* childvtx = new HepMC::GenVertex(prodpos); + childvtx->add_particle_out(particle); + event->add_vertex(childvtx); + + // we first detach the mother from its original vertex + // + HepMC::GenVertex* orig_mother_end_vtx = mother->end_vertex(); + orig_mother_end_vtx->remove_particle(mother); + + // and attach it to the new vertex + // + childvtx->add_particle_in(mother); + + // now we create a new particle representing the mother after + // interaction the barcode of the new particle is 10000000 + the + // original barcode + // + HepMC::GenParticle* mothertwo = new HepMC::GenParticle(*mother); + mothertwo->suggest_barcode(segmentations[motherID]*10000000 + + mother->barcode()); + + // we also reset the barcodes of the vertices + // + orig_mother_end_vtx->suggest_barcode(-segmentations[motherID] + *10000000 - mother->barcode()); + childvtx->suggest_barcode(-mother->barcode()); + + // we attach it to the new vertex where interaction took place + // + childvtx->add_particle_out(mothertwo); + + // and we attach it to the original endvertex + // + orig_mother_end_vtx->add_particle_in(mothertwo); + + // and finally ... the increase the 'segmentation counter' + // + segmentations[motherID] = segmentations[motherID]+1; + } + } + } + else + // mother GenParticle is not there for some reason... + // if this happens, we need to revise the philosophy... + // a solution would be to create HepMC particles + // at the begining of each track + { + G4cerr << "barcode " << motherID << " mother not there! "<< G4endl; + } + } + else // primary + { + HepMC::GenVertex* primaryvtx = new HepMC::GenVertex(prodpos); + primaryvtx->add_particle_out(particle); + event->add_vertex(primaryvtx); + + // add id to the list of primaries + // + primarybarcodes.push_back(partID); + } +} + +void MCTruthManager::PrintEvent() +{ + event->print(); + + // looping over primaries and print the decay tree for each of them + // + for(std::vector::const_iterator primarybar=primarybarcodes.begin(); + primarybar!=primarybarcodes.end();primarybar++) + { + printTree(event->barcode_to_particle(*primarybar), " | "); + } +} + +void MCTruthManager::printTree(HepMC::GenParticle* particle, G4String offset) +{ + G4cout << offset << "--- barcode: " << particle->barcode() << " pdg: " + << particle->pdg_id() << " energy: " << particle->momentum().e() + << " production vertex: "<< particle->production_vertex()->position() + << G4endl; + + for(HepMC::GenVertex::particles_out_const_iterator + it=particle->end_vertex()->particles_out_const_begin(); + it!=particle->end_vertex()->particles_out_const_end(); + it++) + { + G4String deltaoffset = ""; + + if( std::fmod((*it)->barcode(),10000000) != std::fmod(particle->barcode(),10000000) ) + { + deltaoffset = " | "; + } + + printTree((*it), offset + deltaoffset); + } +} diff --git a/examples/extended/analysis/A01/src/A01TrackingAction.cc b/examples/extended/eventgenerator/HepMC/MCTruth/src/MCTruthTrackInformation.cc similarity index 76% rename from examples/extended/analysis/A01/src/A01TrackingAction.cc rename to examples/extended/eventgenerator/HepMC/MCTruth/src/MCTruthTrackInformation.cc index 2e9c8fd0a7..2ad51ebb8f 100644 --- a/examples/extended/analysis/A01/src/A01TrackingAction.cc +++ b/examples/extended/eventgenerator/HepMC/MCTruth/src/MCTruthTrackInformation.cc @@ -23,25 +23,26 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: A01TrackingAction.cc,v 1.5 2006/06/29 16:33:09 gunter Exp $ +// +// $Id: MCTruthTrackInformation.cc,v 1.1 2006/11/22 14:51:30 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// +// -------------------------------------------------------------- +// GEANT 4 - MCTruthTrackInformation class // -------------------------------------------------------------- // +// Author: Witold POKORSKI (Witold.Pokorski@cern.ch) +// +// -------------------------------------------------------------- -#include "A01TrackingAction.hh" -#include "G4TrackingManager.hh" -#include "G4Track.hh" -#include "G4Trajectory.hh" +#include "MCTruthTrackInformation.hh" -A01TrackingAction::A01TrackingAction() -{;} - -A01TrackingAction::~A01TrackingAction() -{;} - -void A01TrackingAction::PreUserTrackingAction(const G4Track* aTrack) +MCTruthTrackInformation::MCTruthTrackInformation() { - fpTrackingManager->SetStoreTrajectory(true); - fpTrackingManager->SetTrajectory(new G4Trajectory(aTrack)); + directParent = true; } - +MCTruthTrackInformation::~MCTruthTrackInformation() +{ +} diff --git a/examples/extended/eventgenerator/HepMC/MCTruth/src/MCTruthTrackingAction.cc b/examples/extended/eventgenerator/HepMC/MCTruth/src/MCTruthTrackingAction.cc new file mode 100644 index 0000000000..d00cc522f9 --- /dev/null +++ b/examples/extended/eventgenerator/HepMC/MCTruth/src/MCTruthTrackingAction.cc @@ -0,0 +1,127 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: MCTruthTrackingAction.cc,v 1.1 2006/11/22 14:51:30 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// +// -------------------------------------------------------------- +// GEANT 4 - MCTruthTrackingAction class +// -------------------------------------------------------------- +// +// Author: Witold POKORSKI (Witold.Pokorski@cern.ch) +// +// -------------------------------------------------------------- + +#include + +#include "G4Track.hh" +#include "G4TrackVector.hh" +#include "G4TrackingManager.hh" +#include "MCTruthTrackingAction.hh" +#include "MCTruthTrackInformation.hh" + +MCTruthTrackingAction::MCTruthTrackingAction() +{} + +MCTruthTrackingAction::~MCTruthTrackingAction() +{} + +void MCTruthTrackingAction::PreUserTrackingAction(const G4Track* track) +{ + fmom = G4LorentzVector(track->GetMomentum(), track->GetTotalEnergy()); + + if(!track->GetUserInformation()) + { + G4VUserTrackInformation* mcinf = new MCTruthTrackInformation; + fpTrackingManager->SetUserTrackInformation(mcinf); + } +} + +void MCTruthTrackingAction::PostUserTrackingAction(const G4Track* track) +{ + + G4LorentzVector prodpos(track->GetGlobalTime() - track->GetLocalTime(), + track->GetVertexPosition()); + G4LorentzVector endpos(track->GetGlobalTime(), track->GetPosition()); + + // here (?) make all different checks to decide whether to store the particle + // + if (trackToBeStored(track)) + { + MCTruthTrackInformation* mcinf = + (MCTruthTrackInformation*) track->GetUserInformation(); + + MCTruthManager::GetInstance()-> + AddParticle(fmom, prodpos, endpos, + track->GetDefinition()->GetPDGEncoding(), + track->GetTrackID(), + track->GetParentID(), mcinf->GetDirectParent()); + } + else + { + // If track is not to be stored, propagate it's parent ID (stored) + // to its secondaries + // + G4TrackVector* childrens = fpTrackingManager->GimmeSecondaries() ; + + for( unsigned int index = 0 ; index < childrens->size() ; ++index ) + { + G4Track* tr = (*childrens)[index] ; + tr->SetParentID( track->GetParentID() ); + + // set the flag saying that the direct mother is not stored + // + MCTruthTrackInformation* mcinf = + (MCTruthTrackInformation*) tr->GetUserInformation(); + if(!mcinf) + tr->SetUserInformation(mcinf = new MCTruthTrackInformation); + + mcinf->SetDirectParent(false); + } + } +} + +G4bool MCTruthTrackingAction::trackToBeStored(const G4Track* track) +{ + MCTruthConfig* config = MCTruthManager::GetInstance()->GetConfig(); + + // check energy + if (fmom.e() > config->GetMinE()) return true; + + // particle type + std::vector types = config->GetParticleTypes(); + + if(std::find( types.begin(), types.end(), + track->GetDefinition()->GetPDGEncoding()) + != types.end()) return true; + + // creator process + + // etc... + + return false; +} diff --git a/examples/extended/eventgenerator/HepMC/MCTruth/src/PhysicsList.cc b/examples/extended/eventgenerator/HepMC/MCTruth/src/PhysicsList.cc new file mode 100644 index 0000000000..1ed7d40984 --- /dev/null +++ b/examples/extended/eventgenerator/HepMC/MCTruth/src/PhysicsList.cc @@ -0,0 +1,221 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: PhysicsList.cc,v 1.1 2006/11/22 14:51:30 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// +// -------------------------------------------------------------- +// GEANT 4 - PhysicsList class +// -------------------------------------------------------------- +// +// Author: Witold POKORSKI (Witold.Pokorski@cern.ch) +// +// -------------------------------------------------------------- + +#include "globals.hh" +#include "PhysicsList.hh" + +#include "G4ProcessManager.hh" +#include "G4ParticleTypes.hh" + +PhysicsList::PhysicsList(): G4VUserPhysicsList() +{ + defaultCutValue = 1.0*cm; + SetVerboseLevel(1); +} + +PhysicsList::~PhysicsList() +{} + +void PhysicsList::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(); + ConstructMesons(); + ConstructBaryons(); +} + +void PhysicsList::ConstructBosons() +{ + // pseudo-particles + G4Geantino::GeantinoDefinition(); + G4ChargedGeantino::ChargedGeantinoDefinition(); + + // gamma + G4Gamma::GammaDefinition(); +} + +void PhysicsList::ConstructLeptons() +{ + // leptons + // e+/- + G4Electron::ElectronDefinition(); + G4Positron::PositronDefinition(); + // mu+/- + G4MuonPlus::MuonPlusDefinition(); + G4MuonMinus::MuonMinusDefinition(); + // nu_e + G4NeutrinoE::NeutrinoEDefinition(); + G4AntiNeutrinoE::AntiNeutrinoEDefinition(); + // nu_mu + G4NeutrinoMu::NeutrinoMuDefinition(); + G4AntiNeutrinoMu::AntiNeutrinoMuDefinition(); +} + +void PhysicsList::ConstructMesons() +{ + // mesons + // light mesons + G4PionPlus::PionPlusDefinition(); + G4PionMinus::PionMinusDefinition(); + G4PionZero::PionZeroDefinition(); + G4Eta::EtaDefinition(); + G4EtaPrime::EtaPrimeDefinition(); + G4KaonPlus::KaonPlusDefinition(); + G4KaonMinus::KaonMinusDefinition(); + G4KaonZero::KaonZeroDefinition(); + G4AntiKaonZero::AntiKaonZeroDefinition(); + G4KaonZeroLong::KaonZeroLongDefinition(); + G4KaonZeroShort::KaonZeroShortDefinition(); +} + +void PhysicsList::ConstructBaryons() +{ + // barions + G4Proton::ProtonDefinition(); + G4AntiProton::AntiProtonDefinition(); + + G4Neutron::NeutronDefinition(); + G4AntiNeutron::AntiNeutronDefinition(); +} + +void PhysicsList::ConstructProcess() +{ + AddTransportation(); + ConstructEM(); + ConstructGeneral(); +} + +#include "G4ComptonScattering.hh" +#include "G4GammaConversion.hh" +#include "G4PhotoElectricEffect.hh" + +#include "G4MultipleScattering.hh" + +#include "G4eIonisation.hh" +#include "G4eBremsstrahlung.hh" +#include "G4eplusAnnihilation.hh" + +#include "G4MuIonisation.hh" +#include "G4MuBremsstrahlung.hh" +#include "G4MuPairProduction.hh" + +#include "G4hIonisation.hh" + +#include "G4StepLimiter.hh" +#include "G4UserSpecialCuts.hh" + +void PhysicsList::ConstructEM() +{ + theParticleIterator->reset(); + while( (*theParticleIterator)() ){ + G4ParticleDefinition* particle = theParticleIterator->value(); + G4ProcessManager* pmanager = particle->GetProcessManager(); + G4String particleName = particle->GetParticleName(); + + if (particleName == "gamma") { + // gamma + pmanager->AddDiscreteProcess(new G4PhotoElectricEffect); + pmanager->AddDiscreteProcess(new G4ComptonScattering); + pmanager->AddDiscreteProcess(new G4GammaConversion); + + } else if (particleName == "e-") { + //electron + pmanager->AddProcess(new G4MultipleScattering,-1, 1,1); + pmanager->AddProcess(new G4eIonisation, -1, 2,2); + pmanager->AddProcess(new G4eBremsstrahlung, -1, 3,3); + + } else if (particleName == "e+") { + //positron + pmanager->AddProcess(new G4MultipleScattering,-1, 1,1); + pmanager->AddProcess(new G4eIonisation, -1, 2,2); + pmanager->AddProcess(new G4eBremsstrahlung, -1, 3,3); + pmanager->AddProcess(new G4eplusAnnihilation, 0,-1,4); + + } else if( particleName == "mu+" || + particleName == "mu-" ) { + //muon + pmanager->AddProcess(new G4MultipleScattering,-1, 1,1); + pmanager->AddProcess(new G4MuIonisation, -1, 2,2); + pmanager->AddProcess(new G4MuBremsstrahlung, -1, 3,3); + pmanager->AddProcess(new G4MuPairProduction, -1, 4,4); + + } else if ((!particle->IsShortLived()) && + (particle->GetPDGCharge() != 0.0) && + (particle->GetParticleName() != "chargedgeantino")) { + //all others charged particles except geantino + pmanager->AddProcess(new G4MultipleScattering,-1, 1,1); + pmanager->AddProcess(new G4hIonisation, -1, 2,2); + //step limit + pmanager->AddProcess(new G4StepLimiter, -1,-1,3); + ///pmanager->AddProcess(new G4UserSpecialCuts, -1,-1,4); + } + } +} + +#include "G4Decay.hh" +void PhysicsList::ConstructGeneral() +{ + // Add Decay Process + G4Decay* theDecayProcess = new G4Decay(); + theParticleIterator->reset(); + while( (*theParticleIterator)() ){ + G4ParticleDefinition* particle = theParticleIterator->value(); + G4ProcessManager* pmanager = particle->GetProcessManager(); + if (theDecayProcess->IsApplicable(*particle)) { + pmanager ->AddProcess(theDecayProcess); + // set ordering for PostStepDoIt and AtRestDoIt + pmanager ->SetProcessOrdering(theDecayProcess, idxPostStep); + pmanager ->SetProcessOrdering(theDecayProcess, idxAtRest); + } + } +} + +void PhysicsList::SetCuts() +{ + //G4VUserPhysicsList::SetCutsWithDefault method sets + //the default cut value for all particle types + // + SetCutsWithDefault(); + + if (verboseLevel>0) DumpCutValuesTable(); +} diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04PhysicsList.cc b/examples/extended/eventgenerator/HepMC/MCTruth/src/PrimaryGeneratorAction.cc similarity index 58% rename from examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04PhysicsList.cc rename to examples/extended/eventgenerator/HepMC/MCTruth/src/PrimaryGeneratorAction.cc index dd00f0f825..6c7e06a124 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01/src/ExN04PhysicsList.cc +++ b/examples/extended/eventgenerator/HepMC/MCTruth/src/PrimaryGeneratorAction.cc @@ -24,65 +24,49 @@ // ******************************************************************** // // -// $Id: ExN04PhysicsList.cc,v 1.5 2006/06/29 17:06:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PrimaryGeneratorAction.cc,v 1.1 2006/11/22 14:51:31 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // -// +// +// -------------------------------------------------------------- +// GEANT 4 - PrimaryGeneratorAction class +// -------------------------------------------------------------- +// +// Author: Witold POKORSKI (Witold.Pokorski@cern.ch) +// +// -------------------------------------------------------------- +#include "PrimaryGeneratorAction.hh" -#include "ExN04PhysicsList.hh" - -#include "globals.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" -#include "G4ProcessVector.hh" -#include "G4ParticleTypes.hh" +#include "G4Event.hh" +#include "G4ParticleGun.hh" #include "G4ParticleTable.hh" +#include "G4ParticleDefinition.hh" +#include "globals.hh" -#include "G4Material.hh" -#include "G4MaterialTable.hh" -#include "G4ios.hh" -#include - -#include "ExN04GeneralPhysics.hh" -#include "ExN04EMPhysics.hh" -#include "ExN04MuonPhysics.hh" -#include "ExN04HadronPhysics.hh" -#include "ExN04IonPhysics.hh" - -ExN04PhysicsList::ExN04PhysicsList(): G4VModularPhysicsList() +PrimaryGeneratorAction::PrimaryGeneratorAction() { - // default cut value (1.0mm) - defaultCutValue = 1.0*mm; - // SetVerboseLevel(1); - - // General Physics - RegisterPhysics( new ExN04GeneralPhysics("general") ); - - // EM Physics - RegisterPhysics( new ExN04EMPhysics("standard EM")); - - // Muon Physics - RegisterPhysics( new ExN04MuonPhysics("muon")); - - // Hadron Physics - RegisterPhysics( new ExN04HadronPhysics("hadron")); - - // Ion Physics - RegisterPhysics( new ExN04IonPhysics("ion")); + G4int n_particle = 1; + particleGun = new G4ParticleGun(n_particle); + // default particle + G4ParticleTable* particleTable = G4ParticleTable::GetParticleTable(); + G4ParticleDefinition* particle = particleTable->FindParticle("kaon0S"); + + particleGun->SetParticleDefinition(particle); + particleGun->SetParticleMomentumDirection(G4ThreeVector(0.,0.,1.)); + particleGun->SetParticleEnergy(3.0*GeV); } -ExN04PhysicsList::~ExN04PhysicsList() +PrimaryGeneratorAction::~PrimaryGeneratorAction() { + delete particleGun; } -void ExN04PhysicsList::SetCuts() -{ - // " G4VUserPhysicsList::SetCutsWithDefault" method sets - // the default cut value for all particle types - SetCutsWithDefault(); +void PrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent) +{ + G4double position = 0.0; + particleGun->SetParticlePosition(G4ThreeVector(0.*cm,0.*cm,position)); + + particleGun->GeneratePrimaryVertex(anEvent); } - - - diff --git a/examples/extended/eventgenerator/HepMC/README b/examples/extended/eventgenerator/HepMC/README index b6b46dd5e6..779cc74776 100644 --- a/examples/extended/eventgenerator/HepMC/README +++ b/examples/extended/eventgenerator/HepMC/README @@ -1,35 +1,27 @@ + Examples for HepMC-Geant4 interface ----------------------------------- - This directory contains examples for using HepMC as an interface with -various Monte Carlo event generators, such as PYTHIA. - - In the version 1.80 of CLHEP, HepMC is merged into a part of CLHEP. -Toghether with this migration, the generic interfaces with HepMC is -provied in the G4 main tree from the release of Geant4.5.0. -But there are differences between the original HepMC and the CLHEP version -in terms of the I/O scheme. So, in this directory, a pair of codes for -each example, one for original HepMC and the other for the CLHEP version -which is tagged with "-clhep", is prepared. - +This directory contains examples for using HepMC as an interface with +various Monte Carlo event generators, such as PYTHIA. +It also include an example for demonstrating MC truth handling with HepMC. Requirements for external software packages ------------------------------------------- -HepMC (now, migrated into CLHEP(1.80)) - tested version : 1.21 (latest at 28/May/02) - URL: http://mdobbs.home.cern.ch/mdobbs/HepMC/ +HepMC: + tested version : 1.27.02 + http://lcgapp.cern.ch/project/spi/extsoft/packages.php?pkg=HepMC + http://cern.ch/mdobbs/HepMC/ - Note that the original HepMC can be currently compiled only with gcc, - so examples were tested only with gcc. + Note: examples were tested only on Linux with gcc. PYTHIA - tested version 6.205 + Tested version 6.205 (CERNLIB 2005) URL: http://www.thep.lu.se/~torbjorn/Pythia.html -What is provided ----------------- -a) For the original HepMC +Examples HepMCEx01 and HepMCEx02 +================================ class HepMCG4Interface This class is derived from G4VPrimaryGenerator, and is a base class @@ -65,46 +57,28 @@ class HepMCG4PythiaInterface / HepMCG4AsciiReaderMessenger Users can set parameters, initialize, generate, and terminate by command line operation. + Macros in examples + ----------------- + hepmc_pygen.in + process PYTHIA events(H->4mu) generated at every event. -b) For the CLHEP version of HepMC + hepmc_ascii.in + read pregenerated events from HepMC Ascii file (data/example_MyPhyia.dat). - G4HepMCInterface, G4HepMCAsciiReader and G4HepMCAsciiReaderMessenger, -which have the same functionality as the above respective ones, are located -in the Geant4 "event/" source tree. As an example of interface with PYTHIA, -the classes of HxxPythiaInterface/HxxPythiaMessenger are provided in each -example. + How to compile + -------------- + To build HepMCEx01 and HepMCEx02 examples, the directory path where the + HepMC package is installed must be provided through the variable HEPMC_DIR. + PYTHIA 6.205 must be installed through CERNLIB 2005 and the bin path + correctly added in PATH. -Examples --------- -HepMCEx01/HepMCEx01-clhep - This example is based on ExampleN04. Only part of the primary generator - action is replaced with new one. + Notes + ----- + We attached a sample HepMC Ascii data file, "data/example_MyPhyia.dat", + which contains 10 PYTHIA events created by "data/example_MyPythia.cxx(cc)". -HepMCEx02/HepMCEx02-clhep - This is another example having the same generator action as HepMCEx01, - but much simpler user control. - - -Macros in examples ------------------ -hepmc_pygen.in - process PYTHIA events(H->4mu) generated at every event. - -hepmc_ascii.in - read pregenerated events from HepMC Ascii file (data/example_MyPhyia.dat). - -How to compile --------------- -To build these examples, directory names including HepMC and PYTHIA -library have to be given in GNUmakefile. Please modify the next two lines -in GNUmakefile; - - HEPMC_DIR := xxxxx # HepMC installed directory - (required only for using the original version) - CERNLIB_DIR := xxxxx # directory including PYTHIA library - -Notes ------ -We attached a sample HepMC Ascii data file, "data/example_MyPhyia.dat", -which contains ten PYTHIA events created by "data/example_MyPythia.cxx(cc)". +Example MCTruth +=============== +Application demonstrating handling of Monte-Carlo truth information through +the HepMC package. diff --git a/examples/extended/eventgenerator/exgps/include/exGPSEventActionMessenger.hh b/examples/extended/eventgenerator/exgps/include/exGPSEventActionMessenger.hh index 1ef015f479..4118d00fb7 100644 --- a/examples/extended/eventgenerator/exgps/include/exGPSEventActionMessenger.hh +++ b/examples/extended/eventgenerator/exgps/include/exGPSEventActionMessenger.hh @@ -31,7 +31,7 @@ // and all its terms. // // $Id: exGPSEventActionMessenger.hh,v 1.4 2006/06/29 17:14:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/eventgenerator/exgps/src/exGPSEventActionMessenger.cc b/examples/extended/eventgenerator/exgps/src/exGPSEventActionMessenger.cc index 3e8137813f..64c8989566 100644 --- a/examples/extended/eventgenerator/exgps/src/exGPSEventActionMessenger.cc +++ b/examples/extended/eventgenerator/exgps/src/exGPSEventActionMessenger.cc @@ -31,7 +31,7 @@ // and all its terms. // // $Id: exGPSEventActionMessenger.cc,v 1.3 2006/06/29 17:14:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/BlineTracer/include/G4BlineEquation.hh b/examples/extended/field/BlineTracer/include/G4BlineEquation.hh index 2fdc6ae014..22b2bc791a 100644 --- a/examples/extended/field/BlineTracer/include/G4BlineEquation.hh +++ b/examples/extended/field/BlineTracer/include/G4BlineEquation.hh @@ -25,7 +25,7 @@ // // // $Id: G4BlineEquation.hh,v 1.2 2006/06/29 17:14:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/examples/extended/field/BlineTracer/include/G4BlineEventAction.hh b/examples/extended/field/BlineTracer/include/G4BlineEventAction.hh index 799b15e1a4..5bdd59e6fb 100644 --- a/examples/extended/field/BlineTracer/include/G4BlineEventAction.hh +++ b/examples/extended/field/BlineTracer/include/G4BlineEventAction.hh @@ -25,7 +25,7 @@ // // // $Id: G4BlineEventAction.hh,v 1.2 2006/06/29 17:14:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/examples/extended/field/BlineTracer/include/G4BlinePrimaryGeneratorAction.hh b/examples/extended/field/BlineTracer/include/G4BlinePrimaryGeneratorAction.hh index f763492cc2..f4fbe4001d 100644 --- a/examples/extended/field/BlineTracer/include/G4BlinePrimaryGeneratorAction.hh +++ b/examples/extended/field/BlineTracer/include/G4BlinePrimaryGeneratorAction.hh @@ -25,7 +25,7 @@ // // // $Id: G4BlinePrimaryGeneratorAction.hh,v 1.2 2006/06/29 17:14:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/examples/extended/field/BlineTracer/include/G4BlineSteppingAction.hh b/examples/extended/field/BlineTracer/include/G4BlineSteppingAction.hh index fd929d9df7..e6d573d1c5 100644 --- a/examples/extended/field/BlineTracer/include/G4BlineSteppingAction.hh +++ b/examples/extended/field/BlineTracer/include/G4BlineSteppingAction.hh @@ -25,7 +25,7 @@ // // // $Id: G4BlineSteppingAction.hh,v 1.2 2006/06/29 17:15:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/examples/extended/field/BlineTracer/include/G4BlineTracer.hh b/examples/extended/field/BlineTracer/include/G4BlineTracer.hh index e71e7f24ed..3030f257ac 100644 --- a/examples/extended/field/BlineTracer/include/G4BlineTracer.hh +++ b/examples/extended/field/BlineTracer/include/G4BlineTracer.hh @@ -25,7 +25,7 @@ // // // $Id: G4BlineTracer.hh,v 1.2 2006/06/29 17:15:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/examples/extended/field/BlineTracer/include/G4BlineTracerMessenger.hh b/examples/extended/field/BlineTracer/include/G4BlineTracerMessenger.hh index ea188bea1f..4c465ddb58 100644 --- a/examples/extended/field/BlineTracer/include/G4BlineTracerMessenger.hh +++ b/examples/extended/field/BlineTracer/include/G4BlineTracerMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: G4BlineTracerMessenger.hh,v 1.2 2006/06/29 17:15:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/examples/extended/field/BlineTracer/src/G4BlineEquation.cc b/examples/extended/field/BlineTracer/src/G4BlineEquation.cc index 3a2277154a..152589b0a8 100644 --- a/examples/extended/field/BlineTracer/src/G4BlineEquation.cc +++ b/examples/extended/field/BlineTracer/src/G4BlineEquation.cc @@ -25,7 +25,7 @@ // // // $Id: G4BlineEquation.cc,v 1.2 2006/06/29 17:15:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/examples/extended/field/BlineTracer/src/G4BlineEventAction.cc b/examples/extended/field/BlineTracer/src/G4BlineEventAction.cc index 2547c16a87..05a18627b5 100644 --- a/examples/extended/field/BlineTracer/src/G4BlineEventAction.cc +++ b/examples/extended/field/BlineTracer/src/G4BlineEventAction.cc @@ -25,7 +25,7 @@ // // // $Id: G4BlineEventAction.cc,v 1.2 2006/06/29 17:15:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/examples/extended/field/BlineTracer/src/G4BlinePrimaryGeneratorAction.cc b/examples/extended/field/BlineTracer/src/G4BlinePrimaryGeneratorAction.cc index efe9b45a10..2399426578 100644 --- a/examples/extended/field/BlineTracer/src/G4BlinePrimaryGeneratorAction.cc +++ b/examples/extended/field/BlineTracer/src/G4BlinePrimaryGeneratorAction.cc @@ -25,7 +25,7 @@ // // // $Id: G4BlinePrimaryGeneratorAction.cc,v 1.3 2006/06/29 17:15:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/examples/extended/field/BlineTracer/src/G4BlineSteppingAction.cc b/examples/extended/field/BlineTracer/src/G4BlineSteppingAction.cc index ade40855b2..42a277faf9 100644 --- a/examples/extended/field/BlineTracer/src/G4BlineSteppingAction.cc +++ b/examples/extended/field/BlineTracer/src/G4BlineSteppingAction.cc @@ -25,7 +25,7 @@ // // // $Id: G4BlineSteppingAction.cc,v 1.2 2006/06/29 17:15:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/examples/extended/field/BlineTracer/src/G4BlineTracer.cc b/examples/extended/field/BlineTracer/src/G4BlineTracer.cc index bc269f8fe5..fb2169512b 100644 --- a/examples/extended/field/BlineTracer/src/G4BlineTracer.cc +++ b/examples/extended/field/BlineTracer/src/G4BlineTracer.cc @@ -25,7 +25,7 @@ // // // $Id: G4BlineTracer.cc,v 1.3 2006/06/29 17:15:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/examples/extended/field/BlineTracer/src/G4BlineTracerMessenger.cc b/examples/extended/field/BlineTracer/src/G4BlineTracerMessenger.cc index 258ccdf288..423b7c5894 100644 --- a/examples/extended/field/BlineTracer/src/G4BlineTracerMessenger.cc +++ b/examples/extended/field/BlineTracer/src/G4BlineTracerMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: G4BlineTracerMessenger.cc,v 1.2 2006/06/29 17:15:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // diff --git a/examples/extended/field/field01/field01.cc b/examples/extended/field/field01/field01.cc index a0f1a21ace..8d1ce6743b 100644 --- a/examples/extended/field/field01/field01.cc +++ b/examples/extended/field/field01/field01.cc @@ -25,7 +25,7 @@ // // // $Id: field01.cc,v 1.8 2006/06/29 17:15:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/field/field01/field01.out b/examples/extended/field/field01/field01.out index 81b52976c9..7f234fd678 100644 --- a/examples/extended/field/field01/field01.out +++ b/examples/extended/field/field01/field01.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -76,17 +76,13 @@ Registered model factories: drawByCharge drawByParticleID drawByOriginVolume - -Registered models: - None + drawByAttribute Registered filter factories: chargeFilter particleFilter originVolumeFilter - -Registered filters: - None + attributeFilter The WORLD is made of 44000mm of Air, the transverse size (R) of the world is 22000 mm. @@ -103,6 +99,7 @@ G4ClassicalRK4 (default) is called The minimal step is equal to 0.1 mm phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV Sampling according Klein-Nishina model @@ -110,7 +107,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.022 MeV to 100 GeV in 100 bins. @@ -229,14 +226,17 @@ Start Run processing. Step# X Y Z Direction x dir y dir z KineE dEStep StepLeng TrakLeng Volume Process 0 0 fm 0 fm 21.9895 m 0 0 -1 500 MeV 0 eV 0 fm 0 fm World initStep +G4GlobalFastSimulationManager::GetFlavoredWorldForThis(...): DEPRECATING, will be dropped @ next major release 1 0 fm 1.01183 m 21.9895 m 0 8.95106e-13 1 500 MeV0.00387483 eV 1.58938 m 1.58938 m World Transportation 2 0 fm 1.01183 m 21.9905 m 0 -0.00197661 0.999998 500 MeV2.43795e-06 eV 1 mm 1.59038 m Absorber Transportation 3 0 fm 1.01172 m 22 m 0 -0.0207544 0.999785 500 MeV2.31623e-05 eV 9.50075 mm 1.59988 m OutOfWorld Transportation +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release Run terminated. Run Summary Number of events processed : 1 - User=0s Real=0.01s Sys=0s + User=0s Real=0.02s Sys=0s ERROR: G4VisCommandsViewerUpdate::SetNewValue: no current viewer. +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release ========= Table of registered couples ============================== @@ -249,10 +249,12 @@ Index : 0 used in the geometry : Yes recalculation needed : No ==================================================================== +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release ### Run 1 start. WARNING: Scene "refresh" not found. /vis/scene/list to see scenes. Start Run processing. +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release ---> Begin of Event: 0 @@ -262,13 +264,15 @@ Start Run processing. Step# X Y Z Direction x dir y dir z KineE dEStep StepLeng TrakLeng Volume Process 0 0 fm 0 fm 21.9895 m 0 0 -1 250 MeV 0 eV 0 fm 0 fm World initStep +G4GlobalFastSimulationManager::GetFlavoredWorldForThis(...): DEPRECATING, will be dropped @ next major release 1 0 fm 50.6432 cm 21.9895 m 0 1.17461e-09 1 250 MeV0.00183026 eV 79.5502 cm 79.5502 cm World Transportation 2 0 fm 50.643 cm 21.9905 m 0 -0.0039492 0.999992 250 MeV2.30077e-06 eV 1 mm 79.6502 cm Absorber Transportation 3 0 fm 50.6214 cm 22 m 0 -0.0414666 0.99914 250 MeV2.18642e-05 eV 9.50301 mm 80.6005 cm OutOfWorld Transportation +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release Run terminated. Run Summary Number of events processed : 1 - User=0s Real=0s Sys=0s + User=0.01s Real=0.01s Sys=0s ERROR: G4VisCommandsViewerUpdate::SetNewValue: no current viewer. ========= Table of registered couples ============================== @@ -295,13 +299,14 @@ Start Run processing. Step# X Y Z Direction x dir y dir z KineE dEStep StepLeng TrakLeng Volume Process 0 0 fm 0 fm 21.9895 m 0 0 -1 200 MeV 0 eV 0 fm 0 fm World initStep +G4GlobalFastSimulationManager::GetFlavoredWorldForThis(...): DEPRECATING, will be dropped @ next major release 1 0 fm 40.5352 cm 21.9895 m 0 -2.18037e-09 1 200 MeV0.00143691 eV 63.6725 cm 63.6725 cm World Transportation 2 0 fm 40.5349 cm 21.9905 m 0 -0.00493399 0.999988 200 MeV2.25672e-06 eV 1 mm 63.7725 cm Absorber Transportation 3 0 fm 40.5079 cm 22 m 0 -0.0518069 0.998657 200 MeV2.14494e-05 eV 9.50471 mm 64.723 cm OutOfWorld Transportation Run terminated. Run Summary Number of events processed : 1 - User=0.01s Real=0.01s Sys=0s + User=0s Real=0s Sys=0s ERROR: G4VisCommandsViewerUpdate::SetNewValue: no current viewer. ========= Table of registered couples ============================== @@ -328,13 +333,14 @@ Start Run processing. Step# X Y Z Direction x dir y dir z KineE dEStep StepLeng TrakLeng Volume Process 0 0 fm 0 fm 21.9895 m 0 0 -1 100 MeV 0 eV 0 fm 0 fm World initStep +G4GlobalFastSimulationManager::GetFlavoredWorldForThis(...): DEPRECATING, will be dropped @ next major release 1 0 fm 20.319 cm 21.9895 m 0 9.91398e-09 1 100 MeV0.000676634 eV 31.9171 cm 31.9171 cm World Transportation 2 0 fm 20.3185 cm 21.9905 m 0 -0.00984297 0.999952 100 MeV2.12001e-06 eV 1.00002 mm 32.0171 cm Absorber Transportation 3 0 fm 20.2645 cm 22 m 0 -0.103352 0.994645 100 MeV2.01797e-05 eV 9.51883 mm 32.969 cm OutOfWorld Transportation Run terminated. Run Summary Number of events processed : 1 - User=0.01s Real=0.01s Sys=0s + User=0s Real=0s Sys=0s ERROR: G4VisCommandsViewerUpdate::SetNewValue: no current viewer. ========= Table of registered couples ============================== @@ -361,13 +367,14 @@ Start Run processing. Step# X Y Z Direction x dir y dir z KineE dEStep StepLeng TrakLeng Volume Process 0 0 fm 0 fm 21.9895 m 0 0 -1 50 MeV 0 eV 0 fm 0 fm World initStep +G4GlobalFastSimulationManager::GetFlavoredWorldForThis(...): DEPRECATING, will be dropped @ next major release 1 0 fm 10.2108 cm 21.9895 m 0 -7.69218e-09 1 50 MeV0.000318172 eV 16.0391 cm 16.0391 cm World Transportation 2 0 fm 10.2098 cm 21.9905 m 0 -0.0195872 0.999808 50 MeV1.98386e-06 eV 1.00006 mm 16.1391 cm Absorber Transportation 3 0 fm 10.1016 cm 22 m 0 -0.205667 0.978622 50 MeV1.89952e-05 eV 9.5755 mm 17.0966 cm OutOfWorld Transportation Run terminated. Run Summary Number of events processed : 1 - User=0s Real=0s Sys=0s + User=0.01s Real=0.01s Sys=0s ERROR: G4VisCommandsViewerUpdate::SetNewValue: no current viewer. G4ClassicalRK4 (default) is called The minimal step is equal to 0.1 mm @@ -401,7 +408,7 @@ Step# X Y Z Direction x dir y dir Run terminated. Run Summary Number of events processed : 1 - User=0s Real=0.01s Sys=0.01s + User=0s Real=0s Sys=0s ERROR: G4VisCommandsViewerUpdate::SetNewValue: no current viewer. ========= Table of registered couples ============================== @@ -442,7 +449,7 @@ Start Run processing. Run terminated. Run Summary Number of events processed : 100 - User=0.04s Real=0.05s Sys=0.01s + User=0.04s Real=0.04s Sys=0s ERROR: G4VisCommandsViewerUpdate::SetNewValue: no current viewer. Graphics systems deleted. Visualization Manager deleting... diff --git a/examples/extended/field/field01/include/F01CalorHit.hh b/examples/extended/field/field01/include/F01CalorHit.hh index 14021a13bc..9857a9ff52 100644 --- a/examples/extended/field/field01/include/F01CalorHit.hh +++ b/examples/extended/field/field01/include/F01CalorHit.hh @@ -25,7 +25,7 @@ // // // $Id: F01CalorHit.hh,v 1.4 2006/06/29 17:15:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field01/include/F01CalorimeterSD.hh b/examples/extended/field/field01/include/F01CalorimeterSD.hh index f1c66648bb..5addc131ea 100644 --- a/examples/extended/field/field01/include/F01CalorimeterSD.hh +++ b/examples/extended/field/field01/include/F01CalorimeterSD.hh @@ -25,7 +25,7 @@ // // // $Id: F01CalorimeterSD.hh,v 1.4 2006/06/29 17:15:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field01/include/F01DetectorConstruction.hh b/examples/extended/field/field01/include/F01DetectorConstruction.hh index f859ea50a7..194e4383f4 100644 --- a/examples/extended/field/field01/include/F01DetectorConstruction.hh +++ b/examples/extended/field/field01/include/F01DetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: F01DetectorConstruction.hh,v 1.7 2006/06/29 17:15:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field01/include/F01DetectorMessenger.hh b/examples/extended/field/field01/include/F01DetectorMessenger.hh index 89531abeac..3d0c0aa7a4 100644 --- a/examples/extended/field/field01/include/F01DetectorMessenger.hh +++ b/examples/extended/field/field01/include/F01DetectorMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: F01DetectorMessenger.hh,v 1.4 2006/06/29 17:15:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field01/include/F01EventAction.hh b/examples/extended/field/field01/include/F01EventAction.hh index cb3fc256ae..709449a648 100644 --- a/examples/extended/field/field01/include/F01EventAction.hh +++ b/examples/extended/field/field01/include/F01EventAction.hh @@ -25,7 +25,7 @@ // // // $Id: F01EventAction.hh,v 1.5 2006/06/29 17:15:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field01/include/F01EventActionMessenger.hh b/examples/extended/field/field01/include/F01EventActionMessenger.hh index e139953e84..50ee0adf1d 100644 --- a/examples/extended/field/field01/include/F01EventActionMessenger.hh +++ b/examples/extended/field/field01/include/F01EventActionMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: F01EventActionMessenger.hh,v 1.3 2006/06/29 17:15:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field01/include/F01FieldMessenger.hh b/examples/extended/field/field01/include/F01FieldMessenger.hh index 8c849fcfe7..90d163d46c 100644 --- a/examples/extended/field/field01/include/F01FieldMessenger.hh +++ b/examples/extended/field/field01/include/F01FieldMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: F01FieldMessenger.hh,v 1.7 2006/06/29 17:15:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field01/include/F01FieldSetup.hh b/examples/extended/field/field01/include/F01FieldSetup.hh index bc36e93f1d..dacd19c806 100644 --- a/examples/extended/field/field01/include/F01FieldSetup.hh +++ b/examples/extended/field/field01/include/F01FieldSetup.hh @@ -25,7 +25,7 @@ // // // $Id: F01FieldSetup.hh,v 1.3 2006/06/29 17:15:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // A class for control of the Magnetic Field of the detector. diff --git a/examples/extended/field/field01/include/F01PhysicsList.hh b/examples/extended/field/field01/include/F01PhysicsList.hh index 934013523a..32331a65ad 100644 --- a/examples/extended/field/field01/include/F01PhysicsList.hh +++ b/examples/extended/field/field01/include/F01PhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: F01PhysicsList.hh,v 1.4 2006/06/29 17:15:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef F01PhysicsList_h diff --git a/examples/extended/field/field01/include/F01PhysicsListMessenger.hh b/examples/extended/field/field01/include/F01PhysicsListMessenger.hh index c554b424df..de71fa042d 100644 --- a/examples/extended/field/field01/include/F01PhysicsListMessenger.hh +++ b/examples/extended/field/field01/include/F01PhysicsListMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: F01PhysicsListMessenger.hh,v 1.4 2006/06/29 17:15:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field01/include/F01PrimaryGeneratorAction.hh b/examples/extended/field/field01/include/F01PrimaryGeneratorAction.hh index 2be788a8a9..65cd67daa4 100644 --- a/examples/extended/field/field01/include/F01PrimaryGeneratorAction.hh +++ b/examples/extended/field/field01/include/F01PrimaryGeneratorAction.hh @@ -25,7 +25,7 @@ // // // $Id: F01PrimaryGeneratorAction.hh,v 1.3 2006/06/29 17:15:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field01/include/F01PrimaryGeneratorMessenger.hh b/examples/extended/field/field01/include/F01PrimaryGeneratorMessenger.hh index 9d65e28b35..497b526c25 100644 --- a/examples/extended/field/field01/include/F01PrimaryGeneratorMessenger.hh +++ b/examples/extended/field/field01/include/F01PrimaryGeneratorMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: F01PrimaryGeneratorMessenger.hh,v 1.3 2006/06/29 17:16:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field01/include/F01RunAction.hh b/examples/extended/field/field01/include/F01RunAction.hh index 3f82d08794..54db9c85a5 100644 --- a/examples/extended/field/field01/include/F01RunAction.hh +++ b/examples/extended/field/field01/include/F01RunAction.hh @@ -25,7 +25,7 @@ // // // $Id: F01RunAction.hh,v 1.6 2006/06/29 17:16:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field01/include/F01RunMessenger.hh b/examples/extended/field/field01/include/F01RunMessenger.hh index 41fb758812..7494b07da9 100644 --- a/examples/extended/field/field01/include/F01RunMessenger.hh +++ b/examples/extended/field/field01/include/F01RunMessenger.hh @@ -26,7 +26,7 @@ // // $Id: F01RunMessenger.hh,v 1.4 2006/06/29 17:16:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field01/include/F01StepCut.hh b/examples/extended/field/field01/include/F01StepCut.hh index 5fa4370ab2..2313510240 100644 --- a/examples/extended/field/field01/include/F01StepCut.hh +++ b/examples/extended/field/field01/include/F01StepCut.hh @@ -25,7 +25,7 @@ // // // $Id: F01StepCut.hh,v 1.5 2006/06/29 17:16:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field01/include/F01SteppingAction.hh b/examples/extended/field/field01/include/F01SteppingAction.hh index 640843e41f..905e7bb192 100644 --- a/examples/extended/field/field01/include/F01SteppingAction.hh +++ b/examples/extended/field/field01/include/F01SteppingAction.hh @@ -25,7 +25,7 @@ // // // $Id: F01SteppingAction.hh,v 1.4 2006/06/29 17:16:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field01/include/F01SteppingMessenger.hh b/examples/extended/field/field01/include/F01SteppingMessenger.hh index 9c23b24e79..26b87de00d 100644 --- a/examples/extended/field/field01/include/F01SteppingMessenger.hh +++ b/examples/extended/field/field01/include/F01SteppingMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: F01SteppingMessenger.hh,v 1.3 2006/06/29 17:16:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/examples/extended/field/field01/include/F01SteppingVerbose.hh b/examples/extended/field/field01/include/F01SteppingVerbose.hh index 5cf9451c32..61343679db 100644 --- a/examples/extended/field/field01/include/F01SteppingVerbose.hh +++ b/examples/extended/field/field01/include/F01SteppingVerbose.hh @@ -25,7 +25,7 @@ // // // $Id: F01SteppingVerbose.hh,v 1.4 2006/06/29 17:16:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/examples/extended/field/field01/src/F01CalorHit.cc b/examples/extended/field/field01/src/F01CalorHit.cc index e83bb549aa..111272b254 100644 --- a/examples/extended/field/field01/src/F01CalorHit.cc +++ b/examples/extended/field/field01/src/F01CalorHit.cc @@ -25,7 +25,7 @@ // // // $Id: F01CalorHit.cc,v 1.4 2006/06/29 17:16:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field01/src/F01CalorimeterSD.cc b/examples/extended/field/field01/src/F01CalorimeterSD.cc index 34af702210..6ddae46302 100644 --- a/examples/extended/field/field01/src/F01CalorimeterSD.cc +++ b/examples/extended/field/field01/src/F01CalorimeterSD.cc @@ -25,7 +25,7 @@ // // // $Id: F01CalorimeterSD.cc,v 1.6 2006/06/29 17:16:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field01/src/F01DetectorConstruction.cc b/examples/extended/field/field01/src/F01DetectorConstruction.cc index f21147d5a4..00ab6f5017 100644 --- a/examples/extended/field/field01/src/F01DetectorConstruction.cc +++ b/examples/extended/field/field01/src/F01DetectorConstruction.cc @@ -25,7 +25,7 @@ // // // $Id: F01DetectorConstruction.cc,v 1.15 2006/06/29 17:16:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field01/src/F01DetectorMessenger.cc b/examples/extended/field/field01/src/F01DetectorMessenger.cc index a089997227..e068223975 100644 --- a/examples/extended/field/field01/src/F01DetectorMessenger.cc +++ b/examples/extended/field/field01/src/F01DetectorMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: F01DetectorMessenger.cc,v 1.5 2006/06/29 17:16:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field01/src/F01EventAction.cc b/examples/extended/field/field01/src/F01EventAction.cc index d520dd9784..6482b05cc6 100644 --- a/examples/extended/field/field01/src/F01EventAction.cc +++ b/examples/extended/field/field01/src/F01EventAction.cc @@ -25,7 +25,7 @@ // // // $Id: F01EventAction.cc,v 1.6 2006/06/29 17:16:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field01/src/F01EventActionMessenger.cc b/examples/extended/field/field01/src/F01EventActionMessenger.cc index e340301154..edac07859e 100644 --- a/examples/extended/field/field01/src/F01EventActionMessenger.cc +++ b/examples/extended/field/field01/src/F01EventActionMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: F01EventActionMessenger.cc,v 1.4 2006/06/29 17:16:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field01/src/F01FieldMessenger.cc b/examples/extended/field/field01/src/F01FieldMessenger.cc index 91f00eb4a7..cecc9684d9 100644 --- a/examples/extended/field/field01/src/F01FieldMessenger.cc +++ b/examples/extended/field/field01/src/F01FieldMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: F01FieldMessenger.cc,v 1.8 2006/06/29 17:16:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field01/src/F01FieldSetup.cc b/examples/extended/field/field01/src/F01FieldSetup.cc index f24fcbbfd3..e8ff1540ba 100644 --- a/examples/extended/field/field01/src/F01FieldSetup.cc +++ b/examples/extended/field/field01/src/F01FieldSetup.cc @@ -25,7 +25,7 @@ // // // $Id: F01FieldSetup.cc,v 1.7 2006/06/29 17:16:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // User Field setup class implementation. // diff --git a/examples/extended/field/field01/src/F01PhysicsList.cc b/examples/extended/field/field01/src/F01PhysicsList.cc index 45ba342405..fdb36d98e3 100644 --- a/examples/extended/field/field01/src/F01PhysicsList.cc +++ b/examples/extended/field/field01/src/F01PhysicsList.cc @@ -25,7 +25,7 @@ // // // $Id: F01PhysicsList.cc,v 1.11 2006/06/29 17:16:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4Timer.hh" diff --git a/examples/extended/field/field01/src/F01PhysicsListMessenger.cc b/examples/extended/field/field01/src/F01PhysicsListMessenger.cc index 4ef1bae147..d2632a8a0b 100644 --- a/examples/extended/field/field01/src/F01PhysicsListMessenger.cc +++ b/examples/extended/field/field01/src/F01PhysicsListMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: F01PhysicsListMessenger.cc,v 1.6 2006/06/29 17:16:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field01/src/F01PrimaryGeneratorAction.cc b/examples/extended/field/field01/src/F01PrimaryGeneratorAction.cc index c8e1f86a3f..7ee75b6065 100644 --- a/examples/extended/field/field01/src/F01PrimaryGeneratorAction.cc +++ b/examples/extended/field/field01/src/F01PrimaryGeneratorAction.cc @@ -25,7 +25,7 @@ // // // $Id: F01PrimaryGeneratorAction.cc,v 1.8 2006/06/29 17:16:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field01/src/F01PrimaryGeneratorMessenger.cc b/examples/extended/field/field01/src/F01PrimaryGeneratorMessenger.cc index 25aa3f7c70..422657b398 100644 --- a/examples/extended/field/field01/src/F01PrimaryGeneratorMessenger.cc +++ b/examples/extended/field/field01/src/F01PrimaryGeneratorMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: F01PrimaryGeneratorMessenger.cc,v 1.5 2006/06/29 17:16:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field01/src/F01RunAction.cc b/examples/extended/field/field01/src/F01RunAction.cc index aae7ffde59..5148d838bf 100644 --- a/examples/extended/field/field01/src/F01RunAction.cc +++ b/examples/extended/field/field01/src/F01RunAction.cc @@ -25,7 +25,7 @@ // // // $Id: F01RunAction.cc,v 1.10 2006/06/29 17:16:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field01/src/F01RunMessenger.cc b/examples/extended/field/field01/src/F01RunMessenger.cc index bef5e0512a..d45be5a934 100644 --- a/examples/extended/field/field01/src/F01RunMessenger.cc +++ b/examples/extended/field/field01/src/F01RunMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: F01RunMessenger.cc,v 1.6 2006/06/29 17:16:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field01/src/F01StepCut.cc b/examples/extended/field/field01/src/F01StepCut.cc index d03f6b72a6..5701f4922f 100644 --- a/examples/extended/field/field01/src/F01StepCut.cc +++ b/examples/extended/field/field01/src/F01StepCut.cc @@ -25,7 +25,7 @@ // // // $Id: F01StepCut.cc,v 1.3 2006/06/29 17:16:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "F01StepCut.hh" diff --git a/examples/extended/field/field01/src/F01SteppingAction.cc b/examples/extended/field/field01/src/F01SteppingAction.cc index dc9ece047c..fde17c9638 100644 --- a/examples/extended/field/field01/src/F01SteppingAction.cc +++ b/examples/extended/field/field01/src/F01SteppingAction.cc @@ -25,7 +25,7 @@ // // // $Id: F01SteppingAction.cc,v 1.7 2006/06/29 17:16:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field01/src/F01SteppingMessenger.cc b/examples/extended/field/field01/src/F01SteppingMessenger.cc index b45841e2a7..001f5b5e21 100644 --- a/examples/extended/field/field01/src/F01SteppingMessenger.cc +++ b/examples/extended/field/field01/src/F01SteppingMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: F01SteppingMessenger.cc,v 1.4 2006/06/29 17:16:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/examples/extended/field/field01/src/F01SteppingVerbose.cc b/examples/extended/field/field01/src/F01SteppingVerbose.cc index 05715e23f2..9e73f977b6 100644 --- a/examples/extended/field/field01/src/F01SteppingVerbose.cc +++ b/examples/extended/field/field01/src/F01SteppingVerbose.cc @@ -25,7 +25,7 @@ // // // $Id: F01SteppingVerbose.cc,v 1.7 2006/06/29 17:17:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... diff --git a/examples/extended/field/field02/field02.cc b/examples/extended/field/field02/field02.cc index 7c67c70eaa..891d7abe0c 100644 --- a/examples/extended/field/field02/field02.cc +++ b/examples/extended/field/field02/field02.cc @@ -25,7 +25,7 @@ // // // $Id: field02.cc,v 1.9 2006/06/29 17:17:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/field/field02/field02.out b/examples/extended/field/field02/field02.out index 482287df82..5aad24c57b 100644 --- a/examples/extended/field/field02/field02.out +++ b/examples/extended/field/field02/field02.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -80,17 +80,13 @@ Registered model factories: drawByCharge drawByParticleID drawByOriginVolume - -Registered models: - None + drawByAttribute Registered filter factories: chargeFilter particleFilter originVolumeFilter - -Registered filters: - None + attributeFilter The WORLD is made of 800mm of Air, the transverse size (R) of the world is 200 mm. @@ -104,6 +100,7 @@ G4ClassicalRK4 (default) is called The minimal step is equal to 10 mm phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV Sampling according Klein-Nishina model @@ -111,7 +108,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.022 MeV to 100 GeV in 100 bins. @@ -237,6 +234,7 @@ Start Run processing. Step# X Y Z KineE dEStep StepLeng TrakLeng NextVolu Process 0 0 fm 0 fm 0 fm 50 MeV 0 eV 0 fm 0 fm World initStep +G4GlobalFastSimulationManager::GetFlavoredWorldForThis(...): DEPRECATING, will be dropped @ next major release 1 0 fm -4.84 cm 1.54 cm 534 MeV 9.3 keV 5.32 cm 5.32 cm World eIoni 2 6.33 um -11.6 cm 1.95 cm 1.21 GeV 17.7 keV 6.79 cm 12.1 cm World eIoni 3 10.6 um -20 cm 2.22 cm 2.05 GeV 18.3 keV 8.39 cm 20.5 cm OutOfWorldTransportation @@ -247,6 +245,7 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng Ne Step# X Y Z KineE dEStep StepLeng TrakLeng NextVolu Process 0 6.33 um -11.6 cm 1.95 cm 1.57 keV 0 eV 0 fm 0 fm World initStep +G4GlobalFastSimulationManager::GetFlavoredWorldForThis(...): DEPRECATING, will be dropped @ next major release 1 5.63 um -11.6 cm 1.95 cm 1.19 MeV 1.57 keV 108 um 108 um World eIoni 2 3.41 um -20 cm 1.95 cm 839 MeV 11.6 keV 8.38 cm 8.39 cm OutOfWorldTransportation @@ -256,6 +255,7 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng Ne Step# X Y Z KineE dEStep StepLeng TrakLeng NextVolu Process 0 0 fm -4.84 cm 1.54 cm 5.82 keV 0 eV 0 fm 0 fm World initStep +G4GlobalFastSimulationManager::GetFlavoredWorldForThis(...): DEPRECATING, will be dropped @ next major release 1 -14.4 um -4.85 cm 1.54 cm 1.2 MeV 169 eV 118 um 118 um World eIoni 2 -42.5 um -7.44 cm 1.54 cm 260 MeV 5.6 keV 2.59 cm 2.6 cm World eIoni 3 -45.6 um -9.35 cm 1.54 cm 451 MeV 4.51 keV 1.91 cm 4.51 cm World eIoni @@ -270,6 +270,7 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng Ne Step# X Y Z KineE dEStep StepLeng TrakLeng NextVolu Process 0 -49.1 um -14.5 cm 1.54 cm 1.7 keV 0 eV 0 fm 0 fm World initStep +G4GlobalFastSimulationManager::GetFlavoredWorldForThis(...): DEPRECATING, will be dropped @ next major release 1 -51.4 um -14.5 cm 1.54 cm 1.35 MeV 1.7 keV 123 um 123 um World eIoni 2 -58.2 um -20 cm 1.53 cm 553 MeV 6.81 keV 5.52 cm 5.53 cm OutOfWorldTransportation @@ -279,6 +280,7 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng Ne Step# X Y Z KineE dEStep StepLeng TrakLeng NextVolu Process 0 -48.9 um -13.8 cm 1.54 cm 1.41 keV 0 eV 0 fm 0 fm World initStep +G4GlobalFastSimulationManager::GetFlavoredWorldForThis(...): DEPRECATING, will be dropped @ next major release 1 -55.2 um -13.8 cm 1.54 cm 1.02 MeV 1.41 keV 93 um 93 um World eIoni 2 -76.4 um -20 cm 1.54 cm 621 MeV 8.25 keV 6.2 cm 6.21 cm OutOfWorldTransportation @@ -329,6 +331,8 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng Ne 1 -26.7 um -14.2 cm 1.54 cm 3.2 MeV 2.98 keV 297 um 297 um World eIoni 2 -18.4 um -15 cm 1.54 cm 82.4 MeV 814 eV 7.92 mm 8.21 mm World eIoni 3 -13.2 um -20 cm 1.54 cm 583 MeV 9.85 keV 5.01 cm 5.83 cm OutOfWorldTransportation +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release ********************************************************************************************************* * G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 @@ -378,6 +382,8 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng Ne 0 0 fm -9.84 mm 8.81 mm 1.07 keV 0 eV 0 fm 0 fm World initStep 1 -4.32 um -9.9 mm 8.81 mm 709 keV 1.07 keV 63.8 um 63.8 um World eIoni 2 -25.2 um -20 cm 8.83 mm 1.9 GeV 29 keV 19 cm 19 cm OutOfWorldTransportation +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release ********************************************************************************************************* * G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 @@ -406,6 +412,7 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng Ne 0 0 fm -1.41 cm 1.01 cm 1.32 keV 0 eV 0 fm 0 fm World initStep 1 -1.46 um -1.42 cm 1.01 cm 929 keV 1.32 keV 85.1 um 85.1 um World eIoni 2 -7.7 um -20 cm 1.01 cm 1.86 GeV 30.7 keV 18.6 cm 18.6 cm OutOfWorldTransportation +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release ********************************************************************************************************* * G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 @@ -4598,7 +4605,7 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng Ne Run terminated. Run Summary Number of events processed : 100 - User=1.07s Real=2.78s Sys=0.94s + User=0.71s Real=1s Sys=0.27s ERROR: G4VisCommandsViewerUpdate::SetNewValue: no current viewer. Graphics systems deleted. Visualization Manager deleting... diff --git a/examples/extended/field/field02/include/F02CalorHit.hh b/examples/extended/field/field02/include/F02CalorHit.hh index f13413c031..e33dc159ee 100644 --- a/examples/extended/field/field02/include/F02CalorHit.hh +++ b/examples/extended/field/field02/include/F02CalorHit.hh @@ -25,7 +25,7 @@ // // // $Id: F02CalorHit.hh,v 1.4 2006/06/29 17:17:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field02/include/F02CalorimeterSD.hh b/examples/extended/field/field02/include/F02CalorimeterSD.hh index 5e28d4577f..979233eb26 100644 --- a/examples/extended/field/field02/include/F02CalorimeterSD.hh +++ b/examples/extended/field/field02/include/F02CalorimeterSD.hh @@ -25,7 +25,7 @@ // // // $Id: F02CalorimeterSD.hh,v 1.4 2006/06/29 17:17:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field02/include/F02DetectorConstruction.hh b/examples/extended/field/field02/include/F02DetectorConstruction.hh index 8087863605..ce1b5cc26a 100644 --- a/examples/extended/field/field02/include/F02DetectorConstruction.hh +++ b/examples/extended/field/field02/include/F02DetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: F02DetectorConstruction.hh,v 1.6 2006/06/29 17:17:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field02/include/F02DetectorMessenger.hh b/examples/extended/field/field02/include/F02DetectorMessenger.hh index 5924e81c06..13e5730460 100644 --- a/examples/extended/field/field02/include/F02DetectorMessenger.hh +++ b/examples/extended/field/field02/include/F02DetectorMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: F02DetectorMessenger.hh,v 1.4 2006/06/29 17:17:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field02/include/F02ElectricFieldSetup.hh b/examples/extended/field/field02/include/F02ElectricFieldSetup.hh index ec0111479f..3f4a96de22 100644 --- a/examples/extended/field/field02/include/F02ElectricFieldSetup.hh +++ b/examples/extended/field/field02/include/F02ElectricFieldSetup.hh @@ -25,7 +25,7 @@ // // // $Id: F02ElectricFieldSetup.hh,v 1.2 2006/06/29 17:17:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // A class for control of the Electric Field of the detector. // The field for this case is uniform. diff --git a/examples/extended/field/field02/include/F02EventAction.hh b/examples/extended/field/field02/include/F02EventAction.hh index 0b74a1ae64..cae0786740 100644 --- a/examples/extended/field/field02/include/F02EventAction.hh +++ b/examples/extended/field/field02/include/F02EventAction.hh @@ -25,7 +25,7 @@ // // // $Id: F02EventAction.hh,v 1.4 2006/06/29 17:17:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field02/include/F02EventActionMessenger.hh b/examples/extended/field/field02/include/F02EventActionMessenger.hh index b28fb9fe7b..565fe9718a 100644 --- a/examples/extended/field/field02/include/F02EventActionMessenger.hh +++ b/examples/extended/field/field02/include/F02EventActionMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: F02EventActionMessenger.hh,v 1.3 2006/06/29 17:17:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field02/include/F02FieldMessenger.hh b/examples/extended/field/field02/include/F02FieldMessenger.hh index 3c0578f799..793d40d2e6 100644 --- a/examples/extended/field/field02/include/F02FieldMessenger.hh +++ b/examples/extended/field/field02/include/F02FieldMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: F02FieldMessenger.hh,v 1.4 2006/06/29 17:17:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field02/include/F02PhysicsList.hh b/examples/extended/field/field02/include/F02PhysicsList.hh index 9ba0dbf8a7..86e91ea23c 100644 --- a/examples/extended/field/field02/include/F02PhysicsList.hh +++ b/examples/extended/field/field02/include/F02PhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: F02PhysicsList.hh,v 1.4 2006/06/29 17:17:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef F02PhysicsList_h diff --git a/examples/extended/field/field02/include/F02PhysicsListMessenger.hh b/examples/extended/field/field02/include/F02PhysicsListMessenger.hh index b38f4b7d06..85b227b9f3 100644 --- a/examples/extended/field/field02/include/F02PhysicsListMessenger.hh +++ b/examples/extended/field/field02/include/F02PhysicsListMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: F02PhysicsListMessenger.hh,v 1.4 2006/06/29 17:17:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field02/include/F02PrimaryGeneratorAction.hh b/examples/extended/field/field02/include/F02PrimaryGeneratorAction.hh index 9d64c2634b..1b0c1c5d0c 100644 --- a/examples/extended/field/field02/include/F02PrimaryGeneratorAction.hh +++ b/examples/extended/field/field02/include/F02PrimaryGeneratorAction.hh @@ -25,7 +25,7 @@ // // // $Id: F02PrimaryGeneratorAction.hh,v 1.4 2006/06/29 17:17:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field02/include/F02PrimaryGeneratorMessenger.hh b/examples/extended/field/field02/include/F02PrimaryGeneratorMessenger.hh index 0f8d049308..891488dc0c 100644 --- a/examples/extended/field/field02/include/F02PrimaryGeneratorMessenger.hh +++ b/examples/extended/field/field02/include/F02PrimaryGeneratorMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: F02PrimaryGeneratorMessenger.hh,v 1.3 2006/06/29 17:17:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field02/include/F02RunAction.hh b/examples/extended/field/field02/include/F02RunAction.hh index 71786e7fa5..4e47898783 100644 --- a/examples/extended/field/field02/include/F02RunAction.hh +++ b/examples/extended/field/field02/include/F02RunAction.hh @@ -25,7 +25,7 @@ // // // $Id: F02RunAction.hh,v 1.6 2006/06/29 17:17:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field02/include/F02RunMessenger.hh b/examples/extended/field/field02/include/F02RunMessenger.hh index d5acffd9a1..38d4e4327a 100644 --- a/examples/extended/field/field02/include/F02RunMessenger.hh +++ b/examples/extended/field/field02/include/F02RunMessenger.hh @@ -26,7 +26,7 @@ // // $Id: F02RunMessenger.hh,v 1.4 2006/06/29 17:17:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field02/include/F02StepCut.hh b/examples/extended/field/field02/include/F02StepCut.hh index 508f3a8168..f3a8f9ba4d 100644 --- a/examples/extended/field/field02/include/F02StepCut.hh +++ b/examples/extended/field/field02/include/F02StepCut.hh @@ -25,7 +25,7 @@ // // // $Id: F02StepCut.hh,v 1.5 2006/06/29 17:17:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field02/include/F02SteppingAction.hh b/examples/extended/field/field02/include/F02SteppingAction.hh index c3b3baa62b..5e6d085d91 100644 --- a/examples/extended/field/field02/include/F02SteppingAction.hh +++ b/examples/extended/field/field02/include/F02SteppingAction.hh @@ -25,7 +25,7 @@ // // // $Id: F02SteppingAction.hh,v 1.5 2006/06/29 17:17:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field02/include/F02SteppingMessenger.hh b/examples/extended/field/field02/include/F02SteppingMessenger.hh index 42b726f051..b50ed23687 100644 --- a/examples/extended/field/field02/include/F02SteppingMessenger.hh +++ b/examples/extended/field/field02/include/F02SteppingMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: F02SteppingMessenger.hh,v 1.3 2006/06/29 17:17:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/examples/extended/field/field02/include/F02SteppingVerbose.hh b/examples/extended/field/field02/include/F02SteppingVerbose.hh index 6a87601cbf..1905db2bbe 100644 --- a/examples/extended/field/field02/include/F02SteppingVerbose.hh +++ b/examples/extended/field/field02/include/F02SteppingVerbose.hh @@ -25,7 +25,7 @@ // // // $Id: F02SteppingVerbose.hh,v 1.4 2006/06/29 17:17:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/examples/extended/field/field02/src/F02CalorHit.cc b/examples/extended/field/field02/src/F02CalorHit.cc index 9e2ad8f0fb..9e5cfa0572 100644 --- a/examples/extended/field/field02/src/F02CalorHit.cc +++ b/examples/extended/field/field02/src/F02CalorHit.cc @@ -25,7 +25,7 @@ // // // $Id: F02CalorHit.cc,v 1.4 2006/06/29 17:17:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field02/src/F02CalorimeterSD.cc b/examples/extended/field/field02/src/F02CalorimeterSD.cc index 3508c5ab6c..31f0890e1c 100644 --- a/examples/extended/field/field02/src/F02CalorimeterSD.cc +++ b/examples/extended/field/field02/src/F02CalorimeterSD.cc @@ -25,7 +25,7 @@ // // // $Id: F02CalorimeterSD.cc,v 1.6 2006/06/29 17:17:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field02/src/F02DetectorConstruction.cc b/examples/extended/field/field02/src/F02DetectorConstruction.cc index aa18825643..77dc0b7201 100644 --- a/examples/extended/field/field02/src/F02DetectorConstruction.cc +++ b/examples/extended/field/field02/src/F02DetectorConstruction.cc @@ -25,7 +25,7 @@ // // // $Id: F02DetectorConstruction.cc,v 1.12 2006/06/29 17:17:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field02/src/F02DetectorMessenger.cc b/examples/extended/field/field02/src/F02DetectorMessenger.cc index 92353342cd..8115563a89 100644 --- a/examples/extended/field/field02/src/F02DetectorMessenger.cc +++ b/examples/extended/field/field02/src/F02DetectorMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: F02DetectorMessenger.cc,v 1.5 2006/06/29 17:17:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field02/src/F02ElectricFieldSetup.cc b/examples/extended/field/field02/src/F02ElectricFieldSetup.cc index 9a77b7292b..945b6646ee 100644 --- a/examples/extended/field/field02/src/F02ElectricFieldSetup.cc +++ b/examples/extended/field/field02/src/F02ElectricFieldSetup.cc @@ -25,7 +25,7 @@ // // // $Id: F02ElectricFieldSetup.cc,v 1.2 2006/06/29 17:17:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // User Field class implementation. diff --git a/examples/extended/field/field02/src/F02EventAction.cc b/examples/extended/field/field02/src/F02EventAction.cc index 7415d1214a..04fec35caf 100644 --- a/examples/extended/field/field02/src/F02EventAction.cc +++ b/examples/extended/field/field02/src/F02EventAction.cc @@ -25,7 +25,7 @@ // // // $Id: F02EventAction.cc,v 1.6 2006/06/29 17:18:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field02/src/F02EventActionMessenger.cc b/examples/extended/field/field02/src/F02EventActionMessenger.cc index 2fc859d653..1743134a04 100644 --- a/examples/extended/field/field02/src/F02EventActionMessenger.cc +++ b/examples/extended/field/field02/src/F02EventActionMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: F02EventActionMessenger.cc,v 1.5 2006/06/29 17:18:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field02/src/F02FieldMessenger.cc b/examples/extended/field/field02/src/F02FieldMessenger.cc index 8e6328d77e..09d6feefb8 100644 --- a/examples/extended/field/field02/src/F02FieldMessenger.cc +++ b/examples/extended/field/field02/src/F02FieldMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: F02FieldMessenger.cc,v 1.6 2006/06/29 17:18:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field02/src/F02PhysicsList.cc b/examples/extended/field/field02/src/F02PhysicsList.cc index bbc612e3ac..2475426b75 100644 --- a/examples/extended/field/field02/src/F02PhysicsList.cc +++ b/examples/extended/field/field02/src/F02PhysicsList.cc @@ -25,7 +25,7 @@ // // // $Id: F02PhysicsList.cc,v 1.10 2006/06/29 17:18:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4Timer.hh" diff --git a/examples/extended/field/field02/src/F02PhysicsListMessenger.cc b/examples/extended/field/field02/src/F02PhysicsListMessenger.cc index ba20519901..f4568f601d 100644 --- a/examples/extended/field/field02/src/F02PhysicsListMessenger.cc +++ b/examples/extended/field/field02/src/F02PhysicsListMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: F02PhysicsListMessenger.cc,v 1.6 2006/06/29 17:18:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field02/src/F02PrimaryGeneratorAction.cc b/examples/extended/field/field02/src/F02PrimaryGeneratorAction.cc index bb802c3f86..084c2f73d7 100644 --- a/examples/extended/field/field02/src/F02PrimaryGeneratorAction.cc +++ b/examples/extended/field/field02/src/F02PrimaryGeneratorAction.cc @@ -25,7 +25,7 @@ // // // $Id: F02PrimaryGeneratorAction.cc,v 1.5 2006/06/29 17:18:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field02/src/F02PrimaryGeneratorMessenger.cc b/examples/extended/field/field02/src/F02PrimaryGeneratorMessenger.cc index d81b378a3f..da591e60a4 100644 --- a/examples/extended/field/field02/src/F02PrimaryGeneratorMessenger.cc +++ b/examples/extended/field/field02/src/F02PrimaryGeneratorMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: F02PrimaryGeneratorMessenger.cc,v 1.5 2006/06/29 17:18:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field02/src/F02RunAction.cc b/examples/extended/field/field02/src/F02RunAction.cc index 027b7914a1..a383228ff8 100644 --- a/examples/extended/field/field02/src/F02RunAction.cc +++ b/examples/extended/field/field02/src/F02RunAction.cc @@ -25,7 +25,7 @@ // // // $Id: F02RunAction.cc,v 1.8 2006/06/29 17:18:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field02/src/F02RunMessenger.cc b/examples/extended/field/field02/src/F02RunMessenger.cc index bcbaf79472..f4e20255fe 100644 --- a/examples/extended/field/field02/src/F02RunMessenger.cc +++ b/examples/extended/field/field02/src/F02RunMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: F02RunMessenger.cc,v 1.6 2006/06/29 17:18:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field02/src/F02StepCut.cc b/examples/extended/field/field02/src/F02StepCut.cc index 84c91a83e1..7ddd0156b3 100644 --- a/examples/extended/field/field02/src/F02StepCut.cc +++ b/examples/extended/field/field02/src/F02StepCut.cc @@ -25,7 +25,7 @@ // // // $Id: F02StepCut.cc,v 1.3 2006/06/29 17:18:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "F02StepCut.hh" diff --git a/examples/extended/field/field02/src/F02SteppingAction.cc b/examples/extended/field/field02/src/F02SteppingAction.cc index d32e0d6f01..96e11d2761 100644 --- a/examples/extended/field/field02/src/F02SteppingAction.cc +++ b/examples/extended/field/field02/src/F02SteppingAction.cc @@ -25,7 +25,7 @@ // // // $Id: F02SteppingAction.cc,v 1.6 2006/06/29 17:18:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field02/src/F02SteppingMessenger.cc b/examples/extended/field/field02/src/F02SteppingMessenger.cc index 506008bfa2..285205c713 100644 --- a/examples/extended/field/field02/src/F02SteppingMessenger.cc +++ b/examples/extended/field/field02/src/F02SteppingMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: F02SteppingMessenger.cc,v 1.4 2006/06/29 17:18:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/examples/extended/field/field02/src/F02SteppingVerbose.cc b/examples/extended/field/field02/src/F02SteppingVerbose.cc index f36b9a2567..73bc0f4751 100644 --- a/examples/extended/field/field02/src/F02SteppingVerbose.cc +++ b/examples/extended/field/field02/src/F02SteppingVerbose.cc @@ -25,7 +25,7 @@ // // // $Id: F02SteppingVerbose.cc,v 1.6 2006/06/29 17:18:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/examples/extended/field/field03/field03.cc b/examples/extended/field/field03/field03.cc index bc7d9a0dcf..af6829becd 100644 --- a/examples/extended/field/field03/field03.cc +++ b/examples/extended/field/field03/field03.cc @@ -25,7 +25,7 @@ // // // $Id: field03.cc,v 1.8 2006/06/29 17:18:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/field/field03/field03.out b/examples/extended/field/field03/field03.out index 33f19bb28e..1e1d0188c6 100644 --- a/examples/extended/field/field03/field03.out +++ b/examples/extended/field/field03/field03.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -78,17 +78,13 @@ Registered model factories: drawByCharge drawByParticleID drawByOriginVolume - -Registered models: - None + drawByAttribute Registered filter factories: chargeFilter particleFilter originVolumeFilter - -Registered filters: - None + attributeFilter The WORLD is made of 44000mm of Air, the transverse size (R) of the world is 22000 mm. @@ -109,6 +105,7 @@ G4ClassicalRK4 (default) is called The minimal step is equal to 10 mm phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV Sampling according Klein-Nishina model @@ -116,7 +113,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.022 MeV to 100 GeV in 100 bins. @@ -235,6 +232,7 @@ Start Run processing. Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process 0 0 fm 0 fm 22 m 500 MeV 0 eV 0 fm 0 fm World initStep +G4GlobalFastSimulationManager::GetFlavoredWorldForThis(...): DEPRECATING, will be dropped @ next major release 1 0 fm 4.0138452 cm 21.79201 m 500 MeV0.00049462122 eV 20.288442 cm 20.288442 cm World Transportation 0 fm 390.36094 um -920.6619 um 2 0 fm 6.5801508 cm 21.74 m 500 MeV0.00014147067 eV 5.8028638 cm 26.091306 cm RadSlice Transportation 0 fm 493.16452 um -869.93607 um 3 0 fm 19.942498 cm 21.58699 m 500 MeV0.00049864186 eV 20.453361 cm 46.544667 cm Radiator Transportation 0 fm 795.60591 um -605.81452 um @@ -244,11 +242,13 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng 7 0 fm 1.0118328 m 21.9895 m 500 MeV0.0003699973 eV 15.176601 cm 1.5893831 m World Transportation 0 fm 2.1925711 Ang 1000 um 8 0 fm 1.0118318 m 21.9905 m 500 MeV2.4379474e-06 eV 1.0000007 mm 1.5903831 m Absorber Transportation 0 fm -1.9763919 um 999.99805 um 9 0 fm 1.0117238 m 22 m 500 MeV2.3162324e-05 eV 9.5007541 mm 1.5998839 m OutOfWorld Transportation 0 fm -20.7542 um 999.78461 um +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release Run terminated. Run Summary Number of events processed : 1 - User=0.01s Real=0.02s Sys=0.01s + User=0.01s Real=0.03s Sys=0s ERROR: G4VisCommandsViewerUpdate::SetNewValue: no current viewer. +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release ========= Table of registered couples ============================== @@ -261,18 +261,25 @@ Index : 0 used in the geometry : Yes recalculation needed : No ==================================================================== +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release ### Run 1 start. WARNING: Scene "refresh" not found. /vis/scene/list to see scenes. Start Run processing. +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release ---> Begin of Event: 0 +G4GlobalFastSimulationManager::GetFlavoredWorldForThis(...): DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::GetFlavoredWorldForThis(...): DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::GetFlavoredWorldForThis(...): DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::GetFlavoredWorldForThis(...): DEPRECATING, will be dropped @ next major release ---> Begin of Event: 50 Run terminated. Run Summary Number of events processed : 100 - User=0.33s Real=0.35s Sys=0s + User=0.39s Real=0.39s Sys=0s ERROR: G4VisCommandsViewerUpdate::SetNewValue: no current viewer. Set field value to (0,0,1000) Gauss @@ -296,7 +303,7 @@ Start Run processing. Run terminated. Run Summary Number of events processed : 10 - User=0.03s Real=0.03s Sys=0s + User=0.04s Real=0.04s Sys=0s ERROR: G4VisCommandsViewerUpdate::SetNewValue: no current viewer. Graphics systems deleted. Visualization Manager deleting... diff --git a/examples/extended/field/field03/include/F03CalorHit.hh b/examples/extended/field/field03/include/F03CalorHit.hh index 3a3cac1fe7..9b66360d44 100644 --- a/examples/extended/field/field03/include/F03CalorHit.hh +++ b/examples/extended/field/field03/include/F03CalorHit.hh @@ -25,7 +25,7 @@ // // // $Id: F03CalorHit.hh,v 1.4 2006/06/29 17:18:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field03/include/F03CalorimeterSD.hh b/examples/extended/field/field03/include/F03CalorimeterSD.hh index 5eba4a50e8..96999fea17 100644 --- a/examples/extended/field/field03/include/F03CalorimeterSD.hh +++ b/examples/extended/field/field03/include/F03CalorimeterSD.hh @@ -25,7 +25,7 @@ // // // $Id: F03CalorimeterSD.hh,v 1.4 2006/06/29 17:18:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field03/include/F03DetectorConstruction.hh b/examples/extended/field/field03/include/F03DetectorConstruction.hh index 2df30c310d..ce526c2647 100644 --- a/examples/extended/field/field03/include/F03DetectorConstruction.hh +++ b/examples/extended/field/field03/include/F03DetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: F03DetectorConstruction.hh,v 1.6 2006/06/29 17:18:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field03/include/F03DetectorMessenger.hh b/examples/extended/field/field03/include/F03DetectorMessenger.hh index 2154a276fe..44e753ec28 100644 --- a/examples/extended/field/field03/include/F03DetectorMessenger.hh +++ b/examples/extended/field/field03/include/F03DetectorMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: F03DetectorMessenger.hh,v 1.4 2006/06/29 17:18:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field03/include/F03EventAction.hh b/examples/extended/field/field03/include/F03EventAction.hh index 77100a6d5a..78ef9d0400 100644 --- a/examples/extended/field/field03/include/F03EventAction.hh +++ b/examples/extended/field/field03/include/F03EventAction.hh @@ -25,7 +25,7 @@ // // // $Id: F03EventAction.hh,v 1.4 2006/06/29 17:18:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field03/include/F03EventActionMessenger.hh b/examples/extended/field/field03/include/F03EventActionMessenger.hh index b327062d2a..03a1e5ac0c 100644 --- a/examples/extended/field/field03/include/F03EventActionMessenger.hh +++ b/examples/extended/field/field03/include/F03EventActionMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: F03EventActionMessenger.hh,v 1.3 2006/06/29 17:18:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field03/include/F03FieldMessenger.hh b/examples/extended/field/field03/include/F03FieldMessenger.hh index c806cc44b6..f5a5e1faae 100644 --- a/examples/extended/field/field03/include/F03FieldMessenger.hh +++ b/examples/extended/field/field03/include/F03FieldMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: F03FieldMessenger.hh,v 1.4 2006/06/29 17:18:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field03/include/F03FieldSetup.hh b/examples/extended/field/field03/include/F03FieldSetup.hh index 778c8a0285..e9b5e3421b 100644 --- a/examples/extended/field/field03/include/F03FieldSetup.hh +++ b/examples/extended/field/field03/include/F03FieldSetup.hh @@ -25,7 +25,7 @@ // // // $Id: F03FieldSetup.hh,v 1.2 2006/06/29 17:18:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // A class for setting up the Magnetic Field of the setup, and // creating the necessary classes to control accuracy of propagation. diff --git a/examples/extended/field/field03/include/F03PhysicsList.hh b/examples/extended/field/field03/include/F03PhysicsList.hh index 9cecdda420..67c03bf53d 100644 --- a/examples/extended/field/field03/include/F03PhysicsList.hh +++ b/examples/extended/field/field03/include/F03PhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: F03PhysicsList.hh,v 1.5 2006/06/29 17:18:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef F03PhysicsList_h diff --git a/examples/extended/field/field03/include/F03PhysicsListMessenger.hh b/examples/extended/field/field03/include/F03PhysicsListMessenger.hh index 1e71a343a6..2f7d8a9e9f 100644 --- a/examples/extended/field/field03/include/F03PhysicsListMessenger.hh +++ b/examples/extended/field/field03/include/F03PhysicsListMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: F03PhysicsListMessenger.hh,v 1.4 2006/06/29 17:18:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field03/include/F03PrimaryGeneratorAction.hh b/examples/extended/field/field03/include/F03PrimaryGeneratorAction.hh index 63f3bc59bd..8a52bb456c 100644 --- a/examples/extended/field/field03/include/F03PrimaryGeneratorAction.hh +++ b/examples/extended/field/field03/include/F03PrimaryGeneratorAction.hh @@ -25,7 +25,7 @@ // // // $Id: F03PrimaryGeneratorAction.hh,v 1.4 2006/06/29 17:18:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field03/include/F03PrimaryGeneratorMessenger.hh b/examples/extended/field/field03/include/F03PrimaryGeneratorMessenger.hh index acc41688a0..e53adbcf5c 100644 --- a/examples/extended/field/field03/include/F03PrimaryGeneratorMessenger.hh +++ b/examples/extended/field/field03/include/F03PrimaryGeneratorMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: F03PrimaryGeneratorMessenger.hh,v 1.3 2006/06/29 17:19:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field03/include/F03RunAction.hh b/examples/extended/field/field03/include/F03RunAction.hh index ab50c97249..27adb79549 100644 --- a/examples/extended/field/field03/include/F03RunAction.hh +++ b/examples/extended/field/field03/include/F03RunAction.hh @@ -25,7 +25,7 @@ // // // $Id: F03RunAction.hh,v 1.6 2006/06/29 17:19:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field03/include/F03RunMessenger.hh b/examples/extended/field/field03/include/F03RunMessenger.hh index 5cd1c6f679..d74d183cd5 100644 --- a/examples/extended/field/field03/include/F03RunMessenger.hh +++ b/examples/extended/field/field03/include/F03RunMessenger.hh @@ -26,7 +26,7 @@ // // $Id: F03RunMessenger.hh,v 1.4 2006/06/29 17:19:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field03/include/F03StepCut.hh b/examples/extended/field/field03/include/F03StepCut.hh index 6f2a091a75..ad4ff08c97 100644 --- a/examples/extended/field/field03/include/F03StepCut.hh +++ b/examples/extended/field/field03/include/F03StepCut.hh @@ -25,7 +25,7 @@ // // // $Id: F03StepCut.hh,v 1.5 2006/06/29 17:19:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field03/include/F03SteppingAction.hh b/examples/extended/field/field03/include/F03SteppingAction.hh index c56965385c..c05acb4897 100644 --- a/examples/extended/field/field03/include/F03SteppingAction.hh +++ b/examples/extended/field/field03/include/F03SteppingAction.hh @@ -25,7 +25,7 @@ // // // $Id: F03SteppingAction.hh,v 1.5 2006/06/29 17:19:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field03/include/F03SteppingMessenger.hh b/examples/extended/field/field03/include/F03SteppingMessenger.hh index 0ede88b159..91ff1147ab 100644 --- a/examples/extended/field/field03/include/F03SteppingMessenger.hh +++ b/examples/extended/field/field03/include/F03SteppingMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: F03SteppingMessenger.hh,v 1.3 2006/06/29 17:19:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/examples/extended/field/field03/include/F03SteppingVerbose.hh b/examples/extended/field/field03/include/F03SteppingVerbose.hh index c1b1403f10..1cac858a50 100644 --- a/examples/extended/field/field03/include/F03SteppingVerbose.hh +++ b/examples/extended/field/field03/include/F03SteppingVerbose.hh @@ -25,7 +25,7 @@ // // // $Id: F03SteppingVerbose.hh,v 1.4 2006/06/29 17:19:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/examples/extended/field/field03/src/F03CalorHit.cc b/examples/extended/field/field03/src/F03CalorHit.cc index 164a1da001..fae333a584 100644 --- a/examples/extended/field/field03/src/F03CalorHit.cc +++ b/examples/extended/field/field03/src/F03CalorHit.cc @@ -25,7 +25,7 @@ // // // $Id: F03CalorHit.cc,v 1.4 2006/06/29 17:19:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field03/src/F03CalorimeterSD.cc b/examples/extended/field/field03/src/F03CalorimeterSD.cc index c35b7aefa9..1c840b13a6 100644 --- a/examples/extended/field/field03/src/F03CalorimeterSD.cc +++ b/examples/extended/field/field03/src/F03CalorimeterSD.cc @@ -25,7 +25,7 @@ // // // $Id: F03CalorimeterSD.cc,v 1.6 2006/06/29 17:19:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field03/src/F03DetectorConstruction.cc b/examples/extended/field/field03/src/F03DetectorConstruction.cc index f3e8755178..f6d7c00fa3 100644 --- a/examples/extended/field/field03/src/F03DetectorConstruction.cc +++ b/examples/extended/field/field03/src/F03DetectorConstruction.cc @@ -25,7 +25,7 @@ // // // $Id: F03DetectorConstruction.cc,v 1.12 2006/06/29 17:19:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field03/src/F03DetectorMessenger.cc b/examples/extended/field/field03/src/F03DetectorMessenger.cc index f8afc3d3e0..f6865b25ca 100644 --- a/examples/extended/field/field03/src/F03DetectorMessenger.cc +++ b/examples/extended/field/field03/src/F03DetectorMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: F03DetectorMessenger.cc,v 1.5 2006/06/29 17:19:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field03/src/F03EventAction.cc b/examples/extended/field/field03/src/F03EventAction.cc index 0114485f63..58837f8cd7 100644 --- a/examples/extended/field/field03/src/F03EventAction.cc +++ b/examples/extended/field/field03/src/F03EventAction.cc @@ -25,7 +25,7 @@ // // // $Id: F03EventAction.cc,v 1.6 2006/06/29 17:19:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field03/src/F03EventActionMessenger.cc b/examples/extended/field/field03/src/F03EventActionMessenger.cc index 5746528bdf..cef111a191 100644 --- a/examples/extended/field/field03/src/F03EventActionMessenger.cc +++ b/examples/extended/field/field03/src/F03EventActionMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: F03EventActionMessenger.cc,v 1.4 2006/06/29 17:19:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field03/src/F03FieldMessenger.cc b/examples/extended/field/field03/src/F03FieldMessenger.cc index a8cfb0dac3..52a7ac4c9d 100644 --- a/examples/extended/field/field03/src/F03FieldMessenger.cc +++ b/examples/extended/field/field03/src/F03FieldMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: F03FieldMessenger.cc,v 1.7 2006/06/29 17:19:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field03/src/F03FieldSetup.cc b/examples/extended/field/field03/src/F03FieldSetup.cc index b903fff89b..971870dae6 100644 --- a/examples/extended/field/field03/src/F03FieldSetup.cc +++ b/examples/extended/field/field03/src/F03FieldSetup.cc @@ -25,7 +25,7 @@ // // // $Id: F03FieldSetup.cc,v 1.4 2006/06/29 17:19:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Field Setup class implementation. diff --git a/examples/extended/field/field03/src/F03PhysicsList.cc b/examples/extended/field/field03/src/F03PhysicsList.cc index 8078c394ae..f6afea7c02 100644 --- a/examples/extended/field/field03/src/F03PhysicsList.cc +++ b/examples/extended/field/field03/src/F03PhysicsList.cc @@ -25,7 +25,7 @@ // // // $Id: F03PhysicsList.cc,v 1.10 2006/06/29 17:19:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4Timer.hh" diff --git a/examples/extended/field/field03/src/F03PhysicsListMessenger.cc b/examples/extended/field/field03/src/F03PhysicsListMessenger.cc index bbcb9f99e1..108604e674 100644 --- a/examples/extended/field/field03/src/F03PhysicsListMessenger.cc +++ b/examples/extended/field/field03/src/F03PhysicsListMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: F03PhysicsListMessenger.cc,v 1.5 2006/06/29 17:19:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field03/src/F03PrimaryGeneratorAction.cc b/examples/extended/field/field03/src/F03PrimaryGeneratorAction.cc index ecb55404d8..386787d4bb 100644 --- a/examples/extended/field/field03/src/F03PrimaryGeneratorAction.cc +++ b/examples/extended/field/field03/src/F03PrimaryGeneratorAction.cc @@ -25,7 +25,7 @@ // // // $Id: F03PrimaryGeneratorAction.cc,v 1.6 2006/06/29 17:19:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field03/src/F03PrimaryGeneratorMessenger.cc b/examples/extended/field/field03/src/F03PrimaryGeneratorMessenger.cc index dfbc9eabcd..c2c5b327fb 100644 --- a/examples/extended/field/field03/src/F03PrimaryGeneratorMessenger.cc +++ b/examples/extended/field/field03/src/F03PrimaryGeneratorMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: F03PrimaryGeneratorMessenger.cc,v 1.5 2006/06/29 17:19:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field03/src/F03RunAction.cc b/examples/extended/field/field03/src/F03RunAction.cc index cbf1f859fb..31ec661cc7 100644 --- a/examples/extended/field/field03/src/F03RunAction.cc +++ b/examples/extended/field/field03/src/F03RunAction.cc @@ -25,7 +25,7 @@ // // // $Id: F03RunAction.cc,v 1.9 2006/06/29 17:19:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "F03RunAction.hh" diff --git a/examples/extended/field/field03/src/F03RunMessenger.cc b/examples/extended/field/field03/src/F03RunMessenger.cc index 7260f0a901..88ff466f40 100644 --- a/examples/extended/field/field03/src/F03RunMessenger.cc +++ b/examples/extended/field/field03/src/F03RunMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: F03RunMessenger.cc,v 1.6 2006/06/29 17:19:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field03/src/F03StepCut.cc b/examples/extended/field/field03/src/F03StepCut.cc index 8285987396..90de726186 100644 --- a/examples/extended/field/field03/src/F03StepCut.cc +++ b/examples/extended/field/field03/src/F03StepCut.cc @@ -25,7 +25,7 @@ // // // $Id: F03StepCut.cc,v 1.3 2006/06/29 17:19:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "F03StepCut.hh" diff --git a/examples/extended/field/field03/src/F03SteppingAction.cc b/examples/extended/field/field03/src/F03SteppingAction.cc index 4c1268588b..d2200b490f 100644 --- a/examples/extended/field/field03/src/F03SteppingAction.cc +++ b/examples/extended/field/field03/src/F03SteppingAction.cc @@ -25,7 +25,7 @@ // // // $Id: F03SteppingAction.cc,v 1.6 2006/06/29 17:19:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/field/field03/src/F03SteppingMessenger.cc b/examples/extended/field/field03/src/F03SteppingMessenger.cc index 1e3124c6ab..dda7005d58 100644 --- a/examples/extended/field/field03/src/F03SteppingMessenger.cc +++ b/examples/extended/field/field03/src/F03SteppingMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: F03SteppingMessenger.cc,v 1.5 2006/06/29 17:19:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/examples/extended/field/field03/src/F03SteppingVerbose.cc b/examples/extended/field/field03/src/F03SteppingVerbose.cc index edfd55c03e..064e2f9d6a 100644 --- a/examples/extended/field/field03/src/F03SteppingVerbose.cc +++ b/examples/extended/field/field03/src/F03SteppingVerbose.cc @@ -25,7 +25,7 @@ // // // $Id: F03SteppingVerbose.cc,v 1.5 2006/06/29 17:19:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... diff --git a/examples/extended/g3tog4/clGeometry/clGeometry.cc b/examples/extended/g3tog4/clGeometry/clGeometry.cc index 13d4e25a14..e50c30e30d 100644 --- a/examples/extended/g3tog4/clGeometry/clGeometry.cc +++ b/examples/extended/g3tog4/clGeometry/clGeometry.cc @@ -25,7 +25,7 @@ // // // $Id: clGeometry.cc,v 1.7 2006/06/29 17:20:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/g3tog4/clGeometry/clGeometry.out b/examples/extended/g3tog4/clGeometry/clGeometry.out index dfe243e34f..d89cfa19de 100644 --- a/examples/extended/g3tog4/clGeometry/clGeometry.out +++ b/examples/extended/g3tog4/clGeometry/clGeometry.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -31,17 +31,13 @@ Registered model factories: drawByCharge drawByParticleID drawByOriginVolume - -Registered models: - None + drawByAttribute Registered filter factories: chargeFilter particleFilter originVolumeFilter - -Registered filters: - None + attributeFilter /run/verbose 1 /tracking/verbose 1 @@ -84,10 +80,14 @@ G3toG4 top level volume is HALL Top-level G3toG4 logical volume HALL G4VisAttributes: invisible, daughters visible, colour: (1,1,1,1) linestyle: solid, line width: 1 drawing style: not forced, auxiliary edge visibility: not forced + line segments per circle: not forced. + time range: (-1.79769e+308,1.79769e+308) G4AttValue pointer is zero, G4AttDef pointer is zero Top-level G3toG4 logical volume HALL G4VisAttributes: invisible, daughters visible, colour: (1,1,1,1) linestyle: solid, line width: 1 drawing style: not forced, auxiliary edge visibility: not forced + line segments per circle: not forced. + time range: (-1.79769e+308,1.79769e+308) G4AttValue pointer is zero, G4AttDef pointer is zero G4VUserPhysicsList::Construct() Construct processes @@ -102,6 +102,7 @@ G3toG4PhysicsList::SetCuts:CutLength : 2 mm /run/beamOn 1 phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV Sampling according Klein-Nishina model @@ -109,7 +110,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.022 MeV to 100 GeV in 100 bins. @@ -141,7 +142,7 @@ eBrem: tables are built for e+ Total cross sections from a parametrisation based on the EEDL data library. Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -238,12 +239,12 @@ Start closing geometry. G4GeometryManager::ReportVoxelStats -- Voxel Statistics Total memory consumed for geometry optimisation: 3 kByte - Total CPU time elapsed for geometry optimisation: 0 seconds + Total CPU time elapsed for geometry optimisation: 0.01 seconds Voxelisation: top CPU users: Percent Total CPU System CPU Memory Volume ------- ---------- ---------- -------- ---------- - 0.00 0.00 0.00 0k HALL + 100.00 0.01 0.00 0k HALL 0.00 0.00 0.00 2k TUB1 0.00 0.00 0.00 0k TUB2 0.00 0.00 0.00 0k BXD1_2_ENV @@ -255,7 +256,7 @@ G4GeometryManager::ReportVoxelStats -- Voxel Statistics Percent Memory Heads Nodes Pointers Total CPU Volume ------- -------- ------ ------ -------- ---------- ---------- 60.02 2k 1 60 60 0.00 TUB1 - 11.92 0k 2 8 18 0.00 HALL + 11.92 0k 2 8 18 0.01 HALL 6.39 0k 1 5 5 0.00 TUB2 5.42 0k 1 4 4 0.00 BXD1_2_ENV 5.42 0k 1 4 4 0.00 BXD1_3_ENV @@ -288,7 +289,7 @@ WARNING: G4VisManager::IsValidView(): Attempt to draw when no graphics system Run terminated. Run Summary Number of events processed : 1 - User=0s Real=0.02s Sys=0.01s + User=0.01s Real=0.03s Sys=0s /gun/particle mu+ /run/beamOn 1 @@ -325,7 +326,7 @@ Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolu Run terminated. Run Summary Number of events processed : 1 - User=0.01s Real=0.01s Sys=0s + User=0s Real=0s Sys=0s /gun/particle e- /run/beamOn 1 @@ -362,7 +363,7 @@ Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolu Run terminated. Run Summary Number of events processed : 1 - User=0s Real=0s Sys=0s + User=0.01s Real=0.01s Sys=0s /gun/particle e+ /run/beamOn 1 @@ -399,7 +400,7 @@ Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolu Run terminated. Run Summary Number of events processed : 1 - User=0s Real=0.01s Sys=0.01s + User=0s Real=0s Sys=0s /gun/position 0. 1.5 0. mm /gun/direction 1. 0. 0. /gun/energy 1 GeV @@ -439,7 +440,7 @@ Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolu Run terminated. Run Summary Number of events processed : 1 - User=0.01s Real=0.01s Sys=0s + User=0s Real=0s Sys=0s /gun/particle mu+ /run/beamOn 1 @@ -476,7 +477,7 @@ Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolu Run terminated. Run Summary Number of events processed : 1 - User=0s Real=0.01s Sys=0s + User=0s Real=0s Sys=0s /gun/particle e- /run/beamOn 1 @@ -513,7 +514,7 @@ Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolu Run terminated. Run Summary Number of events processed : 1 - User=0s Real=0.01s Sys=0s + User=0s Real=0.01s Sys=0.01s /gun/particle e+ /run/beamOn 1 @@ -559,7 +560,9 @@ UserRunAction deleted. UserPrimaryGenerator deleted. G4 kernel has come to Quit state. EventManager deleted. +Default detector region deleted. UImanager deleted. +Units table cleared. StateManager deleted. RunManagerKernel is deleted. RunManager is deleting. diff --git a/examples/extended/g3tog4/clGeometry/include/G3toG4DetectorConstruction.hh b/examples/extended/g3tog4/clGeometry/include/G3toG4DetectorConstruction.hh index ec583c2451..addff2ccf8 100644 --- a/examples/extended/g3tog4/clGeometry/include/G3toG4DetectorConstruction.hh +++ b/examples/extended/g3tog4/clGeometry/include/G3toG4DetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: G3toG4DetectorConstruction.hh,v 1.4 2006/06/29 17:20:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G3toG4DetectorConstruction_h #define G3toG4DetectorConstruction_h 1 diff --git a/examples/extended/g3tog4/clGeometry/include/G3toG4EventAction.hh b/examples/extended/g3tog4/clGeometry/include/G3toG4EventAction.hh index 7ead54a21b..7b461c539b 100644 --- a/examples/extended/g3tog4/clGeometry/include/G3toG4EventAction.hh +++ b/examples/extended/g3tog4/clGeometry/include/G3toG4EventAction.hh @@ -25,7 +25,7 @@ // // // $Id: G3toG4EventAction.hh,v 1.3 2006/06/29 17:20:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/g3tog4/clGeometry/include/G3toG4EventActionMessenger.hh b/examples/extended/g3tog4/clGeometry/include/G3toG4EventActionMessenger.hh index ae845fff23..4e16a6fd1e 100644 --- a/examples/extended/g3tog4/clGeometry/include/G3toG4EventActionMessenger.hh +++ b/examples/extended/g3tog4/clGeometry/include/G3toG4EventActionMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: G3toG4EventActionMessenger.hh,v 1.3 2006/06/29 17:20:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/g3tog4/clGeometry/include/G3toG4PhysicsList.hh b/examples/extended/g3tog4/clGeometry/include/G3toG4PhysicsList.hh index 2d68112483..ea913e2f61 100644 --- a/examples/extended/g3tog4/clGeometry/include/G3toG4PhysicsList.hh +++ b/examples/extended/g3tog4/clGeometry/include/G3toG4PhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: G3toG4PhysicsList.hh,v 1.3 2006/06/29 17:20:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/g3tog4/clGeometry/include/G3toG4PrimaryGeneratorAction.hh b/examples/extended/g3tog4/clGeometry/include/G3toG4PrimaryGeneratorAction.hh index 54e7fa8655..3fc2df78de 100644 --- a/examples/extended/g3tog4/clGeometry/include/G3toG4PrimaryGeneratorAction.hh +++ b/examples/extended/g3tog4/clGeometry/include/G3toG4PrimaryGeneratorAction.hh @@ -25,7 +25,7 @@ // // // $Id: G3toG4PrimaryGeneratorAction.hh,v 1.3 2006/06/29 17:20:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G3toG4PrimaryGeneratorAction_h diff --git a/examples/extended/g3tog4/clGeometry/include/G3toG4RunAction.hh b/examples/extended/g3tog4/clGeometry/include/G3toG4RunAction.hh index 738d540a4f..240f7d403f 100644 --- a/examples/extended/g3tog4/clGeometry/include/G3toG4RunAction.hh +++ b/examples/extended/g3tog4/clGeometry/include/G3toG4RunAction.hh @@ -25,7 +25,7 @@ // // // $Id: G3toG4RunAction.hh,v 1.3 2006/06/29 17:20:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G3toG4RunAction_h diff --git a/examples/extended/g3tog4/clGeometry/src/G3toG4DetectorConstruction.cc b/examples/extended/g3tog4/clGeometry/src/G3toG4DetectorConstruction.cc index 99e40cfa8a..a7e1349077 100644 --- a/examples/extended/g3tog4/clGeometry/src/G3toG4DetectorConstruction.cc +++ b/examples/extended/g3tog4/clGeometry/src/G3toG4DetectorConstruction.cc @@ -25,7 +25,7 @@ // // // $Id: G3toG4DetectorConstruction.cc,v 1.5 2006/06/29 17:20:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //-------------------------------------------------------------------------- // G3toG4DetectorConstruction. Most the work is Done in diff --git a/examples/extended/g3tog4/clGeometry/src/G3toG4EventAction.cc b/examples/extended/g3tog4/clGeometry/src/G3toG4EventAction.cc index 055889a9c8..657a1448ef 100644 --- a/examples/extended/g3tog4/clGeometry/src/G3toG4EventAction.cc +++ b/examples/extended/g3tog4/clGeometry/src/G3toG4EventAction.cc @@ -25,7 +25,7 @@ // // // $Id: G3toG4EventAction.cc,v 1.5 2006/06/29 17:20:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/g3tog4/clGeometry/src/G3toG4EventActionMessenger.cc b/examples/extended/g3tog4/clGeometry/src/G3toG4EventActionMessenger.cc index b8abc4bd51..940fd863ca 100644 --- a/examples/extended/g3tog4/clGeometry/src/G3toG4EventActionMessenger.cc +++ b/examples/extended/g3tog4/clGeometry/src/G3toG4EventActionMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: G3toG4EventActionMessenger.cc,v 1.4 2006/06/29 17:20:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/g3tog4/clGeometry/src/G3toG4PhysicsList.cc b/examples/extended/g3tog4/clGeometry/src/G3toG4PhysicsList.cc index d05dc4cb06..a1dd502f2b 100644 --- a/examples/extended/g3tog4/clGeometry/src/G3toG4PhysicsList.cc +++ b/examples/extended/g3tog4/clGeometry/src/G3toG4PhysicsList.cc @@ -25,7 +25,7 @@ // // // $Id: G3toG4PhysicsList.cc,v 1.5 2006/06/29 17:20:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/g3tog4/clGeometry/src/G3toG4PrimaryGeneratorAction.cc b/examples/extended/g3tog4/clGeometry/src/G3toG4PrimaryGeneratorAction.cc index acafd89f9a..507706d8b4 100644 --- a/examples/extended/g3tog4/clGeometry/src/G3toG4PrimaryGeneratorAction.cc +++ b/examples/extended/g3tog4/clGeometry/src/G3toG4PrimaryGeneratorAction.cc @@ -25,7 +25,7 @@ // // // $Id: G3toG4PrimaryGeneratorAction.cc,v 1.5 2006/06/29 17:20:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "globals.hh" diff --git a/examples/extended/g3tog4/clGeometry/src/G3toG4RunAction.cc b/examples/extended/g3tog4/clGeometry/src/G3toG4RunAction.cc index 9b002cc8a1..4a8c7c55ca 100644 --- a/examples/extended/g3tog4/clGeometry/src/G3toG4RunAction.cc +++ b/examples/extended/g3tog4/clGeometry/src/G3toG4RunAction.cc @@ -25,7 +25,7 @@ // // // $Id: G3toG4RunAction.cc,v 1.4 2006/06/29 17:20:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4ios.hh" diff --git a/examples/extended/g3tog4/cltog4/cltog4.cc b/examples/extended/g3tog4/cltog4/cltog4.cc index 6c79e214b6..b8d5f30dc5 100644 --- a/examples/extended/g3tog4/cltog4/cltog4.cc +++ b/examples/extended/g3tog4/cltog4/cltog4.cc @@ -25,7 +25,7 @@ // // // $Id: cltog4.cc,v 1.6 2006/06/29 17:20:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // #include "G4ios.hh" diff --git a/examples/extended/g3tog4/cltog4/cltog4.out b/examples/extended/g3tog4/cltog4/cltog4.out index 5c3c4fa87a..77e59a844a 100644 --- a/examples/extended/g3tog4/cltog4/cltog4.out +++ b/examples/extended/g3tog4/cltog4/cltog4.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -48,10 +48,14 @@ G3toG4 top level volume is HALL Top-level G3toG4 logical volume HALL G4VisAttributes: invisible, daughters visible, colour: (1,1,1,1) linestyle: solid, line width: 1 drawing style: not forced, auxiliary edge visibility: not forced + line segments per circle: not forced. + time range: (-1.79769e+308,1.79769e+308) G4AttValue pointer is zero, G4AttDef pointer is zero Top-level G3toG4 logical volume HALL G4VisAttributes: invisible, daughters visible, colour: (1,1,1,1) linestyle: solid, line width: 1 drawing style: not forced, auxiliary edge visibility: not forced + line segments per circle: not forced. + time range: (-1.79769e+308,1.79769e+308) G4AttValue pointer is zero, G4AttDef pointer is zero G3toG4PhysicsList::SetCuts:CutLength : 2 mm /control/execute /afs/cern.ch/sw/geant4/stt/dev1/src/geant4/tests/test602/test602.in @@ -65,6 +69,7 @@ G3toG4PhysicsList::SetCuts:CutLength : 2 mm /run/beamOn 10 phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV Sampling according Klein-Nishina model @@ -72,7 +77,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.022 MeV to 100 GeV in 100 bins. @@ -104,7 +109,7 @@ eBrem: tables are built for e+ Total cross sections from a parametrisation based on the EEDL data library. Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -288,5 +293,5 @@ Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolu Run terminated. Run Summary Number of events processed : 10 - User=0.04s Real=0.1s Sys=0s + User=0.02s Real=0.03s Sys=0s G4 kernel has come to Quit state. diff --git a/examples/extended/g3tog4/cltog4/include/G3toG4DetectorConstruction.hh b/examples/extended/g3tog4/cltog4/include/G3toG4DetectorConstruction.hh index e7eb606a97..fe16df8953 100644 --- a/examples/extended/g3tog4/cltog4/include/G3toG4DetectorConstruction.hh +++ b/examples/extended/g3tog4/cltog4/include/G3toG4DetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: G3toG4DetectorConstruction.hh,v 1.3 2006/06/29 17:20:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G3toG4DetectorConstruction_h #define G3toG4DetectorConstruction_h 1 diff --git a/examples/extended/g3tog4/cltog4/include/G3toG4EventAction.hh b/examples/extended/g3tog4/cltog4/include/G3toG4EventAction.hh index f3672c9c2c..8d10f5aba7 100644 --- a/examples/extended/g3tog4/cltog4/include/G3toG4EventAction.hh +++ b/examples/extended/g3tog4/cltog4/include/G3toG4EventAction.hh @@ -25,7 +25,7 @@ // // // $Id: G3toG4EventAction.hh,v 1.3 2006/06/29 17:20:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/g3tog4/cltog4/include/G3toG4EventActionMessenger.hh b/examples/extended/g3tog4/cltog4/include/G3toG4EventActionMessenger.hh index c236423ec8..c80cede404 100644 --- a/examples/extended/g3tog4/cltog4/include/G3toG4EventActionMessenger.hh +++ b/examples/extended/g3tog4/cltog4/include/G3toG4EventActionMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: G3toG4EventActionMessenger.hh,v 1.3 2006/06/29 17:20:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/g3tog4/cltog4/include/G3toG4PhysicsList.hh b/examples/extended/g3tog4/cltog4/include/G3toG4PhysicsList.hh index 424183a606..806966a9c1 100644 --- a/examples/extended/g3tog4/cltog4/include/G3toG4PhysicsList.hh +++ b/examples/extended/g3tog4/cltog4/include/G3toG4PhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: G3toG4PhysicsList.hh,v 1.3 2006/06/29 17:20:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/g3tog4/cltog4/include/G3toG4PrimaryGeneratorAction.hh b/examples/extended/g3tog4/cltog4/include/G3toG4PrimaryGeneratorAction.hh index 3ba5f4b022..e4a0c0c6aa 100644 --- a/examples/extended/g3tog4/cltog4/include/G3toG4PrimaryGeneratorAction.hh +++ b/examples/extended/g3tog4/cltog4/include/G3toG4PrimaryGeneratorAction.hh @@ -25,7 +25,7 @@ // // // $Id: G3toG4PrimaryGeneratorAction.hh,v 1.3 2006/06/29 17:20:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G3toG4PrimaryGeneratorAction_h diff --git a/examples/extended/g3tog4/cltog4/include/G3toG4RunAction.hh b/examples/extended/g3tog4/cltog4/include/G3toG4RunAction.hh index e4ccd758ca..4beb451d88 100644 --- a/examples/extended/g3tog4/cltog4/include/G3toG4RunAction.hh +++ b/examples/extended/g3tog4/cltog4/include/G3toG4RunAction.hh @@ -25,7 +25,7 @@ // // // $Id: G3toG4RunAction.hh,v 1.3 2006/06/29 17:20:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G3toG4RunAction_h diff --git a/examples/extended/g3tog4/cltog4/src/G3toG4DetectorConstruction.cc b/examples/extended/g3tog4/cltog4/src/G3toG4DetectorConstruction.cc index 941aec522a..a51214ef0b 100644 --- a/examples/extended/g3tog4/cltog4/src/G3toG4DetectorConstruction.cc +++ b/examples/extended/g3tog4/cltog4/src/G3toG4DetectorConstruction.cc @@ -25,7 +25,7 @@ // // // $Id: G3toG4DetectorConstruction.cc,v 1.5 2006/06/29 17:20:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //-------------------------------------------------------------------------- // G3toG4DetectorConstruction. Most the work is Done in diff --git a/examples/extended/g3tog4/cltog4/src/G3toG4EventAction.cc b/examples/extended/g3tog4/cltog4/src/G3toG4EventAction.cc index 5626b1afff..6020b049a5 100644 --- a/examples/extended/g3tog4/cltog4/src/G3toG4EventAction.cc +++ b/examples/extended/g3tog4/cltog4/src/G3toG4EventAction.cc @@ -25,7 +25,7 @@ // // // $Id: G3toG4EventAction.cc,v 1.6 2006/06/29 17:20:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/g3tog4/cltog4/src/G3toG4EventActionMessenger.cc b/examples/extended/g3tog4/cltog4/src/G3toG4EventActionMessenger.cc index d54e801d2b..cd09c33860 100644 --- a/examples/extended/g3tog4/cltog4/src/G3toG4EventActionMessenger.cc +++ b/examples/extended/g3tog4/cltog4/src/G3toG4EventActionMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: G3toG4EventActionMessenger.cc,v 1.4 2006/06/29 17:20:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/g3tog4/cltog4/src/G3toG4PhysicsList.cc b/examples/extended/g3tog4/cltog4/src/G3toG4PhysicsList.cc index d9f166a2f8..bf7ab3362e 100644 --- a/examples/extended/g3tog4/cltog4/src/G3toG4PhysicsList.cc +++ b/examples/extended/g3tog4/cltog4/src/G3toG4PhysicsList.cc @@ -25,7 +25,7 @@ // // // $Id: G3toG4PhysicsList.cc,v 1.5 2006/06/29 17:21:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/g3tog4/cltog4/src/G3toG4PrimaryGeneratorAction.cc b/examples/extended/g3tog4/cltog4/src/G3toG4PrimaryGeneratorAction.cc index 557686e52d..e7a683513e 100644 --- a/examples/extended/g3tog4/cltog4/src/G3toG4PrimaryGeneratorAction.cc +++ b/examples/extended/g3tog4/cltog4/src/G3toG4PrimaryGeneratorAction.cc @@ -25,7 +25,7 @@ // // // $Id: G3toG4PrimaryGeneratorAction.cc,v 1.5 2006/06/29 17:21:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "globals.hh" diff --git a/examples/extended/g3tog4/cltog4/src/G3toG4RunAction.cc b/examples/extended/g3tog4/cltog4/src/G3toG4RunAction.cc index 007aa6b915..7d9f5138bf 100644 --- a/examples/extended/g3tog4/cltog4/src/G3toG4RunAction.cc +++ b/examples/extended/g3tog4/cltog4/src/G3toG4RunAction.cc @@ -25,7 +25,7 @@ // // // $Id: G3toG4RunAction.cc,v 1.4 2006/06/29 17:21:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4ios.hh" diff --git a/examples/extended/gdml/GNUmakefile b/examples/extended/gdml/GNUmakefile index fb5bed1ee3..930f923b6d 100644 --- a/examples/extended/gdml/GNUmakefile +++ b/examples/extended/gdml/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.5 2006/06/16 16:52:41 witoldp Exp $ +# $Id: GNUmakefile,v 1.6 2006/07/24 15:32:13 witoldp Exp $ # -------------------------------------------------------------- # GNUmakefile for examples module. # Author: Radovan Chytracek @@ -14,7 +14,7 @@ ifndef G4INSTALL endif CPPFLAGS += \ - -I$(GDML_BASE)/include \ + -I$(GDML_INC) \ -I$(XERCESCROOT)/include EXTRALIBS += \ @@ -33,8 +33,8 @@ all: lib bin ifndef XERCESCROOT @echo XERCESCROOT not defined! endif -ifndef GDML_BASE - @echo GDML_BASE not defined! +ifndef GDML_INC + @echo GDML_INC not defined! endif ifndef GDML_LIB @echo GDML_LIB not defined! diff --git a/examples/extended/gdml/History b/examples/extended/gdml/History index f0da69eae7..d0e6f6e7ad 100644 --- a/examples/extended/gdml/History +++ b/examples/extended/gdml/History @@ -1,4 +1,4 @@ -$Id: History,v 1.8 2006/06/19 12:11:11 gcosmo Exp $ +$Id: History,v 1.9 2006/12/01 16:57:09 gcosmo Exp $ ------------------------------------------------------------------- ========================================================= @@ -17,6 +17,10 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +December 1st, 2006 W.Pokorski - exgdml-V08-01-00 +- Set schema location to LCG release area in test.gdml. +- Updated README and GNUmakefile. + June 19th, 2006 W.Pokorski - exgdml-V08-00-00 - Added G4Evaluator for new version of GDML. - Updated GNUmakefile. diff --git a/examples/extended/gdml/README b/examples/extended/gdml/README index 840041fb81..c8a808e835 100644 --- a/examples/extended/gdml/README +++ b/examples/extended/gdml/README @@ -1,4 +1,4 @@ -$Id: README,v 1.8 2006/06/19 09:48:18 witoldp Exp $ +$Id: README,v 1.9 2006/07/24 15:32:13 witoldp Exp $ ------------------------------------------------------------------- ========================================================= @@ -26,7 +26,7 @@ geometry tree and write it out in the form of a GDML file. HOW TO BUILD THE EXAMPLE ? -- Install the GDML package with Geant4 extensions and Xerces. +- Install the GDML package with the Geant4 binding as well as Xerces. See: http://cern.ch/gdml. - Set the environment variable GDML_INC to point to the directory where @@ -36,15 +36,20 @@ HOW TO BUILD THE EXAMPLE ? You can also edit the GNUmakefile provided with the example and customise it for your specific setup. -- Customise the 'test.gdml' schema file, specifying in the top line the - right path where to retrieve the main GDML schema file (step that will - become automatic in future). - - Compile and link to generate an executable: % gmake - Note: new version of GDML (after GDML_2_5_0) have one additional + Note 1: GDML requires that all the Geant4 header files are copied to + one directory. You can use the Geant4 Configure script for coping + the Geant4 header files. + Note 2: new version of GDML (after GDML_2_5_0) have one additional library called G4Evaluator. If you are compiling with older version of GDML, you should remove that library from the makefile. + +- You may need to customise the location of the GDML schema file which is + specified at the top of test.gdml file (the geometry file). By default + the schema will be loaded from the web server of LCG release area, however, + you can load your own copy of the schema by specifying the path, like: + xsi:noNamespaceSchemaLocation="/home/me/MYGDML/src/GDMLSchema/gdml.xsd" - Execute the application: % g4_gdml_read_write diff --git a/examples/extended/gdml/include/g4rwPrimaryGeneratorAction.hh b/examples/extended/gdml/include/g4rwPrimaryGeneratorAction.hh index 76172d094c..06a561e71d 100644 --- a/examples/extended/gdml/include/g4rwPrimaryGeneratorAction.hh +++ b/examples/extended/gdml/include/g4rwPrimaryGeneratorAction.hh @@ -25,7 +25,7 @@ // // // $Id: g4rwPrimaryGeneratorAction.hh,v 1.2 2006/06/29 17:21:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/gdml/src/g4rwDetectorConstruction.cc b/examples/extended/gdml/src/g4rwDetectorConstruction.cc index 15f5f7fc6f..4fce67b1ed 100644 --- a/examples/extended/gdml/src/g4rwDetectorConstruction.cc +++ b/examples/extended/gdml/src/g4rwDetectorConstruction.cc @@ -25,7 +25,7 @@ // // // $Id: g4rwDetectorConstruction.cc,v 1.3 2006/06/29 17:21:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/gdml/src/g4rwPhysicsList.cc b/examples/extended/gdml/src/g4rwPhysicsList.cc index 26191f21aa..a30f04443a 100644 --- a/examples/extended/gdml/src/g4rwPhysicsList.cc +++ b/examples/extended/gdml/src/g4rwPhysicsList.cc @@ -25,7 +25,7 @@ // // // $Id: g4rwPhysicsList.cc,v 1.2 2006/06/29 17:21:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/gdml/src/g4rwPrimaryGeneratorAction.cc b/examples/extended/gdml/src/g4rwPrimaryGeneratorAction.cc index 48b438947e..efd569a976 100644 --- a/examples/extended/gdml/src/g4rwPrimaryGeneratorAction.cc +++ b/examples/extended/gdml/src/g4rwPrimaryGeneratorAction.cc @@ -25,7 +25,7 @@ // // // $Id: g4rwPrimaryGeneratorAction.cc,v 1.4 2006/06/29 17:21:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "g4rwPrimaryGeneratorAction.hh" diff --git a/examples/extended/gdml/test.gdml b/examples/extended/gdml/test.gdml index a1a866a4f5..9d2e5a2768 100644 --- a/examples/extended/gdml/test.gdml +++ b/examples/extended/gdml/test.gdml @@ -1,5 +1,5 @@ - + diff --git a/examples/extended/geometry/olap/include/G4GeoNav.hh b/examples/extended/geometry/olap/include/G4GeoNav.hh index 026a7414c7..1ee0e499dc 100644 --- a/examples/extended/geometry/olap/include/G4GeoNav.hh +++ b/examples/extended/geometry/olap/include/G4GeoNav.hh @@ -25,7 +25,7 @@ // // // $Id: G4GeoNav.hh,v 1.4 2006/06/29 17:21:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/geometry/olap/include/OlapDetConstr.hh b/examples/extended/geometry/olap/include/OlapDetConstr.hh index 4c137d3fe1..d62399d7af 100644 --- a/examples/extended/geometry/olap/include/OlapDetConstr.hh +++ b/examples/extended/geometry/olap/include/OlapDetConstr.hh @@ -25,7 +25,7 @@ // // // $Id: OlapDetConstr.hh,v 1.2 2006/06/29 17:22:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/geometry/olap/include/OlapEventAction.hh b/examples/extended/geometry/olap/include/OlapEventAction.hh index 5c9b5e6b82..b9626740c5 100644 --- a/examples/extended/geometry/olap/include/OlapEventAction.hh +++ b/examples/extended/geometry/olap/include/OlapEventAction.hh @@ -25,7 +25,7 @@ // // // $Id: OlapEventAction.hh,v 1.3 2006/06/29 17:22:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/geometry/olap/include/OlapGenerator.hh b/examples/extended/geometry/olap/include/OlapGenerator.hh index 4b8d112ffd..15bdf45ff0 100644 --- a/examples/extended/geometry/olap/include/OlapGenerator.hh +++ b/examples/extended/geometry/olap/include/OlapGenerator.hh @@ -25,7 +25,7 @@ // // // $Id: OlapGenerator.hh,v 1.3 2006/06/29 17:22:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/geometry/olap/include/OlapLogManager.hh b/examples/extended/geometry/olap/include/OlapLogManager.hh index bdd48ae3eb..d5b9b0ee6e 100644 --- a/examples/extended/geometry/olap/include/OlapLogManager.hh +++ b/examples/extended/geometry/olap/include/OlapLogManager.hh @@ -25,7 +25,7 @@ // // // $Id: OlapLogManager.hh,v 1.2 2006/06/29 17:22:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/geometry/olap/include/OlapManager.hh b/examples/extended/geometry/olap/include/OlapManager.hh index f7a7cd746d..2f8bd171a5 100644 --- a/examples/extended/geometry/olap/include/OlapManager.hh +++ b/examples/extended/geometry/olap/include/OlapManager.hh @@ -25,7 +25,7 @@ // // // $Id: OlapManager.hh,v 1.4 2006/06/29 17:22:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/geometry/olap/include/OlapManagerMessenger.hh b/examples/extended/geometry/olap/include/OlapManagerMessenger.hh index 50cad23b6f..dda123084a 100644 --- a/examples/extended/geometry/olap/include/OlapManagerMessenger.hh +++ b/examples/extended/geometry/olap/include/OlapManagerMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: OlapManagerMessenger.hh,v 1.2 2006/06/29 17:22:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/geometry/olap/include/OlapNotify.hh b/examples/extended/geometry/olap/include/OlapNotify.hh index 6540375dba..5f2ee222d3 100644 --- a/examples/extended/geometry/olap/include/OlapNotify.hh +++ b/examples/extended/geometry/olap/include/OlapNotify.hh @@ -25,7 +25,7 @@ // // // $Id: OlapNotify.hh,v 1.3 2006/06/29 17:22:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/geometry/olap/include/OlapPhysicsList.hh b/examples/extended/geometry/olap/include/OlapPhysicsList.hh index 5f8c2c804d..6de0424bd7 100644 --- a/examples/extended/geometry/olap/include/OlapPhysicsList.hh +++ b/examples/extended/geometry/olap/include/OlapPhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: OlapPhysicsList.hh,v 1.2 2006/06/29 17:22:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/geometry/olap/include/OlapRunAction.hh b/examples/extended/geometry/olap/include/OlapRunAction.hh index 15240a9612..14b90c4d31 100644 --- a/examples/extended/geometry/olap/include/OlapRunAction.hh +++ b/examples/extended/geometry/olap/include/OlapRunAction.hh @@ -25,7 +25,7 @@ // // // $Id: OlapRunAction.hh,v 1.3 2006/06/29 17:22:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/geometry/olap/include/OlapSteppingAction.hh b/examples/extended/geometry/olap/include/OlapSteppingAction.hh index b7b415f83f..d5084581e0 100644 --- a/examples/extended/geometry/olap/include/OlapSteppingAction.hh +++ b/examples/extended/geometry/olap/include/OlapSteppingAction.hh @@ -25,7 +25,7 @@ // // // $Id: OlapSteppingAction.hh,v 1.3 2006/06/29 17:22:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/geometry/olap/include/RandomDetector.hh b/examples/extended/geometry/olap/include/RandomDetector.hh index b8be1009f4..3203bd5de0 100644 --- a/examples/extended/geometry/olap/include/RandomDetector.hh +++ b/examples/extended/geometry/olap/include/RandomDetector.hh @@ -25,7 +25,7 @@ // // // $Id: RandomDetector.hh,v 1.2 2006/06/29 17:22:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/geometry/olap/include/SolidAnalyser.hh b/examples/extended/geometry/olap/include/SolidAnalyser.hh index 6411a0474a..2fd7ad95c7 100644 --- a/examples/extended/geometry/olap/include/SolidAnalyser.hh +++ b/examples/extended/geometry/olap/include/SolidAnalyser.hh @@ -25,7 +25,7 @@ // // // $Id: SolidAnalyser.hh,v 1.3 2006/06/29 17:22:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/geometry/olap/include/tree.hh b/examples/extended/geometry/olap/include/tree.hh index 4557203c03..0e6673f22f 100644 --- a/examples/extended/geometry/olap/include/tree.hh +++ b/examples/extended/geometry/olap/include/tree.hh @@ -25,7 +25,7 @@ // // // $Id: tree.hh,v 1.4 2006/06/29 17:22:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/geometry/olap/olapex.cc b/examples/extended/geometry/olap/olapex.cc index 011b22ab69..0a5718db09 100644 --- a/examples/extended/geometry/olap/olapex.cc +++ b/examples/extended/geometry/olap/olapex.cc @@ -25,7 +25,7 @@ // // // $Id: olapex.cc,v 1.3 2006/06/29 17:21:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/geometry/olap/src/G4GeoNav.cc b/examples/extended/geometry/olap/src/G4GeoNav.cc index 2ebd38953f..ac6dea6efd 100644 --- a/examples/extended/geometry/olap/src/G4GeoNav.cc +++ b/examples/extended/geometry/olap/src/G4GeoNav.cc @@ -25,7 +25,7 @@ // // // $Id: G4GeoNav.cc,v 1.3 2006/06/29 17:22:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/geometry/olap/src/OlapDetConstr.cc b/examples/extended/geometry/olap/src/OlapDetConstr.cc index d61fd26241..b920254605 100644 --- a/examples/extended/geometry/olap/src/OlapDetConstr.cc +++ b/examples/extended/geometry/olap/src/OlapDetConstr.cc @@ -25,7 +25,7 @@ // // // $Id: OlapDetConstr.cc,v 1.4 2006/06/29 17:22:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/geometry/olap/src/OlapEventAction.cc b/examples/extended/geometry/olap/src/OlapEventAction.cc index 1de6ed08b2..8c319a46e0 100644 --- a/examples/extended/geometry/olap/src/OlapEventAction.cc +++ b/examples/extended/geometry/olap/src/OlapEventAction.cc @@ -25,7 +25,7 @@ // // // $Id: OlapEventAction.cc,v 1.5 2006/06/29 17:22:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/geometry/olap/src/OlapGenerator.cc b/examples/extended/geometry/olap/src/OlapGenerator.cc index 19763ce083..10389a6b62 100644 --- a/examples/extended/geometry/olap/src/OlapGenerator.cc +++ b/examples/extended/geometry/olap/src/OlapGenerator.cc @@ -25,7 +25,7 @@ // // // $Id: OlapGenerator.cc,v 1.4 2006/06/29 17:22:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/geometry/olap/src/OlapLogManager.cc b/examples/extended/geometry/olap/src/OlapLogManager.cc index 47071b2b24..f7fe40f925 100644 --- a/examples/extended/geometry/olap/src/OlapLogManager.cc +++ b/examples/extended/geometry/olap/src/OlapLogManager.cc @@ -25,7 +25,7 @@ // // // $Id: OlapLogManager.cc,v 1.3 2006/06/29 17:22:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/geometry/olap/src/OlapManager.cc b/examples/extended/geometry/olap/src/OlapManager.cc index 07eb89861f..27635c5254 100644 --- a/examples/extended/geometry/olap/src/OlapManager.cc +++ b/examples/extended/geometry/olap/src/OlapManager.cc @@ -25,7 +25,7 @@ // // // $Id: OlapManager.cc,v 1.3 2006/06/29 17:23:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/geometry/olap/src/OlapManagerMessenger.cc b/examples/extended/geometry/olap/src/OlapManagerMessenger.cc index 24c72c6f58..251db8522b 100644 --- a/examples/extended/geometry/olap/src/OlapManagerMessenger.cc +++ b/examples/extended/geometry/olap/src/OlapManagerMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: OlapManagerMessenger.cc,v 1.3 2006/06/29 17:23:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/geometry/olap/src/OlapNotify.cc b/examples/extended/geometry/olap/src/OlapNotify.cc index 2c2afe067d..760b0cb898 100644 --- a/examples/extended/geometry/olap/src/OlapNotify.cc +++ b/examples/extended/geometry/olap/src/OlapNotify.cc @@ -25,7 +25,7 @@ // // // $Id: OlapNotify.cc,v 1.2 2006/06/29 17:23:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/geometry/olap/src/OlapPhysicsList.cc b/examples/extended/geometry/olap/src/OlapPhysicsList.cc index eafc04611e..96fb4d6a9c 100644 --- a/examples/extended/geometry/olap/src/OlapPhysicsList.cc +++ b/examples/extended/geometry/olap/src/OlapPhysicsList.cc @@ -25,7 +25,7 @@ // // // $Id: OlapPhysicsList.cc,v 1.2 2006/06/29 17:23:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/geometry/olap/src/OlapRunAction.cc b/examples/extended/geometry/olap/src/OlapRunAction.cc index 6a0e30690a..0dc281ec9e 100644 --- a/examples/extended/geometry/olap/src/OlapRunAction.cc +++ b/examples/extended/geometry/olap/src/OlapRunAction.cc @@ -25,7 +25,7 @@ // // // $Id: OlapRunAction.cc,v 1.5 2006/06/29 17:23:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/geometry/olap/src/OlapSteppingAction.cc b/examples/extended/geometry/olap/src/OlapSteppingAction.cc index dba690e6b3..83b6d8fd4c 100644 --- a/examples/extended/geometry/olap/src/OlapSteppingAction.cc +++ b/examples/extended/geometry/olap/src/OlapSteppingAction.cc @@ -25,7 +25,7 @@ // // // $Id: OlapSteppingAction.cc,v 1.3 2006/06/29 17:23:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/geometry/olap/src/RandomDetector.cc b/examples/extended/geometry/olap/src/RandomDetector.cc index bf2c182dd9..6276f9e34a 100644 --- a/examples/extended/geometry/olap/src/RandomDetector.cc +++ b/examples/extended/geometry/olap/src/RandomDetector.cc @@ -25,7 +25,7 @@ // // // $Id: RandomDetector.cc,v 1.5 2006/06/29 17:23:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/geometry/olap/src/SolidAnalyser.cc b/examples/extended/geometry/olap/src/SolidAnalyser.cc index 742ff47090..8f02e922cf 100644 --- a/examples/extended/geometry/olap/src/SolidAnalyser.cc +++ b/examples/extended/geometry/olap/src/SolidAnalyser.cc @@ -25,7 +25,7 @@ // // // $Id: SolidAnalyser.cc,v 1.6 2006/06/29 17:23:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/hadronic/Hadr01/GNUmakefile b/examples/extended/hadronic/Hadr01/GNUmakefile index b3880613c1..f6319ee1da 100644 --- a/examples/extended/hadronic/Hadr01/GNUmakefile +++ b/examples/extended/hadronic/Hadr01/GNUmakefile @@ -1,5 +1,5 @@ -# $Id: GNUmakefile,v 1.5 2006/06/23 10:46:54 vnivanch Exp $ -# GEANT4 tag $Name: geant4-08-01 $ +# $Id: GNUmakefile,v 1.7 2006/10/31 15:05:33 vnivanch Exp $ +# GEANT4 tag $Name: geant4-08-02 $ # -------------------------------------------------------------- # GNUmakefile for examples module with AIDA interface # -------------------------------------------------------------- @@ -21,34 +21,9 @@ endif include $(G4INSTALL)/config/architecture.gmk -EXTRALIBS += -L$(G4LIB)/plists/$(G4SYSTEM) -EXTRALIBS += -lLHEP -lLHEP_BERT -lLHEP_BIC -lLHEP_BIC_HP -lLHEP_BERT_HP -EXTRALIBS += -lLHEP_PRECO -lLHEP_EMV -lQGSP -lQGSP_EMV -lQGSP_EMX -lFTFC -EXTRALIBS += -lQGSC -lQGSP_BERT -lQGSP_BIC -lQGSP_BERT_HP -lQBBC -lPackaging - -CPPFLAGS += \ - -I$(G4INSTALL)/physics_lists/hadronic/Packaging/include \ - -I$(G4INSTALL)/physics_lists/hadronic/LHEP/include \ - -I$(G4INSTALL)/physics_lists/hadronic/LHEP_BERT/include \ - -I$(G4INSTALL)/physics_lists/hadronic/LHEP_BIC/include \ - -I$(G4INSTALL)/physics_lists/hadronic/LHEP_BIC_HP/include \ - -I$(G4INSTALL)/physics_lists/hadronic/LHEP_BERT_HP/include \ - -I$(G4INSTALL)/physics_lists/hadronic/QGSC/include \ - -I$(G4INSTALL)/physics_lists/hadronic/QGSP/include \ - -I$(G4INSTALL)/physics_lists/hadronic/FTFC/include \ - -I$(G4INSTALL)/physics_lists/hadronic/LHEP_PRECO/include \ - -I$(G4INSTALL)/physics_lists/hadronic/LHEP_EMV/include \ - -I$(G4INSTALL)/physics_lists/hadronic/QGSP_BERT/include \ - -I$(G4INSTALL)/physics_lists/hadronic/QGSP_BERT_HP/include \ - -I$(G4INSTALL)/physics_lists/hadronic/QGSP_BIC/include \ - -I$(G4INSTALL)/physics_lists/hadronic/QGSP_EMV/include \ - -I$(G4INSTALL)/physics_lists/hadronic/QGSP_EMX/include \ - -I$(G4INSTALL)/physics_lists/hadronic/QBBC/include \ - # for the aida-config command see the README file ifdef G4ANALYSIS_USE CPPFLAGS += `aida-config --include` - LDFLAGS += `aida-config --lib` LOADLIBS += `aida-config --lib` endif diff --git a/examples/extended/hadronic/Hadr01/History b/examples/extended/hadronic/Hadr01/History index 2874e269bb..a63f950660 100644 --- a/examples/extended/hadronic/Hadr01/History +++ b/examples/extended/hadronic/Hadr01/History @@ -1,4 +1,4 @@ -$Id: History,v 1.8 2006/06/23 10:48:22 vnivanch Exp $ +$Id: History,v 1.13 2006/11/24 16:48:57 vnivanch Exp $ ------------------------------------------------------------------- ========================================================= @@ -15,6 +15,21 @@ track of all tags. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +24-11-06 V.Ivant (exhadr01-V08-01-03) +- Include tracking cut for neutrons +- Make changings according to physics_list package update + +16-11-06 V.Ivant (exhadr01-V08-01-02) +- Add option to defaine beam position by user + +31-10-06 V.Ivant (exhadr01-V08-01-01) +- Use physics_list subdirectory from source tree + +11-08-06 V.Ivant (exhadr01-V08-01-00) +- Add PhysList and directory for histograms definition via environment + variable +- Fix link of AIDA + 23-06-06 V.Ivant (exhadr01-V08-00-06) - Fix compilation problem for CLHEP 2.0..; use correct em builders for EMV, EMX physics lists diff --git a/examples/extended/hadronic/Hadr01/README b/examples/extended/hadronic/Hadr01/README index aee8d87ec1..01bcfbb3bb 100644 --- a/examples/extended/hadronic/Hadr01/README +++ b/examples/extended/hadronic/Hadr01/README @@ -49,6 +49,16 @@ defined via standard UI commands /gun/energy 15 GeV /gun/particle proton + +Default beam position is -(targetHalfLength + 5*mm) and direction along Z axis. +Beam position and direction can be changed by gun UI commands: + +/gun/position 1 10 3 mm +/gun/direction 1 0 0 + +however, position command is active only if before it the flag is set + +/testhadr/DefaultBeamPosition false SCORING @@ -80,6 +90,13 @@ The choice of the physics is provided by the UI command: /testhadr/Physics QGSP +The command + +/testhadr/Physics PHYSLIST + +allows allows to download a physics configuration defined by an environment +variable PHYSLIST. + To see the list of available configurations one can use /testhadr/ListPhysics @@ -145,6 +162,8 @@ histograms using UI command: The following types are available: hbook, root, aida. They will be stored in the file "name.hbook", "name.root", or "name.aida". +If the environment variable HISTODIR is defined, files are stored in this +subdirectory. To show the contence of a histogram ID=i the commands may be applied: diff --git a/examples/extended/hadronic/Hadr01/hadr01.cc b/examples/extended/hadronic/Hadr01/hadr01.cc index 1906871361..28e1f86819 100644 --- a/examples/extended/hadronic/Hadr01/hadr01.cc +++ b/examples/extended/hadronic/Hadr01/hadr01.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: hadr01.cc,v 1.5 2006/06/29 17:23:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: hadr01.cc,v 1.9 2006/11/24 16:48:57 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------- // GEANT4 hadr01 @@ -51,6 +51,8 @@ #include "DetectorConstruction.hh" #include "PhysicsList.hh" +#include "QBBC.hh" +#include "QGSP.hh" #include "PrimaryGeneratorAction.hh" #include "RunAction.hh" @@ -71,7 +73,11 @@ int main(int argc,char** argv) { //set mandatory initialization classes runManager->SetUserInitialization(new DetectorConstruction()); + runManager->SetUserInitialization(new PhysicsList); + //runManager->SetUserInitialization(new QBBC(1,"QBEC_HP")); + //runManager->SetUserInitialization(new QGSP); + runManager->SetUserAction(new PrimaryGeneratorAction()); //set user action classes diff --git a/examples/extended/hadronic/Hadr01/hadr01.out b/examples/extended/hadronic/Hadr01/hadr01.out index 2c2e99e88f..065563a49c 100644 --- a/examples/extended/hadronic/Hadr01/hadr01.out +++ b/examples/extended/hadronic/Hadr01/hadr01.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version Name: geant4-08-00-ref-02 (10-February-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -20,7 +20,7 @@ PhysicsList::AddPhysicsList: # /run/initialize -### Target consist of 100 disks of R(mm)= 10 disks of Width(mm)= 1 of G4_Al ### +### Target consist of 100 of G4_Al disks with R(mm)= 10 Width(mm)= 1 Total Length(mm)= 100 ### ***** Table : Nb of materials = 2 ***** @@ -28,13 +28,45 @@ PhysicsList::AddPhysicsList: ---> Element: Al (Al) Z = 13.0 N = 27.0 A = 26.98 g/mole ---> Isotope: Al Z = 13 N = 27 A = 26.98 g/mole abundance: 100.00 % ElmMassFraction: 100.00 % ElmAbundance 100.00 % - Material: G4_Galactic density: 0.000 kg/m3 temperature: 2.73 K pressure: 0.00 atm RadLength: 204311173.221 pc + Material: G4_Galactic density: 0.000 mg/cm3 temperature: 2.73 K pressure: 0.00 atm RadLength: 204311173.221 pc ---> Element: H (H) Z = 1.0 N = 1.0 A = 1.01 g/mole ---> Isotope: H Z = 1 N = 1 A = 1.01 g/mole abundance: 99.99 % ---> Isotope: H Z = 1 N = 2 A = 2.01 g/mole abundance: 0.01 % ElmMassFraction: 100.00 % ElmAbundance 100.00 % +### G4standard instantiates ionIoni for GenericIon +### G4standard instantiates ionIoni for He3 +### G4standard instantiates ionIoni for alpha +### Adding Neutron tracking cut for neutron +### cut value is 10 microseconds =========================================================================================== + + Hadronic Processes for anti_neutron + hElastic Models: elastic Emin(GeV)= 0 Emax(GeV)= 100000 + + Hadronic Processes for anti_proton + hElastic Models: elastic Emin(GeV)= 0 Emax(GeV)= 100000 + + Hadronic Processes for kaon+ + hElastic Models: elastic Emin(GeV)= 0 Emax(GeV)= 100000 + + Hadronic Processes for kaon- + hElastic Models: elastic Emin(GeV)= 0 Emax(GeV)= 100000 + + Hadronic Processes for lambda + hElastic Models: elastic Emin(GeV)= 0 Emax(GeV)= 100000 + + Hadronic Processes for neutron + hElastic Models: elastic Emin(GeV)= 0 Emax(GeV)= 100000 + + Hadronic Processes for pi+ + hElastic Models: elastic Emin(GeV)= 0 Emax(GeV)= 100000 + + Hadronic Processes for pi- + hElastic Models: elastic Emin(GeV)= 0 Emax(GeV)= 100000 + + Hadronic Processes for proton + hElastic Models: elastic Emin(GeV)= 0 Emax(GeV)= 100000 =========================================================================================== PhysicsList::SetCuts:CutLength : 1 mm # @@ -42,134 +74,7 @@ PhysicsList::SetCuts:CutLength : 1 mm /gun/energy 3. GeV /run/beamOn 100 -phot: Total cross sections from Sandia parametrisation. - -compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV - Sampling according Klein-Nishina model - tables are built for gamma - Lambda tables from 100 eV to 100 GeV in 90 bins. - -conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model - tables are built for gamma - Lambda tables from 1.022 MeV to 100 GeV in 100 bins. - -msc: Model variant of multiple scattering for e- - Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 - -eIoni: tables are built for e- - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. - Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV. - Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 - -eBrem: tables are built for e- - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. - Total cross sections from a parametrisation based on the EEDL data library. - Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. - -eIoni: tables are built for e+ - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. - Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV. - Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 - -eBrem: tables are built for e+ - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. - Total cross sections from a parametrisation based on the EEDL data library. - Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. - -annihil: Heilter model of formula of annihilation into 2 photons - tables are built for e+ - Lambda tables from 100 eV to 100 TeV in 120 bins. - -msc: Model variant of multiple scattering for proton - Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 - -hIoni: tables are built for proton - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. - Scaling relation is used to proton dE/dx and range - Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for protons below. - Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 - -msc: Model variant of multiple scattering for GenericIon - Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 - -ionIoni: tables are built for GenericIon - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. - Scaling relation is used to proton dE/dx and range - Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for alpha particles below. - Stopping Power data for 8 ion/material pairs are used. - Step function: finalRange(mm)= 0.1, dRoverRange= 0.1, integral: 1 - -hIoni: tables are built for anti_proton - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. - Scaling relation is used to proton dE/dx and range - Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for protons below. - Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 - -msc: Model variant of multiple scattering for mu+ - Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 - -muIoni: tables are built for mu+ - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. - Bether-Bloch model for E > 0.2 MeV, parametrisation of Bragg peak below, - radiative corrections for E > 1 GeV - Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 - -muBrems: tables are built for mu+ - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. - Parametrised model - -muPairProd: tables are built for mu+ - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. - Parametrised model - -muIoni: tables are built for mu- - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. - Bether-Bloch model for E > 0.2 MeV, parametrisation of Bragg peak below, - radiative corrections for E > 1 GeV - Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 - -muBrems: tables are built for mu- - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. - Parametrised model - -muPairProd: tables are built for mu- - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. - Parametrised model - -hIoni: tables are built for pi+ - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. - Scaling relation is used to proton dE/dx and range - Bether-Bloch model for Escaled > 0.297504 MeV, ICRU49 parametrisation for protons below. - Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 - -msc: Model variant of multiple scattering for pi- - Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 - -hIoni: tables are built for pi- - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. - Scaling relation is used to proton dE/dx and range - Bether-Bloch model for Escaled > 0.297504 MeV, ICRU49 parametrisation for protons below. - Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 +G4UHadronElasticProcess for neutron PDGcode= 2112 Elow(MeV)= 19 Elowest(eV)= 0 ========= Table of registered couples ============================== @@ -204,32 +109,32 @@ EventAction: Event # 90 started Run terminated. Run Summary Number of events processed : 100 - User=1.32s Real=1.33s Sys=0s + User=4.06s Real=4.98s Sys=0.67s RunAction: End of run actions are started HistoManager: End of run actions are started ======================================================== Beam particle proton Beam Energy(MeV) 3000 Number of events 100 -Average number of steps 618.4 -Average number of gamma 1.88 -Average number of e- 4.02 -Average number of e+ 0.01 -Average number of neutrons 1 -Average number of protons 1.15 +Average number of steps 300.5 +Average number of gamma 2.53 +Average number of e- 4.52 +Average number of e+ 0.06 +Average number of neutrons 1.06 +Average number of protons 1.12 Average number of antiprotons 0 -Average number of pi+ & pi- 0.26 -Average number of pi0 0.12 +Average number of pi+ & pi- 0.21 +Average number of pi0 0.16 Average number of kaons 0 Average number of muons 0 -Average number of deuterons+tritons 0.1 +Average number of deuterons+tritons 0.08 Average number of He3+alpha 0.18 -Average number of ions 0.45 -Average number of forward neutrons 0.54 -Average number of reflected neutrons 0.4 -Average number of backword neutrons 0 -Average number of proton leak 2.32 -Average number of pion leak 1 +Average number of ions 0.39 +Average number of forward neutrons 0.06 +Average number of reflected neutrons 0.02 +Average number of leaked neutrons 0.96 +Average number of proton leak 0.52 +Average number of pion leak 0.18 ======================================================== # diff --git a/examples/extended/hadronic/Hadr01/include/CheckVolumeSD.hh b/examples/extended/hadronic/Hadr01/include/CheckVolumeSD.hh index 4a13301662..30e79efea8 100755 --- a/examples/extended/hadronic/Hadr01/include/CheckVolumeSD.hh +++ b/examples/extended/hadronic/Hadr01/include/CheckVolumeSD.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: CheckVolumeSD.hh,v 1.3 2006/06/29 17:23:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ///////////////////////////////////////////////////////////////////////// // diff --git a/examples/extended/hadronic/Hadr01/include/DetectorConstruction.hh b/examples/extended/hadronic/Hadr01/include/DetectorConstruction.hh index dc4006dc55..e31230748a 100644 --- a/examples/extended/hadronic/Hadr01/include/DetectorConstruction.hh +++ b/examples/extended/hadronic/Hadr01/include/DetectorConstruction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: DetectorConstruction.hh,v 1.4 2006/06/29 17:23:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ///////////////////////////////////////////////////////////////////////// // diff --git a/examples/extended/hadronic/Hadr01/include/DetectorMessenger.hh b/examples/extended/hadronic/Hadr01/include/DetectorMessenger.hh index a4c8826ce2..f615f554ff 100644 --- a/examples/extended/hadronic/Hadr01/include/DetectorMessenger.hh +++ b/examples/extended/hadronic/Hadr01/include/DetectorMessenger.hh @@ -23,10 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// -// $Id: DetectorMessenger.hh,v 1.3 2006/06/29 17:23:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// +// $Id: DetectorMessenger.hh,v 1.6 2006/11/15 14:58:09 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // ///////////////////////////////////////////////////////////////////////// // @@ -36,6 +34,7 @@ // // Modified: // 04.06.2006 Adoptation of hadr01 (V.Ivanchenko) +// 16.11.2006 Add beamCmd (V.Ivanchenko) // //////////////////////////////////////////////////////////////////////// // @@ -77,6 +76,7 @@ private: G4UIcmdWithAnInteger* binCmd; G4UIcmdWithAnInteger* nOfAbsCmd; G4UIcmdWithAnInteger* verbCmd; + G4UIcmdWithABool* beamCmd; G4UIcmdWithoutParameter* updateCmd; }; diff --git a/examples/extended/hadronic/Hadr01/include/EventAction.hh b/examples/extended/hadronic/Hadr01/include/EventAction.hh index cb4bf5f589..f0da3acf47 100755 --- a/examples/extended/hadronic/Hadr01/include/EventAction.hh +++ b/examples/extended/hadronic/Hadr01/include/EventAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventAction.hh,v 1.3 2006/06/29 17:23:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ///////////////////////////////////////////////////////////////////////// // diff --git a/examples/extended/hadronic/Hadr01/include/EventActionMessenger.hh b/examples/extended/hadronic/Hadr01/include/EventActionMessenger.hh index 4c21ab7cc8..4ce719a8be 100644 --- a/examples/extended/hadronic/Hadr01/include/EventActionMessenger.hh +++ b/examples/extended/hadronic/Hadr01/include/EventActionMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventActionMessenger.hh,v 1.3 2006/06/29 17:23:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ///////////////////////////////////////////////////////////////////////// // diff --git a/examples/extended/hadronic/Hadr01/include/Histo.hh b/examples/extended/hadronic/Hadr01/include/Histo.hh index c7f0d517b5..7d12414c80 100644 --- a/examples/extended/hadronic/Hadr01/include/Histo.hh +++ b/examples/extended/hadronic/Hadr01/include/Histo.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: Histo.hh,v 1.3 2006/06/29 17:23:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: Histo.hh,v 1.4 2006/08/11 14:38:11 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef Histo_h #define Histo_h 1 diff --git a/examples/extended/hadronic/Hadr01/include/HistoManager.hh b/examples/extended/hadronic/Hadr01/include/HistoManager.hh index 9cf857fbb5..2c31d661e6 100644 --- a/examples/extended/hadronic/Hadr01/include/HistoManager.hh +++ b/examples/extended/hadronic/Hadr01/include/HistoManager.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HistoManager.hh,v 1.3 2006/06/29 17:23:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HistoManager.hh,v 1.7 2006/11/15 14:58:09 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -41,6 +41,8 @@ // // Modified: // 04.06.2006 Adoptation of hadr01 (V.Ivanchenko) +// 03.10.2006 Add csFlag (V.Ivanchenko) +// 16.11.2006 Add beamFlag (V.Ivanchenko) // //---------------------------------------------------------------------------- // @@ -49,6 +51,8 @@ #define HistoManager_h 1 #include "globals.hh" +#include "G4Material.hh" +#include "G4Element.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... @@ -75,24 +79,31 @@ public: void BeginOfRun(); void EndOfRun(); + void Fill(G4int id, G4double x, G4double w); void ScoreNewTrack(const G4Track*); void AddTargetStep(const G4Step*); void AddLeakingParticle(const G4Track*); - void SetTargetLength(G4double val) {length = val;}; - void SetNumberOfSlices(G4int val) {nSlices = val;}; - void SetNumberOfBinsE(G4int val) {nBinsE = val;}; + void SetTargetLength(G4double val) {length = val;}; + void SetNumberOfSlices(G4int val) {nSlices = val;}; + void SetNumberOfBinsE(G4int val) {nBinsE = val;}; - G4double Length() const {return length;}; - G4int NumberOfSlices() const {return nSlices;}; + G4double Length() const {return length;}; + G4int NumberOfSlices() const {return nSlices;}; void SetVerbose(G4int val); - G4int GetVerbose() const {return verbose;}; + G4int GetVerbose() const {return verbose;}; - G4double CurrentKinEnergy() {return currentKinEnergy;}; - const G4ParticleDefinition* CurrentDefinition() - {return currentDef;}; + void SetDefaultBeamPositionFlag(G4bool f) {beamFlag = f;}; + G4bool DefaultBeamPosition() const {return beamFlag;}; + + void SetTargetMaterial(const G4Material* mat); + const G4Material* TargetMaterial() const {return material;}; + const G4Element* TargetElement() const {return elm;}; + + G4double CurrentKinEnergy() {return currentKinEnergy;}; + const G4ParticleDefinition* CurrentParticle() {return currentDef;}; private: @@ -101,16 +112,18 @@ private: const G4ParticleDefinition* primaryDef; const G4ParticleDefinition* currentDef; const G4ParticleDefinition* neutron; - G4double currentKinEnergy; - - G4int verbose; - G4int nBinsE; - G4int nSlices; + const G4Material* material; + G4Element* elm; G4double beamEnergy; G4double length; G4double absZ0; G4double primaryKineticEnergy; + G4double currentKinEnergy; + + G4int verbose; + G4int nBinsE; + G4int nSlices; G4int n_evt; G4int n_elec; @@ -134,6 +147,8 @@ private: G4int n_step; G4int nHisto; + G4bool beamFlag; + Histo* histo; }; diff --git a/examples/extended/hadronic/Hadr01/include/HistoMessenger.hh b/examples/extended/hadronic/Hadr01/include/HistoMessenger.hh index 8e2f2fc3f3..47b2c41961 100644 --- a/examples/extended/hadronic/Hadr01/include/HistoMessenger.hh +++ b/examples/extended/hadronic/Hadr01/include/HistoMessenger.hh @@ -23,9 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// -// $Id: HistoMessenger.hh,v 1.4 2006/06/29 17:23:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HistoMessenger.hh,v 1.5 2006/11/15 14:58:10 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // ///////////////////////////////////////////////////////////////////////// // diff --git a/examples/extended/hadronic/Hadr01/include/PhysicsList.hh b/examples/extended/hadronic/Hadr01/include/PhysicsList.hh index 2374db1602..4a05b024b5 100755 --- a/examples/extended/hadronic/Hadr01/include/PhysicsList.hh +++ b/examples/extended/hadronic/Hadr01/include/PhysicsList.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: PhysicsList.hh,v 1.3 2006/06/29 17:23:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysicsList.hh,v 1.5 2006/08/28 13:54:13 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // ///////////////////////////////////////////////////////////////////////// // @@ -70,7 +70,7 @@ public: private: - void SetStandardList(G4bool); + void SetStandardList(G4bool flagHP = false, G4bool glauber = false); G4double cutForGamma; G4double cutForElectron; @@ -81,6 +81,7 @@ private: std::vector hadronPhys; PhysicsListMessenger* pMessenger; + G4bool dump; }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/hadronic/Hadr01/include/PhysicsListMessenger.hh b/examples/extended/hadronic/Hadr01/include/PhysicsListMessenger.hh index c4e16d356a..268d94ef19 100755 --- a/examples/extended/hadronic/Hadr01/include/PhysicsListMessenger.hh +++ b/examples/extended/hadronic/Hadr01/include/PhysicsListMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: PhysicsListMessenger.hh,v 1.3 2006/06/29 17:23:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ///////////////////////////////////////////////////////////////////////// diff --git a/examples/extended/hadronic/Hadr01/include/PrimaryGeneratorAction.hh b/examples/extended/hadronic/Hadr01/include/PrimaryGeneratorAction.hh index 2e2af2b75b..2a05ef187b 100644 --- a/examples/extended/hadronic/Hadr01/include/PrimaryGeneratorAction.hh +++ b/examples/extended/hadronic/Hadr01/include/PrimaryGeneratorAction.hh @@ -25,7 +25,7 @@ // // // $Id: PrimaryGeneratorAction.hh,v 1.3 2006/06/29 17:23:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ///////////////////////////////////////////////////////////////////////// diff --git a/examples/extended/hadronic/Hadr01/include/StackingAction.hh b/examples/extended/hadronic/Hadr01/include/StackingAction.hh index d030b3e1e1..dd84fee543 100644 --- a/examples/extended/hadronic/Hadr01/include/StackingAction.hh +++ b/examples/extended/hadronic/Hadr01/include/StackingAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StackingAction.hh,v 1.3 2006/06/29 17:23:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ///////////////////////////////////////////////////////////////////////// // diff --git a/examples/extended/hadronic/Hadr01/include/StackingMessenger.hh b/examples/extended/hadronic/Hadr01/include/StackingMessenger.hh index 7cbe70557b..9bb5dd2be8 100644 --- a/examples/extended/hadronic/Hadr01/include/StackingMessenger.hh +++ b/examples/extended/hadronic/Hadr01/include/StackingMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StackingMessenger.hh,v 1.3 2006/06/29 17:23:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ///////////////////////////////////////////////////////////////////////// diff --git a/examples/extended/hadronic/Hadr01/include/TargetSD.hh b/examples/extended/hadronic/Hadr01/include/TargetSD.hh index d04388948e..2423eb649b 100755 --- a/examples/extended/hadronic/Hadr01/include/TargetSD.hh +++ b/examples/extended/hadronic/Hadr01/include/TargetSD.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TargetSD.hh,v 1.4 2006/06/29 17:24:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ///////////////////////////////////////////////////////////////////////// // diff --git a/examples/extended/hadronic/Hadr01/p_pb.in b/examples/extended/hadronic/Hadr01/p_pb.in index 95cb181814..6b0fb41f91 100644 --- a/examples/extended/hadronic/Hadr01/p_pb.in +++ b/examples/extended/hadronic/Hadr01/p_pb.in @@ -1,3 +1,4 @@ +#/bin/csh #================================================ # Macro file for hadr01 # 06.06.2006 V.Ivanchneko @@ -12,24 +13,14 @@ /testhadr/NumberDivZ 100 /testhadr/PrintModulo 10 # -/testhadr/CutsAll 1 mm -#/testhadr/Physics QGSP_BERT -#/testhadr/Physics QGSP -/testhadr/Physics QGSP_EMV -#/testhadr/Physics QGSC -#/testhadr/Physics QBBC -#/testhadr/Physics QQGSP -#/testhadr/Physics QQGSP_EL -#/testhadr/Physics QQGSP_NEL -#/testhadr/Physics QQGSP_NION -#/testhadr/Physics LHEP -#/testhadr/Physics em72 +/testhadr/CutsAll 0.7 mm +/testhadr/Physics PHYSLIST # /run/initialize #/process/eLoss/MscStepLimit 0.2 false -/testhadr/HistoName p_pb_20gev_qgsp_emv +/testhadr/HistoName p_pb_20GeV # /gun/particle proton /gun/energy 20. GeV -/run/beamOn 100 +/run/beamOn 1000 # diff --git a/examples/extended/hadronic/Hadr01/run.csh b/examples/extended/hadronic/Hadr01/run.csh new file mode 100644 index 0000000000..ee941b7677 --- /dev/null +++ b/examples/extended/hadronic/Hadr01/run.csh @@ -0,0 +1,31 @@ +#/bin/csh + +setenv HISTODIR v20061123 +mkdir -p $HISTODIR + +setenv PHYSLIST LHEP +$G4MY/hadr01 p_pb.in >& $HISTODIR/$PHYSLIST.out + +setenv PHYSLIST QGSP +$G4MY/hadr01 p_pb.in >& $HISTODIR/$PHYSLIST.out + +setenv PHYSLIST QGSP_EMV +$G4MY/hadr01 p_pb.in >& $HISTODIR/$PHYSLIST.out + +#setenv PHYSLIST QGSP_EMX +#$G4MY/hadr01 p_pb.in >& $HISTODIR/$PHYSLIST.out + +#setenv PHYSLIST QGSC +#$G4MY/hadr01 p_pb.in >& $HISTODIR/$PHYSLIST.out + +#setenv PHYSLIST QGSP_BERT +#$G4MY/hadr01 p_pb.in >& $HISTODIR/$PHYSLIST.out + +#setenv PHYSLIST QGSP_BIC +#$G4MY/hadr01 p_pb.in >& $HISTODIR/$PHYSLIST.out + +#setenv PHYSLIST QBBC +#$G4MY/hadr01 p_pb.in >& $HISTODIR/$PHYSLIST.out + +echo "Done!" +# diff --git a/examples/extended/hadronic/Hadr01/src/CheckVolumeSD.cc b/examples/extended/hadronic/Hadr01/src/CheckVolumeSD.cc index 19104970cb..988f7452ed 100755 --- a/examples/extended/hadronic/Hadr01/src/CheckVolumeSD.cc +++ b/examples/extended/hadronic/Hadr01/src/CheckVolumeSD.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: CheckVolumeSD.cc,v 1.3 2006/06/29 17:24:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ///////////////////////////////////////////////////////////////////////// // diff --git a/examples/extended/hadronic/Hadr01/src/DetectorConstruction.cc b/examples/extended/hadronic/Hadr01/src/DetectorConstruction.cc index 89c08d782f..8148474c41 100644 --- a/examples/extended/hadronic/Hadr01/src/DetectorConstruction.cc +++ b/examples/extended/hadronic/Hadr01/src/DetectorConstruction.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: DetectorConstruction.cc,v 1.5 2006/06/29 17:24:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: DetectorConstruction.cc,v 1.6 2006/10/04 09:56:03 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // ///////////////////////////////////////////////////////////////////////// // @@ -171,6 +171,7 @@ void DetectorConstruction::SetTargetMaterial(const G4String& mat) G4Material* material = G4NistManager::Instance()->FindOrBuildMaterial(mat); if (material && material != targetMaterial) { + HistoManager::GetPointer()->SetTargetMaterial(material); targetMaterial = material; if(logicTarget) logicTarget->SetMaterial(targetMaterial); G4RunManager::GetRunManager()->PhysicsHasBeenModified(); diff --git a/examples/extended/hadronic/Hadr01/src/DetectorMessenger.cc b/examples/extended/hadronic/Hadr01/src/DetectorMessenger.cc index ea65457eea..80169eec84 100644 --- a/examples/extended/hadronic/Hadr01/src/DetectorMessenger.cc +++ b/examples/extended/hadronic/Hadr01/src/DetectorMessenger.cc @@ -23,10 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// -// $Id: DetectorMessenger.cc,v 1.3 2006/06/29 17:24:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// +// $Id: DetectorMessenger.cc,v 1.6 2006/11/15 14:58:10 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // ///////////////////////////////////////////////////////////////////////// // @@ -36,6 +34,7 @@ // // Modified: // 04.06.2006 Adoptation of hadr01 (V.Ivanchenko) +// 16.11.2006 Add beamCmd (V.Ivanchenko) // //////////////////////////////////////////////////////////////////////// // @@ -100,6 +99,9 @@ DetectorMessenger::DetectorMessenger(DetectorConstruction * Det) updateCmd->SetGuidance("if you changed geometrical value(s)"); updateCmd->AvailableForStates(G4State_PreInit,G4State_Idle); + beamCmd = new G4UIcmdWithABool("/testhadr/DefaultBeamPosition",this); + beamCmd->SetGuidance("show inelastic and elastic cross sections"); + verbCmd = new G4UIcmdWithAnInteger("/testhadr/Verbose",this); verbCmd->SetGuidance("Set verbose for "); verbCmd->SetParameterName("verb",false); @@ -117,6 +119,7 @@ DetectorMessenger::~DetectorMessenger() delete nOfAbsCmd; delete updateCmd; delete testDir; + delete beamCmd; delete verbCmd; } @@ -124,29 +127,24 @@ DetectorMessenger::~DetectorMessenger() void DetectorMessenger::SetNewValue(G4UIcommand* command, G4String newValue) { - + HistoManager* h = HistoManager::GetPointer(); if( command == matCmd ) Detector->SetTargetMaterial(newValue); - - if( command == mat1Cmd ) + else if( command == mat1Cmd ) Detector->SetWorldMaterial(newValue); - - if( command == rCmd ) + else if( command == rCmd ) Detector->SetTargetRadius(rCmd->GetNewDoubleValue(newValue)); - - if( command == lCmd ) - HistoManager::GetPointer()->SetTargetLength(lCmd->GetNewDoubleValue(newValue)); - - if( command == nOfAbsCmd ) - HistoManager::GetPointer()->SetNumberOfSlices(nOfAbsCmd->GetNewIntValue(newValue)); - - if( command == binCmd ) - HistoManager::GetPointer()->SetNumberOfBinsE(binCmd->GetNewIntValue(newValue)); - - if( command == verbCmd ) - HistoManager::GetPointer()->SetVerbose(verbCmd->GetNewIntValue(newValue)); - - if( command == updateCmd ) + else if( command == lCmd ) + h->SetTargetLength(lCmd->GetNewDoubleValue(newValue)); + else if( command == nOfAbsCmd ) + h->SetNumberOfSlices(nOfAbsCmd->GetNewIntValue(newValue)); + else if( command == binCmd ) + h->SetNumberOfBinsE(binCmd->GetNewIntValue(newValue)); + else if( command == verbCmd ) + h->SetVerbose(verbCmd->GetNewIntValue(newValue)); + else if (command == beamCmd) + h->SetDefaultBeamPositionFlag(beamCmd->GetNewBoolValue(newValue)); + else if( command == updateCmd ) Detector->UpdateGeometry(); } diff --git a/examples/extended/hadronic/Hadr01/src/EventAction.cc b/examples/extended/hadronic/Hadr01/src/EventAction.cc index 5018598006..dc6c4bb99e 100755 --- a/examples/extended/hadronic/Hadr01/src/EventAction.cc +++ b/examples/extended/hadronic/Hadr01/src/EventAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventAction.cc,v 1.3 2006/06/29 17:24:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ///////////////////////////////////////////////////////////////////////// // diff --git a/examples/extended/hadronic/Hadr01/src/EventActionMessenger.cc b/examples/extended/hadronic/Hadr01/src/EventActionMessenger.cc index 563367d6de..9e03ec5385 100644 --- a/examples/extended/hadronic/Hadr01/src/EventActionMessenger.cc +++ b/examples/extended/hadronic/Hadr01/src/EventActionMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventActionMessenger.cc,v 1.3 2006/06/29 17:24:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ///////////////////////////////////////////////////////////////////////// // diff --git a/examples/extended/hadronic/Hadr01/src/Histo.cc b/examples/extended/hadronic/Hadr01/src/Histo.cc index ccc264a81e..b507bdf8d4 100644 --- a/examples/extended/hadronic/Hadr01/src/Histo.cc +++ b/examples/extended/hadronic/Hadr01/src/Histo.cc @@ -96,8 +96,16 @@ void Histo::book() if(verbose>0) G4cout<<"Histo books tree factory ......... "<create(name, histType, false, true, option); G4cout << "Histo: tree store : " << tree->storeName() << G4endl; @@ -214,7 +222,7 @@ void Histo::fill(G4int i, G4double x, G4double w) { if(verbose > 1) G4cout << "fill histogram: #" << i << " at x= " << x - << " weight= " << w + << " weight= " << w << " unit= " << unit[i] << G4endl; #ifdef G4ANALYSIS_USE if(i>=0 && iadd1D("1", - "Energy deposition (MeV/mm/event) in the target",nSlices,0.0,length/mm,MeV/mm); - - histo->add1D("2", - "Log10 Energy (MeV) of gammas",nBinsE,-5.,5.,1.0); - - histo->add1D("3", - "Log10 Energy (MeV) of electrons",nBinsE,-5.,5.,1.0); - - histo->add1D("4", - "Log10 Energy (MeV) of positrons",nBinsE,-5.,5.,1.0); - - histo->add1D("5", - "Log10 Energy (MeV) of protons",nBinsE,-5.,5.,1.0); - - histo->add1D("6", - "Log10 Energy (MeV) of neutrons",nBinsE,-5.,5.,1.0); - - histo->add1D("7", - "Log10 Energy (MeV) of charged pions",nBinsE,-4.,6.,1.0); - - histo->add1D("8", - "Log10 Energy (MeV) of pi0",nBinsE,-4.,6.,1.0); - - histo->add1D("9", - "Log10 Energy (MeV) of charged kaons",nBinsE,-4.,6.,1.0); - - histo->add1D("10", - "Log10 Energy (MeV) of neutral kaons",nBinsE,-4.,6.,1.0); - - histo->add1D("11", - "Log10 Energy (MeV) of deuterons and tritons",nBinsE,-5.,5.,1.0); - - histo->add1D("12", - "Log10 Energy (MeV) of He3 and alpha",nBinsE,-5.,5.,1.0); - - histo->add1D("13", - "Log10 Energy (MeV) of Generic Ions",nBinsE,-5.,5.,1.0); - - histo->add1D("14", - "Log10 Energy (MeV) of muons",nBinsE,-4.,6.,1.0); - - histo->add1D("15", - "log10 Energy (MeV) of side-leaked neutrons",nBinsE,-5.,5.,1.0); - - histo->add1D("16", - "log10 Energy (MeV) of forward-leaked neutrons",nBinsE,-5.,5.,1.0); - - histo->add1D("17", - "log10 Energy (MeV) of backward-leaked neutrons",nBinsE,-5.,5.,1.0); - - histo->add1D("18", - "log10 Energy (MeV) of leaking protons",nBinsE,-4.,6.,1.0); - - histo->add1D("19", - "log10 Energy (MeV) of leaking charged pions",nBinsE,-4.,6.,1.0); - + histo->add1D("1","Energy deposition (MeV/mm/event) in the target", + nSlices,0.0,length/mm,MeV/mm); + histo->add1D("2","Log10 Energy (MeV) of gammas",nBinsE,-5.,5.,1.0); + histo->add1D("3","Log10 Energy (MeV) of electrons",nBinsE,-5.,5.,1.0); + histo->add1D("4","Log10 Energy (MeV) of positrons",nBinsE,-5.,5.,1.0); + histo->add1D("5","Log10 Energy (MeV) of protons",nBinsE,-5.,5.,1.0); + histo->add1D("6","Log10 Energy (MeV) of neutrons",nBinsE,-5.,5.,1.0); + histo->add1D("7","Log10 Energy (MeV) of charged pions",nBinsE,-4.,6.,1.0); + histo->add1D("8","Log10 Energy (MeV) of pi0",nBinsE,-4.,6.,1.0); + histo->add1D("9","Log10 Energy (MeV) of charged kaons",nBinsE,-4.,6.,1.0); + histo->add1D("10","Log10 Energy (MeV) of neutral kaons",nBinsE,-4.,6.,1.0); + histo->add1D("11","Log10 Energy (MeV) of deuterons and tritons",nBinsE,-5.,5.,1.0); + histo->add1D("12","Log10 Energy (MeV) of He3 and alpha",nBinsE,-5.,5.,1.0); + histo->add1D("13","Log10 Energy (MeV) of Generic Ions",nBinsE,-5.,5.,1.0); + histo->add1D("14","Log10 Energy (MeV) of muons",nBinsE,-4.,6.,1.0); + histo->add1D("15","log10 Energy (MeV) of side-leaked neutrons",nBinsE,-5.,5.,1.0); + histo->add1D("16","log10 Energy (MeV) of forward-leaked neutrons",nBinsE,-5.,5.,1.0); + histo->add1D("17","log10 Energy (MeV) of backward-leaked neutrons",nBinsE,-5.,5.,1.0); + histo->add1D("18","log10 Energy (MeV) of leaking protons",nBinsE,-4.,6.,1.0); + histo->add1D("19","log10 Energy (MeV) of leaking charged pions",nBinsE,-4.,6.,1.0); + histo->add1D("20","Log10 Energy (MeV) of pi+",nBinsE,-4.,6.,1.0); + histo->add1D("21","Log10 Energy (MeV) of pi-",nBinsE,-4.,6.,1.0); } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... @@ -318,9 +287,16 @@ void HistoManager::ScoreNewTrack(const G4Track* track) histo->fill(5,e,1.0); } else if ( pd == G4AntiProton::AntiProton()) { n_aproton++; - } else if ( pd == G4PionPlus::PionPlus() || pd == G4PionMinus::PionMinus()) { + } else if ( pd == G4PionPlus::PionPlus() ) { n_cpions++; histo->fill(6,e,1.0); + histo->fill(19,e,1.0); + + } else if ( pd == G4PionMinus::PionMinus()) { + n_cpions++; + histo->fill(6,e,1.0); + histo->fill(20,e,1.0); + } else if ( pd == G4PionZero::PionZero()) { n_pi0++; histo->fill(7,e,1.0); @@ -431,3 +407,20 @@ void HistoManager::SetVerbose(G4int val) //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... +void HistoManager::SetTargetMaterial(const G4Material* mat) +{ + if(mat) { + material = mat; + elm = (*(material->GetElementVector()))[0]; + } +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +void HistoManager::Fill(G4int id, G4double x, G4double w) +{ + histo->fill(id, x, w); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + diff --git a/examples/extended/hadronic/Hadr01/src/HistoMessenger.cc b/examples/extended/hadronic/Hadr01/src/HistoMessenger.cc index 3ac5e86450..b795982e38 100644 --- a/examples/extended/hadronic/Hadr01/src/HistoMessenger.cc +++ b/examples/extended/hadronic/Hadr01/src/HistoMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: HistoMessenger.cc,v 1.5 2006/06/29 17:24:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ///////////////////////////////////////////////////////////////////////// // diff --git a/examples/extended/hadronic/Hadr01/src/PhysicsList.cc b/examples/extended/hadronic/Hadr01/src/PhysicsList.cc index 811525ed8b..6966a2a802 100755 --- a/examples/extended/hadronic/Hadr01/src/PhysicsList.cc +++ b/examples/extended/hadronic/Hadr01/src/PhysicsList.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: PhysicsList.cc,v 1.11 2006/06/29 17:24:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysicsList.cc,v 1.17 2006/11/24 16:48:57 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // ///////////////////////////////////////////////////////////////////////// // @@ -47,6 +47,9 @@ #include "G4EmStandardPhysics71.hh" #include "G4EmStandardPhysics.hh" #include "G4HadronElasticPhysics.hh" +#include "G4HadronQElasticPhysics.hh" +#include "G4HadronHElasticPhysics.hh" +#include "G4NeutronTrackingCut.hh" #include "G4QStoppingPhysics.hh" #include "G4LHEPStoppingPhysics.hh" #include "G4IonBinaryCascadePhysics.hh" @@ -87,6 +90,7 @@ PhysicsList::PhysicsList() : G4VModularPhysicsList() cutForGamma = defaultCutValue; cutForElectron = defaultCutValue; cutForPositron = defaultCutValue; + dump = false; pMessenger = new PhysicsListMessenger(this); @@ -127,7 +131,7 @@ void PhysicsList::ConstructProcess() hadronPhys[i]->ConstructProcess(); } - G4HadronProcessStore::Instance()->Dump(1); + if(dump) G4HadronProcessStore::Instance()->Dump(1); } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... @@ -145,52 +149,25 @@ void PhysicsList::AddPhysicsList(const G4String& name) hadronPhys.push_back( new HadronPhysicsLHEP()); hadronPhys.push_back( new G4IonPhysics("ion")); - } else if (name == "em_fast") { + } else if (name == "G4standard_exp") { delete emPhysicsList; emPhysicsList = new G4EmStandardPhysics72("standard"); - } else if (name == "em_71") { + } else if (name == "G4standard_fast") { delete emPhysicsList; emPhysicsList = new G4EmStandardPhysics71("standard"); - } else if (name == "LHEP_BERT") { - - hadronPhys.push_back( new G4EmExtraPhysics("gamma_nuc")); - hadronPhys.push_back( new G4HadronElasticPhysics("elastic", - verboseLevel,false)); - hadronPhys.push_back( new HadronPhysicsLHEP_BERT()); - hadronPhys.push_back( new G4QStoppingPhysics("stopping")); - hadronPhys.push_back( new G4IonPhysics("ion")); - - } else if (name == "LHEP_BERT_HP") { - - hadronPhys.push_back( new G4EmExtraPhysics("gamma_nuc")); - hadronPhys.push_back( new G4HadronElasticPhysics("elastic", - verboseLevel,false)); - hadronPhys.push_back( new HadronPhysicsLHEP_BERT_HP()); - hadronPhys.push_back( new G4QStoppingPhysics("stopping")); - hadronPhys.push_back( new G4IonPhysics("ion")); - - } else if (name == "LHEP_BIC") { - - SetStandardList(false); - hadronPhys.push_back( new HadronPhysicsLHEP_BIC()); - - } else if (name == "LHEP_BIC_HP") { - - SetStandardList(true); - hadronPhys.push_back( new HadronPhysicsLHEP_BIC_HP()); - } else if (name == "QGSC") { hadronPhys.push_back( new G4EmExtraPhysics("gamma_nuc")); - hadronPhys.push_back( new G4HadronElasticPhysics("elastic", - verboseLevel,false)); + hadronPhys.push_back( new G4HadronQElasticPhysics("QElastic",verboseLevel)); hadronPhys.push_back( new HadronPhysicsQGSC()); hadronPhys.push_back( new G4QStoppingPhysics("stopping")); hadronPhys.push_back( new G4IonPhysics("ion")); + hadronPhys.push_back( new G4NeutronTrackingCut()); + dump = true; } else if (name == "QGSP") { @@ -200,21 +177,26 @@ void PhysicsList::AddPhysicsList(const G4String& name) hadronPhys.push_back( new HadronPhysicsQGSP()); hadronPhys.push_back( new G4QStoppingPhysics("stopping")); hadronPhys.push_back( new G4IonPhysics("ion")); + hadronPhys.push_back( new G4NeutronTrackingCut()); + dump = true; } else if (name == "LHEP_EMV") { - AddPhysicsList("em_71"); + AddPhysicsList("G4standard_fast"); AddPhysicsList("LHEP"); + dump = true; } else if (name == "QGSP_EMV") { - AddPhysicsList("em_71"); + AddPhysicsList("G4standard_fast"); AddPhysicsList("QGSP"); + dump = true; } else if (name == "QGSP_EMX") { - AddPhysicsList("em_fast"); + AddPhysicsList("G4standard_exp"); AddPhysicsList("QGSP"); + dump = true; } else if (name == "QGSP_BERT") { @@ -224,6 +206,8 @@ void PhysicsList::AddPhysicsList(const G4String& name) hadronPhys.push_back( new HadronPhysicsQGSP_BERT()); hadronPhys.push_back( new G4QStoppingPhysics("stopping")); hadronPhys.push_back( new G4IonPhysics("ion")); + hadronPhys.push_back( new G4NeutronTrackingCut()); + dump = true; } else if (name == "QGSP_BERT_HP") { @@ -233,18 +217,33 @@ void PhysicsList::AddPhysicsList(const G4String& name) hadronPhys.push_back( new HadronPhysicsQGSP_BERT_HP()); hadronPhys.push_back( new G4QStoppingPhysics("stopping")); hadronPhys.push_back( new G4IonPhysics("ion")); + hadronPhys.push_back( new G4NeutronTrackingCut()); + dump = true; } else if (name == "QGSP_BIC") { SetStandardList(false); hadronPhys.push_back( new HadronPhysicsQGSP_BIC()); + dump = true; + + } else if (name == "QGSP_BIC_HP") { + + SetStandardList(true); + hadronPhys.push_back( new HadronPhysicsQGSP_BIC()); + dump = true; } else if (name == "QBBC") { SetStandardList(false); hadronPhys.push_back( new G4HadronInelasticQBBC("QBBC",verboseLevel)); - } else if (name == "QBBC_BERT") { + } else if (name == "QBBCG") { + + SetStandardList(false, true); + hadronPhys.push_back( new G4HadronInelasticQBBC("QBBC",verboseLevel, + false,false,false,false,true)); + + } else if (name == "QBEC") { SetStandardList(false); hadronPhys.push_back( new G4HadronInelasticQBBC("QBBC",verboseLevel, @@ -256,6 +255,12 @@ void PhysicsList::AddPhysicsList(const G4String& name) hadronPhys.push_back( new G4HadronInelasticQBBC("QBBC",verboseLevel, false,false,false,true)); + } else if (name == "QBEC_HP") { + + SetStandardList(true); + hadronPhys.push_back( new G4HadronInelasticQBBC("QBBC",verboseLevel, + false,true,false,true)); + } else if (name == "QBBC_CHIPS") { SetStandardList(false); @@ -268,26 +273,6 @@ void PhysicsList::AddPhysicsList(const G4String& name) hadronPhys.push_back( new G4HadronInelasticQBBC("QBBC",verboseLevel, true,false,false,false)); - } else if (name == "QQGSP") { - - hadronPhys.push_back( new G4EmExtraPhysics("gamma_nuc")); - hadronPhys.push_back( new G4HadronElasticPhysics("elastic", - verboseLevel,false)); - hadronPhys.push_back( new G4HadronInelasticQLHEP("QGSP",verboseLevel, - true,false,false,false)); - hadronPhys.push_back( new G4QStoppingPhysics("stopping")); - hadronPhys.push_back( new G4IonPhysics("ion")); - - } else if (name == "QQGSP_BERT") { - - hadronPhys.push_back( new G4EmExtraPhysics("gamma_nuc")); - hadronPhys.push_back( new G4HadronElasticPhysics("elastic", - verboseLevel,false)); - hadronPhys.push_back( new G4HadronInelasticQLHEP("QGSP_BERT",verboseLevel, - true,true,false,false)); - hadronPhys.push_back( new G4QStoppingPhysics("stopping")); - hadronPhys.push_back( new G4IonPhysics("ion")); - } else { G4cout << "PhysicsList::AddPhysicsList: <" << name << ">" @@ -298,13 +283,14 @@ void PhysicsList::AddPhysicsList(const G4String& name) //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... -void PhysicsList::SetStandardList(G4bool flagHP) +void PhysicsList::SetStandardList(G4bool flagHP, G4bool glauber) { hadronPhys.push_back( new G4EmExtraPhysics("gamma_nuc")); - hadronPhys.push_back( new G4HadronElasticPhysics("elastic",verboseLevel, - flagHP)); + hadronPhys.push_back( new G4HadronHElasticPhysics("elastic",verboseLevel, + flagHP,glauber)); hadronPhys.push_back( new G4QStoppingPhysics("stopping")); hadronPhys.push_back( new G4IonBinaryCascadePhysics("binary_ion")); + hadronPhys.push_back( new G4NeutronTrackingCut()); } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... @@ -352,8 +338,10 @@ void PhysicsList::SetCutForPositron(G4double cut) void PhysicsList::List() { - G4cout << "### PhysicsLists available: LHEP LHEP_BERT LHEP_BERT_HP LHEP_BIC LHEP_BIC_HP" << G4endl; - G4cout << " QGSC QGSP QGSP_BERT QGSP_BERT_HP QGSP_BIC QBBC" << G4endl; + G4cout << "### PhysicsLists available: LHEP LHEP_EMV QGSP QGSP_BERT QGSP_BERT_HP QGSP_BIC QGSP_BIC_HP" + << G4endl; + G4cout << " QGSP_EMV QGSP_EMX QGSC QBBC QBEC QBBC_HP QBEC_HP QBBC_CHIPS QBBC_FTF" + << G4endl; } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/hadronic/Hadr01/src/PhysicsListMessenger.cc b/examples/extended/hadronic/Hadr01/src/PhysicsListMessenger.cc index 3a8b658f6c..53176fee4d 100755 --- a/examples/extended/hadronic/Hadr01/src/PhysicsListMessenger.cc +++ b/examples/extended/hadronic/Hadr01/src/PhysicsListMessenger.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: PhysicsListMessenger.cc,v 1.3 2006/06/29 17:24:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysicsListMessenger.cc,v 1.4 2006/08/11 14:38:11 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ///////////////////////////////////////////////////////////////////////// @@ -126,8 +126,20 @@ void PhysicsListMessenger::SetNewValue(G4UIcommand* command, pPhysicsList->SetCutForPositron(cut); } - if( command == pListCmd ) - pPhysicsList->AddPhysicsList(newValue); + if( command == pListCmd ) { + G4String name = newValue; + if(name == "PHYSLIST") { + char* path = getenv(name); + if (path) name = G4String(path); + else { + G4cout << "### PhysicsListMessenger WARNING: " + << " environment variable PHYSLIST is not defined" + << G4endl; + return; + } + } + pPhysicsList->AddPhysicsList(name); + } if( command == listCmd ) pPhysicsList->List(); diff --git a/examples/extended/hadronic/Hadr01/src/PrimaryGeneratorAction.cc b/examples/extended/hadronic/Hadr01/src/PrimaryGeneratorAction.cc index bc933fea7c..ba78b79c08 100644 --- a/examples/extended/hadronic/Hadr01/src/PrimaryGeneratorAction.cc +++ b/examples/extended/hadronic/Hadr01/src/PrimaryGeneratorAction.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: PrimaryGeneratorAction.cc,v 1.3 2006/06/29 17:24:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PrimaryGeneratorAction.cc,v 1.4 2006/11/15 14:58:10 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // ///////////////////////////////////////////////////////////////////////// // @@ -34,6 +34,7 @@ // // Modified: // 04.06.2006 Adoptation of hadr01 (V.Ivanchenko) +// 16.11.2006 Add option allowing to have user defined beam position (VI) // //////////////////////////////////////////////////////////////////////// // @@ -62,8 +63,10 @@ PrimaryGeneratorAction::~PrimaryGeneratorAction() void PrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent) { - G4double zVertex = -(5.0*mm + histo->Length()); - particleGun->SetParticlePosition(G4ThreeVector(0.,0.,zVertex)); + if(histo->DefaultBeamPosition()) { + G4double zVertex = -(5.0*mm + histo->Length()); + particleGun->SetParticlePosition(G4ThreeVector(0.,0.,zVertex)); + } particleGun->GeneratePrimaryVertex(anEvent); } diff --git a/examples/extended/hadronic/Hadr01/src/RunAction.cc b/examples/extended/hadronic/Hadr01/src/RunAction.cc index cc1aaa3603..3cea015f16 100755 --- a/examples/extended/hadronic/Hadr01/src/RunAction.cc +++ b/examples/extended/hadronic/Hadr01/src/RunAction.cc @@ -39,6 +39,9 @@ #include "HistoManager.hh" #include "G4UImanager.hh" #include "G4VVisManager.hh" +#include "G4HadronProcessStore.hh" +#include "G4NistManager.hh" +#include "G4Element.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... @@ -75,15 +78,14 @@ void RunAction::BeginOfRunAction(const G4Run* aRun) void RunAction::EndOfRunAction(const G4Run*) { - G4cout << "RunAction: End of run actions are started" << G4endl; - (HistoManager::GetPointer())->EndOfRun(); #ifdef G4VIS_USE if (G4VVisManager::GetConcreteInstance()) G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/update"); #endif + HistoManager::GetPointer()->EndOfRun(); } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/examples/extended/hadronic/Hadr01/src/StackingAction.cc b/examples/extended/hadronic/Hadr01/src/StackingAction.cc index 847edadd79..648a9656ad 100644 --- a/examples/extended/hadronic/Hadr01/src/StackingAction.cc +++ b/examples/extended/hadronic/Hadr01/src/StackingAction.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: StackingAction.cc,v 1.3 2006/06/29 17:24:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: StackingAction.cc,v 1.5 2006/10/04 09:56:03 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // ///////////////////////////////////////////////////////////////////////// // @@ -80,11 +80,12 @@ StackingAction::ClassifyNewTrack(const G4Track* aTrack) << aTrack->GetTrackID() << " of " << name << " E(MeV)= " << aTrack->GetKineticEnergy()/MeV << " produced by " - << histoManager->CurrentDefinition()->GetParticleName() + << histoManager->CurrentParticle()->GetParticleName() << " ID= " << aTrack->GetParentID() << " with E(MeV)= " << histoManager->CurrentKinEnergy()/MeV << G4endl; } + if(aTrack->GetTrackID() == 1) return status; //stack or delete secondaries if (killSecondary) status = fKill; diff --git a/examples/extended/hadronic/Hadr01/src/StackingMessenger.cc b/examples/extended/hadronic/Hadr01/src/StackingMessenger.cc index 4d58ed0cea..2310bb07dd 100644 --- a/examples/extended/hadronic/Hadr01/src/StackingMessenger.cc +++ b/examples/extended/hadronic/Hadr01/src/StackingMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: StackingMessenger.cc,v 1.3 2006/06/29 17:24:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ///////////////////////////////////////////////////////////////////////// // diff --git a/examples/extended/hadronic/Hadr01/src/TargetSD.cc b/examples/extended/hadronic/Hadr01/src/TargetSD.cc index da694b1f8b..e7947ee499 100644 --- a/examples/extended/hadronic/Hadr01/src/TargetSD.cc +++ b/examples/extended/hadronic/Hadr01/src/TargetSD.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: TargetSD.cc,v 1.4 2006/06/29 17:24:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ///////////////////////////////////////////////////////////////////////// // diff --git a/examples/extended/medical/GammaTherapy/GNUmakefile b/examples/extended/medical/GammaTherapy/GNUmakefile index 8bc6ba1320..f53c5d12f3 100644 --- a/examples/extended/medical/GammaTherapy/GNUmakefile +++ b/examples/extended/medical/GammaTherapy/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.1 2004/08/03 16:56:20 vnivanch Exp $ +# $Id: GNUmakefile,v 1.2 2006/11/16 14:42:20 vnivanch Exp $ # -------------------------------------------------------------- # GNUmakefile for examples module. Gabriele Cosmo, 06/04/98. # -------------------------------------------------------------- @@ -22,7 +22,7 @@ include $(G4INSTALL)/config/architecture.gmk ifdef G4ANALYSIS_USE CPPFLAGS += `aida-config --include` - LDFLAGS += `aida-config --lib` + LOADLIBS += `aida-config --lib` endif include $(G4INSTALL)/config/binmake.gmk diff --git a/examples/extended/medical/GammaTherapy/GammaTherapy.cc b/examples/extended/medical/GammaTherapy/GammaTherapy.cc index 6e0f23222e..f8f12b6cbe 100644 --- a/examples/extended/medical/GammaTherapy/GammaTherapy.cc +++ b/examples/extended/medical/GammaTherapy/GammaTherapy.cc @@ -80,8 +80,7 @@ int main(int argc,char** argv) { runManager->SetUserInitialization(new PhysicsList()); // visualization manager - G4VisManager* visManager = new G4VisExecutive(); - visManager->Initialize(); + G4VisManager* visManager = 0; // set user action classes runManager->SetUserAction(new PrimaryGeneratorAction(det)); @@ -95,6 +94,8 @@ int main(int argc,char** argv) { if (argc==1) // Define UI terminal for interactive mode { + visManager = new G4VisExecutive(); + visManager->Initialize(); G4UIsession * session = new G4UIterminal; #ifdef G4UI_USE_TCSH session = new G4UIterminal(new G4UItcsh); @@ -113,8 +114,7 @@ int main(int argc,char** argv) { } // job termination - - delete visManager; + if(visManager) delete visManager; delete runManager; return 0; diff --git a/examples/extended/medical/GammaTherapy/History b/examples/extended/medical/GammaTherapy/History index 79b58f76e3..73b849aee3 100644 --- a/examples/extended/medical/GammaTherapy/History +++ b/examples/extended/medical/GammaTherapy/History @@ -1,4 +1,4 @@ -$Id: History,v 1.20 2006/01/17 10:05:57 vnivanch Exp $ +$Id: History,v 1.21 2006/11/16 14:42:20 vnivanch Exp $ ------------------------------------------------------------------- ========================================================= @@ -15,6 +15,10 @@ track of all tags. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +16 November 06: V.Ivant (gtherapy-V08-01-00) +- Use Phys list components from physics_list subdirectory; +- GNUmakefile - LDFLAGS -> LOADLIBS + 17 January 06: V.Ivant (gtherapy-V08-00-00) - PreciseRange -> CSDARange diff --git a/examples/extended/medical/GammaTherapy/include/EventActionMessenger.hh b/examples/extended/medical/GammaTherapy/include/EventActionMessenger.hh index c51d36bc79..1c4a94279f 100644 --- a/examples/extended/medical/GammaTherapy/include/EventActionMessenger.hh +++ b/examples/extended/medical/GammaTherapy/include/EventActionMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventActionMessenger.hh,v 1.2 2006/06/29 17:25:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/medical/GammaTherapy/include/G4EmMuonBuilder52.hh b/examples/extended/medical/GammaTherapy/include/G4EmMuonBuilder52.hh deleted file mode 100644 index e6678dddd3..0000000000 --- a/examples/extended/medical/GammaTherapy/include/G4EmMuonBuilder52.hh +++ /dev/null @@ -1,66 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: G4EmMuonBuilder52.hh,v 1.2 2006/06/29 17:26:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#ifndef G4EmMuonBuilder52_h -#define G4EmMuonBuilder52_h 1 - -#include "G4VPhysicsConstructor.hh" -#include "globals.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -class G4EmMuonBuilder52 : public G4VPhysicsConstructor -{ -public: - G4EmMuonBuilder52(const G4String& name = "EM_stan_muons"); - virtual ~G4EmMuonBuilder52(); - -public: - // This method is dummy for physics - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); - -private: - - // hide assignment operator - G4EmMuonBuilder52 & operator=(const G4EmMuonBuilder52 &right); - G4EmMuonBuilder52(const G4EmMuonBuilder52&); - -}; - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#endif diff --git a/examples/extended/medical/GammaTherapy/include/G4EmMuonBuilder71.hh b/examples/extended/medical/GammaTherapy/include/G4EmMuonBuilder71.hh deleted file mode 100644 index 2f71bc72db..0000000000 --- a/examples/extended/medical/GammaTherapy/include/G4EmMuonBuilder71.hh +++ /dev/null @@ -1,66 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: G4EmMuonBuilder71.hh,v 1.2 2006/06/29 17:26:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#ifndef G4EmMuonBuilder71_h -#define G4EmMuonBuilder71_h 1 - -#include "G4VPhysicsConstructor.hh" -#include "globals.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -class G4EmMuonBuilder71 : public G4VPhysicsConstructor -{ -public: - G4EmMuonBuilder71(const G4String& name = "EM_stan_muons"); - virtual ~G4EmMuonBuilder71(); - -public: - // This method is dummy for physics - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); - -private: - - // hide assignment operator - G4EmMuonBuilder71 & operator=(const G4EmMuonBuilder71 &right); - G4EmMuonBuilder71(const G4EmMuonBuilder71&); - -}; - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#endif diff --git a/examples/extended/medical/GammaTherapy/include/G4EmQEDBuilder71.hh b/examples/extended/medical/GammaTherapy/include/G4EmQEDBuilder71.hh deleted file mode 100644 index a692340bd1..0000000000 --- a/examples/extended/medical/GammaTherapy/include/G4EmQEDBuilder71.hh +++ /dev/null @@ -1,67 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: G4EmQEDBuilder71.hh,v 1.2 2006/06/29 17:26:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#ifndef G4EmQEDBuilder71_h -#define G4EmQEDBuilder71_h 1 - -#include "G4VPhysicsConstructor.hh" -#include "globals.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -class G4EmQEDBuilder71 : public G4VPhysicsConstructor -{ -public: - G4EmQEDBuilder71(const G4String& name = "EM_stan_QED"); - virtual ~G4EmQEDBuilder71(); - -public: - // This method is dummy for physics - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); - -private: - - // hide assignment operator - G4EmQEDBuilder71 & operator=(const G4EmQEDBuilder71 &right); - G4EmQEDBuilder71(const G4EmQEDBuilder71&); - -}; - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#endif - diff --git a/examples/extended/medical/GammaTherapy/include/G4LowEnergyQEDBuilder.hh b/examples/extended/medical/GammaTherapy/include/G4LowEnergyQEDBuilder.hh deleted file mode 100644 index f3a9dab754..0000000000 --- a/examples/extended/medical/GammaTherapy/include/G4LowEnergyQEDBuilder.hh +++ /dev/null @@ -1,67 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: G4LowEnergyQEDBuilder.hh,v 1.2 2006/06/29 17:26:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#ifndef G4LowEnergyQEDBuilder_h -#define G4LowEnergyQEDBuilder_h 1 - -#include "G4VPhysicsConstructor.hh" -#include "globals.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -class G4LowEnergyQEDBuilder : public G4VPhysicsConstructor -{ -public: - G4LowEnergyQEDBuilder(const G4String& name = "LowEnergy_QED"); - virtual ~G4LowEnergyQEDBuilder(); - -public: - // This method is dummy for physics - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); - -private: - - // hide assignment operator - G4LowEnergyQEDBuilder & operator=(const G4LowEnergyQEDBuilder &right); - G4LowEnergyQEDBuilder(const G4LowEnergyQEDBuilder&); - -}; - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#endif - diff --git a/examples/extended/medical/GammaTherapy/include/G4PenelopeQEDBuilder.hh b/examples/extended/medical/GammaTherapy/include/G4PenelopeQEDBuilder.hh deleted file mode 100644 index a3aa68d5a4..0000000000 --- a/examples/extended/medical/GammaTherapy/include/G4PenelopeQEDBuilder.hh +++ /dev/null @@ -1,67 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: G4PenelopeQEDBuilder.hh,v 1.2 2006/06/29 17:26:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#ifndef G4PenelopeQEDBuilder_h -#define G4PenelopeQEDBuilder_h 1 - -#include "G4VPhysicsConstructor.hh" -#include "globals.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -class G4PenelopeQEDBuilder : public G4VPhysicsConstructor -{ -public: - G4PenelopeQEDBuilder(const G4String& name = "Penelope_QED"); - virtual ~G4PenelopeQEDBuilder(); - -public: - // This method is dummy for physics - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); - -private: - - // hide assignment operator - G4PenelopeQEDBuilder & operator=(const G4PenelopeQEDBuilder &right); - G4PenelopeQEDBuilder(const G4PenelopeQEDBuilder&); - -}; - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#endif - diff --git a/examples/extended/medical/GammaTherapy/include/G4StepLimiterBuilder.hh b/examples/extended/medical/GammaTherapy/include/G4StepLimiterBuilder.hh index 54a43c3c30..30fb5685f8 100644 --- a/examples/extended/medical/GammaTherapy/include/G4StepLimiterBuilder.hh +++ b/examples/extended/medical/GammaTherapy/include/G4StepLimiterBuilder.hh @@ -25,7 +25,7 @@ // // // $Id: G4StepLimiterBuilder.hh,v 1.2 2006/06/29 17:26:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/medical/GammaTherapy/include/G4StepLimiterMessenger.hh b/examples/extended/medical/GammaTherapy/include/G4StepLimiterMessenger.hh index 2ebda9db16..e6aa1b3693 100644 --- a/examples/extended/medical/GammaTherapy/include/G4StepLimiterMessenger.hh +++ b/examples/extended/medical/GammaTherapy/include/G4StepLimiterMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4StepLimiterMessenger.hh,v 1.2 2006/06/29 17:26:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/medical/GammaTherapy/include/G4StepLimiterPerRegion.hh b/examples/extended/medical/GammaTherapy/include/G4StepLimiterPerRegion.hh index 6088937e1b..6b23a39bf0 100644 --- a/examples/extended/medical/GammaTherapy/include/G4StepLimiterPerRegion.hh +++ b/examples/extended/medical/GammaTherapy/include/G4StepLimiterPerRegion.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4StepLimiterPerRegion.hh,v 1.3 2006/06/29 17:26:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/medical/GammaTherapy/include/ParticlesBuilder.hh b/examples/extended/medical/GammaTherapy/include/ParticlesBuilder.hh index 4827d36af4..c5e96f6dc0 100644 --- a/examples/extended/medical/GammaTherapy/include/ParticlesBuilder.hh +++ b/examples/extended/medical/GammaTherapy/include/ParticlesBuilder.hh @@ -25,7 +25,7 @@ // // // $Id: ParticlesBuilder.hh,v 1.2 2006/06/29 17:26:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/medical/GammaTherapy/include/PhysListEmLivermore.hh b/examples/extended/medical/GammaTherapy/include/PhysListEmLivermore.hh new file mode 100644 index 0000000000..5fc702c116 --- /dev/null +++ b/examples/extended/medical/GammaTherapy/include/PhysListEmLivermore.hh @@ -0,0 +1,67 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: PhysListEmLivermore.hh,v 1.1 2006/11/16 14:42:20 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#ifndef PhysListEmLivermore_h +#define PhysListEmLivermore_h 1 + +#include "G4VPhysicsConstructor.hh" +#include "globals.hh" + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +class PhysListEmLivermore : public G4VPhysicsConstructor +{ + public: + PhysListEmLivermore(const G4String& name = "Livermore"); + ~PhysListEmLivermore(); + + public: + // This method is dummy for physics + void ConstructParticle() {}; + + // This method will be invoked in the Construct() method. + // each physics process will be instantiated and + // registered to the process manager of each particle type + void ConstructProcess(); +}; + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#endif + + + + + + + + diff --git a/examples/extended/electromagnetic/TestEm7/include/PhysListEmG4v71.hh b/examples/extended/medical/GammaTherapy/include/PhysListEmPenelope.hh similarity index 88% rename from examples/extended/electromagnetic/TestEm7/include/PhysListEmG4v71.hh rename to examples/extended/medical/GammaTherapy/include/PhysListEmPenelope.hh index 551cfab91e..cd85ac8a2a 100644 --- a/examples/extended/electromagnetic/TestEm7/include/PhysListEmG4v71.hh +++ b/examples/extended/medical/GammaTherapy/include/PhysListEmPenelope.hh @@ -24,25 +24,25 @@ // ******************************************************************** // // -// $Id: PhysListEmG4v71.hh,v 1.2 2006/06/29 16:57:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListEmPenelope.hh,v 1.3 2006/11/16 14:42:20 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#ifndef PhysListEmG4v71_h -#define PhysListEmG4v71_h 1 +#ifndef PhysListEmPenelope_h +#define PhysListEmPenelope_h 1 #include "G4VPhysicsConstructor.hh" #include "globals.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -class PhysListEmG4v71 : public G4VPhysicsConstructor +class PhysListEmPenelope : public G4VPhysicsConstructor { public: - PhysListEmG4v71(const G4String& name = "g4v71"); - ~PhysListEmG4v71(); + PhysListEmPenelope(const G4String& name = "Penelope"); + ~PhysListEmPenelope(); public: // This method is dummy for physics diff --git a/examples/extended/medical/GammaTherapy/include/PhysicsList.hh b/examples/extended/medical/GammaTherapy/include/PhysicsList.hh index a7c29d1209..8271b175cb 100644 --- a/examples/extended/medical/GammaTherapy/include/PhysicsList.hh +++ b/examples/extended/medical/GammaTherapy/include/PhysicsList.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: PhysicsList.hh,v 1.5 2006/06/29 17:26:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysicsList.hh,v 1.6 2006/11/16 14:42:20 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Modified: // @@ -38,7 +38,6 @@ #include "globals.hh" class PhysicsListMessenger; -class G4StepLimiterBuilder; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -46,7 +45,7 @@ class PhysicsList: public G4VModularPhysicsList { public: PhysicsList(); - ~PhysicsList(); + virtual ~PhysicsList(); void ConstructParticle(); void ConstructProcess(); @@ -71,9 +70,10 @@ private: G4bool bicIsRegisted; G4bool ionIsRegisted; G4bool gnucIsRegisted; + G4bool stopIsRegisted; PhysicsListMessenger* pMessenger; - G4StepLimiterBuilder* steplimiter; + G4String emName; }; diff --git a/examples/extended/medical/GammaTherapy/include/PhysicsListMessenger.hh b/examples/extended/medical/GammaTherapy/include/PhysicsListMessenger.hh index a874c4c300..82db9cf306 100644 --- a/examples/extended/medical/GammaTherapy/include/PhysicsListMessenger.hh +++ b/examples/extended/medical/GammaTherapy/include/PhysicsListMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListMessenger.hh,v 1.3 2006/06/29 17:26:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/medical/GammaTherapy/src/EmBinaryCascadeBuilder.cc b/examples/extended/medical/GammaTherapy/src/EmBinaryCascadeBuilder.cc deleted file mode 100644 index 127535a37f..0000000000 --- a/examples/extended/medical/GammaTherapy/src/EmBinaryCascadeBuilder.cc +++ /dev/null @@ -1,99 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// - -#include "EmBinaryCascadeBuilder.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" -#include "G4LFission.hh" -#include "G4LCapture.hh" - -#include "G4HadronFissionProcess.hh" -#include "G4HadronCaptureProcess.hh" - -#include "G4ProtonInelasticProcess.hh" -#include "G4NeutronInelasticProcess.hh" - -#include "G4BinaryCascade.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -EmBinaryCascadeBuilder::EmBinaryCascadeBuilder(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -EmBinaryCascadeBuilder::~EmBinaryCascadeBuilder() -{ - delete theBC; -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void EmBinaryCascadeBuilder::ConstructProcess() -{ - - // Binary Cascade - theBC = new G4BinaryCascade(); - - theParticleIterator->reset(); - while( (*theParticleIterator)() ){ - G4ParticleDefinition* particle = theParticleIterator->value(); - G4String particleName = particle->GetParticleName(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - if (particleName == "proton") { - - G4ProtonInelasticProcess* theInelasticProcess = - new G4ProtonInelasticProcess("inelastic"); - theInelasticProcess->RegisterMe(theBC); - pmanager->AddDiscreteProcess(theInelasticProcess); - - } else if (particleName == "neutron") { - - G4NeutronInelasticProcess* theInelasticProcess = - new G4NeutronInelasticProcess("inelastic"); - theInelasticProcess->RegisterMe(theBC); - pmanager->AddDiscreteProcess(theInelasticProcess); - // fission - G4HadronFissionProcess* theFissionProcess = - new G4HadronFissionProcess; - G4LFission* theFissionModel = new G4LFission; - theFissionProcess->RegisterMe(theFissionModel); - pmanager->AddDiscreteProcess(theFissionProcess); - // capture - G4HadronCaptureProcess* theCaptureProcess = - new G4HadronCaptureProcess; - G4LCapture* theCaptureModel = new G4LCapture; - theCaptureProcess->RegisterMe(theCaptureModel); - pmanager->AddDiscreteProcess(theCaptureProcess); - } - } -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - diff --git a/examples/extended/medical/GammaTherapy/src/EmGammaNucleusBuilder.cc b/examples/extended/medical/GammaTherapy/src/EmGammaNucleusBuilder.cc deleted file mode 100644 index 31b73490bf..0000000000 --- a/examples/extended/medical/GammaTherapy/src/EmGammaNucleusBuilder.cc +++ /dev/null @@ -1,79 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// $Id: EmGammaNucleusBuilder.cc,v 1.6 2006/06/29 17:27:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ - -#include "EmGammaNucleusBuilder.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" -#include "G4Gamma.hh" -#include "G4Proton.hh" -#include "G4Neutron.hh" -#include "G4GenericIon.hh" -#include "G4PhotoNuclearProcess.hh" -#include "G4GammaNuclearReaction.hh" -#include "G4TheoFSGenerator.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -EmGammaNucleusBuilder::EmGammaNucleusBuilder(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -EmGammaNucleusBuilder::~EmGammaNucleusBuilder() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void EmGammaNucleusBuilder::ConstructParticle() -{ - G4Gamma::Gamma(); - G4Proton::Proton(); - G4Neutron::Neutron(); - G4GenericIon::GenericIon(); -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void EmGammaNucleusBuilder::ConstructProcess() -{ - G4ParticleDefinition* particle = G4Gamma::Gamma(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - G4PhotoNuclearProcess* pnp = new G4PhotoNuclearProcess("gNucler"); - G4TheoFSGenerator* tf = new G4TheoFSGenerator(); - G4GammaNuclearReaction* gn = new G4GammaNuclearReaction(); - tf->SetMinEnergy(3.5*GeV); - tf->SetMaxEnergy(100.*TeV); - pnp->RegisterMe(tf); - gn->SetMaxEnergy(3.5*GeV); - pnp->RegisterMe(gn); - pmanager->AddDiscreteProcess(pnp); -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - diff --git a/examples/extended/medical/GammaTherapy/src/EmHadronElasticBuilder.cc b/examples/extended/medical/GammaTherapy/src/EmHadronElasticBuilder.cc deleted file mode 100644 index 75c8f53165..0000000000 --- a/examples/extended/medical/GammaTherapy/src/EmHadronElasticBuilder.cc +++ /dev/null @@ -1,76 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// - -#include "EmHadronElasticBuilder.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" -#include "G4LElastic.hh" -#include "G4HadronElasticProcess.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -EmHadronElasticBuilder::EmHadronElasticBuilder(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -EmHadronElasticBuilder::~EmHadronElasticBuilder() -{ - delete theElasticProcess; -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void EmHadronElasticBuilder::ConstructProcess() -{ - - // Hadron elastic process - theElasticProcess = new G4HadronElasticProcess(); - theElasticProcess->RegisterMe( new G4LElastic() ); - - theParticleIterator->reset(); - while( (*theParticleIterator)() ){ - G4ParticleDefinition* particle = theParticleIterator->value(); - G4ProcessManager* pManager = particle->GetProcessManager(); - if (particle->GetPDGMass() > 110.*MeV && - theElasticProcess->IsApplicable(*particle) && - !particle->IsShortLived()) { - pManager->AddDiscreteProcess(theElasticProcess); - /* - G4cout << "### Elastic model are registered for " - << particle->GetParticleName() - << G4endl; - */ - } - } - -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - diff --git a/examples/extended/medical/GammaTherapy/src/EmIonBinaryCascadeBuilder.cc b/examples/extended/medical/GammaTherapy/src/EmIonBinaryCascadeBuilder.cc deleted file mode 100644 index 22340fc21a..0000000000 --- a/examples/extended/medical/GammaTherapy/src/EmIonBinaryCascadeBuilder.cc +++ /dev/null @@ -1,143 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// $Id: EmIonBinaryCascadeBuilder.cc,v 1.2 2006/06/29 17:27:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ - -#include "EmIonBinaryCascadeBuilder.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" -#include "G4Deuteron.hh" -#include "G4Triton.hh" -#include "G4He3.hh" -#include "G4Alpha.hh" -#include "G4GenericIon.hh" - -#include "G4HadronInelasticProcess.hh" -#include "G4BinaryLightIonReaction.hh" -#include "G4TripathiCrossSection.hh" -#include "G4IonsShenCrossSection.hh" -#include "G4LEDeuteronInelastic.hh" -#include "G4LETritonInelastic.hh" -#include "G4LEAlphaInelastic.hh" -#include "G4DeuteronInelasticProcess.hh" -#include "G4TritonInelasticProcess.hh" -#include "G4AlphaInelasticProcess.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -EmIonBinaryCascadeBuilder::EmIonBinaryCascadeBuilder(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -EmIonBinaryCascadeBuilder::~EmIonBinaryCascadeBuilder() -{ - delete theIPdeuteron; - delete theIPtriton; - delete theIPalpha; - delete theIPHe3; - delete theIPGenericIon; - delete theBC; - delete theGenIonBC; -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void EmIonBinaryCascadeBuilder::ConstructProcess() -{ - // Binary Cascade - G4ParticleDefinition* particle = 0; - G4ProcessManager* pmanager = 0; - theBC = new G4BinaryLightIonReaction(); - theBC->SetMinEnergy(80*MeV); - theBC->SetMaxEnergy(20*GeV); - - G4TripathiCrossSection * TripathiCrossSection= new G4TripathiCrossSection; - G4IonsShenCrossSection * aShen = new G4IonsShenCrossSection; - - // deuteron - particle = G4Deuteron::Deuteron(); - pmanager = particle->GetProcessManager(); - theIPdeuteron = new G4DeuteronInelasticProcess(); - G4LEDeuteronInelastic* theDIModel = new G4LEDeuteronInelastic(); - theDIModel->SetMaxEnergy(100*MeV); - theIPdeuteron->AddDataSet(TripathiCrossSection); - theIPdeuteron->AddDataSet(aShen); - theIPdeuteron->RegisterMe(theDIModel); - theIPdeuteron->RegisterMe(theBC); - pmanager->AddDiscreteProcess(theIPdeuteron); - - // triton - particle = G4Triton::Triton(); - pmanager = particle->GetProcessManager(); - theIPtriton = new G4TritonInelasticProcess(); - G4LETritonInelastic* theTIModel = new G4LETritonInelastic(); - theTIModel->SetMaxEnergy(100*MeV); - theIPtriton->AddDataSet(TripathiCrossSection); - theIPtriton->AddDataSet(aShen); - theIPtriton->RegisterMe(theTIModel); - theIPtriton->RegisterMe(theBC); - pmanager->AddDiscreteProcess(theIPtriton); - - // alpha - particle = G4Alpha::Alpha(); - pmanager = particle->GetProcessManager(); - theIPalpha = new G4AlphaInelasticProcess(); - G4LEAlphaInelastic* theAIModel = new G4LEAlphaInelastic(); - theAIModel->SetMaxEnergy(100*MeV); - theIPalpha->AddDataSet(TripathiCrossSection); - theIPalpha->AddDataSet(aShen); - theIPalpha->RegisterMe(theAIModel); - theIPalpha->RegisterMe(theBC); - pmanager->AddDiscreteProcess(theIPalpha); - - - // GenericIon - particle = G4GenericIon::GenericIon(); - pmanager = particle->GetProcessManager(); - theIPGenericIon = new G4HadronInelasticProcess("IonInelastic",particle); - theIPGenericIon->AddDataSet(TripathiCrossSection); - theIPGenericIon->AddDataSet(aShen); - theGenIonBC= new G4BinaryLightIonReaction(); - theGenIonBC->SetMinEnergy(0*MeV); - theGenIonBC->SetMaxEnergy(10*GeV); - theIPGenericIon->RegisterMe(theGenIonBC); - pmanager->AddDiscreteProcess(theIPGenericIon); - - // He3 - particle = G4He3::He3(); - pmanager = particle->GetProcessManager(); - theIPHe3 = new G4HadronInelasticProcess("He3Inelastic",particle); - theIPHe3->AddDataSet(TripathiCrossSection); - theIPHe3->AddDataSet(aShen); - theIPHe3->RegisterMe(theGenIonBC); - pmanager->AddDiscreteProcess(theIPHe3); - -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - diff --git a/examples/extended/medical/GammaTherapy/src/EventActionMessenger.cc b/examples/extended/medical/GammaTherapy/src/EventActionMessenger.cc index a5e80a0ddb..21651608ff 100644 --- a/examples/extended/medical/GammaTherapy/src/EventActionMessenger.cc +++ b/examples/extended/medical/GammaTherapy/src/EventActionMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: EventActionMessenger.cc,v 1.2 2006/06/29 17:27:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/medical/GammaTherapy/src/G4EmMuonBuilder.cc b/examples/extended/medical/GammaTherapy/src/G4EmMuonBuilder.cc deleted file mode 100644 index d5e4a8a872..0000000000 --- a/examples/extended/medical/GammaTherapy/src/G4EmMuonBuilder.cc +++ /dev/null @@ -1,115 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: G4EmMuonBuilder.cc,v 1.2 2006/06/29 17:27:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//--------------------------------------------------------------------------- -// -// ClassName: G4EmMuonBuilder -// -// Author: V.Ivanchenko 03.05.2004 -// -// Modified: -// 24-11-2004 V.Ivanchenko Use the same radiation processes for mu+ and mu- -// -//---------------------------------------------------------------------------- -// -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#include "G4EmMuonBuilder.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" - -#include "G4MultipleScattering.hh" - -#include "G4MuIonisation.hh" -#include "G4MuBremsstrahlung.hh" -#include "G4MuPairProduction.hh" -#include "G4Gamma.hh" -#include "G4Electron.hh" -#include "G4Positron.hh" -#include "G4MuonPlus.hh" -#include "G4MuonMinus.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -G4EmMuonBuilder::G4EmMuonBuilder(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -G4EmMuonBuilder::~G4EmMuonBuilder() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void G4EmMuonBuilder::ConstructParticle() -{ - // Minimal set of particles - G4Gamma::Gamma(); - G4Electron::Electron(); - G4Positron::Positron(); - G4MuonPlus::MuonPlus(); - G4MuonMinus::MuonMinus(); -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void G4EmMuonBuilder::ConstructProcess() -{ - // Common processes for mu+ and mu- - G4MultipleScattering* mumsc = new G4MultipleScattering(); - G4MuIonisation* muion = new G4MuIonisation(); - G4MuBremsstrahlung* mubrem = new G4MuBremsstrahlung(); - G4MuPairProduction* mupair = new G4MuPairProduction(); - - // Add standard EM Processes for mu+ - const G4ParticleDefinition* particle = G4MuonPlus::MuonPlus(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - - pmanager->AddProcess(mumsc, -1, 1,1); - pmanager->AddProcess(muion, -1, 2,2); - pmanager->AddProcess(mubrem, -1,-1,3); - pmanager->AddProcess(mupair, -1,-1,4); - - - // Add standard EM Processes for mu- - particle = G4MuonMinus::MuonMinus(); - pmanager = particle->GetProcessManager(); - - pmanager->AddProcess(mumsc, -1, 1,1); - pmanager->AddProcess(muion, -1, 2,2); - pmanager->AddProcess(mubrem, -1,-1,3); - pmanager->AddProcess(mupair, -1,-1,4); - -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - diff --git a/examples/extended/medical/GammaTherapy/src/G4EmMuonBuilder71.cc b/examples/extended/medical/GammaTherapy/src/G4EmMuonBuilder71.cc deleted file mode 100644 index f7f6930d57..0000000000 --- a/examples/extended/medical/GammaTherapy/src/G4EmMuonBuilder71.cc +++ /dev/null @@ -1,108 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: G4EmMuonBuilder71.cc,v 1.2 2006/06/29 17:27:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//--------------------------------------------------------------------------- -// -// ClassName: G4EmMuonBuilder71 -// -// Author: V.Ivanchenko 03.10.2005 -// -// Modified: -// -//---------------------------------------------------------------------------- -// -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#include "G4EmMuonBuilder71.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" - -#include "G4MultipleScattering.hh" - -#include "G4MuIonisation.hh" -#include "G4MuBremsstrahlung.hh" -#include "G4MuPairProduction.hh" -#include "G4Gamma.hh" -#include "G4Electron.hh" -#include "G4Positron.hh" -#include "G4MuonPlus.hh" -#include "G4MuonMinus.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -G4EmMuonBuilder71::G4EmMuonBuilder71(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -G4EmMuonBuilder71::~G4EmMuonBuilder71() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void G4EmMuonBuilder71::ConstructParticle() -{ - // Minimal set of particles - G4Gamma::Gamma(); - G4Electron::Electron(); - G4Positron::Positron(); - G4MuonPlus::MuonPlus(); - G4MuonMinus::MuonMinus(); -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void G4EmMuonBuilder71::ConstructProcess() -{ - // Add standard EM Processes for mu+ - const G4ParticleDefinition* particle = G4MuonPlus::MuonPlus(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - - pmanager->AddProcess(new G4MultipleScattering,-1, 1, 1); - pmanager->AddProcess(new G4MuIonisation, -1, 2, 2); - pmanager->AddProcess(new G4MuBremsstrahlung, -1,-1, 3); - pmanager->AddProcess(new G4MuPairProduction, -1,-1, 4); - - - // Add standard EM Processes for mu- - particle = G4MuonMinus::MuonMinus(); - pmanager = particle->GetProcessManager(); - - pmanager->AddProcess(new G4MultipleScattering,-1, 1, 1); - pmanager->AddProcess(new G4MuIonisation, -1, 2, 2); - pmanager->AddProcess(new G4MuBremsstrahlung, -1,-1, 3); - pmanager->AddProcess(new G4MuPairProduction, -1,-1, 4); - -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - diff --git a/examples/extended/medical/GammaTherapy/src/G4EmQEDBuilder.cc b/examples/extended/medical/GammaTherapy/src/G4EmQEDBuilder.cc deleted file mode 100644 index 6ba8686d17..0000000000 --- a/examples/extended/medical/GammaTherapy/src/G4EmQEDBuilder.cc +++ /dev/null @@ -1,114 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: G4EmQEDBuilder.cc,v 1.2 2006/06/29 17:27:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//--------------------------------------------------------------------------- -// -// ClassName: G4EmQEDBuilder -// -// Author: V.Ivanchenko 03.05.2004 -// -// Modified: -// -//---------------------------------------------------------------------------- -// -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#include "G4EmQEDBuilder.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" - -#include "G4ComptonScattering.hh" -#include "G4GammaConversion.hh" -#include "G4PhotoElectricEffect.hh" - -#include "G4MultipleScattering.hh" - -#include "G4eIonisation.hh" -#include "G4eBremsstrahlung.hh" -#include "G4eplusAnnihilation.hh" - -#include "G4Gamma.hh" -#include "G4Electron.hh" -#include "G4Positron.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -G4EmQEDBuilder::G4EmQEDBuilder(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -G4EmQEDBuilder::~G4EmQEDBuilder() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void G4EmQEDBuilder::ConstructParticle() -{ - G4Gamma::Gamma(); - G4Electron::Electron(); - G4Positron::Positron(); -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void G4EmQEDBuilder::ConstructProcess() -{ - // Add standard EM Processes for gamma - G4ParticleDefinition* particle = G4Gamma::Gamma(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - - pmanager->AddDiscreteProcess( new G4PhotoElectricEffect() ); - pmanager->AddDiscreteProcess( new G4ComptonScattering() ); - pmanager->AddDiscreteProcess( new G4GammaConversion() ); - - // Add standard EM Processes for e- - particle = G4Electron::Electron(); - pmanager = particle->GetProcessManager(); - - pmanager->AddProcess(new G4MultipleScattering, -1, 1,1); - pmanager->AddProcess(new G4eIonisation, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung, -1,-1,3); - - // Add standard EM Processes for e+ - particle = G4Positron::Positron(); - pmanager = particle->GetProcessManager(); - - 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); - -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - diff --git a/examples/extended/medical/GammaTherapy/src/G4EmQEDBuilder52.cc b/examples/extended/medical/GammaTherapy/src/G4EmQEDBuilder52.cc deleted file mode 100644 index 9fd30b1779..0000000000 --- a/examples/extended/medical/GammaTherapy/src/G4EmQEDBuilder52.cc +++ /dev/null @@ -1,114 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: G4EmQEDBuilder52.cc,v 1.3 2006/06/29 17:27:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//--------------------------------------------------------------------------- -// -// ClassName: G4EmQEDBuilder52 -// -// Author: V.Ivanchenko 03.05.2004 -// -// Modified: -// -//---------------------------------------------------------------------------- -// -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#include "G4EmQEDBuilder52.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" - -#include "G4ComptonScattering52.hh" -#include "G4GammaConversion52.hh" -#include "G4PhotoElectricEffect52.hh" - -#include "G4MultipleScattering52.hh" - -#include "G4eIonisation52.hh" -#include "G4eBremsstrahlung52.hh" -#include "G4eplusAnnihilation52.hh" - -#include "G4Gamma.hh" -#include "G4Electron.hh" -#include "G4Positron.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -G4EmQEDBuilder52::G4EmQEDBuilder52(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -G4EmQEDBuilder52::~G4EmQEDBuilder52() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void G4EmQEDBuilder52::ConstructParticle() -{ - G4Gamma::Gamma(); - G4Electron::Electron(); - G4Positron::Positron(); -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void G4EmQEDBuilder52::ConstructProcess() -{ - // Add standard EM Processes for gamma - G4ParticleDefinition* particle = G4Gamma::Gamma(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - - pmanager->AddDiscreteProcess( new G4PhotoElectricEffect52() ); - pmanager->AddDiscreteProcess( new G4ComptonScattering52() ); - pmanager->AddDiscreteProcess( new G4GammaConversion52() ); - - // Add standard EM Processes for e- - particle = G4Electron::Electron(); - pmanager = particle->GetProcessManager(); - - pmanager->AddProcess(new G4MultipleScattering52, -1, 1,1); - pmanager->AddProcess(new G4eIonisation52, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung52, -1,-1,3); - - // Add standard EM Processes for e+ - particle = G4Positron::Positron(); - pmanager = particle->GetProcessManager(); - - pmanager->AddProcess(new G4MultipleScattering52, -1, 1,1); - pmanager->AddProcess(new G4eIonisation52, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung52, -1,-1,3); - pmanager->AddProcess(new G4eplusAnnihilation52, 0,-1,4); - -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - diff --git a/examples/extended/medical/GammaTherapy/src/G4EmQEDBuilder71.cc b/examples/extended/medical/GammaTherapy/src/G4EmQEDBuilder71.cc deleted file mode 100644 index 41267492c0..0000000000 --- a/examples/extended/medical/GammaTherapy/src/G4EmQEDBuilder71.cc +++ /dev/null @@ -1,114 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: G4EmQEDBuilder71.cc,v 1.2 2006/06/29 17:27:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//--------------------------------------------------------------------------- -// -// ClassName: G4EmQEDBuilder71 -// -// Author: V.Ivanchenko 03.10.2005 -// -// Modified: -// -//---------------------------------------------------------------------------- -// -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#include "G4EmQEDBuilder71.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" - -#include "G4ComptonScattering.hh" -#include "G4GammaConversion.hh" -#include "G4PhotoElectricEffect.hh" - -#include "G4MultipleScattering71.hh" - -#include "G4eIonisation.hh" -#include "G4eBremsstrahlung.hh" -#include "G4eplusAnnihilation.hh" - -#include "G4Gamma.hh" -#include "G4Electron.hh" -#include "G4Positron.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -G4EmQEDBuilder71::G4EmQEDBuilder71(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -G4EmQEDBuilder71::~G4EmQEDBuilder71() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void G4EmQEDBuilder71::ConstructParticle() -{ - G4Gamma::Gamma(); - G4Electron::Electron(); - G4Positron::Positron(); -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void G4EmQEDBuilder71::ConstructProcess() -{ - // Add standard EM Processes for gamma - G4ParticleDefinition* particle = G4Gamma::Gamma(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - - pmanager->AddDiscreteProcess( new G4PhotoElectricEffect() ); - pmanager->AddDiscreteProcess( new G4ComptonScattering() ); - pmanager->AddDiscreteProcess( new G4GammaConversion() ); - - // Add standard EM Processes for e- - particle = G4Electron::Electron(); - pmanager = particle->GetProcessManager(); - - pmanager->AddProcess(new G4MultipleScattering71, -1, 1, 1); - pmanager->AddProcess(new G4eIonisation, -1, 2, 2); - pmanager->AddProcess(new G4eBremsstrahlung, -1,-1, 3); - - // Add standard EM Processes for e+ - particle = G4Positron::Positron(); - pmanager = particle->GetProcessManager(); - - pmanager->AddProcess(new G4MultipleScattering71, -1, 1, 1); - pmanager->AddProcess(new G4eIonisation, -1, 2, 2); - pmanager->AddProcess(new G4eBremsstrahlung, -1,-1, 3); - pmanager->AddProcess(new G4eplusAnnihilation, 0,-1, 4); - -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - diff --git a/examples/extended/medical/GammaTherapy/src/G4LowEnergyQEDBuilder.cc b/examples/extended/medical/GammaTherapy/src/G4LowEnergyQEDBuilder.cc deleted file mode 100644 index fbde9f9115..0000000000 --- a/examples/extended/medical/GammaTherapy/src/G4LowEnergyQEDBuilder.cc +++ /dev/null @@ -1,122 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: G4LowEnergyQEDBuilder.cc,v 1.3 2006/06/29 17:27:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//--------------------------------------------------------------------------- -// -// ClassName: G4LowEnergyQEDBuilder -// -// Author: V.Ivanchenko 03.05.2004 -// -// Modified: -// -//---------------------------------------------------------------------------- -// -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#include "G4LowEnergyQEDBuilder.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" - -#include "G4LowEnergyCompton.hh" -#include "G4LowEnergyGammaConversion.hh" -#include "G4LowEnergyPhotoElectric.hh" -#include "G4LowEnergyRayleigh.hh" - -#include "G4MultipleScattering.hh" - -#include "G4LowEnergyIonisation.hh" -#include "G4LowEnergyBremsstrahlung.hh" - -#include "G4eIonisation.hh" -#include "G4eBremsstrahlung.hh" -#include "G4eplusAnnihilation.hh" - -#include "G4Gamma.hh" -#include "G4Electron.hh" -#include "G4Positron.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -G4LowEnergyQEDBuilder::G4LowEnergyQEDBuilder(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -G4LowEnergyQEDBuilder::~G4LowEnergyQEDBuilder() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void G4LowEnergyQEDBuilder::ConstructParticle() -{ - G4Gamma::Gamma(); - G4Electron::Electron(); - G4Positron::Positron(); -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void G4LowEnergyQEDBuilder::ConstructProcess() -{ - // Add standard EM Processes for gamma - G4ParticleDefinition* particle = G4Gamma::Gamma(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - - G4LowEnergyPhotoElectric* pe = new G4LowEnergyPhotoElectric(); - pe->SetAngularGenerator("standard"); - - pmanager->AddDiscreteProcess( pe ); - pmanager->AddDiscreteProcess( new G4LowEnergyCompton() ); - pmanager->AddDiscreteProcess( new G4LowEnergyGammaConversion() ); - pmanager->AddDiscreteProcess( new G4LowEnergyRayleigh() ); - - // Add standard EM Processes for e- - particle = G4Electron::Electron(); - pmanager = particle->GetProcessManager(); - - pmanager->AddProcess(new G4MultipleScattering, -1, 1,1); - pmanager->AddProcess(new G4LowEnergyIonisation, -1, 2,2); - pmanager->AddProcess(new G4LowEnergyBremsstrahlung, -1,-1,3); - - // Add standard EM Processes for e+ - particle = G4Positron::Positron(); - pmanager = particle->GetProcessManager(); - - 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); - -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - diff --git a/examples/extended/medical/GammaTherapy/src/G4PenelopeQEDBuilder.cc b/examples/extended/medical/GammaTherapy/src/G4PenelopeQEDBuilder.cc deleted file mode 100644 index f8b9506a1c..0000000000 --- a/examples/extended/medical/GammaTherapy/src/G4PenelopeQEDBuilder.cc +++ /dev/null @@ -1,116 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: G4PenelopeQEDBuilder.cc,v 1.2 2006/06/29 17:27:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//--------------------------------------------------------------------------- -// -// ClassName: G4PenelopeQEDBuilder -// -// Author: V.Ivanchenko 03.05.2004 -// -// Modified: -// -//---------------------------------------------------------------------------- -// -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#include "G4PenelopeQEDBuilder.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" - -#include "G4PenelopeCompton.hh" -#include "G4PenelopeGammaConversion.hh" -#include "G4PenelopePhotoElectric.hh" -#include "G4PenelopeRayleigh.hh" - -#include "G4MultipleScattering.hh" - -#include "G4PenelopeIonisation.hh" -#include "G4PenelopeBremsstrahlung.hh" -#include "G4PenelopeAnnihilation.hh" - -#include "G4Gamma.hh" -#include "G4Electron.hh" -#include "G4Positron.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -G4PenelopeQEDBuilder::G4PenelopeQEDBuilder(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -G4PenelopeQEDBuilder::~G4PenelopeQEDBuilder() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void G4PenelopeQEDBuilder::ConstructParticle() -{ - G4Gamma::Gamma(); - G4Electron::Electron(); - G4Positron::Positron(); -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void G4PenelopeQEDBuilder::ConstructProcess() -{ - // Add standard EM Processes for gamma - G4ParticleDefinition* particle = G4Gamma::Gamma(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - - pmanager->AddDiscreteProcess( new G4PenelopePhotoElectric() ); - pmanager->AddDiscreteProcess( new G4PenelopeCompton() ); - pmanager->AddDiscreteProcess( new G4PenelopeGammaConversion() ); - pmanager->AddDiscreteProcess( new G4PenelopeRayleigh() ); - - // Add standard EM Processes for e- - particle = G4Electron::Electron(); - pmanager = particle->GetProcessManager(); - - pmanager->AddProcess(new G4MultipleScattering, -1, 1,1); - pmanager->AddProcess(new G4PenelopeIonisation, -1, 2,2); - pmanager->AddProcess(new G4PenelopeBremsstrahlung, -1,-1,3); - - // Add standard EM Processes for e+ - particle = G4Positron::Positron(); - pmanager = particle->GetProcessManager(); - - pmanager->AddProcess(new G4MultipleScattering, -1, 1,1); - pmanager->AddProcess(new G4PenelopeIonisation, -1, 2,2); - pmanager->AddProcess(new G4PenelopeBremsstrahlung,-1,-1,3); - pmanager->AddProcess(new G4PenelopeAnnihilation, 0,-1,4); - -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - diff --git a/examples/extended/medical/GammaTherapy/src/G4StepLimiterBuilder.cc b/examples/extended/medical/GammaTherapy/src/G4StepLimiterBuilder.cc index 79556412c6..f23db90d1f 100644 --- a/examples/extended/medical/GammaTherapy/src/G4StepLimiterBuilder.cc +++ b/examples/extended/medical/GammaTherapy/src/G4StepLimiterBuilder.cc @@ -25,7 +25,7 @@ // // // $Id: G4StepLimiterBuilder.cc,v 1.3 2006/06/29 17:27:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/examples/extended/medical/GammaTherapy/src/G4StepLimiterMessenger.cc b/examples/extended/medical/GammaTherapy/src/G4StepLimiterMessenger.cc index fcd5557763..c270d0090c 100644 --- a/examples/extended/medical/GammaTherapy/src/G4StepLimiterMessenger.cc +++ b/examples/extended/medical/GammaTherapy/src/G4StepLimiterMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4StepLimiterMessenger.cc,v 1.2 2006/06/29 17:27:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/medical/GammaTherapy/src/G4StepLimiterPerRegion.cc b/examples/extended/medical/GammaTherapy/src/G4StepLimiterPerRegion.cc index 229dd3d138..8379e5591a 100644 --- a/examples/extended/medical/GammaTherapy/src/G4StepLimiterPerRegion.cc +++ b/examples/extended/medical/GammaTherapy/src/G4StepLimiterPerRegion.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4StepLimiterPerRegion.cc,v 1.3 2006/06/29 17:27:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/medical/GammaTherapy/src/ParticlesBuilder.cc b/examples/extended/medical/GammaTherapy/src/ParticlesBuilder.cc index df2d7f3295..0e3111b9b4 100644 --- a/examples/extended/medical/GammaTherapy/src/ParticlesBuilder.cc +++ b/examples/extended/medical/GammaTherapy/src/ParticlesBuilder.cc @@ -25,7 +25,7 @@ // // // $Id: ParticlesBuilder.cc,v 1.3 2006/06/29 17:27:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/examples/extended/electromagnetic/TestEm7/src/PhysListEmG4v71.cc b/examples/extended/medical/GammaTherapy/src/PhysListEmLivermore.cc similarity index 64% rename from examples/extended/electromagnetic/TestEm7/src/PhysListEmG4v71.cc rename to examples/extended/medical/GammaTherapy/src/PhysListEmLivermore.cc index bb12ec391e..b734984fde 100644 --- a/examples/extended/electromagnetic/TestEm7/src/PhysListEmG4v71.cc +++ b/examples/extended/medical/GammaTherapy/src/PhysListEmLivermore.cc @@ -24,22 +24,25 @@ // ******************************************************************** // // -// $Id: PhysListEmG4v71.cc,v 1.2 2006/06/29 16:58:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListEmLivermore.cc,v 1.1 2006/11/16 14:42:20 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#include "PhysListEmG4v71.hh" +#include "PhysListEmLivermore.hh" #include "G4ParticleDefinition.hh" #include "G4ProcessManager.hh" -#include "G4ComptonScattering.hh" -#include "G4GammaConversion.hh" -#include "G4PhotoElectricEffect.hh" +#include "G4LowEnergyCompton.hh" +#include "G4LowEnergyGammaConversion.hh" +#include "G4LowEnergyPhotoElectric.hh" +#include "G4LowEnergyRayleigh.hh" -#include "G4MultipleScattering71.hh" +#include "G4MultipleScattering.hh" +#include "G4LowEnergyIonisation.hh" +#include "G4LowEnergyBremsstrahlung.hh" #include "G4eIonisation.hh" #include "G4eBremsstrahlung.hh" #include "G4eplusAnnihilation.hh" @@ -48,25 +51,24 @@ #include "G4MuBremsstrahlung.hh" #include "G4MuPairProduction.hh" -#include "G4hIonisation.hh" -#include "G4ionIonisation.hh" +#include "G4hLowEnergyIonisation.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -PhysListEmG4v71::PhysListEmG4v71(const G4String& name) - : G4VPhysicsConstructor(name) -{} +PhysListEmLivermore::PhysListEmLivermore(const G4String& name) + : G4VPhysicsConstructor(name) +{ } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -PhysListEmG4v71::~PhysListEmG4v71() -{} +PhysListEmLivermore::~PhysListEmLivermore() +{ } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -void PhysListEmG4v71::ConstructProcess() +void PhysListEmLivermore::ConstructProcess() { - // Add standard EM Processes + // Add LowEn or standard EM Processes theParticleIterator->reset(); while( (*theParticleIterator)() ){ @@ -76,41 +78,38 @@ void PhysListEmG4v71::ConstructProcess() if (particleName == "gamma") { // gamma - pmanager->AddDiscreteProcess(new G4PhotoElectricEffect); - pmanager->AddDiscreteProcess(new G4ComptonScattering); - pmanager->AddDiscreteProcess(new G4GammaConversion); + pmanager->AddDiscreteProcess(new G4LowEnergyPhotoElectric); + pmanager->AddDiscreteProcess(new G4LowEnergyCompton); + pmanager->AddDiscreteProcess(new G4LowEnergyGammaConversion); + pmanager->AddDiscreteProcess(new G4LowEnergyRayleigh); } else if (particleName == "e-") { //electron - pmanager->AddProcess(new G4MultipleScattering71, -1, 1,1); - pmanager->AddProcess(new G4eIonisation, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung, -1, 3,3); + pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4LowEnergyIonisation, -1, 2, 2); + pmanager->AddProcess(new G4LowEnergyBremsstrahlung, -1,-1, 3); } else if (particleName == "e+") { //positron - pmanager->AddProcess(new G4MultipleScattering71, -1, 1,1); - pmanager->AddProcess(new G4eIonisation, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung, -1, 3,3); - pmanager->AddProcess(new G4eplusAnnihilation, 0,-1,4); + pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4eIonisation, -1, 2, 2); + pmanager->AddProcess(new G4eBremsstrahlung, -1, 3, 3); + pmanager->AddProcess(new G4eplusAnnihilation, 0,-1, 4); } else if( particleName == "mu+" || particleName == "mu-" ) { //muon - pmanager->AddProcess(new G4MultipleScattering71, -1, 1,1); - pmanager->AddProcess(new G4MuIonisation, -1, 2,2); - pmanager->AddProcess(new G4MuBremsstrahlung, -1, 3,3); - pmanager->AddProcess(new G4MuPairProduction, -1, 4,4); + pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4MuIonisation, -1, 2, 2); + pmanager->AddProcess(new G4MuBremsstrahlung, -1, 3, 3); + pmanager->AddProcess(new G4MuPairProduction, -1, 4, 4); - } else if( particleName == "alpha" || particleName == "GenericIon" ) { - pmanager->AddProcess(new G4MultipleScattering71, -1, 1,1); - pmanager->AddProcess(new G4ionIonisation, -1, 2,2); - } else if ((!particle->IsShortLived()) && (particle->GetPDGCharge() != 0.0) && (particle->GetParticleName() != "chargedgeantino")) { //all others charged particles except geantino - pmanager->AddProcess(new G4MultipleScattering71, -1,1,1); - pmanager->AddProcess(new G4hIonisation, -1,2,2); + pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4hLowEnergyIonisation, -1, 2, 2); } } } diff --git a/examples/extended/medical/GammaTherapy/src/PhysListEmPenelope.cc b/examples/extended/medical/GammaTherapy/src/PhysListEmPenelope.cc new file mode 100644 index 0000000000..9430059247 --- /dev/null +++ b/examples/extended/medical/GammaTherapy/src/PhysListEmPenelope.cc @@ -0,0 +1,121 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: PhysListEmPenelope.cc,v 1.3 2006/11/16 14:42:20 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#include "PhysListEmPenelope.hh" +#include "G4ParticleDefinition.hh" +#include "G4ProcessManager.hh" + +#include "G4PenelopeCompton.hh" +#include "G4PenelopeGammaConversion.hh" +#include "G4PenelopePhotoElectric.hh" +#include "G4PenelopeRayleigh.hh" + +#include "G4MultipleScattering.hh" + +#include "G4PenelopeIonisation.hh" +#include "G4PenelopeBremsstrahlung.hh" +#include "G4PenelopeAnnihilation.hh" + +#include "G4MuIonisation.hh" +#include "G4MuBremsstrahlung.hh" +#include "G4MuPairProduction.hh" + +#include "G4hIonisation.hh" +#include "G4ionIonisation.hh" + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +PhysListEmPenelope::PhysListEmPenelope(const G4String& name) + : G4VPhysicsConstructor(name) +{ } + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +PhysListEmPenelope::~PhysListEmPenelope() +{ } + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void PhysListEmPenelope::ConstructProcess() +{ + // Add Penelope or standard EM Processes + + theParticleIterator->reset(); + while( (*theParticleIterator)() ){ + G4ParticleDefinition* particle = theParticleIterator->value(); + G4ProcessManager* pmanager = particle->GetProcessManager(); + G4String particleName = particle->GetParticleName(); + + if (particleName == "gamma") { + // gamma + pmanager->AddDiscreteProcess(new G4PenelopePhotoElectric); + pmanager->AddDiscreteProcess(new G4PenelopeCompton); + pmanager->AddDiscreteProcess(new G4PenelopeGammaConversion); + pmanager->AddDiscreteProcess(new G4PenelopeRayleigh); + + } else if (particleName == "e-") { + //electron + pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4PenelopeIonisation, -1, 2, 2); + pmanager->AddProcess(new G4PenelopeBremsstrahlung, -1,-1, 3); + + } else if (particleName == "e+") { + //positron + pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4PenelopeIonisation, -1, 2, 2); + pmanager->AddProcess(new G4PenelopeBremsstrahlung, -1,-1, 3); + pmanager->AddProcess(new G4PenelopeAnnihilation, 0,-1, 4); + + } else if( particleName == "mu+" || + particleName == "mu-" ) { + //muon + pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4MuIonisation, -1, 2, 2); + pmanager->AddProcess(new G4MuBremsstrahlung, -1, 3, 3); + pmanager->AddProcess(new G4MuPairProduction, -1, 4, 4); + + } else if( particleName == "alpha" || particleName == "GenericIon" ) { + pmanager->AddProcess(new G4MultipleScattering, -1, 1,1); + pmanager->AddProcess(new G4ionIonisation, -1, 2,2); + + } else if ((!particle->IsShortLived()) && + (particle->GetPDGCharge() != 0.0) && + (particle->GetParticleName() != "chargedgeantino")) { + //all others charged particles except geantino + pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4hIonisation, -1, 2, 2); + } + } +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + diff --git a/examples/extended/medical/GammaTherapy/src/PhysicsList.cc b/examples/extended/medical/GammaTherapy/src/PhysicsList.cc index 9a9f507f67..84508bce91 100644 --- a/examples/extended/medical/GammaTherapy/src/PhysicsList.cc +++ b/examples/extended/medical/GammaTherapy/src/PhysicsList.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: PhysicsList.cc,v 1.10 2006/06/29 17:28:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysicsList.cc,v 1.12 2006/12/13 15:42:39 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -33,7 +33,7 @@ // Author: V.Ivanchenko 03.05.2004 // // Modified: -// 03-10-05 Add g4v71 (V.Ivanchenko) +// 16.11.06 Use components from physics_lists subdirectory (V.Ivanchenko) // //---------------------------------------------------------------------------- // @@ -45,32 +45,24 @@ #include "PhysicsListMessenger.hh" #include "ParticlesBuilder.hh" -#include "G4EmQEDBuilder.hh" -#include "G4EmMuonBuilder.hh" -#include "G4EmHadronBuilder.hh" -#include "G4LowEnergyQEDBuilder.hh" -#include "G4PenelopeQEDBuilder.hh" -#include "G4EmQEDBuilder52.hh" -#include "G4EmMuonBuilder52.hh" -#include "G4EmHadronBuilder52.hh" -#include "G4EmQEDBuilder71.hh" -#include "G4EmMuonBuilder71.hh" -#include "G4EmHadronBuilder71.hh" +#include "G4EmStandardPhysics.hh" +#include "G4EmStandardPhysics71.hh" +#include "G4EmStandardPhysics72.hh" +#include "PhysListEmLivermore.hh" +#include "PhysListEmPenelope.hh" #include "G4StepLimiterBuilder.hh" -#include "DecaysBuilder.hh" -#include "EmHadronElasticBuilder.hh" -#include "EmBinaryCascadeBuilder.hh" -#include "EmIonBinaryCascadeBuilder.hh" -#include "EmGammaNucleusBuilder.hh" +#include "G4DecayPhysics.hh" +#include "G4HadronElasticPhysics.hh" +#include "G4HadronInelasticQBBC.hh" +#include "G4IonBinaryCascadePhysics.hh" +#include "G4EmExtraPhysics.hh" +#include "G4QStoppingPhysics.hh" +//#include "PhysListEmModelPai.hh" #include "G4UnitsTable.hh" #include "G4LossTableManager.hh" #include "G4EmProcessOptions.hh" -#include "G4Gamma.hh" -#include "G4Electron.hh" -#include "G4Positron.hh" - //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... PhysicsList::PhysicsList() @@ -83,8 +75,9 @@ PhysicsList::PhysicsList() bicIsRegisted = false; ionIsRegisted = false; gnucIsRegisted = false; - verbose = 0; - G4LossTableManager::Instance()->SetVerbose(0); + stopIsRegisted = false; + verbose = 1; + G4LossTableManager::Instance()->SetVerbose(1); defaultCutValue = 1.*mm; cutForGamma = defaultCutValue; cutForElectron = defaultCutValue; @@ -94,7 +87,6 @@ PhysicsList::PhysicsList() // Add Physics builders RegisterPhysics(new ParticlesBuilder()); - steplimiter = new G4StepLimiterBuilder(); } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -107,7 +99,7 @@ PhysicsList::~PhysicsList() void PhysicsList::ConstructParticle() { if(verbose > 0) - G4cout << "Construte Particles" << G4endl; + G4cout << "### PhysicsList Construte Particles" << G4endl; G4VModularPhysicsList::ConstructParticle(); } @@ -116,7 +108,7 @@ void PhysicsList::ConstructParticle() void PhysicsList::ConstructProcess() { if(verbose > 0) - G4cout << "Construte Processes" << G4endl; + G4cout << "### PhysicsList Construte Processes" << G4endl; if(!emBuilderIsRegisted) AddPhysicsList("standard"); G4VModularPhysicsList::ConstructProcess(); @@ -136,75 +128,78 @@ void PhysicsList::ConstructProcess() void PhysicsList::AddPhysicsList(const G4String& name) { if(verbose > 0) { - G4cout << "Add Physics <" << name + G4cout << "### PhysicsList Add Physics <" << name << "> emBuilderIsRegisted= " << emBuilderIsRegisted << G4endl; } if ((name == "standard") && !emBuilderIsRegisted) { - RegisterPhysics(new G4EmQEDBuilder()); - RegisterPhysics(steplimiter); - RegisterPhysics(new G4EmMuonBuilder()); - RegisterPhysics(new G4EmHadronBuilder()); + RegisterPhysics(new G4EmStandardPhysics()); emBuilderIsRegisted = true; G4cout << "PhysicsList::AddPhysicsList <" << name << ">" << G4endl; - } else if (name == "g4v52" && !emBuilderIsRegisted) { - RegisterPhysics(new G4EmQEDBuilder52()); - RegisterPhysics(steplimiter); - RegisterPhysics(new G4EmMuonBuilder52()); - RegisterPhysics(new G4EmHadronBuilder52()); + } else if (name == "standard_emv" && !emBuilderIsRegisted) { + RegisterPhysics(new G4EmStandardPhysics71()); emBuilderIsRegisted = true; G4cout << "PhysicsList::AddPhysicsList <" << name << ">" << G4endl; - } else if (name == "g4v71" && !emBuilderIsRegisted) { - RegisterPhysics(new G4EmQEDBuilder71()); - RegisterPhysics(steplimiter); - RegisterPhysics(new G4EmMuonBuilder71()); - RegisterPhysics(new G4EmHadronBuilder71()); + } else if (name == "standard_emx" && !emBuilderIsRegisted) { + RegisterPhysics(new G4EmStandardPhysics72()); emBuilderIsRegisted = true; G4cout << "PhysicsList::AddPhysicsList <" << name << ">" << G4endl; } else if (name == "lowenergy" && !emBuilderIsRegisted) { - RegisterPhysics(new G4LowEnergyQEDBuilder()); - RegisterPhysics(steplimiter); - RegisterPhysics(new G4EmMuonBuilder()); - RegisterPhysics(new G4EmHadronBuilder()); + RegisterPhysics(new PhysListEmLivermore()); emBuilderIsRegisted = true; G4cout << "PhysicsList::AddPhysicsList <" << name << ">" << G4endl; } else if (name == "penelope" && !emBuilderIsRegisted) { - RegisterPhysics(new G4PenelopeQEDBuilder()); - RegisterPhysics(steplimiter); - RegisterPhysics(new G4EmMuonBuilder()); - RegisterPhysics(new G4EmHadronBuilder()); + RegisterPhysics(new PhysListEmPenelope()); emBuilderIsRegisted = true; G4cout << "PhysicsList::AddPhysicsList <" << name << ">" << G4endl; + /* + } else if (name == "pai" && !emBuilderIsRegisted) { + RegisterPhysics(new PhysListEmModelPai()); + emBuilderIsRegisted = true; + G4cout << "PhysicsList::AddPhysicsList <" << name << ">" << G4endl; + */ + } else if (name == "step_limit" && !stepLimiterIsRegisted && emBuilderIsRegisted) { + RegisterPhysics(new G4StepLimiterBuilder()); + stepLimiterIsRegisted = true; + G4cout << "PhysicsList::AddPhysicsList <" << name << ">" << G4endl; - } else if (name == "decay" && !decayIsRegisted) { - RegisterPhysics(new DecaysBuilder()); + } else if (name == "decay" && !decayIsRegisted && emBuilderIsRegisted) { + RegisterPhysics(new G4DecayPhysics()); decayIsRegisted = true; G4cout << "PhysicsList::AddPhysicsList <" << name << ">" << G4endl; - } else if (name == "elastic" && !helIsRegisted) { - RegisterPhysics(new EmHadronElasticBuilder()); + } else if (name == "elastic" && !helIsRegisted && emBuilderIsRegisted) { + RegisterPhysics(new G4HadronElasticPhysics()); helIsRegisted = true; G4cout << "PhysicsList::AddPhysicsList <" << name << ">" << G4endl; - } else if (name == "binary" && !bicIsRegisted) { - RegisterPhysics(new EmBinaryCascadeBuilder()); + } else if (name == "binary" && !bicIsRegisted && emBuilderIsRegisted) { + RegisterPhysics(new G4HadronInelasticQBBC()); bicIsRegisted = true; G4cout << "PhysicsList::AddPhysicsList <" << name << ">" << G4endl; - } else if (name == "binary_ion" && !ionIsRegisted) { - RegisterPhysics(new EmIonBinaryCascadeBuilder()); + } else if (name == "binary_ion" && !ionIsRegisted && emBuilderIsRegisted) { + RegisterPhysics(new G4IonBinaryCascadePhysics()); ionIsRegisted = true; G4cout << "PhysicsList::AddPhysicsList <" << name << ">" << G4endl; - } else if (name == "gamma_nuc" && !gnucIsRegisted) { - RegisterPhysics(new EmGammaNucleusBuilder()); + } else if (name == "gamma_nuc" && !gnucIsRegisted && emBuilderIsRegisted) { + RegisterPhysics(new G4EmExtraPhysics()); + gnucIsRegisted = true; + G4cout << "PhysicsList::AddPhysicsList <" << name << ">" << G4endl; + + } else if (name == "stopping" && !stopIsRegisted && emBuilderIsRegisted) { + RegisterPhysics(new G4QStoppingPhysics()); gnucIsRegisted = true; G4cout << "PhysicsList::AddPhysicsList <" << name << ">" << G4endl; + } else if(!emBuilderIsRegisted) { + G4cout << "PhysicsList::AddPhysicsList <" << name << ">" + << " fail - EM physics should be registered first " << G4endl; } else { G4cout << "PhysicsList::AddPhysicsList <" << name << ">" << " fail - module is already regitered or is unknown " << G4endl; @@ -230,10 +225,11 @@ void PhysicsList::SetVerbose(G4int val) verbose = val; } +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + void PhysicsList::SetCutForGamma(G4double cut) { cutForGamma = cut; - SetParticleCuts(cutForGamma, G4Gamma::Gamma()); } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -241,7 +237,6 @@ void PhysicsList::SetCutForGamma(G4double cut) void PhysicsList::SetCutForElectron(G4double cut) { cutForElectron = cut; - SetParticleCuts(cutForElectron, G4Electron::Electron()); } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -249,7 +244,6 @@ void PhysicsList::SetCutForElectron(G4double cut) void PhysicsList::SetCutForPositron(G4double cut) { cutForPositron = cut; - SetParticleCuts(cutForPositron, G4Positron::Positron()); } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/medical/GammaTherapy/src/PhysicsListMessenger.cc b/examples/extended/medical/GammaTherapy/src/PhysicsListMessenger.cc index 5e7cda2f96..b4b8c39433 100644 --- a/examples/extended/medical/GammaTherapy/src/PhysicsListMessenger.cc +++ b/examples/extended/medical/GammaTherapy/src/PhysicsListMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: PhysicsListMessenger.cc,v 1.3 2006/06/29 17:28:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/optical/LXe/History b/examples/extended/optical/LXe/History index 0d8b1e0e54..efa523f828 100644 --- a/examples/extended/optical/LXe/History +++ b/examples/extended/optical/LXe/History @@ -1,4 +1,4 @@ -$Id: History,v 1.7 2006/05/12 01:12:11 gum Exp $ +$Id: History,v 1.8 2006/09/14 22:26:55 gum Exp $ ------------------------------------------------------------------- ========================================================= @@ -15,6 +15,10 @@ track of all tags. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +14 Sept 2006 Peter Gumplinger (LXe-V08-01-00) +- bug fix (889): set the pointers to G4MaterialPropertiesTable LXe_mt + and MPTPStyrene to NULL in the class constructor of LXeDetectorConstruction. + 11 May 2006 Peter Gumplinger (LXe-V08-00-01) - thanks to Andreia Trindade and Pedro Rodrigues, the WLS time delay can now be a delta function or exponential. diff --git a/examples/extended/optical/LXe/LXe.out b/examples/extended/optical/LXe/LXe.out index 45bebb75ff..589449e1a2 100644 --- a/examples/extended/optical/LXe/LXe.out +++ b/examples/extended/optical/LXe/LXe.out @@ -1,5 +1,5 @@ ********************************************** - Geant4 version $Name: geant4-08-01 $ + Geant4 version $Name: geant4-08-02 $ (12-December-2003) Copyright : Geant4 Collaboration ********************************************** diff --git a/examples/extended/optical/LXe/src/LXeDetectorConstruction.cc b/examples/extended/optical/LXe/src/LXeDetectorConstruction.cc index b461e4cf49..3b274f8aeb 100644 --- a/examples/extended/optical/LXe/src/LXeDetectorConstruction.cc +++ b/examples/extended/optical/LXe/src/LXeDetectorConstruction.cc @@ -54,7 +54,9 @@ G4bool LXeDetectorConstruction::sphereOn = true; //_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ -LXeDetectorConstruction::LXeDetectorConstruction(){ +LXeDetectorConstruction::LXeDetectorConstruction() +: LXe_mt(NULL), MPTPStyrene(NULL) +{ SetDefaults(); detectorMessenger = new LXeDetectorMessenger(this); } diff --git a/examples/extended/parallel/ExDiane/Brachy.cc b/examples/extended/parallel/ExDiane/Brachy.cc index ad2de85a55..688311b8e7 100644 --- a/examples/extended/parallel/ExDiane/Brachy.cc +++ b/examples/extended/parallel/ExDiane/Brachy.cc @@ -25,7 +25,7 @@ // // // $Id: Brachy.cc -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------- // GEANT 4 - ExDiane example diff --git a/examples/extended/parallel/ExDiane/include/BrachyAnalysisManager.hh b/examples/extended/parallel/ExDiane/include/BrachyAnalysisManager.hh index b20c0d418f..db09d2c728 100644 --- a/examples/extended/parallel/ExDiane/include/BrachyAnalysisManager.hh +++ b/examples/extended/parallel/ExDiane/include/BrachyAnalysisManager.hh @@ -29,7 +29,7 @@ // // // $Id: BrachyAnalysisManager.hh,v 1.3 2006/06/29 17:30:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ********************************** // * * diff --git a/examples/extended/parallel/ExDiane/include/BrachyDetectorConstruction.hh b/examples/extended/parallel/ExDiane/include/BrachyDetectorConstruction.hh index 177d7e6cfb..318fc61657 100644 --- a/examples/extended/parallel/ExDiane/include/BrachyDetectorConstruction.hh +++ b/examples/extended/parallel/ExDiane/include/BrachyDetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: BrachyDetectorConstruction.hh,v 1.3 2006/06/29 17:30:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // **************************************** // * * diff --git a/examples/extended/parallel/ExDiane/include/BrachyDetectorConstructionI.hh b/examples/extended/parallel/ExDiane/include/BrachyDetectorConstructionI.hh index 4ad4c0509e..fee6f0827d 100644 --- a/examples/extended/parallel/ExDiane/include/BrachyDetectorConstructionI.hh +++ b/examples/extended/parallel/ExDiane/include/BrachyDetectorConstructionI.hh @@ -25,7 +25,7 @@ // // // $Id: BrachyDetectorConstructionI.hh,v 1.3 2006/06/29 17:31:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // **************************************** // * * diff --git a/examples/extended/parallel/ExDiane/include/BrachyDetectorConstructionIr.hh b/examples/extended/parallel/ExDiane/include/BrachyDetectorConstructionIr.hh index f226006ec2..2d141a6bb8 100644 --- a/examples/extended/parallel/ExDiane/include/BrachyDetectorConstructionIr.hh +++ b/examples/extended/parallel/ExDiane/include/BrachyDetectorConstructionIr.hh @@ -25,7 +25,7 @@ // // // $Id: BrachyDetectorConstructionIr.hh,v 1.3 2006/06/29 17:31:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // **************************************** // * * diff --git a/examples/extended/parallel/ExDiane/include/BrachyDetectorConstructionLeipzig.hh b/examples/extended/parallel/ExDiane/include/BrachyDetectorConstructionLeipzig.hh index b712871868..8f9afece10 100644 --- a/examples/extended/parallel/ExDiane/include/BrachyDetectorConstructionLeipzig.hh +++ b/examples/extended/parallel/ExDiane/include/BrachyDetectorConstructionLeipzig.hh @@ -25,7 +25,7 @@ // // // $Id: BrachyDetectorConstructionLeipzig.hh,v 1.3 2006/06/29 17:31:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //Author: Susanna Guatelli // diff --git a/examples/extended/parallel/ExDiane/include/BrachyDetectorMessenger.hh b/examples/extended/parallel/ExDiane/include/BrachyDetectorMessenger.hh index 9922749767..e7d8fe656d 100644 --- a/examples/extended/parallel/ExDiane/include/BrachyDetectorMessenger.hh +++ b/examples/extended/parallel/ExDiane/include/BrachyDetectorMessenger.hh @@ -33,7 +33,7 @@ // ***************************************** // // $Id: BrachyDetectorMessenger.hh,v 1.3 2006/06/29 17:31:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // #ifndef BrachyDetectorMessenger_h diff --git a/examples/extended/parallel/ExDiane/include/BrachyEventAction.hh b/examples/extended/parallel/ExDiane/include/BrachyEventAction.hh index 9c712124dd..480f9596f0 100644 --- a/examples/extended/parallel/ExDiane/include/BrachyEventAction.hh +++ b/examples/extended/parallel/ExDiane/include/BrachyEventAction.hh @@ -25,7 +25,7 @@ // // // $Id: BrachyEventAction.hh,v 1.3 2006/06/29 17:31:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Code developed by: // S.Guatelli diff --git a/examples/extended/parallel/ExDiane/include/BrachyFactory.hh b/examples/extended/parallel/ExDiane/include/BrachyFactory.hh index ab2a00f1b6..596d64a582 100644 --- a/examples/extended/parallel/ExDiane/include/BrachyFactory.hh +++ b/examples/extended/parallel/ExDiane/include/BrachyFactory.hh @@ -26,7 +26,7 @@ // Code developed by: Susanna Guatelli // // $Id: BrachyFactory.hh,v 1.2 2006/06/29 17:31:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ********************************** // * * diff --git a/examples/extended/parallel/ExDiane/include/BrachyFactoryI.hh b/examples/extended/parallel/ExDiane/include/BrachyFactoryI.hh index 4522cc307f..4257704e56 100644 --- a/examples/extended/parallel/ExDiane/include/BrachyFactoryI.hh +++ b/examples/extended/parallel/ExDiane/include/BrachyFactoryI.hh @@ -35,7 +35,7 @@ // // // $Id: BrachyFactoryI.hh,v 1.2 2006/06/29 17:32:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/parallel/ExDiane/include/BrachyFactoryIr.hh b/examples/extended/parallel/ExDiane/include/BrachyFactoryIr.hh index 4ac5993a1a..c217afefdb 100644 --- a/examples/extended/parallel/ExDiane/include/BrachyFactoryIr.hh +++ b/examples/extended/parallel/ExDiane/include/BrachyFactoryIr.hh @@ -25,7 +25,7 @@ // // // $Id: BrachyFactoryIr.hh,v 1.2 2006/06/29 17:32:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ********************************** // * * diff --git a/examples/extended/parallel/ExDiane/include/BrachyFactoryLeipzig.hh b/examples/extended/parallel/ExDiane/include/BrachyFactoryLeipzig.hh index 1e57a53e53..8d062f3eb5 100644 --- a/examples/extended/parallel/ExDiane/include/BrachyFactoryLeipzig.hh +++ b/examples/extended/parallel/ExDiane/include/BrachyFactoryLeipzig.hh @@ -25,7 +25,7 @@ // // // $Id: BrachyFactoryLeipzig.hh,v 1.2 2006/06/29 17:32:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ********************************** // * * diff --git a/examples/extended/parallel/ExDiane/include/BrachyMaterial.hh b/examples/extended/parallel/ExDiane/include/BrachyMaterial.hh index 187e64b40c..7fddf51eed 100644 --- a/examples/extended/parallel/ExDiane/include/BrachyMaterial.hh +++ b/examples/extended/parallel/ExDiane/include/BrachyMaterial.hh @@ -25,7 +25,7 @@ // // // $Id: BrachyMaterial.hh,v 1.2 2006/06/29 17:32:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ********************************** // * * diff --git a/examples/extended/parallel/ExDiane/include/BrachyPhantomHit.hh b/examples/extended/parallel/ExDiane/include/BrachyPhantomHit.hh index 24c604e39c..4c81b007a9 100644 --- a/examples/extended/parallel/ExDiane/include/BrachyPhantomHit.hh +++ b/examples/extended/parallel/ExDiane/include/BrachyPhantomHit.hh @@ -25,7 +25,7 @@ // // // $Id: BrachyPhantomHit.hh,v 1.3 2006/06/29 17:32:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ******************************** diff --git a/examples/extended/parallel/ExDiane/include/BrachyPhantomROGeometry.hh b/examples/extended/parallel/ExDiane/include/BrachyPhantomROGeometry.hh index 304549b3a7..6a2c0065ea 100644 --- a/examples/extended/parallel/ExDiane/include/BrachyPhantomROGeometry.hh +++ b/examples/extended/parallel/ExDiane/include/BrachyPhantomROGeometry.hh @@ -25,7 +25,7 @@ // // // $Id: BrachyPhantomROGeometry.hh,v 1.3 2006/06/29 17:32:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ************************************ // * * diff --git a/examples/extended/parallel/ExDiane/include/BrachyPhantomSD.hh b/examples/extended/parallel/ExDiane/include/BrachyPhantomSD.hh index 54a0e83bbd..8278fe66b2 100644 --- a/examples/extended/parallel/ExDiane/include/BrachyPhantomSD.hh +++ b/examples/extended/parallel/ExDiane/include/BrachyPhantomSD.hh @@ -25,7 +25,7 @@ // // // $Id: BrachyPhantomSD.hh,v 1.2 2006/06/29 17:32:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ******************************** // * * diff --git a/examples/extended/parallel/ExDiane/include/BrachyPhysicsList.hh b/examples/extended/parallel/ExDiane/include/BrachyPhysicsList.hh index eb762fd369..3951e119f5 100644 --- a/examples/extended/parallel/ExDiane/include/BrachyPhysicsList.hh +++ b/examples/extended/parallel/ExDiane/include/BrachyPhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: BrachyPhysicsList.hh,v 1.3 2006/06/29 17:32:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ********************************** // * * diff --git a/examples/extended/parallel/ExDiane/include/BrachyPrimaryGeneratorAction.hh b/examples/extended/parallel/ExDiane/include/BrachyPrimaryGeneratorAction.hh index fd6aaa005e..fbe3fee7b8 100644 --- a/examples/extended/parallel/ExDiane/include/BrachyPrimaryGeneratorAction.hh +++ b/examples/extended/parallel/ExDiane/include/BrachyPrimaryGeneratorAction.hh @@ -25,7 +25,7 @@ // // // $Id: BrachyPrimaryGeneratorAction.hh,v 1.2 2006/06/29 17:32:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ******************************************** // * * diff --git a/examples/extended/parallel/ExDiane/include/BrachyPrimaryGeneratorActionI.hh b/examples/extended/parallel/ExDiane/include/BrachyPrimaryGeneratorActionI.hh index 0de9469b5a..059a731756 100644 --- a/examples/extended/parallel/ExDiane/include/BrachyPrimaryGeneratorActionI.hh +++ b/examples/extended/parallel/ExDiane/include/BrachyPrimaryGeneratorActionI.hh @@ -25,7 +25,7 @@ // // // $Id: BrachyPrimaryGeneratorActionI.hh,v 1.3 2006/06/29 17:32:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // diff --git a/examples/extended/parallel/ExDiane/include/BrachyPrimaryGeneratorActionIr.hh b/examples/extended/parallel/ExDiane/include/BrachyPrimaryGeneratorActionIr.hh index ab48ce6488..a881a83b8a 100644 --- a/examples/extended/parallel/ExDiane/include/BrachyPrimaryGeneratorActionIr.hh +++ b/examples/extended/parallel/ExDiane/include/BrachyPrimaryGeneratorActionIr.hh @@ -26,7 +26,7 @@ //Author: Susanna Guatelli // // $Id: BrachyPrimaryGeneratorActionIr.hh,v 1.3 2006/06/29 17:32:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ************************************************* // * * diff --git a/examples/extended/parallel/ExDiane/include/BrachyRunAction.hh b/examples/extended/parallel/ExDiane/include/BrachyRunAction.hh index 0a573cd11f..44a7e6241f 100644 --- a/examples/extended/parallel/ExDiane/include/BrachyRunAction.hh +++ b/examples/extended/parallel/ExDiane/include/BrachyRunAction.hh @@ -25,7 +25,7 @@ // // // $Id: BrachyRunAction.hh,v 1.3 2006/06/29 17:32:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //Author: Susanna Guatelli // diff --git a/examples/extended/parallel/ExDiane/include/BrachyRunMessenger.hh b/examples/extended/parallel/ExDiane/include/BrachyRunMessenger.hh index 8c3ca5b35b..9835e208ec 100644 --- a/examples/extended/parallel/ExDiane/include/BrachyRunMessenger.hh +++ b/examples/extended/parallel/ExDiane/include/BrachyRunMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: BrachyRunMessenger.hh,v 1.3 2006/06/29 17:32:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //Author: Susanna Guatelli // diff --git a/examples/extended/parallel/ExDiane/include/BrachySimulation.hh b/examples/extended/parallel/ExDiane/include/BrachySimulation.hh index cc55438404..f8fe4a15c1 100644 --- a/examples/extended/parallel/ExDiane/include/BrachySimulation.hh +++ b/examples/extended/parallel/ExDiane/include/BrachySimulation.hh @@ -25,7 +25,7 @@ // // // $Id: BrachySimulation.hh -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------- // GEANT 4 - Brachytherapy example diff --git a/examples/extended/parallel/ExDiane/src/BrachyAnalysisManager.cc b/examples/extended/parallel/ExDiane/src/BrachyAnalysisManager.cc index 8d9e2a010c..79b4eeca46 100644 --- a/examples/extended/parallel/ExDiane/src/BrachyAnalysisManager.cc +++ b/examples/extended/parallel/ExDiane/src/BrachyAnalysisManager.cc @@ -33,7 +33,7 @@ // ******************************* // // $Id: BrachyAnalysisManager.cc,v 1.3 2006/06/29 17:32:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifdef G4ANALYSIS_USE #include diff --git a/examples/extended/parallel/ExDiane/src/BrachyDetectorConstruction.cc b/examples/extended/parallel/ExDiane/src/BrachyDetectorConstruction.cc index 83ee778ad3..32b365b7d1 100644 --- a/examples/extended/parallel/ExDiane/src/BrachyDetectorConstruction.cc +++ b/examples/extended/parallel/ExDiane/src/BrachyDetectorConstruction.cc @@ -37,7 +37,7 @@ // **************************************** // // $Id: BrachyDetectorConstruction.cc,v 1.3 2006/06/29 17:32:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "BrachyPhantomROGeometry.hh" #include "BrachyPhantomSD.hh" diff --git a/examples/extended/parallel/ExDiane/src/BrachyDetectorConstructionI.cc b/examples/extended/parallel/ExDiane/src/BrachyDetectorConstructionI.cc index 4bf701868a..93490671ed 100644 --- a/examples/extended/parallel/ExDiane/src/BrachyDetectorConstructionI.cc +++ b/examples/extended/parallel/ExDiane/src/BrachyDetectorConstructionI.cc @@ -37,7 +37,7 @@ // **************************************** // // $Id: BrachyDetectorConstructionI.cc,v 1.3 2006/06/29 17:32:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "globals.hh" #include "BrachyDetectorConstructionI.hh" diff --git a/examples/extended/parallel/ExDiane/src/BrachyDetectorConstructionIr.cc b/examples/extended/parallel/ExDiane/src/BrachyDetectorConstructionIr.cc index 47ec8b6aa9..9559e554d1 100644 --- a/examples/extended/parallel/ExDiane/src/BrachyDetectorConstructionIr.cc +++ b/examples/extended/parallel/ExDiane/src/BrachyDetectorConstructionIr.cc @@ -37,7 +37,7 @@ // **************************************** // // $Id: BrachyDetectorConstructionIr.cc,v 1.3 2006/06/29 17:32:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "globals.hh" #include "BrachyDetectorConstructionIr.hh" diff --git a/examples/extended/parallel/ExDiane/src/BrachyDetectorConstructionLeipzig.cc b/examples/extended/parallel/ExDiane/src/BrachyDetectorConstructionLeipzig.cc index ba8f98962b..3731b00ef2 100644 --- a/examples/extended/parallel/ExDiane/src/BrachyDetectorConstructionLeipzig.cc +++ b/examples/extended/parallel/ExDiane/src/BrachyDetectorConstructionLeipzig.cc @@ -38,7 +38,7 @@ // // // $Id: BrachyDetectorConstructionLeipzig.cc,v 1.3 2006/06/29 17:32:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "globals.hh" diff --git a/examples/extended/parallel/ExDiane/src/BrachyDetectorMessenger.cc b/examples/extended/parallel/ExDiane/src/BrachyDetectorMessenger.cc index c7f0f5c5d3..9a8c185ce1 100644 --- a/examples/extended/parallel/ExDiane/src/BrachyDetectorMessenger.cc +++ b/examples/extended/parallel/ExDiane/src/BrachyDetectorMessenger.cc @@ -35,7 +35,7 @@ // // // $Id: BrachyDetectorMessenger.cc,v 1.3 2006/06/29 17:33:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/parallel/ExDiane/src/BrachyEventAction.cc b/examples/extended/parallel/ExDiane/src/BrachyEventAction.cc index 2221368e97..446ecedf2b 100644 --- a/examples/extended/parallel/ExDiane/src/BrachyEventAction.cc +++ b/examples/extended/parallel/ExDiane/src/BrachyEventAction.cc @@ -33,7 +33,7 @@ // ******************************* // // $Id: BrachyEventAction.cc,v 1.3 2006/06/29 17:33:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "BrachyEventAction.hh" #include "G4Event.hh" diff --git a/examples/extended/parallel/ExDiane/src/BrachyFactory.cc b/examples/extended/parallel/ExDiane/src/BrachyFactory.cc index 2b5a8147b1..ffceb67651 100644 --- a/examples/extended/parallel/ExDiane/src/BrachyFactory.cc +++ b/examples/extended/parallel/ExDiane/src/BrachyFactory.cc @@ -35,7 +35,7 @@ // ******************************* // // $Id: BrachyFactory.cc,v 1.3 2006/06/29 17:33:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include"BrachyFactory.hh" diff --git a/examples/extended/parallel/ExDiane/src/BrachyFactoryI.cc b/examples/extended/parallel/ExDiane/src/BrachyFactoryI.cc index 671bc5f15f..21a1692047 100644 --- a/examples/extended/parallel/ExDiane/src/BrachyFactoryI.cc +++ b/examples/extended/parallel/ExDiane/src/BrachyFactoryI.cc @@ -33,7 +33,7 @@ // ******************************* // // $Id: BrachyFactoryI.cc,v 1.2 2006/06/29 17:33:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "BrachyFactoryI.hh" #include "BrachyPrimaryGeneratorActionI.hh" diff --git a/examples/extended/parallel/ExDiane/src/BrachyFactoryIr.cc b/examples/extended/parallel/ExDiane/src/BrachyFactoryIr.cc index 5d01b9508a..43da1c83ef 100644 --- a/examples/extended/parallel/ExDiane/src/BrachyFactoryIr.cc +++ b/examples/extended/parallel/ExDiane/src/BrachyFactoryIr.cc @@ -33,7 +33,7 @@ // ******************************* // // $Id: BrachyFactoryIr.cc,v 1.3 2006/06/29 17:33:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "globals.hh" #include "BrachyFactoryIr.hh" diff --git a/examples/extended/parallel/ExDiane/src/BrachyFactoryLeipzig.cc b/examples/extended/parallel/ExDiane/src/BrachyFactoryLeipzig.cc index 6dba1893f6..590e2c2015 100644 --- a/examples/extended/parallel/ExDiane/src/BrachyFactoryLeipzig.cc +++ b/examples/extended/parallel/ExDiane/src/BrachyFactoryLeipzig.cc @@ -33,7 +33,7 @@ // ******************************* // // $Id: BrachyFactoryLeipzig.cc,v 1.3 2006/06/29 17:33:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "globals.hh" diff --git a/examples/extended/parallel/ExDiane/src/BrachyMaterial.cc b/examples/extended/parallel/ExDiane/src/BrachyMaterial.cc index 64f7599bc5..ec50632d30 100644 --- a/examples/extended/parallel/ExDiane/src/BrachyMaterial.cc +++ b/examples/extended/parallel/ExDiane/src/BrachyMaterial.cc @@ -33,7 +33,7 @@ // ******************************* // // $Id: BrachyMaterial.cc,v 1.3 2006/06/29 17:33:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4MaterialPropertiesTable.hh" diff --git a/examples/extended/parallel/ExDiane/src/BrachyPhantomHit.cc b/examples/extended/parallel/ExDiane/src/BrachyPhantomHit.cc index 5518edd7e1..3e0dd4ffa5 100644 --- a/examples/extended/parallel/ExDiane/src/BrachyPhantomHit.cc +++ b/examples/extended/parallel/ExDiane/src/BrachyPhantomHit.cc @@ -33,7 +33,7 @@ // ******************************** // // $Id: BrachyPhantomHit.cc,v 1.3 2006/06/29 17:33:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "BrachyPhantomHit.hh" #include "G4ios.hh" diff --git a/examples/extended/parallel/ExDiane/src/BrachyPhantomROGeometry.cc b/examples/extended/parallel/ExDiane/src/BrachyPhantomROGeometry.cc index 140d221578..e8597c0a78 100644 --- a/examples/extended/parallel/ExDiane/src/BrachyPhantomROGeometry.cc +++ b/examples/extended/parallel/ExDiane/src/BrachyPhantomROGeometry.cc @@ -33,7 +33,7 @@ // ************************************ // // $Id: BrachyPhantomROGeometry.cc,v 1.3 2006/06/29 17:33:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "BrachyPhantomROGeometry.hh" #include "BrachyDummySD.hh" diff --git a/examples/extended/parallel/ExDiane/src/BrachyPhantomSD.cc b/examples/extended/parallel/ExDiane/src/BrachyPhantomSD.cc index c0d462fbcc..e7cc8ac5c5 100644 --- a/examples/extended/parallel/ExDiane/src/BrachyPhantomSD.cc +++ b/examples/extended/parallel/ExDiane/src/BrachyPhantomSD.cc @@ -33,7 +33,7 @@ // ******************************** // // $Id: BrachyPhantomSD.cc,v 1.4 2006/06/29 17:33:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "BrachyPhantomSD.hh" #include "BrachyPhantomHit.hh" diff --git a/examples/extended/parallel/ExDiane/src/BrachyPhysicsList.cc b/examples/extended/parallel/ExDiane/src/BrachyPhysicsList.cc index ad9232f3c4..d81f96a71d 100644 --- a/examples/extended/parallel/ExDiane/src/BrachyPhysicsList.cc +++ b/examples/extended/parallel/ExDiane/src/BrachyPhysicsList.cc @@ -33,7 +33,7 @@ // ********************************** // // $Id: BrachyPhysicsList.cc,v 1.3 2006/06/29 17:33:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "BrachyPhysicsList.hh" diff --git a/examples/extended/parallel/ExDiane/src/BrachyPrimaryGeneratorAction.cc b/examples/extended/parallel/ExDiane/src/BrachyPrimaryGeneratorAction.cc index 36c44cfca2..f4d115e7a3 100644 --- a/examples/extended/parallel/ExDiane/src/BrachyPrimaryGeneratorAction.cc +++ b/examples/extended/parallel/ExDiane/src/BrachyPrimaryGeneratorAction.cc @@ -38,7 +38,7 @@ // ******************************************** // // $Id: BrachyPrimaryGeneratorAction.cc,v 1.2 2006/06/29 17:33:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "globals.hh" #include "BrachyPrimaryGeneratorAction.hh" diff --git a/examples/extended/parallel/ExDiane/src/BrachyPrimaryGeneratorActionI.cc b/examples/extended/parallel/ExDiane/src/BrachyPrimaryGeneratorActionI.cc index b384e04bf6..3d095657ff 100644 --- a/examples/extended/parallel/ExDiane/src/BrachyPrimaryGeneratorActionI.cc +++ b/examples/extended/parallel/ExDiane/src/BrachyPrimaryGeneratorActionI.cc @@ -37,7 +37,7 @@ // ******************************************** // // $Id: BrachyPrimaryGeneratorActionI.cc,v 1.4 2006/06/29 17:33:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "BrachyPrimaryGeneratorActionI.hh" diff --git a/examples/extended/parallel/ExDiane/src/BrachyPrimaryGeneratorActionIr.cc b/examples/extended/parallel/ExDiane/src/BrachyPrimaryGeneratorActionIr.cc index dafefe4a48..ec41905064 100644 --- a/examples/extended/parallel/ExDiane/src/BrachyPrimaryGeneratorActionIr.cc +++ b/examples/extended/parallel/ExDiane/src/BrachyPrimaryGeneratorActionIr.cc @@ -37,7 +37,7 @@ // ******************************************** // // $Id: BrachyPrimaryGeneratorActionIr.cc,v 1.4 2006/06/29 17:33:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "BrachyPrimaryGeneratorActionIr.hh" diff --git a/examples/extended/parallel/ExDiane/src/BrachyRunAction.cc b/examples/extended/parallel/ExDiane/src/BrachyRunAction.cc index 13c3a70af1..137b2ee2ad 100644 --- a/examples/extended/parallel/ExDiane/src/BrachyRunAction.cc +++ b/examples/extended/parallel/ExDiane/src/BrachyRunAction.cc @@ -39,7 +39,7 @@ // ******************************* // // $Id: BrachyRunAction.cc,v 1.3 2006/06/29 17:33:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "BrachyRunAction.hh" diff --git a/examples/extended/parallel/ExDiane/src/BrachyRunMessenger.cc b/examples/extended/parallel/ExDiane/src/BrachyRunMessenger.cc index 2160d90874..67ce7c7377 100644 --- a/examples/extended/parallel/ExDiane/src/BrachyRunMessenger.cc +++ b/examples/extended/parallel/ExDiane/src/BrachyRunMessenger.cc @@ -27,7 +27,7 @@ // S.Guatelli // // $Id: BrachyRunMessenger.cc,v 1.3 2006/06/29 17:33:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // diff --git a/examples/extended/parallel/ExDiane/src/BrachySimulation.cc b/examples/extended/parallel/ExDiane/src/BrachySimulation.cc index e486e7443a..2c75e90245 100644 --- a/examples/extended/parallel/ExDiane/src/BrachySimulation.cc +++ b/examples/extended/parallel/ExDiane/src/BrachySimulation.cc @@ -25,7 +25,7 @@ // // // $Id: BrachySimulation.cc -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------- // GEANT 4 - Brachytherapy example diff --git a/examples/extended/parallel/ParN02/AnnotatedFiles/G4HCofThisEvent.hh b/examples/extended/parallel/ParN02/AnnotatedFiles/G4HCofThisEvent.hh index 93a0679743..e506178c60 100644 --- a/examples/extended/parallel/ParN02/AnnotatedFiles/G4HCofThisEvent.hh +++ b/examples/extended/parallel/ParN02/AnnotatedFiles/G4HCofThisEvent.hh @@ -25,7 +25,7 @@ // // // $Id: G4HCofThisEvent.hh,v 1.3 2006/06/29 17:33:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4HCofThisEvent_h diff --git a/examples/extended/parallel/ParN02/AnnotatedFiles/G4THitsCollection.hh b/examples/extended/parallel/ParN02/AnnotatedFiles/G4THitsCollection.hh index 053461a8ee..a68ba369b4 100644 --- a/examples/extended/parallel/ParN02/AnnotatedFiles/G4THitsCollection.hh +++ b/examples/extended/parallel/ParN02/AnnotatedFiles/G4THitsCollection.hh @@ -25,7 +25,7 @@ // // // $Id: G4THitsCollection.hh,v 1.3 2006/06/29 17:33:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4THitsCollection_h diff --git a/examples/extended/parallel/ParN02/AnnotatedFiles/G4VHitsCollection.hh b/examples/extended/parallel/ParN02/AnnotatedFiles/G4VHitsCollection.hh index 41599362ae..b83dcd703d 100644 --- a/examples/extended/parallel/ParN02/AnnotatedFiles/G4VHitsCollection.hh +++ b/examples/extended/parallel/ParN02/AnnotatedFiles/G4VHitsCollection.hh @@ -25,7 +25,7 @@ // // // $Id: G4VHitsCollection.hh,v 1.3 2006/06/29 17:34:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VHitsCollection_h diff --git a/examples/extended/parallel/ParN02/History b/examples/extended/parallel/ParN02/History index b1723b473d..77049e2846 100644 --- a/examples/extended/parallel/ParN02/History +++ b/examples/extended/parallel/ParN02/History @@ -1,4 +1,4 @@ -$Id: History,v 1.11 2005/11/28 11:30:55 gcosmo Exp $ +$Id: History,v 1.12 2006/07/05 12:47:48 gcosmo Exp $ ------------------------------------------------------------------- ========================================================= @@ -15,6 +15,10 @@ track of all tags. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +Jul 5th, 2006 G.Cosmo - ParN02-V08-01-00 +---------------------- +- Brought up to date with latest fixes introduced in exampleN02. + Nov 28th, 2005 G.Cooperman - ParN02-V07-01-01 --------------------------- - Updated in sync with the last kernel code. diff --git a/examples/extended/parallel/ParN02/ParN02.cc b/examples/extended/parallel/ParN02/ParN02.cc index 29fd2be2ff..789dd1a260 100644 --- a/examples/extended/parallel/ParN02/ParN02.cc +++ b/examples/extended/parallel/ParN02/ParN02.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: ParN02.cc,v 1.4 2006/06/29 17:33:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: ParN02.cc,v 1.5 2006/07/05 12:45:59 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -52,64 +52,84 @@ //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -int main(int argc,char** argv) { - - //my Verbose output class - G4VSteppingVerbose::SetInstance(new ExN02SteppingVerbose); +int main(int argc,char** argv) +{ + // User Verbose output class + // + G4VSteppingVerbose* verbosity = new ExN02SteppingVerbose; + G4VSteppingVerbose::SetInstance(verbosity); // Run manager + // G4RunManager * runManager = new G4RunManager; - // UserInitialization classes (mandatory) - ExN02DetectorConstruction* ExN02detector = new ExN02DetectorConstruction; - runManager->SetUserInitialization(ExN02detector); - runManager->SetUserInitialization(new ExN02PhysicsList); + // User Initialization classes (mandatory) + // + ExN02DetectorConstruction* detector = new ExN02DetectorConstruction; + runManager->SetUserInitialization(detector); + // + G4VUserPhysicsList* physics = new ExN02PhysicsList; + runManager->SetUserInitialization(physics); #ifdef G4VIS_USE // Visualization, if you choose to have it! + // G4VisManager* visManager = new G4VisExecutive; visManager->Initialize(); #endif - // UserAction classes - runManager->SetUserAction(new ExN02PrimaryGeneratorAction(ExN02detector)); - runManager->SetUserAction(new ExN02RunAction); - runManager->SetUserAction(new ExN02EventAction); - runManager->SetUserAction(new ExN02SteppingAction); + // User Action classes + // + G4VUserPrimaryGeneratorAction* gen_action = new ExN02PrimaryGeneratorAction(detector); + runManager->SetUserAction(gen_action); + // + G4UserRunAction* run_action = new ExN02RunAction; + runManager->SetUserAction(run_action); + // + G4UserEventAction* event_action = new ExN02EventAction; + runManager->SetUserAction(event_action); + // + G4UserSteppingAction* stepping_action = new ExN02SteppingAction; + runManager->SetUserAction(stepping_action); - //Initialize G4 kernel + // Initialize G4 kernel + // runManager->Initialize(); - //get the pointer to the User Interface manager + // Get the pointer to the User Interface manager + // G4UImanager * UI = G4UImanager::GetUIpointer(); - if(argc==1) - // Define (G)UI terminal for interactive mode + if(argc==1) // Define (G)UI terminal for interactive mode { - // G4UIterminal is a (dumb) terminal. + // G4UIterminal is a (dumb) terminal + // G4UIsession * session = 0; #ifdef G4UI_USE_TCSH session = new G4UIterminal(new G4UItcsh); #else session = new G4UIterminal(); #endif - - UI->ApplyCommand("/control/execute vis.mac"); + UI->ApplyCommand("/run/beamOn 10"); session->SessionStart(); delete session; } - else - // Batch mode + else // Batch mode { G4String command = "/control/execute "; G4String fileName = argv[1]; UI->ApplyCommand(command+fileName); } + // Free the store: user actions, physics_list and detector_description are + // owned and deleted by the run manager, so they should not + // be deleted in the main() program ! + #ifdef G4VIS_USE delete visManager; #endif delete runManager; + delete verbosity; return 0; } diff --git a/examples/extended/parallel/ParN02/ParTopC.icc b/examples/extended/parallel/ParN02/ParTopC.icc index 99f604b58e..2a8731ab83 100644 --- a/examples/extended/parallel/ParN02/ParTopC.icc +++ b/examples/extended/parallel/ParN02/ParTopC.icc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: ParTopC.icc,v 1.2 2006/06/29 17:33:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // Parallel Library for Geant4 diff --git a/examples/extended/parallel/ParN02/include/ExN02ChamberParameterisation.hh b/examples/extended/parallel/ParN02/include/ExN02ChamberParameterisation.hh index 78f4fa9319..101e16c00d 100644 --- a/examples/extended/parallel/ParN02/include/ExN02ChamberParameterisation.hh +++ b/examples/extended/parallel/ParN02/include/ExN02ChamberParameterisation.hh @@ -25,7 +25,7 @@ // // // $Id: ExN02ChamberParameterisation.hh,v 1.4 2006/06/29 17:34:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // A parameterisation that describes a series of boxes along Z diff --git a/examples/extended/parallel/ParN02/include/ExN02DetectorConstruction.hh b/examples/extended/parallel/ParN02/include/ExN02DetectorConstruction.hh index 672c3226e8..b9837ad02c 100644 --- a/examples/extended/parallel/ParN02/include/ExN02DetectorConstruction.hh +++ b/examples/extended/parallel/ParN02/include/ExN02DetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: ExN02DetectorConstruction.hh,v 1.2 2006/06/29 17:34:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/parallel/ParN02/include/ExN02DetectorMessenger.hh b/examples/extended/parallel/ParN02/include/ExN02DetectorMessenger.hh index 486b804037..10a1d5f5cd 100644 --- a/examples/extended/parallel/ParN02/include/ExN02DetectorMessenger.hh +++ b/examples/extended/parallel/ParN02/include/ExN02DetectorMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: ExN02DetectorMessenger.hh,v 1.3 2006/06/29 17:34:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/parallel/ParN02/include/ExN02EventAction.hh b/examples/extended/parallel/ParN02/include/ExN02EventAction.hh index 81463bcf69..47113581ee 100644 --- a/examples/extended/parallel/ParN02/include/ExN02EventAction.hh +++ b/examples/extended/parallel/ParN02/include/ExN02EventAction.hh @@ -25,7 +25,7 @@ // // // $Id: ExN02EventAction.hh,v 1.2 2006/06/29 17:34:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/parallel/ParN02/include/ExN02MagneticField.hh b/examples/extended/parallel/ParN02/include/ExN02MagneticField.hh index cad0f12a61..306da32139 100644 --- a/examples/extended/parallel/ParN02/include/ExN02MagneticField.hh +++ b/examples/extended/parallel/ParN02/include/ExN02MagneticField.hh @@ -25,7 +25,7 @@ // // // $Id: ExN02MagneticField.hh,v 1.2 2006/06/29 17:34:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // A class for control of the Magnetic Field of the detector. diff --git a/examples/extended/parallel/ParN02/include/ExN02PhysicsList.hh b/examples/extended/parallel/ParN02/include/ExN02PhysicsList.hh index b328a4fa10..038a9c692e 100644 --- a/examples/extended/parallel/ParN02/include/ExN02PhysicsList.hh +++ b/examples/extended/parallel/ParN02/include/ExN02PhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: ExN02PhysicsList.hh,v 1.2 2006/06/29 17:34:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/parallel/ParN02/include/ExN02PrimaryGeneratorAction.hh b/examples/extended/parallel/ParN02/include/ExN02PrimaryGeneratorAction.hh index beff048330..ecb2d357d9 100644 --- a/examples/extended/parallel/ParN02/include/ExN02PrimaryGeneratorAction.hh +++ b/examples/extended/parallel/ParN02/include/ExN02PrimaryGeneratorAction.hh @@ -25,7 +25,7 @@ // // // $Id: ExN02PrimaryGeneratorAction.hh,v 1.2 2006/06/29 17:34:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/parallel/ParN02/include/ExN02RunAction.hh b/examples/extended/parallel/ParN02/include/ExN02RunAction.hh index 1521c5d9d1..01af20a894 100644 --- a/examples/extended/parallel/ParN02/include/ExN02RunAction.hh +++ b/examples/extended/parallel/ParN02/include/ExN02RunAction.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: ExN02RunAction.hh,v 1.2 2006/06/29 17:34:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: ExN02RunAction.hh,v 1.3 2006/07/05 12:46:00 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -48,7 +48,6 @@ class ExN02RunAction : public G4UserRunAction public: void BeginOfRunAction(const G4Run*); - void EndOfRunAction(const G4Run*); }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/parallel/ParN02/include/ExN02SteppingAction.hh b/examples/extended/parallel/ParN02/include/ExN02SteppingAction.hh index d8f60607c0..d5100d7f2b 100644 --- a/examples/extended/parallel/ParN02/include/ExN02SteppingAction.hh +++ b/examples/extended/parallel/ParN02/include/ExN02SteppingAction.hh @@ -25,7 +25,7 @@ // // // $Id: ExN02SteppingAction.hh,v 1.2 2006/06/29 17:34:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/parallel/ParN02/include/ExN02SteppingVerbose.hh b/examples/extended/parallel/ParN02/include/ExN02SteppingVerbose.hh index 58da0e7434..1c4569a8a6 100644 --- a/examples/extended/parallel/ParN02/include/ExN02SteppingVerbose.hh +++ b/examples/extended/parallel/ParN02/include/ExN02SteppingVerbose.hh @@ -25,7 +25,7 @@ // // // $Id: ExN02SteppingVerbose.hh,v 1.2 2006/06/29 17:34:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // This class manages the verbose outputs in G4SteppingManager. // It inherits from G4SteppingVerbose. diff --git a/examples/extended/parallel/ParN02/include/ExN02TrackerSD.hh b/examples/extended/parallel/ParN02/include/ExN02TrackerSD.hh index 00b7142391..de3557821a 100644 --- a/examples/extended/parallel/ParN02/include/ExN02TrackerSD.hh +++ b/examples/extended/parallel/ParN02/include/ExN02TrackerSD.hh @@ -25,7 +25,7 @@ // // // $Id: ExN02TrackerSD.hh,v 1.2 2006/06/29 17:34:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/parallel/ParN02/include/ParRunManager.hh b/examples/extended/parallel/ParN02/include/ParRunManager.hh index 66a1c149ee..0af6ee4829 100644 --- a/examples/extended/parallel/ParN02/include/ParRunManager.hh +++ b/examples/extended/parallel/ParN02/include/ParRunManager.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: ParRunManager.hh,v 1.3 2006/06/29 17:34:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // Parallel Library for Geant4 diff --git a/examples/extended/parallel/ParN02/src/ExN02ChamberParameterisation.cc b/examples/extended/parallel/ParN02/src/ExN02ChamberParameterisation.cc index f5d28e219b..8504b5dc7b 100644 --- a/examples/extended/parallel/ParN02/src/ExN02ChamberParameterisation.cc +++ b/examples/extended/parallel/ParN02/src/ExN02ChamberParameterisation.cc @@ -25,7 +25,7 @@ // // // $Id: ExN02ChamberParameterisation.cc,v 1.3 2006/06/29 17:34:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/parallel/ParN02/src/ExN02DetectorConstruction.cc b/examples/extended/parallel/ParN02/src/ExN02DetectorConstruction.cc index 6b11fecc41..bb3f589035 100644 --- a/examples/extended/parallel/ParN02/src/ExN02DetectorConstruction.cc +++ b/examples/extended/parallel/ParN02/src/ExN02DetectorConstruction.cc @@ -25,7 +25,7 @@ // // // $Id: ExN02DetectorConstruction.cc,v 1.3 2006/06/29 17:34:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/parallel/ParN02/src/ExN02DetectorMessenger.cc b/examples/extended/parallel/ParN02/src/ExN02DetectorMessenger.cc index 6e3e19e48e..955848cff3 100644 --- a/examples/extended/parallel/ParN02/src/ExN02DetectorMessenger.cc +++ b/examples/extended/parallel/ParN02/src/ExN02DetectorMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: ExN02DetectorMessenger.cc,v 1.4 2006/06/29 17:34:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/parallel/ParN02/src/ExN02EventAction.cc b/examples/extended/parallel/ParN02/src/ExN02EventAction.cc index 61f04aeb94..4f512457a5 100644 --- a/examples/extended/parallel/ParN02/src/ExN02EventAction.cc +++ b/examples/extended/parallel/ParN02/src/ExN02EventAction.cc @@ -25,7 +25,7 @@ // // // $Id: ExN02EventAction.cc,v 1.2 2006/06/29 17:34:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/parallel/ParN02/src/ExN02MagneticField.cc b/examples/extended/parallel/ParN02/src/ExN02MagneticField.cc index baf5eb108e..4c676a938c 100644 --- a/examples/extended/parallel/ParN02/src/ExN02MagneticField.cc +++ b/examples/extended/parallel/ParN02/src/ExN02MagneticField.cc @@ -25,7 +25,7 @@ // // // $Id: ExN02MagneticField.cc,v 1.2 2006/06/29 17:34:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // User Field class implementation. // diff --git a/examples/extended/parallel/ParN02/src/ExN02PhysicsList.cc b/examples/extended/parallel/ParN02/src/ExN02PhysicsList.cc index b5156f268a..51d2164564 100644 --- a/examples/extended/parallel/ParN02/src/ExN02PhysicsList.cc +++ b/examples/extended/parallel/ParN02/src/ExN02PhysicsList.cc @@ -25,7 +25,7 @@ // // // $Id: ExN02PhysicsList.cc,v 1.4 2006/06/29 17:34:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/parallel/ParN02/src/ExN02PrimaryGeneratorAction.cc b/examples/extended/parallel/ParN02/src/ExN02PrimaryGeneratorAction.cc index 832ab0065b..e9d6938e0f 100644 --- a/examples/extended/parallel/ParN02/src/ExN02PrimaryGeneratorAction.cc +++ b/examples/extended/parallel/ParN02/src/ExN02PrimaryGeneratorAction.cc @@ -25,7 +25,7 @@ // // // $Id: ExN02PrimaryGeneratorAction.cc,v 1.2 2006/06/29 17:34:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/parallel/ParN02/src/ExN02RunAction.cc b/examples/extended/parallel/ParN02/src/ExN02RunAction.cc index 628dd19f0c..049e846b78 100644 --- a/examples/extended/parallel/ParN02/src/ExN02RunAction.cc +++ b/examples/extended/parallel/ParN02/src/ExN02RunAction.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: ExN02RunAction.cc,v 1.2 2006/06/29 17:34:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: ExN02RunAction.cc,v 1.3 2006/07/05 12:46:00 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -34,7 +34,6 @@ #include "G4Run.hh" #include "G4UImanager.hh" -#include "G4VVisManager.hh" #include "G4ios.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -52,22 +51,6 @@ ExN02RunAction::~ExN02RunAction() void ExN02RunAction::BeginOfRunAction(const G4Run* aRun) { G4cout << "### Run " << aRun->GetRunID() << " start." << G4endl; - - if (G4VVisManager::GetConcreteInstance()) - { - G4UImanager* UI = G4UImanager::GetUIpointer(); - UI->ApplyCommand("/vis/scene/notifyHandlers"); - } -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void ExN02RunAction::EndOfRunAction(const G4Run*) -{ - if (G4VVisManager::GetConcreteInstance()) - { - G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/update"); - } } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/parallel/ParN02/src/ExN02SteppingAction.cc b/examples/extended/parallel/ParN02/src/ExN02SteppingAction.cc index 3dd7cce0cf..06bba0e954 100644 --- a/examples/extended/parallel/ParN02/src/ExN02SteppingAction.cc +++ b/examples/extended/parallel/ParN02/src/ExN02SteppingAction.cc @@ -25,7 +25,7 @@ // // // $Id: ExN02SteppingAction.cc,v 1.2 2006/06/29 17:35:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/parallel/ParN02/src/ExN02SteppingVerbose.cc b/examples/extended/parallel/ParN02/src/ExN02SteppingVerbose.cc index 3c4d133161..e977fe7f19 100644 --- a/examples/extended/parallel/ParN02/src/ExN02SteppingVerbose.cc +++ b/examples/extended/parallel/ParN02/src/ExN02SteppingVerbose.cc @@ -25,7 +25,7 @@ // // // $Id: ExN02SteppingVerbose.cc,v 1.4 2006/06/29 17:35:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/parallel/ParN02/src/ExN02TrackerHit.cc b/examples/extended/parallel/ParN02/src/ExN02TrackerHit.cc index 651756bc76..e43c8e0b05 100644 --- a/examples/extended/parallel/ParN02/src/ExN02TrackerHit.cc +++ b/examples/extended/parallel/ParN02/src/ExN02TrackerHit.cc @@ -25,7 +25,7 @@ // // // $Id: ExN02TrackerHit.cc,v 1.3 2006/06/29 17:35:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/parallel/ParN02/src/ExN02TrackerSD.cc b/examples/extended/parallel/ParN02/src/ExN02TrackerSD.cc index aad76ace85..5b6cdcc0c7 100644 --- a/examples/extended/parallel/ParN02/src/ExN02TrackerSD.cc +++ b/examples/extended/parallel/ParN02/src/ExN02TrackerSD.cc @@ -25,7 +25,7 @@ // // // $Id: ExN02TrackerSD.cc,v 1.3 2006/06/29 17:35:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/parallel/ParN04/AnnotatedFiles/G4HCofThisEvent.hh b/examples/extended/parallel/ParN04/AnnotatedFiles/G4HCofThisEvent.hh index b225e6731d..29c3cd4bbe 100644 --- a/examples/extended/parallel/ParN04/AnnotatedFiles/G4HCofThisEvent.hh +++ b/examples/extended/parallel/ParN04/AnnotatedFiles/G4HCofThisEvent.hh @@ -25,7 +25,7 @@ // // // $Id: G4HCofThisEvent.hh,v 1.3 2006/06/29 17:35:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4HCofThisEvent_h diff --git a/examples/extended/parallel/ParN04/AnnotatedFiles/G4THitsCollection.hh b/examples/extended/parallel/ParN04/AnnotatedFiles/G4THitsCollection.hh index 017849bca3..d65c7a5e6c 100644 --- a/examples/extended/parallel/ParN04/AnnotatedFiles/G4THitsCollection.hh +++ b/examples/extended/parallel/ParN04/AnnotatedFiles/G4THitsCollection.hh @@ -25,7 +25,7 @@ // // // $Id: G4THitsCollection.hh,v 1.3 2006/06/29 17:35:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4THitsCollection_h diff --git a/examples/extended/parallel/ParN04/AnnotatedFiles/G4VHitsCollection.hh b/examples/extended/parallel/ParN04/AnnotatedFiles/G4VHitsCollection.hh index a62e2f957d..164a0a44aa 100644 --- a/examples/extended/parallel/ParN04/AnnotatedFiles/G4VHitsCollection.hh +++ b/examples/extended/parallel/ParN04/AnnotatedFiles/G4VHitsCollection.hh @@ -25,7 +25,7 @@ // // // $Id: G4VHitsCollection.hh,v 1.3 2006/06/29 17:35:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VHitsCollection_h diff --git a/examples/extended/parallel/ParN04/GNUmakefile b/examples/extended/parallel/ParN04/GNUmakefile index 24c60715ac..54d3d3151a 100644 --- a/examples/extended/parallel/ParN04/GNUmakefile +++ b/examples/extended/parallel/ParN04/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.1 2002/03/05 15:22:04 gcosmo Exp $ +# $Id: GNUmakefile,v 1.3 2006/11/16 13:38:46 gunter Exp $ # -------------------------------------------------------------- # GNUmakefile for examples module. Gabriele Cosmo, 06/04/98. # -------------------------------------------------------------- @@ -13,18 +13,11 @@ ifndef G4INSTALL G4INSTALL = ../../.. endif + .PHONY: all -all: lib bin +all: had_list lib bin + +had_list: + @echo "This example uses the QGSP 'educated guess physics list'" include $(G4INSTALL)/config/binmake.gmk - -CXXFLAGS_WITHOUT_O := $(filter-out -O% , $(CXXFLAGS)) -CXXFLAGS_WITHOUT_O := $(filter-out +O% , $(CXXFLAGS_WITHOUT_O)) - -ifeq ($(G4SYSTEM),HP-aCC) -COMPILER := $(shell aCC -V 2>&1) -ifeq ($(COMPILER), aCC: HP ANSI C++ B3910B A.01.15) -$(G4TMP)/$(G4SYSTEM)/$(name)/ExN04HadronPhysics.o: src/ExN04HadronPhysics.cc - $(CXX) $(CXXFLAGS_WITHOUT_O) $(CPPFLAGS) -c $(OUT_OBJ)$@ src/ExN04HadronPhysics.cc -endif -endif diff --git a/examples/extended/parallel/ParN04/History b/examples/extended/parallel/ParN04/History index 6e1221c813..47dcda7462 100644 --- a/examples/extended/parallel/ParN04/History +++ b/examples/extended/parallel/ParN04/History @@ -1,4 +1,4 @@ -$Id: History,v 1.10 2005/11/28 11:30:48 gcosmo Exp $ +$Id: History,v 1.13 2006/11/18 03:45:57 asaim Exp $ ------------------------------------------------------------------- ========================================================= @@ -15,6 +15,21 @@ track of all tags. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +Nov 17th, 2006 M.Asai - ParN04-V08-01-02 +--------------------- +- Fix a bug in ExN04CalorimeterSD.cc which was copied from original + novice/N04. + +Nov 16th, 2006 G.Folger - ParN04-V08-01-01 +----------------------- +- Adapt Gnumakefile to moved physics lists, hadronic_lists.gmk no longer + needed. + +Jul 5th, 2006 G.Cosmo - ParN04-V08-01-00 +---------------------- +- Brought up to date with latest fixes introduced in exampleN04, + in order to make it run with release 8 series. + Nov 28th, 2005 G.Cooperman - ParN04-V07-01-01 --------------------------- - Updated in sync with the last kernel code. diff --git a/examples/extended/parallel/ParN04/ParN04.cc b/examples/extended/parallel/ParN04/ParN04.cc index 78064a0f56..9cea2d7073 100644 --- a/examples/extended/parallel/ParN04/ParN04.cc +++ b/examples/extended/parallel/ParN04/ParN04.cc @@ -24,17 +24,12 @@ // ******************************************************************** // // -// $Id: ParN04.cc,v 1.5 2006/06/29 17:35:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: ParN04.cc,v 1.6 2006/07/05 13:07:54 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- // GEANT 4 - ParN04 -// -// -------------------------------------------------------------- -// Comments -// -// // -------------------------------------------------------------- @@ -44,7 +39,7 @@ #include "G4UItcsh.hh" #include "ExN04DetectorConstruction.hh" -#include "ExN04PhysicsList.hh" +#include "QGSP.hh" #include "ExN04PrimaryGeneratorAction.hh" #include "ExN04RunAction.hh" #include "ExN04EventAction.hh" @@ -61,34 +56,60 @@ int main(int argc,char** argv) { - G4VSteppingVerbose::SetInstance(new ExN04SteppingVerbose); + // User Verbose output class + // + G4VSteppingVerbose* verbosity = new ExN04SteppingVerbose; + G4VSteppingVerbose::SetInstance(verbosity); + // Run manager + // G4RunManager* runManager = new G4RunManager; - runManager->SetUserInitialization(new ExN04DetectorConstruction); - runManager->SetUserInitialization(new ExN04PhysicsList); + // User Initialization classes (mandatory) + // + G4VUserDetectorConstruction* detector = new ExN04DetectorConstruction; + runManager->SetUserInitialization(detector); + // + G4VUserPhysicsList* physics = new QGSP; + runManager->SetUserInitialization(physics); #ifdef G4VIS_USE // Visualization, if you choose to have it! + // G4VisManager* visManager = new G4VisExecutive; visManager->Initialize(); #endif runManager->Initialize(); - runManager->SetUserAction(new ExN04PrimaryGeneratorAction); - runManager->SetUserAction(new ExN04RunAction); - runManager->SetUserAction(new ExN04EventAction); - runManager->SetUserAction(new ExN04StackingAction); - runManager->SetUserAction(new ExN04TrackingAction); - runManager->SetUserAction(new ExN04SteppingAction); + // User Action classes + // + G4VUserPrimaryGeneratorAction* gen_action = new ExN04PrimaryGeneratorAction; + runManager->SetUserAction(gen_action); + // + G4UserRunAction* run_action = new ExN04RunAction; + runManager->SetUserAction(run_action); + // + G4UserEventAction* event_action = new ExN04EventAction; + runManager->SetUserAction(event_action); + // + G4UserStackingAction* stacking_action = new ExN04StackingAction; + runManager->SetUserAction(stacking_action); + // + G4UserTrackingAction* tracking_action = new ExN04TrackingAction; + runManager->SetUserAction(tracking_action); + // + G4UserSteppingAction* stepping_action = new ExN04SteppingAction; + runManager->SetUserAction(stepping_action); - //get the pointer to the User Interface manager + // Get the pointer to the User Interface manager + // G4UImanager* UImanager = G4UImanager::GetUIpointer(); - if(argc==1) + if(argc==1) // Define (G)UI terminal for interactive mode { - // G4UIterminal is a (dumb) terminal. + // G4UIterminal is a (dumb) terminal + // #ifdef G4UI_USE_TCSH G4UIsession* session = new G4UIterminal(new G4UItcsh); #else @@ -98,18 +119,22 @@ int main(int argc,char** argv) session->SessionStart(); delete session; } - else + else // Batch mode { G4String command = "/control/execute "; G4String fileName = argv[1]; UImanager->ApplyCommand(command+fileName); } - delete runManager; + // Free the store: user actions, physics_list and detector_description are + // owned and deleted by the run manager, so they should not + // be deleted in the main() program ! + #ifdef G4VIS_USE delete visManager; #endif + delete runManager; + delete verbosity; return 0; } - diff --git a/examples/extended/parallel/ParN04/ParTopC.icc b/examples/extended/parallel/ParN04/ParTopC.icc index 952b4ec64e..035532e9ce 100644 --- a/examples/extended/parallel/ParN04/ParTopC.icc +++ b/examples/extended/parallel/ParN04/ParTopC.icc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: ParTopC.icc,v 1.2 2006/06/29 17:35:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // Parallel Library for Geant4 diff --git a/examples/novice/N04/hadronic_lists.gmk b/examples/extended/parallel/ParN04/hadronic_lists.gmk similarity index 100% rename from examples/novice/N04/hadronic_lists.gmk rename to examples/extended/parallel/ParN04/hadronic_lists.gmk diff --git a/examples/extended/parallel/ParN04/include/ExN04EMPhysics.hh b/examples/extended/parallel/ParN04/include/ExN04EMPhysics.hh index 6a56c8d23d..a29d8f8da3 100644 --- a/examples/extended/parallel/ParN04/include/ExN04EMPhysics.hh +++ b/examples/extended/parallel/ParN04/include/ExN04EMPhysics.hh @@ -25,7 +25,7 @@ // // // $Id: ExN04EMPhysics.hh,v 1.2 2006/06/29 17:36:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/examples/extended/parallel/ParN04/include/ExN04GeneralPhysics.hh b/examples/extended/parallel/ParN04/include/ExN04GeneralPhysics.hh deleted file mode 100644 index 3d535f4fe7..0000000000 --- a/examples/extended/parallel/ParN04/include/ExN04GeneralPhysics.hh +++ /dev/null @@ -1,80 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: ExN04GeneralPhysics.hh,v 1.2 2006/06/29 17:36:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// -// ------------------------------------------------------------ -// GEANT 4 class header file -// Class Description: -// This class is an derived class of G4VPhysicsConstructor -// -// ------------------------------------------- -// History -// first version 12 Nov. 2000 by H.Kurashige -// ------------------------------------------------------------ -#ifndef ExN04GeneralPhysics_h -#define ExN04GeneralPhysics_h 1 - -#include "globals.hh" -#include "G4ios.hh" - -#include "G4VPhysicsConstructor.hh" - - -#include "G4Decay.hh" - -class ExN04GeneralPhysics : public G4VPhysicsConstructor -{ - public: - ExN04GeneralPhysics(const G4String& name = "general"); - virtual ~ExN04GeneralPhysics(); - - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); - - protected: - G4Decay fDecayProcess; -}; - - -#endif - - - - - - - - diff --git a/examples/extended/parallel/ParN04/include/ExN04HadronPhysics.hh b/examples/extended/parallel/ParN04/include/ExN04HadronPhysics.hh deleted file mode 100644 index b0646830f9..0000000000 --- a/examples/extended/parallel/ParN04/include/ExN04HadronPhysics.hh +++ /dev/null @@ -1,347 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// $Id: ExN04HadronPhysics.hh,v 1.4 2006/06/29 17:36:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// ------------------------------------------------------------ -// GEANT 4 class header file -// -// This class is an derived class of G4VPhysicsConstructor -// -// ------------------------------------------------------------ -#ifndef ExN04HadronPhysics_h -#define ExN04HadronPhysics_h 1 - -#include "globals.hh" -#include "G4ios.hh" -#include - -#include "G4VPhysicsConstructor.hh" - -#include "G4MultipleScattering.hh" -#include "G4hIonisation.hh" - -#include "G4HadronElasticProcess.hh" -#include "G4HadronFissionProcess.hh" -#include "G4HadronCaptureProcess.hh" - -#include "G4PionPlusInelasticProcess.hh" -#include "G4PionMinusInelasticProcess.hh" -#include "G4KaonPlusInelasticProcess.hh" -#include "G4KaonZeroSInelasticProcess.hh" -#include "G4KaonZeroLInelasticProcess.hh" -#include "G4KaonMinusInelasticProcess.hh" -#include "G4ProtonInelasticProcess.hh" -#include "G4AntiProtonInelasticProcess.hh" -#include "G4NeutronInelasticProcess.hh" -#include "G4AntiNeutronInelasticProcess.hh" -#include "G4LambdaInelasticProcess.hh" -#include "G4AntiLambdaInelasticProcess.hh" -#include "G4SigmaPlusInelasticProcess.hh" -#include "G4SigmaMinusInelasticProcess.hh" -#include "G4AntiSigmaPlusInelasticProcess.hh" -#include "G4AntiSigmaMinusInelasticProcess.hh" -#include "G4XiZeroInelasticProcess.hh" -#include "G4XiMinusInelasticProcess.hh" -#include "G4AntiXiZeroInelasticProcess.hh" -#include "G4AntiXiMinusInelasticProcess.hh" -#include "G4DeuteronInelasticProcess.hh" -#include "G4TritonInelasticProcess.hh" -#include "G4AlphaInelasticProcess.hh" -#include "G4OmegaMinusInelasticProcess.hh" -#include "G4AntiOmegaMinusInelasticProcess.hh" - -// Low-energy Models -#include "G4LElastic.hh" -#include "G4LFission.hh" -#include "G4LCapture.hh" - -#include "G4LEPionPlusInelastic.hh" -#include "G4LEPionMinusInelastic.hh" -#include "G4LEKaonPlusInelastic.hh" -#include "G4LEKaonZeroSInelastic.hh" -#include "G4LEKaonZeroLInelastic.hh" -#include "G4LEKaonMinusInelastic.hh" -#include "G4LEProtonInelastic.hh" -#include "G4LEAntiProtonInelastic.hh" -#include "G4LENeutronInelastic.hh" -#include "G4LEAntiNeutronInelastic.hh" -#include "G4LELambdaInelastic.hh" -#include "G4LEAntiLambdaInelastic.hh" -#include "G4LESigmaPlusInelastic.hh" -#include "G4LESigmaMinusInelastic.hh" -#include "G4LEAntiSigmaPlusInelastic.hh" -#include "G4LEAntiSigmaMinusInelastic.hh" -#include "G4LEXiZeroInelastic.hh" -#include "G4LEXiMinusInelastic.hh" -#include "G4LEAntiXiZeroInelastic.hh" -#include "G4LEAntiXiMinusInelastic.hh" -#include "G4LEDeuteronInelastic.hh" -#include "G4LETritonInelastic.hh" -#include "G4LEAlphaInelastic.hh" -#include "G4LEOmegaMinusInelastic.hh" -#include "G4LEAntiOmegaMinusInelastic.hh" - -// High-energy Models - -#include "G4HEPionPlusInelastic.hh" -#include "G4HEPionMinusInelastic.hh" -#include "G4HEKaonPlusInelastic.hh" -#include "G4HEKaonZeroInelastic.hh" -#include "G4HEKaonZeroInelastic.hh" -#include "G4HEKaonMinusInelastic.hh" -#include "G4HEProtonInelastic.hh" -#include "G4HEAntiProtonInelastic.hh" -#include "G4HENeutronInelastic.hh" -#include "G4HEAntiNeutronInelastic.hh" -#include "G4HELambdaInelastic.hh" -#include "G4HEAntiLambdaInelastic.hh" -#include "G4HESigmaPlusInelastic.hh" -#include "G4HESigmaMinusInelastic.hh" -#include "G4HEAntiSigmaPlusInelastic.hh" -#include "G4HEAntiSigmaMinusInelastic.hh" -#include "G4HEXiZeroInelastic.hh" -#include "G4HEXiMinusInelastic.hh" -#include "G4HEAntiXiZeroInelastic.hh" -#include "G4HEAntiXiMinusInelastic.hh" -#include "G4HEOmegaMinusInelastic.hh" -#include "G4HEAntiOmegaMinusInelastic.hh" - -// Stopping processes -#include "G4AntiProtonAnnihilationAtRest.hh" -#include "G4AntiNeutronAnnihilationAtRest.hh" - -#ifdef TRIUMF_STOP_PIMINUS -#include "G4PionMinusAbsorptionAtRest.hh" -#else -#include "G4PiMinusAbsorptionAtRest.hh" -#endif -#ifdef TRIUMF_STOP_KMINUS -#include "G4KaonMinusAbsorption.hh" -#else -#include "G4KaonMinusAbsorptionAtRest.hh" -#endif - -// quark gluon string model with chips afterburner. -#include "G4TheoFSGenerator.hh" -#include "G4ExcitationHandler.hh" -#include "G4PreCompoundModel.hh" -#include "G4GeneratorPrecompoundInterface.hh" -#include "G4QGSModel.hh" -#include "G4QGSParticipants.hh" -#include "G4QGSMFragmentation.hh" -#include "G4ExcitedStringDecay.hh" - -class ExN04HadronPhysics : public G4VPhysicsConstructor -{ - public: - ExN04HadronPhysics(const G4String& name ="hadron"); - virtual ~ExN04HadronPhysics(); - - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); - - protected: - // Elastic Process - G4HadronElasticProcess theElasticProcess; - G4LElastic* theElasticModel; - - // Pi + - G4PionPlusInelasticProcess thePionPlusInelastic; - G4LEPionPlusInelastic* theLEPionPlusModel; - G4MultipleScattering thePionPlusMult; - G4hIonisation thePionPlusIonisation; - - // Pi - - G4PionMinusInelasticProcess thePionMinusInelastic; - G4LEPionMinusInelastic* theLEPionMinusModel; - G4MultipleScattering thePionMinusMult; - G4hIonisation thePionMinusIonisation; -#ifdef TRIUMF_STOP_PIMINUS - G4PionMinusAbsorptionAtRest thePionMinusAbsorption; -#else - G4PiMinusAbsorptionAtRest thePionMinusAbsorption; -#endif - - // pi+ and pi- - - G4TheoFSGenerator theTheoModel; - G4ExcitationHandler theHandler; - G4PreCompoundModel * thePreEquilib; - G4GeneratorPrecompoundInterface theCascade; - G4QGSModel< G4QGSParticipants > theStringModel; - G4QGSMFragmentation theFragmentation; - G4ExcitedStringDecay * theStringDecay; - - // K + - G4KaonPlusInelasticProcess theKaonPlusInelastic; - G4LEKaonPlusInelastic* theLEKaonPlusModel; - G4HEKaonPlusInelastic* theHEKaonPlusModel; - G4MultipleScattering theKaonPlusMult; - G4hIonisation theKaonPlusIonisation; - - // K - - G4KaonMinusInelasticProcess theKaonMinusInelastic; - G4LEKaonMinusInelastic* theLEKaonMinusModel; - G4HEKaonMinusInelastic* theHEKaonMinusModel; - G4MultipleScattering theKaonMinusMult; - G4hIonisation theKaonMinusIonisation; -#ifdef TRIUMF_STOP_KMINUS - G4KaonMinusAbsorption theKaonMinusAbsorption; -#else - G4PiMinusAbsorptionAtRest theKaonMinusAbsorption; -#endif - - // K0L - G4KaonZeroLInelasticProcess theKaonZeroLInelastic; - G4LEKaonZeroLInelastic* theLEKaonZeroLModel; - G4HEKaonZeroInelastic* theHEKaonZeroLModel; - - // K0S - G4KaonZeroSInelasticProcess theKaonZeroSInelastic; - G4LEKaonZeroSInelastic* theLEKaonZeroSModel; - G4HEKaonZeroInelastic* theHEKaonZeroSModel; - - // Proton - G4ProtonInelasticProcess theProtonInelastic; - G4LEProtonInelastic* theLEProtonModel; - G4HEProtonInelastic* theHEProtonModel; - G4MultipleScattering theProtonMult; - G4hIonisation theProtonIonisation; - - // anti-proton - G4AntiProtonInelasticProcess theAntiProtonInelastic; - G4LEAntiProtonInelastic* theLEAntiProtonModel; - G4HEAntiProtonInelastic* theHEAntiProtonModel; - G4MultipleScattering theAntiProtonMult; - G4hIonisation theAntiProtonIonisation; - G4AntiProtonAnnihilationAtRest theAntiProtonAnnihilation; - - // neutron - G4NeutronInelasticProcess theNeutronInelastic; - G4LENeutronInelastic* theLENeutronModel; - G4HENeutronInelastic* theHENeutronModel; - G4HadronFissionProcess theNeutronFission; - G4LFission* theNeutronFissionModel; - G4HadronCaptureProcess theNeutronCapture; - G4LCapture* theNeutronCaptureModel; - - - // anti-neutron - G4AntiNeutronInelasticProcess theAntiNeutronInelastic; - G4LEAntiNeutronInelastic* theLEAntiNeutronModel; - G4HEAntiNeutronInelastic* theHEAntiNeutronModel; - G4AntiNeutronAnnihilationAtRest theAntiNeutronAnnihilation; - - // Lambda - G4LambdaInelasticProcess theLambdaInelastic; - G4LELambdaInelastic* theLELambdaModel; - G4HELambdaInelastic* theHELambdaModel; - - // AntiLambda - G4AntiLambdaInelasticProcess theAntiLambdaInelastic; - G4LEAntiLambdaInelastic* theLEAntiLambdaModel; - G4HEAntiLambdaInelastic* theHEAntiLambdaModel; - - // SigmaMinus - G4SigmaMinusInelasticProcess theSigmaMinusInelastic; - G4LESigmaMinusInelastic* theLESigmaMinusModel; - G4HESigmaMinusInelastic* theHESigmaMinusModel; - G4MultipleScattering theSigmaMinusMult; - G4hIonisation theSigmaMinusIonisation; - - // AntiSigmaMinus - G4AntiSigmaMinusInelasticProcess theAntiSigmaMinusInelastic; - G4LEAntiSigmaMinusInelastic* theLEAntiSigmaMinusModel; - G4HEAntiSigmaMinusInelastic* theHEAntiSigmaMinusModel; - G4MultipleScattering theAntiSigmaMinusMult; - G4hIonisation theAntiSigmaMinusIonisation; - - // SigmaPlus - G4SigmaPlusInelasticProcess theSigmaPlusInelastic; - G4LESigmaPlusInelastic* theLESigmaPlusModel; - G4HESigmaPlusInelastic* theHESigmaPlusModel; - G4MultipleScattering theSigmaPlusMult; - G4hIonisation theSigmaPlusIonisation; - - // AntiSigmaPlus - G4AntiSigmaPlusInelasticProcess theAntiSigmaPlusInelastic; - G4LEAntiSigmaPlusInelastic* theLEAntiSigmaPlusModel; - G4HEAntiSigmaPlusInelastic* theHEAntiSigmaPlusModel; - G4MultipleScattering theAntiSigmaPlusMult; - G4hIonisation theAntiSigmaPlusIonisation; - - // XiZero - G4XiZeroInelasticProcess theXiZeroInelastic; - G4LEXiZeroInelastic* theLEXiZeroModel; - G4HEXiZeroInelastic* theHEXiZeroModel; - - // AntiXiZero - G4AntiXiZeroInelasticProcess theAntiXiZeroInelastic; - G4LEAntiXiZeroInelastic* theLEAntiXiZeroModel; - G4HEAntiXiZeroInelastic* theHEAntiXiZeroModel; - - // XiMinus - G4XiMinusInelasticProcess theXiMinusInelastic; - G4LEXiMinusInelastic* theLEXiMinusModel; - G4HEXiMinusInelastic* theHEXiMinusModel; - G4MultipleScattering theXiMinusMult; - G4hIonisation theXiMinusIonisation; - - // AntiXiMinus - G4AntiXiMinusInelasticProcess theAntiXiMinusInelastic; - G4LEAntiXiMinusInelastic* theLEAntiXiMinusModel; - G4HEAntiXiMinusInelastic* theHEAntiXiMinusModel; - G4MultipleScattering theAntiXiMinusMult; - G4hIonisation theAntiXiMinusIonisation; - - // OmegaMinus - G4OmegaMinusInelasticProcess theOmegaMinusInelastic; - G4LEOmegaMinusInelastic* theLEOmegaMinusModel; - G4HEOmegaMinusInelastic* theHEOmegaMinusModel; - G4MultipleScattering theOmegaMinusMult; - G4hIonisation theOmegaMinusIonisation; - - // AntiOmegaMinus - G4AntiOmegaMinusInelasticProcess theAntiOmegaMinusInelastic; - G4LEAntiOmegaMinusInelastic* theLEAntiOmegaMinusModel; - G4HEAntiOmegaMinusInelastic* theHEAntiOmegaMinusModel; - G4MultipleScattering theAntiOmegaMinusMult; - G4hIonisation theAntiOmegaMinusIonisation; - - -}; - - -#endif - diff --git a/examples/extended/parallel/ParN04/include/ExN04IonPhysics.hh b/examples/extended/parallel/ParN04/include/ExN04IonPhysics.hh deleted file mode 100644 index f1b83fb058..0000000000 --- a/examples/extended/parallel/ParN04/include/ExN04IonPhysics.hh +++ /dev/null @@ -1,115 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: ExN04IonPhysics.hh,v 1.3 2006/06/29 17:36:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// -// ------------------------------------------------------------ -// GEANT 4 class header file -// Class Description: -// This class is an derived class of G4VPhysicsConstructor -// -// ------------------------------------------- -// History -// first version 12 Nov. 2000 by H.Kurashige -// ------------------------------------------------------------ -#ifndef ExN04IonPhysics_h -#define ExN04IonPhysics_h 1 - -#include "globals.hh" -#include "G4ios.hh" - -#include "G4VPhysicsConstructor.hh" - -#include "G4HadronElasticProcess.hh" -#include "G4LElastic.hh" - -#include "G4DeuteronInelasticProcess.hh" -#include "G4LEDeuteronInelastic.hh" - -#include "G4TritonInelasticProcess.hh" -#include "G4LETritonInelastic.hh" - -#include "G4AlphaInelasticProcess.hh" -#include "G4LEAlphaInelastic.hh" - -#include "G4hIonisation.hh" -#include "G4ionIonisation.hh" -#include "G4MultipleScattering.hh" - -class ExN04IonPhysics : public G4VPhysicsConstructor -{ - public: - ExN04IonPhysics(const G4String& name="ion"); - virtual ~ExN04IonPhysics(); - - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); - - protected: - // Elastic Process - G4HadronElasticProcess theElasticProcess; - G4LElastic* theElasticModel; - - // Generic Ion physics - G4MultipleScattering fIonMultipleScattering; - G4ionIonisation fIonIonisation; - - // Deuteron physics - G4MultipleScattering fDeuteronMultipleScattering; - G4hIonisation fDeuteronIonisation; - G4DeuteronInelasticProcess fDeuteronProcess; - G4LEDeuteronInelastic* fDeuteronModel; - - // Triton physics - G4MultipleScattering fTritonMultipleScattering; - G4hIonisation fTritonIonisation; - G4TritonInelasticProcess fTritonProcess; - G4LETritonInelastic* fTritonModel; - - // Alpha physics - G4MultipleScattering fAlphaMultipleScattering; - G4hIonisation fAlphaIonisation; - G4AlphaInelasticProcess fAlphaProcess; - G4LEAlphaInelastic* fAlphaModel; - - // He3 physics - G4MultipleScattering fHe3MultipleScattering; - G4hIonisation fHe3Ionisation; - -}; - - -#endif - diff --git a/examples/extended/parallel/ParN04/include/ExN04MuonPhysics.hh b/examples/extended/parallel/ParN04/include/ExN04MuonPhysics.hh deleted file mode 100644 index 80c0274713..0000000000 --- a/examples/extended/parallel/ParN04/include/ExN04MuonPhysics.hh +++ /dev/null @@ -1,96 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: ExN04MuonPhysics.hh,v 1.3 2006/06/29 17:36:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// -// ------------------------------------------------------------ -// GEANT 4 class header file -// Class Description: -// This class is an derived class of G4VPhysicsConstructor -// -// ------------------------------------------- -// History -// first version 12 Nov. 2000 by H.Kurashige -// ------------------------------------------------------------ -#ifndef ExN04MuonPhysics_h -#define ExN04MuonPhysics_h 1 - -#include "globals.hh" -#include "G4ios.hh" - -#include "G4VPhysicsConstructor.hh" -#include "G4MultipleScattering.hh" -#include "G4MuBremsstrahlung.hh" -#include "G4MuPairProduction.hh" -#include "G4MuIonisation.hh" -#include "G4hIonisation.hh" - -#include "G4MuonMinusCaptureAtRest.hh" - -class ExN04MuonPhysics : public G4VPhysicsConstructor -{ - public: - ExN04MuonPhysics(const G4String& name="muon"); - virtual ~ExN04MuonPhysics(); - - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); - - protected: - // Muon physics - G4MuIonisation fMuPlusIonisation; - G4MultipleScattering fMuPlusMultipleScattering; - G4MuBremsstrahlung fMuPlusBremsstrahlung ; - G4MuPairProduction fMuPlusPairProduction; - - G4MuIonisation fMuMinusIonisation; - G4MultipleScattering fMuMinusMultipleScattering; - G4MuBremsstrahlung fMuMinusBremsstrahlung ; - G4MuPairProduction fMuMinusPairProduction; - - G4MuonMinusCaptureAtRest fMuMinusCaptureAtRest; - - // Tau physics - G4MultipleScattering fTauPlusMultipleScattering; - G4hIonisation fTauPlusIonisation; - - G4MultipleScattering fTauMinusMultipleScattering; - G4hIonisation fTauMinusIonisation; - -}; - - -#endif - diff --git a/examples/extended/parallel/ParN04/include/ExN04RunAction.hh b/examples/extended/parallel/ParN04/include/ExN04RunAction.hh index 974e2ce84d..6d4d2d6faf 100644 --- a/examples/extended/parallel/ParN04/include/ExN04RunAction.hh +++ b/examples/extended/parallel/ParN04/include/ExN04RunAction.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: ExN04RunAction.hh,v 1.2 2006/06/29 17:36:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: ExN04RunAction.hh,v 1.3 2006/07/05 13:07:55 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -48,7 +48,6 @@ class ExN04RunAction : public G4UserRunAction public: void BeginOfRunAction(const G4Run*); - void EndOfRunAction(const G4Run*); }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/parallel/ParN04/include/ExN04SteppingVerbose.hh b/examples/extended/parallel/ParN04/include/ExN04SteppingVerbose.hh index cf7743d565..9d6c4e9319 100644 --- a/examples/extended/parallel/ParN04/include/ExN04SteppingVerbose.hh +++ b/examples/extended/parallel/ParN04/include/ExN04SteppingVerbose.hh @@ -25,7 +25,7 @@ // // // $Id: ExN04SteppingVerbose.hh,v 1.2 2006/06/29 17:36:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // This class manages the verbose outputs in G4SteppingManager. // It inherits from G4SteppingVerbose. diff --git a/examples/extended/parallel/ParN04/include/ParRunManager.hh b/examples/extended/parallel/ParN04/include/ParRunManager.hh index 3fc6aebb31..6d001782d8 100644 --- a/examples/extended/parallel/ParN04/include/ParRunManager.hh +++ b/examples/extended/parallel/ParN04/include/ParRunManager.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: ParRunManager.hh,v 1.4 2006/06/29 17:36:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // Parallel Library for Geant4 diff --git a/examples/extended/parallel/ParN04/src/ExN04CalorimeterSD.cc b/examples/extended/parallel/ParN04/src/ExN04CalorimeterSD.cc index fd5fc04e22..82811ea6b9 100644 --- a/examples/extended/parallel/ParN04/src/ExN04CalorimeterSD.cc +++ b/examples/extended/parallel/ParN04/src/ExN04CalorimeterSD.cc @@ -76,11 +76,11 @@ G4bool ExN04CalorimeterSD::ProcessHits(G4Step*aStep,G4TouchableHistory*ROhist) ExN04CalorimeterHit* calHit = new ExN04CalorimeterHit (physVol->GetLogicalVolume(),copyIDinZ,copyIDinPhi); - G4RotationMatrix rotM; - if(physVol->GetObjectRotation()) rotM = *(physVol->GetObjectRotation()); calHit->SetEdep( edep ); - calHit->SetPos( physVol->GetTranslation() ); - calHit->SetRot( rotM ); + G4AffineTransform aTrans = ROhist->GetHistory()->GetTopTransform(); + aTrans.Invert(); + calHit->SetPos(aTrans.NetTranslation()); + calHit->SetRot(aTrans.NetRotation()); G4int icell = CalCollection->insert( calHit ); CellID[copyIDinZ][copyIDinPhi] = icell - 1; if(verboseLevel>0) diff --git a/examples/extended/parallel/ParN04/src/ExN04EventAction.cc b/examples/extended/parallel/ParN04/src/ExN04EventAction.cc index f6e4f4ba73..a45a9cd5bb 100644 --- a/examples/extended/parallel/ParN04/src/ExN04EventAction.cc +++ b/examples/extended/parallel/ParN04/src/ExN04EventAction.cc @@ -67,24 +67,6 @@ void ExN04EventAction::EndOfEventAction(const G4Event* evt) { G4cout << ">>> Event " << evt->GetEventID() << G4endl; - // get number of stored trajectories - // - G4TrajectoryContainer* trajectoryContainer = evt->GetTrajectoryContainer(); - G4int n_trajectories = 0; - if (trajectoryContainer) n_trajectories = trajectoryContainer->entries(); - - // extract the trajectories and draw them - // - if (G4VVisManager::GetConcreteInstance()) - { - for (G4int i=0; iGetTrajectoryContainer()))[i]); - trj->DrawTrajectory(50); - } - } - - if(trackerCollID<0||calorimeterCollID<0||muonCollID<0) return; G4HCofThisEvent * HCE = evt->GetHCofThisEvent(); diff --git a/examples/extended/parallel/ParN04/src/ExN04HadronPhysics.cc b/examples/extended/parallel/ParN04/src/ExN04HadronPhysics.cc deleted file mode 100644 index c99cef3672..0000000000 --- a/examples/extended/parallel/ParN04/src/ExN04HadronPhysics.cc +++ /dev/null @@ -1,441 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: ExN04HadronPhysics.cc,v 1.4 2006/06/29 17:37:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// - -#include "ExN04HadronPhysics.hh" - -#include "globals.hh" -#include "G4ios.hh" -#include - - -ExN04HadronPhysics::ExN04HadronPhysics(const G4String& name) - : G4VPhysicsConstructor(name) -{ -} - -ExN04HadronPhysics::~ExN04HadronPhysics() -{ -delete theStringDecay; -} - -#include "G4ParticleDefinition.hh" -#include "G4ParticleTable.hh" - -// Nuclei -#include "G4MesonConstructor.hh" -#include "G4BaryonConstructor.hh" -#include "G4ShortLivedConstructor.hh" - -void ExN04HadronPhysics::ConstructParticle() -{ - // Construct all mesons - G4MesonConstructor pMesonConstructor; - pMesonConstructor.ConstructParticle(); - - // Construct all barions - G4BaryonConstructor pBaryonConstructor; - pBaryonConstructor.ConstructParticle(); - - // Construct resonaces and quarks - G4ShortLivedConstructor pShortLivedConstructor; - pShortLivedConstructor.ConstructParticle(); - -} - - -#include "G4ProcessManager.hh" - - -void ExN04HadronPhysics::ConstructProcess() -{ - G4ProcessManager * pManager = 0; - G4cout << "" << G4endl; - G4cout << "You are using the ExN04HadronPhysics" << G4endl; - G4cout << " - Note that this hadronic physics list is not optimized for any particular usage" << G4endl; - G4cout << " - If you wish to have a starting point tailored for a particular area of work," << G4endl; - G4cout << " please use one of the available physics lists by use-case." << G4endl; - G4cout << " More information can also be found from the Geant4 HyperNews." << G4endl; - G4cout << "" << G4endl; - // Elastic Process - theElasticModel = new G4LElastic(); - theElasticProcess.RegisterMe(theElasticModel); - - // pi+ and pi- - - thePreEquilib = new G4PreCompoundModel(&theHandler); - theCascade.SetDeExcitation(thePreEquilib); - theTheoModel.SetTransport(&theCascade); - theTheoModel.SetHighEnergyGenerator(&theStringModel); - theStringDecay = new G4ExcitedStringDecay(&theFragmentation); - theStringModel.SetFragmentationModel(theStringDecay); - theTheoModel.SetMinEnergy(15*GeV); - theTheoModel.SetMaxEnergy(100*TeV); - - // PionPlus - pManager = G4PionPlus::PionPlus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEPionPlusModel = new G4LEPionPlusInelastic(); - thePionPlusInelastic.RegisterMe(theLEPionPlusModel); - thePionPlusInelastic.RegisterMe(&theTheoModel); - pManager->AddDiscreteProcess(&thePionPlusInelastic); - - pManager->AddProcess(&thePionPlusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&thePionPlusMult); - pManager->SetProcessOrdering(&thePionPlusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&thePionPlusMult, idxPostStep, 1); - - // PionMinus - pManager = G4PionMinus::PionMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEPionMinusModel = new G4LEPionMinusInelastic(); - thePionMinusInelastic.RegisterMe(theLEPionMinusModel); - thePionMinusInelastic.RegisterMe(&theTheoModel); - pManager->AddDiscreteProcess(&thePionMinusInelastic); - - pManager->AddProcess(&thePionMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&thePionMinusMult); - pManager->SetProcessOrdering(&thePionMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&thePionMinusMult, idxPostStep, 1); - - pManager->AddRestProcess(&thePionMinusAbsorption, ordDefault); - - // KaonPlus - pManager = G4KaonPlus::KaonPlus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEKaonPlusModel = new G4LEKaonPlusInelastic(); - theHEKaonPlusModel = new G4HEKaonPlusInelastic(); - theKaonPlusInelastic.RegisterMe(theLEKaonPlusModel); - theKaonPlusInelastic.RegisterMe(&theTheoModel); - pManager->AddDiscreteProcess(&theKaonPlusInelastic); - - pManager->AddProcess(&theKaonPlusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theKaonPlusMult); - pManager->SetProcessOrdering(&theKaonPlusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theKaonPlusMult, idxPostStep, 1); - - // KaonMinus - pManager = G4KaonMinus::KaonMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEKaonMinusModel = new G4LEKaonMinusInelastic(); - theHEKaonMinusModel = new G4HEKaonMinusInelastic(); - theKaonMinusInelastic.RegisterMe(theLEKaonMinusModel); - theKaonMinusInelastic.RegisterMe(theHEKaonMinusModel); - pManager->AddDiscreteProcess(&theKaonMinusInelastic); - - pManager->AddProcess(&theKaonMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theKaonMinusMult); - pManager->SetProcessOrdering(&theKaonMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theKaonMinusMult, idxPostStep, 1); - - pManager->AddRestProcess(&theKaonMinusAbsorption, ordDefault); - - // KaonZeroL - pManager = G4KaonZeroLong::KaonZeroLong()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEKaonZeroLModel = new G4LEKaonZeroLInelastic(); - theHEKaonZeroLModel = new G4HEKaonZeroInelastic(); - theKaonZeroLInelastic.RegisterMe(theLEKaonZeroLModel); - theKaonZeroLInelastic.RegisterMe(theHEKaonZeroLModel); - pManager->AddDiscreteProcess(&theKaonZeroLInelastic); - - // KaonZeroS - pManager = G4KaonZeroShort::KaonZeroShort()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEKaonZeroSModel = new G4LEKaonZeroSInelastic(); - theHEKaonZeroSModel = new G4HEKaonZeroInelastic(); - theKaonZeroSInelastic.RegisterMe(theLEKaonZeroSModel); - theKaonZeroSInelastic.RegisterMe(theHEKaonZeroSModel); - pManager->AddDiscreteProcess(&theKaonZeroSInelastic); - - // Proton - pManager = G4Proton::Proton()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEProtonModel = new G4LEProtonInelastic(); - theHEProtonModel = new G4HEProtonInelastic(); - theProtonInelastic.RegisterMe(theLEProtonModel); - theProtonInelastic.RegisterMe(&theTheoModel); - pManager->AddDiscreteProcess(&theProtonInelastic); - - pManager->AddProcess(&theProtonIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theProtonMult); - pManager->SetProcessOrdering(&theProtonMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theProtonMult, idxPostStep, 1); - - // anti-Proton - pManager = G4AntiProton::AntiProton()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiProtonModel = new G4LEAntiProtonInelastic(); - theHEAntiProtonModel = new G4HEAntiProtonInelastic(); - theAntiProtonInelastic.RegisterMe(theLEAntiProtonModel); - theAntiProtonInelastic.RegisterMe(theHEAntiProtonModel); - pManager->AddDiscreteProcess(&theAntiProtonInelastic); - - pManager->AddProcess(&theAntiProtonIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theAntiProtonMult); - pManager->SetProcessOrdering(&theAntiProtonMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theAntiProtonMult, idxPostStep, 1); - - pManager->AddRestProcess(&theAntiProtonAnnihilation); - - // Neutron - pManager = G4Neutron::Neutron()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLENeutronModel = new G4LENeutronInelastic(); - theHENeutronModel = new G4HENeutronInelastic(); - theNeutronInelastic.RegisterMe(theLENeutronModel); - theNeutronInelastic.RegisterMe(&theTheoModel); - pManager->AddDiscreteProcess(&theNeutronInelastic); - - theNeutronFissionModel = new G4LFission(); - theNeutronFission.RegisterMe(theNeutronFissionModel); - pManager->AddDiscreteProcess(&theNeutronFission); - - theNeutronCaptureModel = new G4LCapture(); - theNeutronCapture.RegisterMe(theNeutronCaptureModel); - pManager->AddDiscreteProcess(&theNeutronCapture); - - // AntiNeutron - pManager = G4AntiNeutron::AntiNeutron()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiNeutronModel = new G4LEAntiNeutronInelastic(); - theHEAntiNeutronModel = new G4HEAntiNeutronInelastic(); - theAntiNeutronInelastic.RegisterMe(theLEAntiNeutronModel); - theAntiNeutronInelastic.RegisterMe(theHEAntiNeutronModel); - pManager->AddDiscreteProcess(&theAntiNeutronInelastic); - - pManager->AddRestProcess(&theAntiNeutronAnnihilation); - - // Lambda - pManager = G4Lambda::Lambda()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLELambdaModel = new G4LELambdaInelastic(); - theHELambdaModel = new G4HELambdaInelastic(); - theLambdaInelastic.RegisterMe(theLELambdaModel); - theLambdaInelastic.RegisterMe(theHELambdaModel); - pManager->AddDiscreteProcess(&theLambdaInelastic); - - // AntiLambda - pManager = G4AntiLambda::AntiLambda()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiLambdaModel = new G4LEAntiLambdaInelastic(); - theHEAntiLambdaModel = new G4HEAntiLambdaInelastic(); - theAntiLambdaInelastic.RegisterMe(theLEAntiLambdaModel); - theAntiLambdaInelastic.RegisterMe(theHEAntiLambdaModel); - pManager->AddDiscreteProcess(&theAntiLambdaInelastic); - - // SigmaMinus - pManager = G4SigmaMinus::SigmaMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLESigmaMinusModel = new G4LESigmaMinusInelastic(); - theHESigmaMinusModel = new G4HESigmaMinusInelastic(); - theSigmaMinusInelastic.RegisterMe(theLESigmaMinusModel); - theSigmaMinusInelastic.RegisterMe(theHESigmaMinusModel); - pManager->AddDiscreteProcess(&theSigmaMinusInelastic); - - pManager->AddProcess(&theSigmaMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theSigmaMinusMult); - pManager->SetProcessOrdering(&theSigmaMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theSigmaMinusMult, idxPostStep, 1); - - // anti-SigmaMinus - pManager = G4AntiSigmaMinus::AntiSigmaMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiSigmaMinusModel = new G4LEAntiSigmaMinusInelastic(); - theHEAntiSigmaMinusModel = new G4HEAntiSigmaMinusInelastic(); - theAntiSigmaMinusInelastic.RegisterMe(theLEAntiSigmaMinusModel); - theAntiSigmaMinusInelastic.RegisterMe(theHEAntiSigmaMinusModel); - pManager->AddDiscreteProcess(&theAntiSigmaMinusInelastic); - - pManager->AddProcess(&theAntiSigmaMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theAntiSigmaMinusMult); - pManager->SetProcessOrdering(&theAntiSigmaMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theAntiSigmaMinusMult, idxPostStep, 1); - - // SigmaPlus - pManager = G4SigmaPlus::SigmaPlus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLESigmaPlusModel = new G4LESigmaPlusInelastic(); - theHESigmaPlusModel = new G4HESigmaPlusInelastic(); - theSigmaPlusInelastic.RegisterMe(theLESigmaPlusModel); - theSigmaPlusInelastic.RegisterMe(theHESigmaPlusModel); - pManager->AddDiscreteProcess(&theSigmaPlusInelastic); - - pManager->AddProcess(&theSigmaPlusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theSigmaPlusMult); - pManager->SetProcessOrdering(&theSigmaPlusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theSigmaPlusMult, idxPostStep, 1); - - // anti-SigmaPlus - pManager = G4AntiSigmaPlus::AntiSigmaPlus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiSigmaPlusModel = new G4LEAntiSigmaPlusInelastic(); - theHEAntiSigmaPlusModel = new G4HEAntiSigmaPlusInelastic(); - theAntiSigmaPlusInelastic.RegisterMe(theLEAntiSigmaPlusModel); - theAntiSigmaPlusInelastic.RegisterMe(theHEAntiSigmaPlusModel); - pManager->AddDiscreteProcess(&theAntiSigmaPlusInelastic); - - pManager->AddProcess(&theAntiSigmaPlusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theAntiSigmaPlusMult); - pManager->SetProcessOrdering(&theAntiSigmaPlusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theAntiSigmaPlusMult, idxPostStep, 1); - - // XiMinus - pManager = G4XiMinus::XiMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEXiMinusModel = new G4LEXiMinusInelastic(); - theHEXiMinusModel = new G4HEXiMinusInelastic(); - theXiMinusInelastic.RegisterMe(theLEXiMinusModel); - theXiMinusInelastic.RegisterMe(theHEXiMinusModel); - pManager->AddDiscreteProcess(&theXiMinusInelastic); - - pManager->AddProcess(&theXiMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theXiMinusMult); - pManager->SetProcessOrdering(&theXiMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theXiMinusMult, idxPostStep, 1); - - // anti-XiMinus - pManager = G4AntiXiMinus::AntiXiMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiXiMinusModel = new G4LEAntiXiMinusInelastic(); - theHEAntiXiMinusModel = new G4HEAntiXiMinusInelastic(); - theAntiXiMinusInelastic.RegisterMe(theLEAntiXiMinusModel); - theAntiXiMinusInelastic.RegisterMe(theHEAntiXiMinusModel); - pManager->AddDiscreteProcess(&theAntiXiMinusInelastic); - - pManager->AddProcess(&theAntiXiMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theAntiXiMinusMult); - pManager->SetProcessOrdering(&theAntiXiMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theAntiXiMinusMult, idxPostStep, 1); - - // XiZero - pManager = G4XiZero::XiZero()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEXiZeroModel = new G4LEXiZeroInelastic(); - theHEXiZeroModel = new G4HEXiZeroInelastic(); - theXiZeroInelastic.RegisterMe(theLEXiZeroModel); - theXiZeroInelastic.RegisterMe(theHEXiZeroModel); - pManager->AddDiscreteProcess(&theXiZeroInelastic); - - // anti-XiZero - pManager = G4AntiXiZero::AntiXiZero()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiXiZeroModel = new G4LEAntiXiZeroInelastic(); - theHEAntiXiZeroModel = new G4HEAntiXiZeroInelastic(); - theAntiXiZeroInelastic.RegisterMe(theLEAntiXiZeroModel); - theAntiXiZeroInelastic.RegisterMe(theHEAntiXiZeroModel); - pManager->AddDiscreteProcess(&theAntiXiZeroInelastic); - - // OmegaMinus - pManager = G4OmegaMinus::OmegaMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEOmegaMinusModel = new G4LEOmegaMinusInelastic(); - theHEOmegaMinusModel = new G4HEOmegaMinusInelastic(); - theOmegaMinusInelastic.RegisterMe(theLEOmegaMinusModel); - theOmegaMinusInelastic.RegisterMe(theHEOmegaMinusModel); - pManager->AddDiscreteProcess(&theOmegaMinusInelastic); - - pManager->AddProcess(&theOmegaMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theOmegaMinusMult); - pManager->SetProcessOrdering(&theOmegaMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theOmegaMinusMult, idxPostStep, 1); - - // anti-OmegaMinus - pManager = G4AntiOmegaMinus::AntiOmegaMinus()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - theLEAntiOmegaMinusModel = new G4LEAntiOmegaMinusInelastic(); - theHEAntiOmegaMinusModel = new G4HEAntiOmegaMinusInelastic(); - theAntiOmegaMinusInelastic.RegisterMe(theLEAntiOmegaMinusModel); - theAntiOmegaMinusInelastic.RegisterMe(theHEAntiOmegaMinusModel); - pManager->AddDiscreteProcess(&theAntiOmegaMinusInelastic); - - pManager->AddProcess(&theAntiOmegaMinusIonisation, ordInActive,2, 2); - - pManager->AddProcess(&theAntiOmegaMinusMult); - pManager->SetProcessOrdering(&theAntiOmegaMinusMult, idxAlongStep, 1); - pManager->SetProcessOrdering(&theAntiOmegaMinusMult, idxPostStep, 1); - -} diff --git a/examples/extended/parallel/ParN04/src/ExN04IonPhysics.cc b/examples/extended/parallel/ParN04/src/ExN04IonPhysics.cc deleted file mode 100644 index b3dc5024bb..0000000000 --- a/examples/extended/parallel/ParN04/src/ExN04IonPhysics.cc +++ /dev/null @@ -1,129 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: ExN04IonPhysics.cc,v 1.4 2006/06/29 17:37:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// - -#include "ExN04IonPhysics.hh" - -#include "globals.hh" -#include "G4ios.hh" -#include - - -ExN04IonPhysics::ExN04IonPhysics(const G4String& name) - : G4VPhysicsConstructor(name) -{ -} - -ExN04IonPhysics::~ExN04IonPhysics() -{ -} - -#include "G4ParticleDefinition.hh" -#include "G4ParticleTable.hh" - -// Nuclei -#include "G4IonConstructor.hh" - -void ExN04IonPhysics::ConstructParticle() -{ - // Construct light ions - G4IonConstructor pConstructor; - pConstructor.ConstructParticle(); -} - - -#include "G4ProcessManager.hh" - - -void ExN04IonPhysics::ConstructProcess() -{ - G4ProcessManager * pManager = 0; - - // Elastic Process - theElasticModel = new G4LElastic(); - theElasticProcess.RegisterMe(theElasticModel); - - // Generic Ion - pManager = G4GenericIon::GenericIon()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - pManager->AddProcess(&fIonMultipleScattering, -1, 1, 1); - pManager->AddProcess(&fIonIonisation, -1, 2, 2); - - // Deuteron - pManager = G4Deuteron::Deuteron()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - fDeuteronModel = new G4LEDeuteronInelastic(); - fDeuteronProcess.RegisterMe(fDeuteronModel); - pManager->AddDiscreteProcess(&fDeuteronProcess); - - pManager->AddProcess(&fDeuteronMultipleScattering, -1, 1, 1); - pManager->AddProcess(&fDeuteronIonisation, -1, 2, 2); - - // Triton - pManager = G4Triton::Triton()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - fTritonModel = new G4LETritonInelastic(); - fTritonProcess.RegisterMe(fTritonModel); - pManager->AddDiscreteProcess(&fTritonProcess); - - pManager->AddProcess(&fTritonMultipleScattering, -1, 1, 1); - pManager->AddProcess(&fTritonIonisation, -1, 2, 2); - - // Alpha - pManager = G4Alpha::Alpha()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - fAlphaModel = new G4LEAlphaInelastic(); - fAlphaProcess.RegisterMe(fAlphaModel); - pManager->AddDiscreteProcess(&fAlphaProcess); - - pManager->AddProcess(&fAlphaMultipleScattering, -1, 1, 1); - pManager->AddProcess(&fAlphaIonisation, -1, 2, 2); - - // He3 - pManager = G4He3::He3()->GetProcessManager(); - // add process - pManager->AddDiscreteProcess(&theElasticProcess); - - pManager->AddProcess(&fHe3MultipleScattering, -1, 1, 1); - pManager->AddProcess(&fHe3Ionisation, -1, 2, 2); - - -} - - - diff --git a/examples/extended/parallel/ParN04/src/ExN04MuonPhysics.cc b/examples/extended/parallel/ParN04/src/ExN04MuonPhysics.cc deleted file mode 100644 index b30eb13821..0000000000 --- a/examples/extended/parallel/ParN04/src/ExN04MuonPhysics.cc +++ /dev/null @@ -1,117 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: ExN04MuonPhysics.cc,v 1.4 2006/06/29 17:37:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// - -#include "ExN04MuonPhysics.hh" - -#include "globals.hh" -#include "G4ios.hh" -#include - - -ExN04MuonPhysics::ExN04MuonPhysics(const G4String& name) - : G4VPhysicsConstructor(name) -{ -} - -ExN04MuonPhysics::~ExN04MuonPhysics() -{ -} - -#include "G4ParticleDefinition.hh" -#include "G4ParticleTable.hh" - -#include "G4MuonPlus.hh" -#include "G4MuonMinus.hh" -#include "G4TauMinus.hh" -#include "G4TauPlus.hh" -#include "G4NeutrinoTau.hh" -#include "G4AntiNeutrinoTau.hh" -#include "G4NeutrinoMu.hh" -#include "G4AntiNeutrinoMu.hh" - -void ExN04MuonPhysics::ConstructParticle() -{ - // Mu - G4MuonPlus::MuonPlusDefinition(); - G4MuonMinus::MuonMinusDefinition(); - G4NeutrinoMu::NeutrinoMuDefinition(); - G4AntiNeutrinoMu::AntiNeutrinoMuDefinition(); - - // Tau - G4TauMinus::TauMinusDefinition(); - G4TauPlus::TauPlusDefinition(); - G4NeutrinoTau::NeutrinoTauDefinition(); - G4AntiNeutrinoTau::AntiNeutrinoTauDefinition(); - -} - - -#include "G4ProcessManager.hh" - -void ExN04MuonPhysics::ConstructProcess() -{ - G4ProcessManager * pManager = 0; - - // Muon Plus Physics - pManager = G4MuonPlus::MuonPlus()->GetProcessManager(); - - pManager->AddProcess(&fMuPlusMultipleScattering,-1, 1, 1); - pManager->AddProcess(&fMuPlusIonisation, -1, 2, 2); - pManager->AddProcess(&fMuPlusBremsstrahlung, -1, 3, 3); - pManager->AddProcess(&fMuPlusPairProduction, -1, 4, 4); - - // Muon Minus Physics - pManager = G4MuonMinus::MuonMinus()->GetProcessManager(); - - pManager->AddProcess(&fMuMinusMultipleScattering,-1, 1, 1); - pManager->AddProcess(&fMuMinusIonisation, -1, 2, 2); - pManager->AddProcess(&fMuMinusBremsstrahlung, -1, 3, 3); - pManager->AddProcess(&fMuMinusPairProduction, -1, 4, 4); - - - pManager->AddRestProcess(&fMuMinusCaptureAtRest); - - // Tau Plus Physics - pManager = G4TauPlus::TauPlus()->GetProcessManager(); - - pManager->AddProcess(&fTauPlusMultipleScattering, -1, 1, 1); - pManager->AddProcess(&fTauPlusIonisation, -1, 2, 2); - - // Tau Minus Physics - pManager = G4TauMinus::TauMinus()->GetProcessManager(); - - pManager->AddProcess(&fTauMinusMultipleScattering, -1, 1, 1); - pManager->AddProcess(&fTauMinusIonisation, -1, 2, 2); - -} - - - diff --git a/examples/extended/parallel/ParN04/src/ExN04PhysicsList.cc b/examples/extended/parallel/ParN04/src/ExN04PhysicsList.cc deleted file mode 100644 index 449b11a32e..0000000000 --- a/examples/extended/parallel/ParN04/src/ExN04PhysicsList.cc +++ /dev/null @@ -1,88 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: ExN04PhysicsList.cc,v 1.4 2006/06/29 17:37:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// - -#include "ExN04PhysicsList.hh" - -#include "globals.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" -#include "G4ProcessVector.hh" -#include "G4ParticleTypes.hh" -#include "G4ParticleTable.hh" - -#include "G4Material.hh" -#include "G4MaterialTable.hh" -#include "G4ios.hh" -#include - -#include "ExN04GeneralPhysics.hh" -#include "ExN04EMPhysics.hh" -#include "ExN04MuonPhysics.hh" -#include "ExN04HadronPhysics.hh" -#include "ExN04IonPhysics.hh" - -ExN04PhysicsList::ExN04PhysicsList(): G4VModularPhysicsList() -{ - // default cut value (1.0mm) - defaultCutValue = 1.0*mm; - // SetVerboseLevel(1); - - // General Physics - RegisterPhysics( new ExN04GeneralPhysics("general") ); - - // EM Physics - RegisterPhysics( new ExN04EMPhysics("standard EM")); - - // Muon Physics - RegisterPhysics( new ExN04MuonPhysics("muon")); - - // Hadron Physics - RegisterPhysics( new ExN04HadronPhysics("hadron")); - - // Ion Physics - RegisterPhysics( new ExN04IonPhysics("ion")); - - -} - -ExN04PhysicsList::~ExN04PhysicsList() -{ -} - -void ExN04PhysicsList::SetCuts() -{ - // " G4VUserPhysicsList::SetCutsWithDefault" method sets - // the default cut value for all particle types - SetCutsWithDefault(); -} - - - diff --git a/examples/extended/parallel/ParN04/src/ExN04RunAction.cc b/examples/extended/parallel/ParN04/src/ExN04RunAction.cc index ba92125e79..c33c19f0f8 100644 --- a/examples/extended/parallel/ParN04/src/ExN04RunAction.cc +++ b/examples/extended/parallel/ParN04/src/ExN04RunAction.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: ExN04RunAction.cc,v 1.2 2006/06/29 17:37:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: ExN04RunAction.cc,v 1.3 2006/07/05 13:07:56 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -55,25 +55,6 @@ void ExN04RunAction::BeginOfRunAction(const G4Run* aRun) G4cout << "### Run " << aRun->GetRunID() << " start." << G4endl; G4RunManager::GetRunManager()->SetRandomNumberStore(true); - - if (G4VVisManager::GetConcreteInstance()) - { - G4UImanager* UI = G4UImanager::GetUIpointer(); - UI->ApplyCommand("/vis/scene/notifyHandlers"); - } } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void ExN04RunAction::EndOfRunAction(const G4Run*) -{ - if (G4VVisManager::GetConcreteInstance()) - { - G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/update"); - } -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - - - diff --git a/examples/extended/parallel/ParN04/src/ExN04SteppingVerbose.cc b/examples/extended/parallel/ParN04/src/ExN04SteppingVerbose.cc index 8f9a0ef44a..506c096cf1 100644 --- a/examples/extended/parallel/ParN04/src/ExN04SteppingVerbose.cc +++ b/examples/extended/parallel/ParN04/src/ExN04SteppingVerbose.cc @@ -25,7 +25,7 @@ // // // $Id: ExN04SteppingVerbose.cc,v 1.2 2006/06/29 17:37:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/persistency/P01/exampleP01.cc b/examples/extended/persistency/P01/exampleP01.cc index 065a6d8f29..4b4d3a59ea 100644 --- a/examples/extended/persistency/P01/exampleP01.cc +++ b/examples/extended/persistency/P01/exampleP01.cc @@ -25,7 +25,7 @@ // // // $Id: exampleP01.cc,v 1.2 2006/06/29 17:38:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/persistency/P01/include/ExP01ChamberParameterisation.hh b/examples/extended/persistency/P01/include/ExP01ChamberParameterisation.hh index 6c1ee6ea7c..c5c79603b8 100644 --- a/examples/extended/persistency/P01/include/ExP01ChamberParameterisation.hh +++ b/examples/extended/persistency/P01/include/ExP01ChamberParameterisation.hh @@ -25,7 +25,7 @@ // // // $Id: ExP01ChamberParameterisation.hh,v 1.2 2006/06/29 17:38:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // A parameterisation that describes a series of boxes along Z diff --git a/examples/extended/persistency/P01/include/ExP01DetectorConstruction.hh b/examples/extended/persistency/P01/include/ExP01DetectorConstruction.hh index d572a6b5ce..b06498fd2d 100644 --- a/examples/extended/persistency/P01/include/ExP01DetectorConstruction.hh +++ b/examples/extended/persistency/P01/include/ExP01DetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: ExP01DetectorConstruction.hh,v 1.2 2006/06/29 17:38:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/persistency/P01/include/ExP01DetectorMessenger.hh b/examples/extended/persistency/P01/include/ExP01DetectorMessenger.hh index 419bf03e57..0344ced019 100644 --- a/examples/extended/persistency/P01/include/ExP01DetectorMessenger.hh +++ b/examples/extended/persistency/P01/include/ExP01DetectorMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: ExP01DetectorMessenger.hh,v 1.2 2006/06/29 17:38:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/persistency/P01/include/ExP01EventAction.hh b/examples/extended/persistency/P01/include/ExP01EventAction.hh index b8bb7d4f0f..ea4e07d284 100644 --- a/examples/extended/persistency/P01/include/ExP01EventAction.hh +++ b/examples/extended/persistency/P01/include/ExP01EventAction.hh @@ -25,7 +25,7 @@ // // // $Id: ExP01EventAction.hh,v 1.2 2006/06/29 17:38:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/persistency/P01/include/ExP01MagneticField.hh b/examples/extended/persistency/P01/include/ExP01MagneticField.hh index 54f6d705e0..9b761e94f5 100644 --- a/examples/extended/persistency/P01/include/ExP01MagneticField.hh +++ b/examples/extended/persistency/P01/include/ExP01MagneticField.hh @@ -25,7 +25,7 @@ // // // $Id: ExP01MagneticField.hh,v 1.2 2006/06/29 17:38:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // A class for control of the Magnetic Field of the detector. diff --git a/examples/extended/persistency/P01/include/ExP01PhysicsList.hh b/examples/extended/persistency/P01/include/ExP01PhysicsList.hh index 041bb8c6eb..1bfaac4cbb 100644 --- a/examples/extended/persistency/P01/include/ExP01PhysicsList.hh +++ b/examples/extended/persistency/P01/include/ExP01PhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: ExP01PhysicsList.hh,v 1.2 2006/06/29 17:38:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/persistency/P01/include/ExP01PrimaryGeneratorAction.hh b/examples/extended/persistency/P01/include/ExP01PrimaryGeneratorAction.hh index d667f2e73c..18f2c17c4a 100644 --- a/examples/extended/persistency/P01/include/ExP01PrimaryGeneratorAction.hh +++ b/examples/extended/persistency/P01/include/ExP01PrimaryGeneratorAction.hh @@ -25,7 +25,7 @@ // // // $Id: ExP01PrimaryGeneratorAction.hh,v 1.2 2006/06/29 17:38:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/persistency/P01/include/ExP01RunAction.hh b/examples/extended/persistency/P01/include/ExP01RunAction.hh index 60526c9d5d..c9a7f26b79 100644 --- a/examples/extended/persistency/P01/include/ExP01RunAction.hh +++ b/examples/extended/persistency/P01/include/ExP01RunAction.hh @@ -25,7 +25,7 @@ // // // $Id: ExP01RunAction.hh,v 1.2 2006/06/29 17:39:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/persistency/P01/include/ExP01SteppingAction.hh b/examples/extended/persistency/P01/include/ExP01SteppingAction.hh index 95f9d399c5..866beece9c 100644 --- a/examples/extended/persistency/P01/include/ExP01SteppingAction.hh +++ b/examples/extended/persistency/P01/include/ExP01SteppingAction.hh @@ -25,7 +25,7 @@ // // // $Id: ExP01SteppingAction.hh,v 1.2 2006/06/29 17:39:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/persistency/P01/include/ExP01SteppingVerbose.hh b/examples/extended/persistency/P01/include/ExP01SteppingVerbose.hh index db91d261d1..3f65f1052d 100644 --- a/examples/extended/persistency/P01/include/ExP01SteppingVerbose.hh +++ b/examples/extended/persistency/P01/include/ExP01SteppingVerbose.hh @@ -25,7 +25,7 @@ // // // $Id: ExP01SteppingVerbose.hh,v 1.2 2006/06/29 17:39:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // This class manages the verbose outputs in G4SteppingManager. // It inherits from G4SteppingVerbose. diff --git a/examples/extended/persistency/P01/include/ExP01TrackerHit.hh b/examples/extended/persistency/P01/include/ExP01TrackerHit.hh index 8f3c53a1ff..e285515b41 100644 --- a/examples/extended/persistency/P01/include/ExP01TrackerHit.hh +++ b/examples/extended/persistency/P01/include/ExP01TrackerHit.hh @@ -25,7 +25,7 @@ // // // $Id: ExP01TrackerHit.hh,v 1.2 2006/06/29 17:39:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/persistency/P01/include/ExP01TrackerSD.hh b/examples/extended/persistency/P01/include/ExP01TrackerSD.hh index afe1ad0a2f..2a762b15f0 100644 --- a/examples/extended/persistency/P01/include/ExP01TrackerSD.hh +++ b/examples/extended/persistency/P01/include/ExP01TrackerSD.hh @@ -25,7 +25,7 @@ // // // $Id: ExP01TrackerSD.hh,v 1.2 2006/06/29 17:39:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/persistency/P01/src/ExP01ChamberParameterisation.cc b/examples/extended/persistency/P01/src/ExP01ChamberParameterisation.cc index 9541a569b4..b705ed30d7 100644 --- a/examples/extended/persistency/P01/src/ExP01ChamberParameterisation.cc +++ b/examples/extended/persistency/P01/src/ExP01ChamberParameterisation.cc @@ -25,7 +25,7 @@ // // // $Id: ExP01ChamberParameterisation.cc,v 1.2 2006/06/29 17:39:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/persistency/P01/src/ExP01DetectorConstruction.cc b/examples/extended/persistency/P01/src/ExP01DetectorConstruction.cc index 1d03432e65..c4ebba5c8e 100644 --- a/examples/extended/persistency/P01/src/ExP01DetectorConstruction.cc +++ b/examples/extended/persistency/P01/src/ExP01DetectorConstruction.cc @@ -25,7 +25,7 @@ // // // $Id: ExP01DetectorConstruction.cc,v 1.2 2006/06/29 17:39:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/persistency/P01/src/ExP01DetectorMessenger.cc b/examples/extended/persistency/P01/src/ExP01DetectorMessenger.cc index 14a21d3440..a5bfc2e101 100644 --- a/examples/extended/persistency/P01/src/ExP01DetectorMessenger.cc +++ b/examples/extended/persistency/P01/src/ExP01DetectorMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: ExP01DetectorMessenger.cc,v 1.2 2006/06/29 17:39:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/persistency/P01/src/ExP01EventAction.cc b/examples/extended/persistency/P01/src/ExP01EventAction.cc index 4172fc7b2e..b11450b0ef 100644 --- a/examples/extended/persistency/P01/src/ExP01EventAction.cc +++ b/examples/extended/persistency/P01/src/ExP01EventAction.cc @@ -25,7 +25,7 @@ // // // $Id: ExP01EventAction.cc,v 1.2 2006/06/29 17:39:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/persistency/P01/src/ExP01MagneticField.cc b/examples/extended/persistency/P01/src/ExP01MagneticField.cc index 59406db388..a987923d49 100644 --- a/examples/extended/persistency/P01/src/ExP01MagneticField.cc +++ b/examples/extended/persistency/P01/src/ExP01MagneticField.cc @@ -25,7 +25,7 @@ // // // $Id: ExP01MagneticField.cc,v 1.2 2006/06/29 17:39:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // User Field class implementation. // diff --git a/examples/extended/persistency/P01/src/ExP01PhysicsList.cc b/examples/extended/persistency/P01/src/ExP01PhysicsList.cc index e98078fcfc..aa20046c49 100644 --- a/examples/extended/persistency/P01/src/ExP01PhysicsList.cc +++ b/examples/extended/persistency/P01/src/ExP01PhysicsList.cc @@ -25,7 +25,7 @@ // // // $Id: ExP01PhysicsList.cc,v 1.2 2006/06/29 17:39:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/persistency/P01/src/ExP01PrimaryGeneratorAction.cc b/examples/extended/persistency/P01/src/ExP01PrimaryGeneratorAction.cc index 5ce3000a18..6dd364a88d 100644 --- a/examples/extended/persistency/P01/src/ExP01PrimaryGeneratorAction.cc +++ b/examples/extended/persistency/P01/src/ExP01PrimaryGeneratorAction.cc @@ -25,7 +25,7 @@ // // // $Id: ExP01PrimaryGeneratorAction.cc,v 1.2 2006/06/29 17:39:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/persistency/P01/src/ExP01RunAction.cc b/examples/extended/persistency/P01/src/ExP01RunAction.cc index 105aa850d2..e028cbd766 100644 --- a/examples/extended/persistency/P01/src/ExP01RunAction.cc +++ b/examples/extended/persistency/P01/src/ExP01RunAction.cc @@ -25,7 +25,7 @@ // // // $Id: ExP01RunAction.cc,v 1.2 2006/06/29 17:39:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/persistency/P01/src/ExP01SteppingAction.cc b/examples/extended/persistency/P01/src/ExP01SteppingAction.cc index cbde076907..30e499b498 100644 --- a/examples/extended/persistency/P01/src/ExP01SteppingAction.cc +++ b/examples/extended/persistency/P01/src/ExP01SteppingAction.cc @@ -25,7 +25,7 @@ // // // $Id: ExP01SteppingAction.cc,v 1.2 2006/06/29 17:39:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/persistency/P01/src/ExP01SteppingVerbose.cc b/examples/extended/persistency/P01/src/ExP01SteppingVerbose.cc index 71830b18de..e9fe0eab58 100644 --- a/examples/extended/persistency/P01/src/ExP01SteppingVerbose.cc +++ b/examples/extended/persistency/P01/src/ExP01SteppingVerbose.cc @@ -25,7 +25,7 @@ // // // $Id: ExP01SteppingVerbose.cc,v 1.2 2006/06/29 17:39:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/persistency/P01/src/ExP01TrackerHit.cc b/examples/extended/persistency/P01/src/ExP01TrackerHit.cc index 9f8ad05a8f..ae31ac30f3 100644 --- a/examples/extended/persistency/P01/src/ExP01TrackerHit.cc +++ b/examples/extended/persistency/P01/src/ExP01TrackerHit.cc @@ -25,7 +25,7 @@ // // // $Id: ExP01TrackerHit.cc,v 1.2 2006/06/29 17:39:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/persistency/P01/src/ExP01TrackerSD.cc b/examples/extended/persistency/P01/src/ExP01TrackerSD.cc index 10d8e83df1..229d269948 100644 --- a/examples/extended/persistency/P01/src/ExP01TrackerSD.cc +++ b/examples/extended/persistency/P01/src/ExP01TrackerSD.cc @@ -25,7 +25,7 @@ // // // $Id: ExP01TrackerSD.cc,v 1.2 2006/06/29 17:39:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/polarisation/Pol01/GNUmakefile b/examples/extended/polarisation/Pol01/GNUmakefile new file mode 100644 index 0000000000..71560392a2 --- /dev/null +++ b/examples/extended/polarisation/Pol01/GNUmakefile @@ -0,0 +1,31 @@ +# $Id: GNUmakefile,v 1.2 2006/10/02 16:25:55 vnivanch Exp $ +# -------------------------------------------------------------- +# GNUmakefile for examples module. Gabriele Cosmo, 06/04/98. +# -------------------------------------------------------------- + +name := pol01 +G4TARGET := $(name) +G4EXLIB := true + +ifndef G4INSTALL + G4INSTALL = ../../../.. +endif + +.PHONY: all +all: lib bin + +include $(G4INSTALL)/config/binmake.gmk + +ifdef G4ANALYSIS_USE + # for the aida-config command see the README file + CPPFLAGS += `aida-config --include` + LDLIBS += `aida-config --lib` + +plots: plotResults.class + @echo calling JAIDA ... + java -cp .:$(CLASSPATH) plotResults pol01.aida + +plotResults.class: plotResults.java + @echo compiling $< + javac $< +endif diff --git a/examples/extended/polarisation/Pol01/History b/examples/extended/polarisation/Pol01/History new file mode 100644 index 0000000000..3540b81d8c --- /dev/null +++ b/examples/extended/polarisation/Pol01/History @@ -0,0 +1,36 @@ +$Id: History,v 1.4 2006/11/17 11:44:46 vnivanch Exp $ +------------------------------------------------------------------- + + ========================================================= + Geant4 - an Object-Oriented Toolkit for Simulation in HEP + ========================================================= + + Pol01 History file + ------------------ + +This file should be used by the G4 example coordinator 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-11-06 V.Ivanchenko (expol01-V08-01-02) +- RunAction and HistoManager classes: double -> G4double, + it -> G4int, add destructor for RunAction::ParticleStatistics + +17-11-06 V.Ivanchenko (expol01-V08-01-01) +- Add macro files, README, minor cleanup (A. Schaelicke) + +02-10-06 V.Ivanchenko (expol01-V08-01-00) +- first tag + +11-08-06 Andreas Schaelicke +- created from TestEm15 + +25-08-06 Andreas Schaelicke +- include polarized processes in physics list option "polarized" +- include polarized processes in default macrofile file +- updated the AIDA interface +- add simple plot tool (based on JAIDA) diff --git a/examples/extended/polarisation/Pol01/README b/examples/extended/polarisation/Pol01/README new file mode 100644 index 0000000000..00efd5d71e --- /dev/null +++ b/examples/extended/polarisation/Pol01/README @@ -0,0 +1,136 @@ +$Id: README,v 1.1 2006/11/17 09:49:41 vnivanch Exp $ +------------------------------------------------------------------- + + ========================================================= + Geant4 - an Object-Oriented Toolkit for Simulation in HEP + ========================================================= + + TestPolarization + ---------------- + + How to compute and plot the QED processes including + polarization. + Two possible scenarios are available: + - Polarization transfer of an incoming beam to final state particles + - Material dependent transmission of a polarized beams. + The method is explained below : see item Physics. + + 1- GEOMETRY DEFINITION + + The geometry consists of a single block of a homogeneous material, + placed in a world. + + Three parameters define the geometry : + - the material of the box, + - the thickness of the box (sizeZ), + - the transverse dimension of the box (sizeXY). + + The default geometry (5mm of Iron, G4_Fe) is constructed in + DetectorConstruction, but the above parameters can be changed + interactively via the commands defined in DetectorMessenger. + Its polarization can be accessed via the PolarizationMessenger + (see example macro file), and is given in the global coordinate + system. + + 2- PHYSICS LIST + + The Physics List contains QED particle definitions (electrons, + positrons and photons) and a general transportation process. + In addition the user can add one of the two process modules: + 1. "standard" - standard (unpolarized) EM physics + 2. "polarized" - polarized EM physics + These physics list contain the standard electromagnetic processes. + + 3- AN EVENT : THE PRIMARY GENERATOR + + The primary kinematic consists of a single particle starting + at the edge of the box. The type of the particle and its + energy are set in PrimaryGeneratorAction (10 MeV electron). + By default the ParticleGun polarization is zero. + All parameter can be changed via the G4 build-in commands of + ParticleGun class (see the macros provided with this example). + + 4- PHYSICS + + This example uses the following physics processes: + + - electromagnetic: + photo-electric effect + Compton scattering + pair production + bremsstrahlung + ionization + multiple scattering + annihilation + or + - polarized electromagnetic: + (incl. simulation of polarization transfer, and + asymmetries for longitudinally polarized leptons, and + circularly polarized photons) + + photo-electric effect + polarized Compton scattering + polarized pair production + polarized bremsstrahlung + polarized ionization + multiple scattering + polarized annihilation + and + - transportation + + and defines the following particles: + electron, positron, photon + + + 5- HISTOGRAMS + + The test contains 12 built-in 1D histograms, which are managed by the + HistoManager class and its Messenger. The histos can be individually + activated with the command : + /testem/histo/setHisto id nbBins valMin valMax unit + where unit is the desired unit for the histo (MeV or keV, etc..) + (see the macro histos.mac). + + 1 gamma energy + 2 gamma cos(theta) + 3 gamma phi + 4 gamma polarization + 5 electron energy + 6 electron cos(theta) + 7 electron phi + 8 electron polarization + 9 positron energy + 10 positron cos(theta) + 11 positron phi + 12 positron polarization + + If AIDA is available, i.e. if G4ANALYSIS_USE is set, these + histograms are stored in a compressed XML file + (pol01.aida). These results can be displayed using a small + program (plotResults.java) based on JAIDA by simply calling + + % gmake plots + + 6- VISUALIZATION + + Simulated events can be displayed on top of a representation of + the geometry, see vis.mac for an example. + + 7- HOW TO START ? + + compile and link to generate an executable + % gmake + + execute pol01 in 'batch' mode from the default macro file : + % pol01 pol01.in + + or execute pol01 in 'batch' mode including aida output : + % pol01 histos.mac + + if available use JAIDA to display the results via + % gmake plots + + a visualisation example is available by calling + % pol01 + [...] + PreInit> /control/execute vis.mac diff --git a/examples/extended/polarisation/Pol01/heprep2.mac b/examples/extended/polarisation/Pol01/heprep2.mac new file mode 100644 index 0000000000..41f18424b1 --- /dev/null +++ b/examples/extended/polarisation/Pol01/heprep2.mac @@ -0,0 +1,40 @@ +# +# Macro file for A01app +# +/control/verbose 2 +/run/verbose 2 +# +/run/initialize +# +# Create empty scene ("world" is default) +# +/vis/scene/create pol01.heprep.gz +# +# Create a scene handler for a specific graphics system +# Edit the next line(s) to choose another graphic system +# +/vis/open HepRepXML +/vis/viewer/set/culling global false +/vis/viewer/zoom 1.4 +/vis/viewer/set/viewpointThetaPhi 60 25 deg +/vis/viewer/flush +#/vis/viewer/zoom 0.0001 +#/vis/viewer/set/viewpointThetaPhi 90 90.0001 deg +#/vis/scene/endOfEventAction accumulate +# +# Add volume to scene +# +/vis/scene/add/volume +# +# Add trajectories to scene +# +/vis/scene/add/trajectories +# +# Add hits to scene +# +/vis/scene/add/hits +# +# Do runs +# +/tracking/storeTrajectory 1 +/run/beamOn 20 diff --git a/examples/extended/polarisation/Pol01/histo.mac b/examples/extended/polarisation/Pol01/histo.mac new file mode 100644 index 0000000000..e95017b1d6 --- /dev/null +++ b/examples/extended/polarisation/Pol01/histo.mac @@ -0,0 +1,50 @@ +# $Id: histo.mac,v 1.1 2006/10/03 09:40:40 vnivanch Exp $ +# +# Macro file for "Pol01.cc" +# (can be run in batch, without graphic) +# +/control/verbose 2 +/run/verbose 2 +# +#/testem/det/setMat Tungsten +/testem/det/setMat Iron +/testem/det/setSizeZ 1.75 mm +/testem/phys/addPhysics polarized +#/testem/phys/addPhysics standard +/testem/event/printModulo 5000 +# +/run/initialize +# +/polarization/manager/verbose 1 +/polarization/volume/set theBox 0. 0. 0.08 +/polarization/volume/list +# +#/process/inactivate pol-eIoni +#/process/inactivate pol-eBrem +#/process/inactivate pol-compt +# +/gun/polarization 0. 0. -1. +/gun/particle gamma +# +/gun/energy 10 MeV +# +##/tracking/verbose 1 +##/run/beamOn 1 +# +/testem/histo/setFileName pol01.aida +/testem/histo/setFileType xml +/testem/histo/setHisto 1 110 0 11 MeV #gamma energy +/testem/histo/setHisto 2 100 -1.01 1.01 none #gamma cos(theta) +/testem/histo/setHisto 3 100 -180. 180. deg #gamma phi +/testem/histo/setHisto 4 100 -1.5 1.5 none #gamma polarization +/testem/histo/setHisto 5 110 0 11 MeV #electron energy +/testem/histo/setHisto 6 100 -1. 1. none #electron cos(theta) +/testem/histo/setHisto 7 100 -180. 180. deg #electron phi +/testem/histo/setHisto 8 100 -1.5 1.5 none #electron polarization +/testem/histo/setHisto 9 110 0 11 MeV #positron energy +/testem/histo/setHisto 10 100 -1. 1. none #positron cos(theta) +/testem/histo/setHisto 11 100 -180. 180. deg #positron phi +/testem/histo/setHisto 12 100 -1.5 1.5 none #positron polarization +# +/run/beamOn 10000 +# diff --git a/examples/extended/polarisation/Pol01/histos.mac b/examples/extended/polarisation/Pol01/histos.mac new file mode 100644 index 0000000000..95f102f0ee --- /dev/null +++ b/examples/extended/polarisation/Pol01/histos.mac @@ -0,0 +1,49 @@ +# $Id: histos.mac,v 1.1 2006/11/17 09:49:41 vnivanch Exp $ +# +# Macro file for "pol01.cc" +# (can be run in batch, without graphic) +# +/control/verbose 2 +/run/verbose 2 +# +/testem/det/setMat G4_Fe +/testem/det/setSizeZ 1.75 mm +/testem/phys/addPhysics polarized +#/testem/phys/addPhysics standard +/testem/event/printModulo 5000 +# +/run/initialize +# +/polarization/manager/verbose 1 +/polarization/volume/set theBox 0. 0. 0.08 +/polarization/volume/list +# +#/process/inactivate pol-eIoni +#/process/inactivate pol-eBrem +#/process/inactivate pol-compt +# +/gun/polarization 0. 0. -1. +/gun/particle gamma +# +/gun/energy 10 MeV +# +##/tracking/verbose 1 +##/run/beamOn 1 +# +/testem/histo/setFileName pol01.aida +/testem/histo/setFileType xml +/testem/histo/setHisto 1 110 0 11 MeV #gamma energy +/testem/histo/setHisto 2 100 -1.01 1.01 none #gamma cos(theta) +/testem/histo/setHisto 3 100 -180. 180. deg #gamma phi +/testem/histo/setHisto 4 100 -1.5 1.5 none #gamma polarization +/testem/histo/setHisto 5 110 0 11 MeV #electron energy +/testem/histo/setHisto 6 100 -1. 1. none #electron cos(theta) +/testem/histo/setHisto 7 100 -180. 180. deg #electron phi +/testem/histo/setHisto 8 100 -1.5 1.5 none #electron polarization +/testem/histo/setHisto 9 110 0 11 MeV #positron energy +/testem/histo/setHisto 10 100 -1. 1. none #positron cos(theta) +/testem/histo/setHisto 11 100 -180. 180. deg #positron phi +/testem/histo/setHisto 12 100 -1.5 1.5 none #positron polarization +# +/run/beamOn 10000 +# diff --git a/examples/extended/medical/GammaTherapy/include/G4EmHadronBuilder.hh b/examples/extended/polarisation/Pol01/include/DetectorConstruction.hh similarity index 58% rename from examples/extended/medical/GammaTherapy/include/G4EmHadronBuilder.hh rename to examples/extended/polarisation/Pol01/include/DetectorConstruction.hh index 3b15fb3bfc..056f228bbf 100644 --- a/examples/extended/medical/GammaTherapy/include/G4EmHadronBuilder.hh +++ b/examples/extended/polarisation/Pol01/include/DetectorConstruction.hh @@ -23,45 +23,71 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// -// $Id: G4EmHadronBuilder.hh,v 1.2 2006/06/29 17:25:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// +// $Id: DetectorConstruction.hh,v 1.2 2006/10/02 16:25:55 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#ifndef G4EmHadronBuilder_h -#define G4EmHadronBuilder_h 1 +#ifndef DetectorConstruction_h +#define DetectorConstruction_h 1 -#include "G4VPhysicsConstructor.hh" +#include "G4VUserDetectorConstruction.hh" #include "globals.hh" +class G4LogicalVolume; +class G4Material; +class DetectorMessenger; + //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -class G4EmHadronBuilder : public G4VPhysicsConstructor +class DetectorConstruction : public G4VUserDetectorConstruction { public: - G4EmHadronBuilder(const G4String& name = "EM_stand_had"); - virtual ~G4EmHadronBuilder(); + + DetectorConstruction(); + ~DetectorConstruction(); public: - // This method is dummy for physics - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); + + G4VPhysicalVolume* Construct(); + + void SetSizeXY (G4double); + void SetSizeZ (G4double); + void SetTargetMaterial (G4String); + void SetWorldMaterial (G4String); + void UpdateGeometry(); + +public: + + const G4VPhysicalVolume* GetWorld() {return pWorld;}; + const G4VPhysicalVolume* GetBox() {return pBox;}; + + G4double GetWorldSize() {return worldSize;}; + G4double GetBoxSizeXY() {return boxSizeXY;}; + G4double GetBoxSizeZ() {return boxSizeZ;}; + G4Material* GetMaterial() {return aMaterial;}; + + void PrintParameters(); + private: - - // hide assignment operator - G4EmHadronBuilder & operator=(const G4EmHadronBuilder &right); - G4EmHadronBuilder(const G4EmHadronBuilder&); + + G4VPhysicalVolume* pWorld; + G4VPhysicalVolume* pBox; + + G4double boxSizeXY; + G4double boxSizeZ; + G4double worldSize; + G4Material* aMaterial; + G4Material* wMaterial; + + DetectorMessenger* detectorMessenger; }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + #endif diff --git a/examples/extended/medical/GammaTherapy/include/G4EmHadronBuilder52.hh b/examples/extended/polarisation/Pol01/include/DetectorMessenger.hh similarity index 71% rename from examples/extended/medical/GammaTherapy/include/G4EmHadronBuilder52.hh rename to examples/extended/polarisation/Pol01/include/DetectorMessenger.hh index ab319b687d..235d3a1e5d 100644 --- a/examples/extended/medical/GammaTherapy/include/G4EmHadronBuilder52.hh +++ b/examples/extended/polarisation/Pol01/include/DetectorMessenger.hh @@ -23,42 +23,45 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// -// $Id: G4EmHadronBuilder52.hh,v 1.2 2006/06/29 17:25:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: DetectorMessenger.hh,v 1.1 2006/10/02 13:48:10 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#ifndef G4EmHadronBuilder52_h -#define G4EmHadronBuilder52_h 1 +#ifndef DetectorMessenger_h +#define DetectorMessenger_h 1 -#include "G4VPhysicsConstructor.hh" +#include "G4UImessenger.hh" #include "globals.hh" +class DetectorConstruction; +class G4UIdirectory; +class G4UIcmdWithAString; +class G4UIcmdWithADoubleAndUnit; +class G4UIcmdWithoutParameter; + //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -class G4EmHadronBuilder52 : public G4VPhysicsConstructor +class DetectorMessenger: public G4UImessenger { -public: - G4EmHadronBuilder52(const G4String& name = "EM_stand_had"); - virtual ~G4EmHadronBuilder52(); - -public: - // This method is dummy for physics - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); - -private: - - // hide assignment operator - G4EmHadronBuilder52 & operator=(const G4EmHadronBuilder52 &right); - G4EmHadronBuilder52(const G4EmHadronBuilder52&); - + public: + + DetectorMessenger(DetectorConstruction* ); + ~DetectorMessenger(); + + void SetNewValue(G4UIcommand*, G4String); + + private: + + DetectorConstruction* Detector; + + G4UIdirectory* testemDir; + G4UIdirectory* detDir; + G4UIcmdWithAString* MaterCmd; + G4UIcmdWithADoubleAndUnit* SizeXYCmd; + G4UIcmdWithADoubleAndUnit* SizeZCmd; + G4UIcmdWithoutParameter* UpdateCmd; }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm11/include/PhysListEmG4v52.hh b/examples/extended/polarisation/Pol01/include/EventAction.hh similarity index 75% rename from examples/extended/electromagnetic/TestEm11/include/PhysListEmG4v52.hh rename to examples/extended/polarisation/Pol01/include/EventAction.hh index 3b161eea74..3ede24fe71 100644 --- a/examples/extended/electromagnetic/TestEm11/include/PhysListEmG4v52.hh +++ b/examples/extended/polarisation/Pol01/include/EventAction.hh @@ -23,45 +23,42 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// -// $Id: PhysListEmG4v52.hh,v 1.2 2006/06/29 16:39:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// +// $Id: EventAction.hh,v 1.1 2006/10/02 13:48:10 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#ifndef PhysListEmG4v52_h -#define PhysListEmG4v52_h 1 +#ifndef EventAction_h +#define EventAction_h 1 -#include "G4VPhysicsConstructor.hh" +#include "G4UserEventAction.hh" #include "globals.hh" +class EventActionMessenger; +class RunAction; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -class PhysListEmG4v52 : public G4VPhysicsConstructor +class EventAction : public G4UserEventAction { - public: - PhysListEmG4v52(const G4String& name = "g4v52"); - ~PhysListEmG4v52(); + public: + EventAction(RunAction *); + ~EventAction(); - public: - // This method is dummy for physics. - void ConstructParticle() {}; - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - void ConstructProcess(); + public: + void BeginOfEventAction(const G4Event*); + void EndOfEventAction(const G4Event*); + + void SetPrintModulo(G4int val) {printModulo = val;}; + + private: + G4int printModulo; + EventActionMessenger* eventMessenger; + RunAction* runAction; }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... #endif - - - - - - - + diff --git a/examples/extended/electromagnetic/TestEm9/include/PhysListParticles.hh b/examples/extended/polarisation/Pol01/include/EventActionMessenger.hh similarity index 77% rename from examples/extended/electromagnetic/TestEm9/include/PhysListParticles.hh rename to examples/extended/polarisation/Pol01/include/EventActionMessenger.hh index bb9fea6608..527e64e06b 100644 --- a/examples/extended/electromagnetic/TestEm9/include/PhysListParticles.hh +++ b/examples/extended/polarisation/Pol01/include/EventActionMessenger.hh @@ -23,46 +23,39 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// -// $Id: PhysListParticles.hh,v 1.3 2006/06/29 17:02:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// - +// $Id: EventActionMessenger.hh,v 1.1 2006/10/02 13:48:10 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#ifndef PhysListParticles_h -#define PhysListParticles_h 1 +#ifndef EventActionMessenger_h +#define EventActionMessenger_h 1 -#include "G4VPhysicsConstructor.hh" +#include "G4UImessenger.hh" #include "globals.hh" +class EventAction; +class G4UIdirectory; +class G4UIcmdWithAnInteger; + //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -class PhysListParticles : public G4VPhysicsConstructor +class EventActionMessenger: public G4UImessenger { -public: - PhysListParticles(const G4String& name = "particles"); - virtual ~PhysListParticles(); - -public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - virtual void ConstructParticle(); - - // This method is dummy. - virtual void ConstructProcess() {}; - + public: + EventActionMessenger(EventAction*); + ~EventActionMessenger(); + + void SetNewValue(G4UIcommand*, G4String); + + private: + EventAction* eventAction; + + G4UIdirectory* eventDir; + G4UIcmdWithAnInteger* PrintCmd; }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... #endif - - - - - - - - diff --git a/examples/extended/polarisation/Pol01/include/HistoManager.hh b/examples/extended/polarisation/Pol01/include/HistoManager.hh new file mode 100644 index 0000000000..bb05cfbc28 --- /dev/null +++ b/examples/extended/polarisation/Pol01/include/HistoManager.hh @@ -0,0 +1,98 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: HistoManager.hh,v 1.2 2006/11/17 11:44:46 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#ifndef HistoManager_h +#define HistoManager_h 1 + +#include "globals.hh" + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +namespace AIDA { + class IAnalysisFactory; + class ITree; + class IHistogram1D; +} + +class HistoMessenger; + +const G4int MaxHisto = 13; + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +class HistoManager { +public: + + HistoManager(); + ~HistoManager(); + + void SetFileName (const G4String& name) { fileName[0] = name;}; + void SetFileType (const G4String& name) { fileType = name;}; + void SetFileOption (const G4String& name) { fileType = name;}; + void book(); + void save(); + void SetHisto (G4int,G4int,G4double,G4double,const G4String& unit="none"); + void FillHisto(G4int id, G4double e, G4double weight = 1.0); + + void FillHistos(const G4String & particleName, + G4double kinEnergy, G4double costheta, G4double phi, + G4double longitudinalPolarization); + + void RemoveHisto (G4int); + + G4bool HistoExist (G4int id) {return exist[id];} + G4double GetHistoUnit(G4int id) {return Unit[id];} + G4double GetBinWidth (G4int id) {return Width[id];} + +private: + + G4String fileName[2]; + G4String fileType; + G4String fileOption; + AIDA::IAnalysisFactory* af; + AIDA::ITree* tree; + AIDA::IHistogram1D* histo[MaxHisto]; + G4bool exist[MaxHisto]; + G4String Label[MaxHisto]; + G4String Title[MaxHisto]; + G4int Nbins[MaxHisto]; + G4double Vmin [MaxHisto]; + G4double Vmax [MaxHisto]; + G4double Unit [MaxHisto]; + G4double Width[MaxHisto]; + G4bool factoryOn; + HistoMessenger* histoMessenger; +}; + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#endif + diff --git a/examples/extended/medical/GammaTherapy/include/G4EmQEDBuilder52.hh b/examples/extended/polarisation/Pol01/include/HistoMessenger.hh similarity index 71% rename from examples/extended/medical/GammaTherapy/include/G4EmQEDBuilder52.hh rename to examples/extended/polarisation/Pol01/include/HistoMessenger.hh index 348a2df8fc..f419fa4520 100644 --- a/examples/extended/medical/GammaTherapy/include/G4EmQEDBuilder52.hh +++ b/examples/extended/polarisation/Pol01/include/HistoMessenger.hh @@ -23,41 +23,47 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// -// $Id: G4EmQEDBuilder52.hh,v 1.2 2006/06/29 17:26:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HistoMessenger.hh,v 1.1 2006/10/02 13:48:10 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#ifndef G4EmQEDBuilder52_h -#define G4EmQEDBuilder52_h 1 +#ifndef HistoMessenger_h +#define HistoMessenger_h 1 -#include "G4VPhysicsConstructor.hh" +#include "G4UImessenger.hh" #include "globals.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -class G4EmQEDBuilder52 : public G4VPhysicsConstructor +class HistoManager; +class G4UIdirectory; +class G4UIcommand; +class G4UIcmdWithAString; +class G4UIcmdWithAnInteger; + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +class HistoMessenger: public G4UImessenger { -public: - G4EmQEDBuilder52(const G4String& name = "EM_stan_QED"); - virtual ~G4EmQEDBuilder52(); + public: -public: - // This method is dummy for physics - virtual void ConstructParticle(); + HistoMessenger(HistoManager* ); + ~HistoMessenger(); - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); + void SetNewValue(G4UIcommand* ,G4String ); -private: + private: - // hide assignment operator - G4EmQEDBuilder52 & operator=(const G4EmQEDBuilder52 &right); - G4EmQEDBuilder52(const G4EmQEDBuilder52&); + HistoManager* histoManager; + + G4UIdirectory* histoDir; + G4UIcmdWithAString* factoryCmd; + G4UIcmdWithAString* typeCmd; + G4UIcmdWithAString* optionCmd; + G4UIcommand* histoCmd; + G4UIcmdWithAnInteger* rmhistoCmd; }; diff --git a/examples/extended/polarisation/Pol01/include/PhysListEmPolarized.hh b/examples/extended/polarisation/Pol01/include/PhysListEmPolarized.hh new file mode 100644 index 0000000000..3763508c24 --- /dev/null +++ b/examples/extended/polarisation/Pol01/include/PhysListEmPolarized.hh @@ -0,0 +1,67 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: PhysListEmPolarized.hh,v 1.1 2006/10/02 16:25:55 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#ifndef PhysListEmPolarized_h +#define PhysListEmPolarized_h 1 + +#include "G4VPhysicsConstructor.hh" +#include "globals.hh" + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +class PhysListEmPolarized : public G4VPhysicsConstructor +{ + public: + PhysListEmPolarized(const G4String& name = "polarized"); + ~PhysListEmPolarized(); + + public: + // This method is dummy for physics + void ConstructParticle() {}; + + // This method will be invoked in the Construct() method. + // each physics process will be instantiated and + // registered to the process manager of each particle type + void ConstructProcess(); +}; + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#endif + + + + + + + + diff --git a/examples/extended/electromagnetic/TestEm3/include/PhysListEmG4v71.hh b/examples/extended/polarisation/Pol01/include/PhysListEmStandard.hh similarity index 88% rename from examples/extended/electromagnetic/TestEm3/include/PhysListEmG4v71.hh rename to examples/extended/polarisation/Pol01/include/PhysListEmStandard.hh index b5b8b27d10..1e497f92d0 100644 --- a/examples/extended/electromagnetic/TestEm3/include/PhysListEmG4v71.hh +++ b/examples/extended/polarisation/Pol01/include/PhysListEmStandard.hh @@ -23,25 +23,25 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: PhysListEmG4v71.hh,v 1.2 2006/06/29 16:51:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListEmStandard.hh,v 1.2 2006/10/02 16:25:55 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#ifndef PhysListEmG4v71_h -#define PhysListEmG4v71_h 1 +#ifndef PhysListEmStandard_h +#define PhysListEmStandard_h 1 #include "G4VPhysicsConstructor.hh" #include "globals.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -class PhysListEmG4v71 : public G4VPhysicsConstructor +class PhysListEmStandard : public G4VPhysicsConstructor { public: - PhysListEmG4v71(const G4String& name = "g4v71"); - ~PhysListEmG4v71(); + PhysListEmStandard(const G4String& name = "standard"); + ~PhysListEmStandard(); public: // This method is dummy for physics diff --git a/examples/extended/electromagnetic/TestEm7/include/PhysListHadronElastic.hh b/examples/extended/polarisation/Pol01/include/PhysicsList.hh similarity index 67% rename from examples/extended/electromagnetic/TestEm7/include/PhysListHadronElastic.hh rename to examples/extended/polarisation/Pol01/include/PhysicsList.hh index 01e285a249..5cd67a0386 100644 --- a/examples/extended/electromagnetic/TestEm7/include/PhysListHadronElastic.hh +++ b/examples/extended/polarisation/Pol01/include/PhysicsList.hh @@ -24,54 +24,57 @@ // ******************************************************************** // // -// $Id: PhysListHadronElastic.hh,v 1.3 2006/06/29 16:57:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysicsList.hh,v 1.1 2006/10/02 13:48:10 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // -// The class provides PhysicsList for hadron elastic process +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... // -// 14.10.02 created by V.Ivanchenko +// 14.10.02 (V.Ivanchenko) provide modular list on base of old PhysicsList // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#ifndef PhysListHadronElastic_h -#define PhysListHadronElastic_h 1 +#ifndef PhysicsList_h +#define PhysicsList_h 1 -#include "G4VPhysicsConstructor.hh" -#include "G4HadronElasticProcess.hh" +#include "G4VModularPhysicsList.hh" #include "globals.hh" +class PhysicsListMessenger; +class G4VPhysicsConstructor; + //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -class PhysListHadronElastic : public G4VPhysicsConstructor +class PhysicsList: public G4VModularPhysicsList { - public: - PhysListHadronElastic(const G4String& name = "elastic"); - virtual ~PhysListHadronElastic(); + public: + PhysicsList(); + ~PhysicsList(); - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - void ConstructParticle() {}; - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type + void ConstructParticle(); void ConstructProcess(); + void AddPhysicsList(const G4String& name); + + void AddStepMax(); + void SetCuts(); + void SetCutForGamma(G4double); + void SetCutForElectron(G4double); + void SetCutForPositron(G4double); + private: - // Elastic Process - G4HadronElasticProcess theElasticProcess; + G4double cutForGamma; + G4double cutForElectron; + G4double cutForPositron; + G4double currentDefaultCut; + + G4VPhysicsConstructor* emPhysicsList; + G4String emName; + + PhysicsListMessenger* pMessenger; }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... #endif - - - - - - - diff --git a/examples/extended/polarisation/Pol01/include/PhysicsListMessenger.hh b/examples/extended/polarisation/Pol01/include/PhysicsListMessenger.hh new file mode 100644 index 0000000000..9931222c97 --- /dev/null +++ b/examples/extended/polarisation/Pol01/include/PhysicsListMessenger.hh @@ -0,0 +1,70 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: PhysicsListMessenger.hh,v 1.1 2006/10/02 13:48:10 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#ifndef PhysicsListMessenger_h +#define PhysicsListMessenger_h 1 + +#include "G4UImessenger.hh" +#include "globals.hh" + +class PhysicsList; +class G4UIdirectory; +class G4UIcmdWithADoubleAndUnit; +class G4UIcmdWithAString; + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +class PhysicsListMessenger: public G4UImessenger +{ + public: + + PhysicsListMessenger(PhysicsList* ); + ~PhysicsListMessenger(); + + void SetNewValue(G4UIcommand*, G4String); + + private: + + PhysicsList* pPhysicsList; + + G4UIdirectory* physDir; + G4UIcmdWithADoubleAndUnit* gammaCutCmd; + G4UIcmdWithADoubleAndUnit* electCutCmd; + G4UIcmdWithADoubleAndUnit* protoCutCmd; + G4UIcmdWithADoubleAndUnit* allCutCmd; + G4UIcmdWithAString* pListCmd; + +}; + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#endif + diff --git a/examples/extended/electromagnetic/TestEm11/include/PhysListEmG4v71.hh b/examples/extended/polarisation/Pol01/include/PrimaryGeneratorAction.hh similarity index 75% rename from examples/extended/electromagnetic/TestEm11/include/PhysListEmG4v71.hh rename to examples/extended/polarisation/Pol01/include/PrimaryGeneratorAction.hh index ae62788b5e..47aa456fa0 100644 --- a/examples/extended/electromagnetic/TestEm11/include/PhysListEmG4v71.hh +++ b/examples/extended/polarisation/Pol01/include/PrimaryGeneratorAction.hh @@ -23,35 +23,37 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// -// $Id: PhysListEmG4v71.hh,v 1.2 2006/06/29 16:39:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// +// $Id: PrimaryGeneratorAction.hh,v 1.1 2006/10/02 13:48:10 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#ifndef PhysListEmG4v71_h -#define PhysListEmG4v71_h 1 +#ifndef PrimaryGeneratorAction_h +#define PrimaryGeneratorAction_h 1 -#include "G4VPhysicsConstructor.hh" +#include "G4VUserPrimaryGeneratorAction.hh" +#include "G4ParticleGun.hh" #include "globals.hh" +class G4Event; +class DetectorConstruction; + //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -class PhysListEmG4v71 : public G4VPhysicsConstructor +class PrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction { - public: - PhysListEmG4v71(const G4String& name = "g4v71"); - ~PhysListEmG4v71(); + public: + PrimaryGeneratorAction(DetectorConstruction*); + ~PrimaryGeneratorAction(); - public: - // This method is dummy for physics. - void ConstructParticle() {}; - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - void ConstructProcess(); + public: + void GeneratePrimaries(G4Event*); + G4ParticleGun* GetParticleGun() {return particleGun;}; + + private: + G4ParticleGun* particleGun; + DetectorConstruction* detector; }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -59,9 +61,3 @@ class PhysListEmG4v71 : public G4VPhysicsConstructor #endif - - - - - - diff --git a/examples/extended/polarisation/Pol01/include/ProcessesCount.hh b/examples/extended/polarisation/Pol01/include/ProcessesCount.hh new file mode 100644 index 0000000000..55ab0c066c --- /dev/null +++ b/examples/extended/polarisation/Pol01/include/ProcessesCount.hh @@ -0,0 +1,66 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: ProcessesCount.hh,v 1.1 2006/10/02 13:48:10 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#ifndef ProcessesCount_HH +#define ProcessesCount_HH + +#include "globals.hh" +#include + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +class OneProcessCount +{ +public: + OneProcessCount(G4String name) {Name=name; Counter=0;}; + ~OneProcessCount() {}; + +public: + G4String GetName() {return Name;}; + G4int GetCounter() {return Counter;}; + void Count() {Counter++;}; + +private: + G4String Name; // process name + G4int Counter; // process counter +}; + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +typedef std::vector ProcessesCount; + +#endif + + + + + + diff --git a/examples/extended/polarisation/Pol01/include/RunAction.hh b/examples/extended/polarisation/Pol01/include/RunAction.hh new file mode 100644 index 0000000000..fcd097aadf --- /dev/null +++ b/examples/extended/polarisation/Pol01/include/RunAction.hh @@ -0,0 +1,98 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: RunAction.hh,v 1.2 2006/11/17 11:44:46 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#ifndef RunAction_h +#define RunAction_h 1 + +#include "G4UserRunAction.hh" +#include "ProcessesCount.hh" +#include "globals.hh" + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +class DetectorConstruction; +class PrimaryGeneratorAction; +class HistoManager; +class G4Run; + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +class RunAction : public G4UserRunAction +{ + class ParticleStatistics { + public: + ParticleStatistics(); + ~ParticleStatistics(); + void EventFinished(); + void FillData(G4double kinEnergy, G4double costheta, + G4double longitudinalPolarization); + void PrintResults(G4int totalNumberOfEvents); + void Clear(); + private: + G4int currentNumber; + G4int totalNumber, totalNumber2; + G4double sumEnergy, sumEnergy2; + G4double sumPolarization, sumPolarization2; + G4double sumCosTheta, sumCosTheta2; + }; + +public: + RunAction(DetectorConstruction*, PrimaryGeneratorAction*, HistoManager*); + virtual ~RunAction(); + +public: + void BeginOfRunAction(const G4Run*); + void EndOfRunAction(const G4Run*); + + void CountProcesses(G4String); + + void FillData(const G4String & particleName, + G4double kinEnergy, G4double costheta, G4double phi, + G4double longitudinalPolarization); + void EventFinished(); + +private: + DetectorConstruction* detector; + PrimaryGeneratorAction* primary; + ProcessesCount* ProcCounter; + HistoManager* histoManager; + + G4int totalEventCount; + + ParticleStatistics photonStats; + ParticleStatistics electronStats; + ParticleStatistics positronStats; +}; + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#endif + diff --git a/examples/extended/electromagnetic/TestEm9/src/PhysListHadronElastic.cc b/examples/extended/polarisation/Pol01/include/StepMax.hh similarity index 67% rename from examples/extended/electromagnetic/TestEm9/src/PhysListHadronElastic.cc rename to examples/extended/polarisation/Pol01/include/StepMax.hh index a86a873848..b8587b826d 100644 --- a/examples/extended/electromagnetic/TestEm9/src/PhysListHadronElastic.cc +++ b/examples/extended/polarisation/Pol01/include/StepMax.hh @@ -23,50 +23,51 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// $Id: StepMax.hh,v 1.1 2006/10/02 13:48:10 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // -// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#include "PhysListHadronElastic.hh" +#ifndef StepMax_h +#define StepMax_h 1 + +#include "globals.hh" +#include "G4VDiscreteProcess.hh" #include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" -#include "G4LElastic.hh" +#include "G4Step.hh" + +class StepMaxMessenger; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -PhysListHadronElastic::PhysListHadronElastic(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListHadronElastic::~PhysListHadronElastic() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void PhysListHadronElastic::ConstructProcess() +class StepMax : public G4VDiscreteProcess { - - // Hadron elastic process + public: - theElasticProcess.RegisterMe( new G4LElastic() ); + StepMax(const G4String& processName ="stepMax"); + ~StepMax(); - theParticleIterator->reset(); - while( (*theParticleIterator)() ){ - G4ParticleDefinition* particle = theParticleIterator->value(); - G4ProcessManager* pManager = particle->GetProcessManager(); - if (particle->GetPDGMass() > 110.*MeV && theElasticProcess.IsApplicable(*particle) - && !particle->IsShortLived()) { - pManager->AddDiscreteProcess(&theElasticProcess); - /* - G4cout << "### Elastic model are registered for " - << particle->GetParticleName() - << G4endl; - */ - } - } + G4bool IsApplicable(const G4ParticleDefinition&); + void SetMaxStep(G4double); + G4double GetMaxStep() {return MaxChargedStep;}; + + G4double PostStepGetPhysicalInteractionLength( const G4Track& track, + G4double previousStepSize, + G4ForceCondition* condition); -} + G4VParticleChange* PostStepDoIt(const G4Track&, const G4Step&); + + G4double GetMeanFreePath(const G4Track&, G4double, G4ForceCondition*) + {return 0.;}; // it is not needed here ! + + private: + + G4double MaxChargedStep; + StepMaxMessenger* pMess; +}; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +#endif + diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04RunAction.hh b/examples/extended/polarisation/Pol01/include/StepMaxMessenger.hh similarity index 81% rename from examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04RunAction.hh rename to examples/extended/polarisation/Pol01/include/StepMaxMessenger.hh index 5435388675..628a69ba76 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04RunAction.hh +++ b/examples/extended/polarisation/Pol01/include/StepMaxMessenger.hh @@ -23,39 +23,36 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// $Id: StepMaxMessenger.hh,v 1.1 2006/10/02 13:48:10 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // -// $Id: ExN04RunAction.hh,v 1.2 2006/06/29 17:07:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#ifndef ExN04RunAction_h -#define ExN04RunAction_h 1 +#ifndef StepMaxMessenger_h +#define StepMaxMessenger_h 1 -#include "G4UserRunAction.hh" +#include "G4UImessenger.hh" #include "globals.hh" +class StepMax; +class G4UIcmdWithADoubleAndUnit; + //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -class G4Run; - -class ExN04RunAction : public G4UserRunAction +class StepMaxMessenger: public G4UImessenger { public: - ExN04RunAction(); - ~ExN04RunAction(); - - public: - void BeginOfRunAction(const G4Run*); - void EndOfRunAction(const G4Run*); + StepMaxMessenger(StepMax*); + ~StepMaxMessenger(); + + void SetNewValue(G4UIcommand*, G4String); + + private: + StepMax* pStepMax; + G4UIcmdWithADoubleAndUnit* StepMaxCmd; }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... #endif - - - - - diff --git a/examples/extended/electromagnetic/TestEm1/include/PhysListEmG4v52.hh b/examples/extended/polarisation/Pol01/include/SteppingAction.hh similarity index 74% rename from examples/extended/electromagnetic/TestEm1/include/PhysListEmG4v52.hh rename to examples/extended/polarisation/Pol01/include/SteppingAction.hh index 9d926a3c17..e00e8bfebb 100644 --- a/examples/extended/electromagnetic/TestEm1/include/PhysListEmG4v52.hh +++ b/examples/extended/polarisation/Pol01/include/SteppingAction.hh @@ -23,45 +23,41 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// -// $Id: PhysListEmG4v52.hh,v 1.2 2006/06/29 16:36:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: SteppingAction.hh,v 1.1 2006/10/02 13:48:10 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#ifndef PhysListEmG4v52_h -#define PhysListEmG4v52_h 1 +#ifndef SteppingAction_h +#define SteppingAction_h 1 -#include "G4VPhysicsConstructor.hh" +#include "G4UserSteppingAction.hh" #include "globals.hh" +class DetectorConstruction; +class PrimaryGeneratorAction; +class RunAction; +class HistoManager; + //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -class PhysListEmG4v52 : public G4VPhysicsConstructor +class SteppingAction : public G4UserSteppingAction { - public: - PhysListEmG4v52(const G4String& name = "g4v52"); - ~PhysListEmG4v52(); + public: + SteppingAction(DetectorConstruction*, PrimaryGeneratorAction*, RunAction*, + HistoManager*); + ~SteppingAction(); - public: - // This method is dummy for physics. - void ConstructParticle() {}; - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - void ConstructProcess(); + void UserSteppingAction(const G4Step*); + + private: + DetectorConstruction* detector; + PrimaryGeneratorAction* primary; + RunAction* runAction; + HistoManager* histoManager; }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... #endif - - - - - - - - diff --git a/examples/extended/polarisation/Pol01/plotResults.class b/examples/extended/polarisation/Pol01/plotResults.class new file mode 100644 index 0000000000000000000000000000000000000000..4c6a6fe838eba088903e7165c26b5b9bf6a13ad3 GIT binary patch literal 2096 zcmah~%WoS+9R9|yUE3QcSto5wli)s}&ST>^N%L;nBu%Jk9wrHeQcBr48)t*PYrN|= zp}Y==J3`{XfddC5j^&WnAXU9p;*7X~#6Q44fQ0ysce`;&5SC_UznS0T`#om-^WQ%{ z0Wg41BX}7Z5kp}NV?@BE2m&0B@^y?);}J|?GJ+{g^XamPnJBK{s)*Sr<}fednurAv ziy~g(0@p=kqj(iJqFBN*pH`w+MUH>HCSpy*x`+)CuZy@T;tdgRint}>EfKc`ye;4k zLugtzbbE%upX#~E5STZ&G=}CS-OyI5rA@7}p>7swCs0y#gW*)__R_9;PfZt9qmW*= zE4opb;);=ly}VYoboimF= z1FF8I3b-rbU8v;c-!A5=+uK@&3{@?1nA|3-Nkc7ZNeP?COW1-YU|T`~I|6hGyLeAR z5hV(1uT&IZ@GX;pWdxKZybrR~zN3}X+;2L2UAJtrP*F>nYa}y7W0=N>1PeB$D7RzU zrXirpt=toEU&0>tC47Jf0zQ=R5k8ji2@i-}qA^NijK(;FxKPyccEzO3u?YrWW{^)A zK9LtOXIi>*8g0lBg?SkN>gFz4V2IbZbTge@^)h`#aDCshH6E~8CGmErN+h4764_KJ zO)X7PENZ!|8CwkfsT1mWY|F_z>4~=K6q}(f)pJaaBs_u*4jF_pcVDFV+fQ;xjgvSm z!>pke_buI8RP(l3*(bJnqHR+Hb&=2ilq2V@j^IW`(>&$G5uJu3l5ePe!vVwS2_%mP z+sK8hlfl>_JHA8rWn1TIR!%V3sJ^TkYC+p_s!Vp;oIrAPUu>=7#nO2smZPVn)p6+k z=o!Ps{~_SYlabbAM(Bb%bk?*2zt{}HR5r_Rd#F<1VdzX{8^dv}Ir3!l^f8;x5#^^$ zA#(kOy3VPV=3T}5s}itw%=KOZO}q-gFT)I}?!HQ4(I>>+(H^wJ!vZ^jTt zANom!M15buk2VtcUG^>YKKTa8UjNY25Agqlz^z9J%Ao@YeKZar9w7V}k>&maMEhi^ zh9*B&6ggHyvkyef^$Uxhqm=NXm8cz8z8BTvhGDDpWEv?}s>56DF2fa0JgpZ=td`U?Xrgfwf$ zAnQhkDHvkY7-lyx!qza#?qZA;G0yfe!9K?n`vTMKYg}gEV}?D(74{5Q*{_&oztLa1 RLj4+`ejT8Zrf(kx{{ddq+pGWp literal 0 HcmV?d00001 diff --git a/examples/extended/polarisation/Pol01/plotResults.java b/examples/extended/polarisation/Pol01/plotResults.java new file mode 100644 index 0000000000..a5fe777dcb --- /dev/null +++ b/examples/extended/polarisation/Pol01/plotResults.java @@ -0,0 +1,93 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: plotResults.java,v 1.3 2006/12/13 15:42:42 gunter Exp $ +import hep.aida.*; +import java.util.Random; +import java.io.IOException; + +/* + Small plotter example + compile with (provided aida is in your CLASSPATH variable) + % javac plotResults.java + % java -cp .:$CLASSPATH plotResult + +*/ + + +public class plotResults +{ + public static void main(String[] argv) throws IOException + { + String fileName="pol01.aida"; + if (argv.length>0) { + fileName=argv[0]; + System.out.println("using file name "+fileName); + } + + IAnalysisFactory af = IAnalysisFactory.create(); + ITree tree = af.createTreeFactory().create(fileName,"xml"); + + IHistogram1D h1 = (IHistogram1D) tree.find("1"); + IHistogram1D h2 = (IHistogram1D) tree.find("2"); + IHistogram1D h3 = (IHistogram1D) tree.find("3"); + IHistogram1D h4 = (IHistogram1D) tree.find("4"); + + IPlotterFactory pf = af.createPlotterFactory(); + IPlotter plotterPhoton = pf.create("Photon"); + plotterPhoton.createRegions(2,2); + plotterPhoton.region(0).plot(h1); + plotterPhoton.region(1).plot(h2); + plotterPhoton.region(2).plot(h3); + plotterPhoton.region(3).plot(h4); + plotterPhoton.show(); + + IHistogram1D h5 = (IHistogram1D) tree.find("5"); + IHistogram1D h6 = (IHistogram1D) tree.find("6"); + IHistogram1D h7 = (IHistogram1D) tree.find("7"); + IHistogram1D h8 = (IHistogram1D) tree.find("8"); + + IPlotter plotterElectron = pf.create("Electron"); + plotterElectron.createRegions(2,2); + plotterElectron.region(0).plot(h5); + plotterElectron.region(1).plot(h6); + plotterElectron.region(2).plot(h7); + plotterElectron.region(3).plot(h8); + plotterElectron.show(); + + IHistogram1D h9 = (IHistogram1D) tree.find("9"); + IHistogram1D h10 = (IHistogram1D) tree.find("10"); + IHistogram1D h11 = (IHistogram1D) tree.find("11"); + IHistogram1D h12 = (IHistogram1D) tree.find("12"); + + IPlotter plotterPositron = pf.create("Positron"); + plotterPositron.createRegions(2,2); + plotterPositron.region(0).plot(h9); + plotterPositron.region(1).plot(h10); + plotterPositron.region(2).plot(h11); + plotterPositron.region(3).plot(h12); + plotterPositron.show(); + } +} diff --git a/examples/extended/polarisation/Pol01/pol01.cc b/examples/extended/polarisation/Pol01/pol01.cc new file mode 100644 index 0000000000..719c03ddaf --- /dev/null +++ b/examples/extended/polarisation/Pol01/pol01.cc @@ -0,0 +1,114 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: pol01.cc,v 1.2 2006/10/02 16:25:55 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#include "G4RunManager.hh" +#include "G4UImanager.hh" +#include "G4UIterminal.hh" +#include "G4UItcsh.hh" +#include "Randomize.hh" + +#include "DetectorConstruction.hh" +#include "PhysicsList.hh" +#include "PrimaryGeneratorAction.hh" + +#include "RunAction.hh" +#include "EventAction.hh" +#include "SteppingAction.hh" +#include "HistoManager.hh" + +#ifdef G4VIS_USE + #include "G4VisExecutive.hh" +#endif + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +int main(int argc,char** argv) { + + //choose the Random engine + // CLHEP::HepRandom::setTheEngine(new CLHEP::RanecuEngine); + CLHEP::HepRandom::setTheEngine(new CLHEP::RanluxEngine()); + + // Construct the default run manager + G4RunManager * runManager = new G4RunManager; + + // set mandatory initialization classes + DetectorConstruction* det; + PrimaryGeneratorAction* prim; + runManager->SetUserInitialization(det = new DetectorConstruction); + runManager->SetUserInitialization(new PhysicsList); + runManager->SetUserAction(prim = new PrimaryGeneratorAction(det)); + + G4VisManager* visManager = 0; + + HistoManager* histo = new HistoManager(); + + // set user action classes + RunAction* run; + runManager->SetUserAction(run = new RunAction(det,prim,histo)); + runManager->SetUserAction(new EventAction(run)); + runManager->SetUserAction(new SteppingAction(det,prim,run,histo)); + + // get the pointer to the User Interface manager + G4UImanager* UI = G4UImanager::GetUIpointer(); + + if (argc==1) // Define UI terminal for interactive mode + { +#ifdef G4VIS_USE + // visualization manager + visManager = new G4VisExecutive; + visManager->Initialize(); +#endif + + G4UIsession * session = 0; +#ifdef G4UI_USE_TCSH + session = new G4UIterminal(new G4UItcsh); +#else + session = new G4UIterminal(); +#endif + session->SessionStart(); + delete session; + } + else // Batch mode + { + G4String command = "/control/execute "; + G4String fileName = argv[1]; + UI->ApplyCommand(command+fileName); + } + + // job termination + if(visManager) delete visManager; + delete histo; + delete runManager; + + return 0; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/polarisation/Pol01/pol01.in b/examples/extended/polarisation/Pol01/pol01.in new file mode 100644 index 0000000000..68b7e7a7c2 --- /dev/null +++ b/examples/extended/polarisation/Pol01/pol01.in @@ -0,0 +1,28 @@ +# $Id: pol01.in,v 1.3 2006/11/17 09:49:41 vnivanch Exp $ +# +# Macro file for "pol01.cc" +# (can be run in batch, without graphic, without analysis) +# +/control/verbose 2 +/run/verbose 2 +# +/testem/det/setMat G4_Fe +/testem/det/setSizeZ 1.75 mm +/testem/phys/addPhysics polarized +#/testem/phys/addPhysics standard +/testem/event/printModulo 5000 +# +/run/initialize +# +/polarization/manager/verbose 1 +/polarization/volume/set theBox 0. 0. 0.08 +/polarization/volume/list +# +/gun/polarization 0. 0. -1. +/gun/particle gamma +# +/gun/energy 10 MeV +# +##/tracking/verbose 1 +/run/beamOn 10000 +# diff --git a/examples/extended/polarisation/Pol01/pol01.out b/examples/extended/polarisation/Pol01/pol01.out new file mode 100644 index 0000000000..e6eb11ee86 --- /dev/null +++ b/examples/extended/polarisation/Pol01/pol01.out @@ -0,0 +1,177 @@ + +************************************************************* + Geant4 version Name: global-V08-01-05 (15-December-2006) + Copyright : Geant4 Collaboration + Reference : NIM A 506 (2003), 250-303 + WWW : http://cern.ch/geant4 +************************************************************* + +/run/verbose 2 +# +/testem/det/setMat G4_Fe +/testem/det/setSizeZ 1.75 mm +/testem/phys/addPhysics polarized +PhysicsList::AddPhysicsList: +#/testem/phys/addPhysics standard +/testem/event/printModulo 5000 +# +/run/initialize +userDetector->Construct() start. + + The Box is 5 cm x 5 cm x 1.75 mm of G4_Fe +World is registered to the default region. +physicsList->Construct() start. +physicsList->Construct() start. +physicsList->setCut() start. +# +/polarization/manager/verbose 1 +/polarization/volume/set theBox 0. 0. 0.08 + SetVolumePolarization theBox (0,0,0.08) +/polarization/volume/list + Polarization for 1 registered volume(s) : +theBox : (0,0,0.08) +# +/gun/polarization 0. 0. -1. +/gun/particle gamma +# +/gun/energy 10 MeV +# +##/tracking/verbose 1 +/run/beamOn 10000 + buildBhabha cross section 0 + buildBhabha cross section 0 + +phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model + +pol-compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV + Sampling according Polarized-Compton model + tables are built for gamma + Lambda tables from 100 eV to 100 GeV in 90 bins. + +pol-conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; + sampling secondary e+e- according to the polarized compton cross section + tables are built for gamma + Lambda tables from 1.022 MeV to 100 GeV in 100 bins. + +msc: Model variant of multiple scattering for e- + Lambda tables from 100 eV to 100 TeV in 120 bins. + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +pol-eIoni: tables are built for e- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +pol-eBrem: tables are built for e- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Total cross sections from a parametrisation based on the EEDL data library. + Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. + +pol-eIoni: tables are built for e+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +pol-eBrem: tables are built for e+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Total cross sections from a parametrisation based on the EEDL data library. + Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. + +pol-annihil: Polarized model for annihilation into 2 photons + tables are built for e+ + Lambda tables from 100 eV to 100 TeV in 120 bins. + annih-numOfCouples=2 +annih- 0/2 +annih- 1 + building pol-annih ... +annih- 1/2 +annih- 1 + building pol-annih ... + +Region -- appears in world volume + Materials : G4_Galactic G4_Fe + Production cuts : gamma 100 um e- 100 um e+ 100 um + +========= Table of registered couples ============================== + +Index : 0 used in the geometry : Yes recalculation needed : No + Material : G4_Galactic + Range cuts : gamma 100 um e- 100 um e+ 100 um + Energy thresholds : gamma 990 eV e- 990 eV e+ 990 eV + Region(s) which use this couple : + DefaultRegionForTheWorld + +Index : 1 used in the geometry : Yes recalculation needed : No + Material : G4_Fe + Range cuts : gamma 100 um e- 100 um e+ 100 um + Energy thresholds : gamma 6.25836 keV e- 234.109 keV e+ 228.416 keV + Region(s) which use this couple : + DefaultRegionForTheWorld + +==================================================================== + +Start closing geometry. +G4GeometryManager::ReportVoxelStats -- Voxel Statistics + + Total memory consumed for geometry optimisation: 0 kByte + Total CPU time elapsed for geometry optimisation: 0 seconds +### Run 0 start. +Start Run processing. + +---> Begin of Event: 0 + +---> Begin of Event: 5000 +Run terminated. +Run Summary + Number of events processed : 10000 + User=6.42s Real=6.53s Sys=0.07s + + The run consists of 10000 gamma of 10 MeV through 1.75 mm of G4_Fe (density: 7.874 g/cm3 ) + +--------- Ranlux engine status --------- + Initial seed = 9876 + float_seed_table[] = 0.549714 0.410043 0.780886 0.64282 0.79192 0.70901 0.00266129 0.35078 0.438628 0.375464 0.131737 0.577583 0.387019 0.128477 0.154341 0.67122 0.634085 0.685582 0.89742 0.59932 0.397649 0.493329 0.724233 0.802348 + i_lag = 15, j_lag = 1 + carry = 0, count24 = 7 + luxury = 3 nskip = 199 +---------------------------------------- + + Process calls frequency ---> + Transportation = 31246 + pol-compt = 301 + msc = 4961 + pol-eBrem = 395 + pol-conv = 225 + pol-eIoni = 688 + pol-annihil = 71 + phot = 184 + Gamma: +Mean Number per Event :1.0112 +Mean Energy :9.5321 MeV +- 2.0004 MeV +Mean Polarization :-0.9602 +- 0.19308 + Electron: +Mean Number per Event :0.0357 +Mean Energy :5.3112 MeV +- 2.5499 MeV +Mean Polarization :-0.72312 +- 0.29742 + Positron: +Mean Number per Event :0.0154 +Mean Energy :4.3802 MeV +- 2.1362 MeV +Mean Polarization :-0.63213 +- 0.30361 +# +UserDetectorConstruction deleted. +UserPhysicsList deleted. +UserRunAction deleted. +UserPrimaryGenerator deleted. +G4 kernel has come to Quit state. +EventManager deleted. +Default detector region deleted. +UImanager deleted. +Units table cleared. +StateManager deleted. +RunManagerKernel is deleted. +RunManager is deleting. diff --git a/examples/extended/polarisation/Pol01/src/DetectorConstruction.cc b/examples/extended/polarisation/Pol01/src/DetectorConstruction.cc new file mode 100644 index 0000000000..6ad572044f --- /dev/null +++ b/examples/extended/polarisation/Pol01/src/DetectorConstruction.cc @@ -0,0 +1,205 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: DetectorConstruction.cc,v 1.2 2006/10/02 16:25:55 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#include "DetectorConstruction.hh" +#include "DetectorMessenger.hh" + +#include "G4Material.hh" +#include "G4Box.hh" +#include "G4LogicalVolume.hh" +#include "G4PVPlacement.hh" + +#include "G4GeometryManager.hh" +#include "G4PhysicalVolumeStore.hh" +#include "G4LogicalVolumeStore.hh" +#include "G4SolidStore.hh" + +#include "G4UnitsTable.hh" + +#include "G4PolarizationManager.hh" +#include "G4NistManager.hh" + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +DetectorConstruction::DetectorConstruction() +:pWorld(0), pBox(0), aMaterial(0) +{ + boxSizeXY = 50*mm; + boxSizeZ = 5*mm; + worldSize = 1.*m; + aMaterial = 0; + wMaterial = 0; + SetTargetMaterial("G4_Fe"); + SetWorldMaterial("G4_Galactic"); + detectorMessenger = new DetectorMessenger(this); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +DetectorConstruction::~DetectorConstruction() +{ + delete detectorMessenger; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +G4VPhysicalVolume* DetectorConstruction::Construct() +{ + // Cleanup old geometry + G4GeometryManager::GetInstance()->OpenGeometry(); + G4PhysicalVolumeStore::GetInstance()->Clean(); + G4LogicalVolumeStore::GetInstance()->Clean(); + G4SolidStore::GetInstance()->Clean(); + + G4PolarizationManager::GetInstance()->Clean(); + + // World + // + G4Box* + sWorld = new G4Box("World", //name + worldSize/2,worldSize/2,worldSize/2); //dimensions + + G4LogicalVolume* + lWorld = new G4LogicalVolume(sWorld, //shape + wMaterial, //material + "World"); //name + + pWorld = new G4PVPlacement(0, //no rotation + G4ThreeVector(), //at (0,0,0) + lWorld, //logical volume + "World", //name + 0, //mother volume + false, //no boolean operation + 0); //copy number + + // Box + // + G4Box* + sBox = new G4Box("Container", //its name + boxSizeXY/2.,boxSizeXY/2.,boxSizeZ/2.); //its dimensions + + G4LogicalVolume* + lBox = new G4LogicalVolume(sBox, //its shape + aMaterial, //its material + "theBox"); //its name + + pBox = new G4PVPlacement(0, //no rotation + G4ThreeVector(), //at (0,0,0) + lBox, //its logical volume + aMaterial->GetName(), //its name + lWorld, //its mother volume + false, //no boolean operation + 0); //copy number + + // register logical Volume in PolarizationManager with zero polarization + G4PolarizationManager * polMgr = G4PolarizationManager::GetInstance(); + polMgr->SetVolumePolarization(lBox,G4ThreeVector(0.,0.,0.)); + + PrintParameters(); + + //always return the root volume + // + return pWorld; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void DetectorConstruction::PrintParameters() +{ + G4cout << "\n The Box is " << G4BestUnit(boxSizeXY,"Length") + << " x " << G4BestUnit(boxSizeXY,"Length") + << " x " << G4BestUnit(boxSizeZ,"Length") + << " of " << aMaterial->GetName() << G4endl; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void DetectorConstruction::SetTargetMaterial(G4String materialChoice) +{ + // search the material by its name + G4Material* mat = + G4NistManager::Instance()->FindOrBuildMaterial(materialChoice); + if (mat != aMaterial) { + if(mat) { + aMaterial = mat; + UpdateGeometry(); + } else { + G4cout << "### Warning! Target material: <" + << materialChoice << "> not found" << G4endl; + } + } +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void DetectorConstruction::SetWorldMaterial(G4String materialChoice) +{ + // search the material by its name + G4Material* mat = + G4NistManager::Instance()->FindOrBuildMaterial(materialChoice); + if (mat != wMaterial) { + if(mat) { + wMaterial = mat; + UpdateGeometry(); + } else { + G4cout << "### Warning! World material: <" + << materialChoice << "> not found" << G4endl; + } + } +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void DetectorConstruction::SetSizeXY(G4double value) +{ + boxSizeXY = value; + if (worldSizeDefineWorldVolume(Construct()); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/polarisation/Pol01/src/DetectorMessenger.cc b/examples/extended/polarisation/Pol01/src/DetectorMessenger.cc new file mode 100644 index 0000000000..96da5be2e8 --- /dev/null +++ b/examples/extended/polarisation/Pol01/src/DetectorMessenger.cc @@ -0,0 +1,106 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: DetectorMessenger.cc,v 1.2 2006/10/02 16:25:55 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#include "DetectorMessenger.hh" + +#include "DetectorConstruction.hh" +#include "G4UIdirectory.hh" +#include "G4UIcmdWithAString.hh" +#include "G4UIcmdWithADoubleAndUnit.hh" +#include "G4UIcmdWithoutParameter.hh" + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +DetectorMessenger::DetectorMessenger(DetectorConstruction * Det) +:Detector(Det) +{ + testemDir = new G4UIdirectory("/testem/"); + testemDir->SetGuidance("commands specific to this example"); + + detDir = new G4UIdirectory("/testem/det/"); + detDir->SetGuidance("detector construction"); + + MaterCmd = new G4UIcmdWithAString("/testem/det/setMat",this); + MaterCmd->SetGuidance("Select material of the box."); + MaterCmd->SetParameterName("choice",false); + MaterCmd->AvailableForStates(G4State_PreInit,G4State_Idle); + + SizeXYCmd = new G4UIcmdWithADoubleAndUnit("/testem/det/setSizeXY",this); + SizeXYCmd->SetGuidance("Set sizeXY of the box"); + SizeXYCmd->SetParameterName("Size",false); + SizeXYCmd->SetRange("Size>0."); + SizeXYCmd->SetUnitCategory("Length"); + SizeXYCmd->AvailableForStates(G4State_PreInit,G4State_Idle); + + SizeZCmd = new G4UIcmdWithADoubleAndUnit("/testem/det/setSizeZ",this); + SizeZCmd->SetGuidance("Set sizeZ of the box"); + SizeZCmd->SetParameterName("SizeZ",false); + SizeZCmd->SetRange("SizeZ>0."); + SizeZCmd->SetUnitCategory("Length"); + SizeZCmd->AvailableForStates(G4State_PreInit,G4State_Idle); + + UpdateCmd = new G4UIcmdWithoutParameter("/testem/det/update",this); + UpdateCmd->SetGuidance("Update calorimeter geometry."); + UpdateCmd->SetGuidance("This command MUST be applied before \"beamOn\" "); + UpdateCmd->SetGuidance("if you changed geometrical value(s)."); + UpdateCmd->AvailableForStates(G4State_Idle); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +DetectorMessenger::~DetectorMessenger() +{ + delete MaterCmd; + delete SizeXYCmd; + delete SizeZCmd; + delete UpdateCmd; + delete detDir; + delete testemDir; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void DetectorMessenger::SetNewValue(G4UIcommand* command, G4String newValue) +{ + if( command == MaterCmd ) + { Detector->SetTargetMaterial(newValue);} + + if( command == SizeXYCmd ) + { Detector->SetSizeXY(SizeXYCmd->GetNewDoubleValue(newValue));} + + if( command == SizeZCmd ) + { Detector->SetSizeZ(SizeZCmd->GetNewDoubleValue(newValue));} + + if( command == UpdateCmd ) + { Detector->UpdateGeometry(); } +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm17/src/PhysListEmG4v52.cc b/examples/extended/polarisation/Pol01/src/EventAction.cc similarity index 61% rename from examples/extended/electromagnetic/TestEm17/src/PhysListEmG4v52.cc rename to examples/extended/polarisation/Pol01/src/EventAction.cc index ede32203c1..4c8b516660 100644 --- a/examples/extended/electromagnetic/TestEm17/src/PhysListEmG4v52.cc +++ b/examples/extended/polarisation/Pol01/src/EventAction.cc @@ -23,57 +23,67 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// -// $Id: PhysListEmG4v52.cc,v 1.2 2006/06/29 16:49:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// +// $Id: EventAction.cc,v 1.1 2006/10/02 13:48:10 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#include "PhysListEmG4v52.hh" +#include "EventAction.hh" -#include "G4ParticleDefinition.hh" -#include "G4MuonPlus.hh" -#include "G4MuonMinus.hh" - -#include "G4ProcessManager.hh" -#include "G4MuIonisation52.hh" -#include "G4MuBremsstrahlung52.hh" -#include "G4MuPairProduction52.hh" -#include "G4MuNuclearInteraction.hh" +#include "EventActionMessenger.hh" +#include "G4Event.hh" +#include "G4TrajectoryContainer.hh" +#include "G4Trajectory.hh" +#include "G4VVisManager.hh" +#include "G4UnitsTable.hh" +#include "RunAction.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -PhysListEmG4v52::PhysListEmG4v52(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListEmG4v52::~PhysListEmG4v52() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void PhysListEmG4v52::ConstructProcess() +EventAction::EventAction(RunAction * ra) + :printModulo(10000),eventMessenger(0),runAction(ra) { - // Add standard EM Processes for Muon - G4ParticleDefinition* particle = G4MuonPlus::MuonPlus(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - - pmanager->AddProcess(new G4MuIonisation52, -1, 1,1); - pmanager->AddProcess(new G4MuBremsstrahlung52, -1,-1,2); - pmanager->AddProcess(new G4MuPairProduction52, -1,-1,3); -/// pmanager->AddProcess(new G4MuNuclearInteraction,-1,-1,4); - - particle = G4MuonMinus::MuonMinus(); - pmanager = particle->GetProcessManager(); - - pmanager->AddProcess(new G4MuIonisation52, -1, 1,1); - pmanager->AddProcess(new G4MuBremsstrahlung52, -1,-1,2); - pmanager->AddProcess(new G4MuPairProduction52, -1,-1,3); -/// pmanager->AddProcess(new G4MuNuclearInteraction,-1,-1,4); + eventMessenger = new EventActionMessenger(this); } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +EventAction::~EventAction() +{ + delete eventMessenger; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void EventAction::BeginOfEventAction(const G4Event* evt) +{ + G4int evtNb = evt->GetEventID(); + + //printing survey + if (evtNb%printModulo == 0) + G4cout << "\n---> Begin of Event: " << evtNb << G4endl; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void EventAction::EndOfEventAction(const G4Event* evt) +{ + if (runAction) runAction->EventFinished(); + + if (G4VVisManager::GetConcreteInstance()) + { + G4TrajectoryContainer* trajectoryContainer = evt->GetTrajectoryContainer(); + G4int n_trajectories = 0; + if (trajectoryContainer) n_trajectories = trajectoryContainer->entries(); + for (G4int i=0; iGetTrajectoryContainer()))[i]); + trj->DrawTrajectory(1000); + } + } +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + + diff --git a/examples/extended/electromagnetic/TestEm9/src/PhysListGeneral.cc b/examples/extended/polarisation/Pol01/src/EventActionMessenger.cc similarity index 68% rename from examples/extended/electromagnetic/TestEm9/src/PhysListGeneral.cc rename to examples/extended/polarisation/Pol01/src/EventActionMessenger.cc index 8209128f79..195fdbb6cc 100644 --- a/examples/extended/electromagnetic/TestEm9/src/PhysListGeneral.cc +++ b/examples/extended/polarisation/Pol01/src/EventActionMessenger.cc @@ -23,52 +23,48 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// -// $Id: PhysListGeneral.cc,v 1.3 2006/06/29 17:03:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// +// $Id: EventActionMessenger.cc,v 1.1 2006/10/02 13:48:10 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#include "PhysListGeneral.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" +#include "EventActionMessenger.hh" + +#include "EventAction.hh" + +#include "G4UIdirectory.hh" +#include "G4UIcmdWithAnInteger.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -PhysListGeneral::PhysListGeneral(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListGeneral::~PhysListGeneral() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void PhysListGeneral::ConstructProcess() -{ - // Add Decay Process - - G4Decay* fDecayProcess = new G4Decay(); - - theParticleIterator->reset(); - while( (*theParticleIterator)() ){ - G4ParticleDefinition* particle = theParticleIterator->value(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - - if (fDecayProcess->IsApplicable(*particle)) { - - pmanager ->AddProcess(fDecayProcess); - - // set ordering for PostStepDoIt and AtRestDoIt - pmanager ->SetProcessOrdering(fDecayProcess, idxPostStep); - pmanager ->SetProcessOrdering(fDecayProcess, idxAtRest); - - } - } +EventActionMessenger::EventActionMessenger(EventAction* EvAct) +:eventAction(EvAct) +{ + eventDir = new G4UIdirectory("/testem/event/"); + eventDir ->SetGuidance("event control"); + + PrintCmd = new G4UIcmdWithAnInteger("/testem/event/printModulo",this); + PrintCmd->SetGuidance("Print events modulo n"); + PrintCmd->SetParameterName("EventNb",false); + PrintCmd->SetRange("EventNb>0"); + PrintCmd->AvailableForStates(G4State_PreInit,G4State_Idle); } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +EventActionMessenger::~EventActionMessenger() +{ + delete PrintCmd; + delete eventDir; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void EventActionMessenger::SetNewValue(G4UIcommand* command, G4String newValue) +{ + if (command == PrintCmd) + {eventAction->SetPrintModulo(PrintCmd->GetNewIntValue(newValue));} +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/polarisation/Pol01/src/HistoManager.cc b/examples/extended/polarisation/Pol01/src/HistoManager.cc new file mode 100644 index 0000000000..1ab3c64704 --- /dev/null +++ b/examples/extended/polarisation/Pol01/src/HistoManager.cc @@ -0,0 +1,247 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: HistoManager.cc,v 1.3 2006/11/17 11:44:46 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#include "HistoManager.hh" +#include "HistoMessenger.hh" +#include "G4UnitsTable.hh" + +#ifdef G4ANALYSIS_USE +#include "AIDA/AIDA.h" +#endif + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +HistoManager::HistoManager() +:af(0),tree(0),factoryOn(false) +{ +#ifdef G4ANALYSIS_USE + // Creating the analysis factory + af = AIDA_createAnalysisFactory(); + if(!af) { + G4cout << " HistoManager::HistoManager() :" + << " problem creating the AIDA analysis factory." + << G4endl; + } +#endif + + fileName[0] = "pol01.aida"; + fileType = "xml"; + fileOption = "compress=yes"; + // histograms + for (G4int k=0; kcreateTreeFactory(); + tree = tf->create(fileName[1], fileType, readOnly, createNew, fileOption); + delete tf; + if(!tree) { + G4cout << "HistoManager::book() :" + << " problem creating the AIDA tree with " + << " storeName = " << fileName[1] + << " storeType = " << fileType + << " readOnly = " << readOnly + << " createNew = " << createNew + << " options = " << fileOption + << G4endl; + return; + } + + // Creating a histogram factory, whose histograms will be handled by the tree + AIDA::IHistogramFactory* hf = af->createHistogramFactory(*tree); + + // create selected histograms + for (G4int k=0; kcreateHistogram1D( Label[k], Title[k], + Nbins[k], Vmin[k], Vmax[k]); + factoryOn = true; + } + } + delete hf; + if(factoryOn) + G4cout << "\n----> Histogram Tree is opened " << fileName[1] << G4endl; +#endif +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void HistoManager::save() +{ +#ifdef G4ANALYSIS_USE + if (factoryOn) { + tree->commit(); // Writing the histograms to the file + tree->close(); // and closing the tree (and the file) + G4cout << "\n----> Histogram Tree is saved in " << fileName[1] << G4endl; + + delete tree; + tree = 0; + factoryOn = false; + } +#endif +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void HistoManager::FillHistos(const G4String & particleName, + G4double kinEnergy, G4double costheta, + G4double phi, + G4double longitudinalPolarization) +{ + G4int id=1; + if (particleName=="gamma") id=1; + else if (particleName=="e-") id=5; + else if (particleName=="e+") id=9; + else return; + + if (costheta>=1.) costheta=.99999999; + if (costheta<-1.) costheta=-1.; + FillHisto(id,kinEnergy); + FillHisto(id+1,costheta); + FillHisto(id+2,phi); + FillHisto(id+3,longitudinalPolarization); +} + +void HistoManager::FillHisto(G4int ih, G4double e, G4double weight) +{ + if (ih > MaxHisto) { + G4cout << "---> warning from HistoManager::FillHisto() : histo " << ih + << "does not exist; e= " << e << " w= " << weight << G4endl; + return; + } +#ifdef G4ANALYSIS_USE + if(exist[ih]) histo[ih]->fill(e/Unit[ih], weight); +#endif +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void HistoManager::SetHisto(G4int ih, G4int nbins, G4double valmin, + G4double valmax, const G4String& unit) +{ + if (ih > MaxHisto) { + G4cout << "---> warning from HistoManager::SetHisto() : histo " << ih + << "does not exist" << G4endl; + return; + } + + const G4String id[] = { "0", "1", "2", "3", "4", "5", + "6", "7", "8", "9", "10", "11", "12"}; + const G4String title[] = + { "dummy", //0 + "Gamma Energy distribution", //1 + "Gamma Cos(Theta) distribution", //2 + "Gamma Phi angular distribution", //3 + "Gamma longitudinal Polarization", //4 + "Electron Energy distribution", //5 + "Electron Cos(Theta) distribution", //6 + "Electron Phi angular distribution", //7 + "Electron longitudinal Polarization", //8 + "Positron Energy distribution", //9 + "Positron Cos(Theta) distribution", //10 + "Positron Phi angular distribution", //11 + "Positron longitudinal Polarization" //12 + }; + + + G4String titl = title[ih]; + G4double vmin = valmin, vmax = valmax; + Unit[ih] = 1.; + + if (unit != "none") { + titl = title[ih] + " (" + unit + ")"; + Unit[ih] = G4UnitDefinition::GetValueOf(unit); + vmin = valmin/Unit[ih]; vmax = valmax/Unit[ih]; + } + + exist[ih] = true; + Label[ih] = id[ih]; + Title[ih] = titl; + Nbins[ih] = nbins; + Vmin[ih] = vmin; + Vmax[ih] = vmax; + Width[ih] = (valmax-valmin)/nbins; + + G4cout << "----> SetHisto " << ih << ": " << titl << "; " + << nbins << " bins from " + << vmin << " " << unit << " to " << vmax << " " << unit << G4endl; + +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void HistoManager::RemoveHisto(G4int ih) +{ + if (ih > MaxHisto) { + G4cout << "---> warning from HistoManager::RemoveHisto() : histo " << ih + << "does not exist" << G4endl; + return; + } + + histo[ih] = 0; exist[ih] = false; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + diff --git a/examples/extended/polarisation/Pol01/src/HistoMessenger.cc b/examples/extended/polarisation/Pol01/src/HistoMessenger.cc new file mode 100644 index 0000000000..67294d57bc --- /dev/null +++ b/examples/extended/polarisation/Pol01/src/HistoMessenger.cc @@ -0,0 +1,134 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: HistoMessenger.cc,v 1.1 2006/10/02 13:48:10 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#include "HistoMessenger.hh" + +#include + +#include "HistoManager.hh" +#include "G4UIdirectory.hh" +#include "G4UIcommand.hh" +#include "G4UIparameter.hh" +#include "G4UIcmdWithAString.hh" +#include "G4UIcmdWithAnInteger.hh" + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +HistoMessenger::HistoMessenger(HistoManager* manager) +:histoManager (manager) +{ + histoDir = new G4UIdirectory("/testem/histo/"); + histoDir->SetGuidance("histograms control"); + + factoryCmd = new G4UIcmdWithAString("/testem/histo/setFileName",this); + factoryCmd->SetGuidance("set name for the histograms file"); + + typeCmd = new G4UIcmdWithAString("/testem/histo/setFileType",this); + typeCmd->SetGuidance("set histograms file type"); + typeCmd->SetCandidates("hbook root XML xml aida"); + + optionCmd = new G4UIcmdWithAString("/testem/histo/setFileOption",this); + optionCmd->SetGuidance("set option for the histograms file"); + + histoCmd = new G4UIcommand("/testem/histo/setHisto",this); + histoCmd->SetGuidance("Set bining of the histo number ih :"); + histoCmd->SetGuidance(" nbBins; valMin; valMax; unit (of vmin and vmax)"); + // + G4UIparameter* ih = new G4UIparameter("ih",'i',false); + ih->SetGuidance("histo number : from 1 to MaxHisto"); + ih->SetParameterRange("ih>0"); + histoCmd->SetParameter(ih); + // + G4UIparameter* nbBins = new G4UIparameter("nbBins",'i',false); + nbBins->SetGuidance("number of bins"); + nbBins->SetParameterRange("nbBins>0"); + histoCmd->SetParameter(nbBins); + // + G4UIparameter* valMin = new G4UIparameter("valMin",'d',false); + valMin->SetGuidance("valMin, expressed in unit"); + histoCmd->SetParameter(valMin); + // + G4UIparameter* valMax = new G4UIparameter("valMax",'d',false); + valMax->SetGuidance("valMax, expressed in unit"); + histoCmd->SetParameter(valMax); + // + G4UIparameter* unit = new G4UIparameter("unit",'s',true); + unit->SetGuidance("if omitted, vmin and vmax are assumed dimensionless"); + unit->SetDefaultValue("none"); + histoCmd->SetParameter(unit); + + rmhistoCmd = new G4UIcmdWithAnInteger("/testem/histo/removeHisto",this); + rmhistoCmd->SetGuidance("desactivate histo #id"); + rmhistoCmd->SetParameterName("id",false); + rmhistoCmd->SetRange("id>0"); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +HistoMessenger::~HistoMessenger() +{ + delete rmhistoCmd; + delete histoCmd; + delete optionCmd; + delete typeCmd; + delete factoryCmd; + delete histoDir; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void HistoMessenger::SetNewValue(G4UIcommand* command, G4String newValues) +{ + if (command == factoryCmd) + histoManager->SetFileName(newValues); + + if (command == typeCmd) + histoManager->SetFileType(newValues); + + if (command == optionCmd) + histoManager->SetFileOption(newValues); + + if (command == histoCmd) + { G4int ih,nbBins; G4double vmin,vmax; char unts[30]; + std::istringstream is(newValues.c_str()); + is >> ih >> nbBins >> vmin >> vmax >> unts; + G4String unit = unts; + G4double vUnit = 1. ; + if (unit != "none") vUnit = G4UIcommand::ValueOf(unit); + histoManager->SetHisto (ih,nbBins,vmin*vUnit,vmax*vUnit,unit); + } + + if (command == rmhistoCmd) + histoManager->RemoveHisto(rmhistoCmd->GetNewIntValue(newValues)); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + diff --git a/examples/extended/polarisation/Pol01/src/PhysListEmPolarized.cc b/examples/extended/polarisation/Pol01/src/PhysListEmPolarized.cc new file mode 100644 index 0000000000..95f3e56fe1 --- /dev/null +++ b/examples/extended/polarisation/Pol01/src/PhysListEmPolarized.cc @@ -0,0 +1,127 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: PhysListEmPolarized.cc,v 1.1 2006/10/02 16:25:55 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#include "PhysListEmPolarized.hh" +#include "G4ParticleDefinition.hh" +#include "G4ProcessManager.hh" + +#include "G4ComptonScattering.hh" +#include "G4GammaConversion.hh" +#include "G4PhotoElectricEffect.hh" + +#include "G4MultipleScattering.hh" + +#include "G4eIonisation.hh" +#include "G4eBremsstrahlung.hh" +#include "G4eplusAnnihilation.hh" + +#include "G4PolarizedCompton.hh" +#include "G4PolarizedGammaConversion.hh" +#include "G4ePolarizedIonisation.hh" +#include "G4ePolarizedBremsstrahlung.hh" +#include "G4eplusPolarizedAnnihilation.hh" + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +PhysListEmPolarized::PhysListEmPolarized(const G4String& name) + : G4VPhysicsConstructor(name) +{} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +PhysListEmPolarized::~PhysListEmPolarized() +{} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void PhysListEmPolarized::ConstructProcess() +{ + // Add standard EM Processes + + theParticleIterator->reset(); + while( (*theParticleIterator)() ){ + G4ParticleDefinition* particle = theParticleIterator->value(); + G4ProcessManager* pmanager = particle->GetProcessManager(); + G4String particleName = particle->GetParticleName(); + + if (namePhysics=="polarized") { + if (particleName == "gamma") { + pmanager->AddDiscreteProcess(new G4PhotoElectricEffect); + pmanager->AddDiscreteProcess(new G4PolarizedCompton); + pmanager->AddDiscreteProcess(new G4PolarizedGammaConversion); + } + else if (particleName == "e-") { + //electron + pmanager->AddProcess(new G4MultipleScattering, -1,1,1); + pmanager->AddProcess(new G4ePolarizedIonisation, -1,2,2); + pmanager->AddProcess(new G4ePolarizedBremsstrahlung, -1,3,3); + } + else if (particleName == "e+") { + //positron + pmanager->AddProcess(new G4MultipleScattering, -1, 1,1); + pmanager->AddProcess(new G4ePolarizedIonisation, -1, 2,2); + pmanager->AddProcess(new G4ePolarizedBremsstrahlung, -1, 3,3); + pmanager->AddProcess(new G4eplusPolarizedAnnihilation, 0,-1,4); + } + } + else { + + if (particleName == "gamma") { + // gamma + pmanager->AddDiscreteProcess(new G4PhotoElectricEffect); + pmanager->AddDiscreteProcess(new G4ComptonScattering); + + pmanager->AddDiscreteProcess(new G4GammaConversion); + } else if (particleName == "e-") { + //electron + pmanager->AddProcess(new G4MultipleScattering, -1, 1,1); + pmanager->AddProcess(new G4eIonisation, -1, 2,2); + pmanager->AddProcess(new G4eBremsstrahlung, -1, 3,3); + + } else if (particleName == "e+") { + //positron + pmanager->AddProcess(new G4MultipleScattering, -1, 1,1); + pmanager->AddProcess(new G4eIonisation, -1, 2,2); + pmanager->AddProcess(new G4eBremsstrahlung, -1, 3,3); + pmanager->AddProcess(new G4eplusAnnihilation, 0,-1,4); + } + } + } + // Em options + // + // G4EmProcessOptions emOptions; + // emOptions.SetIntegral(false); + // emOptions.SetLossFluctuations(false); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + diff --git a/examples/extended/electromagnetic/TestEm3/src/PhysListEmG4v71.cc b/examples/extended/polarisation/Pol01/src/PhysListEmStandard.cc similarity index 73% rename from examples/extended/electromagnetic/TestEm3/src/PhysListEmG4v71.cc rename to examples/extended/polarisation/Pol01/src/PhysListEmStandard.cc index 96d5d0e600..04fa17d3cc 100644 --- a/examples/extended/electromagnetic/TestEm3/src/PhysListEmG4v71.cc +++ b/examples/extended/polarisation/Pol01/src/PhysListEmStandard.cc @@ -23,13 +23,13 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: PhysListEmG4v71.cc,v 1.3 2006/06/29 16:52:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PhysListEmStandard.cc,v 1.2 2006/10/02 16:25:55 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#include "PhysListEmG4v71.hh" +#include "PhysListEmStandard.hh" #include "G4ParticleDefinition.hh" #include "G4ProcessManager.hh" @@ -37,7 +37,7 @@ #include "G4GammaConversion.hh" #include "G4PhotoElectricEffect.hh" -#include "G4MultipleScattering71.hh" +#include "G4MultipleScattering.hh" #include "G4eIonisation.hh" #include "G4eBremsstrahlung.hh" @@ -52,18 +52,18 @@ //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -PhysListEmG4v71::PhysListEmG4v71(const G4String& name) +PhysListEmStandard::PhysListEmStandard(const G4String& name) : G4VPhysicsConstructor(name) {} //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -PhysListEmG4v71::~PhysListEmG4v71() +PhysListEmStandard::~PhysListEmStandard() {} //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -void PhysListEmG4v71::ConstructProcess() +void PhysListEmStandard::ConstructProcess() { // Add standard EM Processes @@ -81,37 +81,37 @@ void PhysListEmG4v71::ConstructProcess() } else if (particleName == "e-") { //electron - pmanager->AddProcess(new G4MultipleScattering71, -1, 1,1); - pmanager->AddProcess(new G4eIonisation, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung, -1, 3,3); - + pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4eIonisation, -1, 2, 2); + pmanager->AddProcess(new G4eBremsstrahlung(), -1, 3, 3); + } else if (particleName == "e+") { //positron - pmanager->AddProcess(new G4MultipleScattering71, -1, 1,1); - pmanager->AddProcess(new G4eIonisation, -1, 2,2); - pmanager->AddProcess(new G4eBremsstrahlung, -1, 3,3); - pmanager->AddProcess(new G4eplusAnnihilation, 0,-1,4); + pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4eIonisation, -1, 2, 2); + pmanager->AddProcess(new G4eBremsstrahlung(), -1, 3, 3); + pmanager->AddProcess(new G4eplusAnnihilation, 0,-1, 4); } else if( particleName == "mu+" || particleName == "mu-" ) { //muon - pmanager->AddProcess(new G4MultipleScattering71, -1, 1,1); - pmanager->AddProcess(new G4MuIonisation, -1, 2,2); - pmanager->AddProcess(new G4MuBremsstrahlung, -1, 3,3); - pmanager->AddProcess(new G4MuPairProduction, -1, 4,4); + pmanager->AddProcess(new G4MultipleScattering, -1, 1,1); + pmanager->AddProcess(new G4MuIonisation, -1, 2,2); + pmanager->AddProcess(new G4MuBremsstrahlung, -1, 3,3); + pmanager->AddProcess(new G4MuPairProduction, -1, 4,4); } else if( particleName == "alpha" || - particleName == "He3" || + particleName == "He3" || particleName == "GenericIon" ) { - pmanager->AddProcess(new G4MultipleScattering71, -1, 1,1); - pmanager->AddProcess(new G4ionIonisation, -1, 2,2); + pmanager->AddProcess(new G4MultipleScattering, -1, 1,1); + pmanager->AddProcess(new G4ionIonisation, -1, 2,2); } else if ((!particle->IsShortLived()) && (particle->GetPDGCharge() != 0.0) && (particle->GetParticleName() != "chargedgeantino")) { //all others charged particles except geantino - pmanager->AddProcess(new G4MultipleScattering71, -1,1,1); - pmanager->AddProcess(new G4hIonisation, -1,2,2); + pmanager->AddProcess(new G4MultipleScattering, -1,1,1); + pmanager->AddProcess(new G4hIonisation, -1,2,2); } } } diff --git a/examples/extended/polarisation/Pol01/src/PhysicsList.cc b/examples/extended/polarisation/Pol01/src/PhysicsList.cc new file mode 100644 index 0000000000..d4caefe93f --- /dev/null +++ b/examples/extended/polarisation/Pol01/src/PhysicsList.cc @@ -0,0 +1,204 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: PhysicsList.cc,v 1.2 2006/10/02 16:25:55 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#include "PhysicsList.hh" +#include "PhysicsListMessenger.hh" + +#include "PhysListEmStandard.hh" +#include "PhysListEmPolarized.hh" + +#include "G4LossTableManager.hh" +#include "G4UnitsTable.hh" + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +PhysicsList::PhysicsList() +: G4VModularPhysicsList() +{ + G4LossTableManager::Instance(); + + currentDefaultCut = 0.1*mm; + cutForGamma = currentDefaultCut; + cutForElectron = currentDefaultCut; + cutForPositron = currentDefaultCut; + + pMessenger = new PhysicsListMessenger(this); + + SetVerboseLevel(1); + + emName = "polarized"; + emPhysicsList = new PhysListEmPolarized(); + +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +PhysicsList::~PhysicsList() +{ + delete pMessenger; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +// Bosons +#include "G4Gamma.hh" + +// leptons +#include "G4Electron.hh" +#include "G4Positron.hh" + + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void PhysicsList::ConstructParticle() +{ + // only QED in this example + +// gamma + G4Gamma::GammaDefinition(); + +// leptons + G4Electron::ElectronDefinition(); + G4Positron::PositronDefinition(); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#include "G4EmProcessOptions.hh" + +void PhysicsList::ConstructProcess() +{ + // Transportation + // + AddTransportation(); + + // Electromagnetic physics list + // + emPhysicsList->ConstructProcess(); + + // step limitation (as a full process) + // + AddStepMax(); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void PhysicsList::AddPhysicsList(const G4String& name) +{ + if (verboseLevel>0) { + G4cout << "PhysicsList::AddPhysicsList: <" << name << ">" << G4endl; + } + + if (name == emName) return; + + if (name == "standard") { + + emName = name; + delete emPhysicsList; + emPhysicsList = new PhysListEmStandard(); + + } + if (name == "polarized") { + + emName = name; + delete emPhysicsList; + emPhysicsList = new PhysListEmPolarized(); + + } + else { + G4cout << "PhysicsList::AddPhysicsList: <" << name << ">" + << " is not defined" + << G4endl; + } +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#include "G4ProcessManager.hh" +#include "StepMax.hh" + +void PhysicsList::AddStepMax() +{ + // Step limitation seen as a process + StepMax* stepMaxProcess = new StepMax(); + + theParticleIterator->reset(); + while ((*theParticleIterator)()){ + G4ParticleDefinition* particle = theParticleIterator->value(); + G4ProcessManager* pmanager = particle->GetProcessManager(); + + if (stepMaxProcess->IsApplicable(*particle) && pmanager) + pmanager ->AddDiscreteProcess(stepMaxProcess); + } +} + + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#include "G4Gamma.hh" +#include "G4Electron.hh" +#include "G4Positron.hh" + +void PhysicsList::SetCuts() +{ + // 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(cutForGamma, "gamma"); + SetCutValue(cutForElectron, "e-"); + SetCutValue(cutForPositron, "e+"); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void PhysicsList::SetCutForGamma(G4double cut) +{ + cutForGamma = cut; + SetParticleCuts(cutForGamma, G4Gamma::Gamma()); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void PhysicsList::SetCutForElectron(G4double cut) +{ + cutForElectron = cut; + SetParticleCuts(cutForElectron, G4Electron::Electron()); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void PhysicsList::SetCutForPositron(G4double cut) +{ + cutForPositron = cut; + SetParticleCuts(cutForPositron, G4Positron::Positron()); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/polarisation/Pol01/src/PhysicsListMessenger.cc b/examples/extended/polarisation/Pol01/src/PhysicsListMessenger.cc new file mode 100644 index 0000000000..74ff123329 --- /dev/null +++ b/examples/extended/polarisation/Pol01/src/PhysicsListMessenger.cc @@ -0,0 +1,119 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: PhysicsListMessenger.cc,v 1.1 2006/10/02 13:48:10 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#include "PhysicsListMessenger.hh" + +#include "PhysicsList.hh" +#include "G4UIdirectory.hh" +#include "G4UIcmdWithADoubleAndUnit.hh" +#include "G4UIcmdWithAString.hh" + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +PhysicsListMessenger::PhysicsListMessenger(PhysicsList* pPhys) +:pPhysicsList(pPhys) +{ + physDir = new G4UIdirectory("/testem/phys/"); + physDir->SetGuidance("physics list commands"); + + gammaCutCmd = new G4UIcmdWithADoubleAndUnit("/testem/phys/setGCut",this); + gammaCutCmd->SetGuidance("Set gamma cut."); + gammaCutCmd->SetParameterName("Gcut",false); + gammaCutCmd->SetUnitCategory("Length"); + gammaCutCmd->SetRange("Gcut>0.0"); + gammaCutCmd->AvailableForStates(G4State_PreInit,G4State_Idle); + + electCutCmd = new G4UIcmdWithADoubleAndUnit("/testem/phys/setECut",this); + electCutCmd->SetGuidance("Set electron cut."); + electCutCmd->SetParameterName("Ecut",false); + electCutCmd->SetUnitCategory("Length"); + electCutCmd->SetRange("Ecut>0.0"); + electCutCmd->AvailableForStates(G4State_PreInit,G4State_Idle); + + protoCutCmd = new G4UIcmdWithADoubleAndUnit("/testem/phys/setPCut",this); + protoCutCmd->SetGuidance("Set positron cut."); + protoCutCmd->SetParameterName("Pcut",false); + protoCutCmd->SetUnitCategory("Length"); + protoCutCmd->SetRange("Pcut>0.0"); + protoCutCmd->AvailableForStates(G4State_PreInit,G4State_Idle); + + allCutCmd = new G4UIcmdWithADoubleAndUnit("/testem/phys/setCuts",this); + allCutCmd->SetGuidance("Set cut for all."); + allCutCmd->SetParameterName("cut",false); + allCutCmd->SetUnitCategory("Length"); + allCutCmd->SetRange("cut>0.0"); + allCutCmd->AvailableForStates(G4State_PreInit,G4State_Idle); + + pListCmd = new G4UIcmdWithAString("/testem/phys/addPhysics",this); + pListCmd->SetGuidance("Select standard/polarized physics list."); + pListCmd->SetParameterName("PList",false); + pListCmd->AvailableForStates(G4State_PreInit); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +PhysicsListMessenger::~PhysicsListMessenger() +{ + delete gammaCutCmd; + delete electCutCmd; + delete protoCutCmd; + delete allCutCmd; + delete pListCmd; + delete physDir; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void PhysicsListMessenger::SetNewValue(G4UIcommand* command, + G4String newValue) +{ + if( command == gammaCutCmd ) + { pPhysicsList->SetCutForGamma(gammaCutCmd->GetNewDoubleValue(newValue));} + + if( command == electCutCmd ) + { pPhysicsList->SetCutForElectron(electCutCmd->GetNewDoubleValue(newValue));} + + if( command == protoCutCmd ) + { pPhysicsList->SetCutForPositron(protoCutCmd->GetNewDoubleValue(newValue));} + + if( command == allCutCmd ) + { + G4double cut = allCutCmd->GetNewDoubleValue(newValue); + pPhysicsList->SetCutForGamma(cut); + pPhysicsList->SetCutForElectron(cut); + pPhysicsList->SetCutForPositron(cut); + } + + if( command == pListCmd ) + { pPhysicsList->AddPhysicsList(newValue);} +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/electromagnetic/TestEm7/src/PhysListHadronElastic.cc b/examples/extended/polarisation/Pol01/src/PrimaryGeneratorAction.cc similarity index 67% rename from examples/extended/electromagnetic/TestEm7/src/PhysListHadronElastic.cc rename to examples/extended/polarisation/Pol01/src/PrimaryGeneratorAction.cc index fef758a272..f898c64443 100644 --- a/examples/extended/electromagnetic/TestEm7/src/PhysListHadronElastic.cc +++ b/examples/extended/polarisation/Pol01/src/PrimaryGeneratorAction.cc @@ -23,51 +23,51 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: PhysListHadronElastic.cc,v 1.4 2006/06/29 16:58:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// +// $Id: PrimaryGeneratorAction.cc,v 1.1 2006/10/02 13:48:10 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#include "PhysListHadronElastic.hh" +#include "PrimaryGeneratorAction.hh" + +#include "DetectorConstruction.hh" + +#include "G4Event.hh" +#include "G4ParticleTable.hh" #include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" -#include "G4LElastic.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -PhysListHadronElastic::PhysListHadronElastic(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListHadronElastic::~PhysListHadronElastic() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void PhysListHadronElastic::ConstructProcess() +PrimaryGeneratorAction::PrimaryGeneratorAction(DetectorConstruction* det) +:detector(det) { - - // Hadron elastic process - - theElasticProcess.RegisterMe( new G4LElastic() ); - - theParticleIterator->reset(); - while( (*theParticleIterator)() ){ - G4ParticleDefinition* particle = theParticleIterator->value(); - G4ProcessManager* pManager = particle->GetProcessManager(); - if (particle->GetPDGMass() > 110.*MeV && theElasticProcess.IsApplicable(*particle)) { - pManager->AddDiscreteProcess(&theElasticProcess); - /* - G4cout << "### Elastic model are registered for " - << particle->GetParticleName() - << G4endl; - */ - } - } - + particleGun = new G4ParticleGun(1); + G4ParticleDefinition* particle + = G4ParticleTable::GetParticleTable()->FindParticle("e-"); + particleGun->SetParticleDefinition(particle); + particleGun->SetParticleEnergy(10*MeV); + particleGun->SetParticleMomentumDirection(G4ThreeVector(0.,0.,1.)); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +PrimaryGeneratorAction::~PrimaryGeneratorAction() +{ + delete particleGun; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void PrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent) +{ + //this function is called at the begining of event + // + G4double halfSize = 0.5*(detector->GetWorldSize()); + G4double z0 = - halfSize; + + particleGun->SetParticlePosition(G4ThreeVector(0., 0., z0)); + particleGun->GeneratePrimaryVertex(anEvent); } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/polarisation/Pol01/src/RunAction.cc b/examples/extended/polarisation/Pol01/src/RunAction.cc new file mode 100644 index 0000000000..6ca61337b3 --- /dev/null +++ b/examples/extended/polarisation/Pol01/src/RunAction.cc @@ -0,0 +1,236 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: RunAction.cc,v 1.3 2006/11/17 11:44:46 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#include "RunAction.hh" + +#include "DetectorConstruction.hh" +#include "PrimaryGeneratorAction.hh" +#include "HistoManager.hh" + +#include "G4Run.hh" +#include "G4RunManager.hh" +#include "G4UnitsTable.hh" +#include "G4EmCalculator.hh" + +#include "Randomize.hh" +#include + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +RunAction::RunAction(DetectorConstruction* det, PrimaryGeneratorAction* prim, + HistoManager* histo) + : detector(det), primary(prim), ProcCounter(0), histoManager(histo) +{ + totalEventCount=0; + } + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +RunAction::~RunAction() +{ } + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void RunAction::BeginOfRunAction(const G4Run* aRun) +{ + G4cout << "### Run " << aRun->GetRunID() << " start." << G4endl; + + // save Rndm status + // G4RunManager::GetRunManager()->SetRandomNumberStore(false); + // CLHEP::HepRandom::showEngineStatus(); + + if (ProcCounter) delete ProcCounter; + ProcCounter = new ProcessesCount; + totalEventCount = 0; + photonStats.Clear(); + electronStats.Clear(); + positronStats.Clear(); + + histoManager->book(); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +void RunAction::FillData(const G4String & particleName, + G4double kinEnergy, G4double costheta, + G4double /* phi*/, + G4double longitudinalPolarization) +{ + if (particleName=="gamma") + photonStats.FillData(kinEnergy, costheta, longitudinalPolarization); + else if (particleName=="e-") + electronStats.FillData(kinEnergy, costheta, longitudinalPolarization); + else if (particleName=="e+") + positronStats.FillData(kinEnergy, costheta, longitudinalPolarization); +} + +void RunAction::CountProcesses(G4String procName) +{ + // is the process already counted ? + // *AS* change to std::map?! + size_t nbProc = ProcCounter->size(); + size_t i = 0; + while ((iGetName()!=procName)) i++; + if (i == nbProc) ProcCounter->push_back( new OneProcessCount(procName)); + + (*ProcCounter)[i]->Count(); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void RunAction::EndOfRunAction(const G4Run* aRun) +{ + G4int NbOfEvents = aRun->GetNumberOfEvent(); + if (NbOfEvents == 0) return; + + G4int prec = G4cout.precision(5); + + G4Material* material = detector->GetMaterial(); + G4double density = material->GetDensity(); + + G4ParticleDefinition* particle = + primary->GetParticleGun()->GetParticleDefinition(); + G4String Particle = particle->GetParticleName(); + G4double energy = primary->GetParticleGun()->GetParticleEnergy(); + G4cout << "\n The run consists of " << NbOfEvents << " "<< Particle << " of " + << G4BestUnit(energy,"Energy") << " through " + << G4BestUnit(detector->GetBoxSizeZ(),"Length") << " of " + << material->GetName() << " (density: " + << G4BestUnit(density,"Volumic Mass") << ")" << G4endl; + + //frequency of processes + G4cout << "\n Process calls frequency --->\n"; + for (size_t i=0; i< ProcCounter->size();i++) { + G4String procName = (*ProcCounter)[i]->GetName(); + G4int count = (*ProcCounter)[i]->GetCounter(); + G4cout << "\t" << procName << " = " << count<<"\n"; + } + + if (totalEventCount == 0) return; + + G4cout<<" Gamma: \n"; + photonStats.PrintResults(totalEventCount); + G4cout<<" Electron: \n"; + electronStats.PrintResults(totalEventCount); + G4cout<<" Positron: \n"; + positronStats.PrintResults(totalEventCount); + + //cross check from G4EmCalculator + // G4cout << "\n Verification from G4EmCalculator. \n"; + // G4EmCalculator emCal; + + //restore default format + G4cout.precision(prec); + + // write out histograms + histoManager->save(); + + // show Rndm status + CLHEP::HepRandom::showEngineStatus(); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void RunAction::EventFinished() +{ + ++totalEventCount; + photonStats.EventFinished(); + electronStats.EventFinished(); + positronStats.EventFinished(); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +RunAction::ParticleStatistics::ParticleStatistics() + : currentNumber(0), + totalNumber(0), totalNumber2(0), + sumEnergy(0), sumEnergy2(0), + sumPolarization(0), sumPolarization2(0), + sumCosTheta(0), sumCosTheta2(0) +{} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +RunAction::ParticleStatistics::~ParticleStatistics() +{} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void RunAction::ParticleStatistics::EventFinished() +{ + totalNumber+=currentNumber; + totalNumber2+=currentNumber*currentNumber; + currentNumber=0; +} +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void RunAction::ParticleStatistics:: FillData(G4double kinEnergy, + G4double costheta, + G4double longitudinalPolarization) +{ + ++currentNumber; + sumEnergy+=kinEnergy; + sumEnergy2+=kinEnergy*kinEnergy; + sumPolarization+=longitudinalPolarization; + sumPolarization2+=longitudinalPolarization*longitudinalPolarization; + sumCosTheta+=costheta; + sumCosTheta2+=costheta*costheta; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void RunAction::ParticleStatistics::PrintResults(G4int totalNumberOfEvents) +{ + G4cout<<"Mean Number per Event :" + < 0.) && + (aTrack.GetVolume() != 0) && + (aTrack.GetVolume()->GetName() != "World")) + ProposedStep = MaxChargedStep; + + return ProposedStep; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +G4VParticleChange* StepMax::PostStepDoIt(const G4Track& aTrack, const G4Step&) +{ + // do nothing + aParticleChange.Initialize(aTrack); + return &aParticleChange; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + + diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04RunAction.cc b/examples/extended/polarisation/Pol01/src/StepMaxMessenger.cc similarity index 69% rename from examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04RunAction.cc rename to examples/extended/polarisation/Pol01/src/StepMaxMessenger.cc index 1fdbb93067..9b36f208d8 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04RunAction.cc +++ b/examples/extended/polarisation/Pol01/src/StepMaxMessenger.cc @@ -23,57 +23,42 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// $Id: StepMaxMessenger.cc,v 1.1 2006/10/02 13:48:10 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // -// $Id: ExN04RunAction.cc,v 1.2 2006/06/29 17:08:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#include "ExN04RunAction.hh" +#include "StepMaxMessenger.hh" -#include "G4Run.hh" -#include "G4RunManager.hh" -#include "G4UImanager.hh" -#include "G4VVisManager.hh" -#include "G4ios.hh" +#include "StepMax.hh" +#include "G4UIcmdWithADoubleAndUnit.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -ExN04RunAction::ExN04RunAction() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -ExN04RunAction::~ExN04RunAction() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void ExN04RunAction::BeginOfRunAction(const G4Run* aRun) -{ - G4cout << "### Run " << aRun->GetRunID() << " start." << G4endl; - - G4RunManager::GetRunManager()->SetRandomNumberStore(true); - - if (G4VVisManager::GetConcreteInstance()) - { - G4UImanager* UI = G4UImanager::GetUIpointer(); - UI->ApplyCommand("/vis/scene/notifyHandlers"); - } +StepMaxMessenger::StepMaxMessenger(StepMax* stepM) +:pStepMax(stepM) +{ + StepMaxCmd = new G4UIcmdWithADoubleAndUnit("/testem/stepMax",this); + StepMaxCmd->SetGuidance("Set max allowed step length"); + StepMaxCmd->SetParameterName("mxStep",false); + StepMaxCmd->SetRange("mxStep>0."); + StepMaxCmd->SetUnitCategory("Length"); } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -void ExN04RunAction::EndOfRunAction(const G4Run*) +StepMaxMessenger::~StepMaxMessenger() { - if (G4VVisManager::GetConcreteInstance()) - { - G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/update"); - } + delete StepMaxCmd; } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +void StepMaxMessenger::SetNewValue(G4UIcommand* command, G4String newValue) +{ + if (command == StepMaxCmd) + { pStepMax->SetMaxStep(StepMaxCmd->GetNewDoubleValue(newValue));} +} - +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/medical/GammaTherapy/src/G4EmHadronBuilder.cc b/examples/extended/polarisation/Pol01/src/SteppingAction.cc similarity index 52% rename from examples/extended/medical/GammaTherapy/src/G4EmHadronBuilder.cc rename to examples/extended/polarisation/Pol01/src/SteppingAction.cc index c07441bb6d..7c850e079b 100644 --- a/examples/extended/medical/GammaTherapy/src/G4EmHadronBuilder.cc +++ b/examples/extended/polarisation/Pol01/src/SteppingAction.cc @@ -23,86 +23,67 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// -// $Id: G4EmHadronBuilder.cc,v 1.2 2006/06/29 17:27:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//--------------------------------------------------------------------------- -// -// ClassName: G4EmHadronBuilder -// -// Author: V.Ivanchenko 03.05.2004 -// -// Modified: -// -//---------------------------------------------------------------------------- -// -// +// $Id: SteppingAction.cc,v 1.1 2006/10/02 13:48:10 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#include "G4EmHadronBuilder.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" +#include "SteppingAction.hh" +#include "DetectorConstruction.hh" +#include "PrimaryGeneratorAction.hh" +#include "RunAction.hh" +#include "HistoManager.hh" -#include "G4MultipleScattering.hh" - -#include "G4hIonisation.hh" -#include "G4ionIonisation.hh" - -#include "G4Electron.hh" -#include "G4Proton.hh" -#include "G4GenericIon.hh" +#include "G4RunManager.hh" +#include "G4PolarizationHelper.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -G4EmHadronBuilder::G4EmHadronBuilder(const G4String& name) - : G4VPhysicsConstructor(name) -{} +SteppingAction::SteppingAction(DetectorConstruction* det, + PrimaryGeneratorAction* prim, RunAction* RuAct, + HistoManager* Hist) +:detector(det), primary(prim), runAction(RuAct), histoManager(Hist) +{ } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -G4EmHadronBuilder::~G4EmHadronBuilder() -{} +SteppingAction::~SteppingAction() +{ } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -void G4EmHadronBuilder::ConstructParticle() +void SteppingAction::UserSteppingAction(const G4Step* aStep) { - G4Electron::Electron(); - G4Proton::Proton(); - G4GenericIon::GenericIon(); -} + G4StepPoint* prePoint = aStep->GetPreStepPoint(); + G4StepPoint* endPoint = aStep->GetPostStepPoint(); + + G4String procName = endPoint->GetProcessDefinedStep()->GetProcessName(); + runAction->CountProcesses(procName); -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + if (prePoint->GetTouchableHandle()->GetVolume()==detector->GetBox() && + endPoint->GetTouchableHandle()->GetVolume()==detector->GetWorld()) { + G4Track* aTrack = aStep->GetTrack(); + G4String particleName = aTrack->GetDynamicParticle()->GetDefinition()->GetParticleName(); + // G4cout<<"a "<GetPosition(); + G4ThreeVector direction = endPoint->GetMomentumDirection(); + G4double kinEnergy = endPoint->GetKineticEnergy(); -void G4EmHadronBuilder::ConstructProcess() -{ - // Add standard EM Processes - theParticleIterator->reset(); + G4ThreeVector beamDirection = primary->GetParticleGun()->GetParticleMomentumDirection(); + G4double polZ = endPoint->GetPolarization().z(); - while( (*theParticleIterator)() ){ - G4ParticleDefinition* particle = theParticleIterator->value(); + G4double costheta=direction*beamDirection; - if(particle->GetPDGMass() > 110.*MeV) { - G4ProcessManager* pmanager = particle->GetProcessManager(); - G4String particleName = particle->GetParticleName(); + G4double xdir=direction*G4PolarizationHelper::GetParticleFrameX(beamDirection); + G4double ydir=direction*G4PolarizationHelper::GetParticleFrameY(beamDirection); - if (particleName == "GenericIon" || particleName == "alpha" || particleName == "He3") { - - pmanager->AddProcess(new G4MultipleScattering, -1, 1,1); - pmanager->AddProcess(new G4ionIonisation, -1, 2,2); - - } else if ((!particle->IsShortLived()) && - (particle->GetPDGCharge() != 0.0) && - (particle->GetParticleName() != "chargedgeantino")) { - - pmanager->AddProcess(new G4MultipleScattering,-1,1,1); - pmanager->AddProcess(new G4hIonisation, -1,2,2); - } - } + G4double phi=std::atan2(ydir,xdir); + histoManager->FillHistos(particleName,kinEnergy,costheta,phi,polZ); + runAction->FillData(particleName,kinEnergy,costheta,phi,polZ); } } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + diff --git a/examples/extended/polarisation/Pol01/vis.mac b/examples/extended/polarisation/Pol01/vis.mac new file mode 100644 index 0000000000..2851725d0e --- /dev/null +++ b/examples/extended/polarisation/Pol01/vis.mac @@ -0,0 +1,35 @@ +# $Id: vis.mac,v 1.2 2006/11/17 09:49:41 vnivanch Exp $# +# +# Macro file for the initialization phase of "pol01.cc" +# including OpenGL visualization +# +# Sets some default verbose +# and initializes the graphic. +# +/control/verbose 2 +/run/verbose 2 +# +/run/initialize +# +# Create empty scene ("world" is default) +/vis/scene/create +# +# Create a scene handler for a specific graphics system +# Edit the next line(s) to choose another graphic system +# +/vis/open OGLIX +# +#/vis/open DAWNFILE +# +# Draw scene +/vis/viewer/zoom 1.4 +/vis/viewer/set/viewpointThetaPhi 60 25 deg +/vis/viewer/flush +# +# for drawing the tracks +# if too many tracks cause core dump => storeTrajectory 0 +/tracking/storeTrajectory 1 +/vis/scene/endOfEventAction accumulate +# +/run/beamOn 10 + diff --git a/examples/extended/radioactivedecay/exrdm/exrdm.out b/examples/extended/radioactivedecay/exrdm/exrdm.out index 57035848cd..9e87b5909e 100644 --- a/examples/extended/radioactivedecay/exrdm/exrdm.out +++ b/examples/extended/radioactivedecay/exrdm/exrdm.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version $Name: geant4-08-01 $ (27-July-2004) + Geant4 version $Name: geant4-08-02 $ (27-July-2004) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 diff --git a/examples/extended/radioactivedecay/exrdm/macros/runall.log b/examples/extended/radioactivedecay/exrdm/macros/runall.log index a597d67fc0..ae2f63a06a 100644 --- a/examples/extended/radioactivedecay/exrdm/macros/runall.log +++ b/examples/extended/radioactivedecay/exrdm/macros/runall.log @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version $Name: geant4-08-01 $ (23-February-2005) + Geant4 version $Name: geant4-08-02 $ (23-February-2005) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -44,7 +44,7 @@ Graphics systems deleted. Visualization Manager deleting... ************************************************************* - Geant4 version $Name: geant4-08-01 $ (23-February-2005) + Geant4 version $Name: geant4-08-02 $ (23-February-2005) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -88,7 +88,7 @@ Graphics systems deleted. Visualization Manager deleting... ************************************************************* - Geant4 version $Name: geant4-08-01 $ (23-February-2005) + Geant4 version $Name: geant4-08-02 $ (23-February-2005) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -137,7 +137,7 @@ Graphics systems deleted. Visualization Manager deleting... ************************************************************* - Geant4 version $Name: geant4-08-01 $ (23-February-2005) + Geant4 version $Name: geant4-08-02 $ (23-February-2005) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -341,7 +341,7 @@ Graphics systems deleted. Visualization Manager deleting... ************************************************************* - Geant4 version $Name: geant4-08-01 $ (23-February-2005) + Geant4 version $Name: geant4-08-02 $ (23-February-2005) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -385,7 +385,7 @@ Graphics systems deleted. Visualization Manager deleting... ************************************************************* - Geant4 version $Name: geant4-08-01 $ (23-February-2005) + Geant4 version $Name: geant4-08-02 $ (23-February-2005) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -585,7 +585,7 @@ Graphics systems deleted. Visualization Manager deleting... ************************************************************* - Geant4 version $Name: geant4-08-01 $ (23-February-2005) + Geant4 version $Name: geant4-08-02 $ (23-February-2005) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -780,7 +780,7 @@ Graphics systems deleted. Visualization Manager deleting... ************************************************************* - Geant4 version $Name: geant4-08-01 $ (23-February-2005) + Geant4 version $Name: geant4-08-02 $ (23-February-2005) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -985,7 +985,7 @@ Graphics systems deleted. Visualization Manager deleting... ************************************************************* - Geant4 version $Name: geant4-08-01 $ (23-February-2005) + Geant4 version $Name: geant4-08-02 $ (23-February-2005) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -1195,7 +1195,7 @@ Graphics systems deleted. Visualization Manager deleting... ************************************************************* - Geant4 version $Name: geant4-08-01 $ (23-February-2005) + Geant4 version $Name: geant4-08-02 $ (23-February-2005) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -1468,7 +1468,7 @@ Graphics systems deleted. Visualization Manager deleting... ************************************************************* - Geant4 version $Name: geant4-08-01 $ (23-February-2005) + Geant4 version $Name: geant4-08-02 $ (23-February-2005) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -1512,7 +1512,7 @@ Graphics systems deleted. Visualization Manager deleting... ************************************************************* - Geant4 version $Name: geant4-08-01 $ (23-February-2005) + Geant4 version $Name: geant4-08-02 $ (23-February-2005) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -1556,7 +1556,7 @@ Graphics systems deleted. Visualization Manager deleting... ************************************************************* - Geant4 version $Name: geant4-08-01 $ (23-February-2005) + Geant4 version $Name: geant4-08-02 $ (23-February-2005) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 diff --git a/examples/extended/runAndEvent/RE01/History b/examples/extended/runAndEvent/RE01/History new file mode 100644 index 0000000000..7f4e00e0e8 --- /dev/null +++ b/examples/extended/runAndEvent/RE01/History @@ -0,0 +1,23 @@ +$Id: History,v 1.2 2006/11/18 02:44:26 asaim Exp $ +------------------------------------------------------------------- + + ========================================================= + Geant4 - an Object-Oriented Toolkit for Simulation in HEP + ========================================================= + + Example RE02 History file + ------------------------ +This file should be used by the G4 example coordinator to briefly +summarize all major modifications introduced in the code and keep +track of all tags. + + ---------------------------------------------------------- + * Reverse chronological order (last date on top), please * + ---------------------------------------------------------- + +Nov. 17, 06 M.Asai (exampleRE01-V08-01-01) +- History file is created though the example has been here since two years. +- Fix a bug in RE01CalorimeterSD::ProcessHits() concerning about the + transformation vector and rotation materix of the calorimater cell + in the readoout geometry. + diff --git a/examples/extended/runAndEvent/RE01/RE01.cc b/examples/extended/runAndEvent/RE01/RE01.cc index ecdd159f22..196f928761 100644 --- a/examples/extended/runAndEvent/RE01/RE01.cc +++ b/examples/extended/runAndEvent/RE01/RE01.cc @@ -25,7 +25,7 @@ // // // $Id: RE01.cc,v 1.3 2006/06/29 17:42:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/runAndEvent/RE01/include/RE01BosonPhysics.hh b/examples/extended/runAndEvent/RE01/include/RE01BosonPhysics.hh index 2e2810f25a..2aa84b9251 100644 --- a/examples/extended/runAndEvent/RE01/include/RE01BosonPhysics.hh +++ b/examples/extended/runAndEvent/RE01/include/RE01BosonPhysics.hh @@ -25,7 +25,7 @@ // // // $Id: RE01BosonPhysics.hh,v 1.2 2006/06/29 17:42:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef RE01BosonPhysics_h diff --git a/examples/extended/runAndEvent/RE01/include/RE01CalorimeterHit.hh b/examples/extended/runAndEvent/RE01/include/RE01CalorimeterHit.hh index 01c28eb236..f94a0cc320 100644 --- a/examples/extended/runAndEvent/RE01/include/RE01CalorimeterHit.hh +++ b/examples/extended/runAndEvent/RE01/include/RE01CalorimeterHit.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01CalorimeterHit.hh,v 1.3 2006/06/29 17:42:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // diff --git a/examples/extended/runAndEvent/RE01/include/RE01CalorimeterParametrisation.hh b/examples/extended/runAndEvent/RE01/include/RE01CalorimeterParametrisation.hh index 2a002f0e23..aeaae9d1f6 100644 --- a/examples/extended/runAndEvent/RE01/include/RE01CalorimeterParametrisation.hh +++ b/examples/extended/runAndEvent/RE01/include/RE01CalorimeterParametrisation.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01CalorimeterParametrisation.hh,v 1.2 2006/06/29 17:42:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // diff --git a/examples/extended/runAndEvent/RE01/include/RE01CalorimeterROGeometry.hh b/examples/extended/runAndEvent/RE01/include/RE01CalorimeterROGeometry.hh index c2e872d0d6..342ce749a9 100644 --- a/examples/extended/runAndEvent/RE01/include/RE01CalorimeterROGeometry.hh +++ b/examples/extended/runAndEvent/RE01/include/RE01CalorimeterROGeometry.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01CalorimeterROGeometry.hh,v 1.2 2006/06/29 17:42:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // diff --git a/examples/extended/runAndEvent/RE01/include/RE01CalorimeterSD.hh b/examples/extended/runAndEvent/RE01/include/RE01CalorimeterSD.hh index 3e4a49132e..21b317c444 100644 --- a/examples/extended/runAndEvent/RE01/include/RE01CalorimeterSD.hh +++ b/examples/extended/runAndEvent/RE01/include/RE01CalorimeterSD.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01CalorimeterSD.hh,v 1.2 2006/06/29 17:42:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // diff --git a/examples/extended/runAndEvent/RE01/include/RE01DecayPhysics.hh b/examples/extended/runAndEvent/RE01/include/RE01DecayPhysics.hh index 9350bdd5c1..e37fc9ad27 100644 --- a/examples/extended/runAndEvent/RE01/include/RE01DecayPhysics.hh +++ b/examples/extended/runAndEvent/RE01/include/RE01DecayPhysics.hh @@ -25,7 +25,7 @@ // // // $Id: RE01DecayPhysics.hh,v 1.2 2006/06/29 17:42:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/runAndEvent/RE01/include/RE01DetectorConstruction.hh b/examples/extended/runAndEvent/RE01/include/RE01DetectorConstruction.hh index 1533340bc6..639c4b4930 100644 --- a/examples/extended/runAndEvent/RE01/include/RE01DetectorConstruction.hh +++ b/examples/extended/runAndEvent/RE01/include/RE01DetectorConstruction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01DetectorConstruction.hh,v 1.2 2006/06/29 17:42:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // diff --git a/examples/extended/runAndEvent/RE01/include/RE01DetectorParameterDef.hh b/examples/extended/runAndEvent/RE01/include/RE01DetectorParameterDef.hh index f6716bbee4..53162a84b7 100644 --- a/examples/extended/runAndEvent/RE01/include/RE01DetectorParameterDef.hh +++ b/examples/extended/runAndEvent/RE01/include/RE01DetectorParameterDef.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01DetectorParameterDef.hh,v 1.2 2006/06/29 17:42:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // G4double expHall_x; diff --git a/examples/extended/runAndEvent/RE01/include/RE01DummySD.hh b/examples/extended/runAndEvent/RE01/include/RE01DummySD.hh index db1ce2e694..c1cbd6c86d 100644 --- a/examples/extended/runAndEvent/RE01/include/RE01DummySD.hh +++ b/examples/extended/runAndEvent/RE01/include/RE01DummySD.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01DummySD.hh,v 1.2 2006/06/29 17:42:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/runAndEvent/RE01/include/RE01EventAction.hh b/examples/extended/runAndEvent/RE01/include/RE01EventAction.hh index 87d4a692ad..b3e03d9282 100644 --- a/examples/extended/runAndEvent/RE01/include/RE01EventAction.hh +++ b/examples/extended/runAndEvent/RE01/include/RE01EventAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01EventAction.hh,v 1.2 2006/06/29 17:42:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // diff --git a/examples/extended/runAndEvent/RE01/include/RE01Field.hh b/examples/extended/runAndEvent/RE01/include/RE01Field.hh index 9976ad4a30..60a686abbe 100644 --- a/examples/extended/runAndEvent/RE01/include/RE01Field.hh +++ b/examples/extended/runAndEvent/RE01/include/RE01Field.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01Field.hh,v 1.2 2006/06/29 17:42:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // diff --git a/examples/extended/runAndEvent/RE01/include/RE01HadronPhysics.hh b/examples/extended/runAndEvent/RE01/include/RE01HadronPhysics.hh index 8dd2898338..5b45a6bdcf 100644 --- a/examples/extended/runAndEvent/RE01/include/RE01HadronPhysics.hh +++ b/examples/extended/runAndEvent/RE01/include/RE01HadronPhysics.hh @@ -25,7 +25,7 @@ // // // $Id: RE01HadronPhysics.hh,v 1.2 2006/06/29 17:42:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef RE01HadronPhysics_h diff --git a/examples/extended/runAndEvent/RE01/include/RE01IonPhysics.hh b/examples/extended/runAndEvent/RE01/include/RE01IonPhysics.hh index f468d4620b..3a9261acec 100644 --- a/examples/extended/runAndEvent/RE01/include/RE01IonPhysics.hh +++ b/examples/extended/runAndEvent/RE01/include/RE01IonPhysics.hh @@ -25,7 +25,7 @@ // // // $Id: RE01IonPhysics.hh,v 1.2 2006/06/29 17:42:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef RE01IonPhysics_h diff --git a/examples/extended/runAndEvent/RE01/include/RE01LeptonPhysics.hh b/examples/extended/runAndEvent/RE01/include/RE01LeptonPhysics.hh index 97ab1f55b2..5407942163 100644 --- a/examples/extended/runAndEvent/RE01/include/RE01LeptonPhysics.hh +++ b/examples/extended/runAndEvent/RE01/include/RE01LeptonPhysics.hh @@ -25,7 +25,7 @@ // // // $Id: RE01LeptonPhysics.hh,v 1.2 2006/06/29 17:42:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/runAndEvent/RE01/include/RE01PhysicsList.hh b/examples/extended/runAndEvent/RE01/include/RE01PhysicsList.hh index 3b41503250..574fad77e5 100644 --- a/examples/extended/runAndEvent/RE01/include/RE01PhysicsList.hh +++ b/examples/extended/runAndEvent/RE01/include/RE01PhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: RE01PhysicsList.hh,v 1.2 2006/06/29 17:43:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/runAndEvent/RE01/include/RE01PrimaryGeneratorAction.hh b/examples/extended/runAndEvent/RE01/include/RE01PrimaryGeneratorAction.hh index 40f0271c97..3fc9da0bc2 100644 --- a/examples/extended/runAndEvent/RE01/include/RE01PrimaryGeneratorAction.hh +++ b/examples/extended/runAndEvent/RE01/include/RE01PrimaryGeneratorAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01PrimaryGeneratorAction.hh,v 1.2 2006/06/29 17:43:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // diff --git a/examples/extended/runAndEvent/RE01/include/RE01PrimaryGeneratorMessenger.hh b/examples/extended/runAndEvent/RE01/include/RE01PrimaryGeneratorMessenger.hh index 9caa186cdb..ad1c967eab 100644 --- a/examples/extended/runAndEvent/RE01/include/RE01PrimaryGeneratorMessenger.hh +++ b/examples/extended/runAndEvent/RE01/include/RE01PrimaryGeneratorMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01PrimaryGeneratorMessenger.hh,v 1.2 2006/06/29 17:43:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // diff --git a/examples/extended/runAndEvent/RE01/include/RE01RegionInformation.hh b/examples/extended/runAndEvent/RE01/include/RE01RegionInformation.hh index 4b40ae043e..847e78d1fd 100644 --- a/examples/extended/runAndEvent/RE01/include/RE01RegionInformation.hh +++ b/examples/extended/runAndEvent/RE01/include/RE01RegionInformation.hh @@ -25,7 +25,7 @@ // // // $Id: RE01RegionInformation.hh,v 1.2 2006/06/29 17:43:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef RE01RegionInformation_H diff --git a/examples/extended/runAndEvent/RE01/include/RE01RunAction.hh b/examples/extended/runAndEvent/RE01/include/RE01RunAction.hh index 527672fa0d..4d720040dc 100644 --- a/examples/extended/runAndEvent/RE01/include/RE01RunAction.hh +++ b/examples/extended/runAndEvent/RE01/include/RE01RunAction.hh @@ -25,7 +25,7 @@ // // // $Id: RE01RunAction.hh,v 1.2 2006/06/29 17:43:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef RE01RunAction_h diff --git a/examples/extended/runAndEvent/RE01/include/RE01StackingAction.hh b/examples/extended/runAndEvent/RE01/include/RE01StackingAction.hh index 606fb13075..c1f46bb83b 100644 --- a/examples/extended/runAndEvent/RE01/include/RE01StackingAction.hh +++ b/examples/extended/runAndEvent/RE01/include/RE01StackingAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01StackingAction.hh,v 1.2 2006/06/29 17:43:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // diff --git a/examples/extended/runAndEvent/RE01/include/RE01SteppingAction.hh b/examples/extended/runAndEvent/RE01/include/RE01SteppingAction.hh index fc95a745b5..5cbad1f2e2 100644 --- a/examples/extended/runAndEvent/RE01/include/RE01SteppingAction.hh +++ b/examples/extended/runAndEvent/RE01/include/RE01SteppingAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01SteppingAction.hh,v 1.2 2006/06/29 17:43:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // diff --git a/examples/extended/runAndEvent/RE01/include/RE01TrackInformation.hh b/examples/extended/runAndEvent/RE01/include/RE01TrackInformation.hh index b2925d2850..3c9a4a0aad 100644 --- a/examples/extended/runAndEvent/RE01/include/RE01TrackInformation.hh +++ b/examples/extended/runAndEvent/RE01/include/RE01TrackInformation.hh @@ -25,7 +25,7 @@ // // // $Id: RE01TrackInformation.hh,v 1.2 2006/06/29 17:43:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef RE01TrackInformation_h diff --git a/examples/extended/runAndEvent/RE01/include/RE01TrackerHit.hh b/examples/extended/runAndEvent/RE01/include/RE01TrackerHit.hh index 0e32802baa..a1fecc0a03 100644 --- a/examples/extended/runAndEvent/RE01/include/RE01TrackerHit.hh +++ b/examples/extended/runAndEvent/RE01/include/RE01TrackerHit.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01TrackerHit.hh,v 1.3 2006/06/29 17:43:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // diff --git a/examples/extended/runAndEvent/RE01/include/RE01TrackerParametrisation.hh b/examples/extended/runAndEvent/RE01/include/RE01TrackerParametrisation.hh index 18e6d3299f..bf9f0b1545 100644 --- a/examples/extended/runAndEvent/RE01/include/RE01TrackerParametrisation.hh +++ b/examples/extended/runAndEvent/RE01/include/RE01TrackerParametrisation.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01TrackerParametrisation.hh,v 1.2 2006/06/29 17:43:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // diff --git a/examples/extended/runAndEvent/RE01/include/RE01TrackerSD.hh b/examples/extended/runAndEvent/RE01/include/RE01TrackerSD.hh index 057a8749e7..fb21a404ce 100644 --- a/examples/extended/runAndEvent/RE01/include/RE01TrackerSD.hh +++ b/examples/extended/runAndEvent/RE01/include/RE01TrackerSD.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01TrackerSD.hh,v 1.2 2006/06/29 17:43:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // diff --git a/examples/extended/runAndEvent/RE01/include/RE01TrackingAction.hh b/examples/extended/runAndEvent/RE01/include/RE01TrackingAction.hh index 4b9db6edde..735b436f5e 100644 --- a/examples/extended/runAndEvent/RE01/include/RE01TrackingAction.hh +++ b/examples/extended/runAndEvent/RE01/include/RE01TrackingAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01TrackingAction.hh,v 1.2 2006/06/29 17:43:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef RE01TrackingAction_h diff --git a/examples/extended/runAndEvent/RE01/include/RE01Trajectory.hh b/examples/extended/runAndEvent/RE01/include/RE01Trajectory.hh index 932fce0e6d..0d0d9e839b 100644 --- a/examples/extended/runAndEvent/RE01/include/RE01Trajectory.hh +++ b/examples/extended/runAndEvent/RE01/include/RE01Trajectory.hh @@ -25,7 +25,7 @@ // // // $Id: RE01Trajectory.hh,v 1.3 2006/06/29 17:43:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef RE01Trajectory_h diff --git a/examples/extended/runAndEvent/RE01/sample.out b/examples/extended/runAndEvent/RE01/sample.out index 81a81efbed..7f73a5ea90 100644 --- a/examples/extended/runAndEvent/RE01/sample.out +++ b/examples/extended/runAndEvent/RE01/sample.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version $Name: geant4-08-01 $ (25-June-2004) + Geant4 version $Name: geant4-08-02 $ (25-June-2004) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 diff --git a/examples/extended/runAndEvent/RE01/src/RE01BosonPhysics.cc b/examples/extended/runAndEvent/RE01/src/RE01BosonPhysics.cc index 19cad78099..82d6806224 100644 --- a/examples/extended/runAndEvent/RE01/src/RE01BosonPhysics.cc +++ b/examples/extended/runAndEvent/RE01/src/RE01BosonPhysics.cc @@ -25,7 +25,7 @@ // // // $Id: RE01BosonPhysics.cc,v 1.2 2006/06/29 17:43:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/extended/runAndEvent/RE01/src/RE01CalorimeterHit.cc b/examples/extended/runAndEvent/RE01/src/RE01CalorimeterHit.cc index 2102da1059..516a413b53 100644 --- a/examples/extended/runAndEvent/RE01/src/RE01CalorimeterHit.cc +++ b/examples/extended/runAndEvent/RE01/src/RE01CalorimeterHit.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: RE01CalorimeterHit.cc,v 1.4 2006/06/29 17:43:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: RE01CalorimeterHit.cc,v 1.5 2006/11/14 07:07:38 perl Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // @@ -108,16 +108,13 @@ const std::map* RE01CalorimeterHit::GetAttDefs() const = G4AttDefStore::GetInstance("RE01CalorimeterHit",isNew); if (isNew) { G4String HitType("HitType"); - (*store)[HitType] = G4AttDef(HitType,"Hit Type","Bookkeeping","","G4String"); - - G4String TrackID("TrackID"); - (*store)[TrackID] = G4AttDef(TrackID,"Track ID","Bookkeeping","","G4int"); + (*store)[HitType] = G4AttDef(HitType,"Hit Type","Physics","","G4String"); G4String ZCellID("ZCellID"); - (*store)[ZCellID] = G4AttDef(ZCellID,"Z Cell ID","Bookkeeping","","G4int"); + (*store)[ZCellID] = G4AttDef(ZCellID,"Z Cell ID","Physics","","G4int"); G4String PhiCellID("PhiCellID"); - (*store)[PhiCellID] = G4AttDef(PhiCellID,"Phi Cell ID","Bookkeeping","","G4int"); + (*store)[PhiCellID] = G4AttDef(PhiCellID,"Phi Cell ID","Physics","","G4int"); G4String Energy("Energy"); (*store)[Energy] = G4AttDef(Energy,"Energy Deposited","Physics","G4BestUnit","G4double"); @@ -130,7 +127,7 @@ const std::map* RE01CalorimeterHit::GetAttDefs() const "Physics","G4BestUnit","G4ThreeVector"); G4String LVol("LVol"); - (*store)[LVol] = G4AttDef(LVol,"Logical Volume","Bookkeeping","","G4String"); + (*store)[LVol] = G4AttDef(LVol,"Logical Volume","Physics","","G4String"); } return store; } @@ -141,9 +138,6 @@ std::vector* RE01CalorimeterHit::CreateAttValues() const values->push_back(G4AttValue("HitType","RE01CalorimeterHit","")); - values->push_back - (G4AttValue("TrackID"," ","")); - values->push_back (G4AttValue("ZCellID",G4UIcommand::ConvertToString(ZCellID),"")); diff --git a/examples/extended/runAndEvent/RE01/src/RE01CalorimeterParametrisation.cc b/examples/extended/runAndEvent/RE01/src/RE01CalorimeterParametrisation.cc index fea3576bf4..4b36c8842d 100644 --- a/examples/extended/runAndEvent/RE01/src/RE01CalorimeterParametrisation.cc +++ b/examples/extended/runAndEvent/RE01/src/RE01CalorimeterParametrisation.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01CalorimeterParametrisation.cc,v 1.2 2006/06/29 17:43:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // diff --git a/examples/extended/runAndEvent/RE01/src/RE01CalorimeterROGeometry.cc b/examples/extended/runAndEvent/RE01/src/RE01CalorimeterROGeometry.cc index f4252e12ba..3abd8fd524 100644 --- a/examples/extended/runAndEvent/RE01/src/RE01CalorimeterROGeometry.cc +++ b/examples/extended/runAndEvent/RE01/src/RE01CalorimeterROGeometry.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01CalorimeterROGeometry.cc,v 1.2 2006/06/29 17:43:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "RE01CalorimeterROGeometry.hh" diff --git a/examples/extended/runAndEvent/RE01/src/RE01CalorimeterSD.cc b/examples/extended/runAndEvent/RE01/src/RE01CalorimeterSD.cc index 6bc166aa5f..b1828f30fe 100644 --- a/examples/extended/runAndEvent/RE01/src/RE01CalorimeterSD.cc +++ b/examples/extended/runAndEvent/RE01/src/RE01CalorimeterSD.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: RE01CalorimeterSD.cc,v 1.2 2006/06/29 17:43:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: RE01CalorimeterSD.cc,v 1.3 2006/11/18 02:42:27 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // @@ -83,11 +83,11 @@ G4bool RE01CalorimeterSD::ProcessHits(G4Step*aStep,G4TouchableHistory*ROhist) RE01CalorimeterHit* calHit = new RE01CalorimeterHit (physVol->GetLogicalVolume(),copyIDinZ,copyIDinPhi); - G4RotationMatrix rotM; - if(physVol->GetObjectRotation()) rotM = *(physVol->GetObjectRotation()); calHit->SetEdep( edep ); - calHit->SetPos( physVol->GetTranslation() ); - calHit->SetRot( rotM ); + G4AffineTransform aTrans = ROhist->GetHistory()->GetTopTransform(); + aTrans.Invert(); + calHit->SetPos(aTrans.NetTranslation()); + calHit->SetRot(aTrans.NetRotation()); calHit->SetTrackInformation(aStep->GetTrack()); G4int icell = CalCollection->insert( calHit ); CellID[copyIDinZ][copyIDinPhi] = icell - 1; diff --git a/examples/extended/runAndEvent/RE01/src/RE01DecayPhysics.cc b/examples/extended/runAndEvent/RE01/src/RE01DecayPhysics.cc index 96effab5eb..5c25e3f76f 100644 --- a/examples/extended/runAndEvent/RE01/src/RE01DecayPhysics.cc +++ b/examples/extended/runAndEvent/RE01/src/RE01DecayPhysics.cc @@ -25,7 +25,7 @@ // // // $Id: RE01DecayPhysics.cc,v 1.2 2006/06/29 17:43:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "RE01DecayPhysics.hh" diff --git a/examples/extended/runAndEvent/RE01/src/RE01DetectorConstruction.cc b/examples/extended/runAndEvent/RE01/src/RE01DetectorConstruction.cc index 993ec27f7b..873441404c 100644 --- a/examples/extended/runAndEvent/RE01/src/RE01DetectorConstruction.cc +++ b/examples/extended/runAndEvent/RE01/src/RE01DetectorConstruction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01DetectorConstruction.cc,v 1.3 2006/06/29 17:43:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // diff --git a/examples/extended/runAndEvent/RE01/src/RE01DetectorParameterDef.icc b/examples/extended/runAndEvent/RE01/src/RE01DetectorParameterDef.icc index e48ac63e50..b204747ecf 100644 --- a/examples/extended/runAndEvent/RE01/src/RE01DetectorParameterDef.icc +++ b/examples/extended/runAndEvent/RE01/src/RE01DetectorParameterDef.icc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01DetectorParameterDef.icc,v 1.2 2006/06/29 17:43:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // diff --git a/examples/extended/runAndEvent/RE01/src/RE01DummySD.cc b/examples/extended/runAndEvent/RE01/src/RE01DummySD.cc index 27d5e44b6e..1978debf87 100644 --- a/examples/extended/runAndEvent/RE01/src/RE01DummySD.cc +++ b/examples/extended/runAndEvent/RE01/src/RE01DummySD.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01DummySD.cc,v 1.2 2006/06/29 17:43:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Dummy sensitive used only to flag sensitivity diff --git a/examples/extended/runAndEvent/RE01/src/RE01EventAction.cc b/examples/extended/runAndEvent/RE01/src/RE01EventAction.cc index 1c5a32510e..ef4744a90d 100644 --- a/examples/extended/runAndEvent/RE01/src/RE01EventAction.cc +++ b/examples/extended/runAndEvent/RE01/src/RE01EventAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01EventAction.cc,v 1.2 2006/06/29 17:43:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // diff --git a/examples/extended/runAndEvent/RE01/src/RE01Field.cc b/examples/extended/runAndEvent/RE01/src/RE01Field.cc index 4dce6fe6bf..0818503ecb 100644 --- a/examples/extended/runAndEvent/RE01/src/RE01Field.cc +++ b/examples/extended/runAndEvent/RE01/src/RE01Field.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01Field.cc,v 1.3 2006/06/29 17:43:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // diff --git a/examples/extended/runAndEvent/RE01/src/RE01HadronPhysics.cc b/examples/extended/runAndEvent/RE01/src/RE01HadronPhysics.cc index d152925574..43670bb055 100644 --- a/examples/extended/runAndEvent/RE01/src/RE01HadronPhysics.cc +++ b/examples/extended/runAndEvent/RE01/src/RE01HadronPhysics.cc @@ -25,7 +25,7 @@ // // // $Id: RE01HadronPhysics.cc,v 1.2 2006/06/29 17:44:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "RE01HadronPhysics.hh" diff --git a/examples/extended/runAndEvent/RE01/src/RE01IonPhysics.cc b/examples/extended/runAndEvent/RE01/src/RE01IonPhysics.cc index cdbe18c9dd..2c70c4963f 100644 --- a/examples/extended/runAndEvent/RE01/src/RE01IonPhysics.cc +++ b/examples/extended/runAndEvent/RE01/src/RE01IonPhysics.cc @@ -25,7 +25,7 @@ // // // $Id: RE01IonPhysics.cc,v 1.2 2006/06/29 17:44:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "RE01IonPhysics.hh" diff --git a/examples/extended/runAndEvent/RE01/src/RE01LeptonPhysics.cc b/examples/extended/runAndEvent/RE01/src/RE01LeptonPhysics.cc index c663287fa0..2f6bffcf6d 100644 --- a/examples/extended/runAndEvent/RE01/src/RE01LeptonPhysics.cc +++ b/examples/extended/runAndEvent/RE01/src/RE01LeptonPhysics.cc @@ -25,7 +25,7 @@ // // // $Id: RE01LeptonPhysics.cc,v 1.2 2006/06/29 17:44:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "RE01LeptonPhysics.hh" diff --git a/examples/extended/runAndEvent/RE01/src/RE01PhysicsList.cc b/examples/extended/runAndEvent/RE01/src/RE01PhysicsList.cc index bd817aaf5b..bda9b00de5 100644 --- a/examples/extended/runAndEvent/RE01/src/RE01PhysicsList.cc +++ b/examples/extended/runAndEvent/RE01/src/RE01PhysicsList.cc @@ -25,7 +25,7 @@ // // // $Id: RE01PhysicsList.cc,v 1.2 2006/06/29 17:44:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "RE01PhysicsList.hh" diff --git a/examples/extended/runAndEvent/RE01/src/RE01PrimaryGeneratorAction.cc b/examples/extended/runAndEvent/RE01/src/RE01PrimaryGeneratorAction.cc index 34eea9c201..5ea401abfb 100644 --- a/examples/extended/runAndEvent/RE01/src/RE01PrimaryGeneratorAction.cc +++ b/examples/extended/runAndEvent/RE01/src/RE01PrimaryGeneratorAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01PrimaryGeneratorAction.cc,v 1.2 2006/06/29 17:44:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // diff --git a/examples/extended/runAndEvent/RE01/src/RE01PrimaryGeneratorMessenger.cc b/examples/extended/runAndEvent/RE01/src/RE01PrimaryGeneratorMessenger.cc index 0e5aa832d9..baf48fbeac 100644 --- a/examples/extended/runAndEvent/RE01/src/RE01PrimaryGeneratorMessenger.cc +++ b/examples/extended/runAndEvent/RE01/src/RE01PrimaryGeneratorMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01PrimaryGeneratorMessenger.cc,v 1.2 2006/06/29 17:44:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // diff --git a/examples/extended/runAndEvent/RE01/src/RE01RegionInformation.cc b/examples/extended/runAndEvent/RE01/src/RE01RegionInformation.cc index e747a1930f..c4bff8b2e2 100644 --- a/examples/extended/runAndEvent/RE01/src/RE01RegionInformation.cc +++ b/examples/extended/runAndEvent/RE01/src/RE01RegionInformation.cc @@ -25,7 +25,7 @@ // // // $Id: RE01RegionInformation.cc,v 1.2 2006/06/29 17:44:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "RE01RegionInformation.hh" diff --git a/examples/extended/runAndEvent/RE01/src/RE01RunAction.cc b/examples/extended/runAndEvent/RE01/src/RE01RunAction.cc index 8fa947a13c..8f2a2906ed 100644 --- a/examples/extended/runAndEvent/RE01/src/RE01RunAction.cc +++ b/examples/extended/runAndEvent/RE01/src/RE01RunAction.cc @@ -25,7 +25,7 @@ // // // $Id: RE01RunAction.cc,v 1.2 2006/06/29 17:44:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "RE01RunAction.hh" diff --git a/examples/extended/runAndEvent/RE01/src/RE01StackingAction.cc b/examples/extended/runAndEvent/RE01/src/RE01StackingAction.cc index bb55c44c16..8a3ec4243e 100644 --- a/examples/extended/runAndEvent/RE01/src/RE01StackingAction.cc +++ b/examples/extended/runAndEvent/RE01/src/RE01StackingAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01StackingAction.cc,v 1.2 2006/06/29 17:44:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // diff --git a/examples/extended/runAndEvent/RE01/src/RE01SteppingAction.cc b/examples/extended/runAndEvent/RE01/src/RE01SteppingAction.cc index 3e2fa9b29b..4fb769cdaf 100644 --- a/examples/extended/runAndEvent/RE01/src/RE01SteppingAction.cc +++ b/examples/extended/runAndEvent/RE01/src/RE01SteppingAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01SteppingAction.cc,v 1.2 2006/06/29 17:44:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // diff --git a/examples/extended/runAndEvent/RE01/src/RE01TrackInformation.cc b/examples/extended/runAndEvent/RE01/src/RE01TrackInformation.cc index 1bec6efa26..1aba564506 100644 --- a/examples/extended/runAndEvent/RE01/src/RE01TrackInformation.cc +++ b/examples/extended/runAndEvent/RE01/src/RE01TrackInformation.cc @@ -25,7 +25,7 @@ // // // $Id: RE01TrackInformation.cc,v 1.2 2006/06/29 17:44:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "RE01TrackInformation.hh" diff --git a/examples/extended/runAndEvent/RE01/src/RE01TrackerHit.cc b/examples/extended/runAndEvent/RE01/src/RE01TrackerHit.cc index bc9fc2e297..0ab64901f5 100644 --- a/examples/extended/runAndEvent/RE01/src/RE01TrackerHit.cc +++ b/examples/extended/runAndEvent/RE01/src/RE01TrackerHit.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: RE01TrackerHit.cc,v 1.4 2006/06/29 17:44:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: RE01TrackerHit.cc,v 1.5 2006/11/14 07:07:38 perl Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // @@ -91,16 +91,10 @@ const std::map* RE01TrackerHit::GetAttDefs() const = G4AttDefStore::GetInstance("RE01TrackerHit",isNew); if (isNew) { G4String HitType("HitType"); - (*store)[HitType] = G4AttDef(HitType,"Hit Type","Bookkeeping","","G4String"); + (*store)[HitType] = G4AttDef(HitType,"Hit Type","Physics","","G4String"); G4String TrackID("TrackID"); - (*store)[TrackID] = G4AttDef(TrackID,"Track ID","Bookkeeping","","G4int"); - - G4String ZCellID("ZCellID"); - (*store)[ZCellID] = G4AttDef(ZCellID,"Z Cell ID","Bookkeeping","","G4int"); - - G4String PhiCellID("PhiCellID"); - (*store)[PhiCellID] = G4AttDef(PhiCellID,"Phi Cell ID","Bookkeeping","","G4int"); + (*store)[TrackID] = G4AttDef(TrackID,"Track ID","Physics","","G4int"); G4String Energy("Energy"); (*store)[Energy] = G4AttDef(Energy,"Energy Deposited","Physics","G4BestUnit","G4double"); @@ -111,9 +105,6 @@ const std::map* RE01TrackerHit::GetAttDefs() const G4String Pos("Pos"); (*store)[Pos] = G4AttDef(Pos, "Position", "Physics","G4BestUnit","G4ThreeVector"); - - G4String LVol("LVol"); - (*store)[LVol] = G4AttDef(LVol,"Logical Volume","Bookkeeping","","G4String"); } return store; } @@ -127,12 +118,6 @@ std::vector* RE01TrackerHit::CreateAttValues() const values->push_back (G4AttValue("TrackID",G4UIcommand::ConvertToString(trackID),"")); - values->push_back - (G4AttValue("ZCellID"," ","")); - - values->push_back - (G4AttValue("PhiCellID"," ","")); - values->push_back (G4AttValue("Energy",G4BestUnit(edep,"Energy"),"")); @@ -142,9 +127,6 @@ std::vector* RE01TrackerHit::CreateAttValues() const values->push_back (G4AttValue("Pos",G4BestUnit(pos,"Length"),"")); - - values->push_back - (G4AttValue("LVol"," ","")); return values; } diff --git a/examples/extended/runAndEvent/RE01/src/RE01TrackerParametrisation.cc b/examples/extended/runAndEvent/RE01/src/RE01TrackerParametrisation.cc index 9903927164..cd6e1109c5 100644 --- a/examples/extended/runAndEvent/RE01/src/RE01TrackerParametrisation.cc +++ b/examples/extended/runAndEvent/RE01/src/RE01TrackerParametrisation.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01TrackerParametrisation.cc,v 1.2 2006/06/29 17:44:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // diff --git a/examples/extended/runAndEvent/RE01/src/RE01TrackerSD.cc b/examples/extended/runAndEvent/RE01/src/RE01TrackerSD.cc index bffe411272..a370819da3 100644 --- a/examples/extended/runAndEvent/RE01/src/RE01TrackerSD.cc +++ b/examples/extended/runAndEvent/RE01/src/RE01TrackerSD.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01TrackerSD.cc,v 1.2 2006/06/29 17:44:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // diff --git a/examples/extended/runAndEvent/RE01/src/RE01TrackingAction.cc b/examples/extended/runAndEvent/RE01/src/RE01TrackingAction.cc index 3cd5e21697..4cf04978e5 100644 --- a/examples/extended/runAndEvent/RE01/src/RE01TrackingAction.cc +++ b/examples/extended/runAndEvent/RE01/src/RE01TrackingAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: RE01TrackingAction.cc,v 1.2 2006/06/29 17:44:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // diff --git a/examples/extended/runAndEvent/RE01/src/RE01Trajectory.cc b/examples/extended/runAndEvent/RE01/src/RE01Trajectory.cc index d756d5c1fb..6f5aa6bc0b 100644 --- a/examples/extended/runAndEvent/RE01/src/RE01Trajectory.cc +++ b/examples/extended/runAndEvent/RE01/src/RE01Trajectory.cc @@ -25,7 +25,7 @@ // // // $Id: RE01Trajectory.cc,v 1.3 2006/06/29 17:44:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // diff --git a/examples/extended/runAndEvent/RE02/History b/examples/extended/runAndEvent/RE02/History index 86298a96c3..76964a82fd 100644 --- a/examples/extended/runAndEvent/RE02/History +++ b/examples/extended/runAndEvent/RE02/History @@ -1,4 +1,4 @@ -$Id: History,v 1.1 2005/11/24 01:44:18 asaim Exp $ +$Id: History,v 1.2 2006/11/18 01:37:22 asaim Exp $ ------------------------------------------------------------------- ========================================================= @@ -14,7 +14,11 @@ track of all tags. ---------------------------------------------------------- * Reverse chronological order (last date on top), please * ---------------------------------------------------------- - + +Nov. 17, 06 T.Aso (exampleRE02-V08-01-00) +- Reimplement the geometry with G4VNestedParameterization. +- Modify the scorers according to the nested para,eterisation. + Nov. 23, 05 M.Asai (exampleRE02-V07-01-00) - Tagged. diff --git a/examples/extended/runAndEvent/RE02/README b/examples/extended/runAndEvent/RE02/README index bcfb142f44..145e75f53a 100644 --- a/examples/extended/runAndEvent/RE02/README +++ b/examples/extended/runAndEvent/RE02/README @@ -1,4 +1,4 @@ -$Id: README,v 1.1 2005/11/24 01:44:18 asaim Exp $ +$Id: README,v 1.2 2006/11/18 01:37:22 asaim Exp $ ------------------------------------------------------------------- ========================================================= @@ -9,40 +9,55 @@ $Id: README,v 1.1 2005/11/24 01:44:18 asaim Exp $ ----------- - This example simulates a simplified fixed target application - for demonstration of primitive scorers. + This example simulates a simplified water phantom measurement + in medical application with demonstration of primitive scorers. + This example also demonstrates nested parameterised volume which + realizes segmented boxes using a combination of replicated volumes + and a parameterised volume. - (Caution) - This example creates 100 x 100 x 200 boxes using parameterised - volume for realistic situation of medical application. This is - very memory consumption, and need roughly more than 1 GB memory - for execution. If your machine does not have enough memory, - please try to reduce number of segments according to the - instruction given in "1- GEOMETRY DEFINITION". - + (Tips) + This example creates 100 x 100 x 200 boxes using Nested Parameterised + Volume for realistic situation of medical application. + This is very memory consumption if normal Parameterised Volume is used, + and needs roughly more than 1 GB memory for execution. However, + NestedParameterised volume effectively works to reduce the memory consumption, + and it only needs less than 100 MB memory for execution. 1- GEOMETRY DEFINITION - The setup contains a water phantom as target. The world volume - is 200 cm x 200 cm x 200 cm. The water phantom is box shape and - the size of 200 mm x 200 mm x 400 mm. The volume of water phantom is - is divided into 100 x 100 x 200 boxes using parameterized volume, - (RE02PhantomParamterisation). - e.g. A voxel size is 2.0 mm x 2.0 mm x 2.0 mm. + The setup contains a water phantom as target by default. The world volume + is 200 cm x 200 cm x 200 cm box filled with air. The water phantom is box shape + and the size of 200 mm x 200 mm x 400 mm. The volume of water phantom is divided + into 100 x 100 x 1 towers using replicated volume,(RE02DetectorConstruction), + and then those towers are segmented into 200 boxes with respect to z axis + using nested parameterized volume,(RE02NestedPhantomParameterisation). + e.g. The volume of water phantom is divided into 100 x 100 x 200 boxes, + and a voxel size is 2.0 mm x 2.0 mm x 2.0 mm. - ---- Tips - *If your machine does not have enough memory, please try to reduce - number of segments of water phantom in exampleRE02.cc. - Please change following numbers which represent number of segments - in x, y, z axis, respectively. + For demonstration purpose of the nested parameterised volume, + (RE02NestedPhantomParameterisation), materials are assigned as water (lead) + in even (odd) order segments, alternately. + The simulation for homogeneous water phantom is also possible using an option. + + ---- Tips(1) + *If you want to reduce number of segments of water phantom, + please change following numbers which represent number of segments + in x, y, z axis, respectively.The following code can be found in + exampleRE02.cc. RE02DetectorConstruction* detector = new RE02DetectorConstruction; detector->SetNumberOfSegmentsInPhantom(100,100,200); Nx, Ny, Nz + ---- Tips(2) + *If you want to set all materials to water, + please use the following method. The following code can be found in + exampleRE02.cc. + + detector->SetLeadSegment(FALSE); // Homogeneous water phantom ---- The geometry and sensitive detector are constructed in - DetectorConstruction class. + RE02DetectorConstruction class. (See "4- SCORER " for detail descriptions about sensitive detector.) 2- PHYSICS LIST @@ -88,7 +103,7 @@ $Id: README,v 1.1 2005/11/24 01:44:18 asaim Exp $ A RUN is a set of events. The user has control: - -at Begin and End of each run (class RunAction) + -at Begin and End of each run (class RunAction) -at Begin and End of each event (class EventAction) -at Begin and End of each track (class TrackingAction, not used here) -at End of each step (class SteppingAction, not used here) @@ -96,7 +111,7 @@ $Id: README,v 1.1 2005/11/24 01:44:18 asaim Exp $ 4- SCORER - Concrete Scorer - This example introduces concrete primitive scorer (PS) and filter + This example introduces concrete primitive scorer (PS) and filter classes for easy scoring. Those primitive scorers are registered to MultiFunctionalDetector which is a concrete class of sensitive detector(SD). Then the MultiFunctionalDetector is attached to @@ -105,13 +120,23 @@ $Id: README,v 1.1 2005/11/24 01:44:18 asaim Exp $ created and assigned to the logical volume of water phantom in DetectorConstruction. - A primitive scorer can score one kind of physical quantity, and + A primitive scorer can score one kind of physical quantity, and creates one hits collection per event. The quantity is collected in G4THitsMap with the copy number of geometry. Here collection name is given as /. A primitive scorer can have one filter (SDFilter) for selecting hits to be used for the quantity. + Since the geometry is constructed using nested parameterisation, + the copy number of geometry is defined as follows, + + copy number of geometry = iy*Nx*Ny+ix*Nz+iz, + + where Nx,Ny,Nz is total number of segmentation in x, y, and z axis,respectively, + and ix,iy,iz is a copy number of the mother volume, the grand mother volume, + and this volume, respectively. + This conversion is described in GetIndex() method in PrimitiveScorer. + The physical quantities scored in this example are: ---------------------------------------------------- - Total energy deposit diff --git a/examples/extended/runAndEvent/RE02/exampleRE02.cc b/examples/extended/runAndEvent/RE02/exampleRE02.cc index 5bcc7d2af0..2d2c76d0cb 100644 --- a/examples/extended/runAndEvent/RE02/exampleRE02.cc +++ b/examples/extended/runAndEvent/RE02/exampleRE02.cc @@ -24,13 +24,12 @@ // ******************************************************************** // // -// $Id: exampleRE02.cc,v 1.2 2006/06/29 17:44:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: exampleRE02.cc,v 1.3 2006/11/18 01:37:22 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // // - #include "RE02DetectorConstruction.hh" #include "RE02PhysicsList.hh" #include "RE02PrimaryGeneratorAction.hh" @@ -54,14 +53,19 @@ int main(int argc,char** argv) { // UserInitialization classes (mandatory) //--- - // Create Detector - // If your machine does not have enough memory, - // please try to reduce Number of Segements in phantom. + // Create Detector RE02DetectorConstruction* detector = new RE02DetectorConstruction; detector->SetPhantomSize(G4ThreeVector(200*mm,200*mm,400*mm)); //Default detector->SetNumberOfSegmentsInPhantom(100,100,200); //Default + // If your machine does not have enough memory, + // please try to reduce Number of Segements in phantom. //detector->SetNumberOfSegmentsInPhantom(1,1,100); // For small memory size. // + detector->SetLeadSegment(TRUE); // Default (Water and Lead) + // Water and Lead segments are placed alternately, by defult., + // If you want to simulation homogeneous water phantom, please set it FALSE. + //detector->SetLeadSegment(FALSE); // Homogeneous water phantom + // runManager->SetUserInitialization(detector); runManager->SetUserInitialization(new RE02PhysicsList); diff --git a/examples/extended/runAndEvent/RE02/include/RE02DetectorConstruction.hh b/examples/extended/runAndEvent/RE02/include/RE02DetectorConstruction.hh index fbb4534a94..6410470247 100644 --- a/examples/extended/runAndEvent/RE02/include/RE02DetectorConstruction.hh +++ b/examples/extended/runAndEvent/RE02/include/RE02DetectorConstruction.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: RE02DetectorConstruction.hh,v 1.2 2006/06/29 17:44:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: RE02DetectorConstruction.hh,v 1.3 2006/11/18 01:37:23 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef RE02DetectorConstruction_h @@ -61,11 +61,19 @@ public: void SetNumberOfSegmentsInPhantom(G4int nx, G4int ny, G4int nz) { fNx=nx; fNy=ny; fNz=nz; } void GetNumberOfSegmentsInPhantom(G4int& nx, G4int& ny, G4int& nz) - const{ nx = fNx; ny = fNy; nz = fNz; } + const{ nx=fNx; ny = fNy; nz = fNz; } + // Insert Lead plate in water or simple homogeneous water phantom + void SetLeadSegment(G4bool flag=TRUE){ fInsertLead = flag; } + G4bool IsLeadSegment(){ return fInsertLead; } private: // Data members G4ThreeVector fphantomSize; // Size of Water Phantom G4int fNx,fNy,fNz; // Number of segmentation of water phantom. + G4bool fInsertLead; // Flag for inserting lead plate in water phantom + + + + }; #endif diff --git a/examples/extended/runAndEvent/RE02/include/RE02EventAction.hh b/examples/extended/runAndEvent/RE02/include/RE02EventAction.hh index 600cc76a2f..5cb6c70fe4 100644 --- a/examples/extended/runAndEvent/RE02/include/RE02EventAction.hh +++ b/examples/extended/runAndEvent/RE02/include/RE02EventAction.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: RE02EventAction.hh,v 1.2 2006/06/29 17:44:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: RE02EventAction.hh,v 1.3 2006/11/18 01:37:23 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef RE02EventAction_h diff --git a/examples/extended/runAndEvent/RE02/include/RE02NestedPhantomParameterisation.hh b/examples/extended/runAndEvent/RE02/include/RE02NestedPhantomParameterisation.hh new file mode 100644 index 0000000000..735f574e7d --- /dev/null +++ b/examples/extended/runAndEvent/RE02/include/RE02NestedPhantomParameterisation.hh @@ -0,0 +1,149 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: RE02NestedPhantomParameterisation.hh,v 1.2 2006/12/13 15:42:45 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// class G4VNestedParameterisation +// +// Class description: +// +// Base class for parameterisations that use information from the parent +// volume to compute the material of a copy/instance of this volume. +// This is in addition to using the current replication number. +// +// Notes: +// - Such a volume can be nested inside a placement volume or a parameterised +// volume. +// - The user can modify the solid type, size or transformation using only +// the replication number of this parameterised volume. +// He/she is NOT allowed to change these attributes using information of +// parent volumes - otherwise incorrect results will occur. +// Also note that the usual restrictions apply: +// - the mother volume, in which these copies are placed, must always be +// of the same dimensions + +// History: +// 24.02.05 - J.Apostolakis - First created version. +// -------------------------------------------------------------------- +#ifndef RE02NESTEDPARAMETERISATION_HH +#define RE02NESTEDPARAMETERISATION_HH + +#include "G4Types.hh" +#include "G4VNestedParameterisation.hh" +#include "G4ThreeVector.hh" +#include + +class G4VPhysicalVolume; +class G4VTouchable; +class G4VSolid; +class G4Material; + +// CSG Entities which may be parameterised/replicated +// +class G4Box; +class G4Tubs; +class G4Trd; +class G4Trap; +class G4Cons; +class G4Sphere; +class G4Orb; +class G4Torus; +class G4Para; +class G4Polycone; +class G4Polyhedra; +class G4Hype; + +class RE02NestedPhantomParameterisation: public G4VNestedParameterisation +{ + public: // with description + + RE02NestedPhantomParameterisation(const G4ThreeVector& voxelSize, + G4int nz, + std::vector& mat); + virtual ~RE02NestedPhantomParameterisation(); + + // Methods required in derived classes + // ----------------------------------- + virtual G4Material* ComputeMaterial(G4VPhysicalVolume *currentVol, + const G4int repNo, + const G4VTouchable *parentTouch=0 + ); + // Required method, as it is the reason for this class. + // Must cope with parentTouch=0 for navigator's SetupHierarchy + + virtual G4int GetNumberOfMaterials() const; + virtual G4Material* GetMaterial(G4int idx) const; + // Needed to define materials for instances of Nested Parameterisation + // Current convention: each call should return the materials + // of all instances with the same mother/ancestor volume. + + virtual void ComputeTransformation(const G4int no, + G4VPhysicalVolume *currentPV) const; + + // Methods optional in derived classes + // ----------------------------------- + + // Additional standard Parameterisation methods, + // which can be optionally defined, in case solid is used. + + virtual void ComputeDimensions(G4Box &, + const G4int, + const G4VPhysicalVolume *) const; + +private: // Dummy declarations to get rid of warnings ... + void ComputeDimensions (G4Trd&,const G4int,const G4VPhysicalVolume*) + const {} + void ComputeDimensions (G4Trap&,const G4int,const G4VPhysicalVolume*) + const {} + void ComputeDimensions (G4Cons&,const G4int,const G4VPhysicalVolume*) + const {} + void ComputeDimensions (G4Sphere&,const G4int,const G4VPhysicalVolume*) + const {} + void ComputeDimensions (G4Orb&,const G4int,const G4VPhysicalVolume*) + const {} + void ComputeDimensions (G4Torus&,const G4int,const G4VPhysicalVolume*) + const {} + void ComputeDimensions (G4Para&,const G4int,const G4VPhysicalVolume*) + const {} + void ComputeDimensions (G4Hype&,const G4int,const G4VPhysicalVolume*) + const {} + void ComputeDimensions (G4Tubs&,const G4int,const G4VPhysicalVolume*) + const {} + void ComputeDimensions (G4Polycone&,const G4int,const G4VPhysicalVolume*) + const {} + void ComputeDimensions (G4Polyhedra&,const G4int,const G4VPhysicalVolume*) + const {} + +private: + G4double fdX,fdY,fdZ; + G4int fNz; + // + std::vector fpZ; + std::vector fmat; +}; + +#endif diff --git a/examples/extended/runAndEvent/RE02/include/RE02PSCellFlux.hh b/examples/extended/runAndEvent/RE02/include/RE02PSCellFlux.hh new file mode 100644 index 0000000000..879eefe96a --- /dev/null +++ b/examples/extended/runAndEvent/RE02/include/RE02PSCellFlux.hh @@ -0,0 +1,65 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: RE02PSCellFlux.hh,v 1.2 2006/12/13 15:42:47 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// + +#ifndef RE02PSCellFlux_h +#define RE02PSCellFlux_h 1 + +#include "G4PSCellFlux.hh" +/////////////////////////////////////////////////////////////////////////////// +// (Description) +// This is a primitive scorer class for scoring cell flux. +// The Cell Flux is defined by a sum of track length divided +// by the geometry volume, where all of the tracks in the geometry +// are taken into account. e.g. the unit of Cell Flux is mm/mm3. +// +// +// If you want to score only tracks passing through the geometry volume, +// please use G4PSPassageCellFlux. +// +// +// Created: 2005-11-14 Tsukasa ASO, Akinori Kimura. +// +/////////////////////////////////////////////////////////////////////////////// + + +class RE02PSCellFlux : public G4PSCellFlux +{ + public: // with description + RE02PSCellFlux(G4String name,G4int nx,G4int ny, G4int nz); + virtual ~RE02PSCellFlux(); + + protected: // with description + virtual G4int GetIndex(G4Step*); + + private: + G4int fNx, fNy, fNz; +}; +#endif + diff --git a/examples/extended/runAndEvent/RE02/include/RE02PSEnergyDeposit.hh b/examples/extended/runAndEvent/RE02/include/RE02PSEnergyDeposit.hh new file mode 100644 index 0000000000..3ede22cf86 --- /dev/null +++ b/examples/extended/runAndEvent/RE02/include/RE02PSEnergyDeposit.hh @@ -0,0 +1,56 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: RE02PSEnergyDeposit.hh,v 1.2 2006/12/13 15:42:50 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// + +#ifndef RE02PSEnergyDeposit_h +#define RE02PSEnergyDeposit_h 1 + +#include "G4PSEnergyDeposit.hh" +/////////////////////////////////////////////////////////////////////////////// +// Description: +// This is a primitive scorer class for scoring energy deposit. +// +// Created: 2005-11-14 Tsukasa ASO, Akinori Kimura +/////////////////////////////////////////////////////////////////////////////// + + +class RE02PSEnergyDeposit : public G4PSEnergyDeposit +{ + public: // with description + RE02PSEnergyDeposit(G4String name,G4int nx,G4int ny, G4int nz); + virtual ~RE02PSEnergyDeposit(); + + protected: // with description + virtual G4int GetIndex(G4Step*); + + private: + G4int fNx, fNy, fNz; +}; +#endif + diff --git a/examples/extended/runAndEvent/RE02/include/RE02PSFlatSurfaceCurrent.hh b/examples/extended/runAndEvent/RE02/include/RE02PSFlatSurfaceCurrent.hh new file mode 100644 index 0000000000..d835973675 --- /dev/null +++ b/examples/extended/runAndEvent/RE02/include/RE02PSFlatSurfaceCurrent.hh @@ -0,0 +1,69 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: RE02PSFlatSurfaceCurrent.hh,v 1.2 2006/12/13 15:42:52 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// + +#ifndef RE02PSFlatSurfaceCurrent_h +#define RE02PSFlatSurfaceCurrent_h 1 + +#include "G4PSFlatSurfaceCurrent.hh" +/////////////////////////////////////////////////////////////////////////////// +// (Description) +// This is a primitive scorer class for scoring Surface Current. +// Current version assumes only for G4Box shape, and the surface +// is defined at the -Z plane of the box. +// The current is given in the unit of area. +// e.g. (Number of tracks)/mm2. +// +// Surface is defined at the -Z surface. +// Direction -Z +Z +// 0 IN || OUT ->|<- | fCurrent_InOut +// 1 IN ->| | fCurrent_In +// 2 OUT |<- | fCurrent_Out +// +// +// Created: 2005-11-14 Tsukasa ASO, Akinori Kimura. +// 17-Nov-2005 T.Aso, Bug fix for area definition. +/////////////////////////////////////////////////////////////////////////////// + + +class RE02PSFlatSurfaceCurrent : public G4PSFlatSurfaceCurrent +{ + public: // with description + RE02PSFlatSurfaceCurrent(G4String name, G4int direction, + G4int nx,G4int ny, G4int nz); + virtual ~RE02PSFlatSurfaceCurrent(); + + protected: // with description + virtual G4int GetIndex(G4Step*); + + private: + G4int fNx, fNy, fNz; +}; +#endif + diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02PrimaryGeneratorAction.cc b/examples/extended/runAndEvent/RE02/include/RE02PSFlatSurfaceFlux.hh similarity index 56% rename from examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02PrimaryGeneratorAction.cc rename to examples/extended/runAndEvent/RE02/include/RE02PSFlatSurfaceFlux.hh index 357183ffc7..36940966f8 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02PrimaryGeneratorAction.cc +++ b/examples/extended/runAndEvent/RE02/include/RE02PSFlatSurfaceFlux.hh @@ -23,51 +23,49 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// ==================================================================== // -// H02PrimaryGeneratorAction.cc -// $Id: H02PrimaryGeneratorAction.cc,v 1.3 2006/06/29 17:14:08 gunter Exp $ +// $Id: RE02PSFlatSurfaceFlux.hh,v 1.2 2006/12/13 15:42:54 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // -// ==================================================================== -#include "H02PrimaryGeneratorAction.hh" -#include "H02PrimaryGeneratorMessenger.hh" -#include "G4Event.hh" -#include "G4ParticleGun.hh" -#include "G4HepMCAsciiReader.hh" -#include "H02PythiaInterface.hh" +#ifndef RE02PSFlatSurfaceFlux_h +#define RE02PSFlatSurfaceFlux_h 1 -//////////////////////////////////////////////////// -H02PrimaryGeneratorAction::H02PrimaryGeneratorAction() -//////////////////////////////////////////////////// +#include "G4PSFlatSurfaceFlux.hh" +/////////////////////////////////////////////////////////////////////////////// +// (Description) +// This is a primitive scorer class for scoring Surface Flux. +// Current version assumes only for G4Box shape, and the surface +// is defined at the -Z plane of the box. +// The surface flux is given in the unit of area. +// e.g. sum of 1/cos(T)/mm2, where T is a incident angle of the +// track on the surface. +// +// +// Surface is defined at the -Z surface. +// Direction -Z +Z +// 0 IN || OUT ->|<- | fFlux_InOut +// 1 IN ->| | fFlux_In +// 2 OUT |<- | fFlux_Out +// +// Created: 2005-11-14 Tsukasa ASO, Akinori Kimura. +// +// 18-Nov-2005 T.Aso, To use always positive value for anglefactor. +// Bug fix. Area definition. +/////////////////////////////////////////////////////////////////////////////// + + +class RE02PSFlatSurfaceFlux : public G4PSFlatSurfaceFlux { - // default generator is particle gun. - currentGenerator= particleGun= new G4ParticleGun(); - currentGeneratorName= "particleGun"; - hepmcAscii= new G4HepMCAsciiReader(); - pythiaGen= new H02PythiaInterface(); + public: // with description + RE02PSFlatSurfaceFlux(G4String name, G4int direction, G4int nx,G4int ny, G4int nz); + virtual ~RE02PSFlatSurfaceFlux(); - gentypeMap["particleGun"]= particleGun; - gentypeMap["hepmcAscii"]= hepmcAscii; - gentypeMap["pythia"]= pythiaGen; + protected: // with description + virtual G4int GetIndex(G4Step*); - messenger= new H02PrimaryGeneratorMessenger(this); -} - -///////////////////////////////////////////////////// -H02PrimaryGeneratorAction::~H02PrimaryGeneratorAction() -///////////////////////////////////////////////////// -{ - delete messenger; -} - -////////////////////////////////////////////////////////////////// -void H02PrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent) -////////////////////////////////////////////////////////////////// -{ - if(currentGenerator) - currentGenerator-> GeneratePrimaryVertex(anEvent); - else - G4Exception("generator is not instanciated."); -} + private: + G4int fNx, fNy, fNz; +}; +#endif diff --git a/source/processes/hadronic/models/coherent_elastic/include/G4HadronValues.hh b/examples/extended/runAndEvent/RE02/include/RE02PSNofStep.hh similarity index 68% rename from source/processes/hadronic/models/coherent_elastic/include/G4HadronValues.hh rename to examples/extended/runAndEvent/RE02/include/RE02PSNofStep.hh index ebeb801e9d..bfb9cdbb48 100644 --- a/source/processes/hadronic/models/coherent_elastic/include/G4HadronValues.hh +++ b/examples/extended/runAndEvent/RE02/include/RE02PSNofStep.hh @@ -23,47 +23,35 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4HadronValues.hh,v 1.10 2006/06/29 20:09:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// +// $Id: RE02PSNofStep.hh,v 1.2 2006/12/13 15:42:57 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // -// -// G4HadronValues header file -// -// -// Kinematic and dynamic values -// N. Starkov 2003. -// -// Modifications: -// 14.11.05 Use PDG code instead of static particle pointers (N.Starkov) -// 23.11.05 cleanup (V.Ivanchenko) -// +#ifndef RE02PSNofStep_h +#define RE02PSNofStep_h 1 -#ifndef G4HadronValues_h -#define G4HadronValues_h 1 +#include "G4PSNofStep.hh" +/////////////////////////////////////////////////////////////////////////////// +// (Description) +// This is a primitive scorer class for scoring Number of Steps in the cell. +// +// Created: 2005-11-14 Tsukasa ASO, Akinori Kimura. +// +/////////////////////////////////////////////////////////////////////////////// -#include "globals.hh" -#include "G4DynamicParticle.hh" -#define MyPi 3.141593 -#define MbToGeV2 2.568 -#define GeV2ToMb 0.38939 -#define MbToFm2 25.68 - -class G4HadronValues +class RE02PSNofStep : public G4PSNofStep { -public: - - G4HadronValues(); - ~G4HadronValues(); + public: // with description + RE02PSNofStep(G4String name,G4int nx,G4int ny, G4int nz); + virtual ~RE02PSNofStep(); - void GetHadronValues(const G4DynamicParticle * aHadron); - - G4double HadrTot, HadrSlope, HadrReIm, DDSect2, DDSect3, - MomentumCM; + protected: // with description + virtual G4int GetIndex(G4Step*); + private: + G4int fNx, fNy, fNz; }; - #endif - diff --git a/examples/extended/runAndEvent/RE02/include/RE02PSPassageCellFlux.hh b/examples/extended/runAndEvent/RE02/include/RE02PSPassageCellFlux.hh new file mode 100644 index 0000000000..9aabe8b47c --- /dev/null +++ b/examples/extended/runAndEvent/RE02/include/RE02PSPassageCellFlux.hh @@ -0,0 +1,62 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: RE02PSPassageCellFlux.hh,v 1.2 2006/12/13 15:43:00 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// + +#ifndef RE02PSPassageCellFlux_h +#define RE02PSPassageCellFlux_h 1 + +#include "G4PSPassageCellFlux.hh" +/////////////////////////////////////////////////////////////////////////////// +// (Description) +// This is a primitive scorer class for scoring cell flux. +// The Cell Flux is defined by a track length divided by a geometry +// volume, where only tracks passing through the geometry are taken +// into account. e.g. the unit of Cell Flux is mm/mm3. +// +// If you want to score all tracks in the geometry volume, +// please use G4PSCellFlux. +// +// Created: 2005-11-14 Tsukasa ASO, Akinori Kimura. +/////////////////////////////////////////////////////////////////////////////// + + +class RE02PSPassageCellFlux : public G4PSPassageCellFlux +{ + public: // with description + RE02PSPassageCellFlux(G4String name,G4int nx,G4int ny, G4int nz); + virtual ~RE02PSPassageCellFlux(); + + protected: // with description + virtual G4int GetIndex(G4Step*); + + private: + G4int fNx, fNy, fNz; +}; +#endif + diff --git a/examples/extended/runAndEvent/RE02/include/RE02PhantomParameterisation.hh b/examples/extended/runAndEvent/RE02/include/RE02PhantomParameterisation.hh deleted file mode 100644 index 26106b19d6..0000000000 --- a/examples/extended/runAndEvent/RE02/include/RE02PhantomParameterisation.hh +++ /dev/null @@ -1,92 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: RE02PhantomParameterisation.hh,v 1.2 2006/06/29 17:44:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// - -#ifndef RE02PhantomParameterisation_h -#define RE02PhantomParameterisation_h 1 - -#include "globals.hh" -#include "G4VPVParameterisation.hh" -#include "G4ThreeVector.hh" -#include - -class G4VPhysicalVolume; -class G4LogicalVolume; -class G4Material; -class G4VisAttributes; -class G4Box; - -class G4Trd; -class G4Trap; -class G4Cons; -class G4Orb; -class G4Sphere; -class G4Torus; -class G4Para; -class G4Hype; -class G4Tubs; -class G4Polycone; -class G4Polyhedra; - -// -class RE02PhantomParameterisation : public G4VPVParameterisation -{ -public: - - RE02PhantomParameterisation(const G4ThreeVector& motherSize, - const G4int nx, const G4int ny, const G4int nz); - - virtual ~RE02PhantomParameterisation(); - - void ComputeTransformation(const G4int copyNo, - G4VPhysicalVolume* physVol)const; - - private: // Dummy declarations to get rid of warnings ... - void ComputeDimensions(G4Box&, const G4int,const G4VPhysicalVolume* ) const{}; - void ComputeDimensions(G4Trd&,const G4int,const G4VPhysicalVolume*) const {} - void ComputeDimensions(G4Trap&,const G4int,const G4VPhysicalVolume*) const {} - void ComputeDimensions(G4Cons&,const G4int,const G4VPhysicalVolume*) const {} - void ComputeDimensions(G4Sphere&,const G4int,const G4VPhysicalVolume*) const {} - void ComputeDimensions(G4Orb&,const G4int,const G4VPhysicalVolume*) const {} - void ComputeDimensions(G4Torus&,const G4int,const G4VPhysicalVolume*) const {} - void ComputeDimensions(G4Para&,const G4int,const G4VPhysicalVolume*) const {} - void ComputeDimensions(G4Hype&,const G4int,const G4VPhysicalVolume*) const {} - void ComputeDimensions(G4Tubs&,const G4int,const G4VPhysicalVolume*) const {} - void ComputeDimensions(G4Polycone&,const G4int,const G4VPhysicalVolume*) const {} - void ComputeDimensions(G4Polyhedra&,const G4int,const G4VPhysicalVolume*) const {} - -private: - G4ThreeVector fDxyzMother; - G4ThreeVector fDxyz; - G4int fNx, fNy, fNz; - std::vector fPositions; - -}; -#endif - diff --git a/examples/extended/runAndEvent/RE02/include/RE02PrimaryGeneratorAction.hh b/examples/extended/runAndEvent/RE02/include/RE02PrimaryGeneratorAction.hh index eb55854e6f..3796992d34 100644 --- a/examples/extended/runAndEvent/RE02/include/RE02PrimaryGeneratorAction.hh +++ b/examples/extended/runAndEvent/RE02/include/RE02PrimaryGeneratorAction.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: RE02PrimaryGeneratorAction.hh,v 1.2 2006/06/29 17:45:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: RE02PrimaryGeneratorAction.hh,v 1.3 2006/11/18 01:37:23 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef RE02PrimaryGeneratorAction_h diff --git a/examples/extended/runAndEvent/RE02/include/RE02Run.hh b/examples/extended/runAndEvent/RE02/include/RE02Run.hh index 4a021416ff..0151dd9c1a 100644 --- a/examples/extended/runAndEvent/RE02/include/RE02Run.hh +++ b/examples/extended/runAndEvent/RE02/include/RE02Run.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: RE02Run.hh,v 1.2 2006/06/29 17:45:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: RE02Run.hh,v 1.3 2006/11/18 01:37:23 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------- // (Purpose) diff --git a/examples/extended/runAndEvent/RE02/include/RE02RunAction.hh b/examples/extended/runAndEvent/RE02/include/RE02RunAction.hh index f3aee074f5..c1bbf1f285 100644 --- a/examples/extended/runAndEvent/RE02/include/RE02RunAction.hh +++ b/examples/extended/runAndEvent/RE02/include/RE02RunAction.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: RE02RunAction.hh,v 1.2 2006/06/29 17:45:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: RE02RunAction.hh,v 1.3 2006/11/18 01:37:23 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef RE02RunAction_h @@ -40,7 +40,9 @@ class G4Run; //======================================================================= // RE02RunAction // +// Generate Run object and Dumping Run summary. // +// T.Aso Created. 2007.Nov. // //======================================================================= // @@ -61,7 +63,7 @@ public: // Utility method for converting segment number of // water phantom to copyNo of HitsMap. G4int CopyNo(G4int ix, G4int iy, G4int iz) - { return (ix*(fNy*fNz)+iy*fNz+iz); } + { return (iy*(fNx*fNy)+ix*fNz+iz); } private: diff --git a/examples/extended/runAndEvent/RE02/run.mac b/examples/extended/runAndEvent/RE02/run.mac new file mode 100644 index 0000000000..fd89e82558 --- /dev/null +++ b/examples/extended/runAndEvent/RE02/run.mac @@ -0,0 +1,47 @@ +# $Id: run.mac,v 1.1 2006/11/18 01:37:23 asaim Exp $ +# +# Macro file for "exampleRE02.cc" +# +# can be run in batch, without graphic +# or interactively: Idle> /control/execute run2.mac +# +/control/verbose 2 +/run/verbose 2 +#/event/verbose 0 +/tracking/verbose 1 +# +# +#/vis/scene/create +# +# Create a scene handler for a specific graphics system +# (Edit the next line(s) to choose another graphic system) +#/vis/open OGLIX +#/vis/open DAWNFILE +#/vis/open VRML2FILE +# +# viewer settings +#/vis/viewer/set/viewpointThetaPhi 90 180 deg +#/vis/viewer/zoom 1.4 +# +# Store trajectory +#/tracking/storeTrajectory 1 +#/vis/scene/add/trajectories +#/vis/scene/endOfEventAction accumulate +# +# +# Beam Parameters +# for electron +# UIcommands from G4ParticleGun. +# +/gun/particle gamma +# +# Kinetic Energy. +#/gun/energy 35. keV +#/gun/energy 60. keV +/gun/energy 356. keV +# +/gun/position 0 0 -100. cm +/gun/direction 0 0 1 +# +/run/beamOn 10 +# diff --git a/examples/extended/runAndEvent/RE02/run1.log b/examples/extended/runAndEvent/RE02/run1.log index efdd405b60..47ced79c33 100644 --- a/examples/extended/runAndEvent/RE02/run1.log +++ b/examples/extended/runAndEvent/RE02/run1.log @@ -1,15 +1,11 @@ ************************************************************* - Geant4 version Name: geant4-07-01 (30-June-2005) + Geant4 version Name: geant4-08-01-patch-01 (27-July-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 ************************************************************* -<-- RE02DetectorConstruction ----------------- - Water Phantom Size (200,200,400) - Segmentation (100,100,200) -<--------------------------------------------- You are using the RE02PhysicsList This PhysicsList originally comes from example/extended/analysis/A01, and is modified @@ -29,7 +25,7 @@ Visualization Manager instantiating... Visualization Manager initialising... Registering graphics systems... -You have successfully chosen to use the following graphics systems. +You have successfully registered the following graphics systems. Current available graphics systems are: ASCIITree (ATree) DAWNFILE (DAWNFILE) @@ -42,42 +38,74 @@ Current available graphics systems are: FukuiRenderer (DAWN) OpenGLImmediateX (OGLIX) OpenGLStoredX (OGLSX) - OpenGLImmediateXm (OGLIXm) - OpenGLStoredXm (OGLSXm) + RayTracerX (RayTracerX) VRML1 (VRML1) VRML2 (VRML2) +Registering model factories... + +You have successfully registered the following model factories. +Registered model factories: + generic + drawByCharge + drawByParticleID + drawByOriginVolume + +Registered models: + None + +Registered filter factories: + chargeFilter + particleFilter + originVolumeFilter + +Registered filters: + None + + The materials defined are : -***** Table : Nb of materials = 2 ***** +***** Table : Nb of materials = 3 ***** Material: G4_AIR density: 1.205 mg/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 303.921 m ---> Element: C (C) Z = 6.0 N = 12.0 A = 12.01 g/mole ---> Isotope: C Z = 6 N = 12 A = 12.00 g/mole abundance: 98.93 % - ---> Isotope: C Z = 6 N = 13 A = 13.00 g/mole abundance: 1.07 % fractionMass: 0.01 % Abundance 0.02 % + ---> Isotope: C Z = 6 N = 13 A = 13.00 g/mole abundance: 1.07 % ElmMassFraction: 0.01 % ElmAbundance 0.02 % ---> Element: N (N) Z = 7.0 N = 14.0 A = 14.01 g/mole ---> Isotope: N Z = 7 N = 14 A = 14.00 g/mole abundance: 99.63 % - ---> Isotope: N Z = 7 N = 15 A = 15.00 g/mole abundance: 0.37 % fractionMass: 75.53 % Abundance 78.44 % + ---> Isotope: N Z = 7 N = 15 A = 15.00 g/mole abundance: 0.37 % ElmMassFraction: 75.53 % ElmAbundance 78.44 % ---> Element: O (O) Z = 8.0 N = 16.0 A = 16.00 g/mole ---> Isotope: O Z = 8 N = 16 A = 15.99 g/mole abundance: 99.76 % ---> Isotope: O Z = 8 N = 17 A = 17.00 g/mole abundance: 0.04 % - ---> Isotope: O Z = 8 N = 18 A = 18.00 g/mole abundance: 0.20 % fractionMass: 23.18 % Abundance 21.07 % + ---> Isotope: O Z = 8 N = 18 A = 18.00 g/mole abundance: 0.20 % ElmMassFraction: 23.18 % ElmAbundance 21.07 % ---> Element: Ar (Ar) Z = 18.0 N = 40.0 A = 39.95 g/mole ---> Isotope: Ar Z = 18 N = 36 A = 35.97 g/mole abundance: 0.34 % ---> Isotope: Ar Z = 18 N = 38 A = 37.96 g/mole abundance: 0.06 % - ---> Isotope: Ar Z = 18 N = 40 A = 39.96 g/mole abundance: 99.60 % fractionMass: 1.28 % Abundance 0.47 % + ---> Isotope: Ar Z = 18 N = 40 A = 39.96 g/mole abundance: 99.60 % ElmMassFraction: 1.28 % ElmAbundance 0.47 % - Material: G4_WATER density: 1.000 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 36.083 cm + Material: G4_WATER H_2O density: 1.000 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 36.083 cm ---> Element: H (H) Z = 1.0 N = 1.0 A = 1.01 g/mole ---> Isotope: H Z = 1 N = 1 A = 1.01 g/mole abundance: 99.99 % - ---> Isotope: H Z = 1 N = 2 A = 2.01 g/mole abundance: 0.01 % fractionMass: 11.19 % Abundance 66.67 % + ---> Isotope: H Z = 1 N = 2 A = 2.01 g/mole abundance: 0.01 % ElmMassFraction: 11.19 % ElmAbundance 66.67 % ---> Element: O (O) Z = 8.0 N = 16.0 A = 16.00 g/mole ---> Isotope: O Z = 8 N = 16 A = 15.99 g/mole abundance: 99.76 % ---> Isotope: O Z = 8 N = 17 A = 17.00 g/mole abundance: 0.04 % - ---> Isotope: O Z = 8 N = 18 A = 18.00 g/mole abundance: 0.20 % fractionMass: 88.81 % Abundance 33.33 % + ---> Isotope: O Z = 8 N = 18 A = 18.00 g/mole abundance: 0.20 % ElmMassFraction: 88.81 % ElmAbundance 33.33 % + + Material: G4_Pb density: 11.350 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 5.613 mm + ---> Element: Pb (Pb) Z = 82.0 N = 207.2 A = 207.22 g/mole + ---> Isotope: Pb Z = 82 N = 204 A = 203.97 g/mole abundance: 1.40 % + ---> Isotope: Pb Z = 82 N = 206 A = 205.97 g/mole abundance: 24.10 % + ---> Isotope: Pb Z = 82 N = 207 A = 206.98 g/mole abundance: 22.10 % + ---> Isotope: Pb Z = 82 N = 208 A = 207.98 g/mole abundance: 52.40 % ElmMassFraction: 100.00 % ElmAbundance 100.00 % +<-- RE02DetectorConstruction::Construct------- + Water Phantom Size (200,200,400) + Segmentation (100,100,200) + Lead plate at even copy # (0-False,1-True): 1 +<--------------------------------------------- ----G4SDParticleFileter particle list------ gamma ------------------------------------------- @@ -101,7 +129,7 @@ Thank you for using G4BinaryCascade. # # create empty scene # -/vis/scene/create +#/vis/scene/create # # Create a scene handler for a specific graphics system # (Edit the next line(s) to choose another graphic system) @@ -118,11 +146,10 @@ Thank you for using G4BinaryCascade. # # for drawing the tracks # (if too many tracks cause core dump => storeTrajectory 0) -/tracking/storeTrajectory 1 -/vis/scene/add/trajectories +#/tracking/storeTrajectory 1 +#/vis/scene/add/trajectories # (if you prefer refreshing each event, comment out next line) -/vis/scene/endOfEventAction accumulate -ERROR: No current sceneHandler. Please create one. +#/vis/scene/endOfEventAction accumulate # /gun/particle proton /gun/energy 150. MeV @@ -145,13 +172,13 @@ phot: Total cross sections from Sandia parametrisation. msc: Model variant of multiple scattering for e- Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary algorithm is active with facrange= 0.199 + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 eIoni: tables are built for e- dE/dx and range tables from 100 eV to 100 TeV in 120 bins. Lambda tables from threshold to 100 TeV in 120 bins. Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV. - Step function: finalRange(mm)= 1, dRoverRange= 1, integral: 1 + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 eBrem: tables are built for e- dE/dx and range tables from 100 eV to 100 TeV in 120 bins. @@ -163,7 +190,7 @@ eIoni: tables are built for e+ dE/dx and range tables from 100 eV to 100 TeV in 120 bins. Lambda tables from threshold to 100 TeV in 120 bins. Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV. - Step function: finalRange(mm)= 1, dRoverRange= 1, integral: 1 + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 eBrem: tables are built for e+ dE/dx and range tables from 100 eV to 100 TeV in 120 bins. @@ -184,16 +211,25 @@ hIoni: tables are built for proton msc: Model variant of multiple scattering for proton Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary algorithm is active with facrange= 0.199 + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 ionIoni: tables are built for GenericIon dE/dx and range tables from 100 eV to 100 TeV in 120 bins. Lambda tables from threshold to 100 TeV in 120 bins. Scaling relation is used to proton dE/dx and range Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for alpha particles below. + Stopping Power data for 8 ion/material pairs are used. Step function: finalRange(mm)= 0.1, dRoverRange= 0.1, integral: 1 msc: Model variant of multiple scattering for GenericIon + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +hIoni: tables are built for anti_proton + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 muIoni: tables are built for mu+ dE/dx and range tables from 100 eV to 100 TeV in 120 bins. @@ -204,7 +240,7 @@ muIoni: tables are built for mu+ msc: Model variant of multiple scattering for mu+ Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary algorithm is active with facrange= 0.199 + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 muBrems: tables are built for mu+ dE/dx and range tables from 100 eV to 100 TeV in 120 bins. @@ -233,12 +269,26 @@ muPairProd: tables are built for mu- Lambda tables from threshold to 100 TeV in 120 bins. Parametrised model +hIoni: tables are built for pi+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 0.297504 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +hIoni: tables are built for pi- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 0.297504 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + msc: Model variant of multiple scattering for pi- Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary algorithm is active with facrange= 0.199 + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 -Region DefaultRegionForTheWorld - Materials : G4_AIR G4_WATER +Region -- appears in world volume + Materials : G4_AIR G4_WATER G4_Pb Production cuts : gamma 1 mm e- 1 mm e+ 1 mm ========= Table of registered couples ============================== @@ -257,23 +307,34 @@ Index : 1 used in the geometry : Yes recalculation needed : No Region(s) which use this couple : DefaultRegionForTheWorld +Index : 2 used in the geometry : Yes recalculation needed : No + Material : G4_Pb + Range cuts : gamma 1 mm e- 1 mm e+ 1 mm + Energy thresholds : gamma 100.511 keV e- 1.37814 MeV e+ 1.28002 MeV + Region(s) which use this couple : + DefaultRegionForTheWorld + ==================================================================== Start closing geometry. G4GeometryManager::ReportVoxelStats -- Voxel Statistics - Total memory consumed for geometry optimisation: 445090 kByte - Total CPU time elapsed for geometry optimisation: 24 seconds + Total memory consumed for geometry optimisation: 13 kByte + Total CPU time elapsed for geometry optimisation: 0 seconds Voxelisation: top CPU users: Percent Total CPU System CPU Memory Volume ------- ---------- ---------- -------- ---------- - 99.03 23.39 2.02 445091k Phantom + 0.00 0.00 0.00 3k Phantom + 0.00 0.00 0.00 3k RepY + 0.00 0.00 0.00 7k RepX Voxelisation: top memory users: Percent Memory Heads Nodes Pointers Total CPU Volume ------- -------- ------ ------ -------- ---------- ---------- - -3.66 445090k 79801 13840799 16020201 23.39 Phantom + 52.81 7k 1 201 400 0.00 RepX + 23.59 3k 1 100 100 0.00 Phantom + 23.59 3k 1 100 100 0.00 RepY ++ PhantomSD/totalEDep id 0 ++ PhantomSD/protonEDep id 1 ++ PhantomSD/protonNStep id 2 @@ -473,6 +534,7 @@ Start Run processing. >>> Event 8500 >>> Event 8600 >>> Event 8700 + G4NuclearLevelManager: nuclide (79,201) does not have a gamma levels file >>> Event 8800 >>> Event 8900 >>> Event 9000 @@ -508,6 +570,7 @@ Start Run processing. >>> Event 12000 >>> Event 12100 >>> Event 12200 + G4NuclearLevelManager: nuclide (79,202) does not have a gamma levels file >>> Event 12300 >>> Event 12400 >>> Event 12500 @@ -585,6 +648,7 @@ Start Run processing. >>> Event 19700 >>> Event 19800 >>> Event 19900 + G4NuclearLevelManager: nuclide (77,197) does not have a gamma levels file >>> Event 20000 >>> Event 20100 >>> Event 20200 @@ -650,6 +714,7 @@ Start Run processing. >>> Event 26200 >>> Event 26300 >>> Event 26400 + G4NuclearLevelManager: nuclide (79,203) does not have a gamma levels file >>> Event 26500 >>> Event 26600 >>> Event 26700 @@ -937,6 +1002,7 @@ Start Run processing. >>> Event 54900 >>> Event 55000 >>> Event 55100 + G4NuclearLevelManager: nuclide (75,191) does not have a gamma levels file >>> Event 55200 >>> Event 55300 >>> Event 55400 @@ -1305,6 +1371,7 @@ Start Run processing. >>> Event 91700 >>> Event 91800 >>> Event 91900 + G4NuclearLevelManager: nuclide (74,188) does not have a gamma levels file >>> Event 92000 >>> Event 92100 >>> Event 92200 @@ -1388,123 +1455,123 @@ Start Run processing. Run terminated. Run Summary Number of events processed : 100000 - User=939.26s Real=991.49s Sys=2.29s + User=916.73s Real=922.77s Sys=0.5s ============================================================= Number of event processed : 100000 ============================================================= #Z Cell# totalEDep protonEDep protonNStep chargedPassCellFlux chargedCellFlux chargedSurfFlux gammaSurfCurr000 gammaSurfCurr001 gammaSurfCurr002 gammaSurfCurr003 - 0 4.4232398 GeV 4.3878668 GeV 4011 99055.376 /cm2 99321.945 /cm2 103402.73 /cm2 0 /cm2 0 /cm2 25 /cm2 275 /cm2 - 1 4.4715837 GeV 4.4401568 GeV 4038 99223.098 /cm2 99462.759 /cm2 99503.62 /cm2 0 /cm2 0 /cm2 50 /cm2 300 /cm2 - 2 4.4737645 GeV 4.4233353 GeV 4039 99082.74 /cm2 99266.776 /cm2 99760.227 /cm2 0 /cm2 0 /cm2 50 /cm2 400 /cm2 - 3 4.5176465 GeV 4.4702885 GeV 4051 98813.884 /cm2 99098.026 /cm2 99118.229 /cm2 0 /cm2 0 /cm2 25 /cm2 475 /cm2 - 4 4.583847 GeV 4.5054674 GeV 4056 98880.857 /cm2 99220.087 /cm2 99260.874 /cm2 0 /cm2 0 /cm2 0 /cm2 475 /cm2 - 5 4.5716819 GeV 4.5088414 GeV 4055 98167.551 /cm2 98624.471 /cm2 98818.04 /cm2 0 /cm2 0 /cm2 25 /cm2 350 /cm2 - 6 4.5890688 GeV 4.5203342 GeV 4041 97803.247 /cm2 98104.786 /cm2 98246.741 /cm2 0 /cm2 0 /cm2 25 /cm2 275 /cm2 - 7 4.6985873 GeV 4.6156714 GeV 4068 98133.84 /cm2 98491.272 /cm2 98325.373 /cm2 0 /cm2 0 /cm2 25 /cm2 450 /cm2 - 8 4.6533425 GeV 4.5539217 GeV 4034 98102.149 /cm2 98291.254 /cm2 98328.404 /cm2 0 /cm2 25 /cm2 25 /cm2 400 /cm2 - 9 4.6504279 GeV 4.5835786 GeV 4026 97611.814 /cm2 97872.28 /cm2 98173.856 /cm2 0 /cm2 0 /cm2 25 /cm2 500 /cm2 - 10 4.6480648 GeV 4.5957942 GeV 4031 97250.844 /cm2 97510.482 /cm2 97584.135 /cm2 0 /cm2 0 /cm2 100 /cm2 325 /cm2 - 11 4.7061681 GeV 4.6245896 GeV 4036 96811.793 /cm2 97248.156 /cm2 97218.292 /cm2 0 /cm2 0 /cm2 0 /cm2 400 /cm2 - 12 4.7317507 GeV 4.6721073 GeV 4007 96590.324 /cm2 96895.547 /cm2 97385.42 /cm2 0 /cm2 25 /cm2 75 /cm2 425 /cm2 - 13 4.6596657 GeV 4.6205688 GeV 3992 96522.878 /cm2 96660.935 /cm2 96776.987 /cm2 0 /cm2 25 /cm2 75 /cm2 625 /cm2 - 14 4.6584196 GeV 4.6127279 GeV 3998 96506.476 /cm2 96647.91 /cm2 96574.22 /cm2 0 /cm2 0 /cm2 50 /cm2 325 /cm2 - 15 4.7509067 GeV 4.6928201 GeV 4011 96283.512 /cm2 96610.348 /cm2 96373.167 /cm2 0 /cm2 0 /cm2 50 /cm2 550 /cm2 - 16 4.8037641 GeV 4.7400508 GeV 3992 95891.377 /cm2 96361.079 /cm2 96508.992 /cm2 0 /cm2 25 /cm2 50 /cm2 500 /cm2 - 17 4.6907655 GeV 4.6386139 GeV 3960 95296.216 /cm2 95544.596 /cm2 95852.825 /cm2 0 /cm2 25 /cm2 25 /cm2 450 /cm2 - 18 4.7331782 GeV 4.6704476 GeV 3947 95052.463 /cm2 95263.437 /cm2 95802.055 /cm2 0 /cm2 25 /cm2 50 /cm2 450 /cm2 - 19 4.7863486 GeV 4.7088362 GeV 3954 93886.499 /cm2 94274.683 /cm2 94545.473 /cm2 0 /cm2 0 /cm2 75 /cm2 650 /cm2 - 20 4.7527909 GeV 4.6923221 GeV 3908 93704.156 /cm2 93922.984 /cm2 94258.712 /cm2 0 /cm2 0 /cm2 75 /cm2 475 /cm2 - 21 4.8596374 GeV 4.750938 GeV 3940 93808.14 /cm2 94152.62 /cm2 93902.915 /cm2 0 /cm2 25 /cm2 100 /cm2 325 /cm2 - 22 4.8307371 GeV 4.7782974 GeV 3927 93934.153 /cm2 94114.589 /cm2 94178.935 /cm2 25 /cm2 0 /cm2 50 /cm2 525 /cm2 - 23 4.8130723 GeV 4.7633959 GeV 3900 93440.601 /cm2 93693.611 /cm2 93916.019 /cm2 0 /cm2 0 /cm2 75 /cm2 650 /cm2 - 24 4.8770902 GeV 4.8077241 GeV 3912 92738.302 /cm2 93137.141 /cm2 93131.181 /cm2 0 /cm2 0 /cm2 100 /cm2 650 /cm2 - 25 4.9561005 GeV 4.8630895 GeV 3891 92681.128 /cm2 92983.28 /cm2 92715.328 /cm2 0 /cm2 0 /cm2 75 /cm2 575 /cm2 - 26 4.9068196 GeV 4.8461895 GeV 3874 91875.524 /cm2 92221.435 /cm2 92934.064 /cm2 0 /cm2 0 /cm2 50 /cm2 475 /cm2 - 27 4.909398 GeV 4.8232368 GeV 3854 91585.829 /cm2 91771.069 /cm2 92126.021 /cm2 25 /cm2 0 /cm2 100 /cm2 500 /cm2 - 28 4.9999339 GeV 4.9525409 GeV 3841 91312.173 /cm2 91677.844 /cm2 91702.057 /cm2 0 /cm2 0 /cm2 75 /cm2 500 /cm2 - 29 4.9882704 GeV 4.9081698 GeV 3819 90409.936 /cm2 90671.678 /cm2 91157.686 /cm2 0 /cm2 0 /cm2 75 /cm2 525 /cm2 - 30 5.0125926 GeV 4.9489273 GeV 3808 89916.211 /cm2 90297.061 /cm2 90183.563 /cm2 0 /cm2 0 /cm2 75 /cm2 475 /cm2 - 31 4.9612415 GeV 4.8906578 GeV 3761 89608.154 /cm2 89810.436 /cm2 90071.476 /cm2 0 /cm2 0 /cm2 50 /cm2 600 /cm2 - 32 4.991046 GeV 4.9545303 GeV 3777 89294.996 /cm2 89517.945 /cm2 89381.682 /cm2 0 /cm2 25 /cm2 100 /cm2 550 /cm2 - 33 5.079562 GeV 4.9993783 GeV 3780 88960.109 /cm2 89432.142 /cm2 89640.113 /cm2 0 /cm2 25 /cm2 50 /cm2 425 /cm2 - 34 5.0920679 GeV 5.0236264 GeV 3733 89088.992 /cm2 89313.879 /cm2 89149.924 /cm2 0 /cm2 25 /cm2 75 /cm2 650 /cm2 - 35 5.0748521 GeV 5.0262598 GeV 3732 88327.069 /cm2 88474.634 /cm2 88632.459 /cm2 0 /cm2 0 /cm2 100 /cm2 425 /cm2 - 36 5.1620776 GeV 5.0900549 GeV 3724 87929.784 /cm2 88282.989 /cm2 88530.893 /cm2 50 /cm2 0 /cm2 50 /cm2 300 /cm2 - 37 5.0895208 GeV 5.027679 GeV 3717 87587.551 /cm2 87790.667 /cm2 87731.923 /cm2 25 /cm2 0 /cm2 100 /cm2 525 /cm2 - 38 5.168185 GeV 5.0969318 GeV 3681 86738.223 /cm2 87022.69 /cm2 87425.133 /cm2 0 /cm2 25 /cm2 25 /cm2 650 /cm2 - 39 5.1153162 GeV 5.0535083 GeV 3637 85759.242 /cm2 85987.804 /cm2 86422.253 /cm2 0 /cm2 50 /cm2 50 /cm2 500 /cm2 - 40 5.1296576 GeV 5.0758407 GeV 3616 85108.694 /cm2 85452.235 /cm2 85401.082 /cm2 0 /cm2 25 /cm2 0 /cm2 475 /cm2 - 41 5.1109637 GeV 5.0696762 GeV 3604 84607.533 /cm2 84817.172 /cm2 84812.134 /cm2 0 /cm2 25 /cm2 100 /cm2 550 /cm2 - 42 5.2006673 GeV 5.141012 GeV 3599 84465.959 /cm2 84730.757 /cm2 84738.544 /cm2 0 /cm2 0 /cm2 100 /cm2 350 /cm2 - 43 5.3119784 GeV 5.2182066 GeV 3603 84460.861 /cm2 84790.68 /cm2 84757.508 /cm2 0 /cm2 25 /cm2 50 /cm2 625 /cm2 - 44 5.3034359 GeV 5.2490879 GeV 3579 84079.973 /cm2 84254.953 /cm2 84553.629 /cm2 0 /cm2 0 /cm2 50 /cm2 500 /cm2 - 45 5.3471278 GeV 5.2859512 GeV 3546 83320.624 /cm2 83631.392 /cm2 83885.089 /cm2 0 /cm2 0 /cm2 75 /cm2 575 /cm2 - 46 5.3259787 GeV 5.2933373 GeV 3515 82562.764 /cm2 82752.843 /cm2 83270.922 /cm2 0 /cm2 0 /cm2 25 /cm2 600 /cm2 - 47 5.3007757 GeV 5.2825194 GeV 3463 81319.303 /cm2 81458.806 /cm2 82259.71 /cm2 0 /cm2 25 /cm2 75 /cm2 425 /cm2 - 48 5.3181273 GeV 5.2647278 GeV 3421 80023.322 /cm2 80312.027 /cm2 80682.755 /cm2 25 /cm2 0 /cm2 0 /cm2 375 /cm2 - 49 5.3401863 GeV 5.2876659 GeV 3377 78889.386 /cm2 79206.433 /cm2 79983.693 /cm2 0 /cm2 25 /cm2 50 /cm2 525 /cm2 - 50 5.3199768 GeV 5.2879912 GeV 3328 78492.131 /cm2 78637.534 /cm2 78469.014 /cm2 0 /cm2 25 /cm2 50 /cm2 450 /cm2 - 51 5.349761 GeV 5.3135699 GeV 3315 77414.301 /cm2 77624.224 /cm2 78070.737 /cm2 0 /cm2 50 /cm2 25 /cm2 525 /cm2 - 52 5.3046527 GeV 5.274051 GeV 3274 76128.884 /cm2 76262.741 /cm2 76911.801 /cm2 0 /cm2 0 /cm2 0 /cm2 475 /cm2 - 53 5.3921645 GeV 5.371355 GeV 3225 76037.465 /cm2 76260.356 /cm2 76167.381 /cm2 0 /cm2 0 /cm2 50 /cm2 375 /cm2 - 54 5.4471419 GeV 5.4032424 GeV 3186 75064.937 /cm2 75234.688 /cm2 75576.96 /cm2 0 /cm2 25 /cm2 0 /cm2 450 /cm2 - 55 5.4752533 GeV 5.4363398 GeV 3181 73937.072 /cm2 74127.73 /cm2 74609.116 /cm2 0 /cm2 0 /cm2 50 /cm2 350 /cm2 - 56 5.523 GeV 5.4841362 GeV 3134 73096.928 /cm2 73260.708 /cm2 73851.545 /cm2 0 /cm2 0 /cm2 0 /cm2 450 /cm2 - 57 5.5129817 GeV 5.4772519 GeV 3071 71740.926 /cm2 71929.056 /cm2 72672.844 /cm2 0 /cm2 0 /cm2 75 /cm2 500 /cm2 - 58 5.6569081 GeV 5.5838512 GeV 3051 70848.567 /cm2 71124.292 /cm2 71657.214 /cm2 0 /cm2 0 /cm2 25 /cm2 375 /cm2 - 59 5.7437741 GeV 5.679147 GeV 3008 69882.78 /cm2 70212.399 /cm2 70822.92 /cm2 0 /cm2 0 /cm2 100 /cm2 375 /cm2 - 60 5.6731657 GeV 5.6331965 GeV 2961 68471.825 /cm2 68689.325 /cm2 69843.494 /cm2 0 /cm2 25 /cm2 50 /cm2 650 /cm2 - 61 5.6446003 GeV 5.5959338 GeV 2899 67152.554 /cm2 67380.287 /cm2 67891.245 /cm2 0 /cm2 0 /cm2 50 /cm2 600 /cm2 - 62 5.6417242 GeV 5.6099808 GeV 2812 65119.909 /cm2 65225.191 /cm2 66322.901 /cm2 0 /cm2 0 /cm2 25 /cm2 400 /cm2 - 63 5.7266333 GeV 5.6899249 GeV 2753 63783.061 /cm2 63883.37 /cm2 64523.602 /cm2 0 /cm2 50 /cm2 0 /cm2 500 /cm2 - 64 5.7090443 GeV 5.6689776 GeV 2701 62847.472 /cm2 62890.809 /cm2 63048.116 /cm2 0 /cm2 0 /cm2 50 /cm2 500 /cm2 - 65 5.7805089 GeV 5.7311239 GeV 2659 61763.08 /cm2 61940.373 /cm2 62343.679 /cm2 0 /cm2 25 /cm2 25 /cm2 500 /cm2 - 66 5.8869768 GeV 5.8502915 GeV 2593 59908.09 /cm2 60073.201 /cm2 61220.744 /cm2 0 /cm2 0 /cm2 50 /cm2 500 /cm2 - 67 5.8775528 GeV 5.858811 GeV 2499 58190.805 /cm2 58281.325 /cm2 59105.665 /cm2 0 /cm2 0 /cm2 25 /cm2 350 /cm2 - 68 6.0147484 GeV 5.9339838 GeV 2468 56735.819 /cm2 56986.226 /cm2 57401.695 /cm2 0 /cm2 0 /cm2 25 /cm2 375 /cm2 - 69 6.119374 GeV 6.0481338 GeV 2398 54761.554 /cm2 55029.463 /cm2 56281.494 /cm2 0 /cm2 0 /cm2 25 /cm2 425 /cm2 - 70 6.2557059 GeV 6.1662011 GeV 2313 52911.342 /cm2 53167.476 /cm2 53892.141 /cm2 0 /cm2 0 /cm2 25 /cm2 675 /cm2 - 71 6.4440011 GeV 6.396388 GeV 2257 52026.824 /cm2 52242.509 /cm2 52595.914 /cm2 0 /cm2 0 /cm2 75 /cm2 375 /cm2 - 72 6.7551309 GeV 6.6968531 GeV 2224 50743.012 /cm2 50909.832 /cm2 51285.965 /cm2 0 /cm2 0 /cm2 50 /cm2 400 /cm2 - 73 7.1513626 GeV 7.0801472 GeV 2184 49232.266 /cm2 49572.365 /cm2 50479.408 /cm2 0 /cm2 0 /cm2 50 /cm2 425 /cm2 - 74 7.67016 GeV 7.5425245 GeV 2090 47430.373 /cm2 47854.575 /cm2 48561.983 /cm2 0 /cm2 0 /cm2 50 /cm2 375 /cm2 - 75 8.4061502 GeV 8.3452796 GeV 2051 46047.287 /cm2 46269.48 /cm2 46821.604 /cm2 50 /cm2 0 /cm2 100 /cm2 475 /cm2 - 76 10.101728 GeV 10.061923 GeV 2167 43808.402 /cm2 44660.319 /cm2 45745.099 /cm2 0 /cm2 0 /cm2 50 /cm2 375 /cm2 - 77 12.690606 GeV 12.645475 GeV 2520 33859.574 /cm2 39308.844 /cm2 43458.45 /cm2 0 /cm2 0 /cm2 0 /cm2 275 /cm2 - 78 10.849165 GeV 10.827342 GeV 2127 14320.982 /cm2 23374.753 /cm2 32622.083 /cm2 0 /cm2 0 /cm2 25 /cm2 200 /cm2 - 79 4.1240436 GeV 4.1117495 GeV 774 1578.823 /cm2 6346.2002 /cm2 13698.898 /cm2 0 /cm2 50 /cm2 25 /cm2 300 /cm2 - 80 313.38809 MeV 313.38809 MeV 65 18.096945 /cm2 368.91656 /cm2 1363.2684 /cm2 0 /cm2 0 /cm2 25 /cm2 250 /cm2 - 81 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 175 /cm2 - 82 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 100 /cm2 - 83 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 75 /cm2 - 84 433.8693 keV 0 eV 0 0 /cm2 0.017312319 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 85 180.05715 keV 0 eV 0 15.233907 /cm2 15.233907 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 - 86 333.51427 keV 0 eV 0 29.302477 /cm2 29.302477 /cm2 49.014324 /cm2 0 /cm2 0 /cm2 25 /cm2 100 /cm2 - 87 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 25 /cm2 - 88 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 - 89 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 90 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 50 /cm2 - 91 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 + 0 4.5175018 GeV 4.462083 GeV 16405 99814.5 /cm2 100139.47 /cm2 102725.73 /cm2 0 /cm2 0 /cm2 2350 /cm2 1250 /cm2 + 1 27.117057 GeV 26.614098 GeV 17327 102294.98 /cm2 103663.9 /cm2 102584.17 /cm2 0 /cm2 0 /cm2 3925 /cm2 1350 /cm2 + 2 5.1146796 GeV 4.9952914 GeV 18185 105411.67 /cm2 105809.33 /cm2 104170.64 /cm2 0 /cm2 0 /cm2 3950 /cm2 1825 /cm2 + 3 29.748694 GeV 28.956721 GeV 18847 106893.97 /cm2 108230.99 /cm2 107044.26 /cm2 0 /cm2 25 /cm2 4500 /cm2 2175 /cm2 + 4 5.6017261 GeV 5.4900657 GeV 19455 110102.02 /cm2 110689.04 /cm2 109096.55 /cm2 0 /cm2 0 /cm2 4725 /cm2 2175 /cm2 + 5 32.517297 GeV 31.617783 GeV 19946 111585.57 /cm2 113052.91 /cm2 111408.99 /cm2 0 /cm2 25 /cm2 4575 /cm2 2200 /cm2 + 6 6.1403772 GeV 6.0876662 GeV 20519 115043.57 /cm2 115606.43 /cm2 113921.32 /cm2 0 /cm2 0 /cm2 5000 /cm2 2350 /cm2 + 7 36.014332 GeV 35.450811 GeV 21331 115844 /cm2 117420.82 /cm2 116819.95 /cm2 0 /cm2 0 /cm2 4500 /cm2 2750 /cm2 + 8 6.8677739 GeV 6.7673666 GeV 21281 116764.15 /cm2 117257.49 /cm2 117625.92 /cm2 0 /cm2 25 /cm2 4800 /cm2 2425 /cm2 + 9 39.013939 GeV 38.294085 GeV 21328 113212.83 /cm2 115024.35 /cm2 116385.83 /cm2 0 /cm2 25 /cm2 4925 /cm2 2125 /cm2 + 10 7.2329851 GeV 7.1779531 GeV 20445 110185.2 /cm2 110534.79 /cm2 113250.57 /cm2 0 /cm2 25 /cm2 4625 /cm2 2100 /cm2 + 11 40.560818 GeV 40.147781 GeV 19961 104365.03 /cm2 105537.52 /cm2 108103.43 /cm2 0 /cm2 0 /cm2 3975 /cm2 2425 /cm2 + 12 8.0844511 GeV 7.9981901 GeV 19168 100350.12 /cm2 100847.5 /cm2 103557.83 /cm2 0 /cm2 0 /cm2 3425 /cm2 2250 /cm2 + 13 48.921491 GeV 48.763405 GeV 18250 91533.149 /cm2 93709.848 /cm2 96630.118 /cm2 0 /cm2 50 /cm2 3825 /cm2 1800 /cm2 + 14 11.45682 GeV 11.430982 GeV 14943 74383.122 /cm2 77995.207 /cm2 88782.547 /cm2 0 /cm2 0 /cm2 2550 /cm2 1175 /cm2 + 15 34.486069 GeV 34.375897 GeV 10193 44531.775 /cm2 51650.796 /cm2 66030.331 /cm2 0 /cm2 0 /cm2 1725 /cm2 950 /cm2 + 16 4.54188 GeV 4.5352144 GeV 6839 34413.138 /cm2 35276.845 /cm2 40141.723 /cm2 0 /cm2 25 /cm2 1525 /cm2 625 /cm2 + 17 17.432679 GeV 17.363684 GeV 5088 22851.442 /cm2 25988.141 /cm2 31569.082 /cm2 0 /cm2 0 /cm2 1250 /cm2 875 /cm2 + 18 2.59971 GeV 2.5984058 GeV 3474 17329.418 /cm2 17983.319 /cm2 20872.275 /cm2 0 /cm2 0 /cm2 875 /cm2 575 /cm2 + 19 9.0863899 GeV 9.077728 GeV 2503 10921.522 /cm2 12690.109 /cm2 15598.58 /cm2 0 /cm2 0 /cm2 675 /cm2 450 /cm2 + 20 1.3788503 GeV 1.3747015 GeV 1655 8167.4657 /cm2 8606.7147 /cm2 10155.085 /cm2 0 /cm2 0 /cm2 575 /cm2 525 /cm2 + 21 4.7309995 GeV 4.70695 GeV 1131 4598.7902 /cm2 5735.665 /cm2 7647.8634 /cm2 0 /cm2 0 /cm2 375 /cm2 350 /cm2 + 22 581.31423 MeV 580.88682 MeV 611 3077.442 /cm2 3209.566 /cm2 3970.5533 /cm2 0 /cm2 0 /cm2 375 /cm2 200 /cm2 + 23 1.9604465 GeV 1.9548654 GeV 396 1388.313 /cm2 1883.5439 /cm2 2730.1855 /cm2 0 /cm2 25 /cm2 300 /cm2 200 /cm2 + 24 342.47671 MeV 341.02655 MeV 133 389.30899 /cm2 704.12217 /cm2 1150.4042 /cm2 0 /cm2 0 /cm2 75 /cm2 175 /cm2 + 25 74.325544 MeV 71.540426 MeV 13 0 /cm2 45.360609 /cm2 361.54288 /cm2 0 /cm2 0 /cm2 50 /cm2 125 /cm2 + 26 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 75 /cm2 + 27 111.6326 keV 0 eV 0 0 /cm2 0.019583872 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 50 /cm2 + 28 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 50 /cm2 + 29 464.67815 keV 0 eV 0 0 /cm2 1.662918 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 + 30 81.551144 keV 0 eV 0 0 /cm2 0.0083105996 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 100 /cm2 + 31 2.9333443 MeV 0 eV 0 0 /cm2 26.197394 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 75 /cm2 + 32 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 75 /cm2 50 /cm2 + 33 69.059665 keV 0 eV 0 0 /cm2 0.16135062 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 100 /cm2 + 34 974.57474 keV 0 eV 0 68.496225 /cm2 68.496225 /cm2 0 /cm2 0 /cm2 0 /cm2 75 /cm2 25 /cm2 + 35 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 + 36 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 + 37 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 38 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 39 122.04223 keV 0 eV 0 0 /cm2 0.47575601 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 0 /cm2 + 40 1.2983523 MeV 0 eV 0 0 /cm2 21.017307 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 + 41 178.13929 keV 0 eV 0 0.36805621 /cm2 0.90870595 /cm2 167.06876 /cm2 0 /cm2 25 /cm2 25 /cm2 50 /cm2 + 42 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 43 2.5865235 MeV 0 eV 0 0 /cm2 27.69834 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 + 44 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 45 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 46 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 47 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 48 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 49 760.63505 keV 0 eV 0 0.19220397 /cm2 6.1747034 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 50 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 51 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 52 1.1173012 MeV 1.1173012 MeV 1 0 /cm2 0.37052819 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 53 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 54 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 55 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 + 56 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 57 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 58 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 59 364.39877 keV 0 eV 0 0 /cm2 2.4911314 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 60 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 61 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 62 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 63 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 64 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 65 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 66 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 67 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 68 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 69 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 + 70 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 71 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 72 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 73 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 74 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 75 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 76 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 77 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 78 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 79 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 80 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 81 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 82 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 83 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 84 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 85 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 86 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 87 386.49564 keV 0 eV 0 0 /cm2 1.8712604 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 88 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 89 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 90 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 91 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 92 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 93 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 94 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 95 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 96 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 25 /cm2 - 97 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 98 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 99 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 100 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 93 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 94 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 95 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 96 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 97 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 98 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 99 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 100 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 101 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 102 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 103 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 102 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 103 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 104 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 105 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 + 105 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 106 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 107 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 108 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 109 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 110 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 111 3.6987633 keV 0 eV 0 0 /cm2 0.0058194177 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 111 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 112 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 113 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 114 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 @@ -1516,12 +1583,12 @@ Run Summary 120 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 121 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 122 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 123 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 + 123 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 124 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 125 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 126 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 127 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 128 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 127 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 128 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 129 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 130 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 131 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 @@ -1540,7 +1607,7 @@ Run Summary 144 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 145 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 146 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 147 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 + 147 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 148 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 149 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 150 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 diff --git a/examples/extended/runAndEvent/RE02/run1.mac b/examples/extended/runAndEvent/RE02/run1.mac index 243585b02e..5d0cf0d4bf 100644 --- a/examples/extended/runAndEvent/RE02/run1.mac +++ b/examples/extended/runAndEvent/RE02/run1.mac @@ -9,7 +9,7 @@ # # create empty scene # -/vis/scene/create +#/vis/scene/create # # Create a scene handler for a specific graphics system # (Edit the next line(s) to choose another graphic system) @@ -26,10 +26,10 @@ # # for drawing the tracks # (if too many tracks cause core dump => storeTrajectory 0) -/tracking/storeTrajectory 1 -/vis/scene/add/trajectories +#/tracking/storeTrajectory 1 +#/vis/scene/add/trajectories # (if you prefer refreshing each event, comment out next line) -/vis/scene/endOfEventAction accumulate +#/vis/scene/endOfEventAction accumulate # /gun/particle proton /gun/energy 150. MeV diff --git a/examples/extended/runAndEvent/RE02/run1water.log b/examples/extended/runAndEvent/RE02/run1water.log new file mode 100644 index 0000000000..733dfcab69 --- /dev/null +++ b/examples/extended/runAndEvent/RE02/run1water.log @@ -0,0 +1,1663 @@ + +************************************************************* + Geant4 version Name: geant4-08-01-patch-01 (27-July-2006) + Copyright : Geant4 Collaboration + Reference : NIM A 506 (2003), 250-303 + WWW : http://cern.ch/geant4 +************************************************************* + +You are using the RE02PhysicsList +This PhysicsList originally comes from +example/extended/analysis/A01, and is modified +in Hadron Physics in order to involve Binary Cascade +at low energy region and inelastic process for generic ions. +Full set of particles (barions bosons and mesons) will be created and +Standard EM Physics and Low & High Energy parameterized models will be applied. +RE02PhysicsList is optimized for robustness +and not for any particular usage. +For the hadronic physics, educated guesses of physics list are prepared for various use cases. +When you will start REAL calculations for your own interest, +please consider the usage of hadronic_lists instead of RE02PhysicsLists. +More information can also be found from the Geant4 HyperNews. +http://geant4-hn.slac.stanford.edu:5090/Geant4-HyperNews/index + +Visualization Manager instantiating... +Visualization Manager initialising... +Registering graphics systems... + +You have successfully registered the following graphics systems. +Current available graphics systems are: + ASCIITree (ATree) + DAWNFILE (DAWNFILE) + GAGTree (GAGTree) + G4HepRep (HepRepXML) + G4HepRepFile (HepRepFile) + RayTracer (RayTracer) + VRML1FILE (VRML1FILE) + VRML2FILE (VRML2FILE) + FukuiRenderer (DAWN) + OpenGLImmediateX (OGLIX) + OpenGLStoredX (OGLSX) + RayTracerX (RayTracerX) + VRML1 (VRML1) + VRML2 (VRML2) + +Registering model factories... + +You have successfully registered the following model factories. +Registered model factories: + generic + drawByCharge + drawByParticleID + drawByOriginVolume + +Registered models: + None + +Registered filter factories: + chargeFilter + particleFilter + originVolumeFilter + +Registered filters: + None + + +The materials defined are : + + +***** Table : Nb of materials = 3 ***** + + Material: G4_AIR density: 1.205 mg/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 303.921 m + ---> Element: C (C) Z = 6.0 N = 12.0 A = 12.01 g/mole + ---> Isotope: C Z = 6 N = 12 A = 12.00 g/mole abundance: 98.93 % + ---> Isotope: C Z = 6 N = 13 A = 13.00 g/mole abundance: 1.07 % ElmMassFraction: 0.01 % ElmAbundance 0.02 % + ---> Element: N (N) Z = 7.0 N = 14.0 A = 14.01 g/mole + ---> Isotope: N Z = 7 N = 14 A = 14.00 g/mole abundance: 99.63 % + ---> Isotope: N Z = 7 N = 15 A = 15.00 g/mole abundance: 0.37 % ElmMassFraction: 75.53 % ElmAbundance 78.44 % + ---> Element: O (O) Z = 8.0 N = 16.0 A = 16.00 g/mole + ---> Isotope: O Z = 8 N = 16 A = 15.99 g/mole abundance: 99.76 % + ---> Isotope: O Z = 8 N = 17 A = 17.00 g/mole abundance: 0.04 % + ---> Isotope: O Z = 8 N = 18 A = 18.00 g/mole abundance: 0.20 % ElmMassFraction: 23.18 % ElmAbundance 21.07 % + ---> Element: Ar (Ar) Z = 18.0 N = 40.0 A = 39.95 g/mole + ---> Isotope: Ar Z = 18 N = 36 A = 35.97 g/mole abundance: 0.34 % + ---> Isotope: Ar Z = 18 N = 38 A = 37.96 g/mole abundance: 0.06 % + ---> Isotope: Ar Z = 18 N = 40 A = 39.96 g/mole abundance: 99.60 % ElmMassFraction: 1.28 % ElmAbundance 0.47 % + + Material: G4_WATER H_2O density: 1.000 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 36.083 cm + ---> Element: H (H) Z = 1.0 N = 1.0 A = 1.01 g/mole + ---> Isotope: H Z = 1 N = 1 A = 1.01 g/mole abundance: 99.99 % + ---> Isotope: H Z = 1 N = 2 A = 2.01 g/mole abundance: 0.01 % ElmMassFraction: 11.19 % ElmAbundance 66.67 % + ---> Element: O (O) Z = 8.0 N = 16.0 A = 16.00 g/mole + ---> Isotope: O Z = 8 N = 16 A = 15.99 g/mole abundance: 99.76 % + ---> Isotope: O Z = 8 N = 17 A = 17.00 g/mole abundance: 0.04 % + ---> Isotope: O Z = 8 N = 18 A = 18.00 g/mole abundance: 0.20 % ElmMassFraction: 88.81 % ElmAbundance 33.33 % + + Material: G4_Pb density: 11.350 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 5.613 mm + ---> Element: Pb (Pb) Z = 82.0 N = 207.2 A = 207.22 g/mole + ---> Isotope: Pb Z = 82 N = 204 A = 203.97 g/mole abundance: 1.40 % + ---> Isotope: Pb Z = 82 N = 206 A = 205.97 g/mole abundance: 24.10 % + ---> Isotope: Pb Z = 82 N = 207 A = 206.98 g/mole abundance: 22.10 % + ---> Isotope: Pb Z = 82 N = 208 A = 207.98 g/mole abundance: 52.40 % ElmMassFraction: 100.00 % ElmAbundance 100.00 % + + +<-- RE02DetectorConstruction::Construct------- + Water Phantom Size (200,200,400) + Segmentation (100,100,200) + Lead plate at even copy # (0-False,1-True): 0 +<--------------------------------------------- +----G4SDParticleFileter particle list------ +gamma +------------------------------------------- + G4SDKineticEnergyFilter:: gammaE filter LowE 1 keV HighE 10 keV +----G4SDParticleFileter particle list------ +gamma +------------------------------------------- + G4SDKineticEnergyFilter:: gammaE filter LowE 10 keV HighE 100 keV +----G4SDParticleFileter particle list------ +gamma +------------------------------------------- + G4SDKineticEnergyFilter:: gammaE filter LowE 100 keV HighE 1 MeV +----G4SDParticleFileter particle list------ +gamma +------------------------------------------- + G4SDKineticEnergyFilter:: gammaE filter LowE 1 MeV HighE 10 MeV +Thank you for using G4BinaryCascade. +Thank you for using G4BinaryCascade. +Thank you for using G4BinaryCascade. +/run/verbose 2 +# +# create empty scene +# +#/vis/scene/create +# +# Create a scene handler for a specific graphics system +# (Edit the next line(s) to choose another graphic system) +# +#/vis/open VRML2FILE +#/vis/open OGLIX +#/vis/open DAWNFILE +# +# draw scene +# +#/vis/viewer/set/viewpointThetaPhi 90 180 deg +#/vis/viewer/zoom 1.4 +#/vis/viewer/flush +# +# for drawing the tracks +# (if too many tracks cause core dump => storeTrajectory 0) +#/tracking/storeTrajectory 1 +#/vis/scene/add/trajectories +# (if you prefer refreshing each event, comment out next line) +#/vis/scene/endOfEventAction accumulate +# +/gun/particle proton +/gun/energy 150. MeV +/gun/position 0 0 -100 cm +/gun/direction 0 0 1 +# +/run/beamOn 100000 + +conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; + sampling secondary e+e- according to the Bethe-Heitler model + tables are built for gamma + Lambda tables from 1.022 MeV to 100 GeV in 100 bins. + +compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV + Sampling according Klein-Nishina model + tables are built for gamma + Lambda tables from 100 eV to 100 GeV in 90 bins. + +phot: Total cross sections from Sandia parametrisation. + +msc: Model variant of multiple scattering for e- + Lambda tables from 100 eV to 100 TeV in 120 bins. + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +eIoni: tables are built for e- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +eBrem: tables are built for e- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Total cross sections from a parametrisation based on the EEDL data library. + Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. + +eIoni: tables are built for e+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +eBrem: tables are built for e+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Total cross sections from a parametrisation based on the EEDL data library. + Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. + +annihil: Heilter model of formula of annihilation into 2 photons + tables are built for e+ + Lambda tables from 100 eV to 100 TeV in 120 bins. + +hIoni: tables are built for proton + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +msc: Model variant of multiple scattering for proton + Lambda tables from 100 eV to 100 TeV in 120 bins. + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +ionIoni: tables are built for GenericIon + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for alpha particles below. + Stopping Power data for 8 ion/material pairs are used. + Step function: finalRange(mm)= 0.1, dRoverRange= 0.1, integral: 1 + +msc: Model variant of multiple scattering for GenericIon + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +hIoni: tables are built for anti_proton + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +muIoni: tables are built for mu+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Bether-Bloch model for E > 0.2 MeV, parametrisation of Bragg peak below, + radiative corrections for E > 1 GeV + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +msc: Model variant of multiple scattering for mu+ + Lambda tables from 100 eV to 100 TeV in 120 bins. + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +muBrems: tables are built for mu+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Parametrised model + +muPairProd: tables are built for mu+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Parametrised model + +muIoni: tables are built for mu- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Bether-Bloch model for E > 0.2 MeV, parametrisation of Bragg peak below, + radiative corrections for E > 1 GeV + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +muBrems: tables are built for mu- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Parametrised model + +muPairProd: tables are built for mu- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Parametrised model + +hIoni: tables are built for pi+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 0.297504 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +hIoni: tables are built for pi- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 0.297504 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +msc: Model variant of multiple scattering for pi- + Lambda tables from 100 eV to 100 TeV in 120 bins. + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +Region -- appears in world volume + Materials : G4_AIR G4_WATER + Production cuts : gamma 1 mm e- 1 mm e+ 1 mm + +========= Table of registered couples ============================== + +Index : 0 used in the geometry : Yes recalculation needed : No + Material : G4_AIR + Range cuts : gamma 1 mm e- 1 mm e+ 1 mm + Energy thresholds : gamma 990 eV e- 990 eV e+ 990 eV + Region(s) which use this couple : + DefaultRegionForTheWorld + +Index : 1 used in the geometry : Yes recalculation needed : No + Material : G4_WATER + Range cuts : gamma 1 mm e- 1 mm e+ 1 mm + Energy thresholds : gamma 2.90186 keV e- 347.138 keV e+ 338.695 keV + Region(s) which use this couple : + DefaultRegionForTheWorld + +==================================================================== + +Start closing geometry. +G4GeometryManager::ReportVoxelStats -- Voxel Statistics + + Total memory consumed for geometry optimisation: 13 kByte + Total CPU time elapsed for geometry optimisation: 0 seconds + + Voxelisation: top CPU users: + Percent Total CPU System CPU Memory Volume + ------- ---------- ---------- -------- ---------- + 0.00 0.00 0.00 3k Phantom + 0.00 0.00 0.00 3k RepY + 0.00 0.00 0.00 7k RepX + + Voxelisation: top memory users: + Percent Memory Heads Nodes Pointers Total CPU Volume + ------- -------- ------ ------ -------- ---------- ---------- + 52.81 7k 1 201 400 0.00 RepX + 23.59 3k 1 100 100 0.00 Phantom + 23.59 3k 1 100 100 0.00 RepY +++ PhantomSD/totalEDep id 0 +++ PhantomSD/protonEDep id 1 +++ PhantomSD/protonNStep id 2 +++ PhantomSD/chargedPassCellFlux id 3 +++ PhantomSD/chargedCellFlux id 4 +++ PhantomSD/chargedSurfFlux id 5 +++ PhantomSD/gammaSurfCurr000 id 6 +++ PhantomSD/gammaSurfCurr001 id 7 +++ PhantomSD/gammaSurfCurr002 id 8 +++ PhantomSD/gammaSurfCurr003 id 9 +### Run 0 start. +Start Run processing. +>>> Event 0 +>>> Event 1 +>>> Event 2 +>>> Event 3 +>>> Event 4 +>>> Event 5 +>>> Event 6 +>>> Event 7 +>>> Event 8 +>>> Event 9 +>>> Event 10 +>>> Event 11 +>>> Event 12 +>>> Event 13 +>>> Event 14 +>>> Event 15 +>>> Event 16 +>>> Event 17 +>>> Event 18 +>>> Event 19 +>>> Event 20 +>>> Event 21 +>>> Event 22 +>>> Event 23 +>>> Event 24 +>>> Event 25 +>>> Event 26 +>>> Event 27 +>>> Event 28 +>>> Event 29 +>>> Event 30 +>>> Event 31 +>>> Event 32 +>>> Event 33 +>>> Event 34 +>>> Event 35 +>>> Event 36 +>>> Event 37 +>>> Event 38 +>>> Event 39 +>>> Event 40 +>>> Event 41 +>>> Event 42 +>>> Event 43 +>>> Event 44 +>>> Event 45 +>>> Event 46 +>>> Event 47 +>>> Event 48 +>>> Event 49 +>>> Event 50 +>>> Event 51 +>>> Event 52 +>>> Event 53 +>>> Event 54 +>>> Event 55 +>>> Event 56 +>>> Event 57 +>>> Event 58 +>>> Event 59 +>>> Event 60 +>>> Event 61 +>>> Event 62 +>>> Event 63 +>>> Event 64 +>>> Event 65 +>>> Event 66 +>>> Event 67 +>>> Event 68 +>>> Event 69 +>>> Event 70 +>>> Event 71 +>>> Event 72 +>>> Event 73 +>>> Event 74 +>>> Event 75 +>>> Event 76 +>>> Event 77 +>>> Event 78 +>>> Event 79 +>>> Event 80 +>>> Event 81 +>>> Event 82 +>>> Event 83 +>>> Event 84 +>>> Event 85 +>>> Event 86 +>>> Event 87 +>>> Event 88 +>>> Event 89 +>>> Event 90 +>>> Event 91 +>>> Event 92 +>>> Event 93 +>>> Event 94 +>>> Event 95 +>>> Event 96 +>>> Event 97 +>>> Event 98 +>>> Event 99 +>>> Event 100 +>>> Event 200 +>>> Event 300 +>>> Event 400 +>>> Event 500 +>>> Event 600 +>>> Event 700 +>>> Event 800 +>>> Event 900 +>>> Event 1000 +>>> Event 1100 +>>> Event 1200 +>>> Event 1300 +>>> Event 1400 +>>> Event 1500 +>>> Event 1600 +>>> Event 1700 +>>> Event 1800 +>>> Event 1900 +>>> Event 2000 +>>> Event 2100 +>>> Event 2200 +>>> Event 2300 +>>> Event 2400 +>>> Event 2500 +>>> Event 2600 +>>> Event 2700 +>>> Event 2800 +>>> Event 2900 +>>> Event 3000 +>>> Event 3100 +>>> Event 3200 +>>> Event 3300 +>>> Event 3400 +>>> Event 3500 +>>> Event 3600 +>>> Event 3700 +>>> Event 3800 +>>> Event 3900 +>>> Event 4000 +>>> Event 4100 +>>> Event 4200 +>>> Event 4300 +>>> Event 4400 +>>> Event 4500 +>>> Event 4600 +>>> Event 4700 +>>> Event 4800 +>>> Event 4900 +>>> Event 5000 +>>> Event 5100 +>>> Event 5200 +>>> Event 5300 +>>> Event 5400 +>>> Event 5500 +>>> Event 5600 +>>> Event 5700 +>>> Event 5800 +>>> Event 5900 +>>> Event 6000 +>>> Event 6100 +>>> Event 6200 +>>> Event 6300 +>>> Event 6400 +>>> Event 6500 +>>> Event 6600 +>>> Event 6700 +>>> Event 6800 +>>> Event 6900 +>>> Event 7000 +>>> Event 7100 +>>> Event 7200 +>>> Event 7300 +>>> Event 7400 +>>> Event 7500 +>>> Event 7600 +>>> Event 7700 +>>> Event 7800 +>>> Event 7900 +>>> Event 8000 +>>> Event 8100 +>>> Event 8200 +>>> Event 8300 +>>> Event 8400 +>>> Event 8500 +>>> Event 8600 +>>> Event 8700 +>>> Event 8800 +>>> Event 8900 +>>> Event 9000 +>>> Event 9100 +>>> Event 9200 +>>> Event 9300 +>>> Event 9400 +>>> Event 9500 +>>> Event 9600 +>>> Event 9700 +>>> Event 9800 +>>> Event 9900 +>>> Event 10000 +>>> Event 10100 +>>> Event 10200 +>>> Event 10300 +>>> Event 10400 +>>> Event 10500 +>>> Event 10600 +>>> Event 10700 +>>> Event 10800 +>>> Event 10900 +>>> Event 11000 +>>> Event 11100 +>>> Event 11200 +>>> Event 11300 +>>> Event 11400 +>>> Event 11500 +>>> Event 11600 +>>> Event 11700 +>>> Event 11800 +>>> Event 11900 +>>> Event 12000 +>>> Event 12100 +>>> Event 12200 +>>> Event 12300 +>>> Event 12400 +>>> Event 12500 +>>> Event 12600 +>>> Event 12700 +>>> Event 12800 +>>> Event 12900 +>>> Event 13000 +>>> Event 13100 +>>> Event 13200 +>>> Event 13300 +>>> Event 13400 +>>> Event 13500 +>>> Event 13600 +>>> Event 13700 +>>> Event 13800 +>>> Event 13900 +>>> Event 14000 +>>> Event 14100 +>>> Event 14200 +>>> Event 14300 +>>> Event 14400 +>>> Event 14500 +>>> Event 14600 +>>> Event 14700 +>>> Event 14800 +>>> Event 14900 +>>> Event 15000 +>>> Event 15100 +>>> Event 15200 +>>> Event 15300 +>>> Event 15400 +>>> Event 15500 +>>> Event 15600 +>>> Event 15700 +>>> Event 15800 +>>> Event 15900 +>>> Event 16000 +>>> Event 16100 +>>> Event 16200 +>>> Event 16300 +>>> Event 16400 +>>> Event 16500 +>>> Event 16600 +>>> Event 16700 +>>> Event 16800 +>>> Event 16900 +>>> Event 17000 +>>> Event 17100 +>>> Event 17200 +>>> Event 17300 +>>> Event 17400 +>>> Event 17500 +>>> Event 17600 +>>> Event 17700 +>>> Event 17800 +>>> Event 17900 +>>> Event 18000 +>>> Event 18100 +>>> Event 18200 +>>> Event 18300 +>>> Event 18400 +>>> Event 18500 +>>> Event 18600 +>>> Event 18700 +>>> Event 18800 +>>> Event 18900 +>>> Event 19000 +>>> Event 19100 +>>> Event 19200 +>>> Event 19300 +>>> Event 19400 +>>> Event 19500 +>>> Event 19600 +>>> Event 19700 +>>> Event 19800 +>>> Event 19900 +>>> Event 20000 +>>> Event 20100 +>>> Event 20200 +>>> Event 20300 +>>> Event 20400 +>>> Event 20500 +>>> Event 20600 +>>> Event 20700 +>>> Event 20800 +>>> Event 20900 +>>> Event 21000 +>>> Event 21100 +>>> Event 21200 +>>> Event 21300 +>>> Event 21400 +>>> Event 21500 +>>> Event 21600 +>>> Event 21700 +>>> Event 21800 +>>> Event 21900 +>>> Event 22000 +>>> Event 22100 +>>> Event 22200 +>>> Event 22300 +>>> Event 22400 +>>> Event 22500 +>>> Event 22600 +>>> Event 22700 +>>> Event 22800 +>>> Event 22900 +>>> Event 23000 +>>> Event 23100 +>>> Event 23200 +>>> Event 23300 +>>> Event 23400 +>>> Event 23500 +>>> Event 23600 +>>> Event 23700 +>>> Event 23800 +>>> Event 23900 +>>> Event 24000 +>>> Event 24100 +>>> Event 24200 +>>> Event 24300 +>>> Event 24400 +>>> Event 24500 +>>> Event 24600 +>>> Event 24700 +>>> Event 24800 +>>> Event 24900 +>>> Event 25000 +>>> Event 25100 +>>> Event 25200 +>>> Event 25300 +>>> Event 25400 +>>> Event 25500 +>>> Event 25600 +>>> Event 25700 +>>> Event 25800 +>>> Event 25900 +>>> Event 26000 +>>> Event 26100 +>>> Event 26200 +>>> Event 26300 +>>> Event 26400 +>>> Event 26500 +>>> Event 26600 +>>> Event 26700 +>>> Event 26800 +>>> Event 26900 +>>> Event 27000 +>>> Event 27100 +>>> Event 27200 +>>> Event 27300 +>>> Event 27400 +>>> Event 27500 +>>> Event 27600 +>>> Event 27700 +>>> Event 27800 +>>> Event 27900 +>>> Event 28000 +>>> Event 28100 +>>> Event 28200 +>>> Event 28300 +>>> Event 28400 +>>> Event 28500 +>>> Event 28600 +>>> Event 28700 +>>> Event 28800 +>>> Event 28900 +>>> Event 29000 +>>> Event 29100 +>>> Event 29200 +>>> Event 29300 +>>> Event 29400 +>>> Event 29500 +>>> Event 29600 +>>> Event 29700 +>>> Event 29800 +>>> Event 29900 +>>> Event 30000 +>>> Event 30100 +>>> Event 30200 +>>> Event 30300 +>>> Event 30400 +>>> Event 30500 +>>> Event 30600 +>>> Event 30700 +>>> Event 30800 +>>> Event 30900 +>>> Event 31000 +>>> Event 31100 +>>> Event 31200 +>>> Event 31300 +>>> Event 31400 +>>> Event 31500 +>>> Event 31600 +>>> Event 31700 +>>> Event 31800 +>>> Event 31900 +>>> Event 32000 +>>> Event 32100 +>>> Event 32200 +>>> Event 32300 +>>> Event 32400 +>>> Event 32500 +>>> Event 32600 +>>> Event 32700 +>>> Event 32800 +>>> Event 32900 +>>> Event 33000 +>>> Event 33100 +>>> Event 33200 +>>> Event 33300 +>>> Event 33400 +>>> Event 33500 +>>> Event 33600 +>>> Event 33700 +>>> Event 33800 +>>> Event 33900 +>>> Event 34000 +>>> Event 34100 +>>> Event 34200 +>>> Event 34300 +>>> Event 34400 +>>> Event 34500 +>>> Event 34600 +>>> Event 34700 +>>> Event 34800 +>>> Event 34900 +>>> Event 35000 +>>> Event 35100 +>>> Event 35200 +>>> Event 35300 +>>> Event 35400 +>>> Event 35500 +>>> Event 35600 +>>> Event 35700 +>>> Event 35800 +>>> Event 35900 +>>> Event 36000 +>>> Event 36100 +>>> Event 36200 +>>> Event 36300 +>>> Event 36400 +>>> Event 36500 +>>> Event 36600 +>>> Event 36700 +>>> Event 36800 +>>> Event 36900 +>>> Event 37000 +>>> Event 37100 +>>> Event 37200 +>>> Event 37300 +>>> Event 37400 +>>> Event 37500 +>>> Event 37600 +>>> Event 37700 +>>> Event 37800 +>>> Event 37900 +>>> Event 38000 +>>> Event 38100 +>>> Event 38200 +>>> Event 38300 +>>> Event 38400 +>>> Event 38500 +>>> Event 38600 +>>> Event 38700 +>>> Event 38800 +>>> Event 38900 +>>> Event 39000 +>>> Event 39100 +>>> Event 39200 +>>> Event 39300 +>>> Event 39400 +>>> Event 39500 +>>> Event 39600 +>>> Event 39700 +>>> Event 39800 +>>> Event 39900 +>>> Event 40000 +>>> Event 40100 +>>> Event 40200 +>>> Event 40300 +>>> Event 40400 +>>> Event 40500 +>>> Event 40600 +>>> Event 40700 +>>> Event 40800 +>>> Event 40900 +>>> Event 41000 +>>> Event 41100 +>>> Event 41200 +>>> Event 41300 +>>> Event 41400 +>>> Event 41500 +>>> Event 41600 +>>> Event 41700 +>>> Event 41800 +>>> Event 41900 +>>> Event 42000 +>>> Event 42100 +>>> Event 42200 +>>> Event 42300 +>>> Event 42400 +>>> Event 42500 +>>> Event 42600 +>>> Event 42700 +>>> Event 42800 +>>> Event 42900 +>>> Event 43000 +>>> Event 43100 +>>> Event 43200 +>>> Event 43300 +>>> Event 43400 +>>> Event 43500 +>>> Event 43600 +>>> Event 43700 +>>> Event 43800 +>>> Event 43900 +>>> Event 44000 +>>> Event 44100 +>>> Event 44200 +>>> Event 44300 +>>> Event 44400 +>>> Event 44500 +>>> Event 44600 +>>> Event 44700 +>>> Event 44800 +>>> Event 44900 +>>> Event 45000 +>>> Event 45100 +>>> Event 45200 +>>> Event 45300 +>>> Event 45400 +>>> Event 45500 +>>> Event 45600 +>>> Event 45700 +>>> Event 45800 +>>> Event 45900 +>>> Event 46000 +>>> Event 46100 +>>> Event 46200 +>>> Event 46300 +>>> Event 46400 +>>> Event 46500 +>>> Event 46600 +>>> Event 46700 +>>> Event 46800 +>>> Event 46900 +>>> Event 47000 +>>> Event 47100 +>>> Event 47200 +>>> Event 47300 +>>> Event 47400 +>>> Event 47500 +>>> Event 47600 +>>> Event 47700 +>>> Event 47800 +>>> Event 47900 +>>> Event 48000 +>>> Event 48100 +>>> Event 48200 +>>> Event 48300 +>>> Event 48400 +>>> Event 48500 +>>> Event 48600 +>>> Event 48700 +>>> Event 48800 +>>> Event 48900 +>>> Event 49000 +>>> Event 49100 +>>> Event 49200 +>>> Event 49300 +>>> Event 49400 +>>> Event 49500 +>>> Event 49600 +>>> Event 49700 +>>> Event 49800 +>>> Event 49900 +>>> Event 50000 +>>> Event 50100 +>>> Event 50200 +>>> Event 50300 +>>> Event 50400 +>>> Event 50500 +>>> Event 50600 +>>> Event 50700 +>>> Event 50800 +>>> Event 50900 +>>> Event 51000 +>>> Event 51100 +>>> Event 51200 +>>> Event 51300 +>>> Event 51400 +>>> Event 51500 +>>> Event 51600 +>>> Event 51700 +>>> Event 51800 +>>> Event 51900 +>>> Event 52000 +>>> Event 52100 +>>> Event 52200 +>>> Event 52300 +>>> Event 52400 +>>> Event 52500 +>>> Event 52600 +>>> Event 52700 +>>> Event 52800 +>>> Event 52900 +>>> Event 53000 +>>> Event 53100 +>>> Event 53200 +>>> Event 53300 +>>> Event 53400 +>>> Event 53500 +>>> Event 53600 +>>> Event 53700 +>>> Event 53800 +>>> Event 53900 +>>> Event 54000 +>>> Event 54100 +>>> Event 54200 +>>> Event 54300 +>>> Event 54400 +>>> Event 54500 +>>> Event 54600 +>>> Event 54700 +>>> Event 54800 +>>> Event 54900 +>>> Event 55000 +>>> Event 55100 +>>> Event 55200 +>>> Event 55300 +>>> Event 55400 +>>> Event 55500 +>>> Event 55600 +>>> Event 55700 +>>> Event 55800 +>>> Event 55900 +>>> Event 56000 +>>> Event 56100 +>>> Event 56200 +>>> Event 56300 +>>> Event 56400 +>>> Event 56500 +>>> Event 56600 +>>> Event 56700 +>>> Event 56800 +>>> Event 56900 +>>> Event 57000 +>>> Event 57100 +>>> Event 57200 +>>> Event 57300 +>>> Event 57400 +>>> Event 57500 +>>> Event 57600 +>>> Event 57700 +>>> Event 57800 +>>> Event 57900 +>>> Event 58000 +>>> Event 58100 +>>> Event 58200 +>>> Event 58300 +>>> Event 58400 +>>> Event 58500 +>>> Event 58600 +>>> Event 58700 +>>> Event 58800 +>>> Event 58900 +>>> Event 59000 +>>> Event 59100 +>>> Event 59200 +>>> Event 59300 +>>> Event 59400 +>>> Event 59500 +>>> Event 59600 +>>> Event 59700 +>>> Event 59800 +>>> Event 59900 +>>> Event 60000 +>>> Event 60100 +>>> Event 60200 +>>> Event 60300 +>>> Event 60400 +>>> Event 60500 +>>> Event 60600 +>>> Event 60700 +>>> Event 60800 +>>> Event 60900 +>>> Event 61000 +>>> Event 61100 +>>> Event 61200 +>>> Event 61300 +>>> Event 61400 +>>> Event 61500 +>>> Event 61600 +>>> Event 61700 +>>> Event 61800 +>>> Event 61900 +>>> Event 62000 +>>> Event 62100 +>>> Event 62200 +>>> Event 62300 +>>> Event 62400 +>>> Event 62500 +>>> Event 62600 +>>> Event 62700 +>>> Event 62800 +>>> Event 62900 +>>> Event 63000 +>>> Event 63100 +>>> Event 63200 +>>> Event 63300 +>>> Event 63400 +>>> Event 63500 +>>> Event 63600 +>>> Event 63700 +>>> Event 63800 +>>> Event 63900 +>>> Event 64000 +>>> Event 64100 +>>> Event 64200 +>>> Event 64300 +>>> Event 64400 +>>> Event 64500 +>>> Event 64600 +>>> Event 64700 +>>> Event 64800 +>>> Event 64900 +>>> Event 65000 +>>> Event 65100 +>>> Event 65200 +>>> Event 65300 +>>> Event 65400 +>>> Event 65500 +>>> Event 65600 +>>> Event 65700 +>>> Event 65800 +>>> Event 65900 +>>> Event 66000 +>>> Event 66100 +>>> Event 66200 +>>> Event 66300 +>>> Event 66400 +>>> Event 66500 +>>> Event 66600 +>>> Event 66700 +>>> Event 66800 +>>> Event 66900 +>>> Event 67000 +>>> Event 67100 +>>> Event 67200 +>>> Event 67300 +>>> Event 67400 +>>> Event 67500 +>>> Event 67600 +>>> Event 67700 +>>> Event 67800 +>>> Event 67900 +>>> Event 68000 +>>> Event 68100 +>>> Event 68200 +>>> Event 68300 +>>> Event 68400 +>>> Event 68500 +>>> Event 68600 +>>> Event 68700 +>>> Event 68800 +>>> Event 68900 +>>> Event 69000 +>>> Event 69100 +>>> Event 69200 +>>> Event 69300 +>>> Event 69400 +>>> Event 69500 +>>> Event 69600 +>>> Event 69700 +>>> Event 69800 +>>> Event 69900 +>>> Event 70000 +>>> Event 70100 +>>> Event 70200 +>>> Event 70300 +>>> Event 70400 +>>> Event 70500 +>>> Event 70600 +>>> Event 70700 +>>> Event 70800 +>>> Event 70900 +>>> Event 71000 +>>> Event 71100 +>>> Event 71200 +>>> Event 71300 +>>> Event 71400 +>>> Event 71500 +>>> Event 71600 +>>> Event 71700 +>>> Event 71800 +>>> Event 71900 +>>> Event 72000 +>>> Event 72100 +>>> Event 72200 +>>> Event 72300 +>>> Event 72400 +>>> Event 72500 +>>> Event 72600 +>>> Event 72700 +>>> Event 72800 +>>> Event 72900 +>>> Event 73000 +>>> Event 73100 +>>> Event 73200 +>>> Event 73300 +>>> Event 73400 +>>> Event 73500 +>>> Event 73600 +>>> Event 73700 +>>> Event 73800 +>>> Event 73900 +>>> Event 74000 +>>> Event 74100 +>>> Event 74200 +>>> Event 74300 +>>> Event 74400 +>>> Event 74500 +>>> Event 74600 +>>> Event 74700 +>>> Event 74800 +>>> Event 74900 +>>> Event 75000 +>>> Event 75100 +>>> Event 75200 +>>> Event 75300 +>>> Event 75400 +>>> Event 75500 +>>> Event 75600 +>>> Event 75700 +>>> Event 75800 +>>> Event 75900 +>>> Event 76000 +>>> Event 76100 +>>> Event 76200 +>>> Event 76300 +>>> Event 76400 +>>> Event 76500 +>>> Event 76600 +>>> Event 76700 +>>> Event 76800 +>>> Event 76900 +>>> Event 77000 +>>> Event 77100 +>>> Event 77200 +>>> Event 77300 +>>> Event 77400 +>>> Event 77500 +>>> Event 77600 +>>> Event 77700 +>>> Event 77800 +>>> Event 77900 +>>> Event 78000 +>>> Event 78100 +>>> Event 78200 +>>> Event 78300 +>>> Event 78400 +>>> Event 78500 +>>> Event 78600 +>>> Event 78700 +>>> Event 78800 +>>> Event 78900 +>>> Event 79000 +>>> Event 79100 +>>> Event 79200 +>>> Event 79300 +>>> Event 79400 +>>> Event 79500 +>>> Event 79600 +>>> Event 79700 +>>> Event 79800 +>>> Event 79900 +>>> Event 80000 +>>> Event 80100 +>>> Event 80200 +>>> Event 80300 +>>> Event 80400 +>>> Event 80500 +>>> Event 80600 +>>> Event 80700 +>>> Event 80800 +>>> Event 80900 +>>> Event 81000 +>>> Event 81100 +>>> Event 81200 +>>> Event 81300 +>>> Event 81400 +>>> Event 81500 +>>> Event 81600 +>>> Event 81700 +>>> Event 81800 +>>> Event 81900 +>>> Event 82000 +>>> Event 82100 +>>> Event 82200 +>>> Event 82300 +>>> Event 82400 +>>> Event 82500 +>>> Event 82600 +>>> Event 82700 +>>> Event 82800 +>>> Event 82900 +>>> Event 83000 +>>> Event 83100 +>>> Event 83200 +>>> Event 83300 +>>> Event 83400 +>>> Event 83500 +>>> Event 83600 +>>> Event 83700 +>>> Event 83800 +>>> Event 83900 +>>> Event 84000 +>>> Event 84100 +>>> Event 84200 +>>> Event 84300 +>>> Event 84400 +>>> Event 84500 +>>> Event 84600 +>>> Event 84700 +>>> Event 84800 +>>> Event 84900 +>>> Event 85000 +>>> Event 85100 +>>> Event 85200 +>>> Event 85300 +>>> Event 85400 +>>> Event 85500 +>>> Event 85600 +>>> Event 85700 +>>> Event 85800 +>>> Event 85900 +>>> Event 86000 +>>> Event 86100 +>>> Event 86200 +>>> Event 86300 +>>> Event 86400 +>>> Event 86500 +>>> Event 86600 +>>> Event 86700 +>>> Event 86800 +>>> Event 86900 +>>> Event 87000 +>>> Event 87100 +>>> Event 87200 +>>> Event 87300 +>>> Event 87400 +>>> Event 87500 +>>> Event 87600 +>>> Event 87700 +>>> Event 87800 +>>> Event 87900 +>>> Event 88000 +>>> Event 88100 +>>> Event 88200 +>>> Event 88300 +>>> Event 88400 +>>> Event 88500 +>>> Event 88600 +>>> Event 88700 +>>> Event 88800 +>>> Event 88900 +>>> Event 89000 +>>> Event 89100 +>>> Event 89200 +>>> Event 89300 +>>> Event 89400 +>>> Event 89500 +>>> Event 89600 +>>> Event 89700 +>>> Event 89800 +>>> Event 89900 +>>> Event 90000 +>>> Event 90100 +>>> Event 90200 +>>> Event 90300 +>>> Event 90400 +>>> Event 90500 +>>> Event 90600 +>>> Event 90700 +>>> Event 90800 +>>> Event 90900 +>>> Event 91000 +>>> Event 91100 +>>> Event 91200 +>>> Event 91300 +>>> Event 91400 +>>> Event 91500 +>>> Event 91600 +>>> Event 91700 +>>> Event 91800 +>>> Event 91900 +>>> Event 92000 +>>> Event 92100 +>>> Event 92200 +>>> Event 92300 +>>> Event 92400 +>>> Event 92500 +>>> Event 92600 +>>> Event 92700 +>>> Event 92800 +>>> Event 92900 +>>> Event 93000 +>>> Event 93100 +>>> Event 93200 +>>> Event 93300 +>>> Event 93400 +>>> Event 93500 +>>> Event 93600 +>>> Event 93700 +>>> Event 93800 +>>> Event 93900 +>>> Event 94000 +>>> Event 94100 +>>> Event 94200 +>>> Event 94300 +>>> Event 94400 +>>> Event 94500 +>>> Event 94600 +>>> Event 94700 +>>> Event 94800 +>>> Event 94900 +>>> Event 95000 +>>> Event 95100 +>>> Event 95200 +>>> Event 95300 +>>> Event 95400 +>>> Event 95500 +>>> Event 95600 +>>> Event 95700 +>>> Event 95800 +>>> Event 95900 +>>> Event 96000 +>>> Event 96100 +>>> Event 96200 +>>> Event 96300 +>>> Event 96400 +>>> Event 96500 +>>> Event 96600 +>>> Event 96700 +>>> Event 96800 +>>> Event 96900 +>>> Event 97000 +>>> Event 97100 +>>> Event 97200 +>>> Event 97300 +>>> Event 97400 +>>> Event 97500 +>>> Event 97600 +>>> Event 97700 +>>> Event 97800 +>>> Event 97900 +>>> Event 98000 +>>> Event 98100 +>>> Event 98200 +>>> Event 98300 +>>> Event 98400 +>>> Event 98500 +>>> Event 98600 +>>> Event 98700 +>>> Event 98800 +>>> Event 98900 +>>> Event 99000 +>>> Event 99100 +>>> Event 99200 +>>> Event 99300 +>>> Event 99400 +>>> Event 99500 +>>> Event 99600 +>>> Event 99700 +>>> Event 99800 +>>> Event 99900 +Run terminated. +Run Summary + Number of events processed : 100000 + User=1071.82s Real=1073.72s Sys=0.32s +============================================================= + Number of event processed : 100000 +============================================================= +#Z Cell# totalEDep protonEDep protonNStep chargedPassCellFlux chargedCellFlux chargedSurfFlux gammaSurfCurr000 gammaSurfCurr001 gammaSurfCurr002 gammaSurfCurr003 + 0 4.5463234 GeV 4.5270559 GeV 16497 102541 /cm2 102783.01 /cm2 105436.85 /cm2 0 /cm2 0 /cm2 0 /cm2 175 /cm2 + 1 4.579859 GeV 4.5578584 GeV 16599 102110.73 /cm2 102437.99 /cm2 102590.11 /cm2 0 /cm2 0 /cm2 50 /cm2 300 /cm2 + 2 4.6207139 GeV 4.5946597 GeV 16612 102211.04 /cm2 102459.58 /cm2 102276.91 /cm2 0 /cm2 0 /cm2 25 /cm2 275 /cm2 + 3 4.7024521 GeV 4.6602993 GeV 16649 102145.11 /cm2 102387 /cm2 102754.09 /cm2 0 /cm2 0 /cm2 25 /cm2 375 /cm2 + 4 4.7317199 GeV 4.7024236 GeV 16608 101845.52 /cm2 102156.01 /cm2 102119.64 /cm2 0 /cm2 25 /cm2 25 /cm2 425 /cm2 + 5 4.7132983 GeV 4.6846087 GeV 16705 101779.69 /cm2 101975.11 /cm2 101872.98 /cm2 0 /cm2 0 /cm2 50 /cm2 275 /cm2 + 6 4.786194 GeV 4.7235229 GeV 16662 101601.97 /cm2 102002.25 /cm2 102213.36 /cm2 0 /cm2 0 /cm2 75 /cm2 325 /cm2 + 7 4.7649479 GeV 4.7284626 GeV 16694 101722.09 /cm2 101921.95 /cm2 101749.54 /cm2 0 /cm2 0 /cm2 50 /cm2 425 /cm2 + 8 4.7242448 GeV 4.6854513 GeV 16533 100673.51 /cm2 100910.63 /cm2 101220.25 /cm2 25 /cm2 0 /cm2 200 /cm2 400 /cm2 + 9 4.7720656 GeV 4.7331302 GeV 16525 100150.92 /cm2 100408.79 /cm2 101031.37 /cm2 25 /cm2 0 /cm2 75 /cm2 450 /cm2 + 10 4.7631562 GeV 4.7283644 GeV 16424 99832.604 /cm2 100012.63 /cm2 100243.34 /cm2 0 /cm2 25 /cm2 100 /cm2 525 /cm2 + 11 4.78153 GeV 4.7262044 GeV 16373 99037.619 /cm2 99407.243 /cm2 99684.268 /cm2 0 /cm2 25 /cm2 50 /cm2 525 /cm2 + 12 4.7936279 GeV 4.745351 GeV 16263 98510.633 /cm2 98908.884 /cm2 99310.488 /cm2 0 /cm2 0 /cm2 50 /cm2 450 /cm2 + 13 4.7642854 GeV 4.7355509 GeV 16244 98105.508 /cm2 98411.708 /cm2 98508.486 /cm2 0 /cm2 25 /cm2 25 /cm2 500 /cm2 + 14 4.7208912 GeV 4.7140313 GeV 16199 98144.704 /cm2 98199.568 /cm2 98142.978 /cm2 0 /cm2 0 /cm2 50 /cm2 500 /cm2 + 15 4.8131335 GeV 4.7789661 GeV 16225 98047.448 /cm2 98292.939 /cm2 98133.729 /cm2 0 /cm2 0 /cm2 50 /cm2 400 /cm2 + 16 4.8900971 GeV 4.8437003 GeV 16279 98153.203 /cm2 98537.323 /cm2 98383.327 /cm2 0 /cm2 0 /cm2 25 /cm2 775 /cm2 + 17 4.8429209 GeV 4.8259952 GeV 16281 98153.678 /cm2 98278.347 /cm2 98501.402 /cm2 0 /cm2 0 /cm2 50 /cm2 600 /cm2 + 18 4.8652799 GeV 4.8378737 GeV 16222 97765.3 /cm2 97931.158 /cm2 98154.049 /cm2 0 /cm2 25 /cm2 25 /cm2 500 /cm2 + 19 4.8590049 GeV 4.829123 GeV 16129 96984.712 /cm2 97290.409 /cm2 98137.498 /cm2 0 /cm2 0 /cm2 75 /cm2 425 /cm2 + 20 4.8647416 GeV 4.8241236 GeV 16008 96150.242 /cm2 96416.241 /cm2 96507.055 /cm2 0 /cm2 0 /cm2 75 /cm2 425 /cm2 + 21 4.886006 GeV 4.83719 GeV 15974 95854.519 /cm2 96103.015 /cm2 96208.74 /cm2 0 /cm2 25 /cm2 25 /cm2 500 /cm2 + 22 4.9611786 GeV 4.9372687 GeV 15949 95798.57 /cm2 96034.913 /cm2 96137.004 /cm2 0 /cm2 0 /cm2 125 /cm2 400 /cm2 + 23 4.9472896 GeV 4.8998927 GeV 15874 95379.113 /cm2 95649.307 /cm2 95714.312 /cm2 0 /cm2 0 /cm2 50 /cm2 500 /cm2 + 24 5.0016311 GeV 4.9390579 GeV 15832 95119.954 /cm2 95489.927 /cm2 95363.881 /cm2 0 /cm2 0 /cm2 75 /cm2 700 /cm2 + 25 5.0034432 GeV 4.9656818 GeV 15859 94700.036 /cm2 94934.964 /cm2 95312.48 /cm2 0 /cm2 0 /cm2 75 /cm2 500 /cm2 + 26 5.027096 GeV 4.9999615 GeV 15772 94830.828 /cm2 95021.184 /cm2 94965.22 /cm2 25 /cm2 0 /cm2 150 /cm2 500 /cm2 + 27 5.0034201 GeV 4.962299 GeV 15711 93829.168 /cm2 94020.461 /cm2 94832.862 /cm2 25 /cm2 0 /cm2 125 /cm2 500 /cm2 + 28 5.0526195 GeV 5.0084422 GeV 15610 92994.501 /cm2 93409.901 /cm2 93619.137 /cm2 0 /cm2 0 /cm2 50 /cm2 650 /cm2 + 29 4.984659 GeV 4.9655233 GeV 15351 92170.618 /cm2 92335.958 /cm2 92945.163 /cm2 0 /cm2 0 /cm2 125 /cm2 450 /cm2 + 30 4.9852395 GeV 4.9756573 GeV 15299 91440.087 /cm2 91562.571 /cm2 92043.208 /cm2 0 /cm2 0 /cm2 125 /cm2 450 /cm2 + 31 5.0002576 GeV 4.9664439 GeV 15220 90873.288 /cm2 91116.125 /cm2 91288.958 /cm2 0 /cm2 0 /cm2 75 /cm2 250 /cm2 + 32 5.0446705 GeV 4.982814 GeV 15197 90573.757 /cm2 90803.54 /cm2 90943.38 /cm2 0 /cm2 0 /cm2 75 /cm2 325 /cm2 + 33 4.9598805 GeV 4.9374417 GeV 15040 89302.853 /cm2 89475.417 /cm2 89882.065 /cm2 0 /cm2 0 /cm2 150 /cm2 325 /cm2 + 34 5.0295563 GeV 5.0167692 GeV 15060 89408.722 /cm2 89554.632 /cm2 89592.425 /cm2 0 /cm2 0 /cm2 75 /cm2 400 /cm2 + 35 5.1270452 GeV 5.0973706 GeV 14949 88905.342 /cm2 89248.454 /cm2 89429.517 /cm2 0 /cm2 50 /cm2 125 /cm2 400 /cm2 + 36 5.1661012 GeV 5.1073947 GeV 14877 88403.936 /cm2 88772.958 /cm2 89166.416 /cm2 0 /cm2 0 /cm2 100 /cm2 600 /cm2 + 37 5.1757361 GeV 5.1198213 GeV 14824 87988.301 /cm2 88294.357 /cm2 88394.428 /cm2 0 /cm2 50 /cm2 75 /cm2 450 /cm2 + 38 5.1064808 GeV 5.0795881 GeV 14762 87538.604 /cm2 87684.384 /cm2 88073.668 /cm2 0 /cm2 0 /cm2 100 /cm2 450 /cm2 + 39 5.1594869 GeV 5.1293598 GeV 14693 87365.325 /cm2 87601.596 /cm2 87124.761 /cm2 0 /cm2 25 /cm2 100 /cm2 500 /cm2 + 40 5.2501841 GeV 5.2077224 GeV 14693 86740.387 /cm2 87108.91 /cm2 87918.134 /cm2 0 /cm2 0 /cm2 150 /cm2 700 /cm2 + 41 5.2315437 GeV 5.2091604 GeV 14639 86513.023 /cm2 86700.735 /cm2 86831.634 /cm2 0 /cm2 0 /cm2 50 /cm2 425 /cm2 + 42 5.322301 GeV 5.2911043 GeV 14645 86558.539 /cm2 86746.353 /cm2 86641.872 /cm2 25 /cm2 0 /cm2 125 /cm2 325 /cm2 + 43 5.3895461 GeV 5.3755959 GeV 14575 86481.492 /cm2 86736.301 /cm2 86872.51 /cm2 0 /cm2 0 /cm2 100 /cm2 600 /cm2 + 44 5.3670357 GeV 5.3408558 GeV 14448 85400.345 /cm2 85580.604 /cm2 86111.45 /cm2 0 /cm2 0 /cm2 100 /cm2 475 /cm2 + 45 5.3783249 GeV 5.3507092 GeV 14270 84316.13 /cm2 84580.938 /cm2 85189.461 /cm2 0 /cm2 25 /cm2 200 /cm2 650 /cm2 + 46 5.498884 GeV 5.4093389 GeV 14188 83508.992 /cm2 83834.508 /cm2 84277.087 /cm2 0 /cm2 0 /cm2 125 /cm2 450 /cm2 + 47 5.3687734 GeV 5.3581739 GeV 14024 82620.915 /cm2 82711.029 /cm2 83133.553 /cm2 25 /cm2 0 /cm2 75 /cm2 475 /cm2 + 48 5.4250763 GeV 5.3918042 GeV 13879 81589.721 /cm2 81832.729 /cm2 82295.478 /cm2 0 /cm2 0 /cm2 150 /cm2 475 /cm2 + 49 5.5314792 GeV 5.4365136 GeV 13675 80444.772 /cm2 80857.699 /cm2 81558.606 /cm2 0 /cm2 0 /cm2 75 /cm2 575 /cm2 + 50 5.4380716 GeV 5.4161468 GeV 13544 79843.074 /cm2 79987.872 /cm2 80796.711 /cm2 0 /cm2 0 /cm2 75 /cm2 500 /cm2 + 51 5.4517914 GeV 5.4296767 GeV 13481 79404.527 /cm2 79572.342 /cm2 79668.044 /cm2 0 /cm2 25 /cm2 125 /cm2 500 /cm2 + 52 5.491031 GeV 5.4769426 GeV 13406 79092.611 /cm2 79163.714 /cm2 79112.698 /cm2 0 /cm2 0 /cm2 125 /cm2 550 /cm2 + 53 5.5080432 GeV 5.4906799 GeV 13299 78422.964 /cm2 78483.128 /cm2 79013.372 /cm2 0 /cm2 0 /cm2 75 /cm2 275 /cm2 + 54 5.6263697 GeV 5.5771422 GeV 13137 77359.644 /cm2 77602.607 /cm2 77707.097 /cm2 0 /cm2 0 /cm2 125 /cm2 500 /cm2 + 55 5.5646203 GeV 5.5394021 GeV 12921 75666.42 /cm2 75825.971 /cm2 77066.345 /cm2 0 /cm2 25 /cm2 75 /cm2 550 /cm2 + 56 5.6650587 GeV 5.5966849 GeV 12754 74354.712 /cm2 74596.178 /cm2 74930.136 /cm2 0 /cm2 0 /cm2 50 /cm2 600 /cm2 + 57 5.70691 GeV 5.6527553 GeV 12579 73410.954 /cm2 73701.236 /cm2 74337.066 /cm2 0 /cm2 0 /cm2 50 /cm2 600 /cm2 + 58 5.7569233 GeV 5.6944468 GeV 12404 72347.327 /cm2 72601.615 /cm2 72939.599 /cm2 0 /cm2 25 /cm2 100 /cm2 725 /cm2 + 59 5.6673263 GeV 5.6320683 GeV 12207 70542.259 /cm2 70771.818 /cm2 71888.422 /cm2 0 /cm2 0 /cm2 50 /cm2 600 /cm2 + 60 5.676944 GeV 5.6594202 GeV 11957 69718.302 /cm2 69878.421 /cm2 70238.033 /cm2 0 /cm2 0 /cm2 50 /cm2 500 /cm2 + 61 5.8114018 GeV 5.7869438 GeV 11869 69285.033 /cm2 69468.247 /cm2 69807.204 /cm2 25 /cm2 0 /cm2 75 /cm2 325 /cm2 + 62 5.8514431 GeV 5.8150504 GeV 11779 67978.928 /cm2 68089.89 /cm2 68869.596 /cm2 0 /cm2 0 /cm2 25 /cm2 500 /cm2 + 63 6.043851 GeV 5.9813429 GeV 11524 66708.13 /cm2 67050.291 /cm2 67650.124 /cm2 0 /cm2 25 /cm2 75 /cm2 450 /cm2 + 64 5.9893202 GeV 5.9392686 GeV 11115 64690.295 /cm2 65006.11 /cm2 65475.393 /cm2 0 /cm2 25 /cm2 50 /cm2 475 /cm2 + 65 6.05494 GeV 5.9875409 GeV 10915 63136.816 /cm2 63412.489 /cm2 64047.42 /cm2 0 /cm2 0 /cm2 100 /cm2 550 /cm2 + 66 6.1133085 GeV 6.0937578 GeV 10703 62344.641 /cm2 62514.594 /cm2 63003.373 /cm2 0 /cm2 0 /cm2 75 /cm2 500 /cm2 + 67 6.2241153 GeV 6.207202 GeV 10577 61359.323 /cm2 61511.59 /cm2 62034.533 /cm2 0 /cm2 0 /cm2 75 /cm2 600 /cm2 + 68 6.396521 GeV 6.3867341 GeV 10339 60334.358 /cm2 60563.913 /cm2 61037.931 /cm2 0 /cm2 0 /cm2 50 /cm2 450 /cm2 + 69 6.5141166 GeV 6.4849642 GeV 10129 58482.426 /cm2 58713.855 /cm2 59535.307 /cm2 0 /cm2 0 /cm2 50 /cm2 350 /cm2 + 70 6.6494894 GeV 6.6257603 GeV 9755 56838.05 /cm2 57010.749 /cm2 57940.069 /cm2 0 /cm2 0 /cm2 25 /cm2 575 /cm2 + 71 6.9292634 GeV 6.8808265 GeV 9633 55383.747 /cm2 55656.413 /cm2 55836.54 /cm2 0 /cm2 0 /cm2 25 /cm2 650 /cm2 + 72 7.2601949 GeV 7.1850005 GeV 9360 53818.192 /cm2 54139.475 /cm2 55126.415 /cm2 25 /cm2 25 /cm2 75 /cm2 400 /cm2 + 73 7.5558893 GeV 7.5211853 GeV 9095 52304.448 /cm2 52460.271 /cm2 52981.125 /cm2 0 /cm2 25 /cm2 100 /cm2 325 /cm2 + 74 8.1445461 GeV 8.1253295 GeV 8848 50794.934 /cm2 50978.612 /cm2 51694.886 /cm2 25 /cm2 0 /cm2 25 /cm2 500 /cm2 + 75 9.0778138 GeV 9.0597637 GeV 8687 49266.681 /cm2 49479.369 /cm2 50254.896 /cm2 0 /cm2 0 /cm2 0 /cm2 550 /cm2 + 76 10.746845 GeV 10.736402 GeV 8306 45821.079 /cm2 46881.872 /cm2 48408.581 /cm2 0 /cm2 0 /cm2 0 /cm2 650 /cm2 + 77 13.540122 GeV 13.527346 GeV 7412 35498.385 /cm2 41302.421 /cm2 45277.051 /cm2 0 /cm2 0 /cm2 0 /cm2 625 /cm2 + 78 11.760942 GeV 11.758231 GeV 4601 13484.38 /cm2 24271.844 /cm2 34858.143 /cm2 0 /cm2 0 /cm2 0 /cm2 400 /cm2 + 79 3.8060548 GeV 3.805476 GeV 1176 1511.5219 /cm2 5855.4584 /cm2 12975.427 /cm2 0 /cm2 0 /cm2 0 /cm2 225 /cm2 + 80 305.8384 MeV 302.45386 MeV 84 35.977998 /cm2 373.93772 /cm2 1338.8638 /cm2 0 /cm2 0 /cm2 0 /cm2 250 /cm2 + 81 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 200 /cm2 + 82 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 200 /cm2 + 83 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 350 /cm2 + 84 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 200 /cm2 + 85 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 125 /cm2 + 86 364.29509 keV 0 eV 0 0 /cm2 13.735391 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 175 /cm2 + 87 476.84715 keV 0 eV 0 25.116192 /cm2 25.116192 /cm2 25.047659 /cm2 0 /cm2 0 /cm2 0 /cm2 100 /cm2 + 88 394.80155 keV 0 eV 0 25.090676 /cm2 25.090676 /cm2 25.03341 /cm2 0 /cm2 25 /cm2 25 /cm2 125 /cm2 + 89 296.80566 keV 0 eV 0 25.089035 /cm2 25.089035 /cm2 25.244452 /cm2 0 /cm2 0 /cm2 75 /cm2 75 /cm2 + 90 301.05091 keV 0 eV 0 25.043603 /cm2 25.043603 /cm2 25.034695 /cm2 0 /cm2 0 /cm2 25 /cm2 25 /cm2 + 91 366.52166 keV 0 eV 0 25.617929 /cm2 25.617929 /cm2 25.070528 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 92 332.75323 keV 0 eV 0 27.5887 /cm2 27.5887 /cm2 28.248648 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 + 93 252.30289 keV 0 eV 0 17.037316 /cm2 17.037316 /cm2 26.80276 /cm2 0 /cm2 0 /cm2 75 /cm2 50 /cm2 + 94 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 25 /cm2 + 95 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 25 /cm2 + 96 6.8653197 MeV 6.8653197 MeV 4 14.92179 /cm2 14.92179 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 25 /cm2 + 97 4.1299662 MeV 4.1299662 MeV 3 0 /cm2 3.3021152 /cm2 72.096437 /cm2 0 /cm2 0 /cm2 25 /cm2 25 /cm2 + 98 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 25 /cm2 + 99 268.62454 keV 0 eV 0 14.883428 /cm2 14.883428 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 + 100 246.57529 keV 0 eV 0 18.321615 /cm2 18.321615 /cm2 28.658918 /cm2 0 /cm2 0 /cm2 25 /cm2 50 /cm2 + 101 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 + 102 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 25 /cm2 + 103 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 104 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 75 /cm2 + 105 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 + 106 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 + 107 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 108 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 109 769.53975 keV 769.53975 keV 1 0 /cm2 0.20828725 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 110 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 111 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 112 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 113 10.131532 MeV 10.131532 MeV 2 0 /cm2 15.85965 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 + 114 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 115 2.5912224 MeV 2.5912224 MeV 4 8.5564644 /cm2 8.5564644 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 25 /cm2 + 116 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 117 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 118 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 119 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 120 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 121 734.05195 eV 0 eV 0 0 /cm2 0.00053630361 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 122 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 + 123 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 124 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 + 125 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 126 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 127 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 128 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 129 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 130 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 131 12.07394 keV 0 eV 0 0 /cm2 0.044333235 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 132 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 + 133 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 + 134 8.629508 keV 0 eV 0 0.87835561 /cm2 0.87835561 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 135 432.1039 keV 0 eV 0 23.303014 /cm2 23.303014 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 136 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 137 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 138 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 0 /cm2 + 139 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 140 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 141 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 142 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 143 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 144 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 + 145 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 146 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 147 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 148 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 149 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 150 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 151 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 152 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 153 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 154 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 155 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 156 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 157 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 158 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 159 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 160 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 161 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 162 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 163 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 164 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 165 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 166 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 167 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 168 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 169 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 170 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 171 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 172 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 173 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 174 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 175 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 176 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 177 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 178 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 179 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 180 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 181 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 182 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 183 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 184 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 185 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 186 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 187 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 188 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 189 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 190 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 191 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 192 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 193 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 194 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 195 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 196 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 197 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 198 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 199 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 +============================================= +Graphics systems deleted. +Visualization Manager deleting... +UserDetectorConstruction deleted. +UserPhysicsList deleted. +UserRunAction deleted. +UserPrimaryGenerator deleted. +G4 kernel has come to Quit state. +G4SDManager deleted. +EventManager deleted. +UImanager deleted. +StateManager deleted. +RunManagerKernel is deleted. +RunManager is deleting. diff --git a/examples/extended/runAndEvent/RE02/run2.log b/examples/extended/runAndEvent/RE02/run2.log index 8067eb3e58..c07a91358e 100644 --- a/examples/extended/runAndEvent/RE02/run2.log +++ b/examples/extended/runAndEvent/RE02/run2.log @@ -1,15 +1,11 @@ ************************************************************* - Geant4 version Name: geant4-07-01 (30-June-2005) + Geant4 version Name: geant4-08-01-patch-01 (27-July-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 ************************************************************* -<-- RE02DetectorConstruction ----------------- - Water Phantom Size (200,200,400) - Segmentation (100,100,200) -<--------------------------------------------- You are using the RE02PhysicsList This PhysicsList originally comes from example/extended/analysis/A01, and is modified @@ -29,7 +25,7 @@ Visualization Manager instantiating... Visualization Manager initialising... Registering graphics systems... -You have successfully chosen to use the following graphics systems. +You have successfully registered the following graphics systems. Current available graphics systems are: ASCIITree (ATree) DAWNFILE (DAWNFILE) @@ -42,42 +38,74 @@ Current available graphics systems are: FukuiRenderer (DAWN) OpenGLImmediateX (OGLIX) OpenGLStoredX (OGLSX) - OpenGLImmediateXm (OGLIXm) - OpenGLStoredXm (OGLSXm) + RayTracerX (RayTracerX) VRML1 (VRML1) VRML2 (VRML2) +Registering model factories... + +You have successfully registered the following model factories. +Registered model factories: + generic + drawByCharge + drawByParticleID + drawByOriginVolume + +Registered models: + None + +Registered filter factories: + chargeFilter + particleFilter + originVolumeFilter + +Registered filters: + None + + The materials defined are : -***** Table : Nb of materials = 2 ***** +***** Table : Nb of materials = 3 ***** Material: G4_AIR density: 1.205 mg/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 303.921 m ---> Element: C (C) Z = 6.0 N = 12.0 A = 12.01 g/mole ---> Isotope: C Z = 6 N = 12 A = 12.00 g/mole abundance: 98.93 % - ---> Isotope: C Z = 6 N = 13 A = 13.00 g/mole abundance: 1.07 % fractionMass: 0.01 % Abundance 0.02 % + ---> Isotope: C Z = 6 N = 13 A = 13.00 g/mole abundance: 1.07 % ElmMassFraction: 0.01 % ElmAbundance 0.02 % ---> Element: N (N) Z = 7.0 N = 14.0 A = 14.01 g/mole ---> Isotope: N Z = 7 N = 14 A = 14.00 g/mole abundance: 99.63 % - ---> Isotope: N Z = 7 N = 15 A = 15.00 g/mole abundance: 0.37 % fractionMass: 75.53 % Abundance 78.44 % + ---> Isotope: N Z = 7 N = 15 A = 15.00 g/mole abundance: 0.37 % ElmMassFraction: 75.53 % ElmAbundance 78.44 % ---> Element: O (O) Z = 8.0 N = 16.0 A = 16.00 g/mole ---> Isotope: O Z = 8 N = 16 A = 15.99 g/mole abundance: 99.76 % ---> Isotope: O Z = 8 N = 17 A = 17.00 g/mole abundance: 0.04 % - ---> Isotope: O Z = 8 N = 18 A = 18.00 g/mole abundance: 0.20 % fractionMass: 23.18 % Abundance 21.07 % + ---> Isotope: O Z = 8 N = 18 A = 18.00 g/mole abundance: 0.20 % ElmMassFraction: 23.18 % ElmAbundance 21.07 % ---> Element: Ar (Ar) Z = 18.0 N = 40.0 A = 39.95 g/mole ---> Isotope: Ar Z = 18 N = 36 A = 35.97 g/mole abundance: 0.34 % ---> Isotope: Ar Z = 18 N = 38 A = 37.96 g/mole abundance: 0.06 % - ---> Isotope: Ar Z = 18 N = 40 A = 39.96 g/mole abundance: 99.60 % fractionMass: 1.28 % Abundance 0.47 % + ---> Isotope: Ar Z = 18 N = 40 A = 39.96 g/mole abundance: 99.60 % ElmMassFraction: 1.28 % ElmAbundance 0.47 % - Material: G4_WATER density: 1.000 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 36.083 cm + Material: G4_WATER H_2O density: 1.000 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 36.083 cm ---> Element: H (H) Z = 1.0 N = 1.0 A = 1.01 g/mole ---> Isotope: H Z = 1 N = 1 A = 1.01 g/mole abundance: 99.99 % - ---> Isotope: H Z = 1 N = 2 A = 2.01 g/mole abundance: 0.01 % fractionMass: 11.19 % Abundance 66.67 % + ---> Isotope: H Z = 1 N = 2 A = 2.01 g/mole abundance: 0.01 % ElmMassFraction: 11.19 % ElmAbundance 66.67 % ---> Element: O (O) Z = 8.0 N = 16.0 A = 16.00 g/mole ---> Isotope: O Z = 8 N = 16 A = 15.99 g/mole abundance: 99.76 % ---> Isotope: O Z = 8 N = 17 A = 17.00 g/mole abundance: 0.04 % - ---> Isotope: O Z = 8 N = 18 A = 18.00 g/mole abundance: 0.20 % fractionMass: 88.81 % Abundance 33.33 % + ---> Isotope: O Z = 8 N = 18 A = 18.00 g/mole abundance: 0.20 % ElmMassFraction: 88.81 % ElmAbundance 33.33 % + + Material: G4_Pb density: 11.350 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 5.613 mm + ---> Element: Pb (Pb) Z = 82.0 N = 207.2 A = 207.22 g/mole + ---> Isotope: Pb Z = 82 N = 204 A = 203.97 g/mole abundance: 1.40 % + ---> Isotope: Pb Z = 82 N = 206 A = 205.97 g/mole abundance: 24.10 % + ---> Isotope: Pb Z = 82 N = 207 A = 206.98 g/mole abundance: 22.10 % + ---> Isotope: Pb Z = 82 N = 208 A = 207.98 g/mole abundance: 52.40 % ElmMassFraction: 100.00 % ElmAbundance 100.00 % +<-- RE02DetectorConstruction::Construct------- + Water Phantom Size (200,200,400) + Segmentation (100,100,200) + Lead plate at even copy # (0-False,1-True): 1 +<--------------------------------------------- ----G4SDParticleFileter particle list------ gamma ------------------------------------------- @@ -98,11 +126,11 @@ Thank you for using G4BinaryCascade. Thank you for using G4BinaryCascade. Thank you for using G4BinaryCascade. /run/verbose 2 -/event/verbose 0 +#/event/verbose 0 #/tracking/verbose 1 # # -/vis/scene/create +#/vis/scene/create # # Create a scene handler for a specific graphics system # (Edit the next line(s) to choose another graphic system) @@ -151,13 +179,13 @@ phot: Total cross sections from Sandia parametrisation. msc: Model variant of multiple scattering for e- Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary algorithm is active with facrange= 0.199 + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 eIoni: tables are built for e- dE/dx and range tables from 100 eV to 100 TeV in 120 bins. Lambda tables from threshold to 100 TeV in 120 bins. Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV. - Step function: finalRange(mm)= 1, dRoverRange= 1, integral: 1 + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 eBrem: tables are built for e- dE/dx and range tables from 100 eV to 100 TeV in 120 bins. @@ -169,7 +197,7 @@ eIoni: tables are built for e+ dE/dx and range tables from 100 eV to 100 TeV in 120 bins. Lambda tables from threshold to 100 TeV in 120 bins. Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV. - Step function: finalRange(mm)= 1, dRoverRange= 1, integral: 1 + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 eBrem: tables are built for e+ dE/dx and range tables from 100 eV to 100 TeV in 120 bins. @@ -190,16 +218,25 @@ hIoni: tables are built for proton msc: Model variant of multiple scattering for proton Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary algorithm is active with facrange= 0.199 + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 ionIoni: tables are built for GenericIon dE/dx and range tables from 100 eV to 100 TeV in 120 bins. Lambda tables from threshold to 100 TeV in 120 bins. Scaling relation is used to proton dE/dx and range Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for alpha particles below. + Stopping Power data for 8 ion/material pairs are used. Step function: finalRange(mm)= 0.1, dRoverRange= 0.1, integral: 1 -msc: Model variant of multiple scattering for C12[0.0] +msc: Model variant of multiple scattering for GenericIon + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +hIoni: tables are built for anti_proton + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 muIoni: tables are built for mu+ dE/dx and range tables from 100 eV to 100 TeV in 120 bins. @@ -210,7 +247,7 @@ muIoni: tables are built for mu+ msc: Model variant of multiple scattering for mu+ Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary algorithm is active with facrange= 0.199 + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 muBrems: tables are built for mu+ dE/dx and range tables from 100 eV to 100 TeV in 120 bins. @@ -239,12 +276,26 @@ muPairProd: tables are built for mu- Lambda tables from threshold to 100 TeV in 120 bins. Parametrised model +hIoni: tables are built for pi+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 0.297504 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +hIoni: tables are built for pi- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 0.297504 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + msc: Model variant of multiple scattering for pi- Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary algorithm is active with facrange= 0.199 + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 -Region DefaultRegionForTheWorld - Materials : G4_AIR G4_WATER +Region -- appears in world volume + Materials : G4_AIR G4_WATER G4_Pb Production cuts : gamma 1 mm e- 1 mm e+ 1 mm ========= Table of registered couples ============================== @@ -263,23 +314,34 @@ Index : 1 used in the geometry : Yes recalculation needed : No Region(s) which use this couple : DefaultRegionForTheWorld +Index : 2 used in the geometry : Yes recalculation needed : No + Material : G4_Pb + Range cuts : gamma 1 mm e- 1 mm e+ 1 mm + Energy thresholds : gamma 100.511 keV e- 1.37814 MeV e+ 1.28002 MeV + Region(s) which use this couple : + DefaultRegionForTheWorld + ==================================================================== Start closing geometry. G4GeometryManager::ReportVoxelStats -- Voxel Statistics - Total memory consumed for geometry optimisation: 445090 kByte - Total CPU time elapsed for geometry optimisation: 24 seconds + Total memory consumed for geometry optimisation: 13 kByte + Total CPU time elapsed for geometry optimisation: 0 seconds Voxelisation: top CPU users: Percent Total CPU System CPU Memory Volume ------- ---------- ---------- -------- ---------- - 99.07 23.45 1.71 445091k Phantom + 0.00 0.00 0.00 3k Phantom + 0.00 0.00 0.00 3k RepY + 0.00 0.00 0.00 7k RepX Voxelisation: top memory users: Percent Memory Heads Nodes Pointers Total CPU Volume ------- -------- ------ ------ -------- ---------- ---------- - -3.66 445090k 79801 13840799 16020201 23.45 Phantom + 52.81 7k 1 201 400 0.00 RepX + 23.59 3k 1 100 100 0.00 Phantom + 23.59 3k 1 100 100 0.00 RepY ++ PhantomSD/totalEDep id 0 ++ PhantomSD/protonEDep id 1 ++ PhantomSD/protonNStep id 2 @@ -394,12 +456,19 @@ Start Run processing. >>> Event 99 >>> Event 100 >>> Event 200 + G4NuclearLevelManager: nuclide (85,214) does not have a gamma levels file >>> Event 300 >>> Event 400 + G4NuclearLevelManager: nuclide (75,193) does not have a gamma levels file >>> Event 500 + G4NuclearLevelManager: nuclide (77,197) does not have a gamma levels file + G4NuclearLevelManager: nuclide (69,168) does not have a gamma levels file + G4NuclearLevelManager: nuclide (78,201) does not have a gamma levels file >>> Event 600 >>> Event 700 + G4NuclearLevelManager: nuclide (77,200) does not have a gamma levels file >>> Event 800 + G4NuclearLevelManager: nuclide (79,201) does not have a gamma levels file >>> Event 900 >>> Event 1000 >>> Event 1100 @@ -407,9 +476,12 @@ Start Run processing. >>> Event 1300 >>> Event 1400 >>> Event 1500 + G4NuclearLevelManager: nuclide (85,206) does not have a gamma levels file >>> Event 1600 >>> Event 1700 + G4NuclearLevelManager: nuclide (73,186) does not have a gamma levels file >>> Event 1800 + G4NuclearLevelManager: nuclide (88,210) does not have a gamma levels file >>> Event 1900 >>> Event 2000 >>> Event 2100 @@ -418,24 +490,34 @@ Start Run processing. >>> Event 2400 >>> Event 2500 >>> Event 2600 + G4NuclearLevelManager: nuclide (80,207) does not have a gamma levels file >>> Event 2700 >>> Event 2800 >>> Event 2900 >>> Event 3000 >>> Event 3100 >>> Event 3200 + G4NuclearLevelManager: nuclide (79,204) does not have a gamma levels file >>> Event 3300 >>> Event 3400 + G4NuclearLevelManager: nuclide (79,203) does not have a gamma levels file >>> Event 3500 >>> Event 3600 + G4NuclearLevelManager: nuclide (72,187) does not have a gamma levels file >>> Event 3700 + G4NuclearLevelManager: nuclide (77,199) does not have a gamma levels file >>> Event 3800 >>> Event 3900 + G4NuclearLevelManager: nuclide (79,202) does not have a gamma levels file >>> Event 4000 + G4NuclearLevelManager: nuclide (71,185) does not have a gamma levels file >>> Event 4100 >>> Event 4200 >>> Event 4300 + G4NuclearLevelManager: nuclide (79,205) does not have a gamma levels file + G4NuclearLevelManager: nuclide (73,190) does not have a gamma levels file >>> Event 4400 + G4NuclearLevelManager: nuclide (87,209) does not have a gamma levels file >>> Event 4500 >>> Event 4600 >>> Event 4700 @@ -456,15 +538,19 @@ Start Run processing. >>> Event 6200 >>> Event 6300 >>> Event 6400 + G4NuclearLevelManager: nuclide (77,198) does not have a gamma levels file >>> Event 6500 + G4NuclearLevelManager: nuclide (78,204) does not have a gamma levels file >>> Event 6600 >>> Event 6700 >>> Event 6800 + G4NuclearLevelManager: nuclide (75,191) does not have a gamma levels file >>> Event 6900 >>> Event 7000 >>> Event 7100 >>> Event 7200 >>> Event 7300 + G4NuclearLevelManager: nuclide (75,194) does not have a gamma levels file >>> Event 7400 >>> Event 7500 >>> Event 7600 @@ -479,9 +565,12 @@ Start Run processing. >>> Event 8500 >>> Event 8600 >>> Event 8700 + G4NuclearLevelManager: nuclide (76,195) does not have a gamma levels file >>> Event 8800 >>> Event 8900 >>> Event 9000 + G4NuclearLevelManager: nuclide (82,211) does not have a gamma levels file + G4NuclearLevelManager: nuclide (87,218) does not have a gamma levels file >>> Event 9100 >>> Event 9200 >>> Event 9300 @@ -494,154 +583,154 @@ Start Run processing. Run terminated. Run Summary Number of events processed : 10000 - User=2256.63s Real=2345.91s Sys=1.67s + User=1281.04s Real=1287.96s Sys=0.38s ============================================================= Number of event processed : 10000 ============================================================= #Z Cell# totalEDep protonEDep protonNStep chargedPassCellFlux chargedCellFlux chargedSurfFlux gammaSurfCurr000 gammaSurfCurr001 gammaSurfCurr002 gammaSurfCurr003 - 0 13.531336 GeV 4.4119161 MeV 7 10326.638 /cm2 15728.127 /cm2 16749.298 /cm2 0 /cm2 75 /cm2 25 /cm2 100 /cm2 - 1 13.792529 GeV 43.084361 MeV 24 11004.24 /cm2 17066.404 /cm2 19296.168 /cm2 0 /cm2 200 /cm2 150 /cm2 150 /cm2 - 2 13.867095 GeV 76.771712 MeV 38 11063.589 /cm2 17234.418 /cm2 17803.759 /cm2 0 /cm2 225 /cm2 125 /cm2 150 /cm2 - 3 14.009395 GeV 67.175663 MeV 47 11153.156 /cm2 16647.585 /cm2 17955.947 /cm2 25 /cm2 375 /cm2 100 /cm2 225 /cm2 - 4 14.112976 GeV 61.812029 MeV 52 11369.869 /cm2 16983.504 /cm2 36945.189 /cm2 0 /cm2 200 /cm2 100 /cm2 200 /cm2 - 5 14.420956 GeV 120.67697 MeV 71 11152.441 /cm2 17060.692 /cm2 19811.24 /cm2 0 /cm2 200 /cm2 50 /cm2 300 /cm2 - 6 14.43361 GeV 113.14005 MeV 72 11388.304 /cm2 16311.164 /cm2 14754.424 /cm2 25 /cm2 225 /cm2 50 /cm2 425 /cm2 - 7 14.345366 GeV 88.656278 MeV 66 11543.928 /cm2 16038.309 /cm2 18301.562 /cm2 0 /cm2 200 /cm2 175 /cm2 250 /cm2 - 8 14.35585 GeV 96.779839 MeV 73 11472.914 /cm2 15345.007 /cm2 22630.598 /cm2 0 /cm2 200 /cm2 125 /cm2 175 /cm2 - 9 14.385367 GeV 74.668668 MeV 61 11426.995 /cm2 14389.937 /cm2 16553.973 /cm2 0 /cm2 250 /cm2 50 /cm2 225 /cm2 - 10 14.790008 GeV 122.07539 MeV 70 11396.584 /cm2 14695.39 /cm2 15021.213 /cm2 25 /cm2 200 /cm2 100 /cm2 450 /cm2 - 11 14.858361 GeV 103.69308 MeV 80 11452.049 /cm2 14061.199 /cm2 14363.125 /cm2 0 /cm2 50 /cm2 100 /cm2 350 /cm2 - 12 14.758371 GeV 129.27812 MeV 93 11630.832 /cm2 13953.093 /cm2 12851.329 /cm2 0 /cm2 175 /cm2 100 /cm2 400 /cm2 - 13 14.973667 GeV 118.57643 MeV 96 11811.027 /cm2 13330.97 /cm2 15393.79 /cm2 0 /cm2 50 /cm2 75 /cm2 425 /cm2 - 14 15.035222 GeV 129.09758 MeV 88 11700.383 /cm2 12571.131 /cm2 13428.845 /cm2 0 /cm2 100 /cm2 25 /cm2 325 /cm2 - 15 15.038969 GeV 116.33783 MeV 81 11485.649 /cm2 11842.105 /cm2 12217.958 /cm2 0 /cm2 100 /cm2 50 /cm2 450 /cm2 - 16 15.439206 GeV 143.20903 MeV 88 11587.629 /cm2 11806.972 /cm2 11944.097 /cm2 0 /cm2 100 /cm2 25 /cm2 500 /cm2 - 17 15.543256 GeV 162.96176 MeV 97 11614.137 /cm2 11851.626 /cm2 11795.817 /cm2 0 /cm2 125 /cm2 50 /cm2 375 /cm2 - 18 15.849847 GeV 122.51886 MeV 85 11430.3 /cm2 11711.178 /cm2 11650.05 /cm2 0 /cm2 25 /cm2 25 /cm2 375 /cm2 - 19 16.101812 GeV 125.2569 MeV 86 11739.037 /cm2 11871.919 /cm2 11768.796 /cm2 0 /cm2 25 /cm2 50 /cm2 350 /cm2 - 20 16.449446 GeV 161.81 MeV 96 11772.065 /cm2 12063.23 /cm2 12124.949 /cm2 0 /cm2 25 /cm2 50 /cm2 425 /cm2 - 21 16.687689 GeV 135.59536 MeV 89 11940.212 /cm2 12076.103 /cm2 12075.615 /cm2 0 /cm2 25 /cm2 100 /cm2 400 /cm2 - 22 17.083267 GeV 172.72502 MeV 100 11882.225 /cm2 12169.756 /cm2 12074.587 /cm2 0 /cm2 25 /cm2 25 /cm2 350 /cm2 - 23 17.483878 GeV 218.56948 MeV 120 12163.828 /cm2 12695.102 /cm2 12385.203 /cm2 0 /cm2 0 /cm2 75 /cm2 225 /cm2 - 24 17.566726 GeV 202.63901 MeV 120 12581.8 /cm2 12925.179 /cm2 13736.716 /cm2 0 /cm2 0 /cm2 100 /cm2 350 /cm2 - 25 17.64148 GeV 190.46004 MeV 101 12384.844 /cm2 12543.406 /cm2 12737.82 /cm2 0 /cm2 0 /cm2 25 /cm2 300 /cm2 - 26 17.828381 GeV 155.20817 MeV 97 11808.261 /cm2 12089.364 /cm2 12485.29 /cm2 0 /cm2 50 /cm2 25 /cm2 475 /cm2 - 27 18.140536 GeV 129.69171 MeV 79 11722.177 /cm2 11926.287 /cm2 11663.398 /cm2 0 /cm2 0 /cm2 50 /cm2 500 /cm2 - 28 18.604132 GeV 126.49839 MeV 85 11841.062 /cm2 12032.609 /cm2 11978.173 /cm2 0 /cm2 25 /cm2 50 /cm2 475 /cm2 - 29 19.370532 GeV 186.23784 MeV 102 11833.122 /cm2 12231.3 /cm2 11940.383 /cm2 0 /cm2 50 /cm2 125 /cm2 450 /cm2 - 30 19.975445 GeV 202.2853 MeV 104 12014.465 /cm2 12380.692 /cm2 12213.324 /cm2 0 /cm2 25 /cm2 75 /cm2 450 /cm2 - 31 20.622066 GeV 194.35977 MeV 103 12103.131 /cm2 12395.073 /cm2 12387.701 /cm2 0 /cm2 0 /cm2 125 /cm2 300 /cm2 - 32 21.577189 GeV 212.06409 MeV 104 11747.052 /cm2 12243.755 /cm2 12138.508 /cm2 0 /cm2 0 /cm2 75 /cm2 275 /cm2 - 33 22.820571 GeV 186.06013 MeV 104 11956.109 /cm2 12291.048 /cm2 12668.87 /cm2 0 /cm2 0 /cm2 125 /cm2 325 /cm2 - 34 23.828473 GeV 182.28744 MeV 86 11932.927 /cm2 12117.021 /cm2 12475.522 /cm2 0 /cm2 50 /cm2 75 /cm2 300 /cm2 - 35 25.198673 GeV 206.77718 MeV 97 11470.605 /cm2 11839.278 /cm2 11847.794 /cm2 0 /cm2 0 /cm2 75 /cm2 275 /cm2 - 36 26.284447 GeV 213.79134 MeV 89 11145.378 /cm2 11450.627 /cm2 11805.794 /cm2 0 /cm2 0 /cm2 25 /cm2 400 /cm2 - 37 28.142542 GeV 159.50305 MeV 75 10884.545 /cm2 11047.571 /cm2 11156.692 /cm2 0 /cm2 0 /cm2 25 /cm2 325 /cm2 - 38 32.183798 GeV 214.90299 MeV 92 10741.797 /cm2 11156.89 /cm2 11091.984 /cm2 0 /cm2 0 /cm2 50 /cm2 275 /cm2 - 39 37.933241 GeV 233.44046 MeV 88 10509.192 /cm2 10843.096 /cm2 11077.52 /cm2 0 /cm2 0 /cm2 75 /cm2 300 /cm2 - 40 54.702868 GeV 155.56501 MeV 63 10286.484 /cm2 10452.047 /cm2 10916.427 /cm2 0 /cm2 0 /cm2 75 /cm2 250 /cm2 - 41 45.547367 GeV 102.98082 MeV 45 2862.7571 /cm2 5292.8797 /cm2 9997.5227 /cm2 0 /cm2 0 /cm2 50 /cm2 150 /cm2 - 42 2.4440587 GeV 90.418814 MeV 39 2575.2062 /cm2 2644.3506 /cm2 2630.8135 /cm2 0 /cm2 0 /cm2 25 /cm2 150 /cm2 - 43 1.8114216 GeV 94.003087 MeV 36 2181.6845 /cm2 2292.2508 /cm2 2453.2913 /cm2 0 /cm2 0 /cm2 25 /cm2 125 /cm2 - 44 1.8350681 GeV 58.738894 MeV 29 1898.2037 /cm2 1957.8879 /cm2 2086.5628 /cm2 0 /cm2 0 /cm2 75 /cm2 50 /cm2 - 45 1.6093262 GeV 44.728854 MeV 21 1632.2175 /cm2 1655.496 /cm2 1712.7238 /cm2 0 /cm2 0 /cm2 50 /cm2 100 /cm2 - 46 1.7469079 GeV 32.219458 MeV 15 1505.7658 /cm2 1580.3678 /cm2 1613.1219 /cm2 0 /cm2 0 /cm2 50 /cm2 100 /cm2 - 47 1.4202252 GeV 22.740958 MeV 12 1446.0838 /cm2 1464.5572 /cm2 1508.4952 /cm2 0 /cm2 0 /cm2 50 /cm2 25 /cm2 - 48 1.2677691 GeV 20.438753 MeV 15 1273.1934 /cm2 1317.6046 /cm2 1428.834 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 49 892.25173 MeV 20.306269 MeV 10 1171.1082 /cm2 1188.9376 /cm2 1228.3424 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 - 50 903.25161 MeV 22.0392 MeV 11 1114.8059 /cm2 1139.2218 /cm2 1153.0218 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 - 51 839.43406 MeV 28.619067 MeV 12 1117.9914 /cm2 1127.6598 /cm2 1080.3383 /cm2 0 /cm2 0 /cm2 0 /cm2 100 /cm2 - 52 1.0436738 GeV 24.624362 MeV 10 856.52832 /cm2 969.41504 /cm2 1055.1548 /cm2 0 /cm2 0 /cm2 25 /cm2 75 /cm2 - 53 499.24093 MeV 18.743581 MeV 7 772.84176 /cm2 790.03279 /cm2 827.09959 /cm2 0 /cm2 0 /cm2 0 /cm2 100 /cm2 - 54 442.41707 MeV 21.191085 MeV 10 699.36238 /cm2 735.31677 /cm2 787.10444 /cm2 0 /cm2 0 /cm2 25 /cm2 50 /cm2 - 55 214.75091 MeV 11.899491 MeV 8 635.47272 /cm2 635.47272 /cm2 676.41815 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 - 56 236.21592 MeV 14.074045 MeV 8 593.20456 /cm2 605.66835 /cm2 626.27717 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 57 168.04271 MeV 13.637095 MeV 8 561.54943 /cm2 562.81799 /cm2 601.24663 /cm2 0 /cm2 25 /cm2 0 /cm2 25 /cm2 - 58 125.54363 MeV 14.242124 MeV 8 489.37115 /cm2 495.49755 /cm2 501.35512 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 - 59 107.2776 MeV 10.962101 MeV 6 450.8766 /cm2 450.8766 /cm2 450.85386 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 - 60 113.16645 MeV 11.019038 MeV 6 407.82001 /cm2 416.77436 /cm2 450.88883 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 - 61 114.66795 MeV 7.8833876 MeV 4 340.65694 /cm2 381.66063 /cm2 375.87509 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 62 116.91396 MeV 6.4866776 MeV 2 325.41567 /cm2 336.21929 /cm2 352.79968 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 63 91.385165 MeV 7.2068942 MeV 2 304.0872 /cm2 304.0872 /cm2 303.55335 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 64 103.0146 MeV 9.8017948 MeV 2 224.94831 /cm2 239.58401 /cm2 305.78585 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 - 65 108.43236 MeV 1.3422545 MeV 2 201.03482 /cm2 212.93359 /cm2 200.22645 /cm2 0 /cm2 0 /cm2 25 /cm2 25 /cm2 - 66 93.961229 MeV 7.1106292 MeV 2 247.3677 /cm2 247.3677 /cm2 251.65507 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 67 97.648719 MeV 12.281207 MeV 3 249.65519 /cm2 249.65519 /cm2 251.6644 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 68 107.40054 MeV 7.5890735 MeV 3 199.56591 /cm2 219.17764 /cm2 226.61397 /cm2 0 /cm2 50 /cm2 0 /cm2 0 /cm2 - 69 72.96407 MeV 2.2274904 MeV 1 164.68495 /cm2 164.68495 /cm2 176.15107 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 70 48.336577 MeV 0 eV 0 125.05734 /cm2 128.12974 /cm2 150.10151 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 71 42.427708 MeV 0 eV 0 147.80416 /cm2 147.80416 /cm2 125.06481 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 72 46.328238 MeV 0 eV 0 150.11597 /cm2 150.11597 /cm2 150.1127 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 73 49.561951 MeV 0 eV 0 150.12424 /cm2 150.12424 /cm2 150.12036 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 74 54.672122 MeV 2.0214018 MeV 1 154.90072 /cm2 154.90072 /cm2 150.14446 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 75 70.213532 MeV 7.476699 MeV 1 150.2127 /cm2 159.33503 /cm2 175.5833 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 76 84.159903 MeV 0 eV 0 139.28184 /cm2 155.84183 /cm2 150.20396 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 77 45.172563 MeV 0 eV 0 138.12914 /cm2 138.12914 /cm2 150.20291 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 78 43.922654 MeV 0 eV 0 125.05562 /cm2 125.05562 /cm2 125.05112 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 79 73.378306 MeV 621.78665 keV 1 154.83736 /cm2 154.83736 /cm2 125.05287 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 80 111.17153 MeV 1.8381013 MeV 1 165.21844 /cm2 177.72568 /cm2 175.14949 /cm2 0 /cm2 0 /cm2 25 /cm2 25 /cm2 - 81 64.47296 MeV 1.737928 MeV 2 149.42287 /cm2 153.58472 /cm2 175.26352 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 82 49.465375 MeV 0 eV 0 148.79186 /cm2 148.79186 /cm2 125.16107 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 83 61.52551 MeV 0 eV 0 178.80383 /cm2 178.80383 /cm2 150.28842 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 84 79.763724 MeV 0 eV 0 156.28075 /cm2 156.28075 /cm2 189.38685 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 85 68.079941 MeV 0 eV 0 87.356303 /cm2 105.7002 /cm2 150.32073 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 86 8.250993 MeV 0 eV 0 100.04771 /cm2 100.04771 /cm2 100.04629 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 - 87 8.740486 MeV 0 eV 0 100.05273 /cm2 100.05273 /cm2 100.05125 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 - 88 9.0930303 MeV 0 eV 0 100.05569 /cm2 100.05569 /cm2 100.05412 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 - 89 9.20365 MeV 0 eV 0 100.0637 /cm2 100.0637 /cm2 100.06205 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 90 9.2503887 MeV 0 eV 0 100.07439 /cm2 100.07439 /cm2 100.07264 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 91 9.0731968 MeV 0 eV 0 100.07222 /cm2 100.07222 /cm2 100.07035 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 92 10.388569 MeV 0 eV 0 100.08099 /cm2 100.10177 /cm2 100.07899 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 93 9.9217647 MeV 0 eV 0 100.08204 /cm2 100.08204 /cm2 100.07989 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 94 7.8374745 MeV 0 eV 0 81.708354 /cm2 81.708354 /cm2 100.06754 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 95 7.4811247 MeV 0 eV 0 75.029823 /cm2 75.029823 /cm2 75.028158 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 96 5.5720015 MeV 0 eV 0 51.936178 /cm2 51.936178 /cm2 75.023203 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 97 5.6866783 MeV 0 eV 0 50.014041 /cm2 50.014041 /cm2 50.01237 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 98 5.7545186 MeV 0 eV 0 50.016614 /cm2 50.016614 /cm2 50.014646 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 99 6.3975082 MeV 0 eV 0 50.01218 /cm2 50.01218 /cm2 50.009799 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 100 7.1611589 MeV 0 eV 0 50.017234 /cm2 50.017234 /cm2 50.014179 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 101 8.5660203 MeV 971.61827 keV 1 61.703898 /cm2 61.703898 /cm2 50.011356 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 102 11.489061 MeV 1.9744003 MeV 1 72.060083 /cm2 72.060083 /cm2 93.297599 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 103 18.946054 MeV 0 eV 0 25.005595 /cm2 49.75606 /cm2 50.039305 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 104 1.2322186 MeV 0 eV 0 25.005607 /cm2 25.005607 /cm2 25.005586 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 105 1.2672466 MeV 0 eV 0 25.005406 /cm2 25.005406 /cm2 25.005384 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 106 1.3429561 MeV 0 eV 0 25.005124 /cm2 25.005124 /cm2 25.005103 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 107 2.6465828 MeV 0 eV 0 47.369009 /cm2 47.369009 /cm2 25.005487 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 108 2.651585 MeV 0 eV 0 50.015104 /cm2 50.015104 /cm2 50.014985 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 109 2.601996 MeV 0 eV 0 50.013624 /cm2 50.013624 /cm2 50.013504 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 110 2.6598788 MeV 0 eV 0 50.014082 /cm2 50.014082 /cm2 50.01396 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 111 2.6655473 MeV 0 eV 0 50.013306 /cm2 50.013306 /cm2 50.013184 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 112 2.6288244 MeV 0 eV 0 50.013202 /cm2 50.013202 /cm2 50.013079 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 113 2.414992 MeV 0 eV 0 50.013502 /cm2 50.013502 /cm2 50.013377 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 114 2.7426512 MeV 0 eV 0 50.013655 /cm2 50.013655 /cm2 50.013529 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 115 2.5649719 MeV 0 eV 0 50.014122 /cm2 50.014122 /cm2 50.013995 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 116 2.4708625 MeV 0 eV 0 50.01378 /cm2 50.01378 /cm2 50.013652 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 117 2.5178447 MeV 0 eV 0 50.012955 /cm2 50.012955 /cm2 50.012825 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 118 2.4819488 MeV 0 eV 0 50.01422 /cm2 50.01422 /cm2 50.01409 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 119 2.3959859 MeV 0 eV 0 50.01454 /cm2 50.01454 /cm2 50.014408 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 120 1.8157474 MeV 0 eV 0 32.959453 /cm2 32.959453 /cm2 50.016687 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 121 1.0575494 MeV 0 eV 0 25.005173 /cm2 25.005173 /cm2 25.00515 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 122 1.4959569 MeV 0 eV 0 25.005186 /cm2 25.005186 /cm2 25.005163 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 123 1.3192529 MeV 0 eV 0 25.004803 /cm2 25.004803 /cm2 25.00478 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 124 1.2647435 MeV 0 eV 0 25.005309 /cm2 25.005309 /cm2 25.005286 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 125 1.1061585 MeV 0 eV 0 25.003339 /cm2 25.003339 /cm2 25.003316 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 126 3.2485782 MeV 0 eV 0 47.318449 /cm2 47.318449 /cm2 25.003617 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 127 3.2976726 MeV 0 eV 0 50.031714 /cm2 50.031714 /cm2 50.03121 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 128 3.8621811 MeV 0 eV 0 50.028841 /cm2 50.028841 /cm2 50.028317 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 129 4.1096748 MeV 0 eV 0 50.021792 /cm2 50.021792 /cm2 50.021244 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 130 4.0107212 MeV 0 eV 0 50.019461 /cm2 50.019461 /cm2 50.018882 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 131 4.15587 MeV 0 eV 0 50.028498 /cm2 50.028498 /cm2 50.027887 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 132 3.7983438 MeV 0 eV 0 50.075423 /cm2 50.075423 /cm2 50.074772 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 133 3.724944 MeV 0 eV 0 50.093948 /cm2 50.093948 /cm2 50.093257 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 134 4.5591687 MeV 292.6487 keV 1 53.698231 /cm2 53.698231 /cm2 50.104218 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 135 4.4481685 MeV 0 eV 0 50.096416 /cm2 50.096416 /cm2 50.09563 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 136 3.4720932 MeV 0 eV 0 41.568636 /cm2 41.568636 /cm2 50.091138 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 137 1.3751113 MeV 0 eV 0 25.001543 /cm2 25.001543 /cm2 25.001518 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 138 1.4450918 MeV 0 eV 0 29.010146 /cm2 29.010146 /cm2 25.001438 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 139 1.0571295 MeV 0 eV 0 45.956899 /cm2 45.956899 /cm2 60.312165 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 140 51.339607 keV 0 eV 0 3.4168704 /cm2 3.4168704 /cm2 35.263945 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 141 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 142 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 + 0 13.266999 GeV 60.633786 MeV 58 11955.477 /cm2 18396.814 /cm2 24668.621 /cm2 0 /cm2 25 /cm2 3025 /cm2 3900 /cm2 + 1 78.930345 GeV 481.39292 MeV 187 11260.437 /cm2 15557.091 /cm2 93781.119 /cm2 25 /cm2 100 /cm2 4475 /cm2 4900 /cm2 + 2 14.245677 GeV 92.73259 MeV 259 14302.906 /cm2 17662.984 /cm2 17148.489 /cm2 0 /cm2 25 /cm2 5125 /cm2 5450 /cm2 + 3 86.084654 GeV 530.32696 MeV 265 12787.93 /cm2 16254.52 /cm2 23592.771 /cm2 0 /cm2 0 /cm2 5875 /cm2 5175 /cm2 + 4 16.055084 GeV 124.37212 MeV 307 14947.952 /cm2 16181.117 /cm2 18459.752 /cm2 0 /cm2 0 /cm2 5800 /cm2 6400 /cm2 + 5 99.991278 GeV 716.0939 MeV 330 13274.658 /cm2 16825.614 /cm2 18465.927 /cm2 0 /cm2 50 /cm2 5850 /cm2 5525 /cm2 + 6 20.172734 GeV 163.45498 MeV 328 14325.332 /cm2 15002.698 /cm2 14841.209 /cm2 0 /cm2 0 /cm2 4875 /cm2 4500 /cm2 + 7 126.89091 GeV 915.5459 MeV 373 12385.217 /cm2 15155.155 /cm2 15424.192 /cm2 0 /cm2 25 /cm2 4375 /cm2 3750 /cm2 + 8 24.293147 GeV 129.8051 MeV 267 11619.342 /cm2 11986.863 /cm2 12803.697 /cm2 0 /cm2 0 /cm2 3400 /cm2 2650 /cm2 + 9 105.36379 GeV 471.63579 MeV 199 8534.3431 /cm2 10454.156 /cm2 10816.426 /cm2 0 /cm2 0 /cm2 2725 /cm2 2400 /cm2 + 10 17.950244 GeV 74.68659 MeV 130 8390.8263 /cm2 8728.0851 /cm2 8875.9765 /cm2 0 /cm2 0 /cm2 2650 /cm2 1975 /cm2 + 11 105.86296 GeV 378.9393 MeV 150 6458.8156 /cm2 7677.2544 /cm2 17651.436 /cm2 0 /cm2 0 /cm2 2250 /cm2 1500 /cm2 + 12 29.059537 GeV 101.1993 MeV 128 5906.7319 /cm2 6166.7034 /cm2 6469.621 /cm2 0 /cm2 0 /cm2 1275 /cm2 1300 /cm2 + 13 43.560103 GeV 203.90126 MeV 77 718.49774 /cm2 1760.4431 /cm2 5690.0867 /cm2 0 /cm2 0 /cm2 875 /cm2 800 /cm2 + 14 86.01067 MeV 28.862867 MeV 66 456.25904 /cm2 498.96785 /cm2 608.76011 /cm2 0 /cm2 0 /cm2 675 /cm2 550 /cm2 + 15 454.71413 MeV 91.864543 MeV 29 294.08808 /cm2 469.87888 /cm2 395.30809 /cm2 0 /cm2 0 /cm2 400 /cm2 500 /cm2 + 16 51.779128 MeV 17.981912 MeV 28 299.2597 /cm2 349.98448 /cm2 312.38308 /cm2 0 /cm2 0 /cm2 200 /cm2 500 /cm2 + 17 295.4791 MeV 70.239677 MeV 23 211.31155 /cm2 334.49348 /cm2 220.39626 /cm2 0 /cm2 25 /cm2 275 /cm2 200 /cm2 + 18 39.683896 MeV 4.8828968 MeV 13 166.97148 /cm2 167.66246 /cm2 235.54013 /cm2 0 /cm2 0 /cm2 300 /cm2 150 /cm2 + 19 143.74139 MeV 9.6480012 MeV 8 140.23644 /cm2 173.36112 /cm2 155.88175 /cm2 0 /cm2 0 /cm2 400 /cm2 175 /cm2 + 20 5.6540834 MeV 1.4300857 MeV 4 101.47423 /cm2 101.47423 /cm2 101.46459 /cm2 0 /cm2 0 /cm2 200 /cm2 125 /cm2 + 21 32.229546 MeV 5.3000133 MeV 4 112.56153 /cm2 118.99093 /cm2 101.4961 /cm2 0 /cm2 0 /cm2 125 /cm2 75 /cm2 + 22 7.5772918 MeV 3.0152464 MeV 1 111.74685 /cm2 113.65123 /cm2 75.90483 /cm2 0 /cm2 0 /cm2 100 /cm2 125 /cm2 + 23 20.088779 MeV 0 eV 0 57.894069 /cm2 58.519546 /cm2 75.916211 /cm2 0 /cm2 0 /cm2 75 /cm2 75 /cm2 + 24 4.7527776 MeV 0 eV 0 75.420226 /cm2 75.420226 /cm2 75.417768 /cm2 0 /cm2 0 /cm2 75 /cm2 50 /cm2 + 25 26.612649 MeV 0 eV 0 75.447042 /cm2 75.447042 /cm2 75.422321 /cm2 0 /cm2 0 /cm2 0 /cm2 150 /cm2 + 26 4.2634168 MeV 0 eV 0 65.100355 /cm2 65.100355 /cm2 75.478154 /cm2 0 /cm2 0 /cm2 25 /cm2 100 /cm2 + 27 17.989759 MeV 0 eV 0 38.232555 /cm2 78.345794 /cm2 50.203559 /cm2 0 /cm2 0 /cm2 25 /cm2 100 /cm2 + 28 1.5957512 MeV 0 eV 0 58.57628 /cm2 58.57628 /cm2 51.591997 /cm2 0 /cm2 0 /cm2 75 /cm2 100 /cm2 + 29 18.631516 MeV 5.7789714 MeV 1 65.881283 /cm2 86.96051 /cm2 98.349565 /cm2 0 /cm2 0 /cm2 75 /cm2 75 /cm2 + 30 1.311453 MeV 0 eV 0 25.079573 /cm2 25.079573 /cm2 25.081474 /cm2 0 /cm2 0 /cm2 75 /cm2 25 /cm2 + 31 7.7235434 MeV 0 eV 0 25.143063 /cm2 26.002677 /cm2 25.07933 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 + 32 1.4577605 MeV 0 eV 0 25.413445 /cm2 25.413445 /cm2 25.412128 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 33 4.7840046 MeV 0 eV 0 9.9495898 /cm2 22.626507 /cm2 25.418857 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 34 764.21364 keV 0 eV 0 0 /cm2 0.023521063 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 35 21.898104 keV 0 eV 0 0 /cm2 0.0014078872 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 + 36 1.5338318 MeV 1.5338318 MeV 1 0 /cm2 0.61362485 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 37 1.8422786 MeV 0 eV 0 12.854047 /cm2 17.062091 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 0 /cm2 + 38 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 + 39 8.0717552 keV 0 eV 0 0.03155406 /cm2 0.03155406 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 25 /cm2 + 40 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 41 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 42 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 + 43 1.1415491 MeV 0 eV 0 0 /cm2 10.588923 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 50 /cm2 + 44 1.1257207 MeV 1.1257207 MeV 1 0 /cm2 0.3749254 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 25 /cm2 + 45 26.558793 keV 0 eV 0 0 /cm2 0.010000492 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 + 46 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 47 1.4397499 MeV 0 eV 0 0 /cm2 13.169175 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 48 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 0 /cm2 + 49 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 50 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 + 51 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 52 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 0 /cm2 + 53 375.88425 keV 0 eV 0 0 /cm2 1.7763586 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 + 54 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 + 55 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 56 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 57 7.3562741 keV 0 eV 0 0 /cm2 0.00068690407 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 + 58 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 59 16.696297 MeV 16.696297 MeV 4 22.844418 /cm2 22.844418 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 60 5.3423972 MeV 5.3423972 MeV 4 25.238898 /cm2 25.238898 /cm2 25.293862 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 61 16.572531 MeV 16.572531 MeV 2 0 /cm2 8.6328303 /cm2 25.246268 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 62 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 63 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 64 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 65 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 66 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 67 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 68 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 69 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 70 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 71 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 72 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 73 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 74 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 75 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 76 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 77 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 78 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 79 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 80 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 0 /cm2 + 81 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 0 /cm2 + 82 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 83 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 84 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 85 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 86 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 87 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 88 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 89 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 90 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 91 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 92 717.13195 keV 717.13195 keV 1 0 /cm2 0.18832631 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 93 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 94 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 95 212.15557 keV 0 eV 0 0 /cm2 0.35295607 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 96 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 97 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 98 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 99 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 100 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 101 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 102 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 103 1.4902926 keV 0 eV 0 0 /cm2 0.00030842905 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 104 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 105 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 106 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 107 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 108 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 109 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 110 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 111 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 112 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 113 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 114 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 115 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 116 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 117 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 118 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 119 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 120 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 121 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 122 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 123 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 124 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 125 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 126 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 127 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 128 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 129 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 130 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 131 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 132 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 133 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 134 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 135 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 136 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 137 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 138 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 139 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 140 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 141 456.89758 keV 0 eV 0 0 /cm2 3.9107554 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 142 2.6760691 keV 0 eV 0 0.25297412 /cm2 0.25297412 /cm2 50.464747 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 143 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 144 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 145 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 @@ -655,7 +744,7 @@ Run Summary 153 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 154 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 155 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 156 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 156 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 157 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 158 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 159 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 @@ -663,10 +752,10 @@ Run Summary 161 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 162 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 163 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 164 47.808028 keV 0 eV 0 3.7413677 /cm2 3.7413677 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 164 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 165 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 166 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 167 3.9142093 MeV 1.2595671 MeV 2 0 /cm2 11.334993 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 167 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 168 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 169 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 170 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 diff --git a/examples/extended/runAndEvent/RE02/run2.mac b/examples/extended/runAndEvent/RE02/run2.mac index 9951fadb2e..f6cdd57e40 100644 --- a/examples/extended/runAndEvent/RE02/run2.mac +++ b/examples/extended/runAndEvent/RE02/run2.mac @@ -1,4 +1,4 @@ -# $Id: run2.mac,v 1.1 2005/11/24 01:44:18 asaim Exp $ +# $Id: run2.mac,v 1.2 2006/11/18 01:37:23 asaim Exp $ # # Macro file for "exampleRE02.cc" # @@ -7,11 +7,11 @@ # /control/verbose 2 /run/verbose 2 -/event/verbose 0 +#/event/verbose 0 #/tracking/verbose 1 # # -/vis/scene/create +#/vis/scene/create # # Create a scene handler for a specific graphics system # (Edit the next line(s) to choose another graphic system) diff --git a/examples/extended/runAndEvent/RE02/run3.log b/examples/extended/runAndEvent/RE02/run3.log index 48985d8b96..95ec71e637 100644 --- a/examples/extended/runAndEvent/RE02/run3.log +++ b/examples/extended/runAndEvent/RE02/run3.log @@ -1,15 +1,11 @@ ************************************************************* - Geant4 version Name: geant4-07-01 (30-June-2005) + Geant4 version Name: geant4-08-01-patch-01 (27-July-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 ************************************************************* -<-- RE02DetectorConstruction ----------------- - Water Phantom Size (200,200,400) - Segmentation (100,100,200) -<--------------------------------------------- You are using the RE02PhysicsList This PhysicsList originally comes from example/extended/analysis/A01, and is modified @@ -29,7 +25,7 @@ Visualization Manager instantiating... Visualization Manager initialising... Registering graphics systems... -You have successfully chosen to use the following graphics systems. +You have successfully registered the following graphics systems. Current available graphics systems are: ASCIITree (ATree) DAWNFILE (DAWNFILE) @@ -42,42 +38,74 @@ Current available graphics systems are: FukuiRenderer (DAWN) OpenGLImmediateX (OGLIX) OpenGLStoredX (OGLSX) - OpenGLImmediateXm (OGLIXm) - OpenGLStoredXm (OGLSXm) + RayTracerX (RayTracerX) VRML1 (VRML1) VRML2 (VRML2) +Registering model factories... + +You have successfully registered the following model factories. +Registered model factories: + generic + drawByCharge + drawByParticleID + drawByOriginVolume + +Registered models: + None + +Registered filter factories: + chargeFilter + particleFilter + originVolumeFilter + +Registered filters: + None + + The materials defined are : -***** Table : Nb of materials = 2 ***** +***** Table : Nb of materials = 3 ***** Material: G4_AIR density: 1.205 mg/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 303.921 m ---> Element: C (C) Z = 6.0 N = 12.0 A = 12.01 g/mole ---> Isotope: C Z = 6 N = 12 A = 12.00 g/mole abundance: 98.93 % - ---> Isotope: C Z = 6 N = 13 A = 13.00 g/mole abundance: 1.07 % fractionMass: 0.01 % Abundance 0.02 % + ---> Isotope: C Z = 6 N = 13 A = 13.00 g/mole abundance: 1.07 % ElmMassFraction: 0.01 % ElmAbundance 0.02 % ---> Element: N (N) Z = 7.0 N = 14.0 A = 14.01 g/mole ---> Isotope: N Z = 7 N = 14 A = 14.00 g/mole abundance: 99.63 % - ---> Isotope: N Z = 7 N = 15 A = 15.00 g/mole abundance: 0.37 % fractionMass: 75.53 % Abundance 78.44 % + ---> Isotope: N Z = 7 N = 15 A = 15.00 g/mole abundance: 0.37 % ElmMassFraction: 75.53 % ElmAbundance 78.44 % ---> Element: O (O) Z = 8.0 N = 16.0 A = 16.00 g/mole ---> Isotope: O Z = 8 N = 16 A = 15.99 g/mole abundance: 99.76 % ---> Isotope: O Z = 8 N = 17 A = 17.00 g/mole abundance: 0.04 % - ---> Isotope: O Z = 8 N = 18 A = 18.00 g/mole abundance: 0.20 % fractionMass: 23.18 % Abundance 21.07 % + ---> Isotope: O Z = 8 N = 18 A = 18.00 g/mole abundance: 0.20 % ElmMassFraction: 23.18 % ElmAbundance 21.07 % ---> Element: Ar (Ar) Z = 18.0 N = 40.0 A = 39.95 g/mole ---> Isotope: Ar Z = 18 N = 36 A = 35.97 g/mole abundance: 0.34 % ---> Isotope: Ar Z = 18 N = 38 A = 37.96 g/mole abundance: 0.06 % - ---> Isotope: Ar Z = 18 N = 40 A = 39.96 g/mole abundance: 99.60 % fractionMass: 1.28 % Abundance 0.47 % + ---> Isotope: Ar Z = 18 N = 40 A = 39.96 g/mole abundance: 99.60 % ElmMassFraction: 1.28 % ElmAbundance 0.47 % - Material: G4_WATER density: 1.000 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 36.083 cm + Material: G4_WATER H_2O density: 1.000 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 36.083 cm ---> Element: H (H) Z = 1.0 N = 1.0 A = 1.01 g/mole ---> Isotope: H Z = 1 N = 1 A = 1.01 g/mole abundance: 99.99 % - ---> Isotope: H Z = 1 N = 2 A = 2.01 g/mole abundance: 0.01 % fractionMass: 11.19 % Abundance 66.67 % + ---> Isotope: H Z = 1 N = 2 A = 2.01 g/mole abundance: 0.01 % ElmMassFraction: 11.19 % ElmAbundance 66.67 % ---> Element: O (O) Z = 8.0 N = 16.0 A = 16.00 g/mole ---> Isotope: O Z = 8 N = 16 A = 15.99 g/mole abundance: 99.76 % ---> Isotope: O Z = 8 N = 17 A = 17.00 g/mole abundance: 0.04 % - ---> Isotope: O Z = 8 N = 18 A = 18.00 g/mole abundance: 0.20 % fractionMass: 88.81 % Abundance 33.33 % + ---> Isotope: O Z = 8 N = 18 A = 18.00 g/mole abundance: 0.20 % ElmMassFraction: 88.81 % ElmAbundance 33.33 % + + Material: G4_Pb density: 11.350 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 5.613 mm + ---> Element: Pb (Pb) Z = 82.0 N = 207.2 A = 207.22 g/mole + ---> Isotope: Pb Z = 82 N = 204 A = 203.97 g/mole abundance: 1.40 % + ---> Isotope: Pb Z = 82 N = 206 A = 205.97 g/mole abundance: 24.10 % + ---> Isotope: Pb Z = 82 N = 207 A = 206.98 g/mole abundance: 22.10 % + ---> Isotope: Pb Z = 82 N = 208 A = 207.98 g/mole abundance: 52.40 % ElmMassFraction: 100.00 % ElmAbundance 100.00 % +<-- RE02DetectorConstruction::Construct------- + Water Phantom Size (200,200,400) + Segmentation (100,100,200) + Lead plate at even copy # (0-False,1-True): 1 +<--------------------------------------------- ----G4SDParticleFileter particle list------ gamma ------------------------------------------- @@ -98,11 +126,11 @@ Thank you for using G4BinaryCascade. Thank you for using G4BinaryCascade. Thank you for using G4BinaryCascade. /run/verbose 2 -/event/verbose 0 +#/event/verbose 0 #/tracking/verbose 1 # # -/vis/scene/create +#/vis/scene/create # # Create a scene handler for a specific graphics system # (Edit the next line(s) to choose another graphic system) @@ -111,16 +139,13 @@ Thank you for using G4BinaryCascade. #/vis/open VRML2FILE # # viewer settings -/vis/viewer/set/viewpointThetaPhi 90 180 deg -ERROR: G4VisCommandsViewerSet::SetNewValue: no current viewer. -/vis/viewer/zoom 1.4 -ERROR: G4VisCommandsViewerZoom::SetNewValue: no current viewer. +#/vis/viewer/set/viewpointThetaPhi 90 180 deg +#/vis/viewer/zoom 1.4 # # Store trajectory -/tracking/storeTrajectory 1 -/vis/scene/add/trajectories -/vis/scene/endOfEventAction accumulate -ERROR: No current sceneHandler. Please create one. +#/tracking/storeTrajectory 1 +#/vis/scene/add/trajectories +#/vis/scene/endOfEventAction accumulate # # # Beam Parameters @@ -151,13 +176,13 @@ phot: Total cross sections from Sandia parametrisation. msc: Model variant of multiple scattering for e- Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary algorithm is active with facrange= 0.199 + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 eIoni: tables are built for e- dE/dx and range tables from 100 eV to 100 TeV in 120 bins. Lambda tables from threshold to 100 TeV in 120 bins. Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV. - Step function: finalRange(mm)= 1, dRoverRange= 1, integral: 1 + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 eBrem: tables are built for e- dE/dx and range tables from 100 eV to 100 TeV in 120 bins. @@ -169,7 +194,7 @@ eIoni: tables are built for e+ dE/dx and range tables from 100 eV to 100 TeV in 120 bins. Lambda tables from threshold to 100 TeV in 120 bins. Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV. - Step function: finalRange(mm)= 1, dRoverRange= 1, integral: 1 + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 eBrem: tables are built for e+ dE/dx and range tables from 100 eV to 100 TeV in 120 bins. @@ -190,16 +215,25 @@ hIoni: tables are built for proton msc: Model variant of multiple scattering for proton Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary algorithm is active with facrange= 0.199 + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 ionIoni: tables are built for GenericIon dE/dx and range tables from 100 eV to 100 TeV in 120 bins. Lambda tables from threshold to 100 TeV in 120 bins. Scaling relation is used to proton dE/dx and range Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for alpha particles below. + Stopping Power data for 8 ion/material pairs are used. Step function: finalRange(mm)= 0.1, dRoverRange= 0.1, integral: 1 msc: Model variant of multiple scattering for GenericIon + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +hIoni: tables are built for anti_proton + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 muIoni: tables are built for mu+ dE/dx and range tables from 100 eV to 100 TeV in 120 bins. @@ -210,7 +244,7 @@ muIoni: tables are built for mu+ msc: Model variant of multiple scattering for mu+ Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary algorithm is active with facrange= 0.199 + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 muBrems: tables are built for mu+ dE/dx and range tables from 100 eV to 100 TeV in 120 bins. @@ -239,12 +273,26 @@ muPairProd: tables are built for mu- Lambda tables from threshold to 100 TeV in 120 bins. Parametrised model +hIoni: tables are built for pi+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 0.297504 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +hIoni: tables are built for pi- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 0.297504 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + msc: Model variant of multiple scattering for pi- Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary algorithm is active with facrange= 0.199 + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 -Region DefaultRegionForTheWorld - Materials : G4_AIR G4_WATER +Region -- appears in world volume + Materials : G4_AIR G4_WATER G4_Pb Production cuts : gamma 1 mm e- 1 mm e+ 1 mm ========= Table of registered couples ============================== @@ -263,23 +311,34 @@ Index : 1 used in the geometry : Yes recalculation needed : No Region(s) which use this couple : DefaultRegionForTheWorld +Index : 2 used in the geometry : Yes recalculation needed : No + Material : G4_Pb + Range cuts : gamma 1 mm e- 1 mm e+ 1 mm + Energy thresholds : gamma 100.511 keV e- 1.37814 MeV e+ 1.28002 MeV + Region(s) which use this couple : + DefaultRegionForTheWorld + ==================================================================== Start closing geometry. G4GeometryManager::ReportVoxelStats -- Voxel Statistics - Total memory consumed for geometry optimisation: 445090 kByte - Total CPU time elapsed for geometry optimisation: 24 seconds + Total memory consumed for geometry optimisation: 13 kByte + Total CPU time elapsed for geometry optimisation: 0 seconds Voxelisation: top CPU users: Percent Total CPU System CPU Memory Volume ------- ---------- ---------- -------- ---------- - 98.99 23.52 2.12 445091k Phantom + 0.00 0.00 0.00 3k Phantom + 0.00 0.00 0.00 3k RepY + 0.00 0.00 0.00 7k RepX Voxelisation: top memory users: Percent Memory Heads Nodes Pointers Total CPU Volume ------- -------- ------ ------ -------- ---------- ---------- - -3.66 445090k 79801 13840799 16020201 23.52 Phantom + 52.81 7k 1 201 400 0.00 RepX + 23.59 3k 1 100 100 0.00 Phantom + 23.59 3k 1 100 100 0.00 RepY ++ PhantomSD/totalEDep id 0 ++ PhantomSD/protonEDep id 1 ++ PhantomSD/protonNStep id 2 @@ -494,198 +553,198 @@ Start Run processing. Run terminated. Run Summary Number of events processed : 10000 - User=96.11s Real=159.2s Sys=6.06s + User=134.25s Real=138.48s Sys=0.03s ============================================================= Number of event processed : 10000 ============================================================= #Z Cell# totalEDep protonEDep protonNStep chargedPassCellFlux chargedCellFlux chargedSurfFlux gammaSurfCurr000 gammaSurfCurr001 gammaSurfCurr002 gammaSurfCurr003 - 0 40.238056 MeV 0 eV 0 2754.5248 /cm2 2806.2455 /cm2 2775.4848 /cm2 25 /cm2 50 /cm2 0 /cm2 0 /cm2 - 1 41.194189 MeV 0 eV 0 2799.8965 /cm2 2893.4853 /cm2 2816.0498 /cm2 0 /cm2 75 /cm2 75 /cm2 75 /cm2 - 2 41.2879 MeV 0 eV 0 2771.4571 /cm2 2880.1938 /cm2 2879.6144 /cm2 0 /cm2 125 /cm2 125 /cm2 100 /cm2 - 3 42.675758 MeV 0 eV 0 2763.6281 /cm2 2943.3678 /cm2 2690.81 /cm2 0 /cm2 125 /cm2 100 /cm2 125 /cm2 - 4 42.622231 MeV 0 eV 0 2859.454 /cm2 2930.5965 /cm2 3036.9119 /cm2 0 /cm2 150 /cm2 175 /cm2 150 /cm2 - 5 41.648256 MeV 0 eV 0 2848.5172 /cm2 2979.7207 /cm2 2881.2145 /cm2 0 /cm2 175 /cm2 225 /cm2 125 /cm2 - 6 41.527038 MeV 0 eV 0 2746.5968 /cm2 2909.2385 /cm2 2795.9558 /cm2 25 /cm2 225 /cm2 400 /cm2 175 /cm2 - 7 40.947212 MeV 0 eV 0 2821.0283 /cm2 2945.3108 /cm2 2777.9642 /cm2 0 /cm2 275 /cm2 300 /cm2 225 /cm2 - 8 40.840795 MeV 0 eV 0 2773.1476 /cm2 2875.3566 /cm2 2947.5474 /cm2 0 /cm2 275 /cm2 400 /cm2 275 /cm2 - 9 40.757139 MeV 0 eV 0 2877.3545 /cm2 2944.9452 /cm2 3149.1646 /cm2 0 /cm2 250 /cm2 400 /cm2 350 /cm2 - 10 41.466714 MeV 0 eV 0 2736.1458 /cm2 2854.257 /cm2 3456.2745 /cm2 0 /cm2 275 /cm2 450 /cm2 375 /cm2 - 11 40.796966 MeV 0 eV 0 2773.1918 /cm2 2907.5341 /cm2 3228.7775 /cm2 0 /cm2 200 /cm2 575 /cm2 425 /cm2 - 12 40.9044 MeV 0 eV 0 2908.6865 /cm2 2977.7719 /cm2 3062.0162 /cm2 0 /cm2 200 /cm2 500 /cm2 400 /cm2 - 13 37.681889 MeV 0 eV 0 2714.9963 /cm2 2821.4166 /cm2 2911.0598 /cm2 0 /cm2 275 /cm2 600 /cm2 500 /cm2 - 14 35.914418 MeV 0 eV 0 2459.6884 /cm2 2607.9944 /cm2 2658.986 /cm2 25 /cm2 325 /cm2 600 /cm2 500 /cm2 - 15 31.791629 MeV 0 eV 0 2166.9101 /cm2 2250.6561 /cm2 2822.9397 /cm2 25 /cm2 400 /cm2 750 /cm2 450 /cm2 - 16 31.94854 MeV 0 eV 0 2255.057 /cm2 2336.9247 /cm2 2387.7188 /cm2 25 /cm2 325 /cm2 625 /cm2 525 /cm2 - 17 32.812416 MeV 0 eV 0 2208.3635 /cm2 2339.2054 /cm2 2301.388 /cm2 0 /cm2 425 /cm2 625 /cm2 475 /cm2 - 18 31.389977 MeV 0 eV 0 2163.3468 /cm2 2294.6304 /cm2 2287.8554 /cm2 0 /cm2 375 /cm2 750 /cm2 350 /cm2 - 19 32.791711 MeV 0 eV 0 2258.5926 /cm2 2334.4143 /cm2 2256.367 /cm2 0 /cm2 450 /cm2 825 /cm2 350 /cm2 - 20 30.060065 MeV 0 eV 0 2037.8287 /cm2 2157.514 /cm2 1933.8145 /cm2 0 /cm2 475 /cm2 850 /cm2 275 /cm2 - 21 29.997031 MeV 0 eV 0 1983.8555 /cm2 2091.2671 /cm2 2134.1901 /cm2 25 /cm2 525 /cm2 1000 /cm2 350 /cm2 - 22 26.505228 MeV 0 eV 0 1867.3171 /cm2 1941.04 /cm2 2089.115 /cm2 0 /cm2 400 /cm2 1025 /cm2 400 /cm2 - 23 23.939127 MeV 0 eV 0 1626.2629 /cm2 1693.38 /cm2 2129.054 /cm2 0 /cm2 500 /cm2 1000 /cm2 450 /cm2 - 24 23.258299 MeV 0 eV 0 1547.4106 /cm2 1602.3188 /cm2 4930.2175 /cm2 25 /cm2 450 /cm2 1000 /cm2 400 /cm2 - 25 19.45655 MeV 0 eV 0 1371.3307 /cm2 1412.0138 /cm2 5506.2076 /cm2 0 /cm2 550 /cm2 950 /cm2 575 /cm2 - 26 20.149025 MeV 0 eV 0 1322.6611 /cm2 1390.8551 /cm2 1312.4861 /cm2 25 /cm2 575 /cm2 750 /cm2 675 /cm2 - 27 20.378829 MeV 0 eV 0 1327.2442 /cm2 1431.4818 /cm2 1310.485 /cm2 25 /cm2 550 /cm2 975 /cm2 575 /cm2 - 28 24.370345 MeV 0 eV 0 1528.8832 /cm2 1643.2222 /cm2 1568.7751 /cm2 0 /cm2 475 /cm2 850 /cm2 425 /cm2 - 29 21.97834 MeV 0 eV 0 1476.5124 /cm2 1553.4961 /cm2 1581.0556 /cm2 25 /cm2 400 /cm2 725 /cm2 425 /cm2 - 30 24.434494 MeV 0 eV 0 1541.3773 /cm2 1683.7489 /cm2 1628.9524 /cm2 0 /cm2 425 /cm2 600 /cm2 350 /cm2 - 31 20.476765 MeV 0 eV 0 1463.5121 /cm2 1493.6947 /cm2 1552.3657 /cm2 0 /cm2 500 /cm2 775 /cm2 425 /cm2 - 32 16.552912 MeV 0 eV 0 1093.6949 /cm2 1134.0384 /cm2 1343.2292 /cm2 0 /cm2 450 /cm2 700 /cm2 475 /cm2 - 33 16.318346 MeV 0 eV 0 1153.5066 /cm2 1219.316 /cm2 1085.7162 /cm2 25 /cm2 325 /cm2 825 /cm2 450 /cm2 - 34 18.08827 MeV 0 eV 0 1154.5583 /cm2 1209.6824 /cm2 1348.4902 /cm2 0 /cm2 400 /cm2 825 /cm2 400 /cm2 - 35 16.829554 MeV 0 eV 0 1049.1561 /cm2 1162.0256 /cm2 1148.1826 /cm2 0 /cm2 400 /cm2 850 /cm2 350 /cm2 - 36 14.59147 MeV 0 eV 0 939.24171 /cm2 1010.5249 /cm2 898.07409 /cm2 0 /cm2 350 /cm2 750 /cm2 475 /cm2 - 37 14.066373 MeV 0 eV 0 808.58767 /cm2 924.88634 /cm2 1216.7115 /cm2 0 /cm2 225 /cm2 725 /cm2 475 /cm2 - 38 8.5671281 MeV 0 eV 0 630.46215 /cm2 632.09423 /cm2 739.70277 /cm2 0 /cm2 225 /cm2 725 /cm2 475 /cm2 - 39 9.4985197 MeV 0 eV 0 566.85498 /cm2 610.61938 /cm2 531.27698 /cm2 0 /cm2 200 /cm2 700 /cm2 400 /cm2 - 40 8.9311683 MeV 0 eV 0 606.87264 /cm2 637.95297 /cm2 711.10194 /cm2 0 /cm2 200 /cm2 700 /cm2 450 /cm2 - 41 10.230323 MeV 0 eV 0 738.76546 /cm2 743.2449 /cm2 670.92192 /cm2 25 /cm2 275 /cm2 750 /cm2 500 /cm2 - 42 11.500963 MeV 0 eV 0 817.30456 /cm2 817.31204 /cm2 1332.7524 /cm2 0 /cm2 300 /cm2 650 /cm2 325 /cm2 - 43 7.7339775 MeV 0 eV 0 494.08618 /cm2 531.02649 /cm2 601.721 /cm2 0 /cm2 200 /cm2 575 /cm2 400 /cm2 - 44 8.3123746 MeV 0 eV 0 514.89283 /cm2 592.28394 /cm2 430.77332 /cm2 0 /cm2 200 /cm2 550 /cm2 250 /cm2 - 45 7.1793133 MeV 0 eV 0 449.53028 /cm2 494.85618 /cm2 747.00889 /cm2 0 /cm2 175 /cm2 700 /cm2 250 /cm2 - 46 8.037655 MeV 0 eV 0 551.19097 /cm2 569.15519 /cm2 486.19477 /cm2 0 /cm2 150 /cm2 700 /cm2 225 /cm2 - 47 7.0168484 MeV 0 eV 0 507.94682 /cm2 513.69897 /cm2 738.9718 /cm2 0 /cm2 200 /cm2 725 /cm2 250 /cm2 - 48 6.1495846 MeV 0 eV 0 404.53446 /cm2 426.84216 /cm2 414.07586 /cm2 25 /cm2 250 /cm2 575 /cm2 250 /cm2 - 49 5.4008816 MeV 0 eV 0 320.80109 /cm2 342.54853 /cm2 430.17971 /cm2 0 /cm2 150 /cm2 325 /cm2 300 /cm2 - 50 5.8367608 MeV 0 eV 0 336.65702 /cm2 379.77763 /cm2 304.63114 /cm2 0 /cm2 100 /cm2 475 /cm2 375 /cm2 - 51 5.266217 MeV 0 eV 0 330.86874 /cm2 363.04554 /cm2 864.86167 /cm2 0 /cm2 175 /cm2 600 /cm2 250 /cm2 - 52 6.7661788 MeV 0 eV 0 438.06645 /cm2 465.8097 /cm2 392.81116 /cm2 0 /cm2 150 /cm2 375 /cm2 325 /cm2 - 53 4.3272488 MeV 0 eV 0 324.83246 /cm2 335.89457 /cm2 489.49415 /cm2 0 /cm2 225 /cm2 325 /cm2 275 /cm2 - 54 4.2771145 MeV 0 eV 0 323.29579 /cm2 323.31551 /cm2 277.25973 /cm2 0 /cm2 225 /cm2 325 /cm2 300 /cm2 - 55 4.9028638 MeV 0 eV 0 270.48524 /cm2 303.16991 /cm2 231.52403 /cm2 0 /cm2 325 /cm2 200 /cm2 350 /cm2 - 56 4.9691084 MeV 0 eV 0 323.708 /cm2 356.90264 /cm2 538.51825 /cm2 0 /cm2 225 /cm2 225 /cm2 350 /cm2 - 57 3.6317394 MeV 0 eV 0 215.92425 /cm2 250.8606 /cm2 312.09944 /cm2 0 /cm2 200 /cm2 225 /cm2 325 /cm2 - 58 4.4024811 MeV 0 eV 0 243.06569 /cm2 289.72861 /cm2 214.65046 /cm2 0 /cm2 175 /cm2 250 /cm2 275 /cm2 - 59 2.7979065 MeV 0 eV 0 166.21807 /cm2 166.21807 /cm2 149.94926 /cm2 0 /cm2 200 /cm2 225 /cm2 125 /cm2 - 60 2.8611252 MeV 0 eV 0 196.73444 /cm2 196.73444 /cm2 518.83942 /cm2 0 /cm2 275 /cm2 175 /cm2 200 /cm2 - 61 2.6101907 MeV 0 eV 0 182.22573 /cm2 182.22654 /cm2 211.12244 /cm2 0 /cm2 200 /cm2 225 /cm2 200 /cm2 - 62 3.0810186 MeV 0 eV 0 200.09617 /cm2 207.45273 /cm2 284.14927 /cm2 0 /cm2 150 /cm2 300 /cm2 225 /cm2 - 63 3.0250381 MeV 0 eV 0 182.32672 /cm2 199.51043 /cm2 170.78567 /cm2 0 /cm2 225 /cm2 100 /cm2 250 /cm2 - 64 2.2608581 MeV 0 eV 0 169.30448 /cm2 169.30448 /cm2 146.29715 /cm2 0 /cm2 125 /cm2 100 /cm2 275 /cm2 - 65 2.4324817 MeV 0 eV 0 123.58873 /cm2 140.67484 /cm2 189.26793 /cm2 0 /cm2 150 /cm2 125 /cm2 225 /cm2 - 66 2.1516246 MeV 0 eV 0 159.88479 /cm2 159.88479 /cm2 119.50271 /cm2 0 /cm2 75 /cm2 125 /cm2 225 /cm2 - 67 1.870419 MeV 0 eV 0 124.20861 /cm2 124.20861 /cm2 136.94483 /cm2 0 /cm2 50 /cm2 125 /cm2 225 /cm2 - 68 480.85498 keV 0 eV 0 36.739382 /cm2 36.739382 /cm2 80.545328 /cm2 0 /cm2 75 /cm2 75 /cm2 175 /cm2 - 69 504.92629 keV 0 eV 0 41.060098 /cm2 41.060098 /cm2 31.521252 /cm2 0 /cm2 125 /cm2 75 /cm2 150 /cm2 - 70 324.94675 keV 0 eV 0 3.0909979 /cm2 10.944038 /cm2 34.815891 /cm2 0 /cm2 75 /cm2 100 /cm2 175 /cm2 - 71 1.3171374 MeV 0 eV 0 60.241023 /cm2 66.837224 /cm2 0 /cm2 0 /cm2 75 /cm2 125 /cm2 200 /cm2 - 72 496.14488 keV 0 eV 0 37.744081 /cm2 37.826632 /cm2 82.15838 /cm2 0 /cm2 100 /cm2 150 /cm2 250 /cm2 - 73 372.49757 keV 0 eV 0 7.2023623 /cm2 19.093179 /cm2 45.106727 /cm2 0 /cm2 100 /cm2 125 /cm2 225 /cm2 - 74 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 100 /cm2 200 /cm2 200 /cm2 - 75 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 175 /cm2 250 /cm2 - 76 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 175 /cm2 225 /cm2 - 77 427.08152 keV 0 eV 0 27.030886 /cm2 28.48377 /cm2 0 /cm2 0 /cm2 75 /cm2 100 /cm2 225 /cm2 - 78 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 250 /cm2 250 /cm2 - 79 28.937883 keV 0 eV 0 0 /cm2 0.20125527 /cm2 0 /cm2 0 /cm2 25 /cm2 125 /cm2 225 /cm2 - 80 465.75067 eV 0 eV 0 0 /cm2 0.00032830793 /cm2 0 /cm2 0 /cm2 75 /cm2 100 /cm2 200 /cm2 - 81 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 75 /cm2 100 /cm2 225 /cm2 - 82 3.3547752 keV 0 eV 0 0 /cm2 0.0049495756 /cm2 0 /cm2 0 /cm2 25 /cm2 150 /cm2 225 /cm2 - 83 476.79631 keV 0 eV 0 37.874067 /cm2 37.874067 /cm2 0 /cm2 0 /cm2 0 /cm2 125 /cm2 200 /cm2 - 84 160.18165 keV 0 eV 0 15.65208 /cm2 15.65208 /cm2 26.081638 /cm2 0 /cm2 0 /cm2 125 /cm2 200 /cm2 - 85 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 100 /cm2 200 /cm2 - 86 22.295013 keV 0 eV 0 0 /cm2 0.13126697 /cm2 0 /cm2 0 /cm2 0 /cm2 100 /cm2 175 /cm2 - 87 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 150 /cm2 175 /cm2 - 88 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 125 /cm2 175 /cm2 - 89 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 200 /cm2 150 /cm2 - 90 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 150 /cm2 125 /cm2 - 91 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 125 /cm2 125 /cm2 - 92 3.8558096 keV 0 eV 0 0 /cm2 0.0062165403 /cm2 0 /cm2 0 /cm2 25 /cm2 125 /cm2 125 /cm2 - 93 33.210523 keV 0 eV 0 0 /cm2 2.3350406 /cm2 0 /cm2 0 /cm2 50 /cm2 125 /cm2 125 /cm2 - 94 546.76003 keV 0 eV 0 18.751869 /cm2 30.512755 /cm2 38.520944 /cm2 0 /cm2 25 /cm2 75 /cm2 125 /cm2 - 95 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 125 /cm2 - 96 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 125 /cm2 - 97 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 125 /cm2 - 98 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 100 /cm2 - 99 94.303833 keV 0 eV 0 0 /cm2 2.7866016 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 75 /cm2 - 100 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 25 /cm2 100 /cm2 - 101 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 25 /cm2 75 /cm2 - 102 300.44449 keV 0 eV 0 0 /cm2 9.8993737 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 75 /cm2 - 103 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 100 /cm2 - 104 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 25 /cm2 125 /cm2 - 105 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 50 /cm2 150 /cm2 - 106 263.23814 keV 0 eV 0 20.998061 /cm2 21.060685 /cm2 0 /cm2 0 /cm2 50 /cm2 25 /cm2 125 /cm2 - 107 384.39696 keV 0 eV 0 30.708781 /cm2 30.708781 /cm2 27.366148 /cm2 0 /cm2 50 /cm2 75 /cm2 125 /cm2 - 108 183.21053 keV 0 eV 0 16.053002 /cm2 16.053002 /cm2 155.36564 /cm2 0 /cm2 50 /cm2 50 /cm2 100 /cm2 - 109 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 50 /cm2 100 /cm2 - 110 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 75 /cm2 100 /cm2 - 111 118.43913 keV 0 eV 0 8.4150251 /cm2 8.4150251 /cm2 0 /cm2 0 /cm2 25 /cm2 50 /cm2 75 /cm2 - 112 403.26716 keV 0 eV 0 0.42013255 /cm2 14.232242 /cm2 25.879392 /cm2 0 /cm2 0 /cm2 75 /cm2 100 /cm2 - 113 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 100 /cm2 - 114 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 100 /cm2 - 115 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 25 /cm2 100 /cm2 - 116 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 100 /cm2 - 117 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 100 /cm2 - 118 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 100 /cm2 - 119 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 75 /cm2 - 120 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 50 /cm2 - 121 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 75 /cm2 - 122 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 75 /cm2 50 /cm2 - 123 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 25 /cm2 75 /cm2 - 124 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 - 125 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 - 126 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 75 /cm2 - 127 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 75 /cm2 - 128 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 75 /cm2 - 129 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 75 /cm2 - 130 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 75 /cm2 - 131 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 25 /cm2 75 /cm2 - 132 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 25 /cm2 50 /cm2 - 133 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 50 /cm2 - 134 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 75 /cm2 - 135 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 75 /cm2 - 136 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 75 /cm2 - 137 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 75 /cm2 - 138 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 75 /cm2 - 139 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 75 /cm2 - 140 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 - 141 2.9436204 keV 0 eV 0 0.13893323 /cm2 0.13893323 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 - 142 725.73212 keV 0 eV 0 0 /cm2 38.776776 /cm2 31.200332 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 143 74.277052 keV 0 eV 0 6.4889814 /cm2 6.4889814 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 25 /cm2 - 144 582.24787 keV 0 eV 0 30.972891 /cm2 30.972891 /cm2 26.847672 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 145 678.68142 keV 0 eV 0 51.338785 /cm2 51.338785 /cm2 50.956346 /cm2 0 /cm2 25 /cm2 0 /cm2 25 /cm2 - 146 851.38853 keV 0 eV 0 37.584886 /cm2 54.033056 /cm2 55.729277 /cm2 0 /cm2 25 /cm2 0 /cm2 75 /cm2 - 147 82.940973 keV 0 eV 0 4.9907094 /cm2 4.9907094 /cm2 39.602115 /cm2 0 /cm2 25 /cm2 25 /cm2 50 /cm2 - 148 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 75 /cm2 50 /cm2 - 149 208.77026 keV 0 eV 0 16.337579 /cm2 16.337579 /cm2 127.94464 /cm2 0 /cm2 0 /cm2 50 /cm2 50 /cm2 - 150 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 - 151 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 152 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 153 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 154 216.09864 keV 0 eV 0 15.179382 /cm2 15.179382 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 155 503.07781 keV 0 eV 0 25.950565 /cm2 33.105687 /cm2 25.699544 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 156 304.63732 keV 0 eV 0 27.024474 /cm2 27.024474 /cm2 26.826074 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 157 204.43899 keV 0 eV 0 17.098925 /cm2 17.098925 /cm2 27.173296 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 158 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 25 /cm2 0 /cm2 - 159 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 50 /cm2 0 /cm2 - 160 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 50 /cm2 0 /cm2 - 161 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 0 /cm2 - 162 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 0 /cm2 - 163 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 - 164 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 - 165 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 0 /cm2 + 0 37.183678 MeV 0 eV 0 2489.8121 /cm2 2608.0099 /cm2 2009.0375 /cm2 0 /cm2 25 /cm2 600 /cm2 325 /cm2 + 1 518.80208 MeV 0 eV 0 3249.3296 /cm2 4668.2643 /cm2 3320.8467 /cm2 0 /cm2 50 /cm2 1325 /cm2 850 /cm2 + 2 48.473872 MeV 0 eV 0 3123.3723 /cm2 3257.858 /cm2 4025.7739 /cm2 0 /cm2 0 /cm2 4600 /cm2 3725 /cm2 + 3 298.41491 MeV 0 eV 0 1289.9537 /cm2 2603.5154 /cm2 2310.5796 /cm2 0 /cm2 75 /cm2 4275 /cm2 3625 /cm2 + 4 11.987362 MeV 0 eV 0 797.49487 /cm2 836.3652 /cm2 1237.3117 /cm2 0 /cm2 0 /cm2 3650 /cm2 3650 /cm2 + 5 117.90243 MeV 0 eV 0 317.70187 /cm2 1048.4604 /cm2 1473.677 /cm2 0 /cm2 25 /cm2 2975 /cm2 3250 /cm2 + 6 6.695144 MeV 0 eV 0 392.59467 /cm2 432.47777 /cm2 730.45353 /cm2 0 /cm2 25 /cm2 2525 /cm2 2850 /cm2 + 7 52.222228 MeV 0 eV 0 82.202583 /cm2 436.42617 /cm2 4846.1172 /cm2 0 /cm2 0 /cm2 1800 /cm2 2850 /cm2 + 8 5.4988939 MeV 0 eV 0 310.53168 /cm2 372.98591 /cm2 301.16522 /cm2 0 /cm2 0 /cm2 1475 /cm2 2550 /cm2 + 9 30.425206 MeV 0 eV 0 60.839436 /cm2 254.00567 /cm2 740.15191 /cm2 0 /cm2 0 /cm2 1250 /cm2 2025 /cm2 + 10 3.1721615 MeV 0 eV 0 147.70532 /cm2 188.77184 /cm2 169.14229 /cm2 0 /cm2 0 /cm2 925 /cm2 1975 /cm2 + 11 27.825756 MeV 0 eV 0 20.736122 /cm2 205.1971 /cm2 170.12104 /cm2 0 /cm2 0 /cm2 750 /cm2 1725 /cm2 + 12 4.4251977 MeV 0 eV 0 224.75965 /cm2 279.24825 /cm2 596.70583 /cm2 0 /cm2 0 /cm2 850 /cm2 1350 /cm2 + 13 23.202751 MeV 0 eV 0 45.345629 /cm2 208.48634 /cm2 194.028 /cm2 0 /cm2 0 /cm2 550 /cm2 1200 /cm2 + 14 3.0411594 MeV 0 eV 0 195.50232 /cm2 205.43474 /cm2 129.42915 /cm2 0 /cm2 0 /cm2 475 /cm2 825 /cm2 + 15 19.841355 MeV 0 eV 0 8.8278119 /cm2 161.10162 /cm2 104.31297 /cm2 0 /cm2 0 /cm2 500 /cm2 750 /cm2 + 16 1.5599881 MeV 0 eV 0 66.017973 /cm2 79.932754 /cm2 0 /cm2 0 /cm2 0 /cm2 525 /cm2 725 /cm2 + 17 10.581281 MeV 0 eV 0 12.243738 /cm2 90.888419 /cm2 0 /cm2 0 /cm2 0 /cm2 425 /cm2 575 /cm2 + 18 399.26257 keV 0 eV 0 30.507014 /cm2 30.507014 /cm2 25.729207 /cm2 0 /cm2 0 /cm2 375 /cm2 625 /cm2 + 19 14.564659 MeV 0 eV 0 0 /cm2 118.3633 /cm2 26.323152 /cm2 0 /cm2 0 /cm2 250 /cm2 525 /cm2 + 20 1.1404885 MeV 0 eV 0 84.129152 /cm2 84.129152 /cm2 58.254202 /cm2 0 /cm2 0 /cm2 200 /cm2 400 /cm2 + 21 7.0855784 MeV 0 eV 0 3.5327834 /cm2 60.808399 /cm2 267.85986 /cm2 0 /cm2 0 /cm2 225 /cm2 375 /cm2 + 22 19.549031 keV 0 eV 0 1.6389175 /cm2 1.6389175 /cm2 0 /cm2 0 /cm2 0 /cm2 225 /cm2 250 /cm2 + 23 1.6140979 MeV 0 eV 0 2.4757178 /cm2 12.584887 /cm2 29.229394 /cm2 0 /cm2 0 /cm2 125 /cm2 250 /cm2 + 24 37.668045 keV 0 eV 0 4.1034236 /cm2 4.1034236 /cm2 90.735575 /cm2 0 /cm2 0 /cm2 125 /cm2 225 /cm2 + 25 6.5175242 MeV 0 eV 0 0 /cm2 57.147964 /cm2 0 /cm2 0 /cm2 0 /cm2 125 /cm2 275 /cm2 + 26 161.53258 keV 0 eV 0 7.9199609 /cm2 9.199055 /cm2 51.871135 /cm2 0 /cm2 0 /cm2 100 /cm2 225 /cm2 + 27 2.5279999 MeV 0 eV 0 0 /cm2 21.066794 /cm2 0 /cm2 0 /cm2 0 /cm2 100 /cm2 175 /cm2 + 28 648.40683 keV 0 eV 0 24.761793 /cm2 39.242419 /cm2 0 /cm2 0 /cm2 0 /cm2 100 /cm2 175 /cm2 + 29 5.8405336 MeV 0 eV 0 0 /cm2 46.926006 /cm2 28.860495 /cm2 0 /cm2 0 /cm2 50 /cm2 150 /cm2 + 30 47.429752 keV 0 eV 0 2.3822185 /cm2 2.3822185 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 125 /cm2 + 31 595.56239 keV 0 eV 0 0 /cm2 3.9212469 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 200 /cm2 + 32 634.38789 keV 0 eV 0 16.696286 /cm2 34.306155 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 200 /cm2 + 33 1.2302935 MeV 0 eV 0 6.8825885 /cm2 11.20814 /cm2 33.462142 /cm2 0 /cm2 0 /cm2 25 /cm2 75 /cm2 + 34 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 + 35 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 75 /cm2 + 36 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 75 /cm2 + 37 1.017876 MeV 0 eV 0 0 /cm2 4.9469531 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 100 /cm2 + 38 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 75 /cm2 + 39 407.51316 keV 0 eV 0 0 /cm2 2.0613004 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 75 /cm2 + 40 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 100 /cm2 + 41 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 100 /cm2 + 42 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 43 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 + 44 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 45 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 46 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 47 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 48 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 + 49 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 50 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 51 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 + 52 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 53 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 54 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 55 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 56 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 57 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 58 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 59 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 60 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 61 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 62 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 63 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 64 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 65 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 66 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 67 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 68 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 69 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 70 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 71 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 72 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 73 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 74 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 75 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 76 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 77 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 78 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 79 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 80 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 + 81 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 82 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 83 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 84 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 85 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 86 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 87 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 88 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 89 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 90 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 91 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 92 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 93 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 94 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 95 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 96 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 97 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 98 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 99 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 100 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 101 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 102 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 103 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 104 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 105 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 106 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 107 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 108 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 109 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 110 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 111 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 112 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 113 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 114 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 115 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 116 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 117 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 118 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 119 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 120 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 121 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 122 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 123 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 124 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 125 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 126 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 127 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 128 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 129 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 130 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 131 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 132 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 133 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 134 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 135 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 136 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 137 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 138 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 139 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 140 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 141 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 142 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 143 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 144 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 145 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 146 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 147 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 148 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 149 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 150 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 151 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 152 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 153 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 154 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 155 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 156 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 157 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 158 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 159 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 160 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 161 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 162 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 163 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 164 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 165 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 166 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 167 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 168 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 169 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 170 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 171 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 25 /cm2 + 170 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 171 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 172 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 173 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 174 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 175 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 176 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 177 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 178 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 179 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 180 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 25 /cm2 - 181 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 25 /cm2 - 182 62.691242 keV 0 eV 0 5.1384317 /cm2 5.1384317 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 25 /cm2 - 183 153.03232 keV 0 eV 0 0 /cm2 10.389716 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 - 184 308.84397 keV 0 eV 0 25.67308 /cm2 25.67308 /cm2 25.339672 /cm2 0 /cm2 0 /cm2 0 /cm2 75 /cm2 - 185 344.75127 keV 0 eV 0 25.501364 /cm2 25.501364 /cm2 25.135394 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 - 186 289.27139 keV 0 eV 0 24.811629 /cm2 24.811629 /cm2 25.335509 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 + 177 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 178 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 179 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 180 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 181 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 182 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 183 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 184 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 185 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 186 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 187 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 188 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 189 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 @@ -693,12 +752,12 @@ Run Summary 191 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 192 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 193 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 - 194 73.730222 keV 0 eV 0 5.2381028 /cm2 5.2381028 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 195 317.48887 keV 0 eV 0 0 /cm2 13.529465 /cm2 53.670396 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 - 196 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 - 197 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 - 198 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 - 199 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 + 194 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 195 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 196 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 197 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 198 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 199 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 ============================================= # Graphics systems deleted. diff --git a/examples/extended/runAndEvent/RE02/run3.mac b/examples/extended/runAndEvent/RE02/run3.mac index 11357e5b51..d6c9b29ac0 100644 --- a/examples/extended/runAndEvent/RE02/run3.mac +++ b/examples/extended/runAndEvent/RE02/run3.mac @@ -1,4 +1,4 @@ -# $Id: run3.mac,v 1.1 2005/11/24 01:44:18 asaim Exp $ +# $Id: run3.mac,v 1.2 2006/11/18 01:37:23 asaim Exp $ # # Macro file for "exampleRE02.cc" # @@ -7,11 +7,11 @@ # /control/verbose 2 /run/verbose 2 -/event/verbose 0 +#/event/verbose 0 #/tracking/verbose 1 # # -/vis/scene/create +#/vis/scene/create # # Create a scene handler for a specific graphics system # (Edit the next line(s) to choose another graphic system) @@ -20,13 +20,13 @@ #/vis/open VRML2FILE # # viewer settings -/vis/viewer/set/viewpointThetaPhi 90 180 deg -/vis/viewer/zoom 1.4 +#/vis/viewer/set/viewpointThetaPhi 90 180 deg +#/vis/viewer/zoom 1.4 # # Store trajectory -/tracking/storeTrajectory 1 -/vis/scene/add/trajectories -/vis/scene/endOfEventAction accumulate +#/tracking/storeTrajectory 1 +#/vis/scene/add/trajectories +#/vis/scene/endOfEventAction accumulate # # # Beam Parameters diff --git a/examples/extended/runAndEvent/RE02/run4.log b/examples/extended/runAndEvent/RE02/run4.log index 20ce034e8a..9c5b1484dc 100644 --- a/examples/extended/runAndEvent/RE02/run4.log +++ b/examples/extended/runAndEvent/RE02/run4.log @@ -1,15 +1,11 @@ ************************************************************* - Geant4 version Name: geant4-07-01 (30-June-2005) + Geant4 version Name: geant4-08-01-patch-01 (27-July-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 ************************************************************* -<-- RE02DetectorConstruction ----------------- - Water Phantom Size (200,200,400) - Segmentation (100,100,200) -<--------------------------------------------- You are using the RE02PhysicsList This PhysicsList originally comes from example/extended/analysis/A01, and is modified @@ -29,7 +25,7 @@ Visualization Manager instantiating... Visualization Manager initialising... Registering graphics systems... -You have successfully chosen to use the following graphics systems. +You have successfully registered the following graphics systems. Current available graphics systems are: ASCIITree (ATree) DAWNFILE (DAWNFILE) @@ -42,42 +38,74 @@ Current available graphics systems are: FukuiRenderer (DAWN) OpenGLImmediateX (OGLIX) OpenGLStoredX (OGLSX) - OpenGLImmediateXm (OGLIXm) - OpenGLStoredXm (OGLSXm) + RayTracerX (RayTracerX) VRML1 (VRML1) VRML2 (VRML2) +Registering model factories... + +You have successfully registered the following model factories. +Registered model factories: + generic + drawByCharge + drawByParticleID + drawByOriginVolume + +Registered models: + None + +Registered filter factories: + chargeFilter + particleFilter + originVolumeFilter + +Registered filters: + None + + The materials defined are : -***** Table : Nb of materials = 2 ***** +***** Table : Nb of materials = 3 ***** Material: G4_AIR density: 1.205 mg/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 303.921 m ---> Element: C (C) Z = 6.0 N = 12.0 A = 12.01 g/mole ---> Isotope: C Z = 6 N = 12 A = 12.00 g/mole abundance: 98.93 % - ---> Isotope: C Z = 6 N = 13 A = 13.00 g/mole abundance: 1.07 % fractionMass: 0.01 % Abundance 0.02 % + ---> Isotope: C Z = 6 N = 13 A = 13.00 g/mole abundance: 1.07 % ElmMassFraction: 0.01 % ElmAbundance 0.02 % ---> Element: N (N) Z = 7.0 N = 14.0 A = 14.01 g/mole ---> Isotope: N Z = 7 N = 14 A = 14.00 g/mole abundance: 99.63 % - ---> Isotope: N Z = 7 N = 15 A = 15.00 g/mole abundance: 0.37 % fractionMass: 75.53 % Abundance 78.44 % + ---> Isotope: N Z = 7 N = 15 A = 15.00 g/mole abundance: 0.37 % ElmMassFraction: 75.53 % ElmAbundance 78.44 % ---> Element: O (O) Z = 8.0 N = 16.0 A = 16.00 g/mole ---> Isotope: O Z = 8 N = 16 A = 15.99 g/mole abundance: 99.76 % ---> Isotope: O Z = 8 N = 17 A = 17.00 g/mole abundance: 0.04 % - ---> Isotope: O Z = 8 N = 18 A = 18.00 g/mole abundance: 0.20 % fractionMass: 23.18 % Abundance 21.07 % + ---> Isotope: O Z = 8 N = 18 A = 18.00 g/mole abundance: 0.20 % ElmMassFraction: 23.18 % ElmAbundance 21.07 % ---> Element: Ar (Ar) Z = 18.0 N = 40.0 A = 39.95 g/mole ---> Isotope: Ar Z = 18 N = 36 A = 35.97 g/mole abundance: 0.34 % ---> Isotope: Ar Z = 18 N = 38 A = 37.96 g/mole abundance: 0.06 % - ---> Isotope: Ar Z = 18 N = 40 A = 39.96 g/mole abundance: 99.60 % fractionMass: 1.28 % Abundance 0.47 % + ---> Isotope: Ar Z = 18 N = 40 A = 39.96 g/mole abundance: 99.60 % ElmMassFraction: 1.28 % ElmAbundance 0.47 % - Material: G4_WATER density: 1.000 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 36.083 cm + Material: G4_WATER H_2O density: 1.000 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 36.083 cm ---> Element: H (H) Z = 1.0 N = 1.0 A = 1.01 g/mole ---> Isotope: H Z = 1 N = 1 A = 1.01 g/mole abundance: 99.99 % - ---> Isotope: H Z = 1 N = 2 A = 2.01 g/mole abundance: 0.01 % fractionMass: 11.19 % Abundance 66.67 % + ---> Isotope: H Z = 1 N = 2 A = 2.01 g/mole abundance: 0.01 % ElmMassFraction: 11.19 % ElmAbundance 66.67 % ---> Element: O (O) Z = 8.0 N = 16.0 A = 16.00 g/mole ---> Isotope: O Z = 8 N = 16 A = 15.99 g/mole abundance: 99.76 % ---> Isotope: O Z = 8 N = 17 A = 17.00 g/mole abundance: 0.04 % - ---> Isotope: O Z = 8 N = 18 A = 18.00 g/mole abundance: 0.20 % fractionMass: 88.81 % Abundance 33.33 % + ---> Isotope: O Z = 8 N = 18 A = 18.00 g/mole abundance: 0.20 % ElmMassFraction: 88.81 % ElmAbundance 33.33 % + + Material: G4_Pb density: 11.350 g/cm3 temperature: 273.15 K pressure: 1.00 atm RadLength: 5.613 mm + ---> Element: Pb (Pb) Z = 82.0 N = 207.2 A = 207.22 g/mole + ---> Isotope: Pb Z = 82 N = 204 A = 203.97 g/mole abundance: 1.40 % + ---> Isotope: Pb Z = 82 N = 206 A = 205.97 g/mole abundance: 24.10 % + ---> Isotope: Pb Z = 82 N = 207 A = 206.98 g/mole abundance: 22.10 % + ---> Isotope: Pb Z = 82 N = 208 A = 207.98 g/mole abundance: 52.40 % ElmMassFraction: 100.00 % ElmAbundance 100.00 % +<-- RE02DetectorConstruction::Construct------- + Water Phantom Size (200,200,400) + Segmentation (100,100,200) + Lead plate at even copy # (0-False,1-True): 1 +<--------------------------------------------- ----G4SDParticleFileter particle list------ gamma ------------------------------------------- @@ -98,11 +126,11 @@ Thank you for using G4BinaryCascade. Thank you for using G4BinaryCascade. Thank you for using G4BinaryCascade. /run/verbose 2 -/event/verbose 0 +#/event/verbose 0 #/tracking/verbose 1 # # -/vis/scene/create +#/vis/scene/create # # Create a scene handler for a specific graphics system # (Edit the next line(s) to choose another graphic system) @@ -111,16 +139,13 @@ Thank you for using G4BinaryCascade. #/vis/open VRML2FILE # # viewer settings -/vis/viewer/set/viewpointThetaPhi 90 180 deg -ERROR: G4VisCommandsViewerSet::SetNewValue: no current viewer. -/vis/viewer/zoom 1.4 -ERROR: G4VisCommandsViewerZoom::SetNewValue: no current viewer. +#/vis/viewer/set/viewpointThetaPhi 90 180 deg +#/vis/viewer/zoom 1.4 # # Store trajectory -/tracking/storeTrajectory 1 -/vis/scene/add/trajectories -/vis/scene/endOfEventAction accumulate -ERROR: No current sceneHandler. Please create one. +#/tracking/storeTrajectory 1 +#/vis/scene/add/trajectories +#/vis/scene/endOfEventAction accumulate # # # Beam Parameters @@ -153,13 +178,13 @@ phot: Total cross sections from Sandia parametrisation. msc: Model variant of multiple scattering for e- Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary algorithm is active with facrange= 0.199 + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 eIoni: tables are built for e- dE/dx and range tables from 100 eV to 100 TeV in 120 bins. Lambda tables from threshold to 100 TeV in 120 bins. Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV. - Step function: finalRange(mm)= 1, dRoverRange= 1, integral: 1 + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 eBrem: tables are built for e- dE/dx and range tables from 100 eV to 100 TeV in 120 bins. @@ -171,7 +196,7 @@ eIoni: tables are built for e+ dE/dx and range tables from 100 eV to 100 TeV in 120 bins. Lambda tables from threshold to 100 TeV in 120 bins. Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV. - Step function: finalRange(mm)= 1, dRoverRange= 1, integral: 1 + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 eBrem: tables are built for e+ dE/dx and range tables from 100 eV to 100 TeV in 120 bins. @@ -192,16 +217,25 @@ hIoni: tables are built for proton msc: Model variant of multiple scattering for proton Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary algorithm is active with facrange= 0.199 + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 ionIoni: tables are built for GenericIon dE/dx and range tables from 100 eV to 100 TeV in 120 bins. Lambda tables from threshold to 100 TeV in 120 bins. Scaling relation is used to proton dE/dx and range Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for alpha particles below. + Stopping Power data for 8 ion/material pairs are used. Step function: finalRange(mm)= 0.1, dRoverRange= 0.1, integral: 1 msc: Model variant of multiple scattering for GenericIon + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +hIoni: tables are built for anti_proton + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 muIoni: tables are built for mu+ dE/dx and range tables from 100 eV to 100 TeV in 120 bins. @@ -212,7 +246,7 @@ muIoni: tables are built for mu+ msc: Model variant of multiple scattering for mu+ Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary algorithm is active with facrange= 0.199 + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 muBrems: tables are built for mu+ dE/dx and range tables from 100 eV to 100 TeV in 120 bins. @@ -241,12 +275,26 @@ muPairProd: tables are built for mu- Lambda tables from threshold to 100 TeV in 120 bins. Parametrised model +hIoni: tables are built for pi+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 0.297504 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +hIoni: tables are built for pi- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 0.297504 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + msc: Model variant of multiple scattering for pi- Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary algorithm is active with facrange= 0.199 + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 -Region DefaultRegionForTheWorld - Materials : G4_AIR G4_WATER +Region -- appears in world volume + Materials : G4_AIR G4_WATER G4_Pb Production cuts : gamma 1 mm e- 1 mm e+ 1 mm ========= Table of registered couples ============================== @@ -265,23 +313,34 @@ Index : 1 used in the geometry : Yes recalculation needed : No Region(s) which use this couple : DefaultRegionForTheWorld +Index : 2 used in the geometry : Yes recalculation needed : No + Material : G4_Pb + Range cuts : gamma 1 mm e- 1 mm e+ 1 mm + Energy thresholds : gamma 100.511 keV e- 1.37814 MeV e+ 1.28002 MeV + Region(s) which use this couple : + DefaultRegionForTheWorld + ==================================================================== Start closing geometry. G4GeometryManager::ReportVoxelStats -- Voxel Statistics - Total memory consumed for geometry optimisation: 445090 kByte - Total CPU time elapsed for geometry optimisation: 23 seconds + Total memory consumed for geometry optimisation: 13 kByte + Total CPU time elapsed for geometry optimisation: 0 seconds Voxelisation: top CPU users: Percent Total CPU System CPU Memory Volume ------- ---------- ---------- -------- ---------- - 98.94 22.40 2.21 445091k Phantom + 0.00 0.00 0.00 3k Phantom + 0.00 0.00 0.00 3k RepY + 0.00 0.00 0.00 7k RepX Voxelisation: top memory users: Percent Memory Heads Nodes Pointers Total CPU Volume ------- -------- ------ ------ -------- ---------- ---------- - -3.66 445090k 79801 13840799 16020201 22.40 Phantom + 52.81 7k 1 201 400 0.00 RepX + 23.59 3k 1 100 100 0.00 Phantom + 23.59 3k 1 100 100 0.00 RepY ++ PhantomSD/totalEDep id 0 ++ PhantomSD/protonEDep id 1 ++ PhantomSD/protonNStep id 2 @@ -496,171 +555,171 @@ Start Run processing. Run terminated. Run Summary Number of events processed : 10000 - User=13.1s Real=13.18s Sys=0.05s + User=5.9s Real=6.01s Sys=0.01s ============================================================= Number of event processed : 10000 ============================================================= #Z Cell# totalEDep protonEDep protonNStep chargedPassCellFlux chargedCellFlux chargedSurfFlux gammaSurfCurr000 gammaSurfCurr001 gammaSurfCurr002 gammaSurfCurr003 - 0 190.20479 keV 0 eV 0 0 /cm2 1.1280282 /cm2 0 /cm2 0 /cm2 11000 /cm2 0 /cm2 0 /cm2 - 1 148.33997 keV 0 eV 0 0 /cm2 0.77923363 /cm2 0 /cm2 0 /cm2 10825 /cm2 0 /cm2 0 /cm2 - 2 189.65952 keV 0 eV 0 0 /cm2 1.1098947 /cm2 0 /cm2 0 /cm2 10300 /cm2 0 /cm2 0 /cm2 - 3 178.02953 keV 0 eV 0 0 /cm2 1.6166296 /cm2 0 /cm2 0 /cm2 9900 /cm2 0 /cm2 0 /cm2 - 4 229.85498 keV 0 eV 0 0 /cm2 2.3131311 /cm2 0 /cm2 0 /cm2 9600 /cm2 0 /cm2 0 /cm2 - 5 109.56678 keV 0 eV 0 0 /cm2 0.85217579 /cm2 0 /cm2 0 /cm2 9250 /cm2 0 /cm2 0 /cm2 - 6 295.03338 keV 0 eV 0 0 /cm2 3.073858 /cm2 0 /cm2 0 /cm2 8900 /cm2 0 /cm2 0 /cm2 - 7 116.59922 keV 0 eV 0 0 /cm2 0.32232631 /cm2 0 /cm2 0 /cm2 8825 /cm2 0 /cm2 0 /cm2 - 8 60.340368 keV 0 eV 0 0 /cm2 0.16792476 /cm2 0 /cm2 0 /cm2 8350 /cm2 0 /cm2 0 /cm2 - 9 150.77597 keV 0 eV 0 0 /cm2 0.97440497 /cm2 0 /cm2 0 /cm2 8150 /cm2 0 /cm2 0 /cm2 - 10 234.95334 keV 0 eV 0 0 /cm2 2.342945 /cm2 0 /cm2 0 /cm2 7625 /cm2 0 /cm2 0 /cm2 - 11 72.033123 keV 0 eV 0 0 /cm2 0.19698084 /cm2 0 /cm2 0 /cm2 7500 /cm2 0 /cm2 0 /cm2 - 12 119.40805 keV 0 eV 0 0 /cm2 0.88648208 /cm2 0 /cm2 0 /cm2 7150 /cm2 0 /cm2 0 /cm2 - 13 130.43136 keV 0 eV 0 0 /cm2 0.92024483 /cm2 0 /cm2 0 /cm2 6750 /cm2 0 /cm2 0 /cm2 - 14 228.29779 keV 0 eV 0 0 /cm2 2.0715054 /cm2 0 /cm2 0 /cm2 6500 /cm2 0 /cm2 0 /cm2 - 15 173.5585 keV 0 eV 0 0 /cm2 1.6149517 /cm2 0 /cm2 0 /cm2 6375 /cm2 0 /cm2 0 /cm2 - 16 114.79385 keV 0 eV 0 0 /cm2 0.88868779 /cm2 0 /cm2 0 /cm2 5800 /cm2 0 /cm2 0 /cm2 - 17 11.89969 keV 0 eV 0 0 /cm2 0.017809432 /cm2 0 /cm2 0 /cm2 5575 /cm2 0 /cm2 0 /cm2 - 18 261.74159 keV 0 eV 0 0 /cm2 2.3943359 /cm2 0 /cm2 0 /cm2 5500 /cm2 0 /cm2 0 /cm2 - 19 114.92772 keV 0 eV 0 0 /cm2 0.89457436 /cm2 0 /cm2 0 /cm2 5025 /cm2 0 /cm2 0 /cm2 - 20 3.5112297 keV 0 eV 0 0 /cm2 0.0035783524 /cm2 0 /cm2 0 /cm2 4775 /cm2 0 /cm2 0 /cm2 - 21 32.762838 keV 0 eV 0 0 /cm2 0.093901105 /cm2 0 /cm2 0 /cm2 4575 /cm2 0 /cm2 0 /cm2 - 22 72.733028 keV 0 eV 0 0 /cm2 0.83990634 /cm2 0 /cm2 0 /cm2 4600 /cm2 0 /cm2 0 /cm2 - 23 33.79004 keV 0 eV 0 0 /cm2 0.092475454 /cm2 0 /cm2 0 /cm2 4650 /cm2 0 /cm2 0 /cm2 - 24 8.3719216 keV 0 eV 0 0 /cm2 0.011157966 /cm2 0 /cm2 0 /cm2 4475 /cm2 0 /cm2 0 /cm2 - 25 96.257053 keV 0 eV 0 0 /cm2 0.77181865 /cm2 0 /cm2 0 /cm2 4450 /cm2 0 /cm2 0 /cm2 - 26 26.254361 keV 0 eV 0 0 /cm2 0.057275274 /cm2 0 /cm2 0 /cm2 4100 /cm2 0 /cm2 0 /cm2 - 27 66.378904 keV 0 eV 0 0 /cm2 0.57481627 /cm2 0 /cm2 0 /cm2 4000 /cm2 0 /cm2 0 /cm2 - 28 40.939487 keV 0 eV 0 0 /cm2 0.11341763 /cm2 0 /cm2 0 /cm2 3925 /cm2 0 /cm2 0 /cm2 - 29 59.075777 keV 0 eV 0 0 /cm2 0.16756899 /cm2 0 /cm2 0 /cm2 3575 /cm2 0 /cm2 0 /cm2 - 30 18.736407 keV 0 eV 0 0 /cm2 0.046625078 /cm2 0 /cm2 0 /cm2 3375 /cm2 0 /cm2 0 /cm2 - 31 4.0194141 keV 0 eV 0 0 /cm2 0.004659494 /cm2 0 /cm2 0 /cm2 3150 /cm2 0 /cm2 0 /cm2 - 32 8.0030842 keV 0 eV 0 0 /cm2 0.02153942 /cm2 0 /cm2 0 /cm2 3225 /cm2 0 /cm2 0 /cm2 - 33 34.518929 keV 0 eV 0 0 /cm2 0.085011142 /cm2 0 /cm2 0 /cm2 3300 /cm2 0 /cm2 0 /cm2 - 34 82.771912 keV 0 eV 0 0 /cm2 0.80619656 /cm2 0 /cm2 0 /cm2 3175 /cm2 0 /cm2 0 /cm2 - 35 35.668665 keV 0 eV 0 0 /cm2 0.11117494 /cm2 0 /cm2 0 /cm2 3050 /cm2 0 /cm2 0 /cm2 - 36 131.17143 keV 0 eV 0 0 /cm2 1.4986252 /cm2 0 /cm2 0 /cm2 2975 /cm2 0 /cm2 0 /cm2 - 37 34.308197 keV 0 eV 0 0 /cm2 0.099106065 /cm2 0 /cm2 0 /cm2 2675 /cm2 0 /cm2 0 /cm2 - 38 34.746221 keV 0 eV 0 0 /cm2 0.09712877 /cm2 0 /cm2 0 /cm2 2725 /cm2 0 /cm2 0 /cm2 - 39 19.203025 keV 0 eV 0 0 /cm2 0.049553507 /cm2 0 /cm2 0 /cm2 2400 /cm2 0 /cm2 0 /cm2 - 40 14.080076 keV 0 eV 0 0 /cm2 0.037589881 /cm2 0 /cm2 0 /cm2 2400 /cm2 0 /cm2 0 /cm2 - 41 20.677307 keV 0 eV 0 0 /cm2 0.062034224 /cm2 0 /cm2 0 /cm2 2225 /cm2 0 /cm2 0 /cm2 - 42 14.660392 keV 0 eV 0 0 /cm2 0.16136495 /cm2 0 /cm2 0 /cm2 2200 /cm2 0 /cm2 0 /cm2 - 43 20.13466 keV 0 eV 0 0 /cm2 0.064536461 /cm2 0 /cm2 0 /cm2 2200 /cm2 0 /cm2 0 /cm2 - 44 36.862375 keV 0 eV 0 0 /cm2 0.1113917 /cm2 0 /cm2 0 /cm2 2050 /cm2 0 /cm2 0 /cm2 - 45 75.6191 keV 0 eV 0 0 /cm2 0.76670848 /cm2 0 /cm2 0 /cm2 1925 /cm2 0 /cm2 0 /cm2 - 46 7.1911188 keV 0 eV 0 0 /cm2 0.017561143 /cm2 0 /cm2 0 /cm2 1825 /cm2 0 /cm2 0 /cm2 - 47 9.4365701 keV 0 eV 0 0 /cm2 0.014611499 /cm2 0 /cm2 0 /cm2 1825 /cm2 0 /cm2 0 /cm2 - 48 67.929529 keV 0 eV 0 0 /cm2 0.75675313 /cm2 0 /cm2 0 /cm2 1775 /cm2 0 /cm2 0 /cm2 - 49 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 1675 /cm2 0 /cm2 0 /cm2 - 50 20.530499 keV 0 eV 0 0 /cm2 0.053818427 /cm2 0 /cm2 0 /cm2 1750 /cm2 0 /cm2 0 /cm2 - 51 22.741468 keV 0 eV 0 0 /cm2 0.068117183 /cm2 0 /cm2 0 /cm2 1725 /cm2 0 /cm2 0 /cm2 - 52 53.626736 keV 0 eV 0 0 /cm2 0.51924348 /cm2 0 /cm2 0 /cm2 1500 /cm2 0 /cm2 0 /cm2 - 53 4.1094026 keV 0 eV 0 0 /cm2 0.0069187106 /cm2 0 /cm2 0 /cm2 1600 /cm2 0 /cm2 0 /cm2 - 54 18.883493 keV 0 eV 0 0 /cm2 0.050722209 /cm2 0 /cm2 0 /cm2 1550 /cm2 0 /cm2 0 /cm2 - 55 11.367294 keV 0 eV 0 0 /cm2 0.04003148 /cm2 0 /cm2 0 /cm2 1425 /cm2 0 /cm2 0 /cm2 - 56 29.28201 keV 0 eV 0 0 /cm2 0.084984182 /cm2 0 /cm2 0 /cm2 1400 /cm2 0 /cm2 0 /cm2 - 57 11.003518 keV 0 eV 0 0 /cm2 0.037817099 /cm2 0 /cm2 0 /cm2 1275 /cm2 0 /cm2 0 /cm2 - 58 11.153972 keV 0 eV 0 0 /cm2 0.030194442 /cm2 0 /cm2 0 /cm2 1225 /cm2 0 /cm2 0 /cm2 - 59 3.174372 keV 0 eV 0 0 /cm2 0.0044933902 /cm2 0 /cm2 0 /cm2 1250 /cm2 0 /cm2 0 /cm2 - 60 3.1854377 keV 0 eV 0 0 /cm2 0.0045213719 /cm2 0 /cm2 0 /cm2 1225 /cm2 0 /cm2 0 /cm2 - 61 10.583834 keV 0 eV 0 0 /cm2 0.035262399 /cm2 0 /cm2 0 /cm2 1225 /cm2 0 /cm2 0 /cm2 - 62 85.042515 keV 0 eV 0 0 /cm2 0.55696863 /cm2 0 /cm2 0 /cm2 1250 /cm2 0 /cm2 0 /cm2 - 63 69.701802 keV 0 eV 0 0 /cm2 0.76576683 /cm2 0 /cm2 0 /cm2 1125 /cm2 0 /cm2 0 /cm2 - 64 7.7192474 keV 0 eV 0 0 /cm2 0.017308271 /cm2 0 /cm2 0 /cm2 950 /cm2 0 /cm2 0 /cm2 - 65 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 950 /cm2 0 /cm2 0 /cm2 - 66 2.4704381 keV 0 eV 0 0 /cm2 0.0022873924 /cm2 0 /cm2 0 /cm2 900 /cm2 0 /cm2 0 /cm2 - 67 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 925 /cm2 0 /cm2 0 /cm2 - 68 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 850 /cm2 0 /cm2 0 /cm2 - 69 5.0175633 keV 0 eV 0 0 /cm2 0.0085800534 /cm2 0 /cm2 0 /cm2 800 /cm2 0 /cm2 0 /cm2 - 70 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 800 /cm2 0 /cm2 0 /cm2 - 71 75.751836 keV 0 eV 0 0 /cm2 0.76619486 /cm2 0 /cm2 0 /cm2 850 /cm2 0 /cm2 0 /cm2 - 72 9.9835814 keV 0 eV 0 0 /cm2 0.031624871 /cm2 0 /cm2 0 /cm2 675 /cm2 0 /cm2 0 /cm2 - 73 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 600 /cm2 0 /cm2 0 /cm2 - 74 9.9477873 keV 0 eV 0 0 /cm2 0.031442594 /cm2 0 /cm2 0 /cm2 675 /cm2 0 /cm2 0 /cm2 - 75 9.4126696 keV 0 eV 0 0 /cm2 0.028717569 /cm2 0 /cm2 0 /cm2 600 /cm2 0 /cm2 0 /cm2 - 76 6.6389902 keV 0 eV 0 0 /cm2 0.0156734 /cm2 0 /cm2 0 /cm2 550 /cm2 0 /cm2 0 /cm2 - 77 18.803117 keV 0 eV 0 0 /cm2 0.050516344 /cm2 0 /cm2 0 /cm2 550 /cm2 0 /cm2 0 /cm2 - 78 60 keV 0 eV 0 0 /cm2 0.73557689 /cm2 0 /cm2 0 /cm2 500 /cm2 0 /cm2 0 /cm2 - 79 1.9905062 keV 0 eV 0 0 /cm2 0.0021325298 /cm2 0 /cm2 0 /cm2 450 /cm2 0 /cm2 0 /cm2 - 80 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 450 /cm2 0 /cm2 0 /cm2 - 81 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 475 /cm2 0 /cm2 0 /cm2 - 82 13.634322 keV 0 eV 0 0 /cm2 0.036361099 /cm2 0 /cm2 0 /cm2 400 /cm2 0 /cm2 0 /cm2 - 83 28.547581 keV 0 eV 0 0 /cm2 0.074435053 /cm2 0 /cm2 0 /cm2 375 /cm2 0 /cm2 0 /cm2 - 84 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 275 /cm2 0 /cm2 0 /cm2 - 85 9.479614 keV 0 eV 0 0 /cm2 0.029058476 /cm2 0 /cm2 0 /cm2 275 /cm2 0 /cm2 0 /cm2 - 86 13.735678 keV 0 eV 0 0 /cm2 0.040498031 /cm2 0 /cm2 0 /cm2 300 /cm2 0 /cm2 0 /cm2 - 87 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 250 /cm2 0 /cm2 0 /cm2 - 88 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 250 /cm2 0 /cm2 0 /cm2 - 89 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 225 /cm2 0 /cm2 0 /cm2 - 90 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 300 /cm2 0 /cm2 0 /cm2 - 91 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 250 /cm2 0 /cm2 0 /cm2 - 92 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 250 /cm2 0 /cm2 0 /cm2 - 93 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 225 /cm2 0 /cm2 0 /cm2 - 94 9.1338018 keV 0 eV 0 0 /cm2 0.027297467 /cm2 0 /cm2 0 /cm2 275 /cm2 0 /cm2 0 /cm2 - 95 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 275 /cm2 0 /cm2 0 /cm2 - 96 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 250 /cm2 0 /cm2 0 /cm2 - 97 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 250 /cm2 0 /cm2 0 /cm2 - 98 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 225 /cm2 0 /cm2 0 /cm2 - 99 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 225 /cm2 0 /cm2 0 /cm2 - 100 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 200 /cm2 0 /cm2 0 /cm2 - 101 3.9247273 keV 0 eV 0 0 /cm2 0.0063908125 /cm2 0 /cm2 0 /cm2 200 /cm2 0 /cm2 0 /cm2 - 102 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 150 /cm2 0 /cm2 0 /cm2 - 103 10.103487 keV 0 eV 0 0 /cm2 0.032338426 /cm2 0 /cm2 0 /cm2 150 /cm2 0 /cm2 0 /cm2 - 104 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 150 /cm2 0 /cm2 0 /cm2 - 105 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 150 /cm2 0 /cm2 0 /cm2 - 106 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 150 /cm2 0 /cm2 0 /cm2 - 107 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 175 /cm2 0 /cm2 0 /cm2 - 108 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 175 /cm2 0 /cm2 0 /cm2 - 109 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 150 /cm2 0 /cm2 0 /cm2 - 110 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 150 /cm2 0 /cm2 0 /cm2 - 111 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 125 /cm2 0 /cm2 0 /cm2 - 112 2.876963 keV 0 eV 0 0 /cm2 0.0038536558 /cm2 0 /cm2 0 /cm2 125 /cm2 0 /cm2 0 /cm2 - 113 535.63111 eV 0 eV 0 0 /cm2 0.00037751128 /cm2 0 /cm2 0 /cm2 150 /cm2 0 /cm2 0 /cm2 - 114 1.4266846 keV 0 eV 0 0 /cm2 0.0013007898 /cm2 0 /cm2 0 /cm2 100 /cm2 0 /cm2 0 /cm2 - 115 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 125 /cm2 0 /cm2 0 /cm2 - 116 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 75 /cm2 0 /cm2 0 /cm2 - 117 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 75 /cm2 0 /cm2 0 /cm2 - 118 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 125 /cm2 0 /cm2 0 /cm2 - 119 10.47114 keV 0 eV 0 0 /cm2 0.034576407 /cm2 0 /cm2 0 /cm2 150 /cm2 0 /cm2 0 /cm2 - 120 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 0 /cm2 0 /cm2 - 121 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 0 /cm2 0 /cm2 - 122 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 0 /cm2 0 /cm2 - 123 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 75 /cm2 0 /cm2 0 /cm2 - 124 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 100 /cm2 0 /cm2 0 /cm2 - 125 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 75 /cm2 0 /cm2 0 /cm2 - 126 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 0 /cm2 0 /cm2 - 127 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 0 /cm2 0 /cm2 - 128 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 0 /cm2 0 /cm2 - 129 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 75 /cm2 0 /cm2 0 /cm2 - 130 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 0 /cm2 0 /cm2 - 131 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 0 /cm2 0 /cm2 - 132 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 0 /cm2 0 /cm2 - 133 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 0 /cm2 0 /cm2 - 134 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 0 /cm2 0 /cm2 - 135 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 75 /cm2 0 /cm2 0 /cm2 - 136 456.29262 eV 0 eV 0 0 /cm2 0.000322041 /cm2 0 /cm2 0 /cm2 150 /cm2 0 /cm2 0 /cm2 - 137 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 0 /cm2 0 /cm2 - 138 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 0 /cm2 0 /cm2 - 139 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 140 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 141 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 142 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 143 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 144 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 145 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 146 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 147 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 148 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 0 /cm2 0 /cm2 - 149 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 150 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 151 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 152 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 153 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 154 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 155 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 50 /cm2 0 /cm2 0 /cm2 - 156 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 157 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 158 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 - 159 10.394967 keV 0 eV 0 0 /cm2 0.034112724 /cm2 0 /cm2 0 /cm2 25 /cm2 0 /cm2 0 /cm2 + 0 250.38009 keV 0 eV 0 0 /cm2 2.4024218 /cm2 0 /cm2 0 /cm2 10275 /cm2 0 /cm2 0 /cm2 + 1 23.475973 MeV 0 eV 0 0 /cm2 36.010425 /cm2 0 /cm2 0 /cm2 9850 /cm2 0 /cm2 0 /cm2 + 2 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 3 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 4 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 5 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 6 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 7 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 8 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 9 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 10 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 11 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 12 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 13 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 14 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 15 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 16 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 17 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 18 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 19 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 20 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 21 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 22 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 23 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 24 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 25 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 26 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 27 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 28 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 29 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 30 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 31 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 32 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 33 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 34 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 35 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 36 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 37 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 38 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 39 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 40 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 41 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 42 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 43 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 44 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 45 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 46 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 47 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 48 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 49 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 50 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 51 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 52 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 53 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 54 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 55 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 56 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 57 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 58 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 59 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 60 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 61 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 62 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 63 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 64 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 65 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 66 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 67 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 68 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 69 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 70 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 71 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 72 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 73 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 74 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 75 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 76 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 77 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 78 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 79 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 80 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 81 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 82 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 83 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 84 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 85 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 86 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 87 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 88 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 89 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 90 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 91 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 92 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 93 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 94 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 95 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 96 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 97 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 98 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 99 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 100 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 101 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 102 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 103 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 104 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 105 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 106 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 107 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 108 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 109 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 110 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 111 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 112 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 113 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 114 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 115 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 116 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 117 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 118 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 119 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 120 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 121 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 122 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 123 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 124 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 125 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 126 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 127 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 128 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 129 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 130 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 131 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 132 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 133 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 134 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 135 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 136 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 137 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 138 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 139 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 140 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 141 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 142 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 143 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 144 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 145 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 146 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 147 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 148 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 149 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 150 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 151 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 152 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 153 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 154 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 155 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 156 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 157 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 158 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 + 159 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 160 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 161 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 162 0 eV 0 eV 0 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 0 /cm2 diff --git a/examples/extended/runAndEvent/RE02/run4.mac b/examples/extended/runAndEvent/RE02/run4.mac index c9949744a1..5fe94ee770 100644 --- a/examples/extended/runAndEvent/RE02/run4.mac +++ b/examples/extended/runAndEvent/RE02/run4.mac @@ -1,4 +1,4 @@ -# $Id: run4.mac,v 1.1 2005/11/24 01:44:18 asaim Exp $ +# $Id: run4.mac,v 1.2 2006/11/18 01:37:23 asaim Exp $ # # Macro file for "exampleRE02.cc" # @@ -7,11 +7,11 @@ # /control/verbose 2 /run/verbose 2 -/event/verbose 0 +#/event/verbose 0 #/tracking/verbose 1 # # -/vis/scene/create +#/vis/scene/create # # Create a scene handler for a specific graphics system # (Edit the next line(s) to choose another graphic system) @@ -20,13 +20,13 @@ #/vis/open VRML2FILE # # viewer settings -/vis/viewer/set/viewpointThetaPhi 90 180 deg -/vis/viewer/zoom 1.4 +#/vis/viewer/set/viewpointThetaPhi 90 180 deg +#/vis/viewer/zoom 1.4 # # Store trajectory -/tracking/storeTrajectory 1 -/vis/scene/add/trajectories -/vis/scene/endOfEventAction accumulate +#/tracking/storeTrajectory 1 +#/vis/scene/add/trajectories +#/vis/scene/endOfEventAction accumulate # # # Beam Parameters diff --git a/examples/extended/runAndEvent/RE02/src/RE02DetectorConstruction.cc b/examples/extended/runAndEvent/RE02/src/RE02DetectorConstruction.cc index 640f337e87..23a088d3dc 100644 --- a/examples/extended/runAndEvent/RE02/src/RE02DetectorConstruction.cc +++ b/examples/extended/runAndEvent/RE02/src/RE02DetectorConstruction.cc @@ -24,27 +24,21 @@ // ******************************************************************** // // -// $Id: RE02DetectorConstruction.cc,v 1.2 2006/06/29 17:45:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: RE02DetectorConstruction.cc,v 1.3 2006/11/18 01:37:23 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "RE02DetectorConstruction.hh" #include "G4MultiFunctionalDetector.hh" -#include "G4PSEnergyDeposit.hh" -//#include "G4PSDoseDeposit.hh" -#include "G4PSNofStep.hh" -//#include "G4PSNofSecondary.hh" -//#include "G4PSMinKinEAtGeneration.hh" -#include "G4PSCellFlux.hh" -//#include "G4PSTrackLength.hh" -//#include "G4PSPassageTrackLength.hh" -//#include "G4PSPassageCurrent.hh" -#include "G4PSPassageCellFlux.hh" -#include "G4PSFlatSurfaceFlux.hh" -#include "G4PSFlatSurfaceCurrent.hh" -//#include "G4PSSphereSurfaceCurrent.hh" +#include "RE02PSEnergyDeposit.hh" +#include "RE02PSNofStep.hh" +#include "RE02PSCellFlux.hh" +#include "RE02PSPassageCellFlux.hh" +#include "RE02PSFlatSurfaceFlux.hh" +#include "RE02PSFlatSurfaceCurrent.hh" + #include "G4SDParticleWithEnergyFilter.hh" #include "G4SDParticleFilter.hh" #include "G4SDChargedFilter.hh" @@ -57,7 +51,7 @@ #include "G4SDManager.hh" #include "G4PVParameterised.hh" -#include "RE02PhantomParameterisation.hh" +#include "RE02NestedPhantomParameterisation.hh" #include "G4VisAttributes.hh" #include "G4Colour.hh" @@ -74,12 +68,16 @@ // [Geometry] // The world volume is defined as 200 cm x 200 cm x 200 cm box with Air. // Water phantom is defined as 200 mm x 200 mm x 400 mm box with Water. -// The water phantom is divided into 100 segments in x,y plane, and 200 segments -// perpendicular to z axis using parameterised volume. -// These values are defined at constructor, -// e.g. the size of water phantom (fphantomSize), and number of segmentation +// The water phantom is divided into 100 segments in x,y plane using replication, +// and then divided into 200 segments perpendicular to z axis using nested +// parameterised volume. +// These values are defined at constructor, +// e.g. the size of water phantom (fphantomSize), and number of segmentation // of water phantom (fNx, fNy, fNz). -// NIST database is used for materials. +// +// By default, lead plates are inserted into the position of even order segments. +// NIST database is used for materials. +// // // [Scorer] // Assignment of G4MultiFunctionalDetector and G4PrimitiveScorer @@ -104,16 +102,11 @@ // RE02DetectorConstruction::RE02DetectorConstruction() { + // Default size of water phantom,and segmentation. fphantomSize.setX(200.*mm); fphantomSize.setY(200.*mm); fphantomSize.setZ(400.*mm); - //fNx = fNy = fNz = 100; - fNx = 100; fNy = 100; fNz = 200; - //fNx = 1; fNy = 1; fNz = 200; - G4cout << "<-- RE02DetectorConstruction -----------------" <FindOrBuildMaterial("G4_AIR"); - G4Material* H2O = NISTman->FindOrBuildMaterial("G4_WATER"); + G4Material* Air = NISTman->FindOrBuildMaterial("G4_AIR"); + G4Material* H2O = NISTman->FindOrBuildMaterial("G4_WATER"); + G4Material* LEAD = NISTman->FindOrBuildMaterial("G4_Pb"); // // Print all the materials defined. @@ -199,13 +193,17 @@ RE02DetectorConstruction::~RE02DetectorConstruction() // Phantom segmentation using Parameterisation //.............................................. // + G4cout << "<-- RE02DetectorConstruction::Construct-------" < phantomMat(2,H2O); + if ( IsLeadSegment() ) phantomMat[1]=LEAD; // // Parameterisation for transformation of voxels. - // (voxel size is fixed in this example. i.e parameterisation handles - // only transfomation of voxels.) - RE02PhantomParameterisation* paramPhantom - = new RE02PhantomParameterisation(phantomSize/2.,nxCells,nyCells,nzCells); + // (voxel size is fixed in this example. + // e.g. nested parameterisation handles material and transfomation of voxels.) + RE02NestedPhantomParameterisation* paramPhantom + = new RE02NestedPhantomParameterisation(sensSize/2.,nzCells,phantomMat); //G4VPhysicalVolume * physiPhantomSens = - new G4PVParameterised("PhantomSens", // their name - logicPhantomSens, // their logical volume - logicPhantom, // Mother logical volume - kUndefined, // Are placed along this axis - nCells, // Number of cells - paramPhantom); // Parameterisation. + new G4PVParameterised("PhantomSens", // their name + logicPhantomSens, // their logical volume + logXRep, // Mother logical volume + kUndefined, // Are placed along this axis + nzCells, // Number of cells + paramPhantom); // Parameterisation. // Optimization flag is avaiable for, // kUndefined, kXAxis, kYAxis, kZAxis. // @@ -291,20 +312,23 @@ RE02DetectorConstruction::~RE02DetectorConstruction() //-- Primitive Scorer for Energy Deposit. // Total, by protons, by electrons. G4String psName; - G4PSEnergyDeposit* scorer0 = new G4PSEnergyDeposit(psName="totalEDep"); - G4PSEnergyDeposit* scorer1 = new G4PSEnergyDeposit(psName="protonEDep"); + G4PSEnergyDeposit* scorer0 = new RE02PSEnergyDeposit(psName="totalEDep",fNx,fNy,fNz); + G4PSEnergyDeposit* scorer1 = new RE02PSEnergyDeposit(psName="protonEDep",fNx,fNy,fNz); scorer1->SetFilter(protonFilter); // //-- Number of Steps for protons - G4PSNofStep* scorer2 = new G4PSNofStep(psName="protonNStep"); + G4PSNofStep* scorer2 = new RE02PSNofStep(psName="protonNStep",fNx,fNy,fNz); scorer2->SetFilter(protonFilter); // //-- CellFlux for charged particles - G4PSPassageCellFlux* scorer3 = new G4PSPassageCellFlux(psName="chargedPassCellFlux"); - G4PSCellFlux* scorer4 = new G4PSCellFlux(psName="chargedCellFlux"); - G4PSFlatSurfaceFlux* scorer5 = new G4PSFlatSurfaceFlux(psName="chargedSurfFlux",fFlux_InOut); + G4PSPassageCellFlux* scorer3 = new RE02PSPassageCellFlux(psName="chargedPassCellFlux", + fNx,fNy,fNz); + G4PSCellFlux* scorer4 = new RE02PSCellFlux(psName="chargedCellFlux", + fNx,fNy,fNz); + G4PSFlatSurfaceFlux* scorer5 = new RE02PSFlatSurfaceFlux(psName="chargedSurfFlux", + fFlux_InOut,fNx,fNy,fNz); scorer3->SetFilter(chargedFilter); scorer4->SetFilter(chargedFilter); scorer5->SetFilter(chargedFilter); @@ -346,7 +370,7 @@ RE02DetectorConstruction::~RE02DetectorConstruction() pkinEFilter->show(); // Show accepting condition to stdout. //-- Surface Current Scorer which scores number of tracks in unit area. G4PSFlatSurfaceCurrent* scorer = - new G4PSFlatSurfaceCurrent(psgName,fCurrent_InOut); + new RE02PSFlatSurfaceCurrent(psgName,fCurrent_InOut,fNx,fNy,fNz); scorer->SetFilter(pkinEFilter); // Assign filter. MFDet->RegisterPrimitive(scorer); // Register it to MultiFunctionalDetector. } @@ -359,15 +383,20 @@ RE02DetectorConstruction::~RE02DetectorConstruction() G4VisAttributes* BoxVisAtt= new G4VisAttributes(G4Colour(1.0,1.0,1.0)); logicWorld ->SetVisAttributes(BoxVisAtt); //logicWorld->SetVisAttributes(G4VisAttributes::Invisible); - + + // Mother volume of WaterPhantom G4VisAttributes* PhantomVisAtt = new G4VisAttributes(G4Colour(1.0,1.0,0.0)); logicPhantom->SetVisAttributes(PhantomVisAtt); + + // Replica + G4VisAttributes* YRepVisAtt = new G4VisAttributes(G4Colour(0.0,1.0,0.0)); + logYRep->SetVisAttributes(YRepVisAtt); + G4VisAttributes* XRepVisAtt = new G4VisAttributes(G4Colour(0.0,1.0,0.0)); + logXRep->SetVisAttributes(YRepVisAtt); + + // Skip the visualization for those voxels. + logicPhantomSens->SetVisAttributes(G4VisAttributes::Invisible); - // If number of segmentation of water phantom is too large, - // skip the visualization for those voxels. - if ( nCells > 1000 ) { - logicPhantomSens->SetVisAttributes(G4VisAttributes::Invisible); - } return physiWorld; } diff --git a/examples/extended/runAndEvent/RE02/src/RE02EventAction.cc b/examples/extended/runAndEvent/RE02/src/RE02EventAction.cc index 2c4de65f98..f6a9003cfa 100644 --- a/examples/extended/runAndEvent/RE02/src/RE02EventAction.cc +++ b/examples/extended/runAndEvent/RE02/src/RE02EventAction.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: RE02EventAction.cc,v 1.2 2006/06/29 17:45:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: RE02EventAction.cc,v 1.3 2006/11/18 01:37:24 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "RE02EventAction.hh" diff --git a/examples/extended/runAndEvent/RE02/src/RE02NestedPhantomParameterisation.cc b/examples/extended/runAndEvent/RE02/src/RE02NestedPhantomParameterisation.cc new file mode 100644 index 0000000000..9b8d28392a --- /dev/null +++ b/examples/extended/runAndEvent/RE02/src/RE02NestedPhantomParameterisation.cc @@ -0,0 +1,129 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +/////////////////////////////////////////////////////////////////////////////// +#include "RE02NestedPhantomParameterisation.hh" + +#include "G4VPhysicalVolume.hh" +#include "G4VTouchable.hh" +#include "G4ThreeVector.hh" +#include "G4Box.hh" +#include "G4LogicalVolume.hh" +#include "G4Material.hh" + +//======================================================================= +// (RE02NestedPhantomParameterisation) +// +// (Description) +// Class for nested parameterisation. +// This parameterisation handles material and transfomation of voxles. +// +// T.Aso Created. Nov.2007. +// +//////////////////////////////////////////////////////////////////// +RE02NestedPhantomParameterisation::RE02NestedPhantomParameterisation( + const G4ThreeVector& voxelSize, + G4int nz, + std::vector& mat): + G4VNestedParameterisation(),fdX(voxelSize.x()),fdY(voxelSize.y()),fdZ(voxelSize.z()), + fNz(nz),fmat(mat) +{ + // Position of voxels. + // x and y positions are already defined in DetectorConstruction + // by using replicated volume. Here only we need to define is z positions of voxles. + fpZ.clear(); + G4double zp; + for ( G4int iz = 0; iz < fNz; iz++){ + zp = (-fNz+1+2*iz)*fdZ; + fpZ.push_back(zp); + } + +} + +RE02NestedPhantomParameterisation::~RE02NestedPhantomParameterisation(){ + fpZ.clear(); +} + +// +// Material assignment to geometry. +// +G4Material* RE02NestedPhantomParameterisation::ComputeMaterial(G4VPhysicalVolume* currentVol, + const G4int copyNo, + const G4VTouchable* parentTouch) +{ + // Copy number of voxels. + // Copy number of X and Y are obtained from replication number. + // Copy nymber of Z is the copy number of current voxel. + G4int ix = parentTouch->GetReplicaNumber(0); + G4int iy = parentTouch->GetReplicaNumber(1); + G4int iz = copyNo; + // For demonstration purpose,a couple of materials are chosen alternately. + G4Material* mat=0; + if ( ix < 0 && iy < 0 ) return NULL; + if ( ix%2 == 0 && iy%2 == 0 && iz%2 == 0 ) mat = fmat[0]; + else mat = fmat[1]; + + // Set material to the current logical volume. + G4LogicalVolume* currentLog = currentVol->GetLogicalVolume(); + currentLog->SetMaterial(mat); + + return mat; +} + +// +// Number of Materials +// Material scanner is required for preparing physics tables and so on before +// stating simulation, so that G4 has to know number of materials. +G4int RE02NestedPhantomParameterisation::GetNumberOfMaterials() const{ + return fmat.size(); +} + +// +// GetMaterial +// This is needed for material scanner and realizing geometry. +// +G4Material* RE02NestedPhantomParameterisation::GetMaterial(G4int i) const{ + return fmat[i]; +} + +// +// Transformation of voxels. +// +void RE02NestedPhantomParameterisation::ComputeTransformation(const G4int copyNo, + G4VPhysicalVolume* physVol)const{ + G4ThreeVector position(0.,0.,fpZ[copyNo]); + physVol->SetTranslation(position); +} + +// +// Dimensions are always same in this RE02 example. +// +void RE02NestedPhantomParameterisation::ComputeDimensions(G4Box& box, + const G4int , + const G4VPhysicalVolume* ) const{ + box.SetXHalfLength(fdX); + box.SetYHalfLength(fdY); + box.SetZHalfLength(fdZ); +} diff --git a/examples/extended/runAndEvent/RE02/src/RE02PSCellFlux.cc b/examples/extended/runAndEvent/RE02/src/RE02PSCellFlux.cc new file mode 100644 index 0000000000..650cb58334 --- /dev/null +++ b/examples/extended/runAndEvent/RE02/src/RE02PSCellFlux.cc @@ -0,0 +1,73 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: RE02PSCellFlux.cc,v 1.2 2006/12/13 15:43:05 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// RE02PSCellFlux +#include "RE02PSCellFlux.hh" + +/////////////////////////////////////////////////////////////////////////////// +// +// The developement and research on this code is supported by Core Research +// for Evolutional Science and Technology (CREST) Program of Japan Science +// and Technology Corporation (JST). You may acknowlege to JST and authers +// whenever you publish your results using this code, as well as the Geant4 +// collaboration. Both JST and authers remain to have a right to refuse to use +// this code for any case. +// Tsukasa Aso ( aso@toyama-cmt.ac.jp ) +// Akinori Kimura ( AKimura@ashitech.ac.jp ) +// +/////////////////////////////////////////////////////////////////////////////// +// (Description) +// This is a primitive scorer class for scoring cell charge. +// The Cell Charge is defined by a sum of charge inside the cell +// which calculates the deposited charge in the cell. +// +// +// +// +// +// Created: 2006-06-20 Tsukasa ASO, Akinori Kimura. +// +/////////////////////////////////////////////////////////////////////////////// + +RE02PSCellFlux::RE02PSCellFlux(G4String name,G4int nx, G4int ny, G4int nz) + :G4PSCellFlux(name),fNx(nx),fNy(ny),fNz(nz) +{;} + +RE02PSCellFlux::~RE02PSCellFlux() +{;} + +G4int RE02PSCellFlux::GetIndex(G4Step* aStep) +{ + const G4VTouchable* touchable = aStep->GetPreStepPoint()->GetTouchable(); + G4int ix = touchable->GetReplicaNumber(1); + G4int iy = touchable->GetReplicaNumber(2); + G4int iz = touchable->GetReplicaNumber(0); + + return iy*fNx*fNy+ix*fNz+iz; +} diff --git a/examples/extended/runAndEvent/RE02/src/RE02PSEnergyDeposit.cc b/examples/extended/runAndEvent/RE02/src/RE02PSEnergyDeposit.cc new file mode 100644 index 0000000000..1db7e17abc --- /dev/null +++ b/examples/extended/runAndEvent/RE02/src/RE02PSEnergyDeposit.cc @@ -0,0 +1,72 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: RE02PSEnergyDeposit.cc,v 1.2 2006/12/13 15:43:07 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// RE02PSEnergyDeposit +#include "RE02PSEnergyDeposit.hh" + +/////////////////////////////////////////////////////////////////////////////// +// +// The developement and research on this code is supported by Core Research +// for Evolutional Science and Technology (CREST) Program of Japan Science +// and Technology Corporation (JST). You may acknowlege to JST and authers +// whenever you publish your results using this code, as well as the Geant4 +// collaboration. Both JST and authers remain to have a right to refuse to use +// this code for any case. +// Tsukasa Aso ( aso@toyama-cmt.ac.jp ) +// Akinori Kimura ( AKimura@ashitech.ac.jp ) +// +/////////////////////////////////////////////////////////////////////////////// +// (Description) +// This is a primitive scorer class for scoring cell charge. +// The Cell Charge is defined by a sum of charge inside the cell +// which calculates the deposited charge in the cell. +// +// +// +// +// +// Created: 2006-06-20 Tsukasa ASO, Akinori Kimura. +// +/////////////////////////////////////////////////////////////////////////////// + +RE02PSEnergyDeposit::RE02PSEnergyDeposit(G4String name,G4int nx, G4int ny, G4int nz) + :G4PSEnergyDeposit(name),fNx(nx),fNy(ny),fNz(nz) +{;} + +RE02PSEnergyDeposit::~RE02PSEnergyDeposit() +{;} + +G4int RE02PSEnergyDeposit::GetIndex(G4Step* aStep) +{ + const G4VTouchable* touchable = aStep->GetPreStepPoint()->GetTouchable(); + G4int ix = touchable->GetReplicaNumber(1); + G4int iy = touchable->GetReplicaNumber(2); + G4int iz = touchable->GetReplicaNumber(0); + return iy*fNx*fNy+ix*fNz+iz; +} diff --git a/examples/extended/runAndEvent/RE02/src/RE02PSFlatSurfaceCurrent.cc b/examples/extended/runAndEvent/RE02/src/RE02PSFlatSurfaceCurrent.cc new file mode 100644 index 0000000000..165d614c14 --- /dev/null +++ b/examples/extended/runAndEvent/RE02/src/RE02PSFlatSurfaceCurrent.cc @@ -0,0 +1,74 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: RE02PSFlatSurfaceCurrent.cc,v 1.2 2006/12/13 15:43:09 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// RE02PSFlatSurfaceCurrent +#include "RE02PSFlatSurfaceCurrent.hh" + +/////////////////////////////////////////////////////////////////////////////// +// +// The developement and research on this code is supported by Core Research +// for Evolutional Science and Technology (CREST) Program of Japan Science +// and Technology Corporation (JST). You may acknowlege to JST and authers +// whenever you publish your results using this code, as well as the Geant4 +// collaboration. Both JST and authers remain to have a right to refuse to use +// this code for any case. +// Tsukasa Aso ( aso@toyama-cmt.ac.jp ) +// Akinori Kimura ( AKimura@ashitech.ac.jp ) +// +/////////////////////////////////////////////////////////////////////////////// +// (Description) +// This is a primitive scorer class for scoring cell charge. +// The Cell Charge is defined by a sum of charge inside the cell +// which calculates the deposited charge in the cell. +// +// +// +// +// +// Created: 2006-06-20 Tsukasa ASO, Akinori Kimura. +// +/////////////////////////////////////////////////////////////////////////////// + +RE02PSFlatSurfaceCurrent::RE02PSFlatSurfaceCurrent(G4String name, G4int direction, + G4int nx, G4int ny, G4int nz) + :G4PSFlatSurfaceCurrent(name,direction),fNx(nx),fNy(ny),fNz(nz) +{;} + +RE02PSFlatSurfaceCurrent::~RE02PSFlatSurfaceCurrent() +{;} + +G4int RE02PSFlatSurfaceCurrent::GetIndex(G4Step* aStep) +{ + const G4VTouchable* touchable = aStep->GetPreStepPoint()->GetTouchable(); + G4int ix = touchable->GetReplicaNumber(1); + G4int iy = touchable->GetReplicaNumber(2); + G4int iz = touchable->GetReplicaNumber(0); + + return iy*fNx*fNy+ix*fNz+iz; +} diff --git a/examples/extended/runAndEvent/RE02/src/RE02PSFlatSurfaceFlux.cc b/examples/extended/runAndEvent/RE02/src/RE02PSFlatSurfaceFlux.cc new file mode 100644 index 0000000000..6b3958147e --- /dev/null +++ b/examples/extended/runAndEvent/RE02/src/RE02PSFlatSurfaceFlux.cc @@ -0,0 +1,74 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: RE02PSFlatSurfaceFlux.cc,v 1.2 2006/12/13 15:43:11 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// RE02PSFlatSurfaceFlux +#include "RE02PSFlatSurfaceFlux.hh" + +/////////////////////////////////////////////////////////////////////////////// +// +// The developement and research on this code is supported by Core Research +// for Evolutional Science and Technology (CREST) Program of Japan Science +// and Technology Corporation (JST). You may acknowlege to JST and authers +// whenever you publish your results using this code, as well as the Geant4 +// collaboration. Both JST and authers remain to have a right to refuse to use +// this code for any case. +// Tsukasa Aso ( aso@toyama-cmt.ac.jp ) +// Akinori Kimura ( AKimura@ashitech.ac.jp ) +// +/////////////////////////////////////////////////////////////////////////////// +// (Description) +// This is a primitive scorer class for scoring cell charge. +// The Cell Charge is defined by a sum of charge inside the cell +// which calculates the deposited charge in the cell. +// +// +// +// +// +// Created: 2006-06-20 Tsukasa ASO, Akinori Kimura. +// +/////////////////////////////////////////////////////////////////////////////// + +RE02PSFlatSurfaceFlux::RE02PSFlatSurfaceFlux(G4String name, G4int direction, + G4int nx, G4int ny, G4int nz) + :G4PSFlatSurfaceFlux(name,direction),fNx(nx),fNy(ny),fNz(nz) +{;} + +RE02PSFlatSurfaceFlux::~RE02PSFlatSurfaceFlux() +{;} + +G4int RE02PSFlatSurfaceFlux::GetIndex(G4Step* aStep) +{ + const G4VTouchable* touchable = aStep->GetPreStepPoint()->GetTouchable(); + G4int ix = touchable->GetReplicaNumber(1); + G4int iy = touchable->GetReplicaNumber(2); + G4int iz = touchable->GetReplicaNumber(0); + + return iy*fNx*fNy+ix*fNz+iz; +} diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04PrimaryGeneratorAction.cc b/examples/extended/runAndEvent/RE02/src/RE02PSNofStep.cc similarity index 54% rename from examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04PrimaryGeneratorAction.cc rename to examples/extended/runAndEvent/RE02/src/RE02PSNofStep.cc index 64f2503c22..4af02a9ab0 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04PrimaryGeneratorAction.cc +++ b/examples/extended/runAndEvent/RE02/src/RE02PSNofStep.cc @@ -23,52 +23,51 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// ==================================================================== // -// ExN04PrimaryGeneratorAction.cc -// $Id: ExN04PrimaryGeneratorAction.cc,v 1.3 2006/06/29 17:08:48 gunter Exp $ +// $Id: RE02PSNofStep.cc,v 1.2 2006/12/13 15:43:14 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // -// ==================================================================== -#include "ExN04PrimaryGeneratorAction.hh" -#include "ExN04PrimaryGeneratorMessenger.hh" +// RE02PSNofStep +#include "RE02PSNofStep.hh" -#include "G4Event.hh" -#include "G4ParticleGun.hh" -#include "G4HepMCAsciiReader.hh" -#include "H01PythiaInterface.hh" +/////////////////////////////////////////////////////////////////////////////// +// +// The developement and research on this code is supported by Core Research +// for Evolutional Science and Technology (CREST) Program of Japan Science +// and Technology Corporation (JST). You may acknowlege to JST and authers +// whenever you publish your results using this code, as well as the Geant4 +// collaboration. Both JST and authers remain to have a right to refuse to use +// this code for any case. +// Tsukasa Aso ( aso@toyama-cmt.ac.jp ) +// Akinori Kimura ( AKimura@ashitech.ac.jp ) +// +/////////////////////////////////////////////////////////////////////////////// +// (Description) +// This is a primitive scorer class for scoring cell charge. +// The Cell Charge is defined by a sum of charge inside the cell +// which calculates the deposited charge in the cell. +// +// +// +// +// +// Created: 2006-06-20 Tsukasa ASO, Akinori Kimura. +// +/////////////////////////////////////////////////////////////////////////////// +RE02PSNofStep::RE02PSNofStep(G4String name,G4int nx, G4int ny, G4int nz) + :G4PSNofStep(name),fNx(nx),fNy(ny),fNz(nz) +{;} -////////////////////////////////////////////////////////// -ExN04PrimaryGeneratorAction::ExN04PrimaryGeneratorAction() -////////////////////////////////////////////////////////// +RE02PSNofStep::~RE02PSNofStep() +{;} + +G4int RE02PSNofStep::GetIndex(G4Step* aStep) { - // default generator is particle gun. - currentGenerator= particleGun= new G4ParticleGun(); - currentGeneratorName= "particleGun"; - hepmcAscii= new G4HepMCAsciiReader(); - pythiaGen= new H01PythiaInterface(); - - gentypeMap["particleGun"]= particleGun; - gentypeMap["hepmcAscii"]= hepmcAscii; - gentypeMap["pythia"]= pythiaGen; - - messenger= new ExN04PrimaryGeneratorMessenger(this); + const G4VTouchable* touchable = aStep->GetPreStepPoint()->GetTouchable(); + G4int ix = touchable->GetReplicaNumber(1); + G4int iy = touchable->GetReplicaNumber(2); + G4int iz = touchable->GetReplicaNumber(0); + + return iy*fNx*fNy+ix*fNz+iz; } - -/////////////////////////////////////////////////////////// -ExN04PrimaryGeneratorAction::~ExN04PrimaryGeneratorAction() -/////////////////////////////////////////////////////////// -{ - delete messenger; -} - -///////////////////////////////////////////////////////////////////// -void ExN04PrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent) -///////////////////////////////////////////////////////////////////// -{ - if(currentGenerator) - currentGenerator-> GeneratePrimaryVertex(anEvent); - else - G4Exception("generator is not instanciated."); -} - diff --git a/examples/extended/runAndEvent/RE02/src/RE02PSPassageCellFlux.cc b/examples/extended/runAndEvent/RE02/src/RE02PSPassageCellFlux.cc new file mode 100644 index 0000000000..c450fb6ab6 --- /dev/null +++ b/examples/extended/runAndEvent/RE02/src/RE02PSPassageCellFlux.cc @@ -0,0 +1,73 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: RE02PSPassageCellFlux.cc,v 1.2 2006/12/13 15:43:17 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// RE02PSPassageCellFlux +#include "RE02PSPassageCellFlux.hh" + +/////////////////////////////////////////////////////////////////////////////// +// +// The developement and research on this code is supported by Core Research +// for Evolutional Science and Technology (CREST) Program of Japan Science +// and Technology Corporation (JST). You may acknowlege to JST and authers +// whenever you publish your results using this code, as well as the Geant4 +// collaboration. Both JST and authers remain to have a right to refuse to use +// this code for any case. +// Tsukasa Aso ( aso@toyama-cmt.ac.jp ) +// Akinori Kimura ( AKimura@ashitech.ac.jp ) +// +/////////////////////////////////////////////////////////////////////////////// +// (Description) +// This is a primitive scorer class for scoring cell charge. +// The Cell Charge is defined by a sum of charge inside the cell +// which calculates the deposited charge in the cell. +// +// +// +// +// +// Created: 2006-06-20 Tsukasa ASO, Akinori Kimura. +// +/////////////////////////////////////////////////////////////////////////////// + +RE02PSPassageCellFlux::RE02PSPassageCellFlux(G4String name,G4int nx, G4int ny, G4int nz) + :G4PSPassageCellFlux(name),fNx(nx),fNy(ny),fNz(nz) +{;} + +RE02PSPassageCellFlux::~RE02PSPassageCellFlux() +{;} + +G4int RE02PSPassageCellFlux::GetIndex(G4Step* aStep) +{ + const G4VTouchable* touchable = aStep->GetPreStepPoint()->GetTouchable(); + G4int ix = touchable->GetReplicaNumber(1); + G4int iy = touchable->GetReplicaNumber(2); + G4int iz = touchable->GetReplicaNumber(0); + + return iy*fNx*fNy+ix*fNz+iz; +} diff --git a/examples/extended/runAndEvent/RE02/src/RE02PhantomParameterisation.cc b/examples/extended/runAndEvent/RE02/src/RE02PhantomParameterisation.cc deleted file mode 100644 index 5652dee204..0000000000 --- a/examples/extended/runAndEvent/RE02/src/RE02PhantomParameterisation.cc +++ /dev/null @@ -1,75 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// $Id: RE02PhantomParameterisation.cc,v 1.2 2006/06/29 17:45:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// - -#include "RE02PhantomParameterisation.hh" -#include "G4Box.hh" -#include "G4VPhysicalVolume.hh" - -RE02PhantomParameterisation::RE02PhantomParameterisation( - const G4ThreeVector& motherSize, - const G4int nx, const G4int ny, const G4int nz) - :G4VPVParameterisation(),fDxyzMother(motherSize), - fNx(nx),fNy(ny),fNz(nz) -{ - // Voxel Size - fDxyz.setX(fDxyzMother.x()/(G4double)fNx); - fDxyz.setY(fDxyzMother.y()/(G4double)fNy); - fDxyz.setZ(fDxyzMother.z()/(G4double)fNz); - // Calculation of each segmented position, and fill it in vector. - G4double offsetX = -fDxyzMother.x()+fDxyz.x(); - G4double offsetY = -fDxyzMother.y()+fDxyz.y(); - G4double offsetZ = -fDxyzMother.z()+fDxyz.z(); - for ( G4int ix = 0; ix < fNx; ix++){ - for ( G4int iy = 0; iy < fNy; iy++){ - for ( G4int iz = 0; iz < fNz; iz++){ - G4double x = offsetX+((G4double)ix)*fDxyz.x()*2.; - G4double y = offsetY+((G4double)iy)*fDxyz.y()*2.; - G4double z = offsetZ+((G4double)iz)*fDxyz.z()*2.; - G4ThreeVector pos(x,y,z); - fPositions.push_back(pos); - } - } - } - -} - -RE02PhantomParameterisation::~RE02PhantomParameterisation() { -} - -void RE02PhantomParameterisation::ComputeTransformation(const G4int copyNo, - G4VPhysicalVolume* physVol) const -{ - physVol->SetTranslation(fPositions[copyNo]); -} - - - - - - diff --git a/examples/extended/runAndEvent/RE02/src/RE02PrimaryGeneratorAction.cc b/examples/extended/runAndEvent/RE02/src/RE02PrimaryGeneratorAction.cc index 43dcd01aa8..8de320babf 100644 --- a/examples/extended/runAndEvent/RE02/src/RE02PrimaryGeneratorAction.cc +++ b/examples/extended/runAndEvent/RE02/src/RE02PrimaryGeneratorAction.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: RE02PrimaryGeneratorAction.cc,v 1.2 2006/06/29 17:45:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: RE02PrimaryGeneratorAction.cc,v 1.3 2006/11/18 01:37:24 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "RE02PrimaryGeneratorAction.hh" diff --git a/examples/extended/runAndEvent/RE02/src/RE02Run.cc b/examples/extended/runAndEvent/RE02/src/RE02Run.cc index f535e524f5..94ea96d093 100644 --- a/examples/extended/runAndEvent/RE02/src/RE02Run.cc +++ b/examples/extended/runAndEvent/RE02/src/RE02Run.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: RE02Run.cc,v 1.2 2006/06/29 17:45:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: RE02Run.cc,v 1.3 2006/11/18 01:37:24 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //===================================================================== diff --git a/examples/extended/runAndEvent/RE02/src/RE02RunAction.cc b/examples/extended/runAndEvent/RE02/src/RE02RunAction.cc index 08e480bfa0..8e120e1552 100644 --- a/examples/extended/runAndEvent/RE02/src/RE02RunAction.cc +++ b/examples/extended/runAndEvent/RE02/src/RE02RunAction.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: RE02RunAction.cc,v 1.2 2006/06/29 17:45:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: RE02RunAction.cc,v 1.3 2006/11/18 01:37:24 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "RE02RunAction.hh" #include "RE02Run.hh" diff --git a/examples/extended/visualization/perspective/History b/examples/extended/visualization/perspective/History index cc00b002d4..252b7a2c83 100644 --- a/examples/extended/visualization/perspective/History +++ b/examples/extended/visualization/perspective/History @@ -1,4 +1,4 @@ -$Id: History,v 1.1 2006/05/25 08:44:52 allison Exp $ +$Id: History,v 1.2 2006/11/06 20:07:50 allison Exp $ ------------------------------------------------------------------- ========================================================= @@ -16,5 +16,8 @@ track of all tags. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +65th November 2006 (exam-ext-vis-perps-V08-01-00) +- Improve command guidance. + 25th May 2006 (exam-ext-vis-V08-00-00) - First perspective example. diff --git a/examples/extended/visualization/perspective/include/PerspectiveVisAction.hh b/examples/extended/visualization/perspective/include/PerspectiveVisAction.hh index ce196d3a2e..153bd319ad 100644 --- a/examples/extended/visualization/perspective/include/PerspectiveVisAction.hh +++ b/examples/extended/visualization/perspective/include/PerspectiveVisAction.hh @@ -25,7 +25,7 @@ // // // $Id: PerspectiveVisAction.hh,v 1.2 2006/06/29 17:45:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef PERSPECTIVEVISACTION_HH #define PERSPECTIVEVISACTION_HH diff --git a/examples/extended/visualization/perspective/include/PerspectiveVisActionMessenger.hh b/examples/extended/visualization/perspective/include/PerspectiveVisActionMessenger.hh index e820b80482..49afff798a 100644 --- a/examples/extended/visualization/perspective/include/PerspectiveVisActionMessenger.hh +++ b/examples/extended/visualization/perspective/include/PerspectiveVisActionMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: PerspectiveVisActionMessenger.hh,v 1.2 2006/06/29 17:45:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef PERSPECTIVEVISACTIONMESSENGER_HH #define PERSPECTIVEVISACTIONMESSENGER_HH diff --git a/examples/extended/visualization/perspective/perspective.cc b/examples/extended/visualization/perspective/perspective.cc index 9b275320eb..60b346353d 100644 --- a/examples/extended/visualization/perspective/perspective.cc +++ b/examples/extended/visualization/perspective/perspective.cc @@ -25,7 +25,7 @@ // // // $Id: perspective.cc,v 1.2 2006/06/29 17:45:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "globals.hh" #include "G4VisExecutive.hh" diff --git a/examples/extended/visualization/perspective/src/PerspectiveVisAction.cc b/examples/extended/visualization/perspective/src/PerspectiveVisAction.cc index 83efff8596..a8248fa97d 100644 --- a/examples/extended/visualization/perspective/src/PerspectiveVisAction.cc +++ b/examples/extended/visualization/perspective/src/PerspectiveVisAction.cc @@ -25,7 +25,7 @@ // // // $Id: PerspectiveVisAction.cc,v 1.2 2006/06/29 17:45:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "PerspectiveVisAction.hh" diff --git a/examples/extended/visualization/perspective/src/PerspectiveVisActionMessenger.cc b/examples/extended/visualization/perspective/src/PerspectiveVisActionMessenger.cc index 0b825082e8..5703649fa5 100644 --- a/examples/extended/visualization/perspective/src/PerspectiveVisActionMessenger.cc +++ b/examples/extended/visualization/perspective/src/PerspectiveVisActionMessenger.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: PerspectiveVisActionMessenger.cc,v 1.2 2006/06/29 17:45:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: PerspectiveVisActionMessenger.cc,v 1.3 2006/11/06 20:07:36 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ #include "PerspectiveVisActionMessenger.hh" @@ -47,8 +47,7 @@ PerspectiveVisActionMessenger::PerspectiveVisActionMessenger fpCommandOS = new G4UIcmdWithAString ("/perspectiveDemo/optionString", this); fpCommandOS -> SetGuidance - ("Option string - passed in G4AttValue." - "\n Any combination of \"x\", \"y\", \"z\", \"a[ll]\"."); + ("Option string - any combination of \"x\", \"y\", \"z\", \"a[ll]\"."); fpCommandOS -> SetParameterName ("option-string", omitable = true); fpCommandOS -> SetDefaultValue("all"); diff --git a/examples/extended/visualization/standalone/include/StandaloneVisAction.hh b/examples/extended/visualization/standalone/include/StandaloneVisAction.hh index 392b4ec9df..e9052e55e4 100644 --- a/examples/extended/visualization/standalone/include/StandaloneVisAction.hh +++ b/examples/extended/visualization/standalone/include/StandaloneVisAction.hh @@ -25,7 +25,7 @@ // // // $Id: StandaloneVisAction.hh,v 1.2 2006/06/29 17:45:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef STANDALONEVISACTION_HH #define STANDALONEVISACTION_HH diff --git a/examples/extended/visualization/standalone/src/StandaloneVisAction.cc b/examples/extended/visualization/standalone/src/StandaloneVisAction.cc index 631d135900..d999cccb7c 100644 --- a/examples/extended/visualization/standalone/src/StandaloneVisAction.cc +++ b/examples/extended/visualization/standalone/src/StandaloneVisAction.cc @@ -25,7 +25,7 @@ // // // $Id: StandaloneVisAction.cc,v 1.2 2006/06/29 17:45:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "StandaloneVisAction.hh" diff --git a/examples/extended/visualization/standalone/standalone.cc b/examples/extended/visualization/standalone/standalone.cc index 610c7534cb..7eeeaf5b52 100644 --- a/examples/extended/visualization/standalone/standalone.cc +++ b/examples/extended/visualization/standalone/standalone.cc @@ -25,7 +25,7 @@ // // // $Id: standalone.cc,v 1.2 2006/06/29 17:45:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "globals.hh" #include "G4VisExecutive.hh" diff --git a/examples/extended/visualization/userVisAction/History b/examples/extended/visualization/userVisAction/History index 68b44bf2e8..1bae55297c 100644 --- a/examples/extended/visualization/userVisAction/History +++ b/examples/extended/visualization/userVisAction/History @@ -1,4 +1,4 @@ -$Id: History,v 1.2 2006/05/25 08:00:06 allison Exp $ +$Id: History,v 1.3 2006/11/06 20:12:13 allison Exp $ ------------------------------------------------------------------- ========================================================= @@ -16,6 +16,9 @@ track of all tags. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +6th November 2006 John Allison (exam-ext-vis-UVA-V08-01-00) +- Remove Mac dylib special - no longer necessary. + 25th May 2006 John Allison (exam-ext-vis-V08-00-00) - Improved vis.mac. - UVA_VisAction.cc: Follow changes in G4Colour statics. diff --git a/examples/extended/visualization/userVisAction/include/UVA_ChamberParameterisation.hh b/examples/extended/visualization/userVisAction/include/UVA_ChamberParameterisation.hh index fcc5a41649..b4da178cd5 100644 --- a/examples/extended/visualization/userVisAction/include/UVA_ChamberParameterisation.hh +++ b/examples/extended/visualization/userVisAction/include/UVA_ChamberParameterisation.hh @@ -25,7 +25,7 @@ // // // $Id: UVA_ChamberParameterisation.hh,v 1.2 2006/06/29 17:46:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // A parameterisation that describes a series of boxes along Z diff --git a/examples/extended/visualization/userVisAction/include/UVA_DetectorConstruction.hh b/examples/extended/visualization/userVisAction/include/UVA_DetectorConstruction.hh index 9fbef19774..44014228ae 100644 --- a/examples/extended/visualization/userVisAction/include/UVA_DetectorConstruction.hh +++ b/examples/extended/visualization/userVisAction/include/UVA_DetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: UVA_DetectorConstruction.hh,v 1.2 2006/06/29 17:46:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/visualization/userVisAction/include/UVA_DetectorMessenger.hh b/examples/extended/visualization/userVisAction/include/UVA_DetectorMessenger.hh index a9f3f40650..accdefebc2 100644 --- a/examples/extended/visualization/userVisAction/include/UVA_DetectorMessenger.hh +++ b/examples/extended/visualization/userVisAction/include/UVA_DetectorMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: UVA_DetectorMessenger.hh,v 1.2 2006/06/29 17:46:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/visualization/userVisAction/include/UVA_EventAction.hh b/examples/extended/visualization/userVisAction/include/UVA_EventAction.hh index cd4912d593..4da3bbfc48 100644 --- a/examples/extended/visualization/userVisAction/include/UVA_EventAction.hh +++ b/examples/extended/visualization/userVisAction/include/UVA_EventAction.hh @@ -25,7 +25,7 @@ // // // $Id: UVA_EventAction.hh,v 1.2 2006/06/29 17:46:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/visualization/userVisAction/include/UVA_MagneticField.hh b/examples/extended/visualization/userVisAction/include/UVA_MagneticField.hh index 13e319d035..04b9ff396c 100644 --- a/examples/extended/visualization/userVisAction/include/UVA_MagneticField.hh +++ b/examples/extended/visualization/userVisAction/include/UVA_MagneticField.hh @@ -25,7 +25,7 @@ // // // $Id: UVA_MagneticField.hh,v 1.2 2006/06/29 17:46:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // A class for control of the Magnetic Field of the detector. diff --git a/examples/extended/visualization/userVisAction/include/UVA_PhysicsList.hh b/examples/extended/visualization/userVisAction/include/UVA_PhysicsList.hh index 557d61a387..9f4ba0e506 100644 --- a/examples/extended/visualization/userVisAction/include/UVA_PhysicsList.hh +++ b/examples/extended/visualization/userVisAction/include/UVA_PhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: UVA_PhysicsList.hh,v 1.2 2006/06/29 17:46:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/visualization/userVisAction/include/UVA_PrimaryGeneratorAction.hh b/examples/extended/visualization/userVisAction/include/UVA_PrimaryGeneratorAction.hh index ad3c360b02..73a26b18a9 100644 --- a/examples/extended/visualization/userVisAction/include/UVA_PrimaryGeneratorAction.hh +++ b/examples/extended/visualization/userVisAction/include/UVA_PrimaryGeneratorAction.hh @@ -25,7 +25,7 @@ // // // $Id: UVA_PrimaryGeneratorAction.hh,v 1.2 2006/06/29 17:46:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/visualization/userVisAction/include/UVA_RunAction.hh b/examples/extended/visualization/userVisAction/include/UVA_RunAction.hh index 21679facd3..3bbd60b515 100644 --- a/examples/extended/visualization/userVisAction/include/UVA_RunAction.hh +++ b/examples/extended/visualization/userVisAction/include/UVA_RunAction.hh @@ -25,7 +25,7 @@ // // // $Id: UVA_RunAction.hh,v 1.2 2006/06/29 17:46:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/visualization/userVisAction/include/UVA_SteppingAction.hh b/examples/extended/visualization/userVisAction/include/UVA_SteppingAction.hh index 469b90867c..3fb3e27182 100644 --- a/examples/extended/visualization/userVisAction/include/UVA_SteppingAction.hh +++ b/examples/extended/visualization/userVisAction/include/UVA_SteppingAction.hh @@ -25,7 +25,7 @@ // // // $Id: UVA_SteppingAction.hh,v 1.2 2006/06/29 17:46:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/visualization/userVisAction/include/UVA_SteppingVerbose.hh b/examples/extended/visualization/userVisAction/include/UVA_SteppingVerbose.hh index 59fea4478b..5e06c9b939 100644 --- a/examples/extended/visualization/userVisAction/include/UVA_SteppingVerbose.hh +++ b/examples/extended/visualization/userVisAction/include/UVA_SteppingVerbose.hh @@ -25,7 +25,7 @@ // // // $Id: UVA_SteppingVerbose.hh,v 1.2 2006/06/29 17:46:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // This class manages the verbose outputs in G4SteppingManager. // It inherits from G4SteppingVerbose. diff --git a/examples/extended/visualization/userVisAction/include/UVA_TrackerHit.hh b/examples/extended/visualization/userVisAction/include/UVA_TrackerHit.hh index 1ee8dad4e7..69a7f07480 100644 --- a/examples/extended/visualization/userVisAction/include/UVA_TrackerHit.hh +++ b/examples/extended/visualization/userVisAction/include/UVA_TrackerHit.hh @@ -25,7 +25,7 @@ // // // $Id: UVA_TrackerHit.hh,v 1.2 2006/06/29 17:46:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/visualization/userVisAction/include/UVA_TrackerSD.hh b/examples/extended/visualization/userVisAction/include/UVA_TrackerSD.hh index 033adbe69a..dc53b3621a 100644 --- a/examples/extended/visualization/userVisAction/include/UVA_TrackerSD.hh +++ b/examples/extended/visualization/userVisAction/include/UVA_TrackerSD.hh @@ -25,7 +25,7 @@ // // // $Id: UVA_TrackerSD.hh,v 1.2 2006/06/29 17:46:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/visualization/userVisAction/include/UVA_VisAction.hh b/examples/extended/visualization/userVisAction/include/UVA_VisAction.hh index 0b0f3aec74..e2d75cd105 100644 --- a/examples/extended/visualization/userVisAction/include/UVA_VisAction.hh +++ b/examples/extended/visualization/userVisAction/include/UVA_VisAction.hh @@ -25,7 +25,7 @@ // // // $Id: UVA_VisAction.hh,v 1.2 2006/06/29 17:46:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef UVA_VISACTION_HH #define UVA_VISACTION_HH diff --git a/examples/extended/visualization/userVisAction/src/UVA_ChamberParameterisation.cc b/examples/extended/visualization/userVisAction/src/UVA_ChamberParameterisation.cc index 7db5f504bf..f4c32301ef 100644 --- a/examples/extended/visualization/userVisAction/src/UVA_ChamberParameterisation.cc +++ b/examples/extended/visualization/userVisAction/src/UVA_ChamberParameterisation.cc @@ -25,7 +25,7 @@ // // // $Id: UVA_ChamberParameterisation.cc,v 1.2 2006/06/29 17:46:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/visualization/userVisAction/src/UVA_DetectorConstruction.cc b/examples/extended/visualization/userVisAction/src/UVA_DetectorConstruction.cc index 7602cdc768..0fe37d6626 100644 --- a/examples/extended/visualization/userVisAction/src/UVA_DetectorConstruction.cc +++ b/examples/extended/visualization/userVisAction/src/UVA_DetectorConstruction.cc @@ -25,7 +25,7 @@ // // // $Id: UVA_DetectorConstruction.cc,v 1.2 2006/06/29 17:46:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/visualization/userVisAction/src/UVA_DetectorMessenger.cc b/examples/extended/visualization/userVisAction/src/UVA_DetectorMessenger.cc index 458b38559c..974ac5f8a8 100644 --- a/examples/extended/visualization/userVisAction/src/UVA_DetectorMessenger.cc +++ b/examples/extended/visualization/userVisAction/src/UVA_DetectorMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: UVA_DetectorMessenger.cc,v 1.2 2006/06/29 17:46:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/visualization/userVisAction/src/UVA_EventAction.cc b/examples/extended/visualization/userVisAction/src/UVA_EventAction.cc index 48a8af7cf0..dbf562fe07 100644 --- a/examples/extended/visualization/userVisAction/src/UVA_EventAction.cc +++ b/examples/extended/visualization/userVisAction/src/UVA_EventAction.cc @@ -25,7 +25,7 @@ // // // $Id: UVA_EventAction.cc,v 1.2 2006/06/29 17:46:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/visualization/userVisAction/src/UVA_MagneticField.cc b/examples/extended/visualization/userVisAction/src/UVA_MagneticField.cc index 7603a90a55..d80d183c09 100644 --- a/examples/extended/visualization/userVisAction/src/UVA_MagneticField.cc +++ b/examples/extended/visualization/userVisAction/src/UVA_MagneticField.cc @@ -25,7 +25,7 @@ // // // $Id: UVA_MagneticField.cc,v 1.2 2006/06/29 17:46:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // User Field class implementation. // diff --git a/examples/extended/visualization/userVisAction/src/UVA_PhysicsList.cc b/examples/extended/visualization/userVisAction/src/UVA_PhysicsList.cc index d3a006aa80..0bdc13072c 100644 --- a/examples/extended/visualization/userVisAction/src/UVA_PhysicsList.cc +++ b/examples/extended/visualization/userVisAction/src/UVA_PhysicsList.cc @@ -25,7 +25,7 @@ // // // $Id: UVA_PhysicsList.cc,v 1.2 2006/06/29 17:46:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/visualization/userVisAction/src/UVA_PrimaryGeneratorAction.cc b/examples/extended/visualization/userVisAction/src/UVA_PrimaryGeneratorAction.cc index 9f601e4d83..be1515c4c2 100644 --- a/examples/extended/visualization/userVisAction/src/UVA_PrimaryGeneratorAction.cc +++ b/examples/extended/visualization/userVisAction/src/UVA_PrimaryGeneratorAction.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: UVA_PrimaryGeneratorAction.cc,v 1.2 2006/06/29 17:46:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: UVA_PrimaryGeneratorAction.cc,v 1.3 2006/11/06 20:11:51 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -37,7 +37,6 @@ #include "G4ParticleGun.hh" #include "G4ParticleTable.hh" #include "G4ParticleDefinition.hh" -#include "G4Proton.hh" #include "globals.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -52,7 +51,6 @@ UVA_PrimaryGeneratorAction::UVA_PrimaryGeneratorAction( // default particle G4ParticleTable* particleTable = G4ParticleTable::GetParticleTable(); - G4Proton::Proton(); G4ParticleDefinition* particle = particleTable->FindParticle("proton"); particleGun->SetParticleDefinition(particle); diff --git a/examples/extended/visualization/userVisAction/src/UVA_RunAction.cc b/examples/extended/visualization/userVisAction/src/UVA_RunAction.cc index 1bf5636306..a383aaf3aa 100644 --- a/examples/extended/visualization/userVisAction/src/UVA_RunAction.cc +++ b/examples/extended/visualization/userVisAction/src/UVA_RunAction.cc @@ -25,7 +25,7 @@ // // // $Id: UVA_RunAction.cc,v 1.2 2006/06/29 17:46:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/visualization/userVisAction/src/UVA_SteppingAction.cc b/examples/extended/visualization/userVisAction/src/UVA_SteppingAction.cc index bc9e16928a..37cf998372 100644 --- a/examples/extended/visualization/userVisAction/src/UVA_SteppingAction.cc +++ b/examples/extended/visualization/userVisAction/src/UVA_SteppingAction.cc @@ -25,7 +25,7 @@ // // // $Id: UVA_SteppingAction.cc,v 1.2 2006/06/29 17:46:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/visualization/userVisAction/src/UVA_SteppingVerbose.cc b/examples/extended/visualization/userVisAction/src/UVA_SteppingVerbose.cc index ef5cf1af3d..66a8164012 100644 --- a/examples/extended/visualization/userVisAction/src/UVA_SteppingVerbose.cc +++ b/examples/extended/visualization/userVisAction/src/UVA_SteppingVerbose.cc @@ -25,7 +25,7 @@ // // // $Id: UVA_SteppingVerbose.cc,v 1.2 2006/06/29 17:47:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/visualization/userVisAction/src/UVA_TrackerHit.cc b/examples/extended/visualization/userVisAction/src/UVA_TrackerHit.cc index 5a1765a4f8..8508df31a3 100644 --- a/examples/extended/visualization/userVisAction/src/UVA_TrackerHit.cc +++ b/examples/extended/visualization/userVisAction/src/UVA_TrackerHit.cc @@ -25,7 +25,7 @@ // // // $Id: UVA_TrackerHit.cc,v 1.2 2006/06/29 17:47:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/visualization/userVisAction/src/UVA_TrackerSD.cc b/examples/extended/visualization/userVisAction/src/UVA_TrackerSD.cc index 2854d32d04..9c0f70e6de 100644 --- a/examples/extended/visualization/userVisAction/src/UVA_TrackerSD.cc +++ b/examples/extended/visualization/userVisAction/src/UVA_TrackerSD.cc @@ -25,7 +25,7 @@ // // // $Id: UVA_TrackerSD.cc,v 1.2 2006/06/29 17:47:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/extended/visualization/userVisAction/src/UVA_VisAction.cc b/examples/extended/visualization/userVisAction/src/UVA_VisAction.cc index 1cf35498e7..4dc4025416 100644 --- a/examples/extended/visualization/userVisAction/src/UVA_VisAction.cc +++ b/examples/extended/visualization/userVisAction/src/UVA_VisAction.cc @@ -25,7 +25,7 @@ // // // $Id: UVA_VisAction.cc,v 1.3 2006/06/29 17:47:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "UVA_VisAction.hh" diff --git a/examples/extended/visualization/userVisAction/userVisAction.cc b/examples/extended/visualization/userVisAction/userVisAction.cc index 50290ad99c..85a3636162 100644 --- a/examples/extended/visualization/userVisAction/userVisAction.cc +++ b/examples/extended/visualization/userVisAction/userVisAction.cc @@ -25,7 +25,7 @@ // // // $Id: userVisAction.cc,v 1.2 2006/06/29 17:46:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N01/exampleN01.cc b/examples/novice/N01/exampleN01.cc index 0475048247..1a5e63941c 100644 --- a/examples/novice/N01/exampleN01.cc +++ b/examples/novice/N01/exampleN01.cc @@ -25,7 +25,7 @@ // // // $Id: exampleN01.cc,v 1.6 2006/06/29 17:47:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/novice/N01/exampleN01.out b/examples/novice/N01/exampleN01.out index 59e72a0351..24cfcdf464 100644 --- a/examples/novice/N01/exampleN01.out +++ b/examples/novice/N01/exampleN01.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -222,5 +222,5 @@ Terminate current event processing. Run terminated. Run Summary Number of events processed : 3 - User=0.02s Real=0.12s Sys=0.07000000000000001s + User=0.05s Real=0.06s Sys=0s G4 kernel has come to Quit state. diff --git a/examples/novice/N01/include/ExN01DetectorConstruction.hh b/examples/novice/N01/include/ExN01DetectorConstruction.hh index 4ff8741611..027a726a42 100644 --- a/examples/novice/N01/include/ExN01DetectorConstruction.hh +++ b/examples/novice/N01/include/ExN01DetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: ExN01DetectorConstruction.hh,v 1.6 2006/06/29 17:47:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef ExN01DetectorConstruction_H diff --git a/examples/novice/N01/include/ExN01PhysicsList.hh b/examples/novice/N01/include/ExN01PhysicsList.hh index 0f7eb215db..f5153b99a5 100644 --- a/examples/novice/N01/include/ExN01PhysicsList.hh +++ b/examples/novice/N01/include/ExN01PhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: ExN01PhysicsList.hh,v 1.6 2006/06/29 17:47:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // diff --git a/examples/novice/N01/include/ExN01PrimaryGeneratorAction.hh b/examples/novice/N01/include/ExN01PrimaryGeneratorAction.hh index 33d354f055..e578672b68 100644 --- a/examples/novice/N01/include/ExN01PrimaryGeneratorAction.hh +++ b/examples/novice/N01/include/ExN01PrimaryGeneratorAction.hh @@ -25,7 +25,7 @@ // // // $Id: ExN01PrimaryGeneratorAction.hh,v 1.5 2006/06/29 17:47:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef ExN01PrimaryGeneratorAction_h diff --git a/examples/novice/N01/src/ExN01DetectorConstruction.cc b/examples/novice/N01/src/ExN01DetectorConstruction.cc index 2f6fa84d2d..94361c8a40 100644 --- a/examples/novice/N01/src/ExN01DetectorConstruction.cc +++ b/examples/novice/N01/src/ExN01DetectorConstruction.cc @@ -25,7 +25,7 @@ // // // $Id: ExN01DetectorConstruction.cc,v 1.9 2006/06/29 17:47:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "ExN01DetectorConstruction.hh" diff --git a/examples/novice/N01/src/ExN01PhysicsList.cc b/examples/novice/N01/src/ExN01PhysicsList.cc index 685b86a2d1..72acc6c752 100644 --- a/examples/novice/N01/src/ExN01PhysicsList.cc +++ b/examples/novice/N01/src/ExN01PhysicsList.cc @@ -25,7 +25,7 @@ // // // $Id: ExN01PhysicsList.cc,v 1.6 2006/06/29 17:47:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/novice/N01/src/ExN01PrimaryGeneratorAction.cc b/examples/novice/N01/src/ExN01PrimaryGeneratorAction.cc index 56118131c7..ed793ee25b 100644 --- a/examples/novice/N01/src/ExN01PrimaryGeneratorAction.cc +++ b/examples/novice/N01/src/ExN01PrimaryGeneratorAction.cc @@ -25,7 +25,7 @@ // // // $Id: ExN01PrimaryGeneratorAction.cc,v 1.6 2006/06/29 17:47:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "ExN01PrimaryGeneratorAction.hh" diff --git a/examples/novice/N02/History b/examples/novice/N02/History index 3c5da06378..b484cc35af 100644 --- a/examples/novice/N02/History +++ b/examples/novice/N02/History @@ -1,4 +1,4 @@ -$Id: History,v 1.47 2006/06/16 10:19:30 gcosmo Exp $ +$Id: History,v 1.49 2006/12/12 11:57:07 gcosmo Exp $ ------------------------------------------------------------------- ========================================================= @@ -15,6 +15,12 @@ track of all tags. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +12-12-06 G.Cosmo (exampleN02-V08-01-01) +- Commented out drawing of hits in vis.mac. + +06-11-06 J.Allison (exampleN02-V08-01-00) +- Improved vis.mac to vis best practice. + 16-06-06 G.Cosmo (exampleN02-V08-00-03) - Use coherent allocation scheme for user-classes and initialisation in main(). diff --git a/examples/novice/N02/exampleN02.cc b/examples/novice/N02/exampleN02.cc index e0526afc25..9a31f0bbfd 100644 --- a/examples/novice/N02/exampleN02.cc +++ b/examples/novice/N02/exampleN02.cc @@ -25,7 +25,7 @@ // // // $Id: exampleN02.cc,v 1.12 2006/06/29 17:47:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N02/exampleN02.out b/examples/novice/N02/exampleN02.out index 51f04e5a6e..c33f39d399 100644 --- a/examples/novice/N02/exampleN02.out +++ b/examples/novice/N02/exampleN02.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -29,17 +29,13 @@ Registered model factories: drawByCharge drawByParticleID drawByOriginVolume - -Registered models: - None + drawByAttribute Registered filter factories: chargeFilter particleFilter originVolumeFilter - -Registered filters: - None + attributeFilter The materials defined are : @@ -63,6 +59,7 @@ There are 5 chambers in the tracker region. The chambers are 200 mm of XenonGas The distance between chamber is 80 cm phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV Sampling according Klein-Nishina model @@ -70,7 +67,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.022 MeV to 100 GeV in 100 bins. @@ -102,7 +99,7 @@ eBrem: tables are built for e+ Total cross sections from a parametrisation based on the EEDL data library. Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -213,2311 +210,2066 @@ Index : 2 used in the geometry : Yes recalculation needed : No Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process 0 0 fm 0 fm -2.91 m 200 MeV 0 eV 0 fm 0 fm World initStep - 1 -30.5 um 6.38 um -2.86 m 200 MeV 8.35 keV 4.79 cm 4.79 cm World eIoni - 2 -206 um -180 um -2.65 m 200 MeV 56.1 keV 21.4 cm 26.2 cm World eIoni - 3 200 um -392 um -2.45 m 200 MeV 45.9 keV 19.8 cm 46 cm World Transportation - 4 227 um -409 um -2.45 m 198 MeV 1.5 MeV 1.17 mm 46.1 cm Target eBrem - 5 228 um -409 um -2.45 m 161 MeV 42.8 keV 36.1 um 46.1 cm Target eBrem - 6 228 um -409 um -2.45 m 156 MeV 5.69 keV 8.06 um 46.1 cm Target eBrem - 7 347 um -454 um -2.45 m 153 MeV 2.29 MeV 1.98 mm 46.3 cm Target eBrem - 8 400 um -454 um -2.45 m 148 MeV 1.29 MeV 908 um 46.4 cm Target eBrem - 9 399 um -455 um -2.45 m 147 MeV 174 keV 136 um 46.4 cm Target eBrem - 10 400 um -472 um -2.45 m 146 MeV 519 keV 389 um 46.5 cm Target eBrem - 11 437 um -588 um -2.44 m 140 MeV 4.36 MeV 1.51 mm 46.6 cm Target eBrem - 12 488 um -655 um -2.44 m 114 MeV 885 keV 837 um 46.7 cm Target eBrem - 13 530 um -684 um -2.44 m 112 MeV 310 keV 315 um 46.7 cm Target eBrem - 14 669 um -751 um -2.44 m 108 MeV 911 keV 755 um 46.8 cm Target eBrem - 15 887 um -954 um -2.44 m 63.6 MeV 6.08 MeV 2.19 mm 47 cm Target eBrem - 16 963 um -1.09 mm -2.44 m 60.9 MeV 723 keV 642 um 47.1 cm Target eBrem - 17 1.3 mm -1.77 mm -2.44 m 57.4 MeV 2.93 MeV 2.48 mm 47.3 cm Target eBrem - 18 1.35 mm -1.8 mm -2.44 m 48.8 MeV 320 keV 147 um 47.4 cm Target eBrem - 19 1.78 mm -1.99 mm -2.44 m 43.5 MeV 1.18 MeV 1.05 mm 47.5 cm Target eBrem - 20 1.82 mm -2.03 mm -2.44 m 42.2 MeV 237 keV 192 um 47.5 cm Target eBrem - 21 1.85 mm -2.09 mm -2.44 m 41.5 MeV 345 keV 249 um 47.5 cm Target eBrem - 22 2.3 mm -2.58 mm -2.43 m 31.3 MeV 2.88 MeV 1.64 mm 47.7 cm Target eBrem - 23 2.35 mm -2.75 mm -2.43 m 20.4 MeV 564 keV 429 um 47.7 cm Target eBrem - 24 2.15 mm -2.96 mm -2.43 m 15.4 MeV 4.5 MeV 3.07 mm 48 cm Target eBrem - 25 2.13 mm -2.16 mm -2.43 m 8.96 MeV 5.69 MeV 3.22 mm 48.3 cm Target eBrem - 26 2.03 mm -2.22 mm -2.43 m 3.44 MeV 228 keV 185 um 48.4 cm Target eBrem - 27 2.18 mm -2.17 mm -2.43 m 2.05 MeV 547 keV 613 um 48.4 cm Target eBrem - 28 2.2 mm -2.12 mm -2.43 m 850 keV 93.5 keV 89.1 um 48.4 cm Target eBrem - 29 2.25 mm -2.08 mm -2.43 m 0 eV 850 keV 603 um 48.5 cm Target eIoni - 30 2.25 mm -2.08 mm -2.43 m 0 eV 0 eV 0 fm 48.5 cm Target annihil - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 30, Parent ID = 1 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 2.25 mm -2.08 mm -2.43 m 511 keV 0 eV 0 fm 0 fm Target initStep - 1 1.14 mm -3.86 mm -2.43 m 193 keV 0 eV 2.1 mm 2.1 mm Target compt - 2 840 um -2.39 mm -2.43 m 0 eV 88 keV 1.77 mm 3.87 mm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 32, Parent ID = 30 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 840 um -2.39 mm -2.43 m 105 keV 0 eV 0 fm 0 fm Target initStep - 1 841 um -2.39 mm -2.43 m 0 eV 105 keV 30.2 um 30.2 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 31, Parent ID = 30 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.14 mm -3.86 mm -2.43 m 318 keV 0 eV 0 fm 0 fm Target initStep - 1 1.14 mm -3.87 mm -2.43 m 0 eV 318 keV 162 um 162 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 29, Parent ID = 1 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 2.25 mm -2.08 mm -2.43 m 511 keV 0 eV 0 fm 0 fm Target initStep - 1 9.21 mm 9.07 mm -2.43 m 214 keV 0 eV 1.32 cm 1.32 cm Target compt - 2 9.98 mm 7.97 mm -2.43 m 151 keV 0 eV 1.41 mm 1.46 cm Target compt - 3 1 cm 7.95 mm -2.43 m 0 eV 88 keV 115 um 1.47 cm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 35, Parent ID = 29 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1 cm 7.95 mm -2.43 m 62.6 keV 0 eV 0 fm 0 fm Target initStep - 1 1 cm 7.95 mm -2.43 m 0 eV 62.6 keV 12.9 um 12.9 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 34, Parent ID = 29 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 9.98 mm 7.97 mm -2.43 m 63.2 keV 0 eV 0 fm 0 fm Target initStep - 1 9.98 mm 7.97 mm -2.43 m 0 eV 63.2 keV 13.1 um 13.1 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 33, Parent ID = 29 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 9.21 mm 9.07 mm -2.43 m 297 keV 0 eV 0 fm 0 fm Target initStep - 1 9.21 mm 9.07 mm -2.43 m 0 eV 297 keV 147 um 147 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 28, Parent ID = 1 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 2.2 mm -2.12 mm -2.43 m 1.11 MeV 0 eV 0 fm 0 fm Target initStep - 1 7.48 mm 1.16 cm -2.42 m 267 keV 0 eV 1.55 cm 1.55 cm Target compt - 2 7.31 mm 1.15 cm -2.42 m 259 keV 0 eV 177 um 1.57 cm Target compt - 3 7.29 mm 1.15 cm -2.42 m 159 keV 0 eV 24.7 um 1.57 cm Target compt - 4 7.38 mm 1.14 cm -2.42 m 0 eV 88 keV 208 um 1.59 cm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 39, Parent ID = 28 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 7.38 mm 1.14 cm -2.42 m 71.3 keV 0 eV 0 fm 0 fm Target initStep - 1 7.38 mm 1.14 cm -2.42 m 0 eV 71.3 keV 16.1 um 16.1 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 38, Parent ID = 28 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 7.29 mm 1.15 cm -2.42 m 99.5 keV 0 eV 0 fm 0 fm Target initStep - 1 7.29 mm 1.15 cm -2.42 m 0 eV 99.5 keV 27.4 um 27.4 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 37, Parent ID = 28 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 7.31 mm 1.15 cm -2.42 m 7.7 keV 0 eV 0 fm 0 fm Target initStep - 1 7.31 mm 1.15 cm -2.42 m 0 eV 7.7 keV 477 nm 477 nm Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 36, Parent ID = 28 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 7.48 mm 1.16 cm -2.42 m 844 keV 0 eV 0 fm 0 fm Target initStep - 1 7.51 mm 1.16 cm -2.42 m 0 eV 844 keV 593 um 593 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 27, Parent ID = 1 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 2.18 mm -2.17 mm -2.43 m 840 keV 0 eV 0 fm 0 fm Target initStep - 1 1.88 mm -984 um -2.43 m 410 keV 0 eV 3.17 mm 3.17 mm Target compt - 2 2.51 mm -850 um -2.42 m 0 eV 88 keV 707 um 3.88 mm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 41, Parent ID = 27 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 2.51 mm -850 um -2.42 m 322 keV 0 eV 0 fm 0 fm Target initStep - 1 2.51 mm -849 um -2.42 m 0 eV 322 keV 165 um 165 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 40, Parent ID = 27 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.88 mm -984 um -2.43 m 430 keV 0 eV 0 fm 0 fm Target initStep - 1 1.88 mm -983 um -2.43 m 0 eV 430 keV 248 um 248 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 26, Parent ID = 1 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 2.03 mm -2.22 mm -2.43 m 5.29 MeV 0 eV 0 fm 0 fm Target initStep - 1 -2.49 mm -5.79 mm -2.42 m 0 eV 0 eV 1.01 cm 1.01 cm Target conv - -********************************************************************************************************* -* G4Track Information: Particle = e+, Track ID = 43, Parent ID = 26 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -2.49 mm -5.79 mm -2.42 m 2.53 MeV 0 eV 0 fm 0 fm Target initStep - 1 -2.69 mm -6.02 mm -2.42 m 1.71 MeV 346 keV 361 um 361 um Target eBrem - 2 -2.84 mm -5.87 mm -2.42 m 268 keV 1.44 MeV 1.28 mm 1.64 mm Target eIoni - 3 -2.85 mm -5.87 mm -2.42 m 0 eV 268 keV 123 um 1.76 mm Target eIoni - 4 -2.85 mm -5.87 mm -2.42 m 0 eV 0 eV 0 fm 1.76 mm Target annihil - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 46, Parent ID = 43 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -2.85 mm -5.87 mm -2.42 m 511 keV 0 eV 0 fm 0 fm Target initStep - 1 -3.16 mm -5.72 mm -2.42 m 353 keV 0 eV 552 um 552 um Target compt - 2 -3.12 mm -5.73 mm -2.42 m 247 keV 0 eV 125 um 677 um Target compt - 3 -3.09 mm -5.27 mm -2.42 m 0 eV 88 keV 522 um 1.2 mm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 49, Parent ID = 46 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -3.09 mm -5.27 mm -2.42 m 159 keV 0 eV 0 fm 0 fm Target initStep - 1 -3.09 mm -5.26 mm -2.42 m 0 eV 159 keV 57.3 um 57.3 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 48, Parent ID = 46 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -3.12 mm -5.73 mm -2.42 m 106 keV 0 eV 0 fm 0 fm Target initStep - 1 -3.12 mm -5.73 mm -2.42 m 0 eV 106 keV 30.6 um 30.6 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 47, Parent ID = 46 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -3.16 mm -5.72 mm -2.42 m 158 keV 0 eV 0 fm 0 fm Target initStep - 1 -3.16 mm -5.72 mm -2.42 m 0 eV 158 keV 56.9 um 56.9 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 45, Parent ID = 43 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -2.85 mm -5.87 mm -2.42 m 511 keV 0 eV 0 fm 0 fm Target initStep - 1 1.15 cm -1.31 cm -2.4 m 511 keV 0 eV 2.56 cm 2.56 cm Target Transportation - 2 2.4 m -1.22 m 91.4 cm 511 keV 0 eV 4.26 m 4.28 m Tracker Transportation - 3 2.91 m -1.47 m 1.62 m 511 keV 0 eV 90.9 cm 5.19 m OutOfWorld Transportation - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 44, Parent ID = 43 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -2.69 mm -6.02 mm -2.42 m 476 keV 0 eV 0 fm 0 fm Target initStep - 1 -3.33 mm -8.22 mm -2.41 m 370 keV 0 eV 9.86 mm 9.86 mm Target compt - 2 -3.78 mm -8.89 mm -2.41 m 0 eV 88 keV 938 um 1.08 cm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 51, Parent ID = 44 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -3.78 mm -8.89 mm -2.41 m 282 keV 0 eV 0 fm 0 fm Target initStep - 1 -3.78 mm -8.89 mm -2.41 m 0 eV 282 keV 137 um 137 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 50, Parent ID = 44 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -3.33 mm -8.22 mm -2.41 m 106 keV 0 eV 0 fm 0 fm Target initStep - 1 -3.33 mm -8.22 mm -2.41 m 0 eV 106 keV 30.3 um 30.3 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 42, Parent ID = 26 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -2.49 mm -5.79 mm -2.42 m 1.74 MeV 0 eV 0 fm 0 fm Target initStep - 1 -2.48 mm -5.63 mm -2.42 m 1.05 MeV 379 keV 325 um 325 um Target eBrem - 2 -2.48 mm -5.62 mm -2.42 m 0 eV 1.05 MeV 766 um 1.09 mm Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 52, Parent ID = 42 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -2.48 mm -5.63 mm -2.42 m 310 keV 0 eV 0 fm 0 fm Target initStep - 1 -3.51 mm -4.63 mm -2.42 m 0 eV 88 keV 2.15 mm 2.15 mm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 53, Parent ID = 52 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -3.51 mm -4.63 mm -2.42 m 222 keV 0 eV 0 fm 0 fm Target initStep - 1 -3.51 mm -4.64 mm -2.42 m 0 eV 222 keV 96.3 um 96.3 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 25, Parent ID = 1 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 2.13 mm -2.16 mm -2.43 m 727 keV 0 eV 0 fm 0 fm Target initStep - 1 140 um -3.39 mm -2.42 m 0 eV 88 keV 4.41 mm 4.41 mm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 54, Parent ID = 25 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 140 um -3.39 mm -2.42 m 639 keV 0 eV 0 fm 0 fm Target initStep - 1 145 um -3.39 mm -2.42 m 0 eV 639 keV 418 um 418 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 24, Parent ID = 1 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 2.15 mm -2.96 mm -2.43 m 506 keV 0 eV 0 fm 0 fm Target initStep - 1 1.99 mm -3.02 mm -2.43 m 478 keV 0 eV 384 um 384 um Target compt - 2 1.13 mm -2.65 mm -2.43 m 0 eV 88 keV 5.35 mm 5.74 mm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 56, Parent ID = 24 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.13 mm -2.65 mm -2.43 m 390 keV 0 eV 0 fm 0 fm Target initStep - 1 1.14 mm -2.65 mm -2.43 m 0 eV 390 keV 217 um 217 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 55, Parent ID = 24 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.99 mm -3.02 mm -2.43 m 28.2 keV 0 eV 0 fm 0 fm Target initStep - 1 1.99 mm -3.02 mm -2.43 m 0 eV 28.2 keV 3.56 um 3.56 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 23, Parent ID = 1 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 2.35 mm -2.75 mm -2.43 m 10.4 MeV 0 eV 0 fm 0 fm Target initStep - 1 4.41 mm -7.38 mm -2.43 m 0 eV 0 eV 9.16 mm 9.16 mm Target conv - -********************************************************************************************************* -* G4Track Information: Particle = e+, Track ID = 58, Parent ID = 23 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 4.41 mm -7.38 mm -2.43 m 5.29 MeV 0 eV 0 fm 0 fm Target initStep - 1 4.73 mm -7.93 mm -2.43 m 3.34 MeV 1.33 MeV 861 um 861 um Target eBrem - 2 4.78 mm -8.12 mm -2.43 m 2.26 MeV 297 keV 250 um 1.11 mm Target eBrem - 3 4.89 mm -8.28 mm -2.43 m 0 eV 2.26 MeV 1.52 mm 2.63 mm Target eIoni - 4 4.89 mm -8.28 mm -2.43 m 0 eV 0 eV 0 fm 2.63 mm Target annihil - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 62, Parent ID = 58 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 4.89 mm -8.28 mm -2.43 m 511 keV 0 eV 0 fm 0 fm Target initStep - 1 2.58 mm -8.8 mm -2.43 m 202 keV 0 eV 8.11 mm 8.11 mm Target compt - 2 3.27 mm -8.92 mm -2.43 m 0 eV 88 keV 737 um 8.84 mm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 64, Parent ID = 62 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 3.27 mm -8.92 mm -2.43 m 114 keV 0 eV 0 fm 0 fm Target initStep - 1 3.27 mm -8.92 mm -2.43 m 0 eV 114 keV 34.1 um 34.1 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 63, Parent ID = 62 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 2.58 mm -8.8 mm -2.43 m 309 keV 0 eV 0 fm 0 fm Target initStep - 1 2.57 mm -8.8 mm -2.43 m 0 eV 309 keV 156 um 156 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 61, Parent ID = 58 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 4.89 mm -8.28 mm -2.43 m 511 keV 0 eV 0 fm 0 fm Target initStep - 1 7.77 mm -7.64 mm -2.42 m 0 eV 88 keV 1.01 cm 1.01 cm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 65, Parent ID = 61 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 7.77 mm -7.64 mm -2.42 m 423 keV 0 eV 0 fm 0 fm Target initStep - 1 7.77 mm -7.64 mm -2.42 m 0 eV 423 keV 242 um 242 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 60, Parent ID = 58 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 4.78 mm -8.12 mm -2.43 m 784 keV 0 eV 0 fm 0 fm Target initStep - 1 6.62 mm -1.41 cm -2.42 m 314 keV 0 eV 7.42 mm 7.42 mm Target compt - 2 3.71 mm -1.43 cm -2.42 m 0 eV 88 keV 3.18 mm 1.06 cm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 67, Parent ID = 60 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 3.71 mm -1.43 cm -2.42 m 226 keV 0 eV 0 fm 0 fm Target initStep - 1 3.71 mm -1.43 cm -2.42 m 0 eV 226 keV 99 um 99 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 66, Parent ID = 60 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 6.62 mm -1.41 cm -2.42 m 470 keV 0 eV 0 fm 0 fm Target initStep - 1 6.63 mm -1.42 cm -2.42 m 0 eV 470 keV 279 um 279 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 59, Parent ID = 58 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 4.73 mm -7.93 mm -2.43 m 617 keV 0 eV 0 fm 0 fm Target initStep - 1 1.66 cm -1.72 cm -2.42 m 607 keV 0 eV 1.75 cm 1.75 cm Target compt - 2 1.72 cm -1.79 cm -2.42 m 408 keV 0 eV 1.16 mm 1.86 cm Target compt - 3 1.72 cm -1.79 cm -2.42 m 0 eV 88 keV 33.2 um 1.87 cm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 70, Parent ID = 59 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.72 cm -1.79 cm -2.42 m 320 keV 0 eV 0 fm 0 fm Target initStep - 1 1.72 cm -1.79 cm -2.42 m 0 eV 320 keV 164 um 164 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 69, Parent ID = 59 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.72 cm -1.79 cm -2.42 m 199 keV 0 eV 0 fm 0 fm Target initStep - 1 1.72 cm -1.79 cm -2.42 m 0 eV 199 keV 81.2 um 81.2 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 68, Parent ID = 59 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.66 cm -1.72 cm -2.42 m 10.2 keV 0 eV 0 fm 0 fm Target initStep - 1 1.66 cm -1.72 cm -2.42 m 0 eV 10.2 keV 716 nm 716 nm Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 57, Parent ID = 23 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 4.41 mm -7.38 mm -2.43 m 4.06 MeV 0 eV 0 fm 0 fm Target initStep - 1 5.04 mm -7.41 mm -2.43 m 2.55 MeV 1.51 MeV 1.23 mm 1.23 mm Target eBrem - 2 4.78 mm -7.22 mm -2.43 m 254 keV 1.1 MeV 1.14 mm 2.37 mm Target eBrem - 3 4.78 mm -7.22 mm -2.43 m 0 eV 254 keV 117 um 2.48 mm Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 71, Parent ID = 57 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 4.78 mm -7.22 mm -2.43 m 1.2 MeV 0 eV 0 fm 0 fm Target initStep - 1 1.19 cm -5.84 mm -2.41 m 781 keV 0 eV 1.54 cm 1.54 cm Target compt - 2 9.48 mm -3.15 mm -2.4 m 781 keV 0 eV 1.25 cm 2.79 cm Target Transportation - 3 -6.86 cm 8.34 cm -2.02 m 699 keV 0 eV 40.2 cm 43 cm Tracker compt - 4 -1.97 m 2.4 m 1.63 m 699 keV 0 eV 4.72 m 5.15 m Tracker Transportation - 5 -2.39 m 2.91 m 2.44 m 699 keV 0 eV 1.04 m 6.19 m OutOfWorld Transportation - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 73, Parent ID = 71 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -6.86 cm 8.34 cm -2.02 m 81.9 keV 0 eV 0 fm 0 fm Tracker initStep - 1 -6.67 cm 7.63 cm -2 m 72.6 keV 9.35 keV 1.91 cm 1.91 cm Tracker msc - 2 -6.25 cm 6.42 cm -1.99 m 62.2 keV 10.3 keV 1.72 cm 3.63 cm Tracker eIoni - 3 -5.52 cm 5.5 cm -1.99 m 55.8 keV 6.47 keV 1.34 cm 4.97 cm Tracker eIoni - 4 -4.92 cm 4.72 cm -1.99 m 49.9 keV 5.85 keV 1.13 cm 6.1 cm Tracker eIoni - 5 -4.11 cm 4.24 cm -1.99 m 40.9 keV 9.06 keV 9.51 mm 7.05 cm Tracker eIoni - 6 -3.71 cm 3.65 cm -1.99 m 36.6 keV 4.29 keV 7.11 mm 7.76 cm Tracker eIoni - 7 -3.47 cm 3.13 cm -1.99 m 29.6 keV 6.99 keV 6.12 mm 8.38 cm Tracker eIoni - 8 -3.35 cm 2.88 cm -1.99 m 25 keV 4.56 keV 4.65 mm 8.84 cm Tracker eIoni - 9 -3.14 cm 2.73 cm -1.99 m 18.1 keV 6.94 keV 3.81 mm 9.22 cm Tracker eIoni - 10 -3.05 cm 2.74 cm -1.99 m 9.66 keV 8.42 keV 2.76 mm 9.5 cm Tracker eIoni - 11 -2.96 cm 2.8 cm -1.98 m 4.03 keV 5.64 keV 1.65 mm 9.66 cm Tracker eIoni - 12 -2.96 cm 2.81 cm -1.98 m 0 eV 4.03 keV 478 um 9.71 cm Tracker eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 72, Parent ID = 71 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.19 cm -5.84 mm -2.41 m 415 keV 0 eV 0 fm 0 fm Target initStep - 1 1.19 cm -5.85 mm -2.41 m 0 eV 415 keV 236 um 236 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 22, Parent ID = 1 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 2.3 mm -2.58 mm -2.43 m 7.31 MeV 0 eV 0 fm 0 fm Target initStep - 1 2.31 mm -2.61 mm -2.43 m 1.7 MeV 0 eV 90.4 um 90.4 um Target compt - 2 2.17 cm -2.5 cm -2.42 m 1.7 MeV 0 eV 3.39 cm 3.4 cm Target Transportation - 3 4.23 cm -4.88 cm -2.4 m 1.7 MeV 0 eV 3.6 cm 6.99 cm World Transportation - 4 2.08 m -2.4 m -67.8 cm 1.7 MeV 0 eV 3.56 m 3.63 m Tracker Transportation - 5 2.52 m -2.91 m -30.4 cm 1.7 MeV 0 eV 77.1 cm 4.4 m OutOfWorld Transportation - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 74, Parent ID = 22 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 2.31 mm -2.61 mm -2.43 m 5.62 MeV 0 eV 0 fm 0 fm Target initStep - 1 2.31 mm -2.64 mm -2.43 m 4.75 MeV 122 keV 98.4 um 98.4 um Target eBrem - 2 2.64 mm -3.48 mm -2.43 m 2.28 MeV 2.46 MeV 2.13 mm 2.23 mm Target eIoni - 3 2.83 mm -3.63 mm -2.43 m 1.32 MeV 671 keV 619 um 2.85 mm Target eBrem - 4 2.9 mm -3.69 mm -2.43 m 0 eV 1.32 MeV 998 um 3.85 mm Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 76, Parent ID = 74 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 2.83 mm -3.63 mm -2.43 m 294 keV 0 eV 0 fm 0 fm Target initStep - 1 4.17 mm -3.9 mm -2.43 m 0 eV 88 keV 1.38 mm 1.38 mm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 77, Parent ID = 76 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 4.17 mm -3.9 mm -2.43 m 206 keV 0 eV 0 fm 0 fm Target initStep - 1 4.17 mm -3.9 mm -2.43 m 0 eV 206 keV 86 um 86 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 75, Parent ID = 74 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 2.31 mm -2.64 mm -2.43 m 747 keV 0 eV 0 fm 0 fm Target initStep - 1 5.34 mm -2.23 mm -2.43 m 0 eV 88 keV 6.86 mm 6.86 mm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 78, Parent ID = 75 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 5.34 mm -2.23 mm -2.43 m 659 keV 0 eV 0 fm 0 fm Target initStep - 1 5.36 mm -2.23 mm -2.43 m 0 eV 659 keV 436 um 436 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 21, Parent ID = 1 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.85 mm -2.09 mm -2.44 m 374 keV 0 eV 0 fm 0 fm Target initStep - 1 2.11 mm -2.43 mm -2.43 m 0 eV 88 keV 998 um 998 um Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 79, Parent ID = 21 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 2.11 mm -2.43 mm -2.43 m 286 keV 0 eV 0 fm 0 fm Target initStep - 1 2.11 mm -2.43 mm -2.43 m 0 eV 286 keV 140 um 140 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 20, Parent ID = 1 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.82 mm -2.03 mm -2.44 m 979 keV 0 eV 0 fm 0 fm Target initStep - 1 3.98 mm -5.25 mm -2.42 m 934 keV 0 eV 1.16 cm 1.16 cm Target compt - 2 6.06 mm -8.77 mm -2.42 m 264 keV 0 eV 7.66 mm 1.92 cm Target compt - 3 5.99 mm -9.26 mm -2.42 m 0 eV 88 keV 773 um 2 cm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 82, Parent ID = 20 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 5.99 mm -9.26 mm -2.42 m 176 keV 0 eV 0 fm 0 fm Target initStep - 1 5.99 mm -9.26 mm -2.42 m 0 eV 176 keV 67.5 um 67.5 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 81, Parent ID = 20 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 6.06 mm -8.77 mm -2.42 m 670 keV 0 eV 0 fm 0 fm Target initStep - 1 6.06 mm -8.78 mm -2.42 m 0 eV 670 keV 445 um 445 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 80, Parent ID = 20 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 3.98 mm -5.25 mm -2.42 m 44.3 keV 0 eV 0 fm 0 fm Target initStep - 1 3.98 mm -5.25 mm -2.42 m 0 eV 44.3 keV 7.39 um 7.39 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 19, Parent ID = 1 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.78 mm -1.99 mm -2.44 m 4.13 MeV 0 eV 0 fm 0 fm Target initStep - 1 8.51 mm -8.02 mm -2.41 m 4.06 MeV 0 eV 2.98 cm 2.98 cm Target compt - 2 9.76 mm -8.77 mm -2.4 m 0 eV 0 eV 4.45 mm 3.42 cm Target conv - -********************************************************************************************************* -* G4Track Information: Particle = e+, Track ID = 85, Parent ID = 19 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 9.76 mm -8.77 mm -2.4 m 763 keV 0 eV 0 fm 0 fm Target initStep - 1 9.8 mm -8.81 mm -2.4 m 0 eV 763 keV 528 um 528 um Target eIoni - 2 9.8 mm -8.81 mm -2.4 m 0 eV 0 eV 0 fm 528 um Target annihil - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 87, Parent ID = 85 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 9.8 mm -8.81 mm -2.4 m 511 keV 0 eV 0 fm 0 fm Target initStep - 1 6.72 mm -9.69 mm -2.41 m 0 eV 88 keV 6.12 mm 6.12 mm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 88, Parent ID = 87 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 6.72 mm -9.69 mm -2.41 m 423 keV 0 eV 0 fm 0 fm Target initStep - 1 6.72 mm -9.69 mm -2.41 m 0 eV 423 keV 242 um 242 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 86, Parent ID = 85 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 9.8 mm -8.81 mm -2.4 m 511 keV 0 eV 0 fm 0 fm Target initStep - 1 1.17 cm -8.26 mm -2.4 m 511 keV 0 eV 3.79 mm 3.79 mm Target Transportation - 2 1.52 m 42.6 cm 16 cm 385 keV 0 eV 3 m 3.01 m Tracker compt - 3 2.4 m 93.3 cm 37.5 cm 385 keV 0 eV 1.04 m 4.04 m Tracker Transportation - 4 2.91 m 1.23 m 50 cm 385 keV 0 eV 60.2 cm 4.65 m OutOfWorld Transportation - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 89, Parent ID = 86 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.52 m 42.6 cm 16 cm 126 keV 0 eV 0 fm 0 fm Tracker initStep - 1 1.5 m 41.4 cm 19 cm 111 keV 14.7 keV 4.22 cm 4.22 cm Tracker eIoni - 2 1.49 m 38.4 cm 19.7 cm 97.4 keV 13.5 keV 3.46 cm 7.67 cm Tracker eIoni - 3 1.48 m 36.5 cm 19.5 cm 78.1 keV 19.3 keV 2.77 cm 10.4 cm Tracker eIoni - 4 1.48 m 35.6 cm 17.8 cm 69.1 keV 9.05 keV 1.93 cm 12.4 cm Tracker eIoni - 5 1.48 m 34.4 cm 17 cm 60.4 keV 8.66 keV 1.59 cm 14 cm Tracker eIoni - 6 1.48 m 33.2 cm 16.8 cm 53.5 keV 6.92 keV 1.28 cm 15.2 cm Tracker eIoni - 7 1.48 m 32.4 cm 16.1 cm 47.7 keV 5.76 keV 1.06 cm 16.3 cm Tracker eIoni - 8 1.48 m 32.2 cm 15.7 cm 34.2 keV 4.82 keV 4.71 mm 16.8 cm Tracker eIoni - 9 1.48 m 31.9 cm 15.6 cm 28.4 keV 5.8 keV 5.59 mm 17.3 cm Tracker eIoni - 10 1.48 m 31.6 cm 15.3 cm 25 keV 3.33 keV 4.43 mm 17.8 cm Tracker eIoni - 11 1.48 m 31.5 cm 15 cm 16.7 keV 8.31 keV 3.81 mm 18.2 cm Tracker eIoni - 12 1.48 m 31.7 cm 14.8 cm 11.5 keV 5.25 keV 2.57 mm 18.4 cm Tracker eIoni - 13 1.48 m 31.6 cm 14.7 cm 6.88 keV 4.59 keV 1.9 mm 18.6 cm Tracker eIoni - 14 1.48 m 31.7 cm 14.7 cm 1.53 keV 5.35 keV 1.17 mm 18.7 cm Tracker eIoni - 15 1.48 m 31.7 cm 14.7 cm 0 eV 1.53 keV 105 um 18.7 cm Tracker eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 90, Parent ID = 89 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.48 m 32.2 cm 15.7 cm 8.74 keV 0 eV 0 fm 0 fm Tracker initStep - 1 1.48 m 32.2 cm 15.6 cm 3.76 keV 4.98 keV 1.52 mm 1.52 mm Tracker eIoni - 2 1.48 m 32.2 cm 15.6 cm 0 eV 3.76 keV 429 um 1.94 mm Tracker eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 84, Parent ID = 19 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 9.76 mm -8.77 mm -2.4 m 2.28 MeV 0 eV 0 fm 0 fm Target initStep - 1 1 cm -8.96 mm -2.4 m 561 keV 811 keV 748 um 748 um Target eBrem - 2 1 cm -8.95 mm -2.4 m 0 eV 561 keV 354 um 1.1 mm Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 91, Parent ID = 84 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1 cm -8.96 mm -2.4 m 905 keV 0 eV 0 fm 0 fm Target initStep - 1 1.5 cm -6.97 mm -2.4 m 233 keV 0 eV 5.43 mm 5.43 mm Target compt - 2 1.48 cm -7.48 mm -2.4 m 0 eV 88 keV 548 um 5.97 mm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 93, Parent ID = 91 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.48 cm -7.48 mm -2.4 m 145 keV 0 eV 0 fm 0 fm Target initStep - 1 1.48 cm -7.48 mm -2.4 m 0 eV 145 keV 50.2 um 50.2 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 92, Parent ID = 91 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.5 cm -6.97 mm -2.4 m 672 keV 0 eV 0 fm 0 fm Target initStep - 1 1.5 cm -6.96 mm -2.4 m 0 eV 672 keV 447 um 447 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 83, Parent ID = 19 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 8.51 mm -8.02 mm -2.41 m 68.5 keV 0 eV 0 fm 0 fm Target initStep - 1 8.51 mm -8.02 mm -2.41 m 0 eV 68.5 keV 15 um 15 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 18, Parent ID = 1 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.35 mm -1.8 mm -2.44 m 8.31 MeV 0 eV 0 fm 0 fm Target initStep - 1 1.51 mm -1.88 mm -2.44 m 0 eV 0 eV 532 um 532 um Target conv - -********************************************************************************************************* -* G4Track Information: Particle = e+, Track ID = 95, Parent ID = 18 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.51 mm -1.88 mm -2.44 m 5.31 MeV 0 eV 0 fm 0 fm Target initStep - 1 1.64 mm -1.83 mm -2.44 m 4.22 MeV 500 keV 483 um 483 um Target eBrem - 2 1.66 mm -1.85 mm -2.44 m 3.37 MeV 72.8 keV 58.3 um 541 um Target eBrem - 3 1.69 mm -2.1 mm -2.44 m 1.91 MeV 389 keV 376 um 917 um Target eBrem - 4 1.61 mm -2.21 mm -2.44 m 545 keV 1.37 MeV 1.38 mm 2.29 mm Target eIoni - 5 1.61 mm -2.21 mm -2.44 m 0 eV 545 keV 340 um 2.64 mm Target eIoni - 6 1.61 mm -2.21 mm -2.44 m 0 eV 0 eV 0 fm 2.64 mm Target annihil - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 100, Parent ID = 95 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.61 mm -2.21 mm -2.44 m 511 keV 0 eV 0 fm 0 fm Target initStep - 1 2.13 mm -1.88 mm -2.43 m 187 keV 0 eV 840 um 840 um Target compt - 2 2.12 mm -1.93 mm -2.43 m 0 eV 88 keV 54 um 894 um Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 102, Parent ID = 100 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 2.12 mm -1.93 mm -2.43 m 99.4 keV 0 eV 0 fm 0 fm Target initStep - 1 2.12 mm -1.93 mm -2.43 m 0 eV 99.4 keV 27.3 um 27.3 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 101, Parent ID = 100 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 2.13 mm -1.88 mm -2.43 m 324 keV 0 eV 0 fm 0 fm Target initStep - 1 2.13 mm -1.88 mm -2.43 m 0 eV 324 keV 166 um 166 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 99, Parent ID = 95 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.61 mm -2.21 mm -2.44 m 511 keV 0 eV 0 fm 0 fm Target initStep - 1 -1.78 mm -4.32 mm -2.44 m 0 eV 88 keV 5.38 mm 5.38 mm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 103, Parent ID = 99 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -1.78 mm -4.32 mm -2.44 m 423 keV 0 eV 0 fm 0 fm Target initStep - 1 -1.78 mm -4.32 mm -2.44 m 0 eV 423 keV 242 um 242 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 98, Parent ID = 95 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.69 mm -2.1 mm -2.44 m 1.07 MeV 0 eV 0 fm 0 fm Target initStep - 1 2.1 mm -2.88 mm -2.44 m 0 eV 88 keV 1.02 mm 1.02 mm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 104, Parent ID = 98 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 2.1 mm -2.88 mm -2.44 m 984 keV 0 eV 0 fm 0 fm Target initStep - 1 2.08 mm -2.89 mm -2.44 m 0 eV 984 keV 712 um 712 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 97, Parent ID = 95 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.66 mm -1.85 mm -2.44 m 775 keV 0 eV 0 fm 0 fm Target initStep - 1 1.03 cm -8.13 mm -2.43 m 433 keV 0 eV 1.48 cm 1.48 cm Target compt - 2 1.97 cm -9.98 mm -2.43 m 0 eV 88 keV 9.81 mm 2.46 cm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 106, Parent ID = 97 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.97 cm -9.98 mm -2.43 m 345 keV 0 eV 0 fm 0 fm Target initStep - 1 1.97 cm -9.99 mm -2.43 m 0 eV 345 keV 182 um 182 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 105, Parent ID = 97 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.03 cm -8.13 mm -2.43 m 342 keV 0 eV 0 fm 0 fm Target initStep - 1 1.03 cm -8.14 mm -2.43 m 0 eV 342 keV 180 um 180 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 96, Parent ID = 95 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.64 mm -1.83 mm -2.44 m 587 keV 0 eV 0 fm 0 fm Target initStep - 1 1.88 mm -1.86 mm -2.44 m 480 keV 0 eV 399 um 399 um Target compt - 2 3.11 mm -2.83 mm -2.43 m 0 eV 88 keV 1.74 mm 2.14 mm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 108, Parent ID = 96 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 3.11 mm -2.83 mm -2.43 m 392 keV 0 eV 0 fm 0 fm Target initStep - 1 3.11 mm -2.83 mm -2.43 m 0 eV 392 keV 218 um 218 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 107, Parent ID = 96 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.88 mm -1.86 mm -2.44 m 107 keV 0 eV 0 fm 0 fm Target initStep - 1 1.88 mm -1.86 mm -2.44 m 0 eV 107 keV 31.1 um 31.1 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 94, Parent ID = 18 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.51 mm -1.88 mm -2.44 m 1.98 MeV 0 eV 0 fm 0 fm Target initStep - 1 1.73 mm -1.63 mm -2.44 m 251 keV 1.73 MeV 1.4 mm 1.4 mm Target eIoni - 2 1.73 mm -1.63 mm -2.44 m 0 eV 251 keV 115 um 1.51 mm Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 17, Parent ID = 1 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.3 mm -1.77 mm -2.44 m 594 keV 0 eV 0 fm 0 fm Target initStep - 1 5.57 mm -3.73 mm -2.43 m 0 eV 88 keV 1.22 cm 1.22 cm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 109, Parent ID = 17 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 5.57 mm -3.73 mm -2.43 m 506 keV 0 eV 0 fm 0 fm Target initStep - 1 5.59 mm -3.73 mm -2.43 m 0 eV 506 keV 309 um 309 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 16, Parent ID = 1 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 963 um -1.09 mm -2.44 m 1.98 MeV 0 eV 0 fm 0 fm Target initStep - 1 1.83 mm -4.56 mm -2.42 m 1.56 MeV 0 eV 1.85 cm 1.85 cm Target compt - 2 -4.68 mm -9.85 mm -2.4 m 402 keV 0 eV 2.05 cm 3.9 cm Target compt - 3 -1.46 mm -1.38 cm -2.4 m 258 keV 0 eV 5.09 mm 4.41 cm Target compt - 4 -1.08 mm -1.41 cm -2.4 m 258 keV 0 eV 2.08 mm 4.62 cm Target Transportation - 5 14.8 cm -13.5 cm -1.6 m 258 keV 0 eV 82.3 cm 86.9 cm Tracker Transportation - 6 18.5 cm -16.5 cm -1.4 m 258 keV 0 eV 20.6 cm 1.07 m Chamber Transportation - 7 29.6 cm -25.5 cm -80 cm 258 keV 0 eV 61.7 cm 1.69 m Tracker Transportation - 8 33.4 cm -28.5 cm -60 cm 258 keV 0 eV 20.6 cm 1.9 m Chamber Transportation - 9 44.5 cm -37.5 cm 0 fm 258 keV 0 eV 61.7 cm 2.51 m Tracker Transportation - 10 48.2 cm -40.5 cm 20 cm 258 keV 0 eV 20.6 cm 2.72 m Chamber Transportation - 11 59.4 cm -49.6 cm 80 cm 258 keV 0 eV 61.7 cm 3.34 m Tracker Transportation - 12 63.1 cm -52.6 cm 1 m 258 keV 0 eV 20.6 cm 3.54 m Chamber Transportation - 13 74.3 cm -61.6 cm 1.6 m 258 keV 0 eV 61.7 cm 4.16 m Tracker Transportation - 14 78 cm -64.6 cm 1.8 m 258 keV 0 eV 20.6 cm 4.36 m Chamber Transportation - 15 89.1 cm -73.7 cm 2.4 m 258 keV 0 eV 61.7 cm 4.98 m Tracker Transportation - 16 98.6 cm -81.3 cm 2.91 m 258 keV 0 eV 52.4 cm 5.51 m OutOfWorld Transportation - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 112, Parent ID = 16 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -1.46 mm -1.38 cm -2.4 m 144 keV 0 eV 0 fm 0 fm Target initStep - 1 -1.46 mm -1.38 cm -2.4 m 0 eV 144 keV 49.5 um 49.5 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 111, Parent ID = 16 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -4.68 mm -9.85 mm -2.4 m 1.15 MeV 0 eV 0 fm 0 fm Target initStep - 1 -4.71 mm -9.86 mm -2.4 m 0 eV 1.15 MeV 856 um 856 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 110, Parent ID = 16 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.83 mm -4.56 mm -2.42 m 430 keV 0 eV 0 fm 0 fm Target initStep - 1 1.84 mm -4.56 mm -2.42 m 0 eV 430 keV 248 um 248 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 15, Parent ID = 1 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 887 um -954 um -2.44 m 38.4 MeV 0 eV 0 fm 0 fm Target initStep - 1 996 um -1.37 mm -2.44 m 0 eV 0 eV 2.41 mm 2.41 mm Target conv - -********************************************************************************************************* -* G4Track Information: Particle = e+, Track ID = 114, Parent ID = 15 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 996 um -1.37 mm -2.44 m 11.5 MeV 0 eV 0 fm 0 fm Target initStep - 1 893 um -1.43 mm -2.44 m 10.9 MeV 344 keV 378 um 378 um Target eBrem - 2 -765 um -1.25 mm -2.44 m 3.76 MeV 3.78 MeV 2.89 mm 3.27 mm Target eBrem - 3 -145 um -1.62 mm -2.44 m 0 eV 1.58 MeV 1.41 mm 4.68 mm Target annihil - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 118, Parent ID = 114 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -145 um -1.62 mm -2.44 m 1.02 MeV 0 eV 0 fm 0 fm Target initStep - 1 1.21 cm 6.42 mm -2.45 m 1.02 MeV 0 eV 2.01 cm 2.01 cm Target Transportation - 2 42.2 cm 27.5 cm -2.91 m 1.02 MeV 0 eV 67.2 cm 69.2 cm OutOfWorld Transportation - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 117, Parent ID = 114 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -145 um -1.62 mm -2.44 m 2.18 MeV 0 eV 0 fm 0 fm Target initStep - 1 566 um -690 um -2.44 m 958 keV 0 eV 1.35 mm 1.35 mm Target compt - 2 565 um -656 um -2.44 m 732 keV 0 eV 94.3 um 1.44 mm Target compt - 3 1.64 mm -491 um -2.43 m 257 keV 0 eV 2.26 mm 3.7 mm Target compt - 4 1.99 mm -405 um -2.43 m 0 eV 88 keV 507 um 4.21 mm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 122, Parent ID = 117 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.99 mm -405 um -2.43 m 169 keV 0 eV 0 fm 0 fm Target initStep - 1 1.99 mm -402 um -2.43 m 0 eV 169 keV 63.3 um 63.3 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 121, Parent ID = 117 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.64 mm -491 um -2.43 m 475 keV 0 eV 0 fm 0 fm Target initStep - 1 1.65 mm -491 um -2.43 m 0 eV 475 keV 284 um 284 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 120, Parent ID = 117 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 565 um -656 um -2.44 m 227 keV 0 eV 0 fm 0 fm Target initStep - 1 561 um -653 um -2.44 m 0 eV 227 keV 99.1 um 99.1 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 119, Parent ID = 117 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 566 um -690 um -2.44 m 1.22 MeV 0 eV 0 fm 0 fm Target initStep - 1 578 um -678 um -2.44 m 0 eV 1.22 MeV 917 um 917 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 116, Parent ID = 114 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -765 um -1.25 mm -2.44 m 3.33 MeV 0 eV 0 fm 0 fm Target initStep - 1 -8.66 mm -2.5 cm -2.41 m 3.33 MeV 0 eV 3.65 cm 3.65 cm Target Transportation - 2 -1.16 cm -3.38 cm -2.4 m 3.33 MeV 0 eV 1.35 cm 5 cm World Transportation - 3 -79.8 cm -2.4 m 24.2 cm 3.33 MeV 0 eV 3.63 m 3.68 m Tracker Transportation - 4 -96.8 cm -2.91 m 81.1 cm 3.33 MeV 0 eV 78.3 cm 4.47 m OutOfWorld Transportation - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 115, Parent ID = 114 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 893 um -1.43 mm -2.44 m 327 keV 0 eV 0 fm 0 fm Target initStep - 1 -139 um -2.17 mm -2.43 m 294 keV 0 eV 4.08 mm 4.08 mm Target compt - 2 -165 um -2.09 mm -2.43 m 0 eV 88 keV 201 um 4.28 mm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 124, Parent ID = 115 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -165 um -2.09 mm -2.43 m 206 keV 0 eV 0 fm 0 fm Target initStep - 1 -167 um -2.09 mm -2.43 m 0 eV 206 keV 85.8 um 85.8 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 123, Parent ID = 115 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -139 um -2.17 mm -2.43 m 32.7 keV 0 eV 0 fm 0 fm Target initStep - 1 -139 um -2.17 mm -2.43 m 0 eV 32.7 keV 4.5 um 4.5 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 113, Parent ID = 15 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 996 um -1.37 mm -2.44 m 25.9 MeV 0 eV 0 fm 0 fm Target initStep - 1 1.23 mm -1.73 mm -2.44 m 22.8 MeV 1.58 MeV 1.38 mm 1.38 mm Target eBrem - 2 1.37 mm -1.91 mm -2.44 m 20.3 MeV 1.3 MeV 990 um 2.37 mm Target eBrem - 3 1.37 mm -1.9 mm -2.44 m 7.32 MeV 37.8 keV 38.7 um 2.41 mm Target eBrem - 4 1.41 mm -1.88 mm -2.44 m 6.87 MeV 155 keV 122 um 2.53 mm Target eBrem - 5 1.41 mm -2.38 mm -2.43 m 3.48 MeV 2.98 MeV 2.41 mm 4.94 mm Target eBrem - 6 1.65 mm -2.5 mm -2.43 m 1.56 MeV 1.62 MeV 868 um 5.81 mm Target eBrem - 7 1.69 mm -2.44 mm -2.43 m 382 keV 1.18 MeV 1.18 mm 6.98 mm Target eIoni - 8 1.69 mm -2.44 mm -2.43 m 0 eV 382 keV 210 um 7.19 mm Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 130, Parent ID = 113 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.65 mm -2.5 mm -2.43 m 298 keV 0 eV 0 fm 0 fm Target initStep - 1 3.05 mm -4.99 mm -2.43 m 0 eV 88 keV 3.2 mm 3.2 mm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 131, Parent ID = 130 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 3.05 mm -4.99 mm -2.43 m 210 keV 0 eV 0 fm 0 fm Target initStep - 1 3.04 mm -4.99 mm -2.43 m 0 eV 210 keV 88.5 um 88.5 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 129, Parent ID = 113 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.41 mm -2.38 mm -2.43 m 402 keV 0 eV 0 fm 0 fm Target initStep - 1 1.8 mm -2.58 mm -2.43 m 0 eV 88 keV 444 um 444 um Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 132, Parent ID = 129 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.8 mm -2.58 mm -2.43 m 314 keV 0 eV 0 fm 0 fm Target initStep - 1 1.81 mm -2.59 mm -2.43 m 0 eV 314 keV 159 um 159 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 128, Parent ID = 113 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.41 mm -1.88 mm -2.44 m 294 keV 0 eV 0 fm 0 fm Target initStep - 1 1.4 mm -1.81 mm -2.43 m 0 eV 88 keV 164 um 164 um Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 133, Parent ID = 128 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.4 mm -1.81 mm -2.43 m 206 keV 0 eV 0 fm 0 fm Target initStep - 1 1.4 mm -1.81 mm -2.43 m 0 eV 206 keV 85.6 um 85.6 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 127, Parent ID = 113 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.37 mm -1.9 mm -2.44 m 12.9 MeV 0 eV 0 fm 0 fm Target initStep - 1 1.65 mm -1.04 mm -2.43 m 345 keV 0 eV 2.66 mm 2.66 mm Target compt - 2 1.64 mm -1.03 mm -2.43 m 0 eV 88 keV 7.81 um 2.67 mm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 135, Parent ID = 127 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.64 mm -1.03 mm -2.43 m 257 keV 0 eV 0 fm 0 fm Target initStep - 1 1.64 mm -1.03 mm -2.43 m 0 eV 257 keV 119 um 119 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 134, Parent ID = 127 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.65 mm -1.04 mm -2.43 m 12.6 MeV 0 eV 0 fm 0 fm Target initStep - 1 1.47 mm -1.07 mm -2.43 m 7.8 MeV 2.02 MeV 1.22 mm 1.22 mm Target eBrem - 2 1.47 mm -1.08 mm -2.43 m 5.76 MeV 65.4 keV 47.2 um 1.27 mm Target eBrem - 3 857 um -1.83 mm -2.43 m 2.87 MeV 1.98 MeV 1.98 mm 3.25 mm Target eBrem - 4 1.24 mm -1.81 mm -2.43 m 1.21 MeV 1.67 MeV 1.7 mm 4.96 mm Target eIoni - 5 1.27 mm -1.76 mm -2.43 m 0 eV 1.21 MeV 902 um 5.86 mm Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 138, Parent ID = 134 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 857 um -1.83 mm -2.43 m 903 keV 0 eV 0 fm 0 fm Target initStep - 1 3.4 mm -1.92 cm -2.44 m 0 eV 88 keV 1.83 cm 1.83 cm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 139, Parent ID = 138 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 3.4 mm -1.92 cm -2.44 m 815 keV 0 eV 0 fm 0 fm Target initStep - 1 3.4 mm -1.92 cm -2.44 m 0 eV 815 keV 568 um 568 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 137, Parent ID = 134 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.47 mm -1.08 mm -2.43 m 1.98 MeV 0 eV 0 fm 0 fm Target initStep - 1 1.52 mm -1.1 mm -2.43 m 695 keV 0 eV 502 um 502 um Target compt - 2 7.88 mm 4.78 mm -2.43 m 0 eV 88 keV 9.96 mm 1.05 cm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 141, Parent ID = 137 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 7.88 mm 4.78 mm -2.43 m 607 keV 0 eV 0 fm 0 fm Target initStep - 1 7.89 mm 4.81 mm -2.43 m 0 eV 607 keV 392 um 392 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 140, Parent ID = 137 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.52 mm -1.1 mm -2.43 m 1.28 MeV 0 eV 0 fm 0 fm Target initStep - 1 1.51 mm -1.13 mm -2.43 m 0 eV 1.28 MeV 968 um 968 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 136, Parent ID = 134 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.47 mm -1.07 mm -2.43 m 2.76 MeV 0 eV 0 fm 0 fm Target initStep - 1 1.7 mm -1.08 cm -2.4 m 2.76 MeV 0 eV 3.31 cm 3.31 cm Target Transportation - 2 1.33 cm -50.1 cm -80 cm 2.76 MeV 0 eV 1.67 m 1.71 m Tracker Transportation - 3 1.47 cm -56.3 cm -60 cm 2.76 MeV 0 eV 20.9 cm 1.92 m Chamber Transportation - 4 1.91 cm -74.6 cm 0 fm 2.76 MeV 0 eV 62.8 cm 2.54 m Tracker Transportation - 5 2.05 cm -80.8 cm 20 cm 2.76 MeV 0 eV 20.9 cm 2.75 m Chamber Transportation - 6 2.49 cm -99.2 cm 80 cm 2.76 MeV 0 eV 62.8 cm 3.38 m Tracker Transportation - 7 2.63 cm -1.05 m 1 m 2.76 MeV 0 eV 20.9 cm 3.59 m Chamber Transportation - 8 3.07 cm -1.24 m 1.6 m 2.76 MeV 0 eV 62.8 cm 4.22 m Tracker Transportation - 9 3.21 cm -1.3 m 1.8 m 2.76 MeV 0 eV 20.9 cm 4.43 m Chamber Transportation - 10 3.65 cm -1.48 m 2.4 m 2.76 MeV 0 eV 62.8 cm 5.05 m Tracker Transportation - 11 4.02 cm -1.64 m 2.91 m 2.76 MeV 0 eV 53.3 cm 5.59 m OutOfWorld Transportation - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 126, Parent ID = 113 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.37 mm -1.91 mm -2.44 m 1.18 MeV 0 eV 0 fm 0 fm Target initStep - 1 2.3 mm -780 um -2.43 m 0 eV 88 keV 4.45 mm 4.45 mm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 142, Parent ID = 126 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 2.3 mm -780 um -2.43 m 1.09 MeV 0 eV 0 fm 0 fm Target initStep - 1 2.47 mm -806 um -2.43 m 474 keV 614 keV 560 um 560 um Target eBrem - 2 2.47 mm -797 um -2.43 m 0 eV 474 keV 283 um 842 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 125, Parent ID = 113 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.23 mm -1.73 mm -2.44 m 1.54 MeV 0 eV 0 fm 0 fm Target initStep - 1 858 um -2.8 mm -2.43 m 1.06 MeV 0 eV 5.8 mm 5.8 mm Target compt - 2 -8.91 mm 2.3 mm -2.41 m 0 eV 88 keV 2.34 cm 2.92 cm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 144, Parent ID = 125 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -8.91 mm 2.3 mm -2.41 m 975 keV 0 eV 0 fm 0 fm Target initStep - 1 -8.92 mm 2.31 mm -2.41 m 0 eV 975 keV 704 um 704 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 143, Parent ID = 125 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 858 um -2.8 mm -2.43 m 473 keV 0 eV 0 fm 0 fm Target initStep - 1 863 um -2.81 mm -2.43 m 0 eV 473 keV 283 um 283 um Target eIoni + 1 -31.1 um 1.2 um -2.86 m 200 MeV 8.11 keV 4.79 cm 4.79 cm World eIoni + 2 -248 um 261 um -2.45 m 200 MeV 101 keV 41.2 cm 46 cm World Transportation + 3 -232 um 242 um -2.45 m 191 MeV 1.38 MeV 1.06 mm 46.1 cm Target eBrem + 4 -228 um 250 um -2.45 m 190 MeV 643 keV 504 um 46.2 cm Target eBrem + 5 -228 um 250 um -2.45 m 108 MeV 152 keV 115 um 46.2 cm Target eBrem + 6 -281 um 261 um -2.45 m 106 MeV 1.22 MeV 988 um 46.3 cm Target eBrem + 7 -314 um 167 um -2.45 m 97.2 MeV 1.38 MeV 1.01 mm 46.4 cm Target eBrem + 8 -314 um 158 um -2.45 m 28.5 MeV 101 keV 93.5 um 46.4 cm Target eBrem + 9 -336 um 131 um -2.45 m 22.5 MeV 207 keV 185 um 46.4 cm Target eBrem + 10 -379 um 110 um -2.45 m 21.8 MeV 230 keV 210 um 46.4 cm Target eBrem + 11 -402 um 95.2 um -2.45 m 18.7 MeV 97.4 keV 85.2 um 46.4 cm Target eBrem + 12 -1.05 mm 372 um -2.44 m 2.1 MeV 1.94 MeV 1.69 mm 46.6 cm Target eBrem + 13 -1.33 mm 295 um -2.44 m 1.51 MeV 593 keV 460 um 46.6 cm Target eBrem + 14 -1.28 mm 32.3 um -2.44 m 187 keV 1.32 MeV 1.16 mm 46.8 cm Target eIoni + 15 -1.27 mm 29.9 um -2.44 m 0 eV 187 keV 70.8 um 46.8 cm Target eIoni + 16 -1.27 mm 29.9 um -2.44 m 0 eV 0 eV 0 fm 46.8 cm Target annihil ********************************************************************************************************* * G4Track Information: Particle = gamma, Track ID = 14, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 669 um -751 um -2.44 m 3.09 MeV 0 eV 0 fm 0 fm Target initStep - 1 2.39 mm -1.44 mm -2.43 m 1.62 MeV 0 eV 1.04 cm 1.04 cm Target compt - 2 -1.11 mm 580 um -2.42 m 222 keV 0 eV 1.11 cm 2.14 cm Target compt - 3 -620 um -52.5 um -2.42 m 193 keV 0 eV 2.99 mm 2.44 cm Target compt - 4 -1.12 mm -293 um -2.42 m 165 keV 0 eV 803 um 2.52 cm Target compt - 5 -1.39 mm -255 um -2.42 m 114 keV 0 eV 265 um 2.55 cm Target compt - 6 -1.29 mm -602 um -2.42 m 0 eV 88 keV 367 um 2.58 cm Target phot + 0 -1.27 mm 29.9 um -2.44 m 511 keV 0 eV 0 fm 0 fm Target initStep + 1 -1.25 mm 43.5 um -2.44 m 0 eV 88 keV 27.5 um 27.5 um Target phot ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 150, Parent ID = 14 +* G4Track Information: Particle = e-, Track ID = 15, Parent ID = 14 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -1.29 mm -602 um -2.42 m 26.1 keV 0 eV 0 fm 0 fm Target initStep - 1 -1.29 mm -602 um -2.42 m 0 eV 26.1 keV 3.13 um 3.13 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 149, Parent ID = 14 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -1.39 mm -255 um -2.42 m 50.8 keV 0 eV 0 fm 0 fm Target initStep - 1 -1.39 mm -255 um -2.42 m 0 eV 50.8 keV 9.18 um 9.18 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 148, Parent ID = 14 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -1.12 mm -293 um -2.42 m 27.8 keV 0 eV 0 fm 0 fm Target initStep - 1 -1.12 mm -293 um -2.42 m 0 eV 27.8 keV 3.47 um 3.47 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 147, Parent ID = 14 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -620 um -52.5 um -2.42 m 29.2 keV 0 eV 0 fm 0 fm Target initStep - 1 -619 um -52.5 um -2.42 m 0 eV 29.2 keV 3.76 um 3.76 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 146, Parent ID = 14 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -1.11 mm 580 um -2.42 m 1.4 MeV 0 eV 0 fm 0 fm Target initStep - 1 -1.12 mm 582 um -2.42 m 0 eV 1.4 MeV 1.06 mm 1.06 mm Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 145, Parent ID = 14 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 2.39 mm -1.44 mm -2.43 m 1.46 MeV 0 eV 0 fm 0 fm Target initStep - 1 2.27 mm -1.51 mm -2.43 m 307 keV 595 keV 568 um 568 um Target eBrem - 2 2.27 mm -1.51 mm -2.43 m 0 eV 307 keV 155 um 722 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 151, Parent ID = 145 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 2.27 mm -1.51 mm -2.43 m 562 keV 0 eV 0 fm 0 fm Target initStep - 1 1.54 mm 2.98 mm -2.43 m 474 keV 0 eV 4.68 mm 4.68 mm Target compt - 2 2.17 mm 5.99 mm -2.43 m 0 eV 88 keV 3.15 mm 7.83 mm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 153, Parent ID = 151 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 2.17 mm 5.99 mm -2.43 m 386 keV 0 eV 0 fm 0 fm Target initStep - 1 2.18 mm 6 mm -2.43 m 0 eV 386 keV 214 um 214 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 152, Parent ID = 151 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.54 mm 2.98 mm -2.43 m 87.2 keV 0 eV 0 fm 0 fm Target initStep - 1 1.54 mm 2.98 mm -2.43 m 0 eV 87.2 keV 22.2 um 22.2 um Target eIoni + 0 -1.25 mm 43.5 um -2.44 m 423 keV 0 eV 0 fm 0 fm Target initStep + 1 -1.24 mm 53.6 um -2.44 m 0 eV 423 keV 242 um 242 um Target eIoni ********************************************************************************************************* * G4Track Information: Particle = gamma, Track ID = 13, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 530 um -684 um -2.44 m 1.42 MeV 0 eV 0 fm 0 fm Target initStep - 1 4.59 mm -2.97 mm -2.42 m 226 keV 0 eV 2.74 cm 2.74 cm Target compt - 2 4.06 mm -3.15 mm -2.42 m 0 eV 88 keV 1.11 mm 2.85 cm Target phot + 0 -1.27 mm 29.9 um -2.44 m 511 keV 0 eV 0 fm 0 fm Target initStep + 1 -9.23 mm -5.87 mm -2.44 m 322 keV 0 eV 1.2 cm 1.2 cm Target compt + 2 -9.26 mm -5.85 mm -2.44 m 0 eV 88 keV 34 um 1.2 cm Target phot ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 155, Parent ID = 13 +* G4Track Information: Particle = e-, Track ID = 17, Parent ID = 13 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 4.06 mm -3.15 mm -2.42 m 138 keV 0 eV 0 fm 0 fm Target initStep - 1 4.06 mm -3.15 mm -2.42 m 0 eV 138 keV 46 um 46 um Target eIoni + 0 -9.26 mm -5.85 mm -2.44 m 234 keV 0 eV 0 fm 0 fm Target initStep + 1 -9.26 mm -5.85 mm -2.44 m 0 eV 234 keV 104 um 104 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 154, Parent ID = 13 +* G4Track Information: Particle = e-, Track ID = 16, Parent ID = 13 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 4.59 mm -2.97 mm -2.42 m 1.19 MeV 0 eV 0 fm 0 fm Target initStep - 1 4.59 mm -2.97 mm -2.42 m 0 eV 1.19 MeV 891 um 891 um Target eIoni + 0 -9.23 mm -5.87 mm -2.44 m 189 keV 0 eV 0 fm 0 fm Target initStep + 1 -9.24 mm -5.87 mm -2.44 m 0 eV 189 keV 75.3 um 75.3 um Target eIoni ********************************************************************************************************* * G4Track Information: Particle = gamma, Track ID = 12, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 488 um -655 um -2.44 m 25.6 MeV 0 eV 0 fm 0 fm Target initStep - 1 2.74 mm -2.08 mm -2.42 m 0 eV 0 eV 1.86 cm 1.86 cm Target conv + 0 -1.05 mm 372 um -2.44 m 14.6 MeV 0 eV 0 fm 0 fm Target initStep + 1 -2.56 mm 1.74 mm -2.44 m 0 eV 0 eV 6.37 mm 6.37 mm Target conv ********************************************************************************************************* -* G4Track Information: Particle = e+, Track ID = 157, Parent ID = 12 +* G4Track Information: Particle = e+, Track ID = 19, Parent ID = 12 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 2.74 mm -2.08 mm -2.42 m 12.1 MeV 0 eV 0 fm 0 fm Target initStep - 1 3.22 mm -2.24 mm -2.42 m 4.95 MeV 1.15 MeV 1.06 mm 1.06 mm Target eBrem - 2 3.5 mm -2.17 mm -2.42 m 3.85 MeV 315 keV 325 um 1.39 mm Target eBrem - 3 4.14 mm -1.8 mm -2.42 m 1.8 MeV 2.04 MeV 1.96 mm 3.34 mm Target eIoni - 4 4.29 mm -1.77 mm -2.42 m 0 eV 1.8 MeV 1.33 mm 4.67 mm Target eIoni - 5 4.29 mm -1.77 mm -2.42 m 0 eV 0 eV 0 fm 4.67 mm Target annihil + 0 -2.56 mm 1.74 mm -2.44 m 8.18 MeV 0 eV 0 fm 0 fm Target initStep + 1 -3.32 mm 2.19 mm -2.44 m 4.12 MeV 1.06 MeV 1.05 mm 1.05 mm Target eBrem + 2 -3.45 mm 1.79 mm -2.44 m 3.16 MeV 492 keV 536 um 1.59 mm Target eBrem + 3 -3.47 mm 1.77 mm -2.44 m 1.82 MeV 33.9 keV 38.6 um 1.63 mm Target eBrem + 4 -3.81 mm 1.57 mm -2.44 m 526 keV 1.29 MeV 1.33 mm 2.96 mm Target eIoni + 5 -3.83 mm 1.6 mm -2.44 m 0 eV 526 keV 325 um 3.29 mm Target eIoni + 6 -3.83 mm 1.6 mm -2.44 m 0 eV 0 eV 0 fm 3.29 mm Target annihil ********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 161, Parent ID = 157 +* G4Track Information: Particle = gamma, Track ID = 24, Parent ID = 19 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 4.29 mm -1.77 mm -2.42 m 511 keV 0 eV 0 fm 0 fm Target initStep - 1 5.06 mm 6.38 mm -2.43 m 0 eV 88 keV 8.94 mm 8.94 mm Target phot + 0 -3.83 mm 1.6 mm -2.44 m 511 keV 0 eV 0 fm 0 fm Target initStep + 1 1.36 mm 6.19 mm -2.44 m 479 keV 0 eV 8.07 mm 8.07 mm Target compt + 2 1.52 mm 6.24 mm -2.44 m 0 eV 88 keV 217 um 8.29 mm Target phot ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 162, Parent ID = 161 +* G4Track Information: Particle = e-, Track ID = 26, Parent ID = 24 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 5.06 mm 6.38 mm -2.43 m 423 keV 0 eV 0 fm 0 fm Target initStep - 1 5.06 mm 6.39 mm -2.43 m 0 eV 423 keV 242 um 242 um Target eIoni + 0 1.52 mm 6.24 mm -2.44 m 391 keV 0 eV 0 fm 0 fm Target initStep + 1 1.53 mm 6.25 mm -2.44 m 0 eV 391 keV 217 um 217 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 160, Parent ID = 157 +* G4Track Information: Particle = e-, Track ID = 25, Parent ID = 24 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 4.29 mm -1.77 mm -2.42 m 511 keV 0 eV 0 fm 0 fm Target initStep - 1 4.16 mm -3.18 mm -2.42 m 422 keV 0 eV 1.54 mm 1.54 mm Target compt - 2 5.15 mm -6.7 mm -2.42 m 0 eV 88 keV 7.05 mm 8.59 mm Target phot + 0 1.36 mm 6.19 mm -2.44 m 32.1 keV 0 eV 0 fm 0 fm Target initStep + 1 1.36 mm 6.19 mm -2.44 m 0 eV 32.1 keV 4.35 um 4.35 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 164, Parent ID = 160 +* G4Track Information: Particle = gamma, Track ID = 23, Parent ID = 19 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 5.15 mm -6.7 mm -2.42 m 334 keV 0 eV 0 fm 0 fm Target initStep - 1 5.15 mm -6.71 mm -2.42 m 0 eV 334 keV 174 um 174 um Target eIoni + 0 -3.83 mm 1.6 mm -2.44 m 511 keV 0 eV 0 fm 0 fm Target initStep + 1 -6 mm -323 um -2.44 m 0 eV 88 keV 3.38 mm 3.38 mm Target phot ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 163, Parent ID = 160 +* G4Track Information: Particle = e-, Track ID = 27, Parent ID = 23 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 4.16 mm -3.18 mm -2.42 m 89.4 keV 0 eV 0 fm 0 fm Target initStep - 1 4.16 mm -3.18 mm -2.42 m 0 eV 89.4 keV 23.2 um 23.2 um Target eIoni + 0 -6 mm -323 um -2.44 m 423 keV 0 eV 0 fm 0 fm Target initStep + 1 -6.02 mm -325 um -2.44 m 0 eV 423 keV 242 um 242 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 159, Parent ID = 157 +* G4Track Information: Particle = gamma, Track ID = 22, Parent ID = 19 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 3.5 mm -2.17 mm -2.42 m 787 keV 0 eV 0 fm 0 fm Target initStep - 1 5.8 mm 847 um -2.43 m 0 eV 88 keV 4.08 mm 4.08 mm Target phot + 0 -3.47 mm 1.77 mm -2.44 m 1.31 MeV 0 eV 0 fm 0 fm Target initStep + 1 -6.31 mm -1.77 cm -2.45 m 0 eV 88 keV 2.08 cm 2.08 cm Target phot ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 165, Parent ID = 159 +* G4Track Information: Particle = e-, Track ID = 28, Parent ID = 22 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 5.8 mm 847 um -2.43 m 699 keV 0 eV 0 fm 0 fm Target initStep - 1 5.81 mm 860 um -2.43 m 0 eV 699 keV 469 um 469 um Target eIoni + 0 -6.31 mm -1.77 cm -2.45 m 1.22 MeV 0 eV 0 fm 0 fm Target initStep + 1 -6.32 mm -1.77 cm -2.45 m 0 eV 1.22 MeV 913 um 913 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 158, Parent ID = 157 +* G4Track Information: Particle = gamma, Track ID = 21, Parent ID = 19 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 3.22 mm -2.24 mm -2.42 m 6.01 MeV 0 eV 0 fm 0 fm Target initStep - 1 7.64 mm 153 um -2.42 m 976 keV 0 eV 6.08 mm 6.08 mm Target compt - 2 6.38 mm 1.07 cm -2.41 m 0 eV 88 keV 1.27 cm 1.87 cm Target phot + 0 -3.45 mm 1.79 mm -2.44 m 470 keV 0 eV 0 fm 0 fm Target initStep + 1 -3.69 mm 1.46 mm -2.44 m 0 eV 88 keV 467 um 467 um Target phot ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 167, Parent ID = 158 +* G4Track Information: Particle = e-, Track ID = 29, Parent ID = 21 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 6.38 mm 1.07 cm -2.41 m 888 keV 0 eV 0 fm 0 fm Target initStep - 1 6.29 mm 1.07 cm -2.41 m 62.3 keV 508 keV 399 um 399 um Target eBrem - 2 6.29 mm 1.07 cm -2.41 m 0 eV 62.3 keV 12.8 um 411 um Target eIoni + 0 -3.69 mm 1.46 mm -2.44 m 382 keV 0 eV 0 fm 0 fm Target initStep + 1 -3.69 mm 1.45 mm -2.44 m 0 eV 382 keV 210 um 210 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 168, Parent ID = 167 +* G4Track Information: Particle = gamma, Track ID = 20, Parent ID = 19 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 6.29 mm 1.07 cm -2.41 m 317 keV 0 eV 0 fm 0 fm Target initStep - 1 6.47 mm 1.08 cm -2.41 m 0 eV 88 keV 5.2 mm 5.2 mm Target phot + 0 -3.32 mm 2.19 mm -2.44 m 3 MeV 0 eV 0 fm 0 fm Target initStep + 1 -1.3 cm -8.2 mm -2.45 m 2.85 MeV 0 eV 1.79 cm 1.79 cm Target compt + 2 -1.41 cm -9.09 mm -2.45 m 2.85 MeV 0 eV 1.89 mm 1.98 cm Target Transportation + 3 -44.4 cm -34.3 cm -2.91 m 2.85 MeV 0 eV 71.3 cm 73.2 cm OutOfWorld Transportation ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 169, Parent ID = 168 +* G4Track Information: Particle = e-, Track ID = 30, Parent ID = 20 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 6.47 mm 1.08 cm -2.41 m 229 keV 0 eV 0 fm 0 fm Target initStep - 1 6.47 mm 1.08 cm -2.41 m 0 eV 229 keV 101 um 101 um Target eIoni + 0 -1.3 cm -8.2 mm -2.45 m 148 keV 0 eV 0 fm 0 fm Target initStep + 1 -1.3 cm -8.21 mm -2.45 m 0 eV 148 keV 51.8 um 51.8 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 166, Parent ID = 158 +* G4Track Information: Particle = e-, Track ID = 18, Parent ID = 12 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 7.64 mm 153 um -2.42 m 5.04 MeV 0 eV 0 fm 0 fm Target initStep - 1 8.67 mm 90.4 um -2.42 m 2.13 MeV 1.27 MeV 1.24 mm 1.24 mm Target eBrem - 2 9.03 mm 31.2 um -2.42 m 1.12 MeV 713 keV 764 um 2 mm Target eBrem - 3 9.02 mm 7.93 um -2.42 m 0 eV 1.12 MeV 832 um 2.84 mm Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 171, Parent ID = 166 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 9.03 mm 31.2 um -2.42 m 293 keV 0 eV 0 fm 0 fm Target initStep - 1 1.06 cm -2.63 mm -2.42 m 206 keV 0 eV 3.11 mm 3.11 mm Target compt - 2 1.14 cm -2.42 mm -2.42 m 0 eV 88 keV 1.09 mm 4.2 mm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 173, Parent ID = 171 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.14 cm -2.42 mm -2.42 m 118 keV 0 eV 0 fm 0 fm Target initStep - 1 1.14 cm -2.42 mm -2.42 m 0 eV 118 keV 35.9 um 35.9 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 172, Parent ID = 171 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.06 cm -2.63 mm -2.42 m 87.3 keV 0 eV 0 fm 0 fm Target initStep - 1 1.06 cm -2.63 mm -2.42 m 0 eV 87.3 keV 22.3 um 22.3 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 170, Parent ID = 166 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 8.67 mm 90.4 um -2.42 m 1.64 MeV 0 eV 0 fm 0 fm Target initStep - 1 1.21 cm 5.03 mm -2.43 m 790 keV 0 eV 8.92 mm 8.92 mm Target compt - 2 1.2 cm 4.96 mm -2.43 m 198 keV 0 eV 912 um 9.83 mm Target compt - 3 1.19 cm 5.03 mm -2.43 m 0 eV 88 keV 377 um 1.02 cm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 176, Parent ID = 170 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.19 cm 5.03 mm -2.43 m 110 keV 0 eV 0 fm 0 fm Target initStep - 1 1.19 cm 5.03 mm -2.43 m 0 eV 110 keV 32.5 um 32.5 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 175, Parent ID = 170 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.2 cm 4.96 mm -2.43 m 591 keV 0 eV 0 fm 0 fm Target initStep - 1 1.2 cm 4.96 mm -2.43 m 0 eV 591 keV 379 um 379 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 174, Parent ID = 170 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.21 cm 5.03 mm -2.43 m 853 keV 0 eV 0 fm 0 fm Target initStep - 1 1.21 cm 5.06 mm -2.43 m 0 eV 853 keV 600 um 600 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 156, Parent ID = 12 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 2.74 mm -2.08 mm -2.42 m 12.4 MeV 0 eV 0 fm 0 fm Target initStep - 1 3.06 mm -1.82 mm -2.42 m 9.89 MeV 1.74 MeV 1.14 mm 1.14 mm Target eBrem - 2 3.29 mm -1.83 mm -2.42 m 9.49 MeV 398 keV 394 um 1.54 mm Target msc - 3 3.41 mm -1.98 mm -2.42 m 8.68 MeV 446 keV 410 um 1.95 mm Target eBrem - 4 3.55 mm -2.09 mm -2.42 m 7.81 MeV 194 keV 216 um 2.16 mm Target eBrem - 5 3.87 mm -2.85 mm -2.42 m 5.37 MeV 2.1 MeV 1.87 mm 4.04 mm Target eBrem - 6 4 mm -2.34 mm -2.42 m 3.11 MeV 1.25 MeV 1.15 mm 5.18 mm Target eBrem - 7 4.35 mm -1.88 mm -2.42 m 1.53 MeV 1.58 MeV 1.77 mm 6.95 mm Target eIoni - 8 4.34 mm -1.83 mm -2.42 m 985 keV 34.3 keV 44.7 um 7 mm Target eBrem - 9 4.34 mm -1.83 mm -2.42 m 0 eV 985 keV 713 um 7.71 mm Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 182, Parent ID = 156 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 4.34 mm -1.83 mm -2.42 m 514 keV 0 eV 0 fm 0 fm Target initStep - 1 4.25 mm -1.01 mm -2.42 m 445 keV 0 eV 853 um 853 um Target compt - 2 4.98 mm 823 um -2.42 m 0 eV 88 keV 1.97 mm 2.83 mm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 184, Parent ID = 182 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 4.98 mm 823 um -2.42 m 357 keV 0 eV 0 fm 0 fm Target initStep - 1 4.98 mm 837 um -2.42 m 0 eV 357 keV 192 um 192 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 183, Parent ID = 182 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 4.25 mm -1.01 mm -2.42 m 69.1 keV 0 eV 0 fm 0 fm Target initStep - 1 4.25 mm -1.01 mm -2.42 m 0 eV 69.1 keV 15.3 um 15.3 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 181, Parent ID = 156 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 4 mm -2.34 mm -2.42 m 1.01 MeV 0 eV 0 fm 0 fm Target initStep - 1 2.02 mm 3.69 mm -2.41 m 613 keV 0 eV 9.96 mm 9.96 mm Target compt - 2 4.82 mm 5.84 mm -2.41 m 0 eV 88 keV 4.72 mm 1.47 cm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 186, Parent ID = 181 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 4.82 mm 5.84 mm -2.41 m 525 keV 0 eV 0 fm 0 fm Target initStep - 1 4.82 mm 5.85 mm -2.41 m 0 eV 525 keV 324 um 324 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 185, Parent ID = 181 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 2.02 mm 3.69 mm -2.41 m 400 keV 0 eV 0 fm 0 fm Target initStep - 1 2.01 mm 3.7 mm -2.41 m 0 eV 400 keV 224 um 224 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 180, Parent ID = 156 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 3.87 mm -2.85 mm -2.42 m 344 keV 0 eV 0 fm 0 fm Target initStep - 1 2.94 mm -2.62 mm -2.42 m 0 eV 88 keV 2.49 mm 2.49 mm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 187, Parent ID = 180 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 2.94 mm -2.62 mm -2.42 m 256 keV 0 eV 0 fm 0 fm Target initStep - 1 2.94 mm -2.62 mm -2.42 m 0 eV 256 keV 119 um 119 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 179, Parent ID = 156 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 3.55 mm -2.09 mm -2.42 m 676 keV 0 eV 0 fm 0 fm Target initStep - 1 4.55 mm -5.37 mm -2.42 m 0 eV 88 keV 4.59 mm 4.59 mm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 188, Parent ID = 179 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 4.55 mm -5.37 mm -2.42 m 588 keV 0 eV 0 fm 0 fm Target initStep - 1 4.56 mm -5.39 mm -2.42 m 0 eV 588 keV 376 um 376 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 178, Parent ID = 156 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 3.41 mm -1.98 mm -2.42 m 359 keV 0 eV 0 fm 0 fm Target initStep - 1 7.38 mm -7.13 mm -2.42 m 0 eV 88 keV 7.87 mm 7.87 mm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 189, Parent ID = 178 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 7.38 mm -7.13 mm -2.42 m 271 keV 0 eV 0 fm 0 fm Target initStep - 1 7.39 mm -7.14 mm -2.42 m 0 eV 271 keV 129 um 129 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 177, Parent ID = 156 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 3.06 mm -1.82 mm -2.42 m 803 keV 0 eV 0 fm 0 fm Target initStep - 1 6.34 mm -918 um -2.42 m 0 eV 88 keV 8.73 mm 8.73 mm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 190, Parent ID = 177 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 6.34 mm -918 um -2.42 m 715 keV 0 eV 0 fm 0 fm Target initStep - 1 6.35 mm -926 um -2.42 m 0 eV 715 keV 483 um 483 um Target eIoni + 0 -2.56 mm 1.74 mm -2.44 m 5.44 MeV 0 eV 0 fm 0 fm Target initStep + 1 -1.4 mm 1.58 mm -2.44 m 1.79 MeV 3.66 MeV 2.26 mm 2.26 mm Target eIoni + 2 -1.54 mm 1.81 mm -2.44 m 418 keV 1.37 MeV 1.1 mm 3.36 mm Target eBrem + 3 -1.55 mm 1.81 mm -2.44 m 0 eV 418 keV 239 um 3.6 mm Target eIoni ********************************************************************************************************* * G4Track Information: Particle = gamma, Track ID = 11, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 437 um -588 um -2.44 m 1.31 MeV 0 eV 0 fm 0 fm Target initStep - 1 1.11 mm -1.31 mm -2.44 m 594 keV 0 eV 8.79 mm 8.79 mm Target compt - 2 7.89 mm 1.27 cm -2.42 m 497 keV 0 eV 1.88 cm 2.76 cm Target compt - 3 7.93 mm 1.27 cm -2.42 m 230 keV 0 eV 225 um 2.78 cm Target compt - 4 7.93 mm 1.27 cm -2.42 m 0 eV 88 keV 5.57 um 2.78 cm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 194, Parent ID = 11 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 7.93 mm 1.27 cm -2.42 m 142 keV 0 eV 0 fm 0 fm Target initStep - 1 7.93 mm 1.27 cm -2.42 m 0 eV 142 keV 48.4 um 48.4 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 193, Parent ID = 11 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 7.93 mm 1.27 cm -2.42 m 267 keV 0 eV 0 fm 0 fm Target initStep - 1 7.94 mm 1.27 cm -2.42 m 0 eV 267 keV 126 um 126 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 192, Parent ID = 11 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 7.89 mm 1.27 cm -2.42 m 96.8 keV 0 eV 0 fm 0 fm Target initStep - 1 7.89 mm 1.27 cm -2.42 m 0 eV 96.8 keV 26.2 um 26.2 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 191, Parent ID = 11 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.11 mm -1.31 mm -2.44 m 720 keV 0 eV 0 fm 0 fm Target initStep - 1 1.1 mm -1.32 mm -2.44 m 0 eV 720 keV 487 um 487 um Target eIoni + 0 -402 um 95.2 um -2.45 m 3.02 MeV 0 eV 0 fm 0 fm Target initStep + 1 -1.63 cm -8.69 mm -2.4 m 3.02 MeV 0 eV 4.92 cm 4.92 cm Target Transportation + 2 -57.2 cm -31.6 cm -80 cm 3.02 MeV 0 eV 1.72 m 1.77 m Tracker Transportation + 3 -64.1 cm -35.4 cm -60 cm 3.02 MeV 0 eV 21.5 cm 1.99 m Chamber Transportation + 4 -85 cm -46.9 cm 0 fm 3.02 MeV 0 eV 64.6 cm 2.63 m Tracker Transportation + 5 -91.9 cm -50.8 cm 20 cm 3.02 MeV 0 eV 21.5 cm 2.85 m Chamber Transportation + 6 -1.13 m -62.3 cm 80 cm 3.02 MeV 0 eV 64.6 cm 3.49 m Tracker Transportation + 7 -1.2 m -66.1 cm 1 m 3.02 MeV 0 eV 21.5 cm 3.71 m Chamber Transportation + 8 -1.41 m -77.6 cm 1.6 m 3.02 MeV 0 eV 64.6 cm 4.35 m Tracker Transportation + 9 -1.47 m -81.5 cm 1.8 m 3.02 MeV 0 eV 21.5 cm 4.57 m Chamber Transportation + 10 -1.68 m -93 cm 2.4 m 3.02 MeV 0 eV 64.6 cm 5.21 m Tracker Transportation + 11 -1.86 m -1.03 m 2.91 m 3.02 MeV 0 eV 54.9 cm 5.76 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = gamma, Track ID = 10, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 400 um -472 um -2.45 m 867 keV 0 eV 0 fm 0 fm Target initStep - 1 647 um -728 um -2.44 m 0 eV 88 keV 6.94 mm 6.94 mm Target phot + 0 -379 um 110 um -2.45 m 450 keV 0 eV 0 fm 0 fm Target initStep + 1 -1.16 mm -416 um -2.44 m 0 eV 88 keV 2.38 mm 2.38 mm Target phot ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 195, Parent ID = 10 +* G4Track Information: Particle = e-, Track ID = 31, Parent ID = 10 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 647 um -728 um -2.44 m 779 keV 0 eV 0 fm 0 fm Target initStep - 1 648 um -728 um -2.44 m 0 eV 779 keV 537 um 537 um Target eIoni + 0 -1.16 mm -416 um -2.44 m 362 keV 0 eV 0 fm 0 fm Target initStep + 1 -1.15 mm -420 um -2.44 m 0 eV 362 keV 196 um 196 um Target eIoni ********************************************************************************************************* * G4Track Information: Particle = gamma, Track ID = 9, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 399 um -455 um -2.45 m 309 keV 0 eV 0 fm 0 fm Target initStep - 1 378 um -510 um -2.44 m 0 eV 88 keV 1.84 mm 1.84 mm Target phot + 0 -336 um 131 um -2.45 m 5.82 MeV 0 eV 0 fm 0 fm Target initStep + 1 -3.25 mm -2.7 mm -2.42 m 0 eV 0 eV 2.76 cm 2.76 cm Target conv ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 196, Parent ID = 9 +* G4Track Information: Particle = e+, Track ID = 33, Parent ID = 9 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 378 um -510 um -2.44 m 221 keV 0 eV 0 fm 0 fm Target initStep - 1 378 um -510 um -2.44 m 0 eV 221 keV 95.7 um 95.7 um Target eIoni + 0 -3.25 mm -2.7 mm -2.42 m 2.77 MeV 0 eV 0 fm 0 fm Target initStep + 1 -2.91 mm -3.01 mm -2.42 m 1.45 MeV 880 keV 965 um 965 um Target eBrem + 2 -2.82 mm -2.98 mm -2.42 m 0 eV 1.45 MeV 1.11 mm 2.08 mm Target eIoni + 3 -2.82 mm -2.98 mm -2.42 m 0 eV 0 eV 0 fm 2.08 mm Target annihil + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 36, Parent ID = 33 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -2.82 mm -2.98 mm -2.42 m 511 keV 0 eV 0 fm 0 fm Target initStep + 1 -8.63 mm -4.53 mm -2.41 m 190 keV 0 eV 9.8 mm 9.8 mm Target compt + 2 -8.47 mm -4.48 mm -2.41 m 0 eV 88 keV 168 um 9.97 mm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 38, Parent ID = 36 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -8.47 mm -4.48 mm -2.41 m 102 keV 0 eV 0 fm 0 fm Target initStep + 1 -8.47 mm -4.48 mm -2.41 m 0 eV 102 keV 28.4 um 28.4 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 37, Parent ID = 36 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -8.63 mm -4.53 mm -2.41 m 321 keV 0 eV 0 fm 0 fm Target initStep + 1 -8.63 mm -4.53 mm -2.41 m 0 eV 321 keV 165 um 165 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 35, Parent ID = 33 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -2.82 mm -2.98 mm -2.42 m 511 keV 0 eV 0 fm 0 fm Target initStep + 1 985 um -1.97 mm -2.42 m 324 keV 0 eV 6.43 mm 6.43 mm Target compt + 2 2.68 mm -8.26 mm -2.43 m 0 eV 88 keV 7.71 mm 1.41 cm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 40, Parent ID = 35 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 2.68 mm -8.26 mm -2.43 m 236 keV 0 eV 0 fm 0 fm Target initStep + 1 2.69 mm -8.27 mm -2.43 m 0 eV 236 keV 105 um 105 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 39, Parent ID = 35 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 985 um -1.97 mm -2.42 m 187 keV 0 eV 0 fm 0 fm Target initStep + 1 987 um -1.96 mm -2.42 m 0 eV 187 keV 74.2 um 74.2 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 34, Parent ID = 33 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -2.91 mm -3.01 mm -2.42 m 446 keV 0 eV 0 fm 0 fm Target initStep + 1 -1.93 mm -2.08 mm -2.42 m 0 eV 88 keV 1.99 mm 1.99 mm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 41, Parent ID = 34 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -1.93 mm -2.08 mm -2.42 m 358 keV 0 eV 0 fm 0 fm Target initStep + 1 -1.92 mm -2.08 mm -2.42 m 0 eV 358 keV 192 um 192 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 32, Parent ID = 9 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -3.25 mm -2.7 mm -2.42 m 2.02 MeV 0 eV 0 fm 0 fm Target initStep + 1 -3.22 mm -3.04 mm -2.42 m 490 keV 1.53 MeV 1.41 mm 1.41 mm Target eIoni + 2 -3.2 mm -3.04 mm -2.42 m 0 eV 490 keV 295 um 1.71 mm Target eIoni ********************************************************************************************************* * G4Track Information: Particle = gamma, Track ID = 8, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 400 um -454 um -2.45 m 3.93 MeV 0 eV 0 fm 0 fm Target initStep - 1 620 um -727 um -2.41 m 0 eV 0 eV 3.58 cm 3.58 cm Target conv + 0 -314 um 158 um -2.45 m 68.6 MeV 0 eV 0 fm 0 fm Target initStep + 1 -1.78 mm -1.51 mm -2.43 m 0 eV 0 eV 1.54 cm 1.54 cm Target conv ********************************************************************************************************* -* G4Track Information: Particle = e+, Track ID = 198, Parent ID = 8 +* G4Track Information: Particle = e+, Track ID = 43, Parent ID = 8 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 620 um -727 um -2.41 m 2.65 MeV 0 eV 0 fm 0 fm Target initStep - 1 897 um -974 um -2.41 m 1.9 MeV 749 keV 754 um 754 um Target eBrem - 2 770 um -713 um -2.41 m 438 keV 1.46 MeV 1.37 mm 2.12 mm Target eIoni - 3 757 um -729 um -2.41 m 0 eV 438 keV 252 um 2.38 mm Target eIoni - 4 757 um -729 um -2.41 m 0 eV 0 eV 0 fm 2.38 mm Target annihil + 0 -1.78 mm -1.51 mm -2.43 m 22.7 MeV 0 eV 0 fm 0 fm Target initStep + 1 -1.78 mm -1.52 mm -2.43 m 22.2 MeV 106 keV 124 um 124 um Target eBrem + 2 -1.86 mm -1.53 mm -2.43 m 21.3 MeV 391 keV 382 um 506 um Target eBrem + 3 -1.98 mm -1.51 mm -2.43 m 20.4 MeV 444 keV 416 um 922 um Target eBrem + 4 -3.9 mm -2.09 mm -2.43 m 14.7 MeV 5.1 MeV 3.94 mm 4.86 mm Target eBrem + 5 -3.92 mm -2.24 mm -2.43 m 14 MeV 293 keV 180 um 5.04 mm Target eBrem + 6 -3.55 mm -2.97 mm -2.42 m 8.61 MeV 4.95 MeV 3.48 mm 8.52 mm Target eBrem + 7 -3.64 mm -3.05 mm -2.42 m 8.11 MeV 504 keV 291 um 8.81 mm Target eBrem + 8 -3.65 mm -3.06 mm -2.42 m 5.39 MeV 14.8 keV 20.2 um 8.83 mm Target eBrem + 9 -3.44 mm -4.48 mm -2.42 m 2.83 MeV 2.57 MeV 2.26 mm 1.11 cm Target eIoni + 10 -3.09 mm -4.44 mm -2.42 m 0 eV 2.83 MeV 1.7 mm 1.28 cm Target eIoni + 11 -3.09 mm -4.44 mm -2.42 m 0 eV 0 eV 0 fm 1.28 cm Target annihil ********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 200, Parent ID = 198 +* G4Track Information: Particle = gamma, Track ID = 52, Parent ID = 43 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 757 um -729 um -2.41 m 511 keV 0 eV 0 fm 0 fm Target initStep - 1 -585 um -1.84 mm -2.41 m 497 keV 0 eV 1.83 mm 1.83 mm Target compt - 2 -5.68 mm -8.72 mm -2.41 m 0 eV 88 keV 8.81 mm 1.06 cm Target phot + 0 -3.09 mm -4.44 mm -2.42 m 511 keV 0 eV 0 fm 0 fm Target initStep + 1 -5.34 mm 1.33 mm -2.42 m 0 eV 88 keV 8.54 mm 8.54 mm Target phot ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 202, Parent ID = 200 +* G4Track Information: Particle = e-, Track ID = 53, Parent ID = 52 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -5.68 mm -8.72 mm -2.41 m 409 keV 0 eV 0 fm 0 fm Target initStep - 1 -5.69 mm -8.72 mm -2.41 m 0 eV 409 keV 231 um 231 um Target eIoni + 0 -5.34 mm 1.33 mm -2.42 m 423 keV 0 eV 0 fm 0 fm Target initStep + 1 -5.33 mm 1.35 mm -2.42 m 0 eV 423 keV 242 um 242 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 201, Parent ID = 200 +* G4Track Information: Particle = gamma, Track ID = 51, Parent ID = 43 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -585 um -1.84 mm -2.41 m 14.1 keV 0 eV 0 fm 0 fm Target initStep - 1 -585 um -1.84 mm -2.41 m 0 eV 14.1 keV 1.18 um 1.18 um Target eIoni + 0 -3.09 mm -4.44 mm -2.42 m 511 keV 0 eV 0 fm 0 fm Target initStep + 1 -1.25 mm -9.19 mm -2.43 m 0 eV 88 keV 7.02 mm 7.02 mm Target phot ********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 199, Parent ID = 198 +* G4Track Information: Particle = e-, Track ID = 54, Parent ID = 51 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 757 um -729 um -2.41 m 511 keV 0 eV 0 fm 0 fm Target initStep - 1 8.25 mm 5.49 mm -2.41 m 0 eV 88 keV 1.02 cm 1.02 cm Target phot + 0 -1.25 mm -9.19 mm -2.43 m 423 keV 0 eV 0 fm 0 fm Target initStep + 1 -1.25 mm -9.2 mm -2.43 m 0 eV 423 keV 242 um 242 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 203, Parent ID = 199 +* G4Track Information: Particle = gamma, Track ID = 50, Parent ID = 43 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 8.25 mm 5.49 mm -2.41 m 423 keV 0 eV 0 fm 0 fm Target initStep - 1 8.25 mm 5.49 mm -2.41 m 0 eV 423 keV 242 um 242 um Target eIoni + 0 -3.65 mm -3.06 mm -2.42 m 2.7 MeV 0 eV 0 fm 0 fm Target initStep + 1 -3.72 mm -3.14 mm -2.42 m 1.47 MeV 0 eV 234 um 234 um Target compt + 2 -2.67 mm -3.23 mm -2.42 m 0 eV 88 keV 8.63 mm 8.86 mm Target phot ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 197, Parent ID = 8 +* G4Track Information: Particle = e-, Track ID = 56, Parent ID = 50 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 620 um -727 um -2.41 m 262 keV 0 eV 0 fm 0 fm Target initStep - 1 620 um -727 um -2.41 m 0 eV 262 keV 123 um 123 um Target eIoni + 0 -2.67 mm -3.23 mm -2.42 m 1.39 MeV 0 eV 0 fm 0 fm Target initStep + 1 -2.58 mm -3.1 mm -2.42 m 56.9 keV 1.33 MeV 1.05 mm 1.05 mm Target eIoni + 2 -2.58 mm -3.1 mm -2.42 m 0 eV 56.9 keV 11.1 um 1.06 mm Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 55, Parent ID = 50 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -3.72 mm -3.14 mm -2.42 m 1.23 MeV 0 eV 0 fm 0 fm Target initStep + 1 -3.67 mm -3.13 mm -2.42 m 427 keV 799 keV 730 um 730 um Target eBrem + 2 -3.68 mm -3.12 mm -2.42 m 0 eV 427 keV 245 um 976 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 49, Parent ID = 43 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -3.55 mm -2.97 mm -2.42 m 447 keV 0 eV 0 fm 0 fm Target initStep + 1 -6.21 mm -4.88 mm -2.41 m 0 eV 88 keV 1.47 cm 1.47 cm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 57, Parent ID = 49 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -6.21 mm -4.88 mm -2.41 m 359 keV 0 eV 0 fm 0 fm Target initStep + 1 -6.2 mm -4.88 mm -2.41 m 0 eV 359 keV 193 um 193 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 48, Parent ID = 43 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -3.92 mm -2.24 mm -2.43 m 436 keV 0 eV 0 fm 0 fm Target initStep + 1 -4.02 mm -4.69 mm -2.42 m 0 eV 88 keV 3.32 mm 3.32 mm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 58, Parent ID = 48 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -4.02 mm -4.69 mm -2.42 m 348 keV 0 eV 0 fm 0 fm Target initStep + 1 -4.03 mm -4.7 mm -2.42 m 0 eV 348 keV 185 um 185 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 47, Parent ID = 43 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -3.9 mm -2.09 mm -2.43 m 582 keV 0 eV 0 fm 0 fm Target initStep + 1 -3.91 mm -2.35 mm -2.43 m 198 keV 0 eV 341 um 341 um Target compt + 2 -4.27 mm -2.15 mm -2.43 m 0 eV 88 keV 681 um 1.02 mm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 60, Parent ID = 47 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -4.27 mm -2.15 mm -2.43 m 110 keV 0 eV 0 fm 0 fm Target initStep + 1 -4.27 mm -2.15 mm -2.43 m 0 eV 110 keV 32.1 um 32.1 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 59, Parent ID = 47 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -3.91 mm -2.35 mm -2.43 m 385 keV 0 eV 0 fm 0 fm Target initStep + 1 -3.91 mm -2.36 mm -2.43 m 0 eV 385 keV 213 um 213 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 46, Parent ID = 43 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -1.98 mm -1.51 mm -2.43 m 423 keV 0 eV 0 fm 0 fm Target initStep + 1 -2.18 mm -1.38 mm -2.43 m 0 eV 88 keV 1.2 mm 1.2 mm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 61, Parent ID = 46 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -2.18 mm -1.38 mm -2.43 m 335 keV 0 eV 0 fm 0 fm Target initStep + 1 -2.18 mm -1.38 mm -2.43 m 0 eV 335 keV 175 um 175 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 45, Parent ID = 43 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -1.86 mm -1.53 mm -2.43 m 487 keV 0 eV 0 fm 0 fm Target initStep + 1 -1.92 mm -1.56 mm -2.43 m 316 keV 0 eV 235 um 235 um Target compt + 2 -53.7 um -883 um -2.43 m 0 eV 88 keV 2.62 mm 2.85 mm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 63, Parent ID = 45 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -53.7 um -883 um -2.43 m 228 keV 0 eV 0 fm 0 fm Target initStep + 1 -52.6 um -878 um -2.43 m 0 eV 228 keV 99.8 um 99.8 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 62, Parent ID = 45 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -1.92 mm -1.56 mm -2.43 m 171 keV 0 eV 0 fm 0 fm Target initStep + 1 -1.92 mm -1.56 mm -2.43 m 0 eV 171 keV 64.6 um 64.6 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 44, Parent ID = 43 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -1.78 mm -1.52 mm -2.43 m 428 keV 0 eV 0 fm 0 fm Target initStep + 1 -1.91 mm -1.63 mm -2.43 m 362 keV 0 eV 708 um 708 um Target compt + 2 -5.63 mm -8.28 mm -2.42 m 0 eV 88 keV 9.82 mm 1.05 cm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 65, Parent ID = 44 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -5.63 mm -8.28 mm -2.42 m 274 keV 0 eV 0 fm 0 fm Target initStep + 1 -5.64 mm -8.28 mm -2.42 m 0 eV 274 keV 131 um 131 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 64, Parent ID = 44 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -1.91 mm -1.63 mm -2.43 m 65.6 keV 0 eV 0 fm 0 fm Target initStep + 1 -1.91 mm -1.63 mm -2.43 m 0 eV 65.6 keV 14 um 14 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 42, Parent ID = 8 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -1.78 mm -1.51 mm -2.43 m 44.9 MeV 0 eV 0 fm 0 fm Target initStep + 1 -1.83 mm -1.54 mm -2.43 m 43.9 MeV 397 keV 382 um 382 um Target eBrem + 2 -1.9 mm -1.39 mm -2.43 m 41.5 MeV 1.93 MeV 1.54 mm 1.93 mm Target eBrem + 3 -1.89 mm -1.42 mm -2.43 m 36.8 MeV 211 keV 233 um 2.16 mm Target eBrem + 4 -1.8 mm -1.47 mm -2.43 m 32.4 MeV 1.01 MeV 843 um 3 mm Target eBrem + 5 -1.83 mm -1.44 mm -2.43 m 21.6 MeV 89.9 keV 77.8 um 3.08 mm Target eBrem + 6 -1.84 mm -1.43 mm -2.43 m 21.1 MeV 39 keV 39.1 um 3.12 mm Target eBrem + 7 -1.89 mm -1.37 mm -2.43 m 10.9 MeV 435 keV 194 um 3.31 mm Target eBrem + 8 -1.96 mm -1.31 mm -2.43 m 9.88 MeV 581 keV 422 um 3.73 mm Target eBrem + 9 -848 um -1.67 mm -2.43 m 6.83 MeV 2.6 MeV 1.78 mm 5.51 mm Target eBrem + 10 -18.7 um -1.84 mm -2.43 m 5.2 MeV 1.1 MeV 1.03 mm 6.54 mm Target eBrem + 11 -333 um -1.66 mm -2.43 m 1.99 MeV 2.19 MeV 2.08 mm 8.62 mm Target eBrem + 12 -71.9 um -1.41 mm -2.43 m 534 keV 1.07 MeV 932 um 9.55 mm Target eBrem + 13 -57.8 um -1.41 mm -2.43 m 0 eV 534 keV 332 um 9.89 mm Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 77, Parent ID = 42 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -71.9 um -1.41 mm -2.43 m 390 keV 0 eV 0 fm 0 fm Target initStep + 1 2.92 mm -4.06 mm -2.43 m 269 keV 0 eV 7.63 mm 7.63 mm Target compt + 2 3.47 mm -4.76 mm -2.43 m 0 eV 88 keV 907 um 8.53 mm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 79, Parent ID = 77 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 3.47 mm -4.76 mm -2.43 m 181 keV 0 eV 0 fm 0 fm Target initStep + 1 3.48 mm -4.76 mm -2.43 m 0 eV 181 keV 70.3 um 70.3 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 78, Parent ID = 77 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 2.92 mm -4.06 mm -2.43 m 122 keV 0 eV 0 fm 0 fm Target initStep + 1 2.92 mm -4.06 mm -2.43 m 0 eV 122 keV 37.9 um 37.9 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 76, Parent ID = 42 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -333 um -1.66 mm -2.43 m 1.01 MeV 0 eV 0 fm 0 fm Target initStep + 1 -1.59 mm 5.21 mm -2.43 m 0 eV 88 keV 7.3 mm 7.3 mm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 80, Parent ID = 76 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -1.59 mm 5.21 mm -2.43 m 926 keV 0 eV 0 fm 0 fm Target initStep + 1 -1.59 mm 5.26 mm -2.43 m 0 eV 926 keV 663 um 663 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 75, Parent ID = 42 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -18.7 um -1.84 mm -2.43 m 531 keV 0 eV 0 fm 0 fm Target initStep + 1 2.29 mm -563 um -2.43 m 0 eV 88 keV 3.17 mm 3.17 mm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 81, Parent ID = 75 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 2.29 mm -563 um -2.43 m 443 keV 0 eV 0 fm 0 fm Target initStep + 1 2.29 mm -556 um -2.43 m 0 eV 443 keV 259 um 259 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 74, Parent ID = 42 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -848 um -1.67 mm -2.43 m 452 keV 0 eV 0 fm 0 fm Target initStep + 1 3.8 mm -1.33 mm -2.42 m 0 eV 88 keV 5.07 mm 5.07 mm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 82, Parent ID = 74 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 3.8 mm -1.33 mm -2.42 m 364 keV 0 eV 0 fm 0 fm Target initStep + 1 3.82 mm -1.33 mm -2.42 m 0 eV 364 keV 197 um 197 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 73, Parent ID = 42 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -1.96 mm -1.31 mm -2.43 m 438 keV 0 eV 0 fm 0 fm Target initStep + 1 -565 um -922 um -2.42 m 0 eV 88 keV 6.94 mm 6.94 mm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 83, Parent ID = 73 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -565 um -922 um -2.42 m 350 keV 0 eV 0 fm 0 fm Target initStep + 1 -570 um -922 um -2.42 m 0 eV 350 keV 186 um 186 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 72, Parent ID = 42 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -1.89 mm -1.37 mm -2.43 m 9.72 MeV 0 eV 0 fm 0 fm Target initStep + 1 -2.09 mm -977 um -2.43 m 3.86 MeV 0 eV 927 um 927 um Target compt + 2 -3.44 mm 654 um -2.43 m 2.64 MeV 0 eV 2.75 mm 3.68 mm Target compt + 3 -1.24 cm 1.23 cm -2.4 m 2.64 MeV 0 eV 2.91 cm 3.28 cm Target Transportation + 4 -1.15 m 1.49 m 80 cm 2.64 MeV 0 eV 3.7 m 3.74 m Tracker Transportation + 5 -1.18 m 1.54 m 89.6 cm 2.64 MeV 0 eV 11.1 cm 3.85 m Chamber Transportation + 6 -1.43 m 1.86 m 1.6 m 2.64 MeV 0 eV 81.4 cm 4.66 m Tracker Transportation + 7 -1.5 m 1.95 m 1.8 m 2.64 MeV 0 eV 23.1 cm 4.89 m Chamber Transportation + 8 -1.71 m 2.23 m 2.4 m 2.64 MeV 0 eV 69.4 cm 5.59 m Tracker Transportation + 9 -1.89 m 2.47 m 2.91 m 2.64 MeV 0 eV 59 cm 6.18 m OutOfWorld Transportation + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 85, Parent ID = 72 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -3.44 mm 654 um -2.43 m 1.21 MeV 0 eV 0 fm 0 fm Target initStep + 1 -3.49 mm 710 um -2.43 m 0 eV 1.21 MeV 907 um 907 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 84, Parent ID = 72 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -2.09 mm -977 um -2.43 m 5.87 MeV 0 eV 0 fm 0 fm Target initStep + 1 -1.61 mm -1.49 mm -2.43 m 3.11 MeV 2.01 MeV 1.8 mm 1.8 mm Target eBrem + 2 -1.39 mm -1.06 mm -2.43 m 1.84 MeV 875 keV 901 um 2.7 mm Target eBrem + 3 -1.62 mm -1.14 mm -2.43 m 129 keV 1.71 MeV 1.33 mm 4.03 mm Target eIoni + 4 -1.62 mm -1.15 mm -2.43 m 0 eV 129 keV 41.6 um 4.07 mm Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 87, Parent ID = 84 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -1.39 mm -1.06 mm -2.43 m 389 keV 0 eV 0 fm 0 fm Target initStep + 1 -3.03 mm -310 um -2.43 m 0 eV 88 keV 1.81 mm 1.81 mm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 88, Parent ID = 87 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -3.03 mm -310 um -2.43 m 301 keV 0 eV 0 fm 0 fm Target initStep + 1 -3.04 mm -310 um -2.43 m 0 eV 301 keV 150 um 150 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 86, Parent ID = 84 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -1.61 mm -1.49 mm -2.43 m 755 keV 0 eV 0 fm 0 fm Target initStep + 1 1.69 cm -772 um -2.42 m 0 eV 88 keV 1.88 cm 1.88 cm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 89, Parent ID = 86 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 1.69 cm -772 um -2.42 m 667 keV 0 eV 0 fm 0 fm Target initStep + 1 1.7 cm -782 um -2.42 m 33.3 keV 634 keV 322 um 322 um Target eBrem + 2 1.7 cm -782 um -2.42 m 0 eV 33.3 keV 4.63 um 327 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 71, Parent ID = 42 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -1.84 mm -1.43 mm -2.43 m 535 keV 0 eV 0 fm 0 fm Target initStep + 1 -3.64 mm 465 um -2.42 m 314 keV 0 eV 6.21 mm 6.21 mm Target compt + 2 -3.41 mm 546 um -2.42 m 0 eV 88 keV 291 um 6.5 mm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 91, Parent ID = 71 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -3.41 mm 546 um -2.42 m 226 keV 0 eV 0 fm 0 fm Target initStep + 1 -3.4 mm 549 um -2.42 m 0 eV 226 keV 98.7 um 98.7 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 90, Parent ID = 71 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -3.64 mm 465 um -2.42 m 221 keV 0 eV 0 fm 0 fm Target initStep + 1 -3.64 mm 466 um -2.42 m 0 eV 221 keV 95.7 um 95.7 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 70, Parent ID = 42 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -1.83 mm -1.44 mm -2.43 m 10.7 MeV 0 eV 0 fm 0 fm Target initStep + 1 -2.48 mm -816 um -2.43 m 0 eV 0 eV 1.91 mm 1.91 mm Target conv + +********************************************************************************************************* +* G4Track Information: Particle = e+, Track ID = 93, Parent ID = 70 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -2.48 mm -816 um -2.43 m 4.57 MeV 0 eV 0 fm 0 fm Target initStep + 1 -2.43 mm -488 um -2.43 m 2.64 MeV 729 keV 457 um 457 um Target eBrem + 2 -2.07 mm -128 um -2.43 m 0 eV 1.22 MeV 1.18 mm 1.64 mm Target annihil + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 96, Parent ID = 93 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -2.07 mm -128 um -2.43 m 1.94 MeV 0 eV 0 fm 0 fm Target initStep + 1 -3.59 mm 1.31 cm -2.43 m 0 eV 88 keV 1.34 cm 1.34 cm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 97, Parent ID = 96 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -3.59 mm 1.31 cm -2.43 m 1.86 MeV 0 eV 0 fm 0 fm Target initStep + 1 -3.9 mm 1.32 cm -2.43 m 450 keV 1.11 MeV 745 um 745 um Target eBrem + 2 -3.91 mm 1.32 cm -2.43 m 0 eV 450 keV 264 um 1.01 mm Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 98, Parent ID = 97 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -3.9 mm 1.32 cm -2.43 m 294 keV 0 eV 0 fm 0 fm Target initStep + 1 -3.33 mm 1.29 cm -2.42 m 0 eV 88 keV 3.68 mm 3.68 mm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 99, Parent ID = 98 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -3.33 mm 1.29 cm -2.42 m 206 keV 0 eV 0 fm 0 fm Target initStep + 1 -3.33 mm 1.29 cm -2.42 m 0 eV 206 keV 85.8 um 85.8 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 95, Parent ID = 93 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -2.07 mm -128 um -2.43 m 500 keV 0 eV 0 fm 0 fm Target initStep + 1 2.54 mm -1.07 mm -2.43 m 0 eV 88 keV 4.85 mm 4.85 mm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 100, Parent ID = 95 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 2.54 mm -1.07 mm -2.43 m 412 keV 0 eV 0 fm 0 fm Target initStep + 1 2.55 mm -1.07 mm -2.43 m 0 eV 412 keV 234 um 234 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 94, Parent ID = 93 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -2.43 mm -488 um -2.43 m 1.21 MeV 0 eV 0 fm 0 fm Target initStep + 1 -6.16 mm 1.41 cm -2.41 m 394 keV 0 eV 2 cm 2 cm Target compt + 2 -6.76 mm 1.39 cm -2.41 m 0 eV 88 keV 654 um 2.06 cm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 102, Parent ID = 94 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -6.76 mm 1.39 cm -2.41 m 306 keV 0 eV 0 fm 0 fm Target initStep + 1 -6.77 mm 1.39 cm -2.41 m 0 eV 306 keV 154 um 154 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 101, Parent ID = 94 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -6.16 mm 1.41 cm -2.41 m 812 keV 0 eV 0 fm 0 fm Target initStep + 1 -6.16 mm 1.41 cm -2.41 m 0 eV 812 keV 566 um 566 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 92, Parent ID = 70 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -2.48 mm -816 um -2.43 m 5.09 MeV 0 eV 0 fm 0 fm Target initStep + 1 -2.47 mm -1.06 mm -2.43 m 3.42 MeV 922 keV 651 um 651 um Target eBrem + 2 -2.5 mm -1.04 mm -2.43 m 2.31 MeV 51.4 keV 57.1 um 708 um Target eBrem + 3 -2.75 mm -719 um -2.43 m 955 keV 1.07 MeV 893 um 1.6 mm Target eBrem + 4 -2.79 mm -701 um -2.43 m 0 eV 955 keV 687 um 2.29 mm Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 105, Parent ID = 92 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -2.75 mm -719 um -2.43 m 283 keV 0 eV 0 fm 0 fm Target initStep + 1 -3.04 mm -707 um -2.43 m 0 eV 88 keV 392 um 392 um Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 106, Parent ID = 105 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -3.04 mm -707 um -2.43 m 195 keV 0 eV 0 fm 0 fm Target initStep + 1 -3.04 mm -705 um -2.43 m 0 eV 195 keV 79 um 79 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 104, Parent ID = 92 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -2.5 mm -1.04 mm -2.43 m 1.06 MeV 0 eV 0 fm 0 fm Target initStep + 1 -3.75 mm 1.36 mm -2.42 m 937 keV 0 eV 4.33 mm 4.33 mm Target compt + 2 -5.51 mm 2.45 mm -2.42 m 332 keV 0 eV 3.09 mm 7.42 mm Target compt + 3 -4.75 mm 1.54 mm -2.42 m 0 eV 88 keV 1.58 mm 9 mm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 109, Parent ID = 104 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -4.75 mm 1.54 mm -2.42 m 244 keV 0 eV 0 fm 0 fm Target initStep + 1 -4.75 mm 1.53 mm -2.42 m 0 eV 244 keV 110 um 110 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 108, Parent ID = 104 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -5.51 mm 2.45 mm -2.42 m 605 keV 0 eV 0 fm 0 fm Target initStep + 1 -5.53 mm 2.46 mm -2.42 m 0 eV 605 keV 391 um 391 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 107, Parent ID = 104 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -3.75 mm 1.36 mm -2.42 m 120 keV 0 eV 0 fm 0 fm Target initStep + 1 -3.74 mm 1.37 mm -2.42 m 0 eV 120 keV 37.2 um 37.2 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 103, Parent ID = 92 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -2.47 mm -1.06 mm -2.43 m 749 keV 0 eV 0 fm 0 fm Target initStep + 1 -3.02 mm 2.73 mm -2.42 m 0 eV 88 keV 6.42 mm 6.42 mm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 110, Parent ID = 103 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -3.02 mm 2.73 mm -2.42 m 661 keV 0 eV 0 fm 0 fm Target initStep + 1 -3.01 mm 2.76 mm -2.42 m 0 eV 661 keV 437 um 437 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 69, Parent ID = 42 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -1.8 mm -1.47 mm -2.43 m 3.34 MeV 0 eV 0 fm 0 fm Target initStep + 1 -7.12 mm 3.2 mm -2.41 m 546 keV 0 eV 1.64 cm 1.64 cm Target compt + 2 -8.4 mm 7.19 mm -2.41 m 0 eV 88 keV 4.24 mm 2.06 cm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 112, Parent ID = 69 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -8.4 mm 7.19 mm -2.41 m 458 keV 0 eV 0 fm 0 fm Target initStep + 1 -8.39 mm 7.2 mm -2.41 m 0 eV 458 keV 270 um 270 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 111, Parent ID = 69 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -7.12 mm 3.2 mm -2.41 m 2.8 MeV 0 eV 0 fm 0 fm Target initStep + 1 -7.28 mm 3.18 mm -2.41 m 2.54 MeV 260 keV 252 um 252 um Target eBrem + 2 -6.82 mm 3.36 mm -2.41 m 48.3 keV 2.49 MeV 1.48 mm 1.73 mm Target eBrem + 3 -6.82 mm 3.36 mm -2.41 m 0 eV 48.3 keV 8.49 um 1.74 mm Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 68, Parent ID = 42 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -1.89 mm -1.42 mm -2.43 m 4.54 MeV 0 eV 0 fm 0 fm Target initStep + 1 -1.59 mm -2.52 mm -2.42 m 297 keV 0 eV 6.92 mm 6.92 mm Target compt + 2 901 um -2.41 mm -2.42 m 0 eV 88 keV 3.25 mm 1.02 cm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 114, Parent ID = 68 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 901 um -2.41 mm -2.42 m 209 keV 0 eV 0 fm 0 fm Target initStep + 1 906 um -2.41 mm -2.42 m 0 eV 209 keV 87.8 um 87.8 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 113, Parent ID = 68 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -1.59 mm -2.52 mm -2.42 m 4.24 MeV 0 eV 0 fm 0 fm Target initStep + 1 -1.62 mm -3.4 mm -2.42 m 174 keV 4.07 MeV 2.03 mm 2.03 mm Target eIoni + 2 -1.61 mm -3.4 mm -2.42 m 0 eV 174 keV 66.3 um 2.09 mm Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 67, Parent ID = 42 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -1.9 mm -1.39 mm -2.43 m 426 keV 0 eV 0 fm 0 fm Target initStep + 1 -1.85 mm -1.45 mm -2.43 m 187 keV 0 eV 730 um 730 um Target compt + 2 -1.72 mm -1.59 mm -2.43 m 0 eV 88 keV 241 um 971 um Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 116, Parent ID = 67 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -1.72 mm -1.59 mm -2.43 m 98.9 keV 0 eV 0 fm 0 fm Target initStep + 1 -1.72 mm -1.59 mm -2.43 m 0 eV 98.9 keV 27.1 um 27.1 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 115, Parent ID = 67 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -1.85 mm -1.45 mm -2.43 m 239 keV 0 eV 0 fm 0 fm Target initStep + 1 -1.85 mm -1.45 mm -2.43 m 0 eV 239 keV 107 um 107 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 66, Parent ID = 42 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -1.83 mm -1.54 mm -2.43 m 649 keV 0 eV 0 fm 0 fm Target initStep + 1 -2.38 mm -2.51 mm -2.41 m 401 keV 0 eV 1.62 cm 1.62 cm Target compt + 2 -5.12 mm -339 um -2.41 m 0 eV 88 keV 4.1 mm 2.03 cm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 118, Parent ID = 66 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -5.12 mm -339 um -2.41 m 313 keV 0 eV 0 fm 0 fm Target initStep + 1 -5.12 mm -341 um -2.41 m 0 eV 313 keV 159 um 159 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 117, Parent ID = 66 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -2.38 mm -2.51 mm -2.41 m 247 keV 0 eV 0 fm 0 fm Target initStep + 1 -2.38 mm -2.51 mm -2.41 m 0 eV 247 keV 112 um 112 um Target eIoni ********************************************************************************************************* * G4Track Information: Particle = gamma, Track ID = 7, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 347 um -454 um -2.45 m 318 keV 0 eV 0 fm 0 fm Target initStep - 1 504 um -557 um -2.44 m 263 keV 0 eV 3.91 mm 3.91 mm Target compt - 2 -315 um 1.39 mm -2.44 m 218 keV 0 eV 2.95 mm 6.86 mm Target compt - 3 78.2 um 2.71 mm -2.44 m 0 eV 88 keV 1.38 mm 8.24 mm Target phot + 0 -314 um 167 um -2.45 m 7.57 MeV 0 eV 0 fm 0 fm Target initStep + 1 -177 um -4.78 mm -2.4 m 323 keV 0 eV 4.63 cm 4.63 cm Target compt + 2 -446 um -4.47 mm -2.4 m 0 eV 88 keV 457 um 4.68 cm Target phot ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 206, Parent ID = 7 +* G4Track Information: Particle = e-, Track ID = 120, Parent ID = 7 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 78.2 um 2.71 mm -2.44 m 130 keV 0 eV 0 fm 0 fm Target initStep - 1 77.3 um 2.71 mm -2.44 m 0 eV 130 keV 42.2 um 42.2 um Target eIoni + 0 -446 um -4.47 mm -2.4 m 235 keV 0 eV 0 fm 0 fm Target initStep + 1 -452 um -4.47 mm -2.4 m 0 eV 235 keV 105 um 105 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 205, Parent ID = 7 +* G4Track Information: Particle = e-, Track ID = 119, Parent ID = 7 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -315 um 1.39 mm -2.44 m 44.9 keV 0 eV 0 fm 0 fm Target initStep - 1 -315 um 1.39 mm -2.44 m 0 eV 44.9 keV 7.55 um 7.55 um Target eIoni + 0 -177 um -4.78 mm -2.4 m 7.25 MeV 0 eV 0 fm 0 fm Target initStep + 1 -175 um -4.81 mm -2.4 m 7.09 MeV 158 keV 95.6 um 95.6 um Target msc + 2 -141 um -4.85 mm -2.4 m 6.99 MeV 103 keV 95.6 um 191 um Target msc + 3 -125 um -4.88 mm -2.4 m 6.9 MeV 84.1 keV 95.6 um 287 um Target msc + 4 -127 um -4.9 mm -2.4 m 6.87 MeV 29.9 keV 38.4 um 325 um Target msc + 5 -127 um -4.9 mm -2.4 m 6.87 MeV 31.7 eV 285 nm 326 um Target msc + 6 -127 um -4.9 mm -2.4 m 6.87 MeV0.0517 eV 3.75e+04 fm 326 um Target Transportation + 7 -882 um -4.26 cm -2.31 m 6.69 MeV 18 keV 9.75 cm 9.79 cm Tracker eIoni + 8 -4.53 cm -26.3 cm -1.75 m 6.55 MeV 125 keV 60.3 cm 70.1 cm Tracker eIoni + 9 -10.8 cm -45.5 cm -1.15 m 6.44 MeV 111 keV 63.2 cm 1.33 m Tracker msc + 10 -11.8 cm -56.9 cm -80.1 cm 6.37 MeV 65.4 keV 37.1 cm 1.7 m Tracker msc + 11 -11.8 cm -56.9 cm -80 cm 6.37 MeV 53.7 eV 795 um 1.71 m Tracker Transportation + 12 -11.4 cm -58.2 cm -72.5 cm 6.34 MeV 35.1 keV 7.61 cm 1.78 m Chamber msc + 13 -12.1 cm -60 cm -65.2 cm 6.29 MeV 46 keV 7.61 cm 1.86 m Chamber msc + 14 -12.5 cm -61.6 cm -60 cm 6.21 MeV 82.1 keV 5.46 cm 1.91 m Chamber msc + 15 -12.5 cm -61.6 cm -60 cm 6.21 MeV 116 eV 460 um 1.91 m Chamber msc + 16 -12.5 cm -61.6 cm -60 cm 6.21 MeV0.0196 eV 34.8 nm 1.91 m Chamber Transportation + 17 -13.7 cm -64.5 cm -45.3 cm 6.18 MeV 29.8 keV 15 cm 2.06 m Tracker msc + 18 -14.4 cm -65.9 cm -37.8 cm 6.15 MeV 12.3 keV 7.6 cm 2.14 m Tracker eIoni + 19 -16 cm -69.2 cm -23.3 cm 6.12 MeV 34.2 keV 15 cm 2.29 m Tracker msc + 20 -17.1 cm -72.9 cm -8.73 cm 6.09 MeV 27.9 keV 15 cm 2.44 m Tracker msc + 21 -17.5 cm -74.5 cm -50.4 um 6.08 MeV 12.4 keV 8.89 cm 2.53 m Tracker msc + 22 -17.5 cm -74.5 cm 0.0062 fm 6.08 MeV 9.23 eV 51.4 um 2.53 m Tracker Transportation + 23 -18.9 cm -76.3 cm 9.58 cm 5.95 MeV 47.2 keV 9.91 cm 2.63 m Chamber eBrem + 24 -19.7 cm -78.5 cm 19.8 cm 5.88 MeV 73.6 keV 10.7 cm 2.73 m Chamber msc + 25 -19.7 cm -78.5 cm 20 cm 5.88 MeV 932 eV 2.01 mm 2.74 m Chamber msc + 26 -19.7 cm -78.5 cm 20 cm 5.88 MeV 0.297 eV 530 nm 2.74 m Chamber Transportation + 27 -17.7 cm -87.9 cm 41.7 cm 5.83 MeV 43.2 keV 23.7 cm 2.97 m Tracker msc + 28 -13.8 cm -97.8 cm 62.9 cm 5.79 MeV 47.8 keV 23.7 cm 3.21 m Tracker msc + 29 -11.3 cm -1.05 m 80 cm 5.76 MeV 27.9 keV 18.6 cm 3.4 m Tracker msc + 30 -11.3 cm -1.05 m 80 cm 5.76 MeV 0 eV 141 um 3.4 m Tracker Transportation + 31 -9.5 cm -1.08 m 88.6 cm 5.7 MeV 55.2 keV 9.51 cm 3.49 m Chamber msc + 32 -10.3 cm -1.11 m 97.4 cm 5.64 MeV 67 keV 9.51 cm 3.59 m Chamber msc + 33 -10.5 cm -1.13 m 100 cm 5.6 MeV 31.9 keV 3.36 cm 3.62 m Chamber msc + 34 -10.5 cm -1.13 m 100 cm 5.6 MeV 0 eV 111 um 3.62 m Chamber msc + 35 -10.5 cm -1.13 m 1 m 5.6 MeV0.000473 eV 8.48 Ang 3.62 m Chamber Transportation + 36 -10.5 cm -1.36 m 1.34 m 5.52 MeV 79.8 keV 40.6 cm 4.03 m Tracker msc + 37 -10.3 cm -1.54 m 1.6 m 5.47 MeV 54.5 keV 31.8 cm 4.35 m Tracker msc + 38 -10.3 cm -1.54 m 1.6 m 5.47 MeV 0 eV 498 um 4.35 m Tracker Transportation + 39 -10.4 cm -1.57 m 1.66 m 5.39 MeV 34.1 keV 6.21 cm 4.41 m Chamber eIoni + 40 -10.9 cm -1.62 m 1.74 m 5.34 MeV 48.5 keV 10.4 cm 4.51 m Chamber msc + 41 -9.83 cm -1.67 m 1.8 m 5.31 MeV 33.2 keV 7.77 cm 4.59 m Chamber msc + 42 -9.83 cm -1.67 m 1.8 m 5.31 MeV 14 eV 398 um 4.59 m Chamber msc + 43 -9.83 cm -1.67 m 1.8 m 5.31 MeV0.0252 eV 45.4 nm 4.59 m Chamber Transportation + 44 -8.62 cm -1.81 m 1.96 m 5.27 MeV 35.7 keV 20.7 cm 4.8 m Tracker msc + 45 -8.86 cm -1.94 m 2.11 m 5.24 MeV 30.8 keV 20.7 cm 5 m Tracker msc + 46 -10.2 cm -2.07 m 2.27 m 5.2 MeV 39.4 keV 20.7 cm 5.21 m Tracker msc + 47 -11.2 cm -2.2 m 2.4 m 5.16 MeV 40.3 keV 17.8 cm 5.39 m Tracker msc + 48 -11.2 cm -2.2 m 2.4 m 5.16 MeV 0 eV 81.6 um 5.39 m Tracker Transportation + 49 -11 cm -2.34 m 2.55 m 5.12 MeV 33 keV 20.8 cm 5.6 m World eIoni + 50 -9.39 cm -2.55 m 2.78 m 5.03 MeV 57.9 keV 31.9 cm 5.92 m World eIoni + 51 -10 cm -2.67 m 2.91 m 5 MeV 25.7 keV 17.1 cm 6.09 m OutOfWorld Transportation ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 204, Parent ID = 7 +* G4Track Information: Particle = e-, Track ID = 127, Parent ID = 119 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 504 um -557 um -2.44 m 54.2 keV 0 eV 0 fm 0 fm Target initStep - 1 504 um -557 um -2.44 m 0 eV 54.2 keV 10.3 um 10.3 um Target eIoni + 0 -9.39 cm -2.55 m 2.78 m 32 keV 0 eV 0 fm 0 fm World initStep + 1 -9.41 cm -2.55 m 2.79 m 25.8 keV 6.15 keV 2.24 mm 2.24 mm World msc + 2 -9.16 cm -2.55 m 2.79 m 22.2 keV 3.63 keV 3.95 mm 6.2 mm World eIoni + 3 -9.11 cm -2.55 m 2.79 m 17.2 keV 4.98 keV 3.37 mm 9.56 mm World eIoni + 4 -9.05 cm -2.55 m 2.79 m 12.8 keV 4.37 keV 2.64 mm 1.22 cm World eIoni + 5 -9.08 cm -2.55 m 2.79 m 2.86 keV 9.98 keV 2.07 mm 1.43 cm World eIoni + 6 -9.09 cm -2.55 m 2.79 m 0 eV 2.86 keV 275 um 1.45 cm World eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 126, Parent ID = 119 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -11 cm -2.34 m 2.55 m 9.59 keV 0 eV 0 fm 0 fm World initStep + 1 -11 cm -2.34 m 2.55 m 9.48 keV 110 eV 104 um 104 um World msc + 2 -10.9 cm -2.34 m 2.55 m 4.62 keV 4.86 keV 1.63 mm 1.73 mm World eIoni + 3 -10.9 cm -2.34 m 2.55 m 0 eV 4.62 keV 605 um 2.34 mm World eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 125, Parent ID = 119 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -10.4 cm -1.57 m 1.66 m 46.3 keV 0 eV 0 fm 0 fm Chamber initStep + 1 -10.5 cm -1.57 m 1.66 m 37.5 keV 8.82 keV 4.29 mm 4.29 mm Chamber eIoni + 2 -10.6 cm -1.57 m 1.66 m 21.6 keV 15.9 keV 3.45 mm 7.74 mm Chamber eIoni + 3 -10.6 cm -1.57 m 1.66 m 0 eV 21.6 keV 2.16 mm 9.9 mm Chamber eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 124, Parent ID = 119 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -18.9 cm -76.3 cm 9.58 cm 76.1 keV 0 eV 0 fm 0 fm Chamber initStep + 1 -19.8 cm -79.1 cm 20 cm 76.1 keV 0 eV 10.8 cm 10.8 cm Chamber Transportation + 2 -24.8 cm -95.3 cm 80 cm 76.1 keV 0 eV 62.3 cm 73.2 cm Tracker Transportation + 3 -25.1 cm -96.2 cm 83.5 cm 0 eV 34.6 keV 3.59 cm 76.8 cm Chamber phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 128, Parent ID = 124 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -25.1 cm -96.2 cm 83.5 cm 41.5 keV 0 eV 0 fm 0 fm Chamber initStep + 1 -25.2 cm -96.1 cm 83.6 cm 31.4 keV 10.1 keV 3.82 mm 3.82 mm Chamber eIoni + 2 -25.1 cm -96 cm 83.5 cm 23.3 keV 8.05 keV 2.92 mm 6.73 mm Chamber eIoni + 3 -25 cm -96 cm 83.5 cm 15.6 keV 7.77 keV 2.29 mm 9.03 mm Chamber eIoni + 4 -25 cm -96.1 cm 83.5 cm 8.55 keV 7 keV 1.69 mm 1.07 cm Chamber eIoni + 5 -25 cm -96 cm 83.5 cm 0 eV 8.55 keV 865 um 1.16 cm Chamber eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 123, Parent ID = 119 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -14.4 cm -65.9 cm -37.8 cm 16.6 keV 0 eV 0 fm 0 fm Tracker initStep + 1 -14.5 cm -65.7 cm -37.9 cm 12.7 keV 3.97 keV 2.56 mm 2.56 mm Tracker eIoni + 2 -14.6 cm -65.7 cm -37.9 cm 7.81 keV 4.87 keV 2.05 mm 4.61 mm Tracker eIoni + 3 -14.6 cm -65.8 cm -37.9 cm 4.11 keV 3.7 keV 1.35 mm 5.96 mm Tracker eIoni + 4 -14.6 cm -65.8 cm -37.9 cm 0 eV 4.11 keV 496 um 6.46 mm Tracker eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 122, Parent ID = 119 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -4.53 cm -26.3 cm -1.75 m 12.7 keV 0 eV 0 fm 0 fm Tracker initStep + 1 -4.66 cm -26.4 cm -1.75 m 8.27 keV 4.47 keV 2.06 mm 2.06 mm Tracker eIoni + 2 -4.69 cm -26.3 cm -1.75 m 4.64 keV 3.63 keV 1.44 mm 3.49 mm Tracker eIoni + 3 -4.7 cm -26.3 cm -1.75 m 0 eV 4.64 keV 610 um 4.1 mm Tracker eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 121, Parent ID = 119 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -882 um -4.26 cm -2.31 m 171 keV 0 eV 0 fm 0 fm Tracker initStep + 1 1.24 cm -10.2 cm -2.28 m 151 keV 19.6 keV 7.03 cm 7.03 cm Tracker eIoni + 2 2.19 cm -15.5 cm -2.28 m 126 keV 24.7 keV 5.74 cm 12.8 cm Tracker eIoni + 3 4.99 cm -18.4 cm -2.27 m 109 keV 17.3 keV 4.26 cm 17 cm Tracker eIoni + 4 7.65 cm -18.9 cm -2.26 m 93.6 keV 15.6 keV 3.36 cm 20.4 cm Tracker eIoni + 5 8.44 cm -18.4 cm -2.23 m 80.6 keV 13 keV 2.61 cm 23 cm Tracker eIoni + 6 7.82 cm -18.1 cm -2.22 m 72.4 keV 8.17 keV 2.03 cm 25 cm Tracker eIoni + 7 6.91 cm -16.9 cm -2.21 m 61.1 keV 11.3 keV 1.72 cm 26.8 cm Tracker eIoni + 8 6.12 cm -16 cm -2.21 m 53.7 keV 7.42 keV 1.3 cm 28.1 cm Tracker eIoni + 9 5.2 cm -16 cm -2.22 m 47.4 keV 6.35 keV 1.07 cm 29.1 cm Tracker eIoni + 10 4.66 cm -15.8 cm -2.22 m 40.1 keV 7.22 keV 8.83 mm 30 cm Tracker eIoni + 11 4.2 cm -15.5 cm -2.23 m 29.5 keV 10.6 keV 6.92 mm 30.7 cm Tracker eIoni + 12 3.88 cm -15.5 cm -2.23 m 25.8 keV 3.71 keV 4.64 mm 31.2 cm Tracker eIoni + 13 3.54 cm -15.6 cm -2.23 m 20.1 keV 5.68 keV 3.95 mm 31.6 cm Tracker eIoni + 14 3.29 cm -15.7 cm -2.23 m 14.1 keV 6.03 keV 3.04 mm 31.9 cm Tracker eIoni + 15 3.11 cm -15.7 cm -2.23 m 9.98 keV 4.12 keV 2.24 mm 32.1 cm Tracker eIoni + 16 3.11 cm -15.8 cm -2.23 m 5.62 keV 4.35 keV 1.69 mm 32.3 cm Tracker eIoni + 17 3.08 cm -15.8 cm -2.23 m 0 eV 5.62 keV 844 um 32.3 cm Tracker eIoni ********************************************************************************************************* * G4Track Information: Particle = gamma, Track ID = 6, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 228 um -409 um -2.45 m 5.57 MeV 0 eV 0 fm 0 fm Target initStep - 1 391 um -347 um -2.44 m 1.45 MeV 0 eV 6.73 mm 6.73 mm Target compt - 2 2.49 mm -3.75 mm -2.44 m 637 keV 0 eV 5.9 mm 1.26 cm Target compt - 3 3.06 mm -3.06 mm -2.44 m 252 keV 0 eV 1.93 mm 1.46 cm Target compt - 4 3.61 mm -4.78 mm -2.44 m 0 eV 88 keV 1.81 mm 1.64 cm Target phot + 0 -281 um 261 um -2.45 m 671 keV 0 eV 0 fm 0 fm Target initStep + 1 -292 um 252 um -2.45 m 0 eV 88 keV 200 um 200 um Target phot ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 210, Parent ID = 6 +* G4Track Information: Particle = e-, Track ID = 129, Parent ID = 6 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 3.61 mm -4.78 mm -2.44 m 164 keV 0 eV 0 fm 0 fm Target initStep - 1 3.61 mm -4.79 mm -2.44 m 0 eV 164 keV 60.4 um 60.4 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 209, Parent ID = 6 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 3.06 mm -3.06 mm -2.44 m 385 keV 0 eV 0 fm 0 fm Target initStep - 1 3.06 mm -3.03 mm -2.44 m 101 keV 285 keV 176 um 176 um Target eBrem - 2 3.06 mm -3.03 mm -2.44 m 0 eV 101 keV 27.9 um 204 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 208, Parent ID = 6 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 2.49 mm -3.75 mm -2.44 m 809 keV 0 eV 0 fm 0 fm Target initStep - 1 2.5 mm -3.79 mm -2.44 m 0 eV 809 keV 563 um 563 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 207, Parent ID = 6 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 391 um -347 um -2.44 m 4.12 MeV 0 eV 0 fm 0 fm Target initStep - 1 404 um -363 um -2.44 m 3.88 MeV 238 keV 200 um 200 um Target eBrem - 2 436 um -203 um -2.44 m 2.8 MeV 605 keV 495 um 695 um Target eBrem - 3 447 um 256 um -2.44 m 1.11 MeV 1.69 MeV 1.68 mm 2.38 mm Target eIoni - 4 442 um 260 um -2.44 m 0 eV 1.11 MeV 820 um 3.2 mm Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 211, Parent ID = 207 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 436 um -203 um -2.44 m 471 keV 0 eV 0 fm 0 fm Target initStep - 1 -2.57 mm -4.56 mm -2.43 m 0 eV 88 keV 1.54 cm 1.54 cm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 212, Parent ID = 211 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -2.57 mm -4.56 mm -2.43 m 383 keV 0 eV 0 fm 0 fm Target initStep - 1 -2.58 mm -4.57 mm -2.43 m 0 eV 383 keV 212 um 212 um Target eIoni + 0 -292 um 252 um -2.45 m 583 keV 0 eV 0 fm 0 fm Target initStep + 1 -299 um 248 um -2.45 m 0 eV 583 keV 372 um 372 um Target eIoni ********************************************************************************************************* * G4Track Information: Particle = gamma, Track ID = 5, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 228 um -409 um -2.45 m 36.6 MeV 0 eV 0 fm 0 fm Target initStep - 1 402 um -378 um -2.44 m 0 eV 0 eV 5.54 mm 5.54 mm Target conv + 0 -228 um 250 um -2.45 m 81.5 MeV 0 eV 0 fm 0 fm Target initStep + 1 -515 um 71.9 um -2.44 m 0 eV 0 eV 1.29 cm 1.29 cm Target conv ********************************************************************************************************* -* G4Track Information: Particle = e+, Track ID = 214, Parent ID = 5 +* G4Track Information: Particle = e+, Track ID = 131, Parent ID = 5 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 402 um -378 um -2.44 m 7.31 MeV 0 eV 0 fm 0 fm Target initStep - 1 490 um -275 um -2.44 m 5.75 MeV 472 keV 480 um 480 um Target eBrem - 2 325 um -98.9 um -2.44 m 4.11 MeV 1 MeV 763 um 1.24 mm Target eBrem - 3 559 um 402 um -2.44 m 2.15 MeV 1.5 MeV 1.33 mm 2.57 mm Target eBrem - 4 775 um 792 um -2.44 m 231 keV 1.92 MeV 1.48 mm 4.05 mm Target eIoni - 5 771 um 801 um -2.44 m 0 eV 231 keV 98.2 um 4.15 mm Target eIoni - 6 771 um 801 um -2.44 m 0 eV 0 eV 0 fm 4.15 mm Target annihil + 0 -515 um 71.9 um -2.44 m 27.1 MeV 0 eV 0 fm 0 fm Target initStep + 1 -544 um 75.9 um -2.44 m 25.6 MeV 304 keV 257 um 257 um Target eBrem + 2 -544 um 75.9 um -2.44 m 23.3 MeV 128 keV 82.5 um 339 um Target eBrem + 3 -435 um 64.5 um -2.43 m 21.2 MeV 1.09 MeV 609 um 948 um Target eBrem + 4 -30.1 um 249 um -2.43 m 14.5 MeV 2 MeV 1.25 mm 2.2 mm Target eBrem + 5 1.26 mm 710 um -2.43 m 11.6 MeV 2.41 MeV 2.12 mm 4.32 mm Target eBrem + 6 935 um 1.44 mm -2.43 m 9.58 MeV 929 keV 864 um 5.18 mm Target eBrem + 7 -619 um 2.97 mm -2.43 m 5.32 MeV 3.56 MeV 2.84 mm 8.02 mm Target eBrem + 8 -1.53 mm 3.29 mm -2.43 m 2.89 MeV 2.42 MeV 1.27 mm 9.3 mm Target eBrem + 9 -921 um 3.07 mm -2.43 m 1.15 MeV 1.74 MeV 1.72 mm 1.1 cm Target eIoni + 10 -1.06 mm 3.12 mm -2.43 m 0 eV 285 keV 294 um 1.13 cm Target annihil ********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 219, Parent ID = 214 +* G4Track Information: Particle = gamma, Track ID = 140, Parent ID = 131 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 771 um 801 um -2.44 m 511 keV 0 eV 0 fm 0 fm Target initStep - 1 836 um 427 um -2.44 m 0 eV 88 keV 406 um 406 um Target phot + 0 -1.06 mm 3.12 mm -2.43 m 1.41 MeV 0 eV 0 fm 0 fm Target initStep + 1 -1.04 mm 3.48 mm -2.43 m 336 keV 0 eV 360 um 360 um Target compt + 2 3.24 mm 2.46 mm -2.43 m 0 eV 88 keV 4.51 mm 4.87 mm Target phot ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 220, Parent ID = 219 +* G4Track Information: Particle = e-, Track ID = 142, Parent ID = 140 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 836 um 427 um -2.44 m 423 keV 0 eV 0 fm 0 fm Target initStep - 1 838 um 414 um -2.44 m 0 eV 423 keV 242 um 242 um Target eIoni + 0 3.24 mm 2.46 mm -2.43 m 248 keV 0 eV 0 fm 0 fm Target initStep + 1 3.25 mm 2.46 mm -2.43 m 0 eV 248 keV 113 um 113 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 218, Parent ID = 214 +* G4Track Information: Particle = e-, Track ID = 141, Parent ID = 140 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 771 um 801 um -2.44 m 511 keV 0 eV 0 fm 0 fm Target initStep - 1 512 um 2.29 mm -2.44 m 495 keV 0 eV 1.62 mm 1.62 mm Target compt - 2 349 um 3.2 mm -2.44 m 0 eV 88 keV 932 um 2.55 mm Target phot + 0 -1.04 mm 3.48 mm -2.43 m 1.07 MeV 0 eV 0 fm 0 fm Target initStep + 1 -1.05 mm 3.54 mm -2.43 m 0 eV 1.07 MeV 787 um 787 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 222, Parent ID = 218 +* G4Track Information: Particle = gamma, Track ID = 139, Parent ID = 131 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 349 um 3.2 mm -2.44 m 407 keV 0 eV 0 fm 0 fm Target initStep - 1 341 um 3.21 mm -2.44 m 0 eV 407 keV 230 um 230 um Target eIoni + 0 -1.06 mm 3.12 mm -2.43 m 484 keV 0 eV 0 fm 0 fm Target initStep + 1 -1.07 mm 2.92 mm -2.43 m 0 eV 88 keV 428 um 428 um Target phot ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 221, Parent ID = 218 +* G4Track Information: Particle = e-, Track ID = 143, Parent ID = 139 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 512 um 2.29 mm -2.44 m 15.9 keV 0 eV 0 fm 0 fm Target initStep - 1 512 um 2.29 mm -2.44 m 0 eV 15.9 keV 1.42 um 1.42 um Target eIoni + 0 -1.07 mm 2.92 mm -2.43 m 396 keV 0 eV 0 fm 0 fm Target initStep + 1 -1.06 mm 2.93 mm -2.43 m 0 eV 396 keV 221 um 221 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 217, Parent ID = 214 +* G4Track Information: Particle = gamma, Track ID = 138, Parent ID = 131 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 559 um 402 um -2.44 m 456 keV 0 eV 0 fm 0 fm Target initStep - 1 106 um 936 um -2.44 m 194 keV 0 eV 1.34 mm 1.34 mm Target compt - 2 164 um 972 um -2.44 m 0 eV 88 keV 79.4 um 1.42 mm Target phot + 0 -619 um 2.97 mm -2.43 m 708 keV 0 eV 0 fm 0 fm Target initStep + 1 -2.24 cm 6.19 mm -2.43 m 283 keV 0 eV 2.29 cm 2.29 cm Target compt + 2 -2.26 cm 7.4 mm -2.43 m 0 eV 88 keV 2.32 mm 2.53 cm Target phot ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 224, Parent ID = 217 +* G4Track Information: Particle = e-, Track ID = 145, Parent ID = 138 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 164 um 972 um -2.44 m 106 keV 0 eV 0 fm 0 fm Target initStep - 1 165 um 973 um -2.44 m 0 eV 106 keV 30.5 um 30.5 um Target eIoni + 0 -2.26 cm 7.4 mm -2.43 m 195 keV 0 eV 0 fm 0 fm Target initStep + 1 -2.26 cm 7.4 mm -2.43 m 0 eV 195 keV 78.9 um 78.9 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 223, Parent ID = 217 +* G4Track Information: Particle = e-, Track ID = 144, Parent ID = 138 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 106 um 936 um -2.44 m 262 keV 0 eV 0 fm 0 fm Target initStep - 1 102 um 938 um -2.44 m 0 eV 262 keV 123 um 123 um Target eIoni + 0 -2.24 cm 6.19 mm -2.43 m 425 keV 0 eV 0 fm 0 fm Target initStep + 1 -2.24 cm 6.19 mm -2.43 m 0 eV 425 keV 244 um 244 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 216, Parent ID = 214 +* G4Track Information: Particle = gamma, Track ID = 137, Parent ID = 131 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 325 um -98.9 um -2.44 m 636 keV 0 eV 0 fm 0 fm Target initStep - 1 3.82 mm -2.83 mm -2.43 m 0 eV 88 keV 1.25 cm 1.25 cm Target phot + 0 935 um 1.44 mm -2.43 m 1.04 MeV 0 eV 0 fm 0 fm Target initStep + 1 -3.26 mm 2.28 cm -2.43 m 329 keV 0 eV 2.18 cm 2.18 cm Target compt + 2 -3.03 mm 2.29 cm -2.43 m 0 eV 88 keV 590 um 2.24 cm Target phot ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 225, Parent ID = 216 +* G4Track Information: Particle = e-, Track ID = 147, Parent ID = 137 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 3.82 mm -2.83 mm -2.43 m 548 keV 0 eV 0 fm 0 fm Target initStep - 1 3.82 mm -2.84 mm -2.43 m 0 eV 548 keV 344 um 344 um Target eIoni + 0 -3.03 mm 2.29 cm -2.43 m 241 keV 0 eV 0 fm 0 fm Target initStep + 1 -3.02 mm 2.29 cm -2.43 m 0 eV 241 keV 108 um 108 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 215, Parent ID = 214 +* G4Track Information: Particle = e-, Track ID = 146, Parent ID = 137 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 490 um -275 um -2.44 m 1.09 MeV 0 eV 0 fm 0 fm Target initStep - 1 2.27 cm 1.11 mm -2.41 m 769 keV 0 eV 4.37 cm 4.37 cm Target compt - 2 2.25 cm 2.73 mm -2.4 m 248 keV 0 eV 5.12 mm 4.89 cm Target compt - 3 2.16 cm 1.87 mm -2.4 m 0 eV 88 keV 1.31 mm 5.02 cm Target phot + 0 -3.26 mm 2.28 cm -2.43 m 709 keV 0 eV 0 fm 0 fm Target initStep + 1 -3.28 mm 2.28 cm -2.43 m 0 eV 709 keV 478 um 478 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 228, Parent ID = 215 +* G4Track Information: Particle = gamma, Track ID = 136, Parent ID = 131 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 2.16 cm 1.87 mm -2.4 m 160 keV 0 eV 0 fm 0 fm Target initStep - 1 2.16 cm 1.87 mm -2.4 m 0 eV 160 keV 58.3 um 58.3 um Target eIoni + 0 1.26 mm 710 um -2.43 m 529 keV 0 eV 0 fm 0 fm Target initStep + 1 1.15 mm 1.49 mm -2.43 m 302 keV 0 eV 817 um 817 um Target compt + 2 2.88 mm 2 mm -2.43 m 282 keV 0 eV 2.21 mm 3.03 mm Target compt + 3 4.75 mm 3.01 mm -2.43 m 0 eV 88 keV 2.16 mm 5.18 mm Target phot ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 227, Parent ID = 215 +* G4Track Information: Particle = e-, Track ID = 150, Parent ID = 136 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 2.25 cm 2.73 mm -2.4 m 520 keV 0 eV 0 fm 0 fm Target initStep - 1 2.25 cm 2.71 mm -2.4 m 432 keV 88 keV 63 um 63 um Target msc - 2 2.25 cm 2.71 mm -2.4 m 0 eV 432 keV 250 um 313 um Target eIoni + 0 4.75 mm 3.01 mm -2.43 m 194 keV 0 eV 0 fm 0 fm Target initStep + 1 4.75 mm 3.02 mm -2.43 m 0 eV 194 keV 78.1 um 78.1 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 226, Parent ID = 215 +* G4Track Information: Particle = e-, Track ID = 149, Parent ID = 136 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 2.27 cm 1.11 mm -2.41 m 318 keV 0 eV 0 fm 0 fm Target initStep - 1 2.27 cm 1.11 mm -2.41 m 0 eV 318 keV 162 um 162 um Target eIoni + 0 2.88 mm 2 mm -2.43 m 20.1 keV 0 eV 0 fm 0 fm Target initStep + 1 2.88 mm 2 mm -2.43 m 0 eV 20.1 keV 2.04 um 2.04 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 213, Parent ID = 5 +* G4Track Information: Particle = e-, Track ID = 148, Parent ID = 136 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 402 um -378 um -2.44 m 28.2 MeV 0 eV 0 fm 0 fm Target initStep - 1 527 um -677 um -2.44 m 26.1 MeV 2.16 MeV 1.51 mm 1.51 mm Target msc - 2 392 um -738 um -2.44 m 24.7 MeV 491 keV 408 um 1.92 mm Target eBrem - 3 351 um -744 um -2.44 m 23.8 MeV 95.2 keV 94.7 um 2.01 mm Target eBrem - 4 296 um -736 um -2.44 m 22.9 MeV 328 keV 127 um 2.14 mm Target eBrem - 5 -327 um -387 um -2.44 m 21.3 MeV 1.65 MeV 1.51 mm 3.65 mm Target msc - 6 -1.04 mm 54.7 um -2.44 m 18.7 MeV 1.24 MeV 897 um 4.55 mm Target eBrem - 7 -2.5 mm 112 um -2.44 m 17.1 MeV 1.62 MeV 1.51 mm 6.06 mm Target msc - 8 -2.99 mm 312 um -2.44 m 15.6 MeV 1.14 MeV 542 um 6.6 mm Target eBrem - 9 -4.01 mm 957 um -2.44 m 12.5 MeV 1.44 MeV 1.29 mm 7.89 mm Target eBrem - 10 -4.82 mm 1.76 mm -2.44 m 9.27 MeV 2.29 MeV 1.39 mm 9.28 mm Target eBrem - 11 -4.52 mm 1.18 mm -2.44 m 7.25 MeV 2.02 MeV 1.51 mm 1.08 cm Target msc - 12 -4.53 mm 1.16 mm -2.44 m 4.91 MeV 23 keV 22 um 1.08 cm Target eBrem - 13 -4.84 mm 1.13 mm -2.44 m 3.54 MeV 713 keV 611 um 1.14 cm Target eBrem - 14 -4.98 mm 957 um -2.44 m 2.2 MeV 357 keV 279 um 1.17 cm Target eBrem - 15 -4.98 mm 1.28 mm -2.44 m 339 keV 1.86 MeV 1.48 mm 1.32 cm Target eIoni - 16 -4.98 mm 1.28 mm -2.44 m 0 eV 339 keV 178 um 1.34 cm Target eIoni + 0 1.15 mm 1.49 mm -2.43 m 227 keV 0 eV 0 fm 0 fm Target initStep + 1 1.15 mm 1.49 mm -2.43 m 0 eV 227 keV 99.3 um 99.3 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 238, Parent ID = 213 +* G4Track Information: Particle = gamma, Track ID = 135, Parent ID = 131 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -4.98 mm 957 um -2.44 m 990 keV 0 eV 0 fm 0 fm Target initStep - 1 -1.53 cm -2.91 mm -2.45 m 0 eV 88 keV 1.3 cm 1.3 cm Target phot + 0 -30.1 um 249 um -2.43 m 4.68 MeV 0 eV 0 fm 0 fm Target initStep + 1 1.06 cm -650 um -2.41 m 4.55 MeV 0 eV 2.96 cm 2.96 cm Target compt + 2 1.32 cm -528 um -2.4 m 4.55 MeV 0 eV 6.28 mm 3.59 cm Target Transportation + 3 1.48 m 6.76 cm 80 cm 4.55 MeV 0 eV 3.52 m 3.56 m Tracker Transportation + 4 1.54 m 7.04 cm 93.1 cm 4.55 MeV 0 eV 14.5 cm 3.7 m Chamber Transportation + 5 1.84 m 8.46 cm 1.6 m 4.55 MeV 0 eV 73.5 cm 4.43 m Tracker Transportation + 6 1.93 m 8.89 cm 1.8 m 4.55 MeV 0 eV 22 cm 4.65 m Chamber Transportation + 7 2.21 m 10.2 cm 2.4 m 4.55 MeV 0 eV 66 cm 5.31 m Tracker Transportation + 8 2.44 m 11.3 cm 2.91 m 4.55 MeV 0 eV 56.1 cm 5.88 m OutOfWorld Transportation ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 239, Parent ID = 238 +* G4Track Information: Particle = e-, Track ID = 151, Parent ID = 135 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -1.53 cm -2.91 mm -2.45 m 902 keV 0 eV 0 fm 0 fm Target initStep - 1 -1.53 cm -2.91 mm -2.45 m 0 eV 902 keV 642 um 642 um Target eIoni + 0 1.06 cm -650 um -2.41 m 131 keV 0 eV 0 fm 0 fm Target initStep + 1 1.06 cm -651 um -2.41 m 0 eV 131 keV 42.3 um 42.3 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 237, Parent ID = 213 +* G4Track Information: Particle = gamma, Track ID = 134, Parent ID = 131 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -4.84 mm 1.13 mm -2.44 m 652 keV 0 eV 0 fm 0 fm Target initStep - 1 -6.66 mm -1.09 cm -2.44 m 558 keV 0 eV 1.22 cm 1.22 cm Target compt - 2 -6.76 mm -1.28 cm -2.44 m 0 eV 88 keV 2.21 mm 1.44 cm Target phot + 0 -435 um 64.5 um -2.43 m 1.06 MeV 0 eV 0 fm 0 fm Target initStep + 1 -1.11 mm 3.03 mm -2.42 m 252 keV 0 eV 1.94 cm 1.94 cm Target compt + 2 4.04 mm -108 um -2.42 m 0 eV 88 keV 6.77 mm 2.62 cm Target phot ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 241, Parent ID = 237 +* G4Track Information: Particle = e-, Track ID = 153, Parent ID = 134 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -6.76 mm -1.28 cm -2.44 m 470 keV 0 eV 0 fm 0 fm Target initStep - 1 -6.76 mm -1.29 cm -2.44 m 0 eV 470 keV 280 um 280 um Target eIoni + 0 4.04 mm -108 um -2.42 m 164 keV 0 eV 0 fm 0 fm Target initStep + 1 4.04 mm -107 um -2.42 m 0 eV 164 keV 60.3 um 60.3 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 240, Parent ID = 237 +* G4Track Information: Particle = e-, Track ID = 152, Parent ID = 134 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -6.66 mm -1.09 cm -2.44 m 93.3 keV 0 eV 0 fm 0 fm Target initStep - 1 -6.66 mm -1.09 cm -2.44 m 0 eV 93.3 keV 24.8 um 24.8 um Target eIoni + 0 -1.11 mm 3.03 mm -2.42 m 806 keV 0 eV 0 fm 0 fm Target initStep + 1 -1.12 mm 3.04 mm -2.42 m 0 eV 806 keV 560 um 560 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 236, Parent ID = 213 +* G4Track Information: Particle = gamma, Track ID = 133, Parent ID = 131 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -4.53 mm 1.16 mm -2.44 m 2.32 MeV 0 eV 0 fm 0 fm Target initStep - 1 -4.97 mm 584 um -2.44 m 861 keV 0 eV 791 um 791 um Target compt - 2 -1.14 cm -1.51 cm -2.45 m 861 keV 0 eV 1.89 cm 1.96 cm Target Transportation - 3 -36.9 cm -88.4 cm -2.91 m 861 keV 0 eV 1.05 m 1.07 m OutOfWorld Transportation + 0 -544 um 75.9 um -2.44 m 2.17 MeV 0 eV 0 fm 0 fm Target initStep + 1 -450 um -817 um -2.43 m 1.09 MeV 0 eV 7.87 mm 7.87 mm Target compt + 2 1.21 mm 1.89 mm -2.42 m 0 eV 88 keV 5.61 mm 1.35 cm Target phot ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 242, Parent ID = 236 +* G4Track Information: Particle = e-, Track ID = 155, Parent ID = 133 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -4.97 mm 584 um -2.44 m 1.46 MeV 0 eV 0 fm 0 fm Target initStep - 1 -4.91 mm 669 um -2.44 m 10.9 keV 1.45 MeV 1.11 mm 1.11 mm Target eIoni - 2 -4.91 mm 669 um -2.44 m 0 eV 10.9 keV 796 nm 1.11 mm Target eIoni + 0 1.21 mm 1.89 mm -2.42 m 1 MeV 0 eV 0 fm 0 fm Target initStep + 1 1.21 mm 1.93 mm -2.42 m 0 eV 1 MeV 730 um 730 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 235, Parent ID = 213 +* G4Track Information: Particle = e-, Track ID = 154, Parent ID = 133 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -4.82 mm 1.76 mm -2.44 m 913 keV 0 eV 0 fm 0 fm Target initStep - 1 -4.72 mm 1.81 mm -2.44 m 0 eV 88 keV 497 um 497 um Target phot + 0 -450 um -817 um -2.43 m 1.08 MeV 0 eV 0 fm 0 fm Target initStep + 1 -462 um -849 um -2.43 m 0 eV 1.08 MeV 792 um 792 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 243, Parent ID = 235 +* G4Track Information: Particle = gamma, Track ID = 132, Parent ID = 131 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -4.72 mm 1.81 mm -2.44 m 825 keV 0 eV 0 fm 0 fm Target initStep - 1 -4.72 mm 1.78 mm -2.44 m 0 eV 825 keV 576 um 576 um Target eIoni + 0 -544 um 75.9 um -2.44 m 1.19 MeV 0 eV 0 fm 0 fm Target initStep + 1 -506 um 157 um -2.43 m 720 keV 0 eV 1.62 mm 1.62 mm Target compt + 2 3.17 mm -1.78 mm -2.43 m 0 eV 88 keV 6.02 mm 7.64 mm Target phot ********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 234, Parent ID = 213 +* G4Track Information: Particle = e-, Track ID = 157, Parent ID = 132 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -4.01 mm 957 um -2.44 m 1.71 MeV 0 eV 0 fm 0 fm Target initStep - 1 -4.79 mm 1.2 mm -2.44 m 0 eV 88 keV 850 um 850 um Target phot + 0 3.17 mm -1.78 mm -2.43 m 632 keV 0 eV 0 fm 0 fm Target initStep + 1 3.16 mm -1.8 mm -2.43 m 0 eV 632 keV 413 um 413 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 244, Parent ID = 234 +* G4Track Information: Particle = e-, Track ID = 156, Parent ID = 132 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -4.79 mm 1.2 mm -2.44 m 1.62 MeV 0 eV 0 fm 0 fm Target initStep - 1 -4.93 mm 1.3 mm -2.44 m 272 keV 1.35 MeV 1.21 mm 1.21 mm Target eIoni - 2 -4.93 mm 1.3 mm -2.44 m 0 eV 272 keV 130 um 1.34 mm Target eIoni + 0 -506 um 157 um -2.43 m 468 keV 0 eV 0 fm 0 fm Target initStep + 1 -515 um 164 um -2.43 m 0 eV 468 keV 278 um 278 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 233, Parent ID = 213 +* G4Track Information: Particle = e-, Track ID = 130, Parent ID = 5 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -2.99 mm 312 um -2.44 m 301 keV 0 eV 0 fm 0 fm Target initStep - 1 -4.11 mm 1.05 mm -2.44 m 0 eV 88 keV 1.4 mm 1.4 mm Target phot + 0 -515 um 71.9 um -2.44 m 53.4 MeV 0 eV 0 fm 0 fm Target initStep + 1 -1.22 mm 539 um -2.43 m 42.5 MeV 5.7 MeV 4.39 mm 4.39 mm Target eBrem + 2 -1.27 mm 533 um -2.43 m 250 keV 1.35 MeV 347 um 4.73 mm Target eBrem + 3 -1.28 mm 535 um -2.43 m 0 eV 250 keV 114 um 4.85 mm Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 245, Parent ID = 233 +* G4Track Information: Particle = gamma, Track ID = 159, Parent ID = 130 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -4.11 mm 1.05 mm -2.44 m 213 keV 0 eV 0 fm 0 fm Target initStep - 1 -4.11 mm 1.05 mm -2.44 m 0 eV 213 keV 90.6 um 90.6 um Target eIoni + 0 -1.27 mm 533 um -2.43 m 40.9 MeV 0 eV 0 fm 0 fm Target initStep + 1 -1.47 mm 386 um -2.43 m 0 eV 0 eV 2.19 mm 2.19 mm Target conv ********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 232, Parent ID = 213 +* G4Track Information: Particle = e+, Track ID = 161, Parent ID = 159 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -1.04 mm 54.7 um -2.44 m 1.35 MeV 0 eV 0 fm 0 fm Target initStep - 1 -1.45 cm 3.55 mm -2.44 m 679 keV 0 eV 1.41 cm 1.41 cm Target compt - 2 -1.66 cm 8.16 mm -2.44 m 409 keV 0 eV 5.08 mm 1.92 cm Target compt - 3 -1.63 cm 8.61 mm -2.44 m 0 eV 88 keV 549 um 1.97 cm Target phot + 0 -1.47 mm 386 um -2.43 m 3.12 MeV 0 eV 0 fm 0 fm Target initStep + 1 -1.59 mm 79.2 um -2.43 m 0 eV 666 keV 603 um 603 um Target annihil ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 248, Parent ID = 232 +* G4Track Information: Particle = gamma, Track ID = 163, Parent ID = 161 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -1.63 cm 8.61 mm -2.44 m 321 keV 0 eV 0 fm 0 fm Target initStep - 1 -1.63 cm 8.62 mm -2.44 m 0 eV 321 keV 165 um 165 um Target eIoni + 0 -1.59 mm 79.2 um -2.43 m 2.66 MeV 0 eV 0 fm 0 fm Target initStep + 1 -1.58 mm 83.8 um -2.43 m 0 eV 0 eV 299 um 299 um Target conv ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 247, Parent ID = 232 +* G4Track Information: Particle = e+, Track ID = 165, Parent ID = 163 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -1.66 cm 8.16 mm -2.44 m 270 keV 0 eV 0 fm 0 fm Target initStep - 1 -1.66 cm 8.17 mm -2.44 m 0 eV 270 keV 129 um 129 um Target eIoni + 0 -1.58 mm 83.8 um -2.43 m 568 keV 0 eV 0 fm 0 fm Target initStep + 1 -1.58 mm 71.4 um -2.43 m 0 eV 568 keV 360 um 360 um Target eIoni + 2 -1.58 mm 71.4 um -2.43 m 0 eV 0 eV 0 fm 360 um Target annihil ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 246, Parent ID = 232 +* G4Track Information: Particle = gamma, Track ID = 167, Parent ID = 165 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -1.45 cm 3.55 mm -2.44 m 666 keV 0 eV 0 fm 0 fm Target initStep - 1 -1.46 cm 3.55 mm -2.44 m 313 keV 353 keV 88.5 um 88.5 um Target eBrem - 2 -1.46 cm 3.56 mm -2.44 m 0 eV 313 keV 159 um 247 um Target eIoni + 0 -1.58 mm 71.4 um -2.43 m 511 keV 0 eV 0 fm 0 fm Target initStep + 1 9.15 mm 7.91 mm -2.45 m 0 eV 88 keV 2.39 cm 2.39 cm Target phot ********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 231, Parent ID = 213 +* G4Track Information: Particle = e-, Track ID = 168, Parent ID = 167 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 296 um -736 um -2.44 m 518 keV 0 eV 0 fm 0 fm Target initStep - 1 -8.85 mm -936 um -2.42 m 0 eV 88 keV 2.04 cm 2.04 cm Target phot + 0 9.15 mm 7.91 mm -2.45 m 423 keV 0 eV 0 fm 0 fm Target initStep + 1 9.17 mm 7.9 mm -2.45 m 0 eV 423 keV 242 um 242 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 249, Parent ID = 231 +* G4Track Information: Particle = gamma, Track ID = 166, Parent ID = 165 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -8.85 mm -936 um -2.42 m 430 keV 0 eV 0 fm 0 fm Target initStep - 1 -8.86 mm -942 um -2.42 m 0 eV 430 keV 248 um 248 um Target eIoni + 0 -1.58 mm 71.4 um -2.43 m 511 keV 0 eV 0 fm 0 fm Target initStep + 1 -2.49 mm -591 um -2.43 m 420 keV 0 eV 2.02 mm 2.02 mm Target compt + 2 -3.1 mm -2.19 mm -2.43 m 0 eV 88 keV 1.91 mm 3.92 mm Target phot ********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 230, Parent ID = 213 +* G4Track Information: Particle = e-, Track ID = 170, Parent ID = 166 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 351 um -744 um -2.44 m 853 keV 0 eV 0 fm 0 fm Target initStep - 1 310 um -745 um -2.44 m 0 eV 88 keV 97.3 um 97.3 um Target phot + 0 -3.1 mm -2.19 mm -2.43 m 332 keV 0 eV 0 fm 0 fm Target initStep + 1 -3.1 mm -2.2 mm -2.43 m 0 eV 332 keV 173 um 173 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 250, Parent ID = 230 +* G4Track Information: Particle = e-, Track ID = 169, Parent ID = 166 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 310 um -745 um -2.44 m 765 keV 0 eV 0 fm 0 fm Target initStep - 1 287 um -750 um -2.44 m 0 eV 765 keV 525 um 525 um Target eIoni + 0 -2.49 mm -591 um -2.43 m 91 keV 0 eV 0 fm 0 fm Target initStep + 1 -2.49 mm -590 um -2.43 m 0 eV 91 keV 23.8 um 23.8 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 229, Parent ID = 213 +* G4Track Information: Particle = e-, Track ID = 164, Parent ID = 163 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 392 um -738 um -2.44 m 887 keV 0 eV 0 fm 0 fm Target initStep - 1 -1.12 mm -718 um -2.44 m 814 keV 0 eV 4.25 mm 4.25 mm Target compt - 2 -3.96 mm 4.59 mm -2.41 m 298 keV 0 eV 2.58 cm 3 cm Target compt - 3 -2.06 mm 3.54 mm -2.41 m 0 eV 88 keV 2.19 mm 3.22 cm Target phot + 0 -1.58 mm 83.8 um -2.43 m 1.07 MeV 0 eV 0 fm 0 fm Target initStep + 1 -1.57 mm 99.7 um -2.43 m 0 eV 1.07 MeV 785 um 785 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 253, Parent ID = 229 +* G4Track Information: Particle = gamma, Track ID = 162, Parent ID = 161 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -2.06 mm 3.54 mm -2.41 m 210 keV 0 eV 0 fm 0 fm Target initStep - 1 -2.06 mm 3.54 mm -2.41 m 0 eV 210 keV 88.3 um 88.3 um Target eIoni + 0 -1.59 mm 79.2 um -2.43 m 818 keV 0 eV 0 fm 0 fm Target initStep + 1 -5.21 mm -6.62 mm -2.43 m 0 eV 88 keV 7.8 mm 7.8 mm Target phot ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 252, Parent ID = 229 +* G4Track Information: Particle = e-, Track ID = 171, Parent ID = 162 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -3.96 mm 4.59 mm -2.41 m 516 keV 0 eV 0 fm 0 fm Target initStep - 1 -3.97 mm 4.63 mm -2.41 m 57.1 keV 92.6 keV 52.3 um 52.3 um Target eBrem - 2 -3.97 mm 4.63 mm -2.41 m 0 eV 57.1 keV 11.2 um 63.5 um Target eIoni + 0 -5.21 mm -6.62 mm -2.43 m 730 keV 0 eV 0 fm 0 fm Target initStep + 1 -5.23 mm -6.65 mm -2.43 m 0 eV 730 keV 496 um 496 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 254, Parent ID = 252 +* G4Track Information: Particle = e-, Track ID = 160, Parent ID = 159 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -3.97 mm 4.63 mm -2.41 m 366 keV 0 eV 0 fm 0 fm Target initStep - 1 -6.06 mm 4.4 mm -2.41 m 321 keV 0 eV 2.34 mm 2.34 mm Target compt - 2 -1.01 cm -139 um -2.41 m 0 eV 88 keV 7.42 mm 9.76 mm Target phot + 0 -1.47 mm 386 um -2.43 m 36.8 MeV 0 eV 0 fm 0 fm Target initStep + 1 -1.49 mm 390 um -2.43 m 35 MeV 971 keV 762 um 762 um Target eBrem + 2 -2.2 mm 248 um -2.43 m 31.2 MeV 3.32 MeV 2.01 mm 2.77 mm Target eBrem + 3 -2.33 mm 198 um -2.43 m 28.6 MeV 368 keV 305 um 3.07 mm Target eBrem + 4 -2.39 mm 169 um -2.43 m 12.4 MeV 241 keV 129 um 3.2 mm Target eBrem + 5 -2.69 mm 244 um -2.43 m 11.1 MeV 926 keV 608 um 3.81 mm Target eBrem + 6 -2.82 mm 243 um -2.42 m 10.4 MeV 312 keV 309 um 4.12 mm Target eBrem + 7 -4.08 mm 828 um -2.42 m 6.02 MeV 4.35 MeV 3.05 mm 7.17 mm Target eIoni + 8 -3.96 mm 6.53 um -2.42 m 2.52 MeV 3.51 MeV 1.16 mm 8.33 mm Target eBrem + 9 -3.57 mm 81 um -2.42 m 644 keV 1.87 MeV 1.6 mm 9.93 mm Target eIoni + 10 -3.6 mm 99.7 um -2.42 m 0 eV 644 keV 423 um 1.04 cm Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 256, Parent ID = 254 +* G4Track Information: Particle = gamma, Track ID = 177, Parent ID = 160 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -1.01 cm -139 um -2.41 m 233 keV 0 eV 0 fm 0 fm Target initStep - 1 -1.01 cm -139 um -2.41 m 0 eV 233 keV 103 um 103 um Target eIoni + 0 -2.82 mm 243 um -2.42 m 459 keV 0 eV 0 fm 0 fm Target initStep + 1 -2.43 mm 1.52 mm -2.42 m 428 keV 0 eV 3.19 mm 3.19 mm Target compt + 2 -2.55 mm 2.39 mm -2.42 m 0 eV 88 keV 1.27 mm 4.46 mm Target phot ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 255, Parent ID = 254 +* G4Track Information: Particle = e-, Track ID = 179, Parent ID = 177 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -6.06 mm 4.4 mm -2.41 m 45.7 keV 0 eV 0 fm 0 fm Target initStep - 1 -6.06 mm 4.4 mm -2.41 m 0 eV 45.7 keV 7.78 um 7.78 um Target eIoni + 0 -2.55 mm 2.39 mm -2.42 m 340 keV 0 eV 0 fm 0 fm Target initStep + 1 -2.55 mm 2.39 mm -2.42 m 0 eV 340 keV 179 um 179 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 251, Parent ID = 229 +* G4Track Information: Particle = e-, Track ID = 178, Parent ID = 177 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -1.12 mm -718 um -2.44 m 73 keV 0 eV 0 fm 0 fm Target initStep - 1 -1.13 mm -719 um -2.44 m 0 eV 73 keV 16.7 um 16.7 um Target eIoni + 0 -2.43 mm 1.52 mm -2.42 m 31.4 keV 0 eV 0 fm 0 fm Target initStep + 1 -2.43 mm 1.52 mm -2.42 m 0 eV 31.4 keV 4.19 um 4.19 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 176, Parent ID = 160 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -2.69 mm 244 um -2.43 m 373 keV 0 eV 0 fm 0 fm Target initStep + 1 -4.6 mm 1.06 mm -2.42 m 0 eV 88 keV 3.75 mm 3.75 mm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 180, Parent ID = 176 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -4.6 mm 1.06 mm -2.42 m 285 keV 0 eV 0 fm 0 fm Target initStep + 1 -4.6 mm 1.07 mm -2.42 m 0 eV 285 keV 139 um 139 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 175, Parent ID = 160 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -2.39 mm 169 um -2.43 m 15.9 MeV 0 eV 0 fm 0 fm Target initStep + 1 -6.52 mm -2.08 mm -2.42 m 0 eV 0 eV 1.11 cm 1.11 cm Target conv + +********************************************************************************************************* +* G4Track Information: Particle = e+, Track ID = 182, Parent ID = 175 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -6.52 mm -2.08 mm -2.42 m 4.21 MeV 0 eV 0 fm 0 fm Target initStep + 1 -6.43 mm -1.87 mm -2.41 m 2.64 MeV 1.12 MeV 1.01 mm 1.01 mm Target eBrem + 2 -6.31 mm -1.59 mm -2.41 m 1.46 MeV 813 keV 473 um 1.48 mm Target eBrem + 3 -6.36 mm -1.5 mm -2.41 m 0 eV 1.46 MeV 1.12 mm 2.6 mm Target eIoni + 4 -6.36 mm -1.5 mm -2.41 m 0 eV 0 eV 0 fm 2.6 mm Target annihil + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 186, Parent ID = 182 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -6.36 mm -1.5 mm -2.41 m 511 keV 0 eV 0 fm 0 fm Target initStep + 1 -8.74 mm -1.13 mm -2.42 m 0 eV 88 keV 4.72 mm 4.72 mm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 187, Parent ID = 186 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -8.74 mm -1.13 mm -2.42 m 423 keV 0 eV 0 fm 0 fm Target initStep + 1 -8.72 mm -1.14 mm -2.42 m 0 eV 423 keV 242 um 242 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 185, Parent ID = 182 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -6.36 mm -1.5 mm -2.41 m 511 keV 0 eV 0 fm 0 fm Target initStep + 1 -5.4 mm -1.65 mm -2.41 m 183 keV 0 eV 1.9 mm 1.9 mm Target compt + 2 -5.32 mm -1.38 mm -2.41 m 0 eV 88 keV 916 um 2.82 mm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 189, Parent ID = 185 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -5.32 mm -1.38 mm -2.41 m 94.6 keV 0 eV 0 fm 0 fm Target initStep + 1 -5.32 mm -1.38 mm -2.41 m 0 eV 94.6 keV 25.3 um 25.3 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 188, Parent ID = 185 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -5.4 mm -1.65 mm -2.41 m 328 keV 0 eV 0 fm 0 fm Target initStep + 1 -5.4 mm -1.65 mm -2.41 m 0 eV 328 keV 170 um 170 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 184, Parent ID = 182 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -6.31 mm -1.59 mm -2.41 m 367 keV 0 eV 0 fm 0 fm Target initStep + 1 -8.63 mm -1.04 mm -2.41 m 0 eV 88 keV 3.04 mm 3.04 mm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 190, Parent ID = 184 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -8.63 mm -1.04 mm -2.41 m 279 keV 0 eV 0 fm 0 fm Target initStep + 1 -8.63 mm -1.03 mm -2.41 m 0 eV 279 keV 135 um 135 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 183, Parent ID = 182 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -6.43 mm -1.87 mm -2.41 m 444 keV 0 eV 0 fm 0 fm Target initStep + 1 -6.79 mm 503 um -2.41 m 352 keV 0 eV 5.24 mm 5.24 mm Target compt + 2 -6.75 mm 576 um -2.41 m 0 eV 88 keV 95.9 um 5.33 mm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 192, Parent ID = 183 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -6.75 mm 576 um -2.41 m 264 keV 0 eV 0 fm 0 fm Target initStep + 1 -6.75 mm 575 um -2.41 m 0 eV 264 keV 124 um 124 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 191, Parent ID = 183 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -6.79 mm 503 um -2.41 m 91.5 keV 0 eV 0 fm 0 fm Target initStep + 1 -6.79 mm 502 um -2.41 m 0 eV 91.5 keV 24.1 um 24.1 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 181, Parent ID = 175 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -6.52 mm -2.08 mm -2.42 m 10.7 MeV 0 eV 0 fm 0 fm Target initStep + 1 -6.55 mm -2.22 mm -2.42 m 8.96 MeV 418 keV 369 um 369 um Target eBrem + 2 -6.66 mm -2.27 mm -2.41 m 5.5 MeV 1.09 MeV 345 um 714 um Target eBrem + 3 -6.75 mm -2.29 mm -2.41 m 4.88 MeV 169 keV 134 um 848 um Target eBrem + 4 -6.53 mm -2.67 mm -2.41 m 3.63 MeV 855 keV 841 um 1.69 mm Target eBrem + 5 -5.98 mm -2.63 mm -2.41 m 1.57 MeV 1.28 MeV 998 um 2.69 mm Target eBrem + 6 -5.78 mm -2.55 mm -2.41 m 289 keV 1.28 MeV 1.18 mm 3.87 mm Target eIoni + 7 -5.79 mm -2.55 mm -2.41 m 0 eV 289 keV 141 um 4.01 mm Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 197, Parent ID = 181 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -5.98 mm -2.63 mm -2.41 m 786 keV 0 eV 0 fm 0 fm Target initStep + 1 -4.81 mm -293 um -2.41 m 532 keV 0 eV 2.72 mm 2.72 mm Target compt + 2 -3.08 mm 8.24 mm -2.42 m 0 eV 88 keV 9.82 mm 1.25 cm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 199, Parent ID = 197 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -3.08 mm 8.24 mm -2.42 m 444 keV 0 eV 0 fm 0 fm Target initStep + 1 -3.08 mm 8.25 mm -2.42 m 0 eV 444 keV 259 um 259 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 198, Parent ID = 197 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -4.81 mm -293 um -2.41 m 254 keV 0 eV 0 fm 0 fm Target initStep + 1 -4.81 mm -290 um -2.41 m 0 eV 254 keV 117 um 117 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 196, Parent ID = 181 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -6.53 mm -2.67 mm -2.41 m 386 keV 0 eV 0 fm 0 fm Target initStep + 1 -5.25 mm 58.3 um -2.41 m 0 eV 88 keV 5.69 mm 5.69 mm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 200, Parent ID = 196 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -5.25 mm 58.3 um -2.41 m 298 keV 0 eV 0 fm 0 fm Target initStep + 1 -5.25 mm 67.3 um -2.41 m 0 eV 298 keV 148 um 148 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 195, Parent ID = 181 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -6.75 mm -2.29 mm -2.41 m 451 keV 0 eV 0 fm 0 fm Target initStep + 1 -1.09 cm -9.4 mm -2.41 m 185 keV 0 eV 1.09 cm 1.09 cm Target compt + 2 -8.74 mm -9.79 mm -2.41 m 0 eV 88 keV 3.01 mm 1.4 cm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 202, Parent ID = 195 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -8.74 mm -9.79 mm -2.41 m 96.5 keV 0 eV 0 fm 0 fm Target initStep + 1 -8.74 mm -9.79 mm -2.41 m 0 eV 96.5 keV 26.1 um 26.1 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 201, Parent ID = 195 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -1.09 cm -9.4 mm -2.41 m 267 keV 0 eV 0 fm 0 fm Target initStep + 1 -1.09 cm -9.41 mm -2.41 m 0 eV 267 keV 126 um 126 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 194, Parent ID = 181 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -6.66 mm -2.27 mm -2.41 m 2.38 MeV 0 eV 0 fm 0 fm Target initStep + 1 -1 cm -3.16 mm -2.41 m 1.23 MeV 0 eV 6.88 mm 6.88 mm Target compt + 2 -1.07 cm -918 um -2.4 m 0 eV 88 keV 5.99 mm 1.29 cm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 204, Parent ID = 194 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -1.07 cm -918 um -2.4 m 1.14 MeV 0 eV 0 fm 0 fm Target initStep + 1 -1.07 cm -895 um -2.4 m 0 eV 1.14 MeV 847 um 847 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 203, Parent ID = 194 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -1 cm -3.16 mm -2.41 m 1.15 MeV 0 eV 0 fm 0 fm Target initStep + 1 -1.01 cm -3.19 mm -2.41 m 0 eV 1.15 MeV 851 um 851 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 193, Parent ID = 181 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -6.55 mm -2.22 mm -2.42 m 1.28 MeV 0 eV 0 fm 0 fm Target initStep + 1 -8.22 mm -6.38 mm -2.41 m 498 keV 0 eV 1.04 cm 1.04 cm Target compt + 2 -8.7 mm -6.6 mm -2.41 m 0 eV 88 keV 531 um 1.1 cm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 206, Parent ID = 193 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -8.7 mm -6.6 mm -2.41 m 410 keV 0 eV 0 fm 0 fm Target initStep + 1 -8.69 mm -6.59 mm -2.41 m 0 eV 410 keV 232 um 232 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 205, Parent ID = 193 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -8.22 mm -6.38 mm -2.41 m 781 keV 0 eV 0 fm 0 fm Target initStep + 1 -8.21 mm -6.39 mm -2.41 m 0 eV 781 keV 539 um 539 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 174, Parent ID = 160 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -2.33 mm 198 um -2.43 m 2.28 MeV 0 eV 0 fm 0 fm Target initStep + 1 -3.97 mm -743 um -2.42 m 0 eV 88 keV 3.98 mm 3.98 mm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 207, Parent ID = 174 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -3.97 mm -743 um -2.42 m 2.19 MeV 0 eV 0 fm 0 fm Target initStep + 1 -3.72 mm -708 um -2.42 m 27 keV 2.16 MeV 1.48 mm 1.48 mm Target eIoni + 2 -3.72 mm -708 um -2.42 m 0 eV 27 keV 3.3 um 1.48 mm Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 173, Parent ID = 160 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -2.2 mm 248 um -2.43 m 438 keV 0 eV 0 fm 0 fm Target initStep + 1 -2.88 mm -161 um -2.42 m 0 eV 88 keV 1.83 mm 1.83 mm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 208, Parent ID = 173 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -2.88 mm -161 um -2.42 m 350 keV 0 eV 0 fm 0 fm Target initStep + 1 -2.89 mm -152 um -2.42 m 0 eV 350 keV 187 um 187 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 172, Parent ID = 160 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -1.49 mm 390 um -2.43 m 824 keV 0 eV 0 fm 0 fm Target initStep + 1 -2.16 mm 406 um -2.42 m 0 eV 88 keV 3.39 mm 3.39 mm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 209, Parent ID = 172 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -2.16 mm 406 um -2.42 m 736 keV 0 eV 0 fm 0 fm Target initStep + 1 -2.18 mm 407 um -2.42 m 0 eV 736 keV 501 um 501 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 158, Parent ID = 130 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -1.22 mm 539 um -2.43 m 5.19 MeV 0 eV 0 fm 0 fm Target initStep + 1 -2.99 mm 1.2 mm -2.42 m 0 eV 0 eV 1.39 cm 1.39 cm Target conv + +********************************************************************************************************* +* G4Track Information: Particle = e+, Track ID = 211, Parent ID = 158 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -2.99 mm 1.2 mm -2.42 m 3.34 MeV 0 eV 0 fm 0 fm Target initStep + 1 -3.05 mm 1.22 mm -2.42 m 0 eV 3.34 MeV 1.84 mm 1.84 mm Target eIoni + 2 -3.05 mm 1.22 mm -2.42 m 0 eV 0 eV 0 fm 1.84 mm Target annihil + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 213, Parent ID = 211 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -3.05 mm 1.22 mm -2.42 m 511 keV 0 eV 0 fm 0 fm Target initStep + 1 -6.47 mm 5.69 mm -2.42 m 226 keV 0 eV 5.73 mm 5.73 mm Target compt + 2 -6.13 mm 5.82 mm -2.42 m 0 eV 88 keV 358 um 6.09 mm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 215, Parent ID = 213 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -6.13 mm 5.82 mm -2.42 m 138 keV 0 eV 0 fm 0 fm Target initStep + 1 -6.13 mm 5.82 mm -2.42 m 0 eV 138 keV 46.1 um 46.1 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 214, Parent ID = 213 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -6.47 mm 5.69 mm -2.42 m 285 keV 0 eV 0 fm 0 fm Target initStep + 1 -6.47 mm 5.7 mm -2.42 m 0 eV 285 keV 139 um 139 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 212, Parent ID = 211 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -3.05 mm 1.22 mm -2.42 m 511 keV 0 eV 0 fm 0 fm Target initStep + 1 2.48 mm -6.02 mm -2.42 m 0 eV 88 keV 9.26 mm 9.26 mm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 216, Parent ID = 212 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 2.48 mm -6.02 mm -2.42 m 423 keV 0 eV 0 fm 0 fm Target initStep + 1 2.49 mm -6.04 mm -2.42 m 0 eV 423 keV 242 um 242 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 210, Parent ID = 158 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -2.99 mm 1.2 mm -2.42 m 831 keV 0 eV 0 fm 0 fm Target initStep + 1 -2.99 mm 1.2 mm -2.42 m 0 eV 831 keV 581 um 581 um Target eIoni ********************************************************************************************************* * G4Track Information: Particle = gamma, Track ID = 4, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 227 um -409 um -2.45 m 451 keV 0 eV 0 fm 0 fm Target initStep - 1 366 um -360 um -2.44 m 227 keV 0 eV 4.51 mm 4.51 mm Target compt - 2 5.55 mm -591 um -2.45 m 0 eV 88 keV 5.24 mm 9.75 mm Target phot + 0 -228 um 250 um -2.45 m 494 keV 0 eV 0 fm 0 fm Target initStep + 1 -212 um 219 um -2.45 m 0 eV 88 keV 3.12 mm 3.12 mm Target phot ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 258, Parent ID = 4 +* G4Track Information: Particle = e-, Track ID = 217, Parent ID = 4 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 5.55 mm -591 um -2.45 m 139 keV 0 eV 0 fm 0 fm Target initStep - 1 5.55 mm -591 um -2.45 m 0 eV 139 keV 46.9 um 46.9 um Target eIoni + 0 -212 um 219 um -2.45 m 406 keV 0 eV 0 fm 0 fm Target initStep + 1 -219 um 218 um -2.45 m 0 eV 406 keV 229 um 229 um Target eIoni ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 257, Parent ID = 4 +* G4Track Information: Particle = gamma, Track ID = 3, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 366 um -360 um -2.44 m 223 keV 0 eV 0 fm 0 fm Target initStep - 1 364 um -360 um -2.44 m 0 eV 223 keV 97 um 97 um Target eIoni + 0 -232 um 242 um -2.45 m 7.6 MeV 0 eV 0 fm 0 fm Target initStep + 1 -229 um 239 um -2.45 m 0 eV 0 eV 619 um 619 um Target conv ********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +* G4Track Information: Particle = e+, Track ID = 219, Parent ID = 3 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -206 um -180 um -2.65 m 9.3 keV 0 eV 0 fm 0 fm World initStep - 1 -272 um -195 um -2.65 m 9.01 keV 288 eV 67.8 um 67.8 um World msc - 2 -915 um -403 um -2.65 m 2.21 keV 6.8 keV 1.56 mm 1.63 mm World eIoni - 3 -970 um -357 um -2.65 m 0 eV 2.21 keV 183 um 1.81 mm World eIoni + 0 -229 um 239 um -2.45 m 3.89 MeV 0 eV 0 fm 0 fm Target initStep + 1 -320 um 484 um -2.45 m 3.32 MeV 574 keV 578 um 578 um Target msc + 2 -652 um 721 um -2.45 m 2.74 MeV 580 keV 578 um 1.16 mm Target msc + 3 -915 um 829 um -2.45 m 0 eV 2.74 MeV 1.68 mm 2.83 mm Target eIoni + 4 -915 um 829 um -2.45 m 0 eV 0 eV 0 fm 2.83 mm Target annihil + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 221, Parent ID = 219 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -915 um 829 um -2.45 m 511 keV 0 eV 0 fm 0 fm Target initStep + 1 281 um 132 um -2.45 m 471 keV 0 eV 1.4 mm 1.4 mm Target compt + 2 2.52 mm -2.78 mm -2.45 m 179 keV 0 eV 3.89 mm 5.29 mm Target compt + 3 2.42 mm -2.07 mm -2.45 m 0 eV 88 keV 722 um 6.01 mm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 224, Parent ID = 221 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 2.42 mm -2.07 mm -2.45 m 90.7 keV 0 eV 0 fm 0 fm Target initStep + 1 2.42 mm -2.08 mm -2.45 m 0 eV 90.7 keV 23.7 um 23.7 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 223, Parent ID = 221 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 2.52 mm -2.78 mm -2.45 m 292 keV 0 eV 0 fm 0 fm Target initStep + 1 2.52 mm -2.79 mm -2.45 m 0 eV 292 keV 144 um 144 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 222, Parent ID = 221 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 281 um 132 um -2.45 m 40 keV 0 eV 0 fm 0 fm Target initStep + 1 282 um 132 um -2.45 m 0 eV 40 keV 6.21 um 6.21 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 220, Parent ID = 219 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -915 um 829 um -2.45 m 511 keV 0 eV 0 fm 0 fm Target initStep + 1 -4.46 mm 2.89 mm -2.45 m 0 eV 88 keV 4.15 mm 4.15 mm Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 225, Parent ID = 220 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -4.46 mm 2.89 mm -2.45 m 423 keV 0 eV 0 fm 0 fm Target initStep + 1 -4.47 mm 2.9 mm -2.45 m 0 eV 423 keV 242 um 242 um Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 218, Parent ID = 3 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -229 um 239 um -2.45 m 2.68 MeV 0 eV 0 fm 0 fm Target initStep + 1 -5.46 um 381 um -2.45 m 2.2 MeV 489 keV 493 um 493 um Target msc + 2 -88.4 um 462 um -2.45 m 1.44 MeV 294 keV 201 um 694 um Target eBrem + 3 -200 um 432 um -2.45 m 137 keV 1.31 MeV 1.09 mm 1.79 mm Target eIoni + 4 -200 um 435 um -2.45 m 0 eV 137 keV 45.6 um 1.83 mm Target eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 226, Parent ID = 218 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -88.4 um 462 um -2.45 m 459 keV 0 eV 0 fm 0 fm Target initStep + 1 -708 um 883 um -2.45 m 0 eV 88 keV 756 um 756 um Target phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 227, Parent ID = 226 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -708 um 883 um -2.45 m 371 keV 0 eV 0 fm 0 fm Target initStep + 1 -714 um 892 um -2.45 m 0 eV 371 keV 202 um 202 um Target eIoni ********************************************************************************************************* * G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -30.5 um 6.38 um -2.86 m 10.3 keV 0 eV 0 fm 0 fm World initStep - 1 12.5 um 74.8 um -2.86 m 10.3 keV 8.14 eV 82.6 um 82.6 um World msc - 2 976 um -134 um -2.86 m 4.21 keV 6.05 keV 1.73 mm 1.82 mm World eIoni - 3 1.04 mm -107 um -2.86 m 0 eV 4.21 keV 516 um 2.33 mm World eIoni + 0 -31.1 um 1.2 um -2.86 m 11 keV 0 eV 0 fm 0 fm World initStep + 1 -16.9 um -105 um -2.86 m 11 keV 19.7 eV 112 um 112 um World msc + 2 270 um -1.31 mm -2.86 m 5.12 keV 5.89 keV 1.84 mm 1.95 mm World eIoni + 3 588 um -1.27 mm -2.86 m 0 eV 5.12 keV 715 um 2.67 mm World eIoni >>> Event 0 0 trajectories stored in this event. ### Run 1 start. @@ -2528,352 +2280,176 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process 0 0 fm 0 fm -2.91 m 1 TeV 0 eV 0 fm 0 fm World initStep - 1 0 fm 0 fm -2.45 m 1e+03 GeV 124 keV 46 cm 46 cm World Transportation - 2 -249 nm 45.9 nm -2.44 m 1e+03 GeV 20.7 MeV 1.43 cm 47.4 cm Target msc - 3 -32.8 nm 291 nm -2.42 m 1e+03 GeV 23.7 MeV 1.43 cm 48.9 cm Target msc - 4 -21.6 nm 481 nm -2.41 m 1e+03 GeV 12.8 MeV 9.24 mm 49.8 cm Target muIoni - 5 -219 nm 358 nm -2.4 m 1e+03 GeV 19 MeV 1.22 cm 51 cm Target Transportation - 6 -7.87 um -818 nm -2.17 m 1e+03 GeV 51.1 keV 22.9 cm 73.9 cm Tracker msc - 7 -15.5 um -1.99 um -1.94 m 1e+03 GeV 52.2 keV 22.9 cm 96.7 cm Tracker msc - 8 -23.2 um -3.12 um -1.71 m 1e+03 GeV 52 keV 22.9 cm 1.2 m Tracker msc - 9 -27 um -3.64 um -1.6 m 1e+03 GeV 25.1 keV 11.4 cm 1.31 m Tracker Transportation - 10 -29 um -3.88 um -1.54 m 1e+03 GeV 51 keV 5.71 cm 1.37 m Chamber msc - 11 -31 um -4.19 um -1.49 m 1e+03 GeV 50.3 keV 5.71 cm 1.42 m Chamber msc - 12 -33 um -4.5 um -1.43 m 1e+03 GeV 34.4 keV 5.71 cm 1.48 m Chamber msc - 13 -34 um -4.67 um -1.4 m 1e+03 GeV 21.6 keV 2.86 cm 1.51 m Chamber Transportation - 14 -40.1 um -5.71 um -1.23 m 1e+03 GeV 41.2 keV 17.1 cm 1.68 m Tracker msc - 15 -46.1 um -6.72 um -1.06 m 1e+03 GeV 39.1 keV 17.1 cm 1.85 m Tracker msc - 16 -52.1 um -7.8 um -88.6 cm 1e+03 GeV 36.8 keV 17.1 cm 2.02 m Tracker msc - 17 -55.1 um -8.34 um -80 cm 1e+03 GeV 17.3 keV 8.57 cm 2.11 m Tracker Transportation - 18 -57.2 um -8.71 um -74.3 cm 1e+03 GeV 43.2 keV 5.71 cm 2.17 m Chamber msc - 19 -59.2 um -9.1 um -68.6 cm 1e+03 GeV 46.3 keV 5.71 cm 2.22 m Chamber msc - 20 -61.2 um -9.52 um -62.9 cm 1e+03 GeV 57.4 keV 5.71 cm 2.28 m Chamber msc - 21 -62.2 um -9.69 um -60 cm 1e+03 GeV 20.5 keV 2.86 cm 2.31 m Chamber Transportation - 22 -68.3 um -10.7 um -42.9 cm 1e+03 GeV 35.6 keV 17.1 cm 2.48 m Tracker msc - 23 -72.7 um -11.5 um -30.1 cm 1e+03 GeV 23.7 keV 12.7 cm 2.61 m Tracker muIoni - 24 -78.7 um -12.4 um -13 cm 1e+03 GeV 40.3 keV 17.1 cm 2.78 m Tracker msc - 25 -80.3 um -12.7 um -8.19 cm 1e+03 GeV 14 keV 4.81 cm 2.83 m Tracker muIoni - 26 -81.1 um -12.8 um -5.88 cm 1e+03 GeV 5.49 keV 2.31 cm 2.85 m Tracker muIoni - 27 -83.2 um -13.2 um 0.0142 fm 1e+03 GeV 11.5 keV 5.88 cm 2.91 m Tracker Transportation - 28 -85.2 um -13.5 um 5.71 cm 1e+03 GeV 35.1 keV 5.71 cm 2.97 m Chamber msc - 29 -87.3 um -13.8 um 11.4 cm 1e+03 GeV 48.8 keV 5.71 cm 3.02 m Chamber msc - 30 -89.3 um -14.1 um 17.1 cm 1e+03 GeV 33.6 keV 5.71 cm 3.08 m Chamber msc - 31 -90.3 um -14.2 um 20 cm 1e+03 GeV 36 keV 2.86 cm 3.11 m Chamber Transportation - 32 -96.1 um -15 um 37.1 cm 1e+03 GeV 40.9 keV 17.1 cm 3.28 m Tracker msc - 33 -102 um -15.8 um 54.3 cm 1e+03 GeV 45.7 keV 17.1 cm 3.45 m Tracker msc - 34 -106 um -16.3 um 67.3 cm 1e+03 GeV 26.5 keV 13 cm 3.58 m Tracker muIoni - 35 -111 um -16.8 um 80 cm 1e+03 GeV 31.2 keV 12.7 cm 3.71 m Tracker Transportation - 36 -113 um -17 um 85.7 cm 1e+03 GeV 43.4 keV 5.71 cm 3.77 m Chamber msc - 37 -115 um -17.2 um 91.4 cm 1e+03 GeV 40.4 keV 5.71 cm 3.82 m Chamber msc - 38 -117 um -17.4 um 97.1 cm 1e+03 GeV 33.4 keV 5.71 cm 3.88 m Chamber msc - 39 -118 um -17.4 um 1 m 1e+03 GeV 25.4 keV 2.86 cm 3.91 m Chamber Transportation - 40 -124 um -17.9 um 1.17 m 1e+03 GeV 43.6 keV 17.1 cm 4.08 m Tracker msc - 41 -130 um -18.3 um 1.34 m 1e+03 GeV 39.4 keV 17.1 cm 4.25 m Tracker msc - 42 -137 um -18.8 um 1.51 m 1e+03 GeV 38.5 keV 17.1 cm 4.42 m Tracker msc - 43 -140 um -19 um 1.6 m 1e+03 GeV 19.4 keV 8.57 cm 4.51 m Tracker Transportation - 44 -142 um -19.1 um 1.66 m 1e+03 GeV 55.2 keV 5.71 cm 4.57 m Chamber msc - 45 -144 um -19.2 um 1.71 m 1e+03 GeV 68.3 keV 5.71 cm 4.62 m Chamber msc - 46 -146 um -19.2 um 1.77 m 1e+03 GeV 52.3 keV 5.71 cm 4.68 m Chamber msc - 47 -146 um -19.3 um 1.8 m 1e+03 GeV 20.4 keV 2.86 cm 4.71 m Chamber Transportation - 48 -152 um -19.4 um 1.97 m 1e+03 GeV 37.9 keV 17.1 cm 4.88 m Tracker msc - 49 -158 um -19.6 um 2.14 m 1e+03 GeV 43.6 keV 17.1 cm 5.05 m Tracker msc - 50 -161 um -19.7 um 2.23 m 1e+03 GeV 22.5 keV 8.3 cm 5.14 m Tracker muIoni - 51 -166 um -19.8 um 2.4 m 1e+03 GeV 38.3 keV 17.1 cm 5.31 m Tracker msc - 52 -166 um -19.8 um 2.4 m 1e+03 GeV 1.02 keV 2.78 mm 5.31 m Tracker Transportation - 53 -178 um -20.1 um 2.77 m 1e+03 GeV 79.2 keV 37 cm 5.68 m World muIoni - 54 -183 um -20.2 um 2.91 m 1e+03 GeV 38.1 keV 14 cm 5.82 m OutOfWorld Transportation + 1 106 nm 18.3 nm -2.59 m 1e+03 GeV 84 keV 32 cm 32 cm World muIoni + 2 97.1 nm 24 nm -2.45 m 1e+03 GeV 30.5 keV 14 cm 46 cm World Transportation + 3 -446 nm 287 nm -2.42 m 1e+03 GeV 53.8 MeV 2.58 cm 48.6 cm Target msc + 4 -526 nm 72.1 nm -2.4 m 1e+03 GeV 37.5 MeV 2.42 cm 51 cm Target Transportation + 5 -6.04 um -47.1 nm -2.21 m 1e+03 GeV 46.2 keV 18.5 cm 69.5 cm Tracker msc + 6 -7.4 um -87.1 nm -2.17 m 1e+03 GeV 8.19 keV 4.53 cm 74.1 cm Tracker muIoni + 7 -13 um -183 nm -1.98 m 1e+03 GeV 53.8 keV 18.5 cm 92.6 cm Tracker msc + 8 -18.7 um -325 nm -1.8 m 1e+03 GeV 47.9 keV 18.5 cm 1.11 m Tracker msc + 9 -22.7 um -447 nm -1.67 m 1e+03 GeV 25.6 keV 13.1 cm 1.24 m Tracker muIoni + 10 -24.8 um -507 nm -1.6 m 1e+03 GeV 15.7 keV 6.82 cm 1.31 m Tracker Transportation + 11 -26.4 um -513 nm -1.55 m 1e+03 GeV 30.6 keV 5.01 cm 1.36 m Chamber msc + 12 -27.9 um -556 nm -1.5 m 1e+03 GeV 46.8 keV 5.01 cm 1.41 m Chamber msc + 13 -29.3 um -593 nm -1.45 m 1e+03 GeV 36.6 keV 5.01 cm 1.46 m Chamber msc + 14 -30.9 um -540 nm -1.4 m 1e+03 GeV 34.4 keV 4.97 cm 1.51 m Chamber Transportation + 15 -31.5 um -524 nm -1.38 m 1e+03 GeV 3.36 keV 2.22 cm 1.53 m Tracker muIoni + 16 -40.3 um -354 nm -1.1 m 1e+03 GeV 66.8 keV 28.2 cm 1.81 m Tracker msc + 17 -45.8 um -300 nm -91.8 cm 1e+03 GeV 36.5 keV 17.7 cm 1.99 m Tracker muIoni + 18 -49.5 um -286 nm -80 cm 1e+03 GeV 34.4 keV 11.8 cm 2.11 m Tracker Transportation + 19 -51.4 um -303 nm -74.2 cm 1e+03 GeV 38.2 keV 5.84 cm 2.17 m Chamber msc + 20 -53.2 um -345 nm -68.3 cm 1e+03 GeV 52.4 keV 5.84 cm 2.23 m Chamber msc + 21 -55 um -404 nm -62.5 cm 1e+03 GeV 47.6 keV 5.84 cm 2.29 m Chamber msc + 22 -55.7 um -441 nm -60 cm 1e+03 GeV 14.9 keV 2.49 cm 2.31 m Chamber Transportation + 23 -60.8 um -837 nm -42.1 cm 1e+03 GeV 37.7 keV 17.9 cm 2.49 m Tracker msc + 24 -65.8 um -1.19 um -24.1 cm 1e+03 GeV 45.8 keV 17.9 cm 2.67 m Tracker msc + 25 -69.8 um -1.46 um -9.72 cm 1e+03 GeV 38.3 keV 14.4 cm 2.81 m Tracker muIoni + 26 -72.6 um -1.65 um 0 fm 1e+03 GeV 20.2 keV 9.72 cm 2.91 m Tracker Transportation + 27 -74.2 um -1.78 um 5.7 cm 1e+03 GeV 41.7 keV 5.7 cm 2.97 m Chamber msc + 28 -75.8 um -1.96 um 11.4 cm 1e+03 GeV 83.5 keV 5.7 cm 3.02 m Chamber msc + 29 -77.3 um -2.13 um 17.1 cm 1e+03 GeV 36.3 keV 5.7 cm 3.08 m Chamber msc + 30 -78.1 um -2.22 um 20 cm 1e+03 GeV 24.5 keV 2.9 cm 3.11 m Chamber Transportation + 31 -81.7 um -2.68 um 33.5 cm 1e+03 GeV 30.8 keV 13.5 cm 3.25 m Tracker msc + 32 -85.3 um -3.12 um 47.1 cm 1e+03 GeV 35.6 keV 13.5 cm 3.38 m Tracker msc + 33 -88.8 um -3.56 um 60.6 cm 1e+03 GeV 32.1 keV 13.5 cm 3.52 m Tracker msc + 34 -90.8 um -3.81 um 68.2 cm 1e+03 GeV 18.4 keV 7.54 cm 3.59 m Tracker muIoni + 35 -94 um -4.23 um 80 cm 1e+03 GeV 32.6 keV 11.8 cm 3.71 m Tracker Transportation + 36 -96.2 um -4.52 um 88.3 cm 1e+03 GeV 76.4 keV 8.31 cm 3.79 m Chamber msc + 37 -98.4 um -4.86 um 96.6 cm 1e+03 GeV 59.3 keV 8.31 cm 3.88 m Chamber msc + 38 -99.3 um -5.02 um 1 m 1e+03 GeV 27.9 keV 3.38 cm 3.91 m Chamber Transportation + 39 -103 um -5.67 um 1.16 m 1e+03 GeV 35.9 keV 15.7 cm 4.07 m Tracker msc + 40 -107 um -6.39 um 1.31 m 1e+03 GeV 36.8 keV 15.7 cm 4.22 m Tracker msc + 41 -111 um -7.09 um 1.47 m 1e+03 GeV 32.6 keV 15.2 cm 4.38 m Tracker muIoni + 42 -115 um -7.71 um 1.6 m 1e+03 GeV 22.7 keV 13.5 cm 4.51 m Tracker Transportation + 43 -118 um -8.33 um 1.71 m 1e+03 GeV 92.9 keV 11.2 cm 4.62 m Chamber msc + 44 -120 um -8.82 um 1.8 m 1e+03 GeV 63.1 keV 8.81 cm 4.71 m Chamber Transportation + 45 -127 um -10.4 um 2.12 m 1e+03 GeV 72.2 keV 31.9 cm 5.03 m Tracker msc + 46 -128 um -10.6 um 2.15 m 1e+03 GeV 7.68 keV 3.18 cm 5.06 m Tracker muIoni + 47 -134 um -11.7 um 2.4 m 1e+03 GeV 52.9 keV 24.9 cm 5.31 m Tracker Transportation + 48 -141 um -12.9 um 2.67 m 1e+03 GeV 56.2 keV 27.3 cm 5.58 m World muIoni + 49 -147 um -14.1 um 2.91 m 1e+03 GeV 52.2 keV 23.7 cm 5.82 m OutOfWorld Transportation + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 11, Parent ID = 1 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -141 um -12.9 um 2.67 m 16.6 keV 0 eV 0 fm 0 fm World initStep + 1 4.96 um -6.31 um 2.67 m 16.5 keV 128 eV 147 um 147 um World msc + 2 1.89 mm 747 um 2.67 m 12.8 keV 3.66 keV 2.54 mm 2.69 mm World eIoni + 3 2.69 mm 169 um 2.68 m 9.02 keV 3.8 keV 2.07 mm 4.76 mm World eIoni + 4 3.79 mm 227 um 2.68 m 5.58 keV 3.44 keV 1.56 mm 6.32 mm World eIoni + 5 3.97 mm 322 um 2.68 m 0 eV 5.58 keV 834 um 7.15 mm World eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 10, Parent ID = 1 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -128 um -10.6 um 2.15 m 11 keV 0 eV 0 fm 0 fm Tracker initStep + 1 -778 um 823 um 2.15 m 6.01 keV 5.03 keV 1.84 mm 1.84 mm Tracker eIoni + 2 -606 um 1.17 mm 2.15 m 0 eV 6.01 keV 942 um 2.79 mm Tracker eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 9, Parent ID = 1 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 -111 um -7.09 um 1.47 m 13.6 keV 0 eV 0 fm 0 fm Tracker initStep + 1 -666 um -1.54 mm 1.47 m 9.48 keV 4.1 keV 2.17 mm 2.17 mm Tracker eIoni + 2 -262 um -2.27 mm 1.47 m 2.75 keV 6.73 keV 1.63 mm 3.8 mm Tracker eIoni + 3 -154 um -2.25 mm 1.47 m 0 eV 2.75 keV 258 um 4.05 mm Tracker eIoni ********************************************************************************************************* * G4Track Information: Particle = e-, Track ID = 8, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -178 um -20.1 um 2.77 m 9.76 keV 0 eV 0 fm 0 fm World initStep - 1 -253 um -14.3 um 2.77 m 9.66 keV 105 eV 75.2 um 75.2 um World msc - 2 -1.27 mm 468 um 2.77 m 6.26 keV 3.39 keV 1.65 mm 1.73 mm World eIoni - 3 -1.76 mm 326 um 2.77 m 822 eV 5.44 keV 1.01 mm 2.73 mm World eIoni - 4 -1.78 mm 318 um 2.77 m 0 eV 822 eV 45.2 um 2.78 mm World eIoni + 0 -90.8 um -3.81 um 68.2 cm 18.5 keV 0 eV 0 fm 0 fm Tracker initStep + 1 -2.24 mm 871 um 68.1 cm 13 keV 5.52 keV 2.81 mm 2.81 mm Tracker eIoni + 2 -3.18 mm 511 um 67.9 cm 7.79 keV 5.17 keV 2.09 mm 4.9 mm Tracker eIoni + 3 -3.79 mm 228 um 68 cm 0 eV 7.79 keV 1.35 mm 6.25 mm Tracker eIoni ********************************************************************************************************* * G4Track Information: Particle = e-, Track ID = 7, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -161 um -19.7 um 2.23 m 15.1 keV 0 eV 0 fm 0 fm Tracker initStep - 1 -1.6 mm -571 um 2.23 m 7.51 keV 7.54 keV 2.35 mm 2.35 mm Tracker eIoni - 2 -2.32 mm -324 um 2.22 m 1.76 keV 5.76 keV 1.3 mm 3.65 mm Tracker eIoni - 3 -2.32 mm -326 um 2.22 m 0 eV 1.76 keV 129 um 3.78 mm Tracker eIoni + 0 -69.8 um -1.46 um -9.72 cm 16.7 keV 0 eV 0 fm 0 fm Tracker initStep + 1 -1.25 mm -1.69 mm -9.62 cm 12.8 keV 3.93 keV 2.57 mm 2.57 mm Tracker eIoni + 2 -1.01 mm -2.95 mm -9.5 cm 6.15 keV 6.61 keV 2.06 mm 4.63 mm Tracker eIoni + 3 -1.27 mm -2.97 mm -9.47 cm 0 eV 6.15 keV 977 um 5.61 mm Tracker eIoni ********************************************************************************************************* * G4Track Information: Particle = e-, Track ID = 6, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -106 um -16.3 um 67.3 cm 86.3 keV 0 eV 0 fm 0 fm Tracker initStep - 1 -955 um -1.7 cm 68.6 cm 74.3 keV 12 keV 2.28 cm 2.28 cm Tracker eIoni - 2 1.23 mm -3.21 cm 68.6 cm 66.6 keV 7.76 keV 1.79 cm 4.07 cm Tracker eIoni - 3 -2.26 mm -4.59 cm 68.9 cm 56.9 keV 9.64 keV 1.5 cm 5.56 cm Tracker eIoni - 4 -9.11 mm -5.2 cm 68.4 cm 50.8 keV 6.09 keV 1.17 cm 6.73 cm Tracker eIoni - 5 -1.02 cm -5.98 cm 67.9 cm 43.7 keV 7.13 keV 9.78 mm 7.71 cm Tracker eIoni - 6 -1.37 cm -5.87 cm 67.2 cm 37 keV 6.66 keV 7.86 mm 8.5 cm Tracker eIoni - 7 -1.46 cm -5.8 cm 66.6 cm 30.6 keV 6.38 keV 6.22 mm 9.12 cm Tracker eIoni - 8 -1.16 cm -5.51 cm 66.4 cm 22.2 keV 8.42 keV 4.85 mm 9.6 cm Tracker eIoni - 9 -1.05 cm -5.62 cm 66.6 cm 11.2 keV 11.1 keV 3.37 mm 9.94 cm Tracker eIoni - 10 -1.08 cm -5.76 cm 66.7 cm 7.11 keV 4.06 keV 1.86 mm 10.1 cm Tracker eIoni - 11 -1.08 cm -5.8 cm 66.7 cm 0 eV 7.11 keV 1.22 mm 10.2 cm Tracker eIoni + 0 -45.8 um -300 nm -91.8 cm 18.3 keV 0 eV 0 fm 0 fm Tracker initStep + 1 2.35 mm 486 um -91.9 cm 14.9 keV 3.43 keV 2.79 mm 2.79 mm Tracker eIoni + 2 4.01 mm -191 um -92 cm 11.3 keV 3.58 keV 2.33 mm 5.13 mm Tracker eIoni + 3 4.92 mm -1.21 mm -92 cm 7.09 keV 4.22 keV 1.88 mm 7.01 mm Tracker eIoni + 4 5.02 mm -1.65 mm -92 cm 563 eV 6.52 keV 1.21 mm 8.22 mm Tracker eIoni + 5 5.02 mm -1.65 mm -92 cm 0 eV 563 eV 29.4 um 8.25 mm Tracker eIoni ********************************************************************************************************* * G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -81.1 um -12.8 um -5.88 cm 10.7 keV 0 eV 0 fm 0 fm Tracker initStep - 1 -1.68 mm -402 um -5.89 cm 5.79 keV 4.88 keV 1.79 mm 1.79 mm Tracker eIoni - 2 -1.84 mm -447 um -5.91 cm 0 eV 5.79 keV 887 um 2.68 mm Tracker eIoni + 0 -31.5 um -524 nm -1.38 m 67.6 keV 0 eV 0 fm 0 fm Tracker initStep + 1 1.25 cm 3.56 mm -1.37 m 57.7 keV 9.81 keV 1.53 cm 1.53 cm Tracker eIoni + 2 1.5 cm 4.04 mm -1.37 m 46.3 keV 882 eV 2.73 mm 1.81 cm Tracker eIoni + 3 1.67 cm 7.24 mm -1.36 m 41.8 keV 4.41 keV 8.54 mm 2.66 cm Tracker eIoni + 4 1.71 cm 7.79 mm -1.36 m 34.7 keV 7.16 keV 7.38 mm 3.4 cm Tracker eIoni + 5 2 cm 6.38 mm -1.35 m 29.2 keV 5.52 keV 5.71 mm 3.97 cm Tracker eIoni + 6 2.21 cm 6.15 mm -1.35 m 22.9 keV 6.32 keV 4.58 mm 4.43 cm Tracker eIoni + 7 2.23 cm 3.02 mm -1.35 m 17.8 keV 5.08 keV 3.47 mm 4.77 cm Tracker eIoni + 8 2.22 cm 657 um -1.35 m 14.2 keV 3.54 keV 2.72 mm 5.04 cm Tracker eIoni + 9 2.33 cm 1.71 mm -1.35 m 8.46 keV 5.77 keV 2.25 mm 5.27 cm Tracker eIoni + 10 2.28 cm 2.36 mm -1.35 m 3.4 keV 5.07 keV 1.47 mm 5.42 cm Tracker eIoni + 11 2.27 cm 2.29 mm -1.35 m 0 eV 3.4 keV 363 um 5.45 cm Tracker eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 12, Parent ID = 5 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 1.5 cm 4.04 mm -1.37 m 10.6 keV 0 eV 0 fm 0 fm Tracker initStep + 1 1.6 cm 3.03 mm -1.37 m 6.49 keV 4.12 keV 1.78 mm 1.78 mm Tracker eIoni + 2 1.57 cm 2.46 mm -1.37 m 166 eV 6.32 keV 1.07 mm 2.85 mm Tracker eIoni + 3 1.57 cm 2.46 mm -1.37 m 0 eV 166 eV 11.9 um 2.87 mm Tracker eIoni ********************************************************************************************************* * G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -80.3 um -12.7 um -8.19 cm 34.9 keV 0 eV 0 fm 0 fm Tracker initStep - 1 2.95 mm 3.5 mm -8.16 cm 32 keV 2.95 keV 5.76 mm 5.76 mm Tracker eIoni - 2 5.77 mm 7.6 mm -8.04 cm 26.2 keV 5.8 keV 5.11 mm 1.09 cm Tracker eIoni - 3 4.95 mm 1.02 cm -7.76 cm 22.5 keV 3.71 keV 4.02 mm 1.49 cm Tracker eIoni - 4 7.69 mm 9.67 mm -7.67 cm 18.4 keV 4.09 keV 3.41 mm 1.83 cm Tracker eIoni - 5 9.97 mm 1.03 cm -7.64 cm 16 keV 2.44 keV 2.8 mm 2.11 cm Tracker eIoni - 6 1.15 cm 9.94 mm -7.48 cm 13.4 keV 2.57 keV 2.47 mm 2.36 cm Tracker eIoni - 7 1.08 cm 1.14 cm -7.37 cm 3.21 keV 10.2 keV 2.14 mm 2.57 cm Tracker eIoni - 8 1.07 cm 1.14 cm -7.36 cm 0 eV 3.21 keV 330 um 2.61 cm Tracker eIoni + 0 -22.7 um -447 nm -1.67 m 16.9 keV 0 eV 0 fm 0 fm Tracker initStep + 1 1.76 mm 642 um -1.67 m 14 keV 2.96 keV 2.6 mm 2.6 mm Tracker eIoni + 2 3.39 mm -66 um -1.67 m 7.36 keV 6.6 keV 2.22 mm 4.82 mm Tracker eIoni + 3 4.17 mm 298 um -1.67 m 1.17 keV 6.19 keV 1.27 mm 6.09 mm Tracker eIoni + 4 4.16 mm 312 um -1.67 m 0 eV 1.17 keV 71.8 um 6.16 mm Tracker eIoni ********************************************************************************************************* * G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -72.7 um -11.5 um -30.1 cm 11.5 keV 0 eV 0 fm 0 fm Tracker initStep - 1 -1.23 mm -1.07 mm -30.1 cm 7.3 keV 4.2 keV 1.9 mm 1.9 mm Tracker eIoni - 2 -1.41 mm -981 um -30 cm 0 eV 7.3 keV 1.26 mm 3.16 mm Tracker eIoni + 0 -7.4 um -87.1 nm -2.17 m 8.25 keV 0 eV 0 fm 0 fm Tracker initStep + 1 -37 um -672 um -2.17 m 3.9 keV 4.35 keV 1.43 mm 1.43 mm Tracker eIoni + 2 -134 um -842 um -2.17 m 0 eV 3.9 keV 454 um 1.88 mm Tracker eIoni ********************************************************************************************************* * G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -21.6 nm 481 nm -2.41 m 21.5 MeV 0 eV 0 fm 0 fm Target initStep - 1 -13.1 um 132 um -2.41 m 13.3 MeV 7.93 MeV 716 um 716 um Target eBrem - 2 -76.3 um 118 um -2.41 m 12.3 MeV 266 keV 225 um 941 um Target eBrem - 3 -97.3 um 243 um -2.41 m 6.79 MeV 1.27 MeV 747 um 1.69 mm Target eBrem - 4 -163 um 188 um -2.41 m 4.9 MeV 414 keV 352 um 2.04 mm Target eBrem - 5 -572 um 495 um -2.41 m 2.83 MeV 868 keV 792 um 2.83 mm Target eBrem - 6 -676 um 560 um -2.41 m 2.34 MeV 191 keV 186 um 3.02 mm Target eBrem - 7 -726 um 938 um -2.41 m 753 keV 1.58 MeV 1.54 mm 4.55 mm Target eIoni - 8 -680 um 977 um -2.41 m 213 keV 106 keV 87.8 um 4.64 mm Target eBrem - 9 -685 um 980 um -2.41 m 0 eV 213 keV 90.4 um 4.73 mm Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 15, Parent ID = 2 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -680 um 977 um -2.41 m 434 keV 0 eV 0 fm 0 fm Target initStep - 1 -9.83 mm 1.32 cm -2.41 m 166 keV 0 eV 1.53 cm 1.53 cm Target compt - 2 -9.75 mm 1.28 cm -2.41 m 0 eV 88 keV 363 um 1.57 cm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 17, Parent ID = 15 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -9.75 mm 1.28 cm -2.41 m 77.7 keV 0 eV 0 fm 0 fm Target initStep - 1 -9.75 mm 1.28 cm -2.41 m 0 eV 77.7 keV 18.4 um 18.4 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 16, Parent ID = 15 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -9.83 mm 1.32 cm -2.41 m 268 keV 0 eV 0 fm 0 fm Target initStep - 1 -9.83 mm 1.32 cm -2.41 m 0 eV 268 keV 127 um 127 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 14, Parent ID = 2 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -676 um 560 um -2.41 m 301 keV 0 eV 0 fm 0 fm Target initStep - 1 -901 um 569 um -2.41 m 0 eV 88 keV 356 um 356 um Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 18, Parent ID = 14 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -901 um 569 um -2.41 m 213 keV 0 eV 0 fm 0 fm Target initStep - 1 -901 um 569 um -2.41 m 0 eV 213 keV 90.3 um 90.3 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 13, Parent ID = 2 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -572 um 495 um -2.41 m 1.2 MeV 0 eV 0 fm 0 fm Target initStep - 1 -1.79 mm 290 um -2.41 m 846 keV 0 eV 1.3 mm 1.3 mm Target compt - 2 -5.55 mm -3.09 mm -2.41 m 789 keV 0 eV 6.37 mm 7.67 mm Target compt - 3 -6.02 mm -3.27 mm -2.41 m 647 keV 0 eV 633 um 8.3 mm Target compt - 4 -8.11 mm -6.93 mm -2.4 m 647 keV 0 eV 6.6 mm 1.49 cm Target Transportation - 5 -1.38 m -2.4 m 91.3 cm 647 keV 0 eV 4.31 m 4.33 m Tracker Transportation - 6 -1.67 m -2.91 m 1.62 m 647 keV 0 eV 91.9 cm 5.24 m OutOfWorld Transportation - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 21, Parent ID = 13 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -6.02 mm -3.27 mm -2.41 m 143 keV 0 eV 0 fm 0 fm Target initStep - 1 -6.02 mm -3.27 mm -2.41 m 0 eV 143 keV 48.8 um 48.8 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 20, Parent ID = 13 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -5.55 mm -3.09 mm -2.41 m 56.5 keV 0 eV 0 fm 0 fm Target initStep - 1 -5.55 mm -3.09 mm -2.41 m 0 eV 56.5 keV 11 um 11 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 19, Parent ID = 13 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -1.79 mm 290 um -2.41 m 352 keV 0 eV 0 fm 0 fm Target initStep - 1 -1.8 mm 293 um -2.41 m 0 eV 352 keV 188 um 188 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 12, Parent ID = 2 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -163 um 188 um -2.41 m 1.48 MeV 0 eV 0 fm 0 fm Target initStep - 1 -2.59 mm 1.29 mm -2.4 m 1.48 MeV 0 eV 1.06 cm 1.06 cm Target Transportation - 2 -19.3 cm 8.77 cm -1.6 m 1.48 MeV 0 eV 82.7 cm 83.7 cm Tracker Transportation - 3 -24 cm 10.9 cm -1.4 m 1.48 MeV 0 eV 20.5 cm 1.04 m Chamber Transportation - 4 -38.3 cm 17.4 cm -80 cm 1.48 MeV 0 eV 62.2 cm 1.66 m Tracker Transportation - 5 -43.1 cm 19.6 cm -60 cm 1.48 MeV 0 eV 20.7 cm 1.87 m Chamber Transportation - 6 -57.3 cm 26.1 cm 0.114 fm 1.48 MeV 0 eV 62 cm 2.49 m Tracker Transportation - 7 -62.1 cm 28.2 cm 20 cm 1.48 MeV 0 eV 20.7 cm 2.7 m Chamber Transportation - 8 -76.4 cm 34.7 cm 80 cm 1.48 MeV 0 eV 62 cm 3.32 m Tracker Transportation - 9 -81.1 cm 36.9 cm 1 m 1.48 MeV 0 eV 20.7 cm 3.52 m Chamber Transportation - 10 -95.4 cm 43.3 cm 1.6 m 1.48 MeV 0 eV 62 cm 4.14 m Tracker Transportation - 11 -1 m 45.5 cm 1.8 m 1.48 MeV 0 eV 20.7 cm 4.35 m Chamber Transportation - 12 -1.14 m 52 cm 2.4 m 1.48 MeV 0 eV 62 cm 4.97 m Tracker Transportation - 13 -1.27 m 57.5 cm 2.91 m 1.48 MeV 0 eV 52.7 cm 5.5 m OutOfWorld Transportation - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 11, Parent ID = 2 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -97.3 um 243 um -2.41 m 4.23 MeV 0 eV 0 fm 0 fm Target initStep - 1 -107 um 97.6 um -2.41 m 3.87 MeV 0 eV 2.46 mm 2.46 mm Target compt - 2 523 um 505 um -2.4 m 1.87 MeV 0 eV 7.08 mm 9.53 mm Target compt - 3 1.29 mm 662 um -2.4 m 1.87 MeV 0 eV 1.33 mm 1.09 cm Target Transportation - 4 2.4 m 49.2 cm 92 cm 1.87 MeV 0 eV 4.13 m 4.14 m Tracker Transportation - 5 2.91 m 59.6 cm 1.63 m 1.87 MeV 0 eV 87.7 cm 5.01 m OutOfWorld Transportation - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 23, Parent ID = 11 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 523 um 505 um -2.4 m 2 MeV 0 eV 0 fm 0 fm Target initStep - 1 428 um 444 um -2.4 m 1.26 MeV 172 keV 168 um 168 um Target eBrem - 2 376 um 323 um -2.4 m 1.07 MeV 192 keV 214 um 382 um Target msc - 3 444 um 388 um -2.4 m 811 keV 256 keV 214 um 596 um Target msc - 4 450 um 402 um -2.4 m 0 eV 811 keV 564 um 1.16 mm Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 24, Parent ID = 23 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 428 um 444 um -2.4 m 573 keV 0 eV 0 fm 0 fm Target initStep - 1 5.52 mm -6.43 mm -2.4 m 220 keV 0 eV 9.24 mm 9.24 mm Target compt - 2 5.02 mm -6.06 mm -2.4 m 0 eV 88 keV 813 um 1.01 cm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 26, Parent ID = 24 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 5.02 mm -6.06 mm -2.4 m 132 keV 0 eV 0 fm 0 fm Target initStep - 1 5.02 mm -6.06 mm -2.4 m 0 eV 132 keV 42.8 um 42.8 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 25, Parent ID = 24 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 5.52 mm -6.43 mm -2.4 m 353 keV 0 eV 0 fm 0 fm Target initStep - 1 5.52 mm -6.44 mm -2.4 m 0 eV 353 keV 189 um 189 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 22, Parent ID = 11 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -107 um 97.6 um -2.41 m 356 keV 0 eV 0 fm 0 fm Target initStep - 1 -111 um 91.5 um -2.41 m 0 eV 356 keV 191 um 191 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 10, Parent ID = 2 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -76.3 um 118 um -2.41 m 705 keV 0 eV 0 fm 0 fm Target initStep - 1 -768 um -1.28 mm -2.4 m 451 keV 0 eV 8.64 mm 8.64 mm Target compt - 2 -2.33 mm -559 um -2.4 m 295 keV 0 eV 2.14 mm 1.08 cm Target compt - 3 -1.96 mm 690 um -2.4 m 0 eV 88 keV 1.5 mm 1.23 cm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 29, Parent ID = 10 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -1.96 mm 690 um -2.4 m 207 keV 0 eV 0 fm 0 fm Target initStep - 1 -1.96 mm 691 um -2.4 m 0 eV 207 keV 86.4 um 86.4 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 28, Parent ID = 10 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -2.33 mm -559 um -2.4 m 156 keV 0 eV 0 fm 0 fm Target initStep - 1 -2.33 mm -560 um -2.4 m 0 eV 156 keV 55.8 um 55.8 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 27, Parent ID = 10 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -768 um -1.28 mm -2.4 m 254 keV 0 eV 0 fm 0 fm Target initStep - 1 -766 um -1.28 mm -2.4 m 0 eV 254 keV 117 um 117 um Target eIoni - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 9, Parent ID = 2 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -13.1 um 132 um -2.41 m 307 keV 0 eV 0 fm 0 fm Target initStep - 1 -46 um 72.2 um -2.41 m 0 eV 88 keV 2.15 mm 2.15 mm Target phot - -********************************************************************************************************* -* G4Track Information: Particle = e-, Track ID = 30, Parent ID = 9 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 -46 um 72.2 um -2.41 m 219 keV 0 eV 0 fm 0 fm Target initStep - 1 -47.1 um 71 um -2.41 m 0 eV 219 keV 93.9 um 93.9 um Target eIoni + 0 106 nm 18.3 nm -2.59 m 12.5 keV 0 eV 0 fm 0 fm World initStep + 1 62.8 um -92.1 um -2.59 m 11.4 keV 1.04 keV 113 um 113 um World msc + 2 898 um -999 um -2.59 m 5.91 keV 5.51 keV 1.89 mm 2.01 mm World eIoni + 3 1.03 mm -642 um -2.59 m 0 eV 5.91 keV 917 um 2.92 mm World eIoni >>> Event 0 0 trajectories stored in this event. ### Run 2 start. diff --git a/examples/novice/N02/include/ExN02ChamberParameterisation.hh b/examples/novice/N02/include/ExN02ChamberParameterisation.hh index 12d95202be..b5729e9cfc 100644 --- a/examples/novice/N02/include/ExN02ChamberParameterisation.hh +++ b/examples/novice/N02/include/ExN02ChamberParameterisation.hh @@ -25,7 +25,7 @@ // // // $Id: ExN02ChamberParameterisation.hh,v 1.10 2006/06/29 17:47:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // A parameterisation that describes a series of boxes along Z diff --git a/examples/novice/N02/include/ExN02DetectorConstruction.hh b/examples/novice/N02/include/ExN02DetectorConstruction.hh index c9f40e0d09..b1c04077b7 100644 --- a/examples/novice/N02/include/ExN02DetectorConstruction.hh +++ b/examples/novice/N02/include/ExN02DetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: ExN02DetectorConstruction.hh,v 1.8 2006/06/29 17:47:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N02/include/ExN02DetectorMessenger.hh b/examples/novice/N02/include/ExN02DetectorMessenger.hh index 8936319385..275a4d120a 100644 --- a/examples/novice/N02/include/ExN02DetectorMessenger.hh +++ b/examples/novice/N02/include/ExN02DetectorMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: ExN02DetectorMessenger.hh,v 1.8 2006/06/29 17:47:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N02/include/ExN02EventAction.hh b/examples/novice/N02/include/ExN02EventAction.hh index 9acccf407b..15d8d39f8b 100644 --- a/examples/novice/N02/include/ExN02EventAction.hh +++ b/examples/novice/N02/include/ExN02EventAction.hh @@ -25,7 +25,7 @@ // // // $Id: ExN02EventAction.hh,v 1.8 2006/06/29 17:47:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N02/include/ExN02MagneticField.hh b/examples/novice/N02/include/ExN02MagneticField.hh index a8d52da152..f5c76ef9df 100644 --- a/examples/novice/N02/include/ExN02MagneticField.hh +++ b/examples/novice/N02/include/ExN02MagneticField.hh @@ -25,7 +25,7 @@ // // // $Id: ExN02MagneticField.hh,v 1.7 2006/06/29 17:47:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // A class for control of the Magnetic Field of the detector. diff --git a/examples/novice/N02/include/ExN02PhysicsList.hh b/examples/novice/N02/include/ExN02PhysicsList.hh index fe85a8c07c..22e317c397 100644 --- a/examples/novice/N02/include/ExN02PhysicsList.hh +++ b/examples/novice/N02/include/ExN02PhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: ExN02PhysicsList.hh,v 1.11 2006/06/29 17:47:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N02/include/ExN02PrimaryGeneratorAction.hh b/examples/novice/N02/include/ExN02PrimaryGeneratorAction.hh index 1549216290..bd88895947 100644 --- a/examples/novice/N02/include/ExN02PrimaryGeneratorAction.hh +++ b/examples/novice/N02/include/ExN02PrimaryGeneratorAction.hh @@ -25,7 +25,7 @@ // // // $Id: ExN02PrimaryGeneratorAction.hh,v 1.7 2006/06/29 17:47:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N02/include/ExN02RunAction.hh b/examples/novice/N02/include/ExN02RunAction.hh index 6cd178be87..a8cecc6d90 100644 --- a/examples/novice/N02/include/ExN02RunAction.hh +++ b/examples/novice/N02/include/ExN02RunAction.hh @@ -25,7 +25,7 @@ // // // $Id: ExN02RunAction.hh,v 1.8 2006/06/29 17:47:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N02/include/ExN02SteppingAction.hh b/examples/novice/N02/include/ExN02SteppingAction.hh index 1556d4e28f..5c56846919 100644 --- a/examples/novice/N02/include/ExN02SteppingAction.hh +++ b/examples/novice/N02/include/ExN02SteppingAction.hh @@ -25,7 +25,7 @@ // // // $Id: ExN02SteppingAction.hh,v 1.8 2006/06/29 17:47:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N02/include/ExN02SteppingVerbose.hh b/examples/novice/N02/include/ExN02SteppingVerbose.hh index 742098a69e..ef239e09f6 100644 --- a/examples/novice/N02/include/ExN02SteppingVerbose.hh +++ b/examples/novice/N02/include/ExN02SteppingVerbose.hh @@ -25,7 +25,7 @@ // // // $Id: ExN02SteppingVerbose.hh,v 1.8 2006/06/29 17:47:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // This class manages the verbose outputs in G4SteppingManager. // It inherits from G4SteppingVerbose. diff --git a/examples/novice/N02/include/ExN02TrackerHit.hh b/examples/novice/N02/include/ExN02TrackerHit.hh index 95a8ae0fc5..baf69a83a6 100644 --- a/examples/novice/N02/include/ExN02TrackerHit.hh +++ b/examples/novice/N02/include/ExN02TrackerHit.hh @@ -25,7 +25,7 @@ // // // $Id: ExN02TrackerHit.hh,v 1.8 2006/06/29 17:47:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N02/include/ExN02TrackerSD.hh b/examples/novice/N02/include/ExN02TrackerSD.hh index 7ef41750da..bb8fe4a4c3 100644 --- a/examples/novice/N02/include/ExN02TrackerSD.hh +++ b/examples/novice/N02/include/ExN02TrackerSD.hh @@ -25,7 +25,7 @@ // // // $Id: ExN02TrackerSD.hh,v 1.7 2006/06/29 17:47:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N02/src/ExN02ChamberParameterisation.cc b/examples/novice/N02/src/ExN02ChamberParameterisation.cc index d22ce6a3f5..97b8620221 100644 --- a/examples/novice/N02/src/ExN02ChamberParameterisation.cc +++ b/examples/novice/N02/src/ExN02ChamberParameterisation.cc @@ -25,7 +25,7 @@ // // // $Id: ExN02ChamberParameterisation.cc,v 1.9 2006/06/29 17:47:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N02/src/ExN02DetectorConstruction.cc b/examples/novice/N02/src/ExN02DetectorConstruction.cc index 18eea740c6..72362b1488 100644 --- a/examples/novice/N02/src/ExN02DetectorConstruction.cc +++ b/examples/novice/N02/src/ExN02DetectorConstruction.cc @@ -25,7 +25,7 @@ // // // $Id: ExN02DetectorConstruction.cc,v 1.18 2006/06/29 17:48:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N02/src/ExN02DetectorMessenger.cc b/examples/novice/N02/src/ExN02DetectorMessenger.cc index a93ff4d3a1..a807c93418 100644 --- a/examples/novice/N02/src/ExN02DetectorMessenger.cc +++ b/examples/novice/N02/src/ExN02DetectorMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: ExN02DetectorMessenger.cc,v 1.11 2006/06/29 17:48:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N02/src/ExN02EventAction.cc b/examples/novice/N02/src/ExN02EventAction.cc index 79c7a777ff..d54bcad7c5 100644 --- a/examples/novice/N02/src/ExN02EventAction.cc +++ b/examples/novice/N02/src/ExN02EventAction.cc @@ -25,7 +25,7 @@ // // // $Id: ExN02EventAction.cc,v 1.11 2006/06/29 17:48:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N02/src/ExN02MagneticField.cc b/examples/novice/N02/src/ExN02MagneticField.cc index 84e8f32473..e9a1342d3f 100644 --- a/examples/novice/N02/src/ExN02MagneticField.cc +++ b/examples/novice/N02/src/ExN02MagneticField.cc @@ -25,7 +25,7 @@ // // // $Id: ExN02MagneticField.cc,v 1.8 2006/06/29 17:48:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // User Field class implementation. // diff --git a/examples/novice/N02/src/ExN02PhysicsList.cc b/examples/novice/N02/src/ExN02PhysicsList.cc index 0b90d1e6aa..b0a584e446 100644 --- a/examples/novice/N02/src/ExN02PhysicsList.cc +++ b/examples/novice/N02/src/ExN02PhysicsList.cc @@ -25,7 +25,7 @@ // // // $Id: ExN02PhysicsList.cc,v 1.22 2006/06/29 17:48:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N02/src/ExN02PrimaryGeneratorAction.cc b/examples/novice/N02/src/ExN02PrimaryGeneratorAction.cc index 12d53d56f8..506faffe3a 100644 --- a/examples/novice/N02/src/ExN02PrimaryGeneratorAction.cc +++ b/examples/novice/N02/src/ExN02PrimaryGeneratorAction.cc @@ -25,7 +25,7 @@ // // // $Id: ExN02PrimaryGeneratorAction.cc,v 1.7 2006/06/29 17:48:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N02/src/ExN02RunAction.cc b/examples/novice/N02/src/ExN02RunAction.cc index e9f749d5a2..6ef7556910 100644 --- a/examples/novice/N02/src/ExN02RunAction.cc +++ b/examples/novice/N02/src/ExN02RunAction.cc @@ -25,7 +25,7 @@ // // // $Id: ExN02RunAction.cc,v 1.9 2006/06/29 17:48:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N02/src/ExN02SteppingAction.cc b/examples/novice/N02/src/ExN02SteppingAction.cc index b8368c1f1e..08e3274be6 100644 --- a/examples/novice/N02/src/ExN02SteppingAction.cc +++ b/examples/novice/N02/src/ExN02SteppingAction.cc @@ -25,7 +25,7 @@ // // // $Id: ExN02SteppingAction.cc,v 1.9 2006/06/29 17:48:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N02/src/ExN02SteppingVerbose.cc b/examples/novice/N02/src/ExN02SteppingVerbose.cc index f9f98680d0..d85df44e8f 100644 --- a/examples/novice/N02/src/ExN02SteppingVerbose.cc +++ b/examples/novice/N02/src/ExN02SteppingVerbose.cc @@ -25,7 +25,7 @@ // // // $Id: ExN02SteppingVerbose.cc,v 1.12 2006/06/29 17:48:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N02/src/ExN02TrackerHit.cc b/examples/novice/N02/src/ExN02TrackerHit.cc index ebf18859ba..54bd84851d 100644 --- a/examples/novice/N02/src/ExN02TrackerHit.cc +++ b/examples/novice/N02/src/ExN02TrackerHit.cc @@ -25,7 +25,7 @@ // // // $Id: ExN02TrackerHit.cc,v 1.10 2006/06/29 17:48:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N02/src/ExN02TrackerSD.cc b/examples/novice/N02/src/ExN02TrackerSD.cc index 64f5c1b32e..aad92023b0 100644 --- a/examples/novice/N02/src/ExN02TrackerSD.cc +++ b/examples/novice/N02/src/ExN02TrackerSD.cc @@ -25,7 +25,7 @@ // // // $Id: ExN02TrackerSD.cc,v 1.9 2006/06/29 17:48:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N02/vis.mac b/examples/novice/N02/vis.mac index e93ffb77af..76b80a81e9 100644 --- a/examples/novice/N02/vis.mac +++ b/examples/novice/N02/vis.mac @@ -7,27 +7,25 @@ /control/verbose 2 /run/verbose 2 # -# create empty scene -# -/vis/scene/create -# # Create a scene handler for a specific graphics system -# (Edit the next line(s) to choose another graphic system) +# (Edit the next line(s) to choose another graphics system) # -/vis/open OGLIX +/vis/open OGLIX 600x600-0+0 # ####/vis/open DAWNFILE # # draw scene # +/vis/drawVolume +# /vis/viewer/set/viewpointThetaPhi 90 180 deg /vis/viewer/zoom 1.4 -/vis/viewer/flush # # for drawing the tracks -# (if too many tracks cause core dump => storeTrajectory 0) -/tracking/storeTrajectory 1 /vis/scene/add/trajectories +# (if too many tracks cause core dump => /tracking/storeTrajectory 0) +# for drawing the hits, uncomment next line +# /vis/scene/add/hits # (if you prefer refreshing each event, comment out next line) /vis/scene/endOfEventAction accumulate # diff --git a/examples/novice/N03/History b/examples/novice/N03/History index 30cf924d42..cba29f775c 100644 --- a/examples/novice/N03/History +++ b/examples/novice/N03/History @@ -1,4 +1,4 @@ -$Id: History,v 1.104 2006/06/16 10:18:05 gcosmo Exp $ +$Id: History,v 1.111 2006/10/26 14:58:59 allison Exp $ -------------------------------------------------- ========================================================= @@ -15,6 +15,37 @@ track of all tags. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +26-10-06 John Allison (exampleN03-V08-01-04) +- Migrate to new trajectory modeling commands: + o vis.mac: Add new trajectory commands and helpful comments. + o ExN03EventActionMessenger: Remove /N03/event/drawTracks. + o ExN03EventAction: Remove SetDrawFlag and code for drawing + trajectories in EndOfEventAction. + o ExN03TrackingAction: Remove. (Trajectory choice now available + by vis commands - see exN03Vis12.mac and exN03Vis13.mac.) + o exN03Vis12.mac and exN03Vis13.mac: Further refinement. + +19-09-06 John Allison (exampleN03-V08-01-03) +- exN03Vis12.mac and exN03Vis13.mac: Further refinement. + +12-09-06 John Allison (exampleN03-V08-01-02) +- exN03Vis12.mac and exN03Vis13.mac: Switched off local trajectory + drawing (/N03/event/drawTracks none) so as not to interfere with + drawing from /vis/scene/add/trajectories. + +31-08-06 mma +- Code tidy. + +30-08-06 John Allison (exampleN03-V08-01-01) +- Improved visTutor/exN03Vis12.mac. +- Added visTutor/exN03Vis13.mac: Further demonstration of time slicing. + +16-08-06 John Allison (exampleN03-V08-01-00) +- Added ExN03TrackingAction. Active code is commented out so it + continues to use G4Trajectory. Introduced so that the code can + easily be instated to get G4RichTrajectory for exN03Vis12.mac. +- Added visTutor/exN03Vis12.mac: demonstration of time slicing. + 16-06-06 Gabriele Cosmo (exampleN03-V08-00-06) - Use coherent allocation scheme for user-classes and initialisation in main(). diff --git a/examples/novice/N03/exampleN03.cc b/examples/novice/N03/exampleN03.cc index d219284da4..6fefc72902 100644 --- a/examples/novice/N03/exampleN03.cc +++ b/examples/novice/N03/exampleN03.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: exampleN03.cc,v 1.28 2006/06/29 17:48:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: exampleN03.cc,v 1.30 2006/10/26 14:58:24 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N03/exampleN03.out b/examples/novice/N03/exampleN03.out index 399bba094f..56f6bdd579 100644 --- a/examples/novice/N03/exampleN03.out +++ b/examples/novice/N03/exampleN03.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -84,17 +84,13 @@ Registered model factories: drawByCharge drawByParticleID drawByOriginVolume - -Registered models: - None + drawByAttribute Registered filter factories: chargeFilter particleFilter originVolumeFilter - -Registered filters: - None + attributeFilter ------------------------------------------------------------ @@ -103,6 +99,7 @@ Registered filters: ExN03PhysicsList::SetCuts:CutLength : 1 mm phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV Sampling according Klein-Nishina model @@ -110,7 +107,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.022 MeV to 100 GeV in 100 bins. @@ -142,7 +139,7 @@ eBrem: tables are built for e+ Total cross sections from a parametrisation based on the EEDL data library. Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -254,16 +251,16 @@ Index : 2 used in the geometry : Yes recalculation needed : No Current couple of seeds = 9876, 54321 ---------------------------------------- ---> End of event: 0 - Absorber: total energy: 283.57012 MeV total track length: 19.954777 cm - Gap: total energy: 4.4491408 MeV total track length: 2.1543629 cm + Absorber: total energy: 280.14286 MeV total track length: 19.679096 cm + Gap: total energy: 4.0855894 MeV total track length: 1.9263536 cm --------------------End of Run------------------------------ - mean Energy in Absorber : 283.57012 MeV +- 0 eV - mean Energy in Gap : 4.4491408 MeV +- 0 eV + mean Energy in Absorber : 280.14286 MeV +- 0 eV + mean Energy in Gap : 4.0855894 MeV +- 0 eV - mean trackLength in Absorber : 19.954777 cm +- 0 fm - mean trackLength in Gap : 2.1543629 cm +- 0 fm + mean trackLength in Absorber : 19.679096 cm +- 0 fm + mean trackLength in Gap : 1.9263536 cm +- 0 fm ------------------------------------------------------------ Transportation, msc, hIoni, eIoni @@ -272,6 +269,7 @@ Index : 2 used in the geometry : Yes recalculation needed : No Decay phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV Sampling according Klein-Nishina model @@ -279,7 +277,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.0219981 MeV to 100 GeV in 100 bins. @@ -311,7 +309,7 @@ eBrem: tables are built for e+ Total cross sections from a parametrisation based on the EEDL data library. Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -394,19 +392,19 @@ hIoni: tables are built for pi- --------- Ranecu engine status --------- Initial seed (index) = 0 - Current couple of seeds = 338525291, 1799411122 + Current couple of seeds = 234409320, 652331827 ---------------------------------------- ---> End of event: 0 - Absorber: total energy: 276.14261 MeV total track length: 19.058263 cm - Gap: total energy: 16.389271 MeV total track length: 8.0132117 cm + Absorber: total energy: 280.7777 MeV total track length: 19.595091 cm + Gap: total energy: 18.485587 MeV total track length: 9.63645 cm --------------------End of Run------------------------------ - mean Energy in Absorber : 276.14261 MeV +- 0 eV - mean Energy in Gap : 16.389271 MeV +- 0 eV + mean Energy in Absorber : 280.7777 MeV +- 0 eV + mean Energy in Gap : 18.485587 MeV +- 0 eV - mean trackLength in Absorber : 19.058263 cm +- 0 fm - mean trackLength in Gap : 8.0132117 cm +- 0 fm + mean trackLength in Absorber : 19.595091 cm +- 0 fm + mean trackLength in Gap : 9.63645 cm +- 0 fm ------------------------------------------------------------ @@ -415,6 +413,7 @@ hIoni: tables are built for pi- ------------------------------------------------------------ phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV Sampling according Klein-Nishina model @@ -422,7 +421,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.0219981 MeV to 100 GeV in 100 bins. @@ -454,7 +453,7 @@ eBrem: tables are built for e+ Total cross sections from a parametrisation based on the EEDL data library. Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -537,18 +536,18 @@ hIoni: tables are built for pi- --------- Ranecu engine status --------- Initial seed (index) = 0 - Current couple of seeds = 977943917, 671671507 + Current couple of seeds = 90242937, 1292579150 ---------------------------------------- ---> End of event: 0 - Absorber: total energy: 267.17807 MeV total track length: 62.771551 cm - Gap: total energy: 66.70026 MeV total track length: 1.8562679 m + Absorber: total energy: 413.38926 MeV total track length: 96.682572 cm + Gap: total energy: 79.358667 MeV total track length: 2.2098704 m --------------------End of Run------------------------------ - mean Energy in Absorber : 267.17807 MeV +- 0 eV - mean Energy in Gap : 66.70026 MeV +- 0 eV + mean Energy in Absorber : 413.38926 MeV +- 0 eV + mean Energy in Gap : 79.358667 MeV +- 0 eV - mean trackLength in Absorber : 62.771551 cm +- 0 fm - mean trackLength in Gap : 1.8562679 m +- 0 fm + mean trackLength in Absorber : 96.682572 cm +- 0 fm + mean trackLength in Gap : 2.2098704 m +- 0 fm ------------------------------------------------------------ diff --git a/examples/novice/N03/include/ExN03DetectorConstruction.hh b/examples/novice/N03/include/ExN03DetectorConstruction.hh index e0ed37e080..ca0552a849 100644 --- a/examples/novice/N03/include/ExN03DetectorConstruction.hh +++ b/examples/novice/N03/include/ExN03DetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: ExN03DetectorConstruction.hh,v 1.7 2006/06/29 17:48:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/novice/N03/include/ExN03DetectorMessenger.hh b/examples/novice/N03/include/ExN03DetectorMessenger.hh index 32af3c6afc..5531eb53e0 100644 --- a/examples/novice/N03/include/ExN03DetectorMessenger.hh +++ b/examples/novice/N03/include/ExN03DetectorMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: ExN03DetectorMessenger.hh,v 1.7 2006/06/29 17:48:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/novice/N03/include/ExN03EventAction.hh b/examples/novice/N03/include/ExN03EventAction.hh index 3c8492e926..7ec698e2a7 100644 --- a/examples/novice/N03/include/ExN03EventAction.hh +++ b/examples/novice/N03/include/ExN03EventAction.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: ExN03EventAction.hh,v 1.10 2006/06/29 17:48:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: ExN03EventAction.hh,v 1.11 2006/10/26 14:30:05 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // @@ -56,7 +56,6 @@ class ExN03EventAction : public G4UserEventAction void AddAbs(G4double de, G4double dl) {EnergyAbs += de; TrackLAbs += dl;}; void AddGap(G4double de, G4double dl) {EnergyGap += de; TrackLGap += dl;}; - void SetDrawFlag (G4String val) {drawFlag = val;}; void SetPrintModulo(G4int val) {printModulo = val;}; private: @@ -65,7 +64,6 @@ class ExN03EventAction : public G4UserEventAction G4double EnergyAbs, EnergyGap; G4double TrackLAbs, TrackLGap; - G4String drawFlag; G4int printModulo; ExN03EventActionMessenger* eventMessenger; diff --git a/examples/novice/N03/include/ExN03EventActionMessenger.hh b/examples/novice/N03/include/ExN03EventActionMessenger.hh index 5ad093fc93..064bfef3b7 100644 --- a/examples/novice/N03/include/ExN03EventActionMessenger.hh +++ b/examples/novice/N03/include/ExN03EventActionMessenger.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: ExN03EventActionMessenger.hh,v 1.8 2006/06/29 17:48:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: ExN03EventActionMessenger.hh,v 1.9 2006/10/26 14:28:00 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // @@ -40,7 +40,6 @@ class ExN03EventAction; class G4UIdirectory; -class G4UIcmdWithAString; class G4UIcmdWithAnInteger; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -56,7 +55,6 @@ class ExN03EventActionMessenger: public G4UImessenger private: ExN03EventAction* eventAction; G4UIdirectory* eventDir; - G4UIcmdWithAString* DrawCmd; G4UIcmdWithAnInteger* PrintCmd; }; diff --git a/examples/novice/N03/include/ExN03PhysicsList.hh b/examples/novice/N03/include/ExN03PhysicsList.hh index d796a2f26c..4d579de520 100644 --- a/examples/novice/N03/include/ExN03PhysicsList.hh +++ b/examples/novice/N03/include/ExN03PhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: ExN03PhysicsList.hh,v 1.12 2006/06/29 17:48:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/novice/N03/include/ExN03PrimaryGeneratorAction.hh b/examples/novice/N03/include/ExN03PrimaryGeneratorAction.hh index 9de3f0082a..470cb27fcf 100644 --- a/examples/novice/N03/include/ExN03PrimaryGeneratorAction.hh +++ b/examples/novice/N03/include/ExN03PrimaryGeneratorAction.hh @@ -25,7 +25,7 @@ // // // $Id: ExN03PrimaryGeneratorAction.hh,v 1.7 2006/06/29 17:48:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/novice/N03/include/ExN03PrimaryGeneratorMessenger.hh b/examples/novice/N03/include/ExN03PrimaryGeneratorMessenger.hh index f7ede83ea6..f32332146d 100644 --- a/examples/novice/N03/include/ExN03PrimaryGeneratorMessenger.hh +++ b/examples/novice/N03/include/ExN03PrimaryGeneratorMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: ExN03PrimaryGeneratorMessenger.hh,v 1.7 2006/06/29 17:48:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/novice/N03/include/ExN03RunAction.hh b/examples/novice/N03/include/ExN03RunAction.hh index 51f4331868..320ab2fb29 100644 --- a/examples/novice/N03/include/ExN03RunAction.hh +++ b/examples/novice/N03/include/ExN03RunAction.hh @@ -25,7 +25,7 @@ // // // $Id: ExN03RunAction.hh,v 1.10 2006/06/29 17:48:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/novice/N03/include/ExN03SteppingAction.hh b/examples/novice/N03/include/ExN03SteppingAction.hh index 52511de661..52ab95d9a7 100644 --- a/examples/novice/N03/include/ExN03SteppingAction.hh +++ b/examples/novice/N03/include/ExN03SteppingAction.hh @@ -25,7 +25,7 @@ // // // $Id: ExN03SteppingAction.hh,v 1.9 2006/06/29 17:48:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/novice/N03/include/ExN03SteppingVerbose.hh b/examples/novice/N03/include/ExN03SteppingVerbose.hh index 457d2c8ab6..4bd01ef4cb 100644 --- a/examples/novice/N03/include/ExN03SteppingVerbose.hh +++ b/examples/novice/N03/include/ExN03SteppingVerbose.hh @@ -25,7 +25,7 @@ // // // $Id: ExN03SteppingVerbose.hh,v 1.9 2006/06/29 17:48:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N03/src/ExN03DetectorConstruction.cc b/examples/novice/N03/src/ExN03DetectorConstruction.cc index 0edba8ef07..fcf8da7a56 100644 --- a/examples/novice/N03/src/ExN03DetectorConstruction.cc +++ b/examples/novice/N03/src/ExN03DetectorConstruction.cc @@ -25,7 +25,7 @@ // // // $Id: ExN03DetectorConstruction.cc,v 1.23 2006/06/29 17:48:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/novice/N03/src/ExN03DetectorMessenger.cc b/examples/novice/N03/src/ExN03DetectorMessenger.cc index e03d0f94bc..443e593308 100644 --- a/examples/novice/N03/src/ExN03DetectorMessenger.cc +++ b/examples/novice/N03/src/ExN03DetectorMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: ExN03DetectorMessenger.cc,v 1.10 2006/06/29 17:48:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/novice/N03/src/ExN03EventAction.cc b/examples/novice/N03/src/ExN03EventAction.cc index 8bd0d35cf6..3eb5104eb6 100644 --- a/examples/novice/N03/src/ExN03EventAction.cc +++ b/examples/novice/N03/src/ExN03EventAction.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: ExN03EventAction.cc,v 1.27 2006/06/29 17:49:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: ExN03EventAction.cc,v 1.28 2006/10/26 14:30:05 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // @@ -49,7 +49,7 @@ //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... ExN03EventAction::ExN03EventAction(ExN03RunAction* run) -:runAct(run),drawFlag("all"),printModulo(1),eventMessenger(0) +:runAct(run),printModulo(1),eventMessenger(0) { eventMessenger = new ExN03EventActionMessenger(this); } @@ -102,33 +102,7 @@ void ExN03EventAction::EndOfEventAction(const G4Event* evt) << G4BestUnit(TrackLGap,"Length") << G4endl; - } - - // extract the trajectories and draw them - - // You can get a default drawing without this code by using, e.g., - // /vis/scene/add/trajectories 1000 - // The code here adds sophistication under control of drawFlag. - - // See comments in G4VTrajectory::DrawTrajectory for the - // interpretation of the argument, 1000. - - G4VVisManager* pVisManager = G4VVisManager::GetConcreteInstance(); - if (pVisManager) - { - G4TrajectoryContainer* trajectoryContainer = evt->GetTrajectoryContainer(); - G4int n_trajectories = 0; - if (trajectoryContainer) n_trajectories = trajectoryContainer->entries(); - - for (G4int i=0; iGetTrajectoryContainer()))[i]); - if (drawFlag == "all") pVisManager->Draw(*trj,100); - else if ((drawFlag == "charged")&&(trj->GetCharge() != 0.)) - pVisManager->Draw(*trj,100); - else if ((drawFlag == "neutral")&&(trj->GetCharge() == 0.)) - pVisManager->Draw(*trj,100); - } - } + } } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N03/src/ExN03EventActionMessenger.cc b/examples/novice/N03/src/ExN03EventActionMessenger.cc index 27ba3f9eca..c89cb91f9b 100644 --- a/examples/novice/N03/src/ExN03EventActionMessenger.cc +++ b/examples/novice/N03/src/ExN03EventActionMessenger.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: ExN03EventActionMessenger.cc,v 1.11 2006/06/29 17:49:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: ExN03EventActionMessenger.cc,v 1.12 2006/10/26 14:28:00 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // @@ -36,7 +36,6 @@ #include "ExN03EventAction.hh" #include "G4UIdirectory.hh" -#include "G4UIcmdWithAString.hh" #include "G4UIcmdWithAnInteger.hh" #include "globals.hh" @@ -48,14 +47,6 @@ ExN03EventActionMessenger::ExN03EventActionMessenger(ExN03EventAction* EvAct) eventDir = new G4UIdirectory("/N03/event/"); eventDir->SetGuidance("event control"); - DrawCmd = new G4UIcmdWithAString("/N03/event/drawTracks",this); - DrawCmd->SetGuidance("Draw the tracks in the event"); - DrawCmd->SetGuidance(" Choice : none, charged(default),neutral, all"); - DrawCmd->SetParameterName("choice",true); - DrawCmd->SetDefaultValue("all"); - DrawCmd->SetCandidates("none charged neutral all"); - DrawCmd->AvailableForStates(G4State_Idle); - PrintCmd = new G4UIcmdWithAnInteger("/N03/event/printModulo",this); PrintCmd->SetGuidance("Print events modulo n"); PrintCmd->SetParameterName("EventNb",false); @@ -66,7 +57,6 @@ ExN03EventActionMessenger::ExN03EventActionMessenger(ExN03EventAction* EvAct) ExN03EventActionMessenger::~ExN03EventActionMessenger() { - delete DrawCmd; delete PrintCmd; delete eventDir; } @@ -76,9 +66,6 @@ ExN03EventActionMessenger::~ExN03EventActionMessenger() void ExN03EventActionMessenger::SetNewValue( G4UIcommand* command,G4String newValue) { - if(command == DrawCmd) - {eventAction->SetDrawFlag(newValue);} - if(command == PrintCmd) {eventAction->SetPrintModulo(PrintCmd->GetNewIntValue(newValue));} } diff --git a/examples/novice/N03/src/ExN03PhysicsList.cc b/examples/novice/N03/src/ExN03PhysicsList.cc index c2d9d96c48..4afa408e9f 100644 --- a/examples/novice/N03/src/ExN03PhysicsList.cc +++ b/examples/novice/N03/src/ExN03PhysicsList.cc @@ -25,7 +25,7 @@ // // // $Id: ExN03PhysicsList.cc,v 1.20 2006/06/29 17:49:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/novice/N03/src/ExN03PrimaryGeneratorAction.cc b/examples/novice/N03/src/ExN03PrimaryGeneratorAction.cc index f07b19ba30..cb45059a1b 100644 --- a/examples/novice/N03/src/ExN03PrimaryGeneratorAction.cc +++ b/examples/novice/N03/src/ExN03PrimaryGeneratorAction.cc @@ -25,7 +25,7 @@ // // // $Id: ExN03PrimaryGeneratorAction.cc,v 1.8 2006/06/29 17:49:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/novice/N03/src/ExN03PrimaryGeneratorMessenger.cc b/examples/novice/N03/src/ExN03PrimaryGeneratorMessenger.cc index 65c33d85d1..46d497efd8 100644 --- a/examples/novice/N03/src/ExN03PrimaryGeneratorMessenger.cc +++ b/examples/novice/N03/src/ExN03PrimaryGeneratorMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: ExN03PrimaryGeneratorMessenger.cc,v 1.9 2006/06/29 17:49:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/novice/N03/src/ExN03RunAction.cc b/examples/novice/N03/src/ExN03RunAction.cc index 9e5ae3fa8c..30caa10263 100644 --- a/examples/novice/N03/src/ExN03RunAction.cc +++ b/examples/novice/N03/src/ExN03RunAction.cc @@ -25,7 +25,7 @@ // // // $Id: ExN03RunAction.cc,v 1.18 2006/06/29 17:49:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N03/src/ExN03SteppingAction.cc b/examples/novice/N03/src/ExN03SteppingAction.cc index 088d1f603b..f75d1560d4 100644 --- a/examples/novice/N03/src/ExN03SteppingAction.cc +++ b/examples/novice/N03/src/ExN03SteppingAction.cc @@ -25,7 +25,7 @@ // // // $Id: ExN03SteppingAction.cc,v 1.15 2006/06/29 17:49:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/novice/N03/src/ExN03SteppingVerbose.cc b/examples/novice/N03/src/ExN03SteppingVerbose.cc index bf2b8af684..6915e05853 100644 --- a/examples/novice/N03/src/ExN03SteppingVerbose.cc +++ b/examples/novice/N03/src/ExN03SteppingVerbose.cc @@ -25,7 +25,7 @@ // // // $Id: ExN03SteppingVerbose.cc,v 1.13 2006/06/29 17:49:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N03/vis.mac b/examples/novice/N03/vis.mac index dff0aea735..f8c05f9861 100644 --- a/examples/novice/N03/vis.mac +++ b/examples/novice/N03/vis.mac @@ -33,10 +33,26 @@ # Output an empty detector /vis/viewer/flush # -# for drawing the tracks -# (if too many tracks cause core dump => storeTrajectory 0) +# Draw trajectories at end of event, showing trajectory points as +# markers of size 2 pixels +/vis/scene/add/trajectories +/vis/modeling/trajectories/create/drawByCharge +/vis/modeling/trajectories/drawByCharge-0/default/setDrawStepPts true +/vis/modeling/trajectories/drawByCharge-0/default/setStepPtsSize 2 +# (if too many tracks cause core dump => /tracking/storeTrajectory 0) +# +# To draw gammas only +#/vis/filtering/trajectories/create/particleFilter +#/vis/filtering/trajectories/particleFilter-0/add gamma +# +# To draw charged particles only +#/vis/filtering/trajectories/particleFilter-0/invert true +# +# Many other options available with /vis/modeling and /vis/filtering. +# For example, select colour by particle ID +#/vis/modeling/trajectories/create/drawByParticleID +#/vis/modeling/trajectories/drawByParticleID-0/set e- red # -/tracking/storeTrajectory 1 /vis/scene/endOfEventAction accumulate # # At end of each run, an automatic flush causes graphical output. diff --git a/examples/novice/N03/visTutor/exN03Vis10.mac b/examples/novice/N03/visTutor/exN03Vis10.mac index fced0ba508..eda90180a5 100644 --- a/examples/novice/N03/visTutor/exN03Vis10.mac +++ b/examples/novice/N03/visTutor/exN03Vis10.mac @@ -59,9 +59,9 @@ # Shift + pick a volume : see mother. # # - in viewing mode (cursor is the hand) # # Left-button + pointer move : rotate. # -# Ctrl+Left-button + pointer move : pane. # +# Ctrl+Left-button + pointer move : pan. # # Ctrl+Shift+Left-button + pointer move : scale. # -# Middle-button + pointer move : pane. # +# Middle-button + pointer move : pan. # # # ####################################################################### diff --git a/examples/novice/N03/visTutor/exN03Vis12.loop b/examples/novice/N03/visTutor/exN03Vis12.loop new file mode 100644 index 0000000000..e8f2ee11f4 --- /dev/null +++ b/examples/novice/N03/visTutor/exN03Vis12.loop @@ -0,0 +1,4 @@ +# exN03Vis12.loop +/vis/ogl/set/startTime {startTime} ns {timeRange} ns +# Print eps file +#/vis/oglx/printEPS diff --git a/examples/novice/N03/visTutor/exN03Vis12.mac b/examples/novice/N03/visTutor/exN03Vis12.mac new file mode 100644 index 0000000000..c5562ae304 --- /dev/null +++ b/examples/novice/N03/visTutor/exN03Vis12.mac @@ -0,0 +1,97 @@ +####################################################################### +# MACRO FILE NAME: exN03Vis12.mac # +# # +# AUTHOR(S): John Allison # +# # +# DATE: 16th August 2006 # +# # +# CONTENTS: A basic macro for demonstrating time slicing # +# # +# USAGE: % $G4BINDIR/exampleN03 visTutor/exN03Vis12.mac # +# # +# REQUIRED PLATFORMS & SOFTWARES: Mac/Unix with X-Windows, OpenGL # +# # +# ADDITIONAL NOTES: # +# # +####################################################################### + +/control/verbose 2 +/vis/verbose confirmations + +/vis/open OGLSX +/vis/drawVolume +/vis/scene/add/eventID +/vis/scene/add/trajectories rich + +# Set up drawByCharge with time slicing +/vis/modeling/trajectories/create/drawByCharge +/vis/modeling/trajectories/drawByCharge-0/default/setDrawStepPts true +/vis/modeling/trajectories/drawByCharge-0/default/setStepPtsSize 5 +/vis/modeling/trajectories/drawByCharge-0/default/setDrawAuxPts true +/vis/modeling/trajectories/drawByCharge-0/default/setAuxPtsSize 5 +/vis/modeling/trajectories/drawByCharge-0/default/setTimeSliceInterval 0.001 ns +/vis/modeling/trajectories/list +#/N03/det/setField 5 T +#/N03/det/update +/run/beamOn + +# Configure OpenGL for display-by-time +/vis/ogl/set/fade 1 +/vis/ogl/set/displayHeadTime true +/control/alias timeRange 0.1 +/vis/verbose warnings +/control/verbose 0 +/control/loop visTutor/exN03Vis12.loop startTime -{timeRange} 0.7 0.005 +/control/verbose 2 +/vis/verbose confirmations +/vis/ogl/set/displayHeadTime false + +# Set up drawByParticleID with time slicing +/vis/modeling/trajectories/create/drawByParticleID +/vis/modeling/trajectories/drawByParticleID-0/set e- red +/vis/modeling/trajectories/drawByParticleID-0/set e+ blue +/vis/modeling/trajectories/drawByParticleID-0/set pi- cyan +/vis/modeling/trajectories/drawByParticleID-0/set pi+ magenta +#/vis/modeling/trajectories/drawByParticleID-0/default/setDrawStepPts true +/vis/modeling/trajectories/drawByParticleID-0/default/setStepPtsSize 5 +#/vis/modeling/trajectories/drawByParticleID-0/default/setDrawAuxPts true +/vis/modeling/trajectories/drawByParticleID-0/default/setAuxPtsSize 5 +/vis/modeling/trajectories/drawByParticleID-0/default/setTimeSliceInterval 0.001 ns +/vis/modeling/trajectories/list + +# Remove gammas +/vis/filtering/trajectories/create/particleFilter +/vis/filtering/trajectories/particleFilter-0/add gamma +/vis/filtering/trajectories/particleFilter-0/invert true + +/gun/energy 1 GeV +/run/beamOn +/control/alias timeRange 0.1 +/vis/ogl/set/displayHeadTime true +/vis/ogl/set/displayLightFront true -90 0 0 mm +/vis/verbose warnings +/control/verbose 0 +/control/loop visTutor/exN03Vis12.loop startTime -{timeRange} 0.7 0.001 +/control/verbose 2 +/vis/verbose confirmations +/vis/ogl/set/displayLightFront false +/vis/ogl/set/displayHeadTime false + +# To see pi -> mu -> e decay. +/gun/particle pi+ +/vis/filtering/trajectories/particleFilter-0/add anti_nu_mu +/vis/filtering/trajectories/particleFilter-0/add nu_mu +/vis/filtering/trajectories/particleFilter-0/add anti_nu_e +/vis/filtering/trajectories/particleFilter-0/add nu_e +# Accumulate several events for effect +# /vis/scene/endOfEventAction accumulate +/gun/energy 100 MeV +#/vis/viewer/set/globalLineWidthScale 2 +/run/beamOn +/control/alias timeRange 1000 +/vis/ogl/set/displayHeadTime true +/vis/verbose warnings +/control/verbose 0 +/control/loop visTutor/exN03Vis12.loop startTime -{timeRange} 3000 5 +/control/verbose 2 +/vis/verbose confirmations diff --git a/examples/novice/N03/visTutor/exN03Vis13.loop b/examples/novice/N03/visTutor/exN03Vis13.loop new file mode 100644 index 0000000000..5b1ce9c5d6 --- /dev/null +++ b/examples/novice/N03/visTutor/exN03Vis13.loop @@ -0,0 +1,7 @@ +# exN03Vis13.loop +/vis/viewer/pan {dx} 0 mm +/vis/ogl/set/endTime {endTime} ns {timeRange} ns +# Force refresh here (since auto-refresh switched off in main mac). +/vis/viewer/refresh +# Print eps file +#/vis/oglx/printEPS diff --git a/examples/novice/N03/visTutor/exN03Vis13.mac b/examples/novice/N03/visTutor/exN03Vis13.mac new file mode 100644 index 0000000000..c2fae329bc --- /dev/null +++ b/examples/novice/N03/visTutor/exN03Vis13.mac @@ -0,0 +1,70 @@ +####################################################################### +# MACRO FILE NAME: exN03Vis13.mac # +# # +# AUTHOR(S): John Allison # +# # +# DATE: 18th August 2006 # +# # +# CONTENTS: Time development of an electrmagnetic shower. # +# # +# USAGE: % $G4BINDIR/exampleN03 visTutor/exN03Vis12.mac # +# # +# REQUIRED PLATFORMS & SOFTWARES: Mac/Unix with X-Windows, OpenGL # +# # +# ADDITIONAL NOTES: # +# # +####################################################################### + +/control/verbose 2 +/vis/verbose confirmations + +/vis/open OGLSX 600x600-0+0 +/vis/drawVolume +/vis/scene/add/eventID +/vis/scene/add/trajectories rich + +# Set up drawByParticleID with time slicing +/vis/modeling/trajectories/create/drawByParticleID +/vis/modeling/trajectories/drawByParticleID-0/set e- red +/vis/modeling/trajectories/drawByParticleID-0/set e+ blue +/vis/modeling/trajectories/drawByParticleID-0/set pi- cyan +/vis/modeling/trajectories/drawByParticleID-0/set pi+ magenta +#/vis/modeling/trajectories/drawByParticleID-0/default/setDrawStepPts true +/vis/modeling/trajectories/drawByParticleID-0/default/setStepPtsSize 5 +#/vis/modeling/trajectories/drawByParticleID-0/default/setDrawAuxPts true +/vis/modeling/trajectories/drawByParticleID-0/default/setAuxPtsSize 5 +/control/alias interval 0.01 +/control/alias halfInterval 0.005 +/vis/modeling/trajectories/drawByParticleID-0/default/setTimeSliceInterval {interval} ns +/vis/modeling/trajectories/list + +# Remove gammas +/vis/filtering/trajectories/create/particleFilter +/vis/filtering/trajectories/particleFilter-0/add gamma +/vis/filtering/trajectories/particleFilter-0/invert true + +# Create trajecgtories +/gun/energy 10 GeV +/vis/viewer/set/globalLineWidthScale 2 +/run/beamOn + +# Run time sequence +/vis/ogl/set/fade 1 +/vis/ogl/set/displayHeadTime true +# The trajectories can appear of jump ahead of the light front because +# their time range overlaps the viewer's time range. To mitigate this +# effect of discrete time intervals, advance the light front by half the +# trajectories interval... +/vis/ogl/set/displayLightFront true -90 0 0 mm -{halfInterval} ns +/vis/viewer/panTo -9 0 cm +/vis/viewer/zoomTo 2 +/control/alias timeRange 0.1 +/control/alias dx 0.3 +# Switch off auto-refresh to avoid refresh on /vis/viewer/pan in loop. +# (Then force refresh in loop.) +/vis/viewer/set/autoRefresh 0 +/vis/verbose warnings +/control/verbose 0 +/control/loop visTutor/exN03Vis13.loop endTime 0 0.7 0.001 +/control/verbose 2 +/vis/verbose confirmations diff --git a/examples/novice/N04/GNUmakefile b/examples/novice/N04/GNUmakefile index 7b2e79492d..c148b43fb7 100644 --- a/examples/novice/N04/GNUmakefile +++ b/examples/novice/N04/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.9 2004/12/16 09:15:19 gcosmo Exp $ +# $Id: GNUmakefile,v 1.11 2006/12/08 09:30:24 vnivanch Exp $ # -------------------------------------------------------------- # GNUmakefile for examples module. Gabriele Cosmo, 06/04/98. # -------------------------------------------------------------- @@ -11,16 +11,8 @@ ifndef G4INSTALL G4INSTALL = ../../.. endif -include hadronic_lists.gmk - .PHONY: all -all: had_list lib bin - -had_list: - @echo "This example uses the QGSP 'educated guess physics list'" - @echo "(see $(G4INSTALL)/physics_lists/hadronic)." - @echo "The hadronic physics lists should be compiled before" - @echo "compiling this example." +all: lib bin include $(G4INSTALL)/config/binmake.gmk diff --git a/examples/novice/N04/History b/examples/novice/N04/History index 5651028939..a8caf9ca66 100644 --- a/examples/novice/N04/History +++ b/examples/novice/N04/History @@ -1,4 +1,4 @@ -$Id: History,v 1.47 2006/06/16 10:16:45 gcosmo Exp $ +$Id: History,v 1.57 2006/12/12 11:59:13 gcosmo Exp $ ------------------------------------------------------------------- ========================================================= @@ -15,6 +15,42 @@ track of all tags. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +12-12-06 G.Cosmo (exampleN04-V08-01-08) +- Commented out drawing of hits in vis.mac. + +06-12-06 V.Ivanchenko (exampleN04-V08-01-07) +- GNUmakefile - remove obsolete echo + +23-11-06 Gunter Folger (exampleN04-V08-01-06) +- remove hadronic_lists.gmk + +17-11-06 Makoto Asai (exampleN04-V08-01-05) +- Fix a bug in ExN04CalorimeterSD::ProcessHits() concerning about the + transformation vector and rotation materix of the calorimater cell + in the readoout geometry. + +15-11-06 Joseph Perl (exampleN04-V08-01-04) +- Remove troublesome #include statement from ExNo4CalorimeterHit.hh + +13-11-06 Joseph Perl (exampleN04-V08-01-03) +- Change attribute name Type to HitType. +- Add HitType attribute to all hit classes. +- Skipped tag exampleN04-V08-02 since that tag seems to have been +- accidentally applied many months ago. + +08-11-06 Gunter Folger (exampleN04-V08-01-02) +- Adapt to moved physics lists, ie. phyisics lists are normal libraries + and special setup no longer needed. + +06-11-06 John Allison (exampleN04-V08-01-01) +- Add hits attributes for picking. +- Make material world and readout world top volumes invisible. +- Remove forcedWireframe from tracker and caloLayer. +- Set readout geometry name. + +19-10-06 John Allison (exampleN04-V08-01-00) +- Migrate to new trajectory modeling commands. + 16-06-06 Gabriele Cosmo (exampleN04-V08-00-01) - Use coherent allocation scheme for user-classes and initialisation in main(). diff --git a/examples/novice/N04/README b/examples/novice/N04/README index 45395525cd..6b22eb18d3 100644 --- a/examples/novice/N04/README +++ b/examples/novice/N04/README @@ -1,4 +1,4 @@ -$Id: README,v 1.5 2004/12/13 16:21:33 gcosmo Exp $ +$Id: README,v 1.6 2006/11/08 16:43:57 gunter Exp $ ------------------------------------------------------------------- ========================================================= @@ -33,25 +33,21 @@ a readout geometry to find the phi-z cell. The example uses the QGSP 'Educated guess physics list', which includes electro-magnetic and hadronic interactions. -3.1 Pre-compilation of the Hadronic Physics lists +3.1 Compilation of the Hadronic Physics lists The compilation of the example N04 requires the previous compilation of -the hadronic physics lists. You can check if they are already compiled -(they are NOT automatically compiled together with the standard Geant4 -libraries) by looking at the location -$(G4LIB)/plists/$(G4SYSTEM) +the hadronic physics lists, they ARE automatically compiled together with +the standard Geant4 libraries; you may disable building the physics lists +by setting G4LIB_BUILD_LISTS to NO. If you try to compile the example without the lists, you might probably get an error message during the linking phase, similar to the following: "Linking exampleN04 ... /usr/bin/ld: cannot find -lQGSP" -If they are not compiled yet, then you (or your Geant4 administrator) -can do it with the following steps a,b,c: -a. Make sure the Geant4 environment variables are defined - (this can be obtained for example in a CSH shell by sourcing the - Geant4 configuration file "env.csh" generated with your installation - through the Configure script) -b. cd $G4INSTALL/physics_lists/hadronic +If they are not compiled, then you (or your Geant4 administrator) +can do it with the following steps: +a. Make sure the Geant4 environment variables G4LIB_BUILD_lists is NOT defined +b. cd $G4INSTALL/source/physics_lists c. gmake 4. Event filtering by the stacking mechanism. diff --git a/examples/novice/N04/exampleN04.EMtest.out b/examples/novice/N04/exampleN04.EMtest.out index c4571a1b63..7690b789ed 100644 --- a/examples/novice/N04/exampleN04.EMtest.out +++ b/examples/novice/N04/exampleN04.EMtest.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -8,7 +8,7 @@ <<< Geant4 Physics List engine packaging library: PACK 5.1 -<<< Geant4 Physics List simulation engine: QGSP 3.1 +<<< Geant4 Physics List simulation engine: QGSP 3.2 Visualization Manager instantiating... Visualization Manager initialising... @@ -33,20 +33,22 @@ Registered model factories: drawByCharge drawByParticleID drawByOriginVolume - -Registered models: - None + drawByAttribute Registered filter factories: chargeFilter particleFilter originVolumeFilter + attributeFilter -Registered filters: - None - +### G4standard instantiates ionIoni for GenericIon +### G4standard instantiates ionIoni for He3 +### G4standard instantiates ionIoni for alpha +### Adding Neutron tracking cut for neutron +### cut value is 10 microseconds phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV Sampling according Klein-Nishina model @@ -54,7 +56,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.022 MeV to 100 GeV in 100 bins. @@ -86,13 +88,13 @@ eBrem: tables are built for e+ Total cross sections from a parametrisation based on the EEDL data library. Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. msc: Model variant of multiple scattering for proton Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + Boundary/stepping algorithm is active with facrange= 0.2 Step limitation 0 hIoni: tables are built for proton dE/dx and range tables from 100 eV to 100 TeV in 120 bins. @@ -102,7 +104,7 @@ hIoni: tables are built for proton Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 msc: Model variant of multiple scattering for GenericIon - Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + Boundary/stepping algorithm is active with facrange= 0.2 Step limitation 0 ionIoni: tables are built for GenericIon dE/dx and range tables from 100 eV to 100 TeV in 120 bins. @@ -157,6 +159,8 @@ muPairProd: tables are built for mu- Lambda tables from threshold to 100 TeV in 120 bins. Parametrised model +G4UHadronElasticProcess for neutron PDGcode= 2112 Elow(MeV)= 19 Elowest(eV)= 0 + hIoni: tables are built for pi+ dE/dx and range tables from 100 eV to 100 TeV in 120 bins. Lambda tables from threshold to 100 TeV in 120 bins. @@ -166,7 +170,7 @@ hIoni: tables are built for pi+ msc: Model variant of multiple scattering for pi- Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + Boundary/stepping algorithm is active with facrange= 0.2 Step limitation 0 hIoni: tables are built for pi- dE/dx and range tables from 100 eV to 100 TeV in 120 bins. @@ -179,9 +183,9 @@ Stage 0->1 : 1 hits found in the muon chamber. Stage 1->2 : 0 isolated muon found. ++++++++ event aborted >>> Event 0 - 21 hits are stored in ExN04TrackerHitsCollection. + 15 hits are stored in ExN04TrackerHitsCollection. 2 hits are stored in ExN04CalorimeterHitsCollection. - Total energy deposition in calorimeter : 0.17989462 (GeV) + Total energy deposition in calorimeter : 0.18110513 (GeV) 1 hits are stored in ExN04MuonHitsCollection. ### Run 1 start. Stage 0->1 : 1 hits found in the muon chamber. @@ -189,16 +193,16 @@ Stage 1->2 : 0 isolated muon found. ++++++++ event aborted >>> Event 0 20 hits are stored in ExN04TrackerHitsCollection. - 2 hits are stored in ExN04CalorimeterHitsCollection. - Total energy deposition in calorimeter : 0.18099089 (GeV) + 1 hits are stored in ExN04CalorimeterHitsCollection. + Total energy deposition in calorimeter : 0.18154018 (GeV) 1 hits are stored in ExN04MuonHitsCollection. Stage 0->1 : 1 hits found in the muon chamber. Stage 1->2 : 0 isolated muon found. ++++++++ event aborted >>> Event 1 - 20 hits are stored in ExN04TrackerHitsCollection. + 17 hits are stored in ExN04TrackerHitsCollection. 1 hits are stored in ExN04CalorimeterHitsCollection. - Total energy deposition in calorimeter : 0.17939312 (GeV) + Total energy deposition in calorimeter : 0.18062502 (GeV) 1 hits are stored in ExN04MuonHitsCollection. Graphics systems deleted. Visualization Manager deleting... diff --git a/examples/novice/N04/exampleN04.cc b/examples/novice/N04/exampleN04.cc index 0a7b827d65..c69228a8af 100644 --- a/examples/novice/N04/exampleN04.cc +++ b/examples/novice/N04/exampleN04.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: exampleN04.cc,v 1.12 2006/06/29 17:49:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: exampleN04.cc,v 1.14 2006/12/08 09:34:14 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/novice/N04/exampleN04.out b/examples/novice/N04/exampleN04.out index e00b4534f7..6f8e1eff07 100644 --- a/examples/novice/N04/exampleN04.out +++ b/examples/novice/N04/exampleN04.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -8,7 +8,7 @@ <<< Geant4 Physics List engine packaging library: PACK 5.1 -<<< Geant4 Physics List simulation engine: QGSP 3.1 +<<< Geant4 Physics List simulation engine: QGSP 3.2 Visualization Manager instantiating... Visualization Manager initialising... @@ -33,23 +33,25 @@ Registered model factories: drawByCharge drawByParticleID drawByOriginVolume - -Registered models: - None + drawByAttribute Registered filter factories: chargeFilter particleFilter originVolumeFilter + attributeFilter -Registered filters: - None - +### G4standard instantiates ionIoni for GenericIon +### G4standard instantiates ionIoni for He3 +### G4standard instantiates ionIoni for alpha +### Adding Neutron tracking cut for neutron +### cut value is 10 microseconds /run/verbose 1 /tracking/verbose 0 /run/beamOn 3 phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV Sampling according Klein-Nishina model @@ -57,7 +59,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.022 MeV to 100 GeV in 100 bins. @@ -89,13 +91,13 @@ eBrem: tables are built for e+ Total cross sections from a parametrisation based on the EEDL data library. Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. msc: Model variant of multiple scattering for proton Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + Boundary/stepping algorithm is active with facrange= 0.2 Step limitation 0 hIoni: tables are built for proton dE/dx and range tables from 100 eV to 100 TeV in 120 bins. @@ -105,7 +107,7 @@ hIoni: tables are built for proton Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 msc: Model variant of multiple scattering for GenericIon - Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + Boundary/stepping algorithm is active with facrange= 0.2 Step limitation 0 ionIoni: tables are built for GenericIon dE/dx and range tables from 100 eV to 100 TeV in 120 bins. @@ -160,6 +162,8 @@ muPairProd: tables are built for mu- Lambda tables from threshold to 100 TeV in 120 bins. Parametrised model +G4UHadronElasticProcess for neutron PDGcode= 2112 Elow(MeV)= 19 Elowest(eV)= 0 + hIoni: tables are built for pi+ dE/dx and range tables from 100 eV to 100 TeV in 120 bins. Lambda tables from threshold to 100 TeV in 120 bins. @@ -169,7 +173,7 @@ hIoni: tables are built for pi+ msc: Model variant of multiple scattering for pi- Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + Boundary/stepping algorithm is active with facrange= 0.2 Step limitation 0 hIoni: tables are built for pi- dE/dx and range tables from 100 eV to 100 TeV in 120 bins. @@ -223,9 +227,9 @@ Stage 0->1 : 1 hits found in the muon chamber. Stage 1->2 : 0 isolated muon found. ++++++++ event aborted >>> Event 0 - 226 hits are stored in ExN04TrackerHitsCollection. + 99 hits are stored in ExN04TrackerHitsCollection. 8 hits are stored in ExN04CalorimeterHitsCollection. - Total energy deposition in calorimeter : 0.22006457 (GeV) + Total energy deposition in calorimeter : 0.22225781 (GeV) 1 hits are stored in ExN04MuonHitsCollection. Stage 0->1 : 0 hits found in the muon chamber. ++++++++ event aborted @@ -238,14 +242,14 @@ Stage 0->1 : 1 hits found in the muon chamber. Stage 1->2 : 0 isolated muon found. ++++++++ event aborted >>> Event 2 - 123 hits are stored in ExN04TrackerHitsCollection. + 90 hits are stored in ExN04TrackerHitsCollection. 13 hits are stored in ExN04CalorimeterHitsCollection. - Total energy deposition in calorimeter : 0.34038849 (GeV) + Total energy deposition in calorimeter : 0.34422269 (GeV) 1 hits are stored in ExN04MuonHitsCollection. Run terminated. Run Summary Number of events processed : 3 - User=1.22s Real=1.41s Sys=0.06s + User=1.04s Real=1.23s Sys=0.02s Graphics systems deleted. Visualization Manager deleting... G4 kernel has come to Quit state. diff --git a/examples/novice/N04/include/ExN04CalorimeterHit.hh b/examples/novice/N04/include/ExN04CalorimeterHit.hh index efe0450d3e..bfd194fc59 100644 --- a/examples/novice/N04/include/ExN04CalorimeterHit.hh +++ b/examples/novice/N04/include/ExN04CalorimeterHit.hh @@ -35,6 +35,8 @@ #include "G4Transform3D.hh" #include "G4RotationMatrix.hh" +class G4AttDef; + class ExN04CalorimeterHit : public G4VHit { public: @@ -50,6 +52,8 @@ class ExN04CalorimeterHit : public G4VHit inline void operator delete(void *aHit); void Draw(); + const std::map* GetAttDefs() const; + std::vector* CreateAttValues() const; void Print(); private: @@ -59,6 +63,7 @@ class ExN04CalorimeterHit : public G4VHit G4ThreeVector pos; G4RotationMatrix rot; const G4LogicalVolume* pLogV; + static std::map fAttDefs; public: inline void SetCellID(G4int z,G4int phi) diff --git a/examples/novice/N04/include/ExN04MuonHit.hh b/examples/novice/N04/include/ExN04MuonHit.hh index 280be5dd09..6ba8624024 100644 --- a/examples/novice/N04/include/ExN04MuonHit.hh +++ b/examples/novice/N04/include/ExN04MuonHit.hh @@ -32,6 +32,8 @@ #include "G4Allocator.hh" #include "G4ThreeVector.hh" +class G4AttDef; + class ExN04MuonHit : public G4VHit { public: @@ -47,11 +49,14 @@ class ExN04MuonHit : public G4VHit inline void operator delete(void *aHit); void Draw(); + const std::map* GetAttDefs() const; + std::vector* CreateAttValues() const; void Print(); private: G4double edep; G4ThreeVector pos; + static std::map fAttDefs; public: inline void SetEdep(G4double de) diff --git a/examples/novice/N04/include/ExN04RunAction.hh b/examples/novice/N04/include/ExN04RunAction.hh index 28a1f46b5a..88684ffcb8 100644 --- a/examples/novice/N04/include/ExN04RunAction.hh +++ b/examples/novice/N04/include/ExN04RunAction.hh @@ -25,7 +25,7 @@ // // // $Id: ExN04RunAction.hh,v 1.5 2006/06/29 17:49:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N04/include/ExN04SteppingVerbose.hh b/examples/novice/N04/include/ExN04SteppingVerbose.hh index a823c5bba4..f32113578e 100644 --- a/examples/novice/N04/include/ExN04SteppingVerbose.hh +++ b/examples/novice/N04/include/ExN04SteppingVerbose.hh @@ -25,7 +25,7 @@ // // // $Id: ExN04SteppingVerbose.hh,v 1.2 2006/06/29 17:50:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // This class manages the verbose outputs in G4SteppingManager. // It inherits from G4SteppingVerbose. diff --git a/examples/novice/N04/include/ExN04TrackerHit.hh b/examples/novice/N04/include/ExN04TrackerHit.hh index 4f10cbc766..fbeea821ad 100644 --- a/examples/novice/N04/include/ExN04TrackerHit.hh +++ b/examples/novice/N04/include/ExN04TrackerHit.hh @@ -32,6 +32,8 @@ #include "G4Allocator.hh" #include "G4ThreeVector.hh" +class G4AttDef; + class ExN04TrackerHit : public G4VHit { public: @@ -46,11 +48,14 @@ class ExN04TrackerHit : public G4VHit inline void operator delete(void *aHit); void Draw(); + const std::map* GetAttDefs() const; + std::vector* CreateAttValues() const; void Print(); private: G4double edep; G4ThreeVector pos; + static std::map fAttDefs; public: inline void SetEdep(G4double de) diff --git a/examples/novice/N04/src/ExN04CalorimeterHit.cc b/examples/novice/N04/src/ExN04CalorimeterHit.cc index 83356b4fa6..d74a2d34a3 100644 --- a/examples/novice/N04/src/ExN04CalorimeterHit.cc +++ b/examples/novice/N04/src/ExN04CalorimeterHit.cc @@ -30,6 +30,11 @@ #include "G4Colour.hh" #include "G4VisAttributes.hh" #include "G4LogicalVolume.hh" +#include "G4UIcommand.hh" +#include "G4UnitsTable.hh" +#include "G4AttValue.hh" +#include "G4AttDef.hh" +#include "G4AttCheck.hh" G4Allocator ExN04CalorimeterHitAllocator; @@ -70,6 +75,8 @@ G4int ExN04CalorimeterHit::operator==(const ExN04CalorimeterHit &right) const return ((ZCellID==right.ZCellID)&&(PhiCellID==right.PhiCellID)); } +std::map ExN04CalorimeterHit::fAttDefs; + void ExN04CalorimeterHit::Draw() { G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance(); @@ -81,12 +88,41 @@ void ExN04CalorimeterHit::Draw() if(pVA) attribs = *pVA; G4Colour colour(1.,0.,0.); attribs.SetColour(colour); - attribs.SetForceWireframe(false); attribs.SetForceSolid(true); pVVisManager->Draw(*pLogV,attribs,trans); } } +const std::map* ExN04CalorimeterHit::GetAttDefs() const +{ + // G4AttDefs have to have long life. Use static member... + if (fAttDefs.empty()) { + fAttDefs["HitType"] = + G4AttDef("HitType","Type of hit","Physics","","G4String"); + fAttDefs["ZID"] = G4AttDef("ZID","Z Cell ID","Physics","","G4int"); + fAttDefs["PhiID"] = G4AttDef("PhiID","Phi Cell ID","Physics","","G4int"); + fAttDefs["EDep"] = + G4AttDef("EDep","Energy deposited","Physics","G4BestUnit","G4double"); + } + return &fAttDefs; +} + +std::vector* ExN04CalorimeterHit::CreateAttValues() const +{ + // Create expendable G4AttsValues for picking... + std::vector* attValues = new std::vector; + attValues->push_back + (G4AttValue("HitType","ExN04CalorimeterHit","")); + attValues->push_back + (G4AttValue("ZID",G4UIcommand::ConvertToString(ZCellID),"")); + attValues->push_back + (G4AttValue("PhiID",G4UIcommand::ConvertToString(PhiCellID),"")); + attValues->push_back + (G4AttValue("EDep",G4BestUnit(edep,"Energy"),"")); + //G4cout << "Checking...\n" << G4AttCheck(attValues, GetAttDefs()); + return attValues; +} + void ExN04CalorimeterHit::Print() {;} diff --git a/examples/novice/N04/src/ExN04CalorimeterROGeometry.cc b/examples/novice/N04/src/ExN04CalorimeterROGeometry.cc index 34a6036755..9122027f3e 100644 --- a/examples/novice/N04/src/ExN04CalorimeterROGeometry.cc +++ b/examples/novice/N04/src/ExN04CalorimeterROGeometry.cc @@ -35,7 +35,7 @@ #include "G4Tubs.hh" #include "G4ThreeVector.hh" #include "G4Material.hh" - +#include "G4VisAttributes.hh" ExN04CalorimeterROGeometry::ExN04CalorimeterROGeometry() : G4VReadOutGeometry() @@ -65,6 +65,7 @@ G4VPhysicalVolume* ExN04CalorimeterROGeometry::Build() G4Box *ROWorldBox = new G4Box("ROWorldBox", expHall_x, expHall_y, expHall_z); G4LogicalVolume *ROWorldLog = new G4LogicalVolume(ROWorldBox, dummyMat, "ROWorldLogical", 0, 0, 0); + ROWorldLog->SetVisAttributes(G4VisAttributes::Invisible); G4PVPlacement *ROWorldPhys = new G4PVPlacement(0,G4ThreeVector(), "ROWorldPhysical", ROWorldLog, diff --git a/examples/novice/N04/src/ExN04CalorimeterSD.cc b/examples/novice/N04/src/ExN04CalorimeterSD.cc index fd5fc04e22..82811ea6b9 100644 --- a/examples/novice/N04/src/ExN04CalorimeterSD.cc +++ b/examples/novice/N04/src/ExN04CalorimeterSD.cc @@ -76,11 +76,11 @@ G4bool ExN04CalorimeterSD::ProcessHits(G4Step*aStep,G4TouchableHistory*ROhist) ExN04CalorimeterHit* calHit = new ExN04CalorimeterHit (physVol->GetLogicalVolume(),copyIDinZ,copyIDinPhi); - G4RotationMatrix rotM; - if(physVol->GetObjectRotation()) rotM = *(physVol->GetObjectRotation()); calHit->SetEdep( edep ); - calHit->SetPos( physVol->GetTranslation() ); - calHit->SetRot( rotM ); + G4AffineTransform aTrans = ROhist->GetHistory()->GetTopTransform(); + aTrans.Invert(); + calHit->SetPos(aTrans.NetTranslation()); + calHit->SetRot(aTrans.NetRotation()); G4int icell = CalCollection->insert( calHit ); CellID[copyIDinZ][copyIDinPhi] = icell - 1; if(verboseLevel>0) diff --git a/examples/novice/N04/src/ExN04DetectorConstruction.cc b/examples/novice/N04/src/ExN04DetectorConstruction.cc index e2d3627e9a..a07cf7b404 100644 --- a/examples/novice/N04/src/ExN04DetectorConstruction.cc +++ b/examples/novice/N04/src/ExN04DetectorConstruction.cc @@ -125,10 +125,7 @@ G4VPhysicalVolume* ExN04DetectorConstruction::Construct() G4VPhysicalVolume * experimentalHall_phys = new G4PVPlacement(0,G4ThreeVector(),experimentalHall_log,"expHall_P", 0,false,0); - G4VisAttributes* experimentalHallVisAtt - = new G4VisAttributes(G4Colour(1.0,1.0,1.0)); - experimentalHallVisAtt->SetForceWireframe(true); - experimentalHall_log->SetVisAttributes(experimentalHallVisAtt); + experimentalHall_log->SetVisAttributes(G4VisAttributes::GetInvisible()); //------------------------------ tracker G4VSolid * tracker_tubs @@ -141,7 +138,6 @@ G4VPhysicalVolume* ExN04DetectorConstruction::Construct() experimentalHall_log,false,0); G4VisAttributes* tracker_logVisAtt = new G4VisAttributes(G4Colour(1.0,0.0,1.0)); - tracker_logVisAtt->SetForceWireframe(true); tracker_log->SetVisAttributes(tracker_logVisAtt); //------------------------------ tracker layers @@ -193,7 +189,6 @@ G4VPhysicalVolume* ExN04DetectorConstruction::Construct() kXAxis, nocaloLayers, calorimeterParam); G4VisAttributes* caloLayer_logVisAtt = new G4VisAttributes(G4Colour(0.7,1.0,0.0)); - caloLayer_logVisAtt->SetForceWireframe(true); caloLayer_log->SetVisAttributes(caloLayer_logVisAtt); //------------------------------ muon counters @@ -239,6 +234,7 @@ G4VPhysicalVolume* ExN04DetectorConstruction::Construct() G4String ROgeometryName = "CalorimeterROGeom"; G4VReadOutGeometry* calRO = new ExN04CalorimeterROGeometry(ROgeometryName); calRO->BuildROGeometry(); + calRO->SetName(ROgeometryName); calorimeterSD->SetROgeometry(calRO); SDman->AddNewDetector(calorimeterSD); calorimeter_log->SetSensitiveDetector(calorimeterSD); diff --git a/examples/novice/N04/src/ExN04MuonHit.cc b/examples/novice/N04/src/ExN04MuonHit.cc index 09af3ac06e..ee4882f843 100644 --- a/examples/novice/N04/src/ExN04MuonHit.cc +++ b/examples/novice/N04/src/ExN04MuonHit.cc @@ -29,7 +29,10 @@ #include "G4Circle.hh" #include "G4Colour.hh" #include "G4VisAttributes.hh" - +#include "G4UnitsTable.hh" +#include "G4AttValue.hh" +#include "G4AttDef.hh" +#include "G4AttCheck.hh" G4Allocator ExN04MuonHitAllocator; @@ -58,6 +61,8 @@ G4int ExN04MuonHit::operator==(const ExN04MuonHit &right) const return (this==&right) ? 1 : 0; } +std::map ExN04MuonHit::fAttDefs; + void ExN04MuonHit::Draw() { G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance(); @@ -73,6 +78,26 @@ void ExN04MuonHit::Draw() } } +const std::map* ExN04MuonHit::GetAttDefs() const +{ + // G4AttDefs have to have long life. Use static member... + if (fAttDefs.empty()) { + fAttDefs["HitType"] = + G4AttDef("HitType","Type of hit","Physics","","G4String"); + } + return &fAttDefs; +} + +std::vector* ExN04MuonHit::CreateAttValues() const +{ + // Create expendable G4AttsValues for picking... + std::vector* attValues = new std::vector; + attValues->push_back + (G4AttValue("HitType","ExN04MuonHit","")); + //G4cout << "Checking...\n" << G4AttCheck(attValues, GetAttDefs()); + return attValues; +} + void ExN04MuonHit::Print() {;} diff --git a/examples/novice/N04/src/ExN04RunAction.cc b/examples/novice/N04/src/ExN04RunAction.cc index 90c1d6f297..76ec943c1d 100644 --- a/examples/novice/N04/src/ExN04RunAction.cc +++ b/examples/novice/N04/src/ExN04RunAction.cc @@ -25,7 +25,7 @@ // // // $Id: ExN04RunAction.cc,v 1.5 2006/06/29 17:51:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N04/src/ExN04SteppingVerbose.cc b/examples/novice/N04/src/ExN04SteppingVerbose.cc index 8895db3d47..0917201154 100644 --- a/examples/novice/N04/src/ExN04SteppingVerbose.cc +++ b/examples/novice/N04/src/ExN04SteppingVerbose.cc @@ -25,7 +25,7 @@ // // // $Id: ExN04SteppingVerbose.cc,v 1.4 2006/06/29 17:51:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N04/src/ExN04TrackerHit.cc b/examples/novice/N04/src/ExN04TrackerHit.cc index 90b9e89201..262247f72c 100644 --- a/examples/novice/N04/src/ExN04TrackerHit.cc +++ b/examples/novice/N04/src/ExN04TrackerHit.cc @@ -29,7 +29,10 @@ #include "G4Circle.hh" #include "G4Colour.hh" #include "G4VisAttributes.hh" - +#include "G4UnitsTable.hh" +#include "G4AttValue.hh" +#include "G4AttDef.hh" +#include "G4AttCheck.hh" G4Allocator ExN04TrackerHitAllocator; @@ -58,6 +61,8 @@ G4int ExN04TrackerHit::operator==(const ExN04TrackerHit &right) const return (this==&right) ? 1 : 0; } +std::map ExN04TrackerHit::fAttDefs; + void ExN04TrackerHit::Draw() { G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance(); @@ -73,6 +78,26 @@ void ExN04TrackerHit::Draw() } } +const std::map* ExN04TrackerHit::GetAttDefs() const +{ + // G4AttDefs have to have long life. Use static member... + if (fAttDefs.empty()) { + fAttDefs["HitType"] = + G4AttDef("HitType","Type of hit","Physics","","G4String"); + } + return &fAttDefs; +} + +std::vector* ExN04TrackerHit::CreateAttValues() const +{ + // Create expendable G4AttsValues for picking... + std::vector* attValues = new std::vector; + attValues->push_back + (G4AttValue("HitType","ExN04TrackerHit","")); + //G4cout << "Checking...\n" << G4AttCheck(attValues, GetAttDefs()); + return attValues; +} + void ExN04TrackerHit::Print() {;} diff --git a/examples/novice/N04/vis.mac b/examples/novice/N04/vis.mac index aca6dd7eb6..048473014b 100644 --- a/examples/novice/N04/vis.mac +++ b/examples/novice/N04/vis.mac @@ -17,22 +17,28 @@ /vis/open OGLIX # ####/vis/open DAWNFILE +####/vis/open OIX # # draw scene # /vis/viewer/set/viewpointThetaPhi 90 180 deg /vis/viewer/zoom 1.4 -/vis/viewer/flush # # for drawing the tracks # Draw trajectories at end of event, showing trajectory points as -# markers of size 2 pixels (parameter/1000). -/vis/scene/add/trajectories 2000 -# (if too many tracks cause core dump => storeTrajectory 0) -/tracking/storeTrajectory 1 +# markers of size 2 pixels +/vis/scene/add/trajectories +/vis/modeling/trajectories/create/drawByCharge +/vis/modeling/trajectories/drawByCharge-0/default/setDrawStepPts true +/vis/modeling/trajectories/drawByCharge-0/default/setStepPtsSize 2 +# (if too many tracks cause core dump => /tracking/storeTrajectory 0) +# +# for drawing the hits uncomment following line +# /vis/scene/add/hits +# /vis/scene/endOfEventAction accumulate # # Refresh ready for run -/vis/viewer/refresh +/vis/viewer/flush # # Now ready for /run/beamOn. diff --git a/examples/novice/N05/History b/examples/novice/N05/History index 9819093cda..33894696ec 100644 --- a/examples/novice/N05/History +++ b/examples/novice/N05/History @@ -1,4 +1,4 @@ -$Id: History,v 1.34 2006/06/28 18:34:22 asaim Exp $ +$Id: History,v 1.43 2006/11/18 03:41:51 asaim Exp $ ------------------------------------------------------------------- ========================================================= @@ -15,6 +15,23 @@ track of all tags. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +17th November 2006 Makoto Asai (exampleN05-V08-01-01) +- Fix a bug in ExN05CalorimeterSD.cc which was originated from ExN04CalorimeterSD.cc + +14th November 2006 Gabriele Cosmo (exampleN05-V08-01-00) +- Removed debug printout in ExN05PionShowerModel and ExN05EMShowerModel + DoIt() methods. + +10th November 2006 Marc Verderi +- Changed in physics list to use G4FastSimulationManagerProcess81. + +3rd November 2006 Marc Verderi +- Moved to new parallel geometry scheme, with addition of + ExN05ParallelWorldForPion and removal of ghosts in the + ExN05DetectorConstruction. +- Clean up of the XXXCuts classes, as they are not of primary need for the + example. + 28th June 2006 Makoto Asai (exampleN05-V08-00-01) - Fix a memory leak in ExN05PionShowerModel.cc diff --git a/examples/novice/N05/exampleN05.cc b/examples/novice/N05/exampleN05.cc index fa492dfb58..c7ab7f29b4 100644 --- a/examples/novice/N05/exampleN05.cc +++ b/examples/novice/N05/exampleN05.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: exampleN05.cc,v 1.14 2006/06/29 17:52:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: exampleN05.cc,v 1.15 2006/11/03 17:58:49 mverderi Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- @@ -50,20 +50,23 @@ //--------------------------- #include "G4GlobalFastSimulationManager.hh" -//-------------------- -// Detector: -//-------------------- +//------------ +// Geometries: +//------------ #include "ExN05DetectorConstruction.hh" +#include "ExN05ParallelWorldForPion.hh" -//---------------------------------- -// ExN05PhysicsList makes use of the -// G4ParameterisationManagerProcess -//---------------------------------- +//----------------------------------- +// ExN05PhysicsList (makes use of the +// G4ParameterisationManagerProcess): +//----------------------------------- #include "ExN05PhysicsList.hh" #include "G4UIterminal.hh" #include "G4UImanager.hh" #include "G4RunManager.hh" +#include "G4RunManagerKernel.hh" + #ifdef G4VIS_USE #include "G4VisExecutive.hh" @@ -79,13 +82,17 @@ int main(int argc, char** argv) G4cout << "RunManager construction starting...." << G4endl; G4RunManager * runManager = new G4RunManager; - // Detector geometry + // Detector/mass geometry and parallel geometry(ies): G4VUserDetectorConstruction* detector = new ExN05DetectorConstruction(); + // -- Parallel geometry for pion parameterisation + detector->RegisterParallelWorld(new ExN05ParallelWorldForPion("pionGhostWorld")); + // -- The name passed must be the same passed to the + // -- G4FastSimulationManagerProcess attached to the pions runManager->SetUserInitialization(detector); - + // PhysicsList (including G4FastSimulationManagerProcess) - G4VUserPhysicsList* physics = new ExN05PhysicsList; - runManager->SetUserInitialization(physics); + G4VUserPhysicsList* physicsList = new ExN05PhysicsList; + runManager->SetUserInitialization(physicsList); //------------------------------- // UserAction classes @@ -106,13 +113,8 @@ int main(int argc, char** argv) // runManager->Initialize(); - // Close the "fast simulation" - // Will trigger the ghost geometries construction - // - G4GlobalFastSimulationManager::GetGlobalFastSimulationManager()-> - CloseFastSimulation(); + // -- needed for command /param/showSetup: G4RunManagerKernel::GetRunManagerKernel()->RunInitialization(); - //---------------- // Visualization: //---------------- diff --git a/examples/novice/N05/exampleN05.in b/examples/novice/N05/exampleN05.in index a71643c8fd..234d9b4b6f 100644 --- a/examples/novice/N05/exampleN05.in +++ b/examples/novice/N05/exampleN05.in @@ -4,7 +4,7 @@ /gun/energy 1 GeV /gun/position 0 0 0 # -#/tracking/verbose 1 +/tracking/verbose 1 # /gun/direction 0 .6 1. /run/beamOn 5 @@ -37,26 +37,6 @@ /gun/direction 0 -.6 1. /run/beamOn 5 # -# -# switch off Fast Simulation -# -/gun/particle e- -# -/process/inactivate G4FastSimulationManagerProcess -# -# switch off UserLimits -/exN05/detector/switchUserLimits off -# -/gun/direction 0 .6 1. -/run/beamOn 5 -# -# switch on UserLimits -/exN05/detector/switchUserLimits on -# -/gun/direction 0 .6 1. -/run/beamOn 5 -# - exit diff --git a/examples/novice/N05/exampleN05.large_N.in b/examples/novice/N05/exampleN05.large_N.in index 5037a23bb7..c5aa810e95 100644 --- a/examples/novice/N05/exampleN05.large_N.in +++ b/examples/novice/N05/exampleN05.large_N.in @@ -43,19 +43,11 @@ # /process/inactivate G4FastSimulationManagerProcess # -# switch off UserLimits -/exN05/detector/switchUserLimits off -# -/gun/direction 0 .6 1. -/run/beamOn 250 -# -# switch on UserLimits -/exN05/detector/switchUserLimits on -# /gun/direction 0 .6 1. /run/beamOn 250 # + exit diff --git a/examples/novice/N05/exampleN05.out b/examples/novice/N05/exampleN05.out index c4b13d7d81..dfae63a65d 100644 --- a/examples/novice/N05/exampleN05.out +++ b/examples/novice/N05/exampleN05.out @@ -1,7 +1,7 @@ RunManager construction starting.... ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -10,7 +10,11 @@ RunManager construction starting.... ExN05DetectorConstruction.... -Closing Fast-Simulation ... +Declaring region... +... region declared. Setting it the ghostLogical volume... +... succes. + +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release Instantiating Visualization Manager....... Visualization Manager instantiating... Visualization Manager initialising... @@ -35,21 +39,17 @@ Registered model factories: drawByCharge drawByParticleID drawByOriginVolume - -Registered models: - None + drawByAttribute Registered filter factories: chargeFilter particleFilter originVolumeFilter - -Registered filters: - None + attributeFilter conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.022 MeV to 100 GeV in 100 bins. @@ -59,6 +59,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model msc: Model variant of multiple scattering for e- Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -88,7 +89,7 @@ eBrem: tables are built for e+ Total cross sections from a parametrisation based on the EEDL data library. Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -168,434 +169,4333 @@ hIoni: tables are built for pi- msc: Model variant of multiple scattering for pi- Lambda tables from 100 eV to 100 TeV in 120 bins. Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release ### Run 0 start. -ExN05EMShowerModel::DoIt +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0.000748 51.7 86.1 1e+03 0.0188 100 100 WorldPhysical eIoni + 2 0.000477 60 100 1e+03 0.00337 16.2 117 DriftChamberPhysical CoupledTransportation + 3 0.0015 72 120 1e+03 0.00103 23.4 140 DriftChamberPhysical eIoni + 4 0.00167 73.4 122 1e+03 5.34e-05 2.68 143 DriftChamberPhysical eIoni + 5 0.0708 267 446 1e+03 0.0122 377 520 DriftChamberPhysical msc + 6 0.0906 332 554 1e+03 0.00494 127 646 DriftChamberPhysical eIoni + 7 0.144 526 878 1e+03 0.0146 377 1.02e+03 DriftChamberPhysical msc + 8 0.147 540 900 1e+03 0.000637 26 1.05e+03 WorldPhysical CoupledTransportation + 9 0.148 550 916 1e+03 0.00311 19.1 1.07e+03 WorldPhysical eIoni + 10 0.147 562 937 1e+03 0.00434 24.2 1.09e+03 WorldPhysical eIoni + 11 0.145 568 947 1e+03 0.00307 11 1.1e+03 WorldPhysical eIoni + 12 0.142 588 980 1e+03 0.00858 39.4 1.14e+03 WorldPhysical eIoni + 13 0.142 589 982 1e+03 0.000201 1.46 1.14e+03 WorldPhysical eIoni + 14 0.139 600 1e+03 1e+03 0.00423 21.4 1.17e+03 Crystal CoupledTransportation + 15 0.139 600 1e+03 0 1e+03 0 1.17e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 10, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.142 589 982 0.0318 0 0 0 WorldPhysical initStep + 1 0.78 591 980 0.0294 0.00241 2.52 2.52 WorldPhysical msc + 2 0.789 591 980 0.0273 5.54e-05 0.154 2.67 WorldPhysical eIoni + 3 0.966 592 976 0.024 0.0033 4.72 7.39 WorldPhysical eIoni + 4 -0.981 592 973 0.0181 0.00589 4.03 11.4 WorldPhysical eIoni + 5 -2.76 593 971 0.0144 0.00369 2.98 14.4 WorldPhysical eIoni + 6 -3.26 592 970 0.0132 0.00118 1 15.4 WorldPhysical eIoni + 7 -4.73 591 970 0.0081 0.00513 2.25 17.6 WorldPhysical eIoni + 8 -4.24 591 971 0.00263 0.00547 1.47 19.1 WorldPhysical eIoni + 9 -4.21 591 971 0 0.00263 0.242 19.4 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 11, Parent ID = 10 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.789 591 980 0.00201 0 0 0 WorldPhysical initStep + 1 0.795 591 980 0.002 4.92e-06 0.0058 0.0058 WorldPhysical msc + 2 0.856 591 980 0 0.002 0.156 0.162 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 9, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.142 588 980 0.00213 0 0 0 WorldPhysical initStep + 1 0.147 588 980 0.0019 0.00023 0.00593 0.00593 WorldPhysical msc + 2 0.188 588 980 0 0.0019 0.144 0.15 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 8, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.145 568 947 0.0117 0 0 0 WorldPhysical initStep + 1 0.0424 568 947 0.0115 0.000105 0.137 0.137 WorldPhysical msc + 2 -1.35 567 946 0.00753 0.00402 2.01 2.15 WorldPhysical eIoni + 3 -2.12 567 946 0.00241 0.00512 1.37 3.52 WorldPhysical eIoni + 4 -2.17 567 946 0 0.00241 0.21 3.73 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 7, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.147 562 937 0.00121 0 0 0 WorldPhysical initStep + 1 0.149 562 937 0.00114 6.89e-05 0.00546 0.00546 WorldPhysical msc + 2 0.156 562 937 0 0.00114 0.0694 0.0749 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 6, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.148 550 916 0.00165 0 0 0 WorldPhysical initStep + 1 0.153 550 916 0.00163 2.42e-05 0.00501 0.00501 WorldPhysical msc + 2 0.199 550 916 0 0.00163 0.115 0.12 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0906 332 554 0.00169 0 0 0 DriftChamberPhysical initStep + 1 -0.11 332 555 0 0.00169 0.672 0.672 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00167 73.4 122 0.00211 0 0 0 DriftChamberPhysical initStep + 1 -0.649 73.6 122 0 0.00211 0.968 0.968 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0015 72 120 0.0126 0 0 0 DriftChamberPhysical initStep + 1 -1.82 68.4 125 0.0109 0.00165 6.19 6.19 DriftChamberPhysical eIoni + 2 -4.38 64.8 127 0.00914 0.00176 5.15 11.3 DriftChamberPhysical eIoni + 3 -7.83 63.2 128 0.00725 0.00189 4.13 15.5 DriftChamberPhysical eIoni + 4 -10.6 62.5 127 0.00524 0.00201 3.2 18.7 DriftChamberPhysical eIoni + 5 -11.4 62 125 0.00305 0.0022 2.37 21 DriftChamberPhysical eIoni + 6 -11.7 62 124 0.00122 0.00183 1.51 22.5 DriftChamberPhysical eIoni + 7 -11.3 61.9 124 0 0.00122 0.408 23 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.000748 51.7 86.1 0.00126 0 0 0 WorldPhysical initStep + 1 0.00344 51.7 86.1 0.0011 0.000156 0.00623 0.00623 WorldPhysical msc + 2 0.0236 51.6 86.1 0 0.0011 0.0663 0.0725 WorldPhysical eIoni >>> Event 0 - 12 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.999908 (GeV) - 0 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 0 (GeV) -ExN05EMShowerModel::DoIt ->>> Event 1 - 10 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.999914 (GeV) - 0 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 0 (GeV) -ExN05EMShowerModel::DoIt ->>> Event 2 - 12 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.999915 (GeV) - 0 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 0 (GeV) -ExN05EMShowerModel::DoIt ->>> Event 3 - 12 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.999905 (GeV) - 0 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 0 (GeV) -ExN05EMShowerModel::DoIt ->>> Event 4 11 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.999923 (GeV) + Total energy deposition in EM calorimeter crytals : 0.9998547821839838 (GeV) + 0 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 -0.00255 13.6 22.6 1e+03 0.00717 26.4 26.4 WorldPhysical eIoni + 2 -0.00178 34.8 58 1e+03 0.00654 41.2 67.6 WorldPhysical eIoni + 3 -0.000289 49.8 83 1e+03 0.006 29.2 96.8 WorldPhysical eIoni + 4 -0.00017 60 100 1e+03 0.00362 19.8 117 DriftChamberPhysical CoupledTransportation + 5 0.00199 82.2 137 1e+03 0.00185 43.1 160 DriftChamberPhysical eIoni + 6 0.00452 182 304 1e+03 0.0065 194 354 DriftChamberPhysical msc + 7 0.00323 225 375 1e+03 0.0026 82.7 437 DriftChamberPhysical eIoni + 8 -0.00476 325 541 1e+03 0.00684 194 631 DriftChamberPhysical msc + 9 -0.0139 425 708 1e+03 0.00685 194 826 DriftChamberPhysical msc + 10 -0.0325 525 875 1e+03 0.00658 194 1.02e+03 DriftChamberPhysical msc + 11 -0.0361 540 900 1e+03 0.00125 29.3 1.05e+03 WorldPhysical CoupledTransportation + 12 -0.0508 600 1e+03 1e+03 0.0228 117 1.17e+03 Crystal CoupledTransportation + 13 -0.0508 600 1e+03 0 1e+03 0 1.17e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 6, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00323 225 375 0.00534 0 0 0 DriftChamberPhysical initStep + 1 2.21 225 374 0.004 0.00134 2.41 2.41 DriftChamberPhysical eIoni + 2 3.07 227 374 0.00137 0.00263 1.9 4.3 DriftChamberPhysical eIoni + 3 3.39 227 373 0 0.00137 0.487 4.79 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00199 82.2 137 0.00102 0 0 0 DriftChamberPhysical initStep + 1 -0.0678 82 137 0 0.00102 0.317 0.317 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.000289 49.8 83 0.00178 0 0 0 WorldPhysical initStep + 1 0.00245 49.8 83 0.00178 0 0.0052 0.0052 WorldPhysical msc + 2 0.0381 49.9 83 0 0.00178 0.131 0.136 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.00178 34.8 58 0.00108 0 0 0 WorldPhysical initStep + 1 -0.00549 34.8 58 0.00108 0 0.00371 0.00371 WorldPhysical msc + 2 -0.0301 34.8 58 0 0.00108 0.0641 0.0678 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.00255 13.6 22.6 0.00213 0 0 0 WorldPhysical initStep + 1 0.00297 13.6 22.6 0.0021 2.21e-05 0.00593 0.00593 WorldPhysical msc + 2 0.0477 13.6 22.6 0 0.0021 0.17 0.175 WorldPhysical eIoni +>>> Event 1 + 12 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.9999100819856669 (GeV) + 0 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0 (GeV) + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0 60 100 1e+03 0.0282 117 117 DriftChamberPhysical CoupledTransportation + 2 0.0531 281 469 1e+03 0.0133 430 547 DriftChamberPhysical msc + 3 0.107 503 838 1e+03 0.013 430 977 DriftChamberPhysical msc + 4 0.11 540 900 1e+03 0.00204 72.1 1.05e+03 DriftChamberPhysical msc + 5 0.11 540 900 1e+03 3.13e-12 9.77e-08 1.05e+03 WorldPhysical CoupledTransportation + 6 0.117 564 939 1e+03 0.00889 45.9 1.1e+03 WorldPhysical eIoni + 7 0.119 576 960 1e+03 0.00491 23.5 1.12e+03 WorldPhysical eIoni + 8 0.124 600 1e+03 1e+03 0.0106 47.2 1.17e+03 Crystal CoupledTransportation + 9 0.124 600 1e+03 0 1e+03 0 1.17e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.119 576 960 0.00225 0 0 0 WorldPhysical initStep + 1 0.118 576 960 0.00219 5.99e-05 0.00889 0.00889 WorldPhysical msc + 2 0.0936 576 959 0 0.00219 0.181 0.19 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.117 564 939 0.00113 0 0 0 WorldPhysical initStep + 1 0.114 564 939 0.00105 7.55e-05 0.00381 0.00381 WorldPhysical msc + 2 0.0921 564 939 0 0.00105 0.0622 0.066 WorldPhysical eIoni +>>> Event 2 + 11 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.9999157352050001 (GeV) + 0 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0 (GeV) + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0 60 100 1e+03 0.0272 117 117 DriftChamberPhysical CoupledTransportation + 2 -0.0576 217 361 1e+03 0.011 305 421 DriftChamberPhysical msc + 3 -0.0884 325 542 1e+03 0.006 211 632 DriftChamberPhysical eIoni + 4 -0.103 370 616 1e+03 0.0021 85.9 718 DriftChamberPhysical eIoni + 5 -0.126 496 826 1e+03 0.00749 245 963 DriftChamberPhysical eIoni + 6 -0.135 540 900 1e+03 0.00331 86.3 1.05e+03 DriftChamberPhysical msc + 7 -0.135 540 900 1e+03 1.58e-12 4.95e-08 1.05e+03 WorldPhysical CoupledTransportation + 8 -0.146 600 1e+03 1e+03 0.0248 117 1.17e+03 Crystal CoupledTransportation + 9 -0.146 600 1e+03 0 1e+03 0 1.17e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.126 496 826 0.00159 0 0 0 DriftChamberPhysical initStep + 1 -0.319 496 826 0 0.00159 0.609 0.609 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.103 370 616 0.00315 0 0 0 DriftChamberPhysical initStep + 1 1.1 370 616 0.00111 0.00205 1.55 1.55 DriftChamberPhysical eIoni + 2 1.09 371 616 0 0.00111 0.358 1.91 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0884 325 542 0.0136 0 0 0 DriftChamberPhysical initStep + 1 -6.51 326 545 0.0112 0.00246 7.01 7.01 DriftChamberPhysical eIoni + 2 -9.08 330 546 0.00927 0.00191 5.33 12.3 DriftChamberPhysical eIoni + 3 -10.4 334 546 0.00617 0.0031 4.2 16.5 DriftChamberPhysical eIoni + 4 -12.7 335 546 0.00426 0.00191 2.73 19.3 DriftChamberPhysical eIoni + 5 -14.6 336 546 0.00254 0.00172 2 21.3 DriftChamberPhysical eIoni + 6 -15.6 335 546 0.000452 0.00209 1.25 22.5 DriftChamberPhysical eIoni + 7 -15.6 335 546 0 0.000452 0.12 22.6 DriftChamberPhysical eIoni +>>> Event 3 + 13 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.9998997429738716 (GeV) + 0 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0 (GeV) + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0 60 100 1e+03 0.0231 117 117 DriftChamberPhysical CoupledTransportation + 2 -0.0911 271 451 1e+03 0.0128 409 526 DriftChamberPhysical msc + 3 -0.102 303 504 1e+03 0.00198 62.2 588 DriftChamberPhysical eIoni + 4 -0.126 388 646 1e+03 0.00522 165 754 DriftChamberPhysical eIoni + 5 -0.132 432 720 1e+03 0.00282 86.5 840 DriftChamberPhysical eIoni + 6 -0.15 477 795 1e+03 0.00294 87 927 DriftChamberPhysical eIoni + 7 -0.17 540 900 1e+03 0.00341 122 1.05e+03 DriftChamberPhysical msc + 8 -0.17 540 900 1e+03 8.04e-12 2.51e-07 1.05e+03 WorldPhysical CoupledTransportation + 9 -0.19 569 949 1e+03 0.0129 56.9 1.11e+03 WorldPhysical eIoni + 10 -0.195 600 1e+03 1e+03 0.014 59.7 1.17e+03 Crystal CoupledTransportation + 11 -0.195 600 1e+03 0 1e+03 0 1.17e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 6, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.19 569 949 0.00195 0 0 0 WorldPhysical initStep + 1 -0.183 569 949 0.00195 0 0.00722 0.00722 WorldPhysical msc + 2 -0.121 569 949 0 0.00195 0.15 0.157 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.15 477 795 0.00189 0 0 0 DriftChamberPhysical initStep + 1 -0.101 477 795 0 0.00189 0.807 0.807 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.132 432 720 0.00342 0 0 0 DriftChamberPhysical initStep + 1 0.581 432 722 0.00201 0.00141 1.68 1.68 DriftChamberPhysical eIoni + 2 1.09 431 722 0 0.00201 0.887 2.56 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.126 388 646 0.000999 0 0 0 DriftChamberPhysical initStep + 1 -0.323 388 646 0 0.000999 0.307 0.307 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.102 303 504 0.00902 0 0 0 DriftChamberPhysical initStep + 1 -0.924 300 507 0.00714 0.00188 4.07 4.07 DriftChamberPhysical eIoni + 2 -0.845 299 510 0.00598 0.00116 3.16 7.23 DriftChamberPhysical eIoni + 3 -1.96 297 511 0.00442 0.00156 2.66 9.89 DriftChamberPhysical eIoni + 4 -0.635 295 511 0.00269 0.00174 2.06 11.9 DriftChamberPhysical eIoni + 5 0.36 296 511 0 0.00269 1.34 13.3 DriftChamberPhysical eIoni +>>> Event 4 + 10 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.999903615558452 (GeV) 0 hits are stored in HAD ExN05CalorimeterHitsCollection. Total energy deposition in HAD calorimeter towers : 0 (GeV) number of event = 5 ### Run 1 start. -ExN05EMShowerModel::DoIt + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0.000304 7.09 23.6 1e+03 0.00584 24.7 24.7 WorldPhysical eIoni + 2 0.00518 30 100 1e+03 0.0151 79.7 104 DriftChamberPhysical CoupledTransportation + 3 0.0507 142 473 1e+03 0.0154 390 494 DriftChamberPhysical msc + 4 0.0933 254 847 1e+03 0.0112 390 884 DriftChamberPhysical msc + 5 0.103 270 900 1e+03 0.00303 55.8 940 DriftChamberPhysical msc + 6 0.103 270 900 1e+03 1.47e-12 4.59e-08 940 WorldPhysical CoupledTransportation + 7 0.106 273 911 1e+03 0.00344 11.3 951 WorldPhysical eIoni + 8 0.111 284 946 1e+03 0.00869 36.5 987 WorldPhysical eIoni + 9 0.119 297 989 1e+03 0.00848 45.2 1.03e+03 WorldPhysical eIoni + 10 0.118 300 1e+03 1e+03 0.00231 11.5 1.04e+03 Crystal CoupledTransportation + 11 0.118 300 1e+03 0 1e+03 0 1.04e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.119 297 989 0.00137 0 0 0 WorldPhysical initStep + 1 0.123 297 989 0.00114 0.000224 0.00436 0.00436 WorldPhysical msc + 2 0.147 297 989 0 0.00114 0.0695 0.0738 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.111 284 946 0.0027 0 0 0 WorldPhysical initStep + 1 0.118 284 946 0.00269 1.64e-06 0.00811 0.00811 WorldPhysical msc + 2 0.169 284 946 0.0025 0.000197 0.0585 0.0666 WorldPhysical eIoni + 3 0.262 284 946 0 0.0025 0.221 0.288 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.106 273 911 0.000999 0 0 0 WorldPhysical initStep + 1 0.102 273 911 0.000999 0 0.00504 0.00504 WorldPhysical msc + 2 0.083 273 911 0 0.000999 0.0578 0.0628 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.000304 7.09 23.6 0.00137 0 0 0 WorldPhysical initStep + 1 0.00342 7.08 23.6 0.0011 0.000269 0.0046 0.0046 WorldPhysical msc + 2 0.0287 7.08 23.6 0 0.0011 0.0663 0.0709 WorldPhysical eIoni >>> Event 0 - 10 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.999933 (GeV) - 0 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 0 (GeV) -ExN05EMShowerModel::DoIt ->>> Event 1 - 10 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.999924 (GeV) - 0 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 0 (GeV) -ExN05EMShowerModel::DoIt ->>> Event 2 - 9 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.999916 (GeV) - 0 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 0 (GeV) -ExN05EMShowerModel::DoIt ->>> Event 3 11 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.999927 (GeV) + Total energy deposition in EM calorimeter crytals : 0.9999199931156715 (GeV) 0 hits are stored in HAD ExN05CalorimeterHitsCollection. Total energy deposition in HAD calorimeter towers : 0 (GeV) -ExN05EMShowerModel::DoIt ->>> Event 4 + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0 30 100 1e+03 0.0222 104 104 DriftChamberPhysical CoupledTransportation + 2 -0.148 154 514 1e+03 0.0143 432 536 DriftChamberPhysical msc + 3 -0.224 222 738 1e+03 0.00673 234 771 DriftChamberPhysical eIoni + 4 -0.274 270 900 1e+03 0.00433 169 940 DriftChamberPhysical msc + 5 -0.274 270 900 1e+03 1.18e-11 3.7e-07 940 WorldPhysical CoupledTransportation + 6 -0.297 288 957 1e+03 0.0123 59.9 1e+03 WorldPhysical eIoni + 7 -0.304 297 990 1e+03 0.00608 33.7 1.03e+03 WorldPhysical eIoni + 8 -0.307 300 1e+03 1e+03 0.00149 10.8 1.04e+03 Crystal CoupledTransportation + 9 -0.307 300 1e+03 0 1e+03 0 1.04e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.304 297 990 0.00102 0 0 0 WorldPhysical initStep + 1 -0.301 297 990 0.000843 0.000176 0.00515 0.00515 WorldPhysical msc + 2 -0.288 297 990 0 0.000843 0.0468 0.0519 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.297 288 957 0.00115 0 0 0 WorldPhysical initStep + 1 -0.299 288 957 0.00106 9.41e-05 0.0045 0.0045 WorldPhysical msc + 2 -0.313 288 957 0 0.00106 0.0627 0.0672 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.224 222 738 0.00179 0 0 0 DriftChamberPhysical initStep + 1 0.284 222 738 0 0.00179 0.744 0.744 DriftChamberPhysical eIoni +>>> Event 1 + 9 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.9999285219317773 (GeV) + 0 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0 (GeV) + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0.0102 19.2 64 1e+03 0.0131 66.9 66.9 WorldPhysical eIoni + 2 0.00983 30 100 1e+03 0.00932 37.6 104 DriftChamberPhysical CoupledTransportation + 3 0.0217 93.3 311 1e+03 0.0059 220 325 DriftChamberPhysical eIoni + 4 0.0281 164 549 1e+03 0.00707 248 573 DriftChamberPhysical msc + 5 0.0286 213 711 1e+03 0.00481 170 742 DriftChamberPhysical eIoni + 6 0.0179 270 900 1e+03 0.00601 197 940 DriftChamberPhysical msc + 7 0.0179 270 900 1e+03 1.4e-11 4.38e-07 940 WorldPhysical CoupledTransportation + 8 0.0166 272 907 1e+03 0.0013 7.74 947 WorldPhysical eIoni + 9 0.00332 300 1e+03 1e+03 0.0177 96.6 1.04e+03 Crystal CoupledTransportation + 10 0.00332 300 1e+03 0 1e+03 0 1.04e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0166 272 907 0.00227 0 0 0 WorldPhysical initStep + 1 0.0234 272 907 0.00225 1.4e-05 0.00785 0.00785 WorldPhysical msc + 2 0.0838 272 907 0 0.00225 0.189 0.197 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0286 213 711 0.00868 0 0 0 DriftChamberPhysical initStep + 1 0.891 213 711 0.00741 0.000276 0.91 0.91 DriftChamberPhysical eIoni + 2 2.83 211 713 0.00557 0.00184 3.27 4.18 DriftChamberPhysical eIoni + 3 3.7 209 714 0.00357 0.002 2.5 6.68 DriftChamberPhysical eIoni + 4 4.51 208 714 0.00161 0.00197 1.74 8.42 DriftChamberPhysical eIoni + 5 4.8 208 714 0 0.00161 0.622 9.04 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 6, Parent ID = 4 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.891 213 711 0.000993 0 0 0 DriftChamberPhysical initStep + 1 0.965 213 712 0 0.000993 0.305 0.305 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0217 93.3 311 0.00237 0 0 0 DriftChamberPhysical initStep + 1 -0.0108 94.3 311 0.000415 0.00196 1.15 1.15 DriftChamberPhysical eIoni + 2 -0.0423 94.2 311 0 0.000415 0.111 1.26 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0102 19.2 64 0.00107 0 0 0 WorldPhysical initStep + 1 0.00957 19.2 64 0.00107 0 0.00484 0.00484 WorldPhysical msc + 2 0.00854 19.2 64 0 0.00107 0.0638 0.0687 WorldPhysical eIoni +>>> Event 2 + 13 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.9999203690521944 (GeV) + 0 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0 (GeV) + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0 30 100 1e+03 0.0231 104 104 DriftChamberPhysical CoupledTransportation + 2 -0.0557 111 369 1e+03 0.00914 281 385 DriftChamberPhysical msc + 3 -0.0774 133 443 1e+03 0.00288 77.7 463 DriftChamberPhysical eIoni + 4 -0.164 214 713 1e+03 0.00952 281 744 DriftChamberPhysical msc + 5 -0.217 270 900 1e+03 0.00664 196 940 DriftChamberPhysical msc + 6 -0.217 270 900 1e+03 1.12e-11 3.51e-07 940 WorldPhysical CoupledTransportation + 7 -0.228 280 932 1e+03 0.00631 32.9 973 WorldPhysical eIoni + 8 -0.235 291 969 1e+03 0.00795 38.9 1.01e+03 WorldPhysical eIoni + 9 -0.242 297 990 1e+03 0.00563 22.2 1.03e+03 WorldPhysical eIoni + 10 -0.242 298 991 1e+03 0.000267 1.32 1.03e+03 WorldPhysical eIoni + 11 -0.244 300 1e+03 1e+03 0.00337 9.09 1.04e+03 Crystal CoupledTransportation + 12 -0.244 300 1e+03 0 1e+03 0 1.04e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 6, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.242 298 991 0.00777 0 0 0 WorldPhysical initStep + 1 -0.299 297 991 0.00763 0.000138 0.0601 0.0601 WorldPhysical msc + 2 -0.553 297 991 0.00328 0.00181 0.399 0.459 WorldPhysical eIoni + 3 -0.67 297 991 0 0.00328 0.349 0.808 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 7, Parent ID = 6 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.553 297 991 0.00254 0 0 0 WorldPhysical initStep + 1 -0.557 297 991 0.00254 0 0.00811 0.00811 WorldPhysical msc + 2 -0.624 297 991 0 0.00254 0.228 0.236 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.242 297 990 0.00419 0 0 0 WorldPhysical initStep + 1 -0.227 297 990 0.0041 9.33e-05 0.0194 0.0194 WorldPhysical msc + 2 -0.114 297 990 0 0.0041 0.511 0.53 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.235 291 969 0.00566 0 0 0 WorldPhysical initStep + 1 -0.253 291 969 0.00566 0 0.0227 0.0227 WorldPhysical msc + 2 -0.518 291 969 0 0.00566 0.905 0.927 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.228 280 932 0.00252 0 0 0 WorldPhysical initStep + 1 -0.228 280 932 0.00252 0 0.00687 0.00687 WorldPhysical msc + 2 -0.257 280 932 0 0.00252 0.224 0.231 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0774 133 443 0.00167 0 0 0 DriftChamberPhysical initStep + 1 -0.504 133 444 0 0.00167 0.665 0.665 DriftChamberPhysical eIoni +>>> Event 3 7 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.999915 (GeV) + Total energy deposition in EM calorimeter crytals : 0.9999034242547588 (GeV) + 0 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0 (GeV) + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0 30 100 1e+03 0.0217 104 104 DriftChamberPhysical CoupledTransportation + 2 -0.0926 172 572 1e+03 0.014 492 597 DriftChamberPhysical msc + 3 -0.0947 176 585 1e+03 0.000366 13.8 611 DriftChamberPhysical eIoni + 4 -0.124 270 900 1e+03 0.0107 329 940 DriftChamberPhysical msc + 5 -0.124 270 900 1e+03 4.72e-11 1.47e-06 940 WorldPhysical CoupledTransportation + 6 -0.136 291 968 1e+03 0.0131 71.2 1.01e+03 WorldPhysical eIoni + 7 -0.14 300 1e+03 1e+03 0.00745 33.2 1.04e+03 Crystal CoupledTransportation + 8 -0.14 300 1e+03 0 1e+03 0 1.04e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.136 291 968 0.002 0 0 0 WorldPhysical initStep + 1 -0.142 291 968 0.002 0 0.00702 0.00702 WorldPhysical msc + 2 -0.193 290 968 0 0.002 0.156 0.163 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0947 176 585 0.00606 0 0 0 DriftChamberPhysical initStep + 1 -2.52 175 586 0.00415 0.00191 2.69 2.69 DriftChamberPhysical eIoni + 2 -4.3 175 586 0.00191 0.00224 1.96 4.64 DriftChamberPhysical eIoni + 3 -4.69 175 586 0 0.00191 0.82 5.46 DriftChamberPhysical eIoni +>>> Event 4 + 10 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.9999246365422155 (GeV) 0 hits are stored in HAD ExN05CalorimeterHitsCollection. Total energy deposition in HAD calorimeter towers : 0 (GeV) number of event = 5 ### Run 2 start. -ExN05EMShowerModel::DoIt + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 -0.00545 -13.6 45.3 1e+03 0.012 47.3 47.3 WorldPhysical eIoni + 2 -0.011 -30 100 1e+03 0.0107 57.1 104 DriftChamberPhysical CoupledTransportation + 3 -0.0123 -33.8 112 1e+03 0.000289 13 117 DriftChamberPhysical eIoni + 4 -0.0845 -151 502 1e+03 0.0149 407 524 DriftChamberPhysical msc + 5 -0.14 -268 892 1e+03 0.012 407 931 DriftChamberPhysical msc + 6 -0.142 -270 900 1e+03 0.000348 8.68 940 WorldPhysical CoupledTransportation + 7 -0.166 -300 1e+03 1e+03 0.0208 104 1.04e+03 Crystal CoupledTransportation + 8 -0.166 -300 1e+03 0 1e+03 0 1.04e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0123 -33.8 112 0.0239 0 0 0 DriftChamberPhysical initStep + 1 4.86 -18.4 116 0.0202 0.0037 16.9 16.9 DriftChamberPhysical eIoni + 2 7.27 -9.11 125 0.0176 0.00261 12.8 29.7 DriftChamberPhysical eIoni + 3 12.2 -3.7 132 0.0155 0.00214 10.3 40 DriftChamberPhysical eIoni + 4 15.6 2.63 136 0.0134 0.00206 8.4 48.4 DriftChamberPhysical eIoni + 5 18.8 7.52 139 0.0111 0.00227 6.84 55.3 DriftChamberPhysical eIoni + 6 18.6 12.1 141 0.00972 0.00141 5.3 60.6 DriftChamberPhysical eIoni + 7 16.9 15.8 143 0.00813 0.00159 4.44 65 DriftChamberPhysical eIoni + 8 15.1 17.1 146 0.00596 0.00217 3.61 68.6 DriftChamberPhysical eIoni + 9 13.4 17.1 148 0.00414 0.00182 2.65 71.3 DriftChamberPhysical eIoni + 10 12.5 18.1 149 0.00186 0.00228 1.95 73.2 DriftChamberPhysical eIoni + 11 12.1 18.5 149 0 0.00186 0.786 74 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.00545 -13.6 45.3 0.00346 0 0 0 WorldPhysical initStep + 1 0.00156 -13.6 45.3 0.00344 2.44e-05 0.00847 0.00847 WorldPhysical msc + 2 0.145 -13.5 45.4 0 0.00344 0.38 0.388 WorldPhysical eIoni >>> Event 0 10 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.999899 (GeV) + Total energy deposition in EM calorimeter crytals : 0.9999016010997351 (GeV) 0 hits are stored in HAD ExN05CalorimeterHitsCollection. Total energy deposition in HAD calorimeter towers : 0 (GeV) -ExN05EMShowerModel::DoIt + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0 -30 100 1e+03 0.0243 104 104 DriftChamberPhysical CoupledTransportation + 2 0.00938 -81.7 272 1e+03 0.00502 180 284 DriftChamberPhysical eIoni + 3 0.00822 -100 334 1e+03 0.0015 63.8 348 DriftChamberPhysical eIoni + 4 0.00567 -149 499 1e+03 0.00517 172 521 DriftChamberPhysical eIoni + 5 0.025 -237 790 1e+03 0.00948 304 825 DriftChamberPhysical msc + 6 0.0386 -270 900 1e+03 0.00394 115 940 DriftChamberPhysical msc + 7 0.0386 -270 900 1e+03 3.89e-12 1.22e-07 940 WorldPhysical CoupledTransportation + 8 0.0426 -298 994 1e+03 0.023 97.8 1.04e+03 WorldPhysical eIoni + 9 0.0431 -300 1e+03 1e+03 0.002 6.57 1.04e+03 Crystal CoupledTransportation + 10 0.0431 -300 1e+03 0 1e+03 0 1.04e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0426 -298 994 0.00121 0 0 0 WorldPhysical initStep + 1 0.0462 -298 994 0.00117 4.14e-05 0.00404 0.00404 WorldPhysical msc + 2 0.0711 -298 994 0 0.00117 0.0716 0.0756 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00567 -149 499 0.00135 0 0 0 DriftChamberPhysical initStep + 1 -0.299 -149 499 0 0.00135 0.48 0.48 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00822 -100 334 0.000991 0 0 0 DriftChamberPhysical initStep + 1 0.116 -99.9 334 0 0.000991 0.304 0.304 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00938 -81.7 272 0.00212 0 0 0 DriftChamberPhysical initStep + 1 0.547 -82.2 272 0 0.00212 0.975 0.975 DriftChamberPhysical eIoni >>> Event 1 - 9 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.999918 (GeV) + 6 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.999919932047459 (GeV) 0 hits are stored in HAD ExN05CalorimeterHitsCollection. Total energy deposition in HAD calorimeter towers : 0 (GeV) -ExN05EMShowerModel::DoIt + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0 -30 100 1e+03 0.0258 104 104 DriftChamberPhysical CoupledTransportation + 2 0.00227 -33.7 112 1e+03 0.00059 12.7 117 DriftChamberPhysical eIoni + 3 0.0322 -70.6 235 1e+03 0.00411 129 246 DriftChamberPhysical eIoni + 4 0.0367 -77 257 1e+03 0.000489 22.2 268 DriftChamberPhysical eIoni + 5 0.079 -128 427 1e+03 0.00589 178 446 DriftChamberPhysical msc + 6 0.114 -180 598 1e+03 0.00506 178 625 DriftChamberPhysical msc + 7 0.142 -231 769 1e+03 0.00458 178 803 DriftChamberPhysical msc + 8 0.165 -270 900 1e+03 0.00492 136 940 DriftChamberPhysical msc + 9 0.165 -270 900 1e+03 5.4e-12 1.69e-07 940 WorldPhysical CoupledTransportation + 10 0.181 -300 1e+03 1e+03 0.0226 104 1.04e+03 Crystal CoupledTransportation + 11 0.181 -300 1e+03 0 1e+03 0 1.04e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0367 -77 257 0.00131 0 0 0 DriftChamberPhysical initStep + 1 -0.269 -76.9 257 0 0.00131 0.454 0.454 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0322 -70.6 235 0.00148 0 0 0 DriftChamberPhysical initStep + 1 -0.257 -70.9 235 0 0.00148 0.551 0.551 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00227 -33.7 112 0.00191 0 0 0 DriftChamberPhysical initStep + 1 -0.176 -33.1 112 0 0.00191 0.819 0.819 DriftChamberPhysical eIoni >>> Event 2 - 7 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.999907 (GeV) - 0 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 0 (GeV) -ExN05EMShowerModel::DoIt ->>> Event 3 - 10 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.999933 (GeV) - 0 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 0 (GeV) -ExN05EMShowerModel::DoIt ->>> Event 4 9 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.999912 (GeV) + Total energy deposition in EM calorimeter crytals : 0.9999211880936421 (GeV) + 0 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0 (GeV) + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0 -30 100 1e+03 0.02 104 104 DriftChamberPhysical CoupledTransportation + 2 0.0285 -57.4 191 1e+03 0.00332 95.5 200 DriftChamberPhysical eIoni + 3 0.0982 -137 457 1e+03 0.00682 277 477 DriftChamberPhysical msc + 4 0.192 -217 723 1e+03 0.00864 277 754 DriftChamberPhysical msc + 5 0.27 -270 900 1e+03 0.00615 185 940 DriftChamberPhysical msc + 6 0.27 -270 900 1e+03 1.33e-11 4.15e-07 940 WorldPhysical CoupledTransportation + 7 0.316 -300 1e+03 1e+03 0.0221 104 1.04e+03 Crystal CoupledTransportation + 8 0.316 -300 1e+03 0 1e+03 0 1.04e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0285 -57.4 191 0.00197 0 0 0 DriftChamberPhysical initStep + 1 0.637 -57.3 192 0 0.00197 0.859 0.859 DriftChamberPhysical eIoni +>>> Event 3 + 11 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.9999309583798131 (GeV) + 0 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0 (GeV) + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 -0.000871 -3.87 12.9 1e+03 0.00379 13.5 13.5 WorldPhysical eIoni + 2 0.000793 -23.1 76.9 1e+03 0.013 66.8 80.3 WorldPhysical eIoni + 3 0.00267 -27.3 91.1 1e+03 0.00333 14.8 95.1 WorldPhysical eIoni + 4 0.00296 -30 100 1e+03 0.00427 9.3 104 DriftChamberPhysical CoupledTransportation + 5 0.0561 -155 515 1e+03 0.0139 433 538 DriftChamberPhysical eIoni + 6 0.0424 -270 900 1e+03 0.0127 402 940 DriftChamberPhysical msc + 7 0.0424 -270 900 1e+03 8.17e-11 2.55e-06 940 WorldPhysical CoupledTransportation + 8 0.0243 -298 992 1e+03 0.0229 96.2 1.04e+03 WorldPhysical eIoni + 9 0.0242 -300 1e+03 1e+03 0.00163 8.2 1.04e+03 Crystal CoupledTransportation + 10 0.0242 -300 1e+03 0 1e+03 0 1.04e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 6, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0243 -298 992 0.00145 0 0 0 WorldPhysical initStep + 1 0.0288 -298 992 0.0013 0.000148 0.00453 0.00453 WorldPhysical msc + 2 0.0428 -298 992 0 0.0013 0.0833 0.0878 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0561 -155 515 0.00294 0 0 0 DriftChamberPhysical initStep + 1 0.915 -155 514 0.000736 0.0022 1.46 1.46 DriftChamberPhysical eIoni + 2 0.948 -155 514 0 0.000736 0.206 1.67 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00267 -27.3 91.1 0.00214 0 0 0 WorldPhysical initStep + 1 0.00775 -27.3 91.1 0.00214 0 0.00595 0.00595 WorldPhysical msc + 2 0.0742 -27.4 91.1 0 0.00214 0.175 0.18 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.000793 -23.1 76.9 0.00295 0 0 0 WorldPhysical initStep + 1 -0.00439 -23.1 76.9 0.00288 6.89e-05 0.0109 0.0109 WorldPhysical msc + 2 -0.0556 -23 76.9 0 0.00288 0.282 0.293 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.000871 -3.87 12.9 0.00864 0 0 0 WorldPhysical initStep + 1 -0.0282 -3.81 13 0.00856 7.99e-05 0.0825 0.0825 WorldPhysical msc + 2 0.477 -3.43 13.9 0.00244 0.00612 1.56 1.64 WorldPhysical eIoni + 3 0.537 -3.37 13.9 0 0.00244 0.214 1.86 WorldPhysical eIoni +>>> Event 4 + 6 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.999906403127005 (GeV) 0 hits are stored in HAD ExN05CalorimeterHitsCollection. Total energy deposition in HAD calorimeter towers : 0 (GeV) number of event = 5 ### Run 3 start. -ExN05EMShowerModel::DoIt + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0 -60 100 1e+03 0.0245 117 117 DriftChamberPhysical CoupledTransportation + 2 -0.162 -175 290 1e+03 0.00655 222 338 DriftChamberPhysical msc + 3 -0.319 -289 480 1e+03 0.00624 222 560 DriftChamberPhysical msc + 4 -0.471 -404 670 1e+03 0.00733 222 782 DriftChamberPhysical msc + 5 -0.623 -519 859 1e+03 0.00649 222 1e+03 DriftChamberPhysical msc + 6 -0.654 -543 900 1e+03 0.00141 47.5 1.05e+03 DriftChamberPhysical msc + 7 -0.654 -543 900 1e+03 1.1e-12 3.45e-08 1.05e+03 WorldPhysical CoupledTransportation + 8 -0.667 -554 918 1e+03 0.00484 20.7 1.07e+03 WorldPhysical eIoni + 9 -0.672 -558 924 1e+03 0.00113 7.49 1.08e+03 WorldPhysical eIoni + 10 -0.677 -562 931 1e+03 0.000667 7.49 1.09e+03 WorldPhysical eIoni + 11 -0.729 -604 1e+03 1e+03 0.017 81.1 1.17e+03 Crystal CoupledTransportation + 12 -0.729 -604 1e+03 0 1e+03 0 1.17e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.677 -562 931 0.00309 0 0 0 WorldPhysical initStep + 1 -0.675 -562 931 0.00302 6.44e-05 0.00796 0.00796 WorldPhysical msc + 2 -0.661 -562 931 0 0.00302 0.305 0.312 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.672 -558 924 0.00111 0 0 0 WorldPhysical initStep + 1 -0.672 -558 924 0.00108 3.11e-05 0.00469 0.00469 WorldPhysical msc + 2 -0.664 -558 924 0 0.00108 0.0642 0.0689 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.667 -554 918 0.00507 0 0 0 WorldPhysical initStep + 1 -0.649 -554 918 0.00477 0.000304 0.0206 0.0206 WorldPhysical msc + 2 -0.385 -554 918 0 0.00477 0.666 0.686 WorldPhysical eIoni >>> Event 0 - 9 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.999867 (GeV) + 11 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.999914587734699 (GeV) 0 hits are stored in HAD ExN05CalorimeterHitsCollection. Total energy deposition in HAD calorimeter towers : 0 (GeV) -ExN05EMShowerModel::DoIt + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0 -60 100 1e+03 0.0219 117 117 DriftChamberPhysical CoupledTransportation + 2 -0.0623 -230 383 1e+03 0.0109 330 447 DriftChamberPhysical msc + 3 -0.0861 -400 666 1e+03 0.012 330 777 DriftChamberPhysical msc + 4 -0.127 -526 877 1e+03 0.00809 246 1.02e+03 DriftChamberPhysical eIoni + 5 -0.132 -540 900 1e+03 0.000655 26.5 1.05e+03 WorldPhysical CoupledTransportation + 6 -0.14 -570 950 1e+03 0.00997 58.2 1.11e+03 WorldPhysical eIoni + 7 -0.146 -600 1e+03 1e+03 0.0144 58.5 1.17e+03 Crystal CoupledTransportation + 8 -0.146 -600 1e+03 0 1e+03 0 1.17e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.14 -570 950 0.00126 0 0 0 WorldPhysical initStep + 1 -0.138 -570 950 0.00121 5.1e-05 0.00554 0.00554 WorldPhysical msc + 2 -0.125 -570 950 0 0.00121 0.0746 0.0802 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.127 -526 877 0.00339 0 0 0 DriftChamberPhysical initStep + 1 1.13 -526 878 0.0016 0.00179 1.66 1.66 DriftChamberPhysical eIoni + 2 1.56 -526 878 0 0.0016 0.616 2.28 DriftChamberPhysical eIoni >>> Event 1 - 13 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.999844 (GeV) - 0 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 0 (GeV) -ExN05EMShowerModel::DoIt ->>> Event 2 12 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.999835 (GeV) + Total energy deposition in EM calorimeter crytals : 0.9999173681170486 (GeV) 0 hits are stored in HAD ExN05CalorimeterHitsCollection. Total energy deposition in HAD calorimeter towers : 0 (GeV) -ExN05EMShowerModel::DoIt + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 -0.0134 -56.2 93.6 1e+03 0.0209 109 109 WorldPhysical eIoni + 2 -0.0122 -60 100 1e+03 0.00134 7.43 117 DriftChamberPhysical CoupledTransportation + 3 0.073 -230 383 1e+03 0.0108 330 446 DriftChamberPhysical msc + 4 0.177 -399 666 1e+03 0.0115 330 776 DriftChamberPhysical msc + 5 0.297 -540 900 1e+03 0.00858 273 1.05e+03 DriftChamberPhysical msc + 6 0.297 -540 900 1e+03 3.03e-11 9.46e-07 1.05e+03 WorldPhysical CoupledTransportation + 7 0.325 -584 973 1e+03 0.0179 85.4 1.13e+03 WorldPhysical eIoni + 8 0.336 -600 1e+03 1e+03 0.00605 31.2 1.17e+03 Crystal CoupledTransportation + 9 0.336 -600 1e+03 0 1e+03 0 1.17e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.325 -584 973 0.00474 0 0 0 WorldPhysical initStep + 1 0.299 -584 973 0.00471 3.41e-05 0.0301 0.0301 WorldPhysical msc + 2 0.0568 -584 973 0 0.00471 0.653 0.683 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0134 -56.2 93.6 0.00568 0 0 0 WorldPhysical initStep + 1 -0.0472 -56.2 93.6 0.00548 0.000199 0.0344 0.0344 WorldPhysical msc + 2 -0.406 -56.2 93.7 0 0.00548 0.855 0.889 WorldPhysical eIoni +>>> Event 2 + 11 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.9999124903785512 (GeV) + 0 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0 (GeV) + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0 -60 100 1e+03 0.0245 117 117 DriftChamberPhysical CoupledTransportation + 2 0.00874 -171 284 1e+03 0.00507 215 332 DriftChamberPhysical msc + 3 0.0321 -281 469 1e+03 0.00477 215 547 DriftChamberPhysical msc + 4 0.0547 -392 653 1e+03 0.00644 215 762 DriftChamberPhysical msc + 5 0.0864 -503 838 1e+03 0.00715 215 977 DriftChamberPhysical msc + 6 0.0965 -540 900 1e+03 0.00162 72.5 1.05e+03 DriftChamberPhysical msc + 7 0.0965 -540 900 1e+03 1.45e-12 4.52e-08 1.05e+03 WorldPhysical CoupledTransportation + 8 0.0976 -555 926 1e+03 0.00642 29.8 1.08e+03 WorldPhysical eIoni + 9 0.0992 -600 1e+03 1e+03 0.0177 86.8 1.17e+03 Crystal CoupledTransportation + 10 0.0992 -600 1e+03 0 1e+03 0 1.17e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0976 -555 926 0.00357 0 0 0 WorldPhysical initStep + 1 0.0922 -555 926 0.00327 0.000306 0.0124 0.0124 WorldPhysical msc + 2 0.0458 -555 926 0 0.00327 0.347 0.359 WorldPhysical eIoni >>> Event 3 12 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.999919 (GeV) + Total energy deposition in EM calorimeter crytals : 0.9999226839126187 (GeV) 0 hits are stored in HAD ExN05CalorimeterHitsCollection. Total energy deposition in HAD calorimeter towers : 0 (GeV) -ExN05EMShowerModel::DoIt + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0 -0.247 0.412 1e+03 5.71e-05 0.481 0.481 WorldPhysical eIoni + 2 0.00121 -17.5 29.1 1e+03 0.00801 33.5 34 WorldPhysical eIoni + 3 0.0212 -55.5 92.4 1e+03 0.015 73.8 108 WorldPhysical eIoni + 4 0.0213 -60 100 1e+03 0.00121 8.83 117 DriftChamberPhysical CoupledTransportation + 5 0.0209 -239 398 1e+03 0.0102 347 464 DriftChamberPhysical msc + 6 0.0346 -417 695 1e+03 0.0108 347 811 DriftChamberPhysical msc + 7 0.0347 -540 900 1e+03 0.00753 238 1.05e+03 DriftChamberPhysical msc + 8 0.0347 -540 900 1e+03 1.46e-11 4.57e-07 1.05e+03 WorldPhysical CoupledTransportation + 9 0.0208 -585 975 1e+03 0.0183 88 1.14e+03 WorldPhysical eIoni + 10 0.0232 -600 1e+03 1e+03 0.00598 28.6 1.17e+03 Crystal CoupledTransportation + 11 0.0232 -600 1e+03 0 1e+03 0 1.17e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0208 -585 975 0.00154 0 0 0 WorldPhysical initStep + 1 0.0156 -585 975 0.00154 0 0.00675 0.00675 WorldPhysical msc + 2 -0.0254 -585 976 0 0.00154 0.105 0.112 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0212 -55.5 92.4 0.00105 0 0 0 WorldPhysical initStep + 1 0.0221 -55.5 92.4 0.001 4.56e-05 0.00367 0.00367 WorldPhysical msc + 2 0.0274 -55.4 92.4 0 0.001 0.0579 0.0616 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00121 -17.5 29.1 0.00133 0 0 0 WorldPhysical initStep + 1 -0.00309 -17.5 29.1 0.00132 1.04e-05 0.0043 0.0043 WorldPhysical msc + 2 -0.037 -17.5 29.1 0 0.00132 0.0847 0.089 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 -0.247 0.412 0.00272 0 0 0 WorldPhysical initStep + 1 -0.00675 -0.246 0.414 0.0027 1.52e-05 0.00709 0.00709 WorldPhysical msc + 2 -0.105 -0.218 0.452 0 0.0027 0.254 0.261 WorldPhysical eIoni >>> Event 4 - 11 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.999891 (GeV) + 9 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.9999163011600612 (GeV) 0 hits are stored in HAD ExN05CalorimeterHitsCollection. Total energy deposition in HAD calorimeter towers : 0 (GeV) number of event = 5 ### Run 4 start. -ExN05PionShowerModel::DoIt + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0.00189 12.2 20.4 1e+03 0.00341 23.8 23.8 WorldPhysical hIoni + 2 0.00338 60 100 1e+03 0.0135 92.8 117 DriftChamberPhysical CoupledTransportation + 3 0.0219 284 473 1e+03 0.012 435 551 DriftChamberPhysical hIoni + 4 -0.0227 540 900 1e+03 0.0125 498 1.05e+03 WorldPhysical CoupledTransportation + 5 -0.0217 600 1e+03 1e+03 0.0147 117 1.17e+03 Crystal CoupledTransportation + 6 -0.0139 610 1.02e+03 989 9.4 19 1.19e+03 Crystal hIoni + 7 -0.106 620 1.03e+03 979 9.25 20.1 1.21e+03 Crystal hIoni + 8 1.11e-15 623 1.04e+03 976 3.35 6.66 1.21e+03 Crystal CoupledTransportation + 9 0.252 635 1.06e+03 964 12 22.8 1.23e+03 Crystal msc + 10 0.0528 646 1.08e+03 952 11.4 22.8 1.26e+03 Crystal msc + 11 0.0468 650 1.09e+03 949 3.8 8.06 1.27e+03 Crystal CoupledTransportation + 12 0.837 672 1.12e+03 926 21.8 43.9 1.31e+03 Crystal hIoni + 13 0.869 675 1.13e+03 922 3.08 6.62 1.32e+03 Crystal hIoni + 14 0.858 678 1.14e+03 917 3.54 6.47 1.32e+03 Crystal hIoni + 15 1.02 700 1.17e+03 894 22.5 44.7 1.37e+03 Crystal CoupledTransportation + 16 2.42 715 1.2e+03 878 16.3 30 1.4e+03 Crystal msc + 17 2.63 717 1.2e+03 872 1.7 3.84 1.4e+03 Crystal hIoni + 18 3.02 720 1.21e+03 865 3.73 7.21 1.41e+03 Crystal hIoni + 19 4.96 734 1.24e+03 850 15.2 30 1.44e+03 Crystal msc + 20 5.31 736 1.24e+03 848 1.86 3.32 1.44e+03 Crystal hIoni + 21 8.7 750 1.27e+03 833 15 30 1.47e+03 Crystal msc + 22 8.71 750 1.27e+03 833 0.0199 0.064 1.47e+03 Crystal CoupledTransportation + 23 9.29 752 1.27e+03 829 2.56 4.82 1.48e+03 Crystal hIoni + 24 14.4 774 1.31e+03 804 23.8 44.8 1.52e+03 Crystal hIoni + 25 14.7 776 1.31e+03 794 2.19 3.71 1.52e+03 Crystal hIoni + 26 15.8 784 1.33e+03 784 8.93 17 1.54e+03 Crystal hIoni + 27 16.1 786 1.33e+03 781 1.73 3.29 1.55e+03 Crystal hIoni + 28 18.4 800 1.36e+03 766 15.2 30 1.58e+03 Crystal CoupledTransportation + 29 18.5 800 1.36e+03 754 0.353 0.689 1.58e+03 Crystal hIoni + 30 19.3 806 1.37e+03 749 5.78 12 1.59e+03 Crystal msc + 31 20.1 810 1.38e+03 743 4.71 9.76 1.6e+03 Crystal hIoni + 32 20.9 815 1.39e+03 737 5.6 12 1.61e+03 Crystal msc + 33 21.7 821 1.4e+03 732 5.77 12 1.62e+03 Crystal msc + 34 21.9 822 1.4e+03 730 1.95 2.94 1.62e+03 WorldPhysical CoupledTransportation + 35 23.3 833 1.42e+03 730 0.00319 25.9 1.65e+03 WorldPhysical hIoni + 36 28.1 872 1.5e+03 730 0.0105 85.9 1.74e+03 HadCaloPhysical CoupledTransportation + 37 29.8 885 1.53e+03 730 0.00522 30.4 1.77e+03 HadCaloPhysical msc + 38 31.2 896 1.55e+03 730 0.00293 25.5 1.79e+03 Tower CoupledTransportation + 39 33.1 924 1.6e+03 655 74.2 60.8 1.85e+03 Tower msc + 40 33.3 937 1.63e+03 614 41.7 26.9 1.88e+03 Tower hIoni + 41 32.6 950 1.65e+03 582 31.3 29.4 1.91e+03 Tower CoupledTransportation + 42 30.4 993 1.74e+03 479 103 93 2e+03 Tower hIoni + 43 32.4 1.03e+03 1.8e+03 384 95.4 75.2 2.08e+03 Tower hIoni + 44 34.4 1.05e+03 1.85e+03 307 76.4 54.3 2.13e+03 Tower CoupledTransportation + 45 33.2 1.06e+03 1.9e+03 258 49.8 45.5 2.18e+03 Tower hIoni + 46 39.3 1.07e+03 1.93e+03 217 41 37 2.21e+03 Tower hIoni + 47 47.6 1.07e+03 1.96e+03 183 33.3 30 2.24e+03 Tower hIoni + 48 48.3 1.07e+03 1.96e+03 181 2.59 2.52 2.25e+03 Tower hIoni + 49 50 1.07e+03 1.97e+03 173 7.49 6.98 2.25e+03 Tower CoupledTransportation + 50 57 1.08e+03 1.99e+03 146 27.3 22.8 2.28e+03 Tower hIoni + 51 61.5 1.08e+03 2.01e+03 121 25 18.4 2.3e+03 Tower hIoni + 52 65 1.09e+03 2.02e+03 103 18.1 14.5 2.31e+03 Tower hIoni + 53 67.8 1.09e+03 2.03e+03 85.1 17.7 11.8 2.32e+03 Tower hIoni + 54 70.9 1.09e+03 2.04e+03 70.2 14.9 9.29 2.33e+03 Tower hIoni + 55 72.1 1.09e+03 2.05e+03 57.8 12.4 7.33 2.34e+03 Tower hIoni + 56 73.5 1.09e+03 2.05e+03 47.5 10.2 5.8 2.34e+03 Tower hIoni + 57 74.9 1.1e+03 2.06e+03 37 10.5 4.65 2.35e+03 Tower hIoni + 58 76.3 1.1e+03 2.06e+03 28.5 8.5 3.58 2.35e+03 Tower hIoni + 59 77.2 1.1e+03 2.06e+03 20.4 8.15 2.81 2.35e+03 Tower hIoni + 60 78.2 1.1e+03 2.06e+03 12.4 7.92 2.13 2.36e+03 Tower hIoni + 61 78.6 1.1e+03 2.06e+03 3.15 9.28 1.41 2.36e+03 Tower hIoni + 62 78.7 1.1e+03 2.06e+03 0 3.15 0.142 2.36e+03 Tower hIoni + 63 78.7 1.1e+03 2.06e+03 0 0 0 2.36e+03 Tower Decay + +********************************************************************************************************* +* G4Track Information: Particle = mu-, Track ID = 21, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 78.7 1.1e+03 2.06e+03 4.12 0 0 0 Tower initStep + 1 78.5 1.1e+03 2.06e+03 0 4.12 0.28 0.28 Tower muIoni + 2 78.5 1.1e+03 2.06e+03 0 0 0 0.28 Tower Decay + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 24, Parent ID = 21 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 78.5 1.1e+03 2.06e+03 48.5 0 0 0 Tower initStep + 1 80.1 1.1e+03 2.07e+03 46 2.43 1.9 1.9 Tower eBrem + 2 80.7 1.1e+03 2.07e+03 44.9 0.653 0.662 2.56 Tower eBrem + 3 81.4 1.1e+03 2.07e+03 23.8 0.811 0.827 3.39 Tower eBrem + 4 86.4 1.1e+03 2.07e+03 17.8 5.99 5.59 8.98 Tower eIoni + 5 89.5 1.1e+03 2.07e+03 13.4 4.43 4.61 13.6 Tower eIoni + 6 89.6 1.1e+03 2.07e+03 3.96 0.249 0.241 13.8 Tower eBrem + 7 89.7 1.1e+03 2.07e+03 3.5 0.257 0.268 14.1 Tower eBrem + 8 90.3 1.1e+03 2.07e+03 1.32 2.18 1.97 16.1 Tower eIoni + 9 90.2 1.1e+03 2.07e+03 0 1.32 1.09 17.2 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 29, Parent ID = 24 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 89.7 1.1e+03 2.07e+03 0.207 0 0 0 Tower initStep + 1 89.8 1.1e+03 2.07e+03 0 0.00711 0.449 0.449 Tower phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 30, Parent ID = 29 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 89.8 1.1e+03 2.07e+03 0.2 0 0 0 Tower initStep + 1 89.8 1.1e+03 2.07e+03 0 0.2 0.0831 0.0831 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 28, Parent ID = 24 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 89.6 1.1e+03 2.07e+03 9.15 0 0 0 Tower initStep + 1 103 1.13e+03 2.1e+03 0 0 42.8 42.8 Tower conv + +********************************************************************************************************* +* G4Track Information: Particle = e+, Track ID = 32, Parent ID = 28 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 103 1.13e+03 2.1e+03 2.16 0 0 0 Tower initStep + 1 103 1.13e+03 2.1e+03 0.759 1.4 1.56 1.56 Tower eIoni + 2 104 1.13e+03 2.1e+03 0 0.759 0.556 2.12 Tower eIoni + 3 104 1.13e+03 2.1e+03 0 0 0 2.12 Tower annihil + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 34, Parent ID = 32 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 104 1.13e+03 2.1e+03 0.511 0 0 0 Tower initStep + 1 117 1.15e+03 2.09e+03 0.511 0 28.6 28.6 HadCaloPhysical CoupledTransportation + 2 180 1.25e+03 2.03e+03 0.511 0 131 159 WorldPhysical CoupledTransportation + 3 211 1.3e+03 2.01e+03 0.237 0 3.12e+03 3.28e+03 WorldPhysical compt + 4 211 1.3e+03 2.01e+03 0.237 0 68.3 3.34e+03 WorldPhysical CoupledTransportation + 5 255 1.25e+03 1.99e+03 0.237 0 68.3 3.41e+03 HadCaloPhysical CoupledTransportation + 6 342 1.15e+03 1.96e+03 0.237 0 137 3.55e+03 Tower CoupledTransportation + 7 350 1.14e+03 1.95e+03 0.237 0 12.5 3.56e+03 Tower CoupledTransportation + 8 359 1.13e+03 1.95e+03 0.191 0 14.1 3.58e+03 Tower compt + 9 362 1.13e+03 1.95e+03 0.114 0 4.09 3.58e+03 Tower compt + 10 354 1.14e+03 1.95e+03 0 0.00711 13 3.59e+03 Tower phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 38, Parent ID = 34 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 354 1.14e+03 1.95e+03 0.107 0 0 0 Tower initStep + 1 354 1.14e+03 1.95e+03 0 0.107 0.0304 0.0304 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 37, Parent ID = 34 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 362 1.13e+03 1.95e+03 0.0771 0 0 0 Tower initStep + 1 362 1.13e+03 1.95e+03 0 0.0771 0.0176 0.0176 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 36, Parent ID = 34 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 359 1.13e+03 1.95e+03 0.0463 0 0 0 Tower initStep + 1 359 1.13e+03 1.95e+03 0 0.0463 0.00746 0.00746 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 35, Parent ID = 34 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 211 1.3e+03 2.01e+03 0.274 0 0 0 WorldPhysical initStep + 1 218 1.32e+03 1.99e+03 0.267 0.00531 27.9 27.9 WorldPhysical eIoni + 2 267 1.44e+03 1.9e+03 0.229 0.0383 170 198 WorldPhysical eIoni + 3 243 1.46e+03 1.88e+03 0.219 0.00743 34.3 232 WorldPhysical eIoni + 4 194 1.51e+03 1.88e+03 0.167 0.0175 72.6 305 WorldPhysical eIoni + 5 161 1.55e+03 1.85e+03 0.144 0.0183 65.9 371 WorldPhysical eIoni + 6 157 1.55e+03 1.86e+03 0.141 0.00152 6.35 377 WorldPhysical eIoni + 7 135 1.57e+03 1.89e+03 0.124 0.0151 45.9 423 WorldPhysical eIoni + 8 101 1.6e+03 1.89e+03 0.109 0.0159 49.2 472 WorldPhysical eIoni + 9 120 1.63e+03 1.87e+03 0.0883 0.0142 37.3 510 WorldPhysical eIoni + 10 130 1.64e+03 1.85e+03 0.0744 0.0139 27.9 538 WorldPhysical eIoni + 11 131 1.65e+03 1.85e+03 0.0631 0.00633 10.3 548 WorldPhysical eIoni + 12 125 1.66e+03 1.86e+03 0.0539 0.00914 16 564 WorldPhysical eIoni + 13 119 1.67e+03 1.86e+03 0.0479 0.00606 12.5 576 WorldPhysical eIoni + 14 113 1.68e+03 1.87e+03 0.0423 0.0056 10.4 587 WorldPhysical eIoni + 15 112 1.68e+03 1.87e+03 0.0377 0.00159 2.63 589 WorldPhysical eIoni + 16 111 1.68e+03 1.87e+03 0.0215 0.000838 1.42 591 WorldPhysical eIoni + 17 111 1.68e+03 1.87e+03 0.0197 0.000517 0.274 591 WorldPhysical eIoni + 18 109 1.68e+03 1.88e+03 0.0159 0.00381 3.23 594 WorldPhysical eIoni + 19 109 1.68e+03 1.88e+03 0.0118 0.00408 2.62 597 WorldPhysical eIoni + 20 109 1.68e+03 1.88e+03 0.00657 0.00521 2.04 599 WorldPhysical eIoni + 21 108 1.68e+03 1.88e+03 0.00165 0.00492 1.15 600 WorldPhysical eIoni + 22 109 1.68e+03 1.88e+03 0 0.00165 0.117 600 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 49, Parent ID = 35 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 111 1.68e+03 1.87e+03 0.00129 0 0 0 WorldPhysical initStep + 1 111 1.68e+03 1.87e+03 0.00129 0 0.00577 0.00577 WorldPhysical msc + 2 111 1.68e+03 1.87e+03 0 0.00129 0.0816 0.0874 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 48, Parent ID = 35 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 111 1.68e+03 1.87e+03 0.0154 0 0 0 WorldPhysical initStep + 1 112 1.68e+03 1.87e+03 0.0152 0.000237 0.215 0.215 WorldPhysical msc + 2 112 1.68e+03 1.87e+03 0.00933 0.00584 2.52 2.74 WorldPhysical eIoni + 3 113 1.68e+03 1.87e+03 0.00585 0.00142 0.695 3.43 WorldPhysical eIoni + 4 113 1.68e+03 1.87e+03 0 0.00585 0.959 4.39 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 50, Parent ID = 48 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 113 1.68e+03 1.87e+03 0.00205 0 0 0 WorldPhysical initStep + 1 113 1.68e+03 1.87e+03 0.00204 8.16e-06 0.00584 0.00584 WorldPhysical msc + 2 113 1.68e+03 1.87e+03 0 0.00204 0.161 0.167 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 47, Parent ID = 35 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 112 1.68e+03 1.87e+03 0.003 0 0 0 WorldPhysical initStep + 1 112 1.68e+03 1.87e+03 0.00292 7.64e-05 0.0128 0.0128 WorldPhysical msc + 2 112 1.68e+03 1.87e+03 0 0.00292 0.289 0.302 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 46, Parent ID = 35 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 131 1.65e+03 1.85e+03 0.00499 0 0 0 WorldPhysical initStep + 1 131 1.65e+03 1.85e+03 0.00499 0 0.032 0.032 WorldPhysical msc + 2 132 1.65e+03 1.85e+03 0 0.00499 0.718 0.75 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 45, Parent ID = 35 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 120 1.63e+03 1.87e+03 0.0061 0 0 0 WorldPhysical initStep + 1 120 1.63e+03 1.87e+03 0.00602 7.9e-05 0.0363 0.0363 WorldPhysical msc + 2 119 1.63e+03 1.87e+03 0 0.00602 1.01 1.04 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 44, Parent ID = 35 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 135 1.57e+03 1.89e+03 0.00128 0 0 0 WorldPhysical initStep + 1 135 1.57e+03 1.89e+03 0.00106 0.000223 0.00477 0.00477 WorldPhysical msc + 2 135 1.57e+03 1.89e+03 0 0.00106 0.0625 0.0673 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 43, Parent ID = 35 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 157 1.55e+03 1.86e+03 0.00206 0 0 0 WorldPhysical initStep + 1 157 1.55e+03 1.86e+03 0.00202 3.38e-05 0.00584 0.00584 WorldPhysical msc + 2 157 1.55e+03 1.86e+03 0 0.00202 0.159 0.164 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 42, Parent ID = 35 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 161 1.55e+03 1.85e+03 0.00449 0 0 0 WorldPhysical initStep + 1 161 1.55e+03 1.85e+03 0.00447 2.2e-05 0.0128 0.0128 WorldPhysical msc + 2 161 1.55e+03 1.85e+03 0 0.00447 0.596 0.609 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 41, Parent ID = 35 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 194 1.51e+03 1.88e+03 0.0347 0 0 0 WorldPhysical initStep + 1 194 1.51e+03 1.88e+03 0.033 0.00173 1.71 1.71 WorldPhysical msc + 2 194 1.51e+03 1.89e+03 0.031 0.000826 1.54 3.24 WorldPhysical eIoni + 3 191 1.51e+03 1.89e+03 0.0247 0.00526 5.03 8.27 WorldPhysical eIoni + 4 191 1.51e+03 1.89e+03 0.0202 0.00449 4.15 12.4 WorldPhysical eIoni + 5 191 1.52e+03 1.89e+03 0.0178 0.000705 0.851 13.3 WorldPhysical eIoni + 6 193 1.52e+03 1.89e+03 0.0136 0.00418 2.94 16.2 WorldPhysical eIoni + 7 194 1.52e+03 1.89e+03 0.00956 0.00408 2.31 18.5 WorldPhysical eIoni + 8 194 1.52e+03 1.89e+03 0.00621 0.00193 0.78 19.3 WorldPhysical eIoni + 9 194 1.52e+03 1.89e+03 0.00408 0.000767 0.218 19.5 WorldPhysical eIoni + 10 194 1.52e+03 1.89e+03 0 0.00408 0.507 20 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 55, Parent ID = 41 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 194 1.52e+03 1.89e+03 0.00136 0 0 0 WorldPhysical initStep + 1 194 1.52e+03 1.89e+03 0.00136 0 0.00434 0.00434 WorldPhysical msc + 2 194 1.52e+03 1.89e+03 0 0.00136 0.0885 0.0928 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 54, Parent ID = 41 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 194 1.52e+03 1.89e+03 0.00142 0 0 0 WorldPhysical initStep + 1 194 1.52e+03 1.89e+03 0.00142 5.08e-06 0.00474 0.00474 WorldPhysical msc + 2 194 1.52e+03 1.89e+03 0 0.00142 0.0939 0.0986 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 53, Parent ID = 41 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 191 1.52e+03 1.89e+03 0.00165 0 0 0 WorldPhysical initStep + 1 191 1.52e+03 1.89e+03 0.00159 6.11e-05 0.00501 0.00501 WorldPhysical msc + 2 191 1.52e+03 1.89e+03 0 0.00159 0.11 0.115 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 52, Parent ID = 41 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 191 1.51e+03 1.89e+03 0.00109 0 0 0 WorldPhysical initStep + 1 191 1.51e+03 1.89e+03 0.00102 7.06e-05 0.00374 0.00374 WorldPhysical msc + 2 191 1.51e+03 1.89e+03 0 0.00102 0.0596 0.0634 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 51, Parent ID = 41 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 194 1.51e+03 1.89e+03 0.00117 0 0 0 WorldPhysical initStep + 1 194 1.51e+03 1.89e+03 0.0011 6.93e-05 0.00449 0.00449 WorldPhysical msc + 2 194 1.51e+03 1.89e+03 0 0.0011 0.0659 0.0704 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 40, Parent ID = 35 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 243 1.46e+03 1.88e+03 0.0017 0 0 0 WorldPhysical initStep + 1 243 1.46e+03 1.88e+03 0.00164 6e-05 0.00507 0.00507 WorldPhysical msc + 2 243 1.46e+03 1.88e+03 0 0.00164 0.116 0.121 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 39, Parent ID = 35 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 218 1.32e+03 1.99e+03 0.00143 0 0 0 WorldPhysical initStep + 1 218 1.32e+03 1.99e+03 0.00143 0 0.00448 0.00448 WorldPhysical msc + 2 218 1.32e+03 1.99e+03 0 0.00143 0.0953 0.0998 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 33, Parent ID = 32 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 104 1.13e+03 2.1e+03 0.511 0 0 0 Tower initStep + 1 103 1.13e+03 2.1e+03 0.326 0 2.04 2.04 Tower compt + 2 98.8 1.13e+03 2.1e+03 0.254 0 4.09 6.13 Tower compt + 3 95.6 1.12e+03 2.09e+03 0.14 0 15.3 21.4 Tower compt + 4 101 1.13e+03 2.09e+03 0.0918 0 8.4 29.8 Tower compt + 5 98.3 1.13e+03 2.09e+03 0 0.00711 3.52 33.3 Tower phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 60, Parent ID = 33 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 98.3 1.13e+03 2.09e+03 0.0847 0 0 0 Tower initStep + 1 98.3 1.13e+03 2.09e+03 0 0.0847 0.0207 0.0207 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 59, Parent ID = 33 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 101 1.13e+03 2.09e+03 0.0485 0 0 0 Tower initStep + 1 101 1.13e+03 2.09e+03 0 0.0485 0.00805 0.00805 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 58, Parent ID = 33 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 95.6 1.12e+03 2.09e+03 0.114 0 0 0 Tower initStep + 1 95.6 1.12e+03 2.09e+03 0 0.114 0.0339 0.0339 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 57, Parent ID = 33 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 98.8 1.13e+03 2.1e+03 0.0716 0 0 0 Tower initStep + 1 98.8 1.13e+03 2.1e+03 0 0.0716 0.0156 0.0156 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 56, Parent ID = 33 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 103 1.13e+03 2.1e+03 0.185 0 0 0 Tower initStep + 1 103 1.13e+03 2.1e+03 0 0.185 0.0739 0.0739 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 31, Parent ID = 28 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 103 1.13e+03 2.1e+03 5.97 0 0 0 Tower initStep + 1 103 1.13e+03 2.1e+03 3.58 0.831 0.803 0.803 Tower eBrem + 2 103 1.13e+03 2.1e+03 2.28 0.571 0.622 1.42 Tower eBrem + 3 104 1.13e+03 2.1e+03 0.843 1.43 1.6 3.03 Tower eIoni + 4 104 1.13e+03 2.1e+03 0 0.843 0.635 3.66 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 62, Parent ID = 31 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 103 1.13e+03 2.1e+03 0.73 0 0 0 Tower initStep + 1 103 1.13e+03 2.1e+03 0.38 0 1.17 1.17 Tower compt + 2 106 1.12e+03 2.11e+03 0.306 0 8.25 9.42 Tower compt + 3 106 1.12e+03 2.11e+03 0.192 0 1.15 10.6 Tower compt + 4 109 1.12e+03 2.12e+03 0.165 0 9.63 20.2 Tower compt + 5 106 1.12e+03 2.12e+03 0.157 0 3.55 23.7 Tower compt + 6 105 1.12e+03 2.12e+03 0.15 0 4.54 28.3 Tower compt + 7 105 1.12e+03 2.12e+03 0.142 0 0.00647 28.3 Tower compt + 8 103 1.12e+03 2.13e+03 0.14 0 7.24 35.5 Tower compt + 9 94 1.11e+03 2.15e+03 0 0.00711 24.1 59.6 Tower phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 71, Parent ID = 62 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 94 1.11e+03 2.15e+03 0.133 0 0 0 Tower initStep + 1 94 1.11e+03 2.15e+03 0 0.133 0.0433 0.0433 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 70, Parent ID = 62 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 103 1.12e+03 2.13e+03 0.00218 0 0 0 Tower initStep + 1 103 1.12e+03 2.13e+03 0 0.00218 5.39e-05 5.39e-05 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 69, Parent ID = 62 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 105 1.12e+03 2.12e+03 0.00787 0 0 0 Tower initStep + 1 105 1.12e+03 2.12e+03 0 0.00787 0.000377 0.000377 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 68, Parent ID = 62 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 105 1.12e+03 2.12e+03 0.00695 0 0 0 Tower initStep + 1 105 1.12e+03 2.12e+03 0 0.00695 0.00031 0.00031 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 67, Parent ID = 62 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 106 1.12e+03 2.12e+03 0.00823 0 0 0 Tower initStep + 1 106 1.12e+03 2.12e+03 0 0.00823 0.000407 0.000407 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 66, Parent ID = 62 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 109 1.12e+03 2.12e+03 0.0268 0 0 0 Tower initStep + 1 109 1.12e+03 2.12e+03 0 0.0268 0.00294 0.00294 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 65, Parent ID = 62 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 106 1.12e+03 2.11e+03 0.114 0 0 0 Tower initStep + 1 106 1.12e+03 2.11e+03 0 0.114 0.0339 0.0339 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 64, Parent ID = 62 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 106 1.12e+03 2.11e+03 0.0747 0 0 0 Tower initStep + 1 106 1.12e+03 2.11e+03 0 0.0747 0.0168 0.0168 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 63, Parent ID = 62 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 103 1.13e+03 2.1e+03 0.349 0 0 0 Tower initStep + 1 103 1.13e+03 2.1e+03 0.273 0.00848 0.0113 0.0113 Tower eBrem + 2 103 1.13e+03 2.1e+03 0 0.273 0.134 0.146 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 72, Parent ID = 63 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 103 1.13e+03 2.1e+03 0.0679 0 0 0 Tower initStep + 1 103 1.13e+03 2.1e+03 0 0.00711 0.628 0.628 Tower phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 73, Parent ID = 72 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 103 1.13e+03 2.1e+03 0.0608 0 0 0 Tower initStep + 1 103 1.13e+03 2.1e+03 0 0.0608 0.0118 0.0118 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 61, Parent ID = 31 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 103 1.13e+03 2.1e+03 1.56 0 0 0 Tower initStep + 1 125 1.14e+03 2.13e+03 0.321 0 35.8 35.8 Tower compt + 2 125 1.14e+03 2.13e+03 0.302 0 1.06 36.9 Tower compt + 3 120 1.15e+03 2.12e+03 0.302 0 13.4 50.3 HadCaloPhysical CoupledTransportation + 4 61 1.25e+03 1.99e+03 0.302 0 174 224 WorldPhysical CoupledTransportation + 5 31.4 1.3e+03 1.92e+03 0.302 0 4.78e+03 5e+03 WorldPhysical CoupledTransportation + 6 -1.57e+03 4e+03 -1.56e+03 0.302 0 4.69e+03 9.69e+03 OutOfWorld CoupledTransportation + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 75, Parent ID = 61 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 125 1.14e+03 2.13e+03 0.0189 0 0 0 Tower initStep + 1 125 1.14e+03 2.13e+03 0 0.0189 0.00161 0.00161 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 74, Parent ID = 61 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 125 1.14e+03 2.13e+03 1.24 0 0 0 Tower initStep + 1 126 1.14e+03 2.13e+03 0.158 1.08 1.01 1.01 Tower eIoni + 2 126 1.14e+03 2.13e+03 0 0.158 0.0573 1.07 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 27, Parent ID = 24 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 81.4 1.1e+03 2.07e+03 20.4 0 0 0 Tower initStep + 1 148 1.07e+03 2.09e+03 0 0 79 79 Tower conv + +********************************************************************************************************* +* G4Track Information: Particle = e+, Track ID = 77, Parent ID = 27 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 148 1.07e+03 2.09e+03 5.72 0 0 0 Tower initStep + 1 148 1.07e+03 2.09e+03 5.58 0.0754 0.101 0.101 Tower eBrem + 2 149 1.07e+03 2.09e+03 3.9 0.254 0.252 0.353 Tower eBrem + 3 149 1.07e+03 2.09e+03 3.53 0.209 0.259 0.612 Tower eBrem + 4 149 1.07e+03 2.09e+03 3.37 0.0875 0.0919 0.704 Tower eBrem + 5 149 1.07e+03 2.09e+03 2.93 0.443 0.562 1.27 Tower msc + 6 150 1.07e+03 2.09e+03 2.39 0.538 0.562 1.83 Tower msc + 7 150 1.07e+03 2.09e+03 1.4 0.997 0.226 2.05 Tower msc + 8 150 1.07e+03 2.09e+03 1.37 0.0246 0.0229 2.08 Tower msc + 9 150 1.07e+03 2.09e+03 1.37 0.000219 0.00084 2.08 Tower msc + 10 150 1.07e+03 2.09e+03 1.37 9.46e-07 9.24e-07 2.08 Tower CoupledTransportation + 11 150 1.07e+03 2.09e+03 1.35 0.0163 0.0272 2.11 Tower msc + 12 150 1.07e+03 2.09e+03 1.33 0.0249 0.0272 2.13 Tower msc + 13 150 1.07e+03 2.09e+03 1.3 0.0296 0.0272 2.16 Tower msc + 14 150 1.07e+03 2.09e+03 1.27 0.0301 0.0272 2.19 Tower msc + 15 150 1.07e+03 2.09e+03 1.24 0.0307 0.0272 2.21 Tower msc + 16 150 1.07e+03 2.09e+03 1.22 0.0209 0.0282 2.24 Tower msc + 17 150 1.07e+03 2.09e+03 1.19 0.0287 0.0346 2.28 Tower msc + 18 150 1.07e+03 2.09e+03 1.16 0.029 0.0429 2.32 Tower msc + 19 150 1.07e+03 2.09e+03 1.1 0.0565 0.0525 2.37 Tower msc + 20 150 1.07e+03 2.09e+03 1.06 0.0459 0.0601 2.43 Tower msc + 21 150 1.07e+03 2.09e+03 0.997 0.0608 0.0716 2.5 Tower msc + 22 150 1.07e+03 2.09e+03 0.911 0.0863 0.0842 2.59 Tower msc + 23 150 1.07e+03 2.09e+03 0.845 0.0656 0.0854 2.67 Tower msc + 24 150 1.07e+03 2.09e+03 0.764 0.0811 0.0842 2.76 Tower msc + 25 150 1.07e+03 2.09e+03 0.704 0.0601 0.0729 2.83 Tower msc + 26 150 1.07e+03 2.09e+03 0.658 0.0464 0.0613 2.89 Tower msc + 27 150 1.07e+03 2.09e+03 0.601 0.0572 0.0584 2.95 Tower msc + 28 150 1.07e+03 2.09e+03 0.555 0.0458 0.0653 3.02 Tower msc + 29 150 1.07e+03 2.09e+03 0.436 0.119 0.0785 3.09 Tower msc + 30 150 1.07e+03 2.09e+03 0 0.436 0.261 3.36 Tower eIoni + 31 150 1.07e+03 2.09e+03 0 0 0 3.36 Tower annihil + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 83, Parent ID = 77 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 150 1.07e+03 2.09e+03 0.511 0 0 0 Tower initStep + 1 150 1.08e+03 2.09e+03 0.511 0 10.1 10.1 Tower CoupledTransportation + 2 150 1.08e+03 2.09e+03 0.314 0 0.163 10.3 Tower compt + 3 150 1.08e+03 2.09e+03 0.314 0 0.00776 10.3 Tower CoupledTransportation + 4 197 1.1e+03 2.08e+03 0.282 0 53.9 64.1 Tower compt + 5 200 1.11e+03 2.08e+03 0.19 0 6.61 70.8 Tower compt + 6 198 1.11e+03 2.08e+03 0.189 0 2.93 73.7 Tower compt + 7 190 1.11e+03 2.08e+03 0.178 0 10.9 84.6 Tower compt + 8 179 1.13e+03 2.07e+03 0 0.00711 19.9 105 Tower phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 89, Parent ID = 83 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 179 1.13e+03 2.07e+03 0.171 0 0 0 Tower initStep + 1 179 1.13e+03 2.07e+03 0 0.171 0.0652 0.0652 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 88, Parent ID = 83 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 190 1.11e+03 2.08e+03 0.0113 0 0 0 Tower initStep + 1 190 1.11e+03 2.08e+03 0 0.0113 0.000685 0.000685 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 87, Parent ID = 83 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 198 1.11e+03 2.08e+03 0.000721 0 0 0 Tower initStep + 1 198 1.11e+03 2.08e+03 0 0.000721 1.26e-05 1.26e-05 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 86, Parent ID = 83 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 200 1.11e+03 2.08e+03 0.0922 0 0 0 Tower initStep + 1 200 1.11e+03 2.08e+03 0 0.0922 0.0238 0.0238 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 85, Parent ID = 83 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 197 1.1e+03 2.08e+03 0.0319 0 0 0 Tower initStep + 1 197 1.1e+03 2.08e+03 0 0.0319 0.00393 0.00393 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 84, Parent ID = 83 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 150 1.08e+03 2.09e+03 0.197 0 0 0 Tower initStep + 1 150 1.08e+03 2.09e+03 0.194 0.00239 0.00171 0.00171 Tower msc + 2 150 1.08e+03 2.09e+03 0.192 0.00256 0.00202 0.00373 Tower msc + 3 150 1.08e+03 2.09e+03 0.191 0.00113 0.00234 0.00607 Tower msc + 4 150 1.08e+03 2.09e+03 0.189 0.00195 0.0026 0.00867 Tower msc + 5 150 1.08e+03 2.09e+03 0.186 0.00232 0.00243 0.0111 Tower msc + 6 150 1.08e+03 2.09e+03 0.185 0.00192 0.00217 0.0133 Tower msc + 7 150 1.08e+03 2.09e+03 0.182 0.00217 0.00185 0.0151 Tower msc + 8 150 1.08e+03 2.09e+03 0.18 0.00217 0.00203 0.0171 Tower msc + 9 150 1.08e+03 2.09e+03 0.177 0.00279 0.00216 0.0193 Tower msc + 10 150 1.08e+03 2.09e+03 0.174 0.00309 0.00253 0.0218 Tower msc + 11 150 1.08e+03 2.09e+03 0.17 0.00463 0.00296 0.0248 Tower msc + 12 150 1.08e+03 2.09e+03 0.167 0.00281 0.00366 0.0285 Tower msc + 13 150 1.08e+03 2.09e+03 0.162 0.00515 0.00427 0.0327 Tower msc + 14 150 1.08e+03 2.09e+03 0.156 0.0061 0.00485 0.0376 Tower msc + 15 150 1.08e+03 2.09e+03 0.15 0.00583 0.0051 0.0427 Tower msc + 16 150 1.08e+03 2.09e+03 0.142 0.0081 0.00562 0.0483 Tower msc + 17 150 1.08e+03 2.09e+03 0.131 0.0108 0.00682 0.0551 Tower msc + 18 150 1.08e+03 2.09e+03 0.119 0.0119 0.0073 0.0624 Tower msc + 19 150 1.08e+03 2.09e+03 0.1 0.0189 0.00798 0.0704 Tower msc + 20 150 1.08e+03 2.09e+03 0 0.1 0.0272 0.0976 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 82, Parent ID = 77 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 150 1.07e+03 2.09e+03 0.511 0 0 0 Tower initStep + 1 151 1.06e+03 2.1e+03 0.421 0 5.24 5.24 Tower compt + 2 154 1.06e+03 2.1e+03 0.233 0 7.65 12.9 Tower compt + 3 150 1.05e+03 2.1e+03 0.233 0 4.4 17.3 Tower CoupledTransportation + 4 142 1.05e+03 2.1e+03 0.233 0 8.75 26 Tower CoupledTransportation + 5 140 1.05e+03 2.09e+03 0.138 0 2.15 28.2 Tower compt + 6 141 1.05e+03 2.09e+03 0.138 0 1.59 29.8 Tower CoupledTransportation + 7 141 1.05e+03 2.09e+03 0.136 0 0.48 30.3 Tower compt + 8 142 1.05e+03 2.09e+03 0 0.00711 1.25 31.5 Tower phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 94, Parent ID = 82 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 142 1.05e+03 2.09e+03 0.129 0 0 0 Tower initStep + 1 142 1.05e+03 2.09e+03 0 0.129 0.0413 0.0413 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 93, Parent ID = 82 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 141 1.05e+03 2.09e+03 0.0021 0 0 0 Tower initStep + 1 141 1.05e+03 2.09e+03 0 0.0021 5.08e-05 5.08e-05 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 92, Parent ID = 82 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 140 1.05e+03 2.09e+03 0.0947 0 0 0 Tower initStep + 1 140 1.05e+03 2.09e+03 0 0.0947 0.0249 0.0249 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 91, Parent ID = 82 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 154 1.06e+03 2.1e+03 0.189 0 0 0 Tower initStep + 1 154 1.06e+03 2.1e+03 0 0.189 0.0761 0.0761 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 90, Parent ID = 82 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 151 1.06e+03 2.1e+03 0.0897 0 0 0 Tower initStep + 1 151 1.06e+03 2.1e+03 0 0.0897 0.0228 0.0228 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 81, Parent ID = 77 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 149 1.07e+03 2.09e+03 0.0696 0 0 0 Tower initStep + 1 149 1.07e+03 2.09e+03 0 0.00711 0.557 0.557 Tower phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 95, Parent ID = 81 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 149 1.07e+03 2.09e+03 0.0625 0 0 0 Tower initStep + 1 149 1.07e+03 2.09e+03 0 0.0625 0.0124 0.0124 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 80, Parent ID = 77 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 149 1.07e+03 2.09e+03 0.16 0 0 0 Tower initStep + 1 149 1.07e+03 2.09e+03 0.126 0 0.447 0.447 Tower compt + 2 149 1.07e+03 2.09e+03 0 0.00711 2.25 2.69 Tower phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 97, Parent ID = 80 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 149 1.07e+03 2.09e+03 0.119 0 0 0 Tower initStep + 1 149 1.07e+03 2.09e+03 0 0.119 0.0364 0.0364 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 96, Parent ID = 80 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 149 1.07e+03 2.09e+03 0.0343 0 0 0 Tower initStep + 1 149 1.07e+03 2.09e+03 0 0.0343 0.00447 0.00447 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 79, Parent ID = 77 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 149 1.07e+03 2.09e+03 1.43 0 0 0 Tower initStep + 1 150 1.07e+03 2.09e+03 1.43 0 1.79 1.79 Tower CoupledTransportation + 2 173 1.05e+03 2.09e+03 1.43 0 28.8 30.5 Tower CoupledTransportation + 3 175 1.05e+03 2.09e+03 0.802 0 1.96 32.5 Tower compt + 4 190 1.05e+03 2.1e+03 0.356 0 17.3 49.8 Tower compt + 5 191 1.05e+03 2.1e+03 0.356 0 4.04 53.9 Tower CoupledTransportation + 6 195 1.08e+03 2.11e+03 0.336 0 29.6 83.5 Tower compt + 7 201 1.08e+03 2.12e+03 0.331 0 10.5 94 Tower compt + 8 208 1.1e+03 2.13e+03 0.309 0 21.6 116 Tower compt + 9 213 1.11e+03 2.15e+03 0.299 0 22.4 138 Tower compt + 10 214 1.11e+03 2.15e+03 0.217 0 1.35 139 Tower compt + 11 213 1.11e+03 2.15e+03 0.178 0 2.84 142 Tower compt + 12 211 1.12e+03 2.14e+03 0.131 0 14.7 157 Tower compt + 13 216 1.12e+03 2.13e+03 0.112 0 7.5 164 Tower compt + 14 222 1.12e+03 2.13e+03 0.0891 0 6.38 171 Tower compt + 15 215 1.13e+03 2.13e+03 0 0.00711 12.4 183 Tower phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 109, Parent ID = 79 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 215 1.13e+03 2.13e+03 0.0819 0 0 0 Tower initStep + 1 215 1.13e+03 2.13e+03 0 0.0819 0.0195 0.0195 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 108, Parent ID = 79 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 222 1.12e+03 2.13e+03 0.0232 0 0 0 Tower initStep + 1 222 1.12e+03 2.13e+03 0 0.0232 0.00229 0.00229 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 107, Parent ID = 79 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 216 1.12e+03 2.13e+03 0.0188 0 0 0 Tower initStep + 1 216 1.12e+03 2.13e+03 0 0.0188 0.00161 0.00161 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 106, Parent ID = 79 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 211 1.12e+03 2.14e+03 0.0474 0 0 0 Tower initStep + 1 211 1.12e+03 2.14e+03 0 0.0474 0.00775 0.00775 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 105, Parent ID = 79 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 213 1.11e+03 2.15e+03 0.0382 0 0 0 Tower initStep + 1 213 1.11e+03 2.15e+03 0 0.0382 0.00536 0.00536 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 104, Parent ID = 79 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 214 1.11e+03 2.15e+03 0.0824 0 0 0 Tower initStep + 1 214 1.11e+03 2.15e+03 0 0.0824 0.0197 0.0197 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 103, Parent ID = 79 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 213 1.11e+03 2.15e+03 0.00961 0 0 0 Tower initStep + 1 213 1.11e+03 2.15e+03 0 0.00961 0.000523 0.000523 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 102, Parent ID = 79 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 208 1.1e+03 2.13e+03 0.0226 0 0 0 Tower initStep + 1 208 1.1e+03 2.13e+03 0 0.0226 0.00221 0.00221 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 101, Parent ID = 79 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 201 1.08e+03 2.12e+03 0.00416 0 0 0 Tower initStep + 1 201 1.08e+03 2.12e+03 0 0.00416 0.000138 0.000138 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 100, Parent ID = 79 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 195 1.08e+03 2.11e+03 0.0205 0 0 0 Tower initStep + 1 195 1.08e+03 2.11e+03 0 0.0205 0.00185 0.00185 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 99, Parent ID = 79 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 190 1.05e+03 2.1e+03 0.446 0 0 0 Tower initStep + 1 190 1.05e+03 2.1e+03 0 0.446 0.274 0.274 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 98, Parent ID = 79 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 175 1.05e+03 2.09e+03 0.625 0 0 0 Tower initStep + 1 175 1.05e+03 2.09e+03 0 0.625 0.433 0.433 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 78, Parent ID = 77 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 148 1.07e+03 2.09e+03 0.0667 0 0 0 Tower initStep + 1 149 1.07e+03 2.09e+03 0 0.00711 0.683 0.683 Tower phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 110, Parent ID = 78 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 149 1.07e+03 2.09e+03 0.0596 0 0 0 Tower initStep + 1 149 1.07e+03 2.09e+03 0 0.0596 0.0114 0.0114 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 76, Parent ID = 27 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 148 1.07e+03 2.09e+03 13.6 0 0 0 Tower initStep + 1 150 1.07e+03 2.09e+03 10.1 3.48 1.83 1.83 Tower msc + 2 150 1.07e+03 2.09e+03 9.91 0.219 0.165 1.99 Tower msc + 3 150 1.07e+03 2.09e+03 9.91 0.000325 0.0012 1.99 Tower msc + 4 150 1.07e+03 2.09e+03 9.91 8.4e-08 7.13e-08 1.99 Tower CoupledTransportation + 5 151 1.07e+03 2.09e+03 9.07 0.836 0.754 2.75 Tower msc + 6 151 1.07e+03 2.09e+03 8.29 0.784 0.754 3.5 Tower msc + 7 152 1.07e+03 2.09e+03 6.81 0.086 0.112 3.61 Tower eBrem + 8 152 1.07e+03 2.09e+03 5.95 0.856 0.754 4.37 Tower msc + 9 153 1.07e+03 2.09e+03 5.19 0.761 0.754 5.12 Tower msc + 10 154 1.07e+03 2.09e+03 4.45 0.741 0.754 5.88 Tower msc + 11 154 1.07e+03 2.09e+03 2.71 1.74 0.902 6.78 Tower msc + 12 155 1.07e+03 2.09e+03 0.797 1.92 1.67 8.45 Tower eBrem + 13 155 1.07e+03 2.09e+03 0 0.797 0.592 9.04 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 111, Parent ID = 76 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 152 1.07e+03 2.09e+03 1.39 0 0 0 Tower initStep + 1 189 1.07e+03 2.1e+03 0.259 0 37.9 37.9 Tower compt + 2 184 1.07e+03 2.1e+03 0 0.00711 7.29 45.1 Tower phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 113, Parent ID = 111 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 184 1.07e+03 2.1e+03 0.252 0 0 0 Tower initStep + 1 184 1.07e+03 2.1e+03 0 0.252 0.119 0.119 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 112, Parent ID = 111 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 189 1.07e+03 2.1e+03 1.13 0 0 0 Tower initStep + 1 189 1.07e+03 2.1e+03 0.554 0.137 0.163 0.163 Tower eBrem + 2 189 1.07e+03 2.1e+03 0 0.554 0.369 0.532 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 114, Parent ID = 112 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 189 1.07e+03 2.1e+03 0.44 0 0 0 Tower initStep + 1 190 1.07e+03 2.1e+03 0.435 0 1.49 1.49 Tower compt + 2 201 1.05e+03 2.1e+03 0.403 0 17.5 19 Tower compt + 3 203 1.05e+03 2.1e+03 0.403 0 5.74 24.7 Tower CoupledTransportation + 4 209 1.04e+03 2.1e+03 0.228 0 13.4 38.2 Tower compt + 5 215 1.04e+03 2.09e+03 0.195 0 8.33 46.5 Tower compt + 6 216 1.04e+03 2.09e+03 0.179 0 2.56 49.1 Tower compt + 7 222 1.04e+03 2.09e+03 0.156 0 6.57 55.6 Tower compt + 8 223 1.04e+03 2.09e+03 0.149 0 1.15 56.8 Tower compt + 9 226 1.03e+03 2.1e+03 0.138 0 7.28 64.1 Tower compt + 10 226 1.03e+03 2.1e+03 0 0.00711 0.692 64.7 Tower phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 123, Parent ID = 114 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 226 1.03e+03 2.1e+03 0.131 0 0 0 Tower initStep + 1 226 1.03e+03 2.1e+03 0 0.131 0.0423 0.0423 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 122, Parent ID = 114 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 226 1.03e+03 2.1e+03 0.0115 0 0 0 Tower initStep + 1 226 1.03e+03 2.1e+03 0 0.0115 0.000704 0.000704 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 121, Parent ID = 114 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 223 1.04e+03 2.09e+03 0.00677 0 0 0 Tower initStep + 1 223 1.04e+03 2.09e+03 0 0.00677 0.000297 0.000297 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 120, Parent ID = 114 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 222 1.04e+03 2.09e+03 0.0228 0 0 0 Tower initStep + 1 222 1.04e+03 2.09e+03 0 0.0228 0.00223 0.00223 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 119, Parent ID = 114 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 216 1.04e+03 2.09e+03 0.0163 0 0 0 Tower initStep + 1 216 1.04e+03 2.09e+03 0 0.0163 0.00126 0.00126 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 118, Parent ID = 114 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 215 1.04e+03 2.09e+03 0.0325 0 0 0 Tower initStep + 1 215 1.04e+03 2.09e+03 0 0.0325 0.00406 0.00406 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 117, Parent ID = 114 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 209 1.04e+03 2.1e+03 0.175 0 0 0 Tower initStep + 1 209 1.04e+03 2.1e+03 0 0.175 0.0678 0.0678 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 116, Parent ID = 114 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 201 1.05e+03 2.1e+03 0.032 0 0 0 Tower initStep + 1 201 1.05e+03 2.1e+03 0 0.032 0.00394 0.00394 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 115, Parent ID = 114 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 190 1.07e+03 2.1e+03 0.00495 0 0 0 Tower initStep + 1 190 1.07e+03 2.1e+03 0 0.00495 0.000181 0.000181 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 26, Parent ID = 24 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 80.7 1.1e+03 2.07e+03 0.355 0 0 0 Tower initStep + 1 90.8 1.09e+03 2.07e+03 0.197 0 11.9 11.9 Tower compt + 2 94.5 1.11e+03 2.07e+03 0 0.00711 13 24.8 Tower phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 125, Parent ID = 26 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 94.5 1.11e+03 2.07e+03 0.19 0 0 0 Tower initStep + 1 94.5 1.11e+03 2.07e+03 0 0.19 0.077 0.077 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 124, Parent ID = 26 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 90.8 1.09e+03 2.07e+03 0.158 0 0 0 Tower initStep + 1 90.8 1.09e+03 2.07e+03 0 0.158 0.0575 0.0575 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 25, Parent ID = 24 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 80.1 1.1e+03 2.07e+03 0.0883 0 0 0 Tower initStep + 1 80.3 1.1e+03 2.07e+03 0 0.00711 0.224 0.224 Tower phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 126, Parent ID = 25 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 80.3 1.1e+03 2.07e+03 0.0812 0 0 0 Tower initStep + 1 80.3 1.1e+03 2.07e+03 0 0.0812 0.0192 0.0192 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = anti_nu_e, Track ID = 23, Parent ID = 21 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 78.5 1.1e+03 2.06e+03 26.2 0 0 0 Tower initStep + 1 50.2 1.15e+03 2.04e+03 26.2 0 63.8 63.8 HadCaloPhysical CoupledTransportation + 2 -8.1 1.25e+03 1.97e+03 26.2 0 131 195 WorldPhysical CoupledTransportation + 3 -37.2 1.3e+03 1.94e+03 26.2 0 3.6e+03 3.8e+03 WorldPhysical CoupledTransportation + 4 -1.61e+03 4e+03 283 26.2 0 3.54e+03 7.34e+03 OutOfWorld CoupledTransportation + +********************************************************************************************************* +* G4Track Information: Particle = nu_mu, Track ID = 22, Parent ID = 21 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 78.5 1.1e+03 2.06e+03 30 0 0 0 Tower initStep + 1 50 1.1e+03 2.07e+03 30 0 28.6 28.6 Tower CoupledTransportation + 2 -50 1.11e+03 2.07e+03 30 0 100 129 Tower CoupledTransportation + 3 -150 1.12e+03 2.07e+03 30 0 100 229 Tower CoupledTransportation + 4 -250 1.13e+03 2.07e+03 30 0 100 330 Tower CoupledTransportation + 5 -350 1.13e+03 2.08e+03 30 0 100 430 Tower CoupledTransportation + 6 -450 1.14e+03 2.08e+03 30 0 100 530 Tower CoupledTransportation + 7 -550 1.15e+03 2.08e+03 30 0 100 631 Tower CoupledTransportation + 8 -576 1.15e+03 2.08e+03 30 0 25.6 656 HadCaloPhysical CoupledTransportation + 9 -1.25e+03 1.2e+03 2.1e+03 30 0 677 1.33e+03 WorldPhysical CoupledTransportation + 10 -1.3e+03 1.2e+03 2.1e+03 30 0 2.76e+03 4.09e+03 WorldPhysical CoupledTransportation + 11 -4e+03 1.41e+03 2.18e+03 30 0 2.71e+03 6.8e+03 OutOfWorld CoupledTransportation + +********************************************************************************************************* +* G4Track Information: Particle = anti_nu_mu, Track ID = 20, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 78.7 1.1e+03 2.06e+03 29.8 0 0 0 Tower initStep + 1 105 1.15e+03 2.04e+03 29.8 0 60.9 60.9 HadCaloPhysical CoupledTransportation + 2 160 1.25e+03 1.99e+03 29.8 0 126 186 WorldPhysical CoupledTransportation + 3 188 1.3e+03 1.96e+03 29.8 0 3.45e+03 3.64e+03 WorldPhysical CoupledTransportation + 4 1.67e+03 4e+03 547 29.8 0 3.39e+03 7.03e+03 OutOfWorld CoupledTransportation + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 19, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 23.3 833 1.42e+03 0.0047 0 0 0 WorldPhysical initStep + 1 23.3 833 1.42e+03 0.0047 0 0.0129 0.0129 WorldPhysical msc + 2 23.5 834 1.42e+03 0 0.0047 0.649 0.662 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 18, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 20.1 810 1.38e+03 1.07 0 0 0 Crystal initStep + 1 20 810 1.38e+03 0 1.07 1.5 1.5 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 17, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 18.5 800 1.36e+03 11.3 0 0 0 Crystal initStep + 1 18.5 801 1.36e+03 9.64 0.448 0.805 0.805 Crystal eBrem + 2 17.9 801 1.36e+03 7.85 0.88 1.47 2.27 Crystal eBrem + 3 16.9 802 1.36e+03 7.12 0.734 1.61 3.88 Crystal msc + 4 16.7 802 1.36e+03 6.08 0.0731 0.204 4.08 Crystal eIoni + 5 15.3 802 1.36e+03 5.37 0.718 1.59 5.67 Crystal eBrem + 6 14 802 1.36e+03 4.67 0.693 1.61 7.28 Crystal msc + 7 13.9 802 1.36e+03 4.52 0.113 0.186 7.47 Crystal eBrem + 8 14 803 1.36e+03 3.83 0.682 1.61 9.08 Crystal msc + 9 14.3 804 1.36e+03 2.99 0.846 1.61 10.7 Crystal msc + 10 14 805 1.36e+03 2.15 0.434 0.766 11.5 Crystal eBrem + 11 13.8 805 1.36e+03 1.82 0.278 0.634 12.1 Crystal eBrem + 12 13.8 806 1.36e+03 1.52 0.299 0.501 12.6 Crystal eIoni + 13 13.7 805 1.36e+03 0.573 0.668 1.28 13.9 Crystal eBrem + 14 13.7 805 1.36e+03 0 0.573 0.817 14.7 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 133, Parent ID = 17 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 13.7 805 1.36e+03 0.283 0 0 0 Crystal initStep + 1 18.5 800 1.36e+03 0.283 0 8.07 8.07 Crystal CoupledTransportation + 2 22.8 796 1.37e+03 0.163 0 7.06 15.1 Crystal compt + 3 19.1 798 1.37e+03 0 0.0332 5.73 20.9 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 135, Parent ID = 133 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 19.1 798 1.37e+03 0.13 0 0 0 Crystal initStep + 1 19.1 798 1.37e+03 0 0.13 0.091 0.091 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 134, Parent ID = 133 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 22.8 796 1.37e+03 0.12 0 0 0 Crystal initStep + 1 22.8 796 1.37e+03 0 0.12 0.0798 0.0798 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 132, Parent ID = 17 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 13.8 805 1.36e+03 0.0443 0 0 0 Crystal initStep + 1 13.8 805 1.36e+03 0 0.0332 0.0746 0.0746 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 136, Parent ID = 132 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 13.8 805 1.36e+03 0.0111 0 0 0 Crystal initStep + 1 13.8 805 1.36e+03 0 0.0111 0.00157 0.00157 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 131, Parent ID = 17 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 14 805 1.36e+03 0.408 0 0 0 Crystal initStep + 1 6.03 812 1.36e+03 0.324 0 11.1 11.1 Crystal compt + 2 8.88e-16 824 1.38e+03 0.324 0 23.4 34.4 Crystal CoupledTransportation + 3 -4.58 834 1.4e+03 0 0.0332 17.7 52.2 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 138, Parent ID = 131 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -4.58 834 1.4e+03 0.291 0 0 0 Crystal initStep + 1 -4.6 834 1.4e+03 0 0.291 0.316 0.316 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 137, Parent ID = 131 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 6.03 812 1.36e+03 0.0843 0 0 0 Crystal initStep + 1 6.03 812 1.36e+03 0 0.0843 0.0448 0.0448 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 130, Parent ID = 17 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 13.9 802 1.36e+03 0.0436 0 0 0 Crystal initStep + 1 13.9 802 1.36e+03 0 0.0332 0.00119 0.00119 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 139, Parent ID = 130 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 13.9 802 1.36e+03 0.0104 0 0 0 Crystal initStep + 1 13.9 802 1.36e+03 0 0.0104 0.00142 0.00142 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 129, Parent ID = 17 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 16.7 802 1.36e+03 0.965 0 0 0 Crystal initStep + 1 16.5 802 1.36e+03 0.311 0.654 1.41 1.41 Crystal eIoni + 2 16.5 802 1.36e+03 0 0.311 0.348 1.75 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 128, Parent ID = 17 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 17.9 801 1.36e+03 0.904 0 0 0 Crystal initStep + 1 0 812 1.39e+03 0.904 0 41.2 41.2 Crystal CoupledTransportation + 2 -3.13 814 1.4e+03 0.904 0 7.2 48.4 WorldPhysical CoupledTransportation + 3 -53.7 844 1.5e+03 0.904 0 116 165 HadCaloPhysical CoupledTransportation + 4 -79 860 1.55e+03 0.904 0 58.1 223 Tower CoupledTransportation + 5 -97.4 871 1.59e+03 0.643 0 42.5 265 Tower compt + 6 -94.6 885 1.6e+03 0.612 0 22.2 287 Tower compt + 7 -91.2 896 1.63e+03 0.524 0 29.9 317 Tower compt + 8 -93.2 914 1.64e+03 0.361 0 22.6 340 Tower compt + 9 -90.9 914 1.65e+03 0.307 0 6.91 347 Tower compt + 10 -98.4 903 1.68e+03 0.289 0 30.1 377 Tower compt + 11 -101 904 1.68e+03 0.202 0 7.06 384 Tower compt + 12 -89.2 919 1.69e+03 0.19 0 20 404 Tower compt + 13 -88.6 919 1.69e+03 0.119 0 0.753 405 Tower compt + 14 -93 914 1.69e+03 0.118 0 9.43 414 Tower compt + 15 -93.9 913 1.68e+03 0.112 0 1.87 416 Tower compt + 16 -94.4 913 1.68e+03 0 0.00711 0.907 417 Tower phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 151, Parent ID = 128 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -94.4 913 1.68e+03 0.105 0 0 0 Tower initStep + 1 -94.3 913 1.68e+03 0 0.105 0.0296 0.0296 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 150, Parent ID = 128 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -93.9 913 1.68e+03 0.0059 0 0 0 Tower initStep + 1 -93.9 913 1.68e+03 0 0.0059 0.000239 0.000239 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 149, Parent ID = 128 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -93 914 1.69e+03 0.000811 0 0 0 Tower initStep + 1 -93 914 1.69e+03 0 0.000811 1.44e-05 1.44e-05 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 148, Parent ID = 128 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -88.6 919 1.69e+03 0.0712 0 0 0 Tower initStep + 1 -88.6 919 1.69e+03 0 0.0712 0.0155 0.0155 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 147, Parent ID = 128 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -89.2 919 1.69e+03 0.0118 0 0 0 Tower initStep + 1 -89.2 919 1.69e+03 0 0.0118 0.000738 0.000738 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 146, Parent ID = 128 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -101 904 1.68e+03 0.087 0 0 0 Tower initStep + 1 -101 904 1.68e+03 0 0.087 0.0217 0.0217 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 145, Parent ID = 128 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -98.4 903 1.68e+03 0.0186 0 0 0 Tower initStep + 1 -98.4 903 1.68e+03 0 0.0186 0.00158 0.00158 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 144, Parent ID = 128 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -90.9 914 1.65e+03 0.0532 0 0 0 Tower initStep + 1 -90.9 914 1.65e+03 0 0.0532 0.00944 0.00944 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 143, Parent ID = 128 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -93.2 914 1.64e+03 0.163 0 0 0 Tower initStep + 1 -93.2 914 1.64e+03 0 0.163 0.0603 0.0603 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 142, Parent ID = 128 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -91.2 896 1.63e+03 0.0887 0 0 0 Tower initStep + 1 -91.2 896 1.63e+03 0 0.0887 0.0224 0.0224 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 141, Parent ID = 128 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -94.6 885 1.6e+03 0.0301 0 0 0 Tower initStep + 1 -94.6 885 1.6e+03 0 0.0301 0.00357 0.00357 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 140, Parent ID = 128 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -97.4 871 1.59e+03 0.261 0 0 0 Tower initStep + 1 -97.5 871 1.59e+03 0 0.261 0.126 0.126 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 127, Parent ID = 17 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 18.5 801 1.36e+03 1.18 0 0 0 Crystal initStep + 1 14.8 808 1.37e+03 1.09 0 16.6 16.6 Crystal compt + 2 13 811 1.37e+03 0.591 0 4.46 21.1 Crystal compt + 3 16.7 850 1.38e+03 0.591 0 39.9 60.9 Crystal CoupledTransportation + 4 18.9 872 1.38e+03 0.417 0 22.5 83.4 Crystal compt + 5 7.36 892 1.37e+03 0.396 0 26.3 110 Crystal compt + 6 5.34 900 1.37e+03 0.396 0 8.66 118 Crystal CoupledTransportation + 7 4.95 902 1.37e+03 0.395 0 1.67 120 Crystal compt + 8 0 927 1.36e+03 0.395 0 27.1 147 Crystal CoupledTransportation + 9 -4.55 950 1.35e+03 0.395 0 24.9 172 Crystal CoupledTransportation + 10 -12.6 991 1.34e+03 0.352 0 44.2 216 Crystal compt + 11 -14.4 1e+03 1.34e+03 0.352 0 9.32 226 Crystal CoupledTransportation + 12 -17.4 1.01e+03 1.34e+03 0 0.0332 15.6 241 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 158, Parent ID = 127 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -17.4 1.01e+03 1.34e+03 0.318 0 0 0 Crystal initStep + 1 -17.4 1.01e+03 1.34e+03 0 0.318 0.36 0.36 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 157, Parent ID = 127 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -12.6 991 1.34e+03 0.0435 0 0 0 Crystal initStep + 1 -12.6 991 1.34e+03 0 0.0435 0.0149 0.0149 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 156, Parent ID = 127 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 4.95 902 1.37e+03 0.000922 0 0 0 Crystal initStep + 1 4.95 902 1.37e+03 0 0.000922 4.44e-05 4.44e-05 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 155, Parent ID = 127 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 7.36 892 1.37e+03 0.0213 0 0 0 Crystal initStep + 1 7.36 892 1.37e+03 0 0.0213 0.00452 0.00452 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 154, Parent ID = 127 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 18.9 872 1.38e+03 0.173 0 0 0 Crystal initStep + 1 18.9 872 1.38e+03 0 0.173 0.144 0.144 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 153, Parent ID = 127 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 13 811 1.37e+03 0.5 0 0 0 Crystal initStep + 1 12.9 811 1.37e+03 0 0.5 0.679 0.679 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 152, Parent ID = 127 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 14.8 808 1.37e+03 0.0855 0 0 0 Crystal initStep + 1 14.8 808 1.37e+03 0 0.0855 0.0459 0.0459 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 16, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 16.1 786 1.33e+03 0.851 0 0 0 Crystal initStep + 1 16.1 786 1.33e+03 0.524 0.119 0.205 0.205 Crystal eBrem + 2 16.2 786 1.33e+03 0 0.524 0.724 0.929 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 159, Parent ID = 16 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 16.1 786 1.33e+03 0.209 0 0 0 Crystal initStep + 1 15.7 785 1.33e+03 0.161 0 0.916 0.916 Crystal compt + 2 16.1 784 1.33e+03 0 0.0332 1.7 2.62 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 161, Parent ID = 159 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 16.1 784 1.33e+03 0.128 0 0 0 Crystal initStep + 1 16.1 784 1.33e+03 0 0.128 0.0881 0.0881 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 160, Parent ID = 159 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 15.7 785 1.33e+03 0.0477 0 0 0 Crystal initStep + 1 15.7 785 1.33e+03 0 0.0477 0.0174 0.0174 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 15, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 15.8 784 1.33e+03 1.04 0 0 0 Crystal initStep + 1 16.1 785 1.33e+03 0.326 0.717 1.48 1.48 Crystal eIoni + 2 16.1 785 1.33e+03 0 0.326 0.373 1.85 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 14, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 14.7 776 1.31e+03 7.78 0 0 0 Crystal initStep + 1 14.4 778 1.31e+03 6.4 1.2 2.3 2.3 Crystal eBrem + 2 13.1 777 1.32e+03 4.74 1.66 3.94 6.24 Crystal eIoni + 3 13.7 778 1.32e+03 3.6 0.622 1.37 7.6 Crystal eBrem + 4 13.8 779 1.32e+03 3.33 0.218 0.523 8.13 Crystal eBrem + 5 13.7 779 1.31e+03 1.79 1.54 2.71 10.8 Crystal eIoni + 6 13.2 779 1.31e+03 0.696 1.1 1.99 12.8 Crystal eIoni + 7 13 778 1.31e+03 0.0209 0.675 1.05 13.9 Crystal eIoni + 8 13 778 1.31e+03 0 0.0209 0.00439 13.9 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 164, Parent ID = 14 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 13.8 779 1.32e+03 0.0503 0 0 0 Crystal initStep + 1 13.7 779 1.32e+03 0 0.0332 0.225 0.225 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 165, Parent ID = 164 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 13.7 779 1.32e+03 0.0171 0 0 0 Crystal initStep + 1 13.7 779 1.32e+03 0 0.0171 0.00316 0.00316 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 163, Parent ID = 14 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 13.7 778 1.32e+03 0.513 0 0 0 Crystal initStep + 1 15.9 782 1.32e+03 0.417 0 4.09 4.09 Crystal compt + 2 15.7 800 1.31e+03 0.417 0 19.6 23.6 Crystal CoupledTransportation + 3 15.7 805 1.31e+03 0 0.0332 5.25 28.9 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 167, Parent ID = 163 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 15.7 805 1.31e+03 0.384 0 0 0 Crystal initStep + 1 15.7 805 1.31e+03 0 0.384 0.472 0.472 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 166, Parent ID = 163 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 15.9 782 1.32e+03 0.096 0 0 0 Crystal initStep + 1 15.9 782 1.32e+03 0 0.096 0.0554 0.0554 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 162, Parent ID = 14 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 14.4 778 1.31e+03 0.182 0 0 0 Crystal initStep + 1 14.1 778 1.31e+03 0 0.0332 0.75 0.75 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 168, Parent ID = 162 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 14.1 778 1.31e+03 0.149 0 0 0 Crystal initStep + 1 14 778 1.31e+03 0 0.149 0.113 0.113 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 13, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 14.4 774 1.31e+03 0.992 0 0 0 Crystal initStep + 1 14.5 774 1.31e+03 0 0.992 1.43 1.43 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 12, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 9.29 752 1.27e+03 1.57 0 0 0 Crystal initStep + 1 9.04 753 1.27e+03 1.25 0.323 0.754 0.754 Crystal msc + 2 9.17 753 1.27e+03 0.567 0.684 1.65 2.4 Crystal eIoni + 3 9.17 753 1.27e+03 0.216 0.289 0.566 2.97 Crystal eBrem + 4 9.18 753 1.27e+03 0 0.216 0.203 3.17 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 169, Parent ID = 12 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 9.17 753 1.27e+03 0.0611 0 0 0 Crystal initStep + 1 9.4 753 1.27e+03 0 0.0332 0.483 0.483 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 170, Parent ID = 169 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 9.4 753 1.27e+03 0.0279 0 0 0 Crystal initStep + 1 9.4 753 1.27e+03 0 0.0279 0.00712 0.00712 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 11, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 5.31 736 1.24e+03 0.718 0 0 0 Crystal initStep + 1 5.4 736 1.24e+03 0 0.718 1.09 1.09 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 10, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 3.02 720 1.21e+03 2.97 0 0 0 Crystal initStep + 1 3.18 720 1.21e+03 2.58 0.387 0.895 0.895 Crystal msc + 2 3.3 721 1.21e+03 2.18 0.402 0.895 1.79 Crystal msc + 3 3.25 721 1.21e+03 2.07 0.0248 0.0696 1.86 Crystal eBrem + 4 3.09 721 1.21e+03 1.72 0.352 0.895 2.75 Crystal msc + 5 2.69 722 1.21e+03 0.735 0.985 1.95 4.7 Crystal eIoni + 6 2.65 722 1.21e+03 0.431 0.0364 0.0742 4.78 Crystal eBrem + 7 2.66 722 1.21e+03 0 0.431 0.555 5.33 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 172, Parent ID = 10 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 2.65 722 1.21e+03 0.268 0 0 0 Crystal initStep + 1 -8.88e-16 711 1.22e+03 0.268 0 12.3 12.3 Crystal CoupledTransportation + 2 -2.51 700 1.22e+03 0.268 0 11.6 23.9 Crystal CoupledTransportation + 3 -4.6 691 1.22e+03 0.245 0 9.66 33.5 Crystal compt + 4 -3.42 684 1.23e+03 0.2 0 11.5 45 Crystal compt + 5 -3.02 684 1.23e+03 0 0.0332 1.02 46 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 175, Parent ID = 172 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -3.02 684 1.23e+03 0.167 0 0 0 Crystal initStep + 1 -3.01 684 1.23e+03 0 0.167 0.135 0.135 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 174, Parent ID = 172 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -3.42 684 1.23e+03 0.0449 0 0 0 Crystal initStep + 1 -3.42 684 1.23e+03 0 0.0449 0.0157 0.0157 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 173, Parent ID = 172 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -4.6 691 1.22e+03 0.0234 0 0 0 Crystal initStep + 1 -4.6 691 1.22e+03 0 0.0234 0.00531 0.00531 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 171, Parent ID = 10 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 3.25 721 1.21e+03 0.0822 0 0 0 Crystal initStep + 1 3.11 721 1.21e+03 0 0.0332 0.204 0.204 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 176, Parent ID = 171 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 3.11 721 1.21e+03 0.049 0 0 0 Crystal initStep + 1 3.11 721 1.21e+03 0 0.049 0.0181 0.0181 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 9, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 2.63 717 1.2e+03 4.05 0 0 0 Crystal initStep + 1 2.32 717 1.2e+03 3.67 0.375 0.869 0.869 Crystal msc + 2 2.12 717 1.2e+03 2.88 0.795 0.869 1.74 Crystal msc + 3 2.27 716 1.21e+03 1.74 0.169 0.428 2.17 Crystal eIoni + 4 2.09 716 1.21e+03 1.34 0.4 0.869 3.03 Crystal msc + 5 2.37 716 1.21e+03 0.62 0.19 0.409 3.44 Crystal eBrem + 6 2.48 716 1.21e+03 0.0997 0.41 0.821 4.27 Crystal eBrem + 7 2.48 716 1.21e+03 0 0.0997 0.0588 4.32 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 179, Parent ID = 9 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 2.48 716 1.21e+03 0.111 0 0 0 Crystal initStep + 1 2.61 716 1.21e+03 0 0.0332 0.156 0.156 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 180, Parent ID = 179 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 2.61 716 1.21e+03 0.0775 0 0 0 Crystal initStep + 1 2.61 716 1.21e+03 0 0.0775 0.0389 0.0389 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 178, Parent ID = 9 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 2.37 716 1.21e+03 0.529 0 0 0 Crystal initStep + 1 6.5 704 1.22e+03 0.188 0 22.7 22.7 Crystal compt + 2 6.54 707 1.22e+03 0 0.0332 3.63 26.4 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 182, Parent ID = 178 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 6.54 707 1.22e+03 0.155 0 0 0 Crystal initStep + 1 6.55 707 1.22e+03 0 0.155 0.12 0.12 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 181, Parent ID = 178 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 6.5 704 1.22e+03 0.341 0 0 0 Crystal initStep + 1 6.5 704 1.22e+03 0 0.341 0.398 0.398 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 177, Parent ID = 9 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 2.27 716 1.21e+03 0.971 0 0 0 Crystal initStep + 1 2.56 716 1.2e+03 0.324 0.647 1.41 1.41 Crystal eIoni + 2 2.53 716 1.2e+03 0 0.324 0.37 1.78 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 8, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.858 678 1.14e+03 1.51 0 0 0 Crystal initStep + 1 0.965 678 1.14e+03 1.3 0.215 0.295 0.295 Crystal msc + 2 1.16 678 1.14e+03 1.18 0.118 0.295 0.59 Crystal msc + 3 1.39 678 1.14e+03 1.05 0.126 0.295 0.885 Crystal msc + 4 1.61 678 1.14e+03 0.864 0.19 0.346 1.23 Crystal msc + 5 1.88 678 1.14e+03 0.256 0.608 1.29 2.52 Crystal eIoni + 6 1.9 678 1.14e+03 0 0.256 0.262 2.79 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 7, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.869 675 1.13e+03 1.11 0 0 0 Crystal initStep + 1 1.01 675 1.13e+03 1.03 0.0728 0.217 0.217 Crystal msc + 2 1.13 675 1.13e+03 0.896 0.138 0.254 0.471 Crystal msc + 3 1.18 675 1.13e+03 0.74 0.156 0.283 0.754 Crystal msc + 4 1.08 675 1.13e+03 0 0.74 1.12 1.88 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 6, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.837 672 1.12e+03 0.797 0 0 0 Crystal initStep + 1 0.837 672 1.12e+03 0.68 0.117 0.245 0.245 Crystal msc + 2 0.973 671 1.12e+03 0.57 0.11 0.245 0.49 Crystal msc + 3 1 671 1.12e+03 0 0.57 0.811 1.3 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.106 620 1.03e+03 0.977 0 0 0 Crystal initStep + 1 -0.126 620 1.03e+03 0.963 0.0146 0.0369 0.0369 Crystal msc + 2 -0.155 620 1.03e+03 0.953 0.00948 0.0369 0.0738 Crystal msc + 3 -0.189 620 1.03e+03 0.935 0.018 0.0388 0.113 Crystal msc + 4 -0.226 620 1.03e+03 0.922 0.0131 0.0473 0.16 Crystal msc + 5 -0.262 620 1.03e+03 0.903 0.0194 0.0564 0.216 Crystal msc + 6 -0.318 620 1.03e+03 0.824 0.0791 0.0655 0.282 Crystal msc + 7 -0.378 620 1.03e+03 0.791 0.0332 0.0794 0.361 Crystal msc + 8 -0.447 620 1.03e+03 0.712 0.0784 0.0945 0.456 Crystal msc + 9 -0.533 620 1.03e+03 0.638 0.0743 0.112 0.568 Crystal msc + 10 -0.59 620 1.03e+03 0.581 0.0564 0.133 0.701 Crystal msc + 11 -0.582 620 1.03e+03 0.465 0.117 0.148 0.848 Crystal msc + 12 -0.53 620 1.03e+03 0.355 0.11 0.146 0.994 Crystal msc + 13 -0.499 620 1.03e+03 0 0.355 0.422 1.42 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0139 610 1.02e+03 1.27 0 0 0 Crystal initStep + 1 -0.000685 610 1.02e+03 1.26 0.00598 0.0301 0.0301 Crystal msc + 2 -1.13e-06 610 1.02e+03 1.26 0.000121 0.00127 0.0314 Crystal msc + 3 1.75e-16 610 1.02e+03 1.26 9.85e-07 1.92e-06 0.0314 Crystal CoupledTransportation + 4 0.0195 610 1.02e+03 1.24 0.0217 0.0593 0.0907 Crystal msc + 5 0.0415 610 1.02e+03 1.22 0.0203 0.0593 0.15 Crystal msc + 6 0.0406 610 1.02e+03 1.2 0.0183 0.0593 0.209 Crystal msc + 7 0.00302 610 1.02e+03 1.18 0.0175 0.0413 0.251 Crystal msc + 8 1.33e-05 610 1.02e+03 1.18 0.00384 0.00306 0.254 Crystal msc + 9 -7.25e-16 610 1.02e+03 1.18 6.88e-06 1.34e-05 0.254 Crystal CoupledTransportation + 10 -0.0328 610 1.02e+03 1.17 0.0124 0.0342 0.288 Crystal msc + 11 -0.0658 610 1.02e+03 1.15 0.0149 0.0342 0.322 Crystal msc + 12 -0.0931 610 1.02e+03 1.14 0.0102 0.0342 0.356 Crystal msc + 13 -0.125 610 1.02e+03 1.12 0.0159 0.0342 0.391 Crystal msc + 14 -0.152 610 1.02e+03 1.11 0.0176 0.0342 0.425 Crystal msc + 15 -0.168 610 1.02e+03 1.09 0.018 0.0379 0.463 Crystal msc + 16 -0.168 610 1.02e+03 1.08 0.0137 0.0421 0.505 Crystal msc + 17 -0.189 610 1.02e+03 1.06 0.0184 0.0421 0.547 Crystal msc + 18 -0.228 610 1.02e+03 1.02 0.0325 0.0473 0.594 Crystal msc + 19 -0.267 610 1.02e+03 1 0.0215 0.0571 0.651 Crystal msc + 20 -0.289 609 1.02e+03 0.975 0.0281 0.0668 0.718 Crystal msc + 21 -0.333 609 1.02e+03 0.947 0.0275 0.0722 0.79 Crystal msc + 22 -0.309 609 1.02e+03 0.917 0.03 0.0832 0.873 Crystal msc + 23 -0.302 609 1.02e+03 0.888 0.0292 0.0773 0.951 Crystal msc + 24 -0.354 609 1.02e+03 0.857 0.031 0.0756 1.03 Crystal msc + 25 -0.364 609 1.02e+03 0.816 0.0407 0.0884 1.11 Crystal msc + 26 -0.414 609 1.02e+03 0.787 0.0292 0.091 1.21 Crystal msc + 27 -0.367 609 1.02e+03 0.752 0.0352 0.103 1.31 Crystal msc + 28 -0.3 609 1.02e+03 0.717 0.0346 0.0917 1.4 Crystal msc + 29 -0.268 609 1.02e+03 0.692 0.0254 0.0751 1.48 Crystal msc + 30 -0.21 609 1.02e+03 0.67 0.0217 0.0669 1.54 Crystal msc + 31 -0.194 609 1.02e+03 0.642 0.0283 0.0525 1.6 Crystal msc + 32 -0.188 609 1.02e+03 0.529 0.113 0.0485 1.64 Crystal msc + 33 -0.167 609 1.02e+03 0.501 0.0278 0.0471 1.69 Crystal msc + 34 -0.151 609 1.02e+03 0.485 0.0167 0.0417 1.73 Crystal msc + 35 -0.161 609 1.02e+03 0.389 0.0953 0.0378 1.77 Crystal msc + 36 -0.168 609 1.02e+03 0.371 0.0189 0.0401 1.81 Crystal msc + 37 -0.148 609 1.02e+03 0.348 0.0228 0.0419 1.85 Crystal msc + 38 -0.171 609 1.02e+03 0.328 0.0192 0.0369 1.89 Crystal msc + 39 -0.177 609 1.02e+03 0.291 0.0376 0.0427 1.93 Crystal msc + 40 -0.155 609 1.02e+03 0.275 0.0156 0.0442 1.98 Crystal msc + 41 -0.154 609 1.02e+03 0.251 0.0245 0.0387 2.01 Crystal msc + 42 -0.135 609 1.02e+03 0.229 0.0221 0.0384 2.05 Crystal msc + 43 -0.123 609 1.02e+03 0.213 0.0161 0.0342 2.09 Crystal msc + 44 -0.109 609 1.02e+03 0.161 0.0513 0.0342 2.12 Crystal msc + 45 -0.102 609 1.02e+03 0.138 0.0235 0.0342 2.16 Crystal msc + 46 -0.109 609 1.02e+03 0 0.138 0.1 2.26 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0219 284 473 0.00434 0 0 0 DriftChamberPhysical initStep + 1 -0.0389 285 472 0.00279 0.00156 2.03 2.03 DriftChamberPhysical eIoni + 2 0.626 286 471 0.000632 0.00215 1.39 3.42 DriftChamberPhysical eIoni + 3 0.727 286 471 0 0.000632 0.171 3.59 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00189 12.2 20.4 0.00169 0 0 0 WorldPhysical initStep + 1 0.00541 12.2 20.4 0.00166 2.71e-05 0.00759 0.00759 WorldPhysical msc + 2 0.0459 12.3 20.4 0 0.00166 0.118 0.126 WorldPhysical eIoni >>> Event 0 - 10 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.299985 (GeV) + 12 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.2694481223142347 (GeV) 9 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 0.699966 (GeV) -ExN05PionShowerModel::DoIt + Total energy deposition in HAD calorimeter towers : 0.7824733199757428 (GeV) + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0 60 100 1e+03 0.0171 117 117 DriftChamberPhysical CoupledTransportation + 2 -0.0171 92.4 154 1e+03 0.00131 63.1 180 DriftChamberPhysical hIoni + 3 -0.0544 340 566 1e+03 0.0106 480 660 DriftChamberPhysical msc + 4 -0.0842 415 692 1e+03 0.00311 147 807 DriftChamberPhysical hIoni + 5 -0.115 540 900 1e+03 0.00532 242 1.05e+03 WorldPhysical CoupledTransportation + 6 -0.127 570 950 1e+03 0.0162 117 1.17e+03 WorldPhysical CoupledTransportation + 7 -0.127 570 950 0 1e+03 0 1.17e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0842 415 692 0.00108 0 0 0 DriftChamberPhysical initStep + 1 -0.0274 415 692 0 0.00108 0.344 0.344 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0171 92.4 154 0.0274 0 0 0 DriftChamberPhysical initStep + 1 -9.67 88.5 158 0.0235 0.00237 11.3 11.3 DriftChamberPhysical eIoni + 2 -19.3 85.5 164 0.0201 0.00188 11.9 23.2 DriftChamberPhysical eIoni + 3 -31 87.1 168 0.0173 0.00278 12.6 35.8 DriftChamberPhysical eIoni + 4 -34.8 88.5 169 0.0148 0.00108 4.4 40.2 DriftChamberPhysical eIoni + 5 -40 89.7 175 0.0128 0.00195 7.87 48.1 DriftChamberPhysical eIoni + 6 -43.6 91 180 0.0107 0.00212 6.38 54.5 DriftChamberPhysical eIoni + 7 -44.8 91.1 181 0.0075 0.000447 1.84 56.3 DriftChamberPhysical eIoni + 8 -47.6 91.2 183 0.0062 0.0013 3.31 59.6 DriftChamberPhysical eIoni + 9 -49.7 89.6 184 0.00457 0.00163 2.74 62.4 DriftChamberPhysical eIoni + 10 -51.1 89.2 185 0.00215 0.00242 2.12 64.5 DriftChamberPhysical eIoni + 11 -51.9 89.3 186 0 0.00215 0.998 65.5 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 7, Parent ID = 2 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -44.8 91.1 181 0.00274 0 0 0 DriftChamberPhysical initStep + 1 -45 91.1 183 0.000755 0.00198 1.36 1.36 DriftChamberPhysical eIoni + 2 -45 91 183 0 0.000755 0.213 1.58 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 6, Parent ID = 2 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -34.8 88.5 169 0.00146 0 0 0 DriftChamberPhysical initStep + 1 -35.1 88.6 169 0 0.00146 0.536 0.536 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 2 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -19.3 85.5 164 0.00152 0 0 0 DriftChamberPhysical initStep + 1 -19.2 85.3 165 0 0.00152 0.571 0.571 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 2 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -9.67 88.5 158 0.00151 0 0 0 DriftChamberPhysical initStep + 1 -9.93 88.6 158 0 0.00151 0.566 0.566 DriftChamberPhysical eIoni >>> Event 1 - 16 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.459976 (GeV) - 10 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 1.43992 (GeV) -ExN05PionShowerModel::DoIt + 15 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.4599622662219958 (GeV) + 8 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.4399639068210395 (GeV) + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 -0.0113 39.5 65.8 1e+03 0.0113 76.8 76.8 WorldPhysical hIoni + 2 -0.0224 60 100 1e+03 0.00448 39.8 117 DriftChamberPhysical CoupledTransportation + 3 -0.0787 141 235 1e+03 0.00388 158 274 DriftChamberPhysical hIoni + 4 -0.178 322 536 1e+03 0.00761 351 625 DriftChamberPhysical msc + 5 -0.264 502 837 1e+03 0.00825 351 976 DriftChamberPhysical msc + 6 -0.283 540 900 1e+03 0.00266 73.4 1.05e+03 WorldPhysical CoupledTransportation + 7 -0.288 553 923 1e+03 0.00481 26.3 1.08e+03 WorldPhysical hIoni + 8 -0.297 570 950 1e+03 0.0131 90.4 1.17e+03 WorldPhysical CoupledTransportation + 9 -0.297 570 950 0 1e+03 0 1.17e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.288 553 923 0.00414 0 0 0 WorldPhysical initStep + 1 -0.278 553 923 0.00411 2.37e-05 0.0112 0.0112 WorldPhysical msc + 2 -0.0546 553 923 0 0.00411 0.514 0.525 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0787 141 235 0.00242 0 0 0 DriftChamberPhysical initStep + 1 -0.486 142 234 0.000142 0.00228 1.18 1.18 DriftChamberPhysical eIoni + 2 -0.484 142 234 0 0.000142 0.0558 1.23 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0113 39.5 65.8 0.0034 0 0 0 WorldPhysical initStep + 1 0.00271 39.5 65.8 0.0034 0 0.0159 0.0159 WorldPhysical msc + 2 0.119 39.6 65.8 0 0.0034 0.371 0.387 WorldPhysical eIoni >>> Event 2 - 21 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.679963 (GeV) - 11 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 2.17988 (GeV) -ExN05PionShowerModel::DoIt + 12 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.3599762206630032 (GeV) + 8 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.5599630099202272 (GeV) + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0 60 100 1e+03 0.0203 117 117 DriftChamberPhysical CoupledTransportation + 2 0.00915 105 174 1e+03 0.00141 86.8 203 DriftChamberPhysical hIoni + 3 0.0473 207 346 1e+03 0.00454 200 403 DriftChamberPhysical msc + 4 0.0691 310 517 1e+03 0.00376 200 603 DriftChamberPhysical msc + 5 0.0877 413 688 1e+03 0.00331 200 803 DriftChamberPhysical msc + 6 0.0924 443 738 1e+03 0.00133 58.1 861 DriftChamberPhysical hIoni + 7 0.109 540 900 1e+03 0.00379 189 1.05e+03 WorldPhysical CoupledTransportation + 8 0.116 570 950 1e+03 0.0158 100 1.15e+03 WorldPhysical hIoni + 9 0.116 570 950 0 1e+03 0 1.15e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.116 570 950 0.00138 0 0 0 WorldPhysical initStep + 1 0.116 570 950 0.00137 1.26e-05 0.00438 0.00438 WorldPhysical msc + 2 0.115 570 950 0.00135 1.76e-05 0.00438 0.00876 WorldPhysical msc + 3 0.115 570 950 0.00134 1.08e-05 0.00438 0.0131 WorldPhysical msc + 4 0.114 570 950 0.00134 0 0.00438 0.0175 WorldPhysical msc + 5 0.114 570 950 0.0013 4.09e-05 0.00438 0.0219 WorldPhysical msc + 6 0.113 570 950 0.00128 2.11e-05 0.00438 0.0263 WorldPhysical msc + 7 0.112 570 950 0.00126 1.96e-05 0.00438 0.0307 WorldPhysical msc + 8 0.111 570 950 0.00122 3.96e-05 0.00438 0.035 WorldPhysical msc + 9 0.111 570 950 0.0012 1.85e-05 0.00438 0.0394 WorldPhysical msc + 10 0.11 570 950 0.00105 0.000146 0.00438 0.0438 WorldPhysical msc + 11 0.109 570 950 0.00101 4.86e-05 0.00438 0.0482 WorldPhysical msc + 12 0.108 570 950 0.000998 7.73e-06 0.00438 0.0525 WorldPhysical msc + 13 0.107 570 950 0.000581 0.000417 0.00438 0.0569 WorldPhysical msc + 14 0.106 570 950 0.000531 4.92e-05 0.00438 0.0613 WorldPhysical msc + 15 0.106 570 950 0.000478 5.35e-05 0.00438 0.0657 WorldPhysical msc + 16 0.105 570 950 0.000466 1.15e-05 0.00438 0.0701 WorldPhysical msc + 17 0.104 570 950 0.000444 2.25e-05 0.00438 0.0744 WorldPhysical msc + 18 0.103 570 950 0.000365 7.91e-05 0.00438 0.0788 WorldPhysical msc + 19 0.102 570 950 0.000289 7.57e-05 0.00438 0.0832 WorldPhysical msc + 20 0.101 570 950 0 0.000289 0.0163 0.0995 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0924 443 738 0.00107 0 0 0 DriftChamberPhysical initStep + 1 0.283 443 738 0 0.00107 0.341 0.341 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00915 105 174 0.0163 0 0 0 DriftChamberPhysical initStep + 1 -2.77 97 178 0.0142 0.00208 9.08 9.08 DriftChamberPhysical eIoni + 2 -5.51 92 183 0.012 0.00216 7.43 16.5 DriftChamberPhysical eIoni + 3 -8.45 87.9 185 0.0101 0.00192 5.86 22.4 DriftChamberPhysical eIoni + 4 -9.39 84.4 188 0.00806 0.00205 4.65 27 DriftChamberPhysical eIoni + 5 -10.7 81.4 189 0.00647 0.00159 3.57 30.6 DriftChamberPhysical eIoni + 6 -12.7 79.9 190 0.005 0.00147 2.86 33.5 DriftChamberPhysical eIoni + 7 -13.4 79.1 191 0.00201 0.00156 1.14 34.6 DriftChamberPhysical eIoni + 8 -13.3 78.9 191 0 0.00201 0.888 35.5 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 2 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -13.4 79.1 191 0.00143 0 0 0 DriftChamberPhysical initStep + 1 -13.7 79 191 0 0.00143 0.522 0.522 DriftChamberPhysical eIoni >>> Event 3 - 24 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.879946 (GeV) - 11 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 2.85982 (GeV) -ExN05PionShowerModel::DoIt + 8 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.2199839336628474 (GeV) + 9 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.6599518009885421 (GeV) + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 -0.00872 45.4 75.7 1e+03 0.0151 88.3 88.3 WorldPhysical hIoni + 2 -0.00787 60 100 1e+03 0.00404 28.3 117 DriftChamberPhysical CoupledTransportation + 3 0.0111 221 368 1e+03 0.00798 313 429 DriftChamberPhysical hIoni + 4 0.0134 232 387 1e+03 0.000569 21.6 451 DriftChamberPhysical hIoni + 5 0.0377 455 760 1e+03 0.00955 435 886 DriftChamberPhysical msc + 6 0.0199 540 900 1e+03 0.00375 164 1.05e+03 WorldPhysical CoupledTransportation + 7 0.0197 552 921 1e+03 0.00347 24.7 1.07e+03 WorldPhysical hIoni + 8 0.0113 570 950 1e+03 0.00946 91.9 1.17e+03 WorldPhysical CoupledTransportation + 9 0.0113 570 950 0 1e+03 0 1.17e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0197 552 921 0.00628 0 0 0 WorldPhysical initStep + 1 0.0393 552 921 0.00628 0 0.0201 0.0201 WorldPhysical msc + 2 0.281 552 921 0.00359 0.00121 0.362 0.382 WorldPhysical eIoni + 3 0.322 552 921 0.00191 0.000481 0.104 0.486 WorldPhysical eIoni + 4 0.335 552 922 0 0.00191 0.146 0.632 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 7, Parent ID = 5 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.322 552 921 0.0012 0 0 0 WorldPhysical initStep + 1 0.325 552 921 0.00113 6.87e-05 0.00529 0.00529 WorldPhysical msc + 2 0.346 552 921 0 0.00113 0.0682 0.0735 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 6, Parent ID = 5 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.281 552 921 0.00148 0 0 0 WorldPhysical initStep + 1 0.286 552 921 0.00145 2.78e-05 0.00661 0.00661 WorldPhysical msc + 2 0.3 552 921 0 0.00145 0.0972 0.104 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0134 232 387 0.00118 0 0 0 DriftChamberPhysical initStep + 1 -0.0227 232 387 0 0.00118 0.393 0.393 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0111 221 368 0.00485 0 0 0 DriftChamberPhysical initStep + 1 1.96 220 368 0.00306 0.00179 2.22 2.22 DriftChamberPhysical eIoni + 2 2.7 221 368 0.00113 0.00193 1.51 3.73 DriftChamberPhysical eIoni + 3 2.87 221 368 0 0.00113 0.366 4.1 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.00872 45.4 75.7 0.00117 0 0 0 WorldPhysical initStep + 1 -0.0134 45.4 75.7 0.00113 3.53e-05 0.00508 0.00508 WorldPhysical msc + 2 -0.0352 45.4 75.7 0 0.00113 0.0686 0.0737 WorldPhysical eIoni >>> Event 4 - 26 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 1.09993 (GeV) - 12 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 3.63978 (GeV) + 5 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.119991913733655 (GeV) + 9 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.8399433961355844 (GeV) number of event = 5 ### Run 5 start. -ExN05PionShowerModel::DoIt + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 -0.000615 6.11 20.4 1e+03 0.00448 21.3 21.3 WorldPhysical hIoni + 2 -0.00795 30 100 1e+03 0.0122 83.1 104 DriftChamberPhysical CoupledTransportation + 3 -0.00414 83.7 279 1e+03 0.00441 187 291 DriftChamberPhysical msc + 4 0.0122 137 458 1e+03 0.00331 187 478 DriftChamberPhysical msc + 5 0.0456 191 637 1e+03 0.00426 187 665 DriftChamberPhysical msc + 6 0.0775 245 816 1e+03 0.00377 187 852 DriftChamberPhysical msc + 7 0.0953 270 900 1e+03 0.00234 87.5 940 WorldPhysical CoupledTransportation + 8 0.111 285 950 1e+03 0.00765 52.3 992 WorldPhysical hIoni + 9 0.111 285 950 0 1e+03 0 992 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.111 285 950 0.00222 0 0 0 WorldPhysical initStep + 1 0.114 285 950 0.00222 0 0.00608 0.00608 WorldPhysical msc + 2 0.115 285 950 0.00222 0 0.00608 0.0122 WorldPhysical msc + 3 0.116 285 950 0.00222 0 0.00608 0.0182 WorldPhysical msc + 4 0.117 285 950 0.00222 0 0.00608 0.0243 WorldPhysical msc + 5 0.117 285 950 0.0021 0.000124 0.00608 0.0304 WorldPhysical msc + 6 0.117 285 950 0.00209 3.18e-06 0.00608 0.0365 WorldPhysical msc + 7 0.12 285 950 0.00209 0 0.00608 0.0425 WorldPhysical msc + 8 0.122 285 950 0.00191 0.000182 0.00608 0.0486 WorldPhysical msc + 9 0.124 285 950 0.00191 0 0.00608 0.0547 WorldPhysical msc + 10 0.126 285 950 0.00189 2.69e-05 0.00608 0.0608 WorldPhysical msc + 11 0.13 285 950 0.00189 0 0.00608 0.0669 WorldPhysical msc + 12 0.135 285 950 0.00181 7.79e-05 0.00608 0.0729 WorldPhysical msc + 13 0.14 285 950 0.00181 0 0.00608 0.079 WorldPhysical msc + 14 0.143 285 950 0.00179 1.65e-05 0.00608 0.0851 WorldPhysical msc + 15 0.147 285 950 0.00173 5.79e-05 0.00691 0.092 WorldPhysical msc + 16 0.147 285 950 0.00173 2.95e-06 0.00774 0.0997 WorldPhysical msc + 17 0.146 285 950 0.00168 5.2e-05 0.00861 0.108 WorldPhysical msc + 18 0.147 285 950 0.0015 0.000175 0.0102 0.119 WorldPhysical msc + 19 0.146 285 950 0.00148 2.56e-05 0.0118 0.13 WorldPhysical msc + 20 0.155 285 950 0.00148 0 0.0137 0.144 WorldPhysical msc + 21 0.166 285 950 0.00139 8.32e-05 0.0159 0.16 WorldPhysical msc + 22 0.178 285 950 0.00133 6.22e-05 0.0175 0.178 WorldPhysical msc + 23 0.193 285 950 0.00115 0.000179 0.0187 0.196 WorldPhysical msc + 24 0.211 285 950 0 0.00115 0.0704 0.267 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.000615 6.11 20.4 0.00182 0 0 0 WorldPhysical initStep + 1 0.00157 6.12 20.4 0.0018 1.67e-05 0.00527 0.00527 WorldPhysical msc + 2 0.0149 6.17 20.4 0 0.0018 0.133 0.139 WorldPhysical eIoni >>> Event 0 - 26 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 1.09993 (GeV) - 23 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 4.63969 (GeV) -ExN05PionShowerModel::DoIt + 0 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0 (GeV) + 14 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.9799544346730295 (GeV) + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 -0.000886 8.46 28.2 1e+03 0.00406 29.4 29.4 WorldPhysical hIoni + 2 -0.0064 30 100 1e+03 0.0127 75 104 DriftChamberPhysical CoupledTransportation + 3 -0.042 72.3 241 1e+03 0.00294 147 251 DriftChamberPhysical hIoni + 4 -0.11 127 423 1e+03 0.00389 190 442 DriftChamberPhysical msc + 5 -0.171 181 605 1e+03 0.0055 190 632 DriftChamberPhysical msc + 6 -0.21 236 787 1e+03 0.00473 190 822 DriftChamberPhysical msc + 7 -0.232 270 900 1e+03 0.00272 118 940 WorldPhysical CoupledTransportation + 8 -0.243 285 950 1e+03 0.0102 82.4 1.02e+03 WorldPhysical hIoni + 9 -0.243 285 950 0 1e+03 0 1.02e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.243 285 950 0.0924 0 0 0 WorldPhysical initStep + 1 -25.1 291 960 0.0824 0.00999 30.1 30.1 WorldPhysical eIoni + 2 -38 300 950 0.0737 0.00763 20.8 50.9 WorldPhysical eIoni + 3 -38.1 300 950 0.0717 0.000196 0.831 51.8 WorldPhysical eIoni + 4 -51.4 299 942 0.0619 0.00839 16.3 68.1 WorldPhysical eIoni + 5 -58.7 299 943 0.0544 0.00565 7.53 75.7 WorldPhysical eIoni + 6 -68.1 299 936 0.0467 0.00775 12.7 88.3 WorldPhysical eIoni + 7 -72.4 294 929 0.0415 0.00522 9.99 98.3 WorldPhysical eIoni + 8 -74.2 290 923 0.0364 0.0051 8.35 107 WorldPhysical eIoni + 9 -77.4 287 918 0.0314 0.00494 6.92 114 WorldPhysical eIoni + 10 -80.2 286 918 0.0271 0.00278 3.26 117 WorldPhysical eIoni + 11 -83.6 283 918 0.0226 0.00453 4.67 122 WorldPhysical eIoni + 12 -84.4 282 921 0.017 0.00558 3.77 125 WorldPhysical eIoni + 13 -85.5 281 923 0.0136 0.00341 2.81 128 WorldPhysical eIoni + 14 -85.9 281 923 0.0118 0.000674 0.598 129 WorldPhysical eIoni + 15 -87.6 281 923 0.00711 0.00473 2.05 131 WorldPhysical eIoni + 16 -88.3 281 923 0.000679 0.00643 1.28 132 WorldPhysical eIoni + 17 -88.3 281 923 0 0.000679 0.0361 132 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 10, Parent ID = 4 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -85.9 281 923 0.00108 0 0 0 WorldPhysical initStep + 1 -85.9 281 923 0.00103 5.49e-05 0.00446 0.00446 WorldPhysical msc + 2 -85.9 281 923 0 0.00103 0.0601 0.0646 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 9, Parent ID = 4 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -80.2 286 918 0.00153 0 0 0 WorldPhysical initStep + 1 -80.2 286 918 0.00147 5.68e-05 0.00713 0.00713 WorldPhysical msc + 2 -80.2 286 918 0 0.00147 0.0991 0.106 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 8, Parent ID = 4 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -58.7 299 943 0.00182 0 0 0 WorldPhysical initStep + 1 -58.7 299 943 0.00177 4.93e-05 0.00527 0.00527 WorldPhysical msc + 2 -58.7 299 943 0 0.00177 0.13 0.135 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 7, Parent ID = 4 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -51.4 299 942 0.00138 0 0 0 WorldPhysical initStep + 1 -51.4 299 942 0.00138 4.61e-06 0.00645 0.00645 WorldPhysical msc + 2 -51.4 299 942 0 0.00138 0.0904 0.0968 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 6, Parent ID = 4 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -38.1 300 950 0.00186 0 0 0 WorldPhysical initStep + 1 -38.1 300 950 0.00177 9.32e-05 0.00537 0.00537 WorldPhysical msc + 2 -38.1 300 950 0.00175 1.76e-05 0.00537 0.0107 WorldPhysical msc + 3 -38.1 300 950 0.00171 3.93e-05 0.00537 0.0161 WorldPhysical msc + 4 -38.1 300 950 0.00171 0 0.00537 0.0215 WorldPhysical msc + 5 -38 300 950 0.00166 4.86e-05 0.00537 0.0269 WorldPhysical msc + 6 -38 300 950 0.00164 2.05e-05 0.00537 0.0322 WorldPhysical msc + 7 -38 300 950 0.00164 0 0.00537 0.0376 WorldPhysical msc + 8 -38 300 950 0.00164 0 0.00537 0.043 WorldPhysical msc + 9 -38 300 950 0.00159 4.79e-05 0.00537 0.0484 WorldPhysical msc + 10 -38 300 950 0.00157 2.79e-05 0.00537 0.0537 WorldPhysical msc + 11 -38 300 950 0.00157 0 0.00537 0.0591 WorldPhysical msc + 12 -38 300 950 0.00151 5.36e-05 0.00537 0.0645 WorldPhysical msc + 13 -38 300 950 0.00151 0 0.00537 0.0698 WorldPhysical msc + 14 -38 300 950 0.00151 0 0.00537 0.0752 WorldPhysical msc + 15 -38 300 950 0.00147 3.78e-05 0.0056 0.0808 WorldPhysical msc + 16 -38 300 950 0.00144 3.24e-05 0.00615 0.087 WorldPhysical msc + 17 -38 300 950 0.00139 5.41e-05 0.0066 0.0936 WorldPhysical msc + 18 -38 300 950 0.00139 0 0.00722 0.101 WorldPhysical msc + 19 -38 300 950 0.00139 0 0.00759 0.108 WorldPhysical msc + 20 -38 300 950 0.00133 6.05e-05 0.00847 0.117 WorldPhysical msc + 21 -38 300 950 0.00119 0.000138 0.00979 0.127 WorldPhysical msc + 22 -38 300 950 0.00112 6.93e-05 0.01 0.137 WorldPhysical msc + 23 -38 300 950 0.00108 4.23e-05 0.00938 0.146 WorldPhysical msc + 24 -38 300 950 0.00101 7.09e-05 0.00857 0.155 WorldPhysical msc + 25 -38 300 950 0.000975 3.08e-05 0.00793 0.163 WorldPhysical msc + 26 -38 300 950 0.000784 0.000191 0.0081 0.171 WorldPhysical msc + 27 -38 300 950 0.000739 4.51e-05 0.0084 0.179 WorldPhysical msc + 28 -38 300 950 0.000364 0.000375 0.00834 0.187 WorldPhysical msc + 29 -38 300 950 0 0.000364 0.0195 0.207 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 4 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -38 300 950 0.00107 0 0 0 WorldPhysical initStep + 1 -38 300 950 0.00106 1.56e-05 0.00371 0.00371 WorldPhysical msc + 2 -38 300 950 0 0.00106 0.0627 0.0664 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.042 72.3 241 0.00336 0 0 0 DriftChamberPhysical initStep + 1 -0.0654 70.7 241 0.00164 0.00172 1.65 1.65 DriftChamberPhysical eIoni + 2 -0.0234 70.4 241 0 0.00164 0.642 2.29 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.000886 8.46 28.2 0.00158 0 0 0 WorldPhysical initStep + 1 0.0031 8.45 28.2 0.00158 0 0.00493 0.00493 WorldPhysical msc + 2 0.024 8.41 28.2 0 0.00158 0.109 0.114 WorldPhysical eIoni >>> Event 1 - 26 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 1.09993 (GeV) - 26 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 5.63964 (GeV) -ExN05PionShowerModel::DoIt + 0 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0 (GeV) + 12 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.9998558597351649 (GeV) + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0 30 100 1e+03 0.0158 104 104 DriftChamberPhysical CoupledTransportation + 2 -0.0359 80 267 1e+03 0.00432 174 278 DriftChamberPhysical hIoni + 3 -0.112 142 474 1e+03 0.006 217 495 DriftChamberPhysical msc + 4 -0.188 191 637 1e+03 0.00463 170 665 DriftChamberPhysical hIoni + 5 -0.193 195 649 1e+03 0.000277 12.6 677 DriftChamberPhysical hIoni + 6 -0.292 257 856 1e+03 0.00521 217 894 DriftChamberPhysical msc + 7 -0.313 270 900 1e+03 0.00129 45.9 940 WorldPhysical CoupledTransportation + 8 -0.32 275 914 1e+03 0.00272 14.9 955 WorldPhysical hIoni + 9 -0.331 284 946 1e+03 0.00646 33 988 WorldPhysical hIoni + 10 -0.333 285 950 1e+03 0.00965 56.5 1.04e+03 WorldPhysical CoupledTransportation + 11 -0.333 285 950 0 1e+03 0 1.04e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 6, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.331 284 946 0.00134 0 0 0 WorldPhysical initStep + 1 -0.334 284 946 0.00123 0.00011 0.00431 0.00431 WorldPhysical msc + 2 -0.351 284 946 0 0.00123 0.0763 0.0806 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.32 275 914 0.00116 0 0 0 WorldPhysical initStep + 1 -0.318 275 914 0.00113 3.38e-05 0.00427 0.00427 WorldPhysical msc + 2 -0.319 274 914 0 0.00113 0.0683 0.0726 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.193 195 649 0.0172 0 0 0 DriftChamberPhysical initStep + 1 5.32 191 651 0.012 0.00136 7.32 7.32 DriftChamberPhysical eIoni + 2 10.3 190 654 0.0102 0.00182 5.87 13.2 DriftChamberPhysical eIoni + 3 13.9 190 656 0.00861 0.0016 4.72 17.9 DriftChamberPhysical eIoni + 4 17.3 190 658 0.00667 0.00194 3.86 21.8 DriftChamberPhysical eIoni + 5 19.8 191 658 0.0052 0.00147 2.95 24.7 DriftChamberPhysical eIoni + 6 20.9 193 659 0.00376 0.00144 2.35 27.1 DriftChamberPhysical eIoni + 7 21.7 194 658 0.00159 0.00217 1.81 28.9 DriftChamberPhysical eIoni + 8 21.9 194 658 0 0.00159 0.609 29.5 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 7, Parent ID = 4 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 5.32 191 651 0.00376 0 0 0 DriftChamberPhysical initStep + 1 4.79 189 650 0.00209 0.00167 1.81 1.81 DriftChamberPhysical eIoni + 2 4.41 190 650 0 0.00209 0.952 2.76 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.188 191 637 0.00151 0 0 0 DriftChamberPhysical initStep + 1 -0.582 191 637 0 0.00151 0.567 0.567 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0359 80 267 0.0119 0 0 0 DriftChamberPhysical initStep + 1 4.49 77.8 269 0.00963 0.00225 5.77 5.77 DriftChamberPhysical eIoni + 2 6.94 76.9 272 0.00833 0.0013 4.39 10.2 DriftChamberPhysical eIoni + 3 8.78 75.2 275 0.00599 0.00234 3.71 13.9 DriftChamberPhysical eIoni + 4 10.6 75 277 0.00405 0.00194 2.66 16.5 DriftChamberPhysical eIoni + 5 11.6 75.7 278 0.00222 0.00183 1.92 18.4 DriftChamberPhysical eIoni + 6 12.2 75.7 279 0 0.00222 1.05 19.5 DriftChamberPhysical eIoni >>> Event 2 - 27 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 1.13993 (GeV) - 29 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 6.5996 (GeV) -ExN05PionShowerModel::DoIt + 3 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.05999463863244009 (GeV) + 11 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.9199177923640811 (GeV) + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0 30 100 1e+03 0.0153 104 104 DriftChamberPhysical CoupledTransportation + 2 0.0414 86.5 288 1e+03 0.00666 197 301 DriftChamberPhysical msc + 3 0.0474 93.3 311 1e+03 0.00044 23.6 325 DriftChamberPhysical hIoni + 4 0.0974 150 499 1e+03 0.00417 197 521 DriftChamberPhysical msc + 5 0.159 206 687 1e+03 0.00449 197 718 DriftChamberPhysical msc + 6 0.216 263 876 1e+03 0.00367 197 914 DriftChamberPhysical msc + 7 0.221 270 900 1e+03 0.000787 25.3 940 WorldPhysical CoupledTransportation + 8 0.232 285 950 1e+03 0.0153 102 1.04e+03 WorldPhysical hIoni + 9 0.232 285 950 0 1e+03 0 1.04e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.232 285 950 0.00111 0 0 0 WorldPhysical initStep + 1 0.236 285 950 0.00109 1.51e-05 0.00376 0.00376 WorldPhysical msc + 2 0.239 285 950 0.00107 1.75e-05 0.00376 0.00753 WorldPhysical msc + 3 0.243 285 950 0.00105 2.35e-05 0.00376 0.0113 WorldPhysical msc + 4 0.247 285 950 0.00102 3.25e-05 0.00376 0.0151 WorldPhysical msc + 5 0.251 285 950 0.000979 3.83e-05 0.00376 0.0188 WorldPhysical msc + 6 0.254 285 950 0.000963 1.7e-05 0.00376 0.0226 WorldPhysical msc + 7 0.258 285 950 0.000963 0 0.00376 0.0263 WorldPhysical msc + 8 0.262 285 950 0.000955 7.81e-06 0.00376 0.0301 WorldPhysical msc + 9 0.266 285 950 0.000916 3.89e-05 0.00376 0.0339 WorldPhysical msc + 10 0.27 285 950 0.000881 3.44e-05 0.00376 0.0376 WorldPhysical msc + 11 0.273 285 950 0.000847 3.43e-05 0.00376 0.0414 WorldPhysical msc + 12 0.277 285 950 0.000808 3.91e-05 0.00376 0.0452 WorldPhysical msc + 13 0.281 285 950 0.000761 4.7e-05 0.00376 0.0489 WorldPhysical msc + 14 0.285 285 950 0.000577 0.000184 0.00376 0.0527 WorldPhysical msc + 15 0.288 285 950 0.000427 0.00015 0.00376 0.0565 WorldPhysical msc + 16 0.292 285 950 0.000347 7.98e-05 0.00376 0.0602 WorldPhysical msc + 17 0.296 285 950 0.000169 0.000178 0.00376 0.064 WorldPhysical msc + 18 0.298 285 950 6.81e-05 0.000101 0.00376 0.0677 WorldPhysical msc + 19 0.3 285 950 0 6.81e-05 0.00376 0.0715 WorldPhysical msc + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0474 93.3 311 0.00164 0 0 0 DriftChamberPhysical initStep + 1 -0.34 93.5 311 0 0.00164 0.645 0.645 DriftChamberPhysical eIoni >>> Event 3 - 29 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 1.21993 (GeV) - 31 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 7.51956 (GeV) -ExN05PionShowerModel::DoIt + 0 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0 (GeV) + 10 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.9799476058585136 (GeV) + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 -0.00344 10.1 33.7 1e+03 0.00467 35.2 35.2 WorldPhysical hIoni + 2 -0.00971 21.5 71.8 1e+03 0.00596 39.8 74.9 WorldPhysical hIoni + 3 -0.00833 26 86.8 1e+03 0.00244 15.7 90.6 WorldPhysical hIoni + 4 -0.00682 30 100 1e+03 0.00162 13.8 104 DriftChamberPhysical CoupledTransportation + 5 -0.00509 36.7 122 1e+03 0.000821 23.4 128 DriftChamberPhysical hIoni + 6 0.00248 59.2 197 1e+03 0.00166 78.2 206 DriftChamberPhysical hIoni + 7 0.0721 197 656 1e+03 0.0102 479 685 DriftChamberPhysical msc + 8 0.0906 270 900 1e+03 0.00537 255 940 WorldPhysical CoupledTransportation + 9 0.0977 285 950 1e+03 0.0143 104 1.04e+03 WorldPhysical CoupledTransportation + 10 0.0977 285 950 0 1e+03 0 1.04e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 6, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00248 59.2 197 0.00714 0 0 0 DriftChamberPhysical initStep + 1 1.87 57 198 0.0057 0.00144 3.15 3.15 DriftChamberPhysical eIoni + 2 2.48 56.6 201 0.00439 0.00131 2.55 5.7 DriftChamberPhysical eIoni + 3 2.04 55 202 0.0031 0.00129 2.05 7.75 DriftChamberPhysical eIoni + 4 2.07 53.7 201 0.00126 0.00185 1.53 9.29 DriftChamberPhysical eIoni + 5 2.11 53.5 201 0 0.00126 0.428 9.71 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.00509 36.7 122 0.00201 0 0 0 DriftChamberPhysical initStep + 1 -0.649 36.8 122 0 0.00201 0.884 0.884 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.00833 26 86.8 0.00109 0 0 0 WorldPhysical initStep + 1 -0.0111 26 86.8 0.00109 0 0.00445 0.00445 WorldPhysical msc + 2 -0.032 26 86.8 0 0.00109 0.0656 0.07 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.00971 21.5 71.8 0.00185 0 0 0 WorldPhysical initStep + 1 -0.0142 21.5 71.8 0.00185 0 0.00534 0.00534 WorldPhysical msc + 2 -0.0581 21.5 71.8 0 0.00185 0.139 0.144 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.00344 10.1 33.7 0.00148 0 0 0 WorldPhysical initStep + 1 0.00115 10.1 33.7 0.00148 0 0.0046 0.0046 WorldPhysical msc + 2 0.0364 10.1 33.7 0 0.00148 0.1 0.105 WorldPhysical eIoni >>> Event 4 - 29 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 1.23993 (GeV) - 32 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 8.4995 (GeV) + 2 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.05999636322558592 (GeV) + 12 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.9399430238675128 (GeV) number of event = 5 ### Run 6 start. -ExN05PionShowerModel::DoIt + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 -0.00155 -10.2 33.9 1e+03 0.0054 35.4 35.4 WorldPhysical hIoni + 2 0.00314 -30 100 1e+03 0.00894 69 104 DriftChamberPhysical CoupledTransportation + 3 0.0168 -47.7 159 1e+03 0.00197 61.6 166 DriftChamberPhysical hIoni + 4 0.0222 -53.6 179 1e+03 0.000607 20.5 187 DriftChamberPhysical hIoni + 5 0.129 -169 563 1e+03 0.00843 401 588 DriftChamberPhysical msc + 6 0.193 -270 900 1e+03 0.00789 352 940 WorldPhysical CoupledTransportation + 7 0.203 -285 950 1e+03 0.0168 104 1.04e+03 WorldPhysical CoupledTransportation + 8 0.203 -285 950 0 1e+03 0 1.04e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0222 -53.6 179 0.0014 0 0 0 DriftChamberPhysical initStep + 1 0.376 -53.7 179 0 0.0014 0.506 0.506 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0168 -47.7 159 0.00182 0 0 0 DriftChamberPhysical initStep + 1 -0.531 -47.7 159 0 0.00182 0.76 0.76 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.00155 -10.2 33.9 0.00974 0 0 0 WorldPhysical initStep + 1 -0.0122 -10.1 33.9 0.0097 3.52e-05 0.0817 0.0817 WorldPhysical msc + 2 -0.425 -9.56 34.6 0.00607 0.0026 1.13 1.22 WorldPhysical eIoni + 3 -0.147 -9.46 34.9 0 0.00607 1.02 2.24 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 2 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.425 -9.56 34.6 0.00103 0 0 0 WorldPhysical initStep + 1 -0.424 -9.56 34.6 0.00103 0 0.00364 0.00364 WorldPhysical msc + 2 -0.418 -9.59 34.6 0 0.00103 0.0602 0.0638 WorldPhysical eIoni >>> Event 0 - 30 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 1.25993 (GeV) - 45 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 9.47946 (GeV) -ExN05PionShowerModel::DoIt + 4 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.07999496458713783 (GeV) + 11 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.8999433516053009 (GeV) + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 -0.00741 -22.8 76 1e+03 0.00941 79.4 79.4 WorldPhysical hIoni + 2 -0.00719 -30 100 1e+03 0.00366 25 104 DriftChamberPhysical CoupledTransportation + 3 0.00337 -128 426 1e+03 0.00898 340 444 DriftChamberPhysical msc + 4 -0.0221 -225 751 1e+03 0.00844 340 784 DriftChamberPhysical msc + 5 -0.0221 -228 761 1e+03 0.000143 9.76 794 DriftChamberPhysical hIoni + 6 -0.0193 -270 900 1e+03 0.00264 145 940 WorldPhysical CoupledTransportation + 7 -0.0172 -285 950 1e+03 0.0154 104 1.04e+03 WorldPhysical CoupledTransportation + 8 -0.0172 -285 950 0 1e+03 0 1.04e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0221 -228 761 0.00113 0 0 0 DriftChamberPhysical initStep + 1 -0.243 -228 761 0 0.00113 0.37 0.37 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.00741 -22.8 76 0.002 0 0 0 WorldPhysical initStep + 1 -0.0123 -22.8 76 0.002 0 0.0058 0.0058 WorldPhysical msc + 2 -0.0744 -22.8 76 0 0.002 0.156 0.162 WorldPhysical eIoni >>> Event 1 - 32 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 1.29992 (GeV) - 46 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 10.4394 (GeV) -ExN05PionShowerModel::DoIt + 1 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.01999896413609785 (GeV) + 15 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.9599502785326968 (GeV) + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0 -30 100 1e+03 0.0152 104 104 DriftChamberPhysical CoupledTransportation + 2 -0.0693 -152 506 1e+03 0.00918 424 528 DriftChamberPhysical msc + 3 -0.119 -265 884 1e+03 0.0089 394 923 DriftChamberPhysical hIoni + 4 -0.12 -270 900 1e+03 0.000596 17.1 940 WorldPhysical CoupledTransportation + 5 -0.12 -272 906 1e+03 0.00155 5.95 946 WorldPhysical hIoni + 6 -0.121 -285 950 1e+03 0.0106 78.5 1.02e+03 WorldPhysical hIoni + 7 -0.121 -285 950 0 1e+03 0 1.02e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.121 -285 950 0.00188 0 0 0 WorldPhysical initStep + 1 -0.126 -285 950 0.00186 2.22e-05 0.00712 0.00712 WorldPhysical msc + 2 -0.129 -285 950 0.00179 6.13e-05 0.00712 0.0142 WorldPhysical msc + 3 -0.134 -285 950 0.00176 3.57e-05 0.00712 0.0214 WorldPhysical msc + 4 -0.136 -285 950 0.00173 3.24e-05 0.00712 0.0285 WorldPhysical msc + 5 -0.139 -285 950 0.00164 8.26e-05 0.00712 0.0356 WorldPhysical msc + 6 -0.141 -285 950 0.00164 7.67e-06 0.00712 0.0427 WorldPhysical msc + 7 -0.141 -285 950 0.00162 1.73e-05 0.00712 0.0499 WorldPhysical msc + 8 -0.144 -285 950 0.00142 0.000195 0.00712 0.057 WorldPhysical msc + 9 -0.15 -285 950 0.00138 4.35e-05 0.00712 0.0641 WorldPhysical msc + 10 -0.157 -285 950 0.00134 3.69e-05 0.00712 0.0712 WorldPhysical msc + 11 -0.159 -285 950 0.00125 9.68e-05 0.00712 0.0784 WorldPhysical msc + 12 -0.164 -285 950 0.00116 9.04e-05 0.00712 0.0855 WorldPhysical msc + 13 -0.165 -285 950 0.00116 0 0.00712 0.0926 WorldPhysical msc + 14 -0.169 -285 950 0.000955 0.000201 0.00712 0.0997 WorldPhysical msc + 15 -0.17 -285 950 0.000678 0.000278 0.00712 0.107 WorldPhysical msc + 16 -0.17 -285 950 0.000603 7.46e-05 0.00712 0.114 WorldPhysical msc + 17 -0.172 -285 950 0.000419 0.000184 0.00741 0.121 WorldPhysical msc + 18 -0.172 -285 950 0 0.000419 0.022 0.143 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.12 -272 906 0.00112 0 0 0 WorldPhysical initStep + 1 -0.123 -272 906 0.00108 4.23e-05 0.00379 0.00379 WorldPhysical msc + 2 -0.144 -272 906 0 0.00108 0.0642 0.068 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.119 -265 884 0.015 0 0 0 DriftChamberPhysical initStep + 1 -7.95 -266 884 0.0129 0.00204 8.03 8.03 DriftChamberPhysical eIoni + 2 -13.8 -268 882 0.0106 0.00237 6.47 14.5 DriftChamberPhysical eIoni + 3 -18.3 -269 881 0.00869 0.00187 4.94 19.4 DriftChamberPhysical eIoni + 4 -20.6 -271 879 0.00664 0.00206 3.9 23.3 DriftChamberPhysical eIoni + 5 -22.3 -273 879 0.00516 0.00148 2.93 26.3 DriftChamberPhysical eIoni + 6 -23.4 -274 879 0.00266 0.00124 1.72 28 DriftChamberPhysical eIoni + 7 -24.1 -274 880 0 0.00266 1.32 29.3 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 2 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -23.4 -274 879 0.00126 0 0 0 DriftChamberPhysical initStep + 1 -23.4 -275 880 0 0.00126 0.431 0.431 DriftChamberPhysical eIoni >>> Event 2 - 33 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 1.35992 (GeV) - 49 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 11.3794 (GeV) -ExN05PionShowerModel::DoIt + 1 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.03999744083769016 (GeV) + 14 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.9599385801045641 (GeV) + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0.00706 -16.7 55.7 1e+03 0.00799 58.2 58.2 WorldPhysical hIoni + 2 0.00785 -30 100 1e+03 0.00736 46.2 104 DriftChamberPhysical CoupledTransportation + 3 0.0624 -158 528 1e+03 0.0106 446 551 DriftChamberPhysical msc + 4 0.123 -270 900 1e+03 0.00718 389 940 WorldPhysical CoupledTransportation + 5 0.124 -274 912 1e+03 0.00125 12.9 953 WorldPhysical hIoni + 6 0.133 -285 950 1e+03 0.0144 91.5 1.04e+03 WorldPhysical CoupledTransportation + 7 0.133 -285 950 0 1e+03 0 1.04e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.124 -274 912 0.00102 0 0 0 WorldPhysical initStep + 1 0.121 -274 912 0.000907 0.000111 0.00429 0.00429 WorldPhysical msc + 2 0.106 -274 912 0 0.000907 0.0513 0.0556 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00706 -16.7 55.7 0.00156 0 0 0 WorldPhysical initStep + 1 0.00777 -16.7 55.7 0.00156 0 0.00689 0.00689 WorldPhysical msc + 2 0.0133 -16.7 55.7 0 0.00156 0.108 0.115 WorldPhysical eIoni >>> Event 3 - 34 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 1.37992 (GeV) - 52 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 12.3393 (GeV) -ExN05PionShowerModel::DoIt + 1 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.01999897370494111 (GeV) + 17 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.9799497115421143 (GeV) + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0.00761 -28.3 94.4 1e+03 0.0136 98.5 98.5 WorldPhysical hIoni + 2 0.00916 -30 100 1e+03 0.000657 5.89 104 DriftChamberPhysical CoupledTransportation + 3 0.0883 -133 444 1e+03 0.00757 359 463 DriftChamberPhysical hIoni + 4 0.197 -264 880 1e+03 0.0102 455 918 DriftChamberPhysical msc + 5 0.199 -270 900 1e+03 0.000399 21.3 940 WorldPhysical CoupledTransportation + 6 0.205 -285 950 1e+03 0.0155 104 1.04e+03 WorldPhysical CoupledTransportation + 7 0.205 -285 950 0 1e+03 0 1.04e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0883 -133 444 0.000996 0 0 0 DriftChamberPhysical initStep + 1 0.254 -133 444 0 0.000996 0.306 0.306 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00761 -28.3 94.4 0.00278 0 0 0 WorldPhysical initStep + 1 -0.00298 -28.3 94.4 0.00248 0.000298 0.0115 0.0115 WorldPhysical msc + 2 -0.0839 -28.4 94.3 0 0.00248 0.219 0.23 WorldPhysical eIoni >>> Event 4 - 35 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 1.39992 (GeV) - 52 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 13.3193 (GeV) + 0 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0 (GeV) + 13 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.9999483749591892 (GeV) number of event = 5 ### Run 7 start. -ExN05PionShowerModel::DoIt + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0.0018 -14.2 23.6 1e+03 0.00459 27.5 27.5 WorldPhysical hIoni + 2 -0.00693 -60 100 1e+03 0.0155 89.1 117 DriftChamberPhysical CoupledTransportation + 3 -0.0574 -168 280 1e+03 0.00432 210 326 DriftChamberPhysical msc + 4 -0.0954 -276 460 1e+03 0.00456 210 536 DriftChamberPhysical msc + 5 -0.148 -384 640 1e+03 0.00383 210 746 DriftChamberPhysical msc + 6 -0.212 -492 820 1e+03 0.00413 210 956 DriftChamberPhysical msc + 7 -0.24 -540 900 1e+03 0.00259 93.8 1.05e+03 WorldPhysical CoupledTransportation + 8 -0.261 -570 950 1e+03 0.0176 117 1.17e+03 WorldPhysical CoupledTransportation + 9 -0.261 -570 950 0 1e+03 0 1.17e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0018 -14.2 23.6 0.00164 0 0 0 WorldPhysical initStep + 1 -0.0046 -14.2 23.6 0.0016 3.74e-05 0.00716 0.00716 WorldPhysical msc + 2 -0.0338 -14.2 23.6 0 0.0016 0.112 0.119 WorldPhysical eIoni >>> Event 0 - 39 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 1.51991 (GeV) - 58 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 14.0992 (GeV) -ExN05PionShowerModel::DoIt + 9 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.1999882405930981 (GeV) + 12 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.719957666135153 (GeV) + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0.0105 -55 91.6 1e+03 0.0181 107 107 WorldPhysical hIoni + 2 0.00997 -60 100 1e+03 0.00118 9.76 117 DriftChamberPhysical CoupledTransportation + 3 0.00268 -152 254 1e+03 0.00266 179 296 DriftChamberPhysical hIoni + 4 -0.0324 -352 587 1e+03 0.00892 389 685 DriftChamberPhysical msc + 5 -0.0358 -540 900 1e+03 0.00956 365 1.05e+03 WorldPhysical CoupledTransportation + 6 -0.0329 -564 941 1e+03 0.0075 47.5 1.1e+03 WorldPhysical hIoni + 7 -0.0315 -570 950 1e+03 0.00775 69.1 1.17e+03 WorldPhysical CoupledTransportation + 8 -0.0315 -570 950 0 1e+03 0 1.17e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0329 -564 941 0.00234 0 0 0 WorldPhysical initStep + 1 -0.0386 -564 941 0.00207 0.000276 0.00672 0.00672 WorldPhysical msc + 2 -0.0571 -564 941 0.00174 0.000328 0.0483 0.055 WorldPhysical eIoni + 3 -0.0237 -564 941 0 0.00174 0.127 0.182 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00268 -152 254 0.00123 0 0 0 DriftChamberPhysical initStep + 1 0.131 -152 254 0 0.00123 0.415 0.415 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0105 -55 91.6 0.00546 0 0 0 WorldPhysical initStep + 1 0.00649 -54.9 91.6 0.00544 2.3e-05 0.0167 0.0167 WorldPhysical msc + 2 -0.112 -54.7 91.9 0 0.00544 0.842 0.859 WorldPhysical eIoni >>> Event 1 - 45 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 1.68023 (GeV) - 64 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 14.8388 (GeV) -ExN05PionShowerModel::DoIt + 6 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.1399909383972966 (GeV) + 9 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.6799559865011549 (GeV) + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 -0.00717 -29.8 49.7 1e+03 0.0091 57.9 57.9 WorldPhysical hIoni + 2 -0.0144 -60 100 1e+03 0.00875 58.7 117 DriftChamberPhysical CoupledTransportation + 3 -0.00912 -308 514 1e+03 0.00937 482 599 DriftChamberPhysical msc + 4 -0.06 -540 900 1e+03 0.0097 451 1.05e+03 WorldPhysical CoupledTransportation + 5 -0.0633 -570 950 1e+03 0.0177 117 1.17e+03 WorldPhysical CoupledTransportation + 6 -0.0633 -570 950 0 1e+03 0 1.17e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.00717 -29.8 49.7 0.00658 0 0 0 WorldPhysical initStep + 1 -0.0176 -29.8 49.7 0.00644 0.000138 0.0387 0.0387 WorldPhysical msc + 2 -0.126 -30.1 49.2 0.00207 0.00235 0.623 0.662 WorldPhysical eIoni + 3 -0.151 -30.1 49.1 0 0.00207 0.165 0.826 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 2 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.126 -30.1 49.2 0.00202 0 0 0 WorldPhysical initStep + 1 -0.122 -30.1 49.2 0.00202 0 0.00581 0.00581 WorldPhysical msc + 2 -0.0801 -30.1 49.2 0 0.00202 0.159 0.165 WorldPhysical eIoni >>> Event 2 - 51 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 1.89981 (GeV) - 65 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 15.5388 (GeV) -ExN05PionShowerModel::DoIt + 10 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.2799828603376134 (GeV) + 11 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.6199620478904296 (GeV) + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 -0.00756 -57.1 95.3 1e+03 0.0149 111 111 WorldPhysical hIoni + 2 -0.00922 -60 100 1e+03 0.000768 5.53 117 DriftChamberPhysical CoupledTransportation + 3 -0.0845 -169 281 1e+03 0.00488 212 328 DriftChamberPhysical hIoni + 4 -0.109 -202 338 1e+03 0.00184 65.4 394 DriftChamberPhysical hIoni + 5 -0.194 -329 549 1e+03 0.00594 246 640 DriftChamberPhysical hIoni + 6 -0.334 -540 900 1e+03 0.00699 410 1.05e+03 WorldPhysical CoupledTransportation + 7 -0.35 -570 950 1e+03 0.0149 117 1.17e+03 WorldPhysical CoupledTransportation + 8 -0.35 -570 950 0 1e+03 0 1.17e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.194 -329 549 0.00219 0 0 0 DriftChamberPhysical initStep + 1 -0.51 -329 549 0 0.00219 1.03 1.03 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.109 -202 338 0.00992 0 0 0 DriftChamberPhysical initStep + 1 -3.07 -206 337 0.00818 0.00175 4.54 4.54 DriftChamberPhysical eIoni + 2 -5.37 -208 336 0.0066 0.00158 3.63 8.17 DriftChamberPhysical eIoni + 3 -5.06 -210 334 0.0046 0.002 2.91 11.1 DriftChamberPhysical eIoni + 4 -3.6 -212 334 0.00325 0.00135 2.13 13.2 DriftChamberPhysical eIoni + 5 -2.46 -213 334 0.00152 0.00172 1.6 14.8 DriftChamberPhysical eIoni + 6 -2.27 -213 334 0 0.00152 0.573 15.4 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0845 -169 281 0.244 0 0 0 DriftChamberPhysical initStep + 1 58 -97.5 424 0.234 0.0068 170 170 DriftChamberPhysical eIoni + 2 146 -15.3 534 0.229 0.00483 164 334 DriftChamberPhysical eIoni + 3 329 162 759 0.214 0.0117 343 676 DriftChamberPhysical eIoni + 4 444 260 873 0.206 0.00648 189 866 DriftChamberPhysical eIoni + 5 465 279 900 0.205 0.00167 39.5 905 DriftChamberPhysical msc + 6 465 279 900 0.205 1.44e-06 0.0404 905 WorldPhysical CoupledTransportation + 7 480 285 916 0.202 0.00289 23.1 928 WorldPhysical eIoni + 8 521 314 949 0.188 0.0108 64.9 993 WorldPhysical eIoni + 9 557 317 950 0.176 0.00694 37.7 1.03e+03 WorldPhysical eIoni + 10 562 308 950 0.172 0.00199 11 1.04e+03 WorldPhysical eIoni + 11 562 308 950 0.151 0.0201 83.9 1.13e+03 WorldPhysical eIoni + 12 593 286 968 0.14 0.0106 43.7 1.17e+03 WorldPhysical eIoni + 13 620 275 1e+03 0.124 0.0153 48.4 1.22e+03 Crystal CoupledTransportation + 14 620 275 1e+03 0.123 0.00107 0.00214 1.22e+03 Crystal msc + 15 620 275 1e+03 0.122 0.00124 0.00214 1.22e+03 Crystal msc + 16 620 275 1e+03 0.122 0.000454 0.00214 1.22e+03 Crystal msc + 17 620 275 1e+03 0.121 0.000962 0.00214 1.22e+03 Crystal msc + 18 620 275 1e+03 0.117 0.00349 0.00214 1.22e+03 Crystal msc + 19 620 275 1e+03 0.116 0.0017 0.00214 1.22e+03 Crystal msc + 20 620 275 1e+03 0.115 0.000713 0.00214 1.22e+03 Crystal msc + 21 620 275 1e+03 0.114 0.000893 0.00215 1.22e+03 Crystal msc + 22 620 275 1e+03 0.105 0.00868 0.00218 1.22e+03 Crystal msc + 23 620 275 1e+03 0.104 0.00164 0.00228 1.22e+03 Crystal msc + 24 620 275 1e+03 0.103 0.00097 0.00214 1.22e+03 Crystal msc + 25 620 275 1e+03 0.0962 0.00642 0.00214 1.22e+03 Crystal msc + 26 620 275 1e+03 0.0953 0.000927 0.00214 1.22e+03 Crystal msc + 27 620 275 1e+03 0.0944 0.000865 0.00214 1.22e+03 Crystal msc + 28 620 275 1e+03 0.094 0.000381 0.00214 1.22e+03 Crystal msc + 29 620 275 1e+03 0.0936 0.000404 0.000507 1.22e+03 Crystal msc + 30 620 275 1e+03 0.0936 0 1.69e-05 1.22e+03 Crystal msc + 31 620 275 1e+03 0.0936 1.64e-08 1.52e-08 1.22e+03 WorldPhysical CoupledTransportation + 32 607 265 987 0.0826 0.00924 21.7 1.24e+03 WorldPhysical eIoni + 33 624 257 999 0.0716 0.011 24.9 1.26e+03 WorldPhysical eIoni + 34 624 257 1e+03 0.0714 0.000223 0.978 1.27e+03 Crystal CoupledTransportation + 35 624 257 1e+03 0.0713 0.000135 0.00046 1.27e+03 Crystal msc + 36 624 257 1e+03 0.0709 0.000317 0.00046 1.27e+03 Crystal msc + 37 624 257 1e+03 0.0699 0.00103 0.00046 1.27e+03 Crystal msc + 38 624 257 1e+03 0.0694 0.000499 0.00046 1.27e+03 Crystal msc + 39 624 257 1e+03 0.0692 0.000254 0.00046 1.27e+03 Crystal msc + 40 624 257 1e+03 0.0685 0.000668 0.00046 1.27e+03 Crystal msc + 41 624 257 1e+03 0.0682 0.000299 0.00046 1.27e+03 Crystal msc + 42 624 257 1e+03 0.0679 0.00033 0.00051 1.27e+03 Crystal msc + 43 624 257 1e+03 0.0674 0.000468 0.000571 1.27e+03 Crystal msc + 44 624 257 1e+03 0.067 0.000348 0.000653 1.27e+03 Crystal msc + 45 624 257 1e+03 0.0509 0.0162 0.000774 1.27e+03 Crystal msc + 46 624 257 1e+03 0.0489 0.00195 0.000914 1.27e+03 Crystal msc + 47 624 257 1e+03 0.0477 0.0012 0.000983 1.27e+03 Crystal msc + 48 624 257 1e+03 0.0467 0.00104 0.00111 1.27e+03 Crystal msc + 49 624 257 1e+03 0.0446 0.00207 0.00129 1.27e+03 Crystal msc + 50 624 257 1e+03 0.0416 0.00296 0.00149 1.27e+03 Crystal msc + 51 624 257 1e+03 0.0393 0.00236 0.00157 1.27e+03 Crystal msc + 52 624 257 1e+03 0.0385 0.000814 0.00129 1.27e+03 Crystal msc + 53 624 257 1e+03 0.0376 0.000824 0.00115 1.27e+03 Crystal msc + 54 624 257 1e+03 0.0361 0.00156 0.00102 1.27e+03 Crystal msc + 55 624 257 1e+03 0.0354 0.000708 0.00102 1.27e+03 Crystal msc + 56 624 257 1e+03 0.0317 0.0037 0.00112 1.27e+03 Crystal msc + 57 624 257 1e+03 0.0278 0.00386 0.0012 1.27e+03 Crystal msc + 58 624 257 1e+03 0.0252 0.00265 0.00126 1.27e+03 Crystal msc + 59 624 257 1e+03 0.021 0.00418 0.00119 1.27e+03 Crystal msc + 60 624 257 1e+03 0 0.021 0.00443 1.27e+03 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 14, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 607 265 987 0.00176 0 0 0 WorldPhysical initStep + 1 607 265 987 0.00174 2.01e-05 0.00641 0.00641 WorldPhysical msc + 2 606 265 987 0 0.00174 0.127 0.134 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 13, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 593 286 968 0.00109 0 0 0 WorldPhysical initStep + 1 593 286 968 0.00107 2.21e-05 0.00421 0.00421 WorldPhysical msc + 2 593 286 968 0 0.00107 0.0633 0.0675 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 12, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 562 308 950 0.00274 0 0 0 WorldPhysical initStep + 1 562 308 950 0.00261 0.000124 0.0113 0.0113 WorldPhysical msc + 2 562 308 950 0.00187 0.000746 0.0113 0.0226 WorldPhysical msc + 3 562 308 950 0.00181 6.01e-05 0.0113 0.0339 WorldPhysical msc + 4 562 308 950 0.00181 0 0.0113 0.0452 WorldPhysical msc + 5 562 308 950 0.00178 2.74e-05 0.0113 0.0565 WorldPhysical msc + 6 562 308 950 0.00175 2.87e-05 0.0113 0.0678 WorldPhysical msc + 7 562 308 950 0.00163 0.00012 0.0113 0.0791 WorldPhysical msc + 8 562 308 950 0.00152 0.000108 0.0113 0.0904 WorldPhysical msc + 9 562 308 950 0.00116 0.000359 0.0113 0.102 WorldPhysical msc + 10 562 308 950 0.000314 0.000849 0.0113 0.113 WorldPhysical msc + 11 562 308 950 0 0.000314 0.0173 0.13 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 11, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 557 317 950 0.0052 0 0 0 WorldPhysical initStep + 1 557 317 950 0.00519 1.04e-05 0.0307 0.0307 WorldPhysical msc + 2 557 317 950 0.00505 0.000143 0.0471 0.0778 WorldPhysical msc + 3 557 317 950 0.005 4.84e-05 0.0339 0.112 WorldPhysical msc + 4 557 317 950 0.00492 7.75e-05 0.0417 0.153 WorldPhysical msc + 5 557 317 950 0.00476 0.000165 0.0406 0.194 WorldPhysical msc + 6 556 317 950 0.00446 0.000298 0.0437 0.238 WorldPhysical msc + 7 556 317 950 0.00443 2.86e-05 0.0445 0.282 WorldPhysical msc + 8 556 317 950 0.00403 0.000399 0.047 0.329 WorldPhysical msc + 9 556 317 950 0.00377 0.000263 0.0527 0.382 WorldPhysical msc + 10 556 317 950 0.00366 0.00011 0.0547 0.437 WorldPhysical msc + 11 556 317 950 0.0035 0.000155 0.0541 0.491 WorldPhysical msc + 12 556 317 950 0.00333 0.000178 0.0497 0.54 WorldPhysical msc + 13 556 317 950 0.00311 0.000215 0.0506 0.591 WorldPhysical msc + 14 556 317 950 0.00265 0.000459 0.0508 0.642 WorldPhysical msc + 15 556 317 950 0.00241 0.000239 0.0521 0.694 WorldPhysical msc + 16 556 317 950 0.00209 0.000325 0.0485 0.742 WorldPhysical msc + 17 556 317 950 0 0.00209 0.167 0.91 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 10, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 521 314 949 0.00234 0 0 0 WorldPhysical initStep + 1 521 314 949 0.00234 1.58e-06 0.00872 0.00872 WorldPhysical msc + 2 521 314 948 0 0.00234 0.2 0.209 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 9, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 444 260 873 0.00161 0 0 0 DriftChamberPhysical initStep + 1 443 261 873 0 0.00161 0.625 0.625 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 8, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 329 162 759 0.00262 0 0 0 DriftChamberPhysical initStep + 1 329 162 760 0.00109 0.00153 1.3 1.3 DriftChamberPhysical eIoni + 2 329 163 760 0 0.00109 0.351 1.65 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 7, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 146 -15.3 534 0.00106 0 0 0 DriftChamberPhysical initStep + 1 146 -15.1 534 0 0.00106 0.334 0.334 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 6, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 58 -97.5 424 0.00285 0 0 0 DriftChamberPhysical initStep + 1 58.2 -98.4 425 0.000866 0.00198 1.42 1.42 DriftChamberPhysical eIoni + 2 58.2 -98.5 425 0 0.000866 0.254 1.67 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.00756 -57.1 95.3 0.00219 0 0 0 WorldPhysical initStep + 1 -0.00637 -57.1 95.3 0.00218 6.9e-06 0.00602 0.00602 WorldPhysical msc + 2 0.0204 -57.2 95.2 0 0.00218 0.18 0.186 WorldPhysical eIoni >>> Event 3 - 56 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 2.0998 (GeV) - 66 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 16.2787 (GeV) -ExN05PionShowerModel::DoIt + 12 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.2800157751935862 (GeV) + 11 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.5998148162554657 (GeV) + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0 -60 100 1e+03 0.0156 117 117 DriftChamberPhysical CoupledTransportation + 2 0.019 -281 468 1e+03 0.00841 429 546 DriftChamberPhysical msc + 3 0.0405 -502 836 1e+03 0.00989 429 975 DriftChamberPhysical msc + 4 0.0391 -540 900 1e+03 0.0018 74.6 1.05e+03 WorldPhysical CoupledTransportation + 5 0.0393 -570 950 1e+03 0.013 94.5 1.14e+03 WorldPhysical hIoni + 6 0.0393 -570 950 0 1e+03 0 1.14e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0393 -570 950 0.00307 0 0 0 WorldPhysical initStep + 1 0.0308 -570 950 0.00303 4.48e-05 0.0126 0.0126 WorldPhysical msc + 2 0.0282 -570 950 0.00302 5.74e-06 0.0126 0.0251 WorldPhysical msc + 3 0.0248 -570 950 0.00298 4.17e-05 0.0126 0.0377 WorldPhysical msc + 4 0.0265 -570 950 0.00293 5.31e-05 0.0126 0.0503 WorldPhysical msc + 5 0.0304 -570 950 0.00293 0 0.0126 0.0628 WorldPhysical msc + 6 0.039 -570 950 0.00256 0.00037 0.0126 0.0754 WorldPhysical msc + 7 0.0495 -570 950 0.00253 2.92e-05 0.0126 0.088 WorldPhysical msc + 8 0.0572 -570 950 0.00237 0.000157 0.0126 0.101 WorldPhysical msc + 9 0.0644 -570 950 0.00231 6.32e-05 0.0126 0.113 WorldPhysical msc + 10 0.0697 -570 950 0.00178 0.000526 0.0126 0.126 WorldPhysical msc + 11 0.0719 -570 950 0.00165 0.00013 0.0126 0.138 WorldPhysical msc + 12 0.0819 -570 950 0.0016 5.11e-05 0.0126 0.151 WorldPhysical msc + 13 0.0884 -570 950 0.0015 0.000104 0.0126 0.163 WorldPhysical msc + 14 0.0972 -570 950 0.00142 7.34e-05 0.0126 0.176 WorldPhysical msc + 15 0.109 -570 950 0.0013 0.000126 0.0126 0.189 WorldPhysical msc + 16 0.121 -570 950 0.00119 0.000109 0.0126 0.201 WorldPhysical msc + 17 0.128 -570 950 0.00109 9.84e-05 0.0126 0.214 WorldPhysical msc + 18 0.139 -570 950 0.000833 0.000256 0.0126 0.226 WorldPhysical msc + 19 0.147 -570 950 0.000419 0.000415 0.0126 0.239 WorldPhysical msc + 20 0.147 -570 950 0 0.000419 0.022 0.261 WorldPhysical eIoni >>> Event 4 - 59 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 2.45978 (GeV) - 66 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 16.8987 (GeV) -number of event = 5 - -conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model - tables are built for gamma - Lambda tables from 1.022 MeV to 100 GeV in 100 bins. - -compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV - Sampling according Klein-Nishina model - tables are built for gamma - Lambda tables from 100 eV to 100 GeV in 90 bins. - -phot: Total cross sections from Sandia parametrisation. - -msc: Model variant of multiple scattering for e- - Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 - -eIoni: tables are built for e- - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. - Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV. - Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 - -eBrem: tables are built for e- - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. - Total cross sections from a parametrisation based on the EEDL data library. - Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. - -eIoni: tables are built for e+ - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. - Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV. - Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 - -eBrem: tables are built for e+ - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. - Total cross sections from a parametrisation based on the EEDL data library. - Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. - -annihil: Heilter model of formula of annihilation into 2 photons - tables are built for e+ - Lambda tables from 100 eV to 100 TeV in 120 bins. - -hIoni: tables are built for proton - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. - Scaling relation is used to proton dE/dx and range - Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for protons below. - Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 - -msc: Model variant of multiple scattering for proton - Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 - -msc: Model variant of multiple scattering for GenericIon - Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 - -hIoni: tables are built for anti_proton - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. - Scaling relation is used to proton dE/dx and range - Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for protons below. - Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 - -muIoni: tables are built for mu+ - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. - Bether-Bloch model for E > 0.2 MeV, parametrisation of Bragg peak below, - radiative corrections for E > 1 GeV - Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 - -msc: Model variant of multiple scattering for mu+ - Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 - -muBrems: tables are built for mu+ - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. - Parametrised model - -muPairProd: tables are built for mu+ - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. - Parametrised model - -muIoni: tables are built for mu- - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. - Bether-Bloch model for E > 0.2 MeV, parametrisation of Bragg peak below, - radiative corrections for E > 1 GeV - Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 - -muBrems: tables are built for mu- - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. - Parametrised model - -muPairProd: tables are built for mu- - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. - Parametrised model - -hIoni: tables are built for pi+ - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. - Scaling relation is used to proton dE/dx and range - Bether-Bloch model for Escaled > 0.297504 MeV, ICRU49 parametrisation for protons below. - Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 - -hIoni: tables are built for pi- - dE/dx and range tables from 100 eV to 100 TeV in 120 bins. - Lambda tables from threshold to 100 TeV in 120 bins. - Scaling relation is used to proton dE/dx and range - Bether-Bloch model for Escaled > 0.297504 MeV, ICRU49 parametrisation for protons below. - Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 - -msc: Model variant of multiple scattering for pi- - Lambda tables from 100 eV to 100 TeV in 120 bins. - Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 -### Run 8 start. ->>> Event 0 - 38 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.99736828 (GeV) - 0 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 0 (GeV) ->>> Event 1 - 38 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.99935448 (GeV) - 0 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 0 (GeV) ->>> Event 2 - 38 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.99731281 (GeV) - 1 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 0.00033150998 (GeV) ->>> Event 3 - 38 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.99499437 (GeV) - 0 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 0 (GeV) ->>> Event 4 - 41 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.97551418 (GeV) - 1 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 0.00051099906 (GeV) -number of event = 5 -### Run 9 start. ->>> Event 0 - 30 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.99990461 (GeV) - 0 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 0 (GeV) ->>> Event 1 - 26 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.9896659 (GeV) - 3 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 0.0030839407 (GeV) ->>> Event 2 - 22 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.99829387 (GeV) - 0 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 0 (GeV) ->>> Event 3 - 29 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.9969654 (GeV) - 0 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 0 (GeV) ->>> Event 4 - 25 hits are stored in EM ExN05CalorimeterHitsCollection. - Total energy deposition in EM calorimeter crytals : 0.98375259 (GeV) - 1 hits are stored in HAD ExN05CalorimeterHitsCollection. - Total energy deposition in HAD calorimeter towers : 0.0056036412 (GeV) + 8 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.2399875591140602 (GeV) + 10 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.6599657875636655 (GeV) number of event = 5 diff --git a/examples/novice/N05/exampleN05.ref b/examples/novice/N05/exampleN05.ref new file mode 100644 index 0000000000..9482f51c51 --- /dev/null +++ b/examples/novice/N05/exampleN05.ref @@ -0,0 +1,5026 @@ +RunManager construction starting.... + +************************************************************* + Geant4 version Name: geant4-08-01-ref-03 (27-July-2006) + Copyright : Geant4 Collaboration + Reference : NIM A 506 (2003), 250-303 + WWW : http://cern.ch/geant4 +************************************************************* + + +ExN05DetectorConstruction.... + +Declaring region... +... region declared. Setting it the ghostLogical volume... +... succes. + +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +Instantiating Visualization Manager....... +Visualization Manager instantiating... +Visualization Manager initialising... +Registering graphics systems... + +You have successfully registered the following graphics systems. +Current available graphics systems are: + ASCIITree (ATree) + DAWNFILE (DAWNFILE) + GAGTree (GAGTree) + G4HepRep (HepRepXML) + G4HepRepFile (HepRepFile) + RayTracer (RayTracer) + VRML1FILE (VRML1FILE) + VRML2FILE (VRML2FILE) + OpenGLImmediateX (OGLIX) + OpenGLStoredX (OGLSX) + +Registering model factories... + +You have successfully registered the following model factories. +Registered model factories: + generic + drawByCharge + drawByParticleID + drawByOriginVolume + drawByAttribute + +Registered filter factories: + chargeFilter + particleFilter + originVolumeFilter + attributeFilter + + +conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; + sampling secondary e+e- according Bethe-Heitler model + tables are built for gamma + Lambda tables from 1.022 MeV to 100 GeV in 100 bins. + +compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) GeV + Sampling according Klein-Nishina model + tables are built for gamma + Lambda tables from 100 eV to 100 GeV in 90 bins. + +phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model + +msc: Model variant of multiple scattering for e- + Lambda tables from 100 eV to 100 TeV in 120 bins. + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +eIoni: tables are built for e- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +eBrem: tables are built for e- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Total cross sections from a parametrisation based on the EEDL data library. + Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. + +eIoni: tables are built for e+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Delta cross sections from Moller+Bhabha, good description from 1 KeV to 100 GeV. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +eBrem: tables are built for e+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Total cross sections from a parametrisation based on the EEDL data library. + Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. + +annihil: Sampling according eplus2gg model + tables are built for e+ + Lambda tables from 100 eV to 100 TeV in 120 bins. + +hIoni: tables are built for proton + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +msc: Model variant of multiple scattering for proton + Lambda tables from 100 eV to 100 TeV in 120 bins. + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +msc: Model variant of multiple scattering for GenericIon + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +hIoni: tables are built for anti_proton + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 2 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +muIoni: tables are built for mu+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Bether-Bloch model for E > 0.2 MeV, parametrisation of Bragg peak below, + radiative corrections for E > 1 GeV + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +msc: Model variant of multiple scattering for mu+ + Lambda tables from 100 eV to 100 TeV in 120 bins. + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 + +muBrems: tables are built for mu+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Parametrised model + +muPairProd: tables are built for mu+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Parametrised model + +muIoni: tables are built for mu- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Bether-Bloch model for E > 0.2 MeV, parametrisation of Bragg peak below, + radiative corrections for E > 1 GeV + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +muBrems: tables are built for mu- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Parametrised model + +muPairProd: tables are built for mu- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Parametrised model + +hIoni: tables are built for pi+ + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 0.297504 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +hIoni: tables are built for pi- + dE/dx and range tables from 100 eV to 100 TeV in 120 bins. + Lambda tables from threshold to 100 TeV in 120 bins. + Scaling relation is used to proton dE/dx and range + Bether-Bloch model for Escaled > 0.297504 MeV, ICRU49 parametrisation for protons below. + Step function: finalRange(mm)= 1, dRoverRange= 0.2, integral: 1 + +msc: Model variant of multiple scattering for pi- + Lambda tables from 100 eV to 100 TeV in 120 bins. + Boundary/stepping algorithm is active with facrange= 0.02 Step limitation 1 +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +### Run 0 start. +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0.000748 51.7 86.1 1e+03 0.019 100 100 WorldPhysical eIoni + 2 0.00046 60 100 1e+03 0.00337 16.2 117 DriftChamberPhysical CoupledTransportation + 3 0.00137 72 120 1e+03 0.000769 23.4 140 DriftChamberPhysical eIoni + 4 0.0155 209 349 1e+03 0.00886 267 406 DriftChamberPhysical msc + 5 0.0601 346 577 1e+03 0.00938 267 673 DriftChamberPhysical msc + 6 0.0812 455 758 1e+03 0.00646 211 884 DriftChamberPhysical eIoni + 7 0.0906 488 814 1e+03 0.00183 64.7 949 DriftChamberPhysical eIoni + 8 0.0968 540 900 1e+03 0.00307 100 1.05e+03 WorldPhysical CoupledTransportation + 9 0.121 592 988 1e+03 0.0234 102 1.15e+03 WorldPhysical eIoni + 10 0.119 600 1e+03 1e+03 0.00306 14.3 1.17e+03 Crystal CoupledTransportation +ExN05EMShowerModel::DoIt + 11 0.119 600 1e+03 0 1e+03 0 1.17e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 6, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.121 592 988 0.00129 0 0 0 WorldPhysical initStep + 1 0.123 592 988 0.00127 1.5e-05 0.00219 0.00219 WorldPhysical msc + 2 0.16 592 988 0 0.00127 0.0802 0.0824 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0906 488 814 0.00763 0 0 0 DriftChamberPhysical initStep + 1 3.19 487 815 0.00623 0.00141 3.37 3.37 DriftChamberPhysical eIoni + 2 4.12 486 816 0.00222 0.00214 1.54 4.91 DriftChamberPhysical eIoni + 3 4.45 486 817 0 0.00222 1.05 5.96 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 7, Parent ID = 5 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 4.12 486 816 0.00187 0 0 0 DriftChamberPhysical initStep + 1 4.52 486 815 0 0.00187 0.794 0.794 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0812 455 758 0.00117 0 0 0 DriftChamberPhysical initStep + 1 -0.193 455 758 0 0.00117 0.388 0.388 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00137 72 120 0.000991 0 0 0 DriftChamberPhysical initStep + 1 0.0624 72.2 120 0 0.000991 0.304 0.304 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.000748 51.7 86.1 0.00126 0 0 0 WorldPhysical initStep + 1 0.00143 51.7 86.1 0.00126 2.11e-06 0.00213 0.00213 WorldPhysical msc + 2 0.00971 51.6 86.1 0 0.00126 0.0788 0.081 WorldPhysical eIoni +>>> Event 0 + 12 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.9999084334748491 (GeV) + 0 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0 60 100 1e+03 0.0251 117 117 DriftChamberPhysical CoupledTransportation + 2 -0.128 197 329 1e+03 0.00661 267 383 DriftChamberPhysical msc + 3 -0.275 334 557 1e+03 0.0102 267 650 DriftChamberPhysical msc + 4 -0.428 471 786 1e+03 0.00731 267 916 DriftChamberPhysical msc + 5 -0.508 540 900 1e+03 0.00515 133 1.05e+03 WorldPhysical CoupledTransportation + 6 -0.515 547 911 1e+03 0.00209 13.4 1.06e+03 WorldPhysical eIoni + 7 -0.571 600 1e+03 1e+03 0.0249 103 1.17e+03 Crystal CoupledTransportation +ExN05EMShowerModel::DoIt + 8 -0.571 600 1e+03 0 1e+03 0 1.17e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.515 547 911 0.00505 0 0 0 WorldPhysical initStep + 1 -0.517 547 911 0.00501 4.46e-05 0.0234 0.0234 WorldPhysical msc + 2 -0.518 547 911 0 0.00501 0.721 0.744 WorldPhysical eIoni +>>> Event 1 + 10 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.9999136962794634 (GeV) + 0 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0.0013 10.6 17.6 1e+03 0.00484 20.6 20.6 WorldPhysical eIoni + 2 -0.00184 60 100 1e+03 0.0194 96.1 117 DriftChamberPhysical CoupledTransportation + 3 0.0128 197 329 1e+03 0.00955 267 383 DriftChamberPhysical msc + 4 0.031 263 439 1e+03 0.00355 128 512 DriftChamberPhysical eIoni + 5 0.0568 400 667 1e+03 0.00707 267 778 DriftChamberPhysical msc + 6 0.068 537 896 1e+03 0.00783 267 1.04e+03 DriftChamberPhysical msc + 7 0.0684 540 900 1e+03 0.000108 4.93 1.05e+03 WorldPhysical CoupledTransportation + 8 0.0803 572 953 1e+03 0.0162 62 1.11e+03 WorldPhysical eIoni + 9 0.0975 600 1e+03 1e+03 0.0128 54.6 1.17e+03 Crystal CoupledTransportation +ExN05EMShowerModel::DoIt + 10 0.0975 600 1e+03 0 1e+03 0 1.17e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0803 572 953 0.00127 0 0 0 WorldPhysical initStep + 1 0.0822 572 953 0.00127 0 0.00215 0.00215 WorldPhysical msc + 2 0.134 572 953 0 0.00127 0.0798 0.082 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.031 263 439 0.00106 0 0 0 DriftChamberPhysical initStep + 1 -0.14 263 439 0 0.00106 0.336 0.336 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0013 10.6 17.6 0.00103 0 0 0 WorldPhysical initStep + 1 6.68e-05 10.6 17.6 0.00103 0 0.0015 0.0015 WorldPhysical msc + 2 -0.00275 10.6 17.6 0 0.00103 0.0603 0.0618 WorldPhysical eIoni +>>> Event 2 + 12 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.9999152201311583 (GeV) + 0 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0.000323 3.51 5.86 1e+03 0.00149 6.83 6.83 WorldPhysical eIoni + 2 0.00254 18.9 31.5 1e+03 0.00544 29.9 36.7 WorldPhysical eIoni + 3 0.00152 60 100 1e+03 0.0173 79.9 117 DriftChamberPhysical CoupledTransportation + 4 0.00561 73 122 1e+03 0.000882 25.3 142 DriftChamberPhysical eIoni + 5 0.0437 210 350 1e+03 0.00802 267 409 DriftChamberPhysical msc + 6 0.0817 347 579 1e+03 0.00779 267 675 DriftChamberPhysical msc + 7 0.0969 383 638 1e+03 0.00164 69.1 744 DriftChamberPhysical eIoni + 8 0.137 520 867 1e+03 0.0104 267 1.01e+03 DriftChamberPhysical msc + 9 0.142 540 900 1e+03 0.00104 38.9 1.05e+03 WorldPhysical CoupledTransportation + 10 0.14 593 989 1e+03 0.0228 103 1.15e+03 WorldPhysical eIoni + 11 0.143 600 1e+03 1e+03 0.00441 13.2 1.17e+03 Crystal CoupledTransportation +ExN05EMShowerModel::DoIt + 12 0.143 600 1e+03 0 1e+03 0 1.17e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 6, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.14 593 989 0.00165 0 0 0 WorldPhysical initStep + 1 0.143 593 989 0.00165 0 0.00331 0.00331 WorldPhysical msc + 2 0.172 593 989 0 0.00165 0.117 0.121 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0969 383 638 0.00475 0 0 0 DriftChamberPhysical initStep + 1 1.12 381 639 0.00346 0.0013 2.18 2.18 DriftChamberPhysical eIoni + 2 2.28 380 638 0.00172 0.00174 1.69 3.87 DriftChamberPhysical eIoni + 3 2.77 380 637 0 0.00172 0.694 4.57 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00561 73 122 0.00136 0 0 0 DriftChamberPhysical initStep + 1 0.0382 73.5 122 0 0.00136 0.486 0.486 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00254 18.9 31.5 0.00118 0 0 0 WorldPhysical initStep + 1 0.00417 18.9 31.5 0.00118 2.81e-06 0.00187 0.00187 WorldPhysical msc + 2 0.0135 18.9 31.5 0 0.00118 0.0727 0.0745 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.000323 3.51 5.86 0.00518 0 0 0 WorldPhysical initStep + 1 -0.0129 3.5 5.87 0.00508 9.45e-05 0.0242 0.0242 WorldPhysical msc + 2 -0.149 3.21 6.08 0 0.00508 0.743 0.767 WorldPhysical eIoni +>>> Event 3 + 12 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.9999045856192899 (GeV) + 0 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0 60 100 1e+03 0.0237 117 117 DriftChamberPhysical CoupledTransportation + 2 0.0202 197 329 1e+03 0.00865 267 383 DriftChamberPhysical msc + 3 0.0314 334 557 1e+03 0.00738 267 650 DriftChamberPhysical msc + 4 0.03 471 786 1e+03 0.0087 267 916 DriftChamberPhysical msc + 5 0.0304 474 789 1e+03 0.000149 4.3 921 DriftChamberPhysical eIoni + 6 0.037 540 900 1e+03 0.00362 129 1.05e+03 WorldPhysical CoupledTransportation + 7 0.0389 600 1e+03 1e+03 0.0232 117 1.17e+03 Crystal CoupledTransportation +ExN05EMShowerModel::DoIt + 8 0.0389 600 1e+03 0 1e+03 0 1.17e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0304 474 789 0.00128 0 0 0 DriftChamberPhysical initStep + 1 0.334 474 789 0 0.00128 0.442 0.442 DriftChamberPhysical eIoni +>>> Event 4 + 11 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.9999233145507304 (GeV) + 0 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +number of event = 5 +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +### Run 1 start. +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 -0.0158 26.4 88.1 1e+03 0.0123 92 92 WorldPhysical eIoni + 2 -0.0189 30 100 1e+03 0.00224 12.4 104 DriftChamberPhysical CoupledTransportation + 3 -0.0837 98.5 329 1e+03 0.00912 239 343 DriftChamberPhysical msc + 4 -0.164 167 557 1e+03 0.0086 239 582 DriftChamberPhysical msc + 5 -0.247 235 786 1e+03 0.00846 239 820 DriftChamberPhysical msc + 6 -0.287 270 900 1e+03 0.00304 119 940 WorldPhysical CoupledTransportation + 7 -0.321 300 1e+03 1e+03 0.0213 104 1.04e+03 Crystal CoupledTransportation +ExN05EMShowerModel::DoIt + 8 -0.321 300 1e+03 0 1e+03 0 1.04e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0158 26.4 88.1 0.00182 0 0 0 WorldPhysical initStep + 1 -0.0123 26.4 88.1 0.00182 0 0.00384 0.00384 WorldPhysical msc + 2 0.0449 26.4 88.1 0 0.00182 0.136 0.14 WorldPhysical eIoni +>>> Event 0 + 10 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.9999331361339209 (GeV) + 0 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0.00565 13 43.3 1e+03 0.00795 45.2 45.2 WorldPhysical eIoni + 2 0.0158 30 100 1e+03 0.0111 59.2 104 DriftChamberPhysical CoupledTransportation + 3 0.0511 98.6 329 1e+03 0.00944 239 343 DriftChamberPhysical msc + 4 0.078 167 557 1e+03 0.00675 239 582 DriftChamberPhysical msc + 5 0.0819 174 579 1e+03 0.00128 22.9 605 DriftChamberPhysical eIoni + 6 0.0865 180 600 1e+03 0.00131 22.3 627 DriftChamberPhysical eIoni + 7 0.136 249 829 1e+03 0.00729 239 866 DriftChamberPhysical msc + 8 0.15 270 900 1e+03 0.00178 74.1 940 WorldPhysical CoupledTransportation + 9 0.163 287 956 1e+03 0.0147 58.9 999 WorldPhysical eIoni + 10 0.183 300 1e+03 1e+03 0.00827 45.5 1.04e+03 Crystal CoupledTransportation +ExN05EMShowerModel::DoIt + 11 0.183 300 1e+03 0 1e+03 0 1.04e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.163 287 956 0.00136 0 0 0 WorldPhysical initStep + 1 0.161 287 956 0.00136 0 0.00236 0.00236 WorldPhysical msc + 2 0.143 287 956 0 0.00136 0.0884 0.0908 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0865 180 600 0.00258 0 0 0 DriftChamberPhysical initStep + 1 1.09 180 601 0.000325 0.00226 1.27 1.27 DriftChamberPhysical eIoni + 2 1.1 180 601 0 0.000325 0.09 1.36 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0819 174 579 0.00102 0 0 0 DriftChamberPhysical initStep + 1 0.000644 174 579 0 0.00102 0.316 0.316 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00565 13 43.3 0.00137 0 0 0 WorldPhysical initStep + 1 0.00797 13 43.3 0.00137 0 0.00238 0.00238 WorldPhysical msc + 2 0.0574 13 43.3 0 0.00137 0.0891 0.0915 WorldPhysical eIoni +>>> Event 1 + 9 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.9999237925011433 (GeV) + 0 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0.00132 6.51 21.7 1e+03 0.00644 22.7 22.7 WorldPhysical eIoni + 2 0.00109 7.18 23.9 1e+03 0.000594 2.32 25 WorldPhysical eIoni + 3 -0.01 30 100 1e+03 0.017 79.4 104 DriftChamberPhysical CoupledTransportation + 4 -0.0683 98.6 329 1e+03 0.00649 239 343 DriftChamberPhysical msc + 5 -0.103 167 557 1e+03 0.00736 239 582 DriftChamberPhysical msc + 6 -0.131 236 786 1e+03 0.00861 239 820 DriftChamberPhysical msc + 7 -0.142 270 900 1e+03 0.0036 119 940 WorldPhysical CoupledTransportation + 8 -0.148 280 933 1e+03 0.00719 34.9 975 WorldPhysical eIoni + 9 -0.154 300 1e+03 1e+03 0.0181 69.5 1.04e+03 Crystal CoupledTransportation +ExN05EMShowerModel::DoIt + 10 -0.154 300 1e+03 0 1e+03 0 1.04e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.148 280 933 0.00179 0 0 0 WorldPhysical initStep + 1 -0.149 280 933 0.00178 1.1e-05 0.00374 0.00374 WorldPhysical msc + 2 -0.173 280 934 0 0.00178 0.131 0.135 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00109 7.18 23.9 0.00231 0 0 0 WorldPhysical initStep + 1 0.00598 7.18 23.9 0.00229 1.34e-05 0.00577 0.00577 WorldPhysical msc + 2 0.0441 7.15 23.9 0 0.00229 0.194 0.2 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00132 6.51 21.7 0.00499 0 0 0 WorldPhysical initStep + 1 -0.013 6.5 21.7 0.00497 2.79e-05 0.023 0.023 WorldPhysical msc + 2 0.0774 6.18 21.7 0.00252 0.00244 0.583 0.606 WorldPhysical eIoni + 3 0.106 6.18 21.7 0 0.00252 0.225 0.831 WorldPhysical eIoni +>>> Event 2 + 10 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.9999155377061321 (GeV) + 0 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0 30 100 1e+03 0.0193 104 104 DriftChamberPhysical CoupledTransportation + 2 0.00742 98.6 329 1e+03 0.00789 239 343 DriftChamberPhysical msc + 3 0.0149 135 450 1e+03 0.00332 127 470 DriftChamberPhysical eIoni + 4 0.0275 170 568 1e+03 0.00334 123 593 DriftChamberPhysical eIoni + 5 0.0712 239 796 1e+03 0.00817 239 831 DriftChamberPhysical msc + 6 0.0887 270 900 1e+03 0.0031 108 940 WorldPhysical CoupledTransportation + 7 0.0912 274 912 1e+03 0.00337 12.5 952 WorldPhysical eIoni + 8 0.109 300 1e+03 1e+03 0.0185 91.9 1.04e+03 Crystal CoupledTransportation +ExN05EMShowerModel::DoIt + 9 0.109 300 1e+03 0 1e+03 0 1.04e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0912 274 912 0.00267 0 0 0 WorldPhysical initStep + 1 0.0858 274 912 0.00266 1.22e-05 0.00749 0.00749 WorldPhysical msc + 2 -0.0433 274 912 0 0.00266 0.246 0.253 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0275 170 568 0.00183 0 0 0 DriftChamberPhysical initStep + 1 -0.275 170 568 0 0.00183 0.765 0.765 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0149 135 450 0.00125 0 0 0 DriftChamberPhysical initStep + 1 0.319 135 450 0 0.00125 0.422 0.422 DriftChamberPhysical eIoni +>>> Event 3 + 11 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.9999273047368142 (GeV) + 0 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0.00752 26.8 89.5 1e+03 0.0204 93.4 93.4 WorldPhysical eIoni + 2 0.00976 30 100 1e+03 0.0014 11 104 DriftChamberPhysical CoupledTransportation + 3 0.0118 36.2 121 1e+03 0.000712 21.6 126 DriftChamberPhysical eIoni + 4 0.0195 63 210 1e+03 0.00356 93.2 219 DriftChamberPhysical eIoni + 5 0.0241 105 349 1e+03 0.00518 145 364 DriftChamberPhysical eIoni + 6 0.0396 173 578 1e+03 0.0087 239 603 DriftChamberPhysical msc + 7 0.0404 176 586 1e+03 0.000162 8.43 611 DriftChamberPhysical eIoni + 8 0.0593 244 814 1e+03 0.00718 239 850 DriftChamberPhysical msc + 9 0.0667 270 900 1e+03 0.00288 89.6 940 WorldPhysical CoupledTransportation + 10 0.0696 294 978 1e+03 0.0195 81.8 1.02e+03 WorldPhysical eIoni + 11 0.0682 300 1e+03 1e+03 0.00699 22.6 1.04e+03 Crystal CoupledTransportation +ExN05EMShowerModel::DoIt + 12 0.0682 300 1e+03 0 1e+03 0 1.04e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 7, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0696 294 978 0.000999 0 0 0 WorldPhysical initStep + 1 0.0683 294 978 0.000999 0 0.00144 0.00144 WorldPhysical msc + 2 0.0391 294 978 0 0.000999 0.0578 0.0592 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 6, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0404 176 586 0.00116 0 0 0 DriftChamberPhysical initStep + 1 -0.154 175 586 0 0.00116 0.383 0.383 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0241 105 349 0.00157 0 0 0 DriftChamberPhysical initStep + 1 -0.358 105 349 0 0.00157 0.598 0.598 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0195 63 210 0.00124 0 0 0 DriftChamberPhysical initStep + 1 0.387 63 210 0 0.00124 0.42 0.42 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0118 36.2 121 0.00215 0 0 0 DriftChamberPhysical initStep + 1 -0.206 35.7 121 0 0.00215 0.996 0.996 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00752 26.8 89.5 0.00111 0 0 0 WorldPhysical initStep + 1 0.00844 26.8 89.5 0.00108 2.39e-05 0.00166 0.00166 WorldPhysical msc + 2 0.0218 26.8 89.5 0 0.00108 0.0645 0.0661 WorldPhysical eIoni +>>> Event 4 + 7 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.9999151616230203 (GeV) + 0 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +number of event = 5 +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +### Run 2 start. +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 -0.00243 -13 43.3 1e+03 0.0104 45.2 45.2 WorldPhysical eIoni + 2 0.00415 -23.5 78.4 1e+03 0.00825 36.6 81.9 WorldPhysical eIoni + 3 0.00756 -30 100 1e+03 0.00557 22.5 104 DriftChamberPhysical CoupledTransportation + 4 0.0133 -98.6 329 1e+03 0.00904 239 343 DriftChamberPhysical msc + 5 0.0162 -150 498 1e+03 0.00554 177 520 DriftChamberPhysical eIoni + 6 0.00408 -178 594 1e+03 0.00265 100 620 DriftChamberPhysical eIoni + 7 -0.0256 -247 823 1e+03 0.00743 239 859 DriftChamberPhysical msc + 8 -0.0346 -270 900 1e+03 0.00387 80.6 940 WorldPhysical CoupledTransportation + 9 -0.0511 -291 968 1e+03 0.0157 71.1 1.01e+03 WorldPhysical eIoni + 10 -0.0656 -300 1e+03 1e+03 0.0104 33.3 1.04e+03 Crystal CoupledTransportation +ExN05EMShowerModel::DoIt + 11 -0.0656 -300 1e+03 0 1e+03 0 1.04e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 6, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0511 -291 968 0.00269 0 0 0 WorldPhysical initStep + 1 -0.0479 -291 968 0.00267 2.11e-05 0.00758 0.00758 WorldPhysical msc + 2 -0.00658 -291 968 0 0.00267 0.248 0.255 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00408 -178 594 0.00663 0 0 0 DriftChamberPhysical initStep + 1 -0.0336 -176 595 0.00574 0.00089 2.93 2.93 DriftChamberPhysical eIoni + 2 1.46 -174 596 0.00363 0.00212 2.57 5.49 DriftChamberPhysical eIoni + 3 2.53 -173 596 0.00198 0.00165 1.76 7.25 DriftChamberPhysical eIoni + 4 3.03 -173 596 0 0.00198 0.863 8.12 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0162 -150 498 0.00108 0 0 0 DriftChamberPhysical initStep + 1 0.343 -150 498 0 0.00108 0.345 0.345 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00415 -23.5 78.4 0.0127 0 0 0 WorldPhysical initStep + 1 -0.00792 -23.7 78.4 0.0126 7.03e-05 0.122 0.122 WorldPhysical msc + 2 0.728 -25.4 78.7 0.00815 0.00444 2.15 2.27 WorldPhysical eIoni + 3 0.761 -25.4 79 0.00601 0.00114 0.345 2.62 WorldPhysical eIoni + 4 0.892 -25.5 79.4 0 0.00601 1 3.62 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 7, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.761 -25.4 79 0.000996 0 0 0 WorldPhysical initStep + 1 0.762 -25.4 79 0.000996 0 0.00143 0.00143 WorldPhysical msc + 2 0.791 -25.4 79 0 0.000996 0.0576 0.059 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.00243 -13 43.3 0.00153 0 0 0 WorldPhysical initStep + 1 -0.00122 -13 43.3 0.00153 0 0.00289 0.00289 WorldPhysical msc + 2 0.00321 -13 43.3 0 0.00153 0.104 0.107 WorldPhysical eIoni +>>> Event 0 + 10 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.9998965761225519 (GeV) + 0 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 -0.00645 -15 49.9 1e+03 0.00947 52.1 52.1 WorldPhysical eIoni + 2 -0.000624 -30 100 1e+03 0.0104 52.3 104 DriftChamberPhysical CoupledTransportation + 3 -0.0156 -98.6 329 1e+03 0.00755 239 343 DriftChamberPhysical msc + 4 -0.0301 -167 557 1e+03 0.00817 239 582 DriftChamberPhysical msc + 5 0.00272 -236 786 1e+03 0.00766 239 820 DriftChamberPhysical msc + 6 0.0216 -270 900 1e+03 0.00326 119 940 WorldPhysical CoupledTransportation + 7 0.0219 -271 903 1e+03 0.0016 3.51 943 WorldPhysical eIoni + 8 0.0322 -300 1e+03 1e+03 0.0206 101 1.04e+03 Crystal CoupledTransportation +ExN05EMShowerModel::DoIt + 9 0.0322 -300 1e+03 0 1e+03 0 1.04e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0219 -271 903 0.00605 0 0 0 WorldPhysical initStep + 1 0.00501 -271 903 0.00602 2.75e-05 0.0317 0.0317 WorldPhysical msc + 2 -0.368 -272 903 0.00207 0.00289 0.734 0.765 WorldPhysical eIoni + 3 -0.375 -272 903 0 0.00207 0.165 0.931 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.368 -272 903 0.00107 0 0 0 WorldPhysical initStep + 1 -0.368 -272 903 0.00107 0 0.00157 0.00157 WorldPhysical msc + 2 -0.378 -272 903 0 0.00107 0.0632 0.0647 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.00645 -15 49.9 0.00138 0 0 0 WorldPhysical initStep + 1 -0.00879 -15 49.9 0.00122 0.000158 0.00242 0.00242 WorldPhysical msc + 2 -0.017 -15 49.9 0 0.00122 0.076 0.0784 WorldPhysical eIoni +>>> Event 1 + 8 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.9999239108874618 (GeV) + 0 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0.00167 -5.76 19.2 1e+03 0.00304 20 20 WorldPhysical eIoni + 2 0.00338 -11.8 39.3 1e+03 0.00536 21 41 WorldPhysical eIoni + 3 0.00263 -30 100 1e+03 0.0135 63.4 104 DriftChamberPhysical CoupledTransportation + 4 -0.0188 -98.6 329 1e+03 0.0085 239 343 DriftChamberPhysical msc + 5 -0.0303 -112 374 1e+03 0.00125 47.8 391 DriftChamberPhysical eIoni + 6 -0.0657 -181 603 1e+03 0.00741 239 630 DriftChamberPhysical msc + 7 -0.09 -205 685 1e+03 0.0022 85.2 715 DriftChamberPhysical eIoni + 8 -0.157 -270 900 1e+03 0.00786 225 940 WorldPhysical CoupledTransportation + 9 -0.176 -287 955 1e+03 0.0108 57.7 997 WorldPhysical eIoni + 10 -0.203 -300 1e+03 1e+03 0.0078 46.7 1.04e+03 Crystal CoupledTransportation +ExN05EMShowerModel::DoIt + 11 -0.203 -300 1e+03 0 1e+03 0 1.04e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 6, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.176 -287 955 0.00672 0 0 0 WorldPhysical initStep + 1 -0.142 -287 955 0.00661 0.000103 0.0381 0.0381 WorldPhysical msc + 2 0.364 -286 955 0.00204 0.00318 0.637 0.675 WorldPhysical eIoni + 3 0.43 -286 955 0 0.00204 0.161 0.836 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 7, Parent ID = 6 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.364 -286 955 0.0014 0 0 0 WorldPhysical initStep + 1 0.366 -286 955 0.00136 3.27e-05 0.00246 0.00246 WorldPhysical msc + 2 0.424 -286 955 0 0.00136 0.0888 0.0912 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.09 -205 685 0.0053 0 0 0 DriftChamberPhysical initStep + 1 1.89 -205 686 0.00399 0.00131 2.39 2.39 DriftChamberPhysical eIoni + 2 3.52 -205 685 0.00272 0.00126 1.89 4.28 DriftChamberPhysical eIoni + 3 4.72 -205 685 0.000708 0.00202 1.36 5.64 DriftChamberPhysical eIoni + 4 4.82 -205 685 0 0.000708 0.197 5.83 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0303 -112 374 0.00107 0 0 0 DriftChamberPhysical initStep + 1 -0.226 -112 374 0 0.00107 0.34 0.34 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00338 -11.8 39.3 0.00111 0 0 0 WorldPhysical initStep + 1 0.00469 -11.8 39.3 0.00111 0 0.00167 0.00167 WorldPhysical msc + 2 0.0353 -11.8 39.3 0 0.00111 0.0668 0.0685 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00167 -5.76 19.2 0.00286 0 0 0 WorldPhysical initStep + 1 -0.00276 -5.75 19.2 0.00284 2.07e-05 0.00838 0.00838 WorldPhysical msc + 2 -0.0858 -5.65 19.2 0 0.00284 0.275 0.283 WorldPhysical eIoni +>>> Event 2 + 7 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.9999151611047639 (GeV) + 0 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0.000561 -3.03 10.1 1e+03 0.0036 10.6 10.6 WorldPhysical eIoni + 2 -0.00562 -19.8 65.9 1e+03 0.0111 58.2 68.8 WorldPhysical eIoni + 3 -0.00897 -30 100 1e+03 0.00528 35.6 104 DriftChamberPhysical CoupledTransportation + 4 -0.0718 -98.5 329 1e+03 0.00864 239 343 DriftChamberPhysical msc + 5 -0.124 -167 557 1e+03 0.00735 239 582 DriftChamberPhysical msc + 6 -0.188 -236 786 1e+03 0.00666 239 820 DriftChamberPhysical msc + 7 -0.209 -270 900 1e+03 0.0033 119 940 WorldPhysical CoupledTransportation + 8 -0.211 -278 927 1e+03 0.00508 28.2 968 WorldPhysical eIoni + 9 -0.218 -300 1e+03 1e+03 0.0168 76.2 1.04e+03 Crystal CoupledTransportation +ExN05EMShowerModel::DoIt + 10 -0.218 -300 1e+03 0 1e+03 0 1.04e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.211 -278 927 0.00157 0 0 0 WorldPhysical initStep + 1 -0.209 -278 927 0.00146 0.000106 0.00305 0.00305 WorldPhysical msc + 2 -0.167 -278 927 0 0.00146 0.098 0.101 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.00562 -19.8 65.9 0.00199 0 0 0 WorldPhysical initStep + 1 -0.00335 -19.8 65.9 0.00196 3.79e-05 0.00461 0.00461 WorldPhysical msc + 2 0.0131 -19.8 65.9 0 0.00196 0.151 0.155 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.000561 -3.03 10.1 0.0216 0 0 0 WorldPhysical initStep + 1 0.293 -3.13 10.1 0.0212 0.000397 0.311 0.311 WorldPhysical msc + 2 0.597 -3.18 10.2 0.0209 0.000325 0.311 0.623 WorldPhysical msc + 3 3.56 -4.35 8.97 0.0161 0.00478 3.46 4.08 WorldPhysical eIoni + 4 3.73 -4.37 8.72 0.0158 0.00033 0.311 4.39 WorldPhysical msc + 5 3.93 -3.5 8.25 0.0111 0.00319 1.85 6.24 WorldPhysical eIoni + 6 4.74 -3.35 7.87 0.00757 0.00244 1.25 7.49 WorldPhysical eIoni + 7 4.44 -2.7 6.74 0.00245 0.00513 1.38 8.87 WorldPhysical eIoni + 8 4.41 -2.65 6.75 0 0.00245 0.215 9.09 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 6, Parent ID = 2 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 4.74 -3.35 7.87 0.00111 0 0 0 WorldPhysical initStep + 1 4.74 -3.35 7.87 0.00111 0 0.00167 0.00167 WorldPhysical msc + 2 4.77 -3.33 7.9 0 0.00111 0.0667 0.0684 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 2 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 3.93 -3.5 8.25 0.0015 0 0 0 WorldPhysical initStep + 1 3.93 -3.5 8.25 0.000994 0.000503 0.00278 0.00278 WorldPhysical msc + 2 3.94 -3.49 8.26 0 0.000994 0.0574 0.0602 WorldPhysical eIoni +>>> Event 3 + 9 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.9999069673857882 (GeV) + 0 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 -0.00771 -18.9 63 1e+03 0.0156 65.7 65.7 WorldPhysical eIoni + 2 -0.0107 -26 86.6 1e+03 0.00463 24.7 90.4 WorldPhysical eIoni + 3 -0.0118 -29.4 98.1 1e+03 0.00373 12 102 WorldPhysical eIoni + 4 -0.0122 -30 100 1e+03 0.00167 2.01 104 DriftChamberPhysical CoupledTransportation + 5 -0.066 -98.6 329 1e+03 0.00833 239 343 DriftChamberPhysical msc + 6 -0.101 -167 557 1e+03 0.00704 239 582 DriftChamberPhysical msc + 7 -0.144 -236 786 1e+03 0.00941 239 820 DriftChamberPhysical msc + 8 -0.162 -270 900 1e+03 0.0041 119 940 WorldPhysical CoupledTransportation + 9 -0.164 -283 943 1e+03 0.00701 44.4 984 WorldPhysical eIoni + 10 -0.174 -300 1e+03 1e+03 0.0138 60 1.04e+03 Crystal CoupledTransportation +ExN05EMShowerModel::DoIt + 11 -0.174 -300 1e+03 0 1e+03 0 1.04e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.164 -283 943 0.00429 0 0 0 WorldPhysical initStep + 1 -0.168 -283 943 0.00425 4.72e-05 0.0171 0.0171 WorldPhysical msc + 2 -0.191 -283 943 0 0.00425 0.545 0.562 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0118 -29.4 98.1 0.00214 0 0 0 WorldPhysical initStep + 1 -0.00722 -29.4 98.1 0.00214 0 0.0051 0.0051 WorldPhysical msc + 2 0.0179 -29.4 98.1 0 0.00214 0.175 0.18 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0107 -26 86.6 0.00115 0 0 0 WorldPhysical initStep + 1 -0.0124 -26 86.6 0.00115 0 0.00177 0.00177 WorldPhysical msc + 2 -0.0235 -26 86.6 0 0.00115 0.0699 0.0717 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.00771 -18.9 63 0.00312 0 0 0 WorldPhysical initStep + 1 -0.017 -18.9 63 0.00307 4.84e-05 0.01 0.01 WorldPhysical msc + 2 -0.184 -18.8 63 0 0.00307 0.312 0.322 WorldPhysical eIoni +>>> Event 4 + 7 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.9999139123781654 (GeV) + 0 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +number of event = 5 +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +### Run 3 start. +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 -0.0124 -48.6 81 1e+03 0.019 94.5 94.5 WorldPhysical eIoni + 2 -0.00917 -60 100 1e+03 0.00416 22.1 117 DriftChamberPhysical CoupledTransportation + 3 0.00783 -126 210 1e+03 0.00451 128 244 DriftChamberPhysical eIoni + 4 0.0405 -226 376 1e+03 0.00545 195 439 DriftChamberPhysical eIoni + 5 0.114 -363 605 1e+03 0.00862 267 706 DriftChamberPhysical msc + 6 0.216 -500 834 1e+03 0.00922 267 972 DriftChamberPhysical msc + 7 0.247 -540 900 1e+03 0.00351 77.4 1.05e+03 WorldPhysical CoupledTransportation + 8 0.289 -576 960 1e+03 0.0162 70.1 1.12e+03 WorldPhysical eIoni + 9 0.32 -600 1e+03 1e+03 0.0106 46.5 1.17e+03 Crystal CoupledTransportation +ExN05EMShowerModel::DoIt + 10 0.32 -600 1e+03 0 1e+03 0 1.17e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.289 -576 960 0.00434 0 0 0 WorldPhysical initStep + 1 0.288 -576 960 0.0043 3.41e-05 0.0174 0.0174 WorldPhysical msc + 2 0.288 -576 960 0 0.0043 0.558 0.576 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0405 -226 376 0.00121 0 0 0 DriftChamberPhysical initStep + 1 0.303 -226 377 0 0.00121 0.407 0.407 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00783 -126 210 0.0019 0 0 0 DriftChamberPhysical initStep + 1 0.235 -126 209 0 0.0019 0.814 0.814 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0124 -48.6 81 0.00243 0 0 0 WorldPhysical initStep + 1 -0.0187 -48.6 81 0.00242 7.01e-06 0.00641 0.00641 WorldPhysical msc + 2 -0.123 -48.6 81 0 0.00242 0.212 0.218 WorldPhysical eIoni +>>> Event 0 + 11 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.999908790006697 (GeV) + 0 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0 -60 100 1e+03 0.0214 117 117 DriftChamberPhysical CoupledTransportation + 2 0.0725 -197 329 1e+03 0.00746 267 383 DriftChamberPhysical msc + 3 0.0972 -265 441 1e+03 0.00423 131 515 DriftChamberPhysical eIoni + 4 0.135 -402 670 1e+03 0.00895 267 781 DriftChamberPhysical msc + 5 0.177 -539 898 1e+03 0.00834 267 1.05e+03 DriftChamberPhysical msc + 6 0.178 -540 900 1e+03 4.47e-05 1.83 1.05e+03 WorldPhysical CoupledTransportation + 7 0.184 -559 931 1e+03 0.00592 35.8 1.09e+03 WorldPhysical eIoni + 8 0.29 -601 1e+03 1e+03 0.0163 80.9 1.17e+03 Crystal CoupledTransportation +ExN05EMShowerModel::DoIt + 9 0.29 -601 1e+03 0 1e+03 0 1.17e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.184 -559 931 0.0108 0 0 0 WorldPhysical initStep + 1 0.257 -559 931 0.0108 3.87e-05 0.089 0.089 WorldPhysical msc + 2 1.19 -559 931 0.00646 0.0043 1.9 1.99 WorldPhysical eIoni + 3 1.84 -559 932 0.000356 0.00611 1.13 3.11 WorldPhysical eIoni + 4 1.85 -559 932 0 0.000356 0.0191 3.13 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0972 -265 441 0.00436 0 0 0 DriftChamberPhysical initStep + 1 0.326 -267 441 0.00279 0.00157 2.04 2.04 DriftChamberPhysical eIoni + 2 0.151 -268 441 0.000874 0.00192 1.39 3.43 DriftChamberPhysical eIoni + 3 -0.0691 -268 441 0 0.000874 0.257 3.69 DriftChamberPhysical eIoni +>>> Event 1 + 13 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.9999122393879938 (GeV) + 0 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 1.52e-05 -0.456 0.76 1e+03 0.000151 0.886 0.886 WorldPhysical eIoni + 2 -0.001 -11.9 19.9 1e+03 0.00495 22.3 23.2 WorldPhysical eIoni + 3 -0.000106 -26.4 44 1e+03 0.00518 28.1 51.3 WorldPhysical eIoni + 4 -0.00533 -60 100 1e+03 0.0141 65.4 117 DriftChamberPhysical CoupledTransportation + 5 -0.0538 -197 329 1e+03 0.00969 267 383 DriftChamberPhysical msc + 6 -0.11 -334 557 1e+03 0.00901 267 650 DriftChamberPhysical msc + 7 -0.152 -471 786 1e+03 0.00922 267 916 DriftChamberPhysical msc + 8 -0.17 -540 900 1e+03 0.00475 133 1.05e+03 WorldPhysical CoupledTransportation + 9 -0.174 -583 971 1e+03 0.0146 83 1.13e+03 WorldPhysical eIoni + 10 -0.174 -591 984 1e+03 0.00294 15.1 1.15e+03 WorldPhysical eIoni + 11 -0.177 -600 1e+03 1e+03 0.00295 18.5 1.17e+03 Crystal CoupledTransportation +ExN05EMShowerModel::DoIt + 12 -0.177 -600 1e+03 0 1e+03 0 1.17e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 6, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.174 -591 984 0.00169 0 0 0 WorldPhysical initStep + 1 -0.173 -591 984 0.00169 0 0.00342 0.00342 WorldPhysical msc + 2 -0.132 -591 984 0 0.00169 0.121 0.125 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.174 -583 971 0.00662 0 0 0 WorldPhysical initStep + 1 -0.211 -583 971 0.00656 6.48e-05 0.0373 0.0373 WorldPhysical msc + 2 -0.354 -582 971 8.42e-05 0.00647 1.15 1.19 WorldPhysical eIoni + 3 -0.353 -582 971 0 8.42e-05 0.00849 1.2 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.000106 -26.4 44 0.0018 0 0 0 WorldPhysical initStep + 1 0.00266 -26.4 44 0.0018 0 0.00376 0.00376 WorldPhysical msc + 2 0.0104 -26.4 44 0 0.0018 0.133 0.137 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.001 -11.9 19.9 0.00109 0 0 0 WorldPhysical initStep + 1 -0.00149 -11.9 19.9 0.00109 0 0.00162 0.00162 WorldPhysical msc + 2 -0.00261 -11.9 19.9 0 0.00109 0.0649 0.0665 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 1.52e-05 -0.456 0.76 0.00219 0 0 0 WorldPhysical initStep + 1 0.00453 -0.454 0.762 0.00216 3.25e-05 0.00528 0.00528 WorldPhysical msc + 2 0.0645 -0.448 0.804 0 0.00216 0.176 0.182 WorldPhysical eIoni +>>> Event 2 + 10 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.999909087031952 (GeV) + 0 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 -0.000606 -5.96 9.93 1e+03 0.00171 11.6 11.6 WorldPhysical eIoni + 2 0.00301 -60 100 1e+03 0.0186 105 117 DriftChamberPhysical CoupledTransportation + 3 -0.0138 -160 266 1e+03 0.00703 194 311 DriftChamberPhysical eIoni + 4 -0.0478 -297 495 1e+03 0.00925 267 577 DriftChamberPhysical msc + 5 -0.0451 -434 723 1e+03 0.00932 267 844 DriftChamberPhysical msc + 6 -0.0575 -540 900 1e+03 0.00805 206 1.05e+03 WorldPhysical CoupledTransportation + 7 -0.0656 -588 980 1e+03 0.0201 93.4 1.14e+03 WorldPhysical eIoni + 8 -0.0599 -600 1e+03 1e+03 0.00534 23.2 1.17e+03 Crystal CoupledTransportation +ExN05EMShowerModel::DoIt + 9 -0.0599 -600 1e+03 0 1e+03 0 1.17e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0656 -588 980 0.00251 0 0 0 WorldPhysical initStep + 1 -0.0719 -588 980 0.00238 0.000138 0.0069 0.0069 WorldPhysical msc + 2 -0.178 -588 980 0 0.00238 0.205 0.212 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0138 -160 266 0.00187 0 0 0 DriftChamberPhysical initStep + 1 0.298 -159 267 0 0.00187 0.79 0.79 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.000606 -5.96 9.93 0.00115 0 0 0 WorldPhysical initStep + 1 -0.0001 -5.95 9.93 0.00115 0 0.00176 0.00176 WorldPhysical msc + 2 0.000553 -5.95 9.93 0 0.00115 0.0697 0.0715 WorldPhysical eIoni +>>> Event 3 + 10 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.9999150731060505 (GeV) + 0 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 1.16e-05 -0.543 0.904 1e+03 0.000589 1.05 1.05 WorldPhysical eIoni + 2 -0.00738 -51.3 85.5 1e+03 0.0202 98.7 99.8 WorldPhysical eIoni + 3 -0.00895 -60 100 1e+03 0.00455 16.9 117 DriftChamberPhysical CoupledTransportation + 4 -0.0529 -197 329 1e+03 0.00955 267 383 DriftChamberPhysical msc + 5 -0.0549 -203 338 1e+03 0.000443 10.8 394 DriftChamberPhysical eIoni + 6 -0.108 -340 566 1e+03 0.00813 267 661 DriftChamberPhysical msc + 7 -0.179 -477 795 1e+03 0.00732 267 927 DriftChamberPhysical msc + 8 -0.202 -540 900 1e+03 0.00451 122 1.05e+03 WorldPhysical CoupledTransportation + 9 -0.203 -553 922 863 0.00757 25.9 1.08e+03 WorldPhysical eBrem + 10 -0.204 -559 931 863 0.00284 10 1.09e+03 WorldPhysical eIoni + 11 -0.211 -574 956 863 0.00561 29.2 1.11e+03 WorldPhysical eIoni + 12 -0.217 -600 1e+03 863 0.0107 51.5 1.17e+03 Crystal CoupledTransportation +ExN05EMShowerModel::DoIt + 13 -0.217 -600 1e+03 0 863 0 1.17e+03 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 7, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.211 -574 956 0.00367 0 0 0 WorldPhysical initStep + 1 -0.223 -574 956 0.00274 0.000932 0.013 0.013 WorldPhysical msc + 2 -0.409 -574 956 0 0.00274 0.259 0.272 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 6, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.204 -559 931 0.0271 0 0 0 WorldPhysical initStep + 1 0.114 -559 931 0.0262 0.00088 0.468 0.468 WorldPhysical msc + 2 1.49 -561 932 0.0186 0.0047 3.24 3.71 WorldPhysical eIoni + 3 2.37 -563 933 0.0127 0.00587 3.06 6.76 WorldPhysical eIoni + 4 1.41 -565 932 0.00792 0.00477 2.16 8.93 WorldPhysical eIoni + 5 1.87 -565 933 0.00056 0.00736 1.44 10.4 WorldPhysical eIoni + 6 1.87 -565 933 0 0.00056 0.0292 10.4 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 8, Parent ID = 6 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 1.49 -561 932 0.00298 0 0 0 WorldPhysical initStep + 1 1.49 -561 932 0.00293 5.15e-05 0.00905 0.00905 WorldPhysical msc + 2 1.41 -561 932 0 0.00293 0.289 0.298 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.203 -553 922 137 0 0 0 WorldPhysical initStep + 1 -0.176 -600 1e+03 137 0 90.8 90.8 Crystal CoupledTransportation +ExN05EMShowerModel::DoIt + 2 -0.176 -600 1e+03 0 137 0 90.8 Crystal G4FSMP_massGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0549 -203 338 0.00829 0 0 0 DriftChamberPhysical initStep + 1 1.74 -205 336 0.00649 0.00181 3.69 3.69 DriftChamberPhysical eIoni + 2 2.56 -207 334 0.00336 0.00313 2.86 6.55 DriftChamberPhysical eIoni + 3 2.03 -208 333 0.0017 0.00166 1.65 8.2 DriftChamberPhysical eIoni + 4 1.66 -209 333 0 0.0017 0.681 8.88 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.00738 -51.3 85.5 0.00977 0 0 0 WorldPhysical initStep + 1 -0.0717 -51.4 85.5 0.00956 0.000206 0.0754 0.0754 WorldPhysical msc + 2 -0.387 -51.7 84.9 0.00551 0.00201 0.964 1.04 WorldPhysical eIoni + 3 -0.578 -51.8 84.5 0.0021 0.00195 0.522 1.56 WorldPhysical eIoni + 4 -0.59 -51.8 84.5 0 0.0021 0.169 1.73 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 10, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.578 -51.8 84.5 0.00145 0 0 0 WorldPhysical initStep + 1 -0.577 -51.8 84.5 0.00145 0 0.00264 0.00264 WorldPhysical msc + 2 -0.571 -51.8 84.5 0 0.00145 0.0975 0.1 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 9, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.387 -51.7 84.9 0.00205 0 0 0 WorldPhysical initStep + 1 -0.387 -51.7 84.9 0.00205 0 0.00479 0.00479 WorldPhysical msc + 2 -0.381 -51.7 84.8 0 0.00205 0.162 0.167 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 1.16e-05 -0.543 0.904 0.0478 0 0 0 WorldPhysical initStep + 1 -0.212 0.236 1.89 0.0472 0.0006 1.3 1.3 WorldPhysical msc + 2 -0.475 0.933 2.94 0.0465 0.000679 1.3 2.59 WorldPhysical msc + 3 -0.925 1.35 4.08 0.046 0.000502 1.3 3.89 WorldPhysical msc + 4 -1.37 1.81 5.21 0.0454 0.000592 1.3 5.18 WorldPhysical msc + 5 -1.79 1.87 6.39 0.0447 0.000681 1.3 6.48 WorldPhysical msc + 6 -1.87 2.05 7.65 0.0428 0.00187 1.3 7.78 WorldPhysical msc + 7 -2.02 2.37 8.89 0.0421 0.00071 1.3 9.07 WorldPhysical msc + 8 -1.92 2.63 10.2 0.0413 0.000823 1.3 10.4 WorldPhysical msc + 9 -1.89 3.32 11.2 0.0394 0.00188 1.3 11.7 WorldPhysical msc + 10 -1.83 3.83 12.4 0.0385 0.000912 1.3 13 WorldPhysical msc + 11 -2.24 4.74 13.2 0.0376 0.000863 1.3 14.3 WorldPhysical msc + 12 -2.37 5.39 14.3 0.0372 0.000415 1.3 15.6 WorldPhysical msc + 13 -2.38 5.46 14.4 0.0321 3.56e-05 0.152 15.7 WorldPhysical eIoni + 14 -1.96 5.71 15.6 0.0309 0.00121 1.3 17 WorldPhysical msc + 15 -0.84 6.01 16.2 0.03 0.00094 1.3 18.3 WorldPhysical msc + 16 -0.247 6.44 17.1 0.0283 0.00167 1.3 19.6 WorldPhysical msc + 17 0.439 6.96 17.6 0.0264 0.000677 0.993 20.6 WorldPhysical eIoni + 18 3.51 5.55 20.6 0.0202 0.00624 4.52 25.1 WorldPhysical eIoni + 19 3.54 5.52 20.5 0.0185 0 0.0468 25.2 WorldPhysical eIoni + 20 5.71 3.73 21.5 0.0128 0.0057 3.05 28.2 WorldPhysical eIoni + 21 3.8 3.4 22.4 0.00889 0.00395 2.19 30.4 WorldPhysical eIoni + 22 3.34 2.56 21.5 0.0037 0.00519 1.61 32 WorldPhysical eIoni + 23 3.43 2.48 21.5 0 0.0037 0.429 32.4 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 13, Parent ID = 2 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 3.54 5.52 20.5 0.00165 0 0 0 WorldPhysical initStep + 1 3.53 5.52 20.5 0.0016 5.3e-05 0.00331 0.00331 WorldPhysical msc + 2 3.51 5.51 20.5 0 0.0016 0.111 0.115 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 12, Parent ID = 2 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.439 6.96 17.6 0.00118 0 0 0 WorldPhysical initStep + 1 0.44 6.96 17.6 0.00112 6.08e-05 0.00185 0.00185 WorldPhysical msc + 2 0.443 6.97 17.6 0 0.00112 0.0674 0.0692 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 11, Parent ID = 2 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -2.38 5.46 14.4 0.00509 0 0 0 WorldPhysical initStep + 1 -2.4 5.47 14.4 0.00507 1.72e-05 0.0236 0.0236 WorldPhysical msc + 2 -2.79 5.51 14.6 0 0.00507 0.738 0.762 WorldPhysical eIoni +>>> Event 4 + 12 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.9998213647422369 (GeV) + 0 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +number of event = 5 +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +### Run 4 start. +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 -0.00202 17.3 28.9 1e+03 0.00577 33.7 33.7 WorldPhysical hIoni + 2 -0.0143 52.4 87.3 1e+03 0.00968 68.1 102 WorldPhysical hIoni + 3 -0.0191 57.7 96.2 1e+03 0.00127 10.3 112 WorldPhysical hIoni + 4 -0.0217 60 100 1e+03 0.000492 4.47 117 DriftChamberPhysical CoupledTransportation + 5 -0.0996 122 203 1e+03 0.00292 120 237 DriftChamberPhysical hIoni + 6 -0.261 259 432 1e+03 0.00554 267 504 DriftChamberPhysical msc + 7 -0.418 396 660 1e+03 0.00608 267 770 DriftChamberPhysical msc + 8 -0.563 533 889 1e+03 0.00617 267 1.04e+03 DriftChamberPhysical msc + 9 -0.57 540 900 1e+03 0.000246 12.7 1.05e+03 WorldPhysical CoupledTransportation + 10 -0.58 552 920 1e+03 0.00418 23 1.07e+03 WorldPhysical hIoni + 11 -0.616 587 979 1e+03 0.0102 69.4 1.14e+03 WorldPhysical hIoni + 12 -0.622 597 995 1e+03 0.00388 18.3 1.16e+03 WorldPhysical hIoni + 13 -0.624 600 1e+03 1e+03 0.000587 5.86 1.17e+03 Crystal CoupledTransportation + 14 -0.624 600 1e+03 1e+03 0.0858 0.216 1.17e+03 Crystal msc + 15 -0.623 600 1e+03 1e+03 0.0912 0.216 1.17e+03 Crystal msc + 16 -0.624 600 1e+03 1e+03 0.113 0.216 1.17e+03 Crystal msc + 17 -0.624 600 1e+03 1e+03 0.0414 0.11 1.17e+03 Crystal CoupledTransportation + 18 -0.636 601 1e+03 997 1.6 2.59 1.17e+03 Crystal hIoni + 19 -0.477 607 1.01e+03 987 6.56 12.3 1.18e+03 Crystal hIoni + 20 -0.477 610 1.02e+03 980 3.29 5.98 1.19e+03 Crystal hIoni + 21 -0.112 620 1.03e+03 970 9.52 18.8 1.21e+03 Crystal hIoni + 22 -5.88e-16 622 1.04e+03 967 2.36 3.92 1.21e+03 Crystal CoupledTransportation + 23 0.759 630 1.05e+03 958 9.11 16.4 1.23e+03 Crystal msc + 24 1.3 638 1.07e+03 950 7.89 16.4 1.24e+03 Crystal msc + 25 1.94 647 1.08e+03 941 9.25 16.4 1.26e+03 Crystal msc + 26 2.07 650 1.09e+03 938 2.93 6.37 1.27e+03 Crystal CoupledTransportation + 27 3.05 665 1.11e+03 923 15.5 29.2 1.3e+03 Crystal msc + 28 3.27 670 1.12e+03 915 6.33 11.5 1.31e+03 Crystal hIoni + 29 3.89 681 1.14e+03 904 10.5 20.8 1.33e+03 Crystal hIoni + 30 3.9 681 1.14e+03 902 0.643 1.01 1.33e+03 Crystal hIoni + 31 3.94 683 1.14e+03 898 2.05 4.3 1.33e+03 Crystal hIoni + 32 4.49 698 1.17e+03 883 15.6 29.2 1.36e+03 Crystal msc + 33 4.48 698 1.17e+03 880 0.788 1.4 1.36e+03 Crystal hIoni + 34 4.43 700 1.17e+03 879 1.65 3.36 1.37e+03 Crystal CoupledTransportation + 35 4.02 710 1.19e+03 869 9.18 20.3 1.39e+03 Crystal hIoni + 36 3.94 714 1.2e+03 846 4.19 7.62 1.39e+03 Crystal hIoni + 37 3.76 719 1.21e+03 840 5.18 10.3 1.4e+03 Crystal hIoni + 38 3.75 720 1.21e+03 819 0.391 0.606 1.41e+03 Crystal hIoni + 39 3.3 733 1.23e+03 805 12.5 24.5 1.43e+03 Crystal hIoni + 40 2.9 747 1.25e+03 791 13.9 28.7 1.46e+03 Crystal msc + 41 2.67 750 1.26e+03 789 2.34 5.46 1.46e+03 Crystal CoupledTransportation + 42 2.15 756 1.27e+03 781 5.91 11.1 1.48e+03 Crystal hIoni + 43 1.61 764 1.28e+03 773 8.37 17.4 1.49e+03 Crystal msc + 44 1.6 765 1.28e+03 772 0.103 0.262 1.49e+03 Crystal hIoni + 45 1.35 773 1.3e+03 764 8.49 17.4 1.51e+03 Crystal msc + 46 1.01 782 1.31e+03 753 10.4 17.4 1.53e+03 Crystal msc + 47 0.607 791 1.33e+03 744 9.28 17.4 1.55e+03 Crystal msc + 48 0.0269 799 1.34e+03 735 9.41 17.4 1.56e+03 Crystal msc + 49 -4.37e-16 800 1.34e+03 734 0.657 0.934 1.56e+03 Crystal CoupledTransportation + 50 -0.0077 800 1.34e+03 734 0.105 0.271 1.56e+03 Crystal msc + 51 -0.0154 800 1.34e+03 734 0.0911 0.271 1.56e+03 Crystal msc + 52 -0.0234 800 1.34e+03 734 0.112 0.271 1.56e+03 Crystal msc + 53 -0.0276 800 1.34e+03 734 0.0523 0.134 1.56e+03 Crystal CoupledTransportation + 54 -0.794 808 1.36e+03 725 8.76 18.1 1.58e+03 Crystal msc + 55 -1.57 817 1.38e+03 716 8.87 18.1 1.6e+03 Crystal msc + 56 -2.06 820 1.38e+03 711 3.36 7.35 1.61e+03 Crystal hIoni + 57 -3.61 829 1.4e+03 702 9.42 18.1 1.63e+03 Crystal msc + 58 -3.83 829 1.4e+03 699 0.774 1.68 1.63e+03 Crystal hIoni + 59 -3.83 830 1.4e+03 699 0.00723 0.0305 1.63e+03 WorldPhysical CoupledTransportation + 60 -18 884 1.5e+03 699 0.0171 115 1.74e+03 HadCaloPhysical CoupledTransportation + 61 -20 892 1.51e+03 699 0.00331 16.4 1.76e+03 HadCaloPhysical msc + 62 -22.1 900 1.53e+03 699 0.00326 16.4 1.78e+03 HadCaloPhysical msc + 63 -24.1 907 1.54e+03 699 0.00309 16.4 1.79e+03 HadCaloPhysical msc + 64 -25.1 911 1.55e+03 699 0.00146 8.2 1.8e+03 Tower CoupledTransportation + 65 -27.7 922 1.57e+03 675 24.7 23.3 1.82e+03 Tower msc + 66 -28.3 935 1.59e+03 648 27.1 23.3 1.85e+03 Tower msc + 67 -30.9 945 1.61e+03 624 23.8 23.3 1.87e+03 Tower msc + 68 -32.3 950 1.62e+03 606 17.7 12.6 1.88e+03 Tower CoupledTransportation + 69 -33.6 954 1.63e+03 582 11.4 10 1.89e+03 Tower hIoni + 70 -39.7 971 1.67e+03 526 41.4 38.9 1.93e+03 Tower hIoni + 71 -48 984 1.7e+03 485 40.4 39.9 1.97e+03 Tower msc + 72 -50 988 1.71e+03 463 21.7 10.9 1.98e+03 Tower CoupledTransportation + 73 -61.7 1.01e+03 1.76e+03 410 53.1 50.1 2.03e+03 Tower msc + 74 -72.9 1.02e+03 1.8e+03 356 54.8 50.1 2.08e+03 Tower msc + 75 -77.1 1.04e+03 1.85e+03 304 51.5 50.1 2.13e+03 Tower msc + 76 -81.5 1.05e+03 1.89e+03 251 52.8 44.9 2.18e+03 Tower hIoni + 77 -81.5 1.05e+03 1.89e+03 251 0.265 0.17 2.18e+03 Tower CoupledTransportation + 78 -88.1 1.06e+03 1.93e+03 213 38.3 35.8 2.21e+03 Tower hIoni + 79 -94.7 1.07e+03 1.95e+03 177 35.2 29.3 2.24e+03 Tower hIoni + 80 -98.8 1.07e+03 1.98e+03 147 30.6 23.5 2.27e+03 Tower hIoni + 81 -102 1.08e+03 2e+03 124 22.8 18.5 2.28e+03 Tower hIoni + 82 -105 1.08e+03 2.01e+03 105 18.7 14.9 2.3e+03 Tower hIoni + 83 -108 1.08e+03 2.02e+03 88.7 16.7 12.2 2.31e+03 Tower hIoni + 84 -110 1.08e+03 2.03e+03 72.8 15.9 9.79 2.32e+03 Tower hIoni + 85 -111 1.08e+03 2.04e+03 60.9 11.9 7.65 2.33e+03 Tower hIoni + 86 -111 1.09e+03 2.04e+03 49.7 11.2 6.16 2.34e+03 Tower hIoni + 87 -111 1.09e+03 2.05e+03 45 4.66 2.69 2.34e+03 Tower hIoni + 88 -111 1.09e+03 2.05e+03 37.2 7.87 4.39 2.34e+03 Tower hIoni + 89 -111 1.09e+03 2.05e+03 28.1 9.08 3.59 2.35e+03 Tower hIoni + 90 -111 1.09e+03 2.06e+03 19.3 8.78 2.77 2.35e+03 Tower hIoni + 91 -111 1.09e+03 2.06e+03 11.3 8.03 2.05 2.35e+03 Tower hIoni + 92 -111 1.09e+03 2.06e+03 2.34 8.94 1.27 2.35e+03 Tower hIoni + 93 -111 1.09e+03 2.06e+03 0 2.34 0.0853 2.35e+03 Tower hIoni + 94 -111 1.09e+03 2.06e+03 0 0 0 2.35e+03 Tower Decay + +********************************************************************************************************* +* G4Track Information: Particle = mu-, Track ID = 30, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -111 1.09e+03 2.06e+03 4.12 0 0 0 Tower initStep + 1 -111 1.09e+03 2.06e+03 0 4.12 0.28 0.28 Tower muIoni + 2 -111 1.09e+03 2.06e+03 0 0 0 0.28 Tower Decay + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 33, Parent ID = 30 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -111 1.09e+03 2.06e+03 34.1 0 0 0 Tower initStep + 1 -111 1.09e+03 2.06e+03 24.1 2.91 2.37 2.37 Tower eBrem + 2 -111 1.09e+03 2.06e+03 21.2 2.8 2.54 4.91 Tower eBrem + 3 -111 1.09e+03 2.06e+03 16.3 0.854 0.719 5.63 Tower eBrem + 4 -111 1.09e+03 2.06e+03 15.9 0.105 0.128 5.75 Tower eBrem + 5 -111 1.09e+03 2.06e+03 15 0.202 0.215 5.97 Tower eBrem + 6 -111 1.09e+03 2.06e+03 14.2 0.696 0.633 6.6 Tower eBrem + 7 -112 1.09e+03 2.06e+03 9.16 4.34 3.3 9.91 Tower eBrem + 8 -110 1.1e+03 2.06e+03 4.62 4.53 3.13 13 Tower eIoni + 9 -111 1.1e+03 2.06e+03 3.34 0.605 0.607 13.6 Tower eBrem + 10 -111 1.1e+03 2.06e+03 2.2 1.02 0.623 14.3 Tower eBrem + 11 -111 1.1e+03 2.06e+03 1.62 0.47 0.531 14.8 Tower eBrem + 12 -111 1.1e+03 2.06e+03 0.322 1.3 1.3 16.1 Tower eIoni + 13 -111 1.1e+03 2.06e+03 0 0.322 0.172 16.3 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 43, Parent ID = 33 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -111 1.1e+03 2.06e+03 0.113 0 0 0 Tower initStep + 1 -117 1.1e+03 2.06e+03 0.11 0 6.26 6.26 Tower compt + 2 -120 1.09e+03 2.06e+03 0.0908 0 3.94 10.2 Tower compt + 3 -119 1.09e+03 2.06e+03 0 0.00711 1.19 11.4 Tower phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 46, Parent ID = 43 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -119 1.09e+03 2.06e+03 0.0837 0 0 0 Tower initStep + 1 -119 1.09e+03 2.06e+03 0 0.0837 0.0203 0.0203 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 45, Parent ID = 43 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -120 1.09e+03 2.06e+03 0.0189 0 0 0 Tower initStep + 1 -120 1.09e+03 2.06e+03 0 0.0189 0.00162 0.00162 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 44, Parent ID = 43 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -117 1.1e+03 2.06e+03 0.00307 0 0 0 Tower initStep + 1 -117 1.1e+03 2.06e+03 0 0.00307 8.76e-05 8.76e-05 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 42, Parent ID = 33 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -111 1.1e+03 2.06e+03 0.111 0 0 0 Tower initStep + 1 -116 1.1e+03 2.05e+03 0 0.00711 8.83 8.83 Tower phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 47, Parent ID = 42 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -116 1.1e+03 2.05e+03 0.104 0 0 0 Tower initStep + 1 -116 1.1e+03 2.05e+03 0 0.104 0.0291 0.0291 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 41, Parent ID = 33 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -111 1.1e+03 2.06e+03 0.683 0 0 0 Tower initStep + 1 -114 1.1e+03 2.06e+03 0.572 0 3.92 3.92 Tower compt + 2 -121 1.09e+03 2.06e+03 0.525 0 7.56 11.5 Tower compt + 3 -128 1.09e+03 2.06e+03 0.234 0 10.3 21.8 Tower compt + 4 -126 1.09e+03 2.05e+03 0.231 0 6.71 28.5 Tower compt + 5 -123 1.09e+03 2.05e+03 0 0.00711 4.53 33 Tower phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 52, Parent ID = 41 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -123 1.09e+03 2.05e+03 0.224 0 0 0 Tower initStep + 1 -123 1.09e+03 2.05e+03 0 0.224 0.0999 0.0999 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 51, Parent ID = 41 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -126 1.09e+03 2.05e+03 0.00264 0 0 0 Tower initStep + 1 -126 1.09e+03 2.05e+03 0 0.00264 7.06e-05 7.06e-05 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 50, Parent ID = 41 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -128 1.09e+03 2.06e+03 0.29 0 0 0 Tower initStep + 1 -128 1.09e+03 2.06e+03 0 0.29 0.148 0.148 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 49, Parent ID = 41 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -121 1.09e+03 2.06e+03 0.0473 0 0 0 Tower initStep + 1 -121 1.09e+03 2.06e+03 0 0.0473 0.00772 0.00772 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 48, Parent ID = 41 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -114 1.1e+03 2.06e+03 0.111 0 0 0 Tower initStep + 1 -114 1.1e+03 2.06e+03 0 0.111 0.0325 0.0325 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 40, Parent ID = 33 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -112 1.09e+03 2.06e+03 0.674 0 0 0 Tower initStep + 1 -111 1.11e+03 2.07e+03 0.6 0 16.9 16.9 Tower compt + 2 -101 1.13e+03 2.08e+03 0.556 0 24.5 41.4 Tower compt + 3 -101 1.13e+03 2.08e+03 0.227 0 1.07 42.5 Tower compt + 4 -101 1.11e+03 2.09e+03 0.135 0 20.6 63.1 Tower compt + 5 -111 1.12e+03 2.09e+03 0 0.00711 13.4 76.5 Tower phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 57, Parent ID = 40 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -111 1.12e+03 2.09e+03 0.128 0 0 0 Tower initStep + 1 -111 1.12e+03 2.09e+03 0 0.128 0.0407 0.0407 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 56, Parent ID = 40 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -101 1.11e+03 2.09e+03 0.0923 0 0 0 Tower initStep + 1 -101 1.11e+03 2.09e+03 0 0.0923 0.0239 0.0239 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 55, Parent ID = 40 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -101 1.13e+03 2.08e+03 0.329 0 0 0 Tower initStep + 1 -101 1.13e+03 2.08e+03 0 0.329 0.177 0.177 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 54, Parent ID = 40 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -101 1.13e+03 2.08e+03 0.0439 0 0 0 Tower initStep + 1 -101 1.13e+03 2.08e+03 0 0.0439 0.00682 0.00682 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 53, Parent ID = 40 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -111 1.11e+03 2.07e+03 0.0742 0 0 0 Tower initStep + 1 -111 1.11e+03 2.07e+03 0 0.0742 0.0166 0.0166 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 39, Parent ID = 33 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -111 1.09e+03 2.06e+03 0.092 0 0 0 Tower initStep + 1 -112 1.1e+03 2.06e+03 0 0.00711 6.46 6.46 Tower phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 58, Parent ID = 39 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -112 1.1e+03 2.06e+03 0.0849 0 0 0 Tower initStep + 1 -112 1.1e+03 2.06e+03 0 0.0849 0.0208 0.0208 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 38, Parent ID = 33 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -111 1.09e+03 2.06e+03 0.749 0 0 0 Tower initStep + 1 -112 1.1e+03 2.06e+03 0.218 0 9.89 9.89 Tower compt + 2 -102 1.08e+03 2.07e+03 0.119 0 19.5 29.4 Tower compt + 3 -103 1.08e+03 2.07e+03 0 0.00711 0.72 30.1 Tower phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 61, Parent ID = 38 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -103 1.08e+03 2.07e+03 0.112 0 0 0 Tower initStep + 1 -103 1.08e+03 2.07e+03 0 0.112 0.0328 0.0328 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 60, Parent ID = 38 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -102 1.08e+03 2.07e+03 0.099 0 0 0 Tower initStep + 1 -102 1.08e+03 2.07e+03 0 0.099 0.0267 0.0267 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 59, Parent ID = 38 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -112 1.1e+03 2.06e+03 0.531 0 0 0 Tower initStep + 1 -112 1.1e+03 2.06e+03 0 0.531 0.348 0.348 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 37, Parent ID = 33 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -111 1.09e+03 2.06e+03 0.309 0 0 0 Tower initStep + 1 -110 1.1e+03 2.06e+03 0 0.00711 6.28 6.28 Tower phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 62, Parent ID = 37 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -110 1.1e+03 2.06e+03 0.302 0 0 0 Tower initStep + 1 -110 1.1e+03 2.06e+03 0 0.302 0.156 0.156 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 36, Parent ID = 33 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -111 1.09e+03 2.06e+03 3.99 0 0 0 Tower initStep + 1 -94.8 1.15e+03 2.09e+03 3.99 0 68.1 68.1 HadCaloPhysical CoupledTransportation + 2 -66.5 1.25e+03 2.14e+03 3.99 0 117 185 WorldPhysical CoupledTransportation + 3 -52.4 1.3e+03 2.17e+03 3.99 0 3.22e+03 3.41e+03 WorldPhysical CoupledTransportation + 4 711 4e+03 3.64e+03 3.99 0 3.17e+03 6.58e+03 OutOfWorld CoupledTransportation + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 35, Parent ID = 33 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -111 1.09e+03 2.06e+03 0.114 0 0 0 Tower initStep + 1 -110 1.1e+03 2.06e+03 0.103 0 9.36 9.36 Tower compt + 2 -109 1.1e+03 2.06e+03 0.101 0 1.58 10.9 Tower compt + 3 -108 1.1e+03 2.06e+03 0 0.00711 0.209 11.1 Tower phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 65, Parent ID = 35 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -108 1.1e+03 2.06e+03 0.094 0 0 0 Tower initStep + 1 -108 1.1e+03 2.06e+03 0 0.094 0.0246 0.0246 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 64, Parent ID = 35 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -109 1.1e+03 2.06e+03 0.00153 0 0 0 Tower initStep + 1 -109 1.1e+03 2.06e+03 0 0.00153 3.27e-05 3.27e-05 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 63, Parent ID = 35 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -110 1.1e+03 2.06e+03 0.0117 0 0 0 Tower initStep + 1 -110 1.1e+03 2.06e+03 0 0.0117 0.000723 0.000723 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 34, Parent ID = 33 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -111 1.09e+03 2.06e+03 7.1 0 0 0 Tower initStep + 1 -115 1.15e+03 2.03e+03 7.1 0 66.6 66.6 HadCaloPhysical CoupledTransportation + 2 -122 1.25e+03 1.99e+03 7.1 0 109 176 WorldPhysical CoupledTransportation + 3 -125 1.3e+03 1.97e+03 7.1 0 3e+03 3.17e+03 WorldPhysical CoupledTransportation + 4 -305 4e+03 817 7.1 0 2.94e+03 6.11e+03 OutOfWorld CoupledTransportation + +********************************************************************************************************* +* G4Track Information: Particle = anti_nu_e, Track ID = 32, Parent ID = 30 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -111 1.09e+03 2.06e+03 34.7 0 0 0 Tower initStep + 1 -50 1.08e+03 2.13e+03 34.7 0 92.8 92.8 Tower CoupledTransportation + 2 50 1.08e+03 2.25e+03 34.7 0 153 246 Tower CoupledTransportation + 3 150 1.08e+03 2.36e+03 34.7 0 153 398 Tower CoupledTransportation + 4 226 1.07e+03 2.45e+03 34.7 0 117 515 HadCaloPhysical CoupledTransportation + 5 270 1.07e+03 2.5e+03 34.7 0 66.2 581 WorldPhysical CoupledTransportation + 6 313 1.07e+03 2.55e+03 34.7 0 1.99e+03 2.57e+03 WorldPhysical CoupledTransportation + 7 1.57e+03 1.02e+03 4e+03 34.7 0 1.92e+03 4.49e+03 OutOfWorld CoupledTransportation + +********************************************************************************************************* +* G4Track Information: Particle = nu_mu, Track ID = 31, Parent ID = 30 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -111 1.09e+03 2.06e+03 35.8 0 0 0 Tower initStep + 1 -138 1.05e+03 2.05e+03 35.8 0 47.1 47.1 Tower CoupledTransportation + 2 -150 1.03e+03 2.04e+03 35.8 0 21.7 68.8 Tower CoupledTransportation + 3 -210 950 2.02e+03 35.8 0 106 174 Tower CoupledTransportation + 4 -250 895 2e+03 35.8 0 69.6 244 Tower CoupledTransportation + 5 -283 850 1.99e+03 35.8 0 57.6 302 Tower CoupledTransportation + 6 -350 758 1.96e+03 35.8 0 117 419 Tower CoupledTransportation + 7 -356 750 1.96e+03 35.8 0 9.72 429 Tower CoupledTransportation + 8 -428 650 1.93e+03 35.8 0 127 556 Tower CoupledTransportation + 9 -450 620 1.92e+03 35.8 0 38.2 594 Tower CoupledTransportation + 10 -501 550 1.9e+03 35.8 0 89 683 Tower CoupledTransportation + 11 -550 482 1.88e+03 35.8 0 86.1 769 Tower CoupledTransportation + 12 -573 450 1.87e+03 35.8 0 41.1 810 Tower CoupledTransportation + 13 -646 350 1.84e+03 35.8 0 127 938 Tower CoupledTransportation + 14 -650 345 1.84e+03 35.8 0 6.77 944 Tower CoupledTransportation + 15 -719 250 1.81e+03 35.8 0 120 1.06e+03 Tower CoupledTransportation + 16 -750 207 1.8e+03 35.8 0 54.7 1.12e+03 Tower CoupledTransportation + 17 -791 150 1.78e+03 35.8 0 72.5 1.19e+03 Tower CoupledTransportation + 18 -850 69.4 1.75e+03 35.8 0 103 1.29e+03 Tower CoupledTransportation + 19 -864 50 1.75e+03 35.8 0 24.6 1.32e+03 Tower CoupledTransportation + 20 -937 -50 1.72e+03 35.8 0 127 1.45e+03 Tower CoupledTransportation + 21 -950 -68.3 1.71e+03 35.8 0 23.3 1.47e+03 Tower CoupledTransportation + 22 -1.01e+03 -150 1.69e+03 35.8 0 104 1.57e+03 Tower CoupledTransportation + 23 -1.05e+03 -206 1.67e+03 35.8 0 71.2 1.64e+03 Tower CoupledTransportation + 24 -1.08e+03 -250 1.66e+03 35.8 0 56.1 1.7e+03 Tower CoupledTransportation + 25 -1.15e+03 -344 1.63e+03 35.8 0 119 1.82e+03 HadCaloPhysical CoupledTransportation + 26 -1.25e+03 -481 1.59e+03 35.8 0 175 2e+03 WorldPhysical CoupledTransportation + 27 -1.3e+03 -550 1.57e+03 35.8 0 4.48e+03 6.47e+03 WorldPhysical CoupledTransportation + 28 -3.81e+03 -4e+03 528 35.8 0 4.39e+03 1.09e+04 OutOfWorld CoupledTransportation + +********************************************************************************************************* +* G4Track Information: Particle = anti_nu_mu, Track ID = 29, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -111 1.09e+03 2.06e+03 29.8 0 0 0 Tower initStep + 1 -150 1.07e+03 2.15e+03 29.8 0 98.8 98.8 Tower CoupledTransportation + 2 -188 1.05e+03 2.23e+03 29.8 0 94.9 194 Tower CoupledTransportation + 3 -250 1.02e+03 2.38e+03 29.8 0 157 351 Tower CoupledTransportation + 4 -283 1e+03 2.45e+03 29.8 0 82.3 433 HadCaloPhysical CoupledTransportation + 5 -305 994 2.5e+03 29.8 0 55.7 489 WorldPhysical CoupledTransportation + 6 -327 983 2.55e+03 29.8 0 1.67e+03 2.16e+03 WorldPhysical CoupledTransportation + 7 -967 675 4e+03 29.8 0 1.61e+03 3.77e+03 OutOfWorld CoupledTransportation + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 28, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -39.7 971 1.67e+03 14.7 0 0 0 Tower initStep + 1 -40.6 971 1.67e+03 12.5 2.15 2.07 2.07 Tower msc + 2 -41.5 973 1.67e+03 10.4 2.1 2.07 4.13 Tower msc + 3 -42.7 973 1.67e+03 8.4 2.02 2.07 6.2 Tower msc + 4 -42.8 973 1.67e+03 8.17 0.152 0.169 6.37 Tower eBrem + 5 -42.8 973 1.67e+03 4.53 1.85 1.53 7.9 Tower eBrem + 6 -43.4 973 1.67e+03 2.5 2.03 2.22 10.1 Tower eIoni + 7 -43.2 971 1.67e+03 1.07 1.43 1.68 11.8 Tower eIoni + 8 -43.2 971 1.67e+03 0 1.07 0.853 12.7 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 67, Parent ID = 28 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -42.8 973 1.67e+03 1.79 0 0 0 Tower initStep + 1 -42.8 978 1.68e+03 0.39 0 12.5 12.5 Tower compt + 2 -50 986 1.68e+03 0.39 0 11.3 23.8 Tower CoupledTransportation + 3 -58.9 996 1.67e+03 0.289 0 13.9 37.7 Tower compt + 4 -88.3 993 1.68e+03 0.143 0 29.7 67.4 Tower compt + 5 -85.8 995 1.68e+03 0.0928 0 3.41 70.8 Tower compt + 6 -87.1 995 1.68e+03 0.0801 0 1.34 72.2 Tower compt + 7 -87 993 1.68e+03 0.0726 0 1.46 73.6 Tower compt + 8 -86.4 993 1.67e+03 0 0.00711 2.07 75.7 Tower phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 74, Parent ID = 67 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -86.4 993 1.67e+03 0.0655 0 0 0 Tower initStep + 1 -86.4 993 1.67e+03 0 0.0655 0.0134 0.0134 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 73, Parent ID = 67 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -87 993 1.68e+03 0.00751 0 0 0 Tower initStep + 1 -87 993 1.68e+03 0 0.00751 0.000351 0.000351 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 72, Parent ID = 67 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -87.1 995 1.68e+03 0.0127 0 0 0 Tower initStep + 1 -87.1 995 1.68e+03 0 0.0127 0.000829 0.000829 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 71, Parent ID = 67 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -85.8 995 1.68e+03 0.0499 0 0 0 Tower initStep + 1 -85.8 995 1.68e+03 0 0.0499 0.00843 0.00843 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 70, Parent ID = 67 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -88.3 993 1.68e+03 0.146 0 0 0 Tower initStep + 1 -88.3 993 1.68e+03 0 0.146 0.051 0.051 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 69, Parent ID = 67 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -58.9 996 1.67e+03 0.101 0 0 0 Tower initStep + 1 -58.9 996 1.67e+03 0 0.101 0.0276 0.0276 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 68, Parent ID = 67 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -42.8 978 1.68e+03 1.4 0 0 0 Tower initStep + 1 -42.8 978 1.68e+03 0 1.4 1.15 1.15 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 66, Parent ID = 28 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -42.8 973 1.67e+03 0.0796 0 0 0 Tower initStep + 1 -43.2 974 1.67e+03 0 0.00711 3.5 3.5 Tower phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 75, Parent ID = 66 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -43.2 974 1.67e+03 0.0725 0 0 0 Tower initStep + 1 -43.2 974 1.67e+03 0 0.0725 0.0159 0.0159 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 27, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -33.6 954 1.63e+03 13.2 0 0 0 Tower initStep + 1 -33.6 954 1.63e+03 11.6 1.59 0.858 0.858 Tower msc + 2 -33.7 955 1.63e+03 10.7 0.923 0.858 1.72 Tower msc + 3 -33.7 955 1.63e+03 10.1 0.109 0.129 1.84 Tower eBrem + 4 -33.8 955 1.63e+03 9.31 0.773 0.858 2.7 Tower msc + 5 -34 956 1.63e+03 8.55 0.759 0.858 3.56 Tower msc + 6 -33.9 956 1.64e+03 7.82 0.731 0.858 4.42 Tower msc + 7 -33.6 956 1.64e+03 6.84 0.978 0.858 5.27 Tower msc + 8 -33.3 957 1.64e+03 6.16 0.587 0.612 5.89 Tower eBrem + 9 -31.6 957 1.64e+03 4.33 1.83 2.01 7.89 Tower eBrem + 10 -30.3 956 1.64e+03 2.2 2.13 2.17 10.1 Tower eIoni + 11 -30.3 956 1.64e+03 0.677 1.35 1.39 11.5 Tower eBrem + 12 -30.3 956 1.64e+03 0 0.677 0.481 11.9 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 78, Parent ID = 27 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -30.3 956 1.64e+03 0.177 0 0 0 Tower initStep + 1 -34.4 950 1.63e+03 0.177 0 7.11 7.11 Tower CoupledTransportation + 2 -37.1 946 1.63e+03 0.171 0 4.61 11.7 Tower compt + 3 -37.6 946 1.63e+03 0.12 0 0.526 12.3 Tower compt + 4 -35.1 942 1.64e+03 0 0.00711 8.25 20.5 Tower phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 81, Parent ID = 78 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -35.1 942 1.64e+03 0.113 0 0 0 Tower initStep + 1 -35.1 942 1.64e+03 0 0.113 0.0334 0.0334 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 80, Parent ID = 78 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -37.6 946 1.63e+03 0.0509 0 0 0 Tower initStep + 1 -37.6 946 1.63e+03 0 0.0509 0.00873 0.00873 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 79, Parent ID = 78 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -37.1 946 1.63e+03 0.00567 0 0 0 Tower initStep + 1 -37.1 946 1.63e+03 0 0.00567 0.000225 0.000225 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 77, Parent ID = 27 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -33.3 957 1.64e+03 0.0965 0 0 0 Tower initStep + 1 -32.9 957 1.64e+03 0 0.00711 0.848 0.848 Tower phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 82, Parent ID = 77 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -32.9 957 1.64e+03 0.0894 0 0 0 Tower initStep + 1 -32.9 957 1.64e+03 0 0.0894 0.0227 0.0227 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 76, Parent ID = 27 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -33.7 955 1.63e+03 0.483 0 0 0 Tower initStep + 1 -37.9 958 1.64e+03 0.284 0 12.1 12.1 Tower compt + 2 -39.6 963 1.64e+03 0.18 0 5.09 17.2 Tower compt + 3 -39.5 963 1.64e+03 0.178 0 0.145 17.3 Tower compt + 4 -28.1 963 1.65e+03 0.113 0 15.8 33.1 Tower compt + 5 -29.7 962 1.65e+03 0.107 0 1.87 35 Tower compt + 6 -46.4 965 1.65e+03 0.104 0 17 52 Tower compt + 7 -49.4 966 1.66e+03 0 0.00711 3.52 55.5 Tower phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 89, Parent ID = 76 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -49.4 966 1.66e+03 0.0971 0 0 0 Tower initStep + 1 -49.4 966 1.66e+03 0 0.0971 0.0259 0.0259 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 88, Parent ID = 76 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -46.4 965 1.65e+03 0.00251 0 0 0 Tower initStep + 1 -46.4 965 1.65e+03 0 0.00251 6.54e-05 6.54e-05 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 87, Parent ID = 76 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -29.7 962 1.65e+03 0.00651 0 0 0 Tower initStep + 1 -29.7 962 1.65e+03 0 0.00651 0.000279 0.000279 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 86, Parent ID = 76 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -28.1 963 1.65e+03 0.0648 0 0 0 Tower initStep + 1 -28.1 963 1.65e+03 0 0.0648 0.0132 0.0132 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 85, Parent ID = 76 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -39.5 963 1.64e+03 0.00188 0 0 0 Tower initStep + 1 -39.5 963 1.64e+03 0 0.00188 4.37e-05 4.37e-05 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 84, Parent ID = 76 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -39.6 963 1.64e+03 0.104 0 0 0 Tower initStep + 1 -39.6 963 1.64e+03 0 0.104 0.0293 0.0293 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 83, Parent ID = 76 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -37.9 958 1.64e+03 0.198 0 0 0 Tower initStep + 1 -37.9 958 1.64e+03 0 0.198 0.0822 0.0822 Tower eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 26, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -3.83 829 1.4e+03 1.4 0 0 0 Crystal initStep + 1 -3.82 829 1.4e+03 1.4 0.00607 0.0162 0.0162 Crystal msc + 2 -3.82 830 1.4e+03 1.39 0.00737 0.0118 0.028 WorldPhysical CoupledTransportation + 3 4.12 831 1.42e+03 1.39 0.00291 17 17.1 WorldPhysical eIoni + 4 11.8 833 1.43e+03 1.38 0.00205 17.7 34.8 WorldPhysical eIoni + 5 42.8 829 1.5e+03 1.37 0.012 76.2 111 HadCaloPhysical CoupledTransportation + 6 47.6 827 1.51e+03 1.37 0.00317 15.2 126 HadCaloPhysical msc + 7 51.9 825 1.53e+03 1.37 0.00271 15.2 141 HadCaloPhysical msc + 8 56.3 823 1.54e+03 1.36 0.00152 15.2 157 HadCaloPhysical msc + 9 58.1 822 1.55e+03 1.36 0.000653 7.21 164 Tower CoupledTransportation + 10 58.1 822 1.55e+03 1.35 0.0156 0.0235 164 Tower msc + 11 58.1 822 1.55e+03 1.32 0.0282 0.0235 164 Tower msc + 12 58.1 822 1.55e+03 1.3 0.0195 0.0235 164 Tower msc + 13 58.1 822 1.55e+03 1.28 0.0177 0.0235 164 Tower msc + 14 58.2 822 1.55e+03 1.26 0.0196 0.0235 164 Tower msc + 15 58.2 822 1.55e+03 1.21 0.0512 0.0235 164 Tower msc + 16 58.2 822 1.55e+03 1.2 0.0157 0.0235 164 Tower msc + 17 58.2 822 1.55e+03 1.17 0.024 0.0235 164 Tower msc + 18 58.2 822 1.55e+03 1.16 0.0159 0.0235 164 Tower msc + 19 58.2 822 1.55e+03 1.13 0.0222 0.0235 164 Tower msc + 20 58.2 822 1.55e+03 1.11 0.0262 0.0235 164 Tower msc + 21 58.2 822 1.55e+03 1.08 0.0259 0.0235 164 Tower msc + 22 58.2 822 1.55e+03 1.06 0.0174 0.0235 164 Tower msc + 23 58.2 822 1.55e+03 1.03 0.0298 0.0235 164 Tower msc + 24 58.3 822 1.55e+03 1.01 0.0294 0.0235 164 Tower msc + 25 58.3 822 1.55e+03 0.982 0.023 0.0235 164 Tower msc + 26 58.3 822 1.55e+03 0.961 0.0212 0.0235 164 Tower msc + 27 58.3 822 1.55e+03 0.944 0.0164 0.0235 164 Tower msc + 28 58.3 822 1.55e+03 0.925 0.0194 0.0235 164 Tower msc + 29 58.3 822 1.55e+03 0.908 0.0174 0.0235 164 Tower msc + 30 58.4 822 1.55e+03 0.89 0.0172 0.0235 164 Tower msc + 31 58.4 822 1.55e+03 0.859 0.0311 0.0235 164 Tower msc + 32 58.4 822 1.55e+03 0.843 0.0163 0.0235 164 Tower msc + 33 58.4 822 1.55e+03 0.824 0.0193 0.0235 164 Tower msc + 34 58.4 822 1.55e+03 0.799 0.0249 0.0235 164 Tower msc + 35 58.4 822 1.55e+03 0.783 0.0163 0.0235 164 Tower msc + 36 58.4 822 1.55e+03 0.766 0.0168 0.0235 164 Tower msc + 37 58.4 822 1.55e+03 0.749 0.0168 0.0235 164 Tower msc + 38 58.4 822 1.55e+03 0.731 0.0183 0.0235 164 Tower msc + 39 58.4 822 1.55e+03 0.712 0.0185 0.0235 165 Tower msc + 40 58.4 822 1.55e+03 0.697 0.0152 0.0235 165 Tower msc + 41 58.4 822 1.55e+03 0.674 0.0232 0.0235 165 Tower msc + 42 58.4 822 1.55e+03 0.647 0.0267 0.0235 165 Tower msc + 43 58.4 822 1.55e+03 0.627 0.0195 0.0235 165 Tower msc + 44 58.5 822 1.55e+03 0.587 0.0401 0.0235 165 Tower msc + 45 58.4 822 1.55e+03 0.566 0.0213 0.0235 165 Tower msc + 46 58.5 822 1.55e+03 0.543 0.0227 0.0235 165 Tower msc + 47 58.5 822 1.55e+03 0.513 0.0308 0.0235 165 Tower msc + 48 58.5 822 1.55e+03 0.489 0.0238 0.0235 165 Tower msc + 49 58.5 822 1.55e+03 0.472 0.017 0.0235 165 Tower msc + 50 58.5 822 1.55e+03 0.451 0.0208 0.0235 165 Tower msc + 51 58.5 822 1.55e+03 0.428 0.0229 0.0235 165 Tower msc + 52 58.5 822 1.55e+03 0.408 0.0195 0.0235 165 Tower msc + 53 58.5 822 1.55e+03 0.385 0.0231 0.0235 165 Tower msc + 54 58.5 822 1.55e+03 0.364 0.0218 0.0137 165 HadCaloPhysical CoupledTransportation + 55 61.8 825 1.54e+03 0.354 0.0012 10.1 175 HadCaloPhysical eIoni + 56 64.1 830 1.53e+03 0.35 0.00386 16.9 192 HadCaloPhysical msc + 57 65.2 836 1.51e+03 0.346 0.00365 16.9 209 HadCaloPhysical msc + 58 64.7 839 1.5e+03 0.342 0.004 10 219 WorldPhysical CoupledTransportation + 59 68.7 837 1.46e+03 0.337 0.00506 36.8 256 WorldPhysical msc + 60 68.7 839 1.45e+03 0.332 0.00197 8.93 264 WorldPhysical eIoni + 61 70.1 843 1.44e+03 0.326 0.00423 15.5 280 WorldPhysical eIoni + 62 80.2 842 1.41e+03 0.317 0.00852 36.8 317 WorldPhysical msc + 63 80.7 844 1.4e+03 0.317 0.000783 5.96 323 Crystal CoupledTransportation + 64 80.7 844 1.4e+03 0.314 0.00259 0.00714 323 Crystal msc + 65 80.7 844 1.4e+03 0.31 0.00439 0.00714 323 Crystal msc + 66 80.7 844 1.4e+03 0.304 0.00535 0.00714 323 Crystal msc + 67 80.7 844 1.4e+03 0.3 0.0044 0.00714 323 Crystal msc + 68 80.7 844 1.4e+03 0.298 0.00209 0.00714 323 Crystal msc + 69 80.7 844 1.4e+03 0.295 0.00312 0.00714 323 Crystal msc + 70 80.7 844 1.4e+03 0.293 0.00132 0.00714 323 Crystal msc + 71 80.7 844 1.4e+03 0.292 0.00105 0.00714 323 Crystal msc + 72 80.6 844 1.4e+03 0.285 0.00701 0.00714 323 Crystal msc + 73 80.6 844 1.4e+03 0.259 0.0262 0.00714 323 Crystal msc + 74 80.6 844 1.4e+03 0.255 0.00376 0.00714 323 Crystal msc + 75 80.6 844 1.4e+03 0.253 0.0025 0.00714 323 Crystal msc + 76 80.6 844 1.4e+03 0.251 0.00192 0.00714 323 Crystal msc + 77 80.6 844 1.4e+03 0.249 0.00212 0.00714 323 Crystal msc + 78 80.6 844 1.4e+03 0.245 0.00365 0.00714 323 Crystal msc + 79 80.6 844 1.4e+03 0.24 0.0052 0.00714 323 Crystal msc + 80 80.6 844 1.4e+03 0.238 0.00177 0.00714 323 Crystal msc + 81 80.6 844 1.4e+03 0.236 0.00249 0.00714 323 Crystal msc + 82 80.6 844 1.4e+03 0.233 0.0026 0.00714 323 Crystal msc + 83 80.6 844 1.4e+03 0.229 0.00392 0.00714 323 Crystal msc + 84 80.6 844 1.4e+03 0.226 0.00307 0.00714 323 Crystal msc + 85 80.6 844 1.4e+03 0.224 0.00195 0.00714 323 Crystal msc + 86 80.6 844 1.4e+03 0.218 0.00587 0.00714 323 Crystal msc + 87 80.6 844 1.4e+03 0.21 0.00788 0.00714 323 Crystal msc + 88 80.6 844 1.4e+03 0.207 0.00308 0.00714 323 Crystal msc + 89 80.6 844 1.4e+03 0.203 0.00389 0.00714 323 Crystal msc + 90 80.6 844 1.4e+03 0.198 0.00513 0.00714 323 Crystal msc + 91 80.6 844 1.4e+03 0.195 0.00314 0.00714 323 Crystal msc + 92 80.6 844 1.4e+03 0.191 0.00361 0.00714 323 Crystal msc + 93 80.6 844 1.4e+03 0.18 0.0116 0.00714 323 Crystal msc + 94 80.6 844 1.4e+03 0.176 0.00375 0.00714 323 Crystal msc + 95 80.6 844 1.4e+03 0.166 0.0105 0.00714 323 Crystal msc + 96 80.6 844 1.4e+03 0.162 0.0035 0.00714 323 Crystal msc + 97 80.6 844 1.4e+03 0.158 0.00426 0.00714 323 Crystal msc + 98 80.6 844 1.4e+03 0.152 0.00588 0.00714 323 Crystal msc + 99 80.6 844 1.4e+03 0.129 0.0232 0.00714 323 Crystal msc + 100 80.6 844 1.4e+03 0.124 0.00526 0.00714 323 Crystal msc + 101 80.6 844 1.4e+03 0.118 0.00579 0.00714 323 Crystal msc + 102 80.6 844 1.4e+03 0.114 0.00416 0.00714 323 Crystal msc + 103 80.6 844 1.4e+03 0.109 0.00465 0.00714 323 Crystal msc + 104 80.6 844 1.4e+03 0.103 0.00611 0.00714 323 Crystal msc + 105 80.6 844 1.4e+03 0.0969 0.00593 0.00714 323 Crystal msc + 106 80.6 844 1.4e+03 0.0893 0.00761 0.00714 323 Crystal msc + 107 80.6 844 1.4e+03 0.0757 0.0136 0.00714 323 Crystal msc + 108 80.6 844 1.4e+03 0.0637 0.012 0.00714 323 Crystal msc + 109 80.6 844 1.4e+03 0.0509 0.0128 0.00714 323 Crystal msc + 110 80.6 844 1.4e+03 0.0405 0.0104 0.00714 323 Crystal msc + 111 80.6 844 1.4e+03 0 0.0405 0.0132 323 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 94, Parent ID = 26 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 70.1 843 1.44e+03 0.00207 0 0 0 WorldPhysical initStep + 1 70.1 843 1.44e+03 0.00207 0 0.00484 0.00484 WorldPhysical msc + 2 70 843 1.44e+03 0 0.00207 0.165 0.169 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 93, Parent ID = 26 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 68.7 839 1.45e+03 0.00301 0 0 0 WorldPhysical initStep + 1 68.7 839 1.45e+03 0.00297 3.42e-05 0.00923 0.00923 WorldPhysical msc + 2 68.7 839 1.45e+03 0 0.00297 0.297 0.306 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 92, Parent ID = 26 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 61.8 825 1.54e+03 0.00864 0 0 0 HadCaloPhysical initStep + 1 61.9 826 1.54e+03 0.0007 0.00794 1.5 1.5 HadCaloPhysical eIoni + 2 61.9 826 1.54e+03 0 0.0007 0.0375 1.54 HadCaloPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 91, Parent ID = 26 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 11.8 833 1.43e+03 0.00196 0 0 0 WorldPhysical initStep + 1 11.8 833 1.43e+03 0.00196 0 0.00443 0.00443 WorldPhysical msc + 2 11.7 833 1.43e+03 0 0.00196 0.151 0.155 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 90, Parent ID = 26 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 4.12 831 1.42e+03 0.00102 0 0 0 WorldPhysical initStep + 1 4.13 831 1.42e+03 0.000959 5.97e-05 0.00148 0.00148 WorldPhysical msc + 2 4.13 831 1.42e+03 0 0.000959 0.0549 0.0564 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 25, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -2.06 820 1.38e+03 1.58 0 0 0 Crystal initStep + 1 -2.23 820 1.38e+03 1.42 0.157 0.412 0.412 Crystal msc + 2 -2.39 820 1.38e+03 1.22 0.207 0.412 0.823 Crystal msc + 3 -2.58 821 1.38e+03 1 0.216 0.412 1.23 Crystal msc + 4 -2.59 821 1.38e+03 0 1 1.44 2.67 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 24, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 1.6 765 1.28e+03 0.718 0 0 0 Crystal initStep + 1 1.59 765 1.28e+03 0 0.718 1.09 1.09 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 23, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 2.15 756 1.27e+03 1.55 0 0 0 Crystal initStep + 1 2.16 756 1.27e+03 1.38 0.17 0.429 0.429 Crystal msc + 2 2.44 756 1.27e+03 1.21 0.168 0.429 0.859 Crystal msc + 3 2.66 756 1.27e+03 0.89 0.317 0.429 1.29 Crystal msc + 4 2.75 756 1.27e+03 0.272 0.536 0.944 2.23 Crystal eBrem + 5 2.72 756 1.27e+03 0 0.272 0.287 2.52 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 95, Parent ID = 23 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 2.75 756 1.27e+03 0.0822 0 0 0 Crystal initStep + 1 3.25 756 1.27e+03 0 0.0332 0.673 0.673 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 96, Parent ID = 95 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 3.25 756 1.27e+03 0.0491 0 0 0 Crystal initStep + 1 3.25 756 1.27e+03 0 0.0491 0.0181 0.0181 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 22, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 3.3 733 1.23e+03 1 0 0 0 Crystal initStep + 1 3.28 733 1.23e+03 0.349 0.656 1.44 1.44 Crystal eIoni + 2 3.34 733 1.23e+03 0.216 0.132 0.227 1.67 Crystal eBrem + 3 3.34 733 1.23e+03 0 0.216 0.203 1.87 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 21, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 3.75 720 1.21e+03 21 0 0 0 Crystal initStep + 1 3.5 720 1.21e+03 20.4 0.622 1.03 1.03 Crystal eBrem + 2 2.74 720 1.21e+03 19.2 1.16 2.38 3.41 Crystal msc + 3 1.63 721 1.21e+03 17.1 0.932 1.78 5.19 Crystal eIoni + 4 0.112 721 1.21e+03 15.2 0.989 1.84 7.03 Crystal eBrem + 5 1.01e-15 721 1.21e+03 15.1 0.0569 0.141 7.17 Crystal CoupledTransportation + 6 -0.161 721 1.21e+03 14.4 0.0905 0.2 7.37 Crystal eBrem + 7 -1.31 720 1.21e+03 13.2 1.19 1.35 8.71 Crystal msc + 8 -1.65 720 1.21e+03 12.8 0.161 0.453 9.17 Crystal eBrem + 9 -2.02 720 1.21e+03 11.7 0.17 0.396 9.56 Crystal eIoni + 10 -2.99 720 1.21e+03 11.2 0.539 1.11 10.7 Crystal eBrem + 11 -4.01 720 1.21e+03 10.1 1.09 1.35 12 Crystal msc + 12 -4.82 720 1.21e+03 8.94 0.557 1.09 13.1 Crystal eBrem + 13 -6.01 721 1.21e+03 8.3 0.636 1.35 14.5 Crystal msc + 14 -6.21 721 1.21e+03 6.76 0.0942 0.231 14.7 Crystal eIoni + 15 -7.11 721 1.22e+03 6.16 0.599 1.35 16 Crystal msc + 16 -7.36 722 1.22e+03 5.56 0.609 1.35 17.4 Crystal msc + 17 -7.49 722 1.22e+03 4.95 0.608 1.35 18.7 Crystal msc + 18 -6.99 722 1.22e+03 4.4 0.353 0.806 19.6 Crystal eBrem + 19 -6.04 723 1.22e+03 3.77 0.628 1.35 20.9 Crystal msc + 20 -7.01 723 1.22e+03 3.16 0.506 1.14 22 Crystal eBrem + 21 -8.17 723 1.22e+03 2.65 0.505 1.35 23.4 Crystal msc + 22 -8.27 724 1.22e+03 1.85 0.724 1.68 25.1 Crystal eBrem + 23 -8.9 725 1.22e+03 0.906 0.949 2.02 27.1 Crystal eIoni + 24 -9.16 725 1.22e+03 0.249 0.656 1.34 28.4 Crystal eIoni + 25 -9.15 725 1.22e+03 0 0.249 0.251 28.7 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 106, Parent ID = 21 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -8.27 724 1.22e+03 0.0718 0 0 0 Crystal initStep + 1 -7.79 725 1.22e+03 0 0.0332 0.868 0.868 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 107, Parent ID = 106 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -7.79 725 1.22e+03 0.0386 0 0 0 Crystal initStep + 1 -7.79 725 1.22e+03 0 0.0386 0.0122 0.0122 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 105, Parent ID = 21 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -7.01 723 1.22e+03 0.11 0 0 0 Crystal initStep + 1 -7.08 723 1.22e+03 0 0.0332 0.14 0.14 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 108, Parent ID = 105 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -7.08 723 1.22e+03 0.0769 0 0 0 Crystal initStep + 1 -7.08 723 1.22e+03 0 0.0769 0.0384 0.0384 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 104, Parent ID = 21 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -6.99 722 1.22e+03 0.195 0 0 0 Crystal initStep + 1 5.81e-16 727 1.22e+03 0.195 0 8.49 8.49 Crystal CoupledTransportation + 2 1.66 728 1.22e+03 0 0.0332 2.02 10.5 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 109, Parent ID = 104 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 1.66 728 1.22e+03 0.161 0 0 0 Crystal initStep + 1 1.67 728 1.22e+03 0 0.161 0.128 0.128 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 103, Parent ID = 21 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -6.21 721 1.21e+03 1.44 0 0 0 Crystal initStep + 1 -6.14 720 1.22e+03 0.437 1.01 1.78 1.78 Crystal eIoni + 2 -6.12 720 1.22e+03 0 0.437 0.566 2.35 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 102, Parent ID = 21 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -4.82 720 1.21e+03 0.598 0 0 0 Crystal initStep + 1 -29.1 745 1.22e+03 0.498 0 34.7 34.7 Crystal compt + 2 -31 750 1.22e+03 0.498 0 5.83 40.5 Crystal CoupledTransportation + 3 -35.7 763 1.21e+03 0.257 0 14.1 54.6 Crystal compt + 4 -43.7 761 1.22e+03 0.14 0 8.91 63.5 Crystal compt + 5 -42.8 761 1.22e+03 0.138 0 1.1 64.6 Crystal compt + 6 -42.6 760 1.22e+03 0 0.0332 0.379 65 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 114, Parent ID = 102 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -42.6 760 1.22e+03 0.105 0 0 0 Crystal initStep + 1 -42.6 760 1.22e+03 0 0.105 0.0645 0.0645 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 113, Parent ID = 102 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -42.8 761 1.22e+03 0.00183 0 0 0 Crystal initStep + 1 -42.8 761 1.22e+03 0 0.00183 0.00011 0.00011 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 112, Parent ID = 102 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -43.7 761 1.22e+03 0.117 0 0 0 Crystal initStep + 1 -43.7 761 1.22e+03 0 0.117 0.0763 0.0763 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 111, Parent ID = 102 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -35.7 763 1.21e+03 0.241 0 0 0 Crystal initStep + 1 -35.7 763 1.21e+03 0 0.241 0.239 0.239 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 110, Parent ID = 102 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -29.1 745 1.22e+03 0.1 0 0 0 Crystal initStep + 1 -29.1 745 1.22e+03 0 0.1 0.0593 0.0593 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 101, Parent ID = 21 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -2.02 720 1.21e+03 0.942 0 0 0 Crystal initStep + 1 -1.95 720 1.21e+03 0.313 0.588 1.28 1.28 Crystal eBrem + 2 -1.93 720 1.21e+03 0 0.313 0.352 1.63 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 115, Parent ID = 101 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -1.95 720 1.21e+03 0.0407 0 0 0 Crystal initStep + 1 -1.94 720 1.21e+03 0 0.0332 0.11 0.11 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 116, Parent ID = 115 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -1.94 720 1.21e+03 0.00752 0 0 0 Crystal initStep + 1 -1.94 720 1.21e+03 0 0.00752 0.000855 0.000855 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 100, Parent ID = 21 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -1.65 720 1.21e+03 0.17 0 0 0 Crystal initStep + 1 -3.25 720 1.21e+03 0 0.0332 1.83 1.83 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 117, Parent ID = 100 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -3.25 720 1.21e+03 0.137 0 0 0 Crystal initStep + 1 -3.26 720 1.21e+03 0 0.137 0.0984 0.0984 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 99, Parent ID = 21 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.161 721 1.21e+03 0.647 0 0 0 Crystal initStep + 1 -21.9 709 1.22e+03 0 0.0332 26.8 26.8 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 118, Parent ID = 99 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -21.9 709 1.22e+03 0.614 0 0 0 Crystal initStep + 1 -22 709 1.22e+03 0 0.614 0.893 0.893 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 98, Parent ID = 21 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.112 721 1.21e+03 0.915 0 0 0 Crystal initStep + 1 1.02e-15 721 1.21e+03 0.915 0 0.144 0.144 Crystal CoupledTransportation + 2 -2.54 720 1.21e+03 0 0.0332 3.25 3.4 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 119, Parent ID = 98 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -2.54 720 1.21e+03 0.881 0 0 0 Crystal initStep + 1 -2.49 720 1.21e+03 0.257 0.625 1.31 1.31 Crystal eIoni + 2 -2.5 720 1.21e+03 0 0.257 0.262 1.58 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 97, Parent ID = 21 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 1.63 721 1.21e+03 1.23 0 0 0 Crystal initStep + 1 1.64 721 1.21e+03 1.1 0.132 0.325 0.325 Crystal msc + 2 1.57 721 1.21e+03 0.876 0.221 0.325 0.651 Crystal msc + 3 1.5 721 1.21e+03 0.731 0.145 0.325 0.976 Crystal msc + 4 1.53 721 1.21e+03 0.344 0.262 0.458 1.43 Crystal eBrem + 5 1.5 721 1.21e+03 0 0.344 0.404 1.84 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 120, Parent ID = 97 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 1.53 721 1.21e+03 0.125 0 0 0 Crystal initStep + 1 1.64 721 1.21e+03 0 0.0332 0.155 0.155 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 121, Parent ID = 120 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 1.64 721 1.21e+03 0.0921 0 0 0 Crystal initStep + 1 1.64 721 1.21e+03 0 0.0921 0.0519 0.0519 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 20, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 3.76 719 1.21e+03 0.796 0 0 0 Crystal initStep + 1 3.69 719 1.21e+03 0.416 0.251 0.38 0.38 Crystal eBrem + 2 3.69 719 1.21e+03 0 0.416 0.529 0.909 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 122, Parent ID = 20 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 3.69 719 1.21e+03 0.129 0 0 0 Crystal initStep + 1 3.84 719 1.21e+03 0 0.0332 1.12 1.12 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 123, Parent ID = 122 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 3.84 719 1.21e+03 0.0956 0 0 0 Crystal initStep + 1 3.84 719 1.21e+03 0 0.0956 0.0551 0.0551 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 19, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 3.94 714 1.2e+03 18.4 0 0 0 Crystal initStep + 1 3.65 715 1.2e+03 17.5 0.902 1.86 1.86 Crystal msc + 2 3.55 717 1.2e+03 16 1.51 1.86 3.73 Crystal msc + 3 3.3 718 1.2e+03 14.9 1.06 1.86 5.59 Crystal msc + 4 2.68 719 1.2e+03 13.7 0.619 1.51 7.1 Crystal eBrem + 5 2.55 719 1.2e+03 12.8 0.162 0.308 7.41 Crystal eBrem + 6 1.83 720 1.2e+03 11.3 0.841 1.58 8.99 Crystal eBrem + 7 1.83 720 1.2e+03 10.5 0.000497 0.00351 8.99 Crystal eIoni + 8 0.488 720 1.21e+03 9.69 0.862 1.86 10.9 Crystal msc + 9 1.44e-15 720 1.2e+03 9.39 0.296 0.515 11.4 Crystal CoupledTransportation + 10 -0.0241 720 1.2e+03 9.09 0.0114 0.0266 11.4 Crystal eBrem + 11 -0.595 720 1.2e+03 8.8 0.295 0.647 12 Crystal msc + 12 -1.09 719 1.2e+03 8.46 0.333 0.647 12.7 Crystal msc + 13 -1.11 719 1.2e+03 8.35 0.00477 0.0163 12.7 Crystal eBrem + 14 -1.68 719 1.2e+03 8.02 0.327 0.647 13.4 Crystal msc + 15 -2.1 719 1.21e+03 7.72 0.305 0.647 14 Crystal msc + 16 -2.5 719 1.21e+03 5.31 0.399 0.46 14.5 Crystal eBrem + 17 -3.15 719 1.21e+03 5.06 0.249 0.647 15.1 Crystal msc + 18 -3.64 719 1.2e+03 4.77 0.292 0.647 15.8 Crystal msc + 19 -4.24 718 1.2e+03 4.5 0.266 0.647 16.4 Crystal msc + 20 -4.65 718 1.21e+03 4.21 0.295 0.647 17 Crystal msc + 21 -5.16 718 1.21e+03 3.16 1.05 0.647 17.7 Crystal msc + 22 -5.42 717 1.2e+03 2.7 0.453 0.647 18.3 Crystal msc + 23 -5.01 717 1.2e+03 2.43 0.273 0.647 19 Crystal msc + 24 -4.68 717 1.21e+03 1.36 0.534 1.11 20.1 Crystal eBrem + 25 -5.38 717 1.21e+03 0.65 0.711 1.73 21.8 Crystal eIoni + 26 -5.38 717 1.21e+03 0 0.65 0.962 22.8 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 131, Parent ID = 19 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -4.68 717 1.21e+03 0.534 0 0 0 Crystal initStep + 1 -7.97 710 1.21e+03 0.198 0 7.93 7.93 Crystal compt + 2 -10 715 1.21e+03 0 0.0332 5.77 13.7 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 133, Parent ID = 131 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -10 715 1.21e+03 0.165 0 0 0 Crystal initStep + 1 -10 715 1.21e+03 0 0.165 0.133 0.133 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 132, Parent ID = 131 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -7.97 710 1.21e+03 0.336 0 0 0 Crystal initStep + 1 -7.98 710 1.21e+03 0 0.336 0.391 0.391 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 130, Parent ID = 19 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -2.5 719 1.21e+03 2.01 0 0 0 Crystal initStep + 1 -50 704 1.2e+03 2.01 0 50.8 50.8 Crystal CoupledTransportation + 2 -61.1 700 1.19e+03 2.01 0 11.9 62.7 Crystal CoupledTransportation + 3 -100 688 1.19e+03 2.01 0 41.5 104 Crystal CoupledTransportation + 4 -150 671 1.18e+03 2.01 0 53.4 158 Crystal CoupledTransportation + 5 -156 670 1.17e+03 1.54 0 6.31 164 Crystal compt + 6 -189 650 1.18e+03 1.54 0 39.3 203 Crystal CoupledTransportation + 7 -200 644 1.18e+03 1.54 0 12.3 216 Crystal CoupledTransportation + 8 -226 629 1.19e+03 1.41 0 30.7 246 Crystal compt + 9 -250 621 1.19e+03 1.41 0 26.2 272 Crystal CoupledTransportation + 10 -251 620 1.19e+03 0.48 0 1.03 273 Crystal compt + 11 -252 622 1.2e+03 0.188 0 6.55 280 Crystal compt + 12 -254 619 1.2e+03 0 0.0332 3.87 284 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 138, Parent ID = 130 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -254 619 1.2e+03 0.155 0 0 0 Crystal initStep + 1 -254 619 1.2e+03 0 0.155 0.12 0.12 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 137, Parent ID = 130 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -252 622 1.2e+03 0.292 0 0 0 Crystal initStep + 1 -252 622 1.2e+03 0 0.292 0.319 0.319 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 136, Parent ID = 130 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -251 620 1.19e+03 0.93 0 0 0 Crystal initStep + 1 -251 620 1.19e+03 0.852 0.0777 0.187 0.187 Crystal msc + 2 -251 620 1.19e+03 0.765 0.0872 0.187 0.374 Crystal msc + 3 -251 620 1.19e+03 0.679 0.0853 0.187 0.561 Crystal msc + 4 -251 620 1.19e+03 0.599 0.0806 0.187 0.748 Crystal msc + 5 -251 620 1.19e+03 0.524 0.0752 0.187 0.934 Crystal msc + 6 -251 620 1.2e+03 0 0.524 0.724 1.66 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 135, Parent ID = 130 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -226 629 1.19e+03 0.13 0 0 0 Crystal initStep + 1 -226 629 1.19e+03 0 0.13 0.0911 0.0911 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 134, Parent ID = 130 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -156 670 1.17e+03 0.472 0 0 0 Crystal initStep + 1 -156 670 1.17e+03 0 0.472 0.629 0.629 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 129, Parent ID = 19 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -1.11 719 1.2e+03 0.11 0 0 0 Crystal initStep + 1 -1.46 719 1.2e+03 0 0.0332 0.42 0.42 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 139, Parent ID = 129 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -1.46 719 1.2e+03 0.0771 0 0 0 Crystal initStep + 1 -1.46 719 1.2e+03 0 0.0771 0.0386 0.0386 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 128, Parent ID = 19 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0241 720 1.2e+03 0.289 0 0 0 Crystal initStep + 1 -2.21 719 1.21e+03 0 0.0332 2.36 2.36 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 140, Parent ID = 128 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -2.21 719 1.21e+03 0.256 0 0 0 Crystal initStep + 1 -2.22 719 1.21e+03 0 0.256 0.261 0.261 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 127, Parent ID = 19 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 1.83 720 1.2e+03 0.712 0 0 0 Crystal initStep + 1 2.02 720 1.2e+03 0.0296 0.682 1.08 1.08 Crystal eIoni + 2 2.02 720 1.2e+03 0 0.0296 0.00782 1.08 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 126, Parent ID = 19 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 1.83 720 1.2e+03 0.716 0 0 0 Crystal initStep + 1 -8.22e-17 720 1.21e+03 0.716 0 3.38 3.38 Crystal CoupledTransportation + 2 -1.73 720 1.21e+03 0.529 0 3.2 6.58 Crystal compt + 3 -24.1 750 1.23e+03 0.406 0 41.4 48 Crystal compt + 4 -26.7 750 1.23e+03 0.406 0 2.65 50.6 Crystal CoupledTransportation + 5 -43.3 753 1.23e+03 0.326 0 17 67.7 Crystal compt + 6 -46.9 753 1.23e+03 0 0.0332 4.57 72.3 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 144, Parent ID = 126 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -46.9 753 1.23e+03 0.293 0 0 0 Crystal initStep + 1 -46.9 753 1.23e+03 0 0.293 0.319 0.319 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 143, Parent ID = 126 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -43.3 753 1.23e+03 0.08 0 0 0 Crystal initStep + 1 -43.3 753 1.23e+03 0 0.08 0.0409 0.0409 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 142, Parent ID = 126 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -24.1 750 1.23e+03 0.123 0 0 0 Crystal initStep + 1 -24.1 750 1.23e+03 0 0.123 0.0828 0.0828 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 141, Parent ID = 126 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -1.73 720 1.21e+03 0.187 0 0 0 Crystal initStep + 1 -1.74 720 1.21e+03 0 0.187 0.162 0.162 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 125, Parent ID = 19 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 2.55 719 1.2e+03 0.749 0 0 0 Crystal initStep + 1 -9.22e-17 721 1.21e+03 0.749 0 4.92 4.92 Crystal CoupledTransportation + 2 -4.5 725 1.21e+03 0.559 0 8.68 13.6 Crystal compt + 3 -11.4 733 1.21e+03 0.397 0 10.6 24.2 Crystal compt + 4 -9.94 741 1.22e+03 0 0.0332 9.02 33.2 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 147, Parent ID = 125 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -9.94 741 1.22e+03 0.363 0 0 0 Crystal initStep + 1 -9.92 741 1.22e+03 0 0.363 0.437 0.437 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 146, Parent ID = 125 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -11.4 733 1.21e+03 0.162 0 0 0 Crystal initStep + 1 -11.4 733 1.21e+03 0 0.162 0.129 0.129 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 145, Parent ID = 125 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -4.5 725 1.21e+03 0.191 0 0 0 Crystal initStep + 1 -4.5 725 1.21e+03 0 0.191 0.167 0.167 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 124, Parent ID = 19 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 2.68 719 1.2e+03 0.593 0 0 0 Crystal initStep + 1 1.19e-15 723 1.21e+03 0.593 0 10.6 10.6 Crystal CoupledTransportation + 2 -0.129 723 1.21e+03 0.269 0 0.512 11.1 Crystal compt + 3 -11.9 733 1.2e+03 0.267 0 17.3 28.4 Crystal compt + 4 -17.7 736 1.2e+03 0 0.0332 7.32 35.7 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 150, Parent ID = 124 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -17.7 736 1.2e+03 0.234 0 0 0 Crystal initStep + 1 -17.7 736 1.2e+03 0 0.234 0.229 0.229 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 149, Parent ID = 124 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -11.9 733 1.2e+03 0.00207 0 0 0 Crystal initStep + 1 -11.9 733 1.2e+03 0 0.00207 0.000131 0.000131 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 148, Parent ID = 124 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.129 723 1.21e+03 0.324 0 0 0 Crystal initStep + 1 -0.118 723 1.21e+03 0.309 0.0144 0.0258 0.0258 Crystal msc + 2 -0.119 723 1.21e+03 0.295 0.0137 0.0258 0.0516 Crystal msc + 3 -0.123 723 1.21e+03 0.284 0.0112 0.0258 0.0775 Crystal msc + 4 -0.141 723 1.21e+03 0.269 0.0152 0.0258 0.103 Crystal msc + 5 -0.151 723 1.21e+03 0.257 0.0124 0.0258 0.129 Crystal msc + 6 -0.162 723 1.21e+03 0.238 0.0181 0.0258 0.155 Crystal msc + 7 -0.18 723 1.21e+03 0.223 0.0158 0.0258 0.181 Crystal msc + 8 -0.176 723 1.21e+03 0.208 0.0149 0.0258 0.207 Crystal msc + 9 -0.163 723 1.21e+03 0.192 0.0154 0.0258 0.232 Crystal msc + 10 -0.164 723 1.21e+03 0.175 0.0177 0.0258 0.258 Crystal msc + 11 -0.167 723 1.21e+03 0.149 0.0252 0.0258 0.284 Crystal msc + 12 -0.177 723 1.21e+03 0 0.149 0.113 0.397 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 18, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 4.02 710 1.19e+03 0.713 0 0 0 Crystal initStep + 1 3.97 710 1.19e+03 0.112 0.601 1.08 1.08 Crystal eIoni + 2 3.97 710 1.19e+03 0 0.112 0.072 1.15 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 17, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 4.48 698 1.17e+03 1.64 0 0 0 Crystal initStep + 1 4.41 699 1.17e+03 1.48 0.167 0.326 0.326 Crystal msc + 2 4.43 699 1.17e+03 1.35 0.131 0.326 0.652 Crystal msc + 3 4.71 699 1.17e+03 1.22 0.129 0.326 0.978 Crystal msc + 4 4.87 699 1.17e+03 0.715 0.0609 0.167 1.15 Crystal eBrem + 5 4.95 699 1.17e+03 0.553 0.161 0.326 1.47 Crystal msc + 6 5.08 699 1.17e+03 0.319 0.234 0.326 1.8 Crystal msc + 7 5.07 699 1.17e+03 0 0.319 0.362 2.16 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 151, Parent ID = 17 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 4.87 699 1.17e+03 0.442 0 0 0 Crystal initStep + 1 7.39 700 1.17e+03 0.442 0 2.79 2.79 Crystal CoupledTransportation + 2 33.4 711 1.16e+03 0.421 0 28.8 31.6 Crystal compt + 3 44.1 718 1.17e+03 0.21 0 12.8 44.4 Crystal compt + 4 38.8 722 1.17e+03 0 0.0332 7.96 52.3 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 154, Parent ID = 151 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 38.8 722 1.17e+03 0.177 0 0 0 Crystal initStep + 1 38.8 722 1.17e+03 0 0.177 0.148 0.148 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 153, Parent ID = 151 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 44.1 718 1.17e+03 0.211 0 0 0 Crystal initStep + 1 44.1 718 1.17e+03 0 0.211 0.195 0.195 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 152, Parent ID = 151 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 33.4 711 1.16e+03 0.0202 0 0 0 Crystal initStep + 1 33.4 711 1.16e+03 0 0.0202 0.00412 0.00412 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 16, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 3.94 683 1.14e+03 1.91 0 0 0 Crystal initStep + 1 3.53 684 1.14e+03 0.85 1.06 2.05 2.05 Crystal eIoni + 2 3.26 683 1.14e+03 0.409 0.385 0.818 2.87 Crystal eBrem + 3 3.31 683 1.14e+03 0 0.409 0.516 3.38 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 155, Parent ID = 16 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 3.26 683 1.14e+03 0.0563 0 0 0 Crystal initStep + 1 3.51 683 1.14e+03 0 0.0332 0.289 0.289 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 156, Parent ID = 155 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 3.51 683 1.14e+03 0.0231 0 0 0 Crystal initStep + 1 3.51 683 1.14e+03 0 0.0231 0.00519 0.00519 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 15, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 3.9 681 1.14e+03 0.705 0 0 0 Crystal initStep + 1 3.83 681 1.14e+03 0 0.705 1.06 1.06 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 14, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 3.89 681 1.14e+03 1.16 0 0 0 Crystal initStep + 1 3.41 680 1.14e+03 0.436 0.726 1.58 1.58 Crystal eIoni + 2 3.41 680 1.14e+03 0 0.436 0.564 2.15 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 13, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 3.27 670 1.12e+03 1.29 0 0 0 Crystal initStep + 1 3.39 671 1.12e+03 0.361 0.928 1.68 1.68 Crystal eIoni + 2 3.35 671 1.12e+03 0 0.361 0.432 2.11 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 12, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.112 620 1.03e+03 0.998 0 0 0 Crystal initStep + 1 -0.136 620 1.03e+03 0.984 0.0145 0.0327 0.0327 Crystal msc + 2 -0.157 620 1.04e+03 0.973 0.0112 0.0327 0.0655 Crystal msc + 3 -0.184 620 1.04e+03 0.962 0.0106 0.0327 0.0982 Crystal msc + 4 -0.206 620 1.04e+03 0.946 0.0157 0.0327 0.131 Crystal msc + 5 -0.236 620 1.04e+03 0.933 0.0131 0.0327 0.164 Crystal msc + 6 -0.262 620 1.04e+03 0.903 0.0301 0.0327 0.196 Crystal msc + 7 -0.284 620 1.04e+03 0.894 0.00937 0.0327 0.229 Crystal msc + 8 -0.292 620 1.03e+03 0.881 0.0129 0.0327 0.262 Crystal msc + 9 -0.302 620 1.03e+03 0.867 0.014 0.0327 0.295 Crystal msc + 10 -0.298 620 1.03e+03 0.85 0.0171 0.0327 0.327 Crystal msc + 11 -0.288 620 1.03e+03 0.84 0.00953 0.0327 0.36 Crystal msc + 12 -0.271 620 1.03e+03 0.832 0.0085 0.0327 0.393 Crystal msc + 13 -0.273 620 1.03e+03 0.814 0.0174 0.0327 0.426 Crystal msc + 14 -0.28 620 1.03e+03 0.806 0.00857 0.0327 0.458 Crystal msc + 15 -0.301 620 1.03e+03 0.79 0.0155 0.0327 0.491 Crystal msc + 16 -0.29 620 1.03e+03 0.78 0.00984 0.0327 0.524 Crystal msc + 17 -0.293 620 1.03e+03 0.758 0.0226 0.0327 0.557 Crystal msc + 18 -0.289 620 1.04e+03 0.628 0.13 0.0327 0.589 Crystal msc + 19 -0.298 620 1.04e+03 0.612 0.0159 0.0327 0.622 Crystal msc + 20 -0.309 620 1.04e+03 0.595 0.017 0.0327 0.655 Crystal msc + 21 -0.325 620 1.04e+03 0.584 0.0111 0.0327 0.688 Crystal msc + 22 -0.342 620 1.04e+03 0.571 0.0125 0.0327 0.72 Crystal msc + 23 -0.345 620 1.04e+03 0.542 0.0291 0.0327 0.753 Crystal msc + 24 -0.37 620 1.04e+03 0.529 0.0129 0.0327 0.786 Crystal msc + 25 -0.393 620 1.04e+03 0.512 0.0166 0.0327 0.818 Crystal msc + 26 -0.403 620 1.04e+03 0.497 0.0152 0.0327 0.851 Crystal msc + 27 -0.409 620 1.04e+03 0.478 0.019 0.0327 0.884 Crystal msc + 28 -0.407 620 1.04e+03 0.461 0.0172 0.0327 0.917 Crystal msc + 29 -0.431 620 1.04e+03 0.442 0.0191 0.0327 0.949 Crystal msc + 30 -0.415 620 1.04e+03 0.432 0.00995 0.0327 0.982 Crystal msc + 31 -0.435 620 1.04e+03 0.419 0.0132 0.0327 1.01 Crystal msc + 32 -0.464 620 1.04e+03 0.394 0.0246 0.0327 1.05 Crystal msc + 33 -0.478 620 1.04e+03 0.377 0.0174 0.0327 1.08 Crystal msc + 34 -0.49 620 1.04e+03 0.359 0.0178 0.0327 1.11 Crystal msc + 35 -0.524 620 1.04e+03 0 0.359 0.429 1.54 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 11, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.477 610 1.02e+03 3.49 0 0 0 Crystal initStep + 1 -0.545 611 1.02e+03 2.89 0.0605 0.145 0.145 Crystal eBrem + 2 -0.644 611 1.02e+03 2.82 0.0705 0.162 0.307 Crystal msc + 3 -0.571 611 1.02e+03 2.75 0.0686 0.162 0.469 Crystal msc + 4 -0.561 611 1.02e+03 2.69 0.0619 0.162 0.632 Crystal msc + 5 -0.579 611 1.02e+03 2.61 0.0792 0.162 0.794 Crystal msc + 6 -0.599 611 1.02e+03 2.51 0.0925 0.162 0.956 Crystal msc + 7 -0.728 611 1.02e+03 2.45 0.0661 0.162 1.12 Crystal msc + 8 -0.816 611 1.02e+03 2.39 0.0566 0.162 1.28 Crystal msc + 9 -0.909 611 1.02e+03 2.32 0.0694 0.162 1.44 Crystal msc + 10 -1.01 611 1.02e+03 2.19 0.131 0.162 1.6 Crystal msc + 11 -0.963 611 1.02e+03 1.79 0.404 0.162 1.77 Crystal msc + 12 -0.854 612 1.02e+03 1.71 0.0744 0.162 1.93 Crystal msc + 13 -0.763 612 1.02e+03 1.65 0.0658 0.162 2.09 Crystal msc + 14 -0.768 612 1.02e+03 1.58 0.0629 0.162 2.25 Crystal msc + 15 -0.764 612 1.02e+03 1.4 0.179 0.162 2.42 Crystal msc + 16 -0.778 612 1.02e+03 1.21 0.0264 0.0732 2.49 Crystal eBrem + 17 -0.811 612 1.02e+03 1.13 0.0823 0.162 2.65 Crystal msc + 18 -0.917 612 1.02e+03 1.06 0.0631 0.162 2.81 Crystal msc + 19 -1.03 612 1.02e+03 0.996 0.067 0.162 2.98 Crystal msc + 20 -1.11 612 1.02e+03 0.914 0.0814 0.162 3.14 Crystal msc + 21 -1.17 612 1.02e+03 0.849 0.0653 0.162 3.3 Crystal msc + 22 -1.16 612 1.02e+03 0.779 0.0703 0.162 3.46 Crystal msc + 23 -1.11 612 1.02e+03 0.617 0.0861 0.16 3.62 Crystal eBrem + 24 -1.1 612 1.02e+03 0 0.617 0.898 4.52 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 159, Parent ID = 11 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -1.11 612 1.02e+03 0.0757 0 0 0 Crystal initStep + 1 -1.11 612 1.02e+03 0 0.0332 0.0441 0.0441 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 160, Parent ID = 159 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -1.11 612 1.02e+03 0.0425 0 0 0 Crystal initStep + 1 -1.11 612 1.02e+03 0 0.0425 0.0144 0.0144 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 158, Parent ID = 11 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.778 612 1.02e+03 0.17 0 0 0 Crystal initStep + 1 -4.42 614 1.04e+03 0 0.0332 16.9 16.9 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 161, Parent ID = 158 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -4.42 614 1.04e+03 0.137 0 0 0 Crystal initStep + 1 -4.42 614 1.04e+03 0 0.137 0.0993 0.0993 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 157, Parent ID = 11 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.545 611 1.02e+03 0.546 0 0 0 Crystal initStep + 1 -41.2 625 1.03e+03 0.196 0 45.9 45.9 Crystal compt + 2 -39.8 625 1.03e+03 0 0.0332 2.89 48.8 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 163, Parent ID = 157 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -39.8 625 1.03e+03 0.162 0 0 0 Crystal initStep + 1 -39.8 625 1.03e+03 0 0.162 0.129 0.129 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 162, Parent ID = 157 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -41.2 625 1.03e+03 0.35 0 0 0 Crystal initStep + 1 -41.2 625 1.03e+03 0 0.35 0.414 0.414 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 10, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.477 607 1.01e+03 2.99 0 0 0 Crystal initStep + 1 -0.423 608 1.01e+03 2.94 0.0472 0.132 0.132 Crystal msc + 2 -0.428 608 1.01e+03 2.89 0.0512 0.132 0.264 Crystal msc + 3 -0.462 608 1.01e+03 2.84 0.0533 0.132 0.397 Crystal msc + 4 -0.479 608 1.01e+03 2.78 0.0601 0.132 0.529 Crystal msc + 5 -0.518 608 1.01e+03 2.72 0.0527 0.132 0.661 Crystal msc + 6 -0.551 608 1.01e+03 2.63 0.0896 0.132 0.793 Crystal msc + 7 -0.633 608 1.01e+03 2.59 0.0478 0.132 0.926 Crystal msc + 8 -0.728 608 1.01e+03 2.53 0.0503 0.132 1.06 Crystal msc + 9 -0.849 608 1.01e+03 2.47 0.065 0.132 1.19 Crystal msc + 10 -0.937 608 1.01e+03 2.4 0.0678 0.132 1.32 Crystal msc + 11 -0.981 608 1.01e+03 2.27 0.129 0.132 1.45 Crystal msc + 12 -1.03 608 1.01e+03 2.21 0.0592 0.132 1.59 Crystal msc + 13 -1.12 608 1.01e+03 2.16 0.0554 0.132 1.72 Crystal msc + 14 -1.25 608 1.01e+03 2.11 0.0482 0.132 1.85 Crystal msc + 15 -1.33 609 1.01e+03 2.02 0.0893 0.132 1.98 Crystal msc + 16 -1.44 609 1.01e+03 1.97 0.0527 0.132 2.12 Crystal msc + 17 -1.53 609 1.01e+03 1.91 0.0574 0.132 2.25 Crystal msc + 18 -1.63 609 1.01e+03 1.85 0.0645 0.132 2.38 Crystal msc + 19 -1.73 609 1.01e+03 1.8 0.0472 0.132 2.51 Crystal msc + 20 -1.77 609 1.01e+03 1.75 0.0465 0.132 2.64 Crystal msc + 21 -1.81 608 1.01e+03 1.67 0.0874 0.132 2.78 Crystal msc + 22 -1.89 608 1.01e+03 1.61 0.0588 0.132 2.91 Crystal msc + 23 -1.96 608 1.01e+03 1.54 0.0692 0.132 3.04 Crystal msc + 24 -2.05 608 1.01e+03 1.48 0.0559 0.132 3.17 Crystal msc + 25 -2 608 1.01e+03 1.43 0.0479 0.132 3.31 Crystal msc + 26 -1.89 608 1.01e+03 1.38 0.0551 0.132 3.44 Crystal msc + 27 -1.81 608 1.01e+03 1.35 0.0321 0.0897 3.53 Crystal eBrem + 28 -1.77 608 1.01e+03 1.29 0.0591 0.132 3.66 Crystal msc + 29 -1.73 608 1.01e+03 1.24 0.0512 0.132 3.79 Crystal msc + 30 -1.65 608 1.01e+03 1.13 0.104 0.132 3.92 Crystal msc + 31 -1.6 608 1.01e+03 1 0.13 0.132 4.06 Crystal msc + 32 -1.59 609 1.01e+03 0.949 0.0534 0.132 4.19 Crystal msc + 33 -1.53 609 1.01e+03 0.894 0.0548 0.132 4.32 Crystal msc + 34 -1.25 609 1.01e+03 0.6 0.253 0.557 4.88 Crystal eBrem + 35 -1.25 609 1.01e+03 0 0.6 0.867 5.75 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 164, Parent ID = 10 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -1.25 609 1.01e+03 0.0409 0 0 0 Crystal initStep + 1 -1.25 609 1.01e+03 0 0.0332 0.00826 0.00826 Crystal phot + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 165, Parent ID = 164 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -1.25 609 1.01e+03 0.00774 0 0 0 Crystal initStep + 1 -1.25 609 1.01e+03 0 0.00774 0.000891 0.000891 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 9, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.636 601 1e+03 1.36 0 0 0 Crystal initStep + 1 -0.669 601 1e+03 1.29 0.0659 0.127 0.127 Crystal msc + 2 -0.688 601 1e+03 1.22 0.0741 0.127 0.254 Crystal msc + 3 -0.7 601 1e+03 1.17 0.0449 0.127 0.382 Crystal msc + 4 -0.751 601 1e+03 1.13 0.0368 0.127 0.509 Crystal msc + 5 -0.755 602 1e+03 1.08 0.0529 0.127 0.636 Crystal msc + 6 -0.836 602 1e+03 1.03 0.0512 0.127 0.763 Crystal msc + 7 -0.879 602 1e+03 0.982 0.0471 0.127 0.89 Crystal msc + 8 -0.938 602 1e+03 0.882 0.101 0.127 1.02 Crystal msc + 9 -0.946 602 1e+03 0.834 0.048 0.127 1.14 Crystal msc + 10 -1.02 602 1e+03 0.775 0.0587 0.127 1.27 Crystal msc + 11 -1 602 1e+03 0.712 0.0628 0.127 1.4 Crystal msc + 12 -1.03 602 1e+03 0.665 0.0474 0.127 1.53 Crystal msc + 13 -1.14 602 1e+03 0.61 0.0545 0.127 1.65 Crystal msc + 14 -1.24 602 1e+03 0.553 0.0572 0.127 1.78 Crystal msc + 15 -1.3 602 1e+03 0 0.553 0.779 2.56 Crystal eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 8, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.622 597 995 0.00122 0 0 0 WorldPhysical initStep + 1 -0.623 597 995 0.00119 2.37e-05 0.00198 0.00198 WorldPhysical msc + 2 -0.633 597 995 0 0.00119 0.0736 0.0755 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 7, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.616 587 979 0.0034 0 0 0 WorldPhysical initStep + 1 -0.612 587 979 0.00333 6.94e-05 0.0114 0.0114 WorldPhysical msc + 2 -0.607 587 979 0 0.00333 0.358 0.369 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 6, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.58 552 920 0.00108 0 0 0 WorldPhysical initStep + 1 -0.581 552 920 0.00108 0 0.00161 0.00161 WorldPhysical msc + 2 -0.593 551 920 0 0.00108 0.0647 0.0663 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0996 122 203 0.00179 0 0 0 DriftChamberPhysical initStep + 1 -0.0839 122 203 0 0.00179 0.742 0.742 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0191 57.7 96.2 0.00921 0 0 0 WorldPhysical initStep + 1 -0.0132 57.8 96.1 0.00898 0.00023 0.0666 0.0666 WorldPhysical msc + 2 -0.649 57.7 95.3 0.00473 0.00425 1.63 1.7 WorldPhysical eIoni + 3 -0.713 57.8 95.3 0 0.00473 0.657 2.35 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0143 52.4 87.3 0.00217 0 0 0 WorldPhysical initStep + 1 -0.0167 52.4 87.3 0.00215 2.49e-05 0.00522 0.00522 WorldPhysical msc + 2 -0.0371 52.3 87.4 0 0.00215 0.175 0.181 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.00202 17.3 28.9 0.00264 0 0 0 WorldPhysical initStep + 1 0.00219 17.3 28.9 0.00264 0 0.00738 0.00738 WorldPhysical msc + 2 0.0199 17.4 28.8 0 0.00264 0.244 0.251 WorldPhysical eIoni +>>> Event 0 + 13 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.2993775602288603 (GeV) + 5 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.7275652889656623 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0.00653 27.5 45.8 1e+03 0.00797 53.5 53.5 WorldPhysical hIoni + 2 0.00653 28.3 47.1 1e+03 4.87e-05 1.48 54.9 WorldPhysical hIoni + 3 0.018 60 100 1e+03 0.0108 61.7 117 DriftChamberPhysical CoupledTransportation + 4 0.0414 197 329 1e+03 0.00574 267 383 DriftChamberPhysical msc + 5 0.0964 334 557 1e+03 0.00592 267 650 DriftChamberPhysical msc + 6 0.118 472 786 1e+03 0.00612 267 916 DriftChamberPhysical msc + 7 0.122 491 818 1e+03 0.000793 37.9 954 DriftChamberPhysical hIoni + 8 0.133 540 900 1e+03 0.00186 95.4 1.05e+03 WorldPhysical CoupledTransportation + 9 0.134 543 905 1e+03 0.00112 5.86 1.06e+03 WorldPhysical hIoni + 10 0.131 570 950 1e+03 0.0113 79.6 1.14e+03 WorldPhysical hIoni +ExN05PionShowerModel::DoIt + 11 0.131 570 950 0 1e+03 0 1.14e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 6, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.131 570 950 0.0025 0 0 0 WorldPhysical initStep + 1 0.129 570 950 0.00246 3.39e-05 0.0068 0.0068 WorldPhysical msc + 2 0.13 570 950 0 0.00246 0.217 0.224 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.134 543 905 0.00137 0 0 0 WorldPhysical initStep + 1 0.131 543 905 0.00134 3.17e-05 0.00239 0.00239 WorldPhysical msc + 2 0.115 543 905 0 0.00134 0.0865 0.0889 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.122 491 818 0.00567 0 0 0 DriftChamberPhysical initStep + 1 -0.891 490 820 0.00414 0.00154 2.54 2.54 DriftChamberPhysical eIoni + 2 -2.35 489 820 0.00214 0.00199 1.7 4.24 DriftChamberPhysical eIoni + 3 -2.36 488 820 0 0.00214 0.989 5.23 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00653 28.3 47.1 0.0429 0 0 0 WorldPhysical initStep + 1 -1.01 28.3 47.4 0.042 0.000837 1.07 1.07 WorldPhysical msc + 2 -8.28 26.4 51.3 0.0355 0.00657 8.52 9.59 WorldPhysical eIoni + 3 -14.3 26.3 54 0.029 0.00648 6.68 16.3 WorldPhysical eIoni + 4 -16.6 25.8 58.2 0.023 0.00595 5.08 21.3 WorldPhysical eIoni + 5 -17 26 59.6 0.0199 0.00203 1.65 23 WorldPhysical eIoni + 6 -16.9 25.8 59.7 0.0162 0.000104 0.269 23.3 WorldPhysical eIoni + 7 -15.1 24.2 59.9 0.0112 0.00499 2.67 25.9 WorldPhysical eIoni + 8 -13.6 23.8 59.5 0.00322 0.00513 1.7 27.6 WorldPhysical eIoni + 9 -13.6 23.8 59.5 0 0.00322 0.338 28 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 9, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -13.6 23.8 59.5 0.00282 0 0 0 WorldPhysical initStep + 1 -13.6 23.8 59.5 0.00282 0 0.0082 0.0082 WorldPhysical msc + 2 -13.6 23.8 59.4 0 0.00282 0.273 0.281 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 8, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -16.9 25.8 59.7 0.00361 0 0 0 WorldPhysical initStep + 1 -16.9 25.8 59.7 0.00355 6.57e-05 0.0126 0.0126 WorldPhysical msc + 2 -16.9 25.7 59.5 0 0.00355 0.4 0.413 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 7, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -17 26 59.6 0.00111 0 0 0 WorldPhysical initStep + 1 -17 26 59.6 0.00111 0 0.00167 0.00167 WorldPhysical msc + 2 -17 26 59.6 0 0.00111 0.0666 0.0683 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00653 27.5 45.8 0.00122 0 0 0 WorldPhysical initStep + 1 0.00646 27.5 45.8 0.00112 9.83e-05 0.002 0.002 WorldPhysical msc + 2 0.00879 27.5 45.9 0 0.00112 0.068 0.07 WorldPhysical eIoni +>>> Event 1 + 4 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.09998947233625742 (GeV) + 9 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.739922095288305 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0.000636 11.1 18.4 1e+03 0.00306 21.5 21.5 WorldPhysical hIoni + 2 0.00203 16.1 26.8 1e+03 0.00105 9.78 31.3 WorldPhysical hIoni + 3 0.0036 46.7 77.8 1e+03 0.00878 59.4 90.7 WorldPhysical hIoni + 4 -0.0122 60 100 1e+03 0.00411 25.9 117 DriftChamberPhysical CoupledTransportation + 5 -0.148 197 329 1e+03 0.00547 267 383 DriftChamberPhysical msc + 6 -0.272 334 557 1e+03 0.00631 267 650 DriftChamberPhysical msc + 7 -0.39 471 786 1e+03 0.00551 267 916 DriftChamberPhysical msc + 8 -0.455 540 900 1e+03 0.00362 133 1.05e+03 WorldPhysical CoupledTransportation + 9 -0.477 564 940 1e+03 0.00898 46.7 1.1e+03 WorldPhysical hIoni + 10 -0.476 570 950 1e+03 0.00908 69.9 1.17e+03 WorldPhysical CoupledTransportation +ExN05PionShowerModel::DoIt + 11 -0.476 570 950 0 1e+03 0 1.17e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.477 564 940 0.00122 0 0 0 WorldPhysical initStep + 1 -0.478 564 940 0.00122 0 0.002 0.002 WorldPhysical msc + 2 -0.51 564 940 0 0.00122 0.076 0.078 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0036 46.7 77.8 0.00156 0 0 0 WorldPhysical initStep + 1 0.00302 46.7 77.8 0.00156 7.73e-06 0.00304 0.00304 WorldPhysical msc + 2 0.00489 46.6 77.8 0 0.00156 0.107 0.11 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00203 16.1 26.8 0.00157 0 0 0 WorldPhysical initStep + 1 0.00206 16.1 26.8 0.00152 4.12e-05 0.00305 0.00305 WorldPhysical msc + 2 0.00423 16.1 26.8 0 0.00152 0.104 0.107 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.000636 11.1 18.4 0.00349 0 0 0 WorldPhysical initStep + 1 0.00527 11.1 18.4 0.00346 3.25e-05 0.0119 0.0119 WorldPhysical msc + 2 0.192 11.1 18.4 0.000304 0.00316 0.286 0.298 WorldPhysical eIoni + 3 0.192 11.1 18.4 0 0.000304 0.0169 0.315 WorldPhysical eIoni +>>> Event 2 + 10 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.2599834078667342 (GeV) + 13 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.6599578815078637 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 -0.000124 2.1 3.5 1e+03 0.000324 4.08 4.08 WorldPhysical hIoni + 2 0.000993 60 100 1e+03 0.0164 113 117 DriftChamberPhysical CoupledTransportation + 3 0.0711 197 329 1e+03 0.00683 267 383 DriftChamberPhysical msc + 4 0.151 317 528 1e+03 0.00434 232 615 DriftChamberPhysical hIoni + 5 0.234 454 756 1e+03 0.00693 267 882 DriftChamberPhysical msc + 6 0.235 455 759 1e+03 0.000394 3.43 885 DriftChamberPhysical hIoni + 7 0.308 540 900 1e+03 0.00332 164 1.05e+03 WorldPhysical CoupledTransportation + 8 0.32 555 925 1e+03 0.00428 28.8 1.08e+03 WorldPhysical hIoni + 9 0.325 570 950 1e+03 0.0136 87.9 1.17e+03 WorldPhysical CoupledTransportation +ExN05PionShowerModel::DoIt + 10 0.325 570 950 0 1e+03 0 1.17e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.32 555 925 0.00276 0 0 0 WorldPhysical initStep + 1 0.318 555 925 0.00275 1.21e-05 0.00789 0.00789 WorldPhysical msc + 2 0.28 555 925 0 0.00275 0.26 0.268 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.235 455 759 0.00385 0 0 0 DriftChamberPhysical initStep + 1 -1.18 457 759 0.00146 0.00239 1.84 1.84 DriftChamberPhysical eIoni + 2 -1.43 457 758 0 0.00146 0.539 2.38 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.151 317 528 0.00212 0 0 0 DriftChamberPhysical initStep + 1 0.621 317 527 0 0.00212 0.975 0.975 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.000124 2.1 3.5 0.00129 0 0 0 WorldPhysical initStep + 1 -0.00155 2.1 3.5 0.00129 0 0.00219 0.00219 WorldPhysical msc + 2 -0.0323 2.12 3.47 0 0.00129 0.0816 0.0838 WorldPhysical eIoni +>>> Event 3 + 8 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.2199853865030743 (GeV) + 8 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.6999535025097816 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0 60 100 1e+03 0.0191 117 117 DriftChamberPhysical CoupledTransportation + 2 0.0331 162 270 1e+03 0.00463 198 314 DriftChamberPhysical hIoni + 3 0.0453 194 323 1e+03 0.0025 62.7 377 DriftChamberPhysical hIoni + 4 0.128 331 552 1e+03 0.00692 267 644 DriftChamberPhysical msc + 5 0.262 468 781 1e+03 0.00671 267 910 DriftChamberPhysical msc + 6 0.324 540 900 1e+03 0.00412 139 1.05e+03 WorldPhysical CoupledTransportation + 7 0.327 544 907 1e+03 0.0024 8.23 1.06e+03 WorldPhysical hIoni + 8 0.328 570 950 1e+03 0.0146 108 1.17e+03 WorldPhysical CoupledTransportation +ExN05PionShowerModel::DoIt + 9 0.328 570 950 0 1e+03 0 1.17e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.327 544 907 0.00449 0 0 0 WorldPhysical initStep + 1 0.344 544 907 0.00449 0 0.0185 0.0185 WorldPhysical msc + 2 0.398 544 907 0 0.00449 0.602 0.621 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0453 194 323 0.00123 0 0 0 DriftChamberPhysical initStep + 1 -0.161 194 324 0 0.00123 0.415 0.415 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0331 162 270 0.00149 0 0 0 DriftChamberPhysical initStep + 1 0.00757 162 269 0 0.00149 0.555 0.555 DriftChamberPhysical eIoni +>>> Event 4 + 7 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.2599822598904041 (GeV) + 9 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.7199508735426573 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +number of event = 5 +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +### Run 5 start. +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0 30 100 1e+03 0.0217 104 104 DriftChamberPhysical CoupledTransportation + 2 0.00526 57.8 193 1e+03 0.00186 96.6 201 DriftChamberPhysical hIoni + 3 0.0166 98.4 328 1e+03 0.00461 142 343 DriftChamberPhysical hIoni + 4 0.0556 164 548 1e+03 0.00578 229 572 DriftChamberPhysical hIoni + 5 0.088 233 776 1e+03 0.0058 239 810 DriftChamberPhysical msc + 6 0.107 270 900 1e+03 0.00207 129 940 WorldPhysical CoupledTransportation + 7 0.113 285 950 1e+03 0.0136 87 1.03e+03 WorldPhysical hIoni +ExN05PionShowerModel::DoIt + 8 0.113 285 950 0 1e+03 0 1.03e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.113 285 950 0.00501 0 0 0 WorldPhysical initStep + 1 0.0906 285 950 0.00497 3.62e-05 0.0231 0.0231 WorldPhysical msc + 2 0.0794 285 950 0 0.00497 0.713 0.736 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0556 164 548 0.00484 0 0 0 DriftChamberPhysical initStep + 1 2.06 163 548 0.00332 0.00152 2.21 2.21 DriftChamberPhysical eIoni + 2 2.85 162 548 0.000572 0.00275 1.63 3.84 DriftChamberPhysical eIoni + 3 2.86 162 548 0 0.000572 0.153 4 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0166 98.4 328 0.00152 0 0 0 DriftChamberPhysical initStep + 1 -0.359 98.8 328 0 0.00152 0.573 0.573 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00526 57.8 193 0.00237 0 0 0 DriftChamberPhysical initStep + 1 0.461 58.7 193 4.5e-05 0.00232 1.15 1.15 DriftChamberPhysical eIoni + 2 0.47 58.7 193 0 4.5e-05 0.0314 1.18 DriftChamberPhysical eIoni +>>> Event 0 + 3 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.05999584606632728 (GeV) + 10 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.9399349217057942 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0.00548 13.8 45.9 1e+03 0.00702 47.9 47.9 WorldPhysical hIoni + 2 0.00123 30 100 1e+03 0.0081 56.5 104 DriftChamberPhysical CoupledTransportation + 3 -0.0174 98.5 329 1e+03 0.00549 239 343 DriftChamberPhysical msc + 4 -0.000341 167 557 1e+03 0.00533 239 582 DriftChamberPhysical msc + 5 0.00511 214 714 1e+03 0.00432 164 746 DriftChamberPhysical hIoni + 6 0.0142 251 836 1e+03 0.00256 127 873 DriftChamberPhysical hIoni + 7 0.0204 270 900 1e+03 0.00155 66.3 940 WorldPhysical CoupledTransportation + 8 0.0205 274 915 1e+03 0.00271 15.5 955 WorldPhysical hIoni + 9 0.0206 277 924 1e+03 0.000622 9.41 964 WorldPhysical hIoni + 10 0.0122 285 950 1e+03 0.0115 79.5 1.04e+03 WorldPhysical CoupledTransportation +ExN05PionShowerModel::DoIt + 11 0.0122 285 950 0 1e+03 0 1.04e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 6, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0206 277 924 0.0587 0 0 0 WorldPhysical initStep + 1 -1.59 276 925 0.058 0.000751 1.86 1.86 WorldPhysical msc + 2 -1.65 276 925 0.049 0 0.0715 1.93 WorldPhysical eIoni + 3 -3.05 275 925 0.0482 0.000772 1.86 3.79 WorldPhysical msc + 4 -4.79 274 925 0.0477 0.00055 1.86 5.65 WorldPhysical msc + 5 -6.26 273 925 0.0461 0.00155 1.86 7.52 WorldPhysical msc + 6 -7.94 273 925 0.0454 0.000738 1.86 9.38 WorldPhysical msc + 7 -8.78 271 926 0.0434 0.000682 1.81 11.2 WorldPhysical eIoni + 8 -9.78 270 927 0.0416 0.00183 1.86 13 WorldPhysical msc + 9 -10.8 270 929 0.0407 0.000898 1.86 14.9 WorldPhysical msc + 10 -12.1 269 930 0.0398 0.000953 1.86 16.8 WorldPhysical msc + 11 -13.5 268 931 0.0374 0.00239 1.86 18.6 WorldPhysical msc + 12 -15 268 931 0.0358 0.0016 1.86 20.5 WorldPhysical msc + 13 -19.2 265 936 0.0312 0.00455 6.76 27.3 WorldPhysical eIoni + 14 -20.6 264 937 0.0188 0.00129 1.97 29.2 WorldPhysical eIoni + 15 -23.4 264 937 0.013 0.00575 3.09 32.3 WorldPhysical eIoni + 16 -24.4 266 936 0.00793 0.00338 2.1 34.4 WorldPhysical eIoni + 17 -24.7 265 935 0.00223 0.00571 1.44 35.9 WorldPhysical eIoni + 18 -24.6 265 936 0 0.00223 0.186 36 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 10, Parent ID = 6 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -24.4 266 936 0.00173 0 0 0 WorldPhysical initStep + 1 -24.4 266 936 0.00173 0 0.00353 0.00353 WorldPhysical msc + 2 -24.4 266 936 0 0.00173 0.126 0.129 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 9, Parent ID = 6 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -20.6 264 937 0.0111 0 0 0 WorldPhysical initStep + 1 -20.6 264 937 0.0111 6.86e-05 0.0938 0.0938 WorldPhysical msc + 2 -21.3 265 938 0.00739 0.00369 1.94 2.04 WorldPhysical eIoni + 3 -21.3 266 938 0.000813 0.00658 1.34 3.38 WorldPhysical eIoni + 4 -21.3 266 938 0 0.000813 0.0446 3.42 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 8, Parent ID = 6 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -8.78 271 926 0.00125 0 0 0 WorldPhysical initStep + 1 -8.78 271 926 0.00121 4.91e-05 0.00211 0.00211 WorldPhysical msc + 2 -8.79 271 926 0 0.00121 0.0746 0.0767 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 7, Parent ID = 6 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -1.65 276 925 0.00897 0 0 0 WorldPhysical initStep + 1 -1.66 276 925 0.00895 2.03e-05 0.0634 0.0634 WorldPhysical msc + 2 -2.52 276 925 0.00109 0.00786 1.62 1.69 WorldPhysical eIoni + 3 -2.51 276 925 0 0.00109 0.0653 1.75 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0205 274 915 0.00137 0 0 0 WorldPhysical initStep + 1 0.0184 274 915 0.00136 1.22e-05 0.00239 0.00239 WorldPhysical msc + 2 -0.0331 274 915 0 0.00136 0.0885 0.0908 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0142 251 836 0.00723 0 0 0 DriftChamberPhysical initStep + 1 -1.56 253 837 0.00593 0.00129 3.19 3.19 DriftChamberPhysical eIoni + 2 -2.09 255 835 0.00406 0.00187 2.64 5.83 DriftChamberPhysical eIoni + 3 -3.71 255 834 0.00255 0.00151 1.92 7.75 DriftChamberPhysical eIoni + 4 -4.23 255 833 0.00107 0.00148 0.81 8.56 DriftChamberPhysical eIoni + 5 -4.33 255 833 0 0.00107 0.339 8.9 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00511 214 714 0.00105 0 0 0 DriftChamberPhysical initStep + 1 -0.0222 214 714 0 0.00105 0.33 0.33 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00548 13.8 45.9 0.00329 0 0 0 WorldPhysical initStep + 1 0.0161 13.8 45.9 0.00328 3.68e-06 0.0108 0.0108 WorldPhysical msc + 2 0.207 13.8 45.9 0 0.00328 0.349 0.36 WorldPhysical eIoni +>>> Event 1 + 2 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.03999516657725281 (GeV) + 14 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.939886414565441 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0 30 100 1e+03 0.0175 104 104 DriftChamberPhysical CoupledTransportation + 2 0.0339 84.5 282 1e+03 0.00455 190 294 DriftChamberPhysical hIoni + 3 0.0769 153 510 1e+03 0.00628 239 533 DriftChamberPhysical msc + 4 0.135 222 739 1e+03 0.00599 239 771 DriftChamberPhysical msc + 5 0.152 238 792 1e+03 0.00135 56 827 DriftChamberPhysical hIoni + 6 0.155 240 800 1e+03 0.000101 7.67 835 DriftChamberPhysical hIoni + 7 0.19 270 900 1e+03 0.0031 105 940 WorldPhysical CoupledTransportation + 8 0.227 285 950 1e+03 0.017 104 1.04e+03 WorldPhysical CoupledTransportation +ExN05PionShowerModel::DoIt + 9 0.227 285 950 0 1e+03 0 1.04e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.155 240 800 0.0117 0 0 0 DriftChamberPhysical initStep + 1 1.05 245 799 0.0101 0.00155 5.62 5.62 DriftChamberPhysical eIoni + 2 1.38 250 797 0.00757 0.00253 4.65 10.3 DriftChamberPhysical eIoni + 3 2.99 253 797 0.00483 0.00274 3.34 13.6 DriftChamberPhysical eIoni + 4 4.71 254 797 0.00319 0.00164 2.21 15.8 DriftChamberPhysical eIoni + 5 5.34 255 797 0.00174 0.00145 1.57 17.4 DriftChamberPhysical eIoni + 6 5.29 256 797 0 0.00174 0.711 18.1 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.152 238 792 0.00388 0 0 0 DriftChamberPhysical initStep + 1 -0.981 237 793 0.00136 0.00252 1.85 1.85 DriftChamberPhysical eIoni + 2 -1.24 236 793 0 0.00136 0.486 2.34 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0339 84.5 282 0.000997 0 0 0 DriftChamberPhysical initStep + 1 -0.121 84.6 282 0 0.000997 0.306 0.306 DriftChamberPhysical eIoni +>>> Event 2 + 1 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.01999855289847564 (GeV) + 11 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.9799290920253061 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 -6.04e-06 0.435 1.45 1e+03 5.67e-05 1.51 1.51 WorldPhysical hIoni + 2 -0.0075 16.6 55.2 1e+03 0.00966 56.1 57.6 WorldPhysical hIoni + 3 -0.00688 30 100 1e+03 0.00726 46.8 104 DriftChamberPhysical CoupledTransportation + 4 -0.0382 98.6 329 1e+03 0.00619 239 343 DriftChamberPhysical msc + 5 -0.092 167 557 1e+03 0.00571 239 582 DriftChamberPhysical msc + 6 -0.154 236 786 1e+03 0.00607 239 820 DriftChamberPhysical msc + 7 -0.176 270 900 1e+03 0.00268 119 940 WorldPhysical CoupledTransportation + 8 -0.173 285 950 1e+03 0.0138 103 1.04e+03 WorldPhysical hIoni +ExN05PionShowerModel::DoIt + 9 -0.173 285 950 0 1e+03 0 1.04e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.173 285 950 0.00386 0 0 0 WorldPhysical initStep + 1 -0.181 285 950 0.00384 2.68e-05 0.0144 0.0144 WorldPhysical msc + 2 -0.283 285 950 0 0.00384 0.456 0.47 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0075 16.6 55.2 0.00125 0 0 0 WorldPhysical initStep + 1 -0.00938 16.6 55.2 0.00125 0 0.00209 0.00209 WorldPhysical msc + 2 -0.0299 16.6 55.2 0 0.00125 0.0782 0.0803 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -6.04e-06 0.435 1.45 0.00231 0 0 0 WorldPhysical initStep + 1 0.0042 0.431 1.45 0.00231 0 0.00578 0.00578 WorldPhysical msc + 2 0.0184 0.413 1.46 0 0.00231 0.196 0.202 WorldPhysical eIoni +>>> Event 3 + 0 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0 (GeV) + 9 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.9999411708949256 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0.00597 16.5 54.8 1e+03 0.00838 57.3 57.3 WorldPhysical hIoni + 2 0.00747 21.9 72.9 1e+03 0.00241 18.9 76.1 WorldPhysical hIoni + 3 0.0118 28.1 93.7 1e+03 0.0026 21.7 97.8 WorldPhysical hIoni + 4 0.0133 30 100 1e+03 0.00111 6.6 104 DriftChamberPhysical CoupledTransportation + 5 0.0931 98.6 329 1e+03 0.00549 239 343 DriftChamberPhysical msc + 6 0.181 167 557 1e+03 0.00551 239 582 DriftChamberPhysical msc + 7 0.233 236 786 1e+03 0.00564 239 820 DriftChamberPhysical msc + 8 0.253 270 900 1e+03 0.00242 119 940 WorldPhysical CoupledTransportation + 9 0.242 285 950 1e+03 0.0147 104 1.04e+03 WorldPhysical CoupledTransportation +ExN05PionShowerModel::DoIt + 10 0.242 285 950 0 1e+03 0 1.04e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0118 28.1 93.7 0.0035 0 0 0 WorldPhysical initStep + 1 0.0215 28.1 93.7 0.0034 9.63e-05 0.0119 0.0119 WorldPhysical msc + 2 0.0801 28.1 93.7 0 0.0034 0.372 0.384 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00747 21.9 72.9 0.00692 0 0 0 WorldPhysical initStep + 1 0.0457 21.9 72.9 0.00689 2.75e-05 0.0399 0.0399 WorldPhysical msc + 2 0.954 21.9 72.9 0 0.00689 1.23 1.27 WorldPhysical eIoni +>>> Event 4 + 1 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.05999648154539951 (GeV) + 9 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.8999472231809926 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +number of event = 5 +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +### Run 6 start. +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0 -30 100 1e+03 0.0157 104 104 DriftChamberPhysical CoupledTransportation + 2 0.0984 -98.6 329 1e+03 0.00393 239 343 DriftChamberPhysical msc + 3 0.12 -115 383 1e+03 0.00103 56.3 399 DriftChamberPhysical hIoni + 4 0.232 -183 611 1e+03 0.00511 239 638 DriftChamberPhysical msc + 5 0.353 -252 840 1e+03 0.00443 239 877 DriftChamberPhysical msc + 6 0.388 -270 900 1e+03 0.00157 63 940 WorldPhysical CoupledTransportation + 7 0.419 -285 949 1e+03 0.00992 51 991 WorldPhysical hIoni + 8 0.419 -285 949 1e+03 0 0.165 991 WorldPhysical hIoni + 9 0.414 -285 950 1e+03 0.00926 53.3 1.04e+03 WorldPhysical CoupledTransportation +ExN05PionShowerModel::DoIt + 10 0.414 -285 950 0 1e+03 0 1.04e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.419 -285 949 0.00129 0 0 0 WorldPhysical initStep + 1 0.421 -285 949 0.00129 0 0.0022 0.0022 WorldPhysical msc + 2 0.423 -285 949 0 0.00129 0.0819 0.0841 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.419 -285 949 0.00128 0 0 0 WorldPhysical initStep + 1 0.419 -285 949 0.00123 4.74e-05 0.00217 0.00217 WorldPhysical msc + 2 0.425 -285 949 0 0.00123 0.0768 0.079 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.12 -115 383 0.00169 0 0 0 DriftChamberPhysical initStep + 1 0.234 -115 382 0 0.00169 0.679 0.679 DriftChamberPhysical eIoni +>>> Event 0 + 0 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0 (GeV) + 11 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.9999448257585765 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 -0.00974 -22.6 75.2 1e+03 0.0112 78.6 78.6 WorldPhysical hIoni + 2 -0.00937 -23.5 78.3 1e+03 0.000449 3.24 81.8 WorldPhysical hIoni + 3 -0.00818 -30 100 1e+03 0.00433 22.6 104 DriftChamberPhysical CoupledTransportation + 4 -0.0169 -98.6 329 1e+03 0.00532 239 343 DriftChamberPhysical msc + 5 -0.0203 -167 557 1e+03 0.00475 239 582 DriftChamberPhysical msc + 6 -0.0354 -236 786 1e+03 0.00596 239 820 DriftChamberPhysical msc + 7 -0.0521 -270 900 1e+03 0.0022 119 940 WorldPhysical CoupledTransportation + 8 -0.0553 -275 916 1e+03 0.00493 16.4 956 WorldPhysical hIoni + 9 -0.0577 -284 946 1e+03 0.00616 31.2 987 WorldPhysical hIoni + 10 -0.0597 -285 950 1e+03 0.00747 56.7 1.04e+03 WorldPhysical CoupledTransportation +ExN05PionShowerModel::DoIt + 11 -0.0597 -285 950 0 1e+03 0 1.04e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0577 -284 946 0.0027 0 0 0 WorldPhysical initStep + 1 -0.0648 -284 946 0.00268 1.59e-05 0.00762 0.00762 WorldPhysical msc + 2 -0.165 -284 946 0 0.00268 0.25 0.258 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0553 -275 916 0.0181 0 0 0 WorldPhysical initStep + 1 -0.262 -275 916 0.018 0.000136 0.225 0.225 WorldPhysical msc + 2 -2.84 -274 917 0.0137 0.00426 2.97 3.19 WorldPhysical eIoni + 3 -3.34 -273 918 0.00864 0.0051 2.32 5.52 WorldPhysical eIoni + 4 -4.41 -272 918 0.00288 0.00577 1.57 7.09 WorldPhysical eIoni + 5 -4.52 -272 918 0 0.00288 0.281 7.37 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.00937 -23.5 78.3 0.00441 0 0 0 WorldPhysical initStep + 1 0.0063 -23.5 78.3 0.0042 0.00021 0.0179 0.0179 WorldPhysical msc + 2 0.329 -23.8 78.3 0 0.0042 0.533 0.551 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.00974 -22.6 75.2 0.023 0 0 0 WorldPhysical initStep + 1 -0.103 -22.3 75.4 0.0227 0.000343 0.347 0.347 WorldPhysical msc + 2 -1.88 -20.8 75.7 0.0198 0.00288 3.79 4.14 WorldPhysical eIoni + 3 -2.5 -19.7 78 0.0164 0.00344 3.26 7.39 WorldPhysical eIoni + 4 -4.45 -20.1 79.8 0.0119 0.00446 2.71 10.1 WorldPhysical eIoni + 5 -4.57 -20.3 80.2 0.00934 0.00135 0.443 10.5 WorldPhysical eIoni + 6 -4.26 -21 81.5 0.00501 0.00433 1.68 12.2 WorldPhysical eIoni + 7 -4.14 -20.9 81.9 0 0.00501 0.722 12.9 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 6, Parent ID = 2 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -4.57 -20.3 80.2 0.00125 0 0 0 WorldPhysical initStep + 1 -4.57 -20.3 80.2 0.00125 0 0.00208 0.00208 WorldPhysical msc + 2 -4.59 -20.2 80.2 0 0.00125 0.0779 0.0799 WorldPhysical eIoni +>>> Event 1 + 3 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.05999393873875495 (GeV) + 11 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.9399050402404941 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 -0.00931 -22.1 73.7 1e+03 0.0106 76.9 76.9 WorldPhysical hIoni + 2 -0.0126 -26.8 89.5 999 0.00275 16.5 93.5 WorldPhysical hIoni + 3 -0.00634 -30 100 999 0.00132 10.9 104 DriftChamberPhysical CoupledTransportation + 4 0.136 -98.7 329 999 0.0045 239 343 DriftChamberPhysical msc + 5 0.291 -167 557 999 0.00474 239 582 DriftChamberPhysical msc + 6 0.433 -236 786 999 0.0047 239 820 DriftChamberPhysical msc + 7 0.5 -270 900 999 0.00352 119 940 WorldPhysical CoupledTransportation + 8 0.505 -273 908 999 0.000867 8.66 948 WorldPhysical hIoni + 9 0.525 -285 950 999 0.0113 95.8 1.04e+03 WorldPhysical CoupledTransportation +ExN05PionShowerModel::DoIt + 10 0.525 -285 950 0 999 0 1.04e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.505 -273 908 0.00318 0 0 0 WorldPhysical initStep + 1 0.511 -273 908 0.00314 4.09e-05 0.0104 0.0104 WorldPhysical msc + 2 0.58 -273 908 0 0.00314 0.323 0.333 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0126 -26.8 89.5 0.905 0 0 0 WorldPhysical initStep + 1 -8.24 -24.4 100 0.903 0.00164 13.6 13.6 DriftChamberPhysical CoupledTransportation + 2 -137 21.9 255 0.894 0.0048 207 221 DriftChamberPhysical eIoni + 3 -312 96.8 483 0.886 0.00775 297 518 DriftChamberPhysical msc + 4 -504 138 705 0.88 0.00636 297 815 DriftChamberPhysical msc + 5 -657 165 900 0.874 0.00541 249 1.06e+03 WorldPhysical CoupledTransportation + 6 -668 169 912 0.871 0.00145 16.4 1.08e+03 WorldPhysical eIoni + 7 -679 171 924 0.867 0.00322 16.3 1.1e+03 WorldPhysical eIoni + 8 -692 190 952 0.854 0.0132 101 1.2e+03 WorldPhysical CoupledTransportation + 9 -733 222 987 0.839 0.0109 62.6 1.26e+03 WorldPhysical eIoni + 10 -753 229 1e+03 0.834 0.00539 25.7 1.29e+03 Crystal CoupledTransportation + 11 -753 229 1e+03 0.814 0.0194 0.0263 1.29e+03 Crystal msc + 12 -754 229 1e+03 0.798 0.0156 0.0263 1.29e+03 Crystal msc + 13 -754 229 1e+03 0.79 0.00863 0.0263 1.29e+03 Crystal msc + 14 -754 229 1e+03 0.785 0.00504 0.0263 1.29e+03 Crystal msc + 15 -754 229 1e+03 0.775 0.0097 0.0263 1.29e+03 Crystal msc + 16 -754 229 1e+03 0.768 0.00677 0.0263 1.29e+03 Crystal msc + 17 -754 229 1e+03 0.76 0.00855 0.0263 1.29e+03 Crystal msc + 18 -753 229 1e+03 0.74 0.0198 0.0263 1.29e+03 Crystal msc + 19 -753 229 1e+03 0.72 0.0204 0.0263 1.29e+03 Crystal msc + 20 -753 229 1e+03 0.708 0.0115 0.0263 1.29e+03 Crystal msc + 21 -753 229 1e+03 0.697 0.011 0.0263 1.29e+03 Crystal msc + 22 -753 229 1e+03 0.687 0.00985 0.0263 1.29e+03 Crystal msc + 23 -753 229 1e+03 0.677 0.0106 0.0263 1.29e+03 Crystal msc + 24 -753 229 1e+03 0.665 0.0119 0.0263 1.29e+03 Crystal msc + 25 -753 229 1e+03 0.653 0.0117 0.0263 1.29e+03 Crystal msc + 26 -753 229 1e+03 0.643 0.00998 0.0263 1.29e+03 Crystal msc + 27 -753 229 1e+03 0.629 0.0135 0.0263 1.29e+03 Crystal msc + 28 -753 229 1e+03 0.621 0.00824 0.0263 1.29e+03 Crystal msc + 29 -753 229 1e+03 0.613 0.0081 0.0263 1.29e+03 Crystal msc + 30 -753 229 1e+03 0.595 0.0176 0.0263 1.29e+03 Crystal msc + 31 -753 229 1e+03 0.579 0.0165 0.0263 1.29e+03 Crystal msc + 32 -753 229 1e+03 0.562 0.017 0.0263 1.29e+03 Crystal msc + 33 -753 229 1e+03 0.551 0.011 0.0263 1.29e+03 Crystal msc + 34 -753 229 1e+03 0.542 0.009 0.0263 1.29e+03 Crystal msc + 35 -753 229 1e+03 0.532 0.00965 0.0263 1.29e+03 Crystal msc + 36 -753 229 1e+03 0.519 0.0136 0.0263 1.29e+03 Crystal msc + 37 -753 229 1e+03 0.509 0.0098 0.0263 1.29e+03 Crystal msc + 38 -753 229 1e+03 0.496 0.0131 0.0263 1.29e+03 Crystal msc + 39 -753 229 1e+03 0.486 0.00976 0.0263 1.29e+03 Crystal msc + 40 -753 229 1e+03 0.475 0.0111 0.0263 1.29e+03 Crystal msc + 41 -753 229 1e+03 0.458 0.0171 0.0263 1.29e+03 Crystal msc + 42 -753 229 1e+03 0.446 0.0117 0.0263 1.29e+03 Crystal msc + 43 -753 229 1e+03 0.435 0.0115 0.0263 1.29e+03 Crystal msc + 44 -753 229 1e+03 0.423 0.0117 0.0263 1.29e+03 Crystal msc + 45 -753 229 1e+03 0.406 0.0165 0.0263 1.29e+03 Crystal msc + 46 -753 229 1e+03 0.389 0.0175 0.0263 1.29e+03 Crystal msc + 47 -753 229 1e+03 0.377 0.0121 0.0267 1.29e+03 WorldPhysical CoupledTransportation + 48 -750 268 981 0.371 0.00558 42.9 1.33e+03 WorldPhysical msc + 49 -748 301 955 0.363 0.00863 42.9 1.37e+03 WorldPhysical msc + 50 -757 307 953 0.356 0.0042 30.4 1.4e+03 WorldPhysical eIoni + +*** G4Exception : UnexpectedPositionShift + issued by : G4Navigator::ComputeStep() +Accuracy ERROR or slightly inaccurate position shift. +*** This is just a warning message. + The Step's starting point has moved 1255.638056 mm + since the last call to a Locate method. + This has resulted in moving 11.94377434 mm from the last point at which the safety was calculated + which is more than the computed safety= 5.137881264 mm at that point. + This difference is 6.805893074 mm. + The tolerated accuracy is 1e-06 mm. + This problem can be due to either + - a process that has proposed a displacement larger than the current safety , or + - inaccuracy in the computation of the safety + We suggest that you + - find i) what particle is being tracked, and ii) through what part of your geometry + for example by re-running this event with + /tracking/verbose 1 + - check which processes you declare for this particle (and look at non-standard ones) + - in case, create a detailed logfile of this event using: + /tracking/verbose 6 +ERROR - G4Navigator::ComputeStep() + Position has shifted considerably without notifying the navigator ! + Tolerated safety: 5.137882264 + Computed shift : 142.6537454 + +*** G4Exception : SignificantPositionShift + issued by : G4Navigator::ComputeStep() +May lead to a crash or unreliable results. +*** This is just a warning message. + 51 -757 309 956 0.35 0.00324 26 1.43e+03 WorldPhysical eIoni + 52 -765 330 948 0.343 0.00694 42.9 1.47e+03 WorldPhysical msc + +*** G4Exception : UnexpectedPositionShift + issued by : G4Navigator::ComputeStep() +Accuracy ERROR or slightly inaccurate position shift. +*** This is just a warning message. + The Step's starting point has moved 1261.884801 mm + since the last call to a Locate method. + This has resulted in moving 23.47795813 mm from the last point at which the safety was calculated + which is more than the computed safety= 5.960486281 mm at that point. + This difference is 17.51747185 mm. + The tolerated accuracy is 1e-06 mm. +ERROR - G4Navigator::ComputeStep() + Position has shifted considerably without notifying the navigator ! + Tolerated safety: 5.960487281 + Computed shift : 551.2145181 + +*** G4Exception : SignificantPositionShift + issued by : G4Navigator::ComputeStep() +May lead to a crash or unreliable results. +*** This is just a warning message. + 53 -787 366 952 0.336 0.00718 42.9 1.51e+03 WorldPhysical msc + 54 -792 384 954 0.33 0.0051 18.8 1.53e+03 WorldPhysical eIoni + 55 -811 421 957 0.323 0.00761 42.9 1.58e+03 WorldPhysical msc + 56 -832 452 979 0.317 0.00591 42.9 1.62e+03 WorldPhysical msc + 57 -857 485 975 0.311 0.00586 42.9 1.66e+03 WorldPhysical msc + 58 -889 510 977 0.288 0.00619 42.5 1.71e+03 WorldPhysical eIoni + 59 -920 538 986 0.281 0.00698 42.9 1.75e+03 WorldPhysical msc + 60 -958 555 994 0.275 0.00575 42.9 1.79e+03 WorldPhysical msc + 61 -972 570 999 0.27 0.00372 21.7 1.81e+03 WorldPhysical eIoni + 62 -979 574 1e+03 0.267 0.00298 7.69 1.82e+03 Crystal CoupledTransportation + 63 -979 574 1e+03 0.264 0.00284 0.00557 1.82e+03 Crystal msc + 64 -979 574 1e+03 0.261 0.00295 0.00557 1.82e+03 Crystal msc + 65 -979 574 1e+03 0.258 0.00313 0.00557 1.82e+03 Crystal msc + 66 -979 574 1e+03 0.256 0.00233 0.00477 1.82e+03 WorldPhysical CoupledTransportation + 67 -992 589 988 0.251 0.00497 23.5 1.84e+03 WorldPhysical msc + 68 -1.01e+03 599 975 0.247 0.00397 23.5 1.87e+03 WorldPhysical msc + 69 -1.02e+03 613 960 0.243 0.00387 23.5 1.89e+03 WorldPhysical msc + 70 -1.02e+03 616 950 0.238 0.00461 23.5 1.91e+03 WorldPhysical msc + +*** G4Exception : UnexpectedPositionShift + issued by : G4Navigator::ComputeStep() +Accuracy ERROR or slightly inaccurate position shift. +*** This is just a warning message. + The Step's starting point has moved 1526.845997 mm + since the last call to a Locate method. + This has resulted in moving 11.71417139 mm from the last point at which the safety was calculated + which is more than the computed safety= 9.769864016 mm at that point. + This difference is 1.944307372 mm. + The tolerated accuracy is 1e-06 mm. +ERROR - G4Navigator::ComputeStep() + Position has shifted considerably without notifying the navigator ! + Tolerated safety: 9.769865016 + Computed shift : 137.2218113 + +*** G4Exception : SignificantPositionShift + issued by : G4Navigator::ComputeStep() +May lead to a crash or unreliable results. +*** This is just a warning message. + 71 -1.03e+03 633 934 0.233 0.00537 23.5 1.94e+03 WorldPhysical msc + 72 -1.03e+03 650 920 0.228 0.00456 23.5 1.96e+03 WorldPhysical msc + 73 -1.04e+03 663 901 0.224 0.00473 23.5 1.98e+03 WorldPhysical msc + 74 -1.04e+03 664 900 0.224 7.36e-05 1.34 1.99e+03 DriftChamberPhysical CoupledTransportation + 75 -1.06e+03 706 852 0.221 0.00237 67 2.05e+03 DriftChamberPhysical eIoni + 76 -1.13e+03 818 723 0.213 0.00813 186 2.24e+03 DriftChamberPhysical msc + 77 -1.13e+03 822 719 0.21 0.00117 5.94 2.24e+03 DriftChamberPhysical eIoni + 78 -1.15e+03 933 572 0.204 0.00597 186 2.43e+03 DriftChamberPhysical msc + 79 -1.15e+03 957 551 0.202 0.000958 32.3 2.46e+03 DriftChamberPhysical eIoni + 80 -1.16e+03 965 545 0.199 0.000615 9.85 2.47e+03 DriftChamberPhysical eIoni + 81 -1.17e+03 1.05e+03 476 0.195 0.00329 111 2.58e+03 DriftChamberPhysical eIoni + 82 -1.18e+03 1.12e+03 410 0.19 0.00288 93.8 2.68e+03 DriftChamberPhysical eIoni + 83 -1.22e+03 1.19e+03 249 0.183 0.00724 186 2.86e+03 DriftChamberPhysical msc + 84 -1.25e+03 1.25e+03 176 0.179 0.00402 97.9 2.96e+03 WorldPhysical CoupledTransportation + 85 -1.25e+03 1.26e+03 168 0.176 0.00283 12.8 2.97e+03 WorldPhysical msc + 86 -1.25e+03 1.27e+03 157 0.174 0.0026 12.8 2.99e+03 WorldPhysical msc + 87 -1.25e+03 1.27e+03 150 0.168 0.00215 8.07 2.99e+03 WorldPhysical eIoni + 88 -1.25e+03 1.27e+03 147 0.166 0.000477 2.56 3e+03 WorldPhysical eIoni + 89 -1.25e+03 1.27e+03 136 0.163 0.00311 12.8 3.01e+03 WorldPhysical msc + 90 -1.26e+03 1.28e+03 127 0.16 0.00283 12.8 3.02e+03 WorldPhysical msc + 91 -1.27e+03 1.29e+03 119 0.157 0.00322 12.8 3.04e+03 WorldPhysical msc + 92 -1.27e+03 1.29e+03 118 0.157 0 0.299 3.04e+03 WorldPhysical eIoni + 93 -1.27e+03 1.3e+03 113 0.155 0.00235 12.8 3.05e+03 WorldPhysical msc + 94 -1.27e+03 1.31e+03 106 0.151 0.00382 12.8 3.06e+03 WorldPhysical msc + 95 -1.27e+03 1.32e+03 96.9 0.148 0.00296 12.8 3.07e+03 WorldPhysical msc + 96 -1.27e+03 1.33e+03 88.1 0.145 0.00258 12.8 3.09e+03 WorldPhysical msc + 97 -1.26e+03 1.33e+03 81.3 0.142 0.0038 12.8 3.1e+03 WorldPhysical msc + 98 -1.25e+03 1.34e+03 75.8 0.139 0.00271 12.8 3.11e+03 WorldPhysical msc + 99 -1.24e+03 1.35e+03 68.4 0.136 0.00314 12.8 3.13e+03 WorldPhysical msc + 100 -1.24e+03 1.35e+03 58.6 0.133 0.00256 12.8 3.14e+03 WorldPhysical msc + 101 -1.23e+03 1.36e+03 49.1 0.129 0.00426 12.8 3.15e+03 WorldPhysical msc + 102 -1.24e+03 1.37e+03 41.7 0.124 0.00518 12.8 3.16e+03 WorldPhysical msc + 103 -1.24e+03 1.38e+03 38.4 0.121 0.00268 12.8 3.18e+03 WorldPhysical msc + 104 -1.24e+03 1.39e+03 32.9 0.117 0.00392 12.8 3.19e+03 WorldPhysical msc + 105 -1.24e+03 1.4e+03 27.7 0.111 0.00598 12.8 3.2e+03 WorldPhysical msc + 106 -1.24e+03 1.41e+03 21.6 0.106 0.00561 12.8 3.22e+03 WorldPhysical msc + 107 -1.23e+03 1.42e+03 19.8 0.0924 0.0028 8.42 3.22e+03 WorldPhysical eIoni + 108 -1.23e+03 1.43e+03 14.9 0.0877 0.00471 12.8 3.24e+03 WorldPhysical msc + 109 -1.23e+03 1.43e+03 12.3 0.084 0.00179 3.1 3.24e+03 WorldPhysical eIoni + 110 -1.23e+03 1.43e+03 6.21 0.0791 0.00272 7.53 3.25e+03 WorldPhysical eIoni + 111 -1.23e+03 1.44e+03 -0.353 0.0718 0.00407 7.53 3.25e+03 WorldPhysical eIoni + 112 -1.23e+03 1.44e+03 -6.39 0.0688 0.00299 6.37 3.26e+03 WorldPhysical eIoni + 113 -1.23e+03 1.44e+03 -6.97 0.0673 5.23e-05 0.576 3.26e+03 WorldPhysical eIoni + 114 -1.22e+03 1.44e+03 -17.9 0.0613 0.00597 12.8 3.27e+03 WorldPhysical msc + 115 -1.22e+03 1.44e+03 -19.3 0.0583 0.000523 2.43 3.28e+03 WorldPhysical eIoni + 116 -1.21e+03 1.44e+03 -29.1 0.051 0.0073 12.8 3.29e+03 WorldPhysical msc + 117 -1.21e+03 1.44e+03 -30.9 0.048 0.000503 1.95 3.29e+03 WorldPhysical eIoni + 118 -1.21e+03 1.44e+03 -31 0.0405 0.000146 0.137 3.29e+03 WorldPhysical eIoni + 119 -1.21e+03 1.44e+03 -35.5 0.0353 0.0039 6.2 3.3e+03 WorldPhysical eIoni + 120 -1.21e+03 1.44e+03 -34 0.0301 0.00514 6.63 3.3e+03 WorldPhysical eIoni + 121 -1.22e+03 1.45e+03 -34.4 0.0257 0.00446 5.34 3.31e+03 WorldPhysical eIoni + 122 -1.22e+03 1.45e+03 -36.2 0.022 0.00369 4.36 3.31e+03 WorldPhysical eIoni + 123 -1.22e+03 1.45e+03 -37.1 0.0163 0.00562 3.65 3.32e+03 WorldPhysical eIoni + 124 -1.22e+03 1.45e+03 -37.1 0.014 8.9e-05 0.116 3.32e+03 WorldPhysical eIoni + 125 -1.22e+03 1.45e+03 -38.6 0.00823 0.00581 2.37 3.32e+03 WorldPhysical eIoni + 126 -1.22e+03 1.45e+03 -39.4 0.000869 0.00736 1.5 3.32e+03 WorldPhysical eIoni + 127 -1.22e+03 1.45e+03 -39.3 0 0.000869 0.0486 3.32e+03 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 30, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -1.22e+03 1.45e+03 -37.1 0.00222 0 0 0 WorldPhysical initStep + 1 -1.22e+03 1.45e+03 -37.1 0.00222 0 0.0054 0.0054 WorldPhysical msc + 2 -1.22e+03 1.45e+03 -37 0 0.00222 0.185 0.19 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 29, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -1.21e+03 1.44e+03 -35.5 0.0013 0 0 0 WorldPhysical initStep + 1 -1.21e+03 1.44e+03 -35.5 0.000801 0.000499 0.00222 0.00222 WorldPhysical msc + 2 -1.21e+03 1.44e+03 -35.5 0 0.000801 0.0438 0.046 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 28, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -1.21e+03 1.44e+03 -31 0.00735 0 0 0 WorldPhysical initStep + 1 -1.21e+03 1.44e+03 -31 0.00714 0.000205 0.0444 0.0444 WorldPhysical msc + 2 -1.21e+03 1.44e+03 -31.3 0.00133 0.00581 1.29 1.34 WorldPhysical eIoni + 3 -1.21e+03 1.44e+03 -31.3 0 0.00133 0.0858 1.42 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 27, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -1.21e+03 1.44e+03 -30.9 0.00251 0 0 0 WorldPhysical initStep + 1 -1.21e+03 1.44e+03 -30.9 0.00247 4.13e-05 0.00686 0.00686 WorldPhysical msc + 2 -1.21e+03 1.44e+03 -30.9 0.00193 0.000536 0.0483 0.0551 WorldPhysical eIoni + 3 -1.21e+03 1.44e+03 -30.9 0 0.00193 0.148 0.203 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 26, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -1.22e+03 1.44e+03 -19.3 0.00252 0 0 0 WorldPhysical initStep + 1 -1.22e+03 1.44e+03 -19.3 0.00252 0 0.00694 0.00694 WorldPhysical msc + 2 -1.22e+03 1.44e+03 -19.4 0 0.00252 0.225 0.232 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 25, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -1.23e+03 1.44e+03 -6.97 0.0015 0 0 0 WorldPhysical initStep + 1 -1.23e+03 1.44e+03 -6.97 0.0015 0 0.00279 0.00279 WorldPhysical msc + 2 -1.23e+03 1.44e+03 -6.97 0 0.0015 0.102 0.105 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 24, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -1.23e+03 1.44e+03 -0.353 0.00315 0 0 0 WorldPhysical initStep + 1 -1.23e+03 1.44e+03 -0.351 0.00297 0.000181 0.0102 0.0102 WorldPhysical msc + 2 -1.23e+03 1.44e+03 -0.32 0 0.00297 0.296 0.306 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 23, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -1.23e+03 1.43e+03 6.21 0.00224 0 0 0 WorldPhysical initStep + 1 -1.23e+03 1.43e+03 6.21 0.00223 8.18e-06 0.00548 0.00548 WorldPhysical msc + 2 -1.23e+03 1.43e+03 6.23 0 0.00223 0.186 0.192 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 22, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -1.23e+03 1.43e+03 12.3 0.00186 0 0 0 WorldPhysical initStep + 1 -1.23e+03 1.43e+03 12.3 0.00155 0.000303 0.00399 0.00399 WorldPhysical msc + 2 -1.23e+03 1.43e+03 12.3 0 0.00155 0.107 0.111 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 21, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -1.23e+03 1.42e+03 19.8 0.0104 0 0 0 WorldPhysical initStep + 1 -1.23e+03 1.42e+03 19.8 0.0104 8.36e-06 0.084 0.084 WorldPhysical msc + 2 -1.24e+03 1.42e+03 18.8 0.00348 0.00691 1.84 1.92 WorldPhysical eIoni + 3 -1.24e+03 1.42e+03 18.6 0 0.00348 0.387 2.31 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 20, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -1.25e+03 1.27e+03 147 0.00111 0 0 0 WorldPhysical initStep + 1 -1.25e+03 1.27e+03 147 0.00111 0 0.00166 0.00166 WorldPhysical msc + 2 -1.25e+03 1.27e+03 147 0 0.00111 0.0664 0.0681 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 19, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -1.25e+03 1.27e+03 150 0.0038 0 0 0 WorldPhysical initStep + 1 -1.25e+03 1.27e+03 150 0.0038 0 0.0139 0.0139 WorldPhysical msc + 2 -1.25e+03 1.27e+03 150 0 0.0038 0.448 0.462 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 18, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -1.18e+03 1.12e+03 410 0.00119 0 0 0 DriftChamberPhysical initStep + 1 -1.18e+03 1.12e+03 410 0 0.00119 0.395 0.395 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 17, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -1.17e+03 1.05e+03 476 0.00141 0 0 0 DriftChamberPhysical initStep + 1 -1.17e+03 1.05e+03 476 0 0.00141 0.512 0.512 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 16, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -1.16e+03 965 545 0.0018 0 0 0 DriftChamberPhysical initStep + 1 -1.16e+03 966 545 0 0.0018 0.747 0.747 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 15, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -1.15e+03 957 551 0.00145 0 0 0 DriftChamberPhysical initStep + 1 -1.15e+03 957 550 0 0.00145 0.533 0.533 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 14, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -1.13e+03 822 719 0.0019 0 0 0 DriftChamberPhysical initStep + 1 -1.13e+03 822 719 0 0.0019 0.811 0.811 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 13, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -972 570 999 0.00118 0 0 0 WorldPhysical initStep + 1 -972 570 999 0.00118 0 0.00186 0.00186 WorldPhysical msc + 2 -972 570 999 0 0.00118 0.0724 0.0742 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 12, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -889 510 977 0.017 0 0 0 WorldPhysical initStep + 1 -889 510 977 0.017 4.83e-05 0.202 0.202 WorldPhysical msc + 2 -888 511 975 0.0122 0.00477 2.8 3.01 WorldPhysical eIoni + 3 -888 510 974 0.00585 0.00636 2.1 5.1 WorldPhysical eIoni + 4 -888 510 974 0 0.00585 0.957 6.06 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 11, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -792 384 954 0.00101 0 0 0 WorldPhysical initStep + 1 -792 384 954 0.00101 0 0.00146 0.00146 WorldPhysical msc + 2 -792 384 954 0 0.00101 0.0585 0.0599 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 10, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -757 309 956 0.00251 0 0 0 WorldPhysical initStep + 1 -757 309 956 0.00246 4.37e-05 0.00687 0.00687 WorldPhysical msc + 2 -757 309 956 0 0.00246 0.217 0.224 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 9, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -757 307 953 0.00218 0 0 0 WorldPhysical initStep + 1 -757 307 953 0.00218 0 0.00525 0.00525 WorldPhysical msc + 2 -757 307 953 0 0.00218 0.18 0.185 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 8, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -733 222 987 0.00414 0 0 0 WorldPhysical initStep + 1 -733 222 987 0.00411 2.29e-05 0.0162 0.0162 WorldPhysical msc + 2 -733 222 987 0 0.00411 0.514 0.53 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 7, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -679 171 924 0.000998 0 0 0 WorldPhysical initStep + 1 -679 171 924 0.000998 0 0.00144 0.00144 WorldPhysical msc + 2 -679 171 924 0 0.000998 0.0577 0.0591 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 6, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -668 169 912 0.00148 0 0 0 WorldPhysical initStep + 1 -668 169 912 0.00148 0 0.00272 0.00272 WorldPhysical msc + 2 -668 169 912 0 0.00148 0.0999 0.103 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -137 21.9 255 0.00436 0 0 0 DriftChamberPhysical initStep + 1 -138 20.5 254 0.00251 0.00186 2.04 2.04 DriftChamberPhysical eIoni + 2 -137 19.6 254 0.000329 0.00218 1.23 3.27 DriftChamberPhysical eIoni + 3 -137 19.6 254 0 0.000329 0.0909 3.36 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.00931 -22.1 73.7 0.00115 0 0 0 WorldPhysical initStep + 1 -0.00825 -22.1 73.7 0.0011 4.77e-05 0.00177 0.00177 WorldPhysical msc + 2 0.0174 -22.1 73.7 0 0.0011 0.0661 0.0679 WorldPhysical eIoni +>>> Event 2 + 3 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.02044898977980272 (GeV) + 10 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.979065719003161 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0.00229 -10.1 33.6 1e+03 0.00607 35.1 35.1 WorldPhysical hIoni + 2 -0.000969 -30 100 1e+03 0.0102 69.3 104 DriftChamberPhysical CoupledTransportation + 3 -0.057 -98.6 329 1e+03 0.00672 239 343 DriftChamberPhysical msc + 4 -0.0819 -149 496 1e+03 0.00335 175 518 DriftChamberPhysical hIoni + 5 -0.0646 -217 725 1e+03 0.00462 239 757 DriftChamberPhysical msc + 6 -0.0538 -270 900 1e+03 0.00384 183 940 WorldPhysical CoupledTransportation + 7 -0.0529 -275 917 1e+03 0.00281 18.2 958 WorldPhysical hIoni + 8 -0.0534 -277 923 1e+03 0.00105 5.61 963 WorldPhysical hIoni + 9 -0.0543 -279 932 1e+03 0.000748 9.07 973 WorldPhysical hIoni + 10 -0.0534 -285 950 1e+03 0.00826 49.1 1.02e+03 WorldPhysical hIoni +ExN05PionShowerModel::DoIt + 11 -0.0534 -285 950 0 1e+03 0 1.02e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 7, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0534 -285 950 0.00206 0 0 0 WorldPhysical initStep + 1 -0.0495 -285 950 0.00203 3.56e-05 0.00483 0.00483 WorldPhysical msc + 2 -0.0446 -285 950 0 0.00203 0.159 0.164 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 6, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0543 -279 932 0.00123 0 0 0 WorldPhysical initStep + 1 -0.0523 -279 932 0.00113 0.000101 0.00203 0.00203 WorldPhysical msc + 2 -0.0128 -279 932 0 0.00113 0.0687 0.0707 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0534 -277 923 0.00102 0 0 0 WorldPhysical initStep + 1 -0.0534 -277 923 0.00102 0 0.00148 0.00148 WorldPhysical msc + 2 -0.054 -277 923 0 0.00102 0.0592 0.0606 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0529 -275 917 0.00181 0 0 0 WorldPhysical initStep + 1 -0.0544 -275 917 0.00181 0 0.00382 0.00382 WorldPhysical msc + 2 -0.0611 -275 917 0 0.00181 0.135 0.139 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.0819 -149 496 0.00132 0 0 0 DriftChamberPhysical initStep + 1 -0.198 -149 496 0 0.00132 0.461 0.461 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00229 -10.1 33.6 0.0014 0 0 0 WorldPhysical initStep + 1 0.000685 -10.1 33.6 0.00134 5.4e-05 0.00246 0.00246 WorldPhysical msc + 2 0.00188 -10.1 33.6 0 0.00134 0.0869 0.0894 WorldPhysical eIoni +>>> Event 3 + 3 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.05999660920544716 (GeV) + 14 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.9399468775520056 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0 -30 100 1e+03 0.0113 104 104 DriftChamberPhysical CoupledTransportation + 2 0.0166 -98.6 329 1e+03 0.00506 239 343 DriftChamberPhysical msc + 3 0.0283 -167 557 1e+03 0.00589 239 582 DriftChamberPhysical msc + 4 0.0297 -236 786 1e+03 0.00541 239 820 DriftChamberPhysical msc + 5 0.039 -270 900 1e+03 0.00214 119 940 WorldPhysical CoupledTransportation + 6 0.0389 -273 910 1e+03 0.00245 10.2 950 WorldPhysical hIoni + 7 0.0379 -279 929 1e+03 0.00276 19.8 970 WorldPhysical hIoni + 8 0.0483 -285 950 1e+03 0.0106 74.4 1.04e+03 WorldPhysical CoupledTransportation +ExN05PionShowerModel::DoIt + 9 0.0483 -285 950 0 1e+03 0 1.04e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0379 -279 929 0.0195 0 0 0 WorldPhysical initStep + 1 -0.17 -279 929 0.0192 0.000287 0.26 0.26 WorldPhysical msc + 2 -2.06 -278 928 0.0145 0.00471 3.15 3.41 WorldPhysical eIoni + 3 -3.18 -278 927 0.00682 0.00517 1.73 5.15 WorldPhysical eIoni + 4 -2.91 -279 927 0.0018 0.00503 1.21 6.35 WorldPhysical eIoni + 5 -2.95 -279 927 0 0.0018 0.133 6.49 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 3 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -3.18 -278 927 0.00246 0 0 0 WorldPhysical initStep + 1 -3.18 -278 927 0.00245 1.38e-05 0.00659 0.00659 WorldPhysical msc + 2 -3.25 -278 927 0 0.00245 0.215 0.221 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0389 -273 910 0.00232 0 0 0 WorldPhysical initStep + 1 0.0426 -273 910 0.00232 0 0.00582 0.00582 WorldPhysical msc + 2 0.112 -273 910 0 0.00232 0.198 0.203 WorldPhysical eIoni +>>> Event 4 + 0 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0 (GeV) + 10 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.9999325836109803 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +number of event = 5 +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +### Run 7 start. +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 -8.29e-05 -11.6 19.4 1e+03 0.00475 22.6 22.6 WorldPhysical hIoni + 2 -0.00101 -20.4 34.1 1e+03 0.00158 17.1 39.7 WorldPhysical hIoni + 3 -0.00101 -20.5 34.1 1e+03 0 0.0698 39.8 WorldPhysical hIoni + 4 -0.00337 -60 100 1e+03 0.00836 76.8 117 DriftChamberPhysical CoupledTransportation + 5 -0.0352 -197 329 1e+03 0.00785 267 383 DriftChamberPhysical msc + 6 -0.0341 -334 557 1e+03 0.00648 267 650 DriftChamberPhysical msc + 7 -0.0512 -471 786 1e+03 0.00582 267 916 DriftChamberPhysical msc + 8 -0.0609 -540 900 1e+03 0.00367 133 1.05e+03 WorldPhysical CoupledTransportation + 9 -0.0686 -570 950 1e+03 0.0182 117 1.17e+03 WorldPhysical CoupledTransportation +ExN05PionShowerModel::DoIt + 10 -0.0686 -570 950 0 1e+03 0 1.17e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.00101 -20.5 34.1 0.0022 0 0 0 WorldPhysical initStep + 1 0.0009 -20.5 34.1 0.00217 2.74e-05 0.00532 0.00532 WorldPhysical msc + 2 0.0209 -20.5 34.1 0 0.00217 0.179 0.184 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.00101 -20.4 34.1 0.0025 0 0 0 WorldPhysical initStep + 1 -0.00155 -20.4 34.1 0.00245 5.13e-05 0.0068 0.0068 WorldPhysical msc + 2 -0.00825 -20.4 34.1 0 0.00245 0.214 0.221 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -8.29e-05 -11.6 19.4 0.00504 0 0 0 WorldPhysical initStep + 1 -0.0216 -11.6 19.4 0.00504 0 0.0234 0.0234 WorldPhysical msc + 2 -0.243 -11.7 19.4 0 0.00504 0.731 0.754 WorldPhysical eIoni +>>> Event 0 + 12 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.2799814082368458 (GeV) + 12 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.6599561765582793 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0.00733 -55.1 91.8 1e+03 0.0124 107 107 WorldPhysical hIoni + 2 0.00885 -60 100 1e+03 0.000806 9.61 117 DriftChamberPhysical CoupledTransportation + 3 0.0252 -113 188 1e+03 0.00264 103 220 DriftChamberPhysical hIoni + 4 0.027 -120 200 1e+03 0.000394 13.4 233 DriftChamberPhysical hIoni + 5 0.0553 -257 429 1e+03 0.00632 267 500 DriftChamberPhysical msc + 6 0.0788 -394 657 1e+03 0.00622 267 766 DriftChamberPhysical msc + 7 0.135 -531 886 1e+03 0.00547 267 1.03e+03 DriftChamberPhysical msc + 8 0.138 -540 900 1e+03 0.000702 16.6 1.05e+03 WorldPhysical CoupledTransportation + 9 0.149 -565 942 1e+03 0.00726 49.5 1.1e+03 WorldPhysical hIoni + 10 0.156 -570 950 1e+03 0.0109 67.1 1.17e+03 WorldPhysical CoupledTransportation +ExN05PionShowerModel::DoIt + 11 0.156 -570 950 0 1e+03 0 1.17e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.149 -565 942 0.00107 0 0 0 WorldPhysical initStep + 1 0.15 -565 942 0.000971 0.000103 0.00159 0.00159 WorldPhysical msc + 2 0.154 -565 942 0 0.000971 0.0558 0.0574 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.027 -120 200 0.00108 0 0 0 DriftChamberPhysical initStep + 1 0.148 -120 200 0 0.00108 0.343 0.343 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0252 -113 188 0.00272 0 0 0 DriftChamberPhysical initStep + 1 1.33 -113 188 0.00117 0.00155 1.35 1.35 DriftChamberPhysical eIoni + 2 1.31 -113 188 0 0.00117 0.386 1.74 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.00733 -55.1 91.8 0.00127 0 0 0 WorldPhysical initStep + 1 0.0092 -55.1 91.8 0.00126 9.84e-06 0.00215 0.00215 WorldPhysical msc + 2 0.0145 -55.1 91.8 0 0.00126 0.0789 0.081 WorldPhysical eIoni +>>> Event 1 + 7 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.1999881543320912 (GeV) + 8 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.7799538018951557 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0.0112 -43 71.6 1e+03 0.011 83.5 83.5 WorldPhysical hIoni + 2 0.00778 -60 100 1e+03 0.00693 33.1 117 DriftChamberPhysical CoupledTransportation + 3 -0.0497 -197 329 1e+03 0.00654 267 383 DriftChamberPhysical msc + 4 -0.12 -334 557 1e+03 0.00567 267 650 DriftChamberPhysical msc + 5 -0.167 -471 786 1e+03 0.00615 267 916 DriftChamberPhysical msc + 6 -0.207 -532 887 1e+03 0.00304 118 1.03e+03 DriftChamberPhysical hIoni + 7 -0.211 -540 900 1e+03 0.000156 15.3 1.05e+03 WorldPhysical CoupledTransportation + 8 -0.213 -545 908 1e+03 0.00104 9.41 1.06e+03 WorldPhysical hIoni + 9 -0.218 -563 939 1e+03 0.0059 36.5 1.1e+03 WorldPhysical hIoni + 10 -0.216 -570 950 1e+03 0.00755 39 1.13e+03 WorldPhysical hIoni +ExN05PionShowerModel::DoIt + 11 -0.216 -570 950 0 1e+03 0 1.13e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 6, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.216 -570 950 0.00112 0 0 0 WorldPhysical initStep + 1 -0.218 -570 950 0.00112 0 0.0017 0.0017 WorldPhysical msc + 2 -0.223 -570 950 0 0.00112 0.0676 0.0693 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.218 -563 939 0.00583 0 0 0 WorldPhysical initStep + 1 -0.223 -563 939 0.00582 5.45e-06 0.0294 0.0294 WorldPhysical msc + 2 -0.376 -563 940 0 0.00582 0.95 0.979 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.213 -545 908 0.00104 0 0 0 WorldPhysical initStep + 1 -0.214 -545 908 0.00103 8.15e-06 0.00153 0.00153 WorldPhysical msc + 2 -0.222 -545 908 0 0.00103 0.0607 0.0622 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.207 -532 887 0.00161 0 0 0 DriftChamberPhysical initStep + 1 -0.688 -532 887 0 0.00161 0.626 0.626 DriftChamberPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0112 -43 71.6 0.0016 0 0 0 WorldPhysical initStep + 1 0.014 -43 71.6 0.00128 0.000321 0.00318 0.00318 WorldPhysical msc + 2 0.0257 -43 71.6 0 0.00128 0.081 0.0842 WorldPhysical eIoni +>>> Event 2 + 6 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.1399908789334725 (GeV) + 11 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.8199465766103388 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 -0.00956 -52.6 87.7 1e+03 0.0145 102 102 WorldPhysical hIoni + 2 -0.00787 -57.6 96 1e+03 0.0025 9.68 112 WorldPhysical hIoni + 3 -0.00683 -60 100 1e+03 0.00105 4.65 117 DriftChamberPhysical CoupledTransportation + 4 0.0421 -197 329 1e+03 0.00569 267 383 DriftChamberPhysical msc + 5 0.0844 -316 527 1e+03 0.00597 231 614 DriftChamberPhysical hIoni + 6 0.114 -453 755 1e+03 0.00584 267 881 DriftChamberPhysical msc + 7 0.122 -540 900 1e+03 0.00457 169 1.05e+03 WorldPhysical CoupledTransportation + 8 0.124 -549 915 1e+03 0.00274 17.7 1.07e+03 WorldPhysical hIoni + 9 0.124 -550 916 1e+03 2.31e-05 0.909 1.07e+03 WorldPhysical hIoni + 10 0.13 -570 950 1e+03 0.00822 55.8 1.12e+03 WorldPhysical hIoni +ExN05PionShowerModel::DoIt + 11 0.13 -570 950 0 1e+03 0 1.12e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 6, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.13 -570 950 0.00767 0 0 0 WorldPhysical initStep + 1 0.139 -570 950 0.00756 0.000114 0.0486 0.0486 WorldPhysical msc + 2 0.358 -571 950 0.0021 0.00546 1.37 1.42 WorldPhysical eIoni + 3 0.373 -571 950 0 0.0021 0.169 1.59 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.124 -550 916 0.00244 0 0 0 WorldPhysical initStep + 1 0.13 -550 916 0.00242 1.65e-05 0.00643 0.00643 WorldPhysical msc + 2 0.226 -550 916 0 0.00242 0.211 0.217 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 4, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.124 -549 915 0.00375 0 0 0 WorldPhysical initStep + 1 0.115 -549 915 0.0037 5.61e-05 0.0135 0.0135 WorldPhysical msc + 2 0.0866 -549 915 0 0.0037 0.429 0.442 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.00787 -57.6 96 0.00123 0 0 0 WorldPhysical initStep + 1 -0.00978 -57.6 96 0.00123 0 0.00201 0.00201 WorldPhysical msc + 2 -0.0444 -57.6 96 0 0.00123 0.0764 0.0784 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 -0.00956 -52.6 87.7 0.00211 0 0 0 WorldPhysical initStep + 1 -0.012 -52.6 87.7 0.00211 0 0.00498 0.00498 WorldPhysical msc + 2 -0.0447 -52.6 87.8 0 0.00211 0.17 0.175 WorldPhysical eIoni +>>> Event 3 + 2 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.05999590330706202 (GeV) + 11 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.8999385496059302 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release + +********************************************************************************************************* +* G4Track Information: Particle = pi-, Track ID = 1, Parent ID = 0 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0 0 0 1e+03 0 0 0 WorldPhysical initStep + 1 0 -60 100 1e+03 0.0174 117 117 DriftChamberPhysical CoupledTransportation + 2 0.0337 -197 329 1e+03 0.00721 267 383 DriftChamberPhysical msc + 3 0.0575 -334 557 1e+03 0.0061 267 650 DriftChamberPhysical msc + 4 0.0907 -465 774 1e+03 0.0066 253 903 DriftChamberPhysical hIoni + 5 0.104 -540 900 1e+03 0.00302 146 1.05e+03 WorldPhysical CoupledTransportation + 6 0.116 -570 950 1e+03 0.012 66.3 1.12e+03 WorldPhysical hIoni +ExN05PionShowerModel::DoIt + 7 0.116 -570 950 0 1e+03 0 1.12e+03 WorldPhysical G4FSMP_parallelGeom + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 3, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.116 -570 950 0.00105 0 0 0 WorldPhysical initStep + 1 0.116 -570 950 0.00105 0 0.00154 0.00154 WorldPhysical msc + 2 0.119 -570 950 0 0.00105 0.0617 0.0632 WorldPhysical eIoni + +********************************************************************************************************* +* G4Track Information: Particle = e-, Track ID = 2, Parent ID = 1 +********************************************************************************************************* + +Step# X(mm) Y(mm) Z(mm) KinE(MeV) dE(MeV) StepLeng TrackLeng NextVolume ProcName + 0 0.0907 -465 774 0.00596 0 0 0 DriftChamberPhysical initStep + 1 0.773 -462 776 0.00486 0.00111 2.65 2.65 DriftChamberPhysical eIoni + 2 1.27 -461 777 0.00358 0.00127 2.22 4.87 DriftChamberPhysical eIoni + 3 1.35 -459 778 0.00188 0.00171 1.74 6.61 DriftChamberPhysical eIoni + 4 1.44 -459 778 0 0.00188 0.797 7.41 DriftChamberPhysical eIoni +>>> Event 4 + 9 hits are stored in EM ExN05CalorimeterHitsCollection. + Total energy deposition in EM calorimeter crytals : 0.2999821905092657 (GeV) + 11 hits are stored in HAD ExN05CalorimeterHitsCollection. + Total energy deposition in HAD calorimeter towers : 0.5999643810185314 (GeV) +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +number of event = 5 +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release +G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release diff --git a/examples/novice/N05/include/ExN05CalorimeterHit.hh b/examples/novice/N05/include/ExN05CalorimeterHit.hh index 48dbcb48db..2642c89ec0 100644 --- a/examples/novice/N05/include/ExN05CalorimeterHit.hh +++ b/examples/novice/N05/include/ExN05CalorimeterHit.hh @@ -25,7 +25,7 @@ // // // $Id: ExN05CalorimeterHit.hh,v 1.8 2006/06/29 17:52:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef ExN05CalorimeterHit_h diff --git a/examples/novice/N05/include/ExN05CalorimeterSD.hh b/examples/novice/N05/include/ExN05CalorimeterSD.hh index daebe11575..5b5700efb5 100644 --- a/examples/novice/N05/include/ExN05CalorimeterSD.hh +++ b/examples/novice/N05/include/ExN05CalorimeterSD.hh @@ -25,7 +25,7 @@ // // // $Id: ExN05CalorimeterSD.hh,v 1.5 2006/06/29 17:52:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef ExN05CalorimeterSD_h diff --git a/examples/novice/N05/include/ExN05DetectorConstruction.hh b/examples/novice/N05/include/ExN05DetectorConstruction.hh index a2304387a6..7315bf749f 100644 --- a/examples/novice/N05/include/ExN05DetectorConstruction.hh +++ b/examples/novice/N05/include/ExN05DetectorConstruction.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: ExN05DetectorConstruction.hh,v 1.5 2006/06/29 17:52:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: ExN05DetectorConstruction.hh,v 1.6 2006/11/03 17:58:49 mverderi Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef ExN05DetectorConstruction_h #define ExN05DetectorConstruction_h 1 @@ -34,7 +34,6 @@ #include "G4VUserDetectorConstruction.hh" #include "globals.hh" -class G4UserLimits; class ExN05DetectorMessenger; class ExN05DetectorConstruction : public G4VUserDetectorConstruction @@ -46,27 +45,10 @@ public: public: G4VPhysicalVolume* Construct(); - - // methods for UserLimits in crystal - void UseUserLimits(G4bool value); - G4bool IsUseUserLimits() { return fUseUserLimits; } - G4double GetMaxTimeInCrystal() const { return theMaxTimeCutsInCrystal; } - G4double GetMinEkineInCrystal() const { return theMinEkineCutsInCrystal; } - G4double GetMinRangeInCrystal() const { return theMinRangeCutsInCrystal; } - void SetMaxTimeInCrystal(G4double value); - void SetMinEkineInCrystal(G4double value); - void SetMinRangeInCrystal(G4double value); - private: G4LogicalVolume* theCrystalLog; G4LogicalVolume* theTowerLog; - G4bool fUseUserLimits; - G4UserLimits* theUserLimitsForCrystal; - G4double theMaxTimeCutsInCrystal; - G4double theMinEkineCutsInCrystal; - G4double theMinRangeCutsInCrystal; - // messeneger ExN05DetectorMessenger* theMessenger; diff --git a/examples/novice/N05/include/ExN05EMShowerModel.hh b/examples/novice/N05/include/ExN05EMShowerModel.hh index 02485b32dd..a1fd6cdf3f 100644 --- a/examples/novice/N05/include/ExN05EMShowerModel.hh +++ b/examples/novice/N05/include/ExN05EMShowerModel.hh @@ -25,7 +25,7 @@ // // // $Id: ExN05EMShowerModel.hh,v 1.10 2006/06/29 17:52:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //---------------------------------------------- diff --git a/examples/novice/N05/include/ExN05EnergySpot.hh b/examples/novice/N05/include/ExN05EnergySpot.hh index 003cbd53a5..da1bbece3b 100644 --- a/examples/novice/N05/include/ExN05EnergySpot.hh +++ b/examples/novice/N05/include/ExN05EnergySpot.hh @@ -25,7 +25,7 @@ // // // $Id: ExN05EnergySpot.hh,v 1.8 2006/06/29 17:52:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef ExN05EnergySpot_h #define ExN05EnergySpot_h diff --git a/examples/novice/N05/include/ExN05EventAction.hh b/examples/novice/N05/include/ExN05EventAction.hh index 67c0630de4..dd4a4b9122 100644 --- a/examples/novice/N05/include/ExN05EventAction.hh +++ b/examples/novice/N05/include/ExN05EventAction.hh @@ -25,7 +25,7 @@ // // // $Id: ExN05EventAction.hh,v 1.6 2006/06/29 17:52:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef ExN05EventAction_h diff --git a/examples/novice/N05/include/ExN05EventActionMessenger.hh b/examples/novice/N05/include/ExN05EventActionMessenger.hh index a9488bb629..f6ef050a0f 100644 --- a/examples/novice/N05/include/ExN05EventActionMessenger.hh +++ b/examples/novice/N05/include/ExN05EventActionMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: ExN05EventActionMessenger.hh,v 1.5 2006/06/29 17:52:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef ExN05EventActionMessenger_h diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04CalorimeterROGeometry.hh b/examples/novice/N05/include/ExN05ParallelWorldForPion.hh similarity index 80% rename from examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04CalorimeterROGeometry.hh rename to examples/novice/N05/include/ExN05ParallelWorldForPion.hh index 38a6a1de4e..25a2ad9b3c 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04CalorimeterROGeometry.hh +++ b/examples/novice/N05/include/ExN05ParallelWorldForPion.hh @@ -23,23 +23,22 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -#ifndef ExN04CalorimeterROGeometry_h -#define ExN04CalorimeterROGeometry_h 1 +// +// $Id: ExN05ParallelWorldForPion.hh,v 1.1 2006/11/03 17:58:49 mverderi Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +#ifndef ExN05ParallelWorldForPion_hh +#define ExN05ParallelWorldForPion_hh -#include "G4VReadOutGeometry.hh" +#include "G4VUserParallelWorld.hh" -class ExN04CalorimeterROGeometry : public G4VReadOutGeometry -{ +class ExN05ParallelWorldForPion : public G4VUserParallelWorld { public: - ExN04CalorimeterROGeometry(); - ExN04CalorimeterROGeometry(G4String); - ~ExN04CalorimeterROGeometry(); - + ExN05ParallelWorldForPion(G4String worldName); + ~ExN05ParallelWorldForPion(); + private: - G4VPhysicalVolume* Build(); - -#include "ExN04DetectorParameterDef.hh" - + void Construct(); }; #endif diff --git a/examples/novice/N05/include/ExN05PhysicsList.hh b/examples/novice/N05/include/ExN05PhysicsList.hh index 780ef55895..e455f65283 100644 --- a/examples/novice/N05/include/ExN05PhysicsList.hh +++ b/examples/novice/N05/include/ExN05PhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: ExN05PhysicsList.hh,v 1.8 2006/06/29 17:52:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // #ifndef ExN05PhysicsList_h diff --git a/examples/novice/N05/include/ExN05PiModel.hh b/examples/novice/N05/include/ExN05PiModel.hh index 18c605e00b..bba4c29364 100644 --- a/examples/novice/N05/include/ExN05PiModel.hh +++ b/examples/novice/N05/include/ExN05PiModel.hh @@ -25,7 +25,7 @@ // // // $Id: ExN05PiModel.hh,v 1.6 2006/06/29 17:52:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //---------------------------------------- diff --git a/examples/novice/N05/include/ExN05PionShowerModel.hh b/examples/novice/N05/include/ExN05PionShowerModel.hh index aeb94da1ea..dfdcc2c74b 100644 --- a/examples/novice/N05/include/ExN05PionShowerModel.hh +++ b/examples/novice/N05/include/ExN05PionShowerModel.hh @@ -25,7 +25,7 @@ // // // $Id: ExN05PionShowerModel.hh,v 1.10 2006/06/29 17:52:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //---------------------------------------------- diff --git a/examples/novice/N05/include/ExN05PrimaryGeneratorAction.hh b/examples/novice/N05/include/ExN05PrimaryGeneratorAction.hh index 358c332c1e..854849c006 100644 --- a/examples/novice/N05/include/ExN05PrimaryGeneratorAction.hh +++ b/examples/novice/N05/include/ExN05PrimaryGeneratorAction.hh @@ -25,7 +25,7 @@ // // // $Id: ExN05PrimaryGeneratorAction.hh,v 1.5 2006/06/29 17:52:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef ExN05PrimaryGeneratorAction_h diff --git a/examples/novice/N05/include/ExN05RunAction.hh b/examples/novice/N05/include/ExN05RunAction.hh index 9ab7063297..4fe2ef5524 100644 --- a/examples/novice/N05/include/ExN05RunAction.hh +++ b/examples/novice/N05/include/ExN05RunAction.hh @@ -25,7 +25,7 @@ // // // $Id: ExN05RunAction.hh,v 1.9 2006/06/29 17:52:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef ExN05RunAction_h diff --git a/examples/novice/N05/include/ExN05SpecialCuts.hh b/examples/novice/N05/include/ExN05SpecialCuts.hh deleted file mode 100644 index 4bdab6187c..0000000000 --- a/examples/novice/N05/include/ExN05SpecialCuts.hh +++ /dev/null @@ -1,102 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: ExN05SpecialCuts.hh,v 1.8 2006/06/29 17:52:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// -// ------------------------------------------------------------ -// GEANT 4 class header file -// -// ------------------------------------------------------------ -// 15 April 1998 M.Maire -// ------------------------------------------------------------ - -#ifndef ExN05SpecialCuts_h -#define ExN05SpecialCuts_h 1 - -#include "G4ios.hh" -#include "globals.hh" -#include "G4VProcess.hh" - - -class ExN05SpecialCuts : public G4VProcess -{ - public: - - ExN05SpecialCuts(const G4String& processName ="ExN05SpecialCut" ); - - virtual ~ExN05SpecialCuts(); - - virtual G4double PostStepGetPhysicalInteractionLength( - const G4Track& track, - G4double previousStepSize, - G4ForceCondition* condition - ); - - virtual G4VParticleChange* PostStepDoIt( - const G4Track& , - const G4Step& - ); - - // no operation in AtRestGPIL - virtual G4double AtRestGetPhysicalInteractionLength( - const G4Track& , - G4ForceCondition* - ){ return -1.0; }; - - // no operation in AtRestDoIt - virtual G4VParticleChange* AtRestDoIt( - const G4Track& , - const G4Step& - ){return 0;}; - - // no operation in AlongStepGPIL - virtual G4double AlongStepGetPhysicalInteractionLength( - const G4Track&, - G4double , - G4double , - G4double& , - G4GPILSelection* - ){ return -1.0; }; - - // no operation in AlongStepDoIt - virtual G4VParticleChange* AlongStepDoIt( - const G4Track& , - const G4Step& - ) {return 0;}; - - private: - - // hide assignment operator as private - ExN05SpecialCuts(ExN05SpecialCuts&); - ExN05SpecialCuts& operator=(const ExN05SpecialCuts& right); - -}; - -#endif - - diff --git a/examples/novice/N05/include/ExN05SteppingAction.hh b/examples/novice/N05/include/ExN05SteppingAction.hh index 5b1f72e8de..52ec2cedb4 100644 --- a/examples/novice/N05/include/ExN05SteppingAction.hh +++ b/examples/novice/N05/include/ExN05SteppingAction.hh @@ -25,7 +25,7 @@ // // // $Id: ExN05SteppingAction.hh,v 1.6 2006/06/29 17:52:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef ExN05SteppingAction_h diff --git a/examples/novice/N05/include/ExN05SteppingActionMessenger.hh b/examples/novice/N05/include/ExN05SteppingActionMessenger.hh index 253e79d7ad..611b87cb71 100644 --- a/examples/novice/N05/include/ExN05SteppingActionMessenger.hh +++ b/examples/novice/N05/include/ExN05SteppingActionMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: ExN05SteppingActionMessenger.hh,v 1.5 2006/06/29 17:52:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef ExN05SteppingActionMessenger_h diff --git a/examples/novice/N05/src/ExN05CalorimeterHit.cc b/examples/novice/N05/src/ExN05CalorimeterHit.cc index df784e3476..72721e9511 100644 --- a/examples/novice/N05/src/ExN05CalorimeterHit.cc +++ b/examples/novice/N05/src/ExN05CalorimeterHit.cc @@ -25,7 +25,7 @@ // // // $Id: ExN05CalorimeterHit.cc,v 1.6 2006/06/29 17:53:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "ExN05CalorimeterHit.hh" diff --git a/examples/novice/N05/src/ExN05CalorimeterSD.cc b/examples/novice/N05/src/ExN05CalorimeterSD.cc index a37202a36c..cd72246676 100644 --- a/examples/novice/N05/src/ExN05CalorimeterSD.cc +++ b/examples/novice/N05/src/ExN05CalorimeterSD.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: ExN05CalorimeterSD.cc,v 1.6 2006/06/29 17:53:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: ExN05CalorimeterSD.cc,v 1.8 2006/11/20 18:39:37 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "ExN05CalorimeterSD.hh" @@ -70,19 +70,19 @@ G4bool ExN05CalorimeterSD::ProcessHits(G4Step* aStep, G4TouchableHistory*) G4double edep = aStep->GetTotalEnergyDeposit(); if(edep<=0.) return false; - const G4VPhysicalVolume* physVol - = aStep->GetPreStepPoint()->GetPhysicalVolume(); - G4int copyID = physVol->GetCopyNo(); + G4TouchableHistory* hist = (G4TouchableHistory*)(aStep->GetPreStepPoint()->GetTouchable()); + const G4VPhysicalVolume* physVol = hist->GetVolume(); + G4int copyID = hist->GetReplicaNumber(); if(CellID[copyID]==-1) { ExN05CalorimeterHit* calHit = new ExN05CalorimeterHit(physVol->GetLogicalVolume()); - G4RotationMatrix rotM; - if(physVol->GetObjectRotation()) rotM = *(physVol->GetObjectRotation()); calHit->SetEdep( edep ); - calHit->SetPos( physVol->GetTranslation() ); - calHit->SetRot( rotM ); + G4AffineTransform aTrans = hist->GetHistory()->GetTopTransform(); + aTrans.Invert(); + calHit->SetPos(aTrans.NetTranslation()); + calHit->SetRot(aTrans.NetRotation()); G4int icell = CalCollection->insert( calHit ); CellID[copyID] = icell - 1; if(verboseLevel>0) diff --git a/examples/novice/N05/src/ExN05DetectorConstruction.cc b/examples/novice/N05/src/ExN05DetectorConstruction.cc index 1827aa11bf..00d51c61b1 100644 --- a/examples/novice/N05/src/ExN05DetectorConstruction.cc +++ b/examples/novice/N05/src/ExN05DetectorConstruction.cc @@ -24,18 +24,18 @@ // ******************************************************************** // // -// $Id: ExN05DetectorConstruction.cc,v 1.9 2006/06/29 17:53:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: ExN05DetectorConstruction.cc,v 1.10 2006/11/03 17:58:49 mverderi Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "ExN05DetectorConstruction.hh" #include "ExN05CalorimeterSD.hh" -#include "ExN05DetectorMessenger.hh" #include "ExN05EMShowerModel.hh" -#include "ExN05PionShowerModel.hh" +#include "ExN05PiModel.hh" #include "G4Material.hh" #include "G4MaterialTable.hh" #include "G4Element.hh" +#include "G4ProductionCuts.hh" #include "G4ElementTable.hh" #include "G4Box.hh" #include "G4Tubs.hh" @@ -45,25 +45,13 @@ #include "G4SDManager.hh" #include "G4VisAttributes.hh" #include "G4Colour.hh" -#include "G4UserLimits.hh" -#include "G4FastSimulationManager.hh" ExN05DetectorConstruction::ExN05DetectorConstruction() -{ - theUserLimitsForCrystal = 0; - fUseUserLimits = false; - theMaxTimeCutsInCrystal = 1000.0 * ns; - theMinEkineCutsInCrystal = 1.0 * MeV; - theMinRangeCutsInCrystal = 1.0 * mm; - theMessenger = new ExN05DetectorMessenger(this); -} +{;} ExN05DetectorConstruction::~ExN05DetectorConstruction() -{ - if (theUserLimitsForCrystal != 0) delete theUserLimitsForCrystal; - delete theMessenger; -} +{;} G4VPhysicalVolume* ExN05DetectorConstruction::Construct() { @@ -159,19 +147,6 @@ G4VPhysicalVolume* ExN05DetectorConstruction::Construct() G4Box *CrystalSolid = new G4Box("CrystalSolid", CrystalX, CrystalY, CrystalZ); theCrystalLog = new G4LogicalVolume(CrystalSolid,CsI, "CrystalLogical", 0, 0, 0); - // create UserLimits - if (theUserLimitsForCrystal != 0) delete theUserLimitsForCrystal; - theUserLimitsForCrystal = new G4UserLimits( DBL_MAX, //step max - DBL_MAX, // track max - theMaxTimeCutsInCrystal, - theMinEkineCutsInCrystal, - theMinRangeCutsInCrystal ); - - // attach UserLimits - if (fUseUserLimits) { - theCrystalLog->SetUserLimits(theUserLimitsForCrystal); - } - G4String tName1("Crystal"); // Allow all target physicals to share // same name (delayed copy) @@ -188,19 +163,18 @@ G4VPhysicalVolume* ExN05DetectorConstruction::Construct() for (G4int i = 0; i < nX; i++) { xTlate = -detectSize + 3*CrystalX + i*2*CrystalX; - crystalPhys - = new G4PVPlacement(0,G4ThreeVector(xTlate,yTlate,0*cm), - tName1, - theCrystalLog, - calorimeterPhys,false,copyNo++); + crystalPhys = new G4PVPlacement(0,G4ThreeVector(xTlate,yTlate,0*cm), + tName1, + theCrystalLog, + calorimeterPhys,false,copyNo++); } } - + //-------------------------- // "Hadron Calorimeter": used // in parameterisation with - // a ghost volume + // a parallel geometry //-------------------------- // -- Logical volume: G4Box *hadCaloBox @@ -247,35 +221,6 @@ G4VPhysicalVolume* ExN05DetectorConstruction::Construct() } - //------------------------------------------------------------ - // - // - - //--------------- Ghost Volumes ------------------------------------ - // Ghost volumes will be placed in an automatic copy of the world volume. - // The placement of the ghost logical volume are specified by the - // G4FastSimulationManager object attached to the related region - // ** this is a temporary implemention using regions : this will ** - // ** be improved with incoming "parallel geometries" functionnality ** - // Those placement are given compared to the world. - // -- Solid: - G4Box *ghostBox - = new G4Box("GhostBox", detectSize+5*cm, detectSize+5*cm, 80*cm); - // -- Logical volume: - G4LogicalVolume* ghostLogical - = new G4LogicalVolume(ghostBox,Air, - "GhostLogical", - 0, 0, 0); - // -- make it becoming a region: - G4Region* ghostRegion = new G4Region("Ghost Calorimeter Region"); - ghostRegion->AddRootLogicalVolume(ghostLogical); - - // G4FastSimulationManager doesn't exist yet: we set it - new G4FastSimulationManager(ghostRegion); - - ghostRegion->GetFastSimulationManager()-> - AddGhostPlacement(0,G4ThreeVector(0., 0., 175*cm)); - //--------- Sensitive detector ------------------------------------- G4SDManager* SDman = G4SDManager::GetSDMpointer(); G4String calorimeterSDname = "ExN05/Calorimeter"; @@ -292,14 +237,21 @@ G4VPhysicalVolume* ExN05DetectorConstruction::Construct() // -- Makes the calorimeterLog volume becoming a G4Region: G4Region* caloRegion = new G4Region("EM_calo_region"); caloRegion->AddRootLogicalVolume(calorimeterLog); + std::vector cuts; cuts.push_back(1.0*mm);cuts.push_back(1.0*mm);cuts.push_back(1.0*mm); + caloRegion->SetProductionCuts(new G4ProductionCuts()); + caloRegion->GetProductionCuts()->SetProductionCuts(cuts); // builds a model and sets it to the envelope of the calorimeter: - // ExN05EMShowerModel* emShowerModel = new ExN05EMShowerModel("emShowerModel",caloRegion); - - // and a model attached to the ghost: - // ExN05PionShowerModel* ghostPionShowerModel = - new ExN05PionShowerModel("ghostPionShowerModel",ghostRegion); - + // -- uncomment for seeing warning message with /param/showSetup command new ExN05PiModel(caloRegion); + + // ---------------- Makes had. calo a region too ------------------ + G4Region* hadRegion = new G4Region("HAD_calo_region"); + hadRegion->AddRootLogicalVolume(hadCaloLog); + cuts.clear(); + cuts.push_back(1.0*cm);cuts.push_back(1.0*cm);cuts.push_back(1.0*cm); + hadRegion->SetProductionCuts(new G4ProductionCuts()); + hadRegion->GetProductionCuts()->SetProductionCuts(cuts); + //--------- Visualization attributes ------------------------------- WorldLog->SetVisAttributes(G4VisAttributes::Invisible); @@ -328,11 +280,6 @@ G4VPhysicalVolume* ExN05DetectorConstruction::Construct() towerVisAtt->SetForceWireframe(true); theTowerLog->SetVisAttributes(towerVisAtt); - G4VisAttributes * ghostVisAtt - = new G4VisAttributes(G4Colour(1.0,1.0,1.0)); - ghostVisAtt->SetForceWireframe(true); - ghostLogical->SetVisAttributes(ghostVisAtt); - //------------------------------------------------------------------ @@ -343,32 +290,3 @@ G4VPhysicalVolume* ExN05DetectorConstruction::Construct() return WorldPhys; } -void ExN05DetectorConstruction::SetMaxTimeInCrystal(G4double value) -{ - theMaxTimeCutsInCrystal = value; - if (theUserLimitsForCrystal != 0) { - theUserLimitsForCrystal->SetUserMaxTime(value); - } -} -void ExN05DetectorConstruction::SetMinEkineInCrystal(G4double value) -{ - theMinEkineCutsInCrystal = value; - if (theUserLimitsForCrystal != 0) { - theUserLimitsForCrystal->SetUserMinEkine(value); - } -} -void ExN05DetectorConstruction::SetMinRangeInCrystal(G4double value) -{ - theMinRangeCutsInCrystal = value; - if (theUserLimitsForCrystal != 0) { - theUserLimitsForCrystal->SetUserMinRange(value); - } -} - -void ExN05DetectorConstruction::UseUserLimits(G4bool isUse) -{ - fUseUserLimits = isUse; - if ( fUseUserLimits && (theUserLimitsForCrystal!= 0)) { - theCrystalLog->SetUserLimits(theUserLimitsForCrystal); - } -} diff --git a/examples/novice/N05/src/ExN05DetectorMessenger.cc b/examples/novice/N05/src/ExN05DetectorMessenger.cc deleted file mode 100644 index b5cb34b170..0000000000 --- a/examples/novice/N05/src/ExN05DetectorMessenger.cc +++ /dev/null @@ -1,128 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: ExN05DetectorMessenger.cc,v 1.8 2006/06/29 17:53:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// - -#include "ExN05DetectorMessenger.hh" -#include "ExN05DetectorConstruction.hh" -#include "G4UIdirectory.hh" -#include "G4UIcmdWithAString.hh" -#include "G4UIcmdWithADoubleAndUnit.hh" -#include "globals.hh" -#include - -#include - -ExN05DetectorMessenger::ExN05DetectorMessenger(ExN05DetectorConstruction * myDet) : myDetector(myDet) -{ - - mydetDir = new G4UIdirectory("/exN05/detector/"); - mydetDir->SetGuidance("ExN05 detector control."); - - SwitchCmd = new G4UIcmdWithAString("/exN05/detector/switchUserLimits",this); - SwitchCmd->SetGuidance("Switch On/Off UserLimits for crystals"); - SwitchCmd->SetGuidance(" Choice : on / off "); - SwitchCmd->SetParameterName("choice",true); - SwitchCmd->SetDefaultValue("on"); - SwitchCmd->SetCandidates("on ON off OFF"); - SwitchCmd->AvailableForStates(G4State_PreInit,G4State_Idle); - - TmaxCmd = new G4UIcmdWithADoubleAndUnit("/exN05/detector/maxTime",this); - TmaxCmd->SetGuidance("Set maximum time in crystal"); - TmaxCmd->SetParameterName("Tmax",false,false); - TmaxCmd->SetDefaultUnit("ns"); - TmaxCmd->SetUnitCategory("Time"); - TmaxCmd->AvailableForStates(G4State_PreInit,G4State_Idle); - - EminCmd = new G4UIcmdWithADoubleAndUnit("/exN05/detector/minEkine",this); - EminCmd->SetGuidance("Set minimum kinetic energy in crystal"); - EminCmd->SetParameterName("Emin",false,false); - EminCmd->SetDefaultUnit("MeV"); - EminCmd->SetUnitCategory("Energy"); - EminCmd->AvailableForStates(G4State_PreInit,G4State_Idle); - - RminCmd = new G4UIcmdWithADoubleAndUnit("/exN05/detector/minRange",this); - RminCmd->SetGuidance("Set minimum range in crystal"); - RminCmd->SetParameterName("Rmin",false,false); - RminCmd->SetDefaultUnit("mm"); - RminCmd->SetUnitCategory("Length"); - RminCmd->AvailableForStates(G4State_PreInit,G4State_Idle); -} - -ExN05DetectorMessenger::~ExN05DetectorMessenger() -{ - delete SwitchCmd; - delete TmaxCmd; - delete RminCmd; - delete EminCmd; -} - -void ExN05DetectorMessenger::SetNewValue(G4UIcommand * command,G4String newValues) -{ - if( command == SwitchCmd ) { - if ( (newValues == "off") || (newValues == "OFF") ){ - myDetector->UseUserLimits(false); - } else { - myDetector->UseUserLimits(true); - } - - } else if( command == TmaxCmd ) { - myDetector->SetMaxTimeInCrystal(TmaxCmd->GetNewDoubleValue(newValues)); - - } else if( command == EminCmd ) { - myDetector->SetMinEkineInCrystal(EminCmd->GetNewDoubleValue(newValues)); - - } else if( command == RminCmd ) { - myDetector->SetMinRangeInCrystal(RminCmd->GetNewDoubleValue(newValues)); - } -} - -G4String ExN05DetectorMessenger::GetCurrentValue(G4UIcommand * command) -{ - G4String returnValue('\0'); - std::ostringstream os; - - if( command == SwitchCmd ) { - if ( myDetector->IsUseUserLimits() )returnValue = "on"; - else returnValue = "off"; - - } else if( command == TmaxCmd ) { - os << myDetector->GetMaxTimeInCrystal()/ns << " ns" << '\0'; - returnValue = os.str(); - - } else if( command == EminCmd ) { - os << myDetector->GetMinEkineInCrystal()/MeV << " MeV" << '\0'; - returnValue = os.str(); - - } else if( command == RminCmd ) { - os << myDetector->GetMinRangeInCrystal()/mm << " mm" << '\0'; - returnValue = os.str(); - } - return returnValue; -} diff --git a/examples/novice/N05/src/ExN05EMShowerModel.cc b/examples/novice/N05/src/ExN05EMShowerModel.cc index 91a26c086e..7705157ac7 100644 --- a/examples/novice/N05/src/ExN05EMShowerModel.cc +++ b/examples/novice/N05/src/ExN05EMShowerModel.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: ExN05EMShowerModel.cc,v 1.14 2006/06/29 17:53:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: ExN05EMShowerModel.cc,v 1.15 2006/11/14 09:21:44 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "ExN05EMShowerModel.hh" #include "ExN05EnergySpot.hh" @@ -84,8 +84,6 @@ G4bool ExN05EMShowerModel::ModelTrigger(const G4FastTrack& fastTrack) void ExN05EMShowerModel::DoIt(const G4FastTrack& fastTrack, G4FastStep& fastStep) { - G4cout << "ExN05EMShowerModel::DoIt" << G4endl; - // Kill the parameterised particle: fastStep.KillPrimaryTrack(); fastStep.ProposePrimaryTrackPathLength(0.0); diff --git a/examples/novice/N05/src/ExN05EnergySpot.cc b/examples/novice/N05/src/ExN05EnergySpot.cc index 827cdbae5e..7b81466bfe 100644 --- a/examples/novice/N05/src/ExN05EnergySpot.cc +++ b/examples/novice/N05/src/ExN05EnergySpot.cc @@ -25,7 +25,7 @@ // // // $Id: ExN05EnergySpot.cc,v 1.7 2006/06/29 17:53:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "ExN05EnergySpot.hh" diff --git a/examples/novice/N05/src/ExN05EventAction.cc b/examples/novice/N05/src/ExN05EventAction.cc index 36dc55e45d..35330cd17d 100644 --- a/examples/novice/N05/src/ExN05EventAction.cc +++ b/examples/novice/N05/src/ExN05EventAction.cc @@ -25,7 +25,7 @@ // // // $Id: ExN05EventAction.cc,v 1.9 2006/06/29 17:53:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "ExN05EventAction.hh" diff --git a/examples/novice/N05/src/ExN05EventActionMessenger.cc b/examples/novice/N05/src/ExN05EventActionMessenger.cc index d37d459f7c..438d9863ea 100644 --- a/examples/novice/N05/src/ExN05EventActionMessenger.cc +++ b/examples/novice/N05/src/ExN05EventActionMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: ExN05EventActionMessenger.cc,v 1.7 2006/06/29 17:53:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "ExN05EventActionMessenger.hh" diff --git a/examples/novice/N05/src/ExN05MinEkineCuts.cc b/examples/novice/N05/src/ExN05MinEkineCuts.cc deleted file mode 100644 index 49975a15d4..0000000000 --- a/examples/novice/N05/src/ExN05MinEkineCuts.cc +++ /dev/null @@ -1,98 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: ExN05MinEkineCuts.cc,v 1.8 2006/06/29 17:53:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// -// -------------------------------------------------------------- -// GEANT 4 class implementation file -// -------------------------------------------------------------- -// 15 April 1998 M.Maire -// -------------------------------------------------------------- - -#include "ExN05MinEkineCuts.hh" - -#include "G4Step.hh" -#include "G4UserLimits.hh" -#include "G4VParticleChange.hh" -#include "G4EnergyLossTables.hh" - -ExN05MinEkineCuts::ExN05MinEkineCuts(const G4String& aName) - : ExN05SpecialCuts(aName) -{ - if (verboseLevel>1) { - G4cout << GetProcessName() << " is created "<< G4endl; - } - SetProcessType(fUserDefined); -} - -ExN05MinEkineCuts::~ExN05MinEkineCuts() -{} - -ExN05MinEkineCuts::ExN05MinEkineCuts(ExN05MinEkineCuts&) - : ExN05SpecialCuts() -{} - - -G4double ExN05MinEkineCuts::PostStepGetPhysicalInteractionLength( - const G4Track& aTrack, - G4double , - G4ForceCondition* condition - ) -{ - // condition is set to "Not Forced" - *condition = NotForced; - - G4double proposedStep = DBL_MAX; - // get the pointer to UserLimits - G4UserLimits* pUserLimits = aTrack.GetVolume()->GetLogicalVolume()->GetUserLimits(); - const G4DynamicParticle* aParticle = aTrack.GetDynamicParticle(); - G4ParticleDefinition* aParticleDef = aTrack.GetDefinition(); - - if (pUserLimits) { - //min kinetic energy - G4double temp = DBL_MAX; - G4double eKine = aParticle->GetKineticEnergy(); - const G4MaterialCutsCouple* couple = aTrack.GetMaterialCutsCouple(); - G4double eMin = pUserLimits->GetUserMinEkine(aTrack); - - G4double rangeNow = DBL_MAX; - if (aParticleDef->GetPDGCharge() != 0.0) { - rangeNow = G4EnergyLossTables::GetRange(aParticleDef,eKine,couple); - } - if (eKine < eMin ) { - proposedStep = 0.; - } else if (aParticleDef->GetPDGCharge() != 0.0) { - // charged particles only - G4double rangeMin = G4EnergyLossTables::GetRange(aParticleDef,eMin,couple); - temp = rangeNow - rangeMin; - if (temp<0.) temp=0.; - if (proposedStep > temp) proposedStep = temp; - } - } - return proposedStep; -} diff --git a/examples/novice/N05/src/ExN05MinRangeCuts.cc b/examples/novice/N05/src/ExN05MinRangeCuts.cc deleted file mode 100644 index 98456c511b..0000000000 --- a/examples/novice/N05/src/ExN05MinRangeCuts.cc +++ /dev/null @@ -1,95 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: ExN05MinRangeCuts.cc,v 1.7 2006/06/29 17:53:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// -// -------------------------------------------------------------- -// GEANT 4 class implementation file -// -------------------------------------------------------------- -// 15 April 1998 M.Maire -// -------------------------------------------------------------- - -#include "ExN05MinRangeCuts.hh" - -#include "G4Step.hh" -#include "G4UserLimits.hh" -#include "G4VParticleChange.hh" -#include "G4EnergyLossTables.hh" - -ExN05MinRangeCuts::ExN05MinRangeCuts(const G4String& aName) - : ExN05SpecialCuts(aName) -{ - if (verboseLevel>1) { - G4cout << GetProcessName() << " is created "<< G4endl; - } - SetProcessType(fUserDefined); -} - -ExN05MinRangeCuts::~ExN05MinRangeCuts() -{} - -ExN05MinRangeCuts::ExN05MinRangeCuts(ExN05MinRangeCuts&) - : ExN05SpecialCuts() -{} - - -G4double ExN05MinRangeCuts::PostStepGetPhysicalInteractionLength( - const G4Track& aTrack, - G4double , - G4ForceCondition* condition - ) -{ - // condition is set to "Not Forced" - *condition = NotForced; - - G4double proposedStep = DBL_MAX; - // get the pointer to UserLimits - G4UserLimits* pUserLimits = aTrack.GetVolume()->GetLogicalVolume()->GetUserLimits(); - const G4DynamicParticle* aParticle = aTrack.GetDynamicParticle(); - G4ParticleDefinition* aParticleDef = aTrack.GetDefinition(); - - if (pUserLimits) { - G4double temp = DBL_MAX; - - //min remaining range - G4double eKine = aParticle->GetKineticEnergy(); - const G4MaterialCutsCouple* couple = aTrack.GetMaterialCutsCouple(); - G4double rangeNow = DBL_MAX; - if (aParticleDef->GetPDGCharge() != 0.0) { - rangeNow = G4EnergyLossTables::GetRange(aParticleDef,eKine,couple); - } - temp = (rangeNow - pUserLimits->GetUserMinRange(aTrack)); - if (temp < 0.) { - proposedStep = 0.; - } else { - if (proposedStep > temp) proposedStep = temp; - } - - } - return proposedStep; -} diff --git a/examples/novice/N05/src/ExN05ParallelWorldForPion.cc b/examples/novice/N05/src/ExN05ParallelWorldForPion.cc new file mode 100644 index 0000000000..b4721d4c8e --- /dev/null +++ b/examples/novice/N05/src/ExN05ParallelWorldForPion.cc @@ -0,0 +1,101 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +#include "ExN05ParallelWorldForPion.hh" +#include "G4Box.hh" +#include "G4LogicalVolume.hh" +#include "G4Region.hh" +#include "G4PVPlacement.hh" +#include "G4ThreeVector.hh" +#include "ExN05PionShowerModel.hh" + + +ExN05ParallelWorldForPion::ExN05ParallelWorldForPion(G4String worldName) + : G4VUserParallelWorld(worldName) +{;} + +ExN05ParallelWorldForPion::~ExN05ParallelWorldForPion() +{;} + +void ExN05ParallelWorldForPion::Construct() +{ + // -- fake material: + G4double a, iz, 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="Oxigen", 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); + + // ------------------------------- + // Build parallel/ghost geometry: + // ------------------------------- + + // -- Obtain clone of mass geometry world from GetWorld() base class utility: + G4VPhysicalVolume* ghostWorld = GetWorld(); + // -- Why needed ? No default ? + ghostWorld->GetLogicalVolume()->SetMaterial(Air); + G4Region* parallelWorldRegion = new G4Region("ParallelWorldRegion"); + parallelWorldRegion->AddRootLogicalVolume(ghostWorld->GetLogicalVolume()); + + // -- Create box for encompassing Elec.+Had. calorimeters together: + G4double detectSize = 125*cm; + G4Box *ghostBox + = new G4Box("GhostBox", detectSize+5*cm, detectSize+5*cm, 80*cm); + // -- Build the subsequent logical volume: + G4LogicalVolume* ghostLogical + = new G4LogicalVolume(ghostBox, + Air, // -- no material : IMPOSSIBLE !!! + "GhostLogical", + 0, 0, 0); + // -- And place this logical volume in the parallel geometry: + new G4PVPlacement(0,G4ThreeVector(0., 0., 175*cm), + "GhostPhysical", + ghostLogical, + ghostWorld,false,0); + + // ----------------------- + // Setup fast simulation: + // ----------------------- + + // -- Make Elec+Had logical volume becoming a region: + G4cout << "Declaring region..." << G4endl; + G4Region* ghostRegion = new G4Region("GhostCalorimeterRegion"); + G4cout << "... region declared. Setting it the ghostLogical volume..." << G4endl; + ghostRegion->AddRootLogicalVolume(ghostLogical); + G4cout << "... succes.\n" << G4endl; + + // // -- Create fast simulation manager, which will handle the physics fast simulation model(s): + // new G4FastSimulationManager(ghostRegion); + + // -- Attach fast simulation model (create the G4FastSimulationManager if needed): + new ExN05PionShowerModel("ghostPionShowerModel",ghostRegion); + +} diff --git a/examples/novice/N05/src/ExN05PhysicsList.cc b/examples/novice/N05/src/ExN05PhysicsList.cc index 9a23fdf239..073a82bcd4 100644 --- a/examples/novice/N05/src/ExN05PhysicsList.cc +++ b/examples/novice/N05/src/ExN05PhysicsList.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: ExN05PhysicsList.cc,v 1.10 2006/06/29 17:53:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: ExN05PhysicsList.cc,v 1.12 2006/11/10 13:11:00 mverderi Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // @@ -42,7 +42,7 @@ #include "G4ios.hh" #include -#include "G4FastSimulationManagerProcess.hh" +#include "G4FastSimulationManagerProcess81.hh" ExN05PhysicsList::ExN05PhysicsList(): G4VUserPhysicsList() @@ -122,21 +122,35 @@ void ExN05PhysicsList::ConstructProcess() ConstructGeneral(); } -#include "ExN05MaxTimeCuts.hh" -#include "ExN05MinEkineCuts.hh" -#include "ExN05MinRangeCuts.hh" +#include "G4CoupledTransportation.hh" + void ExN05PhysicsList::AddTransportation() { - G4VUserPhysicsList::AddTransportation(); + // G4VUserPhysicsList::AddTransportation(); + G4CoupledTransportation* theTransportationProcess= new G4CoupledTransportation(); + // loop over all particles in G4ParticleTable theParticleIterator->reset(); while( (*theParticleIterator)() ){ G4ParticleDefinition* particle = theParticleIterator->value(); G4ProcessManager* pmanager = particle->GetProcessManager(); - pmanager->AddDiscreteProcess(new ExN05MaxTimeCuts()); - pmanager->AddDiscreteProcess(new ExN05MinEkineCuts()); - pmanager->AddDiscreteProcess(new ExN05MinRangeCuts()); - } + if (!particle->IsShortLived()) { + // Add transportation process for all particles other than "shortlived" + if ( pmanager == 0) { + // Error !! no process manager + G4String particleName = particle->GetParticleName(); + G4Exception("G4VUserPhysicsList::AddTransportation","No process manager", + RunMustBeAborted, particleName ); + } else { + // add transportation with ordering = ( -1, "first", "first" ) + pmanager ->AddProcess(theTransportationProcess); + pmanager ->SetProcessOrderingToFirst(theTransportationProcess, idxAlongStep); + pmanager ->SetProcessOrderingToFirst(theTransportationProcess, idxPostStep); + } + } else { + // shortlived particle case + } + } } #include "G4ComptonScattering.hh" @@ -272,18 +286,22 @@ void ExN05PhysicsList::ConstructGeneral() void ExN05PhysicsList::AddParameterisation() { - G4FastSimulationManagerProcess* - theFastSimulationManagerProcess = - new G4FastSimulationManagerProcess(); + G4FastSimulationManagerProcess81* + fastSimProcess_parallelGeom = new G4FastSimulationManagerProcess81("G4FSMP_parallelGeom", "pionGhostWorld"); + G4FastSimulationManagerProcess81* + fastSimProcess_massGeom = new G4FastSimulationManagerProcess81("G4FSMP_massGeom"); theParticleIterator->reset(); - while( (*theParticleIterator)() ){ - G4ParticleDefinition* particle = theParticleIterator->value(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - // both postStep and alongStep action are required: because - // of the use of ghost volumes. If no ghost, the postStep - // is sufficient. - pmanager->AddProcess(theFastSimulationManagerProcess, -1, 1, 1); - } + while( (*theParticleIterator)() ) + { + G4ParticleDefinition* particle = theParticleIterator->value(); + G4ProcessManager* pmanager = particle->GetProcessManager(); + // -- G4FSMP is a PostStep process, ordering does not matter (?) + if (particle->GetParticleName() == "pi+" || + particle->GetParticleName() == "pi-") pmanager->AddDiscreteProcess(fastSimProcess_parallelGeom); + if (particle->GetParticleName() == "e+" || + particle->GetParticleName() == "e-" || + particle->GetParticleName() == "gamma") pmanager->AddDiscreteProcess(fastSimProcess_massGeom); + } } void ExN05PhysicsList::SetCuts() diff --git a/examples/novice/N05/src/ExN05PiModel.cc b/examples/novice/N05/src/ExN05PiModel.cc index 24cd647632..13bbbe44ed 100644 --- a/examples/novice/N05/src/ExN05PiModel.cc +++ b/examples/novice/N05/src/ExN05PiModel.cc @@ -25,7 +25,7 @@ // // // $Id: ExN05PiModel.cc,v 1.7 2006/06/29 17:53:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "ExN05PiModel.hh" diff --git a/examples/novice/N05/src/ExN05PionShowerModel.cc b/examples/novice/N05/src/ExN05PionShowerModel.cc index c91476d3ac..669afe10b5 100644 --- a/examples/novice/N05/src/ExN05PionShowerModel.cc +++ b/examples/novice/N05/src/ExN05PionShowerModel.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: ExN05PionShowerModel.cc,v 1.16 2006/06/29 17:53:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: ExN05PionShowerModel.cc,v 1.17 2006/11/13 10:19:16 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "ExN05PionShowerModel.hh" #include "ExN05EnergySpot.hh" @@ -85,9 +85,7 @@ G4bool ExN05PionShowerModel::ModelTrigger(const G4FastTrack&) void ExN05PionShowerModel::DoIt(const G4FastTrack& fastTrack, G4FastStep& fastStep) { - G4cout << "ExN05PionShowerModel::DoIt" << G4endl; - - // Kill the parawmeterised particle: + // Kill the parameterised particle: fastStep.KillPrimaryTrack(); fastStep.ProposePrimaryTrackPathLength(0.0); fastStep.ProposeTotalEnergyDeposited(fastTrack.GetPrimaryTrack()->GetKineticEnergy()); @@ -97,7 +95,6 @@ void ExN05PionShowerModel::DoIt(const G4FastTrack& fastTrack, // and put those energy spots into the crystals: BuildDetectorResponse(); - } void ExN05PionShowerModel::Explode(const G4FastTrack& fastTrack) diff --git a/examples/novice/N05/src/ExN05PrimaryGeneratorAction.cc b/examples/novice/N05/src/ExN05PrimaryGeneratorAction.cc index 85e705fbbe..4d92acec78 100644 --- a/examples/novice/N05/src/ExN05PrimaryGeneratorAction.cc +++ b/examples/novice/N05/src/ExN05PrimaryGeneratorAction.cc @@ -25,7 +25,7 @@ // // // $Id: ExN05PrimaryGeneratorAction.cc,v 1.5 2006/06/29 17:53:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "ExN05PrimaryGeneratorAction.hh" diff --git a/examples/novice/N05/src/ExN05RunAction.cc b/examples/novice/N05/src/ExN05RunAction.cc index ad1ce7040b..96be4b44f8 100644 --- a/examples/novice/N05/src/ExN05RunAction.cc +++ b/examples/novice/N05/src/ExN05RunAction.cc @@ -25,7 +25,7 @@ // // // $Id: ExN05RunAction.cc,v 1.8 2006/06/29 17:53:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Make this appear first! diff --git a/examples/novice/N05/src/ExN05SpecialCuts.cc b/examples/novice/N05/src/ExN05SpecialCuts.cc deleted file mode 100644 index 5956641ac2..0000000000 --- a/examples/novice/N05/src/ExN05SpecialCuts.cc +++ /dev/null @@ -1,73 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: ExN05SpecialCuts.cc,v 1.9 2006/06/29 17:53:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// -// ------------------------------------------------------------ -// GEANT 4 class implementation file -// -// ------------------------------------------------------------ -// 15 April 1998 M.Maire -// ------------------------------------------------------------ - -#include "ExN05SpecialCuts.hh" -#include "G4VParticleChange.hh" -#include "G4Track.hh" -#include "G4Step.hh" - -ExN05SpecialCuts::ExN05SpecialCuts(const G4String& aName) - : G4VProcess(aName) -{ - if (verboseLevel>1) { - G4cout << GetProcessName() << " is created "<< G4endl; - } -} - -ExN05SpecialCuts::~ExN05SpecialCuts() -{ -} - -G4VParticleChange* -ExN05SpecialCuts::PostStepDoIt( const G4Track& aTrack, const G4Step& ) -{ - // - // Stop the current particle, if requested by G4UserLimits - // - aParticleChange.Initialize(aTrack); - aParticleChange.ProposeEnergy(0.) ; - aParticleChange.ProposeLocalEnergyDeposit (aTrack.GetKineticEnergy()) ; - aParticleChange.ProposeTrackStatus(fStopButAlive); - return &aParticleChange; -} - -G4double -ExN05SpecialCuts:: -PostStepGetPhysicalInteractionLength(const G4Track&,G4double,G4ForceCondition*) -{ - return DBL_MAX; -} diff --git a/examples/novice/N05/src/ExN05SteppingAction.cc b/examples/novice/N05/src/ExN05SteppingAction.cc index 9fc7561340..20ed0156be 100644 --- a/examples/novice/N05/src/ExN05SteppingAction.cc +++ b/examples/novice/N05/src/ExN05SteppingAction.cc @@ -25,7 +25,7 @@ // // // $Id: ExN05SteppingAction.cc,v 1.7 2006/06/29 17:53:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "ExN05SteppingAction.hh" diff --git a/examples/novice/N05/src/ExN05SteppingActionMessenger.cc b/examples/novice/N05/src/ExN05SteppingActionMessenger.cc index b0c89fea14..939f37400e 100644 --- a/examples/novice/N05/src/ExN05SteppingActionMessenger.cc +++ b/examples/novice/N05/src/ExN05SteppingActionMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: ExN05SteppingActionMessenger.cc,v 1.7 2006/06/29 17:53:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "ExN05SteppingActionMessenger.hh" diff --git a/examples/novice/N06/History b/examples/novice/N06/History index 3d4d4aa22b..e403aa9e15 100644 --- a/examples/novice/N06/History +++ b/examples/novice/N06/History @@ -1,4 +1,4 @@ -$Id: History,v 1.33 2006/06/16 10:13:58 gcosmo Exp $ +$Id: History,v 1.34 2006/10/18 16:18:02 allison Exp $ ------------------------------------------------------------------- ========================================================= @@ -15,6 +15,9 @@ track of all tags. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +October 18th 2006 J.Allison (exampleN06-V08-01-00) +- Migrate to new trajectory modeling commands. + 16th June 2006 Gabriele Cosmo (exampleN06-V08-00-02) - Use coherent allocation scheme for user-classes and initialisation in main(). diff --git a/examples/novice/N06/exampleN06.cc b/examples/novice/N06/exampleN06.cc index 535c92bb5c..256822f733 100644 --- a/examples/novice/N06/exampleN06.cc +++ b/examples/novice/N06/exampleN06.cc @@ -25,7 +25,7 @@ // // // $Id: exampleN06.cc,v 1.14 2006/06/29 17:53:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N06/exampleN06.out b/examples/novice/N06/exampleN06.out index 72fe5cc6a4..fd6c1b8482 100644 --- a/examples/novice/N06/exampleN06.out +++ b/examples/novice/N06/exampleN06.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -29,17 +29,13 @@ Registered model factories: drawByCharge drawByParticleID drawByOriginVolume - -Registered models: - None + drawByAttribute Registered filter factories: chargeFilter particleFilter originVolumeFilter - -Registered filters: - None + attributeFilter Equal Equal @@ -88,7 +84,7 @@ eBrem: tables are built for e+ Total cross sections from a parametrisation based on the EEDL data library. Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -174,488 +170,498 @@ hIoni: tables are built for pi- Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process 0 0 fm 0 fm 0 fm 500 keV 0 eV 0 fm 0 fm Tank initStep - Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 31 + Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 34 - Exiting from G4Scintillation::DoIt -- NumberOfSecondaries = 31 - 1 834 um 0 fm 0 fm 0 eV 500 keV 1.49 mm 1.49 mm Tank eIoni + Exiting from G4Scintillation::DoIt -- NumberOfSecondaries = 28 + 1 953 um 690 um 369 um 43 keV 457 keV 1.49 mm 1.49 mm Tank eIoni ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 63, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 215 um 0 fm 0 fm 4 eV 0 eV 0 fm 0 fm Tank initStep - -** Photon absorbed! ** - 1 99.3 cm -38.1 cm -3.5 m 4 eV 0 eV 3.66 m 3.66 m Tank OpAbsorption + 0 60.4 um 43.7 um 23.4 um 3.24 eV 0 eV 0 fm 0 fm Tank initStep + Photon at Boundary! + Old Momentum Direction: (-0.143701,-0.937057,-0.318235) + Old Polarization: (0.210659,0.285237,-0.93502) + New Momentum Direction: (-0.194839,-0.88083,-0.431481) + New Polarization: (0.819446,-0.387938,0.421914) + *** FresnelRefraction *** + 1 -76.7 cm -5 m -1.7 m 3.24 eV 0 eV 5.34 m 5.34 m Tank Transportation + 2 -1.87 m -10 m -4.15 m 3.24 eV 0 eV 5.68 m 11 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 62, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 468 um 0 fm 0 fm 2.53 eV 0 eV 0 fm 0 fm Tank initStep - Photon at Boundary! - Old Momentum Direction: (0.757038,-0.653053,0.0203704) - Old Polarization: (-0.653212,-0.757173,0.00156699) - New Momentum Direction: (0.471179,-0.881609,0.0274996) - New Polarization: (0.881851,0.47021,-0.0352413) - *** FresnelRefraction *** - 1 5 m -4.31 m 13.5 cm 2.53 eV 0 eV 6.6 m 6.6 m Tank Transportation - 2 8.04 m -10 m 31.2 cm 2.53 eV 0 eV 6.45 m 13.1 m OutOfWorld Transportation + 0 548 um 396 um 212 um 2.52 eV 0 eV 0 fm 0 fm Tank initStep + +** Photon absorbed! ** + 1 1.91 m 1.76 m 22.9 cm 2.52 eV 0 eV 2.61 m 2.61 m Tank OpAbsorption ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 61, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 18.8 um 0 fm 0 fm 3.64 eV 0 eV 0 fm 0 fm Tank initStep + 0 106 um 76.6 um 41 um 4.07 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! - Old Momentum Direction: (0.29544454,0.12428277,0.94724143) - Old Polarization: (-0.95207142,0.12049762,0.28114113) - New Momentum Direction: (0.40135032,0.16883348,0.90022952) - New Polarization: (-0.91424666,0.13331221,0.38259757) + Old Momentum Direction: (0.92454703,0.036223043,0.37934244) + Old Polarization: (0.21390579,-0.87317533,-0.43796021) + New Momentum Direction: (0.85513691,0.049277577,0.51605482) + New Polarization: (0.29337035,-0.86673297,-0.40337055) *** FresnelRefraction *** - 1 1.56 m 65.6 cm 5 m 3.64 eV 0 eV 5.28 m 5.28 m Tank Transportation - 2 3.79 m 1.59 m 10 m 3.64 eV 0 eV 5.55 m 10.8 m OutOfWorld Transportation + 1 5 m 19.6 cm 2.05 m 4.07 eV 0 eV 5.41 m 5.41 m Tank Transportation + 2 10 m 48.4 cm 5.07 m 4.07 eV 0 eV 5.85 m 11.3 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 60, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 368 um 0 fm 0 fm 2.34 eV 0 eV 0 fm 0 fm Tank initStep - -** Photon absorbed! ** - 1 -4.88 m -2.46 m -1.02 m 2.34 eV 0 eV 5.56 m 5.56 m Tank OpAbsorption + 0 582 um 421 um 225 um 2.65 eV 0 eV 0 fm 0 fm Tank initStep + Photon at Boundary! + Old Momentum Direction: (0.73771368,0.076058006,0.67081571) + Old Polarization: (0.62069707,0.31441686,-0.71824591) + New Momentum Direction: (0.40983654,0.10276342,0.90635186) + New Polarization: (0.84900969,0.32030367,-0.42022388) + *** FresnelRefraction *** + 1 5 m 51.6 cm 4.55 m 2.65 eV 0 eV 6.78 m 6.78 m Tank Transportation + 2 7.47 m 1.13 m 10 m 2.65 eV 0 eV 6.02 m 12.8 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 59, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 208 um 0 fm 0 fm 2.1 eV 0 eV 0 fm 0 fm Tank initStep + 0 199 um 144 um 77.1 um 2.39 eV 0 eV 0 fm 0 fm Tank initStep ** Photon absorbed! ** - 1 1.97 m 1.66 m -2.24 m 2.1 eV 0 eV 3.42 m 3.42 m Tank OpAbsorption + 1 -3.49 m -26.2 cm 15.9 cm 2.39 eV 0 eV 3.5 m 3.5 m Tank OpAbsorption ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 58, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 810 um 0 fm 0 fm 2.14 eV 0 eV 0 fm 0 fm Tank initStep + 0 700 um 506 um 271 um 2.31 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! - Old Momentum Direction: (-0.30121382,-0.25123676,0.9198643) - Old Polarization: (-0.62017009,0.78438802,0.011157406) - New Momentum Direction: (-0.40515096,-0.33792876,0.84950388) - New Polarization: (-0.62148268,0.78328075,0.015183905) + Old Momentum Direction: (0.15599765,0.16214519,-0.97435808) + Old Polarization: (-0.11305894,-0.97702049,-0.18068932) + New Momentum Direction: (0.21014867,0.2184302,-0.95295634) + New Polarization: (-0.10267076,-0.96440213,-0.24369498) *** FresnelRefraction *** - 1 -1.64 m -1.37 m 5 m 2.14 eV 0 eV 5.44 m 5.44 m Tank Transportation - 2 -4.02 m -3.35 m 10 m 2.14 eV 0 eV 5.89 m 11.3 m OutOfWorld Transportation + 1 80.1 cm 83.3 cm -5 m 2.31 eV 0 eV 5.13 m 5.13 m Tank Transportation + 2 1.9 m 1.98 m -10 m 2.31 eV 0 eV 5.25 m 10.4 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 57, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 251 um 0 fm 0 fm 3.36 eV 0 eV 0 fm 0 fm Tank initStep + 0 711 um 514 um 275 um 2.74 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! - Old Momentum Direction: (0.25205395,0.95883479,0.13078475) - Old Polarization: (0.96691809,-0.24405889,-0.07419346) - New Momentum Direction: (0.34199497,0.9227946,0.17745299) - New Polarization: (-0.47062303,0.33164712,-0.81763327) + Old Momentum Direction: (-0.10948788,0.27927892,0.95394742) + Old Polarization: (0.32796775,-0.89582081,0.2999037) + New Momentum Direction: (-0.14803623,0.37760708,0.91405589) + New Polarization: (0.31354033,-0.85864229,0.40549461) *** FresnelRefraction *** - 1 1.31 m 5 m 68.2 cm 3.36 eV 0 eV 5.21 m 5.21 m Tank Transportation - 2 3.17 m 10 m 1.64 m 3.36 eV 0 eV 5.42 m 10.6 m OutOfWorld Transportation + 1 -57.3 cm 1.46 m 5 m 2.74 eV 0 eV 5.24 m 5.24 m Tank Transportation + 2 -1.38 m 3.53 m 10 m 2.74 eV 0 eV 5.47 m 10.7 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 56, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 135 um 0 fm 0 fm 2.3 eV 0 eV 0 fm 0 fm Tank initStep - -** Photon absorbed! ** - 1 -36.2 cm -3.57 m -4.73 m 2.3 eV 0 eV 5.93 m 5.93 m Tank OpAbsorption + 0 578 um 418 um 224 um 2.15 eV 0 eV 0 fm 0 fm Tank initStep + Photon at Boundary! + Old Momentum Direction: (-0.89002859,-0.3257515,-0.31895936) + Old Polarization: (0.16194753,0.42809048,-0.88910716) + New Momentum Direction: (-0.78988158,-0.43818403,-0.4290476) + New Polarization: (-0.22120195,0.85609426,-0.46708919) + *** FresnelRefraction *** + 1 -5 m -1.83 m -1.79 m 2.15 eV 0 eV 5.62 m 5.62 m Tank Transportation + 2 -10 m -4.6 m -4.51 m 2.15 eV 0 eV 6.33 m 11.9 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 55, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 80.9 um 0 fm 0 fm 2.68 eV 0 eV 0 fm 0 fm Tank initStep + 0 122 um 88.4 um 47.3 um 2.36 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! - Old Momentum Direction: (-0.02984382,-0.99953087,0.0068840981) - Old Polarization: (-0.83956414,0.021328831,-0.54284172) - New Momentum Direction: (-0.040337637,-0.99914278,0.0093047154) - New Polarization: (0.51671136,-0.028829433,-0.85567414) + Old Momentum Direction: (-0.44481293,-0.89467634,0.041178942) + Old Polarization: (-0.27605386,0.18069707,0.94400362) + New Momentum Direction: (-0.59948664,-0.79845835,0.055497995) + New Polarization: (0.41021861,-0.24697391,0.87790921) *** FresnelRefraction *** - 1 -14.9 cm -5 m 3.44 cm 2.68 eV 0 eV 5 m 5 m Tank Transportation - 2 -35.1 cm -10 m 8.1 cm 2.68 eV 0 eV 5 m 10 m OutOfWorld Transportation + 1 -2.49 m -5 m 23 cm 2.36 eV 0 eV 5.59 m 5.59 m Tank Transportation + 2 -6.24 m -10 m 57.8 cm 2.36 eV 0 eV 6.26 m 11.9 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 54, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 280 um 0 fm 0 fm 3.2 eV 0 eV 0 fm 0 fm Tank initStep + 0 940 um 680 um 364 um 3.05 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! - Old Momentum Direction: (-0.36159578,-0.28588738,-0.88742149) - Old Polarization: (-0.39037413,0.91080021,-0.13435403) - New Momentum Direction: (-0.49018909,-0.38755672,-0.78071406) - New Polarization: (-0.41060395,0.892771,-0.18537623) + Old Momentum Direction: (0.3062388,-0.94185532,0.13829803) + Old Polarization: (0.36768666,0.25103188,0.895427) + New Momentum Direction: (0.41484969,-0.89039366,0.18734692) + New Polarization: (-0.88079748,-0.34133079,0.32816016) *** FresnelRefraction *** - 1 -2.04 m -1.61 m -5 m 3.2 eV 0 eV 5.63 m 5.63 m Tank Transportation - 2 -5.18 m -4.09 m -10 m 3.2 eV 0 eV 6.4 m 12 m OutOfWorld Transportation + 1 1.63 m -5 m 73.5 cm 3.05 eV 0 eV 5.31 m 5.31 m Tank Transportation + 2 3.96 m -10 m 1.79 m 3.05 eV 0 eV 5.62 m 10.9 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 53, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 46.1 um 0 fm 0 fm 3.46 eV 0 eV 0 fm 0 fm Tank initStep - -** Photon absorbed! ** - 1 2.46 m 2.56 m -37.9 cm 3.46 eV 0 eV 3.57 m 3.57 m Tank OpAbsorption + 0 450 um 326 um 174 um 3.96 eV 0 eV 0 fm 0 fm Tank initStep + Photon at Boundary! + Old Momentum Direction: (0.51849005,-0.61446948,-0.59463882) + Old Polarization: (-0.80882323,-0.12679901,-0.5742186) + New Momentum Direction: (0.54468361,0.24737865,0.80132613) + New Polarization: (0.79068639,-0.46995842,-0.39236988) + *** LambertianReflection *** + 1 4.22 m -5 m -4.84 m 3.96 eV 0 eV 8.14 m 8.14 m Tank Transportation + 2 4.22 m -5 m -4.84 m 3.96 eV 0 eV 0 fm 8.14 m World Transportation + Photon at Boundary! + Old Momentum Direction: (0.54468361,0.24737865,0.80132613) + Old Polarization: (0.79068639,-0.46995842,-0.39236988) + New Momentum Direction: (-0.54468361,0.24737865,0.80132613) + New Polarization: (0.79068639,0.46995842,0.39236988) + *** LobeReflection *** + 3 5 m -4.65 m -3.69 m 3.96 eV 0 eV 1.43 m 9.57 m Tank Transportation + 4 5 m -4.65 m -3.69 m 3.96 eV 0 eV 0 fm 9.57 m World Transportation + Photon at Boundary! + Old Momentum Direction: (-0.54468361,0.24737865,0.80132613) + Old Polarization: (0.79068639,0.46995842,0.39236988) + New Momentum Direction: (-0.7406818,0.33639504,0.58157446) + New Polarization: (0.66235609,0.51066436,0.54818457) + *** FresnelRefraction *** + 5 -90.7 cm -1.96 m 5 m 3.96 eV 0 eV 10.8 m 20.4 m Tank Transportation + 6 -7.28 m 92.9 cm 10 m 3.96 eV 0 eV 8.6 m 29 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 52, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 130 um 0 fm 0 fm 3.72 eV 0 eV 0 fm 0 fm Tank initStep + 0 746 um 540 um 289 um 3.92 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! - Old Momentum Direction: (0.98600474,-0.089697135,0.14053142) - Old Polarization: (0.066066183,0.98414324,0.16461272) - New Momentum Direction: (0.97400291,-0.12188049,0.19095414) - New Polarization: (0.089911788,0.98168393,0.16796588) + Old Momentum Direction: (0.68959123,-0.14579871,0.70937061) + Old Polarization: (0.67353825,0.48903904,-0.55424457) + New Momentum Direction: (0.93762783,-0.19824053,0.28557792) + New Polarization: (-0.1125263,0.60418244,0.78886083) *** FresnelRefraction *** - 1 5 m -45.5 cm 71.3 cm 3.72 eV 0 eV 5.07 m 5.07 m Tank Transportation - 2 10 m -1.08 m 1.69 m 3.72 eV 0 eV 5.13 m 10.2 m OutOfWorld Transportation + 1 4.86 m -1.03 m 5 m 3.92 eV 0 eV 7.05 m 7.05 m Tank Transportation + 2 10 m -2.11 m 6.57 m 3.92 eV 0 eV 5.48 m 12.5 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 51, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 403 um 0 fm 0 fm 3.84 eV 0 eV 0 fm 0 fm Tank initStep - -** Photon absorbed! ** - 1 -1.12 m 19.9 cm -1.31 m 3.84 eV 0 eV 1.73 m 1.73 m Tank OpAbsorption + 0 486 um 352 um 188 um 3.02 eV 0 eV 0 fm 0 fm Tank initStep + Photon at Boundary! + Old Momentum Direction: (-0.49244792,-0.68067284,-0.54238319) + Old Polarization: (-0.52798153,0.72905312,-0.43556522) + New Momentum Direction: (-0.66699217,-0.12427868,-0.73462661) + New Polarization: (0.024231298,-0.98908705,0.145326) + *** FresnelRefraction *** + 1 -3.62 m -5 m -3.98 m 3.02 eV 0 eV 7.35 m 7.35 m Tank Transportation + 2 -9.08 m -6.02 m -10 m 3.02 eV 0 eV 8.19 m 15.5 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 50, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 765 um 0 fm 0 fm 4.07 eV 0 eV 0 fm 0 fm Tank initStep - -** Photon absorbed! ** - 1 17.8 cm -84.4 cm 1.1 m 4.07 eV 0 eV 1.4 m 1.4 m Tank OpAbsorption + 0 149 um 108 um 57.6 um 3.64 eV 0 eV 0 fm 0 fm Tank initStep + Photon at Boundary! + Old Momentum Direction: (-0.59367866,-0.72173894,-0.35586309) + Old Polarization: (0.75280553,-0.65437336,0.07126942) + New Momentum Direction: (-0.80648964,-0.34040187,-0.48342633) + New Polarization: (0.43075937,-0.89835452,-0.08605532) + *** FresnelRefraction *** + 1 -4.11 m -5 m -2.47 m 3.64 eV 0 eV 6.93 m 6.93 m Tank Transportation + 2 -10 m -7.48 m -5.99 m 3.64 eV 0 eV 7.3 m 14.2 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 49, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 750 um 0 fm 0 fm 3.4 eV 0 eV 0 fm 0 fm Tank initStep + 0 469 um 340 um 182 um 2.16 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! - Old Momentum Direction: (-0.73771514,-0.046765887,-0.67349041) - Old Polarization: (0.082620463,-0.99635313,-0.021314377) - New Momentum Direction: (-0.40087805,-0.063461605,-0.91393075) - New Polarization: (-0.12245551,-0.98493406,0.12210468) + Old Momentum Direction: (-0.75452764,-0.65625344,0.004412055) + Old Polarization: (-0.066242642,0.069470452,-0.99538222) + New Momentum Direction: (-0.46957574,-0.88287224,0.005935635) + New Polarization: (-0.095372096,0.044039928,-0.99446702) *** FresnelRefraction *** - 1 -5 m -31.7 cm -4.57 m 3.4 eV 0 eV 6.78 m 6.78 m Tank Transportation - 2 -7.38 m -69.4 cm -10 m 3.4 eV 0 eV 5.95 m 12.7 m OutOfWorld Transportation + 1 -5 m -4.35 m 2.94 cm 2.16 eV 0 eV 6.63 m 6.63 m Tank Transportation + 2 -8.01 m -10 m 6.74 cm 2.16 eV 0 eV 6.4 m 13 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 48, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 390 um 0 fm 0 fm 3.38 eV 0 eV 0 fm 0 fm Tank initStep + 0 402 um 291 um 155 um 2.99 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! - Old Momentum Direction: (0.48956411,0.73077698,0.47570157) - Old Polarization: (0.043280142,-0.56524226,0.82378882) - New Momentum Direction: (0.66429789,0.37690065,0.64548758) - New Polarization: (-0.59518004,0.78913448,0.15174815) + Old Momentum Direction: (-0.1666561,-0.98229479,-0.08557272) + Old Polarization: (-0.11035288,0.10482263,-0.98834936) + New Momentum Direction: (0.1666561,0.98229479,0.08557272) + New Polarization: (0.11035288,-0.10482263,0.98834936) + *** BackScattering *** + 1 -84.8 cm -5 m -43.5 cm 2.99 eV 0 eV 5.09 m 5.09 m Tank Transportation + 2 -84.8 cm -5 m -43.5 cm 2.99 eV 0 eV 0 fm 5.09 m World Transportation + Photon at Boundary! + Old Momentum Direction: (0.1666561,0.98229479,0.08557272) + Old Polarization: (0.11035288,-0.10482263,0.98834936) + New Momentum Direction: (0.22568913,0.9672824,0.11588434) + New Polarization: (-0.86053094,0.14217894,0.48915402) *** FresnelRefraction *** - 1 3.35 m 5 m 3.25 m 3.38 eV 0 eV 6.84 m 6.84 m Tank Transportation - 2 10 m 8.77 m 9.72 m 3.38 eV 0 eV 10 m 16.9 m OutOfWorld Transportation + 3 34 cm 2 m 17.4 cm 2.99 eV 0 eV 7.13 m 12.2 m Tank Transportation + Photon at Boundary! + Old Momentum Direction: (0.22568913,0.9672824,0.11588434) + Old Polarization: (-0.86053094,0.14217894,0.48915402) + New Momentum Direction: (-0.22568913,0.9672824,0.11588434) + New Polarization: (-0.74722768,-0.095554687,-0.6576626) + *** FresnelReflection *** + 4 50 cm 2.69 m 25.7 cm 2.99 eV 0 eV 71 cm 12.9 m Bubble Transportation + 5 50 cm 2.69 m 25.7 cm 2.99 eV 0 eV 0 fm 12.9 m Tank Transportation + Photon at Boundary! + Old Momentum Direction: (-0.22568913,0.9672824,0.11588434) + Old Polarization: (-0.74722768,-0.095554687,-0.6576626) + New Momentum Direction: (-0.1666561,0.98229479,0.08557272) + New Polarization: (-0.093220344,0.070701051,-0.99313208) + *** FresnelRefraction *** + 6 42.7 cm 3 m 29.4 cm 2.99 eV 0 eV 32.3 cm 13.3 m Bubble Transportation + Photon at Boundary! + Old Momentum Direction: (-0.1666561,0.98229479,0.08557272) + Old Polarization: (-0.093220344,0.070701051,-0.99313208) + New Momentum Direction: (-0.22568913,0.9672824,0.11588434) + New Polarization: (-0.097474716,0.095935213,-0.99060341) + *** FresnelRefraction *** + 7 8.77 cm 5 m 46.8 cm 2.99 eV 0 eV 2.04 m 15.3 m Tank Transportation + 8 -1.08 m 10 m 1.07 m 2.99 eV 0 eV 5.17 m 20.5 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 47, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 638 um 0 fm 0 fm 3.32 eV 0 eV 0 fm 0 fm Tank initStep + 0 425 um 307 um 164 um 2.3 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! - Old Momentum Direction: (-0.24506605,0.012153222,-0.96943021) - Old Polarization: (-0.13195292,-0.99103494,0.020932827) - New Momentum Direction: (-0.33244209,0.016486341,-0.94297956) - New Polarization: (0.031334807,-0.99910212,-0.028514454) + Old Momentum Direction: (0.68080695,-0.30554464,-0.6656909) + Old Polarization: (0.73241767,0.29407876,0.61407006) + New Momentum Direction: (0.1629109,-0.41157416,-0.89669769) + New Polarization: (0.98659845,0.076374086,0.14418911) *** FresnelRefraction *** - 1 -1.26 m 6.27 cm -5 m 3.32 eV 0 eV 5.16 m 5.16 m Tank Transportation - 2 -3.03 m 15 cm -10 m 3.32 eV 0 eV 5.3 m 10.5 m OutOfWorld Transportation + 1 5 m -2.24 m -4.89 m 2.3 eV 0 eV 7.34 m 7.34 m Tank Transportation + 2 5.93 m -4.59 m -10 m 2.3 eV 0 eV 5.7 m 13 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 46, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 51.4 um 0 fm 0 fm 3.55 eV 0 eV 0 fm 0 fm Tank initStep + 0 907 um 657 um 351 um 3.13 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! - Old Momentum Direction: (-0.24746335,0.13333022,-0.9596796) - Old Polarization: (0.18646019,0.97852534,0.087867804) - New Momentum Direction: (-0.33606627,0.18106839,-0.92426928) - New Polarization: (0.70596194,0.69801943,-0.1199442) + Old Momentum Direction: (-0.5401547,0.088621898,-0.83688653) + Old Polarization: (-0.16371311,0.96437649,0.20778836) + New Momentum Direction: (-0.63927416,0.0036158559,0.7689704) + New Polarization: (0.14325192,-0.98192425,0.12370795) + *** LambertianReflection *** + 1 -3.23 m 53 cm -5 m 3.13 eV 0 eV 5.97 m 5.97 m Tank Transportation + 2 -3.23 m 53 cm -5 m 3.13 eV 0 eV 0 fm 5.97 m World Transportation + Photon at Boundary! + Old Momentum Direction: (-0.63927416,0.0036158559,0.7689704) + Old Polarization: (0.14325192,-0.98192425,0.12370795) + New Momentum Direction: (0.63927416,0.0036158559,0.7689704) + New Polarization: (0.14325192,0.98192425,-0.12370795) + *** LobeReflection *** + 3 -5 m 54 cm -2.87 m 3.13 eV 0 eV 2.77 m 8.75 m Tank Transportation + 4 -5 m 54 cm -2.87 m 3.13 eV 0 eV 0 fm 8.75 m World Transportation +Scattering Photon! +Old Momentum Direction: (0.63927416,0.0036158559,0.7689704) +Old Polarization: (0.14325192,0.98192425,-0.12370795) +New Polarization: (0.22264896,0.51685869,0.82661026) +Polarization Change: (0.22264896,0.51685869,0.82661026) +New Momentum Direction: (-0.051057344,-0.84054786,0.53932591) +Momentum Change: (-0.051057344,-0.84054786,0.53932591) + 5 -1.94 m 55.8 cm 81.6 cm 3.13 eV 0 eV 4.79 m 13.5 m Tank OpRayleigh + Photon at Boundary! + Old Momentum Direction: (-0.051057344,-0.84054786,0.53932591) + Old Polarization: (0.22264896,0.51685869,0.82661026) + New Momentum Direction: (-0.069192068,-0.67898362,0.73088556) + New Polarization: (0.35085033,-0.70239921,-0.61930558) *** FresnelRefraction *** - 1 -1.29 m 69.5 cm -5 m 3.55 eV 0 eV 5.21 m 5.21 m Tank Transportation - 2 -3.11 m 1.67 m -10 m 3.55 eV 0 eV 5.41 m 10.6 m OutOfWorld Transportation + 6 -2.28 m -5 m 4.38 m 3.13 eV 0 eV 6.61 m 20.2 m Tank Transportation + 7 -2.79 m -10 m 9.76 m 3.13 eV 0 eV 7.36 m 27.5 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 45, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 378 um 0 fm 0 fm 3.99 eV 0 eV 0 fm 0 fm Tank initStep - -** Photon absorbed! ** - 1 -2.82 m 1.01 m 58.8 cm 3.99 eV 0 eV 3.06 m 3.06 m Tank OpAbsorption + 0 531 um 384 um 205 um 3.37 eV 0 eV 0 fm 0 fm Tank initStep + Photon at Boundary! + Old Momentum Direction: (0.31541138,0.55773754,-0.76775289) + Old Polarization: (0.81307967,0.25832887,0.52169689) + New Momentum Direction: (0.42797219,0.75677726,-0.4940931) + New Polarization: (0.28109633,-0.63103088,-0.72303865) + *** FresnelRefraction *** + 1 2.05 m 3.63 m -5 m 3.37 eV 0 eV 6.51 m 6.51 m Tank Transportation + 2 5.66 m 10 m -9.16 m 3.37 eV 0 eV 8.41 m 14.9 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 44, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 105 um 0 fm 0 fm 3.03 eV 0 eV 0 fm 0 fm Tank initStep - Photon at Boundary! - Old Momentum Direction: (0.88444991,-0.27627529,-0.37605894) - Old Polarization: (-0.068668508,0.72006334,-0.6905023) - New Momentum Direction: (0.77491014,-0.37422323,-0.5093832) - New Polarization: (0.094839575,0.8656113,-0.49165286) - *** FresnelRefraction *** - 1 5 m -1.56 m -2.13 m 3.03 eV 0 eV 5.65 m 5.65 m Tank Transportation - 2 10 m -3.98 m -5.41 m 3.03 eV 0 eV 6.45 m 12.1 m OutOfWorld Transportation + 0 507 um 367 um 196 um 2.21 eV 0 eV 0 fm 0 fm Tank initStep + +** Photon absorbed! ** + 1 51.7 cm 2.5 m -1.64 m 2.21 eV 0 eV 3.04 m 3.04 m Tank OpAbsorption ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 43, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 435 um 0 fm 0 fm 2.39 eV 0 eV 0 fm 0 fm Tank initStep - -** Photon absorbed! ** - 1 -39.8 cm -14.9 cm -8.57 cm 2.39 eV 0 eV 43.4 cm 43.4 cm Tank OpAbsorption + 0 390 um 282 um 151 um 3.34 eV 0 eV 0 fm 0 fm Tank initStep + Photon at Boundary! + Old Momentum Direction: (-0.32456565,-0.66003842,0.67750013) + Old Polarization: (-0.59545905,-0.41394146,-0.68853539) + New Momentum Direction: (-0.32456565,-0.66003842,-0.67750013) + New Polarization: (-0.62547629,-0.38753984,0.67719442) + *** LobeReflection *** + 1 -2.39 m -4.87 m 5 m 3.34 eV 0 eV 7.38 m 7.38 m Tank Transportation + 2 -2.39 m -4.87 m 5 m 3.34 eV 0 eV 0 fm 7.38 m World Transportation + Photon at Boundary! + Old Momentum Direction: (-0.32456565,-0.66003842,-0.67750013) + Old Polarization: (-0.62547629,-0.38753984,0.67719442) + New Momentum Direction: (0.32456565,0.66003842,0.67750013) + New Polarization: (0.62547629,0.38753984,-0.67719442) + *** BackScattering *** + 3 -2.46 m -5 m 4.87 m 3.34 eV 0 eV 19.6 cm 7.58 m Tank Transportation + 4 -2.46 m -5 m 4.87 m 3.34 eV 0 eV 0 fm 7.58 m World Transportation + Photon at Boundary! + Old Momentum Direction: (0.32456565,0.66003842,0.67750013) + Old Polarization: (0.62547629,0.38753984,-0.67719442) + New Momentum Direction: (0.44033009,0.8954576,0.065307675) + New Polarization: (0.25374946,-0.19389142,0.94763776) + *** FresnelRefraction *** + 5 -2.39 m -4.87 m 5 m 3.34 eV 0 eV 19.6 cm 7.77 m Tank Transportation + 6 4.92 m 10 m 6.08 m 3.34 eV 0 eV 16.6 m 24.4 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 42, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 530 um 0 fm 0 fm 2.49 eV 0 eV 0 fm 0 fm Tank initStep -Scattering Photon! -Old Momentum Direction: (-0.93210974,-0.18554896,-0.31103539) -Old Polarization: (0.30939491,-0.85437521,-0.41751382) -New Polarization: (0.65865294,-0.53445151,-0.52965827) -Polarization Change: (0.65865294,-0.53445151,-0.52965827) -New Momentum Direction: (0.57453591,0.81176186,-0.10464783) -Momentum Change: (0.57453591,0.81176186,-0.10464783) - 1 -1.66 m -33 cm -55.4 cm 2.49 eV 0 eV 1.78 m 1.78 m Tank OpRayleigh + 0 195 um 141 um 75.4 um 2.41 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! - Old Momentum Direction: (0.57453591,0.81176186,-0.10464783) - Old Polarization: (0.65865294,-0.53445151,-0.52965827) - New Momentum Direction: (0.77525681,0.61566,-0.14120779) - New Polarization: (-0.62766425,0.72581006,-0.28149131) + Old Momentum Direction: (-0.36958309,0.9010553,-0.22695303) + Old Polarization: (0.32417943,0.35393485,0.87729004) + New Momentum Direction: (-0.49829374,0.81121672,-0.30599147) + New Polarization: (0.26774792,0.47965716,0.8356076) *** FresnelRefraction *** - 2 2.11 m 5 m -1.24 m 2.49 eV 0 eV 6.57 m 8.35 m Tank Transportation - 3 8.41 m 10 m -2.39 m 2.49 eV 0 eV 8.12 m 16.5 m OutOfWorld Transportation + 1 -2.05 m 5 m -1.26 m 2.41 eV 0 eV 5.55 m 5.55 m Tank Transportation + 2 -5.12 m 10 m -3.15 m 2.41 eV 0 eV 6.16 m 11.7 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 41, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 70.3 um 0 fm 0 fm 3.46 eV 0 eV 0 fm 0 fm Tank initStep - Photon at Boundary! - Old Momentum Direction: (-0.38990836,0.25233001,-0.88560772) - Old Polarization: (0.16472173,-0.92710128,-0.33667486) - New Momentum Direction: (-0.52922021,0.34248596,-0.77629204) - New Polarization: (0.10657521,-0.88083831,-0.46126521) - *** FresnelRefraction *** - 1 -2.2 m 1.42 m -5 m 3.46 eV 0 eV 5.65 m 5.65 m Tank Transportation - 2 -5.61 m 3.63 m -10 m 3.46 eV 0 eV 6.44 m 12.1 m OutOfWorld Transportation + 0 124 um 89.4 um 47.8 um 3.46 eV 0 eV 0 fm 0 fm Tank initStep + +** Photon absorbed! ** + 1 -1.82 m -1.92 m 1.57 m 3.46 eV 0 eV 3.07 m 3.07 m Tank OpAbsorption ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 40, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 518 um 0 fm 0 fm 2.69 eV 0 eV 0 fm 0 fm Tank initStep - Photon at Boundary! - Old Momentum Direction: (0.27898081,0.94959214,-0.14298415) - Old Polarization: (-0.84845249,0.17400219,-0.49985159) - New Momentum Direction: (0.37709775,0.90578335,-0.19327136) - New Polarization: (-0.8281712,0.23634798,-0.50820479) - *** FresnelRefraction *** - 1 1.47 m 5 m -75.3 cm 2.69 eV 0 eV 5.27 m 5.27 m Tank Transportation - 2 3.55 m 10 m -1.82 m 2.69 eV 0 eV 5.52 m 10.8 m OutOfWorld Transportation + 0 483 um 349 um 187 um 3.5 eV 0 eV 0 fm 0 fm Tank initStep + +** Photon absorbed! ** + 1 -77.8 cm 70.5 cm -8.49 cm 3.5 eV 0 eV 1.05 m 1.05 m Tank OpAbsorption ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 39, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 149 um 0 fm 0 fm 3.36 eV 0 eV 0 fm 0 fm Tank initStep + 0 547 um 396 um 212 um 3.28 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! - Old Momentum Direction: (0.64637477,0.68483442,-0.33645427) - Old Polarization: (-0.51209652,0.062470064,-0.85665317) - New Momentum Direction: (0.64637477,-0.68483442,-0.33645427) - New Polarization: (-0.42160398,0.046969446,-0.90556278) - *** LobeReflection *** - 1 4.72 m 5 m -2.46 m 3.36 eV 0 eV 7.3 m 7.3 m Tank Transportation - 2 4.72 m 5 m -2.46 m 3.36 eV 0 eV 0 fm 7.3 m World Transportation - Photon at Boundary! - Old Momentum Direction: (0.64637477,-0.68483442,-0.33645427) - Old Polarization: (-0.42160398,0.046969446,-0.90556278) - New Momentum Direction: (-0.64637477,-0.68483442,-0.33645427) - New Polarization: (-0.42160398,-0.046969446,0.90556278) - *** LobeReflection *** - 3 5 m 4.7 m -2.6 m 3.36 eV 0 eV 43.4 cm 7.74 m Tank Transportation - 4 5 m 4.7 m -2.6 m 3.36 eV 0 eV 0 fm 7.74 m World Transportation - Photon at Boundary! - Old Momentum Direction: (-0.64637477,-0.68483442,-0.33645427) - Old Polarization: (-0.42160398,-0.046969446,0.90556278) - New Momentum Direction: (-0.64637477,-0.68483442,0.33645427) - New Polarization: (0.42160398,0.046969446,0.90556278) - *** LobeReflection *** - 5 39.4 cm -17.7 cm -5 m 3.36 eV 0 eV 7.13 m 14.9 m Tank Transportation - 6 39.4 cm -17.7 cm -5 m 3.36 eV 0 eV 0 fm 14.9 m World Transportation -Scattering Photon! -Old Momentum Direction: (-0.64637477,-0.68483442,0.33645427) -Old Polarization: (0.42160398,0.046969446,0.90556278) -New Polarization: (-0.59831382,-0.21326008,0.77236048) -Polarization Change: (-0.59831382,-0.21326008,0.77236048) -New Momentum Direction: (-0.7595821,-0.1558802,-0.63145578) -Momentum Change: (-0.7595821,-0.1558802,-0.63145578) - 7 -1.92 m -2.62 m -3.8 m 3.36 eV 0 eV 3.57 m 18.4 m Tank OpRayleigh - Photon at Boundary! - Old Momentum Direction: (-0.7595821,-0.1558802,-0.63145578) - Old Polarization: (-0.59831382,-0.21326008,0.77236048) - New Momentum Direction: (-0.7595821,-0.1558802,0.63145578) - New Polarization: (0.59831382,0.21326008,0.77236048) - *** SpikeReflection *** - 8 -3.36 m -2.92 m -5 m 3.36 eV 0 eV 1.9 m 20.3 m Tank Transportation - 9 -3.36 m -2.92 m -5 m 3.36 eV 0 eV 0 fm 20.3 m World Transportation - Photon at Boundary! - Old Momentum Direction: (-0.7595821,-0.1558802,0.63145578) - Old Polarization: (0.59831382,0.21326008,0.77236048) - New Momentum Direction: (-0.47033215,-0.21150095,0.85677011) - New Polarization: (-0.820221,0.46298797,-0.33597567) + Old Momentum Direction: (0.60496306,0.10101273,0.78982031) + Old Polarization: (0.66776176,0.47594018,-0.57234184) + New Momentum Direction: (0.82041143,0.13698688,0.55512132) + New Polarization: (-0.57080682,0.2526596,0.78124433) *** FresnelRefraction *** - 10 -5 m -3.26 m -3.64 m 3.36 eV 0 eV 2.16 m 22.5 m Tank Transportation - 11 -10 m -5.51 m 5.47 m 3.36 eV 0 eV 10.6 m 33.1 m OutOfWorld Transportation + 1 3.83 m 64 cm 5 m 3.28 eV 0 eV 6.33 m 6.33 m Tank Transportation + 2 10 m 1.67 m 9.17 m 3.28 eV 0 eV 7.52 m 13.9 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 38, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 567 um 0 fm 0 fm 2.84 eV 0 eV 0 fm 0 fm Tank initStep + 0 404 um 293 um 156 um 2.48 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! - Old Momentum Direction: (-0.61844409,-0.024185395,-0.78545654) - Old Polarization: (0.08243148,0.99201533,-0.095449641) - New Momentum Direction: (-0.83684524,-0.032726374,-0.54646046) - New Polarization: (0.050194626,0.98941969,-0.13612193) + Old Momentum Direction: (0.90569417,-0.37565161,0.19647884) + Old Polarization: (-0.11475134,0.22892963,0.96665576) + New Momentum Direction: (0.82029269,-0.5068073,0.26507783) + New Polarization: (0.15693818,0.64512868,0.74778298) *** FresnelRefraction *** - 1 -3.94 m -15.4 cm -5 m 2.84 eV 0 eV 6.37 m 6.37 m Tank Transportation - 2 -10 m -39.1 cm -8.96 m 2.84 eV 0 eV 7.25 m 13.6 m OutOfWorld Transportation + 1 5 m -2.07 m 1.08 m 2.48 eV 0 eV 5.52 m 5.52 m Tank Transportation + 2 10 m -5.16 m 2.7 m 2.48 eV 0 eV 6.1 m 11.6 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 37, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 583 um 0 fm 0 fm 2.09 eV 0 eV 0 fm 0 fm Tank initStep + 0 408 um 295 um 158 um 2.75 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! - Old Momentum Direction: (-0.41989864,-0.20992453,0.88295913) - Old Polarization: (0.060109529,0.96431279,0.25785205) - New Momentum Direction: (-0.56447184,-0.2822026,0.77571466) - New Polarization: (0.014643558,0.93617361,0.35123288) + Old Momentum Direction: (-0.68530144,-0.055639576,-0.72613096) + Old Polarization: (-0.1163685,0.992632,0.033765085) + New Momentum Direction: (-0.92661377,-0.075231707,-0.36841161) + New Polarization: (-0.060921833,0.99687238,-0.050338809) *** FresnelRefraction *** - 1 -2.38 m -1.19 m 5 m 2.09 eV 0 eV 5.66 m 5.66 m Tank Transportation - 2 -6.02 m -3.01 m 10 m 2.09 eV 0 eV 6.45 m 12.1 m OutOfWorld Transportation + 1 -4.72 m -38.3 cm -5 m 2.75 eV 0 eV 6.89 m 6.89 m Tank Transportation + 2 -10 m -81.2 cm -7.1 m 2.75 eV 0 eV 5.7 m 12.6 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 36, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 494 um 0 fm 0 fm 4 eV 0 eV 0 fm 0 fm Tank initStep + 0 452 um 327 um 175 um 3.99 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! - Old Momentum Direction: (-0.88727359,0.45812219,0.053568959) - Old Polarization: (-0.45901745,-0.86561942,-0.20001502) - New Momentum Direction: (-0.77877934,0.62305293,0.072854574) - New Polarization: (-0.62438762,-0.75874597,-0.18559272) + Old Momentum Direction: (0.56952241,0.81810066,0.07972157) + Old Polarization: (-0.35734567,0.33376974,-0.87229687) + New Momentum Direction: (0.77452287,0.62318534,0.10841747) + New Polarization: (-0.2567062,0.46632277,-0.84654888) *** FresnelRefraction *** - 1 -5 m 2.58 m 30.2 cm 4 eV 0 eV 5.64 m 5.64 m Tank Transportation - 2 -10 m 6.58 m 77 cm 4 eV 0 eV 6.42 m 12.1 m OutOfWorld Transportation + 1 3.48 m 5 m 48.7 cm 3.99 eV 0 eV 6.11 m 6.11 m Tank Transportation + 2 9.7 m 10 m 1.36 m 3.99 eV 0 eV 8.02 m 14.1 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 35, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 176 um 0 fm 0 fm 3.11 eV 0 eV 0 fm 0 fm Tank initStep - Photon at Boundary! - Old Momentum Direction: (-0.78743142,0.38124181,-0.48436189) - Old Polarization: (-0.50576841,-0.84878455,0.15415289) - New Momentum Direction: (-0.54984839,0.51660702,-0.65634133) - New Polarization: (-0.69701882,-0.71678088,0.019746799) - *** FresnelRefraction *** - 1 -5 m 2.42 m -3.08 m 3.11 eV 0 eV 6.35 m 6.35 m Tank Transportation - 2 -10 m 7.12 m -9.04 m 3.11 eV 0 eV 9.09 m 15.4 m OutOfWorld Transportation - -********************************************************************************************************* -* G4Track Information: Particle = opticalphoton, Track ID = 34, Parent ID = 1 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 282 um 0 fm 0 fm 2.36 eV 0 eV 0 fm 0 fm Tank initStep -Scattering Photon! -Old Momentum Direction: (-0.53656892,0.08859642,0.83919275) -Old Polarization: (-0.46174496,0.80156102,-0.37985723) -New Polarization: (0.44982407,0.87201633,-0.19299176) -Polarization Change: (0.44982407,0.87201633,-0.19299176) -New Momentum Direction: (-0.86712504,0.37466245,-0.32821061) -Momentum Change: (-0.86712504,0.37466245,-0.32821061) - 1 -2.93 m 48.4 cm 4.59 m 2.36 eV 0 eV 5.46 m 5.46 m Tank OpRayleigh - Photon at Boundary! - Old Momentum Direction: (-0.86712504,0.37466245,-0.32821061) - Old Polarization: (0.44982407,0.87201633,-0.19299176) - New Momentum Direction: (-0.74122174,0.50492031,-0.44231868) - New Polarization: (-0.6087621,-0.22798572,0.75988895) - *** FresnelRefraction *** - 2 -5 m 1.38 m 3.8 m 2.36 eV 0 eV 2.39 m 7.85 m Tank Transportation - 3 -10 m 4.78 m 81.8 cm 2.36 eV 0 eV 6.75 m 14.6 m OutOfWorld Transportation - -********************************************************************************************************* -* G4Track Information: Particle = opticalphoton, Track ID = 33, Parent ID = 1 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 776 um 0 fm 0 fm 2.07 eV 0 eV 0 fm 0 fm Tank initStep - -** Photon absorbed! ** - 1 -67 cm 14.8 cm -18.6 cm 2.07 eV 0 eV 71.2 cm 71.2 cm Tank OpAbsorption - -********************************************************************************************************* -* G4Track Information: Particle = opticalphoton, Track ID = 32, Parent ID = 1 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 750 um 0 fm 0 fm 4.09 eV 0 eV 0 fm 0 fm Tank initStep + 0 857 um 0 fm 0 fm 4.09 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! Old Momentum Direction: (0.85181825,0.2904508,-0.43594037) Old Polarization: (-0.52383745,0.47230547,-0.70888777) @@ -666,11 +672,11 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng 2 10 m 4.52 m -6.79 m 4.09 eV 0 eV 7.13 m 13 m OutOfWorld Transportation ********************************************************************************************************* -* G4Track Information: Particle = opticalphoton, Track ID = 31, Parent ID = 1 +* G4Track Information: Particle = opticalphoton, Track ID = 34, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 244 um 0 fm 0 fm 2.42 eV 0 eV 0 fm 0 fm Tank initStep + 0 279 um 0 fm 0 fm 2.42 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! Old Momentum Direction: (0.8595015,-0.44787952,0.24629478) Old Polarization: (-0.51113323,-0.75313654,0.4141596) @@ -681,11 +687,11 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng 2 10 m -6.77 m 3.72 m 2.42 eV 0 eV 6.9 m 12.7 m OutOfWorld Transportation ********************************************************************************************************* -* G4Track Information: Particle = opticalphoton, Track ID = 30, Parent ID = 1 +* G4Track Information: Particle = opticalphoton, Track ID = 33, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 585 um 0 fm 0 fm 2.72 eV 0 eV 0 fm 0 fm Tank initStep + 0 669 um 0 fm 0 fm 2.72 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! Old Momentum Direction: (0.85724849,-0.1900385,-0.4785503) Old Polarization: (-0.51490292,-0.31639017,-0.79672595) @@ -696,29 +702,21 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng 2 10 m -2.9 m -7.3 m 2.72 eV 0 eV 6.96 m 12.8 m OutOfWorld Transportation ********************************************************************************************************* -* G4Track Information: Particle = opticalphoton, Track ID = 29, Parent ID = 1 +* G4Track Information: Particle = opticalphoton, Track ID = 32, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 794 um 0 fm 0 fm 4.13 eV 0 eV 0 fm 0 fm Tank initStep -Scattering Photon! -Old Momentum Direction: (0.85168109,-0.020373577,0.52366424) -Old Polarization: (-0.52406042,-0.033110285,0.85103724) -New Polarization: (-0.19664141,0.45865675,0.86658302) -Polarization Change: (-0.19664141,0.45865675,0.86658302) -New Momentum Direction: (-0.64073007,-0.72912234,0.24051108) -Momentum Change: (-0.64073007,-0.72912234,0.24051108) - 1 2 m -4.78 cm 1.23 m 4.13 eV 0 eV 2.35 m 2.35 m Tank OpRayleigh + 0 908 um 0 fm 0 fm 4.13 eV 0 eV 0 fm 0 fm Tank initStep ** Photon absorbed! ** - 2 4.35 cm -2.27 m 1.96 m 4.13 eV 0 eV 3.05 m 5.4 m Tank OpAbsorption + 1 1.84 m -4.39 cm 1.13 m 4.13 eV 0 eV 2.16 m 2.16 m Tank OpAbsorption ********************************************************************************************************* -* G4Track Information: Particle = opticalphoton, Track ID = 28, Parent ID = 1 +* G4Track Information: Particle = opticalphoton, Track ID = 31, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 393 um 0 fm 0 fm 2.59 eV 0 eV 0 fm 0 fm Tank initStep + 0 449 um 0 fm 0 fm 2.59 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! Old Momentum Direction: (0.85813547,0.50155418,-0.10975845) Old Polarization: (-0.51342332,0.83829739,-0.18345021) @@ -728,166 +726,152 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng 1 5 m 2.92 m -63.9 cm 2.59 eV 0 eV 5.83 m 5.83 m Tank Transportation 2 10 m 7.62 m -1.67 m 2.59 eV 0 eV 6.94 m 12.8 m OutOfWorld Transportation +********************************************************************************************************* +* G4Track Information: Particle = opticalphoton, Track ID = 30, Parent ID = 1 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 352 um 0 fm 0 fm 2.17 eV 0 eV 0 fm 0 fm Tank initStep + +** Photon absorbed! ** + 1 4.83 m 2.76 m -70 cm 2.17 eV 0 eV 5.61 m 5.61 m Tank OpAbsorption + +********************************************************************************************************* +* G4Track Information: Particle = opticalphoton, Track ID = 29, Parent ID = 1 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 460 um 0 fm 0 fm 2.21 eV 0 eV 0 fm 0 fm Tank initStep + Photon at Boundary! + Old Momentum Direction: (0.86103311,-0.50406594,-0.067375947) + Old Polarization: (-0.5085489,-0.85344292,-0.1140754) + New Momentum Direction: (0.72901566,-0.67846303,-0.090686726) + New Polarization: (0.68449702,0.72258923,0.096584852) + *** FresnelRefraction *** + 1 5 m -2.93 m -39.1 cm 2.21 eV 0 eV 5.81 m 5.81 m Tank Transportation + 2 10 m -7.58 m -1.01 m 2.21 eV 0 eV 6.86 m 12.7 m OutOfWorld Transportation + +********************************************************************************************************* +* G4Track Information: Particle = opticalphoton, Track ID = 28, Parent ID = 1 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 680 um 0 fm 0 fm 2.3 eV 0 eV 0 fm 0 fm Tank initStep + +** Photon absorbed! ** + 1 2.27 m 41.8 cm -1.28 m 2.3 eV 0 eV 2.64 m 2.64 m Tank OpAbsorption + ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 27, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 308 um 0 fm 0 fm 2.17 eV 0 eV 0 fm 0 fm Tank initStep - Photon at Boundary! - Old Momentum Direction: (0.86139193,0.49238979,-0.12472466) - Old Polarization: (-0.50794089,0.83501959,-0.2115144) - New Momentum Direction: (0.73004989,0.6624711,-0.16780706) - New Polarization: (0.68339386,-0.70769871,0.17926342) - *** FresnelRefraction *** - 1 5 m 2.86 m -72.4 cm 2.17 eV 0 eV 5.8 m 5.8 m Tank Transportation - 2 10 m 7.4 m -1.87 m 2.17 eV 0 eV 6.85 m 12.7 m OutOfWorld Transportation + 0 631 um 0 fm 0 fm 2.8 eV 0 eV 0 fm 0 fm Tank initStep + +** Photon absorbed! ** + 1 2.17 m -1.29 m 21.3 cm 2.8 eV 0 eV 2.53 m 2.53 m Tank OpAbsorption ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 26, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 403 um 0 fm 0 fm 2.21 eV 0 eV 0 fm 0 fm Tank initStep + 0 432 um 0 fm 0 fm 2.03 eV 0 eV 0 fm 0 fm Tank initStep ** Photon absorbed! ** - 1 1.75 m -1.03 m -13.7 cm 2.21 eV 0 eV 2.03 m 2.03 m Tank OpAbsorption + 1 4.03 m 1.87 m -1.45 m 2.03 eV 0 eV 4.67 m 4.67 m Tank OpAbsorption ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 25, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 594 um 0 fm 0 fm 2.3 eV 0 eV 0 fm 0 fm Tank initStep + 0 65.1 um 0 fm 0 fm 3.6 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! - Old Momentum Direction: (0.8603348,0.15836832,-0.48450336) - Old Polarization: (-0.50972937,0.26729826,-0.81775767) - New Momentum Direction: (0.72699497,0.21333372,-0.6526615) - New Polarization: (0.68664278,-0.22587078,0.6910167) + Old Momentum Direction: (0.85323787,-0.50655797,0.12403288) + Old Polarization: (-0.52152194,-0.82875602,0.20292445) + New Momentum Direction: (0.70583968,-0.68804639,0.16847109) + New Polarization: (0.70837161,0.68558711,-0.16786893) *** FresnelRefraction *** - 1 5 m 92 cm -2.82 m 2.3 eV 0 eV 5.81 m 5.81 m Tank Transportation - 2 10 m 2.39 m -7.3 m 2.3 eV 0 eV 6.88 m 12.7 m OutOfWorld Transportation + 1 5 m -2.97 m 72.7 cm 3.6 eV 0 eV 5.86 m 5.86 m Tank Transportation + 2 10 m -7.84 m 1.92 m 3.6 eV 0 eV 7.08 m 12.9 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 24, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 552 um 0 fm 0 fm 2.8 eV 0 eV 0 fm 0 fm Tank initStep - Photon at Boundary! - Old Momentum Direction: (0.85672622,-0.50882352,0.084373071) - Old Polarization: (-0.51577145,-0.8451853,0.14014855) - New Momentum Direction: (0.7163819,-0.68830957,0.11413543) - New Polarization: (0.69770837,0.70673156,-0.11719017) - *** FresnelRefraction *** - 1 5 m -2.97 m 49.2 cm 2.8 eV 0 eV 5.84 m 5.84 m Tank Transportation - 2 10 m -7.77 m 1.29 m 2.8 eV 0 eV 6.98 m 12.8 m OutOfWorld Transportation + 0 671 um 0 fm 0 fm 4.07 eV 0 eV 0 fm 0 fm Tank initStep + +** Photon absorbed! ** + 1 1.97 m -63.9 cm -1.03 m 4.07 eV 0 eV 2.31 m 2.31 m Tank OpAbsorption ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 23, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 378 um 0 fm 0 fm 2.03 eV 0 eV 0 fm 0 fm Tank initStep - -Warning: G4MaterialPropertyVector::GetProperty -==> attempt to Retrieve Property below range - -Warning: G4MaterialPropertyVector::GetProperty -==> attempt to Retrieve Property below range - -Warning: G4MaterialPropertyVector::GetProperty -==> attempt to Retrieve Property below range + 0 56.7 um 0 fm 0 fm 3.94 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! - Old Momentum Direction: (0.86261875,0.39995153,-0.30972192) - Old Polarization: (-0.50585462,0.68202538,-0.52815953) - New Momentum Direction: (0.73356526,0.53733752,-0.41611344) - New Polarization: (0.67961901,-0.57998986,0.44914336) + Old Momentum Direction: (0.85231549,0.50714935,0.12789775) + Old Polarization: (-0.52302801,0.82643996,0.20841949) + New Momentum Direction: (0.7030038,0.68959513,0.17390866) + New Polarization: (0.7111861,-0.68166124,-0.17190782) *** FresnelRefraction *** - 1 5 m 2.32 m -1.8 m 2.03 eV 0 eV 5.8 m 5.8 m Tank Transportation - 2 10 m 5.98 m -4.63 m 2.03 eV 0 eV 6.82 m 12.6 m OutOfWorld Transportation + 1 5 m 2.98 m 75 cm 3.94 eV 0 eV 5.87 m 5.87 m Tank Transportation + 2 10 m 7.88 m 1.99 m 3.94 eV 0 eV 7.11 m 13 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 22, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 56.9 um 0 fm 0 fm 3.6 eV 0 eV 0 fm 0 fm Tank initStep + 0 195 um 0 fm 0 fm 3.97 eV 0 eV 0 fm 0 fm Tank initStep ** Photon absorbed! ** - 1 3.16 m -1.88 m 46 cm 3.6 eV 0 eV 3.71 m 3.71 m Tank OpAbsorption + 1 1.12 m -26.9 cm -63.4 cm 3.97 eV 0 eV 1.32 m 1.32 m Tank OpAbsorption ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 21, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 587 um 0 fm 0 fm 4.07 eV 0 eV 0 fm 0 fm Tank initStep - -** Photon absorbed! ** - 1 1.54 m -50 cm -80.6 cm 4.07 eV 0 eV 1.81 m 1.81 m Tank OpAbsorption + 0 325 um 0 fm 0 fm 4.12 eV 0 eV 0 fm 0 fm Tank initStep + Photon at Boundary! + Old Momentum Direction: (0.85169957,0.45236164,-0.26453125) + Old Polarization: (-0.52403038,0.73521734,-0.4299391) + New Momentum Direction: (0.70109859,0.61554248,-0.35995586) + New Polarization: (0.71306435,-0.60521321,0.35391552) + *** FresnelRefraction *** + 1 5 m 2.66 m -1.55 m 4.12 eV 0 eV 5.87 m 5.87 m Tank Transportation + 2 10 m 7.05 m -4.12 m 4.12 eV 0 eV 7.13 m 13 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 20, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 49.6 um 0 fm 0 fm 3.94 eV 0 eV 0 fm 0 fm Tank initStep + 0 625 um 0 fm 0 fm 3.49 eV 0 eV 0 fm 0 fm Tank initStep ** Photon absorbed! ** - 1 68.8 cm 41 cm 10.3 cm 3.94 eV 0 eV 80.8 cm 80.8 cm Tank OpAbsorption + 1 3.12 m -1.85 m 46.2 cm 3.49 eV 0 eV 3.66 m 3.66 m Tank OpAbsorption ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 19, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 171 um 0 fm 0 fm 3.97 eV 0 eV 0 fm 0 fm Tank initStep - Photon at Boundary! - Old Momentum Direction: (0.852227,-0.20435118,-0.4816116) - Old Polarization: (-0.52317218,-0.33288007,-0.78452644) - New Momentum Direction: (0.70273065,-0.27789488,-0.65493822) - New Polarization: (0.711456,0.27448675,0.64690601) - *** FresnelRefraction *** - 1 5 m -1.2 m -2.83 m 3.97 eV 0 eV 5.87 m 5.87 m Tank Transportation - 2 10 m -3.18 m -7.49 m 3.97 eV 0 eV 7.12 m 13 m OutOfWorld Transportation + 0 535 um 0 fm 0 fm 3.75 eV 0 eV 0 fm 0 fm Tank initStep + +** Photon absorbed! ** + 1 4.34 m -2.54 m 78.2 cm 3.75 eV 0 eV 5.09 m 5.09 m Tank OpAbsorption ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 18, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 285 um 0 fm 0 fm 4.12 eV 0 eV 0 fm 0 fm Tank initStep - -** Photon absorbed! ** - 1 39.8 cm 21.1 cm -12.4 cm 4.12 eV 0 eV 46.7 cm 46.7 cm Tank OpAbsorption - -********************************************************************************************************* -* G4Track Information: Particle = opticalphoton, Track ID = 17, Parent ID = 1 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 546 um 0 fm 0 fm 3.49 eV 0 eV 0 fm 0 fm Tank initStep - -** Photon absorbed! ** - 1 1.23 m -72.6 cm 18.2 cm 3.49 eV 0 eV 1.44 m 1.44 m Tank OpAbsorption - -********************************************************************************************************* -* G4Track Information: Particle = opticalphoton, Track ID = 16, Parent ID = 1 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 468 um 0 fm 0 fm 3.75 eV 0 eV 0 fm 0 fm Tank initStep - -** Photon absorbed! ** - 1 1.39 m -81.2 cm 25 cm 3.75 eV 0 eV 1.63 m 1.63 m Tank OpAbsorption - -********************************************************************************************************* -* G4Track Information: Particle = opticalphoton, Track ID = 15, Parent ID = 1 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 455 um 0 fm 0 fm 2.4 eV 0 eV 0 fm 0 fm Tank initStep + 0 520 um 0 fm 0 fm 2.4 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! Old Momentum Direction: (0.85964915,0.49094728,0.14132979) Old Polarization: (-0.51088486,0.82610084,0.23781099) @@ -898,31 +882,41 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng 2 10 m 7.42 m 2.14 m 2.4 eV 0 eV 6.9 m 12.7 m OutOfWorld Transportation ********************************************************************************************************* -* G4Track Information: Particle = opticalphoton, Track ID = 14, Parent ID = 1 +* G4Track Information: Particle = opticalphoton, Track ID = 17, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 189 um 0 fm 0 fm 3.16 eV 0 eV 0 fm 0 fm Tank initStep - -** Photon absorbed! ** - 1 4.29 m 1.42 m 2.18 m 3.16 eV 0 eV 5.02 m 5.02 m Tank OpAbsorption + 0 216 um 0 fm 0 fm 3.16 eV 0 eV 0 fm 0 fm Tank initStep + Photon at Boundary! + Old Momentum Direction: (0.85506263,0.2825014,0.4348113) + Old Polarization: (-0.51852474,0.46585316,0.71701668) + New Momentum Direction: (0.71138989,0.38289648,0.58933412) + New Polarization: (0.70279757,-0.38757773,-0.59653925) + *** FresnelRefraction *** + 1 5 m 1.65 m 2.54 m 3.16 eV 0 eV 5.85 m 5.85 m Tank Transportation + 2 10 m 4.34 m 6.68 m 3.16 eV 0 eV 7.03 m 12.9 m OutOfWorld Transportation ********************************************************************************************************* -* G4Track Information: Particle = opticalphoton, Track ID = 13, Parent ID = 1 +* G4Track Information: Particle = opticalphoton, Track ID = 16, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 558 um 0 fm 0 fm 3.76 eV 0 eV 0 fm 0 fm Tank initStep - -** Photon absorbed! ** - 1 4.3 m 2.08 m -1.62 m 3.76 eV 0 eV 5.05 m 5.05 m Tank OpAbsorption + 0 638 um 0 fm 0 fm 3.76 eV 0 eV 0 fm 0 fm Tank initStep + Photon at Boundary! + Old Momentum Direction: (0.85278639,0.41130284,-0.32184678) + Old Polarization: (-0.52225988,0.67160714,-0.52553636) + New Momentum Direction: (0.70445415,0.55895924,-0.43738875) + New Polarization: (0.7097495,-0.55478892,0.43412545) + *** FresnelRefraction *** + 1 5 m 2.41 m -1.89 m 3.76 eV 0 eV 5.86 m 5.86 m Tank Transportation + 2 10 m 6.38 m -4.99 m 3.76 eV 0 eV 7.1 m 13 m OutOfWorld Transportation ********************************************************************************************************* -* G4Track Information: Particle = opticalphoton, Track ID = 12, Parent ID = 1 +* G4Track Information: Particle = opticalphoton, Track ID = 15, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 683 um 0 fm 0 fm 2.48 eV 0 eV 0 fm 0 fm Tank initStep + 0 781 um 0 fm 0 fm 2.48 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! Old Momentum Direction: (0.85894039,0.44810215,-0.24784243) Old Polarization: (-0.51207559,0.75163325,-0.41572353) @@ -933,11 +927,11 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng 2 10 m 6.79 m -3.76 m 2.48 eV 0 eV 6.92 m 12.7 m OutOfWorld Transportation ********************************************************************************************************* -* G4Track Information: Particle = opticalphoton, Track ID = 11, Parent ID = 1 +* G4Track Information: Particle = opticalphoton, Track ID = 14, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 106 um 0 fm 0 fm 3.72 eV 0 eV 0 fm 0 fm Tank initStep + 0 121 um 0 fm 0 fm 3.72 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! Old Momentum Direction: (0.85289719,-0.30751821,-0.4218992) Old Polarization: (-0.5220789,-0.50237888,-0.68923804) @@ -948,11 +942,11 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng 2 10 m -4.77 m -6.54 m 3.72 eV 0 eV 7.09 m 13 m OutOfWorld Transportation ********************************************************************************************************* -* G4Track Information: Particle = opticalphoton, Track ID = 10, Parent ID = 1 +* G4Track Information: Particle = opticalphoton, Track ID = 13, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 236 um 0 fm 0 fm 2.25 eV 0 eV 0 fm 0 fm Tank initStep + 0 269 um 0 fm 0 fm 2.25 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! Old Momentum Direction: (0.86072262,0.2988851,-0.41209739) Old Polarization: (-0.50907422,0.50534314,-0.69675803) @@ -963,26 +957,21 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng 2 10 m 4.5 m -6.2 m 2.25 eV 0 eV 6.87 m 12.7 m OutOfWorld Transportation ********************************************************************************************************* -* G4Track Information: Particle = opticalphoton, Track ID = 9, Parent ID = 1 +* G4Track Information: Particle = opticalphoton, Track ID = 12, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 111 um 0 fm 0 fm 2.16 eV 0 eV 0 fm 0 fm Tank initStep - Photon at Boundary! - Old Momentum Direction: (0.8615111,-0.051191657,0.50515149) - Old Polarization: (-0.50773873,-0.08685999,0.85712118) - New Momentum Direction: (0.73039278,-0.068864754,0.67954693) - New Polarization: (0.68302737,0.07364027,-0.72667099) - *** FresnelRefraction *** - 1 5 m -29.7 cm 2.93 m 2.16 eV 0 eV 5.8 m 5.8 m Tank Transportation - 2 10 m -76.9 cm 7.58 m 2.16 eV 0 eV 6.85 m 12.6 m OutOfWorld Transportation + 0 127 um 0 fm 0 fm 2.16 eV 0 eV 0 fm 0 fm Tank initStep + +** Photon absorbed! ** + 1 2.75 m -16.4 cm 1.61 m 2.16 eV 0 eV 3.19 m 3.19 m Tank OpAbsorption ********************************************************************************************************* -* G4Track Information: Particle = opticalphoton, Track ID = 8, Parent ID = 1 +* G4Track Information: Particle = opticalphoton, Track ID = 11, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 755 um 0 fm 0 fm 2.69 eV 0 eV 0 fm 0 fm Tank initStep + 0 863 um 0 fm 0 fm 2.69 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! Old Momentum Direction: (0.8574164,0.16457695,0.48759773) Old Polarization: (-0.51462328,0.27420247,0.812389) @@ -993,26 +982,21 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng 2 10 m 2.51 m 7.43 m 2.69 eV 0 eV 6.96 m 12.8 m OutOfWorld Transportation ********************************************************************************************************* -* G4Track Information: Particle = opticalphoton, Track ID = 7, Parent ID = 1 +* G4Track Information: Particle = opticalphoton, Track ID = 10, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 522 um 0 fm 0 fm 2.2 eV 0 eV 0 fm 0 fm Tank initStep - Photon at Boundary! - Old Momentum Direction: (0.86112833,0.26833694,-0.43180236) - Old Polarization: (-0.50838764,0.45452037,-0.73140498) - New Momentum Direction: (0.7292904,0.3611364,-0.58113339) - New Polarization: (0.68420429,-0.38493373,0.61942757) - *** FresnelRefraction *** - 1 5 m 1.56 m -2.51 m 2.2 eV 0 eV 5.81 m 5.81 m Tank Transportation - 2 10 m 4.03 m -6.49 m 2.2 eV 0 eV 6.86 m 12.7 m OutOfWorld Transportation + 0 597 um 0 fm 0 fm 2.2 eV 0 eV 0 fm 0 fm Tank initStep + +** Photon absorbed! ** + 1 3.87 m 1.2 m -1.94 m 2.2 eV 0 eV 4.49 m 4.49 m Tank OpAbsorption ********************************************************************************************************* -* G4Track Information: Particle = opticalphoton, Track ID = 6, Parent ID = 1 +* G4Track Information: Particle = opticalphoton, Track ID = 9, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 227 um 0 fm 0 fm 2.74 eV 0 eV 0 fm 0 fm Tank initStep + 0 259 um 0 fm 0 fm 2.74 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! Old Momentum Direction: (0.85714229,-0.33130843,-0.3943879) Old Polarization: (-0.51507969,-0.55132919,-0.6562995) @@ -1023,11 +1007,11 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng 2 10 m -5.05 m -6.02 m 2.74 eV 0 eV 6.97 m 12.8 m OutOfWorld Transportation ********************************************************************************************************* -* G4Track Information: Particle = opticalphoton, Track ID = 5, Parent ID = 1 +* G4Track Information: Particle = opticalphoton, Track ID = 8, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 727 um 0 fm 0 fm 3.12 eV 0 eV 0 fm 0 fm Tank initStep + 0 831 um 0 fm 0 fm 3.12 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! Old Momentum Direction: (0.85523123,0.44391052,-0.26743782) Old Polarization: (-0.5182466,0.73255887,-0.44133656) @@ -1037,78 +1021,189 @@ Step# X Y Z KineE dEStep StepLeng TrakLeng 1 5 m 2.59 m -1.56 m 3.12 eV 0 eV 5.85 m 5.85 m Tank Transportation 2 10 m 6.82 m -4.11 m 3.12 eV 0 eV 7.02 m 12.9 m OutOfWorld Transportation +********************************************************************************************************* +* G4Track Information: Particle = opticalphoton, Track ID = 7, Parent ID = 1 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 691 um 0 fm 0 fm 3.03 eV 0 eV 0 fm 0 fm Tank initStep + +** Photon absorbed! ** + 1 95.2 cm -37.9 cm -43.4 cm 3.03 eV 0 eV 1.11 m 1.11 m Tank OpAbsorption + +********************************************************************************************************* +* G4Track Information: Particle = opticalphoton, Track ID = 6, Parent ID = 1 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 918 um 0 fm 0 fm 4.09 eV 0 eV 0 fm 0 fm Tank initStep + Photon at Boundary! + Old Momentum Direction: (0.85184268,0.5235039,0.0175418) + Old Polarization: (-0.52379772,0.85136485,0.028527909) + New Momentum Direction: (0.70154208,0.71222829,0.02386566) + New Polarization: (0.71262803,-0.70114856,-0.023494396) + *** FresnelRefraction *** + 1 5 m 3.07 m 10.3 cm 4.09 eV 0 eV 5.87 m 5.87 m Tank Transportation + 2 10 m 8.15 m 27.3 cm 4.09 eV 0 eV 7.13 m 13 m OutOfWorld Transportation + +********************************************************************************************************* +* G4Track Information: Particle = opticalphoton, Track ID = 5, Parent ID = 1 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 691 um 0 fm 0 fm 3.84 eV 0 eV 0 fm 0 fm Tank initStep + Photon at Boundary! + Old Momentum Direction: (0.85256339,0.24150677,0.46347616) + Old Polarization: (-0.52262383,0.39397328,0.75607498) + New Momentum Direction: (0.70376798,0.32829277,0.63002737) + New Polarization: (0.71042989,-0.32521427,-0.62411942) + *** FresnelRefraction *** + 1 5 m 1.42 m 2.72 m 3.84 eV 0 eV 5.86 m 5.86 m Tank Transportation + 2 10 m 3.75 m 7.19 m 3.84 eV 0 eV 7.1 m 13 m OutOfWorld Transportation + ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 4, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 605 um 0 fm 0 fm 3.03 eV 0 eV 0 fm 0 fm Tank initStep + 0 843 um 0 fm 0 fm 3.9 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! - Old Momentum Direction: (0.85559889,-0.34060141,-0.38979638) - Old Polarization: (-0.51763939,-0.56297529,-0.64428897) - New Momentum Direction: (0.71300609,-0.46135467,-0.52799071) - New Polarization: (0.70115784,0.46915069,0.53691276) + Old Momentum Direction: (0.85241053,0.077581535,-0.51708547) + Old Polarization: (-0.5228731,0.1264768,-0.84297529) + New Momentum Direction: (0.70329696,0.10547955,-0.70302735) + New Polarization: (0.71089619,-0.10435201,0.69551223) *** FresnelRefraction *** - 1 5 m -1.99 m -2.28 m 3.03 eV 0 eV 5.84 m 5.84 m Tank Transportation - 2 10 m -5.23 m -5.98 m 3.03 eV 0 eV 7.01 m 12.9 m OutOfWorld Transportation + 1 5 m 45.5 cm -3.03 m 3.9 eV 0 eV 5.86 m 5.86 m Tank Transportation + 2 10 m 1.2 m -8.03 m 3.9 eV 0 eV 7.11 m 13 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 3, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 760 um 0 fm 0 fm 2.92 eV 0 eV 0 fm 0 fm Tank initStep + 0 628 um 0 fm 0 fm 3.16 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! - Old Momentum Direction: (0.85606959,-0.076741873,-0.51113162) - Old Polarization: (-0.51686057,-0.12710659,-0.84658081) - New Momentum Direction: (0.71441919,-0.10389198,-0.6919622) - New Polarization: (0.69971796,0.10607477,0.70650047) + Old Momentum Direction: (0.85507637,-0.50273565,-0.1268908) + Old Polarization: (-0.51850208,-0.8290755,-0.20925919) + New Momentum Direction: (0.71143139,-0.68138641,-0.17198236) + New Polarization: (0.70275556,0.68979843,0.17410556) *** FresnelRefraction *** - 1 5 m -44.8 cm -2.98 m 2.92 eV 0 eV 5.84 m 5.84 m Tank Transportation - 2 10 m -1.18 m -7.83 m 2.92 eV 0 eV 7 m 12.8 m OutOfWorld Transportation + 1 5 m -2.94 m -74.2 cm 3.16 eV 0 eV 5.85 m 5.85 m Tank Transportation + 2 10 m -7.73 m -1.95 m 3.16 eV 0 eV 7.03 m 12.9 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 2, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 528 um 0 fm 0 fm 2.08 eV 0 eV 0 fm 0 fm Tank initStep + 0 670 um 0 fm 0 fm 2.98 eV 0 eV 0 fm 0 fm Tank initStep Photon at Boundary! - Old Momentum Direction: (0.86215706,-0.38968858,-0.32377154) - Old Polarization: (-0.50664109,-0.66313761,-0.5509658) - New Momentum Direction: (0.73224608,-0.52382953,-0.43522213) - New Polarization: (0.68104014,0.56321514,0.46794554) + Old Momentum Direction: (0.85583959,-0.0091349129,-0.51716066) + Old Polarization: (-0.51724133,-0.01511484,-0.85570611) + New Momentum Direction: (0.71372934,-0.012370029,-0.70031237) + New Polarization: (0.70042161,0.012605055,0.71361802) *** FresnelRefraction *** - 1 5 m -2.26 m -1.88 m 2.08 eV 0 eV 5.8 m 5.8 m Tank Transportation - 2 10 m -5.84 m -4.85 m 2.08 eV 0 eV 6.83 m 12.6 m OutOfWorld Transportation + 1 5 m -5.34 cm -3.02 m 2.98 eV 0 eV 5.84 m 5.84 m Tank Transportation + 2 10 m -14 cm -7.93 m 2.98 eV 0 eV 7.01 m 12.8 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = e+, Track ID = 1, Parent ID = 0 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 1 834 um 0 fm 0 fm 0 eV 0 eV 0 fm 1.49 mm Tank initStep - 2 834 um 0 fm 0 fm 0 eV 0 eV 0 fm 1.49 mm Tank Scintillation + 1 953 um 690 um 369 um 43 keV 0 eV 0 fm 1.49 mm Tank initStep + + Exiting from G4Scintillation::DoIt -- NumberOfSecondaries = 4 + 2 962 um 693 um 382 um 0 eV 43 keV 30.8 um 1.52 mm Tank eIoni + 3 962 um 693 um 382 um 0 eV 0 eV 0 fm 1.52 mm Tank Scintillation ********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 65, Parent ID = 1 +* G4Track Information: Particle = gamma, Track ID = 69, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 834 um 0 fm 0 fm 511 keV 0 eV 0 fm 0 fm Tank initStep - 1 1.98 m 10.1 cm 5 m 511 keV 0 eV 5.38 m 5.38 m Tank Transportation - 2 3.96 m 20.3 cm 10 m 511 keV 0 eV 5.38 m 10.8 m OutOfWorld Transportation + 0 962 um 693 um 382 um 511 keV 0 eV 0 fm 0 fm Tank initStep + 1 -5 m 4.88 m -4.28 m 511 keV 0 eV 8.19 m 8.19 m Tank Transportation + 2 -10 m 9.76 m -8.55 m 511 keV 0 eV 8.19 m 16.4 m OutOfWorld Transportation ********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 64, Parent ID = 1 +* G4Track Information: Particle = gamma, Track ID = 68, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 834 um 0 fm 0 fm 511 keV 0 eV 0 fm 0 fm Tank initStep - 1 -1.98 m -10.1 cm -5 m 511 keV 0 eV 5.38 m 5.38 m Tank Transportation - 2 -3.96 m -20.3 cm -10 m 511 keV 0 eV 5.38 m 10.8 m OutOfWorld Transportation -Number of optical photons produces in this event : 62 -number of event = 1 User=0.12s Real=0.41s Sys=0.19s + 0 962 um 693 um 382 um 511 keV 0 eV 0 fm 0 fm Tank initStep + 1 5 m -4.88 m 4.27 m 511 keV 0 eV 8.19 m 8.19 m Tank Transportation + 2 10 m -9.76 m 8.55 m 511 keV 0 eV 8.19 m 16.4 m OutOfWorld Transportation + +********************************************************************************************************* +* G4Track Information: Particle = opticalphoton, Track ID = 67, Parent ID = 1 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 959 um 692 um 377 um 2.24 eV 0 eV 0 fm 0 fm Tank initStep + Photon at Boundary! + Old Momentum Direction: (0.83018016,0.036163763,0.55632102) + Old Polarization: (-0.54579392,-0.15065622,0.82426434) + New Momentum Direction: (0.66077606,0.048689046,0.74900225) + New Polarization: (0.73582146,-0.23895479,-0.63361455) + *** FresnelRefraction *** + 1 5 m 21.8 cm 3.35 m 2.24 eV 0 eV 6.02 m 6.02 m Tank Transportation + 2 10 m 58.7 cm 9.02 m 2.24 eV 0 eV 7.57 m 13.6 m OutOfWorld Transportation + +********************************************************************************************************* +* G4Track Information: Particle = opticalphoton, Track ID = 66, Parent ID = 1 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 954 um 690 um 370 um 2.79 eV 0 eV 0 fm 0 fm Tank initStep + Photon at Boundary! + Old Momentum Direction: (-0.41599532,-0.1230935,0.90099716) + Old Polarization: (0.26078471,0.93303211,0.24787582) + New Momentum Direction: (-0.56270897,-0.16650625,0.80971247) + New Polarization: (0.21677779,0.91550379,0.33891031) + *** FresnelRefraction *** + 1 -2.31 m -68.2 cm 5 m 2.79 eV 0 eV 5.55 m 5.55 m Tank Transportation + 2 -5.78 m -1.71 m 10 m 2.79 eV 0 eV 6.18 m 11.7 m OutOfWorld Transportation + +********************************************************************************************************* +* G4Track Information: Particle = opticalphoton, Track ID = 65, Parent ID = 1 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 957 um 691 um 375 um 3.11 eV 0 eV 0 fm 0 fm Tank initStep + Photon at Boundary! + Old Momentum Direction: (-0.3963132,-0.60773963,0.68817759) + Old Polarization: (-0.19930186,-0.67473377,-0.71064274) + New Momentum Direction: (0.3963132,0.60773963,-0.68817759) + New Polarization: (0.19930186,0.67473377,0.71064274) + *** BackScattering *** + 1 -2.88 m -4.41 m 5 m 3.11 eV 0 eV 7.27 m 7.27 m Tank Transportation + 2 -2.88 m -4.41 m 5 m 3.11 eV 0 eV 0 fm 7.27 m World Transportation + Photon at Boundary! + Old Momentum Direction: (0.3963132,0.60773963,-0.68817759) + Old Polarization: (0.19930186,0.67473377,0.71064274) + New Momentum Direction: (0.53702154,0.8235135,-0.18284798) + New Polarization: (-0.24099572,-0.057949556,-0.96879457) + *** FresnelRefraction *** + 3 2.88 m 4.42 m -5 m 3.11 eV 0 eV 14.5 m 21.8 m Tank Transportation + 4 6.52 m 10 m -6.24 m 3.11 eV 0 eV 6.78 m 28.6 m OutOfWorld Transportation + +********************************************************************************************************* +* G4Track Information: Particle = opticalphoton, Track ID = 64, Parent ID = 1 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 958 um 691 um 376 um 2.77 eV 0 eV 0 fm 0 fm Tank initStep + Photon at Boundary! + Old Momentum Direction: (-0.65242199,-0.74392016,-0.14466631) + Old Polarization: (0.72255438,-0.55301218,-0.41484058) + New Momentum Direction: (-0.88232194,-0.42805552,-0.19564372) + New Polarization: (0.46909541,-0.76611303,-0.43934077) + *** FresnelRefraction *** + 1 -4.38 m -5 m -97.2 cm 2.77 eV 0 eV 6.72 m 6.72 m Tank Transportation + 2 -10 m -7.72 m -2.22 m 2.77 eV 0 eV 6.36 m 13.1 m OutOfWorld Transportation +Number of optical photons produces in this event : 66 +number of event = 1 User=0.11s Real=0.19s Sys=0.05s # /process/inactivate Scintillation /run/physicsModified @@ -1144,7 +1239,7 @@ eBrem: tables are built for e+ Total cross sections from a parametrisation based on the EEDL data library. Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -1229,334 +1324,336 @@ hIoni: tables are built for pi- Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process 0 0 fm 0 fm 0 fm 500 keV 0 eV 0 fm 0 fm Tank initStep - 1 1.02 mm 71.7 um -779 um 159 keV 341 keV 1.49 mm 1.49 mm Tank eIoni + 1 953 um -450 um 640 um 195 keV 305 keV 1.49 mm 1.49 mm Tank eIoni + +********************************************************************************************************* +* G4Track Information: Particle = opticalphoton, Track ID = 35, Parent ID = 1 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 257 um 0 fm 0 fm 2.19 eV 0 eV 0 fm 0 fm Tank initStep + 1 5 m -2.91 m -47.1 cm 2.19 eV 0 eV 5.81 m 5.81 m Tank Transportation + 2 10 m -7.54 m -1.22 m 2.19 eV 0 eV 6.85 m 12.7 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 34, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 183 um 0 fm 0 fm 3.16 eV 0 eV 0 fm 0 fm Tank initStep - 1 5 m 2.04 m -2.24 m 3.16 eV 0 eV 5.85 m 5.85 m Tank Transportation - 2 10 m 5.37 m -5.89 m 3.16 eV 0 eV 7.03 m 12.9 m OutOfWorld Transportation + 0 555 um 0 fm 0 fm 2.08 eV 0 eV 0 fm 0 fm Tank initStep + 1 33.4 cm 14.2 cm 13.5 cm 2.08 eV 0 eV 38.6 cm 38.6 cm Tank OpAbsorption ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 33, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 935 um 0 fm 0 fm 2.27 eV 0 eV 0 fm 0 fm Tank initStep - 1 1.87 m 57 cm -94.6 cm 2.27 eV 0 eV 2.17 m 2.17 m Tank OpAbsorption + 0 713 um 0 fm 0 fm 3.98 eV 0 eV 0 fm 0 fm Tank initStep + 1 5 m -1.25 m 2.8 m 3.98 eV 0 eV 5.87 m 5.87 m Tank Transportation + 2 10 m -3.3 m 7.43 m 3.98 eV 0 eV 7.12 m 13 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 32, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 648 um 0 fm 0 fm 4.09 eV 0 eV 0 fm 0 fm Tank initStep - 1 5.27 cm -3.87 mm -3.18 cm 4.09 eV 0 eV 6.11 cm 6.11 cm Tank OpRayleigh - 2 5 m 2.5 m -4.02 m 4.09 eV 0 eV 6.83 m 6.89 m Tank Transportation - 3 7.6 m 6.24 m -10 m 4.09 eV 0 eV 7.52 m 14.4 m OutOfWorld Transportation + 0 519 um 0 fm 0 fm 3.45 eV 0 eV 0 fm 0 fm Tank initStep + 1 2.26 m 1.2 m 67.9 cm 3.45 eV 0 eV 2.65 m 2.65 m Tank OpAbsorption ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 31, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 463 um 0 fm 0 fm 3.03 eV 0 eV 0 fm 0 fm Tank initStep - 1 5 m -71 cm 2.94 m 3.03 eV 0 eV 5.84 m 5.84 m Tank Transportation - 2 10 m -1.86 m 7.72 m 3.03 eV 0 eV 7.01 m 12.9 m OutOfWorld Transportation + 0 492 um 0 fm 0 fm 2.39 eV 0 eV 0 fm 0 fm Tank initStep + 1 5 m 2.96 m -21.6 cm 2.39 eV 0 eV 5.82 m 5.82 m Tank Transportation + 2 10 m 7.7 m -56 cm 2.39 eV 0 eV 6.89 m 12.7 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 30, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 77.5 um 0 fm 0 fm 2.06 eV 0 eV 0 fm 0 fm Tank initStep - 1 1.21 m 22 cm -67.4 cm 2.06 eV 0 eV 1.4 m 1.4 m Tank OpAbsorption + 0 404 um 0 fm 0 fm 2.24 eV 0 eV 0 fm 0 fm Tank initStep + 1 5 m -2.92 m 43.8 cm 2.24 eV 0 eV 5.81 m 5.81 m Tank Transportation + 2 10 m -7.57 m 1.13 m 2.24 eV 0 eV 6.86 m 12.7 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 29, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 171 um 0 fm 0 fm 3.87 eV 0 eV 0 fm 0 fm Tank initStep - 1 73.3 cm -44.2 cm 8.34 cm 3.87 eV 0 eV 86 cm 86 cm Tank OpRayleigh - 2 30 cm -20.3 cm 3.55 m 3.87 eV 0 eV 3.5 m 4.36 m Tank OpAbsorption + 0 314 um 0 fm 0 fm 2.64 eV 0 eV 0 fm 0 fm Tank initStep + 1 5 m 2.54 m -1.58 m 2.64 eV 0 eV 5.83 m 5.83 m Tank Transportation + 2 10 m 6.64 m -4.13 m 2.64 eV 0 eV 6.95 m 12.8 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 28, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 680 um 0 fm 0 fm 2.04 eV 0 eV 0 fm 0 fm Tank initStep - -Warning: G4MaterialPropertyVector::GetProperty -==> attempt to Retrieve Property below range - -Warning: G4MaterialPropertyVector::GetProperty -==> attempt to Retrieve Property below range - -Warning: G4MaterialPropertyVector::GetProperty -==> attempt to Retrieve Property below range - 1 5 m 2.93 m -15.7 cm 2.04 eV 0 eV 5.8 m 5.8 m Tank Transportation - 2 10 m 7.55 m -40.5 cm 2.04 eV 0 eV 6.82 m 12.6 m OutOfWorld Transportation + 0 186 um 0 fm 0 fm 2.96 eV 0 eV 0 fm 0 fm Tank initStep + 1 5 m 2.83 m -1.07 m 2.96 eV 0 eV 5.84 m 5.84 m Tank Transportation + 2 10 m 7.41 m -2.8 m 2.96 eV 0 eV 7 m 12.8 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 27, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 687 um 0 fm 0 fm 2.89 eV 0 eV 0 fm 0 fm Tank initStep - 1 5 m -2.51 m 1.68 m 2.89 eV 0 eV 5.84 m 5.84 m Tank Transportation - 2 10 m -6.57 m 4.4 m 2.89 eV 0 eV 6.99 m 12.8 m OutOfWorld Transportation + 0 749 um 0 fm 0 fm 2.77 eV 0 eV 0 fm 0 fm Tank initStep + 1 5 m 44.4 cm 2.97 m 2.77 eV 0 eV 5.83 m 5.83 m Tank Transportation + 2 10 m 1.16 m 7.78 m 2.77 eV 0 eV 6.97 m 12.8 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 26, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 980 um 0 fm 0 fm 2.21 eV 0 eV 0 fm 0 fm Tank initStep - 1 5 m -1.7 m -2.42 m 2.21 eV 0 eV 5.81 m 5.81 m Tank Transportation - 2 10 m -4.4 m -6.26 m 2.21 eV 0 eV 6.86 m 12.7 m OutOfWorld Transportation + 0 96.9 um 0 fm 0 fm 2.57 eV 0 eV 0 fm 0 fm Tank initStep + 1 5 m 2.8 m 1.05 m 2.57 eV 0 eV 5.83 m 5.83 m Tank Transportation + 2 10 m 7.3 m 2.73 m 2.57 eV 0 eV 6.94 m 12.8 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 25, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 63.6 um 0 fm 0 fm 2.81 eV 0 eV 0 fm 0 fm Tank initStep - 1 5 m -1.24 m 2.75 m 2.81 eV 0 eV 5.84 m 5.84 m Tank Transportation - 2 10 m -3.24 m 7.19 m 2.81 eV 0 eV 6.98 m 12.8 m OutOfWorld Transportation + 0 45.3 um 0 fm 0 fm 3.29 eV 0 eV 0 fm 0 fm Tank initStep + 1 5 m 2.95 m -73.3 cm 3.29 eV 0 eV 5.85 m 5.85 m Tank Transportation + 2 10 m 7.77 m -1.93 m 3.29 eV 0 eV 7.04 m 12.9 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 24, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 220 um 0 fm 0 fm 2.15 eV 0 eV 0 fm 0 fm Tank initStep - 1 5 m 80.2 cm -2.83 m 2.15 eV 0 eV 5.8 m 5.8 m Tank Transportation - 2 10 m 2.08 m -7.33 m 2.15 eV 0 eV 6.84 m 12.6 m OutOfWorld Transportation + 0 133 um 0 fm 0 fm 2.61 eV 0 eV 0 fm 0 fm Tank initStep + 1 5 m 2.38 m -1.81 m 2.61 eV 0 eV 5.83 m 5.83 m Tank Transportation + 2 10 m 6.21 m -4.73 m 2.61 eV 0 eV 6.94 m 12.8 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 23, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 632 um 0 fm 0 fm 3.34 eV 0 eV 0 fm 0 fm Tank initStep - 1 5 m -1.42 m 2.69 m 3.34 eV 0 eV 5.85 m 5.85 m Tank Transportation - 2 10 m -3.74 m 7.09 m 3.34 eV 0 eV 7.05 m 12.9 m OutOfWorld Transportation + 0 180 um 0 fm 0 fm 3.49 eV 0 eV 0 fm 0 fm Tank initStep + 1 5 m -2.32 m -1.98 m 3.49 eV 0 eV 5.86 m 5.86 m Tank Transportation + 2 10 m -6.11 m -5.23 m 3.49 eV 0 eV 7.07 m 12.9 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 22, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 798 um 0 fm 0 fm 2.28 eV 0 eV 0 fm 0 fm Tank initStep - 1 4.15 m 79.1 cm -2.33 m 2.28 eV 0 eV 4.83 m 4.83 m Tank OpAbsorption + 0 915 um 0 fm 0 fm 4.08 eV 0 eV 0 fm 0 fm Tank initStep + 1 5 m -2.92 m -95.5 cm 4.08 eV 0 eV 5.87 m 5.87 m Tank Transportation + 2 10 m -7.75 m -2.53 m 4.08 eV 0 eV 7.13 m 13 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 21, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 49.5 um 0 fm 0 fm 2.6 eV 0 eV 0 fm 0 fm Tank initStep - 1 5 m 2.24 m -1.98 m 2.6 eV 0 eV 5.83 m 5.83 m Tank Transportation - 2 10 m 5.86 m -5.16 m 2.6 eV 0 eV 6.94 m 12.8 m OutOfWorld Transportation + 0 672 um 0 fm 0 fm 3.52 eV 0 eV 0 fm 0 fm Tank initStep + 1 5 m -1.65 m 2.57 m 3.52 eV 0 eV 5.86 m 5.86 m Tank Transportation + 2 10 m -4.35 m 6.78 m 3.52 eV 0 eV 7.07 m 12.9 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 20, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 384 um 0 fm 0 fm 3.98 eV 0 eV 0 fm 0 fm Tank initStep - 1 1.16 m 65.3 cm -28 cm 3.98 eV 0 eV 1.36 m 1.36 m Tank OpAbsorption + 0 665 um 0 fm 0 fm 2.97 eV 0 eV 0 fm 0 fm Tank initStep + 1 5 m 2.78 m 1.19 m 2.97 eV 0 eV 5.84 m 5.84 m Tank Transportation + 2 10 m 7.29 m 3.11 m 2.97 eV 0 eV 7.01 m 12.8 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 19, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 754 um 0 fm 0 fm 3.18 eV 0 eV 0 fm 0 fm Tank initStep - 1 5 m -2.87 m 98.6 cm 3.18 eV 0 eV 5.85 m 5.85 m Tank Transportation - 2 10 m -7.54 m 2.59 m 3.18 eV 0 eV 7.03 m 12.9 m OutOfWorld Transportation + 0 8.37 um 0 fm 0 fm 2.19 eV 0 eV 0 fm 0 fm Tank initStep + 1 5 m 2.33 m -1.81 m 2.19 eV 0 eV 5.81 m 5.81 m Tank Transportation + 2 10 m 6.03 m -4.68 m 2.19 eV 0 eV 6.85 m 12.7 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 18, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 949 um 0 fm 0 fm 3.99 eV 0 eV 0 fm 0 fm Tank initStep - 1 1.39 m -67.9 cm -52.1 cm 3.99 eV 0 eV 1.64 m 1.64 m Tank OpAbsorption + 0 355 um 0 fm 0 fm 2.97 eV 0 eV 0 fm 0 fm Tank initStep + 1 5 m -2.64 m 1.47 m 2.97 eV 0 eV 5.84 m 5.84 m Tank Transportation + 2 10 m -6.93 m 3.85 m 2.97 eV 0 eV 7 m 12.8 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 17, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 861 um 0 fm 0 fm 3.97 eV 0 eV 0 fm 0 fm Tank initStep - 1 5 m -6.14 mm -3.07 m 3.97 eV 0 eV 5.87 m 5.87 m Tank Transportation - 2 10 m -1.63 cm -8.13 m 3.97 eV 0 eV 7.11 m 13 m OutOfWorld Transportation + 0 761 um 0 fm 0 fm 4.06 eV 0 eV 0 fm 0 fm Tank initStep + 1 5 m 2.17 m 2.17 m 4.06 eV 0 eV 5.87 m 5.87 m Tank Transportation + 2 10 m 5.76 m 5.76 m 4.06 eV 0 eV 7.12 m 13 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 16, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 8.92 um 0 fm 0 fm 3.79 eV 0 eV 0 fm 0 fm Tank initStep - 1 5 m -2.04 m 2.28 m 3.79 eV 0 eV 5.86 m 5.86 m Tank Transportation - 2 10 m -5.4 m 6.04 m 3.79 eV 0 eV 7.1 m 13 m OutOfWorld Transportation + 0 31.2 um 0 fm 0 fm 4.13 eV 0 eV 0 fm 0 fm Tank initStep + 1 64.2 cm -2.2 cm -39.5 cm 4.13 eV 0 eV 75.4 cm 75.4 cm Tank OpRayleigh + 2 34 cm 5 m 4.93 m 4.13 eV 0 eV 7.32 m 8.08 m Tank Transportation + 3 5.09 cm 5.71 m 10 m 4.13 eV 0 eV 5.13 m 13.2 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 15, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 498 um 0 fm 0 fm 4.12 eV 0 eV 0 fm 0 fm Tank initStep - 1 4.86 m -2.82 m -98.6 cm 4.12 eV 0 eV 5.7 m 5.7 m Tank OpAbsorption + 0 842 um 0 fm 0 fm 3.81 eV 0 eV 0 fm 0 fm Tank initStep + 1 2.86 m -1.27 m -1.21 m 3.81 eV 0 eV 3.35 m 3.35 m Tank OpRayleigh + 2 5 m -16.2 cm -1.17 m 3.81 eV 0 eV 2.41 m 5.76 m Tank Transportation + 3 10 m 3.82 m -1.04 m 3.81 eV 0 eV 6.39 m 12.2 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 14, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 258 um 0 fm 0 fm 2.41 eV 0 eV 0 fm 0 fm Tank initStep - 1 5 m 2.91 m 62.3 cm 2.41 eV 0 eV 5.82 m 5.82 m Tank Transportation - 2 10 m 7.55 m 1.62 m 2.41 eV 0 eV 6.9 m 12.7 m OutOfWorld Transportation + 0 827 um 0 fm 0 fm 2.33 eV 0 eV 0 fm 0 fm Tank initStep + 1 2.01 m 43.7 cm -1.11 m 2.33 eV 0 eV 2.33 m 2.33 m Tank OpAbsorption ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 13, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 889 um 0 fm 0 fm 3.81 eV 0 eV 0 fm 0 fm Tank initStep - 1 1.75 m 3.82 cm -1.07 m 3.81 eV 0 eV 2.05 m 2.05 m Tank OpAbsorption + 0 232 um 0 fm 0 fm 2.9 eV 0 eV 0 fm 0 fm Tank initStep + 1 5 m -2.37 m 1.86 m 2.9 eV 0 eV 5.84 m 5.84 m Tank Transportation + 2 10 m -6.22 m 4.89 m 2.9 eV 0 eV 7 m 12.8 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 12, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 993 um 0 fm 0 fm 2.33 eV 0 eV 0 fm 0 fm Tank initStep - 1 2.54 m 1.32 m -73.4 cm 2.33 eV 0 eV 2.95 m 2.95 m Tank OpAbsorption + 0 160 um 0 fm 0 fm 3.81 eV 0 eV 0 fm 0 fm Tank initStep + 1 5 m 33.9 cm 3.05 m 3.81 eV 0 eV 5.86 m 5.86 m Tank Transportation + 2 10 m 89.7 cm 8.06 m 3.81 eV 0 eV 7.1 m 13 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 11, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 532 um 0 fm 0 fm 3.93 eV 0 eV 0 fm 0 fm Tank initStep - 1 5 m 3.07 m 4.67 cm 3.93 eV 0 eV 5.87 m 5.87 m Tank Transportation - 2 10 m 8.12 m 12.4 cm 3.93 eV 0 eV 7.11 m 13 m OutOfWorld Transportation + 0 171 um 0 fm 0 fm 3.16 eV 0 eV 0 fm 0 fm Tank initStep + 1 1.1 m 44.7 cm -49.1 cm 3.16 eV 0 eV 1.28 m 1.28 m Tank OpRayleigh + 2 2.17 m -3.98 m 5 m 3.16 eV 0 eV 7.13 m 8.41 m Tank Transportation + 3 3.63 m -10 m 8.6 m 3.16 eV 0 eV 7.17 m 15.6 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 10, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 139 um 0 fm 0 fm 3.13 eV 0 eV 0 fm 0 fm Tank initStep - 1 5 m 35.5 cm 3.01 m 3.13 eV 0 eV 5.85 m 5.85 m Tank Transportation - 2 10 m 93.2 cm 7.91 m 3.13 eV 0 eV 7.02 m 12.9 m OutOfWorld Transportation + 0 876 um 0 fm 0 fm 2.27 eV 0 eV 0 fm 0 fm Tank initStep + 1 5 m 1.53 m -2.53 m 2.27 eV 0 eV 5.81 m 5.81 m Tank Transportation + 2 10 m 3.96 m -6.57 m 2.27 eV 0 eV 6.87 m 12.7 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 9, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 703 um 0 fm 0 fm 2.85 eV 0 eV 0 fm 0 fm Tank initStep - 1 5 m -1.73 cm 3.01 m 2.85 eV 0 eV 5.84 m 5.84 m Tank Transportation - 2 10 m -4.54 cm 7.9 m 2.85 eV 0 eV 6.99 m 12.8 m OutOfWorld Transportation + 0 607 um 0 fm 0 fm 4.09 eV 0 eV 0 fm 0 fm Tank initStep + 1 1.36 m -10.1 cm -83 cm 4.09 eV 0 eV 1.6 m 1.6 m Tank OpAbsorption ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 8, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 804 um 0 fm 0 fm 2.2 eV 0 eV 0 fm 0 fm Tank initStep - 1 5 m -2.65 m 1.31 m 2.2 eV 0 eV 5.81 m 5.81 m Tank Transportation - 2 10 m -6.85 m 3.38 m 2.2 eV 0 eV 6.86 m 12.7 m OutOfWorld Transportation + 0 433 um 0 fm 0 fm 3.03 eV 0 eV 0 fm 0 fm Tank initStep + 1 8.17 cm -1.15 cm 4.78 cm 3.03 eV 0 eV 9.5 cm 9.5 cm Tank OpAbsorption ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 7, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 468 um 0 fm 0 fm 3.77 eV 0 eV 0 fm 0 fm Tank initStep - 1 5 m -2.14 m -2.19 m 3.77 eV 0 eV 5.86 m 5.86 m Tank Transportation - 2 10 m -5.66 m -5.8 m 3.77 eV 0 eV 7.1 m 13 m OutOfWorld Transportation + 0 72.6 um 0 fm 0 fm 2.06 eV 0 eV 0 fm 0 fm Tank initStep + 1 72.8 cm 13.3 cm -40.7 cm 2.06 eV 0 eV 84.5 cm 84.5 cm Tank OpAbsorption ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 6, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 52.5 um 0 fm 0 fm 2.05 eV 0 eV 0 fm 0 fm Tank initStep - 1 1.99 m -55.7 cm 1.03 m 2.05 eV 0 eV 2.31 m 2.31 m Tank OpAbsorption + 0 160 um 0 fm 0 fm 3.87 eV 0 eV 0 fm 0 fm Tank initStep + 1 4.93 m -2.97 m 56.1 cm 3.87 eV 0 eV 5.78 m 5.78 m Tank OpAbsorption ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 5, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 226 um 0 fm 0 fm 2.24 eV 0 eV 0 fm 0 fm Tank initStep - 1 5 m 1.05 m -2.76 m 2.24 eV 0 eV 5.81 m 5.81 m Tank Transportation - 2 10 m 2.72 m -7.16 m 2.24 eV 0 eV 6.86 m 12.7 m OutOfWorld Transportation + 0 637 um 0 fm 0 fm 2.04 eV 0 eV 0 fm 0 fm Tank initStep + 1 77.2 cm 45.2 cm -2.42 cm 2.04 eV 0 eV 89.5 cm 89.5 cm Tank OpAbsorption ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 4, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 665 um 0 fm 0 fm 2.79 eV 0 eV 0 fm 0 fm Tank initStep - 1 5 m -85.4 cm 2.89 m 2.79 eV 0 eV 5.84 m 5.84 m Tank Transportation - 2 10 m -2.24 m 7.55 m 2.79 eV 0 eV 6.98 m 12.8 m OutOfWorld Transportation + 0 643 um 0 fm 0 fm 2.89 eV 0 eV 0 fm 0 fm Tank initStep + 1 5 m -2.51 m 1.68 m 2.89 eV 0 eV 5.84 m 5.84 m Tank Transportation + 2 10 m -6.57 m 4.4 m 2.89 eV 0 eV 6.99 m 12.8 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 3, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 470 um 0 fm 0 fm 3.42 eV 0 eV 0 fm 0 fm Tank initStep - 1 5 m 1.3 m 2.76 m 3.42 eV 0 eV 5.85 m 5.85 m Tank Transportation - 2 10 m 3.42 m 7.27 m 3.42 eV 0 eV 7.06 m 12.9 m OutOfWorld Transportation + 0 918 um 0 fm 0 fm 2.21 eV 0 eV 0 fm 0 fm Tank initStep + 1 5 m -1.7 m -2.42 m 2.21 eV 0 eV 5.81 m 5.81 m Tank Transportation + 2 10 m -4.4 m -6.26 m 2.21 eV 0 eV 6.86 m 12.7 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = opticalphoton, Track ID = 2, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 159 um 0 fm 0 fm 3.11 eV 0 eV 0 fm 0 fm Tank initStep - 1 5 m -21.6 cm 3.02 m 3.11 eV 0 eV 5.85 m 5.85 m Tank Transportation - 2 10 m -56.7 cm 7.94 m 3.11 eV 0 eV 7.02 m 12.9 m OutOfWorld Transportation + 0 59.6 um 0 fm 0 fm 2.81 eV 0 eV 0 fm 0 fm Tank initStep + 1 5 m -1.24 m 2.75 m 2.81 eV 0 eV 5.84 m 5.84 m Tank Transportation + 2 10 m -3.24 m 7.19 m 2.81 eV 0 eV 6.98 m 12.8 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = e+, Track ID = 1, Parent ID = 0 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 1 1.02 mm 71.7 um -779 um 159 keV 0 eV 0 fm 1.49 mm Tank initStep - 2 1.03 mm 131 um -844 um 128 keV 31.4 keV 90.8 um 1.58 mm Tank msc - 3 1.02 mm 226 um -866 um 0 eV 128 keV 205 um 1.79 mm Tank eIoni - 4 1.02 mm 226 um -866 um 0 eV 0 eV 0 fm 1.79 mm Tank annihil + 1 953 um -450 um 640 um 195 keV 0 eV 0 fm 1.49 mm Tank initStep + 2 1.06 mm -652 um 649 um 0 eV 195 keV 415 um 1.91 mm Tank eIoni + 3 1.06 mm -652 um 649 um 0 eV 0 eV 0 fm 1.91 mm Tank annihil + +********************************************************************************************************* +* G4Track Information: Particle = gamma, Track ID = 37, Parent ID = 1 +********************************************************************************************************* + +Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process + 0 1.06 mm -652 um 649 um 511 keV 0 eV 0 fm 0 fm Tank initStep + 1 -1.05 m -1.23 m -5 m 511 keV 0 eV 5.25 m 5.25 m Tank Transportation + 2 -2.1 m -2.45 m -10 m 511 keV 0 eV 5.25 m 10.5 m OutOfWorld Transportation ********************************************************************************************************* * G4Track Information: Particle = gamma, Track ID = 36, Parent ID = 1 ********************************************************************************************************* Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.02 mm 226 um -866 um 511 keV 0 eV 0 fm 0 fm Tank initStep - 1 3.06 m -5 m -1.19 m 511 keV 0 eV 5.98 m 5.98 m Tank Transportation - 2 6.11 m -10 m -2.38 m 511 keV 0 eV 5.98 m 12 m OutOfWorld Transportation - -********************************************************************************************************* -* G4Track Information: Particle = gamma, Track ID = 35, Parent ID = 1 -********************************************************************************************************* - -Step# X Y Z KineE dEStep StepLeng TrakLeng Volume Process - 0 1.02 mm 226 um -866 um 511 keV 0 eV 0 fm 0 fm Tank initStep - 1 -3.05 m 5 m 1.19 m 511 keV 0 eV 5.98 m 5.98 m Tank Transportation - 2 -6.11 m 10 m 2.38 m 511 keV 0 eV 5.98 m 12 m OutOfWorld Transportation -Number of optical photons produces in this event : 33 -number of event = 1 User=0.05s Real=0.14s Sys=0.06s + 0 1.06 mm -652 um 649 um 511 keV 0 eV 0 fm 0 fm Tank initStep + 1 1.05 m 1.22 m 5 m 511 keV 0 eV 5.25 m 5.25 m Tank Transportation + 2 2.1 m 2.45 m 10 m 511 keV 0 eV 5.25 m 10.5 m OutOfWorld Transportation +Number of optical photons produces in this event : 34 +number of event = 1 User=0.06s Real=0.06s Sys=0s Graphics systems deleted. Visualization Manager deleting... diff --git a/examples/novice/N06/include/ExN06DetectorConstruction.hh b/examples/novice/N06/include/ExN06DetectorConstruction.hh index c4bd51227f..05f76b1ccd 100644 --- a/examples/novice/N06/include/ExN06DetectorConstruction.hh +++ b/examples/novice/N06/include/ExN06DetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: ExN06DetectorConstruction.hh,v 1.5 2006/06/29 17:53:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N06/include/ExN06EventAction.hh b/examples/novice/N06/include/ExN06EventAction.hh index 3181644cf2..b9e15c9cf2 100644 --- a/examples/novice/N06/include/ExN06EventAction.hh +++ b/examples/novice/N06/include/ExN06EventAction.hh @@ -25,7 +25,7 @@ // // // $Id: ExN06EventAction.hh,v 1.2 2006/06/29 17:53:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N06/include/ExN06PhysicsList.hh b/examples/novice/N06/include/ExN06PhysicsList.hh index 7c53eb1c6f..81bbf4fde6 100644 --- a/examples/novice/N06/include/ExN06PhysicsList.hh +++ b/examples/novice/N06/include/ExN06PhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: ExN06PhysicsList.hh,v 1.7 2006/06/29 17:53:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N06/include/ExN06PhysicsListMessenger.hh b/examples/novice/N06/include/ExN06PhysicsListMessenger.hh index e129ab86b2..5855fad961 100644 --- a/examples/novice/N06/include/ExN06PhysicsListMessenger.hh +++ b/examples/novice/N06/include/ExN06PhysicsListMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: ExN06PhysicsListMessenger.hh,v 1.2 2006/06/29 17:54:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/novice/N06/include/ExN06PrimaryGeneratorAction.hh b/examples/novice/N06/include/ExN06PrimaryGeneratorAction.hh index 5c6043dea0..263499dff7 100644 --- a/examples/novice/N06/include/ExN06PrimaryGeneratorAction.hh +++ b/examples/novice/N06/include/ExN06PrimaryGeneratorAction.hh @@ -25,7 +25,7 @@ // // // $Id: ExN06PrimaryGeneratorAction.hh,v 1.6 2006/06/29 17:54:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N06/include/ExN06PrimaryGeneratorMessenger.hh b/examples/novice/N06/include/ExN06PrimaryGeneratorMessenger.hh index 6f2613def6..fca2d30d95 100644 --- a/examples/novice/N06/include/ExN06PrimaryGeneratorMessenger.hh +++ b/examples/novice/N06/include/ExN06PrimaryGeneratorMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: ExN06PrimaryGeneratorMessenger.hh,v 1.2 2006/06/29 17:54:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/novice/N06/include/ExN06RunAction.hh b/examples/novice/N06/include/ExN06RunAction.hh index d1ae588540..2979b629cd 100644 --- a/examples/novice/N06/include/ExN06RunAction.hh +++ b/examples/novice/N06/include/ExN06RunAction.hh @@ -25,7 +25,7 @@ // // // $Id: ExN06RunAction.hh,v 1.9 2006/06/29 17:54:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N06/include/ExN06StackingAction.hh b/examples/novice/N06/include/ExN06StackingAction.hh index 0239852b51..1e07e09d4b 100644 --- a/examples/novice/N06/include/ExN06StackingAction.hh +++ b/examples/novice/N06/include/ExN06StackingAction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: ExN06StackingAction.hh,v 1.5 2006/06/29 17:54:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N06/include/ExN06SteppingVerbose.hh b/examples/novice/N06/include/ExN06SteppingVerbose.hh index 234b8a7d1d..39d3f388ff 100644 --- a/examples/novice/N06/include/ExN06SteppingVerbose.hh +++ b/examples/novice/N06/include/ExN06SteppingVerbose.hh @@ -25,7 +25,7 @@ // // // $Id: ExN06SteppingVerbose.hh,v 1.2 2006/06/29 17:54:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N06/src/ExN06DetectorConstruction.cc b/examples/novice/N06/src/ExN06DetectorConstruction.cc index 811ee402cb..af7c225772 100644 --- a/examples/novice/N06/src/ExN06DetectorConstruction.cc +++ b/examples/novice/N06/src/ExN06DetectorConstruction.cc @@ -25,7 +25,7 @@ // // // $Id: ExN06DetectorConstruction.cc,v 1.15 2006/06/29 17:54:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N06/src/ExN06EventAction.cc b/examples/novice/N06/src/ExN06EventAction.cc index 98ca5d44ce..16f91ef65d 100644 --- a/examples/novice/N06/src/ExN06EventAction.cc +++ b/examples/novice/N06/src/ExN06EventAction.cc @@ -25,7 +25,7 @@ // // // $Id: ExN06EventAction.cc,v 1.3 2006/06/29 17:54:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N06/src/ExN06PhysicsList.cc b/examples/novice/N06/src/ExN06PhysicsList.cc index 8b58ffb2ef..976b505623 100644 --- a/examples/novice/N06/src/ExN06PhysicsList.cc +++ b/examples/novice/N06/src/ExN06PhysicsList.cc @@ -25,7 +25,7 @@ // // // $Id: ExN06PhysicsList.cc,v 1.13 2006/06/29 17:54:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N06/src/ExN06PhysicsListMessenger.cc b/examples/novice/N06/src/ExN06PhysicsListMessenger.cc index a760ecf30f..4a8d800e9a 100644 --- a/examples/novice/N06/src/ExN06PhysicsListMessenger.cc +++ b/examples/novice/N06/src/ExN06PhysicsListMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: ExN06PhysicsListMessenger.cc,v 1.3 2006/06/29 17:54:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/novice/N06/src/ExN06PrimaryGeneratorMessenger.cc b/examples/novice/N06/src/ExN06PrimaryGeneratorMessenger.cc index d33e500056..8fd7607da8 100644 --- a/examples/novice/N06/src/ExN06PrimaryGeneratorMessenger.cc +++ b/examples/novice/N06/src/ExN06PrimaryGeneratorMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: ExN06PrimaryGeneratorMessenger.cc,v 1.3 2006/06/29 17:54:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/novice/N06/src/ExN06PrimaryGeneratoraction.cc b/examples/novice/N06/src/ExN06PrimaryGeneratoraction.cc index 0e03be71e9..e7195eae8d 100644 --- a/examples/novice/N06/src/ExN06PrimaryGeneratoraction.cc +++ b/examples/novice/N06/src/ExN06PrimaryGeneratoraction.cc @@ -25,7 +25,7 @@ // // // $Id: ExN06PrimaryGeneratorAction.cc,v 1.6 2006/06/29 17:54:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N06/src/ExN06RunAction.cc b/examples/novice/N06/src/ExN06RunAction.cc index 062271d440..3378796447 100644 --- a/examples/novice/N06/src/ExN06RunAction.cc +++ b/examples/novice/N06/src/ExN06RunAction.cc @@ -25,7 +25,7 @@ // // // $Id: ExN06RunAction.cc,v 1.10 2006/06/29 17:54:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N06/src/ExN06StackingAction.cc b/examples/novice/N06/src/ExN06StackingAction.cc index 3a4c4edd46..078464a9e2 100644 --- a/examples/novice/N06/src/ExN06StackingAction.cc +++ b/examples/novice/N06/src/ExN06StackingAction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: ExN06StackingAction.cc,v 1.5 2006/06/29 17:54:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N06/src/ExN06SteppingVerbose.cc b/examples/novice/N06/src/ExN06SteppingVerbose.cc index 04add5b269..f23979c8ee 100644 --- a/examples/novice/N06/src/ExN06SteppingVerbose.cc +++ b/examples/novice/N06/src/ExN06SteppingVerbose.cc @@ -25,7 +25,7 @@ // // // $Id: ExN06SteppingVerbose.cc,v 1.4 2006/06/29 17:54:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/examples/novice/N06/vis.mac b/examples/novice/N06/vis.mac index 89e169265d..9c2805b00f 100644 --- a/examples/novice/N06/vis.mac +++ b/examples/novice/N06/vis.mac @@ -22,10 +22,13 @@ # # for drawing the tracks # Draw trajectories at end of event, showing trajectory points as -# markers of size 2 pixels (parameter/1000). -/vis/scene/add/trajectories 2000 +# markers of size 2 pixels +/vis/scene/add/trajectories +/vis/modeling/trajectories/create/drawByCharge +/vis/modeling/trajectories/drawByCharge-0/default/setDrawStepPts true +/vis/modeling/trajectories/drawByCharge-0/default/setStepPtsSize 2 # (if too many tracks cause core dump => storeTrajectory 0) -/tracking/storeTrajectory 1 +# /vis/scene/endOfEventAction accumulate # # Refresh ready for run diff --git a/examples/novice/N07/History b/examples/novice/N07/History index ecc8c3fb86..48b3a31f7c 100644 --- a/examples/novice/N07/History +++ b/examples/novice/N07/History @@ -1,4 +1,4 @@ -$Id: History,v 1.13 2006/06/16 10:10:26 gcosmo Exp $ +$Id: History,v 1.14 2006/11/04 19:25:18 asaim Exp $ ------------------------------------------------------------------- ========================================================= @@ -15,6 +15,9 @@ track of all tags. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +November 04, 2006 M.Asai (exampleN07-V08-01-00) +- Timing measurement for each region and for e+/e- is added. + June 16, 2006 G.Cosmo (exampleN07-V08-00-00) - Use coherent allocation scheme for user-classes and initialisation in main(). diff --git a/examples/novice/N07/README b/examples/novice/N07/README index 3f0a4abd9c..545b7dfec6 100644 --- a/examples/novice/N07/README +++ b/examples/novice/N07/README @@ -1,4 +1,4 @@ -$Id: README,v 1.3 2005/11/22 22:20:55 asaim Exp $ +$Id: README,v 1.4 2006/11/04 20:08:28 asaim Exp $ ------------------------------------------------------------------- ========================================================= @@ -13,15 +13,23 @@ $Id: README,v 1.3 2005/11/22 22:20:55 asaim Exp $ The main features demonstrated in this example are : 1. Utilizing a concrete run class derived from G4Run base class for - accumulating physics quantities and hits as a run + accumulating physics quantities for a run 2. Changing calorimeter geometries without re-building a world volume - 3. Defining geometrical regions ans setting production thresholds + 3. Defining geometrical regions and setting production thresholds for each region 4. Demonstrating the use of primitive scorer and filter classes without implementing sensitive detector class + 5. Measuring the timing spent for each region, both for all particle + types and for e+/e- + + ********************************************************************* + Note: Since this example utilize its own ExN07SteppingVerbose for the + timing measurement, the user cannot get the ordinary verbosity with + /tracking/verbose. + ********************************************************************* 1- Utilizing a concrete run class derived from G4Run base class for - accumulating physics quantities and hits as a run + accumulating physics quantities for a run G4Run is a class the user can inherit and create his/her own concrete class for accumulating information useful to him/her. It has a virtual @@ -59,7 +67,7 @@ $Id: README,v 1.3 2005/11/22 22:20:55 asaim Exp $ ExN07DetectorConstruction::SetSerialGeometry(G4bool) for changing the position of placed volumes. - 3- Defining geometrical regions ans setting production thresholds + 3- Defining geometrical regions and setting production thresholds for each region Setting production thresholds (so-called production cuts) to individual @@ -105,7 +113,30 @@ $Id: README,v 1.3 2005/11/22 22:20:55 asaim Exp $ In ExN07Run::RecordEvent() method, the way of retreiving G4THitsMap from each primitive scorer via G4HCofThisEvent is demonstrated. - 5- Macro files + 5- Measuring the timing spent for each region, both for all particle + types and for e+/e- + + ExN07SteppingVerbose class has two G4SliceTimer class objects for each + detector region. One G4SliceTimer is measuring the time spent by a step + in a region for all types of particles, and another is measuring for + e+/e- only. + + ExN07SteppingVerbose::InitializeTimers() is invoked by ExN07RunAction:: + BeginOfRunAction(), and checks the number of regions appear in the + geometry and instantiates the necessary number of timers. Thus, this + ExN07SteppingVerbose class can be used for any kind of geometry the user + defines without any modification. Given G4VSteppingVerbose is not invoked + if the verbosity of G4SteppingManager is 0, this verbosity is set to 1. + + NewStep() and StepInfo() are the methods defined in G4VSteppingVerbose + base class, and they are invoked at the beginning and the end of every + step, respectively, from G4SteppingManager. Thus, these methods are + utilized in ExN07SteppingVerbose to start/resume and pause the timer. + + ExN07SteppingVerbose::Report() method is used by ExN07RunAction:: + EndOfRunAction() to get the timing measured. + + 6- Macro files exampleN07.in To be used for batch mode. The reference output file is made by this @@ -119,7 +150,7 @@ $Id: README,v 1.3 2005/11/22 22:20:55 asaim Exp $ Setting visualization parameters. This macro file will be called automatically when interactive execution starts. - 6- UI commands defined in this example + 7- UI commands defined in this example Command /N07/setAbsMat Guidance : diff --git a/examples/novice/N07/exampleN07.cc b/examples/novice/N07/exampleN07.cc index 8a3cb06f4a..c28db6040a 100644 --- a/examples/novice/N07/exampleN07.cc +++ b/examples/novice/N07/exampleN07.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: exampleN07.cc,v 1.8 2006/06/29 17:54:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: exampleN07.cc,v 1.9 2006/11/04 19:23:07 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- @@ -44,10 +44,15 @@ #include "ExN07PhysicsList.hh" #include "ExN07PrimaryGeneratorAction.hh" #include "ExN07RunAction.hh" +#include "ExN07SteppingVerbose.hh" int main(int argc,char** argv) { - // Construct the default run manager + // Construct the stepping verbose class + ExN07SteppingVerbose* verbosity = new ExN07SteppingVerbose; + G4VSteppingVerbose::SetInstance(verbosity); + + // Construct the run manager // G4RunManager * runManager = new G4RunManager; diff --git a/examples/novice/N07/exampleN07.out b/examples/novice/N07/exampleN07.out index d0961ce242..be5170f869 100644 --- a/examples/novice/N07/exampleN07.out +++ b/examples/novice/N07/exampleN07.out @@ -1,6 +1,6 @@ ************************************************************* - Geant4 version Name: global-V08-00-04 (30-June-2006) + Geant4 version Name: global-V08-01-05 (15-December-2006) Copyright : Geant4 Collaboration Reference : NIM A 506 (2003), 250-303 WWW : http://cern.ch/geant4 @@ -29,17 +29,13 @@ Registered model factories: drawByCharge drawByParticleID drawByOriginVolume - -Registered models: - None + drawByAttribute Registered filter factories: chargeFilter particleFilter originVolumeFilter - -Registered filters: - None + attributeFilter -------------------------------------------------------- Calorimeters are placed in parallel. @@ -69,7 +65,7 @@ Region -- appears in world volume /run/beamOn 10 conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.022 MeV to 100 GeV in 100 bins. @@ -79,6 +75,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model msc: Model variant of multiple scattering for e- Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -108,7 +105,7 @@ eBrem: tables are built for e+ Total cross sections from a parametrisation based on the EEDL data library. Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -243,7 +240,7 @@ Start Run processing. Run terminated. Run Summary Number of events processed : 10 - User=22.48s Real=26.86s Sys=4.17s + User=20.27s Real=21.37s Sys=1.04s ############################################################ Run Summary - Number of events : 10 ############################################################ @@ -251,56 +248,73 @@ Region : Calor-A Production thresholds : gamma 1 mm e- 1 mm e+ 1 mm Energy deposition in an event : - Absorber 4.0300657 GeV Gap 447.61873 MeV + Absorber 3.8384542 GeV Gap 446.58195 MeV Number of secondaries in an event : - gamma in Absorber 1625 in Gap 81.6 - e- in Absorber 2621.8 in Gap 245.9 - e+ in Absorber 160.3 in Gap 4.9 + gamma in Absorber 1484.8 in Gap 86.2 + e- in Absorber 2420.3 in Gap 235.7 + e+ in Absorber 141.3 in Gap 4 Minimum kinetic energy of generated secondaries : - gamma in Absorber 100.5325 keV in Gap 6.20549 keV - e- in Absorber 25.099939 eV in Gap 105.05053 eV - e+ in Absorber 6.5269601 keV in Gap 406.67263 keV + gamma in Absorber 100.54989 keV in Gap 6.1865176 keV + e- in Absorber 33.740565 eV in Gap 47.12953 eV + e+ in Absorber 3.1474981 keV in Gap 39.105383 keV Total track length of e+/e- in an event : - Absorber 1.8312215 m Gap 1.1750796 m + Absorber 1.6964143 m Gap 1.1868795 m Total number of steps of e+/e- in an event : - Absorber 6154.8 Gap 1394 + Absorber 5268.2 Gap 946.4 ############################################################ Region : Calor-B Production thresholds : gamma 1 cm e- 1 cm e+ 1 cm Energy deposition in an event : - Absorber 3.6032855 GeV Gap 394.31439 MeV + Absorber 2.7014011 GeV Gap 330.00558 MeV Number of secondaries in an event : - gamma in Absorber 905.1 in Gap 53.4 - e- in Absorber 1646.9 in Gap 145.3 - e+ in Absorber 126.8 in Gap 3.5 + gamma in Absorber 494.6 in Gap 31.3 + e- in Absorber 885.6 in Gap 83 + e+ in Absorber 68.2 in Gap 1.5 Minimum kinetic energy of generated secondaries : - gamma in Absorber 282.54695 keV in Gap 19.056183 keV - e- in Absorber 11.650835 eV in Gap 103.35805 eV - e+ in Absorber 18.441735 keV in Gap 87.244513 keV + gamma in Absorber 282.62822 keV in Gap 19.088344 keV + e- in Absorber 223.62358 eV in Gap 146.33215 eV + e+ in Absorber 5.6363129 keV in Gap 446.91555 keV Total track length of e+/e- in an event : - Absorber 1.3469283 m Gap 81.901001 cm + Absorber 73.784069 cm Gap 51.051907 cm Total number of steps of e+/e- in an event : - Absorber 3920.9 Gap 854.4 + Absorber 1995 Gap 400.3 ############################################################ Region : Calor-C Production thresholds : gamma 10 cm e- 10 cm e+ 10 cm Energy deposition in an event : - Absorber 2.5167888 GeV Gap 254.69553 MeV + Absorber 2.7189983 GeV Gap 290.8093 MeV Number of secondaries in an event : - gamma in Absorber 64.5 in Gap 5.6 - e- in Absorber 118.2 in Gap 8 - e+ in Absorber 16.8 in Gap 0.6 + gamma in Absorber 108.4 in Gap 13.7 + e- in Absorber 195.3 in Gap 17.2 + e+ in Absorber 30.6 in Gap 1 Minimum kinetic energy of generated secondaries : - gamma in Absorber 386.68725 keV in Gap 69.375584 keV - e- in Absorber 276.44315 eV in Gap 302.70928 eV - e+ in Absorber 55.775399 keV in Gap 1.401554 MeV + gamma in Absorber 299.87249 keV in Gap 56.919898 keV + e- in Absorber 1.170817 keV in Gap 347.96812 eV + e+ in Absorber 56.726087 keV in Gap 521.26691 keV Total track length of e+/e- in an event : - Absorber 18.180988 cm Gap 7.7680837 cm + Absorber 28.403601 cm Gap 19.379885 cm Total number of steps of e+/e- in an event : - Absorber 356.2 Gap 76.5 + Absorber 544.9 Gap 123.5 ############################################################ + +Region + All particles : User=0 Real=0 Sys=0 + e+ / e- : User=0 Real=0 Sys=0 + +Region + All particles : User=9.25 Real=9.87 Sys=0.6 + e+ / e- : User=6.06 Real=6.6 Sys=0.52 + +Region + All particles : User=3.55 Real=3.82 Sys=0.27 + e+ / e- : User=2.22 Real=2.45 Sys=0.24 + +Region + All particles : User=1.18 Real=1.29 Sys=0.1 + e+ / e- : User=0.69 Real=0.79 Sys=0.1 + /run/dumpCouples ========= Table of registered couples ============================== @@ -382,7 +396,7 @@ Region -- appears in world volume /run/beamOn 10 conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.0219981 MeV to 100 GeV in 100 bins. @@ -392,6 +406,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model msc: Model variant of multiple scattering for e- Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -421,7 +436,7 @@ eBrem: tables are built for e+ Total cross sections from a parametrisation based on the EEDL data library. Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -556,7 +571,7 @@ Start Run processing. Run terminated. Run Summary Number of events processed : 10 - User=25.4s Real=30.32s Sys=4.7s + User=18.41s Real=19.44s Sys=1.02s ############################################################ Run Summary - Number of events : 10 ############################################################ @@ -564,56 +579,73 @@ Region : Calor-A Production thresholds : gamma 200 um e- 200 um e+ 200 um Energy deposition in an event : - Absorber 3.7194141 GeV Gap 444.96093 MeV + Absorber 2.4047704 GeV Gap 314.04883 MeV Number of secondaries in an event : - gamma in Absorber 1793 in Gap 98 - e- in Absorber 2950.8 in Gap 342.8 - e+ in Absorber 128.6 in Gap 4.8 + gamma in Absorber 782.1 in Gap 43.7 + e- in Absorber 1355.9 in Gap 186.4 + e+ in Absorber 50.4 in Gap 2 Minimum kinetic energy of generated secondaries : - gamma in Absorber 47.184905 keV in Gap 2.8146532 keV - e- in Absorber 0.95369553 eV in Gap 18.459714 eV - e+ in Absorber 16.919094 keV in Gap 210.84443 keV + gamma in Absorber 47.204127 keV in Gap 2.8058691 keV + e- in Absorber 2.7244269 eV in Gap 22.9818 eV + e+ in Absorber 21.151548 keV in Gap 294.80954 keV Total track length of e+/e- in an event : - Absorber 1.7242182 m Gap 1.2183426 m + Absorber 77.67535 cm Gap 57.327784 cm Total number of steps of e+/e- in an event : - Absorber 6582.9 Gap 1729.9 + Absorber 2854.5 Gap 626.8 ############################################################ Region : Calor-B Production thresholds : gamma 2 mm e- 2 mm e+ 2 mm Energy deposition in an event : - Absorber 2.8955649 GeV Gap 358.22999 MeV + Absorber 2.1206417 GeV Gap 282.55165 MeV Number of secondaries in an event : - gamma in Absorber 831.1 in Gap 47.1 - e- in Absorber 1376.1 in Gap 135 - e+ in Absorber 80.8 in Gap 2.6 + gamma in Absorber 376.5 in Gap 23.1 + e- in Absorber 637.9 in Gap 70.2 + e+ in Absorber 32.8 in Gap 1.1 Minimum kinetic energy of generated secondaries : - gamma in Absorber 120.59151 keV in Gap 8.6161325 keV - e- in Absorber 13.874844 eV in Gap 9.2203819 eV - e+ in Absorber 281.42262 eV in Gap 351.36478 keV + gamma in Absorber 120.60059 keV in Gap 9.1372702 keV + e- in Absorber 86.401329 eV in Gap 60.571056 eV + e+ in Absorber 7.1749592 keV in Gap 858.26597 keV Total track length of e+/e- in an event : - Absorber 99.359071 cm Gap 72.813698 cm + Absorber 46.282422 cm Gap 36.587042 cm Total number of steps of e+/e- in an event : - Absorber 3308.2 Gap 979.7 + Absorber 1387.2 Gap 308.4 ############################################################ Region : Calor-C Production thresholds : gamma 2 cm e- 2 cm e+ 2 cm Energy deposition in an event : - Absorber 2.6401278 GeV Gap 333.85547 MeV + Absorber 3.3453316 GeV Gap 375.99704 MeV Number of secondaries in an event : - gamma in Absorber 375.4 in Gap 31.2 - e- in Absorber 713.7 in Gap 73.4 - e+ in Absorber 58 in Gap 2.5 + gamma in Absorber 677 in Gap 40.6 + e- in Absorber 1187.3 in Gap 110.9 + e+ in Absorber 103.8 in Gap 2.5 Minimum kinetic energy of generated secondaries : - gamma in Absorber 308.48864 keV in Gap 26.990609 keV - e- in Absorber 137.70874 eV in Gap 118.56305 eV - e+ in Absorber 1.9567694 keV in Gap 335.64547 keV + gamma in Absorber 287.46674 keV in Gap 27.899283 keV + e- in Absorber 71.332315 eV in Gap 163.93948 eV + e+ in Absorber 37.080121 keV in Gap 58.260605 keV Total track length of e+/e- in an event : - Absorber 63.339938 cm Gap 48.232653 cm + Absorber 1.1168628 m Gap 67.9228 cm Total number of steps of e+/e- in an event : - Absorber 1713.1 Gap 494.6 + Absorber 2709.3 Gap 513.2 ############################################################ + +Region + All particles : User=0 Real=0 Sys=0 + e+ / e- : User=0 Real=0 Sys=0 + +Region + All particles : User=5.39 Real=5.69 Sys=0.3 + e+ / e- : User=3.47 Real=3.72 Sys=0.25 + +Region + All particles : User=2.89 Real=3.09 Sys=0.19 + e+ / e- : User=1.66 Real=1.84 Sys=0.18 + +Region + All particles : User=5.22 Real=5.7 Sys=0.48 + e+ / e- : User=3.24 Real=3.63 Sys=0.37 + /run/dumpCouples ========= Table of registered couples ============================== @@ -694,7 +726,7 @@ Region -- appears in world volume /run/beamOn 10 conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.0219981 MeV to 100 GeV in 100 bins. @@ -704,6 +736,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model msc: Model variant of multiple scattering for e- Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -733,7 +766,7 @@ eBrem: tables are built for e+ Total cross sections from a parametrisation based on the EEDL data library. Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -898,7 +931,7 @@ Start Run processing. Run terminated. Run Summary Number of events processed : 10 - User=6.27s Real=7.59s Sys=1.27s + User=5.82s Real=6.05s Sys=0.22s ############################################################ Run Summary - Number of events : 10 ############################################################ @@ -906,56 +939,73 @@ Region : Calor-A Production thresholds : gamma 200 um e- 200 um e+ 200 um Energy deposition in an event : - Absorber 615.89225 MeV Gap 271.62707 MeV + Absorber 617.08743 MeV Gap 272.69443 MeV Number of secondaries in an event : - gamma in Absorber 59.5 in Gap 14.9 - e- in Absorber 357.7 in Gap 181.4 - e+ in Absorber 2.5 in Gap 0.4 + gamma in Absorber 56.8 in Gap 17.5 + e- in Absorber 357.7 in Gap 177.4 + e+ in Absorber 1.6 in Gap 0.3 Minimum kinetic energy of generated secondaries : - gamma in Absorber 3.2524461 keV in Gap 1.5317573 keV - e- in Absorber 9.2682403 eV in Gap 12.38841 eV - e+ in Absorber 147.36672 keV in Gap 860.84938 keV + gamma in Absorber 3.3237433 keV in Gap 1.5991662 keV + e- in Absorber 7.5677569 eV in Gap 44.426358 eV + e+ in Absorber 709.83974 keV in Gap 2.0602411 MeV Total track length of e+/e- in an event : - Absorber 51.413656 cm Gap 49.035412 cm + Absorber 51.656934 cm Gap 50.829306 cm Total number of steps of e+/e- in an event : - Absorber 899.2 Gap 490.5 + Absorber 771.4 Gap 435.7 ############################################################ Region : Calor-B Production thresholds : gamma 2 mm e- 2 mm e+ 2 mm Energy deposition in an event : - Absorber 724.27469 MeV Gap 318.46624 MeV + Absorber 588.06477 MeV Gap 258.33325 MeV Number of secondaries in an event : - gamma in Absorber 79.2 in Gap 19.7 - e- in Absorber 392.7 in Gap 170.6 - e+ in Absorber 4.2 in Gap 1.5 + gamma in Absorber 38.2 in Gap 11.2 + e- in Absorber 208.9 in Gap 90.6 + e+ in Absorber 1.5 in Gap 0.8 Minimum kinetic energy of generated secondaries : - gamma in Absorber 9.5878447 keV in Gap 3.970749 keV - e- in Absorber 9.2084186 eV in Gap 26.240077 eV - e+ in Absorber 37.227442 keV in Gap 682.06809 keV + gamma in Absorber 9.7055776 keV in Gap 3.9134847 keV + e- in Absorber 14.957893 eV in Gap 2.5652342 eV + e+ in Absorber 475.28653 keV in Gap 1.6926927 MeV Total track length of e+/e- in an event : - Absorber 69.531101 cm Gap 69.21788 cm + Absorber 38.000474 cm Gap 37.948451 cm Total number of steps of e+/e- in an event : - Absorber 978.3 Gap 495.7 + Absorber 448.7 Gap 247.7 ############################################################ Region : Calor-C Production thresholds : gamma 2 cm e- 2 cm e+ 2 cm Energy deposition in an event : - Absorber 562.12287 MeV Gap 247.5024 MeV + Absorber 549.48066 MeV Gap 244.81139 MeV Number of secondaries in an event : - gamma in Absorber 20.7 in Gap 6.7 - e- in Absorber 117.2 in Gap 50.7 - e+ in Absorber 1 in Gap 0.2 + gamma in Absorber 16.7 in Gap 5.5 + e- in Absorber 100.9 in Gap 42.4 + e+ in Absorber 1.4 in Gap 0.1 Minimum kinetic energy of generated secondaries : - gamma in Absorber 30.346482 keV in Gap 10.381798 keV - e- in Absorber 8.113974 eV in Gap 29.817712 eV - e+ in Absorber 587.24186 keV in Gap 27.730673 MeV + gamma in Absorber 29.162722 keV in Gap 10.353238 keV + e- in Absorber 24.563989 eV in Gap 109.69884 eV + e+ in Absorber 264.76828 keV in Gap 5.6290779 MeV Total track length of e+/e- in an event : - Absorber 21.273528 cm Gap 22.933109 cm + Absorber 18.066616 cm Gap 20.632062 cm Total number of steps of e+/e- in an event : - Absorber 270.6 Gap 117.5 + Absorber 206.8 Gap 113.2 ############################################################ + +Region + All particles : User=0.01 Real=0.01 Sys=0 + e+ / e- : User=0 Real=0 Sys=0 + +Region + All particles : User=2.01 Real=2.11 Sys=0.1 + e+ / e- : User=1.01 Real=1.07 Sys=0.06 + +Region + All particles : User=1.38 Real=1.46 Sys=0.07 + e+ / e- : User=0.69 Real=0.75 Sys=0.04 + +Region + All particles : User=0.83 Real=0.86 Sys=0.03 + e+ / e- : User=0.31 Real=0.32 Sys=0.01 + /run/dumpCouples ========= Table of registered couples ============================== @@ -1067,7 +1117,7 @@ Region -- appears in world volume /run/beamOn 10 conv: Total cross sections has a good parametrisation from 1.5 MeV to 100 GeV for all Z; - sampling secondary e+e- according to the Bethe-Heitler model + sampling secondary e+e- according Bethe-Heitler model tables are built for gamma Lambda tables from 1.0219981 MeV to 100 GeV in 100 bins. @@ -1077,6 +1127,7 @@ compt: Total cross sections has a good parametrisation from 10 KeV to (100/Z) G Lambda tables from 100 eV to 100 GeV in 90 bins. phot: Total cross sections from Sandia parametrisation. + Sampling according PhotoElectric model msc: Model variant of multiple scattering for e- Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -1106,7 +1157,7 @@ eBrem: tables are built for e+ Total cross sections from a parametrisation based on the EEDL data library. Good description from 1 KeV to 100 GeV, log scale extrapolation above 100 GeV. -annihil: Heilter model of formula of annihilation into 2 photons +annihil: Sampling according eplus2gg model tables are built for e+ Lambda tables from 100 eV to 100 TeV in 120 bins. @@ -1271,7 +1322,7 @@ Start Run processing. Run terminated. Run Summary Number of events processed : 10 - User=11.55s Real=13.91s Sys=2.25s + User=14.2s Real=14.9s Sys=0.7s ############################################################ Run Summary - Number of events : 10 ############################################################ @@ -1279,56 +1330,73 @@ Region : Calor-A Production thresholds : gamma 10 um e- 10 um e+ 10 um Energy deposition in an event : - Absorber 531.35651 MeV Gap 231.84386 MeV + Absorber 520.59218 MeV Gap 228.88808 MeV Number of secondaries in an event : - gamma in Absorber 45.5 in Gap 12.1 - e- in Absorber 898.8 in Gap 1904 - e+ in Absorber 0.7 in Gap 0.4 + gamma in Absorber 39.7 in Gap 8.9 + e- in Absorber 874.3 in Gap 1857.1 + e+ in Absorber 0.6 in Gap 0.4 Minimum kinetic energy of generated secondaries : - gamma in Absorber 1.0362237 keV in Gap 1.0508781 keV - e- in Absorber 10.92019 eV in Gap 26.723419 eV - e+ in Absorber 297.30182 keV in Gap 2.8662818 MeV + gamma in Absorber 1.0053994 keV in Gap 1.0508429 keV + e- in Absorber 27.406968 eV in Gap 100.63758 eV + e+ in Absorber 432.56627 keV in Gap 382.58113 keV Total track length of e+/e- in an event : - Absorber 33.438895 cm Gap 29.896184 cm + Absorber 30.380916 cm Gap 28.461402 cm Total number of steps of e+/e- in an event : - Absorber 1431.1 Gap 2622.1 + Absorber 1267.2 Gap 2503.8 ############################################################ Region : Calor-B Production thresholds : gamma 100 um e- 100 um e+ 100 um Energy deposition in an event : - Absorber 569.68503 MeV Gap 257.56283 MeV + Absorber 629.39306 MeV Gap 272.17226 MeV Number of secondaries in an event : - gamma in Absorber 45.3 in Gap 14.6 - e- in Absorber 359.9 in Gap 201.6 - e+ in Absorber 0.9 in Gap 0.3 + gamma in Absorber 70.8 in Gap 17 + e- in Absorber 479.1 in Gap 239.6 + e+ in Absorber 2.7 in Gap 0.3 Minimum kinetic energy of generated secondaries : - gamma in Absorber 2.3206229 keV in Gap 1.1057393 keV - e- in Absorber 1.640242 eV in Gap 55.46843 eV - e+ in Absorber 2.3450622 MeV in Gap 5.1185198 MeV + gamma in Absorber 2.3519112 keV in Gap 1.1864175 keV + e- in Absorber 1.6197728 eV in Gap 34.151089 eV + e+ in Absorber 282.77669 keV in Gap 1.2252106 MeV Total track length of e+/e- in an event : - Absorber 40.940765 cm Gap 42.653748 cm + Absorber 55.906563 cm Gap 50.581095 cm Total number of steps of e+/e- in an event : - Absorber 860.3 Gap 510.7 + Absorber 940.3 Gap 521 ############################################################ Region : Calor-C Production thresholds : gamma 1 mm e- 1 mm e+ 1 mm Energy deposition in an event : - Absorber 626.40853 MeV Gap 269.7753 MeV + Absorber 613.58757 MeV Gap 262.44784 MeV Number of secondaries in an event : - gamma in Absorber 52.2 in Gap 13.4 - e- in Absorber 265.4 in Gap 117.4 - e+ in Absorber 2.3 in Gap 0.7 + gamma in Absorber 46.5 in Gap 12.6 + e- in Absorber 257.7 in Gap 112.7 + e+ in Absorber 1.8 in Gap 0.5 Minimum kinetic energy of generated secondaries : - gamma in Absorber 6.9745377 keV in Gap 2.9702402 keV - e- in Absorber 5.6276211 eV in Gap 14.227761 eV - e+ in Absorber 659.03607 keV in Gap 1.3643115 MeV + gamma in Absorber 6.9598143 keV in Gap 2.9306652 keV + e- in Absorber 2.2401748 eV in Gap 1.2716564 eV + e+ in Absorber 934.95702 keV in Gap 1.7239285 MeV Total track length of e+/e- in an event : - Absorber 49.671222 cm Gap 46.311333 cm + Absorber 46.646914 cm Gap 42.116864 cm Total number of steps of e+/e- in an event : - Absorber 708.9 Gap 368.7 + Absorber 610.3 Gap 305.9 ############################################################ + +Region + All particles : User=0 Real=0 Sys=0 + e+ / e- : User=0 Real=0 Sys=0 + +Region + All particles : User=5.97 Real=6.42 Sys=0.42 + e+ / e- : User=3.1 Real=3.24 Sys=0.13 + +Region + All particles : User=2.59 Real=2.69 Sys=0.1 + e+ / e- : User=1.46 Real=1.53 Sys=0.07 + +Region + All particles : User=1.67 Real=1.8 Sys=0.12 + e+ / e- : User=0.88 Real=0.98 Sys=0.1 + /run/dumpCouples ========= Table of registered couples ============================== diff --git a/examples/novice/N07/include/ExN07DetectorConstruction.hh b/examples/novice/N07/include/ExN07DetectorConstruction.hh index 5b81b3be8b..d9d962bedf 100644 --- a/examples/novice/N07/include/ExN07DetectorConstruction.hh +++ b/examples/novice/N07/include/ExN07DetectorConstruction.hh @@ -25,7 +25,7 @@ // // // $Id: ExN07DetectorConstruction.hh,v 1.5 2006/06/29 17:54:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/novice/N07/include/ExN07DetectorMessenger.hh b/examples/novice/N07/include/ExN07DetectorMessenger.hh index e3537f3650..0f6b69197a 100644 --- a/examples/novice/N07/include/ExN07DetectorMessenger.hh +++ b/examples/novice/N07/include/ExN07DetectorMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: ExN07DetectorMessenger.hh,v 1.6 2006/06/29 17:54:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef ExN07DetectorMessenger_h diff --git a/examples/novice/N07/include/ExN07PhysicsList.hh b/examples/novice/N07/include/ExN07PhysicsList.hh index 9e0d47d016..39622b0df4 100644 --- a/examples/novice/N07/include/ExN07PhysicsList.hh +++ b/examples/novice/N07/include/ExN07PhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: ExN07PhysicsList.hh,v 1.3 2006/06/29 17:54:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef ExN07PhysicsList_h diff --git a/examples/novice/N07/include/ExN07PrimaryGeneratorAction.hh b/examples/novice/N07/include/ExN07PrimaryGeneratorAction.hh index 92bef511d7..d9cff19fe4 100644 --- a/examples/novice/N07/include/ExN07PrimaryGeneratorAction.hh +++ b/examples/novice/N07/include/ExN07PrimaryGeneratorAction.hh @@ -25,7 +25,7 @@ // // // $Id: ExN07PrimaryGeneratorAction.hh,v 1.3 2006/06/29 17:54:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef ExN07PrimaryGeneratorAction_h diff --git a/examples/novice/N07/include/ExN07Run.hh b/examples/novice/N07/include/ExN07Run.hh index a5734c9299..eb151b5d81 100644 --- a/examples/novice/N07/include/ExN07Run.hh +++ b/examples/novice/N07/include/ExN07Run.hh @@ -25,7 +25,7 @@ // // // $Id: ExN07Run.hh,v 1.5 2006/06/29 17:54:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef ExN07Run_h diff --git a/examples/novice/N07/include/ExN07RunAction.hh b/examples/novice/N07/include/ExN07RunAction.hh index 4a6cec77c4..1e91436fcd 100644 --- a/examples/novice/N07/include/ExN07RunAction.hh +++ b/examples/novice/N07/include/ExN07RunAction.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: ExN07RunAction.hh,v 1.3 2006/06/29 17:54:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: ExN07RunAction.hh,v 1.4 2006/11/04 19:23:07 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef ExN07RunAction_h @@ -44,7 +44,8 @@ class ExN07RunAction : public G4UserRunAction public: G4Run* GenerateRun(); - void EndOfRunAction(const G4Run*); + virtual void BeginOfRunAction(const G4Run*); + virtual void EndOfRunAction(const G4Run*); }; #endif diff --git a/examples/novice/N07/include/ExN07SteppingVerbose.hh b/examples/novice/N07/include/ExN07SteppingVerbose.hh new file mode 100644 index 0000000000..f5ea6c8b65 --- /dev/null +++ b/examples/novice/N07/include/ExN07SteppingVerbose.hh @@ -0,0 +1,81 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: ExN07SteppingVerbose.hh,v 1.1 2006/11/04 19:23:07 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// + +class ExN07SteppingVerbose; + +#ifndef ExN07SteppingVerbose_h +#define ExN07SteppingVerbose_h 1 + +#include +#include "G4VSteppingVerbose.hh" +#include "G4SliceTimer.hh" + +class G4Region; + +class ExN07SteppingVerbose : public G4VSteppingVerbose +{ + public: + + ExN07SteppingVerbose(); + ~ExN07SteppingVerbose(); + + void InitializeTimers(); + void Report(); + + virtual void NewStep(); + virtual void StepInfo(); + + // Following methods are not used + virtual void TrackBanner(); + virtual void AtRestDoItInvoked(); + virtual void AlongStepDoItAllDone(); + virtual void PostStepDoItAllDone(); + virtual void AlongStepDoItOneByOne(); + virtual void PostStepDoItOneByOne(); + virtual void TrackingStarted(); + virtual void DPSLStarted(); + virtual void DPSLUserLimit(); + virtual void DPSLPostStep(); + virtual void DPSLAlongStep(); + virtual void VerboseTrack(); + virtual void VerboseParticleChange(); + + private: + G4int FindRegion(G4Region*); + + private: + std::vector fTimers; + G4int nRegions,nTimers,regIdx; + G4bool ep; +}; + + +#endif diff --git a/examples/novice/N07/src/ExN07DetectorConstruction.cc b/examples/novice/N07/src/ExN07DetectorConstruction.cc index e0ba4c44e1..6509ea66c9 100644 --- a/examples/novice/N07/src/ExN07DetectorConstruction.cc +++ b/examples/novice/N07/src/ExN07DetectorConstruction.cc @@ -25,7 +25,7 @@ // // // $Id: ExN07DetectorConstruction.cc,v 1.7 2006/06/29 17:54:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/examples/novice/N07/src/ExN07DetectorMessenger.cc b/examples/novice/N07/src/ExN07DetectorMessenger.cc index bf9ae4a090..a9fe8951f5 100644 --- a/examples/novice/N07/src/ExN07DetectorMessenger.cc +++ b/examples/novice/N07/src/ExN07DetectorMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: ExN07DetectorMessenger.cc,v 1.6 2006/06/29 17:54:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "ExN07DetectorMessenger.hh" diff --git a/examples/novice/N07/src/ExN07PhysicsList.cc b/examples/novice/N07/src/ExN07PhysicsList.cc index ade4e70f4b..90801cd097 100644 --- a/examples/novice/N07/src/ExN07PhysicsList.cc +++ b/examples/novice/N07/src/ExN07PhysicsList.cc @@ -25,7 +25,7 @@ // // // $Id: ExN07PhysicsList.cc,v 1.6 2006/06/29 17:54:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "ExN07PhysicsList.hh" diff --git a/examples/novice/N07/src/ExN07PrimaryGeneratorAction.cc b/examples/novice/N07/src/ExN07PrimaryGeneratorAction.cc index 811cdb0d95..627ff1e1c2 100644 --- a/examples/novice/N07/src/ExN07PrimaryGeneratorAction.cc +++ b/examples/novice/N07/src/ExN07PrimaryGeneratorAction.cc @@ -25,7 +25,7 @@ // // // $Id: ExN07PrimaryGeneratorAction.cc,v 1.3 2006/06/29 17:55:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "ExN07PrimaryGeneratorAction.hh" diff --git a/examples/novice/N07/src/ExN07Run.cc b/examples/novice/N07/src/ExN07Run.cc index 0770473255..bbc0333358 100644 --- a/examples/novice/N07/src/ExN07Run.cc +++ b/examples/novice/N07/src/ExN07Run.cc @@ -25,7 +25,7 @@ // // // $Id: ExN07Run.cc,v 1.5 2006/06/29 17:55:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "ExN07Run.hh" diff --git a/examples/novice/N07/src/ExN07RunAction.cc b/examples/novice/N07/src/ExN07RunAction.cc index 1eb35a8d4a..9de2bc091d 100644 --- a/examples/novice/N07/src/ExN07RunAction.cc +++ b/examples/novice/N07/src/ExN07RunAction.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: ExN07RunAction.cc,v 1.5 2006/06/29 17:55:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: ExN07RunAction.cc,v 1.6 2006/11/04 19:23:07 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "ExN07RunAction.hh" @@ -37,6 +37,9 @@ #include "G4ios.hh" #include "G4UnitsTable.hh" +#include "G4VSteppingVerbose.hh" +#include "ExN07SteppingVerbose.hh" + ExN07RunAction::ExN07RunAction() {;} @@ -46,6 +49,12 @@ ExN07RunAction::~ExN07RunAction() G4Run* ExN07RunAction::GenerateRun() { return new ExN07Run; } +void ExN07RunAction::BeginOfRunAction(const G4Run*) +{ + ExN07SteppingVerbose* sv = (ExN07SteppingVerbose*)(G4VSteppingVerbose::GetInstance()); + sv->InitializeTimers(); +} + void ExN07RunAction::EndOfRunAction(const G4Run* aRun) { static G4String regName[3] = {"Calor-A","Calor-B","Calor-C"}; @@ -106,5 +115,7 @@ void ExN07RunAction::EndOfRunAction(const G4Run* aRun) G4cout << "############################################################" << G4endl; } + ExN07SteppingVerbose* sv = (ExN07SteppingVerbose*)(G4VSteppingVerbose::GetInstance()); + sv->Report(); } diff --git a/examples/novice/N07/src/ExN07SteppingVerbose.cc b/examples/novice/N07/src/ExN07SteppingVerbose.cc new file mode 100644 index 0000000000..a9495b1dee --- /dev/null +++ b/examples/novice/N07/src/ExN07SteppingVerbose.cc @@ -0,0 +1,150 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: ExN07SteppingVerbose.cc,v 1.1 2006/11/04 19:23:07 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// + +#include "ExN07SteppingVerbose.hh" + +#include "G4SteppingManager.hh" +#include "G4UnitsTable.hh" +#include "G4RegionStore.hh" +#include "G4Region.hh" +#include "G4Electron.hh" +#include "G4Positron.hh" +#include "G4RunManagerKernel.hh" +#include "G4TrackingManager.hh" + +ExN07SteppingVerbose::ExN07SteppingVerbose() +: nTimers(0),regIdx(-1),ep(false) +{} + +ExN07SteppingVerbose::~ExN07SteppingVerbose() +{ + for(G4int j=0;jsize(); + nTimers = 2 * nRegions; + G4int nEnt = fTimers.size(); + if(nEntClear(); } + regIdx = -1; + ep = false; + + // Set verbosity for timing + G4RunManagerKernel::GetRunManagerKernel()->GetTrackingManager()->SetVerboseLevel(0); + fManager->SetVerboseLevel(1); +} + +void ExN07SteppingVerbose::Report() +{ + for(G4int i=0;iGetName() << ">" << G4endl; + G4cout << " All particles : User=" << fTimers[i]->GetUserElapsed() + << " Real=" << fTimers[i]->GetRealElapsed() + << " Sys=" << fTimers[i]->GetSystemElapsed() << G4endl; + G4cout << " e+ / e- : User=" << fTimers[nRegions+i]->GetUserElapsed() + << " Real=" << fTimers[nRegions+i]->GetRealElapsed() + << " Sys=" << fTimers[nRegions+i]->GetSystemElapsed() << G4endl; + } + G4cout << G4endl; +} + +void ExN07SteppingVerbose::NewStep() +{ + CopyState(); + G4Region* reg = fTrack->GetStep()->GetPreStepPoint()->GetPhysicalVolume()->GetLogicalVolume()->GetRegion(); + regIdx = FindRegion(reg); + fTimers[regIdx]->Start(); + G4ParticleDefinition* pd = fTrack->GetDefinition(); + if(pd==G4Electron::ElectronDefinition() || pd==G4Positron::PositronDefinition()) ep = true; + if(ep) fTimers[nRegions+regIdx]->Start(); +} + +void ExN07SteppingVerbose::StepInfo() +{ + fTimers[regIdx]->Stop(); + if(ep) + { + fTimers[nRegions+regIdx]->Stop(); + ep = false; + } + regIdx = -1; +} + +G4int ExN07SteppingVerbose::FindRegion(G4Region* rgn) +{ + G4RegionStore* regionStore = G4RegionStore::GetInstance(); + G4int sz = regionStore->size(); + for(G4int i=0;i G4HadronElastic - -25.04.2006, V.Ivanchenko - hadr-lists-V08-00-03 -- Fix problem in destructors of G4DecayPhysics and G4ElectroNuclearBuilder -- Fix typo in LHEP PhysicsList - -24.04.2006, V.Ivanchenko - hadr-lists-V08-00-02 -- add QBBC Physics List - version of physics free of LHEP models but - using Binary, BinaryIon, Bertini, CHIPS, QGSC, FTFC - -15.02.2006, V.Ivanchenko - hadr-lists-V08-00-01 -- fix minor typo in G4EmMessenger - -19.12.2005, V.Ivanchenko - hadr-lists-V08-00-00 -- rename G4EmStandardPhysics71 ->G4EmStandardPhysics72; -- define StepFunction of e+ and e- (1.0, 1.0*mm) for G4EmStandardPhysics71 - in order to have backward compatibility with the previous release - -16.12.2005, G.Folger - hadr-lists-V07-01-08 -- Add QGSP_EMV, LHEP_EMV physics lists, both using multiple scattering 71. - -16.12.2005, G.Folger - hadr-lists-V07-01-07 -- Add QGSP_BERT_HP physics list, used for background radiation studies for LHCb - -15.12.2005, G.Folger - hadr-lists-V07-01-06 -- Change version number for Packaging, FTFP, and QGSC. - -07.12.2005, G.Cosmo - hadr-lists-V07-01-05 -- Do not allow installation of shared libraries when Geant4 granular - libraries are installed and used. Coworks with tag "config-V07-01-06". - -06.12.2005, V.Ivanchenko - hadr-lists-V07-01-04 -- Defined hIoni and msc to the same list of hadrons as in version 7.1. -- Fixed bug in EmPhysics71. - -05.12.2005, V.Ivanchenko - hadr-lists-V07-01-03 -- Add verbosity level as a parameter of Physics Lists -- Update cout - -02.12.2005, G.Folger - hadr-lists-V07-01-02 -- Completed migration of physics lists to non static particles scheme. - Package 3.0. - -02.12.2005, V.Ivanchenko - hadr-lists-V07-01-01 -- Rename Builder -> Physics for all PhysicsConstructors. -- Fixed compilation problems for non migrated lists. - -29.11.2005, G.Folger - hadr-lists-V07-01-00 -- (Partial) migration of physics lists to non static particles scheme. - A copy of the standard EM Builder is also used. - -Nov-2005, G.Folger - hadr-lists-V07-01-00 -- numerous changes to adopt lists to non static particle scheme. -- use standard EM physics builder - -17.02.2005, G.Cosmo - ghad-lists-V07-00-01 -- Added missing fix in LBE physics-list for usage of 'this' pointer for - porting on gcc-3.4.X compiler series. - -15.02.2005, G.Cosmo - ghad-lists-V07-00-00 -- Implemented porting on gcc-3.4.X compiler series: - o Added explicit 'typename' keywords to template class declarations - o Use 'this' pointer to access data-members of base class for - unqualified names in physics-lists definitions. - -13.12.2004, G.Cosmo - ghad-lists-V06-02-03 -- Imported lists from top-level directory. - -10.12.2004, G.Cosmo - ghad-lists-V06-02-02 -- Removed debug printout in G4HadronQEDBuilder.hh. - -07.12.2004, M.Kossov - ghad-lists-V06-02-01 -- Added to build missing LHEP_BERT_HP & LHEP_BIC_HP lists. -- Implemented migration to G4VParticleChange. - -14.07.2004, G.Cosmo - ghad-lists-V06-02-00 -- Corrected example GNUmakefile to remove unnecessary addition of - kernel libraries from EXTRALIBS. - -25.04.2004, G.Cosmo - ghad-lists-V06-00-00 -- Updated lists to package 2.4 (H.P.Wellisch). - Technically verified with 200 events per simulation engine - in two typical calorimeter setups (LArg Copper, and Brass - scintillator sampling calorimeters). -- Technical changes: - o Using templating to configure some of the processes, - resulting in reduced code size, and easier maintenance - (use of TMPs to be extended in releases to come). -- Physics changes: - o Multiple scattering for ions now included. - o Bertini and Binary cascade now used up to 9.9 GeV - for nucleon induced reactions in the respective physics simulation - engines. - o Binary cascade now used for pion induced reactions up to 1.3 GeV - in the respective physics simulation engines. - o QGS model now used to lower energies; 12 GeV for QGSP(_XX), and 8 GeV - for QGSC(_XX) simulation engines (for nucleon, pion and kaon induced - reactions). - o Use of alternative pion cross-sections in BertiniPiKBuilder now also - for pi+. -- Physics lists affected: - o FTFC 2.7 ==> FTFC 2.8 - o FTFP 2.7 ==> FTFP 2.8 - o LBE 5.2 ==> LBE 5.3 - o LHEP 3.6 ==> LHEP 3.7 - o LHEP_BERT 1.0 ==> LHEP_BERT 1.1 - o LHEP_BERT_HP 1.0 ==> LHEP_BERT_HP 1.1 - o LHEP_BIC 1.0 ==> LHEP_BIC 1.1 - o LHEP_BIC_HP 1.0 ==> LHEP_BIC_HP 1.1 - o LHEP_GN 2.4 ==> LHEP_GN 2.5 - o LHEP_HP 1.6 ==> LHEP_HP 1.7 - o LHEP_LEAD 1.4 ==> LHEP_LEAD 1.5 - o LHEP_LEAD_HP 1.5 ==> LHEP_LEAD_HP 1.6 - o LHEP_PRECO 2.6 ==> LHEP_PRECO 2.7 - o LHEP_PRECO_HP 2.4 ==> LHEP_PRECO_HP 2.5 - o QGSC 2.8 ==> QGSC 2.9 - o QGSC_LEAD 1.6 ==> QGSC_LEAD 1.7 - o QGSC_LEAD_HP 1.6 ==> QGSC_LEAD_HP 1.7 - o QGSP 2.7 ==> QGSP 2.8 - o QGSP_BERT 1.1 ==> QGSP_BERT 1.2 - o QGSP_BIC 1.1 ==> QGSP_BIC 1.2 - o QGSP_GN 2.5 ==> QGSP_GN 2.6 - o QGSP_HP 2.2 ==> QGSP_HP 2.3 - -05.12.2003, G.Cosmo - ghad-lists-V05-02-01 -- Changed LISTS_BASE to G4LISTS_BASE. - -04.12.2003, G.Cosmo - ghad-lists-V05-02-00 -- Corrected installation setup to point to default build area if - LISTS_BASE is not defined. - -03.12.2003, H.P.Wellisch -- Imported hadronic physics lists from development branch. -- Created. diff --git a/physics_lists/hadronic/LBE/GNUmakefile b/physics_lists/hadronic/LBE/GNUmakefile deleted file mode 100644 index 15a2bec70e..0000000000 --- a/physics_lists/hadronic/LBE/GNUmakefile +++ /dev/null @@ -1,2 +0,0 @@ -name := LBE -include ../common.gmk diff --git a/physics_lists/hadronic/LHEP/GNUmakefile b/physics_lists/hadronic/LHEP/GNUmakefile deleted file mode 100644 index 3ccede7cb0..0000000000 --- a/physics_lists/hadronic/LHEP/GNUmakefile +++ /dev/null @@ -1,2 +0,0 @@ -name := LHEP -include ../common.gmk diff --git a/physics_lists/hadronic/LHEP_BERT/GNUmakefile b/physics_lists/hadronic/LHEP_BERT/GNUmakefile deleted file mode 100644 index 3a688d83ae..0000000000 --- a/physics_lists/hadronic/LHEP_BERT/GNUmakefile +++ /dev/null @@ -1,2 +0,0 @@ -name := LHEP_BERT -include ../common.gmk diff --git a/physics_lists/hadronic/LHEP_BERT_HP/GNUmakefile b/physics_lists/hadronic/LHEP_BERT_HP/GNUmakefile deleted file mode 100644 index d33be4e418..0000000000 --- a/physics_lists/hadronic/LHEP_BERT_HP/GNUmakefile +++ /dev/null @@ -1,2 +0,0 @@ -name := LHEP_BERT_HP -include ../common.gmk diff --git a/physics_lists/hadronic/LHEP_BIC/GNUmakefile b/physics_lists/hadronic/LHEP_BIC/GNUmakefile deleted file mode 100644 index fc437bda15..0000000000 --- a/physics_lists/hadronic/LHEP_BIC/GNUmakefile +++ /dev/null @@ -1,2 +0,0 @@ -name := LHEP_BIC -include ../common.gmk diff --git a/physics_lists/hadronic/LHEP_BIC_HP/GNUmakefile b/physics_lists/hadronic/LHEP_BIC_HP/GNUmakefile deleted file mode 100644 index 5354389a81..0000000000 --- a/physics_lists/hadronic/LHEP_BIC_HP/GNUmakefile +++ /dev/null @@ -1,2 +0,0 @@ -name := LHEP_BIC_HP -include ../common.gmk diff --git a/physics_lists/hadronic/LHEP_EMV/GNUmakefile b/physics_lists/hadronic/LHEP_EMV/GNUmakefile deleted file mode 100644 index 23751ac08f..0000000000 --- a/physics_lists/hadronic/LHEP_EMV/GNUmakefile +++ /dev/null @@ -1,2 +0,0 @@ -name := LHEP_EMV -include ../common.gmk diff --git a/physics_lists/hadronic/LHEP_GN/GNUmakefile b/physics_lists/hadronic/LHEP_GN/GNUmakefile deleted file mode 100644 index 56c82921f9..0000000000 --- a/physics_lists/hadronic/LHEP_GN/GNUmakefile +++ /dev/null @@ -1,2 +0,0 @@ -name := LHEP_GN -include ../common.gmk diff --git a/physics_lists/hadronic/LHEP_HP/GNUmakefile b/physics_lists/hadronic/LHEP_HP/GNUmakefile deleted file mode 100644 index 75e9ce70e6..0000000000 --- a/physics_lists/hadronic/LHEP_HP/GNUmakefile +++ /dev/null @@ -1,2 +0,0 @@ -name := LHEP_HP -include ../common.gmk diff --git a/physics_lists/hadronic/LHEP_LEAD/GNUmakefile b/physics_lists/hadronic/LHEP_LEAD/GNUmakefile deleted file mode 100644 index 745dfed721..0000000000 --- a/physics_lists/hadronic/LHEP_LEAD/GNUmakefile +++ /dev/null @@ -1,2 +0,0 @@ -name := LHEP_LEAD -include ../common.gmk diff --git a/physics_lists/hadronic/LHEP_LEAD_HP/GNUmakefile b/physics_lists/hadronic/LHEP_LEAD_HP/GNUmakefile deleted file mode 100644 index 4b08bbd3e9..0000000000 --- a/physics_lists/hadronic/LHEP_LEAD_HP/GNUmakefile +++ /dev/null @@ -1,2 +0,0 @@ -name := LHEP_LEAD_HP -include ../common.gmk diff --git a/physics_lists/hadronic/LHEP_PRECO/GNUmakefile b/physics_lists/hadronic/LHEP_PRECO/GNUmakefile deleted file mode 100644 index 3b4db0aad9..0000000000 --- a/physics_lists/hadronic/LHEP_PRECO/GNUmakefile +++ /dev/null @@ -1,2 +0,0 @@ -name := LHEP_PRECO -include ../common.gmk diff --git a/physics_lists/hadronic/LHEP_PRECO_HP/GNUmakefile b/physics_lists/hadronic/LHEP_PRECO_HP/GNUmakefile deleted file mode 100644 index 5b525ecbd0..0000000000 --- a/physics_lists/hadronic/LHEP_PRECO_HP/GNUmakefile +++ /dev/null @@ -1,2 +0,0 @@ -name := LHEP_PRECO_HP -include ../common.gmk diff --git a/physics_lists/hadronic/Packaging/GNUmakefile b/physics_lists/hadronic/Packaging/GNUmakefile deleted file mode 100644 index d223909ab8..0000000000 --- a/physics_lists/hadronic/Packaging/GNUmakefile +++ /dev/null @@ -1,2 +0,0 @@ -name := Packaging -include ../common.gmk diff --git a/physics_lists/hadronic/QBBC/GNUmakefile b/physics_lists/hadronic/QBBC/GNUmakefile deleted file mode 100644 index b58aecf012..0000000000 --- a/physics_lists/hadronic/QBBC/GNUmakefile +++ /dev/null @@ -1,2 +0,0 @@ -name := QBBC -include ../common.gmk diff --git a/physics_lists/hadronic/QGSC/GNUmakefile b/physics_lists/hadronic/QGSC/GNUmakefile deleted file mode 100644 index 7a3f40548c..0000000000 --- a/physics_lists/hadronic/QGSC/GNUmakefile +++ /dev/null @@ -1,2 +0,0 @@ -name := QGSC -include ../common.gmk diff --git a/physics_lists/hadronic/QGSC_LEAD/GNUmakefile b/physics_lists/hadronic/QGSC_LEAD/GNUmakefile deleted file mode 100644 index dd3eea6a49..0000000000 --- a/physics_lists/hadronic/QGSC_LEAD/GNUmakefile +++ /dev/null @@ -1,2 +0,0 @@ -name := QGSC_LEAD -include ../common.gmk diff --git a/physics_lists/hadronic/QGSC_LEAD_HP/GNUmakefile b/physics_lists/hadronic/QGSC_LEAD_HP/GNUmakefile deleted file mode 100644 index 450b1d701a..0000000000 --- a/physics_lists/hadronic/QGSC_LEAD_HP/GNUmakefile +++ /dev/null @@ -1,2 +0,0 @@ -name := QGSC_LEAD_HP -include ../common.gmk diff --git a/physics_lists/hadronic/QGSP/GNUmakefile b/physics_lists/hadronic/QGSP/GNUmakefile deleted file mode 100644 index 33fc82f605..0000000000 --- a/physics_lists/hadronic/QGSP/GNUmakefile +++ /dev/null @@ -1,2 +0,0 @@ -name := QGSP -include ../common.gmk diff --git a/physics_lists/hadronic/QGSP_BERT/GNUmakefile b/physics_lists/hadronic/QGSP_BERT/GNUmakefile deleted file mode 100644 index 0befcb1721..0000000000 --- a/physics_lists/hadronic/QGSP_BERT/GNUmakefile +++ /dev/null @@ -1,2 +0,0 @@ -name := QGSP_BERT -include ../common.gmk diff --git a/physics_lists/hadronic/QGSP_BERT_HP/GNUmakefile b/physics_lists/hadronic/QGSP_BERT_HP/GNUmakefile deleted file mode 100644 index 4a99120432..0000000000 --- a/physics_lists/hadronic/QGSP_BERT_HP/GNUmakefile +++ /dev/null @@ -1,2 +0,0 @@ -name := QGSP_BERT_HP -include ../common.gmk diff --git a/physics_lists/hadronic/QGSP_BIC/GNUmakefile b/physics_lists/hadronic/QGSP_BIC/GNUmakefile deleted file mode 100644 index 99bad69c92..0000000000 --- a/physics_lists/hadronic/QGSP_BIC/GNUmakefile +++ /dev/null @@ -1,2 +0,0 @@ -name := QGSP_BIC -include ../common.gmk diff --git a/physics_lists/hadronic/QGSP_EMV/GNUmakefile b/physics_lists/hadronic/QGSP_EMV/GNUmakefile deleted file mode 100644 index 9058fac868..0000000000 --- a/physics_lists/hadronic/QGSP_EMV/GNUmakefile +++ /dev/null @@ -1,2 +0,0 @@ -name := QGSP_EMV -include ../common.gmk diff --git a/physics_lists/hadronic/QGSP_EMX/GNUmakefile b/physics_lists/hadronic/QGSP_EMX/GNUmakefile deleted file mode 100644 index 11234f923b..0000000000 --- a/physics_lists/hadronic/QGSP_EMX/GNUmakefile +++ /dev/null @@ -1,2 +0,0 @@ -name := QGSP_EMX -include ../common.gmk diff --git a/physics_lists/hadronic/QGSP_GN/GNUmakefile b/physics_lists/hadronic/QGSP_GN/GNUmakefile deleted file mode 100644 index 84894c6944..0000000000 --- a/physics_lists/hadronic/QGSP_GN/GNUmakefile +++ /dev/null @@ -1,2 +0,0 @@ -name := QGSP_GN -include ../common.gmk diff --git a/physics_lists/hadronic/QGSP_HP/GNUmakefile b/physics_lists/hadronic/QGSP_HP/GNUmakefile deleted file mode 100644 index 57e4285ad2..0000000000 --- a/physics_lists/hadronic/QGSP_HP/GNUmakefile +++ /dev/null @@ -1,2 +0,0 @@ -name := QGSP_HP -include ../common.gmk diff --git a/physics_lists/hadronic/README b/physics_lists/hadronic/README deleted file mode 100644 index 70c3cc7dfc..0000000000 --- a/physics_lists/hadronic/README +++ /dev/null @@ -1,36 +0,0 @@ -Installation instructions -------------------------- - + set the environment: - - G4INSTALL as usual to point to your geant4 installation. - * [optional] set G4LISTS_BASE, if you have your own physics lists area - installation point different from the default one. G4LISTS_BASE must - point to the 'physics_lists' directory that contains the subdirectory - 'hadronic'. - + type 'make' from physics_lists/hadronic directory - + to build your own application/example: copy the provided - GNUmakefile.user.code.example file to your application area and - uncomment the physics lists you decide to employ. - - NOTE for Linux/Unix users: - - Shared libraries of the physics-lists are NOT allowed if granular - kernel libraries of Geant4 are installed and used. In this specific - case, physics-lists must be built only with -static- libraries, - (i.e. - must have the variable G4LIB_BUILD_SHARED -unset-) ! - - NOTE for Windows users: - - If DLL libraries of the kernel libraries of Geant4 are installed, - the physics-lists must be installed using the variable G4LIB_USE_DLL - -set- (i.e. - use 'make G4LIB_USE_DLL=1' to build the physics-lists). - Similar for building any Geant4 example or application. - -Setting default cut values --------------------------- - - The default is: defaultCutValue = 0.7*mm; - - To override this value, please call the - "void SetDefaultCutValue(G4double newCutValue)" method of the Physics List. - -Verbosity Level ---------------- - - verbosity level of any Physics List can be established via its - constructor, e.g. "new QGSP(0)" means 0 verbosity level for - the Physics List. The default level is 1. diff --git a/source/GNUmakefile b/source/GNUmakefile index 7eee71ba07..724bf6491a 100644 --- a/source/GNUmakefile +++ b/source/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.79 2006/06/07 10:18:10 gcosmo Exp $ +# $Id: GNUmakefile,v 1.86 2006/12/14 10:39:45 gcosmo Exp $ # ----------------------------------------------------------------- # "gmake" makes default libraries for each subdomain. # "gmake global" makes global libraries for each subdomain. @@ -13,34 +13,55 @@ # # (The .o files(s) are made by implicit rules.) -SUBDIR1 = global intercoms graphics_reps materials -SUBDIR2 = geometry particles track digits_hits processes -SUBDIR2 += parameterisations tracking event run readout -SUBDIR3 = persistency interfaces visualization -SUBDIR4 = g3tog4 - ifndef G4INSTALL G4INSTALL = .. endif include $(G4INSTALL)/config/architecture.gmk + +SUBDIR1 = global intercoms graphics_reps materials +SUBDIR2 = geometry particles track digits_hits processes +SUBDIR2 += parameterisations tracking event run readout +SUBDIR3 = persistency interfaces visualization +ifeq ($(G4LIB_BUILD_LISTS),1) +SUBDIR3 += physics_lists +endif + +SUBDIR4 = g3tog4 + G4BINDIR := $(G4BIN)/$(G4SYSTEM) G4LIBDIR := $(G4LIB)/$(G4SYSTEM) G4TMPDIR := $(G4TMP)/$(G4SYSTEM) unique := $(shell echo $$$$) -.PHONY: all glob global kernel_global kernel libmap dll win32def includes clean_libs clean clean_lists clean_all +.PHONY: all glob global kernel_global kernel liblist libmap dll win32def includes clean_libs clean clean_lists clean_all all: banner kernel ifdef G4LIB_USE_G3TOG4 @for dir in $(SUBDIR4); do (cd $$dir && $(MAKE)); done;: endif @$(MAKE) libmap + @$(ECHO) "Libraries installation completed !" glob global: banner kernel_global ifdef G4LIB_USE_G3TOG4 @for dir in $(SUBDIR4); do (cd $$dir && $(MAKE)); done;: endif + @$(MAKE) liblist + @$(ECHO) "Libraries installation completed !" + +fpe_debug: banner kernel + @$(ECHO) Activating FPE debug build ... +ifneq (,$(findstring Linux-g++,$(G4SYSTEM))) + @rm -f $(G4TMPDIR)/G4run/G4RunManagerKernel.* + @cd $(G4INSTALL)/source/run; $(MAKE) G4FPE_DEBUG=1; + @cd $(G4INSTALL)/source; $(MAKE) libmap; + @$(ECHO) "Libraries installation completed !" +else + @$(ECHO) "Build of FPE check is only supported on Linux platforms with gcc !" + @$(ECHO) "The system you have currently selected is $(G4SYSTEM)." + @$(ECHO) "No actions taken !" +endif kernel_global: @for dir in $(SUBDIR1); do (cd $$dir && $(MAKE) global); done;: @@ -52,30 +73,29 @@ kernel: @for dir in $(SUBDIR2); do (cd $$dir && $(MAKE)); done;: @for dir in $(SUBDIR3); do (cd $$dir && $(MAKE)); done;: -libmap: $(G4LIBDIR)/liblist - @echo "libmap stage:" - @echo "Searching for GNUmakefiles and sorting ..." +libmap: liblist + @$(ECHO) "Libmap stage. Searching for GNUmakefiles and sorting ..." @find . \ -name GNUmakefile -exec $(GREP) -l '^ *name *:=' {} \; \ | sort \ > /tmp/G4_all_lib_makefiles.$(unique); - @echo "Weeding out paths and files ..." - @for i in `cat /tmp/G4_all_lib_makefiles.$(unique)`; \ + @$(ECHO) "Weeding out paths and files ..." + @for i in `$(CAT) /tmp/G4_all_lib_makefiles.$(unique)`; \ do \ - echo $$i | $(GREP) -q -e '/tests\?/' -e 'models/verification' || \ + $(ECHO) $$i | $(GREP) -q -e '/tests\?/' -e 'models/verification' || \ $(GREP) -q -e SUBDIR -e G4hepgeometry $$i || \ - echo $$i >> /tmp/G4_granlib_makefiles.$(unique); \ + $(ECHO) $$i >> /tmp/G4_granlib_makefiles.$(unique); \ done - @echo "Making libname.map starter file ..." + @$(ECHO) "Making libname.map starter file ..." @touch /tmp/G4libname.map.starter.$(unique); - @for i in `cat /tmp/G4_granlib_makefiles.$(unique)`; \ + @for i in `$(CAT) /tmp/G4_granlib_makefiles.$(unique)`; \ do \ - $(GREP) '^ *name *:=' $$i | cut -d \ -f 3 \ + $(GREP) '^ *name *:=' $$i | $(CUT) -d \ -f 3 \ >> /tmp/G4libname.map.starter.$(unique); \ - echo $$i | sed "s/^\\./source/" \ + $(ECHO) $$i | $(SED) "s/^\\./source/" \ >> /tmp/G4libname.map.starter.$(unique); \ done - @echo "Making libname.map ..." + @$(ECHO) "Making libname.map ..." @rm -f $(G4LIBDIR)/libname.map; @G4TMP=$(G4TMP); export G4TMP; \ $(G4LIBDIR)/liblist -l -d $(G4TMPDIR) \ @@ -85,41 +105,44 @@ libmap: $(G4LIBDIR)/liblist @rm -f /tmp/G4_granlib_makefiles.$(unique); @rm -f /tmp/G4libname.map.starter.$(unique); +liblist: $(G4LIBDIR)/liblist + $(G4LIBDIR)/liblist: $(G4INSTALL)/config/liblist.c - @echo "Building library management utility liblist ..." + @$(ECHO) "Building library management utility liblist ..." @if [ ! -d $(G4LIBDIR) ] ; then mkdir $(G4LIBDIR) ;fi @$(CC) $(CCFLAGS) -o $(G4LIBDIR)/liblist $(G4INSTALL)/config/liblist.c dll: banner win32def ifneq (,$(findstring WIN32-VC,$(G4SYSTEM))) - @echo "Verifying existence of global libraries for DLLs ..." + @$(ECHO) "Verifying existence of global libraries for DLLs ..." @$(MAKE) kernel_global G4LIB_BUILD_DLL=1 - @echo "Building Windows DLL libraries ..." + @$(ECHO) "Building Windows DLL libraries ..." @$(MAKE) kernel_global G4LIB_BUILD_DLL=1 G4LIB_BUILD_SHARED=1 - @echo "Clearing temporary DLL objects and temporaries ..." + @$(ECHO) "Clearing temporary DLL objects and temporaries ..." @rm -rf $(G4LIBDIR)/*.def $(G4LIBDIR)/*.exp @rm -rf $(G4TMPDIR)/* ifdef G4LIB_USE_G3TOG4 @for dir in $(SUBDIR4); do (cd $$dir && $(MAKE)); done;: @mv $(G4LIBDIR)/libG3toG4.a $(G4LIBDIR)/libG3toG4.lib endif - @echo "Done !" + @$(ECHO) "Done !" else - @echo "Sorry !" + @$(ECHO) "Sorry !" endif win32def: $(G4INSTALL)/config/win32def.c ifneq (,$(findstring WIN32-VC,$(G4SYSTEM))) - @echo "Building DLL management utility win32def ..." + @$(ECHO) "Building DLL management utility win32def ..." @if [ ! -d $(G4LIBDIR) ] ; then mkdir $(G4LIBDIR) ;fi @$(CC) $(CCFLAGS) -o $(G4LIBDIR)/win32def $(G4INSTALL)/config/win32def.c else - @echo "Build of DLLs is only supported on Windows platforms !" - @echo "The system you have currently selected is $(G4SYSTEM)." + @$(ECHO) "Build of DLLs is only supported on Windows platforms !" + @$(ECHO) "The system you have currently selected is $(G4SYSTEM)." + @$(ECHO) "No actions taken !" endif includes: - @echo Installing header files in $(G4INCLUDE) ... + @$(ECHO) Installing header files in $(G4INCLUDE) ... @for dir in $(SUBDIR1); do (cd $$dir && $(MAKE) $@); done @for dir in $(SUBDIR2); do (cd $$dir && $(MAKE) $@); done @for dir in $(SUBDIR3); do (cd $$dir && $(MAKE) $@); done @@ -128,13 +151,13 @@ ifdef G4LIB_USE_G3TOG4 endif banner: - @echo "*************************************************************" - @echo " Installation Geant4 version $$Name: geant4-08-01 $ " - @echo " Copyright (C) 1994-2006 Geant4 Collaboration " - @echo "*************************************************************" + @$(ECHO) "*************************************************************" + @$(ECHO) " Installation Geant4 version $$Name: geant4-08-02 $ " + @$(ECHO) " Copyright (C) 1994-2007 Geant4 Collaboration " + @$(ECHO) "*************************************************************" clean_libs:: - @echo Removing all libraries ... + @$(ECHO) Removing all libraries ... @for dir in $(SUBDIR1); do (cd $$dir && $(MAKE) clean_libs); done @for dir in $(SUBDIR2); do (cd $$dir && $(MAKE) clean_libs); done @for dir in $(SUBDIR3); do (cd $$dir && $(MAKE) clean_libs); done @@ -144,48 +167,27 @@ endif @rm -rf $(G4LIBDIR)/libname.map clean:: - @echo Removing current $(G4SYSTEM) installation ... + @$(ECHO) Removing current $(G4SYSTEM) installation ... @rm -rf $(G4TMPDIR) @rm -rf $(G4LIBDIR) @rm -rf $(G4BINDIR) @rm -rf $(G4INSTALL)/.config/bin/$(G4SYSTEM) - @echo Removing physics-lists installation ... -ifndef G4LISTS_BASE - @rm -rf $(G4LIB)/plists/$(G4SYSTEM) - @rm -rf $(G4TMP)/plists/$(G4SYSTEM) -else - @rm -rf $(G4LISTS_BASE)/hadronic/plists/lib/$(G4SYSTEM) - @rm -rf $(G4LISTS_BASE)/hadronic/plists/tmp/$(G4SYSTEM) -endif ifdef CFRONT @rm -rf $(G4TREP) endif -clean_lists:: - @echo Removing physics-lists installation ... -ifndef G4LISTS_BASE - @rm -rf $(G4LIB)/plists/$(G4SYSTEM) - @rm -rf $(G4TMP)/plists/$(G4SYSTEM) -else - @rm -rf $(G4LISTS_BASE)/hadronic/plists/lib/$(G4SYSTEM) - @rm -rf $(G4LISTS_BASE)/hadronic/plists/tmp/$(G4SYSTEM) -endif # Pay _extremely_ attention before executing the following target !! # clean_all:: - @echo Removing all installations ... - @echo Removing $(G4TMP) ... + @$(ECHO) Removing all installations ... + @$(ECHO) Removing $(G4TMP) ... @rm -rf $(G4TMP) - @echo Removing $(G4LIB) ... + @$(ECHO) Removing $(G4LIB) ... @rm -rf $(G4LIB) - @echo Removing $(G4BIN) ... + @$(ECHO) Removing $(G4BIN) ... @rm -rf $(G4BIN) - @echo Removing $(G4INCLUDE) ... + @$(ECHO) Removing $(G4INCLUDE) ... @rm -rf $(G4INCLUDE) -ifdef G4LISTS_BASE - @echo Removing physics-lists installation ... - @rm -rf $(G4LISTS_BASE)/hadronic/plists -endif - @echo Removing installation configurations ... + @$(ECHO) Removing installation configurations ... @rm -rf $(G4INSTALL)/.config diff --git a/source/digits_hits/History b/source/digits_hits/History index f831a42b08..dd70051cf2 100644 --- a/source/digits_hits/History +++ b/source/digits_hits/History @@ -1,4 +1,4 @@ -$Id: History,v 1.17 2006/01/02 19:46:04 asaim Exp $ +$Id: History,v 1.18 2006/11/18 18:22:24 asaim Exp $ ------------------------------------------------------------------- ========================================================= @@ -17,6 +17,9 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +Nov 17, 2006, M.Asai (digits_hits-V08-01-00) +- Tag for release 8.2 + Jan 2, 2006, M.Asai (digits_hits-V08-00-00) - Missing methods in G4VDigiCollection and G4TDigiCollection are added. diff --git a/source/digits_hits/detector/include/G4CellScoreComposer.hh b/source/digits_hits/detector/include/G4CellScoreComposer.hh index b3d361a41b..7e5f66b9c4 100644 --- a/source/digits_hits/detector/include/G4CellScoreComposer.hh +++ b/source/digits_hits/detector/include/G4CellScoreComposer.hh @@ -25,7 +25,7 @@ // // // $Id: G4CellScoreComposer.hh,v 1.2 2006/06/29 18:05:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4CellScoreComposer diff --git a/source/digits_hits/detector/include/G4CellScoreValues.hh b/source/digits_hits/detector/include/G4CellScoreValues.hh index 4023589ead..e13b57e5bf 100644 --- a/source/digits_hits/detector/include/G4CellScoreValues.hh +++ b/source/digits_hits/detector/include/G4CellScoreValues.hh @@ -25,7 +25,7 @@ // // // $Id: G4CellScoreValues.hh,v 1.2 2006/06/29 18:05:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4CellScoreValues diff --git a/source/digits_hits/detector/include/G4CellStoreScorer.hh b/source/digits_hits/detector/include/G4CellStoreScorer.hh index f1bd162a8d..09acb7c6bb 100644 --- a/source/digits_hits/detector/include/G4CellStoreScorer.hh +++ b/source/digits_hits/detector/include/G4CellStoreScorer.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4CellStoreScorer.hh,v 1.2 2006/06/29 18:05:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4CellStoreScorer diff --git a/source/digits_hits/detector/include/G4CollectionNameVector.hh b/source/digits_hits/detector/include/G4CollectionNameVector.hh index 9c9696c01d..095c7af06a 100644 --- a/source/digits_hits/detector/include/G4CollectionNameVector.hh +++ b/source/digits_hits/detector/include/G4CollectionNameVector.hh @@ -25,7 +25,7 @@ // // // $Id: G4CollectionNameVector.hh,v 1.2 2006/06/29 18:05:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4CollectionNameVector_H diff --git a/source/digits_hits/detector/include/G4HCtable.hh b/source/digits_hits/detector/include/G4HCtable.hh index 536cfca604..dda225f2aa 100644 --- a/source/digits_hits/detector/include/G4HCtable.hh +++ b/source/digits_hits/detector/include/G4HCtable.hh @@ -25,7 +25,7 @@ // // // $Id: G4HCtable.hh,v 1.3 2006/06/29 18:05:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4HCtable_H diff --git a/source/digits_hits/detector/include/G4MultiFunctionalDetector.hh b/source/digits_hits/detector/include/G4MultiFunctionalDetector.hh index ae67a3fa25..bcae0b5f5e 100644 --- a/source/digits_hits/detector/include/G4MultiFunctionalDetector.hh +++ b/source/digits_hits/detector/include/G4MultiFunctionalDetector.hh @@ -25,7 +25,7 @@ // // // $Id: G4MultiFunctionalDetector.hh,v 1.3 2006/06/29 18:05:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4MultiFunctionalDetector_h diff --git a/source/digits_hits/detector/include/G4SDManager.hh b/source/digits_hits/detector/include/G4SDManager.hh index 2c18f32b11..f2091d766e 100644 --- a/source/digits_hits/detector/include/G4SDManager.hh +++ b/source/digits_hits/detector/include/G4SDManager.hh @@ -25,7 +25,7 @@ // // // $Id: G4SDManager.hh,v 1.4 2006/06/29 18:05:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4SDManager_h diff --git a/source/digits_hits/detector/include/G4SDStructure.hh b/source/digits_hits/detector/include/G4SDStructure.hh index ca255a7a37..67b052e35f 100644 --- a/source/digits_hits/detector/include/G4SDStructure.hh +++ b/source/digits_hits/detector/include/G4SDStructure.hh @@ -25,7 +25,7 @@ // // // $Id: G4SDStructure.hh,v 1.3 2006/06/29 18:05:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4SDStructure_h diff --git a/source/digits_hits/detector/include/G4SDmessenger.hh b/source/digits_hits/detector/include/G4SDmessenger.hh index 094bf9be7b..034b17f1e9 100644 --- a/source/digits_hits/detector/include/G4SDmessenger.hh +++ b/source/digits_hits/detector/include/G4SDmessenger.hh @@ -25,7 +25,7 @@ // // // $Id: G4SDmessenger.hh,v 1.2 2006/06/29 18:05:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4SDmessenger_h diff --git a/source/digits_hits/detector/include/G4SensitiveVolumeList.hh b/source/digits_hits/detector/include/G4SensitiveVolumeList.hh index 7334e4fc5e..0e8dbf0d94 100644 --- a/source/digits_hits/detector/include/G4SensitiveVolumeList.hh +++ b/source/digits_hits/detector/include/G4SensitiveVolumeList.hh @@ -25,7 +25,7 @@ // // // $Id: G4SensitiveVolumeList.hh,v 1.2 2006/06/29 18:05:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------ // GEANT 4 class header file --- Copyright CERN 1996 diff --git a/source/digits_hits/detector/include/G4SensitiveVolumeList.icc b/source/digits_hits/detector/include/G4SensitiveVolumeList.icc index adfd039f23..cd6d13b72e 100644 --- a/source/digits_hits/detector/include/G4SensitiveVolumeList.icc +++ b/source/digits_hits/detector/include/G4SensitiveVolumeList.icc @@ -25,7 +25,7 @@ // // // $Id: G4SensitiveVolumeList.icc,v 1.2 2006/06/29 18:05:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ----------------------------------------------------------- // Inline functions of GEANT 4 class header file. diff --git a/source/digits_hits/detector/include/G4TrackLogger.hh b/source/digits_hits/detector/include/G4TrackLogger.hh index dce2370e1f..015913c4ae 100644 --- a/source/digits_hits/detector/include/G4TrackLogger.hh +++ b/source/digits_hits/detector/include/G4TrackLogger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4TrackLogger.hh,v 1.2 2006/06/29 18:05:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4TrackLogger diff --git a/source/digits_hits/detector/include/G4VPrimitiveScorer.hh b/source/digits_hits/detector/include/G4VPrimitiveScorer.hh index e2391ec15a..0a814be286 100644 --- a/source/digits_hits/detector/include/G4VPrimitiveScorer.hh +++ b/source/digits_hits/detector/include/G4VPrimitiveScorer.hh @@ -25,7 +25,7 @@ // // // $Id: G4VPrimitiveScorer.hh,v 1.2 2006/06/29 18:05:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VPrimitiveScorer_h diff --git a/source/digits_hits/detector/include/G4VReadOutGeometry.hh b/source/digits_hits/detector/include/G4VReadOutGeometry.hh index f671ec4a7c..e0b4b62fba 100644 --- a/source/digits_hits/detector/include/G4VReadOutGeometry.hh +++ b/source/digits_hits/detector/include/G4VReadOutGeometry.hh @@ -25,7 +25,7 @@ // // // $Id: G4VReadOutGeometry.hh,v 1.2 2006/06/29 18:05:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------ diff --git a/source/digits_hits/detector/include/G4VSDFilter.hh b/source/digits_hits/detector/include/G4VSDFilter.hh index 34897e36b7..1f87839eb2 100644 --- a/source/digits_hits/detector/include/G4VSDFilter.hh +++ b/source/digits_hits/detector/include/G4VSDFilter.hh @@ -25,7 +25,7 @@ // // // $Id: G4VSDFilter.hh,v 1.2 2006/06/29 18:05:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VSDFilter_h diff --git a/source/digits_hits/detector/include/G4VSensitiveDetector.hh b/source/digits_hits/detector/include/G4VSensitiveDetector.hh index fd8c70ccc0..f4b7c5fef2 100644 --- a/source/digits_hits/detector/include/G4VSensitiveDetector.hh +++ b/source/digits_hits/detector/include/G4VSensitiveDetector.hh @@ -25,7 +25,7 @@ // // // $Id: G4VSensitiveDetector.hh,v 1.4 2006/06/29 18:05:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VSensitiveDetector_h diff --git a/source/digits_hits/detector/src/G4CellScoreComposer.cc b/source/digits_hits/detector/src/G4CellScoreComposer.cc index cd13f15487..1a638dc91b 100644 --- a/source/digits_hits/detector/src/G4CellScoreComposer.cc +++ b/source/digits_hits/detector/src/G4CellScoreComposer.cc @@ -25,7 +25,7 @@ // // // $Id: G4CellScoreComposer.cc,v 1.3 2006/06/29 18:05:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/digits_hits/detector/src/G4CellStoreScorer.cc b/source/digits_hits/detector/src/G4CellStoreScorer.cc index fa8705e2dc..e8d2690d09 100644 --- a/source/digits_hits/detector/src/G4CellStoreScorer.cc +++ b/source/digits_hits/detector/src/G4CellStoreScorer.cc @@ -25,7 +25,7 @@ // // // $Id: G4CellStoreScorer.cc,v 1.2 2006/06/29 18:05:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/digits_hits/detector/src/G4HCtable.cc b/source/digits_hits/detector/src/G4HCtable.cc index d644fd9bc6..6e64964585 100644 --- a/source/digits_hits/detector/src/G4HCtable.cc +++ b/source/digits_hits/detector/src/G4HCtable.cc @@ -25,7 +25,7 @@ // // // $Id: G4HCtable.cc,v 1.4 2006/06/29 18:05:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4HCtable.hh" diff --git a/source/digits_hits/detector/src/G4MultiFunctionalDetector.cc b/source/digits_hits/detector/src/G4MultiFunctionalDetector.cc index 2a1afef86d..1920285207 100644 --- a/source/digits_hits/detector/src/G4MultiFunctionalDetector.cc +++ b/source/digits_hits/detector/src/G4MultiFunctionalDetector.cc @@ -25,7 +25,7 @@ // // // $Id: G4MultiFunctionalDetector.cc,v 1.4 2006/06/29 18:05:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4MultiFunctionalDetector #include "G4MultiFunctionalDetector.hh" diff --git a/source/digits_hits/detector/src/G4SDManager.cc b/source/digits_hits/detector/src/G4SDManager.cc index b47d1aec37..020dcb144e 100644 --- a/source/digits_hits/detector/src/G4SDManager.cc +++ b/source/digits_hits/detector/src/G4SDManager.cc @@ -25,7 +25,7 @@ // // // $Id: G4SDManager.cc,v 1.4 2006/06/29 18:05:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4SDManager.hh" diff --git a/source/digits_hits/detector/src/G4SDStructure.cc b/source/digits_hits/detector/src/G4SDStructure.cc index 60c4b2a91d..c19984fd95 100644 --- a/source/digits_hits/detector/src/G4SDStructure.cc +++ b/source/digits_hits/detector/src/G4SDStructure.cc @@ -25,7 +25,7 @@ // // // $Id: G4SDStructure.cc,v 1.3 2006/06/29 18:05:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4SDStructure diff --git a/source/digits_hits/detector/src/G4SDmessenger.cc b/source/digits_hits/detector/src/G4SDmessenger.cc index b47ecc1289..83834f0558 100644 --- a/source/digits_hits/detector/src/G4SDmessenger.cc +++ b/source/digits_hits/detector/src/G4SDmessenger.cc @@ -25,7 +25,7 @@ // // // $Id: G4SDmessenger.cc,v 1.2 2006/06/29 18:05:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // --------------------------------------------------------------------- diff --git a/source/digits_hits/detector/src/G4SensitiveVolumeList.cc b/source/digits_hits/detector/src/G4SensitiveVolumeList.cc index 48242dab07..b269772b05 100644 --- a/source/digits_hits/detector/src/G4SensitiveVolumeList.cc +++ b/source/digits_hits/detector/src/G4SensitiveVolumeList.cc @@ -25,7 +25,7 @@ // // // $Id: G4SensitiveVolumeList.cc,v 1.2 2006/06/29 18:05:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------- // GEANT 4 class implementation file diff --git a/source/digits_hits/detector/src/G4TrackLogger.cc b/source/digits_hits/detector/src/G4TrackLogger.cc index b864718c68..b5501b0f3a 100644 --- a/source/digits_hits/detector/src/G4TrackLogger.cc +++ b/source/digits_hits/detector/src/G4TrackLogger.cc @@ -25,7 +25,7 @@ // // // $Id: G4TrackLogger.cc,v 1.3 2006/06/29 18:06:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/digits_hits/detector/src/G4VPrimitiveScorer.cc b/source/digits_hits/detector/src/G4VPrimitiveScorer.cc index 321b6290dd..d8a9d8a7a7 100644 --- a/source/digits_hits/detector/src/G4VPrimitiveScorer.cc +++ b/source/digits_hits/detector/src/G4VPrimitiveScorer.cc @@ -25,7 +25,7 @@ // // // $Id: G4VPrimitiveScorer.cc,v 1.2 2006/06/29 18:06:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VPrimitiveScorer #include "G4VPrimitiveScorer.hh" diff --git a/source/digits_hits/detector/src/G4VReadOutGeometry.cc b/source/digits_hits/detector/src/G4VReadOutGeometry.cc index 5ffb8dec80..1b479ccd05 100644 --- a/source/digits_hits/detector/src/G4VReadOutGeometry.cc +++ b/source/digits_hits/detector/src/G4VReadOutGeometry.cc @@ -25,7 +25,7 @@ // // // $Id: G4VReadOutGeometry.cc,v 1.2 2006/06/29 18:06:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4VReadOutGeometry.hh" diff --git a/source/digits_hits/detector/src/G4VSDFilter.cc b/source/digits_hits/detector/src/G4VSDFilter.cc index cbd42736df..0d81ba92f1 100644 --- a/source/digits_hits/detector/src/G4VSDFilter.cc +++ b/source/digits_hits/detector/src/G4VSDFilter.cc @@ -25,7 +25,7 @@ // // // $Id: G4VSDFilter.cc,v 1.2 2006/06/29 18:06:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VSensitiveDetector #include "G4VSDFilter.hh" diff --git a/source/digits_hits/detector/src/G4VSensitiveDetector.cc b/source/digits_hits/detector/src/G4VSensitiveDetector.cc index 6cd70d1789..612e1617df 100644 --- a/source/digits_hits/detector/src/G4VSensitiveDetector.cc +++ b/source/digits_hits/detector/src/G4VSensitiveDetector.cc @@ -25,7 +25,7 @@ // // // $Id: G4VSensitiveDetector.cc,v 1.3 2006/06/29 18:06:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VSensitiveDetector #include "G4VSensitiveDetector.hh" diff --git a/source/digits_hits/digits/include/G4DCofThisEvent.hh b/source/digits_hits/digits/include/G4DCofThisEvent.hh index ff40ee1e6a..1230548645 100644 --- a/source/digits_hits/digits/include/G4DCofThisEvent.hh +++ b/source/digits_hits/digits/include/G4DCofThisEvent.hh @@ -25,7 +25,7 @@ // // // $Id: G4DCofThisEvent.hh,v 1.5 2006/06/29 18:06:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4DCofThisEvent_h diff --git a/source/digits_hits/digits/include/G4TDigiCollection.hh b/source/digits_hits/digits/include/G4TDigiCollection.hh index 380ba38d63..e7056b2403 100644 --- a/source/digits_hits/digits/include/G4TDigiCollection.hh +++ b/source/digits_hits/digits/include/G4TDigiCollection.hh @@ -25,7 +25,7 @@ // // // $Id: G4TDigiCollection.hh,v 1.6 2006/06/29 18:06:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4TDigiCollection_h diff --git a/source/digits_hits/digits/include/G4VDigi.hh b/source/digits_hits/digits/include/G4VDigi.hh index 675d1261d6..7a7e5dda33 100644 --- a/source/digits_hits/digits/include/G4VDigi.hh +++ b/source/digits_hits/digits/include/G4VDigi.hh @@ -25,7 +25,7 @@ // // // $Id: G4VDigi.hh,v 1.4 2006/06/29 18:06:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VDigi_h diff --git a/source/digits_hits/digits/include/G4VDigiCollection.hh b/source/digits_hits/digits/include/G4VDigiCollection.hh index e21110bdaf..07c8f51bb2 100644 --- a/source/digits_hits/digits/include/G4VDigiCollection.hh +++ b/source/digits_hits/digits/include/G4VDigiCollection.hh @@ -25,7 +25,7 @@ // // // $Id: G4VDigiCollection.hh,v 1.3 2006/06/29 18:06:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VDigiCollection_h diff --git a/source/digits_hits/digits/src/G4DCofThisEvent.cc b/source/digits_hits/digits/src/G4DCofThisEvent.cc index 2faac96bb5..6734497148 100644 --- a/source/digits_hits/digits/src/G4DCofThisEvent.cc +++ b/source/digits_hits/digits/src/G4DCofThisEvent.cc @@ -25,7 +25,7 @@ // // // $Id: G4DCofThisEvent.cc,v 1.4 2006/06/29 18:06:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4DCofThisEvent.hh" diff --git a/source/digits_hits/digits/src/G4TDigiCollection.cc b/source/digits_hits/digits/src/G4TDigiCollection.cc index a404b5c4f2..ff88960d2f 100644 --- a/source/digits_hits/digits/src/G4TDigiCollection.cc +++ b/source/digits_hits/digits/src/G4TDigiCollection.cc @@ -25,7 +25,7 @@ // // // $Id: G4TDigiCollection.cc,v 1.4 2006/06/29 18:06:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4TDigiCollection.hh" diff --git a/source/digits_hits/digits/src/G4VDigi.cc b/source/digits_hits/digits/src/G4VDigi.cc index 53953b6898..7f215666b4 100644 --- a/source/digits_hits/digits/src/G4VDigi.cc +++ b/source/digits_hits/digits/src/G4VDigi.cc @@ -25,7 +25,7 @@ // // // $Id: G4VDigi.cc,v 1.2 2006/06/29 18:06:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VDigi diff --git a/source/digits_hits/digits/src/G4VDigiCollection.cc b/source/digits_hits/digits/src/G4VDigiCollection.cc index c70e93c0c3..8480ae4a2c 100644 --- a/source/digits_hits/digits/src/G4VDigiCollection.cc +++ b/source/digits_hits/digits/src/G4VDigiCollection.cc @@ -25,7 +25,7 @@ // // // $Id: G4VDigiCollection.cc,v 1.2 2006/06/29 18:06:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VDigiCollection diff --git a/source/digits_hits/hits/include/G4HCofThisEvent.hh b/source/digits_hits/hits/include/G4HCofThisEvent.hh index 0b39b04c75..7106c1f7c5 100644 --- a/source/digits_hits/hits/include/G4HCofThisEvent.hh +++ b/source/digits_hits/hits/include/G4HCofThisEvent.hh @@ -25,7 +25,7 @@ // // // $Id: G4HCofThisEvent.hh,v 1.5 2006/06/29 18:06:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4HCofThisEvent_h diff --git a/source/digits_hits/hits/include/G4THitsCollection.hh b/source/digits_hits/hits/include/G4THitsCollection.hh index c33f16ffa6..abee1584bc 100644 --- a/source/digits_hits/hits/include/G4THitsCollection.hh +++ b/source/digits_hits/hits/include/G4THitsCollection.hh @@ -25,7 +25,7 @@ // // // $Id: G4THitsCollection.hh,v 1.5 2006/06/29 18:06:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4THitsCollection_h diff --git a/source/digits_hits/hits/include/G4THitsMap.hh b/source/digits_hits/hits/include/G4THitsMap.hh index 88b23e6211..1d7538c820 100644 --- a/source/digits_hits/hits/include/G4THitsMap.hh +++ b/source/digits_hits/hits/include/G4THitsMap.hh @@ -25,7 +25,7 @@ // // // $Id: G4THitsMap.hh,v 1.6 2006/06/29 18:06:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4THitsMap_h #define G4THitsMap_h 1 diff --git a/source/digits_hits/hits/include/G4VHit.hh b/source/digits_hits/hits/include/G4VHit.hh index 1cfe5e4cb3..e631be0c3d 100644 --- a/source/digits_hits/hits/include/G4VHit.hh +++ b/source/digits_hits/hits/include/G4VHit.hh @@ -25,7 +25,7 @@ // // // $Id: G4VHit.hh,v 1.3 2006/06/29 18:06:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VHit_h diff --git a/source/digits_hits/hits/include/G4VHitsCollection.hh b/source/digits_hits/hits/include/G4VHitsCollection.hh index 7bdb041847..f9d362633b 100644 --- a/source/digits_hits/hits/include/G4VHitsCollection.hh +++ b/source/digits_hits/hits/include/G4VHitsCollection.hh @@ -25,7 +25,7 @@ // // // $Id: G4VHitsCollection.hh,v 1.2 2006/06/29 18:06:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VHitsCollection_h diff --git a/source/digits_hits/hits/src/G4HCofThisEvent.cc b/source/digits_hits/hits/src/G4HCofThisEvent.cc index 4fb9117508..ffeee8c7df 100644 --- a/source/digits_hits/hits/src/G4HCofThisEvent.cc +++ b/source/digits_hits/hits/src/G4HCofThisEvent.cc @@ -25,7 +25,7 @@ // // // $Id: G4HCofThisEvent.cc,v 1.4 2006/06/29 18:06:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4HCofThisEvent.hh" diff --git a/source/digits_hits/hits/src/G4THitsCollection.cc b/source/digits_hits/hits/src/G4THitsCollection.cc index 923025f85c..61bee84fbb 100644 --- a/source/digits_hits/hits/src/G4THitsCollection.cc +++ b/source/digits_hits/hits/src/G4THitsCollection.cc @@ -25,7 +25,7 @@ // // // $Id: G4THitsCollection.cc,v 1.4 2006/06/29 18:06:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4THitsCollection.hh" diff --git a/source/digits_hits/hits/src/G4VHit.cc b/source/digits_hits/hits/src/G4VHit.cc index 9521b3b88d..c907029cf2 100644 --- a/source/digits_hits/hits/src/G4VHit.cc +++ b/source/digits_hits/hits/src/G4VHit.cc @@ -25,7 +25,7 @@ // // // $Id: G4VHit.cc,v 1.2 2006/06/29 18:06:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VHit diff --git a/source/digits_hits/hits/src/G4VHitsCollection.cc b/source/digits_hits/hits/src/G4VHitsCollection.cc index d9446b8fdc..fe3ce68f87 100644 --- a/source/digits_hits/hits/src/G4VHitsCollection.cc +++ b/source/digits_hits/hits/src/G4VHitsCollection.cc @@ -25,7 +25,7 @@ // // // $Id: G4VHitsCollection.cc,v 1.2 2006/06/29 18:06:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VHitsCollection diff --git a/source/digits_hits/utils/History b/source/digits_hits/utils/History index ce09ad8473..6a2ab24f7d 100644 --- a/source/digits_hits/utils/History +++ b/source/digits_hits/utils/History @@ -1,4 +1,4 @@ -$Id: History,v 1.2 2005/11/19 00:59:10 asaim Exp $ +$Id: History,v 1.3 2006/11/18 18:20:40 asaim Exp $ ------------------------------------------------------------------- ========================================================= @@ -17,9 +17,12 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- -November 18, 2007 M.Asai (detutils-V07-01-01) +November 17, 2006 M.Asai (detutils-V08-01-00) +- G4PSCellCharge is introduced. + +November 18, 2005 M.Asai (detutils-V07-01-01) - Introducing concrete primitive scorer and filter classes. -November 16, 2007 M.Asai (detutils-V07-01-00) +November 16, 2005 M.Asai (detutils-V07-01-00) - Created. diff --git a/examples/novice/N05/include/ExN05MinEkineCuts.hh b/source/digits_hits/utils/include/G4PSCellCharge.hh old mode 100644 new mode 100755 similarity index 61% rename from examples/novice/N05/include/ExN05MinEkineCuts.hh rename to source/digits_hits/utils/include/G4PSCellCharge.hh index 66572e1db6..333d862174 --- a/examples/novice/N05/include/ExN05MinEkineCuts.hh +++ b/source/digits_hits/utils/include/G4PSCellCharge.hh @@ -24,48 +24,44 @@ // ******************************************************************** // // -// $Id: ExN05MinEkineCuts.hh,v 1.6 2006/06/29 17:52:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4PSCellCharge.hh,v 1.2 2006/12/13 15:43:28 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // + +#ifndef G4PSCellCharge_h +#define G4PSCellCharge_h 1 + +#include "G4VPrimitiveScorer.hh" +#include "G4THitsMap.hh" +/////////////////////////////////////////////////////////////////////////////// +// (Description) +// This is a primitive scorer class for scoring cell charge. +// The Cell Charge is defined by a sum of deposited charge in the cell. +// +// Created: 2007-08-20 Tsukasa ASO // -// ------------------------------------------------------------ -// GEANT 4 class header file -// -// ------------------------------------------------------------ -// 14 Aug. 1998 H.Kurashige -// ------------------------------------------------------------ - -#ifndef ExN05MinEkineCuts_h -#define ExN05MinEkineCuts_h 1 - -#include "G4ios.hh" -#include "globals.hh" -#include "ExN05SpecialCuts.hh" +/////////////////////////////////////////////////////////////////////////////// -class ExN05MinEkineCuts : public ExN05SpecialCuts +class G4PSCellCharge : public G4VPrimitiveScorer { - public: + public: // with description + G4PSCellCharge(G4String name, G4int depth=0); + virtual ~G4PSCellCharge(); - ExN05MinEkineCuts(const G4String& processName ="ExN05MinEkineCuts" ); + protected: // with description + virtual G4bool ProcessHits(G4Step*,G4TouchableHistory*); - virtual ~ExN05MinEkineCuts(); + public: + virtual void Initialize(G4HCofThisEvent*); + virtual void EndOfEvent(G4HCofThisEvent*); + virtual void clear(); + virtual void DrawAll(); + virtual void PrintAll(); - // PostStep GPIL - virtual G4double PostStepGetPhysicalInteractionLength( - const G4Track& track, - G4double previousStepSize, - G4ForceCondition* condition - ); - - private: - - // hide assignment operator as private - ExN05MinEkineCuts(ExN05MinEkineCuts&); - ExN05MinEkineCuts& operator=(const ExN05MinEkineCuts& right); - + G4int HCID; + G4THitsMap* EvtMap; }; - #endif diff --git a/source/digits_hits/utils/include/G4PSCellFlux.hh b/source/digits_hits/utils/include/G4PSCellFlux.hh index 7e1811c695..bd88a86247 100644 --- a/source/digits_hits/utils/include/G4PSCellFlux.hh +++ b/source/digits_hits/utils/include/G4PSCellFlux.hh @@ -25,7 +25,7 @@ // // // $Id: G4PSCellFlux.hh,v 1.3 2006/06/29 18:06:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4PSCellFlux_h diff --git a/source/digits_hits/utils/include/G4PSDirectionFlag.hh b/source/digits_hits/utils/include/G4PSDirectionFlag.hh index c3b43d4eab..70e3d678b2 100644 --- a/source/digits_hits/utils/include/G4PSDirectionFlag.hh +++ b/source/digits_hits/utils/include/G4PSDirectionFlag.hh @@ -25,7 +25,7 @@ // // // $Id: G4PSDirectionFlag.hh,v 1.2 2006/06/29 18:06:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/digits_hits/utils/include/G4PSDoseDeposit.hh b/source/digits_hits/utils/include/G4PSDoseDeposit.hh index 040a0951a2..06bafb144f 100644 --- a/source/digits_hits/utils/include/G4PSDoseDeposit.hh +++ b/source/digits_hits/utils/include/G4PSDoseDeposit.hh @@ -25,7 +25,7 @@ // // // $Id: G4PSDoseDeposit.hh,v 1.3 2006/06/29 18:06:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4PSDoseDeposit_h diff --git a/source/digits_hits/utils/include/G4PSEnergyDeposit.hh b/source/digits_hits/utils/include/G4PSEnergyDeposit.hh index d23703cd0e..323712aead 100644 --- a/source/digits_hits/utils/include/G4PSEnergyDeposit.hh +++ b/source/digits_hits/utils/include/G4PSEnergyDeposit.hh @@ -25,7 +25,7 @@ // // // $Id: G4PSEnergyDeposit.hh,v 1.2 2006/06/29 18:06:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4PSEnergyDeposit_h diff --git a/source/digits_hits/utils/include/G4PSFlatSurfaceCurrent.hh b/source/digits_hits/utils/include/G4PSFlatSurfaceCurrent.hh index 2f5730e5d9..c89bbe2ff9 100644 --- a/source/digits_hits/utils/include/G4PSFlatSurfaceCurrent.hh +++ b/source/digits_hits/utils/include/G4PSFlatSurfaceCurrent.hh @@ -25,7 +25,7 @@ // // // $Id: G4PSFlatSurfaceCurrent.hh,v 1.3 2006/06/29 18:07:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4PSFlatSurfaceCurrent_h diff --git a/source/digits_hits/utils/include/G4PSFlatSurfaceFlux.hh b/source/digits_hits/utils/include/G4PSFlatSurfaceFlux.hh index e42783689d..b931f1c4e8 100644 --- a/source/digits_hits/utils/include/G4PSFlatSurfaceFlux.hh +++ b/source/digits_hits/utils/include/G4PSFlatSurfaceFlux.hh @@ -25,7 +25,7 @@ // // // $Id: G4PSFlatSurfaceFlux.hh,v 1.3 2006/06/29 18:07:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4PSFlatSurfaceFlux_h diff --git a/source/digits_hits/utils/include/G4PSMinKinEAtGeneration.hh b/source/digits_hits/utils/include/G4PSMinKinEAtGeneration.hh index e2ee37580d..45a439fc6c 100755 --- a/source/digits_hits/utils/include/G4PSMinKinEAtGeneration.hh +++ b/source/digits_hits/utils/include/G4PSMinKinEAtGeneration.hh @@ -25,7 +25,7 @@ // // // $Id: G4PSMinKinEAtGeneration.hh,v 1.2 2006/06/29 18:07:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4PSMinKinEAtGeneration_h diff --git a/source/digits_hits/utils/include/G4PSNofSecondary.hh b/source/digits_hits/utils/include/G4PSNofSecondary.hh index 4de0a94b26..c8983967c6 100755 --- a/source/digits_hits/utils/include/G4PSNofSecondary.hh +++ b/source/digits_hits/utils/include/G4PSNofSecondary.hh @@ -25,7 +25,7 @@ // // // $Id: G4PSNofSecondary.hh,v 1.2 2006/06/29 18:07:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4PSNofSecondary_h diff --git a/source/digits_hits/utils/include/G4PSNofStep.hh b/source/digits_hits/utils/include/G4PSNofStep.hh index c6f5960c38..e9565e48d8 100644 --- a/source/digits_hits/utils/include/G4PSNofStep.hh +++ b/source/digits_hits/utils/include/G4PSNofStep.hh @@ -25,7 +25,7 @@ // // // $Id: G4PSNofStep.hh,v 1.2 2006/06/29 18:07:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4PSNofStep_h diff --git a/source/digits_hits/utils/include/G4PSPassageCellFlux.hh b/source/digits_hits/utils/include/G4PSPassageCellFlux.hh index 9d7fd3c989..f62211dfae 100644 --- a/source/digits_hits/utils/include/G4PSPassageCellFlux.hh +++ b/source/digits_hits/utils/include/G4PSPassageCellFlux.hh @@ -25,7 +25,7 @@ // // // $Id: G4PSPassageCellFlux.hh,v 1.3 2006/06/29 18:07:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4PSPassageCellFlux_h diff --git a/source/digits_hits/utils/include/G4PSPassageCurrent.hh b/source/digits_hits/utils/include/G4PSPassageCurrent.hh index d374125db1..dc23eb4b01 100644 --- a/source/digits_hits/utils/include/G4PSPassageCurrent.hh +++ b/source/digits_hits/utils/include/G4PSPassageCurrent.hh @@ -25,7 +25,7 @@ // // // $Id: G4PSPassageCurrent.hh,v 1.3 2006/06/29 18:07:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4PSPassageCurrent_h diff --git a/source/digits_hits/utils/include/G4PSPassageTrackLength.hh b/source/digits_hits/utils/include/G4PSPassageTrackLength.hh index fcd667be3d..82c9d5b3db 100644 --- a/source/digits_hits/utils/include/G4PSPassageTrackLength.hh +++ b/source/digits_hits/utils/include/G4PSPassageTrackLength.hh @@ -25,7 +25,7 @@ // // // $Id: G4PSPassageTrackLength.hh,v 1.3 2006/06/29 18:07:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4PSPassageTrackLength_h diff --git a/source/digits_hits/utils/include/G4PSSphereSurfaceCurrent.hh b/source/digits_hits/utils/include/G4PSSphereSurfaceCurrent.hh index e413f63b0c..07f8a137a6 100644 --- a/source/digits_hits/utils/include/G4PSSphereSurfaceCurrent.hh +++ b/source/digits_hits/utils/include/G4PSSphereSurfaceCurrent.hh @@ -25,7 +25,7 @@ // // // $Id: G4PSSphereSurfaceCurrent.hh,v 1.3 2006/06/29 18:07:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4PSSphereSurfaceCurrent_h diff --git a/source/digits_hits/utils/include/G4PSTrackLength.hh b/source/digits_hits/utils/include/G4PSTrackLength.hh index e42ae2a22c..d857ef6609 100644 --- a/source/digits_hits/utils/include/G4PSTrackLength.hh +++ b/source/digits_hits/utils/include/G4PSTrackLength.hh @@ -25,7 +25,7 @@ // // // $Id: G4PSTrackLength.hh,v 1.4 2006/06/29 18:07:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4PSTrackLength_h diff --git a/source/digits_hits/utils/include/G4SDChargedFilter.hh b/source/digits_hits/utils/include/G4SDChargedFilter.hh index 2d31ed7a73..1d9fba7b1b 100644 --- a/source/digits_hits/utils/include/G4SDChargedFilter.hh +++ b/source/digits_hits/utils/include/G4SDChargedFilter.hh @@ -25,7 +25,7 @@ // // // $Id: G4SDChargedFilter.hh,v 1.3 2006/06/29 18:07:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4SDChargedFilter_h diff --git a/source/digits_hits/utils/include/G4SDKineticEnergyFilter.hh b/source/digits_hits/utils/include/G4SDKineticEnergyFilter.hh index 6e79184601..be811aed17 100644 --- a/source/digits_hits/utils/include/G4SDKineticEnergyFilter.hh +++ b/source/digits_hits/utils/include/G4SDKineticEnergyFilter.hh @@ -25,7 +25,7 @@ // // // $Id: G4SDKineticEnergyFilter.hh,v 1.3 2006/06/29 18:07:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4SDKineticEnergyFilter_h diff --git a/source/digits_hits/utils/include/G4SDNeutralFilter.hh b/source/digits_hits/utils/include/G4SDNeutralFilter.hh index c8df318a3c..ecb7fcf52f 100644 --- a/source/digits_hits/utils/include/G4SDNeutralFilter.hh +++ b/source/digits_hits/utils/include/G4SDNeutralFilter.hh @@ -25,7 +25,7 @@ // // // $Id: G4SDNeutralFilter.hh,v 1.3 2006/06/29 18:07:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4SDNeutralFilter_h diff --git a/source/digits_hits/utils/include/G4SDParticleFilter.hh b/source/digits_hits/utils/include/G4SDParticleFilter.hh index c67770d900..75ec2cfb9f 100644 --- a/source/digits_hits/utils/include/G4SDParticleFilter.hh +++ b/source/digits_hits/utils/include/G4SDParticleFilter.hh @@ -25,7 +25,7 @@ // // // $Id: G4SDParticleFilter.hh,v 1.3 2006/06/29 18:07:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4SDParticleFilter_h diff --git a/source/digits_hits/utils/include/G4SDParticleWithEnergyFilter.hh b/source/digits_hits/utils/include/G4SDParticleWithEnergyFilter.hh index b0652a0566..803f0bee9e 100644 --- a/source/digits_hits/utils/include/G4SDParticleWithEnergyFilter.hh +++ b/source/digits_hits/utils/include/G4SDParticleWithEnergyFilter.hh @@ -25,7 +25,7 @@ // // // $Id: G4SDParticleWithEnergyFilter.hh,v 1.3 2006/06/29 18:07:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4SDParticleWithEnergyFilter_h diff --git a/source/digits_hits/utils/src/G4PSCellCharge.cc b/source/digits_hits/utils/src/G4PSCellCharge.cc new file mode 100755 index 0000000000..9edeccfb73 --- /dev/null +++ b/source/digits_hits/utils/src/G4PSCellCharge.cc @@ -0,0 +1,105 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4PSCellCharge.cc,v 1.2 2006/12/13 15:43:30 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// G4PSCellCharge +#include "G4PSCellCharge.hh" +#include "G4Track.hh" + + +/////////////////////////////////////////////////////////////////////////////// +// (Description) +// This is a primitive scorer class for scoring cell charge. +// The Cell Charge is defined by a sum of deposited charge inside the cell. +// +// Created: 2006-08-20 Tsukasa ASO +// +/////////////////////////////////////////////////////////////////////////////// + +G4PSCellCharge::G4PSCellCharge(G4String name, G4int depth) + :G4VPrimitiveScorer(name,depth),HCID(-1) +{;} + +G4PSCellCharge::~G4PSCellCharge() +{;} + +G4bool G4PSCellCharge::ProcessHits(G4Step* aStep,G4TouchableHistory*) +{ + + // Enter or First step of primary. + if( aStep->GetPreStepPoint()->GetStepStatus() == fGeomBoundary + || ( aStep->GetTrack()->GetParentID() == 0 && + aStep->GetTrack()->GetCurrentStepNumber() == 1 ) ){ + G4double CellCharge = aStep->GetPreStepPoint()->GetCharge(); + CellCharge *= aStep->GetPreStepPoint()->GetWeight(); + G4int index = GetIndex(aStep); + EvtMap->add(index,CellCharge); + } + + // Exit + if( aStep->GetPostStepPoint()->GetStepStatus() == fGeomBoundary){ + G4double CellCharge = aStep->GetPreStepPoint()->GetCharge(); + CellCharge *= aStep->GetPreStepPoint()->GetWeight(); + G4int index = GetIndex(aStep); + CellCharge *= -1.0; + EvtMap->add(index,CellCharge); + } + + return TRUE; +} + +void G4PSCellCharge::Initialize(G4HCofThisEvent* HCE) +{ + EvtMap = new G4THitsMap(detector->GetName(), + GetName()); + if ( HCID < 0 ) HCID = GetCollectionID(0); + HCE->AddHitsCollection(HCID,EvtMap); +} + +void G4PSCellCharge::EndOfEvent(G4HCofThisEvent*) +{;} + +void G4PSCellCharge::clear(){ + EvtMap->clear(); +} + +void G4PSCellCharge::DrawAll() +{;} + +void G4PSCellCharge::PrintAll() +{ + G4cout << " MultiFunctionalDet " << detector->GetName() << G4endl; + G4cout << " PrimitiveScorer " << GetName() <entries() << G4endl; + std::map::iterator itr = EvtMap->GetMap()->begin(); + for(; itr != EvtMap->GetMap()->end(); itr++) { + G4cout << " copy no.: " << itr->first + << " cell charge : " << *(itr->second) << " [e]" + << G4endl; + } +} + diff --git a/source/digits_hits/utils/src/G4PSCellFlux.cc b/source/digits_hits/utils/src/G4PSCellFlux.cc index af5b4493ae..ca1d5fd3b4 100644 --- a/source/digits_hits/utils/src/G4PSCellFlux.cc +++ b/source/digits_hits/utils/src/G4PSCellFlux.cc @@ -25,7 +25,7 @@ // // // $Id: G4PSCellFlux.cc,v 1.4 2006/06/29 18:07:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4PSCellFlux #include "G4PSCellFlux.hh" diff --git a/source/digits_hits/utils/src/G4PSDoseDeposit.cc b/source/digits_hits/utils/src/G4PSDoseDeposit.cc index 0a8f74c471..32a12c9e38 100644 --- a/source/digits_hits/utils/src/G4PSDoseDeposit.cc +++ b/source/digits_hits/utils/src/G4PSDoseDeposit.cc @@ -25,7 +25,7 @@ // // // $Id: G4PSDoseDeposit.cc,v 1.4 2006/06/29 18:07:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4PSDoseDeposit #include "G4PSDoseDeposit.hh" diff --git a/source/digits_hits/utils/src/G4PSEnergyDeposit.cc b/source/digits_hits/utils/src/G4PSEnergyDeposit.cc index c75679cd53..8d612163be 100644 --- a/source/digits_hits/utils/src/G4PSEnergyDeposit.cc +++ b/source/digits_hits/utils/src/G4PSEnergyDeposit.cc @@ -25,7 +25,7 @@ // // // $Id: G4PSEnergyDeposit.cc,v 1.4 2006/06/29 18:07:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4PSEnergyDeposit #include "G4PSEnergyDeposit.hh" diff --git a/source/digits_hits/utils/src/G4PSFlatSurfaceCurrent.cc b/source/digits_hits/utils/src/G4PSFlatSurfaceCurrent.cc index 265699c1a4..416017065d 100644 --- a/source/digits_hits/utils/src/G4PSFlatSurfaceCurrent.cc +++ b/source/digits_hits/utils/src/G4PSFlatSurfaceCurrent.cc @@ -25,7 +25,7 @@ // // // $Id: G4PSFlatSurfaceCurrent.cc,v 1.5 2006/06/29 18:07:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4PSFlatSurfaceCurrent #include "G4PSFlatSurfaceCurrent.hh" diff --git a/source/digits_hits/utils/src/G4PSFlatSurfaceFlux.cc b/source/digits_hits/utils/src/G4PSFlatSurfaceFlux.cc index 654c98abca..eb9a4fb824 100644 --- a/source/digits_hits/utils/src/G4PSFlatSurfaceFlux.cc +++ b/source/digits_hits/utils/src/G4PSFlatSurfaceFlux.cc @@ -25,7 +25,7 @@ // // // $Id: G4PSFlatSurfaceFlux.cc,v 1.5 2006/06/29 18:07:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4PSFlatSurfaceFlux #include "G4PSFlatSurfaceFlux.hh" diff --git a/source/digits_hits/utils/src/G4PSMinKinEAtGeneration.cc b/source/digits_hits/utils/src/G4PSMinKinEAtGeneration.cc index 28df6a0637..2f771c139d 100755 --- a/source/digits_hits/utils/src/G4PSMinKinEAtGeneration.cc +++ b/source/digits_hits/utils/src/G4PSMinKinEAtGeneration.cc @@ -25,7 +25,7 @@ // // // $Id: G4PSMinKinEAtGeneration.cc,v 1.5 2006/06/29 18:07:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4PSMinKinEAtGeneration #include "G4PSMinKinEAtGeneration.hh" diff --git a/source/digits_hits/utils/src/G4PSNofSecondary.cc b/source/digits_hits/utils/src/G4PSNofSecondary.cc index 0edf7dcccc..cf8ae4c495 100755 --- a/source/digits_hits/utils/src/G4PSNofSecondary.cc +++ b/source/digits_hits/utils/src/G4PSNofSecondary.cc @@ -25,7 +25,7 @@ // // // $Id: G4PSNofSecondary.cc,v 1.3 2006/06/29 18:07:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4PSNofSecondary #include "G4PSNofSecondary.hh" diff --git a/source/digits_hits/utils/src/G4PSNofStep.cc b/source/digits_hits/utils/src/G4PSNofStep.cc index cb642e37ad..bba68db5d2 100644 --- a/source/digits_hits/utils/src/G4PSNofStep.cc +++ b/source/digits_hits/utils/src/G4PSNofStep.cc @@ -25,7 +25,7 @@ // // // $Id: G4PSNofStep.cc,v 1.5 2006/06/29 18:07:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4PSNofStep #include "G4PSNofStep.hh" diff --git a/source/digits_hits/utils/src/G4PSPassageCellFlux.cc b/source/digits_hits/utils/src/G4PSPassageCellFlux.cc index 80e4e2d71d..34ea40c435 100644 --- a/source/digits_hits/utils/src/G4PSPassageCellFlux.cc +++ b/source/digits_hits/utils/src/G4PSPassageCellFlux.cc @@ -25,7 +25,7 @@ // // // $Id: G4PSPassageCellFlux.cc,v 1.5 2006/06/29 18:07:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4PSPassageCellFlux #include "G4PSPassageCellFlux.hh" diff --git a/source/digits_hits/utils/src/G4PSPassageCurrent.cc b/source/digits_hits/utils/src/G4PSPassageCurrent.cc index 08426bf777..36f4007b5b 100644 --- a/source/digits_hits/utils/src/G4PSPassageCurrent.cc +++ b/source/digits_hits/utils/src/G4PSPassageCurrent.cc @@ -25,7 +25,7 @@ // // // $Id: G4PSPassageCurrent.cc,v 1.4 2006/06/29 18:07:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4PSPassageCurrent #include "G4PSPassageCurrent.hh" diff --git a/source/digits_hits/utils/src/G4PSPassageTrackLength.cc b/source/digits_hits/utils/src/G4PSPassageTrackLength.cc index ed013ba51f..441dd8c1e6 100644 --- a/source/digits_hits/utils/src/G4PSPassageTrackLength.cc +++ b/source/digits_hits/utils/src/G4PSPassageTrackLength.cc @@ -25,7 +25,7 @@ // // // $Id: G4PSPassageTrackLength.cc,v 1.3 2006/06/29 18:07:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4PSPassageTrackLength #include "G4PSPassageTrackLength.hh" diff --git a/source/digits_hits/utils/src/G4PSSphereSurfaceCurrent.cc b/source/digits_hits/utils/src/G4PSSphereSurfaceCurrent.cc index fc2d6799e2..e200f9f724 100644 --- a/source/digits_hits/utils/src/G4PSSphereSurfaceCurrent.cc +++ b/source/digits_hits/utils/src/G4PSSphereSurfaceCurrent.cc @@ -25,7 +25,7 @@ // // // $Id: G4PSSphereSurfaceCurrent.cc,v 1.5 2006/06/29 18:08:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4PSSphereSurfaceCurrent #include "G4PSSphereSurfaceCurrent.hh" diff --git a/source/digits_hits/utils/src/G4PSTrackLength.cc b/source/digits_hits/utils/src/G4PSTrackLength.cc index 7c894f58f1..60303cdc85 100644 --- a/source/digits_hits/utils/src/G4PSTrackLength.cc +++ b/source/digits_hits/utils/src/G4PSTrackLength.cc @@ -25,7 +25,7 @@ // // // $Id: G4PSTrackLength.cc,v 1.5 2006/06/29 18:08:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4PSTrackLength #include "G4PSTrackLength.hh" diff --git a/source/digits_hits/utils/src/G4SDChargedFilter.cc b/source/digits_hits/utils/src/G4SDChargedFilter.cc index 2d504bc3c5..15061cb856 100644 --- a/source/digits_hits/utils/src/G4SDChargedFilter.cc +++ b/source/digits_hits/utils/src/G4SDChargedFilter.cc @@ -25,7 +25,7 @@ // // // $Id: G4SDChargedFilter.cc,v 1.2 2006/06/29 18:08:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VSensitiveDetector #include "G4SDChargedFilter.hh" diff --git a/source/digits_hits/utils/src/G4SDKineticEnergyFilter.cc b/source/digits_hits/utils/src/G4SDKineticEnergyFilter.cc index 757d3f565b..178e9ca8c1 100644 --- a/source/digits_hits/utils/src/G4SDKineticEnergyFilter.cc +++ b/source/digits_hits/utils/src/G4SDKineticEnergyFilter.cc @@ -25,7 +25,7 @@ // // // $Id: G4SDKineticEnergyFilter.cc,v 1.5 2006/06/29 18:08:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VSensitiveDetector #include "G4SDKineticEnergyFilter.hh" diff --git a/source/digits_hits/utils/src/G4SDNeutralFilter.cc b/source/digits_hits/utils/src/G4SDNeutralFilter.cc index c85f9ea665..e5364095a2 100644 --- a/source/digits_hits/utils/src/G4SDNeutralFilter.cc +++ b/source/digits_hits/utils/src/G4SDNeutralFilter.cc @@ -25,7 +25,7 @@ // // // $Id: G4SDNeutralFilter.cc,v 1.2 2006/06/29 18:08:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VSensitiveDetector #include "G4SDNeutralFilter.hh" diff --git a/source/digits_hits/utils/src/G4SDParticleFilter.cc b/source/digits_hits/utils/src/G4SDParticleFilter.cc index 35e17049c5..18113ac296 100644 --- a/source/digits_hits/utils/src/G4SDParticleFilter.cc +++ b/source/digits_hits/utils/src/G4SDParticleFilter.cc @@ -25,7 +25,7 @@ // // // $Id: G4SDParticleFilter.cc,v 1.3 2006/06/29 18:08:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VSensitiveDetector #include "G4SDParticleFilter.hh" diff --git a/source/digits_hits/utils/src/G4SDParticleWithEnergyFilter.cc b/source/digits_hits/utils/src/G4SDParticleWithEnergyFilter.cc index 069e19c529..770113a87f 100644 --- a/source/digits_hits/utils/src/G4SDParticleWithEnergyFilter.cc +++ b/source/digits_hits/utils/src/G4SDParticleWithEnergyFilter.cc @@ -25,7 +25,7 @@ // // // $Id: G4SDParticleWithEnergyFilter.cc,v 1.2 2006/06/29 18:08:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VSensitiveDetector #include "G4SDParticleWithEnergyFilter.hh" diff --git a/source/event/History b/source/event/History index a5436c7d83..272083cff1 100644 --- a/source/event/History +++ b/source/event/History @@ -1,4 +1,4 @@ -$Id: History,v 1.102 2006/06/15 23:44:06 asaim Exp $ +$Id: History,v 1.106 2006/11/17 17:52:57 flei Exp $ ------------------------------------------------------------------- ========================================================= @@ -16,6 +16,18 @@ committal in the CVS repository ! ---------------------------------------------------------- * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +November 17, 2006, F.Lei (event-V08-01-03) +- Improved implementation of flat_sampling (biasing) for multiple sources in GPS. + +November 17, 2006, F.Lei (event-V08-01-02) +- First implementation of flat_sampling (biasing) for multiple sources. + +November 10, 2006, F.Lei (event-V08-01-01) +- Added line 468 to for initialization to G4PSEneDistribution.cc + +November 02, 2006, M.Asai (event-V08-01-00) +- Add a flag in G4Event to keep the particular event object until the end of current run. +- Add a set method to G4EventManager to control the above flag and add a UI command in G4EvManMessenger. June 15, 2006, M.Asai (event-V08-00-04) - Add zero vector check for polarization of optical photon in G4PrimaryTransformer. diff --git a/source/event/include/G4CellScorer.hh b/source/event/include/G4CellScorer.hh index 40dd8230b5..875c16f5fd 100644 --- a/source/event/include/G4CellScorer.hh +++ b/source/event/include/G4CellScorer.hh @@ -25,7 +25,7 @@ // // // $Id: G4CellScorer.hh,v 1.2 2006/06/29 18:08:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4CellScorer diff --git a/source/event/include/G4CellScorerStore.hh b/source/event/include/G4CellScorerStore.hh index fdfd4f72ab..5e7b599e91 100644 --- a/source/event/include/G4CellScorerStore.hh +++ b/source/event/include/G4CellScorerStore.hh @@ -25,7 +25,7 @@ // // // $Id: G4CellScorerStore.hh,v 1.3 2006/06/29 18:08:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4CellScorerStore diff --git a/source/event/include/G4ClassificationOfNewTrack.hh b/source/event/include/G4ClassificationOfNewTrack.hh index f7b5b9509d..2581a54f9e 100644 --- a/source/event/include/G4ClassificationOfNewTrack.hh +++ b/source/event/include/G4ClassificationOfNewTrack.hh @@ -25,7 +25,7 @@ // // // $Id: G4ClassificationOfNewTrack.hh,v 1.6 2006/06/29 18:08:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/event/include/G4EvManMessenger.hh b/source/event/include/G4EvManMessenger.hh index ef42a0e556..9ffb634c66 100644 --- a/source/event/include/G4EvManMessenger.hh +++ b/source/event/include/G4EvManMessenger.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4EvManMessenger.hh,v 1.5 2006/06/29 18:08:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4EvManMessenger.hh,v 1.6 2006/11/03 03:11:13 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4EvManMessenger_h @@ -58,6 +58,7 @@ class G4EvManMessenger: public G4UImessenger G4UIdirectory* eventDirectory; G4UIcmdWithoutParameter* abortCmd; G4UIcmdWithAnInteger* verboseCmd; + G4UIcmdWithoutParameter* storeEvtCmd; }; #endif diff --git a/source/event/include/G4Event.hh b/source/event/include/G4Event.hh index 1fb1acb263..b622a3b671 100644 --- a/source/event/include/G4Event.hh +++ b/source/event/include/G4Event.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Event.hh,v 1.12 2006/06/29 18:08:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Event.hh,v 1.13 2006/11/03 03:11:13 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4Event_h @@ -94,10 +94,17 @@ class G4Event // UserEventInformation (optional) G4VUserEventInformation* userInfo; - // Initial random number engine status + // Initial random number engine status before primary particle generation G4String randomNumberStatus; G4bool validRandomNumberStatus; + // Initial random number engine status before event processing + G4String randomNumberStatusForProcessing; + G4bool validRandomNumberStatusForProcessing; + + // Flag to keep the event until the end of run + G4bool keepTheEvent; + public: inline void SetEventID(G4int i) { eventID = i; } @@ -114,6 +121,16 @@ class G4Event randomNumberStatus = st; validRandomNumberStatus = true; } + inline void SetRandomNumberStatusForProcessing(G4String st) + { + randomNumberStatusForProcessing = st; + validRandomNumberStatusForProcessing = true; + } + inline void KeepTheEvent(G4bool vl=true) + { keepTheEvent = vl; } + inline G4bool ToBeKept() const + { return keepTheEvent; } + public: // with description inline G4int GetEventID() const { return eventID; } @@ -171,6 +188,12 @@ class G4Event { G4Exception("Random number status is not available for this event."); } return randomNumberStatus; } + inline const G4String& GetRandomNumberStatusForProcessing() const + { + if(!validRandomNumberStatusForProcessing) + { G4Exception("Random number status is not available for this event."); } + return randomNumberStatusForProcessing; + } }; #if defined G4EVENT_ALLOC_EXPORT diff --git a/source/event/include/G4EventManager.hh b/source/event/include/G4EventManager.hh index 2e909b5252..534053ffae 100644 --- a/source/event/include/G4EventManager.hh +++ b/source/event/include/G4EventManager.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4EventManager.hh,v 1.17 2006/06/29 18:08:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4EventManager.hh,v 1.18 2006/11/03 03:11:13 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // @@ -177,6 +177,9 @@ class G4EventManager void SetNumberOfAdditionalWaitingStacks(G4int iAdd) { trackContainer->SetNumberOfAdditionalWaitingStacks(iAdd); } + void KeepTheCurrentEvent(); + // If the current event exists, it is kept undeleted until the end of the current run + inline G4StackManager* GetStackManager() const { return trackContainer; } inline G4TrackingManager* GetTrackingManager() const @@ -204,7 +207,6 @@ class G4EventManager inline void SetPrimaryTransformer(G4PrimaryTransformer* tf) { transformer = tf; } - }; diff --git a/source/event/include/G4GeneralParticleSource.hh b/source/event/include/G4GeneralParticleSource.hh index 68315653a8..66dd73d168 100644 --- a/source/event/include/G4GeneralParticleSource.hh +++ b/source/event/include/G4GeneralParticleSource.hh @@ -175,6 +175,10 @@ public: // Set if multiple vertex per event. void SetMultipleVertex(G4bool av) {multiple_vertex = av;} ; + // set if flat_sampling is applied in multiple source case + + void SetFlatSampling(G4bool av) {flat_sampling = av; normalised = false;} ; + // Set the particle species void SetParticleDefinition (G4ParticleDefinition * aParticleDefinition) {currentSource->SetParticleDefinition(aParticleDefinition); } ; @@ -204,6 +208,8 @@ private: private: G4bool multiple_vertex; + G4bool flat_sampling; + G4double weight_change; G4bool normalised; G4int currentSourceIdx; G4SingleParticleSource* currentSource; diff --git a/source/event/include/G4GeneralParticleSourceMessenger.hh b/source/event/include/G4GeneralParticleSourceMessenger.hh index acbee9255a..ef61901c04 100644 --- a/source/event/include/G4GeneralParticleSourceMessenger.hh +++ b/source/event/include/G4GeneralParticleSourceMessenger.hh @@ -133,6 +133,7 @@ private: //commands G4UIcmdWithADouble *setintensityCmd; G4UIcmdWithAnInteger *deletesourceCmd; G4UIcmdWithABool *multiplevertexCmd; + G4UIcmdWithABool *flatsamplingCmd; // positional commands G4UIdirectory *positionDirectory; G4UIcmdWithAString *typeCmd1; diff --git a/source/event/include/G4HEPEvtInterface.hh b/source/event/include/G4HEPEvtInterface.hh index ff9330e94f..f8f03ca13a 100644 --- a/source/event/include/G4HEPEvtInterface.hh +++ b/source/event/include/G4HEPEvtInterface.hh @@ -25,7 +25,7 @@ // // // $Id: G4HEPEvtInterface.hh,v 1.8 2006/06/29 18:08:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4HEPEvtInterface_h diff --git a/source/event/include/G4HEPEvtParticle.hh b/source/event/include/G4HEPEvtParticle.hh index ab0af359f3..9b5b42c8a4 100644 --- a/source/event/include/G4HEPEvtParticle.hh +++ b/source/event/include/G4HEPEvtParticle.hh @@ -25,7 +25,7 @@ // // // $Id: G4HEPEvtParticle.hh,v 1.9 2006/06/29 18:08:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/event/include/G4ParticleGun.hh b/source/event/include/G4ParticleGun.hh index 8f2f70a31f..2192ee65ad 100644 --- a/source/event/include/G4ParticleGun.hh +++ b/source/event/include/G4ParticleGun.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParticleGun.hh,v 1.8 2006/06/29 18:08:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4ParticleGun_h diff --git a/source/event/include/G4ParticleGunMessenger.hh b/source/event/include/G4ParticleGunMessenger.hh index 96e70c3dfd..38095974f8 100644 --- a/source/event/include/G4ParticleGunMessenger.hh +++ b/source/event/include/G4ParticleGunMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParticleGunMessenger.hh,v 1.8 2006/06/29 18:08:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/event/include/G4PrimaryTransformer.hh b/source/event/include/G4PrimaryTransformer.hh index 293d3707c4..46f58df3ae 100644 --- a/source/event/include/G4PrimaryTransformer.hh +++ b/source/event/include/G4PrimaryTransformer.hh @@ -25,7 +25,7 @@ // // // $Id: G4PrimaryTransformer.hh,v 1.12 2006/06/29 18:08:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4PromaryTransformer_h diff --git a/source/event/include/G4RayShooter.hh b/source/event/include/G4RayShooter.hh index 07cfc1ebb1..370dbe1ed8 100644 --- a/source/event/include/G4RayShooter.hh +++ b/source/event/include/G4RayShooter.hh @@ -25,7 +25,7 @@ // // // $Id: G4RayShooter.hh,v 1.2 2006/06/29 18:08:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class description: diff --git a/source/event/include/G4SPSRandomGenerator.hh b/source/event/include/G4SPSRandomGenerator.hh index 685c38b67c..4e6d334f4c 100644 --- a/source/event/include/G4SPSRandomGenerator.hh +++ b/source/event/include/G4SPSRandomGenerator.hh @@ -161,8 +161,10 @@ public: G4double GenRandPosTheta(); G4double GenRandPosPhi(); + inline void SetIntensityWeight(G4double weight) {bweights[8]=weight;}; + inline G4double GetBiasWeight() - { return bweights[0]*bweights[1]*bweights[2]*bweights[3]*bweights[4]*bweights[5]*bweights[6]*bweights[7];}; + { return bweights[0]*bweights[1]*bweights[2]*bweights[3]*bweights[4]*bweights[5]*bweights[6]*bweights[7]*bweights[8];}; // method to re-set the histograms void ReSetHist(G4String); @@ -199,7 +201,7 @@ private: G4PhysicsOrderedFreeVector PosPhiBiasH; G4PhysicsOrderedFreeVector IPDFPosPhiBiasH; - G4double bweights[8]; //record x,y,z,theta,phi,energy,posThet, posPhi weights + G4double bweights[9]; //record x,y,z,theta,phi,energy,posThet,posPhi,intensity weights // Verbosity G4int verbosityLevel; diff --git a/source/event/include/G4ScoreTable.hh b/source/event/include/G4ScoreTable.hh index cd36b1f361..3f17c63e14 100644 --- a/source/event/include/G4ScoreTable.hh +++ b/source/event/include/G4ScoreTable.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4ScoreTable.hh,v 1.3 2006/06/29 18:08:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4ScoreTable diff --git a/source/event/include/G4Scorer.hh b/source/event/include/G4Scorer.hh index 2b68d82854..5fb7092108 100644 --- a/source/event/include/G4Scorer.hh +++ b/source/event/include/G4Scorer.hh @@ -25,7 +25,7 @@ // // // $Id: G4Scorer.hh,v 1.2 2006/06/29 18:09:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4Scorer diff --git a/source/event/include/G4StackChecker.hh b/source/event/include/G4StackChecker.hh index 3a1697ea8f..8d0237b28a 100644 --- a/source/event/include/G4StackChecker.hh +++ b/source/event/include/G4StackChecker.hh @@ -25,7 +25,7 @@ // // // $Id: G4StackChecker.hh,v 1.2 2006/06/29 18:09:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4StackChecker_h diff --git a/source/event/include/G4StackManager.hh b/source/event/include/G4StackManager.hh index 49c5ff0fa2..29693f4bdc 100644 --- a/source/event/include/G4StackManager.hh +++ b/source/event/include/G4StackManager.hh @@ -25,7 +25,7 @@ // // // $Id: G4StackManager.hh,v 1.12 2006/06/29 18:09:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/event/include/G4StackedTrack.hh b/source/event/include/G4StackedTrack.hh index d7b0130fc5..f4cb7a0bed 100644 --- a/source/event/include/G4StackedTrack.hh +++ b/source/event/include/G4StackedTrack.hh @@ -25,7 +25,7 @@ // // // $Id: G4StackedTrack.hh,v 1.10 2006/06/29 18:09:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Last Modification : 02/Feb/96 M.Asai diff --git a/source/event/include/G4StackingMessenger.hh b/source/event/include/G4StackingMessenger.hh index 39c9dbabc2..bf0701186b 100644 --- a/source/event/include/G4StackingMessenger.hh +++ b/source/event/include/G4StackingMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: G4StackingMessenger.hh,v 1.5 2006/06/29 18:09:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4StackingMessenger_h diff --git a/source/event/include/G4TrackStack.hh b/source/event/include/G4TrackStack.hh index a0daf1efce..47f7652c11 100644 --- a/source/event/include/G4TrackStack.hh +++ b/source/event/include/G4TrackStack.hh @@ -25,7 +25,7 @@ // // // $Id: G4TrackStack.hh,v 1.6 2006/06/29 18:09:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Last Modification : 09/Dec/96 M.Asai diff --git a/source/event/include/G4TrajectoryContainer.hh b/source/event/include/G4TrajectoryContainer.hh index 584d431e3c..eb31de2caf 100644 --- a/source/event/include/G4TrajectoryContainer.hh +++ b/source/event/include/G4TrajectoryContainer.hh @@ -25,7 +25,7 @@ // // // $Id: G4TrajectoryContainer.hh,v 1.15 2006/06/29 18:09:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4TrajectoryContainer diff --git a/source/event/include/G4UserEventAction.hh b/source/event/include/G4UserEventAction.hh index 467062f814..a883e84acf 100644 --- a/source/event/include/G4UserEventAction.hh +++ b/source/event/include/G4UserEventAction.hh @@ -25,7 +25,7 @@ // // // $Id: G4UserEventAction.hh,v 1.6 2006/06/29 18:09:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // diff --git a/source/event/include/G4UserStackingAction.hh b/source/event/include/G4UserStackingAction.hh index 999781d3b4..6271d5089f 100644 --- a/source/event/include/G4UserStackingAction.hh +++ b/source/event/include/G4UserStackingAction.hh @@ -25,7 +25,7 @@ // // // $Id: G4UserStackingAction.hh,v 1.6 2006/06/29 18:09:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4UserStackingAction_h diff --git a/source/event/include/G4VPrimaryGenerator.hh b/source/event/include/G4VPrimaryGenerator.hh index 1a343bcd83..4fee05edda 100644 --- a/source/event/include/G4VPrimaryGenerator.hh +++ b/source/event/include/G4VPrimaryGenerator.hh @@ -25,7 +25,7 @@ // // // $Id: G4VPrimaryGenerator.hh,v 1.8 2006/06/29 18:09:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VPrimaryGenerator_h diff --git a/source/event/include/G4VUserEventInformation.hh b/source/event/include/G4VUserEventInformation.hh index 84f58a70dd..6aeac4dbd6 100644 --- a/source/event/include/G4VUserEventInformation.hh +++ b/source/event/include/G4VUserEventInformation.hh @@ -25,7 +25,7 @@ // // // $Id: G4VUserEventInformation.hh,v 1.2 2006/06/29 18:09:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/event/include/eventgendefs.hh b/source/event/include/eventgendefs.hh index 4cd03868c2..879fd503a9 100644 --- a/source/event/include/eventgendefs.hh +++ b/source/event/include/eventgendefs.hh @@ -25,7 +25,7 @@ // // // $Id: eventgendefs.hh,v 1.4 2006/06/29 18:09:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef EventGenerator_DEBUG #define EventGenerator_DEBUG diff --git a/source/event/include/evmandefs.hh b/source/event/include/evmandefs.hh index 8151c8ed75..c778bc2157 100644 --- a/source/event/include/evmandefs.hh +++ b/source/event/include/evmandefs.hh @@ -25,7 +25,7 @@ // // // $Id: evmandefs.hh,v 1.4 2006/06/29 18:09:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ///#define G4EVENTMANAGER_DEBUG 1 diff --git a/source/event/include/trajectoryControl.hh b/source/event/include/trajectoryControl.hh index 0018136271..5ffb917202 100644 --- a/source/event/include/trajectoryControl.hh +++ b/source/event/include/trajectoryControl.hh @@ -25,7 +25,7 @@ // // // $Id: trajectoryControl.hh,v 1.4 2006/06/29 18:09:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ////#define G4_STORE_TRAJECTORY 1 diff --git a/source/event/src/G4CellScorer.cc b/source/event/src/G4CellScorer.cc index abc4924f03..f4fc11ef59 100644 --- a/source/event/src/G4CellScorer.cc +++ b/source/event/src/G4CellScorer.cc @@ -25,7 +25,7 @@ // // // $Id: G4CellScorer.cc,v 1.4 2006/06/29 18:09:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/event/src/G4CellScorerStore.cc b/source/event/src/G4CellScorerStore.cc index b0260f936d..92eea4c9df 100644 --- a/source/event/src/G4CellScorerStore.cc +++ b/source/event/src/G4CellScorerStore.cc @@ -25,7 +25,7 @@ // // // $Id: G4CellScorerStore.cc,v 1.4 2006/06/29 18:09:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/event/src/G4EvManMessenger.cc b/source/event/src/G4EvManMessenger.cc index ef8db9f20b..892e979025 100644 --- a/source/event/src/G4EvManMessenger.cc +++ b/source/event/src/G4EvManMessenger.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4EvManMessenger.cc,v 1.5 2006/06/29 18:09:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4EvManMessenger.cc,v 1.6 2006/11/03 03:11:13 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- @@ -52,12 +52,20 @@ G4EvManMessenger::G4EvManMessenger(G4EventManager * fEvMan) verboseCmd->SetGuidance(" 2 : More..."); verboseCmd->SetParameterName("level",false); verboseCmd->SetRange("level>=0"); + + storeEvtCmd = new G4UIcmdWithoutParameter("/event/keepCurrentEvent",this); + storeEvtCmd->SetGuidance("Store the current event to G4Run object instead of deleting it at the end of event."); + storeEvtCmd->SetGuidance("Stored event is available through G4Run until the begining of next run."); + storeEvtCmd->SetGuidance("Given the potential large memory size of G4Event and its datamember objects stored in G4Event,"); + storeEvtCmd->SetGuidance("the user must be careful and responsible for not to store too many G4Event objects."); + storeEvtCmd->AvailableForStates(G4State_EventProc); } G4EvManMessenger::~G4EvManMessenger() { delete abortCmd; delete verboseCmd; + delete storeEvtCmd; delete eventDirectory; } @@ -67,6 +75,8 @@ void G4EvManMessenger::SetNewValue(G4UIcommand * command,G4String newValues) { fEvManager->SetVerboseLevel(verboseCmd->GetNewIntValue(newValues)); } if( command == abortCmd ) { fEvManager->AbortCurrentEvent(); } + if( command == storeEvtCmd ) + { fEvManager->KeepTheCurrentEvent(); } } G4String G4EvManMessenger::GetCurrentValue(G4UIcommand * command) diff --git a/source/event/src/G4Event.cc b/source/event/src/G4Event.cc index e8ef2e98a4..bcdbeb15b3 100644 --- a/source/event/src/G4Event.cc +++ b/source/event/src/G4Event.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Event.cc,v 1.10 2006/06/29 18:09:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Event.cc,v 1.11 2006/11/03 03:11:13 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4Event @@ -44,14 +44,14 @@ G4Event::G4Event() :eventID(0), thePrimaryVertex(0),numberOfPrimaryVertex(0), HC(0),DC(0),trajectoryContainer(0),eventAborted(false),userInfo(0), - validRandomNumberStatus(false) + validRandomNumberStatus(false),keepTheEvent(false) {;} G4Event::G4Event(G4int evID) :eventID(evID), thePrimaryVertex(0),numberOfPrimaryVertex(0), HC(0),DC(0),trajectoryContainer(0),eventAborted(false),userInfo(0), - validRandomNumberStatus(false) + validRandomNumberStatus(false),keepTheEvent(false) {;} G4Event::~G4Event() diff --git a/source/event/src/G4EventManager.cc b/source/event/src/G4EventManager.cc index 423f8067f7..dfba045ee7 100644 --- a/source/event/src/G4EventManager.cc +++ b/source/event/src/G4EventManager.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4EventManager.cc,v 1.25 2006/06/29 18:09:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4EventManager.cc,v 1.26 2006/11/03 03:11:13 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // @@ -41,7 +41,7 @@ #include "G4ApplicationState.hh" #include "G4TransportationManager.hh" #include "G4Navigator.hh" - +#include "Randomize.hh" G4EventManager* G4EventManager::fpEventManager = 0; G4EventManager* G4EventManager::GetEventManager() @@ -108,6 +108,9 @@ void G4EventManager::DoProcessing(G4Event* anEvent) } currentEvent = anEvent; stateManager->SetNewState(G4State_EventProc); + std::ostringstream oss; + CLHEP::HepRandom::saveFullState(oss); + currentEvent->SetRandomNumberStatusForProcessing(oss.str()); // Reseting Navigator has been moved to G4Eventmanager, so that resetting // is now done for every event. @@ -327,8 +330,6 @@ void G4EventManager::ProcessOneEvent(G4Event* anEvent) DoProcessing(anEvent); } -#include "Randomize.hh" - #ifdef CLHEP_HepMC // Temporarly disabled #include "G4HepMCInterface.hh" void G4EventManager::ProcessOneEvent(const HepMC::GenEvent* hepmcevt,G4Event* anEvent) @@ -394,5 +395,7 @@ G4VUserEventInformation* G4EventManager::GetUserInformation() return currentEvent->GetUserInformation(); } +void G4EventManager::KeepTheCurrentEvent() +{ if(currentEvent) currentEvent->KeepTheEvent(); } diff --git a/source/event/src/G4GeneralParticleSource.cc b/source/event/src/G4GeneralParticleSource.cc index c6c0b26685..b0aeb7b916 100644 --- a/source/event/src/G4GeneralParticleSource.cc +++ b/source/event/src/G4GeneralParticleSource.cc @@ -62,7 +62,7 @@ #include "G4GeneralParticleSource.hh" G4GeneralParticleSource::G4GeneralParticleSource() - : multiple_vertex(false) + : multiple_vertex(false), flat_sampling(false), weight_change(1.) { sourceVector.clear(); sourceIntensity.clear(); @@ -99,9 +99,22 @@ void G4GeneralParticleSource::IntensityNormalization() total += sourceIntensity[i] ; // sourceProbability.clear(); - sourceProbability.push_back(sourceIntensity[0]/total); - for ( i = 1 ; i < sourceIntensity.size(); i++) - sourceProbability.push_back(sourceIntensity[i]/total + sourceProbability[i-1]); + sourceIntensity[0] = sourceIntensity[0]/total; + sourceProbability.push_back(sourceIntensity[0]); + for ( i = 1 ; i < sourceIntensity.size(); i++) { + sourceIntensity[i] = sourceIntensity[i]/total; + sourceProbability.push_back(sourceIntensity[i] + sourceProbability[i-1]); + } + + // set source weights here based on sampling scheme (analog/flat) and intensities + for ( i = 0 ; i < sourceIntensity.size(); i++) { + if (!flat_sampling) { + sourceVector[i]->GetBiasRndm()->SetIntensityWeight(1.); + } else { + sourceVector[i]->GetBiasRndm()->SetIntensityWeight(sourceIntensity[i]*sourceIntensity.size()); + } + } + normalised = true; } @@ -170,10 +183,15 @@ void G4GeneralParticleSource::GeneratePrimaryVertex(G4Event* evt) if (!normalised) IntensityNormalization(); G4double rndm = G4UniformRand(); size_t i = 0 ; - while ( rndm > sourceProbability[i] ) i++; - (currentSource = sourceVector[i]); + if (!flat_sampling) { + while ( rndm > sourceProbability[i] ) i++; + (currentSource = sourceVector[i]); + } else { + i = size_t (sourceIntensity.size()*rndm); + currentSource = sourceVector[i]; + } } - currentSource-> GeneratePrimaryVertex(evt); + currentSource-> GeneratePrimaryVertex(evt); } else { for (size_t i = 0; i < sourceIntensity.size(); i++) { diff --git a/source/event/src/G4GeneralParticleSourceMessenger.cc b/source/event/src/G4GeneralParticleSourceMessenger.cc index b972a0161c..6ea12a2697 100644 --- a/source/event/src/G4GeneralParticleSourceMessenger.cc +++ b/source/event/src/G4GeneralParticleSourceMessenger.cc @@ -119,6 +119,12 @@ G4GeneralParticleSourceMessenger::G4GeneralParticleSourceMessenger multiplevertexCmd->SetParameterName("multiplevertex",true); multiplevertexCmd->SetDefaultValue(false); + flatsamplingCmd = new G4UIcmdWithABool("/gps/source/flatsampling",this); + flatsamplingCmd->SetGuidance("true for appling flat (biased) sampling among the sources"); + flatsamplingCmd->SetGuidance("Default is false"); + flatsamplingCmd->SetParameterName("flatsampling",true); + flatsamplingCmd->SetDefaultValue(false); + // below we reproduce commands awailable in G4Particle Gun listCmd = new G4UIcmdWithoutParameter("/gps/List",this); @@ -897,6 +903,7 @@ G4GeneralParticleSourceMessenger::~G4GeneralParticleSourceMessenger() delete setintensityCmd; delete deletesourceCmd; delete multiplevertexCmd; + delete flatsamplingCmd; delete gpsDirectory; @@ -1327,6 +1334,10 @@ void G4GeneralParticleSourceMessenger::SetNewValue(G4UIcommand *command, G4Strin { fGPS->SetMultipleVertex(multiplevertexCmd->GetNewBoolValue(newValues)); } + else if(command == flatsamplingCmd) + { + fGPS->SetFlatSampling(flatsamplingCmd->GetNewBoolValue(newValues)); + } // // new implementations // diff --git a/source/event/src/G4HEPEvtInterface.cc b/source/event/src/G4HEPEvtInterface.cc index 6dfebcf95a..b88c2ca51a 100644 --- a/source/event/src/G4HEPEvtInterface.cc +++ b/source/event/src/G4HEPEvtInterface.cc @@ -25,7 +25,7 @@ // // // $Id: G4HEPEvtInterface.cc,v 1.11 2006/06/29 18:09:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/event/src/G4HEPEvtParticle.cc b/source/event/src/G4HEPEvtParticle.cc index c281d5fb4f..1ccbde8b12 100644 --- a/source/event/src/G4HEPEvtParticle.cc +++ b/source/event/src/G4HEPEvtParticle.cc @@ -25,7 +25,7 @@ // // // $Id: G4HEPEvtParticle.cc,v 1.8 2006/06/29 18:09:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/event/src/G4ParticleGun.cc b/source/event/src/G4ParticleGun.cc index 16979685a9..85a3560429 100644 --- a/source/event/src/G4ParticleGun.cc +++ b/source/event/src/G4ParticleGun.cc @@ -25,7 +25,7 @@ // // // $Id: G4ParticleGun.cc,v 1.12 2006/06/29 18:09:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4ParticleGun diff --git a/source/event/src/G4ParticleGunMessenger.cc b/source/event/src/G4ParticleGunMessenger.cc index 6c87b98d1c..c6715baff3 100644 --- a/source/event/src/G4ParticleGunMessenger.cc +++ b/source/event/src/G4ParticleGunMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: G4ParticleGunMessenger.cc,v 1.14 2006/06/29 18:09:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4ParticleGunMessenger.hh" diff --git a/source/event/src/G4PrimaryTransformer.cc b/source/event/src/G4PrimaryTransformer.cc index 130f31d049..8ee15700aa 100644 --- a/source/event/src/G4PrimaryTransformer.cc +++ b/source/event/src/G4PrimaryTransformer.cc @@ -25,7 +25,7 @@ // // // $Id: G4PrimaryTransformer.cc,v 1.27 2006/06/29 18:09:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4PrimaryTransformer.hh" diff --git a/source/event/src/G4RayShooter.cc b/source/event/src/G4RayShooter.cc index c7a370a5f5..d8e4324041 100644 --- a/source/event/src/G4RayShooter.cc +++ b/source/event/src/G4RayShooter.cc @@ -25,7 +25,7 @@ // // // $Id: G4RayShooter.cc,v 1.2 2006/06/29 18:10:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4RayShooter.hh" diff --git a/source/event/src/G4SPSEneDistribution.cc b/source/event/src/G4SPSEneDistribution.cc index b4961591e4..f594681bc0 100644 --- a/source/event/src/G4SPSEneDistribution.cc +++ b/source/event/src/G4SPSEneDistribution.cc @@ -465,6 +465,7 @@ void G4SPSEneDistribution::LogInterpolation() Arb_alpha[0] = 0.; Arb_Const[0] = 0.; Area_seg[0] = 0.; + Arb_Cum_Area[0]=0. ; if(Arb_x[0] <= 0. || Arb_y[0] <= 0.) { G4cout << "You should not use log interpolation with points <= 0." << G4endl; diff --git a/source/event/src/G4SPSRandomGenerator.cc b/source/event/src/G4SPSRandomGenerator.cc index a0787610b0..39d0909332 100644 --- a/source/event/src/G4SPSRandomGenerator.cc +++ b/source/event/src/G4SPSRandomGenerator.cc @@ -83,7 +83,7 @@ G4SPSRandomGenerator::G4SPSRandomGenerator() IPDFPosThetaBias = false; PosPhiBias = false; IPDFPosPhiBias = false; - bweights[0] = bweights[1] = bweights[2] = bweights[3] = bweights[4] = bweights[5] = bweights[6] = bweights[7]= 1. ; + bweights[0] = bweights[1] = bweights[2] = bweights[3] = bweights[4] = bweights[5] = bweights[6] = bweights[7]= bweights[8]= 1. ; verbosityLevel = 0 ; } diff --git a/source/event/src/G4ScoreTable.cc b/source/event/src/G4ScoreTable.cc index ce6938905e..bf5a4b0082 100644 --- a/source/event/src/G4ScoreTable.cc +++ b/source/event/src/G4ScoreTable.cc @@ -25,7 +25,7 @@ // // // $Id: G4ScoreTable.cc,v 1.6 2006/06/29 18:10:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/event/src/G4Scorer.cc b/source/event/src/G4Scorer.cc index bffa54908e..dedfeddeec 100644 --- a/source/event/src/G4Scorer.cc +++ b/source/event/src/G4Scorer.cc @@ -25,7 +25,7 @@ // // // $Id: G4Scorer.cc,v 1.2 2006/06/29 18:10:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/event/src/G4StackChecker.cc b/source/event/src/G4StackChecker.cc index cdfba81ef9..8cd6f30184 100644 --- a/source/event/src/G4StackChecker.cc +++ b/source/event/src/G4StackChecker.cc @@ -25,7 +25,7 @@ // // // $Id: G4StackChecker.cc,v 1.2 2006/06/29 18:10:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4StackChecker.hh" diff --git a/source/event/src/G4StackManager.cc b/source/event/src/G4StackManager.cc index 1e8e53741d..41a525a6b2 100644 --- a/source/event/src/G4StackManager.cc +++ b/source/event/src/G4StackManager.cc @@ -25,7 +25,7 @@ // // // $Id: G4StackManager.cc,v 1.10 2006/06/29 18:10:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Last Modification : 09/Dec/96 M.Asai diff --git a/source/event/src/G4StackedTrack.cc b/source/event/src/G4StackedTrack.cc index 6bf685ca2b..23e547dc49 100644 --- a/source/event/src/G4StackedTrack.cc +++ b/source/event/src/G4StackedTrack.cc @@ -25,7 +25,7 @@ // // // $Id: G4StackedTrack.cc,v 1.9 2006/06/29 18:10:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Last Modification : 02/Feb/96 M.Asai diff --git a/source/event/src/G4StackingMessenger.cc b/source/event/src/G4StackingMessenger.cc index e84dd0fc29..5184c45127 100644 --- a/source/event/src/G4StackingMessenger.cc +++ b/source/event/src/G4StackingMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: G4StackingMessenger.cc,v 1.5 2006/06/29 18:10:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- diff --git a/source/event/src/G4TrackStack.cc b/source/event/src/G4TrackStack.cc index 99b3e20cae..d20e8b452d 100644 --- a/source/event/src/G4TrackStack.cc +++ b/source/event/src/G4TrackStack.cc @@ -25,7 +25,7 @@ // // // $Id: G4TrackStack.cc,v 1.6 2006/06/29 18:10:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4TrackStack.hh" diff --git a/source/event/src/G4TrajectoryContainer.cc b/source/event/src/G4TrajectoryContainer.cc index 75103bc5e9..188a03425d 100644 --- a/source/event/src/G4TrajectoryContainer.cc +++ b/source/event/src/G4TrajectoryContainer.cc @@ -25,7 +25,7 @@ // // // $Id: G4TrajectoryContainer.cc,v 1.5 2006/06/29 18:10:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4TrajectoryContainer.hh" diff --git a/source/event/src/G4UserEventAction.cc b/source/event/src/G4UserEventAction.cc index 564ec40a71..8d42d35161 100644 --- a/source/event/src/G4UserEventAction.cc +++ b/source/event/src/G4UserEventAction.cc @@ -25,7 +25,7 @@ // // // $Id: G4UserEventAction.cc,v 1.7 2006/06/29 18:10:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4UserEventAction.hh" diff --git a/source/event/src/G4UserStackingAction.cc b/source/event/src/G4UserStackingAction.cc index 2511c9b522..c836bd665f 100644 --- a/source/event/src/G4UserStackingAction.cc +++ b/source/event/src/G4UserStackingAction.cc @@ -25,7 +25,7 @@ // // // $Id: G4UserStackingAction.cc,v 1.7 2006/06/29 18:10:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4UserStackingAction.hh" diff --git a/source/event/src/G4VPrimaryGenerator.cc b/source/event/src/G4VPrimaryGenerator.cc index 302cfe1239..e288486f34 100644 --- a/source/event/src/G4VPrimaryGenerator.cc +++ b/source/event/src/G4VPrimaryGenerator.cc @@ -25,7 +25,7 @@ // // // $Id: G4VPrimaryGenerator.cc,v 1.5 2006/06/29 18:10:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VPrimaryGenerator diff --git a/source/g3tog4/include/G3DetTable.hh b/source/g3tog4/include/G3DetTable.hh index 8df6d3de59..9b8365d011 100644 --- a/source/g3tog4/include/G3DetTable.hh +++ b/source/g3tog4/include/G3DetTable.hh @@ -25,7 +25,7 @@ // // // $Id: G3DetTable.hh,v 1.9 2006/06/29 18:11:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G3DetTable class diff --git a/source/g3tog4/include/G3DetTableEntry.hh b/source/g3tog4/include/G3DetTableEntry.hh index 3554258b96..bb59101686 100644 --- a/source/g3tog4/include/G3DetTableEntry.hh +++ b/source/g3tog4/include/G3DetTableEntry.hh @@ -25,7 +25,7 @@ // // // $Id: G3DetTableEntry.hh,v 1.6 2006/06/29 18:11:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G3DetTableEntry class diff --git a/source/g3tog4/include/G3Division.hh b/source/g3tog4/include/G3Division.hh index a5956ba786..902ae2b362 100644 --- a/source/g3tog4/include/G3Division.hh +++ b/source/g3tog4/include/G3Division.hh @@ -25,7 +25,7 @@ // // // $Id: G3Division.hh,v 1.8 2006/06/29 18:11:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------- // Class description: diff --git a/source/g3tog4/include/G3EleTable.hh b/source/g3tog4/include/G3EleTable.hh index 687893041e..e4d2affbbb 100644 --- a/source/g3tog4/include/G3EleTable.hh +++ b/source/g3tog4/include/G3EleTable.hh @@ -25,7 +25,7 @@ // // // $Id: G3EleTable.hh,v 1.8 2006/06/29 18:11:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------- // Class description: diff --git a/source/g3tog4/include/G3G4Interface.hh b/source/g3tog4/include/G3G4Interface.hh index ee6ce8c7e4..369d602a94 100644 --- a/source/g3tog4/include/G3G4Interface.hh +++ b/source/g3tog4/include/G3G4Interface.hh @@ -25,7 +25,7 @@ // // // $Id: G3G4Interface.hh,v 1.10 2006/06/29 18:11:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Interfaces for G3 equivalent routines // diff --git a/source/g3tog4/include/G3MatTable.hh b/source/g3tog4/include/G3MatTable.hh index 604e4a1b16..1869c5d362 100644 --- a/source/g3tog4/include/G3MatTable.hh +++ b/source/g3tog4/include/G3MatTable.hh @@ -25,7 +25,7 @@ // // // $Id: G3MatTable.hh,v 1.13 2006/06/29 18:11:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------- // Class description: diff --git a/source/g3tog4/include/G3MatTableEntry.hh b/source/g3tog4/include/G3MatTableEntry.hh index 8af3afdaf2..aca8035351 100644 --- a/source/g3tog4/include/G3MatTableEntry.hh +++ b/source/g3tog4/include/G3MatTableEntry.hh @@ -25,7 +25,7 @@ // // // $Id: G3MatTableEntry.hh,v 1.6 2006/06/29 18:11:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------- // Class description: diff --git a/source/g3tog4/include/G3MedTable.hh b/source/g3tog4/include/G3MedTable.hh index c470f6c179..cac9a93dd8 100644 --- a/source/g3tog4/include/G3MedTable.hh +++ b/source/g3tog4/include/G3MedTable.hh @@ -25,7 +25,7 @@ // // // $Id: G3MedTable.hh,v 1.13 2006/06/29 18:12:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------- // Class description: diff --git a/source/g3tog4/include/G3MedTableEntry.hh b/source/g3tog4/include/G3MedTableEntry.hh index cc85331108..6f4ea76777 100644 --- a/source/g3tog4/include/G3MedTableEntry.hh +++ b/source/g3tog4/include/G3MedTableEntry.hh @@ -25,7 +25,7 @@ // // // $Id: G3MedTableEntry.hh,v 1.6 2006/06/29 18:12:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------- // Class description: diff --git a/source/g3tog4/include/G3PartTable.hh b/source/g3tog4/include/G3PartTable.hh index 8094dbab44..ca49536151 100644 --- a/source/g3tog4/include/G3PartTable.hh +++ b/source/g3tog4/include/G3PartTable.hh @@ -25,7 +25,7 @@ // // // $Id: G3PartTable.hh,v 1.10 2006/06/29 18:12:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------- // Class description: diff --git a/source/g3tog4/include/G3Pos.hh b/source/g3tog4/include/G3Pos.hh index 095617a779..da0b1046ba 100644 --- a/source/g3tog4/include/G3Pos.hh +++ b/source/g3tog4/include/G3Pos.hh @@ -25,7 +25,7 @@ // // // $Id: G3Pos.hh,v 1.11 2006/06/29 18:12:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------- // Class description: diff --git a/source/g3tog4/include/G3RotTable.hh b/source/g3tog4/include/G3RotTable.hh index add659675c..fe712bf088 100644 --- a/source/g3tog4/include/G3RotTable.hh +++ b/source/g3tog4/include/G3RotTable.hh @@ -25,7 +25,7 @@ // // // $Id: G3RotTable.hh,v 1.15 2006/06/29 18:12:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------- // Class description: diff --git a/source/g3tog4/include/G3RotTableEntry.hh b/source/g3tog4/include/G3RotTableEntry.hh index 093ebc37a6..95c560e211 100644 --- a/source/g3tog4/include/G3RotTableEntry.hh +++ b/source/g3tog4/include/G3RotTableEntry.hh @@ -25,7 +25,7 @@ // // // $Id: G3RotTableEntry.hh,v 1.6 2006/06/29 18:12:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------- // Class description: diff --git a/source/g3tog4/include/G3SensVolVector.hh b/source/g3tog4/include/G3SensVolVector.hh index c816aa87de..1d87560987 100644 --- a/source/g3tog4/include/G3SensVolVector.hh +++ b/source/g3tog4/include/G3SensVolVector.hh @@ -25,7 +25,7 @@ // // // $Id: G3SensVolVector.hh,v 1.7 2006/06/29 18:12:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // vector of logical volumes that were defined with // tracking medium with ISVOL=1 diff --git a/source/g3tog4/include/G3VolTable.hh b/source/g3tog4/include/G3VolTable.hh index a62468fbf5..76d6a7b270 100644 --- a/source/g3tog4/include/G3VolTable.hh +++ b/source/g3tog4/include/G3VolTable.hh @@ -25,7 +25,7 @@ // // // $Id: G3VolTable.hh,v 1.18 2006/06/29 18:12:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------- // Class description: diff --git a/source/g3tog4/include/G3VolTableEntry.hh b/source/g3tog4/include/G3VolTableEntry.hh index 0f80e3b639..27afd02876 100644 --- a/source/g3tog4/include/G3VolTableEntry.hh +++ b/source/g3tog4/include/G3VolTableEntry.hh @@ -25,7 +25,7 @@ // // // $Id: G3VolTableEntry.hh,v 1.9 2006/06/29 18:12:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------- // Class description: diff --git a/source/g3tog4/include/G3toG4.hh b/source/g3tog4/include/G3toG4.hh index 081c1718cf..dadf1b0a4b 100644 --- a/source/g3tog4/include/G3toG4.hh +++ b/source/g3tog4/include/G3toG4.hh @@ -25,7 +25,7 @@ // // // $Id: G3toG4.hh,v 1.9 2006/06/29 18:12:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // modified by I.Hrivnacova, 27 Sep 99 diff --git a/source/g3tog4/include/G3toG4.inc b/source/g3tog4/include/G3toG4.inc index fa482361c2..1450d64079 100644 --- a/source/g3tog4/include/G3toG4.inc +++ b/source/g3tog4/include/G3toG4.inc @@ -25,7 +25,7 @@ * * * $Id: G3toG4.inc,v 1.4 2006/06/29 18:12:35 gunter Exp $ -* GEANT4 tag $Name: geant4-08-01 $ +* GEANT4 tag $Name: geant4-08-02 $ * integer maxlines parameter (maxlines = 750) ! max no. of cmd lines per C++ source file diff --git a/source/g3tog4/include/G3toG4BuildTree.hh b/source/g3tog4/include/G3toG4BuildTree.hh index c0db15ea87..97a67f875b 100644 --- a/source/g3tog4/include/G3toG4BuildTree.hh +++ b/source/g3tog4/include/G3toG4BuildTree.hh @@ -25,7 +25,7 @@ // // // $Id: G3toG4BuildTree.hh,v 1.8 2006/06/29 18:12:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------- // Class Description: diff --git a/source/g3tog4/include/G3toG4MANY.hh b/source/g3tog4/include/G3toG4MANY.hh index 4cc91058bc..188d7a9618 100644 --- a/source/g3tog4/include/G3toG4MANY.hh +++ b/source/g3tog4/include/G3toG4MANY.hh @@ -25,7 +25,7 @@ // // // $Id: G3toG4MANY.hh,v 1.3 2006/06/29 18:12:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------- // Class Description: diff --git a/source/g3tog4/include/G3toG4MakeSolid.hh b/source/g3tog4/include/G3toG4MakeSolid.hh index d5674b4a91..a18940c22a 100644 --- a/source/g3tog4/include/G3toG4MakeSolid.hh +++ b/source/g3tog4/include/G3toG4MakeSolid.hh @@ -25,7 +25,7 @@ // // // $Id: G3toG4MakeSolid.hh,v 1.7 2006/06/29 18:12:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------- // Class Description: diff --git a/source/g3tog4/include/G3toG4RotationMatrix.hh b/source/g3tog4/include/G3toG4RotationMatrix.hh index a26948a358..3edc2e4078 100644 --- a/source/g3tog4/include/G3toG4RotationMatrix.hh +++ b/source/g3tog4/include/G3toG4RotationMatrix.hh @@ -25,7 +25,7 @@ // // // $Id: G3toG4RotationMatrix.hh,v 1.6 2006/06/29 18:12:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ---------------------- // Class description: // diff --git a/source/g3tog4/include/gcbank.inc b/source/g3tog4/include/gcbank.inc index df3a6eccef..9fdd6c3eb3 100644 --- a/source/g3tog4/include/gcbank.inc +++ b/source/g3tog4/include/gcbank.inc @@ -25,7 +25,7 @@ * * * $Id: gcbank.inc,v 1.4 2006/06/29 18:12:46 gunter Exp $ -* GEANT4 tag $Name: geant4-08-01 $ +* GEANT4 tag $Name: geant4-08-02 $ * INTEGER IQ,LQ,NZEBRA,IXSTOR,IXDIV,IXCONS,LMAIN,LR1,JCG INTEGER KWBANK,KWWORK,IWS diff --git a/source/g3tog4/src/G3DetTable.cc b/source/g3tog4/src/G3DetTable.cc index 6db016dcbd..8847b41cba 100644 --- a/source/g3tog4/src/G3DetTable.cc +++ b/source/g3tog4/src/G3DetTable.cc @@ -25,7 +25,7 @@ // // // $Id: G3DetTable.cc,v 1.12 2006/06/29 18:12:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "globals.hh" #include "G3DetTable.hh" diff --git a/source/g3tog4/src/G3DetTableEntry.cc b/source/g3tog4/src/G3DetTableEntry.cc index 1bff669ee3..d3ab96ee60 100644 --- a/source/g3tog4/src/G3DetTableEntry.cc +++ b/source/g3tog4/src/G3DetTableEntry.cc @@ -25,7 +25,7 @@ // // // $Id: G3DetTableEntry.cc,v 1.5 2006/06/29 18:12:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "globals.hh" #include "G3DetTableEntry.hh" diff --git a/source/g3tog4/src/G3Division.cc b/source/g3tog4/src/G3Division.cc index 5fa693ab56..548bf6a5d2 100644 --- a/source/g3tog4/src/G3Division.cc +++ b/source/g3tog4/src/G3Division.cc @@ -25,7 +25,7 @@ // // // $Id: G3Division.cc,v 1.17 2006/06/29 18:12:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by I.Hrivnacova, V.Berejnoi 13.10.99 diff --git a/source/g3tog4/src/G3EleTable.cc b/source/g3tog4/src/G3EleTable.cc index 2b78a75eeb..fe7046c8e3 100644 --- a/source/g3tog4/src/G3EleTable.cc +++ b/source/g3tog4/src/G3EleTable.cc @@ -25,7 +25,7 @@ // // // $Id: G3EleTable.cc,v 1.16 2006/06/29 18:12:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4Types.hh" diff --git a/source/g3tog4/src/G3MatTable.cc b/source/g3tog4/src/G3MatTable.cc index 209bce271e..b8b520aa63 100644 --- a/source/g3tog4/src/G3MatTable.cc +++ b/source/g3tog4/src/G3MatTable.cc @@ -25,7 +25,7 @@ // // // $Id: G3MatTable.cc,v 1.16 2006/06/29 18:12:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by I.Hrivnacova, 27 Sep 99 diff --git a/source/g3tog4/src/G3MatTableEntry.cc b/source/g3tog4/src/G3MatTableEntry.cc index 81ea6bc78d..90e6f96ef2 100644 --- a/source/g3tog4/src/G3MatTableEntry.cc +++ b/source/g3tog4/src/G3MatTableEntry.cc @@ -25,7 +25,7 @@ // // // $Id: G3MatTableEntry.cc,v 1.4 2006/06/29 18:13:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by I.Hrivnacova, 27 Sep 99 diff --git a/source/g3tog4/src/G3MedTable.cc b/source/g3tog4/src/G3MedTable.cc index 34d7f8a450..c0c391e8f9 100644 --- a/source/g3tog4/src/G3MedTable.cc +++ b/source/g3tog4/src/G3MedTable.cc @@ -25,7 +25,7 @@ // // // $Id: G3MedTable.cc,v 1.15 2006/06/29 18:13:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by I.Hrivnacova, 27 Sep 99 diff --git a/source/g3tog4/src/G3MedTableEntry.cc b/source/g3tog4/src/G3MedTableEntry.cc index 80b09eb2b4..d79fea3c82 100644 --- a/source/g3tog4/src/G3MedTableEntry.cc +++ b/source/g3tog4/src/G3MedTableEntry.cc @@ -25,7 +25,7 @@ // // // $Id: G3MedTableEntry.cc,v 1.4 2006/06/29 18:13:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by I.Hrivnacova, 27 Sep 99 diff --git a/source/g3tog4/src/G3NegVolPars.cc b/source/g3tog4/src/G3NegVolPars.cc index b12d8993ae..5c63610300 100644 --- a/source/g3tog4/src/G3NegVolPars.cc +++ b/source/g3tog4/src/G3NegVolPars.cc @@ -25,7 +25,7 @@ // // // $Id: G3NegVolPars.cc,v 1.13 2006/06/29 18:13:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // modified by I. Hrivnacova, 13.10.99 diff --git a/source/g3tog4/src/G3PartTable.cc b/source/g3tog4/src/G3PartTable.cc index 931175b9ad..b4c7395267 100644 --- a/source/g3tog4/src/G3PartTable.cc +++ b/source/g3tog4/src/G3PartTable.cc @@ -25,7 +25,7 @@ // // // $Id: G3PartTable.cc,v 1.14 2006/06/29 18:13:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4Types.hh" diff --git a/source/g3tog4/src/G3Pos.cc b/source/g3tog4/src/G3Pos.cc index 24e7aa40c5..131a4223cd 100644 --- a/source/g3tog4/src/G3Pos.cc +++ b/source/g3tog4/src/G3Pos.cc @@ -25,7 +25,7 @@ // // // $Id: G3Pos.cc,v 1.9 2006/06/29 18:13:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // modified by I.Hrivnacova, 13.10.99 diff --git a/source/g3tog4/src/G3RotTable.cc b/source/g3tog4/src/G3RotTable.cc index 2487532c37..7473685a5e 100644 --- a/source/g3tog4/src/G3RotTable.cc +++ b/source/g3tog4/src/G3RotTable.cc @@ -25,7 +25,7 @@ // // // $Id: G3RotTable.cc,v 1.16 2006/06/29 18:13:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by I.Hrivnacova, 27 Sep 99 diff --git a/source/g3tog4/src/G3RotTableEntry.cc b/source/g3tog4/src/G3RotTableEntry.cc index 6ac77c30b0..4bfddc18a3 100644 --- a/source/g3tog4/src/G3RotTableEntry.cc +++ b/source/g3tog4/src/G3RotTableEntry.cc @@ -25,7 +25,7 @@ // // // $Id: G3RotTableEntry.cc,v 1.4 2006/06/29 18:13:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by I.Hrivnacova, 27 Sep 99 diff --git a/source/g3tog4/src/G3VolTable.cc b/source/g3tog4/src/G3VolTable.cc index c0b8cb081d..b97cf51806 100644 --- a/source/g3tog4/src/G3VolTable.cc +++ b/source/g3tog4/src/G3VolTable.cc @@ -25,7 +25,7 @@ // // // $Id: G3VolTable.cc,v 1.22 2006/06/29 18:13:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // modified by I.Hrivnacova, 13.10.99 diff --git a/source/g3tog4/src/G3VolTableEntry.cc b/source/g3tog4/src/G3VolTableEntry.cc index ccad522306..75ac3f7992 100644 --- a/source/g3tog4/src/G3VolTableEntry.cc +++ b/source/g3tog4/src/G3VolTableEntry.cc @@ -25,7 +25,7 @@ // // // $Id: G3VolTableEntry.cc,v 1.12 2006/06/29 18:13:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // modified by I.Hrivnacova, 13.10.99 diff --git a/source/g3tog4/src/G3fillParams.cc.archive b/source/g3tog4/src/G3fillParams.cc.archive index c60ff58324..7e5bf56299 100644 --- a/source/g3tog4/src/G3fillParams.cc.archive +++ b/source/g3tog4/src/G3fillParams.cc.archive @@ -6,7 +6,7 @@ // and all its terms. // // $Id: G3fillParams.cc.archive,v 1.2 2003/06/16 16:50:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // extracted from clparse.cc by I. Hrivnacova, 30.7.99 diff --git a/source/g3tog4/src/G3toG4BuildTree.cc b/source/g3tog4/src/G3toG4BuildTree.cc index 3702a44fd3..99352f8066 100644 --- a/source/g3tog4/src/G3toG4BuildTree.cc +++ b/source/g3tog4/src/G3toG4BuildTree.cc @@ -25,7 +25,7 @@ // // // $Id: G3toG4BuildTree.cc,v 1.20 2006/06/29 18:13:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // modified by I. Hrivnacova, 2.8.99 diff --git a/source/g3tog4/src/G3toG4MANY.cc b/source/g3tog4/src/G3toG4MANY.cc index 4d2c2cd12a..8b657f9027 100644 --- a/source/g3tog4/src/G3toG4MANY.cc +++ b/source/g3tog4/src/G3toG4MANY.cc @@ -25,7 +25,7 @@ // // // $Id: G3toG4MANY.cc,v 1.2 2006/06/29 18:13:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // By I. Hrivnacova, 22.10.01 diff --git a/source/g3tog4/src/G3toG4MakeSolid.cc b/source/g3tog4/src/G3toG4MakeSolid.cc index 17fcf9b1a8..28b131216f 100644 --- a/source/g3tog4/src/G3toG4MakeSolid.cc +++ b/source/g3tog4/src/G3toG4MakeSolid.cc @@ -25,7 +25,7 @@ // // // $Id: G3toG4MakeSolid.cc,v 1.10 2006/06/29 18:13:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // modified by I.Hrivnacova, V.Berejnoi 27 Sep 99 diff --git a/source/g3tog4/src/G3toG4RotationMatrix.cc b/source/g3tog4/src/G3toG4RotationMatrix.cc index 2a748e388f..d2e307f4fb 100644 --- a/source/g3tog4/src/G3toG4RotationMatrix.cc +++ b/source/g3tog4/src/G3toG4RotationMatrix.cc @@ -25,7 +25,7 @@ // // // $Id: G3toG4RotationMatrix.cc,v 1.4 2006/06/29 18:13:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G3toG4RotationMatrix.hh" diff --git a/source/g3tog4/src/G4BuildGeom.cc b/source/g3tog4/src/G4BuildGeom.cc index 3c58a53f15..20ce2f8fd9 100644 --- a/source/g3tog4/src/G4BuildGeom.cc +++ b/source/g3tog4/src/G4BuildGeom.cc @@ -25,7 +25,7 @@ // // // $Id: G4BuildGeom.cc,v 1.17 2006/06/29 18:13:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // modified by I. Hrivnacova, 13.10.99 diff --git a/source/g3tog4/src/G4ggclos.cc b/source/g3tog4/src/G4ggclos.cc index 027607c06d..8975de74ac 100644 --- a/source/g3tog4/src/G4ggclos.cc +++ b/source/g3tog4/src/G4ggclos.cc @@ -25,7 +25,7 @@ // // // $Id: G4ggclos.cc,v 1.8 2006/06/29 18:13:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G3toG4.hh" #include "G3VolTable.hh" diff --git a/source/g3tog4/src/G4gsatt.cc b/source/g3tog4/src/G4gsatt.cc index 6becb1e120..64a493b207 100644 --- a/source/g3tog4/src/G4gsatt.cc +++ b/source/g3tog4/src/G4gsatt.cc @@ -25,7 +25,7 @@ // // // $Id: G4gsatt.cc,v 1.13 2006/06/29 18:13:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "globals.hh" #include "G3toG4.hh" diff --git a/source/g3tog4/src/G4gsbool.cc b/source/g3tog4/src/G4gsbool.cc index 20bc2a6543..b470ce4ae3 100644 --- a/source/g3tog4/src/G4gsbool.cc +++ b/source/g3tog4/src/G4gsbool.cc @@ -25,7 +25,7 @@ // // // $Id: G4gsbool.cc,v 1.2 2006/06/29 18:13:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by I.Hrivnacova, 13.10.01 diff --git a/source/g3tog4/src/G4gsdet.cc b/source/g3tog4/src/G4gsdet.cc index ade9305ac2..e9d5068509 100644 --- a/source/g3tog4/src/G4gsdet.cc +++ b/source/g3tog4/src/G4gsdet.cc @@ -25,7 +25,7 @@ // // // $Id: G4gsdet.cc,v 1.5 2006/06/29 18:13:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "globals.hh" #include "G3toG4.hh" diff --git a/source/g3tog4/src/G4gsdeta.cc b/source/g3tog4/src/G4gsdeta.cc index cc58e81353..6b9f97b22e 100644 --- a/source/g3tog4/src/G4gsdeta.cc +++ b/source/g3tog4/src/G4gsdeta.cc @@ -25,7 +25,7 @@ // // // $Id: G4gsdeta.cc,v 1.6 2006/06/29 18:13:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // modified by I.Hrivnacova, 6 Oct 99 diff --git a/source/g3tog4/src/G4gsdetd.cc b/source/g3tog4/src/G4gsdetd.cc index 11cb6c95ad..5a41f6ee2f 100644 --- a/source/g3tog4/src/G4gsdetd.cc +++ b/source/g3tog4/src/G4gsdetd.cc @@ -25,7 +25,7 @@ // // // $Id: G4gsdetd.cc,v 1.8 2006/06/29 18:13:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G3toG4.hh" #include "G3DetTable.hh" diff --git a/source/g3tog4/src/G4gsdeth.cc b/source/g3tog4/src/G4gsdeth.cc index 864900c19c..e912dae61a 100644 --- a/source/g3tog4/src/G4gsdeth.cc +++ b/source/g3tog4/src/G4gsdeth.cc @@ -25,7 +25,7 @@ // // // $Id: G4gsdeth.cc,v 1.8 2006/06/29 18:13:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G3toG4.hh" #include "G3DetTable.hh" diff --git a/source/g3tog4/src/G4gsdetu.cc b/source/g3tog4/src/G4gsdetu.cc index b1bc296b29..f746bd623b 100644 --- a/source/g3tog4/src/G4gsdetu.cc +++ b/source/g3tog4/src/G4gsdetu.cc @@ -25,7 +25,7 @@ // // // $Id: G4gsdetu.cc,v 1.6 2006/06/29 18:13:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G3toG4.hh" diff --git a/source/g3tog4/src/G4gsdetv.cc b/source/g3tog4/src/G4gsdetv.cc index c6dcb0497d..c509d940dd 100644 --- a/source/g3tog4/src/G4gsdetv.cc +++ b/source/g3tog4/src/G4gsdetv.cc @@ -25,7 +25,7 @@ // // // $Id: G4gsdetv.cc,v 1.10 2006/06/29 18:13:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4ios.hh" #include "G3toG4.hh" diff --git a/source/g3tog4/src/G4gsdk.cc b/source/g3tog4/src/G4gsdk.cc index 098c325b9b..9cd81224a9 100644 --- a/source/g3tog4/src/G4gsdk.cc +++ b/source/g3tog4/src/G4gsdk.cc @@ -25,7 +25,7 @@ // // // $Id: G4gsdk.cc,v 1.7 2006/06/29 18:13:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4Decay.hh" #include "G3toG4.hh" diff --git a/source/g3tog4/src/G4gsdvn.cc b/source/g3tog4/src/G4gsdvn.cc index 960db4c3b4..7b075a2f71 100644 --- a/source/g3tog4/src/G4gsdvn.cc +++ b/source/g3tog4/src/G4gsdvn.cc @@ -25,7 +25,7 @@ // // // $Id: G4gsdvn.cc,v 1.10 2006/06/29 18:13:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by I.Hrivnacova, V.Berejnoi, 29 Oct 99 diff --git a/source/g3tog4/src/G4gsdvn2.cc b/source/g3tog4/src/G4gsdvn2.cc index 1e37614722..827fb97fbd 100644 --- a/source/g3tog4/src/G4gsdvn2.cc +++ b/source/g3tog4/src/G4gsdvn2.cc @@ -25,7 +25,7 @@ // // // $Id: G4gsdvn2.cc,v 1.8 2006/06/29 18:14:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by I.Hrivnacova, V.Berejnoi, 29 Oct 99 diff --git a/source/g3tog4/src/G4gsdvt.cc b/source/g3tog4/src/G4gsdvt.cc index db627044cd..30fd981418 100644 --- a/source/g3tog4/src/G4gsdvt.cc +++ b/source/g3tog4/src/G4gsdvt.cc @@ -25,7 +25,7 @@ // // // $Id: G4gsdvt.cc,v 1.7 2006/06/29 18:14:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by I.Hrivnacova, V.Berejnoi, 29 Oct 99 diff --git a/source/g3tog4/src/G4gsdvt2.cc b/source/g3tog4/src/G4gsdvt2.cc index 50df3827bf..47af3fc73d 100644 --- a/source/g3tog4/src/G4gsdvt2.cc +++ b/source/g3tog4/src/G4gsdvt2.cc @@ -25,7 +25,7 @@ // // // $Id: G4gsdvt2.cc,v 1.7 2006/06/29 18:14:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by I.Hrivnacova, V.Berejnoi, 29 Oct 99 diff --git a/source/g3tog4/src/G4gsdvx.cc b/source/g3tog4/src/G4gsdvx.cc index 5a6f6cc699..503415b9b1 100644 --- a/source/g3tog4/src/G4gsdvx.cc +++ b/source/g3tog4/src/G4gsdvx.cc @@ -25,7 +25,7 @@ // // // $Id: G4gsdvx.cc,v 1.5 2006/06/29 18:14:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by I.Hrivnacova, V.Berejnoi, 27 Sep 99 diff --git a/source/g3tog4/src/G4gsmate.cc b/source/g3tog4/src/G4gsmate.cc index bd2c8975fa..45bfe59c1f 100644 --- a/source/g3tog4/src/G4gsmate.cc +++ b/source/g3tog4/src/G4gsmate.cc @@ -25,7 +25,7 @@ // // // $Id: G4gsmate.cc,v 1.12 2006/06/29 18:14:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by I.Hrivnacova, 27 Sep 99 diff --git a/source/g3tog4/src/G4gsmixt.cc b/source/g3tog4/src/G4gsmixt.cc index 74b32f1b3f..67541e9c20 100644 --- a/source/g3tog4/src/G4gsmixt.cc +++ b/source/g3tog4/src/G4gsmixt.cc @@ -25,7 +25,7 @@ // // // $Id: G4gsmixt.cc,v 1.13 2006/06/29 18:14:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by I.Hrivnacova, 27 Sep 99 diff --git a/source/g3tog4/src/G4gspart.cc b/source/g3tog4/src/G4gspart.cc index 619c1ee7a7..b4babd7714 100644 --- a/source/g3tog4/src/G4gspart.cc +++ b/source/g3tog4/src/G4gspart.cc @@ -25,7 +25,7 @@ // // // $Id: G4gspart.cc,v 1.7 2006/06/29 18:14:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4ProcessManager.hh" #include "G3toG4.hh" diff --git a/source/g3tog4/src/G4gspos.cc b/source/g3tog4/src/G4gspos.cc index 1ec2c880bb..322f938357 100644 --- a/source/g3tog4/src/G4gspos.cc +++ b/source/g3tog4/src/G4gspos.cc @@ -25,7 +25,7 @@ // // // $Id: G4gspos.cc,v 1.13 2006/06/29 18:14:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by I.Hrivnacova, 13.10.99 diff --git a/source/g3tog4/src/G4gsposp.cc b/source/g3tog4/src/G4gsposp.cc index cc77d68bba..37bc388874 100644 --- a/source/g3tog4/src/G4gsposp.cc +++ b/source/g3tog4/src/G4gsposp.cc @@ -25,7 +25,7 @@ // // // $Id: G4gsposp.cc,v 1.16 2006/06/29 18:14:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by I.Hrivnacova, 13.10.99 diff --git a/source/g3tog4/src/G4gsrotm.cc b/source/g3tog4/src/G4gsrotm.cc index 2620cbbc5a..cfe3a03f4d 100644 --- a/source/g3tog4/src/G4gsrotm.cc +++ b/source/g3tog4/src/G4gsrotm.cc @@ -25,7 +25,7 @@ // // // $Id: G4gsrotm.cc,v 1.12 2006/06/29 18:14:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G3toG4.hh" #include "G3RotTable.hh" diff --git a/source/g3tog4/src/G4gstmed.cc b/source/g3tog4/src/G4gstmed.cc index 53cc8bfa2d..0e9dfa1aa6 100644 --- a/source/g3tog4/src/G4gstmed.cc +++ b/source/g3tog4/src/G4gstmed.cc @@ -25,7 +25,7 @@ // // // $Id: G4gstmed.cc,v 1.7 2006/06/29 18:15:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // The last G4int argument of G4gstmed(..) is used for sending // info whether the Geant3 tracking medium parameters should diff --git a/source/g3tog4/src/G4gstpar.cc b/source/g3tog4/src/G4gstpar.cc index 134a3d9edc..190d89689b 100644 --- a/source/g3tog4/src/G4gstpar.cc +++ b/source/g3tog4/src/G4gstpar.cc @@ -25,7 +25,7 @@ // // // $Id: G4gstpar.cc,v 1.8 2006/06/29 18:15:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G3toG4.hh" #include "G3VolTable.hh" diff --git a/source/g3tog4/src/G4gsvolu.cc b/source/g3tog4/src/G4gsvolu.cc index 9b0c527954..30212470b1 100644 --- a/source/g3tog4/src/G4gsvolu.cc +++ b/source/g3tog4/src/G4gsvolu.cc @@ -25,7 +25,7 @@ // // // $Id: G4gsvolu.cc,v 1.10 2006/06/29 18:15:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by I.Hrivnacova, 13.10.99 diff --git a/source/g3tog4/src/clparse.cc b/source/g3tog4/src/clparse.cc index c62eb42775..076515be0b 100644 --- a/source/g3tog4/src/clparse.cc +++ b/source/g3tog4/src/clparse.cc @@ -25,7 +25,7 @@ // // // $Id: clparse.cc,v 1.18 2006/06/29 18:15:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // modified by I.Hrivnacova // added G3SensVol diff --git a/source/g3tog4/src/g3routines.F b/source/g3tog4/src/g3routines.F index 7d4ba58905..4614a688f4 100644 --- a/source/g3tog4/src/g3routines.F +++ b/source/g3tog4/src/g3routines.F @@ -25,7 +25,7 @@ * * * $Id: g3routines.F,v 1.5 2006/06/29 18:15:10 gunter Exp $ -* GEANT4 tag $Name: geant4-08-01 $ +* GEANT4 tag $Name: geant4-08-02 $ * #define CALL_GEANT diff --git a/source/g3tog4/src/g3test.F.main b/source/g3tog4/src/g3test.F.main index a1657f2b7e..2a308ba345 100644 --- a/source/g3tog4/src/g3test.F.main +++ b/source/g3tog4/src/g3test.F.main @@ -6,7 +6,7 @@ * and all its terms. * * $Id: g3test.F.main,v 1.2 1999/12/05 17:50:16 gcosmo Exp $ -* GEANT4 tag $Name: geant4-08-01 $ +* GEANT4 tag $Name: geant4-08-02 $ * * * g3test diff --git a/source/g3tog4/src/g3tog4.F b/source/g3tog4/src/g3tog4.F index 34e78d648f..2527946f42 100644 --- a/source/g3tog4/src/g3tog4.F +++ b/source/g3tog4/src/g3tog4.F @@ -25,7 +25,7 @@ * * * $Id: g3tog4.F,v 1.5 2006/06/29 18:15:12 gunter Exp $ -* GEANT4 tag $Name: geant4-08-01 $ +* GEANT4 tag $Name: geant4-08-02 $ * * * G3toG4 diff --git a/source/g3tog4/src/g4geom.cc.main b/source/g3tog4/src/g4geom.cc.main index a65df15e16..ba5e25a505 100644 --- a/source/g3tog4/src/g4geom.cc.main +++ b/source/g3tog4/src/g4geom.cc.main @@ -6,7 +6,7 @@ // and all its terms. // // $Id: g4geom.cc.main,v 1.2 1999/12/05 17:50:17 gcosmo Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // g4geom // diff --git a/source/g3tog4/src/jshape.F b/source/g3tog4/src/jshape.F index 38b8efc6ab..9c9807dc16 100644 --- a/source/g3tog4/src/jshape.F +++ b/source/g3tog4/src/jshape.F @@ -25,7 +25,7 @@ * * * $Id: jshape.F,v 1.4 2006/06/29 18:15:14 gunter Exp $ -* GEANT4 tag $Name: geant4-08-01 $ +* GEANT4 tag $Name: geant4-08-02 $ * * *-- Author : Jouko Vuoskoski, CERN, Jouko.Vuoskoski@cern.ch diff --git a/source/g3tog4/src/mztog4.F b/source/g3tog4/src/mztog4.F index 9833cf71ad..6394021095 100644 --- a/source/g3tog4/src/mztog4.F +++ b/source/g3tog4/src/mztog4.F @@ -25,7 +25,7 @@ * * * $Id: mztog4.F,v 1.4 2006/06/29 18:15:16 gunter Exp $ -* GEANT4 tag $Name: geant4-08-01 $ +* GEANT4 tag $Name: geant4-08-02 $ * subroutine mztog4 ************************************************************************ diff --git a/source/g3tog4/src/rztog4.F b/source/g3tog4/src/rztog4.F index f2ec001bd8..194cddde9d 100644 --- a/source/g3tog4/src/rztog4.F +++ b/source/g3tog4/src/rztog4.F @@ -25,7 +25,7 @@ * * * $Id: rztog4.F,v 1.4 2006/06/29 18:15:18 gunter Exp $ -* GEANT4 tag $Name: geant4-08-01 $ +* GEANT4 tag $Name: geant4-08-02 $ * program rztog4 ************************************************************************ diff --git a/source/g3tog4/src/tog4.F b/source/g3tog4/src/tog4.F index 74d6324944..77575107c6 100644 --- a/source/g3tog4/src/tog4.F +++ b/source/g3tog4/src/tog4.F @@ -25,7 +25,7 @@ * * * $Id: tog4.F,v 1.5 2006/06/29 18:15:21 gunter Exp $ -* GEANT4 tag $Name: geant4-08-01 $ +* GEANT4 tag $Name: geant4-08-02 $ * subroutine tog4 ************************************************************************ diff --git a/source/geometry/biasing/include/G4GeometryCell.hh b/source/geometry/biasing/include/G4GeometryCell.hh index bd0dbabbde..cf6c07746d 100644 --- a/source/geometry/biasing/include/G4GeometryCell.hh +++ b/source/geometry/biasing/include/G4GeometryCell.hh @@ -25,7 +25,7 @@ // // // $Id: G4GeometryCell.hh,v 1.6 2006/06/29 18:15:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4GeometryCell diff --git a/source/geometry/biasing/include/G4GeometryCellComp.hh b/source/geometry/biasing/include/G4GeometryCellComp.hh index 002ac45ed1..264bc8af5d 100644 --- a/source/geometry/biasing/include/G4GeometryCellComp.hh +++ b/source/geometry/biasing/include/G4GeometryCellComp.hh @@ -25,7 +25,7 @@ // // // $Id: G4GeometryCellComp.hh,v 1.2 2006/06/29 18:15:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4GeometryCellComp diff --git a/source/geometry/biasing/include/G4GeometryCellImportance.hh b/source/geometry/biasing/include/G4GeometryCellImportance.hh index e719a2de68..4c06be2c79 100644 --- a/source/geometry/biasing/include/G4GeometryCellImportance.hh +++ b/source/geometry/biasing/include/G4GeometryCellImportance.hh @@ -25,7 +25,7 @@ // // // $Id: G4GeometryCellImportance.hh,v 1.4 2006/06/29 18:15:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4GeometryCellImportance diff --git a/source/geometry/biasing/include/G4GeometryCellStep.hh b/source/geometry/biasing/include/G4GeometryCellStep.hh index 6877cce133..ff51702b9c 100644 --- a/source/geometry/biasing/include/G4GeometryCellStep.hh +++ b/source/geometry/biasing/include/G4GeometryCellStep.hh @@ -25,7 +25,7 @@ // // // $Id: G4GeometryCellStep.hh,v 1.2 2006/06/29 18:15:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4GeometryCellStep diff --git a/source/geometry/biasing/include/G4GeometryCellStepStream.hh b/source/geometry/biasing/include/G4GeometryCellStepStream.hh index 30478c1373..820e0bf3f7 100644 --- a/source/geometry/biasing/include/G4GeometryCellStepStream.hh +++ b/source/geometry/biasing/include/G4GeometryCellStepStream.hh @@ -25,7 +25,7 @@ // // // $Id: G4GeometryCellStepStream.hh,v 1.3 2006/06/29 18:15:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Declarations diff --git a/source/geometry/biasing/include/G4GeometryCellWeight.hh b/source/geometry/biasing/include/G4GeometryCellWeight.hh index 3f58e823b8..8640c03e71 100644 --- a/source/geometry/biasing/include/G4GeometryCellWeight.hh +++ b/source/geometry/biasing/include/G4GeometryCellWeight.hh @@ -25,7 +25,7 @@ // // // $Id: G4GeometryCellWeight.hh,v 1.3 2006/06/29 18:16:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4GeometryCellWeight diff --git a/source/geometry/biasing/include/G4IStore.hh b/source/geometry/biasing/include/G4IStore.hh index 58ab2aa442..6917ad40bb 100644 --- a/source/geometry/biasing/include/G4IStore.hh +++ b/source/geometry/biasing/include/G4IStore.hh @@ -25,7 +25,7 @@ // // // $Id: G4IStore.hh,v 1.10 2006/06/29 18:16:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4IStore diff --git a/source/geometry/biasing/include/G4ImportanceAlgorithm.hh b/source/geometry/biasing/include/G4ImportanceAlgorithm.hh index 757ae843ff..5f21384d9a 100644 --- a/source/geometry/biasing/include/G4ImportanceAlgorithm.hh +++ b/source/geometry/biasing/include/G4ImportanceAlgorithm.hh @@ -25,7 +25,7 @@ // // // $Id: G4ImportanceAlgorithm.hh,v 1.7 2006/06/29 18:16:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4ImportanceAlgorithm diff --git a/source/geometry/biasing/include/G4ImportanceSplitExaminer.hh b/source/geometry/biasing/include/G4ImportanceSplitExaminer.hh index 52b8695f55..96edbf36f7 100644 --- a/source/geometry/biasing/include/G4ImportanceSplitExaminer.hh +++ b/source/geometry/biasing/include/G4ImportanceSplitExaminer.hh @@ -25,7 +25,7 @@ // // // $Id: G4ImportanceSplitExaminer.hh,v 1.8 2006/06/29 18:16:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4ImportanceSplitExaminer diff --git a/source/geometry/biasing/include/G4Nsplit_Weight.hh b/source/geometry/biasing/include/G4Nsplit_Weight.hh index 853cd137e6..9d842e365e 100644 --- a/source/geometry/biasing/include/G4Nsplit_Weight.hh +++ b/source/geometry/biasing/include/G4Nsplit_Weight.hh @@ -25,7 +25,7 @@ // // // $Id: G4Nsplit_Weight.hh,v 1.11 2006/06/29 18:16:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4Nsplit_Weight diff --git a/source/geometry/biasing/include/G4ParallelNavigator.hh b/source/geometry/biasing/include/G4ParallelNavigator.hh index be75a8fd6a..bd7ed662f6 100644 --- a/source/geometry/biasing/include/G4ParallelNavigator.hh +++ b/source/geometry/biasing/include/G4ParallelNavigator.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParallelNavigator.hh,v 1.10 2006/06/29 18:16:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4ParallelNavigator diff --git a/source/geometry/biasing/include/G4ParallelStepper.hh b/source/geometry/biasing/include/G4ParallelStepper.hh index 6c81b6e0f9..36dc6aea09 100644 --- a/source/geometry/biasing/include/G4ParallelStepper.hh +++ b/source/geometry/biasing/include/G4ParallelStepper.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParallelStepper.hh,v 1.7 2006/06/29 18:16:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4ParallelStepper diff --git a/source/geometry/biasing/include/G4ParallelWorld.hh b/source/geometry/biasing/include/G4ParallelWorld.hh index 2b83b504bf..aa6e8aff5d 100644 --- a/source/geometry/biasing/include/G4ParallelWorld.hh +++ b/source/geometry/biasing/include/G4ParallelWorld.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParallelWorld.hh,v 1.7 2006/06/29 18:16:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4ParallelWorld diff --git a/source/geometry/biasing/include/G4VCellScorer.hh b/source/geometry/biasing/include/G4VCellScorer.hh index b5d89c6fcd..761e7400cd 100644 --- a/source/geometry/biasing/include/G4VCellScorer.hh +++ b/source/geometry/biasing/include/G4VCellScorer.hh @@ -25,7 +25,7 @@ // // // $Id: G4VCellScorer.hh,v 1.7 2006/06/29 18:16:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4VCellScorer diff --git a/source/geometry/biasing/include/G4VCellScorerStore.hh b/source/geometry/biasing/include/G4VCellScorerStore.hh index 15a646b061..10274431dc 100644 --- a/source/geometry/biasing/include/G4VCellScorerStore.hh +++ b/source/geometry/biasing/include/G4VCellScorerStore.hh @@ -25,7 +25,7 @@ // // // $Id: G4VCellScorerStore.hh,v 1.7 2006/06/29 18:16:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4VCellScorerStore diff --git a/source/geometry/biasing/include/G4VGCellFinder.hh b/source/geometry/biasing/include/G4VGCellFinder.hh index 7c53026c19..d872ada3c1 100644 --- a/source/geometry/biasing/include/G4VGCellFinder.hh +++ b/source/geometry/biasing/include/G4VGCellFinder.hh @@ -25,7 +25,7 @@ // // // $Id: G4VGCellFinder.hh,v 1.2 2006/06/29 18:16:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4VGCellFinder diff --git a/source/geometry/biasing/include/G4VIStore.hh b/source/geometry/biasing/include/G4VIStore.hh index 91144f15e0..75b0a1eeee 100644 --- a/source/geometry/biasing/include/G4VIStore.hh +++ b/source/geometry/biasing/include/G4VIStore.hh @@ -25,7 +25,7 @@ // // // $Id: G4VIStore.hh,v 1.9 2006/06/29 18:16:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4VIStore diff --git a/source/geometry/biasing/include/G4VImportanceAlgorithm.hh b/source/geometry/biasing/include/G4VImportanceAlgorithm.hh index dc6a55b9b4..2efc907fce 100644 --- a/source/geometry/biasing/include/G4VImportanceAlgorithm.hh +++ b/source/geometry/biasing/include/G4VImportanceAlgorithm.hh @@ -25,7 +25,7 @@ // // // $Id: G4VImportanceAlgorithm.hh,v 1.8 2006/06/29 18:16:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4VImportanceAlgorithm diff --git a/source/geometry/biasing/include/G4VImportanceSplitExaminer.hh b/source/geometry/biasing/include/G4VImportanceSplitExaminer.hh index 9203a0c695..2f0c08156f 100644 --- a/source/geometry/biasing/include/G4VImportanceSplitExaminer.hh +++ b/source/geometry/biasing/include/G4VImportanceSplitExaminer.hh @@ -25,7 +25,7 @@ // // // $Id: G4VImportanceSplitExaminer.hh,v 1.5 2006/06/29 18:16:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4VImportanceSplitExaminer diff --git a/source/geometry/biasing/include/G4VPGeoDriver.hh b/source/geometry/biasing/include/G4VPGeoDriver.hh index 7e77c901bd..014448eea1 100644 --- a/source/geometry/biasing/include/G4VPGeoDriver.hh +++ b/source/geometry/biasing/include/G4VPGeoDriver.hh @@ -25,7 +25,7 @@ // // // $Id: G4VPGeoDriver.hh,v 1.7 2006/06/29 18:16:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4VPGeoDriver diff --git a/source/geometry/biasing/include/G4VParallelStepper.hh b/source/geometry/biasing/include/G4VParallelStepper.hh index 56378e3a8e..989ec67ffe 100644 --- a/source/geometry/biasing/include/G4VParallelStepper.hh +++ b/source/geometry/biasing/include/G4VParallelStepper.hh @@ -25,7 +25,7 @@ // // // $Id: G4VParallelStepper.hh,v 1.8 2006/06/29 18:16:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4VParallelStepper diff --git a/source/geometry/biasing/include/G4VScorer.hh b/source/geometry/biasing/include/G4VScorer.hh index be3e19fe56..d03f82664b 100644 --- a/source/geometry/biasing/include/G4VScorer.hh +++ b/source/geometry/biasing/include/G4VScorer.hh @@ -25,7 +25,7 @@ // // // $Id: G4VScorer.hh,v 1.2 2006/06/29 18:16:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4VScorer diff --git a/source/geometry/biasing/include/G4VWeightWindowAlgorithm.hh b/source/geometry/biasing/include/G4VWeightWindowAlgorithm.hh index 50c88a2aac..cab1aec54e 100644 --- a/source/geometry/biasing/include/G4VWeightWindowAlgorithm.hh +++ b/source/geometry/biasing/include/G4VWeightWindowAlgorithm.hh @@ -25,7 +25,7 @@ // // // $Id: G4VWeightWindowAlgorithm.hh,v 1.8 2006/06/29 18:16:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4VWeightWindowAlgorithm diff --git a/source/geometry/biasing/include/G4VWeightWindowExaminer.hh b/source/geometry/biasing/include/G4VWeightWindowExaminer.hh index a91262cf41..db66cfb53e 100644 --- a/source/geometry/biasing/include/G4VWeightWindowExaminer.hh +++ b/source/geometry/biasing/include/G4VWeightWindowExaminer.hh @@ -25,7 +25,7 @@ // // // $Id: G4VWeightWindowExaminer.hh,v 1.3 2006/06/29 18:16:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4VWeightWindowExaminer diff --git a/source/geometry/biasing/include/G4VWeightWindowStore.hh b/source/geometry/biasing/include/G4VWeightWindowStore.hh index d7a562fb65..95b696b05c 100644 --- a/source/geometry/biasing/include/G4VWeightWindowStore.hh +++ b/source/geometry/biasing/include/G4VWeightWindowStore.hh @@ -25,7 +25,7 @@ // // // $Id: G4VWeightWindowStore.hh,v 1.3 2006/06/29 18:16:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4VWeightWindowStore diff --git a/source/geometry/biasing/include/G4WeightWindowAlgorithm.hh b/source/geometry/biasing/include/G4WeightWindowAlgorithm.hh index 4cd06a46fc..9aec6d1618 100644 --- a/source/geometry/biasing/include/G4WeightWindowAlgorithm.hh +++ b/source/geometry/biasing/include/G4WeightWindowAlgorithm.hh @@ -25,7 +25,7 @@ // // // $Id: G4WeightWindowAlgorithm.hh,v 1.7 2006/06/29 18:16:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4WeightWindowAlgorithm diff --git a/source/geometry/biasing/include/G4WeightWindowExaminer.hh b/source/geometry/biasing/include/G4WeightWindowExaminer.hh index 29c037a168..fe71b7a419 100644 --- a/source/geometry/biasing/include/G4WeightWindowExaminer.hh +++ b/source/geometry/biasing/include/G4WeightWindowExaminer.hh @@ -25,7 +25,7 @@ // // // $Id: G4WeightWindowExaminer.hh,v 1.3 2006/06/29 18:17:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4WeightWindowExaminer diff --git a/source/geometry/biasing/include/G4WeightWindowStore.hh b/source/geometry/biasing/include/G4WeightWindowStore.hh index c60561aad5..66e5953a89 100644 --- a/source/geometry/biasing/include/G4WeightWindowStore.hh +++ b/source/geometry/biasing/include/G4WeightWindowStore.hh @@ -25,7 +25,7 @@ // // // $Id: G4WeightWindowStore.hh,v 1.3 2006/06/29 18:17:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4WeightWindowStore diff --git a/source/geometry/biasing/src/G4GeometryCell.cc b/source/geometry/biasing/src/G4GeometryCell.cc index f3f3ca0836..2a0ed7b866 100644 --- a/source/geometry/biasing/src/G4GeometryCell.cc +++ b/source/geometry/biasing/src/G4GeometryCell.cc @@ -25,7 +25,7 @@ // // // $Id: G4GeometryCell.cc,v 1.6 2006/06/29 18:17:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/biasing/src/G4GeometryCellComp.cc b/source/geometry/biasing/src/G4GeometryCellComp.cc index dec39c289a..2a2b331f2b 100644 --- a/source/geometry/biasing/src/G4GeometryCellComp.cc +++ b/source/geometry/biasing/src/G4GeometryCellComp.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4GeometryCellComp.cc,v 1.4 2006/06/29 18:17:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/biasing/src/G4GeometryCellImportance.cc b/source/geometry/biasing/src/G4GeometryCellImportance.cc index 4035a3f4fe..c1269ecaf0 100644 --- a/source/geometry/biasing/src/G4GeometryCellImportance.cc +++ b/source/geometry/biasing/src/G4GeometryCellImportance.cc @@ -25,7 +25,7 @@ // // // $Id: G4GeometryCellImportance.cc,v 1.5 2006/06/29 18:17:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/biasing/src/G4GeometryCellStep.cc b/source/geometry/biasing/src/G4GeometryCellStep.cc index a54921b53c..471b624f5f 100644 --- a/source/geometry/biasing/src/G4GeometryCellStep.cc +++ b/source/geometry/biasing/src/G4GeometryCellStep.cc @@ -25,7 +25,7 @@ // // // $Id: G4GeometryCellStep.cc,v 1.2 2006/06/29 18:17:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/biasing/src/G4GeometryCellStepStream.cc b/source/geometry/biasing/src/G4GeometryCellStepStream.cc index f8e16ebd7b..5a5b66614d 100644 --- a/source/geometry/biasing/src/G4GeometryCellStepStream.cc +++ b/source/geometry/biasing/src/G4GeometryCellStepStream.cc @@ -25,7 +25,7 @@ // // // $Id: G4GeometryCellStepStream.cc,v 1.3 2006/06/29 18:17:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/biasing/src/G4IStore.cc b/source/geometry/biasing/src/G4IStore.cc index 673befd72a..bd9b74265d 100644 --- a/source/geometry/biasing/src/G4IStore.cc +++ b/source/geometry/biasing/src/G4IStore.cc @@ -25,7 +25,7 @@ // // // $Id: G4IStore.cc,v 1.14 2006/06/29 18:17:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/biasing/src/G4ImportanceAlgorithm.cc b/source/geometry/biasing/src/G4ImportanceAlgorithm.cc index 9a0dff5296..7cbdac2391 100644 --- a/source/geometry/biasing/src/G4ImportanceAlgorithm.cc +++ b/source/geometry/biasing/src/G4ImportanceAlgorithm.cc @@ -25,7 +25,7 @@ // // // $Id: G4ImportanceAlgorithm.cc,v 1.14 2006/06/29 18:17:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/biasing/src/G4ImportanceSplitExaminer.cc b/source/geometry/biasing/src/G4ImportanceSplitExaminer.cc index eb4ff0ddbf..80b302ff4b 100644 --- a/source/geometry/biasing/src/G4ImportanceSplitExaminer.cc +++ b/source/geometry/biasing/src/G4ImportanceSplitExaminer.cc @@ -25,7 +25,7 @@ // // // $Id: G4ImportanceSplitExaminer.cc,v 1.8 2006/06/29 18:17:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/biasing/src/G4Nsplit_Weight.cc b/source/geometry/biasing/src/G4Nsplit_Weight.cc index 802cf0e8c0..ece6b9974e 100644 --- a/source/geometry/biasing/src/G4Nsplit_Weight.cc +++ b/source/geometry/biasing/src/G4Nsplit_Weight.cc @@ -25,7 +25,7 @@ // // // $Id: G4Nsplit_Weight.cc,v 1.10 2006/06/29 18:17:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/biasing/src/G4ParallelNavigator.cc b/source/geometry/biasing/src/G4ParallelNavigator.cc index 1183287d15..d44882b059 100644 --- a/source/geometry/biasing/src/G4ParallelNavigator.cc +++ b/source/geometry/biasing/src/G4ParallelNavigator.cc @@ -25,7 +25,7 @@ // // // $Id: G4ParallelNavigator.cc,v 1.20 2006/06/29 18:17:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/biasing/src/G4ParallelStepper.cc b/source/geometry/biasing/src/G4ParallelStepper.cc index 356fd04052..3067ef60b1 100644 --- a/source/geometry/biasing/src/G4ParallelStepper.cc +++ b/source/geometry/biasing/src/G4ParallelStepper.cc @@ -25,7 +25,7 @@ // // // $Id: G4ParallelStepper.cc,v 1.12 2006/06/29 18:17:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/biasing/src/G4ParallelWorld.cc b/source/geometry/biasing/src/G4ParallelWorld.cc index f5009ff8f3..1cb63ceae4 100644 --- a/source/geometry/biasing/src/G4ParallelWorld.cc +++ b/source/geometry/biasing/src/G4ParallelWorld.cc @@ -25,7 +25,7 @@ // // // $Id: G4ParallelWorld.cc,v 1.8 2006/06/29 18:17:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/biasing/src/G4VCellScorer.cc b/source/geometry/biasing/src/G4VCellScorer.cc index 27288bb578..5567a7a68e 100644 --- a/source/geometry/biasing/src/G4VCellScorer.cc +++ b/source/geometry/biasing/src/G4VCellScorer.cc @@ -25,7 +25,7 @@ // // // $Id: G4VCellScorer.cc,v 1.6 2006/06/29 18:17:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/biasing/src/G4VCellScorerStore.cc b/source/geometry/biasing/src/G4VCellScorerStore.cc index cb92d57a10..982c0f52c1 100644 --- a/source/geometry/biasing/src/G4VCellScorerStore.cc +++ b/source/geometry/biasing/src/G4VCellScorerStore.cc @@ -25,7 +25,7 @@ // // // $Id: G4VCellScorerStore.cc,v 1.4 2006/06/29 18:17:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/biasing/src/G4VGCellFinder.cc b/source/geometry/biasing/src/G4VGCellFinder.cc index 4e8d631e6f..dcc609c446 100644 --- a/source/geometry/biasing/src/G4VGCellFinder.cc +++ b/source/geometry/biasing/src/G4VGCellFinder.cc @@ -25,7 +25,7 @@ // // // $Id: G4VGCellFinder.cc,v 1.2 2006/06/29 18:17:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/biasing/src/G4VIStore.cc b/source/geometry/biasing/src/G4VIStore.cc index e7c679263c..bcadede4b4 100644 --- a/source/geometry/biasing/src/G4VIStore.cc +++ b/source/geometry/biasing/src/G4VIStore.cc @@ -25,7 +25,7 @@ // // // $Id: G4VIStore.cc,v 1.2 2006/06/29 18:17:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/biasing/src/G4VImportanceAlgorithm.cc b/source/geometry/biasing/src/G4VImportanceAlgorithm.cc index b2c46cf602..963410ecae 100644 --- a/source/geometry/biasing/src/G4VImportanceAlgorithm.cc +++ b/source/geometry/biasing/src/G4VImportanceAlgorithm.cc @@ -25,7 +25,7 @@ // // // $Id: G4VImportanceAlgorithm.cc,v 1.2 2006/06/29 18:17:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/biasing/src/G4VImportanceSplitExaminer.cc b/source/geometry/biasing/src/G4VImportanceSplitExaminer.cc index f450b16e23..a5a536f1b9 100644 --- a/source/geometry/biasing/src/G4VImportanceSplitExaminer.cc +++ b/source/geometry/biasing/src/G4VImportanceSplitExaminer.cc @@ -25,7 +25,7 @@ // // // $Id: G4VImportanceSplitExaminer.cc,v 1.2 2006/06/29 18:17:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/biasing/src/G4VPGeoDriver.cc b/source/geometry/biasing/src/G4VPGeoDriver.cc index 2ac8c2c6ca..117785e7f1 100644 --- a/source/geometry/biasing/src/G4VPGeoDriver.cc +++ b/source/geometry/biasing/src/G4VPGeoDriver.cc @@ -25,7 +25,7 @@ // // // $Id: G4VPGeoDriver.cc,v 1.2 2006/06/29 18:17:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/biasing/src/G4VParallelStepper.cc b/source/geometry/biasing/src/G4VParallelStepper.cc index 06c9c6011a..b01a6e138f 100644 --- a/source/geometry/biasing/src/G4VParallelStepper.cc +++ b/source/geometry/biasing/src/G4VParallelStepper.cc @@ -25,7 +25,7 @@ // // // $Id: G4VParallelStepper.cc,v 1.2 2006/06/29 18:17:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/biasing/src/G4VScorer.cc b/source/geometry/biasing/src/G4VScorer.cc index 35828166fe..32d11620d3 100644 --- a/source/geometry/biasing/src/G4VScorer.cc +++ b/source/geometry/biasing/src/G4VScorer.cc @@ -25,7 +25,7 @@ // // // $Id: G4VScorer.cc,v 1.2 2006/06/29 18:17:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/biasing/src/G4VWeightWindowAlgorithm.cc b/source/geometry/biasing/src/G4VWeightWindowAlgorithm.cc index eef7169ba3..046fb59dff 100644 --- a/source/geometry/biasing/src/G4VWeightWindowAlgorithm.cc +++ b/source/geometry/biasing/src/G4VWeightWindowAlgorithm.cc @@ -25,7 +25,7 @@ // // // $Id: G4VWeightWindowAlgorithm.cc,v 1.2 2006/06/29 18:17:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/biasing/src/G4VWeightWindowExaminer.cc b/source/geometry/biasing/src/G4VWeightWindowExaminer.cc index 6b69aeb557..bb5119f6c8 100644 --- a/source/geometry/biasing/src/G4VWeightWindowExaminer.cc +++ b/source/geometry/biasing/src/G4VWeightWindowExaminer.cc @@ -25,7 +25,7 @@ // // // $Id: G4VWeightWindowExaminer.cc,v 1.2 2006/06/29 18:17:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/biasing/src/G4VWeightWindowStore.cc b/source/geometry/biasing/src/G4VWeightWindowStore.cc index b927768a8a..5fbfdbcdc1 100644 --- a/source/geometry/biasing/src/G4VWeightWindowStore.cc +++ b/source/geometry/biasing/src/G4VWeightWindowStore.cc @@ -25,7 +25,7 @@ // // // $Id: G4VWeightWindowStore.cc,v 1.3 2006/06/29 18:17:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/biasing/src/G4WeightWindowAlgorithm.cc b/source/geometry/biasing/src/G4WeightWindowAlgorithm.cc index 118f626ed3..bd17db83dd 100644 --- a/source/geometry/biasing/src/G4WeightWindowAlgorithm.cc +++ b/source/geometry/biasing/src/G4WeightWindowAlgorithm.cc @@ -25,7 +25,7 @@ // // // $Id: G4WeightWindowAlgorithm.cc,v 1.8 2006/06/29 18:18:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/biasing/src/G4WeightWindowExaminer.cc b/source/geometry/biasing/src/G4WeightWindowExaminer.cc index 3f388f4d3f..721bb29e73 100644 --- a/source/geometry/biasing/src/G4WeightWindowExaminer.cc +++ b/source/geometry/biasing/src/G4WeightWindowExaminer.cc @@ -25,7 +25,7 @@ // // // $Id: G4WeightWindowExaminer.cc,v 1.2 2006/06/29 18:18:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/biasing/src/G4WeightWindowStore.cc b/source/geometry/biasing/src/G4WeightWindowStore.cc index 29400bd124..7787b4c306 100644 --- a/source/geometry/biasing/src/G4WeightWindowStore.cc +++ b/source/geometry/biasing/src/G4WeightWindowStore.cc @@ -25,7 +25,7 @@ // // // $Id: G4WeightWindowStore.cc,v 1.5 2006/06/29 18:18:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/divisions/include/G4PVDivision.hh b/source/geometry/divisions/include/G4PVDivision.hh index 737b9e62e5..beadc7dfe5 100644 --- a/source/geometry/divisions/include/G4PVDivision.hh +++ b/source/geometry/divisions/include/G4PVDivision.hh @@ -25,7 +25,7 @@ // // // $Id: G4PVDivision.hh,v 1.12 2006/06/29 18:18:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4PVDivision // diff --git a/source/geometry/divisions/include/G4PVDivisionFactory.hh b/source/geometry/divisions/include/G4PVDivisionFactory.hh index 78147f0c71..18789395bf 100644 --- a/source/geometry/divisions/include/G4PVDivisionFactory.hh +++ b/source/geometry/divisions/include/G4PVDivisionFactory.hh @@ -25,7 +25,7 @@ // // // $Id: G4PVDivisionFactory.hh,v 1.2 2006/06/29 18:18:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4PVDivisionFactory diff --git a/source/geometry/divisions/include/G4ParameterisationBox.hh b/source/geometry/divisions/include/G4ParameterisationBox.hh index f7c9304a3c..4cdb728d7c 100644 --- a/source/geometry/divisions/include/G4ParameterisationBox.hh +++ b/source/geometry/divisions/include/G4ParameterisationBox.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParameterisationBox.hh,v 1.6 2006/06/29 18:18:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // classes G4ParameterisationBoxX, // G4ParameterisationBoxY, diff --git a/source/geometry/divisions/include/G4ParameterisationCons.hh b/source/geometry/divisions/include/G4ParameterisationCons.hh index 49ba35ba59..9c3c440d35 100644 --- a/source/geometry/divisions/include/G4ParameterisationCons.hh +++ b/source/geometry/divisions/include/G4ParameterisationCons.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParameterisationCons.hh,v 1.6 2006/06/29 18:18:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // classes G4ParameterisationConsRho, // G4ParameterisationConsPhi, diff --git a/source/geometry/divisions/include/G4ParameterisationPara.hh b/source/geometry/divisions/include/G4ParameterisationPara.hh index 01b25fe5c2..a297ba67da 100644 --- a/source/geometry/divisions/include/G4ParameterisationPara.hh +++ b/source/geometry/divisions/include/G4ParameterisationPara.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParameterisationPara.hh,v 1.7 2006/06/29 18:18:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // classes G4ParameterisationParaX, // G4ParameterisationParaY, diff --git a/source/geometry/divisions/include/G4ParameterisationPolycone.hh b/source/geometry/divisions/include/G4ParameterisationPolycone.hh index de471a7dd0..4894621053 100644 --- a/source/geometry/divisions/include/G4ParameterisationPolycone.hh +++ b/source/geometry/divisions/include/G4ParameterisationPolycone.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParameterisationPolycone.hh,v 1.7 2006/06/29 18:18:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // classes G4ParameterisationPolyconeRho, // G4ParameterisationPolyconePhi, diff --git a/source/geometry/divisions/include/G4ParameterisationPolyhedra.hh b/source/geometry/divisions/include/G4ParameterisationPolyhedra.hh index 6249c544d3..88c4ff71d3 100644 --- a/source/geometry/divisions/include/G4ParameterisationPolyhedra.hh +++ b/source/geometry/divisions/include/G4ParameterisationPolyhedra.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParameterisationPolyhedra.hh,v 1.8 2006/06/29 18:18:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // classes G4ParameterisationPolyhedraRho, // G4ParameterisationPolyhedraPhi, diff --git a/source/geometry/divisions/include/G4ParameterisationTrd.hh b/source/geometry/divisions/include/G4ParameterisationTrd.hh index 5262a74ee3..61b280e111 100644 --- a/source/geometry/divisions/include/G4ParameterisationTrd.hh +++ b/source/geometry/divisions/include/G4ParameterisationTrd.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParameterisationTrd.hh,v 1.7 2006/06/29 18:18:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // classes G4ParameterisationTrdX // G4ParameterisationTrdY diff --git a/source/geometry/divisions/include/G4ParameterisationTubs.hh b/source/geometry/divisions/include/G4ParameterisationTubs.hh index 3565e3602c..b89f0151cf 100644 --- a/source/geometry/divisions/include/G4ParameterisationTubs.hh +++ b/source/geometry/divisions/include/G4ParameterisationTubs.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParameterisationTubs.hh,v 1.6 2006/06/29 18:18:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // classes G4ParameterisationTubsRho // G4ParameterisationTubsPhi diff --git a/source/geometry/divisions/include/G4VDivisionParameterisation.hh b/source/geometry/divisions/include/G4VDivisionParameterisation.hh index d4602c5a34..39af6e117d 100644 --- a/source/geometry/divisions/include/G4VDivisionParameterisation.hh +++ b/source/geometry/divisions/include/G4VDivisionParameterisation.hh @@ -25,7 +25,7 @@ // // // $Id: G4VDivisionParameterisation.hh,v 1.10 2006/06/29 18:18:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4VDivisionParameterisation // diff --git a/source/geometry/divisions/include/G4VDivisionParameterisation.icc b/source/geometry/divisions/include/G4VDivisionParameterisation.icc index 211ccf1db5..12fd4fe30d 100644 --- a/source/geometry/divisions/include/G4VDivisionParameterisation.icc +++ b/source/geometry/divisions/include/G4VDivisionParameterisation.icc @@ -25,7 +25,7 @@ // // // $Id: G4VDivisionParameterisation.icc,v 1.4 2006/06/29 18:18:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4VDivisionParameterisation Inline Implementation file // diff --git a/source/geometry/divisions/src/G4PVDivision.cc b/source/geometry/divisions/src/G4PVDivision.cc index ee4753f680..a6449669d2 100644 --- a/source/geometry/divisions/src/G4PVDivision.cc +++ b/source/geometry/divisions/src/G4PVDivision.cc @@ -25,7 +25,7 @@ // // // $Id: G4PVDivision.cc,v 1.20 2006/06/29 18:18:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4PVDivision Implementation file // diff --git a/source/geometry/divisions/src/G4PVDivisionFactory.cc b/source/geometry/divisions/src/G4PVDivisionFactory.cc index 06365355aa..82df9198a9 100644 --- a/source/geometry/divisions/src/G4PVDivisionFactory.cc +++ b/source/geometry/divisions/src/G4PVDivisionFactory.cc @@ -25,7 +25,7 @@ // // // $Id: G4PVDivisionFactory.cc,v 1.2 2006/06/29 18:18:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4PVDivisionFactory Implementation file // diff --git a/source/geometry/divisions/src/G4ParameterisationBox.cc b/source/geometry/divisions/src/G4ParameterisationBox.cc index 222da8e908..c32dac48f5 100644 --- a/source/geometry/divisions/src/G4ParameterisationBox.cc +++ b/source/geometry/divisions/src/G4ParameterisationBox.cc @@ -25,7 +25,7 @@ // // // $Id: G4ParameterisationBox.cc,v 1.10 2006/06/29 18:18:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4ParameterisationBox Implementation file // diff --git a/source/geometry/divisions/src/G4ParameterisationCons.cc b/source/geometry/divisions/src/G4ParameterisationCons.cc index e96e50bcfb..88058ac368 100644 --- a/source/geometry/divisions/src/G4ParameterisationCons.cc +++ b/source/geometry/divisions/src/G4ParameterisationCons.cc @@ -25,7 +25,7 @@ // // // $Id: G4ParameterisationCons.cc,v 1.9 2006/06/29 18:18:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4ParameterisationCons Implementation file // diff --git a/source/geometry/divisions/src/G4ParameterisationPara.cc b/source/geometry/divisions/src/G4ParameterisationPara.cc index d7006c2ed6..c1d2eba27d 100644 --- a/source/geometry/divisions/src/G4ParameterisationPara.cc +++ b/source/geometry/divisions/src/G4ParameterisationPara.cc @@ -25,7 +25,7 @@ // // // $Id: G4ParameterisationPara.cc,v 1.11 2006/06/29 18:18:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4ParameterisationPara Implementation file // diff --git a/source/geometry/divisions/src/G4ParameterisationPolycone.cc b/source/geometry/divisions/src/G4ParameterisationPolycone.cc index eaaf6b38ad..65acbd9d93 100644 --- a/source/geometry/divisions/src/G4ParameterisationPolycone.cc +++ b/source/geometry/divisions/src/G4ParameterisationPolycone.cc @@ -25,7 +25,7 @@ // // // $Id: G4ParameterisationPolycone.cc,v 1.15 2006/06/29 18:18:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4ParameterisationPolycone Implementation file // diff --git a/source/geometry/divisions/src/G4ParameterisationPolyhedra.cc b/source/geometry/divisions/src/G4ParameterisationPolyhedra.cc index f5403bead6..3fa1c9c032 100644 --- a/source/geometry/divisions/src/G4ParameterisationPolyhedra.cc +++ b/source/geometry/divisions/src/G4ParameterisationPolyhedra.cc @@ -25,7 +25,7 @@ // // // $Id: G4ParameterisationPolyhedra.cc,v 1.15 2006/06/29 18:18:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4ParameterisationPolyhedra Implementation file // diff --git a/source/geometry/divisions/src/G4ParameterisationTrd.cc b/source/geometry/divisions/src/G4ParameterisationTrd.cc index 469126f0d4..a0ff113ca1 100644 --- a/source/geometry/divisions/src/G4ParameterisationTrd.cc +++ b/source/geometry/divisions/src/G4ParameterisationTrd.cc @@ -25,7 +25,7 @@ // // // $Id: G4ParameterisationTrd.cc,v 1.14 2006/06/29 18:18:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4ParameterisationTrd Implementation file // diff --git a/source/geometry/divisions/src/G4ParameterisationTubs.cc b/source/geometry/divisions/src/G4ParameterisationTubs.cc index 87475ea6cb..93683bae05 100644 --- a/source/geometry/divisions/src/G4ParameterisationTubs.cc +++ b/source/geometry/divisions/src/G4ParameterisationTubs.cc @@ -25,7 +25,7 @@ // // // $Id: G4ParameterisationTubs.cc,v 1.8 2006/06/29 18:18:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4ParameterisationTubs Implementation file // diff --git a/source/geometry/divisions/src/G4VDivisionParameterisation.cc b/source/geometry/divisions/src/G4VDivisionParameterisation.cc index 478f479f99..f4aec60ed1 100644 --- a/source/geometry/divisions/src/G4VDivisionParameterisation.cc +++ b/source/geometry/divisions/src/G4VDivisionParameterisation.cc @@ -25,7 +25,7 @@ // // // $Id: G4VDivisionParameterisation.cc,v 1.11 2006/06/29 18:18:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4VDivisionParameterisation Implementation file // diff --git a/source/geometry/magneticfield/History b/source/geometry/magneticfield/History index c3dbe0037b..4157de3a5f 100644 --- a/source/geometry/magneticfield/History +++ b/source/geometry/magneticfield/History @@ -1,4 +1,4 @@ -$Id: History,v 1.111 2006/06/22 10:38:08 japost Exp $ +$Id: History,v 1.113 2006/11/13 18:23:55 gcosmo Exp $ ------------------------------------------------------------------- ========================================================= @@ -17,6 +17,18 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +November 13th, 2006 G.Cosmo - field-V08-01-01 +---------------------------- +- G4FieldTrack: + o Implemented missing definition for GetCharge(). + o Corrected 'const' qualifier for accessors in the subclass. + o Cleanup ... +- NOTE: this tag is NOT including the change below in G4MagIntegratorStepper. + +June 21st, 2006 J.Apostolakis - field-V08-01-00 +------------------------------ +- Including the SetEquationOfMotion() method in G4MagIntegratorStepper + June 22nd, 2006 J.Apostolakis - field-V08-00-07 ----------------------------- - G4ExactHelixStepper: reintroduced corrected class @@ -29,6 +41,8 @@ June 21st, 2006 J.Apostolakis - field-V08-00-06 - G4ExactHelixStepper: taking out class (provisional tag in case of difficulties with class, revisions) +--- The field-V08-00-0x , x > 6, tags do not include the change below + June 21st, 2006 J.Apostolakis - field-V08-01-00 ----------------------------- - G4MagIntegratorStepper diff --git a/source/geometry/magneticfield/include/G4CashKarpRKF45.hh b/source/geometry/magneticfield/include/G4CashKarpRKF45.hh index a0fbd990d3..2572683ecc 100644 --- a/source/geometry/magneticfield/include/G4CashKarpRKF45.hh +++ b/source/geometry/magneticfield/include/G4CashKarpRKF45.hh @@ -25,7 +25,7 @@ // // // $Id: G4CashKarpRKF45.hh,v 1.10 2006/06/29 18:20:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4CashKarpRKF45 diff --git a/source/geometry/magneticfield/include/G4ChordFinder.hh b/source/geometry/magneticfield/include/G4ChordFinder.hh index 5588ffe32a..b698d19f6d 100644 --- a/source/geometry/magneticfield/include/G4ChordFinder.hh +++ b/source/geometry/magneticfield/include/G4ChordFinder.hh @@ -25,7 +25,7 @@ // // // $Id: G4ChordFinder.hh,v 1.17 2006/06/29 18:21:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4ChordFinder diff --git a/source/geometry/magneticfield/include/G4ChordFinder.icc b/source/geometry/magneticfield/include/G4ChordFinder.icc index 1230268140..7cf12cd29d 100644 --- a/source/geometry/magneticfield/include/G4ChordFinder.icc +++ b/source/geometry/magneticfield/include/G4ChordFinder.icc @@ -25,7 +25,7 @@ // // // $Id: G4ChordFinder.icc,v 1.12 2006/06/29 18:21:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4ChordFinder inline implementations // diff --git a/source/geometry/magneticfield/include/G4ChordFinderSaf.hh b/source/geometry/magneticfield/include/G4ChordFinderSaf.hh index 498ed3c533..5686168961 100644 --- a/source/geometry/magneticfield/include/G4ChordFinderSaf.hh +++ b/source/geometry/magneticfield/include/G4ChordFinderSaf.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4ChordFinderSaf.hh,v 1.3 2006/06/29 18:21:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4ChordFinderRad diff --git a/source/geometry/magneticfield/include/G4ClassicalRK4.hh b/source/geometry/magneticfield/include/G4ClassicalRK4.hh index 22d632f537..fe26d0c983 100644 --- a/source/geometry/magneticfield/include/G4ClassicalRK4.hh +++ b/source/geometry/magneticfield/include/G4ClassicalRK4.hh @@ -25,7 +25,7 @@ // // // $Id: G4ClassicalRK4.hh,v 1.10 2006/06/29 18:21:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4ClassicalRK4 diff --git a/source/geometry/magneticfield/include/G4DELPHIMagField.hh b/source/geometry/magneticfield/include/G4DELPHIMagField.hh index 554a08aa39..5f58c0682e 100644 --- a/source/geometry/magneticfield/include/G4DELPHIMagField.hh +++ b/source/geometry/magneticfield/include/G4DELPHIMagField.hh @@ -25,7 +25,7 @@ // // // $Id: G4DELPHIMagField.hh,v 1.4 2006/06/29 18:21:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4DELPHIMagField diff --git a/source/geometry/magneticfield/include/G4ElectricField.hh b/source/geometry/magneticfield/include/G4ElectricField.hh index 9452804833..353981e043 100644 --- a/source/geometry/magneticfield/include/G4ElectricField.hh +++ b/source/geometry/magneticfield/include/G4ElectricField.hh @@ -25,7 +25,7 @@ // // // $Id: G4ElectricField.hh,v 1.2 2006/06/29 18:21:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4ElectricField diff --git a/source/geometry/magneticfield/include/G4ElectroMagneticField.hh b/source/geometry/magneticfield/include/G4ElectroMagneticField.hh index 6ae031efe4..56800da748 100644 --- a/source/geometry/magneticfield/include/G4ElectroMagneticField.hh +++ b/source/geometry/magneticfield/include/G4ElectroMagneticField.hh @@ -25,7 +25,7 @@ // // // $Id: G4ElectroMagneticField.hh,v 1.11 2006/06/29 18:22:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4ElectroMagneticField diff --git a/source/geometry/magneticfield/include/G4EqMagElectricField.hh b/source/geometry/magneticfield/include/G4EqMagElectricField.hh index a83b3d3c5a..c45fb65180 100644 --- a/source/geometry/magneticfield/include/G4EqMagElectricField.hh +++ b/source/geometry/magneticfield/include/G4EqMagElectricField.hh @@ -25,7 +25,7 @@ // // // $Id: G4EqMagElectricField.hh,v 1.9 2006/06/29 18:22:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4EqMagElectricField diff --git a/source/geometry/magneticfield/include/G4EquationOfMotion.hh b/source/geometry/magneticfield/include/G4EquationOfMotion.hh index 4285fcc20c..9cb330aad4 100644 --- a/source/geometry/magneticfield/include/G4EquationOfMotion.hh +++ b/source/geometry/magneticfield/include/G4EquationOfMotion.hh @@ -25,7 +25,7 @@ // // // $Id: G4EquationOfMotion.hh,v 1.10 2006/06/29 18:22:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4EquationOfMotion diff --git a/source/geometry/magneticfield/include/G4EquationOfMotion.icc b/source/geometry/magneticfield/include/G4EquationOfMotion.icc index 5c154c5536..8bb2b0a970 100644 --- a/source/geometry/magneticfield/include/G4EquationOfMotion.icc +++ b/source/geometry/magneticfield/include/G4EquationOfMotion.icc @@ -25,7 +25,7 @@ // // // $Id: G4EquationOfMotion.icc,v 1.9 2006/06/29 18:22:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Inline implementation diff --git a/source/geometry/magneticfield/include/G4ExactHelixStepper.hh b/source/geometry/magneticfield/include/G4ExactHelixStepper.hh index b91becb843..42e8e294e0 100644 --- a/source/geometry/magneticfield/include/G4ExactHelixStepper.hh +++ b/source/geometry/magneticfield/include/G4ExactHelixStepper.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4ExactHelixStepper.hh,v 1.4 2006/06/29 18:22:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4ExactHelixStepper diff --git a/source/geometry/magneticfield/include/G4ExplicitEuler.hh b/source/geometry/magneticfield/include/G4ExplicitEuler.hh index 74b3472988..5e8e6604df 100644 --- a/source/geometry/magneticfield/include/G4ExplicitEuler.hh +++ b/source/geometry/magneticfield/include/G4ExplicitEuler.hh @@ -25,7 +25,7 @@ // // // $Id: G4ExplicitEuler.hh,v 1.9 2006/06/29 18:22:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4ExplicitEuler diff --git a/source/geometry/magneticfield/include/G4Field.hh b/source/geometry/magneticfield/include/G4Field.hh index bade2eb335..5df5b81257 100644 --- a/source/geometry/magneticfield/include/G4Field.hh +++ b/source/geometry/magneticfield/include/G4Field.hh @@ -25,7 +25,7 @@ // // // $Id: G4Field.hh,v 1.10 2006/06/29 18:22:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4Field diff --git a/source/geometry/magneticfield/include/G4FieldManager.hh b/source/geometry/magneticfield/include/G4FieldManager.hh index f4f88df9b5..fdc372f7b9 100644 --- a/source/geometry/magneticfield/include/G4FieldManager.hh +++ b/source/geometry/magneticfield/include/G4FieldManager.hh @@ -25,7 +25,7 @@ // // // $Id: G4FieldManager.hh,v 1.16 2006/06/29 18:22:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4FieldManager diff --git a/source/geometry/magneticfield/include/G4FieldManager.icc b/source/geometry/magneticfield/include/G4FieldManager.icc index cc51d17b55..610c195c9b 100644 --- a/source/geometry/magneticfield/include/G4FieldManager.icc +++ b/source/geometry/magneticfield/include/G4FieldManager.icc @@ -25,7 +25,7 @@ // // // $Id: G4FieldManager.icc,v 1.12 2006/06/29 18:22:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4FieldManager inline implementation diff --git a/source/geometry/magneticfield/include/G4FieldTrack.hh b/source/geometry/magneticfield/include/G4FieldTrack.hh index f00621fd30..53c44b48d9 100644 --- a/source/geometry/magneticfield/include/G4FieldTrack.hh +++ b/source/geometry/magneticfield/include/G4FieldTrack.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4FieldTrack.hh,v 1.20 2006/06/29 18:22:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4FieldTrack.hh,v 1.21 2006/11/13 18:24:35 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4FieldTrack @@ -51,9 +51,6 @@ #include "G4ThreeVector.hh" -// #include "G4ReferenceCountedHandle.hh" -// typedef G4ReferenceCountedHandle G4ChargeStateHandle; - class G4FieldTrack { public: // with description @@ -63,11 +60,11 @@ class G4FieldTrack const G4ThreeVector& pMomentumDirection, G4double kineticEnergy, G4double restMass_c2, - G4double charge, - const G4ThreeVector& pSpin, - G4double magnetic_dipole_moment= 0.0, - G4double curve_length= 0.0 - ); + G4double charge, + const G4ThreeVector& pSpin, + G4double magnetic_dipole_moment= 0.0, + G4double curve_length= 0.0 + ); G4FieldTrack( const G4FieldTrack& pFieldTrack ); G4FieldTrack( char ); // Almost default constructor @@ -77,19 +74,19 @@ class G4FieldTrack inline void UpdateState( const G4ThreeVector& pPosition, G4double LaboratoryTimeOfFlight, - const G4ThreeVector& pMomentumDirection, - G4double kineticEnergy); + const G4ThreeVector& pMomentumDirection, + G4double kineticEnergy); // Update four-vectors for space/time and momentum/energy // Also resets curve length. inline void UpdateFourMomentum( G4double kineticEnergy, - const G4ThreeVector& momentumDirection ); + const G4ThreeVector& momentumDirection ); // Update momentum (and direction), and kinetic energy void SetChargeAndMoments(G4double charge, - G4double magnetic_dipole_moment= DBL_MAX, // default: do not change - G4double electric_dipole_moment= DBL_MAX, - G4double magnetic_charge=DBL_MAX ); + G4double magnetic_dipole_moment= DBL_MAX, + G4double electric_dipole_moment= DBL_MAX, + G4double magnetic_charge=DBL_MAX ); // Sets all charges and moments G4FieldTrack( const G4ThreeVector& pPosition, @@ -113,7 +110,7 @@ class G4FieldTrack inline G4ThreeVector GetMomentumDirection() const; inline G4double GetCurveLength() const; // Distance along curve of point. - // inline G4double GetMomentumModulus() const; // Obsolete + inline G4ThreeVector GetSpin() const; inline G4double GetLabTimeOfFlight() const; inline G4double GetProperTimeOfFlight() const; @@ -132,8 +129,7 @@ class G4FieldTrack // Distance along curve. inline void SetKineticEnergy(G4double nEnergy); // Does not modify momentum. - // inline void SetMomentumModulus(G4double nMomentumMod); // Obsolete - // Does not modify energy. + inline void SetSpin(G4ThreeVector nSpin); inline void SetLabTimeOfFlight(G4double nTOF); inline void SetProperTimeOfFlight(G4double nTOF); @@ -147,11 +143,12 @@ class G4FieldTrack inline void InitialiseSpin( const G4ThreeVector& Spin ); // Used to update / initialise the state + enum { ncompSVEC = 12 }; + // Needed and should be used only for RK integration driver - enum { ncompSVEC = 12 }; // Needed and should be used only for RK integration driver inline void DumpToArray(G4double valArr[ncompSVEC]) const; - inline void LoadFromArray(const G4double valArr[ncompSVEC], G4int noVarsIntegrated); - + inline void LoadFromArray(const G4double valArr[ncompSVEC], + G4int noVarsIntegrated); friend std::ostream& operator<<( std::ostream& os, const G4FieldTrack& SixVec); @@ -163,51 +160,49 @@ class G4FieldTrack G4double fRestMass_c2; G4double fLabTimeOfFlight; G4double fProperTimeOfFlight; - // G4double fMomentumModulus; // Unused G4ThreeVector fSpin; G4ThreeVector fMomentumDir; - private: // Implementation detail -- daughter class + private: // Implementation detail -- daughter class - class G4ChargeState + class G4ChargeState // Charge & moments { - // Charge & moments // ------------------------------------- - public: // without description - inline G4ChargeState(G4double charge, - G4double magnetic_dipole_moment= 0.0, - G4double electric_dipole_moment= 0.0, - G4double magnetic_charge= 0.0); - inline G4ChargeState( const G4ChargeState& right ); + public: // without description - inline void SetCharge(G4double charge){ fCharge= charge; } + inline G4ChargeState(G4double charge, + G4double magnetic_dipole_moment= 0.0, + G4double electric_dipole_moment= 0.0, + G4double magnetic_charge= 0.0); + inline G4ChargeState( const G4ChargeState& right ); - // Revise the charge (in units of the positron charge) - // do not change moments + inline void SetCharge(G4double charge){ fCharge= charge; } - void SetChargeAndMoments(G4double charge, - G4double magnetic_dipole_moment= DBL_MAX, // default: do not change - G4double electric_dipole_moment= DBL_MAX, // - G4double magnetic_charge=DBL_MAX ); - // Revise the charge and all moments - G4double GetCharge() { return fCharge; } - G4double GetMagneticDipoleMoment() { return fMagn_dipole; } - G4double ElectricDipoleMoment() { return fElec_dipole; } - G4double MagneticCharge() { return fMagneticCharge; } + // Revise the charge (in units of the positron charge) + // do not change moments + + void SetChargeAndMoments(G4double charge, + G4double magnetic_dipole_moment= DBL_MAX, + G4double electric_dipole_moment= DBL_MAX, + G4double magnetic_charge=DBL_MAX ); + // Revise the charge and all moments + + G4double GetCharge() const { return fCharge; } + G4double GetMagneticDipoleMoment() const { return fMagn_dipole; } + G4double ElectricDipoleMoment() const { return fElec_dipole; } + G4double MagneticCharge() const { return fMagneticCharge; } - private: - G4double fCharge; - G4double fMagn_dipole; - G4double fElec_dipole; - G4double fMagneticCharge; // for magnetic monopole + private: + + G4double fCharge; + G4double fMagn_dipole; + G4double fElec_dipole; + G4double fMagneticCharge; // for magnetic monopole }; G4ChargeState fChargeState; - // G4ChargeState* fpChargeState; - // Aim to share Charge state between FieldTracks - // by using pointer or handle - // eg G4ChargeStateHandle fpChargeState;d - public: // Access + public: // Access + const G4ChargeState* GetChargeState() const { return &fChargeState; } }; diff --git a/source/geometry/magneticfield/include/G4FieldTrack.icc b/source/geometry/magneticfield/include/G4FieldTrack.icc index 51bd8f5662..5fa2db8f46 100644 --- a/source/geometry/magneticfield/include/G4FieldTrack.icc +++ b/source/geometry/magneticfield/include/G4FieldTrack.icc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4FieldTrack.icc,v 1.20 2006/06/29 18:22:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4FieldTrack.icc,v 1.21 2006/11/13 18:24:35 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- @@ -238,6 +238,12 @@ void G4FieldTrack::SetMomentum(G4ThreeVector pMomentum) fMomentumDir = pMomentum.unit(); } +inline +G4double G4FieldTrack::GetCharge() const +{ + return fChargeState.GetCharge(); +} + // Dump values to array // // note that momentum direction is not saved diff --git a/source/geometry/magneticfield/include/G4HarmonicPolMagField.hh b/source/geometry/magneticfield/include/G4HarmonicPolMagField.hh index f874a73c6c..a0b950b1f7 100644 --- a/source/geometry/magneticfield/include/G4HarmonicPolMagField.hh +++ b/source/geometry/magneticfield/include/G4HarmonicPolMagField.hh @@ -25,7 +25,7 @@ // // // $Id: G4HarmonicPolMagField.hh,v 1.4 2006/06/29 18:22:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4HarmonicPolMagField // diff --git a/source/geometry/magneticfield/include/G4HelixExplicitEuler.hh b/source/geometry/magneticfield/include/G4HelixExplicitEuler.hh index 103d252fcc..721d3644ca 100644 --- a/source/geometry/magneticfield/include/G4HelixExplicitEuler.hh +++ b/source/geometry/magneticfield/include/G4HelixExplicitEuler.hh @@ -25,7 +25,7 @@ // // // $Id: G4HelixExplicitEuler.hh,v 1.8 2006/06/29 18:22:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4HelixExplicitEuler diff --git a/source/geometry/magneticfield/include/G4HelixHeum.hh b/source/geometry/magneticfield/include/G4HelixHeum.hh index 7742ffb31f..116ea81188 100644 --- a/source/geometry/magneticfield/include/G4HelixHeum.hh +++ b/source/geometry/magneticfield/include/G4HelixHeum.hh @@ -25,7 +25,7 @@ // // // $Id: G4HelixHeum.hh,v 1.8 2006/06/29 18:22:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4HelixHeum diff --git a/source/geometry/magneticfield/include/G4HelixImplicitEuler.hh b/source/geometry/magneticfield/include/G4HelixImplicitEuler.hh index 79fcf48903..3d056218c4 100644 --- a/source/geometry/magneticfield/include/G4HelixImplicitEuler.hh +++ b/source/geometry/magneticfield/include/G4HelixImplicitEuler.hh @@ -25,7 +25,7 @@ // // // $Id: G4HelixImplicitEuler.hh,v 1.8 2006/06/29 18:22:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4HelixImplicitEuler diff --git a/source/geometry/magneticfield/include/G4HelixSimpleRunge.hh b/source/geometry/magneticfield/include/G4HelixSimpleRunge.hh index 270b96c7ed..47f8c4b091 100644 --- a/source/geometry/magneticfield/include/G4HelixSimpleRunge.hh +++ b/source/geometry/magneticfield/include/G4HelixSimpleRunge.hh @@ -25,7 +25,7 @@ // // // $Id: G4HelixSimpleRunge.hh,v 1.7 2006/06/29 18:22:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4HelixSimpleRunge diff --git a/source/geometry/magneticfield/include/G4ImplicitEuler.hh b/source/geometry/magneticfield/include/G4ImplicitEuler.hh index 9c78509313..05026914f2 100644 --- a/source/geometry/magneticfield/include/G4ImplicitEuler.hh +++ b/source/geometry/magneticfield/include/G4ImplicitEuler.hh @@ -25,7 +25,7 @@ // // // $Id: G4ImplicitEuler.hh,v 1.8 2006/06/29 18:22:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4ImplicitEuler diff --git a/source/geometry/magneticfield/include/G4LineCurrentMagField.hh b/source/geometry/magneticfield/include/G4LineCurrentMagField.hh index 26b99d6de9..6c81be3235 100644 --- a/source/geometry/magneticfield/include/G4LineCurrentMagField.hh +++ b/source/geometry/magneticfield/include/G4LineCurrentMagField.hh @@ -25,7 +25,7 @@ // // // $Id: G4LineCurrentMagField.hh,v 1.4 2006/06/29 18:22:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4LineCurrentMagField diff --git a/source/geometry/magneticfield/include/G4LineSection.hh b/source/geometry/magneticfield/include/G4LineSection.hh index 6b6c307d35..1284545c9b 100644 --- a/source/geometry/magneticfield/include/G4LineSection.hh +++ b/source/geometry/magneticfield/include/G4LineSection.hh @@ -25,7 +25,7 @@ // // // $Id: G4LineSection.hh,v 1.9 2006/06/29 18:22:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4LineSection diff --git a/source/geometry/magneticfield/include/G4MagErrorStepper.hh b/source/geometry/magneticfield/include/G4MagErrorStepper.hh index 8bc6e270a5..2e3756c757 100644 --- a/source/geometry/magneticfield/include/G4MagErrorStepper.hh +++ b/source/geometry/magneticfield/include/G4MagErrorStepper.hh @@ -25,7 +25,7 @@ // // // $Id: G4MagErrorStepper.hh,v 1.11 2006/06/29 18:22:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4MagErrorStepper diff --git a/source/geometry/magneticfield/include/G4MagErrorStepper.icc b/source/geometry/magneticfield/include/G4MagErrorStepper.icc index ea9ffb85c7..9a61dedc70 100644 --- a/source/geometry/magneticfield/include/G4MagErrorStepper.icc +++ b/source/geometry/magneticfield/include/G4MagErrorStepper.icc @@ -25,7 +25,7 @@ // // // $Id: G4MagErrorStepper.icc,v 1.13 2006/06/29 18:22:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- diff --git a/source/geometry/magneticfield/include/G4MagHelicalStepper.hh b/source/geometry/magneticfield/include/G4MagHelicalStepper.hh index 8ed094f0a7..a474b07fe7 100644 --- a/source/geometry/magneticfield/include/G4MagHelicalStepper.hh +++ b/source/geometry/magneticfield/include/G4MagHelicalStepper.hh @@ -25,7 +25,7 @@ // // // $Id: G4MagHelicalStepper.hh,v 1.11 2006/06/29 18:22:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4MagHelicalStepper diff --git a/source/geometry/magneticfield/include/G4MagHelicalStepper.icc b/source/geometry/magneticfield/include/G4MagHelicalStepper.icc index 46a976da87..9a32d8e68b 100644 --- a/source/geometry/magneticfield/include/G4MagHelicalStepper.icc +++ b/source/geometry/magneticfield/include/G4MagHelicalStepper.icc @@ -25,7 +25,7 @@ // // // $Id: G4MagHelicalStepper.icc,v 1.11 2006/06/29 18:22:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Linear Step in regions of no field // diff --git a/source/geometry/magneticfield/include/G4MagIntegratorDriver.hh b/source/geometry/magneticfield/include/G4MagIntegratorDriver.hh index 76e08d2811..a6539e2642 100644 --- a/source/geometry/magneticfield/include/G4MagIntegratorDriver.hh +++ b/source/geometry/magneticfield/include/G4MagIntegratorDriver.hh @@ -25,7 +25,7 @@ // // // $Id: G4MagIntegratorDriver.hh,v 1.17 2006/06/29 18:22:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4MagInt_Driver diff --git a/source/geometry/magneticfield/include/G4MagIntegratorDriver.icc b/source/geometry/magneticfield/include/G4MagIntegratorDriver.icc index 7f65e72fea..85cb7a4172 100644 --- a/source/geometry/magneticfield/include/G4MagIntegratorDriver.icc +++ b/source/geometry/magneticfield/include/G4MagIntegratorDriver.icc @@ -25,7 +25,7 @@ // // // $Id: G4MagIntegratorDriver.icc,v 1.11 2006/06/29 18:23:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- diff --git a/source/geometry/magneticfield/include/G4MagIntegratorStepper.hh b/source/geometry/magneticfield/include/G4MagIntegratorStepper.hh index 1b1ce1b9e0..8bd4973348 100644 --- a/source/geometry/magneticfield/include/G4MagIntegratorStepper.hh +++ b/source/geometry/magneticfield/include/G4MagIntegratorStepper.hh @@ -25,7 +25,7 @@ // // // $Id: G4MagIntegratorStepper.hh,v 1.10.2.1 2006/06/29 18:23:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4MagIntegratorStepper diff --git a/source/geometry/magneticfield/include/G4MagIntegratorStepper.icc b/source/geometry/magneticfield/include/G4MagIntegratorStepper.icc index 12698984fc..2e82db8a61 100644 --- a/source/geometry/magneticfield/include/G4MagIntegratorStepper.icc +++ b/source/geometry/magneticfield/include/G4MagIntegratorStepper.icc @@ -25,7 +25,7 @@ // // // $Id: G4MagIntegratorStepper.icc,v 1.8.2.1 2006/06/29 18:23:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // inline diff --git a/source/geometry/magneticfield/include/G4Mag_EqRhs.hh b/source/geometry/magneticfield/include/G4Mag_EqRhs.hh index 82a259e3aa..958da3c56a 100644 --- a/source/geometry/magneticfield/include/G4Mag_EqRhs.hh +++ b/source/geometry/magneticfield/include/G4Mag_EqRhs.hh @@ -25,7 +25,7 @@ // // // $Id: G4Mag_EqRhs.hh,v 1.9 2006/06/29 18:23:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4Mag_EqRhs diff --git a/source/geometry/magneticfield/include/G4Mag_SpinEqRhs.hh b/source/geometry/magneticfield/include/G4Mag_SpinEqRhs.hh index 032198f633..bb95582b09 100644 --- a/source/geometry/magneticfield/include/G4Mag_SpinEqRhs.hh +++ b/source/geometry/magneticfield/include/G4Mag_SpinEqRhs.hh @@ -25,7 +25,7 @@ // // // $Id: G4Mag_SpinEqRhs.hh,v 1.11 2006/06/29 18:23:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4Mag_SpinEqRhs diff --git a/source/geometry/magneticfield/include/G4Mag_UsualEqRhs.hh b/source/geometry/magneticfield/include/G4Mag_UsualEqRhs.hh index 2a2c2cb33f..936cbf6f7d 100644 --- a/source/geometry/magneticfield/include/G4Mag_UsualEqRhs.hh +++ b/source/geometry/magneticfield/include/G4Mag_UsualEqRhs.hh @@ -25,7 +25,7 @@ // // // $Id: G4Mag_UsualEqRhs.hh,v 1.7 2006/06/29 18:23:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4Mag_UsualEqRhs diff --git a/source/geometry/magneticfield/include/G4MagneticField.hh b/source/geometry/magneticfield/include/G4MagneticField.hh index 23b9c2f516..635a027538 100644 --- a/source/geometry/magneticfield/include/G4MagneticField.hh +++ b/source/geometry/magneticfield/include/G4MagneticField.hh @@ -25,7 +25,7 @@ // // // $Id: G4MagneticField.hh,v 1.14 2006/06/29 18:23:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4MagneticField diff --git a/source/geometry/magneticfield/include/G4QuadrupoleMagField.hh b/source/geometry/magneticfield/include/G4QuadrupoleMagField.hh index fc4efd5e78..62d4228da4 100644 --- a/source/geometry/magneticfield/include/G4QuadrupoleMagField.hh +++ b/source/geometry/magneticfield/include/G4QuadrupoleMagField.hh @@ -25,7 +25,7 @@ // // // $Id: G4QuadrupoleMagField.hh,v 1.4 2006/06/29 18:23:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4QuadrupoleMagField diff --git a/source/geometry/magneticfield/include/G4RKG3_Stepper.hh b/source/geometry/magneticfield/include/G4RKG3_Stepper.hh index e271ebeaf6..9472700f5f 100644 --- a/source/geometry/magneticfield/include/G4RKG3_Stepper.hh +++ b/source/geometry/magneticfield/include/G4RKG3_Stepper.hh @@ -25,7 +25,7 @@ // // // $Id: G4RKG3_Stepper.hh,v 1.11 2006/06/29 18:23:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4RKG3_Stepper diff --git a/source/geometry/magneticfield/include/G4SimpleHeum.hh b/source/geometry/magneticfield/include/G4SimpleHeum.hh index 55d0bf424a..2e461d6626 100644 --- a/source/geometry/magneticfield/include/G4SimpleHeum.hh +++ b/source/geometry/magneticfield/include/G4SimpleHeum.hh @@ -25,7 +25,7 @@ // // // $Id: G4SimpleHeum.hh,v 1.8 2006/06/29 18:23:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4SimpleHeum diff --git a/source/geometry/magneticfield/include/G4SimpleRunge.hh b/source/geometry/magneticfield/include/G4SimpleRunge.hh index 03cbb87953..c22bd35902 100644 --- a/source/geometry/magneticfield/include/G4SimpleRunge.hh +++ b/source/geometry/magneticfield/include/G4SimpleRunge.hh @@ -25,7 +25,7 @@ // // // $Id: G4SimpleRunge.hh,v 1.8 2006/06/29 18:23:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4SimpleRunge diff --git a/source/geometry/magneticfield/include/G4UniformElectricField.hh b/source/geometry/magneticfield/include/G4UniformElectricField.hh index 0f90b88907..fde4b237e1 100644 --- a/source/geometry/magneticfield/include/G4UniformElectricField.hh +++ b/source/geometry/magneticfield/include/G4UniformElectricField.hh @@ -25,7 +25,7 @@ // // // $Id: G4UniformElectricField.hh,v 1.9 2006/06/29 18:23:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4UniformElectricField diff --git a/source/geometry/magneticfield/include/G4UniformMagField.hh b/source/geometry/magneticfield/include/G4UniformMagField.hh index eae760bb66..a65eaeb32d 100644 --- a/source/geometry/magneticfield/include/G4UniformMagField.hh +++ b/source/geometry/magneticfield/include/G4UniformMagField.hh @@ -25,7 +25,7 @@ // // // $Id: G4UniformMagField.hh,v 1.9 2006/06/29 18:23:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4UniformMagField diff --git a/source/geometry/magneticfield/src/G4CashKarpRKF45.cc b/source/geometry/magneticfield/src/G4CashKarpRKF45.cc index d5cefd8475..59743a6afd 100644 --- a/source/geometry/magneticfield/src/G4CashKarpRKF45.cc +++ b/source/geometry/magneticfield/src/G4CashKarpRKF45.cc @@ -25,7 +25,7 @@ // // // $Id: G4CashKarpRKF45.cc,v 1.14 2006/06/29 18:23:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // The Cash-Karp Runge-Kutta-Fehlberg 4/5 method is an embedded fourth // order method (giving fifth-order accuracy) for the solution of an ODE. diff --git a/source/geometry/magneticfield/src/G4ChordFinder.cc b/source/geometry/magneticfield/src/G4ChordFinder.cc index 17b6a57a15..ae8fbd3cce 100644 --- a/source/geometry/magneticfield/src/G4ChordFinder.cc +++ b/source/geometry/magneticfield/src/G4ChordFinder.cc @@ -25,7 +25,7 @@ // // // $Id: G4ChordFinder.cc,v 1.47 2006/06/29 18:23:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // 25.02.97 John Apostolakis, design and implimentation diff --git a/source/geometry/magneticfield/src/G4ClassicalRK4.cc b/source/geometry/magneticfield/src/G4ClassicalRK4.cc index b5528a0e02..218cddb0c2 100644 --- a/source/geometry/magneticfield/src/G4ClassicalRK4.cc +++ b/source/geometry/magneticfield/src/G4ClassicalRK4.cc @@ -25,7 +25,7 @@ // // // $Id: G4ClassicalRK4.cc,v 1.12 2006/06/29 18:23:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- diff --git a/source/geometry/magneticfield/src/G4DELPHIMagField.cc b/source/geometry/magneticfield/src/G4DELPHIMagField.cc index 9a42b82168..c9aa27df5e 100644 --- a/source/geometry/magneticfield/src/G4DELPHIMagField.cc +++ b/source/geometry/magneticfield/src/G4DELPHIMagField.cc @@ -25,7 +25,7 @@ // // // $Id: G4DELPHIMagField.cc,v 1.6 2006/06/29 18:23:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------------- #include "G4DELPHIMagField.hh" diff --git a/source/geometry/magneticfield/src/G4ElectricField.cc b/source/geometry/magneticfield/src/G4ElectricField.cc index 9bf53b786c..b8e9ddcdf5 100644 --- a/source/geometry/magneticfield/src/G4ElectricField.cc +++ b/source/geometry/magneticfield/src/G4ElectricField.cc @@ -25,7 +25,7 @@ // // // $Id: G4ElectricField.cc,v 1.2 2006/06/29 18:23:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- diff --git a/source/geometry/magneticfield/src/G4ElectroMagneticField.cc b/source/geometry/magneticfield/src/G4ElectroMagneticField.cc index ad536a76d8..89d5686ca1 100644 --- a/source/geometry/magneticfield/src/G4ElectroMagneticField.cc +++ b/source/geometry/magneticfield/src/G4ElectroMagneticField.cc @@ -25,7 +25,7 @@ // // // $Id: G4ElectroMagneticField.cc,v 1.3 2006/06/29 18:23:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- diff --git a/source/geometry/magneticfield/src/G4EqMagElectricField.cc b/source/geometry/magneticfield/src/G4EqMagElectricField.cc index 9188f12616..8f39bacb72 100644 --- a/source/geometry/magneticfield/src/G4EqMagElectricField.cc +++ b/source/geometry/magneticfield/src/G4EqMagElectricField.cc @@ -25,7 +25,7 @@ // // // $Id: G4EqMagElectricField.cc,v 1.13 2006/06/29 18:23:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // This is the standard right-hand side for equation of motion. diff --git a/source/geometry/magneticfield/src/G4EquationOfMotion.cc b/source/geometry/magneticfield/src/G4EquationOfMotion.cc index 9ca45f91ae..d681bed0f4 100644 --- a/source/geometry/magneticfield/src/G4EquationOfMotion.cc +++ b/source/geometry/magneticfield/src/G4EquationOfMotion.cc @@ -25,7 +25,7 @@ // // // $Id: G4EquationOfMotion.cc,v 1.9 2006/06/29 18:23:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- diff --git a/source/geometry/magneticfield/src/G4ExactHelixStepper.cc b/source/geometry/magneticfield/src/G4ExactHelixStepper.cc index f565d50139..d3798069dc 100644 --- a/source/geometry/magneticfield/src/G4ExactHelixStepper.cc +++ b/source/geometry/magneticfield/src/G4ExactHelixStepper.cc @@ -25,7 +25,7 @@ // // // $Id: G4ExactHelixStepper.cc,v 1.4 2006/06/29 18:23:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Helix a-la-Explicity Euler: x_1 = x_0 + helix(h) // with helix(h) being a helix piece of length h diff --git a/source/geometry/magneticfield/src/G4ExplicitEuler.cc b/source/geometry/magneticfield/src/G4ExplicitEuler.cc index 1a7b747ade..b295a57b4d 100644 --- a/source/geometry/magneticfield/src/G4ExplicitEuler.cc +++ b/source/geometry/magneticfield/src/G4ExplicitEuler.cc @@ -25,7 +25,7 @@ // // // $Id: G4ExplicitEuler.cc,v 1.8 2006/06/29 18:23:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Explicit Euler: x_1 = x_0 + h * dx_0 diff --git a/source/geometry/magneticfield/src/G4FieldManager.cc b/source/geometry/magneticfield/src/G4FieldManager.cc index be7f7272eb..46e7487a0b 100644 --- a/source/geometry/magneticfield/src/G4FieldManager.cc +++ b/source/geometry/magneticfield/src/G4FieldManager.cc @@ -25,7 +25,7 @@ // // // $Id: G4FieldManager.cc,v 1.14 2006/06/29 18:23:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- diff --git a/source/geometry/magneticfield/src/G4FieldTrack.cc b/source/geometry/magneticfield/src/G4FieldTrack.cc index 253f6cbea2..65ac701db2 100644 --- a/source/geometry/magneticfield/src/G4FieldTrack.cc +++ b/source/geometry/magneticfield/src/G4FieldTrack.cc @@ -25,7 +25,7 @@ // // // $Id: G4FieldTrack.cc,v 1.13 2006/06/29 18:23:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- diff --git a/source/geometry/magneticfield/src/G4HarmonicPolMagField.cc b/source/geometry/magneticfield/src/G4HarmonicPolMagField.cc index 768c4b3d5d..0fd00f4fa2 100644 --- a/source/geometry/magneticfield/src/G4HarmonicPolMagField.cc +++ b/source/geometry/magneticfield/src/G4HarmonicPolMagField.cc @@ -25,7 +25,7 @@ // // // $Id: G4HarmonicPolMagField.cc,v 1.6 2006/06/29 18:24:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- diff --git a/source/geometry/magneticfield/src/G4HelixExplicitEuler.cc b/source/geometry/magneticfield/src/G4HelixExplicitEuler.cc index dea7e587bd..f2a56e1b7c 100644 --- a/source/geometry/magneticfield/src/G4HelixExplicitEuler.cc +++ b/source/geometry/magneticfield/src/G4HelixExplicitEuler.cc @@ -25,7 +25,7 @@ // // // $Id: G4HelixExplicitEuler.cc,v 1.6 2006/06/29 18:24:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Helix Explicit Euler: x_1 = x_0 + helix(h) diff --git a/source/geometry/magneticfield/src/G4HelixHeum.cc b/source/geometry/magneticfield/src/G4HelixHeum.cc index 47f526fd65..d975e9a660 100644 --- a/source/geometry/magneticfield/src/G4HelixHeum.cc +++ b/source/geometry/magneticfield/src/G4HelixHeum.cc @@ -25,7 +25,7 @@ // // // $Id: G4HelixHeum.cc,v 1.6 2006/06/29 18:24:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Simple Heum: diff --git a/source/geometry/magneticfield/src/G4HelixImplicitEuler.cc b/source/geometry/magneticfield/src/G4HelixImplicitEuler.cc index 6c8a51cc43..984d264bd9 100644 --- a/source/geometry/magneticfield/src/G4HelixImplicitEuler.cc +++ b/source/geometry/magneticfield/src/G4HelixImplicitEuler.cc @@ -25,7 +25,7 @@ // // // $Id: G4HelixImplicitEuler.cc,v 1.6 2006/06/29 18:24:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Helix Implicit Euler: diff --git a/source/geometry/magneticfield/src/G4HelixSimpleRunge.cc b/source/geometry/magneticfield/src/G4HelixSimpleRunge.cc index 1f7a3e79a0..b46617b308 100644 --- a/source/geometry/magneticfield/src/G4HelixSimpleRunge.cc +++ b/source/geometry/magneticfield/src/G4HelixSimpleRunge.cc @@ -25,7 +25,7 @@ // // // $Id: G4HelixSimpleRunge.cc,v 1.7 2006/06/29 18:24:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Simple Runge: diff --git a/source/geometry/magneticfield/src/G4ImplicitEuler.cc b/source/geometry/magneticfield/src/G4ImplicitEuler.cc index ec318a786a..c56bd6cb81 100644 --- a/source/geometry/magneticfield/src/G4ImplicitEuler.cc +++ b/source/geometry/magneticfield/src/G4ImplicitEuler.cc @@ -25,7 +25,7 @@ // // // $Id: G4ImplicitEuler.cc,v 1.9 2006/06/29 18:24:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Implicit Euler: diff --git a/source/geometry/magneticfield/src/G4LineCurrentMagField.cc b/source/geometry/magneticfield/src/G4LineCurrentMagField.cc index 176f55e832..9ec143d9bd 100644 --- a/source/geometry/magneticfield/src/G4LineCurrentMagField.cc +++ b/source/geometry/magneticfield/src/G4LineCurrentMagField.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4LineCurrentMagField.cc,v 1.6 2006/06/29 18:24:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------------- #include "G4LineCurrentMagField.hh" diff --git a/source/geometry/magneticfield/src/G4LineSection.cc b/source/geometry/magneticfield/src/G4LineSection.cc index 8e3a67260e..85a9b91894 100644 --- a/source/geometry/magneticfield/src/G4LineSection.cc +++ b/source/geometry/magneticfield/src/G4LineSection.cc @@ -25,7 +25,7 @@ // // // $Id: G4LineSection.cc,v 1.10 2006/06/29 18:24:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- diff --git a/source/geometry/magneticfield/src/G4MagErrorStepper.cc b/source/geometry/magneticfield/src/G4MagErrorStepper.cc index f8673346ac..850adea1af 100644 --- a/source/geometry/magneticfield/src/G4MagErrorStepper.cc +++ b/source/geometry/magneticfield/src/G4MagErrorStepper.cc @@ -25,7 +25,7 @@ // // // $Id: G4MagErrorStepper.cc,v 1.13 2006/06/29 18:24:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- diff --git a/source/geometry/magneticfield/src/G4MagHelicalStepper.cc b/source/geometry/magneticfield/src/G4MagHelicalStepper.cc index 7cfac734cb..1a91817646 100644 --- a/source/geometry/magneticfield/src/G4MagHelicalStepper.cc +++ b/source/geometry/magneticfield/src/G4MagHelicalStepper.cc @@ -25,7 +25,7 @@ // // // $Id: G4MagHelicalStepper.cc,v 1.16 2006/06/29 18:24:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- diff --git a/source/geometry/magneticfield/src/G4MagIntegratorDriver.cc b/source/geometry/magneticfield/src/G4MagIntegratorDriver.cc index 4290da4906..4d169325e6 100644 --- a/source/geometry/magneticfield/src/G4MagIntegratorDriver.cc +++ b/source/geometry/magneticfield/src/G4MagIntegratorDriver.cc @@ -25,7 +25,7 @@ // // // $Id: G4MagIntegratorDriver.cc,v 1.44 2006/06/29 18:24:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // diff --git a/source/geometry/magneticfield/src/G4MagIntegratorStepper.cc b/source/geometry/magneticfield/src/G4MagIntegratorStepper.cc index 02b4ee8611..41ad4a3a5e 100644 --- a/source/geometry/magneticfield/src/G4MagIntegratorStepper.cc +++ b/source/geometry/magneticfield/src/G4MagIntegratorStepper.cc @@ -25,7 +25,7 @@ // // // $Id: G4MagIntegratorStepper.cc,v 1.11 2006/06/29 18:24:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- diff --git a/source/geometry/magneticfield/src/G4Mag_EqRhs.cc b/source/geometry/magneticfield/src/G4Mag_EqRhs.cc index 5d9b72e7bd..7759815b35 100644 --- a/source/geometry/magneticfield/src/G4Mag_EqRhs.cc +++ b/source/geometry/magneticfield/src/G4Mag_EqRhs.cc @@ -25,7 +25,7 @@ // // // $Id: G4Mag_EqRhs.cc,v 1.11 2006/06/29 18:24:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // This is the standard right-hand side for equation of motion // in a pure Magnetic Field . diff --git a/source/geometry/magneticfield/src/G4Mag_SpinEqRhs.cc b/source/geometry/magneticfield/src/G4Mag_SpinEqRhs.cc index d69f2b2728..e04433a077 100644 --- a/source/geometry/magneticfield/src/G4Mag_SpinEqRhs.cc +++ b/source/geometry/magneticfield/src/G4Mag_SpinEqRhs.cc @@ -25,7 +25,7 @@ // // // $Id: G4Mag_SpinEqRhs.cc,v 1.12 2006/06/29 18:24:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // This is the standard right-hand side for equation of motion. // This version of the right-hand side includes the three components diff --git a/source/geometry/magneticfield/src/G4Mag_UsualEqRhs.cc b/source/geometry/magneticfield/src/G4Mag_UsualEqRhs.cc index 77da70db29..e4c964f96e 100644 --- a/source/geometry/magneticfield/src/G4Mag_UsualEqRhs.cc +++ b/source/geometry/magneticfield/src/G4Mag_UsualEqRhs.cc @@ -25,7 +25,7 @@ // // // $Id: G4Mag_UsualEqRhs.cc,v 1.12 2006/06/29 18:24:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // This is the 'standard' right-hand side for the equation of motion diff --git a/source/geometry/magneticfield/src/G4MagneticField.cc b/source/geometry/magneticfield/src/G4MagneticField.cc index 37b172d314..b3cc1e412b 100644 --- a/source/geometry/magneticfield/src/G4MagneticField.cc +++ b/source/geometry/magneticfield/src/G4MagneticField.cc @@ -25,7 +25,7 @@ // // // $Id: G4MagneticField.cc,v 1.3 2006/06/29 18:24:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- diff --git a/source/geometry/magneticfield/src/G4QuadrupoleMagField.cc b/source/geometry/magneticfield/src/G4QuadrupoleMagField.cc index 7e9e80b1a3..842793a26e 100644 --- a/source/geometry/magneticfield/src/G4QuadrupoleMagField.cc +++ b/source/geometry/magneticfield/src/G4QuadrupoleMagField.cc @@ -25,7 +25,7 @@ // // // $Id: G4QuadrupoleMagField.cc,v 1.4 2006/06/29 18:24:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- diff --git a/source/geometry/magneticfield/src/G4RKG3_Stepper.cc b/source/geometry/magneticfield/src/G4RKG3_Stepper.cc index 8de678ecca..850bfacfdc 100644 --- a/source/geometry/magneticfield/src/G4RKG3_Stepper.cc +++ b/source/geometry/magneticfield/src/G4RKG3_Stepper.cc @@ -25,7 +25,7 @@ // // // $Id: G4RKG3_Stepper.cc,v 1.10 2006/06/29 18:24:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- diff --git a/source/geometry/magneticfield/src/G4SimpleHeum.cc b/source/geometry/magneticfield/src/G4SimpleHeum.cc index b77f18d10d..016ddc484c 100644 --- a/source/geometry/magneticfield/src/G4SimpleHeum.cc +++ b/source/geometry/magneticfield/src/G4SimpleHeum.cc @@ -25,7 +25,7 @@ // // // $Id: G4SimpleHeum.cc,v 1.8 2006/06/29 18:24:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Simple Heum: // x_1 = x_0 + h * diff --git a/source/geometry/magneticfield/src/G4SimpleRunge.cc b/source/geometry/magneticfield/src/G4SimpleRunge.cc index a45c952e71..f6b66f4914 100644 --- a/source/geometry/magneticfield/src/G4SimpleRunge.cc +++ b/source/geometry/magneticfield/src/G4SimpleRunge.cc @@ -25,7 +25,7 @@ // // // $Id: G4SimpleRunge.cc,v 1.10 2006/06/29 18:24:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Simple Runge: // diff --git a/source/geometry/magneticfield/src/G4UniformElectricField.cc b/source/geometry/magneticfield/src/G4UniformElectricField.cc index 5ddccf02d0..1709b31d77 100644 --- a/source/geometry/magneticfield/src/G4UniformElectricField.cc +++ b/source/geometry/magneticfield/src/G4UniformElectricField.cc @@ -25,7 +25,7 @@ // // // $Id: G4UniformElectricField.cc,v 1.12 2006/06/29 18:24:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // diff --git a/source/geometry/magneticfield/src/G4UniformMagField.cc b/source/geometry/magneticfield/src/G4UniformMagField.cc index 963b9a3eff..4b8a3b2b9f 100644 --- a/source/geometry/magneticfield/src/G4UniformMagField.cc +++ b/source/geometry/magneticfield/src/G4UniformMagField.cc @@ -25,7 +25,7 @@ // // // $Id: G4UniformMagField.cc,v 1.11 2006/06/29 18:24:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Class for creation of uniform Magnetic Field diff --git a/source/geometry/management/History b/source/geometry/management/History index 9cf7609c9e..f7ad9fc256 100644 --- a/source/geometry/management/History +++ b/source/geometry/management/History @@ -1,4 +1,4 @@ -$Id: History,v 1.101 2006/05/03 10:03:41 gcosmo Exp $ +$Id: History,v 1.111 2006/11/30 10:39:40 gcosmo Exp $ ------------------------------------------------------------------- ========================================================= @@ -17,6 +17,44 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +November 30, 2006 G.Cosmo geommng-V08-01-08 +- Corrected deregistration and deletion of world default region, now + happening through G4RunManagerKernel. Affected codes: G4LogicalVolume + destructor and G4RegionStore::Clean() method. +- Minor cleanup in the implementation of the other stores. + +November 8, 2006 G.Cosmo geommng-V08-01-07 +- Fixed compilation problems on SUN-CC for changes in the last tag. + Added inclusion of header in G4ReflectedSolid.cc. + +November 6, 2006 J.Allison geommng-V08-01-06 +- Fix in G4ReflectedSolid::CreatePolyhedron() for case of component that + does not have a G4Polyhedron representation. + +October 23, 2006 G.Cosmo geommng-V08-01-05 +- Replaced algorithm for EstimateSurfaceArea() in G4VSolid with more precise + method by M.Kosov based on skin surface estimation. + +October 19, 2006 G.Cosmo geommng-V08-01-04 +- Modified interface for GetSurfaceArea() to be similar to the one for + the computation of the geometrical volume, and allow the caching + mechanism. + +October 18, 2006 G.Cosmo geommng-V08-01-03 +- Added GetSurfaceArea() method to G4VSolid for approximated computation + of the surfare area of a shape. + +October 2, 2006 G.Cosmo geommng-V08-01-02 +- Removed debug printout in G4IdentityTrajectoryFilter implementation. + +September 18, 2006 G.Cosmo geommng-V08-01-01 +- Added empty virtual method CheckOverlaps() to G4VPhysicalVolume to allow + for proper overloading from subclasses. Implementation returns always + 'false', which the case for replicas. + +July 17, 2006 M.Asai geommng-V08-01-00 +- Fix a bug in G4Region.cc for nested parameterization. + May 3, 2006 G.Cosmo geommng-V08-00-05 - Modified G4VStoreNotifier class to be now a typedef of G4VNotifier which is moved in the 'global' module. Adapted stores to the new configuration. diff --git a/source/geometry/management/include/G4AffineTransform.hh b/source/geometry/management/include/G4AffineTransform.hh index 904e88e8cd..bb172fb66b 100644 --- a/source/geometry/management/include/G4AffineTransform.hh +++ b/source/geometry/management/include/G4AffineTransform.hh @@ -25,7 +25,7 @@ // // // $Id: G4AffineTransform.hh,v 1.6 2006/06/29 18:30:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4AffineTransform diff --git a/source/geometry/management/include/G4AffineTransform.icc b/source/geometry/management/include/G4AffineTransform.icc index 802bde0db3..12a2c9265f 100644 --- a/source/geometry/management/include/G4AffineTransform.icc +++ b/source/geometry/management/include/G4AffineTransform.icc @@ -25,7 +25,7 @@ // // // $Id: G4AffineTransform.icc,v 1.8 2006/06/29 18:30:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4AffineTransformation Inline implementation diff --git a/source/geometry/management/include/G4BlockingList.hh b/source/geometry/management/include/G4BlockingList.hh index 026bea3dba..1892ddebd0 100644 --- a/source/geometry/management/include/G4BlockingList.hh +++ b/source/geometry/management/include/G4BlockingList.hh @@ -25,7 +25,7 @@ // // // $Id: G4BlockingList.hh,v 1.4 2006/06/29 18:30:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4BlockingList // diff --git a/source/geometry/management/include/G4BlockingList.icc b/source/geometry/management/include/G4BlockingList.icc index 795a1da82a..fb7577360e 100644 --- a/source/geometry/management/include/G4BlockingList.icc +++ b/source/geometry/management/include/G4BlockingList.icc @@ -25,7 +25,7 @@ // // // $Id: G4BlockingList.icc,v 1.3 2006/06/29 18:30:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4BlockingList Inlined Implementation diff --git a/source/geometry/management/include/G4GeometryManager.hh b/source/geometry/management/include/G4GeometryManager.hh index 485ddd8f00..dd5610f249 100644 --- a/source/geometry/management/include/G4GeometryManager.hh +++ b/source/geometry/management/include/G4GeometryManager.hh @@ -25,7 +25,7 @@ // // // $Id: G4GeometryManager.hh,v 1.11 2006/06/29 18:30:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4GeometryManager // diff --git a/source/geometry/management/include/G4IdentityTrajectoryFilter.hh b/source/geometry/management/include/G4IdentityTrajectoryFilter.hh index fd4ede7d51..f65df793a3 100644 --- a/source/geometry/management/include/G4IdentityTrajectoryFilter.hh +++ b/source/geometry/management/include/G4IdentityTrajectoryFilter.hh @@ -25,7 +25,7 @@ // // // $Id: G4IdentityTrajectoryFilter.hh,v 1.3 2006/06/29 18:30:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class GIdentityTrajectoryFilter diff --git a/source/geometry/management/include/G4LogicalSurface.hh b/source/geometry/management/include/G4LogicalSurface.hh index b9636d2ca3..fa3c68c8f5 100644 --- a/source/geometry/management/include/G4LogicalSurface.hh +++ b/source/geometry/management/include/G4LogicalSurface.hh @@ -25,7 +25,7 @@ // // // $Id: G4LogicalSurface.hh,v 1.10 2006/06/29 18:30:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //////////////////////////////////////////////////////////////////////// // Class G4LogicalSurface diff --git a/source/geometry/management/include/G4LogicalSurface.icc b/source/geometry/management/include/G4LogicalSurface.icc index 25d5b4d8e5..290a6ad662 100644 --- a/source/geometry/management/include/G4LogicalSurface.icc +++ b/source/geometry/management/include/G4LogicalSurface.icc @@ -25,7 +25,7 @@ // // // $Id: G4LogicalSurface.icc,v 1.9 2006/06/29 18:30:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //////////////////////////////////////////////////////////////////////// // Surface Class Inline Methods diff --git a/source/geometry/management/include/G4LogicalVolume.hh b/source/geometry/management/include/G4LogicalVolume.hh index 94c1cee201..98df684afb 100644 --- a/source/geometry/management/include/G4LogicalVolume.hh +++ b/source/geometry/management/include/G4LogicalVolume.hh @@ -25,7 +25,7 @@ // // // $Id: G4LogicalVolume.hh,v 1.26 2006/06/29 18:30:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4LogicalVolume diff --git a/source/geometry/management/include/G4LogicalVolume.icc b/source/geometry/management/include/G4LogicalVolume.icc index d8ea09bc72..873862390b 100644 --- a/source/geometry/management/include/G4LogicalVolume.icc +++ b/source/geometry/management/include/G4LogicalVolume.icc @@ -25,7 +25,7 @@ // // // $Id: G4LogicalVolume.icc,v 1.24 2006/06/29 18:30:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4LogicalVolume Inline Implementation file diff --git a/source/geometry/management/include/G4LogicalVolumeStore.hh b/source/geometry/management/include/G4LogicalVolumeStore.hh index 5ed4166061..8c9cb417a3 100644 --- a/source/geometry/management/include/G4LogicalVolumeStore.hh +++ b/source/geometry/management/include/G4LogicalVolumeStore.hh @@ -25,7 +25,7 @@ // // // $Id: G4LogicalVolumeStore.hh,v 1.12 2006/06/29 18:30:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4LogicalVolumeStore // diff --git a/source/geometry/management/include/G4PhysicalVolumeStore.hh b/source/geometry/management/include/G4PhysicalVolumeStore.hh index 99b53ee446..fe2c9c9d60 100644 --- a/source/geometry/management/include/G4PhysicalVolumeStore.hh +++ b/source/geometry/management/include/G4PhysicalVolumeStore.hh @@ -25,7 +25,7 @@ // // // $Id: G4PhysicalVolumeStore.hh,v 1.14 2006/06/29 18:31:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4PhysicalVolume // diff --git a/source/geometry/management/include/G4ReflectedSolid.hh b/source/geometry/management/include/G4ReflectedSolid.hh index b52c0b87e8..9e64c552f7 100644 --- a/source/geometry/management/include/G4ReflectedSolid.hh +++ b/source/geometry/management/include/G4ReflectedSolid.hh @@ -25,7 +25,7 @@ // // // $Id: G4ReflectedSolid.hh,v 1.5 2006/06/29 18:31:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4ReflectedSolid diff --git a/source/geometry/management/include/G4Region.hh b/source/geometry/management/include/G4Region.hh index 3d0ce5d9ec..e6aa49faa2 100644 --- a/source/geometry/management/include/G4Region.hh +++ b/source/geometry/management/include/G4Region.hh @@ -25,7 +25,7 @@ // // // $Id: G4Region.hh,v 1.17 2006/06/29 18:31:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4Region // diff --git a/source/geometry/management/include/G4Region.icc b/source/geometry/management/include/G4Region.icc index 955417b9cb..5e22d17620 100644 --- a/source/geometry/management/include/G4Region.icc +++ b/source/geometry/management/include/G4Region.icc @@ -25,7 +25,7 @@ // // // $Id: G4Region.icc,v 1.13 2006/06/29 18:31:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4Region Inline Implementation file diff --git a/source/geometry/management/include/G4RegionStore.hh b/source/geometry/management/include/G4RegionStore.hh index 585b573bb9..ebaf6d829a 100644 --- a/source/geometry/management/include/G4RegionStore.hh +++ b/source/geometry/management/include/G4RegionStore.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4RegionStore.hh,v 1.9 2006/06/29 18:31:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4RegionStore.hh,v 1.10 2006/11/30 10:39:28 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4RegionStore // @@ -96,8 +96,7 @@ class G4RegionStore : public std::vector // If it does not exist it will allocate one delegating ownership // to the client. - virtual ~G4RegionStore(); - // Destructor: takes care to delete allocated regions. + public: // without description void SetWorldVolume(); // Set a world volume pointer to a region that belongs to it. @@ -107,6 +106,9 @@ class G4RegionStore : public std::vector protected: G4RegionStore(); + // Protected singleton constructor. + virtual ~G4RegionStore(); + // Destructor: takes care to delete allocated regions. private: diff --git a/source/geometry/management/include/G4SmartVoxelHeader.hh b/source/geometry/management/include/G4SmartVoxelHeader.hh index b5d23d0bbb..6e2d69c8c7 100644 --- a/source/geometry/management/include/G4SmartVoxelHeader.hh +++ b/source/geometry/management/include/G4SmartVoxelHeader.hh @@ -25,7 +25,7 @@ // // // $Id: G4SmartVoxelHeader.hh,v 1.10 2006/06/29 18:32:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4SmartVoxelHeader // diff --git a/source/geometry/management/include/G4SmartVoxelHeader.icc b/source/geometry/management/include/G4SmartVoxelHeader.icc index eba47598bd..db1726491e 100644 --- a/source/geometry/management/include/G4SmartVoxelHeader.icc +++ b/source/geometry/management/include/G4SmartVoxelHeader.icc @@ -25,7 +25,7 @@ // // // $Id: G4SmartVoxelHeader.icc,v 1.6 2006/06/29 18:32:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4SmartVoxelHeader Inline implementation diff --git a/source/geometry/management/include/G4SmartVoxelNode.hh b/source/geometry/management/include/G4SmartVoxelNode.hh index a93996f130..f2e7b135ff 100644 --- a/source/geometry/management/include/G4SmartVoxelNode.hh +++ b/source/geometry/management/include/G4SmartVoxelNode.hh @@ -25,7 +25,7 @@ // // // $Id: G4SmartVoxelNode.hh,v 1.10 2006/06/29 18:32:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4SmartVoxelNode // diff --git a/source/geometry/management/include/G4SmartVoxelNode.icc b/source/geometry/management/include/G4SmartVoxelNode.icc index 9bacaf5789..83b590e92a 100644 --- a/source/geometry/management/include/G4SmartVoxelNode.icc +++ b/source/geometry/management/include/G4SmartVoxelNode.icc @@ -25,7 +25,7 @@ // // // $Id: G4SmartVoxelNode.icc,v 1.5 2006/06/29 18:32:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4SmartVoxelNode Inline implementation diff --git a/source/geometry/management/include/G4SmartVoxelProxy.hh b/source/geometry/management/include/G4SmartVoxelProxy.hh index 20e79cd347..1e356c76b3 100644 --- a/source/geometry/management/include/G4SmartVoxelProxy.hh +++ b/source/geometry/management/include/G4SmartVoxelProxy.hh @@ -25,7 +25,7 @@ // // // $Id: G4SmartVoxelProxy.hh,v 1.8 2006/06/29 18:32:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4SmartVoxelProxy // diff --git a/source/geometry/management/include/G4SmartVoxelProxy.icc b/source/geometry/management/include/G4SmartVoxelProxy.icc index c65db75700..c0082c4258 100644 --- a/source/geometry/management/include/G4SmartVoxelProxy.icc +++ b/source/geometry/management/include/G4SmartVoxelProxy.icc @@ -25,7 +25,7 @@ // // // $Id: G4SmartVoxelProxy.icc,v 1.4 2006/06/29 18:32:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4SmartVoxelProxy Inline implementation diff --git a/source/geometry/management/include/G4SmartVoxelStat.hh b/source/geometry/management/include/G4SmartVoxelStat.hh index 3a9a71337f..4f9062c5e5 100644 --- a/source/geometry/management/include/G4SmartVoxelStat.hh +++ b/source/geometry/management/include/G4SmartVoxelStat.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4SmartVoxelStat.hh,v 1.4 2006/06/29 18:32:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 class header file diff --git a/source/geometry/management/include/G4SolidStore.hh b/source/geometry/management/include/G4SolidStore.hh index cb08a70efb..a629c8cbca 100644 --- a/source/geometry/management/include/G4SolidStore.hh +++ b/source/geometry/management/include/G4SolidStore.hh @@ -25,7 +25,7 @@ // // // $Id: G4SolidStore.hh,v 1.12 2006/06/29 18:32:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4SolidStore // diff --git a/source/geometry/management/include/G4TouchableHandle.hh b/source/geometry/management/include/G4TouchableHandle.hh index e2aead33b4..71d5bbb11f 100644 --- a/source/geometry/management/include/G4TouchableHandle.hh +++ b/source/geometry/management/include/G4TouchableHandle.hh @@ -25,7 +25,7 @@ // // // $Id: G4TouchableHandle.hh,v 1.6 2006/06/29 18:32:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Class G4TouchableHandle // diff --git a/source/geometry/management/include/G4VCurvedTrajectoryFilter.hh b/source/geometry/management/include/G4VCurvedTrajectoryFilter.hh index 8cfe7b6005..2163669457 100644 --- a/source/geometry/management/include/G4VCurvedTrajectoryFilter.hh +++ b/source/geometry/management/include/G4VCurvedTrajectoryFilter.hh @@ -25,7 +25,7 @@ // // // $Id: G4VCurvedTrajectoryFilter.hh,v 1.3 2006/06/29 18:32:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4VCurevedTrajectoryFilter diff --git a/source/geometry/management/include/G4VNestedParameterisation.hh b/source/geometry/management/include/G4VNestedParameterisation.hh index a0b627eab6..1197e812e9 100644 --- a/source/geometry/management/include/G4VNestedParameterisation.hh +++ b/source/geometry/management/include/G4VNestedParameterisation.hh @@ -25,7 +25,7 @@ // // // $Id: G4VNestedParameterisation.hh,v 1.6 2006/06/29 18:32:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4VNestedParameterisation // diff --git a/source/geometry/management/include/G4VPVDivisionFactory.hh b/source/geometry/management/include/G4VPVDivisionFactory.hh index 3a0e10908b..3eadd46e47 100644 --- a/source/geometry/management/include/G4VPVDivisionFactory.hh +++ b/source/geometry/management/include/G4VPVDivisionFactory.hh @@ -25,7 +25,7 @@ // // // $Id: G4VPVDivisionFactory.hh,v 1.2 2006/06/29 18:32:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4VPVDivisionFactory diff --git a/source/geometry/management/include/G4VPVParameterisation.hh b/source/geometry/management/include/G4VPVParameterisation.hh index c646692b86..7f86a0cbc1 100644 --- a/source/geometry/management/include/G4VPVParameterisation.hh +++ b/source/geometry/management/include/G4VPVParameterisation.hh @@ -25,7 +25,7 @@ // // // $Id: G4VPVParameterisation.hh,v 1.12 2006/06/29 18:32:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4VPVParamterisation // diff --git a/source/geometry/management/include/G4VPhysicalVolume.hh b/source/geometry/management/include/G4VPhysicalVolume.hh index df57a32f4c..fd574dc289 100644 --- a/source/geometry/management/include/G4VPhysicalVolume.hh +++ b/source/geometry/management/include/G4VPhysicalVolume.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VPhysicalVolume.hh,v 1.14 2006/06/29 18:32:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VPhysicalVolume.hh,v 1.15 2006/09/18 14:03:25 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4VPhysicalVolume @@ -165,6 +165,12 @@ class G4VPhysicalVolume // is regular, voxel-like. Value is id for structure type. // If non-zero the volume is a candidate for specialised // navigation such as 'nearest neighbour' directly on volumes. + virtual G4bool CheckOverlaps(G4int res=1000); + // Verifies if the placed volume is overlapping with existing + // daughters or with the mother volume. Provides default resolution + // for the number of points to be generated and verified. + // Concrete implementation is done and required only for placed and + // parameterised volumes. Returns true if the volume is overlapping. public: // without description diff --git a/source/geometry/management/include/G4VPhysicalVolume.icc b/source/geometry/management/include/G4VPhysicalVolume.icc index 0aa935531a..e34def2fbb 100644 --- a/source/geometry/management/include/G4VPhysicalVolume.icc +++ b/source/geometry/management/include/G4VPhysicalVolume.icc @@ -25,7 +25,7 @@ // // // $Id: G4VPhysicalVolume.icc,v 1.10 2006/06/29 18:32:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4VPhysicalVolume Inline Implementation diff --git a/source/geometry/management/include/G4VSolid.hh b/source/geometry/management/include/G4VSolid.hh index c054882410..fa1bcc9a99 100644 --- a/source/geometry/management/include/G4VSolid.hh +++ b/source/geometry/management/include/G4VSolid.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VSolid.hh,v 1.22 2006/06/29 18:32:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VSolid.hh,v 1.25 2006/10/19 15:43:40 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4VSolid @@ -175,6 +175,13 @@ class G4VSolid // or anyway to cache the computed value. // Note: the computed value is NOT cached. + virtual G4double GetSurfaceArea(); + // Return an estimation of the solid surface area in internal units. + // This method may be overloaded by derived classes to compute the + // exact geometrical quantity for solids where this is possible, + // or anyway to cache the computed value. + // Note: the computed value is NOT cached. + virtual G4GeometryType GetEntityType() const = 0; // Provide identification of the class of an object. // (required for persistency and STEP interface) @@ -278,6 +285,11 @@ class G4VSolid // Accuracy is limited by the second argument or the statistics // expressed by the first argument. + G4double EstimateSurfaceArea(G4int nStat, G4double ell) const; + // Calculate surface area only based on Inside() method. + // Accuracy is limited by the second argument or the statistics + // expressed by the first argument. + private: void ClipPolygonToSimpleLimits(G4ThreeVectorList& pPolygon, diff --git a/source/geometry/management/include/G4VSolid.icc b/source/geometry/management/include/G4VSolid.icc index e1c90fc151..4a0062298a 100644 --- a/source/geometry/management/include/G4VSolid.icc +++ b/source/geometry/management/include/G4VSolid.icc @@ -25,7 +25,7 @@ // // // $Id: G4VSolid.icc,v 1.8 2006/06/29 18:33:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4VSolid Inline implementation diff --git a/source/geometry/management/include/G4VStoreNotifier.hh b/source/geometry/management/include/G4VStoreNotifier.hh index ba2a92ebb6..d58c77356e 100644 --- a/source/geometry/management/include/G4VStoreNotifier.hh +++ b/source/geometry/management/include/G4VStoreNotifier.hh @@ -25,7 +25,7 @@ // // // $Id: G4VStoreNotifier.hh,v 1.3 2006/06/29 18:33:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4VStoreNotifier // diff --git a/source/geometry/management/include/G4VTouchable.hh b/source/geometry/management/include/G4VTouchable.hh index 08bb531288..dafcd7deca 100644 --- a/source/geometry/management/include/G4VTouchable.hh +++ b/source/geometry/management/include/G4VTouchable.hh @@ -25,7 +25,7 @@ // // // $Id: G4VTouchable.hh,v 1.9 2006/06/29 18:33:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4VTouchable diff --git a/source/geometry/management/include/G4VTouchable.icc b/source/geometry/management/include/G4VTouchable.icc index 5d67ca1843..74f9902ad2 100644 --- a/source/geometry/management/include/G4VTouchable.icc +++ b/source/geometry/management/include/G4VTouchable.icc @@ -25,7 +25,7 @@ // // // $Id: G4VTouchable.icc,v 1.9 2006/06/29 18:33:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4VTouchable Inline implementation diff --git a/source/geometry/management/include/G4VUserRegionInformation.hh b/source/geometry/management/include/G4VUserRegionInformation.hh index e9da3a4000..ed4e260848 100644 --- a/source/geometry/management/include/G4VUserRegionInformation.hh +++ b/source/geometry/management/include/G4VUserRegionInformation.hh @@ -25,7 +25,7 @@ // // // $Id: G4VUserRegionInformation.hh,v 1.4 2006/06/29 18:33:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/management/include/G4VVolumeMaterialScanner.hh b/source/geometry/management/include/G4VVolumeMaterialScanner.hh index 34c7b6ae00..d729266f1b 100644 --- a/source/geometry/management/include/G4VVolumeMaterialScanner.hh +++ b/source/geometry/management/include/G4VVolumeMaterialScanner.hh @@ -25,7 +25,7 @@ // // // $Id: G4VVolumeMaterialScanner.hh,v 1.4 2006/06/29 18:33:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4VVolumeMaterialScanner // diff --git a/source/geometry/management/include/G4VoxelLimits.hh b/source/geometry/management/include/G4VoxelLimits.hh index be90293d0e..8e6ad4c27b 100644 --- a/source/geometry/management/include/G4VoxelLimits.hh +++ b/source/geometry/management/include/G4VoxelLimits.hh @@ -25,7 +25,7 @@ // // // $Id: G4VoxelLimits.hh,v 1.9 2006/06/29 18:33:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4VoxelLimits // diff --git a/source/geometry/management/include/G4VoxelLimits.icc b/source/geometry/management/include/G4VoxelLimits.icc index 9bb54e1b98..87dcf3b825 100644 --- a/source/geometry/management/include/G4VoxelLimits.icc +++ b/source/geometry/management/include/G4VoxelLimits.icc @@ -25,7 +25,7 @@ // // // $Id: G4VoxelLimits.icc,v 1.4 2006/06/29 18:33:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4VoxelLimits Inline implementation diff --git a/source/geometry/management/include/meshdefs.hh b/source/geometry/management/include/meshdefs.hh index ed6c92b24c..a1a90838f3 100644 --- a/source/geometry/management/include/meshdefs.hh +++ b/source/geometry/management/include/meshdefs.hh @@ -25,7 +25,7 @@ // // // $Id: meshdefs.hh,v 1.7 2006/06/29 18:33:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Tube/Cone Meshing constants for extent calculations diff --git a/source/geometry/management/include/voxeldefs.hh b/source/geometry/management/include/voxeldefs.hh index 3fe4b50ece..83e1b551d5 100644 --- a/source/geometry/management/include/voxeldefs.hh +++ b/source/geometry/management/include/voxeldefs.hh @@ -25,7 +25,7 @@ // // // $Id: voxeldefs.hh,v 1.7 2006/06/29 18:33:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // diff --git a/source/geometry/management/src/G4BlockingList.cc b/source/geometry/management/src/G4BlockingList.cc index 97ad3536c2..1a5e9d3a3e 100644 --- a/source/geometry/management/src/G4BlockingList.cc +++ b/source/geometry/management/src/G4BlockingList.cc @@ -25,7 +25,7 @@ // // // $Id: G4BlockingList.cc,v 1.3 2006/06/29 18:33:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4BlockingList Implementation diff --git a/source/geometry/management/src/G4GeometryManager.cc b/source/geometry/management/src/G4GeometryManager.cc index 33f89de34e..ebbff3ef2a 100644 --- a/source/geometry/management/src/G4GeometryManager.cc +++ b/source/geometry/management/src/G4GeometryManager.cc @@ -25,7 +25,7 @@ // // // $Id: G4GeometryManager.cc,v 1.18 2006/06/29 18:33:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4GeometryManager // diff --git a/source/geometry/management/src/G4IdentityTrajectoryFilter.cc b/source/geometry/management/src/G4IdentityTrajectoryFilter.cc index 13fb27a261..257a01b990 100644 --- a/source/geometry/management/src/G4IdentityTrajectoryFilter.cc +++ b/source/geometry/management/src/G4IdentityTrajectoryFilter.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4IdentityTrajectoryFilter.cc,v 1.3 2006/06/29 18:33:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4IdentityTrajectoryFilter.cc,v 1.4 2006/10/02 10:09:24 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------------ @@ -47,7 +47,6 @@ G4IdentityTrajectoryFilter::TakeIntermediatePoint( G4ThreeVector newPoint ) // the vector; the vector will never be copied by value itself. In // the final version, will probably want to create the intermediate // points at this stage. + // fpFilteredPoints->push_back( newPoint ); - G4cout << "spong: G4IdentityTrajectoryFilter::TakeIntermediatePoint" - << G4endl; } diff --git a/source/geometry/management/src/G4LogicalVolume.cc b/source/geometry/management/src/G4LogicalVolume.cc index 6e4af1a1f1..6825e75cea 100644 --- a/source/geometry/management/src/G4LogicalVolume.cc +++ b/source/geometry/management/src/G4LogicalVolume.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4LogicalVolume.cc,v 1.31 2006/06/29 18:33:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4LogicalVolume.cc,v 1.32 2006/11/30 10:39:28 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4LogicalVolume Implementation @@ -99,7 +99,11 @@ G4LogicalVolume::G4LogicalVolume( __void__& ) // G4LogicalVolume::~G4LogicalVolume() { - if(fRootRegion) fRegion->RemoveRootLogicalVolume(this); + // Avoid de-registration of root region if treating the first world volume + // + if( (fRootRegion) && (this != (*G4LogicalVolumeStore::GetInstance())[0]) ) + { fRegion->RemoveRootLogicalVolume(this); } + G4LogicalVolumeStore::DeRegister(this); } diff --git a/source/geometry/management/src/G4LogicalVolumeStore.cc b/source/geometry/management/src/G4LogicalVolumeStore.cc index 184d13747e..dc2ad41caf 100644 --- a/source/geometry/management/src/G4LogicalVolumeStore.cc +++ b/source/geometry/management/src/G4LogicalVolumeStore.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4LogicalVolumeStore.cc,v 1.16 2006/06/29 18:33:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4LogicalVolumeStore.cc,v 1.17 2006/11/30 10:39:28 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4LogicalVolumeStore // @@ -89,16 +89,16 @@ void G4LogicalVolumeStore::Clean() size_t i=0; G4LogicalVolumeStore* store = GetInstance(); - std::vector::iterator pos; #ifdef G4GEOMETRY_VOXELDEBUG G4cout << "Deleting Logical Volumes ... "; #endif - for(pos=store->begin(); pos!=store->end(); pos++) + for(iterator pos=store->begin(); pos!=store->end(); pos++) { - if (fgNotifier) fgNotifier->NotifyDeRegistration(); - if (*pos) delete *pos; i++; + if (fgNotifier) { fgNotifier->NotifyDeRegistration(); } + if (*pos) { delete *pos; } + i++; } #ifdef G4GEOMETRY_VOXELDEBUG @@ -129,7 +129,7 @@ void G4LogicalVolumeStore::SetNotifier(G4VStoreNotifier* pNotifier) void G4LogicalVolumeStore::Register(G4LogicalVolume* pVolume) { GetInstance()->push_back(pVolume); - if (fgNotifier) fgNotifier->NotifyRegistration(); + if (fgNotifier) { fgNotifier->NotifyRegistration(); } } // *************************************************************************** @@ -140,7 +140,7 @@ void G4LogicalVolumeStore::DeRegister(G4LogicalVolume* pVolume) { if (!locked) // Do not de-register if locked ! { - if (fgNotifier) fgNotifier->NotifyDeRegistration(); + if (fgNotifier) { fgNotifier->NotifyDeRegistration(); } for (iterator i=GetInstance()->begin(); i!=GetInstance()->end(); i++) { if (**i==*pVolume) diff --git a/source/geometry/management/src/G4PhysicalVolumeStore.cc b/source/geometry/management/src/G4PhysicalVolumeStore.cc index f13f2f7ffc..c1b7078a83 100644 --- a/source/geometry/management/src/G4PhysicalVolumeStore.cc +++ b/source/geometry/management/src/G4PhysicalVolumeStore.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4PhysicalVolumeStore.cc,v 1.17 2006/06/29 18:33:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4PhysicalVolumeStore.cc,v 1.18 2006/11/30 10:39:28 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4PhysicalVolumeStore // @@ -101,14 +101,15 @@ void G4PhysicalVolumeStore::Clean(G4bool notifyLV) { for(pos=store->begin(); pos!=store->end(); pos++) { - if (*pos) (*pos)->GetLogicalVolume()->ClearDaughters(); + if (*pos) { (*pos)->GetLogicalVolume()->ClearDaughters(); } } } for(pos=store->begin(); pos!=store->end(); pos++) { - if (fgNotifier) fgNotifier->NotifyDeRegistration(); - if (*pos) delete *pos; i++; + if (fgNotifier) { fgNotifier->NotifyDeRegistration(); } + if (*pos) { delete *pos; } + i++; } #ifdef G4GEOMETRY_VOXELDEBUG @@ -139,7 +140,7 @@ void G4PhysicalVolumeStore::SetNotifier(G4VStoreNotifier* pNotifier) void G4PhysicalVolumeStore::Register(G4VPhysicalVolume* pVolume) { GetInstance()->push_back(pVolume); - if (fgNotifier) fgNotifier->NotifyRegistration(); + if (fgNotifier) { fgNotifier->NotifyRegistration(); } } // *************************************************************************** @@ -151,9 +152,9 @@ void G4PhysicalVolumeStore::DeRegister(G4VPhysicalVolume* pVolume) { if (!locked) // Do not de-register if locked ! { - if (fgNotifier) fgNotifier->NotifyDeRegistration(); + if (fgNotifier) { fgNotifier->NotifyDeRegistration(); } G4LogicalVolume* motherLogical = pVolume->GetMotherLogical(); - if (motherLogical) motherLogical->RemoveDaughter(pVolume); + if (motherLogical) { motherLogical->RemoveDaughter(pVolume); } for (iterator i=GetInstance()->begin(); i!=GetInstance()->end(); i++) { if (**i==*pVolume) diff --git a/source/geometry/management/src/G4ReflectedSolid.cc b/source/geometry/management/src/G4ReflectedSolid.cc index de9b8a456b..ee65ad9d84 100644 --- a/source/geometry/management/src/G4ReflectedSolid.cc +++ b/source/geometry/management/src/G4ReflectedSolid.cc @@ -24,9 +24,9 @@ // ******************************************************************** // // -// $Id: G4ReflectedSolid.cc,v 1.8 2006/06/29 18:33:36 gunter Exp $ +// $Id: G4ReflectedSolid.cc,v 1.11 2006/11/08 09:56:33 gcosmo Exp $ // -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Implementation for G4ReflectedSolid class for boolean // operations between other solids @@ -36,6 +36,9 @@ // -------------------------------------------------------------------- #include "G4ReflectedSolid.hh" + +#include + #include "G4Point3D.hh" #include "G4Normal3D.hh" @@ -552,9 +555,21 @@ G4Polyhedron* G4ReflectedSolid::CreatePolyhedron () const { G4Polyhedron* polyhedron = fPtrSolid->CreatePolyhedron(); - polyhedron->Transform(*fDirectTransform3D); - - return polyhedron; + if (polyhedron) + { + polyhedron->Transform(*fDirectTransform3D); + return polyhedron; + } + else + { + std::ostringstream oss; + oss << "Solid - " << GetName() + << " - original solid has no" << G4endl + << " corresponding polyhedron. Returning NULL!"; + G4Exception("G4ReflectedSolid::CreatePolyhedron()", "InvalidSetup", + JustWarning, oss.str().c_str()); + return 0; + } } ///////////////////////////////////////////////////////// diff --git a/source/geometry/management/src/G4Region.cc b/source/geometry/management/src/G4Region.cc index 7604710484..5040ed301a 100644 --- a/source/geometry/management/src/G4Region.cc +++ b/source/geometry/management/src/G4Region.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Region.cc,v 1.20 2006/06/29 18:33:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Region.cc,v 1.21 2006/07/17 08:36:47 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4Region Implementation @@ -176,9 +176,9 @@ void G4Region::ScanVolumeTree(G4LogicalVolume* lv, G4bool region) } AddMaterial(volMat); } - G4LogicalVolume* daughterLVol = daughterPVol->GetLogicalVolume(); - ScanVolumeTree(daughterLVol, region); } + G4LogicalVolume* daughterLVol = daughterPVol->GetLogicalVolume(); + ScanVolumeTree(daughterLVol, region); } else { diff --git a/source/geometry/management/src/G4RegionStore.cc b/source/geometry/management/src/G4RegionStore.cc index 4fc5331bb0..37fc01c7e7 100644 --- a/source/geometry/management/src/G4RegionStore.cc +++ b/source/geometry/management/src/G4RegionStore.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4RegionStore.cc,v 1.11 2006/06/29 18:33:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4RegionStore.cc,v 1.12 2006/11/30 10:39:28 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4RegionStore // @@ -39,6 +39,7 @@ #include "G4RegionStore.hh" #include "G4GeometryManager.hh" #include "G4VPhysicalVolume.hh" +#include "G4PhysicalVolumeStore.hh" #include "G4ios.hh" @@ -92,16 +93,18 @@ void G4RegionStore::Clean() size_t i=0; G4RegionStore* store = GetInstance(); - std::vector::iterator pos; #ifdef G4GEOMETRY_VOXELDEBUG G4cout << "Deleting Regions ... "; #endif - for(pos=store->begin()+1; pos!=store->end(); pos++) + // Do NOT delete world region ! + // + for(iterator pos=store->begin(); pos!=store->end(); ++pos) { - if (fgNotifier) fgNotifier->NotifyDeRegistration(); - if (*pos) delete *pos; i++; // Do NOT delete world region ! + if (fgNotifier) { fgNotifier->NotifyDeRegistration(); } + if (*pos) { delete *pos; } + i++; } #ifdef G4GEOMETRY_VOXELDEBUG @@ -132,7 +135,7 @@ void G4RegionStore::SetNotifier(G4VStoreNotifier* pNotifier) void G4RegionStore::Register(G4Region* pRegion) { GetInstance()->push_back(pRegion); - if (fgNotifier) fgNotifier->NotifyRegistration(); + if (fgNotifier) { fgNotifier->NotifyRegistration(); } } // *************************************************************************** @@ -143,7 +146,7 @@ void G4RegionStore::DeRegister(G4Region* pRegion) { if (!locked) // Do not de-register if locked ! { - if (fgNotifier) fgNotifier->NotifyDeRegistration(); + if (fgNotifier) { fgNotifier->NotifyDeRegistration(); } for (iterator i=GetInstance()->begin(); i!=GetInstance()->end(); i++) { if (**i==*pRegion) @@ -178,7 +181,7 @@ G4bool G4RegionStore::IsModified() const { for (iterator i=GetInstance()->begin(); i!=GetInstance()->end(); i++) { - if ((*i)->IsModified()) return true; + if ((*i)->IsModified()) { return true; } } return false; } @@ -196,7 +199,6 @@ void G4RegionStore::ResetRegionModified() } } - // *************************************************************************** // Forces recomputation of material lists in all regions in the store. // *************************************************************************** @@ -205,7 +207,7 @@ void G4RegionStore::UpdateMaterialList(G4VPhysicalVolume* currentWorld) { for (iterator i=GetInstance()->begin(); i!=GetInstance()->end(); i++) { - if((*i)->GetWorldPhysical()==currentWorld) (*i)->UpdateMaterialList(); + if((*i)->GetWorldPhysical()==currentWorld) { (*i)->UpdateMaterialList(); } } } @@ -217,8 +219,7 @@ G4Region* G4RegionStore::GetRegion(const G4String& name, G4bool verbose) const { for (iterator i=GetInstance()->begin(); i!=GetInstance()->end(); i++) { - if ((*i)->GetName() == name) - return *i; + if ((*i)->GetName() == name) { return *i; } } if (verbose) { @@ -249,22 +250,25 @@ G4Region* G4RegionStore::FindOrCreateRegion(const G4String& name) // Scan over all world volumes. // ************************************************************************** // -#include "G4VPhysicalVolume.hh" -#include "G4PhysicalVolumeStore.hh" void G4RegionStore::SetWorldVolume() { // Reset all pointers first + // for (iterator i=GetInstance()->begin(); i!=GetInstance()->end(); i++) { (*i)->SetWorld(0); } // Find world volumes - G4PhysicalVolumeStore* fPhysicalVolumeStore = G4PhysicalVolumeStore::GetInstance(); + // + G4PhysicalVolumeStore* fPhysicalVolumeStore + = G4PhysicalVolumeStore::GetInstance(); size_t nPhys = fPhysicalVolumeStore->size(); - for(size_t iPhys=0;iPhysGetMotherLogical()) continue; // not a world volume - // Now fPhys is a world volume, set it to regions that belong to it. + if(fPhys->GetMotherLogical()) { continue; } // not a world volume + + // Now 'fPhys' is a world volume, set it to regions that belong to it. + // for (iterator i=GetInstance()->begin(); i!=GetInstance()->end(); i++) { (*i)->SetWorld(fPhys); } } diff --git a/source/geometry/management/src/G4SmartVoxelHeader.cc b/source/geometry/management/src/G4SmartVoxelHeader.cc index e295806051..aea2378c13 100644 --- a/source/geometry/management/src/G4SmartVoxelHeader.cc +++ b/source/geometry/management/src/G4SmartVoxelHeader.cc @@ -25,7 +25,7 @@ // // // $Id: G4SmartVoxelHeader.cc,v 1.28 2006/06/29 18:33:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4SmartVoxelHeader diff --git a/source/geometry/management/src/G4SmartVoxelNode.cc b/source/geometry/management/src/G4SmartVoxelNode.cc index f57d7b40fb..53fbc357da 100644 --- a/source/geometry/management/src/G4SmartVoxelNode.cc +++ b/source/geometry/management/src/G4SmartVoxelNode.cc @@ -25,7 +25,7 @@ // // // $Id: G4SmartVoxelNode.cc,v 1.6 2006/06/29 18:33:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Class G4SmartVoxelNode // diff --git a/source/geometry/management/src/G4SmartVoxelProxy.cc b/source/geometry/management/src/G4SmartVoxelProxy.cc index 73af65fff6..24a10730aa 100644 --- a/source/geometry/management/src/G4SmartVoxelProxy.cc +++ b/source/geometry/management/src/G4SmartVoxelProxy.cc @@ -25,7 +25,7 @@ // // // $Id: G4SmartVoxelProxy.cc,v 1.3 2006/06/29 18:33:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Class G4SmartVoxelProxy // diff --git a/source/geometry/management/src/G4SmartVoxelStat.cc b/source/geometry/management/src/G4SmartVoxelStat.cc index d0abb52ff6..fc2f2e3621 100644 --- a/source/geometry/management/src/G4SmartVoxelStat.cc +++ b/source/geometry/management/src/G4SmartVoxelStat.cc @@ -25,7 +25,7 @@ // // // $Id: G4SmartVoxelStat.cc,v 1.3 2006/06/29 18:33:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/management/src/G4SolidStore.cc b/source/geometry/management/src/G4SolidStore.cc index dca2296686..baa0359cfb 100644 --- a/source/geometry/management/src/G4SolidStore.cc +++ b/source/geometry/management/src/G4SolidStore.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4SolidStore.cc,v 1.15 2006/06/29 18:33:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4SolidStore.cc,v 1.16 2006/11/30 10:39:28 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4SolidStore // @@ -64,8 +64,6 @@ G4SolidStore::G4SolidStore() // G4SolidStore::~G4SolidStore() { - // NOTE: destruction of solids is client responsibility ! - // clear(); Clean(); } @@ -91,16 +89,16 @@ void G4SolidStore::Clean() size_t i=0; G4SolidStore* store = GetInstance(); - std::vector::iterator pos; #ifdef G4GEOMETRY_VOXELDEBUG G4cout << "Deleting Solids ... "; #endif - for(pos=store->begin(); pos!=store->end(); pos++) + for(iterator pos=store->begin(); pos!=store->end(); pos++) { - if (fgNotifier) fgNotifier->NotifyDeRegistration(); - if (*pos) delete *pos; i++; + if (fgNotifier) { fgNotifier->NotifyDeRegistration(); } + if (*pos) { delete *pos; } + i++; } #ifdef G4GEOMETRY_VOXELDEBUG @@ -131,7 +129,7 @@ void G4SolidStore::SetNotifier(G4VStoreNotifier* pNotifier) void G4SolidStore::Register(G4VSolid* pSolid) { GetInstance()->push_back(pSolid); - if (fgNotifier) fgNotifier->NotifyRegistration(); + if (fgNotifier) { fgNotifier->NotifyRegistration(); } } // *************************************************************************** @@ -142,7 +140,7 @@ void G4SolidStore::DeRegister(G4VSolid* pSolid) { if (!locked) // Do not de-register if locked ! { - if (fgNotifier) fgNotifier->NotifyDeRegistration(); + if (fgNotifier) { fgNotifier->NotifyDeRegistration(); } for (iterator i=GetInstance()->begin(); i!=GetInstance()->end(); i++) { if (**i==*pSolid) diff --git a/source/geometry/management/src/G4VCurvedTrajectoryFilter.cc b/source/geometry/management/src/G4VCurvedTrajectoryFilter.cc index 73f36b4bab..ff647f5e5c 100644 --- a/source/geometry/management/src/G4VCurvedTrajectoryFilter.cc +++ b/source/geometry/management/src/G4VCurvedTrajectoryFilter.cc @@ -25,7 +25,7 @@ // // // $Id: G4VCurvedTrajectoryFilter.cc,v 1.3 2006/06/29 18:33:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // -------------------------------------------------------------------- #include "G4VCurvedTrajectoryFilter.hh" diff --git a/source/geometry/management/src/G4VNestedParameterisation.cc b/source/geometry/management/src/G4VNestedParameterisation.cc index e62488589d..89dc4b1a20 100644 --- a/source/geometry/management/src/G4VNestedParameterisation.cc +++ b/source/geometry/management/src/G4VNestedParameterisation.cc @@ -25,7 +25,7 @@ // // // $Id: G4VNestedParameterisation.cc,v 1.6 2006/06/29 18:33:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4VNestedParameterisation implementation // diff --git a/source/geometry/management/src/G4VPVDivisionFactory.cc b/source/geometry/management/src/G4VPVDivisionFactory.cc index f26ea3a6c3..3f720f61c0 100644 --- a/source/geometry/management/src/G4VPVDivisionFactory.cc +++ b/source/geometry/management/src/G4VPVDivisionFactory.cc @@ -25,7 +25,7 @@ // // // $Id: G4VPVDivisionFactory.cc,v 1.2 2006/06/29 18:34:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4VPVDivisionFactory Implementation file // diff --git a/source/geometry/management/src/G4VPVParameterisation.cc b/source/geometry/management/src/G4VPVParameterisation.cc index f15bf64c1d..0f54e18504 100644 --- a/source/geometry/management/src/G4VPVParameterisation.cc +++ b/source/geometry/management/src/G4VPVParameterisation.cc @@ -25,7 +25,7 @@ // // // $Id: G4VPVParameterisation.cc,v 1.7 2006/06/29 18:34:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Default implementations for Parameterisations that do not // parameterise solid and/or material. diff --git a/source/geometry/management/src/G4VPhysicalVolume.cc b/source/geometry/management/src/G4VPhysicalVolume.cc index bd6c0eff08..f39484c497 100644 --- a/source/geometry/management/src/G4VPhysicalVolume.cc +++ b/source/geometry/management/src/G4VPhysicalVolume.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VPhysicalVolume.cc,v 1.11 2006/06/29 18:34:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VPhysicalVolume.cc,v 1.12 2006/09/18 14:03:25 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4VPhysicalVolume Implementation @@ -91,3 +91,11 @@ G4RotationMatrix* G4VPhysicalVolume::GetObjectRotation() const } return retval; } + +// Only implemented for placed and parameterised volumes. +// Not required for replicas. +// +G4bool G4VPhysicalVolume::CheckOverlaps(G4int) +{ + return false; +} diff --git a/source/geometry/management/src/G4VSolid.cc b/source/geometry/management/src/G4VSolid.cc index 13d30a2c32..50407d0bf8 100644 --- a/source/geometry/management/src/G4VSolid.cc +++ b/source/geometry/management/src/G4VSolid.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VSolid.cc,v 1.28 2006/06/29 18:34:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VSolid.cc,v 1.33 2006/10/23 08:33:40 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4VSolid // @@ -119,7 +119,7 @@ G4ThreeVector G4VSolid::GetPointOnSurface() const { G4cerr << "WARNING - G4VSolid::GetPointOnSurface()" << G4endl << " Not implemented for solid: " - << this->GetEntityType() << " !" << G4endl; + << this->GetEntityType() << " !" << G4endl; G4Exception("G4VSolid::GetPointOnSurface()", "NotImplemented", JustWarning, "Not implemented for this solid ! Returning origin."); return G4ThreeVector(0,0,0); @@ -515,3 +515,80 @@ G4double G4VSolid::EstimateCubicVolume(G4int nStat, G4double epsilon) const volume = (maxX-minX)*(maxY-minY)*(maxZ-minZ)*iInside/nStat; return volume; } + +//////////////////////////////////////////////////////////////// +// +// Returns an estimation of the solid surface area in internal units. +// The number of statistics and error accuracy is fixed. +// This method may be overloaded by derived classes to compute the +// exact geometrical quantity for solids where this is possible. +// or anyway to cache the computed value. +// This implementation does NOT cache the computed value. + +G4double G4VSolid::GetSurfaceArea() +{ + G4int stat = 1000000; + G4double ell = -1.; + return EstimateSurfaceArea(stat,ell); +} + +//////////////////////////////////////////////////////////////// +// +// Estimate surface area based on Inside(), DistanceToIn(), and +// DistanceToOut() methods. Accuracy is limited by the statistics +// defined by the first argument. Implemented by Mikhail Kosov. + +G4double G4VSolid::EstimateSurfaceArea(G4int nStat, G4double ell) const +{ + G4int inside=0; + G4double px,py,pz,minX,maxX,minY,maxY,minZ,maxZ,surf; + G4bool yesno; + G4ThreeVector p; + EInside in; + + // values needed for CalculateExtent signature + + G4VoxelLimits limit; // Unlimited + G4AffineTransform origin; + + // min max extents of pSolid along X,Y,Z + + yesno = this->CalculateExtent(kXAxis,limit,origin,minX,maxX); + yesno = this->CalculateExtent(kYAxis,limit,origin,minY,maxY); + yesno = this->CalculateExtent(kZAxis,limit,origin,minZ,maxZ); + + // limits + + if(nStat < 1000) { nStat = 100; } + + G4double dX=maxX-minX; + G4double dY=maxY-minY; + G4double dZ=maxZ-minZ; + if(ell<=0.) // Automatic definition of skin thickness + { + G4double minval=dX; + if(dYInside(p); + if(in != kOutside) + { + if (DistanceToOut(p) safety (additional check) *Key change* + o Revised condition for extra checking against safety + o Many small and cosmetic changes in debug printing. + +November 18th, 2006 - J.Apostolakis (geomnav-V08-01-07) +----------------------------------- +- G4PathFinder: + o Fix for problem when step is fully taken + -- Note: this occurs due to optimisation in PiF that avoids calling G4(Multi)Navigator!! + o Function LimitedString( ELimited lim ) enables printing this enum + +Small/cosmetic +- G4PathFinder: + o Improved printing in IntersectChord. Deleted/simplified few prints in ComputeStep +- G4MultiNavigator - cleanup, cosmetics + +November 13th, 2006 - G.Cosmo (geomnav-V08-01-06) +----------------------------- +- Fixed compilation warnings and some cleanup ... + +November 11th, 2006 - J.Apostolakis (geomnav-V08-01-05) +----------------------------------- +G4PathFinder improvements for parallel Navigation + - ComputeStep method signature extended to add volume + - Use G4MultiNavigator for tracking in field. +G4MultiNavigator: several fixes, primarily for + taking care of condition of geometry limited step. + +November 11th, 2006 - J.Apostolakis (geomnav-V08-01-04) +----------------------------------- +- G4PropagatorInField: + o Refined fix in LocateIntersectionPoint(), to subdivide + in case it cannot find intersection point quickly (T.Nikitina). + Second version, with several levels of cutting. + o NOTE: Special tags made (later) not including the Developments in + G4TransportationManager, G4PathFinder, G4SafetyHelper for parallel + navigation. i.e. - based on tag "geomnav-V08-01-03". + +November 11th, 2006 - J.Apostolakis +----------------------------------- +- Created G4MultiNavigator class and utilised it from G4PathFinder + to implement curved trajectory parallel navigation. + +November 10th, 2006 - J.Apostolakis (geomnav-V08-01-03) +----------------------------------- +- G4PropagatorInField: + o Fix in LocateIntersectionPoint(), to subdivide in case it cannot find + intersection point quickly (T.Nikitina). + First version, only one level of cutting + o NOTE: Special tags made (later) not including the Developments in + G4TransportationManager, G4PathFinder, G4SafetyHelper for parallel + navigation. i.e. - based on tag "geomnav-V08-01-02". + +November 9th, 2006 - J.Apostolakis +----------------------------------- +- G4SafetyHelper: + o Changed default value of 'fUseParallelGeometries' to 'false'. + This is the default, except when using parallel geometries. + Value 'true' will become the default. + +November 4th, 2006 - M.Asai +--------------------------- +- G4TransportationManager: + o added new method SetWorldForTracking() to enable change of world from + the RunManager. + +October 31st, 2006 - J.Apostolakis +---------------------------------- +- G4SafetyHelper + o Added new class variable 'fUseParallelGeometries', to enable + it to work call G4Navigator of Mass geometry directly, in + the case of single geometry (when G4PathFinder is disabled). + o Default value is currently 'true' --> for parallel navigation development. +- G4PathFinder + o Improved the code that checks within relocation whether position + is proposed to be moved outside safety sphere from endpoint. + +October 26th, 2006 - G.Cosmo (geomnav-V08-01-02) +---------------------------- +- G4Navigator: + o Added inline methods EnteredDaughterVolume() and ExitedMotherVolume() to + allow for verification of a point entering a daughter volume or exiting + the mother volume. + o Made LocateGlobalPointAndSetup() method virtual. Moved to non virtual + and inline LocateGlobalPointAndUpdateTouchableHandle() method. + o Moved 'fHistory' data member to protected to aloow for more complete + subclassing. + o Minor cosmetics to recently introduced printout diagnostics in + ComputeSafety() method. +- G4TransportationManager: + o Added methods to access the list of the registered worlds. +- NOTE: this tag does NOT include the recent developments introduced for + G4PathFinder. It resumes from tag "geomnav-V08-00-01"; anything else + introduced after it, except for changes in G4Navigator, is NOT included ! + +October 25th, 2006 - J.Apostolakis +---------------------------------- +- G4PathFinder: fixed initialisation of cached value for the + G4TransportationManager to cope with singletons. + +October 16th, 2006 - J.Apostolakis (geomnav-V08-01-01) +---------------------------------- +- G4Navigator: moved debug printing behind fVerbose conditions + +October 12th, 2006 - J.Apostolakis (geomnav-V08-01-00) +---------------------------------- +- New class G4SafetyHelper to aid multiple scattering inn + determining the correct Mass geometry step (via PathFinder) + and all-geometry safety. +- Several revisions, fixes to G4PathFinder. + +June 8th, 2006 - J.Apostolakis (geomnav-V08-00-06) +------------------------------ +- G4PathFinder: + o New method 'ComputeSafety' to compute safety at endpoint of last step. + +June 2nd, 2006 - J.Apostolakis (geomnav-V08-00-05) +------------------------------ +- G4PathFinder: + o New method ReLocate() for non-Transportation classes to call when moving + the endpoint of a particle. Uses LocateGlobalPointWithinVolume() method + of the navigators. + o Small fixes and protection of debug printing with Verbose flag. + o Default verbose level is now 0. + +May 28th, 2006 - J.Apostolakis (geomnav-V08-00-04) +------------------------------ +- G4PathFinder: + o Check whether a process shifted the position since the last step. + o Corrected checking for 'Unique', i.e. one process limiting step. + o Revised printing (more information, some protected by verbose flag). + +May 27th, 2006 - J.Apostolakis (geomnav-V08-00-03) +------------------------------ +- G4PathFinder revised significantly: + o Workaround for problem of CreateHistory() when outside world. + o Revised for new counting of Navigator IDs (M.Asai). + o Added MovePoint() method that signals if it moved. + o Added state to cope with cases where a full step is taken, + i.e. to cope with steps that return kInfinity: + New state: + RelocatedPoint - to show if it is moved; + TrueMinStep - finite whereas reported can be kInfinity. + and to aid in clarifying the state of the (singleton) object: + LastStepNo - already kept in one method (static), now exposed; + CurrentStepNo - mostly for debugging and printing out. + o Small improvements in tests. + +May 23rd, 2006 - J.Apostolakis (geomnav-V08-00-02) +------------------------------ +- Added new prototype class G4PathFinder to coupled navigation + in parallel geometries. + May 22nd, 2006 - G.Cosmo (geomnav-V08-00-01) ------------------------ - Extended G4TransportationManager to handle multiple navigators. diff --git a/source/geometry/navigation/include/G4AuxiliaryNavServices.hh b/source/geometry/navigation/include/G4AuxiliaryNavServices.hh index 73fb6f3849..7a485c222c 100644 --- a/source/geometry/navigation/include/G4AuxiliaryNavServices.hh +++ b/source/geometry/navigation/include/G4AuxiliaryNavServices.hh @@ -25,7 +25,7 @@ // // // $Id: G4AuxiliaryNavServices.hh,v 1.3 2006/06/29 18:35:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4NormalNavigation diff --git a/source/geometry/navigation/include/G4AuxiliaryNavServices.icc b/source/geometry/navigation/include/G4AuxiliaryNavServices.icc index f6ad6dd8e4..a43880592e 100644 --- a/source/geometry/navigation/include/G4AuxiliaryNavServices.icc +++ b/source/geometry/navigation/include/G4AuxiliaryNavServices.icc @@ -25,7 +25,7 @@ // // // $Id: G4AuxiliaryNavServices.icc,v 1.3 2006/06/29 18:35:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4AuxiliaryNavServices Inline implementation diff --git a/source/geometry/navigation/include/G4DrawVoxels.hh b/source/geometry/navigation/include/G4DrawVoxels.hh index 404367430a..95416e5a7b 100644 --- a/source/geometry/navigation/include/G4DrawVoxels.hh +++ b/source/geometry/navigation/include/G4DrawVoxels.hh @@ -25,7 +25,7 @@ // // // $Id: G4DrawVoxels.hh,v 1.3 2006/06/29 18:35:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4DrawVoxels diff --git a/source/geometry/navigation/include/G4GeomTestErrorList.hh b/source/geometry/navigation/include/G4GeomTestErrorList.hh index ff2aba7fe7..05276ea26f 100644 --- a/source/geometry/navigation/include/G4GeomTestErrorList.hh +++ b/source/geometry/navigation/include/G4GeomTestErrorList.hh @@ -25,7 +25,7 @@ // // // $Id: G4GeomTestErrorList.hh,v 1.3 2006/06/29 18:35:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 class header file diff --git a/source/geometry/navigation/include/G4GeomTestLogger.hh b/source/geometry/navigation/include/G4GeomTestLogger.hh index f69f1f8234..df68f84a05 100644 --- a/source/geometry/navigation/include/G4GeomTestLogger.hh +++ b/source/geometry/navigation/include/G4GeomTestLogger.hh @@ -25,7 +25,7 @@ // // // $Id: G4GeomTestLogger.hh,v 1.3 2006/06/29 18:35:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 class header file diff --git a/source/geometry/navigation/include/G4GeomTestOverlapList.hh b/source/geometry/navigation/include/G4GeomTestOverlapList.hh index c17899c4c1..473d262d46 100644 --- a/source/geometry/navigation/include/G4GeomTestOverlapList.hh +++ b/source/geometry/navigation/include/G4GeomTestOverlapList.hh @@ -25,7 +25,7 @@ // // // $Id: G4GeomTestOverlapList.hh,v 1.3 2006/06/29 18:35:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 class header file diff --git a/source/geometry/navigation/include/G4GeomTestOvershootList.hh b/source/geometry/navigation/include/G4GeomTestOvershootList.hh index c3baa1aa1d..ac824bd986 100644 --- a/source/geometry/navigation/include/G4GeomTestOvershootList.hh +++ b/source/geometry/navigation/include/G4GeomTestOvershootList.hh @@ -25,7 +25,7 @@ // // // $Id: G4GeomTestOvershootList.hh,v 1.3 2006/06/29 18:35:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 class header file diff --git a/source/geometry/navigation/include/G4GeomTestPoint.hh b/source/geometry/navigation/include/G4GeomTestPoint.hh index 0a443ed489..a11ea79b5c 100644 --- a/source/geometry/navigation/include/G4GeomTestPoint.hh +++ b/source/geometry/navigation/include/G4GeomTestPoint.hh @@ -25,7 +25,7 @@ // // // $Id: G4GeomTestPoint.hh,v 1.3 2006/06/29 18:35:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 class header file diff --git a/source/geometry/navigation/include/G4GeomTestSegment.hh b/source/geometry/navigation/include/G4GeomTestSegment.hh index abc362f2a5..9a010739e4 100644 --- a/source/geometry/navigation/include/G4GeomTestSegment.hh +++ b/source/geometry/navigation/include/G4GeomTestSegment.hh @@ -25,7 +25,7 @@ // // // $Id: G4GeomTestSegment.hh,v 1.3 2006/06/29 18:35:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 class header file diff --git a/source/geometry/navigation/include/G4GeomTestStreamLogger.hh b/source/geometry/navigation/include/G4GeomTestStreamLogger.hh index 9d8df64797..a4e30204a0 100644 --- a/source/geometry/navigation/include/G4GeomTestStreamLogger.hh +++ b/source/geometry/navigation/include/G4GeomTestStreamLogger.hh @@ -25,7 +25,7 @@ // // // $Id: G4GeomTestStreamLogger.hh,v 1.3 2006/06/29 18:35:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 class header file diff --git a/source/geometry/navigation/include/G4GeomTestVolPoint.hh b/source/geometry/navigation/include/G4GeomTestVolPoint.hh index 4fe6f3198b..31f25b5117 100644 --- a/source/geometry/navigation/include/G4GeomTestVolPoint.hh +++ b/source/geometry/navigation/include/G4GeomTestVolPoint.hh @@ -25,7 +25,7 @@ // // // $Id: G4GeomTestVolPoint.hh,v 1.3 2006/06/29 18:35:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 class header file diff --git a/source/geometry/navigation/include/G4GeomTestVolume.hh b/source/geometry/navigation/include/G4GeomTestVolume.hh index b0eaa2645f..425c1273ec 100644 --- a/source/geometry/navigation/include/G4GeomTestVolume.hh +++ b/source/geometry/navigation/include/G4GeomTestVolume.hh @@ -25,7 +25,7 @@ // // // $Id: G4GeomTestVolume.hh,v 1.3 2006/06/29 18:35:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 class header file diff --git a/source/geometry/navigation/include/G4GeometryMessenger.hh b/source/geometry/navigation/include/G4GeometryMessenger.hh index 163757a725..00a6784782 100644 --- a/source/geometry/navigation/include/G4GeometryMessenger.hh +++ b/source/geometry/navigation/include/G4GeometryMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: G4GeometryMessenger.hh,v 1.4 2006/06/29 18:35:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 class header file diff --git a/source/geometry/navigation/include/G4MultiNavigator.hh b/source/geometry/navigation/include/G4MultiNavigator.hh new file mode 100644 index 0000000000..55d321e7c4 --- /dev/null +++ b/source/geometry/navigation/include/G4MultiNavigator.hh @@ -0,0 +1,183 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4MultiNavigator.hh,v 1.3 2006/11/13 17:34:08 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// +// class G4MultiNavigator +// +// Class description: +// +// Utility class for polling the navigators of several geometries to +// identify the next boundary. + +// History: +// - Created. John Apostolakis, November 2006 +// ********************************************************************* + +#ifndef G4MULTINAVIGATOR_HH +#define G4MULTINAVIGATOR_HH + +#include + +#include "geomdefs.hh" +#include "G4ThreeVector.hh" +#include "G4Navigator.hh" + +#include "G4TouchableHistoryHandle.hh" + +#include "G4NavigationHistory.hh" + +enum ELimited { kDoNot,kUnique,kSharedTransport,kSharedOther,kUndefLimited }; + +class G4TransportationManager; +class G4VPhysicalVolume; + +class G4MultiNavigator : public G4Navigator +{ + public: // with description + + friend std::ostream& operator << (std::ostream &os, const G4Navigator &n); + + G4MultiNavigator(); + // Constructor - initialisers and setup. + + ~G4MultiNavigator(); + // Destructor. No actions. + + G4double ComputeStep(const G4ThreeVector &pGlobalPoint, + const G4ThreeVector &pDirection, + const G4double pCurrentProposedStepLength, + G4double &pNewSafety); + // Return the distance to the next boundary of any geometry + + G4double ObtainFinalStep( G4int navigatorId, + G4double &pNewSafety, // for this geom + G4double &minStepLast, + ELimited &limitedStep); + // Get values for a single geometry + + void PrepareNavigators(); + // Find which geometries are registered for this particles - and keep info + void PrepareNewTrack( const G4ThreeVector position, + const G4ThreeVector direction ); + // Prepare Navigators and locate + + G4VPhysicalVolume* ResetHierarchyAndLocate(const G4ThreeVector &point, + const G4ThreeVector &direction, + const G4TouchableHistory &h); + // Reset the geometrical hierarchy for all geometries. + // Use the touchable history for the first (mass) geometry. + // Return the volume in the first (mass) geometry. + // + // Important Note: In order to call this the geometries MUST be closed. + + G4VPhysicalVolume* LocateGlobalPointAndSetup(const G4ThreeVector& point, + const G4ThreeVector* direction=0, + const G4bool pRelativeSearch=true, + const G4bool ignoreDirection=true); + // Locate in all geometries. + // Return the volume in the first (mass) geometry + // Maintain vector of other volumes, to be returned separately + // + // Important Note: In order to call this the geometry MUST be closed. + + void LocateGlobalPointWithinVolume(const G4ThreeVector& position); + // Relocate in all geometries for point that has not changed volume + // (ie is within safety in all geometries or is distance less that + // along the direction of a computed step. + + G4double ComputeSafety(const G4ThreeVector &globalpoint, + const G4double pProposedMaxLength = DBL_MAX); + // Calculate the isotropic distance to the nearest boundary + // in any geometry from the specified point in the global coordinate system. + // The geometry must be closed. + + G4TouchableHistoryHandle CreateTouchableHistoryHandle() const; + // Returns a reference counted handle to a touchable history. + + public: // without description + + G4Navigator* GetNavigator(G4int n) const + { + if( (n>fNoActiveNavigators)||(n<0)){ n=0; } + return fpNavigator[n]; + } + + protected: // with description + + void ResetState(); + // Utility method to reset the navigator state machine. + + void SetupHierarchy(); + // Renavigate & reset hierarchy described by current history + // o Reset volumes + // o Recompute transforms and/or solids of replicated/parameterised + // volumes. + + void WhichLimited(); // Flag which processes limited the step + void PrintLimited(); // Auxiliary, debugging printing + void CheckMassWorld(); + + private: + + // STATE Information + + G4int fNoActiveNavigators; + static const G4int fMaxNav = 8; // rename to kMaxNoNav ?? + G4VPhysicalVolume* fLastMassWorld; + + // Global state (retained during stepping for one track + G4Navigator* fpNavigator[fMaxNav]; // G4Navigator** fpNavigator; + + // State after a step computation + ELimited fLimitedStep[fMaxNav]; + G4bool fLimitTruth[fMaxNav]; + G4double fCurrentStepSize[fMaxNav]; + G4double fNewSafety[ fMaxNav ]; // Safety for starting point + + // Lowest values - determine step length, and safety + G4double fMinStep; // As reported by Navigators -- can be kInfinity + G4double fMinSafety; + G4double fTrueMinStep; // Corrected in case fMinStep >= proposed + + // State after calling 'locate' + G4VPhysicalVolume* fLocatedVolume[fMaxNav]; + G4ThreeVector fLastLocatedPosition; + + // cache of safety information + G4ThreeVector fSafetyLocation; // point where ComputeSafety is called + G4double fMinSafety_atSafLocation; // /\ corresponding value of safety + G4ThreeVector fPreStepLocation; // point where last ComputeStep called + G4double fMinSafety_PreStepPt; // /\ corresponding value of safety + + // STATE Auxiliary variables + G4int fVerboseLevel; + G4TransportationManager* pTransportManager; // Cache for frequent use +}; + +#endif diff --git a/source/geometry/navigation/include/G4Navigator.hh b/source/geometry/navigation/include/G4Navigator.hh index bb69997ea8..3be35053ae 100644 --- a/source/geometry/navigation/include/G4Navigator.hh +++ b/source/geometry/navigation/include/G4Navigator.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Navigator.hh,v 1.14 2006/06/29 18:36:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Navigator.hh,v 1.18 2006/11/11 01:17:49 japost Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4Navigator @@ -113,6 +113,7 @@ class G4Navigator // // Important Note: In order to call this the geometry MUST be closed. + virtual G4VPhysicalVolume* LocateGlobalPointAndSetup(const G4ThreeVector& point, const G4ThreeVector* direction=0, const G4bool pRelativeSearch=true, @@ -133,7 +134,8 @@ class G4Navigator // // Important Note: In order to call this the geometry MUST be closed. - virtual void LocateGlobalPointWithinVolume(const G4ThreeVector& position); + virtual + void LocateGlobalPointWithinVolume(const G4ThreeVector& position); // Notify the Navigator that a track has moved to the new Global point // 'position', that is known to be within the current safety. // No check is performed to ensure that it is within the volume. @@ -142,7 +144,7 @@ class G4Navigator // same volume as the previous position. Usually this can be guaranteed // only if the point is within safety. - virtual void LocateGlobalPointAndUpdateTouchableHandle( + inline void LocateGlobalPointAndUpdateTouchableHandle( const G4ThreeVector& position, const G4ThreeVector& direction, G4TouchableHandle& oldTouchableToUpdate, @@ -164,8 +166,7 @@ class G4Navigator const G4ThreeVector& position, G4VTouchable* touchableToUpdate, const G4bool RelativeSearch = true); - // Old version (missing direction). - // Not recommended replace with newer version above. + // Same as the method above but missing direction. inline void SetGeometricallyLimitedStep(); // Inform the navigator that the previous Step calculated @@ -215,6 +216,18 @@ class G4Navigator inline void Activate(G4bool flag); // Activate/inactivate the navigator. + inline G4bool EnteredDaughterVolume() const; + // The purpose of this function is to inform the caller if the track is + // entering a daughter volume while exiting from the current volume. + // This method returns + // - True only in case 1) above, that is when the Step has caused + // the track to arrive at a boundary of a daughter. + // - False in cases 2), 3) and 4), i.e. in all other cases. + // This function is not guaranteed to work if SetGeometricallyLimitedStep() + // was not called when it should have been called. + inline G4bool ExitedMotherVolume() const; + // Verify if the step has exited the mother volume. + inline void CheckMode(G4bool mode); // Run navigation in "check-mode", therefore using additional // verifications and more strict correctness conditions. @@ -240,13 +253,18 @@ class G4Navigator // Values: 1 (small problem), 5 (correcting), // 9 (ready to abandon), 10 (abandoned) - protected: // with description + public: // with description inline G4ThreeVector GetCurrentLocalCoordinate() const; // Return the local coordinate of the point in the reference system // of its containing volume that was found by LocalGlobalPointAndSetup. // The local coordinate of the last located track. + inline G4ThreeVector NetTranslation() const; + inline G4RotationMatrix NetRotation() const; + // Compute+return the local->global translation/rotation of current volume. + + protected: // with description inline G4ThreeVector ComputeLocalPoint(const G4ThreeVector& rGlobPoint) const; // Return position vector in local coordinate system, given a position // vector in world coordinate system. @@ -256,20 +274,6 @@ class G4Navigator // system of the volume that was found by LocalGlobalPointAndSetup. // The Local Coordinates of point in world coordinate system. - inline G4ThreeVector NetTranslation() const; - inline G4RotationMatrix NetRotation() const; - // Compute+return the local->global translation/rotation of current volume. - - inline G4bool EnteredDaughterVolume(); - // The purpose of this function is to inform the caller if the track is - // entering a daughter volume while exiting from the current volume. - // This method returns - // - True only in case 1) above, that is when the Step has caused - // the track to arrive at a boundary of a daughter. - // - False in cases 2), 3) and 4), i.e. in all other cases. - // This function is not guaranteed to work if SetGeometricallyLimitedStep() - // was not called when it should have been called. - virtual void ResetState(); // Utility method to reset the navigator state machine. @@ -285,20 +289,36 @@ class G4Navigator // o Recompute transforms and/or solids of replicated/parameterised // volumes. - private: + protected: // without description // // BEGIN State information // + G4NavigationHistory fHistory; + // Transformation and history of the current path + // through the geometrical hierarchy. + + G4bool fEnteredDaughter; + // A memory of whether in this Step a daughter volume is entered + // (set in Compute & Locate). + // After Compute: it expects to enter a daughter + // After Locate: it has entered a daughter + + G4bool fExitedMother; + // A similar memory whether the Step exited current "mother" volume + // completely, not entering daughter. + + G4bool fWasLimitedByGeometry; + // Set true if last Step was limited by geometry. + + private: + G4bool fActive; // States if the navigator is activated or not. G4ThreeVector fLastLocatedPointLocal; // Position of the last located point relative to its containing volume. - - G4bool fWasLimitedByGeometry; - // Set true if last Step was limited by geometry. G4bool fEntering,fExiting; // Entering/Exiting volumes blocking/setup // o If exiting @@ -314,23 +334,12 @@ class G4Navigator G4VPhysicalVolume *fCandidatePhysicalVolume; G4int fCandidateReplicaNo; - G4bool fEnteredDaughter; // A memory of whether in this Step a daughter - // volume is entered (set in Compute & Locate) - // After Compute: it expects to enter a daughter - // After Locate: it has entered a daughter - G4bool fExitedMother; // A similar memory whether the Step exited - // current "mother" volume completely, - // not entering daughter. - G4bool fValidExitNormal; // Set true if have leaving volume normal G4ThreeVector fExitNormal; // Leaving volume normal, in the // volume containing the exited // volume's coordinate system G4ThreeVector fGrandMotherExitNormal; // Leaving volume normal, in its // own coordinate system - G4NavigationHistory fHistory; - // Transformation & `path' history of current path - // through geomtrical hierarchy // Count zero steps - as one or two can occur due to changing momentum at // a boundary or at an edge common between volumes diff --git a/source/geometry/navigation/include/G4Navigator.icc b/source/geometry/navigation/include/G4Navigator.icc index 4c736be132..50ef8aa65d 100644 --- a/source/geometry/navigation/include/G4Navigator.icc +++ b/source/geometry/navigation/include/G4Navigator.icc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Navigator.icc,v 1.10 2006/06/29 18:36:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Navigator.icc,v 1.12 2006/10/27 09:13:46 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4Navigator Inline implementation @@ -287,15 +287,30 @@ G4TouchableHistory* G4Navigator::CreateTouchableHistory() const } // ******************************************************************** -// EnteredDaughterVolume -// -// To inform the caller if the track is entering a daughter volume +// LocateGlobalPointAndUpdateTouchableHandle // ******************************************************************** // inline -G4bool G4Navigator::EnteredDaughterVolume() +void G4Navigator::LocateGlobalPointAndUpdateTouchableHandle( + const G4ThreeVector& position, + const G4ThreeVector& direction, + G4TouchableHandle& oldTouchableToUpdate, + const G4bool RelativeSearch ) { - return fEnteredDaughter; + G4VPhysicalVolume* pPhysVol; + pPhysVol = LocateGlobalPointAndSetup( position,&direction,RelativeSearch ); + if( fEnteredDaughter || fExitedMother ) + { + oldTouchableToUpdate = CreateTouchableHistory(); + if( pPhysVol == 0 ) + { + // We want to ensure that the touchable is correct in this case. + // The method below should do this and recalculate a lot more .... + // + oldTouchableToUpdate->UpdateYourself( pPhysVol, &fHistory ); + } + } + return; } // ******************************************************************** @@ -346,7 +361,7 @@ G4int G4Navigator::GetVerboseLevel() const // ******************************************************************** // inline -void G4Navigator::SetVerboseLevel(G4int level) +void G4Navigator::SetVerboseLevel(G4int level) { fVerbose = level; fnormalNav.SetVerboseLevel(level); @@ -370,11 +385,33 @@ G4bool G4Navigator::IsActive() const // ******************************************************************** // inline -void G4Navigator::Activate(G4bool flag) +void G4Navigator::Activate(G4bool flag) { fActive = flag; } +// ******************************************************************** +// EnteredDaughterVolume +// +// To inform the caller if the track is entering a daughter volume +// ******************************************************************** +// +inline +G4bool G4Navigator::EnteredDaughterVolume() const +{ + return fEnteredDaughter; +} + +// ******************************************************************** +// ExitedMotherVolume +// ******************************************************************** +// +inline +G4bool G4Navigator::ExitedMotherVolume() const +{ + return fExitedMother; +} + // ******************************************************************** // CheckMode // ******************************************************************** diff --git a/source/geometry/navigation/include/G4NormalNavigation.hh b/source/geometry/navigation/include/G4NormalNavigation.hh index 9d576b5e24..ab74a7304d 100644 --- a/source/geometry/navigation/include/G4NormalNavigation.hh +++ b/source/geometry/navigation/include/G4NormalNavigation.hh @@ -25,7 +25,7 @@ // // // $Id: G4NormalNavigation.hh,v 1.4 2006/06/29 18:36:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4NormalNavigation diff --git a/source/geometry/navigation/include/G4NormalNavigation.icc b/source/geometry/navigation/include/G4NormalNavigation.icc index 9b0901c734..304c5abf60 100644 --- a/source/geometry/navigation/include/G4NormalNavigation.icc +++ b/source/geometry/navigation/include/G4NormalNavigation.icc @@ -25,7 +25,7 @@ // // // $Id: G4NormalNavigation.icc,v 1.4 2006/06/29 18:36:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4NormalNavigation Inline Implementation diff --git a/source/geometry/navigation/include/G4ParameterisedNavigation.hh b/source/geometry/navigation/include/G4ParameterisedNavigation.hh index bd97544a16..b4fadc9c95 100644 --- a/source/geometry/navigation/include/G4ParameterisedNavigation.hh +++ b/source/geometry/navigation/include/G4ParameterisedNavigation.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParameterisedNavigation.hh,v 1.5 2006/06/29 18:36:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4ParameterisedNavigation diff --git a/source/geometry/navigation/include/G4ParameterisedNavigation.icc b/source/geometry/navigation/include/G4ParameterisedNavigation.icc index c08d273fc3..fba91b2eac 100644 --- a/source/geometry/navigation/include/G4ParameterisedNavigation.icc +++ b/source/geometry/navigation/include/G4ParameterisedNavigation.icc @@ -25,7 +25,7 @@ // // // $Id: G4ParameterisedNavigation.icc,v 1.6 2006/06/29 18:36:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4ParameterisedNavigation Inline implementation diff --git a/source/geometry/navigation/include/G4PathFinder.hh b/source/geometry/navigation/include/G4PathFinder.hh new file mode 100644 index 0000000000..510043d221 --- /dev/null +++ b/source/geometry/navigation/include/G4PathFinder.hh @@ -0,0 +1,240 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4PathFinder.hh,v 1.20 2006/11/11 01:23:35 japost Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// class G4PathFinder +// +// Class description: +// +// This class directs the lock-stepped propagation of a track in the +// 'mass' and other parallel geometries. It ensures that tracking +// in a magnetic field sees these parallel geometries at each trial step, +// and that the earliest boundary limits the step. +// +// For the movement in field, it relies on the class G4PropagatorInField +// +// History: +// ------- +// 7.10.05 John Apostolakis, Draft design +// 26.04.06 John Apostolakis, Revised design and first implementation +// --------------------------------------------------------------------------- + +#ifndef G4PATHFINDER_HH +#define G4PATHFINDER_HH 1 + +#include "G4Types.hh" +#include + +#include "G4FieldTrack.hh" +// class G4FieldManager; // #include "G4FieldManager.hh" +// class G4Navigator; +// class G4VPhysicalVolume; +// class G4VCurvedTrajectoryFilter; +class G4TransportationManager; +class G4Navigator; +#include "G4TouchableHandle.hh" +#include "G4FieldTrack.hh" + +// enum ELimited { kDoNot, kUnique, kSharedTransport, kSharedOther, kUndefLimited }; +// #include "G4Elimited.hh" + +// class G4MultiNavigator; // --> Moved Elimited to G4MultiNavigator +#include "G4MultiNavigator.hh" +class G4PropagatorInField; + +class G4PathFinder +{ + + public: // with description + + static G4PathFinder* GetInstance(); // Singleton + ~G4PathFinder(); + + + // Attempt next step + // + G4double ComputeStep( const G4FieldTrack &pFieldTrack, // Or update non-c + G4double pCurrentProposedStepLength, + G4int navigatorId, + G4int stepNo, // See next step / check + G4double &pNewSafety, // for this geom + ELimited &limitedStep, + G4FieldTrack &EndState, + G4VPhysicalVolume* currentVolume + ); + // Compute the next geometric Step -- Curved or linear + + void Locate( const G4ThreeVector& position, + const G4ThreeVector& direction, + G4bool relativeSearch= true); + // Make primary relocation of global point in all navigators, and update them. + + void ReLocate( const G4ThreeVector& position ); + // Make secondary relocation of global point (within safety only) + // in all navigators, and update them. + + void PrepareNewTrack( G4ThreeVector position, G4ThreeVector direction); + // Check and cache set of active navigators + + G4TouchableHandle CreateTouchableHandle( G4int navId) const; + // Also? G4TouchableCreator& GetTouchableCreator( G4int navId ) const; + inline G4VPhysicalVolume* GetLocatedVolume( G4int navId ) const; + + // ----------------------------------------------------------------- + inline void SetChargeMomentumMass( G4double charge, // in e+ units + G4double momentum, // in Geant4 units + G4double pMass ); + + inline G4bool IsParticleLooping() const; + + G4double GetCurrentSafety() const { return fMinSafety; } + // Minimum value of safety after last ComputeStep + + G4double ComputeSafety( const G4ThreeVector& pGlobalPoint ); + // Recompute safety for the relevant point - the endpoint of the last step!! + + void EnableParallelNavigation(G4bool enableChoice= true); + // Must call it to ensure that PathFinder is prepared, + // especially for curved tracks + // --> if true it switches PropagatorInField to use MultiNavigator. + // Must call it with false to undo (=PiF use Navigator for tracking!) + + inline G4int SetVerboseLevel(G4int lev=-1); + // inline G4int GetVerboseLevel() const; + + public: // with description + + inline G4int GetMaxLoopCount() const; + inline void SetMaxLoopCount( G4int new_max ); + // A maximum for the number of steps that a (looping) particle can take. + + public: // without description + void MovePoint(){ fRelocatedPoint= true; } + // Signal that location will be moved -- internal use primarily + + protected: // without description + G4double DoNextLinearStep( const G4FieldTrack &FieldTrack, + G4double proposedStepLength); + + G4double DoNextCurvedStep( const G4FieldTrack &FieldTrack, + G4double proposedStepLength, + G4VPhysicalVolume* pCurrentPhysVolume); + + void WhichLimited(); + void PrintLimited(); // Print key details out - for debugging + // + // void SetTrajectoryFilter(G4VCurvedTrajectoryFilter* filter); + // Set the filter that examines & stores 'intermediate' + // curved trajectory points. Currently only position is stored. + + void ClearState(); + // Clear all the State of this class and its current associates + + inline G4bool UseSafetyForOptimization( G4bool ); + // Whether to safety to discard + // unneccesary calls to navigator (thus 'optimising' performance) + + protected: + G4Navigator* GetNavigator(G4int n) const { + if( (n>fNoActiveNavigators)||(n<0)){ n=0; } + return fpNavigator[n]; + } + + private: + G4PathFinder(); // Singleton + + private: + + // ---------------------------------------------------------------------- + // DATA Members + // ---------------------------------------------------------------------- + // std::vector fActiveNavigators; + // + G4MultiNavigator *fpMultiNavigator; + // Object that enables G4PropagatorInField to see many geometries + + G4int fNoActiveNavigators; + // G4int fNoNavigators; + G4bool fNewTrack; // Flag a new track (ensure first step) + + static const G4int fMaxNav = 8; // rename to kMaxNoNav ?? + // enum EMaximumNavs { fMaxNav = 8; } + + // Global state (retained during stepping for one track + G4Navigator* fpNavigator[fMaxNav]; // G4Navigator** fpNavigator; + // State after a step computation + ELimited fLimitedStep[fMaxNav]; + G4bool fLimitTruth[fMaxNav]; + G4double fCurrentStepSize[fMaxNav]; + G4double fNewSafety[ fMaxNav ]; // Safety for starting point + G4double fMinSafety; + + G4double fMinStep; // As reported by Navigators -- can be kInfinity + G4double fTrueMinStep; // Corrected in case >= proposed + // State after calling 'locate' + G4VPhysicalVolume* fLocatedVolume[fMaxNav]; + G4ThreeVector fLastLocatedPosition; + // G4ThreeVector fLastLocatedDirection; + + G4FieldTrack fEndState; + // End point storage + G4bool fRelocatedPoint; // Signals that point was or is being moved + // from the position of the last location + // or the endpoint resulting from ComputeStep + // -- invalidates fEndState + + G4ThreeVector fSafetyLocation; // point where ComputeSafety is called + G4double fMinSafety_atSafLocation; // /\ corresponding value of safety + G4ThreeVector fPreStepLocation; // point where last ComputeStep called + G4double fMinSafety_PreStepPt; // /\ corresponding value of safety + + G4int fLastStepNo, fCurrentStepNo; + G4bool fParticleIsLooping; + G4int fVerboseLevel; + // For debuging purposes + G4int fMax_loop_count; + // Limit for the number of sub-steps taken in one call to ComputeStep + + G4TransportationManager* fpTransportManager; // Cache for frequent use + G4PropagatorInField* fpFieldPropagator; +}; + +// ******************************************************************** +// Inline methods. +// ******************************************************************** +inline G4VPhysicalVolume* G4PathFinder::GetLocatedVolume( G4int navId ) const +{ G4VPhysicalVolume* vol=0; + if( (navId < fMaxNav) && (navId >=0) ) { vol= fLocatedVolume[navId]; } + return vol; +} + +inline G4int G4PathFinder::SetVerboseLevel(G4int newLevel) +{ G4int old= fVerboseLevel; fVerboseLevel= newLevel; return old; +} +// #include "G4PathFinder.icc" + +#endif diff --git a/source/geometry/navigation/include/G4PropagatorInField.hh b/source/geometry/navigation/include/G4PropagatorInField.hh index c7784403a9..5c4e806a59 100644 --- a/source/geometry/navigation/include/G4PropagatorInField.hh +++ b/source/geometry/navigation/include/G4PropagatorInField.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4PropagatorInField.hh,v 1.9 2006/06/29 18:36:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4PropagatorInField.hh,v 1.10 2006/11/11 01:25:29 japost Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4PropagatorInField // @@ -143,6 +143,8 @@ class G4PropagatorInField public: // without description inline G4FieldManager* GetCurrentFieldManager(); + inline void SetNavigatorForPropagating( G4Navigator *SimpleOrMultiNavigator ); + inline G4Navigator* GetNavigatorForPropagating(); public: // no description diff --git a/source/geometry/navigation/include/G4PropagatorInField.icc b/source/geometry/navigation/include/G4PropagatorInField.icc index 0fd631d2a2..fc105d94f4 100644 --- a/source/geometry/navigation/include/G4PropagatorInField.icc +++ b/source/geometry/navigation/include/G4PropagatorInField.icc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4PropagatorInField.icc,v 1.8 2006/06/29 18:36:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4PropagatorInField.icc,v 1.10 2006/11/13 17:34:08 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------------------ @@ -255,4 +255,15 @@ G4bool G4PropagatorInField::GetUseSafetyForOptimization() return fUseSafetyForOptimisation; } +inline +void G4PropagatorInField:: +SetNavigatorForPropagating( G4Navigator *SimpleOrMultiNavigator ) +{ + if(SimpleOrMultiNavigator) { fNavigator= SimpleOrMultiNavigator; } +} +inline +G4Navigator* G4PropagatorInField::GetNavigatorForPropagating() +{ + return fNavigator; +} diff --git a/source/geometry/navigation/include/G4ReplicaNavigation.hh b/source/geometry/navigation/include/G4ReplicaNavigation.hh index 5bed7dc569..1a3df0411a 100644 --- a/source/geometry/navigation/include/G4ReplicaNavigation.hh +++ b/source/geometry/navigation/include/G4ReplicaNavigation.hh @@ -25,7 +25,7 @@ // // // $Id: G4ReplicaNavigation.hh,v 1.4 2006/06/29 18:36:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4ReplicaNavigation diff --git a/source/geometry/navigation/include/G4ReplicaNavigation.icc b/source/geometry/navigation/include/G4ReplicaNavigation.icc index 9f2afc89c9..5d3ea1dfac 100644 --- a/source/geometry/navigation/include/G4ReplicaNavigation.icc +++ b/source/geometry/navigation/include/G4ReplicaNavigation.icc @@ -25,7 +25,7 @@ // // // $Id: G4ReplicaNavigation.icc,v 1.5 2006/06/29 18:36:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4ReplicaNavigation Inline implementation diff --git a/source/geometry/navigation/include/G4SafetyHelper.hh b/source/geometry/navigation/include/G4SafetyHelper.hh new file mode 100644 index 0000000000..a1f1950140 --- /dev/null +++ b/source/geometry/navigation/include/G4SafetyHelper.hh @@ -0,0 +1,96 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4SafetyHelper.hh,v 1.3 2006/10/31 16:53:06 japost Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// +// class G4SafetyHelper +// +// Class description: +// +// This class is a helper for physics processes which require +// knowledge of the safety, and the step size for the 'mass' geometry + +// First version: J. Apostolakis, July 5th, 2006 +// -------------------------------------------------------------------- + +#ifndef G4SAFETYHELPER_HH +#define G4SAFETYHELPER_HH 1 + +#include +#include "G4Types.hh" +#include "G4ThreeVector.hh" + +class G4Navigator; +class G4PathFinder; + +class G4SafetyHelper +{ + public: // with description + + G4SafetyHelper(); + ~G4SafetyHelper(); + // + // Constructor and destructor + + G4double ComputeMassStep( const G4ThreeVector &position, + const G4ThreeVector &direction, + G4double &newSafety ); + // + // Return step for mass geometry + + G4double ComputeSafety( const G4ThreeVector& pGlobalPoint ); + // + // Return safety for all geometries + + void ReLocateWithinVolume(const G4ThreeVector& pGlobalPoint ); + // + // Relocate the point in the volume of interest + +public: // with description + static void EnableParallelNavigation(G4bool parallel) + { fUseParallelGeometries= parallel; } + // + // To have parallel worlds considered, must be true. + // Alternative is to use single (mass) Navigator directly + + void InitialiseNavigator(); + // + // Check for new navigator for tracking, and reinitialise pointer + +private: + + G4PathFinder* fpPathFinder; + G4Navigator* fpMassNavigator; + G4int fMassNavigatorId; + + static G4bool fUseParallelGeometries; + // Flag whether to use PathFinder or single (mass) Navigator directly + +}; + +#endif diff --git a/source/geometry/navigation/include/G4TransportationManager.hh b/source/geometry/navigation/include/G4TransportationManager.hh index a71ddeefd1..d4c8bff6ea 100644 --- a/source/geometry/navigation/include/G4TransportationManager.hh +++ b/source/geometry/navigation/include/G4TransportationManager.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4TransportationManager.hh,v 1.8 2006/06/29 18:36:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4TransportationManager.hh,v 1.10 2006/11/03 20:03:26 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4TransportationManager // @@ -71,10 +71,18 @@ class G4TransportationManager inline void SetNavigatorForTracking( G4Navigator* newNavigator ); // Accessors for the navigator for tracking + inline void SetWorldForTracking(G4VPhysicalVolume* theWorld); + // Set the world volume for tracking + // This method is to be invoked by G4RunManagerKernel. + inline size_t GetNoActiveNavigators() const; inline std::vector::iterator GetActiveNavigatorsIterator(); // Return an iterator to the list of active navigators + inline size_t GetNoWorlds() const; + inline std::vector::iterator GetWorldsIterator(); + // Return an iterator to the list of registered worlds + G4VPhysicalVolume* GetParallelWorld ( const G4String& worldName ); // Return an exact copy of the tracking world volume. If already // existing just return the pointer diff --git a/source/geometry/navigation/include/G4TransportationManager.icc b/source/geometry/navigation/include/G4TransportationManager.icc index 90d447a9ec..0a33a90351 100644 --- a/source/geometry/navigation/include/G4TransportationManager.icc +++ b/source/geometry/navigation/include/G4TransportationManager.icc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4TransportationManager.icc,v 1.6 2006/06/29 18:36:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4TransportationManager.icc,v 1.9 2006/11/03 20:16:50 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------ // GEANT 4 inlined function members implementation // ------------------------------------------------------------ @@ -47,6 +47,18 @@ G4Navigator* G4TransportationManager::GetNavigatorForTracking() const return fNavigators[0]; } +// ---------------------------------------------------------------------------- +// SetWorldForTracking() +// +// Set the tracking world volume. This method is to be invoked by G4RunManagerKernel. +// +inline +void G4TransportationManager::SetWorldForTracking(G4VPhysicalVolume* theWorld) +{ + fWorlds[0] = theWorld; + fNavigators[0]->SetWorldVolume(theWorld); +} + // ---------------------------------------------------------------------------- // SetNavigatorForTracking() // @@ -96,7 +108,7 @@ G4FieldManager* G4TransportationManager::GetFieldManager() const // ---------------------------------------------------------------------------- // GetNoActiveNavigators() // -// Return an iterator to the list of active navigators. +// Return the number of active navigators. // inline size_t G4TransportationManager::GetNoActiveNavigators() const @@ -117,3 +129,28 @@ G4TransportationManager::GetActiveNavigatorsIterator() = std::vector::iterator(fActiveNavigators.begin()); return iterator; } + +// ---------------------------------------------------------------------------- +// GetNoWorlds() +// +// Return the number of registerd worlds. +// +inline +size_t G4TransportationManager::GetNoWorlds() const +{ + return fWorlds.size(); +} + +// ---------------------------------------------------------------------------- +// GetWorldsIterator() +// +// Return an iterator to the list of registered worlds. +// +inline +std::vector::iterator +G4TransportationManager::GetWorldsIterator() +{ + std::vector::iterator iterator + = std::vector::iterator(fWorlds.begin()); + return iterator; +} diff --git a/source/geometry/navigation/include/G4VoxelNavigation.hh b/source/geometry/navigation/include/G4VoxelNavigation.hh index 7205d3595f..b45384f1d4 100644 --- a/source/geometry/navigation/include/G4VoxelNavigation.hh +++ b/source/geometry/navigation/include/G4VoxelNavigation.hh @@ -25,7 +25,7 @@ // // // $Id: G4VoxelNavigation.hh,v 1.4 2006/06/29 18:36:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4VoxelNavigation diff --git a/source/geometry/navigation/include/G4VoxelNavigation.icc b/source/geometry/navigation/include/G4VoxelNavigation.icc index f2af1d516d..6beaa0b5c3 100644 --- a/source/geometry/navigation/include/G4VoxelNavigation.icc +++ b/source/geometry/navigation/include/G4VoxelNavigation.icc @@ -25,7 +25,7 @@ // // // $Id: G4VoxelNavigation.icc,v 1.4 2006/06/29 18:36:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4VoxelNavigation Inline implementation diff --git a/source/geometry/navigation/src/G4AuxiliaryNavServices.cc b/source/geometry/navigation/src/G4AuxiliaryNavServices.cc index 75ffda2aad..1da0c991e4 100644 --- a/source/geometry/navigation/src/G4AuxiliaryNavServices.cc +++ b/source/geometry/navigation/src/G4AuxiliaryNavServices.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4AuxiliaryNavServices.cc,v 1.3 2006/06/29 18:36:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- diff --git a/source/geometry/navigation/src/G4DrawVoxels.cc b/source/geometry/navigation/src/G4DrawVoxels.cc index 23f213b664..9f528b2788 100644 --- a/source/geometry/navigation/src/G4DrawVoxels.cc +++ b/source/geometry/navigation/src/G4DrawVoxels.cc @@ -25,7 +25,7 @@ // // // $Id: G4DrawVoxels.cc,v 1.4 2006/06/29 18:36:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4DrawVoxels diff --git a/source/geometry/navigation/src/G4GeomTestErrorList.cc b/source/geometry/navigation/src/G4GeomTestErrorList.cc index 8bd36c44aa..f941ab8848 100644 --- a/source/geometry/navigation/src/G4GeomTestErrorList.cc +++ b/source/geometry/navigation/src/G4GeomTestErrorList.cc @@ -25,7 +25,7 @@ // // // $Id: G4GeomTestErrorList.cc,v 1.3 2006/06/29 18:36:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/navigation/src/G4GeomTestOverlapList.cc b/source/geometry/navigation/src/G4GeomTestOverlapList.cc index a14f7f17bf..a6f8931442 100644 --- a/source/geometry/navigation/src/G4GeomTestOverlapList.cc +++ b/source/geometry/navigation/src/G4GeomTestOverlapList.cc @@ -25,7 +25,7 @@ // // // $Id: G4GeomTestOverlapList.cc,v 1.3 2006/06/29 18:36:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/navigation/src/G4GeomTestOvershootList.cc b/source/geometry/navigation/src/G4GeomTestOvershootList.cc index 3289e03237..d7c5d9c2d0 100644 --- a/source/geometry/navigation/src/G4GeomTestOvershootList.cc +++ b/source/geometry/navigation/src/G4GeomTestOvershootList.cc @@ -25,7 +25,7 @@ // // // $Id: G4GeomTestOvershootList.cc,v 1.3 2006/06/29 18:36:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/navigation/src/G4GeomTestPoint.cc b/source/geometry/navigation/src/G4GeomTestPoint.cc index 373687b8f3..d850bf48be 100644 --- a/source/geometry/navigation/src/G4GeomTestPoint.cc +++ b/source/geometry/navigation/src/G4GeomTestPoint.cc @@ -25,7 +25,7 @@ // // // $Id: G4GeomTestPoint.cc,v 1.3 2006/06/29 18:36:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/navigation/src/G4GeomTestSegment.cc b/source/geometry/navigation/src/G4GeomTestSegment.cc index 6a2d0880bb..b36192f155 100644 --- a/source/geometry/navigation/src/G4GeomTestSegment.cc +++ b/source/geometry/navigation/src/G4GeomTestSegment.cc @@ -25,7 +25,7 @@ // // // $Id: G4GeomTestSegment.cc,v 1.5 2006/06/29 18:36:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/navigation/src/G4GeomTestStreamLogger.cc b/source/geometry/navigation/src/G4GeomTestStreamLogger.cc index d8cf59dac9..d7e70179e3 100644 --- a/source/geometry/navigation/src/G4GeomTestStreamLogger.cc +++ b/source/geometry/navigation/src/G4GeomTestStreamLogger.cc @@ -25,7 +25,7 @@ // // // $Id: G4GeomTestStreamLogger.cc,v 1.3 2006/06/29 18:36:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/navigation/src/G4GeomTestVolPoint.cc b/source/geometry/navigation/src/G4GeomTestVolPoint.cc index fe47aa082f..fc9c95dec8 100644 --- a/source/geometry/navigation/src/G4GeomTestVolPoint.cc +++ b/source/geometry/navigation/src/G4GeomTestVolPoint.cc @@ -25,7 +25,7 @@ // // // $Id: G4GeomTestVolPoint.cc,v 1.3 2006/06/29 18:36:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/navigation/src/G4GeomTestVolume.cc b/source/geometry/navigation/src/G4GeomTestVolume.cc index fa84120fc7..f1a3e1f71b 100644 --- a/source/geometry/navigation/src/G4GeomTestVolume.cc +++ b/source/geometry/navigation/src/G4GeomTestVolume.cc @@ -25,7 +25,7 @@ // // // $Id: G4GeomTestVolume.cc,v 1.5 2006/06/29 18:36:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/navigation/src/G4GeometryMessenger.cc b/source/geometry/navigation/src/G4GeometryMessenger.cc index a4850b8a56..4e463bfee4 100644 --- a/source/geometry/navigation/src/G4GeometryMessenger.cc +++ b/source/geometry/navigation/src/G4GeometryMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: G4GeometryMessenger.cc,v 1.5 2006/06/29 18:36:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/navigation/src/G4MultiNavigator.cc b/source/geometry/navigation/src/G4MultiNavigator.cc new file mode 100644 index 0000000000..67b0e340ac --- /dev/null +++ b/source/geometry/navigation/src/G4MultiNavigator.cc @@ -0,0 +1,700 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4MultiNavigator.cc,v 1.4 2006/11/14 15:41:56 japost Exp $ +// GEANT4 tag $ Name: $ +// +// class G4PathFinder Implementation +// +// Author: John Apostolakis, November 2006 +// -------------------------------------------------------------------- + +#include "G4MultiNavigator.hh" + +class G4FieldManager; + +#include "G4Navigator.hh" +#include "G4PropagatorInField.hh" +#include "G4TransportationManager.hh" + +#include + +// ******************************************************************** +// Constructor +// ******************************************************************** +// +G4MultiNavigator::G4MultiNavigator() + // : fpActiveNavigators() + : G4Navigator(), + fVerboseLevel(1) +{ + fNoActiveNavigators= 0; + G4ThreeVector Big3Vector( DBL_MAX, DBL_MAX, DBL_MAX ); + fLastLocatedPosition= Big3Vector; + fSafetyLocation= Big3Vector; + fPreStepLocation= Big3Vector; + + fMinSafety_PreStepPt= -1.0; + fMinSafety_atSafLocation= -1.0; + fMinSafety= -DBL_MAX; + fMinStep= -DBL_MAX; + // fNewTrack= false; + + G4int num; + for( num=0; num<= fMaxNav; ++num ) { + fpNavigator[num] = 0; + fLimitTruth[num] = false; + fLimitedStep[num] = kUndefLimited; + fCurrentStepSize[num] = -1.0; + fLocatedVolume[num] = 0; + } + // fpNavigator= new[MaxNav] (G4Navigator*); + + pTransportManager= G4TransportationManager::GetTransportationManager(); + + // EndState = G4FieldTrack( G4ThreeVector(), G4ThreeVector(), 0., 0., 0., 0., 0.) ); + // fRelocatedPoint( + // fLastStepNo= -1; + + G4Navigator* massNav= pTransportManager->GetNavigatorForTracking(); + if( massNav ) { + G4VPhysicalVolume* pWorld= massNav->GetWorldVolume(); + if( pWorld ) { + this->SetWorldVolume( pWorld ); + fLastMassWorld= pWorld; + } + } +} + +G4MultiNavigator::~G4MultiNavigator() +{ + // delete[] fpNavigator; +} + +// static G4int lastStepNo= -1; + // To find the field do not forget to call + // G4FieldManager* FindAndSetFieldManager(G4VPhysicalVolume* pCurrentPhysVol); + // which sets and returns the correct field manager (global or local), if any. + // Need to call it before PropagatorInField::ComputeStep is called. + +G4double G4MultiNavigator::ComputeStep(const G4ThreeVector &pGlobalPoint, + const G4ThreeVector &pDirection, + const G4double proposedStepLength, + G4double &pNewSafety) +{ + G4double safety= 0.0, step=0.0; + G4double minSafety= DBL_MAX, minStep= DBL_MAX; + + if( fVerboseLevel > 2 ){ + G4cout << " G4MultiNavigator::ComputeStep : entered " << G4endl; + G4cout << " Input position= " << pGlobalPoint + << " direction= " << pDirection << G4endl; + G4cout << " Requested step= " << proposedStepLength << G4endl; + } + + std::vector::iterator pNavigatorIter; + + pNavigatorIter= pTransportManager-> GetActiveNavigatorsIterator(); + + G4ThreeVector initialPosition= pGlobalPoint; + G4ThreeVector initialDirection= pDirection; + + G4int num=0; + for( num=0; num< fNoActiveNavigators; ++pNavigatorIter,++num ) { + safety= DBL_MAX; + + step= (*pNavigatorIter)->ComputeStep( initialPosition, + initialDirection, + proposedStepLength, + safety ); + if( safety < minSafety ){ minSafety = safety; } + if( step < minStep ) { minStep= step; } + // Later could reduce the proposed step to the latest minStep value ? + // if( step == kInfinity ) { step = proposedStepLength; } + fCurrentStepSize[num] = step; + fNewSafety[num]= safety; + // This is currently the safety from the last sub-step + + if( fVerboseLevel > 2 ){ + G4cout << "G4MultiNavigator::ComputeStep : Navigator [" << num << "] -- step size " << step << " safety= " << safety << G4endl; + } + } + + // fWasLimitedByGeometry= false; // <----- Could reset(?), but navigator leaves it as is + // Whether any geometry limited the step + // G4bool StepLimited = ( minStep <= proposedStepLength); + // G4cout << "G4MultiNavigator::ComputeStep - StepLimited is " << StepLimited + // << " given minStep= " << minStep << " and proposed Step= " << proposedStepLength << G4endl; + + // Save safety value, related position + fPreStepLocation= initialPosition; + fMinSafety_PreStepPt= minSafety; + + fMinStep= minStep; + + G4double trueMinStep= minStep; + if( fMinStep == kInfinity ){ + trueMinStep = proposedStepLength; // Use this below for endpoint !! + } + fTrueMinStep = trueMinStep; + + if( fVerboseLevel > 1 ){ + G4ThreeVector endPosition; + endPosition= initialPosition + trueMinStep * initialDirection ; + + int oldPrec= G4cout.precision(8); + G4cout << "G4MultiNavigator::ComputeStep : " + << " initialPosition = " << initialPosition + << " and endPosition = " << endPosition<< G4endl; + G4cout.precision( oldPrec ); + } + + pNewSafety= minSafety; + // Set the EndState + // fEndState= initialState; + // fEndState.SetPosition( endPosition ); + // fEndState.SetProperTimeOfFlight( -1.000 ); // Not defined YET + // fEndState.SetMomentum( initialState.GetMomentum ); + + this->WhichLimited(); + + if( fVerboseLevel > 2 ){ + G4cout << " G4MultiNavigator::ComputeStep : exits returning " << minStep << G4endl; + } + + return minStep; // must return kInfinity if do not limit step +} + +G4double +G4MultiNavigator::ObtainFinalStep( G4int navigatorId, + G4double &pNewSafety, // for this geom + G4double &minStep, + ELimited &limitedStep) +{ + G4int navigatorNo=-1; + + if( navigatorId <= fNoActiveNavigators ){ + navigatorNo= navigatorId; + } else { + G4cerr << " Navigator Id = " << navigatorId + << " No Active = " << fNoActiveNavigators << " . " << G4endl; + G4Exception( "G4MultiNavigator::ObtainFinalStep : Bad Navigator Id" ); + } + // if( ! ){ G4Exception( "G4MultiNavigator::ObtainFinalStep Called without call to ComputeStep"); } + + // Prepare the information to return + pNewSafety = fNewSafety[ navigatorNo ]; + limitedStep = fLimitedStep[ navigatorNo ]; + minStep= fMinStep; + + // if( (minStep==kInfinity) || (fVerboseLevel > 1) ){ + if( fVerboseLevel > 1 ){ + G4cout << " G4MultiNavigator::ComputeStep returns " << fCurrentStepSize[ navigatorNo ] + << " for Navigator " << navigatorNo << " Limited step = " << limitedStep + << " Safety(mm) = " << pNewSafety / mm << G4endl; + } + + return fCurrentStepSize[ navigatorNo ]; +} + +// ---------------------------------------------------------------------- + +void +G4MultiNavigator::PrepareNewTrack( const G4ThreeVector position, + const G4ThreeVector direction ) +{ + if( fVerboseLevel > 1 ) + G4cout << " Entered G4MultiNavigator::PrepareNewTrack() " << G4endl; + + G4MultiNavigator::PrepareNavigators(); + //*********************************** + + if( fVerboseLevel > 1 ) { + G4cout << " Calling MultiNavigator::Locate() from G4MultiNavigator::PrepareNewTrack() " + << G4endl; + } + + this->LocateGlobalPointAndSetup( position, &direction, false, false ); + // ========================= + // The first location for each Navigator must be non-relative + // or else call ResetStackAndState() for each Navigator + // Use direction to get correct side of boundary (ignore dir= false) + + // fRelocatedPoint= false; + + if( fVerboseLevel > 0 ) { + G4cout << " G4MultiNavigator::PrepareNewTrack : exiting. " << G4endl; + } + +} + +void +G4MultiNavigator::PrepareNavigators() +{ + // Key purposes: + // - Check and cache set of active navigators + // - Reset state for new track + G4int num=0; + + if( fVerboseLevel > 1 ) + G4cout << " G4MultiNavigator::PrepareNavigators - entered " << G4endl; + // static G4TransportationManager* pTransportManager= + // G4TransportationManager::GetTransportationManager(); + + // fNavigators= true; + // this->MovePoint(); // Signal further that the last status is wiped + + // Message the G4NavigatorPanel / Dispatcher to find active navigators + std::vector::iterator pNavigatorIter; + + fNoActiveNavigators= pTransportManager-> GetNoActiveNavigators(); + if( fNoActiveNavigators > fMaxNav ){ + G4cerr << "Too many active Navigators (worlds). G4MultiNavigator fails." + << G4endl; + G4cout << " Fatal error: Transportation Manager reports " << fNoActiveNavigators + << " which is more than the number allowed = " << fMaxNav << G4endl; + G4Exception("G4MultiNavigator::PrepareNavigators()", "TooManyNavigators", + FatalException, "Too many active Navigators / worlds"); + } + + pNavigatorIter= pTransportManager-> GetActiveNavigatorsIterator(); + for( num=0; num< fNoActiveNavigators; ++pNavigatorIter,++num ) { + + // Keep information in carray ... for returning information stored + fpNavigator[num] = *pNavigatorIter; + fLimitTruth[num] = false; + fLimitedStep[num] = kDoNot; + fCurrentStepSize[num] = 0.0; + fLocatedVolume[num] = 0; + } + fWasLimitedByGeometry= false; + + // Check the world volume of the mass navigator (in case a SetWorldVolume changed it) + G4VPhysicalVolume* massWorld = this-> GetWorldVolume(); + // fpNavigator[0] -> GetWorldVolume(); + if( (massWorld != fLastMassWorld) && (massWorld!=0) ) { + // Pass along change to Mass Navigator + fpNavigator[0] -> SetWorldVolume( massWorld ); + if( fVerboseLevel > 0 ) { + G4cout << "G4MultiNavigator::PrepareNavigators changed world volume " + << " for mass geometry to " << massWorld->GetName() << G4endl; + } + fLastMassWorld= massWorld; + }else{ + if( fVerboseLevel > 2 ) { + G4cout << "G4MultiNavigator::PrepareNavigators retained world volume " + << " Pointer= " << massWorld << G4endl; + if( massWorld ) + G4cout << " Name= " << massWorld->GetName() << G4endl; + } + } + + if( fVerboseLevel > 2 ) { + G4cout << " G4MultiNavigator::PrepareNavigators : exiting. " << G4endl; + } +} + + +G4VPhysicalVolume* +G4MultiNavigator::LocateGlobalPointAndSetup(const G4ThreeVector& position, + const G4ThreeVector* pDirection, + const G4bool pRelativeSearch, + const G4bool ignoreDirection ) +{ + // Locate the point in each geometry + + G4ThreeVector direction(0.0, 0.0, 0.0); + G4bool relative= pRelativeSearch; + std::vector::iterator pNavIter= pTransportManager->GetActiveNavigatorsIterator(); + G4int num=0; + + if( pDirection ) direction = *pDirection; + +#if 0 + G4ThreeVector lastEndPosition= fEndState.GetPosition(); + G4ThreeVector moveVec = (position - lastEndPosition ); + G4double moveLenSq= moveVec.mag2(); + if( (!fNewTrack) && (!fRelocatedPoint) && ( moveLenSq> 0.0) ){ + ReportMove( position, lastEndPosition, "Position" ); + G4Exception( "G4MultiNavigator::LocateGlobalPointAndSetup", + "211-LocateUnexpectedPoint", + JustWarning, + // FatalException, + "Location is not where last ComputeStep ended."); + } + fLastLocatedPosition= position; +#endif + + if( fVerboseLevel > 2 ){ + G4cout << " G4MultiNavigator::LocateGlobalPointAndSetup : entered " << " ---------------" << G4endl; + G4cout << " Locating at position " << position << " with direction " << direction + << " relative= " << relative << " ignore direction= " << ignoreDirection<< G4endl; + G4cout << " Number of active navigators= " << fNoActiveNavigators << G4endl; + } + + for ( num=0; num< fNoActiveNavigators ; ++pNavIter,++num ) { + // ... who limited the step .... + + // G4cout << " -- Navigator id= " << num << " NavigatorPtr " << *pNavIter << G4endl; + // G4VPhysicalVolume* world= (*pNavIter)->GetWorldVolume(); + // if( world ) { G4cout << " Navigator world= " << world->GetName() << G4endl; } + // else{ G4cout << " No world set in Navigator. " << G4endl; } + + if( fWasLimitedByGeometry && fLimitTruth[num] ) { + (*pNavIter)->SetGeometricallyLimitedStep(); + } + + G4VPhysicalVolume *pLocated= + (*pNavIter)->LocateGlobalPointAndSetup( position, &direction, + //*************************************// + relative, + ignoreDirection); + // Set the state related to the location + fLocatedVolume[num] = pLocated; + + // Clear state related to the step + fLimitedStep[num] = kDoNot; + fCurrentStepSize[num] = 0.0; + fLimitTruth[ num ] = false; // Always clear on locating (see Navigator) + + if( fVerboseLevel > 2 ){ + G4cout << " Located in world " << num << " at " << position + << " used geomLimStp " << fLimitTruth[num] + << " - found in volume " << pLocated ; + G4cout << " name = '" ; + if( pLocated ){ + G4cout << pLocated->GetName() << "'"; + G4cout << " - CopyNo= " << pLocated->GetCopyNo(); + } else { + G4cout << "Null' Id: Not-Set "; + } + G4cout << G4endl; + } + } // ending for (num= .... + fWasLimitedByGeometry= false; // Clear on locating + + if( fVerboseLevel > 2 ){ + G4cout << " G4MultiNavigator::Locate : exiting. " << G4endl << G4endl; + } + // fRelocatedPoint= false; + + G4VPhysicalVolume* volMassLocated= fLocatedVolume[0]; + return volMassLocated; +} + +void +G4MultiNavigator::LocateGlobalPointWithinVolume(const G4ThreeVector& position) +{ + // Relocate the point in each geometry + std::vector::iterator pNavIter= pTransportManager->GetActiveNavigatorsIterator(); + // const G4double cErrorTolerance=1e-12; + // Maximum relative error from roundoff of arithmetic + G4int num=0; + + if( fVerboseLevel > 2 ){ + G4cout << G4endl; + G4cout << " G4MultiNavigator::ReLocate : entered " << G4endl; + G4cout << " ---------------------- -------" << G4endl; + G4cout << " *Re*Locating at position " << position << G4endl; + } + + for ( num=0; num< fNoActiveNavigators ; ++pNavIter,++num ) { + // ... none limited the step + + // G4VPhysicalVolume physVolume= + (*pNavIter)->LocateGlobalPointWithinVolume( position ); + //*************************************// + + // Clear state related to the step + fLimitedStep[num] = kDoNot; + fCurrentStepSize[num] = 0.0; + + fLimitTruth[ num ] = false; // Always clear on locating (see Navigator) + // fLocatedVolume[num]= physVolume; + + // G4cout << " ReLocated in world " << num << " at " << position << G4endl; + } + fWasLimitedByGeometry= false; // Clear on locating + + fLastLocatedPosition= position; + // fRelocatedPoint= false; + + if( fVerboseLevel > 2 ){ + G4cout << " G4MultiNavigator::LocateGlobalPointWithinVolume : exiting " + << " at position " << position << G4endl; + G4cout << G4endl; + } + +} + +// ----------------------------------------------------------------------------- + +G4double G4MultiNavigator::ComputeSafety( const G4ThreeVector& position, + G4double maxDistance) + // Recompute safety for the relevant point +{ + G4double minSafety= DBL_MAX; + // G4cout << " G4MultiNavigator::ComputeSafety - called at " << position << G4endl; + + std::vector::iterator pNavigatorIter; + pNavigatorIter= pTransportManager-> GetActiveNavigatorsIterator(); + + G4int num=0; + for( num=0; num< fNoActiveNavigators; ++pNavigatorIter,++num ) { + + G4double safety; + safety= (*pNavigatorIter)->ComputeSafety( position, maxDistance ); + + if( safety < minSafety ){ minSafety = safety; } + // fNewSafety[num]= safety; + } + + fSafetyLocation= position; + fMinSafety_atSafLocation = minSafety; + + if( fVerboseLevel > 1 ) { + G4cout << " G4MultiNavigator::ComputeSafety - returns " + << minSafety << " at location " << position + << G4endl; + } + return minSafety; +} + + +// ----------------------------------------------------------------------------- + +G4TouchableHistoryHandle +G4MultiNavigator::CreateTouchableHistoryHandle() const +{ + G4Exception( "G4MultiNavigator::CreateTouchableHistoryHandle", + "215-TouchableFromWrongNavigator", + FatalException, + "Getting a touchable from G4MultiNavigator is not defined."); + + if( fVerboseLevel > 2 ){ + G4cout << "G4MultiNavigator::CreateTouchableHandle : navId = " << 0 ; + // << " -- " << GetNavigator(navId) << G4endl; + } + + G4TouchableHistory* touchHist; + touchHist= fpNavigator[0] -> CreateTouchableHistory(); + + // G4TouchableHistory* touchHist= new G4TouchableHistory(); + + G4VPhysicalVolume* locatedVolume= fLocatedVolume[0]; + if( locatedVolume == 0 ) + { + // Workaround to ensure that the touchable is fixed !! // TODO: fix + touchHist->UpdateYourself( locatedVolume, + touchHist->GetHistory() ); + } + + return G4TouchableHistoryHandle(touchHist); +} + +void +G4MultiNavigator::WhichLimited() // Flag which processes limited the step +{ + G4int num=-1, last=-1; + const G4int IdTransport= 0; // Id of Mass Navigator !! + G4int noLimited=0; + ELimited shared= kSharedOther; + + if( fVerboseLevel > 2 ) + G4cout << " G4MultiNavigator::WhichLimited - entered " << G4endl; + + // Assume that [IdTransport] is Mass / Transport + // G4bool transportLimited = (fCurrentStepSize[IdTransport] == fMinStep); + G4bool transportLimited = (fCurrentStepSize[IdTransport] == fMinStep) + && ( fMinStep!= kInfinity) ; + if( transportLimited ){ + shared= kSharedTransport; + } + + for ( num= 0; num < fNoActiveNavigators; num++ ) { + G4bool limitedStep; + + G4double step= fCurrentStepSize[num]; + + limitedStep = ( step == fMinStep ) && ( step != kInfinity); + // if( step == kInfinity ) { fCurrentStepSize[num] = proposedStepLength; } + + fLimitTruth[ num ] = limitedStep; + if( limitedStep ) { + noLimited++; + fLimitedStep[num] = shared; + last= num; + }else{ + fLimitedStep[num] = kDoNot; + } + } + if( (last > -1) && (noLimited == 1 ) ){ + fLimitedStep[ last ] = kUnique; + } + +#ifndef G4NO_VERBOSE + if( fVerboseLevel > 1 ){ + this->PrintLimited(); // --> for tracing + G4cout << " G4MultiNavigator::WhichLimited - exiting. " << G4endl; + } +#endif + +} + +void +G4MultiNavigator::PrintLimited() +{ + static G4String StrDoNot("DoNot"), StrUnique("Unique"), StrUndefined("Undefined"), + StrSharedTransport("SharedTransport"), StrSharedOther("SharedOther"); + // Report results -- for checking + G4cout << "G4MultiNavigator::PrintLimited reports: " ; + G4cout << " Minimum step (true)= " << fTrueMinStep + << " reported min = " << fMinStep + << G4endl; + if( // (fCurrentStepNo <= 2) || + (fVerboseLevel>=2) ) { + G4cout // << std::setw(5) << " Step#" << " " + << std::setw(5) << " NavId" << " " + << std::setw(12) << " step-size " << " " + << std::setw(12) << " raw-size " << " " + << std::setw(12) << " pre-safety " << " " + << std::setw(15) << " Limited / flag" << " " + << std::setw(15) << " World " << " " + << G4endl; + } + int num; + for ( num= 0; num < fNoActiveNavigators; num++ ) { + G4double rawStep = fCurrentStepSize[num]; + G4double stepLen = fCurrentStepSize[num]; + if( stepLen > fTrueMinStep ) { + stepLen = fTrueMinStep; // did not limit (went as far as asked) + } + G4int oldPrec= G4cout.precision(9); + // const char *BooleanValue[2] = { " NO", "YES" } ; + G4cout // << std::setw(5) << fCurrentStepNo << " " + << std::setw(5) << num << " " + << std::setw(12) << stepLen << " " + << std::setw(12) << rawStep << " " + << std::setw(12) << fNewSafety[num] << " " + << std::setw(5) << (fLimitTruth[num] ? "YES" : " NO") << " "; + G4String limitedStr; + switch ( fLimitedStep[num] ) { + case kDoNot: limitedStr= StrDoNot; break; + case kUnique: limitedStr = StrUnique; break; + case kSharedTransport: limitedStr= StrSharedTransport; break; + case kSharedOther: limitedStr = StrSharedOther; break; + default: limitedStr = StrUndefined; break; + } + G4cout << " " << std::setw(15) << limitedStr << " "; + G4cout.precision(oldPrec); + + G4Navigator *pNav= fpNavigator[ num ]; + G4String WorldName( "Not-Set" ); + if (pNav) { + G4VPhysicalVolume *pWorld= pNav->GetWorldVolume(); + if( pWorld ) { + WorldName = pWorld->GetName(); + } + } + G4cout << " " << WorldName ; + G4cout << G4endl; + } + + if( fVerboseLevel > 2 ) + G4cout << " G4MultiNavigator::PrintLimited - exiting. " << G4endl; +} + + +void +G4MultiNavigator::ResetState() +{ + G4int num; + fWasLimitedByGeometry= false; + + G4Exception( "G4MultiNavigator::ResetState", + "217-CannotImplement", + FatalException, + "Cannot call ResetState for active navigators of G4MultiNavigator."); + std::vector::iterator pNavigatorIter; + pNavigatorIter= pTransportManager-> GetActiveNavigatorsIterator(); + for( num=0; num< fNoActiveNavigators; ++pNavigatorIter,++num ) { + // (*pNavigatorIter)->ResetState(); // KEEP THIS comment !!! + } +} + +void +G4MultiNavigator::SetupHierarchy() +{ + // G4Navigator::SetupHierarchy(); + G4Exception( "G4MultiNavigator::SetupHierarchy", + "217-CannotImplement", + FatalException, + "Cannot call SetupHierarchy for active navigators of G4MultiNavigator."); +} + +void +G4MultiNavigator::CheckMassWorld() +{ + // + G4VPhysicalVolume* navTrackWorld= pTransportManager->GetNavigatorForTracking() + ->GetWorldVolume(); + if( navTrackWorld != fLastMassWorld ) { + G4Exception( "G4MultiNavigator::CheckMassWorld", "MultiNav-220", FatalException, + "Mass world pointer has been changed." ); + } +} + +G4VPhysicalVolume* G4MultiNavigator::ResetHierarchyAndLocate(const G4ThreeVector &point, + const G4ThreeVector &direction, + const G4TouchableHistory &MassHistory) + // Reset geometry for all -- and use the touchable for the mass history +{ + G4VPhysicalVolume* massVolume=0; + G4int num; + G4Navigator* pMassNavigator= fpNavigator[0]; + + if( pMassNavigator ){ + massVolume= pMassNavigator->ResetHierarchyAndLocate( point, direction, MassHistory); + }else{ + G4Exception("G4MultiNavigator::ResetHierarchyAndLocate", + "218-TooEarlyToReset", + FatalException, + "Cannot reset hierarchy before object is initialised with valid navigators, including a mass Navigator" ); + } + + std::vector::iterator pNavIter= + pTransportManager->GetActiveNavigatorsIterator(); + + for ( num=0; num< fNoActiveNavigators ; ++pNavIter,++num ) { + G4bool relativeSearch, ignoreDirection; + + (*pNavIter)-> LocateGlobalPointAndSetup( point, + &direction, + relativeSearch=false, + ignoreDirection=false); + } + return massVolume; +} diff --git a/source/geometry/navigation/src/G4Navigator.cc b/source/geometry/navigation/src/G4Navigator.cc index 41dec03bd4..8ddbf55aa2 100644 --- a/source/geometry/navigation/src/G4Navigator.cc +++ b/source/geometry/navigation/src/G4Navigator.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // -// $Id: G4Navigator.cc,v 1.21 2006/06/29 18:36:59 gunter Exp $ +// $Id: G4Navigator.cc,v 1.25 2006/11/11 01:28:23 japost Exp $ // GEANT4 tag $ Name: $ // // class G4Navigator Implementation @@ -44,9 +44,10 @@ // ******************************************************************** // G4Navigator::G4Navigator() - : fActive(false), fWasLimitedByGeometry(false), fTopPhysical(0), + : fWasLimitedByGeometry(false), fTopPhysical(0), fCheck(false), fPushed(false), fVerbose(0) { + fActive= false; ResetStackAndState(); fActionThreshold_NoZeroSteps = 10; @@ -185,7 +186,7 @@ G4Navigator::LocateGlobalPointAndSetup( const G4ThreeVector& globalPoint, case kParameterised: G4VSolid *pSolid; G4VPVParameterisation *pParam; - G4TouchableHistory parentTouchable( fHistory ); + G4TouchableHistory parentTouchable( fHistory ); pParam = fBlockedPhysicalVolume->GetParameterisation(); pSolid = pParam->ComputeSolid(fBlockedReplicaNo, fBlockedPhysicalVolume); @@ -202,10 +203,10 @@ G4Navigator::LocateGlobalPointAndSetup( const G4ThreeVector& globalPoint, G4LogicalVolume *pLogical; pLogical = fBlockedPhysicalVolume->GetLogicalVolume(); pLogical->SetSolid( pSolid ); - pLogical->UpdateMaterial(pParam->ComputeMaterial( - fBlockedReplicaNo, - fBlockedPhysicalVolume, - &parentTouchable)); + pLogical->UpdateMaterial(pParam -> + ComputeMaterial(fBlockedReplicaNo, + fBlockedPhysicalVolume, + &parentTouchable)); break; } fEntering = false; @@ -507,32 +508,6 @@ G4Navigator::LocateGlobalPointWithinVolume(const G4ThreeVector& pGlobalpoint) fExitedMother = false; // Boundary not encountered, did not exit } -// ******************************************************************** -// LocateGlobalPointAndUpdateTouchableHandle -// ******************************************************************** -// -void G4Navigator::LocateGlobalPointAndUpdateTouchableHandle( - const G4ThreeVector& position, - const G4ThreeVector& direction, - G4TouchableHandle& oldTouchableToUpdate, - const G4bool RelativeSearch ) -{ - G4VPhysicalVolume* pPhysVol; - pPhysVol = LocateGlobalPointAndSetup( position,&direction,RelativeSearch ); - if( fEnteredDaughter || fExitedMother ) - { - oldTouchableToUpdate = CreateTouchableHistory(); - if( pPhysVol == 0 ) - { - // We want to ensure that the touchable is correct in this case. - // The method below should do this and recalculate a lot more .... - // - oldTouchableToUpdate->UpdateYourself( pPhysVol, &fHistory ); - } - } - return; -} - // ******************************************************************** // ComputeStep // @@ -993,15 +968,15 @@ void G4Navigator::SetupHierarchy() pSolid->ComputeDimensions(pParam, replicaNo, current); pParam->ComputeTransformation(replicaNo, current); - G4TouchableHistory touchable( fHistory ); - touchable.MoveUpHistory(); // move up to the parent level + G4TouchableHistory touchable( fHistory ); + touchable.MoveUpHistory(); // move up to the parent level // Set up the correct solid and material in Logical Volume // G4LogicalVolume *pLogical = current->GetLogicalVolume(); pLogical->SetSolid( pSolid ); - pLogical->UpdateMaterial( pParam->ComputeMaterial(replicaNo, current, - &touchable) ); + pLogical->UpdateMaterial( pParam -> + ComputeMaterial(replicaNo, current, &touchable) ); break; } mother = current; @@ -1061,8 +1036,12 @@ G4double G4Navigator::ComputeSafety( const G4ThreeVector &pGlobalpoint, G4int oldcoutPrec = G4cout.precision(8); if( fVerbose > 0 ) { + G4cout << "*** G4Navigator::ComputeSafety: ***" << G4endl + << " Called at point: " + << pGlobalpoint << G4endl + << " for Navigator: " << this << G4endl; + G4VPhysicalVolume *motherPhysical = fHistory.GetTopVolume(); - G4cout << "*** G4Navigator::ComputeSafety: ***" << G4endl; G4cout << " Volume = " << motherPhysical->GetName() << " - Maximum length = " << pMaxLength << G4endl; if( fVerbose == 4 ) @@ -1081,6 +1060,12 @@ G4double G4Navigator::ComputeSafety( const G4ThreeVector &pGlobalpoint, // LocateGlobalPointWithinVolume( pGlobalpoint ); + if( fVerbose >= 2 ) + { + G4cout << " ComputeSafety() relocates-in-volume to point: " + << pGlobalpoint << G4endl; + } + G4VPhysicalVolume *motherPhysical = fHistory.GetTopVolume(); G4LogicalVolume *motherLogical = motherPhysical->GetLogicalVolume(); G4ThreeVector localPoint = ComputeLocalPoint(pGlobalpoint); @@ -1114,6 +1099,23 @@ G4double G4Navigator::ComputeSafety( const G4ThreeVector &pGlobalpoint, fHistory, pMaxLength); } } + else + { + if( fVerbose >= 2 ) + { + G4cout << " ComputeSafety() finds that point - " + << pGlobalpoint << " - is on surface " << G4endl; + if( fEnteredDaughter ) + { + G4cout << " entered new daughter volume" << G4endl; + } + if( fExitedMother ) + { + G4cout << " and exited previous volume."; + } + G4cout << G4endl; + } + } // Remember last safety origin & value // diff --git a/source/geometry/navigation/src/G4NormalNavigation.cc b/source/geometry/navigation/src/G4NormalNavigation.cc index 3f48f23bf7..3eac3c2112 100644 --- a/source/geometry/navigation/src/G4NormalNavigation.cc +++ b/source/geometry/navigation/src/G4NormalNavigation.cc @@ -25,7 +25,7 @@ // // // $Id: G4NormalNavigation.cc,v 1.8 2006/06/29 18:37:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4NormalNavigation Implementation diff --git a/source/geometry/navigation/src/G4ParameterisedNavigation.cc b/source/geometry/navigation/src/G4ParameterisedNavigation.cc index 6a3b479238..e3168c144c 100644 --- a/source/geometry/navigation/src/G4ParameterisedNavigation.cc +++ b/source/geometry/navigation/src/G4ParameterisedNavigation.cc @@ -25,7 +25,7 @@ // // // $Id: G4ParameterisedNavigation.cc,v 1.10 2006/06/29 18:37:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4ParameterisedNavigation Implementation diff --git a/source/geometry/navigation/src/G4PathFinder.cc b/source/geometry/navigation/src/G4PathFinder.cc new file mode 100644 index 0000000000..9ca3130f25 --- /dev/null +++ b/source/geometry/navigation/src/G4PathFinder.cc @@ -0,0 +1,1041 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4PathFinder.cc,v 1.25 2006/12/13 15:43:32 gunter Exp $ +// GEANT4 tag $ Name: $ +// +// class G4PathFinder Implementation +// +// Original author: John Apostolakis, April 2006 +// Revisions: +// 21.05.06 J.Apostolakis First implementation coworks with MassNavigator +// 23.05.06 M.Asai Change to new navigator numbering of G4Transp..Manager +// 31.05.06 J.Apostolakis New Relocate method, to relocate within volume +// 25.10.06 G.Cosmo pTransportManager ptr a data member - singleton issue +// 31.10.06 J.Apostolakis Revised Relocate, to check proposed position vs safety +// -------------------------------------------------------------------- + +#include "G4PathFinder.hh" +// #include "G4ios.hh" +// #include + +// class G4VPhysicalVolume; +// #include "G4VPhysicalVolume.hh" + +class G4FieldManager; // #include "G4FieldManager.hh" +#include "G4Navigator.hh" +#include "G4PropagatorInField.hh" +#include "G4TransportationManager.hh" +#include "G4MultiNavigator.hh" + +// class G4VCurvedTrajectoryFilter; + +#include + +// ******************************************************************** +// Constructor +// ******************************************************************** +// + +G4PathFinder* +G4PathFinder::GetInstance() +{ + static G4PathFinder* fpInstance= 0; + if( ! fpInstance ) { + fpInstance= new G4PathFinder(); + } + return fpInstance; +} + + +G4PathFinder::G4PathFinder() + // : fpActiveNavigators() + : fEndState( G4ThreeVector(), G4ThreeVector(), 0., 0., 0., 0., 0.), + fRelocatedPoint(true), + fLastStepNo(-1), + fVerboseLevel(0) +{ + fpMultiNavigator= new G4MultiNavigator(); + + fpTransportManager= G4TransportationManager::GetTransportationManager(); + fpFieldPropagator = fpTransportManager->GetPropagatorInField() ; + + fNoActiveNavigators= 0; + G4ThreeVector Big3Vector( DBL_MAX, DBL_MAX, DBL_MAX ); + fLastLocatedPosition= Big3Vector; + fSafetyLocation= G4ThreeVector( DBL_MAX, DBL_MAX, DBL_MAX ); + fPreStepLocation= Big3Vector; + + fMinSafety_PreStepPt= -1.0; + fMinSafety_atSafLocation= -1.0; + fMinSafety= -1.0; // Invalid value + fMinStep= -1.0; // + fNewTrack= false; + + G4int num; + for( num=0; num<= fMaxNav; ++num ) { + fpNavigator[num] = 0; + fLimitTruth[num] = false; + fLimitedStep[num] = kUndefLimited; + fCurrentStepSize[num] = -1.0; + fLocatedVolume[num] = 0; + } + // fpNavigator= new[MaxNav] (G4Navigator*); + +} + +G4PathFinder::~G4PathFinder() +{ + // delete[] fpNavigator; + delete fpMultiNavigator; +} + +#include "G4SafetyHelper.hh" + +void +G4PathFinder::EnableParallelNavigation(G4bool enableChoice) +{ + G4Navigator *navigatorForPropagation=0, *massNavigator=0; + + massNavigator= fpTransportManager->GetNavigatorForTracking(); + if( enableChoice ){ + // + navigatorForPropagation= fpMultiNavigator; + G4SafetyHelper::EnableParallelNavigation(true); // Enable Msc to use PF + }else{ + // fpNavigator[0]; // must be mass Navigator + navigatorForPropagation= massNavigator; + G4SafetyHelper::EnableParallelNavigation(false); // Disable Msc from using PF + } + fpFieldPropagator->SetNavigatorForPropagating(navigatorForPropagation); +} + +G4double +G4PathFinder::ComputeStep( const G4FieldTrack &InitialFieldTrack, + G4double proposedStepLength, + G4int navigatorId, + G4int stepNo, // find next step + G4double &pNewSafety, // for this geom + ELimited &limitedStep, + G4FieldTrack &EndState, + G4VPhysicalVolume* currentVolume) +{ + // --- + G4int navigatorNo=-1; + + if( fVerboseLevel > 2 ){ + G4cout << " -------------------------" << G4endl; + G4cout << " G4PathFinder::ComputeStep - entered " << G4endl; + G4cout << " - stepNo = " << std::setw(4) << stepNo << " " + << " navigatorId = " << std::setw(2) << navigatorId << " " + << " proposed step len = " << proposedStepLength << " " + << G4endl; + G4cout << " PF::ComputeStep: step= " << stepNo + << " nav = " << navigatorId + << " trial-step-len " << proposedStepLength + << " from " << InitialFieldTrack.GetPosition() + << " dir " << InitialFieldTrack.GetMomentumDirection() + << G4endl; + } + + if( navigatorId <= fNoActiveNavigators ){ + navigatorNo= navigatorId; + } else { + G4cerr << " Navigator Id = " << navigatorId + << " No Active = " << fNoActiveNavigators << " . " << G4endl; + G4Exception( "G4PathFinder::ComputeStep: Bad Navigator Id" ); + } + + if( fNewTrack || (stepNo != fLastStepNo) ){ + + // This is a new track or a new step, so we must make the step + // ( else we can simply retrieve its results for this Navigator Id ) + + // G4cout << " initial = " << InitialFieldTrack << G4endl; + G4FieldTrack currentState= InitialFieldTrack; + if( fVerboseLevel > 1 ) + G4cout << " current = " << currentState << G4endl; + + fCurrentStepNo = stepNo; + + // Check whether a process shifted the position + // since the last step -- by physics processes + G4ThreeVector newPosition = InitialFieldTrack.GetPosition(); + G4ThreeVector moveVector= newPosition - fLastLocatedPosition; + G4double moveLenSq= moveVector.mag2(); + if( moveLenSq > kCarTolerance * kCarTolerance ){ + G4ThreeVector newDirection = InitialFieldTrack.GetMomentumDirection(); + if( fVerboseLevel > 2 ) { + G4double moveLen= std::sqrt( moveLenSq ); + G4cout << " G4PathFinder::ComputeStep : Point moved since last step " + << " -- at step # = " << stepNo << G4endl + << " by " << moveLen + << " to " << newPosition << G4endl; + } + + // fRelocatedPoint= true; // It has moved !! + this->MovePoint(); + +#ifdef G4VERBOSE + if( fVerboseLevel > 2 ) { + G4cout << " Calling PathFinder::Locate() from G4PathFinder::ComputeStep() " << G4endl; + } +#endif + // Relocate to cope with this move -- else could abort !? + Locate( newPosition, newDirection ); + } + + // Check whether the particle have an (EM) field force exerting upon it + // + G4double particleCharge= currentState.GetCharge(); + // G4double magDipoleMoment= currentState.GetMagneticDipoleMoment(); + + G4FieldManager* fieldMgr=0; + G4bool fieldExertsForce = false ; + if( (particleCharge != 0.0) ) { // || ( magDipoleMoment != 0.0 ) ) { + fieldMgr= fpFieldPropagator->FindAndSetFieldManager( currentVolume ); + // Protect for case where field manager has no field (= field is zero) + fieldExertsForce = (fieldMgr != 0) + && (fieldMgr->GetDetectorField() != 0); + } + // G4cout << "G4PF::CS> Field exerts force = " << fieldExertsForce << G4endl; + if( fieldExertsForce ) { + DoNextCurvedStep( currentState, proposedStepLength, currentVolume ); + //-------------- + }else{ + DoNextLinearStep( currentState, proposedStepLength ); + //-------------- + } + fLastStepNo= stepNo; + } + else{ + // This is neither a new track nor a new step -- just another + // client accessing information for the current track, step + // We will simply retrieve the results of the synchronous + // stepping for this Navigator Id below. +#ifdef G4VERBOSE + if( fVerboseLevel > 1 ){ + G4cout << " G4P::CS -> Not calling DoNextLinearStep: " + << " stepNo= " << stepNo << " last= " << fLastStepNo + << " new= " << fNewTrack << " Step already done" << G4endl; + } +#endif + } + + fNewTrack= false; + + // Prepare the information to return + pNewSafety = fNewSafety[ navigatorNo ]; + limitedStep = fLimitedStep[ navigatorNo ]; + EndState = fEndState; // set in DoNextLinearStep ( right ? ) + fRelocatedPoint= false; + + + if( fVerboseLevel > 0 ){ + G4cout << " G4PathFinder::ComputeStep returns " << fCurrentStepSize[ navigatorNo ] + << " for Navigator " << navigatorNo + << " Limited step = " << limitedStep + << " Safety(mm) = " << pNewSafety / mm + << G4endl; + } + + return fCurrentStepSize[ navigatorNo ]; +} + +// ---------------------------------------------------------------------- + +void +G4PathFinder::PrepareNewTrack( const G4ThreeVector position, + const G4ThreeVector direction ) +{ + // Key purposes: + // - Check and cache set of active navigators + // - Reset state for new track + G4int num=0; + + EnableParallelNavigation(true); + // Switch PropagatorInField to use MultiNavigator + + if( fVerboseLevel > 1 ) + G4cout << " G4PathFinder::PrepareNewTrack - entered " << G4endl; + // static G4TransportationManager* fpTransportManager= + // G4TransportationManager::GetTransportationManager(); + + fNewTrack= true; + this->MovePoint(); // Signal further that the last status is wiped + + // Message the G4NavigatorPanel / Dispatcher to find active navigators + // G4ThreeVector point(0.0, 0.0, 0.0); + std::vector::iterator pNavigatorIter; + + fNoActiveNavigators= fpTransportManager-> GetNoActiveNavigators(); + if( fNoActiveNavigators > fMaxNav ){ + G4cerr << "Too many active Navigators (worlds). G4PathFinder fails." << G4endl; + G4cout << " Fatal error: Transportation Manager has "<< fNoActiveNavigators + << " active navigators. " + << " This is more than the number allowed = " << fMaxNav << G4endl; + G4Exception("G4PathFinder::PrepareNewTrack()", "TooManyNavigators", + FatalException, "Too many active Navigators / worlds"); + } + + fpMultiNavigator->PrepareNavigators(); + //------------------------------------ + + pNavigatorIter= fpTransportManager-> GetActiveNavigatorsIterator(); + for( num=0; num< fNoActiveNavigators; ++pNavigatorIter,++num ) { + + // Keep information in carray ... for creating touchables - at least + fpNavigator[num] = *pNavigatorIter; + fLimitTruth[num] = false; + fLimitedStep[num] = kDoNot; + fCurrentStepSize[num] = 0.0; + fLocatedVolume[num] = 0; + } + + if( fVerboseLevel > 1 ) + G4cout << " Calling PathFinder::Locate() from G4PathFinder::PrepareNewTrack() " << G4endl; + + Locate( position, direction, false ); + // The first location for each Navigator must be non-relative + // or else call ResetStackAndState() for each Navigator + + fRelocatedPoint= false; + + if( fVerboseLevel > 0 ) { + G4cout << " G4PathFinder::PrepareNewTrack : exiting. " << G4endl; + } +} + +static +void ReportMove( G4ThreeVector OldVector, G4ThreeVector NewVector, G4String Quantity ) +{ + G4ThreeVector moveVec = ( NewVector - OldVector ); + + G4cerr << G4endl + << "**************************************************************" << G4endl; + G4cerr << "Endpoint has moved between value returned by ComputeStep" + << " and call to Locate. " << G4endl + << "Change of " << Quantity << " is " << moveVec.mag() / mm << " mm long, " + << " and its vector is " << (1.0/mm) * moveVec << " mm " << G4endl + << "Endpoint of ComputeStep was " << OldVector + << " and current position to locate is " << NewVector << G4endl; +} + +void +G4PathFinder::Locate( const G4ThreeVector& position, + const G4ThreeVector& direction, + G4bool relative) +{ + // Locate the point in each geometry + std::vector::iterator pNavIter= fpTransportManager->GetActiveNavigatorsIterator(); + G4int num=0; + + G4ThreeVector lastEndPosition= fEndState.GetPosition(); + G4ThreeVector moveVec = (position - lastEndPosition ); + G4double moveLenSq= moveVec.mag2(); + if( (!fNewTrack) && (!fRelocatedPoint) && ( moveLenSq> kCarTolerance*kCarTolerance ) ){ // ( moveLenSq> 0.0) ){ + ReportMove( position, lastEndPosition, "Position" ); + G4Exception( "G4PathFinder::Locate", "201-LocateUnexpectedPoint", + JustWarning, // FatalException, + "Location is not where last ComputeStep ended."); + } + fLastLocatedPosition= position; + + if( fVerboseLevel > 2 ){ + G4cout << G4endl; + G4cout << " G4PathFinder::Locate : entered " << G4endl; + G4cout << " -------------------- -------" << G4endl; + G4cout << " Locating at position " << position << " with direction " << direction + << " relative= " << relative << G4endl; + if ( (fVerboseLevel > 1) || ( moveLenSq > 0.0) ){ + G4cout << " lastEndPosition = " << lastEndPosition + << " moveVec = " << moveVec + << " newTr = " << fNewTrack + << " relocated = " << fRelocatedPoint << G4endl; + } + } + + if( fVerboseLevel > 2 ) { + G4cout << " Located at " << position ; + if( fNoActiveNavigators > 1 ) G4cout << G4endl; + } + + for ( num=0; num< fNoActiveNavigators ; ++pNavIter,++num ) { + // ... who limited the step .... + + // G4Navigator pNav= *pNavIter; + // if( fGeometryLimitedStep ) { + if( fLimitTruth[num] ) { (*pNavIter)->SetGeometricallyLimitedStep(); } + + G4VPhysicalVolume *pLocated= + (*pNavIter)->LocateGlobalPointAndSetup( position, &direction, + //*************************************// + relative, + false); + // Set the state related to the location + fLocatedVolume[num] = pLocated; + + // Clear state related to the step + fLimitedStep[num] = kDoNot; + fCurrentStepSize[num] = 0.0; + + if( fVerboseLevel > 2 ){ + G4cout << " - In world " << num + << " geomLimStp= " << fLimitTruth[num] + << " gives volume= " << pLocated ; + if( pLocated ){ + G4cout << " name = '" << pLocated->GetName() << "'"; + G4cout << " - CopyNo= " << pLocated->GetCopyNo(); + } + G4cout << G4endl; + } + } // ending for (num= .... + + if( fVerboseLevel > 2 ){ + G4cout << " G4PathFinder::Locate : exiting. " << G4endl << G4endl; + } + fRelocatedPoint= false; +} + +void +G4PathFinder::ReLocate( const G4ThreeVector& position ) + // const G4ThreeVector& direction, G4bool relative ) +{ + // Locate the point in each geometry + std::vector::iterator pNavIter= fpTransportManager->GetActiveNavigatorsIterator(); + const G4double cErrorTolerance=1e-12; + // Maximum relative error from roundoff of arithmetic + G4int num=0; + + // Check that this relocation does not violate safety + // - at endpoint (computed from start point) AND + // - at last safety location (likely just called) + + G4ThreeVector lastEndPosition= fEndState.GetPosition(); + // calculate end-point safety + G4double DistanceStartEnd= (lastEndPosition - fPreStepLocation).mag(); + G4double endPointSafety_raw = fMinSafety_PreStepPt + - DistanceStartEnd; + // - fTrueMinStep; // OK for linear only + G4double endPointSafety_Est1 = std::max( 0.0, endPointSafety_raw ); + + // and check move from endpoint against this endpoint safety + G4ThreeVector moveVecEndPos = (position - lastEndPosition ); + G4double moveLenEndPosSq = moveVecEndPos.mag2(); + + // Check that move from endpoint of last step is within safety + // -- or check against last location or relocation ?? + // G4ThreeVector moveVecStepStart = (position - fLastPrestepPosition ); + // G4double moveLenStartSq= moveVecStepStart.mag2(); + G4ThreeVector moveVecSafety= (position - fSafetyLocation ); + G4double moveLenSafSq= moveVecSafety.mag2(); + + // G4double distCheckStart_sq= ( moveLenStartSq - fMinSafety*fMinSafety ); + G4double distCheckEnd_sq= ( moveLenEndPosSq - endPointSafety_Est1 + *endPointSafety_Est1 ); + G4double distCheckSaf_sq= ( moveLenSafSq - fMinSafety_atSafLocation + *fMinSafety_atSafLocation ); + // G4bool longMoveStart = distCheckStart_sq > 0.0; + G4bool longMoveEnd = distCheckEnd_sq > 0.0; + G4bool longMoveSaf = distCheckSaf_sq > 0.0; + + G4double revisedSafety= 0.0; + if( (!fNewTrack) && ( longMoveEnd && longMoveSaf ) ){ + // Used to use ( longMoveEnd || longMoveSaf ) for extra checking + + // Recompute ComputeSafety for end position + revisedSafety= ComputeSafety(lastEndPosition); + + G4double distCheckRevisedEnd= + ( moveLenEndPosSq - revisedSafety * revisedSafety ); + G4bool longMoveRevisedEnd= ( distCheckRevisedEnd > 0. ) ; + + G4double moveMinusSafety= 0.0; + G4double moveLenEndPosition= std::sqrt( moveLenEndPosSq ); + moveMinusSafety = moveLenEndPosition - revisedSafety; + // moveMinusSafety = distCheckRevisedEnd / (moveLenEndPosition + revisedSafety); + + if( longMoveRevisedEnd && (moveMinusSafety > 0.0 ) && (revisedSafety > 0.0) ){ + // Take into account possibility of roundoff error causing + // this apparent move further than safety + + if( fVerboseLevel > 0 ) + G4cout << " G4PF:Relocate> Ratio to revised safety is " + << std::fabs(moveMinusSafety)/revisedSafety << G4endl; + // + G4double absMoveMinusSafety= std::fabs(moveMinusSafety); + G4bool smallRatio= absMoveMinusSafety < kRadTolerance * revisedSafety ; + G4double maxCoordPos = std::max( + std::max( std::fabs(position.x()), + std::fabs(position.y())), + std::fabs(position.z()) ); + G4bool smallValue= absMoveMinusSafety < cErrorTolerance * maxCoordPos; + if( ! (smallRatio || smallValue) ) { + G4cout << " G4PF:Relocate> Ratio to revised safety is " + << std::fabs(moveMinusSafety)/revisedSafety << G4endl; + G4cout << " Difference of move and safety is not very small." << G4endl; + }else{ + moveMinusSafety = 0.0; + longMoveRevisedEnd = false; // Numerical issue -- not too long! +#ifdef G4DEBUG_PATHFINDER + G4cout << " Difference of move and safety is very small in magnitude, " + << absMoveMinusSafety << G4endl; + if( smallRatio ) { + G4cout << " ratio to safety " << revisedSafety + << " is " << absMoveMinusSafety / revisedSafety + << "smaller than " << kRadTolerance << " of safety "; + }else{ + G4cout << " as fraction " << absMoveMinusSafety / maxCoordPos + << " of position vector max-coord " << maxCoordPos + << " smaller than " << cErrorTolerance ; + } + G4cout << " -- reset moveMinusSafety to " << moveMinusSafety << G4endl; +#endif + } + } + + if ( longMoveEnd && longMoveSaf && longMoveRevisedEnd && (moveMinusSafety>0.0)) { + // if( (moveMinusSafety>0.0) ){ // Eventually ? + G4int oldPrec= G4cout.precision(9); + G4cout << " Problem in G4PathFinder::Relocate() " << G4endl; + G4cout << " Moved from last endpoint by " << moveLenEndPosition + // << " Moved from last located by " << std::sqrt(moveLenStartSq) + << " compared to end safety (from preStep point) = " + << endPointSafety_Est1 << G4endl; + + G4cout << " --> last PreStep Location was " << fPreStepLocation << G4endl; + G4cout << " safety value = " << fMinSafety_PreStepPt << G4endl; + G4cout << " --> last EndStep Location was " << lastEndPosition << G4endl; + G4cout << " safety value = " << endPointSafety_Est1 + << " raw-value = " << endPointSafety_raw << G4endl; + G4cout << " --> Calling again at this endpoint, we get " + << revisedSafety << " as safety value." << G4endl; + G4cout << " --> last position for safety " << fSafetyLocation << G4endl; + G4cout << " its safety value = " << fMinSafety_atSafLocation << G4endl; + G4cout << " move from safety location = " << std::sqrt(moveLenSafSq) << G4endl; + // moveVecSafety.mag() *** (position-fSafetyLocation).mag() << G4endl; + G4cout << " safety - Move-from-end= " + << revisedSafety - moveLenEndPosition << " (negative is Bad.)" << G4endl; + + G4cout << " Debub: distCheckRevisedEnd = " << distCheckRevisedEnd << G4endl; + + ReportMove( lastEndPosition, position, "Position" ); + G4Exception( "G4PathFinder::ReLocate", "205-RelocatePointTooFar", + FatalException, + "ReLocation is further than end-safety value from step-end point (and the other-safety-value around the last-called safety 'check' point.)"); + G4cout.precision(oldPrec); + } + } + +#ifdef G4VERBOSE + if( fVerboseLevel > 2 ){ + G4cout << G4endl; + G4cout << " G4PathFinder::ReLocate : entered " << G4endl; + G4cout << " ---------------------- -------" << G4endl; + G4cout << " *Re*Locating at position " << position << G4endl; + // << " with direction " << direction + // << " relative= " << relative << G4endl; + if ( (fVerboseLevel > -1) || ( moveLenEndPosSq > 0.0) ){ + G4cout << " lastEndPosition = " << lastEndPosition + << " moveVec from step-end = " << moveVecEndPos + << " is new Track = " << fNewTrack + << " relocated = " << fRelocatedPoint << G4endl; + } + } +#endif + + for ( num=0; num< fNoActiveNavigators ; ++pNavIter,++num ) { + + // ... none limited the step + + (*pNavIter)->LocateGlobalPointWithinVolume( position ); + //*************************************// + + // Clear state related to the step + fLimitedStep[num] = kDoNot; + fCurrentStepSize[num] = 0.0; + fLimitTruth[num] = false; + // G4cout << " ReLocated in world " << num << " at " << position << G4endl; + } + + fLastLocatedPosition= position; + fRelocatedPoint= false; + + if( fVerboseLevel > 2 ){ + G4cout << " G4PathFinder::ReLocate : exiting " + << " at position " << fLastLocatedPosition << G4endl; + G4cout << G4endl; + } + +} + +// ----------------------------------------------------------------------------- + +G4double G4PathFinder::ComputeSafety( const G4ThreeVector& position ) + // Recompute safety for the relevant point +{ + G4double minSafety= DBL_MAX; + // G4cout << " G4PathFinder::ComputeSafety - called at " << position << G4endl; + + std::vector::iterator pNavigatorIter; + pNavigatorIter= fpTransportManager-> GetActiveNavigatorsIterator(); + + G4int num=0; + for( num=0; num< fNoActiveNavigators; ++pNavigatorIter,++num ) { + + G4double safety; + safety= (*pNavigatorIter)->ComputeSafety( position ); + + if( safety < minSafety ){ minSafety = safety; } + // fNewSafety[num]= safety; + + // G4cout << " Navigator # " << num << " gives safety = " << safety << G4endl; + } + + fSafetyLocation= position; + fMinSafety_atSafLocation = minSafety; + + if( fVerboseLevel > 1 ) { + G4cout << " G4PathFinder::ComputeSafety - returns " + << minSafety << " at location " << position + << G4endl; + } + return minSafety; +} + + +// ----------------------------------------------------------------------------- + +G4TouchableHandle +G4PathFinder::CreateTouchableHandle( G4int navId ) const + // Also? G4TouchableCreator& GetTouchableCreator( navId ) const; +{ + if( fVerboseLevel > 2 ){ + G4cout << "G4PathFinder::CreateTouchableHandle : navId = " << navId << " -- " << GetNavigator(navId) << G4endl; + } + + G4TouchableHistory* touchHist; + touchHist= GetNavigator(navId) -> CreateTouchableHistory(); + + // return G4TouchableHandle(touchHist); + //--------> Problem with out of world !! + + // G4TouchableHistory* touchHist= new G4TouchableHistory(); + + G4VPhysicalVolume* locatedVolume= fLocatedVolume[navId]; + if( locatedVolume == 0 ) + { + // Workaround to ensure that the touchable is fixed !! // TODO: fix + touchHist->UpdateYourself( locatedVolume, + touchHist->GetHistory() ); + } + + if( fVerboseLevel > 2 ) { + G4String VolumeName("None"); + if( locatedVolume ) { VolumeName= locatedVolume->GetName(); } + G4cout << " Touchable History created at address " << touchHist + << " volume = " << locatedVolume << " name= " << VolumeName + << G4endl; + } + + return G4TouchableHandle(touchHist); +} + +G4double +G4PathFinder::DoNextLinearStep( const G4FieldTrack &initialState, + G4double proposedStepLength + ) +{ + // --- + // G4Navigator* navigator; + G4double safety= 0.0, step=0.0; + G4double minSafety= DBL_MAX, minStep= DBL_MAX; + + if( fVerboseLevel > 2 ){ + G4cout << " G4PathFinder::DoNextLinearStep : entered " << G4endl; + G4cout << " Input field track= " << initialState << G4endl; + G4cout << " Requested step= " << proposedStepLength << G4endl; + } + + std::vector::iterator pNavigatorIter; + + pNavigatorIter= fpTransportManager-> GetActiveNavigatorsIterator(); + + G4ThreeVector initialPosition= initialState.GetPosition(); + G4ThreeVector initialDirection= initialState.GetMomentumDirection(); + + G4int num=0; + for( num=0; num< fNoActiveNavigators; ++pNavigatorIter,++num ) { + // navigator= this->GetNavigator(num); + safety= DBL_MAX; + + step= + (*pNavigatorIter)->ComputeStep( initialPosition, + initialDirection, + proposedStepLength, + safety ); + if( safety < minSafety ){ minSafety = safety; } + if( step < minStep ) { minStep= step; } + // Later can reduce the proposed step to the latest minStep value + + // if( step == kInfinity ) { step = proposedStepLength; } + fCurrentStepSize[num] = step; + fNewSafety[num]= safety; + + if( fVerboseLevel > 2 ){ + G4cout << "G4PathFinder::DoNextLinearStep : Navigator [" << num << "] -- step size " << step << G4endl; + } + } + + // Save safety value, related position + fPreStepLocation= initialPosition; + fMinSafety_PreStepPt= minSafety; + + // Also store in simple 'safety' status ? + // fMinSafety= minSafety; + // fMinSafety_atSafLocation = minSafety; + + fMinStep= minStep; + + if( fMinStep == kInfinity ){ + minStep = proposedStepLength; // Use this below for endpoint !! + } + fTrueMinStep = minStep; + + // Set the EndState + G4ThreeVector endPosition; + + fEndState= initialState; + endPosition= initialPosition + minStep * initialDirection ; + + if( fVerboseLevel > 1 ){ + G4cout << "G4PathFinder::DoNextLinearStep : " + << " initialPosition = " << initialPosition + << " and endPosition = " << endPosition<< G4endl; + } + + fEndState.SetPosition( endPosition ); + fEndState.SetProperTimeOfFlight( -1.000 ); // Not defined YET + // fEndState.SetMomentum( initialState.GetMomentum ); + this->WhichLimited(); + + if( fVerboseLevel > 2 ){ + G4cout << " G4PathFinder::DoNextLinearStep : exits returning " << minStep << G4endl; + G4cout << " Endpoint values = " << fEndState << G4endl; + G4cout << G4endl; + } + + return minStep; +} + +void +G4PathFinder::WhichLimited() // Flag which processes limited the step +{ + G4int num=-1, last=-1; + const G4int IdTransport= 0; // Id of Mass Navigator !! + G4int noLimited=0; + ELimited shared= kSharedOther; + + if( fVerboseLevel > 4 ) + G4cout << " G4PathFinder::WhichLimited - entered " << G4endl; + + // Assume that [IdTransport] is Mass / Transport + G4bool transportLimited = (fCurrentStepSize[IdTransport] == fMinStep) + && ( fMinStep!= kInfinity) ; + if( transportLimited ){ + shared= kSharedTransport; + } + + for ( num= 0; num < fNoActiveNavigators; num++ ) { + G4bool limitedStep; + + G4double step= fCurrentStepSize[num]; + + // limitedStep = ( step == fMinStep ); + limitedStep = ( step == fMinStep ) && ( step != kInfinity); + // if( step == kInfinity ) { fCurrentStepSize[num] = proposedStepLength; } + + fLimitTruth[ num ] = limitedStep; + if( limitedStep ) { + noLimited++; + fLimitedStep[num] = shared; + last= num; + }else{ + fLimitedStep[num] = kDoNot; + } + } + if( (last > -1) && (noLimited == 1 ) ){ + fLimitedStep[ last ] = kUnique; + } + +#ifdef G4VERBOSE + if( fVerboseLevel > 1 ){ + this->PrintLimited(); // --> for tracing + if( fVerboseLevel > 4 ) + G4cout << " G4PathFinder::WhichLimited - exiting. " << G4endl; + } +#endif + +} + +void +G4PathFinder::PrintLimited() +{ + G4String& LimitedString( ELimited lim ); + + // Report results -- for checking + G4cout << "G4PathFinder::PrintLimited reports: " ; + G4cout << " Minimum step (true)= " << fTrueMinStep + << " reported min = " << fMinStep + << G4endl; + if( (fCurrentStepNo <= 2) || (fVerboseLevel>=2) ) { + G4cout << std::setw(5) << " Step#" << " " + << std::setw(5) << " NavId" << " " + << std::setw(12) << " step-size " << " " + << std::setw(12) << " raw-size " << " " + << std::setw(12) << " pre-safety " << " " + << std::setw(15) << " Limited / flag" << " " + << std::setw(15) << " World " << " " + << G4endl; + } + int num; + for ( num= 0; num < fNoActiveNavigators; num++ ) { + G4double rawStep = fCurrentStepSize[num]; + G4double stepLen = fCurrentStepSize[num]; + if( stepLen > fTrueMinStep ) { + stepLen = fTrueMinStep; // did not limit (went as far as asked) + } + G4int oldPrec= G4cout.precision(9); + // const char *BooleanValue[2] = { " NO", "YES" } ; + G4cout << std::setw(5) << fCurrentStepNo << " " + << std::setw(5) << num << " " + << std::setw(12) << stepLen << " " + << std::setw(12) << rawStep << " " + << std::setw(12) << fNewSafety[num] << " " + << std::setw(5) << (fLimitTruth[num] ? "YES" : " NO") << " "; + G4String limitedStr= LimitedString(fLimitedStep[num]); + G4cout << " " << std::setw(15) << limitedStr << " "; + G4cout.precision(oldPrec); + + G4Navigator *pNav= GetNavigator( num ); + G4String WorldName( "Not-Set" ); + if (pNav) { + G4VPhysicalVolume *pWorld= pNav->GetWorldVolume(); + if( pWorld ) { + WorldName = pWorld->GetName(); + } + } + G4cout << " " << WorldName ; + G4cout << G4endl; + } + + if( fVerboseLevel > 4 ) + G4cout << " G4PathFinder::PrintLimited - exiting. " << G4endl; +} + + +G4double +G4PathFinder::DoNextCurvedStep( const G4FieldTrack &initialState, + G4double proposedStepLength, + G4VPhysicalVolume* pCurrentPhysicalVolume ) +{ + const G4double toleratedRelativeError= 1.0e-10; + if( fVerboseLevel > 2 ) + G4cout << " G4PathFinder::DoNextCurvedStep ****** " << G4endl; + G4double minStep= DBL_MAX, newSafety=0.0; + G4int numNav; + G4FieldTrack fieldTrack= initialState; + + if( fVerboseLevel > 2 ) + G4cout << " Initial value of field track is " << fieldTrack + << " and proposed step= " << proposedStepLength << G4endl; + + // Allow Propagator In Field to do the hard work, calling G4MultiNavigator + minStep= fpFieldPropagator->ComputeStep( fieldTrack, + proposedStepLength, + newSafety, + pCurrentPhysicalVolume ); + // fieldTrack now contains the endpoint information + fEndState= fieldTrack; + fMinStep= minStep; + fTrueMinStep = std::min( minStep, proposedStepLength ); + + if( fVerboseLevel > 2 ) + G4cout << "G4PathFinder::DoNextCurvedStep : " << G4endl + << " initialState = " << initialState << G4endl + << " and endState = " << fEndState << G4endl; + + G4double currentStepSize = 0; + G4cout << "G4PathFinder::DoNextCurvedStep : " + << " minStep = " << minStep + << " proposedStepLength " << proposedStepLength + << " safety = " << newSafety << G4endl; + if( minStep < proposedStepLength ) { // if == , then a boundary found at end ?? + + // Recover the remaining information from MultiNavigator + // especially regarding which Navigator limited the step + for( numNav=0; numNav < fNoActiveNavigators; ++numNav ) { + G4double finalStep, lastPreSafety=0.0, minStepLast; + ELimited didLimit; + + finalStep= fpMultiNavigator->ObtainFinalStep( numNav, lastPreSafety, + minStepLast, didLimit ); + currentStepSize = fTrueMinStep; + G4double diffStep= 0.0; + if( (minStepLast != kInfinity) ){ + diffStep = (finalStep-minStepLast); + if ( std::abs(diffStep) <= toleratedRelativeError * finalStep ) + { diffStep = 0.0; } + currentStepSize += diffStep; + } + fCurrentStepSize[numNav] = currentStepSize; + + // if( (currentStepSize < 0) || (diffStep < 0) ) { } + + // fNewSafety[numNav]= preSafety; + fNewSafety[numNav]= 0.0; + // TODO: improve this safety !! + // Currently would need to call ComputeSafety at start or endpoint + // endSafety= fpNavigator[numNav]->ComputeSafety( endPoint ); + // ... + // else + // - for pre step safety + // notify MultiNavigator about new set of sub-steps + // allow it to return this value in ObtainFinalStep + // instead of lastPreSafety (or as well?) + // - for final step start (available) + // get final Step start from MultiNavigator + fLimitedStep[numNav] = didLimit; + fLimitTruth[numNav] = (didLimit != kDoNot ); + + G4bool StepError= (currentStepSize < 0) + || ( (minStepLast != kInfinity) && (diffStep < 0) ) ; + if( StepError || (fVerboseLevel > 2) ){ + + G4String& LimitedString( ELimited lim ); + G4String limitedString= LimitedString( fLimitedStep[numNav] ); + + G4cout << " G4PathFinder::ComputeStep. Geometry " << numNav << " step= " << fCurrentStepSize[numNav] + << " from final-step= " << finalStep + << " fTrueMinStep= " << fTrueMinStep + << " minStepLast= " << minStepLast + << " limited = " << (fLimitTruth[numNav] ? "YES" : " NO") << " "; + G4cout << " status = " << limitedString << " #= " << didLimit << G4endl; + + if( StepError ) { + G4cerr << " currentStepSize = " << currentStepSize + << " diffStep= " << diffStep << G4endl; + G4cerr << "ERROR in computing step size for this navigator." << G4endl; + G4Exception( "G4PathFinder::DoNextCurvedStep", "207-StepGoingBackwards", + FatalException, + "Incorrect calculation of step size for one navigator" ); + } + } + + } // for num Navigators + + } + // else if ( minStep > proposedStepLength ) { // ie minStep == kInfinity + else if ( (minStep == proposedStepLength) + || (minStep == kInfinity) + || ( std::abs(minStep-proposedStepLength) < toleratedRelativeError * proposedStepLength ) + ) { + // In case the step was not limited, use default responses + // --> all Navigators + // Also avoid problems in case of PathFinder using safety to optimise + // - it is possible that the Navigators were not called + // if the safety was already satisfactory. + // (In that case calling ObtainFinalStep gives invalid results.) + currentStepSize= minStep; + for( numNav=0; numNav < fNoActiveNavigators; ++numNav ) { + fCurrentStepSize[numNav] = minStep; + fNewSafety[numNav]= 0.0; + // Improve it -- see TODO above + fLimitedStep[numNav] = kDoNot; + fLimitTruth[numNav] = false; + } + } + else{ // (minStep > proposedStepLength) and not (minStep == kInfinity) + G4cerr << G4endl; + G4cerr << "ERROR in G4PathFinder::DoNextCurvedStep " + << " currentStepSize = " << minStep << " is larger than " + << " proposed StepSize = " << proposedStepLength + << G4endl; + G4Exception( "G4PathFinder::DoNextCurvedStep", "208-StepLongerThanRequested", + FatalException, + "Incorrect calculation of step size for one navigator" ); + } + + if( fVerboseLevel > 2 ){ + G4cout << " Exiting G4PathFinder::DoNextCurvedStep " << G4endl; + PrintLimited(); + } + + return minStep; +} + +static G4String StrDoNot("DoNot"), StrUnique("Unique"), + StrUndefined("Undefined"), StrSharedTransport("SharedTransport"), + StrSharedOther("SharedOther"); + +G4String& LimitedString( ELimited lim ) +{ + G4String* limitedStr; + switch ( lim ) { + case kDoNot: limitedStr= &StrDoNot; break; + case kUnique: limitedStr = &StrUnique; break; + case kSharedTransport: limitedStr= &StrSharedTransport; break; + case kSharedOther: limitedStr = &StrSharedOther; break; + default: limitedStr = &StrUndefined; break; + } + + return *limitedStr; +} + + +#if 0 +// Potential extension ..... ?? + // Return relevant step + // When no field exists or the particle has no charge or EM moment + +G4double +G4PathFinder::ComputeLinearStep(const G4ThreeVector &pGlobalPoint, + const G4ThreeVector &pDirection, + G4double pCurrentProposedStepLength, + G4double &pNewSafety, + G4bool &limitedStep, + G4int stepNo, // See next step / check + G4int navId ) +{ + G4cout << pGlobalPoint << pDirection << pCurrentProposedStepLength + << pNewSafety << limitedStep << stepNo << navId << G4endl; + + G4cout << " G4PathFinder::ComputeLinearStep" << G4endl; + G4Exception( " G4PathFinder::ComputeLinearStep is Null", "203-No Method", + FatalException, "G4PathFinder::ComputeLinearStep is Null" ); + return 0.500 * pCurrentProposedStepLength; +} +#endif diff --git a/source/geometry/navigation/src/G4PropagatorInField.cc b/source/geometry/navigation/src/G4PropagatorInField.cc index 6bd815f167..68413d361a 100644 --- a/source/geometry/navigation/src/G4PropagatorInField.cc +++ b/source/geometry/navigation/src/G4PropagatorInField.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4PropagatorInField.cc,v 1.23 2006/06/29 18:37:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4PropagatorInField.cc,v 1.29 2006/11/17 16:53:45 japost Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // This class implements an algorithm to track a particle in a @@ -80,12 +80,15 @@ G4PropagatorInField::G4PropagatorInField( G4Navigator *theNavigator, fPreviousSftOrigin= G4ThreeVector(0.,0.,0.); fPreviousSafety= 0.0; + } G4PropagatorInField::~G4PropagatorInField() { } + + /////////////////////////////////////////////////////////////////////////// // // Compute the next geometric Step @@ -248,8 +251,8 @@ G4PropagatorInField::ComputeStep( // Intersect chord AB with geometry intersects= IntersectChord( SubStartPoint, EndPointB, - NewSafety, LinearStepLength, - InterSectionPointE ); + NewSafety, LinearStepLength, + InterSectionPointE ); // E <- Intersection Point of chord AB and either volume A's surface // or a daughter volume's surface .. @@ -267,17 +270,18 @@ G4PropagatorInField::ComputeStep( G4bool found_intersection = LocateIntersectionPoint( SubStepStartState, CurrentState, InterSectionPointE, IntersectPointVelct_G, - recalculatedEndPt); + recalculatedEndPt); + //G4cout<<"In Locate"< 1) && (do_loop_count > fMax_loop_count-10 )) { if( do_loop_count == fMax_loop_count-9 ){ - G4cout << "G4PropagatorInField::ComputeStep " - << " Difficult track - taking many sub steps." << G4endl; + G4cout << "G4PropagatorInField::ComputeStep " + << " Difficult track - taking many sub steps." << G4endl; } printStatus( SubStepStartState, CurrentState, CurrentProposedStepLength, - NewSafety, do_loop_count, pPhysVol ); + NewSafety, do_loop_count, pPhysVol ); } #endif @@ -360,22 +364,10 @@ G4PropagatorInField::ComputeStep( << OriginalState.GetCurveLength() + TruePathLength - End_PointAndTangent.GetCurveLength() << G4endl; G4cerr << " Original state= " << OriginalState << G4endl - << " Proposed state= " << End_PointAndTangent << G4endl; + << " Proposed state= " << End_PointAndTangent << G4endl; G4Exception("G4PropagatorInField::ComputeStep()", "IncorrectProposedEndPoint", - FatalException, - "Curve length mis-match between original state and proposed endpoint of propagation."); - } -#endif - -#ifdef G4DEBUG_FIELD - // static G4std::vector ZeroStepNumberHist(fAbandonThreshold+1); - if( fNoZeroStep ){ - // ZeroStepNumberHist[fNoZeroStep]++; - if( fNoZeroStep > fActionThreshold_NoZeroSteps ){ - G4cout << " PiF: Step returning=" << StepTaken << G4endl; - G4cout << " ------------------------------------------------------- " - << G4endl; - } + FatalException, + "Curve length mis-match between original state and proposed endpoint of propagation."); } #endif @@ -393,19 +385,11 @@ G4PropagatorInField::ComputeStep( G4cout << " WARNING - G4PropagatorInField::ComputeStep():" << G4endl << " Zero progress for " << fNoZeroStep << " attempted steps." << G4endl; -#ifdef G4VERBOSE if ( fVerboseLevel > 2 ) G4cout << " Particle that is stuck will be killed." << G4endl; -#endif fNoZeroStep = 0; } - -#ifdef G4VERBOSE - if ( fVerboseLevel > 3 ){ - G4cout << "G4PropagatorInField returns " << TruePathLength << G4endl; - } -#endif - + // G4cout << "G4PropagatorInField returns " << TruePathLength << G4endl; return TruePathLength; } @@ -446,181 +430,273 @@ G4PropagatorInField::LocateIntersectionPoint( const G4FieldTrack& CurveStartPointVelocity, // A const G4FieldTrack& CurveEndPointVelocity, // B const G4ThreeVector& TrialPoint, // E - G4FieldTrack& IntersectedOrRecalculatedFT, // Out: point found - G4bool& recalculatedEndPoint) // Out: + G4FieldTrack& IntersectedOrRecalculatedFT, // Out: point found + G4bool& recalculatedEndPoint) // Out: { // Find Intersection Point ( A, B, E ) of true path AB - start at E. G4bool found_approximate_intersection = false; G4bool there_is_no_intersection = false; - + G4FieldTrack CurrentA_PointVelocity = CurveStartPointVelocity; G4FieldTrack CurrentB_PointVelocity = CurveEndPointVelocity; G4ThreeVector CurrentE_Point = TrialPoint; - G4FieldTrack ApproxIntersecPointV(CurveEndPointVelocity); // FT-Def-Construct - G4double NewSafety= -0.0; - G4bool final_section= true; // Shows whether current section is last (ie B=full end) + G4double NewSafety= -0.0; + G4bool final_section= true; // Shows whether current section is last + // (i.e. B=full end) + G4bool first_section=true; recalculatedEndPoint= false; G4bool restoredFullEndpoint= false; - G4int substep_no = 0; - + G4int substep_no = 0; + // Limits for substep number + // const G4int max_substeps= 10000; // Test 120 (old value 100 ) const G4int warn_substeps= 1000; // 100 - // Statistics for substeps + + // Statistics for substeps + // static G4int max_no_seen= -1; - static G4int trigger_substepno_print= warn_substeps - 20 ; + static G4int trigger_substepno_print= warn_substeps - 20 ; - do{ // REPEAT + //-------------------------------------------------------------------------- + // Algoritm for the case if progress in founding intersection is too slow. + // Process is defined too slow if after N=param_substeps advances on the + // path, it will be only 'fraction_done' of the total length. + // In this case the remaining length is divided in two half and + // the loop is restarted for each half. + // If progress is still too slow, the division in two halfs continue + // until 'max_depth'. + //-------------------------------------------------------------------------- - G4ThreeVector Point_A = CurrentA_PointVelocity.GetPosition(); - G4ThreeVector Point_B = CurrentB_PointVelocity.GetPosition(); + const G4int param_substeps=10; // Test value for the maximum number + // of substeps + const G4double fraction_done=0.3; - // F = a point on true AB path close to point E (the closest if possible) - // - ApproxIntersecPointV = - GetChordFinder()->ApproxCurvePointV( CurrentA_PointVelocity, - CurrentB_PointVelocity, - CurrentE_Point, - fEpsilonStep ); - // The above method is the key & most intuitive part ... + G4bool Second_half=false; // First half or second half of divided step + + // We need to know this for the 'final_section': + // real 'final_section' or first half 'final_section' + // In algorithm it is considered that the 'Second_half' is true + // and it becomes false only if we are in the first-half of level + // depthness or if we are in the first section + + G4int depth=0; // Depth counts how many subdivisions of initial step made + + const G4int max_depth=4; // Max allowed depth, test parameter + + // Intermediates Points on the Track = Subdivided Points must be stored. + // Use array of Pointers [max_depth+1] to do this + // Array of pointers to the Intermediate G4FieldTrack + + G4FieldTrack* ptrInterMedFT[max_depth+1]; + G4ThreeVector zeroV(0.0,0.0,0.0); + for (G4int idepth=0; idepthApproxCurvePointV( CurrentA_PointVelocity, + CurrentB_PointVelocity, + CurrentE_Point, + fEpsilonStep ); + // The above method is the key & most intuitive part ... #ifdef G4DEBUG_FIELD - if( ApproxIntersecPointV.GetCurveLength() > - CurrentB_PointVelocity.GetCurveLength() * (1.0 + kAngTolerance) ) { - G4cerr << "Error - Intermediate F point is more advanced than endpoint B." - << G4endl; - G4Exception("G4PropagatorInField::LocateIntersectionPoint()", - "IntermediatePointConfusion", - FatalException, "Intermediate F point is past end B point" ); - } +`` if( ApproxIntersecPointV.GetCurveLength() > + CurrentB_PointVelocity.GetCurveLength() * (1.0 + kAngTolerance) ) + { + G4cerr << "Error - Intermediate F point is more advanced than endpoint B." + << G4endl; + G4Exception("G4PropagatorInField::LocateIntersectionPoint()", + "IntermediatePointConfusion", FatalException, + "Intermediate F point is past end B point" ); + } #endif - G4ThreeVector CurrentF_Point= ApproxIntersecPointV.GetPosition(); + G4ThreeVector CurrentF_Point= ApproxIntersecPointV.GetPosition(); - // First check whether EF is small - then F is a good approx. point - // Calculate the length and direction of the chord AF - // - G4ThreeVector ChordEF_Vector = CurrentF_Point - CurrentE_Point; - - if ( ChordEF_Vector.mag2() <= sqr(GetDeltaIntersection()) ) - { - found_approximate_intersection = true; - - // Create the "point" return value + // First check whether EF is small - then F is a good approx. point + // Calculate the length and direction of the chord AF // - IntersectedOrRecalculatedFT = ApproxIntersecPointV; - IntersectedOrRecalculatedFT.SetPosition( CurrentE_Point ); + G4ThreeVector ChordEF_Vector = CurrentF_Point - CurrentE_Point; - // Note: in order to return a point on the boundary, - // we must return E. But it is F on the curve. - // So we must "cheat": we are using the position at point E - // and the velocity at point F !!! - // - // This must limit the length we can allow for displacement! - - } - else // E is NOT close enough to the curve (ie point F) - { - // Check whether any volumes are encountered by the chord AF - // --------------------------------------------------------- - // First relocate to restore any Voxel etc information in the Navigator - // before calling ComputeStep - fNavigator->LocateGlobalPointWithinVolume( Point_A ); - - G4ThreeVector PointG; // Candidate intersection point - G4double stepLengthAF; - G4bool Intersects_AF = IntersectChord( Point_A, CurrentF_Point, - NewSafety, stepLengthAF, - PointG - ); - if( Intersects_AF ) + if ( ChordEF_Vector.mag2() <= sqr(GetDeltaIntersection()) ) { - // G is our new Candidate for the intersection point. - // It replaces "E" and we will repeat the test to see if - // it is a good enough approximate point for us. - // B <- F - // E <- G - CurrentB_PointVelocity = ApproxIntersecPointV; - CurrentE_Point = PointG; + found_approximate_intersection = true; - // By moving point B, must take care if current AF has no intersection - // to try current FB!! - final_section= false; + // Create the "point" return value + // + IntersectedOrRecalculatedFT = ApproxIntersecPointV; + IntersectedOrRecalculatedFT.SetPosition( CurrentE_Point ); + + // Note: in order to return a point on the boundary, + // we must return E. But it is F on the curve. + // So we must "cheat": we are using the position at point E + // and the velocity at point F !!! + // + // This must limit the length we can allow for displacement! + } + else // E is NOT close enough to the curve (ie point F) + { + // Check whether any volumes are encountered by the chord AF + // --------------------------------------------------------- + // First relocate to restore any Voxel etc information + // in the Navigator before calling ComputeStep() + // + fNavigator->LocateGlobalPointWithinVolume( Point_A ); + + G4ThreeVector PointG; // Candidate intersection point + G4double stepLengthAF; + G4bool Intersects_AF = IntersectChord( Point_A, CurrentF_Point, + NewSafety, stepLengthAF, + PointG ); + if( Intersects_AF ) + { + // G is our new Candidate for the intersection point. + // It replaces "E" and we will repeat the test to see if + // it is a good enough approximate point for us. + // B <- F + // E <- G + + CurrentB_PointVelocity = ApproxIntersecPointV; + CurrentE_Point = PointG; + + // By moving point B, must take care if current + // AF has no intersection to try current FB!! + // + final_section= false; #ifdef G4VERBOSE - if( fVerboseLevel > 3 ){ - G4cout << "G4PiF::LI> Investigating intermediate point" - << " at s=" << ApproxIntersecPointV.GetCurveLength() - << " on way to full s=" << CurveEndPointVelocity.GetCurveLength() - << G4endl; - } + if( fVerboseLevel > 3 ) + { + G4cout << "G4PiF::LI> Investigating intermediate point" + << " at s=" << ApproxIntersecPointV.GetCurveLength() + << " on way to full s=" + << CurveEndPointVelocity.GetCurveLength() << G4endl; + } #endif - } - else // not Intersects_AF - { - // In this case: - // There is NO intersection of AF with a volume boundary. - // We must continue the search in the segment FB! - fNavigator->LocateGlobalPointWithinVolume( CurrentF_Point ); + } + else // not Intersects_AF + { + // In this case: + // There is NO intersection of AF with a volume boundary. + // We must continue the search in the segment FB! + // + fNavigator->LocateGlobalPointWithinVolume( CurrentF_Point ); - G4double stepLengthFB; - G4ThreeVector PointH; - // Check whether any volumes are encountered by the chord FB - // --------------------------------------------------------- - G4bool Intersects_FB = - IntersectChord( CurrentF_Point, Point_B, - NewSafety, stepLengthFB, PointH ); - if( Intersects_FB ) - { - // There is an intersection of FB with a volume boundary - // H <- First Intersection of Chord FB + G4double stepLengthFB; + G4ThreeVector PointH; - // H is our new Candidate for the intersection point. - // It replaces "E" and we will repeat the test to see if - // it is a good enough approximate point for us. + // Check whether any volumes are encountered by the chord FB + // --------------------------------------------------------- - // Note that F must be in volume volA (the same as A) - // (otherwise AF would meet a volume boundary!) - // A <- F - // E <- H - CurrentA_PointVelocity = ApproxIntersecPointV; - CurrentE_Point = PointH; - } - else // not Intersects_FB - { - // There is NO intersection of FB with a volume boundary - if( final_section ){ - // If B is the original endpoint, this means that whatever volume(s) - // intersected the original chord, none touch the smaller chords - // we have used. - // The value of IntersectedOrRecalculatedFT returned is likely not valid - // - there_is_no_intersection = true; - }else{ - // We must restore the original endpoint - CurrentA_PointVelocity= CurrentB_PointVelocity; // We have got to B - CurrentB_PointVelocity= CurveEndPointVelocity; - restoredFullEndpoint = true; - } + G4bool Intersects_FB = IntersectChord( CurrentF_Point, Point_B, + NewSafety, stepLengthFB, + PointH ); + if( Intersects_FB ) + { + // There is an intersection of FB with a volume boundary + // H <- First Intersection of Chord FB - } // Endif (Intersects_FB) - } // Endif (Intersects_AF) + // H is our new Candidate for the intersection point. + // It replaces "E" and we will repeat the test to see if + // it is a good enough approximate point for us. - // Ensure that the new endpoints are not further apart in space - // than on the curve due to different errors in the integration - // - G4double linDistSq, curveDist; - linDistSq = ( CurrentB_PointVelocity.GetPosition() - - CurrentA_PointVelocity.GetPosition() ).mag2(); - curveDist = CurrentB_PointVelocity.GetCurveLength() - - CurrentA_PointVelocity.GetCurveLength(); - if( curveDist*(curveDist+2*perMillion ) < linDistSq ) - { + // Note that F must be in volume volA (the same as A) + // (otherwise AF would meet a volume boundary!) + // A <- F + // E <- H + + CurrentA_PointVelocity = ApproxIntersecPointV; + CurrentE_Point = PointH; + } + else // not Intersects_FB + { + // There is NO intersection of FB with a volume boundary + + if( final_section ) + { + // If B is the original endpoint, this means that whatever + // volume(s) intersected the original chord, none touch the + // smaller chords we have used. + // The value of 'IntersectedOrRecalculatedFT' returned is + // likely not valid + + // Check on real final_section or SubEndSection + // + if( ((Second_half)&&(depth==0)) || (first_section) ) + { + there_is_no_intersection = true; // real final_section + } + else + { + // end of subsection, not real final section + // exit from the and go to the depth-1 level + + substep_no_p = param_substeps+2; // exit from the loop + + // but 'Second_half' is still true because we need to find + // the 'CurrentE_point' for the next loop + // + Second_half = true; + sub_final_section = true; + + } + } + else + { + // We must restore the original endpoint + + CurrentA_PointVelocity = CurrentB_PointVelocity; // Got to B + CurrentB_PointVelocity = CurveEndPointVelocity; + restoredFullEndpoint = true; + } + } // Endif (Intersects_FB) + } // Endif (Intersects_AF) + + // Ensure that the new endpoints are not further apart in space + // than on the curve due to different errors in the integration + // + G4double linDistSq, curveDist; + linDistSq = ( CurrentB_PointVelocity.GetPosition() + - CurrentA_PointVelocity.GetPosition() ).mag2(); + curveDist = CurrentB_PointVelocity.GetCurveLength() + - CurrentA_PointVelocity.GetCurveLength(); + if( curveDist*(curveDist+2*perMillion ) < linDistSq ) + { // Re-integrate to obtain a new B // G4FieldTrack newEndPointFT= @@ -628,141 +704,251 @@ G4PropagatorInField::LocateIntersectionPoint( CurrentB_PointVelocity, linDistSq, // to avoid recalculation curveDist ); - G4FieldTrack oldPointVelB = CurrentB_PointVelocity; - CurrentB_PointVelocity = newEndPointFT; + G4FieldTrack oldPointVelB = CurrentB_PointVelocity; + CurrentB_PointVelocity = newEndPointFT; - if( final_section ){ - recalculatedEndPoint= true; - IntersectedOrRecalculatedFT= newEndPointFT; // So that we can return it, - // if it is the endpoint! - } - } - if( curveDist < 0.0 ) - { - G4cerr << "G4PropagatorInField::LocateIntersectionPoint():" << G4endl - << "Error in advancing propagation." << G4endl; - fVerboseLevel= 5; // Print out a maximum of information - printStatus( CurrentA_PointVelocity, CurrentB_PointVelocity, - -1.0, NewSafety, substep_no, 0); - G4cerr << " Point A (start) is " << CurrentA_PointVelocity << G4endl; - G4cerr << " Point B (end) is " << CurrentB_PointVelocity << G4endl; - G4cerr << " curveDist is " << curveDist << G4endl; - G4cerr << G4endl - << "The final curve point is not further along" - << " than the original!" << G4endl; - G4Exception("G4PropagatorInField::LocateIntersectionPoint()", "FatalError", - FatalException, "Error in advancing propagation."); - } + if( (final_section)&&(Second_half)&&(depth==0) ) // real final section + { + recalculatedEndPoint = true; + IntersectedOrRecalculatedFT = newEndPointFT; + // So that we can return it, if it is the endpoint! + } + } + if( curveDist < 0.0 ) + { + G4cerr << "G4PropagatorInField::LocateIntersectionPoint():" << G4endl + << "Error in advancing propagation." << G4endl; + fVerboseLevel = 5; // Print out a maximum of information + printStatus( CurrentA_PointVelocity, CurrentB_PointVelocity, + -1.0, NewSafety, substep_no, 0 ); + G4cerr << " Point A (start) is " << CurrentA_PointVelocity << G4endl; + G4cerr << " Point B (end) is " << CurrentB_PointVelocity << G4endl; + G4cerr << " curveDist is " << curveDist << G4endl; + G4cerr << G4endl + << "The final curve point is not further along" + << " than the original!" << G4endl; + G4Exception("G4PropagatorInField::LocateIntersectionPoint()", + "FatalError", FatalException, + "Error in advancing propagation."); + } - if(restoredFullEndpoint) { - final_section= restoredFullEndpoint; - restoredFullEndpoint=false; - } - - } // EndIf ( E is close enough to the curve, ie point F. ) - // tests ChordAF_Vector.mag() <= maximum_lateral_displacement + if(restoredFullEndpoint) + { + final_section = restoredFullEndpoint; + restoredFullEndpoint = false; + } + } // EndIf ( E is close enough to the curve, ie point F. ) + // tests ChordAF_Vector.mag() <= maximum_lateral_displacement #ifdef G4DEBUG_LOCATE_INTERSECTION -// #ifdef G4VERBOSE - if( substep_no >= trigger_substepno_print ) { - G4cout << "Difficulty in converging in G4PropagatorInField::LocateIntersectionPoint:" - << " Substep no = " << substep_no << G4endl; - if( substep_no == trigger_substepno_print ){ - printStatus( CurveStartPointVelocity, CurveEndPointVelocity, - -1.0, NewSafety, 0, 0); - } - G4cout << " State of point A: "; - printStatus( CurrentA_PointVelocity, CurrentA_PointVelocity, - -1.0, NewSafety, substep_no-1, 0); - G4cout << " State of point B: "; - printStatus( CurrentA_PointVelocity, CurrentB_PointVelocity, - -1.0, NewSafety, substep_no, 0); - } + if( substep_no >= trigger_substepno_print ) + { + G4cout << "Difficulty in converging in " + << "G4PropagatorInField::LocateIntersectionPoint():" + << G4endl + << " Substep no = " << substep_no << G4endl; + if( substep_no == trigger_substepno_print ) + { + printStatus( CurveStartPointVelocity, CurveEndPointVelocity, + -1.0, NewSafety, 0, 0); + } + G4cout << " State of point A: "; + printStatus( CurrentA_PointVelocity, CurrentA_PointVelocity, + -1.0, NewSafety, substep_no-1, 0); + G4cout << " State of point B: "; + printStatus( CurrentA_PointVelocity, CurrentB_PointVelocity, + -1.0, NewSafety, substep_no, 0); + } #endif - substep_no++; + substep_no++; + substep_no_p++; - } while ( ( ! found_approximate_intersection ) - && ( ! there_is_no_intersection ) - && ( substep_no <= max_substeps) ); // UNTIL found or failed + } while ( ( ! found_approximate_intersection ) + && ( ! there_is_no_intersection ) + && ( substep_no_p <= param_substeps) ); // UNTIL found or + // failed param substep + first_section = false; - if( substep_no > max_no_seen ) { + if( (!found_approximate_intersection) && (!there_is_no_intersection) ) + { + G4double did_len = std::abs( CurrentA_PointVelocity.GetCurveLength() + - SubStart_PointVelocity.GetCurveLength()); + G4double all_len = std::abs( CurrentB_PointVelocity.GetCurveLength() + - SubStart_PointVelocity.GetCurveLength()); + + G4double stepLengthAB; + G4ThreeVector PointGe; + + // Check if progress is too slow and if it possible to go deeper, + // then halve the step if so + // + if( ( ( did_len )GetIntegrationDriver(); + integrDriver->AccurateAdvance(start, Sub_len, fEpsilonStep); + *ptrInterMedFT[depth] = start; + CurrentB_PointVelocity = *ptrInterMedFT[depth]; + + // Adjust 'SubStartPoint' to calculate the 'did_length' in next loop + // + SubStart_PointVelocity = CurrentA_PointVelocity; + + // Find new trial intersection point needed at start of the loop + // + G4ThreeVector Point_A = CurrentA_PointVelocity.GetPosition(); + G4ThreeVector SubE_point = CurrentB_PointVelocity.GetPosition(); + + fNavigator->LocateGlobalPointWithinVolume(Point_A); + G4bool Intersects_AB = IntersectChord(Point_A, SubE_point, + NewSafety, stepLengthAB, PointGe); + if(Intersects_AB) + { + CurrentE_Point = PointGe; + } + else + { + // No intersection found for first part of curve + // (CurrentA,InterMedPoint[depth]). Go to the second part + // + Second_half = true; + } + } // if did_len + + if( (Second_half)&&(depth!=0) ) + { + // Second part of curve (InterMed[depth],Intermed[depth-1]) ) + // On the depth-1 level normally we are on the 'second_half' + + Second_half = true; + + // Find new trial intersection point needed at start of the loop + // + SubStart_PointVelocity = *ptrInterMedFT[depth]; + CurrentA_PointVelocity = *ptrInterMedFT[depth]; + CurrentB_PointVelocity = *ptrInterMedFT[depth-1]; + G4ThreeVector Point_A = CurrentA_PointVelocity.GetPosition(); + G4ThreeVector SubE_point = CurrentB_PointVelocity.GetPosition(); + fNavigator->LocateGlobalPointWithinVolume(Point_A); + G4bool Intersects_AB = IntersectChord(Point_A, SubE_point, NewSafety, + stepLengthAB, PointGe); + if(Intersects_AB) + { + CurrentE_Point = PointGe; + } + else + { + final_section = true; + } + depth--; + } + } // if(!found_aproximate_intersection) + + } while ( ( ! found_approximate_intersection ) + && ( ! there_is_no_intersection ) + && ( substep_no <= max_substeps) ); // UNTIL found or failed + + if( substep_no > max_no_seen ) + { max_no_seen = substep_no; - if( max_no_seen > warn_substeps ) { - trigger_substepno_print= max_no_seen - 20; // Want to see that last 20 steps + if( max_no_seen > warn_substeps ) + { + trigger_substepno_print = max_no_seen-20; // Want to see last 20 steps } } - if( ( substep_no >= max_substeps) && !there_is_no_intersection && !found_approximate_intersection ) { - - G4cerr << "Problem in G4PropagatorInField::LocateIntersectionPoint:" - << " Convergence is requiring too many substeps: " << substep_no; - G4cerr << " Abandoning effort to intersect. " << G4endl; - G4cerr << " Information on start & current step follows in cout: " << G4endl; - G4cout << "Problem in G4PropagatorInField::LocateIntersectionPoint:" - << " Convergence is requiring too many substeps: " << substep_no << G4endl; - G4cout << " found intersection= " << found_approximate_intersection - << " intersection exists = " << ! there_is_no_intersection << G4endl; - + if( ( substep_no >= max_substeps) + && !there_is_no_intersection + && !found_approximate_intersection ) + { + G4cerr << "WARNING - G4PropagatorInField::LocateIntersectionPoint()" + << G4endl + << " Convergence is requiring too many substeps: " + << substep_no << G4endl; + G4cerr << " Abandoning effort to intersect. " << G4endl; + G4cerr << " Information on start & current step follows in cout." + << G4endl; + G4cout << "WARNING - G4PropagatorInField::LocateIntersectionPoint()" + << G4endl + << " Convergence is requiring too many substeps: " + << substep_no << G4endl; + G4cout << " Found intersection = " + << found_approximate_intersection << G4endl + << " Intersection exists = " + << !there_is_no_intersection << G4endl; + G4cout << " Start and Endpoint of Requested Step:" << G4endl; + printStatus( CurveStartPointVelocity, CurveEndPointVelocity, + -1.0, NewSafety, 0, 0); G4cout << G4endl; - G4cout << " Start and Endpoint of Requested Step " << G4endl; - printStatus( CurveStartPointVelocity, CurveEndPointVelocity, - -1.0, NewSafety, 0, 0); - - G4cout << G4endl; - G4cout << " 'Bracketing' starting and endpoint of current Sub-Step " << G4endl; - printStatus( CurrentA_PointVelocity, CurrentA_PointVelocity, - -1.0, NewSafety, substep_no-1, 0); - printStatus( CurrentA_PointVelocity, CurrentB_PointVelocity, - -1.0, NewSafety, substep_no, 0); - + G4cout << " 'Bracketing' starting and endpoint of current Sub-Step" + << G4endl; + printStatus( CurrentA_PointVelocity, CurrentA_PointVelocity, + -1.0, NewSafety, substep_no-1, 0); + printStatus( CurrentA_PointVelocity, CurrentB_PointVelocity, + -1.0, NewSafety, substep_no, 0); G4cout << G4endl; -// #ifdef G4DEBUG_LOCATE_INTERSECTION -// #ifdef G4VERBOSE -// #endif - - // G4Exception("G4PropagatorInField::LocateIntersectionPoint()", "UnableToLocateIntersection", - // FatalException, "Too many substeps while trying to locate intersection."); - #ifdef FUTURE_CORRECTION // Attempt to correct the results of the method // FIX - TODO - if ( ! found_approximate_intersection ){ - recalculatedEndPoint= true; - // Return the further valid intersection point -- potentially A ?? JA/19 Jan 2006 + + if ( ! found_approximate_intersection ) + { + recalculatedEndPoint = true; + // Return the further valid intersection point -- potentially A ?? + // JA/19 Jan 2006 IntersectedOrRecalculatedFT = CurrentA_PointVelocity; - G4cout << "G4PropagatorInField::LocateIntersectionPoint:" - << " did not convergence after " << substep_no << " substeps." << G4endl; - G4cout << " The endpoint was adjused to pointA resulting from the last substep: " - << CurrentA_PointVelocity - << G4endl; + G4cout << "WARNING - G4PropagatorInField::LocateIntersectionPoint()" + << G4endl + << " Did not convergence after " << substep_no + << " substeps." << G4endl; + G4cout << " The endpoint was adjused to pointA resulting" + << G4endl + << " from the last substep: " << CurrentA_PointVelocity + << G4endl; } #endif G4cout.precision( 10 ); - G4double done_len= CurrentA_PointVelocity.GetCurveLength(); - G4double full_len= CurveEndPointVelocity.GetCurveLength(); - G4cout << " G4PropagatorInField::LocateIntersectionPoint(): " << G4endl - << " Undertaken only length " << done_len - << " out of " << full_len << " required." << G4endl; - G4cout << " Remaining length = " << full_len - done_len << " " << G4endl; - - G4Exception("G4PropagatorInField::LocateIntersectionPoint()", "UnableToLocateIntersection", - FatalException, "Too many substeps while trying to locate intersection."); + G4double done_len = CurrentA_PointVelocity.GetCurveLength(); + G4double full_len = CurveEndPointVelocity.GetCurveLength(); + G4cout << "ERROR - G4PropagatorInField::LocateIntersectionPoint()" + << G4endl + << " Undertaken only length: " << done_len + << " out of " << full_len << " required." << G4endl; + G4cout << " Remaining length = " << full_len - done_len << G4endl; + G4Exception("G4PropagatorInField::LocateIntersectionPoint()", + "UnableToLocateIntersection", FatalException, + "Too many substeps while trying to locate intersection."); } - else if( substep_no >= warn_substeps ) { + else if( substep_no >= warn_substeps ) + { int oldprc= G4cout.precision( 10 ); - G4cout << " G4PropagatorInField::LocateIntersectionPoint(): Undertaken length " - << CurrentB_PointVelocity.GetCurveLength(); - G4cout << " Needed " << substep_no << " substeps. Warning level= " << warn_substeps - << " and maximum substeps= " << max_substeps << G4endl; - G4Exception("G4PropagatorInField::LocateIntersectionPoint()", "DifficultyToLocateIntersection", - JustWarning, "Many substeps while trying to locate intersection."); + G4cout << "WARNING - G4PropagatorInField::LocateIntersectionPoint()" + << G4endl + << " Undertaken length: " + << CurrentB_PointVelocity.GetCurveLength(); + G4cout << " - Needed: " << substep_no << " substeps." << G4endl + << " Warning level = " << warn_substeps + << " and maximum substeps = " << max_substeps << G4endl; + G4Exception("G4PropagatorInField::LocateIntersectionPoint()", + "DifficultyToLocateIntersection", JustWarning, + "Many substeps while trying to locate intersection."); G4cout.precision( oldprc ); } + for ( G4int idepth=0; idepth>> " - << std::setw( 7) << " Delta|N|" << " " + << std::setw( 7) << " Delta|N|" << " " // << std::setw( 7) << " Delta(N_z) " << " " << std::setw( 9) << "StepLen" << " " << std::setw(12) << "StartSafety" << " " @@ -960,14 +1146,17 @@ G4PropagatorInField::IntersectChord( G4ThreeVector StartPointA, // printIntersection( // StartPointA, EndPointB, LinearStepLength, IntersectionPoint, NewSafety - G4cout << "Start=" << std::setw(12) << StartPointA << " " + G4cout << " G4PropagatorInField::IntersectChord reports " << G4endl; + G4cout << " PiF-IC> " + << "Start=" << std::setw(12) << StartPointA << " " << "End= " << std::setw(8) << EndPointB << " " << "StepIn=" << std::setw(8) << LinearStepLength << " " - << "NewSft=" << std::setw(8) << NewSafety - << "NavCall" << doCallNav << " " - << "In T/F " << intersects << " " - << "IntrPt=" << std::setw(8) << IntersectionPoint << " " - << G4endl; + << "NewSft=" << std::setw(8) << NewSafety << " " + << "CallNav=" << doCallNav << " " + << "Intersects " << intersects << " "; + if( intersects ) + G4cout << "IntrPt=" << std::setw(8) << IntersectionPoint << " " ; + G4cout << G4endl; #endif return intersects; @@ -985,7 +1174,7 @@ ReEstimateEndpoint( const G4FieldTrack &CurrentStateA, // G4double checkCurveDist= EstimatedEndStateB.GetCurveLength() // - CurrentStateA.GetCurveLength(); // G4double checkLinDistSq= (EstimatedEndStateB.GetPosition() - // - CurrentStateA.GetPosition() ).mag2(); + // - CurrentStateA.GetPosition() ).mag2(); G4FieldTrack newEndPoint( CurrentStateA ); G4MagInt_Driver* integrDriver= GetChordFinder()->GetIntegrationDriver(); @@ -1022,8 +1211,8 @@ ReEstimateEndpoint( const G4FieldTrack &CurrentStateA, if( itrial > 1) { if( fVerboseLevel > 0 ) { G4cout << MethodName << " called - goodAdv= " << goodAdvance - << " trials = " << itrial << " previous good= " << latest_good_trials - << G4endl; + << " trials = " << itrial << " previous good= " << latest_good_trials + << G4endl; } latest_good_trials=0; }else{ @@ -1039,7 +1228,7 @@ ReEstimateEndpoint( const G4FieldTrack &CurrentStateA, G4cout << MethodName << "> AccurateAdvance failed " ; G4cout << " in " << itrial << " integration trials/steps. " << G4endl G4cout << " It went only " << lengthDone << " instead of " << curveDist - << " -- a difference of " << curveDist - lengthDone << G4endl; + << " -- a difference of " << curveDist - lengthDone << G4endl; G4cout << " ReEstimateEndpoint> Reset endPoint to original value!" << G4endl; } } @@ -1068,7 +1257,7 @@ ReEstimateEndpoint( const G4FieldTrack &CurrentStateA, noCorrections++; if( goodAdvance ){ sumCorrectionsSq += (EstimatedEndStateB.GetPosition() - - newEndPoint.GetPosition()).mag2(); + newEndPoint.GetPosition()).mag2(); } linearDistSq -= curveDist; // To use linearDistSq ... ! #endif diff --git a/source/geometry/navigation/src/G4ReplicaNavigation.cc b/source/geometry/navigation/src/G4ReplicaNavigation.cc index 36e717d0ec..b694525e85 100644 --- a/source/geometry/navigation/src/G4ReplicaNavigation.cc +++ b/source/geometry/navigation/src/G4ReplicaNavigation.cc @@ -25,7 +25,7 @@ // // // $Id: G4ReplicaNavigation.cc,v 1.11 2006/06/29 18:37:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4ReplicaNavigation Implementation diff --git a/source/geometry/navigation/src/G4SafetyHelper.cc b/source/geometry/navigation/src/G4SafetyHelper.cc new file mode 100644 index 0000000000..7ab5a0c00e --- /dev/null +++ b/source/geometry/navigation/src/G4SafetyHelper.cc @@ -0,0 +1,153 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4SafetyHelper.cc,v 1.7 2006/11/14 10:22:12 japost Exp $ +// GEANT4 tag $ Name: $ + + +#include "G4SafetyHelper.hh" +#include "G4PathFinder.hh" +#include "G4TransportationManager.hh" +#include "G4Navigator.hh" + +// #include "G4Exception.hh" +#include "globals.hh" + +G4bool G4SafetyHelper::fUseParallelGeometries= false; + // By default, one geometry only + +G4SafetyHelper::G4SafetyHelper() +{ + fpPathFinder= G4PathFinder::GetInstance(); + + InitialiseNavigator(); +} + +void G4SafetyHelper::InitialiseNavigator() +{ + // G4Navigator* + static G4TransportationManager* pTransportMgr= + G4TransportationManager::GetTransportationManager(); + + fpMassNavigator = pTransportMgr->GetNavigatorForTracking(); + + fMassNavigatorId = pTransportMgr->ActivateNavigator( fpMassNavigator ); +} + +G4SafetyHelper::~G4SafetyHelper() +{} + +G4double +G4SafetyHelper::ComputeMassStep( const G4ThreeVector &position, + const G4ThreeVector &direction, + G4double &newSafety ) +{ + // Step for mass geometry + G4double linearStep; + const G4double proposedStep = DBL_MAX; + + // Check + G4VPhysicalVolume* worldPV= fpMassNavigator->GetWorldVolume(); + if( worldPV == 0 ) { + G4Exception("G4SafetyHelper::ComputeMassStep", + "InvalidNavigatorWorld", + FatalException, + "Found that existing mass Navigator has null world"); + } + + fpMassNavigator->LocateGlobalPointWithinVolume(position); + // Potentially dangerous to relocate the point. + // Safe in PostStepDoIt -- and possibly in AlongStepGPIL + + G4cout << "G4SafetyHelper::ComputeMassStep " + << " trial step size = " << proposedStep << " ." << G4endl; + + // Distance in the Mass geometry + linearStep = fpMassNavigator->ComputeStep( position, + direction, + proposedStep, + newSafety); + + fpMassNavigator->LocateGlobalPointWithinVolume(position); + G4cout << "G4UrbanMscModel relocates mass Navigator back to " + << position << G4endl; + + // TO-DO: Can replace this with a call to PathFinder + // giving id of Mass Geometry --> this avoid doing the work twice + + return linearStep; +} + +G4double G4SafetyHelper::ComputeSafety( const G4ThreeVector& position ) +{ + // Safety for all geometries + G4double newsafety= 0.0; + + if( !fUseParallelGeometries) { + // Old code: safety for mass geometry + fpMassNavigator->LocateGlobalPointWithinVolume(position); + newsafety = fpMassNavigator->ComputeSafety(position); + }else{ + + // fpPathFinder->ReLocate( position ); // Safe in PostStepDoIt only ?? + newsafety= fpPathFinder->ComputeSafety( position ); + +#ifdef CHECK_WITH_ONE_GEOM + // Check against mass safety + fpMassNavigator->LocateGlobalPointWithinVolume(position); + G4double mass_safety = fpMassNavigator->ComputeSafety(position); + + // For initial tests check assume that mass is only geometry + if( (mass_safety - newsafety) > 1e-4 * newsafety ){ + G4cerr << " ERROR in G4SafetyHelper " << G4endl + << " Safety from PathFinder is " << newsafety << " " + << " not equal to " << mass_safety << " " << G4endl; + G4Exception("G4SafetyHelper::ComputeSafety", "SafetyError", + FatalException, + "Incompatible safeties between navigator and pathfinder" ); + exit(1); + } +#endif + } + return newsafety; +} + + +void G4SafetyHelper::ReLocateWithinVolume( const G4ThreeVector &newPosition ) +{ + +#ifdef G4VERBOSE_HELPER + G4int oldPrec= G4cout.precision( 10 ); + G4cout << " G4SafetyHelper::ReLocateWithinVolume " + << " calling PathFinder->ReLocating at position " << newPosition << G4endl; + G4cout.precision( oldPrec ); +#endif + + if( !fUseParallelGeometries) { + fpMassNavigator->LocateGlobalPointWithinVolume( newPosition ); + }else{ + fpPathFinder->ReLocate( newPosition ); + } +} diff --git a/source/geometry/navigation/src/G4TransportationManager.cc b/source/geometry/navigation/src/G4TransportationManager.cc index dc71892efd..f4f4c9e8d5 100644 --- a/source/geometry/navigation/src/G4TransportationManager.cc +++ b/source/geometry/navigation/src/G4TransportationManager.cc @@ -25,7 +25,7 @@ // // // $Id: G4TransportationManager.cc,v 1.14 2006/06/29 18:37:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4TransportationManager diff --git a/source/geometry/navigation/src/G4VoxelNavigation.cc b/source/geometry/navigation/src/G4VoxelNavigation.cc index 46be8742d3..fd6c2ab491 100644 --- a/source/geometry/navigation/src/G4VoxelNavigation.cc +++ b/source/geometry/navigation/src/G4VoxelNavigation.cc @@ -25,7 +25,7 @@ // // // $Id: G4VoxelNavigation.cc,v 1.6 2006/06/29 18:37:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4VoxelNavigation Implementation diff --git a/source/geometry/solids/BREPS/History b/source/geometry/solids/BREPS/History index dc73bdc15d..b288be6345 100644 --- a/source/geometry/solids/BREPS/History +++ b/source/geometry/solids/BREPS/History @@ -1,4 +1,4 @@ -$Id: History,v 1.63 2005/12/21 17:37:50 gcosmo Exp $ +$Id: History,v 1.64 2006/10/19 15:35:55 gcosmo Exp $ ---------------------------------------------------------------------------- ========================================================= @@ -17,6 +17,10 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +19/10/2006 : G. Cosmo breps-V08-01-00 +- Added GetSurfaceArea() method, accessors and modifiers to base class + G4BREPSolid, implementing the caching mechanism as for volumes. + 21/12/2005 : G. Cosmo breps-V08-00-00 - Use explicit 'HepGeom' namespace for 'Identity', to allow for porting on Windows/VC++ when using CLHEP-2.0.X. diff --git a/source/geometry/solids/BREPS/include/G4Assembly.hh b/source/geometry/solids/BREPS/include/G4Assembly.hh index 236b1dcff2..51719d884d 100644 --- a/source/geometry/solids/BREPS/include/G4Assembly.hh +++ b/source/geometry/solids/BREPS/include/G4Assembly.hh @@ -25,7 +25,7 @@ // // // $Id: G4Assembly.hh,v 1.10 2006/06/29 18:37:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4Assembly diff --git a/source/geometry/solids/BREPS/include/G4Assembly.icc b/source/geometry/solids/BREPS/include/G4Assembly.icc index fc7a0d029f..b378d1526e 100644 --- a/source/geometry/solids/BREPS/include/G4Assembly.icc +++ b/source/geometry/solids/BREPS/include/G4Assembly.icc @@ -25,7 +25,7 @@ // // // $Id: G4Assembly.icc,v 1.4 2006/06/29 18:37:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4Axis2Placement3D.hh b/source/geometry/solids/BREPS/include/G4Axis2Placement3D.hh index 2a0421d6a3..39c0387adf 100644 --- a/source/geometry/solids/BREPS/include/G4Axis2Placement3D.hh +++ b/source/geometry/solids/BREPS/include/G4Axis2Placement3D.hh @@ -25,7 +25,7 @@ // // // $Id: G4Axis2Placement3D.hh,v 1.5 2006/06/29 18:37:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4Axis2Placement3D diff --git a/source/geometry/solids/BREPS/include/G4Axis2Placement3D.icc b/source/geometry/solids/BREPS/include/G4Axis2Placement3D.icc index c1598de04f..783e667f1f 100644 --- a/source/geometry/solids/BREPS/include/G4Axis2Placement3D.icc +++ b/source/geometry/solids/BREPS/include/G4Axis2Placement3D.icc @@ -25,7 +25,7 @@ // // // $Id: G4Axis2Placement3D.icc,v 1.9 2006/06/29 18:37:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4BREPSolid.hh b/source/geometry/solids/BREPS/include/G4BREPSolid.hh index 10ed999a77..c2b8008195 100644 --- a/source/geometry/solids/BREPS/include/G4BREPSolid.hh +++ b/source/geometry/solids/BREPS/include/G4BREPSolid.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4BREPSolid.hh,v 1.16 2006/06/29 18:37:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4BREPSolid.hh,v 1.17 2006/10/19 15:35:36 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4BREPSolid @@ -146,10 +146,16 @@ public: // with description inline G4int GetNumberOfSolids() const; inline const G4Axis2Placement3D* GetPlace() const; inline const G4BoundingBox3D* GetBBox() const; + // Accessors methods. + inline G4int GetCubVolStatistics() const; inline G4double GetCubVolEpsilon() const; inline void SetCubVolStatistics(G4int st); inline void SetCubVolEpsilon(G4double ep); + inline G4int GetAreaStatistics() const; + inline G4double GetAreaAccuracy() const; + inline void SetAreaStatistics(G4int st); + inline void SetAreaAccuracy(G4double ep); // Accessors methods. public: @@ -157,6 +163,9 @@ public: inline G4double GetCubicVolume(); // Returns an estimation of the geometrical cubic volume of the // solid. Caches the computed value once computed the first time. + inline G4double GetSurfaceArea(); + // Returns an estimation of the geometrical surface area of the + // solid. Caches the computed value once computed the first time. inline G4double IntersectionDistance() const; inline void IntersectionDistance(G4double) const; @@ -220,10 +229,13 @@ protected: private: - G4int fCubVolStatistics; + G4int fStatistics; G4double fCubVolEpsilon; + G4double fAreaAccuracy; G4double fCubicVolume; - // Statistics, error accuracy and cached value for volume. + G4double fSurfaceArea; + // Statistics, error accuracy and cached value for volume and area. + mutable G4Polyhedron* fpPolyhedron; G4BREPSolid(const G4BREPSolid&); diff --git a/source/geometry/solids/BREPS/include/G4BREPSolid.icc b/source/geometry/solids/BREPS/include/G4BREPSolid.icc index c3921b9d2d..d1cc6ea545 100644 --- a/source/geometry/solids/BREPS/include/G4BREPSolid.icc +++ b/source/geometry/solids/BREPS/include/G4BREPSolid.icc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4BREPSolid.icc,v 1.7 2006/06/29 18:37:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4BREPSolid.icc,v 1.9 2006/10/20 14:23:19 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file @@ -144,7 +144,7 @@ inline void G4BREPSolid::QuickSort( register G4Surface** SrfVec, inline G4int G4BREPSolid::GetCubVolStatistics() const { - return fCubVolStatistics; + return fStatistics; } inline G4double G4BREPSolid::GetCubVolEpsilon() const @@ -154,19 +154,48 @@ inline G4double G4BREPSolid::GetCubVolEpsilon() const inline void G4BREPSolid::SetCubVolStatistics(G4int st) { - fCubVolStatistics=st; + fCubicVolume=0.; + fStatistics=st; } inline void G4BREPSolid::SetCubVolEpsilon(G4double ep) { + fCubicVolume=0.; fCubVolEpsilon=ep; } -/////////////////////////////////////////////////// +inline G4int G4BREPSolid::GetAreaStatistics() const +{ + return fStatistics; +} + +inline G4double G4BREPSolid::GetAreaAccuracy() const +{ + return fAreaAccuracy; +} + +inline void G4BREPSolid::SetAreaStatistics(G4int st) +{ + fSurfaceArea=0.; + fStatistics=st; +} + +inline void G4BREPSolid::SetAreaAccuracy(G4double ep) +{ + fSurfaceArea=0.; + fAreaAccuracy=ep; +} inline G4double G4BREPSolid::GetCubicVolume() { - if(fCubicVolume != 0.) ; - else fCubicVolume = EstimateCubicVolume(fCubVolStatistics,fCubVolEpsilon); + if(fCubicVolume != 0.) {;} + else { fCubicVolume = EstimateCubicVolume(fStatistics,fCubVolEpsilon); } return fCubicVolume; } + +inline G4double G4BREPSolid::GetSurfaceArea() +{ + if(fSurfaceArea != 0.) {;} + else { fSurfaceArea = EstimateSurfaceArea(fStatistics,fAreaAccuracy); } + return fSurfaceArea; +} diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidBox.hh b/source/geometry/solids/BREPS/include/G4BREPSolidBox.hh index 16b4bdd447..7d01726af8 100644 --- a/source/geometry/solids/BREPS/include/G4BREPSolidBox.hh +++ b/source/geometry/solids/BREPS/include/G4BREPSolidBox.hh @@ -25,7 +25,7 @@ // // // $Id: G4BREPSolidBox.hh,v 1.9 2006/06/29 18:37:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4BREPSolidBox diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidCone.hh b/source/geometry/solids/BREPS/include/G4BREPSolidCone.hh index 149b7f7cb7..a5195f7100 100644 --- a/source/geometry/solids/BREPS/include/G4BREPSolidCone.hh +++ b/source/geometry/solids/BREPS/include/G4BREPSolidCone.hh @@ -25,7 +25,7 @@ // // // $Id: G4BREPSolidCone.hh,v 1.11 2006/06/29 18:37:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4BREPSolidCone diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidCylinder.hh b/source/geometry/solids/BREPS/include/G4BREPSolidCylinder.hh index 20a547582c..c6f3dace8d 100644 --- a/source/geometry/solids/BREPS/include/G4BREPSolidCylinder.hh +++ b/source/geometry/solids/BREPS/include/G4BREPSolidCylinder.hh @@ -25,7 +25,7 @@ // // // $Id: G4BREPSolidCylinder.hh,v 1.10 2006/06/29 18:37:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4BREPSolidCylinder diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidOpenPCone.hh b/source/geometry/solids/BREPS/include/G4BREPSolidOpenPCone.hh index 85542955d0..ea24212775 100644 --- a/source/geometry/solids/BREPS/include/G4BREPSolidOpenPCone.hh +++ b/source/geometry/solids/BREPS/include/G4BREPSolidOpenPCone.hh @@ -25,7 +25,7 @@ // // // $Id: G4BREPSolidOpenPCone.hh,v 1.9 2006/06/29 18:37:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4BREPSolidOpenPCone diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidPCone.hh b/source/geometry/solids/BREPS/include/G4BREPSolidPCone.hh index d28dae9ce1..6555b262ee 100644 --- a/source/geometry/solids/BREPS/include/G4BREPSolidPCone.hh +++ b/source/geometry/solids/BREPS/include/G4BREPSolidPCone.hh @@ -25,7 +25,7 @@ // // // $Id: G4BREPSolidPCone.hh,v 1.14 2006/06/29 18:37:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4BREPSolidPCone diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidPolyhedra.hh b/source/geometry/solids/BREPS/include/G4BREPSolidPolyhedra.hh index 4fbe05e483..d6dc4cac51 100644 --- a/source/geometry/solids/BREPS/include/G4BREPSolidPolyhedra.hh +++ b/source/geometry/solids/BREPS/include/G4BREPSolidPolyhedra.hh @@ -25,7 +25,7 @@ // // // $Id: G4BREPSolidPolyhedra.hh,v 1.14 2006/06/29 18:37:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4BREPSolidPolyhedra diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidSphere.hh b/source/geometry/solids/BREPS/include/G4BREPSolidSphere.hh index 014bd9bf72..49e5a8868e 100644 --- a/source/geometry/solids/BREPS/include/G4BREPSolidSphere.hh +++ b/source/geometry/solids/BREPS/include/G4BREPSolidSphere.hh @@ -25,7 +25,7 @@ // // // $Id: G4BREPSolidSphere.hh,v 1.11 2006/06/29 18:38:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4BREPSolidSphere diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidTorus.hh b/source/geometry/solids/BREPS/include/G4BREPSolidTorus.hh index 4956e38f0a..72f7f74e05 100644 --- a/source/geometry/solids/BREPS/include/G4BREPSolidTorus.hh +++ b/source/geometry/solids/BREPS/include/G4BREPSolidTorus.hh @@ -25,7 +25,7 @@ // // // $Id: G4BREPSolidTorus.hh,v 1.10 2006/06/29 18:38:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4BREPSolidTorus diff --git a/source/geometry/solids/BREPS/include/G4BSplineCurve.hh b/source/geometry/solids/BREPS/include/G4BSplineCurve.hh index 34c1528a6b..4b7d34242a 100644 --- a/source/geometry/solids/BREPS/include/G4BSplineCurve.hh +++ b/source/geometry/solids/BREPS/include/G4BSplineCurve.hh @@ -25,7 +25,7 @@ // // // $Id: G4BSplineCurve.hh,v 1.13 2006/06/29 18:38:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4BSplineCurve diff --git a/source/geometry/solids/BREPS/include/G4BSplineCurve.icc b/source/geometry/solids/BREPS/include/G4BSplineCurve.icc index 4d380a9f95..bd16530c80 100644 --- a/source/geometry/solids/BREPS/include/G4BSplineCurve.icc +++ b/source/geometry/solids/BREPS/include/G4BSplineCurve.icc @@ -25,7 +25,7 @@ // // // $Id: G4BSplineCurve.icc,v 1.7 2006/06/29 18:38:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4BSplineCurveWithKnots.hh b/source/geometry/solids/BREPS/include/G4BSplineCurveWithKnots.hh index 0568ecadf5..7bd4590faf 100644 --- a/source/geometry/solids/BREPS/include/G4BSplineCurveWithKnots.hh +++ b/source/geometry/solids/BREPS/include/G4BSplineCurveWithKnots.hh @@ -25,7 +25,7 @@ // // // $Id: G4BSplineCurveWithKnots.hh,v 1.5 2006/06/29 18:38:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4BSplineCurveWithKnots diff --git a/source/geometry/solids/BREPS/include/G4BSplineSurface.hh b/source/geometry/solids/BREPS/include/G4BSplineSurface.hh index fe52a21ed8..0f2ba399cf 100644 --- a/source/geometry/solids/BREPS/include/G4BSplineSurface.hh +++ b/source/geometry/solids/BREPS/include/G4BSplineSurface.hh @@ -25,7 +25,7 @@ // // // $Id: G4BSplineSurface.hh,v 1.11 2006/06/29 18:38:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4BSplineSurface diff --git a/source/geometry/solids/BREPS/include/G4BSplineSurface.icc b/source/geometry/solids/BREPS/include/G4BSplineSurface.icc index e80da4a0a8..ccddfe5dcf 100644 --- a/source/geometry/solids/BREPS/include/G4BSplineSurface.icc +++ b/source/geometry/solids/BREPS/include/G4BSplineSurface.icc @@ -25,7 +25,7 @@ // // // $Id: G4BSplineSurface.icc,v 1.6 2006/06/29 18:38:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4BSplineSurfaceWithKnots.hh b/source/geometry/solids/BREPS/include/G4BSplineSurfaceWithKnots.hh index 2f7ed50e59..d48ba61be6 100644 --- a/source/geometry/solids/BREPS/include/G4BSplineSurfaceWithKnots.hh +++ b/source/geometry/solids/BREPS/include/G4BSplineSurfaceWithKnots.hh @@ -25,7 +25,7 @@ // // // $Id: G4BSplineSurfaceWithKnots.hh,v 1.4 2006/06/29 18:38:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4BSplineSurfaceWithKnots diff --git a/source/geometry/solids/BREPS/include/G4BezierSurface.hh b/source/geometry/solids/BREPS/include/G4BezierSurface.hh index a4b6b31f7a..21b72b1b53 100644 --- a/source/geometry/solids/BREPS/include/G4BezierSurface.hh +++ b/source/geometry/solids/BREPS/include/G4BezierSurface.hh @@ -25,7 +25,7 @@ // // // $Id: G4BezierSurface.hh,v 1.7 2006/06/29 18:38:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4BezierSurface diff --git a/source/geometry/solids/BREPS/include/G4BezierSurface.icc b/source/geometry/solids/BREPS/include/G4BezierSurface.icc index 3ffaa60fa5..cd0ed0b82b 100644 --- a/source/geometry/solids/BREPS/include/G4BezierSurface.icc +++ b/source/geometry/solids/BREPS/include/G4BezierSurface.icc @@ -25,7 +25,7 @@ // // // $Id: G4BezierSurface.icc,v 1.4 2006/06/29 18:38:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4BoundingBox3D.hh b/source/geometry/solids/BREPS/include/G4BoundingBox3D.hh index ad848b6e1d..d69ccd6688 100644 --- a/source/geometry/solids/BREPS/include/G4BoundingBox3D.hh +++ b/source/geometry/solids/BREPS/include/G4BoundingBox3D.hh @@ -25,7 +25,7 @@ // // // $Id: G4BoundingBox3D.hh,v 1.6 2006/06/29 18:38:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4BoundingBox3D diff --git a/source/geometry/solids/BREPS/include/G4BoundingBox3D.icc b/source/geometry/solids/BREPS/include/G4BoundingBox3D.icc index 158406d5ab..a85afe269a 100644 --- a/source/geometry/solids/BREPS/include/G4BoundingBox3D.icc +++ b/source/geometry/solids/BREPS/include/G4BoundingBox3D.icc @@ -25,7 +25,7 @@ // // // $Id: G4BoundingBox3D.icc,v 1.4 2006/06/29 18:38:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4CircularCurve.hh b/source/geometry/solids/BREPS/include/G4CircularCurve.hh index 57fdd87470..7c3b3e596f 100644 --- a/source/geometry/solids/BREPS/include/G4CircularCurve.hh +++ b/source/geometry/solids/BREPS/include/G4CircularCurve.hh @@ -25,7 +25,7 @@ // // // $Id: G4CircularCurve.hh,v 1.9 2006/06/29 18:38:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4CircularCurve diff --git a/source/geometry/solids/BREPS/include/G4CircularCurve.icc b/source/geometry/solids/BREPS/include/G4CircularCurve.icc index 0a6dd32ae3..2141ce3d9b 100644 --- a/source/geometry/solids/BREPS/include/G4CircularCurve.icc +++ b/source/geometry/solids/BREPS/include/G4CircularCurve.icc @@ -25,7 +25,7 @@ // // // $Id: G4CircularCurve.icc,v 1.6 2006/06/29 18:38:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4CompositeCurve.hh b/source/geometry/solids/BREPS/include/G4CompositeCurve.hh index e8664dcf66..bb30b26a6c 100644 --- a/source/geometry/solids/BREPS/include/G4CompositeCurve.hh +++ b/source/geometry/solids/BREPS/include/G4CompositeCurve.hh @@ -25,7 +25,7 @@ // // // $Id: G4CompositeCurve.hh,v 1.8 2006/06/29 18:38:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4CompositeCurve diff --git a/source/geometry/solids/BREPS/include/G4CompositeCurve.icc b/source/geometry/solids/BREPS/include/G4CompositeCurve.icc index f04bf6e5cd..ab7b74c98d 100644 --- a/source/geometry/solids/BREPS/include/G4CompositeCurve.icc +++ b/source/geometry/solids/BREPS/include/G4CompositeCurve.icc @@ -25,7 +25,7 @@ // // // $Id: G4CompositeCurve.icc,v 1.5 2006/06/29 18:38:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4Conic.hh b/source/geometry/solids/BREPS/include/G4Conic.hh index e015787def..0820d1576e 100644 --- a/source/geometry/solids/BREPS/include/G4Conic.hh +++ b/source/geometry/solids/BREPS/include/G4Conic.hh @@ -25,7 +25,7 @@ // // // $Id: G4Conic.hh,v 1.7 2006/06/29 18:38:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4Conic diff --git a/source/geometry/solids/BREPS/include/G4Conic.icc b/source/geometry/solids/BREPS/include/G4Conic.icc index 010930c560..16eb9d003b 100644 --- a/source/geometry/solids/BREPS/include/G4Conic.icc +++ b/source/geometry/solids/BREPS/include/G4Conic.icc @@ -25,7 +25,7 @@ // // // $Id: G4Conic.icc,v 1.4 2006/06/29 18:38:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4ConicalSurface.hh b/source/geometry/solids/BREPS/include/G4ConicalSurface.hh index da16782722..c5b6d86ef1 100644 --- a/source/geometry/solids/BREPS/include/G4ConicalSurface.hh +++ b/source/geometry/solids/BREPS/include/G4ConicalSurface.hh @@ -25,7 +25,7 @@ // // // $Id: G4ConicalSurface.hh,v 1.10 2006/06/29 18:38:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4ConicalSurface diff --git a/source/geometry/solids/BREPS/include/G4ConicalSurface.icc b/source/geometry/solids/BREPS/include/G4ConicalSurface.icc index aebd783c1c..4acd679ade 100644 --- a/source/geometry/solids/BREPS/include/G4ConicalSurface.icc +++ b/source/geometry/solids/BREPS/include/G4ConicalSurface.icc @@ -25,7 +25,7 @@ // // // $Id: G4ConicalSurface.icc,v 1.4 2006/06/29 18:38:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4ControlPoints.hh b/source/geometry/solids/BREPS/include/G4ControlPoints.hh index e1b9b3d963..b851befa92 100644 --- a/source/geometry/solids/BREPS/include/G4ControlPoints.hh +++ b/source/geometry/solids/BREPS/include/G4ControlPoints.hh @@ -25,7 +25,7 @@ // // // $Id: G4ControlPoints.hh,v 1.7 2006/06/29 18:38:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4ControlPoints diff --git a/source/geometry/solids/BREPS/include/G4ControlPoints.icc b/source/geometry/solids/BREPS/include/G4ControlPoints.icc index 4aa6cb980e..758b2539fb 100644 --- a/source/geometry/solids/BREPS/include/G4ControlPoints.icc +++ b/source/geometry/solids/BREPS/include/G4ControlPoints.icc @@ -25,7 +25,7 @@ // // // $Id: G4ControlPoints.icc,v 1.3 2006/06/29 18:38:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4ConvexHull.hh b/source/geometry/solids/BREPS/include/G4ConvexHull.hh index 41d897d194..2e56c6808a 100644 --- a/source/geometry/solids/BREPS/include/G4ConvexHull.hh +++ b/source/geometry/solids/BREPS/include/G4ConvexHull.hh @@ -25,7 +25,7 @@ // // // $Id: G4ConvexHull.hh,v 1.7 2006/06/29 18:38:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4ConvexHull diff --git a/source/geometry/solids/BREPS/include/G4Curve.hh b/source/geometry/solids/BREPS/include/G4Curve.hh index 8c7355184f..ad88002bac 100644 --- a/source/geometry/solids/BREPS/include/G4Curve.hh +++ b/source/geometry/solids/BREPS/include/G4Curve.hh @@ -25,7 +25,7 @@ // // // $Id: G4Curve.hh,v 1.10 2006/06/29 18:38:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4Curve diff --git a/source/geometry/solids/BREPS/include/G4Curve.icc b/source/geometry/solids/BREPS/include/G4Curve.icc index c77f9f2c75..7828794c10 100644 --- a/source/geometry/solids/BREPS/include/G4Curve.icc +++ b/source/geometry/solids/BREPS/include/G4Curve.icc @@ -25,7 +25,7 @@ // // // $Id: G4Curve.icc,v 1.7 2006/06/29 18:38:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4CurvePoint.hh b/source/geometry/solids/BREPS/include/G4CurvePoint.hh index da6712b2e2..60ac9ac695 100644 --- a/source/geometry/solids/BREPS/include/G4CurvePoint.hh +++ b/source/geometry/solids/BREPS/include/G4CurvePoint.hh @@ -25,7 +25,7 @@ // // // $Id: G4CurvePoint.hh,v 1.6 2006/06/29 18:39:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4CurvePoint diff --git a/source/geometry/solids/BREPS/include/G4CurvePoint.icc b/source/geometry/solids/BREPS/include/G4CurvePoint.icc index 1e8d193998..d1cf75fb93 100644 --- a/source/geometry/solids/BREPS/include/G4CurvePoint.icc +++ b/source/geometry/solids/BREPS/include/G4CurvePoint.icc @@ -25,7 +25,7 @@ // // // $Id: G4CurvePoint.icc,v 1.4 2006/06/29 18:39:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4CurveRayIntersection.hh b/source/geometry/solids/BREPS/include/G4CurveRayIntersection.hh index e3b0be0889..009d3e488f 100644 --- a/source/geometry/solids/BREPS/include/G4CurveRayIntersection.hh +++ b/source/geometry/solids/BREPS/include/G4CurveRayIntersection.hh @@ -25,7 +25,7 @@ // // // $Id: G4CurveRayIntersection.hh,v 1.5 2006/06/29 18:39:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4CurveRayIntersection diff --git a/source/geometry/solids/BREPS/include/G4CurveRayIntersection.icc b/source/geometry/solids/BREPS/include/G4CurveRayIntersection.icc index a17e03045d..42d4c41f6c 100644 --- a/source/geometry/solids/BREPS/include/G4CurveRayIntersection.icc +++ b/source/geometry/solids/BREPS/include/G4CurveRayIntersection.icc @@ -25,7 +25,7 @@ // // // $Id: G4CurveRayIntersection.icc,v 1.4 2006/06/29 18:39:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4CurveVector.hh b/source/geometry/solids/BREPS/include/G4CurveVector.hh index da42a1d146..06bfc0a81d 100644 --- a/source/geometry/solids/BREPS/include/G4CurveVector.hh +++ b/source/geometry/solids/BREPS/include/G4CurveVector.hh @@ -25,7 +25,7 @@ // // // $Id: G4CurveVector.hh,v 1.7 2006/06/29 18:39:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4CurveVector diff --git a/source/geometry/solids/BREPS/include/G4CylindricalSurface.hh b/source/geometry/solids/BREPS/include/G4CylindricalSurface.hh index 585fb28659..19957c29a3 100644 --- a/source/geometry/solids/BREPS/include/G4CylindricalSurface.hh +++ b/source/geometry/solids/BREPS/include/G4CylindricalSurface.hh @@ -25,7 +25,7 @@ // // // $Id: G4CylindricalSurface.hh,v 1.10 2006/06/29 18:39:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4CylindricalSurface diff --git a/source/geometry/solids/BREPS/include/G4CylindricalSurface.icc b/source/geometry/solids/BREPS/include/G4CylindricalSurface.icc index 5388520293..ec1d76318a 100644 --- a/source/geometry/solids/BREPS/include/G4CylindricalSurface.icc +++ b/source/geometry/solids/BREPS/include/G4CylindricalSurface.icc @@ -25,7 +25,7 @@ // // // $Id: G4CylindricalSurface.icc,v 1.4 2006/06/29 18:39:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4Ellipse.hh b/source/geometry/solids/BREPS/include/G4Ellipse.hh index 6467a9cbc4..7e6368ad1b 100644 --- a/source/geometry/solids/BREPS/include/G4Ellipse.hh +++ b/source/geometry/solids/BREPS/include/G4Ellipse.hh @@ -25,7 +25,7 @@ // // // $Id: G4Ellipse.hh,v 1.10 2006/06/29 18:39:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4Ellipse diff --git a/source/geometry/solids/BREPS/include/G4Ellipse.icc b/source/geometry/solids/BREPS/include/G4Ellipse.icc index b69eb84fa8..5c5cd39267 100644 --- a/source/geometry/solids/BREPS/include/G4Ellipse.icc +++ b/source/geometry/solids/BREPS/include/G4Ellipse.icc @@ -25,7 +25,7 @@ // // // $Id: G4Ellipse.icc,v 1.8 2006/06/29 18:39:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4FConicalSurface.hh b/source/geometry/solids/BREPS/include/G4FConicalSurface.hh index 6e223179c6..6dff9a53c4 100644 --- a/source/geometry/solids/BREPS/include/G4FConicalSurface.hh +++ b/source/geometry/solids/BREPS/include/G4FConicalSurface.hh @@ -25,7 +25,7 @@ // // // $Id: G4FConicalSurface.hh,v 1.13 2006/06/29 18:39:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4FConicalSurface diff --git a/source/geometry/solids/BREPS/include/G4FConicalSurface.icc b/source/geometry/solids/BREPS/include/G4FConicalSurface.icc index 6cb465e4ab..575dcdaad4 100644 --- a/source/geometry/solids/BREPS/include/G4FConicalSurface.icc +++ b/source/geometry/solids/BREPS/include/G4FConicalSurface.icc @@ -25,7 +25,7 @@ // // // $Id: G4FConicalSurface.icc,v 1.4 2006/06/29 18:39:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4FCylindricalSurface.hh b/source/geometry/solids/BREPS/include/G4FCylindricalSurface.hh index 2c1b4b9bde..2ef876ebfa 100644 --- a/source/geometry/solids/BREPS/include/G4FCylindricalSurface.hh +++ b/source/geometry/solids/BREPS/include/G4FCylindricalSurface.hh @@ -25,7 +25,7 @@ // // // $Id: G4FCylindricalSurface.hh,v 1.13 2006/06/29 18:39:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4FCylindricalSurface diff --git a/source/geometry/solids/BREPS/include/G4FCylindricalSurface.icc b/source/geometry/solids/BREPS/include/G4FCylindricalSurface.icc index 2b2315834b..46f28c08c1 100644 --- a/source/geometry/solids/BREPS/include/G4FCylindricalSurface.icc +++ b/source/geometry/solids/BREPS/include/G4FCylindricalSurface.icc @@ -25,7 +25,7 @@ // // // $Id: G4FCylindricalSurface.icc,v 1.4 2006/06/29 18:39:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4FPlane.hh b/source/geometry/solids/BREPS/include/G4FPlane.hh index 0f3b6e9b44..38f590c706 100644 --- a/source/geometry/solids/BREPS/include/G4FPlane.hh +++ b/source/geometry/solids/BREPS/include/G4FPlane.hh @@ -25,7 +25,7 @@ // // // $Id: G4FPlane.hh,v 1.13 2006/06/29 18:39:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4FPlane diff --git a/source/geometry/solids/BREPS/include/G4FPlane.icc b/source/geometry/solids/BREPS/include/G4FPlane.icc index 6a37a56133..7099d03793 100644 --- a/source/geometry/solids/BREPS/include/G4FPlane.icc +++ b/source/geometry/solids/BREPS/include/G4FPlane.icc @@ -25,7 +25,7 @@ // // // $Id: G4FPlane.icc,v 1.6 2006/06/29 18:39:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4Globals.hh b/source/geometry/solids/BREPS/include/G4Globals.hh index e3330c7ce0..cd9b2d0b0c 100644 --- a/source/geometry/solids/BREPS/include/G4Globals.hh +++ b/source/geometry/solids/BREPS/include/G4Globals.hh @@ -25,7 +25,7 @@ // // // $Id: G4Globals.hh,v 1.5 2006/06/29 18:39:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: A.Breakstone // Adaptation: J.Sulkimo, P.Urban. diff --git a/source/geometry/solids/BREPS/include/G4Hyperbola.hh b/source/geometry/solids/BREPS/include/G4Hyperbola.hh index 0b2048c612..10659c25a2 100644 --- a/source/geometry/solids/BREPS/include/G4Hyperbola.hh +++ b/source/geometry/solids/BREPS/include/G4Hyperbola.hh @@ -25,7 +25,7 @@ // // // $Id: G4Hyperbola.hh,v 1.10 2006/06/29 18:39:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4Hyperbola diff --git a/source/geometry/solids/BREPS/include/G4Hyperbola.icc b/source/geometry/solids/BREPS/include/G4Hyperbola.icc index dca2944cd6..409654cf2d 100644 --- a/source/geometry/solids/BREPS/include/G4Hyperbola.icc +++ b/source/geometry/solids/BREPS/include/G4Hyperbola.icc @@ -25,7 +25,7 @@ // // // $Id: G4Hyperbola.icc,v 1.9 2006/06/29 18:39:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4KnotVector.hh b/source/geometry/solids/BREPS/include/G4KnotVector.hh index 12ad829a26..f4b4bf87c3 100644 --- a/source/geometry/solids/BREPS/include/G4KnotVector.hh +++ b/source/geometry/solids/BREPS/include/G4KnotVector.hh @@ -25,7 +25,7 @@ // // // $Id: G4KnotVector.hh,v 1.9 2006/06/29 18:39:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4KnotVector diff --git a/source/geometry/solids/BREPS/include/G4KnotVector.icc b/source/geometry/solids/BREPS/include/G4KnotVector.icc index f517be6193..a6e148b351 100644 --- a/source/geometry/solids/BREPS/include/G4KnotVector.icc +++ b/source/geometry/solids/BREPS/include/G4KnotVector.icc @@ -25,7 +25,7 @@ // // // $Id: G4KnotVector.icc,v 1.5 2006/06/29 18:39:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4Line.hh b/source/geometry/solids/BREPS/include/G4Line.hh index 55bc5456de..08acc5ad0d 100644 --- a/source/geometry/solids/BREPS/include/G4Line.hh +++ b/source/geometry/solids/BREPS/include/G4Line.hh @@ -25,7 +25,7 @@ // // // $Id: G4Line.hh,v 1.9 2006/06/29 18:39:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4Line diff --git a/source/geometry/solids/BREPS/include/G4Line.icc b/source/geometry/solids/BREPS/include/G4Line.icc index b5b9841d5e..6302c8f7ae 100644 --- a/source/geometry/solids/BREPS/include/G4Line.icc +++ b/source/geometry/solids/BREPS/include/G4Line.icc @@ -25,7 +25,7 @@ // // // $Id: G4Line.icc,v 1.9 2006/06/29 18:39:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4OsloMatrix.hh b/source/geometry/solids/BREPS/include/G4OsloMatrix.hh index d48ca7983f..7ae95a1665 100644 --- a/source/geometry/solids/BREPS/include/G4OsloMatrix.hh +++ b/source/geometry/solids/BREPS/include/G4OsloMatrix.hh @@ -25,7 +25,7 @@ // // // $Id: G4OsloMatrix.hh,v 1.6 2006/06/29 18:39:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4OsloMatrix diff --git a/source/geometry/solids/BREPS/include/G4OsloMatrix.icc b/source/geometry/solids/BREPS/include/G4OsloMatrix.icc index 27f0045a1b..6f5d399414 100644 --- a/source/geometry/solids/BREPS/include/G4OsloMatrix.icc +++ b/source/geometry/solids/BREPS/include/G4OsloMatrix.icc @@ -25,7 +25,7 @@ // // // $Id: G4OsloMatrix.icc,v 1.4 2006/06/29 18:39:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4Parabola.hh b/source/geometry/solids/BREPS/include/G4Parabola.hh index 1ec5460a6a..edeeaff63c 100644 --- a/source/geometry/solids/BREPS/include/G4Parabola.hh +++ b/source/geometry/solids/BREPS/include/G4Parabola.hh @@ -25,7 +25,7 @@ // // // $Id: G4Parabola.hh,v 1.10 2006/06/29 18:39:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4Parabola diff --git a/source/geometry/solids/BREPS/include/G4Parabola.icc b/source/geometry/solids/BREPS/include/G4Parabola.icc index 7ac435c116..cce0358193 100644 --- a/source/geometry/solids/BREPS/include/G4Parabola.icc +++ b/source/geometry/solids/BREPS/include/G4Parabola.icc @@ -25,7 +25,7 @@ // // // $Id: G4Parabola.icc,v 1.8 2006/06/29 18:39:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4PlacedSolid.hh b/source/geometry/solids/BREPS/include/G4PlacedSolid.hh index a5f229b6ac..dac96f5fe6 100644 --- a/source/geometry/solids/BREPS/include/G4PlacedSolid.hh +++ b/source/geometry/solids/BREPS/include/G4PlacedSolid.hh @@ -25,7 +25,7 @@ // // // $Id: G4PlacedSolid.hh,v 1.10 2006/06/29 18:39:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4PlacedSolid diff --git a/source/geometry/solids/BREPS/include/G4PlacedSolid.icc b/source/geometry/solids/BREPS/include/G4PlacedSolid.icc index 1c37407d1b..538d65b0e2 100644 --- a/source/geometry/solids/BREPS/include/G4PlacedSolid.icc +++ b/source/geometry/solids/BREPS/include/G4PlacedSolid.icc @@ -25,7 +25,7 @@ // // // $Id: G4PlacedSolid.icc,v 1.8 2006/06/29 18:40:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4PlacementVector.hh b/source/geometry/solids/BREPS/include/G4PlacementVector.hh index 1c78c9edc1..4f8efab486 100644 --- a/source/geometry/solids/BREPS/include/G4PlacementVector.hh +++ b/source/geometry/solids/BREPS/include/G4PlacementVector.hh @@ -25,7 +25,7 @@ // // // $Id: G4PlacementVector.hh,v 1.7 2006/06/29 18:40:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4PlacementVector diff --git a/source/geometry/solids/BREPS/include/G4Plane.hh b/source/geometry/solids/BREPS/include/G4Plane.hh index abc5c578e2..6bf7324498 100644 --- a/source/geometry/solids/BREPS/include/G4Plane.hh +++ b/source/geometry/solids/BREPS/include/G4Plane.hh @@ -25,7 +25,7 @@ // // // $Id: G4Plane.hh,v 1.6 2006/06/29 18:40:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4Plane diff --git a/source/geometry/solids/BREPS/include/G4Point3DVector.hh b/source/geometry/solids/BREPS/include/G4Point3DVector.hh index 64f6691b01..73f385428f 100644 --- a/source/geometry/solids/BREPS/include/G4Point3DVector.hh +++ b/source/geometry/solids/BREPS/include/G4Point3DVector.hh @@ -25,7 +25,7 @@ // // // $Id: G4Point3DVector.hh,v 1.8 2006/06/29 18:40:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4Point3DVector diff --git a/source/geometry/solids/BREPS/include/G4PointRat.hh b/source/geometry/solids/BREPS/include/G4PointRat.hh index ea0ca576d1..231890f900 100644 --- a/source/geometry/solids/BREPS/include/G4PointRat.hh +++ b/source/geometry/solids/BREPS/include/G4PointRat.hh @@ -25,7 +25,7 @@ // // // $Id: G4PointRat.hh,v 1.10 2006/06/29 18:40:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4PointRat diff --git a/source/geometry/solids/BREPS/include/G4PointRat.icc b/source/geometry/solids/BREPS/include/G4PointRat.icc index 65fc8d5076..0af2b2c735 100644 --- a/source/geometry/solids/BREPS/include/G4PointRat.icc +++ b/source/geometry/solids/BREPS/include/G4PointRat.icc @@ -25,7 +25,7 @@ // // // $Id: G4PointRat.icc,v 1.4 2006/06/29 18:40:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4ProjectedSurface.hh b/source/geometry/solids/BREPS/include/G4ProjectedSurface.hh index f7a2d67673..7520e8ead3 100644 --- a/source/geometry/solids/BREPS/include/G4ProjectedSurface.hh +++ b/source/geometry/solids/BREPS/include/G4ProjectedSurface.hh @@ -25,7 +25,7 @@ // // // $Id: G4ProjectedSurface.hh,v 1.7 2006/06/29 18:40:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4ProjectedSurface diff --git a/source/geometry/solids/BREPS/include/G4ProjectedSurface.icc b/source/geometry/solids/BREPS/include/G4ProjectedSurface.icc index d7d1e1d8cd..39c777b5ac 100644 --- a/source/geometry/solids/BREPS/include/G4ProjectedSurface.icc +++ b/source/geometry/solids/BREPS/include/G4ProjectedSurface.icc @@ -25,7 +25,7 @@ // // // $Id: G4ProjectedSurface.icc,v 1.5 2006/06/29 18:40:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4Ray.hh b/source/geometry/solids/BREPS/include/G4Ray.hh index ad3360d230..555f0c8459 100644 --- a/source/geometry/solids/BREPS/include/G4Ray.hh +++ b/source/geometry/solids/BREPS/include/G4Ray.hh @@ -25,7 +25,7 @@ // // // $Id: G4Ray.hh,v 1.9 2006/06/29 18:40:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4Ray diff --git a/source/geometry/solids/BREPS/include/G4Ray.icc b/source/geometry/solids/BREPS/include/G4Ray.icc index c45212b5aa..be9c8189be 100644 --- a/source/geometry/solids/BREPS/include/G4Ray.icc +++ b/source/geometry/solids/BREPS/include/G4Ray.icc @@ -25,7 +25,7 @@ // // // $Id: G4Ray.icc,v 1.7 2006/06/29 18:40:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4RectangularTrimmedSurface.hh b/source/geometry/solids/BREPS/include/G4RectangularTrimmedSurface.hh index 5aa875eaf7..1e65ff7ee9 100644 --- a/source/geometry/solids/BREPS/include/G4RectangularTrimmedSurface.hh +++ b/source/geometry/solids/BREPS/include/G4RectangularTrimmedSurface.hh @@ -25,7 +25,7 @@ // // // $Id: G4RectangularTrimmedSurface.hh,v 1.8 2006/06/29 18:40:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4BezierSurface diff --git a/source/geometry/solids/BREPS/include/G4STEPEntity.hh b/source/geometry/solids/BREPS/include/G4STEPEntity.hh index ac68a79e2a..9cfc0d3790 100644 --- a/source/geometry/solids/BREPS/include/G4STEPEntity.hh +++ b/source/geometry/solids/BREPS/include/G4STEPEntity.hh @@ -25,7 +25,7 @@ // // // $Id: G4STEPEntity.hh,v 1.7 2006/06/29 18:40:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4STEPEntity diff --git a/source/geometry/solids/BREPS/include/G4Sort.hh b/source/geometry/solids/BREPS/include/G4Sort.hh index 4bf2d83686..44cd4d98be 100644 --- a/source/geometry/solids/BREPS/include/G4Sort.hh +++ b/source/geometry/solids/BREPS/include/G4Sort.hh @@ -25,7 +25,7 @@ // // // $Id: G4Sort.hh,v 1.5 2006/06/29 18:40:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // diff --git a/source/geometry/solids/BREPS/include/G4SphericalSurface.hh b/source/geometry/solids/BREPS/include/G4SphericalSurface.hh index 66fb1d93a4..bef784538c 100644 --- a/source/geometry/solids/BREPS/include/G4SphericalSurface.hh +++ b/source/geometry/solids/BREPS/include/G4SphericalSurface.hh @@ -25,7 +25,7 @@ // // // $Id: G4SphericalSurface.hh,v 1.10 2006/06/29 18:40:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4SphericalSurface diff --git a/source/geometry/solids/BREPS/include/G4SphericalSurface.icc b/source/geometry/solids/BREPS/include/G4SphericalSurface.icc index 4604470f00..df2454115e 100644 --- a/source/geometry/solids/BREPS/include/G4SphericalSurface.icc +++ b/source/geometry/solids/BREPS/include/G4SphericalSurface.icc @@ -25,7 +25,7 @@ // // // $Id: G4SphericalSurface.icc,v 1.4 2006/06/29 18:40:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4Surface.hh b/source/geometry/solids/BREPS/include/G4Surface.hh index 8b0fd59914..146c73dca2 100644 --- a/source/geometry/solids/BREPS/include/G4Surface.hh +++ b/source/geometry/solids/BREPS/include/G4Surface.hh @@ -25,7 +25,7 @@ // // // $Id: G4Surface.hh,v 1.9 2006/06/29 18:40:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4Surface diff --git a/source/geometry/solids/BREPS/include/G4Surface.icc b/source/geometry/solids/BREPS/include/G4Surface.icc index 66b8dd6ab8..ca223860b7 100644 --- a/source/geometry/solids/BREPS/include/G4Surface.icc +++ b/source/geometry/solids/BREPS/include/G4Surface.icc @@ -25,7 +25,7 @@ // // // $Id: G4Surface.icc,v 1.5 2006/06/29 18:40:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4SurfaceBoundary.hh b/source/geometry/solids/BREPS/include/G4SurfaceBoundary.hh index 44b64f72c1..5a030a54d1 100644 --- a/source/geometry/solids/BREPS/include/G4SurfaceBoundary.hh +++ b/source/geometry/solids/BREPS/include/G4SurfaceBoundary.hh @@ -25,7 +25,7 @@ // // // $Id: G4SurfaceBoundary.hh,v 1.8 2006/06/29 18:40:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4SurfaceBoundary diff --git a/source/geometry/solids/BREPS/include/G4SurfaceBoundary.icc b/source/geometry/solids/BREPS/include/G4SurfaceBoundary.icc index 4a29c2f580..db4e3e8114 100644 --- a/source/geometry/solids/BREPS/include/G4SurfaceBoundary.icc +++ b/source/geometry/solids/BREPS/include/G4SurfaceBoundary.icc @@ -25,7 +25,7 @@ // // // $Id: G4SurfaceBoundary.icc,v 1.5 2006/06/29 18:40:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4SurfaceList.hh b/source/geometry/solids/BREPS/include/G4SurfaceList.hh index 921ab90c79..9859801593 100644 --- a/source/geometry/solids/BREPS/include/G4SurfaceList.hh +++ b/source/geometry/solids/BREPS/include/G4SurfaceList.hh @@ -25,7 +25,7 @@ // // // $Id: G4SurfaceList.hh,v 1.6 2006/06/29 18:40:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4SurfaceList diff --git a/source/geometry/solids/BREPS/include/G4SurfaceOfLinearExtrusion.hh b/source/geometry/solids/BREPS/include/G4SurfaceOfLinearExtrusion.hh index a22bd741f6..c2e8c1130d 100644 --- a/source/geometry/solids/BREPS/include/G4SurfaceOfLinearExtrusion.hh +++ b/source/geometry/solids/BREPS/include/G4SurfaceOfLinearExtrusion.hh @@ -25,7 +25,7 @@ // // // $Id: G4SurfaceOfLinearExtrusion.hh,v 1.5 2006/06/29 18:40:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4SurfaceOfLinearExtrusion diff --git a/source/geometry/solids/BREPS/include/G4SurfaceOfRevolution.hh b/source/geometry/solids/BREPS/include/G4SurfaceOfRevolution.hh index 7d7e10ea30..7dccfac2a9 100644 --- a/source/geometry/solids/BREPS/include/G4SurfaceOfRevolution.hh +++ b/source/geometry/solids/BREPS/include/G4SurfaceOfRevolution.hh @@ -25,7 +25,7 @@ // // // $Id: G4SurfaceOfRevolution.hh,v 1.5 2006/06/29 18:40:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4SurfaceOfRevolution diff --git a/source/geometry/solids/BREPS/include/G4ThreeMat.hh b/source/geometry/solids/BREPS/include/G4ThreeMat.hh index 3d7b52cc5e..6abdd80e3d 100644 --- a/source/geometry/solids/BREPS/include/G4ThreeMat.hh +++ b/source/geometry/solids/BREPS/include/G4ThreeMat.hh @@ -25,7 +25,7 @@ // // // $Id: G4ThreeMat.hh,v 1.10 2006/06/29 18:40:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4ThreeMat diff --git a/source/geometry/solids/BREPS/include/G4ToroidalSurface.hh b/source/geometry/solids/BREPS/include/G4ToroidalSurface.hh index d9c2ce3271..c33333aafa 100644 --- a/source/geometry/solids/BREPS/include/G4ToroidalSurface.hh +++ b/source/geometry/solids/BREPS/include/G4ToroidalSurface.hh @@ -25,7 +25,7 @@ // // // $Id: G4ToroidalSurface.hh,v 1.7 2006/06/29 18:41:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4ToroidalSurface diff --git a/source/geometry/solids/BREPS/include/G4ToroidalSurface.icc b/source/geometry/solids/BREPS/include/G4ToroidalSurface.icc index 97b3f8173f..78e1e8a683 100644 --- a/source/geometry/solids/BREPS/include/G4ToroidalSurface.icc +++ b/source/geometry/solids/BREPS/include/G4ToroidalSurface.icc @@ -25,7 +25,7 @@ // // // $Id: G4ToroidalSurface.icc,v 1.4 2006/06/29 18:41:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/BREPS/include/G4UVHit.hh b/source/geometry/solids/BREPS/include/G4UVHit.hh index 6ef17af7c7..4c734610db 100644 --- a/source/geometry/solids/BREPS/include/G4UVHit.hh +++ b/source/geometry/solids/BREPS/include/G4UVHit.hh @@ -25,7 +25,7 @@ // // // $Id: G4UVHit.hh,v 1.7 2006/06/29 18:41:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4UVHit diff --git a/source/geometry/solids/BREPS/src/G4Assembly.cc b/source/geometry/solids/BREPS/src/G4Assembly.cc index b5750d2d86..22c0b4f0ac 100644 --- a/source/geometry/solids/BREPS/src/G4Assembly.cc +++ b/source/geometry/solids/BREPS/src/G4Assembly.cc @@ -25,7 +25,7 @@ // // // $Id: G4Assembly.cc,v 1.6 2006/06/29 18:41:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4Axis2Placement3D.cc b/source/geometry/solids/BREPS/src/G4Axis2Placement3D.cc index 6555370093..475e11ad0c 100644 --- a/source/geometry/solids/BREPS/src/G4Axis2Placement3D.cc +++ b/source/geometry/solids/BREPS/src/G4Axis2Placement3D.cc @@ -25,7 +25,7 @@ // // // $Id: G4Axis2Placement3D.cc,v 1.9 2006/06/29 18:41:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4BREPSolid.cc b/source/geometry/solids/BREPS/src/G4BREPSolid.cc index b7cfde1064..fa6ac5522d 100644 --- a/source/geometry/solids/BREPS/src/G4BREPSolid.cc +++ b/source/geometry/solids/BREPS/src/G4BREPSolid.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4BREPSolid.cc,v 1.35 2006/06/29 18:41:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4BREPSolid.cc,v 1.36 2006/10/19 15:35:36 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file @@ -55,8 +55,8 @@ G4BREPSolid::G4BREPSolid(const G4String& name) Box(0), Convex(0), AxisBox(0), PlaneSolid(0), place(0), bbox(0), intersectionDistance(kInfinity), active(1), startInside(0), nb_of_surfaces(0), SurfaceVec(0), solidname(name), - fCubVolStatistics(1000000), fCubVolEpsilon(0.001), fCubicVolume(0.), - fpPolyhedron(0) + fStatistics(1000000), fCubVolEpsilon(0.001), fAreaAccuracy(-1.), + fCubicVolume(0.), fSurfaceArea(0.), fpPolyhedron(0) { } @@ -67,8 +67,8 @@ G4BREPSolid::G4BREPSolid( const G4String& name , Box(0), Convex(0), AxisBox(0), PlaneSolid(0), place(0), bbox(0), intersectionDistance(kInfinity), active(1), startInside(0), nb_of_surfaces(numberOfSrfs), SurfaceVec(srfVec), - fCubVolStatistics(1000000), fCubVolEpsilon(0.001), fCubicVolume(0.), - fpPolyhedron(0) + fStatistics(1000000), fCubVolEpsilon(0.001), fAreaAccuracy(-1.), + fCubicVolume(0.), fSurfaceArea(0.), fpPolyhedron(0) { Initialize(); } @@ -78,8 +78,8 @@ G4BREPSolid::G4BREPSolid( __void__& a ) Box(0), Convex(0), AxisBox(0), PlaneSolid(0), place(0), bbox(0), intersectionDistance(kInfinity), active(1), startInside(0), nb_of_surfaces(0), SurfaceVec(0), - fCubVolStatistics(1000000), fCubVolEpsilon(0.001), fCubicVolume(0.), - fpPolyhedron(0) + fStatistics(1000000), fCubVolEpsilon(0.001), fAreaAccuracy(-1.), + fCubicVolume(0.), fSurfaceArea(0.), fpPolyhedron(0) { } diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidBox.cc b/source/geometry/solids/BREPS/src/G4BREPSolidBox.cc index 4cb9279b3f..b43c79b825 100644 --- a/source/geometry/solids/BREPS/src/G4BREPSolidBox.cc +++ b/source/geometry/solids/BREPS/src/G4BREPSolidBox.cc @@ -25,7 +25,7 @@ // // // $Id: G4BREPSolidBox.cc,v 1.10 2006/06/29 18:41:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidCone.cc b/source/geometry/solids/BREPS/src/G4BREPSolidCone.cc index 5bd95cd17b..60a5b9cc77 100644 --- a/source/geometry/solids/BREPS/src/G4BREPSolidCone.cc +++ b/source/geometry/solids/BREPS/src/G4BREPSolidCone.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4BREPSolidCone.cc,v 1.15 2006/06/29 18:41:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidCylinder.cc b/source/geometry/solids/BREPS/src/G4BREPSolidCylinder.cc index c9187aa6e6..5f4768f52d 100644 --- a/source/geometry/solids/BREPS/src/G4BREPSolidCylinder.cc +++ b/source/geometry/solids/BREPS/src/G4BREPSolidCylinder.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4BREPSolidCylinder.cc,v 1.11 2006/06/29 18:41:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidOpenPCone.cc b/source/geometry/solids/BREPS/src/G4BREPSolidOpenPCone.cc index 14624f06c6..a2ec609141 100644 --- a/source/geometry/solids/BREPS/src/G4BREPSolidOpenPCone.cc +++ b/source/geometry/solids/BREPS/src/G4BREPSolidOpenPCone.cc @@ -25,7 +25,7 @@ // // // $Id: G4BREPSolidOpenPCone.cc,v 1.11 2006/06/29 18:41:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidPCone.cc b/source/geometry/solids/BREPS/src/G4BREPSolidPCone.cc index 416bd1b01f..f0c2aea5c2 100644 --- a/source/geometry/solids/BREPS/src/G4BREPSolidPCone.cc +++ b/source/geometry/solids/BREPS/src/G4BREPSolidPCone.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4BREPSolidPCone.cc,v 1.38 2006/06/29 18:41:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidPolyhedra.cc b/source/geometry/solids/BREPS/src/G4BREPSolidPolyhedra.cc index b0e902281c..8e12d3cd48 100644 --- a/source/geometry/solids/BREPS/src/G4BREPSolidPolyhedra.cc +++ b/source/geometry/solids/BREPS/src/G4BREPSolidPolyhedra.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4BREPSolidPolyhedra.cc,v 1.34 2006/06/29 18:41:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidSphere.cc b/source/geometry/solids/BREPS/src/G4BREPSolidSphere.cc index 20e3b9aff8..02b8f51fe0 100644 --- a/source/geometry/solids/BREPS/src/G4BREPSolidSphere.cc +++ b/source/geometry/solids/BREPS/src/G4BREPSolidSphere.cc @@ -25,7 +25,7 @@ // // // $Id: G4BREPSolidSphere.cc,v 1.11 2006/06/29 18:41:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidTorus.cc b/source/geometry/solids/BREPS/src/G4BREPSolidTorus.cc index db9253ba57..9f29be242c 100644 --- a/source/geometry/solids/BREPS/src/G4BREPSolidTorus.cc +++ b/source/geometry/solids/BREPS/src/G4BREPSolidTorus.cc @@ -25,7 +25,7 @@ // // // $Id: G4BREPSolidTorus.cc,v 1.9 2006/06/29 18:41:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4BSplineCurve.cc b/source/geometry/solids/BREPS/src/G4BSplineCurve.cc index e1ed8c254f..23f06d0b91 100644 --- a/source/geometry/solids/BREPS/src/G4BSplineCurve.cc +++ b/source/geometry/solids/BREPS/src/G4BSplineCurve.cc @@ -25,7 +25,7 @@ // // // $Id: G4BSplineCurve.cc,v 1.12 2006/06/29 18:41:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4BSplineCurveWithKnots.cc b/source/geometry/solids/BREPS/src/G4BSplineCurveWithKnots.cc index 8a0f52665a..474ca862d9 100644 --- a/source/geometry/solids/BREPS/src/G4BSplineCurveWithKnots.cc +++ b/source/geometry/solids/BREPS/src/G4BSplineCurveWithKnots.cc @@ -25,7 +25,7 @@ // // // $Id: G4BSplineCurveWithKnots.cc,v 1.5 2006/06/29 18:41:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4BSplineSurface.cc b/source/geometry/solids/BREPS/src/G4BSplineSurface.cc index 4f8dc19d53..63b1a5a956 100644 --- a/source/geometry/solids/BREPS/src/G4BSplineSurface.cc +++ b/source/geometry/solids/BREPS/src/G4BSplineSurface.cc @@ -25,7 +25,7 @@ // // // $Id: G4BSplineSurface.cc,v 1.14 2006/06/29 18:41:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4BSplineSurfaceWithKnots.cc b/source/geometry/solids/BREPS/src/G4BSplineSurfaceWithKnots.cc index 9f1e86d19e..1b9e81d092 100644 --- a/source/geometry/solids/BREPS/src/G4BSplineSurfaceWithKnots.cc +++ b/source/geometry/solids/BREPS/src/G4BSplineSurfaceWithKnots.cc @@ -25,7 +25,7 @@ // // // $Id: G4BSplineSurfaceWithKnots.cc,v 1.4 2006/06/29 18:41:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4BezierSurface.cc b/source/geometry/solids/BREPS/src/G4BezierSurface.cc index b644112b3e..3ee079c49e 100644 --- a/source/geometry/solids/BREPS/src/G4BezierSurface.cc +++ b/source/geometry/solids/BREPS/src/G4BezierSurface.cc @@ -25,7 +25,7 @@ // // // $Id: G4BezierSurface.cc,v 1.9 2006/06/29 18:41:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4BoundingBox3D.cc b/source/geometry/solids/BREPS/src/G4BoundingBox3D.cc index 6d3373f182..d8cc092638 100644 --- a/source/geometry/solids/BREPS/src/G4BoundingBox3D.cc +++ b/source/geometry/solids/BREPS/src/G4BoundingBox3D.cc @@ -25,7 +25,7 @@ // // // $Id: G4BoundingBox3D.cc,v 1.10 2006/06/29 18:41:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4CircularCurve.cc b/source/geometry/solids/BREPS/src/G4CircularCurve.cc index 3761a8b85f..a4a6041ec9 100644 --- a/source/geometry/solids/BREPS/src/G4CircularCurve.cc +++ b/source/geometry/solids/BREPS/src/G4CircularCurve.cc @@ -25,7 +25,7 @@ // // // $Id: G4CircularCurve.cc,v 1.10 2006/06/29 18:41:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4CompositeCurve.cc b/source/geometry/solids/BREPS/src/G4CompositeCurve.cc index 74ddb93c1a..1e2c194b36 100644 --- a/source/geometry/solids/BREPS/src/G4CompositeCurve.cc +++ b/source/geometry/solids/BREPS/src/G4CompositeCurve.cc @@ -25,7 +25,7 @@ // // // $Id: G4CompositeCurve.cc,v 1.13 2006/06/29 18:41:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4Conic.cc b/source/geometry/solids/BREPS/src/G4Conic.cc index fa2fed74c3..fb05b6d1e1 100644 --- a/source/geometry/solids/BREPS/src/G4Conic.cc +++ b/source/geometry/solids/BREPS/src/G4Conic.cc @@ -25,7 +25,7 @@ // // // $Id: G4Conic.cc,v 1.8 2006/06/29 18:41:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4ConicalSurface.cc b/source/geometry/solids/BREPS/src/G4ConicalSurface.cc index d0dc0493cf..08c5331221 100644 --- a/source/geometry/solids/BREPS/src/G4ConicalSurface.cc +++ b/source/geometry/solids/BREPS/src/G4ConicalSurface.cc @@ -25,7 +25,7 @@ // // // $Id: G4ConicalSurface.cc,v 1.11 2006/06/29 18:41:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4ControlPoints.cc b/source/geometry/solids/BREPS/src/G4ControlPoints.cc index 8e1b34b222..9a48ce9d4f 100644 --- a/source/geometry/solids/BREPS/src/G4ControlPoints.cc +++ b/source/geometry/solids/BREPS/src/G4ControlPoints.cc @@ -25,7 +25,7 @@ // // // $Id: G4ControlPoints.cc,v 1.8 2006/06/29 18:42:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4Curve.cc b/source/geometry/solids/BREPS/src/G4Curve.cc index c1cf7d8e87..274cc325fe 100644 --- a/source/geometry/solids/BREPS/src/G4Curve.cc +++ b/source/geometry/solids/BREPS/src/G4Curve.cc @@ -25,7 +25,7 @@ // // // $Id: G4Curve.cc,v 1.7 2006/06/29 18:42:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4CurvePoint.cc b/source/geometry/solids/BREPS/src/G4CurvePoint.cc index 99fe157da7..f5658efe7c 100644 --- a/source/geometry/solids/BREPS/src/G4CurvePoint.cc +++ b/source/geometry/solids/BREPS/src/G4CurvePoint.cc @@ -25,7 +25,7 @@ // // // $Id: G4CurvePoint.cc,v 1.5 2006/06/29 18:42:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4CurveRayIntersection.cc b/source/geometry/solids/BREPS/src/G4CurveRayIntersection.cc index 24707cdb4e..960a5f7a5a 100644 --- a/source/geometry/solids/BREPS/src/G4CurveRayIntersection.cc +++ b/source/geometry/solids/BREPS/src/G4CurveRayIntersection.cc @@ -25,7 +25,7 @@ // // // $Id: G4CurveRayIntersection.cc,v 1.6 2006/06/29 18:42:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4CylindricalSurface.cc b/source/geometry/solids/BREPS/src/G4CylindricalSurface.cc index d6bae5c115..3b88e55377 100644 --- a/source/geometry/solids/BREPS/src/G4CylindricalSurface.cc +++ b/source/geometry/solids/BREPS/src/G4CylindricalSurface.cc @@ -25,7 +25,7 @@ // // // $Id: G4CylindricalSurface.cc,v 1.8 2006/06/29 18:42:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4Ellipse.cc b/source/geometry/solids/BREPS/src/G4Ellipse.cc index 1778ca860b..d7b718b1ba 100644 --- a/source/geometry/solids/BREPS/src/G4Ellipse.cc +++ b/source/geometry/solids/BREPS/src/G4Ellipse.cc @@ -25,7 +25,7 @@ // // // $Id: G4Ellipse.cc,v 1.11 2006/06/29 18:42:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4FConicalSurface.cc b/source/geometry/solids/BREPS/src/G4FConicalSurface.cc index 0c137998cb..9e468f37c4 100644 --- a/source/geometry/solids/BREPS/src/G4FConicalSurface.cc +++ b/source/geometry/solids/BREPS/src/G4FConicalSurface.cc @@ -25,7 +25,7 @@ // // // $Id: G4FConicalSurface.cc,v 1.19 2006/06/29 18:42:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4FCylindricalSurface.cc b/source/geometry/solids/BREPS/src/G4FCylindricalSurface.cc index 394d8c454f..01fcdb42a2 100644 --- a/source/geometry/solids/BREPS/src/G4FCylindricalSurface.cc +++ b/source/geometry/solids/BREPS/src/G4FCylindricalSurface.cc @@ -25,7 +25,7 @@ // // // $Id: G4FCylindricalSurface.cc,v 1.16 2006/06/29 18:42:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4FPlane.cc b/source/geometry/solids/BREPS/src/G4FPlane.cc index 39d68ce41c..fc8f615ceb 100644 --- a/source/geometry/solids/BREPS/src/G4FPlane.cc +++ b/source/geometry/solids/BREPS/src/G4FPlane.cc @@ -25,7 +25,7 @@ // // // $Id: G4FPlane.cc,v 1.16 2006/06/29 18:42:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4Hyperbola.cc b/source/geometry/solids/BREPS/src/G4Hyperbola.cc index 7d4dfcdbf6..35b00921ed 100644 --- a/source/geometry/solids/BREPS/src/G4Hyperbola.cc +++ b/source/geometry/solids/BREPS/src/G4Hyperbola.cc @@ -25,7 +25,7 @@ // // // $Id: G4Hyperbola.cc,v 1.11 2006/06/29 18:42:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4KnotVector.cc b/source/geometry/solids/BREPS/src/G4KnotVector.cc index f58115d2c7..1e6ebfdc81 100644 --- a/source/geometry/solids/BREPS/src/G4KnotVector.cc +++ b/source/geometry/solids/BREPS/src/G4KnotVector.cc @@ -25,7 +25,7 @@ // // // $Id: G4KnotVector.cc,v 1.8 2006/06/29 18:42:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4Line.cc b/source/geometry/solids/BREPS/src/G4Line.cc index 38efc7fb71..c9fe2a54f9 100644 --- a/source/geometry/solids/BREPS/src/G4Line.cc +++ b/source/geometry/solids/BREPS/src/G4Line.cc @@ -25,7 +25,7 @@ // // // $Id: G4Line.cc,v 1.10 2006/06/29 18:42:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4OsloMatrix.cc b/source/geometry/solids/BREPS/src/G4OsloMatrix.cc index 9709aa251d..767ef380bb 100644 --- a/source/geometry/solids/BREPS/src/G4OsloMatrix.cc +++ b/source/geometry/solids/BREPS/src/G4OsloMatrix.cc @@ -25,7 +25,7 @@ // // // $Id: G4OsloMatrix.cc,v 1.6 2006/06/29 18:42:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4Parabola.cc b/source/geometry/solids/BREPS/src/G4Parabola.cc index 1e7847d043..737872c9fd 100644 --- a/source/geometry/solids/BREPS/src/G4Parabola.cc +++ b/source/geometry/solids/BREPS/src/G4Parabola.cc @@ -25,7 +25,7 @@ // // // $Id: G4Parabola.cc,v 1.8 2006/06/29 18:42:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4PlacedSolid.cc b/source/geometry/solids/BREPS/src/G4PlacedSolid.cc index 8679f89373..9c1ee0e3df 100644 --- a/source/geometry/solids/BREPS/src/G4PlacedSolid.cc +++ b/source/geometry/solids/BREPS/src/G4PlacedSolid.cc @@ -25,7 +25,7 @@ // // // $Id: G4PlacedSolid.cc,v 1.5 2006/06/29 18:42:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4PointRat.cc b/source/geometry/solids/BREPS/src/G4PointRat.cc index 1f4130e10f..1a884556ee 100644 --- a/source/geometry/solids/BREPS/src/G4PointRat.cc +++ b/source/geometry/solids/BREPS/src/G4PointRat.cc @@ -25,7 +25,7 @@ // // // $Id: G4PointRat.cc,v 1.6 2006/06/29 18:42:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4ProjectedSurface.cc b/source/geometry/solids/BREPS/src/G4ProjectedSurface.cc index 29ea5633a8..9a58eb29f0 100644 --- a/source/geometry/solids/BREPS/src/G4ProjectedSurface.cc +++ b/source/geometry/solids/BREPS/src/G4ProjectedSurface.cc @@ -25,7 +25,7 @@ // // // $Id: G4ProjectedSurface.cc,v 1.11 2006/06/29 18:42:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4Ray.cc b/source/geometry/solids/BREPS/src/G4Ray.cc index b2e588a50b..b0f35afb88 100644 --- a/source/geometry/solids/BREPS/src/G4Ray.cc +++ b/source/geometry/solids/BREPS/src/G4Ray.cc @@ -25,7 +25,7 @@ // // // $Id: G4Ray.cc,v 1.11 2006/06/29 18:42:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4RectangularTrimmedSurface.cc b/source/geometry/solids/BREPS/src/G4RectangularTrimmedSurface.cc index 1ca11872a6..b9899d902d 100644 --- a/source/geometry/solids/BREPS/src/G4RectangularTrimmedSurface.cc +++ b/source/geometry/solids/BREPS/src/G4RectangularTrimmedSurface.cc @@ -25,7 +25,7 @@ // // // $Id: G4RectangularTrimmedSurface.cc,v 1.7 2006/06/29 18:42:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4Sort.cc b/source/geometry/solids/BREPS/src/G4Sort.cc index b04ce60a09..0b1f86ed5b 100644 --- a/source/geometry/solids/BREPS/src/G4Sort.cc +++ b/source/geometry/solids/BREPS/src/G4Sort.cc @@ -25,7 +25,7 @@ // // // $Id: G4Sort.cc,v 1.5 2006/06/29 18:42:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 source file diff --git a/source/geometry/solids/BREPS/src/G4SphericalSurface.cc b/source/geometry/solids/BREPS/src/G4SphericalSurface.cc index 61ff3aeb98..15a8735445 100644 --- a/source/geometry/solids/BREPS/src/G4SphericalSurface.cc +++ b/source/geometry/solids/BREPS/src/G4SphericalSurface.cc @@ -25,7 +25,7 @@ // // // $Id: G4SphericalSurface.cc,v 1.10 2006/06/29 18:42:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4Surface.cc b/source/geometry/solids/BREPS/src/G4Surface.cc index c4eb0576af..32e05fb8e8 100644 --- a/source/geometry/solids/BREPS/src/G4Surface.cc +++ b/source/geometry/solids/BREPS/src/G4Surface.cc @@ -25,7 +25,7 @@ // // // $Id: G4Surface.cc,v 1.15 2006/06/29 18:42:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4SurfaceBoundary.cc b/source/geometry/solids/BREPS/src/G4SurfaceBoundary.cc index 8c2f5c1487..69840919fa 100644 --- a/source/geometry/solids/BREPS/src/G4SurfaceBoundary.cc +++ b/source/geometry/solids/BREPS/src/G4SurfaceBoundary.cc @@ -25,7 +25,7 @@ // // // $Id: G4SurfaceBoundary.cc,v 1.14 2006/06/29 18:42:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4SurfaceList.cc b/source/geometry/solids/BREPS/src/G4SurfaceList.cc index aff8b7ddd8..292e6d3af0 100644 --- a/source/geometry/solids/BREPS/src/G4SurfaceList.cc +++ b/source/geometry/solids/BREPS/src/G4SurfaceList.cc @@ -25,7 +25,7 @@ // // // $Id: G4SurfaceList.cc,v 1.7 2006/06/29 18:42:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4SurfaceOfLinearExtrusion.cc b/source/geometry/solids/BREPS/src/G4SurfaceOfLinearExtrusion.cc index 87fe322a75..472b792355 100644 --- a/source/geometry/solids/BREPS/src/G4SurfaceOfLinearExtrusion.cc +++ b/source/geometry/solids/BREPS/src/G4SurfaceOfLinearExtrusion.cc @@ -25,7 +25,7 @@ // // // $Id: G4SurfaceOfLinearExtrusion.cc,v 1.4 2006/06/29 18:42:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4SurfaceOfRevolution.cc b/source/geometry/solids/BREPS/src/G4SurfaceOfRevolution.cc index c0a98e35b3..926815b4ef 100644 --- a/source/geometry/solids/BREPS/src/G4SurfaceOfRevolution.cc +++ b/source/geometry/solids/BREPS/src/G4SurfaceOfRevolution.cc @@ -28,7 +28,7 @@ // and all its terms. // // $Id: G4SurfaceOfRevolution.cc,v 1.4 2006/06/29 18:42:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4ThreeMat.cc b/source/geometry/solids/BREPS/src/G4ThreeMat.cc index a3348124d4..91e89c49c0 100644 --- a/source/geometry/solids/BREPS/src/G4ThreeMat.cc +++ b/source/geometry/solids/BREPS/src/G4ThreeMat.cc @@ -25,7 +25,7 @@ // // // $Id: G4ThreeMat.cc,v 1.8 2006/06/29 18:42:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/BREPS/src/G4ToroidalSurface.cc b/source/geometry/solids/BREPS/src/G4ToroidalSurface.cc index d621ac893a..afa506ddb8 100644 --- a/source/geometry/solids/BREPS/src/G4ToroidalSurface.cc +++ b/source/geometry/solids/BREPS/src/G4ToroidalSurface.cc @@ -25,7 +25,7 @@ // // // $Id: G4ToroidalSurface.cc,v 1.10 2006/06/29 18:42:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/geometry/solids/Boolean/History b/source/geometry/solids/Boolean/History index 82d1e52dbc..e36055b58e 100644 --- a/source/geometry/solids/Boolean/History +++ b/source/geometry/solids/Boolean/History @@ -1,5 +1,5 @@ -$Id: History,v 1.56 2006/05/03 10:33:28 gcosmo Exp $ +$Id: History,v 1.60 2006/11/08 09:39:37 gcosmo Exp $ ------------------------------------------------------------------- ========================================================= @@ -20,6 +20,22 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- + Nov 08, 2006 G.Cosmo geom-bool-V08-01-02 + - Fixed compilation problems on SUN-CC for changes in the last tag. + Added inclusion of header in G4IntersectionSolid.cc and + G4UnionSolid.cc. + + Nov 06, 2006 J.Allison geom-bool-V08-01-01 + - G4IntersectionSolid, G4SubtractionSolid, G4UnionSolid: + fixed CreatePolyhedron() for case of component that does + not have a G4Polyhedron representation. + - Added checks for point on boolean surface to unit tests + testG4DisplacedSolid and testG4SubtractionSolid (V.Grichine). + + Oct 19, 2006 G.Cosmo geom-bool-V08-01-00 + - Added GetSurfaceArea() method, accessors and modifiers to base class + G4BooleanSolid, implementing the caching mechanism as for volumes. + May 03, 2006 V.Grichine geom-bool-V08-00-00 - Fix in G4IntersectionSolid::CalculateExtent() for the correctly handling extent computation for nested intersections and always respect the rule diff --git a/source/geometry/solids/Boolean/include/G4BooleanSolid.hh b/source/geometry/solids/Boolean/include/G4BooleanSolid.hh index eaec357af4..37672bc924 100644 --- a/source/geometry/solids/Boolean/include/G4BooleanSolid.hh +++ b/source/geometry/solids/Boolean/include/G4BooleanSolid.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4BooleanSolid.hh,v 1.14 2006/06/29 18:43:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4BooleanSolid.hh,v 1.15 2006/10/19 15:34:49 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4BooleanSolid @@ -78,8 +78,10 @@ class G4BooleanSolid : public G4VSolid // return the corresponding solid (for no=0 and 1). // If the solid is not a "Boolean", return 0. - virtual G4GeometryType GetEntityType() const; inline G4double GetCubicVolume(); + inline G4double GetSurfaceArea(); + + virtual G4GeometryType GetEntityType() const; virtual G4Polyhedron* GetPolyhedron () const; std::ostream& StreamInfo(std::ostream& os) const; @@ -88,6 +90,12 @@ class G4BooleanSolid : public G4VSolid inline G4double GetCubVolEpsilon() const; inline void SetCubVolStatistics(G4int st); inline void SetCubVolEpsilon(G4double ep); + + inline G4int GetAreaStatistics() const; + inline G4double GetAreaAccuracy() const; + inline void SetAreaStatistics(G4int st); + inline void SetAreaAccuracy(G4double ep); + G4ThreeVector GetPointOnSurface() const; public: // without description @@ -110,9 +118,12 @@ class G4BooleanSolid : public G4VSolid private: - G4int fCubVolStatistics; + G4int fStatistics; G4double fCubVolEpsilon; + G4double fAreaAccuracy; G4double fCubicVolume; + G4double fSurfaceArea; + mutable G4Polyhedron* fpPolyhedron; G4bool createdDisplacedSolid; diff --git a/source/geometry/solids/Boolean/include/G4BooleanSolid.icc b/source/geometry/solids/Boolean/include/G4BooleanSolid.icc index 6d33b08bab..2d82b25c10 100644 --- a/source/geometry/solids/Boolean/include/G4BooleanSolid.icc +++ b/source/geometry/solids/Boolean/include/G4BooleanSolid.icc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4BooleanSolid.icc,v 1.2 2006/06/29 18:43:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4BooleanSolid.icc,v 1.4 2006/10/20 14:20:54 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file @@ -38,7 +38,7 @@ inline G4int G4BooleanSolid::GetCubVolStatistics() const { - return fCubVolStatistics; + return fStatistics; } inline @@ -50,21 +50,55 @@ G4double G4BooleanSolid::GetCubVolEpsilon() const inline void G4BooleanSolid::SetCubVolStatistics(G4int st) { - fCubVolStatistics=st; + fCubicVolume=0.; + fStatistics=st; } inline void G4BooleanSolid::SetCubVolEpsilon(G4double ep) { + fCubicVolume=0.; fCubVolEpsilon=ep; } -/////////////////////////////////////////////////// +inline +G4int G4BooleanSolid::GetAreaStatistics() const +{ + return fStatistics; +} + +inline +G4double G4BooleanSolid::GetAreaAccuracy() const +{ + return fAreaAccuracy; +} + +inline +void G4BooleanSolid::SetAreaStatistics(G4int st) +{ + fSurfaceArea=0.; + fStatistics=st; +} + +inline +void G4BooleanSolid::SetAreaAccuracy(G4double ep) +{ + fSurfaceArea=0.; + fAreaAccuracy=ep; +} inline G4double G4BooleanSolid::GetCubicVolume() { - if(fCubicVolume != 0.) ; - else fCubicVolume = EstimateCubicVolume(fCubVolStatistics,fCubVolEpsilon); + if(fCubicVolume != 0.) {;} + else { fCubicVolume = EstimateCubicVolume(fStatistics,fCubVolEpsilon); } return fCubicVolume; } + +inline +G4double G4BooleanSolid::GetSurfaceArea() +{ + if(fSurfaceArea != 0.) {;} + else { fSurfaceArea = EstimateSurfaceArea(fStatistics,fAreaAccuracy); } + return fSurfaceArea; +} diff --git a/source/geometry/solids/Boolean/include/G4DisplacedSolid.hh b/source/geometry/solids/Boolean/include/G4DisplacedSolid.hh index 016fe14f61..f9f01e2a4c 100644 --- a/source/geometry/solids/Boolean/include/G4DisplacedSolid.hh +++ b/source/geometry/solids/Boolean/include/G4DisplacedSolid.hh @@ -25,7 +25,7 @@ // // // $Id: G4DisplacedSolid.hh,v 1.19 2006/06/29 18:43:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4DisplacedSolid diff --git a/source/geometry/solids/Boolean/include/G4IntersectionSolid.hh b/source/geometry/solids/Boolean/include/G4IntersectionSolid.hh index b0509fa152..489f9751ea 100644 --- a/source/geometry/solids/Boolean/include/G4IntersectionSolid.hh +++ b/source/geometry/solids/Boolean/include/G4IntersectionSolid.hh @@ -25,7 +25,7 @@ // // // $Id: G4IntersectionSolid.hh,v 1.9 2006/06/29 18:43:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4IntersectionSolid diff --git a/source/geometry/solids/Boolean/include/G4SubtractionSolid.hh b/source/geometry/solids/Boolean/include/G4SubtractionSolid.hh index f25b39e761..da476d02c0 100644 --- a/source/geometry/solids/Boolean/include/G4SubtractionSolid.hh +++ b/source/geometry/solids/Boolean/include/G4SubtractionSolid.hh @@ -25,7 +25,7 @@ // // // $Id: G4SubtractionSolid.hh,v 1.9 2006/06/29 18:43:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4SubtractionSolid diff --git a/source/geometry/solids/Boolean/include/G4UnionSolid.hh b/source/geometry/solids/Boolean/include/G4UnionSolid.hh index c522fa93cd..fa54c29bea 100644 --- a/source/geometry/solids/Boolean/include/G4UnionSolid.hh +++ b/source/geometry/solids/Boolean/include/G4UnionSolid.hh @@ -25,7 +25,7 @@ // // // $Id: G4UnionSolid.hh,v 1.10 2006/06/29 18:43:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4UnionSolid diff --git a/source/geometry/solids/Boolean/src/G4BooleanSolid.cc b/source/geometry/solids/Boolean/src/G4BooleanSolid.cc index a696579222..0abccd8f4d 100644 --- a/source/geometry/solids/Boolean/src/G4BooleanSolid.cc +++ b/source/geometry/solids/Boolean/src/G4BooleanSolid.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4BooleanSolid.cc,v 1.20 2006/06/29 18:43:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4BooleanSolid.cc,v 1.21 2006/10/19 15:34:49 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Implementation for the abstract base class for solids created by boolean // operations between other solids @@ -48,8 +48,9 @@ G4BooleanSolid::G4BooleanSolid( const G4String& pName, G4VSolid* pSolidA , G4VSolid* pSolidB ) : - G4VSolid(pName), fCubVolStatistics(1000000), fCubVolEpsilon(0.001), - fCubicVolume(0.), fpPolyhedron(0), createdDisplacedSolid(false) + G4VSolid(pName), fStatistics(1000000), fCubVolEpsilon(0.001), + fAreaAccuracy(-1.), fCubicVolume(0.), fSurfaceArea(0.), + fpPolyhedron(0), createdDisplacedSolid(false) { fPtrSolidA = pSolidA ; fPtrSolidB = pSolidB ; @@ -64,8 +65,9 @@ G4BooleanSolid::G4BooleanSolid( const G4String& pName, G4VSolid* pSolidB , G4RotationMatrix* rotMatrix, const G4ThreeVector& transVector ) : - G4VSolid(pName), fCubVolStatistics(1000000), fCubVolEpsilon(0.001), - fCubicVolume(0.), fpPolyhedron(0), createdDisplacedSolid(true) + G4VSolid(pName), fStatistics(1000000), fCubVolEpsilon(0.001), + fAreaAccuracy(-1.), fCubicVolume(0.), fSurfaceArea(0.), + fpPolyhedron(0), createdDisplacedSolid(true) { fPtrSolidA = pSolidA ; fPtrSolidB = new G4DisplacedSolid("placedB",pSolidB,rotMatrix,transVector) ; @@ -79,8 +81,9 @@ G4BooleanSolid::G4BooleanSolid( const G4String& pName, G4VSolid* pSolidA , G4VSolid* pSolidB , const G4Transform3D& transform ) : - G4VSolid(pName), fCubVolStatistics(1000000), fCubVolEpsilon(0.001), - fCubicVolume(0.), fpPolyhedron(0), createdDisplacedSolid(true) + G4VSolid(pName), fStatistics(1000000), fCubVolEpsilon(0.001), + fAreaAccuracy(-1.), fCubicVolume(0.), fSurfaceArea(0.), + fpPolyhedron(0), createdDisplacedSolid(true) { fPtrSolidA = pSolidA ; fPtrSolidB = new G4DisplacedSolid("placedB",pSolidB,transform) ; @@ -93,8 +96,9 @@ G4BooleanSolid::G4BooleanSolid( const G4String& pName, G4BooleanSolid::G4BooleanSolid( __void__& a ) : G4VSolid(a), fPtrSolidA(0), fPtrSolidB(0), - fCubVolStatistics(1000000), fCubVolEpsilon(0.001), - fCubicVolume(0.), fpPolyhedron(0), createdDisplacedSolid(false) + fStatistics(1000000), fCubVolEpsilon(0.001), + fAreaAccuracy(-1.), fCubicVolume(0.), fSurfaceArea(0.), + fpPolyhedron(0), createdDisplacedSolid(false) { } diff --git a/source/geometry/solids/Boolean/src/G4DisplacedSolid.cc b/source/geometry/solids/Boolean/src/G4DisplacedSolid.cc index 846f0aa153..85feb5af25 100644 --- a/source/geometry/solids/Boolean/src/G4DisplacedSolid.cc +++ b/source/geometry/solids/Boolean/src/G4DisplacedSolid.cc @@ -25,7 +25,7 @@ // // // $Id: G4DisplacedSolid.cc,v 1.27 2006/06/29 18:43:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Implementation for G4DisplacedSolid class for boolean // operations between other solids diff --git a/source/geometry/solids/Boolean/src/G4IntersectionSolid.cc b/source/geometry/solids/Boolean/src/G4IntersectionSolid.cc index 70853e6714..bc8c3bcf85 100644 --- a/source/geometry/solids/Boolean/src/G4IntersectionSolid.cc +++ b/source/geometry/solids/Boolean/src/G4IntersectionSolid.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4IntersectionSolid.cc,v 1.27 2006/06/29 18:43:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4IntersectionSolid.cc,v 1.30 2006/11/08 09:37:41 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Implementation of methods for the class G4IntersectionSolid // @@ -42,6 +42,8 @@ #include "G4IntersectionSolid.hh" +#include + #include "G4VoxelLimits.hh" #include "G4VPVParameterisation.hh" @@ -501,8 +503,21 @@ G4IntersectionSolid::CreatePolyhedron () const { G4Polyhedron* pA = fPtrSolidA->GetPolyhedron(); G4Polyhedron* pB = fPtrSolidB->GetPolyhedron(); - G4Polyhedron* resultant = new G4Polyhedron (pA->intersect(*pB)); - return resultant; + if (pA && pB) + { + G4Polyhedron* resultant = new G4Polyhedron (pA->intersect(*pB)); + return resultant; + } + else + { + std::ostringstream oss; + oss << "Solid - " << GetName() + << " - one of the Boolean components has no" << G4endl + << " corresponding polyhedron. Returning NULL !"; + G4Exception("G4IntersectionSolid::CreatePolyhedron()", "InvalidSetup", + JustWarning, oss.str().c_str()); + return 0; + } } ///////////////////////////////////////////////////////// diff --git a/source/geometry/solids/Boolean/src/G4SubtractionSolid.cc b/source/geometry/solids/Boolean/src/G4SubtractionSolid.cc index 8a00ffbd5a..c16721a5a2 100644 --- a/source/geometry/solids/Boolean/src/G4SubtractionSolid.cc +++ b/source/geometry/solids/Boolean/src/G4SubtractionSolid.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4SubtractionSolid.cc,v 1.27 2006/06/29 18:43:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4SubtractionSolid.cc,v 1.29 2006/11/07 14:05:46 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Implementation of methods for the class G4IntersectionSolid // @@ -49,6 +49,8 @@ #include "G4NURBS.hh" // #include "G4NURBSbox.hh" +#include + /////////////////////////////////////////////////////////////////// // // Transfer all data members to G4BooleanSolid which is responsible @@ -453,8 +455,21 @@ G4SubtractionSolid::CreatePolyhedron () const { G4Polyhedron* pA = fPtrSolidA->GetPolyhedron(); G4Polyhedron* pB = fPtrSolidB->GetPolyhedron(); - G4Polyhedron* resultant = new G4Polyhedron (pA->subtract(*pB)); - return resultant; + if (pA && pB) + { + G4Polyhedron* resultant = new G4Polyhedron (pA->subtract(*pB)); + return resultant; + } + else + { + std::ostringstream oss; + oss << "Solid - " << GetName() + << " - one of the Boolean components has no" << G4endl + << " corresponding polyhedron. Returning NULL !"; + G4Exception("G4SubtractionSolid::CreatePolyhedron()", "InvalidSetup", + JustWarning, oss.str().c_str()); + return 0; + } } ///////////////////////////////////////////////////////// diff --git a/source/geometry/solids/Boolean/src/G4UnionSolid.cc b/source/geometry/solids/Boolean/src/G4UnionSolid.cc index b059ef5c26..72526804ed 100644 --- a/source/geometry/solids/Boolean/src/G4UnionSolid.cc +++ b/source/geometry/solids/Boolean/src/G4UnionSolid.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4UnionSolid.cc,v 1.31 2006/06/29 18:43:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4UnionSolid.cc,v 1.33 2006/11/08 09:37:41 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Implementation of methods for the class G4IntersectionSolid // @@ -40,6 +40,8 @@ #include "G4UnionSolid.hh" +#include + #include "G4VoxelLimits.hh" #include "G4VPVParameterisation.hh" @@ -447,8 +449,17 @@ G4UnionSolid::CreatePolyhedron () const { G4Polyhedron* pA = fPtrSolidA->GetPolyhedron(); G4Polyhedron* pB = fPtrSolidB->GetPolyhedron(); - G4Polyhedron* resultant = new G4Polyhedron (pA->add(*pB)); - return resultant; + if (pA && pB) { + G4Polyhedron* resultant = new G4Polyhedron (pA->add(*pB)); + return resultant; + } else { + std::ostringstream oss; + oss << GetName() << + ": one of the Boolean components has no corresponding polyhedron."; + G4Exception("G4UnionSolid::CreatePolyhedron", + "", JustWarning, oss.str().c_str()); + return 0; + } } ///////////////////////////////////////////////////////// diff --git a/source/geometry/solids/CSG/History b/source/geometry/solids/CSG/History index db000d5bc0..5ad3718780 100644 --- a/source/geometry/solids/CSG/History +++ b/source/geometry/solids/CSG/History @@ -1,4 +1,4 @@ -$Id: History,v 1.91 2006/06/06 10:34:44 gcosmo Exp $ +$Id: History,v 1.92 2006/10/19 15:34:03 gcosmo Exp $ ------------------------------------------------------------------- ========================================================= @@ -17,6 +17,12 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +Oct 19, 2006 G.Cosmo geom-csg-V08-01-00 +- Added explicit computation for GetSurfaceArea() for all solids + (by H.Dierckx). +- Implemented caching mechanism for computation of surface area in + G4CSGSolid, as done for the geometrical volume computation. + Jun 06, 2006 V.Grichine geom-csg-V08-00-01 - G4Tubs: added protection against NaNs in CalculateExtent() to avoid sqrt() of negative numbers due to round-off. diff --git a/source/geometry/solids/CSG/include/G4Box.hh b/source/geometry/solids/CSG/include/G4Box.hh index 2bd8da683a..89ee3dc9ac 100644 --- a/source/geometry/solids/CSG/include/G4Box.hh +++ b/source/geometry/solids/CSG/include/G4Box.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Box.hh,v 1.16 2006/06/29 18:44:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Box.hh,v 1.17 2006/10/19 15:33:37 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 class header file @@ -74,37 +74,28 @@ class G4Box : public G4CSGSolid // Accessors and modifiers inline G4double GetXHalfLength() const; - inline G4double GetYHalfLength() const; - inline G4double GetZHalfLength() const; void SetXHalfLength(G4double dx) ; - void SetYHalfLength(G4double dy) ; - void SetZHalfLength(G4double dz) ; - inline G4double GetCubicVolume(); - // Methods for solid + inline G4double GetCubicVolume(); + inline G4double GetSurfaceArea(); + EInside Inside(const G4ThreeVector& p) const; - G4ThreeVector SurfaceNormal( const G4ThreeVector& p) const; - G4double DistanceToIn(const G4ThreeVector& p, const G4ThreeVector& v) const; - G4double DistanceToIn(const G4ThreeVector& p) const; - G4double DistanceToOut(const G4ThreeVector& p, const G4ThreeVector& v, const G4bool calcNorm=false, G4bool *validNorm=0, G4ThreeVector *n=0) const; - G4double DistanceToOut(const G4ThreeVector& p) const; G4GeometryType GetEntityType() const; - G4ThreeVector GetPointOnSurface() const; std::ostream& StreamInfo(std::ostream& os) const; diff --git a/source/geometry/solids/CSG/include/G4Box.icc b/source/geometry/solids/CSG/include/G4Box.icc index ec0fb4cb5f..980cf8d61e 100644 --- a/source/geometry/solids/CSG/include/G4Box.icc +++ b/source/geometry/solids/CSG/include/G4Box.icc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Box.icc,v 1.5 2006/06/29 18:44:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Box.icc,v 1.6 2006/10/19 15:33:37 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file @@ -60,3 +60,11 @@ G4double G4Box::GetCubicVolume() else { fCubicVolume = 8*fDx*fDy*fDz; } return fCubicVolume; } + +inline +G4double G4Box::GetSurfaceArea() +{ + if(fSurfaceArea != 0.) {;} + else { fSurfaceArea = 8*(fDx*fDy+fDx*fDz+fDy*fDz); } + return fSurfaceArea; +} diff --git a/source/geometry/solids/CSG/include/G4CSGSolid.hh b/source/geometry/solids/CSG/include/G4CSGSolid.hh index ed6f9b1d7c..2ac9ebc5cc 100644 --- a/source/geometry/solids/CSG/include/G4CSGSolid.hh +++ b/source/geometry/solids/CSG/include/G4CSGSolid.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4CSGSolid.hh,v 1.11 2006/06/29 18:44:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4CSGSolid.hh,v 1.12 2006/10/19 15:33:37 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- @@ -68,6 +68,7 @@ class G4CSGSolid : public G4VSolid protected: G4double fCubicVolume; + G4double fSurfaceArea; mutable G4Polyhedron* fpPolyhedron; }; diff --git a/source/geometry/solids/CSG/include/G4Cons.hh b/source/geometry/solids/CSG/include/G4Cons.hh index b154dbcc2d..bf428b11e3 100644 --- a/source/geometry/solids/CSG/include/G4Cons.hh +++ b/source/geometry/solids/CSG/include/G4Cons.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Cons.hh,v 1.16 2006/06/29 18:44:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Cons.hh,v 1.17 2006/10/19 15:33:37 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- @@ -91,7 +91,6 @@ class G4Cons : public G4CSGSolid inline G4double GetStartPhiAngle () const; inline G4double GetDeltaPhiAngle () const; - inline G4double GetCubicVolume(); // Modifiers @@ -106,6 +105,9 @@ class G4Cons : public G4CSGSolid // Other methods for solid + inline G4double GetCubicVolume(); + inline G4double GetSurfaceArea(); + void ComputeDimensions(G4VPVParameterisation* p, const G4int n, const G4VPhysicalVolume* pRep); diff --git a/source/geometry/solids/CSG/include/G4Cons.icc b/source/geometry/solids/CSG/include/G4Cons.icc index 9a31858962..7875f820fe 100644 --- a/source/geometry/solids/CSG/include/G4Cons.icc +++ b/source/geometry/solids/CSG/include/G4Cons.icc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Cons.icc,v 1.5 2006/06/29 18:44:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Cons.icc,v 1.6 2006/10/19 15:33:37 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file @@ -82,6 +82,7 @@ void G4Cons::SetInnerRadiusMinusZ( G4double Rmin1 ) { fRmin1= Rmin1 ; fCubicVolume= 0.; + fSurfaceArea= 0.; fpPolyhedron = 0; } @@ -90,6 +91,7 @@ void G4Cons::SetOuterRadiusMinusZ( G4double Rmax1 ) { fRmax1= Rmax1 ; fCubicVolume= 0.; + fSurfaceArea= 0.; fpPolyhedron = 0; } @@ -98,6 +100,7 @@ void G4Cons::SetInnerRadiusPlusZ ( G4double Rmin2 ) { fRmin2= Rmin2 ; fCubicVolume= 0.; + fSurfaceArea= 0.; fpPolyhedron = 0; } @@ -106,6 +109,7 @@ void G4Cons::SetOuterRadiusPlusZ ( G4double Rmax2 ) { fRmax2= Rmax2 ; fCubicVolume= 0.; + fSurfaceArea= 0.; fpPolyhedron = 0; } @@ -114,6 +118,7 @@ void G4Cons::SetZHalfLength ( G4double newDz ) { fDz= newDz ; fCubicVolume= 0.; + fSurfaceArea= 0.; fpPolyhedron = 0; } @@ -122,6 +127,7 @@ void G4Cons::SetStartPhiAngle ( G4double newSPhi ) { fSPhi= newSPhi; fCubicVolume= 0.; + fSurfaceArea= 0.; fpPolyhedron = 0; } @@ -129,6 +135,7 @@ void G4Cons::SetDeltaPhiAngle ( G4double newDPhi ) { fDPhi= newDPhi; fCubicVolume= 0.; + fSurfaceArea= 0.; fpPolyhedron = 0; } @@ -176,12 +183,10 @@ G4double G4Cons::GetDPhi() const return GetDeltaPhiAngle(); } -/////////////////////////////////////////////////// - inline G4double G4Cons::GetCubicVolume() { - if(fCubicVolume != 0.) ; + if(fCubicVolume != 0.) {;} else { G4double Rmean, rMean, deltaR, deltar; @@ -196,3 +201,28 @@ G4double G4Cons::GetCubicVolume() } return fCubicVolume; } + +inline +G4double G4Cons::GetSurfaceArea() +{ + if(fSurfaceArea != 0.) {;} + else + { + G4double mmin, mmax, dmin, dmax; + + mmin= (fRmin1+fRmin2)*0.5; + mmax= (fRmax1+fRmax2)*0.5; + dmin= (fRmin2-fRmin1); + dmax= (fRmax2-fRmax1); + + fSurfaceArea = fDPhi*( mmin * std::sqrt(dmin*dmin+4*fDz*fDz) + + mmax * std::sqrt(dmax*dmax+4*fDz*fDz) + + 0.5*(fRmax1*fRmax1-fRmin1*fRmin1 + +fRmax2*fRmax2-fRmin2*fRmin2 )); + if(fDPhi < twopi ) + { + fSurfaceArea = fSurfaceArea+4*fDz*(mmax-mmin); + } + } + return fSurfaceArea; +} diff --git a/source/geometry/solids/CSG/include/G4Orb.hh b/source/geometry/solids/CSG/include/G4Orb.hh index a3ed286ec6..7cbe0a31e0 100644 --- a/source/geometry/solids/CSG/include/G4Orb.hh +++ b/source/geometry/solids/CSG/include/G4Orb.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Orb.hh,v 1.10 2006/06/29 18:44:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Orb.hh,v 1.11 2006/10/19 15:33:37 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- @@ -62,10 +62,12 @@ class G4Orb : public G4CSGSolid // Modifiers inline void SetRadius(G4double newRmax); - inline G4double GetCubicVolume(); // Methods for solid + inline G4double GetCubicVolume(); + inline G4double GetSurfaceArea(); + void ComputeDimensions( G4VPVParameterisation* p, const G4int n, const G4VPhysicalVolume* pRep); diff --git a/source/geometry/solids/CSG/include/G4Orb.icc b/source/geometry/solids/CSG/include/G4Orb.icc index 0ab67d7ddf..5045fab9a9 100644 --- a/source/geometry/solids/CSG/include/G4Orb.icc +++ b/source/geometry/solids/CSG/include/G4Orb.icc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Orb.icc,v 1.4 2006/06/29 18:44:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Orb.icc,v 1.5 2006/10/19 15:33:37 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file @@ -46,6 +46,7 @@ void G4Orb::SetRadius(G4double newRmax) { fRmax=newRmax; fCubicVolume= 0.; + fSurfaceArea = 0.; fpPolyhedron = 0; } @@ -56,3 +57,11 @@ G4double G4Orb::GetCubicVolume() else { fCubicVolume = 4*pi*fRmax*fRmax*fRmax/3.; } return fCubicVolume; } + +inline +G4double G4Orb::GetSurfaceArea() +{ + if(fSurfaceArea != 0.) {;} + else { fSurfaceArea = 4*pi*fRmax*fRmax; } + return fSurfaceArea; +} diff --git a/source/geometry/solids/CSG/include/G4Para.hh b/source/geometry/solids/CSG/include/G4Para.hh index c4b5298372..de2811997c 100644 --- a/source/geometry/solids/CSG/include/G4Para.hh +++ b/source/geometry/solids/CSG/include/G4Para.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Para.hh,v 1.17 2006/06/29 18:44:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Para.hh,v 1.18 2006/10/19 15:33:37 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- @@ -94,7 +94,6 @@ class G4Para : public G4CSGSolid inline G4double GetYHalfLength() const; inline G4double GetXHalfLength() const; inline G4double GetTanAlpha() const; - inline G4double GetCubicVolume(); // Modifiers @@ -110,6 +109,9 @@ class G4Para : public G4CSGSolid // Other methods of solid + inline G4double GetCubicVolume(); + inline G4double GetSurfaceArea(); + void ComputeDimensions(G4VPVParameterisation* p, const G4int n, const G4VPhysicalVolume* pRep); diff --git a/source/geometry/solids/CSG/include/G4Para.icc b/source/geometry/solids/CSG/include/G4Para.icc index b5de4cd301..ee490db3f8 100644 --- a/source/geometry/solids/CSG/include/G4Para.icc +++ b/source/geometry/solids/CSG/include/G4Para.icc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Para.icc,v 1.6 2006/06/29 18:44:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Para.icc,v 1.7 2006/10/19 15:33:37 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file @@ -75,6 +75,7 @@ void G4Para::SetXHalfLength(G4double val) { fDx= val; fCubicVolume= 0.; + fSurfaceArea= 0.; fpPolyhedron = 0; } @@ -83,6 +84,7 @@ void G4Para::SetYHalfLength(G4double val) { fDy= val; fCubicVolume= 0.; + fSurfaceArea= 0.; fpPolyhedron = 0; } @@ -91,6 +93,7 @@ void G4Para::SetZHalfLength(G4double val) { fDz= val; fCubicVolume= 0.; + fSurfaceArea= 0.; fpPolyhedron = 0; } @@ -98,6 +101,7 @@ inline void G4Para::SetAlpha(G4double alpha) { fTalpha= std::tan(alpha); + fSurfaceArea= 0.; fCubicVolume= 0.; fpPolyhedron = 0; } @@ -107,6 +111,7 @@ void G4Para::SetTanAlpha(G4double val) { fTalpha= val; fCubicVolume= 0.; + fSurfaceArea= 0.; fpPolyhedron = 0; } @@ -116,17 +121,31 @@ void G4Para::SetThetaAndPhi(double pTheta, double pPhi) fTthetaCphi=std::tan(pTheta)*std::cos(pPhi); fTthetaSphi=std::tan(pTheta)*std::sin(pPhi); fCubicVolume= 0.; + fSurfaceArea= 0.; fpPolyhedron = 0; } -/////////////////////////////////////////////////// -// -// It is like G4Box, since para transformations keep the volume to be const - inline G4double G4Para::GetCubicVolume() { - if(fCubicVolume != 0.) ; + // + // It is like G4Box, since para transformations keep the volume to be const + + if(fCubicVolume != 0.) {;} else fCubicVolume = 8*fDx*fDy*fDz; return fCubicVolume; } + +inline +G4double G4Para::GetSurfaceArea() +{ + if(fSurfaceArea != 0.) {;} + else + { + fSurfaceArea = 8*(fDx*fDy + + fDx*fDz*std::sqrt(1+fTthetaSphi*fTthetaSphi) + + fDy*fDz*std::sqrt(1+fTalpha*fTalpha + +std::pow(fTthetaCphi-fTthetaSphi*fTalpha, 2)) ); + } + return fSurfaceArea; +} diff --git a/source/geometry/solids/CSG/include/G4Sphere.hh b/source/geometry/solids/CSG/include/G4Sphere.hh index 31e3b17d3f..3bcea72da0 100644 --- a/source/geometry/solids/CSG/include/G4Sphere.hh +++ b/source/geometry/solids/CSG/include/G4Sphere.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Sphere.hh,v 1.18 2006/06/29 18:44:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Sphere.hh,v 1.19 2006/10/19 15:33:37 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- @@ -93,7 +93,6 @@ class G4Sphere : public G4CSGSolid inline G4double GetDeltaPhiAngle () const; inline G4double GetStartThetaAngle() const; inline G4double GetDeltaThetaAngle() const; - inline G4double GetCubicVolume(); // Modifiers @@ -106,6 +105,9 @@ class G4Sphere : public G4CSGSolid // Methods for solid + inline G4double GetCubicVolume(); + inline G4double GetSurfaceArea(); + void ComputeDimensions( G4VPVParameterisation* p, const G4int n, const G4VPhysicalVolume* pRep); diff --git a/source/geometry/solids/CSG/include/G4Sphere.icc b/source/geometry/solids/CSG/include/G4Sphere.icc index 958b0c22da..1f0034d334 100644 --- a/source/geometry/solids/CSG/include/G4Sphere.icc +++ b/source/geometry/solids/CSG/include/G4Sphere.icc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Sphere.icc,v 1.6 2006/06/29 18:44:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Sphere.icc,v 1.7 2006/10/19 15:33:37 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file @@ -75,6 +75,7 @@ void G4Sphere::SetInsideRadius(G4double newRmin) { fRmin= newRmin; fCubicVolume= 0.; + fSurfaceArea= 0.; fpPolyhedron = 0; } @@ -83,6 +84,7 @@ void G4Sphere::SetOuterRadius(G4double newRmax) { fRmax= newRmax; fCubicVolume= 0.; + fSurfaceArea= 0.; fpPolyhedron = 0; } @@ -91,6 +93,7 @@ void G4Sphere::SetStartPhiAngle(G4double newSphi) { fSPhi= newSphi; fCubicVolume= 0.; + fSurfaceArea= 0.; fpPolyhedron = 0; } @@ -99,6 +102,7 @@ void G4Sphere::SetDeltaPhiAngle(G4double newDphi) { fDPhi= newDphi; fCubicVolume= 0.; + fSurfaceArea= 0.; fpPolyhedron = 0; } @@ -107,6 +111,7 @@ void G4Sphere::SetStartThetaAngle(G4double newSTheta) { fSTheta=newSTheta; fCubicVolume= 0.; + fSurfaceArea= 0.; fpPolyhedron = 0; } @@ -115,6 +120,7 @@ void G4Sphere::SetDeltaThetaAngle(G4double newDTheta) { fDTheta=newDTheta; fCubicVolume= 0.; + fSurfaceArea= 0.; fpPolyhedron = 0; } @@ -155,13 +161,60 @@ G4double G4Sphere::GetDTheta() const { return GetDeltaThetaAngle(); } -/////////////////////////////////////////////////// inline G4double G4Sphere::GetCubicVolume() { - if(fCubicVolume != 0.) ; + if(fCubicVolume != 0.) {;} else fCubicVolume = fDPhi*(std::cos(fSTheta)-std::cos(fSTheta+fDTheta))* (fRmax*fRmax*fRmax-fRmin*fRmin*fRmin)/3.; return fCubicVolume; } + + +inline +G4double G4Sphere::GetSurfaceArea() +{ + if(fSurfaceArea != 0.) {;} + else + { + G4double Rsq=fRmax*fRmax; + G4double rsq=fRmin*fRmin; + + fSurfaceArea = fDPhi*(rsq+Rsq)*(std::cos(fSTheta) + - std::cos(fSTheta+fDTheta)); + if(fDPhi < twopi) + { + fSurfaceArea = fSurfaceArea + fDTheta*(Rsq-rsq); + } + if(fSTheta >0) + { + G4double acos1=std::acos( std::pow(std::sin(fSTheta),2) + *std::cos(fDPhi) + +std::pow(std::cos(fSTheta),2)); + if(fDPhi>pi) + { + fSurfaceArea = fSurfaceArea + 0.5*(Rsq-rsq)*(twopi-acos1); + } + else + { + fSurfaceArea = fSurfaceArea + 0.5*(Rsq-rsq)*acos1; + } + } + if(fDTheta+fSTheta < pi) + { + G4double acos2=std::acos( std::pow(std::sin(fSTheta+fDTheta),2) + *std::cos(fDPhi) + +std::pow(std::cos(fSTheta+fDTheta),2)); + if(fDPhi>pi) + { + fSurfaceArea = fSurfaceArea + 0.5*(Rsq-rsq)*(twopi-acos2); + } + else + { + fSurfaceArea = fSurfaceArea + 0.5*(Rsq-rsq)*acos2; + } + } + } + return fSurfaceArea; +} diff --git a/source/geometry/solids/CSG/include/G4Torus.hh b/source/geometry/solids/CSG/include/G4Torus.hh index d85474e74c..fac0f4e2a0 100644 --- a/source/geometry/solids/CSG/include/G4Torus.hh +++ b/source/geometry/solids/CSG/include/G4Torus.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Torus.hh,v 1.25 2006/06/29 18:44:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Torus.hh,v 1.26 2006/10/19 15:33:37 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- @@ -119,10 +119,12 @@ class G4Torus : public G4CSGSolid inline G4double GetRtor() const; inline G4double GetSPhi() const; inline G4double GetDPhi() const; - inline G4double GetCubicVolume(); // Methods of solid + inline G4double GetCubicVolume(); + inline G4double GetSurfaceArea(); + EInside Inside(const G4ThreeVector& p) const; G4bool CalculateExtent(const EAxis pAxis, const G4VoxelLimits& pVoxelLimit, @@ -191,8 +193,6 @@ class G4Torus : public G4CSGSolid G4ThreeVector ApproxSurfaceNormal( const G4ThreeVector& p) const; // Algorithm for SurfaceNormal() following the original // specification for points not on the surface - - }; #include "G4Torus.icc" diff --git a/source/geometry/solids/CSG/include/G4Torus.icc b/source/geometry/solids/CSG/include/G4Torus.icc index 1735bcecbb..32c67dd59e 100644 --- a/source/geometry/solids/CSG/include/G4Torus.icc +++ b/source/geometry/solids/CSG/include/G4Torus.icc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Torus.icc,v 1.5 2006/06/29 18:44:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Torus.icc,v 1.6 2006/10/19 15:33:37 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file @@ -72,3 +72,18 @@ G4double G4Torus::GetCubicVolume() else { fCubicVolume = fDPhi*pi*fRtor*(fRmax*fRmax-fRmin*fRmin); } return fCubicVolume; } + +inline +G4double G4Torus::GetSurfaceArea() +{ + if(fSurfaceArea != 0.) {;} + else + { + fSurfaceArea = fDPhi*2*pi*fRtor*(fRmax+fRmin); + if(fDPhi < twopi) + { + fSurfaceArea = fSurfaceArea + twopi*(fRmax*fRmax-fRmin*fRmin); + } + } + return fSurfaceArea; +} diff --git a/source/geometry/solids/CSG/include/G4Trap.hh b/source/geometry/solids/CSG/include/G4Trap.hh index 1ad01e2e91..d6f2f6d67e 100644 --- a/source/geometry/solids/CSG/include/G4Trap.hh +++ b/source/geometry/solids/CSG/include/G4Trap.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Trap.hh,v 1.16 2006/06/29 18:44:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Trap.hh,v 1.17 2006/10/19 15:33:37 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- @@ -172,7 +172,6 @@ class G4Trap : public G4CSGSolid inline TrapSidePlane GetSidePlane( G4int n ) const; inline G4ThreeVector GetSymAxis() const; - inline G4double GetCubicVolume(); // Modifiers @@ -190,6 +189,9 @@ class G4Trap : public G4CSGSolid // Methods for solid + inline G4double GetCubicVolume(); + inline G4double GetSurfaceArea(); + void ComputeDimensions( G4VPVParameterisation* p, const G4int n, const G4VPhysicalVolume* pRep ); diff --git a/source/geometry/solids/CSG/include/G4Trap.icc b/source/geometry/solids/CSG/include/G4Trap.icc index 14cde906d4..691ffb1906 100644 --- a/source/geometry/solids/CSG/include/G4Trap.icc +++ b/source/geometry/solids/CSG/include/G4Trap.icc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Trap.icc,v 1.7 2006/06/29 18:44:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Trap.icc,v 1.8 2006/10/19 15:33:37 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file @@ -122,3 +122,43 @@ G4double G4Trap::GetCubicVolume() + (fDx4+fDx3-fDx2-fDx1)*(fDy2-fDy1)/3 ); } return fCubicVolume; } + +inline +G4double G4Trap::GetSurfaceArea() +{ + if(fSurfaceArea != 0.) {;} + else + { + G4ThreeVector ba(fDx1-fDx2+fTalpha1*2*fDy1,2*fDy1,0); + G4ThreeVector bc(2*fDz*fTthetaCphi-(fDx4-fDx2)+fTalpha2*fDy2-fTalpha1*fDy1, + 2*fDz*fTthetaSphi+fDy2-fDy1, 2*fDz); + G4ThreeVector dc(-fDx4+fDx3+2*fTalpha2*fDy2, 2*fDy2,0); + G4ThreeVector da(-2*fDz*fTthetaCphi-(fDx1-fDx3)-fTalpha1*fDy1+fTalpha2*fDy2, + -2*fDz*fTthetaSphi-fDy1+fDy2,-2*fDz); + + G4ThreeVector ef(fDx2-fDx1+2*fTalpha1*fDy1, 2*fDy1,0); + G4ThreeVector eh(2*fDz*fTthetaCphi+fDx3-fDx1+fTalpha1*fDy1-fTalpha2*fDy2, + 2*fDz*fTthetaSphi-fDy2+fDy1,2*fDz); + G4ThreeVector gh(fDx3-fDx4-2*fTalpha2*fDy2, -2*fDy2,0); + G4ThreeVector gf(-2*fDz*fTthetaCphi+fDx2-fDx4+fTalpha1*fDy1-fTalpha2*fDy2, + -2*fDz*fTthetaSphi+fDy1-fDy2,-2*fDz); + + G4ThreeVector cr; + cr = ba.cross(bc); + G4double babc=cr.mag(); + cr = dc.cross(da); + G4double dcda=cr.mag(); + cr = ef.cross(eh); + G4double efeh=cr.mag(); + cr = gh.cross(gf); + G4double ghgf=cr.mag(); + + fSurfaceArea = 2*fDy1*(fDx1+fDx2)+2*fDy2*(fDx3+fDx4) + + (fDx1+fDx3) + * std::sqrt(4*fDz*fDz+std::pow(fDy2-fDy1-2*fDz*fTthetaSphi,2)) + + (fDx2+fDx4) + * std::sqrt(4*fDz*fDz+std::pow(fDy2-fDy1+2*fDz*fTthetaSphi,2)) + + 0.5*(babc+dcda+efeh+ghgf); + } + return fSurfaceArea; +} diff --git a/source/geometry/solids/CSG/include/G4Trd.hh b/source/geometry/solids/CSG/include/G4Trd.hh index fe5ce4ddba..cf48263853 100644 --- a/source/geometry/solids/CSG/include/G4Trd.hh +++ b/source/geometry/solids/CSG/include/G4Trd.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Trd.hh,v 1.15 2006/06/29 18:44:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Trd.hh,v 1.16 2006/10/19 15:33:37 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- @@ -82,7 +82,6 @@ class G4Trd : public G4CSGSolid inline G4double GetYHalfLength1() const; inline G4double GetYHalfLength2() const; inline G4double GetZHalfLength() const; - inline G4double GetCubicVolume(); // Modifiers @@ -94,6 +93,9 @@ class G4Trd : public G4CSGSolid // Methods of solid + inline G4double GetCubicVolume(); + inline G4double GetSurfaceArea(); + void ComputeDimensions( G4VPVParameterisation* p, const G4int n, const G4VPhysicalVolume* pRep ); diff --git a/source/geometry/solids/CSG/include/G4Trd.icc b/source/geometry/solids/CSG/include/G4Trd.icc index 1f28236c80..f5e0eff02d 100644 --- a/source/geometry/solids/CSG/include/G4Trd.icc +++ b/source/geometry/solids/CSG/include/G4Trd.icc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Trd.icc,v 1.6 2006/06/29 18:44:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Trd.icc,v 1.7 2006/10/19 15:33:37 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file @@ -70,6 +70,7 @@ void G4Trd::SetXHalfLength1(G4double val) { fDx1= val; fCubicVolume= 0.; + fSurfaceArea=0; fpPolyhedron = 0; } @@ -78,6 +79,7 @@ void G4Trd::SetXHalfLength2(G4double val) { fDx2= val; fCubicVolume= 0.; + fSurfaceArea=0; fpPolyhedron = 0; } @@ -86,6 +88,7 @@ void G4Trd::SetYHalfLength1(G4double val) { fDy1= val; fCubicVolume= 0.; + fSurfaceArea=0; fpPolyhedron = 0; } @@ -94,6 +97,7 @@ void G4Trd::SetYHalfLength2(G4double val) { fDy2= val; fCubicVolume= 0.; + fSurfaceArea=0; fpPolyhedron = 0; } @@ -102,6 +106,7 @@ void G4Trd::SetZHalfLength(G4double val) { fDz= val; fCubicVolume= 0.; + fSurfaceArea=0; fpPolyhedron = 0; } @@ -109,7 +114,23 @@ inline G4double G4Trd::GetCubicVolume() { if(fCubicVolume != 0.) {;} - else { fCubicVolume = 2*fDz*( (fDx1+fDx2)*(fDy1+fDy2) - + (fDx2-fDx1)*(fDy2-fDy1)/3 ); } + else + { + fCubicVolume = 2*fDz*( (fDx1+fDx2)*(fDy1+fDy2) + + (fDx2-fDx1)*(fDy2-fDy1)/3 ); + } return fCubicVolume; } + +inline +G4double G4Trd::GetSurfaceArea() +{ + if(fSurfaceArea != 0.) {;} + else + { + fSurfaceArea = 4*(fDx1*fDy1+fDx2*fDy2) + + 2*((fDy1+fDy2)*std::sqrt(4*fDz*fDz+(fDx2-fDx1)*(fDx2-fDx1)) + + (fDx1+fDx2) *std::sqrt(4*fDz*fDz+(fDy2-fDy1)*(fDy2-fDy1)) ); + } + return fSurfaceArea; +} diff --git a/source/geometry/solids/CSG/include/G4Tubs.hh b/source/geometry/solids/CSG/include/G4Tubs.hh index c9389fbc21..e2886304be 100644 --- a/source/geometry/solids/CSG/include/G4Tubs.hh +++ b/source/geometry/solids/CSG/include/G4Tubs.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Tubs.hh,v 1.15 2006/06/29 18:44:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Tubs.hh,v 1.16 2006/10/19 15:33:37 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- @@ -94,8 +94,6 @@ class G4Tubs : public G4CSGSolid inline G4double GetZHalfLength () const; inline G4double GetStartPhiAngle () const; inline G4double GetDeltaPhiAngle () const; - inline G4double GetCubicVolume(); - // Modifiers @@ -107,6 +105,9 @@ class G4Tubs : public G4CSGSolid // Methods for solid + inline G4double GetCubicVolume(); + inline G4double GetSurfaceArea(); + void ComputeDimensions( G4VPVParameterisation* p, const G4int n, const G4VPhysicalVolume* pRep ); diff --git a/source/geometry/solids/CSG/include/G4Tubs.icc b/source/geometry/solids/CSG/include/G4Tubs.icc index 5fbc2bb4eb..060e870e54 100644 --- a/source/geometry/solids/CSG/include/G4Tubs.icc +++ b/source/geometry/solids/CSG/include/G4Tubs.icc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Tubs.icc,v 1.6 2006/06/29 18:45:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Tubs.icc,v 1.7 2006/10/19 15:33:37 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file @@ -70,6 +70,7 @@ void G4Tubs::SetInnerRadius (G4double newRMin) { fRMin= newRMin; fCubicVolume= 0.; + fSurfaceArea= 0.; fpPolyhedron = 0; } @@ -78,6 +79,7 @@ void G4Tubs::SetOuterRadius (G4double newRMax) { fRMax= newRMax; fCubicVolume= 0.; + fSurfaceArea= 0.; fpPolyhedron = 0; } @@ -86,6 +88,7 @@ void G4Tubs::SetZHalfLength (G4double newDz) { fDz= newDz; fCubicVolume= 0.; + fSurfaceArea= 0.; fpPolyhedron = 0; } @@ -94,6 +97,7 @@ void G4Tubs::SetStartPhiAngle (G4double newSPhi) { fSPhi= newSPhi; fCubicVolume= 0.; + fSurfaceArea= 0.; fpPolyhedron = 0; } @@ -102,6 +106,7 @@ void G4Tubs::SetDeltaPhiAngle (G4double newDPhi) { fDPhi= newDPhi; fCubicVolume= 0.; + fSurfaceArea= 0.; fpPolyhedron = 0; } @@ -144,3 +149,18 @@ G4double G4Tubs::GetCubicVolume() else { fCubicVolume = fDPhi*fDz*(fRMax*fRMax-fRMin*fRMin); } return fCubicVolume; } + +inline +G4double G4Tubs::GetSurfaceArea() +{ + if(fSurfaceArea != 0.) {;} + else + { + fSurfaceArea = fDPhi*(fRMin+fRMax)*(2*fDz+fRMax-fRMin); + if (fDPhi < twopi) + { + fSurfaceArea = fSurfaceArea + 4*fDz*(fRMax-fRMin); + } + } + return fSurfaceArea; +} diff --git a/source/geometry/solids/CSG/src/G4Box.cc b/source/geometry/solids/CSG/src/G4Box.cc index 71306cd2a0..59cb55d40c 100644 --- a/source/geometry/solids/CSG/src/G4Box.cc +++ b/source/geometry/solids/CSG/src/G4Box.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Box.cc,v 1.43 2006/06/29 18:45:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Box.cc,v 1.44 2006/10/19 15:33:37 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // @@ -115,6 +115,7 @@ void G4Box::SetXHalfLength(G4double dx) FatalException, "Invalid dimensions. Too small."); } fCubicVolume= 0.; + fSurfaceArea= 0.; fpPolyhedron = 0; } @@ -131,6 +132,7 @@ void G4Box::SetYHalfLength(G4double dy) FatalException, "Invalid dimensions. Too small."); } fCubicVolume= 0.; + fSurfaceArea= 0.; fpPolyhedron = 0; } @@ -147,6 +149,7 @@ void G4Box::SetZHalfLength(G4double dz) FatalException, "Invalid dimensions. Too small."); } fCubicVolume= 0.; + fSurfaceArea= 0.; fpPolyhedron = 0; } diff --git a/source/geometry/solids/CSG/src/G4CSGSolid.cc b/source/geometry/solids/CSG/src/G4CSGSolid.cc index 5b92aef990..b180e56f60 100644 --- a/source/geometry/solids/CSG/src/G4CSGSolid.cc +++ b/source/geometry/solids/CSG/src/G4CSGSolid.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4CSGSolid.cc,v 1.12 2006/06/29 18:45:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4CSGSolid.cc,v 1.13 2006/10/19 15:33:37 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- @@ -39,7 +39,7 @@ // - Base class constructor G4CSGSolid::G4CSGSolid(const G4String& name) : - G4VSolid(name), fCubicVolume(0.), fpPolyhedron(0) + G4VSolid(name), fCubicVolume(0.), fSurfaceArea(0.), fpPolyhedron(0) { } @@ -49,7 +49,7 @@ G4CSGSolid::G4CSGSolid(const G4String& name) : // for usage restricted to object persistency. G4CSGSolid::G4CSGSolid( __void__& a ) - : G4VSolid(a), fCubicVolume(0.), fpPolyhedron(0) + : G4VSolid(a), fCubicVolume(0.), fSurfaceArea(0.), fpPolyhedron(0) { } diff --git a/source/geometry/solids/CSG/src/G4Cons.cc b/source/geometry/solids/CSG/src/G4Cons.cc index 8533faa2a0..66f4a97f81 100644 --- a/source/geometry/solids/CSG/src/G4Cons.cc +++ b/source/geometry/solids/CSG/src/G4Cons.cc @@ -25,7 +25,7 @@ // // // $Id: G4Cons.cc,v 1.48 2006/06/29 18:45:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4Cons // diff --git a/source/geometry/solids/CSG/src/G4Orb.cc b/source/geometry/solids/CSG/src/G4Orb.cc index 903cb09a9d..fd4c01bb9d 100644 --- a/source/geometry/solids/CSG/src/G4Orb.cc +++ b/source/geometry/solids/CSG/src/G4Orb.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4Orb.cc,v 1.23 2006/06/29 18:45:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4Orb // diff --git a/source/geometry/solids/CSG/src/G4Para.cc b/source/geometry/solids/CSG/src/G4Para.cc index 756310aab9..d5067b301e 100644 --- a/source/geometry/solids/CSG/src/G4Para.cc +++ b/source/geometry/solids/CSG/src/G4Para.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Para.cc,v 1.38 2006/06/29 18:45:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Para.cc,v 1.39 2006/10/19 15:33:37 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4Para // @@ -92,6 +92,7 @@ void G4Para::SetAllParameters( G4double pDx, G4double pDy, G4double pDz, FatalException, "Invalid Length Parameters."); } fCubicVolume = 0.; + fSurfaceArea = 0.; fpPolyhedron = 0; } diff --git a/source/geometry/solids/CSG/src/G4Sphere.cc b/source/geometry/solids/CSG/src/G4Sphere.cc index 01104cb8f0..1b4aa92254 100644 --- a/source/geometry/solids/CSG/src/G4Sphere.cc +++ b/source/geometry/solids/CSG/src/G4Sphere.cc @@ -25,7 +25,7 @@ // // // $Id: G4Sphere.cc,v 1.56 2006/06/29 18:45:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4Sphere // diff --git a/source/geometry/solids/CSG/src/G4Torus.cc b/source/geometry/solids/CSG/src/G4Torus.cc index 78247f7f65..021bb72b19 100644 --- a/source/geometry/solids/CSG/src/G4Torus.cc +++ b/source/geometry/solids/CSG/src/G4Torus.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Torus.cc,v 1.59 2006/06/29 18:45:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Torus.cc,v 1.60 2006/10/19 15:33:37 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4Torus @@ -97,6 +97,7 @@ G4Torus::SetAllParameters( G4double pRmin, G4double pDPhi ) { fCubicVolume = 0.; + fSurfaceArea = 0.; fpPolyhedron = 0; if ( pRtor >= pRmax+1.e3*kCarTolerance ) // Check swept radius, as in G4Cons { diff --git a/source/geometry/solids/CSG/src/G4Trap.cc b/source/geometry/solids/CSG/src/G4Trap.cc index d46bd6d356..dbc33b4bfd 100644 --- a/source/geometry/solids/CSG/src/G4Trap.cc +++ b/source/geometry/solids/CSG/src/G4Trap.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Trap.cc,v 1.41 2006/06/29 18:45:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Trap.cc,v 1.42 2006/10/19 15:33:38 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4Trap // @@ -560,6 +560,7 @@ void G4Trap::SetAllParameters ( G4double pDz, G4double pAlp2 ) { fCubicVolume= 0.; + fSurfaceArea= 0.; fpPolyhedron = 0; if ( pDz>0 && pDy1>0 && pDx1>0 && pDx2>0 && pDy2>0 && pDx3>0 && pDx4>0 ) { diff --git a/source/geometry/solids/CSG/src/G4Trd.cc b/source/geometry/solids/CSG/src/G4Trd.cc index 44014e8780..2247b63295 100644 --- a/source/geometry/solids/CSG/src/G4Trd.cc +++ b/source/geometry/solids/CSG/src/G4Trd.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Trd.cc,v 1.33 2006/06/29 18:45:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Trd.cc,v 1.34 2006/10/19 15:33:38 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Implementation for G4Trd class @@ -109,6 +109,7 @@ void G4Trd::CheckAndSetAllParameters ( G4double pdx1, G4double pdx2, } } fCubicVolume= 0.; + fSurfaceArea= 0.; fpPolyhedron = 0; } diff --git a/source/geometry/solids/CSG/src/G4Tubs.cc b/source/geometry/solids/CSG/src/G4Tubs.cc index 476f6bf1ae..8333817e95 100644 --- a/source/geometry/solids/CSG/src/G4Tubs.cc +++ b/source/geometry/solids/CSG/src/G4Tubs.cc @@ -25,7 +25,7 @@ // // // $Id: G4Tubs.cc,v 1.60 2006/06/29 18:45:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4Tubs diff --git a/source/geometry/solids/History b/source/geometry/solids/History index b681db9e01..6bdc1f971c 100644 --- a/source/geometry/solids/History +++ b/source/geometry/solids/History @@ -1,4 +1,4 @@ -$Id: History,v 1.21 2005/11/09 15:06:49 gcosmo Exp $ +$Id: History,v 1.22 2006/10/20 15:29:03 gcosmo Exp $ ------------------------------------------------------------------- ========================================================= @@ -17,6 +17,13 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +October, 20th, 2006, G.Cosmo - geomsolids-V08-01-00 +- Includes tags: geom-bool-V08-01-00, breps-V08-01-00, geom-csg-V08-01-00, + geom-specific-V08-01-00, geom-solids-tests-V08-01-00. +- Implemented specific computation of surface area for CSG solids and + included caching mechanism for the computed value. +- Requires tag "geommng-V08-01-04". + November, 9th, 2005, G.Cosmo - geomsolids-V07-01-00 - Includes tags: geom-bool-V07-01-01, breps-V07-01-01, geom-csg-V07-01-04, geom-specific-V07-01-07. diff --git a/source/geometry/solids/specific/History b/source/geometry/solids/specific/History index 2dc697995f..35671ce329 100644 --- a/source/geometry/solids/specific/History +++ b/source/geometry/solids/specific/History @@ -1,4 +1,4 @@ -$Id: History,v 1.94 2006/06/20 10:09:23 gcosmo Exp $ +$Id: History,v 1.100 2006/11/15 10:43:13 gcosmo Exp $ ------------------------------------------------------------------- ========================================================= @@ -17,6 +17,27 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +15-Nov-2006, J.Allison (geom-specific-V08-01-04) +- Fixed typo in G4Polycone::CreatePolyhedron() introduced by mistake in + the last cleanup of the source code. + +13-Nov-2006, G.Cosmo (geom-specific-V08-01-03) +- Added concrete implementation of GetSurfaceArea() in G4Tet (M.H.Mendenhall). + +08-Nov-2006, G.Cosmo (geom-specific-V08-01-02) +- Cleared compilation warnings on SUN-CC for changes in the last tag. + Fixed overloaded class variables in G4Polyhedra and G4Polycone + implementation of CreatePolyhedron(). + +31-Oct-2006, J.Allison (geom-specific-V08-01-01) +- Implemented CreatePolyhedron() for G4Polyhedra and G4Polycone. + +20-Oct-2006, G.Cosmo (geom-specific-V08-01-00) +- Implemented caching mechanism for computation of surface area in + all solids and base classes, as done for the geometrical volume + computation. +- Added missing fake constructor for object persistency to G4TessellatedSolid. + 20-Jun-2006, G.Cosmo (geom-specific-V08-00-10) - Added accessor method GetVertices() in G4Tet to return the list of vertices composing the solid. Required for GDML persistency. diff --git a/source/geometry/solids/specific/include/G4ClippablePolygon.hh b/source/geometry/solids/specific/include/G4ClippablePolygon.hh index 09738332f7..085dccfcd2 100644 --- a/source/geometry/solids/specific/include/G4ClippablePolygon.hh +++ b/source/geometry/solids/specific/include/G4ClippablePolygon.hh @@ -25,7 +25,7 @@ // // // $Id: G4ClippablePolygon.hh,v 1.10 2006/06/29 18:46:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/include/G4ClippablePolygon.icc b/source/geometry/solids/specific/include/G4ClippablePolygon.icc index cfc2f5f40b..4f75efbb7c 100644 --- a/source/geometry/solids/specific/include/G4ClippablePolygon.icc +++ b/source/geometry/solids/specific/include/G4ClippablePolygon.icc @@ -25,7 +25,7 @@ // // // $Id: G4ClippablePolygon.icc,v 1.4 2006/06/29 18:46:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/specific/include/G4Ellipsoid.hh b/source/geometry/solids/specific/include/G4Ellipsoid.hh index 4183998bd8..e0171bbbe0 100644 --- a/source/geometry/solids/specific/include/G4Ellipsoid.hh +++ b/source/geometry/solids/specific/include/G4Ellipsoid.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Ellipsoid.hh,v 1.10 2006/06/29 18:46:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Ellipsoid.hh,v 1.11 2006/10/20 13:45:20 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- @@ -76,6 +76,7 @@ class G4Ellipsoid : public G4VSolid inline void SetSemiAxis (G4double x, G4double y, G4double z); inline void SetZCuts (G4double newzBottomCut, G4double newzTopCut); inline G4double GetCubicVolume(); + inline G4double GetSurfaceArea(); // Solid standard methods @@ -126,6 +127,7 @@ class G4Ellipsoid : public G4VSolid private: G4double fCubicVolume; + G4double fSurfaceArea; G4double xSemiAxis, ySemiAxis, zSemiAxis, semiAxisMax, zBottomCut, zTopCut; }; diff --git a/source/geometry/solids/specific/include/G4Ellipsoid.icc b/source/geometry/solids/specific/include/G4Ellipsoid.icc index b52e82217e..1171d74987 100644 --- a/source/geometry/solids/specific/include/G4Ellipsoid.icc +++ b/source/geometry/solids/specific/include/G4Ellipsoid.icc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Ellipsoid.icc,v 1.6 2006/06/29 18:46:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Ellipsoid.icc,v 1.7 2006/10/20 13:45:20 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- @@ -36,6 +36,7 @@ // Implementation of inline methods of G4Ellipsoid // -------------------------------------------------------------------- +inline G4double G4Ellipsoid::GetSemiAxisMax (G4int i) const { return (i==0) ? xSemiAxis @@ -43,16 +44,19 @@ G4double G4Ellipsoid::GetSemiAxisMax (G4int i) const : zSemiAxis; } +inline G4double G4Ellipsoid::GetZBottomCut() const { return zBottomCut; } +inline G4double G4Ellipsoid::GetZTopCut() const { return zTopCut; } +inline void G4Ellipsoid::SetSemiAxis (G4double newxSemiAxis, G4double newySemiAxis, G4double newzSemiAxis) @@ -64,6 +68,7 @@ void G4Ellipsoid::SetSemiAxis (G4double newxSemiAxis, if (zTopCut > +zSemiAxis) { zTopCut = +zSemiAxis; } } +inline void G4Ellipsoid::SetZCuts (G4double newzBottomCut, G4double newzTopCut) { if (newzBottomCut < -zSemiAxis) @@ -97,3 +102,11 @@ G4double G4Ellipsoid::GetCubicVolume() } return fCubicVolume; } + +inline +G4double G4Ellipsoid::GetSurfaceArea() +{ + if(fSurfaceArea != 0.) {;} + else { fSurfaceArea = G4VSolid::GetSurfaceArea(); } + return fSurfaceArea; +} diff --git a/source/geometry/solids/specific/include/G4EllipticalCone.hh b/source/geometry/solids/specific/include/G4EllipticalCone.hh index 3aece5bf34..6c9fdc4280 100644 --- a/source/geometry/solids/specific/include/G4EllipticalCone.hh +++ b/source/geometry/solids/specific/include/G4EllipticalCone.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4EllipticalCone.hh,v 1.8 2006/06/29 18:46:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4EllipticalCone.hh,v 1.9 2006/10/20 13:45:20 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- @@ -83,7 +83,9 @@ class G4EllipticalCone : public G4VSolid inline G4double GetZTopCut() const; inline void SetSemiAxis (G4double x, G4double y, G4double z); inline void SetZCut (G4double newzTopCut); + inline G4double GetCubicVolume(); + inline G4double GetSurfaceArea(); // Solid standard methods // @@ -140,6 +142,7 @@ class G4EllipticalCone : public G4VSolid private: G4double fCubicVolume; + G4double fSurfaceArea; G4double xSemiAxis, ySemiAxis, zheight, semiAxisMax, zTopCut; }; diff --git a/source/geometry/solids/specific/include/G4EllipticalCone.icc b/source/geometry/solids/specific/include/G4EllipticalCone.icc index 5bc185eaa2..46787caba5 100644 --- a/source/geometry/solids/specific/include/G4EllipticalCone.icc +++ b/source/geometry/solids/specific/include/G4EllipticalCone.icc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4EllipticalCone.icc,v 1.5 2006/06/29 18:46:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4EllipticalCone.icc,v 1.6 2006/10/20 13:45:20 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- @@ -38,16 +38,19 @@ // Author: Dionysios Anninos // -------------------------------------------------------------------- +inline G4double G4EllipticalCone::GetSemiAxisMax () const { return ySemiAxis > xSemiAxis ? ySemiAxis : xSemiAxis; } +inline G4double G4EllipticalCone::GetZTopCut() const { return zTopCut; } +inline void G4EllipticalCone::SetSemiAxis (G4double newxSemiAxis, G4double newySemiAxis, G4double newzMax) @@ -59,6 +62,7 @@ void G4EllipticalCone::SetSemiAxis (G4double newxSemiAxis, if (zTopCut > +zheight) { zTopCut = +zheight; } } +inline void G4EllipticalCone::SetZCut (G4double newzTopCut) { if (newzTopCut > +zheight) @@ -85,3 +89,11 @@ G4double G4EllipticalCone::GetCubicVolume() } return fCubicVolume; } + +inline +G4double G4EllipticalCone::GetSurfaceArea() +{ + if(fSurfaceArea != 0.) {;} + else { fSurfaceArea = G4VSolid::GetSurfaceArea(); } + return fSurfaceArea; +} diff --git a/source/geometry/solids/specific/include/G4EllipticalTube.hh b/source/geometry/solids/specific/include/G4EllipticalTube.hh index e80b3655ce..9106cbc99f 100644 --- a/source/geometry/solids/specific/include/G4EllipticalTube.hh +++ b/source/geometry/solids/specific/include/G4EllipticalTube.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4EllipticalTube.hh,v 1.17 2006/06/29 18:46:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4EllipticalTube.hh,v 1.18 2006/10/20 13:45:20 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 class header file @@ -90,6 +90,7 @@ class G4EllipticalTube : public G4VSolid std::ostream& StreamInfo(std::ostream& os) const; G4double GetCubicVolume(); + G4double GetSurfaceArea(); G4ThreeVector GetPointOnSurface() const; @@ -134,6 +135,7 @@ class G4EllipticalTube : public G4VSolid private: G4double fCubicVolume; + G4double fSurfaceArea; mutable G4Polyhedron* fpPolyhedron; }; diff --git a/source/geometry/solids/specific/include/G4EllipticalTube.icc b/source/geometry/solids/specific/include/G4EllipticalTube.icc index c347aaf969..def4326991 100644 --- a/source/geometry/solids/specific/include/G4EllipticalTube.icc +++ b/source/geometry/solids/specific/include/G4EllipticalTube.icc @@ -25,7 +25,7 @@ // // // $Id: G4EllipticalTube.icc,v 1.4 2006/06/29 18:46:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/specific/include/G4EnclosingCylinder.hh b/source/geometry/solids/specific/include/G4EnclosingCylinder.hh index c0579716f7..a0baff6a27 100644 --- a/source/geometry/solids/specific/include/G4EnclosingCylinder.hh +++ b/source/geometry/solids/specific/include/G4EnclosingCylinder.hh @@ -25,7 +25,7 @@ // // // $Id: G4EnclosingCylinder.hh,v 1.8 2006/06/29 18:46:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/include/G4Hype.hh b/source/geometry/solids/specific/include/G4Hype.hh index 2a7d3af443..5f18e88d23 100644 --- a/source/geometry/solids/specific/include/G4Hype.hh +++ b/source/geometry/solids/specific/include/G4Hype.hh @@ -24,9 +24,9 @@ // ******************************************************************** // // -// $Id: G4Hype.hh,v 1.14 2006/06/29 18:47:01 gunter Exp $ +// $Id: G4Hype.hh,v 1.15 2006/10/20 13:45:20 gcosmo Exp $ // $Original: G4Hype.hh,v 1.0 1998/06/09 16:57:50 safai Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- @@ -114,6 +114,7 @@ class G4Hype : public G4VSolid std::ostream& StreamInfo(std::ostream& os) const; G4double GetCubicVolume(); + G4double GetSurfaceArea(); G4ThreeVector GetPointOnSurface() const; @@ -189,6 +190,7 @@ class G4Hype : public G4VSolid private: G4double fCubicVolume; + G4double fSurfaceArea; mutable G4Polyhedron* fpPolyhedron; diff --git a/source/geometry/solids/specific/include/G4Hype.icc b/source/geometry/solids/specific/include/G4Hype.icc index 0acb8aa5c9..90057382d1 100644 --- a/source/geometry/solids/specific/include/G4Hype.icc +++ b/source/geometry/solids/specific/include/G4Hype.icc @@ -25,7 +25,7 @@ // // // $Id: G4Hype.icc,v 1.7 2006/06/29 18:47:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/specific/include/G4IntersectingCone.hh b/source/geometry/solids/specific/include/G4IntersectingCone.hh index 68ed2d0b59..a7c9a3f253 100644 --- a/source/geometry/solids/specific/include/G4IntersectingCone.hh +++ b/source/geometry/solids/specific/include/G4IntersectingCone.hh @@ -25,7 +25,7 @@ // // // $Id: G4IntersectingCone.hh,v 1.9 2006/06/29 18:47:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/include/G4PolyPhiFace.hh b/source/geometry/solids/specific/include/G4PolyPhiFace.hh index 33d5d4cfa8..d4c1e7c214 100644 --- a/source/geometry/solids/specific/include/G4PolyPhiFace.hh +++ b/source/geometry/solids/specific/include/G4PolyPhiFace.hh @@ -25,7 +25,7 @@ // // // $Id: G4PolyPhiFace.hh,v 1.9 2006/06/29 18:47:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/include/G4PolyPhiFace.icc b/source/geometry/solids/specific/include/G4PolyPhiFace.icc index 58628e90d1..8d0183a052 100644 --- a/source/geometry/solids/specific/include/G4PolyPhiFace.icc +++ b/source/geometry/solids/specific/include/G4PolyPhiFace.icc @@ -25,7 +25,7 @@ // // // $Id: G4PolyPhiFace.icc,v 1.6 2006/06/29 18:47:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/include/G4Polycone.hh b/source/geometry/solids/specific/include/G4Polycone.hh index 7a77be6409..b2db869ac7 100644 --- a/source/geometry/solids/specific/include/G4Polycone.hh +++ b/source/geometry/solids/specific/include/G4Polycone.hh @@ -25,7 +25,7 @@ // // // $Id: G4Polycone.hh,v 1.19 2006/06/29 18:47:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/include/G4Polycone.icc b/source/geometry/solids/specific/include/G4Polycone.icc index 3ce405b16e..42fd0cf829 100644 --- a/source/geometry/solids/specific/include/G4Polycone.icc +++ b/source/geometry/solids/specific/include/G4Polycone.icc @@ -25,7 +25,7 @@ // // // $Id: G4Polycone.icc,v 1.10 2006/06/29 18:47:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/specific/include/G4PolyconeSide.hh b/source/geometry/solids/specific/include/G4PolyconeSide.hh index d437fe3ec5..3e83e4cc73 100644 --- a/source/geometry/solids/specific/include/G4PolyconeSide.hh +++ b/source/geometry/solids/specific/include/G4PolyconeSide.hh @@ -25,7 +25,7 @@ // // // $Id: G4PolyconeSide.hh,v 1.8 2006/06/29 18:47:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/include/G4Polyhedra.hh b/source/geometry/solids/specific/include/G4Polyhedra.hh index 736a8daf48..97724926e2 100644 --- a/source/geometry/solids/specific/include/G4Polyhedra.hh +++ b/source/geometry/solids/specific/include/G4Polyhedra.hh @@ -25,7 +25,7 @@ // // // $Id: G4Polyhedra.hh,v 1.16 2006/06/29 18:47:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/include/G4Polyhedra.icc b/source/geometry/solids/specific/include/G4Polyhedra.icc index e5d32876be..04b98fecdb 100644 --- a/source/geometry/solids/specific/include/G4Polyhedra.icc +++ b/source/geometry/solids/specific/include/G4Polyhedra.icc @@ -25,7 +25,7 @@ // // // $Id: G4Polyhedra.icc,v 1.10 2006/06/29 18:47:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 inline definitions file diff --git a/source/geometry/solids/specific/include/G4PolyhedraSide.hh b/source/geometry/solids/specific/include/G4PolyhedraSide.hh index a5054dd698..98eababb66 100644 --- a/source/geometry/solids/specific/include/G4PolyhedraSide.hh +++ b/source/geometry/solids/specific/include/G4PolyhedraSide.hh @@ -25,7 +25,7 @@ // // // $Id: G4PolyhedraSide.hh,v 1.8 2006/06/29 18:47:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/include/G4QuadrangularFacet.hh b/source/geometry/solids/specific/include/G4QuadrangularFacet.hh index 4ece435f69..a88390f1ca 100644 --- a/source/geometry/solids/specific/include/G4QuadrangularFacet.hh +++ b/source/geometry/solids/specific/include/G4QuadrangularFacet.hh @@ -25,7 +25,7 @@ // ******************************************************************** // // $Id: G4QuadrangularFacet.hh,v 1.3 2006/06/29 18:47:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% // diff --git a/source/geometry/solids/specific/include/G4ReduciblePolygon.hh b/source/geometry/solids/specific/include/G4ReduciblePolygon.hh index c3ccee63eb..bfbe5f5404 100644 --- a/source/geometry/solids/specific/include/G4ReduciblePolygon.hh +++ b/source/geometry/solids/specific/include/G4ReduciblePolygon.hh @@ -25,7 +25,7 @@ // // // $Id: G4ReduciblePolygon.hh,v 1.9 2006/06/29 18:47:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/include/G4SolidExtentList.hh b/source/geometry/solids/specific/include/G4SolidExtentList.hh index 6e81d11bed..e42d3ecd45 100644 --- a/source/geometry/solids/specific/include/G4SolidExtentList.hh +++ b/source/geometry/solids/specific/include/G4SolidExtentList.hh @@ -25,7 +25,7 @@ // // // $Id: G4SolidExtentList.hh,v 1.7 2006/06/29 18:47:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/include/G4TessellatedSolid.hh b/source/geometry/solids/specific/include/G4TessellatedSolid.hh index a27ec01ab3..836c0a81fd 100644 --- a/source/geometry/solids/specific/include/G4TessellatedSolid.hh +++ b/source/geometry/solids/specific/include/G4TessellatedSolid.hh @@ -24,8 +24,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4TessellatedSolid.hh,v 1.3 2006/06/29 18:47:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4TessellatedSolid.hh,v 1.4 2006/10/20 13:45:20 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% // @@ -139,7 +139,9 @@ class G4TessellatedSolid : public G4VSolid G4VFacet *GetFacet (size_t i) const; size_t GetNumberOfFacets () const; -// G4double GetCubicVolume (); + G4double GetCubicVolume (); + G4double GetSurfaceArea (); + // // void ComputeDimensions (G4VPVParameterisation* p, const G4int n, // const G4VPhysicalVolume* pRep) const; @@ -177,6 +179,13 @@ class G4TessellatedSolid : public G4VSolid G4Polyhedron* GetPolyhedron () const; G4NURBS* CreateNURBS () const; + public: // without description + + G4TessellatedSolid(__void__&); + // Fake default constructor for usage restricted to direct object + // persistency for clients requiring preallocation of memory for + // persistifiable objects. + protected: // with description void DeleteObjects (); @@ -193,6 +202,7 @@ class G4TessellatedSolid : public G4VSolid std::vector facets; G4GeometryType geometryType; G4double cubicVolume; + G4double surfaceArea; G4ThreeVectorList vertexList; G4double xMinExtent; G4double xMaxExtent; diff --git a/source/geometry/solids/specific/include/G4Tet.hh b/source/geometry/solids/specific/include/G4Tet.hh index b3dd7da78d..e54cdfd4b6 100644 --- a/source/geometry/solids/specific/include/G4Tet.hh +++ b/source/geometry/solids/specific/include/G4Tet.hh @@ -28,8 +28,8 @@ // ******************************************************************** // // -// $Id: G4Tet.hh,v 1.7 2006/06/29 18:47:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Tet.hh,v 1.9 2006/11/13 08:58:03 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- @@ -46,6 +46,7 @@ // ------- // 03.09.2004 - M.H.Mendenhall & R.A.Weller (Vanderbilt University, USA) // 10.02.2005 - D.Anninos (CERN) - Added GetPointOnSurface() method. +// 12.11.2006 - M.H.Mendenhall - Added GetSurfaceArea() concrete implementation. // -------------------------------------------------------------------- #ifndef G4TET_HH #define G4TET_HH @@ -90,7 +91,8 @@ class G4Tet : public G4VSolid G4double DistanceToOut(const G4ThreeVector& p) const; - G4double GetCubicVolume() {return fCubicVolume;} + G4double GetCubicVolume(); + G4double GetSurfaceArea(); G4GeometryType GetEntityType() const; @@ -114,7 +116,7 @@ class G4Tet : public G4VSolid // persistifiable objects. const char* CVSHeaderVers() - { return "$Id: G4Tet.hh,v 1.7 2006/06/29 18:47:38 gunter Exp $"; } + { return "$Id: G4Tet.hh,v 1.9 2006/11/13 08:58:03 gcosmo Exp $"; } const char* CVSFileVers() { return CVSVers; } void PrintWarnings(G4bool flag) @@ -135,7 +137,7 @@ class G4Tet : public G4VSolid private: - G4double fCubicVolume; + G4double fCubicVolume, fSurfaceArea; mutable G4Polyhedron* fpPolyhedron; diff --git a/source/geometry/solids/specific/include/G4TriangularFacet.hh b/source/geometry/solids/specific/include/G4TriangularFacet.hh index 591a99f5b3..e21027f8d5 100644 --- a/source/geometry/solids/specific/include/G4TriangularFacet.hh +++ b/source/geometry/solids/specific/include/G4TriangularFacet.hh @@ -25,7 +25,7 @@ // ******************************************************************** // // $Id: G4TriangularFacet.hh,v 1.3 2006/06/29 18:47:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% // diff --git a/source/geometry/solids/specific/include/G4TwistTrapFlatSide.hh b/source/geometry/solids/specific/include/G4TwistTrapFlatSide.hh index f3294f08d3..91da50ab12 100644 --- a/source/geometry/solids/specific/include/G4TwistTrapFlatSide.hh +++ b/source/geometry/solids/specific/include/G4TwistTrapFlatSide.hh @@ -25,7 +25,7 @@ // // // $Id: G4TwistTrapFlatSide.hh,v 1.5 2006/06/29 18:47:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/include/G4TwistTubsFlatSide.hh b/source/geometry/solids/specific/include/G4TwistTubsFlatSide.hh index 35ca7bd432..81ef7c42d7 100644 --- a/source/geometry/solids/specific/include/G4TwistTubsFlatSide.hh +++ b/source/geometry/solids/specific/include/G4TwistTubsFlatSide.hh @@ -25,7 +25,7 @@ // // // $Id: G4TwistTubsFlatSide.hh,v 1.5 2006/06/29 18:47:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/include/G4TwistTubsHypeSide.hh b/source/geometry/solids/specific/include/G4TwistTubsHypeSide.hh index 3b0b978512..126ded458b 100644 --- a/source/geometry/solids/specific/include/G4TwistTubsHypeSide.hh +++ b/source/geometry/solids/specific/include/G4TwistTubsHypeSide.hh @@ -25,7 +25,7 @@ // // // $Id: G4TwistTubsHypeSide.hh,v 1.5 2006/06/29 18:47:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/include/G4TwistTubsSide.hh b/source/geometry/solids/specific/include/G4TwistTubsSide.hh index 444af63cbe..1d63e51efb 100644 --- a/source/geometry/solids/specific/include/G4TwistTubsSide.hh +++ b/source/geometry/solids/specific/include/G4TwistTubsSide.hh @@ -25,7 +25,7 @@ // // // $Id: G4TwistTubsSide.hh,v 1.5 2006/06/29 18:47:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/include/G4TwistedBox.hh b/source/geometry/solids/specific/include/G4TwistedBox.hh index 2646934cca..ca583190bd 100644 --- a/source/geometry/solids/specific/include/G4TwistedBox.hh +++ b/source/geometry/solids/specific/include/G4TwistedBox.hh @@ -25,7 +25,7 @@ // // // $Id: G4TwistedBox.hh,v 1.10 2006/06/29 18:48:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/include/G4TwistedTrap.hh b/source/geometry/solids/specific/include/G4TwistedTrap.hh index ab11d08809..f39ead3ad4 100644 --- a/source/geometry/solids/specific/include/G4TwistedTrap.hh +++ b/source/geometry/solids/specific/include/G4TwistedTrap.hh @@ -25,7 +25,7 @@ // // // $Id: G4TwistedTrap.hh,v 1.10 2006/06/29 18:48:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/include/G4TwistedTrd.hh b/source/geometry/solids/specific/include/G4TwistedTrd.hh index 1a90d74897..253ec152f5 100644 --- a/source/geometry/solids/specific/include/G4TwistedTrd.hh +++ b/source/geometry/solids/specific/include/G4TwistedTrd.hh @@ -25,7 +25,7 @@ // // // $Id: G4TwistedTrd.hh,v 1.6 2006/06/29 18:48:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/include/G4TwistedTubs.hh b/source/geometry/solids/specific/include/G4TwistedTubs.hh index 2417cb3928..0d346510cd 100644 --- a/source/geometry/solids/specific/include/G4TwistedTubs.hh +++ b/source/geometry/solids/specific/include/G4TwistedTubs.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4TwistedTubs.hh,v 1.12 2006/06/29 18:48:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4TwistedTubs.hh,v 1.13 2006/10/20 13:45:20 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- @@ -170,6 +170,9 @@ class G4TwistedTubs : public G4VSolid G4double GetCubicVolume(); // Returns an estimation of the geometrical cubic volume of the // solid. Caches the computed value once computed the first time. + G4double GetSurfaceArea(); + // Returns an estimation of the geometrical surface area of the + // solid. Caches the computed value once computed the first time. G4ThreeVector GetPointOnSurface() const ; @@ -231,6 +234,7 @@ class G4TwistedTubs : public G4VSolid G4VTwistSurface *fOuterHype; // Surface of +ve r G4double fCubicVolume; // Cached value for cubic volume + G4double fSurfaceArea; // Cached value for surface area mutable G4Polyhedron* fpPolyhedron; // pointer to polyhedron for vis diff --git a/source/geometry/solids/specific/include/G4VCSGface.hh b/source/geometry/solids/specific/include/G4VCSGface.hh index 04c4681fe1..fe662040a8 100644 --- a/source/geometry/solids/specific/include/G4VCSGface.hh +++ b/source/geometry/solids/specific/include/G4VCSGface.hh @@ -25,7 +25,7 @@ // // // $Id: G4VCSGface.hh,v 1.7 2006/06/29 18:48:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/include/G4VCSGfaceted.hh b/source/geometry/solids/specific/include/G4VCSGfaceted.hh index 0ae1240768..76b82b41a5 100644 --- a/source/geometry/solids/specific/include/G4VCSGfaceted.hh +++ b/source/geometry/solids/specific/include/G4VCSGfaceted.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VCSGfaceted.hh,v 1.12 2006/06/29 18:48:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VCSGfaceted.hh,v 1.13 2006/10/20 13:45:20 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- @@ -55,7 +55,7 @@ class G4VCSGfaceted : public G4VSolid { public: // with description - G4VCSGfaceted( G4String name ); + G4VCSGfaceted( const G4String& name ); virtual ~G4VCSGfaceted(); G4VCSGfaceted( const G4VCSGfaceted &source ); @@ -96,10 +96,17 @@ class G4VCSGfaceted : public G4VSolid G4double GetCubVolEpsilon() const; void SetCubVolStatistics(G4int st); void SetCubVolEpsilon(G4double ep); + G4int GetAreaStatistics() const; + G4double GetAreaAccuracy() const; + void SetAreaStatistics(G4int st); + void SetAreaAccuracy(G4double ep); virtual G4double GetCubicVolume(); // Returns an estimation of the geometrical cubic volume of the // solid. Caches the computed value once computed the first time. + virtual G4double GetSurfaceArea(); + // Returns an estimation of the geometrical surface area of the + // solid. Caches the computed value once computed the first time. public: // without description @@ -113,6 +120,7 @@ class G4VCSGfaceted : public G4VSolid G4int numFace; G4VCSGface **faces; G4double fCubicVolume; + G4double fSurfaceArea; mutable G4Polyhedron* fpPolyhedron; virtual G4double DistanceTo( const G4ThreeVector &p, @@ -123,8 +131,9 @@ class G4VCSGfaceted : public G4VSolid private: - G4int fCubVolStatistics; + G4int fStatistics; G4double fCubVolEpsilon; + G4double fAreaAccuracy; // Statistics, error accuracy for volume estimation. }; diff --git a/source/geometry/solids/specific/include/G4VFacet.hh b/source/geometry/solids/specific/include/G4VFacet.hh index c49b7bba9a..b64811a5f8 100644 --- a/source/geometry/solids/specific/include/G4VFacet.hh +++ b/source/geometry/solids/specific/include/G4VFacet.hh @@ -25,7 +25,7 @@ // ******************************************************************** // // $Id: G4VFacet.hh,v 1.3 2006/06/29 18:48:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% // diff --git a/source/geometry/solids/specific/include/G4VFacet.icc b/source/geometry/solids/specific/include/G4VFacet.icc index faa54ae308..9c7f187b26 100644 --- a/source/geometry/solids/specific/include/G4VFacet.icc +++ b/source/geometry/solids/specific/include/G4VFacet.icc @@ -25,7 +25,7 @@ // ******************************************************************** // // $Id: G4VFacet.icc,v 1.3 2006/06/29 18:48:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% // diff --git a/source/geometry/solids/specific/include/G4VTwistSurface.hh b/source/geometry/solids/specific/include/G4VTwistSurface.hh index fea04112f4..ffd6522939 100644 --- a/source/geometry/solids/specific/include/G4VTwistSurface.hh +++ b/source/geometry/solids/specific/include/G4VTwistSurface.hh @@ -25,7 +25,7 @@ // // // $Id: G4VTwistSurface.hh,v 1.5 2006/06/29 18:48:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/include/G4VTwistSurface.icc b/source/geometry/solids/specific/include/G4VTwistSurface.icc index e7e28fcb2c..2c0dda3cd6 100644 --- a/source/geometry/solids/specific/include/G4VTwistSurface.icc +++ b/source/geometry/solids/specific/include/G4VTwistSurface.icc @@ -25,7 +25,7 @@ // // // $Id: G4VTwistSurface.icc,v 1.3 2006/06/29 18:48:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/include/G4VTwistedFaceted.hh b/source/geometry/solids/specific/include/G4VTwistedFaceted.hh index 7c40848163..e657a391ec 100644 --- a/source/geometry/solids/specific/include/G4VTwistedFaceted.hh +++ b/source/geometry/solids/specific/include/G4VTwistedFaceted.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VTwistedFaceted.hh,v 1.9 2006/06/29 18:48:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VTwistedFaceted.hh,v 1.10 2006/10/20 13:45:20 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 class header file @@ -107,6 +107,7 @@ class G4VTwistedFaceted: public G4VSolid G4ThreeVector GetPointInSolid(G4double z) const; virtual inline G4double GetCubicVolume() ; + virtual inline G4double GetSurfaceArea() ; virtual void DescribeYourselfTo (G4VGraphicsScene &scene) const; virtual G4Polyhedron *CreatePolyhedron () const ; @@ -194,7 +195,8 @@ class G4VTwistedFaceted: public G4VSolid G4VTwistSurface *fSide180 ; // Twisted Side at phi = 180 deg G4VTwistSurface *fSide270 ; // Twisted Side at phi = 270 deg - G4double fCubicVolume ; // volume of the twisted trapezoid + G4double fCubicVolume ; // volume of the solid + G4double fSurfaceArea ; // area of the solid mutable G4Polyhedron* fpPolyhedron; // pointer to polyhedron for vis @@ -275,14 +277,20 @@ class G4VTwistedFaceted: public G4VSolid inline G4double G4VTwistedFaceted::GetCubicVolume() { - - if(fCubicVolume != 0.) ; else fCubicVolume = 2 * fDz * ( ( fDx1 + fDx2 ) * fDy1 + ( fDx3 + fDx4 ) * fDy2 ); return fCubicVolume; } +inline +G4double G4VTwistedFaceted::GetSurfaceArea() +{ + if(fSurfaceArea != 0.) ; + else fSurfaceArea = G4VSolid::GetSurfaceArea(); + return fSurfaceArea; +} + inline G4double G4VTwistedFaceted::GetValueA(G4double phi) const { diff --git a/source/geometry/solids/specific/src/G4ClippablePolygon.cc b/source/geometry/solids/specific/src/G4ClippablePolygon.cc index 04f5684091..d7ecd461b8 100644 --- a/source/geometry/solids/specific/src/G4ClippablePolygon.cc +++ b/source/geometry/solids/specific/src/G4ClippablePolygon.cc @@ -25,7 +25,7 @@ // // // $Id: G4ClippablePolygon.cc,v 1.11 2006/06/29 18:48:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/src/G4Ellipsoid.cc b/source/geometry/solids/specific/src/G4Ellipsoid.cc index 2fb7e369cb..9fd799113e 100644 --- a/source/geometry/solids/specific/src/G4Ellipsoid.cc +++ b/source/geometry/solids/specific/src/G4Ellipsoid.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4Ellipsoid.cc,v 1.12 2006/06/29 18:48:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Ellipsoid.cc,v 1.13 2006/10/20 13:45:20 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4Ellipsoid // @@ -67,7 +67,7 @@ G4Ellipsoid::G4Ellipsoid(const G4String& pName, G4double pzSemiAxis, G4double pzBottomCut, G4double pzTopCut) - : G4VSolid(pName), fpPolyhedron(0), fCubicVolume(0.), + : G4VSolid(pName), fpPolyhedron(0), fCubicVolume(0.), fSurfaceArea(0.), zBottomCut(0.), zTopCut(0.) { // note: for users that want to use the full ellipsoid it is useful @@ -112,7 +112,7 @@ G4Ellipsoid::G4Ellipsoid(const G4String& pName, // for usage restricted to object persistency. // G4Ellipsoid::G4Ellipsoid( __void__& a ) - : G4VSolid(a), fpPolyhedron(0), fCubicVolume(0.) + : G4VSolid(a), fpPolyhedron(0), fCubicVolume(0.), fSurfaceArea(0.) { } diff --git a/source/geometry/solids/specific/src/G4EllipticalCone.cc b/source/geometry/solids/specific/src/G4EllipticalCone.cc index 8c95b8e9c1..43992234d0 100644 --- a/source/geometry/solids/specific/src/G4EllipticalCone.cc +++ b/source/geometry/solids/specific/src/G4EllipticalCone.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4EllipticalCone.cc,v 1.11 2006/06/29 18:48:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4EllipticalCone.cc,v 1.12 2006/10/20 13:45:21 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Implementation of G4EllipticalCone class // @@ -70,7 +70,8 @@ G4EllipticalCone::G4EllipticalCone(const G4String& pName, G4double pySemiAxis, G4double pzMax, G4double pzTopCut) - : G4VSolid(pName), fpPolyhedron(0), fCubicVolume(0.), zTopCut(0.) + : G4VSolid(pName), fpPolyhedron(0), fCubicVolume(0.), fSurfaceArea(0.), + zTopCut(0.) { // Check Semi-Axis @@ -108,7 +109,8 @@ G4EllipticalCone::G4EllipticalCone(const G4String& pName, // for usage restricted to object persistency. // G4EllipticalCone::G4EllipticalCone( __void__& a ) - : G4VSolid(a), fpPolyhedron(0), fCubicVolume(0.) + : G4VSolid(a), fpPolyhedron(0), fCubicVolume(0.), fSurfaceArea(0.), + zTopCut(0.) { } diff --git a/source/geometry/solids/specific/src/G4EllipticalTube.cc b/source/geometry/solids/specific/src/G4EllipticalTube.cc index 380c75208a..45fe6cd240 100644 --- a/source/geometry/solids/specific/src/G4EllipticalTube.cc +++ b/source/geometry/solids/specific/src/G4EllipticalTube.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4EllipticalTube.cc,v 1.26 2006/06/29 18:48:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4EllipticalTube.cc,v 1.27 2006/10/20 13:45:21 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- @@ -62,7 +62,7 @@ G4EllipticalTube::G4EllipticalTube( const G4String &name, G4double theDx, G4double theDy, G4double theDz ) - : G4VSolid( name ), fCubicVolume(0.), fpPolyhedron(0) + : G4VSolid( name ), fCubicVolume(0.), fSurfaceArea(0.), fpPolyhedron(0) { dx = theDx; dy = theDy; @@ -75,14 +75,18 @@ G4EllipticalTube::G4EllipticalTube( const G4String &name, // for usage restricted to object persistency. // G4EllipticalTube::G4EllipticalTube( __void__& a ) - : G4VSolid(a), fCubicVolume(0.), fpPolyhedron(0) + : G4VSolid(a), fCubicVolume(0.), fSurfaceArea(0.), fpPolyhedron(0) { } + // // Destructor // -G4EllipticalTube::~G4EllipticalTube() {delete fpPolyhedron;} +G4EllipticalTube::~G4EllipticalTube() +{ + delete fpPolyhedron; +} // @@ -766,11 +770,20 @@ G4GeometryType G4EllipticalTube::GetEntityType() const // G4double G4EllipticalTube::GetCubicVolume() { - if(fCubicVolume != 0.) ; - else fCubicVolume = G4VSolid::GetCubicVolume(); + if(fCubicVolume != 0.) {;} + else { fCubicVolume = G4VSolid::GetCubicVolume(); } return fCubicVolume; } +// +// GetSurfaceArea +// +G4double G4EllipticalTube::GetSurfaceArea() +{ + if(fSurfaceArea != 0.) {;} + else { fSurfaceArea = G4VSolid::GetSurfaceArea(); } + return fSurfaceArea; +} // // Stream object contents to an output stream diff --git a/source/geometry/solids/specific/src/G4EnclosingCylinder.cc b/source/geometry/solids/specific/src/G4EnclosingCylinder.cc index 47eb992b47..200fdde013 100644 --- a/source/geometry/solids/specific/src/G4EnclosingCylinder.cc +++ b/source/geometry/solids/specific/src/G4EnclosingCylinder.cc @@ -25,7 +25,7 @@ // // // $Id: G4EnclosingCylinder.cc,v 1.9 2006/06/29 18:48:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/src/G4Hype.cc b/source/geometry/solids/specific/src/G4Hype.cc index a1715290e7..c428c0e809 100644 --- a/source/geometry/solids/specific/src/G4Hype.cc +++ b/source/geometry/solids/specific/src/G4Hype.cc @@ -24,9 +24,9 @@ // ******************************************************************** // // -// $Id: G4Hype.cc,v 1.24 2006/06/29 18:48:35 gunter Exp $ +// $Id: G4Hype.cc,v 1.25 2006/10/20 13:45:21 gcosmo Exp $ // $Original: G4Hype.cc,v 1.0 1998/06/09 16:57:50 safai Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- @@ -76,7 +76,7 @@ G4Hype::G4Hype(const G4String& pName, G4double newInnerStereo, G4double newOuterStereo, G4double newHalfLenZ) - : G4VSolid(pName), fCubicVolume(0.), fpPolyhedron(0) + : G4VSolid(pName), fCubicVolume(0.), fSurfaceArea(0.), fpPolyhedron(0) { // Check z-len // @@ -141,7 +141,7 @@ G4Hype::G4Hype(const G4String& pName, // for usage restricted to object persistency. // G4Hype::G4Hype( __void__& a ) - : G4VSolid(a), fCubicVolume(0.), fpPolyhedron(0) + : G4VSolid(a), fCubicVolume(0.), fSurfaceArea(0.), fpPolyhedron(0) { } @@ -1329,12 +1329,23 @@ G4GeometryType G4Hype::GetEntityType() const // G4double G4Hype::GetCubicVolume() { - if(fCubicVolume != 0.) ; - else fCubicVolume = G4VSolid::GetCubicVolume(); + if(fCubicVolume != 0.) {;} + else { fCubicVolume = G4VSolid::GetCubicVolume(); } return fCubicVolume; } +// +// GetSurfaceArea +// +G4double G4Hype::GetSurfaceArea() +{ + if(fSurfaceArea != 0.) {;} + else { fSurfaceArea = G4VSolid::GetSurfaceArea(); } + return fSurfaceArea; +} + + // // Stream object contents to an output stream // diff --git a/source/geometry/solids/specific/src/G4IntersectingCone.cc b/source/geometry/solids/specific/src/G4IntersectingCone.cc index d88487b5d0..afe916f4ac 100644 --- a/source/geometry/solids/specific/src/G4IntersectingCone.cc +++ b/source/geometry/solids/specific/src/G4IntersectingCone.cc @@ -25,7 +25,7 @@ // // // $Id: G4IntersectingCone.cc,v 1.8 2006/06/29 18:48:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/src/G4PolyPhiFace.cc b/source/geometry/solids/specific/src/G4PolyPhiFace.cc index b05b6b7943..4ba54b2ef9 100644 --- a/source/geometry/solids/specific/src/G4PolyPhiFace.cc +++ b/source/geometry/solids/specific/src/G4PolyPhiFace.cc @@ -25,7 +25,7 @@ // // // $Id: G4PolyPhiFace.cc,v 1.10 2006/06/29 18:48:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/src/G4Polycone.cc b/source/geometry/solids/specific/src/G4Polycone.cc index 7a15bb5f94..623e00c4a7 100644 --- a/source/geometry/solids/specific/src/G4Polycone.cc +++ b/source/geometry/solids/specific/src/G4Polycone.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Polycone.cc,v 1.29 2006/06/29 18:48:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Polycone.cc,v 1.34 2006/11/15 10:40:38 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- @@ -825,13 +825,285 @@ G4Polyhedron* G4Polycone::CreatePolyhedron() const } else { - G4cerr << "ERROR - G4Polycone::CreatePolyhedron(): " << GetName() << G4endl - << " Visualization of the 'generic' G4Polycone type" << G4endl - << " is not supported at this time !" << G4endl - << " Use the alternative constructor instead." << G4endl; - return 0; + // The following code prepares for: + // HepPolyhedron::createPolyhedron(int Nnodes, int Nfaces, + // const double xyz[][3], + // const int faces_vec[][4]) + // Here is an extract from the header file HepPolyhedron.h: + /** + * Creates user defined polyhedron. + * This function allows to the user to define arbitrary polyhedron. + * The faces of the polyhedron should be either triangles or planar + * quadrilateral. Nodes of a face are defined by indexes pointing to + * the elements in the xyz array. Numeration of the elements in the + * array starts from 1 (like in fortran). The indexes can be positive + * or negative. Negative sign means that the corresponding edge is + * invisible. The normal of the face should be directed to exterior + * of the polyhedron. + * + * @param Nnodes number of nodes + * @param Nfaces number of faces + * @param xyz nodes + * @param faces_vec faces (quadrilaterals or triangles) + * @return status of the operation - is non-zero in case of problem + */ + const G4int numSide = + G4int(G4Polyhedron::GetNumberOfRotationSteps() + * (endPhi - startPhi) / twopi) + 1; + G4int nNodes; + G4int nFaces; + typedef G4double double3[3]; + double3* xyz; + typedef G4int int4[4]; + int4* faces_vec; + if (phiIsOpen) + { + // Triangulate open ends. Simple ear-chopping algorithm... + // I'm not sure how robust this algorithm is (J.Allison). + // + std::vector chopped(numCorner, false); + std::vector triQuads; + G4int remaining = numCorner; + G4int iStarter = 0; + while (remaining >= 3) + { + // Find unchopped corners... + // + G4int A = -1, B = -1, C = -1; + G4int iStepper = iStarter; + do + { + if (A < 0) { A = iStepper; } + else if (B < 0) { B = iStepper; } + else if (C < 0) { C = iStepper; } + do + { + if (++iStepper >= numCorner) { iStepper = 0; } + } + while (chopped[iStepper]); + } + while (C < 0 && iStepper != iStarter); + + // Check triangle at B is pointing outward (an "ear"). + // Sign of z cross product determines... + // + G4double BAr = corners[A].r - corners[B].r; + G4double BAz = corners[A].z - corners[B].z; + G4double BCr = corners[C].r - corners[B].r; + G4double BCz = corners[C].z - corners[B].z; + if (BAr * BCz - BAz * BCr < kCarTolerance) + { + G4int* tq = new G4int[3]; + tq[0] = A + 1; + tq[1] = B + 1; + tq[2] = C + 1; + triQuads.push_back(tq); + chopped[B] = true; + --remaining; + } + else + { + do + { + if (++iStarter >= numCorner) { iStarter = 0; } + } + while (chopped[iStarter]); + } + } + // Transfer to faces... + // + nNodes = (numSide + 1) * numCorner; + nFaces = numSide * numCorner + 2 * triQuads.size(); + faces_vec = new int4[nFaces]; + G4int iface = 0; + G4int addition = numCorner * numSide; + G4int d = numCorner - 1; + for (G4int iEnd = 0; iEnd < 2; ++iEnd) + { + for (size_t i = 0; i < triQuads.size(); ++i) + { + // Negative for soft/auxiliary/normally invisible edges... + // + G4int a, b, c; + if (iEnd == 0) + { + a = triQuads[i][0]; + b = triQuads[i][1]; + c = triQuads[i][2]; + } + else + { + a = triQuads[i][0] + addition; + b = triQuads[i][2] + addition; + c = triQuads[i][1] + addition; + } + G4int ab = std::abs(b - a); + G4int bc = std::abs(c - b); + G4int ca = std::abs(a - c); + faces_vec[iface][0] = (ab == 1 || ab == d)? a: -a; + faces_vec[iface][1] = (bc == 1 || bc == d)? b: -b; + faces_vec[iface][2] = (ca == 1 || ca == d)? c: -c; + faces_vec[iface][3] = 0; + ++iface; + } + } + + // Continue with sides... + + xyz = new double3[nNodes]; + const G4double dPhi = (endPhi - startPhi) / numSide; + G4double phi = startPhi; + G4int ixyz = 0; + for (G4int iSide = 0; iSide < numSide; ++iSide) + { + for (G4int iCorner = 0; iCorner < numCorner; ++iCorner) + { + xyz[ixyz][0] = corners[iCorner].r * std::cos(phi); + xyz[ixyz][1] = corners[iCorner].r * std::sin(phi); + xyz[ixyz][2] = corners[iCorner].z; + if (iSide == 0) // startPhi + { + if (iCorner < numCorner - 1) + { + faces_vec[iface][0] = ixyz + 1; + faces_vec[iface][1] = -(ixyz + numCorner + 1); + faces_vec[iface][2] = ixyz + numCorner + 2; + faces_vec[iface][3] = ixyz + 2; + } + else + { + faces_vec[iface][0] = ixyz + 1; + faces_vec[iface][1] = -(ixyz + numCorner + 1); + faces_vec[iface][2] = ixyz + 2; + faces_vec[iface][3] = ixyz - numCorner + 2; + } + } + else if (iSide == numSide - 1) // endPhi + { + if (iCorner < numCorner - 1) + { + faces_vec[iface][0] = ixyz + 1; + faces_vec[iface][1] = ixyz + numCorner + 1; + faces_vec[iface][2] = ixyz + numCorner + 2; + faces_vec[iface][3] = -(ixyz + 2); + } + else + { + faces_vec[iface][0] = ixyz + 1; + faces_vec[iface][1] = ixyz + numCorner + 1; + faces_vec[iface][2] = ixyz + 2; + faces_vec[iface][3] = -(ixyz - numCorner + 2); + } + } + else + { + if (iCorner < numCorner - 1) + { + faces_vec[iface][0] = ixyz + 1; + faces_vec[iface][1] = -(ixyz + numCorner + 1); + faces_vec[iface][2] = ixyz + numCorner + 2; + faces_vec[iface][3] = -(ixyz + 2); + } + else + { + faces_vec[iface][0] = ixyz + 1; + faces_vec[iface][1] = -(ixyz + numCorner + 1); + faces_vec[iface][2] = ixyz + 2; + faces_vec[iface][3] = -(ixyz - numCorner + 2); + } + } + ++iface; + ++ixyz; + } + phi += dPhi; + } + + // Last corners... + + for (G4int iCorner = 0; iCorner < numCorner; ++iCorner) + { + xyz[ixyz][0] = corners[iCorner].r * std::cos(phi); + xyz[ixyz][1] = corners[iCorner].r * std::sin(phi); + xyz[ixyz][2] = corners[iCorner].z; + ++ixyz; + } + } + else // !phiIsOpen - i.e., a complete 360 degrees. + { + nNodes = numSide * numCorner; + nFaces = numSide * numCorner;; + xyz = new double3[nNodes]; + faces_vec = new int4[nFaces]; + const G4double dPhi = (endPhi - startPhi) / numSide; + G4double phi = startPhi; + G4int ixyz = 0, iface = 0; + for (G4int iSide = 0; iSide < numSide; ++iSide) + { + for (G4int iCorner = 0; iCorner < numCorner; ++iCorner) + { + xyz[ixyz][0] = corners[iCorner].r * std::cos(phi); + xyz[ixyz][1] = corners[iCorner].r * std::sin(phi); + xyz[ixyz][2] = corners[iCorner].z; + + if (iSide < numSide - 1) + { + if (iCorner < numCorner - 1) + { + faces_vec[iface][0] = ixyz + 1; + faces_vec[iface][1] = -(ixyz + numCorner + 1); + faces_vec[iface][2] = ixyz + numCorner + 2; + faces_vec[iface][3] = -(ixyz + 2); + } + else + { + faces_vec[iface][0] = ixyz + 1; + faces_vec[iface][1] = -(ixyz + numCorner + 1); + faces_vec[iface][2] = ixyz + 2; + faces_vec[iface][3] = -(ixyz - numCorner + 2); + } + } + else // Last side joins ends... + { + if (iCorner < numCorner - 1) + { + faces_vec[iface][0] = ixyz + 1; + faces_vec[iface][1] = -(ixyz + numCorner - nFaces + 1); + faces_vec[iface][2] = ixyz + numCorner - nFaces + 2; + faces_vec[iface][3] = -(ixyz + 2); + } + else + { + faces_vec[iface][0] = ixyz + 1; + faces_vec[iface][1] = -(ixyz - nFaces + numCorner + 1); + faces_vec[iface][2] = ixyz - nFaces + 2; + faces_vec[iface][3] = -(ixyz - numCorner + 2); + } + } + ++ixyz; + ++iface; + } + phi += dPhi; + } + } + G4Polyhedron* polyhedron = new G4Polyhedron; + G4int problem = polyhedron->createPolyhedron(nNodes, nFaces, xyz, faces_vec); + delete faces_vec; + delete xyz; + if (problem) + { + std::ostringstream oss; + oss << "Problem creating G4Polyhedron for: " << GetName(); + G4Exception("G4Polycone::CreatePolyhedron()", "BadPolyhedron", + JustWarning, oss.str().c_str()); + delete polyhedron; + return 0; + } + else + { + return polyhedron; + } } -} +} // diff --git a/source/geometry/solids/specific/src/G4PolyconeSide.cc b/source/geometry/solids/specific/src/G4PolyconeSide.cc index 561fbc8010..fc3499d9ef 100644 --- a/source/geometry/solids/specific/src/G4PolyconeSide.cc +++ b/source/geometry/solids/specific/src/G4PolyconeSide.cc @@ -25,7 +25,7 @@ // // // $Id: G4PolyconeSide.cc,v 1.13 2006/06/29 18:48:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/src/G4Polyhedra.cc b/source/geometry/solids/specific/src/G4Polyhedra.cc index 3fc58c0db4..80a8ea2d82 100644 --- a/source/geometry/solids/specific/src/G4Polyhedra.cc +++ b/source/geometry/solids/specific/src/G4Polyhedra.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Polyhedra.cc,v 1.29 2006/06/29 18:48:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Polyhedra.cc,v 1.32 2006/11/08 09:49:51 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- @@ -67,6 +67,8 @@ #include "G4ReduciblePolygon.hh" #include "G4VPVParameterisation.hh" +#include + using namespace CLHEP; // @@ -174,7 +176,7 @@ G4Polyhedra::G4Polyhedra( const G4String& name, // Set original_parameters struct for consistency // - SetOriginalParameters(); + SetOriginalParameters(); // In .icc; looks dodgy to me (J.Allison). Ignore. delete rz; } @@ -885,9 +887,6 @@ G4ThreeVector G4Polyhedra::GetPointOnSurface() const // G4Polyhedron* G4Polyhedra::CreatePolyhedron() const { - // - // This has to be fixed in visualization. Fake it for the moment. - // if (!genericPgon) { return new G4PolyhedronPgon( original_parameters->Start_angle, @@ -900,15 +899,245 @@ G4Polyhedron* G4Polyhedra::CreatePolyhedron() const } else { - G4cerr << "ERROR - G4Polyhedra::CreatePolyhedron() " << GetName() << G4endl - << " Visualization of the 'generic' G4Polyhedra type" - << G4endl - << " is not supported at this time !" << G4endl - << " Use the alternative constructor instead." << G4endl; - return 0; - } -} + // The following code prepares for: + // HepPolyhedron::createPolyhedron(int Nnodes, int Nfaces, + // const double xyz[][3], + // const int faces_vec[][4]) + // Here is an extract from the header file HepPolyhedron.h: + /** + * Creates user defined polyhedron. + * This function allows to the user to define arbitrary polyhedron. + * The faces of the polyhedron should be either triangles or planar + * quadrilateral. Nodes of a face are defined by indexes pointing to + * the elements in the xyz array. Numeration of the elements in the + * array starts from 1 (like in fortran). The indexes can be positive + * or negative. Negative sign means that the corresponding edge is + * invisible. The normal of the face should be directed to exterior + * of the polyhedron. + * + * @param Nnodes number of nodes + * @param Nfaces number of faces + * @param xyz nodes + * @param faces_vec faces (quadrilaterals or triangles) + * @return status of the operation - is non-zero in case of problem + */ + G4int nNodes; + G4int nFaces; + typedef G4double double3[3]; + double3* xyz; + typedef G4int int4[4]; + int4* faces_vec; + if (phiIsOpen) + { + // Triangulate open ends. Simple ear-chopping algorithm... + // I'm not sure how robust this algorithm is (J.Allison). + // + std::vector chopped(numCorner, false); + std::vector triQuads; + G4int remaining = numCorner; + G4int iStarter = 0; + while (remaining >= 3) + { + // Find unchopped corners... + // + G4int A = -1, B = -1, C = -1; + G4int iStepper = iStarter; + do + { + if (A < 0) { A = iStepper; } + else if (B < 0) { B = iStepper; } + else if (C < 0) { C = iStepper; } + do + { + if (++iStepper >= numCorner) iStepper = 0; + } + while (chopped[iStepper]); + } + while (C < 0 && iStepper != iStarter); + // Check triangle at B is pointing outward (an "ear"). + // Sign of z cross product determines... + + G4double BAr = corners[A].r - corners[B].r; + G4double BAz = corners[A].z - corners[B].z; + G4double BCr = corners[C].r - corners[B].r; + G4double BCz = corners[C].z - corners[B].z; + if (BAr * BCz - BAz * BCr < kCarTolerance) + { + G4int* tq = new G4int[3]; + tq[0] = A + 1; + tq[1] = B + 1; + tq[2] = C + 1; + triQuads.push_back(tq); + chopped[B] = true; + --remaining; + } + else + { + do + { + if (++iStarter >= numCorner) { iStarter = 0; } + } + while (chopped[iStarter]); + } + } + + // Transfer to faces... + + nNodes = (numSide + 1) * numCorner; + nFaces = numSide * numCorner + 2 * triQuads.size(); + faces_vec = new int4[nFaces]; + G4int iface = 0; + G4int addition = numCorner * numSide; + G4int d = numCorner - 1; + for (G4int iEnd = 0; iEnd < 2; ++iEnd) + { + for (size_t i = 0; i < triQuads.size(); ++i) + { + // Negative for soft/auxiliary/normally invisible edges... + // + G4int a, b, c; + if (iEnd == 0) + { + a = triQuads[i][0]; + b = triQuads[i][1]; + c = triQuads[i][2]; + } + else + { + a = triQuads[i][0] + addition; + b = triQuads[i][2] + addition; + c = triQuads[i][1] + addition; + } + G4int ab = std::abs(b - a); + G4int bc = std::abs(c - b); + G4int ca = std::abs(a - c); + faces_vec[iface][0] = (ab == 1 || ab == d)? a: -a; + faces_vec[iface][1] = (bc == 1 || bc == d)? b: -b; + faces_vec[iface][2] = (ca == 1 || ca == d)? c: -c; + faces_vec[iface][3] = 0; + ++iface; + } + } + + // Continue with sides... + + xyz = new double3[nNodes]; + const G4double dPhi = (endPhi - startPhi) / numSide; + G4double phi = startPhi; + G4int ixyz = 0; + for (G4int iSide = 0; iSide < numSide; ++iSide) + { + for (G4int iCorner = 0; iCorner < numCorner; ++iCorner) + { + xyz[ixyz][0] = corners[iCorner].r * std::cos(phi); + xyz[ixyz][1] = corners[iCorner].r * std::sin(phi); + xyz[ixyz][2] = corners[iCorner].z; + if (iCorner < numCorner - 1) + { + faces_vec[iface][0] = ixyz + 1; + faces_vec[iface][1] = ixyz + numCorner + 1; + faces_vec[iface][2] = ixyz + numCorner + 2; + faces_vec[iface][3] = ixyz + 2; + } + else + { + faces_vec[iface][0] = ixyz + 1; + faces_vec[iface][1] = ixyz + numCorner + 1; + faces_vec[iface][2] = ixyz + 2; + faces_vec[iface][3] = ixyz - numCorner + 2; + } + ++iface; + ++ixyz; + } + phi += dPhi; + } + + // Last corners... + + for (G4int iCorner = 0; iCorner < numCorner; ++iCorner) + { + xyz[ixyz][0] = corners[iCorner].r * std::cos(phi); + xyz[ixyz][1] = corners[iCorner].r * std::sin(phi); + xyz[ixyz][2] = corners[iCorner].z; + ++ixyz; + } + } + else // !phiIsOpen - i.e., a complete 360 degrees. + { + nNodes = numSide * numCorner; + nFaces = numSide * numCorner;; + xyz = new double3[nNodes]; + faces_vec = new int4[nFaces]; + const G4double dPhi = (endPhi - startPhi) / numSide; + G4double phi = startPhi; + G4int ixyz = 0, iface = 0; + for (G4int iSide = 0; iSide < numSide; ++iSide) + { + for (G4int iCorner = 0; iCorner < numCorner; ++iCorner) + { + xyz[ixyz][0] = corners[iCorner].r * std::cos(phi); + xyz[ixyz][1] = corners[iCorner].r * std::sin(phi); + xyz[ixyz][2] = corners[iCorner].z; + if (iSide < numSide - 1) + { + if (iCorner < numCorner - 1) + { + faces_vec[iface][0] = ixyz + 1; + faces_vec[iface][1] = ixyz + numCorner + 1; + faces_vec[iface][2] = ixyz + numCorner + 2; + faces_vec[iface][3] = ixyz + 2; + } + else + { + faces_vec[iface][0] = ixyz + 1; + faces_vec[iface][1] = ixyz + numCorner + 1; + faces_vec[iface][2] = ixyz + 2; + faces_vec[iface][3] = ixyz - numCorner + 2; + } + } + else // Last side joins ends... + { + if (iCorner < numCorner - 1) + { + faces_vec[iface][0] = ixyz + 1; + faces_vec[iface][1] = ixyz + numCorner - nFaces + 1; + faces_vec[iface][2] = ixyz + numCorner - nFaces + 2; + faces_vec[iface][3] = ixyz + 2; + } + else + { + faces_vec[iface][0] = ixyz + 1; + faces_vec[iface][1] = ixyz - nFaces + numCorner + 1; + faces_vec[iface][2] = ixyz - nFaces + 2; + faces_vec[iface][3] = ixyz - numCorner + 2; + } + } + ++ixyz; + ++iface; + } + phi += dPhi; + } + } + G4Polyhedron* polyhedron = new G4Polyhedron; + G4int problem = polyhedron->createPolyhedron(nNodes, nFaces, xyz, faces_vec); + delete faces_vec; + delete xyz; + if (problem) + { + std::ostringstream oss; + oss << "Problem creating G4Polyhedron for: " << GetName(); + G4Exception("G4Polyhedra::CreatePolyhedron()", "BadPolyhedron", + JustWarning, oss.str().c_str()); + delete polyhedron; + return 0; + } + else + { + return polyhedron; + } + } +} // // CreateNURBS diff --git a/source/geometry/solids/specific/src/G4PolyhedraSide.cc b/source/geometry/solids/specific/src/G4PolyhedraSide.cc index c021b00a9a..528254f7da 100644 --- a/source/geometry/solids/specific/src/G4PolyhedraSide.cc +++ b/source/geometry/solids/specific/src/G4PolyhedraSide.cc @@ -25,7 +25,7 @@ // // // $Id: G4PolyhedraSide.cc,v 1.11 2006/06/29 18:48:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/src/G4QuadrangularFacet.cc b/source/geometry/solids/specific/src/G4QuadrangularFacet.cc index 09942274b2..1e14e4a219 100644 --- a/source/geometry/solids/specific/src/G4QuadrangularFacet.cc +++ b/source/geometry/solids/specific/src/G4QuadrangularFacet.cc @@ -25,7 +25,7 @@ // ******************************************************************** // // $Id: G4QuadrangularFacet.cc,v 1.3 2006/06/29 18:48:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% // diff --git a/source/geometry/solids/specific/src/G4ReduciblePolygon.cc b/source/geometry/solids/specific/src/G4ReduciblePolygon.cc index 4cf9823802..ee63c04516 100644 --- a/source/geometry/solids/specific/src/G4ReduciblePolygon.cc +++ b/source/geometry/solids/specific/src/G4ReduciblePolygon.cc @@ -25,7 +25,7 @@ // // // $Id: G4ReduciblePolygon.cc,v 1.11 2006/06/29 18:48:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/src/G4SolidExtentList.cc b/source/geometry/solids/specific/src/G4SolidExtentList.cc index 227aad4e28..b4ccdec66b 100644 --- a/source/geometry/solids/specific/src/G4SolidExtentList.cc +++ b/source/geometry/solids/specific/src/G4SolidExtentList.cc @@ -25,7 +25,7 @@ // // // $Id: G4SolidExtentList.cc,v 1.4 2006/06/29 18:48:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/src/G4TessellatedSolid.cc b/source/geometry/solids/specific/src/G4TessellatedSolid.cc index 36dcf89fe3..a582a60bc6 100644 --- a/source/geometry/solids/specific/src/G4TessellatedSolid.cc +++ b/source/geometry/solids/specific/src/G4TessellatedSolid.cc @@ -24,8 +24,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4TessellatedSolid.cc,v 1.4 2006/06/29 18:48:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4TessellatedSolid.cc,v 1.5 2006/10/20 13:45:21 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% // @@ -62,7 +62,7 @@ // Standard contructor has blank name and defines no facets. // G4TessellatedSolid::G4TessellatedSolid () - : G4VSolid("dummy"), fpPolyhedron(0), cubicVolume(0.) + : G4VSolid("dummy"), fpPolyhedron(0), cubicVolume(0.), surfaceArea(0.) { dirTolerance = 1.0E-14; @@ -84,7 +84,7 @@ G4TessellatedSolid::G4TessellatedSolid () // to detine. // G4TessellatedSolid::G4TessellatedSolid (const G4String &name) - : G4VSolid(name), fpPolyhedron(0), cubicVolume(0.) + : G4VSolid(name), fpPolyhedron(0), cubicVolume(0.), surfaceArea(0.) { dirTolerance = 1.0E-14; @@ -100,6 +100,20 @@ G4TessellatedSolid::G4TessellatedSolid (const G4String &name) zMaxExtent = -kInfinity; } +/////////////////////////////////////////////////////////////////////////////// +// +// Fake default constructor - sets only member data and allocates memory +// for usage restricted to object persistency. +// +G4TessellatedSolid::G4TessellatedSolid( __void__& a ) + : G4VSolid(a), fpPolyhedron(0), facets(0), + geometryType("G4TessellatedSolid"), cubicVolume(0.), surfaceArea(0.), + vertexList(), xMinExtent(0.), xMaxExtent(0.), + yMinExtent(0.), yMaxExtent(0.), zMinExtent(0.), zMaxExtent(0.), + solidClosed(false), dirTolerance(0.) +{ +} + /////////////////////////////////////////////////////////////////////////////// // // Destructor. @@ -722,6 +736,18 @@ G4VisExtent G4TessellatedSolid::GetExtent () const /////////////////////////////////////////////////////////////////////////////// // -//G4double G4TessellatedSolid::GetCubicVolume () -// {return cubicVolume;} - +G4double G4TessellatedSolid::GetCubicVolume () +{ + if(cubicVolume != 0.) {;} + else { cubicVolume = G4VSolid::GetCubicVolume(); } + return cubicVolume; +} + +/////////////////////////////////////////////////////////////////////////////// +// +G4double G4TessellatedSolid::GetSurfaceArea () +{ + if(surfaceArea != 0.) {;} + else { surfaceArea = G4VSolid::GetSurfaceArea(); } + return surfaceArea; +} diff --git a/source/geometry/solids/specific/src/G4Tet.cc b/source/geometry/solids/specific/src/G4Tet.cc index eb4c89c3cd..2693fcf6de 100644 --- a/source/geometry/solids/specific/src/G4Tet.cc +++ b/source/geometry/solids/specific/src/G4Tet.cc @@ -27,8 +27,8 @@ // * * // ******************************************************************** // -// $Id: G4Tet.cc,v 1.9 2006/06/29 18:49:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Tet.cc,v 1.11 2006/11/13 08:58:03 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4Tet // @@ -50,12 +50,13 @@ // G4Exception // 20041103 - MHM removed many unused variables from class // 20040803 - Dionysios Anninos, added GetPointOnSurface() method +// 20061112 - MHM added code for G4VSolid GetSurfaceArea() // // -------------------------------------------------------------------- #include "G4Tet.hh" -const char G4Tet::CVSVers[]="$Id: G4Tet.cc,v 1.9 2006/06/29 18:49:00 gunter Exp $"; +const char G4Tet::CVSVers[]="$Id: G4Tet.cc,v 1.11 2006/11/13 08:58:03 gcosmo Exp $"; #include "G4VoxelLimits.hh" #include "G4AffineTransform.hh" @@ -154,10 +155,25 @@ G4Tet::G4Tet(const G4String& pName, G4ThreeVector fCenter142=(anchor+p4+p2)*(1.0/3.0); G4ThreeVector fCenter234=(p2+p3+p4)*(1.0/3.0); - fNormal123=fV31.cross(fV21).unit(); - fNormal134=fV41.cross(fV31).unit(); - fNormal142=fV21.cross(fV41).unit(); - fNormal234=fV32.cross(fV43).unit(); + // compute area of each triangular face by cross product + // and sum for total surface area + + G4ThreeVector normal123=fV31.cross(fV21); + G4ThreeVector normal134=fV41.cross(fV31); + G4ThreeVector normal142=fV21.cross(fV41); + G4ThreeVector normal234=fV32.cross(fV43); + + fSurfaceArea=( + normal123.mag()+ + normal134.mag()+ + normal142.mag()+ + normal234.mag() + )/2.0; + + fNormal123=normal123.unit(); + fNormal134=normal134.unit(); + fNormal142=normal142.unit(); + fNormal234=normal234.unit(); fCdotN123=fCenter123.dot(fNormal123); fCdotN134=fCenter134.dot(fNormal134); @@ -171,7 +187,13 @@ G4Tet::G4Tet(const G4String& pName, // for usage restricted to object persistency. // G4Tet::G4Tet( __void__& a ) - : G4VSolid(a), warningFlag(0) + : G4VSolid(a), fCubicVolume(0.), fSurfaceArea(0.), fpPolyhedron(0), + fAnchor(0,0,0), fP2(0,0,0), fP3(0,0,0), fP4(0,0,0), fMiddle(0,0,0), + fNormal123(0,0,0), fNormal142(0,0,0), fNormal134(0,0,0), + fNormal234(0,0,0), warningFlag(0), + fCdotN123(0.), fCdotN142(0.), fCdotN134(0.), fCdotN234(0.), + fXMin(0.), fXMax(0.), fYMin(0.), fYMax(0.), fZMin(0.), fZMax(0.), + fDx(0.), fDy(0.), fDz(0.), fTol(0.), fMaxSize(0.) { } @@ -661,6 +683,24 @@ std::vector G4Tet::GetVertices() const return vertices; } +//////////////////////////////////////////////////////////////////////// +// +// GetCubicVolume + +G4double G4Tet::GetCubicVolume() +{ + return fCubicVolume; +} + +//////////////////////////////////////////////////////////////////////// +// +// GetSurfaceArea + +G4double G4Tet::GetSurfaceArea() +{ + return fSurfaceArea; +} + // Methods for visualisation //////////////////////////////////////////////////////////////////////// diff --git a/source/geometry/solids/specific/src/G4TriangularFacet.cc b/source/geometry/solids/specific/src/G4TriangularFacet.cc index d4bc9444fe..8d2bcc9f43 100644 --- a/source/geometry/solids/specific/src/G4TriangularFacet.cc +++ b/source/geometry/solids/specific/src/G4TriangularFacet.cc @@ -25,7 +25,7 @@ // ******************************************************************** // // $Id: G4TriangularFacet.cc,v 1.5 2006/06/29 18:49:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% // diff --git a/source/geometry/solids/specific/src/G4TwistBoxSide.cc b/source/geometry/solids/specific/src/G4TwistBoxSide.cc index 4c5152bdaa..ff788e860c 100644 --- a/source/geometry/solids/specific/src/G4TwistBoxSide.cc +++ b/source/geometry/solids/specific/src/G4TwistBoxSide.cc @@ -25,7 +25,7 @@ // // // $Id: G4TwistBoxSide.cc,v 1.5 2006/06/29 18:49:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/src/G4TwistTrapAlphaSide.cc b/source/geometry/solids/specific/src/G4TwistTrapAlphaSide.cc index a579819f4d..aac167c40a 100644 --- a/source/geometry/solids/specific/src/G4TwistTrapAlphaSide.cc +++ b/source/geometry/solids/specific/src/G4TwistTrapAlphaSide.cc @@ -25,7 +25,7 @@ // // // $Id: G4TwistTrapAlphaSide.cc,v 1.5 2006/06/29 18:49:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/src/G4TwistTrapFlatSide.cc b/source/geometry/solids/specific/src/G4TwistTrapFlatSide.cc index f5b8fd3445..e03e07c33a 100644 --- a/source/geometry/solids/specific/src/G4TwistTrapFlatSide.cc +++ b/source/geometry/solids/specific/src/G4TwistTrapFlatSide.cc @@ -25,7 +25,7 @@ // // // $Id: G4TwistTrapFlatSide.cc,v 1.5 2006/06/29 18:49:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/src/G4TwistTrapParallelSide.cc b/source/geometry/solids/specific/src/G4TwistTrapParallelSide.cc index 8d5c0d671a..e2efcb9462 100644 --- a/source/geometry/solids/specific/src/G4TwistTrapParallelSide.cc +++ b/source/geometry/solids/specific/src/G4TwistTrapParallelSide.cc @@ -25,7 +25,7 @@ // // // $Id: G4TwistTrapParallelSide.cc,v -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/src/G4TwistTubsFlatSide.cc b/source/geometry/solids/specific/src/G4TwistTubsFlatSide.cc index 8adee2bfd9..3602276601 100644 --- a/source/geometry/solids/specific/src/G4TwistTubsFlatSide.cc +++ b/source/geometry/solids/specific/src/G4TwistTubsFlatSide.cc @@ -25,7 +25,7 @@ // // // $Id: G4TwistTubsFlatSide.cc,v 1.5 2006/06/29 18:49:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/src/G4TwistTubsHypeSide.cc b/source/geometry/solids/specific/src/G4TwistTubsHypeSide.cc index 6e749574bb..c1cd3195cd 100644 --- a/source/geometry/solids/specific/src/G4TwistTubsHypeSide.cc +++ b/source/geometry/solids/specific/src/G4TwistTubsHypeSide.cc @@ -25,7 +25,7 @@ // // // $Id: G4TwistTubsHypeSide.cc,v 1.5 2006/06/29 18:49:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/src/G4TwistTubsSide.cc b/source/geometry/solids/specific/src/G4TwistTubsSide.cc index 29f485ed64..8de546068c 100644 --- a/source/geometry/solids/specific/src/G4TwistTubsSide.cc +++ b/source/geometry/solids/specific/src/G4TwistTubsSide.cc @@ -25,7 +25,7 @@ // // // $Id: G4TwistTubsSide.cc,v 1.5 2006/06/29 18:49:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/src/G4TwistedBox.cc b/source/geometry/solids/specific/src/G4TwistedBox.cc index 571bad2a88..7a93e24373 100644 --- a/source/geometry/solids/specific/src/G4TwistedBox.cc +++ b/source/geometry/solids/specific/src/G4TwistedBox.cc @@ -25,7 +25,7 @@ // // // $Id: G4TwistedBox.cc,v 1.12 2006/06/29 18:49:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/src/G4TwistedTrap.cc b/source/geometry/solids/specific/src/G4TwistedTrap.cc index dd69f977e7..9aa695bdad 100644 --- a/source/geometry/solids/specific/src/G4TwistedTrap.cc +++ b/source/geometry/solids/specific/src/G4TwistedTrap.cc @@ -25,7 +25,7 @@ // // // $Id: G4TwistedTrap.cc,v 1.14 2006/06/29 18:49:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/src/G4TwistedTrd.cc b/source/geometry/solids/specific/src/G4TwistedTrd.cc index 4281315133..95673efacf 100644 --- a/source/geometry/solids/specific/src/G4TwistedTrd.cc +++ b/source/geometry/solids/specific/src/G4TwistedTrd.cc @@ -25,7 +25,7 @@ // // // $Id: G4TwistedTrd.cc,v 1.7 2006/06/29 18:49:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/src/G4TwistedTubs.cc b/source/geometry/solids/specific/src/G4TwistedTubs.cc index 151206fb8a..a6308e0079 100644 --- a/source/geometry/solids/specific/src/G4TwistedTubs.cc +++ b/source/geometry/solids/specific/src/G4TwistedTubs.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4TwistedTubs.cc,v 1.22 2006/06/29 18:49:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4TwistedTubs.cc,v 1.23 2006/10/20 13:45:21 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- @@ -73,7 +73,7 @@ G4TwistedTubs::G4TwistedTubs(const G4String &pname, : G4VSolid(pname), fDPhi(dphi), fLowerEndcap(0), fUpperEndcap(0), fLatterTwisted(0), fFormerTwisted(0), fInnerHype(0), fOuterHype(0), - fCubicVolume(0.), fpPolyhedron(0) + fCubicVolume(0.), fSurfaceArea(0.), fpPolyhedron(0) { if (endinnerrad < DBL_MIN) { @@ -106,7 +106,7 @@ G4TwistedTubs::G4TwistedTubs(const G4String &pname, : G4VSolid(pname), fLowerEndcap(0), fUpperEndcap(0), fLatterTwisted(0), fFormerTwisted(0), fInnerHype(0), fOuterHype(0), - fCubicVolume(0.), fpPolyhedron(0) + fCubicVolume(0.), fSurfaceArea(0.), fpPolyhedron(0) { if (!nseg) @@ -146,7 +146,7 @@ G4TwistedTubs::G4TwistedTubs(const G4String &pname, : G4VSolid(pname), fDPhi(dphi), fLowerEndcap(0), fUpperEndcap(0), fLatterTwisted(0), fFormerTwisted(0), fInnerHype(0), fOuterHype(0), - fCubicVolume(0.), fpPolyhedron(0) + fCubicVolume(0.), fSurfaceArea(0.), fpPolyhedron(0) { if (innerrad < DBL_MIN) { @@ -169,7 +169,7 @@ G4TwistedTubs::G4TwistedTubs(const G4String &pname, : G4VSolid(pname), fLowerEndcap(0), fUpperEndcap(0), fLatterTwisted(0), fFormerTwisted(0), fInnerHype(0), fOuterHype(0), - fCubicVolume(0.), fpPolyhedron(0) + fCubicVolume(0.), fSurfaceArea(0.), fpPolyhedron(0) { if (!nseg) { @@ -193,7 +193,7 @@ G4TwistedTubs::G4TwistedTubs(const G4String &pname, G4TwistedTubs::G4TwistedTubs( __void__& a ) : G4VSolid(a), fLowerEndcap(0), fUpperEndcap(0), fLatterTwisted(0), fFormerTwisted(0), fInnerHype(0), fOuterHype(0), fCubicVolume(0.), - fpPolyhedron(0) + fSurfaceArea(0.), fpPolyhedron(0) { } @@ -1137,6 +1137,16 @@ G4double G4TwistedTubs::GetCubicVolume() return fCubicVolume; } +//===================================================================== +//* GetSurfaceArea ---------------------------------------------------- + +G4double G4TwistedTubs::GetSurfaceArea() +{ + if(fSurfaceArea != 0.) {;} + else { fSurfaceArea = G4VSolid::GetSurfaceArea(); } + return fSurfaceArea; +} + //===================================================================== //* GetPointOnSurface ------------------------------------------------- diff --git a/source/geometry/solids/specific/src/G4VCSGfaceted.cc b/source/geometry/solids/specific/src/G4VCSGfaceted.cc index 655173b5a0..dae0766dd6 100644 --- a/source/geometry/solids/specific/src/G4VCSGfaceted.cc +++ b/source/geometry/solids/specific/src/G4VCSGfaceted.cc @@ -29,8 +29,8 @@ // based on the Program) you indicate your acceptance of this statement, // and all its terms. // -// $Id: G4VCSGfaceted.cc,v 1.18 2006/06/29 18:49:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VCSGfaceted.cc,v 1.20 2006/10/20 14:21:36 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- @@ -60,10 +60,10 @@ // // Constructor // -G4VCSGfaceted::G4VCSGfaceted( G4String name ) +G4VCSGfaceted::G4VCSGfaceted( const G4String& name ) : G4VSolid(name), - numFace(0), faces(0), fCubicVolume(0.), fpPolyhedron(0), - fCubVolStatistics(1000000), fCubVolEpsilon(0.001) + numFace(0), faces(0), fCubicVolume(0.), fSurfaceArea(0.), fpPolyhedron(0), + fStatistics(1000000), fCubVolEpsilon(0.001), fAreaAccuracy(-1.) { } @@ -74,8 +74,8 @@ G4VCSGfaceted::G4VCSGfaceted( G4String name ) // G4VCSGfaceted::G4VCSGfaceted( __void__& a ) : G4VSolid(a), - numFace(0), faces(0), fCubicVolume(0.), fpPolyhedron(0), - fCubVolStatistics(1000000), fCubVolEpsilon(0.001) + numFace(0), faces(0), fCubicVolume(0.), fSurfaceArea(0.), fpPolyhedron(0), + fStatistics(1000000), fCubVolEpsilon(0.001), fAreaAccuracy(-1.) { } @@ -447,7 +447,7 @@ std::ostream& G4VCSGfaceted::StreamInfo( std::ostream& os ) const // G4int G4VCSGfaceted::GetCubVolStatistics() const { - return fCubVolStatistics; + return fStatistics; } @@ -465,7 +465,8 @@ G4double G4VCSGfaceted::GetCubVolEpsilon() const // void G4VCSGfaceted::SetCubVolStatistics(G4int st) { - fCubVolStatistics=st; + fCubicVolume=0.; + fStatistics=st; } @@ -474,20 +475,74 @@ void G4VCSGfaceted::SetCubVolStatistics(G4int st) // void G4VCSGfaceted::SetCubVolEpsilon(G4double ep) { + fCubicVolume=0.; fCubVolEpsilon=ep; } +// +// GetAreaStatistics +// +G4int G4VCSGfaceted::GetAreaStatistics() const +{ + return fStatistics; +} + + +// +// GetAreaAccuracy +// +G4double G4VCSGfaceted::GetAreaAccuracy() const +{ + return fAreaAccuracy; +} + + +// +// SetAreaStatistics +// +void G4VCSGfaceted::SetAreaStatistics(G4int st) +{ + fSurfaceArea=0.; + fStatistics=st; +} + + +// +// SetAreaAccuracy +// +void G4VCSGfaceted::SetAreaAccuracy(G4double ep) +{ + fSurfaceArea=0.; + fAreaAccuracy=ep; +} + + // // GetCubicVolume // G4double G4VCSGfaceted::GetCubicVolume() { if(fCubicVolume != 0.) ; - else fCubicVolume = EstimateCubicVolume(fCubVolStatistics,fCubVolEpsilon); + else fCubicVolume = EstimateCubicVolume(fStatistics,fCubVolEpsilon); return fCubicVolume; } + +// +// GetSurfaceArea +// +G4double G4VCSGfaceted::GetSurfaceArea() +{ + if(fSurfaceArea != 0.) ; + else fSurfaceArea = EstimateCubicVolume(fStatistics,fAreaAccuracy); + return fSurfaceArea; +} + + +// +// GetPolyhedron +// G4Polyhedron* G4VCSGfaceted::GetPolyhedron () const { if (!fpPolyhedron || diff --git a/source/geometry/solids/specific/src/G4VFacet.cc b/source/geometry/solids/specific/src/G4VFacet.cc index d5103b9607..46a6211420 100644 --- a/source/geometry/solids/specific/src/G4VFacet.cc +++ b/source/geometry/solids/specific/src/G4VFacet.cc @@ -25,7 +25,7 @@ // ******************************************************************** // // $Id: G4VFacet.cc,v 1.3 2006/06/29 18:49:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% // diff --git a/source/geometry/solids/specific/src/G4VTwistSurface.cc b/source/geometry/solids/specific/src/G4VTwistSurface.cc index f8cbc9f0c3..8b2ec4ea1a 100644 --- a/source/geometry/solids/specific/src/G4VTwistSurface.cc +++ b/source/geometry/solids/specific/src/G4VTwistSurface.cc @@ -25,7 +25,7 @@ // // // $Id: G4VTwistSurface.cc,v 1.5 2006/06/29 18:49:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/geometry/solids/specific/src/G4VTwistedFaceted.cc b/source/geometry/solids/specific/src/G4VTwistedFaceted.cc index fb2d740ee9..26a553d47e 100644 --- a/source/geometry/solids/specific/src/G4VTwistedFaceted.cc +++ b/source/geometry/solids/specific/src/G4VTwistedFaceted.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4VTwistedFaceted.cc,v 1.13 2006/06/29 18:49:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VTwistedFaceted.cc,v 1.14 2006/10/20 13:45:21 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- @@ -78,7 +78,7 @@ G4VTwistedFaceted( const G4String &pname, // Name of instance : G4VSolid(pname), fLowerEndcap(0), fUpperEndcap(0), fSide0(0), fSide90(0), fSide180(0), fSide270(0), - fpPolyhedron(0) + fSurfaceArea(0.), fpPolyhedron(0) { G4double pDytmp ; @@ -199,7 +199,7 @@ G4VTwistedFaceted::G4VTwistedFaceted( __void__& a ) : G4VSolid(a), fLowerEndcap(0), fUpperEndcap(0), fSide0(0), fSide90(0), fSide180(0), fSide270(0), - fCubicVolume(0.), fpPolyhedron(0) + fCubicVolume(0.), fSurfaceArea(0.), fpPolyhedron(0) { } diff --git a/source/geometry/volumes/History b/source/geometry/volumes/History index 8a40980a9d..7696655bdb 100644 --- a/source/geometry/volumes/History +++ b/source/geometry/volumes/History @@ -1,4 +1,4 @@ -$Id: History,v 1.140 2006/05/05 14:53:29 gcosmo Exp $ +$Id: History,v 1.142 2006/11/10 09:45:54 gcosmo Exp $ ------------------------------------------------------------------- ========================================================= @@ -17,6 +17,14 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +Nov 10th, 2006 G.Cosmo - geomvol-V08-01-00 +- Use 'direct' rotation/translation instead of 'frame' rotation/translation + in concrete CheckOverlaps() method of G4PVPlacement and G4PVParameterised + volumes. Fixes a problem reported for wrong transformation associated + to overlap-check in displaced boolean solids (V.Grichine). +- Updated unit test 'testG4NavigationHistory': added test for NULL + navigation-history (J.Apostolakis). + May 5th, 2006 G.Cosmo - geomvol-V08-00-04 - G4AssemblyVolume: o Corrected decomposition of transformation in G4AssemblyVolume. diff --git a/source/geometry/volumes/include/G4AssemblyTriplet.hh b/source/geometry/volumes/include/G4AssemblyTriplet.hh index 9713117542..80d7687caf 100644 --- a/source/geometry/volumes/include/G4AssemblyTriplet.hh +++ b/source/geometry/volumes/include/G4AssemblyTriplet.hh @@ -25,7 +25,7 @@ // // // $Id: G4AssemblyTriplet.hh,v 1.2 2006/06/29 18:56:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Class G4AssemblyTriplet diff --git a/source/geometry/volumes/include/G4AssemblyTriplet.icc b/source/geometry/volumes/include/G4AssemblyTriplet.icc index b96ebc68ce..4dcc9d49e9 100644 --- a/source/geometry/volumes/include/G4AssemblyTriplet.icc +++ b/source/geometry/volumes/include/G4AssemblyTriplet.icc @@ -25,7 +25,7 @@ // // // $Id: G4AssemblyTriplet.icc,v 1.2 2006/06/29 18:56:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Class G4AssemblyTriplet - inline implementation diff --git a/source/geometry/volumes/include/G4AssemblyVolume.hh b/source/geometry/volumes/include/G4AssemblyVolume.hh index ce60fac43e..614bd92ec0 100644 --- a/source/geometry/volumes/include/G4AssemblyVolume.hh +++ b/source/geometry/volumes/include/G4AssemblyVolume.hh @@ -25,7 +25,7 @@ // // // $Id: G4AssemblyVolume.hh,v 1.7 2006/06/29 18:56:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Class G4AssemblyVolume diff --git a/source/geometry/volumes/include/G4AssemblyVolume.icc b/source/geometry/volumes/include/G4AssemblyVolume.icc index 8f1ebe15ab..3cc7f04b1a 100644 --- a/source/geometry/volumes/include/G4AssemblyVolume.icc +++ b/source/geometry/volumes/include/G4AssemblyVolume.icc @@ -25,7 +25,7 @@ // // // $Id: G4AssemblyVolume.icc,v 1.3 2006/06/29 18:56:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Class G4AssemblyVolume - inline implementation diff --git a/source/geometry/volumes/include/G4GRSSolid.hh b/source/geometry/volumes/include/G4GRSSolid.hh index 99033fd9d2..07c33ea324 100644 --- a/source/geometry/volumes/include/G4GRSSolid.hh +++ b/source/geometry/volumes/include/G4GRSSolid.hh @@ -25,7 +25,7 @@ // // // $Id: G4GRSSolid.hh,v 1.8 2006/06/29 18:56:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4GRSSolid diff --git a/source/geometry/volumes/include/G4GRSSolid.icc b/source/geometry/volumes/include/G4GRSSolid.icc index 0d74347000..0dc2f87239 100644 --- a/source/geometry/volumes/include/G4GRSSolid.icc +++ b/source/geometry/volumes/include/G4GRSSolid.icc @@ -25,7 +25,7 @@ // // // $Id: G4GRSSolid.icc,v 1.9 2006/06/29 18:56:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4GRSSolid inline implementation diff --git a/source/geometry/volumes/include/G4GRSSolidHandle.hh b/source/geometry/volumes/include/G4GRSSolidHandle.hh index f52380e946..72ac458cac 100644 --- a/source/geometry/volumes/include/G4GRSSolidHandle.hh +++ b/source/geometry/volumes/include/G4GRSSolidHandle.hh @@ -25,7 +25,7 @@ // // // $Id: G4GRSSolidHandle.hh,v 1.6 2006/06/29 18:56:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Class G4GRSSolidHandle // diff --git a/source/geometry/volumes/include/G4GRSVolume.hh b/source/geometry/volumes/include/G4GRSVolume.hh index a5b94e7f97..ca10981adc 100644 --- a/source/geometry/volumes/include/G4GRSVolume.hh +++ b/source/geometry/volumes/include/G4GRSVolume.hh @@ -25,7 +25,7 @@ // // // $Id: G4GRSVolume.hh,v 1.8 2006/06/29 18:57:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4GRSVolume diff --git a/source/geometry/volumes/include/G4GRSVolume.icc b/source/geometry/volumes/include/G4GRSVolume.icc index edc1c6f041..2917b50491 100644 --- a/source/geometry/volumes/include/G4GRSVolume.icc +++ b/source/geometry/volumes/include/G4GRSVolume.icc @@ -25,7 +25,7 @@ // // // $Id: G4GRSVolume.icc,v 1.10 2006/06/29 18:57:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4GRSVolume inline implementation diff --git a/source/geometry/volumes/include/G4GRSVolumeHandle.hh b/source/geometry/volumes/include/G4GRSVolumeHandle.hh index b86a45b8ef..99ddaf8f30 100644 --- a/source/geometry/volumes/include/G4GRSVolumeHandle.hh +++ b/source/geometry/volumes/include/G4GRSVolumeHandle.hh @@ -25,7 +25,7 @@ // // // $Id: G4GRSVolumeHandle.hh,v 1.6 2006/06/29 18:57:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Class G4GRSVolumeHandle // diff --git a/source/geometry/volumes/include/G4LogicalBorderSurface.hh b/source/geometry/volumes/include/G4LogicalBorderSurface.hh index 62514de0fc..ec0d60cf55 100644 --- a/source/geometry/volumes/include/G4LogicalBorderSurface.hh +++ b/source/geometry/volumes/include/G4LogicalBorderSurface.hh @@ -25,7 +25,7 @@ // // // $Id: G4LogicalBorderSurface.hh,v 1.14 2006/06/29 18:57:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4LogicalBorderSurface // diff --git a/source/geometry/volumes/include/G4LogicalBorderSurface.icc b/source/geometry/volumes/include/G4LogicalBorderSurface.icc index b1824aca6d..6d70c6b194 100644 --- a/source/geometry/volumes/include/G4LogicalBorderSurface.icc +++ b/source/geometry/volumes/include/G4LogicalBorderSurface.icc @@ -25,7 +25,7 @@ // // // $Id: G4LogicalBorderSurface.icc,v 1.9 2006/06/29 18:57:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4LogicalBorderSurface inline implementation diff --git a/source/geometry/volumes/include/G4LogicalSkinSurface.hh b/source/geometry/volumes/include/G4LogicalSkinSurface.hh index 9bd3438e24..8d9ba0ae71 100644 --- a/source/geometry/volumes/include/G4LogicalSkinSurface.hh +++ b/source/geometry/volumes/include/G4LogicalSkinSurface.hh @@ -25,7 +25,7 @@ // // // $Id: G4LogicalSkinSurface.hh,v 1.14 2006/06/29 18:57:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4LogicalSkinSurface // diff --git a/source/geometry/volumes/include/G4LogicalSkinSurface.icc b/source/geometry/volumes/include/G4LogicalSkinSurface.icc index 4efbcf78e7..ddf24f26ac 100644 --- a/source/geometry/volumes/include/G4LogicalSkinSurface.icc +++ b/source/geometry/volumes/include/G4LogicalSkinSurface.icc @@ -25,7 +25,7 @@ // // // $Id: G4LogicalSkinSurface.icc,v 1.9 2006/06/29 18:57:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4LogicalSkinSurface inline implementation diff --git a/source/geometry/volumes/include/G4NavigationHistory.hh b/source/geometry/volumes/include/G4NavigationHistory.hh index f855dfbd81..eb5b9caa31 100644 --- a/source/geometry/volumes/include/G4NavigationHistory.hh +++ b/source/geometry/volumes/include/G4NavigationHistory.hh @@ -25,7 +25,7 @@ // // // $Id: G4NavigationHistory.hh,v 1.13 2006/06/29 18:57:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4NavigationHistory // diff --git a/source/geometry/volumes/include/G4NavigationHistory.icc b/source/geometry/volumes/include/G4NavigationHistory.icc index 97a42b42ad..ade6965a97 100644 --- a/source/geometry/volumes/include/G4NavigationHistory.icc +++ b/source/geometry/volumes/include/G4NavigationHistory.icc @@ -25,7 +25,7 @@ // // // $Id: G4NavigationHistory.icc,v 1.12 2006/06/29 18:57:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4NavigationHistory Inline implementation diff --git a/source/geometry/volumes/include/G4NavigationLevel.hh b/source/geometry/volumes/include/G4NavigationLevel.hh index e9e6ab4802..472a370bc1 100644 --- a/source/geometry/volumes/include/G4NavigationLevel.hh +++ b/source/geometry/volumes/include/G4NavigationLevel.hh @@ -25,7 +25,7 @@ // // // $Id: G4NavigationLevel.hh,v 1.16 2006/06/29 18:57:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4NavigationLevel // diff --git a/source/geometry/volumes/include/G4NavigationLevel.icc b/source/geometry/volumes/include/G4NavigationLevel.icc index 067291c6c1..448337b1ae 100644 --- a/source/geometry/volumes/include/G4NavigationLevel.icc +++ b/source/geometry/volumes/include/G4NavigationLevel.icc @@ -25,7 +25,7 @@ // // // $Id: G4NavigationLevel.icc,v 1.20 2006/06/29 18:57:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // 30.09.97 J.Apostolakis Initial version. // diff --git a/source/geometry/volumes/include/G4NavigationLevelRep.hh b/source/geometry/volumes/include/G4NavigationLevelRep.hh index 45f1c7af58..55d5d44293 100644 --- a/source/geometry/volumes/include/G4NavigationLevelRep.hh +++ b/source/geometry/volumes/include/G4NavigationLevelRep.hh @@ -25,7 +25,7 @@ // // // $Id: G4NavigationLevelRep.hh,v 1.9 2006/06/29 18:57:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4NavigationLevelRep // diff --git a/source/geometry/volumes/include/G4NavigationLevelRep.icc b/source/geometry/volumes/include/G4NavigationLevelRep.icc index afc7af2f41..4ac4ee1a8f 100644 --- a/source/geometry/volumes/include/G4NavigationLevelRep.icc +++ b/source/geometry/volumes/include/G4NavigationLevelRep.icc @@ -25,7 +25,7 @@ // // // $Id: G4NavigationLevelRep.icc,v 1.14 2006/06/29 18:57:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // 1 October 1997 J.Apostolakis Initial version. // diff --git a/source/geometry/volumes/include/G4PVParameterised.hh b/source/geometry/volumes/include/G4PVParameterised.hh index fcfbec68ab..5dc1b2092c 100644 --- a/source/geometry/volumes/include/G4PVParameterised.hh +++ b/source/geometry/volumes/include/G4PVParameterised.hh @@ -25,7 +25,7 @@ // // // $Id: G4PVParameterised.hh,v 1.6 2006/06/29 18:57:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4PVParameterised diff --git a/source/geometry/volumes/include/G4PVPlacement.hh b/source/geometry/volumes/include/G4PVPlacement.hh index 88f28f5353..03d0ae5a28 100644 --- a/source/geometry/volumes/include/G4PVPlacement.hh +++ b/source/geometry/volumes/include/G4PVPlacement.hh @@ -25,7 +25,7 @@ // // // $Id: G4PVPlacement.hh,v 1.6 2006/06/29 18:57:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4PVPlacement diff --git a/source/geometry/volumes/include/G4PVReplica.hh b/source/geometry/volumes/include/G4PVReplica.hh index 2775812ee0..0f54200fe5 100644 --- a/source/geometry/volumes/include/G4PVReplica.hh +++ b/source/geometry/volumes/include/G4PVReplica.hh @@ -25,7 +25,7 @@ // // // $Id: G4PVReplica.hh,v 1.5 2006/06/29 18:57:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4PVReplica diff --git a/source/geometry/volumes/include/G4ReflectionFactory.hh b/source/geometry/volumes/include/G4ReflectionFactory.hh index f6e03af70e..6217455ea9 100644 --- a/source/geometry/volumes/include/G4ReflectionFactory.hh +++ b/source/geometry/volumes/include/G4ReflectionFactory.hh @@ -25,7 +25,7 @@ // // // $Id: G4ReflectionFactory.hh,v 1.3 2006/06/29 18:57:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4ReflectionFactory diff --git a/source/geometry/volumes/include/G4TouchableHistory.hh b/source/geometry/volumes/include/G4TouchableHistory.hh index 107591169d..28d056df34 100644 --- a/source/geometry/volumes/include/G4TouchableHistory.hh +++ b/source/geometry/volumes/include/G4TouchableHistory.hh @@ -25,7 +25,7 @@ // // // $Id: G4TouchableHistory.hh,v 1.8 2006/06/29 18:57:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4TouchableHistory diff --git a/source/geometry/volumes/include/G4TouchableHistory.icc b/source/geometry/volumes/include/G4TouchableHistory.icc index ac65004175..6227ffbda3 100644 --- a/source/geometry/volumes/include/G4TouchableHistory.icc +++ b/source/geometry/volumes/include/G4TouchableHistory.icc @@ -25,7 +25,7 @@ // // // $Id: G4TouchableHistory.icc,v 1.9 2006/06/29 18:57:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4TouchableHistory inline implementation diff --git a/source/geometry/volumes/include/G4TouchableHistoryHandle.hh b/source/geometry/volumes/include/G4TouchableHistoryHandle.hh index 685c05a22d..a60213e94f 100644 --- a/source/geometry/volumes/include/G4TouchableHistoryHandle.hh +++ b/source/geometry/volumes/include/G4TouchableHistoryHandle.hh @@ -25,7 +25,7 @@ // // // $Id: G4TouchableHistoryHandle.hh,v 1.6 2006/06/29 18:57:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Class G4TouchableHistoryHandle // diff --git a/source/geometry/volumes/src/G4AssemblyVolume.cc b/source/geometry/volumes/src/G4AssemblyVolume.cc index 1e487b7e5d..18b28eed22 100644 --- a/source/geometry/volumes/src/G4AssemblyVolume.cc +++ b/source/geometry/volumes/src/G4AssemblyVolume.cc @@ -25,7 +25,7 @@ // // // $Id: G4AssemblyVolume.cc,v 1.10 2006/06/29 18:57:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Class G4AssemblyVolume - implementation diff --git a/source/geometry/volumes/src/G4GRSSolid.cc b/source/geometry/volumes/src/G4GRSSolid.cc index 1538569de2..644a696742 100644 --- a/source/geometry/volumes/src/G4GRSSolid.cc +++ b/source/geometry/volumes/src/G4GRSSolid.cc @@ -25,7 +25,7 @@ // // // $Id: G4GRSSolid.cc,v 1.8 2006/06/29 18:57:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4GRSSolid Implementation diff --git a/source/geometry/volumes/src/G4GRSVolume.cc b/source/geometry/volumes/src/G4GRSVolume.cc index 56bd71e86e..d6451bc1df 100644 --- a/source/geometry/volumes/src/G4GRSVolume.cc +++ b/source/geometry/volumes/src/G4GRSVolume.cc @@ -25,7 +25,7 @@ // // // $Id: G4GRSVolume.cc,v 1.8 2006/06/29 18:57:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4GRSVolume Implementation diff --git a/source/geometry/volumes/src/G4LogicalBorderSurface.cc b/source/geometry/volumes/src/G4LogicalBorderSurface.cc index c200dba32a..32b5245550 100644 --- a/source/geometry/volumes/src/G4LogicalBorderSurface.cc +++ b/source/geometry/volumes/src/G4LogicalBorderSurface.cc @@ -25,7 +25,7 @@ // // // $Id: G4LogicalBorderSurface.cc,v 1.14 2006/06/29 18:57:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // G4LogicalBorderSurface Implementation diff --git a/source/geometry/volumes/src/G4LogicalSkinSurface.cc b/source/geometry/volumes/src/G4LogicalSkinSurface.cc index fe42e02f26..b4844bc2cb 100644 --- a/source/geometry/volumes/src/G4LogicalSkinSurface.cc +++ b/source/geometry/volumes/src/G4LogicalSkinSurface.cc @@ -25,7 +25,7 @@ // // // $Id: G4LogicalSkinSurface.cc,v 1.13 2006/06/29 18:57:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // G4LogicalSkinSurface Implementation diff --git a/source/geometry/volumes/src/G4NavigationHistory.cc b/source/geometry/volumes/src/G4NavigationHistory.cc index 6b41d767b9..3b559dc3ed 100644 --- a/source/geometry/volumes/src/G4NavigationHistory.cc +++ b/source/geometry/volumes/src/G4NavigationHistory.cc @@ -25,7 +25,7 @@ // // // $Id: G4NavigationHistory.cc,v 1.10 2006/06/29 18:58:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4NavigationHistory Implementation diff --git a/source/geometry/volumes/src/G4NavigationLevel.cc b/source/geometry/volumes/src/G4NavigationLevel.cc index 34bc783284..ab7ddc35e8 100644 --- a/source/geometry/volumes/src/G4NavigationLevel.cc +++ b/source/geometry/volumes/src/G4NavigationLevel.cc @@ -25,7 +25,7 @@ // // // $Id: G4NavigationLevel.cc,v 1.4 2006/06/29 18:58:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // 30.09.97 J.Apostolakis Initial version. // diff --git a/source/geometry/volumes/src/G4NavigationLevelRep.cc b/source/geometry/volumes/src/G4NavigationLevelRep.cc index 74efa6bef2..7428f4959b 100644 --- a/source/geometry/volumes/src/G4NavigationLevelRep.cc +++ b/source/geometry/volumes/src/G4NavigationLevelRep.cc @@ -25,7 +25,7 @@ // // // $Id: G4NavigationLevelRep.cc,v 1.2 2006/06/29 18:58:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // 1 October 1997 J.Apostolakis Initial version. // diff --git a/source/geometry/volumes/src/G4PVParameterised.cc b/source/geometry/volumes/src/G4PVParameterised.cc index 0eb03a9ec7..057efc027d 100644 --- a/source/geometry/volumes/src/G4PVParameterised.cc +++ b/source/geometry/volumes/src/G4PVParameterised.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4PVParameterised.cc,v 1.6 2006/06/29 18:58:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4PVParameterised.cc,v 1.7 2006/11/10 09:42:27 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4PVParameterised @@ -168,7 +168,7 @@ G4bool G4PVParameterised::CheckOverlaps(G4int res) // Create the transformation from daughter to mother // - G4AffineTransform Tm( GetFrameRotation(), GetFrameTranslation() ); + G4AffineTransform Tm( GetRotation(), GetTranslation() ); // Generate random points on surface according to the given resolution, // transform them to the mother's coordinate system and if no overlaps @@ -189,7 +189,7 @@ G4bool G4PVParameterised::CheckOverlaps(G4int res) << GetName() << ", parameterised instance: " << i << G4endl << " with its mother volume " << motherLog->GetName() << G4endl - << " at point " << mp << G4endl; + << " at mother local point " << mp << G4endl; G4Exception("G4PVParameterised::CheckOverlaps()", "InvalidSetup", JustWarning, "Overlap with mother volume !"); return true; @@ -208,7 +208,7 @@ G4bool G4PVParameterised::CheckOverlaps(G4int res) // Create the transformation for daughter volume // - G4AffineTransform Td( GetFrameRotation(), GetFrameTranslation() ); + G4AffineTransform Td( GetRotation(), GetTranslation() ); for (pos=points.begin(); pos!=points.end(); pos++) { @@ -224,7 +224,7 @@ G4bool G4PVParameterised::CheckOverlaps(G4int res) << GetName() << ", parameterised instance: " << i << G4endl << " with parameterised volume instance: " << j << G4endl - << " at point " << md << G4endl; + << " at daughter local point " << md << G4endl; G4Exception("G4PVParameterised::CheckOverlaps()", "InvalidSetup", JustWarning, "Overlap within parameterised volumes !"); return true; diff --git a/source/geometry/volumes/src/G4PVPlacement.cc b/source/geometry/volumes/src/G4PVPlacement.cc index e15e23cb4c..817db69240 100644 --- a/source/geometry/volumes/src/G4PVPlacement.cc +++ b/source/geometry/volumes/src/G4PVPlacement.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4PVPlacement.cc,v 1.11 2006/06/29 18:58:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4PVPlacement.cc,v 1.12 2006/11/10 09:42:27 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4PVPlacement Implementation @@ -252,7 +252,7 @@ G4bool G4PVPlacement::CheckOverlaps(G4int res) // Create the transformation from daughter to mother // - G4AffineTransform Tm( GetFrameRotation(), GetFrameTranslation() ); + G4AffineTransform Tm( GetRotation(), GetTranslation() ); for (G4int n=0; nGetName() << G4endl - << " at point " << mp << G4endl; + << " at mother local point " << mp << G4endl; G4Exception("G4PVPlacement::CheckOverlaps()", "InvalidSetup", JustWarning, "Overlap with mother volume !"); return true; @@ -288,8 +288,8 @@ G4bool G4PVPlacement::CheckOverlaps(G4int res) // Create the transformation for daughter volume and transform point // - G4AffineTransform Td( daughter->GetFrameRotation(), - daughter->GetFrameTranslation() ); + G4AffineTransform Td( daughter->GetRotation(), + daughter->GetTranslation() ); G4ThreeVector md = Td.Inverse().TransformPoint(mp); G4VSolid* daughterSolid = daughter->GetLogicalVolume()->GetSolid(); @@ -300,7 +300,7 @@ G4bool G4PVPlacement::CheckOverlaps(G4int res) << " Overlap is detected for volume " << GetName() << G4endl << " with volume " << daughter->GetName() << G4endl - << " at point " << md << G4endl; + << " at daughter local point " << md << G4endl; G4Exception("G4PVPlacement::CheckOverlaps()", "InvalidSetup", JustWarning, "Overlap with volume already placed !"); return true; diff --git a/source/geometry/volumes/src/G4PVReplica.cc b/source/geometry/volumes/src/G4PVReplica.cc index cd7f03c30a..d33e21bdce 100644 --- a/source/geometry/volumes/src/G4PVReplica.cc +++ b/source/geometry/volumes/src/G4PVReplica.cc @@ -25,7 +25,7 @@ // // // $Id: G4PVReplica.cc,v 1.7 2006/06/29 18:58:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4PVReplica Implementation diff --git a/source/geometry/volumes/src/G4ReflectionFactory.cc b/source/geometry/volumes/src/G4ReflectionFactory.cc index f084aa8f74..5ed1909a4c 100644 --- a/source/geometry/volumes/src/G4ReflectionFactory.cc +++ b/source/geometry/volumes/src/G4ReflectionFactory.cc @@ -25,7 +25,7 @@ // // // $Id: G4ReflectionFactory.cc,v 1.5 2006/06/29 18:58:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Class G4ReflectionFactory Implementation diff --git a/source/geometry/volumes/src/G4TouchableHistory.cc b/source/geometry/volumes/src/G4TouchableHistory.cc index e015129a33..4fb1c4865a 100644 --- a/source/geometry/volumes/src/G4TouchableHistory.cc +++ b/source/geometry/volumes/src/G4TouchableHistory.cc @@ -25,7 +25,7 @@ // // // $Id: G4TouchableHistory.cc,v 1.12 2006/06/29 18:58:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4TouchableHistory Implementation diff --git a/source/global/HEPGeometry/include/G4LorentzRotation.hh b/source/global/HEPGeometry/include/G4LorentzRotation.hh index 5533e795cb..861f11f2ab 100644 --- a/source/global/HEPGeometry/include/G4LorentzRotation.hh +++ b/source/global/HEPGeometry/include/G4LorentzRotation.hh @@ -25,7 +25,7 @@ // // // $Id: G4LorentzRotation.hh,v 1.5 2006/06/29 18:59:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4LorentzRotation_hh #define G4LorentzRotation_hh diff --git a/source/global/HEPGeometry/include/G4LorentzVector.hh b/source/global/HEPGeometry/include/G4LorentzVector.hh index b73d636113..132befe201 100644 --- a/source/global/HEPGeometry/include/G4LorentzVector.hh +++ b/source/global/HEPGeometry/include/G4LorentzVector.hh @@ -25,7 +25,7 @@ // // // $Id: G4LorentzVector.hh,v 1.5 2006/06/29 18:59:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4LorentzVector_hh #define G4LorentzVector_hh diff --git a/source/global/HEPGeometry/include/G4Normal3D.hh b/source/global/HEPGeometry/include/G4Normal3D.hh index a09a559a60..4bc0221142 100644 --- a/source/global/HEPGeometry/include/G4Normal3D.hh +++ b/source/global/HEPGeometry/include/G4Normal3D.hh @@ -25,7 +25,7 @@ // // // $Id: G4Normal3D.hh,v 1.5 2006/06/29 18:59:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NORMAL3D_HH #define G4NORMAL3D_HH diff --git a/source/global/HEPGeometry/include/G4Plane3D.hh b/source/global/HEPGeometry/include/G4Plane3D.hh index 778022008c..f67210ccd2 100644 --- a/source/global/HEPGeometry/include/G4Plane3D.hh +++ b/source/global/HEPGeometry/include/G4Plane3D.hh @@ -25,7 +25,7 @@ // // // $Id: G4Plane3D.hh,v 1.5 2006/06/29 18:59:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4PLANE3D_HH #define G4PLANE3D_HH diff --git a/source/global/HEPGeometry/include/G4Point3D.hh b/source/global/HEPGeometry/include/G4Point3D.hh index e6df64bc77..e40642ace2 100644 --- a/source/global/HEPGeometry/include/G4Point3D.hh +++ b/source/global/HEPGeometry/include/G4Point3D.hh @@ -25,7 +25,7 @@ // // // $Id: G4Point3D.hh,v 1.5 2006/06/29 18:59:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4POINT3D_HH #define G4POINT3D_HH diff --git a/source/global/HEPGeometry/include/G4Transform3D.hh b/source/global/HEPGeometry/include/G4Transform3D.hh index 1ba0e58578..4480dcb4c3 100644 --- a/source/global/HEPGeometry/include/G4Transform3D.hh +++ b/source/global/HEPGeometry/include/G4Transform3D.hh @@ -25,7 +25,7 @@ // // // $Id: G4Transform3D.hh,v 1.5 2006/06/29 18:59:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4TRANSFORM3D_HH #define G4TRANSFORM3D_HH diff --git a/source/global/HEPGeometry/include/G4Vector3D.hh b/source/global/HEPGeometry/include/G4Vector3D.hh index 64f8bc7f63..5751ede66a 100644 --- a/source/global/HEPGeometry/include/G4Vector3D.hh +++ b/source/global/HEPGeometry/include/G4Vector3D.hh @@ -25,7 +25,7 @@ // // // $Id: G4Vector3D.hh,v 1.5 2006/06/29 18:59:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VECTOR3D_HH #define G4VECTOR3D_HH diff --git a/source/global/HEPGeometry/include/geomdefs.hh b/source/global/HEPGeometry/include/geomdefs.hh index a1803d7dd4..1c22abf7ea 100644 --- a/source/global/HEPGeometry/include/geomdefs.hh +++ b/source/global/HEPGeometry/include/geomdefs.hh @@ -25,7 +25,7 @@ // // // $Id: geomdefs.hh,v 1.6 2006/06/29 18:59:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/global/HEPNumerics/include/G4AnalyticalPolSolver.hh b/source/global/HEPNumerics/include/G4AnalyticalPolSolver.hh index 9debf2e50c..78c412d7d9 100644 --- a/source/global/HEPNumerics/include/G4AnalyticalPolSolver.hh +++ b/source/global/HEPNumerics/include/G4AnalyticalPolSolver.hh @@ -25,7 +25,7 @@ // // // $Id: G4AnalyticalPolSolver.hh,v 1.5 2006/06/29 18:59:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Class description: // diff --git a/source/global/HEPNumerics/include/G4ChebyshevApproximation.hh b/source/global/HEPNumerics/include/G4ChebyshevApproximation.hh index fbd0b93ec2..262fc4a36c 100644 --- a/source/global/HEPNumerics/include/G4ChebyshevApproximation.hh +++ b/source/global/HEPNumerics/include/G4ChebyshevApproximation.hh @@ -25,7 +25,7 @@ // // // $Id: G4ChebyshevApproximation.hh,v 1.6 2006/06/29 18:59:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Class description: // diff --git a/source/global/HEPNumerics/include/G4DataInterpolation.hh b/source/global/HEPNumerics/include/G4DataInterpolation.hh index b139399094..f453087205 100644 --- a/source/global/HEPNumerics/include/G4DataInterpolation.hh +++ b/source/global/HEPNumerics/include/G4DataInterpolation.hh @@ -25,7 +25,7 @@ // // // $Id: G4DataInterpolation.hh,v 1.5 2006/06/29 18:59:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Class description: // diff --git a/source/global/HEPNumerics/include/G4GaussChebyshevQ.hh b/source/global/HEPNumerics/include/G4GaussChebyshevQ.hh index 767d94240b..18ea9f02fd 100644 --- a/source/global/HEPNumerics/include/G4GaussChebyshevQ.hh +++ b/source/global/HEPNumerics/include/G4GaussChebyshevQ.hh @@ -25,7 +25,7 @@ // // // $Id: G4GaussChebyshevQ.hh,v 1.5 2006/06/29 18:59:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Class description: // diff --git a/source/global/HEPNumerics/include/G4GaussHermiteQ.hh b/source/global/HEPNumerics/include/G4GaussHermiteQ.hh index 613ba8c592..98bc8971df 100644 --- a/source/global/HEPNumerics/include/G4GaussHermiteQ.hh +++ b/source/global/HEPNumerics/include/G4GaussHermiteQ.hh @@ -25,7 +25,7 @@ // // // $Id: G4GaussHermiteQ.hh,v 1.6 2006/06/29 18:59:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Class description: // diff --git a/source/global/HEPNumerics/include/G4GaussJacobiQ.hh b/source/global/HEPNumerics/include/G4GaussJacobiQ.hh index d646fef595..2bde6bdb21 100644 --- a/source/global/HEPNumerics/include/G4GaussJacobiQ.hh +++ b/source/global/HEPNumerics/include/G4GaussJacobiQ.hh @@ -25,7 +25,7 @@ // // // $Id: G4GaussJacobiQ.hh,v 1.5 2006/06/29 18:59:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Class description: // diff --git a/source/global/HEPNumerics/include/G4GaussLaguerreQ.hh b/source/global/HEPNumerics/include/G4GaussLaguerreQ.hh index 0822a9609e..86450b7692 100644 --- a/source/global/HEPNumerics/include/G4GaussLaguerreQ.hh +++ b/source/global/HEPNumerics/include/G4GaussLaguerreQ.hh @@ -25,7 +25,7 @@ // // // $Id: G4GaussLaguerreQ.hh,v 1.6 2006/06/29 18:59:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Class description: // diff --git a/source/global/HEPNumerics/include/G4GaussLegendreQ.hh b/source/global/HEPNumerics/include/G4GaussLegendreQ.hh index 2357a64fe1..6d3c38792a 100644 --- a/source/global/HEPNumerics/include/G4GaussLegendreQ.hh +++ b/source/global/HEPNumerics/include/G4GaussLegendreQ.hh @@ -25,7 +25,7 @@ // // // $Id: G4GaussLegendreQ.hh,v 1.6 2006/06/29 18:59:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Class description: // diff --git a/source/global/HEPNumerics/include/G4Integrator.hh b/source/global/HEPNumerics/include/G4Integrator.hh index db16716559..957d78ad1e 100644 --- a/source/global/HEPNumerics/include/G4Integrator.hh +++ b/source/global/HEPNumerics/include/G4Integrator.hh @@ -25,7 +25,7 @@ // // // $Id: G4Integrator.hh,v 1.7 2006/06/29 18:59:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Class description: // diff --git a/source/global/HEPNumerics/include/G4Integrator.icc b/source/global/HEPNumerics/include/G4Integrator.icc index c4afbdc163..2061f610b5 100644 --- a/source/global/HEPNumerics/include/G4Integrator.icc +++ b/source/global/HEPNumerics/include/G4Integrator.icc @@ -25,7 +25,7 @@ // // // $Id: G4Integrator.icc,v 1.13 2006/06/29 18:59:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Implementation of G4Integrator methods. // diff --git a/source/global/HEPNumerics/include/G4JTPolynomialSolver.hh b/source/global/HEPNumerics/include/G4JTPolynomialSolver.hh index c6446acccb..75db603bfd 100644 --- a/source/global/HEPNumerics/include/G4JTPolynomialSolver.hh +++ b/source/global/HEPNumerics/include/G4JTPolynomialSolver.hh @@ -25,7 +25,7 @@ // // // $Id: G4JTPolynomialSolver.hh,v 1.6 2006/06/29 18:59:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Class description: // diff --git a/source/global/HEPNumerics/include/G4PolynomialSolver.hh b/source/global/HEPNumerics/include/G4PolynomialSolver.hh index d45039a0d3..a4c6ef8ebe 100644 --- a/source/global/HEPNumerics/include/G4PolynomialSolver.hh +++ b/source/global/HEPNumerics/include/G4PolynomialSolver.hh @@ -25,7 +25,7 @@ // // // $Id: G4PolynomialSolver.hh,v 1.4 2006/06/29 18:59:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4PolynomialSolver // diff --git a/source/global/HEPNumerics/include/G4PolynomialSolver.icc b/source/global/HEPNumerics/include/G4PolynomialSolver.icc index 3d4692daf0..2f1a4d4d84 100644 --- a/source/global/HEPNumerics/include/G4PolynomialSolver.icc +++ b/source/global/HEPNumerics/include/G4PolynomialSolver.icc @@ -25,7 +25,7 @@ // // // $Id: G4PolynomialSolver.icc,v 1.8 2006/06/29 18:59:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4PolynomialSolver // diff --git a/source/global/HEPNumerics/include/G4SimpleIntegration.hh b/source/global/HEPNumerics/include/G4SimpleIntegration.hh index bf9ee7de64..bbd21b6ae5 100644 --- a/source/global/HEPNumerics/include/G4SimpleIntegration.hh +++ b/source/global/HEPNumerics/include/G4SimpleIntegration.hh @@ -25,7 +25,7 @@ // // // $Id: G4SimpleIntegration.hh,v 1.6 2006/06/29 18:59:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Class description: // diff --git a/source/global/HEPNumerics/include/G4VGaussianQuadrature.hh b/source/global/HEPNumerics/include/G4VGaussianQuadrature.hh index 4315a90491..0b984bbca1 100644 --- a/source/global/HEPNumerics/include/G4VGaussianQuadrature.hh +++ b/source/global/HEPNumerics/include/G4VGaussianQuadrature.hh @@ -25,7 +25,7 @@ // // // $Id: G4VGaussianQuadrature.hh,v 1.7 2006/06/29 18:59:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Class description: // diff --git a/source/global/HEPNumerics/src/G4AnalyticalPolSolver.cc b/source/global/HEPNumerics/src/G4AnalyticalPolSolver.cc index 6894be27bc..0d7d91f553 100644 --- a/source/global/HEPNumerics/src/G4AnalyticalPolSolver.cc +++ b/source/global/HEPNumerics/src/G4AnalyticalPolSolver.cc @@ -25,7 +25,7 @@ // // // $Id: G4AnalyticalPolSolver.cc,v 1.6 2006/06/29 19:00:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "globals.hh" diff --git a/source/global/HEPNumerics/src/G4ChebyshevApproximation.cc b/source/global/HEPNumerics/src/G4ChebyshevApproximation.cc index 3dabd9e3f6..cccddc5d4d 100644 --- a/source/global/HEPNumerics/src/G4ChebyshevApproximation.cc +++ b/source/global/HEPNumerics/src/G4ChebyshevApproximation.cc @@ -25,7 +25,7 @@ // // // $Id: G4ChebyshevApproximation.cc,v 1.6 2006/06/29 19:00:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4ChebyshevApproximation.hh" diff --git a/source/global/HEPNumerics/src/G4DataInterpolation.cc b/source/global/HEPNumerics/src/G4DataInterpolation.cc index b3bb02ca2c..43f3773a9c 100644 --- a/source/global/HEPNumerics/src/G4DataInterpolation.cc +++ b/source/global/HEPNumerics/src/G4DataInterpolation.cc @@ -25,7 +25,7 @@ // // // $Id: G4DataInterpolation.cc,v 1.8 2006/06/29 19:00:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4DataInterpolation.hh" diff --git a/source/global/HEPNumerics/src/G4GaussChebyshevQ.cc b/source/global/HEPNumerics/src/G4GaussChebyshevQ.cc index 9552fd858f..e6fa561013 100644 --- a/source/global/HEPNumerics/src/G4GaussChebyshevQ.cc +++ b/source/global/HEPNumerics/src/G4GaussChebyshevQ.cc @@ -25,7 +25,7 @@ // // // $Id: G4GaussChebyshevQ.cc,v 1.6 2006/06/29 19:00:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4GaussChebyshevQ.hh" diff --git a/source/global/HEPNumerics/src/G4GaussHermiteQ.cc b/source/global/HEPNumerics/src/G4GaussHermiteQ.cc index f1405cb153..a1ad374fdd 100644 --- a/source/global/HEPNumerics/src/G4GaussHermiteQ.cc +++ b/source/global/HEPNumerics/src/G4GaussHermiteQ.cc @@ -25,7 +25,7 @@ // // // $Id: G4GaussHermiteQ.cc,v 1.7 2006/06/29 19:00:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4GaussHermiteQ.hh" diff --git a/source/global/HEPNumerics/src/G4GaussJacobiQ.cc b/source/global/HEPNumerics/src/G4GaussJacobiQ.cc index 35083cd280..ae437e0bec 100644 --- a/source/global/HEPNumerics/src/G4GaussJacobiQ.cc +++ b/source/global/HEPNumerics/src/G4GaussJacobiQ.cc @@ -25,7 +25,7 @@ // // // $Id: G4GaussJacobiQ.cc,v 1.7 2006/06/29 19:00:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4GaussJacobiQ.hh" diff --git a/source/global/HEPNumerics/src/G4GaussLaguerreQ.cc b/source/global/HEPNumerics/src/G4GaussLaguerreQ.cc index cb241580f4..b234b50c53 100644 --- a/source/global/HEPNumerics/src/G4GaussLaguerreQ.cc +++ b/source/global/HEPNumerics/src/G4GaussLaguerreQ.cc @@ -25,7 +25,7 @@ // // // $Id: G4GaussLaguerreQ.cc,v 1.7 2006/06/29 19:00:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4GaussLaguerreQ.hh" diff --git a/source/global/HEPNumerics/src/G4GaussLegendreQ.cc b/source/global/HEPNumerics/src/G4GaussLegendreQ.cc index b3c25d6046..873cf023bf 100644 --- a/source/global/HEPNumerics/src/G4GaussLegendreQ.cc +++ b/source/global/HEPNumerics/src/G4GaussLegendreQ.cc @@ -25,7 +25,7 @@ // // // $Id: G4GaussLegendreQ.cc,v 1.7 2006/06/29 19:00:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4GaussLegendreQ.hh" diff --git a/source/global/HEPNumerics/src/G4JTPolynomialSolver.cc b/source/global/HEPNumerics/src/G4JTPolynomialSolver.cc index 34b83c3219..adfbbd9146 100644 --- a/source/global/HEPNumerics/src/G4JTPolynomialSolver.cc +++ b/source/global/HEPNumerics/src/G4JTPolynomialSolver.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4JTPolynomialSolver.cc,v 1.5 2006/06/29 19:00:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/global/HEPNumerics/src/G4SimpleIntegration.cc b/source/global/HEPNumerics/src/G4SimpleIntegration.cc index bb16d872de..ed9d79bf49 100644 --- a/source/global/HEPNumerics/src/G4SimpleIntegration.cc +++ b/source/global/HEPNumerics/src/G4SimpleIntegration.cc @@ -25,7 +25,7 @@ // // // $Id: G4SimpleIntegration.cc,v 1.7 2006/06/29 19:00:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Implementation file for simple integration methods // diff --git a/source/global/HEPNumerics/src/G4VGaussianQuadrature.cc b/source/global/HEPNumerics/src/G4VGaussianQuadrature.cc index ef50c645c9..0b1e8a2e81 100644 --- a/source/global/HEPNumerics/src/G4VGaussianQuadrature.cc +++ b/source/global/HEPNumerics/src/G4VGaussianQuadrature.cc @@ -25,7 +25,7 @@ // // // $Id: G4VGaussianQuadrature.cc,v 1.7 2006/06/29 19:00:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Implementation file for G4VGaussianQuadrature virtual base class // diff --git a/source/global/HEPRandom/include/G4Poisson.hh b/source/global/HEPRandom/include/G4Poisson.hh index 226f97a1d1..f30b3dfc7b 100644 --- a/source/global/HEPRandom/include/G4Poisson.hh +++ b/source/global/HEPRandom/include/G4Poisson.hh @@ -25,7 +25,7 @@ // // // $Id: G4Poisson.hh,v 1.9 2006/06/29 19:00:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/global/HEPRandom/include/G4RandomDirection.hh b/source/global/HEPRandom/include/G4RandomDirection.hh index d776289f17..95f52cba77 100644 --- a/source/global/HEPRandom/include/G4RandomDirection.hh +++ b/source/global/HEPRandom/include/G4RandomDirection.hh @@ -25,7 +25,7 @@ // // // $Id: G4RandomDirection.hh,v 1.3 2006/06/29 19:00:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/global/HEPRandom/include/Randomize.hh b/source/global/HEPRandom/include/Randomize.hh index f33f1b658e..f5defe12db 100644 --- a/source/global/HEPRandom/include/Randomize.hh +++ b/source/global/HEPRandom/include/Randomize.hh @@ -25,7 +25,7 @@ // // // $Id: Randomize.hh,v 1.7 2006/06/29 19:00:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef randomize_h #define randomize_h 1 diff --git a/source/global/History b/source/global/History index 4cfec3cb08..9acfdcc2ac 100644 --- a/source/global/History +++ b/source/global/History @@ -1,4 +1,4 @@ -$Id: History,v 1.161 2006/06/14 08:44:54 gcosmo Exp $ +$Id: History,v 1.174 2006/11/30 10:38:13 gcosmo Exp $ ------------------------------------------------------------------- ========================================================= @@ -17,6 +17,46 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +Nov 30, 2006 G.Cosmo (global-V08-01-07) +- Added ClearUnitsTable() method to G4UnitDefinition to allow for proper + deallocation of units from the run-manager. + +Nov 22, 2006 M.Asai (global-V08-01-06) +- Fixed the incorrect behavior of G4StateManager, so that now it changes the + state AFTER it asks to all the G4VStateDependent classes. + +Nov 15, 2006 G.Cosmo (global-V08-01-05) +- Added signal handler for debugging FPE signals and catching NaNs in + applications. Works only on Linux with gcc compiler. + Activated through the run-manager if "run" module is compiled with + the flag G4FPE_DEBUG set in the environment. +- Changed date for release 8.2. + +Nov 02, 2006 G.Cosmo (global-V08-01-04) +- Removed definitions of 'sysconf()', 'filetime2msec()' and 'times()' for + WIN32 in G4SliceTimer. Symbols are already defined in G4Timer and + included in the library. Fixes archiving warning on Windows. + +Nov 02, 2006 G.Cosmo +- Changed date for release 8.1.p02. + +Oct 23, 2006 G.Cosmo (global-V08-01-03) +- New class G4SliceTimer with implementation derived from G4Timer for the + computation of slice time intervals (by M.Asai). + +Sep 15, 2006 G.Cosmo (global-V08-01-02) +- Corrected inclusion of CLHEP headers in wrapper files + G4SystemOfUnits.hh and G4PhysicalConstants.hh + +Aug 18, 2006 M.Maire (global-V08-01-01) +- G4UnitsTable: removed mum; um should be used instead. + +Jul 20, 2006 G.Cosmo (global-V08-01-00) +- Changed date for release 8.1.p01. + +Jun 13, 2006 V.Grichine +- Extended unit test G4IntegratorTest in HEPNumerics. + May 03, 2006 G.Cosmo (global-V08-00-04) - Updated date for release 8.1 in G4Version.hh. diff --git a/source/global/management/include/G4Allocator.hh b/source/global/management/include/G4Allocator.hh index ca601f7a27..a81b7228c3 100644 --- a/source/global/management/include/G4Allocator.hh +++ b/source/global/management/include/G4Allocator.hh @@ -25,7 +25,7 @@ // // // $Id: G4Allocator.hh,v 1.18 2006/06/29 19:01:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/global/management/include/G4AllocatorPool.hh b/source/global/management/include/G4AllocatorPool.hh index 2f8c01bce8..c35d2eb609 100644 --- a/source/global/management/include/G4AllocatorPool.hh +++ b/source/global/management/include/G4AllocatorPool.hh @@ -25,7 +25,7 @@ // // // $Id: G4AllocatorPool.hh,v 1.5 2006/06/29 19:01:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------------- diff --git a/source/global/management/include/G4ApplicationState.hh b/source/global/management/include/G4ApplicationState.hh index ff610296bb..918856597b 100644 --- a/source/global/management/include/G4ApplicationState.hh +++ b/source/global/management/include/G4ApplicationState.hh @@ -25,7 +25,7 @@ // // // $Id: G4ApplicationState.hh,v 1.4 2006/06/29 19:01:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4APPLICATIONSTATE_H diff --git a/source/global/management/include/G4DataVector.hh b/source/global/management/include/G4DataVector.hh index ca86003295..89c20f2a7e 100644 --- a/source/global/management/include/G4DataVector.hh +++ b/source/global/management/include/G4DataVector.hh @@ -25,7 +25,7 @@ // // // $Id: G4DataVector.hh,v 1.14 2006/06/29 19:01:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/global/management/include/G4DataVector.icc b/source/global/management/include/G4DataVector.icc index 22c3b33577..1ce6393cea 100644 --- a/source/global/management/include/G4DataVector.icc +++ b/source/global/management/include/G4DataVector.icc @@ -25,7 +25,7 @@ // // // $Id: G4DataVector.icc,v 1.2 2006/06/29 19:01:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4DataVector inline implementation diff --git a/source/global/management/include/G4ExceptionSeverity.hh b/source/global/management/include/G4ExceptionSeverity.hh index 70d9ccdf3a..2a11f4fd82 100644 --- a/source/global/management/include/G4ExceptionSeverity.hh +++ b/source/global/management/include/G4ExceptionSeverity.hh @@ -25,7 +25,7 @@ // // // $Id: G4ExceptionSeverity.hh,v 1.3 2006/06/29 19:01:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Class Description: // diff --git a/source/global/management/include/G4FPEDetection.hh b/source/global/management/include/G4FPEDetection.hh new file mode 100644 index 0000000000..5df045fa02 --- /dev/null +++ b/source/global/management/include/G4FPEDetection.hh @@ -0,0 +1,121 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4FPEDetection.hh,v 1.2 2006/11/15 16:00:18 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// +// -*- C++ -*- +// +// ----------------------------------------------------------------------- +// This global method should be used on LINUX platforms with gcc compiler +// for activating NaN detection and FPE signals, and forcing abortion of +// the application at the time these are detected. +// Meant to be used for debug purposes, can be activated by compiling the +// "run" module with the flag G4FPE_DEBUG set in the environment. +// ----------------------------------------------------------------------- + +#ifndef G4FPEDetection_h +#define G4FPEDetection_h 1 + +#ifdef __linux__ +#ifdef __GNUC__ + #include + #include + #include + + #include + + struct sigaction termaction, oldaction; + + void TerminationSignalHandler(int sig) + { + std::cerr << "ERROR: " << sig; + std::string message; + switch (SIGFPE) + { + case FPE_INTDIV: + message = "Integer divide by zero."; + break; + case FPE_INTOVF: + message = "Integer overflow."; + break; + case FPE_FLTDIV: + message = "Floating point divide by zero."; + break; + case FPE_FLTOVF: + message = "Floating point overflow."; + break; + case FPE_FLTUND: + message = "Floating point underflow."; + break; + case FPE_FLTRES: + message = "Floating point inexact result."; + break; + case FPE_FLTINV: + message = "Floating point invalid operation."; + break; + case FPE_FLTSUB: + message = "Subscript out of range."; + break; + default: + message = "Unknown error."; + break; + } + std::cerr << " - " << message << std::endl; + + ::abort(); + } + + void InvalidOperationDetection() + { + std::cout << std::endl + << " " + << "############################################" << std::endl + << " " + << "!!! WARNING - FPE detection is activated !!!" << std::endl + << " " + << "############################################" << std::endl; + + (void) feenableexcept( FE_DIVBYZERO ); + (void) feenableexcept( FE_INVALID ); + //(void) feenableexcept( FE_OVERFLOW ); + //(void) feenableexcept( FE_UNDERFLOW ); + + sigset_t *def_set; + def_set=&termaction.sa_mask; + sigfillset(def_set); + sigdelset(def_set,SIGFPE); + termaction.sa_handler=TerminationSignalHandler; + termaction.sa_flags=0; + sigaction(SIGFPE, &termaction,&oldaction); + } +#endif +#else + void InvalidOperationDetection() {;} +#endif + +#endif diff --git a/source/global/management/include/G4FastVector.hh b/source/global/management/include/G4FastVector.hh index 68c14b0122..032cf52968 100644 --- a/source/global/management/include/G4FastVector.hh +++ b/source/global/management/include/G4FastVector.hh @@ -25,7 +25,7 @@ // // // $Id: G4FastVector.hh,v 1.5 2006/06/29 19:01:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/global/management/include/G4LPhysicsFreeVector.hh b/source/global/management/include/G4LPhysicsFreeVector.hh index 3a5765ae4b..f402c7902e 100644 --- a/source/global/management/include/G4LPhysicsFreeVector.hh +++ b/source/global/management/include/G4LPhysicsFreeVector.hh @@ -25,7 +25,7 @@ // // // $Id: G4LPhysicsFreeVector.hh,v 1.8 2006/06/29 19:01:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------------ diff --git a/source/global/management/include/G4LPhysicsFreeVector.icc b/source/global/management/include/G4LPhysicsFreeVector.icc index 7f64569cc9..c6b4bf5846 100644 --- a/source/global/management/include/G4LPhysicsFreeVector.icc +++ b/source/global/management/include/G4LPhysicsFreeVector.icc @@ -25,7 +25,7 @@ // // // $Id: G4LPhysicsFreeVector.icc,v 1.7 2006/06/29 19:02:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------------ diff --git a/source/global/management/include/G4OrderedTable.hh b/source/global/management/include/G4OrderedTable.hh index 3b530a0c16..e44301fa4d 100644 --- a/source/global/management/include/G4OrderedTable.hh +++ b/source/global/management/include/G4OrderedTable.hh @@ -25,7 +25,7 @@ // // // $Id: G4OrderedTable.hh,v 1.13 2006/06/29 19:02:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/global/management/include/G4PhysicalConstants.hh b/source/global/management/include/G4PhysicalConstants.hh index 63872943fb..5123a2ac7c 100644 --- a/source/global/management/include/G4PhysicalConstants.hh +++ b/source/global/management/include/G4PhysicalConstants.hh @@ -24,7 +24,7 @@ // ******************************************************************** // -#include "CLHEP/Units/PhysicalConstants.h" +#include using CLHEP::pi; using CLHEP::twopi; diff --git a/source/global/management/include/G4PhysicsFreeVector.hh b/source/global/management/include/G4PhysicsFreeVector.hh index 655a743622..c00de5b5e9 100644 --- a/source/global/management/include/G4PhysicsFreeVector.hh +++ b/source/global/management/include/G4PhysicsFreeVector.hh @@ -25,7 +25,7 @@ // // // $Id: G4PhysicsFreeVector.hh,v 1.10 2006/06/29 19:02:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //-------------------------------------------------------------------- diff --git a/source/global/management/include/G4PhysicsLinearVector.hh b/source/global/management/include/G4PhysicsLinearVector.hh index 164251ea8f..7a9cde0530 100644 --- a/source/global/management/include/G4PhysicsLinearVector.hh +++ b/source/global/management/include/G4PhysicsLinearVector.hh @@ -25,7 +25,7 @@ // // // $Id: G4PhysicsLinearVector.hh,v 1.10 2006/06/29 19:02:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //-------------------------------------------------------------------- diff --git a/source/global/management/include/G4PhysicsLnVector.hh b/source/global/management/include/G4PhysicsLnVector.hh index 58318d4f0b..970e14a524 100644 --- a/source/global/management/include/G4PhysicsLnVector.hh +++ b/source/global/management/include/G4PhysicsLnVector.hh @@ -25,7 +25,7 @@ // // // $Id: G4PhysicsLnVector.hh,v 1.12 2006/06/29 19:02:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //-------------------------------------------------------------------- diff --git a/source/global/management/include/G4PhysicsLogVector.hh b/source/global/management/include/G4PhysicsLogVector.hh index f286506fbd..f9572c38c7 100644 --- a/source/global/management/include/G4PhysicsLogVector.hh +++ b/source/global/management/include/G4PhysicsLogVector.hh @@ -25,7 +25,7 @@ // // // $Id: G4PhysicsLogVector.hh,v 1.11 2006/06/29 19:02:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //-------------------------------------------------------------------- diff --git a/source/global/management/include/G4PhysicsOrderedFreeVector.hh b/source/global/management/include/G4PhysicsOrderedFreeVector.hh index f23e4580b0..837259af90 100644 --- a/source/global/management/include/G4PhysicsOrderedFreeVector.hh +++ b/source/global/management/include/G4PhysicsOrderedFreeVector.hh @@ -25,7 +25,7 @@ // // // $Id: G4PhysicsOrderedFreeVector.hh,v 1.9 2006/06/29 19:02:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //////////////////////////////////////////////////////////////////////// // PhysicsOrderedFreeVector Class Definition diff --git a/source/global/management/include/G4PhysicsOrderedFreeVector.icc b/source/global/management/include/G4PhysicsOrderedFreeVector.icc index f4ef6b0850..af76256b25 100644 --- a/source/global/management/include/G4PhysicsOrderedFreeVector.icc +++ b/source/global/management/include/G4PhysicsOrderedFreeVector.icc @@ -25,7 +25,7 @@ // // // $Id: G4PhysicsOrderedFreeVector.icc,v 1.8 2006/06/29 19:02:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //////////////////////////////////////////////////////////////////////// // PhysicsOrderedFreeVector Class Inline Functions Definitions diff --git a/source/global/management/include/G4PhysicsTable.hh b/source/global/management/include/G4PhysicsTable.hh index 852a86990c..82b226d2ed 100644 --- a/source/global/management/include/G4PhysicsTable.hh +++ b/source/global/management/include/G4PhysicsTable.hh @@ -25,7 +25,7 @@ // // // $Id: G4PhysicsTable.hh,v 1.17 2006/06/29 19:02:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/global/management/include/G4PhysicsTable.icc b/source/global/management/include/G4PhysicsTable.icc index 31cca92ef0..556bc6425e 100644 --- a/source/global/management/include/G4PhysicsTable.icc +++ b/source/global/management/include/G4PhysicsTable.icc @@ -25,7 +25,7 @@ // // // $Id: G4PhysicsTable.icc,v 1.8 2006/06/29 19:02:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/global/management/include/G4PhysicsVector.hh b/source/global/management/include/G4PhysicsVector.hh index 8850e70969..abdc4b9bfa 100644 --- a/source/global/management/include/G4PhysicsVector.hh +++ b/source/global/management/include/G4PhysicsVector.hh @@ -25,7 +25,7 @@ // // // $Id: G4PhysicsVector.hh,v 1.14 2006/06/29 19:02:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/global/management/include/G4PhysicsVector.icc b/source/global/management/include/G4PhysicsVector.icc index bb3908c3f2..9e9b660106 100644 --- a/source/global/management/include/G4PhysicsVector.icc +++ b/source/global/management/include/G4PhysicsVector.icc @@ -25,7 +25,7 @@ // // // $Id: G4PhysicsVector.icc,v 1.9 2006/06/29 19:02:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/global/management/include/G4PhysicsVectorType.hh b/source/global/management/include/G4PhysicsVectorType.hh index feb335a7ba..17802cc124 100644 --- a/source/global/management/include/G4PhysicsVectorType.hh +++ b/source/global/management/include/G4PhysicsVectorType.hh @@ -25,7 +25,7 @@ // // // $Id: G4PhysicsVectorType.hh,v 1.4 2006/06/29 19:02:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------- // diff --git a/source/global/management/include/G4ReferenceCountedHandle.hh b/source/global/management/include/G4ReferenceCountedHandle.hh index a0509353b3..c6fd738851 100644 --- a/source/global/management/include/G4ReferenceCountedHandle.hh +++ b/source/global/management/include/G4ReferenceCountedHandle.hh @@ -25,7 +25,7 @@ // // // $Id: G4ReferenceCountedHandle.hh,v 1.15 2006/06/29 19:02:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Class G4ReferenceCountedHandle diff --git a/source/global/management/include/G4RotationMatrix.hh b/source/global/management/include/G4RotationMatrix.hh index 3233638a13..a4b8442738 100644 --- a/source/global/management/include/G4RotationMatrix.hh +++ b/source/global/management/include/G4RotationMatrix.hh @@ -25,7 +25,7 @@ // // // $Id: G4RotationMatrix.hh,v 1.5 2006/06/29 19:02:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/global/management/include/G4SIunits.hh b/source/global/management/include/G4SIunits.hh index 0045256aa7..318e81e1ff 100644 --- a/source/global/management/include/G4SIunits.hh +++ b/source/global/management/include/G4SIunits.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4SIunits.hh,v 1.4 2006/06/29 19:02:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4SIunits.hh,v 1.5 2006/09/15 08:16:10 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // @@ -67,8 +67,6 @@ #ifndef G4UNITSTEST_HH #define G4UNITSTEST_HH -#include - // // Length [L] // diff --git a/source/global/management/include/G4SliceTimer.hh b/source/global/management/include/G4SliceTimer.hh new file mode 100644 index 0000000000..02c0a418c1 --- /dev/null +++ b/source/global/management/include/G4SliceTimer.hh @@ -0,0 +1,140 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4SliceTimer.hh,v 1.1 2006/10/23 07:43:31 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// +// ---------------------------------------------------------------------- +// Class G4SliceTimer +// +// Class description: +// +// Class for timer objects, able to measure elasped user/system process +// accumulated time. +// +// Note: Uses & - POSIX.1 defined +// If used, this header must be included in the source (.cc) file +// and it must be the first header file to be included! +// +// Member functions: +// +// G4SliceTimer() +// Construct a timer object +// Start() +// Start timing +// Stop() +// Stop timing +// Clear() +// Clear accumulated times +// G4bool IsValid() +// Return true if have a valid time (ie start() and stop() called) +// G4double GetRealElapsed() +// Return the elapsed real time between last calling start() and stop() +// G4double GetSystemElapsed() +// Return the elapsed system time between last calling start() and stop() +// G4double GetUserElapsed() +// Return the elapsed user time between last calling start() and stop() +// +// Operators: +// +// std::ostream& operator << (std::ostream& os, const G4SliceTimer& t); +// Print the elapsed real,system and usertimes on os. Prints **s for times +// if !IsValid +// +// Member data: +// +// G4bool fValidTimes +// True after start and stop have both been called more than once and +// an equal number of times +// clock_t fStartRealTime,fEndRealTime +// Real times (arbitrary time 0) +// tms fStartTimes,fEndTimes +// Timing structures (see times(2)) for start and end times + +// History: +// 23.10.06 - M.Asai - Derived from G4Timer implementation +// ---------------------------------------------------------------------- +#ifndef G4SLICE_TIMER_HH +#define G4SLICE_TIMER_HH + +#ifndef WIN32 +# include +# include +#else +# include +# define _SC_CLK_TCK 1 + + extern "C" { + int sysconf(int); + }; + + // Structure returned by times() + + struct tms { + clock_t tms_utime; /* user time */ + clock_t tms_stime; /* system time */ + clock_t tms_cutime; /* user time, children */ + clock_t tms_cstime; /* system time, children */ + }; + + extern "C" { + extern clock_t times(struct tms *); + }; +#endif /* WIN32 */ + +#include "G4Types.hh" +#include "G4ios.hh" + +class G4SliceTimer +{ + public: + + G4SliceTimer(); + + inline void Start(); + inline void Stop(); + inline void Clear(); + inline G4bool IsValid() const; + G4double GetRealElapsed() const; + G4double GetSystemElapsed() const; + G4double GetUserElapsed() const; + + private: + + G4bool fValidTimes; + clock_t fStartRealTime,fEndRealTime; + tms fStartTimes,fEndTimes; + G4double fRealElapsed,fSystemElapsed,fUserElapsed; +}; + +std::ostream& operator << (std::ostream& os, const G4SliceTimer& t); + +#include "G4SliceTimer.icc" + +#define times ostimes + +#endif diff --git a/source/global/management/include/G4SliceTimer.icc b/source/global/management/include/G4SliceTimer.icc new file mode 100644 index 0000000000..5be1993fa1 --- /dev/null +++ b/source/global/management/include/G4SliceTimer.icc @@ -0,0 +1,64 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4SliceTimer.icc,v 1.1 2006/10/23 07:43:31 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// +// ------------------------------------------------------------ +// GEANT 4 class inline implementation +// ------------------------------------------------------------ + +inline +void G4SliceTimer::Start() +{ + fValidTimes=false; + fStartRealTime=times(&fStartTimes); +} + +inline +void G4SliceTimer::Stop() +{ + fEndRealTime=times(&fEndTimes); + fRealElapsed += fEndRealTime-fStartRealTime; + fSystemElapsed += fEndTimes.tms_stime-fStartTimes.tms_stime; + fUserElapsed += fEndTimes.tms_utime-fStartTimes.tms_utime; + fValidTimes=true; +} + +inline +void G4SliceTimer::Clear() +{ + fRealElapsed = 0.; + fSystemElapsed = 0.; + fUserElapsed = 0.; +} + +inline +G4bool G4SliceTimer::IsValid() const +{ + return fValidTimes; +} diff --git a/source/global/management/include/G4StateManager.hh b/source/global/management/include/G4StateManager.hh index a4883133c4..66e2fe6774 100644 --- a/source/global/management/include/G4StateManager.hh +++ b/source/global/management/include/G4StateManager.hh @@ -25,7 +25,7 @@ // // // $Id: G4StateManager.hh,v 1.10 2006/06/29 19:02:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/global/management/include/G4StateManager.icc b/source/global/management/include/G4StateManager.icc index 49d6cbcc07..a6cbdaa00c 100644 --- a/source/global/management/include/G4StateManager.icc +++ b/source/global/management/include/G4StateManager.icc @@ -25,7 +25,7 @@ // // // $Id: G4StateManager.icc,v 1.2 2006/06/29 19:03:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/global/management/include/G4String.hh b/source/global/management/include/G4String.hh index caec6ed31c..554e5b7dfc 100644 --- a/source/global/management/include/G4String.hh +++ b/source/global/management/include/G4String.hh @@ -25,7 +25,7 @@ // // // $Id: G4String.hh,v 1.6 2006/06/29 19:03:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/global/management/include/G4String.icc b/source/global/management/include/G4String.icc index 02ab3c5c86..7205cbd3ff 100644 --- a/source/global/management/include/G4String.icc +++ b/source/global/management/include/G4String.icc @@ -25,7 +25,7 @@ // // // $Id: G4String.icc,v 1.8 2006/06/29 19:03:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/global/management/include/G4SystemOfUnits.hh b/source/global/management/include/G4SystemOfUnits.hh index f20e59c81b..c58ae3a4ea 100644 --- a/source/global/management/include/G4SystemOfUnits.hh +++ b/source/global/management/include/G4SystemOfUnits.hh @@ -24,7 +24,7 @@ // ******************************************************************** // -#include "CLHEP/Units/SystemOfUnits.h" +#include using CLHEP::millimeter; using CLHEP::millimeter2; diff --git a/source/global/management/include/G4ThreeVector.hh b/source/global/management/include/G4ThreeVector.hh index 3541e19d1a..3693289d87 100644 --- a/source/global/management/include/G4ThreeVector.hh +++ b/source/global/management/include/G4ThreeVector.hh @@ -25,7 +25,7 @@ // // // $Id: G4ThreeVector.hh,v 1.5 2006/06/29 19:03:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/global/management/include/G4Timer.hh b/source/global/management/include/G4Timer.hh index 9b55fb6d69..f874ddd6d3 100644 --- a/source/global/management/include/G4Timer.hh +++ b/source/global/management/include/G4Timer.hh @@ -25,7 +25,7 @@ // // // $Id: G4Timer.hh,v 1.14 2006/06/29 19:03:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/global/management/include/G4Timer.icc b/source/global/management/include/G4Timer.icc index f379652310..71654aafd8 100644 --- a/source/global/management/include/G4Timer.icc +++ b/source/global/management/include/G4Timer.icc @@ -25,7 +25,7 @@ // // // $Id: G4Timer.icc,v 1.2 2006/06/29 19:03:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/global/management/include/G4Tokenizer.hh b/source/global/management/include/G4Tokenizer.hh index 6bccb3fb1b..b6b328ddd0 100644 --- a/source/global/management/include/G4Tokenizer.hh +++ b/source/global/management/include/G4Tokenizer.hh @@ -25,7 +25,7 @@ // // // $Id: G4Tokenizer.hh,v 1.2 2006/06/29 19:03:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/global/management/include/G4Types.hh b/source/global/management/include/G4Types.hh index 4f147fdef3..2481fef9c6 100644 --- a/source/global/management/include/G4Types.hh +++ b/source/global/management/include/G4Types.hh @@ -25,7 +25,7 @@ // // // $Id: G4Types.hh,v 1.14 2006/06/29 19:03:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // GEANT4 native types diff --git a/source/global/management/include/G4UnitsTable.hh b/source/global/management/include/G4UnitsTable.hh index fa39245701..1e93069a02 100644 --- a/source/global/management/include/G4UnitsTable.hh +++ b/source/global/management/include/G4UnitsTable.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4UnitsTable.hh,v 1.17 2006/06/29 19:03:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4UnitsTable.hh,v 1.18 2006/11/30 10:37:57 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ----------------------------------------------------------------- @@ -85,6 +85,7 @@ public: // with description static void BuildUnitsTable(); static void PrintUnitsTable(); + static void ClearUnitsTable(); static G4UnitsTable& GetUnitsTable(); diff --git a/source/global/management/include/G4UnitsTable.icc b/source/global/management/include/G4UnitsTable.icc index 2a40d438d7..5c3c79cdcd 100644 --- a/source/global/management/include/G4UnitsTable.icc +++ b/source/global/management/include/G4UnitsTable.icc @@ -25,7 +25,7 @@ // // // $Id: G4UnitsTable.icc,v 1.2 2006/06/29 19:03:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/global/management/include/G4UserLimits.hh b/source/global/management/include/G4UserLimits.hh index 873fcd7d2e..57aaebdc62 100644 --- a/source/global/management/include/G4UserLimits.hh +++ b/source/global/management/include/G4UserLimits.hh @@ -25,7 +25,7 @@ // // // $Id: G4UserLimits.hh,v 1.9 2006/06/29 19:03:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // class G4UserLimits diff --git a/source/global/management/include/G4UserLimits.icc b/source/global/management/include/G4UserLimits.icc index f58d6f2df1..4a910a1c19 100644 --- a/source/global/management/include/G4UserLimits.icc +++ b/source/global/management/include/G4UserLimits.icc @@ -25,7 +25,7 @@ // // // $Id: G4UserLimits.icc,v 1.8 2006/06/29 19:03:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // diff --git a/source/global/management/include/G4VExceptionHandler.hh b/source/global/management/include/G4VExceptionHandler.hh index 44ed9617fe..95771aa1d3 100644 --- a/source/global/management/include/G4VExceptionHandler.hh +++ b/source/global/management/include/G4VExceptionHandler.hh @@ -25,7 +25,7 @@ // // // $Id: G4VExceptionHandler.hh,v 1.2 2006/06/29 19:03:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/global/management/include/G4VNotifier.hh b/source/global/management/include/G4VNotifier.hh index ad47491b03..9179eb9f56 100644 --- a/source/global/management/include/G4VNotifier.hh +++ b/source/global/management/include/G4VNotifier.hh @@ -25,7 +25,7 @@ // // // $Id: G4VNotifier.hh,v 1.2 2006/06/29 19:03:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class G4VNotifier // diff --git a/source/global/management/include/G4VStateDependent.hh b/source/global/management/include/G4VStateDependent.hh index 6740435ce0..32b264a93b 100644 --- a/source/global/management/include/G4VStateDependent.hh +++ b/source/global/management/include/G4VStateDependent.hh @@ -25,7 +25,7 @@ // // // $Id: G4VStateDependent.hh,v 1.5 2006/06/29 19:03:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/global/management/include/G4Version.hh b/source/global/management/include/G4Version.hh index c759ba7e8e..5bc7e034f5 100644 --- a/source/global/management/include/G4Version.hh +++ b/source/global/management/include/G4Version.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Version.hh,v 1.4 2006/06/29 19:03:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Version.hh,v 1.7 2006/11/15 12:14:03 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Version information // @@ -46,18 +46,18 @@ // |--> patch number #ifndef G4VERSION_NUMBER -#define G4VERSION_NUMBER 810 +#define G4VERSION_NUMBER 820 #endif #ifndef G4VERSION_TAG -#define G4VERSION_TAG "$Name: geant4-08-01 $" +#define G4VERSION_TAG "$Name: geant4-08-02 $" #endif // as variables #include "G4String.hh" -static const G4String G4Version = "$Name: geant4-08-01 $"; -static const G4String G4Date = "(30-June-2006)"; +static const G4String G4Version = "$Name: geant4-08-02 $"; +static const G4String G4Date = "(15-December-2006)"; #endif diff --git a/source/global/management/include/G4coutDestination.hh b/source/global/management/include/G4coutDestination.hh index a0a22197c1..66dd5bfc08 100644 --- a/source/global/management/include/G4coutDestination.hh +++ b/source/global/management/include/G4coutDestination.hh @@ -25,7 +25,7 @@ // // // $Id: G4coutDestination.hh,v 1.6 2006/06/29 19:03:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // --------------------------------------------------------------- diff --git a/source/global/management/include/G4ios.hh b/source/global/management/include/G4ios.hh index 89f01bcf70..0191317c0c 100644 --- a/source/global/management/include/G4ios.hh +++ b/source/global/management/include/G4ios.hh @@ -25,7 +25,7 @@ // // // $Id: G4ios.hh,v 1.10 2006/06/29 19:03:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // --------------------------------------------------------------- diff --git a/source/global/management/include/G4strstreambuf.hh b/source/global/management/include/G4strstreambuf.hh index 0543268307..982ca883ea 100644 --- a/source/global/management/include/G4strstreambuf.hh +++ b/source/global/management/include/G4strstreambuf.hh @@ -25,7 +25,7 @@ // // // $Id: G4strstreambuf.hh,v 1.15 2006/06/29 19:03:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ==================================================================== // // G4strstreambuf diff --git a/source/global/management/include/G4strstreambuf.icc b/source/global/management/include/G4strstreambuf.icc index 7b8977a8ff..42d16fcc4c 100644 --- a/source/global/management/include/G4strstreambuf.icc +++ b/source/global/management/include/G4strstreambuf.icc @@ -25,7 +25,7 @@ // // // $Id: G4strstreambuf.icc,v 1.13 2006/06/29 19:03:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ==================================================================== // G4strstreambuf.icc // diff --git a/source/global/management/include/globals.hh b/source/global/management/include/globals.hh index 48b7aa0600..456c157eb3 100644 --- a/source/global/management/include/globals.hh +++ b/source/global/management/include/globals.hh @@ -25,7 +25,7 @@ // // // $Id: globals.hh,v 1.27 2006/06/29 19:03:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Global Constants and typedefs diff --git a/source/global/management/include/templates.hh b/source/global/management/include/templates.hh index c4e903791a..6425edf31e 100644 --- a/source/global/management/include/templates.hh +++ b/source/global/management/include/templates.hh @@ -25,7 +25,7 @@ // // // $Id: templates.hh,v 1.10 2006/06/29 19:03:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -*- C++ -*- diff --git a/source/global/management/src/G4AllocatorPool.cc b/source/global/management/src/G4AllocatorPool.cc index bec9178203..c3403f21a8 100644 --- a/source/global/management/src/G4AllocatorPool.cc +++ b/source/global/management/src/G4AllocatorPool.cc @@ -25,7 +25,7 @@ // // // $Id: G4AllocatorPool.cc,v 1.4 2006/06/29 19:03:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/global/management/src/G4DataVector.cc b/source/global/management/src/G4DataVector.cc index 812983958e..1fbc2b749a 100644 --- a/source/global/management/src/G4DataVector.cc +++ b/source/global/management/src/G4DataVector.cc @@ -25,7 +25,7 @@ // // // $Id: G4DataVector.cc,v 1.8 2006/06/29 19:03:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/global/management/src/G4Exception.cc b/source/global/management/src/G4Exception.cc index d8dd610c59..786b48f00b 100644 --- a/source/global/management/src/G4Exception.cc +++ b/source/global/management/src/G4Exception.cc @@ -25,7 +25,7 @@ // // // $Id: G4Exception.cc,v 1.20 2006/06/29 19:04:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/global/management/src/G4LPhysicsFreeVector.cc b/source/global/management/src/G4LPhysicsFreeVector.cc index 43e2630b30..0c7e04b3e4 100644 --- a/source/global/management/src/G4LPhysicsFreeVector.cc +++ b/source/global/management/src/G4LPhysicsFreeVector.cc @@ -25,7 +25,7 @@ // // // $Id: G4LPhysicsFreeVector.cc,v 1.10 2006/06/29 19:04:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------------- diff --git a/source/global/management/src/G4OrderedTable.cc b/source/global/management/src/G4OrderedTable.cc index 811f7f71b4..f571b94e75 100644 --- a/source/global/management/src/G4OrderedTable.cc +++ b/source/global/management/src/G4OrderedTable.cc @@ -25,7 +25,7 @@ // // // $Id: G4OrderedTable.cc,v 1.5 2006/06/29 19:04:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/global/management/src/G4PhysicsFreeVector.cc b/source/global/management/src/G4PhysicsFreeVector.cc index 7624318adc..71a8bb8785 100644 --- a/source/global/management/src/G4PhysicsFreeVector.cc +++ b/source/global/management/src/G4PhysicsFreeVector.cc @@ -25,7 +25,7 @@ // // // $Id: G4PhysicsFreeVector.cc,v 1.10 2006/06/29 19:04:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //-------------------------------------------------------------------- diff --git a/source/global/management/src/G4PhysicsLinearVector.cc b/source/global/management/src/G4PhysicsLinearVector.cc index 1d0a99ecdf..9dc17b2a8a 100644 --- a/source/global/management/src/G4PhysicsLinearVector.cc +++ b/source/global/management/src/G4PhysicsLinearVector.cc @@ -25,7 +25,7 @@ // // // $Id: G4PhysicsLinearVector.cc,v 1.12 2006/06/29 19:04:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //-------------------------------------------------------------------- diff --git a/source/global/management/src/G4PhysicsLnVector.cc b/source/global/management/src/G4PhysicsLnVector.cc index 9a56f5b43e..b39d3a8651 100644 --- a/source/global/management/src/G4PhysicsLnVector.cc +++ b/source/global/management/src/G4PhysicsLnVector.cc @@ -25,7 +25,7 @@ // // // $Id: G4PhysicsLnVector.cc,v 1.15 2006/06/29 19:04:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/global/management/src/G4PhysicsLogVector.cc b/source/global/management/src/G4PhysicsLogVector.cc index 7b96175f33..c6b8998a33 100644 --- a/source/global/management/src/G4PhysicsLogVector.cc +++ b/source/global/management/src/G4PhysicsLogVector.cc @@ -25,7 +25,7 @@ // // // $Id: G4PhysicsLogVector.cc,v 1.13 2006/06/29 19:04:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/global/management/src/G4PhysicsOrderedFreeVector.cc b/source/global/management/src/G4PhysicsOrderedFreeVector.cc index 96d926541e..50d437bb80 100644 --- a/source/global/management/src/G4PhysicsOrderedFreeVector.cc +++ b/source/global/management/src/G4PhysicsOrderedFreeVector.cc @@ -25,7 +25,7 @@ // // // $Id: G4PhysicsOrderedFreeVector.cc,v 1.10 2006/06/29 19:04:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //////////////////////////////////////////////////////////////////////// // PhysicsOrderedFreeVector Class Implementation diff --git a/source/global/management/src/G4PhysicsTable.cc b/source/global/management/src/G4PhysicsTable.cc index 23d78f8838..9e53660fb1 100644 --- a/source/global/management/src/G4PhysicsTable.cc +++ b/source/global/management/src/G4PhysicsTable.cc @@ -25,7 +25,7 @@ // // // $Id: G4PhysicsTable.cc,v 1.14 2006/06/29 19:04:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/global/management/src/G4PhysicsVector.cc b/source/global/management/src/G4PhysicsVector.cc index fc48d0f742..18453df851 100644 --- a/source/global/management/src/G4PhysicsVector.cc +++ b/source/global/management/src/G4PhysicsVector.cc @@ -25,7 +25,7 @@ // // // $Id: G4PhysicsVector.cc,v 1.17 2006/06/29 19:04:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04GeneralPhysics.cc b/source/global/management/src/G4SliceTimer.cc similarity index 57% rename from examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04GeneralPhysics.cc rename to source/global/management/src/G4SliceTimer.cc index ed26345e61..118600a3b6 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04GeneralPhysics.cc +++ b/source/global/management/src/G4SliceTimer.cc @@ -24,53 +24,64 @@ // ******************************************************************** // // -// $Id: ExN04GeneralPhysics.cc,v 1.3 2006/06/29 17:08:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4SliceTimer.cc,v 1.2 2006/11/02 15:39:39 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // +// ---------------------------------------------------------------------- +// class G4SliceTimer +// +// Implementation +// ---------------------------------------------------------------------- -#include "ExN04GeneralPhysics.hh" - -#include "globals.hh" +#include "G4SliceTimer.hh" #include "G4ios.hh" -#include -ExN04GeneralPhysics::ExN04GeneralPhysics(const G4String& name) - : G4VPhysicsConstructor(name) +#undef times + +// Global error function +void G4Exception(const char* s=0); + +#if defined(IRIX6_2) +# if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE_EXTENDED==1) +# define __vfork vfork +# endif +#endif + +// Print timer status n std::ostream +std::ostream& operator << (std::ostream& os, const G4SliceTimer& t) { + if (t.IsValid()) + { + os << "User=" << t.GetUserElapsed() + << "s Real=" << t.GetRealElapsed() + << "s Sys=" << t.GetSystemElapsed() << "s"; + } + else + { + os << "User=****s Real=****s Sys=****s"; + } + return os; } -ExN04GeneralPhysics::~ExN04GeneralPhysics() +G4SliceTimer::G4SliceTimer() + : fValidTimes(true) { + Clear(); } -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" -// Bosons -#include "G4ChargedGeantino.hh" -#include "G4Geantino.hh" - -void ExN04GeneralPhysics::ConstructParticle() +G4double G4SliceTimer::GetRealElapsed() const { - // pseudo-particles - G4Geantino::GeantinoDefinition(); - G4ChargedGeantino::ChargedGeantinoDefinition(); -} - -void ExN04GeneralPhysics::ConstructProcess() -{ - // Add Decay Process - theParticleIterator->reset(); - while( (*theParticleIterator)() ){ - G4ParticleDefinition* particle = theParticleIterator->value(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - if (fDecayProcess.IsApplicable(*particle)) { - pmanager ->AddProcess(&fDecayProcess); - // set ordering for PostStepDoIt and AtRestDoIt - pmanager ->SetProcessOrdering(&fDecayProcess, idxPostStep); - pmanager ->SetProcessOrdering(&fDecayProcess, idxAtRest); - } - } + return fRealElapsed/sysconf(_SC_CLK_TCK); } +G4double G4SliceTimer::GetSystemElapsed() const +{ + return fSystemElapsed/sysconf(_SC_CLK_TCK); +} + +G4double G4SliceTimer::GetUserElapsed() const +{ + return fUserElapsed/sysconf(_SC_CLK_TCK); +} diff --git a/source/global/management/src/G4StateManager.cc b/source/global/management/src/G4StateManager.cc index fc8bb98101..e8d8eb9e06 100644 --- a/source/global/management/src/G4StateManager.cc +++ b/source/global/management/src/G4StateManager.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4StateManager.cc,v 1.12 2006/06/29 19:04:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4StateManager.cc,v 1.13 2006/11/23 00:41:56 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ @@ -192,7 +192,6 @@ G4StateManager::SetNewState(G4ApplicationState requestedState, const char* msg) G4bool ack = true; G4ApplicationState savedState = thePreviousState; thePreviousState = theCurrentState; - theCurrentState = requestedState; while ((ack) && (iNotify(requestedState); @@ -204,10 +203,9 @@ G4StateManager::SetNewState(G4ApplicationState requestedState, const char* msg) } if(!ack) - { - theCurrentState = thePreviousState; - thePreviousState = savedState; - } + { thePreviousState = savedState; } + else + { theCurrentState = requestedState; } msgptr = 0; return ack; } diff --git a/source/global/management/src/G4Timer.cc b/source/global/management/src/G4Timer.cc index 4ca5f33234..55b4ce37d2 100644 --- a/source/global/management/src/G4Timer.cc +++ b/source/global/management/src/G4Timer.cc @@ -25,7 +25,7 @@ // // // $Id: G4Timer.cc,v 1.15 2006/06/29 19:04:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/global/management/src/G4UnitsTable.cc b/source/global/management/src/G4UnitsTable.cc index ff2533c776..5cb68a037b 100644 --- a/source/global/management/src/G4UnitsTable.cc +++ b/source/global/management/src/G4UnitsTable.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4UnitsTable.cc,v 1.34 2006/06/29 19:04:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4UnitsTable.cc,v 1.36 2006/11/30 10:37:57 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... // @@ -40,6 +40,7 @@ // 07-02-06: GeV/cm MeV/cm keV/cm eV/cm ("Energy/Length") (mma) // 15-02-06: g/cm2 ("Mass/Surface") // MeV*cm2/g ..etc.. ("Energy*Surface/Mass") +// 18-08-06: remove symbol mum (mma) // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -80,11 +81,6 @@ G4UnitDefinition::G4UnitDefinition(const G4String& name, G4UnitDefinition::~G4UnitDefinition() { - for (size_t i=0;i* definitions) +- Improved output diagnostics. + +--------------------------------------------------------------------------- +15th September 2006 John Allison (greps-V08-01-04 - coworks vis-V08-01-06) +- G4Visible: Added fAllocatedVisAttributes to prevent memory leak. + +12th September 2006 Jane Tinslay +- Remove trailing white spaces in G4ConversionUtils +- Add FilterHit method to G4VVisManager + +11th September 2006 Jane Tinslay +- Add templated G4AttDef's and various utilities + +11th September 2006 John Allison +- Fixed G4AttCheck for dimensionless "Physics" attributes (were + previously "Bookkeeping"). + +6th September 2006 Jane Tinslay +- Add G4TypeKey & G4TypeKeyT classes + +------------------------------------------------ +26th August 2006 John Allison (greps-V08-01-03) +- G4VisAttributes: Added time range. + +25th August 2006 Jane Tinslay +- Make G4VFilter Accept method const + +14th August 2006 John Allison (greps-V08-01-02) +- G4AttCheck: Improved error checking. + +10th July 2006 John Allison (greps-V08-01-01) +- Co-works with vis-V08-01-01. +- G4VGraphicsScene.hh: Removed Establish/DecommissionSpecials. +- G4VisAttributes: + o Added ForceLineSegmentsPerCircle. + o Cosmetic re-ordering of methods, + +3rd July 2006 John Allison (greps-V08-01-00) +- G4AttCheck.cc: + o Added G4bool to the list of allowed G4AttValue value types. + o Added Density to the list of units categories. +- G4AttDefStore: Added GetName. 2nd May 2006 Jane Tinslay (greps-V08-00-03) - Add FilterTrajectory method to G4VVisManager diff --git a/source/graphics_reps/include/G4AttCheck.hh b/source/graphics_reps/include/G4AttCheck.hh index 3f1c24c0e3..1ba60d7f8e 100644 --- a/source/graphics_reps/include/G4AttCheck.hh +++ b/source/graphics_reps/include/G4AttCheck.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4AttCheck.hh,v 1.6 2006/06/29 19:05:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4AttCheck.hh,v 1.8 2006/10/17 16:14:08 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4ATTCHECK_HH #define G4ATTCHECK_HH diff --git a/source/graphics_reps/include/G4AttDef.hh b/source/graphics_reps/include/G4AttDef.hh index aed87e3477..60f225649b 100644 --- a/source/graphics_reps/include/G4AttDef.hh +++ b/source/graphics_reps/include/G4AttDef.hh @@ -24,13 +24,15 @@ // ******************************************************************** // // -// $Id: G4AttDef.hh,v 1.5 2006/06/29 19:05:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4AttDef.hh,v 1.7 2006/10/17 16:14:08 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4ATTDEF_HH #define G4ATTDEF_HH #include "globals.hh" +#include "G4TypeKey.hh" +#include // Class Description: // @@ -65,13 +67,27 @@ m_category(category), m_extra(extra),m_valueType(valueType){}; + // G4Typekey based constructor + G4AttDef(const G4String& name, + const G4String& desc, + const G4String& category, + const G4String& extra, + const G4TypeKey& typeKey): + m_name(name),m_desc(desc), + m_category(category), + m_extra(extra),m_valueType("Null"), + m_typeKey(typeKey) + {}; + G4AttDef(){}; + virtual ~G4AttDef(){}; const G4String& GetName()const{return m_name;}; const G4String& GetDesc()const{return m_desc;}; const G4String& GetCategory()const{return m_category;}; const G4String& GetExtra()const{return m_extra;}; const G4String& GetValueType()const{return m_valueType;}; + const G4TypeKey& GetTypeKey()const{return m_typeKey;}; void SetName(const G4String& name){m_name = name;}; void SetDesc(const G4String& desc){m_desc = desc;}; @@ -90,5 +106,12 @@ G4String m_extra; /// The type of the value of the attribute (int, double, vector, etc.) G4String m_valueType; + // Type key + G4TypeKey m_typeKey; + }; + +std::ostream& operator<< + (std::ostream& os, const std::map* definitions); + #endif //G4ATTDEF_H diff --git a/source/graphics_reps/include/G4AttDefStore.hh b/source/graphics_reps/include/G4AttDefStore.hh index 5d8e8c8a00..e90833c919 100644 --- a/source/graphics_reps/include/G4AttDefStore.hh +++ b/source/graphics_reps/include/G4AttDefStore.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4AttDefStore.hh,v 1.7 2006/06/29 19:05:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4AttDefStore.hh,v 1.10 2006/11/01 10:08:41 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4ATTDEFSTORE_HH #define G4ATTDEFSTORE_HH @@ -40,11 +40,17 @@ class G4AttDefStore public: static std::map* - GetInstance(G4String storeName, G4bool& isNew); - // Returns a pointer to the named store - // and isNew is true if store is new. - // The store keeps the ownership of the returned - // pointer to the map. + GetInstance(G4String storeKey, G4bool& isNew); + // Returns a pointer to the definitions accessed by the given + // key. "isNew" is true if definitions pointer is new and + // therefore the needs filling. The store keeps the ownership + // of the returned pointer. See G4Trajectory::GetAttDefs for an + // example of the use of this class. + + static G4bool GetStoreKey + (const std::map* definitions, G4String& key); + // Returns true and assigns key if definitions are amongst those + // maintained in the store. ~G4AttDefStore(); // Destructor. @@ -58,7 +64,7 @@ class G4AttDefStore G4AttDefStore(const G4AttDefStore&); G4AttDefStore& operator=(const G4AttDefStore&); - static std::map*> m_stores; + static std::map*> m_defsmaps; static G4AttDefStore* theInstance; }; diff --git a/source/graphics_reps/include/G4AttDefT.hh b/source/graphics_reps/include/G4AttDefT.hh new file mode 100644 index 0000000000..bb1d15a4af --- /dev/null +++ b/source/graphics_reps/include/G4AttDefT.hh @@ -0,0 +1,62 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4AttDefT.hh,v 1.2 2006/12/13 15:43:57 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// Templated G4AttDef. Generates type key for given template parameter. +// +// Jane Tinslay, September 2006 +// +#ifndef G4ATTDEFT_HH +#define G4ATTDEFT_HH + +#include "globals.hh" +#include "G4AttDef.hh" +#include "G4TypeKeyT.hh" + +template +class G4AttDefT : public G4AttDef { + +public: + + typedef T Type; + + // Constructor + G4AttDefT(const G4String& name, + const G4String& desc, + const G4String& category, + const G4String& extra="") + :G4AttDef(name, desc, category, extra, G4TypeKeyT()) + {} + + // Destructor + virtual ~G4AttDefT() {}; + +private: + +}; + +#endif diff --git a/examples/extended/medical/GammaTherapy/include/EmHadronElasticBuilder.hh b/source/graphics_reps/include/G4AttHolder.hh similarity index 58% rename from examples/extended/medical/GammaTherapy/include/EmHadronElasticBuilder.hh rename to source/graphics_reps/include/G4AttHolder.hh index 48d33ea960..cce1e7e3a2 100644 --- a/examples/extended/medical/GammaTherapy/include/EmHadronElasticBuilder.hh +++ b/source/graphics_reps/include/G4AttHolder.hh @@ -23,57 +23,56 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// -// -// ------------------------------------------------------------ -// GEANT 4 class header file -// Class Description: -// This class is an derived class of G4VPhysicsConstructor -// It is provide PhysicsList for hadron eleastic process -// -// ------------------------------------------------------------ -// History -// Created: 14.10.02 V.Ivanchenko -// -// Modified: -// -// ------------------------------------------------------------ -// -#ifndef EmHadronElasticBuilder_h -#define EmHadronElasticBuilder_h 1 +// $Id: G4AttHolder.hh,v 1.4 2006/11/01 10:11:44 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ + +#ifndef G4ATTHOLDER_HH +#define G4ATTHOLDER_HH + +// Class Description: +// +// @class G4AttHolder +// +// @brief Holds G4AttValues and their corresponding G4AttDef map. +// +// Intended for inheritance by classes that need to hold them. +// +// For further details, see the HepRep home page at http://heprep.freehep.org +// +// @author J.Allison +// @author J.Perl +// Class Description - End: -#include "G4VPhysicsConstructor.hh" #include "globals.hh" -class G4HadronElasticProcess; +#include +#include -class EmHadronElasticBuilder : public G4VPhysicsConstructor -{ -public: - EmHadronElasticBuilder(const G4String& name = "elastic"); - virtual ~EmHadronElasticBuilder(); +class G4AttValue; +class G4AttDef; + +class G4AttHolder { public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - void ConstructParticle() {}; - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - void ConstructProcess(); + G4AttHolder() {} + ~G4AttHolder(); // Note: G4AttValues are deleted here. + + const std::vector*>& GetAttValues() const + {return fValues;} + const std::vector*>& GetAttDefs() const + {return fDefs;} + + void AddAtts(const std::vector* values, + const std::map* defs) + {fValues.push_back(values); fDefs.push_back(defs);} + // Note: G4AttValues are assumed to be expendable - they will be + // deleted in the destructor. G4AttDefs are assumed to have long + // life. private: - G4HadronElasticProcess* theElasticProcess; + std::vector*> fValues; + std::vector*> fDefs; }; - -#endif - - - - - - - - +#endif //G4ATTHOLDER_HH diff --git a/examples/extended/medical/GammaTherapy/include/G4EmMuonBuilder.hh b/source/graphics_reps/include/G4AttUtils.hh similarity index 51% rename from examples/extended/medical/GammaTherapy/include/G4EmMuonBuilder.hh rename to source/graphics_reps/include/G4AttUtils.hh index 3f5a07d319..8faffa1c69 100644 --- a/examples/extended/medical/GammaTherapy/include/G4EmMuonBuilder.hh +++ b/source/graphics_reps/include/G4AttUtils.hh @@ -23,44 +23,76 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// $Id: G4AttUtils.hh,v 1.1 2006/09/11 18:04:58 tinslay Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // -// $Id: G4EmMuonBuilder.hh,v 1.2 2006/06/29 17:26:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// Jane Tinslay September 2006 // -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +// Visualisation attribute utility functions. +// +#ifndef G4ATTUTILS_HH +#define G4ATTUTILS_HH -#ifndef G4EmMuonBuilder_h -#define G4EmMuonBuilder_h 1 - -#include "G4VPhysicsConstructor.hh" #include "globals.hh" +#include "G4AttDef.hh" +#include "G4AttValue.hh" +#include "G4String.hh" +#include "G4TypeKey.hh" +#include +#include -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +namespace G4AttUtils { + + namespace { -class G4EmMuonBuilder : public G4VPhysicsConstructor -{ -public: - G4EmMuonBuilder(const G4String& name = "EM_stan_muons"); - virtual ~G4EmMuonBuilder(); + // Utility class + template + class HasName { + public: + HasName(const G4String& name): fName(name) {}; + bool operator()(const T& value) const + {return value.GetName() == fName;} + private: + G4String fName; + }; -public: - // This method is dummy for physics - virtual void ConstructParticle(); + } + + // Extract attribute definition with given name + template + G4bool ExtractAttDef(const T& object, const G4String& name, G4AttDef& def) + { + const std::map* attDefs = object.GetAttDefs(); - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); + std::map::const_iterator iter = attDefs->find(name); + if (iter == attDefs->end()) return false; + + def = iter->second; + + return true; + } + + // Extract attribute value with given name + template + G4bool ExtractAttValue(const T& object, const G4String& name, G4AttValue& attVal) + { + std::vector* attValues = object.CreateAttValues(); + + std::vector::iterator iter = std::find_if(attValues->begin(), attValues->end(), + HasName(name)); + if (iter == attValues->end()) return false; + + attVal = *iter; + + // Clean up + delete attValues; -private: + return true; + } - // hide assignment operator - G4EmMuonBuilder & operator=(const G4EmMuonBuilder &right); - G4EmMuonBuilder(const G4EmMuonBuilder&); + // Get G4TypeKey information for old style G4AttDef's + G4TypeKey GetKey(const G4AttDef& def); -}; - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +} #endif diff --git a/source/graphics_reps/include/G4AttValue.hh b/source/graphics_reps/include/G4AttValue.hh index 949826dcac..7eb93652b4 100644 --- a/source/graphics_reps/include/G4AttValue.hh +++ b/source/graphics_reps/include/G4AttValue.hh @@ -25,7 +25,7 @@ // // // $Id: G4AttValue.hh,v 1.5 2006/06/29 19:05:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4ATTVALUE_HH #define G4ATTVALUE_HH diff --git a/source/graphics_reps/include/G4Circle.hh b/source/graphics_reps/include/G4Circle.hh index 3e956bb4bf..d426ccd6ba 100644 --- a/source/graphics_reps/include/G4Circle.hh +++ b/source/graphics_reps/include/G4Circle.hh @@ -25,7 +25,7 @@ // // // $Id: G4Circle.hh,v 1.9 2006/06/29 19:05:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 17/11/96. diff --git a/source/graphics_reps/include/G4Color.hh b/source/graphics_reps/include/G4Color.hh index 67078034b0..62da0864c7 100644 --- a/source/graphics_reps/include/G4Color.hh +++ b/source/graphics_reps/include/G4Color.hh @@ -25,7 +25,7 @@ // // // $Id: G4Color.hh,v 1.5 2006/06/29 19:05:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 20th October 1996 diff --git a/source/graphics_reps/include/G4Colour.hh b/source/graphics_reps/include/G4Colour.hh index eb52663860..37be491497 100644 --- a/source/graphics_reps/include/G4Colour.hh +++ b/source/graphics_reps/include/G4Colour.hh @@ -25,7 +25,7 @@ // // // $Id: G4Colour.hh,v 1.13 2006/06/29 19:05:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 20th October 1996 diff --git a/source/graphics_reps/include/G4ConversionFatalError.hh b/source/graphics_reps/include/G4ConversionFatalError.hh new file mode 100644 index 0000000000..8ff9580c8b --- /dev/null +++ b/source/graphics_reps/include/G4ConversionFatalError.hh @@ -0,0 +1,51 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4ConversionFatalError.hh,v 1.2 2006/12/13 15:44:00 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// Fatal G4Exception error +// +// Jane Tinslay, September 2006 +// +#ifndef G4CONVERSIONFATALERROR_HH +#define G4CONVERSIONFATALERROR_HH + +#include "globals.hh" +#include "G4String.hh" +#include + +struct G4ConversionFatalError { + + void ReportError(const G4String& input, const G4String& message) const { + std::ostringstream o; + o < + +namespace G4ConversionUtils +{ + // Generic single value istringstream conversion. + // Returns false if conversion failed or if extra characters + // exist in input. + template + G4bool Convert(const G4String& myInput, Value& output) + { + G4String input(myInput); + input = input.strip(); + + std::istringstream is(input); + char tester; + + return ((is >> output) && !is.get(tester)); + } + + // Conversion specialisations. + template<> + inline G4bool Convert(const G4String& myInput, G4DimensionedDouble& output) + { + G4String input(myInput); + input = input.strip(); + + G4double value; + G4String unit; + + std::istringstream is(input); + char tester; + + if (!(is >> value >> unit) || is.get(tester)) return false; + + output = G4DimensionedDouble(value, unit); + + return true; + } + + template<> inline G4bool Convert(const G4String& myInput, + G4DimensionedThreeVector& output) + { + G4String input(myInput); + input = input.strip(); + + G4double value1, value2, value3; + G4String unit; + + std::istringstream is(input); + char tester; + + if (!(is >> value1 >> value2 >> value3 >>unit) || is.get(tester)) return false; + + output = G4DimensionedThreeVector(G4ThreeVector(value1, value2, value3), unit); + + return true; + } + + template<> inline G4bool Convert(const G4String& myInput, G4ThreeVector& output) + { + G4String input(myInput); + input = input.strip(); + + G4double value1, value2, value3; + + std::istringstream is(input); + char tester; + + if (!(is >> value1 >> value2 >> value3) || is.get(tester)) return false; + output = G4ThreeVector(value1, value2, value3); + + return true; + } + + // Generic double value istringstream conversion. + // Return false if conversion failed or if extra characters + // exist in input. + template G4bool Convert(const G4String& myInput, Value& value1, + Value& value2) + { + G4String input(myInput); + input = input.strip(); + + std::istringstream is(input); + char tester; + + return ((is >> value1 >> value2) && (!is.get(tester))); + } + + // Conversion specialisations. + template<> inline G4bool Convert(const G4String& myInput, G4DimensionedDouble& min, + G4DimensionedDouble& max) + { + G4String input(myInput); + input = input.strip(); + + G4double valueMin, valueMax; + G4String unitsMin, unitsMax; + + std::istringstream is(input); + char tester; + + if (!(is >> valueMin >> unitsMin >> valueMax >> unitsMax) || is.get(tester)) return false;; + + min = G4DimensionedDouble(valueMin, unitsMin); + max = G4DimensionedDouble(valueMax, unitsMax); + + return true; + } + + template<> inline G4bool Convert(const G4String& myInput, G4DimensionedThreeVector& min, + G4DimensionedThreeVector& max) + { + G4String input(myInput); + input = input.strip(); + + G4double valueMinX, valueMinY, valueMinZ; + G4double valueMaxX, valueMaxY, valueMaxZ; + G4String unitMin, unitMax; + + std::istringstream is(input); + char tester; + + if (!(is >> valueMinX >> valueMinY >> valueMinZ >> unitMin >> valueMaxX >> valueMaxY >> valueMaxZ >> unitMax) + || is.get(tester)) return false; + + min = G4DimensionedThreeVector(G4ThreeVector(valueMinX, valueMinY, valueMinZ), unitMin); + max = G4DimensionedThreeVector(G4ThreeVector(valueMaxX, valueMaxY, valueMaxZ), unitMax); + + return true; + } + + template<> inline G4bool Convert(const G4String& myInput, G4ThreeVector& min, + G4ThreeVector& max) + { + G4String input(myInput); + input = input.strip(); + + G4double valueMinX, valueMinY, valueMinZ; + G4double valueMaxX, valueMaxY, valueMaxZ; + + std::istringstream is(input); + char tester; + + if (!(is >> valueMinX >> valueMinY >> valueMinZ >> valueMaxX >> valueMaxY >> valueMaxZ) + || is.get(tester)) return false; + + min = G4ThreeVector(valueMinX, valueMinY, valueMinZ); + max = G4ThreeVector(valueMaxX, valueMaxY, valueMaxZ); + + return true; + } + +} + +#endif diff --git a/source/graphics_reps/include/G4CreatorFactoryT.hh b/source/graphics_reps/include/G4CreatorFactoryT.hh new file mode 100644 index 0000000000..49225a3947 --- /dev/null +++ b/source/graphics_reps/include/G4CreatorFactoryT.hh @@ -0,0 +1,109 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4CreatorFactoryT.hh,v 1.2 2006/12/13 15:44:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// Generic identifier-creator based factory. Based on +// factory presented in "Modern C++ Design, Andrei Alexandrescu" +// +// Jane Tinslay, September 2006 +// +#ifndef G4CREATORFACTORYT_HH +#define G4CREATORFACTORYT_HH + +#include "globals.hh" +#include +#include + +template +class G4CreatorFactoryT { + +public: + + // Constructor + G4CreatorFactoryT(); + + // Destructor + virtual ~G4CreatorFactoryT(); + + // Register identifier<->creator pairs + G4bool Register(const Identifier& id, Creator creator); + + // Create product with given identifier + T* Create(const Identifier& id) const; + +private: + + typedef std::map Map; + + // Data member + Map fMap; + +}; + +template +G4CreatorFactoryT::G4CreatorFactoryT() {} + +template +G4CreatorFactoryT::~G4CreatorFactoryT() {} + +template +G4bool +G4CreatorFactoryT::Register(const Identifier& id, + Creator creator) +{ + if (fMap.find(id) != fMap.end()) { + std::ostringstream o; + o << "Creator with identifier "<creator pair into map + std::pair myPair(id, creator); + return fMap.insert(myPair).second; +} + +template +T* +G4CreatorFactoryT::Create(const Identifier& id) const +{ + typename Map::const_iterator iter = fMap.find(id); + + if (iter == fMap.end()) { + std::ostringstream o; + o << "Identifier "<second(); +} + +#endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04PhysicsList.hh b/source/graphics_reps/include/G4DimensionedDouble.hh similarity index 83% rename from examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04PhysicsList.hh rename to source/graphics_reps/include/G4DimensionedDouble.hh index 1e86903982..cfa6315ce3 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01/include/ExN04PhysicsList.hh +++ b/source/graphics_reps/include/G4DimensionedDouble.hh @@ -23,27 +23,18 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -#ifndef ExN04PhysicsList_h -#define ExN04PhysicsList_h 1 +// $Id: G4DimensionedDouble.hh,v 1.2 2006/12/13 15:44:05 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// Dimensioned G4double. +// +// Jane Tinslay, September 2006 +// +#ifndef G4DIMENSIONEDDOUBLE_HH +#define G4DIMENSIONEDDOUBLE_HH -#include "G4VModularPhysicsList.hh" -#include "globals.hh" - -class ExN04PhysicsList: public G4VModularPhysicsList -{ -public: - ExN04PhysicsList(); - virtual ~ExN04PhysicsList(); - -public: - // SetCuts() - virtual void SetCuts(); - - -}; +#include "G4DimensionedType.hh" +typedef G4DimensionedType G4DimensionedDouble; #endif - - - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04PhysicsList.hh b/source/graphics_reps/include/G4DimensionedThreeVector.hh similarity index 82% rename from examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04PhysicsList.hh rename to source/graphics_reps/include/G4DimensionedThreeVector.hh index 1e86903982..a19c7145ab 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04PhysicsList.hh +++ b/source/graphics_reps/include/G4DimensionedThreeVector.hh @@ -23,27 +23,18 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -#ifndef ExN04PhysicsList_h -#define ExN04PhysicsList_h 1 +// $Id: G4DimensionedThreeVector.hh,v 1.2 2006/12/13 15:44:07 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// Dimensioned G4Threevector. +// +// Jane Tinslay, September 2006 +// +#ifndef G4DIMENSIONEDTHREEVECTOR_HH +#define G4DIMENSIONEDTHREEVECTOR_HH -#include "G4VModularPhysicsList.hh" -#include "globals.hh" - -class ExN04PhysicsList: public G4VModularPhysicsList -{ -public: - ExN04PhysicsList(); - virtual ~ExN04PhysicsList(); - -public: - // SetCuts() - virtual void SetCuts(); - - -}; +#include "G4DimensionedType.hh" +typedef G4DimensionedType G4DimensionedThreeVector; #endif - - - diff --git a/source/graphics_reps/include/G4DimensionedType.hh b/source/graphics_reps/include/G4DimensionedType.hh new file mode 100644 index 0000000000..d0234b89d8 --- /dev/null +++ b/source/graphics_reps/include/G4DimensionedType.hh @@ -0,0 +1,213 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4DimensionedType.hh,v 1.3 2006/12/13 15:44:09 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// Generic dimensioned type. +// +// Jane Tinslay, September 2006 +// +#ifndef G4DIMENSIONEDTYPE_HH +#define G4DIMENSIONEDTYPE_HH + +#include "globals.hh" +#include "G4ConversionFatalError.hh" +#include "G4String.hh" +#include "G4UnitsTable.hh" +#include + +namespace { + + // Helper class + class HasName{ + public: + HasName(const G4String& name): fName(name) {}; + bool operator()(const G4UnitDefinition* value) const + { + return ((value->GetName() == fName) || (value->GetSymbol() == fName)); + } + private: + G4String fName; + }; + + // Get unit value from input string. Return value indicates if + // conversion was successful. + G4bool GetUnitValue(const G4String& unit, G4double& value) + { + // Get units table + G4UnitsTable& unitTable = G4UnitDefinition::GetUnitsTable(); + if (unitTable.size() == 0) G4UnitDefinition::BuildUnitsTable(); + + // Iterate over unit lists, searching for unit match + G4UnitsTable::const_iterator iterTable = unitTable.begin(); + + HasName myUnit(unit); + G4bool gotUnit(false); + + while (!gotUnit && (iterTable != unitTable.end())) { + G4UnitsContainer unitContainer = (*iterTable)->GetUnitsList(); + + G4UnitsContainer::const_iterator iterUnits = + std::find_if(unitContainer.begin(), unitContainer.end(), myUnit); + + if (iterUnits != unitContainer.end()) { + value = (*iterUnits)->GetValue(); + gotUnit = true; + } + + iterTable++; + } + + return gotUnit; + } +} + +// Default error handling done through G4ConversionFatalError +template +class G4DimensionedType : public ConversionErrorPolicy { + +public: + + // Constructors + G4DimensionedType(); + G4DimensionedType(const T& value, const G4String& unit); + + // Destructor + virtual ~G4DimensionedType(); + + // Accessors + + // Raw, undimensioned value + T RawValue() const; + + // Unit string + G4String Unit() const; + + // Dimensioned value - rawValue*converted unit + T DimensionedValue() const; + + // Operators + T operator()() const; + bool operator == (const G4DimensionedType& rhs) const; + bool operator != (const G4DimensionedType& rhs) const; + bool operator < (const G4DimensionedType& rhs) const; + bool operator > (const G4DimensionedType& rhs) const; + +private: + + // Data members + T fValue; + G4String fUnit; + T fDimensionedValue; + +}; + +template +G4DimensionedType::G4DimensionedType() + :fValue(0) + ,fUnit("Undefined") + ,fDimensionedValue(0) +{} + +template +G4DimensionedType::G4DimensionedType(const T& value, const G4String& unit) + :fValue(value) + ,fUnit(unit) +{ + G4double unitValue(0); + + // Convert unit string to unit value + if (!GetUnitValue(unit, unitValue)) ConversionErrorPolicy::ReportError(unit, "Invalid unit"); + + fDimensionedValue = value*unitValue; +} + +template +G4DimensionedType::~G4DimensionedType() {} + +template +T +G4DimensionedType::RawValue() const +{ + return fValue; +} + +template +G4String +G4DimensionedType::Unit() const +{ + return fUnit; +} + +template +T +G4DimensionedType::DimensionedValue() const +{ + return fDimensionedValue; +} + +template +T +G4DimensionedType::operator()() const +{ + return fDimensionedValue; +} + +template +bool +G4DimensionedType::operator == (const G4DimensionedType& rhs) const +{ + return fDimensionedValue == rhs.fDimensionedValue; +} + +template +bool +G4DimensionedType::operator != (const G4DimensionedType& rhs) const +{ + return fDimensionedValue != rhs.fDimensionedValue; +} + +template +bool +G4DimensionedType::operator < (const G4DimensionedType& rhs) const +{ + return fDimensionedValue < rhs.fDimensionedValue; +} + +template +bool +G4DimensionedType::operator > (const G4DimensionedType& rhs) const +{ + return fDimensionedValue > rhs.fDimensionedValue; +} + +template +std::ostream& operator << (std::ostream& os, const G4DimensionedType& obj) { + os << obj.RawValue()<<" "<::~G4SmartFilter() {} template G4bool -G4SmartFilter::Accept(const T& object) +G4SmartFilter::Accept(const T& object) const { if (fVerbose) { G4cout<<"Begin verbose printout for filter "<::Name()< -class ExN04PrimaryGeneratorAction; -class G4UIdirectory; -class G4UIcommand; -class G4UIcmdWithoutParameter; -class G4UIcmdWithABool; -class G4UIcmdWithAnInteger; -class G4UIcmdWithAString; - -class ExN04PrimaryGeneratorMessenger : public G4UImessenger { -private: - ExN04PrimaryGeneratorAction* primaryAction; - - G4UIdirectory* dir; - G4UIdirectory* mydetdir; - G4UIcmdWithAString* select; +class G4TypeKey { public: - ExN04PrimaryGeneratorMessenger(ExN04PrimaryGeneratorAction* genaction); - ~ExN04PrimaryGeneratorMessenger(); + + typedef unsigned long Key; + + // Constructor + G4TypeKey():fMyKey(0) {} + + // Destructor + virtual ~G4TypeKey() {} + + G4bool IsValid() { + return (0 == fMyKey ? false : true); + } - void SetNewValue(G4UIcommand* command, G4String newValues); - G4String GetCurrentValue(G4UIcommand* command); + // Operators + Key operator()() const {return fMyKey;} + bool operator==(const G4TypeKey& rhs) const {return fMyKey == rhs.fMyKey;} + bool operator!=(const G4TypeKey& rhs) const {return !operator==(rhs);} + bool operator<(const G4TypeKey& rhs) const {return fMyKey < rhs.fMyKey;} + bool operator>(const G4TypeKey& rhs) const {return fMyKey > rhs.fMyKey;} + + friend std::ostream& operator<<(std::ostream& out, const G4TypeKey& key){ + return out<< key.fMyKey; + } + +protected: + + Key NextKey() const { + static Key nKey = 0; + return ++nKey; + } + + Key fMyKey; + }; - #endif diff --git a/source/graphics_reps/include/G4TypeKeyT.hh b/source/graphics_reps/include/G4TypeKeyT.hh new file mode 100644 index 0000000000..749b252c02 --- /dev/null +++ b/source/graphics_reps/include/G4TypeKeyT.hh @@ -0,0 +1,52 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4TypeKeyT.hh,v 1.2 2006/12/13 15:44:14 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// Type key class +// +// Jane Tinslay, September 2006 +// +#ifndef G4TYPEKEYT_HH +#define G4TYPEKEYT_HH + +#include "G4TypeKey.hh" + +template +class G4TypeKeyT : public G4TypeKey { + +public: + + G4TypeKeyT() { + static Key key = NextKey(); + fMyKey = key; + } + + virtual ~G4TypeKeyT() {} + +}; + +#endif diff --git a/source/graphics_reps/include/G4VFilter.hh b/source/graphics_reps/include/G4VFilter.hh index 2424042bd6..731f732bb0 100644 --- a/source/graphics_reps/include/G4VFilter.hh +++ b/source/graphics_reps/include/G4VFilter.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4VFilter.hh,v 1.3 2006/06/29 19:06:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VFilter.hh,v 1.4 2006/08/25 19:39:39 tinslay Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Abstract filter class. // @@ -50,7 +50,7 @@ public: // With description virtual ~G4VFilter(); // Filter method - virtual G4bool Accept(const T&) = 0; + virtual G4bool Accept(const T&) const = 0; // Print configuration virtual void PrintAll(std::ostream& ostr) const = 0; diff --git a/source/graphics_reps/include/G4VGraphicsScene.hh b/source/graphics_reps/include/G4VGraphicsScene.hh index b80c762a2d..fa86e458ef 100644 --- a/source/graphics_reps/include/G4VGraphicsScene.hh +++ b/source/graphics_reps/include/G4VGraphicsScene.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VGraphicsScene.hh,v 1.8 2006/06/29 19:06:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VGraphicsScene.hh,v 1.9 2006/07/10 15:19:29 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // John Allison 19th July 1996 // // Class Description: @@ -139,17 +139,6 @@ public: // With description virtual void AddPrimitive (const G4Polyhedron&) = 0; virtual void AddPrimitive (const G4NURBS&) = 0; - /////////////////////////////////////////////////////////////////// - // Special functions for particular models. - - virtual void EstablishSpecials (G4PhysicalVolumeModel&) {} - // Used to establish any special relationships between scene and - // this particular type of model - non-pure, i.e., no requirement to - // implement. See G4PhysicalVolumeModel.hh for details. - - virtual void DecommissionSpecials (G4PhysicalVolumeModel&) {} - // Used to reverse the effect of EstablishSpecials, if required. - }; #endif diff --git a/source/graphics_reps/include/G4VMarker.hh b/source/graphics_reps/include/G4VMarker.hh index 857721a808..e5ae06b697 100644 --- a/source/graphics_reps/include/G4VMarker.hh +++ b/source/graphics_reps/include/G4VMarker.hh @@ -25,7 +25,7 @@ // // // $Id: G4VMarker.hh,v 1.12 2006/06/29 19:06:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4VMarker - base class for markers - circles, squares, etc. diff --git a/source/graphics_reps/include/G4VMarker.icc b/source/graphics_reps/include/G4VMarker.icc index bc5877a039..242b726e82 100644 --- a/source/graphics_reps/include/G4VMarker.icc +++ b/source/graphics_reps/include/G4VMarker.icc @@ -25,7 +25,7 @@ // // // $Id: G4VMarker.icc,v 1.7 2006/06/29 19:06:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/graphics_reps/include/G4VVisManager.hh b/source/graphics_reps/include/G4VVisManager.hh index d411c80fff..4338df741d 100644 --- a/source/graphics_reps/include/G4VVisManager.hh +++ b/source/graphics_reps/include/G4VVisManager.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VVisManager.hh,v 1.12 2006/06/29 19:06:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VVisManager.hh,v 1.13 2006/09/12 18:29:31 tinslay Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // John Allison 19/Oct/1996. // // Class Description: @@ -175,6 +175,9 @@ public: // With description virtual G4bool FilterTrajectory(const G4VTrajectory&) = 0; // Trajectory filter + virtual G4bool FilterHit(const G4VHit&) = 0; + // Hit filter + protected: static void SetConcreteInstance (G4VVisManager*); diff --git a/source/graphics_reps/include/G4VisAttributes.hh b/source/graphics_reps/include/G4VisAttributes.hh index 93587c46c6..32c6295849 100644 --- a/source/graphics_reps/include/G4VisAttributes.hh +++ b/source/graphics_reps/include/G4VisAttributes.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VisAttributes.hh,v 1.15 2006/06/29 19:06:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VisAttributes.hh,v 1.18 2006/10/24 05:54:20 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 23rd October 1996 @@ -45,7 +45,7 @@ // - visibility // - visibility of daughters // - force wireframe style, force solid style -// - force auxiliary edge visibility +// - force auxiliary edge visibility, force line segments pe circle // - colour // Class Description - End: @@ -86,18 +86,6 @@ public: // With description G4bool operator != (const G4VisAttributes& a) const; G4bool operator == (const G4VisAttributes& a) const; - G4bool IsVisible () const; - G4bool IsDaughtersInvisible () const; - const G4Colour& GetColour () const; - const G4Color& GetColor () const; - LineStyle GetLineStyle () const; - G4double GetLineWidth () const; - G4bool IsForceDrawingStyle () const; - ForcedDrawingStyle GetForcedDrawingStyle () const; - G4bool IsForceAuxEdgeVisible () const; - const std::vector* GetAttValues() const; - const std::map* GetAttDefs () const; - void SetVisibility (G4bool); void SetDaughtersInvisible (G4bool); void SetColour (const G4Colour&); @@ -111,9 +99,33 @@ public: // With description void SetForceWireframe (G4bool); void SetForceSolid (G4bool); void SetForceAuxEdgeVisible (G4bool); + void SetForceLineSegmentsPerCircle (G4int nSegments); + // Allows choice of circle approximation. A circle of 360 degrees + // will be composed of nSegments line segments. If your solid has + // curves of D degrees that you need to divide into N segments, + // specify nSegments = N * 360 / D. + void SetStartTime (G4double); + void SetEndTime (G4double); void SetAttValues (const std::vector*); void SetAttDefs (const std::map*); + G4bool IsVisible () const; + G4bool IsDaughtersInvisible () const; + const G4Colour& GetColour () const; + const G4Color& GetColor () const; + LineStyle GetLineStyle () const; + G4double GetLineWidth () const; + G4bool IsForceDrawingStyle () const; + ForcedDrawingStyle GetForcedDrawingStyle () const; + G4bool IsForceAuxEdgeVisible () const; + G4int GetForcedLineSegmentsPerCircle () const; + G4double GetStartTime () const; + G4double GetEndTime () const; + // Returns an expendable copy of the G4AttValues... + const std::vector* CreateAttValues () const; + // Returns the orginal long life G4AttDefs... + const std::map* GetAttDefs () const; + private: G4bool fVisible; // Visibility flag @@ -125,6 +137,9 @@ private: G4bool fForceDrawingStyle; // To switch on forced drawing style. ForcedDrawingStyle fForcedStyle; // Value of forced drawing style. G4bool fForceAuxEdgeVisible; // Force drawing of auxilary edges. + G4int fForcedLineSegmentsPerCircle; // Forced lines segments per + // circle. <=0 means not forced. + G4double fStartTime, fEndTime; // Time range. const std::vector* fAttValues; // For picking, etc. const std::map* fAttDefs; // Corresponding definitions. }; diff --git a/source/graphics_reps/include/G4VisAttributes.icc b/source/graphics_reps/include/G4VisAttributes.icc index 5342f54254..a78a5d30d3 100644 --- a/source/graphics_reps/include/G4VisAttributes.icc +++ b/source/graphics_reps/include/G4VisAttributes.icc @@ -24,53 +24,12 @@ // ******************************************************************** // // -// $Id: G4VisAttributes.icc,v 1.9 2006/06/29 19:06:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VisAttributes.icc,v 1.13 2006/12/13 15:44:17 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 18th November 1996 -inline G4bool G4VisAttributes::IsVisible () const {return fVisible;} - -inline G4bool G4VisAttributes::IsDaughtersInvisible () const { - return fDaughtersInvisible; -} - -inline const G4Colour& G4VisAttributes::GetColour () const {return fColour;} - -inline const G4Color& G4VisAttributes::GetColor () const {return fColour;} - -inline G4VisAttributes::LineStyle G4VisAttributes::GetLineStyle () const { - return fLineStyle; -} - -inline G4double G4VisAttributes::GetLineWidth () const { - return fLineWidth; -} - -inline G4bool G4VisAttributes::IsForceDrawingStyle () const { - return fForceDrawingStyle; -} - -inline G4VisAttributes::ForcedDrawingStyle -G4VisAttributes::GetForcedDrawingStyle () const { - return fForcedStyle; -} - -inline G4bool G4VisAttributes::IsForceAuxEdgeVisible () const { - return fForceAuxEdgeVisible; -} - -inline const std::vector* -G4VisAttributes::GetAttValues () const { - return fAttValues; -} - -inline -const std::map* G4VisAttributes::GetAttDefs () const { - return fAttDefs; -} - inline void G4VisAttributes::SetVisibility (G4bool v) {fVisible = v;} inline void G4VisAttributes::SetDaughtersInvisible (G4bool v) { @@ -117,6 +76,14 @@ inline void G4VisAttributes::SetForceAuxEdgeVisible (G4bool force) { fForceAuxEdgeVisible = force; } +inline void G4VisAttributes::SetStartTime(G4double time) { + fStartTime = time; +} + +inline void G4VisAttributes::SetEndTime(G4double time) { + fEndTime = time; +} + inline void G4VisAttributes::SetAttValues (const std::vector* attValues){ fAttValues = attValues; @@ -126,3 +93,50 @@ inline void G4VisAttributes::SetAttDefs (const std::map* attDefs) { fAttDefs = attDefs; } +inline G4bool G4VisAttributes::IsVisible () const {return fVisible;} + +inline G4bool G4VisAttributes::IsDaughtersInvisible () const { + return fDaughtersInvisible; +} + +inline const G4Colour& G4VisAttributes::GetColour () const {return fColour;} + +inline const G4Color& G4VisAttributes::GetColor () const {return fColour;} + +inline G4VisAttributes::LineStyle G4VisAttributes::GetLineStyle () const { + return fLineStyle; +} + +inline G4double G4VisAttributes::GetLineWidth () const { + return fLineWidth; +} + +inline G4bool G4VisAttributes::IsForceDrawingStyle () const { + return fForceDrawingStyle; +} + +inline G4VisAttributes::ForcedDrawingStyle +G4VisAttributes::GetForcedDrawingStyle () const { + return fForcedStyle; +} + +inline G4bool G4VisAttributes::IsForceAuxEdgeVisible () const { + return fForceAuxEdgeVisible; +} + +inline G4int G4VisAttributes::GetForcedLineSegmentsPerCircle () const { + return fForcedLineSegmentsPerCircle; +} + +inline G4double G4VisAttributes::GetStartTime() const { + return fStartTime; +} + +inline G4double G4VisAttributes::GetEndTime() const { + return fEndTime; +} + +inline +const std::map* G4VisAttributes::GetAttDefs () const { + return fAttDefs; +} diff --git a/source/graphics_reps/include/G4VisExtent.hh b/source/graphics_reps/include/G4VisExtent.hh index 32c9ecf936..cf85e983b6 100644 --- a/source/graphics_reps/include/G4VisExtent.hh +++ b/source/graphics_reps/include/G4VisExtent.hh @@ -25,7 +25,7 @@ // // // $Id: G4VisExtent.hh,v 1.10 2006/06/29 19:06:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // A.Walkden 28/11/95 diff --git a/source/graphics_reps/include/G4Visible.hh b/source/graphics_reps/include/G4Visible.hh index 19bd9a75df..537ace2cd5 100644 --- a/source/graphics_reps/include/G4Visible.hh +++ b/source/graphics_reps/include/G4Visible.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Visible.hh,v 1.10 2006/06/29 19:06:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Visible.hh,v 1.13 2006/11/07 11:53:16 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 30th October 1996 @@ -53,10 +53,15 @@ class G4Visible { public: // With description G4Visible (); + G4Visible (const G4Visible&); G4Visible (const G4VisAttributes* pVA); virtual ~G4Visible (); + G4Visible& operator= (const G4Visible&); + + G4bool operator != (const G4Visible& right) const; + const G4VisAttributes* GetVisAttributes () const; void SetVisAttributes (const G4VisAttributes* pVA); @@ -69,13 +74,10 @@ public: // With description // associated G4VisAttributes object would normally also be created // on the heap and managed in the same way. - G4bool operator != (const G4Visible& right) const; - // Simple test on non-equality of address of vis attributes. - protected: const G4VisAttributes* fpVisAttributes; - + G4bool fAllocatedVisAttributes; }; #include "G4Visible.icc" diff --git a/source/graphics_reps/include/G4Visible.icc b/source/graphics_reps/include/G4Visible.icc index c17fcfc080..dd0db72e65 100644 --- a/source/graphics_reps/include/G4Visible.icc +++ b/source/graphics_reps/include/G4Visible.icc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Visible.icc,v 1.7 2006/06/29 19:06:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Visible.icc,v 1.8 2006/11/07 11:53:16 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 30th October 1996 @@ -33,7 +33,3 @@ inline const G4VisAttributes* G4Visible::GetVisAttributes () const { return fpVisAttributes; } - -inline void G4Visible::SetVisAttributes (const G4VisAttributes* pVA) { - fpVisAttributes = pVA; -} diff --git a/source/graphics_reps/include/HepPolyhedron.h b/source/graphics_reps/include/HepPolyhedron.h index b21d4402da..5df4b0ce43 100644 --- a/source/graphics_reps/include/HepPolyhedron.h +++ b/source/graphics_reps/include/HepPolyhedron.h @@ -25,7 +25,7 @@ // // // $Id: HepPolyhedron.h,v 1.21 2006/06/29 19:06:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Class Description: diff --git a/source/graphics_reps/src/G4AttCheck.cc b/source/graphics_reps/src/G4AttCheck.cc index 6b70eec75f..910b8096d8 100644 --- a/source/graphics_reps/src/G4AttCheck.cc +++ b/source/graphics_reps/src/G4AttCheck.cc @@ -24,14 +24,15 @@ // ******************************************************************** // // -// $Id: G4AttCheck.cc,v 1.8 2006/06/29 19:06:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4AttCheck.cc,v 1.15 2006/11/07 11:50:22 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4AttCheck.hh" #include "globals.hh" #include "G4AttDef.hh" +#include "G4AttDefStore.hh" #include "G4AttValue.hh" #include "G4UnitsTable.hh" #include "G4UIcommand.hh" @@ -50,12 +51,14 @@ G4AttCheck::G4AttCheck fUnitCategories.insert("Energy"); fUnitCategories.insert("Time"); fUnitCategories.insert("Electric charge"); + fUnitCategories.insert("Volumic Mass"); // (Density) // Corresponding Standard Units... fStandardUnits["Length"] = "m"; fStandardUnits["Energy"] = "MeV"; fStandardUnits["Time"] = "ns"; fStandardUnits["Electric charge"] = "e+"; + fStandardUnits["Volumic Mass"] = "kg/m3"; // Legal Categories... fCategories.insert("Bookkeeping"); @@ -65,6 +68,7 @@ G4AttCheck::G4AttCheck fCategories.insert("Association"); // Legal units... + fUnits.insert(""); fUnits.insert("G4BestUnit"); // ...plus any legal unit symbol ("MeV", "km", etc.)... G4UnitsTable& units = G4UnitDefinition::GetUnitsTable(); @@ -86,6 +90,7 @@ G4AttCheck::G4AttCheck fValueTypes.insert("G4int"); fValueTypes.insert("G4double"); fValueTypes.insert("G4ThreeVector"); + fValueTypes.insert("G4bool"); } } @@ -123,7 +128,7 @@ G4bool G4AttCheck::Check(const G4String& leader) const { G4cerr << '\n' << leader; } G4cerr << - "\nERROR " << iError << ": Null definitions map*" + "\nG4AttCheck: ERROR " << iError << ": Null definitions pointer" "\n*******************************************************" << G4endl; return error; @@ -145,7 +150,7 @@ G4bool G4AttCheck::Check(const G4String& leader) const { G4cerr << '\n' << leader; } G4cerr << - "\nERROR " << iError << ": No G4AttDef for G4AttValue \"" + "\nG4AttCheck: ERROR " << iError << ": No G4AttDef for G4AttValue \"" << valueName << "\": " << value << "\n*******************************************************" << G4endl; @@ -164,7 +169,7 @@ G4bool G4AttCheck::Check(const G4String& leader) const { G4cerr << '\n' << leader; } G4cerr << - "\nERROR " << iError << ": Illegal Category Field \"" + "\nG4AttCheck: ERROR " << iError << ": Illegal Category Field \"" << category << "\" for G4AttValue \"" << valueName << "\": " << value << "\n Possible Categories:"; @@ -187,7 +192,7 @@ G4bool G4AttCheck::Check(const G4String& leader) const { G4cerr << '\n' << leader; } G4cerr << - "\nERROR " << iError << ": Illegal Extra field \"" + "\nG4AttCheck: ERROR " << iError << ": Illegal Extra field \"" << extra << "\" for G4AttValue \"" << valueName << "\": " << value << "\n Possible Extra fields if Category==\"Physics\":\n "; @@ -210,7 +215,7 @@ G4bool G4AttCheck::Check(const G4String& leader) const { G4cerr << '\n' << leader; } G4cerr << - "\nERROR " << iError << ": Illegal Value Type field \"" + "\nG4AttCheck: ERROR " << iError << ": Illegal Value Type field \"" << valueType << "\" for G4AttValue \"" << valueName << "\": " << value << "\n Possible Value Types:"; @@ -228,8 +233,22 @@ G4bool G4AttCheck::Check(const G4String& leader) const { return error; } -std::ostream& operator<< (std::ostream& os, const G4AttCheck& ac) { +std::ostream& operator<< (std::ostream& os, const G4AttCheck& ac) +{ using namespace std; + if (!ac.fpDefinitions) { + os << "G4AttCheck: ERROR: zero definitions pointer." << endl; + return os; + } + G4String storeKey; + if (G4AttDefStore::GetStoreKey(ac.fpDefinitions, storeKey)) { + os << storeKey << ':' << endl; + } + if (!ac.fpValues) { + // A null values vector is a valid situation. + os << "G4AttCheck: zero values pointer." << endl; + return os; + } vector::const_iterator iValue; for (iValue = ac.fpValues->begin(); iValue != ac.fpValues->end(); ++iValue) { const G4String& valueName = iValue->GetName(); @@ -239,7 +258,7 @@ std::ostream& operator<< (std::ostream& os, const G4AttCheck& ac) { G4bool error = false; if (iDef == ac.fpDefinitions->end()) { error = true; - os << "ERROR: No G4AttDef for G4AttValue \"" + os << "G4AttCheck: ERROR: No G4AttDef for G4AttValue \"" << valueName << "\": " << value << endl; } else { const G4String& category = iDef->second.GetCategory(); @@ -248,7 +267,7 @@ std::ostream& operator<< (std::ostream& os, const G4AttCheck& ac) { if (ac.fCategories.find(category) == ac.fCategories.end()) { error = true; os << - "ERROR: Illegal Category Field \"" << category + "G4AttCheck: ERROR: Illegal Category Field \"" << category << "\" for G4AttValue \"" << valueName << "\": " << value << "\n Possible Categories:"; set::iterator i; @@ -260,8 +279,8 @@ std::ostream& operator<< (std::ostream& os, const G4AttCheck& ac) { if(category == "Physics" && ac.fUnits.find(extra) == ac.fUnits.end()) { error = true; os << - "ERROR: Illegal Extra field \""<< extra << "\" for G4AttValue \"" - << valueName << "\": " << value << + "G4AttCheck: ERROR: Illegal Extra field \""<< extra + << "\" for G4AttValue \"" << valueName << "\": " << value << "\n Possible Extra fields if Category==\"Physics\":\n "; set::iterator i; for (i = ac.fUnits.begin(); i != ac.fUnits.end(); ++i) { @@ -272,7 +291,7 @@ std::ostream& operator<< (std::ostream& os, const G4AttCheck& ac) { if (ac.fValueTypes.find(valueType) == ac.fValueTypes.end()) { error = true; os << - "ERROR: Illegal Value Type field \"" << valueType + "G4AttCheck: ERROR: Illegal Value Type field \"" << valueType << "\" for G4AttValue \"" << valueName << "\": " << value << "\n Possible Value Types:"; set::iterator i; @@ -283,11 +302,12 @@ std::ostream& operator<< (std::ostream& os, const G4AttCheck& ac) { } } if (!error) { - os << iDef->second.GetDesc() << ": " - << iValue->GetValue(); - if (iDef->second.GetCategory() == "Physics") { - os << " (" - << iDef->second.GetExtra() << ")"; + os << iDef->second.GetDesc() + << " (" << valueName + << "): " << value; + if (iDef->second.GetCategory() == "Physics" && + !iDef->second.GetExtra().empty()) { + os << " (" << iDef->second.GetExtra() << ")"; } os << endl; } @@ -317,6 +337,7 @@ G4bool G4AttCheck::Standard (std::vector* standardValues, std::map* standardDefinitions) const { // Places standard versions in provided vector and map and returns error. + // Assumes valid input. Use Check to check. using namespace std; G4bool error = false; vector::const_iterator iValue; @@ -340,56 +361,91 @@ G4bool G4AttCheck::Standard standardValues->push_back(*iValue); (*standardDefinitions)[valueName] = fpDefinitions->find(valueName)->second; - } else { - G4String valueAndUnit; - G4String unit; - if (extra == "G4BestUnit") { - valueAndUnit = value; - valueAndUnit = valueAndUnit.strip(); - unit = valueAndUnit.substr(valueAndUnit.rfind(' ')+1); - } else { - valueAndUnit = value + ' ' + extra; - unit = extra; - } - G4String unitCategory = G4UnitDefinition::GetCategory(unit); - if (fUnitCategories.find(unitCategory) != fUnitCategories.end()) { - G4String standardUnit = fStandardUnits[unitCategory]; - G4double valueOfUnit = G4UnitDefinition::GetValueOf(standardUnit); - G4String extra = iDef->second.GetExtra(); - if (valueType == "G4ThreeVector") { + } else { // "Physics"... + if (extra.empty()) { // Dimensionless... + if (valueType == "G4ThreeVector") { // Split vector into 3... G4ThreeVector internalValue = - G4UIcommand::ConvertToDimensioned3Vector(valueAndUnit); + G4UIcommand::ConvertTo3Vector(value); AddValuesAndDefs (standardValues,standardDefinitions, valueName,valueName+"-X", - G4UIcommand::ConvertToString(internalValue.x()/valueOfUnit), - standardUnit, + G4UIcommand::ConvertToString(internalValue.x()),"", fpDefinitions->find(valueName)->second.GetDesc()+"-X"); AddValuesAndDefs (standardValues,standardDefinitions, valueName,valueName+"-Y", - G4UIcommand::ConvertToString(internalValue.y()/valueOfUnit), - standardUnit, + G4UIcommand::ConvertToString(internalValue.y()),"", fpDefinitions->find(valueName)->second.GetDesc()+"-Y"); AddValuesAndDefs (standardValues,standardDefinitions, valueName,valueName+"-Z", - G4UIcommand::ConvertToString(internalValue.z()/valueOfUnit), - standardUnit, + G4UIcommand::ConvertToString(internalValue.z()),"", fpDefinitions->find(valueName)->second.GetDesc()+"-Z"); + } else { // Simply copy... + standardValues->push_back(*iValue); + (*standardDefinitions)[valueName] = + fpDefinitions->find(valueName)->second; + } + } else { // Dimensioned... + G4String valueAndUnit; + G4String unit; + if (extra == "G4BestUnit") { + valueAndUnit = value; + valueAndUnit = valueAndUnit.strip(); + unit = valueAndUnit.substr(valueAndUnit.rfind(' ')+1); } else { - G4double internalValue = - G4UIcommand::ConvertToDimensionedDouble(valueAndUnit); - AddValuesAndDefs - (standardValues,standardDefinitions, - valueName,valueName, - G4UIcommand::ConvertToString(internalValue/valueOfUnit), - standardUnit); + valueAndUnit = value + ' ' + extra; + valueAndUnit = valueAndUnit.strip(); + unit = extra; + } + G4String unitCategory = G4UnitDefinition::GetCategory(unit); + if (fUnitCategories.find(unitCategory) != fUnitCategories.end()) { + G4String standardUnit = fStandardUnits[unitCategory]; + G4double valueOfStandardUnit = + G4UnitDefinition::GetValueOf(standardUnit); + G4String extra = iDef->second.GetExtra(); + if (valueType == "G4ThreeVector") { // Split vector into 3... + G4ThreeVector internalValue = + G4UIcommand::ConvertToDimensioned3Vector(valueAndUnit); + AddValuesAndDefs + (standardValues,standardDefinitions, + valueName,valueName+"-X", + G4UIcommand::ConvertToString + (internalValue.x()/valueOfStandardUnit), + standardUnit, + fpDefinitions->find(valueName)->second.GetDesc()+"-X"); + AddValuesAndDefs + (standardValues,standardDefinitions, + valueName,valueName+"-Y", + G4UIcommand::ConvertToString + (internalValue.y()/valueOfStandardUnit), + standardUnit, + fpDefinitions->find(valueName)->second.GetDesc()+"-Y"); + AddValuesAndDefs + (standardValues,standardDefinitions, + valueName,valueName+"-Z", + G4UIcommand::ConvertToString + (internalValue.z()/valueOfStandardUnit), + standardUnit, + fpDefinitions->find(valueName)->second.GetDesc()+"-Z"); + } else { + G4double internalValue = + G4UIcommand::ConvertToDimensionedDouble(valueAndUnit); + AddValuesAndDefs + (standardValues,standardDefinitions, + valueName,valueName, + G4UIcommand::ConvertToString + (internalValue/valueOfStandardUnit), + standardUnit); + } } } } } } } + if (error) { + G4cerr << "G4AttCheck::Standard: Conversion error." << G4endl; + } return error; } diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04MuonHit.cc b/source/graphics_reps/src/G4AttDef.cc similarity index 62% rename from examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04MuonHit.cc rename to source/graphics_reps/src/G4AttDef.cc index 09af3ac06e..f57811b59d 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04MuonHit.cc +++ b/source/graphics_reps/src/G4AttDef.cc @@ -23,57 +23,39 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// +// $Id: G4AttDef.cc,v 1.2 2006/11/01 10:15:05 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ -#include "ExN04MuonHit.hh" -#include "G4VVisManager.hh" -#include "G4Circle.hh" -#include "G4Colour.hh" -#include "G4VisAttributes.hh" +#include "G4AttDef.hh" +#include "G4AttDefStore.hh" -G4Allocator ExN04MuonHitAllocator; - -ExN04MuonHit::ExN04MuonHit() -{;} - -ExN04MuonHit::~ExN04MuonHit() -{;} - -ExN04MuonHit::ExN04MuonHit(const ExN04MuonHit &right) - : G4VHit() +std::ostream& operator<< + (std::ostream& os, const std::map* definitions) { - edep = right.edep; - pos = right.pos; -} - -const ExN04MuonHit& ExN04MuonHit::operator=(const ExN04MuonHit &right) -{ - edep = right.edep; - pos = right.pos; - return *this; -} - -G4int ExN04MuonHit::operator==(const ExN04MuonHit &right) const -{ - return (this==&right) ? 1 : 0; -} - -void ExN04MuonHit::Draw() -{ - G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance(); - if(pVVisManager) - { - G4Circle circle(pos); - circle.SetScreenSize(0.04); - circle.SetFillStyle(G4Circle::filled); - G4Colour colour(1.,0.,0.); - G4VisAttributes attribs(colour); - circle.SetVisAttributes(attribs); - pVVisManager->Draw(circle); + using namespace std; + if (!definitions) { + os << "G4AttCheck: ERROR: zero definitions pointer." << endl; + return os; } + G4String storeKey; + if (G4AttDefStore::GetStoreKey(definitions, storeKey)) { + os << storeKey << ":"; + } + std::map::const_iterator i; + for (i = definitions->begin(); i != definitions->end(); ++i) { + if (i->second.GetCategory() == "Physics") { + os << "\n " << i->second.GetDesc() + << " (" << i->first << "): "; + if (!i->second.GetExtra().empty()) { + if (i->second.GetExtra() != "G4BestUnit") os << "unit: "; + os << i->second.GetExtra() << " ("; + } + os << i->second.GetValueType(); + if (!i->second.GetExtra().empty()) os << ")"; + } + } + os << endl; + return os; } - -void ExN04MuonHit::Print() -{;} - - diff --git a/source/graphics_reps/src/G4AttDefStore.cc b/source/graphics_reps/src/G4AttDefStore.cc index 366fbeaf1a..4c7cd9b0c3 100644 --- a/source/graphics_reps/src/G4AttDefStore.cc +++ b/source/graphics_reps/src/G4AttDefStore.cc @@ -24,21 +24,21 @@ // ******************************************************************** // // -// $Id: G4AttDefStore.cc,v 1.6 2006/06/29 19:06:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4AttDefStore.cc,v 1.10 2006/11/01 10:08:41 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4AttDefStore.hh" #include "G4AttDef.hh" G4AttDefStore* G4AttDefStore::theInstance = 0; -std::map*> G4AttDefStore::m_stores; +std::map*> G4AttDefStore::m_defsmaps; std::map* -G4AttDefStore::GetInstance(G4String storeName, G4bool& isNew) +G4AttDefStore::GetInstance(G4String storeKey, G4bool& isNew) { // Create the private static instance first to allow for - // the deletion of the allocated attributes in the map store + // the deletion of the definitions in the store // static G4AttDefStore theStore; if (!theInstance) @@ -49,22 +49,43 @@ G4AttDefStore::GetInstance(G4String storeName, G4bool& isNew) // Allocate the new map if not existing already // and return it to the caller // - std::map* store; - std::map*>::iterator iStore = - m_stores.find(storeName); + std::map* definitions; + std::map*>::iterator iDefinitions = + m_defsmaps.find(storeKey); - if (iStore == m_stores.end()) + if (iDefinitions == m_defsmaps.end()) { isNew = true; - store = new std::map; - m_stores[storeName] = store; + definitions = new std::map; + m_defsmaps[storeKey] = definitions; } else { isNew = false; - store = iStore->second; + definitions = iDefinitions->second; } - return store; + return definitions; +} + +G4bool G4AttDefStore::GetStoreKey +(const std::map* definitions, G4String& key) +{ + if (!theInstance) + { + return false; + } + + std::map*>::const_iterator i; + for (i = m_defsmaps.begin(); i != m_defsmaps.end(); ++i) + { + if (i->second == definitions) + { + key = i->first; + return true; + } + } + + return false; } G4AttDefStore::G4AttDefStore() @@ -74,13 +95,13 @@ G4AttDefStore::G4AttDefStore() G4AttDefStore::~G4AttDefStore() { std::map*>::iterator iStore, iStore_tmp; - for ( iStore = m_stores.begin(); iStore != m_stores.end(); ) + for ( iStore = m_defsmaps.begin(); iStore != m_defsmaps.end(); ) { if (iStore->second) { delete iStore->second; iStore_tmp = iStore++; - m_stores.erase(iStore_tmp); + m_defsmaps.erase(iStore_tmp); } else { diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02PhysicsList.hh b/source/graphics_reps/src/G4AttHolder.cc similarity index 84% rename from examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02PhysicsList.hh rename to source/graphics_reps/src/G4AttHolder.cc index f0147d52a0..c242e5bb73 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02PhysicsList.hh +++ b/source/graphics_reps/src/G4AttHolder.cc @@ -23,27 +23,16 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -#ifndef H02PhysicsList_h -#define H02PhysicsList_h 1 +// $Id: G4AttHolder.cc,v 1.3 2006/11/01 10:11:44 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ -#include "G4VModularPhysicsList.hh" -#include "globals.hh" +#include "G4AttHolder.hh" -class H02PhysicsList: public G4VModularPhysicsList +#include "G4AttValue.hh" +#include "G4AttDef.hh" +#include "G4AttDefStore.hh" + +G4AttHolder::~G4AttHolder() { -public: - H02PhysicsList(); - virtual ~H02PhysicsList(); - -public: - // SetCuts() - virtual void SetCuts(); - - -}; - - -#endif - - - + for (size_t i = 0; i < fValues.size(); ++i) delete fValues[i]; +} diff --git a/source/graphics_reps/src/G4AttUtils.cc b/source/graphics_reps/src/G4AttUtils.cc new file mode 100644 index 0000000000..b843c76abe --- /dev/null +++ b/source/graphics_reps/src/G4AttUtils.cc @@ -0,0 +1,60 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4AttUtils.cc,v 1.1 2006/09/11 18:04:59 tinslay Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// Jane Tinslay September 2006 +// +// Visualisation attribute utility functions. +// +#include "G4AttUtils.hh" +#include "G4DimensionedDouble.hh" +#include "G4DimensionedThreeVector.hh" +#include "G4ThreeVector.hh" +#include "G4TypeKeyT.hh" + +namespace G4AttUtils +{ + // Get G4TypeKey information for old style G4AttDef's + G4TypeKey GetKey(const G4AttDef& def) + { + G4String type = def.GetValueType(); + + G4bool withUnit = (def.GetExtra() == "G4BestUnit"); + + // Known conversions + if (type == "G4String") return G4TypeKeyT(); + if (type == "G4int") return G4TypeKeyT(); + if (type == "G4double" && !withUnit) return G4TypeKeyT(); + if (type == "G4double" && withUnit) return G4TypeKeyT(); + if (type == "G4ThreeVector" && !withUnit) return G4TypeKeyT(); + if (type == "G4ThreeVector" && withUnit) return G4TypeKeyT(); + if (type == "G4bool") return G4TypeKeyT(); + + // Return default (invalid) key + return G4TypeKey(); + } +} diff --git a/source/graphics_reps/src/G4Circle.cc b/source/graphics_reps/src/G4Circle.cc index 44eb6b6a61..209af99ca5 100644 --- a/source/graphics_reps/src/G4Circle.cc +++ b/source/graphics_reps/src/G4Circle.cc @@ -25,7 +25,7 @@ // // // $Id: G4Circle.cc,v 1.7 2006/06/29 19:06:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/graphics_reps/src/G4Colour.cc b/source/graphics_reps/src/G4Colour.cc index 62d2c52da7..8f551e212e 100644 --- a/source/graphics_reps/src/G4Colour.cc +++ b/source/graphics_reps/src/G4Colour.cc @@ -25,7 +25,7 @@ // // // $Id: G4Colour.cc,v 1.10 2006/06/29 19:06:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 20th October 1996 diff --git a/source/graphics_reps/src/G4NURBS.cc b/source/graphics_reps/src/G4NURBS.cc index 25f52db30a..9e138906c7 100644 --- a/source/graphics_reps/src/G4NURBS.cc +++ b/source/graphics_reps/src/G4NURBS.cc @@ -25,7 +25,7 @@ // // // $Id: G4NURBS.cc,v 1.9 2006/06/29 19:06:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Olivier Crumeyrolle 12 September 1996 diff --git a/source/graphics_reps/src/G4NURBSbox.cc b/source/graphics_reps/src/G4NURBSbox.cc index df7be000f0..204c277f7c 100644 --- a/source/graphics_reps/src/G4NURBSbox.cc +++ b/source/graphics_reps/src/G4NURBSbox.cc @@ -25,7 +25,7 @@ // // // $Id: G4NURBSbox.cc,v 1.7 2006/06/29 19:06:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Olivier Crumeyrolle 12 September 1996 diff --git a/source/graphics_reps/src/G4NURBScylinder.cc b/source/graphics_reps/src/G4NURBScylinder.cc index 6959dcb9e9..fe17ef8719 100644 --- a/source/graphics_reps/src/G4NURBScylinder.cc +++ b/source/graphics_reps/src/G4NURBScylinder.cc @@ -25,7 +25,7 @@ // // // $Id: G4NURBScylinder.cc,v 1.8 2006/06/29 19:06:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Olivier Crumeyrolle 12 September 1996 diff --git a/source/graphics_reps/src/G4NURBShexahedron.cc b/source/graphics_reps/src/G4NURBShexahedron.cc index b687ff07ae..db78bb74c6 100644 --- a/source/graphics_reps/src/G4NURBShexahedron.cc +++ b/source/graphics_reps/src/G4NURBShexahedron.cc @@ -25,7 +25,7 @@ // // // $Id: G4NURBShexahedron.cc,v 1.7 2006/06/29 19:06:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // hexahedron implementation // OC 17 9 96 diff --git a/source/graphics_reps/src/G4NURBStube.cc b/source/graphics_reps/src/G4NURBStube.cc index c5f48dcf7d..62fdec8cd0 100644 --- a/source/graphics_reps/src/G4NURBStube.cc +++ b/source/graphics_reps/src/G4NURBStube.cc @@ -25,7 +25,7 @@ // // // $Id: G4NURBStube.cc,v 1.8 2006/06/29 19:06:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Olivier Crumeyrolle 12 September 1996 diff --git a/source/graphics_reps/src/G4NURBStubesector.cc b/source/graphics_reps/src/G4NURBStubesector.cc index 7cc0821d8c..0901744cee 100644 --- a/source/graphics_reps/src/G4NURBStubesector.cc +++ b/source/graphics_reps/src/G4NURBStubesector.cc @@ -25,7 +25,7 @@ // // // $Id: G4NURBStubesector.cc,v 1.12 2006/06/29 19:06:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Olivier Crumeyrolle 12 September 1996 diff --git a/source/graphics_reps/src/G4PlacedPolyhedron.cc b/source/graphics_reps/src/G4PlacedPolyhedron.cc index f3933fad7e..b9bde765dd 100644 --- a/source/graphics_reps/src/G4PlacedPolyhedron.cc +++ b/source/graphics_reps/src/G4PlacedPolyhedron.cc @@ -25,7 +25,7 @@ // // // $Id: G4PlacedPolyhedron.cc,v 1.4 2006/06/29 19:06:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4PlacedPolyhedron.hh" diff --git a/source/graphics_reps/src/G4Point3DList.cc b/source/graphics_reps/src/G4Point3DList.cc index 09a4606ece..296dbcfc36 100644 --- a/source/graphics_reps/src/G4Point3DList.cc +++ b/source/graphics_reps/src/G4Point3DList.cc @@ -25,7 +25,7 @@ // // // $Id: G4Point3DList.cc,v 1.7 2006/06/29 19:07:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison July 1995 diff --git a/source/graphics_reps/src/G4Polyhedron.cc b/source/graphics_reps/src/G4Polyhedron.cc index 3a21bf6e34..e0d5f162a3 100644 --- a/source/graphics_reps/src/G4Polyhedron.cc +++ b/source/graphics_reps/src/G4Polyhedron.cc @@ -25,7 +25,7 @@ // // // $Id: G4Polyhedron.cc,v 1.20 2006/06/29 19:07:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4Polyhedron.hh" diff --git a/source/graphics_reps/src/G4Polyline.cc b/source/graphics_reps/src/G4Polyline.cc index 93c0493f17..079fe0b6c6 100644 --- a/source/graphics_reps/src/G4Polyline.cc +++ b/source/graphics_reps/src/G4Polyline.cc @@ -25,7 +25,7 @@ // // // $Id: G4Polyline.cc,v 1.11 2006/06/29 19:07:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison July 1995 diff --git a/source/graphics_reps/src/G4Polymarker.cc b/source/graphics_reps/src/G4Polymarker.cc index 6f8b0374c8..c94b3d21b1 100644 --- a/source/graphics_reps/src/G4Polymarker.cc +++ b/source/graphics_reps/src/G4Polymarker.cc @@ -25,7 +25,7 @@ // // // $Id: G4Polymarker.cc,v 1.11 2006/06/29 19:07:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison November 1996 diff --git a/source/graphics_reps/src/G4Scale.cc b/source/graphics_reps/src/G4Scale.cc index f1aaeee085..50c216d2c9 100644 --- a/source/graphics_reps/src/G4Scale.cc +++ b/source/graphics_reps/src/G4Scale.cc @@ -25,7 +25,7 @@ // // // $Id: G4Scale.cc,v 1.9 2006/06/29 19:07:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 21st July 2001 diff --git a/source/graphics_reps/src/G4Square.cc b/source/graphics_reps/src/G4Square.cc index a930e62f03..25d761a580 100644 --- a/source/graphics_reps/src/G4Square.cc +++ b/source/graphics_reps/src/G4Square.cc @@ -25,7 +25,7 @@ // // // $Id: G4Square.cc,v 1.6 2006/06/29 19:07:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/graphics_reps/src/G4Text.cc b/source/graphics_reps/src/G4Text.cc index 9c0e4460d2..53c72de04a 100644 --- a/source/graphics_reps/src/G4Text.cc +++ b/source/graphics_reps/src/G4Text.cc @@ -25,7 +25,7 @@ // // // $Id: G4Text.cc,v 1.9 2006/06/29 19:07:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 17/11/96. diff --git a/source/graphics_reps/src/G4VMarker.cc b/source/graphics_reps/src/G4VMarker.cc index ad369bf7e4..70bf5cd99c 100644 --- a/source/graphics_reps/src/G4VMarker.cc +++ b/source/graphics_reps/src/G4VMarker.cc @@ -25,7 +25,7 @@ // // // $Id: G4VMarker.cc,v 1.11 2006/06/29 19:07:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/graphics_reps/src/G4VVisManager.cc b/source/graphics_reps/src/G4VVisManager.cc index adbd7fb00a..43d4b8d302 100644 --- a/source/graphics_reps/src/G4VVisManager.cc +++ b/source/graphics_reps/src/G4VVisManager.cc @@ -25,7 +25,7 @@ // // // $Id: G4VVisManager.cc,v 1.4 2006/06/29 19:07:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Abstract interface for GEANT4 Visualization Manager. diff --git a/source/graphics_reps/src/G4VisAttributes.cc b/source/graphics_reps/src/G4VisAttributes.cc index cdf15afbb4..6c89ed7ea5 100644 --- a/source/graphics_reps/src/G4VisAttributes.cc +++ b/source/graphics_reps/src/G4VisAttributes.cc @@ -24,14 +24,16 @@ // ******************************************************************** // // -// $Id: G4VisAttributes.cc,v 1.12 2006/06/29 19:07:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VisAttributes.cc,v 1.15 2006/10/24 05:54:20 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 23rd October 1996 #include "G4VisAttributes.hh" +#include "G4AttValue.hh" + G4VisAttributes::G4VisAttributes (): fVisible (true), fDaughtersInvisible (false), @@ -40,6 +42,9 @@ fLineStyle (unbroken), fLineWidth (1.), fForceDrawingStyle (false), fForceAuxEdgeVisible (false), +fForcedLineSegmentsPerCircle (0), // <=0 means not forced. +fStartTime (-DBL_MAX), +fEndTime (DBL_MAX), fAttValues (0), fAttDefs (0) {} @@ -52,6 +57,9 @@ fLineStyle (unbroken), fLineWidth (1.), fForceDrawingStyle (false), fForceAuxEdgeVisible (false), +fForcedLineSegmentsPerCircle (0), // <=0 means not forced. +fStartTime (-DBL_MAX), +fEndTime (DBL_MAX), fAttValues (0), fAttDefs (0) {} @@ -64,6 +72,9 @@ fLineStyle (unbroken), fLineWidth (1.), fForceDrawingStyle (false), fForceAuxEdgeVisible (false), +fForcedLineSegmentsPerCircle (0), // <=0 means not forced. +fStartTime (-DBL_MAX), +fEndTime (DBL_MAX), fAttValues (0), fAttDefs (0) {} @@ -76,6 +87,9 @@ fColour (colour), fLineStyle (unbroken), fLineWidth (1.), fForceDrawingStyle (false), +fForcedLineSegmentsPerCircle (0), // <=0 means not forced. +fStartTime (-DBL_MAX), +fEndTime (DBL_MAX), fAttValues (0), fAttDefs (0) {} @@ -86,6 +100,23 @@ const G4VisAttributes& G4VisAttributes::GetInvisible() { return Invisible; } +const std::vector* G4VisAttributes::CreateAttValues () const { + // Create an expendable copy on the heap... + return new std::vector(*fAttValues); +} + +void G4VisAttributes::SetForceLineSegmentsPerCircle (G4int nSegments) { + const G4int nSegmentsMin = 12; + if (nSegments < nSegmentsMin) { + nSegments = nSegmentsMin; + G4cout << + "G4VisAttributes::SetForcedLineSegmentsPerCircle: attempt to set the" + "\nnumber of line segements per circle < " << nSegmentsMin + << "; forced to " << nSegments << G4endl; + } + fForcedLineSegmentsPerCircle = nSegments; +} + std::ostream& operator << (std::ostream& os, const G4VisAttributes& a) { os << "G4VisAttributes: "; @@ -123,6 +154,13 @@ std::ostream& operator << (std::ostream& os, const G4VisAttributes& a) { os << "not "; } os << "forced"; + os << "\n line segments per circle: "; + if (a.fForcedLineSegmentsPerCircle > 0) { + os << "forced to " << a.fForcedLineSegmentsPerCircle; + } else { + os << "not forced."; + } + os << "\n time range: (" << a.fStartTime << ',' << a.fEndTime << ')'; os << "\n G4AttValue pointer is "; if (a.fAttValues) { os << "non-"; @@ -148,6 +186,9 @@ G4bool G4VisAttributes::operator != (const G4VisAttributes& a) const { (fLineWidth != a.fLineWidth) || (fForceDrawingStyle != a.fForceDrawingStyle) || (fForceAuxEdgeVisible!= a.fForceAuxEdgeVisible)|| + (fForcedLineSegmentsPerCircle != a.fForcedLineSegmentsPerCircle) || + (fStartTime != a.fStartTime) || + (fEndTime != a.fEndTime) || (fAttValues != a.fAttValues) || (fAttDefs != a.fAttDefs) ) diff --git a/source/graphics_reps/src/G4VisExtent.cc b/source/graphics_reps/src/G4VisExtent.cc index d46ff53ed4..f24f6e7314 100644 --- a/source/graphics_reps/src/G4VisExtent.cc +++ b/source/graphics_reps/src/G4VisExtent.cc @@ -25,7 +25,7 @@ // // // $Id: G4VisExtent.cc,v 1.10 2006/06/29 19:07:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // A.Walkden 28/11/95 diff --git a/source/graphics_reps/src/G4Visible.cc b/source/graphics_reps/src/G4Visible.cc index f946dfebf4..52365f6303 100644 --- a/source/graphics_reps/src/G4Visible.cc +++ b/source/graphics_reps/src/G4Visible.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Visible.cc,v 1.14 2006/06/29 19:07:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Visible.cc,v 1.17 2006/11/07 11:53:16 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 30th October 1996 @@ -35,21 +35,55 @@ #include "G4VisAttributes.hh" #include "G4ios.hh" -G4Visible::G4Visible (): fpVisAttributes (0) {} - -G4Visible::~G4Visible () {} - -G4Visible::G4Visible (const G4VisAttributes* pVA): - fpVisAttributes (pVA) +G4Visible::G4Visible (): + fpVisAttributes (0), + fAllocatedVisAttributes (false) {} +G4Visible::G4Visible (const G4Visible& visible){ + fAllocatedVisAttributes = visible.fAllocatedVisAttributes; + if (fAllocatedVisAttributes) + fpVisAttributes = new G4VisAttributes(visible.fpVisAttributes); + else fpVisAttributes = visible.fpVisAttributes; +} + +G4Visible::G4Visible (const G4VisAttributes* pVA): + fpVisAttributes (pVA), + fAllocatedVisAttributes (false) +{} + +G4Visible::~G4Visible () { + if (fAllocatedVisAttributes) delete fpVisAttributes; +} + +G4Visible& G4Visible::operator= (const G4Visible& rhs) { + fAllocatedVisAttributes = rhs.fAllocatedVisAttributes; + if (fAllocatedVisAttributes) + fpVisAttributes = new G4VisAttributes(rhs.fpVisAttributes); + else fpVisAttributes = rhs.fpVisAttributes; + return *this; +} + void G4Visible::SetVisAttributes (const G4VisAttributes& VA) { + // Allocate G4VisAttributes on the heap in case the user specifies a + // short-lived VA for a long-lived G4Visible. Flag so that it can + // be deleted in the destructor. + // First delete any G4VisAttributes already on the heap... + if (fAllocatedVisAttributes) delete fpVisAttributes; fpVisAttributes = new G4VisAttributes(VA); + fAllocatedVisAttributes = true; +} + + +void G4Visible::SetVisAttributes (const G4VisAttributes* pVA) { + // First delete any G4VisAttributes already on the heap... + if (fAllocatedVisAttributes) delete fpVisAttributes; + fpVisAttributes = pVA; + fAllocatedVisAttributes = false; } G4bool G4Visible::operator != (const G4Visible& right) const { - // Simple test on non-equality of address... - return fpVisAttributes != right.fpVisAttributes; + return *fpVisAttributes != *right.fpVisAttributes; } std::ostream& operator << (std::ostream& os, const G4Visible& v) { diff --git a/source/graphics_reps/src/HepPolyhedron.cc b/source/graphics_reps/src/HepPolyhedron.cc index 37331ee00d..a394798db5 100644 --- a/source/graphics_reps/src/HepPolyhedron.cc +++ b/source/graphics_reps/src/HepPolyhedron.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: HepPolyhedron.cc,v 1.22 2006/06/29 19:07:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HepPolyhedron.cc,v 1.23 2006/11/07 11:48:51 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // @@ -2018,16 +2018,20 @@ HepPolyhedronEllipticalCone::HepPolyhedronEllipticalCone(double ax, zTopCut = (h >= zTopCut ? zTopCut : h); double *zz, *rr; - zz = new double[2]; - rr = new double[2]; + zz = new double[4]; + rr = new double[4]; zz[0] = zTopCut; zz[1] = -zTopCut; + zz[2] = zTopCut; + zz[3] = -zTopCut; rr[0] = (h-zTopCut); rr[1] = (h+zTopCut); + rr[2] = 0.; + rr[3] = 0.; // R O T A T E P O L Y L I N E S - RotateAroundZ(0, 0., twopi, 2, 1, zz, rr, -1, 1); + RotateAroundZ(0, 0., twopi, 2, 2, zz, rr, -1, 1); SetReferences(); delete [] zz; @@ -2037,8 +2041,8 @@ HepPolyhedronEllipticalCone::HepPolyhedronEllipticalCone(double ax, { Point3D * p= pV; for (int i=0; isetX( p->x() * ax ); - p->setY( p->y() * ay ); + p->setX( p->x() * ax / h); + p->setY( p->y() * ay / h); } } } diff --git a/source/intercoms/History b/source/intercoms/History index 5162f50309..7c33bbfc26 100644 --- a/source/intercoms/History +++ b/source/intercoms/History @@ -1,4 +1,4 @@ -$Id: History,v 1.65 2005/11/09 10:12:31 gcosmo Exp $ +$Id: History,v 1.67 2006/11/14 08:35:40 gcosmo Exp $ ------------------------------------------------------------------- ========================================================= @@ -17,6 +17,13 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +November 3, 2006, M.Verderi (intercoms-V08-01-01) +- Added missing forward declaration of G4VPhysicalVolume in + G4VFlavoredParallelWorld header. + +October 17, 2006, J.Allison (intercoms-V08-01-00) +- Extended G4UImanager::Loop to handle negative increments. + November 9, 2005 Gabriele Cosmo (intercoms-V07-01-03) - Removed inclusion of from G4UImessenger.hh. - The tag coworks with: run-V07-01-05, radioactive_decay-V07-01-00. diff --git a/source/intercoms/include/G4UIaliasList.hh b/source/intercoms/include/G4UIaliasList.hh index f481139f8b..a13d26b85f 100644 --- a/source/intercoms/include/G4UIaliasList.hh +++ b/source/intercoms/include/G4UIaliasList.hh @@ -25,7 +25,7 @@ // // // $Id: G4UIaliasList.hh,v 1.6 2006/06/29 19:07:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4UIaliasList_h diff --git a/source/intercoms/include/G4UIbatch.hh b/source/intercoms/include/G4UIbatch.hh index 95af0fde67..9f31c16dc1 100644 --- a/source/intercoms/include/G4UIbatch.hh +++ b/source/intercoms/include/G4UIbatch.hh @@ -25,7 +25,7 @@ // // // $Id: G4UIbatch.hh,v 1.9 2006/06/29 19:07:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // $id$ diff --git a/source/intercoms/include/G4UIcmdWith3Vector.hh b/source/intercoms/include/G4UIcmdWith3Vector.hh index b6181ca998..57876840aa 100644 --- a/source/intercoms/include/G4UIcmdWith3Vector.hh +++ b/source/intercoms/include/G4UIcmdWith3Vector.hh @@ -25,7 +25,7 @@ // // // $Id: G4UIcmdWith3Vector.hh,v 1.7 2006/06/29 19:07:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/intercoms/include/G4UIcmdWith3VectorAndUnit.hh b/source/intercoms/include/G4UIcmdWith3VectorAndUnit.hh index f57ff68842..6c1d750046 100644 --- a/source/intercoms/include/G4UIcmdWith3VectorAndUnit.hh +++ b/source/intercoms/include/G4UIcmdWith3VectorAndUnit.hh @@ -25,7 +25,7 @@ // // // $Id: G4UIcmdWith3VectorAndUnit.hh,v 1.8 2006/06/29 19:07:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/intercoms/include/G4UIcmdWithABool.hh b/source/intercoms/include/G4UIcmdWithABool.hh index 0e039c39c1..09b1608e46 100644 --- a/source/intercoms/include/G4UIcmdWithABool.hh +++ b/source/intercoms/include/G4UIcmdWithABool.hh @@ -25,7 +25,7 @@ // // // $Id: G4UIcmdWithABool.hh,v 1.7 2006/06/29 19:07:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/intercoms/include/G4UIcmdWithADouble.hh b/source/intercoms/include/G4UIcmdWithADouble.hh index 398bb52626..6a4486ca52 100644 --- a/source/intercoms/include/G4UIcmdWithADouble.hh +++ b/source/intercoms/include/G4UIcmdWithADouble.hh @@ -25,7 +25,7 @@ // // // $Id: G4UIcmdWithADouble.hh,v 1.7 2006/06/29 19:07:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/intercoms/include/G4UIcmdWithADoubleAndUnit.hh b/source/intercoms/include/G4UIcmdWithADoubleAndUnit.hh index c5a57a0031..5fd6dea1a9 100644 --- a/source/intercoms/include/G4UIcmdWithADoubleAndUnit.hh +++ b/source/intercoms/include/G4UIcmdWithADoubleAndUnit.hh @@ -25,7 +25,7 @@ // // // $Id: G4UIcmdWithADoubleAndUnit.hh,v 1.8 2006/06/29 19:07:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/intercoms/include/G4UIcmdWithAString.hh b/source/intercoms/include/G4UIcmdWithAString.hh index c6e8b30a0c..8674eb45d8 100644 --- a/source/intercoms/include/G4UIcmdWithAString.hh +++ b/source/intercoms/include/G4UIcmdWithAString.hh @@ -25,7 +25,7 @@ // // // $Id: G4UIcmdWithAString.hh,v 1.5 2006/06/29 19:07:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/intercoms/include/G4UIcmdWithAnInteger.hh b/source/intercoms/include/G4UIcmdWithAnInteger.hh index e059e89103..b8ae8d6012 100644 --- a/source/intercoms/include/G4UIcmdWithAnInteger.hh +++ b/source/intercoms/include/G4UIcmdWithAnInteger.hh @@ -25,7 +25,7 @@ // // // $Id: G4UIcmdWithAnInteger.hh,v 1.7 2006/06/29 19:08:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/intercoms/include/G4UIcmdWithoutParameter.hh b/source/intercoms/include/G4UIcmdWithoutParameter.hh index fb32b560b0..cde0cc1126 100644 --- a/source/intercoms/include/G4UIcmdWithoutParameter.hh +++ b/source/intercoms/include/G4UIcmdWithoutParameter.hh @@ -25,7 +25,7 @@ // // // $Id: G4UIcmdWithoutParameter.hh,v 1.5 2006/06/29 19:08:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/intercoms/include/G4UIcommand.hh b/source/intercoms/include/G4UIcommand.hh index bc1cbbf7bd..994d8efdc2 100644 --- a/source/intercoms/include/G4UIcommand.hh +++ b/source/intercoms/include/G4UIcommand.hh @@ -25,7 +25,7 @@ // // // $Id: G4UIcommand.hh,v 1.15 2006/06/29 19:08:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/intercoms/include/G4UIcommandStatus.hh b/source/intercoms/include/G4UIcommandStatus.hh index c65e06ded2..6fc90acf18 100644 --- a/source/intercoms/include/G4UIcommandStatus.hh +++ b/source/intercoms/include/G4UIcommandStatus.hh @@ -25,7 +25,7 @@ // // // $Id: G4UIcommandStatus.hh,v 1.5 2006/06/29 19:08:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4UIcommandStatus_h diff --git a/source/intercoms/include/G4UIcommandTree.hh b/source/intercoms/include/G4UIcommandTree.hh index a348acdcff..4a15b46469 100644 --- a/source/intercoms/include/G4UIcommandTree.hh +++ b/source/intercoms/include/G4UIcommandTree.hh @@ -25,7 +25,7 @@ // // // $Id: G4UIcommandTree.hh,v 1.15 2006/06/29 19:08:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4UIcommandTree_h diff --git a/source/intercoms/include/G4UIcontrolMessenger.hh b/source/intercoms/include/G4UIcontrolMessenger.hh index 92df0a4953..3e4cf3f833 100644 --- a/source/intercoms/include/G4UIcontrolMessenger.hh +++ b/source/intercoms/include/G4UIcontrolMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: G4UIcontrolMessenger.hh,v 1.11 2006/06/29 19:08:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4UIcontrolMessenger_h diff --git a/source/intercoms/include/G4UIdirectory.hh b/source/intercoms/include/G4UIdirectory.hh index e63c8d3f49..4e27c74691 100644 --- a/source/intercoms/include/G4UIdirectory.hh +++ b/source/intercoms/include/G4UIdirectory.hh @@ -25,7 +25,7 @@ // // // $Id: G4UIdirectory.hh,v 1.5 2006/06/29 19:08:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/intercoms/include/G4UImanager.hh b/source/intercoms/include/G4UImanager.hh index 3355bad72d..64cab1f60a 100644 --- a/source/intercoms/include/G4UImanager.hh +++ b/source/intercoms/include/G4UImanager.hh @@ -25,7 +25,7 @@ // // // $Id: G4UImanager.hh,v 1.21 2006/06/29 19:08:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4UImanager_h diff --git a/source/intercoms/include/G4UImessenger.hh b/source/intercoms/include/G4UImessenger.hh index a0010d4310..396568286c 100644 --- a/source/intercoms/include/G4UImessenger.hh +++ b/source/intercoms/include/G4UImessenger.hh @@ -25,7 +25,7 @@ // // // $Id: G4UImessenger.hh,v 1.9 2006/06/29 19:08:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4UImessenger_h diff --git a/source/intercoms/include/G4UIparameter.hh b/source/intercoms/include/G4UIparameter.hh index cdf1f758b4..78cf397ee5 100644 --- a/source/intercoms/include/G4UIparameter.hh +++ b/source/intercoms/include/G4UIparameter.hh @@ -25,7 +25,7 @@ // // // $Id: G4UIparameter.hh,v 1.9 2006/06/29 19:08:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // --------------------------------------------------------------------- diff --git a/source/intercoms/include/G4UIsession.hh b/source/intercoms/include/G4UIsession.hh index 65dfeb0cd7..2575b1a57c 100644 --- a/source/intercoms/include/G4UIsession.hh +++ b/source/intercoms/include/G4UIsession.hh @@ -25,7 +25,7 @@ // // // $Id: G4UIsession.hh,v 1.5 2006/06/29 19:08:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // $id$ diff --git a/source/intercoms/include/G4UItokenNum.hh b/source/intercoms/include/G4UItokenNum.hh index 43baf50082..980534ec71 100644 --- a/source/intercoms/include/G4UItokenNum.hh +++ b/source/intercoms/include/G4UItokenNum.hh @@ -25,7 +25,7 @@ // // // $Id: G4UItokenNum.hh,v 1.8 2006/06/29 19:08:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4UItokenNum.hh diff --git a/source/intercoms/include/G4UnitsMessenger.hh b/source/intercoms/include/G4UnitsMessenger.hh index 3be9ec22e8..ce6bef1731 100644 --- a/source/intercoms/include/G4UnitsMessenger.hh +++ b/source/intercoms/include/G4UnitsMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: G4UnitsMessenger.hh,v 1.5 2006/06/29 19:08:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class description // diff --git a/source/intercoms/include/G4VFlavoredParallelWorld.hh b/source/intercoms/include/G4VFlavoredParallelWorld.hh index da3e77bf9a..5f04259d0b 100644 --- a/source/intercoms/include/G4VFlavoredParallelWorld.hh +++ b/source/intercoms/include/G4VFlavoredParallelWorld.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VFlavoredParallelWorld.hh,v 1.4 2006/06/29 19:08:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VFlavoredParallelWorld.hh,v 1.5 2006/11/03 17:44:40 mverderi Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Abstract interface for GEANT4 Flavored Parallel World. @@ -35,6 +35,8 @@ #ifndef G4VFLAVOREDPARALLELWORLD_HH #define G4VFLAVOREDPARALLELWORLD_HH +class G4VPhysicalVolume; + class G4VFlavoredParallelWorld { public: diff --git a/source/intercoms/include/G4VGlobalFastSimulationManager.hh b/source/intercoms/include/G4VGlobalFastSimulationManager.hh index 46859a5e09..e7127df105 100644 --- a/source/intercoms/include/G4VGlobalFastSimulationManager.hh +++ b/source/intercoms/include/G4VGlobalFastSimulationManager.hh @@ -25,7 +25,7 @@ // // // $Id: G4VGlobalFastSimulationManager.hh,v 1.5 2006/06/29 19:08:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Abstract interface for GEANT4 Global Fast Simulation Manager. diff --git a/source/intercoms/src/G4UIaliasList.cc b/source/intercoms/src/G4UIaliasList.cc index 6b02fc2dcb..e1eedf1311 100644 --- a/source/intercoms/src/G4UIaliasList.cc +++ b/source/intercoms/src/G4UIaliasList.cc @@ -25,7 +25,7 @@ // // // $Id: G4UIaliasList.cc,v 1.6 2006/06/29 19:08:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4UIaliasList.hh" diff --git a/source/intercoms/src/G4UIbatch.cc b/source/intercoms/src/G4UIbatch.cc index 754fef6b49..10ba2b8b9e 100644 --- a/source/intercoms/src/G4UIbatch.cc +++ b/source/intercoms/src/G4UIbatch.cc @@ -25,7 +25,7 @@ // // // $Id: G4UIbatch.cc,v 1.14 2006/06/29 19:08:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4UIbatch.hh" diff --git a/source/intercoms/src/G4UIcmdWith3Vector.cc b/source/intercoms/src/G4UIcmdWith3Vector.cc index abe4234794..ca4fe6f2a3 100644 --- a/source/intercoms/src/G4UIcmdWith3Vector.cc +++ b/source/intercoms/src/G4UIcmdWith3Vector.cc @@ -25,7 +25,7 @@ // // // $Id: G4UIcmdWith3Vector.cc,v 1.8 2006/06/29 19:08:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/intercoms/src/G4UIcmdWith3VectorAndUnit.cc b/source/intercoms/src/G4UIcmdWith3VectorAndUnit.cc index 4d14297c50..d8ec0e7ffe 100644 --- a/source/intercoms/src/G4UIcmdWith3VectorAndUnit.cc +++ b/source/intercoms/src/G4UIcmdWith3VectorAndUnit.cc @@ -25,7 +25,7 @@ // // // $Id: G4UIcmdWith3VectorAndUnit.cc,v 1.9 2006/06/29 19:08:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/intercoms/src/G4UIcmdWithABool.cc b/source/intercoms/src/G4UIcmdWithABool.cc index 41a5f405eb..9f82e01f51 100644 --- a/source/intercoms/src/G4UIcmdWithABool.cc +++ b/source/intercoms/src/G4UIcmdWithABool.cc @@ -25,7 +25,7 @@ // // // $Id: G4UIcmdWithABool.cc,v 1.8 2006/06/29 19:08:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/intercoms/src/G4UIcmdWithADouble.cc b/source/intercoms/src/G4UIcmdWithADouble.cc index af3ea56da3..ca0f3b4bf5 100644 --- a/source/intercoms/src/G4UIcmdWithADouble.cc +++ b/source/intercoms/src/G4UIcmdWithADouble.cc @@ -25,7 +25,7 @@ // // // $Id: G4UIcmdWithADouble.cc,v 1.8 2006/06/29 19:08:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/intercoms/src/G4UIcmdWithADoubleAndUnit.cc b/source/intercoms/src/G4UIcmdWithADoubleAndUnit.cc index c05a67c441..c024c3d854 100644 --- a/source/intercoms/src/G4UIcmdWithADoubleAndUnit.cc +++ b/source/intercoms/src/G4UIcmdWithADoubleAndUnit.cc @@ -25,7 +25,7 @@ // // // $Id: G4UIcmdWithADoubleAndUnit.cc,v 1.9 2006/06/29 19:08:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/intercoms/src/G4UIcmdWithAString.cc b/source/intercoms/src/G4UIcmdWithAString.cc index 3b1c91a676..19c774fa5d 100644 --- a/source/intercoms/src/G4UIcmdWithAString.cc +++ b/source/intercoms/src/G4UIcmdWithAString.cc @@ -25,7 +25,7 @@ // // // $Id: G4UIcmdWithAString.cc,v 1.6 2006/06/29 19:08:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/intercoms/src/G4UIcmdWithAnInteger.cc b/source/intercoms/src/G4UIcmdWithAnInteger.cc index c3c876081a..da981a8a5b 100644 --- a/source/intercoms/src/G4UIcmdWithAnInteger.cc +++ b/source/intercoms/src/G4UIcmdWithAnInteger.cc @@ -25,7 +25,7 @@ // // // $Id: G4UIcmdWithAnInteger.cc,v 1.8 2006/06/29 19:08:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/intercoms/src/G4UIcmdWithoutParameter.cc b/source/intercoms/src/G4UIcmdWithoutParameter.cc index 5843e1830d..0ae2f0d02a 100644 --- a/source/intercoms/src/G4UIcmdWithoutParameter.cc +++ b/source/intercoms/src/G4UIcmdWithoutParameter.cc @@ -25,7 +25,7 @@ // // // $Id: G4UIcmdWithoutParameter.cc,v 1.4 2006/06/29 19:08:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/intercoms/src/G4UIcommand.cc b/source/intercoms/src/G4UIcommand.cc index 49b8c87bf0..f6eda5bd25 100644 --- a/source/intercoms/src/G4UIcommand.cc +++ b/source/intercoms/src/G4UIcommand.cc @@ -25,7 +25,7 @@ // // // $Id: G4UIcommand.cc,v 1.25 2006/06/29 19:08:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/intercoms/src/G4UIcommandTree.cc b/source/intercoms/src/G4UIcommandTree.cc index ea46787c67..79eaae7809 100644 --- a/source/intercoms/src/G4UIcommandTree.cc +++ b/source/intercoms/src/G4UIcommandTree.cc @@ -25,7 +25,7 @@ // // // $Id: G4UIcommandTree.cc,v 1.13 2006/06/29 19:08:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4UIcommandTree.hh" diff --git a/source/intercoms/src/G4UIcontrolMessenger.cc b/source/intercoms/src/G4UIcontrolMessenger.cc index 277bb548f9..39820e9913 100644 --- a/source/intercoms/src/G4UIcontrolMessenger.cc +++ b/source/intercoms/src/G4UIcontrolMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: G4UIcontrolMessenger.cc,v 1.10 2006/06/29 19:09:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include diff --git a/source/intercoms/src/G4UIdirectory.cc b/source/intercoms/src/G4UIdirectory.cc index 91e3ea5455..c14e33c92d 100644 --- a/source/intercoms/src/G4UIdirectory.cc +++ b/source/intercoms/src/G4UIdirectory.cc @@ -25,7 +25,7 @@ // // // $Id: G4UIdirectory.cc,v 1.4 2006/06/29 19:09:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/intercoms/src/G4UImanager.cc b/source/intercoms/src/G4UImanager.cc index 617c3f61b4..9e4ee882a0 100644 --- a/source/intercoms/src/G4UImanager.cc +++ b/source/intercoms/src/G4UImanager.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4UImanager.cc,v 1.31 2006/06/29 19:09:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4UImanager.cc,v 1.32 2006/10/17 16:32:49 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // --------------------------------------------------------------------- @@ -248,12 +248,22 @@ void G4UImanager::Loop(const char * macroFile,const char * variableName, G4double initialValue,G4double finalValue,G4double stepSize) { G4String cd; - for(G4double d=initialValue;d<=finalValue;d+=stepSize) - { - std::ostringstream os; - os << d; - cd += os.str(); - cd += " "; + if (stepSize > 0) { + for(G4double d=initialValue;d<=finalValue;d+=stepSize) + { + std::ostringstream os; + os << d; + cd += os.str(); + cd += " "; + } + } else { + for(G4double d=initialValue;d>=finalValue;d+=stepSize) + { + std::ostringstream os; + os << d; + cd += os.str(); + cd += " "; + } } Foreach(macroFile,variableName,cd); } diff --git a/source/intercoms/src/G4UImessenger.cc b/source/intercoms/src/G4UImessenger.cc index 19681903b4..e94efc9603 100644 --- a/source/intercoms/src/G4UImessenger.cc +++ b/source/intercoms/src/G4UImessenger.cc @@ -25,7 +25,7 @@ // // // $Id: G4UImessenger.cc,v 1.7 2006/06/29 19:09:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4UImessenger.hh" diff --git a/source/intercoms/src/G4UIparameter.cc b/source/intercoms/src/G4UIparameter.cc index 6c8a229ad1..b6796ee185 100644 --- a/source/intercoms/src/G4UIparameter.cc +++ b/source/intercoms/src/G4UIparameter.cc @@ -25,7 +25,7 @@ // // // $Id: G4UIparameter.cc,v 1.14 2006/06/29 19:09:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4UIparameter.hh" diff --git a/source/intercoms/src/G4UIsession.cc b/source/intercoms/src/G4UIsession.cc index 753c184e28..eafea6e6cc 100644 --- a/source/intercoms/src/G4UIsession.cc +++ b/source/intercoms/src/G4UIsession.cc @@ -25,7 +25,7 @@ // // // $Id: G4UIsession.cc,v 1.7 2006/06/29 19:09:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // --------------------------------------------------------------------- diff --git a/source/intercoms/src/G4UnitsMessenger.cc b/source/intercoms/src/G4UnitsMessenger.cc index 19b4966472..308af601ca 100644 --- a/source/intercoms/src/G4UnitsMessenger.cc +++ b/source/intercoms/src/G4UnitsMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: G4UnitsMessenger.cc,v 1.7 2006/06/29 19:09:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/intercoms/src/G4VGlobalFastSimulationManager.cc b/source/intercoms/src/G4VGlobalFastSimulationManager.cc index 56da665395..726ac86e29 100644 --- a/source/intercoms/src/G4VGlobalFastSimulationManager.cc +++ b/source/intercoms/src/G4VGlobalFastSimulationManager.cc @@ -25,7 +25,7 @@ // // // $Id: G4VGlobalFastSimulationManager.cc,v 1.5 2006/06/29 19:09:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Abstract interface for GEANT4 Global Fast Simulation Manager. diff --git a/source/interfaces/GAG/include/G4UIGAG.hh b/source/interfaces/GAG/include/G4UIGAG.hh index cf4a91ef6a..bd8c9950b6 100644 --- a/source/interfaces/GAG/include/G4UIGAG.hh +++ b/source/interfaces/GAG/include/G4UIGAG.hh @@ -25,7 +25,7 @@ // // // $Id: G4UIGAG.hh,v 1.7 2006/06/29 19:09:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4UIGAG.hh // GAG(Geant4 adaptive GUI) interface class diff --git a/source/interfaces/GAG/include/G4UIGainServer.hh b/source/interfaces/GAG/include/G4UIGainServer.hh index 860bff39c1..761dfce4a5 100644 --- a/source/interfaces/GAG/include/G4UIGainServer.hh +++ b/source/interfaces/GAG/include/G4UIGainServer.hh @@ -25,7 +25,7 @@ // // // $Id: G4UIGainServer.hh,v 1.5 2006/06/29 19:09:21 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // diff --git a/source/interfaces/GAG/src/G4UIGAG.cc b/source/interfaces/GAG/src/G4UIGAG.cc index 82cedfd6a3..eef0db5f14 100644 --- a/source/interfaces/GAG/src/G4UIGAG.cc +++ b/source/interfaces/GAG/src/G4UIGAG.cc @@ -25,7 +25,7 @@ // // // $Id: G4UIGAG.cc,v 1.18 2006/06/29 19:09:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4UIGAG.cc // 18.Feb.98 M.Nagamatu and T.Kodama created G4UIGAG from G4UIterminal diff --git a/source/interfaces/GAG/src/G4UIGainServer.cc b/source/interfaces/GAG/src/G4UIGainServer.cc index 8b5159ae6e..ab0ded4098 100644 --- a/source/interfaces/GAG/src/G4UIGainServer.cc +++ b/source/interfaces/GAG/src/G4UIGainServer.cc @@ -26,7 +26,7 @@ // // 12/06/2002 G4UIGainServer H. MInamimoto and H. Yoshida created // $Id: G4UIGainServer.cc,v 1.10 2006/06/29 19:09:25 gunter Exp $ -// $Name: geant4-08-01 $ +// $Name: geant4-08-02 $ // #ifndef WIN32 diff --git a/source/interfaces/basic/include/G4UIArrayString.hh b/source/interfaces/basic/include/G4UIArrayString.hh index a5c1d79a1f..43c5e4c2e5 100644 --- a/source/interfaces/basic/include/G4UIArrayString.hh +++ b/source/interfaces/basic/include/G4UIArrayString.hh @@ -25,7 +25,7 @@ // // // $Id: G4UIArrayString.hh,v 1.3 2006/06/29 19:09:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4UIArrayString_h diff --git a/source/interfaces/basic/include/G4UIWin32.hh b/source/interfaces/basic/include/G4UIWin32.hh index 4528e479e6..595926f9b0 100644 --- a/source/interfaces/basic/include/G4UIWin32.hh +++ b/source/interfaces/basic/include/G4UIWin32.hh @@ -25,7 +25,7 @@ // // // $Id: G4UIWin32.hh,v 1.14 2006/06/29 19:09:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4UIWin32_h #define G4UIWin32_h diff --git a/source/interfaces/basic/include/G4UIXaw.hh b/source/interfaces/basic/include/G4UIXaw.hh index 82409eadc4..1a0fd9a176 100644 --- a/source/interfaces/basic/include/G4UIXaw.hh +++ b/source/interfaces/basic/include/G4UIXaw.hh @@ -25,7 +25,7 @@ // // // $Id: G4UIXaw.hh,v 1.6 2006/06/29 19:09:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4UIXaw_h #define G4UIXaw_h diff --git a/source/interfaces/basic/include/G4UIXm.hh b/source/interfaces/basic/include/G4UIXm.hh index 016dedb139..9c420524d9 100644 --- a/source/interfaces/basic/include/G4UIXm.hh +++ b/source/interfaces/basic/include/G4UIXm.hh @@ -25,7 +25,7 @@ // // // $Id: G4UIXm.hh,v 1.13 2006/06/29 19:09:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4UIXm_h #define G4UIXm_h diff --git a/source/interfaces/basic/include/G4UIcsh.hh b/source/interfaces/basic/include/G4UIcsh.hh index bbfc26de47..699b345d93 100644 --- a/source/interfaces/basic/include/G4UIcsh.hh +++ b/source/interfaces/basic/include/G4UIcsh.hh @@ -25,7 +25,7 @@ // // // $Id: G4UIcsh.hh,v 1.4 2006/06/29 19:09:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4UIcsh_h diff --git a/source/interfaces/basic/include/G4UItcsh.hh b/source/interfaces/basic/include/G4UItcsh.hh index 52b2ebe4bd..d8ee07e8c8 100644 --- a/source/interfaces/basic/include/G4UItcsh.hh +++ b/source/interfaces/basic/include/G4UItcsh.hh @@ -25,7 +25,7 @@ // // // $Id: G4UItcsh.hh,v 1.7 2006/06/29 19:09:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4UItcsh_h diff --git a/source/interfaces/basic/include/G4UIterminal.hh b/source/interfaces/basic/include/G4UIterminal.hh index fd62ef2a21..5439aef096 100644 --- a/source/interfaces/basic/include/G4UIterminal.hh +++ b/source/interfaces/basic/include/G4UIterminal.hh @@ -25,7 +25,7 @@ // // // $Id: G4UIterminal.hh,v 1.9 2006/06/29 19:09:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4UIterminal_h diff --git a/source/interfaces/basic/include/G4VUIshell.hh b/source/interfaces/basic/include/G4VUIshell.hh index 30782c2786..fa62056f19 100644 --- a/source/interfaces/basic/include/G4VUIshell.hh +++ b/source/interfaces/basic/include/G4VUIshell.hh @@ -25,7 +25,7 @@ // // // $Id: G4VUIshell.hh,v 1.6 2006/06/29 19:09:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VUIshell_h diff --git a/source/interfaces/basic/src/G4UIArrayString.cc b/source/interfaces/basic/src/G4UIArrayString.cc index 349d6c4051..e225c02696 100644 --- a/source/interfaces/basic/src/G4UIArrayString.cc +++ b/source/interfaces/basic/src/G4UIArrayString.cc @@ -25,7 +25,7 @@ // // // $Id: G4UIArrayString.cc,v 1.8 2006/06/29 19:09:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include diff --git a/source/interfaces/basic/src/G4UIWin32.cc b/source/interfaces/basic/src/G4UIWin32.cc index ec42479ca4..52ed4836e3 100644 --- a/source/interfaces/basic/src/G4UIWin32.cc +++ b/source/interfaces/basic/src/G4UIWin32.cc @@ -25,7 +25,7 @@ // // // $Id: G4UIWin32.cc,v 1.13 2006/06/29 19:09:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G.Barrand diff --git a/source/interfaces/basic/src/G4UIXaw.cc b/source/interfaces/basic/src/G4UIXaw.cc index 0ecd27b251..412b75f724 100644 --- a/source/interfaces/basic/src/G4UIXaw.cc +++ b/source/interfaces/basic/src/G4UIXaw.cc @@ -25,7 +25,7 @@ // // // $Id: G4UIXaw.cc,v 1.6 2006/06/29 19:09:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G.Barrand diff --git a/source/interfaces/basic/src/G4UIXm.cc b/source/interfaces/basic/src/G4UIXm.cc index 7d56e06562..c816a485f0 100644 --- a/source/interfaces/basic/src/G4UIXm.cc +++ b/source/interfaces/basic/src/G4UIXm.cc @@ -25,7 +25,7 @@ // // // $Id: G4UIXm.cc,v 1.14 2006/06/29 19:09:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G.Barrand diff --git a/source/interfaces/basic/src/G4UIcsh.cc b/source/interfaces/basic/src/G4UIcsh.cc index fc964c4e54..4b73be4973 100644 --- a/source/interfaces/basic/src/G4UIcsh.cc +++ b/source/interfaces/basic/src/G4UIcsh.cc @@ -25,7 +25,7 @@ // // // $Id: G4UIcsh.cc,v 1.8 2006/06/29 19:09:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4UIcsh.hh" diff --git a/source/interfaces/basic/src/G4UItcsh.cc b/source/interfaces/basic/src/G4UItcsh.cc index ff13c99e35..28a182c439 100644 --- a/source/interfaces/basic/src/G4UItcsh.cc +++ b/source/interfaces/basic/src/G4UItcsh.cc @@ -25,7 +25,7 @@ // // // $Id: G4UItcsh.cc,v 1.12 2006/06/29 19:09:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef WIN32 diff --git a/source/interfaces/basic/src/G4UIterminal.cc b/source/interfaces/basic/src/G4UIterminal.cc index a4cd1cda4a..a99b83c89f 100644 --- a/source/interfaces/basic/src/G4UIterminal.cc +++ b/source/interfaces/basic/src/G4UIterminal.cc @@ -25,7 +25,7 @@ // // // $Id: G4UIterminal.cc,v 1.21 2006/06/29 19:09:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4Types.hh" diff --git a/source/interfaces/basic/src/G4VUIshell.cc b/source/interfaces/basic/src/G4VUIshell.cc index ab6cbaa6dc..35751d6df3 100644 --- a/source/interfaces/basic/src/G4VUIshell.cc +++ b/source/interfaces/basic/src/G4VUIshell.cc @@ -25,7 +25,7 @@ // // // $Id: G4VUIshell.cc,v 1.9 2006/06/29 19:09:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4UImanager.hh" diff --git a/source/interfaces/common/include/G4VBasicShell.hh b/source/interfaces/common/include/G4VBasicShell.hh index c35ce1be1a..dafddcb90a 100644 --- a/source/interfaces/common/include/G4VBasicShell.hh +++ b/source/interfaces/common/include/G4VBasicShell.hh @@ -25,7 +25,7 @@ // // // $Id: G4VBasicShell.hh,v 1.7 2006/06/29 19:10:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VBasicShell_H diff --git a/source/interfaces/common/include/G4VInteractorManager.hh b/source/interfaces/common/include/G4VInteractorManager.hh index 6021a55e23..e64f9cdd33 100644 --- a/source/interfaces/common/include/G4VInteractorManager.hh +++ b/source/interfaces/common/include/G4VInteractorManager.hh @@ -25,7 +25,7 @@ // // // $Id: G4VInteractorManager.hh,v 1.9 2006/06/29 19:10:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G.Barrand diff --git a/source/interfaces/common/include/G4Win32.hh b/source/interfaces/common/include/G4Win32.hh index 3c52f7ba2d..7dc41ffa64 100644 --- a/source/interfaces/common/include/G4Win32.hh +++ b/source/interfaces/common/include/G4Win32.hh @@ -25,7 +25,7 @@ // // // $Id: G4Win32.hh,v 1.8 2006/06/29 19:10:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // To unify Windows message treatment between // G4/interfaces Windows sessions and G4/visualizations Windows drivers. diff --git a/source/interfaces/common/include/G4Xt.hh b/source/interfaces/common/include/G4Xt.hh index 206893058b..6579444eef 100644 --- a/source/interfaces/common/include/G4Xt.hh +++ b/source/interfaces/common/include/G4Xt.hh @@ -25,7 +25,7 @@ // // // $Id: G4Xt.hh,v 1.6 2006/06/29 19:10:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // To unify X11 event treatment between // G4/interfaces Xt sessions and G4/visualizations Xt drivers. diff --git a/source/interfaces/common/src/G4VBasicShell.cc b/source/interfaces/common/src/G4VBasicShell.cc index 12e165cbb8..3403cf2bb2 100644 --- a/source/interfaces/common/src/G4VBasicShell.cc +++ b/source/interfaces/common/src/G4VBasicShell.cc @@ -25,7 +25,7 @@ // // // $Id: G4VBasicShell.cc,v 1.12 2006/06/29 19:10:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4VBasicShell.hh" diff --git a/source/interfaces/common/src/G4VInteractorManager.cc b/source/interfaces/common/src/G4VInteractorManager.cc index feb10bf3a0..7c47dded99 100644 --- a/source/interfaces/common/src/G4VInteractorManager.cc +++ b/source/interfaces/common/src/G4VInteractorManager.cc @@ -25,7 +25,7 @@ // // // $Id: G4VInteractorManager.cc,v 1.13 2006/06/29 19:10:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G.Barrand diff --git a/source/interfaces/common/src/G4Win32.cc b/source/interfaces/common/src/G4Win32.cc index 1d3950694f..c5a480d36f 100644 --- a/source/interfaces/common/src/G4Win32.cc +++ b/source/interfaces/common/src/G4Win32.cc @@ -25,7 +25,7 @@ // // // $Id: G4Win32.cc,v 1.9 2006/06/29 19:10:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G.Barrand diff --git a/source/interfaces/common/src/G4Xt.cc b/source/interfaces/common/src/G4Xt.cc index 12323578a6..e5c1fa1dae 100644 --- a/source/interfaces/common/src/G4Xt.cc +++ b/source/interfaces/common/src/G4Xt.cc @@ -25,7 +25,7 @@ // // // $Id: G4Xt.cc,v 1.11 2006/06/29 19:10:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G.Barrand diff --git a/source/materials/History b/source/materials/History index 2eccb5ccd5..168510892d 100644 --- a/source/materials/History +++ b/source/materials/History @@ -1,4 +1,4 @@ -$Id: History,v 1.76 2006/06/27 13:02:53 vnivanch Exp $ +$Id: History,v 1.78 2006/10/17 15:15:46 vnivanch Exp $ ------------------------------------------------------------------- ========================================================= @@ -17,7 +17,15 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- -27-06-06 V.Ivanchenko (materials-V08-00-04) +27-06-06 V.Ivanchenko (materials-V08-01-01) +- Add methods to access vector of names of NIST elements and materials + (ILC requirement) +- Add methods GetAtomicMass, AddIsotopeMass - return atom mass amd + nuclear mass in G4 units +- Add GetTotalBindingEnergy method to G4AtomicShells +- Add Get/SetNaturalAbandancesFlag (requirement of hadronic group) + +27-06-06 V.Ivanchenko (materials-V08-01-00) - G4NistMaterialBuilder - fix graphite desctription 11-05-06 V.Ivanchenko (materials-V08-00-03) diff --git a/source/materials/include/G4AtomicShells.hh b/source/materials/include/G4AtomicShells.hh index 924d4aefb5..7279b8ca10 100644 --- a/source/materials/include/G4AtomicShells.hh +++ b/source/materials/include/G4AtomicShells.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4AtomicShells.hh,v 1.6 2006/06/29 19:10:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4AtomicShells.hh,v 1.7 2006/10/17 15:15:46 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // class description // @@ -65,6 +65,7 @@ public : //with description static G4int GetNumberOfShells(G4int Z); static G4int GetNumberOfElectrons(G4int Z, G4int SubshellNb); static G4double GetBindingEnergy (G4int Z, G4int SubshellNb); + G4double GetTotalBindingEnergy (G4int Z); private : diff --git a/source/materials/include/G4Element.hh b/source/materials/include/G4Element.hh index 3ddd3150ad..a4798c45a3 100644 --- a/source/materials/include/G4Element.hh +++ b/source/materials/include/G4Element.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Element.hh,v 1.21 2006/06/29 19:10:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Element.hh,v 1.22 2006/10/17 15:15:46 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // class description @@ -69,6 +69,7 @@ // 14-09-01, fCountUse: nb of materials which use this element // 26-02-02, fIndexInTable renewed // 01-04-05, new data member fIndexZ to count the number of elements with same Z +// 17-10-06: Add Get/Set fNaturalAbandances (V.Ivanchenko) //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -121,6 +122,9 @@ public: // with description G4double GetZ() const {return fZeff;}; //atomic number G4double GetN() const {return fNeff;}; //number of nucleons G4double GetA() const {return fAeff;}; //mass of a mole + G4bool GetNaturalAbandancesFlag(); + + void SetNaturalAbandancesFlag(G4bool); //the number of atomic shells in this element: // @@ -238,6 +242,7 @@ private: // Set up the static Table of Elements static G4ElementTable theElementTable; size_t fIndexInTable; + G4bool fNaturalAbandances; // // Derived data members (computed from the basic data members) @@ -247,6 +252,16 @@ private: G4IonisParamElm* fIonisation; // Pointer to ionisation parameters }; +inline G4bool G4Element::GetNaturalAbandancesFlag() +{ + return fNaturalAbandances; +} + +inline void G4Element::SetNaturalAbandancesFlag(G4bool val) +{ + fNaturalAbandances = val; +} + //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... #endif diff --git a/source/materials/include/G4ElementTable.hh b/source/materials/include/G4ElementTable.hh index 60e606213c..c36a2e2875 100644 --- a/source/materials/include/G4ElementTable.hh +++ b/source/materials/include/G4ElementTable.hh @@ -25,7 +25,7 @@ // // // $Id: G4ElementTable.hh,v 1.6 2006/06/29 19:10:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/materials/include/G4ElementVector.hh b/source/materials/include/G4ElementVector.hh index d8d328a63f..981f178368 100644 --- a/source/materials/include/G4ElementVector.hh +++ b/source/materials/include/G4ElementVector.hh @@ -25,7 +25,7 @@ // // // $Id: G4ElementVector.hh,v 1.6 2006/06/29 19:11:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/materials/include/G4IonisParamElm.hh b/source/materials/include/G4IonisParamElm.hh index 160591b5ab..3e1c569d0d 100644 --- a/source/materials/include/G4IonisParamElm.hh +++ b/source/materials/include/G4IonisParamElm.hh @@ -25,7 +25,7 @@ // // // $Id: G4IonisParamElm.hh,v 1.9 2006/06/29 19:11:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class description diff --git a/source/materials/include/G4IonisParamMat.hh b/source/materials/include/G4IonisParamMat.hh index f94e701776..5f24240e9a 100644 --- a/source/materials/include/G4IonisParamMat.hh +++ b/source/materials/include/G4IonisParamMat.hh @@ -25,7 +25,7 @@ // // // $Id: G4IonisParamMat.hh,v 1.9 2006/06/29 19:11:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class description diff --git a/source/materials/include/G4Isotope.hh b/source/materials/include/G4Isotope.hh index 3c35f37edc..7f72c52764 100644 --- a/source/materials/include/G4Isotope.hh +++ b/source/materials/include/G4Isotope.hh @@ -25,7 +25,7 @@ // // // $Id: G4Isotope.hh,v 1.19 2006/06/29 19:11:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/source/materials/include/G4IsotopeVector.hh b/source/materials/include/G4IsotopeVector.hh index 192429a09c..90d420b5b6 100644 --- a/source/materials/include/G4IsotopeVector.hh +++ b/source/materials/include/G4IsotopeVector.hh @@ -25,7 +25,7 @@ // // // $Id: G4IsotopeVector.hh,v 1.6 2006/06/29 19:11:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/materials/include/G4MPVEntry.hh b/source/materials/include/G4MPVEntry.hh index 5c559f7ce1..57b7ccbd57 100644 --- a/source/materials/include/G4MPVEntry.hh +++ b/source/materials/include/G4MPVEntry.hh @@ -25,7 +25,7 @@ // // // $Id: G4MPVEntry.hh,v 1.6 2006/06/29 19:11:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //////////////////////////////////////////////////////////////////////// diff --git a/source/materials/include/G4Material.hh b/source/materials/include/G4Material.hh index e66cda8129..49ea500963 100644 --- a/source/materials/include/G4Material.hh +++ b/source/materials/include/G4Material.hh @@ -25,7 +25,7 @@ // // // $Id: G4Material.hh,v 1.25 2006/06/29 19:11:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class description diff --git a/source/materials/include/G4MaterialPropertiesTable.hh b/source/materials/include/G4MaterialPropertiesTable.hh index 84794bac76..beb33dd3be 100644 --- a/source/materials/include/G4MaterialPropertiesTable.hh +++ b/source/materials/include/G4MaterialPropertiesTable.hh @@ -25,7 +25,7 @@ // // // $Id: G4MaterialPropertiesTable.hh,v 1.18 2006/06/29 19:11:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //////////////////////////////////////////////////////////////////////// diff --git a/source/materials/include/G4MaterialPropertyVector.hh b/source/materials/include/G4MaterialPropertyVector.hh index c163e9fb5d..5c956265c4 100644 --- a/source/materials/include/G4MaterialPropertyVector.hh +++ b/source/materials/include/G4MaterialPropertyVector.hh @@ -25,7 +25,7 @@ // // // $Id: G4MaterialPropertyVector.hh,v 1.10 2006/06/29 19:11:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //////////////////////////////////////////////////////////////////////// diff --git a/source/materials/include/G4MaterialTable.hh b/source/materials/include/G4MaterialTable.hh index 5f44938000..923e0fb388 100644 --- a/source/materials/include/G4MaterialTable.hh +++ b/source/materials/include/G4MaterialTable.hh @@ -25,7 +25,7 @@ // // // $Id: G4MaterialTable.hh,v 1.6 2006/06/29 19:11:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/materials/include/G4NistElementBuilder.hh b/source/materials/include/G4NistElementBuilder.hh index b174ba4089..e06c5b176e 100644 --- a/source/materials/include/G4NistElementBuilder.hh +++ b/source/materials/include/G4NistElementBuilder.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4NistElementBuilder.hh,v 1.9 2006/06/29 19:11:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4NistElementBuilder.hh,v 1.10 2006/10/17 15:15:46 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4NistElementBuilder_h #define G4NistElementBuilder_h 1 @@ -41,6 +41,7 @@ // Modifications: // 27.02.06 V.Ivanchenko Return m=0 if Z&N combination is out of NIST // 27.02.06 V.Ivanchneko add GetAtomicMassAmu +// 17.10.06 V.Ivanchneko add GetAtomicMass and GetNistElementNames methods // //---------------------------------------------------------------------------- // @@ -52,6 +53,7 @@ //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... #include "globals.hh" +#include "G4AtomicShells.hh" #include //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -70,6 +72,7 @@ public: G4int GetZ (const G4String& symb); G4double GetA (G4int Z); G4double GetIsotopeMass (G4int Z, G4int N); + G4double GetAtomicMass (G4int Z, G4int N); G4double GetIsotopeAbundance (G4int Z, G4int N); @@ -83,7 +86,10 @@ public: // Find or build a G4Element by symbol G4Element* FindOrBuildElement (const G4String& symb, - G4bool buildIsotopes = true); + G4bool buildIsotopes = true); + + // Return reference to vector of element names + const std::vector& GetElementNames() const; private: @@ -111,6 +117,8 @@ private: G4int verbose; G4bool first; + std::vector elmNames; + G4AtomicShells aShell; }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -138,7 +146,20 @@ inline G4double G4NistElementBuilder::GetIsotopeMass(G4int Z, G4int N) { G4double m = 0.0; G4int i = N - nFirstIsotope[Z]; - if(i >= 0 && i = 0 && i = 0 && i & G4NistElementBuilder::GetElementNames() const +{ + return elmNames; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + #endif diff --git a/source/materials/include/G4NistManager.hh b/source/materials/include/G4NistManager.hh index fd916df076..2307ffc36e 100644 --- a/source/materials/include/G4NistManager.hh +++ b/source/materials/include/G4NistManager.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4NistManager.hh,v 1.8 2006/06/29 19:11:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4NistManager.hh,v 1.9 2006/10/17 15:15:46 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------------- @@ -40,6 +40,8 @@ // Modifications: // 27.02.06 V.Ivanchneko add GetAtomicMassAmu and ConstructNewGasMaterial // 11.05.06 V.Ivanchneko add warning flag to FindMaterial method +// 17.10.06 V.Ivanchneko add methods: GetAtomicMass, GetNistElementNames, +// GetNistMaterialNames // // Class Description: // @@ -93,8 +95,14 @@ public: size_t GetNumberOfElements() const; G4int GetZ(const G4String& symb) const; + + // Mass in amu G4double GetAtomicMassAmu(G4int Z) const; + + // Mass in Geant4 units G4double GetIsotopeMass(G4int Z, G4int N) const; + G4double GetAtomicMass(G4int Z, G4int N) const; + G4double GetIsotopeAbundance(G4int Z, G4int N) const; void PrintElement(const G4String&); @@ -102,9 +110,10 @@ public: void PrintG4Element(const G4String&); + const std::vector& GetNistElementNames() const; - // Materials - // + // Materials + // void RegisterMaterial (G4Material*); void DeRegisterMaterial(G4Material*); @@ -144,6 +153,8 @@ public: void ListMaterials(const G4String&); void PrintG4Material(const G4String&); + const std::vector& GetNistMaterialNames() const; + private: G4NistManager(); @@ -224,6 +235,14 @@ G4double G4NistManager::GetIsotopeMass(G4int Z, G4int N) const //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +inline +G4double G4NistManager::GetAtomicMass(G4int Z, G4int N) const +{ + return elmBuilder->GetAtomicMass(Z, N); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + inline G4double G4NistManager::GetIsotopeAbundance(G4int Z, G4int N) const { @@ -232,6 +251,14 @@ G4double G4NistManager::GetIsotopeAbundance(G4int Z, G4int N) const //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +inline +const std::vector& G4NistManager::GetNistElementNames() const +{ + return elmBuilder->GetElementNames(); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + inline G4Material* G4NistManager::GetMaterial(size_t index) { diff --git a/source/materials/include/G4NistMaterialBuilder.hh b/source/materials/include/G4NistMaterialBuilder.hh index 8705206b3e..8245b826d9 100644 --- a/source/materials/include/G4NistMaterialBuilder.hh +++ b/source/materials/include/G4NistMaterialBuilder.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4NistMaterialBuilder.hh,v 1.8 2006/06/29 19:12:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4NistMaterialBuilder.hh,v 1.9 2006/10/17 15:15:46 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4NistMaterialBuilder_h #define G4NistMaterialBuilder_h 1 @@ -102,6 +102,8 @@ public: void ListNistCompoundMaterials(); void ListHepMaterials(); + const std::vector& GetMaterialNames() const; + private: void Initialise(); @@ -161,4 +163,10 @@ private: }; +inline const std::vector& + G4NistMaterialBuilder::GetMaterialNames() const +{ + return names; +} + #endif diff --git a/source/materials/include/G4NistMessenger.hh b/source/materials/include/G4NistMessenger.hh index 3437eb8779..d050a89862 100644 --- a/source/materials/include/G4NistMessenger.hh +++ b/source/materials/include/G4NistMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: G4NistMessenger.hh,v 1.2 2006/06/29 19:12:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // File name: G4NistMessenger // diff --git a/source/materials/include/G4OpticalSurface.hh b/source/materials/include/G4OpticalSurface.hh index 0f008e5d4b..879e2f3b71 100644 --- a/source/materials/include/G4OpticalSurface.hh +++ b/source/materials/include/G4OpticalSurface.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpticalSurface.hh,v 1.8 2006/06/29 19:12:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //////////////////////////////////////////////////////////////////////// diff --git a/source/materials/include/G4SandiaTable.hh b/source/materials/include/G4SandiaTable.hh index 1d33d457f4..d0314fb596 100644 --- a/source/materials/include/G4SandiaTable.hh +++ b/source/materials/include/G4SandiaTable.hh @@ -25,7 +25,7 @@ // // // $Id: G4SandiaTable.hh,v 1.14 2006/06/29 19:12:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // class description // diff --git a/source/materials/include/G4StaticSandiaData.hh b/source/materials/include/G4StaticSandiaData.hh index a3364af976..2854093dfe 100644 --- a/source/materials/include/G4StaticSandiaData.hh +++ b/source/materials/include/G4StaticSandiaData.hh @@ -25,7 +25,7 @@ // // // $Id: G4StaticSandiaData.hh,v 1.7 2006/06/29 19:12:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo.... diff --git a/source/materials/include/G4SurfaceProperty.hh b/source/materials/include/G4SurfaceProperty.hh index 5271656237..0facd227ff 100644 --- a/source/materials/include/G4SurfaceProperty.hh +++ b/source/materials/include/G4SurfaceProperty.hh @@ -25,7 +25,7 @@ // // // $Id: G4SurfaceProperty.hh,v 1.3 2006/06/29 19:12:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //////////////////////////////////////////////////////////////////////// diff --git a/source/materials/src/G4AtomicShells.cc b/source/materials/src/G4AtomicShells.cc index eb6b7778a6..2696b03465 100644 --- a/source/materials/src/G4AtomicShells.cc +++ b/source/materials/src/G4AtomicShells.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4AtomicShells.cc,v 1.6 2006/06/29 19:12:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4AtomicShells.cc,v 1.7 2006/10/17 15:15:46 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo.... @@ -759,3 +759,17 @@ G4AtomicShells::GetNumberOfElectrons(G4int Z, G4int ShellNb) } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo.... + +G4double G4AtomicShells::GetTotalBindingEnergy (G4int Z) +{ + assert (Z>=1 && Z<=101); + + G4int idx = 1; + for (G4int z = 1 ; z < Z ; z++) idx += fNumberOfShells[z]; + G4double energy = 0.0; + G4int idxmax = idx + fNumberOfShells[Z]; + for (G4int i=idx; i etc.) correctly, P. Urban +// 29.01.97: Forbidden to create Isotope with Z<1 or NGetIsotopeMass(Z,N))*g/mole; + fA = (G4NistManager::Instance()->GetIsotopeMass(Z,N))*g/(mole*amu_c2); theIsotopeTable.push_back(this); fIndexInTable = theIsotopeTable.size() - 1; diff --git a/source/materials/src/G4MPVEntry.cc b/source/materials/src/G4MPVEntry.cc index 1c28028715..71579bd41d 100644 --- a/source/materials/src/G4MPVEntry.cc +++ b/source/materials/src/G4MPVEntry.cc @@ -25,7 +25,7 @@ // // // $Id: G4MPVEntry.cc,v 1.7 2006/06/29 19:12:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //////////////////////////////////////////////////////////////////////// diff --git a/source/materials/src/G4Material.cc b/source/materials/src/G4Material.cc index 9e53172951..17e024b76c 100644 --- a/source/materials/src/G4Material.cc +++ b/source/materials/src/G4Material.cc @@ -25,7 +25,7 @@ // // // $Id: G4Material.cc,v 1.34 2006/06/29 19:12:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... // diff --git a/source/materials/src/G4MaterialPropertiesTable.cc b/source/materials/src/G4MaterialPropertiesTable.cc index e4b6e78433..8b01621ee0 100644 --- a/source/materials/src/G4MaterialPropertiesTable.cc +++ b/source/materials/src/G4MaterialPropertiesTable.cc @@ -25,7 +25,7 @@ // // // $Id: G4MaterialPropertiesTable.cc,v 1.18 2006/06/29 19:12:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //////////////////////////////////////////////////////////////////////// diff --git a/source/materials/src/G4MaterialPropertyVector.cc b/source/materials/src/G4MaterialPropertyVector.cc index 68a38ca3bc..c8cc2c067e 100644 --- a/source/materials/src/G4MaterialPropertyVector.cc +++ b/source/materials/src/G4MaterialPropertyVector.cc @@ -25,7 +25,7 @@ // // // $Id: G4MaterialPropertyVector.cc,v 1.15 2006/06/29 19:12:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //////////////////////////////////////////////////////////////////////// diff --git a/source/materials/src/G4NistElementBuilder.cc b/source/materials/src/G4NistElementBuilder.cc index 420cfbe481..3c21306073 100644 --- a/source/materials/src/G4NistElementBuilder.cc +++ b/source/materials/src/G4NistElementBuilder.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4NistElementBuilder.cc,v 1.10 2006/06/29 19:12:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4NistElementBuilder.cc,v 1.11 2006/10/17 15:15:46 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // @@ -39,6 +39,8 @@ // Modifications: // 02.05.2006 Subtract mass of atomic electrons from NIST mass (VI) // 11.05.2006 Do not subtract mass of atomic electrons from NIST mass (VI) +// 17.10.2006 Add natiral abandances flag to element and +// use G4 units for isotope mass vector (VI) // // ------------------------------------------------------------------- // @@ -157,6 +159,7 @@ G4Element* G4NistElementBuilder::BuildElement(G4int Z, G4bool buildIsotopes) else { theElement = new G4Element(elmSymbol[Z],elmSymbol[Z],Zeff,Aeff*gram/mole); } + theElement->SetNaturalAbandancesFlag(buildIsotopes); return theElement; } @@ -187,7 +190,7 @@ void G4NistElementBuilder::PrintElement(G4int Z) G4cout << " N: "; for(j=0; j& G4NistManager::GetNistMaterialNames() const +{ + return matBuilder->GetMaterialNames(); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/source/materials/src/G4NistMaterialBuilder.cc b/source/materials/src/G4NistMaterialBuilder.cc index 8a86bfb4c8..c51ead3122 100644 --- a/source/materials/src/G4NistMaterialBuilder.cc +++ b/source/materials/src/G4NistMaterialBuilder.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4NistMaterialBuilder.cc,v 1.14 2006/06/29 19:13:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------------- diff --git a/source/materials/src/G4NistMessenger.cc b/source/materials/src/G4NistMessenger.cc index b4ca24d776..801ac3df02 100644 --- a/source/materials/src/G4NistMessenger.cc +++ b/source/materials/src/G4NistMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: G4NistMessenger.cc,v 1.2 2006/06/29 19:13:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // File name: G4NistMessenger diff --git a/source/materials/src/G4OpticalSurface.cc b/source/materials/src/G4OpticalSurface.cc index 3627d66b10..e64ae22ce2 100644 --- a/source/materials/src/G4OpticalSurface.cc +++ b/source/materials/src/G4OpticalSurface.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpticalSurface.cc,v 1.10 2006/06/29 19:13:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //////////////////////////////////////////////////////////////////////// diff --git a/source/materials/src/G4SandiaTable.cc b/source/materials/src/G4SandiaTable.cc index ca3731bb89..45d0279d87 100644 --- a/source/materials/src/G4SandiaTable.cc +++ b/source/materials/src/G4SandiaTable.cc @@ -25,7 +25,7 @@ // // // $Id: G4SandiaTable.cc,v 1.22 2006/06/29 19:13:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo.... // diff --git a/source/parameterisations/gflash/include/G4GFlashSpot.hh b/source/parameterisations/gflash/include/G4GFlashSpot.hh index f2ab7f610f..06b6d36a75 100644 --- a/source/parameterisations/gflash/include/G4GFlashSpot.hh +++ b/source/parameterisations/gflash/include/G4GFlashSpot.hh @@ -25,7 +25,7 @@ // // // $Id: G4GFlashSpot.hh,v 1.4 2006/06/29 19:13:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/parameterisations/gflash/include/G4VGFlashSensitiveDetector.hh b/source/parameterisations/gflash/include/G4VGFlashSensitiveDetector.hh index cdd55d5ffd..889764a0f6 100644 --- a/source/parameterisations/gflash/include/G4VGFlashSensitiveDetector.hh +++ b/source/parameterisations/gflash/include/G4VGFlashSensitiveDetector.hh @@ -25,7 +25,7 @@ // // // $Id: G4VGFlashSensitiveDetector.hh,v 1.5 2006/06/29 19:13:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/parameterisations/gflash/include/GFlashEnergySpot.hh b/source/parameterisations/gflash/include/GFlashEnergySpot.hh index e8149a9886..41e5d4485b 100644 --- a/source/parameterisations/gflash/include/GFlashEnergySpot.hh +++ b/source/parameterisations/gflash/include/GFlashEnergySpot.hh @@ -25,7 +25,7 @@ // // // $Id: GFlashEnergySpot.hh,v 1.5 2006/06/29 19:13:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/parameterisations/gflash/include/GFlashHitMaker.hh b/source/parameterisations/gflash/include/GFlashHitMaker.hh index 71bb46948b..ab515c6453 100644 --- a/source/parameterisations/gflash/include/GFlashHitMaker.hh +++ b/source/parameterisations/gflash/include/GFlashHitMaker.hh @@ -25,7 +25,7 @@ // // // $Id: GFlashHitMaker.hh,v 1.5 2006/06/29 19:13:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/parameterisations/gflash/include/GFlashHomoShowerParameterisation.hh b/source/parameterisations/gflash/include/GFlashHomoShowerParameterisation.hh index 7aa7bb56a7..dbfe113030 100644 --- a/source/parameterisations/gflash/include/GFlashHomoShowerParameterisation.hh +++ b/source/parameterisations/gflash/include/GFlashHomoShowerParameterisation.hh @@ -25,7 +25,7 @@ // // // $Id: GFlashHomoShowerParameterisation.hh,v 1.4 2006/06/29 19:13:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // --------------------------------------------------------------- diff --git a/source/parameterisations/gflash/include/GFlashParticleBounds.hh b/source/parameterisations/gflash/include/GFlashParticleBounds.hh index 77af16b738..8d69e47962 100644 --- a/source/parameterisations/gflash/include/GFlashParticleBounds.hh +++ b/source/parameterisations/gflash/include/GFlashParticleBounds.hh @@ -25,7 +25,7 @@ // // // $Id: GFlashParticleBounds.hh,v 1.4 2006/06/29 19:13:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/parameterisations/gflash/include/GFlashSamplingShowerParameterisation.hh b/source/parameterisations/gflash/include/GFlashSamplingShowerParameterisation.hh index 3b8cf324c7..fc9522742f 100644 --- a/source/parameterisations/gflash/include/GFlashSamplingShowerParameterisation.hh +++ b/source/parameterisations/gflash/include/GFlashSamplingShowerParameterisation.hh @@ -25,7 +25,7 @@ // // // $Id: GFlashSamplingShowerParameterisation.hh,v 1.4 2006/06/29 19:13:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/parameterisations/gflash/include/GFlashSamplingShowerTuning.hh b/source/parameterisations/gflash/include/GFlashSamplingShowerTuning.hh index f90d2dfc0f..ccf9625ee5 100644 --- a/source/parameterisations/gflash/include/GFlashSamplingShowerTuning.hh +++ b/source/parameterisations/gflash/include/GFlashSamplingShowerTuning.hh @@ -25,7 +25,7 @@ // // // $Id: GFlashSamplingShowerTuning.hh,v 1.3 2006/06/29 19:13:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/parameterisations/gflash/include/GFlashShowerModel.hh b/source/parameterisations/gflash/include/GFlashShowerModel.hh index 29b23902aa..19f45d9742 100644 --- a/source/parameterisations/gflash/include/GFlashShowerModel.hh +++ b/source/parameterisations/gflash/include/GFlashShowerModel.hh @@ -25,7 +25,7 @@ // // // $Id: GFlashShowerModel.hh,v 1.9 2006/06/29 19:13:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/parameterisations/gflash/include/GFlashShowerModelMessenger.hh b/source/parameterisations/gflash/include/GFlashShowerModelMessenger.hh index 6edd039c71..6b81a41e2f 100644 --- a/source/parameterisations/gflash/include/GFlashShowerModelMessenger.hh +++ b/source/parameterisations/gflash/include/GFlashShowerModelMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: GFlashShowerModelMessenger.hh,v 1.4 2006/06/29 19:14:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/parameterisations/gflash/include/GVFlashHomoShowerTuning.hh b/source/parameterisations/gflash/include/GVFlashHomoShowerTuning.hh index 8b4e2fbde0..6e8bd74969 100644 --- a/source/parameterisations/gflash/include/GVFlashHomoShowerTuning.hh +++ b/source/parameterisations/gflash/include/GVFlashHomoShowerTuning.hh @@ -25,7 +25,7 @@ // // // $Id: GVFlashHomoShowerTuning.hh,v 1.7 2006/06/29 19:14:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // --------------------------------------------------------------- diff --git a/source/parameterisations/gflash/include/GVFlashShowerParameterisation.hh b/source/parameterisations/gflash/include/GVFlashShowerParameterisation.hh index c1b9f951d3..a5a674f13c 100644 --- a/source/parameterisations/gflash/include/GVFlashShowerParameterisation.hh +++ b/source/parameterisations/gflash/include/GVFlashShowerParameterisation.hh @@ -25,7 +25,7 @@ // // // $Id: GVFlashShowerParameterisation.hh,v 1.2 2006/06/29 19:14:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/parameterisations/gflash/include/Gamma.hh b/source/parameterisations/gflash/include/Gamma.hh index d82fddaef3..61e6ecfe55 100644 --- a/source/parameterisations/gflash/include/Gamma.hh +++ b/source/parameterisations/gflash/include/Gamma.hh @@ -26,7 +26,7 @@ // // // $Id: Gamma.hh,v 1.6 2006/06/29 19:14:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/parameterisations/gflash/src/GFlashEnergySpot.cc b/source/parameterisations/gflash/src/GFlashEnergySpot.cc index ef25273d21..a84a2f481f 100644 --- a/source/parameterisations/gflash/src/GFlashEnergySpot.cc +++ b/source/parameterisations/gflash/src/GFlashEnergySpot.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: GFlashEnergySpot.cc,v 1.5 2006/06/29 19:14:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/parameterisations/gflash/src/GFlashHitMaker.cc b/source/parameterisations/gflash/src/GFlashHitMaker.cc index bdbb5162a0..9eb61fcb1c 100644 --- a/source/parameterisations/gflash/src/GFlashHitMaker.cc +++ b/source/parameterisations/gflash/src/GFlashHitMaker.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: GFlashHitMaker.cc,v 1.7 2006/06/29 19:14:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/parameterisations/gflash/src/GFlashHomoShowerParameterisation.cc b/source/parameterisations/gflash/src/GFlashHomoShowerParameterisation.cc index 269bdd6f58..9fc72475a0 100644 --- a/source/parameterisations/gflash/src/GFlashHomoShowerParameterisation.cc +++ b/source/parameterisations/gflash/src/GFlashHomoShowerParameterisation.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: GFlashHomoShowerParameterisation.cc,v 1.5 2006/06/29 19:14:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/parameterisations/gflash/src/GFlashParticleBounds.cc b/source/parameterisations/gflash/src/GFlashParticleBounds.cc index e4d46e87b9..4f44560d16 100644 --- a/source/parameterisations/gflash/src/GFlashParticleBounds.cc +++ b/source/parameterisations/gflash/src/GFlashParticleBounds.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: GFlashParticleBounds.cc,v 1.4 2006/06/29 19:14:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/parameterisations/gflash/src/GFlashSamplingShowerParameterisation.cc b/source/parameterisations/gflash/src/GFlashSamplingShowerParameterisation.cc index 5249970a5c..db66028644 100644 --- a/source/parameterisations/gflash/src/GFlashSamplingShowerParameterisation.cc +++ b/source/parameterisations/gflash/src/GFlashSamplingShowerParameterisation.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: GFlashSamplingShowerParameterisation.cc,v 1.6 2006/06/29 19:14:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/parameterisations/gflash/src/GFlashShowerModel.cc b/source/parameterisations/gflash/src/GFlashShowerModel.cc index 3e5a971718..cc0e5e2988 100644 --- a/source/parameterisations/gflash/src/GFlashShowerModel.cc +++ b/source/parameterisations/gflash/src/GFlashShowerModel.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: GFlashShowerModel.cc,v 1.13 2006/06/29 19:14:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/parameterisations/gflash/src/GFlashShowerModelMessenger.cc b/source/parameterisations/gflash/src/GFlashShowerModelMessenger.cc index 7851fc390d..fd8a3bbb6b 100644 --- a/source/parameterisations/gflash/src/GFlashShowerModelMessenger.cc +++ b/source/parameterisations/gflash/src/GFlashShowerModelMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: GFlashShowerModelMessenger.cc,v 1.6 2006/06/29 19:14:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/parameterisations/gflash/src/GVFlashShowerParameterisation.cc b/source/parameterisations/gflash/src/GVFlashShowerParameterisation.cc index 783e0331c9..b1525c0355 100644 --- a/source/parameterisations/gflash/src/GVFlashShowerParameterisation.cc +++ b/source/parameterisations/gflash/src/GVFlashShowerParameterisation.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: GVFlashShowerParameterisation.cc,v 1.2 2006/06/29 19:14:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/parameterisations/gflash/src/Gamma.cc b/source/parameterisations/gflash/src/Gamma.cc index 5cac9ddac9..ccfaa5936d 100644 --- a/source/parameterisations/gflash/src/Gamma.cc +++ b/source/parameterisations/gflash/src/Gamma.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: Gamma.cc,v 1.6 2006/06/29 19:14:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/History b/source/particles/History index f49d444ab4..c278624add 100644 --- a/source/particles/History +++ b/source/particles/History @@ -1,4 +1,4 @@ -$Id: History,v 1.131 2006/04/28 06:33:52 kurasige Exp $ +$Id: History,v 1.138 2006/11/15 09:57:51 kurasige Exp $ ------------------------------------------------------------------- ========================================================= @@ -16,7 +16,27 @@ committal in the CVS repository ! ---------------------------------------------------------- * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +- Nov. 15, 2006 H.Kurashige (particles-V08-01-05) +- Optimize G4IonTable::IsLightIon + +- Oct. 13, 2006 H.Kurashige (particles-V08-01-04) +- Update mass/width/encoding to match with PDG2006 +- Introduce PDG encoding for nuclei +- Oct. 1, 2006 H.Kurashige (particles-V08-01-03) +- Add G4Exception of Warning if sum of daughter mass exceeds parent mass in G4PhaseSpaceDecayChannel +- Modify GetMass and GetCharge of G4PrimaryParticle to return PDG mass and charge + if users do not specify them + +- Sep. 25, 2006 H.Kurashige (particles-V08-01-02) +- Fix the bug in k2(1770) decay + +- Sep. 5, 2006 H.Kurashige (particles-V08-01-01) +- Fix the bug of not filling quark contents without G4VERBOSE + in G4ParticleDefinition constructor + +- Jun. 27, 2006 M.Asai (particles-V08-01-00) +- Code polish of G4PrimaryVertex - Apr. 28 , 2006 H.Kurashige (particles-V08-00-05) - Fix memory leak in G4MuonDecayChannel.cc diff --git a/source/particles/bosons/include/G4BosonConstructor.hh b/source/particles/bosons/include/G4BosonConstructor.hh index c33a73a196..371510113b 100644 --- a/source/particles/bosons/include/G4BosonConstructor.hh +++ b/source/particles/bosons/include/G4BosonConstructor.hh @@ -25,7 +25,7 @@ // // // $Id: G4BosonConstructor.hh,v 1.6 2006/06/29 19:14:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/particles/bosons/include/G4ChargedGeantino.hh b/source/particles/bosons/include/G4ChargedGeantino.hh index 5907144f46..8fb30e9b49 100644 --- a/source/particles/bosons/include/G4ChargedGeantino.hh +++ b/source/particles/bosons/include/G4ChargedGeantino.hh @@ -25,7 +25,7 @@ // // // $Id: G4ChargedGeantino.hh,v 1.12 2006/06/29 19:14:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/bosons/include/G4Gamma.hh b/source/particles/bosons/include/G4Gamma.hh index ea4832092c..dd4900db1b 100644 --- a/source/particles/bosons/include/G4Gamma.hh +++ b/source/particles/bosons/include/G4Gamma.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4Gamma.hh,v 1.15 2006/06/29 19:14:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/bosons/include/G4Geantino.hh b/source/particles/bosons/include/G4Geantino.hh index 976e85461e..8863b042fd 100644 --- a/source/particles/bosons/include/G4Geantino.hh +++ b/source/particles/bosons/include/G4Geantino.hh @@ -25,7 +25,7 @@ // // // $Id: G4Geantino.hh,v 1.12 2006/06/29 19:14:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/bosons/include/G4OpticalPhoton.hh b/source/particles/bosons/include/G4OpticalPhoton.hh index 217a693726..070ee02ace 100644 --- a/source/particles/bosons/include/G4OpticalPhoton.hh +++ b/source/particles/bosons/include/G4OpticalPhoton.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpticalPhoton.hh,v 1.12 2006/06/29 19:14:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/bosons/include/G4UnknownParticle.hh b/source/particles/bosons/include/G4UnknownParticle.hh index f970ed1931..ca94a2f472 100644 --- a/source/particles/bosons/include/G4UnknownParticle.hh +++ b/source/particles/bosons/include/G4UnknownParticle.hh @@ -25,7 +25,7 @@ // // // $Id: G4UnknownParticle.hh,v 1.5 2006/06/29 19:14:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/bosons/src/G4BosonConstructor.cc b/source/particles/bosons/src/G4BosonConstructor.cc index 65066c0878..a99565adc3 100644 --- a/source/particles/bosons/src/G4BosonConstructor.cc +++ b/source/particles/bosons/src/G4BosonConstructor.cc @@ -25,7 +25,7 @@ // // // $Id: G4BosonConstructor.cc,v 1.5 2006/06/29 19:14:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/particles/bosons/src/G4ChargedGeantino.cc b/source/particles/bosons/src/G4ChargedGeantino.cc index 8ac12741d5..aef87cbca9 100644 --- a/source/particles/bosons/src/G4ChargedGeantino.cc +++ b/source/particles/bosons/src/G4ChargedGeantino.cc @@ -25,7 +25,7 @@ // // // $Id: G4ChargedGeantino.cc,v 1.15 2006/06/29 19:14:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/bosons/src/G4Gamma.cc b/source/particles/bosons/src/G4Gamma.cc index e90c5d5bf2..56943ab3cc 100644 --- a/source/particles/bosons/src/G4Gamma.cc +++ b/source/particles/bosons/src/G4Gamma.cc @@ -25,7 +25,7 @@ // // // $Id: G4Gamma.cc,v 1.13 2006/06/29 19:14:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/bosons/src/G4Geantino.cc b/source/particles/bosons/src/G4Geantino.cc index 942f358fc8..d27d6e43d7 100644 --- a/source/particles/bosons/src/G4Geantino.cc +++ b/source/particles/bosons/src/G4Geantino.cc @@ -25,7 +25,7 @@ // // // $Id: G4Geantino.cc,v 1.15 2006/06/29 19:14:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/bosons/src/G4OpticalPhoton.cc b/source/particles/bosons/src/G4OpticalPhoton.cc index 5d1329ee42..bf9288aac2 100644 --- a/source/particles/bosons/src/G4OpticalPhoton.cc +++ b/source/particles/bosons/src/G4OpticalPhoton.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpticalPhoton.cc,v 1.13 2006/06/29 19:14:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/bosons/src/G4UnknownParticle.cc b/source/particles/bosons/src/G4UnknownParticle.cc index 236d3db9b0..0d069d5050 100644 --- a/source/particles/bosons/src/G4UnknownParticle.cc +++ b/source/particles/bosons/src/G4UnknownParticle.cc @@ -25,7 +25,7 @@ // // // $Id: G4UnknownParticle.cc,v 1.4 2006/06/29 19:15:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/barions/include/G4AntiLambda.hh b/source/particles/hadrons/barions/include/G4AntiLambda.hh index 71b003615b..8a0672e834 100644 --- a/source/particles/hadrons/barions/include/G4AntiLambda.hh +++ b/source/particles/hadrons/barions/include/G4AntiLambda.hh @@ -25,7 +25,7 @@ // // // $Id: G4AntiLambda.hh,v 1.13 2006/06/29 19:15:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4AntiLambdacPlus.hh b/source/particles/hadrons/barions/include/G4AntiLambdacPlus.hh index bfa0d8c86a..5abc5b0e29 100644 --- a/source/particles/hadrons/barions/include/G4AntiLambdacPlus.hh +++ b/source/particles/hadrons/barions/include/G4AntiLambdacPlus.hh @@ -25,7 +25,7 @@ // // // $Id: G4AntiLambdacPlus.hh,v 1.9 2006/06/29 19:15:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4AntiNeutron.hh b/source/particles/hadrons/barions/include/G4AntiNeutron.hh index 71b5a0068c..542d4b4a29 100644 --- a/source/particles/hadrons/barions/include/G4AntiNeutron.hh +++ b/source/particles/hadrons/barions/include/G4AntiNeutron.hh @@ -25,7 +25,7 @@ // // // $Id: G4AntiNeutron.hh,v 1.14 2006/06/29 19:15:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4AntiOmegaMinus.hh b/source/particles/hadrons/barions/include/G4AntiOmegaMinus.hh index 80d2b6906d..e129eabae0 100644 --- a/source/particles/hadrons/barions/include/G4AntiOmegaMinus.hh +++ b/source/particles/hadrons/barions/include/G4AntiOmegaMinus.hh @@ -25,7 +25,7 @@ // // // $Id: G4AntiOmegaMinus.hh,v 1.10 2006/06/29 19:15:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4AntiOmegacZero.hh b/source/particles/hadrons/barions/include/G4AntiOmegacZero.hh index 9160beb52b..d05976c0dc 100644 --- a/source/particles/hadrons/barions/include/G4AntiOmegacZero.hh +++ b/source/particles/hadrons/barions/include/G4AntiOmegacZero.hh @@ -25,7 +25,7 @@ // // // $Id: G4AntiOmegacZero.hh,v 1.12 2006/06/29 19:15:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4AntiProton.hh b/source/particles/hadrons/barions/include/G4AntiProton.hh index a1da8ae054..14a25a06c3 100644 --- a/source/particles/hadrons/barions/include/G4AntiProton.hh +++ b/source/particles/hadrons/barions/include/G4AntiProton.hh @@ -25,7 +25,7 @@ // // // $Id: G4AntiProton.hh,v 1.11 2006/06/29 19:15:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4AntiSigmaMinus.hh b/source/particles/hadrons/barions/include/G4AntiSigmaMinus.hh index bdb0efebf5..2997d31a0f 100644 --- a/source/particles/hadrons/barions/include/G4AntiSigmaMinus.hh +++ b/source/particles/hadrons/barions/include/G4AntiSigmaMinus.hh @@ -25,7 +25,7 @@ // // // $Id: G4AntiSigmaMinus.hh,v 1.10 2006/06/29 19:15:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4AntiSigmaPlus.hh b/source/particles/hadrons/barions/include/G4AntiSigmaPlus.hh index c4f313c3fa..1272d03c42 100644 --- a/source/particles/hadrons/barions/include/G4AntiSigmaPlus.hh +++ b/source/particles/hadrons/barions/include/G4AntiSigmaPlus.hh @@ -25,7 +25,7 @@ // // // $Id: G4AntiSigmaPlus.hh,v 1.10 2006/06/29 19:15:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4AntiSigmaZero.hh b/source/particles/hadrons/barions/include/G4AntiSigmaZero.hh index 4cbad8b861..2ff241bccd 100644 --- a/source/particles/hadrons/barions/include/G4AntiSigmaZero.hh +++ b/source/particles/hadrons/barions/include/G4AntiSigmaZero.hh @@ -25,7 +25,7 @@ // // // $Id: G4AntiSigmaZero.hh,v 1.13 2006/06/29 19:15:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4AntiSigmacPlus.hh b/source/particles/hadrons/barions/include/G4AntiSigmacPlus.hh index a8a61b9a92..3e29ce1ae8 100644 --- a/source/particles/hadrons/barions/include/G4AntiSigmacPlus.hh +++ b/source/particles/hadrons/barions/include/G4AntiSigmacPlus.hh @@ -25,7 +25,7 @@ // // // $Id: G4AntiSigmacPlus.hh,v 1.9 2006/06/29 19:15:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4AntiSigmacPlusPlus.hh b/source/particles/hadrons/barions/include/G4AntiSigmacPlusPlus.hh index fdd8895c21..2bd2c9fd06 100644 --- a/source/particles/hadrons/barions/include/G4AntiSigmacPlusPlus.hh +++ b/source/particles/hadrons/barions/include/G4AntiSigmacPlusPlus.hh @@ -25,7 +25,7 @@ // // // $Id: G4AntiSigmacPlusPlus.hh,v 1.9 2006/06/29 19:15:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4AntiSigmacZero.hh b/source/particles/hadrons/barions/include/G4AntiSigmacZero.hh index 8c83d5f0ce..ac19d436b5 100644 --- a/source/particles/hadrons/barions/include/G4AntiSigmacZero.hh +++ b/source/particles/hadrons/barions/include/G4AntiSigmacZero.hh @@ -25,7 +25,7 @@ // // // $Id: G4AntiSigmacZero.hh,v 1.12 2006/06/29 19:15:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4AntiXiMinus.hh b/source/particles/hadrons/barions/include/G4AntiXiMinus.hh index b892d835e2..21c42ece6b 100644 --- a/source/particles/hadrons/barions/include/G4AntiXiMinus.hh +++ b/source/particles/hadrons/barions/include/G4AntiXiMinus.hh @@ -25,7 +25,7 @@ // // // $Id: G4AntiXiMinus.hh,v 1.10 2006/06/29 19:15:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4AntiXiZero.hh b/source/particles/hadrons/barions/include/G4AntiXiZero.hh index d62e837f74..ac07948a86 100644 --- a/source/particles/hadrons/barions/include/G4AntiXiZero.hh +++ b/source/particles/hadrons/barions/include/G4AntiXiZero.hh @@ -25,7 +25,7 @@ // // // $Id: G4AntiXiZero.hh,v 1.13 2006/06/29 19:15:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4AntiXicPlus.hh b/source/particles/hadrons/barions/include/G4AntiXicPlus.hh index 4e44e1d80a..b8c5b8ace5 100644 --- a/source/particles/hadrons/barions/include/G4AntiXicPlus.hh +++ b/source/particles/hadrons/barions/include/G4AntiXicPlus.hh @@ -25,7 +25,7 @@ // // // $Id: G4AntiXicPlus.hh,v 1.9 2006/06/29 19:15:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4AntiXicZero.hh b/source/particles/hadrons/barions/include/G4AntiXicZero.hh index b253c7b88b..f6d464212c 100644 --- a/source/particles/hadrons/barions/include/G4AntiXicZero.hh +++ b/source/particles/hadrons/barions/include/G4AntiXicZero.hh @@ -25,7 +25,7 @@ // // // $Id: G4AntiXicZero.hh,v 1.12 2006/06/29 19:15:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4BaryonConstructor.hh b/source/particles/hadrons/barions/include/G4BaryonConstructor.hh index 8357ffffb9..a9cd8cc818 100644 --- a/source/particles/hadrons/barions/include/G4BaryonConstructor.hh +++ b/source/particles/hadrons/barions/include/G4BaryonConstructor.hh @@ -25,7 +25,7 @@ // // // $Id: G4BaryonConstructor.hh,v 1.5 2006/06/29 19:15:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/particles/hadrons/barions/include/G4Lambda.hh b/source/particles/hadrons/barions/include/G4Lambda.hh index 906dc409c2..cc98eade63 100644 --- a/source/particles/hadrons/barions/include/G4Lambda.hh +++ b/source/particles/hadrons/barions/include/G4Lambda.hh @@ -25,7 +25,7 @@ // // // $Id: G4Lambda.hh,v 1.13 2006/06/29 19:15:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4LambdacPlus.hh b/source/particles/hadrons/barions/include/G4LambdacPlus.hh index bd4f231cb4..ab23a51a4b 100644 --- a/source/particles/hadrons/barions/include/G4LambdacPlus.hh +++ b/source/particles/hadrons/barions/include/G4LambdacPlus.hh @@ -25,7 +25,7 @@ // // // $Id: G4LambdacPlus.hh,v 1.9 2006/06/29 19:15:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4Neutron.hh b/source/particles/hadrons/barions/include/G4Neutron.hh index f1c309ac6b..872341a096 100644 --- a/source/particles/hadrons/barions/include/G4Neutron.hh +++ b/source/particles/hadrons/barions/include/G4Neutron.hh @@ -25,7 +25,7 @@ // // // $Id: G4Neutron.hh,v 1.16 2006/06/29 19:15:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4OmegaMinus.hh b/source/particles/hadrons/barions/include/G4OmegaMinus.hh index 985c0c78a8..7aabd58502 100644 --- a/source/particles/hadrons/barions/include/G4OmegaMinus.hh +++ b/source/particles/hadrons/barions/include/G4OmegaMinus.hh @@ -25,7 +25,7 @@ // // // $Id: G4OmegaMinus.hh,v 1.10 2006/06/29 19:15:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4OmegacZero.hh b/source/particles/hadrons/barions/include/G4OmegacZero.hh index 998abc0765..c229bda908 100644 --- a/source/particles/hadrons/barions/include/G4OmegacZero.hh +++ b/source/particles/hadrons/barions/include/G4OmegacZero.hh @@ -25,7 +25,7 @@ // // // $Id: G4OmegacZero.hh,v 1.12 2006/06/29 19:15:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4Proton.hh b/source/particles/hadrons/barions/include/G4Proton.hh index d268619317..0b5c486430 100644 --- a/source/particles/hadrons/barions/include/G4Proton.hh +++ b/source/particles/hadrons/barions/include/G4Proton.hh @@ -25,7 +25,7 @@ // // // $Id: G4Proton.hh,v 1.13 2006/06/29 19:15:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4SigmaMinus.hh b/source/particles/hadrons/barions/include/G4SigmaMinus.hh index efabc05e81..57764b29a9 100644 --- a/source/particles/hadrons/barions/include/G4SigmaMinus.hh +++ b/source/particles/hadrons/barions/include/G4SigmaMinus.hh @@ -25,7 +25,7 @@ // // // $Id: G4SigmaMinus.hh,v 1.10 2006/06/29 19:15:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4SigmaPlus.hh b/source/particles/hadrons/barions/include/G4SigmaPlus.hh index 15ddda0415..ba24841c61 100644 --- a/source/particles/hadrons/barions/include/G4SigmaPlus.hh +++ b/source/particles/hadrons/barions/include/G4SigmaPlus.hh @@ -25,7 +25,7 @@ // // // $Id: G4SigmaPlus.hh,v 1.10 2006/06/29 19:15:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4SigmaZero.hh b/source/particles/hadrons/barions/include/G4SigmaZero.hh index 2e719a5e6a..dbc1b26049 100644 --- a/source/particles/hadrons/barions/include/G4SigmaZero.hh +++ b/source/particles/hadrons/barions/include/G4SigmaZero.hh @@ -25,7 +25,7 @@ // // // $Id: G4SigmaZero.hh,v 1.13 2006/06/29 19:15:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4SigmacPlus.hh b/source/particles/hadrons/barions/include/G4SigmacPlus.hh index e86992f967..5f94053d17 100644 --- a/source/particles/hadrons/barions/include/G4SigmacPlus.hh +++ b/source/particles/hadrons/barions/include/G4SigmacPlus.hh @@ -25,7 +25,7 @@ // // // $Id: G4SigmacPlus.hh,v 1.9 2006/06/29 19:16:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4SigmacPlusPlus.hh b/source/particles/hadrons/barions/include/G4SigmacPlusPlus.hh index 26da6b666b..cc00a09f1b 100644 --- a/source/particles/hadrons/barions/include/G4SigmacPlusPlus.hh +++ b/source/particles/hadrons/barions/include/G4SigmacPlusPlus.hh @@ -25,7 +25,7 @@ // // // $Id: G4SigmacPlusPlus.hh,v 1.9 2006/06/29 19:16:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4SigmacZero.hh b/source/particles/hadrons/barions/include/G4SigmacZero.hh index bfadc32ff7..9eb98949b1 100644 --- a/source/particles/hadrons/barions/include/G4SigmacZero.hh +++ b/source/particles/hadrons/barions/include/G4SigmacZero.hh @@ -25,7 +25,7 @@ // // // $Id: G4SigmacZero.hh,v 1.12 2006/06/29 19:16:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4XiMinus.hh b/source/particles/hadrons/barions/include/G4XiMinus.hh index 277544ca82..4aeabc97bd 100644 --- a/source/particles/hadrons/barions/include/G4XiMinus.hh +++ b/source/particles/hadrons/barions/include/G4XiMinus.hh @@ -25,7 +25,7 @@ // // // $Id: G4XiMinus.hh,v 1.10 2006/06/29 19:16:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4XiZero.hh b/source/particles/hadrons/barions/include/G4XiZero.hh index 283a221643..ac14f7b2cd 100644 --- a/source/particles/hadrons/barions/include/G4XiZero.hh +++ b/source/particles/hadrons/barions/include/G4XiZero.hh @@ -25,7 +25,7 @@ // // // $Id: G4XiZero.hh,v 1.13 2006/06/29 19:16:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4XicPlus.hh b/source/particles/hadrons/barions/include/G4XicPlus.hh index 1f14752356..430062dd9b 100644 --- a/source/particles/hadrons/barions/include/G4XicPlus.hh +++ b/source/particles/hadrons/barions/include/G4XicPlus.hh @@ -25,7 +25,7 @@ // // // $Id: G4XicPlus.hh,v 1.9 2006/06/29 19:16:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/include/G4XicZero.hh b/source/particles/hadrons/barions/include/G4XicZero.hh index e36912a92b..bd537f279f 100644 --- a/source/particles/hadrons/barions/include/G4XicZero.hh +++ b/source/particles/hadrons/barions/include/G4XicZero.hh @@ -25,7 +25,7 @@ // // // $Id: G4XicZero.hh,v 1.12 2006/06/29 19:16:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/barions/src/G4AntiLambda.cc b/source/particles/hadrons/barions/src/G4AntiLambda.cc index c29b3f0eb8..efac0bb426 100644 --- a/source/particles/hadrons/barions/src/G4AntiLambda.cc +++ b/source/particles/hadrons/barions/src/G4AntiLambda.cc @@ -25,7 +25,7 @@ // // // $Id: G4AntiLambda.cc,v 1.17 2006/06/29 19:16:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/barions/src/G4AntiLambdacPlus.cc b/source/particles/hadrons/barions/src/G4AntiLambdacPlus.cc index e99ccd5d90..51cb57f041 100644 --- a/source/particles/hadrons/barions/src/G4AntiLambdacPlus.cc +++ b/source/particles/hadrons/barions/src/G4AntiLambdacPlus.cc @@ -25,7 +25,7 @@ // // // $Id: G4AntiLambdacPlus.cc,v 1.13 2006/06/29 19:16:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/barions/src/G4AntiNeutron.cc b/source/particles/hadrons/barions/src/G4AntiNeutron.cc index 0fb3bb38de..164d941bfc 100644 --- a/source/particles/hadrons/barions/src/G4AntiNeutron.cc +++ b/source/particles/hadrons/barions/src/G4AntiNeutron.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4AntiNeutron.cc,v 1.19 2006/06/29 19:16:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4AntiNeutron.cc,v 1.20 2006/10/12 10:59:44 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- @@ -65,7 +65,7 @@ G4AntiNeutron* G4AntiNeutron::Definition() // stable lifetime decay table // shortlived subType anti_encoding anInstance = new G4ParticleDefinition( - name, 0.93956563*GeV, 7.431e-28*GeV, 0.0, + name, 0.93956563*GeV, 7.432e-28*GeV, 0.0, 1, +1, 0, 1, +1, 0, "baryon", 0, -1, -2112, diff --git a/source/particles/hadrons/barions/src/G4AntiOmegaMinus.cc b/source/particles/hadrons/barions/src/G4AntiOmegaMinus.cc index 45bb87cc67..53293e1f06 100644 --- a/source/particles/hadrons/barions/src/G4AntiOmegaMinus.cc +++ b/source/particles/hadrons/barions/src/G4AntiOmegaMinus.cc @@ -25,7 +25,7 @@ // // // $Id: G4AntiOmegaMinus.cc,v 1.13 2006/06/29 19:16:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/barions/src/G4AntiOmegacZero.cc b/source/particles/hadrons/barions/src/G4AntiOmegacZero.cc index 3f7b248fc4..733981c1f7 100644 --- a/source/particles/hadrons/barions/src/G4AntiOmegacZero.cc +++ b/source/particles/hadrons/barions/src/G4AntiOmegacZero.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4AntiOmegacZero.cc,v 1.18 2006/06/29 19:16:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4AntiOmegacZero.cc,v 1.19 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- @@ -69,7 +69,7 @@ G4AntiOmegacZero* G4AntiOmegacZero::Definition() // shortlived subType anti_encoding anInstance = new G4ParticleDefinition( - name, 2.6975*GeV, 1.02e-8*MeV, 0.*eplus, + name, 2.6975*GeV, 9.6e-9*MeV, 0.*eplus, 1, +1, 0, 0, 0, 0, "baryon", 0, -1, -4332, diff --git a/source/particles/hadrons/barions/src/G4AntiProton.cc b/source/particles/hadrons/barions/src/G4AntiProton.cc index 9a28fcbd50..1979c014ee 100644 --- a/source/particles/hadrons/barions/src/G4AntiProton.cc +++ b/source/particles/hadrons/barions/src/G4AntiProton.cc @@ -25,7 +25,7 @@ // // // $Id: G4AntiProton.cc,v 1.12 2006/06/29 19:16:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/barions/src/G4AntiSigmaMinus.cc b/source/particles/hadrons/barions/src/G4AntiSigmaMinus.cc index 57914e63bd..11d81ed759 100644 --- a/source/particles/hadrons/barions/src/G4AntiSigmaMinus.cc +++ b/source/particles/hadrons/barions/src/G4AntiSigmaMinus.cc @@ -25,7 +25,7 @@ // // // $Id: G4AntiSigmaMinus.cc,v 1.13 2006/06/29 19:16:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/barions/src/G4AntiSigmaPlus.cc b/source/particles/hadrons/barions/src/G4AntiSigmaPlus.cc index 04c54d2b57..08150f1039 100644 --- a/source/particles/hadrons/barions/src/G4AntiSigmaPlus.cc +++ b/source/particles/hadrons/barions/src/G4AntiSigmaPlus.cc @@ -25,7 +25,7 @@ // // // $Id: G4AntiSigmaPlus.cc,v 1.13 2006/06/29 19:16:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/barions/src/G4AntiSigmaZero.cc b/source/particles/hadrons/barions/src/G4AntiSigmaZero.cc index b5036576cb..e27372c54a 100644 --- a/source/particles/hadrons/barions/src/G4AntiSigmaZero.cc +++ b/source/particles/hadrons/barions/src/G4AntiSigmaZero.cc @@ -25,7 +25,7 @@ // // // $Id: G4AntiSigmaZero.cc,v 1.17 2006/06/29 19:16:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/barions/src/G4AntiSigmacPlus.cc b/source/particles/hadrons/barions/src/G4AntiSigmacPlus.cc index 98deebed6b..53bcebcd67 100644 --- a/source/particles/hadrons/barions/src/G4AntiSigmacPlus.cc +++ b/source/particles/hadrons/barions/src/G4AntiSigmacPlus.cc @@ -25,7 +25,7 @@ // // // $Id: G4AntiSigmacPlus.cc,v 1.12 2006/06/29 19:16:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/barions/src/G4AntiSigmacPlusPlus.cc b/source/particles/hadrons/barions/src/G4AntiSigmacPlusPlus.cc index 0d4e128531..075643da5b 100644 --- a/source/particles/hadrons/barions/src/G4AntiSigmacPlusPlus.cc +++ b/source/particles/hadrons/barions/src/G4AntiSigmacPlusPlus.cc @@ -25,7 +25,7 @@ // // // $Id: G4AntiSigmacPlusPlus.cc,v 1.12 2006/06/29 19:16:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/barions/src/G4AntiSigmacZero.cc b/source/particles/hadrons/barions/src/G4AntiSigmacZero.cc index a19f100f4e..707bb7c56f 100644 --- a/source/particles/hadrons/barions/src/G4AntiSigmacZero.cc +++ b/source/particles/hadrons/barions/src/G4AntiSigmacZero.cc @@ -25,7 +25,7 @@ // // // $Id: G4AntiSigmacZero.cc,v 1.17 2006/06/29 19:16:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/barions/src/G4AntiXiMinus.cc b/source/particles/hadrons/barions/src/G4AntiXiMinus.cc index aa4bc7be80..e55c52ce36 100644 --- a/source/particles/hadrons/barions/src/G4AntiXiMinus.cc +++ b/source/particles/hadrons/barions/src/G4AntiXiMinus.cc @@ -25,7 +25,7 @@ // // // $Id: G4AntiXiMinus.cc,v 1.12 2006/06/29 19:16:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/barions/src/G4AntiXiZero.cc b/source/particles/hadrons/barions/src/G4AntiXiZero.cc index e322c4c5ed..7e2dcd3d93 100644 --- a/source/particles/hadrons/barions/src/G4AntiXiZero.cc +++ b/source/particles/hadrons/barions/src/G4AntiXiZero.cc @@ -25,7 +25,7 @@ // // // $Id: G4AntiXiZero.cc,v 1.18 2006/06/29 19:16:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/barions/src/G4AntiXicPlus.cc b/source/particles/hadrons/barions/src/G4AntiXicPlus.cc index b8157101c5..5f6a785980 100644 --- a/source/particles/hadrons/barions/src/G4AntiXicPlus.cc +++ b/source/particles/hadrons/barions/src/G4AntiXicPlus.cc @@ -25,7 +25,7 @@ // // // $Id: G4AntiXicPlus.cc,v 1.13 2006/06/29 19:16:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/barions/src/G4AntiXicZero.cc b/source/particles/hadrons/barions/src/G4AntiXicZero.cc index 027e489c11..3ccee6b239 100644 --- a/source/particles/hadrons/barions/src/G4AntiXicZero.cc +++ b/source/particles/hadrons/barions/src/G4AntiXicZero.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4AntiXicZero.cc,v 1.18 2006/06/29 19:16:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4AntiXicZero.cc,v 1.19 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- @@ -69,7 +69,7 @@ G4AntiXicZero* G4AntiXicZero::Definition() // shortlived subType anti_encoding anInstance = new G4ParticleDefinition( - name, 2.4710*GeV, 6.7e-9*MeV, 0.0, + name, 2.4710*GeV, 6.0e-9*MeV, 0.0, 1, +1, 0, 1, +1, 0, "baryon", 0, -1, -4132, diff --git a/source/particles/hadrons/barions/src/G4BaryonConstructor.cc b/source/particles/hadrons/barions/src/G4BaryonConstructor.cc index b0850782a1..cbc389ae5b 100644 --- a/source/particles/hadrons/barions/src/G4BaryonConstructor.cc +++ b/source/particles/hadrons/barions/src/G4BaryonConstructor.cc @@ -25,7 +25,7 @@ // // // $Id: G4BaryonConstructor.cc,v 1.4 2006/06/29 19:16:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/particles/hadrons/barions/src/G4Lambda.cc b/source/particles/hadrons/barions/src/G4Lambda.cc index 7855656e52..e9ccf83dc7 100644 --- a/source/particles/hadrons/barions/src/G4Lambda.cc +++ b/source/particles/hadrons/barions/src/G4Lambda.cc @@ -25,7 +25,7 @@ // // // $Id: G4Lambda.cc,v 1.17 2006/06/29 19:16:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/barions/src/G4LambdacPlus.cc b/source/particles/hadrons/barions/src/G4LambdacPlus.cc index fd50361d2f..e9bb1f0143 100644 --- a/source/particles/hadrons/barions/src/G4LambdacPlus.cc +++ b/source/particles/hadrons/barions/src/G4LambdacPlus.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4LambdacPlus.cc,v 1.13 2006/06/29 19:17:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4LambdacPlus.cc,v 1.14 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- @@ -69,7 +69,7 @@ G4LambdacPlus* G4LambdacPlus::Definition() // shortlived subType anti_encoding anInstance = new G4ParticleDefinition( - name, 2.2849*GeV, 3.30e-9*MeV, +1.*eplus, + name, 2.28646*GeV, 3.30e-9*MeV, +1.*eplus, 1, +1, 0, 0, 0, 0, "baryon", 0, +1, 4122, diff --git a/source/particles/hadrons/barions/src/G4Neutron.cc b/source/particles/hadrons/barions/src/G4Neutron.cc index 92755eb774..946e1c42c8 100644 --- a/source/particles/hadrons/barions/src/G4Neutron.cc +++ b/source/particles/hadrons/barions/src/G4Neutron.cc @@ -25,7 +25,7 @@ // // // $Id: G4Neutron.cc,v 1.20 2006/06/29 19:17:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/barions/src/G4OmegaMinus.cc b/source/particles/hadrons/barions/src/G4OmegaMinus.cc index e2ddea229b..9a63fca415 100644 --- a/source/particles/hadrons/barions/src/G4OmegaMinus.cc +++ b/source/particles/hadrons/barions/src/G4OmegaMinus.cc @@ -25,7 +25,7 @@ // // // $Id: G4OmegaMinus.cc,v 1.13 2006/06/29 19:17:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/barions/src/G4OmegacZero.cc b/source/particles/hadrons/barions/src/G4OmegacZero.cc index cfb9b72f98..0a1766e31e 100644 --- a/source/particles/hadrons/barions/src/G4OmegacZero.cc +++ b/source/particles/hadrons/barions/src/G4OmegacZero.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OmegacZero.cc,v 1.18 2006/06/29 19:17:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OmegacZero.cc,v 1.19 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- @@ -69,7 +69,7 @@ G4OmegacZero* G4OmegacZero::Definition() // shortlived subType anti_encoding anInstance = new G4ParticleDefinition( - name, 2.6975*GeV, 1.02e-8*MeV, 0.*eplus, + name, 2.6975*GeV, 9.6e-9*MeV, 0.*eplus, 1, +1, 0, 0, 0, 0, "baryon", 0, +1, 4332, diff --git a/source/particles/hadrons/barions/src/G4Proton.cc b/source/particles/hadrons/barions/src/G4Proton.cc index 409a2769f7..539b33d5e5 100644 --- a/source/particles/hadrons/barions/src/G4Proton.cc +++ b/source/particles/hadrons/barions/src/G4Proton.cc @@ -25,7 +25,7 @@ // // // $Id: G4Proton.cc,v 1.12 2006/06/29 19:17:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/barions/src/G4SigmaMinus.cc b/source/particles/hadrons/barions/src/G4SigmaMinus.cc index f58c47de41..52fb45394d 100644 --- a/source/particles/hadrons/barions/src/G4SigmaMinus.cc +++ b/source/particles/hadrons/barions/src/G4SigmaMinus.cc @@ -25,7 +25,7 @@ // // // $Id: G4SigmaMinus.cc,v 1.12 2006/06/29 19:17:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/barions/src/G4SigmaPlus.cc b/source/particles/hadrons/barions/src/G4SigmaPlus.cc index 12b70afc0a..4bdcf79ae8 100644 --- a/source/particles/hadrons/barions/src/G4SigmaPlus.cc +++ b/source/particles/hadrons/barions/src/G4SigmaPlus.cc @@ -25,7 +25,7 @@ // // // $Id: G4SigmaPlus.cc,v 1.13 2006/06/29 19:17:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/barions/src/G4SigmaZero.cc b/source/particles/hadrons/barions/src/G4SigmaZero.cc index f789ed9001..aa0e7c2d5a 100644 --- a/source/particles/hadrons/barions/src/G4SigmaZero.cc +++ b/source/particles/hadrons/barions/src/G4SigmaZero.cc @@ -25,7 +25,7 @@ // // // $Id: G4SigmaZero.cc,v 1.17 2006/06/29 19:17:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/barions/src/G4SigmacPlus.cc b/source/particles/hadrons/barions/src/G4SigmacPlus.cc index 5dbc474ead..6a7fe4d836 100644 --- a/source/particles/hadrons/barions/src/G4SigmacPlus.cc +++ b/source/particles/hadrons/barions/src/G4SigmacPlus.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4SigmacPlus.cc,v 1.12 2006/06/29 19:17:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4SigmacPlus.cc,v 1.13 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- @@ -69,7 +69,7 @@ G4SigmacPlus* G4SigmacPlus::Definition() // shortlived subType anti_encoding anInstance = new G4ParticleDefinition( - name, 2.4513*GeV, 2.2*MeV, +1.0*eplus, + name, 2.4529*GeV, 2.2*MeV, +1.0*eplus, 1, +1, 0, 2, +1, 0, "baryon", 0, +1, 4212, diff --git a/source/particles/hadrons/barions/src/G4SigmacPlusPlus.cc b/source/particles/hadrons/barions/src/G4SigmacPlusPlus.cc index 2668aef3a1..120be2ac92 100644 --- a/source/particles/hadrons/barions/src/G4SigmacPlusPlus.cc +++ b/source/particles/hadrons/barions/src/G4SigmacPlusPlus.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4SigmacPlusPlus.cc,v 1.12 2006/06/29 19:17:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4SigmacPlusPlus.cc,v 1.13 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- @@ -69,7 +69,7 @@ G4SigmacPlusPlus* G4SigmacPlusPlus::Definition() // shortlived subType anti_encoding anInstance = new G4ParticleDefinition( - name, 2.4525*GeV, 2.23*MeV, +2.0*eplus, + name, 2.45402*GeV, 2.23*MeV, +2.0*eplus, 1, +1, 0, 2, +2, 0, "baryon", 0, +1, 4222, diff --git a/source/particles/hadrons/barions/src/G4SigmacZero.cc b/source/particles/hadrons/barions/src/G4SigmacZero.cc index b1a50a7719..0a493054ad 100644 --- a/source/particles/hadrons/barions/src/G4SigmacZero.cc +++ b/source/particles/hadrons/barions/src/G4SigmacZero.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4SigmacZero.cc,v 1.17 2006/06/29 19:17:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4SigmacZero.cc,v 1.18 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- @@ -69,7 +69,7 @@ G4SigmacZero* G4SigmacZero::Definition() // shortlived subType anti_encoding anInstance = new G4ParticleDefinition( - name, 2.4522*GeV, 2.2*MeV, +0.0*eplus, + name, 2.45376*GeV, 2.2*MeV, +0.0*eplus, 1, +1, 0, 2, 0, 0, "baryon", 0, +1, 4112, diff --git a/source/particles/hadrons/barions/src/G4XiMinus.cc b/source/particles/hadrons/barions/src/G4XiMinus.cc index a080e1c684..515fa9cf40 100644 --- a/source/particles/hadrons/barions/src/G4XiMinus.cc +++ b/source/particles/hadrons/barions/src/G4XiMinus.cc @@ -25,7 +25,7 @@ // // // $Id: G4XiMinus.cc,v 1.12 2006/06/29 19:17:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/barions/src/G4XiZero.cc b/source/particles/hadrons/barions/src/G4XiZero.cc index 5dcd93a82a..3a5f7c22f0 100644 --- a/source/particles/hadrons/barions/src/G4XiZero.cc +++ b/source/particles/hadrons/barions/src/G4XiZero.cc @@ -25,7 +25,7 @@ // // // $Id: G4XiZero.cc,v 1.17 2006/06/29 19:17:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/barions/src/G4XicPlus.cc b/source/particles/hadrons/barions/src/G4XicPlus.cc index 0596df8a77..815db1f162 100644 --- a/source/particles/hadrons/barions/src/G4XicPlus.cc +++ b/source/particles/hadrons/barions/src/G4XicPlus.cc @@ -25,7 +25,7 @@ // // // $Id: G4XicPlus.cc,v 1.13 2006/06/29 19:17:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/barions/src/G4XicZero.cc b/source/particles/hadrons/barions/src/G4XicZero.cc index efbfb881ac..aceac82b3c 100644 --- a/source/particles/hadrons/barions/src/G4XicZero.cc +++ b/source/particles/hadrons/barions/src/G4XicZero.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4XicZero.cc,v 1.18 2006/06/29 19:17:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4XicZero.cc,v 1.19 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- @@ -69,7 +69,7 @@ G4XicZero* G4XicZero::Definition() // shortlived subType anti_encoding anInstance = new G4ParticleDefinition( - name, 2.4710*GeV, 6.7e-9*MeV, 0.0, + name, 2.4710*GeV, 5.9e-9*MeV, 0.0, 1, +1, 0, 1, -1, 0, "baryon", 0, +1, 4132, diff --git a/source/particles/hadrons/ions/include/G4Alpha.hh b/source/particles/hadrons/ions/include/G4Alpha.hh index 5c9f85e996..aca35251db 100644 --- a/source/particles/hadrons/ions/include/G4Alpha.hh +++ b/source/particles/hadrons/ions/include/G4Alpha.hh @@ -25,7 +25,7 @@ // // // $Id: G4Alpha.hh,v 1.11 2006/06/29 19:17:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/ions/include/G4Deuteron.hh b/source/particles/hadrons/ions/include/G4Deuteron.hh index 94c7442ac1..27d0480ab8 100644 --- a/source/particles/hadrons/ions/include/G4Deuteron.hh +++ b/source/particles/hadrons/ions/include/G4Deuteron.hh @@ -25,7 +25,7 @@ // // // $Id: G4Deuteron.hh,v 1.11 2006/06/29 19:17:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/ions/include/G4GenericIon.hh b/source/particles/hadrons/ions/include/G4GenericIon.hh index 9c468a5698..1a48ffd552 100644 --- a/source/particles/hadrons/ions/include/G4GenericIon.hh +++ b/source/particles/hadrons/ions/include/G4GenericIon.hh @@ -25,7 +25,7 @@ // // // $Id: G4GenericIon.hh,v 1.11 2006/06/29 19:17:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/ions/include/G4He3.hh b/source/particles/hadrons/ions/include/G4He3.hh index c4966c1955..a7b2e9e65f 100644 --- a/source/particles/hadrons/ions/include/G4He3.hh +++ b/source/particles/hadrons/ions/include/G4He3.hh @@ -25,7 +25,7 @@ // // // $Id: G4He3.hh,v 1.11 2006/06/29 19:17:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/ions/include/G4IonConstructor.hh b/source/particles/hadrons/ions/include/G4IonConstructor.hh index 8ddfb826bd..49e3f2e6f3 100644 --- a/source/particles/hadrons/ions/include/G4IonConstructor.hh +++ b/source/particles/hadrons/ions/include/G4IonConstructor.hh @@ -25,7 +25,7 @@ // // // $Id: G4IonConstructor.hh,v 1.5 2006/06/29 19:17:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/particles/hadrons/ions/include/G4Triton.hh b/source/particles/hadrons/ions/include/G4Triton.hh index ba8e09bf10..cb6067acad 100644 --- a/source/particles/hadrons/ions/include/G4Triton.hh +++ b/source/particles/hadrons/ions/include/G4Triton.hh @@ -25,7 +25,7 @@ // // // $Id: G4Triton.hh,v 1.11 2006/06/29 19:17:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/ions/src/G4Alpha.cc b/source/particles/hadrons/ions/src/G4Alpha.cc index 683cf79f1d..06ac0e171d 100644 --- a/source/particles/hadrons/ions/src/G4Alpha.cc +++ b/source/particles/hadrons/ions/src/G4Alpha.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Alpha.cc,v 1.12 2006/06/29 19:17:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Alpha.cc,v 1.13 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- @@ -69,12 +69,16 @@ G4Alpha* G4Alpha::Definition() name, 3.727417*GeV, 0.0*MeV, +2.0*eplus, 0, +1, 0, 0, 0, 0, - "nucleus", 0, +4, 0, + "nucleus", 0, +4, 1000020040, true, -1.0, NULL, false, "static", 0, 0.0 ); } + + //No Anti particle registered + anInstance->SetAntiPDGEncoding(0); + theInstance = reinterpret_cast(anInstance); return theInstance; } diff --git a/source/particles/hadrons/ions/src/G4Deuteron.cc b/source/particles/hadrons/ions/src/G4Deuteron.cc index 4c92ba1f31..63e48b7cb4 100644 --- a/source/particles/hadrons/ions/src/G4Deuteron.cc +++ b/source/particles/hadrons/ions/src/G4Deuteron.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Deuteron.cc,v 1.12 2006/06/29 19:17:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Deuteron.cc,v 1.13 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- @@ -69,12 +69,15 @@ G4Deuteron* G4Deuteron::Definition() name, 1.875613*GeV, 0.0*MeV, +1.0*eplus, 2, +1, 0, 0, 0, 0, - "nucleus", 0, +2, 0, + "nucleus", 0, +2, 1000010020, true, -1.0, NULL, false, "static", 0, 0.0 ); } + //No Anti particle registered + anInstance->SetAntiPDGEncoding(0); + theInstance = reinterpret_cast(anInstance); return theInstance; } diff --git a/source/particles/hadrons/ions/src/G4GenericIon.cc b/source/particles/hadrons/ions/src/G4GenericIon.cc index eac54bda1e..87f58329ac 100644 --- a/source/particles/hadrons/ions/src/G4GenericIon.cc +++ b/source/particles/hadrons/ions/src/G4GenericIon.cc @@ -25,7 +25,7 @@ // // // $Id: G4GenericIon.cc,v 1.13 2006/06/29 19:17:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/ions/src/G4He3.cc b/source/particles/hadrons/ions/src/G4He3.cc index 38b4dc2d61..152b1a7def 100644 --- a/source/particles/hadrons/ions/src/G4He3.cc +++ b/source/particles/hadrons/ions/src/G4He3.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4He3.cc,v 1.12 2006/06/29 19:17:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4He3.cc,v 1.13 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- @@ -69,12 +69,15 @@ G4He3* G4He3::Definition() name, 2.80923*GeV, 0.0*MeV, +2.0*eplus, 1, +1, 0, 0, 0, 0, - "nucleus", 0, +3, 0, + "nucleus", 0, +3, 1000020030, true, -1.0, NULL, false, "static", 0, 0.0 ); } + //No Anti particle registered + anInstance->SetAntiPDGEncoding(0); + theInstance = reinterpret_cast(anInstance); return theInstance; } diff --git a/source/particles/hadrons/ions/src/G4IonConstructor.cc b/source/particles/hadrons/ions/src/G4IonConstructor.cc index fea9f6f50b..c7e5a8d3dd 100644 --- a/source/particles/hadrons/ions/src/G4IonConstructor.cc +++ b/source/particles/hadrons/ions/src/G4IonConstructor.cc @@ -25,7 +25,7 @@ // // // $Id: G4IonConstructor.cc,v 1.4 2006/06/29 19:18:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/particles/hadrons/ions/src/G4Triton.cc b/source/particles/hadrons/ions/src/G4Triton.cc index 920f4fb06d..f3672e1028 100644 --- a/source/particles/hadrons/ions/src/G4Triton.cc +++ b/source/particles/hadrons/ions/src/G4Triton.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Triton.cc,v 1.12 2006/06/29 19:18:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Triton.cc,v 1.13 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- @@ -69,12 +69,15 @@ G4Triton* G4Triton::Definition() name, 2.80925*GeV, 0.0*MeV, +1.0*eplus, 1, +1, 0, 0, 0, 0, - "nucleus", 0, +3, 0, + "nucleus", 0, +3, 1000010030, true, -1.0, NULL, false, "static", 0, 0.0 ); } + //No Anti particle registered + anInstance->SetAntiPDGEncoding(0); + theInstance = reinterpret_cast(anInstance); return theInstance; } diff --git a/source/particles/hadrons/mesons/include/G4AntiBMesonZero.hh b/source/particles/hadrons/mesons/include/G4AntiBMesonZero.hh index 1e9e5bd25b..f0ce8577fc 100644 --- a/source/particles/hadrons/mesons/include/G4AntiBMesonZero.hh +++ b/source/particles/hadrons/mesons/include/G4AntiBMesonZero.hh @@ -25,7 +25,7 @@ // // // $Id: G4AntiBMesonZero.hh,v 1.11 2006/06/29 19:18:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/mesons/include/G4AntiBsMesonZero.hh b/source/particles/hadrons/mesons/include/G4AntiBsMesonZero.hh index 25f6858582..7420554f0d 100644 --- a/source/particles/hadrons/mesons/include/G4AntiBsMesonZero.hh +++ b/source/particles/hadrons/mesons/include/G4AntiBsMesonZero.hh @@ -25,7 +25,7 @@ // // // $Id: G4AntiBsMesonZero.hh,v 1.11 2006/06/29 19:18:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/mesons/include/G4AntiDMesonZero.hh b/source/particles/hadrons/mesons/include/G4AntiDMesonZero.hh index 26a7d84763..a5f1cd4558 100644 --- a/source/particles/hadrons/mesons/include/G4AntiDMesonZero.hh +++ b/source/particles/hadrons/mesons/include/G4AntiDMesonZero.hh @@ -25,7 +25,7 @@ // // // $Id: G4AntiDMesonZero.hh,v 1.11 2006/06/29 19:18:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/mesons/include/G4AntiKaonZero.hh b/source/particles/hadrons/mesons/include/G4AntiKaonZero.hh index c1b30ed260..69f6f922b1 100644 --- a/source/particles/hadrons/mesons/include/G4AntiKaonZero.hh +++ b/source/particles/hadrons/mesons/include/G4AntiKaonZero.hh @@ -25,7 +25,7 @@ // // // $Id: G4AntiKaonZero.hh,v 1.13 2006/06/29 19:18:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/mesons/include/G4BMesonMinus.hh b/source/particles/hadrons/mesons/include/G4BMesonMinus.hh index 2712ddbd27..606deaf5a2 100644 --- a/source/particles/hadrons/mesons/include/G4BMesonMinus.hh +++ b/source/particles/hadrons/mesons/include/G4BMesonMinus.hh @@ -25,7 +25,7 @@ // // // $Id: G4BMesonMinus.hh,v 1.8 2006/06/29 19:18:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/mesons/include/G4BMesonPlus.hh b/source/particles/hadrons/mesons/include/G4BMesonPlus.hh index 690c08f9b2..8901f03b27 100644 --- a/source/particles/hadrons/mesons/include/G4BMesonPlus.hh +++ b/source/particles/hadrons/mesons/include/G4BMesonPlus.hh @@ -25,7 +25,7 @@ // // // $Id: G4BMesonPlus.hh,v 1.8 2006/06/29 19:18:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/mesons/include/G4BMesonZero.hh b/source/particles/hadrons/mesons/include/G4BMesonZero.hh index 267fa30960..fd2133cf55 100644 --- a/source/particles/hadrons/mesons/include/G4BMesonZero.hh +++ b/source/particles/hadrons/mesons/include/G4BMesonZero.hh @@ -25,7 +25,7 @@ // // // $Id: G4BMesonZero.hh,v 1.11 2006/06/29 19:18:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/mesons/include/G4BsMesonZero.hh b/source/particles/hadrons/mesons/include/G4BsMesonZero.hh index e07e44ad92..5481f4ebe0 100644 --- a/source/particles/hadrons/mesons/include/G4BsMesonZero.hh +++ b/source/particles/hadrons/mesons/include/G4BsMesonZero.hh @@ -25,7 +25,7 @@ // // // $Id: G4BsMesonZero.hh,v 1.11 2006/06/29 19:18:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/mesons/include/G4DMesonMinus.hh b/source/particles/hadrons/mesons/include/G4DMesonMinus.hh index 0afedc18f7..840ec1db2a 100644 --- a/source/particles/hadrons/mesons/include/G4DMesonMinus.hh +++ b/source/particles/hadrons/mesons/include/G4DMesonMinus.hh @@ -25,7 +25,7 @@ // // // $Id: G4DMesonMinus.hh,v 1.8 2006/06/29 19:18:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/mesons/include/G4DMesonPlus.hh b/source/particles/hadrons/mesons/include/G4DMesonPlus.hh index d1c7eb33c2..4c1dfc24b3 100644 --- a/source/particles/hadrons/mesons/include/G4DMesonPlus.hh +++ b/source/particles/hadrons/mesons/include/G4DMesonPlus.hh @@ -25,7 +25,7 @@ // // // $Id: G4DMesonPlus.hh,v 1.8 2006/06/29 19:18:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/mesons/include/G4DMesonZero.hh b/source/particles/hadrons/mesons/include/G4DMesonZero.hh index 93c92c5b71..f82957f945 100644 --- a/source/particles/hadrons/mesons/include/G4DMesonZero.hh +++ b/source/particles/hadrons/mesons/include/G4DMesonZero.hh @@ -25,7 +25,7 @@ // // // $Id: G4DMesonZero.hh,v 1.11 2006/06/29 19:18:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/mesons/include/G4DsMesonMinus.hh b/source/particles/hadrons/mesons/include/G4DsMesonMinus.hh index ea80482e88..8699239f23 100644 --- a/source/particles/hadrons/mesons/include/G4DsMesonMinus.hh +++ b/source/particles/hadrons/mesons/include/G4DsMesonMinus.hh @@ -25,7 +25,7 @@ // // // $Id: G4DsMesonMinus.hh,v 1.8 2006/06/29 19:18:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/mesons/include/G4DsMesonPlus.hh b/source/particles/hadrons/mesons/include/G4DsMesonPlus.hh index 2c04d10356..6780d1f208 100644 --- a/source/particles/hadrons/mesons/include/G4DsMesonPlus.hh +++ b/source/particles/hadrons/mesons/include/G4DsMesonPlus.hh @@ -25,7 +25,7 @@ // // // $Id: G4DsMesonPlus.hh,v 1.8 2006/06/29 19:18:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/mesons/include/G4Eta.hh b/source/particles/hadrons/mesons/include/G4Eta.hh index 8f6831c854..b434843f62 100644 --- a/source/particles/hadrons/mesons/include/G4Eta.hh +++ b/source/particles/hadrons/mesons/include/G4Eta.hh @@ -25,7 +25,7 @@ // // // $Id: G4Eta.hh,v 1.12 2006/06/29 19:18:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/mesons/include/G4EtaPrime.hh b/source/particles/hadrons/mesons/include/G4EtaPrime.hh index 59426640f7..c57e62398d 100644 --- a/source/particles/hadrons/mesons/include/G4EtaPrime.hh +++ b/source/particles/hadrons/mesons/include/G4EtaPrime.hh @@ -25,7 +25,7 @@ // // // $Id: G4EtaPrime.hh,v 1.12 2006/06/29 19:18:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/mesons/include/G4JPsi.hh b/source/particles/hadrons/mesons/include/G4JPsi.hh index 67a7964509..9bb3ede8ed 100644 --- a/source/particles/hadrons/mesons/include/G4JPsi.hh +++ b/source/particles/hadrons/mesons/include/G4JPsi.hh @@ -25,7 +25,7 @@ // // // $Id: G4JPsi.hh,v 1.11 2006/06/29 19:18:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/mesons/include/G4KaonMinus.hh b/source/particles/hadrons/mesons/include/G4KaonMinus.hh index 226c7ac128..35aec12fc3 100644 --- a/source/particles/hadrons/mesons/include/G4KaonMinus.hh +++ b/source/particles/hadrons/mesons/include/G4KaonMinus.hh @@ -25,7 +25,7 @@ // // // $Id: G4KaonMinus.hh,v 1.10 2006/06/29 19:18:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/mesons/include/G4KaonPlus.hh b/source/particles/hadrons/mesons/include/G4KaonPlus.hh index 18da9bdca4..c82db92e9d 100644 --- a/source/particles/hadrons/mesons/include/G4KaonPlus.hh +++ b/source/particles/hadrons/mesons/include/G4KaonPlus.hh @@ -25,7 +25,7 @@ // // // $Id: G4KaonPlus.hh,v 1.10 2006/06/29 19:18:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/mesons/include/G4KaonZero.hh b/source/particles/hadrons/mesons/include/G4KaonZero.hh index 2627638a97..c06f6e6f21 100644 --- a/source/particles/hadrons/mesons/include/G4KaonZero.hh +++ b/source/particles/hadrons/mesons/include/G4KaonZero.hh @@ -25,7 +25,7 @@ // // // $Id: G4KaonZero.hh,v 1.13 2006/06/29 19:18:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/mesons/include/G4KaonZeroLong.hh b/source/particles/hadrons/mesons/include/G4KaonZeroLong.hh index 3637ab03b1..9e060fbcf7 100644 --- a/source/particles/hadrons/mesons/include/G4KaonZeroLong.hh +++ b/source/particles/hadrons/mesons/include/G4KaonZeroLong.hh @@ -25,7 +25,7 @@ // // // $Id: G4KaonZeroLong.hh,v 1.12 2006/06/29 19:18:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/mesons/include/G4KaonZeroShort.hh b/source/particles/hadrons/mesons/include/G4KaonZeroShort.hh index 3b81dc6440..18be82914c 100644 --- a/source/particles/hadrons/mesons/include/G4KaonZeroShort.hh +++ b/source/particles/hadrons/mesons/include/G4KaonZeroShort.hh @@ -25,7 +25,7 @@ // // // $Id: G4KaonZeroShort.hh,v 1.12 2006/06/29 19:18:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/mesons/include/G4MesonConstructor.hh b/source/particles/hadrons/mesons/include/G4MesonConstructor.hh index e034dd62db..a79bbc88b3 100644 --- a/source/particles/hadrons/mesons/include/G4MesonConstructor.hh +++ b/source/particles/hadrons/mesons/include/G4MesonConstructor.hh @@ -25,7 +25,7 @@ // // // $Id: G4MesonConstructor.hh,v 1.5 2006/06/29 19:18:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/particles/hadrons/mesons/include/G4PionMinus.hh b/source/particles/hadrons/mesons/include/G4PionMinus.hh index 2b84faa46f..308c152e3e 100644 --- a/source/particles/hadrons/mesons/include/G4PionMinus.hh +++ b/source/particles/hadrons/mesons/include/G4PionMinus.hh @@ -25,7 +25,7 @@ // // // $Id: G4PionMinus.hh,v 1.10 2006/06/29 19:18:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/mesons/include/G4PionPlus.hh b/source/particles/hadrons/mesons/include/G4PionPlus.hh index 424d6accee..0ebab402d0 100644 --- a/source/particles/hadrons/mesons/include/G4PionPlus.hh +++ b/source/particles/hadrons/mesons/include/G4PionPlus.hh @@ -25,7 +25,7 @@ // // // $Id: G4PionPlus.hh,v 1.10 2006/06/29 19:18:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/mesons/include/G4PionZero.hh b/source/particles/hadrons/mesons/include/G4PionZero.hh index 96097f44bc..4f013fce58 100644 --- a/source/particles/hadrons/mesons/include/G4PionZero.hh +++ b/source/particles/hadrons/mesons/include/G4PionZero.hh @@ -25,7 +25,7 @@ // // // $Id: G4PionZero.hh,v 1.13 2006/06/29 19:19:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/hadrons/mesons/src/G4AntiBMesonZero.cc b/source/particles/hadrons/mesons/src/G4AntiBMesonZero.cc index cda22ed11e..866c7522c0 100644 --- a/source/particles/hadrons/mesons/src/G4AntiBMesonZero.cc +++ b/source/particles/hadrons/mesons/src/G4AntiBMesonZero.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4AntiBMesonZero.cc,v 1.18 2006/06/29 19:19:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4AntiBMesonZero.cc,v 1.19 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- @@ -65,7 +65,7 @@ G4AntiBMesonZero* G4AntiBMesonZero::Definition() // shortlived subType anti_encoding anInstance = new G4ParticleDefinition( - name, 5.2794*GeV, 4.29e-10*MeV, 0., + name, 5.2794*GeV, 4.302e-10*MeV, 0., 0, -1, 0, 1, +1, 0, "meson", 0, 0, -511, diff --git a/source/particles/hadrons/mesons/src/G4AntiBsMesonZero.cc b/source/particles/hadrons/mesons/src/G4AntiBsMesonZero.cc index 7cb2c98c4e..673d26523e 100644 --- a/source/particles/hadrons/mesons/src/G4AntiBsMesonZero.cc +++ b/source/particles/hadrons/mesons/src/G4AntiBsMesonZero.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4AntiBsMesonZero.cc,v 1.17 2006/06/29 19:19:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4AntiBsMesonZero.cc,v 1.18 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- @@ -65,7 +65,7 @@ G4AntiBsMesonZero* G4AntiBsMesonZero::Definition() // shortlived subType anti_encoding anInstance = new G4ParticleDefinition( - name, 5.3696*GeV, 4.51e-10*MeV, 0., + name, 5.3675*GeV, 4.49e-10*MeV, 0., 0, -1, 0, 0, 0, 0, "meson", 0, 0, -531, diff --git a/source/particles/hadrons/mesons/src/G4AntiDMesonZero.cc b/source/particles/hadrons/mesons/src/G4AntiDMesonZero.cc index 8d6a68052a..d3a8cc463b 100644 --- a/source/particles/hadrons/mesons/src/G4AntiDMesonZero.cc +++ b/source/particles/hadrons/mesons/src/G4AntiDMesonZero.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4AntiDMesonZero.cc,v 1.17 2006/06/29 19:19:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4AntiDMesonZero.cc,v 1.18 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- @@ -65,7 +65,7 @@ G4AntiDMesonZero* G4AntiDMesonZero::Definition() // shortlived subType anti_encoding anInstance = new G4ParticleDefinition( - name, 1.8645*GeV, 1.604e-9*MeV, 0., + name, 1.8645*GeV, 1.605e-9*MeV, 0., 0, -1, 0, 1, +1, 0, "meson", 0, 0, -421, diff --git a/source/particles/hadrons/mesons/src/G4AntiKaonZero.cc b/source/particles/hadrons/mesons/src/G4AntiKaonZero.cc index 82309a79f8..8f455f8a2d 100644 --- a/source/particles/hadrons/mesons/src/G4AntiKaonZero.cc +++ b/source/particles/hadrons/mesons/src/G4AntiKaonZero.cc @@ -25,7 +25,7 @@ // // // $Id: G4AntiKaonZero.cc,v 1.15 2006/06/29 19:19:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/mesons/src/G4BMesonMinus.cc b/source/particles/hadrons/mesons/src/G4BMesonMinus.cc index 85d974c6a9..fca4809964 100644 --- a/source/particles/hadrons/mesons/src/G4BMesonMinus.cc +++ b/source/particles/hadrons/mesons/src/G4BMesonMinus.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4BMesonMinus.cc,v 1.13 2006/06/29 19:19:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4BMesonMinus.cc,v 1.14 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- @@ -66,7 +66,7 @@ G4BMesonMinus* G4BMesonMinus::Definition() // shortlived subType anti_encoding anInstance = new G4ParticleDefinition( - name, 5.2790*GeV, 3.94e-10*MeV, -1.*eplus, + name, 5.2790*GeV, 4.018e-10*MeV, -1.*eplus, 0, -1, 0, 1, -1, 0, "meson", 0, 0, -521, diff --git a/source/particles/hadrons/mesons/src/G4BMesonPlus.cc b/source/particles/hadrons/mesons/src/G4BMesonPlus.cc index b1500bda8a..d6363d8372 100644 --- a/source/particles/hadrons/mesons/src/G4BMesonPlus.cc +++ b/source/particles/hadrons/mesons/src/G4BMesonPlus.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4BMesonPlus.cc,v 1.13 2006/06/29 19:19:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4BMesonPlus.cc,v 1.14 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- @@ -66,7 +66,7 @@ G4BMesonPlus* G4BMesonPlus::Definition() // shortlived subType anti_encoding anInstance = new G4ParticleDefinition( - name, 5.2790*GeV, 3.94e-10*MeV, +1.*eplus, + name, 5.2790*GeV, 4.018e-10*MeV, +1.*eplus, 0, -1, 0, 1, +1, 0, "meson", 0, 0, 521, diff --git a/source/particles/hadrons/mesons/src/G4BMesonZero.cc b/source/particles/hadrons/mesons/src/G4BMesonZero.cc index 25bac2027b..6668612995 100644 --- a/source/particles/hadrons/mesons/src/G4BMesonZero.cc +++ b/source/particles/hadrons/mesons/src/G4BMesonZero.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4BMesonZero.cc,v 1.18 2006/06/29 19:19:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4BMesonZero.cc,v 1.19 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- @@ -65,7 +65,7 @@ G4BMesonZero* G4BMesonZero::Definition() // shortlived subType anti_encoding anInstance = new G4ParticleDefinition( - name, 5.2794*GeV, 4.29e-10*MeV, 0., + name, 5.2794*GeV, 4.302e-10*MeV, 0., 0, -1, 0, 1, -1, 0, "meson", 0, 0, 511, diff --git a/source/particles/hadrons/mesons/src/G4BsMesonZero.cc b/source/particles/hadrons/mesons/src/G4BsMesonZero.cc index 19af93570c..9d71c3d091 100644 --- a/source/particles/hadrons/mesons/src/G4BsMesonZero.cc +++ b/source/particles/hadrons/mesons/src/G4BsMesonZero.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4BsMesonZero.cc,v 1.17 2006/06/29 19:19:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4BsMesonZero.cc,v 1.18 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- @@ -65,7 +65,7 @@ G4BsMesonZero* G4BsMesonZero::Definition() // shortlived subType anti_encoding anInstance = new G4ParticleDefinition( - name, 5.3696*GeV, 4.51e-10*MeV, 0., + name, 5.3675*GeV, 4.49e-10*MeV, 0., 0, -1, 0, 0, 0, 0, "meson", 0, 0, 531, diff --git a/source/particles/hadrons/mesons/src/G4DMesonMinus.cc b/source/particles/hadrons/mesons/src/G4DMesonMinus.cc index 185cfd6ed0..b562500976 100644 --- a/source/particles/hadrons/mesons/src/G4DMesonMinus.cc +++ b/source/particles/hadrons/mesons/src/G4DMesonMinus.cc @@ -25,7 +25,7 @@ // // // $Id: G4DMesonMinus.cc,v 1.13 2006/06/29 19:19:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/mesons/src/G4DMesonPlus.cc b/source/particles/hadrons/mesons/src/G4DMesonPlus.cc index 9d494c239e..9fab2a3f58 100644 --- a/source/particles/hadrons/mesons/src/G4DMesonPlus.cc +++ b/source/particles/hadrons/mesons/src/G4DMesonPlus.cc @@ -25,7 +25,7 @@ // // // $Id: G4DMesonPlus.cc,v 1.13 2006/06/29 19:19:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/mesons/src/G4DMesonZero.cc b/source/particles/hadrons/mesons/src/G4DMesonZero.cc index 9f8ddd13e7..c6f521d84c 100644 --- a/source/particles/hadrons/mesons/src/G4DMesonZero.cc +++ b/source/particles/hadrons/mesons/src/G4DMesonZero.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4DMesonZero.cc,v 1.18 2006/06/29 19:19:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4DMesonZero.cc,v 1.19 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- @@ -64,7 +64,7 @@ G4DMesonZero* G4DMesonZero::Definition() // stable lifetime decay table // shortlived subType anti_encoding anInstance = new G4ParticleDefinition( - name, 1.8645*GeV, 1.604e-9*MeV, 0., + name, 1.8645*GeV, 1.605e-9*MeV, 0., 0, -1, 0, 1, -1, 0, "meson", 0, 0, 421, diff --git a/source/particles/hadrons/mesons/src/G4DsMesonMinus.cc b/source/particles/hadrons/mesons/src/G4DsMesonMinus.cc index 65749a0d29..c63d8e9712 100644 --- a/source/particles/hadrons/mesons/src/G4DsMesonMinus.cc +++ b/source/particles/hadrons/mesons/src/G4DsMesonMinus.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4DsMesonMinus.cc,v 1.12 2006/06/29 19:19:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4DsMesonMinus.cc,v 1.13 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- @@ -65,7 +65,7 @@ G4DsMesonMinus* G4DsMesonMinus::Definition() // stable lifetime decay table // shortlived subType anti_encoding anInstance = new G4ParticleDefinition( - name, 1.9682*GeV, 1.342e-9*MeV, -1.*eplus, + name, 1.9682*GeV, 1.317e-9*MeV, -1.*eplus, 0, -1, 0, 0, 0, 0, "meson", 0, 0, -431, diff --git a/source/particles/hadrons/mesons/src/G4DsMesonPlus.cc b/source/particles/hadrons/mesons/src/G4DsMesonPlus.cc index 1d42626e83..96e2129c09 100644 --- a/source/particles/hadrons/mesons/src/G4DsMesonPlus.cc +++ b/source/particles/hadrons/mesons/src/G4DsMesonPlus.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4DsMesonPlus.cc,v 1.12 2006/06/29 19:19:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4DsMesonPlus.cc,v 1.13 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- @@ -65,7 +65,7 @@ G4DsMesonPlus* G4DsMesonPlus::Definition() // stable lifetime decay table // shortlived subType anti_encoding anInstance = new G4ParticleDefinition( - name, 1.9682*GeV, 1.342e-9*MeV, +1.*eplus, + name, 1.9682*GeV, 1.317e-9*MeV, +1.*eplus, 0, -1, 0, 0, 0, 0, "meson", 0, 0, 431, diff --git a/source/particles/hadrons/mesons/src/G4Eta.cc b/source/particles/hadrons/mesons/src/G4Eta.cc index 17e66ece64..9fa7471c90 100644 --- a/source/particles/hadrons/mesons/src/G4Eta.cc +++ b/source/particles/hadrons/mesons/src/G4Eta.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Eta.cc,v 1.17 2006/06/29 19:19:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Eta.cc,v 1.18 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- @@ -37,6 +37,8 @@ // ********************************************************************** // New impelemenataion as an utility class M.Asai, 26 July 2004 // ---------------------------------------------------------------------- +// Update mass (PDG2006) Oct. 11 2006 H.Kurashige +// #include "G4Eta.hh" #include "G4ParticleTable.hh" @@ -70,7 +72,7 @@ G4Eta* G4Eta::Definition() // shortlived subType anti_encoding anInstance = new G4ParticleDefinition( - name, 0.54775*GeV, 1.29*keV, 0.0, + name, 0.54751*GeV, 1.30*keV, 0.0, 0, -1, +1, 0, 0, +1, "meson", 0, 0, 221, diff --git a/source/particles/hadrons/mesons/src/G4EtaPrime.cc b/source/particles/hadrons/mesons/src/G4EtaPrime.cc index 0d95a491cc..6168de2ab0 100644 --- a/source/particles/hadrons/mesons/src/G4EtaPrime.cc +++ b/source/particles/hadrons/mesons/src/G4EtaPrime.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4EtaPrime.cc,v 1.17 2006/06/29 19:19:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4EtaPrime.cc,v 1.18 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------- @@ -35,6 +35,8 @@ // ********************************************************************** // New impelemenataion as an utility class M.Asai, 26 July 2004 // ---------------------------------------------------------------------- +// Update mass (PDG2006) Oct. 11 2006 H.Kurashige +// #include "G4EtaPrime.hh" #include "G4ParticleTable.hh" @@ -68,7 +70,7 @@ G4EtaPrime* G4EtaPrime::Definition() // shortlived subType anti_encoding anInstance = new G4ParticleDefinition( - name, 0.95777*GeV, 0.202*MeV, 0.0, + name, 0.95778*GeV, 0.203*MeV, 0.0, 0, -1, +1, 0, 0, +1, "meson", 0, 0, 331, diff --git a/source/particles/hadrons/mesons/src/G4JPsi.cc b/source/particles/hadrons/mesons/src/G4JPsi.cc index a6276a9e72..ead217ad8d 100644 --- a/source/particles/hadrons/mesons/src/G4JPsi.cc +++ b/source/particles/hadrons/mesons/src/G4JPsi.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4JPsi.cc,v 1.16 2006/06/29 19:19:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4JPsi.cc,v 1.17 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- @@ -65,7 +65,7 @@ G4JPsi* G4JPsi::Definition() // shortlived subType anti_encoding anInstance = new G4ParticleDefinition( - name, 3.096916*GeV, 0.0910*MeV, 0., + name, 3.096916*GeV, 0.0934*MeV, 0., 2, -1, -1, 0, 0, -1, "meson", 0, 0, 443, diff --git a/source/particles/hadrons/mesons/src/G4KaonMinus.cc b/source/particles/hadrons/mesons/src/G4KaonMinus.cc index 8e5ffe6817..d0f9b3df08 100644 --- a/source/particles/hadrons/mesons/src/G4KaonMinus.cc +++ b/source/particles/hadrons/mesons/src/G4KaonMinus.cc @@ -25,7 +25,7 @@ // // // $Id: G4KaonMinus.cc,v 1.14 2006/06/29 19:19:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/mesons/src/G4KaonPlus.cc b/source/particles/hadrons/mesons/src/G4KaonPlus.cc index 1890caaf86..6d2ff58590 100644 --- a/source/particles/hadrons/mesons/src/G4KaonPlus.cc +++ b/source/particles/hadrons/mesons/src/G4KaonPlus.cc @@ -25,7 +25,7 @@ // // // $Id: G4KaonPlus.cc,v 1.13 2006/06/29 19:19:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/mesons/src/G4KaonZero.cc b/source/particles/hadrons/mesons/src/G4KaonZero.cc index 274739d9e0..358316ad1b 100644 --- a/source/particles/hadrons/mesons/src/G4KaonZero.cc +++ b/source/particles/hadrons/mesons/src/G4KaonZero.cc @@ -25,7 +25,7 @@ // // // $Id: G4KaonZero.cc,v 1.15 2006/06/29 19:19:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/mesons/src/G4KaonZeroLong.cc b/source/particles/hadrons/mesons/src/G4KaonZeroLong.cc index ad8a4cca81..58ac4dfa56 100644 --- a/source/particles/hadrons/mesons/src/G4KaonZeroLong.cc +++ b/source/particles/hadrons/mesons/src/G4KaonZeroLong.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4KaonZeroLong.cc,v 1.17 2006/06/29 19:19:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4KaonZeroLong.cc,v 1.18 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- @@ -37,6 +37,8 @@ // ********************************************************************** // New impelemenataion as an utility class M.Asai, 26 July 2004 // ---------------------------------------------------------------------- +// Update width (PDG2006) Oct. 11 2006 H.Kurashige +// #include "G4KaonZeroLong.hh" #include "G4ParticleTable.hh" @@ -71,7 +73,7 @@ G4KaonZeroLong* G4KaonZeroLong::Definition() // shortlived subType anti_encoding anInstance = new G4ParticleDefinition( - name, 0.497672*GeV, 1.273e-14*MeV, 0.0, + name, 0.497672*GeV, 1.287e-14*MeV, 0.0, 0, -1, 0, 1, 0, 0, "meson", 0, 0, 130, diff --git a/source/particles/hadrons/mesons/src/G4KaonZeroShort.cc b/source/particles/hadrons/mesons/src/G4KaonZeroShort.cc index 4bc9b7914b..345e3a1a45 100644 --- a/source/particles/hadrons/mesons/src/G4KaonZeroShort.cc +++ b/source/particles/hadrons/mesons/src/G4KaonZeroShort.cc @@ -25,7 +25,7 @@ // // // $Id: G4KaonZeroShort.cc,v 1.17 2006/06/29 19:19:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/mesons/src/G4MesonConstructor.cc b/source/particles/hadrons/mesons/src/G4MesonConstructor.cc index f67c88daf9..ea6057e2fb 100644 --- a/source/particles/hadrons/mesons/src/G4MesonConstructor.cc +++ b/source/particles/hadrons/mesons/src/G4MesonConstructor.cc @@ -25,7 +25,7 @@ // // // $Id: G4MesonConstructor.cc,v 1.5 2006/06/29 19:19:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/particles/hadrons/mesons/src/G4PionMinus.cc b/source/particles/hadrons/mesons/src/G4PionMinus.cc index 81529b4afd..bd75044373 100644 --- a/source/particles/hadrons/mesons/src/G4PionMinus.cc +++ b/source/particles/hadrons/mesons/src/G4PionMinus.cc @@ -25,7 +25,7 @@ // // // $Id: G4PionMinus.cc,v 1.11 2006/06/29 19:19:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/mesons/src/G4PionPlus.cc b/source/particles/hadrons/mesons/src/G4PionPlus.cc index 783613b117..d6d87c5381 100644 --- a/source/particles/hadrons/mesons/src/G4PionPlus.cc +++ b/source/particles/hadrons/mesons/src/G4PionPlus.cc @@ -25,7 +25,7 @@ // // // $Id: G4PionPlus.cc,v 1.12 2006/06/29 19:20:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/hadrons/mesons/src/G4PionZero.cc b/source/particles/hadrons/mesons/src/G4PionZero.cc index 70e43d3cc9..1377458ea5 100644 --- a/source/particles/hadrons/mesons/src/G4PionZero.cc +++ b/source/particles/hadrons/mesons/src/G4PionZero.cc @@ -25,7 +25,7 @@ // // // $Id: G4PionZero.cc,v 1.16 2006/06/29 19:20:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/leptons/include/G4AntiNeutrinoE.hh b/source/particles/leptons/include/G4AntiNeutrinoE.hh index 8d5aa25232..589524564e 100644 --- a/source/particles/leptons/include/G4AntiNeutrinoE.hh +++ b/source/particles/leptons/include/G4AntiNeutrinoE.hh @@ -25,7 +25,7 @@ // // // $Id: G4AntiNeutrinoE.hh,v 1.12 2006/06/29 19:20:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/leptons/include/G4AntiNeutrinoMu.hh b/source/particles/leptons/include/G4AntiNeutrinoMu.hh index 75618bfe23..7a07388443 100644 --- a/source/particles/leptons/include/G4AntiNeutrinoMu.hh +++ b/source/particles/leptons/include/G4AntiNeutrinoMu.hh @@ -25,7 +25,7 @@ // // // $Id: G4AntiNeutrinoMu.hh,v 1.12 2006/06/29 19:20:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/leptons/include/G4AntiNeutrinoTau.hh b/source/particles/leptons/include/G4AntiNeutrinoTau.hh index 96baea1569..fa299568e5 100644 --- a/source/particles/leptons/include/G4AntiNeutrinoTau.hh +++ b/source/particles/leptons/include/G4AntiNeutrinoTau.hh @@ -25,7 +25,7 @@ // // // $Id: G4AntiNeutrinoTau.hh,v 1.13 2006/06/29 19:20:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/leptons/include/G4Electron.hh b/source/particles/leptons/include/G4Electron.hh index 7d329f1e69..30eeeb8f15 100644 --- a/source/particles/leptons/include/G4Electron.hh +++ b/source/particles/leptons/include/G4Electron.hh @@ -25,7 +25,7 @@ // // // $Id: G4Electron.hh,v 1.12 2006/06/29 19:20:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/leptons/include/G4LeptonConstructor.hh b/source/particles/leptons/include/G4LeptonConstructor.hh index 2cf9a18632..7055fa6c01 100644 --- a/source/particles/leptons/include/G4LeptonConstructor.hh +++ b/source/particles/leptons/include/G4LeptonConstructor.hh @@ -25,7 +25,7 @@ // // // $Id: G4LeptonConstructor.hh,v 1.6 2006/06/29 19:20:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/particles/leptons/include/G4MuonMinus.hh b/source/particles/leptons/include/G4MuonMinus.hh index 4030cab1dc..b234772837 100644 --- a/source/particles/leptons/include/G4MuonMinus.hh +++ b/source/particles/leptons/include/G4MuonMinus.hh @@ -25,7 +25,7 @@ // // // $Id: G4MuonMinus.hh,v 1.11 2006/06/29 19:20:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/leptons/include/G4MuonPlus.hh b/source/particles/leptons/include/G4MuonPlus.hh index bfda66c4a6..983cbcd44c 100644 --- a/source/particles/leptons/include/G4MuonPlus.hh +++ b/source/particles/leptons/include/G4MuonPlus.hh @@ -25,7 +25,7 @@ // // // $Id: G4MuonPlus.hh,v 1.10 2006/06/29 19:20:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/leptons/include/G4NeutrinoE.hh b/source/particles/leptons/include/G4NeutrinoE.hh index f4a5bf31b6..f8fdc03391 100644 --- a/source/particles/leptons/include/G4NeutrinoE.hh +++ b/source/particles/leptons/include/G4NeutrinoE.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutrinoE.hh,v 1.12 2006/06/29 19:20:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/leptons/include/G4NeutrinoMu.hh b/source/particles/leptons/include/G4NeutrinoMu.hh index 3a9490c91b..9dc50f3571 100644 --- a/source/particles/leptons/include/G4NeutrinoMu.hh +++ b/source/particles/leptons/include/G4NeutrinoMu.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutrinoMu.hh,v 1.12 2006/06/29 19:20:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/leptons/include/G4NeutrinoTau.hh b/source/particles/leptons/include/G4NeutrinoTau.hh index 4a40588d1c..2b86198e4c 100644 --- a/source/particles/leptons/include/G4NeutrinoTau.hh +++ b/source/particles/leptons/include/G4NeutrinoTau.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutrinoTau.hh,v 1.13 2006/06/29 19:20:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/leptons/include/G4Positron.hh b/source/particles/leptons/include/G4Positron.hh index 56db131816..6f3743eb7e 100644 --- a/source/particles/leptons/include/G4Positron.hh +++ b/source/particles/leptons/include/G4Positron.hh @@ -25,7 +25,7 @@ // // // $Id: G4Positron.hh,v 1.11 2006/06/29 19:20:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/leptons/include/G4TauMinus.hh b/source/particles/leptons/include/G4TauMinus.hh index 8ca2a679ff..e0f198dfaf 100644 --- a/source/particles/leptons/include/G4TauMinus.hh +++ b/source/particles/leptons/include/G4TauMinus.hh @@ -25,7 +25,7 @@ // // // $Id: G4TauMinus.hh,v 1.10 2006/06/29 19:20:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/leptons/include/G4TauPlus.hh b/source/particles/leptons/include/G4TauPlus.hh index 2d711de4fe..94d2ac11f8 100644 --- a/source/particles/leptons/include/G4TauPlus.hh +++ b/source/particles/leptons/include/G4TauPlus.hh @@ -25,7 +25,7 @@ // // // $Id: G4TauPlus.hh,v 1.10 2006/06/29 19:20:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/leptons/src/G4AntiNeutrinoE.cc b/source/particles/leptons/src/G4AntiNeutrinoE.cc index 370ef83820..6437c95191 100644 --- a/source/particles/leptons/src/G4AntiNeutrinoE.cc +++ b/source/particles/leptons/src/G4AntiNeutrinoE.cc @@ -25,7 +25,7 @@ // // // $Id: G4AntiNeutrinoE.cc,v 1.15 2006/06/29 19:20:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/leptons/src/G4AntiNeutrinoMu.cc b/source/particles/leptons/src/G4AntiNeutrinoMu.cc index e631e19317..666ec08494 100644 --- a/source/particles/leptons/src/G4AntiNeutrinoMu.cc +++ b/source/particles/leptons/src/G4AntiNeutrinoMu.cc @@ -25,7 +25,7 @@ // // // $Id: G4AntiNeutrinoMu.cc,v 1.15 2006/06/29 19:20:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/leptons/src/G4AntiNeutrinoTau.cc b/source/particles/leptons/src/G4AntiNeutrinoTau.cc index 78222bc7ed..bdd350d9c6 100644 --- a/source/particles/leptons/src/G4AntiNeutrinoTau.cc +++ b/source/particles/leptons/src/G4AntiNeutrinoTau.cc @@ -25,7 +25,7 @@ // // // $Id: G4AntiNeutrinoTau.cc,v 1.15 2006/06/29 19:20:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/leptons/src/G4Electron.cc b/source/particles/leptons/src/G4Electron.cc index 3d02165555..3e918c6cc8 100644 --- a/source/particles/leptons/src/G4Electron.cc +++ b/source/particles/leptons/src/G4Electron.cc @@ -25,7 +25,7 @@ // // // $Id: G4Electron.cc,v 1.12 2006/06/29 19:21:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/leptons/src/G4LeptonConstructor.cc b/source/particles/leptons/src/G4LeptonConstructor.cc index 0896cca5e7..aa304cf886 100644 --- a/source/particles/leptons/src/G4LeptonConstructor.cc +++ b/source/particles/leptons/src/G4LeptonConstructor.cc @@ -25,7 +25,7 @@ // // // $Id: G4LeptonConstructor.cc,v 1.5 2006/06/29 19:21:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/particles/leptons/src/G4MuonMinus.cc b/source/particles/leptons/src/G4MuonMinus.cc index 21ec4dca34..8787f1a7e5 100644 --- a/source/particles/leptons/src/G4MuonMinus.cc +++ b/source/particles/leptons/src/G4MuonMinus.cc @@ -25,7 +25,7 @@ // // // $Id: G4MuonMinus.cc,v 1.11 2006/06/29 19:21:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/leptons/src/G4MuonPlus.cc b/source/particles/leptons/src/G4MuonPlus.cc index 20597e9c21..c4dbf51771 100644 --- a/source/particles/leptons/src/G4MuonPlus.cc +++ b/source/particles/leptons/src/G4MuonPlus.cc @@ -25,7 +25,7 @@ // // // $Id: G4MuonPlus.cc,v 1.11 2006/06/29 19:21:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/leptons/src/G4NeutrinoE.cc b/source/particles/leptons/src/G4NeutrinoE.cc index acd44be9db..68f8bc43e5 100644 --- a/source/particles/leptons/src/G4NeutrinoE.cc +++ b/source/particles/leptons/src/G4NeutrinoE.cc @@ -25,7 +25,7 @@ // // // $Id: G4NeutrinoE.cc,v 1.15 2006/06/29 19:21:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/leptons/src/G4NeutrinoMu.cc b/source/particles/leptons/src/G4NeutrinoMu.cc index 356172a286..529e873de8 100644 --- a/source/particles/leptons/src/G4NeutrinoMu.cc +++ b/source/particles/leptons/src/G4NeutrinoMu.cc @@ -25,7 +25,7 @@ // // // $Id: G4NeutrinoMu.cc,v 1.16 2006/06/29 19:22:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/leptons/src/G4NeutrinoTau.cc b/source/particles/leptons/src/G4NeutrinoTau.cc index 71b8d9cfd8..7dea04450c 100644 --- a/source/particles/leptons/src/G4NeutrinoTau.cc +++ b/source/particles/leptons/src/G4NeutrinoTau.cc @@ -25,7 +25,7 @@ // // // $Id: G4NeutrinoTau.cc,v 1.15 2006/06/29 19:22:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/leptons/src/G4Positron.cc b/source/particles/leptons/src/G4Positron.cc index 69b08a1412..8478ecf588 100644 --- a/source/particles/leptons/src/G4Positron.cc +++ b/source/particles/leptons/src/G4Positron.cc @@ -25,7 +25,7 @@ // // // $Id: G4Positron.cc,v 1.11 2006/06/29 19:22:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/leptons/src/G4TauMinus.cc b/source/particles/leptons/src/G4TauMinus.cc index aa784788bd..cde2187147 100644 --- a/source/particles/leptons/src/G4TauMinus.cc +++ b/source/particles/leptons/src/G4TauMinus.cc @@ -25,7 +25,7 @@ // // // $Id: G4TauMinus.cc,v 1.14 2006/06/29 19:22:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/leptons/src/G4TauPlus.cc b/source/particles/leptons/src/G4TauPlus.cc index 67e75f0186..f461369876 100644 --- a/source/particles/leptons/src/G4TauPlus.cc +++ b/source/particles/leptons/src/G4TauPlus.cc @@ -25,7 +25,7 @@ // // // $Id: G4TauPlus.cc,v 1.14 2006/06/29 19:22:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/management/include/G4DalitzDecayChannel.hh b/source/particles/management/include/G4DalitzDecayChannel.hh index 50fc79eca9..3aa939bb71 100644 --- a/source/particles/management/include/G4DalitzDecayChannel.hh +++ b/source/particles/management/include/G4DalitzDecayChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4DalitzDecayChannel.hh,v 1.5 2006/06/29 19:22:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/include/G4DecayProducts.hh b/source/particles/management/include/G4DecayProducts.hh index 7fd8d679d8..adb6bed0df 100644 --- a/source/particles/management/include/G4DecayProducts.hh +++ b/source/particles/management/include/G4DecayProducts.hh @@ -25,7 +25,7 @@ // // // $Id: G4DecayProducts.hh,v 1.12 2006/06/29 19:22:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/include/G4DecayTable.hh b/source/particles/management/include/G4DecayTable.hh index 36e342d22e..5ddfecd847 100644 --- a/source/particles/management/include/G4DecayTable.hh +++ b/source/particles/management/include/G4DecayTable.hh @@ -25,7 +25,7 @@ // // // $Id: G4DecayTable.hh,v 1.9 2006/06/29 19:22:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/include/G4DecayTableMessenger.hh b/source/particles/management/include/G4DecayTableMessenger.hh index 1d449deaff..689f153c17 100644 --- a/source/particles/management/include/G4DecayTableMessenger.hh +++ b/source/particles/management/include/G4DecayTableMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: G4DecayTableMessenger.hh,v 1.8 2006/06/29 19:22:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/particles/management/include/G4DynamicParticle.hh b/source/particles/management/include/G4DynamicParticle.hh index 9bcc490b85..ed6a10af29 100644 --- a/source/particles/management/include/G4DynamicParticle.hh +++ b/source/particles/management/include/G4DynamicParticle.hh @@ -25,7 +25,7 @@ // // // $Id: G4DynamicParticle.hh,v 1.17 2006/06/29 19:23:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/include/G4DynamicParticle.icc b/source/particles/management/include/G4DynamicParticle.icc index e113cb6112..d14f645c12 100644 --- a/source/particles/management/include/G4DynamicParticle.icc +++ b/source/particles/management/include/G4DynamicParticle.icc @@ -25,7 +25,7 @@ // // // $Id: G4DynamicParticle.icc,v 1.15 2006/06/29 19:23:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/include/G4DynamicParticleFastVector.hh b/source/particles/management/include/G4DynamicParticleFastVector.hh index 31d7461130..1d04657a7a 100644 --- a/source/particles/management/include/G4DynamicParticleFastVector.hh +++ b/source/particles/management/include/G4DynamicParticleFastVector.hh @@ -25,7 +25,7 @@ // // // $Id: G4DynamicParticleFastVector.hh,v 1.4 2006/06/29 19:23:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/include/G4ElectronOccupancy.hh b/source/particles/management/include/G4ElectronOccupancy.hh index a5c1645bf3..509bedc0f1 100644 --- a/source/particles/management/include/G4ElectronOccupancy.hh +++ b/source/particles/management/include/G4ElectronOccupancy.hh @@ -25,7 +25,7 @@ // // // $Id: G4ElectronOccupancy.hh,v 1.9 2006/06/29 19:23:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/include/G4IonTable.hh b/source/particles/management/include/G4IonTable.hh index 6a29df63bf..b3563d1ca9 100644 --- a/source/particles/management/include/G4IonTable.hh +++ b/source/particles/management/include/G4IonTable.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4IonTable.hh,v 1.22 2006/06/29 19:23:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4IonTable.hh,v 1.23 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ @@ -40,6 +40,7 @@ // ----- // Modified GetIon methods 17 Aug. 99 H.Kurashige // New design using G4VIsotopeTable 5 Oct. 99 H.Kurashige +// Add GetNucleusEncoding according PDG 2006 9 Oct. 2006 H.Kurashige #ifndef G4IonTable_h #define G4IonTable_h 1 @@ -105,6 +106,10 @@ class G4IonTable // Z: Atomic Number // A: Atomic Mass // J: Total Angular momentum (in unit of 1/2) + G4ParticleDefinition* GetIon(G4int encoding); + // The ion can be get by using PDG encoding + // !! Only ground state can be obtained .i.e. Isomer = 0 + // Find/Get "excited state" G4ParticleDefinition* FindIon(G4int Z, G4int A, G4double E, G4int J=0); @@ -123,7 +128,23 @@ class G4IonTable G4String GetIonName(G4int Z, G4int A, G4double E) const; // get ion name + + static G4int GetNucleusEncoding(G4int Z, G4int A, + G4double E=0.0, G4int J=0); + // get PDG code for Ions + // Nuclear codes are given as 10-digit numbers +-100ZZZAAAI. + //For a nucleus consisting of np protons and nn neutrons + // A = np + nn and Z = np. + // I gives the isomer level, with I = 0 corresponding + // to the ground state and I >0 to excitations + // + //!!! I = 1 is assigned fo all excitation states in Geant4 + static G4bool GetNucleusByEncoding(G4int encoding, + G4int &Z, G4int &A, + G4double &E, G4int &J); + //!!! Only ground states are supported now + G4double GetIonMass(G4int Z, G4int A) const; G4double GetNucleusMass(G4int Z, G4int A) const; // These two methods returns Nucleus (i.e. full ionized atom) mass diff --git a/source/particles/management/include/G4Ions.hh b/source/particles/management/include/G4Ions.hh index 773ead2af6..00c5f2d8c0 100644 --- a/source/particles/management/include/G4Ions.hh +++ b/source/particles/management/include/G4Ions.hh @@ -25,7 +25,7 @@ // // // $Id: G4Ions.hh,v 1.13 2006/06/29 19:23:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/include/G4IsotopeProperty.hh b/source/particles/management/include/G4IsotopeProperty.hh index bce22e42f0..6267a50f12 100644 --- a/source/particles/management/include/G4IsotopeProperty.hh +++ b/source/particles/management/include/G4IsotopeProperty.hh @@ -25,7 +25,7 @@ // // // $Id: G4IsotopeProperty.hh,v 1.4 2006/06/29 19:23:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/include/G4KL3DecayChannel.hh b/source/particles/management/include/G4KL3DecayChannel.hh index 37053608fd..b65c6615da 100644 --- a/source/particles/management/include/G4KL3DecayChannel.hh +++ b/source/particles/management/include/G4KL3DecayChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4KL3DecayChannel.hh,v 1.5 2006/06/29 19:23:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/include/G4MuonDecayChannel.hh b/source/particles/management/include/G4MuonDecayChannel.hh index 9cc306fb94..32c8b747eb 100644 --- a/source/particles/management/include/G4MuonDecayChannel.hh +++ b/source/particles/management/include/G4MuonDecayChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4MuonDecayChannel.hh,v 1.6 2006/06/29 19:23:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/include/G4NeutronBetaDecayChannel.hh b/source/particles/management/include/G4NeutronBetaDecayChannel.hh index b9ca13e227..ebbcb42877 100644 --- a/source/particles/management/include/G4NeutronBetaDecayChannel.hh +++ b/source/particles/management/include/G4NeutronBetaDecayChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronBetaDecayChannel.hh,v 1.2 2006/06/29 19:23:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/include/G4NucleiProperties.hh b/source/particles/management/include/G4NucleiProperties.hh index db372885f0..ba49eca301 100644 --- a/source/particles/management/include/G4NucleiProperties.hh +++ b/source/particles/management/include/G4NucleiProperties.hh @@ -25,7 +25,7 @@ // // // $Id: G4NucleiProperties.hh,v 1.14 2006/06/29 19:23:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/include/G4NucleiPropertiesTable.hh b/source/particles/management/include/G4NucleiPropertiesTable.hh index 4b781cf3bf..d536002c7f 100644 --- a/source/particles/management/include/G4NucleiPropertiesTable.hh +++ b/source/particles/management/include/G4NucleiPropertiesTable.hh @@ -25,7 +25,7 @@ // // // $Id: G4NucleiPropertiesTable.hh,v 1.13 2006/06/29 19:23:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // GEANT 4 class file --- Copyright CERN 1997 diff --git a/source/particles/management/include/G4NucleiPropertiesTheoreticalTable.hh b/source/particles/management/include/G4NucleiPropertiesTheoreticalTable.hh index e810d67071..86026192b7 100644 --- a/source/particles/management/include/G4NucleiPropertiesTheoreticalTable.hh +++ b/source/particles/management/include/G4NucleiPropertiesTheoreticalTable.hh @@ -25,7 +25,7 @@ // // // $Id: G4NucleiPropertiesTheoreticalTable.hh,v 1.7 2006/06/29 19:23:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/include/G4PDGCodeChecker.hh b/source/particles/management/include/G4PDGCodeChecker.hh index 7db1018030..c8088d865e 100644 --- a/source/particles/management/include/G4PDGCodeChecker.hh +++ b/source/particles/management/include/G4PDGCodeChecker.hh @@ -25,7 +25,7 @@ // // // $Id: G4PDGCodeChecker.hh,v 1.7 2006/06/29 19:24:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/include/G4ParticleDefinition.hh b/source/particles/management/include/G4ParticleDefinition.hh index b970a299ed..b8e0858f83 100644 --- a/source/particles/management/include/G4ParticleDefinition.hh +++ b/source/particles/management/include/G4ParticleDefinition.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParticleDefinition.hh,v 1.30 2006/06/29 19:24:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/include/G4ParticleDefinition.icc b/source/particles/management/include/G4ParticleDefinition.icc index 57106e7682..b5d7ebe143 100644 --- a/source/particles/management/include/G4ParticleDefinition.icc +++ b/source/particles/management/include/G4ParticleDefinition.icc @@ -25,7 +25,7 @@ // // // $Id: G4ParticleDefinition.icc,v 1.11 2006/06/29 19:24:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // inline diff --git a/source/particles/management/include/G4ParticleMessenger.hh b/source/particles/management/include/G4ParticleMessenger.hh index 9bf53e7a75..991195b8e4 100644 --- a/source/particles/management/include/G4ParticleMessenger.hh +++ b/source/particles/management/include/G4ParticleMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParticleMessenger.hh,v 1.7 2006/06/29 19:24:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/particles/management/include/G4ParticleMomentum.hh b/source/particles/management/include/G4ParticleMomentum.hh index cb0fe2848e..30155f4bc8 100644 --- a/source/particles/management/include/G4ParticleMomentum.hh +++ b/source/particles/management/include/G4ParticleMomentum.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParticleMomentum.hh,v 1.6 2006/06/29 19:24:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/include/G4ParticlePropertyData.hh b/source/particles/management/include/G4ParticlePropertyData.hh index 636907e3f7..74ba768448 100644 --- a/source/particles/management/include/G4ParticlePropertyData.hh +++ b/source/particles/management/include/G4ParticlePropertyData.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParticlePropertyData.hh,v 1.2 2006/06/29 19:24:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/include/G4ParticlePropertyMessenger.hh b/source/particles/management/include/G4ParticlePropertyMessenger.hh index 42b43b4574..21d7064bca 100644 --- a/source/particles/management/include/G4ParticlePropertyMessenger.hh +++ b/source/particles/management/include/G4ParticlePropertyMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParticlePropertyMessenger.hh,v 1.7 2006/06/29 19:24:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/particles/management/include/G4ParticlePropertyTable.hh b/source/particles/management/include/G4ParticlePropertyTable.hh index 8a9b9cfd23..bc46db87ab 100644 --- a/source/particles/management/include/G4ParticlePropertyTable.hh +++ b/source/particles/management/include/G4ParticlePropertyTable.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4ParticlePropertyTable.hh,v 1.4 2006/06/29 19:24:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/include/G4ParticleTable.hh b/source/particles/management/include/G4ParticleTable.hh index 3623e9d321..b60e956901 100644 --- a/source/particles/management/include/G4ParticleTable.hh +++ b/source/particles/management/include/G4ParticleTable.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParticleTable.hh,v 1.18 2006/06/29 19:24:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/include/G4ParticleTable.icc b/source/particles/management/include/G4ParticleTable.icc index b27db255e3..c5c245dd9f 100644 --- a/source/particles/management/include/G4ParticleTable.icc +++ b/source/particles/management/include/G4ParticleTable.icc @@ -25,7 +25,7 @@ // // // $Id: G4ParticleTable.icc,v 1.10 2006/06/29 19:24:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/include/G4ParticleTableIterator.hh b/source/particles/management/include/G4ParticleTableIterator.hh index 29c2dfcf90..177cd9153e 100644 --- a/source/particles/management/include/G4ParticleTableIterator.hh +++ b/source/particles/management/include/G4ParticleTableIterator.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParticleTableIterator.hh,v 1.7 2006/06/29 19:24:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/include/G4ParticleWithCuts.hh b/source/particles/management/include/G4ParticleWithCuts.hh index 13a6743673..70cd4d8663 100644 --- a/source/particles/management/include/G4ParticleWithCuts.hh +++ b/source/particles/management/include/G4ParticleWithCuts.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParticleWithCuts.hh,v 1.19 2006/06/29 19:24:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------- diff --git a/source/particles/management/include/G4PhaseSpaceDecayChannel.hh b/source/particles/management/include/G4PhaseSpaceDecayChannel.hh index e9ba25e2d5..1905f2afe0 100644 --- a/source/particles/management/include/G4PhaseSpaceDecayChannel.hh +++ b/source/particles/management/include/G4PhaseSpaceDecayChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4PhaseSpaceDecayChannel.hh,v 1.6 2006/06/29 19:24:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/include/G4PrimaryParticle.hh b/source/particles/management/include/G4PrimaryParticle.hh index fb56c92c54..14679a1898 100644 --- a/source/particles/management/include/G4PrimaryParticle.hh +++ b/source/particles/management/include/G4PrimaryParticle.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4PrimaryParticle.hh,v 1.3 2006/06/29 19:24:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4PrimaryParticle.hh,v 1.4 2006/09/28 14:29:43 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // @@ -116,10 +116,16 @@ class G4PrimaryParticle public: // with description // followings are get methods available. - // "trackID" will be set if this particle is sent to G4EventManager and converted to - // G4Track. Otherwise = -1. - // "mass" is just for book keeping. This will not be used but the mass in - // G4ParticleDefinition will be used. + // "trackID" will be set if this particle is sent to G4EventManager + // and converted to G4Track. Otherwise = -1. + // The mass and charge in G4ParticleDefinition will be used in default. + // "SetMass" and "SetCharge" methods are used to set dynamical mass and charge + // G4DynamicParticle."GetMass" and "GetCharge" methods will return + // those in G4ParticleDefinition if users do not set dynamical ones. + + G4double GetMass() const; + G4double GetCharge() const; + inline G4int GetPDGcode() const { return PDGcode; } inline G4ParticleDefinition * GetG4code() const @@ -138,10 +144,6 @@ class G4PrimaryParticle { return daughterParticle; } inline G4int GetTrackID() const { return trackID; } - inline G4double GetMass() const - { return mass; } - inline G4double GetCharge() const - { return charge; } inline G4ThreeVector GetPolarization() const { return G4ThreeVector(polX,polY,polZ); } inline G4double GetPolX() const { return polX; } diff --git a/source/particles/management/include/G4PrimaryVertex.hh b/source/particles/management/include/G4PrimaryVertex.hh index 6fefe318d0..e48ec36073 100644 --- a/source/particles/management/include/G4PrimaryVertex.hh +++ b/source/particles/management/include/G4PrimaryVertex.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4PrimaryVertex.hh,v 1.2.2.1 2006/06/29 19:24:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4PrimaryVertex.hh,v 1.4 2006/07/20 15:14:43 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // @@ -71,6 +71,7 @@ class G4PrimaryVertex G4PrimaryParticle * theParticle; G4PrimaryParticle * theTail; G4PrimaryVertex* nextVertex; + G4PrimaryVertex* tailVertex; G4int numberOfParticle; G4double Weight0; G4VUserPrimaryVertexInformation* userInfo; @@ -95,15 +96,10 @@ class G4PrimaryVertex inline void SetPrimary(G4PrimaryParticle * pp) { if(theParticle == 0) - { - theParticle = pp; - theTail = pp; - } + { theParticle = pp; } else - { - theTail->SetNext(pp); - theTail = pp; - } + { theTail->SetNext(pp); } + theTail = pp; numberOfParticle++; } inline G4PrimaryParticle* GetPrimary(G4int i=0) const @@ -128,7 +124,8 @@ class G4PrimaryVertex if(nextVertex == 0) { nextVertex = nv; } else - { nextVertex->SetNext(nv); } + { tailVertex->SetNext(nv); } + tailVertex = nv; } inline G4PrimaryVertex* GetNext() const { return nextVertex; } diff --git a/source/particles/management/include/G4ShortLivedTable.hh b/source/particles/management/include/G4ShortLivedTable.hh index 5e64730b5e..67f0cba914 100644 --- a/source/particles/management/include/G4ShortLivedTable.hh +++ b/source/particles/management/include/G4ShortLivedTable.hh @@ -25,7 +25,7 @@ // // // $Id: G4ShortLivedTable.hh,v 1.12 2006/06/29 19:24:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/include/G4TauLeptonicDecayChannel.hh b/source/particles/management/include/G4TauLeptonicDecayChannel.hh index 13688c61cd..ecdab9694f 100644 --- a/source/particles/management/include/G4TauLeptonicDecayChannel.hh +++ b/source/particles/management/include/G4TauLeptonicDecayChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4TauLeptonicDecayChannel.hh,v 1.2 2006/06/29 19:24:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/include/G4VDecayChannel.hh b/source/particles/management/include/G4VDecayChannel.hh index 61e01ef552..ff47754bfb 100644 --- a/source/particles/management/include/G4VDecayChannel.hh +++ b/source/particles/management/include/G4VDecayChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4VDecayChannel.hh,v 1.12 2006/06/29 19:24:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/include/G4VIsotopeTable.hh b/source/particles/management/include/G4VIsotopeTable.hh index 7c6891714b..a4189ebcdd 100644 --- a/source/particles/management/include/G4VIsotopeTable.hh +++ b/source/particles/management/include/G4VIsotopeTable.hh @@ -25,7 +25,7 @@ // // // $Id: G4VIsotopeTable.hh,v 1.6 2006/06/29 19:24:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/include/G4VUserPrimaryParticleInformation.hh b/source/particles/management/include/G4VUserPrimaryParticleInformation.hh index 044c1248f3..ad21afd796 100644 --- a/source/particles/management/include/G4VUserPrimaryParticleInformation.hh +++ b/source/particles/management/include/G4VUserPrimaryParticleInformation.hh @@ -25,7 +25,7 @@ // // // $Id: G4VUserPrimaryParticleInformation.hh,v 1.2 2006/06/29 19:24:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/particles/management/include/G4VUserPrimaryVertexInformation.hh b/source/particles/management/include/G4VUserPrimaryVertexInformation.hh index 51d1c89a83..3e8259ad1b 100644 --- a/source/particles/management/include/G4VUserPrimaryVertexInformation.hh +++ b/source/particles/management/include/G4VUserPrimaryVertexInformation.hh @@ -25,7 +25,7 @@ // // // $Id: G4VUserPrimaryVertexInformation.hh,v 1.2 2006/06/29 19:24:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/particles/management/src/G4DalitzDecayChannel.cc b/source/particles/management/src/G4DalitzDecayChannel.cc index 3111519c05..081aa89c2a 100644 --- a/source/particles/management/src/G4DalitzDecayChannel.cc +++ b/source/particles/management/src/G4DalitzDecayChannel.cc @@ -25,7 +25,7 @@ // // // $Id: G4DalitzDecayChannel.cc,v 1.8 2006/06/29 19:24:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/src/G4DecayProducts.cc b/source/particles/management/src/G4DecayProducts.cc index d2715074a8..c95999bdc1 100644 --- a/source/particles/management/src/G4DecayProducts.cc +++ b/source/particles/management/src/G4DecayProducts.cc @@ -25,7 +25,7 @@ // // // $Id: G4DecayProducts.cc,v 1.14 2006/06/29 19:25:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/src/G4DecayTable.cc b/source/particles/management/src/G4DecayTable.cc index b6c91dd0ea..bceb86d61e 100644 --- a/source/particles/management/src/G4DecayTable.cc +++ b/source/particles/management/src/G4DecayTable.cc @@ -25,7 +25,7 @@ // // // $Id: G4DecayTable.cc,v 1.8 2006/06/29 19:25:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/src/G4DecayTableMessenger.cc b/source/particles/management/src/G4DecayTableMessenger.cc index 8e0c2b59a4..ba15c54397 100644 --- a/source/particles/management/src/G4DecayTableMessenger.cc +++ b/source/particles/management/src/G4DecayTableMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: G4DecayTableMessenger.cc,v 1.6 2006/06/29 19:25:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/particles/management/src/G4DynamicParticle.cc b/source/particles/management/src/G4DynamicParticle.cc index 71990876cf..7af7551cf3 100644 --- a/source/particles/management/src/G4DynamicParticle.cc +++ b/source/particles/management/src/G4DynamicParticle.cc @@ -25,7 +25,7 @@ // // // $Id: G4DynamicParticle.cc,v 1.24 2006/06/29 19:25:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/particles/management/src/G4ElectronOccupancy.cc b/source/particles/management/src/G4ElectronOccupancy.cc index ff7d57373d..90a83eb637 100644 --- a/source/particles/management/src/G4ElectronOccupancy.cc +++ b/source/particles/management/src/G4ElectronOccupancy.cc @@ -25,7 +25,7 @@ // // // $Id: G4ElectronOccupancy.cc,v 1.9 2006/06/29 19:25:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/management/src/G4IonTable.cc b/source/particles/management/src/G4IonTable.cc index d4c8fd3f9a..a05a5430e4 100644 --- a/source/particles/management/src/G4IonTable.cc +++ b/source/particles/management/src/G4IonTable.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4IonTable.cc,v 1.41 2006/06/29 19:25:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4IonTable.cc,v 1.43 2006/11/15 09:57:52 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- @@ -157,16 +157,20 @@ G4ParticleDefinition* G4IonTable::CreateIon(G4int Z, G4int A, G4double E, G4int G4double mass = GetNucleusMass(Z, A)+ E; G4double charge = G4double(Z)*eplus; + G4int encoding = GetNucleusEncoding(Z,A,E,J); + // create an ion // spin, parity, isospin values are fixed // ion = new G4Ions( name, mass, 0.0*MeV, charge, J, +1, 0, 0, 0, 0, - "nucleus", 0, A, 0, + "nucleus", 0, A, encoding, stable, life, decayTable, false, "generic", 0, E ); + //No Anti particle registered + ion->SetAntiPDGEncoding(0); #ifdef G4VERBOSE if (GetVerboseLevel()>1) { @@ -198,6 +202,26 @@ G4ParticleDefinition* G4IonTable::GetIon(G4int Z, G4int A, G4int J) return GetIon( Z, A, 0.0, J); } +//////////////////// +G4ParticleDefinition* G4IonTable::GetIon(G4int encoding) +{ + G4int Z, A, J; + G4double E; + if (!GetNucleusByEncoding(encoding,Z,A,E,J) ){ +#ifdef G4VERBOSE + if (GetVerboseLevel()>0) { + G4cout << "G4IonTable::GetIon() : illegal encoding" << G4endl; + G4cout << " CODE:" << encoding << G4endl; + } +#endif + G4Exception( "G4IonTable::GetIon()","Illegal operation", + JustWarning, "illegal encoding"); + return 0; + } + // Only ground state is supported + return GetIon( Z, A, 0.0, J); +} + //////////////////// G4ParticleDefinition* G4IonTable::GetIon(G4int Z, G4int A, G4double E, G4int J) { @@ -271,6 +295,50 @@ G4ParticleDefinition* G4IonTable::FindIon(G4int Z, G4int A, G4double E, G4int J) } } +///////////////// +G4int G4IonTable::GetNucleusEncoding(G4int Z, G4int A, G4double E, G4int ) +{ +// PDG code for Ions +// Nuclear codes are given as 10-digit numbers +-100ZZZAAAI. +//For a nucleus consisting of np protons and nn neutrons +// A = np + nn and Z = np. +// I gives the isomer level, with I = 0 corresponding +// to the ground state and I >0 to excitations + +//!!! I = 1 is assigned fo all excitation states !!! + + G4int encoding = 1000000000; + encoding += Z * 10000; + encoding += A *10; + if (E>0.0) encoding += 1; + + return encoding; +} + +/////////////// +G4bool G4IonTable::GetNucleusByEncoding(G4int encoding, + G4int &Z, G4int &A, + G4double &E, G4int &J) +{ + if (encoding <= 0) { + // anti particle + return false; + } + if (encoding % 10 != 0) { + //!!!not supported for excitation states !!! + return false; + } + + encoding -= 1000000000; + Z = encoding/10000; + encoding -= 10000*Z; + A = encoding/10; + + E=0.0; + J=0; + + return true; +} ///////////////// G4String G4IonTable::GetIonName(G4int Z, G4int A, G4double E) const { @@ -303,20 +371,15 @@ G4bool G4IonTable::IsIon(G4ParticleDefinition* particle) } ///////////////// +#include + G4bool G4IonTable::IsLightIon(G4ParticleDefinition* particle) const { - // return true if the particle is pre-defined ion - G4String name = particle->GetParticleName(); + static const std::string names[] = { "proton", "neutron", "alpha", "deuteron", + "triton", "He3", "GenericIon"}; - G4bool value = (name == "proton"); - value = value || (name == "neutron"); - value = value || (name == "alpha"); - value = value || (name == "deuteron"); - value = value || (name == "triton") ; - value = value || (name == "He3"); - value = value || (name == "GenericIon") ; - - return value; + // return true if the particle is pre-defined ion + return std::find(names, names+7, particle->GetParticleName())!=names+7; } ///////////////// diff --git a/source/particles/management/src/G4Ions.cc b/source/particles/management/src/G4Ions.cc index ca9b9c0af4..e0440b04f8 100644 --- a/source/particles/management/src/G4Ions.cc +++ b/source/particles/management/src/G4Ions.cc @@ -25,7 +25,7 @@ // // // $Id: G4Ions.cc,v 1.11 2006/06/29 19:25:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/management/src/G4IsotopeProperty.cc b/source/particles/management/src/G4IsotopeProperty.cc index 4fea9f022f..59d42b0080 100644 --- a/source/particles/management/src/G4IsotopeProperty.cc +++ b/source/particles/management/src/G4IsotopeProperty.cc @@ -25,7 +25,7 @@ // // // $Id: G4IsotopeProperty.cc,v 1.5 2006/06/29 19:25:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/management/src/G4KL3DecayChannel.cc b/source/particles/management/src/G4KL3DecayChannel.cc index 52c67f7245..13b6a88977 100644 --- a/source/particles/management/src/G4KL3DecayChannel.cc +++ b/source/particles/management/src/G4KL3DecayChannel.cc @@ -25,7 +25,7 @@ // // // $Id: G4KL3DecayChannel.cc,v 1.8 2006/06/29 19:25:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/src/G4MuonDecayChannel.cc b/source/particles/management/src/G4MuonDecayChannel.cc index 8bab255b19..912e033540 100644 --- a/source/particles/management/src/G4MuonDecayChannel.cc +++ b/source/particles/management/src/G4MuonDecayChannel.cc @@ -25,7 +25,7 @@ // // // $Id: G4MuonDecayChannel.cc,v 1.17 2006/06/29 19:25:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/src/G4NeutronBetaDecayChannel.cc b/source/particles/management/src/G4NeutronBetaDecayChannel.cc index 711b547be2..ee827c65be 100644 --- a/source/particles/management/src/G4NeutronBetaDecayChannel.cc +++ b/source/particles/management/src/G4NeutronBetaDecayChannel.cc @@ -25,7 +25,7 @@ // // // $Id: G4NeutronBetaDecayChannel.cc,v 1.7 2006/06/29 19:25:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/src/G4NucleiProperties.cc b/source/particles/management/src/G4NucleiProperties.cc index 9fb746ecfe..3387049899 100644 --- a/source/particles/management/src/G4NucleiProperties.cc +++ b/source/particles/management/src/G4NucleiProperties.cc @@ -25,7 +25,7 @@ // // // $Id: G4NucleiProperties.cc,v 1.12 2006/06/29 19:25:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/src/G4NucleiPropertiesTableA.cc b/source/particles/management/src/G4NucleiPropertiesTableA.cc index bc1487d02b..80e3ac3c89 100644 --- a/source/particles/management/src/G4NucleiPropertiesTableA.cc +++ b/source/particles/management/src/G4NucleiPropertiesTableA.cc @@ -25,7 +25,7 @@ // // // $Id: G4NucleiPropertiesTableA.cc,v 1.10 2006/06/29 19:25:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // GEANT 4 class file --- Copyright CERN 1997 diff --git a/source/particles/management/src/G4NucleiPropertiesTableB.cc b/source/particles/management/src/G4NucleiPropertiesTableB.cc index ec7a507852..5cca894bdc 100644 --- a/source/particles/management/src/G4NucleiPropertiesTableB.cc +++ b/source/particles/management/src/G4NucleiPropertiesTableB.cc @@ -25,7 +25,7 @@ // // // $Id: G4NucleiPropertiesTableB.cc,v 1.9 2006/06/29 19:25:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // GEANT 4 class implementation file diff --git a/source/particles/management/src/G4NucleiPropertiesTheoreticalTableA.cc b/source/particles/management/src/G4NucleiPropertiesTheoreticalTableA.cc index a012f87f22..40af1fbf8a 100644 --- a/source/particles/management/src/G4NucleiPropertiesTheoreticalTableA.cc +++ b/source/particles/management/src/G4NucleiPropertiesTheoreticalTableA.cc @@ -25,7 +25,7 @@ // // // $Id: G4NucleiPropertiesTheoreticalTableA.cc,v 1.8 2006/06/29 19:25:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/src/G4PDGCodeChecker.cc b/source/particles/management/src/G4PDGCodeChecker.cc index ac5bb32090..985e3ca7a8 100644 --- a/source/particles/management/src/G4PDGCodeChecker.cc +++ b/source/particles/management/src/G4PDGCodeChecker.cc @@ -25,7 +25,7 @@ // // // $Id: G4PDGCodeChecker.cc,v 1.8 2006/06/29 19:25:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/management/src/G4ParticleDefinition.cc b/source/particles/management/src/G4ParticleDefinition.cc index 859af4cdb2..a795301317 100644 --- a/source/particles/management/src/G4ParticleDefinition.cc +++ b/source/particles/management/src/G4ParticleDefinition.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4ParticleDefinition.cc,v 1.27 2006/06/29 19:25:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ParticleDefinition.cc,v 1.28 2006/09/05 01:15:11 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- @@ -114,14 +114,14 @@ G4ParticleDefinition::G4ParticleDefinition( if (anti_encoding !=0) theAntiPDGEncoding = anti_encoding; // check quark contents -#ifdef G4VERBOSE if (this->FillQuarkContents() != thePDGEncoding) { +#ifdef G4VERBOSE if (verboseLevel>0) { // Using G4cerr expecting that it is available in construction of static objects G4cerr << "Particle " << aName << " has a strange PDGEncoding " <0) { + G4cerr << "G4PhaseSpaceDecayChannel::TwoBodyDecayIt " + << "sum of daughter mass is larger than parent mass" << G4endl; + G4cerr << "parent :" << parent->GetParticleName() << " " << parent_mass/GeV << G4endl; + G4cerr << "daughter 1 :" << daughters[0]->GetParticleName() << " " << daughtermass[0]/GeV << G4endl; + G4cerr << "daughter 2:" << daughters[1]->GetParticleName() << " " << daughtermass[1]/GeV << G4endl; + } +#endif + G4Exception("G4PhaseSpaceDecayChannel::TwoBodyDecayIt", + "can not create decay products", JustWarning, + "sum of daughter mass is larger than parent mass"); + return products; + } + G4double costheta = 2.*G4UniformRand()-1.0; G4double sintheta = std::sqrt((1.0 - costheta)*(1.0 + costheta)); G4double phi = twopi*G4UniformRand()*rad; @@ -209,10 +225,31 @@ G4DecayProducts *G4PhaseSpaceDecayChannel::ThreeBodyDecayIt() //create parent G4DynamicParticle at rest G4ThreeVector dummy; G4DynamicParticle * parentparticle = new G4DynamicParticle( parent, dummy, 0.0); + + //create G4Decayproducts G4DecayProducts *products = new G4DecayProducts(*parentparticle); delete parentparticle; + if (sumofdaughtermass >parentmass) { +#ifdef G4VERBOSE + if (GetVerboseLevel()>0) { + G4cerr << "G4PhaseSpaceDecayChannel::ThreeBodyDecayIt " + << "sum of daughter mass is larger than parent mass" << G4endl; + G4cerr << "parent :" << parent->GetParticleName() << " " << parent_mass/GeV << G4endl; + G4cerr << "daughter 1 :" << daughters[0]->GetParticleName() << " " << daughtermass[0]/GeV << G4endl; + G4cerr << "daughter 2:" << daughters[1]->GetParticleName() << " " << daughtermass[1]/GeV << G4endl; + G4cerr << "daughter 3:" << daughters[2]->GetParticleName() << " " << daughtermass[2]/GeV << G4endl; + } +#endif + G4Exception("G4PhaseSpaceDecayChannel::ThreeBodyDecayIt", + "can not create decay products", JustWarning, + "sum of daughter mass is larger than parent mass"); + return products; + } + + + //calculate daughter momentum // Generate two G4double rd1, rd2, rd; @@ -287,7 +324,7 @@ G4DecayProducts *G4PhaseSpaceDecayChannel::ThreeBodyDecayIt() (direction0*daughtermomentum[0] + direction2*(daughtermomentum[2]/direction2.mag()))*(-1.0) ); products->PushProducts(daughterparticle); - + #ifdef G4VERBOSE if (GetVerboseLevel()>1) { G4cout << "G4PhaseSpaceDecayChannel::ThreeBodyDecayIt "; @@ -395,6 +432,11 @@ G4DecayProducts *G4PhaseSpaceDecayChannel::ManyBodyDecayIt() delete [] sm; delete [] daughtermass; delete [] daughtermomentum; + + G4Exception("G4PhaseSpaceDecayChannel::ManyBodyDecayIt", + "can not create decay products", JustWarning, + "sum of daughter mass is larger than parent mass"); + return 0; // Error detection } else { diff --git a/source/particles/management/src/G4PrimaryParticle.cc b/source/particles/management/src/G4PrimaryParticle.cc index b05d704c98..85ddecc664 100644 --- a/source/particles/management/src/G4PrimaryParticle.cc +++ b/source/particles/management/src/G4PrimaryParticle.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4PrimaryParticle.cc,v 1.2 2006/06/29 19:26:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4PrimaryParticle.cc,v 1.4 2006/10/01 02:29:43 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4PrimaryParticle.hh" @@ -125,6 +125,30 @@ void G4PrimaryParticle::SetG4code(G4ParticleDefinition* Gcode) PDGcode = Gcode->GetPDGEncoding(); } +G4double G4PrimaryParticle::GetMass() const +{ + if (mass <0.0 ) { + if (G4code != 0) { + // return PDG mass if dynamical mass has not be specified + return G4code->GetPDGMass(); + } + } + return mass; +} + +G4double G4PrimaryParticle::GetCharge() const +{ + if ( charge GetPDGCharge(); + } + } + return charge; +} + const G4PrimaryParticle & G4PrimaryParticle::operator=(const G4PrimaryParticle &) { return *this; } @@ -166,3 +190,6 @@ void G4PrimaryParticle::Print() const { G4cout << "<<<< End of link" << G4endl; } } + + + diff --git a/source/particles/management/src/G4PrimaryVertex.cc b/source/particles/management/src/G4PrimaryVertex.cc index 52e59c738c..90924159af 100644 --- a/source/particles/management/src/G4PrimaryVertex.cc +++ b/source/particles/management/src/G4PrimaryVertex.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4PrimaryVertex.cc,v 1.1.2.1 2006/06/29 19:26:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4PrimaryVertex.cc,v 1.3 2006/07/20 15:14:43 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4PrimaryVertex.hh" @@ -36,18 +36,18 @@ G4Allocator aPrimaryVertexAllocator; G4PrimaryVertex::G4PrimaryVertex() :X0(0.),Y0(0.),Z0(0.),T0(0.),theParticle(0),theTail(0), - nextVertex(0),numberOfParticle(0),Weight0(1.0),userInfo(0) + nextVertex(0),tailVertex(0),numberOfParticle(0),Weight0(1.0),userInfo(0) {;} G4PrimaryVertex::G4PrimaryVertex( G4double x0,G4double y0,G4double z0,G4double t0) :X0(x0),Y0(y0),Z0(z0),T0(t0),theParticle(0),theTail(0), - nextVertex(0),numberOfParticle(0),Weight0(1.0),userInfo(0) + nextVertex(0),tailVertex(0),numberOfParticle(0),Weight0(1.0),userInfo(0) {;} G4PrimaryVertex::G4PrimaryVertex(G4ThreeVector xyz0,G4double t0) :T0(t0),theParticle(0),theTail(0), - nextVertex(0),numberOfParticle(0),Weight0(1.0),userInfo(0) + nextVertex(0),tailVertex(0),numberOfParticle(0),Weight0(1.0),userInfo(0) { X0=xyz0.x(); Y0=xyz0.y(); diff --git a/source/particles/management/src/G4ShortLivedTable.cc b/source/particles/management/src/G4ShortLivedTable.cc index 1b1e5c1e88..e73bd4f850 100644 --- a/source/particles/management/src/G4ShortLivedTable.cc +++ b/source/particles/management/src/G4ShortLivedTable.cc @@ -25,7 +25,7 @@ // // // $Id: G4ShortLivedTable.cc,v 1.14 2006/06/29 19:26:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/particles/management/src/G4TauLeptonicDecayChannel.cc b/source/particles/management/src/G4TauLeptonicDecayChannel.cc index cf9b71020a..62e010a003 100644 --- a/source/particles/management/src/G4TauLeptonicDecayChannel.cc +++ b/source/particles/management/src/G4TauLeptonicDecayChannel.cc @@ -25,7 +25,7 @@ // // // $Id: G4TauLeptonicDecayChannel.cc,v 1.5 2006/06/29 19:26:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/src/G4VDecayChannel.cc b/source/particles/management/src/G4VDecayChannel.cc index e9f197f638..80503b4a33 100644 --- a/source/particles/management/src/G4VDecayChannel.cc +++ b/source/particles/management/src/G4VDecayChannel.cc @@ -25,7 +25,7 @@ // // // $Id: G4VDecayChannel.cc,v 1.18 2006/06/29 19:26:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/management/src/G4VUserPrimaryParticleInformation.cc b/source/particles/management/src/G4VUserPrimaryParticleInformation.cc index 414071f3a2..0523596414 100644 --- a/source/particles/management/src/G4VUserPrimaryParticleInformation.cc +++ b/source/particles/management/src/G4VUserPrimaryParticleInformation.cc @@ -25,7 +25,7 @@ // // // $Id: G4VUserPrimaryParticleInformation.cc,v 1.2 2006/06/29 19:26:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4VUserPrimaryParticleInformation.hh" G4VUserPrimaryParticleInformation::G4VUserPrimaryParticleInformation() {;} diff --git a/source/particles/management/src/G4VUserPrimaryVertexInformation.cc b/source/particles/management/src/G4VUserPrimaryVertexInformation.cc index d1c75568c2..b108b4f71f 100644 --- a/source/particles/management/src/G4VUserPrimaryVertexInformation.cc +++ b/source/particles/management/src/G4VUserPrimaryVertexInformation.cc @@ -25,7 +25,7 @@ // // // $Id: G4VUserPrimaryVertexInformation.cc,v 1.2 2006/06/29 19:26:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/particles/shortlived/include/G4DiQuarks.hh b/source/particles/shortlived/include/G4DiQuarks.hh index fa87dd6cc6..1ed0d12ba0 100644 --- a/source/particles/shortlived/include/G4DiQuarks.hh +++ b/source/particles/shortlived/include/G4DiQuarks.hh @@ -25,7 +25,7 @@ // // // $Id: G4DiQuarks.hh,v 1.6 2006/06/29 19:26:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/shortlived/include/G4ExcitedBaryonConstructor.hh b/source/particles/shortlived/include/G4ExcitedBaryonConstructor.hh index 95e32e443b..c5ac688078 100644 --- a/source/particles/shortlived/include/G4ExcitedBaryonConstructor.hh +++ b/source/particles/shortlived/include/G4ExcitedBaryonConstructor.hh @@ -25,7 +25,7 @@ // // // $Id: G4ExcitedBaryonConstructor.hh,v 1.6 2006/06/29 19:26:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/particles/shortlived/include/G4ExcitedBaryons.hh b/source/particles/shortlived/include/G4ExcitedBaryons.hh index 282102e7c0..7c249a3f32 100644 --- a/source/particles/shortlived/include/G4ExcitedBaryons.hh +++ b/source/particles/shortlived/include/G4ExcitedBaryons.hh @@ -25,7 +25,7 @@ // // // $Id: G4ExcitedBaryons.hh,v 1.7 2006/06/29 19:26:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/shortlived/include/G4ExcitedDeltaConstructor.hh b/source/particles/shortlived/include/G4ExcitedDeltaConstructor.hh index 3a4a61f76f..3723666256 100644 --- a/source/particles/shortlived/include/G4ExcitedDeltaConstructor.hh +++ b/source/particles/shortlived/include/G4ExcitedDeltaConstructor.hh @@ -25,7 +25,7 @@ // // // $Id: G4ExcitedDeltaConstructor.hh,v 1.6 2006/06/29 19:26:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/particles/shortlived/include/G4ExcitedLambdaConstructor.hh b/source/particles/shortlived/include/G4ExcitedLambdaConstructor.hh index 8f22b18979..0209407994 100644 --- a/source/particles/shortlived/include/G4ExcitedLambdaConstructor.hh +++ b/source/particles/shortlived/include/G4ExcitedLambdaConstructor.hh @@ -25,7 +25,7 @@ // // // $Id: G4ExcitedLambdaConstructor.hh,v 1.8 2006/06/29 19:26:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/particles/shortlived/include/G4ExcitedMesonConstructor.hh b/source/particles/shortlived/include/G4ExcitedMesonConstructor.hh index 874785c2f5..d09d897994 100644 --- a/source/particles/shortlived/include/G4ExcitedMesonConstructor.hh +++ b/source/particles/shortlived/include/G4ExcitedMesonConstructor.hh @@ -31,7 +31,7 @@ // and all its terms. // // $Id: G4ExcitedMesonConstructor.hh,v 1.8 2006/06/29 19:26:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/particles/shortlived/include/G4ExcitedMesons.hh b/source/particles/shortlived/include/G4ExcitedMesons.hh index aa1e0b4d85..bb3a201888 100644 --- a/source/particles/shortlived/include/G4ExcitedMesons.hh +++ b/source/particles/shortlived/include/G4ExcitedMesons.hh @@ -25,7 +25,7 @@ // // // $Id: G4ExcitedMesons.hh,v 1.7 2006/06/29 19:26:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/shortlived/include/G4ExcitedNucleonConstructor.hh b/source/particles/shortlived/include/G4ExcitedNucleonConstructor.hh index dab811ec23..9fe197a491 100644 --- a/source/particles/shortlived/include/G4ExcitedNucleonConstructor.hh +++ b/source/particles/shortlived/include/G4ExcitedNucleonConstructor.hh @@ -25,7 +25,7 @@ // // // $Id: G4ExcitedNucleonConstructor.hh,v 1.6 2006/06/29 19:26:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/particles/shortlived/include/G4ExcitedSigmaConstructor.hh b/source/particles/shortlived/include/G4ExcitedSigmaConstructor.hh index a6897626eb..9f299e272e 100644 --- a/source/particles/shortlived/include/G4ExcitedSigmaConstructor.hh +++ b/source/particles/shortlived/include/G4ExcitedSigmaConstructor.hh @@ -25,7 +25,7 @@ // // // $Id: G4ExcitedSigmaConstructor.hh,v 1.6 2006/06/29 19:26:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/particles/shortlived/include/G4ExcitedXiConstructor.hh b/source/particles/shortlived/include/G4ExcitedXiConstructor.hh index 3c70bc07a7..c358a57a34 100644 --- a/source/particles/shortlived/include/G4ExcitedXiConstructor.hh +++ b/source/particles/shortlived/include/G4ExcitedXiConstructor.hh @@ -25,7 +25,7 @@ // // // $Id: G4ExcitedXiConstructor.hh,v 1.6 2006/06/29 19:26:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/particles/shortlived/include/G4Gluons.hh b/source/particles/shortlived/include/G4Gluons.hh index 907e348954..4488f3545a 100644 --- a/source/particles/shortlived/include/G4Gluons.hh +++ b/source/particles/shortlived/include/G4Gluons.hh @@ -25,7 +25,7 @@ // // // $Id: G4Gluons.hh,v 1.6 2006/06/29 19:26:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/shortlived/include/G4Quarks.hh b/source/particles/shortlived/include/G4Quarks.hh index 32a75bfc65..2db747c0cc 100644 --- a/source/particles/shortlived/include/G4Quarks.hh +++ b/source/particles/shortlived/include/G4Quarks.hh @@ -25,7 +25,7 @@ // // // $Id: G4Quarks.hh,v 1.6 2006/06/29 19:26:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/shortlived/include/G4ShortLivedConstructor.hh b/source/particles/shortlived/include/G4ShortLivedConstructor.hh index 9f41b84468..e5d47fd908 100644 --- a/source/particles/shortlived/include/G4ShortLivedConstructor.hh +++ b/source/particles/shortlived/include/G4ShortLivedConstructor.hh @@ -25,7 +25,7 @@ // // // $Id: G4ShortLivedConstructor.hh,v 1.6 2006/06/29 19:26:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/particles/shortlived/include/G4VShortLivedParticle.hh b/source/particles/shortlived/include/G4VShortLivedParticle.hh index c5bf73e8bf..29607453e3 100644 --- a/source/particles/shortlived/include/G4VShortLivedParticle.hh +++ b/source/particles/shortlived/include/G4VShortLivedParticle.hh @@ -25,7 +25,7 @@ // // // $Id: G4VShortLivedParticle.hh,v 1.8 2006/06/29 19:26:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/particles/shortlived/src/G4DiQuarks.cc b/source/particles/shortlived/src/G4DiQuarks.cc index 6c2bee54b2..0a3e2c8d23 100644 --- a/source/particles/shortlived/src/G4DiQuarks.cc +++ b/source/particles/shortlived/src/G4DiQuarks.cc @@ -25,7 +25,7 @@ // // // $Id: G4DiQuarks.cc,v 1.7 2006/06/29 19:26:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/shortlived/src/G4ExcitedBaryonConstructor.cc b/source/particles/shortlived/src/G4ExcitedBaryonConstructor.cc index 22178cc63c..7abba6eccf 100644 --- a/source/particles/shortlived/src/G4ExcitedBaryonConstructor.cc +++ b/source/particles/shortlived/src/G4ExcitedBaryonConstructor.cc @@ -25,7 +25,7 @@ // // // $Id: G4ExcitedBaryonConstructor.cc,v 1.7 2006/06/29 19:26:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/particles/shortlived/src/G4ExcitedBaryons.cc b/source/particles/shortlived/src/G4ExcitedBaryons.cc index 6ebdd8dfd7..f89f98978f 100644 --- a/source/particles/shortlived/src/G4ExcitedBaryons.cc +++ b/source/particles/shortlived/src/G4ExcitedBaryons.cc @@ -25,7 +25,7 @@ // // // $Id: G4ExcitedBaryons.cc,v 1.7 2006/06/29 19:26:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/shortlived/src/G4ExcitedDeltaConstructor.cc b/source/particles/shortlived/src/G4ExcitedDeltaConstructor.cc index 19d0d5b999..0b3c937b8f 100644 --- a/source/particles/shortlived/src/G4ExcitedDeltaConstructor.cc +++ b/source/particles/shortlived/src/G4ExcitedDeltaConstructor.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4ExcitedDeltaConstructor.cc,v 1.10 2006/06/29 19:27:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ExcitedDeltaConstructor.cc,v 1.11 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- @@ -481,7 +481,7 @@ const G4double G4ExcitedDeltaConstructor::mass[] = const G4double G4ExcitedDeltaConstructor::width[] = { 350.0*MeV, 145.0*MeV, 300.0*MeV, 200.0*MeV, 330.0*MeV, - 250.0*MeV, 200.0*MeV, 360.0*MeV, 285.0*MeV + 250.0*MeV, 200.0*MeV, 360.0*MeV, 280.0*MeV }; const G4int G4ExcitedDeltaConstructor::iSpin[] = diff --git a/source/particles/shortlived/src/G4ExcitedLambdaConstructor.cc b/source/particles/shortlived/src/G4ExcitedLambdaConstructor.cc index 7219503055..44aa4d04aa 100644 --- a/source/particles/shortlived/src/G4ExcitedLambdaConstructor.cc +++ b/source/particles/shortlived/src/G4ExcitedLambdaConstructor.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4ExcitedLambdaConstructor.cc,v 1.10 2006/06/29 19:27:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ExcitedLambdaConstructor.cc,v 1.11 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/particles/shortlived/src/G4ExcitedMesonConstructor.cc b/source/particles/shortlived/src/G4ExcitedMesonConstructor.cc index ec6905ee24..58913718af 100644 --- a/source/particles/shortlived/src/G4ExcitedMesonConstructor.cc +++ b/source/particles/shortlived/src/G4ExcitedMesonConstructor.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4ExcitedMesonConstructor.cc,v 1.17 2006/06/29 19:27:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ExcitedMesonConstructor.cc,v 1.19 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- @@ -388,34 +388,34 @@ G4DecayTable* G4ExcitedMesonConstructor::AddKTwoPiMode( if (iIso3 == +1) { if (iType == TK) { mode = new G4PhaseSpaceDecayChannel(nameParent, br/3., 2, - "k2(1770)+","pi0"); + "k2_star(1430)+","pi0"); decayTable->Insert(mode); mode = new G4PhaseSpaceDecayChannel(nameParent, br*2./3., 2, - "k2(1770)0","pi+"); + "k2_star(1430)0","pi+"); decayTable->Insert(mode); }else if (iType==TAntiK) { mode = new G4PhaseSpaceDecayChannel(nameParent, br/3., 2, - "anti_k2(1770)0","pi0"); + "anti_k2_star(1430)0","pi0"); decayTable->Insert(mode); mode = new G4PhaseSpaceDecayChannel(nameParent, br*2./3., 2, - "k2(1770)-","pi+"); + "k2_star(1430)-","pi+"); decayTable->Insert(mode); } } else if (iIso3 == -1) { if (iType == TK) { mode = new G4PhaseSpaceDecayChannel(nameParent, br/3., 2, - "k2(1770)0","pi0"); + "k2_star(1430)0","pi0"); decayTable->Insert(mode); mode = new G4PhaseSpaceDecayChannel(nameParent, br*2./3., 2, - "k2(1770)+","pi-"); + "k2_star(1430)+","pi-"); decayTable->Insert(mode); }else if (iType==TAntiK) { mode = new G4PhaseSpaceDecayChannel(nameParent, br/3., 2, - "k2(1770)-","pi0"); + "k2_star(1430)-","pi0"); decayTable->Insert(mode); mode = new G4PhaseSpaceDecayChannel(nameParent, br*2./3., 2, - "anti_k2(1770)0","pi-"); + "anti_k2_star(1430)0","pi-"); decayTable->Insert(mode); } } @@ -1399,16 +1399,16 @@ const char* G4ExcitedMesonConstructor::name[G4ExcitedMesonConstructor::NMultiple const G4double G4ExcitedMesonConstructor::mass[G4ExcitedMesonConstructor::NMultiplets ][ G4ExcitedMesonConstructor::NMesonTypes ] = { - { 1.2295*GeV, 1.170*GeV, 1.386*GeV, 1.273*GeV, 1.273*GeV }, - { 1.474*GeV, 1.370*GeV, 0.0, 1.412*GeV, 1.412*GeV }, + { 1.2295*GeV, 1.170*GeV, 1.386*GeV, 1.272*GeV, 1.273*GeV }, + { 1.474*GeV, 1.350*GeV, 0.0, 1.414*GeV, 1.414*GeV }, { 1.230*GeV,1.2818*GeV,1.4263*GeV, 1.402*GeV, 1.402*GeV }, - { 1.318*GeV,1.2754*GeV, 1.525*GeV,1.4256*GeV, 1.4256*GeV }, - { 1.672*GeV, 1.617*GeV, 1.842*GeV, 1.773*GeV, 1.773*GeV }, + { 1.3183*GeV,1.2754*GeV, 1.525*GeV,1.4256*GeV, 1.4256*GeV }, + { 1.6724*GeV, 1.617*GeV, 1.842*GeV, 1.773*GeV, 1.773*GeV }, { 1.720*GeV, 1.670*GeV, 0.0, 1.717*GeV, 1.717*GeV }, - { 1.688*GeV, 1.667*GeV, 1.854*GeV, 1.776*GeV, 1.776*GeV }, + { 1.6888*GeV, 1.667*GeV, 1.854*GeV, 1.776*GeV, 1.776*GeV }, { 1.300*GeV, 1.294*GeV, 1.476*GeV, 1.460*GeV, 1.460*GeV }, - { 1.465*GeV, 1.420*GeV, 1.680*GeV, 1.414*GeV, 1.414*GeV }, - { 0.0, 1.815*GeV, 2.011*GeV, 1.973*GeV, 1.973*GeV } + { 1.459*GeV, 1.425*GeV, 1.680*GeV, 1.414*GeV, 1.414*GeV }, + { 0.0, 1.815*GeV, 2.010*GeV, 1.973*GeV, 1.973*GeV } }; const G4double G4ExcitedMesonConstructor::massKdiff[ G4ExcitedMesonConstructor::NMultiplets ] = { @@ -1424,15 +1424,15 @@ const G4double G4ExcitedMesonConstructor::widthKdiff[ G4ExcitedMesonConstructor const G4double G4ExcitedMesonConstructor::width[G4ExcitedMesonConstructor::NMultiplets ][ G4ExcitedMesonConstructor::NMesonTypes ] = { { 142.0*MeV, 360.0*MeV, 91.0*MeV, 90.0*MeV, 90.0*MeV }, - { 265.0*MeV, 200.0*MeV, 0.0, 294.0*MeV, 294.0*MeV }, - { 400.0*MeV, 24.1*MeV, 54.9*MeV, 174.0*MeV, 174.0*MeV }, - { 105.0*MeV, 185.2*MeV, 73.0*MeV, 98.5*MeV, 98.5*MeV }, + { 265.0*MeV, 350.0*MeV, 0.0, 290.0*MeV, 290.0*MeV }, + { 420.0*MeV, 24.2*MeV, 54.9*MeV, 174.0*MeV, 174.0*MeV }, + { 107.0*MeV, 185.2*MeV, 73.0*MeV, 98.5*MeV, 98.5*MeV }, { 259.0*MeV, 181.0*MeV, 225.0*MeV, 186.0*MeV, 186.0*MeV }, - { 250.0*MeV, 315.0*MeV, 0.0, 322.0*MeV, 322.0*MeV }, + { 250.0*MeV, 315.0*MeV, 0.0, 320.0*MeV, 320.0*MeV }, { 161.0*MeV, 168.0*MeV, 87.0*MeV, 159.0*MeV, 159.0*MeV }, - { 220.0*MeV, 55.0*MeV, 87.0*MeV, 260.0*MeV, 260.0*MeV }, - { 400.0*MeV, 210.0*MeV, 150.0*MeV, 232.0*MeV, 232.0*MeV }, - { 0.0, 197.0*MeV, 202.0*MeV, 373.0*MeV, 373.0*MeV } + { 400.0*MeV, 55.0*MeV, 87.0*MeV, 260.0*MeV, 260.0*MeV }, + { 150.0*MeV, 215.0*MeV, 150.0*MeV, 232.0*MeV, 232.0*MeV }, + { 0.0, 197.0*MeV, 200.0*MeV, 373.0*MeV, 373.0*MeV } }; diff --git a/source/particles/shortlived/src/G4ExcitedMesons.cc b/source/particles/shortlived/src/G4ExcitedMesons.cc index 405c463e3f..54ed21d20f 100644 --- a/source/particles/shortlived/src/G4ExcitedMesons.cc +++ b/source/particles/shortlived/src/G4ExcitedMesons.cc @@ -25,7 +25,7 @@ // // // $Id: G4ExcitedMesons.cc,v 1.7 2006/06/29 19:27:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/shortlived/src/G4ExcitedNucleonConstructor.cc b/source/particles/shortlived/src/G4ExcitedNucleonConstructor.cc index 8afce167dd..b4a7252dc4 100644 --- a/source/particles/shortlived/src/G4ExcitedNucleonConstructor.cc +++ b/source/particles/shortlived/src/G4ExcitedNucleonConstructor.cc @@ -25,7 +25,7 @@ // // // $Id: G4ExcitedNucleonConstructor.cc,v 1.11 2006/06/29 19:27:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/particles/shortlived/src/G4ExcitedSigmaConstructor.cc b/source/particles/shortlived/src/G4ExcitedSigmaConstructor.cc index 2a0f9483a0..2e6c7b589a 100644 --- a/source/particles/shortlived/src/G4ExcitedSigmaConstructor.cc +++ b/source/particles/shortlived/src/G4ExcitedSigmaConstructor.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4ExcitedSigmaConstructor.cc,v 1.10 2006/06/29 19:27:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ExcitedSigmaConstructor.cc,v 1.11 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- @@ -574,12 +574,12 @@ const char* G4ExcitedSigmaConstructor::name[] = { }; const G4double G4ExcitedSigmaConstructor::mass[] = { - 1.3828*GeV, 1.660*GeV, 1.670*GeV, 1.750*GeV, 1.775*GeV, + 1.3837*GeV, 1.660*GeV, 1.670*GeV, 1.750*GeV, 1.775*GeV, 1.915*GeV, 1.940*GeV, 2.030*GeV }; const G4double G4ExcitedSigmaConstructor::width[] = { - 36.0*MeV, 100.0*MeV, 60.0*MeV, 90.0*MeV, 120.0*MeV, + 35.8*MeV, 100.0*MeV, 60.0*MeV, 90.0*MeV, 120.0*MeV, 120.0*MeV, 220.0*MeV, 180.0*MeV }; diff --git a/source/particles/shortlived/src/G4ExcitedXiConstructor.cc b/source/particles/shortlived/src/G4ExcitedXiConstructor.cc index 8313dcf7bc..c4810166f5 100644 --- a/source/particles/shortlived/src/G4ExcitedXiConstructor.cc +++ b/source/particles/shortlived/src/G4ExcitedXiConstructor.cc @@ -25,7 +25,7 @@ // // // $Id: G4ExcitedXiConstructor.cc,v 1.7 2006/06/29 19:27:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/particles/shortlived/src/G4Gluons.cc b/source/particles/shortlived/src/G4Gluons.cc index 489961578c..00bf62998a 100644 --- a/source/particles/shortlived/src/G4Gluons.cc +++ b/source/particles/shortlived/src/G4Gluons.cc @@ -25,7 +25,7 @@ // // // $Id: G4Gluons.cc,v 1.7 2006/06/29 19:27:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/shortlived/src/G4Quarks.cc b/source/particles/shortlived/src/G4Quarks.cc index c6dac035f7..39d43ecadb 100644 --- a/source/particles/shortlived/src/G4Quarks.cc +++ b/source/particles/shortlived/src/G4Quarks.cc @@ -25,7 +25,7 @@ // // // $Id: G4Quarks.cc,v 1.7 2006/06/29 19:27:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------------------------------------------------------------- diff --git a/source/particles/shortlived/src/G4ShortLivedConstructor.cc b/source/particles/shortlived/src/G4ShortLivedConstructor.cc index ba49730fb8..cde0fd5c1f 100644 --- a/source/particles/shortlived/src/G4ShortLivedConstructor.cc +++ b/source/particles/shortlived/src/G4ShortLivedConstructor.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4ShortLivedConstructor.cc,v 1.14 2006/06/29 19:27:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ShortLivedConstructor.cc,v 1.15 2006/10/12 10:59:45 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- @@ -33,6 +33,8 @@ // // Add "rho0" 25 Feb. 2000 H.Kurashige // Fix spin/isospin number for quarks 06 Apr. 2001 H.Kurashige +// update quark mass 11 Oct. 2006 H.Kurashige +// update meson/baryon masses 11 Oct. 2006 H.Kurashige #include "G4ShortLivedConstructor.hh" @@ -88,84 +90,84 @@ void G4ShortLivedConstructor::ConstructQuarks() particle->SetAntiPDGEncoding(21); // u-quark particle = new G4Quarks( - "u_quark", 8.0*MeV, 0.0*MeV, 2./3.*eplus, + "u_quark", 2.3*MeV, 0.0*MeV, 2./3.*eplus, 1, +1, 0, 1, +1, 0, "quarks", 0, 0, 2, true, -1.0, NULL); // d-quark particle = new G4Quarks( - "d_quark", 15.0*MeV, 0.0*MeV, -1./3.*eplus, + "d_quark", 5.0*MeV, 0.0*MeV, -1./3.*eplus, 1, +1, 0, 1, -1, 0, "quarks", 0, 0, 1, true, -1.0, NULL); // s-quark particle = new G4Quarks( - "s_quark", 300.0*MeV, 0.0*MeV, -1./3.*eplus, + "s_quark", 95.0*MeV, 0.0*MeV, -1./3.*eplus, 1, +1, 0, 0, 0, 0, "quarks", 0, 0, 3, true, -1.0, NULL); // c-quark particle = new G4Quarks( - "c_quark", 1.6*GeV, 0.0*MeV, +2./3.*eplus, + "c_quark", 1.25*GeV, 0.0*MeV, +2./3.*eplus, 1, +1, 0, 0, 0, 0, "quarks", 0, 0, 4, true, -1.0, NULL); // b-quark particle = new G4Quarks( - "b_quark", 4.5*GeV, 0.0*MeV, -1./3.*eplus, + "b_quark", 4.20*GeV, 0.0*MeV, -1./3.*eplus, 1, +1, 0, 0, 0, 0, "quarks", 0, 0, 5, true, -1.0, NULL); // t-quark particle = new G4Quarks( - "t_quark", 174.3*GeV, 0.0*MeV, +2./3.*eplus, + "t_quark", 174.2*GeV, 0.0*MeV, +2./3.*eplus, 1, +1, 0, 0, 0, 0, "quarks", 0, 0, 6, true, -1.0, NULL); // anti u-quark particle = new G4Quarks( - "anti_u_quark", 8.0*MeV, 0.0*MeV, -2./3.*eplus, + "anti_u_quark", 2.3*MeV, 0.0*MeV, -2./3.*eplus, 1, +1, 0, 1, -1, 0, "quarks", 0, 0, -2, true, -1.0, NULL); // anti d-quark particle = new G4Quarks( - "anti_d_quark", 15.0*MeV, 0.0*MeV, 1./3.*eplus, + "anti_d_quark", 5.0*MeV, 0.0*MeV, 1./3.*eplus, 1, +1, 0, 1, +1, 0, "quarks", 0, 0, -1, true, -1.0, NULL); // s-quark particle = new G4Quarks( - "anti_s_quark", 300.0*MeV, 0.0*MeV, 1./3.*eplus, + "anti_s_quark", 95.0*MeV, 0.0*MeV, 1./3.*eplus, 1, +1, 0, 0, 0, 0, "quarks", 0, 0, -3, true, -1.0, NULL); // c-quark particle = new G4Quarks( - "anti_c_quark", 1.6*GeV, 0.0*MeV, -2./3.*eplus, + "anti_c_quark", 1.25*GeV, 0.0*MeV, -2./3.*eplus, 1, +1, 0, 0, 0, 0, "quarks", 0, 0, -4, true, -1.0, NULL); // b-quark particle = new G4Quarks( - "anti_b_quark", 4.5*GeV, 0.0*MeV, 1./3.*eplus, + "anti_b_quark", 4.20*GeV, 0.0*MeV, 1./3.*eplus, 1, +1, 0, 0, 0, 0, "quarks", 0, 0, -5, true, -1.0, NULL); // t-quark particle = new G4Quarks( - "anti_t_quark", 174.0*GeV, 0.0*MeV, -2./3.*eplus, + "anti_t_quark", 174.2*GeV, 0.0*MeV, -2./3.*eplus, 1, +1, 0, 0, 0, 0, "quarks", 0, 0, -6, @@ -173,21 +175,21 @@ void G4ShortLivedConstructor::ConstructQuarks() // uu1-Diquark particle = new G4DiQuarks( - "uu1_diquark", 16.0*MeV, 0.0*MeV, 4./3.*eplus, + "uu1_diquark", 4.6*MeV, 0.0*MeV, 4./3.*eplus, 2, +1, 0, 2, +2, 0, "diquarks", 0, 0, 2203, true, -1.0, NULL); // ud1-Diquark particle = new G4DiQuarks( - "ud1_diquark", 23.0*MeV, 0.0*MeV, 1./3.*eplus, + "ud1_diquark", 7.3*MeV, 0.0*MeV, 1./3.*eplus, 2, +1, 0, 2, +0, 0, "diquarks", 0, 0, 2103, true, -1.0, NULL); // dd1-Diquark particle = new G4DiQuarks( - "dd1_diquark", 30.0*MeV, 0.0*MeV, -2./3.*eplus, + "dd1_diquark", 10.0*MeV, 0.0*MeV, -2./3.*eplus, 2, +1, 0, 2, -2, 0, "diquarks", 0, 0, 1103, @@ -195,7 +197,7 @@ void G4ShortLivedConstructor::ConstructQuarks() // ud0-Diquark particle = new G4DiQuarks( - "ud0_diquark", 23.0*MeV, 0.0*MeV, 1./3.*eplus, + "ud0_diquark", 7.3*MeV, 0.0*MeV, 1./3.*eplus, 0, +1, 0, 0, +0, 0, "diquarks", 0, 0, 2101, @@ -203,7 +205,7 @@ void G4ShortLivedConstructor::ConstructQuarks() // sd1-Diquark particle = new G4DiQuarks( - "sd1_diquark", 315.0*MeV, 0.0*MeV, -2./3.*eplus, + "sd1_diquark", 100.0*MeV, 0.0*MeV, -2./3.*eplus, 2, +1, 0, 1, -1, 0, "diquarks", 0, 0, 3103, @@ -211,7 +213,7 @@ void G4ShortLivedConstructor::ConstructQuarks() // su1-Diquark particle = new G4DiQuarks( - "su1_diquark", 308.0*MeV, 0.0*MeV, 1./3.*eplus, + "su1_diquark", 97.3*MeV, 0.0*MeV, 1./3.*eplus, 2, +1, 0, 1, +1, 0, "diquarks", 0, 0, 3203, @@ -219,7 +221,7 @@ void G4ShortLivedConstructor::ConstructQuarks() // sd0-Diquark particle = new G4DiQuarks( - "sd0_diquark", 315.0*MeV, 0.0*MeV, -2./3.*eplus, + "sd0_diquark", 100.0*MeV, 0.0*MeV, -2./3.*eplus, 0, +1, 0, 1, -1, 0, "diquarks", 0, 0, 3101, @@ -227,7 +229,7 @@ void G4ShortLivedConstructor::ConstructQuarks() // su0-Diquark particle = new G4DiQuarks( - "su0_diquark", 308.0*MeV, 0.0*MeV, 1./3.*eplus, + "su0_diquark", 97.3*MeV, 0.0*MeV, 1./3.*eplus, 0, +1, 0, 1, +1, 0, "diquarks", 0, 0, 3201, @@ -235,21 +237,21 @@ void G4ShortLivedConstructor::ConstructQuarks() // anti uu1-Diquark particle = new G4DiQuarks( - "anti_uu1_diquark", 16.0*MeV, 0.0*MeV, -4./3.*eplus, + "anti_uu1_diquark", 4.6*MeV, 0.0*MeV, -4./3.*eplus, 2, +1, 0, 2, -2, 0, "diquarks", 0, 0, -2203, true, -1.0, NULL); // anti ud1-Diquark particle = new G4DiQuarks( - "anti_ud1_diquark", 23.0*MeV, 0.0*MeV, -1./3.*eplus, + "anti_ud1_diquark", 7.3*MeV, 0.0*MeV, -1./3.*eplus, 2, +1, 0, 2, +0, 0, "diquarks", 0, 0, -2103, true, -1.0, NULL); // anti dd1-Diquark particle = new G4DiQuarks( - "anti_dd1_diquark", 30.0*MeV, 0.0*MeV, 2./3.*eplus, + "anti_dd1_diquark", 10.0*MeV, 0.0*MeV, 2./3.*eplus, 2, +1, 0, 2, +2, 0, "diquarks", 0, 0, -1103, @@ -257,7 +259,7 @@ void G4ShortLivedConstructor::ConstructQuarks() // anti ud0-Diquark particle = new G4DiQuarks( - "anti_ud0_diquark", 23.0*MeV, 0.0*MeV, -1./3.*eplus, + "anti_ud0_diquark", 7.3*MeV, 0.0*MeV, -1./3.*eplus, 0, +1, 0, 0, +0, 0, "diquarks", 0, 0, -2101, @@ -265,7 +267,7 @@ void G4ShortLivedConstructor::ConstructQuarks() // anti sd1-Diquark particle = new G4DiQuarks( - "anti_sd1_diquark", 315.0*MeV, 0.0*MeV, 2./3.*eplus, + "anti_sd1_diquark", 100.0*MeV, 0.0*MeV, 2./3.*eplus, 2, +1, 0, 1, +1, 0, "diquarks", 0, 0, -3103, @@ -273,7 +275,7 @@ void G4ShortLivedConstructor::ConstructQuarks() // anti su1-Diquark particle = new G4DiQuarks( - "anti_su1_diquark", 308.0*MeV, 0.0*MeV, -1./3.*eplus, + "anti_su1_diquark", 97.3*MeV, 0.0*MeV, -1./3.*eplus, 2, +1, 0, 1, -1, 0, "diquarks", 0, 0, -3203, @@ -281,7 +283,7 @@ void G4ShortLivedConstructor::ConstructQuarks() // anti sd0-Diquark particle = new G4DiQuarks( - "anti_sd0_diquark", 315.0*MeV, 0.0*MeV, 2./3.*eplus, + "anti_sd0_diquark", 100.0*MeV, 0.0*MeV, 2./3.*eplus, 0, +1, 0, 1, +1, 0, "diquarks", 0, 0, -3101, @@ -289,14 +291,14 @@ void G4ShortLivedConstructor::ConstructQuarks() // anti su0-Diquark particle = new G4DiQuarks( - "anti_su0_diquark", 308.0*MeV, 0.0*MeV, -1./3.*eplus, + "anti_su0_diquark", 97.3*MeV, 0.0*MeV, -1./3.*eplus, 0, +1, 0, 1, -1, 0, "diquarks", 0, 0, -3201, true, -1.0, NULL); - // anti ss1-Diquark + // ss1-Diquark particle = new G4DiQuarks( - "ss1_diquark", 600.0*MeV, 0.0*MeV, -2./3.*eplus, + "ss1_diquark", 190.0*MeV, 0.0*MeV, -2./3.*eplus, 2, +1, 0, 0, 0, 0, "diquarks", 0, 0, 3303, @@ -304,7 +306,7 @@ void G4ShortLivedConstructor::ConstructQuarks() // anti ss1-Diquark particle = new G4DiQuarks( - "anti_ss1_diquark", 600.0*MeV, 0.0*MeV, 2./3.*eplus, + "anti_ss1_diquark", 190.0*MeV, 0.0*MeV, 2./3.*eplus, 2, +1, 0, 0, 0, 0, "diquarks", 0, 0, -3303, @@ -446,7 +448,7 @@ void G4ShortLivedConstructor::ConstructBaryons() // delta(1232)- particle = new G4ExcitedBaryons( - "delta-", 1.232*GeV, 120.0*MeV, -1.0*eplus, + "delta-", 1.232*GeV, 118.0*MeV, -1.0*eplus, 3, +1, 0, 3, -3, 0, "baryon", 0, +1, 1114, @@ -532,7 +534,7 @@ void G4ShortLivedConstructor::ConstructBaryons() // anti_delta(1232)- particle = new G4ExcitedBaryons( - "anti_delta-", 1.232*GeV, 120.0*MeV, +1.0*eplus, + "anti_delta-", 1.232*GeV, 118.0*MeV, +1.0*eplus, 3, +1, 0, 3, +3, 0, "baryon", 0, -1, -1114, @@ -569,7 +571,7 @@ void G4ShortLivedConstructor::ConstructMesons() // vector mesons // omega particle = new G4ExcitedMesons( - "omega", 782.57*MeV, 8.49*MeV, +0.0*eplus, + "omega", 782.65*MeV, 8.49*MeV, +0.0*eplus, 2, -1, -1, 0, +0, -1, "meson", 0, 0, 223, @@ -672,7 +674,7 @@ void G4ShortLivedConstructor::ConstructMesons() // rho0 particle = new G4ExcitedMesons( - "rho0", 775.8*MeV, 150.3*MeV, 0.0, + "rho0", 775.5*MeV, 149.4*MeV, 0.0, 2, -1, -1, 2, 0, +1, "meson", 0, 0, 113, @@ -730,7 +732,7 @@ void G4ShortLivedConstructor::ConstructMesons() // a0(980)0 particle = new G4ExcitedMesons( - "a0(980)0", 984.7*MeV, 60.0*MeV, 0.0, + "a0(980)0", 984.7*MeV, 75.0*MeV, 0.0, 0, +1, +1, 2, 0, -1, "meson", 0, 0, 9000111, @@ -748,28 +750,9 @@ void G4ShortLivedConstructor::ConstructMesons() decayTable->Insert(mode); particle->SetDecayTable(decayTable); - // f0(400-1200) + // f0(600) (was f0(400-1200)) particle = new G4ExcitedMesons( - "f0(600)", 470.0*MeV, 400.0*MeV, 0.0, - 0, +1, +1, - 0, 0, +1, - "meson", 0, 0, 9000221, - false, 0.0, NULL); - particle->SetAntiPDGEncoding(9000221); - // set sub type - particle->SetMultipletName("f0(600)"); - // create decay table - decayTable = new G4DecayTable(); - // create decay channel of f0(600) -> pi + pi - // parent BR #daughters - mode = new G4PhaseSpaceDecayChannel("f0(600)",1.000, 2, - "pi+","pi-"); - // add decay table - decayTable->Insert(mode); - particle->SetDecayTable(decayTable); - // f0(400-1200) - particle = new G4ExcitedMesons( - "f0(600)", 470.0*MeV, 400.0*MeV, 0.0, + "f0(600)", 800.0*MeV, 800.0*MeV, 0.0, 0, +1, +1, 0, 0, +1, "meson", 0, 0, 9000221, @@ -790,7 +773,7 @@ void G4ShortLivedConstructor::ConstructMesons() // f0(980) particle = new G4ExcitedMesons( - "f0(980)", 980.0*MeV, 40.0*MeV, 0.0, + "f0(980)", 980.0*MeV, 70.0*MeV, 0.0, 0, +1, +1, 0, 0, +1, "meson", 0, 0, 9010221, @@ -808,15 +791,33 @@ void G4ShortLivedConstructor::ConstructMesons() decayTable->Insert(mode); particle->SetDecayTable(decayTable); - + // eta(1405) + particle = new G4ExcitedMesons( + "eta(1405)", 1409.8*MeV, 51.1*MeV, 0.0, + 0, -1, +1, + 0, 0, +1, + "meson", 0, 0, 9020221, + false, 0.0, NULL); + particle->SetAntiPDGEncoding(9020221); + // set sub type + particle->SetMultipletName("eta(1405)"); + // create decay table + decayTable = new G4DecayTable(); + // create decay channel of eta(1405) -> rho + rho + // parent BR #daughters + mode = new G4PhaseSpaceDecayChannel("eta(1405)",1.000, 2, + "rho+","rho-"); + // add decay table + decayTable->Insert(mode); + particle->SetDecayTable(decayTable); // f0(1500) particle = new G4ExcitedMesons( "f0(1500)", 1507.0*MeV, 109.0*MeV, 0.0, 0, +1, +1, 0, 0, +1, - "meson", 0, 0, 9020221, + "meson", 0, 0, 9030221, false, 0.0, NULL); - particle->SetAntiPDGEncoding(9020221); + particle->SetAntiPDGEncoding(9030221); // set sub type particle->SetMultipletName("f0(1500)"); // create decay table @@ -831,7 +832,7 @@ void G4ShortLivedConstructor::ConstructMesons() // f0(1710) particle = new G4ExcitedMesons( - "f0(1710)", 1713.0*MeV, 125.0*MeV, 0.0, + "f0(1710)", 1718.0*MeV, 137.0*MeV, 0.0, 0, +1, +1, 0, 0, +1, "meson", 0, 0, 10331, @@ -892,7 +893,7 @@ void G4ShortLivedConstructor::ConstructMesons() // k_star0 particle = new G4ExcitedMesons( - "k_star0", 896.1*MeV, 50.7*MeV, 0.0*eplus, + "k_star0", 896.0*MeV, 50.3*MeV, 0.0*eplus, 2, -1, 0, 1, -1, 0, "meson", 0, 0, 313, @@ -943,7 +944,7 @@ void G4ShortLivedConstructor::ConstructMesons() // anti_k_star0 particle = new G4ExcitedMesons( - "anti_k_star0", 896.1*MeV, 50.7*MeV, 0.0*eplus, + "anti_k_star0", 896.0*MeV, 50.3*MeV, 0.0*eplus, 2, -1, 0, 1, -1, 0, "meson", 0, 0, -313, diff --git a/source/particles/shortlived/src/G4VShortLivedParticle.cc b/source/particles/shortlived/src/G4VShortLivedParticle.cc index 7a2f020168..d36723f4fe 100644 --- a/source/particles/shortlived/src/G4VShortLivedParticle.cc +++ b/source/particles/shortlived/src/G4VShortLivedParticle.cc @@ -25,7 +25,7 @@ // // // $Id: G4VShortLivedParticle.cc,v 1.8 2006/06/29 19:27:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/particles/utils/include/G4HtmlPPReporter.hh b/source/particles/utils/include/G4HtmlPPReporter.hh index 64ab702f9c..ec950faafa 100644 --- a/source/particles/utils/include/G4HtmlPPReporter.hh +++ b/source/particles/utils/include/G4HtmlPPReporter.hh @@ -30,7 +30,7 @@ // and all its terms. // // $Id: G4HtmlPPReporter.hh,v 1.2 2006/06/29 19:27:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // --------------------------------------------------------------- diff --git a/source/particles/utils/include/G4SimplePPReporter.hh b/source/particles/utils/include/G4SimplePPReporter.hh index 73376f083c..482de7b1dd 100644 --- a/source/particles/utils/include/G4SimplePPReporter.hh +++ b/source/particles/utils/include/G4SimplePPReporter.hh @@ -30,7 +30,7 @@ // and all its terms. // // $Id: G4SimplePPReporter.hh,v 1.2 2006/06/29 19:27:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // --------------------------------------------------------------- diff --git a/source/particles/utils/include/G4TextPPReporter.hh b/source/particles/utils/include/G4TextPPReporter.hh index f9eee4bd7e..b89c7cad64 100644 --- a/source/particles/utils/include/G4TextPPReporter.hh +++ b/source/particles/utils/include/G4TextPPReporter.hh @@ -30,7 +30,7 @@ // and all its terms. // // $Id: G4TextPPReporter.hh,v 1.2 2006/06/29 19:27:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // --------------------------------------------------------------- diff --git a/source/particles/utils/include/G4TextPPRetriever.hh b/source/particles/utils/include/G4TextPPRetriever.hh index a54685d7e0..3ba21f8dd8 100644 --- a/source/particles/utils/include/G4TextPPRetriever.hh +++ b/source/particles/utils/include/G4TextPPRetriever.hh @@ -30,7 +30,7 @@ // and all its terms. // // $Id: G4TextPPRetriever.hh,v 1.2 2006/06/29 19:27:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // --------------------------------------------------------------- diff --git a/source/particles/utils/include/G4VParticlePropertyReporter.hh b/source/particles/utils/include/G4VParticlePropertyReporter.hh index 103f0e388c..bf8e714803 100644 --- a/source/particles/utils/include/G4VParticlePropertyReporter.hh +++ b/source/particles/utils/include/G4VParticlePropertyReporter.hh @@ -30,7 +30,7 @@ // and all its terms. // // $Id: G4VParticlePropertyReporter.hh,v 1.2 2006/06/29 19:27:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // --------------------------------------------------------------- diff --git a/source/particles/utils/include/G4VParticlePropertyRetriever.hh b/source/particles/utils/include/G4VParticlePropertyRetriever.hh index f5cb4ebfb8..84509ecfa0 100644 --- a/source/particles/utils/include/G4VParticlePropertyRetriever.hh +++ b/source/particles/utils/include/G4VParticlePropertyRetriever.hh @@ -30,7 +30,7 @@ // and all its terms. // // $Id: G4VParticlePropertyRetriever.hh,v 1.2 2006/06/29 19:27:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // --------------------------------------------------------------- diff --git a/source/particles/utils/src/G4HtmlPPReporter.cc b/source/particles/utils/src/G4HtmlPPReporter.cc index afcfad43aa..41b191cd86 100644 --- a/source/particles/utils/src/G4HtmlPPReporter.cc +++ b/source/particles/utils/src/G4HtmlPPReporter.cc @@ -30,7 +30,7 @@ // and all its terms. // // $Id: G4HtmlPPReporter.cc,v 1.4 2006/06/29 19:27:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // --------------------------------------------------------------- diff --git a/source/particles/utils/src/G4SimplePPReporter.cc b/source/particles/utils/src/G4SimplePPReporter.cc index 93984dc1cf..9f69a5ccdb 100644 --- a/source/particles/utils/src/G4SimplePPReporter.cc +++ b/source/particles/utils/src/G4SimplePPReporter.cc @@ -30,7 +30,7 @@ // and all its terms. // // $Id: G4SimplePPReporter.cc,v 1.2 2006/06/29 19:28:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // --------------------------------------------------------------- diff --git a/source/particles/utils/src/G4TextPPReporter.cc b/source/particles/utils/src/G4TextPPReporter.cc index 7abb0734d0..114e57134f 100644 --- a/source/particles/utils/src/G4TextPPReporter.cc +++ b/source/particles/utils/src/G4TextPPReporter.cc @@ -30,7 +30,7 @@ // and all its terms. // // $Id: G4TextPPReporter.cc,v 1.2 2006/06/29 19:28:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // --------------------------------------------------------------- diff --git a/source/particles/utils/src/G4TextPPRetriever.cc b/source/particles/utils/src/G4TextPPRetriever.cc index 0564edb7cd..5cf032a570 100644 --- a/source/particles/utils/src/G4TextPPRetriever.cc +++ b/source/particles/utils/src/G4TextPPRetriever.cc @@ -30,7 +30,7 @@ // and all its terms. // // $Id: G4TextPPRetriever.cc,v 1.2 2006/06/29 19:28:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // --------------------------------------------------------------- diff --git a/source/particles/utils/src/G4VParticlePropertyReporter.cc b/source/particles/utils/src/G4VParticlePropertyReporter.cc index b06fb543d7..98aaa61732 100644 --- a/source/particles/utils/src/G4VParticlePropertyReporter.cc +++ b/source/particles/utils/src/G4VParticlePropertyReporter.cc @@ -30,7 +30,7 @@ // and all its terms. // // $Id: G4VParticlePropertyReporter.cc,v 1.2 2006/06/29 19:28:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // --------------------------------------------------------------- diff --git a/source/persistency/GNUmakefile b/source/persistency/GNUmakefile index c2e9aa906e..ccf0d617a0 100644 --- a/source/persistency/GNUmakefile +++ b/source/persistency/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.25 2004/06/03 09:38:45 gcosmo Exp $ +# $Id: GNUmakefile,v 1.26 2006/11/14 16:12:17 gcosmo Exp $ # ----------------------------------------------------------------------- # GNUmakefile for persistency library. Gabriele Cosmo, 16/11/96. # ----------------------------------------------------------------------- @@ -27,6 +27,12 @@ CPPFLAGS += -I$(G4INSTALL)/source/global/management/include \ -I$(G4INSTALL)/source/tracking/include \ -I$(G4INSTALL)/source/intercoms/include \ -I$(G4INSTALL)/source/geometry/management/include +ifdef G4LIB_USE_HEPMC + ifndef HEPMC_DIR + @echo HEPMC_DIR not defined! + endif + CPPFLAGS += -I$(HEPMC_DIR)/include +endif include $(G4INSTALL)/config/common.gmk diff --git a/source/persistency/History b/source/persistency/History index 57e73dd76c..1aaf668962 100644 --- a/source/persistency/History +++ b/source/persistency/History @@ -15,6 +15,19 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +14 November, 06 G.Cosmo (persistency-V08-01-02) +- Cleared trivial compilation warnings in G4PersistencyManager implementation. +- Added setup for retrieving HepMC in case G4LIB_USE_HEPMC is set and the + HEPMC_DIR path defined in the environment. + +30 October, 06 W.Pokorski (persistency-V08-01-01) +- Put 'ifdef G4LIB_USE_HEPMC' in all the places which explicitly use HepMC + classes to allow compilation with CLHEP 2.0.3.0. + +22 August, 06 G.Cosmo (persistency-V08-01-00) +- Get Rid of useless forward declarations in G4MCTEvent and G4MCTGenParticle + header files. Clearing compilation warnings on icc-9.X compilers. + 28 June, 05 G.Cosmo (persistency-V07-01-01) - Trivial fixes to G4MCTSimParticle and G4MCTSimVertex to support for CLHEP-2.0.X series. diff --git a/source/persistency/include/G4MCTEvent.hh b/source/persistency/include/G4MCTEvent.hh index 27e41b2c98..c110c15d3d 100644 --- a/source/persistency/include/G4MCTEvent.hh +++ b/source/persistency/include/G4MCTEvent.hh @@ -42,8 +42,6 @@ class G4MCTGenEvent; class G4MCTSimEvent; class G4MCTSimParticle; -class HepMC::GenEvent; -class HepMC::GenParticle; typedef std::map MCTGen2SimParticleMap; typedef std::map MCTSim2GenParticleMap; diff --git a/source/persistency/include/G4MCTGenParticle.hh b/source/persistency/include/G4MCTGenParticle.hh index 7e8351a803..1313300343 100644 --- a/source/persistency/include/G4MCTGenParticle.hh +++ b/source/persistency/include/G4MCTGenParticle.hh @@ -34,9 +34,6 @@ #include "CLHEP/HepMC/GenEvent.h" #include "CLHEP/HepMC/GenParticle.h" -class HepMC::GenEvent; -class HepMC::GenParticle; - typedef std::pair G4MCTGenParticle; #endif diff --git a/source/persistency/include/G4PersistencyManager.hh b/source/persistency/include/G4PersistencyManager.hh index adde3e4e1c..985028653c 100644 --- a/source/persistency/include/G4PersistencyManager.hh +++ b/source/persistency/include/G4PersistencyManager.hh @@ -32,11 +32,15 @@ #define PERSISTENCY_MANAGER_HH 1 #include "G4Event.hh" + #ifndef WIN32 +#ifdef G4LIB_USE_HEPMC #include "CLHEP/HepMC/GenEvent.h" #include "G4VHepMCIO.hh" #include "G4VMCTruthIO.hh" #endif +#endif + #include "G4HCIOcatalog.hh" #include "G4DCIOcatalog.hh" #include "G4VPEventIO.hh" @@ -149,6 +153,7 @@ class G4PersistencyManager // Returns the current digit I/O handling manager // Each derived class should return the pointer of actual manager. #ifndef WIN32 +#ifdef G4LIB_USE_HEPMC virtual G4VHepMCIO* HepMCIO() { return 0; }; // Returns the current HepMC I/O handling manager // Each derived class should return the pointer of actual manager. @@ -156,6 +161,7 @@ class G4PersistencyManager virtual G4VMCTruthIO* MCTruthIO() { return 0; }; // Returns the current MCTruth I/O handling manager // Each derived class should return the pointer of actual manager. +#endif #endif virtual G4VTransactionManager* TransactionManager() { return 0; }; // Returns the current transaction manager @@ -174,9 +180,11 @@ class G4PersistencyManager G4bool Retrieve(G4Event*& evt); // Retrieve the G4Event and its associated objects #ifndef WIN32 +#ifdef G4LIB_USE_HEPMC G4bool Retrieve(HepMC::GenEvent*& evt, int id=-1); // retrieves HepMC GenEvent and its associated object. // To be used by generator/HepMCObjyReader. +#endif #endif G4bool Store(const G4Run*) {return false;}; // not used diff --git a/source/persistency/include/G4VPEventIO.hh b/source/persistency/include/G4VPEventIO.hh index c8b71f7f49..341361947b 100644 --- a/source/persistency/include/G4VPEventIO.hh +++ b/source/persistency/include/G4VPEventIO.hh @@ -34,10 +34,12 @@ #include "G4Event.hh" #ifndef WIN32 +#ifdef G4LIB_USE_HEPMC #include "CLHEP/HepMC/GenEvent.h" // not yet // #include "G4MCTEvent.hh" #include "G4Pevent.hh" #endif +#endif // Class Description: // Abstract base class for storing and retrieving an event object @@ -61,12 +63,14 @@ class G4VPEventIO virtual G4bool Store( const G4Event* anEvent ) =0; // Store a Geant4 event. #ifndef WIN32 +#ifdef G4LIB_USE_HEPMC // virtual G4bool Store( HepMC::GenEvent* hepevt, G4MCTEvent* mctevt, const G4Event* anEvent ) =0; virtual G4bool Store( HepMC::GenEvent* hepevt, const G4Event* anEvent ) =0; // Store a Geant4 event. virtual G4bool Retrieve( G4Pevent*& anEvent ) =0; // Retrieve a Geant4 event. +#endif #endif virtual G4bool Retrieve( G4Event*& anEvent ) =0; // Retrieve a Geant4 event. diff --git a/source/persistency/src/G4MCTEvent.cc b/source/persistency/src/G4MCTEvent.cc index 1076a28e5a..6af4bf9e0d 100644 --- a/source/persistency/src/G4MCTEvent.cc +++ b/source/persistency/src/G4MCTEvent.cc @@ -28,6 +28,7 @@ // ==================================================================== #ifndef WIN32 +#ifdef G4LIB_USE_HEPMC #include "G4ios.hh" #include "G4MCTEvent.hh" @@ -120,3 +121,4 @@ void G4MCTEvent::Print(std::ostream& ostr) const } #endif +#endif diff --git a/source/persistency/src/G4MCTGenEvent.cc b/source/persistency/src/G4MCTGenEvent.cc index 00e8fa74b3..36d011ff0a 100644 --- a/source/persistency/src/G4MCTGenEvent.cc +++ b/source/persistency/src/G4MCTGenEvent.cc @@ -29,6 +29,8 @@ #ifndef WIN32 +#ifdef G4LIB_USE_HEPMC + #include "G4MCTGenEvent.hh" #include "CLHEP/HepMC/GenParticle.h" @@ -96,3 +98,4 @@ void G4MCTGenEvent::Print(std::ostream& ostr) const } #endif +#endif diff --git a/source/persistency/src/G4PersistencyManager.cc b/source/persistency/src/G4PersistencyManager.cc index 49cd1e8327..599a61beea 100644 --- a/source/persistency/src/G4PersistencyManager.cc +++ b/source/persistency/src/G4PersistencyManager.cc @@ -68,8 +68,10 @@ void G4PersistencyManager::SetVerboseLevel(int v) } if ( EventIO() != 0 ) EventIO()->SetVerboseLevel(m_verbose); #ifndef WIN32 +#ifdef G4LIB_USE_HEPMC if ( HepMCIO() != 0 ) HepMCIO()->SetVerboseLevel(m_verbose); if ( MCTruthIO() != 0 ) MCTruthIO()->SetVerboseLevel(m_verbose); +#endif #endif if ( HitIO() != 0 ) HitIO()->SetVerboseLevel(m_verbose); if ( DigitIO() != 0 ) DigitIO()->SetVerboseLevel(m_verbose); @@ -121,8 +123,7 @@ G4bool G4PersistencyManager::Store(const G4Event* evt) Initialize(); } - G4bool sthep = true, stmct = true; - G4bool st1 = true, st2 = true, st3 = true; + G4bool st1 = true, st2 = true; // Start event IO transaction // @@ -141,6 +142,9 @@ G4bool G4PersistencyManager::Store(const G4Event* evt) std::string obj; #ifndef WIN32 +#ifdef G4LIB_USE_HEPMC + + G4bool sthep = true, stmct = true, st3 = true; // Store HepMC event // @@ -193,6 +197,7 @@ G4bool G4PersistencyManager::Store(const G4Event* evt) } // end of if ( mctevt != 0 ) } +#endif #endif // Store hits collection @@ -234,6 +239,7 @@ G4bool G4PersistencyManager::Store(const G4Event* evt) } #ifndef WIN32 +#ifdef G4LIB_USE_HEPMC // Store this G4EVENT // @@ -255,6 +261,12 @@ G4bool G4PersistencyManager::Store(const G4Event* evt) G4bool st = sthep && stmct && st1 && st2 && st3; +#else + + G4bool st = st1 && st2; + +#endif + #else G4bool st = st1 && st2; @@ -348,6 +360,7 @@ G4bool G4PersistencyManager::Retrieve(G4Event*& evt) } #ifndef WIN32 +#ifdef G4LIB_USE_HEPMC // Implementation of Retrieve G4bool G4PersistencyManager::Retrieve(HepMC::GenEvent*& evt, int id) @@ -414,6 +427,7 @@ G4bool G4PersistencyManager::Retrieve(HepMC::GenEvent*& evt, int id) return st; } #endif +#endif // End of G4PersistencyManager.cc diff --git a/source/persistency/src/G4Pevent.cc b/source/persistency/src/G4Pevent.cc index 5cf2cd7d4d..b7fd5fff22 100644 --- a/source/persistency/src/G4Pevent.cc +++ b/source/persistency/src/G4Pevent.cc @@ -29,6 +29,7 @@ // '01.11.18 Youhei Morita Initial creation #ifndef WIN32 +#ifdef G4LIB_USE_HEPMC #include "G4Pevent.hh" @@ -48,3 +49,4 @@ G4Pevent::~G4Pevent() } #endif +#endif diff --git a/source/persistency/src/G4VHepMCIO.cc b/source/persistency/src/G4VHepMCIO.cc index b7ad1c9cda..0029ad266b 100644 --- a/source/persistency/src/G4VHepMCIO.cc +++ b/source/persistency/src/G4VHepMCIO.cc @@ -29,6 +29,7 @@ // '01.11.18 Youhei Morita Initial creation #ifndef WIN32 +#ifdef G4LIB_USE_HEPMC #include "G4VHepMCIO.hh" @@ -40,3 +41,4 @@ G4VHepMCIO::G4VHepMCIO() // End of G4VHepMCIO.cc #endif +#endif diff --git a/source/persistency/src/G4VMCTruthIO.cc b/source/persistency/src/G4VMCTruthIO.cc index fa893ace59..a68964b85b 100644 --- a/source/persistency/src/G4VMCTruthIO.cc +++ b/source/persistency/src/G4VMCTruthIO.cc @@ -29,6 +29,7 @@ // '01.11.18 Youhei Morita Initial creation #ifndef WIN32 +#ifdef G4LIB_USE_HEPMC #include "G4VMCTruthIO.hh" @@ -38,3 +39,4 @@ G4VMCTruthIO::G4VMCTruthIO() {} #endif +#endif diff --git a/source/persistency/tools/README b/source/persistency/tools/README deleted file mode 100644 index cf16dbf4ca..0000000000 --- a/source/persistency/tools/README +++ /dev/null @@ -1,3 +0,0 @@ - -The files in this directory are intended for developpers' use. - diff --git a/source/persistency/tools/g4pmv.sh b/source/persistency/tools/g4pmv.sh deleted file mode 100755 index ede7d62741..0000000000 --- a/source/persistency/tools/g4pmv.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/csh -f -set file = $1 -set tmpfile = fadsmv.tmp.$$ -#if ( ! -f $file ) then -# echo "File $file does not exist. Stop." -# exit 1 -#endif - -set filename = `basename $file` -set filepath = `dirname $file` - -echo $filename | sed \ --e 's/DCIOcatalog/G4DCIOcatalog/g' \ --e 's/DCIOentryT/G4DCIOentryT/g' \ --e 's/FADSevent/G4Pevent/g' \ --e 's/FileUtilities/G4FileUtilities/g' \ --e 's/HCIOcatalog/G4HCIOcatalog/g' \ --e 's/HCIOentryT/G4HCIOentryT/g' \ --e 's/PersistencyCenter/G4PersistencyCenter/g' \ --e 's/PersistencyCenterMessenger/G4PersistencyCenterMessenger/g' \ --e 's/PersistencyManager/G4PersistencyManager/g' \ --e 's/PersistencyManagerT/G4PersistencyManagerT/g' \ --e 's/VDCIOentry/G4VDCIOentry/g' \ --e 's/VHCIOentry/G4VHCIOentry/g' \ --e 's/VHepMCIO/G4VHepMCIO/g' \ --e 's/VMCTruthIO/G4VMCTruthIO/g' \ --e 's/VPDigitIO/G4VPDigitIO/g' \ --e 's/VPDigitsCollectionIO/G4VPDigitsCollectionIO/g' \ --e 's/VPEventIO/G4VPEventIO/g' \ --e 's/VPHitIO/G4VPHitIO/g' \ --e 's/VPHitsCollectionIO/G4VPHitsCollectionIO/g' \ --e 's/VTransactionManager/G4VTransactionManager/g' \ - -e 's/MCTEvent/G4MCTEvent/g' \ - -e 's/MCTEventAction/G4MCTEventAction/g' \ - -e 's/MCTGenEvent/G4MCTGenEvent/g' \ - -e 's/MCTGenParticle/G4MCTGenParticle/g' \ - -e 's/MCTManager/G4MCTManager/g' \ - -e 's/MCTMessenger/G4MCTMessenger/g' \ - -e 's/MCTSimEvent/G4MCTSimEvent/g' \ - -e 's/MCTSimParticle/G4MCTSimParticle/g' \ - -e 's/MCTSimVertex/G4MCTSimVertex/g' \ - -e 's/MCTSteppingAction/G4MCTSteppingAction/g' \ - -e 's/MCTVStoreSelection/G4MCTVStoreSelection/g' \ - -e 's/MCTVUserFilter/G4MCTVUserFilter/g' \ --e 's/G4G4/G4/g' \ - > $tmpfile - -set filename2 = `cat $tmpfile` - -if ( $filename != $filename2 ) then - echo "mv -f $filepath/$filename $filepath/$filename2" - mv -f $filepath/$filename $filepath/$filename2 -endif - -rm -f $tmpfile - diff --git a/source/persistency/tools/g4psed.sh b/source/persistency/tools/g4psed.sh deleted file mode 100755 index 0aa7618954..0000000000 --- a/source/persistency/tools/g4psed.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/csh -f -set file = $1 -set tmpfile = $1.tmp.$$ -if ( ! -f $file ) then - echo "File $file does not exist. Stop." - exit 1 -endif - -cat $file | sed \ --e 's/DCIOcatalog/G4DCIOcatalog/g' \ --e 's/DCIOentryT/G4DCIOentryT/g' \ --e 's/FADSevent/G4Pevent/g' \ --e 's/FileUtilities/G4FileUtilities/g' \ --e 's/HCIOcatalog/G4HCIOcatalog/g' \ --e 's/HCIOentryT/G4HCIOentryT/g' \ --e 's/PersistencyCenter/G4PersistencyCenter/g' \ --e 's/PersistencyCenterMessenger/G4PersistencyCenterMessenger/g' \ --e 's/PersistencyManager/G4PersistencyManager/g' \ --e 's/PersistencyManagerT/G4PersistencyManagerT/g' \ --e 's/VDCIOentry/G4VDCIOentry/g' \ --e 's/VHCIOentry/G4VHCIOentry/g' \ --e 's/VHepMCIO/G4VHepMCIO/g' \ --e 's/VMCTruthIO/G4VMCTruthIO/g' \ --e 's/VPDigitIO/G4VPDigitIO/g' \ --e 's/VPDigitsCollectionIO/G4VPDigitsCollectionIO/g' \ --e 's/VPEventIO/G4VPEventIO/g' \ --e 's/VPHitIO/G4VPHitIO/g' \ --e 's/VPHitsCollectionIO/G4VPHitsCollectionIO/g' \ --e 's/VTransactionManager/G4VTransactionManager/g' \ - -e 's/MCTEvent/G4MCTEvent/g' \ - -e 's/MCTEventAction/G4MCTEventAction/g' \ - -e 's/MCTGenEvent/G4MCTGenEvent/g' \ - -e 's/MCTGenParticle/G4MCTGenParticle/g' \ - -e 's/MCTManager/G4MCTManager/g' \ - -e 's/MCTMessenger/G4MCTMessenger/g' \ - -e 's/MCTSimEvent/G4MCTSimEvent/g' \ - -e 's/MCTSimParticle/G4MCTSimParticle/g' \ - -e 's/MCTSimVertex/G4MCTSimVertex/g' \ - -e 's/MCTSteppingAction/G4MCTSteppingAction/g' \ - -e 's/MCTVStoreSelection/G4MCTVStoreSelection/g' \ - -e 's/MCTVUserFilter/G4MCTVUserFilter/g' \ --e 's/G4G4/G4/g' \ --e 's/G4VG4/G4V/g' \ --e 's/GetG4/Get/g' \ --e 's/CurrentG4/Current/g' \ --e 's/SetG4PersistencyManager/SetPersistencyManager/g' \ --e 's/RegisterG4PersistencyManager/RegisterPersistencyManager/g' \ --e 's/DeleteG4PersistencyManager/DeletePersistencyManager/g' \ --e 's/FADS\/Goofy tag/GEANT4 tag/g' \ - > $tmpfile - -diff $file $tmpfile - -mv -f $file ${file}.org -mv -f $tmpfile $file - diff --git a/source/persistency/tools/rename.sh b/source/persistency/tools/rename.sh deleted file mode 100755 index 187fe3eed3..0000000000 --- a/source/persistency/tools/rename.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -find . -name '*.hh' -exec $HOME/bin/g4pmv.sh "{}" \; -find . -name '*.cc' -exec $HOME/bin/g4pmv.sh "{}" \; diff --git a/source/persistency/tools/setup.csh b/source/persistency/tools/setup.csh deleted file mode 100644 index ec2876a1b1..0000000000 --- a/source/persistency/tools/setup.csh +++ /dev/null @@ -1,8 +0,0 @@ -setenv G4INSTALL $HOME/geant4/cvsco/geant4 -setenv G4SYSTEM Linux-g++ -setenv G4LIB_BUILD_SHARED 1 - -# CLHEP (1.80) -set clhep_vers = 1.8.0.0 -setenv CLHEP_BASE_DIR /usr/local/CLHEP/$clhep_vers - diff --git a/source/physics_lists/GNUmakefile b/source/physics_lists/GNUmakefile new file mode 100644 index 0000000000..dfac768f96 --- /dev/null +++ b/source/physics_lists/GNUmakefile @@ -0,0 +1,23 @@ +# $Id: GNUmakefile,v 1.5 2006/12/05 16:16:12 gcosmo Exp $ +# ---------------------------------------------------------------------- +# GNUmakefile for physicslists library, Gunter Folger 25-October 2006 +# ---------------------------------------------------------------------- + +name := G4physicslists + +SUBDIRS = lists +SUBDIRS += builders + +GLOBLIBS = libG4processes.lib libG4digits_hits.lib libG4track.lib +GLOBLIBS += libG4particles.lib libG4geometry.lib +GLOBLIBS += libG4materials.lib libG4graphics_reps.lib +GLOBLIBS += libG4intercoms.lib libG4global.lib + +SUBLIBS = G4phys_lists +SUBLIBS += G4phys_builders + +ifndef G4INSTALL + G4INSTALL = ../.. +endif + +include $(G4INSTALL)/config/globlib.gmk diff --git a/physics_lists/History b/source/physics_lists/History similarity index 58% rename from physics_lists/History rename to source/physics_lists/History index 2a16e3baba..47a1a80b74 100644 --- a/physics_lists/History +++ b/source/physics_lists/History @@ -1,4 +1,4 @@ -$Id: History,v 1.23 2006/06/24 14:41:50 vnivanch Exp $ +$Id: History,v 1.7 2006/12/05 17:03:45 gunter Exp $ ------------------------------------------------------------------- ========================================================= @@ -15,6 +15,68 @@ track of all tags. * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +05.12.2006, G.Folger - phys-lists-V08-01-13 + - add QGSC_EFLOW, using new energy flow method for CHIPS; consequently, + HadronPhysicsQGSC_EFLOW and builders G4QGSCEflow{Proton,Neutron,PiK}Builder + added as well. + QGSC changed to use G4QStringChipsParticleLevelInterface via the builders + G4QGS{Proton,Neutron,PiK}Builder; this emulates 8.1 modeling. + +05.12.2006, G.Cosmo + - GNUmakefile: added definition of GLOBLIBS with correct library + dependencies to allow for generation of DLLs on Windows. + +29.11.2006, G.Folger - phys-lists-V08-01-12 + - in G4HadronQElasticPhysics initialize wasActivated in ctor + +28.11.2006, G.Folger - phys-lists-V08-01-11 + - add QGSP_QEL, i.e QGSP with chips elastic + +24.11.2006, G.Folger - phys-lists-V08-01-10 + - add QGSC_EMV and QGSP_BIC_HP + - correct neutron tracking cut + - various small fixes + - update versions numbers + +21.11.2006, G.Folger - phys-lists-V08-01-09 + - add warning to obsolete physics lists + (LHEP: _HP, _BIC, BIC_HP, _PRECO, QGSP_HP) + - add neutron tracking cut to QGSP and FTF lists without _HP extension +03.11.2006, G.Folger - phys-lists-V08-01-08 +- Move physics lists into source tree +- Simplify directory/library structure +- delete 2 _GN lists - added for G4 8.1 by mistake, + +05.10.2006, V.Ivanchenko - phys-lists-V08-01-07 +- QBBC - use LHEP cross section if LHEP option is configured + +26.09.2006, V.Ivanchenko - phys-lists-V08-01-06 +- QBBC physics lists - add an option to use Glauber-Gribov cross sections + +15.08.2006, V.Ivanchenko - phys-lists-V08-01-05 +- G4NadronElasticPhysics - move includes from .cc to .hh + +10.08.2006, V.Ivanchenko - phys-lists-V08-01-04 +- G4NadronElasticPhysics - configure neutrons separately + from other hadrons +- G4HadronProcessStore - implement computation of cross sections + +26.07.2006, V.Ivanchenko - phys-lists-V08-01-03 +- Return pLimit= 20 MeV/c + +24.07.2006, V.Ivanchenko - phys-lists-V08-01-02 +- Fix - add G4NeutronHPElasticData in the PL, not inside the process +- Use pLimit=60 MeV/c instead of 20 MeV/c + +14.07.06, G.Folger - phys-lists-V08-01-01 +- Correct flag for HP in G4HadronElasticPhysics() to true for + LHEP_HP and QGSP_HP + +05.07.2006, V.Ivanchenko - phys-lists-V08-01-00 +- Fix initialisation problem for QBBC_HP +- Fix HP regime for G4NadronElasticPhysics +- Add cout of the list of processes and models for QBBC + 24.06.2006, V.Ivanchenko - phys-lists-V08-00-15 - Fix typo in BinaryIon builder diff --git a/source/physics_lists/builders/GNUmakefile b/source/physics_lists/builders/GNUmakefile new file mode 100644 index 0000000000..123d1d4333 --- /dev/null +++ b/source/physics_lists/builders/GNUmakefile @@ -0,0 +1,74 @@ +# $Id: GNUmakefile,v 1.2 2006/11/20 17:54:51 gunter Exp $ +# --------------------------------------------------------------------------- +# GNUmakefile for physics_lists/builders library. Gunter Folger 25-Oct-2006. +# --------------------------------------------------------------------------- + +name := G4phys_builders + +ifndef G4INSTALL + G4INSTALL = ../../.. +endif + +include $(G4INSTALL)/config/architecture.gmk + +CPPFLAGS += -I$(G4BASE)/global/management/include \ + -I$(G4BASE)/global/HEPRandom/include \ + -I$(G4BASE)/global/HEPGeometry/include \ + -I$(G4BASE)/geometry/volumes/include \ + -I$(G4BASE)/geometry/management/include \ + -I$(G4BASE)/geometry/magneticfield/include \ + -I$(G4BASE)/geometry/navigation/include \ + -I$(G4BASE)/intercoms/include \ + -I$(G4BASE)/track/include \ + -I$(G4BASE)/particles/shortlived/include \ + -I$(G4BASE)/particles/management/include \ + -I$(G4BASE)/particles/leptons/include \ + -I$(G4BASE)/particles/bosons/include \ + -I$(G4BASE)/particles/hadrons/mesons/include \ + -I$(G4BASE)/particles/hadrons/barions/include \ + -I$(G4BASE)/particles/hadrons/ions/include \ + -I$(G4BASE)/run/include \ + -I$(G4BASE)/processes/management/include \ + -I$(G4BASE)/processes/transportation/include \ + -I$(G4BASE)/processes/decay/include \ + -I$(G4BASE)/processes/cuts/include \ + -I$(G4BASE)/processes/optical/include \ + -I$(G4BASE)/processes/electromagnetic/standard/include \ + -I$(G4BASE)/processes/electromagnetic/muons/include \ + -I$(G4BASE)/processes/electromagnetic/utils/include \ + -I$(G4BASE)/processes/electromagnetic/xrays/include \ + -I$(G4BASE)/processes/hadronic/cross_sections/include \ + -I$(G4BASE)/processes/hadronic/stopping/include \ + -I$(G4BASE)/processes/hadronic/management/include \ + -I$(G4BASE)/processes/hadronic/processes/include \ + -I$(G4BASE)/processes/hadronic/util/include \ + -I$(G4BASE)/processes/hadronic/models/management/include \ + -I$(G4BASE)/processes/hadronic/models/util/include \ + -I$(G4BASE)/processes/hadronic/models/binary_cascade/include \ + -I$(G4BASE)/processes/hadronic/models/cascade/cascade/include \ + -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/body/include \ + -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/interface/include \ + -I$(G4BASE)/processes/hadronic/models/coherent_elastic/include \ + -I$(G4BASE)/processes/hadronic/models/de_excitation/evaporation/include \ + -I$(G4BASE)/processes/hadronic/models/de_excitation/fermi_breakup/include \ + -I$(G4BASE)/processes/hadronic/models/de_excitation/handler/include \ + -I$(G4BASE)/processes/hadronic/models/de_excitation/management/include \ + -I$(G4BASE)/processes/hadronic/models/de_excitation/multifragmentation/include \ + -I$(G4BASE)/processes/hadronic/models/de_excitation/photon_evaporation/include \ + -I$(G4BASE)/processes/hadronic/models/de_excitation/util/include \ + -I$(G4BASE)/processes/hadronic/models/high_energy/include \ + -I$(G4BASE)/processes/hadronic/models/im_r_matrix/include \ + -I$(G4BASE)/processes/hadronic/models/leading_particle/include \ + -I$(G4BASE)/processes/hadronic/models/low_energy/include \ + -I$(G4BASE)/processes/hadronic/models/neutron_hp/include \ + -I$(G4BASE)/processes/hadronic/models/parton_string/diffraction/include \ + -I$(G4BASE)/processes/hadronic/models/parton_string/hadronization/include \ + -I$(G4BASE)/processes/hadronic/models/parton_string/management/include \ + -I$(G4BASE)/processes/hadronic/models/parton_string/qgsm/include \ + -I$(G4BASE)/processes/hadronic/models/photolepton_hadron/muon_nuclear/include \ + -I$(G4BASE)/processes/hadronic/models/pre_equilibrium/exciton_model/include \ + -I$(G4BASE)/processes/hadronic/models/theo_high_energy/include \ + -I$(G4BASE)/processes/hadronic/util/include \ + -I$(G4BASE)/materials/include + +include $(G4INSTALL)/config/common.gmk diff --git a/physics_lists/hadronic/Packaging/include/CompileTimeConstraints.hh b/source/physics_lists/builders/include/CompileTimeConstraints.hh similarity index 100% rename from physics_lists/hadronic/Packaging/include/CompileTimeConstraints.hh rename to source/physics_lists/builders/include/CompileTimeConstraints.hh diff --git a/physics_lists/hadronic/Packaging/include/G4BertiniNeutronBuilder.hh b/source/physics_lists/builders/include/G4BertiniNeutronBuilder.hh similarity index 100% rename from physics_lists/hadronic/Packaging/include/G4BertiniNeutronBuilder.hh rename to source/physics_lists/builders/include/G4BertiniNeutronBuilder.hh diff --git a/physics_lists/hadronic/Packaging/include/G4BertiniPiKBuilder.hh b/source/physics_lists/builders/include/G4BertiniPiKBuilder.hh similarity index 100% rename from physics_lists/hadronic/Packaging/include/G4BertiniPiKBuilder.hh rename to source/physics_lists/builders/include/G4BertiniPiKBuilder.hh diff --git a/physics_lists/hadronic/Packaging/include/G4BertiniProtonBuilder.hh b/source/physics_lists/builders/include/G4BertiniProtonBuilder.hh similarity index 100% rename from physics_lists/hadronic/Packaging/include/G4BertiniProtonBuilder.hh rename to source/physics_lists/builders/include/G4BertiniProtonBuilder.hh diff --git a/physics_lists/hadronic/Packaging/include/G4BinaryNeutronBuilder.hh b/source/physics_lists/builders/include/G4BinaryNeutronBuilder.hh similarity index 100% rename from physics_lists/hadronic/Packaging/include/G4BinaryNeutronBuilder.hh rename to source/physics_lists/builders/include/G4BinaryNeutronBuilder.hh diff --git a/physics_lists/hadronic/Packaging/include/G4BinaryPiKBuilder.hh b/source/physics_lists/builders/include/G4BinaryPiKBuilder.hh similarity index 100% rename from physics_lists/hadronic/Packaging/include/G4BinaryPiKBuilder.hh rename to source/physics_lists/builders/include/G4BinaryPiKBuilder.hh diff --git a/physics_lists/hadronic/Packaging/include/G4BinaryProtonBuilder.hh b/source/physics_lists/builders/include/G4BinaryProtonBuilder.hh similarity index 100% rename from physics_lists/hadronic/Packaging/include/G4BinaryProtonBuilder.hh rename to source/physics_lists/builders/include/G4BinaryProtonBuilder.hh diff --git a/physics_lists/hadronic/Packaging/include/G4DataQuestionaire.hh b/source/physics_lists/builders/include/G4DataQuestionaire.hh similarity index 100% rename from physics_lists/hadronic/Packaging/include/G4DataQuestionaire.hh rename to source/physics_lists/builders/include/G4DataQuestionaire.hh diff --git a/physics_lists/hadronic/Packaging/include/G4DecayPhysics.hh b/source/physics_lists/builders/include/G4DecayPhysics.hh similarity index 96% rename from physics_lists/hadronic/Packaging/include/G4DecayPhysics.hh rename to source/physics_lists/builders/include/G4DecayPhysics.hh index 79b178cc84..6bf59ef362 100644 --- a/physics_lists/hadronic/Packaging/include/G4DecayPhysics.hh +++ b/source/physics_lists/builders/include/G4DecayPhysics.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4DecayPhysics.hh,v 1.5 2006/06/29 17:58:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4DecayPhysics.hh,v 1.1 2006/10/31 11:35:01 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/Packaging/include/G4ElectroNuclearBuilder.hh b/source/physics_lists/builders/include/G4ElectroNuclearBuilder.hh similarity index 100% rename from physics_lists/hadronic/Packaging/include/G4ElectroNuclearBuilder.hh rename to source/physics_lists/builders/include/G4ElectroNuclearBuilder.hh diff --git a/physics_lists/hadronic/Packaging/include/G4EmExtraPhysics.hh b/source/physics_lists/builders/include/G4EmExtraPhysics.hh similarity index 96% rename from physics_lists/hadronic/Packaging/include/G4EmExtraPhysics.hh rename to source/physics_lists/builders/include/G4EmExtraPhysics.hh index 810366dd9b..d66fbe28da 100644 --- a/physics_lists/hadronic/Packaging/include/G4EmExtraPhysics.hh +++ b/source/physics_lists/builders/include/G4EmExtraPhysics.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4EmExtraPhysics.hh,v 1.5 2006/06/29 17:58:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4EmExtraPhysics.hh,v 1.1 2006/10/31 11:35:01 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/Packaging/include/G4EmMessenger.hh b/source/physics_lists/builders/include/G4EmMessenger.hh similarity index 96% rename from physics_lists/hadronic/Packaging/include/G4EmMessenger.hh rename to source/physics_lists/builders/include/G4EmMessenger.hh index dc4450013f..b0c915097b 100644 --- a/physics_lists/hadronic/Packaging/include/G4EmMessenger.hh +++ b/source/physics_lists/builders/include/G4EmMessenger.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4EmMessenger.hh,v 1.5 2006/06/29 17:58:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4EmMessenger.hh,v 1.1 2006/10/31 11:35:01 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/Packaging/include/G4EmStandardPhysics.hh b/source/physics_lists/builders/include/G4EmStandardPhysics.hh similarity index 91% rename from physics_lists/hadronic/Packaging/include/G4EmStandardPhysics.hh rename to source/physics_lists/builders/include/G4EmStandardPhysics.hh index 9fafcb6e28..c84c52c7f6 100644 --- a/physics_lists/hadronic/Packaging/include/G4EmStandardPhysics.hh +++ b/source/physics_lists/builders/include/G4EmStandardPhysics.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4EmStandardPhysics.hh,v 1.5 2006/06/29 17:58:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4EmStandardPhysics.hh,v 1.3 2006/11/23 15:53:10 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -35,6 +35,7 @@ // // Modified: // 05.12.2005 V.Ivanchenko add controlled verbosity +// 23.11.2006 V.Ivanchenko remove mscStepLimit option and improve cout // //---------------------------------------------------------------------------- // @@ -56,8 +57,7 @@ class G4EmStandardPhysics : public G4VPhysicsConstructor { public: - G4EmStandardPhysics(const G4String& name = "EMstandard", G4int ver = 1, - G4bool msc=true); + G4EmStandardPhysics(const G4String& name = "G4standard", G4int ver = 0); virtual ~G4EmStandardPhysics(); public: @@ -66,7 +66,6 @@ public: private: G4int verbose; - G4bool mscStepLimit; }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/physics_lists/hadronic/Packaging/include/G4EmStandardPhysics71.hh b/source/physics_lists/builders/include/G4EmStandardPhysics71.hh similarity index 91% rename from physics_lists/hadronic/Packaging/include/G4EmStandardPhysics71.hh rename to source/physics_lists/builders/include/G4EmStandardPhysics71.hh index 269aba2e9a..15251eb520 100644 --- a/physics_lists/hadronic/Packaging/include/G4EmStandardPhysics71.hh +++ b/source/physics_lists/builders/include/G4EmStandardPhysics71.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4EmStandardPhysics71.hh,v 1.5 2006/06/29 17:58:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4EmStandardPhysics71.hh,v 1.3 2006/11/23 15:30:19 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -35,6 +35,7 @@ // // Modified: // 05.12.2005 V.Ivanchenko add controlled verbosity +// 13.11.2006 V.Ivanchenko set default msc step limit false // //---------------------------------------------------------------------------- // @@ -56,8 +57,7 @@ class G4EmStandardPhysics71 : public G4VPhysicsConstructor { public: - G4EmStandardPhysics71(const G4String& name = "EMstandard71", G4int ver = 1, - G4bool msc=true); + G4EmStandardPhysics71(const G4String& name = "G4standard_fast", G4int ver = 1); virtual ~G4EmStandardPhysics71(); public: @@ -66,7 +66,6 @@ public: private: G4int verbose; - G4bool mscStepLimit; }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/physics_lists/hadronic/Packaging/include/G4EmStandardPhysics72.hh b/source/physics_lists/builders/include/G4EmStandardPhysics72.hh similarity index 94% rename from physics_lists/hadronic/Packaging/include/G4EmStandardPhysics72.hh rename to source/physics_lists/builders/include/G4EmStandardPhysics72.hh index b13e5fd6d5..61af76187d 100644 --- a/physics_lists/hadronic/Packaging/include/G4EmStandardPhysics72.hh +++ b/source/physics_lists/builders/include/G4EmStandardPhysics72.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4EmStandardPhysics72.hh,v 1.3 2006/06/29 17:58:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4EmStandardPhysics72.hh,v 1.2 2006/11/23 15:30:19 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -57,8 +57,7 @@ class G4EmStandardPhysics72 : public G4VPhysicsConstructor { public: - G4EmStandardPhysics72(const G4String& name = "EMstandard72", G4int ver = 1, - G4bool msc=true); + G4EmStandardPhysics72(const G4String& name = "EMstandard72", G4int ver = 1); virtual ~G4EmStandardPhysics72(); public: @@ -67,7 +66,6 @@ public: private: G4int verbose; - G4bool mscStepLimit; }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/physics_lists/hadronic/Packaging/include/G4FTFCNeutronBuilder.hh b/source/physics_lists/builders/include/G4FTFCNeutronBuilder.hh similarity index 100% rename from physics_lists/hadronic/Packaging/include/G4FTFCNeutronBuilder.hh rename to source/physics_lists/builders/include/G4FTFCNeutronBuilder.hh diff --git a/physics_lists/hadronic/Packaging/include/G4FTFCPiKBuilder.hh b/source/physics_lists/builders/include/G4FTFCPiKBuilder.hh similarity index 100% rename from physics_lists/hadronic/Packaging/include/G4FTFCPiKBuilder.hh rename to source/physics_lists/builders/include/G4FTFCPiKBuilder.hh diff --git a/physics_lists/hadronic/Packaging/include/G4FTFCProtonBuilder.hh b/source/physics_lists/builders/include/G4FTFCProtonBuilder.hh similarity index 100% rename from physics_lists/hadronic/Packaging/include/G4FTFCProtonBuilder.hh rename to source/physics_lists/builders/include/G4FTFCProtonBuilder.hh diff --git a/physics_lists/hadronic/Packaging/include/G4FTFPNeutronBuilder.hh b/source/physics_lists/builders/include/G4FTFPNeutronBuilder.hh similarity index 100% rename from physics_lists/hadronic/Packaging/include/G4FTFPNeutronBuilder.hh rename to source/physics_lists/builders/include/G4FTFPNeutronBuilder.hh diff --git a/physics_lists/hadronic/Packaging/include/G4FTFPPiKBuilder.hh b/source/physics_lists/builders/include/G4FTFPPiKBuilder.hh similarity index 100% rename from physics_lists/hadronic/Packaging/include/G4FTFPPiKBuilder.hh rename to source/physics_lists/builders/include/G4FTFPPiKBuilder.hh diff --git a/physics_lists/hadronic/Packaging/include/G4FTFPProtonBuilder.hh b/source/physics_lists/builders/include/G4FTFPProtonBuilder.hh similarity index 100% rename from physics_lists/hadronic/Packaging/include/G4FTFPProtonBuilder.hh rename to source/physics_lists/builders/include/G4FTFPProtonBuilder.hh diff --git a/physics_lists/hadronic/Packaging/include/G4HadronElasticPhysics.hh b/source/physics_lists/builders/include/G4HadronElasticPhysics.hh similarity index 84% rename from physics_lists/hadronic/Packaging/include/G4HadronElasticPhysics.hh rename to source/physics_lists/builders/include/G4HadronElasticPhysics.hh index 77365b7a15..c05919a639 100644 --- a/physics_lists/hadronic/Packaging/include/G4HadronElasticPhysics.hh +++ b/source/physics_lists/builders/include/G4HadronElasticPhysics.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4HadronElasticPhysics.hh,v 1.5 2006/06/29 17:58:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4HadronElasticPhysics.hh,v 1.4 2006/11/23 15:46:04 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -33,6 +33,8 @@ // Author: 11 April 2006 V. Ivanchenko // // Modified: +// 05.07.2006 V.Ivanchenko fix problem of initialisation of HP +// 23.11.2006 V.Ivanchenko remove variables // //---------------------------------------------------------------------------- // @@ -44,13 +46,15 @@ #include "G4VPhysicsConstructor.hh" #include "G4UHadronElasticProcess.hh" #include "G4HadronElastic.hh" -#include +#include "G4NeutronHPElastic.hh" +#include "G4NeutronHPElasticData.hh" class G4HadronElasticPhysics : public G4VPhysicsConstructor { public: G4HadronElasticPhysics(const G4String& name = "elastic", - G4int ver = 1, G4bool hp = false); + G4int ver = 0, G4bool hp = false, + G4bool glauber = false); virtual ~G4HadronElasticPhysics(); public: @@ -63,34 +67,20 @@ public: // registered to the process manager of each particle type virtual void ConstructProcess(); - void SetLimitSWave(G4double); - - void SetLimitIonKineticEnergy(G4double); - private: - std::vector p_list; + G4HadronicInteraction* model; + G4HadronicInteraction* neutronModel; + G4HadronicInteraction* neutronHPModel; G4String mname; - G4double pLimit; - G4double edepLimit; - G4int verbose; G4bool hpFlag; + G4bool glFlag; G4bool wasActivated; }; -inline void G4HadronElasticPhysics::SetLimitSWave(G4double val) -{ - pLimit = val; -} - -inline void G4HadronElasticPhysics::SetLimitIonKineticEnergy(G4double val) -{ - edepLimit = val; -} - #endif diff --git a/examples/extended/electromagnetic/TestEm9/include/PhysListGeneral.hh b/source/physics_lists/builders/include/G4HadronHElasticPhysics.hh similarity index 62% rename from examples/extended/electromagnetic/TestEm9/include/PhysListGeneral.hh rename to source/physics_lists/builders/include/G4HadronHElasticPhysics.hh index 6e82ed1f5f..3c036130bd 100644 --- a/examples/extended/electromagnetic/TestEm9/include/PhysListGeneral.hh +++ b/source/physics_lists/builders/include/G4HadronHElasticPhysics.hh @@ -23,40 +23,62 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// $Id: G4HadronHElasticPhysics.hh,v 1.1 2006/11/23 15:46:04 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // -// $Id: PhysListGeneral.hh,v 1.3 2006/06/29 17:02:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +//--------------------------------------------------------------------------- +// +// ClassName: G4HadronHElasticPhysics +// +// Author: 23 November 2006 V. Ivanchenko +// +// Modified: +// +//---------------------------------------------------------------------------- // -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#ifndef PhysListGeneral_h -#define PhysListGeneral_h 1 +#ifndef G4HadronHElasticPhysics_h +#define G4HadronHElasticPhysics_h 1 -#include "G4VPhysicsConstructor.hh" -#include "G4Decay.hh" #include "globals.hh" +#include "G4VPhysicsConstructor.hh" +#include "G4UHadronElasticProcess.hh" +#include "G4HadronElastic.hh" +#include "G4NeutronHPElastic.hh" +#include "G4NeutronHPElasticData.hh" -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -class PhysListGeneral : public G4VPhysicsConstructor +class G4HadronHElasticPhysics : public G4VPhysicsConstructor { public: - PhysListGeneral(const G4String& name = "general"); - virtual ~PhysListGeneral(); + G4HadronHElasticPhysics(const G4String& name = "HElastic", + G4int ver = 0, G4bool hp = false, + G4bool glauber = false); + virtual ~G4HadronHElasticPhysics(); public: - // This method is dummy for physics - virtual void ConstructParticle() {}; + // This method will be invoked in the Construct() method. + // each particle type will be instantiated + virtual void ConstructParticle(); // This method will be invoked in the Construct() method. // each physics process will be instantiated and // registered to the process manager of each particle type virtual void ConstructProcess(); +private: + + G4HadronicInteraction* model; + G4HadronicInteraction* neutronModel; + G4HadronicInteraction* neutronHPModel; + + G4String mname; + + G4int verbose; + G4bool hpFlag; + G4bool glFlag; + G4bool wasActivated; }; -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... #endif diff --git a/physics_lists/hadronic/Packaging/include/G4HadronProcessStore.hh b/source/physics_lists/builders/include/G4HadronProcessStore.hh similarity index 89% rename from physics_lists/hadronic/Packaging/include/G4HadronProcessStore.hh rename to source/physics_lists/builders/include/G4HadronProcessStore.hh index 5196b46951..f0f69d94a6 100644 --- a/physics_lists/hadronic/Packaging/include/G4HadronProcessStore.hh +++ b/source/physics_lists/builders/include/G4HadronProcessStore.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4HadronProcessStore.hh,v 1.4 2006/06/29 17:58:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4HadronProcessStore.hh,v 1.1 2006/10/31 11:35:01 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------------- @@ -39,6 +39,7 @@ // Creation date: 03.05.2006 // // Modifications: +// 04.08.06 V.Ivanchenko add computation of cross sections // // // Class Description: @@ -71,6 +72,11 @@ public: ~G4HadronProcessStore(); G4double GetInelasticCrossSectionPerVolume( + const G4ParticleDefinition *aParticle, + G4double kineticEnergy, + const G4Material *material); + + G4double GetInelasticCrossSectionPerAtom( const G4ParticleDefinition *aParticle, G4double kineticEnergy, const G4Element *anElement); @@ -81,6 +87,11 @@ public: G4int Z, G4int A); G4double GetElasticCrossSectionPerVolume( + const G4ParticleDefinition *aParticle, + G4double kineticEnergy, + const G4Material *material); + + G4double GetElasticCrossSectionPerAtom( const G4ParticleDefinition *aParticle, G4double kineticEnergy, const G4Element *anElement); @@ -125,9 +136,7 @@ private: std::vector modelName; std::vector particle; - // cash HP currentProcess; - HP currentModel; PD currentParticle; G4DynamicParticle localDP; diff --git a/examples/extended/electromagnetic/TestEm9/include/PhysListHadronElastic.hh b/source/physics_lists/builders/include/G4HadronQElasticPhysics.hh similarity index 71% rename from examples/extended/electromagnetic/TestEm9/include/PhysListHadronElastic.hh rename to source/physics_lists/builders/include/G4HadronQElasticPhysics.hh index 9394ec4f77..e56e56e493 100644 --- a/examples/extended/electromagnetic/TestEm9/include/PhysListHadronElastic.hh +++ b/source/physics_lists/builders/include/G4HadronQElasticPhysics.hh @@ -23,50 +23,56 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// $Id: G4HadronQElasticPhysics.hh,v 1.1 2006/11/17 19:19:40 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // +//--------------------------------------------------------------------------- // -// ------------------------------------------------------------ -// GEANT 4 class header file -// Class Description: -// This class is an derived class of G4VPhysicsConstructor -// It is provide PhysicsList for hadron eleastic process +// ClassName: G4HadronQElasticPhysics // -// ------------------------------------------------------------ -// History -// Created: 14.10.02 V.Ivanchenko +// Author: 17 Nov 2006 V. Ivanchenko // -// Modified: -// -// ------------------------------------------------------------ +// Modified: +// +//---------------------------------------------------------------------------- // -#ifndef PhysListHadronElastic_h -#define PhysListHadronElastic_h 1 -#include "G4VPhysicsConstructor.hh" -#include "G4HadronElasticProcess.hh" +#ifndef G4HadronQElasticPhysics_h +#define G4HadronQElasticPhysics_h 1 + #include "globals.hh" +#include "G4VPhysicsConstructor.hh" -class PhysListHadronElastic : public G4VPhysicsConstructor +class G4HadronElastic; +class G4QElastic; + +class G4HadronQElasticPhysics : public G4VPhysicsConstructor { public: - PhysListHadronElastic(const G4String& name = "elastic"); - virtual ~PhysListHadronElastic(); + G4HadronQElasticPhysics(const G4String& name = "elastic", + G4int ver = 1); + virtual ~G4HadronQElasticPhysics(); public: // This method will be invoked in the Construct() method. // each particle type will be instantiated - void ConstructParticle() {}; + virtual void ConstructParticle(); // This method will be invoked in the Construct() method. // each physics process will be instantiated and // registered to the process manager of each particle type - void ConstructProcess(); + virtual void ConstructProcess(); private: - // Elastic Process - G4HadronElasticProcess theElasticProcess; -}; + G4HadronElastic* model; + G4QElastic* process; + + G4String mname; + + G4int verbose; + G4bool wasActivated; +}; #endif diff --git a/physics_lists/hadronic/Packaging/include/G4IonBinaryCascadePhysics.hh b/source/physics_lists/builders/include/G4IonBinaryCascadePhysics.hh similarity index 97% rename from physics_lists/hadronic/Packaging/include/G4IonBinaryCascadePhysics.hh rename to source/physics_lists/builders/include/G4IonBinaryCascadePhysics.hh index e46d520d9d..0fe8bf586c 100644 --- a/physics_lists/hadronic/Packaging/include/G4IonBinaryCascadePhysics.hh +++ b/source/physics_lists/builders/include/G4IonBinaryCascadePhysics.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4IonBinaryCascadePhysics.hh,v 1.4 2006/06/29 17:58:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4IonBinaryCascadePhysics.hh,v 1.1 2006/10/31 11:35:01 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/Packaging/include/G4IonPhysics.hh b/source/physics_lists/builders/include/G4IonPhysics.hh similarity index 96% rename from physics_lists/hadronic/Packaging/include/G4IonPhysics.hh rename to source/physics_lists/builders/include/G4IonPhysics.hh index 316e7b0eaf..f9f1049057 100644 --- a/physics_lists/hadronic/Packaging/include/G4IonPhysics.hh +++ b/source/physics_lists/builders/include/G4IonPhysics.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4IonPhysics.hh,v 1.5 2006/06/29 17:58:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4IonPhysics.hh,v 1.1 2006/10/31 11:35:01 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/Packaging/include/G4LEADNeutronBuilder.hh b/source/physics_lists/builders/include/G4LEADNeutronBuilder.hh similarity index 100% rename from physics_lists/hadronic/Packaging/include/G4LEADNeutronBuilder.hh rename to source/physics_lists/builders/include/G4LEADNeutronBuilder.hh diff --git a/physics_lists/hadronic/Packaging/include/G4LEADPiKBuilder.hh b/source/physics_lists/builders/include/G4LEADPiKBuilder.hh similarity index 100% rename from physics_lists/hadronic/Packaging/include/G4LEADPiKBuilder.hh rename to source/physics_lists/builders/include/G4LEADPiKBuilder.hh diff --git a/physics_lists/hadronic/Packaging/include/G4LEADProtonBuilder.hh b/source/physics_lists/builders/include/G4LEADProtonBuilder.hh similarity index 100% rename from physics_lists/hadronic/Packaging/include/G4LEADProtonBuilder.hh rename to source/physics_lists/builders/include/G4LEADProtonBuilder.hh diff --git a/physics_lists/hadronic/Packaging/include/G4LEPNeutronBuilder.hh b/source/physics_lists/builders/include/G4LEPNeutronBuilder.hh similarity index 98% rename from physics_lists/hadronic/Packaging/include/G4LEPNeutronBuilder.hh rename to source/physics_lists/builders/include/G4LEPNeutronBuilder.hh index 5a2a9ae444..aba2abf121 100644 --- a/physics_lists/hadronic/Packaging/include/G4LEPNeutronBuilder.hh +++ b/source/physics_lists/builders/include/G4LEPNeutronBuilder.hh @@ -23,7 +23,7 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/Packaging/include/G4LEPPiKBuilder.hh b/source/physics_lists/builders/include/G4LEPPiKBuilder.hh similarity index 99% rename from physics_lists/hadronic/Packaging/include/G4LEPPiKBuilder.hh rename to source/physics_lists/builders/include/G4LEPPiKBuilder.hh index 6846d65c52..e77eb86daa 100644 --- a/physics_lists/hadronic/Packaging/include/G4LEPPiKBuilder.hh +++ b/source/physics_lists/builders/include/G4LEPPiKBuilder.hh @@ -23,7 +23,7 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/Packaging/include/G4LEPProtonBuilder.hh b/source/physics_lists/builders/include/G4LEPProtonBuilder.hh similarity index 98% rename from physics_lists/hadronic/Packaging/include/G4LEPProtonBuilder.hh rename to source/physics_lists/builders/include/G4LEPProtonBuilder.hh index fdd732ee3f..9a4576af1e 100644 --- a/physics_lists/hadronic/Packaging/include/G4LEPProtonBuilder.hh +++ b/source/physics_lists/builders/include/G4LEPProtonBuilder.hh @@ -23,7 +23,7 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/Packaging/include/G4LHEPNeutronBuilder.hh b/source/physics_lists/builders/include/G4LHEPNeutronBuilder.hh similarity index 100% rename from physics_lists/hadronic/Packaging/include/G4LHEPNeutronBuilder.hh rename to source/physics_lists/builders/include/G4LHEPNeutronBuilder.hh diff --git a/physics_lists/hadronic/Packaging/include/G4LHEPPiKBuilder.hh b/source/physics_lists/builders/include/G4LHEPPiKBuilder.hh similarity index 100% rename from physics_lists/hadronic/Packaging/include/G4LHEPPiKBuilder.hh rename to source/physics_lists/builders/include/G4LHEPPiKBuilder.hh diff --git a/physics_lists/hadronic/Packaging/include/G4LHEPProtonBuilder.hh b/source/physics_lists/builders/include/G4LHEPProtonBuilder.hh similarity index 100% rename from physics_lists/hadronic/Packaging/include/G4LHEPProtonBuilder.hh rename to source/physics_lists/builders/include/G4LHEPProtonBuilder.hh diff --git a/physics_lists/hadronic/Packaging/include/G4LHEPStoppingPhysics.hh b/source/physics_lists/builders/include/G4LHEPStoppingPhysics.hh similarity index 96% rename from physics_lists/hadronic/Packaging/include/G4LHEPStoppingPhysics.hh rename to source/physics_lists/builders/include/G4LHEPStoppingPhysics.hh index 0ecfebcba9..f0ad14b999 100644 --- a/physics_lists/hadronic/Packaging/include/G4LHEPStoppingPhysics.hh +++ b/source/physics_lists/builders/include/G4LHEPStoppingPhysics.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4LHEPStoppingPhysics.hh,v 1.3 2006/06/29 17:59:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4LHEPStoppingPhysics.hh,v 1.1 2006/10/31 11:35:01 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/Packaging/include/G4MiscLHEPBuilder.hh b/source/physics_lists/builders/include/G4MiscLHEPBuilder.hh similarity index 99% rename from physics_lists/hadronic/Packaging/include/G4MiscLHEPBuilder.hh rename to source/physics_lists/builders/include/G4MiscLHEPBuilder.hh index 72dede6606..5ddd7ab0a2 100644 --- a/physics_lists/hadronic/Packaging/include/G4MiscLHEPBuilder.hh +++ b/source/physics_lists/builders/include/G4MiscLHEPBuilder.hh @@ -23,7 +23,7 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/Packaging/include/G4NeutronBuilder.hh b/source/physics_lists/builders/include/G4NeutronBuilder.hh similarity index 98% rename from physics_lists/hadronic/Packaging/include/G4NeutronBuilder.hh rename to source/physics_lists/builders/include/G4NeutronBuilder.hh index fdfda7a3d1..af04214c28 100644 --- a/physics_lists/hadronic/Packaging/include/G4NeutronBuilder.hh +++ b/source/physics_lists/builders/include/G4NeutronBuilder.hh @@ -23,7 +23,7 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/Packaging/include/G4NeutronHPBuilder.hh b/source/physics_lists/builders/include/G4NeutronHPBuilder.hh similarity index 100% rename from physics_lists/hadronic/Packaging/include/G4NeutronHPBuilder.hh rename to source/physics_lists/builders/include/G4NeutronHPBuilder.hh diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02GeneralPhysics.hh b/source/physics_lists/builders/include/G4NeutronTrackingCut.hh similarity index 71% rename from examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02GeneralPhysics.hh rename to source/physics_lists/builders/include/G4NeutronTrackingCut.hh index 9697f5ed58..26ebb7f134 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02GeneralPhysics.hh +++ b/source/physics_lists/builders/include/G4NeutronTrackingCut.hh @@ -23,52 +23,49 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// $Id: G4NeutronTrackingCut.hh,v 1.1 2006/11/20 17:56:08 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // -// $Id: H02GeneralPhysics.hh,v 1.2 2006/06/29 17:13:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +//--------------------------------------------------------------------------- // -// -// ------------------------------------------------------------ -// GEANT 4 class header file -// Class Description: -// This class is an derived class of G4VPhysicsConstructor +// ClassName: G4NeutronTrackingCut // -// ------------------------------------------- -// History -// first version 12 Nov. 2000 by H.Kurashige -// ------------------------------------------------------------ -#ifndef H02GeneralPhysics_h -#define H02GeneralPhysics_h 1 +// Author: Nov 2006 G.Folger +// +// +//---------------------------------------------------------------------------- +// + +#ifndef G4NeutronTrackingCut_h +#define G4NeutronTrackingCut_h 1 #include "globals.hh" -#include "G4ios.hh" - #include "G4VPhysicsConstructor.hh" +class G4NeutronKiller; -#include "G4Decay.hh" - -class H02GeneralPhysics : public G4VPhysicsConstructor +class G4NeutronTrackingCut : public G4VPhysicsConstructor { public: - H02GeneralPhysics(const G4String& name = "general"); - virtual ~H02GeneralPhysics(); + G4NeutronTrackingCut(const G4String& name = "neutronTrackingCut",G4int ver=0); + virtual ~G4NeutronTrackingCut(); public: // This method will be invoked in the Construct() method. // each particle type will be instantiated - virtual void ConstructParticle(); + virtual void ConstructParticle(); // This method will be invoked in the Construct() method. // each physics process will be instantiated and // registered to the process manager of each particle type - virtual void ConstructProcess(); + virtual void ConstructProcess(); - protected: - G4Decay fDecayProcess; +private: + G4NeutronKiller* pNeutronKiller; + G4int verbose; + G4bool wasActivated; }; - #endif diff --git a/physics_lists/hadronic/Packaging/include/G4PiKBuilder.hh b/source/physics_lists/builders/include/G4PiKBuilder.hh similarity index 96% rename from physics_lists/hadronic/Packaging/include/G4PiKBuilder.hh rename to source/physics_lists/builders/include/G4PiKBuilder.hh index adc1d71a34..0cea876765 100644 --- a/physics_lists/hadronic/Packaging/include/G4PiKBuilder.hh +++ b/source/physics_lists/builders/include/G4PiKBuilder.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4PiKBuilder.hh,v 1.5 2006/06/29 17:59:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4PiKBuilder.hh,v 1.1 2006/10/31 11:35:01 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/Packaging/include/G4PrecoNeutronBuilder.hh b/source/physics_lists/builders/include/G4PrecoNeutronBuilder.hh similarity index 100% rename from physics_lists/hadronic/Packaging/include/G4PrecoNeutronBuilder.hh rename to source/physics_lists/builders/include/G4PrecoNeutronBuilder.hh diff --git a/physics_lists/hadronic/Packaging/include/G4PrecoProtonBuilder.hh b/source/physics_lists/builders/include/G4PrecoProtonBuilder.hh similarity index 100% rename from physics_lists/hadronic/Packaging/include/G4PrecoProtonBuilder.hh rename to source/physics_lists/builders/include/G4PrecoProtonBuilder.hh diff --git a/physics_lists/hadronic/Packaging/include/G4ProtonBuilder.hh b/source/physics_lists/builders/include/G4ProtonBuilder.hh similarity index 98% rename from physics_lists/hadronic/Packaging/include/G4ProtonBuilder.hh rename to source/physics_lists/builders/include/G4ProtonBuilder.hh index ab136d2cd9..f323c14432 100644 --- a/physics_lists/hadronic/Packaging/include/G4ProtonBuilder.hh +++ b/source/physics_lists/builders/include/G4ProtonBuilder.hh @@ -23,7 +23,7 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/source/physics_lists/builders/include/G4QGSCEflowNeutronBuilder.hh b/source/physics_lists/builders/include/G4QGSCEflowNeutronBuilder.hh new file mode 100644 index 0000000000..c748031f89 --- /dev/null +++ b/source/physics_lists/builders/include/G4QGSCEflowNeutronBuilder.hh @@ -0,0 +1,73 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +#ifndef G4QGSCEflowNeutronBuilder_h +#define G4QGSCEflowNeutronBuilder_h 1 + +#include "globals.hh" + +#include "G4HadronElasticProcess.hh" +#include "G4HadronFissionProcess.hh" +#include "G4HadronCaptureProcess.hh" +#include "G4NeutronInelasticProcess.hh" +#include "G4VNeutronBuilder.hh" + +#include "G4NeutronInelasticCrossSection.hh" +#include "G4TheoFSGenerator.hh" +#include "G4StringChipsParticleLevelInterface.hh" +#include "G4QGSModel.hh" +#include "G4QGSParticipants.hh" +#include "G4QGSMFragmentation.hh" +#include "G4ExcitedStringDecay.hh" + +class G4QGSCEflowNeutronBuilder : public G4VNeutronBuilder +{ + public: + G4QGSCEflowNeutronBuilder(); + virtual ~G4QGSCEflowNeutronBuilder(); + + public: + virtual void Build(G4HadronElasticProcess * ){} + virtual void Build(G4HadronFissionProcess * ){} + virtual void Build(G4HadronCaptureProcess * ){} + virtual void Build(G4NeutronInelasticProcess * aP); + + void SetMinEnergy(G4double aM) {theMin = aM;} + + private: + G4QGSModel< G4QGSParticipants > * theStringModel; + G4StringChipsParticleLevelInterface * theCascade; + G4TheoFSGenerator * theModel; + G4ExcitedStringDecay * theStringDecay; + + G4NeutronInelasticCrossSection theXSec; + G4double theMin; + +}; + +// 2006 G.Folger + +#endif + diff --git a/source/physics_lists/builders/include/G4QGSCEflowPiKBuilder.hh b/source/physics_lists/builders/include/G4QGSCEflowPiKBuilder.hh new file mode 100644 index 0000000000..62fd4f90fb --- /dev/null +++ b/source/physics_lists/builders/include/G4QGSCEflowPiKBuilder.hh @@ -0,0 +1,78 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +#ifndef G4QGSCEflowPiKBuilder_h +#define G4QGSCEflowPiKBuilder_h 1 + +#include "globals.hh" + +#include "G4HadronElasticProcess.hh" +#include "G4HadronFissionProcess.hh" +#include "G4HadronCaptureProcess.hh" +#include "G4NeutronInelasticProcess.hh" +#include "G4VPiKBuilder.hh" + +#include "G4PiNuclearCrossSection.hh" + +#include "G4TheoFSGenerator.hh" +#include "G4StringChipsParticleLevelInterface.hh" +#include "G4QGSModel.hh" +#include "G4QGSParticipants.hh" +#include "G4QGSMFragmentation.hh" +#include "G4ExcitedStringDecay.hh" + +class G4QGSCEflowPiKBuilder : public G4VPiKBuilder +{ + public: + G4QGSCEflowPiKBuilder(); + virtual ~G4QGSCEflowPiKBuilder(); + + public: + virtual void Build(G4HadronElasticProcess * aP); + virtual void Build(G4PionPlusInelasticProcess * aP); + virtual void Build(G4PionMinusInelasticProcess * aP); + virtual void Build(G4KaonPlusInelasticProcess * aP); + virtual void Build(G4KaonMinusInelasticProcess * aP); + virtual void Build(G4KaonZeroLInelasticProcess * aP); + virtual void Build(G4KaonZeroSInelasticProcess * aP); + + void SetMinEnergy(G4double aM) {theMin = aM;} + + private: + G4PiNuclearCrossSection thePiCross; + + G4TheoFSGenerator * theModel; + G4StringChipsParticleLevelInterface * theCascade; + G4QGSModel< G4QGSParticipants > * theStringModel; + G4QGSMFragmentation theFragmentation; + G4ExcitedStringDecay * theStringDecay; + G4double theMin; + +}; + +// 2006 G.Folger + +#endif + diff --git a/source/physics_lists/builders/include/G4QGSCEflowProtonBuilder.hh b/source/physics_lists/builders/include/G4QGSCEflowProtonBuilder.hh new file mode 100644 index 0000000000..b78cb025f9 --- /dev/null +++ b/source/physics_lists/builders/include/G4QGSCEflowProtonBuilder.hh @@ -0,0 +1,72 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +#ifndef G4QGSCEflowProtonBuilder_h +#define G4QGSCEflowProtonBuilder_h + +#include "globals.hh" + +#include "G4HadronElasticProcess.hh" +#include "G4HadronFissionProcess.hh" +#include "G4HadronCaptureProcess.hh" +#include "G4ProtonInelasticProcess.hh" +#include "G4VProtonBuilder.hh" + +#include "G4NeutronInelasticCrossSection.hh" +#include "G4TheoFSGenerator.hh" +#include "G4StringChipsParticleLevelInterface.hh" +#include "G4QGSModel.hh" +#include "G4QGSParticipants.hh" +#include "G4QGSMFragmentation.hh" +#include "G4ExcitedStringDecay.hh" + +#include "G4ProtonInelasticCrossSection.hh" + +class G4QGSCEflowProtonBuilder : public G4VProtonBuilder +{ + public: + G4QGSCEflowProtonBuilder(); + virtual ~G4QGSCEflowProtonBuilder(); + + public: + virtual void Build(G4HadronElasticProcess * aP); + virtual void Build(G4ProtonInelasticProcess * aP); + + void SetMinEnergy(G4double aM) {theMin = aM;} + + private: + G4ProtonInelasticCrossSection theXSec; + G4TheoFSGenerator * theModel; + G4StringChipsParticleLevelInterface * theCascade; + G4QGSModel< G4QGSParticipants > * theStringModel; + G4ExcitedStringDecay * theStringDecay; + G4double theMin; + +}; + +// 2006 G.Folger + +#endif + diff --git a/physics_lists/hadronic/Packaging/include/G4QGSCNeutronBuilder.hh b/source/physics_lists/builders/include/G4QGSCNeutronBuilder.hh similarity index 96% rename from physics_lists/hadronic/Packaging/include/G4QGSCNeutronBuilder.hh rename to source/physics_lists/builders/include/G4QGSCNeutronBuilder.hh index 5e09f9d72a..5b620a2f8e 100644 --- a/physics_lists/hadronic/Packaging/include/G4QGSCNeutronBuilder.hh +++ b/source/physics_lists/builders/include/G4QGSCNeutronBuilder.hh @@ -36,7 +36,7 @@ #include "G4NeutronInelasticCrossSection.hh" #include "G4TheoFSGenerator.hh" -#include "G4StringChipsParticleLevelInterface.hh" +#include "G4QStringChipsParticleLevelInterface.hh" #include "G4QGSModel.hh" #include "G4QGSParticipants.hh" #include "G4QGSMFragmentation.hh" @@ -58,7 +58,7 @@ class G4QGSCNeutronBuilder : public G4VNeutronBuilder private: G4QGSModel< G4QGSParticipants > * theStringModel; - G4StringChipsParticleLevelInterface * theCascade; + G4QStringChipsParticleLevelInterface * theCascade; G4TheoFSGenerator * theModel; G4ExcitedStringDecay * theStringDecay; diff --git a/physics_lists/hadronic/Packaging/include/G4QGSCPiKBuilder.hh b/source/physics_lists/builders/include/G4QGSCPiKBuilder.hh similarity index 96% rename from physics_lists/hadronic/Packaging/include/G4QGSCPiKBuilder.hh rename to source/physics_lists/builders/include/G4QGSCPiKBuilder.hh index 2cab89d5aa..2f946ab5cf 100644 --- a/physics_lists/hadronic/Packaging/include/G4QGSCPiKBuilder.hh +++ b/source/physics_lists/builders/include/G4QGSCPiKBuilder.hh @@ -37,7 +37,7 @@ #include "G4PiNuclearCrossSection.hh" #include "G4TheoFSGenerator.hh" -#include "G4StringChipsParticleLevelInterface.hh" +#include "G4QStringChipsParticleLevelInterface.hh" #include "G4QGSModel.hh" #include "G4QGSParticipants.hh" #include "G4QGSMFragmentation.hh" @@ -64,7 +64,7 @@ class G4QGSCPiKBuilder : public G4VPiKBuilder G4PiNuclearCrossSection thePiCross; G4TheoFSGenerator * theModel; - G4StringChipsParticleLevelInterface * theCascade; + G4QStringChipsParticleLevelInterface * theCascade; G4QGSModel< G4QGSParticipants > * theStringModel; G4QGSMFragmentation theFragmentation; G4ExcitedStringDecay * theStringDecay; diff --git a/physics_lists/hadronic/Packaging/include/G4QGSCProtonBuilder.hh b/source/physics_lists/builders/include/G4QGSCProtonBuilder.hh similarity index 96% rename from physics_lists/hadronic/Packaging/include/G4QGSCProtonBuilder.hh rename to source/physics_lists/builders/include/G4QGSCProtonBuilder.hh index a9bf0bc12e..e3f1239886 100644 --- a/physics_lists/hadronic/Packaging/include/G4QGSCProtonBuilder.hh +++ b/source/physics_lists/builders/include/G4QGSCProtonBuilder.hh @@ -36,7 +36,7 @@ #include "G4NeutronInelasticCrossSection.hh" #include "G4TheoFSGenerator.hh" -#include "G4StringChipsParticleLevelInterface.hh" +#include "G4QStringChipsParticleLevelInterface.hh" #include "G4QGSModel.hh" #include "G4QGSParticipants.hh" #include "G4QGSMFragmentation.hh" @@ -59,7 +59,7 @@ class G4QGSCProtonBuilder : public G4VProtonBuilder private: G4ProtonInelasticCrossSection theXSec; G4TheoFSGenerator * theModel; - G4StringChipsParticleLevelInterface * theCascade; + G4QStringChipsParticleLevelInterface * theCascade; G4QGSModel< G4QGSParticipants > * theStringModel; G4ExcitedStringDecay * theStringDecay; G4double theMin; diff --git a/physics_lists/hadronic/Packaging/include/G4QGSPNeutronBuilder.hh b/source/physics_lists/builders/include/G4QGSPNeutronBuilder.hh similarity index 100% rename from physics_lists/hadronic/Packaging/include/G4QGSPNeutronBuilder.hh rename to source/physics_lists/builders/include/G4QGSPNeutronBuilder.hh diff --git a/physics_lists/hadronic/Packaging/include/G4QGSPPiKBuilder.hh b/source/physics_lists/builders/include/G4QGSPPiKBuilder.hh similarity index 100% rename from physics_lists/hadronic/Packaging/include/G4QGSPPiKBuilder.hh rename to source/physics_lists/builders/include/G4QGSPPiKBuilder.hh diff --git a/physics_lists/hadronic/Packaging/include/G4QGSPProtonBuilder.hh b/source/physics_lists/builders/include/G4QGSPProtonBuilder.hh similarity index 100% rename from physics_lists/hadronic/Packaging/include/G4QGSPProtonBuilder.hh rename to source/physics_lists/builders/include/G4QGSPProtonBuilder.hh diff --git a/physics_lists/hadronic/Packaging/include/G4QStoppingPhysics.hh b/source/physics_lists/builders/include/G4QStoppingPhysics.hh similarity index 96% rename from physics_lists/hadronic/Packaging/include/G4QStoppingPhysics.hh rename to source/physics_lists/builders/include/G4QStoppingPhysics.hh index e0621eb411..5acd101afa 100644 --- a/physics_lists/hadronic/Packaging/include/G4QStoppingPhysics.hh +++ b/source/physics_lists/builders/include/G4QStoppingPhysics.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4QStoppingPhysics.hh,v 1.4 2006/06/29 17:59:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4QStoppingPhysics.hh,v 1.1 2006/10/31 11:35:01 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/Packaging/include/G4StoppingHadronBuilder.hh b/source/physics_lists/builders/include/G4StoppingHadronBuilder.hh similarity index 96% rename from physics_lists/hadronic/Packaging/include/G4StoppingHadronBuilder.hh rename to source/physics_lists/builders/include/G4StoppingHadronBuilder.hh index f40390e1bf..cb04f04497 100644 --- a/physics_lists/hadronic/Packaging/include/G4StoppingHadronBuilder.hh +++ b/source/physics_lists/builders/include/G4StoppingHadronBuilder.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4StoppingHadronBuilder.hh,v 1.5 2006/06/29 17:59:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4StoppingHadronBuilder.hh,v 1.1 2006/10/31 11:35:02 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/Packaging/include/G4VNeutronBuilder.hh b/source/physics_lists/builders/include/G4VNeutronBuilder.hh similarity index 100% rename from physics_lists/hadronic/Packaging/include/G4VNeutronBuilder.hh rename to source/physics_lists/builders/include/G4VNeutronBuilder.hh diff --git a/physics_lists/hadronic/Packaging/include/G4VPiKBuilder.hh b/source/physics_lists/builders/include/G4VPiKBuilder.hh similarity index 96% rename from physics_lists/hadronic/Packaging/include/G4VPiKBuilder.hh rename to source/physics_lists/builders/include/G4VPiKBuilder.hh index 72a727a3d8..a747d9c8c1 100644 --- a/physics_lists/hadronic/Packaging/include/G4VPiKBuilder.hh +++ b/source/physics_lists/builders/include/G4VPiKBuilder.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4VPiKBuilder.hh,v 1.4 2006/06/29 17:59:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VPiKBuilder.hh,v 1.1 2006/10/31 11:35:02 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/Packaging/include/G4VProtonBuilder.hh b/source/physics_lists/builders/include/G4VProtonBuilder.hh similarity index 95% rename from physics_lists/hadronic/Packaging/include/G4VProtonBuilder.hh rename to source/physics_lists/builders/include/G4VProtonBuilder.hh index f9c25d40be..96a3a20a7c 100644 --- a/physics_lists/hadronic/Packaging/include/G4VProtonBuilder.hh +++ b/source/physics_lists/builders/include/G4VProtonBuilder.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4VProtonBuilder.hh,v 1.4 2006/06/29 17:59:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VProtonBuilder.hh,v 1.1 2006/10/31 11:35:02 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/source/physics_lists/builders/include/G4WarnPLStatus.hh b/source/physics_lists/builders/include/G4WarnPLStatus.hh new file mode 100644 index 0000000000..c4cc82902f --- /dev/null +++ b/source/physics_lists/builders/include/G4WarnPLStatus.hh @@ -0,0 +1,85 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +#ifndef G4WarnPLStatus_hh +#define G4WarnPLStatus_hh + +#include "G4String.hh" + +class G4WarnPLStatus +{ +public: + G4WarnPLStatus(); + void Unsupported(const G4String aPL, const G4String Replacement ="") const ; + void Experimental(const G4String aPL) const ; +}; + +inline +G4WarnPLStatus::G4WarnPLStatus() +{} + +inline +void G4WarnPLStatus::Unsupported(const G4String aPL, const G4String Replacement) const +{ + G4cout << +"*=====================================================================" < 0) + { + G4cout << +"* We recommend you try the physics lists "< 1) - G4cout << "### EmStandard instantiates eIoni and msc80 for " - << particleName << G4endl; pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); pmanager->AddProcess(new G4eIonisation, -1, 2, 2); pmanager->AddProcess(new G4eBremsstrahlung(), -1, 3, 3); } else if (particleName == "e+") { - if(verbose > 1) - G4cout << "### EmStandard instantiates eIoni and msc80 for " - << particleName << G4endl; pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); pmanager->AddProcess(new G4eIonisation, -1, 2, 2); pmanager->AddProcess(new G4eBremsstrahlung, -1, 3, 3); @@ -161,9 +158,6 @@ void G4EmStandardPhysics::ConstructProcess() } else if (particleName == "mu+" || particleName == "mu-" ) { - if(verbose > 1) - G4cout << "### EmStandard instantiates muIoni and msc80 for " - << particleName << G4endl; pmanager->AddProcess(new G4MultipleScattering,-1, 1, 1); pmanager->AddProcess(new G4MuIonisation, -1, 2, 2); pmanager->AddProcess(new G4MuBremsstrahlung, -1, 3, 3); @@ -173,11 +167,10 @@ void G4EmStandardPhysics::ConstructProcess() particleName == "He3" || particleName == "GenericIon") { - if(verbose > 1) - G4cout << "### EmStandard instantiates ionIoni and msc80 for " + G4cout << "### G4standard instantiates ionIoni for " << particleName << G4endl; - pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); - pmanager->AddProcess(new G4ionIonisation, -1, 2, 2); + pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4ionIonisation, -1, 2, 2); } else if (particleName == "anti_omega-" || particleName == "anti_proton" || @@ -199,16 +192,14 @@ void G4EmStandardPhysics::ConstructProcess() particleName == "xi-" ) { if(verbose > 1) - G4cout << "### EmStandard instantiates hIoni and msc80 for " + G4cout << "### G4standard instantiates hIoni for " << particleName << G4endl; - pmanager->AddProcess(new G4MultipleScattering,-1, 1, 1); - pmanager->AddProcess(new G4hIonisation, -1, 2, 2); + pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4hIonisation, -1, 2, 2); } } G4EmProcessOptions opt; opt.SetVerbose(verbose); - if(!mscStepLimit) - opt.SetMscStepLimitation(false); } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/physics_lists/hadronic/Packaging/src/G4EmStandardPhysics71.cc b/source/physics_lists/builders/src/G4EmStandardPhysics71.cc similarity index 81% rename from physics_lists/hadronic/Packaging/src/G4EmStandardPhysics71.cc rename to source/physics_lists/builders/src/G4EmStandardPhysics71.cc index c55c031972..64dba8f7d2 100644 --- a/physics_lists/hadronic/Packaging/src/G4EmStandardPhysics71.cc +++ b/source/physics_lists/builders/src/G4EmStandardPhysics71.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4EmStandardPhysics71.cc,v 1.14 2006/06/29 18:00:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4EmStandardPhysics71.cc,v 1.3 2006/11/23 15:30:19 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -36,6 +36,8 @@ // 19.12.2005 V.Ivanchenko StepFunction for electrons (1.0, 1.0*mm) // 21.06.2006 V.Ivanchenko use recent msc with step limitation off // 23.06.2006 V.Ivanchenko set dRoverRange = 0.8 for e- and e+ +// 13.11.2006 V.Ivanchenko use G4hMultipleScattering +// 23.11.2006 V.Ivanchenko remove mscStepLimit option and improve cout // //---------------------------------------------------------------------------- // @@ -49,7 +51,7 @@ #include "G4GammaConversion.hh" #include "G4PhotoElectricEffect.hh" -#include "G4MultipleScattering71.hh" +#include "G4hMultipleScattering.hh" #include "G4MultipleScattering.hh" #include "G4eIonisation.hh" @@ -82,8 +84,8 @@ //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -G4EmStandardPhysics71::G4EmStandardPhysics71(const G4String& name, G4int ver, - G4bool msc): G4VPhysicsConstructor(name), verbose(ver), mscStepLimit(msc) +G4EmStandardPhysics71::G4EmStandardPhysics71(const G4String& name, G4int ver) + : G4VPhysicsConstructor(name), verbose(ver) { G4LossTableManager::Instance(); } @@ -145,33 +147,35 @@ void G4EmStandardPhysics71::ConstructProcess() } else if (particleName == "e-") { if(verbose > 1) - G4cout << "### EmStandard71 instantiates eIoni and msc71 for " + G4cout << "### G4standard_fast instantiates eIoni " << particleName << G4endl; G4eIonisation* eioni = new G4eIonisation(); eioni->SetStepFunction(0.8, 1.0*mm); - pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); - pmanager->AddProcess(eioni, -1, 2, 2); - pmanager->AddProcess(new G4eBremsstrahlung(), -1, 3, 3); + G4MultipleScattering* msc = new G4MultipleScattering; + pmanager->AddProcess(msc, -1, 1, 1); + pmanager->AddProcess(eioni, -1, 2, 2); + pmanager->AddProcess(new G4eBremsstrahlung, -1, 3, 3); } else if (particleName == "e+") { if(verbose > 1) - G4cout << "### EmStandard71 instantiates eIoni and msc71 for " + G4cout << "### G4standard_fast instantiates eIoni " << particleName << G4endl; G4eIonisation* eioni = new G4eIonisation(); eioni->SetStepFunction(0.8, 1.0*mm); - pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); - pmanager->AddProcess(eioni, -1, 2, 2); - pmanager->AddProcess(new G4eBremsstrahlung, -1, 3, 3); - pmanager->AddProcess(new G4eplusAnnihilation, 0,-1, 4); + G4MultipleScattering* msc = new G4MultipleScattering; + pmanager->AddProcess(msc, -1, 1, 1); + pmanager->AddProcess(eioni, -1, 2, 2); + pmanager->AddProcess(new G4eBremsstrahlung, -1, 3, 3); + pmanager->AddProcess(new G4eplusAnnihilation, 0,-1, 4); } else if (particleName == "mu+" || particleName == "mu-" ) { if(verbose > 1) - G4cout << "### EmStandard71 instantiates muIoni and msc71 for " + G4cout << "### G4standard_fast instantiates muIoni " << particleName << G4endl; - pmanager->AddProcess(new G4MultipleScattering ,-1, 1, 1); + pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1); pmanager->AddProcess(new G4MuIonisation, -1, 2, 2); pmanager->AddProcess(new G4MuBremsstrahlung, -1, 3, 3); pmanager->AddProcess(new G4MuPairProduction, -1, 4, 4); @@ -181,9 +185,9 @@ void G4EmStandardPhysics71::ConstructProcess() particleName == "GenericIon") { if(verbose > 1) - G4cout << "### EmStandard71 instantiates ionIoni and msc71 for " + G4cout << "### G4standard_fast instantiates ionIoni " << particleName << G4endl; - pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1); pmanager->AddProcess(new G4ionIonisation, -1, 2, 2); } else if (particleName == "anti_omega-" || @@ -205,15 +209,15 @@ void G4EmStandardPhysics71::ConstructProcess() particleName == "triton" || particleName == "xi-" ) { if(verbose > 1) - G4cout << "### EmStandard71 instantiates hIoni and msc71 for " + G4cout << "### G4Standard_fast instantiates hIoni " << particleName << G4endl; - pmanager->AddProcess(new G4MultipleScattering, -1, 1, 1); - pmanager->AddProcess(new G4hIonisation, -1, 2, 2); + pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4hIonisation, -1, 2, 2); } } G4EmProcessOptions opt; opt.SetVerbose(verbose); - opt.SetMscStepLimitation(false, 0.2); + opt.SetMscStepLimitation(false); } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/physics_lists/hadronic/Packaging/src/G4EmStandardPhysics72.cc b/source/physics_lists/builders/src/G4EmStandardPhysics72.cc similarity index 79% rename from physics_lists/hadronic/Packaging/src/G4EmStandardPhysics72.cc rename to source/physics_lists/builders/src/G4EmStandardPhysics72.cc index aae50b8368..017cc5c2d6 100644 --- a/physics_lists/hadronic/Packaging/src/G4EmStandardPhysics72.cc +++ b/source/physics_lists/builders/src/G4EmStandardPhysics72.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4EmStandardPhysics72.cc,v 1.6 2006/06/29 18:00:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4EmStandardPhysics72.cc,v 1.5 2006/11/23 15:30:19 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -35,6 +35,8 @@ // Modified: // 19.12.2005 V.Ivanchenko rename 71 -> 72 // 15.06.2006 V.Ivanchenko use this class as a constructor of fast EM physics +// 13.11.2006 V.Ivanchenko use G4hMultipleScattering +// 14.11.2006 V.Ivanchenko use sub-cutoff optionfor all particles // //---------------------------------------------------------------------------- // @@ -50,6 +52,7 @@ #include "G4MultipleScattering71.hh" #include "G4MultipleScattering.hh" +#include "G4hMultipleScattering.hh" #include "G4UrbanMscModel.hh" #include "G4eIonisation.hh" @@ -82,8 +85,8 @@ //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -G4EmStandardPhysics72::G4EmStandardPhysics72(const G4String& name, G4int ver, - G4bool msc): G4VPhysicsConstructor(name), verbose(ver), mscStepLimit(msc) +G4EmStandardPhysics72::G4EmStandardPhysics72(const G4String& name, G4int ver) + : G4VPhysicsConstructor(name), verbose(ver) { G4LossTableManager::Instance(); } @@ -147,38 +150,32 @@ void G4EmStandardPhysics72::ConstructProcess() msc = new G4MultipleScattering(); msc->MscStepLimitation(true,0.1); - G4eIonisation* eion = new G4eIonisation; - eion->ActivateSubCutoff(true); - G4eBremsstrahlung* brem = new G4eBremsstrahlung(); - brem->ActivateSubCutoff(true); if(verbose > 1) - G4cout << "### EmStandard72 instantiates eIoni and msc71 for " + G4cout << "### G4standard_exp instantiates eIoni " << particleName << G4endl; - pmanager->AddProcess(msc, -1, 1, 1); - pmanager->AddProcess(eion,-1, 2, 2); - pmanager->AddProcess(brem,-1,-3, 3); + pmanager->AddProcess(msc, -1, 1, 1); + pmanager->AddProcess(new G4eIonisation, -1, 2, 2); + pmanager->AddProcess(new G4eBremsstrahlung, -1,-3, 3); } else if (particleName == "e+") { msc = new G4MultipleScattering(); msc->MscStepLimitation(true,0.1); if(verbose > 1) - G4cout << "### EmStandard72 instantiates eIoni and msc71 for " + G4cout << "### G4standard_exp instantiates eIoni and msc71 for " << particleName << G4endl; - pmanager->AddProcess(msc, -1, 1, 1); - pmanager->AddProcess(new G4eIonisation, -1, 2, 2); - pmanager->AddProcess(new G4eBremsstrahlung, -1,-3, 3); - pmanager->AddProcess(new G4eplusAnnihilation, 0,-1, 4); + pmanager->AddProcess(msc, -1, 1, 1); + pmanager->AddProcess(new G4eIonisation, -1, 2, 2); + pmanager->AddProcess(new G4eBremsstrahlung, -1,-3, 3); + pmanager->AddProcess(new G4eplusAnnihilation, 0,-1, 4); } else if (particleName == "mu+" || particleName == "mu-" ) { - msc = new G4MultipleScattering(); - msc->MscStepLimitation(false,0.2); if(verbose > 1) - G4cout << "### EmStandard72 instantiates muIoni and msc71 for " + G4cout << "### G4standard_exp instantiates muIoni " << particleName << G4endl; - pmanager->AddProcess(msc,-1, 1, 1); + pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1); pmanager->AddProcess(new G4MuIonisation, -1, 2, 2); pmanager->AddProcess(new G4MuBremsstrahlung, -1,-3, 3); pmanager->AddProcess(new G4MuPairProduction, -1,-4, 4); @@ -187,13 +184,11 @@ void G4EmStandardPhysics72::ConstructProcess() particleName == "He3" || particleName == "GenericIon") { - msc = new G4MultipleScattering(); - msc->MscStepLimitation(false,0.2); if(verbose > 1) - G4cout << "### EmStandard72 instantiates ionIoni and msc71 for " + G4cout << "### G4standard_exp instantiates ionIoni " << particleName << G4endl; - pmanager->AddProcess(msc, -1, 1, 1); - pmanager->AddProcess(new G4ionIonisation, -1, 2, 2); + pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4ionIonisation, -1, 2, 2); } else if (particleName == "anti_omega-" || particleName == "anti_proton" || @@ -214,18 +209,16 @@ void G4EmStandardPhysics72::ConstructProcess() particleName == "triton" || particleName == "xi-" ) { if(verbose > 1) - G4cout << "### EmStandard72 instantiates hIoni and msc71 for " + G4cout << "### G4standard_exp instantiates hIoni and " << particleName << G4endl; - msc = new G4MultipleScattering(); - msc->MscStepLimitation(false,0.2); - pmanager->AddProcess(msc, -1, 1, 1); - pmanager->AddProcess(new G4hIonisation, -1, 2, 2); + + pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1); + pmanager->AddProcess(new G4hIonisation, -1, 2, 2); } } G4EmProcessOptions opt; opt.SetVerbose(verbose); - // opt.SetMscStepLimitation(false, 0.2); - // opt.SetSubCutoff(true); + opt.SetSubCutoff(true); } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/physics_lists/hadronic/Packaging/src/G4FTFCNeutronBuilder.cc b/source/physics_lists/builders/src/G4FTFCNeutronBuilder.cc similarity index 100% rename from physics_lists/hadronic/Packaging/src/G4FTFCNeutronBuilder.cc rename to source/physics_lists/builders/src/G4FTFCNeutronBuilder.cc diff --git a/physics_lists/hadronic/Packaging/src/G4FTFCPiKBuilder.cc b/source/physics_lists/builders/src/G4FTFCPiKBuilder.cc similarity index 100% rename from physics_lists/hadronic/Packaging/src/G4FTFCPiKBuilder.cc rename to source/physics_lists/builders/src/G4FTFCPiKBuilder.cc diff --git a/physics_lists/hadronic/Packaging/src/G4FTFCProtonBuilder.cc b/source/physics_lists/builders/src/G4FTFCProtonBuilder.cc similarity index 100% rename from physics_lists/hadronic/Packaging/src/G4FTFCProtonBuilder.cc rename to source/physics_lists/builders/src/G4FTFCProtonBuilder.cc diff --git a/physics_lists/hadronic/Packaging/src/G4FTFPNeutronBuilder.cc b/source/physics_lists/builders/src/G4FTFPNeutronBuilder.cc similarity index 100% rename from physics_lists/hadronic/Packaging/src/G4FTFPNeutronBuilder.cc rename to source/physics_lists/builders/src/G4FTFPNeutronBuilder.cc diff --git a/physics_lists/hadronic/Packaging/src/G4FTFPPiKBuilder.cc b/source/physics_lists/builders/src/G4FTFPPiKBuilder.cc similarity index 100% rename from physics_lists/hadronic/Packaging/src/G4FTFPPiKBuilder.cc rename to source/physics_lists/builders/src/G4FTFPPiKBuilder.cc diff --git a/physics_lists/hadronic/Packaging/src/G4FTFPProtonBuilder.cc b/source/physics_lists/builders/src/G4FTFPProtonBuilder.cc similarity index 100% rename from physics_lists/hadronic/Packaging/src/G4FTFPProtonBuilder.cc rename to source/physics_lists/builders/src/G4FTFPProtonBuilder.cc diff --git a/physics_lists/hadronic/Packaging/src/G4HadronElasticPhysics.cc b/source/physics_lists/builders/src/G4HadronElasticPhysics.cc similarity index 55% rename from physics_lists/hadronic/Packaging/src/G4HadronElasticPhysics.cc rename to source/physics_lists/builders/src/G4HadronElasticPhysics.cc index bc406eef04..3a103b9939 100644 --- a/physics_lists/hadronic/Packaging/src/G4HadronElasticPhysics.cc +++ b/source/physics_lists/builders/src/G4HadronElasticPhysics.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4HadronElasticPhysics.cc,v 1.9 2006/06/29 18:00:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4HadronElasticPhysics.cc,v 1.3 2006/11/23 15:46:04 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -33,6 +33,11 @@ // Author: 11 April 2006 V. Ivanchenko // // Modified: +// 05.07.2006 V.Ivanchenko define process by particle name; +// fix problem of initialisation of HP +// 24.07.2006 V.Ivanchenko add G4NeutronHPElasticData +// 10.08.2006 V.Ivanchenko separate neutrons from other particles +// 17.11.2006 V.Ivanchenko do not redefine G4HadronElastic default parameters // //---------------------------------------------------------------------------- // @@ -54,19 +59,25 @@ #include "G4HadronProcessStore.hh" #include "G4VQCrossSection.hh" +#include "G4UElasticCrossSection.hh" -G4HadronElasticPhysics::G4HadronElasticPhysics(const G4String& name, - G4int ver, G4bool hp) +G4HadronElasticPhysics::G4HadronElasticPhysics( + const G4String& name, G4int ver, G4bool hp, G4bool glauber) : G4VPhysicsConstructor(name), mname(name), verbose(ver), hpFlag(hp), - wasActivated(false) + glFlag(glauber),wasActivated(false) { if(verbose > 1) G4cout << "### HadronElasticPhysics" << G4endl; - pLimit = 20.*MeV; - edepLimit = 100.*keV; + model = 0; + neutronModel = 0; + neutronHPModel = 0; } G4HadronElasticPhysics::~G4HadronElasticPhysics() -{} +{ + delete model; + delete neutronModel; + delete neutronHPModel; +} void G4HadronElasticPhysics::ConstructParticle() { @@ -93,48 +104,90 @@ void G4HadronElasticPhysics::ConstructProcess() G4cout << "### HadronElasticPhysics Construct Processes with the model <" << mname << ">" << G4endl; - G4double mThreshold = 130.*MeV; - G4HadronicInteraction* model = 0; G4HadronicProcess* hel = 0; G4VQCrossSection* man = 0; if(mname == "elastic") { - G4HadronElastic* he = new G4HadronElastic(edepLimit, pLimit); + G4HadronElastic* he = new G4HadronElastic(); model = he; man = he->GetCS(); } else { model = new G4LElastic(); } - model->SetMaxEnergy(100.*TeV); theParticleIterator->reset(); while( (*theParticleIterator)() ) { G4ParticleDefinition* particle = theParticleIterator->value(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - if(particle->GetPDGMass() > mThreshold && !particle->IsShortLived()) { - + G4String pname = particle->GetParticleName(); + if(pname == "anti_lambda" || + pname == "anti_neutron" || + pname == "anti_omega-" || + pname == "anti_proton" || + pname == "anti_sigma-" || + pname == "anti_sigma+" || + pname == "anti_xi-" || + pname == "anti_xi0" || + pname == "kaon-" || + pname == "kaon+" || + pname == "kaon0S" || + pname == "kaon0L" || + pname == "lambda" || + pname == "omega-" || + pname == "pi-" || + pname == "pi+" || + pname == "proton" || + pname == "sigma-" || + pname == "sigma+" || + pname == "xi-" || + pname == "alpha" || + pname == "deuteron" || + pname == "triton") { + + G4ProcessManager* pmanager = particle->GetProcessManager(); if(mname == "elastic") { - G4UHadronElasticProcess* h = new G4UHadronElasticProcess("hElastic", hpFlag); - h->SetQElasticCrossSection(man); + G4UHadronElasticProcess* h = new G4UHadronElasticProcess("hElastic"); + h->SetQElasticCrossSection(man); hel = h; + if(glFlag) hel->AddDataSet(new G4UElasticCrossSection()); } else { - hel = new G4HadronElasticProcess(); + hel = new G4HadronElasticProcess("hElastic"); } - if( hel->IsApplicable(*particle)) { - - pmanager->AddDiscreteProcess(hel); - hel->RegisterMe(model); - store->Register(hel,particle,model,mname); - if(hpFlag && particle == G4Neutron::Neutron()) { - } + hel->RegisterMe(model); + store->Register(hel,particle,model,mname); + pmanager->AddDiscreteProcess(hel); - if(verbose > 1) - G4cout << "### HadronElasticPhysics added for " - << particle->GetParticleName() << G4endl; - } else { - delete hel; + // neutron case + } else if(pname == "neutron") { + + G4ProcessManager* pmanager = particle->GetProcessManager(); + if(mname == "elastic") { + G4UHadronElasticProcess* h = new G4UHadronElasticProcess("hElastic"); + G4HadronElastic* nhe = new G4HadronElastic(); + neutronModel = nhe; + h->SetQElasticCrossSection(nhe->GetCS()); + hel = h; + if(glFlag) hel->AddDataSet(new G4UElasticCrossSection()); + } else { + hel = new G4HadronElasticProcess("hElastic"); + neutronModel = new G4LElastic(); } + + if(hpFlag) { + neutronModel->SetMinEnergy(19.5*MeV); + neutronHPModel = new G4NeutronHPElastic(); + hel->RegisterMe(neutronHPModel); + store->Register(hel,particle,neutronHPModel,"HP"); + hel->AddDataSet(new G4NeutronHPElasticData()); + } + + hel->RegisterMe(neutronModel); + store->Register(hel,particle,neutronModel,mname); + pmanager->AddDiscreteProcess(hel); + + if(verbose > 1) + G4cout << "### HadronElasticPhysics added for " + << particle->GetParticleName() << G4endl; } } } diff --git a/source/physics_lists/builders/src/G4HadronHElasticPhysics.cc b/source/physics_lists/builders/src/G4HadronHElasticPhysics.cc new file mode 100644 index 0000000000..c3b56031f0 --- /dev/null +++ b/source/physics_lists/builders/src/G4HadronHElasticPhysics.cc @@ -0,0 +1,185 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4HadronHElasticPhysics.cc,v 1.1 2006/11/23 15:46:04 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +//--------------------------------------------------------------------------- +// +// ClassName: G4HadronHElasticPhysics +// +// Author: 23 November 2006 V. Ivanchenko +// +// Modified: +// +//---------------------------------------------------------------------------- +// + +#include "G4HadronHElasticPhysics.hh" + +#include "G4HadronicProcess.hh" +#include "G4HadronElasticProcess.hh" +#include "G4HadronicInteraction.hh" +#include "G4LElastic.hh" + +#include "G4ParticleDefinition.hh" +#include "G4ProcessManager.hh" + +#include "G4MesonConstructor.hh" +#include "G4BaryonConstructor.hh" +#include "G4IonConstructor.hh" +#include "G4Neutron.hh" + +#include "G4HadronProcessStore.hh" +#include "G4VQCrossSection.hh" +#include "G4UElasticCrossSection.hh" + +G4HadronHElasticPhysics::G4HadronHElasticPhysics( + const G4String& name, G4int ver, G4bool hp, G4bool glauber) + : G4VPhysicsConstructor(name), mname(name), verbose(ver), hpFlag(hp), + glFlag(glauber),wasActivated(false) +{ + if(verbose > 1) G4cout << "### HadronHElasticPhysics" << G4endl; + model = 0; + neutronModel = 0; + neutronHPModel = 0; +} + +G4HadronHElasticPhysics::~G4HadronHElasticPhysics() +{ + delete model; + delete neutronModel; + delete neutronHPModel; +} + +void G4HadronHElasticPhysics::ConstructParticle() +{ +// G4cout << "G4HadronElasticPhysics::ConstructParticle" << G4endl; + G4MesonConstructor pMesonConstructor; + pMesonConstructor.ConstructParticle(); + + G4BaryonConstructor pBaryonConstructor; + pBaryonConstructor.ConstructParticle(); + + // Construct light ions + G4IonConstructor pConstructor; + pConstructor.ConstructParticle(); +} + +void G4HadronHElasticPhysics::ConstructProcess() +{ + if(wasActivated) return; + wasActivated = true; + + G4HadronProcessStore* store = G4HadronProcessStore::Instance(); + + G4double elimit = 0.4*GeV; + + if(verbose > 1) + G4cout << "### HadronElasticPhysics Construct Processes with HE limit " + << elimit << " MeV" << G4endl; + + G4HadronicProcess* hel = 0; + G4VQCrossSection* man = 0; + + G4HadronElastic* he = new G4HadronElastic(); + he->SetHEModelLowLimit(elimit); + model = he; + man = he->GetCS(); + + theParticleIterator->reset(); + while( (*theParticleIterator)() ) + { + G4ParticleDefinition* particle = theParticleIterator->value(); + G4String pname = particle->GetParticleName(); + if(pname == "anti_lambda" || + pname == "anti_neutron" || + pname == "anti_omega-" || + pname == "anti_proton" || + pname == "anti_sigma-" || + pname == "anti_sigma+" || + pname == "anti_xi-" || + pname == "anti_xi0" || + pname == "kaon-" || + pname == "kaon+" || + pname == "kaon0S" || + pname == "kaon0L" || + pname == "lambda" || + pname == "omega-" || + pname == "pi-" || + pname == "pi+" || + pname == "proton" || + pname == "sigma-" || + pname == "sigma+" || + pname == "xi-" || + pname == "alpha" || + pname == "deuteron" || + pname == "triton") { + + G4ProcessManager* pmanager = particle->GetProcessManager(); + if(mname == "elastic") { + G4UHadronElasticProcess* h = new G4UHadronElasticProcess("hElastic"); + h->SetQElasticCrossSection(man); + hel = h; + if(glFlag) hel->AddDataSet(new G4UElasticCrossSection()); + } else { + hel = new G4HadronElasticProcess("hElastic"); + } + hel->RegisterMe(model); + store->Register(hel,particle,model,mname); + pmanager->AddDiscreteProcess(hel); + + // neutron case + } else if(pname == "neutron") { + + G4ProcessManager* pmanager = particle->GetProcessManager(); + G4UHadronElasticProcess* h = new G4UHadronElasticProcess("hElastic"); + G4HadronElastic* nhe = new G4HadronElastic(); + nhe->SetHEModelLowLimit(elimit); + neutronModel = nhe; + h->SetQElasticCrossSection(nhe->GetCS()); + hel = h; + if(glFlag) hel->AddDataSet(new G4UElasticCrossSection()); + + if(hpFlag) { + neutronModel->SetMinEnergy(19.5*MeV); + neutronHPModel = new G4NeutronHPElastic(); + hel->RegisterMe(neutronHPModel); + store->Register(hel,particle,neutronHPModel,"HP"); + hel->AddDataSet(new G4NeutronHPElasticData()); + } + + hel->RegisterMe(neutronModel); + store->Register(hel,particle,neutronModel,mname); + pmanager->AddDiscreteProcess(hel); + + if(verbose > 1) + G4cout << "### HadronHElasticPhysics added for " + << particle->GetParticleName() << G4endl; + } + } +} + + diff --git a/physics_lists/hadronic/Packaging/src/G4HadronProcessStore.cc b/source/physics_lists/builders/src/G4HadronProcessStore.cc similarity index 74% rename from physics_lists/hadronic/Packaging/src/G4HadronProcessStore.cc rename to source/physics_lists/builders/src/G4HadronProcessStore.cc index fa34150b3d..08bb72fc8e 100644 --- a/physics_lists/hadronic/Packaging/src/G4HadronProcessStore.cc +++ b/source/physics_lists/builders/src/G4HadronProcessStore.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4HadronProcessStore.cc,v 1.5 2006/06/29 18:00:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4HadronProcessStore.cc,v 1.1 2006/10/31 11:35:02 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // @@ -35,9 +35,10 @@ // // Author: Vladimir Ivanchenko // -// Creation date: 03.01.2002 +// Creation date: 03.05.2006 // // Modifications: +// 04.08.06 V.Ivanchenko add computation of cross sections // // // Class Description: @@ -85,12 +86,33 @@ G4HadronProcessStore::G4HadronProcessStore() n_proc = 0; n_part = 0; n_model= 0; + currentProcess = 0; + currentParticle = 0; verbose = 1; } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... G4double G4HadronProcessStore::GetInelasticCrossSectionPerVolume( + const G4ParticleDefinition *aParticle, + G4double kineticEnergy, + const G4Material *material) +{ + G4double cross = 0.0; + const G4ElementVector* theElementVector = material->GetElementVector(); + const G4double* theAtomNumDensityVector = material->GetVecNbOfAtomsPerVolume(); + size_t nelm = material->GetNumberOfElements(); + for (size_t i=0; iGetElementVector(); + const G4double* theAtomNumDensityVector = material->GetVecNbOfAtomsPerVolume(); + size_t nelm = material->GetNumberOfElements(); + for (size_t i=0; i(aParticle)); localDP.SetKineticEnergy(kineticEnergy); G4double cross = 0.0; if(hp) cross = hp->GetMicroscopicCrossSection(&localDP, @@ -270,14 +310,31 @@ G4int G4HadronProcessStore::GetVerbose() G4HadronicProcess* G4HadronProcessStore::FindElasticProcess( const G4ParticleDefinition* part) { + bool isNew = false; G4HadronicProcess* hp = 0; - std::multimap >::iterator it; - for(it=p_map.lower_bound(part); it!=p_map.upper_bound(part); ++it) { - if(it->first == part && (it->second)->GetProcessName() == "Elastic") { - hp = it->second; - break; - } - } + + if(part != currentParticle) { + isNew = true; + currentParticle = part; + localDP.SetDefinition(const_cast(part)); + } else if(!currentProcess) { + isNew = true; + } else if(currentProcess->GetProcessName() == "hElastic") { + hp = currentProcess; + } else { + isNew = true; + } + + if(isNew) { + std::multimap >::iterator it; + for(it=p_map.lower_bound(part); it!=p_map.upper_bound(part); ++it) { + if(it->first == part && (it->second)->GetProcessName() == "hElastic") { + hp = it->second; + break; + } + } + currentProcess = hp; + } return hp; } @@ -287,14 +344,31 @@ G4HadronicProcess* G4HadronProcessStore::FindElasticProcess( G4HadronicProcess* G4HadronProcessStore::FindInelasticProcess( const G4ParticleDefinition* part) { + bool isNew = false; G4HadronicProcess* hp = 0; - std::multimap >::iterator it; - for(it=p_map.lower_bound(part); it!=p_map.upper_bound(part); ++it) { - if(it->first == part && (it->second)->GetProcessName() == "Inelastic") { - hp = it->second; - break; - } - } + + if(part != currentParticle) { + isNew = true; + currentParticle = part; + localDP.SetDefinition(const_cast(part)); + } else if(!currentProcess) { + isNew = true; + } else if(currentProcess->GetProcessName() == "hInelastic") { + hp = currentProcess; + } else { + isNew = true; + } + + if(isNew) { + std::multimap >::iterator it; + for(it=p_map.lower_bound(part); it!=p_map.upper_bound(part); ++it) { + if(it->first == part && (it->second)->GetProcessName() == "hInelastic") { + hp = it->second; + break; + } + } + currentProcess = hp; + } return hp; } diff --git a/source/physics_lists/builders/src/G4HadronQElasticPhysics.cc b/source/physics_lists/builders/src/G4HadronQElasticPhysics.cc new file mode 100644 index 0000000000..a4499e11ad --- /dev/null +++ b/source/physics_lists/builders/src/G4HadronQElasticPhysics.cc @@ -0,0 +1,149 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4HadronQElasticPhysics.cc,v 1.6 2006/11/29 14:33:30 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +//--------------------------------------------------------------------------- +// +// ClassName: G4HadronQElasticPhysics +// +// Author: 17 Nov 2006 V.Ivanchenko +// +// Modified: +// +//---------------------------------------------------------------------------- +// + +#include "G4HadronQElasticPhysics.hh" + +#include "G4UHadronElasticProcess.hh" +#include "G4HadronicInteraction.hh" +#include "G4HadronElastic.hh" +#include "G4QElastic.hh" + +#include "G4HadronProcessStore.hh" +#include "G4VQCrossSection.hh" + +#include "G4ParticleDefinition.hh" +#include "G4ProcessManager.hh" + +#include "G4MesonConstructor.hh" +#include "G4BaryonConstructor.hh" +#include "G4IonConstructor.hh" + +G4HadronQElasticPhysics::G4HadronQElasticPhysics( + const G4String& name, G4int ver) + : G4VPhysicsConstructor(name), verbose(ver), wasActivated(false) +{ + if(verbose > 1) G4cout << "### HadronQElasticPhysics" << G4endl; + model = 0; +} + +G4HadronQElasticPhysics::~G4HadronQElasticPhysics() +{ + delete model; +} + +void G4HadronQElasticPhysics::ConstructParticle() +{ + G4MesonConstructor pMesonConstructor; + pMesonConstructor.ConstructParticle(); + + G4BaryonConstructor pBaryonConstructor; + pBaryonConstructor.ConstructParticle(); + + // Construct light ions + G4IonConstructor pConstructor; + pConstructor.ConstructParticle(); +} + +void G4HadronQElasticPhysics::ConstructProcess() +{ + if(wasActivated) return; + wasActivated = true; + + G4HadronProcessStore* store = G4HadronProcessStore::Instance(); + + G4double elimit = DBL_MAX; + + if(verbose > 1) + G4cout << "### HadronQElasticPhysics: use HE limit " << elimit << " MeV" + << G4endl; + + process = new G4QElastic(); + + model = new G4HadronElastic(); + model->SetHEModelLowLimit(elimit); + G4VQCrossSection* man = model->GetCS(); + + theParticleIterator->reset(); + while( (*theParticleIterator)() ) + { + G4ParticleDefinition* particle = theParticleIterator->value(); + G4String pname = particle->GetParticleName(); + if(pname == "anti_lambda" || + pname == "anti_neutron" || + pname == "anti_omega-" || + pname == "anti_proton" || + pname == "anti_sigma-" || + pname == "anti_sigma+" || + pname == "anti_xi-" || + pname == "anti_xi0" || + pname == "kaon-" || + pname == "kaon+" || + pname == "kaon0S" || + pname == "kaon0L" || + pname == "lambda" || + pname == "omega-" || + pname == "pi-" || + pname == "pi+" || + pname == "sigma-" || + pname == "sigma+" || + pname == "xi-" || + pname == "alpha" || + pname == "deuteron" || + pname == "triton") { + + G4ProcessManager* pmanager = particle->GetProcessManager(); + G4UHadronElasticProcess* hel = new G4UHadronElasticProcess("hElastic"); + hel->SetQElasticCrossSection(man); + hel->RegisterMe(model); + store->Register(hel,particle,model,mname); + pmanager->AddDiscreteProcess(hel); + + } else if(pname == "neutron" || pname == "proton") { + + G4ProcessManager* pmanager = particle->GetProcessManager(); + pmanager->AddDiscreteProcess(process); + + if(verbose > 0) + G4cout << "### QElastic added for " + << particle->GetParticleName() << G4endl; + } + } +} + + diff --git a/physics_lists/hadronic/Packaging/src/G4IonBinaryCascadePhysics.cc b/source/physics_lists/builders/src/G4IonBinaryCascadePhysics.cc similarity index 98% rename from physics_lists/hadronic/Packaging/src/G4IonBinaryCascadePhysics.cc rename to source/physics_lists/builders/src/G4IonBinaryCascadePhysics.cc index f26421e764..078780be8a 100644 --- a/physics_lists/hadronic/Packaging/src/G4IonBinaryCascadePhysics.cc +++ b/source/physics_lists/builders/src/G4IonBinaryCascadePhysics.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4IonBinaryCascadePhysics.cc,v 1.6 2006/06/29 18:00:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4IonBinaryCascadePhysics.cc,v 1.1 2006/10/31 11:35:02 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/Packaging/src/G4IonPhysics.cc b/source/physics_lists/builders/src/G4IonPhysics.cc similarity index 97% rename from physics_lists/hadronic/Packaging/src/G4IonPhysics.cc rename to source/physics_lists/builders/src/G4IonPhysics.cc index 44a4e4bc2c..2459335873 100644 --- a/physics_lists/hadronic/Packaging/src/G4IonPhysics.cc +++ b/source/physics_lists/builders/src/G4IonPhysics.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4IonPhysics.cc,v 1.5 2006/06/29 18:00:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4IonPhysics.cc,v 1.1 2006/10/31 11:35:02 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/Packaging/src/G4LEADNeutronBuilder.cc b/source/physics_lists/builders/src/G4LEADNeutronBuilder.cc similarity index 100% rename from physics_lists/hadronic/Packaging/src/G4LEADNeutronBuilder.cc rename to source/physics_lists/builders/src/G4LEADNeutronBuilder.cc diff --git a/physics_lists/hadronic/Packaging/src/G4LEADPiKBuilder.cc b/source/physics_lists/builders/src/G4LEADPiKBuilder.cc similarity index 100% rename from physics_lists/hadronic/Packaging/src/G4LEADPiKBuilder.cc rename to source/physics_lists/builders/src/G4LEADPiKBuilder.cc diff --git a/physics_lists/hadronic/Packaging/src/G4LEADProtonBuilder.cc b/source/physics_lists/builders/src/G4LEADProtonBuilder.cc similarity index 100% rename from physics_lists/hadronic/Packaging/src/G4LEADProtonBuilder.cc rename to source/physics_lists/builders/src/G4LEADProtonBuilder.cc diff --git a/physics_lists/hadronic/Packaging/src/G4LEPNeutronBuilder.cc b/source/physics_lists/builders/src/G4LEPNeutronBuilder.cc similarity index 98% rename from physics_lists/hadronic/Packaging/src/G4LEPNeutronBuilder.cc rename to source/physics_lists/builders/src/G4LEPNeutronBuilder.cc index b1b30c6101..43c56b593d 100644 --- a/physics_lists/hadronic/Packaging/src/G4LEPNeutronBuilder.cc +++ b/source/physics_lists/builders/src/G4LEPNeutronBuilder.cc @@ -23,7 +23,7 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/Packaging/src/G4LEPPiKBuilder.cc b/source/physics_lists/builders/src/G4LEPPiKBuilder.cc similarity index 99% rename from physics_lists/hadronic/Packaging/src/G4LEPPiKBuilder.cc rename to source/physics_lists/builders/src/G4LEPPiKBuilder.cc index c6be168bed..a4e352e808 100644 --- a/physics_lists/hadronic/Packaging/src/G4LEPPiKBuilder.cc +++ b/source/physics_lists/builders/src/G4LEPPiKBuilder.cc @@ -23,7 +23,7 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/Packaging/src/G4LEPProtonBuilder.cc b/source/physics_lists/builders/src/G4LEPProtonBuilder.cc similarity index 98% rename from physics_lists/hadronic/Packaging/src/G4LEPProtonBuilder.cc rename to source/physics_lists/builders/src/G4LEPProtonBuilder.cc index 36d816cf24..aa4b196bbd 100644 --- a/physics_lists/hadronic/Packaging/src/G4LEPProtonBuilder.cc +++ b/source/physics_lists/builders/src/G4LEPProtonBuilder.cc @@ -23,7 +23,7 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/Packaging/src/G4LHEPNeutronBuilder.cc b/source/physics_lists/builders/src/G4LHEPNeutronBuilder.cc similarity index 100% rename from physics_lists/hadronic/Packaging/src/G4LHEPNeutronBuilder.cc rename to source/physics_lists/builders/src/G4LHEPNeutronBuilder.cc diff --git a/physics_lists/hadronic/Packaging/src/G4LHEPPiKBuilder.cc b/source/physics_lists/builders/src/G4LHEPPiKBuilder.cc similarity index 100% rename from physics_lists/hadronic/Packaging/src/G4LHEPPiKBuilder.cc rename to source/physics_lists/builders/src/G4LHEPPiKBuilder.cc diff --git a/physics_lists/hadronic/Packaging/src/G4LHEPProtonBuilder.cc b/source/physics_lists/builders/src/G4LHEPProtonBuilder.cc similarity index 100% rename from physics_lists/hadronic/Packaging/src/G4LHEPProtonBuilder.cc rename to source/physics_lists/builders/src/G4LHEPProtonBuilder.cc diff --git a/physics_lists/hadronic/Packaging/src/G4LHEPStoppingPhysics.cc b/source/physics_lists/builders/src/G4LHEPStoppingPhysics.cc similarity index 97% rename from physics_lists/hadronic/Packaging/src/G4LHEPStoppingPhysics.cc rename to source/physics_lists/builders/src/G4LHEPStoppingPhysics.cc index a1e03e375b..0302c4ad3d 100644 --- a/physics_lists/hadronic/Packaging/src/G4LHEPStoppingPhysics.cc +++ b/source/physics_lists/builders/src/G4LHEPStoppingPhysics.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4LHEPStoppingPhysics.cc,v 1.3 2006/06/29 18:02:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4LHEPStoppingPhysics.cc,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/Packaging/src/G4MiscLHEPBuilder.cc b/source/physics_lists/builders/src/G4MiscLHEPBuilder.cc similarity index 91% rename from physics_lists/hadronic/Packaging/src/G4MiscLHEPBuilder.cc rename to source/physics_lists/builders/src/G4MiscLHEPBuilder.cc index a881780370..bc47477e84 100644 --- a/physics_lists/hadronic/Packaging/src/G4MiscLHEPBuilder.cc +++ b/source/physics_lists/builders/src/G4MiscLHEPBuilder.cc @@ -23,7 +23,7 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -57,6 +57,7 @@ void G4MiscLHEPBuilder::Build() aProcMan = G4AntiProton::AntiProton()->GetProcessManager(); theLEAntiProtonModel = new G4LEAntiProtonInelastic(); theHEAntiProtonModel = new G4HEAntiProtonInelastic(); + theHEAntiProtonModel->SetMaxEnergy(100*TeV); theAntiProtonInelastic.RegisterMe(theLEAntiProtonModel); theAntiProtonInelastic.RegisterMe(theHEAntiProtonModel); aProcMan->AddDiscreteProcess(&theAntiProtonInelastic); @@ -65,6 +66,7 @@ void G4MiscLHEPBuilder::Build() aProcMan = G4AntiNeutron::AntiNeutron()->GetProcessManager(); theLEAntiNeutronModel = new G4LEAntiNeutronInelastic(); theHEAntiNeutronModel = new G4HEAntiNeutronInelastic(); + theHEAntiNeutronModel->SetMaxEnergy(100*TeV); theAntiNeutronInelastic.RegisterMe(theLEAntiNeutronModel); theAntiNeutronInelastic.RegisterMe(theHEAntiNeutronModel); aProcMan->AddDiscreteProcess(&theAntiNeutronInelastic); @@ -73,6 +75,7 @@ void G4MiscLHEPBuilder::Build() aProcMan = G4Lambda::Lambda()->GetProcessManager(); theLELambdaModel = new G4LELambdaInelastic(); theHELambdaModel = new G4HELambdaInelastic(); + theHELambdaModel->SetMaxEnergy(100*TeV); theLambdaInelastic.RegisterMe(theLELambdaModel); theLambdaInelastic.RegisterMe(theHELambdaModel); aProcMan->AddDiscreteProcess(&theLambdaInelastic); @@ -81,6 +84,7 @@ void G4MiscLHEPBuilder::Build() aProcMan = G4AntiLambda::AntiLambda()->GetProcessManager(); theLEAntiLambdaModel = new G4LEAntiLambdaInelastic(); theHEAntiLambdaModel = new G4HEAntiLambdaInelastic(); + theHEAntiLambdaModel->SetMaxEnergy(100*TeV); theAntiLambdaInelastic.RegisterMe(theLEAntiLambdaModel); theAntiLambdaInelastic.RegisterMe(theHEAntiLambdaModel); aProcMan->AddDiscreteProcess(&theAntiLambdaInelastic); @@ -89,6 +93,7 @@ void G4MiscLHEPBuilder::Build() aProcMan = G4SigmaMinus::SigmaMinus()->GetProcessManager(); theLESigmaMinusModel = new G4LESigmaMinusInelastic(); theHESigmaMinusModel = new G4HESigmaMinusInelastic(); + theHESigmaMinusModel->SetMaxEnergy(100*TeV); theSigmaMinusInelastic.RegisterMe(theLESigmaMinusModel); theSigmaMinusInelastic.RegisterMe(theHESigmaMinusModel); aProcMan->AddDiscreteProcess(&theSigmaMinusInelastic); @@ -97,6 +102,7 @@ void G4MiscLHEPBuilder::Build() aProcMan = G4AntiSigmaMinus::AntiSigmaMinus()->GetProcessManager(); theLEAntiSigmaMinusModel = new G4LEAntiSigmaMinusInelastic(); theHEAntiSigmaMinusModel = new G4HEAntiSigmaMinusInelastic(); + theHEAntiSigmaMinusModel->SetMaxEnergy(100*TeV); theAntiSigmaMinusInelastic.RegisterMe(theLEAntiSigmaMinusModel); theAntiSigmaMinusInelastic.RegisterMe(theHEAntiSigmaMinusModel); aProcMan->AddDiscreteProcess(&theAntiSigmaMinusInelastic); @@ -105,6 +111,7 @@ void G4MiscLHEPBuilder::Build() aProcMan = G4SigmaPlus::SigmaPlus()->GetProcessManager(); theLESigmaPlusModel = new G4LESigmaPlusInelastic(); theHESigmaPlusModel = new G4HESigmaPlusInelastic(); + theHESigmaPlusModel->SetMaxEnergy(100*TeV); theSigmaPlusInelastic.RegisterMe(theLESigmaPlusModel); theSigmaPlusInelastic.RegisterMe(theHESigmaPlusModel); aProcMan->AddDiscreteProcess(&theSigmaPlusInelastic); @@ -113,6 +120,7 @@ void G4MiscLHEPBuilder::Build() aProcMan = G4AntiSigmaPlus::AntiSigmaPlus()->GetProcessManager(); theLEAntiSigmaPlusModel = new G4LEAntiSigmaPlusInelastic(); theHEAntiSigmaPlusModel = new G4HEAntiSigmaPlusInelastic(); + theHEAntiSigmaPlusModel->SetMaxEnergy(100*TeV); theAntiSigmaPlusInelastic.RegisterMe(theLEAntiSigmaPlusModel); theAntiSigmaPlusInelastic.RegisterMe(theHEAntiSigmaPlusModel); aProcMan->AddDiscreteProcess(&theAntiSigmaPlusInelastic); @@ -121,6 +129,7 @@ void G4MiscLHEPBuilder::Build() aProcMan = G4XiMinus::XiMinus()->GetProcessManager(); theLEXiMinusModel = new G4LEXiMinusInelastic(); theHEXiMinusModel = new G4HEXiMinusInelastic(); + theHEXiMinusModel->SetMaxEnergy(100*TeV); theXiMinusInelastic.RegisterMe(theLEXiMinusModel); theXiMinusInelastic.RegisterMe(theHEXiMinusModel); aProcMan->AddDiscreteProcess(&theXiMinusInelastic); @@ -129,6 +138,7 @@ void G4MiscLHEPBuilder::Build() aProcMan = G4AntiXiMinus::AntiXiMinus()->GetProcessManager(); theLEAntiXiMinusModel = new G4LEAntiXiMinusInelastic(); theHEAntiXiMinusModel = new G4HEAntiXiMinusInelastic(); + theHEAntiXiMinusModel->SetMaxEnergy(100*TeV); theAntiXiMinusInelastic.RegisterMe(theLEAntiXiMinusModel); theAntiXiMinusInelastic.RegisterMe(theHEAntiXiMinusModel); aProcMan->AddDiscreteProcess(&theAntiXiMinusInelastic); @@ -137,6 +147,7 @@ void G4MiscLHEPBuilder::Build() aProcMan = G4XiZero::XiZero()->GetProcessManager(); theLEXiZeroModel = new G4LEXiZeroInelastic(); theHEXiZeroModel = new G4HEXiZeroInelastic(); + theHEXiZeroModel->SetMaxEnergy(100*TeV); theXiZeroInelastic.RegisterMe(theLEXiZeroModel); theXiZeroInelastic.RegisterMe(theHEXiZeroModel); aProcMan->AddDiscreteProcess(&theXiZeroInelastic); @@ -145,6 +156,7 @@ void G4MiscLHEPBuilder::Build() aProcMan = G4AntiXiZero::AntiXiZero()->GetProcessManager(); theLEAntiXiZeroModel = new G4LEAntiXiZeroInelastic(); theHEAntiXiZeroModel = new G4HEAntiXiZeroInelastic(); + theHEAntiXiZeroModel->SetMaxEnergy(100*TeV); theAntiXiZeroInelastic.RegisterMe(theLEAntiXiZeroModel); theAntiXiZeroInelastic.RegisterMe(theHEAntiXiZeroModel); aProcMan->AddDiscreteProcess(&theAntiXiZeroInelastic); @@ -153,6 +165,7 @@ void G4MiscLHEPBuilder::Build() aProcMan = G4OmegaMinus::OmegaMinus()->GetProcessManager(); theLEOmegaMinusModel = new G4LEOmegaMinusInelastic(); theHEOmegaMinusModel = new G4HEOmegaMinusInelastic(); + theHEOmegaMinusModel->SetMaxEnergy(100*TeV); theOmegaMinusInelastic.RegisterMe(theLEOmegaMinusModel); theOmegaMinusInelastic.RegisterMe(theHEOmegaMinusModel); aProcMan->AddDiscreteProcess(&theOmegaMinusInelastic); @@ -161,6 +174,7 @@ void G4MiscLHEPBuilder::Build() aProcMan = G4AntiOmegaMinus::AntiOmegaMinus()->GetProcessManager(); theLEAntiOmegaMinusModel = new G4LEAntiOmegaMinusInelastic(); theHEAntiOmegaMinusModel = new G4HEAntiOmegaMinusInelastic(); + theHEAntiOmegaMinusModel->SetMaxEnergy(100*TeV); theAntiOmegaMinusInelastic.RegisterMe(theLEAntiOmegaMinusModel); theAntiOmegaMinusInelastic.RegisterMe(theHEAntiOmegaMinusModel); aProcMan->AddDiscreteProcess(&theAntiOmegaMinusInelastic); diff --git a/physics_lists/hadronic/Packaging/src/G4NeutronBuilder.cc b/source/physics_lists/builders/src/G4NeutronBuilder.cc similarity index 98% rename from physics_lists/hadronic/Packaging/src/G4NeutronBuilder.cc rename to source/physics_lists/builders/src/G4NeutronBuilder.cc index 179d4bf42c..a4e2c2d231 100644 --- a/physics_lists/hadronic/Packaging/src/G4NeutronBuilder.cc +++ b/source/physics_lists/builders/src/G4NeutronBuilder.cc @@ -23,7 +23,7 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/Packaging/src/G4NeutronHPBuilder.cc b/source/physics_lists/builders/src/G4NeutronHPBuilder.cc similarity index 100% rename from physics_lists/hadronic/Packaging/src/G4NeutronHPBuilder.cc rename to source/physics_lists/builders/src/G4NeutronHPBuilder.cc diff --git a/source/physics_lists/builders/src/G4NeutronTrackingCut.cc b/source/physics_lists/builders/src/G4NeutronTrackingCut.cc new file mode 100644 index 0000000000..169cce9b7f --- /dev/null +++ b/source/physics_lists/builders/src/G4NeutronTrackingCut.cc @@ -0,0 +1,86 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4NeutronTrackingCut.cc,v 1.4 2006/11/24 16:30:13 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +//--------------------------------------------------------------------------- +// +// ClassName: G4NeutronTrackingCut +// +// Author: Nov 2006 G.Folger +// +// +//---------------------------------------------------------------------------- +// + +#include "G4NeutronTrackingCut.hh" + +#include "G4ParticleDefinition.hh" +#include "G4ProcessManager.hh" + +#include "G4Neutron.hh" +#include "G4NeutronKiller.hh" + +G4NeutronTrackingCut::G4NeutronTrackingCut(const G4String& name, G4int ver) + : G4VPhysicsConstructor(name), verbose(ver), wasActivated(false) +{} + +G4NeutronTrackingCut::~G4NeutronTrackingCut() +{ + if(wasActivated) + { + delete pNeutronKiller; + } +} + +void G4NeutronTrackingCut::ConstructParticle() +{ + +// G4cout << "G4NeutronTrackingCut::ConstructParticle" << G4endl; + + G4Neutron::NeutronDefinition(); +} + +void G4NeutronTrackingCut::ConstructProcess() +{ + G4double timeLimit =10*microsecond; +// G4double kineticEnergylimit =1*keV; + if(wasActivated) return; + wasActivated = true; + + // Add Decay Process + pNeutronKiller = new G4NeutronKiller(); + G4ParticleDefinition * particle = G4Neutron::Neutron(); + G4ProcessManager * pmanager = particle->GetProcessManager(); +// if(verbose > 1) + G4cout << "### Adding Neutron tracking cut for " << particle->GetParticleName() << G4endl; + G4cout << "### cut value is " << timeLimit/microsecond << " microseconds" << G4endl; + pmanager -> AddDiscreteProcess(pNeutronKiller); +// pNeutronKiller->SetKinEnergyLimit(kineticEnergylimit); + pNeutronKiller->SetTimeLimit(timeLimit); +} + + diff --git a/physics_lists/hadronic/Packaging/src/G4PiKBuilder.cc b/source/physics_lists/builders/src/G4PiKBuilder.cc similarity index 97% rename from physics_lists/hadronic/Packaging/src/G4PiKBuilder.cc rename to source/physics_lists/builders/src/G4PiKBuilder.cc index 4320b2fa12..94478ffb99 100644 --- a/physics_lists/hadronic/Packaging/src/G4PiKBuilder.cc +++ b/source/physics_lists/builders/src/G4PiKBuilder.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4PiKBuilder.cc,v 1.7 2006/06/29 18:02:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4PiKBuilder.cc,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/Packaging/src/G4PrecoNeutronBuilder.cc b/source/physics_lists/builders/src/G4PrecoNeutronBuilder.cc similarity index 100% rename from physics_lists/hadronic/Packaging/src/G4PrecoNeutronBuilder.cc rename to source/physics_lists/builders/src/G4PrecoNeutronBuilder.cc diff --git a/physics_lists/hadronic/Packaging/src/G4PrecoProtonBuilder.cc b/source/physics_lists/builders/src/G4PrecoProtonBuilder.cc similarity index 100% rename from physics_lists/hadronic/Packaging/src/G4PrecoProtonBuilder.cc rename to source/physics_lists/builders/src/G4PrecoProtonBuilder.cc diff --git a/physics_lists/hadronic/Packaging/src/G4ProtonBuilder.cc b/source/physics_lists/builders/src/G4ProtonBuilder.cc similarity index 96% rename from physics_lists/hadronic/Packaging/src/G4ProtonBuilder.cc rename to source/physics_lists/builders/src/G4ProtonBuilder.cc index 90d9cd6672..873b7b826d 100644 --- a/physics_lists/hadronic/Packaging/src/G4ProtonBuilder.cc +++ b/source/physics_lists/builders/src/G4ProtonBuilder.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4ProtonBuilder.cc,v 1.5 2006/06/29 18:02:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ProtonBuilder.cc,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/examples/extended/electromagnetic/TestEm9/include/PhysListEmG4v71.hh b/source/physics_lists/builders/src/G4QGSCEflowNeutronBuilder.cc similarity index 62% rename from examples/extended/electromagnetic/TestEm9/include/PhysListEmG4v71.hh rename to source/physics_lists/builders/src/G4QGSCEflowNeutronBuilder.cc index 27bcb0e63e..d3850a61d5 100644 --- a/examples/extended/electromagnetic/TestEm9/include/PhysListEmG4v71.hh +++ b/source/physics_lists/builders/src/G4QGSCEflowNeutronBuilder.cc @@ -23,45 +23,43 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// -// $Id: PhysListEmG4v71.hh,v 1.2 2006/06/29 17:01:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#ifndef PhysListEmG4v71_h -#define PhysListEmG4v71_h 1 - -#include "G4VPhysicsConstructor.hh" -#include "globals.hh" - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -class PhysListEmG4v71 : public G4VPhysicsConstructor -{ -public: - PhysListEmG4v71(const G4String& name = "g4v71"); - ~PhysListEmG4v71(); - -public: - // This method is dummy for physics. - void ConstructParticle() {}; - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - void ConstructProcess(); -}; - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#endif - + #include "G4QGSCEflowNeutronBuilder.hh" + #include "G4ParticleDefinition.hh" + #include "G4ParticleTable.hh" + #include "G4ProcessManager.hh" + G4QGSCEflowNeutronBuilder:: + G4QGSCEflowNeutronBuilder() + { + theMin = 8*GeV; + theModel = new G4TheoFSGenerator; + theStringModel= new G4QGSModel< G4QGSParticipants >; + theStringDecay = new G4ExcitedStringDecay(new G4QGSMFragmentation); + theStringModel->SetFragmentationModel(theStringDecay); + theCascade = new G4StringChipsParticleLevelInterface; + theModel->SetTransport(theCascade); + theModel->SetHighEnergyGenerator(theStringModel); + } + G4QGSCEflowNeutronBuilder:: + ~G4QGSCEflowNeutronBuilder() + { + delete theStringDecay; + delete theStringModel; + delete theCascade; + delete theModel; + } + void G4QGSCEflowNeutronBuilder:: + Build(G4NeutronInelasticProcess * aP) + { + theModel->SetMinEnergy(theMin); + theModel->SetMaxEnergy(100*TeV); + aP->RegisterMe(theModel); + aP->AddDataSet(&theXSec); + } +// 2006 G.Folger diff --git a/examples/extended/parallel/ParN04/src/ExN04EMPhysics.cc b/source/physics_lists/builders/src/G4QGSCEflowPiKBuilder.cc similarity index 50% rename from examples/extended/parallel/ParN04/src/ExN04EMPhysics.cc rename to source/physics_lists/builders/src/G4QGSCEflowPiKBuilder.cc index 3d6a28b584..e114d3a562 100644 --- a/examples/extended/parallel/ParN04/src/ExN04EMPhysics.cc +++ b/source/physics_lists/builders/src/G4QGSCEflowPiKBuilder.cc @@ -23,82 +23,87 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// -// $Id: ExN04EMPhysics.cc,v 1.4 2006/06/29 17:37:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// - -#include "ExN04EMPhysics.hh" - -#include "globals.hh" -#include "G4ios.hh" -#include - - -ExN04EMPhysics::ExN04EMPhysics(const G4String& name) - : G4VPhysicsConstructor(name) -{ -} - -ExN04EMPhysics::~ExN04EMPhysics() -{ -} - +#include "G4QGSCEflowPiKBuilder.hh" #include "G4ParticleDefinition.hh" #include "G4ParticleTable.hh" - -#include "G4Gamma.hh" - -#include "G4Electron.hh" -#include "G4Positron.hh" - -#include "G4NeutrinoE.hh" -#include "G4AntiNeutrinoE.hh" - -void ExN04EMPhysics::ConstructParticle() -{ - // gamma - G4Gamma::GammaDefinition(); - - // electron - G4Electron::ElectronDefinition(); - G4Positron::PositronDefinition(); - G4NeutrinoE::NeutrinoEDefinition(); - G4AntiNeutrinoE::AntiNeutrinoEDefinition(); -} - - #include "G4ProcessManager.hh" - -void ExN04EMPhysics::ConstructProcess() +G4QGSCEflowPiKBuilder:: +G4QGSCEflowPiKBuilder() { - G4ProcessManager * pManager = 0; + theMin = 8*GeV; + theModel = new G4TheoFSGenerator; - // Gamma Physics - pManager = G4Gamma::Gamma()->GetProcessManager(); - pManager->AddDiscreteProcess(&thePhotoEffect); - pManager->AddDiscreteProcess(&theComptonEffect); - pManager->AddDiscreteProcess(&thePairProduction); + theStringModel = new G4QGSModel< G4QGSParticipants >; + theStringDecay = new G4ExcitedStringDecay(new G4QGSMFragmentation); + theStringModel->SetFragmentationModel(theStringDecay); - // Electron Physics - pManager = G4Electron::Electron()->GetProcessManager(); - - pManager->AddProcess(&theElectronMultipleScattering, -1, 1, 1); - pManager->AddProcess(&theElectronIonisation, -1, 2, 2); - pManager->AddProcess(&theElectronBremsStrahlung, -1, 3, 3); - - - //Positron Physics - pManager = G4Positron::Positron()->GetProcessManager(); - - pManager->AddProcess(&thePositronMultipleScattering, -1, 1, 1); - pManager->AddProcess(&thePositronIonisation, -1, 2, 2); - pManager->AddProcess(&thePositronBremsStrahlung, -1, 3, 3); - pManager->AddProcess(&theAnnihilation, 0,-1, 4); + theCascade = new G4StringChipsParticleLevelInterface; + theModel->SetTransport(theCascade); + theModel->SetHighEnergyGenerator(theStringModel); } +G4QGSCEflowPiKBuilder:: +~G4QGSCEflowPiKBuilder() +{ + delete theCascade; + delete theStringDecay; + delete theStringModel; + delete theModel; +} +void G4QGSCEflowPiKBuilder:: +Build(G4HadronElasticProcess * ) {} +void G4QGSCEflowPiKBuilder:: +Build(G4PionPlusInelasticProcess * aP) +{ + theModel->SetMinEnergy(theMin); + theModel->SetMaxEnergy(100*TeV); + aP->AddDataSet(&thePiCross); + aP->RegisterMe(theModel); +} + +void G4QGSCEflowPiKBuilder:: +Build(G4PionMinusInelasticProcess * aP) +{ + theModel->SetMinEnergy(theMin); + theModel->SetMaxEnergy(100*TeV); + aP->AddDataSet(&thePiCross); + aP->RegisterMe(theModel); +} + +void G4QGSCEflowPiKBuilder:: +Build(G4KaonPlusInelasticProcess * aP) +{ + theModel->SetMinEnergy(theMin); + theModel->SetMaxEnergy(100*TeV); + aP->RegisterMe(theModel); +} + +void G4QGSCEflowPiKBuilder:: +Build(G4KaonMinusInelasticProcess * aP) +{ + theModel->SetMinEnergy(theMin); + theModel->SetMaxEnergy(100*TeV); + aP->RegisterMe(theModel); +} + +void G4QGSCEflowPiKBuilder:: +Build(G4KaonZeroLInelasticProcess * aP) +{ + theModel->SetMinEnergy(theMin); + theModel->SetMaxEnergy(100*TeV); + aP->RegisterMe(theModel); +} + +void G4QGSCEflowPiKBuilder:: +Build(G4KaonZeroSInelasticProcess * aP) +{ + theModel->SetMinEnergy(theMin); + theModel->SetMaxEnergy(100*TeV); + aP->RegisterMe(theModel); +} + +// 2006 G.Folger diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04CalorimeterParametrisation.cc b/source/physics_lists/builders/src/G4QGSCEflowProtonBuilder.cc similarity index 62% rename from examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04CalorimeterParametrisation.cc rename to source/physics_lists/builders/src/G4QGSCEflowProtonBuilder.cc index 18b947593a..91f2223504 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04CalorimeterParametrisation.cc +++ b/source/physics_lists/builders/src/G4QGSCEflowProtonBuilder.cc @@ -23,36 +23,48 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +#include "G4QGSCEflowProtonBuilder.hh" +#include "G4ParticleDefinition.hh" +#include "G4ParticleTable.hh" +#include "G4ProcessManager.hh" -#include "ExN04CalorimeterParametrisation.hh" - -#include "G4VPhysicalVolume.hh" -#include "G4ThreeVector.hh" -#include "G4Tubs.hh" - -ExN04CalorimeterParametrisation::ExN04CalorimeterParametrisation() +G4QGSCEflowProtonBuilder:: +G4QGSCEflowProtonBuilder() { -#include "ExN04DetectorParameterDef.icc" + theMin = 8*GeV; + theModel = new G4TheoFSGenerator; + + theStringModel = new G4QGSModel< G4QGSParticipants >; + theStringDecay = new G4ExcitedStringDecay(new G4QGSMFragmentation); + theStringModel->SetFragmentationModel(theStringDecay); + + theCascade = new G4StringChipsParticleLevelInterface; + + theModel->SetHighEnergyGenerator(theStringModel); + theModel->SetTransport(theCascade); } -ExN04CalorimeterParametrisation::~ExN04CalorimeterParametrisation() -{;} - -void ExN04CalorimeterParametrisation::ComputeTransformation -(const G4int,G4VPhysicalVolume *physVol) const +G4QGSCEflowProtonBuilder:: +~G4QGSCEflowProtonBuilder() { - G4ThreeVector origin; - physVol->SetTranslation(origin); + delete theCascade; + delete theStringDecay; + delete theStringModel; + delete theModel; } -void ExN04CalorimeterParametrisation::ComputeDimensions -(G4Tubs & calorimeterLayer, const G4int copyNo, const G4VPhysicalVolume*) const +void G4QGSCEflowProtonBuilder:: +Build(G4HadronElasticProcess * ) { - G4double innerRad = caloTubs_rmin - + copyNo*(absorber_thick+scinti_thick); - calorimeterLayer.SetInnerRadius(innerRad); - calorimeterLayer.SetOuterRadius(innerRad+absorber_thick); - calorimeterLayer.SetZHalfLength(caloTubs_dz); - calorimeterLayer.SetStartPhiAngle(caloTubs_sphi); - calorimeterLayer.SetDeltaPhiAngle(caloTubs_dphi); } + +void G4QGSCEflowProtonBuilder:: +Build(G4ProtonInelasticProcess * aP) +{ + theModel->SetMinEnergy(theMin); + theModel->SetMaxEnergy(100*TeV); + aP->RegisterMe(theModel); + aP->AddDataSet(&theXSec); +} + +// 2006 G.Folger diff --git a/physics_lists/hadronic/Packaging/src/G4QGSCNeutronBuilder.cc b/source/physics_lists/builders/src/G4QGSCNeutronBuilder.cc similarity index 97% rename from physics_lists/hadronic/Packaging/src/G4QGSCNeutronBuilder.cc rename to source/physics_lists/builders/src/G4QGSCNeutronBuilder.cc index d7d2c1c57d..0703aa1578 100644 --- a/physics_lists/hadronic/Packaging/src/G4QGSCNeutronBuilder.cc +++ b/source/physics_lists/builders/src/G4QGSCNeutronBuilder.cc @@ -38,7 +38,7 @@ theStringDecay = new G4ExcitedStringDecay(new G4QGSMFragmentation); theStringModel->SetFragmentationModel(theStringDecay); - theCascade = new G4StringChipsParticleLevelInterface; + theCascade = new G4QStringChipsParticleLevelInterface; theModel->SetTransport(theCascade); theModel->SetHighEnergyGenerator(theStringModel); diff --git a/physics_lists/hadronic/Packaging/src/G4QGSCPiKBuilder.cc b/source/physics_lists/builders/src/G4QGSCPiKBuilder.cc similarity index 98% rename from physics_lists/hadronic/Packaging/src/G4QGSCPiKBuilder.cc rename to source/physics_lists/builders/src/G4QGSCPiKBuilder.cc index 88e4a6c234..2ed519f7db 100644 --- a/physics_lists/hadronic/Packaging/src/G4QGSCPiKBuilder.cc +++ b/source/physics_lists/builders/src/G4QGSCPiKBuilder.cc @@ -38,7 +38,7 @@ G4QGSCPiKBuilder() theStringDecay = new G4ExcitedStringDecay(new G4QGSMFragmentation); theStringModel->SetFragmentationModel(theStringDecay); - theCascade = new G4StringChipsParticleLevelInterface; + theCascade = new G4QStringChipsParticleLevelInterface; theModel->SetTransport(theCascade); theModel->SetHighEnergyGenerator(theStringModel); diff --git a/physics_lists/hadronic/Packaging/src/G4QGSCProtonBuilder.cc b/source/physics_lists/builders/src/G4QGSCProtonBuilder.cc similarity index 97% rename from physics_lists/hadronic/Packaging/src/G4QGSCProtonBuilder.cc rename to source/physics_lists/builders/src/G4QGSCProtonBuilder.cc index a342497b81..324015b69f 100644 --- a/physics_lists/hadronic/Packaging/src/G4QGSCProtonBuilder.cc +++ b/source/physics_lists/builders/src/G4QGSCProtonBuilder.cc @@ -38,7 +38,7 @@ G4QGSCProtonBuilder() theStringDecay = new G4ExcitedStringDecay(new G4QGSMFragmentation); theStringModel->SetFragmentationModel(theStringDecay); - theCascade = new G4StringChipsParticleLevelInterface; + theCascade = new G4QStringChipsParticleLevelInterface; theModel->SetHighEnergyGenerator(theStringModel); theModel->SetTransport(theCascade); diff --git a/physics_lists/hadronic/Packaging/src/G4QGSPNeutronBuilder.cc b/source/physics_lists/builders/src/G4QGSPNeutronBuilder.cc similarity index 100% rename from physics_lists/hadronic/Packaging/src/G4QGSPNeutronBuilder.cc rename to source/physics_lists/builders/src/G4QGSPNeutronBuilder.cc diff --git a/physics_lists/hadronic/Packaging/src/G4QGSPPiKBuilder.cc b/source/physics_lists/builders/src/G4QGSPPiKBuilder.cc similarity index 100% rename from physics_lists/hadronic/Packaging/src/G4QGSPPiKBuilder.cc rename to source/physics_lists/builders/src/G4QGSPPiKBuilder.cc diff --git a/physics_lists/hadronic/Packaging/src/G4QGSPProtonBuilder.cc b/source/physics_lists/builders/src/G4QGSPProtonBuilder.cc similarity index 100% rename from physics_lists/hadronic/Packaging/src/G4QGSPProtonBuilder.cc rename to source/physics_lists/builders/src/G4QGSPProtonBuilder.cc diff --git a/physics_lists/hadronic/Packaging/src/G4QStoppingPhysics.cc b/source/physics_lists/builders/src/G4QStoppingPhysics.cc similarity index 97% rename from physics_lists/hadronic/Packaging/src/G4QStoppingPhysics.cc rename to source/physics_lists/builders/src/G4QStoppingPhysics.cc index a2c6de44dd..5d522187a3 100644 --- a/physics_lists/hadronic/Packaging/src/G4QStoppingPhysics.cc +++ b/source/physics_lists/builders/src/G4QStoppingPhysics.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4QStoppingPhysics.cc,v 1.5 2006/06/29 18:02:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4QStoppingPhysics.cc,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/Packaging/src/G4StoppingHadronBuilder.cc b/source/physics_lists/builders/src/G4StoppingHadronBuilder.cc similarity index 97% rename from physics_lists/hadronic/Packaging/src/G4StoppingHadronBuilder.cc rename to source/physics_lists/builders/src/G4StoppingHadronBuilder.cc index 76bc51e28b..c732c0c595 100644 --- a/physics_lists/hadronic/Packaging/src/G4StoppingHadronBuilder.cc +++ b/source/physics_lists/builders/src/G4StoppingHadronBuilder.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4StoppingHadronBuilder.cc,v 1.6 2006/06/29 18:02:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4StoppingHadronBuilder.cc,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/common.gmk b/source/physics_lists/lists/GNUmakefile similarity index 83% rename from physics_lists/hadronic/common.gmk rename to source/physics_lists/lists/GNUmakefile index d5c02861fd..d09e9f4280 100644 --- a/physics_lists/hadronic/common.gmk +++ b/source/physics_lists/lists/GNUmakefile @@ -1,43 +1,14 @@ -# $Id: common.gmk,v 1.3 2006/06/19 21:34:47 vnivanch Exp $ -# -------------------------------------------------------------- -# Setup for hadronic physics-lists libraries -# -------------------------------------------------------------- +# $Id: GNUmakefile,v 1.1 2006/10/31 11:34:03 gunter Exp $ +# --------------------------------------------------------------------------- +# GNUmakefile for physics_lists/lists library. Gunter Folger 25-Oct-2006. +# --------------------------------------------------------------------------- + +name := G4phys_lists ifndef G4INSTALL G4INSTALL = ../../.. endif -# If G4LISTS_BASE is not defined, place hadronic physics-lists libraries and -# temporaries in the default G4LIB and G4TMP area (whatever they point to) -# inside a specific directory "plists". -# Otherwise, create a self-consistent installation under G4LISTS_BASE. -# -ifdef G4LISTS_BASE - G4LIB = $(G4LISTS_BASE)/hadronic/plists/lib - G4TMP = $(G4LISTS_BASE)/hadronic/plists/tmp -else - G4LISTS_BASE = $(G4INSTALL)/physics_lists - ifdef G4LIB - G4LIB := $(G4LIB)/plists - else - G4LIB = $(G4INSTALL)/lib/plists - endif - ifdef G4TMP - G4TMP := $(G4TMP)/plists - else - G4TMP = $(G4INSTALL)/tmp/plists - endif -endif - -LISTS_INCLUDE = $(G4LISTS_BASE) - -# Shared libraries for the physics lists are currently NOT supported -# if granular libraries of Geant4 are installed and used. -# -ifdef G4LIB_USE_GRANULAR - G4LIB_NO_SHARED := 1 -endif - include $(G4INSTALL)/config/architecture.gmk CPPFLAGS += -I$(G4BASE)/global/management/include \ @@ -77,7 +48,7 @@ CPPFLAGS += -I$(G4BASE)/global/management/include \ -I$(G4BASE)/processes/hadronic/management/include \ -I$(G4BASE)/processes/hadronic/processes/include \ -I$(G4BASE)/processes/hadronic/util/include \ - -I$(LISTS_INCLUDE)/hadronic/Packaging/include \ + -I$(G4BASE)/physics_lists/builders/include \ -I$(G4BASE)/processes/hadronic/models/management/include \ -I$(G4BASE)/processes/hadronic/models/util/include \ -I$(G4BASE)/processes/hadronic/models/binary_cascade/include \ @@ -113,5 +84,4 @@ CPPFLAGS += -I$(G4BASE)/global/management/include \ -I$(G4BASE)/processes/hadronic/util/include \ -I$(G4BASE)/materials/include - include $(G4INSTALL)/config/common.gmk diff --git a/physics_lists/hadronic/FTFC/include/FTFC.hh b/source/physics_lists/lists/include/FTFC.hh similarity index 96% rename from physics_lists/hadronic/FTFC/include/FTFC.hh rename to source/physics_lists/lists/include/FTFC.hh index 1e05bc2a4f..5fa5a12114 100644 --- a/physics_lists/hadronic/FTFC/include/FTFC.hh +++ b/source/physics_lists/lists/include/FTFC.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: FTFC.hh,v 1.4 2006/06/29 17:55:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: FTFC.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/FTFC/include/FTFC.icc b/source/physics_lists/lists/include/FTFC.icc similarity index 96% rename from physics_lists/hadronic/FTFC/include/FTFC.icc rename to source/physics_lists/lists/include/FTFC.icc index e7c5812b7a..dc8722604b 100644 --- a/physics_lists/hadronic/FTFC/include/FTFC.icc +++ b/source/physics_lists/lists/include/FTFC.icc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: FTFC.icc,v 1.11 2006/06/29 17:55:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: FTFC.icc,v 1.2 2006/11/24 17:10:02 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -71,7 +71,7 @@ template TFTFC::TFTFC(G4int ver): T() // default cut value (1.0mm) // defaultCutValue = 1.0*mm; G4DataQuestionaire it(photon); - G4cout << "<<< Geant4 Physics List simulation engine: FTFC 3.1"<defaultCutValue = 0.7*mm; this->SetVerboseLevel(ver); diff --git a/physics_lists/hadronic/FTFP/include/FTFP.hh b/source/physics_lists/lists/include/FTFP.hh similarity index 96% rename from physics_lists/hadronic/FTFP/include/FTFP.hh rename to source/physics_lists/lists/include/FTFP.hh index ea8c721159..8c6bfc10ef 100644 --- a/physics_lists/hadronic/FTFP/include/FTFP.hh +++ b/source/physics_lists/lists/include/FTFP.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: FTFP.hh,v 1.4 2006/06/29 17:55:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: FTFP.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/FTFP/include/FTFP.icc b/source/physics_lists/lists/include/FTFP.icc similarity index 91% rename from physics_lists/hadronic/FTFP/include/FTFP.icc rename to source/physics_lists/lists/include/FTFP.icc index 47ec289dc5..a3c649ac6f 100644 --- a/physics_lists/hadronic/FTFP/include/FTFP.icc +++ b/source/physics_lists/lists/include/FTFP.icc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: FTFP.icc,v 1.11 2006/06/29 17:55:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: FTFP.icc,v 1.3 2006/11/24 17:10:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -38,6 +38,7 @@ // 02.12.2005 V.Ivanchenko: rename components // 08.06.2006 V.Ivanchenko: migration to CHIPS stopping // 15.06.2006 G.Folger: Migrate to HadronElasticPhysics using improved elastic +// 20.11.2006 G.Folger: add Tracking Cut for neutrons // //---------------------------------------------------------------------------- // @@ -61,6 +62,7 @@ #include "G4IonPhysics.hh" #include "G4QStoppingPhysics.hh" #include "G4HadronElasticPhysics.hh" +#include "G4NeutronTrackingCut.hh" #include "G4DataQuestionaire.hh" #include "HadronPhysicsFTFP.hh" @@ -70,7 +72,7 @@ template TFTFP::TFTFP(G4int ver): T() // default cut value (1.0mm) // defaultCutValue = 1.0*mm; G4DataQuestionaire it(photon); - G4cout << "<<< Geant4 Physics List simulation engine: FTFP 4.1"<defaultCutValue = 0.7*mm; this->SetVerboseLevel(ver); @@ -95,6 +97,10 @@ template TFTFP::TFTFP(G4int ver): T() // Ion Physics this->RegisterPhysics( new G4IonPhysics("ion")); + + // Neutron tracking cut + this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver)); + } template TFTFP::~TFTFP() diff --git a/physics_lists/hadronic/QBBC/include/G4HadronInelasticQBBC.hh b/source/physics_lists/lists/include/G4HadronInelasticQBBC.hh similarity index 90% rename from physics_lists/hadronic/QBBC/include/G4HadronInelasticQBBC.hh rename to source/physics_lists/lists/include/G4HadronInelasticQBBC.hh index c066b52ee9..c70668d1f4 100644 --- a/physics_lists/hadronic/QBBC/include/G4HadronInelasticQBBC.hh +++ b/source/physics_lists/lists/include/G4HadronInelasticQBBC.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4HadronInelasticQBBC.hh,v 1.4 2006/06/29 18:02:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4HadronInelasticQBBC.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -33,6 +33,7 @@ // Author: 11 April 2006 V. Ivanchenko // // Modified: +// 05.07.2006 V.Ivanchenko fix problem of initialisation of HP // //---------------------------------------------------------------------------- // @@ -66,7 +67,8 @@ public: G4HadronInelasticQBBC(const G4String& name = "inelastic", G4int ver = 1, G4bool ftf = false, G4bool bert = false, - G4bool chips = false, G4bool hp = false); + G4bool chips = false, G4bool hp = false, + G4bool glauber = false); virtual ~G4HadronInelasticQBBC(); @@ -90,9 +92,9 @@ private: G4ProtonInelasticCrossSection theXSecP; G4NeutronInelasticCrossSection theXSecN; - G4NeutronHPInelasticData theHPXSecI; - G4NeutronHPCaptureData theHPXSecC; - G4NeutronHPFissionData theHPXSecF; + G4NeutronHPInelasticData* theHPXSecI; + G4NeutronHPCaptureData* theHPXSecC; + G4NeutronHPFissionData* theHPXSecF; G4HadronProcessStore* store; @@ -107,6 +109,7 @@ private: G4bool bertFlag; G4bool chipsFlag; G4bool hpFlag; + G4bool glFlag; G4bool wasActivated; }; diff --git a/physics_lists/hadronic/QBBC/include/G4HadronInelasticQLHEP.hh b/source/physics_lists/lists/include/G4HadronInelasticQLHEP.hh similarity index 93% rename from physics_lists/hadronic/QBBC/include/G4HadronInelasticQLHEP.hh rename to source/physics_lists/lists/include/G4HadronInelasticQLHEP.hh index 533ac4cb9d..87728f1f8f 100644 --- a/physics_lists/hadronic/QBBC/include/G4HadronInelasticQLHEP.hh +++ b/source/physics_lists/lists/include/G4HadronInelasticQLHEP.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4HadronInelasticQLHEP.hh,v 1.3 2006/06/29 18:02:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4HadronInelasticQLHEP.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -33,6 +33,7 @@ // Author: 11 April 2006 V. Ivanchenko // // Modified: +// 05.07.2006 V.Ivanchenko fix problem of initialisation of HP // //---------------------------------------------------------------------------- // @@ -100,9 +101,9 @@ private: G4ProtonInelasticCrossSection theXSecP; G4NeutronInelasticCrossSection theXSecN; - G4NeutronHPInelasticData theHPXSecI; - G4NeutronHPCaptureData theHPXSecC; - G4NeutronHPFissionData theHPXSecF; + G4NeutronHPInelasticData* theHPXSecI; + G4NeutronHPCaptureData* theHPXSecC; + G4NeutronHPFissionData* theHPXSecF; G4HadronProcessStore* store; diff --git a/physics_lists/hadronic/FTFC/include/HadronPhysicsFTFC.hh b/source/physics_lists/lists/include/HadronPhysicsFTFC.hh similarity index 96% rename from physics_lists/hadronic/FTFC/include/HadronPhysicsFTFC.hh rename to source/physics_lists/lists/include/HadronPhysicsFTFC.hh index 8c8d6d5f6f..7b1b2946e7 100644 --- a/physics_lists/hadronic/FTFC/include/HadronPhysicsFTFC.hh +++ b/source/physics_lists/lists/include/HadronPhysicsFTFC.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsFTFC.hh,v 1.4 2006/06/29 17:55:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsFTFC.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/FTFP/include/HadronPhysicsFTFP.hh b/source/physics_lists/lists/include/HadronPhysicsFTFP.hh similarity index 96% rename from physics_lists/hadronic/FTFP/include/HadronPhysicsFTFP.hh rename to source/physics_lists/lists/include/HadronPhysicsFTFP.hh index 11bd09be40..bb2ca2b162 100644 --- a/physics_lists/hadronic/FTFP/include/HadronPhysicsFTFP.hh +++ b/source/physics_lists/lists/include/HadronPhysicsFTFP.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsFTFP.hh,v 1.4 2006/06/29 17:55:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsFTFP.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP/include/HadronPhysicsLHEP.hh b/source/physics_lists/lists/include/HadronPhysicsLHEP.hh similarity index 96% rename from physics_lists/hadronic/LHEP/include/HadronPhysicsLHEP.hh rename to source/physics_lists/lists/include/HadronPhysicsLHEP.hh index 4d87020e29..57ae4d63ed 100644 --- a/physics_lists/hadronic/LHEP/include/HadronPhysicsLHEP.hh +++ b/source/physics_lists/lists/include/HadronPhysicsLHEP.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsLHEP.hh,v 1.3 2006/06/29 17:55:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsLHEP.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_BERT/include/HadronPhysicsLHEP_BERT.hh b/source/physics_lists/lists/include/HadronPhysicsLHEP_BERT.hh similarity index 96% rename from physics_lists/hadronic/LHEP_BERT/include/HadronPhysicsLHEP_BERT.hh rename to source/physics_lists/lists/include/HadronPhysicsLHEP_BERT.hh index 2762c95b92..ec9bbc90ea 100644 --- a/physics_lists/hadronic/LHEP_BERT/include/HadronPhysicsLHEP_BERT.hh +++ b/source/physics_lists/lists/include/HadronPhysicsLHEP_BERT.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsLHEP_BERT.hh,v 1.5 2006/06/29 17:55:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsLHEP_BERT.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_BERT_HP/include/HadronPhysicsLHEP_BERT_HP.hh b/source/physics_lists/lists/include/HadronPhysicsLHEP_BERT_HP.hh similarity index 96% rename from physics_lists/hadronic/LHEP_BERT_HP/include/HadronPhysicsLHEP_BERT_HP.hh rename to source/physics_lists/lists/include/HadronPhysicsLHEP_BERT_HP.hh index 3dc63938ea..16c65b28e8 100644 --- a/physics_lists/hadronic/LHEP_BERT_HP/include/HadronPhysicsLHEP_BERT_HP.hh +++ b/source/physics_lists/lists/include/HadronPhysicsLHEP_BERT_HP.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsLHEP_BERT_HP.hh,v 1.5 2006/06/29 17:56:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsLHEP_BERT_HP.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_BIC/include/HadronPhysicsLHEP_BIC.hh b/source/physics_lists/lists/include/HadronPhysicsLHEP_BIC.hh similarity index 96% rename from physics_lists/hadronic/LHEP_BIC/include/HadronPhysicsLHEP_BIC.hh rename to source/physics_lists/lists/include/HadronPhysicsLHEP_BIC.hh index 8a60e0863d..0699a01f1a 100644 --- a/physics_lists/hadronic/LHEP_BIC/include/HadronPhysicsLHEP_BIC.hh +++ b/source/physics_lists/lists/include/HadronPhysicsLHEP_BIC.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsLHEP_BIC.hh,v 1.5 2006/06/29 17:56:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsLHEP_BIC.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_BIC_HP/include/HadronPhysicsLHEP_BIC_HP.hh b/source/physics_lists/lists/include/HadronPhysicsLHEP_BIC_HP.hh similarity index 96% rename from physics_lists/hadronic/LHEP_BIC_HP/include/HadronPhysicsLHEP_BIC_HP.hh rename to source/physics_lists/lists/include/HadronPhysicsLHEP_BIC_HP.hh index 11a8417c22..523d137b1c 100644 --- a/physics_lists/hadronic/LHEP_BIC_HP/include/HadronPhysicsLHEP_BIC_HP.hh +++ b/source/physics_lists/lists/include/HadronPhysicsLHEP_BIC_HP.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsLHEP_BIC_HP.hh,v 1.5 2006/06/29 17:56:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsLHEP_BIC_HP.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_EMV/include/HadronPhysicsLHEP_EMV.hh b/source/physics_lists/lists/include/HadronPhysicsLHEP_EMV.hh similarity index 96% rename from physics_lists/hadronic/LHEP_EMV/include/HadronPhysicsLHEP_EMV.hh rename to source/physics_lists/lists/include/HadronPhysicsLHEP_EMV.hh index e517649d2c..4d057bea74 100644 --- a/physics_lists/hadronic/LHEP_EMV/include/HadronPhysicsLHEP_EMV.hh +++ b/source/physics_lists/lists/include/HadronPhysicsLHEP_EMV.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsLHEP_EMV.hh,v 1.3 2006/06/29 17:56:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsLHEP_EMV.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_HP/include/HadronPhysicsLHEP_HP.hh b/source/physics_lists/lists/include/HadronPhysicsLHEP_HP.hh similarity index 96% rename from physics_lists/hadronic/LHEP_HP/include/HadronPhysicsLHEP_HP.hh rename to source/physics_lists/lists/include/HadronPhysicsLHEP_HP.hh index 85ea283c1a..338e733a8e 100644 --- a/physics_lists/hadronic/LHEP_HP/include/HadronPhysicsLHEP_HP.hh +++ b/source/physics_lists/lists/include/HadronPhysicsLHEP_HP.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsLHEP_HP.hh,v 1.5 2006/06/29 17:56:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsLHEP_HP.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_LEAD/include/HadronPhysicsLHEP_LEAD.hh b/source/physics_lists/lists/include/HadronPhysicsLHEP_LEAD.hh similarity index 96% rename from physics_lists/hadronic/LHEP_LEAD/include/HadronPhysicsLHEP_LEAD.hh rename to source/physics_lists/lists/include/HadronPhysicsLHEP_LEAD.hh index 74d1db4613..ce0c8a802d 100644 --- a/physics_lists/hadronic/LHEP_LEAD/include/HadronPhysicsLHEP_LEAD.hh +++ b/source/physics_lists/lists/include/HadronPhysicsLHEP_LEAD.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsLHEP_LEAD.hh,v 1.5 2006/06/29 17:57:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsLHEP_LEAD.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_LEAD_HP/include/HadronPhysicsLHEP_LEAD_HP.hh b/source/physics_lists/lists/include/HadronPhysicsLHEP_LEAD_HP.hh similarity index 97% rename from physics_lists/hadronic/LHEP_LEAD_HP/include/HadronPhysicsLHEP_LEAD_HP.hh rename to source/physics_lists/lists/include/HadronPhysicsLHEP_LEAD_HP.hh index dba17b26d8..aa52473199 100644 --- a/physics_lists/hadronic/LHEP_LEAD_HP/include/HadronPhysicsLHEP_LEAD_HP.hh +++ b/source/physics_lists/lists/include/HadronPhysicsLHEP_LEAD_HP.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsLHEP_LEAD_HP.hh,v 1.5 2006/06/29 17:57:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsLHEP_LEAD_HP.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_PRECO/include/HadronPhysicsLHEP_PRECO.hh b/source/physics_lists/lists/include/HadronPhysicsLHEP_PRECO.hh similarity index 96% rename from physics_lists/hadronic/LHEP_PRECO/include/HadronPhysicsLHEP_PRECO.hh rename to source/physics_lists/lists/include/HadronPhysicsLHEP_PRECO.hh index f64285e9f6..1b7fd01482 100644 --- a/physics_lists/hadronic/LHEP_PRECO/include/HadronPhysicsLHEP_PRECO.hh +++ b/source/physics_lists/lists/include/HadronPhysicsLHEP_PRECO.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsLHEP_PRECO.hh,v 1.5 2006/06/29 17:57:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsLHEP_PRECO.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_PRECO_HP/include/HadronPhysicsLHEP_PRECO_HP.hh b/source/physics_lists/lists/include/HadronPhysicsLHEP_PRECO_HP.hh similarity index 96% rename from physics_lists/hadronic/LHEP_PRECO_HP/include/HadronPhysicsLHEP_PRECO_HP.hh rename to source/physics_lists/lists/include/HadronPhysicsLHEP_PRECO_HP.hh index 29fd9f30c3..6e2902ccc2 100644 --- a/physics_lists/hadronic/LHEP_PRECO_HP/include/HadronPhysicsLHEP_PRECO_HP.hh +++ b/source/physics_lists/lists/include/HadronPhysicsLHEP_PRECO_HP.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsLHEP_PRECO_HP.hh,v 1.5 2006/06/29 17:57:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsLHEP_PRECO_HP.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/QGSC/include/HadronPhysicsQGSC.hh b/source/physics_lists/lists/include/HadronPhysicsQGSC.hh similarity index 96% rename from physics_lists/hadronic/QGSC/include/HadronPhysicsQGSC.hh rename to source/physics_lists/lists/include/HadronPhysicsQGSC.hh index 0465d3fe59..ef28547d69 100644 --- a/physics_lists/hadronic/QGSC/include/HadronPhysicsQGSC.hh +++ b/source/physics_lists/lists/include/HadronPhysicsQGSC.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsQGSC.hh,v 1.4 2006/06/29 18:03:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsQGSC.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_GN/include/HadronPhysicsLHEP_GN.hh b/source/physics_lists/lists/include/HadronPhysicsQGSC_EFLOW.hh similarity index 71% rename from physics_lists/hadronic/LHEP_GN/include/HadronPhysicsLHEP_GN.hh rename to source/physics_lists/lists/include/HadronPhysicsQGSC_EFLOW.hh index 2cab40664d..771bb4df45 100644 --- a/physics_lists/hadronic/LHEP_GN/include/HadronPhysicsLHEP_GN.hh +++ b/source/physics_lists/lists/include/HadronPhysicsQGSC_EFLOW.hh @@ -23,23 +23,22 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsLHEP_GN.hh,v 1.4 2006/06/29 17:56:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsQGSC_EFLOW.hh,v 1.1 2006/12/05 17:03:31 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // -// ClassName: HadronPhysicsLHEP_GN +// ClassName: HadronPhysicsQGSC_EFLOW // -// Author: 2002 J.P. Wellisch +// Author: 2006 Gunter Folger // +// Created from HadronPhysicsQGSC // Modified: -// 1.12.2005 G.Folger: don't keep processes as data members, but new these -// 08.06.2006 V.Ivanchenko: remove stopping // //---------------------------------------------------------------------------- -// -#ifndef HadronPhysicsLHEP_GN_h -#define HadronPhysicsLHEP_GN_h 1 + +#ifndef HadronPhysicsQGSC_EFLOW_h +#define HadronPhysicsQGSC_EFLOW_h 1 #include "globals.hh" #include "G4ios.hh" @@ -47,20 +46,23 @@ #include "G4VPhysicsConstructor.hh" #include "G4MiscLHEPBuilder.hh" -#include "G4LHEPPiKBuilder.hh" #include "G4PiKBuilder.hh" +#include "G4LEPPiKBuilder.hh" +#include "G4QGSCEflowPiKBuilder.hh" #include "G4ProtonBuilder.hh" -#include "G4LHEPProtonBuilder.hh" +#include "G4LEPProtonBuilder.hh" +#include "G4QGSCEflowProtonBuilder.hh" #include "G4NeutronBuilder.hh" -#include "G4LHEPNeutronBuilder.hh" +#include "G4LEPNeutronBuilder.hh" +#include "G4QGSCEflowNeutronBuilder.hh" -class HadronPhysicsLHEP_GN : public G4VPhysicsConstructor +class HadronPhysicsQGSC_EFLOW : public G4VPhysicsConstructor { public: - HadronPhysicsLHEP_GN(const G4String& name ="hadron"); - virtual ~HadronPhysicsLHEP_GN(); + HadronPhysicsQGSC_EFLOW(const G4String& name ="hadron"); + virtual ~HadronPhysicsQGSC_EFLOW(); public: virtual void ConstructParticle(); @@ -69,13 +71,16 @@ class HadronPhysicsLHEP_GN : public G4VPhysicsConstructor private: void CreateModels(); G4NeutronBuilder * theNeutrons; - G4LHEPNeutronBuilder * theLHEPNeutron; + G4LEPNeutronBuilder * theLEPNeutron; + G4QGSCEflowNeutronBuilder * theQGSCEflowNeutron; G4PiKBuilder * thePiK; - G4LHEPPiKBuilder * theLHEPPiK; + G4LEPPiKBuilder * theLEPPiK; + G4QGSCEflowPiKBuilder * theQGSCEflowPiK; G4ProtonBuilder * thePro; - G4LHEPProtonBuilder * theLHEPPro; + G4LEPProtonBuilder * theLEPPro; + G4QGSCEflowProtonBuilder * theQGSCEflowPro; G4MiscLHEPBuilder * theMiscLHEP; }; diff --git a/physics_lists/hadronic/QGSP_GN/include/HadronPhysicsQGSP_GN.hh b/source/physics_lists/lists/include/HadronPhysicsQGSC_EMV.hh similarity index 77% rename from physics_lists/hadronic/QGSP_GN/include/HadronPhysicsQGSP_GN.hh rename to source/physics_lists/lists/include/HadronPhysicsQGSC_EMV.hh index a6e052b701..7dcfd02d6f 100644 --- a/physics_lists/hadronic/QGSP_GN/include/HadronPhysicsQGSP_GN.hh +++ b/source/physics_lists/lists/include/HadronPhysicsQGSC_EMV.hh @@ -23,23 +23,21 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// -// $Id: HadronPhysicsQGSP_GN.hh,v 1.2 2006/06/29 18:04:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsQGSC_EMV.hh,v 1.1 2006/11/24 15:49:09 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // -// ClassName: HadronPhysicsQGSP_GN +// ClassName: HadronPhysicsQGSC_EMV // -// Author: 2002 J.P. Wellisch +// Author: 2006 G.Folger // -// Modified: -// 21.11.2005 G.Folger: migration to non static particles -// 08.06.2006 V.Ivanchenko: remove stopping +// Created as copy of HadronPhysicsQGSC.hh // +//---------------------------------------------------------------------------- -#ifndef HadronPhysicsQGSP_GN_h -#define HadronPhysicsQGSP_GN_h 1 +#ifndef HadronPhysicsQGSC_EMV_h +#define HadronPhysicsQGSC_EMV_h 1 #include "globals.hh" #include "G4ios.hh" @@ -49,21 +47,21 @@ #include "G4PiKBuilder.hh" #include "G4LEPPiKBuilder.hh" -#include "G4QGSPPiKBuilder.hh" +#include "G4QGSCPiKBuilder.hh" #include "G4ProtonBuilder.hh" #include "G4LEPProtonBuilder.hh" -#include "G4QGSPProtonBuilder.hh" +#include "G4QGSCProtonBuilder.hh" #include "G4NeutronBuilder.hh" #include "G4LEPNeutronBuilder.hh" -#include "G4QGSPNeutronBuilder.hh" +#include "G4QGSCNeutronBuilder.hh" -class HadronPhysicsQGSP_GN : public G4VPhysicsConstructor +class HadronPhysicsQGSC_EMV : public G4VPhysicsConstructor { public: - HadronPhysicsQGSP_GN(const G4String& name ="hadron"); - virtual ~HadronPhysicsQGSP_GN(); + HadronPhysicsQGSC_EMV(const G4String& name ="hadron"); + virtual ~HadronPhysicsQGSC_EMV(); public: virtual void ConstructParticle(); @@ -73,15 +71,15 @@ class HadronPhysicsQGSP_GN : public G4VPhysicsConstructor void CreateModels(); G4NeutronBuilder * theNeutrons; G4LEPNeutronBuilder * theLEPNeutron; - G4QGSPNeutronBuilder * theQGSPNeutron; + G4QGSCNeutronBuilder * theQGSCNeutron; G4PiKBuilder * thePiK; G4LEPPiKBuilder * theLEPPiK; - G4QGSPPiKBuilder * theQGSPPiK; + G4QGSCPiKBuilder * theQGSCPiK; G4ProtonBuilder * thePro; G4LEPProtonBuilder * theLEPPro; - G4QGSPProtonBuilder * theQGSPPro; + G4QGSCProtonBuilder * theQGSCPro; G4MiscLHEPBuilder * theMiscLHEP; }; diff --git a/physics_lists/hadronic/QGSC_LEAD/include/HadronPhysicsQGSC_LEAD.hh b/source/physics_lists/lists/include/HadronPhysicsQGSC_LEAD.hh similarity index 97% rename from physics_lists/hadronic/QGSC_LEAD/include/HadronPhysicsQGSC_LEAD.hh rename to source/physics_lists/lists/include/HadronPhysicsQGSC_LEAD.hh index b973bf9da8..3579dba9fa 100644 --- a/physics_lists/hadronic/QGSC_LEAD/include/HadronPhysicsQGSC_LEAD.hh +++ b/source/physics_lists/lists/include/HadronPhysicsQGSC_LEAD.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsQGSC_LEAD.hh,v 1.5 2006/06/29 18:03:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsQGSC_LEAD.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/QGSC_LEAD_HP/include/HadronPhysicsQGSC_LEAD_HP.hh b/source/physics_lists/lists/include/HadronPhysicsQGSC_LEAD_HP.hh similarity index 97% rename from physics_lists/hadronic/QGSC_LEAD_HP/include/HadronPhysicsQGSC_LEAD_HP.hh rename to source/physics_lists/lists/include/HadronPhysicsQGSC_LEAD_HP.hh index 4929abd01d..06ec3c17a8 100644 --- a/physics_lists/hadronic/QGSC_LEAD_HP/include/HadronPhysicsQGSC_LEAD_HP.hh +++ b/source/physics_lists/lists/include/HadronPhysicsQGSC_LEAD_HP.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsQGSC_LEAD_HP.hh,v 1.5 2006/06/29 18:03:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsQGSC_LEAD_HP.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/QGSP/include/HadronPhysicsQGSP.hh b/source/physics_lists/lists/include/HadronPhysicsQGSP.hh similarity index 96% rename from physics_lists/hadronic/QGSP/include/HadronPhysicsQGSP.hh rename to source/physics_lists/lists/include/HadronPhysicsQGSP.hh index 1769129cd5..e60a194177 100644 --- a/physics_lists/hadronic/QGSP/include/HadronPhysicsQGSP.hh +++ b/source/physics_lists/lists/include/HadronPhysicsQGSP.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsQGSP.hh,v 1.4 2006/06/29 18:03:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsQGSP.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/QGSP_BERT/include/HadronPhysicsQGSP_BERT.hh b/source/physics_lists/lists/include/HadronPhysicsQGSP_BERT.hh similarity index 97% rename from physics_lists/hadronic/QGSP_BERT/include/HadronPhysicsQGSP_BERT.hh rename to source/physics_lists/lists/include/HadronPhysicsQGSP_BERT.hh index 7a0df45164..e1ebb4da22 100644 --- a/physics_lists/hadronic/QGSP_BERT/include/HadronPhysicsQGSP_BERT.hh +++ b/source/physics_lists/lists/include/HadronPhysicsQGSP_BERT.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsQGSP_BERT.hh,v 1.4 2006/06/29 18:03:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsQGSP_BERT.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/QGSP_BERT_HP/include/HadronPhysicsQGSP_BERT_HP.hh b/source/physics_lists/lists/include/HadronPhysicsQGSP_BERT_HP.hh similarity index 95% rename from physics_lists/hadronic/QGSP_BERT_HP/include/HadronPhysicsQGSP_BERT_HP.hh rename to source/physics_lists/lists/include/HadronPhysicsQGSP_BERT_HP.hh index c532f79dd2..2671a6b483 100644 --- a/physics_lists/hadronic/QGSP_BERT_HP/include/HadronPhysicsQGSP_BERT_HP.hh +++ b/source/physics_lists/lists/include/HadronPhysicsQGSP_BERT_HP.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsQGSP_BERT_HP.hh,v 1.4 2006/06/29 18:04:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsQGSP_BERT_HP.hh,v 1.2 2006/11/24 16:35:38 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -92,7 +92,6 @@ class HadronPhysicsQGSP_BERT_HP : public G4VPhysicsConstructor G4BertiniProtonBuilder * theBertiniPro; G4MiscLHEPBuilder * theMiscLHEP; - G4StoppingHadronBuilder * theStoppingHadron; }; // 2002 by J.P. Wellisch diff --git a/physics_lists/hadronic/QGSP_BIC/include/HadronPhysicsQGSP_BIC.hh b/source/physics_lists/lists/include/HadronPhysicsQGSP_BIC.hh similarity index 97% rename from physics_lists/hadronic/QGSP_BIC/include/HadronPhysicsQGSP_BIC.hh rename to source/physics_lists/lists/include/HadronPhysicsQGSP_BIC.hh index f3b44ae302..491591bea3 100644 --- a/physics_lists/hadronic/QGSP_BIC/include/HadronPhysicsQGSP_BIC.hh +++ b/source/physics_lists/lists/include/HadronPhysicsQGSP_BIC.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsQGSP_BIC.hh,v 1.4 2006/06/29 18:04:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsQGSP_BIC.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/source/physics_lists/lists/include/HadronPhysicsQGSP_BIC_HP.hh b/source/physics_lists/lists/include/HadronPhysicsQGSP_BIC_HP.hh new file mode 100644 index 0000000000..09eeab22df --- /dev/null +++ b/source/physics_lists/lists/include/HadronPhysicsQGSP_BIC_HP.hh @@ -0,0 +1,97 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: HadronPhysicsQGSP_BIC_HP.hh,v 1.1 2006/11/24 16:31:35 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +//--------------------------------------------------------------------------- +// +// ClassName: HadronPhysicsQGSP_BIC_HP +// +// Author: 2006 G.Folger +// +// Based on HadronPhysicsQGSP_BIC +// Modified: +// 23.11.2005 G.Folger: migration to non static particles +// 08.06.2006 V.Ivanchenko: remove stopping +// +//---------------------------------------------------------------------------- +// +#ifndef HadronPhysicsQGSP_BIC_HP_h +#define HadronPhysicsQGSP_BIC_HP_h 1 + +#include "globals.hh" +#include "G4ios.hh" + +#include "G4VPhysicsConstructor.hh" +#include "G4MiscLHEPBuilder.hh" + +#include "G4PiKBuilder.hh" +#include "G4LEPPiKBuilder.hh" +#include "G4QGSPPiKBuilder.hh" + +#include "G4ProtonBuilder.hh" +#include "G4LEPProtonBuilder.hh" +#include "G4QGSPProtonBuilder.hh" +#include "G4BinaryProtonBuilder.hh" + +#include "G4NeutronBuilder.hh" +#include "G4LEPNeutronBuilder.hh" +#include "G4QGSPNeutronBuilder.hh" +#include "G4BinaryNeutronBuilder.hh" +#include "G4NeutronHPBuilder.hh" + +class HadronPhysicsQGSP_BIC_HP : public G4VPhysicsConstructor +{ + public: + HadronPhysicsQGSP_BIC_HP(const G4String& name ="hadron"); + virtual ~HadronPhysicsQGSP_BIC_HP(); + + public: + virtual void ConstructParticle(); + virtual void ConstructProcess(); + + private: + void CreateModels(); + G4NeutronBuilder * theNeutrons; + G4LEPNeutronBuilder * theLEPNeutron; + G4QGSPNeutronBuilder * theQGSPNeutron; + G4BinaryNeutronBuilder * theBinaryNeutron; + G4NeutronHPBuilder * theHPNeutron; + + G4PiKBuilder * thePiK; + G4LEPPiKBuilder * theLEPPiK; + G4QGSPPiKBuilder * theQGSPPiK; + + G4ProtonBuilder * thePro; + G4LEPProtonBuilder * theLEPPro; + G4QGSPProtonBuilder * theQGSPPro; + G4BinaryProtonBuilder * theBinaryPro; + + G4MiscLHEPBuilder * theMiscLHEP; +}; + +#endif + diff --git a/physics_lists/hadronic/QGSP_EMV/include/HadronPhysicsQGSP_EMV.hh b/source/physics_lists/lists/include/HadronPhysicsQGSP_EMV.hh similarity index 96% rename from physics_lists/hadronic/QGSP_EMV/include/HadronPhysicsQGSP_EMV.hh rename to source/physics_lists/lists/include/HadronPhysicsQGSP_EMV.hh index df7df24556..f45b0403c7 100644 --- a/physics_lists/hadronic/QGSP_EMV/include/HadronPhysicsQGSP_EMV.hh +++ b/source/physics_lists/lists/include/HadronPhysicsQGSP_EMV.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsQGSP_EMV.hh,v 1.3 2006/06/29 18:04:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsQGSP_EMV.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/QGSP_EMX/include/HadronPhysicsQGSP_EMX.hh b/source/physics_lists/lists/include/HadronPhysicsQGSP_EMX.hh similarity index 96% rename from physics_lists/hadronic/QGSP_EMX/include/HadronPhysicsQGSP_EMX.hh rename to source/physics_lists/lists/include/HadronPhysicsQGSP_EMX.hh index dc89c83691..2d613901e4 100644 --- a/physics_lists/hadronic/QGSP_EMX/include/HadronPhysicsQGSP_EMX.hh +++ b/source/physics_lists/lists/include/HadronPhysicsQGSP_EMX.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsQGSP_EMX.hh,v 1.2 2006/06/29 18:04:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsQGSP_EMX.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/QGSP_HP/include/HadronPhysicsQGSP_HP.hh b/source/physics_lists/lists/include/HadronPhysicsQGSP_HP.hh similarity index 96% rename from physics_lists/hadronic/QGSP_HP/include/HadronPhysicsQGSP_HP.hh rename to source/physics_lists/lists/include/HadronPhysicsQGSP_HP.hh index 6507c2c5de..e96d84810a 100644 --- a/physics_lists/hadronic/QGSP_HP/include/HadronPhysicsQGSP_HP.hh +++ b/source/physics_lists/lists/include/HadronPhysicsQGSP_HP.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsQGSP_HP.hh,v 1.4 2006/06/29 18:04:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsQGSP_HP.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LBE/include/LBE.hh b/source/physics_lists/lists/include/LBE.hh similarity index 91% rename from physics_lists/hadronic/LBE/include/LBE.hh rename to source/physics_lists/lists/include/LBE.hh index f9df0a3cf7..ce37169786 100644 --- a/physics_lists/hadronic/LBE/include/LBE.hh +++ b/source/physics_lists/lists/include/LBE.hh @@ -25,16 +25,20 @@ // // // -------------------------------------------------------------- -// GEANT 4 - Underground Dark Matter Detector Advanced Example // // For information related to this code contact: Alex Howard -// e-mail: a.s.howard@ic.ac.uk +// e-mail: alexander.howard@cern.ch // -------------------------------------------------------------- // Comments // // Underground Advanced -// by A. Howard and H. Araujo -// (27th November 2001) +// +// This physics list is taken from the underground_physics example with small +// modifications. It is an example of a "flat" physics list with no dependence +// on builders. The physics covered would be suitable for a low background +// experiment including the neutron_hp package +// +// // // PhysicsList header // -------------------------------------------------------------- diff --git a/physics_lists/hadronic/LBE/include/LBE.icc b/source/physics_lists/lists/include/LBE.icc similarity index 98% rename from physics_lists/hadronic/LBE/include/LBE.icc rename to source/physics_lists/lists/include/LBE.icc index 5ae68b801c..80f2ff65c1 100644 --- a/physics_lists/hadronic/LBE/include/LBE.icc +++ b/source/physics_lists/lists/include/LBE.icc @@ -25,16 +25,20 @@ // // // -------------------------------------------------------------- -// GEANT 4 - Underground Dark Matter Detector Advanced Example // // For information related to this code contact: Alex Howard -// e-mail: a.s.howard@ic.ac.uk +// e-mail: alexander.howard@cern.ch // -------------------------------------------------------------- // Comments // // Underground Advanced -// by A. Howard and H. Araujo -// (27th November 2001) +// +// This physics list is taken from the underground_physics example with small +// modifications. It is an example of a "flat" physics list with no dependence +// on builders. The physics covered would be suitable for a low background +// experiment including the neutron_hp package +// +// // // PhysicsList program // diff --git a/physics_lists/hadronic/LHEP/include/LHEP.hh b/source/physics_lists/lists/include/LHEP.hh similarity index 100% rename from physics_lists/hadronic/LHEP/include/LHEP.hh rename to source/physics_lists/lists/include/LHEP.hh diff --git a/physics_lists/hadronic/LHEP/include/LHEP.icc b/source/physics_lists/lists/include/LHEP.icc similarity index 96% rename from physics_lists/hadronic/LHEP/include/LHEP.icc rename to source/physics_lists/lists/include/LHEP.icc index bff0e7608d..8b6b1dd0f8 100644 --- a/physics_lists/hadronic/LHEP/include/LHEP.icc +++ b/source/physics_lists/lists/include/LHEP.icc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: LHEP.icc,v 1.11 2006/06/29 17:55:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: LHEP.icc,v 1.2 2006/11/24 17:10:06 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -67,7 +67,7 @@ template TLHEP::TLHEP(G4int ver): T() // default cut value (1.0mm) // defaultCutValue = 1.0*mm; G4DataQuestionaire it(photon); - G4cout << "<<< Geant4 Physics List simulation engine: LHEP 4.1"<defaultCutValue = 0.7*mm; this->SetVerboseLevel(ver); diff --git a/physics_lists/hadronic/LHEP_BERT/include/LHEP_BERT.hh b/source/physics_lists/lists/include/LHEP_BERT.hh similarity index 96% rename from physics_lists/hadronic/LHEP_BERT/include/LHEP_BERT.hh rename to source/physics_lists/lists/include/LHEP_BERT.hh index 96f2adb913..934d835fd7 100644 --- a/physics_lists/hadronic/LHEP_BERT/include/LHEP_BERT.hh +++ b/source/physics_lists/lists/include/LHEP_BERT.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: LHEP_BERT.hh,v 1.4 2006/06/29 17:56:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: LHEP_BERT.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_BERT/include/LHEP_BERT.icc b/source/physics_lists/lists/include/LHEP_BERT.icc similarity index 97% rename from physics_lists/hadronic/LHEP_BERT/include/LHEP_BERT.icc rename to source/physics_lists/lists/include/LHEP_BERT.icc index 31a94f04e0..a53f2b17fb 100644 --- a/physics_lists/hadronic/LHEP_BERT/include/LHEP_BERT.icc +++ b/source/physics_lists/lists/include/LHEP_BERT.icc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: LHEP_BERT.icc,v 1.10 2006/06/29 17:56:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: LHEP_BERT.icc,v 1.2 2006/11/24 17:10:06 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -70,7 +70,7 @@ template TLHEP_BERT::TLHEP_BERT(G4int ver): T() // defaultCutValue = 1.0*mm; G4DataQuestionaire it(photon); - G4cout << "<<< Geant4 Physics List simulation engine: LHEP_BERT 3.1"<defaultCutValue = 0.7*mm; diff --git a/physics_lists/hadronic/LHEP_BERT_HP/include/LHEP_BERT_HP.hh b/source/physics_lists/lists/include/LHEP_BERT_HP.hh similarity index 100% rename from physics_lists/hadronic/LHEP_BERT_HP/include/LHEP_BERT_HP.hh rename to source/physics_lists/lists/include/LHEP_BERT_HP.hh diff --git a/physics_lists/hadronic/LHEP_BERT_HP/include/LHEP_BERT_HP.icc b/source/physics_lists/lists/include/LHEP_BERT_HP.icc similarity index 97% rename from physics_lists/hadronic/LHEP_BERT_HP/include/LHEP_BERT_HP.icc rename to source/physics_lists/lists/include/LHEP_BERT_HP.icc index b4e3d1ba8d..09d35168f4 100644 --- a/physics_lists/hadronic/LHEP_BERT_HP/include/LHEP_BERT_HP.icc +++ b/source/physics_lists/lists/include/LHEP_BERT_HP.icc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: LHEP_BERT_HP.icc,v 1.10 2006/06/29 17:56:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: LHEP_BERT_HP.icc,v 1.2 2006/11/24 17:10:07 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -68,7 +68,7 @@ template TLHEP_BERT_HP::TLHEP_BERT_HP(G4int ver): T() { G4DataQuestionaire it(photon); - G4cout << "<<< Geant4 Physics List simulation engine: LHEP_BERT_HP 3.1"<defaultCutValue = 0.7*mm; diff --git a/physics_lists/hadronic/LHEP_BIC/include/LHEP_BIC.hh b/source/physics_lists/lists/include/LHEP_BIC.hh similarity index 96% rename from physics_lists/hadronic/LHEP_BIC/include/LHEP_BIC.hh rename to source/physics_lists/lists/include/LHEP_BIC.hh index ec16dfd121..ef9edd374b 100644 --- a/physics_lists/hadronic/LHEP_BIC/include/LHEP_BIC.hh +++ b/source/physics_lists/lists/include/LHEP_BIC.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: LHEP_BIC.hh,v 1.4 2006/06/29 17:56:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: LHEP_BIC.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_BIC/include/LHEP_BIC.icc b/source/physics_lists/lists/include/LHEP_BIC.icc similarity index 95% rename from physics_lists/hadronic/LHEP_BIC/include/LHEP_BIC.icc rename to source/physics_lists/lists/include/LHEP_BIC.icc index 57005b0ef5..b18388e9ae 100644 --- a/physics_lists/hadronic/LHEP_BIC/include/LHEP_BIC.icc +++ b/source/physics_lists/lists/include/LHEP_BIC.icc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: LHEP_BIC.icc,v 1.11 2006/06/29 17:56:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: LHEP_BIC.icc,v 1.2 2006/11/21 07:32:33 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -65,18 +65,23 @@ #include "G4DataQuestionaire.hh" #include "HadronPhysicsLHEP_BIC.hh" +#include "G4WarnPLStatus.hh" + template TLHEP_BIC::TLHEP_BIC(G4int ver): T() { // default cut value (1.0mm) // defaultCutValue = 1.0*mm; G4DataQuestionaire it(photon); - G4cout << "<<< Geant4 Physics List simulation engine: LHEP_BIC 3.1"<defaultCutValue = 0.7*mm; this->SetVerboseLevel(ver); + G4WarnPLStatus obs; + obs.Unsupported("LHEP_BIC","QGSP_BIC"); + // EM Physics this->RegisterPhysics( new G4EmStandardPhysics("standard EM",ver)); diff --git a/physics_lists/hadronic/LHEP_BIC_HP/include/LHEP_BIC_HP.hh b/source/physics_lists/lists/include/LHEP_BIC_HP.hh similarity index 96% rename from physics_lists/hadronic/LHEP_BIC_HP/include/LHEP_BIC_HP.hh rename to source/physics_lists/lists/include/LHEP_BIC_HP.hh index 7c82016469..3228582ecd 100644 --- a/physics_lists/hadronic/LHEP_BIC_HP/include/LHEP_BIC_HP.hh +++ b/source/physics_lists/lists/include/LHEP_BIC_HP.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: LHEP_BIC_HP.hh,v 1.4 2006/06/29 17:56:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: LHEP_BIC_HP.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_BIC_HP/include/LHEP_BIC_HP.icc b/source/physics_lists/lists/include/LHEP_BIC_HP.icc similarity index 95% rename from physics_lists/hadronic/LHEP_BIC_HP/include/LHEP_BIC_HP.icc rename to source/physics_lists/lists/include/LHEP_BIC_HP.icc index 8059cbcdd5..908806791e 100644 --- a/physics_lists/hadronic/LHEP_BIC_HP/include/LHEP_BIC_HP.icc +++ b/source/physics_lists/lists/include/LHEP_BIC_HP.icc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: LHEP_BIC_HP.icc,v 1.11 2006/06/29 17:56:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: LHEP_BIC_HP.icc,v 1.2 2006/11/21 07:32:33 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -65,18 +65,23 @@ #include "G4DataQuestionaire.hh" #include "HadronPhysicsLHEP_BIC_HP.hh" +#include "G4WarnPLStatus.hh" + template TLHEP_BIC_HP::TLHEP_BIC_HP(G4int ver): T() { // default cut value (1.0mm) // defaultCutValue = 1.0*mm; G4DataQuestionaire it(photon); - G4cout << "<<< Geant4 Physics List simulation engine: LHEP_BIC_HP 3.1"<defaultCutValue = 0.7*mm; this->SetVerboseLevel(ver); + G4WarnPLStatus obs; + obs.Unsupported("LHEP_BIC_HP"); + // EM Physics this->RegisterPhysics( new G4EmStandardPhysics("standard EM",ver)); diff --git a/physics_lists/hadronic/LHEP_EMV/include/LHEP_EMV.hh b/source/physics_lists/lists/include/LHEP_EMV.hh similarity index 96% rename from physics_lists/hadronic/LHEP_EMV/include/LHEP_EMV.hh rename to source/physics_lists/lists/include/LHEP_EMV.hh index 0a118d2084..43db55066a 100644 --- a/physics_lists/hadronic/LHEP_EMV/include/LHEP_EMV.hh +++ b/source/physics_lists/lists/include/LHEP_EMV.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: LHEP_EMV.hh,v 1.2 2006/06/29 17:56:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: LHEP_EMV.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_EMV/include/LHEP_EMV.icc b/source/physics_lists/lists/include/LHEP_EMV.icc similarity index 97% rename from physics_lists/hadronic/LHEP_EMV/include/LHEP_EMV.icc rename to source/physics_lists/lists/include/LHEP_EMV.icc index 9ed2151a9e..f09c70f22b 100644 --- a/physics_lists/hadronic/LHEP_EMV/include/LHEP_EMV.icc +++ b/source/physics_lists/lists/include/LHEP_EMV.icc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: LHEP_EMV.icc,v 1.6 2006/06/29 17:56:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: LHEP_EMV.icc,v 1.2 2006/11/24 17:10:07 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -68,7 +68,7 @@ template TLHEP_EMV::TLHEP_EMV(G4int ver): T() // default cut value (1.0mm) // defaultCutValue = 1.0*mm; G4DataQuestionaire it(photon); - G4cout << "<<< Geant4 Physics List simulation engine: LHEP_EMV 3.1"<defaultCutValue = 0.7*mm; this->SetVerboseLevel(ver); diff --git a/physics_lists/hadronic/LHEP_HP/include/LHEP_HP.hh b/source/physics_lists/lists/include/LHEP_HP.hh similarity index 96% rename from physics_lists/hadronic/LHEP_HP/include/LHEP_HP.hh rename to source/physics_lists/lists/include/LHEP_HP.hh index 9f0becfd1d..b02440a527 100644 --- a/physics_lists/hadronic/LHEP_HP/include/LHEP_HP.hh +++ b/source/physics_lists/lists/include/LHEP_HP.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: LHEP_HP.hh,v 1.4 2006/06/29 17:56:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: LHEP_HP.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_HP/include/LHEP_HP.icc b/source/physics_lists/lists/include/LHEP_HP.icc similarity index 94% rename from physics_lists/hadronic/LHEP_HP/include/LHEP_HP.icc rename to source/physics_lists/lists/include/LHEP_HP.icc index 5ae5837080..f274779e2a 100644 --- a/physics_lists/hadronic/LHEP_HP/include/LHEP_HP.icc +++ b/source/physics_lists/lists/include/LHEP_HP.icc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: LHEP_HP.icc,v 1.10 2006/06/29 17:57:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: LHEP_HP.icc,v 1.2 2006/11/21 07:32:33 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -64,16 +64,21 @@ #include "G4DataQuestionaire.hh" #include "HadronPhysicsLHEP_HP.hh" +#include "G4WarnPLStatus.hh" + template TLHEP_HP::TLHEP_HP(G4int ver): T() { // default cut value (1.0mm) // defaultCutValue = 1.0*mm; G4DataQuestionaire it(photon, neutron); - G4cout << "<<< Geant4 Physics List simulation engine: LHEP_HP 3.1"<defaultCutValue = 0.7*mm; this->SetVerboseLevel(ver); + G4WarnPLStatus obs; + obs.Unsupported("LHEP_HP","QGSP_BERT_HP"); + // EM Physics this->RegisterPhysics( new G4EmStandardPhysics("standard EM",ver)); @@ -84,7 +89,7 @@ template TLHEP_HP::TLHEP_HP(G4int ver): T() this->RegisterPhysics( new G4DecayPhysics("decay",ver) ); // Hadron Elastic scattering - this-> RegisterPhysics( new G4HadronElasticPhysics("LElastic",ver,false)); + this-> RegisterPhysics( new G4HadronElasticPhysics("LElastic",ver,true)); // Hadron Physics this->RegisterPhysics( new HadronPhysicsLHEP_HP("hadron")); diff --git a/physics_lists/hadronic/LHEP_LEAD/include/LHEP_LEAD.hh b/source/physics_lists/lists/include/LHEP_LEAD.hh similarity index 96% rename from physics_lists/hadronic/LHEP_LEAD/include/LHEP_LEAD.hh rename to source/physics_lists/lists/include/LHEP_LEAD.hh index acfe6e6953..b2b21d3743 100644 --- a/physics_lists/hadronic/LHEP_LEAD/include/LHEP_LEAD.hh +++ b/source/physics_lists/lists/include/LHEP_LEAD.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: LHEP_LEAD.hh,v 1.4 2006/06/29 17:57:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: LHEP_LEAD.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_LEAD/include/LHEP_LEAD.icc b/source/physics_lists/lists/include/LHEP_LEAD.icc similarity index 97% rename from physics_lists/hadronic/LHEP_LEAD/include/LHEP_LEAD.icc rename to source/physics_lists/lists/include/LHEP_LEAD.icc index f110ef764e..1e41c6c657 100644 --- a/physics_lists/hadronic/LHEP_LEAD/include/LHEP_LEAD.icc +++ b/source/physics_lists/lists/include/LHEP_LEAD.icc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: LHEP_LEAD.icc,v 1.11 2006/06/29 17:57:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: LHEP_LEAD.icc,v 1.2 2006/11/24 17:10:22 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -68,7 +68,7 @@ template TLHEP_LEAD::TLHEP_LEAD(G4int ver): T() // default cut value (1.0mm) // defaultCutValue = 1.0*mm; G4DataQuestionaire it(photon); - G4cout << "<<< Geant4 Physics List simulation engine: LHEP_LEAD 3.1"<defaultCutValue = 0.7*mm; this->SetVerboseLevel(ver); diff --git a/physics_lists/hadronic/LHEP_LEAD_HP/include/LHEP_LEAD_HP.hh b/source/physics_lists/lists/include/LHEP_LEAD_HP.hh similarity index 96% rename from physics_lists/hadronic/LHEP_LEAD_HP/include/LHEP_LEAD_HP.hh rename to source/physics_lists/lists/include/LHEP_LEAD_HP.hh index b340f81ad2..aa9f0e6b3b 100644 --- a/physics_lists/hadronic/LHEP_LEAD_HP/include/LHEP_LEAD_HP.hh +++ b/source/physics_lists/lists/include/LHEP_LEAD_HP.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: LHEP_LEAD_HP.hh,v 1.4 2006/06/29 17:57:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: LHEP_LEAD_HP.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_LEAD_HP/include/LHEP_LEAD_HP.icc b/source/physics_lists/lists/include/LHEP_LEAD_HP.icc similarity index 97% rename from physics_lists/hadronic/LHEP_LEAD_HP/include/LHEP_LEAD_HP.icc rename to source/physics_lists/lists/include/LHEP_LEAD_HP.icc index 39f1ee2843..6d80fe4bc1 100644 --- a/physics_lists/hadronic/LHEP_LEAD_HP/include/LHEP_LEAD_HP.icc +++ b/source/physics_lists/lists/include/LHEP_LEAD_HP.icc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: LHEP_LEAD_HP.icc,v 1.10 2006/06/29 17:57:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: LHEP_LEAD_HP.icc,v 1.2 2006/11/24 17:10:22 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -69,7 +69,7 @@ template TLHEP_LEAD_HP::TLHEP_LEAD_HP(G4int ver): T() // default cut value (1.0mm) // defaultCutValue = 1.0*mm; G4DataQuestionaire it(photon, neutron); - G4cout << "<<< Geant4 Physics List simulation engine: LHEP_LEAD_HP 3.1"<defaultCutValue = 0.7*mm; this->SetVerboseLevel(ver); diff --git a/physics_lists/hadronic/LHEP_PRECO/include/LHEP_PRECO.hh b/source/physics_lists/lists/include/LHEP_PRECO.hh similarity index 96% rename from physics_lists/hadronic/LHEP_PRECO/include/LHEP_PRECO.hh rename to source/physics_lists/lists/include/LHEP_PRECO.hh index 9361e76305..ebd062f38c 100644 --- a/physics_lists/hadronic/LHEP_PRECO/include/LHEP_PRECO.hh +++ b/source/physics_lists/lists/include/LHEP_PRECO.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: LHEP_PRECO.hh,v 1.4 2006/06/29 17:57:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: LHEP_PRECO.hh,v 1.1 2006/10/31 11:35:08 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_PRECO/include/LHEP_PRECO.icc b/source/physics_lists/lists/include/LHEP_PRECO.icc similarity index 95% rename from physics_lists/hadronic/LHEP_PRECO/include/LHEP_PRECO.icc rename to source/physics_lists/lists/include/LHEP_PRECO.icc index f2716feb17..35a47a97b4 100644 --- a/physics_lists/hadronic/LHEP_PRECO/include/LHEP_PRECO.icc +++ b/source/physics_lists/lists/include/LHEP_PRECO.icc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: LHEP_PRECO.icc,v 1.11 2006/06/29 17:57:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: LHEP_PRECO.icc,v 1.2 2006/11/21 07:32:33 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -64,16 +64,21 @@ #include "G4DataQuestionaire.hh" #include "HadronPhysicsLHEP_PRECO.hh" +#include "G4WarnPLStatus.hh" + template TLHEP_PRECO::TLHEP_PRECO(G4int ver): T() { // default cut value (1.0mm) // defaultCutValue = 1.0*mm; G4DataQuestionaire it(photon); - G4cout << "<<< Geant4 Physics List simulation engine: LHEP_PRECO 3.1"<defaultCutValue = 0.7*mm; this->SetVerboseLevel(ver); + G4WarnPLStatus obs; + obs.Unsupported("LHEP_PRECO","QGSP_BIC"); + // EM Physics this->RegisterPhysics( new G4EmStandardPhysics("standard EM",ver)); diff --git a/physics_lists/hadronic/LHEP_PRECO_HP/include/LHEP_PRECO_HP.hh b/source/physics_lists/lists/include/LHEP_PRECO_HP.hh similarity index 96% rename from physics_lists/hadronic/LHEP_PRECO_HP/include/LHEP_PRECO_HP.hh rename to source/physics_lists/lists/include/LHEP_PRECO_HP.hh index 07b5f271b2..a64e31eb01 100644 --- a/physics_lists/hadronic/LHEP_PRECO_HP/include/LHEP_PRECO_HP.hh +++ b/source/physics_lists/lists/include/LHEP_PRECO_HP.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: LHEP_PRECO_HP.hh,v 1.4 2006/06/29 17:57:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: LHEP_PRECO_HP.hh,v 1.1 2006/10/31 11:35:08 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_PRECO_HP/include/LHEP_PRECO_HP.icc b/source/physics_lists/lists/include/LHEP_PRECO_HP.icc similarity index 96% rename from physics_lists/hadronic/LHEP_PRECO_HP/include/LHEP_PRECO_HP.icc rename to source/physics_lists/lists/include/LHEP_PRECO_HP.icc index 82cb416421..801d58c45a 100644 --- a/physics_lists/hadronic/LHEP_PRECO_HP/include/LHEP_PRECO_HP.icc +++ b/source/physics_lists/lists/include/LHEP_PRECO_HP.icc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: LHEP_PRECO_HP.icc,v 1.10 2006/06/29 17:57:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: LHEP_PRECO_HP.icc,v 1.2 2006/11/24 17:10:22 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -68,7 +68,7 @@ template TLHEP_PRECO_HP::TLHEP_PRECO_HP(G4int ver): T() // default cut value (1.0mm) // defaultCutValue = 1.0*mm; G4DataQuestionaire it(photon, neutron); - G4cout << "<<< Geant4 Physics List simulation engine: LHEP_PRECO_HP 3.1"<defaultCutValue = 0.7*mm; this->SetVerboseLevel(ver); @@ -83,7 +83,7 @@ template TLHEP_PRECO_HP::TLHEP_PRECO_HP(G4int ver): T() this->RegisterPhysics( new G4DecayPhysics("decay",ver) ); // Hadron Elastic scattering - this-> RegisterPhysics( new G4HadronElasticPhysics("LElastic",ver,false)); + this-> RegisterPhysics( new G4HadronElasticPhysics("LElastic",ver,true)); // Hadron Physics this->RegisterPhysics( new HadronPhysicsLHEP_PRECO_HP("hadron")); diff --git a/physics_lists/hadronic/LBE/include/MaxTimeCuts.hh b/source/physics_lists/lists/include/MaxTimeCuts.hh similarity index 100% rename from physics_lists/hadronic/LBE/include/MaxTimeCuts.hh rename to source/physics_lists/lists/include/MaxTimeCuts.hh diff --git a/physics_lists/hadronic/LBE/include/MinEkineCuts.hh b/source/physics_lists/lists/include/MinEkineCuts.hh similarity index 96% rename from physics_lists/hadronic/LBE/include/MinEkineCuts.hh rename to source/physics_lists/lists/include/MinEkineCuts.hh index 7348b22c5b..4895f7c639 100644 --- a/physics_lists/hadronic/LBE/include/MinEkineCuts.hh +++ b/source/physics_lists/lists/include/MinEkineCuts.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: MinEkineCuts.hh,v 1.2 2006/06/29 17:55:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: MinEkineCuts.hh,v 1.1 2006/10/31 11:35:08 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/physics_lists/hadronic/QBBC/include/QBBC.hh b/source/physics_lists/lists/include/QBBC.hh similarity index 93% rename from physics_lists/hadronic/QBBC/include/QBBC.hh rename to source/physics_lists/lists/include/QBBC.hh index e42c768441..03806e1410 100644 --- a/physics_lists/hadronic/QBBC/include/QBBC.hh +++ b/source/physics_lists/lists/include/QBBC.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: QBBC.hh,v 1.4 2006/06/29 18:03:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: QBBC.hh,v 1.1 2006/10/31 11:35:08 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -48,7 +48,7 @@ class TQBBC: public T { public: - TQBBC(G4int ver = 1, const G4String& type = "QBBC"); + TQBBC(G4int ver = 1, const G4String& type = "QBBC", G4bool glauber = false); virtual ~TQBBC(); diff --git a/physics_lists/hadronic/QBBC/include/QBBC.icc b/source/physics_lists/lists/include/QBBC.icc similarity index 80% rename from physics_lists/hadronic/QBBC/include/QBBC.icc rename to source/physics_lists/lists/include/QBBC.icc index 47e672bc9b..ee515c279f 100644 --- a/physics_lists/hadronic/QBBC/include/QBBC.icc +++ b/source/physics_lists/lists/include/QBBC.icc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: QBBC.icc,v 1.15 2006/06/29 18:03:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: QBBC.icc,v 1.4 2006/11/24 17:26:21 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -33,6 +33,7 @@ // Author: 11 April 2006 V. Ivanchenko // // Modified: +// 24.11.06 Add G4HadronHElasticPhysics and G4NeutronTrackingCut // //---------------------------------------------------------------------------- // @@ -50,13 +51,15 @@ #include "G4HadronInelasticQBBC.hh" #include "G4HadronInelasticQLHEP.hh" #include "G4HadronElasticPhysics.hh" +#include "G4HadronHElasticPhysics.hh" #include "G4IonBinaryCascadePhysics.hh" #include "G4IonPhysics.hh" +#include "G4NeutronTrackingCut.hh" -template TQBBC::TQBBC( G4int ver, const G4String& type): T() +template TQBBC::TQBBC( G4int ver, const G4String& type, G4bool gl): T() { G4DataQuestionaire it(photon, neutron); - G4cout << "<<< Geant4 Physics List simulation engine: QBBC 3.0 with type <" + G4cout << "<<< Geant4 Physics List simulation engine: QBBC 3.1 with type <" << type <<">" <defaultCutValue = 0.7*mm; @@ -73,40 +76,54 @@ template TQBBC::TQBBC( G4int ver, const G4String& type): T() // Hadron Physics if(type == "QBBC") { - this->RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false)); - this->RegisterPhysics( new G4HadronInelasticQBBC("inelastic", ver, false, - false, false, false)); + this->RegisterPhysics( new G4HadronHElasticPhysics("HElastic",ver,false)); this->RegisterPhysics( new G4QStoppingPhysics("stopping",ver)); this->RegisterPhysics( new G4IonBinaryCascadePhysics("ionBIC")); + this->RegisterPhysics( new G4HadronInelasticQBBC("inelastic", ver, false, + false, false, false, gl)); + } else if(type == "QBEC") { - this->RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false)); - this->RegisterPhysics( new G4HadronInelasticQBBC("inelastic", ver, false, - true, false, false)); + this->RegisterPhysics( new G4HadronHElasticPhysics("HElastic",ver,false)); this->RegisterPhysics( new G4QStoppingPhysics("stopping",ver)); this->RegisterPhysics( new G4IonBinaryCascadePhysics("ionBIC")); + this->RegisterPhysics( new G4HadronInelasticQBBC("inelastic", ver, false, + true, false, false, gl)); + + } else if(type == "QBBC_HP") { + this->RegisterPhysics( new G4HadronHElasticPhysics("HElastic",ver,true)); + this->RegisterPhysics( new G4QStoppingPhysics("stopping",ver)); + this->RegisterPhysics( new G4IonBinaryCascadePhysics("ionBIC")); + this->RegisterPhysics( new G4HadronInelasticQBBC("inelastic", ver, false, + false, false, true, gl)); + } else if(type == "QBEC_HP") { - this->RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,true)); - this->RegisterPhysics( new G4HadronInelasticQBBC("inelastic", ver, false, - true, false, true)); + this->RegisterPhysics( new G4HadronHElasticPhysics("HElastic",ver,true)); this->RegisterPhysics( new G4QStoppingPhysics("stopping",ver)); this->RegisterPhysics( new G4IonBinaryCascadePhysics("ionBIC")); + this->RegisterPhysics( new G4HadronInelasticQBBC("inelastic", ver, false, + true, false, true, gl)); + } else if(type == "QGSP") { this->RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false)); + this->RegisterPhysics( new G4QStoppingPhysics("stopping",ver)); + this->RegisterPhysics( new G4IonPhysics("ion")); this->RegisterPhysics( new G4HadronInelasticQLHEP("inelastic", ver, true, false, false, false)); - this->RegisterPhysics( new G4QStoppingPhysics("stopping",ver)); - this->RegisterPhysics( new G4IonPhysics("ion")); + } else if(type == "QGSP_BERT") { this->RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false)); - this->RegisterPhysics( new G4HadronInelasticQLHEP("inelastic", ver, - true, true, false, false)); this->RegisterPhysics( new G4QStoppingPhysics("stopping",ver)); this->RegisterPhysics( new G4IonPhysics("ion")); - } else { + this->RegisterPhysics( new G4HadronInelasticQLHEP("inelastic", ver, + true, true, false, false)); + + } else { G4cout << "QBBC ERROR: Unknown Hadronic Physics Type <" << type << ">" << G4endl; G4Exception("*** No Hadronic Physics can be configured"); } + // Neutron tracking cut + this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver)); } template TQBBC::~TQBBC() diff --git a/physics_lists/hadronic/QGSC/include/QGSC.hh b/source/physics_lists/lists/include/QGSC.hh similarity index 100% rename from physics_lists/hadronic/QGSC/include/QGSC.hh rename to source/physics_lists/lists/include/QGSC.hh diff --git a/physics_lists/hadronic/QGSC/include/QGSC.icc b/source/physics_lists/lists/include/QGSC.icc similarity index 88% rename from physics_lists/hadronic/QGSC/include/QGSC.icc rename to source/physics_lists/lists/include/QGSC.icc index 32d391669d..809bbb6d97 100644 --- a/physics_lists/hadronic/QGSC/include/QGSC.icc +++ b/source/physics_lists/lists/include/QGSC.icc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: QGSC.icc,v 1.12 2006/06/29 18:03:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: QGSC.icc,v 1.5 2006/11/24 17:10:23 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -38,6 +38,7 @@ // 02.12.2005 V.Ivanchenko: rename components // 08.06.2006 V.Ivanchenko: migration to CHIPS stopping // 13.06.2006 G.Folger: Migrate to HadronElasticPhysics with improved elastic +// 20.11.2006 G.Folger: add Tracking Cut for neutrons // //---------------------------------------------------------------------------- // @@ -59,7 +60,8 @@ #include "G4EmExtraPhysics.hh" #include "G4IonPhysics.hh" #include "G4QStoppingPhysics.hh" -#include "G4HadronElasticPhysics.hh" +#include "G4HadronQElasticPhysics.hh" +#include "G4NeutronTrackingCut.hh" #include "G4DataQuestionaire.hh" #include "HadronPhysicsQGSC.hh" @@ -69,7 +71,7 @@ template TQGSC::TQGSC(G4int ver): T() // default cut value (1.0mm) // defaultCutValue = 1.0*mm; G4DataQuestionaire it(photon); - G4cout << "<<< Geant4 Physics List simulation engine: QGSC 4.1"<defaultCutValue = 0.7*mm; this->SetVerboseLevel(ver); @@ -83,8 +85,8 @@ template TQGSC::TQGSC(G4int ver): T() // Decays this->RegisterPhysics( new G4DecayPhysics("decay",ver) ); - // Hadron Elastic scattering - this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false)); + // Hadron Elastic scattering, "CHIPS" version + this-> RegisterPhysics( new G4HadronQElasticPhysics("elastic",ver)); // Hadron Physics this->RegisterPhysics( new HadronPhysicsQGSC("hadron")); @@ -94,6 +96,9 @@ template TQGSC::TQGSC(G4int ver): T() // Ion Physics this->RegisterPhysics( new G4IonPhysics("ion")); + + // Neutron tracking cut + this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver)); } diff --git a/examples/extended/parallel/ParN04/include/ExN04PhysicsList.hh b/source/physics_lists/lists/include/QGSC_EFLOW.hh similarity index 82% rename from examples/extended/parallel/ParN04/include/ExN04PhysicsList.hh rename to source/physics_lists/lists/include/QGSC_EFLOW.hh index 1e86903982..346bcf265e 100644 --- a/examples/extended/parallel/ParN04/include/ExN04PhysicsList.hh +++ b/source/physics_lists/lists/include/QGSC_EFLOW.hh @@ -23,25 +23,31 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -#ifndef ExN04PhysicsList_h -#define ExN04PhysicsList_h 1 +#ifndef TQGSC_EFLOW_h +#define TQGSC_EFLOW_h 1 #include "G4VModularPhysicsList.hh" #include "globals.hh" +#include "CompileTimeConstraints.hh" -class ExN04PhysicsList: public G4VModularPhysicsList +template +class TQGSC_EFLOW: public T { public: - ExN04PhysicsList(); - virtual ~ExN04PhysicsList(); + TQGSC_EFLOW(G4int ver = 1); + virtual ~TQGSC_EFLOW(); public: // SetCuts() virtual void SetCuts(); - +private: + enum {ok = CompileTimeConstraints::IsA::ok }; }; +#include "QGSC_EFLOW.icc" +typedef TQGSC_EFLOW QGSC_EFLOW; +// 2002 by J.P. Wellisch #endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04PhysicsList.cc b/source/physics_lists/lists/include/QGSC_EFLOW.icc similarity index 52% rename from examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04PhysicsList.cc rename to source/physics_lists/lists/include/QGSC_EFLOW.icc index 108022a879..54584f0364 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04PhysicsList.cc +++ b/source/physics_lists/lists/include/QGSC_EFLOW.icc @@ -23,16 +23,23 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// $Id: QGSC_EFLOW.icc,v 1.1 2006/12/05 17:03:32 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // -// $Id: ExN04PhysicsList.cc,v 1.4 2006/06/29 17:08:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +//--------------------------------------------------------------------------- +// +// ClassName: QGSC_EFLOW +// +// Author: 2006 Gunter Folger +// +// Created as copy of QGSC +// Modified: +// +//---------------------------------------------------------------------------- // -// - -#include "ExN04PhysicsList.hh" - #include "globals.hh" #include "G4ParticleDefinition.hh" +#include "G4ParticleWithCuts.hh" #include "G4ProcessManager.hh" #include "G4ProcessVector.hh" #include "G4ParticleTypes.hh" @@ -43,46 +50,72 @@ #include "G4ios.hh" #include -#include "ExN04GeneralPhysics.hh" -#include "ExN04EMPhysics.hh" -#include "ExN04MuonPhysics.hh" -#include "ExN04HadronPhysics.hh" -#include "ExN04IonPhysics.hh" +#include "G4DecayPhysics.hh" +#include "G4EmStandardPhysics.hh" +#include "G4EmExtraPhysics.hh" +#include "G4IonPhysics.hh" +#include "G4QStoppingPhysics.hh" +#include "G4HadronQElasticPhysics.hh" +#include "G4NeutronTrackingCut.hh" -ExN04PhysicsList::ExN04PhysicsList(): G4VModularPhysicsList() +#include "G4DataQuestionaire.hh" +#include "HadronPhysicsQGSC_EFLOW.hh" + +template TQGSC_EFLOW::TQGSC_EFLOW(G4int ver): T() { // default cut value (1.0mm) - defaultCutValue = 1.0*mm; - // SetVerboseLevel(1); - - // General Physics - RegisterPhysics( new ExN04GeneralPhysics("general") ); + // defaultCutValue = 1.0*mm; + G4DataQuestionaire it(photon); + G4cout << "<<< Geant4 Physics List simulation engine: QGSC_EFLOW 1.0"<defaultCutValue = 0.7*mm; + this->SetVerboseLevel(ver); // EM Physics - RegisterPhysics( new ExN04EMPhysics("standard EM")); + this->RegisterPhysics( new G4EmStandardPhysics("standard EM",ver)); - // Muon Physics - RegisterPhysics( new ExN04MuonPhysics("muon")); + // Synchroton Radiation & GN Physics + this->RegisterPhysics( new G4EmExtraPhysics("extra EM")); + + // Decays + this->RegisterPhysics( new G4DecayPhysics("decay",ver) ); + + // Hadron Elastic scattering, "CHIPS" version + this-> RegisterPhysics( new G4HadronQElasticPhysics("elastic",ver)); // Hadron Physics - RegisterPhysics( new ExN04HadronPhysics("hadron")); + this->RegisterPhysics( new HadronPhysicsQGSC_EFLOW("hadron")); + + // Stopping Physics + this->RegisterPhysics( new G4QStoppingPhysics("stopping")); // Ion Physics - RegisterPhysics( new ExN04IonPhysics("ion")); - + this->RegisterPhysics( new G4IonPhysics("ion")); + + // Neutron tracking cut + this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver)); } -ExN04PhysicsList::~ExN04PhysicsList() +template TQGSC_EFLOW::~TQGSC_EFLOW() { } -void ExN04PhysicsList::SetCuts() +template void TQGSC_EFLOW::SetCuts() { + if (this->verboseLevel >1){ + G4cout << "QGSC_EFLOW::SetCuts:"; + } // " G4VUserPhysicsList::SetCutsWithDefault" method sets // the default cut value for all particle types - SetCutsWithDefault(); + + this->SetCutsWithDefault(); + +// if (this->verboseLevel >0) +// G4VUserPhysicsList::DumpCutValuesTable(); + } +// 2002 by J.P. Wellisch diff --git a/physics_lists/hadronic/QGSP_GN/include/QGSP_GN.hh b/source/physics_lists/lists/include/QGSC_EMV.hh similarity index 90% rename from physics_lists/hadronic/QGSP_GN/include/QGSP_GN.hh rename to source/physics_lists/lists/include/QGSC_EMV.hh index 4489fdf54e..8136785f86 100644 --- a/physics_lists/hadronic/QGSP_GN/include/QGSP_GN.hh +++ b/source/physics_lists/lists/include/QGSC_EMV.hh @@ -23,19 +23,19 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -#ifndef TQGSP_GN_h -#define TQGSP_GN_h 1 +#ifndef TQGSC_EMV_h +#define TQGSC_EMV_h 1 #include "G4VModularPhysicsList.hh" #include "globals.hh" #include "CompileTimeConstraints.hh" template -class TQGSP_GN: public T +class TQGSC_EMV: public T { public: - TQGSP_GN(G4int ver = 1); - virtual ~TQGSP_GN(); + TQGSC_EMV(G4int ver = 1); + virtual ~TQGSC_EMV(); public: // SetCuts() @@ -44,8 +44,8 @@ public: private: enum {ok = CompileTimeConstraints::IsA::ok }; }; -#include "QGSP_GN.icc" -typedef TQGSP_GN QGSP_GN; +#include "QGSC_EMV.icc" +typedef TQGSC_EMV QGSC_EMV; // 2002 by J.P. Wellisch diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02PhysicsList.cc b/source/physics_lists/lists/include/QGSC_EMV.icc similarity index 53% rename from examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02PhysicsList.cc rename to source/physics_lists/lists/include/QGSC_EMV.icc index ff35e0c1cb..30eac042a1 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/src/H02PhysicsList.cc +++ b/source/physics_lists/lists/include/QGSC_EMV.icc @@ -23,14 +23,19 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// $Id: QGSC_EMV.icc,v 1.1 2006/11/24 15:49:09 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // -// $Id: H02PhysicsList.cc,v 1.3 2006/06/29 17:14:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +//--------------------------------------------------------------------------- +// +// ClassName: QGSC_EMV +// +// Author: 2006 G.Folger +// +// Created as copy of QGSC +// +//---------------------------------------------------------------------------- // -// - -#include "H02PhysicsList.hh" - #include "globals.hh" #include "G4ParticleDefinition.hh" #include "G4ParticleWithCuts.hh" @@ -44,46 +49,72 @@ #include "G4ios.hh" #include -#include "H02GeneralPhysics.hh" -#include "H02EMPhysics.hh" -#include "H02MuonPhysics.hh" -#include "H02HadronPhysics.hh" -#include "H02IonPhysics.hh" +#include "G4DecayPhysics.hh" +#include "G4EmStandardPhysics71.hh" +#include "G4EmExtraPhysics.hh" +#include "G4IonPhysics.hh" +#include "G4QStoppingPhysics.hh" +#include "G4HadronQElasticPhysics.hh" +#include "G4NeutronTrackingCut.hh" -H02PhysicsList::H02PhysicsList(): G4VModularPhysicsList() +#include "G4DataQuestionaire.hh" +#include "HadronPhysicsQGSC_EMV.hh" + +template TQGSC_EMV::TQGSC_EMV(G4int ver): T() { // default cut value (1.0mm) - defaultCutValue = 1.0*mm; - SetVerboseLevel(1); - - // General Physics - RegisterPhysics( new H02GeneralPhysics("general") ); + // defaultCutValue = 1.0*mm; + G4DataQuestionaire it(photon); + G4cout << "<<< Geant4 Physics List simulation engine: QGSC_EMV 1.0"<defaultCutValue = 0.7*mm; + this->SetVerboseLevel(ver); // EM Physics - RegisterPhysics( new H02EMPhysics("standard EM")); + this->RegisterPhysics( new G4EmStandardPhysics71("standard EM",ver)); - // Muon Physics - RegisterPhysics( new H02MuonPhysics("muon")); + // Synchroton Radiation & GN Physics + this->RegisterPhysics( new G4EmExtraPhysics("extra EM")); + + // Decays + this->RegisterPhysics( new G4DecayPhysics("decay",ver) ); + + // Hadron Elastic scattering, "CHIPS" version + this-> RegisterPhysics( new G4HadronQElasticPhysics("elastic",ver)); // Hadron Physics - RegisterPhysics( new H02HadronPhysics("hadron")); + this->RegisterPhysics( new HadronPhysicsQGSC_EMV("hadron")); + + // Stopping Physics + this->RegisterPhysics( new G4QStoppingPhysics("stopping")); // Ion Physics - RegisterPhysics( new H02IonPhysics("ion")); - + this->RegisterPhysics( new G4IonPhysics("ion")); + + // Neutron tracking cut + this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver)); } -H02PhysicsList::~H02PhysicsList() +template TQGSC_EMV::~TQGSC_EMV() { } -void H02PhysicsList::SetCuts() +template void TQGSC_EMV::SetCuts() { + if (this->verboseLevel >1){ + G4cout << "QGSC_EMV::SetCuts:"; + } // " G4VUserPhysicsList::SetCutsWithDefault" method sets // the default cut value for all particle types - SetCutsWithDefault(); + + this->SetCutsWithDefault(); + +// if (this->verboseLevel >0) +// G4VUserPhysicsList::DumpCutValuesTable(); + } +// 2002 by J.P. Wellisch diff --git a/physics_lists/hadronic/QGSC_LEAD/include/QGSC_LEAD.hh b/source/physics_lists/lists/include/QGSC_LEAD.hh similarity index 96% rename from physics_lists/hadronic/QGSC_LEAD/include/QGSC_LEAD.hh rename to source/physics_lists/lists/include/QGSC_LEAD.hh index 118d72289f..9a7196781e 100644 --- a/physics_lists/hadronic/QGSC_LEAD/include/QGSC_LEAD.hh +++ b/source/physics_lists/lists/include/QGSC_LEAD.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: QGSC_LEAD.hh,v 1.4 2006/06/29 18:03:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: QGSC_LEAD.hh,v 1.1 2006/10/31 11:35:09 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/QGSC_LEAD/include/QGSC_LEAD.icc b/source/physics_lists/lists/include/QGSC_LEAD.icc similarity index 92% rename from physics_lists/hadronic/QGSC_LEAD/include/QGSC_LEAD.icc rename to source/physics_lists/lists/include/QGSC_LEAD.icc index 9d693dcd4b..18cc9bd25a 100644 --- a/physics_lists/hadronic/QGSC_LEAD/include/QGSC_LEAD.icc +++ b/source/physics_lists/lists/include/QGSC_LEAD.icc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: QGSC_LEAD.icc,v 1.10 2006/06/29 18:03:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: QGSC_LEAD.icc,v 1.3 2006/11/24 17:10:23 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -36,6 +36,7 @@ // 30.11.2005 G.Folger: Register EmStandard first, split Em Standard and Extra // 08.06.2006 V.Ivanchenko: migration to CHIPS stopping // 15.06.2006 G.Folger: Migrate to HadronElasticPhysics using improved elastic +// 20.11.2006 G.Folger: add Tracking Cut for neutrons // //---------------------------------------------------------------------------- // @@ -59,6 +60,7 @@ #include "G4IonPhysics.hh" #include "G4QStoppingPhysics.hh" #include "G4HadronElasticPhysics.hh" +#include "G4NeutronTrackingCut.hh" #include "G4DataQuestionaire.hh" #include "HadronPhysicsQGSC_LEAD.hh" @@ -68,7 +70,7 @@ template TQGSC_LEAD::TQGSC_LEAD(G4int ver): T() // default cut value (1.0mm) // defaultCutValue = 1.0*mm; G4DataQuestionaire it(photon); - G4cout << "<<< Geant4 Physics List simulation engine: QGSC_LEAD 3.1"<defaultCutValue = 0.7*mm; this->SetVerboseLevel(ver); @@ -93,6 +95,9 @@ template TQGSC_LEAD::TQGSC_LEAD(G4int ver): T() // Ion Physics this->RegisterPhysics( new G4IonPhysics("ion")); + + // Neutron tracking cut + this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver)); } diff --git a/physics_lists/hadronic/QGSC_LEAD_HP/include/QGSC_LEAD_HP.hh b/source/physics_lists/lists/include/QGSC_LEAD_HP.hh similarity index 96% rename from physics_lists/hadronic/QGSC_LEAD_HP/include/QGSC_LEAD_HP.hh rename to source/physics_lists/lists/include/QGSC_LEAD_HP.hh index 2c3adb8a9e..976e8d22bd 100644 --- a/physics_lists/hadronic/QGSC_LEAD_HP/include/QGSC_LEAD_HP.hh +++ b/source/physics_lists/lists/include/QGSC_LEAD_HP.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: QGSC_LEAD_HP.hh,v 1.4 2006/06/29 18:03:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: QGSC_LEAD_HP.hh,v 1.1 2006/10/31 11:35:09 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/QGSC_LEAD_HP/include/QGSC_LEAD_HP.icc b/source/physics_lists/lists/include/QGSC_LEAD_HP.icc similarity index 97% rename from physics_lists/hadronic/QGSC_LEAD_HP/include/QGSC_LEAD_HP.icc rename to source/physics_lists/lists/include/QGSC_LEAD_HP.icc index f2745fcdb0..b9c19352a0 100644 --- a/physics_lists/hadronic/QGSC_LEAD_HP/include/QGSC_LEAD_HP.icc +++ b/source/physics_lists/lists/include/QGSC_LEAD_HP.icc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: QGSC_LEAD_HP.icc,v 1.11 2006/06/29 18:03:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: QGSC_LEAD_HP.icc,v 1.2 2006/11/24 17:10:23 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -67,7 +67,7 @@ template TQGSC_LEAD_HP::TQGSC_LEAD_HP(G4int ver): T() // default cut value (1.0mm) // defaultCutValue = 1.0*mm; G4DataQuestionaire it(photon, neutron); - G4cout << "<<< Geant4 Physics List simulation engine: QGSC_LEAD_HP 3.1"<defaultCutValue = 0.7*mm; this->SetVerboseLevel(ver); diff --git a/physics_lists/hadronic/QGSP/include/QGSP.hh b/source/physics_lists/lists/include/QGSP.hh similarity index 96% rename from physics_lists/hadronic/QGSP/include/QGSP.hh rename to source/physics_lists/lists/include/QGSP.hh index ee6b1865b5..f4e9b68835 100644 --- a/physics_lists/hadronic/QGSP/include/QGSP.hh +++ b/source/physics_lists/lists/include/QGSP.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: QGSP.hh,v 1.5 2006/06/29 18:03:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: QGSP.hh,v 1.1 2006/10/31 11:35:09 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/QGSP/include/QGSP.icc b/source/physics_lists/lists/include/QGSP.icc similarity index 91% rename from physics_lists/hadronic/QGSP/include/QGSP.icc rename to source/physics_lists/lists/include/QGSP.icc index e44c9e5d0f..8983400acd 100644 --- a/physics_lists/hadronic/QGSP/include/QGSP.icc +++ b/source/physics_lists/lists/include/QGSP.icc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: QGSP.icc,v 1.14 2006/06/29 18:03:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: QGSP.icc,v 1.3 2006/11/24 17:10:23 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -37,6 +37,7 @@ // 30.11.2005 G.Folger: Register EmStandard first, split Em Standard and Extra // 08.06.2006 V.Ivanchenko: migration to CHIPS stopping // 15.06.2006 G.Folger: Migrate to HadronElasticPhysics using improved elastic +// 20.11.2006 G.Folger: add Tracking Cut for neutrons // //---------------------------------------------------------------------------- // @@ -60,6 +61,7 @@ #include "G4IonPhysics.hh" #include "G4QStoppingPhysics.hh" #include "G4HadronElasticPhysics.hh" +#include "G4NeutronTrackingCut.hh" #include "G4DataQuestionaire.hh" #include "HadronPhysicsQGSP.hh" @@ -70,7 +72,7 @@ template TQGSP::TQGSP(G4int ver): T() // defaultCutValue = 1.0*mm; G4DataQuestionaire it(photon); - G4cout << "<<< Geant4 Physics List simulation engine: QGSP 3.1"<defaultCutValue = 0.7*mm; @@ -96,6 +98,9 @@ template TQGSP::TQGSP(G4int ver): T() // Ion Physics this->RegisterPhysics( new G4IonPhysics("ion")); + + // Neutron tracking cut + this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver)); } diff --git a/physics_lists/hadronic/QGSP_BERT/include/QGSP_BERT.hh b/source/physics_lists/lists/include/QGSP_BERT.hh similarity index 96% rename from physics_lists/hadronic/QGSP_BERT/include/QGSP_BERT.hh rename to source/physics_lists/lists/include/QGSP_BERT.hh index 14932eada5..cf845f2873 100644 --- a/physics_lists/hadronic/QGSP_BERT/include/QGSP_BERT.hh +++ b/source/physics_lists/lists/include/QGSP_BERT.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: QGSP_BERT.hh,v 1.4 2006/06/29 18:03:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: QGSP_BERT.hh,v 1.1 2006/10/31 11:35:09 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/QGSP_BERT/include/QGSP_BERT.icc b/source/physics_lists/lists/include/QGSP_BERT.icc similarity index 92% rename from physics_lists/hadronic/QGSP_BERT/include/QGSP_BERT.icc rename to source/physics_lists/lists/include/QGSP_BERT.icc index 2725c0d261..527c3e395b 100644 --- a/physics_lists/hadronic/QGSP_BERT/include/QGSP_BERT.icc +++ b/source/physics_lists/lists/include/QGSP_BERT.icc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: QGSP_BERT.icc,v 1.11 2006/06/29 18:04:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: QGSP_BERT.icc,v 1.3 2006/11/24 17:10:23 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -38,6 +38,7 @@ // 02.12.2005 V.Ivanchenko: rename components // 08.06.2006 V.Ivanchenko: migration to CHIPS stopping // 15.06.2006 G.Folger: Migrate to HadronElasticPhysics using improved elastic +// 20.11.2006 G.Folger: add Tracking Cut for neutrons // //---------------------------------------------------------------------------- // @@ -61,6 +62,7 @@ #include "G4IonPhysics.hh" #include "G4QStoppingPhysics.hh" #include "G4HadronElasticPhysics.hh" +#include "G4NeutronTrackingCut.hh" #include "G4DataQuestionaire.hh" #include "HadronPhysicsQGSP_BERT.hh" @@ -69,7 +71,7 @@ template TQGSP_BERT::TQGSP_BERT(G4int ver): T() { G4DataQuestionaire it(photon); - G4cout << "<<< Geant4 Physics List simulation engine: QGSP_BERT 3.1"<defaultCutValue = 0.7*mm; @@ -95,6 +97,9 @@ template TQGSP_BERT::TQGSP_BERT(G4int ver): T() // Ion Physics this->RegisterPhysics( new G4IonPhysics("ion")); + + // Neutron tracking cut + this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver)); } diff --git a/physics_lists/hadronic/QGSP_BERT_HP/include/QGSP_BERT_HP.hh b/source/physics_lists/lists/include/QGSP_BERT_HP.hh similarity index 96% rename from physics_lists/hadronic/QGSP_BERT_HP/include/QGSP_BERT_HP.hh rename to source/physics_lists/lists/include/QGSP_BERT_HP.hh index 9757eaae5f..12727b13cd 100644 --- a/physics_lists/hadronic/QGSP_BERT_HP/include/QGSP_BERT_HP.hh +++ b/source/physics_lists/lists/include/QGSP_BERT_HP.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: QGSP_BERT_HP.hh,v 1.3 2006/06/29 18:04:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: QGSP_BERT_HP.hh,v 1.1 2006/10/31 11:35:09 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/QGSP_BERT_HP/include/QGSP_BERT_HP.icc b/source/physics_lists/lists/include/QGSP_BERT_HP.icc similarity index 95% rename from physics_lists/hadronic/QGSP_BERT_HP/include/QGSP_BERT_HP.icc rename to source/physics_lists/lists/include/QGSP_BERT_HP.icc index c15d9c7244..31f5b42548 100644 --- a/physics_lists/hadronic/QGSP_BERT_HP/include/QGSP_BERT_HP.icc +++ b/source/physics_lists/lists/include/QGSP_BERT_HP.icc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: QGSP_BERT_HP.icc,v 1.6 2006/06/29 18:04:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: QGSP_BERT_HP.icc,v 1.2 2006/11/24 17:10:24 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -66,7 +66,7 @@ template TQGSP_BERT_HP::TQGSP_BERT_HP(G4int ver): T() { G4DataQuestionaire it(photon, neutron); - G4cout << "You are using the simulation engine: QGSP_BERT_HP 2.1"<defaultCutValue = 0.7*mm; diff --git a/physics_lists/hadronic/QGSP_BIC/include/QGSP_BIC.hh b/source/physics_lists/lists/include/QGSP_BIC.hh similarity index 96% rename from physics_lists/hadronic/QGSP_BIC/include/QGSP_BIC.hh rename to source/physics_lists/lists/include/QGSP_BIC.hh index 32ca6fc0b8..93ada509cc 100644 --- a/physics_lists/hadronic/QGSP_BIC/include/QGSP_BIC.hh +++ b/source/physics_lists/lists/include/QGSP_BIC.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: QGSP_BIC.hh,v 1.4 2006/06/29 18:04:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: QGSP_BIC.hh,v 1.1 2006/10/31 11:35:09 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/QGSP_BIC/include/QGSP_BIC.icc b/source/physics_lists/lists/include/QGSP_BIC.icc similarity index 93% rename from physics_lists/hadronic/QGSP_BIC/include/QGSP_BIC.icc rename to source/physics_lists/lists/include/QGSP_BIC.icc index 1cf86d2dd1..aabab53b02 100644 --- a/physics_lists/hadronic/QGSP_BIC/include/QGSP_BIC.icc +++ b/source/physics_lists/lists/include/QGSP_BIC.icc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: QGSP_BIC.icc,v 1.13 2006/06/29 18:04:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: QGSP_BIC.icc,v 1.3 2006/11/24 17:10:24 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -39,6 +39,7 @@ // 08.06.2006 V.Ivanchenko: migration to CHIPS stopping // 15.06.2006 G.Folger: Migrate to HadronElasticPhysics using improved elastic // 20.06.2006 V.Ivanchenko: add ion Binary Cascade +// 20.11.2006 G.Folger: add Tracking Cut for neutrons // //---------------------------------------------------------------------------- // @@ -61,6 +62,7 @@ #include "G4IonBinaryCascadePhysics.hh" #include "G4QStoppingPhysics.hh" #include "G4HadronElasticPhysics.hh" +#include "G4NeutronTrackingCut.hh" #include "G4DataQuestionaire.hh" #include "HadronPhysicsQGSP_BIC.hh" @@ -71,7 +73,7 @@ template TQGSP_BIC::TQGSP_BIC(G4int ver): T() // defaultCutValue = 1.0*mm; G4DataQuestionaire it(photon); - G4cout << "<<< Geant4 Physics List simulation engine: QGSP_BIC 3.1"<defaultCutValue = 0.7*mm; @@ -97,6 +99,9 @@ template TQGSP_BIC::TQGSP_BIC(G4int ver): T() // Ion Physics this->RegisterPhysics( new G4IonBinaryCascadePhysics("ionBIC")); + + // Neutron tracking cut + this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver)); } diff --git a/source/physics_lists/lists/include/QGSP_BIC_HP.hh b/source/physics_lists/lists/include/QGSP_BIC_HP.hh new file mode 100644 index 0000000000..293abb85bf --- /dev/null +++ b/source/physics_lists/lists/include/QGSP_BIC_HP.hh @@ -0,0 +1,69 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: QGSP_BIC_HP.hh,v 1.1 2006/11/24 16:31:35 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +//--------------------------------------------------------------------------- +// +// ClassName: QGSP_BIC_HP +// +// Author: 2006 G.Folger +// +// based on QGSP_BIC +// Modified: +// +//---------------------------------------------------------------------------- +// +#ifndef TQGSP_BIC_HP_h +#define TQGSP_BIC_HP_h 1 + +#include "G4VModularPhysicsList.hh" +#include "globals.hh" +#include "CompileTimeConstraints.hh" + +template +class TQGSP_BIC_HP: public T +{ +public: + TQGSP_BIC_HP(G4int ver = 1); + virtual ~TQGSP_BIC_HP(); + +public: + // SetCuts() + virtual void SetCuts(); + +private: + enum {ok = CompileTimeConstraints::IsA::ok }; +}; +#include "QGSP_BIC_HP.icc" +typedef TQGSP_BIC_HP QGSP_BIC_HP; + +// 2002 by J.P. Wellisch + +#endif + + + diff --git a/physics_lists/hadronic/QGSP_GN/include/QGSP_GN.icc b/source/physics_lists/lists/include/QGSP_BIC_HP.icc similarity index 75% rename from physics_lists/hadronic/QGSP_GN/include/QGSP_GN.icc rename to source/physics_lists/lists/include/QGSP_BIC_HP.icc index 5b7a2a280a..364b134e99 100644 --- a/physics_lists/hadronic/QGSP_GN/include/QGSP_GN.icc +++ b/source/physics_lists/lists/include/QGSP_BIC_HP.icc @@ -23,26 +23,20 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: QGSP_GN.icc,v 1.11 2006/06/29 18:04:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: QGSP_BIC_HP.icc,v 1.1 2006/11/24 16:31:35 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // -// ClassName: QGSP_GN +// ClassName: QGSP_BIC_HP // -// Author: 2002 J.P. Wellisch +// Author: 2006 G.Folger // +// based on QGSP_BIC // Modified: -// 23.11.2005 G.Folger: migration to non static particles -// 30.11.2005 G.Folger: Register EmStandard first, -// Use EmStandard71 -// 02.12.2005 V.Ivanchenko: rename components -// 08.06.2006 V.Ivanchenko: migration to CHIPS stopping -// 15.06.2006 G.Folger: Migrate to HadronElasticPhysics using improved elastic // //---------------------------------------------------------------------------- // - #include "globals.hh" #include "G4ParticleDefinition.hh" #include "G4ParticleWithCuts.hh" @@ -57,56 +51,63 @@ #include #include "G4DecayPhysics.hh" -#include "G4EmStandardPhysics71.hh" +#include "G4EmStandardPhysics.hh" #include "G4EmExtraPhysics.hh" -#include "G4IonPhysics.hh" +#include "G4IonBinaryCascadePhysics.hh" #include "G4QStoppingPhysics.hh" #include "G4HadronElasticPhysics.hh" #include "G4DataQuestionaire.hh" -#include "HadronPhysicsQGSP_GN.hh" +#include "HadronPhysicsQGSP_BIC_HP.hh" -template TQGSP_GN::TQGSP_GN(G4int ver): T() +#include "G4WarnPLStatus.hh" + +template TQGSP_BIC_HP::TQGSP_BIC_HP(G4int ver): T() { // default cut value (1.0mm) // defaultCutValue = 1.0*mm; + G4DataQuestionaire it(photon); - G4cout << "<<< Geant4 Physics List simulation engine: QGSP_GN 3.1"<defaultCutValue = 0.7*mm; this->SetVerboseLevel(ver); + G4WarnPLStatus exp; + exp.Experimental("QGSP_BIC_HP"); + // EM Physics - this->RegisterPhysics( new G4EmStandardPhysics71("standard EM msc 7.1",ver)); + this->RegisterPhysics( new G4EmStandardPhysics("standard EM",ver)); // Synchroton Radiation & GN Physics this->RegisterPhysics( new G4EmExtraPhysics("extra EM")); - // General Physics - i.e. decay + // Decays this->RegisterPhysics( new G4DecayPhysics("decay",ver) ); // Hadron Elastic scattering this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false)); // Hadron Physics - this->RegisterPhysics( new HadronPhysicsQGSP_GN("hadron")); + this->RegisterPhysics( new HadronPhysicsQGSP_BIC_HP("hadron")); // Stopping Physics this->RegisterPhysics( new G4QStoppingPhysics("stopping")); // Ion Physics - this->RegisterPhysics( new G4IonPhysics("ion")); - + this->RegisterPhysics( new G4IonBinaryCascadePhysics("ionBIC")); + } -template TQGSP_GN::~TQGSP_GN() +template TQGSP_BIC_HP::~TQGSP_BIC_HP() { } -template void TQGSP_GN::SetCuts() +template void TQGSP_BIC_HP::SetCuts() { if (this->verboseLevel >1){ - G4cout << "QGSP_GN::SetCuts:"; + G4cout << "QGSP_BIC_HP::SetCuts:"; } // " G4VUserPhysicsList::SetCutsWithDefault" method sets // the default cut value for all particle types @@ -115,7 +116,7 @@ template void TQGSP_GN::SetCuts() // if (this->verboseLevel >0) // G4VUserPhysicsList::DumpCutValuesTable(); - + } diff --git a/physics_lists/hadronic/QGSP_EMV/include/QGSP_EMV.hh b/source/physics_lists/lists/include/QGSP_EMV.hh similarity index 96% rename from physics_lists/hadronic/QGSP_EMV/include/QGSP_EMV.hh rename to source/physics_lists/lists/include/QGSP_EMV.hh index c8e5186abf..fa21501df6 100644 --- a/physics_lists/hadronic/QGSP_EMV/include/QGSP_EMV.hh +++ b/source/physics_lists/lists/include/QGSP_EMV.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: QGSP_EMV.hh,v 1.3 2006/06/29 18:04:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: QGSP_EMV.hh,v 1.1 2006/10/31 11:35:09 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/QGSP_EMV/include/QGSP_EMV.icc b/source/physics_lists/lists/include/QGSP_EMV.icc similarity index 93% rename from physics_lists/hadronic/QGSP_EMV/include/QGSP_EMV.icc rename to source/physics_lists/lists/include/QGSP_EMV.icc index 600282ba31..705fdf2388 100644 --- a/physics_lists/hadronic/QGSP_EMV/include/QGSP_EMV.icc +++ b/source/physics_lists/lists/include/QGSP_EMV.icc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: QGSP_EMV.icc,v 1.10 2006/06/29 18:04:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: QGSP_EMV.icc,v 1.3 2006/11/24 17:10:24 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -40,6 +40,7 @@ // 08.06.2006 V.Ivanchenko: migration to CHIPS stopping // 15.06.2006 G.Folger: Migrate to HadronElasticPhysics using improved elastic // 21.06.2006 V.Ivanchenko: use v71 EM physics +// 20.11.2006 G.Folger: add Tracking Cut for neutrons // //---------------------------------------------------------------------------- // @@ -63,6 +64,7 @@ #include "G4IonPhysics.hh" #include "G4QStoppingPhysics.hh" #include "G4HadronElasticPhysics.hh" +#include "G4NeutronTrackingCut.hh" #include "G4DataQuestionaire.hh" #include "HadronPhysicsQGSP_EMV.hh" @@ -70,7 +72,7 @@ template TQGSP_EMV::TQGSP_EMV(G4int ver): T() { G4DataQuestionaire it(photon); - G4cout << "<<< Geant4 Physics List simulation engine: QGSP_EMV 3.1"<defaultCutValue = 0.7*mm; this->SetVerboseLevel(ver); @@ -95,6 +97,9 @@ template TQGSP_EMV::TQGSP_EMV(G4int ver): T() // Ion Physics this->RegisterPhysics( new G4IonPhysics("ion")); + + // Neutron tracking cut + this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver)); } diff --git a/physics_lists/hadronic/QGSP_EMX/include/QGSP_EMX.hh b/source/physics_lists/lists/include/QGSP_EMX.hh similarity index 96% rename from physics_lists/hadronic/QGSP_EMX/include/QGSP_EMX.hh rename to source/physics_lists/lists/include/QGSP_EMX.hh index 52b212dcff..24d7164076 100644 --- a/physics_lists/hadronic/QGSP_EMX/include/QGSP_EMX.hh +++ b/source/physics_lists/lists/include/QGSP_EMX.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: QGSP_EMX.hh,v 1.2 2006/06/29 18:04:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: QGSP_EMX.hh,v 1.1 2006/10/31 11:35:09 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/QGSP_EMX/include/QGSP_EMX.icc b/source/physics_lists/lists/include/QGSP_EMX.icc similarity index 92% rename from physics_lists/hadronic/QGSP_EMX/include/QGSP_EMX.icc rename to source/physics_lists/lists/include/QGSP_EMX.icc index 7e0f14de67..b85feaca51 100644 --- a/physics_lists/hadronic/QGSP_EMX/include/QGSP_EMX.icc +++ b/source/physics_lists/lists/include/QGSP_EMX.icc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: QGSP_EMX.icc,v 1.2 2006/06/29 18:04:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: QGSP_EMX.icc,v 1.3 2006/11/24 17:10:24 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -33,6 +33,7 @@ // Author: 2006 V.Ivanchenko // // Modified: +// 20.11.2006 G.Folger: add Tracking Cut for neutrons // 21.06.2006 V.Ivanchenko crerate from QGSP_EMV // //---------------------------------------------------------------------------- @@ -57,6 +58,7 @@ #include "G4IonPhysics.hh" #include "G4QStoppingPhysics.hh" #include "G4HadronElasticPhysics.hh" +#include "G4NeutronTrackingCut.hh" #include "G4DataQuestionaire.hh" #include "HadronPhysicsQGSP_EMX.hh" @@ -64,7 +66,7 @@ template TQGSP_EMX::TQGSP_EMX(G4int ver): T() { G4DataQuestionaire it(photon); - G4cout << "<<< Geant4 Physics List simulation engine: QGSP_EMX 3.1"<defaultCutValue = 7.*mm; this->SetVerboseLevel(ver); @@ -89,6 +91,9 @@ template TQGSP_EMX::TQGSP_EMX(G4int ver): T() // Ion Physics this->RegisterPhysics( new G4IonPhysics("ion")); + + // Neutron tracking cut + this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver)); } diff --git a/physics_lists/hadronic/QGSP_HP/include/QGSP_HP.hh b/source/physics_lists/lists/include/QGSP_HP.hh similarity index 96% rename from physics_lists/hadronic/QGSP_HP/include/QGSP_HP.hh rename to source/physics_lists/lists/include/QGSP_HP.hh index 8e5afe36ec..9f0d977865 100644 --- a/physics_lists/hadronic/QGSP_HP/include/QGSP_HP.hh +++ b/source/physics_lists/lists/include/QGSP_HP.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: QGSP_HP.hh,v 1.4 2006/06/29 18:05:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: QGSP_HP.hh,v 1.1 2006/10/31 11:35:09 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/QGSP_HP/include/QGSP_HP.icc b/source/physics_lists/lists/include/QGSP_HP.icc similarity index 94% rename from physics_lists/hadronic/QGSP_HP/include/QGSP_HP.icc rename to source/physics_lists/lists/include/QGSP_HP.icc index e3a266b31e..529688d254 100644 --- a/physics_lists/hadronic/QGSP_HP/include/QGSP_HP.icc +++ b/source/physics_lists/lists/include/QGSP_HP.icc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: QGSP_HP.icc,v 1.11 2006/06/29 18:05:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: QGSP_HP.icc,v 1.2 2006/11/21 07:33:04 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -65,16 +65,21 @@ #include "G4DataQuestionaire.hh" #include "HadronPhysicsQGSP_HP.hh" +#include "G4WarnPLStatus.hh" + template TQGSP_HP::TQGSP_HP(G4int ver): T() { G4DataQuestionaire it(photon, neutron); - G4cout << "<<< Geant4 Physics List simulation engine: QGSP_HP 3.1"<defaultCutValue = 0.7*mm; this->SetVerboseLevel(ver); + G4WarnPLStatus obs; + obs.Unsupported("QGSP_HP","QGSP_BERT_HP"); + // EM Physics this->RegisterPhysics( new G4EmStandardPhysics("standard EM",ver)); @@ -85,7 +90,7 @@ template TQGSP_HP::TQGSP_HP(G4int ver): T() this->RegisterPhysics( new G4DecayPhysics("decay",ver) ); // Hadron Elastic scattering - this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false)); + this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,true)); // Hadron Physics this->RegisterPhysics( new HadronPhysicsQGSP_HP("hadron")); diff --git a/physics_lists/hadronic/LHEP_GN/include/LHEP_GN.hh b/source/physics_lists/lists/include/QGSP_QEL.hh similarity index 85% rename from physics_lists/hadronic/LHEP_GN/include/LHEP_GN.hh rename to source/physics_lists/lists/include/QGSP_QEL.hh index 22f5786936..c2c3c080b8 100644 --- a/physics_lists/hadronic/LHEP_GN/include/LHEP_GN.hh +++ b/source/physics_lists/lists/include/QGSP_QEL.hh @@ -23,42 +23,44 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: LHEP_GN.hh,v 1.4 2006/06/29 17:56:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// +// $Id: QGSP_QEL.hh,v 1.1 2006/11/28 15:41:23 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // -// ClassName: LHEP_GN +// ClassName: QGSP_QEL // -// Author: 2002 J.P. Wellisch +// Author: 2006 G.Folger // +// Created from QGSP // Modified: // //---------------------------------------------------------------------------- -// -#ifndef TLHEP_GN_h -#define TLHEP_GN_h 1 +#ifndef TQGSP_QEL_h +#define TQGSP_QEL_h 1 #include "G4VModularPhysicsList.hh" #include "globals.hh" #include "CompileTimeConstraints.hh" template -class TLHEP_GN: public T +class TQGSP_QEL: public T { public: - TLHEP_GN(G4int ver = 1); - virtual ~TLHEP_GN(); + TQGSP_QEL(G4int ver = 1); + virtual ~TQGSP_QEL(); public: // SetCuts() virtual void SetCuts(); + private: enum {ok = CompileTimeConstraints::IsA::ok }; }; -#include "LHEP_GN.icc" -typedef TLHEP_GN LHEP_GN; +#include "QGSP_QEL.icc" +typedef TQGSP_QEL QGSP_QEL; // 2002 by J.P. Wellisch diff --git a/physics_lists/hadronic/LHEP_GN/include/LHEP_GN.icc b/source/physics_lists/lists/include/QGSP_QEL.icc similarity index 71% rename from physics_lists/hadronic/LHEP_GN/include/LHEP_GN.icc rename to source/physics_lists/lists/include/QGSP_QEL.icc index dc7d6e5b71..a3b81fbbc2 100644 --- a/physics_lists/hadronic/LHEP_GN/include/LHEP_GN.icc +++ b/source/physics_lists/lists/include/QGSP_QEL.icc @@ -23,21 +23,17 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: LHEP_GN.icc,v 1.13 2006/06/29 17:56:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: QGSP_QEL.icc,v 1.1 2006/11/28 15:41:23 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // -// ClassName: LHEP_GN +// ClassName: QGSP_QEL // -// Author: 2002 J.P. Wellisch +// Author: 2006 G.Folger // +// Created from QGSP // Modified: -// 30.11.2005 G.Folger: migration to non static particles -// 30.11.2005 G.Folger: Register EmStandard first, split Em Standard and Extra -// 02.12.2005 V.Ivanchenko: rename components -// 08.06.2006 V.Ivanchenko: migration to CHIPS stopping -// 14.06.2006 G.Folger: Migrate to HadronElasticPhysics using G4LElastic // //---------------------------------------------------------------------------- // @@ -61,60 +57,65 @@ #include "G4IonPhysics.hh" #include "G4QStoppingPhysics.hh" #include "G4HadronElasticPhysics.hh" +#include "G4NeutronTrackingCut.hh" #include "G4DataQuestionaire.hh" -#include "HadronPhysicsLHEP_GN.hh" +#include "HadronPhysicsQGSP.hh" -template TLHEP_GN::TLHEP_GN(G4int ver): T() +template TQGSP_QEL::TQGSP_QEL(G4int ver): T() { // default cut value (1.0mm) // defaultCutValue = 1.0*mm; + G4DataQuestionaire it(photon); - G4cout << "<<< Geant4 Physics List simulation engine: LHEP_GN 3.1"<defaultCutValue = 0.7*mm; this->SetVerboseLevel(ver); - // EM Physics - without multiple scattering limiting the step - this->RegisterPhysics( new G4EmStandardPhysics("EMstandard",ver,false)); + // EM Physics + this->RegisterPhysics( new G4EmStandardPhysics("standard EM",ver)); // Synchroton Radiation & GN Physics this->RegisterPhysics( new G4EmExtraPhysics("extra EM")); // Decays - this->RegisterPhysics( new G4DecayPhysics("general",ver) ); + this->RegisterPhysics( new G4DecayPhysics("decay",ver) ); - // Hadron Elastic scattering - this-> RegisterPhysics( new G4HadronElasticPhysics("LElastic",ver,false)); + // Hadron Elastic scattering, "CHIPS" version + this-> RegisterPhysics( new G4HadronQElasticPhysics("elastic",ver)); // Hadron Physics - this->RegisterPhysics( new HadronPhysicsLHEP_GN("hadron")); + this->RegisterPhysics( new HadronPhysicsQGSP("hadron")); // Stopping Physics this->RegisterPhysics( new G4QStoppingPhysics("stopping")); // Ion Physics this->RegisterPhysics( new G4IonPhysics("ion")); + + // Neutron tracking cut + this->RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver)); + } -template TLHEP_GN::~TLHEP_GN() +template TQGSP_QEL::~TQGSP_QEL() { } -template void TLHEP_GN::SetCuts() +template void TQGSP_QEL::SetCuts() { if (this->verboseLevel >1){ - G4cout << "LHEP_GN::SetCuts:"; + G4cout << "QGSP_QEL::SetCuts:"; } // " G4VUserPhysicsList::SetCutsWithDefault" method sets // the default cut value for all particle types this->SetCutsWithDefault(); - - if (this->verboseLevel >0) - G4VUserPhysicsList::DumpCutValuesTable(); - - + +// if (this->verboseLevel > 0) +// G4VUserPhysicsList::DumpCutValuesTable(); } diff --git a/physics_lists/hadronic/LBE/include/SpecialCuts.hh b/source/physics_lists/lists/include/SpecialCuts.hh similarity index 100% rename from physics_lists/hadronic/LBE/include/SpecialCuts.hh rename to source/physics_lists/lists/include/SpecialCuts.hh diff --git a/physics_lists/hadronic/QBBC/src/G4HadronInelasticQBBC.cc b/source/physics_lists/lists/src/G4HadronInelasticQBBC.cc similarity index 87% rename from physics_lists/hadronic/QBBC/src/G4HadronInelasticQBBC.cc rename to source/physics_lists/lists/src/G4HadronInelasticQBBC.cc index a17ab86029..9e866eaaef 100644 --- a/physics_lists/hadronic/QBBC/src/G4HadronInelasticQBBC.cc +++ b/source/physics_lists/lists/src/G4HadronInelasticQBBC.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4HadronInelasticQBBC.cc,v 1.8 2006/06/29 18:03:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4HadronInelasticQBBC.cc,v 1.1 2006/10/31 11:35:09 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -33,6 +33,7 @@ // Author: 11 April 2006 V. Ivanchenko // // Modified: +// 05.07.2006 V.Ivanchenko fix problem of initialisation of HP // //---------------------------------------------------------------------------- // @@ -67,15 +68,18 @@ #include "G4NeutronHPCapture.hh" #include "G4HadronProcessStore.hh" +#include "G4UInelasticCrossSection.hh" G4HadronInelasticQBBC::G4HadronInelasticQBBC(const G4String& name, - G4int ver, G4bool ftf, G4bool bert, - G4bool chips, G4bool hp) + G4int ver, G4bool ftf, G4bool bert, G4bool chips, G4bool hp, G4bool glauber) : G4VPhysicsConstructor(name), verbose(ver), ftfFlag(ftf), bertFlag(bert), - chipsFlag(chips), hpFlag(hp), wasActivated(false) + chipsFlag(chips), hpFlag(hp), glFlag(glauber), wasActivated(false) { - if(verbose > 1) G4cout << "### HadronInelasticQBBC" << G4endl; + if(verbose > -1) G4cout << "### HadronInelasticQBBC" << G4endl; store = G4HadronProcessStore::Instance(); + theHPXSecI = 0; + theHPXSecC = 0; + theHPXSecF = 0; } G4HadronInelasticQBBC::~G4HadronInelasticQBBC() @@ -86,6 +90,9 @@ G4HadronInelasticQBBC::~G4HadronInelasticQBBC() delete theQGStringModel; delete theFTFStringDecay; delete theFTFStringModel; + delete theHPXSecI; + delete theHPXSecC; + delete theHPXSecF; } } @@ -186,6 +193,8 @@ void G4HadronInelasticQBBC::ConstructProcess() theBIC->SetMaxEnergy(maxEcascade); Register(particle,hp,theBIC,"Binary"); } + if(glFlag) + hp->AddDataSet(new G4UInelasticCrossSection(particle)); } else if(pname == "neutron") { hp->AddDataSet(&theXSecN); @@ -201,10 +210,13 @@ void G4HadronInelasticQBBC::ConstructProcess() G4double emin = 0.0; if(hpFlag) { - emin = 19.9; - hp->AddDataSet(&theHPXSecI); - theNeutronCapture->AddDataSet(&theHPXSecC); - theNeutronFission->AddDataSet(&theHPXSecF); + emin = 19.5*MeV; + theHPXSecI = new G4NeutronHPInelasticData; + theHPXSecC = new G4NeutronHPCaptureData; + theHPXSecF = new G4NeutronHPFissionData; + hp->AddDataSet(theHPXSecI); + theNeutronCapture->AddDataSet(theHPXSecC); + theNeutronFission->AddDataSet(theHPXSecF); G4NeutronHPInelastic* hpi = new G4NeutronHPInelastic(); G4NeutronHPCapture* hpc = new G4NeutronHPCapture(); G4NeutronHPFission* hpf = new G4NeutronHPFission(); @@ -228,15 +240,15 @@ void G4HadronInelasticQBBC::ConstructProcess() theB->SetMinEnergy(emin); theB->SetMaxEnergy(maxEcascade); Register(particle,hp,theB,s); + if(glFlag) + hp->AddDataSet(new G4UInelasticCrossSection(particle)); G4HadronicInteraction* theC = new G4LCapture(); theC->SetMinEnergy(emin); - theC->SetMaxEnergy(maxEcascade); Register(particle,theNeutronCapture,theC,"LCapture"); G4HadronicInteraction* theF = new G4LFission(); theF->SetMinEnergy(emin); - theF->SetMaxEnergy(maxEcascade); Register(particle,theNeutronFission,theF,"LFission"); } else if(pname == "pi-" || pname == "pi+") { @@ -246,6 +258,8 @@ void G4HadronInelasticQBBC::ConstructProcess() if(chipsFlag) Register(particle,hp,theCHIPS,"CHIPS"); else Register(particle,hp,theBERT,"Bertini"); + if(glFlag) + hp->AddDataSet(new G4UInelasticCrossSection(particle)); } else if(pname == "kaon-" || pname == "kaon+" || @@ -256,6 +270,8 @@ void G4HadronInelasticQBBC::ConstructProcess() if(chipsFlag) Register(particle,hp,theCHIPS,"CHIPS"); else Register(particle,hp,theBERT,"Bertini"); + if(glFlag) + hp->AddDataSet(new G4UInelasticCrossSection(particle)); } else if(pname == "lambda" || pname == "sigma-" || @@ -266,14 +282,20 @@ void G4HadronInelasticQBBC::ConstructProcess() if(chipsFlag) Register(particle,hp,theCHIPS,"CHIPS"); else Register(particle,hp,theBERT,"Bertini"); + if(glFlag) + hp->AddDataSet(new G4UInelasticCrossSection(particle)); } else if(pname == "anti_proton" || pname == "anti_neutron") { Register(particle,hp,theFTFModel,"FTF"); Register(particle,hp,theCHIPS,"CHIPS"); + if(glFlag) + hp->AddDataSet(new G4UInelasticCrossSection(particle)); } else { Register(particle,hp,theFTFModel,"FTF"); Register(particle,hp,theCHIPS,"CHIPS"); + if(glFlag) + hp->AddDataSet(new G4UInelasticCrossSection(particle)); } if(verbose > 1) @@ -281,6 +303,7 @@ void G4HadronInelasticQBBC::ConstructProcess() << " added for " << pname << G4endl; } } + store->Dump(verbose); } void G4HadronInelasticQBBC::Register(G4ParticleDefinition* p, diff --git a/physics_lists/hadronic/QBBC/src/G4HadronInelasticQLHEP.cc b/source/physics_lists/lists/src/G4HadronInelasticQLHEP.cc similarity index 93% rename from physics_lists/hadronic/QBBC/src/G4HadronInelasticQLHEP.cc rename to source/physics_lists/lists/src/G4HadronInelasticQLHEP.cc index 9a2632c6ef..49c6029fcb 100644 --- a/physics_lists/hadronic/QBBC/src/G4HadronInelasticQLHEP.cc +++ b/source/physics_lists/lists/src/G4HadronInelasticQLHEP.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4HadronInelasticQLHEP.cc,v 1.6 2006/06/29 18:03:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4HadronInelasticQLHEP.cc,v 1.1 2006/10/31 11:35:10 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -33,6 +33,7 @@ // Author: 11 April 2006 V. Ivanchenko // // Modified: +// 05.07.2006 V.Ivanchenko fix problem of initialisation of HP // //---------------------------------------------------------------------------- // @@ -125,6 +126,9 @@ G4HadronInelasticQLHEP::G4HadronInelasticQLHEP(const G4String& name, theQGStringDecay = 0; theQGStringModel = 0; thePreEquilib = 0; + theHPXSecI = 0; + theHPXSecC = 0; + theHPXSecF = 0; } G4HadronInelasticQLHEP::~G4HadronInelasticQLHEP() @@ -134,6 +138,9 @@ G4HadronInelasticQLHEP::~G4HadronInelasticQLHEP() delete theQGStringDecay; delete theQGStringModel; delete thePreEquilib; + delete theHPXSecI; + delete theHPXSecC; + delete theHPXSecF; } } @@ -228,20 +235,24 @@ void G4HadronInelasticQLHEP::ConstructProcess() pmanager->AddDiscreteProcess(hp); if(pname == "proton") { - hp->AddDataSet(&theXSecP); - if(qgsFlag) Register(particle,hp,theQGSModel,"QGS"); - else AddHEP(particle, hp, 25.*GeV, 100.*TeV); - + if(qgsFlag) { + Register(particle,hp,theQGSModel,"QGS"); + hp->AddDataSet(&theXSecP); + } else { + AddHEP(particle, hp, 25.*GeV, 100.*TeV); + } AddLEP(particle, hp, minELEP, maxELEP); if(bicFlag) Register(particle,hp,theBIC,"Binary"); else if(bertFlag) Register(particle,hp,theBERT,"Bertini"); } else if(pname == "neutron") { - hp->AddDataSet(&theXSecN); - if(qgsFlag) Register(particle,hp,theQGSModel,"QGS"); - else AddHEP(particle, hp, 25.*GeV, 100.*TeV); - + if(qgsFlag) { + Register(particle,hp,theQGSModel,"QGS"); + hp->AddDataSet(&theXSecN); + } else { + AddHEP(particle, hp, 25.*GeV, 100.*TeV); + } AddLEP(particle, hp, minELEP, maxELEP); G4HadronCaptureProcess* theNeutronCapture = @@ -252,9 +263,12 @@ void G4HadronInelasticQLHEP::ConstructProcess() pmanager->AddDiscreteProcess(theNeutronFission); if(hpFlag) { - hp->AddDataSet(&theHPXSecI); - theNeutronCapture->AddDataSet(&theHPXSecC); - theNeutronFission->AddDataSet(&theHPXSecF); + theHPXSecI = new G4NeutronHPInelasticData; + theHPXSecC = new G4NeutronHPCaptureData; + theHPXSecF = new G4NeutronHPFissionData; + hp->AddDataSet(theHPXSecI); + theNeutronCapture->AddDataSet(theHPXSecC); + theNeutronFission->AddDataSet(theHPXSecF); G4NeutronHPInelastic* hpi = new G4NeutronHPInelastic(); G4NeutronHPCapture* hpc = new G4NeutronHPCapture(); G4NeutronHPFission* hpf = new G4NeutronHPFission(); @@ -284,10 +298,12 @@ void G4HadronInelasticQLHEP::ConstructProcess() } } else if(pname == "pi-" || pname == "pi+") { - hp->AddDataSet(&thePiCross); - if(qgsFlag) Register(particle,hp,theQGSModel,"QGS"); - else AddHEP(particle, hp, 25.*GeV, 100.*TeV); - + if(qgsFlag) { + Register(particle,hp,theQGSModel,"QGS"); + hp->AddDataSet(&thePiCross); + } else { + AddHEP(particle, hp, 25.*GeV, 100.*TeV); + } AddLEP(particle, hp, minELEP, maxELEP); if(bertFlag) Register(particle,hp,theBERT,"Bertini"); @@ -313,6 +329,7 @@ void G4HadronInelasticQLHEP::ConstructProcess() << " added for " << pname << G4endl; } } + store->Dump(verbose); } void G4HadronInelasticQLHEP::AddLEP(G4ParticleDefinition* particle, diff --git a/physics_lists/hadronic/FTFC/src/HadronPhysicsFTFC.cc b/source/physics_lists/lists/src/HadronPhysicsFTFC.cc similarity index 97% rename from physics_lists/hadronic/FTFC/src/HadronPhysicsFTFC.cc rename to source/physics_lists/lists/src/HadronPhysicsFTFC.cc index ef26f7ae8f..8145521a42 100644 --- a/physics_lists/hadronic/FTFC/src/HadronPhysicsFTFC.cc +++ b/source/physics_lists/lists/src/HadronPhysicsFTFC.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsFTFC.cc,v 1.4 2006/06/29 17:55:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsFTFC.cc,v 1.1 2006/10/31 11:35:10 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/FTFP/src/HadronPhysicsFTFP.cc b/source/physics_lists/lists/src/HadronPhysicsFTFP.cc similarity index 97% rename from physics_lists/hadronic/FTFP/src/HadronPhysicsFTFP.cc rename to source/physics_lists/lists/src/HadronPhysicsFTFP.cc index 5f300b9749..e8ff3cd191 100644 --- a/physics_lists/hadronic/FTFP/src/HadronPhysicsFTFP.cc +++ b/source/physics_lists/lists/src/HadronPhysicsFTFP.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsFTFP.cc,v 1.4 2006/06/29 17:55:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsFTFP.cc,v 1.1 2006/10/31 11:35:10 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP/src/HadronPhysicsLHEP.cc b/source/physics_lists/lists/src/HadronPhysicsLHEP.cc similarity index 97% rename from physics_lists/hadronic/LHEP/src/HadronPhysicsLHEP.cc rename to source/physics_lists/lists/src/HadronPhysicsLHEP.cc index 27b3981ba2..1554b4add3 100644 --- a/physics_lists/hadronic/LHEP/src/HadronPhysicsLHEP.cc +++ b/source/physics_lists/lists/src/HadronPhysicsLHEP.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsLHEP.cc,v 1.4 2006/06/29 17:55:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsLHEP.cc,v 1.1 2006/10/31 11:35:10 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_BERT/src/HadronPhysicsLHEP_BERT.cc b/source/physics_lists/lists/src/HadronPhysicsLHEP_BERT.cc similarity index 97% rename from physics_lists/hadronic/LHEP_BERT/src/HadronPhysicsLHEP_BERT.cc rename to source/physics_lists/lists/src/HadronPhysicsLHEP_BERT.cc index d2c8a6aa60..a5896c781e 100644 --- a/physics_lists/hadronic/LHEP_BERT/src/HadronPhysicsLHEP_BERT.cc +++ b/source/physics_lists/lists/src/HadronPhysicsLHEP_BERT.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsLHEP_BERT.cc,v 1.6 2006/06/29 17:56:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsLHEP_BERT.cc,v 1.1 2006/10/31 11:35:10 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_BERT_HP/src/HadronPhysicsLHEP_BERT_HP.cc b/source/physics_lists/lists/src/HadronPhysicsLHEP_BERT_HP.cc similarity index 97% rename from physics_lists/hadronic/LHEP_BERT_HP/src/HadronPhysicsLHEP_BERT_HP.cc rename to source/physics_lists/lists/src/HadronPhysicsLHEP_BERT_HP.cc index 7a6728d24a..aee40d6363 100644 --- a/physics_lists/hadronic/LHEP_BERT_HP/src/HadronPhysicsLHEP_BERT_HP.cc +++ b/source/physics_lists/lists/src/HadronPhysicsLHEP_BERT_HP.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsLHEP_BERT_HP.cc,v 1.5 2006/06/29 17:56:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsLHEP_BERT_HP.cc,v 1.1 2006/10/31 11:35:10 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_BIC/src/HadronPhysicsLHEP_BIC.cc b/source/physics_lists/lists/src/HadronPhysicsLHEP_BIC.cc similarity index 97% rename from physics_lists/hadronic/LHEP_BIC/src/HadronPhysicsLHEP_BIC.cc rename to source/physics_lists/lists/src/HadronPhysicsLHEP_BIC.cc index c2012f8631..b90d058b3f 100644 --- a/physics_lists/hadronic/LHEP_BIC/src/HadronPhysicsLHEP_BIC.cc +++ b/source/physics_lists/lists/src/HadronPhysicsLHEP_BIC.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsLHEP_BIC.cc,v 1.5 2006/06/29 17:56:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsLHEP_BIC.cc,v 1.1 2006/10/31 11:35:10 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_BIC_HP/src/HadronPhysicsLHEP_BIC_HP.cc b/source/physics_lists/lists/src/HadronPhysicsLHEP_BIC_HP.cc similarity index 97% rename from physics_lists/hadronic/LHEP_BIC_HP/src/HadronPhysicsLHEP_BIC_HP.cc rename to source/physics_lists/lists/src/HadronPhysicsLHEP_BIC_HP.cc index 8ef3225ff9..077335b8aa 100644 --- a/physics_lists/hadronic/LHEP_BIC_HP/src/HadronPhysicsLHEP_BIC_HP.cc +++ b/source/physics_lists/lists/src/HadronPhysicsLHEP_BIC_HP.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsLHEP_BIC_HP.cc,v 1.5 2006/06/29 17:56:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsLHEP_BIC_HP.cc,v 1.1 2006/10/31 11:35:10 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_EMV/src/HadronPhysicsLHEP_EMV.cc b/source/physics_lists/lists/src/HadronPhysicsLHEP_EMV.cc similarity index 97% rename from physics_lists/hadronic/LHEP_EMV/src/HadronPhysicsLHEP_EMV.cc rename to source/physics_lists/lists/src/HadronPhysicsLHEP_EMV.cc index 6bbdb9b849..c8875ed150 100644 --- a/physics_lists/hadronic/LHEP_EMV/src/HadronPhysicsLHEP_EMV.cc +++ b/source/physics_lists/lists/src/HadronPhysicsLHEP_EMV.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsLHEP_EMV.cc,v 1.3 2006/06/29 17:56:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsLHEP_EMV.cc,v 1.1 2006/10/31 11:35:10 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_HP/src/HadronPhysicsLHEP_HP.cc b/source/physics_lists/lists/src/HadronPhysicsLHEP_HP.cc similarity index 97% rename from physics_lists/hadronic/LHEP_HP/src/HadronPhysicsLHEP_HP.cc rename to source/physics_lists/lists/src/HadronPhysicsLHEP_HP.cc index 3a4cb9c528..85d69aed3a 100644 --- a/physics_lists/hadronic/LHEP_HP/src/HadronPhysicsLHEP_HP.cc +++ b/source/physics_lists/lists/src/HadronPhysicsLHEP_HP.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsLHEP_HP.cc,v 1.5 2006/06/29 17:57:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsLHEP_HP.cc,v 1.1 2006/10/31 11:35:10 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_LEAD/src/HadronPhysicsLHEP_LEAD.cc b/source/physics_lists/lists/src/HadronPhysicsLHEP_LEAD.cc similarity index 97% rename from physics_lists/hadronic/LHEP_LEAD/src/HadronPhysicsLHEP_LEAD.cc rename to source/physics_lists/lists/src/HadronPhysicsLHEP_LEAD.cc index 1b7d4196e6..ad671da302 100644 --- a/physics_lists/hadronic/LHEP_LEAD/src/HadronPhysicsLHEP_LEAD.cc +++ b/source/physics_lists/lists/src/HadronPhysicsLHEP_LEAD.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsLHEP_LEAD.cc,v 1.5 2006/06/29 17:57:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsLHEP_LEAD.cc,v 1.1 2006/10/31 11:35:10 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_LEAD_HP/src/HadronPhysicsLHEP_LEAD_HP.cc b/source/physics_lists/lists/src/HadronPhysicsLHEP_LEAD_HP.cc similarity index 97% rename from physics_lists/hadronic/LHEP_LEAD_HP/src/HadronPhysicsLHEP_LEAD_HP.cc rename to source/physics_lists/lists/src/HadronPhysicsLHEP_LEAD_HP.cc index 1a68f6feb1..02c6271c86 100644 --- a/physics_lists/hadronic/LHEP_LEAD_HP/src/HadronPhysicsLHEP_LEAD_HP.cc +++ b/source/physics_lists/lists/src/HadronPhysicsLHEP_LEAD_HP.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsLHEP_LEAD_HP.cc,v 1.5 2006/06/29 17:57:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsLHEP_LEAD_HP.cc,v 1.1 2006/10/31 11:35:10 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_PRECO/src/HadronPhysicsLHEP_PRECO.cc b/source/physics_lists/lists/src/HadronPhysicsLHEP_PRECO.cc similarity index 97% rename from physics_lists/hadronic/LHEP_PRECO/src/HadronPhysicsLHEP_PRECO.cc rename to source/physics_lists/lists/src/HadronPhysicsLHEP_PRECO.cc index 8673670ec3..7ea1afe643 100644 --- a/physics_lists/hadronic/LHEP_PRECO/src/HadronPhysicsLHEP_PRECO.cc +++ b/source/physics_lists/lists/src/HadronPhysicsLHEP_PRECO.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsLHEP_PRECO.cc,v 1.5 2006/06/29 17:57:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsLHEP_PRECO.cc,v 1.1 2006/10/31 11:35:10 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_PRECO_HP/src/HadronPhysicsLHEP_PRECO_HP.cc b/source/physics_lists/lists/src/HadronPhysicsLHEP_PRECO_HP.cc similarity index 97% rename from physics_lists/hadronic/LHEP_PRECO_HP/src/HadronPhysicsLHEP_PRECO_HP.cc rename to source/physics_lists/lists/src/HadronPhysicsLHEP_PRECO_HP.cc index 77c74b9c84..4f135910aa 100644 --- a/physics_lists/hadronic/LHEP_PRECO_HP/src/HadronPhysicsLHEP_PRECO_HP.cc +++ b/source/physics_lists/lists/src/HadronPhysicsLHEP_PRECO_HP.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsLHEP_PRECO_HP.cc,v 1.5 2006/06/29 17:57:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsLHEP_PRECO_HP.cc,v 1.1 2006/10/31 11:35:11 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/QGSC/src/HadronPhysicsQGSC.cc b/source/physics_lists/lists/src/HadronPhysicsQGSC.cc similarity index 97% rename from physics_lists/hadronic/QGSC/src/HadronPhysicsQGSC.cc rename to source/physics_lists/lists/src/HadronPhysicsQGSC.cc index 9096fc73e4..0043e96183 100644 --- a/physics_lists/hadronic/QGSC/src/HadronPhysicsQGSC.cc +++ b/source/physics_lists/lists/src/HadronPhysicsQGSC.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsQGSC.cc,v 1.4 2006/06/29 18:03:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsQGSC.cc,v 1.1 2006/10/31 11:35:11 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LHEP_GN/src/HadronPhysicsLHEP_GN.cc b/source/physics_lists/lists/src/HadronPhysicsQGSC_EFLOW.cc similarity index 69% rename from physics_lists/hadronic/LHEP_GN/src/HadronPhysicsLHEP_GN.cc rename to source/physics_lists/lists/src/HadronPhysicsQGSC_EFLOW.cc index 026787cef1..49edfcb57a 100644 --- a/physics_lists/hadronic/LHEP_GN/src/HadronPhysicsLHEP_GN.cc +++ b/source/physics_lists/lists/src/HadronPhysicsQGSC_EFLOW.cc @@ -23,53 +23,25 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsLHEP_GN.cc,v 1.4 2006/06/29 17:56:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsQGSC_EFLOW.cc,v 1.1 2006/12/05 17:03:32 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // -// ClassName: HadronPhysicsLHEP_GN +// ClassName: HadronPhysicsQGSC_EFLOW // -// Author: 2002 J.P. Wellisch +// Author: 2006 Gunter Folger // +// Created from HadronPhysicsQGSC // Modified: -// 1.12.2005 G.Folger: don't keep processes as data members, but new these -// 08.06.2006 V.Ivanchenko: remove stopping // //---------------------------------------------------------------------------- - -#include "HadronPhysicsLHEP_GN.hh" +// +#include "HadronPhysicsQGSC_EFLOW.hh" #include "globals.hh" #include "G4ios.hh" #include - -HadronPhysicsLHEP_GN::HadronPhysicsLHEP_GN(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -void HadronPhysicsLHEP_GN::CreateModels() -{ - theNeutrons=new G4NeutronBuilder; - theNeutrons->RegisterMe(theLHEPNeutron=new G4LHEPNeutronBuilder); - - thePro=new G4ProtonBuilder; - thePro->RegisterMe(theLHEPPro=new G4LHEPProtonBuilder); - - thePiK=new G4PiKBuilder; - thePiK->RegisterMe(theLHEPPiK=new G4LHEPPiKBuilder); -} - -HadronPhysicsLHEP_GN::~HadronPhysicsLHEP_GN() -{ - delete theLHEPNeutron; - delete theNeutrons; - delete theLHEPPro; - delete thePro; - delete theLHEPPiK; - delete thePiK; -} - #include "G4ParticleDefinition.hh" #include "G4ParticleTable.hh" @@ -77,7 +49,45 @@ HadronPhysicsLHEP_GN::~HadronPhysicsLHEP_GN() #include "G4BaryonConstructor.hh" #include "G4ShortLivedConstructor.hh" -void HadronPhysicsLHEP_GN::ConstructParticle() +HadronPhysicsQGSC_EFLOW::HadronPhysicsQGSC_EFLOW(const G4String& name) + : G4VPhysicsConstructor(name) +{} + +void HadronPhysicsQGSC_EFLOW::CreateModels() +{ + theNeutrons=new G4NeutronBuilder; + theNeutrons->RegisterMe(theQGSCEflowNeutron=new G4QGSCEflowNeutronBuilder); + theNeutrons->RegisterMe(theLEPNeutron=new G4LEPNeutronBuilder); + theLEPNeutron->SetMaxInelasticEnergy(25*GeV); + + thePro=new G4ProtonBuilder; + thePro->RegisterMe(theQGSCEflowPro=new G4QGSCEflowProtonBuilder); + thePro->RegisterMe(theLEPPro=new G4LEPProtonBuilder); + theLEPPro->SetMaxEnergy(25*GeV); + + thePiK=new G4PiKBuilder; + thePiK->RegisterMe(theQGSCEflowPiK=new G4QGSCEflowPiKBuilder); + thePiK->RegisterMe(theLEPPiK=new G4LEPPiKBuilder); + theLEPPiK->SetMaxEnergy(25*GeV); + + theMiscLHEP=new G4MiscLHEPBuilder; +} + +HadronPhysicsQGSC_EFLOW::~HadronPhysicsQGSC_EFLOW() +{ + delete theMiscLHEP; + delete theQGSCEflowNeutron; + delete theLEPNeutron; + delete theNeutrons; + delete theQGSCEflowPro; + delete theLEPPro; + delete thePro; + delete theQGSCEflowPiK; + delete theLEPPiK; + delete thePiK; +} + +void HadronPhysicsQGSC_EFLOW::ConstructParticle() { G4MesonConstructor pMesonConstructor; pMesonConstructor.ConstructParticle(); @@ -87,12 +97,10 @@ void HadronPhysicsLHEP_GN::ConstructParticle() G4ShortLivedConstructor pShortLivedConstructor; pShortLivedConstructor.ConstructParticle(); - - theMiscLHEP=new G4MiscLHEPBuilder; } #include "G4ProcessManager.hh" -void HadronPhysicsLHEP_GN::ConstructProcess() +void HadronPhysicsQGSC_EFLOW::ConstructProcess() { CreateModels(); theNeutrons->Build(); @@ -100,4 +108,4 @@ void HadronPhysicsLHEP_GN::ConstructProcess() thePiK->Build(); theMiscLHEP->Build(); } -// 2002 by J.P. Wellisch + diff --git a/physics_lists/hadronic/QGSP_GN/src/HadronPhysicsQGSP_GN.cc b/source/physics_lists/lists/src/HadronPhysicsQGSC_EMV.cc similarity index 77% rename from physics_lists/hadronic/QGSP_GN/src/HadronPhysicsQGSP_GN.cc rename to source/physics_lists/lists/src/HadronPhysicsQGSC_EMV.cc index 8e7f7bf921..81479c5603 100644 --- a/physics_lists/hadronic/QGSP_GN/src/HadronPhysicsQGSP_GN.cc +++ b/source/physics_lists/lists/src/HadronPhysicsQGSC_EMV.cc @@ -23,22 +23,21 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// -// $Id: HadronPhysicsQGSP_GN.cc,v 1.2 2006/06/29 18:04:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsQGSC_EMV.cc,v 1.1 2006/11/24 15:49:10 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // -// ClassName: HadronPhysicsQGSP_GN +// ClassName: HadronPhysicsQGSC_EMV // -// Author: 2002 J.P. Wellisch +// Author: 2006 G.Folger // +// Created as copy of HadronPhysicsQGSC // Modified: -// 21.11.2005 G.Folger: migration to non static particles -// 08.06.2006 V.Ivanchenko: remove stopping // - -#include "HadronPhysicsQGSP_GN.hh" +//---------------------------------------------------------------------------- +// +#include "HadronPhysicsQGSC_EMV.hh" #include "globals.hh" #include "G4ios.hh" @@ -50,43 +49,42 @@ #include "G4BaryonConstructor.hh" #include "G4ShortLivedConstructor.hh" -HadronPhysicsQGSP_GN::HadronPhysicsQGSP_GN(const G4String& name) +HadronPhysicsQGSC_EMV::HadronPhysicsQGSC_EMV(const G4String& name) : G4VPhysicsConstructor(name) {} -void HadronPhysicsQGSP_GN::CreateModels() +void HadronPhysicsQGSC_EMV::CreateModels() { theNeutrons=new G4NeutronBuilder; - theNeutrons->RegisterMe(theQGSPNeutron=new G4QGSPNeutronBuilder); + theNeutrons->RegisterMe(theQGSCNeutron=new G4QGSCNeutronBuilder); theNeutrons->RegisterMe(theLEPNeutron=new G4LEPNeutronBuilder); - theLEPNeutron->SetMaxInelasticEnergy(25*GeV); + theLEPNeutron->SetMaxInelasticEnergy(25*GeV); thePro=new G4ProtonBuilder; - thePro->RegisterMe(theQGSPPro=new G4QGSPProtonBuilder); + thePro->RegisterMe(theQGSCPro=new G4QGSCProtonBuilder); thePro->RegisterMe(theLEPPro=new G4LEPProtonBuilder); theLEPPro->SetMaxEnergy(25*GeV); - + thePiK=new G4PiKBuilder; - thePiK->RegisterMe(theQGSPPiK=new G4QGSPPiKBuilder); + thePiK->RegisterMe(theQGSCPiK=new G4QGSCPiKBuilder); thePiK->RegisterMe(theLEPPiK=new G4LEPPiKBuilder); theLEPPiK->SetMaxEnergy(25*GeV); theMiscLHEP=new G4MiscLHEPBuilder; } -HadronPhysicsQGSP_GN::~HadronPhysicsQGSP_GN() +HadronPhysicsQGSC_EMV::~HadronPhysicsQGSC_EMV() { delete theMiscLHEP; - delete theQGSPPro; + delete theQGSCPro; delete theLEPPro; delete thePro; - delete theQGSPPiK; + delete theQGSCPiK; delete theLEPPiK; delete thePiK; } - -void HadronPhysicsQGSP_GN::ConstructParticle() +void HadronPhysicsQGSC_EMV::ConstructParticle() { G4MesonConstructor pMesonConstructor; pMesonConstructor.ConstructParticle(); @@ -99,7 +97,7 @@ void HadronPhysicsQGSP_GN::ConstructParticle() } #include "G4ProcessManager.hh" -void HadronPhysicsQGSP_GN::ConstructProcess() +void HadronPhysicsQGSC_EMV::ConstructProcess() { CreateModels(); theNeutrons->Build(); diff --git a/physics_lists/hadronic/QGSC_LEAD/src/HadronPhysicsQGSC_LEAD.cc b/source/physics_lists/lists/src/HadronPhysicsQGSC_LEAD.cc similarity index 97% rename from physics_lists/hadronic/QGSC_LEAD/src/HadronPhysicsQGSC_LEAD.cc rename to source/physics_lists/lists/src/HadronPhysicsQGSC_LEAD.cc index 4ef91ab09b..a7433be1a5 100644 --- a/physics_lists/hadronic/QGSC_LEAD/src/HadronPhysicsQGSC_LEAD.cc +++ b/source/physics_lists/lists/src/HadronPhysicsQGSC_LEAD.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsQGSC_LEAD.cc,v 1.5 2006/06/29 18:03:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsQGSC_LEAD.cc,v 1.1 2006/10/31 11:35:11 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/QGSC_LEAD_HP/src/HadronPhysicsQGSC_LEAD_HP.cc b/source/physics_lists/lists/src/HadronPhysicsQGSC_LEAD_HP.cc similarity index 97% rename from physics_lists/hadronic/QGSC_LEAD_HP/src/HadronPhysicsQGSC_LEAD_HP.cc rename to source/physics_lists/lists/src/HadronPhysicsQGSC_LEAD_HP.cc index bf4ac38f8c..b0fc4d6f24 100644 --- a/physics_lists/hadronic/QGSC_LEAD_HP/src/HadronPhysicsQGSC_LEAD_HP.cc +++ b/source/physics_lists/lists/src/HadronPhysicsQGSC_LEAD_HP.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsQGSC_LEAD_HP.cc,v 1.6 2006/06/29 18:03:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsQGSC_LEAD_HP.cc,v 1.1 2006/10/31 11:35:11 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/QGSP/src/HadronPhysicsQGSP.cc b/source/physics_lists/lists/src/HadronPhysicsQGSP.cc similarity index 97% rename from physics_lists/hadronic/QGSP/src/HadronPhysicsQGSP.cc rename to source/physics_lists/lists/src/HadronPhysicsQGSP.cc index 0dcf4eeed2..452552b8f4 100644 --- a/physics_lists/hadronic/QGSP/src/HadronPhysicsQGSP.cc +++ b/source/physics_lists/lists/src/HadronPhysicsQGSP.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: HadronPhysicsQGSP.cc,v 1.4 2006/06/29 18:03:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsQGSP.cc,v 1.1 2006/10/31 11:35:11 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/QGSP_BERT/src/HadronPhysicsQGSP_BERT.cc b/source/physics_lists/lists/src/HadronPhysicsQGSP_BERT.cc similarity index 97% rename from physics_lists/hadronic/QGSP_BERT/src/HadronPhysicsQGSP_BERT.cc rename to source/physics_lists/lists/src/HadronPhysicsQGSP_BERT.cc index a8a0524c56..8b294baf29 100644 --- a/physics_lists/hadronic/QGSP_BERT/src/HadronPhysicsQGSP_BERT.cc +++ b/source/physics_lists/lists/src/HadronPhysicsQGSP_BERT.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsQGSP_BERT.cc,v 1.5 2006/06/29 18:04:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsQGSP_BERT.cc,v 1.1 2006/10/31 11:35:11 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/QGSP_BERT_HP/src/HadronPhysicsQGSP_BERT_HP.cc b/source/physics_lists/lists/src/HadronPhysicsQGSP_BERT_HP.cc similarity index 97% rename from physics_lists/hadronic/QGSP_BERT_HP/src/HadronPhysicsQGSP_BERT_HP.cc rename to source/physics_lists/lists/src/HadronPhysicsQGSP_BERT_HP.cc index 34c70df31a..4adfc66756 100644 --- a/physics_lists/hadronic/QGSP_BERT_HP/src/HadronPhysicsQGSP_BERT_HP.cc +++ b/source/physics_lists/lists/src/HadronPhysicsQGSP_BERT_HP.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsQGSP_BERT_HP.cc,v 1.5 2006/06/29 18:04:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsQGSP_BERT_HP.cc,v 1.1 2006/10/31 11:35:11 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/QGSP_BIC/src/HadronPhysicsQGSP_BIC.cc b/source/physics_lists/lists/src/HadronPhysicsQGSP_BIC.cc similarity index 97% rename from physics_lists/hadronic/QGSP_BIC/src/HadronPhysicsQGSP_BIC.cc rename to source/physics_lists/lists/src/HadronPhysicsQGSP_BIC.cc index 8d4110efc7..1b8ef551eb 100644 --- a/physics_lists/hadronic/QGSP_BIC/src/HadronPhysicsQGSP_BIC.cc +++ b/source/physics_lists/lists/src/HadronPhysicsQGSP_BIC.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsQGSP_BIC.cc,v 1.5 2006/06/29 18:04:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsQGSP_BIC.cc,v 1.1 2006/10/31 11:35:11 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/source/physics_lists/lists/src/HadronPhysicsQGSP_BIC_HP.cc b/source/physics_lists/lists/src/HadronPhysicsQGSP_BIC_HP.cc new file mode 100644 index 0000000000..af575e7a3f --- /dev/null +++ b/source/physics_lists/lists/src/HadronPhysicsQGSP_BIC_HP.cc @@ -0,0 +1,127 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: HadronPhysicsQGSP_BIC_HP.cc,v 1.2 2006/11/24 16:33:23 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +//--------------------------------------------------------------------------- +// +// ClassName: HadronPhysicsQGSP_BIC_HP +// +// Author: 2006 G.Folger +// +// Based on HadronPhysicsQGSP_BIC +// +// Modified: +// +//---------------------------------------------------------------------------- +// +#include "HadronPhysicsQGSP_BIC_HP.hh" + +#include "globals.hh" +#include "G4ios.hh" +#include +#include "G4ParticleDefinition.hh" +#include "G4ParticleTable.hh" + +#include "G4MesonConstructor.hh" +#include "G4BaryonConstructor.hh" +#include "G4ShortLivedConstructor.hh" + +HadronPhysicsQGSP_BIC_HP::HadronPhysicsQGSP_BIC_HP(const G4String& name) + : G4VPhysicsConstructor(name) +{} + +void HadronPhysicsQGSP_BIC_HP::CreateModels() +{ + theNeutrons=new G4NeutronBuilder; + + theNeutrons->RegisterMe(theQGSPNeutron=new G4QGSPNeutronBuilder); + theNeutrons->RegisterMe(theLEPNeutron=new G4LEPNeutronBuilder); + theLEPNeutron->SetMinEnergy(19.9*MeV); + theLEPNeutron->SetMinInelasticEnergy(9.5*GeV); + theLEPNeutron->SetMaxInelasticEnergy(25*GeV); + + theNeutrons->RegisterMe(theBinaryNeutron=new G4BinaryNeutronBuilder); + theBinaryNeutron->SetMinEnergy(19.9*MeV); + theBinaryNeutron->SetMaxEnergy(9.9*GeV); + + theNeutrons->RegisterMe(theHPNeutron=new G4NeutronHPBuilder); + + thePro=new G4ProtonBuilder; + thePro->RegisterMe(theQGSPPro=new G4QGSPProtonBuilder); + thePro->RegisterMe(theLEPPro=new G4LEPProtonBuilder); + theLEPPro->SetMinEnergy(9.5*GeV); + theLEPPro->SetMaxEnergy(25*GeV); + + thePro->RegisterMe(theBinaryPro=new G4BinaryProtonBuilder); + theBinaryPro->SetMaxEnergy(9.9*GeV); + + thePiK=new G4PiKBuilder; + thePiK->RegisterMe(theQGSPPiK=new G4QGSPPiKBuilder); + thePiK->RegisterMe(theLEPPiK=new G4LEPPiKBuilder); + theLEPPiK->SetMaxEnergy(25*GeV); + + theMiscLHEP=new G4MiscLHEPBuilder; +} + +HadronPhysicsQGSP_BIC_HP::~HadronPhysicsQGSP_BIC_HP() +{ + delete theMiscLHEP; + delete theQGSPNeutron; + delete theLEPNeutron; + delete theBinaryNeutron; + delete theHPNeutron; + delete theQGSPPro; + delete theLEPPro; + delete thePro; + delete theBinaryPro; + delete theQGSPPiK; + delete theLEPPiK; + delete thePiK; +} + +void HadronPhysicsQGSP_BIC_HP::ConstructParticle() +{ + G4MesonConstructor pMesonConstructor; + pMesonConstructor.ConstructParticle(); + + G4BaryonConstructor pBaryonConstructor; + pBaryonConstructor.ConstructParticle(); + + G4ShortLivedConstructor pShortLivedConstructor; + pShortLivedConstructor.ConstructParticle(); +} + +#include "G4ProcessManager.hh" +void HadronPhysicsQGSP_BIC_HP::ConstructProcess() +{ + CreateModels(); + theNeutrons->Build(); + thePro->Build(); + thePiK->Build(); + theMiscLHEP->Build(); +} + diff --git a/physics_lists/hadronic/QGSP_EMV/src/HadronPhysicsQGSP_EMV.cc b/source/physics_lists/lists/src/HadronPhysicsQGSP_EMV.cc similarity index 97% rename from physics_lists/hadronic/QGSP_EMV/src/HadronPhysicsQGSP_EMV.cc rename to source/physics_lists/lists/src/HadronPhysicsQGSP_EMV.cc index 60000c5ff7..58b36beeef 100644 --- a/physics_lists/hadronic/QGSP_EMV/src/HadronPhysicsQGSP_EMV.cc +++ b/source/physics_lists/lists/src/HadronPhysicsQGSP_EMV.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: HadronPhysicsQGSP_EMV.cc,v 1.3 2006/06/29 18:04:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsQGSP_EMV.cc,v 1.1 2006/10/31 11:35:11 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/QGSP_EMX/src/HadronPhysicsQGSP_EMX.cc b/source/physics_lists/lists/src/HadronPhysicsQGSP_EMX.cc similarity index 97% rename from physics_lists/hadronic/QGSP_EMX/src/HadronPhysicsQGSP_EMX.cc rename to source/physics_lists/lists/src/HadronPhysicsQGSP_EMX.cc index 4bf0579afb..a188fe3ec8 100644 --- a/physics_lists/hadronic/QGSP_EMX/src/HadronPhysicsQGSP_EMX.cc +++ b/source/physics_lists/lists/src/HadronPhysicsQGSP_EMX.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: HadronPhysicsQGSP_EMX.cc,v 1.2 2006/06/29 18:04:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsQGSP_EMX.cc,v 1.1 2006/10/31 11:35:11 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/QGSP_HP/src/HadronPhysicsQGSP_HP.cc b/source/physics_lists/lists/src/HadronPhysicsQGSP_HP.cc similarity index 97% rename from physics_lists/hadronic/QGSP_HP/src/HadronPhysicsQGSP_HP.cc rename to source/physics_lists/lists/src/HadronPhysicsQGSP_HP.cc index 6f8f8f01b9..5317dd1511 100644 --- a/physics_lists/hadronic/QGSP_HP/src/HadronPhysicsQGSP_HP.cc +++ b/source/physics_lists/lists/src/HadronPhysicsQGSP_HP.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: HadronPhysicsQGSP_HP.cc,v 1.4 2006/06/29 18:05:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: HadronPhysicsQGSP_HP.cc,v 1.1 2006/10/31 11:35:11 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/physics_lists/hadronic/LBE/src/MaxTimeCuts.cc b/source/physics_lists/lists/src/MaxTimeCuts.cc similarity index 100% rename from physics_lists/hadronic/LBE/src/MaxTimeCuts.cc rename to source/physics_lists/lists/src/MaxTimeCuts.cc diff --git a/physics_lists/hadronic/LBE/src/MinEkineCuts.cc b/source/physics_lists/lists/src/MinEkineCuts.cc similarity index 99% rename from physics_lists/hadronic/LBE/src/MinEkineCuts.cc rename to source/physics_lists/lists/src/MinEkineCuts.cc index 719295006e..ca111dd19d 100644 --- a/physics_lists/hadronic/LBE/src/MinEkineCuts.cc +++ b/source/physics_lists/lists/src/MinEkineCuts.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/physics_lists/hadronic/LBE/src/SpecialCuts.cc b/source/physics_lists/lists/src/SpecialCuts.cc similarity index 100% rename from physics_lists/hadronic/LBE/src/SpecialCuts.cc rename to source/physics_lists/lists/src/SpecialCuts.cc diff --git a/source/processes/GNUmakefile b/source/processes/GNUmakefile index 05f466c2b8..9fdfec7cf7 100644 --- a/source/processes/GNUmakefile +++ b/source/processes/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.31 2004/11/30 08:30:14 gcosmo Exp $ +# $Id: GNUmakefile,v 1.34 2006/12/05 15:54:43 gcosmo Exp $ # ---------------------------------------------------------------------- # GNUmakefile for processes library, Gabriele Cosmo 27-Jun-1998 # ---------------------------------------------------------------------- @@ -9,6 +9,7 @@ SUBDIRS = management SUBDIRS += cuts SUBDIRS += optical SUBDIRS += decay +SUBDIRS += scoring SUBDIRS += transportation SUBDIRS += parameterisation SUBDIRS += electromagnetic/muons @@ -17,11 +18,13 @@ SUBDIRS += electromagnetic/utils SUBDIRS += electromagnetic/xrays SUBDIRS += electromagnetic/lowenergy SUBDIRS += electromagnetic/highenergy +SUBDIRS += electromagnetic/polarisation SUBLIBS = G4procman SUBLIBS += G4cuts SUBLIBS += G4optical -SUBLIBS += G4decay +SUBLIBS += G4decay +SUBLIBS += G4scoring SUBLIBS += G4transportation SUBLIBS += G4parameterisation SUBLIBS += G4muons @@ -30,8 +33,9 @@ SUBLIBS += G4emutils SUBLIBS += G4xrays SUBLIBS += G4emlowenergy SUBLIBS += G4emhighenergy +SUBLIBS += G4empolar -GLOBLIBS = libG4track.lib libG4particles.lib libG4geometry.lib +GLOBLIBS = libG4digits_hits.lib libG4track.lib libG4particles.lib libG4geometry.lib GLOBLIBS += libG4materials.lib libG4graphics_reps.lib GLOBLIBS += libG4intercoms.lib libG4global.lib diff --git a/source/processes/cuts/include/G4MCCIndexConversionTable.hh b/source/processes/cuts/include/G4MCCIndexConversionTable.hh index e6fc5000c7..67568743a0 100644 --- a/source/processes/cuts/include/G4MCCIndexConversionTable.hh +++ b/source/processes/cuts/include/G4MCCIndexConversionTable.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4MCCIndexConversionTable.hh,v 1.3 2006/06/29 19:29:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/processes/cuts/include/G4MaterialCutsCouple.hh b/source/processes/cuts/include/G4MaterialCutsCouple.hh index 886cbe2d39..f7d4c703a9 100644 --- a/source/processes/cuts/include/G4MaterialCutsCouple.hh +++ b/source/processes/cuts/include/G4MaterialCutsCouple.hh @@ -25,7 +25,7 @@ // // // $Id: G4MaterialCutsCouple.hh,v 1.3 2006/06/29 19:29:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/processes/cuts/include/G4PhysicsTableHelper.hh b/source/processes/cuts/include/G4PhysicsTableHelper.hh index 0148d2b6c0..198e9e60b2 100644 --- a/source/processes/cuts/include/G4PhysicsTableHelper.hh +++ b/source/processes/cuts/include/G4PhysicsTableHelper.hh @@ -25,7 +25,7 @@ // // // $Id: G4PhysicsTableHelper.hh,v 1.3 2006/06/29 19:29:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/processes/cuts/include/G4ProductionCuts.hh b/source/processes/cuts/include/G4ProductionCuts.hh index 0eaff055d2..5ff6143321 100644 --- a/source/processes/cuts/include/G4ProductionCuts.hh +++ b/source/processes/cuts/include/G4ProductionCuts.hh @@ -25,7 +25,7 @@ // // // $Id: G4ProductionCuts.hh,v 1.4 2006/06/29 19:29:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/processes/cuts/include/G4ProductionCutsTable.hh b/source/processes/cuts/include/G4ProductionCutsTable.hh index a7c81596f0..0c2359f08f 100644 --- a/source/processes/cuts/include/G4ProductionCutsTable.hh +++ b/source/processes/cuts/include/G4ProductionCutsTable.hh @@ -25,7 +25,7 @@ // // // $Id: G4ProductionCutsTable.hh,v 1.7 2006/06/29 19:29:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/processes/cuts/include/G4RToEConvForAntiNeutron.hh b/source/processes/cuts/include/G4RToEConvForAntiNeutron.hh index a4361f62a9..6a19174e21 100644 --- a/source/processes/cuts/include/G4RToEConvForAntiNeutron.hh +++ b/source/processes/cuts/include/G4RToEConvForAntiNeutron.hh @@ -25,7 +25,7 @@ // // // $Id: G4RToEConvForAntiNeutron.hh,v 1.2 2006/06/29 19:29:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/processes/cuts/include/G4RToEConvForAntiProton.hh b/source/processes/cuts/include/G4RToEConvForAntiProton.hh index 4319c87337..2c86f792f6 100644 --- a/source/processes/cuts/include/G4RToEConvForAntiProton.hh +++ b/source/processes/cuts/include/G4RToEConvForAntiProton.hh @@ -25,7 +25,7 @@ // // // $Id: G4RToEConvForAntiProton.hh,v 1.2 2006/06/29 19:29:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/processes/cuts/include/G4RToEConvForElectron.hh b/source/processes/cuts/include/G4RToEConvForElectron.hh index fa460c21a5..dc63aab9f6 100644 --- a/source/processes/cuts/include/G4RToEConvForElectron.hh +++ b/source/processes/cuts/include/G4RToEConvForElectron.hh @@ -25,7 +25,7 @@ // // // $Id: G4RToEConvForElectron.hh,v 1.2 2006/06/29 19:29:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/processes/cuts/include/G4RToEConvForGamma.hh b/source/processes/cuts/include/G4RToEConvForGamma.hh index a459dedbde..88b28cb377 100644 --- a/source/processes/cuts/include/G4RToEConvForGamma.hh +++ b/source/processes/cuts/include/G4RToEConvForGamma.hh @@ -25,7 +25,7 @@ // // // $Id: G4RToEConvForGamma.hh,v 1.2 2006/06/29 19:29:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/processes/cuts/include/G4RToEConvForNeutron.hh b/source/processes/cuts/include/G4RToEConvForNeutron.hh index b135f0d08e..6a4b10e9d8 100644 --- a/source/processes/cuts/include/G4RToEConvForNeutron.hh +++ b/source/processes/cuts/include/G4RToEConvForNeutron.hh @@ -25,7 +25,7 @@ // // // $Id: G4RToEConvForNeutron.hh,v 1.2 2006/06/29 19:30:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/processes/cuts/include/G4RToEConvForPositron.hh b/source/processes/cuts/include/G4RToEConvForPositron.hh index 5e27691648..66d2d6e212 100644 --- a/source/processes/cuts/include/G4RToEConvForPositron.hh +++ b/source/processes/cuts/include/G4RToEConvForPositron.hh @@ -25,7 +25,7 @@ // // // $Id: G4RToEConvForPositron.hh,v 1.2 2006/06/29 19:30:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/processes/cuts/include/G4RToEConvForProton.hh b/source/processes/cuts/include/G4RToEConvForProton.hh index b4bf068ab5..bdf0c718fe 100644 --- a/source/processes/cuts/include/G4RToEConvForProton.hh +++ b/source/processes/cuts/include/G4RToEConvForProton.hh @@ -25,7 +25,7 @@ // // // $Id: G4RToEConvForProton.hh,v 1.2 2006/06/29 19:30:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/processes/cuts/include/G4VRangeToEnergyConverter.hh b/source/processes/cuts/include/G4VRangeToEnergyConverter.hh index 82a37d02fe..559b760acf 100644 --- a/source/processes/cuts/include/G4VRangeToEnergyConverter.hh +++ b/source/processes/cuts/include/G4VRangeToEnergyConverter.hh @@ -25,7 +25,7 @@ // // // $Id: G4VRangeToEnergyConverter.hh,v 1.4 2006/06/29 19:30:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/processes/cuts/src/G4MCCIndexConversionTable.cc b/source/processes/cuts/src/G4MCCIndexConversionTable.cc index 7e309a4b70..41babc82d3 100644 --- a/source/processes/cuts/src/G4MCCIndexConversionTable.cc +++ b/source/processes/cuts/src/G4MCCIndexConversionTable.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4MCCIndexConversionTable.cc,v 1.3 2006/06/29 19:30:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/processes/cuts/src/G4MaterialCutsCouple.cc b/source/processes/cuts/src/G4MaterialCutsCouple.cc index 254a81c403..89c1ce67dd 100644 --- a/source/processes/cuts/src/G4MaterialCutsCouple.cc +++ b/source/processes/cuts/src/G4MaterialCutsCouple.cc @@ -25,7 +25,7 @@ // // // $Id: G4MaterialCutsCouple.cc,v 1.3 2006/06/29 19:30:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/processes/cuts/src/G4PhysicsTableHelper.cc b/source/processes/cuts/src/G4PhysicsTableHelper.cc index 24ed482438..2209205b9a 100644 --- a/source/processes/cuts/src/G4PhysicsTableHelper.cc +++ b/source/processes/cuts/src/G4PhysicsTableHelper.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4PhysicsTableHelper.cc,v 1.5 2006/06/29 19:30:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/processes/cuts/src/G4ProductionCuts.cc b/source/processes/cuts/src/G4ProductionCuts.cc index 075133a361..290f26b96d 100644 --- a/source/processes/cuts/src/G4ProductionCuts.cc +++ b/source/processes/cuts/src/G4ProductionCuts.cc @@ -25,7 +25,7 @@ // // // $Id: G4ProductionCuts.cc,v 1.5 2006/06/29 19:30:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/processes/cuts/src/G4ProductionCutsTable.cc b/source/processes/cuts/src/G4ProductionCutsTable.cc index 1a61b3d864..b3fe1b5f1d 100644 --- a/source/processes/cuts/src/G4ProductionCutsTable.cc +++ b/source/processes/cuts/src/G4ProductionCutsTable.cc @@ -25,7 +25,7 @@ // // // $Id: G4ProductionCutsTable.cc,v 1.15 2006/06/29 19:30:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/processes/cuts/src/G4RToEConvForAntiNeutron.cc b/source/processes/cuts/src/G4RToEConvForAntiNeutron.cc index 3de1e05a1f..666e1d6f6f 100644 --- a/source/processes/cuts/src/G4RToEConvForAntiNeutron.cc +++ b/source/processes/cuts/src/G4RToEConvForAntiNeutron.cc @@ -25,7 +25,7 @@ // // // $Id: G4RToEConvForAntiNeutron.cc,v 1.3 2006/06/29 19:30:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/processes/cuts/src/G4RToEConvForAntiProton.cc b/source/processes/cuts/src/G4RToEConvForAntiProton.cc index 6b00b6fc72..3831d95109 100644 --- a/source/processes/cuts/src/G4RToEConvForAntiProton.cc +++ b/source/processes/cuts/src/G4RToEConvForAntiProton.cc @@ -25,7 +25,7 @@ // // // $Id: G4RToEConvForAntiProton.cc,v 1.3 2006/06/29 19:30:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/processes/cuts/src/G4RToEConvForElectron.cc b/source/processes/cuts/src/G4RToEConvForElectron.cc index 10ea045343..5d49fa0e89 100644 --- a/source/processes/cuts/src/G4RToEConvForElectron.cc +++ b/source/processes/cuts/src/G4RToEConvForElectron.cc @@ -25,7 +25,7 @@ // // // $Id: G4RToEConvForElectron.cc,v 1.5 2006/06/29 19:30:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/processes/cuts/src/G4RToEConvForGamma.cc b/source/processes/cuts/src/G4RToEConvForGamma.cc index 1c930a383f..7f6d263156 100644 --- a/source/processes/cuts/src/G4RToEConvForGamma.cc +++ b/source/processes/cuts/src/G4RToEConvForGamma.cc @@ -25,7 +25,7 @@ // // // $Id: G4RToEConvForGamma.cc,v 1.4 2006/06/29 19:30:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/processes/cuts/src/G4RToEConvForNeutron.cc b/source/processes/cuts/src/G4RToEConvForNeutron.cc index 157069ee96..94a205087f 100644 --- a/source/processes/cuts/src/G4RToEConvForNeutron.cc +++ b/source/processes/cuts/src/G4RToEConvForNeutron.cc @@ -25,7 +25,7 @@ // // // $Id: G4RToEConvForNeutron.cc,v 1.3 2006/06/29 19:30:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/processes/cuts/src/G4RToEConvForPositron.cc b/source/processes/cuts/src/G4RToEConvForPositron.cc index 280a50d2a0..548fd77c33 100644 --- a/source/processes/cuts/src/G4RToEConvForPositron.cc +++ b/source/processes/cuts/src/G4RToEConvForPositron.cc @@ -25,7 +25,7 @@ // // // $Id: G4RToEConvForPositron.cc,v 1.5 2006/06/29 19:30:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/processes/cuts/src/G4RToEConvForProton.cc b/source/processes/cuts/src/G4RToEConvForProton.cc index f2f46c10f4..49435e3eba 100644 --- a/source/processes/cuts/src/G4RToEConvForProton.cc +++ b/source/processes/cuts/src/G4RToEConvForProton.cc @@ -25,7 +25,7 @@ // // // $Id: G4RToEConvForProton.cc,v 1.3 2006/06/29 19:30:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/processes/cuts/src/G4VRangeToEnergyConverter.cc b/source/processes/cuts/src/G4VRangeToEnergyConverter.cc index 7a80391f68..b1a11aef20 100644 --- a/source/processes/cuts/src/G4VRangeToEnergyConverter.cc +++ b/source/processes/cuts/src/G4VRangeToEnergyConverter.cc @@ -25,7 +25,7 @@ // // // $Id: G4VRangeToEnergyConverter.cc,v 1.7 2006/06/29 19:30:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/processes/decay/include/G4Decay.hh b/source/processes/decay/include/G4Decay.hh index 3a4100c221..ed73f1f0af 100644 --- a/source/processes/decay/include/G4Decay.hh +++ b/source/processes/decay/include/G4Decay.hh @@ -25,7 +25,7 @@ // // // $Id: G4Decay.hh,v 1.15 2006/06/29 19:30:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/processes/decay/include/G4UnknownDecay.hh b/source/processes/decay/include/G4UnknownDecay.hh index 6ddd6d3f4e..f4a0506f63 100644 --- a/source/processes/decay/include/G4UnknownDecay.hh +++ b/source/processes/decay/include/G4UnknownDecay.hh @@ -25,7 +25,7 @@ // // // $Id: G4UnknownDecay.hh,v 1.3 2006/06/29 19:30:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/processes/decay/include/G4VExtDecayer.hh b/source/processes/decay/include/G4VExtDecayer.hh index f8573859a4..9fac516f80 100644 --- a/source/processes/decay/include/G4VExtDecayer.hh +++ b/source/processes/decay/include/G4VExtDecayer.hh @@ -25,7 +25,7 @@ // // // $Id: G4VExtDecayer.hh,v 1.4 2006/06/29 19:31:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/processes/decay/src/G4Decay.cc b/source/processes/decay/src/G4Decay.cc index ef707eb923..2718e64705 100644 --- a/source/processes/decay/src/G4Decay.cc +++ b/source/processes/decay/src/G4Decay.cc @@ -25,7 +25,7 @@ // // // $Id: G4Decay.cc,v 1.22 2006/06/29 19:31:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/processes/decay/src/G4UnknownDecay.cc b/source/processes/decay/src/G4UnknownDecay.cc index b5c38fa2fb..f48b3f35ea 100644 --- a/source/processes/decay/src/G4UnknownDecay.cc +++ b/source/processes/decay/src/G4UnknownDecay.cc @@ -25,7 +25,7 @@ // // // $Id: G4UnknownDecay.cc,v 1.3 2006/06/29 19:31:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/processes/electromagnetic/GNUmakefile b/source/processes/electromagnetic/GNUmakefile index 166d3b5ce2..f325baa112 100644 --- a/source/processes/electromagnetic/GNUmakefile +++ b/source/processes/electromagnetic/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.5 2004/11/30 08:26:54 gcosmo Exp $ +# $Id: GNUmakefile,v 1.6 2006/09/21 21:35:20 vnivanch Exp $ # ------------------------------------------------------------------ # GNUmakefile for electromagnetic library. Gabriele Cosmo, 18/9/96. # ------------------------------------------------------------------ @@ -7,8 +7,8 @@ MAKEFLAGS= --no-print-directory name := G4electromagnetic -SUBDIRS = muons standard utils xrays lowenergy highenergy -SUBLIBS = G4muons G4emstandard G4emutils G4xrays G4emlowenergy G4emhighenergy +SUBDIRS = muons standard utils xrays lowenergy highenergy polarisation +SUBLIBS = G4muons G4emstandard G4emutils G4xrays G4emlowenergy G4emhighenergy G4polar ifndef G4INSTALL G4INSTALL = ../../.. diff --git a/source/processes/electromagnetic/highenergy/History b/source/processes/electromagnetic/highenergy/History index 1bb4d88829..4f1bd6b009 100644 --- a/source/processes/electromagnetic/highenergy/History +++ b/source/processes/electromagnetic/highenergy/History @@ -1,4 +1,4 @@ -$Id: History,v 1.14 2006/02/15 16:38:52 vnivanch Exp $ +$Id: History,v 1.16 2006/10/27 14:11:12 vnivanch Exp $ ------------------------------------------------------------------- ========================================================= @@ -17,6 +17,11 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +25 October 06: V.Ivant (emhighenergy-V08-01-00) +- added G4mplIonisation and G4mplIonisationModel - ionisation for + classic magnetic monopole +- G4hhIonisation - add maxKinEnergy class member (100 TeV) + 15 February 05: V.Ivant (emhighenergy-V08-00-01) - added functions G4BraggModel::ComputeCrossSectionPerElectron/Atom() - added functions G4BraggIonModel::ComputeCrossSectionPerElectron/Atom() diff --git a/source/processes/electromagnetic/highenergy/include/G4AnnihiToMuPair.hh b/source/processes/electromagnetic/highenergy/include/G4AnnihiToMuPair.hh index 73c45ecc68..cf71d12bab 100644 --- a/source/processes/electromagnetic/highenergy/include/G4AnnihiToMuPair.hh +++ b/source/processes/electromagnetic/highenergy/include/G4AnnihiToMuPair.hh @@ -25,7 +25,7 @@ // // // $Id: G4AnnihiToMuPair.hh,v 1.2 2006/06/29 19:32:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------ G4AnnihiToMuPair physics process ------ // by H.Burkhardt, S. Kelner and R. Kokoulin, November 2002 diff --git a/source/processes/electromagnetic/highenergy/include/G4BetheBlochNoDeltaModel.hh b/source/processes/electromagnetic/highenergy/include/G4BetheBlochNoDeltaModel.hh index 0629e2da22..ea18f3b81b 100644 --- a/source/processes/electromagnetic/highenergy/include/G4BetheBlochNoDeltaModel.hh +++ b/source/processes/electromagnetic/highenergy/include/G4BetheBlochNoDeltaModel.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4BetheBlochNoDeltaModel.hh,v 1.7 2006/06/29 19:32:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/highenergy/include/G4BraggNoDeltaModel.hh b/source/processes/electromagnetic/highenergy/include/G4BraggNoDeltaModel.hh index 8c0283a76f..89906b5228 100644 --- a/source/processes/electromagnetic/highenergy/include/G4BraggNoDeltaModel.hh +++ b/source/processes/electromagnetic/highenergy/include/G4BraggNoDeltaModel.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4BraggNoDeltaModel.hh,v 1.6 2006/06/29 19:32:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/highenergy/include/G4GammaConversionToMuons.hh b/source/processes/electromagnetic/highenergy/include/G4GammaConversionToMuons.hh index 381814b53d..fcb7e585a9 100644 --- a/source/processes/electromagnetic/highenergy/include/G4GammaConversionToMuons.hh +++ b/source/processes/electromagnetic/highenergy/include/G4GammaConversionToMuons.hh @@ -25,7 +25,7 @@ // // // $Id: G4GammaConversionToMuons.hh,v 1.2 2006/06/29 19:32:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------ G4GammaConversionToMuons physics process ------ // by H.Burkhardt, S. Kelner and R. Kokoulin, April 2002 diff --git a/source/processes/electromagnetic/highenergy/include/G4Vee2hadrons.hh b/source/processes/electromagnetic/highenergy/include/G4Vee2hadrons.hh index cd344a4338..26ded80840 100644 --- a/source/processes/electromagnetic/highenergy/include/G4Vee2hadrons.hh +++ b/source/processes/electromagnetic/highenergy/include/G4Vee2hadrons.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4Vee2hadrons.hh,v 1.2 2006/06/29 19:32:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/highenergy/include/G4eeCrossSections.hh b/source/processes/electromagnetic/highenergy/include/G4eeCrossSections.hh index 64acf08b3b..c11d930468 100644 --- a/source/processes/electromagnetic/highenergy/include/G4eeCrossSections.hh +++ b/source/processes/electromagnetic/highenergy/include/G4eeCrossSections.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4eeCrossSections.hh,v 1.2 2006/06/29 19:32:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/highenergy/include/G4eeToHadrons.hh b/source/processes/electromagnetic/highenergy/include/G4eeToHadrons.hh index d25a58d8d8..c5e80dbfc0 100644 --- a/source/processes/electromagnetic/highenergy/include/G4eeToHadrons.hh +++ b/source/processes/electromagnetic/highenergy/include/G4eeToHadrons.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4eeToHadrons.hh,v 1.6 2006/06/29 19:32:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/highenergy/include/G4eeToHadronsModel.hh b/source/processes/electromagnetic/highenergy/include/G4eeToHadronsModel.hh index d5afaeffbc..9767b89575 100644 --- a/source/processes/electromagnetic/highenergy/include/G4eeToHadronsModel.hh +++ b/source/processes/electromagnetic/highenergy/include/G4eeToHadronsModel.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4eeToHadronsModel.hh,v 1.5 2006/06/29 19:32:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/highenergy/include/G4eeToHadronsMultiModel.hh b/source/processes/electromagnetic/highenergy/include/G4eeToHadronsMultiModel.hh index f66a000c95..5674cf93e6 100644 --- a/source/processes/electromagnetic/highenergy/include/G4eeToHadronsMultiModel.hh +++ b/source/processes/electromagnetic/highenergy/include/G4eeToHadronsMultiModel.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4eeToHadronsMultiModel.hh,v 1.3 2006/06/29 19:32:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/highenergy/include/G4eeToTwoPiModel.hh b/source/processes/electromagnetic/highenergy/include/G4eeToTwoPiModel.hh index 0dac34c8d1..6a339c3426 100644 --- a/source/processes/electromagnetic/highenergy/include/G4eeToTwoPiModel.hh +++ b/source/processes/electromagnetic/highenergy/include/G4eeToTwoPiModel.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4eeToTwoPiModel.hh,v 1.2 2006/06/29 19:32:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/highenergy/include/G4hhIonisation.hh b/source/processes/electromagnetic/highenergy/include/G4hhIonisation.hh index 10f1f2f4fc..40f2644f9b 100644 --- a/source/processes/electromagnetic/highenergy/include/G4hhIonisation.hh +++ b/source/processes/electromagnetic/highenergy/include/G4hhIonisation.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4hhIonisation.hh,v 1.2 2006/06/29 19:32:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4hhIonisation.hh,v 1.3 2006/10/27 14:11:12 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // @@ -96,6 +96,7 @@ private: G4double mass; G4double ratio; G4double minKinEnergy; + G4double maxKinEnergy; const G4ParticleDefinition* theParticle; const G4ParticleDefinition* theBaseParticle; diff --git a/source/processes/electromagnetic/highenergy/include/G4mplIonisation.hh b/source/processes/electromagnetic/highenergy/include/G4mplIonisation.hh new file mode 100644 index 0000000000..e94f899da3 --- /dev/null +++ b/source/processes/electromagnetic/highenergy/include/G4mplIonisation.hh @@ -0,0 +1,123 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4mplIonisation.hh,v 1.3 2006/12/13 15:44:20 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ------------------------------------------------------------------- +// +// GEANT4 Class header file +// +// +// File name: G4mplIonisation +// +// Author: Vladimir Ivanchenko +// +// Creation date: 25.08.2005 +// +// Modifications: +// +// +// Class Description: +// +// This class manages the ionisation process for a magnetic monopole +// it inherites from G4VContinuousDiscreteProcess via G4VEnergyLossProcess. +// Magnetic charge of the monopole should be defined in the constructor of +// the process, unless it is assumed that it is classic Dirac monopole with +// the charge 67.5*eplus. The name of the particle should be "monopole". +// + +// ------------------------------------------------------------------- +// + +#ifndef G4mplIonisation_h +#define G4mplIonisation_h 1 + +#include "G4VEnergyLossProcess.hh" +#include "globals.hh" +#include "G4VEmModel.hh" + +class G4Material; +class G4VEmFluctuationModel; + +class G4mplIonisation : public G4VEnergyLossProcess +{ + +public: + + G4mplIonisation(G4double mCharge = 0.0, const G4String& name = "mplIoni"); + + virtual ~G4mplIonisation(); + + G4bool IsApplicable(const G4ParticleDefinition& p); + + // Print out of the class parameters + virtual void PrintInfo(); + +protected: + + std::vector* SecondariesPostStep( + G4VEmModel*, + const G4MaterialCutsCouple*, + const G4DynamicParticle*, + G4double&); + + virtual void InitialiseEnergyLossProcess(const G4ParticleDefinition*, + const G4ParticleDefinition*); + +private: + + // hide assignment operator + G4mplIonisation & operator=(const G4mplIonisation &right); + G4mplIonisation(const G4mplIonisation&); + + G4double magneticCharge; + G4bool isInitialised; + +}; + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +inline G4bool G4mplIonisation::IsApplicable(const G4ParticleDefinition& p) +{ + return (p.GetParticleName() == "monopole"); +} + + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +inline std::vector* G4mplIonisation::SecondariesPostStep( + G4VEmModel*, + const G4MaterialCutsCouple*, + const G4DynamicParticle*, + G4double&) +{ + return 0; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +#endif diff --git a/source/processes/electromagnetic/highenergy/include/G4mplIonisationModel.hh b/source/processes/electromagnetic/highenergy/include/G4mplIonisationModel.hh new file mode 100644 index 0000000000..afd8a88240 --- /dev/null +++ b/source/processes/electromagnetic/highenergy/include/G4mplIonisationModel.hh @@ -0,0 +1,146 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4mplIonisationModel.hh,v 1.3 2006/12/13 15:44:22 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ------------------------------------------------------------------- +// +// GEANT4 Class header file +// +// +// File name: G4mplIonisationModel +// +// Author: Vladimir Ivanchenko +// +// Creation date: 06.09.2005 +// +// Modifications: +// +// +// Class Description: +// +// Implementation of model of energy loss of the magnetic monopole + +// ------------------------------------------------------------------- +// + +#ifndef G4mplIonisationModel_h +#define G4mplIonisationModel_h 1 + +#include "G4VEmModel.hh" +#include "G4VEmFluctuationModel.hh" + +class G4ParticleChangeForLoss; + +class G4mplIonisationModel : public G4VEmModel, public G4VEmFluctuationModel +{ + +public: + + G4mplIonisationModel(G4double mCharge, const G4String& nam = "mplIonisation"); + + virtual ~G4mplIonisationModel(); + + virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&); + + virtual G4double ComputeDEDXPerVolume(const G4Material*, + const G4ParticleDefinition*, + G4double kineticEnergy, + G4double cutEnergy); + + virtual std::vector* SampleSecondaries( + const G4MaterialCutsCouple*, + const G4DynamicParticle*, + G4double tmin, + G4double maxEnergy); + + + virtual G4double SampleFluctuations(const G4Material*, + const G4DynamicParticle*, + G4double& tmax, + G4double& length, + G4double& meanLoss); + + virtual G4double Dispersion(const G4Material*, + const G4DynamicParticle*, + G4double& tmax, + G4double& length); + +private: + + void SetParticle(const G4ParticleDefinition* p); + + // hide assignment operator + G4mplIonisationModel & operator=(const G4mplIonisationModel &right); + G4mplIonisationModel(const G4mplIonisationModel&); + + const G4ParticleDefinition* monopole; + G4ParticleChangeForLoss* fParticleChange; + + G4double mass; + G4double magCharge; + G4double chargeSquare; + G4double twoln10; + G4double beta2low; + G4double beta2lim; + G4double bg2lim; + G4double factlow; + G4int nmpl; +}; + +#endif + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +inline std::vector* G4mplIonisationModel::SampleSecondaries( + const G4MaterialCutsCouple*, + const G4DynamicParticle*, + G4double, + G4double) +{ + return 0; +} + +inline G4double G4mplIonisationModel::Dispersion( + const G4Material* material, + const G4DynamicParticle* dp, + G4double& tmax, + G4double& length) +{ + G4double siga = 0.0; + G4double tau = dp->GetKineticEnergy()/mass; + if(tau > 0.0) { + G4double electronDensity = material->GetElectronDensity(); + G4double gam = tau + 1.0; + G4double invbeta2 = (gam*gam)/(tau * (tau+2.0)); + siga = (invbeta2 - 0.5) * twopi_mc2_rcl2 * tmax * length + * electronDensity * chargeSquare; + } + return siga; +} + + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/source/processes/electromagnetic/highenergy/src/G4AnnihiToMuPair.cc b/source/processes/electromagnetic/highenergy/src/G4AnnihiToMuPair.cc index 2e80ce62c4..4d6d16f018 100644 --- a/source/processes/electromagnetic/highenergy/src/G4AnnihiToMuPair.cc +++ b/source/processes/electromagnetic/highenergy/src/G4AnnihiToMuPair.cc @@ -25,7 +25,7 @@ // // // $Id: G4AnnihiToMuPair.cc,v 1.3 2006/06/29 19:32:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------ G4AnnihiToMuPair physics process ------ // by H.Burkhardt, S. Kelner and R. Kokoulin, November 2002 diff --git a/source/processes/electromagnetic/highenergy/src/G4BetheBlochNoDeltaModel.cc b/source/processes/electromagnetic/highenergy/src/G4BetheBlochNoDeltaModel.cc index 98294fed38..5402b18820 100644 --- a/source/processes/electromagnetic/highenergy/src/G4BetheBlochNoDeltaModel.cc +++ b/source/processes/electromagnetic/highenergy/src/G4BetheBlochNoDeltaModel.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4BetheBlochNoDeltaModel.cc,v 1.3 2006/06/29 19:32:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/highenergy/src/G4BraggNoDeltaModel.cc b/source/processes/electromagnetic/highenergy/src/G4BraggNoDeltaModel.cc index 453398f074..d85710afae 100644 --- a/source/processes/electromagnetic/highenergy/src/G4BraggNoDeltaModel.cc +++ b/source/processes/electromagnetic/highenergy/src/G4BraggNoDeltaModel.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4BraggNoDeltaModel.cc,v 1.3 2006/06/29 19:32:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/highenergy/src/G4GammaConversionToMuons.cc b/source/processes/electromagnetic/highenergy/src/G4GammaConversionToMuons.cc index e8acd6f844..48acecb9f1 100644 --- a/source/processes/electromagnetic/highenergy/src/G4GammaConversionToMuons.cc +++ b/source/processes/electromagnetic/highenergy/src/G4GammaConversionToMuons.cc @@ -25,7 +25,7 @@ // // // $Id: G4GammaConversionToMuons.cc,v 1.4 2006/06/29 19:32:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------ G4GammaConversionToMuons physics process ------ // by H.Burkhardt, S. Kelner and R. Kokoulin, April 2002 diff --git a/source/processes/electromagnetic/highenergy/src/G4eeCrossSections.cc b/source/processes/electromagnetic/highenergy/src/G4eeCrossSections.cc index 99a49ca569..150a8a486b 100644 --- a/source/processes/electromagnetic/highenergy/src/G4eeCrossSections.cc +++ b/source/processes/electromagnetic/highenergy/src/G4eeCrossSections.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4eeCrossSections.cc,v 1.6 2006/06/29 19:32:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/highenergy/src/G4eeToHadrons.cc b/source/processes/electromagnetic/highenergy/src/G4eeToHadrons.cc index 5cc18f75de..e3ae934d6f 100644 --- a/source/processes/electromagnetic/highenergy/src/G4eeToHadrons.cc +++ b/source/processes/electromagnetic/highenergy/src/G4eeToHadrons.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4eeToHadrons.cc,v 1.7 2006/06/29 19:32:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/highenergy/src/G4eeToHadronsModel.cc b/source/processes/electromagnetic/highenergy/src/G4eeToHadronsModel.cc index 441ede874c..7d5a3484a4 100644 --- a/source/processes/electromagnetic/highenergy/src/G4eeToHadronsModel.cc +++ b/source/processes/electromagnetic/highenergy/src/G4eeToHadronsModel.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4eeToHadronsModel.cc,v 1.7 2006/06/29 19:32:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/highenergy/src/G4eeToHadronsMultiModel.cc b/source/processes/electromagnetic/highenergy/src/G4eeToHadronsMultiModel.cc index c1cfd5fc9e..6300fc1f4c 100644 --- a/source/processes/electromagnetic/highenergy/src/G4eeToHadronsMultiModel.cc +++ b/source/processes/electromagnetic/highenergy/src/G4eeToHadronsMultiModel.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4eeToHadronsMultiModel.cc,v 1.3 2006/06/29 19:32:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/highenergy/src/G4eeToTwoPiModel.cc b/source/processes/electromagnetic/highenergy/src/G4eeToTwoPiModel.cc index 7aebc4454d..2290c17561 100644 --- a/source/processes/electromagnetic/highenergy/src/G4eeToTwoPiModel.cc +++ b/source/processes/electromagnetic/highenergy/src/G4eeToTwoPiModel.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4eeToTwoPiModel.cc,v 1.4 2006/06/29 19:32:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/highenergy/src/G4hhIonisation.cc b/source/processes/electromagnetic/highenergy/src/G4hhIonisation.cc index 2547b90c94..f8b5d67eb8 100644 --- a/source/processes/electromagnetic/highenergy/src/G4hhIonisation.cc +++ b/source/processes/electromagnetic/highenergy/src/G4hhIonisation.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4hhIonisation.cc,v 1.4 2006/06/29 19:32:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4hhIonisation.cc,v 1.5 2006/10/27 14:11:12 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // @@ -39,6 +39,7 @@ // // Modifications: // 10-01-06 SetStepLimits -> SetStepFunction (V.Ivantchenko) +// 27-10-06 Add maxKinEnergy (V.Ivantchenko) // // // ------------------------------------------------------------------- @@ -63,10 +64,11 @@ G4hhIonisation::G4hhIonisation(const G4String& name) isInitialised(false) { minKinEnergy = 0.1*keV; + maxKinEnergy = 100.*TeV; SetDEDXBinning(120); SetLambdaBinning(120); SetMinKinEnergy(minKinEnergy); - SetMaxKinEnergy(100.0*TeV); + SetMaxKinEnergy(maxKinEnergy); SetStepFunction(0.1, 0.1*mm); SetVerboseLevel(1); mass = 0.0; @@ -107,10 +109,12 @@ void G4hhIonisation::InitialiseEnergyLossProcess(const G4ParticleDefinition* par nm++; } - G4VEmModel* em1 = new G4BetheBlochNoDeltaModel(); - em1->SetLowEnergyLimit(std::max(eth,minKinEnergy)); - em1->SetHighEnergyLimit(100.0*TeV); - AddEmModel(nm, em1, flucModel); + if(eth < maxKinEnergy) { + G4VEmModel* em1 = new G4BetheBlochNoDeltaModel(); + em1->SetLowEnergyLimit(std::max(eth,minKinEnergy)); + em1->SetHighEnergyLimit(maxKinEnergy); + AddEmModel(nm, em1, flucModel); + } if(verboseLevel>0) G4cout << "G4hhIonisation is initialised: Nmodels= " << nm << G4endl; diff --git a/examples/extended/electromagnetic/TestEm9/src/PhysListParticles.cc b/source/processes/electromagnetic/highenergy/src/G4mplIonisation.cc similarity index 55% rename from examples/extended/electromagnetic/TestEm9/src/PhysListParticles.cc rename to source/processes/electromagnetic/highenergy/src/G4mplIonisation.cc index ed3e4413c9..c5285269f8 100644 --- a/examples/extended/electromagnetic/TestEm9/src/PhysListParticles.cc +++ b/source/processes/electromagnetic/highenergy/src/G4mplIonisation.cc @@ -23,86 +23,83 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// $Id: G4mplIonisation.cc,v 1.3 2006/12/13 15:44:25 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // -// $Id: PhysListParticles.cc,v 1.4 2006/06/29 17:03:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -#include "PhysListParticles.hh" - -// Bosons -#include "G4ChargedGeantino.hh" -#include "G4Geantino.hh" -#include "G4Gamma.hh" -#include "G4OpticalPhoton.hh" - -// leptons -#include "G4MuonPlus.hh" -#include "G4MuonMinus.hh" -#include "G4NeutrinoMu.hh" -#include "G4AntiNeutrinoMu.hh" +// ------------------------------------------------------------------- +// +// GEANT4 Class file +// +// +// File name: G4mplIonisation +// +// Author: Vladimir Ivanchenko +// +// Creation date: 25.08.2005 +// +// Modifications: +// +// +// ------------------------------------------------------------------- +// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... +#include "G4mplIonisation.hh" #include "G4Electron.hh" -#include "G4Positron.hh" -#include "G4NeutrinoE.hh" -#include "G4AntiNeutrinoE.hh" +#include "G4mplIonisationModel.hh" +#include "G4BohrFluctuations.hh" -// Hadrons -#include "G4MesonConstructor.hh" -#include "G4BaryonConstructor.hh" -#include "G4IonConstructor.hh" +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +using namespace std; -PhysListParticles::PhysListParticles(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -PhysListParticles::~PhysListParticles() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void PhysListParticles::ConstructParticle() +G4mplIonisation::G4mplIonisation(G4double mCharge, const G4String& name) + : G4VEnergyLossProcess(name), + magneticCharge(mCharge), + isInitialised(false) { + // By default classical magnetic charge is used + if(magneticCharge == 0.0) magneticCharge = eplus*0.5/fine_structure_const; -// pseudo-particles - G4Geantino::GeantinoDefinition(); - G4ChargedGeantino::ChargedGeantinoDefinition(); - -// gamma - G4Gamma::GammaDefinition(); - -// optical photon - G4OpticalPhoton::OpticalPhotonDefinition(); - -// leptons - G4Electron::ElectronDefinition(); - G4Positron::PositronDefinition(); - G4MuonPlus::MuonPlusDefinition(); - G4MuonMinus::MuonMinusDefinition(); - - G4NeutrinoE::NeutrinoEDefinition(); - G4AntiNeutrinoE::AntiNeutrinoEDefinition(); - G4NeutrinoMu::NeutrinoMuDefinition(); - G4AntiNeutrinoMu::AntiNeutrinoMuDefinition(); - -// mesons - G4MesonConstructor mConstructor; - mConstructor.ConstructParticle(); - -// barions - G4BaryonConstructor bConstructor; - bConstructor.ConstructParticle(); - -// ions - G4IonConstructor iConstructor; - iConstructor.ConstructParticle(); + SetDEDXBinning(120); + SetLambdaBinning(120); + SetMinKinEnergy(0.1*keV); + SetMaxKinEnergy(100.0*TeV); + SetVerboseLevel(0); } -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... +G4mplIonisation::~G4mplIonisation() +{} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +void G4mplIonisation::InitialiseEnergyLossProcess(const G4ParticleDefinition*, + const G4ParticleDefinition*) +{ + if(isInitialised) return; + + SetBaseParticle(0); + SetSecondaryParticle(G4Electron::Electron()); + + G4mplIonisationModel* ion = new G4mplIonisationModel(magneticCharge); + ion->SetLowEnergyLimit(0.1*keV); + ion->SetHighEnergyLimit(100.*TeV); + AddEmModel(0,ion,ion); + + SetStepFunction(0.2, 1*mm); + + isInitialised = true; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +void G4mplIonisation::PrintInfo() +{ + G4cout << " No delta-electron production, only dE/dx" + << G4endl; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/source/processes/electromagnetic/highenergy/src/G4mplIonisationModel.cc b/source/processes/electromagnetic/highenergy/src/G4mplIonisationModel.cc new file mode 100644 index 0000000000..83185198ae --- /dev/null +++ b/source/processes/electromagnetic/highenergy/src/G4mplIonisationModel.cc @@ -0,0 +1,188 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4mplIonisationModel.cc,v 1.3 2006/12/13 15:44:27 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ------------------------------------------------------------------- +// +// GEANT4 Class header file +// +// +// File name: G4mplIonisationModel +// +// Author: Vladimir Ivanchenko +// +// Creation date: 06.09.2005 +// +// Modifications: +// +// +// ------------------------------------------------------------------- +// + + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +#include "G4mplIonisationModel.hh" +#include "Randomize.hh" +#include "G4LossTableManager.hh" +#include "G4ParticleChangeForLoss.hh" + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +using namespace std; + +G4mplIonisationModel::G4mplIonisationModel(G4double mCharge, + const G4String& nam) + : G4VEmModel(nam),G4VEmFluctuationModel(nam), + magCharge(mCharge), + twoln10(2.0*log(10.0)), + beta2low(0.0001), + beta2lim(0.01), + bg2lim(beta2lim*(1.0 + beta2lim)) +{ + nmpl = G4int(abs(magCharge)/68.0); + if(nmpl > 6) nmpl = 6; + else if(nmpl < 1) nmpl = 1; + G4double x = 45.0*GeV*G4double(nmpl)/cm; + factlow = x*x; + chargeSquare = magCharge*magCharge; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +G4mplIonisationModel::~G4mplIonisationModel() +{} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +void G4mplIonisationModel::Initialise(const G4ParticleDefinition* p, + const G4DataVector&) +{ + monopole = p; + mass = monopole->GetPDGMass(); + + if(pParticleChange) + fParticleChange = reinterpret_cast(pParticleChange); + else + fParticleChange = new G4ParticleChangeForLoss(); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +G4double G4mplIonisationModel::ComputeDEDXPerVolume(const G4Material* material, + const G4ParticleDefinition*, + G4double kineticEnergy, + G4double) +{ + G4double tau = kineticEnergy/mass; + G4double gam = tau + 1.0; + G4double bg2 = tau * (tau+2.0); + G4double beta2 = bg2/(gam*gam); + + G4double dedx0 = factlow*abs(beta2); + + if(beta2 > beta2low) { + + G4double b2 = beta2; + if(beta2 < beta2lim) { + beta2= beta2lim; + bg2 = bg2lim; + } + + G4double eexc = material->GetIonisation()->GetMeanExcitationEnergy(); + G4double cden = material->GetIonisation()->GetCdensity(); + G4double mden = material->GetIonisation()->GetMdensity(); + G4double aden = material->GetIonisation()->GetAdensity(); + G4double x0den = material->GetIonisation()->GetX0density(); + G4double x1den = material->GetIonisation()->GetX1density(); + + G4double eDensity = material->GetElectronDensity(); + + G4double dedx = 2.0*log(2.0*electron_mass_c2*bg2/eexc) - 1.0; + + G4double k = 0.406; + if(nmpl > 1) k = 0.346; + const G4double B[7] = { 0.0, 0.248, 0.672, 1.022, 1.243, 1.464, 1.685}; + + dedx += k - B[nmpl]; + + // density correction + G4double x = log(bg2)/twoln10; + if ( x >= x0den ) { + dedx -= twoln10*x - cden ; + if ( x < x1den ) dedx -= aden*pow((x1den-x),mden) ; + } + + // now compute the total ionization loss + + if (dedx < 0.0) dedx = 0.0 ; + + dedx *= twopi_mc2_rcl2*chargeSquare*eDensity; + + // extrapolate between two formula + if(beta2 < beta2lim) { + x = log(dedx0) + log(dedx/dedx0)*log(b2/beta2low)/log(beta2lim/beta2low); + dedx = exp(x); + } + dedx0 = dedx; + } + + return dedx0; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +G4double G4mplIonisationModel::SampleFluctuations( + const G4Material* material, + const G4DynamicParticle* dp, + G4double& tmax, + G4double& length, + G4double& meanLoss) +{ + G4double siga = Dispersion(material,dp,tmax,length); + G4double loss = meanLoss; + siga = sqrt(siga); + G4double twomeanLoss = meanLoss + meanLoss; + + if(twomeanLoss < siga) { + G4double x; + do { + loss = twomeanLoss*G4UniformRand(); + x = (loss - meanLoss)/siga; + } while (1.0 - 0.5*x*x < G4UniformRand()); + } else { + do { + loss = G4RandGauss::shoot(meanLoss,siga); + } while (0.0 > loss || loss > twomeanLoss); + } + //G4cout << "G4mplIonisationModel::SampleFluctuations: loss= " << loss + //<< " siga= " << siga << G4endl; + return loss; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/source/processes/electromagnetic/lowenergy/History b/source/processes/electromagnetic/lowenergy/History index e5f2a1f31d..512fc93246 100644 --- a/source/processes/electromagnetic/lowenergy/History +++ b/source/processes/electromagnetic/lowenergy/History @@ -1,4 +1,4 @@ -$Id: History,v 1.251 2006/05/31 07:48:58 gcosmo Exp $ +$Id: History,v 1.254 2006/10/19 11:19:50 pia Exp $ ------------------------------------------------------------------- ========================================================= @@ -17,6 +17,15 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +19.10.2006 MGP, tag emlowen-V08-01-02 + Bug fixes in G4FluoData.cc + +14.10.2006 MGP, tag emlowen-V08-01-01 + Developments and fixes for atomic deexcitation + +14.10.2006 MGP, tag emlowen-V08-01-00 + Cosmetics on code formatting for DNA processes + 31.05.2006 G.Cosmo, tag emlowen-V08-00-06 Added missing migration to std namespace for mathematical functions. Also required for allowing compilation on Windows diff --git a/source/processes/electromagnetic/lowenergy/include/G4AtomicDeexcitation.hh b/source/processes/electromagnetic/lowenergy/include/G4AtomicDeexcitation.hh index 99bebc2515..f0fc72139d 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4AtomicDeexcitation.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4AtomicDeexcitation.hh @@ -25,7 +25,7 @@ // // // $Id: G4AtomicTransitionManager.hh,v 1.2 ???? -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Authors: Elena Guardincerri (Elena.Guardincerri@ge.infn.it) // Alfonso Mantero (Alfonso.Mantero@ge.infn.it) diff --git a/source/processes/electromagnetic/lowenergy/include/G4AtomicShell.hh b/source/processes/electromagnetic/lowenergy/include/G4AtomicShell.hh index 32c9a9596d..d20109cc38 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4AtomicShell.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4AtomicShell.hh @@ -25,7 +25,7 @@ // // // $Id: G4AtomicShell.hh,v 1.2 ???? -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Authors: Elena Guardincerri (Elena.Guardincerri@ge.infn.it) // Alfonso Mantero (Alfonso.Mantero@ge.infn.it) diff --git a/source/processes/electromagnetic/lowenergy/include/G4AtomicTransitionManager.hh b/source/processes/electromagnetic/lowenergy/include/G4AtomicTransitionManager.hh index acf6c18ed6..bac1d8b238 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4AtomicTransitionManager.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4AtomicTransitionManager.hh @@ -25,7 +25,7 @@ // // // $Id: G4AtomicTransitionManager.hh,v 1.2 ???? -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Authors: Elena Guardincerri (Elena.Guardincerri@ge.infn.it) // Alfonso Mantero (Alfonso.Mantero@ge.infn.it) diff --git a/source/processes/electromagnetic/lowenergy/include/G4AugerData.hh b/source/processes/electromagnetic/lowenergy/include/G4AugerData.hh index ff1d97aa30..0203488a3a 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4AugerData.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4AugerData.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4AugerData.hh -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Alfonso Mantero (Alfonso.Mantero@ge.infn.it) // diff --git a/source/processes/electromagnetic/lowenergy/include/G4BremsstrahlungParameters.hh b/source/processes/electromagnetic/lowenergy/include/G4BremsstrahlungParameters.hh index 646be05a97..e916471f15 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4BremsstrahlungParameters.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4BremsstrahlungParameters.hh @@ -25,7 +25,7 @@ // // // $Id: G4BremsstrahlungParameters.hh,v 1.10 2006/06/29 19:33:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch) // V. Ivanchenko (Vladimir.Ivantchenko@cern.ch) diff --git a/source/processes/electromagnetic/lowenergy/include/G4CompositeEMDataSet.hh b/source/processes/electromagnetic/lowenergy/include/G4CompositeEMDataSet.hh index b8b31d2009..19f86e0ef2 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4CompositeEMDataSet.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4CompositeEMDataSet.hh @@ -25,7 +25,7 @@ // // // $Id: G4CompositeEMDataSet.hh,v 1.8 2006/06/29 19:33:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch) // diff --git a/source/processes/electromagnetic/lowenergy/include/G4CrossSectionHandler.hh b/source/processes/electromagnetic/lowenergy/include/G4CrossSectionHandler.hh index 15d1af7057..7f7e87c5e1 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4CrossSectionHandler.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4CrossSectionHandler.hh @@ -25,7 +25,7 @@ // // // $Id: G4CrossSectionHandler.hh,v 1.9 2006/06/29 19:33:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch) // diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusChargeDecrease.hh b/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusChargeDecrease.hh index a10d5b73f5..a1d509c2bc 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusChargeDecrease.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusChargeDecrease.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNAAlphaPlusChargeDecrease.hh,v 1.2 2006/06/29 19:33:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4DNAALPHAPLUSCHARGEDECREASE_HH #define G4DNAALPHAPLUSCHARGEDECREASE_HH 1 diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusChargeDecreaseFinalStatesPolicy.icc b/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusChargeDecreaseFinalStatesPolicy.icc index 6c5596086e..1657c857eb 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusChargeDecreaseFinalStatesPolicy.icc +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusChargeDecreaseFinalStatesPolicy.icc @@ -25,7 +25,7 @@ // // // $Id: G4DNAAlphaPlusChargeDecreaseFinalStatesPolicy.icc,v 2005/09/14 16:12:34 Francis -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifdef G4DNAALPHAPLUSCHARGEDECREASEFINALSTATESPOLICY_HH diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusChargeIncrease.hh b/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusChargeIncrease.hh index 7eaf5efb1f..4e3b21b7e8 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusChargeIncrease.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusChargeIncrease.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNAAlphaPlusChargeIncrease.hh,v 1.2 2006/06/29 19:33:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4DNAALPHAPLUSCHARGEINCREASE_HH #define G4DNAALPHAPLUSCHARGEINCREASE_HH 1 diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusChargeIncreaseFinalStatesPolicy.icc b/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusChargeIncreaseFinalStatesPolicy.icc index 17c8bbbcf8..d32ceb769e 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusChargeIncreaseFinalStatesPolicy.icc +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusChargeIncreaseFinalStatesPolicy.icc @@ -25,7 +25,7 @@ // // // $Id: G4DNAAlphaPlusChargeIncreaseFinalStatesPolicy.icc,v 2005/09/14 16:12:34 Francis -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifdef G4DNAALPHAPLUSCHARGEINCREASEFINALSTATESPOLICY_HH diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusExcitation.hh b/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusExcitation.hh index 1688f7aba9..cc618cb23a 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusExcitation.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusExcitation.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNAAlphaPlusExcitation.hh,v 1.2 2006/06/29 19:33:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4DNAALPHAPLUSEXCITATION_HH #define G4DNAALPHAPLUSEXCITATION_HH 1 diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusPlusChargeDecrease.hh b/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusPlusChargeDecrease.hh index 3d7debe279..5d2f947ffe 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusPlusChargeDecrease.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusPlusChargeDecrease.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNAAlphaPlusPlusChargeDecrease.hh,v 1.2 2006/06/29 19:33:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4DNAALPHAPLUSPLUSCHARGEDECREASE_HH #define G4DNAALPHAPLUSPLUSCHARGEDECREASE_HH 1 diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusPlusChargeDecreaseFinalStatesPolicy.icc b/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusPlusChargeDecreaseFinalStatesPolicy.icc index a924354521..54fc51753d 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusPlusChargeDecreaseFinalStatesPolicy.icc +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusPlusChargeDecreaseFinalStatesPolicy.icc @@ -25,7 +25,7 @@ // // // $Id: G4DNAAlphaPlusPlusChargeDecreaseFinalStatesPolicy.icc,v 2005/09/14 16:12:34 Francis -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifdef G4DNAALPHAPLUSPLUSCHARGEDECREASEFINALSTATESPOLICY_HH diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusPlusExcitation.hh b/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusPlusExcitation.hh index a703b0f746..3ddf2869a2 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusPlusExcitation.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAAlphaPlusPlusExcitation.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNAAlphaPlusPlusExcitation.hh,v 1.2 2006/06/29 19:33:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4DNAALPHAPLUSPLUSEXCITATION_HH #define G4DNAALPHAPLUSPLUSEXCITATION_HH 1 diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNABornExcitationFinalStatesPolicy.icc b/source/processes/electromagnetic/lowenergy/include/G4DNABornExcitationFinalStatesPolicy.icc index 16938bd6db..c678c35971 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNABornExcitationFinalStatesPolicy.icc +++ b/source/processes/electromagnetic/lowenergy/include/G4DNABornExcitationFinalStatesPolicy.icc @@ -25,7 +25,7 @@ // // // $Id: G4DNABornExcitationFinalStatesPolicy.icc,v 2005/09/19 13:55:54 Ziad FRANCIS -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifdef G4DNABornExcitationFinalStatesPolicy_HH diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNABrennerAngularDistributionPolicy.hh b/source/processes/electromagnetic/lowenergy/include/G4DNABrennerAngularDistributionPolicy.hh index 49ee305618..66511c647a 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNABrennerAngularDistributionPolicy.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNABrennerAngularDistributionPolicy.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNABrennerAngularDistributionPolicy.hh,v 1.2 2006/06/29 19:33:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Phys. Med. Biol. 29 N.4 (1983) 443-447 diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAChargeDecreaseInWater.hh b/source/processes/electromagnetic/lowenergy/include/G4DNAChargeDecreaseInWater.hh index 0d5c72e0a6..5476d9d659 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAChargeDecreaseInWater.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAChargeDecreaseInWater.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNAChargeDecreaseInWater.hh,v 1.4 2006/06/29 19:33:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4DNACHARGEDECREASEINWATER_HH diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAChargeDecreaseInWater.icc b/source/processes/electromagnetic/lowenergy/include/G4DNAChargeDecreaseInWater.icc index 6108a674dc..012f1f7905 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAChargeDecreaseInWater.icc +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAChargeDecreaseInWater.icc @@ -25,7 +25,7 @@ // // // $Id: G4DNAChargeDecreaseInWater.icc,v 1.4 2006/06/29 19:33:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifdef G4DNACHARGEDECREASEINWATER_HH diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAChargeIncreaseInWater.hh b/source/processes/electromagnetic/lowenergy/include/G4DNAChargeIncreaseInWater.hh index 266f3301d9..8dbb683cb7 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAChargeIncreaseInWater.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAChargeIncreaseInWater.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNAChargeIncreaseInWater.hh,v 1.3 2006/06/29 19:33:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4DNACHARGEINCREASEINWATER_HH diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAChargeIncreaseInWater.icc b/source/processes/electromagnetic/lowenergy/include/G4DNAChargeIncreaseInWater.icc index 06e087aa18..83a46ccf02 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAChargeIncreaseInWater.icc +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAChargeIncreaseInWater.icc @@ -25,7 +25,7 @@ // // // $Id: G4DNAChargeIncreaseInWater.icc,v 1.4 2006/06/29 19:33:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifdef G4DNACHARGEINCREASEINWATER_HH diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNACrossSectionDataSet.hh b/source/processes/electromagnetic/lowenergy/include/G4DNACrossSectionDataSet.hh index ac16a9f4e9..6d6e3d8d6d 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNACrossSectionDataSet.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNACrossSectionDataSet.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNACrossSectionDataSet.hh,v 1.2 2006/06/29 19:33:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Riccardo Capra // diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNADingfelderChargeChangeTotalCrossSectionPolicy.hh b/source/processes/electromagnetic/lowenergy/include/G4DNADingfelderChargeChangeTotalCrossSectionPolicy.hh index 3c50731c66..9283f1562b 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNADingfelderChargeChangeTotalCrossSectionPolicy.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNADingfelderChargeChangeTotalCrossSectionPolicy.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNADingfelderChargeChangeTotalCrossSectionPolicy.hh,v 1.2 2006/06/29 19:33:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4DNADINGFELDERCHARGECHANGETOTALCROSSSECTIONPOLICY_HH #define G4DNADINGFELDERCHARGECHANGETOTALCROSSSECTIONPOLICY_HH 1 diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNADingfelderChargeChangeTotalCrossSectionPolicy.icc b/source/processes/electromagnetic/lowenergy/include/G4DNADingfelderChargeChangeTotalCrossSectionPolicy.icc index cf50b4720b..f1746fe2fd 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNADingfelderChargeChangeTotalCrossSectionPolicy.icc +++ b/source/processes/electromagnetic/lowenergy/include/G4DNADingfelderChargeChangeTotalCrossSectionPolicy.icc @@ -25,7 +25,7 @@ // // // $Id: G4DNADingfelderChargeChangeTotalCrossSectionPolicy.icc,v 1.3 2006/06/29 19:33:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifdef G4DNADINGFELDERCHARGECHANGETOTALCROSSSECTIONPOLICY_HH diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAElectronBornExcitation.hh b/source/processes/electromagnetic/lowenergy/include/G4DNAElectronBornExcitation.hh index e9d980f872..41e0fb47b5 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAElectronBornExcitation.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAElectronBornExcitation.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNAElectronBornExcitation.hh,v 1.3 2006/06/29 19:33:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4DNAElectronBornExcitation_HH #define G4DNAElectronBornExcitation_HH 1 diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAElectronElasticBrenner.hh b/source/processes/electromagnetic/lowenergy/include/G4DNAElectronElasticBrenner.hh index 21f2cf999e..c8027f21f9 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAElectronElasticBrenner.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAElectronElasticBrenner.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNAElectronElasticBrenner.hh,v 1.3 2006/06/29 19:33:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4DNAELECTRONELASTICBRENNER_HH #define G4DNAELECTRONELASTICBRENNER_HH 1 diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAElectronElasticEmfietzoglou.hh b/source/processes/electromagnetic/lowenergy/include/G4DNAElectronElasticEmfietzoglou.hh index 74ab9905de..67c5f9e78f 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAElectronElasticEmfietzoglou.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAElectronElasticEmfietzoglou.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNAElectronElasticEmfietzoglou.hh,v 1.3 2006/06/29 19:33:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4DNAELECTRONELASTICEMFIETZOGLOU_HH #define G4DNAELECTRONELASTICEMFIETZOGLOU_HH 1 diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAElectronElasticScatteringInWater.hh b/source/processes/electromagnetic/lowenergy/include/G4DNAElectronElasticScatteringInWater.hh index 61b2f36bfa..d4fb0cdef9 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAElectronElasticScatteringInWater.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAElectronElasticScatteringInWater.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4DNAElectronElasticScatteringInWater.hh,v 1.5 2006/06/29 19:34:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4DNAElectronElasticScatteringInWater.hh,v 1.6 2006/10/14 11:03:03 pia Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Nucl. Instr. Meth. 155 (1978) 145-156 @@ -33,35 +33,37 @@ // Phys. Med. Biol. 45 (2000) 3171-3194 #ifndef G4DNAELECTRONELASTICSCATTERINGINWATER_HH - #define G4DNAELECTRONELASTICSCATTERINGINWATER_HH 1 +#define G4DNAELECTRONELASTICSCATTERINGINWATER_HH 1 - #include "G4VDNAProcessInWater.hh" +#include "G4VDNAProcessInWater.hh" - // TotalCrossSectionPolicy must provide: - // - [protected] const G4ParticleDefinition * IncomingParticleDefinition(void) - // - [protected] G4double TotalCrossSection(G4double k, G4int z) - // - [protected] void BuildTotalCrossSection(void) +// TotalCrossSectionPolicy must provide: +// - [protected] const G4ParticleDefinition * IncomingParticleDefinition(void) +// - [protected] G4double TotalCrossSection(G4double k, G4int z) +// - [protected] void BuildTotalCrossSection(void) - // FinalStatesPolicy must provide: - // - [protected] G4double RandomizeCosTheta(G4double k, G4int z) - // - [protected] G4bool KillIncomingParticle(G4double k) - // - [protected] void BuildFinalStatesData(void) +// FinalStatesPolicy must provide: +// - [protected] G4double RandomizeCosTheta(G4double k, G4int z) +// - [protected] G4bool KillIncomingParticle(G4double k) +// - [protected] void BuildFinalStatesData(void) - template - class G4DNAElectronElasticScatteringInWater : public G4VDNAProcessInWater - { - public: - G4DNAElectronElasticScatteringInWater(const G4String & name) : G4VDNAProcessInWater(name) {} - virtual ~G4DNAElectronElasticScatteringInWater() {} - - virtual G4VParticleChange * PostStepDoIt(const G4Track & aTrack, const G4Step & aStep); +template +class G4DNAElectronElasticScatteringInWater : public G4VDNAProcessInWater +{ +public: - private: - // Hides default constructor and assignment operator as private - G4DNAElectronElasticScatteringInWater(const G4DNAElectronElasticScatteringInWater & copy); - G4DNAElectronElasticScatteringInWater & operator=(const G4DNAElectronElasticScatteringInWater & right); - }; + G4DNAElectronElasticScatteringInWater(const G4String & name): G4VDNAProcessInWater(name) {} + + virtual ~G4DNAElectronElasticScatteringInWater() {} - #include "G4DNAElectronElasticScatteringInWater.icc" + virtual G4VParticleChange* PostStepDoIt(const G4Track & aTrack, const G4Step & aStep); + +private: + // Hides default constructor and assignment operator as private + G4DNAElectronElasticScatteringInWater(const G4DNAElectronElasticScatteringInWater & copy); + G4DNAElectronElasticScatteringInWater & operator=(const G4DNAElectronElasticScatteringInWater & right); +}; + +#include "G4DNAElectronElasticScatteringInWater.icc" #endif /* G4DNAELECTRONELASTICSCATTERINGINWATER_HH */ diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAElectronElasticScatteringInWater.icc b/source/processes/electromagnetic/lowenergy/include/G4DNAElectronElasticScatteringInWater.icc index 080bd0227d..5da185f968 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAElectronElasticScatteringInWater.icc +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAElectronElasticScatteringInWater.icc @@ -25,7 +25,7 @@ // // // $Id: G4DNAElectronElasticScatteringInWater.icc,v 1.4 2006/06/29 19:34:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifdef G4DNAELECTRONELASTICSCATTERINGINWATER_HH diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAElectronExcitation.hh b/source/processes/electromagnetic/lowenergy/include/G4DNAElectronExcitation.hh index ed38810d63..3c7425e546 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAElectronExcitation.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAElectronExcitation.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNAElectronExcitation.hh,v 1.3 2006/06/29 19:34:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4DNAELECTRONEXCITATION_HH #define G4DNAELECTRONEXCITATION_HH 1 diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAEmfietzoglouAngularDistributionPolicy.hh b/source/processes/electromagnetic/lowenergy/include/G4DNAEmfietzoglouAngularDistributionPolicy.hh index 1fedafed1e..b3ecd4b4dd 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAEmfietzoglouAngularDistributionPolicy.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAEmfietzoglouAngularDistributionPolicy.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNAEmfietzoglouAngularDistributionPolicy.hh,v 1.2 2006/06/29 19:34:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Nucl. Instr. Meth. 155 (1978) 145-156 diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAEmfietzoglouExcitationTotalCrossSectionPolicy.icc b/source/processes/electromagnetic/lowenergy/include/G4DNAEmfietzoglouExcitationTotalCrossSectionPolicy.icc index 7cb4e949fe..54481a66cf 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAEmfietzoglouExcitationTotalCrossSectionPolicy.icc +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAEmfietzoglouExcitationTotalCrossSectionPolicy.icc @@ -25,7 +25,7 @@ // // // $Id: G4DNAEmfietzoglouExcitationTotalCrossSectionPolicy.icc,v 2005/07/26 10:49:54 Francis -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifdef G4DNAEmfietzoglouExcitationTotalCrossSectionPolicy_HH diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAExcitationInWater.hh b/source/processes/electromagnetic/lowenergy/include/G4DNAExcitationInWater.hh index 4f367fb2c9..589ddbd042 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAExcitationInWater.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAExcitationInWater.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNAExcitationInWater.hh,v 1.2 2006/06/29 19:34:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4DNAEXCITATIONINWATER_HH diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAExcitationInWater.icc b/source/processes/electromagnetic/lowenergy/include/G4DNAExcitationInWater.icc index fa4af03e20..f3399fa354 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAExcitationInWater.icc +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAExcitationInWater.icc @@ -25,7 +25,7 @@ // // // $Id: G4DNAExcitationInWater.icc,v 1.3 2006/06/29 19:34:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifdef G4DNAEXCITATIONINWATER_HH diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAGenericIonsManager.hh b/source/processes/electromagnetic/lowenergy/include/G4DNAGenericIonsManager.hh index beef089df0..f6a44c5c8d 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAGenericIonsManager.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAGenericIonsManager.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNAGenericIonsManager.hh,v 1.3 2006/06/29 19:34:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4DNAGENERICIONSMANAGER_HH #define G4DNAGENERICIONSMANAGER_HH 1 diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAHeliumChargeIncrease.hh b/source/processes/electromagnetic/lowenergy/include/G4DNAHeliumChargeIncrease.hh index 969daf1dc7..fc0e00e8d0 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAHeliumChargeIncrease.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAHeliumChargeIncrease.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNAHeliumChargeIncrease.hh,v 1.2 2006/06/29 19:34:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4DNAHELIUMCHARGEINCREASE_HH #define G4DNAHELIUMCHARGEINCREASE_HH 1 diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAHeliumChargeIncreaseFinalStatesPolicy.icc b/source/processes/electromagnetic/lowenergy/include/G4DNAHeliumChargeIncreaseFinalStatesPolicy.icc index 80dda13863..4bf6123790 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAHeliumChargeIncreaseFinalStatesPolicy.icc +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAHeliumChargeIncreaseFinalStatesPolicy.icc @@ -25,7 +25,7 @@ // // // $Id: G4DNAHeliumChargeIncreaseFinalStatesPolicy.icc,v 2005/09/14 16:12:34 Francis -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifdef G4DNAHELIUMCHARGEINCREASEFINALSTATESPOLICY_HH diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAHeliumExcitation.hh b/source/processes/electromagnetic/lowenergy/include/G4DNAHeliumExcitation.hh index 3461c30777..fe8e06dd92 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAHeliumExcitation.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAHeliumExcitation.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNAHeliumExcitation.hh,v 1.2 2006/06/29 19:34:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4DNAHELIUMEXCITATION_HH #define G4DNAHELIUMEXCITATION_HH 1 diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAHydrogenChargeIncrease.hh b/source/processes/electromagnetic/lowenergy/include/G4DNAHydrogenChargeIncrease.hh index 4e12351cce..66a4021310 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAHydrogenChargeIncrease.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAHydrogenChargeIncrease.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNAHydrogenChargeIncrease.hh,v 1.2 2006/06/29 19:34:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4DNAHYDROGENCHARGEINCREASE_HH #define G4DNAHYDROGENCHARGEINCREASE_HH 1 diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAHydrogenChargeIncreaseFinalStatesPolicy.icc b/source/processes/electromagnetic/lowenergy/include/G4DNAHydrogenChargeIncreaseFinalStatesPolicy.icc index 2d129b8995..fecc077f69 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAHydrogenChargeIncreaseFinalStatesPolicy.icc +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAHydrogenChargeIncreaseFinalStatesPolicy.icc @@ -25,7 +25,7 @@ // // // $Id: G4DNAHydrogenChargeIncreaseFinalStatesPolicy.icc,v 2005/09/15 14:38:34 Ziad FRANCIS -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifdef G4DNAHYDROGENCHARGEINCREASEFINALSTATESPOLICY_HH diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAHydrogenChargeIncreaseTotalCrossSectionPolicy.hh b/source/processes/electromagnetic/lowenergy/include/G4DNAHydrogenChargeIncreaseTotalCrossSectionPolicy.hh index f9dbb23bb7..cf8dda9805 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAHydrogenChargeIncreaseTotalCrossSectionPolicy.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAHydrogenChargeIncreaseTotalCrossSectionPolicy.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNAHydrogenChargeIncreaseTotalCrossSectionPolicy.hh,v 1.2 2006/06/29 19:34:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4DNAHYDROGENCHARGEINCREASETOTALCROSSSECTIONPOLICY_HH #define G4DNAHYDROGENCHARGEINCREASETOTALCROSSSECTIONPOLICY_HH 1 diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAHydrogenChargeIncreaseTotalCrossSectionPolicy.icc b/source/processes/electromagnetic/lowenergy/include/G4DNAHydrogenChargeIncreaseTotalCrossSectionPolicy.icc index e012f90733..6a5f06d281 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAHydrogenChargeIncreaseTotalCrossSectionPolicy.icc +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAHydrogenChargeIncreaseTotalCrossSectionPolicy.icc @@ -25,7 +25,7 @@ // // // $Id: G4DNAHydrogenChargeIncreaseTotalCrossSectionPolicy.icc,v 1.3 2006/06/29 19:34:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifdef G4DNAHYDROGENCHARGEINCREASETOTALCROSSSECTIONPOLICY_HH diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAHydrogenRuddIonization.hh b/source/processes/electromagnetic/lowenergy/include/G4DNAHydrogenRuddIonization.hh index ddb3b58df6..210152965d 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAHydrogenRuddIonization.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAHydrogenRuddIonization.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNAHydrogenRuddIonization.hh,v 1.3 2006/06/29 19:34:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4DNAHYDROGENRUDDIONIZATION_HH #define G4DNAHYDROGENRUDDIONIZATION_HH 1 diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAHydrogenRuddIonizationFinalStatesPolicy.icc b/source/processes/electromagnetic/lowenergy/include/G4DNAHydrogenRuddIonizationFinalStatesPolicy.icc index 600603a796..9979da28d2 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAHydrogenRuddIonizationFinalStatesPolicy.icc +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAHydrogenRuddIonizationFinalStatesPolicy.icc @@ -25,7 +25,7 @@ // // // $Id: G4DNAHydrogenRuddIonizationFinalStatesPolicy.icc,v 2005/09/16 09:27:54 Ziad FRANCIS -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifdef G4DNAHydrogenRuddIonizationFinalStatesPolicy_HH diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAIonizationInWater.hh b/source/processes/electromagnetic/lowenergy/include/G4DNAIonizationInWater.hh index b738288341..5051c39bf9 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAIonizationInWater.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAIonizationInWater.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNAIonizationInWater.hh,v 1.2 2006/06/29 19:34:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4DNAIONIZATIONINWATER_HH diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAIonizationInWater.icc b/source/processes/electromagnetic/lowenergy/include/G4DNAIonizationInWater.icc index 7198bb0d05..d212381f8e 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAIonizationInWater.icc +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAIonizationInWater.icc @@ -25,7 +25,7 @@ // // // $Id: G4DNAIonizationInWater.icc,v 1.4 2006/06/29 19:34:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifdef G4DNAIONIZATIONINWATER_HH diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAMillerAndGreenExcitationTotalCrossSectionPolicy.hh b/source/processes/electromagnetic/lowenergy/include/G4DNAMillerAndGreenExcitationTotalCrossSectionPolicy.hh index 040052b59f..08d9d7f136 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAMillerAndGreenExcitationTotalCrossSectionPolicy.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAMillerAndGreenExcitationTotalCrossSectionPolicy.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNAMillerAndGreenExcitationTotalCrossSectionPolicy.hh,v 1.2 2006/06/29 19:34:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4DNAMILLERANDGREENEXCITATIONTOTALCROSSSECTIONPOLICY_HH #define G4DNAMILLERANDGREENEXCITATIONTOTALCROSSSECTIONPOLICY_HH 1 diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAMillerAndGreenExcitationTotalCrossSectionPolicy.icc b/source/processes/electromagnetic/lowenergy/include/G4DNAMillerAndGreenExcitationTotalCrossSectionPolicy.icc index e37cb6f395..76ad80848c 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAMillerAndGreenExcitationTotalCrossSectionPolicy.icc +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAMillerAndGreenExcitationTotalCrossSectionPolicy.icc @@ -25,7 +25,7 @@ // // // $Id: G4DNAMillerAndGreenExcitationTotalCrossSectionPolicy.icc,v 1.2 2006/06/29 19:34:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifdef G4DNAMILLERANDGREENEXCITATIONTOTALCROSSSECTIONPOLICY_HH diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAProtonBornExcitation.hh b/source/processes/electromagnetic/lowenergy/include/G4DNAProtonBornExcitation.hh index cac131242d..a4a263cb17 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAProtonBornExcitation.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAProtonBornExcitation.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNAProtonBornExcitation.hh,v 1.2 2006/06/29 19:34:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4DNAProtonBornExcitation_HH #define G4DNAProtonBornExcitation_HH 1 diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAProtonChargeDecrease.hh b/source/processes/electromagnetic/lowenergy/include/G4DNAProtonChargeDecrease.hh index f44a255c6a..d19f228dc2 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAProtonChargeDecrease.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAProtonChargeDecrease.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNAProtonChargeDecrease.hh,v 1.3 2006/06/29 19:34:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4DNAPROTONCHARGEDECREASE_HH #define G4DNAPROTONCHARGEDECREASE_HH 1 diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAProtonChargeDecreaseFinalStatesPolicy.icc b/source/processes/electromagnetic/lowenergy/include/G4DNAProtonChargeDecreaseFinalStatesPolicy.icc index e1f313eb1b..fe32c66312 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAProtonChargeDecreaseFinalStatesPolicy.icc +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAProtonChargeDecreaseFinalStatesPolicy.icc @@ -25,7 +25,7 @@ // // // $Id: G4DNAProtonChargeDecreaseFinalStatesPolicy.icc,v 2005/09/14 16:12:34 Francis -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifdef G4DNAPROTONCHARGEDECREASEFINALSTATESPOLICY_HH diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAProtonChargeIncrease.hh b/source/processes/electromagnetic/lowenergy/include/G4DNAProtonChargeIncrease.hh index 913625cd85..14d523754c 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAProtonChargeIncrease.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAProtonChargeIncrease.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNAProtonChargeIncrease.hh,v 1.3 2006/06/29 19:34:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4DNAPROTONCHARGEINCREASE_HH #define G4DNAPROTONCHARGEINCREASE_HH 1 diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAProtonChargeIncreaseFinalStatesPolicy.icc b/source/processes/electromagnetic/lowenergy/include/G4DNAProtonChargeIncreaseFinalStatesPolicy.icc index c14cff4868..592669b9e6 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAProtonChargeIncreaseFinalStatesPolicy.icc +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAProtonChargeIncreaseFinalStatesPolicy.icc @@ -25,7 +25,7 @@ // // // $Id: G4DNAProtonChargeIncreaseFinalStatesPolicy.icc,v 2005/09/15 14:38:34 Ziad FRANCIS -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifdef G4DNAProtonChargeIncreaseFinalStatesPolicy_HH diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAProtonChargeIncreaseTotalCrossSectionPolicy.hh b/source/processes/electromagnetic/lowenergy/include/G4DNAProtonChargeIncreaseTotalCrossSectionPolicy.hh index 35633dbba2..3a9c672e37 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAProtonChargeIncreaseTotalCrossSectionPolicy.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAProtonChargeIncreaseTotalCrossSectionPolicy.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNAProtonChargeIncreaseTotalCrossSectionPolicy.hh,v 1.4 2006/06/29 19:35:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4DNAPROTONCHARGEINCREASETOTALCROSSSECTIONPOLICY_HH #define G4DNAPROTONCHARGEINCREASETOTALCROSSSECTIONPOLICY_HH 1 diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAProtonChargeIncreaseTotalCrossSectionPolicy.icc b/source/processes/electromagnetic/lowenergy/include/G4DNAProtonChargeIncreaseTotalCrossSectionPolicy.icc index de1e63af62..181245c649 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAProtonChargeIncreaseTotalCrossSectionPolicy.icc +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAProtonChargeIncreaseTotalCrossSectionPolicy.icc @@ -25,7 +25,7 @@ // // // $Id: G4DNAProtonChargeIncreaseTotalCrossSectionPolicy.icc,v 1.4 2006/06/29 19:35:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifdef G4DNAPROTONCHARGEINCREASETOTALCROSSSECTIONPOLICY_HH diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAProtonExcitation.hh b/source/processes/electromagnetic/lowenergy/include/G4DNAProtonExcitation.hh index 931199590c..ce15367bfa 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAProtonExcitation.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAProtonExcitation.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNAProtonExcitation.hh,v 1.2 2006/06/29 19:35:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4DNAPROTONEXCITATION_HH #define G4DNAPROTONEXCITATION_HH 1 diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAProtonRuddIonization.hh b/source/processes/electromagnetic/lowenergy/include/G4DNAProtonRuddIonization.hh index d80aabdd9f..99939e5151 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAProtonRuddIonization.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAProtonRuddIonization.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNAProtonRuddIonization.hh,v 1.4 2006/06/29 19:35:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4DNAPROTONRUDDIONIZATION_HH #define G4DNAPROTONRUDDIONIZATION_HH 1 diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNARuddIonizationFinalStatesPolicy.icc b/source/processes/electromagnetic/lowenergy/include/G4DNARuddIonizationFinalStatesPolicy.icc index 287dfe9a7f..614f125da4 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNARuddIonizationFinalStatesPolicy.icc +++ b/source/processes/electromagnetic/lowenergy/include/G4DNARuddIonizationFinalStatesPolicy.icc @@ -25,7 +25,7 @@ // // // $Id: G4DNARuddIonizationFinalStatesPolicy.icc,v 2005/09/19 19:08:54 Ziad FRANCIS -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifdef G4DNARuddIonizationFinalStatesPolicy_HH diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNARutherfordTotalCrossSectionPolicy.hh b/source/processes/electromagnetic/lowenergy/include/G4DNARutherfordTotalCrossSectionPolicy.hh index 267bffbdd5..3cdce20127 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNARutherfordTotalCrossSectionPolicy.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNARutherfordTotalCrossSectionPolicy.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNARutherfordTotalCrossSectionPolicy.hh,v 1.3 2006/06/29 19:35:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4DNARUTHERFORDTOTALCROSSSECTIONPOLICY_HH #define G4DNARUTHERFORDTOTALCROSSSECTIONPOLICY_HH 1 diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNARutherfordTotalCrossSectionPolicy.icc b/source/processes/electromagnetic/lowenergy/include/G4DNARutherfordTotalCrossSectionPolicy.icc index 855b520c11..30cf324fd0 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNARutherfordTotalCrossSectionPolicy.icc +++ b/source/processes/electromagnetic/lowenergy/include/G4DNARutherfordTotalCrossSectionPolicy.icc @@ -25,7 +25,7 @@ // // // $Id: G4DNARutherfordTotalCrossSectionPolicy.icc,v 1.2 2006/06/29 19:35:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifdef G4DNARUTHERFORDTOTALCROSSSECTIONPOLICY_HH diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAStopAndKillBelowEnergyLimitPolicy.hh b/source/processes/electromagnetic/lowenergy/include/G4DNAStopAndKillBelowEnergyLimitPolicy.hh index 4e748c2a51..9e644f5829 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAStopAndKillBelowEnergyLimitPolicy.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAStopAndKillBelowEnergyLimitPolicy.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNAStopAndKillBelowEnergyLimitPolicy.hh,v 1.2 2006/06/29 19:35:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4DNASTOPANDKILLBELOWENERGYLIMITPOLICY_HH #define G4DNASTOPANDKILLBELOWENERGYLIMITPOLICY_HH 1 diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNAStopAndKillBelowEnergyLimitPolicy.icc b/source/processes/electromagnetic/lowenergy/include/G4DNAStopAndKillBelowEnergyLimitPolicy.icc index 1b8517ce82..0d11dab14d 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNAStopAndKillBelowEnergyLimitPolicy.icc +++ b/source/processes/electromagnetic/lowenergy/include/G4DNAStopAndKillBelowEnergyLimitPolicy.icc @@ -25,7 +25,7 @@ // // // $Id: G4DNAStopAndKillBelowEnergyLimitPolicy.icc,v 1.2 2006/06/29 19:35:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifdef G4DNASTOPANDKILLBELOWENERGYLIMITPOLICY_HH diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNATotalCrossSectionFromFilePolicy.hh b/source/processes/electromagnetic/lowenergy/include/G4DNATotalCrossSectionFromFilePolicy.hh index 512461bcd2..c0abfc21d2 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNATotalCrossSectionFromFilePolicy.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4DNATotalCrossSectionFromFilePolicy.hh @@ -25,7 +25,7 @@ // // // $Id: G4DNATotalCrossSectionFromFilePolicy.hh,v 1.5 2006/06/29 19:35:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4DNATOTALCROSSSECTIONFROMFILEPOLICY_HH #define G4DNATOTALCROSSSECTIONFROMFILEPOLICY_HH 1 diff --git a/source/processes/electromagnetic/lowenergy/include/G4DNATotalCrossSectionFromFilePolicy.icc b/source/processes/electromagnetic/lowenergy/include/G4DNATotalCrossSectionFromFilePolicy.icc index f7d1b88e90..f8e0358ae7 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4DNATotalCrossSectionFromFilePolicy.icc +++ b/source/processes/electromagnetic/lowenergy/include/G4DNATotalCrossSectionFromFilePolicy.icc @@ -25,7 +25,7 @@ // // // $Id: G4DNATotalCrossSectionFromFilePolicy.icc,v 1.4 2006/06/29 19:35:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifdef G4DNATOTALCROSSSECTIONFROMFILEPOLICY_HH diff --git a/source/processes/electromagnetic/lowenergy/include/G4EMDataSet.hh b/source/processes/electromagnetic/lowenergy/include/G4EMDataSet.hh index e97dcf9592..4fc8ab719c 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4EMDataSet.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4EMDataSet.hh @@ -25,7 +25,7 @@ // // // $Id: G4EMDataSet.hh,v 1.7 2006/06/29 19:35:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch) // diff --git a/source/processes/electromagnetic/lowenergy/include/G4FluoTransition.hh b/source/processes/electromagnetic/lowenergy/include/G4FluoTransition.hh index 46f627361b..562eef6859 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4FluoTransition.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4FluoTransition.hh @@ -25,7 +25,7 @@ // // // $Id: G4FluoTransition.hh,v 1.2 ???? -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Elena Guardincerri (Elena.Guardincerri@ge.infn.it) // diff --git a/source/processes/electromagnetic/lowenergy/include/G4LinInterpolation.hh b/source/processes/electromagnetic/lowenergy/include/G4LinInterpolation.hh index 006408f23a..f736648237 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4LinInterpolation.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4LinInterpolation.hh @@ -25,7 +25,7 @@ // // // $Id: G4LinInterpolation.hh,v 1.3 2006/06/29 19:35:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch) // diff --git a/source/processes/electromagnetic/lowenergy/include/G4LogLogInterpolation.hh b/source/processes/electromagnetic/lowenergy/include/G4LogLogInterpolation.hh index 05488e076e..5b6052461b 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4LogLogInterpolation.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4LogLogInterpolation.hh @@ -25,7 +25,7 @@ // // // $Id: G4LogLogInterpolation.hh,v 1.4 2006/06/29 19:35:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch) // diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBraggModel.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBraggModel.hh index c6f85f4ffc..079fecdf13 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBraggModel.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBraggModel.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4LowEnergyBraggModel.hh,v 1.6 2006/06/29 19:35:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBremsstrahlung.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBremsstrahlung.hh index e3314f7881..4b3da8b840 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBremsstrahlung.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBremsstrahlung.hh @@ -26,7 +26,7 @@ // // ------------------------------------------------------------------- // $Id: G4LowEnergyBremsstrahlung.hh,v 1.37 2006/06/29 19:35:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: A. Forti // diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyCompton.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyCompton.hh index c79d4f3c92..1df63fea58 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyCompton.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyCompton.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4LowEnergyCompton.hh,v 1.21 2006/06/29 19:35:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: A. Forti // Maria Grazia Pia (Maria.Grazia.Pia@cern.ch) diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyGammaConversion.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyGammaConversion.hh index c8f30bf838..e3a9446fbc 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyGammaConversion.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyGammaConversion.hh @@ -25,7 +25,7 @@ // // // $Id: G4LowEnergyGammaConversion.hh,v 1.15 2006/06/29 19:35:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: A. Forti // Maria Grazia Pia (Maria.Grazia.Pia@cern.ch) diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyIonisation.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyIonisation.hh index 0d6a85a050..df1f18ddc9 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyIonisation.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyIonisation.hh @@ -25,7 +25,7 @@ // // ------------------------------------------------------------------- // $Id: G4LowEnergyIonisation.hh,v 1.41 2006/06/29 19:36:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: A. Forti // diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPhotoElectric.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPhotoElectric.hh index 55193d54be..3d10a6cd6a 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPhotoElectric.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPhotoElectric.hh @@ -25,7 +25,7 @@ // // // $Id: G4LowEnergyPhotoElectric.hh,v 1.28 2006/06/29 19:36:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: A. Forti // Maria Grazia Pia (Maria.Grazia.Pia@cern.ch) diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPolarizedCompton.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPolarizedCompton.hh index 6357ce49ec..05783d4b51 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPolarizedCompton.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPolarizedCompton.hh @@ -25,7 +25,7 @@ // // // $Id: G4LowEnergyPolarizedCompton.hh,v 1.9 2006/06/29 19:36:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------ // GEANT 4 class header file diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPolarizedRayleigh.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPolarizedRayleigh.hh index 34a4abdaca..86f10c5bb8 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPolarizedRayleigh.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPolarizedRayleigh.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4LowEnergyPolarizedRayleigh.hh,v 1.5 2006/06/29 19:36:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyRayleigh.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyRayleigh.hh index cb905e5bd3..0464e8e927 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyRayleigh.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyRayleigh.hh @@ -25,7 +25,7 @@ // // // $Id: G4LowEnergyRayleigh.hh,v 1.16 2006/06/29 19:36:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // diff --git a/source/processes/electromagnetic/lowenergy/include/G4PenelopeBremsstrahlung.hh b/source/processes/electromagnetic/lowenergy/include/G4PenelopeBremsstrahlung.hh index 3f91de692b..1690b292fc 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4PenelopeBremsstrahlung.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4PenelopeBremsstrahlung.hh @@ -26,7 +26,7 @@ // // ------------------------------------------------------------------- // $Id: G4PenelopeBremsstrahlung.hh,v 1.8 2006/06/29 19:36:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: L.Pandola // diff --git a/source/processes/electromagnetic/lowenergy/include/G4PenelopeBremsstrahlungAngular.hh b/source/processes/electromagnetic/lowenergy/include/G4PenelopeBremsstrahlungAngular.hh index 0fcff41311..96f6cc73a6 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4PenelopeBremsstrahlungAngular.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4PenelopeBremsstrahlungAngular.hh @@ -26,7 +26,7 @@ // // ------------------------------------------------------------------- // $Id: G4PenelopeBremsstrahlungAngular.hh,v 1.3 2006/06/29 19:36:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: L.Pandola // diff --git a/source/processes/electromagnetic/lowenergy/include/G4PenelopeBremsstrahlungContinuous.hh b/source/processes/electromagnetic/lowenergy/include/G4PenelopeBremsstrahlungContinuous.hh index 09c3d873c3..8bf4f71506 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4PenelopeBremsstrahlungContinuous.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4PenelopeBremsstrahlungContinuous.hh @@ -26,7 +26,7 @@ // // ------------------------------------------------------------------- // $Id: G4PenelopeBremsstrahlungContinuous.hh,v 1.3 2006/06/29 19:36:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: L.Pandola // diff --git a/source/processes/electromagnetic/lowenergy/include/G4PenelopeCompton.hh b/source/processes/electromagnetic/lowenergy/include/G4PenelopeCompton.hh index 35a36abf99..12ffaa4aea 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4PenelopeCompton.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4PenelopeCompton.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4PenelopeCompton.hh,v 1.10 2006/06/29 19:36:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Luciano Pandola // diff --git a/source/processes/electromagnetic/lowenergy/include/G4PenelopeGammaConversion.hh b/source/processes/electromagnetic/lowenergy/include/G4PenelopeGammaConversion.hh index c92b900a97..d8a159432b 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4PenelopeGammaConversion.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4PenelopeGammaConversion.hh @@ -25,7 +25,7 @@ // // // $Id: G4PenelopeGammaConversion.hh,v 1.2 2006/06/29 19:36:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: L. Pandola // diff --git a/source/processes/electromagnetic/lowenergy/include/G4PenelopeIonisation.hh b/source/processes/electromagnetic/lowenergy/include/G4PenelopeIonisation.hh index 392062df7b..e6b616a8e6 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4PenelopeIonisation.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4PenelopeIonisation.hh @@ -25,7 +25,7 @@ // // ------------------------------------------------------------------- // $Id: G4PenelopeIonisation.hh,v 1.5 2006/06/29 19:36:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: L. Pandola // diff --git a/source/processes/electromagnetic/lowenergy/include/G4PenelopePhotoElectric.hh b/source/processes/electromagnetic/lowenergy/include/G4PenelopePhotoElectric.hh index e631e26ae1..5e065a4a1a 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4PenelopePhotoElectric.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4PenelopePhotoElectric.hh @@ -25,7 +25,7 @@ // // // $Id: G4PenelopePhotoElectric.hh,v 1.4 2006/06/29 19:36:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: L.Pandola // diff --git a/source/processes/electromagnetic/lowenergy/include/G4PenelopeRayleigh.hh b/source/processes/electromagnetic/lowenergy/include/G4PenelopeRayleigh.hh index 1c8e705fbd..7378c90c0b 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4PenelopeRayleigh.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4PenelopeRayleigh.hh @@ -25,7 +25,7 @@ // // // $Id: G4PenelopeRayleigh.hh,v 1.5 2006/06/29 19:36:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Luciano Pandola // diff --git a/source/processes/electromagnetic/lowenergy/include/G4RangeNoTest.hh b/source/processes/electromagnetic/lowenergy/include/G4RangeNoTest.hh index d4d330e844..e89c6cfac1 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4RangeNoTest.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4RangeNoTest.hh @@ -25,7 +25,7 @@ // // // $Id: G4RangeNoTest.hh,v 1.4 2006/06/29 19:36:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch) // diff --git a/source/processes/electromagnetic/lowenergy/include/G4RangeTest.hh b/source/processes/electromagnetic/lowenergy/include/G4RangeTest.hh index 321aaf6b72..116a3964e7 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4RangeTest.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4RangeTest.hh @@ -25,7 +25,7 @@ // // // $Id: G4RangeTest.hh,v 1.4 2006/06/29 19:36:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch) // diff --git a/source/processes/electromagnetic/lowenergy/include/G4SemiLogInterpolation.hh b/source/processes/electromagnetic/lowenergy/include/G4SemiLogInterpolation.hh index 71c6c73408..cd62392a35 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4SemiLogInterpolation.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4SemiLogInterpolation.hh @@ -25,7 +25,7 @@ // // // $Id: G4SemiLogInterpolation.hh,v 1.4 2006/06/29 19:36:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch) // diff --git a/source/processes/electromagnetic/lowenergy/include/G4ShellData.hh b/source/processes/electromagnetic/lowenergy/include/G4ShellData.hh index 85befb5d85..57a9df3f54 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4ShellData.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4ShellData.hh @@ -25,7 +25,7 @@ // // // $Id: G4ShellData.hh,v 1.4 2006/06/29 19:36:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch) // diff --git a/source/processes/electromagnetic/lowenergy/include/G4ShellEMDataSet.hh b/source/processes/electromagnetic/lowenergy/include/G4ShellEMDataSet.hh index 981006e1dd..137b19b008 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4ShellEMDataSet.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4ShellEMDataSet.hh @@ -25,7 +25,7 @@ // // // $Id: G4ShellEMDataSet.hh,v 1.8 2006/06/29 19:36:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch) // diff --git a/source/processes/electromagnetic/lowenergy/include/G4VCrossSectionHandler.hh b/source/processes/electromagnetic/lowenergy/include/G4VCrossSectionHandler.hh index e984f1536e..ddb96c42ff 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4VCrossSectionHandler.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4VCrossSectionHandler.hh @@ -25,7 +25,7 @@ // // // $Id: G4VCrossSectionHandler.hh,v 1.14 2006/06/29 19:37:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch) // diff --git a/source/processes/electromagnetic/lowenergy/include/G4VDNAProcessInWater.hh b/source/processes/electromagnetic/lowenergy/include/G4VDNAProcessInWater.hh index 8227c5ccb9..b43df608ec 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4VDNAProcessInWater.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4VDNAProcessInWater.hh @@ -25,7 +25,7 @@ // // // $Id: G4VDNAProcessInWater.hh,v 1.6 2006/06/29 19:37:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VDNAPROCESSINWATER_HH diff --git a/source/processes/electromagnetic/lowenergy/include/G4VDNAProcessInWater.icc b/source/processes/electromagnetic/lowenergy/include/G4VDNAProcessInWater.icc index 48380f6e8d..2814a1eaee 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4VDNAProcessInWater.icc +++ b/source/processes/electromagnetic/lowenergy/include/G4VDNAProcessInWater.icc @@ -25,7 +25,7 @@ // // // $Id: G4VDNAProcessInWater.icc,v 1.4 2006/06/29 19:37:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifdef G4VDNAPROCESSINWATER_HH template diff --git a/source/processes/electromagnetic/lowenergy/include/G4VDataSetAlgorithm.hh b/source/processes/electromagnetic/lowenergy/include/G4VDataSetAlgorithm.hh index 91e717b0a8..11b18e10e9 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4VDataSetAlgorithm.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4VDataSetAlgorithm.hh @@ -25,7 +25,7 @@ // // // $Id: G4VDataSetAlgorithm.hh,v 1.7 2006/06/29 19:37:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch) // diff --git a/source/processes/electromagnetic/lowenergy/include/G4VEMDataSet.hh b/source/processes/electromagnetic/lowenergy/include/G4VEMDataSet.hh index bb7516708c..8e18700969 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4VEMDataSet.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4VEMDataSet.hh @@ -25,7 +25,7 @@ // // // $Id: G4VEMDataSet.hh,v 1.8 2006/06/29 19:37:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch) // diff --git a/source/processes/electromagnetic/lowenergy/include/G4VLowEnergyDiscretePhotonProcess.hh b/source/processes/electromagnetic/lowenergy/include/G4VLowEnergyDiscretePhotonProcess.hh index 545bcea92a..dd27664e38 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4VLowEnergyDiscretePhotonProcess.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4VLowEnergyDiscretePhotonProcess.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4VLowEnergyDiscretePhotonProcess.hh,v 1.4 2006/06/29 19:37:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/lowenergy/include/G4VLowEnergyTestableDiscreteProcess.hh b/source/processes/electromagnetic/lowenergy/include/G4VLowEnergyTestableDiscreteProcess.hh index a4147fe085..fa193ac602 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4VLowEnergyTestableDiscreteProcess.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4VLowEnergyTestableDiscreteProcess.hh @@ -25,7 +25,7 @@ // // // $Id: G4VLowEnergyTestableDiscreteProcess.hh,v 1.3 2006/06/29 19:37:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VLowEnergyTestableDiscreteProcess_hh diff --git a/source/processes/electromagnetic/lowenergy/include/G4VRangeTest.hh b/source/processes/electromagnetic/lowenergy/include/G4VRangeTest.hh index c8cbc11bd5..57db442654 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4VRangeTest.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4VRangeTest.hh @@ -25,7 +25,7 @@ // // // $Id: G4VRangeTest.hh,v 1.3 2006/06/29 19:37:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch) // diff --git a/source/processes/electromagnetic/lowenergy/include/G4VeLowEnergyLoss.hh b/source/processes/electromagnetic/lowenergy/include/G4VeLowEnergyLoss.hh index a651c4cd9e..f5874c5183 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4VeLowEnergyLoss.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4VeLowEnergyLoss.hh @@ -25,7 +25,7 @@ // // // $Id: G4VeLowEnergyLoss.hh,v 1.9 2006/06/29 19:37:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // 3.4.2000 Veronique Lefebure: // Move utils/include/G4VEnergyLoss.hh to diff --git a/source/processes/electromagnetic/lowenergy/include/G4eBremsstrahlungSpectrum.hh b/source/processes/electromagnetic/lowenergy/include/G4eBremsstrahlungSpectrum.hh index c5deb2cfd6..a4e1966ad0 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4eBremsstrahlungSpectrum.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4eBremsstrahlungSpectrum.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4eBremsstrahlungSpectrum.hh,v 1.8 2006/06/29 19:37:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/lowenergy/include/G4eIonisationCrossSectionHandler.hh b/source/processes/electromagnetic/lowenergy/include/G4eIonisationCrossSectionHandler.hh index 537cf65896..c4a4d626e5 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4eIonisationCrossSectionHandler.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4eIonisationCrossSectionHandler.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4eIonisationCrossSectionHandler.hh,v 1.6 2006/06/29 19:37:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/lowenergy/include/G4eIonisationParameters.hh b/source/processes/electromagnetic/lowenergy/include/G4eIonisationParameters.hh index 6e6ade3f2f..bba906eceb 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4eIonisationParameters.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4eIonisationParameters.hh @@ -25,7 +25,7 @@ // // // $Id: G4eIonisationParameters.hh,v 1.8 2006/06/29 19:37:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch) // V. Ivanchenko diff --git a/source/processes/electromagnetic/lowenergy/include/G4eIonisationSpectrum.hh b/source/processes/electromagnetic/lowenergy/include/G4eIonisationSpectrum.hh index cddab4a367..b85d9beb74 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4eIonisationSpectrum.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4eIonisationSpectrum.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4eIonisationSpectrum.hh,v 1.7 2006/06/29 19:37:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.hh b/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.hh index b301f9c35d..7a2660166d 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.hh @@ -25,7 +25,7 @@ // // // $Id: G4eLowEnergyLoss.hh,v 1.14 2006/06/29 19:37:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- diff --git a/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.icc b/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.icc index 57899fcfd8..41e919c167 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.icc +++ b/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.icc @@ -25,7 +25,7 @@ // // // $Id: G4eLowEnergyLoss.icc,v 1.8 2006/06/29 19:37:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // --------------------------------------------------------------- // GEANT 4 class inlined methods file diff --git a/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.hh b/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.hh index 1bec9343da..8ef4f9ae68 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.hh @@ -25,7 +25,7 @@ // // // $Id: G4hLowEnergyLoss.hh,v 1.17 2006/06/29 19:37:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // $Id: // ------------------------------------------------------------ diff --git a/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.icc b/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.icc index 797bdd6764..692b6a71fc 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.icc +++ b/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.icc @@ -25,7 +25,7 @@ // // // $Id: G4hLowEnergyLoss.icc,v 1.3 2006/06/29 19:38:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // $Id: // --------------------------------------------------------------- diff --git a/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionDoubleExp.hh b/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionDoubleExp.hh index fd79696a14..e2567e628b 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionDoubleExp.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionDoubleExp.hh @@ -44,7 +44,7 @@ // // ------------------------------------------------------------------- // $Id: G4hShellCrossSectionDoubleExp.hh,v 1.3 2006/06/29 19:38:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4HSHELLCROSSSECTIONDOUBLEEXP_HH #define G4HSHELLCROSSSECTIONDOUBLEEXP_HH 1 diff --git a/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionDoubleExpData.hh b/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionDoubleExpData.hh index f82ba238cd..8721f5f0b2 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionDoubleExpData.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionDoubleExpData.hh @@ -39,7 +39,7 @@ // Further documentation available from http://www.ge.infn.it/geant4/lowE // ------------------------------------------------------------------- // $Id: G4hShellCrossSectionDoubleExpData.hh,v 1.3 2006/06/29 19:38:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4hShellCrossSectionDoubleExpData_HH #define G4hShellCrossSectionDoubleExpData_HH 1 diff --git a/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionExp.hh b/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionExp.hh index adbe398718..4ad9667603 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionExp.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionExp.hh @@ -44,7 +44,7 @@ // ------------------------------------------------------------------- // $Id: G4hShellCrossSectionExp.hh,v 1.3 2006/06/29 19:38:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4HSHELLCROSSSECTIONEXP_HH #define G4HSHELLCROSSSECTIONEXP_HH 1 diff --git a/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionExpData.hh b/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionExpData.hh index 1e626a775a..036a85c3ee 100644 --- a/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionExpData.hh +++ b/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionExpData.hh @@ -37,7 +37,7 @@ // Further documentation available from http://www.ge.infn.it/geant4/lowE // ------------------------------------------------------------------- // $Id: G4hShellCrossSectionExpData.hh,v 1.3 2006/06/29 19:38:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4hShellCrossSectionExpData_HH #define G4hShellCrossSectionExpData_HH 1 diff --git a/source/processes/electromagnetic/lowenergy/src/G4AtomicDeexcitation.cc b/source/processes/electromagnetic/lowenergy/src/G4AtomicDeexcitation.cc index 5f8489bbbc..ccafe5cfdb 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4AtomicDeexcitation.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4AtomicDeexcitation.cc @@ -25,7 +25,7 @@ // // // $Id: G4AtomicDeexcitation.cc,v 1.11 -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Authors: Elena Guardincerri (Elena.Guardincerri@ge.infn.it) // Alfonso Mantero (Alfonso.Mantero@ge.infn.it) diff --git a/source/processes/electromagnetic/lowenergy/src/G4AtomicShell.cc b/source/processes/electromagnetic/lowenergy/src/G4AtomicShell.cc index 4ea6e632cd..61a0dc2e49 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4AtomicShell.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4AtomicShell.cc @@ -25,7 +25,7 @@ // // // $Id: G4AtomicShell.cc,v 1.2 ???? -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Authors: Elena Guardincerri (Elena.Guardincerri@ge.infn.it) // Alfonso Mantero (Alfonso.Mantero@ge.infn.it) diff --git a/source/processes/electromagnetic/lowenergy/src/G4AtomicTransitionManager.cc b/source/processes/electromagnetic/lowenergy/src/G4AtomicTransitionManager.cc index 7dec47de58..b7b5062f05 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4AtomicTransitionManager.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4AtomicTransitionManager.cc @@ -25,7 +25,7 @@ // // // $Id: G4AtomicTransitionManager.cc,v 1.2 ???? -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Authors: Elena Guardincerri (Elena.Guardincerri@ge.infn.it) // Alfonso Mantero (Alfonso.Mantero@ge.infn.it) @@ -93,7 +93,7 @@ G4AtomicTransitionManager::G4AtomicTransitionManager(G4int minZ, G4int maxZ, G4int finalShell = fluoManager->VacancyId(vacancyIndex); size_t numberOfTransitions = fluoManager->NumberOfTransitions(vacancyIndex); - for (size_t origShellIndex = 0; origShellIndex <= numberOfTransitions; + for (size_t origShellIndex = 0; origShellIndex < numberOfTransitions; origShellIndex++) { diff --git a/source/processes/electromagnetic/lowenergy/src/G4AugerData.cc b/source/processes/electromagnetic/lowenergy/src/G4AugerData.cc index 91298f9bcf..a17480ee22 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4AugerData.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4AugerData.cc @@ -234,220 +234,221 @@ G4double G4AugerData::StartShellProb(G4int Z, G4int vacancyIndex,G4int transitio std::vector G4AugerData::LoadData(G4int Z) { // Build the complete string identifying the file with the data set - - std::ostringstream ost; - if(Z != 0){ - ost << "au-tr-pr-"<< Z << ".dat"; - } - else{ - ost << "au-tr-pr-"<<".dat"; - } - G4String name(ost.str()); - - char* path = getenv("G4LEDATA"); - if (!path) - { - G4String excep = "G4EMDataSet - G4LEDATA environment variable not set"; - G4Exception(excep); + + std::ostringstream ost; + if(Z != 0){ + ost << "au-tr-pr-"<< Z << ".dat"; } - - G4String pathString(path); - G4String dirFile = pathString + "/auger/" + name; - std::ifstream file(dirFile); - std::filebuf* lsdp = file.rdbuf(); - - if (! (lsdp->is_open()) ) - { - G4String excep = "G4AugerData - data file: " + dirFile + " not found"; - G4Exception(excep); + else{ + ost << "au-tr-pr-"<<".dat"; } + G4String name(ost.str()); + + char* path = getenv("G4LEDATA"); + if (!path) + { + G4String excep = "G4EMDataSet - G4LEDATA environment variable not set"; + G4Exception(excep); + } + + G4String pathString(path); + G4String dirFile = pathString + "/auger/" + name; + std::ifstream file(dirFile); + std::filebuf* lsdp = file.rdbuf(); + + if (! (lsdp->is_open()) ) + { + G4String excep = "G4AugerData - data file: " + dirFile + " not found"; + G4Exception(excep); + } - G4double a = 0; - G4int k = 1; - G4int s = 0; + G4double a = 0; + G4int k = 1; + G4int s = 0; - G4int vacId = 0; - std::vector* initIds = new std::vector; - std::vector* newIds = new std::vector; - G4DataVector* transEnergies = new G4DataVector; - G4DataVector* transProbabilities = new G4DataVector; - std::vector augerTransitionVector; - std::map,std::less >* newIdMap = - new std::map,std::less >; - std::map >* newEnergyMap = - new std::map >; - std::map >* newProbabilityMap = - new std::map >; + G4int vacId = 0; + std::vector* initIds = new std::vector; + std::vector* newIds = new std::vector; + G4DataVector* transEnergies = new G4DataVector; + G4DataVector* transProbabilities = new G4DataVector; + std::vector augerTransitionVector; + std::map,std::less >* newIdMap = + new std::map,std::less >; + std::map >* newEnergyMap = + new std::map >; + std::map >* newProbabilityMap = + new std::map >; - do { - file >> a; + do { + file >> a; - G4int nColumns = 4; + G4int nColumns = 4; - if (a == -1) - { + if (a == -1) + { - if (s == 0) - { - // End of a shell data set + if (s == 0) + { + // End of a shell data set - std::vector::iterator vectorIndex = initIds->begin(); + std::vector::iterator vectorIndex = initIds->begin(); - vacId = *vectorIndex; + vacId = *vectorIndex; - //initIds->erase(vectorIndex); + //initIds->erase(vectorIndex); - std::vector identifiers; - for (vectorIndex = initIds->begin()+1 ; vectorIndex != initIds->end(); ++vectorIndex){ + std::vector identifiers; + for (vectorIndex = initIds->begin()+1 ; vectorIndex != initIds->end(); ++vectorIndex){ - identifiers.push_back(*vectorIndex); + identifiers.push_back(*vectorIndex); + } + + vectorIndex = (initIds->end())-1; + + G4int augerShellId = *(vectorIndex); + + + (*newIdMap)[augerShellId] = *newIds; + (*newEnergyMap)[augerShellId] = *transEnergies; + (*newProbabilityMap)[augerShellId] = *transProbabilities; + + augerTransitionVector.push_back(G4AugerTransition(vacId, identifiers, newIdMap, newEnergyMap, newProbabilityMap)); + + // Now deleting all the variables I used, and creating new ones for the next shell + + delete newIdMap; + delete newEnergyMap; + delete newProbabilityMap; + + G4int n = initIds->size(); + nInitShells.push_back(n); + numberOfVacancies[Z]++; + delete initIds; + delete newIds; + delete transEnergies; + delete transProbabilities; + initIds = new std::vector; + newIds = new std::vector; + transEnergies = new G4DataVector; + transProbabilities = new G4DataVector; + newIdMap = new std::map,std::less >; + newEnergyMap = new std::map >; + newProbabilityMap = new std::map >; + + + + } + s++; + if (s == nColumns) + { + s = 0; } - - vectorIndex = (initIds->end())-1; - - G4int augerShellId = *(vectorIndex); - - - (*newIdMap)[augerShellId] = *newIds; - (*newEnergyMap)[augerShellId] = *transEnergies; - (*newProbabilityMap)[augerShellId] = *transProbabilities; - - augerTransitionVector.push_back(G4AugerTransition(vacId, identifiers, newIdMap, newEnergyMap, newProbabilityMap)); - - // Now deleting all the variables I used, and creating new ones for the next shell - - delete newIdMap; - delete newEnergyMap; - delete newProbabilityMap; - - G4int n = initIds->size(); - nInitShells.push_back(n); - numberOfVacancies[Z]++; - delete initIds; - delete newIds; - delete transEnergies; - delete transProbabilities; - initIds = new std::vector; - newIds = new std::vector; - transEnergies = new G4DataVector; - transProbabilities = new G4DataVector; - newIdMap = new std::map,std::less >; - newEnergyMap = new std::map >; - newProbabilityMap = new std::map >; - - - - } - s++; - if (s == nColumns) - { - s = 0; - } - } - else if (a == -2) - { - // End of file; delete the empty vectors created - //when encountering the last -1 -1 row - delete initIds; - delete newIds; - delete transEnergies; - delete transProbabilities; - delete newIdMap ; - delete newEnergyMap; - delete newProbabilityMap; - } - else - { + } + else if (a == -2) + { + // End of file; delete the empty vectors created + //when encountering the last -1 -1 row + delete initIds; + delete newIds; + delete transEnergies; + delete transProbabilities; + delete newIdMap ; + delete newEnergyMap; + delete newProbabilityMap; + } + else + { - if (k%nColumns == 3){ - // 3rd column is the transition probabilities - transProbabilities->push_back(a); + if (k%nColumns == 3){ + // 3rd column is the transition probabilities + transProbabilities->push_back(a); - k++;} - else if(k%nColumns == 2){ - // 2nd column is new auger vacancy + k++;} + else if(k%nColumns == 2){ + // 2nd column is new auger vacancy - // 2nd column is new auger vacancy + // 2nd column is new auger vacancy - G4int l = (G4int)a; - newIds->push_back(l); + G4int l = (G4int)a; + newIds->push_back(l); - k++; + k++; } - else if (k%nColumns == 1) - { - // 1st column is shell id + else if (k%nColumns == 1) + { + // 1st column is shell id - if(initIds->size() == 0) { + if(initIds->size() == 0) { - // if this is the first data of the shell, all the colums are equal - // to the shell Id; so we skip the next colums ang go to the next row + // if this is the first data of the shell, all the colums are equal + // to the shell Id; so we skip the next colums ang go to the next row - initIds->push_back((G4int)a); - // first line of initIds is the original shell of the vacancy - file >> a; - file >> a; - file >> a; - k = k+3; - } - else { + initIds->push_back((G4int)a); + // first line of initIds is the original shell of the vacancy + file >> a; + file >> a; + file >> a; + k = k+3; + } + else { - // std::vector::iterator vectorIndex = (initIds->end())-1; - if((G4int)a != initIds->back()){ + // std::vector::iterator vectorIndex = (initIds->end())-1; + if((G4int)a != initIds->back()){ - if((initIds->size()) == 1) { - initIds->push_back((G4int)a); - } - else { + if((initIds->size()) == 1) { + initIds->push_back((G4int)a); + } + else { - G4int augerShellId = 0; - augerShellId = initIds->back(); + G4int augerShellId = 0; + augerShellId = initIds->back(); - (*newIdMap)[augerShellId] = *newIds; - (*newEnergyMap)[augerShellId] = *transEnergies; - (*newProbabilityMap)[augerShellId] = *transProbabilities; - delete newIds; - delete transEnergies; - delete transProbabilities; - newIds = new std::vector; - transEnergies = new G4DataVector; - transProbabilities = new G4DataVector; - initIds->push_back((G4int)a); + (*newIdMap)[augerShellId] = *newIds; + (*newEnergyMap)[augerShellId] = *transEnergies; + (*newProbabilityMap)[augerShellId] = *transProbabilities; + delete newIds; + delete transEnergies; + delete transProbabilities; + newIds = new std::vector; + transEnergies = new G4DataVector; + transProbabilities = new G4DataVector; + initIds->push_back((G4int)a); + } } } - } - k++; + k++; - } - else if (k%nColumns == 0) + } + else if (k%nColumns == 0) - {//fourth column is transition energies - G4double e = a * MeV; + {//fourth column is transition energies + G4double e = a * MeV; - transEnergies->push_back(e); - k=1; + transEnergies->push_back(e); + k=1; - } - } - } + } + } + } - while (a != -2); // end of file - file.close(); - return augerTransitionVector; + while (a != -2); // end of file + file.close(); + return augerTransitionVector; + } void G4AugerData::BuildAugerTransitionTable() diff --git a/source/processes/electromagnetic/lowenergy/src/G4BremsstrahlungCrossSectionHandler.cc b/source/processes/electromagnetic/lowenergy/src/G4BremsstrahlungCrossSectionHandler.cc index c45c8bc47b..a6b5709e6c 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4BremsstrahlungCrossSectionHandler.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4BremsstrahlungCrossSectionHandler.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4BremsstrahlungCrossSectionHandler.cc,v 1.9 2006/06/29 19:38:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/lowenergy/src/G4BremsstrahlungParameters.cc b/source/processes/electromagnetic/lowenergy/src/G4BremsstrahlungParameters.cc index e7032a6e06..defe7073e5 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4BremsstrahlungParameters.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4BremsstrahlungParameters.cc @@ -25,7 +25,7 @@ // // // $Id: G4BremsstrahlungParameters.cc,v 1.19 2006/06/29 19:38:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch) // V.Ivanchenko (Vladimir.Ivantchenko@cern.ch) diff --git a/source/processes/electromagnetic/lowenergy/src/G4CompositeEMDataSet.cc b/source/processes/electromagnetic/lowenergy/src/G4CompositeEMDataSet.cc index c41baf7a1d..5d5982a6c6 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4CompositeEMDataSet.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4CompositeEMDataSet.cc @@ -25,7 +25,7 @@ // // // $Id: G4CompositeEMDataSet.cc,v 1.9 2006/06/29 19:38:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch) // diff --git a/source/processes/electromagnetic/lowenergy/src/G4CrossSectionHandler.cc b/source/processes/electromagnetic/lowenergy/src/G4CrossSectionHandler.cc index eb24f7985d..34be43c22e 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4CrossSectionHandler.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4CrossSectionHandler.cc @@ -25,7 +25,7 @@ // // // $Id: G4CrossSectionHandler.cc,v 1.18 2006/06/29 19:38:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch) // diff --git a/source/processes/electromagnetic/lowenergy/src/G4DNAAlphaPlusChargeDecrease.cc b/source/processes/electromagnetic/lowenergy/src/G4DNAAlphaPlusChargeDecrease.cc index d61a2a5ebf..43044ac7e7 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4DNAAlphaPlusChargeDecrease.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4DNAAlphaPlusChargeDecrease.cc @@ -25,7 +25,7 @@ // // // $Id: G4DNAAlphaPlusChargeDecrease.cc,v 1.2 2006/06/29 19:38:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4DNAAlphaPlusChargeDecrease.hh" #include "G4DNAGenericIonsManager.hh" diff --git a/source/processes/electromagnetic/lowenergy/src/G4DNAAlphaPlusChargeIncrease.cc b/source/processes/electromagnetic/lowenergy/src/G4DNAAlphaPlusChargeIncrease.cc index 9ed12b5833..cc6612f84b 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4DNAAlphaPlusChargeIncrease.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4DNAAlphaPlusChargeIncrease.cc @@ -25,7 +25,7 @@ // // // $Id: G4DNAAlphaPlusChargeIncrease.cc,v 1.2 2006/06/29 19:38:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4DNAAlphaPlusChargeIncrease.hh" #include "G4DNAGenericIonsManager.hh" diff --git a/source/processes/electromagnetic/lowenergy/src/G4DNAAlphaPlusExcitation.cc b/source/processes/electromagnetic/lowenergy/src/G4DNAAlphaPlusExcitation.cc index 454a7d64ca..3026dd93e7 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4DNAAlphaPlusExcitation.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4DNAAlphaPlusExcitation.cc @@ -25,7 +25,7 @@ // // // $Id: G4DNAAlphaPlusExcitation.cc,v 1.3 2006/06/29 19:38:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4DNAAlphaPlusExcitation.hh" #include "G4DNAGenericIonsManager.hh" diff --git a/source/processes/electromagnetic/lowenergy/src/G4DNAAlphaPlusPlusChargeDecrease.cc b/source/processes/electromagnetic/lowenergy/src/G4DNAAlphaPlusPlusChargeDecrease.cc index 6801524763..2b8c104436 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4DNAAlphaPlusPlusChargeDecrease.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4DNAAlphaPlusPlusChargeDecrease.cc @@ -25,7 +25,7 @@ // // // $Id: G4DNAAlphaPlusPlusChargeDecrease.cc,v 1.2 2006/06/29 19:38:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4DNAAlphaPlusPlusChargeDecrease.hh" #include "G4DNAGenericIonsManager.hh" diff --git a/source/processes/electromagnetic/lowenergy/src/G4DNAAlphaPlusPlusExcitation.cc b/source/processes/electromagnetic/lowenergy/src/G4DNAAlphaPlusPlusExcitation.cc index 8ec9f9b2c6..5feabd420e 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4DNAAlphaPlusPlusExcitation.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4DNAAlphaPlusPlusExcitation.cc @@ -25,7 +25,7 @@ // // // $Id: G4DNAAlphaPlusPlusExcitation.cc,v 1.3 2006/06/29 19:38:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4DNAAlphaPlusPlusExcitation.hh" #include "G4DNAGenericIonsManager.hh" diff --git a/source/processes/electromagnetic/lowenergy/src/G4DNABrennerAngularDistributionPolicy.cc b/source/processes/electromagnetic/lowenergy/src/G4DNABrennerAngularDistributionPolicy.cc index 67242b2b58..f21f943eeb 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4DNABrennerAngularDistributionPolicy.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4DNABrennerAngularDistributionPolicy.cc @@ -25,7 +25,7 @@ // // // $Id: G4DNABrennerAngularDistributionPolicy.cc,v 1.3 2006/06/29 19:39:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4DNAElectronElasticBrenner.hh" diff --git a/source/processes/electromagnetic/lowenergy/src/G4DNACrossSectionDataSet.cc b/source/processes/electromagnetic/lowenergy/src/G4DNACrossSectionDataSet.cc index d2da12d6f7..ccb0f1cbd4 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4DNACrossSectionDataSet.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4DNACrossSectionDataSet.cc @@ -25,7 +25,7 @@ // // // $Id: G4DNACrossSectionDataSet.cc,v 1.1.2.1 2006/06/29 19:39:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Riccardo Capra // diff --git a/source/processes/electromagnetic/lowenergy/src/G4DNAElectronBornExcitation.cc b/source/processes/electromagnetic/lowenergy/src/G4DNAElectronBornExcitation.cc index a454b0e801..d1d88b9c78 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4DNAElectronBornExcitation.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4DNAElectronBornExcitation.cc @@ -25,7 +25,7 @@ // // // $Id: G4DNAElectronBornExcitation.cc,v 1.3 2006/06/29 19:39:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4DNAElectronBornExcitation.hh" #include "G4Electron.hh" diff --git a/source/processes/electromagnetic/lowenergy/src/G4DNAElectronElasticBrenner.cc b/source/processes/electromagnetic/lowenergy/src/G4DNAElectronElasticBrenner.cc index 710bd0e2dd..8ba55cf6bf 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4DNAElectronElasticBrenner.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4DNAElectronElasticBrenner.cc @@ -25,7 +25,7 @@ // // // $Id: G4DNAElectronElasticBrenner.cc,v 1.4 2006/06/29 19:39:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4DNAElectronElasticBrenner.hh" diff --git a/source/processes/electromagnetic/lowenergy/src/G4DNAElectronElasticEmfietzoglou.cc b/source/processes/electromagnetic/lowenergy/src/G4DNAElectronElasticEmfietzoglou.cc index 8b7d0e8454..6f4c58660b 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4DNAElectronElasticEmfietzoglou.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4DNAElectronElasticEmfietzoglou.cc @@ -25,7 +25,7 @@ // // // $Id: G4DNAElectronElasticEmfietzoglou.cc,v 1.3 2006/06/29 19:39:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4DNAElectronElasticEmfietzoglou.hh" diff --git a/source/processes/electromagnetic/lowenergy/src/G4DNAElectronExcitation.cc b/source/processes/electromagnetic/lowenergy/src/G4DNAElectronExcitation.cc index 2630e96add..52ac7ede7c 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4DNAElectronExcitation.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4DNAElectronExcitation.cc @@ -25,7 +25,7 @@ // // // $Id: G4DNAElectronExcitation.cc,v 1.2 2006/06/29 19:39:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4DNAElectronExcitation.hh" #include "G4Electron.hh" diff --git a/source/processes/electromagnetic/lowenergy/src/G4DNAEmfietzoglouAngularDistributionPolicy.cc b/source/processes/electromagnetic/lowenergy/src/G4DNAEmfietzoglouAngularDistributionPolicy.cc index b6fbe9c94b..36a3c951f1 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4DNAEmfietzoglouAngularDistributionPolicy.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4DNAEmfietzoglouAngularDistributionPolicy.cc @@ -25,7 +25,7 @@ // // // $Id: G4DNAEmfietzoglouAngularDistributionPolicy.cc,v 1.3 2006/06/29 19:39:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4DNAEmfietzoglouAngularDistributionPolicy.hh" diff --git a/source/processes/electromagnetic/lowenergy/src/G4DNAGenericIonsManager.cc b/source/processes/electromagnetic/lowenergy/src/G4DNAGenericIonsManager.cc index d0aa4432c8..26ccecab3a 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4DNAGenericIonsManager.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4DNAGenericIonsManager.cc @@ -25,7 +25,7 @@ // // // $Id: G4DNAGenericIonsManager.cc,v 1.4 2006/06/29 19:39:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4DNAGenericIonsManager.hh" #include "G4Alpha.hh" diff --git a/source/processes/electromagnetic/lowenergy/src/G4DNAHeliumChargeIncrease.cc b/source/processes/electromagnetic/lowenergy/src/G4DNAHeliumChargeIncrease.cc index 164ba5ed4b..e72b930426 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4DNAHeliumChargeIncrease.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4DNAHeliumChargeIncrease.cc @@ -25,7 +25,7 @@ // // // $Id: G4DNAHeliumChargeIncrease.cc,v 1.2 2006/06/29 19:39:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4DNAHeliumChargeIncrease.hh" #include "G4DNAGenericIonsManager.hh" diff --git a/source/processes/electromagnetic/lowenergy/src/G4DNAHeliumExcitation.cc b/source/processes/electromagnetic/lowenergy/src/G4DNAHeliumExcitation.cc index 8982c70d32..02efde1d19 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4DNAHeliumExcitation.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4DNAHeliumExcitation.cc @@ -25,7 +25,7 @@ // // // $Id: G4DNAHeliumExcitation.cc,v 1.3 2006/06/29 19:39:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4DNAHeliumExcitation.hh" #include "G4DNAGenericIonsManager.hh" diff --git a/source/processes/electromagnetic/lowenergy/src/G4DNAHydrogenChargeIncrease.cc b/source/processes/electromagnetic/lowenergy/src/G4DNAHydrogenChargeIncrease.cc index d3040addf6..040e68b1d8 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4DNAHydrogenChargeIncrease.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4DNAHydrogenChargeIncrease.cc @@ -25,7 +25,7 @@ // // // $Id: G4DNAHydrogenChargeIncrease.cc,v 1.2 2006/06/29 19:39:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4DNAHydrogenChargeIncrease.hh" #include "G4DNAGenericIonsManager.hh" diff --git a/source/processes/electromagnetic/lowenergy/src/G4DNAHydrogenRuddIonization.cc b/source/processes/electromagnetic/lowenergy/src/G4DNAHydrogenRuddIonization.cc index 33f6caf7f3..c2b9014cfa 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4DNAHydrogenRuddIonization.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4DNAHydrogenRuddIonization.cc @@ -25,7 +25,7 @@ // // // $Id: G4DNAHydrogenRuddIonization.cc,v 1.3 2006/06/29 19:39:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4DNAHydrogenRuddIonization.hh" #include "G4DNAGenericIonsManager.hh" diff --git a/source/processes/electromagnetic/lowenergy/src/G4DNAProtonBornExcitation.cc b/source/processes/electromagnetic/lowenergy/src/G4DNAProtonBornExcitation.cc index 96fec8b418..256919384b 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4DNAProtonBornExcitation.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4DNAProtonBornExcitation.cc @@ -25,7 +25,7 @@ // // // $Id: G4DNAProtonBornExcitation.cc,v 1.3 2006/06/29 19:39:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4DNAProtonBornExcitation.hh" #include "G4Proton.hh" diff --git a/source/processes/electromagnetic/lowenergy/src/G4DNAProtonChargeDecrease.cc b/source/processes/electromagnetic/lowenergy/src/G4DNAProtonChargeDecrease.cc index 55472beec7..455cc3e8da 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4DNAProtonChargeDecrease.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4DNAProtonChargeDecrease.cc @@ -25,7 +25,7 @@ // // // $Id: G4DNAProtonChargeDecrease.cc,v 1.3 2006/06/29 19:39:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4DNAProtonChargeDecrease.hh" #include "G4Proton.hh" diff --git a/source/processes/electromagnetic/lowenergy/src/G4DNAProtonChargeIncrease.cc b/source/processes/electromagnetic/lowenergy/src/G4DNAProtonChargeIncrease.cc index e55d3c19b9..fd24ac300b 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4DNAProtonChargeIncrease.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4DNAProtonChargeIncrease.cc @@ -25,7 +25,7 @@ // // // $Id: G4DNAProtonChargeIncrease.cc,v 1.4 2006/06/29 19:39:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4DNAProtonChargeIncrease.hh" #include "G4DNAGenericIonsManager.hh" diff --git a/source/processes/electromagnetic/lowenergy/src/G4DNAProtonExcitation.cc b/source/processes/electromagnetic/lowenergy/src/G4DNAProtonExcitation.cc index 807b9b7ce5..bcddae519e 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4DNAProtonExcitation.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4DNAProtonExcitation.cc @@ -25,7 +25,7 @@ // // // $Id: G4DNAProtonExcitation.cc,v 1.2 2006/06/29 19:39:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4DNAProtonExcitation.hh" #include "G4Proton.hh" diff --git a/source/processes/electromagnetic/lowenergy/src/G4DNAProtonRuddIonization.cc b/source/processes/electromagnetic/lowenergy/src/G4DNAProtonRuddIonization.cc index c123deb9b3..f63318c27a 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4DNAProtonRuddIonization.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4DNAProtonRuddIonization.cc @@ -25,7 +25,7 @@ // // // $Id: G4DNAProtonRuddIonization.cc,v 1.4 2006/06/29 19:39:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4DNAProtonRuddIonization.hh" #include "G4Proton.hh" diff --git a/source/processes/electromagnetic/lowenergy/src/G4EMDataSet.cc b/source/processes/electromagnetic/lowenergy/src/G4EMDataSet.cc index f56ff104fc..2300b4adcb 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4EMDataSet.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4EMDataSet.cc @@ -25,7 +25,7 @@ // // // $Id: G4EMDataSet.cc,v 1.12 2006/06/29 19:39:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch) // diff --git a/source/processes/electromagnetic/lowenergy/src/G4FluoData.cc b/source/processes/electromagnetic/lowenergy/src/G4FluoData.cc index 96b481d971..82ccbc93ef 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4FluoData.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4FluoData.cc @@ -117,9 +117,11 @@ G4int G4FluoData::StartShellId(G4int initIndex, G4int vacancyIndex) const G4DataVector dataSet = *((*pos).second); G4int nData = dataSet.size(); + //The first Element of idMap's dataSets is the original shell of the vacancy, + //so we must start from the first element of dataSet if (initIndex >= 0 && initIndex < nData) { - n = (G4int) dataSet[initIndex]; + n = (G4int) dataSet[initIndex+1]; } } @@ -210,7 +212,7 @@ void G4FluoData::LoadData(G4int Z) G4int k = 1; G4int s = 0; - G4int vacId = 0; + G4int vacIndex = 0; G4DataVector* initIds = new G4DataVector; G4DataVector* transEnergies = new G4DataVector; G4DataVector* transProbabilities = new G4DataVector; @@ -223,9 +225,9 @@ void G4FluoData::LoadData(G4int Z) if (s == 0) { // End of a shell data set - idMap[vacId] = initIds; - energyMap[vacId] = transEnergies; - probabilityMap[vacId] = transProbabilities; + idMap[vacIndex] = initIds; + energyMap[vacIndex] = transEnergies; + probabilityMap[vacIndex] = transProbabilities; // G4double size=transProbabilities->size(); G4int n = initIds->size(); @@ -235,7 +237,7 @@ void G4FluoData::LoadData(G4int Z) initIds = new G4DataVector; transEnergies = new G4DataVector; transProbabilities = new G4DataVector; - vacId++; + vacIndex++; } s++; if (s == nColumns) @@ -258,24 +260,33 @@ void G4FluoData::LoadData(G4int Z) { // 2nd column is transition probabilities - transProbabilities->push_back(a); + if (a != -1) transProbabilities->push_back(a); k++; } else if (k%nColumns == 1) { - // 1st column is shell id - - initIds->push_back(a); + // 1st column is shell id + // if this is the first data of the shell, all the colums are equal + // to the shell Id; so we skip the next colums ang go to the next row + if(initIds->size() == 0) { + if (a != -1) initIds->push_back((G4int)a); + file >> a; + file >> a; + k=k+2; + } + else{ + if (a != -1) initIds->push_back(a); + } k++; - } else if (k%nColumns == 0) {//third column is transition energies - G4double e = a * MeV; - transEnergies->push_back(e); + if (a != -1) + {G4double e = a * MeV; + transEnergies->push_back(e);} k=1; } @@ -295,9 +306,11 @@ void G4FluoData::PrintData() <<" ----- " < diff --git a/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionDoubleExpData.cc b/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionDoubleExpData.cc index e4a7dc12be..a61bafbb81 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionDoubleExpData.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionDoubleExpData.cc @@ -33,7 +33,7 @@ // // ------------------------------------------------------------------- // $Id: G4hShellCrossSectionDoubleExpData.cc,v 1.4 2006/06/29 19:42:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4hShellCrossSectionDoubleExpData.hh" diff --git a/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionExp.cc b/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionExp.cc index ccb8d3273b..b19a78b001 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionExp.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionExp.cc @@ -41,7 +41,7 @@ // Empiric Model for shell cross sections in proton ionisation // ------------------------------------------------------------------- // $Id: G4hShellCrossSectionExp.cc,v 1.5 2006/06/29 19:42:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "globals.hh" #include diff --git a/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionExpData.cc b/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionExpData.cc index 785bfc8ee2..e7647c3019 100644 --- a/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionExpData.cc +++ b/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionExpData.cc @@ -33,7 +33,7 @@ // // ------------------------------------------------------------------- // $Id: G4hShellCrossSectionExpData.cc,v 1.3 2006/06/29 19:42:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4hShellCrossSectionExpData.hh" #include diff --git a/source/processes/electromagnetic/muons/History b/source/processes/electromagnetic/muons/History index 33aed48ca8..a5a62dcd8f 100644 --- a/source/processes/electromagnetic/muons/History +++ b/source/processes/electromagnetic/muons/History @@ -1,4 +1,4 @@ -$Id: History,v 1.91 2006/05/03 16:41:01 vnivanch Exp $ +$Id: History,v 1.93 2006/10/16 15:31:01 vnivanch Exp $ ------------------------------------------------------------------- ========================================================= @@ -17,6 +17,12 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +16 Oct 06: V.Ivanchenko (emmuons-V08-01-01) +- Add warning to all processes 52 type + +21 July 06: V.Ivant (emmuons-V08-01-00) +- G4EnergyLossForExtrapolator - fix misprint in method name + 21 March 06: V.Ivant (emmuons-V08-00-03) - G4EnergyLossForExtrapolator - fix compilation warning - remove G4Material* from number of methods diff --git a/source/processes/electromagnetic/muons/include/G4EnergyLossForExtrapolator.hh b/source/processes/electromagnetic/muons/include/G4EnergyLossForExtrapolator.hh index 3c41e32ade..92b257edcc 100644 --- a/source/processes/electromagnetic/muons/include/G4EnergyLossForExtrapolator.hh +++ b/source/processes/electromagnetic/muons/include/G4EnergyLossForExtrapolator.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4EnergyLossForExtrapolator.hh,v 1.6 2006/06/29 19:49:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4EnergyLossForExtrapolator.hh,v 1.7 2006/07/21 09:39:02 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // @@ -90,7 +90,7 @@ public: G4double EnergyDispersion(G4double kinEnergy, G4double step, const G4Material*, const G4ParticleDefinition*); - G4double EnergyDispertion(G4double kinEnergy, G4double step, + G4double EnergyDispersion(G4double kinEnergy, G4double step, const G4Material*, const G4String& particleName); G4double ComputeDEDX(G4double kinEnergy, const G4ParticleDefinition*); @@ -200,7 +200,7 @@ inline G4double G4EnergyLossForExtrapolator::AverageScatteringAngle(G4double kin //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... -inline G4double G4EnergyLossForExtrapolator::EnergyDispertion(G4double kinEnergy, +inline G4double G4EnergyLossForExtrapolator::EnergyDispersion(G4double kinEnergy, G4double step, const G4Material* mat, const G4String& name) diff --git a/source/processes/electromagnetic/muons/include/G4MuBetheBlochModel.hh b/source/processes/electromagnetic/muons/include/G4MuBetheBlochModel.hh index 29b50d2c82..0dd69ff61d 100644 --- a/source/processes/electromagnetic/muons/include/G4MuBetheBlochModel.hh +++ b/source/processes/electromagnetic/muons/include/G4MuBetheBlochModel.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4MuBetheBlochModel.hh,v 1.16 2006/06/29 19:49:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung.hh b/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung.hh index 0e31ff55db..e909ab750c 100644 --- a/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung.hh +++ b/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4MuBremsstrahlung.hh,v 1.27 2006/06/29 19:49:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung52.hh b/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung52.hh index 53d92f5496..f8192a431d 100644 --- a/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung52.hh +++ b/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung52.hh @@ -25,7 +25,7 @@ // // // $Id: G4MuBremsstrahlung52.hh,v 1.4 2006/06/29 19:49:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------- G4MuBremsstrahlung52 physics process ------------------ // by Laszlo Urban, September 1997 diff --git a/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung52.icc b/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung52.icc index 6e2ca43a01..88c16365dc 100644 --- a/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung52.icc +++ b/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung52.icc @@ -25,7 +25,7 @@ // // // $Id: G4MuBremsstrahlung52.icc,v 1.2 2006/06/29 19:49:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------- G4MuBremsstrahlung52 physics process ------------------ // by Laszlo Urban, September 1997 diff --git a/source/processes/electromagnetic/muons/include/G4MuBremsstrahlungModel.hh b/source/processes/electromagnetic/muons/include/G4MuBremsstrahlungModel.hh index 3c5e893600..33f285f4ed 100644 --- a/source/processes/electromagnetic/muons/include/G4MuBremsstrahlungModel.hh +++ b/source/processes/electromagnetic/muons/include/G4MuBremsstrahlungModel.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4MuBremsstrahlungModel.hh,v 1.15 2006/06/29 19:49:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/muons/include/G4MuIonisation.hh b/source/processes/electromagnetic/muons/include/G4MuIonisation.hh index fd447d5190..0809e8e4fb 100644 --- a/source/processes/electromagnetic/muons/include/G4MuIonisation.hh +++ b/source/processes/electromagnetic/muons/include/G4MuIonisation.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4MuIonisation.hh,v 1.28 2006/06/29 19:49:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/muons/include/G4MuIonisation52.hh b/source/processes/electromagnetic/muons/include/G4MuIonisation52.hh index 46b2dc54b4..2ded4b8e6e 100644 --- a/source/processes/electromagnetic/muons/include/G4MuIonisation52.hh +++ b/source/processes/electromagnetic/muons/include/G4MuIonisation52.hh @@ -25,7 +25,7 @@ // // // $Id: G4MuIonisation52.hh,v 1.4 2006/06/29 19:49:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // --------------- G4MuIonisation52 physics process ------------------------------ // by Laszlo Urban, September 1997 diff --git a/source/processes/electromagnetic/muons/include/G4MuIonisation52.icc b/source/processes/electromagnetic/muons/include/G4MuIonisation52.icc index cc46baa23f..c8d9a1a6dc 100644 --- a/source/processes/electromagnetic/muons/include/G4MuIonisation52.icc +++ b/source/processes/electromagnetic/muons/include/G4MuIonisation52.icc @@ -25,7 +25,7 @@ // // // $Id: G4MuIonisation52.icc,v 1.2 2006/06/29 19:49:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // GEANT 4 class inlined methods file diff --git a/source/processes/electromagnetic/muons/include/G4MuPairProduction.hh b/source/processes/electromagnetic/muons/include/G4MuPairProduction.hh index e8d266f33d..4f9fd41a05 100644 --- a/source/processes/electromagnetic/muons/include/G4MuPairProduction.hh +++ b/source/processes/electromagnetic/muons/include/G4MuPairProduction.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4MuPairProduction.hh,v 1.27 2006/06/29 19:49:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/muons/include/G4MuPairProduction52.hh b/source/processes/electromagnetic/muons/include/G4MuPairProduction52.hh index 2cb3f7d50b..7d5a8145f1 100644 --- a/source/processes/electromagnetic/muons/include/G4MuPairProduction52.hh +++ b/source/processes/electromagnetic/muons/include/G4MuPairProduction52.hh @@ -25,7 +25,7 @@ // // // $Id: G4MuPairProduction52.hh,v 1.4 2006/06/29 19:49:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------- G4MuPairProduction52 physics process ------------------ // by Laszlo Urban, May 1998 diff --git a/source/processes/electromagnetic/muons/include/G4MuPairProduction52.icc b/source/processes/electromagnetic/muons/include/G4MuPairProduction52.icc index 1a6e42f09b..4d6e870cf9 100644 --- a/source/processes/electromagnetic/muons/include/G4MuPairProduction52.icc +++ b/source/processes/electromagnetic/muons/include/G4MuPairProduction52.icc @@ -25,7 +25,7 @@ // // // $Id: G4MuPairProduction52.icc,v 1.2 2006/06/29 19:49:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------- G4MuPairProduction52 physics process ------------------ // by Laszlo Urban, May 1998 diff --git a/source/processes/electromagnetic/muons/include/G4MuPairProductionModel.hh b/source/processes/electromagnetic/muons/include/G4MuPairProductionModel.hh index d2f8435af4..3e24bb598f 100644 --- a/source/processes/electromagnetic/muons/include/G4MuPairProductionModel.hh +++ b/source/processes/electromagnetic/muons/include/G4MuPairProductionModel.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4MuPairProductionModel.hh,v 1.20 2006/06/29 19:49:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/muons/include/G4VMuEnergyLoss.hh b/source/processes/electromagnetic/muons/include/G4VMuEnergyLoss.hh index b4765a22af..0437f67035 100644 --- a/source/processes/electromagnetic/muons/include/G4VMuEnergyLoss.hh +++ b/source/processes/electromagnetic/muons/include/G4VMuEnergyLoss.hh @@ -25,7 +25,7 @@ // // // $Id: G4VMuEnergyLoss.hh,v 1.11 2006/06/29 19:49:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // ------------------------------------------------------------------- // GEANT 4 class header file // diff --git a/source/processes/electromagnetic/muons/include/G4VMuEnergyLoss.icc b/source/processes/electromagnetic/muons/include/G4VMuEnergyLoss.icc index bbfee836c2..5f57cb878b 100644 --- a/source/processes/electromagnetic/muons/include/G4VMuEnergyLoss.icc +++ b/source/processes/electromagnetic/muons/include/G4VMuEnergyLoss.icc @@ -25,7 +25,7 @@ // // // $Id: G4VMuEnergyLoss.icc,v 1.5 2006/06/29 19:49:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // --------------------------------------------------------------- // GEANT 4 class inlined methods file // diff --git a/source/processes/electromagnetic/muons/src/G4EnergyLossForExtrapolator.cc b/source/processes/electromagnetic/muons/src/G4EnergyLossForExtrapolator.cc index bdfc56755a..74da39121f 100644 --- a/source/processes/electromagnetic/muons/src/G4EnergyLossForExtrapolator.cc +++ b/source/processes/electromagnetic/muons/src/G4EnergyLossForExtrapolator.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4EnergyLossForExtrapolator.cc,v 1.9 2006/06/29 19:49:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/muons/src/G4MuBetheBlochModel.cc b/source/processes/electromagnetic/muons/src/G4MuBetheBlochModel.cc index da2d167129..dc0e40f974 100644 --- a/source/processes/electromagnetic/muons/src/G4MuBetheBlochModel.cc +++ b/source/processes/electromagnetic/muons/src/G4MuBetheBlochModel.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4MuBetheBlochModel.cc,v 1.22 2006/06/29 19:49:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/muons/src/G4MuBremsstrahlung.cc b/source/processes/electromagnetic/muons/src/G4MuBremsstrahlung.cc index f23c5d73f7..e34115cc83 100644 --- a/source/processes/electromagnetic/muons/src/G4MuBremsstrahlung.cc +++ b/source/processes/electromagnetic/muons/src/G4MuBremsstrahlung.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4MuBremsstrahlung.cc,v 1.37 2006/06/29 19:49:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/muons/src/G4MuBremsstrahlung52.cc b/source/processes/electromagnetic/muons/src/G4MuBremsstrahlung52.cc index d91e9a19d7..979fa6a5e9 100644 --- a/source/processes/electromagnetic/muons/src/G4MuBremsstrahlung52.cc +++ b/source/processes/electromagnetic/muons/src/G4MuBremsstrahlung52.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4MuBremsstrahlung52.cc,v 1.5 2006/06/29 19:49:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4MuBremsstrahlung52.cc,v 1.6 2006/10/16 15:31:01 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------- G4MuBremsstrahlung52 physics process --------------------------- @@ -708,6 +708,8 @@ void G4MuBremsstrahlung52::PrintInfoDefinition() "Energy") << " to " << G4BestUnit(UpperBoundLambda,"Energy") << " in " << NbinLambda << " bins. \n"; + G4cout << " WARNING: This process is obsolete and will be soon removed" + << G4endl; } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/source/processes/electromagnetic/muons/src/G4MuBremsstrahlungModel.cc b/source/processes/electromagnetic/muons/src/G4MuBremsstrahlungModel.cc index d331d55b1c..667f7f5c64 100644 --- a/source/processes/electromagnetic/muons/src/G4MuBremsstrahlungModel.cc +++ b/source/processes/electromagnetic/muons/src/G4MuBremsstrahlungModel.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4MuBremsstrahlungModel.cc,v 1.21 2006/06/29 19:49:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/muons/src/G4MuIonisation.cc b/source/processes/electromagnetic/muons/src/G4MuIonisation.cc index 1e20687d49..d380f2cdfa 100644 --- a/source/processes/electromagnetic/muons/src/G4MuIonisation.cc +++ b/source/processes/electromagnetic/muons/src/G4MuIonisation.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4MuIonisation.cc,v 1.53 2006/06/29 19:49:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/muons/src/G4MuIonisation52.cc b/source/processes/electromagnetic/muons/src/G4MuIonisation52.cc index 363ea62624..3192783147 100644 --- a/source/processes/electromagnetic/muons/src/G4MuIonisation52.cc +++ b/source/processes/electromagnetic/muons/src/G4MuIonisation52.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4MuIonisation52.cc,v 1.5 2006/06/29 19:49:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4MuIonisation52.cc,v 1.6 2006/10/16 15:31:01 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // --------------- G4MuIonisation52 physics process ------------------------------ // by Laszlo Urban, September 1997 @@ -576,6 +576,8 @@ void G4MuIonisation52::PrintInfoDefinition() "Energy") << " to " << G4BestUnit(UpperBoundLambda,"Energy") << " in " << NbinLambda << " bins. \n"; + G4cout << " WARNING: This process is obsolete and will be soon removed" + << G4endl; } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/source/processes/electromagnetic/muons/src/G4MuPairProduction.cc b/source/processes/electromagnetic/muons/src/G4MuPairProduction.cc index 8f368bcc28..f9cc1906ae 100644 --- a/source/processes/electromagnetic/muons/src/G4MuPairProduction.cc +++ b/source/processes/electromagnetic/muons/src/G4MuPairProduction.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4MuPairProduction.cc,v 1.47 2006/06/29 19:49:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/muons/src/G4MuPairProduction52.cc b/source/processes/electromagnetic/muons/src/G4MuPairProduction52.cc index 14521326a9..20cecc4b1d 100644 --- a/source/processes/electromagnetic/muons/src/G4MuPairProduction52.cc +++ b/source/processes/electromagnetic/muons/src/G4MuPairProduction52.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4MuPairProduction52.cc,v 1.5 2006/06/29 19:49:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4MuPairProduction52.cc,v 1.6 2006/10/16 15:31:01 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------- G4MuPairProduction52 physics process --------------------------- // by Laszlo Urban, May 1998 @@ -914,6 +914,8 @@ void G4MuPairProduction52::PrintInfoDefinition() "Energy") << " to " << G4BestUnit(UpperBoundLambda,"Energy") << " in " << NbinLambda << " bins. \n"; + G4cout << " WARNING: This process is obsolete and will be soon removed" + << G4endl; } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/source/processes/electromagnetic/muons/src/G4MuPairProductionModel.cc b/source/processes/electromagnetic/muons/src/G4MuPairProductionModel.cc index 77751b6e15..6f39676d6a 100644 --- a/source/processes/electromagnetic/muons/src/G4MuPairProductionModel.cc +++ b/source/processes/electromagnetic/muons/src/G4MuPairProductionModel.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4MuPairProductionModel.cc,v 1.30 2006/06/29 19:49:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/muons/src/G4VMuEnergyLoss.cc b/source/processes/electromagnetic/muons/src/G4VMuEnergyLoss.cc index dd33a9171f..7065b37121 100644 --- a/source/processes/electromagnetic/muons/src/G4VMuEnergyLoss.cc +++ b/source/processes/electromagnetic/muons/src/G4VMuEnergyLoss.cc @@ -25,7 +25,7 @@ // // // $Id: G4VMuEnergyLoss.cc,v 1.32 2006/06/29 19:49:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // -------------------------------------------------------------- // GEANT 4 class implementation file // diff --git a/source/processes/electromagnetic/polarisation/GNUmakefile b/source/processes/electromagnetic/polarisation/GNUmakefile new file mode 100644 index 0000000000..db67029b31 --- /dev/null +++ b/source/processes/electromagnetic/polarisation/GNUmakefile @@ -0,0 +1,37 @@ +# $Id: GNUmakefile,v 1.1 2006/09/21 21:35:10 vnivanch Exp $ +# -------------------------------------------------------------------- +# GNUmakefile for electromagnetic sub-library. John Allison, 25/6/98. +# Modified: +# 19.11.2004 V.Ivanchenko remove obsolete parts +# -------------------------------------------------------------------- + +name := G4empolar + +ifndef G4INSTALL + G4INSTALL = ../../../.. +endif + +include $(G4INSTALL)/config/architecture.gmk + +CPPFLAGS += -I$(G4BASE)/global/management/include \ + -I$(G4BASE)/global/HEPRandom/include \ + -I$(G4BASE)/global/HEPGeometry/include \ + -I$(G4BASE)/global/HEPNumerics/include \ + -I$(G4BASE)/geometry/management/include \ + -I$(G4BASE)/geometry/volumes/include \ + -I$(G4BASE)/track/include \ + -I$(G4BASE)/processes/management/include \ + -I$(G4BASE)/processes/cuts/include \ + -I$(G4BASE)/processes/electromagnetic/utils/include \ + -I$(G4BASE)/processes/electromagnetic/standard/include \ + -I$(G4BASE)/particles/management/include \ + -I$(G4BASE)/particles/bosons/include \ + -I$(G4BASE)/particles/leptons/include \ + -I$(G4BASE)/particles/hadrons/barions/include \ + -I$(G4BASE)/particles/hadrons/mesons/include \ + -I$(G4BASE)/particles/hadrons/ions/include \ + -I$(G4BASE)/intercoms/include \ + -I$(G4BASE)/materials/include + +include $(G4INSTALL)/config/common.gmk + diff --git a/source/processes/electromagnetic/polarisation/History b/source/processes/electromagnetic/polarisation/History new file mode 100644 index 0000000000..afc0b1a3c4 --- /dev/null +++ b/source/processes/electromagnetic/polarisation/History @@ -0,0 +1,52 @@ +$Id: History,v 1.6 2006/11/20 12:21:25 vnivanch Exp $ +------------------------------------------------------------------- + + ========================================================= + Geant4 - an Object-Oriented Toolkit for Simulation in HEP + ========================================================= + + Category History file + --------------------- +This file should be used by G4 developers and category coordinators +to briefly summarize all major modifications introduced in the code +and keep track of all category-tags. +It DOES NOT substitute the CVS log-message one should put at every +committal in the CVS repository ! + + ---------------------------------------------------------- + * Reverse chronological order (last date on top), please * + ---------------------------------------------------------- + +20 November 06: V.Ivanchenko (empolar-V08-01-04) +- G4PolarizedAnnihilationCrossSection fixed compilation problem at windows + +17 November 06: V.Ivanchenko (empolar-V08-01-03) +- Add protection against zero kin energy in G4PolarizedAnnihilationModel +- substitue double -> G4double, int -> G4int, bool ->G4bool + +10 November 06: V.Ivanchenko (empolar-V08-01-02) +9. November 06: A.Schaelicke +- G4PolarizedGammaConversionModel : add warning message if polarization + transfer does not work properly +- G4PolarizedPairProductionCrossSection : bug fixed in Initialize(), + and corrected spelling warning message +- G4PolarizedAnnihilationModel : SampleSecondaries() bug fixed in + return statement and call to cross section. +- G4PolarizedAnnihilationCrossSection : Initialize() bug fixed in + dicing and sign in cross section. +- G4PolarizedComptonCrossSection and G4PolarizedComptonModel: + use correct convention of photon polarization vectors. +- G4PolarizedMollerBhabhaModel : bug fixed in eps dicing, added + warning message, employ new cross section calculation (made conform + to other polarized processes) +- G4PolarizedBhabhaCrossSection and G4PolarizedMollerCrossSection : + new cross section calculation to make polarization vector conform to + other polarized processes + +29 Sept 06: G.Cosmo (empolar-V08-01-01) +- Fixed for usage of std namespace and porting on WIN32-VC platform. + +21 Sept 06: V.Ivantchenko (empolar-V08-01-00) +- First commit. + + diff --git a/source/processes/electromagnetic/polarisation/include/G4PolarizationHelper.hh b/source/processes/electromagnetic/polarisation/include/G4PolarizationHelper.hh new file mode 100644 index 0000000000..c9529f3e37 --- /dev/null +++ b/source/processes/electromagnetic/polarisation/include/G4PolarizationHelper.hh @@ -0,0 +1,60 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4PolarizationHelper.hh,v 1.1 2006/09/21 21:35:10 vnivanch Exp $ +// tag $Name: geant4-08-02 $ +// +// GEANT4 Class header file +// +// +// File name: G4PolarizationHelper +// +// Author: Andreas Schaelicke +// +// Creation date: 12.08.2006 +// +// Class Description: +// +// Provides polarization some basic transformation routines. + +#ifndef G4PolarizationHelper_h +#define G4PolarizationHelper_h 1 + +#include "globals.hh" +#include "G4ThreeVector.hh" + +class G4PolarizationHelper { +public: + static G4ThreeVector GetFrame(const G4ThreeVector &, const G4ThreeVector &); + static G4ThreeVector GetParticleFrameX(const G4ThreeVector &); + static G4ThreeVector GetParticleFrameY(const G4ThreeVector &); + + static G4ThreeVector GetSpinInPRF(const G4ThreeVector &uZ,const G4ThreeVector &spin); + + static void TestPolarizationTransformations(); + static void TestInteractionFrame(); +}; + +#endif diff --git a/source/processes/electromagnetic/polarisation/include/G4PolarizationManager.hh b/source/processes/electromagnetic/polarisation/include/G4PolarizationManager.hh new file mode 100644 index 0000000000..c09506334e --- /dev/null +++ b/source/processes/electromagnetic/polarisation/include/G4PolarizationManager.hh @@ -0,0 +1,133 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4PolarizationManager.hh,v 1.1 2006/09/21 21:35:10 vnivanch Exp $ +// tag $Name: geant4-08-02 $ +// +// GEANT4 Class header file +// +// +// File name: G4PolarizationManager +// +// Author: Andreas Schaelicke +// +// Creation date: 01.05.2005 +// +// Modifications: +// 12-08-06 Helper routines are moved to G4PolarizationHelper +// +// Class Description: +// +// Provides polarization information for logical volumes, and some basic +// transformation routines. + +#ifndef G4PolarizationManager_h +#define G4PolarizationManager_h 1 + +#include "globals.hh" +#include +#include "G4ThreeVector.hh" + +#include + +class G4LogicalVolume; +class G4PolarizationManager; +class G4PolarizationMessenger; + +typedef std::map PolarizationMap; + +class G4PolarizationManager { +public: + + virtual ~G4PolarizationManager(); + static G4PolarizationManager* GetInstance(); + static void Dispose(); + + void ListVolumes(); + inline void Clean(); + + void SetVolumePolarization(G4LogicalVolume* lVol, const G4ThreeVector & pol); + void SetVolumePolarization(const G4String & lVolName, const G4ThreeVector & pol); + + inline const G4ThreeVector & GetVolumePolarization(G4LogicalVolume* lVol) const; + inline bool IsPolarized(G4LogicalVolume* lVol) const; + + inline void SetVerbose(G4int val); + inline G4int GetVerbose() const; + + inline void SetActivated(G4bool val); + inline bool IsActivated() const; + +private: + G4PolarizationManager(); + + G4ThreeVector zeroPolarization; + PolarizationMap volumePolarizations; + G4PolarizationMessenger * messenger; + + G4int verboseLevel; + G4bool activated; + + static G4PolarizationManager* instance; +}; + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +inline const G4ThreeVector & G4PolarizationManager::GetVolumePolarization(G4LogicalVolume* lVol) const +{ + if (!activated) return zeroPolarization; + PolarizationMap::const_iterator cit=volumePolarizations.find(lVol); + if (cit!=volumePolarizations.end()) return cit->second; + return zeroPolarization; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +inline bool G4PolarizationManager::IsPolarized(G4LogicalVolume* lVol) const +{ + if (!activated) return false; + PolarizationMap::const_iterator cit=volumePolarizations.find(lVol); + return (cit!=volumePolarizations.end()); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +inline void G4PolarizationManager::SetVerbose(G4int val) { verboseLevel = val; } +inline G4int G4PolarizationManager::GetVerbose() const { return verboseLevel; } + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +inline void G4PolarizationManager::SetActivated(G4bool val) { activated = val; } +inline bool G4PolarizationManager::IsActivated() const { return activated; } + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +inline void G4PolarizationManager::Clean() { volumePolarizations.clear(); } + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#endif + diff --git a/source/processes/electromagnetic/polarisation/include/G4PolarizationMessenger.hh b/source/processes/electromagnetic/polarisation/include/G4PolarizationMessenger.hh new file mode 100644 index 0000000000..6fca1a5b40 --- /dev/null +++ b/source/processes/electromagnetic/polarisation/include/G4PolarizationMessenger.hh @@ -0,0 +1,92 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// ------------------------------------------------------------------- +// +// $Id: G4PolarizationMessenger.hh,v 1.2 2006/12/13 15:44:33 gunter Exp $ +// tag $Name: geant4-08-02 $ +// +// GEANT4 Class header file +// +// +// File name: G4PolarizationMessenger +// +// Author: Andreas Schaelicke +// +// Creation date: 01.05.2005 +// +// Modifications: +// +// Class Description: +// +// Provides access to general polarization information and to +// polarization for logical volumes through macro files. +// + +#ifndef G4PolarizationMessenger_h +#define G4PolarizationMessenger_h 1 + +class G4PolarizationManager; +class G4UIdirectory; +class G4UIcmdWithoutParameter; +class G4UIcmdWithAString; +class G4UIcmdWithAnInteger; +class G4UIcmdWithABool; +class G4UIcommand; + +#include "G4UImessenger.hh" +#include "globals.hh" + +class G4PolarizationMessenger: public G4UImessenger +{ + public: + G4PolarizationMessenger(G4PolarizationManager* runMgr); + ~G4PolarizationMessenger(); + + public: + void SetNewValue(G4UIcommand * command,G4String newValues); + G4String GetCurrentValue(G4UIcommand * command); + private: + G4PolarizationManager * polarizationManager; + + private: //commands + G4UIdirectory * polarizationDirectory; + + G4UIdirectory * managerDirectory; + G4UIcmdWithAnInteger * verboseCmd; + G4UIcmdWithABool * optActivateCmd; + + G4UIdirectory * volumeDirectory; + G4UIcmdWithoutParameter * printVolumeListCmd; + G4UIcommand * setPolarizationCmd; + + G4UIdirectory * testDirectory; + G4UIcmdWithoutParameter * testPolarizationTransformationCmd; + G4UIcmdWithoutParameter * testInteractionFrameCmd; +}; + +#endif + + diff --git a/source/processes/electromagnetic/polarisation/include/G4PolarizedAnnihilationCrossSection.hh b/source/processes/electromagnetic/polarisation/include/G4PolarizedAnnihilationCrossSection.hh new file mode 100644 index 0000000000..ec4fdcaff6 --- /dev/null +++ b/source/processes/electromagnetic/polarisation/include/G4PolarizedAnnihilationCrossSection.hh @@ -0,0 +1,99 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// ------------------------------------------------------------------- +// $Id: G4PolarizedAnnihilationCrossSection.hh,v 1.3 2006/11/20 12:21:25 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// ------------------------------------------------------------------- +// +// GEANT4 Class file +// +// +// File name: PolarizedAnnihilationCrossSection +// +// Author: Andreas Schaelicke and Pavel Starovoitov +// +// Creation date: 22.03.2006 +// +// Modifications: +// +// Class Description: +// * calculates the differential cross section (ME squared, +// without phase space) incomming positron (along positive z direction) +// annihilations with an electron at rest +// * phi denotes the angle between the scattering plane and +// X axis of incomint partice reference frame (PRF) +// +#ifndef G4PolarizedAnnihilationCrossSection_h +#define G4PolarizedAnnihilationCrossSection_h 1 + +#include "G4StokesVector.hh" +#include "G4VPolarizedCrossSection.hh" + +class G4PolarizedAnnihilationCrossSection : public G4VPolarizedCrossSection +{ +public: + G4PolarizedAnnihilationCrossSection(); + virtual ~G4PolarizedAnnihilationCrossSection(); +public: + virtual void Initialize(G4double eps, G4double gamma, G4double phi, + const G4StokesVector & p0,const G4StokesVector & p1, + G4int flag=0); + + G4double DiceEpsilon(); + virtual G4double XSection(const G4StokesVector & pol2, + const G4StokesVector & pol3); + virtual G4double TotalXSection(G4double xmin, G4double xmax, + G4double y, + const G4StokesVector & pol0, + const G4StokesVector & pol1); + + // return expected mean polarisation + G4StokesVector GetPol2(); + G4StokesVector GetPol3(); + + G4double getVar(G4int ); + // test routine + void getCoeff(); +private: + void TotalXS(); + void DefineCoefficients(const G4StokesVector & pol0, + const G4StokesVector & pol1); + + + G4double polxx, polyy, polzz, polxz, polzx, polxy, polyx, polyz, polzy; + + G4double re2, diffXSFactor, totalXSFactor; + // - unpolarised + part depending on the polarization of the intial pair + G4double phi0; + // - part depending on the polarization of the final positron + G4ThreeVector phi2; + // - part depending on the polarization of the final electron + G4ThreeVector phi3; + G4double dice; + G4double polXS, unpXS; + G4double ISPxx, ISPyy, ISPzz, ISPnd; +}; +#endif diff --git a/source/processes/electromagnetic/polarisation/include/G4PolarizedAnnihilationModel.hh b/source/processes/electromagnetic/polarisation/include/G4PolarizedAnnihilationModel.hh new file mode 100644 index 0000000000..1129a8a950 --- /dev/null +++ b/source/processes/electromagnetic/polarisation/include/G4PolarizedAnnihilationModel.hh @@ -0,0 +1,139 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4PolarizedAnnihilationModel.hh,v 1.1 2006/09/21 21:35:10 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ------------------------------------------------------------------- +// +// GEANT4 Class header file +// +// +// File name: G4PolarizedAnnihilationModel +// +// Author: Andreas Schaelicke and Pavel Starovoitov +// +// Creation date: 01.05.2005 +// +// Modifications: +// 18-07-06 use newly calculated cross sections (P. Starovoitov) +// 21-08-05 update interface to geant4.8.1 (A. Schaelicke) +// +// +// Class Description: +// +// Implementation of polarized gamma Annihilation scattering on free electron +// + +// ------------------------------------------------------------------- +// + +#ifndef G4PolarizedAnnihilationModel_h +#define G4PolarizedAnnihilationModel_h 1 + +#include "G4eeToTwoGammaModel.hh" +#include "G4StokesVector.hh" + +class G4ParticleChangeForGamma; +class G4PolarizedAnnihilationCrossSection; + +class G4PolarizedAnnihilationModel : public G4eeToTwoGammaModel +{ + +public: + + G4PolarizedAnnihilationModel(const G4ParticleDefinition* p = 0, + const G4String& nam = "Polarized-Annihilation"); + + virtual ~G4PolarizedAnnihilationModel(); + + virtual G4double ComputeCrossSectionPerElectron( + const G4ParticleDefinition*, + G4double kinEnergy, + G4double cut, + G4double emax); + void ComputeAsymmetriesPerElectron(G4double gammaEnergy, + G4double & valueX, + G4double & valueA, + G4double & valueT); + + virtual std::vector* SampleSecondaries( + const G4MaterialCutsCouple*, + const G4DynamicParticle*, + G4double tmin, + G4double maxEnergy); + + // polarized routines + inline void SetTargetPolarization(const G4ThreeVector & pTarget); + inline void SetBeamPolarization(const G4ThreeVector & pBeam); + inline const G4ThreeVector & GetTargetPolarization() const; + inline const G4ThreeVector & GetBeamPolarization() const; + inline const G4ThreeVector & GetFinalGamma1Polarization() const; + inline const G4ThreeVector & GetFinalGamma2Polarization() const; +private: + + // hide assignment operator + G4PolarizedAnnihilationModel & operator=(const G4PolarizedAnnihilationModel &right); + G4PolarizedAnnihilationModel(const G4PolarizedAnnihilationModel&); + + G4PolarizedAnnihilationCrossSection * crossSectionCalculator; + // incomming + G4StokesVector theBeamPolarization; // positron + G4StokesVector theTargetPolarization; // electron + // outgoing + G4StokesVector finalGamma1Polarization; + G4StokesVector finalGamma2Polarization; + + G4int verboseLevel; +}; + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +inline void G4PolarizedAnnihilationModel::SetTargetPolarization(const G4ThreeVector & pTarget) +{ + theTargetPolarization = pTarget; +} +inline void G4PolarizedAnnihilationModel::SetBeamPolarization(const G4ThreeVector & pBeam) +{ + theBeamPolarization = pBeam; +} +inline const G4ThreeVector & G4PolarizedAnnihilationModel::GetTargetPolarization() const +{ + return theTargetPolarization; +} +inline const G4ThreeVector & G4PolarizedAnnihilationModel::GetBeamPolarization() const +{ + return theBeamPolarization; +} +inline const G4ThreeVector & G4PolarizedAnnihilationModel::GetFinalGamma1Polarization() const +{ + return finalGamma1Polarization; +} +inline const G4ThreeVector & G4PolarizedAnnihilationModel::GetFinalGamma2Polarization() const +{ + return finalGamma2Polarization; +} + +#endif diff --git a/source/processes/electromagnetic/polarisation/include/G4PolarizedBhabhaCrossSection.hh b/source/processes/electromagnetic/polarisation/include/G4PolarizedBhabhaCrossSection.hh new file mode 100644 index 0000000000..843e44fd29 --- /dev/null +++ b/source/processes/electromagnetic/polarisation/include/G4PolarizedBhabhaCrossSection.hh @@ -0,0 +1,78 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4PolarizedBhabhaCrossSection.hh,v 1.2 2006/11/17 14:14:17 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// GEANT4 Class file +// +// +// File name: G4PolarizedBhabhaCrossSection +// +// Author: Andreas Schaelicke and Pavel Starovoitov +// +// Creation date: 12.01.2006 +// +// Modifications: +// 16-01-06 included cross section as calculated by P.Starovoitov +// +// Class Description: +// * calculates the differential cross section (ME squared, without phase space) +// incomming positron (along positive z direction) scatters at an electron at rest +// * phi denotes the angle between the scattering plane and the incoming PRF X-axis +// * all stokes vectors refer to spins in the Global System (X,Y,Z) +// +#ifndef G4PolarizedBhabhaCrossSection_h +#define G4PolarizedBhabhaCrossSection_h 1 + +#include "G4StokesVector.hh" +#include "G4VPolarizedCrossSection.hh" + +class G4PolarizedBhabhaCrossSection : public G4VPolarizedCrossSection +{ +public: + G4PolarizedBhabhaCrossSection(); + virtual ~G4PolarizedBhabhaCrossSection(); +public: + void Initialize(G4double x, G4double y, G4double phi, + const G4StokesVector & p0,const G4StokesVector & p1, + G4int flag=0); + + G4double XSection(const G4StokesVector & pol2,const G4StokesVector & pol3); + G4double TotalXSection(G4double xmin, G4double xmax, G4double y, + const G4StokesVector & pol0, + const G4StokesVector & pol1); + // return expected mean polarisation + G4StokesVector GetPol2(); + G4StokesVector GetPol3(); +private: + G4double phi0; + // - part depending on the polarization of the final positron + G4ThreeVector phi2; + // - part depending on the polarization of the final electron + G4ThreeVector phi3; + +}; +#endif diff --git a/examples/extended/medical/GammaTherapy/include/EmIonBinaryCascadeBuilder.hh b/source/processes/electromagnetic/polarisation/include/G4PolarizedBremsstrahlungCrossSection.hh similarity index 52% rename from examples/extended/medical/GammaTherapy/include/EmIonBinaryCascadeBuilder.hh rename to source/processes/electromagnetic/polarisation/include/G4PolarizedBremsstrahlungCrossSection.hh index 31ca55112a..7d4bb5f584 100644 --- a/examples/extended/medical/GammaTherapy/include/EmIonBinaryCascadeBuilder.hh +++ b/source/processes/electromagnetic/polarisation/include/G4PolarizedBremsstrahlungCrossSection.hh @@ -23,65 +23,59 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// $Id: G4PolarizedBremsstrahlungCrossSection.hh,v 1.2 2006/11/17 12:12:01 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// GEANT4 Class file // // -// ------------------------------------------------------------ -// GEANT 4 class header file +// File name: G4PolarizedBremsstrahlungCrossSection +// +// Author: Karim Laihem and Andreas Schaelicke +// +// Creation date: 15.05.2005 +// +// Modifications: +// // Class Description: -// This class is an derived class of G4VPhysicsConstructor -// It is provide PhysicsList for hadron eleastic process +// determine the polarization of the final state +// in a Bremsstrahlung scattering process employing the differential +// cross section by Olsen and Maximon // -// ------------------------------------------------------------ -// History -// Created: 14.10.02 V.Ivanchenko -// -// Modified: -// -// ------------------------------------------------------------ -// -#ifndef EmIonBinaryCascadeBuilder_h -#define EmIonBinaryCascadeBuilder_h 1 +#ifndef G4PolarizedBremsstrahlungCrossSection_h +#define G4PolarizedBremsstrahlungCrossSection_h 1 -#include "G4VPhysicsConstructor.hh" -#include "globals.hh" +#include "G4StokesVector.hh" +#include "G4VPolarizedCrossSection.hh" +#include "G4RotationMatrix.hh" -class G4HadronInelasticProcess; -class G4BinaryLightIonReaction; +class G4ePolarizedBremsstrahlungModel; -class EmIonBinaryCascadeBuilder : public G4VPhysicsConstructor +class G4PolarizedBremsstrahlungCrossSection : public G4VPolarizedCrossSection { -public: - EmIonBinaryCascadeBuilder(const G4String& name = "binary_ion"); - virtual ~EmIonBinaryCascadeBuilder(); + public: + G4PolarizedBremsstrahlungCrossSection(G4ePolarizedBremsstrahlungModel * model); + virtual void Initialize(G4double eps, G4double X, G4double phi, + const G4StokesVector & p0, + const G4StokesVector & p1, + G4int flag=0); + virtual G4double XSection(const G4StokesVector & pol2, + const G4StokesVector & pol3); -public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - void ConstructParticle() {}; + // return expected mean polarisation + G4StokesVector GetPol2(); // electron/positron + G4StokesVector GetPol3(); // photon + private: + + G4ePolarizedBremsstrahlungModel * theModel; - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - void ConstructProcess(); + G4StokesVector theFinalLeptonPolarization; + G4StokesVector theFinalGammaPolarization; -private: + void InitializeMe(); - G4HadronInelasticProcess* theIPdeuteron; - G4HadronInelasticProcess* theIPtriton; - G4HadronInelasticProcess* theIPalpha; - G4HadronInelasticProcess* theIPHe3; - G4HadronInelasticProcess* theIPGenericIon; - G4BinaryLightIonReaction* theBC; - G4BinaryLightIonReaction* theGenIonBC; + static G4bool scrnInitialized; + static G4double SCRN [3][20]; // screening function lookup table; }; - #endif - - - - - - - - diff --git a/source/processes/electromagnetic/polarisation/include/G4PolarizedCompton.hh b/source/processes/electromagnetic/polarisation/include/G4PolarizedCompton.hh new file mode 100644 index 0000000000..a89ae43e26 --- /dev/null +++ b/source/processes/electromagnetic/polarisation/include/G4PolarizedCompton.hh @@ -0,0 +1,144 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// ------------------------------------------------------------------- +// +// GEANT4 Class header file +// +// +// File name: G4PolarizedCompton +// +// Author: Andreas Schaelicke +// based on code by Michel Maire / Vladimir IVANTCHENKO +// Class description +// +// modified version respecting media and beam polarization +// using the stokes formalism +// +// Creation date: 01.05.2005 +// +// Modifications: +// +// 01-01-05, include polarization description (A.Stahl) +// 01-01-05, create asymmetry table and determine interactionlength (A.Stahl) +// 01-05-05, update handling of media polarization (A.Schalicke) +// 01-05-05, update polarized differential cross section (A.Schalicke) +// 26-07-06, cross section recalculated (P.Starovoitov) +// 09-08-06, make it work under current geant4 release (A.Schalicke) +// +// ----------------------------------------------------------------------------- + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#ifndef PolarizedComptonScattering_h +#define PolarizedComptonScattering_h 1 + +#include "globals.hh" +#include "G4VEmProcess.hh" +#include "G4Gamma.hh" + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +class G4ParticleDefinition; +class G4VEmModel; +class G4MaterialCutsCouple; +class G4DynamicParticle; + +class G4PolarizedComptonModel; + +class G4PolarizedCompton : public G4VEmProcess + +{ +public: // with description + + G4PolarizedCompton(const G4String& processName ="pol-compt", + G4ProcessType type = fElectromagnetic); + + virtual ~G4PolarizedCompton(); + + // true for Gamma only. + G4bool IsApplicable(const G4ParticleDefinition&); + + // Print few lines of informations about the process: validity range, + virtual void PrintInfo(); + + void SetModel(const G4String& name); + +protected: + + virtual void InitialiseProcess(const G4ParticleDefinition*); + + virtual std::vector* SecondariesPostStep( + G4VEmModel*, + const G4MaterialCutsCouple*, + const G4DynamicParticle*); + + // added for polarization treatment of polarized media: + virtual void BuildPhysicsTable(const G4ParticleDefinition&); + virtual void PreparePhysicsTable(const G4ParticleDefinition&); + void BuildAsymmetryTable(const G4ParticleDefinition& part); + G4double ComputeAsymmetry(G4double energy, + const G4MaterialCutsCouple* couple, + const G4ParticleDefinition& particle, + G4double cut, + G4double & tAsymmetry); + + virtual G4double GetMeanFreePath(const G4Track& aTrack, + G4double previousStepSize, + G4ForceCondition* condition); + // can be removed as soon as G4PolarizationChangeForGamma is fixed! + // virtual G4VParticleChange* PostStepDoIt(const G4Track&, const G4Step&); + +private: + + G4PolarizedCompton& operator=(const G4PolarizedCompton &right); + G4PolarizedCompton(const G4PolarizedCompton& ); + + G4bool buildAsymmetryTable; + G4bool useAsymmetryTable; + + G4bool isInitialised; + G4VEmModel* selectedModel; + G4int mType; + + // added for polarization treatment: + G4PolarizedComptonModel* emModel; + G4PhysicsTable* theAsymmetryTable; // table for crosssection assymmetry + G4ThreeVector targetPolarization; +}; + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +inline G4bool G4PolarizedCompton::IsApplicable(const G4ParticleDefinition& p) +{ + return (&p == G4Gamma::Gamma()); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#endif + diff --git a/source/processes/electromagnetic/polarisation/include/G4PolarizedComptonCrossSection.hh b/source/processes/electromagnetic/polarisation/include/G4PolarizedComptonCrossSection.hh new file mode 100644 index 0000000000..19350b81fa --- /dev/null +++ b/source/processes/electromagnetic/polarisation/include/G4PolarizedComptonCrossSection.hh @@ -0,0 +1,109 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4PolarizedComptonCrossSection.hh,v 1.2 2006/11/17 14:14:19 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// GEANT4 Class file +// +// +// File name: G4PolarizedComptonCrossSection +// +// Author: Andreas Schaelicke +// +// Creation date: 15.05.2005 +// +// Modifications: +// 18-07-06 use newly calculated cross sections (P. Starovoitov) +// 21-08-05 update interface to geant4.8.1 (A. Schaelicke) +// +// +// Class Description: +// determine the polarization of the final state +// in a Compton scattering process employing the differential +// cross section by F.W.Lipps & H.A.Tolhoek +// ( Physica 20 (1954) 395 ) +// +#ifndef G4PolarizedComptonCrossSection_h +#define G4PolarizedComptonCrossSection_h 1 + +#include "G4StokesVector.hh" +#include "G4VPolarizedCrossSection.hh" +#include "G4RotationMatrix.hh" + + +class G4PolarizedComptonCrossSection : public G4VPolarizedCrossSection +{ +public: + G4PolarizedComptonCrossSection(); + virtual ~G4PolarizedComptonCrossSection(); +public: + // prepares the ingredients for the calculation of a polarization + // dependent differential cross section + // the kinematics is fixed (X - incoming photon energy in units of electron mass, eps - outgoing photon energy in unit of incoming photon energy, + // and polarization of the incoming particles fixed (p0, p1) + // a flag specifies the extent to which polarization is taken + // into account + virtual void Initialize(G4double eps, G4double X, G4double phi, + const G4StokesVector & p0, + const G4StokesVector & p1, + G4int flag=0); + + // returns the differential cross section for a given polarisation state + // of the final state particles to be used in the calculation of the + // polarization transfer + // the calculation has to be initialised by calling Initialize() + // prior to the first call of this function (see above) + G4double XSection(const G4StokesVector & pol2,const G4StokesVector & pol3); + +public: + // return expected mean polarisation + G4StokesVector GetPol2(); + G4StokesVector GetPol3(); +private: + void DefineCoefficients(const G4StokesVector & pol0, + const G4StokesVector & pol1); + // states if an incoming or outgoing particle is polarized + G4bool gammaPol0, electronPol1, gammaPol2, electronPol3; + + + // these variables store the information necessary to evaluate the + // differential cross section for arbitrary final state + // polarizations (used in XSection): + // - polarization independent part + G4double phi0; + // - part depending on the polarization of the final photon + G4ThreeVector phi2; + // - part depending on the polarization of the final electron + G4ThreeVector phi3; + // - product of polarizations of initial particles + G4double polxx, polyy, polzz, polxz, polzx, polyz, polzy, polxy, polyx; + + G4double diffXSFactor, totalXSFactor, re2; + G4double epsilon, polXS, unpXS; +}; + + +#endif diff --git a/source/processes/electromagnetic/polarisation/include/G4PolarizedComptonModel.hh b/source/processes/electromagnetic/polarisation/include/G4PolarizedComptonModel.hh new file mode 100644 index 0000000000..763d2eb642 --- /dev/null +++ b/source/processes/electromagnetic/polarisation/include/G4PolarizedComptonModel.hh @@ -0,0 +1,137 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4PolarizedComptonModel.hh,v 1.1 2006/09/21 21:35:10 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ------------------------------------------------------------------- +// +// GEANT4 Class header file +// +// +// File name: G4PolarizedComptonModel +// +// Author: Andreas Schaelicke +// +// Creation date: 01.05.2005 +// +// Modifications: +// 18-07-06 use newly calculated cross sections (P. Starovoitov) +// 21-08-05 update interface (A. Schaelicke) +// +// +// Class Description: +// +// Implementation of polarized gamma Compton scattering on free electron +// + +// ------------------------------------------------------------------- +// + +#ifndef G4PolarizedComptonModel_h +#define G4PolarizedComptonModel_h 1 + +#include "G4KleinNishinaCompton.hh" +#include "G4StokesVector.hh" + +class G4ParticleChangeForGamma; +class G4PolarizedComptonCrossSection; + +class G4PolarizedComptonModel : public G4KleinNishinaCompton +{ + +public: + + G4PolarizedComptonModel(const G4ParticleDefinition* p = 0, + const G4String& nam = "Polarized-Compton"); + + virtual G4double ComputeCrossSectionPerAtom( + const G4ParticleDefinition*, + G4double kinEnergy, + G4double Z, + G4double A, + G4double cut, + G4double emax); + G4double ComputeAsymmetryPerAtom(G4double gammaEnergy, G4double Z); + virtual ~G4PolarizedComptonModel(); + + virtual std::vector* SampleSecondaries( + const G4MaterialCutsCouple*, + const G4DynamicParticle*, + G4double tmin, + G4double maxEnergy); + + // polarized routines + inline void SetTargetPolarization(const G4ThreeVector & pTarget); + inline void SetBeamPolarization(const G4ThreeVector & pBeam); + inline const G4ThreeVector & GetTargetPolarization() const; + inline const G4ThreeVector & GetBeamPolarization() const; + inline const G4ThreeVector & GetFinalGammaPolarization() const; + inline const G4ThreeVector & GetFinalElectronPolarization() const; +private: + + // hide assignment operator + G4PolarizedComptonModel & operator=(const G4PolarizedComptonModel &right); + G4PolarizedComptonModel(const G4PolarizedComptonModel&); + + G4PolarizedComptonCrossSection * crossSectionCalculator; + // incomming + G4StokesVector theBeamPolarization; // photon + G4StokesVector theTargetPolarization; // electron + // outgoing + G4StokesVector finalGammaPolarization; + G4StokesVector finalElectronPolarization; + + G4int verboseLevel; +}; + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +inline void G4PolarizedComptonModel::SetTargetPolarization(const G4ThreeVector & pTarget) +{ + theTargetPolarization = pTarget; +} +inline void G4PolarizedComptonModel::SetBeamPolarization(const G4ThreeVector & pBeam) +{ + theBeamPolarization = pBeam; +} +inline const G4ThreeVector & G4PolarizedComptonModel::GetTargetPolarization() const +{ + return theTargetPolarization; +} +inline const G4ThreeVector & G4PolarizedComptonModel::GetBeamPolarization() const +{ + return theBeamPolarization; +} +inline const G4ThreeVector & G4PolarizedComptonModel::GetFinalGammaPolarization() const +{ + return finalGammaPolarization; +} +inline const G4ThreeVector & G4PolarizedComptonModel::GetFinalElectronPolarization() const +{ + return finalElectronPolarization; +} + +#endif diff --git a/source/processes/electromagnetic/polarisation/include/G4PolarizedGammaConversion.hh b/source/processes/electromagnetic/polarisation/include/G4PolarizedGammaConversion.hh new file mode 100644 index 0000000000..09b371a466 --- /dev/null +++ b/source/processes/electromagnetic/polarisation/include/G4PolarizedGammaConversion.hh @@ -0,0 +1,109 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4PolarizedGammaConversion.hh,v 1.1 2006/09/21 21:35:10 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ------------------------------------------------------------------- +// +// +// File name: G4PolarizedGammaConversion +// +// Author: Karim Laihem based on code by Michel Maire +// +// Creation date: 01.05.2005 +// +// Modifications: +// 21-08-06 Modified to work in g4.8.1 framework (A.Schaelicke) +// +// Class Description: +// +// polarized version of G4GammaConversion + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#ifndef G4PolarizedGammaConversion_h +#define G4PolarizedGammaConversion_h 1 + +#include "globals.hh" +#include "G4VEmProcess.hh" +#include "G4Gamma.hh" + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +class G4ParticleDefinition; +class G4VEmModel; +class G4MaterialCutsCouple; +class G4DynamicParticle; + +class G4PolarizedGammaConversion : public G4VEmProcess + +{ +public: // with description + + G4PolarizedGammaConversion(const G4String& processName ="pol-conv", + G4ProcessType type = fElectromagnetic); + + virtual ~G4PolarizedGammaConversion(); + + // true for Gamma only. + G4bool IsApplicable(const G4ParticleDefinition&); + + // Print few lines of informations about the process: validity range, + virtual void PrintInfo(); + +protected: + + virtual void InitialiseProcess(const G4ParticleDefinition*); + + std::vector* SecondariesPostStep( + G4VEmModel*, + const G4MaterialCutsCouple*, + const G4DynamicParticle*); + +private: + + // hide assignment operator as private + G4PolarizedGammaConversion& operator=(const G4PolarizedGammaConversion &right); + G4PolarizedGammaConversion(const G4PolarizedGammaConversion& ); + + G4bool isInitialised; +}; + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +inline G4bool G4PolarizedGammaConversion::IsApplicable(const G4ParticleDefinition& p) +{ + return (&p == G4Gamma::Gamma()); +} + + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#endif + diff --git a/source/processes/electromagnetic/polarisation/include/G4PolarizedGammaConversionModel.hh b/source/processes/electromagnetic/polarisation/include/G4PolarizedGammaConversionModel.hh new file mode 100644 index 0000000000..7e4db00f14 --- /dev/null +++ b/source/processes/electromagnetic/polarisation/include/G4PolarizedGammaConversionModel.hh @@ -0,0 +1,94 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4PolarizedGammaConversionModel.hh,v 1.1 2006/09/21 21:35:10 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ------------------------------------------------------------------- +// +// GEANT4 Class header file +// +// +// File name: G4PolarizedGammaConversionModel +// +// Author: Karim Laihem +// +// Creation date: 19.04.2005 +// +// Modifications: +// 21-08-06 Modified to work in g4.8.1 framework (A.Schaelicke) +// +// Class Description: +// +// Implementation of gamma convertion to e+e- in the field of a nucleus +// including polarization transfer + +// ------------------------------------------------------------------- +// + +#ifndef G4PolarizedGammaConversionModel_h +#define G4PolarizedGammaConversionModel_h 1 + +#include "G4BetheHeitlerModel.hh" +#include "G4PhysicsTable.hh" + +class G4ParticleChangeForGamma; +class G4VPolarizedCrossSection; +class G4PolarizedGammaConversionModel : public G4BetheHeitlerModel +{ + +public: + + G4PolarizedGammaConversionModel(const G4ParticleDefinition* p = 0, + const G4String& nam = "polConv"); + + virtual ~G4PolarizedGammaConversionModel(); + + virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&); + + virtual std::vector* SampleSecondaries( + const G4MaterialCutsCouple*, + const G4DynamicParticle*, + G4double tmin, + G4double maxEnergy); + inline const G4Element* SelectedAtom(); + + protected: + G4VPolarizedCrossSection* crossSectionCalculator; + +}; + + + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +inline const G4Element* G4PolarizedGammaConversionModel::SelectedAtom() +{ + return GetCurrentElement(); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +#endif diff --git a/source/processes/electromagnetic/polarisation/include/G4PolarizedMollerBhabhaModel.hh b/source/processes/electromagnetic/polarisation/include/G4PolarizedMollerBhabhaModel.hh new file mode 100644 index 0000000000..341bcfefae --- /dev/null +++ b/source/processes/electromagnetic/polarisation/include/G4PolarizedMollerBhabhaModel.hh @@ -0,0 +1,121 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4PolarizedMollerBhabhaModel.hh,v 1.2 2006/11/09 18:00:48 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// ------------------------------------------------------------------- +// +// GEANT4 Class header file +// +// +// File name: G4PolarizedMollerBhabhaModel +// +// Author: A.Schaelicke on base of Vladimir Ivanchenko code +// +// Creation date: 10.11.2005 +// +// Modifications: +// +// 20-08-05, modified interface (A.Schaelicke) +// +// +// Class Description: +// +// Physics implementation of polarized Bhabha/Moller scattering +// +// ------------------------------------------------------------------- +// + +#ifndef G4PolarizedMollerBhabhaModel_h +#define G4PolarizedMollerBhabhaModel_h 1 + +#include "G4VEmModel.hh" +#include "G4MollerBhabhaModel.hh" +#include "G4StokesVector.hh" + +class G4VPolarizedCrossSection; + +class G4PolarizedMollerBhabhaModel : public G4MollerBhabhaModel +{ + +public: + + G4PolarizedMollerBhabhaModel(const G4ParticleDefinition* p =0, + const G4String& nam = "PolarizedMollerBhabha"); + + virtual ~G4PolarizedMollerBhabhaModel(); + + virtual G4double ComputeCrossSectionPerElectron( + const G4ParticleDefinition*, + G4double kinEnergy, + G4double cut, + G4double emax); + + virtual std::vector* SampleSecondaries( + const G4MaterialCutsCouple*, + const G4DynamicParticle*, + G4double tmin, + G4double maxEnergy); + + + // polarization access routines (may go if using a modified ParticleChange) + + void SetTargetPolarization(const G4ThreeVector & pTarget) + { + theTargetPolarization = pTarget; + } + void SetBeamPolarization(const G4ThreeVector & pBeam) + { + theBeamPolarization = pBeam; + } + const G4StokesVector & GetTargetPolarization() + { + return theTargetPolarization; + } + const G4StokesVector & GetBeamPolarization() + { + return theBeamPolarization; + } + const G4StokesVector & GetFinalElectronPolarization() + { + return fElectronPolarization; + } + const G4StokesVector & GetFinalPositronPolarization() + { + return fPositronPolarization; + } +private: + G4StokesVector theBeamPolarization; + G4StokesVector theTargetPolarization; + + G4VPolarizedCrossSection * crossSectionCalculator; + + G4StokesVector fPositronPolarization; + G4StokesVector fElectronPolarization; +}; + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#endif diff --git a/source/processes/electromagnetic/polarisation/include/G4PolarizedMollerCrossSection.hh b/source/processes/electromagnetic/polarisation/include/G4PolarizedMollerCrossSection.hh new file mode 100644 index 0000000000..5f215c9b94 --- /dev/null +++ b/source/processes/electromagnetic/polarisation/include/G4PolarizedMollerCrossSection.hh @@ -0,0 +1,78 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4PolarizedMollerCrossSection.hh,v 1.3 2006/12/13 15:44:36 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// GEANT4 Class file +// +// +// File name: G4PolarizedMollerCrossSection +// +// Author: Andreas Schaelicke +// +// Creation date: 12.01.2006 +// +// Modifications: +// 16-01-06 included cross section as calculated by P.Starovoitov +// +// Class Description: +// * calculates the differential cross section +// incomming electron (along positive z direction) scatters at an electron at rest +// * phi denotes the angle between the scattering plane (defined by the +// outgoing electron) and X-axis +// * all stokes vectors refer to spins in the Global System (X,Y,Z) +// +#ifndef G4PolarizedMollerCrossSection_h +#define G4PolarizedMollerCrossSection_h 1 + +#include "G4StokesVector.hh" +#include "G4VPolarizedCrossSection.hh" + +class G4PolarizedMollerCrossSection : public G4VPolarizedCrossSection +{ +public: + G4PolarizedMollerCrossSection(); + virtual ~G4PolarizedMollerCrossSection(); +public: + void Initialize(G4double x, G4double y, G4double phi, + const G4StokesVector & p0,const G4StokesVector & p1, + G4int flag=0); + + G4double XSection(const G4StokesVector & pol2,const G4StokesVector & pol3); + G4double TotalXSection(G4double xmin, G4double xmax, G4double y, + const G4StokesVector & pol0,const G4StokesVector & pol1); + // return expected mean polarisation + G4StokesVector GetPol2(); + G4StokesVector GetPol3(); +private: + G4double phi0; + // - part depending on the polarization of the final electron P1 + G4ThreeVector phi2; + // - part depending on the polarization of the final electron P2 + G4ThreeVector phi3; + +}; +#endif diff --git a/source/processes/electromagnetic/polarisation/include/G4PolarizedPairProductionCrossSection.hh b/source/processes/electromagnetic/polarisation/include/G4PolarizedPairProductionCrossSection.hh new file mode 100644 index 0000000000..c44f18c4c4 --- /dev/null +++ b/source/processes/electromagnetic/polarisation/include/G4PolarizedPairProductionCrossSection.hh @@ -0,0 +1,81 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4PolarizedPairProductionCrossSection.hh,v 1.2 2006/11/17 14:14:19 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// GEANT4 Class file +// +// +// File name: G4PolarizedBremsstrahlungCrossSection +// +// Author: Karim Laihem +// +// Creation date: 15.05.2005 +// 20-08-06 updated interface to geant4.8.1 (A.Schaelicke) +// Modifications: +// +// Class Description: +// determine the polarization of the final state +// in a Bremsstrahlung scattering process employing the differential +// cross section by Olsen and Maximon +// +#ifndef G4PolarizedPairProductionCrossSection_h +#define G4PolarizedPairProductionCrossSection_h 1 + +#include "G4StokesVector.hh" +#include "G4VPolarizedCrossSection.hh" +#include "G4RotationMatrix.hh" + +class G4PolarizedGammaConversionModel; + +class G4PolarizedPairProductionCrossSection : public G4VPolarizedCrossSection +{ + public: + G4PolarizedPairProductionCrossSection(G4PolarizedGammaConversionModel * model); + virtual void Initialize(G4double eps, G4double X, G4double phi, + const G4StokesVector & p0, + const G4StokesVector & p1, + G4int flag=0); + virtual G4double XSection(const G4StokesVector & pol2, + const G4StokesVector & pol3); + + // return expected mean polarisation + G4StokesVector GetPol2(); // electron/positron + G4StokesVector GetPol3(); // photon + private: + + G4PolarizedGammaConversionModel * theModel; + + G4StokesVector theFinalElectronPolarization; + G4StokesVector theFinalPositronPolarization; + + void InitializeMe(); + + static G4bool scrnInitialized; + static G4double SCRN [3][20]; // screening function lookup table; +}; + +#endif diff --git a/source/processes/electromagnetic/polarisation/include/G4StokesVector.hh b/source/processes/electromagnetic/polarisation/include/G4StokesVector.hh new file mode 100644 index 0000000000..698b0c1b65 --- /dev/null +++ b/source/processes/electromagnetic/polarisation/include/G4StokesVector.hh @@ -0,0 +1,113 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4StokesVector.hh,v 1.3 2006/11/17 11:59:03 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// GEANT4 Class header file +// +// File name: G4StokesVector +// +// Author: Andreas Schaelicke +// +// Creation date: 01.05.2005 +// +// Modifications: +// 27-07-06 added some test routines (P.Starovoitov) +// 25-08-06 modified name of test routines (A.Schaelicke) +// +// Class Description: +// +// Provides Stokesvector representation employed in implementation of +// polarized processes. +// +// aim: +// - store three components of a stokesvector +// - distinguish between boson or fermion state (different transformations) +// - provide unique definition of reference frame (cf. PolarizationHelper) +// + +#ifndef G4StokesVector_h +#define G4StokesVector_h 1 + +#include "G4ThreeVector.hh" +#include "G4RotationMatrix.hh" + + +class G4StokesVector: public G4ThreeVector +{ + public: + // standard vectors: + static const G4StokesVector ZERO; + static const G4StokesVector P1; + static const G4StokesVector P2; + static const G4StokesVector P3; + static const G4StokesVector M1; + static const G4StokesVector M2; + static const G4StokesVector M3; +public: + G4StokesVector(); + G4StokesVector(const G4ThreeVector & v); + virtual ~G4StokesVector(); +public: + inline G4double p1() const { return x(); } + inline G4double p2() const { return y(); } + inline G4double p3() const { return z(); } + + inline G4bool IsZero() const { return *this==ZERO; } + inline G4double Transverse() const { return perp(); } + + inline G4ThreeVector PolSqr() const { + return G4ThreeVector(x()*x(),y()*y(),z()*z()); + } + inline G4ThreeVector PolSqrt() const { + return G4ThreeVector(std::sqrt(x()),std::sqrt(y()),std::sqrt(z())); + } + G4ThreeVector PolError(const G4StokesVector & sum2, long n); + + // Ratio of 3-vectors. + G4ThreeVector PolDiv( const G4StokesVector & ); + + inline void SetPhoton() { isPhoton=true; } + + void RotateAz(G4ThreeVector nInteractionFrame, + G4ThreeVector particleDirection); + void InvRotateAz(G4ThreeVector nInteractionFrame, + G4ThreeVector particleDirection); + void RotateAz(G4double cosphi, G4double sinphi); + G4double GetBeta(); + + void DiceUniform(); + void DiceP1(); + void DiceP2(); + void DiceP3(); + + void FlipP3(); +private: + G4bool isPhoton; +}; + + +#endif diff --git a/source/processes/electromagnetic/polarisation/include/G4VPolarizedCrossSection.hh b/source/processes/electromagnetic/polarisation/include/G4VPolarizedCrossSection.hh new file mode 100644 index 0000000000..6d2c4a99a5 --- /dev/null +++ b/source/processes/electromagnetic/polarisation/include/G4VPolarizedCrossSection.hh @@ -0,0 +1,80 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4VPolarizedCrossSection.hh,v 1.2 2006/11/17 14:14:19 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// File name: G4VPolarizedCrossSection +// +// Author: Andreas Schaelicke +// +// Creation date: 15.05.2005 +// +// Modifications: +// +// Class Description: +// (pure virtual) interface class +// +// provides readable but efficient routines to determine +// polarization for the final state of a given process +// empoying the differential cross section +// + +#ifndef G4VPolarizedCrossSection_h +#define G4VPolarizedCrossSection_h 1 + +#include "G4StokesVector.hh" + + +class G4VPolarizedCrossSection +{ +public: + G4VPolarizedCrossSection(); + virtual ~G4VPolarizedCrossSection(); +public: + virtual void Initialize(G4double, G4double, G4double, + const G4StokesVector & p0,const G4StokesVector & p1, + G4int flag=0); + virtual G4double XSection(const G4StokesVector & pol2,const G4StokesVector & pol3) = 0; + virtual G4double TotalXSection(G4double xmin, G4double xmax, G4double y, + const G4StokesVector & pol0, + const G4StokesVector & pol1); + + // return expected mean polarisation + virtual G4StokesVector GetPol2(); + virtual G4StokesVector GetPol3(); + + // return appropriate distribute polarisation states; + void DicePolarization(); + G4StokesVector DicedPol2(); + G4StokesVector DicedPol3(); +protected: +// G4double costheta; + G4StokesVector pol0, pol1; + G4StokesVector pol2, pol3; +}; + + +#endif diff --git a/examples/extended/medical/GammaTherapy/include/EmBinaryCascadeBuilder.hh b/source/processes/electromagnetic/polarisation/include/G4ePolarizedBremsstrahlung.hh similarity index 60% rename from examples/extended/medical/GammaTherapy/include/EmBinaryCascadeBuilder.hh rename to source/processes/electromagnetic/polarisation/include/G4ePolarizedBremsstrahlung.hh index ca15031320..ce9ec9b7c6 100644 --- a/examples/extended/medical/GammaTherapy/include/EmBinaryCascadeBuilder.hh +++ b/source/processes/electromagnetic/polarisation/include/G4ePolarizedBremsstrahlung.hh @@ -23,58 +23,48 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// $Id: G4ePolarizedBremsstrahlung.hh,v 1.1 2006/09/21 21:35:10 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ------------------------------------------------------------------- +// +// GEANT4 Class header file // // -// ------------------------------------------------------------ -// GEANT 4 class header file +// File name: G4ePolarizedBremsstrahlung +// +// Author: Karim Laihem based on code by Michel Maire +// +// Creation date: 01.05.2005 +// +// Modifications: +// 21-08-06 Modified to work in g4.8.1 framework (A.Schaelicke) +// // Class Description: -// This class is an derived class of G4VPhysicsConstructor -// It is provide PhysicsList for hadron eleastic process // -// ------------------------------------------------------------ -// History -// Created: 14.10.02 V.Ivanchenko -// -// Modified: -// -// ------------------------------------------------------------ -// -#ifndef EmBinaryCascadeBuilder_h -#define EmBinaryCascadeBuilder_h 1 +// polarized version of G4eBremsstrahlung -#include "G4VPhysicsConstructor.hh" -#include "globals.hh" +#ifndef G4ePolarizedBremsstrahlung_h +#define G4ePolarizedBremsstrahlung_h 1 -class G4BinaryCascade; +#include "G4eBremsstrahlung.hh" -class EmBinaryCascadeBuilder : public G4VPhysicsConstructor +class G4ePolarizedBremsstrahlung : public G4eBremsstrahlung { -public: - EmBinaryCascadeBuilder(const G4String& name = "binary"); - virtual ~EmBinaryCascadeBuilder(); public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - void ConstructParticle() {}; - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - void ConstructProcess(); + G4ePolarizedBremsstrahlung(const G4String& name = "pol-eBrem", G4double thresh=DBL_MAX); -private: - G4BinaryCascade* theBC; +protected: + std::vector* SecondariesPostStep( + G4VEmModel*, + const G4MaterialCutsCouple*, + const G4DynamicParticle*, + G4double&); + + virtual void InitialiseEnergyLossProcess(const G4ParticleDefinition*, + const G4ParticleDefinition*); }; - - #endif - - - - - - - - diff --git a/source/processes/electromagnetic/polarisation/include/G4ePolarizedBremsstrahlungModel.hh b/source/processes/electromagnetic/polarisation/include/G4ePolarizedBremsstrahlungModel.hh new file mode 100644 index 0000000000..d3d0dbe1d5 --- /dev/null +++ b/source/processes/electromagnetic/polarisation/include/G4ePolarizedBremsstrahlungModel.hh @@ -0,0 +1,93 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4ePolarizedBremsstrahlungModel.hh,v 1.1 2006/09/21 21:35:10 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ------------------------------------------------------------------- +// +// GEANT4 Class header file +// +// +// File name: G4ePolarizedBremsstrahlungModel +// +// Author: Karim Laihem based on code by Michel Maire +// +// Creation date: 01.05.2005 +// +// Modifications: +// 21-08-06 Modified to work in g4.8.1 framework (A.Schaelicke) +// +// Class Description: +// +// Implementation of energy loss for gamma emission by polarized +// electrons and positrons + +// ------------------------------------------------------------------- +// + +#ifndef G4ePolarizedBremsstrahlungModel_h +#define G4ePolarizedBremsstrahlungModel_h 1 + +#include "G4eBremsstrahlungModel.hh" + + +class G4VPolarizedCrossSection; + +class G4ePolarizedBremsstrahlungModel : public G4eBremsstrahlungModel +{ + +public: + + G4ePolarizedBremsstrahlungModel(const G4ParticleDefinition* p=0, + const G4String& nam = "PolBrem"); + + virtual ~G4ePolarizedBremsstrahlungModel(); + + virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&); + + virtual std::vector* SampleSecondaries( + const G4MaterialCutsCouple*, + const G4DynamicParticle*, + G4double tmin, + G4double maxEnergy); + inline const G4Element* SelectedAtom(); +protected: + + G4VPolarizedCrossSection* crossSectionCalculator; + + +}; + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +inline const G4Element* G4ePolarizedBremsstrahlungModel::SelectedAtom() +{ + return GetCurrentElement(); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +#endif diff --git a/source/processes/electromagnetic/polarisation/include/G4ePolarizedIonisation.hh b/source/processes/electromagnetic/polarisation/include/G4ePolarizedIonisation.hh new file mode 100644 index 0000000000..adabcc4812 --- /dev/null +++ b/source/processes/electromagnetic/polarisation/include/G4ePolarizedIonisation.hh @@ -0,0 +1,152 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4ePolarizedIonisation.hh,v 1.1 2006/09/21 21:35:11 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// ------------------------------------------------------------------- +// +// GEANT4 Class header file +// +// +// File name: G4ePolarizedIonisation +// +// Author: A.Schaelicke on base of Vladimir Ivanchenko code +// +// Creation date: 10.11.2005 +// +// Modifications: +// +// 10-11-05, include polarization description (A.Schaelicke) +// , create asymmetry table and determine interactionlength +// , update polarized differential cross section +// +// 20-08-05, modified interface (A.Schaelicke) +// +// Class Description: +// +// polarized version of G4eIonisation +// ---------------------------------------------------------------------------- +// ------------------------------------------------------------------- +// + +#ifndef G4ePolarizedIonisation_h +#define G4ePolarizedIonisation_h 1 + +#include "G4VEnergyLossProcess.hh" +#include "G4Electron.hh" +#include "G4Positron.hh" + +class G4Material; +class G4ParticleDefinition; +class G4VEmFluctuationModel; +class G4PolarizedMollerBhabhaModel; + +class G4ePolarizedIonisation : public G4VEnergyLossProcess +{ + +public: + + G4ePolarizedIonisation(const G4String& name = "pol-eIoni"); + + virtual ~G4ePolarizedIonisation(); + + G4bool IsApplicable(const G4ParticleDefinition& p); + + // Print out of the class parameters + virtual void PrintInfo(); + +protected: + + std::vector* SecondariesPostStep( + G4VEmModel*, + const G4MaterialCutsCouple*, + const G4DynamicParticle*, + G4double&); + + virtual void InitialiseEnergyLossProcess(const G4ParticleDefinition*, + const G4ParticleDefinition*); + + virtual G4double MinPrimaryEnergy(const G4ParticleDefinition*, + const G4Material*, G4double cut); + + + // for polarization + G4double GetMeanFreePath(const G4Track& track, + G4double previousStepSize, + G4ForceCondition* condition); + + virtual void BuildPhysicsTable(const G4ParticleDefinition&); + + G4double ComputeAsymmetry(G4double energy, + const G4MaterialCutsCouple* couple, + const G4ParticleDefinition& particle, + G4double cut, + G4double &tasm); + +protected: + + const G4ParticleDefinition* DefineBaseParticle(const G4ParticleDefinition* p); + +private: + G4ePolarizedIonisation & operator=(const G4ePolarizedIonisation &right); + G4ePolarizedIonisation(const G4ePolarizedIonisation&); + + G4ParticleDefinition* theElectron; + G4VEmFluctuationModel* flucModel; + G4PolarizedMollerBhabhaModel* emModel; + + G4bool isElectron; + G4bool isInitialised; + + // for polarization: + G4ThreeVector theTargetPolarization; + + size_t numBinAsymmetryTable; + + G4PhysicsTable* theAsymmetryTable; // table for cross section assym. + G4PhysicsTable* theTransverseAsymmetryTable; // table for transverse cross section assym. +}; + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +inline G4double G4ePolarizedIonisation::MinPrimaryEnergy(const G4ParticleDefinition*, + const G4Material*, + G4double cut) +{ + G4double x = cut; + if(isElectron) x += cut; + return x; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +inline G4bool G4ePolarizedIonisation::IsApplicable(const G4ParticleDefinition& p) +{ + return (&p == G4Electron::Electron() || &p == G4Positron::Positron()); +} +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#endif diff --git a/source/processes/electromagnetic/polarisation/include/G4eplusPolarizedAnnihilation.hh b/source/processes/electromagnetic/polarisation/include/G4eplusPolarizedAnnihilation.hh new file mode 100644 index 0000000000..d41717e3ad --- /dev/null +++ b/source/processes/electromagnetic/polarisation/include/G4eplusPolarizedAnnihilation.hh @@ -0,0 +1,155 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4eplusPolarizedAnnihilation.hh,v 1.1 2006/09/21 21:35:11 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ------------------------------------------------------------------- +// +// GEANT4 Class header file +// +// +// File name: G4eplusPolarizedAnnihilation +// +// Author: A. Schaelicke on base of Vladimir Ivanchenko / Michel Maire code +// +// Creation date: 02.07.2006 +// +// Modifications: +// 26-07-06 modified cross section (P. Starovoitov) +// 21-08-06 interface updated (A. Schaelicke) +// +// +// Class Description: +// +// Polarized process of e+ annihilation into 2 gammas +// + +// ------------------------------------------------------------------- +// + +#ifndef G4eplusPolarizedAnnihilation_h +#define G4eplusPolarizedAnnihilation_h 1 + +#include "G4VEmProcess.hh" +#include "G4Positron.hh" +#include "G4VEmModel.hh" + + +class G4PolarizedAnnihilationModel; + +class G4eplusPolarizedAnnihilation : public G4VEmProcess +{ + +public: + + G4eplusPolarizedAnnihilation(const G4String& name = "pol-annihil"); + + virtual ~G4eplusPolarizedAnnihilation(); + + virtual G4bool IsApplicable(const G4ParticleDefinition& p); + + virtual G4VParticleChange* AtRestDoIt( + const G4Track& track, + const G4Step& stepData); + + G4double AtRestGetPhysicalInteractionLength( + const G4Track& track, + G4ForceCondition* condition + ); + + // Print out of the class parameters + virtual void PrintInfo(); + + // for polarization + // G4VParticleChange* PostStepDoIt(const G4Track&, const G4Step&); + + G4double GetMeanFreePath(const G4Track& track, + G4double previousStepSize, + G4ForceCondition* condition); + + virtual void BuildPhysicsTable(const G4ParticleDefinition&); + void BuildAsymmetryTable(const G4ParticleDefinition& part); + virtual void PreparePhysicsTable(const G4ParticleDefinition&); + + G4double ComputeAsymmetry(G4double energy, + const G4MaterialCutsCouple* couple, + const G4ParticleDefinition& particle, + G4double cut, + G4double &tasm); + +protected: + + virtual void InitialiseProcess(const G4ParticleDefinition*); + + std::vector* SecondariesPostStep( + G4VEmModel*, + const G4MaterialCutsCouple*, + const G4DynamicParticle*); + +private: + + G4bool isInitialised; + + // for polarization: + G4PolarizedAnnihilationModel* emModel; + G4ThreeVector theTargetPolarization; + + G4PhysicsTable* theAsymmetryTable; // table for cross section assym. + G4PhysicsTable* theTransverseAsymmetryTable; // table for transverse cross section assym. +}; + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +inline G4bool G4eplusPolarizedAnnihilation::IsApplicable(const G4ParticleDefinition& p) +{ + return (&p == G4Positron::Positron()); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +inline G4double G4eplusPolarizedAnnihilation::AtRestGetPhysicalInteractionLength( + const G4Track&, G4ForceCondition* condition) +{ + *condition = NotForced; + return 0.0; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +inline std::vector* G4eplusPolarizedAnnihilation::SecondariesPostStep( + G4VEmModel* model, + const G4MaterialCutsCouple* couple, + const G4DynamicParticle* dp) +{ + fParticleChange.SetProposedKineticEnergy(0.); + fParticleChange.ProposeTrackStatus(fStopAndKill); + return model->SampleSecondaries(couple, dp); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#endif diff --git a/source/processes/electromagnetic/polarisation/src/G4PolarizationHelper.cc b/source/processes/electromagnetic/polarisation/src/G4PolarizationHelper.cc new file mode 100644 index 0000000000..aac4eaf8d4 --- /dev/null +++ b/source/processes/electromagnetic/polarisation/src/G4PolarizationHelper.cc @@ -0,0 +1,156 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4PolarizationHelper.cc,v 1.3 2006/11/17 14:14:19 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// GEANT4 Class file +// +// +// File name: G4PolarizationHelper +// +// Author: Andreas Schaelicke +// +// Creation date: 12.08.2006 +// +// Modifications: +// +// Class Description: +// +// Provides polarization information for logical volumes, and some basic +// transformation routines. +// +#include "G4PolarizationHelper.hh" +#include "G4StokesVector.hh" + + +G4ThreeVector G4PolarizationHelper::GetFrame(const G4ThreeVector & mom1, const G4ThreeVector & mom2) +{ + G4ThreeVector normal = mom1.cross(mom2); + return 1./normal.mag()*normal; +} + +G4ThreeVector G4PolarizationHelper::GetParticleFrameY(const G4ThreeVector &uZ) +{ + // compare also G4ThreeVector::rotateUz() + + if (uZ.x()==0. && uZ.y()==0.) { + return G4ThreeVector(0.,1.,0.); + } + + G4double invPerp = 1./std::sqrt(sqr(uZ.x())+sqr(uZ.y())); + return G4ThreeVector(-uZ.y()*invPerp,uZ.x()*invPerp,0); +} + +G4ThreeVector G4PolarizationHelper::GetParticleFrameX(const G4ThreeVector &uZ) +{ + // compare also G4ThreeVector::rotateUz() + + if (uZ.x()==0. && uZ.y()==0.) { + if (uZ.z()>=0.) return G4ThreeVector(1.,0.,0.); + return G4ThreeVector(-1.,0.,0.); + } + + G4double perp = std::sqrt(sqr(uZ.x())+sqr(uZ.y())); + G4double invPerp = uZ.z()/perp; + return G4ThreeVector(uZ.x()*invPerp,uZ.y()*invPerp,-perp); +} + +G4ThreeVector G4PolarizationHelper::GetSpinInPRF(const G4ThreeVector &uZ, const G4ThreeVector & spin) +{ + // compare also G4ThreeVector::rotateUz() + + if (uZ.x()==0. && uZ.y()==0.) { + if (uZ.z()>=0.) return spin; + return G4ThreeVector(-spin.x(),spin.y(),-spin.z()); + } + + G4double perp = std::sqrt(sqr(uZ.x())+sqr(uZ.y())); + G4double invPerp = uZ.z()/perp; + + G4ThreeVector uX(uZ.x()*invPerp,uZ.y()*invPerp,-perp); + G4ThreeVector uY(-uZ.y()*invPerp,uZ.x()*invPerp,0); + + return G4ThreeVector(spin*uX,spin*uY,spin*uZ); +} + +void G4PolarizationHelper::TestPolarizationTransformations() +{ + G4double theta=0.; + G4cout<<"========================================\n\n"; + for (G4int i=0; i<=10; ++i) { + theta=pi*i/10.; + G4ThreeVector zAxis = G4ThreeVector(std::sin(theta),0.,std::cos(theta)); + if (i==5) zAxis = G4ThreeVector(1.,0.,0.); + if (i==10) zAxis = G4ThreeVector(0.,0.,-1.); + G4ThreeVector yAxis = GetParticleFrameY(zAxis); + + G4cout<first->GetName()<<" : "<second<=1) G4cout<<" SetVolumePolarization " + <GetName()<<" " + <first->GetName()==lVolName) { + it->second=pol; + if (verboseLevel>=1) G4cout<<" SetVolumePolarization " + <SetGuidance("polarization control commands."); + + managerDirectory = new G4UIdirectory("/polarization/manager/"); + managerDirectory->SetGuidance("general polarization information."); + + verboseCmd = new G4UIcmdWithAnInteger("/polarization/manager/verbose",this); + verboseCmd->SetGuidance("Set the Verbose level of G4PolarizationManager."); + verboseCmd->SetGuidance(" 0 : Silent (default)"); + verboseCmd->SetGuidance(" 1 : Verbose"); + verboseCmd->SetParameterName("level",true); + verboseCmd->SetDefaultValue(0); + verboseCmd->SetRange("level >=0 && level <=1"); + + optActivateCmd = new G4UIcmdWithABool("/polarization/manager/activate",this); + optActivateCmd->SetGuidance("activate/deactivate polarization treatment"); + optActivateCmd->SetParameterName("flag",true); + optActivateCmd->SetDefaultValue(true); + + + volumeDirectory = new G4UIdirectory("/polarization/volume/"); + volumeDirectory->SetGuidance("Status control commands of registered polarized logical volumes."); + + printVolumeListCmd = new G4UIcmdWithoutParameter("/polarization/volume/list",this); + printVolumeListCmd->SetGuidance("print list of registered polarized logical volumes"); + printVolumeListCmd->AvailableForStates(G4State_PreInit,G4State_Idle,G4State_GeomClosed); + + setPolarizationCmd = new G4UIcommand("/polarization/volume/set",this); + setPolarizationCmd->SetGuidance("set or change polarization of a logical volume"); +// setPolarizationCmd->SetParameterName("polarization",true); +// setPolarizationCmd->SetDefaultValue("worldVolume 0. 0. 0."); + setPolarizationCmd->AvailableForStates(G4State_PreInit,G4State_Idle,G4State_GeomClosed); + + G4UIparameter* param; + param = new G4UIparameter("logicalVolumeName",'s',false); + param->SetDefaultValue("worldVolume"); + setPolarizationCmd->SetParameter(param); + param = new G4UIparameter("px",'d',true); + param->SetDefaultValue("0.0"); + setPolarizationCmd->SetParameter(param); + param = new G4UIparameter("py",'d',true); + param->SetDefaultValue("0.0"); + setPolarizationCmd->SetParameter(param); + param = new G4UIparameter("pz",'d',true); + param->SetDefaultValue("0.0"); + setPolarizationCmd->SetParameter(param); + + testDirectory = new G4UIdirectory("/polarization/test/"); + testDirectory->SetGuidance("provides access to some internal test routines."); + + testPolarizationTransformationCmd = new G4UIcmdWithoutParameter("/polarization/test/polarizationTransformation",this); + testPolarizationTransformationCmd->SetGuidance("checks definition of particle reference frame and corresponding translation routines"); + testPolarizationTransformationCmd->AvailableForStates(G4State_PreInit,G4State_Idle,G4State_GeomClosed); + + + +} + +G4PolarizationMessenger::~G4PolarizationMessenger() +{ + delete verboseCmd; +} + +void G4PolarizationMessenger::SetNewValue(G4UIcommand * command,G4String newValue) +{ + if( command==verboseCmd ) { + polarizationManager->SetVerbose(verboseCmd->GetNewIntValue(newValue)); + } + else if ( command==optActivateCmd ) { + polarizationManager->SetActivated(optActivateCmd->GetNewBoolValue(newValue)); + } + else if ( command==printVolumeListCmd ) { + polarizationManager->ListVolumes(); + } + else if ( command==setPolarizationCmd ) { + G4Tokenizer next( newValue ); + G4String volumeName=next(); + G4double px=0.,py=0.,pz=0.; + G4String dvalue=next(); + if (!dvalue.isNull()) { + px=StoD(dvalue); + dvalue=next(); + if (!dvalue.isNull()) { + py=StoD(dvalue); + dvalue=next(); + if (!dvalue.isNull()) pz=StoD(dvalue); + } + } + G4ThreeVector pol(px,py,pz); + polarizationManager->SetVolumePolarization(volumeName,pol); + } + else if ( command==testPolarizationTransformationCmd ) { + G4PolarizationHelper::TestPolarizationTransformations(); + } + else if (command==testInteractionFrameCmd ) { + G4PolarizationHelper::TestInteractionFrame(); + } +} + +G4String G4PolarizationMessenger::GetCurrentValue(G4UIcommand * command) +{ + G4String cv; + if( command==verboseCmd ) + { cv = verboseCmd->ConvertToString(polarizationManager->GetVerbose()); } + + return cv; +} diff --git a/source/processes/electromagnetic/polarisation/src/G4PolarizedAnnihilationCrossSection.cc b/source/processes/electromagnetic/polarisation/src/G4PolarizedAnnihilationCrossSection.cc new file mode 100644 index 0000000000..f4d6ee4706 --- /dev/null +++ b/source/processes/electromagnetic/polarisation/src/G4PolarizedAnnihilationCrossSection.cc @@ -0,0 +1,315 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// ------------------------------------------------------------------- +// $Id: G4PolarizedAnnihilationCrossSection.cc,v 1.5 2006/11/20 12:21:25 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// ------------------------------------------------------------------- +// +// GEANT4 Class file +// +// +// File name: PolarizedAnnihilationCrossSection +// +// Author: Andreas Schaelicke +// +// Creation date: 22.03.2006 +// +// Modifications: +// 24-03-06 included cross section as given in W.McMaster, Nuovo Cimento 7, 1960, 395 +// 27-07-06 new calculation by P.Starovoitov +// +// Class Description: +// * calculates the differential cross section in e+e- -> gamma gamma +// + +#include "G4PolarizedAnnihilationCrossSection.hh" + +G4PolarizedAnnihilationCrossSection::G4PolarizedAnnihilationCrossSection() : + polxx(0.), polyy(0.), polzz(0.), polxz(0.), polzx(0.), polxy(0.), + polyx(0.), polyz(0.), polzy(0.), + re2(1.), diffXSFactor(1.), totalXSFactor(1.), + phi0(0.) +{ + re2 = classic_electr_radius * classic_electr_radius; + phi2 = G4ThreeVector(0., 0., 0.); + phi3 = G4ThreeVector(0., 0., 0.); + dice = 0.; + polXS= 0.; + unpXS = 0.; + ISPxx=ISPyy=ISPzz=ISPnd=0.; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +G4PolarizedAnnihilationCrossSection::~G4PolarizedAnnihilationCrossSection() +{ +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void G4PolarizedAnnihilationCrossSection::TotalXS() +{ + // total cross section is sum of + // + unpol xsec "sigma0" + // + longitudinal polarised cross section "sigma_zz" times pol_3(e-)*pol_3(e+) + // + transverse contribution "(sigma_xx+sigma_yy)/2" times pol_T(e-)*pol_T(e+) + // (Note: if both beams are transversely polarised, i.e. pol_T(e-)!=0 and + // pol_T(e+)!=0, and sigma_xx!=sigma_yy, then the diff. cross section will + // exhibit a azimuthal asymmetry even if pol_T(e-)*pol_T(e+)==0) + + +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void G4PolarizedAnnihilationCrossSection::Initialize( + G4double eps, + G4double gam, + G4double , // phi + const G4StokesVector & pol0, // positron polarization + const G4StokesVector & pol1, // electron polarization + G4int flag) +{ + + diffXSFactor=re2/(gam - 1.); + DefineCoefficients(pol0,pol1); + // + // prepare dicing + // + dice = 0.; + G4double symmXS = 0.125*((-1./sqr(gam + 1.))/sqr(eps) + + ((sqr(gam) + 4.*gam - 1.)/sqr(gam + 1.))/eps - 1.); + // + // + // + G4ThreeVector epsVector(1./sqr(eps), 1./eps, 1.); + G4ThreeVector oneEpsVector(1./sqr(1. - eps), 1./(1.-eps), 1.); + G4ThreeVector sumEpsVector(epsVector + oneEpsVector); + G4ThreeVector difEpsVector(epsVector - oneEpsVector); + G4ThreeVector calcVector(0., 0., 0.); + // + // temporary variables + // + G4double helpVar2 = 0., helpVar1 = 0.; + // + // unpolarised contribution + // + helpVar1 = (gam*gam + 4.*gam + 1.)/sqr(gam + 1.); + helpVar2 = -1./sqr(gam + 1.); + calcVector = G4ThreeVector(helpVar2, helpVar1, -1.); + unpXS = 0.125 * calcVector * sumEpsVector; + + // initial particles polarised contribution + helpVar2 = 1./sqr(gam + 1.); + helpVar1 = -(gam*gam + 4.*gam + 1.)/sqr(gam + 1.); + calcVector = G4ThreeVector(helpVar2, helpVar1, 0.5*(gam + 3.)); + ISPxx = 0.25*(calcVector * sumEpsVector)/(gam - 1.); + + helpVar1 = 1./sqr(gam + 1.); + calcVector = G4ThreeVector(-helpVar1, 2.*gam*helpVar1, -1.); + ISPyy = 0.125 * calcVector * sumEpsVector; + + helpVar1 = 1./(gam - 1.); + helpVar2 = 1./sqr(gam + 1.); + calcVector = G4ThreeVector(-(gam*gam + 1.)*helpVar2,(gam*gam*(gam + 1.) + 7.*gam + 3.)*helpVar2, -(gam + 3.)); + ISPzz = 0.125*helpVar1*(calcVector * sumEpsVector); + + helpVar1 = std::sqrt(std::fabs(eps*(1. - eps)*2.*(gam + 1.) - 1.)); + calcVector = G4ThreeVector(-1./(gam*gam - 1.), 2./(gam - 1.), 0.); + ISPnd = 0.125*(calcVector * difEpsVector) * helpVar1; + + polXS = 0.; + polXS += ISPxx*polxx; + polXS += ISPyy*polyy; + polXS += ISPzz*polzz; + polXS += ISPnd*(polzx + polxz); + phi0 = unpXS + polXS; + dice = symmXS; + // if(polzz != 0.) dice *= (1. + std::fabs(polzz*ISPzz/unpXS)); + if(polzz != 0.) { + dice *= (1. + (polzz*ISPzz/unpXS)); + if (dice<0.) dice=0.; + } + // prepare final state coefficients + if (flag==2) { + // + // circular polarisation + // + G4double circ1 = 0., circ2 = 0., circ3 = 0.; + helpVar1 = 8.*sqr(1. - eps)*sqr(eps)*(gam - 1.)*sqr(gam + 1.)/std::sqrt(gam*gam - 1.); + helpVar2 = sqr(gam + 1.)*sqr(eps)*(-2.*eps + 3.) - (gam*gam + 3.*gam + 2.)*eps; + circ1 = helpVar2 + gam; + circ1 /= helpVar1; + circ2 = helpVar2 + 1.; + circ2 /= helpVar1; + helpVar1 = std::sqrt(std::fabs(eps*(1. - eps)*2.*(gam + 1.) - 1.)); + helpVar1 /= std::sqrt(gam*gam - 1.); + calcVector = G4ThreeVector(1., -2.*gam, 0.); + circ3 = 0.125*(calcVector * sumEpsVector)/(gam + 1.); + circ3 *= helpVar1; + + phi2.setZ( circ2*pol1.z() + circ1*pol0.z() + circ3*(pol1.x() + pol0.x())); + phi3.setZ(-circ1*pol1.z() - circ2*pol0.z() - circ3*(pol1.x() + pol0.x())); + // + // common to both linear polarisation + // + calcVector = G4ThreeVector(-1., 2.*gam, 0.); + G4double linearZero = 0.125*(calcVector * sumEpsVector)/sqr(gam + 1.); + // + // Linear Polarisation #1 + // + helpVar1 = std::sqrt(std::fabs(2.*(gam + 1.)*(1. - eps)*eps - 1.))/((gam + 1.)*eps*(1. - eps)); + helpVar2 = helpVar1*helpVar1; + // + // photon 1 + // + G4double diagContrib = 0.125*helpVar2*(polxx + polyy - polzz); + G4double nonDiagContrib = 0.125*helpVar1*(-polxz/(1. - eps) + polzx/eps); + + phi2.setX(linearZero + diagContrib + nonDiagContrib); + // + // photon 2 + // + nonDiagContrib = 0.125*helpVar1*(polxz/eps - polzx/(1. - eps)); + + + phi3.setX(linearZero + diagContrib + nonDiagContrib); + // + // Linear Polarisation #2 + // + helpVar1 = std::sqrt(gam*gam - 1.)*(2.*(gam + 1.)*eps*(1. - eps) - 1.); + helpVar1 /= 8.*sqr(1. - eps)*sqr(eps)*sqr(gam + 1.)*(gam - 1.); + helpVar2 = std::sqrt((gam*gam - 1.)*std::fabs(2.*(gam + 1.)*eps*(1. - eps) - 1.)); + helpVar2 /= 8.*sqr(1. - eps)*sqr(eps)*sqr(gam + 1.)*(gam - 1.); + + G4double contrib21 = (-polxy + polyx)*helpVar1; + G4double contrib32 = -(eps*(gam + 1.) - 1.)*polyz + (eps*(gam + 1.) - gam)*polzy; + + contrib32 *=helpVar2; + phi2.setY(contrib21 + contrib32); + + contrib32 = -(eps*(gam + 1.) - gam)*polyz + (eps*(gam + 1.) - 1.)*polzy; + contrib32 *=helpVar2; + phi3.setY(contrib21 + contrib32); + + } + phi0 *= diffXSFactor; + phi2 *= diffXSFactor; + phi3 *= diffXSFactor; +} + + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +G4double G4PolarizedAnnihilationCrossSection::XSection(const G4StokesVector & pol2, + const G4StokesVector & pol3) +{ + G4double xs=phi0+pol2*phi2+pol3*phi3; + return xs; +} +// +// calculate total cross section +// +G4double G4PolarizedAnnihilationCrossSection::TotalXSection( + G4double ,G4double ,G4double gam, + const G4StokesVector & pol0,const G4StokesVector & pol1) +{ + totalXSFactor =pi*re2/(gam + 1.); // atomic number ignored + DefineCoefficients(pol0,pol1); + + G4double xs = 0.; + + + G4double gam2 = gam*gam; + G4double sqrtgam1 = std::sqrt(gam2 - 1.); + G4double logMEM = std::log(gam+sqrtgam1); + G4double unpME = (gam*(gam + 4.) + 1.)*logMEM; + unpME += -(gam + 3.)*sqrtgam1; + unpME /= 4.*(gam2 - 1.); + G4double longPart = - 2.*(gam*(gam + 4.) + 1.)*logMEM; + longPart += (gam*(gam + 4.) + 7.)*sqrtgam1; + longPart /= 4.*sqr(gam - 1.)*(gam + 1.); + G4double tranPart = -(gam*(gam + 2.) + 3.)*logMEM; + tranPart += 2.*(2.*gam + 1.)*sqrtgam1; + tranPart /= 8.*sqr(gam - 1.); + + xs += unpME; + xs += polzz*longPart; + xs += (polxx + polyy)*tranPart; + + return xs*totalXSFactor; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +G4StokesVector G4PolarizedAnnihilationCrossSection::GetPol2() +{ + // Note, mean polarization can not contain correlation + // effects. + return 1./phi0 * phi2; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +G4StokesVector G4PolarizedAnnihilationCrossSection::GetPol3() +{ + // Note, mean polarization can not contain correlation + // effects. + return 1./phi0 * phi3; +} +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +void G4PolarizedAnnihilationCrossSection::DefineCoefficients(const G4StokesVector & pol0, + const G4StokesVector & pol1) +{ + polxx=pol0.x()*pol1.x(); + polyy=pol0.y()*pol1.y(); + polzz=pol0.z()*pol1.z(); + + polxz=pol0.x()*pol1.z(); + polzx=pol0.z()*pol1.x(); + + polyz=pol0.y()*pol1.z(); + polzy=pol0.z()*pol1.y(); + + polxy=pol0.x()*pol1.y(); + polyx=pol0.y()*pol1.x(); +} +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +G4double G4PolarizedAnnihilationCrossSection::DiceEpsilon() +{ + return dice; +} +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +G4double G4PolarizedAnnihilationCrossSection::getVar(G4int choice) +{ + if (choice == -1) return polXS/unpXS; + if (choice == 0) return unpXS; + if (choice == 1) return ISPxx; + if (choice == 2) return ISPyy; + if (choice == 3) return ISPzz; + if (choice == 4) return ISPnd; + return 0; +} +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/source/processes/electromagnetic/polarisation/src/G4PolarizedAnnihilationModel.cc b/source/processes/electromagnetic/polarisation/src/G4PolarizedAnnihilationModel.cc new file mode 100644 index 0000000000..e7e0e33e4b --- /dev/null +++ b/source/processes/electromagnetic/polarisation/src/G4PolarizedAnnihilationModel.cc @@ -0,0 +1,375 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4PolarizedAnnihilationModel.cc,v 1.4 2006/11/17 14:14:20 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ------------------------------------------------------------------- +// +// GEANT4 Class file +// +// +// File name: G4PolarizedAnnihilationModel +// +// Author: Andreas Schaelicke +// +// Creation date: 01.05.2005 +// +// Modifications: +// 18-07-06 use newly calculated cross sections (P. Starovoitov) +// 21-08-06 update interface (A. Schaelicke) +// 17-11-06 add protection agaist e+ zero energy PostStep (V.Ivanchenko) +// +// +// Class Description: +// +// Implementation of polarized gamma Annihilation scattering on free electron +// + +// ------------------------------------------------------------------- +#include "G4PolarizedAnnihilationModel.hh" +#include "G4PolarizationManager.hh" +#include "G4PolarizationHelper.hh" +#include "G4StokesVector.hh" +#include "G4PolarizedAnnihilationCrossSection.hh" +#include "G4ParticleChangeForGamma.hh" +#include "G4Gamma.hh" + +G4PolarizedAnnihilationModel::G4PolarizedAnnihilationModel(const G4ParticleDefinition* p, + const G4String& nam) + : G4eeToTwoGammaModel(p,nam),crossSectionCalculator(0) +{ + crossSectionCalculator=new G4PolarizedAnnihilationCrossSection(); +} + +G4PolarizedAnnihilationModel::~G4PolarizedAnnihilationModel() +{ + if (crossSectionCalculator) delete crossSectionCalculator; +} + +G4double G4PolarizedAnnihilationModel::ComputeCrossSectionPerElectron( + const G4ParticleDefinition* pd, + G4double kinEnergy, + G4double cut, + G4double emax) +{ + G4double xs = G4eeToTwoGammaModel::ComputeCrossSectionPerElectron(pd,kinEnergy, + cut,emax); + + G4double polzz = theBeamPolarization.z()*theTargetPolarization.z(); + G4double poltt = theBeamPolarization.x()*theTargetPolarization.x() + + theBeamPolarization.y()*theTargetPolarization.y(); + if (polzz!=0 || poltt!=0) { + G4double xval,lasym,tasym; + ComputeAsymmetriesPerElectron(kinEnergy,xval,lasym,tasym); + xs*=(1.+polzz*lasym+poltt*tasym); + } + + return xs; +} + +void G4PolarizedAnnihilationModel::ComputeAsymmetriesPerElectron(G4double ene, + G4double & valueX, + G4double & valueA, + G4double & valueT) +{ + // *** calculate asymmetries + G4double gam = 1. + ene/electron_mass_c2; + G4double xs0=crossSectionCalculator->TotalXSection(0.,1.,gam, + G4StokesVector::ZERO, + G4StokesVector::ZERO); + G4double xsA=crossSectionCalculator->TotalXSection(0.,1.,gam, + G4StokesVector::P3, + G4StokesVector::P3); + G4double xsT1=crossSectionCalculator->TotalXSection(0.,1.,gam, + G4StokesVector::P1, + G4StokesVector::P1); + G4double xsT2=crossSectionCalculator->TotalXSection(0.,1.,gam, + G4StokesVector::P2, + G4StokesVector::P2); + G4double xsT=0.5*(xsT1+xsT2); + + valueX=xs0; + valueA=xsA/xs0-1.; + valueT=xsT/xs0-1.; + // G4cout<DiceEpsilon()<Initialize(epsilmax, gama, 0., theBeamPolarization, theTargetPolarization); + if (crossSectionCalculator->DiceEpsilon()<0) { + G4cout<<"ERROR in PolarizedAnnihilationPS::PostStepDoIt\n" + <<"epsilmax DiceRoutine not appropriate ! "<DiceEpsilon()<Initialize(epsil, gama, 0., theBeamPolarization, theTargetPolarization,1); + + treject = crossSectionCalculator->DiceEpsilon(); + treject*=epsil; + + if (treject>gmax || treject<0.) + G4cout<<"ERROR in PolarizedAnnihilationPS::PostStepDoIt\n" + <<" eps ("<trejectmax) trejectmax=treject; + if (ncount>1000) { + G4cout<<"WARNING in PolarizedAnnihilationPS::PostStepDoIt\n" + <<"eps dicing very inefficient ="<Initialize(epsil, gama, 0., theBeamPolarization, theTargetPolarization,2); + + G4double gdiced =crossSectionCalculator->getVar(0); + gdiced += crossSectionCalculator->getVar(3)*theBeamPolarization.p3()*theTargetPolarization.p3(); + gdiced += 1.*(std::fabs(crossSectionCalculator->getVar(1)) + + std::fabs(crossSectionCalculator->getVar(2)))*beamTrans*targetTrans; + gdiced += 1.*std::fabs(crossSectionCalculator->getVar(4)) + *(std::fabs(theBeamPolarization.p3())*targetTrans + std::fabs(theTargetPolarization.p3())*beamTrans); + + G4double gdist = crossSectionCalculator->getVar(0); + gdist += crossSectionCalculator->getVar(3)*theBeamPolarization.p3()*theTargetPolarization.p3(); + gdist += crossSectionCalculator->getVar(1)*(std::cos(phi)*theBeamPolarization.p1() + + std::sin(phi)*theBeamPolarization.p2()) + *(std::cos(phi)*theTargetPolarization.p1() + + std::sin(phi)*theTargetPolarization.p2()); + gdist += crossSectionCalculator->getVar(2)*(std::cos(phi)*theBeamPolarization.p2() + - std::sin(phi)*theBeamPolarization.p1()) + *(std::cos(phi)*theTargetPolarization.p2() + - std::sin(phi)*theTargetPolarization.p1()); + gdist += crossSectionCalculator->getVar(4) + *(std::cos(phi)*theBeamPolarization.p3()*theTargetPolarization.p1() + + std::cos(phi)*theBeamPolarization.p1()*theTargetPolarization.p3() + + std::sin(phi)*theBeamPolarization.p3()*theTargetPolarization.p2() + + std::sin(phi)*theBeamPolarization.p2()*theTargetPolarization.p3()); + + treject = gdist/gdiced; + //G4cout<<" treject = "<Initialize(epsil,gama,phi,theBeamPolarization,theTargetPolarization,2); + + // ********************************************************************** + + Phot1Direction.rotateUz(PositDirection); + // create G4DynamicParticle object for the particle1 + G4DynamicParticle* aParticle1= new G4DynamicParticle (G4Gamma::Gamma(), + Phot1Direction, Phot1Energy); + finalGamma1Polarization=crossSectionCalculator->GetPol2(); + G4double n1=finalGamma1Polarization.mag2(); + if (n1>1) { + G4cout<<"ERROR: PolarizedAnnihilation Polarization Vector at epsil = " + <SetPolarization(finalGamma1Polarization.p1(), + finalGamma1Polarization.p2(), + finalGamma1Polarization.p3()); + + fvect->push_back(aParticle1); + + + // ********************************************************************** + + G4double Eratio= Phot1Energy/Phot2Energy; + G4double PositP= std::sqrt(PositKinEnergy*(PositKinEnergy+2.*electron_mass_c2)); + G4ThreeVector Phot2Direction (-dirx*Eratio, -diry*Eratio, + (PositP-dirz*Phot1Energy)/Phot2Energy); + Phot2Direction.rotateUz(PositDirection); + // create G4DynamicParticle object for the particle2 + G4DynamicParticle* aParticle2= new G4DynamicParticle (G4Gamma::Gamma(), + Phot2Direction, Phot2Energy); + + // define polarization of second final state photon + finalGamma2Polarization=crossSectionCalculator->GetPol3(); + G4double n2=finalGamma2Polarization.mag2(); + if (n2>1) { + G4cout<<"ERROR: PolarizedAnnihilation Polarization Vector at epsil = "<SetPolarization(finalGamma2Polarization.p1(), + finalGamma2Polarization.p2(), + finalGamma2Polarization.p3()); + + fvect->push_back(aParticle2); + + return fvect; +} diff --git a/source/processes/electromagnetic/polarisation/src/G4PolarizedBhabhaCrossSection.cc b/source/processes/electromagnetic/polarisation/src/G4PolarizedBhabhaCrossSection.cc new file mode 100644 index 0000000000..4a07668f60 --- /dev/null +++ b/source/processes/electromagnetic/polarisation/src/G4PolarizedBhabhaCrossSection.cc @@ -0,0 +1,307 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4PolarizedBhabhaCrossSection.cc,v 1.4 2006/11/17 14:14:20 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// ------------------------------------------------------------------- +// +// GEANT4 Class file +// +// +// File name: G4PolarizedBhabhaCrossSection +// +// Author: Andreas Schaelicke +// +// Creation date: 12.01.2006 +// +// Modifications: +// 16-01-06 included cross section as calculated by P.Starovoitov +// 24-08-06 bugfix in total cross section (A. Schaelicke) +// 07-11-06 modify reference system for polarisation vectors +// (A. Schaelicke & P.Starovoitov) +// +// Class Description: +// * calculates the differential cross section +// incomming positron Kpl(along positive z direction) scatters at +// an electron Kmn at rest +// * phi denotes the angle between the scattering plane (defined by the +// outgoing electron) and X-axis +// * all stokes vectors refer to spins in the Global System (X,Y,Z) +// + +#include "G4PolarizedBhabhaCrossSection.hh" + +G4PolarizedBhabhaCrossSection::G4PolarizedBhabhaCrossSection() +{ +} +G4PolarizedBhabhaCrossSection::~G4PolarizedBhabhaCrossSection() +{ +} +void G4PolarizedBhabhaCrossSection::Initialize( + G4double e, + G4double gamma, + G4double /*phi*/, + const G4StokesVector & pol0, + const G4StokesVector & pol1, + G4int flag) +{ + G4double re2 = classic_electr_radius * classic_electr_radius; + G4double gamma2 = gamma*gamma; + G4double gamma3 = gamma2*gamma; + G4double gmo = (gamma - 1.); + G4double gmo2 = (gamma - 1.)*(gamma - 1.); + G4double gmo3 = gmo2*(gamma - 1.); + G4double gpo = (gamma + 1.); + G4double gpo2 = (gamma + 1.)*(gamma + 1.); + G4double gpo3 = gpo2*(gamma + 1.); + G4double gpo12 = std::sqrt(gpo); + G4double gpo32 = gpo*gpo12; + G4double gpo52 = gpo2*gpo12; + + G4double pref = re2/(gamma - 1.0); + G4double sqrttwo=std::sqrt(2.); + G4double d = std::sqrt(1./e - 1.); + G4double e2 = e*e; + G4double e3 = e2*e; + + // *** new *** + G4double gmo12 = std::sqrt(gmo); + G4double gmo32 = gmo*gmo12; + G4double egmp32 = std::pow(e*(2 + e*gmo)*gpo,(3./2.)); + G4double e32 = e*std::sqrt(e); + + G4bool polarized=(!pol0.IsZero())||(!pol1.IsZero()); + + if (flag==0) polarized=false; + // Unpolarised part of XS + // *AS* UnpME . OK + phi0 = 0.; + phi0+= e2*gmo3/gpo3; + phi0+= -2.*e*gamma*gmo2/gpo3; + phi0+= (3.*gamma2 + 6.*gamma + 4.)*gmo/gpo3; + phi0+= -(2.*gamma2 + 4.*gamma + 1.)/(e*gpo2); + phi0+= gamma2/(e2*(gamma2 - 1.)); + phi0*=0.25; + // Initial state polarisarion dependence + if (polarized) { + // G4cout<<"Polarized differential Bhabha cross section"<=1) { + // + // Final Positron Ppl + // + // initial positron Kpl + if (!pol0.IsZero()) { + + G4double xxPplKpl = -((-1 + e)*(e*gmo - gamma)*(-(gamma*gpo) + e*(-2 + gamma + gamma2)))/ + (4*e2*gpo*std::sqrt(gmo*gpo*(-1 + e + gamma - e*gamma)* (1 + e + gamma - e*gamma))); + G4double xyPplKpl = 0; + G4double xzPplKpl = ((e*gmo - gamma)*(-1 - gamma + e*gmo*(1 + 2*gamma)))/ + (2*sqrttwo*e32*gmo*gpo2*std::sqrt(1 + e + gamma - e*gamma)); + G4double yxPplKpl = 0; + G4double yyPplKpl = (gamma2*gpo + e2*gmo2*(3 + gamma) - + e*gmo*(1 + 2*gamma*(2 + gamma)))/(4*e2*gmo*gpo2); + G4double yzPplKpl = 0; + G4double zxPplKpl = ((e*gmo - gamma)*(1 + e*(-1 + 2*e*gmo - 2*gamma)*gmo + gamma))/ + (2*sqrttwo*e*gmo*gpo2*std::sqrt(e*(1 + e + gamma - e*gamma))); + G4double zyPplKpl = 0; + G4double zzPplKpl = -((e*gmo - gamma)*std::sqrt((1 - e)/(e - e*gamma2 + gpo2))* + (2*e2*gmo2 + gamma + gamma2 - e*(-2 + gamma + gamma2)))/ + (4*e2*(-1 + gamma2)); + + phi2[0] += xxPplKpl*pol0.x() + xyPplKpl*pol0.y() + xzPplKpl*pol0.z(); + phi2[1] += yxPplKpl*pol0.x() + yyPplKpl*pol0.y() + yzPplKpl*pol0.z(); + phi2[2] += zxPplKpl*pol0.x() + zyPplKpl*pol0.y() + zzPplKpl*pol0.z(); + } + // initial electron Kmn + if (!pol1.IsZero()) { + G4double xxPplKmn = ((-1 + e)*(e*(-2 + gamma)*gmo + gamma))/(4*e*gpo32*std::sqrt(1 + e2*gmo + gamma - 2*e*gamma)); + G4double xyPplKmn = 0; + G4double xzPplKmn = (-1 + e*gmo + gmo*gamma)/(2*sqrttwo*gpo2* std::sqrt(e*(1 + e + gamma - e*gamma))); + G4double yxPplKmn = 0; + G4double yyPplKmn = (-1 - 2*gamma + e*gmo*(3 + gamma))/(4*e*gpo2); + G4double yzPplKmn = 0; + G4double zxPplKmn = (1 + 2*e2*gmo2 + gamma + gamma2 + e*(1 + (3 - 4*gamma)*gamma))/ + (2*sqrttwo*gpo2*std::sqrt(e*(1 + e + gamma - e*gamma))); + G4double zyPplKmn = 0; + G4double zzPplKmn = -(std::sqrt((1 - e)/(e - e*gamma2 + gpo2))* + (2*e2*gmo2 + gamma + 2*gamma2 + e*(2 + gamma - 3*gamma2)))/(4*e*gpo); + + phi2[0] += xxPplKmn*pol1.x() + xyPplKmn*pol1.y() + xzPplKmn*pol1.z(); + phi2[1] += yxPplKmn*pol1.x() + yyPplKmn*pol1.y() + yzPplKmn*pol1.z(); + phi2[2] += zxPplKmn*pol1.x() + zyPplKmn*pol1.y() + zzPplKmn*pol1.z(); + } +// +// Final Electron Pmn +// + // initial positron Kpl + if (!pol0.IsZero()) { + G4double xxPmnKpl = ((-1 + e*gmo)*(2 + gamma))/(4*gpo* std::sqrt(e*(2 + e*gmo)*gpo)); + G4double xyPmnKpl = 0; + G4double xzPmnKpl = (std::sqrt((-1 + e)/(-2 + e - e*gamma))* + (e + gamma + e*gamma - 2*(-1 + e)*gamma2))/(2*sqrttwo*e*gpo2); + G4double yxPmnKpl = 0; + G4double yyPmnKpl = (-1 - 2*gamma + e*gmo*(3 + gamma))/(4*e*gpo2); + G4double yzPmnKpl = 0; + G4double zxPmnKpl = -((-1 + e)*(1 + 2*e*gmo)*(e*gmo - gamma))/ + (2*sqrttwo*e*std::sqrt(-((-1 + e)*(2 + e*gmo)))*gpo2); + G4double zyPmnKpl = 0; + G4double zzPmnKpl = (-2 + 2*e2*gmo2 + gamma*(-1 + 2*gamma) + + e*(-2 + (5 - 3*gamma)*gamma))/(4*std::sqrt(e*(2 + e*gmo))* gpo32); + + phi3[0] += xxPmnKpl*pol0.x() + xyPmnKpl*pol0.y() + xzPmnKpl*pol0.z(); + phi3[1] += yxPmnKpl*pol0.x() + yyPmnKpl*pol0.y() + yzPmnKpl*pol0.z(); + phi3[2] += zxPmnKpl*pol0.x() + zyPmnKpl*pol0.y() + zzPmnKpl*pol0.z(); + } + // initial electron Kmn + if (!pol1.IsZero()) { + G4double xxPmnKmn = -((2 + e*gmo)*(-1 + e*gmo - gamma)*(e*gmo - gamma)* + (-2 + gamma))/(4*gmo*egmp32); + G4double xyPmnKmn = 0; + G4double xzPmnKmn = ((e*gmo - gamma)* + std::sqrt((-1 + e + gamma - e*gamma)/(2 + e*gmo))* + (e + gamma - e*gamma + gamma2))/ + (2*sqrttwo*e2*gmo32*gpo2); + G4double yxPmnKmn = 0; + G4double yyPmnKmn = (gamma2*gpo + e2*gmo2*(3 + gamma) - + e*gmo*(1 + 2*gamma*(2 + gamma)))/(4*e2*gmo*gpo2); + G4double yzPmnKmn = 0; + G4double zxPmnKmn = -((-1 + e)*(e*gmo - gamma)*(e*gmo + 2*e2*gmo2 - gamma*gpo))/ + (2*sqrttwo*e2*std::sqrt(-((-1 + e)*(2 + e*gmo)))* gmo*gpo2); + G4double zyPmnKmn = 0; + G4double zzPmnKmn = ((e*gmo - gamma)*std::sqrt(e/((2 + e*gmo)*gpo))* + (-(e*(-2 + gamma)*gmo) + 2*e2*gmo2 + (-2 + gamma)*gpo))/(4*e2*(-1 + gamma2)); + + phi3[0] += xxPmnKmn*pol1.x() + xyPmnKmn*pol1.y() + xzPmnKmn*pol1.z(); + phi3[1] += yxPmnKmn*pol1.x() + yyPmnKmn*pol1.y() + yzPmnKmn*pol1.z(); + phi3[2] += zxPmnKmn*pol1.x() + zyPmnKmn*pol1.y() + zzPmnKmn*pol1.z(); + } + } + phi0 *= pref; + phi2 *= pref; + phi3 *= pref; + +} + +G4double G4PolarizedBhabhaCrossSection::XSection(const G4StokesVector & pol2, + const G4StokesVector & pol3) +{ + G4double xs=0.; + xs+=phi0; + + G4bool polarized=(!pol2.IsZero())||(!pol3.IsZero()); + if (polarized) { + xs+=phi2*pol2 + phi3*pol3; + } + return xs; +} + +G4double G4PolarizedBhabhaCrossSection::TotalXSection( + G4double xmin, G4double xmax, G4double gamma, + const G4StokesVector & pol0,const G4StokesVector & pol1) +{ + G4double xs=0.; + + G4double x=xmin; + + if (xmax != 1.) G4cout<<" warning xmax expected to be 1 but is "< electron radius^2; + G4double re2 = classic_electr_radius * classic_electr_radius; + G4double gamma2=gamma*gamma; + G4double gmo2 = (gamma - 1.)*(gamma - 1.); + G4double gpo2 = (gamma + 1.)*(gamma + 1.); + G4double gpo3 = gpo2*(gamma + 1.); + G4double logMEM = std::log(x); + G4double pref = twopi*re2/(gamma - 1.0); + // unpolarise XS + G4double sigma0 = 0.; + sigma0 += -gmo2*(gamma - 1.)*x*x*x/3. + gmo2*gamma*x*x; + sigma0 += -(gamma - 1.)*(3.*gamma*(gamma + 2.) +4.)*x; + sigma0 += (gamma*(gamma*(gamma*(4.*gamma - 1.) - 21.) - 7.)+13.)/(3.*(gamma - 1.)); + sigma0 /= gpo3; + sigma0 += logMEM*(2. - 1./gpo2); + sigma0 += gamma2/((gamma2 - 1.)*x); + // longitudinal part + G4double sigma2=0.; + sigma2 += logMEM*gamma*(gamma + 1.)*(2.*gamma + 1.); + sigma2 += gamma*(7.*gamma*(gamma + 1.) - 2.)/3.; + sigma2 += -(3.*gamma + 1.)*(gamma2 + gamma - 1.)*x; + sigma2 += (gamma - 1.)*gamma*(gamma + 3.)*x*x; + sigma2 += -gmo2*(gamma + 3.)*x*x*x/3.; + sigma2 /= gpo3; + // transverse part + G4double sigma3=0.; + sigma3 += 0.5*(gamma + 1.)*(3.*gamma + 1.)*logMEM; + sigma3 += (gamma*(5.*gamma - 4.) - 13.)/6.; + sigma3 += 0.5*(gamma2 + 3.)*x; + sigma3 += - 2.*(gamma - 1.)*gamma*x*x; // *AS* changed sign + sigma3 += 2.*gmo2*x*x*x/3.; + sigma3 /= gpo3; + // total cross section + xs+=pref*(sigma0 + sigma2*pol0.z()*pol1.z() + sigma3*(pol0.x()*pol1.x()+pol0.y()*pol1.y())); + + return xs; +} + + +G4StokesVector G4PolarizedBhabhaCrossSection::GetPol2() +{ + // Note, mean polarization can not contain correlation + // effects. + return 1./phi0 * phi2; +} +G4StokesVector G4PolarizedBhabhaCrossSection::GetPol3() +{ + // Note, mean polarization can not contain correlation + // effects. + return 1./phi0 * phi3; +} diff --git a/source/processes/electromagnetic/polarisation/src/G4PolarizedBremsstrahlungCrossSection.cc b/source/processes/electromagnetic/polarisation/src/G4PolarizedBremsstrahlungCrossSection.cc new file mode 100644 index 0000000000..8a880ffc4e --- /dev/null +++ b/source/processes/electromagnetic/polarisation/src/G4PolarizedBremsstrahlungCrossSection.cc @@ -0,0 +1,223 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4PolarizedBremsstrahlungCrossSection.cc,v 1.3 2006/11/17 12:12:02 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ------------------------------------------------------------------- +// +// GEANT4 Class file +// +// +// File name: G4BremsstrahlungCrossSection +// +// Author: Andreas Schaelicke on the base of Karim Laihems code +// +// Creation date: 16.08.2006 +// + +#include "G4PolarizedBremsstrahlungCrossSection.hh" +#include "G4ePolarizedBremsstrahlungModel.hh" +#include "G4Element.hh" + +G4bool G4PolarizedBremsstrahlungCrossSection::scrnInitialized=false; +G4double G4PolarizedBremsstrahlungCrossSection::SCRN [3][20]; +// screening function lookup table; + + +void G4PolarizedBremsstrahlungCrossSection::InitializeMe() +{ + if (!scrnInitialized) { + SCRN [1][1]= 0.5 ; SCRN [2][1] = 0.0145; + SCRN [1][2]= 1.0 ; SCRN [2][2] = 0.0490; + SCRN [1][3]= 2.0 ; SCRN [2][3] = 0.1400; + SCRN [1][4]= 4.0 ; SCRN [2][4] = 0.3312; + SCRN [1][5]= 8.0 ; SCRN [2][5] = 0.6758; + SCRN [1][6]= 15.0 ; SCRN [2][6] = 1.126; + SCRN [1][7]= 20.0 ; SCRN [2][7] = 1.367; + SCRN [1][8]= 25.0 ; SCRN [2][8] = 1.564; + SCRN [1][9]= 30.0 ; SCRN [2][9] = 1.731; + SCRN [1][10]= 35.0 ; SCRN [2][10]= 1.875; + SCRN [1][11]= 40.0 ; SCRN [2][11]= 2.001; + SCRN [1][12]= 45.0 ; SCRN [2][12]= 2.114; + SCRN [1][13]= 50.0 ; SCRN [2][13]= 2.216; + SCRN [1][14]= 60.0 ; SCRN [2][14]= 2.393; + SCRN [1][15]= 70.0 ; SCRN [2][15]= 2.545; + SCRN [1][16]= 80.0 ; SCRN [2][16]= 2.676; + SCRN [1][17]= 90.0 ; SCRN [2][17]= 2.793; + SCRN [1][18]= 100.0 ; SCRN [2][18]= 2.897; + SCRN [1][19]= 120.0 ; SCRN [2][19]= 3.078; + + scrnInitialized=true; + } +} + +G4PolarizedBremsstrahlungCrossSection::G4PolarizedBremsstrahlungCrossSection( + G4ePolarizedBremsstrahlungModel * model) + : theModel(model) +{ + InitializeMe(); +} + + +void G4PolarizedBremsstrahlungCrossSection::Initialize( + G4double aLept0E, G4double aGammaE, G4double sintheta, + const G4StokesVector & beamPol, + const G4StokesVector & /*p1*/, + G4int /*flag*/) +{ +// G4cout<<"G4PolarizedBremsstrahlungCrossSection::Initialize \n" +// <<"lepE = "<SelectedAtom(); + + // ******* Gamma Transvers Momentum + + G4double TMom = std::sqrt(Lept0E2 -1.)* sintheta; + G4double u = TMom , u2 =u * u ; + G4double Xsi = 1./(1.+u2) , Xsi2 = Xsi * Xsi ; + + G4double theZ = theSelectedElement->GetZ(); + + G4double fCoul = theSelectedElement->GetfCoulomb(); + G4double delta = 12. * std::pow(theZ, 1./3.) * + Lept0E * Lept1E * Xsi / (121. * GammaE); + G4double GG=0.; + + if(delta < 0.5) { + GG = std::log(2.* Lept0E * Lept1E / GammaE) - 2. - fCoul; + } + else if ( delta < 120) { + for (G4int j=2; j<=19; j++) { + if(SCRN[1][j] >= delta) { + GG =std::log(2 * Lept0E * Lept1E / GammaE) - 2 - fCoul + -(SCRN[2][j-1]+(delta-SCRN[1][j-1])*(SCRN[2][j]-SCRN[2][j-1]) + /(SCRN[1][j]-SCRN[1][j-1])); + break; + } + } + } + else { + G4double alpha_sc = (111 * std::pow(theZ, -1./3.)) / Xsi; + GG = std::log(alpha_sc)- 2 - fCoul; + } + + if(GG<-1) GG=-1; // *KL* do we need this ?! + + G4double I_Lept = (Lept0E2 + Lept1E2) * (3.+2.*GG) - 2 * Lept0E * Lept1E * (1. + 4. * u2 * Xsi2 * GG); + G4double F_Lept = Lept1E * 4. * GammaE * u * Xsi * (1. - 2 * Xsi) * GG / I_Lept; + G4double E_Lept = Lept0E * 4. * GammaE * u * Xsi * (2. * Xsi - 1.) * GG / I_Lept; + G4double M_Lept = 4. * Lept0E * Lept1E * (1. + GG - 2. * Xsi2 * u2 * GG) / I_Lept ; + G4double P_Lept = GammaE2 * (1. + 8. * GG * (Xsi - 0.5)*(Xsi - 0.5)) / I_Lept ; + + G4double Stokes_SS1 = M_Lept * Stokes_S1 + E_Lept * Stokes_S3; + G4double Stokes_SS2 = M_Lept * Stokes_S2 ; + G4double Stokes_SS3 = (M_Lept + P_Lept) * Stokes_S3 + F_Lept * Stokes_S1; + + theFinalLeptonPolarization.setX(Stokes_SS1); + theFinalLeptonPolarization.setY(Stokes_SS2); + theFinalLeptonPolarization.setZ(Stokes_SS3); + + if(theFinalLeptonPolarization.mag2()>1) { + G4cout<<" WARNING in pol-brem theFinalLeptonPolarization \n"; + G4cout + <<"\t"<1) theFinalLeptonPolarization.setZ(1); + } + + + G4double I_Gamma = (Lept0E2 + Lept1E2)*(3+2*GG) - 2 * Lept0E * Lept1E * (1 + 4 * u2 * Xsi2 * GG); + G4double D_Gamma = 8 * Lept0E * Lept1E * u2 * Xsi2 * GG / I_Gamma; + G4double L_Gamma = GammaE * ((Lept0E + Lept1E) * (3 + 2 * GG) + - 2 * Lept1E * (1 + 4 * u2 * Xsi2 * GG))/I_Gamma; + G4double T_Gamma = 4 * GammaE * Lept1E * Xsi * u * (2 * Xsi - 1) * GG / I_Gamma ; + + G4double Stokes_P1 = D_Gamma ; + G4double Stokes_P2 = 0 ; + G4double Stokes_P3 = (Stokes_S3*L_Gamma + Stokes_S1*T_Gamma) ; + + theFinalGammaPolarization.SetPhoton(); + + theFinalGammaPolarization.setX(Stokes_P1); + theFinalGammaPolarization.setY(Stokes_P2); + theFinalGammaPolarization.setZ(Stokes_P3); + + if(theFinalGammaPolarization.mag2()>1) { + G4cout<<" WARNING in pol-brem theFinalGammaPolarization \n"; + G4cout + <<"\t"<clearAndDestroy(); + delete theAsymmetryTable; + } +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +void G4PolarizedCompton::InitialiseProcess(const G4ParticleDefinition*) +{ + if(!isInitialised) { + isInitialised = true; + SetBuildTableFlag(true); + SetSecondaryParticle(G4Electron::Electron()); + G4double emin = MinKinEnergy(); + G4double emax = MaxKinEnergy(); + emModel = new G4PolarizedComptonModel(); + if(0 == mType) selectedModel = new G4KleinNishinaCompton(); + else if(10 == mType) selectedModel = emModel; + selectedModel->SetLowEnergyLimit(emin); + selectedModel->SetHighEnergyLimit(emax); + AddEmModel(1, selectedModel); + } +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void G4PolarizedCompton::PrintInfo() +{ + G4cout << " Total cross sections has a good parametrisation" + << " from 10 KeV to (100/Z) GeV" + << "\n Sampling according " << selectedModel->GetName() << " model" + << G4endl; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void G4PolarizedCompton::SetModel(const G4String& s) +{ + if(s == "Klein-Nishina") mType = 0; + if(s == "Polarized-Compton") mType = 10; +} + + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + + + +G4double G4PolarizedCompton::GetMeanFreePath( + const G4Track& aTrack, + G4double previousStepSize, + G4ForceCondition* condition) +{ + // *** get unploarised mean free path from lambda table *** + G4double mfp = G4VEmProcess::GetMeanFreePath(aTrack, previousStepSize, condition); + + + if (theAsymmetryTable && useAsymmetryTable) { + // *** get asymmetry, if target is polarized *** + const G4DynamicParticle* aDynamicGamma = aTrack.GetDynamicParticle(); + const G4double GammaEnergy = aDynamicGamma->GetKineticEnergy(); + const G4StokesVector GammaPolarization = aTrack.GetPolarization(); + const G4ParticleMomentum GammaDirection0 = aDynamicGamma->GetMomentumDirection(); + + G4Material* aMaterial = aTrack.GetMaterial(); + G4VPhysicalVolume* aPVolume = aTrack.GetVolume(); + G4LogicalVolume* aLVolume = aPVolume->GetLogicalVolume(); + + // G4Material* bMaterial = aLVolume->GetMaterial(); + G4PolarizationManager * polarizationManger = G4PolarizationManager::GetInstance(); + + const G4bool VolumeIsPolarized = polarizationManger->IsPolarized(aLVolume); + G4StokesVector ElectronPolarization = polarizationManger->GetVolumePolarization(aLVolume); + + if (!VolumeIsPolarized || mfp == DBL_MAX) return mfp; + + if (verboseLevel>=2) { + + G4cout << " Mom " << GammaDirection0 << G4endl; + G4cout << " Polarization " << GammaPolarization << G4endl; + G4cout << " MaterialPol. " << ElectronPolarization << G4endl; + G4cout << " Phys. Volume " << aPVolume->GetName() << G4endl; + G4cout << " Log. Volume " << aLVolume->GetName() << G4endl; + G4cout << " Material " << aMaterial << G4endl; + } + + G4bool isOutRange; + + + G4int midx= CurrentMaterialCutsCoupleIndex(); + G4PhysicsVector * aVector=(*theAsymmetryTable)(midx); + + G4double asymmetry=0; + if (aVector) + asymmetry = aVector->GetValue(GammaEnergy, isOutRange); + else { + G4cout << " MaterialIndex " << midx << " is out of range \n"; + } + if (isOutRange) { + G4cout << " MaterialIndex " << midx + << " GammaEnergy=" << GammaEnergy << " is out of range \n"; + asymmetry=0; + } + + // we have to determine angle between particle motion + // and target polarisation here + // circ pol * Vec(ElectronPol)*Vec(PhotonMomentum) + // both vectors in global reference frame + + G4double pol=ElectronPolarization*GammaDirection0; + + G4double polProduct = GammaPolarization.p3() * pol; + mfp *= 1. / ( 1. + polProduct * asymmetry ); + + if (verboseLevel>=2) { + G4cout << " MeanFreePath: " << mfp / mm << " mm " << G4endl; + G4cout << " Asymmetry: " << asymmetry << G4endl; + G4cout << " PolProduct: " << polProduct << G4endl; + } + } + + return mfp; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void G4PolarizedCompton::PreparePhysicsTable(const G4ParticleDefinition& part) +{ + G4VEmProcess::PreparePhysicsTable(part); + if(buildAsymmetryTable) + theAsymmetryTable = G4PhysicsTableHelper::PreparePhysicsTable(theAsymmetryTable); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + + +void G4PolarizedCompton::BuildPhysicsTable(const G4ParticleDefinition& part) +{ + // *** build (unpolarized) cross section tables (Lambda) + G4VEmProcess::BuildPhysicsTable(part); + if(buildAsymmetryTable) + BuildAsymmetryTable(part); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + + +void G4PolarizedCompton::BuildAsymmetryTable(const G4ParticleDefinition& part) +{ + // Access to materials + const G4ProductionCutsTable* theCoupleTable= + G4ProductionCutsTable::GetProductionCutsTable(); + size_t numOfCouples = theCoupleTable->GetTableSize(); + for(size_t i=0; iGetFlag(i)) { + + // create physics vector and fill it + const G4MaterialCutsCouple* couple = theCoupleTable->GetMaterialCutsCouple(i); + // use same parameters as for lambda + G4PhysicsVector* aVector = LambdaPhysicsVector(couple); + // modelManager->FillLambdaVector(aVector, couple, startFromNull); + + for (G4int j = 0 ; j < LambdaBinning() ; ++j ) { + G4double lowEdgeEnergy = aVector->GetLowEdgeEnergy(j); + G4double tasm=0.; + G4double asym = ComputeAsymmetry(lowEdgeEnergy, couple, part, 0., tasm); + aVector->PutValue(j,asym); + } + + G4PhysicsTableHelper::SetPhysicsVector(theAsymmetryTable, i, aVector); + } + } + +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + + +G4double G4PolarizedCompton::ComputeAsymmetry(G4double energy, + const G4MaterialCutsCouple* couple, + const G4ParticleDefinition& particle, + G4double cut, + G4double & tAsymmetry) +{ + G4double lAsymmetry = 0.0; + tAsymmetry=0; + + // + // calculate polarized cross section + // + G4ThreeVector thePolarization=G4ThreeVector(0.,0.,1.); + emModel->SetTargetPolarization(thePolarization); + emModel->SetBeamPolarization(thePolarization); + G4double sigma2=emModel->CrossSection(couple,&particle,energy,cut,energy); + + // + // calculate unpolarized cross section + // + thePolarization=G4ThreeVector(); + emModel->SetTargetPolarization(thePolarization); + emModel->SetBeamPolarization(thePolarization); + G4double sigma0=emModel->CrossSection(couple,&particle,energy,cut,energy); + + // determine assymmetries + if (sigma0>0.) { + lAsymmetry=sigma2/sigma0-1.; + } + return lAsymmetry; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + + +std::vector* G4PolarizedCompton::SecondariesPostStep( + G4VEmModel* model, + const G4MaterialCutsCouple* couple, + const G4DynamicParticle* dp) +{ + std::vector* secondaries = model->SampleSecondaries(couple, dp); + return secondaries; +} +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/source/processes/electromagnetic/polarisation/src/G4PolarizedComptonCrossSection.cc b/source/processes/electromagnetic/polarisation/src/G4PolarizedComptonCrossSection.cc new file mode 100644 index 0000000000..c77760b8e5 --- /dev/null +++ b/source/processes/electromagnetic/polarisation/src/G4PolarizedComptonCrossSection.cc @@ -0,0 +1,219 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4PolarizedComptonCrossSection.cc,v 1.3 2006/11/09 18:00:49 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// GEANT4 Class file +// +// +// File name: PolarizedComptonCrossSectionPS +// +// Author: Andreas Schaelicke +// +// Creation date: 15.05.2005 +// +// Modifications: +// +// Class Description: +// determine the polarization of the final state +// in a Compton scattering process employing the differential +// cross section by F.W.Lipps & H.A.Tolhoek +// ( Physica 20 (1954) 395 ) +// recalculated by P.Starovoitov +// +#include "G4PolarizedComptonCrossSection.hh" +#include "Randomize.hh" + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +G4PolarizedComptonCrossSection::G4PolarizedComptonCrossSection() + { + // G4cout<<"G4PolarizedComptonCrossSection() init\n"; + + re2 = classic_electr_radius * classic_electr_radius; + // G4double unit_conversion = hbarc_squared ; + // G4cout<<" (keV)^2* m^2 ="< 1.+1.e-8) cosT = 1.; + if(cosT < -1.-1.e-8) cosT = -1.; + G4double cosT2 = cosT*cosT; + G4double cosT3 = cosT2*cosT; + G4double sinT2 = 1. - cosT2; + if(sinT2 > 1. + 1.e-8) sinT2 = 1.; + if(sinT2 < 0.) sinT2 = 0.; + G4double sinT = std::sqrt(sinT2); + G4double cos2T = 2.*cosT2 - 1.; + G4double sin2T = 2.*sinT*cosT; + G4double eps2 = sqr(eps); + DefineCoefficients(pol0,pol1); + diffXSFactor = re2/(4.*X); + + // unpolarized Cross Section + unpXS = (eps2 + 1. - eps*sinT2)/(2.*eps); + // initial polarization dependence + polXS = -sinT2*pol0.x() + (1. - eps)*sinT*polzx + ((eps2 - 1.)/eps)*cosT*polzz; + polXS *= 0.5; + + phi0 = unpXS + polXS; + + if (flag == 2 ){ + // polarization of outgoing photon + G4double PHI21 = -sinT2 + 0.5*(cos2T + 3.)*pol0.x() - ((1. - eps)/eps)*sinT*polzx; + PHI21 *= 0.5; + G4double PHI22 = cosT*pol0.y() + ((1. - eps)/(2.*eps))*sinT*polzy; + G4double PHI23 = ((eps2 + 1.)/eps)*cosT*pol0.z() - ((1. - eps)/eps)*(eps*cosT2 + 1.)*pol1.z(); + PHI23 += 0.5*(1. - eps)*sin2T*pol1.x(); + PHI23 += (eps - 1.)*(-sinT2*polxz + sinT*polyy - 0.5*sin2T*polxx); + PHI23 *= 0.5; + phi2 = G4ThreeVector(PHI21, PHI22, PHI23); + + // polarization of outgoing electron + G4double PHI32 = -sinT2*polxy + ((1. - eps)/eps)*sinT*polyz + 0.5*(cos2T + 3.)*pol1.y(); + PHI32 *= 0.5; + + G4double PHI31 = 0., PHI31add = 0., PHI33 = 0., PHI33add = 0.; + + if ((1. - eps) > 1.e-12){ + G4double helpVar = std::sqrt(eps2 - 2.*cosT*eps + 1.); + + PHI31 = (1. - eps)*(1. + cosT)*sinT*pol0.z(); + PHI31 += (-eps*cosT3 + eps*cosT2 + (eps - 2.)*cosT + eps)*pol1.x(); + PHI31 += -(eps*cosT2 - eps*cosT + cosT + 1.)*sinT*pol1.z(); + PHI31 /= 2.*helpVar; + + PHI31add = -eps*sqr(1. - cosT)*(1. + cosT)*polxx; + PHI31add += (1. - eps)*sinT2*polyy; + PHI31add += -(-eps2 + cosT*(cosT*eps - eps + 1.)*eps + eps - 1.)*sinT*polxz/eps; + PHI31add /= 2.*helpVar; + + PHI33 = ((1. - eps)/eps)*(-eps*cosT2 + eps*(eps + 1.)*cosT - 1.)*pol0.z(); + PHI33 += -(eps*cosT2 + (1. - eps)*eps*cosT + 1.)*sinT*pol1.x(); + PHI33 += -(-eps2*cosT3 + eps*(eps2 - eps + 1.)*cosT2 - cosT + eps2)*pol1.z()/eps; + PHI33 /= -2.*helpVar; + + PHI33add = (eps*(eps - cosT - 1.)*cosT + 1.)*sinT*polxx; + PHI33add += -(-eps2 + cosT*eps + eps - 1.)*sinT2*polxz; + PHI33add += (eps - 1.)*(cosT - eps)*sinT*polyy; + PHI33add /= -2.*helpVar; + }else{ + PHI31 = -pol1.z() - (X - 1.)*std::sqrt(1. - eps)*pol1.x()/std::sqrt(2.*X); + PHI31add = -(-X*X*pol1.z() - 2.*X*(2.*pol0.z() - pol1.z()) - (4.*pol0.x() + 5.)*pol1.z())*(1. - eps)/(4.*X); + + PHI33 = pol1.x() - (X - 1.)*std::sqrt(1. - eps)*pol1.z()/std::sqrt(2.*X); + PHI33add = -(X*X - 2.*X + 4.*pol0.x() + 5.)*(1. - eps)*pol1.x()/(4.*X); + } + phi3 = G4ThreeVector(PHI31 + PHI31add, PHI32, PHI33 + PHI33add); + + } + unpXS *= diffXSFactor; + polXS *= diffXSFactor; + phi0 *= diffXSFactor; + phi2 *= diffXSFactor; + phi3 *= diffXSFactor; + +} + +G4double G4PolarizedComptonCrossSection::XSection(const G4StokesVector & pol2,const G4StokesVector & pol3) +{ + gammaPol2 = !(pol2==G4StokesVector::ZERO); + electronPol3 = !(pol3==G4StokesVector::ZERO); + + G4double phi = 0.; + // polarization independent part + phi += phi0; + + + if (gammaPol2) { + // part depending on the polarization of the final photon + phi += phi2*pol2; + } + + if (electronPol3) { + // part depending on the polarization of the final electron + phi += phi3*pol3; + } + + // return cross section. + return phi; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +G4StokesVector G4PolarizedComptonCrossSection::GetPol2() +{ + // Note, mean polarization can not contain correlation + // effects. + return 1./phi0 * phi2; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +G4StokesVector G4PolarizedComptonCrossSection::GetPol3() +{ + // Note, mean polarization can not contain correlation + // effects. + return 1./phi0 * phi3; +} + + + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +void G4PolarizedComptonCrossSection::DefineCoefficients(const G4StokesVector & pol0, + const G4StokesVector & pol1) +{ + polxx=pol0.x()*pol1.x(); + polyy=pol0.y()*pol1.y(); + polzz=pol0.z()*pol1.z(); + + polxz=pol0.x()*pol1.z(); + polzx=pol0.z()*pol1.x(); + + polyz=pol0.y()*pol1.z(); + polzy=pol0.z()*pol1.y(); + + polxy=pol0.x()*pol1.y(); + polyx=pol0.y()*pol1.x(); +} + + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/source/processes/electromagnetic/polarisation/src/G4PolarizedComptonModel.cc b/source/processes/electromagnetic/polarisation/src/G4PolarizedComptonModel.cc new file mode 100644 index 0000000000..2e6964389d --- /dev/null +++ b/source/processes/electromagnetic/polarisation/src/G4PolarizedComptonModel.cc @@ -0,0 +1,377 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4PolarizedComptonModel.cc,v 1.3 2006/11/09 18:00:49 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ------------------------------------------------------------------- +// +// GEANT4 Class file +// +// +// File name: G4PolarizedComptonModel +// +// Author: Andreas Schaelicke +// +// Creation date: 01.05.2005 +// +// Modifications: +// 18-07-06 use newly calculated cross sections (P. Starovoitov) +// 21-08-05 update interface (A. Schaelicke) +// +// Class Description: +// +// ------------------------------------------------------------------- +// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +#include "G4PolarizedComptonModel.hh" +#include "G4Electron.hh" +#include "G4Gamma.hh" +#include "Randomize.hh" +#include "G4DataVector.hh" +#include "G4ParticleChangeForGamma.hh" + + +#include "G4StokesVector.hh" +#include "G4PolarizationManager.hh" +#include "G4PolarizationHelper.hh" +#include "G4PolarizedComptonCrossSection.hh" + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +G4PolarizedComptonModel::G4PolarizedComptonModel(const G4ParticleDefinition*, + const G4String& nam) + : G4KleinNishinaCompton(0,nam), + verboseLevel(0) +{ + crossSectionCalculator=new G4PolarizedComptonCrossSection(); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +G4PolarizedComptonModel::~G4PolarizedComptonModel() +{ + if (crossSectionCalculator) delete crossSectionCalculator; +} + + + +G4double G4PolarizedComptonModel::ComputeAsymmetryPerAtom + (G4double gammaEnergy, G4double /*Z*/) + +{ + G4double asymmetry = 0.0 ; + + G4double k0 = gammaEnergy / electron_mass_c2 ; + G4double k1 = 1 + 2*k0 ; + + asymmetry = -k0; + asymmetry *= (k0 + 1.)*sqr(k1)*std::log(k1) - 2.*k0*(5.*sqr(k0) + 4.*k0 + 1.); + asymmetry /= ((k0 - 2.)*k0 -2.)*sqr(k1)*std::log(k1) + 2.*k0*(k0*(k0 + 1.)*(k0 + 8.) + 2.); + + // G4cout<<"energy = "<* G4PolarizedComptonModel::SampleSecondaries( + const G4MaterialCutsCouple*, + const G4DynamicParticle* aDynamicGamma, + G4double, + G4double) +{ + const G4Track * aTrack = fParticleChange->GetCurrentTrack(); + G4VPhysicalVolume* aPVolume = aTrack->GetVolume(); + G4LogicalVolume* aLVolume = aPVolume->GetLogicalVolume(); + + if (verboseLevel>=1) + G4cout<<"G4PolarizedComptonModel::SampleSecondaries in " + << aLVolume->GetName() <GetPolarization(); + theBeamPolarization.SetPhoton(); + + // obtain polarization of the media + const G4bool targetIsPolarized = polarizationManager->IsPolarized(aLVolume); + theTargetPolarization = polarizationManager->GetVolumePolarization(aLVolume); + + // if beam is linear polarized or target is transversely polarized + // determine the angle to x-axis + // (assumes same PRF as in the polarization definition) + + G4ThreeVector gamDirection0 = aDynamicGamma->GetMomentumDirection(); + + // transfere theTargetPolarization + // into the gamma frame (problem electron is at rest) + if (targetIsPolarized) + theTargetPolarization.rotateUz(gamDirection0); + + // The scattered gamma energy is sampled according to Klein - Nishina formula. + // The random number techniques of Butcher & Messel are used + // (Nuc Phys 20(1960),15). + // Note : Effects due to binding of atomic electrons are negliged. + + G4double gamEnergy0 = aDynamicGamma->GetKineticEnergy(); + G4double E0_m = gamEnergy0 / electron_mass_c2 ; + + + // + // sample the energy rate of the scattered gamma + // + + G4double epsilon, epsilonsq, onecost, sint2, greject ; + + G4double epsilon0 = 1./(1. + 2.*E0_m); + G4double epsilon0sq = epsilon0*epsilon0; + G4double alpha1 = - std::log(epsilon0); + G4double alpha2 = 0.5*(1.- epsilon0sq); + + G4double polarization = theBeamPolarization.p3()*theTargetPolarization.p3(); + do { + if ( alpha1/(alpha1+alpha2) > G4UniformRand() ) { + epsilon = std::exp(-alpha1*G4UniformRand()); // epsilon0**r + epsilonsq = epsilon*epsilon; + + } else { + epsilonsq = epsilon0sq + (1.- epsilon0sq)*G4UniformRand(); + epsilon = std::sqrt(epsilonsq); + }; + + onecost = (1.- epsilon)/(epsilon*E0_m); + sint2 = onecost*(2.-onecost); + + + G4double gdiced = 2.*(1./epsilon+epsilon); + G4double gdist = 1./epsilon + epsilon - sint2 + - polarization*(1./epsilon-epsilon)*(1.-onecost); + + greject = gdist/gdiced; + + if (greject>1) G4cout<<"ERROR in PolarizedComptonScattering::PostStepDoIt\n" + <<" costh rejection does not work properly: "<1.+1.e-10 || greject<0) G4cout<<"ERROR in PolarizedComptonScattering::PostStepDoIt\n" + <<" phi rejection does not work properly: "<SetProposedKineticEnergy(gamEnergy1); + + + if(gamEnergy1 > lowestGammaEnergy) { + fParticleChange->ProposeMomentumDirection(gamDirection1); + } else { + fParticleChange->ProposeTrackStatus(fStopAndKill); + gamEnergy1 += fParticleChange->GetLocalEnergyDeposit(); + fParticleChange->ProposeLocalEnergyDeposit(gamEnergy1); + } + + + std::vector* fvect = new std::vector; + + // + // kinematic of the scattered electron + // + + G4double eKinEnergy = gamEnergy0 - gamEnergy1; + G4ThreeVector eDirection = gamEnergy0*gamDirection0 - gamEnergy1*gamDirection1; + eDirection = eDirection.unit(); + + // + // calculate Stokesvector of final state photon and electron + // + G4ThreeVector nInteractionFrame; + if((gamEnergy1 > lowestGammaEnergy) || + (eKinEnergy > DBL_MIN)) { + + // determine interaction plane +// nInteractionFrame = +// G4PolarizationHelper::GetFrame(gamDirection1,eDirection); + if (gamEnergy1 > lowestGammaEnergy) + nInteractionFrame = G4PolarizationHelper::GetFrame(gamDirection1,gamDirection0); + else + nInteractionFrame = G4PolarizationHelper::GetFrame(gamDirection0, eDirection); + + // transfere theBeamPolarization and theTargetPolarization + // into the interaction frame (note electron is in gamma frame) + if (verboseLevel>=1) { + G4cout << "========================================\n"; + G4cout << " nInteractionFrame = " <=1) { + G4cout << "----------------------------------------\n"; + G4cout << " gammaPolarization = " <Initialize(epsilon,E0_m,0., + theBeamPolarization, + theTargetPolarization,2); + } + + // if(eKinEnergy > DBL_MIN) + { + // in interaction frame + // calculate polarization transfer to the photon (in interaction plane) + finalGammaPolarization = crossSectionCalculator->GetPol2(); + if (verboseLevel>=1) G4cout << " gammaPolarization1 = " <ProposePolarization(finalGammaPolarization); + if (finalGammaPolarization.mag() > 1.+1.e-8){ + G4cout<<"ERROR in Polarizaed Compton Scattering !"< fminimalEnergy) { + { + finalElectronPolarization = crossSectionCalculator->GetPol3(); + if (verboseLevel>=1) + G4cout << " electronPolarization1 = " <=1) { + G4cout << " electronPolarization1 = " <=1) + G4cout << "========================================\n"; + + + if(eKinEnergy > DBL_MIN) { + + // create G4DynamicParticle object for the electron. + G4DynamicParticle* aElectron = new G4DynamicParticle(theElectron,eDirection,eKinEnergy); + //store polarization vector + if (finalElectronPolarization.mag() > 1.+1.e-8){ + G4cout<<"ERROR in Polarizaed Compton Scattering !"<SetLowEnergyLimit(emin); + model->SetHighEnergyLimit(emax); + AddEmModel(1, model); + } } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -void G4EmMuonBuilder52::ConstructProcess() +void G4PolarizedGammaConversion::PrintInfo() { - // Add standard EM Processes for mu+ - const G4ParticleDefinition* particle = G4MuonPlus::MuonPlus(); - G4ProcessManager* pmanager = particle->GetProcessManager(); + G4cout << " Total cross sections has a good parametrisation" + << " from 1.5 MeV to 100 GeV for all Z;" + << "\n sampling secondary e+e- according to the polarized compton cross section" + << G4endl; +} - pmanager->AddProcess(new G4MultipleScattering52,-1, 1,1); - pmanager->AddProcess(new G4MuIonisation52, -1, 2,2); - pmanager->AddProcess(new G4MuBremsstrahlung52, -1,-1,3); - pmanager->AddProcess(new G4MuPairProduction52, -1,-1,4); - - - // Add standard EM Processes for mu- - particle = G4MuonMinus::MuonMinus(); - pmanager = particle->GetProcessManager(); - - pmanager->AddProcess(new G4MultipleScattering52,-1, 1,1); - pmanager->AddProcess(new G4MuIonisation52, -1, 2,2); - pmanager->AddProcess(new G4MuBremsstrahlung52, -1,-1,3); - pmanager->AddProcess(new G4MuPairProduction52, -1,-1,4); +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... +std::vector* G4PolarizedGammaConversion::SecondariesPostStep( + G4VEmModel* model, + const G4MaterialCutsCouple* couple, + const G4DynamicParticle* dp) +{ + return model->SampleSecondaries(couple, dp); } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - diff --git a/source/processes/electromagnetic/polarisation/src/G4PolarizedGammaConversionModel.cc b/source/processes/electromagnetic/polarisation/src/G4PolarizedGammaConversionModel.cc new file mode 100644 index 0000000000..7fe69f0942 --- /dev/null +++ b/source/processes/electromagnetic/polarisation/src/G4PolarizedGammaConversionModel.cc @@ -0,0 +1,144 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4PolarizedGammaConversionModel.cc,v 1.3 2006/11/09 18:00:49 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ------------------------------------------------------------------- +// +// GEANT4 Class file +// +// +// File name: G4PolarizedGammaConversionModel +// +// Author: Karim Laihem +// +// Creation date: 19.04.2005 +// +// Modifications: +// 21-08-06 Modified to fit in g4.8.1 framework (A.Schaelicke) +// +// Class Description: +// +// Implementation of gamma convertion to e+e- in the field of a nucleus +// including polarization transfer + +// ------------------------------------------------------------------- +// + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +#include "G4PolarizedGammaConversionModel.hh" +#include "G4Electron.hh" +#include "G4Positron.hh" +#include "G4Gamma.hh" +#include "Randomize.hh" +#include "G4DataVector.hh" +#include "G4PhysicsLogVector.hh" +#include "G4ParticleChangeForGamma.hh" +#include "G4PolarizedPairProductionCrossSection.hh" +#include "G4PolarizationHelper.hh" + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + + +G4PolarizedGammaConversionModel::G4PolarizedGammaConversionModel(const G4ParticleDefinition* pd, + const G4String& nam) + : G4BetheHeitlerModel(pd,nam) +{ +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +G4PolarizedGammaConversionModel::~G4PolarizedGammaConversionModel() +{ + if (crossSectionCalculator) delete crossSectionCalculator; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +void G4PolarizedGammaConversionModel::Initialise(const G4ParticleDefinition* pd, + const G4DataVector& dv) +{ + G4BetheHeitlerModel::Initialise(pd,dv); + if (!crossSectionCalculator) + crossSectionCalculator = new G4PolarizedPairProductionCrossSection(this); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +std::vector* G4PolarizedGammaConversionModel::SampleSecondaries( + const G4MaterialCutsCouple* couple, + const G4DynamicParticle* dp, + G4double tmin, + G4double maxEnergy) +{ + std::vector* vdp = + G4BetheHeitlerModel::SampleSecondaries(couple, dp, tmin, maxEnergy); + + if(vdp && vdp->size()>0) { + G4double gamEnergy0 = dp->GetKineticEnergy(); + G4double lepEnergy1 = (*vdp)[0]->GetKineticEnergy(); + G4double sintheta = dp->GetMomentumDirection().cross((*vdp)[0]->GetMomentumDirection()).mag(); + if (sintheta>1.) sintheta=1.; + + G4StokesVector beamPol = dp->GetPolarization(); + beamPol.SetPhoton(); + + // determine interaction plane + G4ThreeVector nInteractionFrame = + G4PolarizationHelper::GetFrame(dp->GetMomentumDirection(), + (*vdp)[0]->GetMomentumDirection()); + + // transform polarization into interaction frame + beamPol.InvRotateAz(nInteractionFrame,dp->GetMomentumDirection()); + + // calulcate polarization transfer + crossSectionCalculator->Initialize(gamEnergy0, lepEnergy1, sintheta, + beamPol, G4StokesVector::ZERO); + + // deterimine final state polarization + G4StokesVector lep1Pol = crossSectionCalculator->GetPol2(); + lep1Pol.RotateAz(nInteractionFrame,(*vdp)[0]->GetMomentumDirection()); + (*vdp)[0]->SetPolarization(lep1Pol.p1(), + lep1Pol.p2(), + lep1Pol.p3()); + + size_t num = vdp->size(); + if (num!=2) G4cout<<" WARNING "<GetPol3(); + lep2Pol.RotateAz(nInteractionFrame,(*vdp)[i]->GetMomentumDirection()); + (*vdp)[i]->SetPolarization(lep2Pol.p1(), + lep2Pol.p2(), + lep2Pol.p3()); + + } + } + return vdp; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/source/processes/electromagnetic/polarisation/src/G4PolarizedMollerBhabhaModel.cc b/source/processes/electromagnetic/polarisation/src/G4PolarizedMollerBhabhaModel.cc new file mode 100644 index 0000000000..4df95433a4 --- /dev/null +++ b/source/processes/electromagnetic/polarisation/src/G4PolarizedMollerBhabhaModel.cc @@ -0,0 +1,354 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4PolarizedMollerBhabhaModel.cc,v 1.3 2006/11/09 18:00:49 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// ------------------------------------------------------------------- +// +// GEANT4 Class file +// +// File name: G4PolarizedMollerBhabhaModel +// +// Author: A.Schaelicke on base of Vladimir Ivanchenko code +// +// Creation date: 10.11.2005 +// +// Modifications: +// +// 20-08-05, modified interface (A.Schaelicke) +// +// Class Description: +// +// Implementation of energy loss and delta-electron production by e+/e- +// (including polarization effects) +// +// ------------------------------------------------------------------- +// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#include "G4PolarizedMollerBhabhaModel.hh" +#include "G4Electron.hh" +#include "G4Positron.hh" +#include "G4ParticleChangeForLoss.hh" +#include "Randomize.hh" + +#include "G4PolarizationManager.hh" +#include "G4PolarizationHelper.hh" +#include "G4PolarizedBhabhaCrossSection.hh" +#include "G4PolarizedMollerCrossSection.hh" + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +G4PolarizedMollerBhabhaModel::G4PolarizedMollerBhabhaModel(const G4ParticleDefinition* p, + const G4String& nam) + : G4MollerBhabhaModel(p,nam) +{ + + // G4cout<<" particle==electron "<<(p==theElectron)< + TotalXSection(xmin,xmax,gam, + theBeamPolarization, + theTargetPolarization); + G4double crossUnpol=crossSectionCalculator-> + TotalXSection(xmin,xmax,gam, + G4StokesVector::ZERO, + G4StokesVector::ZERO); + if (crossUnpol>0.) factor=crossPol/crossUnpol; + // G4cout<<" factor="<* G4PolarizedMollerBhabhaModel::SampleSecondaries( + const G4MaterialCutsCouple* , + const G4DynamicParticle* dp, + G4double tmin, + G4double maxEnergy) +{ + // *** obtain and save target and beam polarization *** + G4PolarizationManager * polarizationManger = G4PolarizationManager::GetInstance(); + + const G4Track * aTrack = fParticleChange->GetCurrentTrack(); + + // obtain polarization of the beam + theBeamPolarization = dp->GetPolarization(); + + // obtain polarization of the media + G4VPhysicalVolume* aPVolume = aTrack->GetVolume(); + G4LogicalVolume* aLVolume = aPVolume->GetLogicalVolume(); + const G4bool targetIsPolarized = polarizationManger->IsPolarized(aLVolume); + theTargetPolarization = polarizationManger->GetVolumePolarization(aLVolume); + + // transfer target polarization in interaction frame + if (targetIsPolarized) + theTargetPolarization.rotateUz(dp->GetMomentumDirection()); + + + + + G4double tmax = std::min(maxEnergy, MaxSecondaryKinEnergy(dp)); + if(tmin >= tmax) return 0; + // if(tmin > tmax) tmin = tmax; + + G4double polL = theBeamPolarization.z()*theTargetPolarization.z(); + polL=std::fabs(polL); + G4double polT = theBeamPolarization.x()*theTargetPolarization.x() + + theBeamPolarization.y()*theTargetPolarization.y(); + polT=std::fabs(polT); + + G4double kineticEnergy = dp->GetKineticEnergy(); + G4double energy = kineticEnergy + electron_mass_c2; + G4double totalMomentum = std::sqrt(kineticEnergy*(energy + electron_mass_c2)); + G4double xmin = tmin/kineticEnergy; + G4double xmax = tmax/kineticEnergy; + G4double gam = energy/electron_mass_c2; + G4double gamma2 = gam*gam; + G4double gmo = gam - 1.; + G4double gmo2 = gmo*gmo; + G4double gmo3 = gmo2*gmo; + G4double gpo = gam + 1.; + G4double gpo2 = gpo*gpo; + G4double gpo3 = gpo2*gpo; + G4double x, y, q, grej, grej2; + G4double z = 0.; + G4double xs = 0., phi =0.; + G4ThreeVector direction = dp->GetMomentumDirection(); + + //(Polarized) Moller (e-e-) scattering + if (isElectron) { + // *** dice according to polarized cross section + G4double G = ((2.0*gam - 1.0)/gamma2)*(1. - polT - polL*gam); + G4double H = (sqr(gam - 1.0)/gamma2)*(1. + polT + polL*((gam + 3.)/(gam - 1.))); + + y = 1.0 - xmax; + grej = 1.0 - G*xmax + xmax*xmax*(H + (1.0 - G*y)/(y*y)); + grej2 = 1.0 - G*xmin + xmin*xmin*(H + (1.0 - G*y)/(y*y)); + if (grej2 > grej) grej = grej2; + G4double prefM = gamma2*classic_electr_radius*classic_electr_radius/(gmo2*(gam + 1.0)); + grej *= prefM; + do { + q = G4UniformRand(); + x = xmin*xmax/(xmin*(1.0 - q) + xmax*q); + if (crossSectionCalculator) { + crossSectionCalculator->Initialize(x,gam,phi,theBeamPolarization, + theTargetPolarization,1); + xs=crossSectionCalculator->XSection(G4StokesVector::ZERO, + G4StokesVector::ZERO); + z=xs*sqr(x)*4.; + if (grej < z) { + G4cout<<"WARNING : error in Moller rejection routine! \n" + <<" z = "< z); + //Bhabha (e+e-) scattering + } else { + // *** dice according to polarized cross section + y = xmax*xmax; + grej = 0.; + grej += y*y*gmo3*(1. + (polL + polT)*(gam + 3.)/gmo); + grej += -2.*xmin*xmin*xmin*gam*gmo2*(1. - (polL + polT)*(gam + 3.)/gmo); + grej += y*y*gmo*(3.*gamma2 + 6.*gam + 4.)*(1. + (polL*(3.*gam + 1.)*(gamma2 + gam + 1.) + polT*((gam + 2.)*gamma2 + 1.))/(gmo*(3.*gam*(gam + 2.) + 4.))); + grej /= gpo3; + grej += -xmin*(2.*gamma2 + 4.*gam + 1.)*(1. - gam*(polL*(2.*gam + 1.) + polT)/(2.*gam*(gam + 2.) + 1.))/gpo2; + grej += gamma2/(gamma2 - 1.); + G4double prefB = classic_electr_radius*classic_electr_radius/(gam - 1.0); + grej *= prefB; + + do { + q = G4UniformRand(); + x = xmin*xmax/(xmin*(1.0 - q) + xmax*q); + if (crossSectionCalculator) { + crossSectionCalculator->Initialize(x,gam,phi,theBeamPolarization, + theTargetPolarization,1); + xs=crossSectionCalculator->XSection(G4StokesVector::ZERO, + G4StokesVector::ZERO); + z=xs*sqr(x)*4.; + } else { + G4cout<<"No calculator in Bhabha scattering"< grej) { + G4cout<<"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&"< z); + } + // + // + // polar asymmetries (due to transverse polarizations) + // + // + if (crossSectionCalculator) { + // grej*=1./(sqr(x)*sqr(gamma2-1))*sqr(gam*(1+gam)); + grej=xs*2.; + do { + phi = twopi * G4UniformRand() ; + crossSectionCalculator->Initialize(x,gam,phi,theBeamPolarization, + theTargetPolarization,1); + xs=crossSectionCalculator->XSection(G4StokesVector::ZERO, + G4StokesVector::ZERO); + if(xs > grej) { + if (isElectron){ + G4cout << "G4PolarizedMollerBhabhaModel::SampleSecondaries Warning! "< xs); + } + + // fix kinematics of delta electron + G4double deltaKinEnergy = x * kineticEnergy; + G4double deltaMomentum = + std::sqrt(deltaKinEnergy * (deltaKinEnergy + 2.0*electron_mass_c2)); + G4double cost = deltaKinEnergy * (energy + electron_mass_c2) / + (deltaMomentum * totalMomentum); + G4double sint = 1.0 - cost*cost; + if(sint > 0.0) sint = std::sqrt(sint); + + + G4ThreeVector deltaDirection(-sint*std::cos(phi),-sint*std::sin(phi), cost) ; + deltaDirection.rotateUz(direction); + + // primary change + kineticEnergy -= deltaKinEnergy; + fParticleChange->SetProposedKineticEnergy(kineticEnergy); + + if(kineticEnergy > DBL_MIN) { + G4ThreeVector dir = totalMomentum*direction - deltaMomentum*deltaDirection; + direction = dir.unit(); + fParticleChange->SetProposedMomentumDirection(direction); + } + + // create G4DynamicParticle object for delta ray + std::vector* vdp = new std::vector; + G4DynamicParticle* delta = new G4DynamicParticle(theElectron,deltaDirection,deltaKinEnergy); + vdp->push_back(delta); + + // get interaction frame + G4ThreeVector nInteractionFrame = + G4PolarizationHelper::GetFrame(direction,deltaDirection); + + if (crossSectionCalculator) { + // calculate mean final state polarizations + + theBeamPolarization.InvRotateAz(nInteractionFrame,direction); + theTargetPolarization.InvRotateAz(nInteractionFrame,direction); + crossSectionCalculator->Initialize(x,gam,phi,theBeamPolarization, + theTargetPolarization,2); + + // electron/positron + fPositronPolarization=crossSectionCalculator->GetPol2(); + fPositronPolarization.RotateAz(nInteractionFrame,direction); + + fParticleChange->ProposePolarization(fPositronPolarization); + + // electron + fElectronPolarization=crossSectionCalculator->GetPol3(); + fElectronPolarization.RotateAz(nInteractionFrame,deltaDirection); + delta->SetPolarization(fElectronPolarization.x(), + fElectronPolarization.y(), + fElectronPolarization.z()); + } + else { + fPositronPolarization=G4ThreeVector(); + fElectronPolarization=G4ThreeVector(); + } + + return vdp; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/source/processes/electromagnetic/polarisation/src/G4PolarizedMollerCrossSection.cc b/source/processes/electromagnetic/polarisation/src/G4PolarizedMollerCrossSection.cc new file mode 100644 index 0000000000..23f1f3ca85 --- /dev/null +++ b/source/processes/electromagnetic/polarisation/src/G4PolarizedMollerCrossSection.cc @@ -0,0 +1,273 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4PolarizedMollerCrossSection.cc,v 1.4 2006/11/17 14:14:20 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// ------------------------------------------------------------------- +// +// GEANT4 Class file +// +// +// File name: G4PolarizedMollerCrossSection +// +// Author: Andreas Schaelicke +// +// Creation date: 12.01.2006 +// +// Modifications: +// 16-01-06 included cross section as calculated by P.Starovoitov +// +// Class Description: +// * calculates the differential cross section +// incomming electron K1(along positive z direction) scatters at an electron K2 at rest +// * phi denotes the angle between the scattering plane (defined by the +// outgoing electron) and X-axis +// * all stokes vectors refer to spins in the Global System (X,Y,Z) +// + +#include "G4PolarizedMollerCrossSection.hh" + +G4PolarizedMollerCrossSection::G4PolarizedMollerCrossSection() +{ +} +G4PolarizedMollerCrossSection::~G4PolarizedMollerCrossSection() {} +void G4PolarizedMollerCrossSection::Initialize( + G4double e, + G4double gamma, + G4double /*phi*/, + const G4StokesVector & pol0, + const G4StokesVector & pol1, + G4int flag) +{ + G4double re2 = classic_electr_radius * classic_electr_radius; + G4double gamma2=gamma*gamma; + G4double gmo = (gamma - 1.); + G4double gmo2 = (gamma - 1.)*(gamma - 1.); + G4double gpo = (gamma + 1.); + G4double pref = gamma2*re2/(gmo2*(gamma + 1.0)); + G4double sqrttwo=std::sqrt(2.); + G4double f = (-1. + e); + G4double e2 = e*e; + G4double f2 = f*f; + // G4double w = e*(1. - e); + + G4bool polarized=(!pol0.IsZero())||(!pol1.IsZero()); + + if (flag==0) polarized=false; + // Unpolarised part of XS + phi0 = 0.; + phi0+= gmo2/gamma2; + phi0+= ((1. - 2.*gamma)/gamma2)*(1./e + 1./(1.-e)); + phi0+= 1./(e*e) + 1./((1. - e)*(1. - e)); + phi0*=0.25; + // Initial state polarisarion dependence + if (polarized) { + G4double usephi=1.; + if (flag<=1) usephi=0.; + // G4cout<<"Polarized differential moller cross section"<=1) { + // + // Final Electron P1 + // + + // initial electron K1 + if (!pol0.IsZero()) { + G4double xxP1K1 = (std::sqrt(gpo/(1 + e2*gmo + gamma - 2*e*gamma))* + (gamma - e*gpo))/(4*e2*gamma); + G4double xyP1K1 = 0; + G4double xzP1K1 = (-1 + 2*e*gamma)/(2*sqrttwo*f*gamma* + std::sqrt(e*e2*(1 + e + gamma - e*gamma))); + G4double yxP1K1 = 0; + G4double yyP1K1 = (-gamma2 + e*(-1 + gamma*(2 + gamma)))/(4*f*e2*gamma2); + G4double yzP1K1 = 0; + G4double zxP1K1 = (1 + 2*e2*gmo - 2*e*gamma)/(2*sqrttwo*f*e*gamma* + std::sqrt(e*(1 + e + gamma - e*gamma))); + G4double zyP1K1 = 0; + G4double zzP1K1 = (-gamma + e*(1 - 2*e*gmo + gamma))/(4*f*e2*gamma* + std::sqrt(1 - (2*e)/(f*gpo))); + phi2[0] += xxP1K1*pol0.x() + xyP1K1*pol0.y() + xzP1K1*pol0.z(); + phi2[1] += yxP1K1*pol0.x() + yyP1K1*pol0.y() + yzP1K1*pol0.z(); + phi2[2] += zxP1K1*pol0.x() + zyP1K1*pol0.y() + zzP1K1*pol0.z(); + } + // initial electron K2 + if (!pol1.IsZero()) { + G4double xxP1K2 = ((1 + e*(-3 + gamma))*std::sqrt(gpo/(1 + e2*gmo + gamma - + 2*e*gamma)))/(4*f*e*gamma); + G4double xyP1K2 = 0; + G4double xzP1K2 = (-2 + 2*e + gamma)/(2*sqrttwo*f2*gamma* + std::sqrt(e*(1 + e + gamma - e*gamma))); + G4double yxP1K2 = 0; + G4double yyP1K2 = (1 - 2*gamma + e*(-1 + gamma*(2 + gamma)))/(4*f2*e*gamma2); + G4double yzP1K2 = 0; + G4double zxP1K2 = (2*e*(1 + e*gmo - 2*gamma) + gamma)/(2*sqrttwo*f2*gamma* + std::sqrt(e*(1 + e + gamma - e*gamma))); + G4double zyP1K2 = 0; + G4double zzP1K2 = (1 - 2*gamma + e*(-1 - 2*e*gmo + 3*gamma))/ + (4*f2*e*gamma*std::sqrt(1 - (2*e)/(f*gpo))); + phi2[0] += xxP1K2*pol1.x() + xyP1K2*pol1.y() + xzP1K2*pol1.z(); + phi2[1] += yxP1K2*pol1.x() + yyP1K2*pol1.y() + yzP1K2*pol1.z(); + phi2[2] += zxP1K2*pol1.x() + zyP1K2*pol1.y() + zzP1K2*pol1.z(); + } + // + // Final Electron P2 + // + + // initial electron K1 + if (!pol0.IsZero()) { + + + G4double xxP2K1 = (-1 + e + e*gamma)/(4*f2*gamma* + std::sqrt((e*(2 + e*gmo))/gpo)); + G4double xyP2K1 = 0; + G4double xzP2K1 = -((1 + 2*f*gamma)*std::sqrt(f/(-2 + e - e*gamma)))/ + (2*sqrttwo*f2*e*gamma); + G4double yxP2K1 = 0; + G4double yyP2K1 = (1 - 2*gamma + e*(-1 + gamma*(2 + gamma)))/(4*f2*e*gamma2); + G4double yzP2K1 = 0; + G4double zxP2K1 = (1 + 2*e*(-2 + e + gamma - e*gamma))/(2*sqrttwo*f*e* + std::sqrt(-(f*(2 + e*gmo)))*gamma); + G4double zyP2K1 = 0; + G4double zzP2K1 = (std::sqrt((e*gpo)/(2 + e*gmo))* + (-3 + e*(5 + 2*e*gmo - 3*gamma) + 2*gamma))/(4*f2*e*gamma); + + phi3[0] += xxP2K1*pol0.x() + xyP2K1*pol0.y() + xzP2K1*pol0.z(); + phi3[1] += yxP2K1*pol0.x() + yyP2K1*pol0.y() + yzP2K1*pol0.z(); + phi3[2] += zxP2K1*pol0.x() + zyP2K1*pol0.y() + zzP2K1*pol0.z(); + } + // initial electron K2 + if (!pol1.IsZero()) { + + G4double xxP2K2 = (-2 - e*(-3 + gamma) + gamma)/ + (4*f*e*gamma* std::sqrt((e*(2 + e*gmo))/gpo)); + G4double xyP2K2 = 0; + G4double xzP2K2 = ((-2*e + gamma)*std::sqrt(f/(-2 + e - e*gamma)))/ + (2*sqrttwo*f*e2*gamma); + G4double yxP2K2 = 0; + G4double yyP2K2 = (-gamma2 + e*(-1 + gamma*(2 + gamma)))/(4*f*e2*gamma2); + G4double yzP2K2 = 0; + G4double zxP2K2 = (gamma + 2*e*(-1 + e - e*gamma))/ + (2*sqrttwo*e2* std::sqrt(-(f*(2 + e*gmo)))*gamma); + G4double zyP2K2 = 0; + G4double zzP2K2 = (std::sqrt((e*gpo)/(2 + e*gmo))* + (-2 + e*(3 + 2*e*gmo - gamma) + gamma))/(4*f*e2*gamma); + phi3[0] += xxP2K2*pol1.x() + xyP2K2*pol1.y() + xzP2K2*pol1.z(); + phi3[1] += yxP2K2*pol1.x() + yyP2K2*pol1.y() + yzP2K2*pol1.z(); + phi3[2] += zxP2K2*pol1.x() + zyP2K2*pol1.y() + zzP2K2*pol1.z(); + } + } + phi0 *= pref; + phi2 *= pref; + phi3 *= pref; +} + +G4double G4PolarizedMollerCrossSection::XSection(const G4StokesVector & pol2, + const G4StokesVector & pol3) +{ + G4double xs=0.; + xs+=phi0; + + G4bool polarized=(!pol2.IsZero())||(!pol3.IsZero()); + if (polarized) { + xs+=phi2*pol2 + phi3*pol3; + } + return xs; +} + +G4double G4PolarizedMollerCrossSection::TotalXSection( + G4double xmin, G4double xmax, G4double gamma, + const G4StokesVector & pol0,const G4StokesVector & pol1) +{ + G4double xs=0.; + + G4double x=xmin; + + if (xmax != 1./2.) G4cout<<" warning xmax expected to be 1/2 but is "< electron radius^2; + G4double re2 = classic_electr_radius * classic_electr_radius; + G4double gamma2=gamma*gamma; + G4double gmo2 = (gamma - 1.)*(gamma - 1.); + G4double logMEM = std::log(1./x - 1.); + G4double pref = twopi*gamma2*re2/(gmo2*(gamma + 1.0)); + // unpolarise XS + G4double sigma0 = 0.; + sigma0 += (gmo2/gamma2)*(0.5 - x); + sigma0 += ((1. - 2.*gamma)/gamma2)*logMEM; + sigma0 += 1./x - 1./(1. - x); + // longitudinal part + G4double sigma2=0.; + sigma2 += ((gamma2 + 2.*gamma - 3.)/gamma2)*(0.5 - x); + sigma2 += (1./gamma - 2.)*logMEM; + // transverse part + G4double sigma3=0.; + sigma3 += (2.*(1. - gamma)/gamma2)*(0.5 - x); + sigma3 += (1. - 3.*gamma)/(2.*gamma2)*logMEM; + // total cross section + xs+=pref*(sigma0 + sigma2*pol0.z()*pol1.z() + sigma3*(pol0.x()*pol1.x()+pol0.y()*pol1.y())); + + return xs; +} + + +G4StokesVector G4PolarizedMollerCrossSection::GetPol2() +{ + // Note, mean polarization can not contain correlation + // effects. + return 1./phi0 * phi2; +} +G4StokesVector G4PolarizedMollerCrossSection::GetPol3() +{ + // Note, mean polarization can not contain correlation + // effects. + return 1./phi0 * phi3; +} diff --git a/source/processes/electromagnetic/polarisation/src/G4PolarizedPairProductionCrossSection.cc b/source/processes/electromagnetic/polarisation/src/G4PolarizedPairProductionCrossSection.cc new file mode 100644 index 0000000000..37b062bef7 --- /dev/null +++ b/source/processes/electromagnetic/polarisation/src/G4PolarizedPairProductionCrossSection.cc @@ -0,0 +1,215 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4PolarizedPairProductionCrossSection.cc,v 1.4 2006/11/17 14:14:20 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ------------------------------------------------------------------- +// +// GEANT4 Class file +// +// +// File name: G4PairProductionCrossSection +// +// Author: Andreas Schaelicke on the base of Karim Laihems code +// +// Creation date: 16.08.2006 +// + +#include "G4PolarizedPairProductionCrossSection.hh" +#include "G4PolarizedGammaConversionModel.hh" +#include "G4Element.hh" + +G4bool G4PolarizedPairProductionCrossSection::scrnInitialized=false; +G4double G4PolarizedPairProductionCrossSection::SCRN [3][20]; +// screening function lookup table; + +void G4PolarizedPairProductionCrossSection::InitializeMe() +{ + if (!scrnInitialized) { + SCRN [1][1]= 0.5 ; SCRN [2][1] = 0.0145; + SCRN [1][2]= 1.0 ; SCRN [2][2] = 0.0490; + SCRN [1][3]= 2.0 ; SCRN [2][3] = 0.1400; + SCRN [1][4]= 4.0 ; SCRN [2][4] = 0.3312; + SCRN [1][5]= 8.0 ; SCRN [2][5] = 0.6758; + SCRN [1][6]= 15.0 ; SCRN [2][6] = 1.126; + SCRN [1][7]= 20.0 ; SCRN [2][7] = 1.367; + SCRN [1][8]= 25.0 ; SCRN [2][8] = 1.564; + SCRN [1][9]= 30.0 ; SCRN [2][9] = 1.731; + SCRN [1][10]= 35.0 ; SCRN [2][10]= 1.875; + SCRN [1][11]= 40.0 ; SCRN [2][11]= 2.001; + SCRN [1][12]= 45.0 ; SCRN [2][12]= 2.114; + SCRN [1][13]= 50.0 ; SCRN [2][13]= 2.216; + SCRN [1][14]= 60.0 ; SCRN [2][14]= 2.393; + SCRN [1][15]= 70.0 ; SCRN [2][15]= 2.545; + SCRN [1][16]= 80.0 ; SCRN [2][16]= 2.676; + SCRN [1][17]= 90.0 ; SCRN [2][17]= 2.793; + SCRN [1][18]= 100.0 ; SCRN [2][18]= 2.897; + SCRN [1][19]= 120.0 ; SCRN [2][19]= 3.078; + + scrnInitialized=true; + } +} + +G4PolarizedPairProductionCrossSection::G4PolarizedPairProductionCrossSection( + G4PolarizedGammaConversionModel * model) + : theModel(model) +{ + InitializeMe(); +} + + +void G4PolarizedPairProductionCrossSection::Initialize(G4double aGammaE, + G4double aLept0E, + G4double sintheta, + const G4StokesVector & beamPol, + const G4StokesVector & /*p1*/, + G4int /*flag*/) +{ + G4double aLept1E = aGammaE - aLept0E; + + G4double Stokes_P3 = beamPol.z() ; + // ************************************************************************** + + G4double m0_c2 = electron_mass_c2; + G4double Lept0E = aLept0E/m0_c2+1., Lept0E2 = Lept0E * Lept0E ; + G4double GammaE = aGammaE/m0_c2; + G4double Lept1E = aLept1E/m0_c2-1., Lept1E2 = Lept1E * Lept1E ; + + if (theModel==0) { + G4cout<<" theSelectedElement is not available!!"<SelectedAtom(); + + // ******* Gamma Transvers Momentum + + G4double TMom = std::sqrt(Lept0E2 -1.)* sintheta, u = TMom , u2 =u * u ; + G4double Xsi = 1./(1.+u2) , Xsi2 = Xsi * Xsi ; + + G4double theZ = theSelectedElement->GetZ(); + + G4double fCoul = theSelectedElement->GetfCoulomb(); + G4double delta = 12. * std::pow(theZ, 1./3.) * Lept0E * Lept1E * Xsi / (121. * GammaE); + G4double GG=0.; + + if(delta < 0.5) { + GG = std::log(2.* Lept0E * Lept1E / GammaE) - 2. - fCoul; + } + else if ( delta < 120) { + for (G4int j=2; j<=19; j++) { + if(SCRN[1][j] >= delta) { + GG =std::log(2 * Lept0E * Lept1E / GammaE) - 2 - fCoul + -(SCRN[2][j-1]+(delta-SCRN[1][j-1])*(SCRN[2][j]-SCRN[2][j-1])/(SCRN[1][j]-SCRN[1][j-1])); + break; + } + } + } + else { + G4double alpha_sc = (111 * std::pow(theZ, -1./3.)) / Xsi; + GG = std::log(alpha_sc)- 2 - fCoul; + } + + if(GG<-1) GG=-1; // *KL* do we need this ?! + + + G4double I_Lepton = (Lept0E2 + Lept1E2)*(3+2*GG) + 2 * Lept0E * Lept1E * (1 + 4 * u2 * Xsi2 * GG); + + // G4double D_Lepton1 = -8 * Lept0E * Lept1E * u2 * Xsi2 * GG / I_Lepton; + + G4double L_Lepton1 = GammaE * ((Lept0E - Lept1E) * (3. + 2. * GG)+2 * Lept1E * (1 + 4 * u2 * Xsi2 * GG))/I_Lepton; + + G4double T_Lepton1 = 4 * GammaE * Lept1E * Xsi * u * (1. - 2. * Xsi) * GG / I_Lepton ; + + + G4double Stokes_S1 = (Stokes_P3 * T_Lepton1) ; + G4double Stokes_S2 = 0; + G4double Stokes_S3 = (Stokes_P3 * L_Lepton1) ; + + + theFinalElectronPolarization.setX(Stokes_S1); + theFinalElectronPolarization.setY(Stokes_S2); + theFinalElectronPolarization.setZ(Stokes_S3); + + if(theFinalElectronPolarization.mag2()>1) { + G4cout<<" WARNING in pol-conv theFinalElectronPolarization \n"; + G4cout + <<"\t"<1) theFinalElectronPolarization.setZ(1); + } + + + G4double L_Lepton2 = GammaE * ((Lept1E - Lept0E) * (3. + 2. * GG)+2 * Lept0E * (1 + 4 * u2 * Xsi2 * GG))/I_Lepton; + + G4double T_Lepton2 = 4 * GammaE * Lept0E * Xsi * u * (1. - 2. * Xsi) * GG / I_Lepton ; + + G4double Stokes_SS1 = (Stokes_P3 * T_Lepton2) ; + G4double Stokes_SS2 = 0; + G4double Stokes_SS3 = (Stokes_P3 * L_Lepton2) ; + + theFinalPositronPolarization.SetPhoton(); + + theFinalPositronPolarization.setX(Stokes_SS1); + theFinalPositronPolarization.setY(Stokes_SS2); + theFinalPositronPolarization.setZ(Stokes_SS3); + + if(theFinalPositronPolarization.mag2()>1) { + G4cout<<" WARNING in pol-conv theFinalPositronPolarization \n"; + G4cout + <<"\t"<(1.+1.e-8) || cosphi<(-1.-1.e-8)) { + G4cout<<" warning G4StokesVector::RotateAz cosphi>1 or cosphi<-1\n" + <<" cosphi="<1.) cosphi=1.; + else if (cosphi<-1.) cosphi=-1.; + +// G4cout<<" cosphi="< is the same, since SYSIN is called with p1, and p2 as first parameter! + G4double hel=(cross(yParticleFrame*nInteractionFrame)*particleDirection)>0?1.:-1.; + + G4double sinphi=hel*std::sqrt(1.-cosphi*cosphi); + // G4cout<<" sin2 + cos2 -1 = "<<(sinphi*sinphi+cosphi*cosphi-1)<<"\n"; + + RotateAz(cosphi,sinphi); +} + + +void G4StokesVector::InvRotateAz(G4ThreeVector nInteractionFrame, + G4ThreeVector particleDirection) +{ + // note if incomming particle is on z-axis, + // we might encounter some nummerical problems, since + // nInteratonFrame and yParticleFrame are actually (almost) the same momentum + // and the normalization is only good to 10^-12 ! + + G4ThreeVector yParticleFrame = + G4PolarizationHelper::GetParticleFrameY(particleDirection); + G4double cosphi=yParticleFrame*nInteractionFrame; + + if (cosphi>1.+1.e-8 || cosphi<-1.-1.e-8) { + G4cout<<" warning G4StokesVector::RotateAz cosphi>1 or cosphi<-1\n"; + } + if (cosphi>1) cosphi=1.; + else if (cosphi<-1)cosphi=-1.; + + // check sign once more! + G4double hel=(cross(yParticleFrame*nInteractionFrame)*particleDirection)>0?1.:-1.; + G4double sinphi=hel*std::sqrt(std::fabs(1.-cosphi*cosphi)); + RotateAz(cosphi,-sinphi); +} + +void G4StokesVector::RotateAz(G4double cosphi, G4double sinphi) +{ + if (!isPhoton) { + G4double xsi1= cosphi*p1() + sinphi*p2(); + G4double xsi2= -sinphi*p1() + cosphi*p2(); + setX(xsi1); + setY(xsi2); + return; + } + + G4double sin2phi=2.*cosphi*sinphi; + G4double cos2phi=cosphi*cosphi-sinphi*sinphi; + + G4double xsi1= cos2phi*p1() + sin2phi*p2(); + G4double xsi2= -sin2phi*p1() + cos2phi*p2(); + setX(xsi1); + setY(xsi2); +} + +G4double G4StokesVector::GetBeta() +{ + G4double beta=getPhi(); + if (isPhoton) + return 0.5*beta; + return beta; +} + +void G4StokesVector::DiceUniform() +{ + G4double costheta=2.*G4UniformRand()-1.; + G4double sintheta=std::sqrt(1.-costheta*costheta); + G4double phi =2.*pi*G4UniformRand(); + setX(std::sin(phi)*sintheta); + setY(std::cos(phi)*sintheta); + setZ(costheta); +} + +void G4StokesVector::DiceP1() +{ + if (G4UniformRand()>0.5) setX(1.); + else setX(-1.); + setY(0.); + setZ(0.); +} + +void G4StokesVector::DiceP2() +{ + setX(0.); + if (G4UniformRand()>0.5) setY(1.); + else setY(-1.); + setZ(0.); +} + +void G4StokesVector::DiceP3() +{ + setX(0.); + setY(0.); + if (G4UniformRand()>0.5) setZ(1.); + else setZ(-1.); +} + +void G4StokesVector::FlipP3() +{ + setZ(-z()); +} + +G4ThreeVector G4StokesVector::PolError(const G4StokesVector & sum2, long n) +{ + // delta x = sqrt[ ( - ^2 )/(n-1) ] + G4StokesVector mean=(1./n)*(*this); + return G4StokesVector((1./(n-1.)*((1./n)*sum2 - mean.PolSqr()))).PolSqrt(); +} + +G4ThreeVector G4StokesVector::PolDiv(const G4StokesVector & b) + {return G4ThreeVector(b.x()!=0. ? x()/b.x() : 11111., + b.y()!=0. ? y()/b.y() : 11111., + b.z()!=0. ? z()/b.z() : 11111.);} diff --git a/source/processes/electromagnetic/polarisation/src/G4VPolarizedCrossSection.cc b/source/processes/electromagnetic/polarisation/src/G4VPolarizedCrossSection.cc new file mode 100644 index 0000000000..8474448ebc --- /dev/null +++ b/source/processes/electromagnetic/polarisation/src/G4VPolarizedCrossSection.cc @@ -0,0 +1,145 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4VPolarizedCrossSection.cc,v 1.2 2006/11/17 14:14:20 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// File name: G4VPolarizedCrossSection +// +// Author: Andreas Schaelicke +// +// Creation date: 15.05.2005 +// +// Modifications: +// +// Class Description: +// (pure virtual) interface class +// +// provides readable but efficient routines to determine +// polarization for the final state of a given process +// empoying the differential cross section +// + +#include "G4VPolarizedCrossSection.hh" +#include "Randomize.hh" + +G4VPolarizedCrossSection::G4VPolarizedCrossSection() +{ +} + +G4VPolarizedCrossSection::~G4VPolarizedCrossSection() +{ +} + +void G4VPolarizedCrossSection::Initialize(G4double, G4double, G4double, + const G4StokesVector &, + const G4StokesVector &, + G4int ) +{ +} + +G4StokesVector G4VPolarizedCrossSection::GetPol2() +{ + // neglects correlation effects! + + G4double invXsecTotal=1./XSection(G4StokesVector::ZERO,G4StokesVector::ZERO); + G4double xsPol1=XSection(G4StokesVector::P1,G4StokesVector::ZERO); + G4double xsPol2=XSection(G4StokesVector::P2,G4StokesVector::ZERO); + G4double xsPol3=XSection(G4StokesVector::P3,G4StokesVector::ZERO); + pol2=G4ThreeVector(invXsecTotal*xsPol1,invXsecTotal*xsPol2,invXsecTotal*xsPol3); + return pol2; +} + +G4StokesVector G4VPolarizedCrossSection::GetPol3() +{ + // neglects correlation effects! + + G4double invXsecTotal=1./XSection(G4StokesVector::ZERO,G4StokesVector::ZERO); + G4double xsPol1=XSection(G4StokesVector::ZERO,G4StokesVector::P1); + G4double xsPol2=XSection(G4StokesVector::ZERO,G4StokesVector::P2); + G4double xsPol3=XSection(G4StokesVector::ZERO,G4StokesVector::P3); + pol3=G4ThreeVector(invXsecTotal*xsPol1,invXsecTotal*xsPol2,invXsecTotal*xsPol3); + return pol3; +} + +void G4VPolarizedCrossSection::DicePolarization() +{ + // can respect correlation effects, but is limited to + // one quantization axis! + G4double sigma[4]; + sigma[0]=XSection(G4StokesVector::P3,G4StokesVector::P3); + sigma[1]=XSection(G4StokesVector::P3,G4StokesVector::M3); + sigma[2]=XSection(G4StokesVector::M3,G4StokesVector::P3); + sigma[3]=XSection(G4StokesVector::M3,G4StokesVector::M3); + + G4double sigma_max = 4. * XSection(G4StokesVector::ZERO,G4StokesVector::ZERO); + + for (G4int i=0;i<4;++i) { + G4cout<<"sigma="<sigma_max) { + G4cout<<"ERROR G4VPolarizedCrossSection::DicePolarization(["<0) sigma[i]+=sigma[i-1]; + } + + G4int k = 0; + G4double disc = sigma[3]*G4UniformRand(); + while (sigma[k]1.) { + G4cout<<" pol3 rejection error occurred "<BremsstrahlungTh(); + if(!isInitialised) { + isInitialised = true; + particle = p; + SetSecondaryParticle(G4Gamma::Gamma()); + SetIonisation(false); + + //G4VEmFluctuationModel* fm = 0; + G4VEmFluctuationModel* fm = new G4UniversalFluctuation(); + + G4VEmModel* em = new G4ePolarizedBremsstrahlungModel; + em->SetLowEnergyLimit(0.1*keV); + em->SetHighEnergyLimit(100.0*TeV); + AddEmModel(1, em, fm); + } +} + + +std::vector* G4ePolarizedBremsstrahlung::SecondariesPostStep( + G4VEmModel* model, + const G4MaterialCutsCouple* couple, + const G4DynamicParticle* dp, + G4double& tcut) +{ + std::vector* newp = model->SampleSecondaries(couple, dp, tcut); + return newp; +} diff --git a/source/processes/electromagnetic/polarisation/src/G4ePolarizedBremsstrahlungModel.cc b/source/processes/electromagnetic/polarisation/src/G4ePolarizedBremsstrahlungModel.cc new file mode 100644 index 0000000000..a7d35a28ba --- /dev/null +++ b/source/processes/electromagnetic/polarisation/src/G4ePolarizedBremsstrahlungModel.cc @@ -0,0 +1,135 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4ePolarizedBremsstrahlungModel.cc,v 1.2 2006/09/26 09:08:48 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ------------------------------------------------------------------- +// +// GEANT4 Class file +// +// +// File name: G4ePolarizedBremsstrahlungModel +// +// Author: Karim Laihem +// +// Creation date: 12.03.2005 +// +// Modifications: +// 19-08-06 addapted to accomodate geant481 structure +// +// +// Class Description: +// +// +// ------------------------------------------------------------------- +// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +#include "G4ePolarizedBremsstrahlungModel.hh" +#include "G4PolarizedBremsstrahlungCrossSection.hh" +#include "G4ParticleChangeForLoss.hh" +#include "G4PolarizationHelper.hh" + +G4ePolarizedBremsstrahlungModel::G4ePolarizedBremsstrahlungModel(const G4ParticleDefinition* p, + const G4String& nam) + : G4eBremsstrahlungModel(p,nam), + crossSectionCalculator(0) +{ +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +G4ePolarizedBremsstrahlungModel::~G4ePolarizedBremsstrahlungModel() +{ + if (crossSectionCalculator) delete crossSectionCalculator; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +void G4ePolarizedBremsstrahlungModel::Initialise(const G4ParticleDefinition* p, + const G4DataVector& d) +{ + G4eBremsstrahlungModel::Initialise(p,d); + if (!crossSectionCalculator) + crossSectionCalculator = new G4PolarizedBremsstrahlungCrossSection(this); +} + + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + + +std::vector* G4ePolarizedBremsstrahlungModel::SampleSecondaries( + const G4MaterialCutsCouple* couple, + const G4DynamicParticle* dp, + G4double tmin, + G4double maxEnergy) +{ + std::vector* vdp = + G4eBremsstrahlungModel::SampleSecondaries(couple,dp,tmin,maxEnergy); + + + if(vdp) { + G4double lepEnergy0 = dp->GetKineticEnergy(); + G4double gamEnergy1 = (*vdp)[0]->GetKineticEnergy(); + G4double sintheta = dp->GetMomentumDirection().cross((*vdp)[0]->GetMomentumDirection()).mag(); + if (sintheta>1.) sintheta=1.; + + + G4StokesVector beamPol = dp->GetPolarization(); + + // determine interaction plane + G4ThreeVector nInteractionFrame = + G4PolarizationHelper::GetFrame(dp->GetMomentumDirection(), + fParticleChange->GetProposedMomentumDirection()); + + // transform polarization into interaction frame + beamPol.InvRotateAz(nInteractionFrame,dp->GetMomentumDirection()); + + // calulcate polarization transfer + crossSectionCalculator->Initialize(lepEnergy0, gamEnergy1, sintheta, + beamPol, G4StokesVector::ZERO); + + // deterimine final state polarization + G4StokesVector newBeamPol = crossSectionCalculator->GetPol2(); + newBeamPol.RotateAz(nInteractionFrame, + fParticleChange->GetProposedMomentumDirection()); + fParticleChange->ProposePolarization(newBeamPol); + + G4int num = vdp->size(); + if (num!=1) G4cout<<" WARNING "<GetPol3(); + photonPol.SetPhoton(); + photonPol.RotateAz(nInteractionFrame,(*vdp)[i]->GetMomentumDirection()); + (*vdp)[i]->SetPolarization(photonPol.p1(), + photonPol.p2(), + photonPol.p3()); + } + } + return vdp; +} +// The emitted gamma energy is sampled using a parametrized formula diff --git a/source/processes/electromagnetic/polarisation/src/G4ePolarizedIonisation.cc b/source/processes/electromagnetic/polarisation/src/G4ePolarizedIonisation.cc new file mode 100644 index 0000000000..31e30eeb8c --- /dev/null +++ b/source/processes/electromagnetic/polarisation/src/G4ePolarizedIonisation.cc @@ -0,0 +1,298 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4ePolarizedIonisation.cc,v 1.2 2006/09/26 09:08:48 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// ------------------------------------------------------------------- +// +// GEANT4 Class file +// +// +// File name: G4ePolarizedIonisation +// +// Author: A.Schaelicke on base of Vladimir Ivanchenko code +// +// Creation date: 10.11.2005 +// +// Modifications: +// +// 10-11-05, include polarization description (A.Schaelicke) +// , create asymmetry table and determine interactionlength +// , update polarized differential cross section +// +// 20-08-05, modified interface (A.Schaelicke) +// +// Class Description: +// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +#include "G4ePolarizedIonisation.hh" +#include "G4Electron.hh" +#include "G4UniversalFluctuation.hh" +#include "G4BohrFluctuations.hh" +#include "G4UnitsTable.hh" + +#include "G4PolarizedMollerBhabhaModel.hh" +#include "G4ProductionCutsTable.hh" +#include "G4PolarizationManager.hh" +#include "G4PolarizationHelper.hh" +#include "G4StokesVector.hh" + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +G4ePolarizedIonisation::G4ePolarizedIonisation(const G4String& name) + : G4VEnergyLossProcess(name), + theElectron(G4Electron::Electron()), + isElectron(true), + isInitialised(false), + theAsymmetryTable(NULL), + theTransverseAsymmetryTable(NULL) +{ + verboseLevel=0; + SetDEDXBinning(120); + SetLambdaBinning(120); + numBinAsymmetryTable=120; + + SetMinKinEnergy(0.1*keV); + SetMaxKinEnergy(100.0*TeV); + // PrintInfoDefinition(); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +G4ePolarizedIonisation::~G4ePolarizedIonisation() +{ + if (theAsymmetryTable) { + theAsymmetryTable->clearAndDestroy(); + delete theAsymmetryTable; + } + if (theTransverseAsymmetryTable) { + theTransverseAsymmetryTable->clearAndDestroy(); + delete theTransverseAsymmetryTable; + } +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +void G4ePolarizedIonisation::InitialiseEnergyLossProcess( + const G4ParticleDefinition* part, + const G4ParticleDefinition* /*part2*/) +{ + if(!isInitialised) { + + if(part == G4Positron::Positron()) isElectron = false; + SetSecondaryParticle(theElectron); + + + + flucModel = new G4UniversalFluctuation(); + //flucModel = new G4BohrFluctuations(); + + // G4VEmModel* em = new G4MollerBhabhaModel(); + emModel = new G4PolarizedMollerBhabhaModel; + emModel->SetLowEnergyLimit(100*eV); + emModel->SetHighEnergyLimit(100*TeV); + AddEmModel(1, emModel, flucModel); + + isInitialised = true; + } +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +void G4ePolarizedIonisation::PrintInfo() +{ + G4cout << " Delta cross sections from Moller+Bhabha, " + << "good description from 1 KeV to 100 GeV." + << G4endl; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +G4double G4ePolarizedIonisation::GetMeanFreePath(const G4Track& track, + G4double s, + G4ForceCondition* cond) +{ + // *** get unploarised mean free path from lambda table *** + G4double mfp = G4VEnergyLossProcess::GetMeanFreePath(track, s, cond); + + + // *** get asymmetry, if target is polarized *** + G4VPhysicalVolume* aPVolume = track.GetVolume(); + G4LogicalVolume* aLVolume = aPVolume->GetLogicalVolume(); + + G4PolarizationManager * polarizationManger = G4PolarizationManager::GetInstance(); + const G4bool volumeIsPolarized = polarizationManger->IsPolarized(aLVolume); + const G4StokesVector ePolarization = track.GetPolarization(); + + if (mfp != DBL_MAX && volumeIsPolarized && !ePolarization.IsZero()) { + const G4DynamicParticle* aDynamicElectron = track.GetDynamicParticle(); + const G4double eEnergy = aDynamicElectron->GetKineticEnergy(); + const G4ParticleMomentum eDirection0 = aDynamicElectron->GetMomentumDirection(); + + G4StokesVector volumePolarization = polarizationManger->GetVolumePolarization(aLVolume); + + G4bool isOutRange; + size_t idx = CurrentMaterialCutsCoupleIndex(); + G4double lAsymmetry = (*theAsymmetryTable)(idx)-> + GetValue(eEnergy, isOutRange); + G4double tAsymmetry = (*theTransverseAsymmetryTable)(idx)-> + GetValue(eEnergy, isOutRange); + + // calculate longitudinal spin component + G4double polZZ = ePolarization.z()* + volumePolarization*eDirection0; + // calculate transvers spin components + G4double polXX = ePolarization.x()* + volumePolarization*G4PolarizationHelper::GetParticleFrameX(eDirection0); + G4double polYY = ePolarization.y()* + volumePolarization*G4PolarizationHelper::GetParticleFrameY(eDirection0); + + + G4double impact = 1. + polZZ*lAsymmetry + (polXX + polYY)*tAsymmetry; + // determine polarization dependent mean free path + mfp /= impact; + if (mfp <=0.) { + G4cout <<"PV impact ( "<clearAndDestroy(); delete theAsymmetryTable;} + if (theTransverseAsymmetryTable) { + theTransverseAsymmetryTable->clearAndDestroy(); delete theTransverseAsymmetryTable;} + + const G4ProductionCutsTable* theCoupleTable= + G4ProductionCutsTable::GetProductionCutsTable(); + size_t numOfCouples = theCoupleTable->GetTableSize(); + + theAsymmetryTable = new G4PhysicsTable(numOfCouples); + theTransverseAsymmetryTable = new G4PhysicsTable(numOfCouples); + + for (size_t j=0 ; j < numOfCouples; j++ ) { + // get cut value + const G4MaterialCutsCouple* couple = theCoupleTable->GetMaterialCutsCouple(j); + + G4double tcutmin = emModel->MinEnergyCut(&part, couple); + G4double cut = (*theCoupleTable->GetEnergyCutsVector(1))[j]; + cut = std::max(cut, tcutmin); + + //create physics vectors then fill it (same parameters as lambda vector) + G4PhysicsVector * ptrVectorA = LambdaPhysicsVector(couple,cut); + G4PhysicsVector * ptrVectorB = LambdaPhysicsVector(couple,cut); + + for (size_t i = 0 ; i < numBinAsymmetryTable ; i++ ) { + G4double lowEdgeEnergy = ptrVectorA->GetLowEdgeEnergy(i); + G4double tasm=0.; + G4double asym = ComputeAsymmetry(lowEdgeEnergy, couple, part, cut, tasm); + ptrVectorA->PutValue(i,asym); + ptrVectorB->PutValue(i,tasm); + } + theAsymmetryTable->insertAt( j , ptrVectorA ) ; + theTransverseAsymmetryTable->insertAt( j , ptrVectorB ) ; + } + +} +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +G4double G4ePolarizedIonisation::ComputeAsymmetry(G4double energy, + const G4MaterialCutsCouple* couple, + const G4ParticleDefinition& particle, + G4double cut, + G4double & tAsymmetry) +{ + G4double lAsymmetry = 0.0; + tAsymmetry = 0.0; + if (isElectron) {lAsymmetry = tAsymmetry = -1.0;} + + // calculate polarized cross section + theTargetPolarization=G4ThreeVector(0.,0.,1.); + emModel->SetTargetPolarization(theTargetPolarization); + emModel->SetBeamPolarization(theTargetPolarization); + G4double sigma2=emModel->CrossSection(couple,&particle,energy,cut,energy); + + // calculate transversely polarized cross section + theTargetPolarization=G4ThreeVector(1.,0.,0.); + emModel->SetTargetPolarization(theTargetPolarization); + emModel->SetBeamPolarization(theTargetPolarization); + G4double sigma3=emModel->CrossSection(couple,&particle,energy,cut,energy); + + // calculate unpolarized cross section + theTargetPolarization=G4ThreeVector(); + emModel->SetTargetPolarization(theTargetPolarization); + emModel->SetBeamPolarization(theTargetPolarization); + G4double sigma0=emModel->CrossSection(couple,&particle,energy,cut,energy); + // determine assymmetries + if (sigma0>0.) { + lAsymmetry=sigma2/sigma0-1.; + tAsymmetry=sigma3/sigma0-1.; + } + if (std::fabs(lAsymmetry)>1.) { + G4cout<<" energy="<1.) { + G4cout<<" energy="<* G4ePolarizedIonisation::SecondariesPostStep( + G4VEmModel* model, + const G4MaterialCutsCouple* couple, + const G4DynamicParticle* dp, + G4double& tcut) +{ + // determine the delta electron + std::vector* particles = model->SampleSecondaries(couple, dp, tcut); + // Note: G4VEnergyLossProcess relies on fParticleChange and not on polParticleChange, + // but the former does not allow for polarization! + return particles; +} + diff --git a/source/processes/electromagnetic/polarisation/src/G4eplusPolarizedAnnihilation.cc b/source/processes/electromagnetic/polarisation/src/G4eplusPolarizedAnnihilation.cc new file mode 100644 index 0000000000..b61a2aa2c2 --- /dev/null +++ b/source/processes/electromagnetic/polarisation/src/G4eplusPolarizedAnnihilation.cc @@ -0,0 +1,312 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4eplusPolarizedAnnihilation.cc,v 1.3 2006/11/17 14:14:22 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ------------------------------------------------------------------- +// +// GEANT4 Class file +// +// +// File name: G4eplusPolarizedAnnihilation +// +// Author: A. Schaelicke on base of Vladimir Ivanchenko / Michel Maire code +// +// Creation date: 02.07.2006 +// +// Modifications: +// 26-07-06 modified cross section (P. Starovoitov) +// 21-08-06 interface updated (A. Schaelicke) +// +// +// Class Description: +// +// Polarized process of e+ annihilation into 2 gammas +// + +// +// ------------------------------------------------------------------- +// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +#include "G4eplusPolarizedAnnihilation.hh" +#include "G4MaterialCutsCouple.hh" +#include "G4Gamma.hh" +#include "G4PhysicsVector.hh" +#include "G4PhysicsLogVector.hh" + + +#include "G4PolarizedAnnihilationModel.hh" +#include "G4PhysicsTableHelper.hh" +#include "G4ProductionCutsTable.hh" +#include "G4PolarizationManager.hh" +#include "G4PolarizationHelper.hh" +#include "G4StokesVector.hh" + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +G4eplusPolarizedAnnihilation::G4eplusPolarizedAnnihilation(const G4String& name) + : G4VEmProcess(name), isInitialised(false), + theAsymmetryTable(NULL), + theTransverseAsymmetryTable(NULL) +{} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +G4eplusPolarizedAnnihilation::~G4eplusPolarizedAnnihilation() +{ + if (theAsymmetryTable) { + theAsymmetryTable->clearAndDestroy(); + delete theAsymmetryTable; + } + if (theTransverseAsymmetryTable) { + theTransverseAsymmetryTable->clearAndDestroy(); + delete theTransverseAsymmetryTable; + } +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +void G4eplusPolarizedAnnihilation::InitialiseProcess(const G4ParticleDefinition*) +{ + if(!isInitialised) { + isInitialised = true; + // SetVerboseLevel(3); + SetBuildTableFlag(true); + SetStartFromNullFlag(false); + SetSecondaryParticle(G4Gamma::Gamma()); + G4double emin = 0.1*keV; + G4double emax = 100.*TeV; + SetLambdaBinning(120); + SetMinKinEnergy(emin); + SetMaxKinEnergy(emax); + emModel = new G4PolarizedAnnihilationModel(); + emModel->SetLowEnergyLimit(emin); + emModel->SetHighEnergyLimit(emax); + AddEmModel(1, emModel); + } +} + + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + + // for polarization + +G4double G4eplusPolarizedAnnihilation::GetMeanFreePath(const G4Track& track, + G4double previousStepSize, + G4ForceCondition* condition) +{ + G4double mfp = G4VEmProcess::GetMeanFreePath(track, previousStepSize, condition); + + if (theAsymmetryTable) { + + G4Material* aMaterial = track.GetMaterial(); + G4VPhysicalVolume* aPVolume = track.GetVolume(); + G4LogicalVolume* aLVolume = aPVolume->GetLogicalVolume(); + + // G4Material* bMaterial = aLVolume->GetMaterial(); + G4PolarizationManager * polarizationManger = G4PolarizationManager::GetInstance(); + + const G4bool volumeIsPolarized = polarizationManger->IsPolarized(aLVolume); + G4StokesVector electronPolarization = polarizationManger->GetVolumePolarization(aLVolume); + + if (!volumeIsPolarized || mfp == DBL_MAX) return mfp; + + // *** get asymmetry, if target is polarized *** + const G4DynamicParticle* aDynamicPositron = track.GetDynamicParticle(); + const G4double positronEnergy = aDynamicPositron->GetKineticEnergy(); + const G4StokesVector positronPolarization = track.GetPolarization(); + const G4ParticleMomentum positronDirection0 = aDynamicPositron->GetMomentumDirection(); + + if (verboseLevel>=2) { + + G4cout << " Mom " << positronDirection0 << G4endl; + G4cout << " Polarization " << positronPolarization << G4endl; + G4cout << " MaterialPol. " << electronPolarization << G4endl; + G4cout << " Phys. Volume " << aPVolume->GetName() << G4endl; + G4cout << " Log. Volume " << aLVolume->GetName() << G4endl; + G4cout << " Material " << aMaterial << G4endl; + } + + G4bool isOutRange; + G4int idx= CurrentMaterialCutsCoupleIndex(); + G4double lAsymmetry = (*theAsymmetryTable)(idx)-> + GetValue(positronEnergy, isOutRange); + G4double tAsymmetry = (*theTransverseAsymmetryTable)(idx)-> + GetValue(positronEnergy, isOutRange); + + G4double polZZ = positronPolarization.z()* + electronPolarization*positronDirection0; + G4double polXX = positronPolarization.x()* + electronPolarization*G4PolarizationHelper::GetParticleFrameX(positronDirection0); + G4double polYY = positronPolarization.y()* + electronPolarization*G4PolarizationHelper::GetParticleFrameY(positronDirection0); + + G4double impact = 1. + polZZ*lAsymmetry + (polXX + polYY)*tAsymmetry; + + mfp *= 1. / impact; + + if (verboseLevel>=2) { + G4cout << " MeanFreePath: " << mfp / mm << " mm " << G4endl; + G4cout << " Asymmetry: " << lAsymmetry << ", " << tAsymmetry << G4endl; + G4cout << " PolProduct: " << polXX << ", " << polYY << ", " << polZZ << G4endl; + } + } + + return mfp; +} +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +void G4eplusPolarizedAnnihilation::BuildPhysicsTable(const G4ParticleDefinition& pd) +{ + G4VEmProcess::BuildPhysicsTable(pd); + BuildAsymmetryTable(pd); +} +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +void G4eplusPolarizedAnnihilation::PreparePhysicsTable(const G4ParticleDefinition& pd) +{ + G4VEmProcess::PreparePhysicsTable(pd); + theAsymmetryTable = G4PhysicsTableHelper::PreparePhysicsTable(theAsymmetryTable); + theTransverseAsymmetryTable = G4PhysicsTableHelper::PreparePhysicsTable(theTransverseAsymmetryTable); +} + +void G4eplusPolarizedAnnihilation::BuildAsymmetryTable(const G4ParticleDefinition& part) +{ + // Access to materials + const G4ProductionCutsTable* theCoupleTable= + G4ProductionCutsTable::GetProductionCutsTable(); + size_t numOfCouples = theCoupleTable->GetTableSize(); + G4cout<<" annih-numOfCouples="<GetFlag(i)<<"\n"; + if (theAsymmetryTable->GetFlag(i)) { + G4cout<<" building pol-annih ... \n"; + + // create physics vector and fill it + const G4MaterialCutsCouple* couple = theCoupleTable->GetMaterialCutsCouple(i); + + // use same parameters as for lambda + G4PhysicsVector* aVector = LambdaPhysicsVector(couple); + G4PhysicsVector* tVector = LambdaPhysicsVector(couple); + + for (G4int j = 0 ; j < LambdaBinning() ; ++j ) { + G4double lowEdgeEnergy = aVector->GetLowEdgeEnergy(j); + G4double tasm=0.; + G4double asym = ComputeAsymmetry(lowEdgeEnergy, couple, part, 0., tasm); + aVector->PutValue(j,asym); + tVector->PutValue(j,tasm); + } + + G4PhysicsTableHelper::SetPhysicsVector(theAsymmetryTable, i, aVector); + G4PhysicsTableHelper::SetPhysicsVector(theTransverseAsymmetryTable, i, tVector); + } + } + +} + + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +G4double G4eplusPolarizedAnnihilation::ComputeAsymmetry(G4double energy, + const G4MaterialCutsCouple* couple, + const G4ParticleDefinition& particle, + G4double cut, + G4double &tAsymmetry) +{ + G4double lAsymmetry = 0.0; + tAsymmetry = 0.0; + + // calculate polarized cross section + theTargetPolarization=G4ThreeVector(0.,0.,1.); + emModel->SetTargetPolarization(theTargetPolarization); + emModel->SetBeamPolarization(theTargetPolarization); + G4double sigma2=emModel->CrossSection(couple,&particle,energy,cut,energy); + + // calculate transversely polarized cross section + theTargetPolarization=G4ThreeVector(1.,0.,0.); + emModel->SetTargetPolarization(theTargetPolarization); + emModel->SetBeamPolarization(theTargetPolarization); + G4double sigma3=emModel->CrossSection(couple,&particle,energy,cut,energy); + + // calculate unpolarized cross section + theTargetPolarization=G4ThreeVector(); + emModel->SetTargetPolarization(theTargetPolarization); + emModel->SetBeamPolarization(theTargetPolarization); + G4double sigma0=emModel->CrossSection(couple,&particle,energy,cut,energy); + + // determine assymmetries + if (sigma0>0.) { + lAsymmetry=sigma2/sigma0-1.; + tAsymmetry=sigma3/sigma0-1.; + } + return lAsymmetry; + +} + + + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +void G4eplusPolarizedAnnihilation::PrintInfo() +{ + G4cout << " Polarized model for annihilation into 2 photons" + << G4endl; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +G4VParticleChange* G4eplusPolarizedAnnihilation::AtRestDoIt(const G4Track& aTrack, + const G4Step& ) +// +// Performs the e+ e- annihilation when both particles are assumed at rest. +// It generates two back to back photons with energy = electron_mass. +// The angular distribution is isotropic. +// GEANT4 internal units +// +// Note : Effects due to binding of atomic electrons are negliged. +{ + fParticleChange.InitializeForPostStep(aTrack); + + fParticleChange.SetNumberOfSecondaries(2); + + G4double cosTeta = 2.*G4UniformRand()-1. , sinTeta = std::sqrt(1.-cosTeta*cosTeta); + G4double phi = twopi * G4UniformRand(); + G4ThreeVector direction (sinTeta*std::cos(phi), sinTeta*std::sin(phi), cosTeta); + fParticleChange.AddSecondary( new G4DynamicParticle (G4Gamma::Gamma(), + direction, electron_mass_c2) ); + fParticleChange.AddSecondary( new G4DynamicParticle (G4Gamma::Gamma(), + -direction, electron_mass_c2) ); + // Kill the incident positron + // + fParticleChange.ProposeTrackStatus(fStopAndKill); + return &fParticleChange; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/source/processes/electromagnetic/standard/History b/source/processes/electromagnetic/standard/History index 55b7007e99..0bd84eeb89 100644 --- a/source/processes/electromagnetic/standard/History +++ b/source/processes/electromagnetic/standard/History @@ -1,4 +1,4 @@ -$Id: History,v 1.239 2006/05/22 18:22:00 vnivanch Exp $ +$Id: History,v 1.269 2006/12/04 12:45:25 vnivanch Exp $ ------------------------------------------------------------------- ========================================================= @@ -17,6 +17,120 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +04 Dec 06: V.Ivanchenko (emstand-V08-01-16) +- G4UrbanMscModel - fix in ComputeTruePathLengthLimit stepmin=1.e-6*mm + (L.Urban) + +23 Nov 06: V.Ivanchenko (emstand-V08-01-15) +- G4MultipleScattering - ste default skin=1 only for e+-, + for all other particles default skin=0 + +20 Nov 06: V.Ivanchenko (emstand-V08-01-14) +20 Nov 06: +- G4UrbanMscModel - fix in the single scattering part of SampleCosineTheta, + now there is single scattering just before boundary crossings (and not + inside a volume) + +15 Nov 06: V.Ivanchenko (emstand-V08-01-13) +- G4UrbanMscModel - fix NaN inside SampleCosineTheta (L.Urban) + +10 Nov 06: V.Ivanchenko (emstand-V08-01-12) +07 Nov 06: +- G4UrbanMscModel - some optimization in ComputeTruePathLengthLimit, + fixes in ComputeGeomPathLength, SampleCosineTheta (L.Urban) + +31 Oct 06: V.Ivanchenko (emstand-V08-01-11) +- G4UrbanMscModel is changed to work with new approach of parallel + navigation (j.Apostolakis) + +26 Oct 06: V.Ivanchenko (emstand-V08-01-10) +- G4hMultipleScattering - new class configured for hadrons +- G4eCoulombScatteringModel - set cross section const below 1 keV + +23 Oct 06: V.Ivanchenko (emstand-V08-01-09) +- G4BraggIonModel - reduce lowest energy for parameterisation to 0.25 keV +23 Oct 06: L.Urban +- G4MultipleScattering - parameter skin = 1 by default, +- G4UrbanMscModel - more effective safety update in SampleSecondaries, + + come cosmetics. + +20 Oct 06: V.Ivanchenko (emstand-V08-01-08) +- G4CoulombScatteringModel inherit from G4eCoulombScatteringModel, + screening parameter computation is done in inline function +- G4eeToTwoGammaModel - introduce member theGamma + +20 Oct 06: L.Urban cleanup of msc +- theta0 parameter for SampleCosineTheta is computed in a public + function ComputeTheta0; +- default value of skin = 0 (there is no small step with single scattering if + skin <=0, and there are ~skin small steps if skin >0 +- no z sampling in ComputeGeomPathLength by default +- correction in the single scattering part, allowing not only small angles now +- PostStep ComputeSafety(pos) is used + +16 Oct 06: V.Ivanchenko (emstand-V08-01-07) +- Add extra protection to G4eplusAnnihilation52 +- Add warning to all processes 52 and 71 type + +16 Oct 06: L.Urban +- new msc version (G4MultipleScattering, G4UrbanMscModel): + - Stepping has been modified: + - min. steplimit in 8.1: tlimitmin = max(lambda/25, 5 nanometer) + now : tlimitmin = max(lambda/25, 1.01*stepmin) + where stepmin ~ lambda elastic + + - possibility to have extreme small step(s) before boundary crossing + this feature is not active by default; + it can be activated by setting the data member "skin" to a + non-negative value, steplimit = stepmin, if the distance to the boundary + (in the original direction) is smaller than skin*stepmin; + + - the step restriction is weaker for particles with higher energy, + i.e. bigger effective facrange value is used in this case + in 8.0/8.1 this 'scaling' depends on Tkin, new version : + scaling depends on lambda, giving smaller material dependence + + - Angular distribution has been changed: + + - single/plural scattering for step <= stepmin + (in this case t = z + no lateral displacement) + + - parameter theta0 has been (sligtly) modified + + - tail of the distribution has been modified, now the parameter + describing the tail is material (i.e. Z) dependent + +14 Sept 06: mma (emstand-V08-01-06) +- move the function SetModel() in G4VEmProcess + +09 Sept 06: mma (emstand-V08-01-05) +- add/modify the function SetModel() in G4PhotoElectric, G4ComptonScattering, + G4GammaConversion, G4eplusAnnihilation + +08 Sep 06: V.Ivanchenko (emstand-V08-01-04) +- Bug fixed in PAI model concerning Tmax for electrons and positrons. Tmax + is defined now for each particle independently (V.Grichine) + +30 Aug 06: V.Ivanchenko (emstand-V08-01-03) +- Provide changings required for new processes/models with polarization: + G4KleinNishinaCompton - make some members protected + G4MollerBhabhaModel - make some members protected + G4eBremsstrahlungModel - reorganize SelectRandomAom method and make + some members protected + +29 Aug 06: V.Ivanchenko (emstand-V08-01-02) +- Fix problem of positron zero incident energy in G4eeToTwoGammaModel +- Add extra protection inside G4BetheBlochModel + +19 Aug 06: V.Ivanchenko (emstand-V08-01-01) +- Fix energy non-conservation in G4PAIModel for positrons (V.Grichine) + +08 Aug 06: V.Ivanchenko (emstand-V08-01-00) +- Fix problems and add comments in the classes prototype Coulomb + elastic scattering: G4CoulombScattering, G4CoulombScatteringModel, + G4eCoulombScatteringModel +- Set default limit on scattering angle to zero + 22 May 06: V.Ivanchenko (emstand-V08-00-25) - G4eBremsstrahlung - use gammaThreshold from G4LossTableManager for more easier initialisation (CMS request) diff --git a/source/processes/electromagnetic/standard/include/G4ASTARStopping.hh b/source/processes/electromagnetic/standard/include/G4ASTARStopping.hh index 8097af87f8..93a5ecd9ea 100644 --- a/source/processes/electromagnetic/standard/include/G4ASTARStopping.hh +++ b/source/processes/electromagnetic/standard/include/G4ASTARStopping.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4ASTARStopping.hh,v 1.5 2006/06/29 19:49:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4ASTARStopping_h #define G4ASTARStopping_h 1 diff --git a/source/processes/electromagnetic/standard/include/G4BetheBlochModel.hh b/source/processes/electromagnetic/standard/include/G4BetheBlochModel.hh index 6f25a398fe..3569c740e8 100644 --- a/source/processes/electromagnetic/standard/include/G4BetheBlochModel.hh +++ b/source/processes/electromagnetic/standard/include/G4BetheBlochModel.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4BetheBlochModel.hh,v 1.8 2006/06/29 19:50:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/standard/include/G4BetheHeitlerModel.hh b/source/processes/electromagnetic/standard/include/G4BetheHeitlerModel.hh index 74e52af85d..01daa55465 100644 --- a/source/processes/electromagnetic/standard/include/G4BetheHeitlerModel.hh +++ b/source/processes/electromagnetic/standard/include/G4BetheHeitlerModel.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4BetheHeitlerModel.hh,v 1.5 2006/06/29 19:50:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/standard/include/G4BohrFluctuations.hh b/source/processes/electromagnetic/standard/include/G4BohrFluctuations.hh index ebd23ec694..95d8f01ab1 100644 --- a/source/processes/electromagnetic/standard/include/G4BohrFluctuations.hh +++ b/source/processes/electromagnetic/standard/include/G4BohrFluctuations.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4BohrFluctuations.hh,v 1.2 2006/06/29 19:50:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/standard/include/G4BraggIonModel.hh b/source/processes/electromagnetic/standard/include/G4BraggIonModel.hh index b3236244ff..d07f414c3f 100644 --- a/source/processes/electromagnetic/standard/include/G4BraggIonModel.hh +++ b/source/processes/electromagnetic/standard/include/G4BraggIonModel.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4BraggIonModel.hh,v 1.7 2006/06/29 19:50:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/standard/include/G4BraggModel.hh b/source/processes/electromagnetic/standard/include/G4BraggModel.hh index 81b86c2b38..be2fc7d4a1 100644 --- a/source/processes/electromagnetic/standard/include/G4BraggModel.hh +++ b/source/processes/electromagnetic/standard/include/G4BraggModel.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4BraggModel.hh,v 1.9 2006/06/29 19:50:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/standard/include/G4ComptonScattering.hh b/source/processes/electromagnetic/standard/include/G4ComptonScattering.hh index 0e9b8ad26b..055bc33282 100644 --- a/source/processes/electromagnetic/standard/include/G4ComptonScattering.hh +++ b/source/processes/electromagnetic/standard/include/G4ComptonScattering.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4ComptonScattering.hh,v 1.16 2006/06/29 19:50:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ComptonScattering.hh,v 1.18 2006/09/14 10:27:19 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //------------------ G4ComptonScattering physics process ----------------------- // by Michel Maire, April 1996 @@ -46,6 +46,8 @@ // 09-11-04, Remove Retrieve tables (V.Ivantchenko) // 15-03-05, Redesign - use G4VEmProcess interface (V.Ivantchenko) // 04-05-05, Make class to be default (V.Ivanchenko) +// 09-09-06, modify SetModel(G4VEmModel*) (mma) +// 12-09-06, move SetModel(G4VEmModel*) in G4VEmProcess (mma) // ----------------------------------------------------------------------------- // class description @@ -80,11 +82,10 @@ public: // with description // true for Gamma only. G4bool IsApplicable(const G4ParticleDefinition&); - + // Print few lines of informations about the process: validity range, virtual void PrintInfo(); - void SetModel(const G4String& name); protected: @@ -96,27 +97,23 @@ protected: const G4DynamicParticle*); private: - - // hide assignment operator as private - G4ComptonScattering& operator=(const G4ComptonScattering &right); - G4ComptonScattering(const G4ComptonScattering& ); - G4bool isInitialised; - G4VEmModel* selectedModel; - G4int mType; + G4bool isInitialised; }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... -inline G4bool G4ComptonScattering::IsApplicable(const G4ParticleDefinition& p) +inline +G4bool G4ComptonScattering::IsApplicable(const G4ParticleDefinition& p) { return (&p == G4Gamma::Gamma()); } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... -inline std::vector* G4ComptonScattering::SecondariesPostStep( +inline +std::vector* G4ComptonScattering::SecondariesPostStep( G4VEmModel* model, const G4MaterialCutsCouple* couple, const G4DynamicParticle* dp) diff --git a/source/processes/electromagnetic/standard/include/G4ComptonScattering52.hh b/source/processes/electromagnetic/standard/include/G4ComptonScattering52.hh index f144f0832a..528c138e90 100644 --- a/source/processes/electromagnetic/standard/include/G4ComptonScattering52.hh +++ b/source/processes/electromagnetic/standard/include/G4ComptonScattering52.hh @@ -25,7 +25,7 @@ // // // $Id: G4ComptonScattering52.hh,v 1.2 2006/06/29 19:50:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //------------------ G4ComptonScattering52 physics process ----------------------- // by Michel Maire, April 1996 diff --git a/source/processes/electromagnetic/standard/include/G4CoulombScattering.hh b/source/processes/electromagnetic/standard/include/G4CoulombScattering.hh index 5cca2d4754..d4de14ccf9 100644 --- a/source/processes/electromagnetic/standard/include/G4CoulombScattering.hh +++ b/source/processes/electromagnetic/standard/include/G4CoulombScattering.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4CoulombScattering.hh,v 1.2 2006/06/29 19:50:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4CoulombScattering.hh,v 1.4 2006/08/09 17:57:03 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // @@ -58,7 +58,7 @@ class G4CoulombScattering : public G4VEmProcess public: - G4CoulombScattering(const G4String& name = "CoulombScat"); + G4CoulombScattering(const G4String& name = "eCoulombScat"); virtual ~G4CoulombScattering(); @@ -70,6 +70,8 @@ public: void SetQ2Max(G4double); + void SetBuildTableFlag(G4bool); + // Print out of the class parameters virtual void PrintInfo(); @@ -92,6 +94,7 @@ private: G4double thetaMax; G4double q2Max; G4bool isInitialised; + G4bool buildTableFlag; }; @@ -126,6 +129,13 @@ inline void G4CoulombScattering::SetQ2Max(G4double val) //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... +inline void G4CoulombScattering::SetBuildTableFlag(G4bool val) +{ + buildTableFlag = val; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + inline std::vector* G4CoulombScattering::SecondariesPostStep( G4VEmModel* model, const G4MaterialCutsCouple* couple, diff --git a/source/processes/electromagnetic/standard/include/G4CoulombScatteringModel.hh b/source/processes/electromagnetic/standard/include/G4CoulombScatteringModel.hh index a92da2cc02..bb17300dc0 100644 --- a/source/processes/electromagnetic/standard/include/G4CoulombScatteringModel.hh +++ b/source/processes/electromagnetic/standard/include/G4CoulombScatteringModel.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4CoulombScatteringModel.hh,v 1.2 2006/06/29 19:50:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4CoulombScatteringModel.hh,v 1.5 2006/10/19 09:44:27 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // @@ -38,12 +38,19 @@ // Creation date: 19.02.2006 // // Modifications: +// 01.08.06 V.Ivanchenko extend upper limit of table to TeV and review the +// logic of building - only elements from G4ElementTable +// 08.08.06 V.Ivanchenko build internal table in ekin scale, introduce faclim +// 19.10.06 V.Ivanchenko use inheritance from G4eCoulombScatteringModel // // Class Description: // // Implementation of CoulombScattering of pointlike charge particle // on Atomic Nucleus for interval of scattering anles in CM system // thetaMin - ThetaMax +// The model based on analysis of J.M.Fernandez-Varea et al. +// NIM B73(1993)447 originated from G.Wentzel Z.Phys. 40(1927)590 with +// screening parameter from H.A.Bethe Phys. Rev. 89 (1953) 1256. // // ------------------------------------------------------------------- @@ -52,35 +59,23 @@ #ifndef G4CoulombScatteringModel_h #define G4CoulombScatteringModel_h 1 -#include "G4VEmModel.hh" -#include "G4PhysicsTable.hh" +#include "G4eCoulombScatteringModel.hh" #include "globals.hh" -class G4ParticleChangeForGamma; class G4ParticleTable; class G4NistManager; -class G4CoulombScatteringModel : public G4VEmModel +class G4CoulombScatteringModel : public G4eCoulombScatteringModel { public: G4CoulombScatteringModel(G4double thetaMin = 0.0, G4double thetaMax = pi, - G4bool build = true, G4double tlim = PeV*PeV, + G4bool build = true, G4double tlim = TeV*TeV, const G4String& nam = "CoulombScattering"); virtual ~G4CoulombScatteringModel(); - virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&); - - virtual G4double ComputeCrossSectionPerAtom( - const G4ParticleDefinition*, - G4double kinEnergy, - G4double Z, - G4double A, - G4double cut, - G4double emax); - virtual std::vector* SampleSecondaries( const G4MaterialCutsCouple*, const G4DynamicParticle*, @@ -99,48 +94,12 @@ private: G4CoulombScatteringModel & operator=(const G4CoulombScatteringModel &right); G4CoulombScatteringModel(const G4CoulombScatteringModel&); - G4ParticleChangeForGamma* fParticleChange; - G4PhysicsTable* theCrossSectionTable; G4ParticleTable* theParticleTable; const G4NistManager* theMatManager; const G4ParticleDefinition* theProton; - G4double coeff; - G4double a0; - G4double cosThetaMin; - G4double cosThetaMax; - G4double lowMomentum; - G4double highMomentum; - G4double q2Limit; - - G4int nbins; - G4int nmax; - - G4bool buildTable; - G4bool isInitialised; }; -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -inline G4double G4CoulombScatteringModel::ComputeCrossSectionPerAtom( - const G4ParticleDefinition* p, - G4double kinEnergy, - G4double Z, G4double, - G4double, G4double) -{ - G4double x; - if(theCrossSectionTable) { - G4bool b; - G4double mass = p->GetPDGMass(); - G4double momentum2 = kinEnergy*(kinEnergy + 2.0*mass); - G4double e = kinEnergy + mass; - G4double beta2 = momentum2/(e*e); - x = (((*theCrossSectionTable)[G4int(Z)]))->GetValue(momentum2, b) - / (momentum2*beta2); - } else x = CalculateCrossSectionPerAtom(p, kinEnergy, Z); - return x; -} - //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... #endif diff --git a/source/processes/electromagnetic/standard/include/G4GammaConversion.hh b/source/processes/electromagnetic/standard/include/G4GammaConversion.hh index e7b8fe3a37..5bd59ed9a2 100644 --- a/source/processes/electromagnetic/standard/include/G4GammaConversion.hh +++ b/source/processes/electromagnetic/standard/include/G4GammaConversion.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4GammaConversion.hh,v 1.18 2006/06/29 19:50:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4GammaConversion.hh,v 1.20 2006/09/14 10:27:19 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // //------------------ G4GammaConversion physics process------------------------ @@ -49,6 +49,8 @@ // 09-11-04, Remove Retrieve tables (V.Ivantchenko) // 19-04-05, Redesign - use G4VEmProcess interface (V.Ivantchenko) // 04-05-05, Make class to be default (V.Ivanchenko) +// 09-08-06, add SetModel(G4VEmModel*) (mma) +// 12-09-06, move SetModel(G4VEmModel*) in G4VEmProcess (mma) // ----------------------------------------------------------------------------- // class description @@ -97,12 +99,8 @@ protected: const G4DynamicParticle*); private: - - // hide assignment operator as private - G4GammaConversion& operator=(const G4GammaConversion &right); - G4GammaConversion(const G4GammaConversion& ); - G4bool isInitialised; + G4bool isInitialised; }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/source/processes/electromagnetic/standard/include/G4GammaConversion52.hh b/source/processes/electromagnetic/standard/include/G4GammaConversion52.hh index 557a166227..7194a8a2eb 100644 --- a/source/processes/electromagnetic/standard/include/G4GammaConversion52.hh +++ b/source/processes/electromagnetic/standard/include/G4GammaConversion52.hh @@ -25,7 +25,7 @@ // // // $Id: G4GammaConversion52.hh,v 1.2 2006/06/29 19:50:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //------------------ G4GammaConversion52 physics process ------------------------- // by Michel Maire, 24 May 1996 diff --git a/source/processes/electromagnetic/standard/include/G4InitXscPAI.hh b/source/processes/electromagnetic/standard/include/G4InitXscPAI.hh index b508295415..94e0be993d 100644 --- a/source/processes/electromagnetic/standard/include/G4InitXscPAI.hh +++ b/source/processes/electromagnetic/standard/include/G4InitXscPAI.hh @@ -25,7 +25,7 @@ // // // $Id: G4InitXscPAI.hh,v 1.8 2006/06/29 19:50:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4InitXscPAI.hh -- header file diff --git a/source/processes/electromagnetic/standard/include/G4IonFluctuations.hh b/source/processes/electromagnetic/standard/include/G4IonFluctuations.hh index ef2987c84b..c8de8cf0ea 100644 --- a/source/processes/electromagnetic/standard/include/G4IonFluctuations.hh +++ b/source/processes/electromagnetic/standard/include/G4IonFluctuations.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4IonFluctuations.hh,v 1.2 2006/06/29 19:50:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/standard/include/G4KleinNishinaCompton.hh b/source/processes/electromagnetic/standard/include/G4KleinNishinaCompton.hh index d4761e75eb..8010eeeba7 100644 --- a/source/processes/electromagnetic/standard/include/G4KleinNishinaCompton.hh +++ b/source/processes/electromagnetic/standard/include/G4KleinNishinaCompton.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4KleinNishinaCompton.hh,v 1.7 2006/06/29 19:50:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4KleinNishinaCompton.hh,v 1.8 2006/08/28 17:44:36 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // @@ -82,16 +82,19 @@ public: G4double tmin, G4double maxEnergy); +protected: + + G4ParticleDefinition* theGamma; + G4ParticleDefinition* theElectron; + G4ParticleChangeForGamma* fParticleChange; + G4double lowestGammaEnergy; + private: // hide assignment operator G4KleinNishinaCompton & operator=(const G4KleinNishinaCompton &right); G4KleinNishinaCompton(const G4KleinNishinaCompton&); - G4ParticleDefinition* theGamma; - G4ParticleDefinition* theElectron; - G4ParticleChangeForGamma* fParticleChange; - G4double lowestGammaEnergy; }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/source/processes/electromagnetic/standard/include/G4MollerBhabhaModel.hh b/source/processes/electromagnetic/standard/include/G4MollerBhabhaModel.hh index 00bd133d45..c62e7631ed 100644 --- a/source/processes/electromagnetic/standard/include/G4MollerBhabhaModel.hh +++ b/source/processes/electromagnetic/standard/include/G4MollerBhabhaModel.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4MollerBhabhaModel.hh,v 1.16 2006/06/29 19:50:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4MollerBhabhaModel.hh,v 1.17 2006/08/28 17:44:36 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // @@ -110,6 +110,12 @@ protected: G4double MaxSecondaryEnergy(const G4ParticleDefinition*, G4double kinEnergy); + const G4ParticleDefinition* particle; + G4ParticleDefinition* theElectron; + G4ParticleChangeForLoss* fParticleChange; + + G4bool isElectron; + private: void SetParticle(const G4ParticleDefinition* p); @@ -118,12 +124,8 @@ private: G4MollerBhabhaModel & operator=(const G4MollerBhabhaModel &right); G4MollerBhabhaModel(const G4MollerBhabhaModel&); - const G4ParticleDefinition* particle; - G4ParticleDefinition* theElectron; - G4ParticleChangeForLoss* fParticleChange; G4double twoln10; G4double lowLimit; - G4bool isElectron; }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/source/processes/electromagnetic/standard/include/G4MscModel71.hh b/source/processes/electromagnetic/standard/include/G4MscModel71.hh index 54b643013e..4cefd1ebe4 100644 --- a/source/processes/electromagnetic/standard/include/G4MscModel71.hh +++ b/source/processes/electromagnetic/standard/include/G4MscModel71.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4MscModel71.hh,v 1.4 2006/06/29 19:50:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/standard/include/G4MultipleScattering.hh b/source/processes/electromagnetic/standard/include/G4MultipleScattering.hh index dc343a00a4..47dac186d9 100644 --- a/source/processes/electromagnetic/standard/include/G4MultipleScattering.hh +++ b/source/processes/electromagnetic/standard/include/G4MultipleScattering.hh @@ -23,12 +23,20 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4MultipleScattering.hh,v 1.29 2006/06/29 19:50:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4MultipleScattering.hh,v 1.32 2006/10/24 11:38:12 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // +// ----------------------------------------------------------------------------- // -//------------- G4MultipleScattering physics process ------------------------- -// by Laszlo Urban, March 2001 +// GEANT4 Class header file +// +// File name: G4MultipleScattering +// +// Author: Laszlo Urban +// +// Creation date: March 2001 +// +// Modifications: // // 07-08-01 new methods Store/Retrieve PhysicsTable // 23-08-01 new angle and z distribution,energy dependence reduced, @@ -66,11 +74,12 @@ // 19-01-07 tlimitmin = facrange*50*micrometer, i.e. it depends on the // value of facrange (L.Urban) // 16-02-06 set function for data member factail (L.Urban) +// 13-10-06 data member factail removed, new data member skin +// together with set function, data member tkinlimit +// changed to lambdalimit (L.Urban) // //------------------------------------------------------------------------------ // -// $Id: G4MultipleScattering.hh,v 1.29 2006/06/29 19:50:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ // class description // @@ -116,8 +125,8 @@ public: // with description // to reduce the energy/step dependence void Setdtrl(G4double value) { dtrl = value;}; - // 'soften' step limitation above Tkinlimit - void SetTkinlimit(G4double value) { tkinlimit = value;}; + // 'soften' step limitation above lambdalimit + void SetLambdalimit(G4double value) { lambdalimit = value;}; // Steplimit = facrange*max(range,lambda) void SetFacrange(G4double val) { facrange=val;}; @@ -125,8 +134,9 @@ public: // with description // connected with step size reduction due to geometry void SetFacgeom(G4double val) { facgeom=val;}; - // parameter governs the tail of the angular distribution - void SetFactail(G4double val) { factail=val;}; + // set msc parameter skin + // if skin <= 0 --> no single scattering at boundary + void SetSkin(G4double val) { skin=val;}; protected: @@ -141,11 +151,11 @@ private: // data members G4double highKineticEnergy; G4int totBins; - G4double tkinlimit; + G4double lambdalimit; G4double facrange; G4double facgeom; + G4double skin; G4double dtrl; - G4double factail; G4bool steppingAlgorithm; G4bool samplez; diff --git a/source/processes/electromagnetic/standard/include/G4MultipleScattering52.hh b/source/processes/electromagnetic/standard/include/G4MultipleScattering52.hh index ffc3f5b357..d17b27c875 100644 --- a/source/processes/electromagnetic/standard/include/G4MultipleScattering52.hh +++ b/source/processes/electromagnetic/standard/include/G4MultipleScattering52.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4MultipleScattering52.hh,v 1.3 2006/06/29 19:50:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //------------- G4MultipleScattering52 physics process -------------------------- // by Laszlo Urban, March 2001 diff --git a/source/processes/electromagnetic/standard/include/G4MultipleScattering52.icc b/source/processes/electromagnetic/standard/include/G4MultipleScattering52.icc index e6cc57505f..b535081b35 100644 --- a/source/processes/electromagnetic/standard/include/G4MultipleScattering52.icc +++ b/source/processes/electromagnetic/standard/include/G4MultipleScattering52.icc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4MultipleScattering52.icc,v 1.2 2006/06/29 19:50:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //------------ G4MultipleScattering52 physics process --------------------------- // by Laszlo Urban, March 2001 diff --git a/source/processes/electromagnetic/standard/include/G4MultipleScattering71.hh b/source/processes/electromagnetic/standard/include/G4MultipleScattering71.hh index 6f4f22f513..925af53eb3 100644 --- a/source/processes/electromagnetic/standard/include/G4MultipleScattering71.hh +++ b/source/processes/electromagnetic/standard/include/G4MultipleScattering71.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4MultipleScattering71.hh,v 1.4 2006/06/29 19:50:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //------------- G4MultipleScattering71 physics process -------------------------- @@ -58,7 +58,7 @@ //------------------------------------------------------------------------------ // // $Id: G4MultipleScattering71.hh,v 1.4 2006/06/29 19:50:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // class description // diff --git a/source/processes/electromagnetic/standard/include/G4PAIModel.hh b/source/processes/electromagnetic/standard/include/G4PAIModel.hh index 9f65fc2d0c..81beafe95a 100644 --- a/source/processes/electromagnetic/standard/include/G4PAIModel.hh +++ b/source/processes/electromagnetic/standard/include/G4PAIModel.hh @@ -104,7 +104,7 @@ public: void DefineForRegion(const G4Region* r) ; void ComputeSandiaPhotoAbsCof(); - void BuildPAIonisationTable(); + void BuildPAIonisationTable(const G4ParticleDefinition*); void BuildLambdaVector(const G4MaterialCutsCouple* matCutsCouple); G4double GetdNdxCut( G4int iPlace, G4double transferCut); G4double GetdEdxCut( G4int iPlace, G4double transferCut); @@ -132,11 +132,13 @@ private: // The vector over proton kinetic energies: the range of gammas G4int fVerbose; + G4double fLowestGamma; + G4double fHighestGamma; G4double fLowestKineticEnergy; G4double fHighestKineticEnergy; G4int fTotBin; G4int fMeanNumber; - G4PhysicsLogVector* fProtonEnergyVector ; + G4PhysicsLogVector* fParticleEnergyVector ; diff --git a/source/processes/electromagnetic/standard/include/G4PAIxSection.hh b/source/processes/electromagnetic/standard/include/G4PAIxSection.hh index 3837c99668..2b1760ed58 100644 --- a/source/processes/electromagnetic/standard/include/G4PAIxSection.hh +++ b/source/processes/electromagnetic/standard/include/G4PAIxSection.hh @@ -25,7 +25,7 @@ // // // $Id: G4PAIxSection.hh,v 1.12 2006/06/29 19:50:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4PAIxSection.hh -- header file diff --git a/source/processes/electromagnetic/standard/include/G4PEEffectModel.hh b/source/processes/electromagnetic/standard/include/G4PEEffectModel.hh index a255a100cc..228633a3aa 100644 --- a/source/processes/electromagnetic/standard/include/G4PEEffectModel.hh +++ b/source/processes/electromagnetic/standard/include/G4PEEffectModel.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4PEEffectModel.hh,v 1.5 2006/06/29 19:50:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/standard/include/G4PSTARStopping.hh b/source/processes/electromagnetic/standard/include/G4PSTARStopping.hh index 6c5d5962e0..5aa21343a4 100644 --- a/source/processes/electromagnetic/standard/include/G4PSTARStopping.hh +++ b/source/processes/electromagnetic/standard/include/G4PSTARStopping.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4PSTARStopping.hh,v 1.4 2006/06/29 19:50:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4PSTARStopping_h #define G4PSTARStopping_h 1 diff --git a/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.hh b/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.hh index 14c9b1292b..e86e1741c7 100644 --- a/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.hh +++ b/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4PhotoElectricEffect.hh,v 1.20 2006/06/29 19:50:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4PhotoElectricEffect.hh,v 1.22 2006/09/14 10:27:19 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // //------------------ G4PhotoElectricEffect physics process ------------------ @@ -55,6 +55,8 @@ // 21-04-05, Redesign - use G4VEmProcess interface (V.Ivanchenko) // 02-05-05, move ParticleChange actions in model (mma) // 04-05-05, Make class to be default (V.Ivanchenko) +// 09-08-06, add SetModel(G4VEmModel*) (mma) +// 12-09-06, move SetModel(G4VEmModel*) in G4VEmProcess (mma) // ----------------------------------------------------------------------------- // class description @@ -104,20 +106,22 @@ protected: private: - G4bool isInitialised; + G4bool isInitialised; }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... -inline G4bool G4PhotoElectricEffect::IsApplicable(const G4ParticleDefinition& p) +inline +G4bool G4PhotoElectricEffect::IsApplicable(const G4ParticleDefinition& p) { return (&p == G4Gamma::Gamma()); } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... -inline std::vector* G4PhotoElectricEffect::SecondariesPostStep( +inline +std::vector* G4PhotoElectricEffect::SecondariesPostStep( G4VEmModel* model, const G4MaterialCutsCouple* couple, const G4DynamicParticle* dp) diff --git a/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect52.hh b/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect52.hh index 99108273b0..afb3572c61 100644 --- a/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect52.hh +++ b/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect52.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4PhotoElectricEffect52.hh,v 1.2 2006/06/29 19:50:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... // diff --git a/source/processes/electromagnetic/standard/include/G4PolarizedComptonScattering.hh b/source/processes/electromagnetic/standard/include/G4PolarizedComptonScattering.hh index 83c54b2766..41e3d1e568 100644 --- a/source/processes/electromagnetic/standard/include/G4PolarizedComptonScattering.hh +++ b/source/processes/electromagnetic/standard/include/G4PolarizedComptonScattering.hh @@ -25,7 +25,7 @@ // // // $Id: G4PolarizedComptonScattering.hh,v 1.9 2006/06/29 19:51:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // --------- G4PolarizedComptonScattering physics process ---------------------- // by Vicente Lara, March 1998 diff --git a/source/processes/electromagnetic/standard/include/G4UniversalFluctuation.hh b/source/processes/electromagnetic/standard/include/G4UniversalFluctuation.hh index fdeb16b8ec..f96d7ea75b 100644 --- a/source/processes/electromagnetic/standard/include/G4UniversalFluctuation.hh +++ b/source/processes/electromagnetic/standard/include/G4UniversalFluctuation.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4UniversalFluctuation.hh,v 1.3 2006/06/29 19:51:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/standard/include/G4UrbanMscModel.hh b/source/processes/electromagnetic/standard/include/G4UrbanMscModel.hh index e47678d45f..7cb2032b3a 100644 --- a/source/processes/electromagnetic/standard/include/G4UrbanMscModel.hh +++ b/source/processes/electromagnetic/standard/include/G4UrbanMscModel.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4UrbanMscModel.hh,v 1.8 2006/06/29 19:51:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4UrbanMscModel.hh,v 1.15 2006/11/20 06:57:57 urban Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // @@ -62,8 +62,16 @@ // 11-05-06 name of data member safety changed to presafety, some new data // members added (frscaling1,frscaling2,tlimitminfix,nstepmax) // (L.Urban) +// 13-10-06 data member factail removed, data member tkinlimit changed +// to lambdalimit, +// new data members tgeom,tnow,skin,skindepth,Zeff,geomlimit +// G4double GeomLimit(const G4Track& track) changed to +// void GeomLimit(const G4Track& track) (L.Urban) +// 20-10-06 parameter theta0 now computed in the (public) +// function ComputeTheta0, +// single scattering modified allowing not small +// angles as well (L.Urban) // - // // Class Description: // @@ -80,6 +88,7 @@ #include "G4VEmModel.hh" #include "G4PhysicsTable.hh" +#include "G4SafetyHelper.hh" class G4ParticleChangeForMSC; class G4Navigator; @@ -92,8 +101,8 @@ class G4UrbanMscModel : public G4VEmModel public: - G4UrbanMscModel(G4double facrange, G4double dtrl, G4double tkinlimit, - G4double facgeom, G4double factail, + G4UrbanMscModel(G4double facrange, G4double dtrl, G4double lambdalimit, + G4double facgeom,G4double skin, G4bool samplez, G4bool stepAlg, const G4String& nam = "UrbanMscUni"); @@ -124,6 +133,9 @@ public: virtual G4double ComputeTrueStepLength(G4double geomStepLength); + G4double ComputeTheta0(G4double truePathLength, + G4double KineticEnergy); + void SetLateralDisplasmentFlag(G4bool val); void SetMscStepLimitation(G4bool, G4double); @@ -138,7 +150,7 @@ private: G4double GetLambda(G4double kinEnergy); - G4double GeomLimit(const G4Track& track); + void GeomLimit(const G4Track& track); void SetParticle(const G4ParticleDefinition* p); @@ -149,6 +161,7 @@ private: const G4ParticleDefinition* particle; G4ParticleChangeForMSC* fParticleChange; G4Navigator* navigator; + G4SafetyHelper* safetyHelper; G4PhysicsTable* theLambdaTable; const G4MaterialCutsCouple* couple; G4LossTableManager* theManager; @@ -161,19 +174,22 @@ private: G4double taulim; G4double currentTau; G4double dtrl; - G4double factail ; - G4double Tkinlimit; - G4double Tlimit; + G4double lambdalimit; + G4double llimit; G4double facrange; G4double frscaling1,frscaling2; G4double tlimit; G4double tlimitmin; G4double tlimitminfix; + G4double tnow; G4double nstepmax; + G4double tgeom; G4double geombig; G4double geommin; + G4double geomlimit; G4double facgeom; + G4double skin,skindepth,skindepth1; G4double presafety; G4double facsafety; @@ -190,6 +206,8 @@ private: G4double currentRange; G4double currentRadLength; + G4double Zeff; + G4int currentMaterialIndex; G4bool samplez; @@ -197,6 +215,7 @@ private: G4bool steppingAlgorithm; G4bool isInitialized; + G4bool inside; }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -243,7 +262,7 @@ void G4UrbanMscModel::SetParticle(const G4ParticleDefinition* p) particle = p; mass = p->GetPDGMass(); charge = p->GetPDGCharge()/eplus; - Tlimit = Tkinlimit*electron_mass_c2/mass; + llimit = lambdalimit; } } diff --git a/source/processes/electromagnetic/standard/include/G4VeEnergyLoss.hh b/source/processes/electromagnetic/standard/include/G4VeEnergyLoss.hh index dc7a6b3071..79dff5efb6 100644 --- a/source/processes/electromagnetic/standard/include/G4VeEnergyLoss.hh +++ b/source/processes/electromagnetic/standard/include/G4VeEnergyLoss.hh @@ -25,7 +25,7 @@ // // // $Id: G4VeEnergyLoss.hh,v 1.14 2006/06/29 19:51:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ----------------------------------------------------------------------------- diff --git a/source/processes/electromagnetic/standard/include/G4VeEnergyLoss.icc b/source/processes/electromagnetic/standard/include/G4VeEnergyLoss.icc index 4f49b88410..a1f5a47557 100644 --- a/source/processes/electromagnetic/standard/include/G4VeEnergyLoss.icc +++ b/source/processes/electromagnetic/standard/include/G4VeEnergyLoss.icc @@ -25,7 +25,7 @@ // // // $Id: G4VeEnergyLoss.icc,v 1.14 2006/06/29 19:51:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... // diff --git a/source/processes/electromagnetic/standard/include/G4VhEnergyLoss.hh b/source/processes/electromagnetic/standard/include/G4VhEnergyLoss.hh index 0c8fd2ac6e..b8deb28f6b 100644 --- a/source/processes/electromagnetic/standard/include/G4VhEnergyLoss.hh +++ b/source/processes/electromagnetic/standard/include/G4VhEnergyLoss.hh @@ -25,7 +25,7 @@ // // // $Id: G4VhEnergyLoss.hh,v 1.19 2006/06/29 19:51:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------- G4VhEnergyLoss physics process -------------------------------- // by Laszlo Urban, 30 May 1997 diff --git a/source/processes/electromagnetic/standard/include/G4VhEnergyLoss.icc b/source/processes/electromagnetic/standard/include/G4VhEnergyLoss.icc index 9b31c481f8..d316232474 100644 --- a/source/processes/electromagnetic/standard/include/G4VhEnergyLoss.icc +++ b/source/processes/electromagnetic/standard/include/G4VhEnergyLoss.icc @@ -25,7 +25,7 @@ // // // $Id: G4VhEnergyLoss.icc,v 1.7 2006/06/29 19:51:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------- G4VhEnergyLoss physics process ----------------------------- diff --git a/source/processes/electromagnetic/standard/include/G4WaterStopping.hh b/source/processes/electromagnetic/standard/include/G4WaterStopping.hh index f07d10b84f..82f95eb39a 100644 --- a/source/processes/electromagnetic/standard/include/G4WaterStopping.hh +++ b/source/processes/electromagnetic/standard/include/G4WaterStopping.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4WaterStopping.hh,v 1.2 2006/06/29 19:51:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifndef G4WaterStopping_h #define G4WaterStopping_h 1 diff --git a/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.hh b/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.hh index d867214fb0..3a7487ffe8 100644 --- a/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.hh +++ b/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4eBremsstrahlung.hh,v 1.33 2006/06/29 19:51:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4eBremsstrahlung.hh,v 1.34 2006/08/28 17:44:36 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // @@ -108,16 +108,16 @@ protected: virtual void InitialiseEnergyLossProcess(const G4ParticleDefinition*, const G4ParticleDefinition*); + const G4ParticleDefinition* particle; + G4double gammaThreshold; + G4bool isInitialised; + private: // hide assignment operator G4eBremsstrahlung & operator=(const G4eBremsstrahlung &right); G4eBremsstrahlung(const G4eBremsstrahlung&); - const G4ParticleDefinition* particle; - G4double gammaThreshold; - G4bool isInitialised; - }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/source/processes/electromagnetic/standard/include/G4eBremsstrahlung52.hh b/source/processes/electromagnetic/standard/include/G4eBremsstrahlung52.hh index 78e0e80c16..58df8506f3 100644 --- a/source/processes/electromagnetic/standard/include/G4eBremsstrahlung52.hh +++ b/source/processes/electromagnetic/standard/include/G4eBremsstrahlung52.hh @@ -25,7 +25,7 @@ // // // $Id: G4eBremsstrahlung52.hh,v 1.4 2006/06/29 19:52:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------ G4eBremsstrahlung5252 physics process ------ diff --git a/source/processes/electromagnetic/standard/include/G4eBremsstrahlung52.icc b/source/processes/electromagnetic/standard/include/G4eBremsstrahlung52.icc index 7341c86080..69dc74db29 100644 --- a/source/processes/electromagnetic/standard/include/G4eBremsstrahlung52.icc +++ b/source/processes/electromagnetic/standard/include/G4eBremsstrahlung52.icc @@ -25,7 +25,7 @@ // // // $Id: G4eBremsstrahlung52.icc,v 1.3 2006/06/29 19:52:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------ G4eBremsstrahlung52 physics process --------- // by Michel Maire, 27 July 1996 diff --git a/source/processes/electromagnetic/standard/include/G4eBremsstrahlungModel.hh b/source/processes/electromagnetic/standard/include/G4eBremsstrahlungModel.hh index 4c10101478..c852f780d5 100644 --- a/source/processes/electromagnetic/standard/include/G4eBremsstrahlungModel.hh +++ b/source/processes/electromagnetic/standard/include/G4eBremsstrahlungModel.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4eBremsstrahlungModel.hh,v 1.18 2006/06/29 19:52:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4eBremsstrahlungModel.hh,v 1.20 2006/08/29 14:00:24 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // @@ -108,6 +108,8 @@ protected: G4double MaxSecondaryEnergy(const G4ParticleDefinition*, G4double kineticEnergy); + const G4Element* SelectRandomAtom(const G4MaterialCutsCouple* couple); + private: void SetParticle(const G4ParticleDefinition* p); @@ -121,8 +123,6 @@ private: G4DataVector* ComputePartialSumSigma(const G4Material* material, G4double tkin, G4double cut); - const G4Element* SelectRandomAtom(const G4MaterialCutsCouple* couple) const; - G4double SupressionFunction(const G4Material* material, G4double tkin, G4double gammaEnergy); @@ -134,16 +134,22 @@ private: G4eBremsstrahlungModel & operator=(const G4eBremsstrahlungModel &right); G4eBremsstrahlungModel(const G4eBremsstrahlungModel&); +protected: + const G4ParticleDefinition* particle; G4ParticleDefinition* theGamma; G4ParticleChangeForLoss* fParticleChange; + + G4double minThreshold; + G4bool isElectron; + +private: + G4double highKinEnergy; G4double lowKinEnergy; - G4double minThreshold; G4double probsup; G4double MigdalConstant; G4double LPMconstant; - G4bool isElectron; G4bool theLPMflag; std::vector partialSumSigma; diff --git a/source/processes/electromagnetic/standard/include/G4eCoulombScatteringModel.hh b/source/processes/electromagnetic/standard/include/G4eCoulombScatteringModel.hh index 065324ad83..94cc53bcee 100644 --- a/source/processes/electromagnetic/standard/include/G4eCoulombScatteringModel.hh +++ b/source/processes/electromagnetic/standard/include/G4eCoulombScatteringModel.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4eCoulombScatteringModel.hh,v 1.2 2006/06/29 19:52:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4eCoulombScatteringModel.hh,v 1.5 2006/10/19 09:44:27 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // @@ -38,12 +38,20 @@ // Creation date: 19.02.2006 // // Modifications: +// 01.08.06 V.Ivanchenko extend upper limit of table to TeV and review the +// logic of building - only elements from G4ElementTable +// 08.08.06 V.Ivanchenko build internal table in ekin scale, introduce faclim +// 19.08.06 V.Ivanchenko add inline function ScreeningParameter and +// make some members protected // // Class Description: // // Implementation of eCoulombScattering of pointlike charge particle // on Atomic Nucleus for interval of scattering anles in Lab system -// thetaMin - ThetaMax, nucleus recoil is neglected +// thetaMin - ThetaMax, nucleus recoil is neglected. +// The model based on analysis of J.M.Fernandez-Varea et al. +// NIM B73(1993)447 originated from G.Wentzel Z.Phys. 40(1927)590 with +// screening parameter from H.A.Bethe Phys. Rev. 89 (1953) 1256. // // ------------------------------------------------------------------- @@ -54,6 +62,7 @@ #include "G4VEmModel.hh" #include "G4PhysicsTable.hh" +#include "globals.hh" class G4ParticleChangeForGamma; @@ -84,6 +93,11 @@ public: G4double tmin, G4double maxEnergy); +protected: + + G4double ScreeningParameter(G4double Z, G4double q2, + G4double mom2, G4double invbeta2); + private: G4double CalculateCrossSectionPerAtom(const G4ParticleDefinition*, @@ -94,19 +108,29 @@ private: G4eCoulombScatteringModel & operator=(const G4eCoulombScatteringModel &right); G4eCoulombScatteringModel(const G4eCoulombScatteringModel&); +protected: + G4ParticleChangeForGamma* fParticleChange; - G4PhysicsTable* theCrossSectionTable; G4double coeff; - G4double a0; G4double cosThetaMin; G4double cosThetaMax; - G4double lowMomentum; - G4double highMomentum; G4double q2Limit; + +private: + + G4PhysicsTable* theCrossSectionTable; + + G4double a0; + G4double lowKEnergy; + G4double highKEnergy; + G4double alpha2; + G4double faclim; + G4int nbins; G4int nmax; + G4int index[100]; G4bool buildTable; G4bool isInitialised; @@ -115,24 +139,33 @@ private: //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... inline G4double G4eCoulombScatteringModel::ComputeCrossSectionPerAtom( - const G4ParticleDefinition* p, - G4double kinEnergy, - G4double Z, G4double, - G4double, G4double) + const G4ParticleDefinition* p, + G4double kinEnergy, + G4double Z, G4double, + G4double, G4double) { G4double x; + G4bool b; if(theCrossSectionTable) { - G4bool b; - G4double mass = p->GetPDGMass(); - G4double momentum2 = kinEnergy*(kinEnergy + 2.0*mass); - G4double e = kinEnergy + mass; - G4double beta2 = momentum2/(e*e); - x = (((*theCrossSectionTable)[G4int(Z)]))->GetValue(momentum2, b) - / (momentum2*beta2); + x = std::exp((((*theCrossSectionTable)[index[G4int(Z)]])) + ->GetValue(kinEnergy, b)); } else x = CalculateCrossSectionPerAtom(p, kinEnergy, Z); + + // G4cout << "G4eCoulombScatteringModel: e= " << kinEnergy + // << " cs= " << x << G4endl; return x; } +inline G4double G4eCoulombScatteringModel::ScreeningParameter( + G4double Z, + G4double q2, + G4double mom2, + G4double invbeta2) +{ + G4double a = invbeta2*Z*Z*q2*alpha2; + return std::pow(Z,0.6666667)*a0*(1.13 + 3.76*a)/mom2; +} + //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... #endif diff --git a/source/processes/electromagnetic/standard/include/G4eIonisation.hh b/source/processes/electromagnetic/standard/include/G4eIonisation.hh index 3bfa2ec2db..3a8729315d 100644 --- a/source/processes/electromagnetic/standard/include/G4eIonisation.hh +++ b/source/processes/electromagnetic/standard/include/G4eIonisation.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4eIonisation.hh,v 1.32 2006/06/29 19:52:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/standard/include/G4eIonisation52.hh b/source/processes/electromagnetic/standard/include/G4eIonisation52.hh index 52feb5d830..ac794c0022 100644 --- a/source/processes/electromagnetic/standard/include/G4eIonisation52.hh +++ b/source/processes/electromagnetic/standard/include/G4eIonisation52.hh @@ -25,7 +25,7 @@ // // // $Id: G4eIonisation52.hh,v 1.4 2006/06/29 19:52:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------- G4eIonisation52 physics process -------------------------------- // by Laszlo Urban, 20 March 1997 diff --git a/source/processes/electromagnetic/standard/include/G4eIonisation52.icc b/source/processes/electromagnetic/standard/include/G4eIonisation52.icc index 6670837ee0..e5f086e44a 100644 --- a/source/processes/electromagnetic/standard/include/G4eIonisation52.icc +++ b/source/processes/electromagnetic/standard/include/G4eIonisation52.icc @@ -25,7 +25,7 @@ // // // $Id: G4eIonisation52.icc,v 1.2 2006/06/29 19:52:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //----------------- G4eIonisation52 physics process ------------------------------ diff --git a/source/processes/electromagnetic/standard/include/G4eeToTwoGammaModel.hh b/source/processes/electromagnetic/standard/include/G4eeToTwoGammaModel.hh index eef640c3a9..c3ea8d569f 100644 --- a/source/processes/electromagnetic/standard/include/G4eeToTwoGammaModel.hh +++ b/source/processes/electromagnetic/standard/include/G4eeToTwoGammaModel.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4eeToTwoGammaModel.hh,v 1.11 2006/06/29 19:52:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4eeToTwoGammaModel.hh,v 1.12 2006/10/20 08:59:50 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // @@ -38,11 +38,11 @@ // Creation date: 02.08.2004 // // Modifications: -// 08-04-05 Major optimisation of internal interfaces (V.Ivantchenko) -// 18-04-05 Compute CrossSectionPerVolume (V.Ivantchenko) +// 08-04-05 Major optimisation of internal interfaces (V.Ivanchenko) +// 18-04-05 Compute CrossSectionPerVolume (V.Ivanchenko) // 06-02-06 ComputeCrossSectionPerElectron, ComputeCrossSectionPerAtom (mma) +// 20-10-06 Add theGamma as a member (V.Ivanchenko) // - // // Class Description: // @@ -101,6 +101,7 @@ private: G4eeToTwoGammaModel(const G4eeToTwoGammaModel&); G4double pi_rcl2; + G4ParticleDefinition* theGamma; }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.hh b/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.hh index 5f5e16cd73..a532b0a7ea 100644 --- a/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.hh +++ b/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4eplusAnnihilation.hh,v 1.19 2006/06/29 19:52:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4eplusAnnihilation.hh,v 1.21 2006/09/14 10:27:19 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // @@ -39,10 +39,13 @@ // // Modifications: // 08-11-04 Migration to new interface of Store/Retrieve tables (V.Ivanchenko) -// 15-03-05 Update interface according to changings in G4VEmProcess (V.Ivanchenko) +// 15-03-05 Update interface according to changings +// in G4VEmProcess (V.Ivanchenko) // 08-04-05 Major optimisation of internal interfaces (V.Ivanchenko) // 04-05-05 Make class to be default (V.Ivanchenko) // 04-12-05 SetProposedKineticEnergy(0.) for annihilated positron (mma) +// 09-08-06 add SetModel(G4VEmModel*) (mma) +// 12-09-06, move SetModel(G4VEmModel*) in G4VEmProcess (mma) // // // Class Description: @@ -69,7 +72,7 @@ public: virtual ~G4eplusAnnihilation(); - virtual G4bool IsApplicable(const G4ParticleDefinition& p); + G4bool IsApplicable(const G4ParticleDefinition& p); virtual G4VParticleChange* AtRestDoIt( const G4Track& track, @@ -93,13 +96,8 @@ protected: const G4DynamicParticle*); private: - - // hide assignment operator - G4eplusAnnihilation & operator=(const G4eplusAnnihilation &right); - G4eplusAnnihilation(const G4eplusAnnihilation&); - G4bool isInitialised; - + G4bool isInitialised; }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... @@ -112,7 +110,8 @@ inline G4bool G4eplusAnnihilation::IsApplicable(const G4ParticleDefinition& p) //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... -inline G4double G4eplusAnnihilation::AtRestGetPhysicalInteractionLength( +inline +G4double G4eplusAnnihilation::AtRestGetPhysicalInteractionLength( const G4Track&, G4ForceCondition* condition) { *condition = NotForced; @@ -121,7 +120,8 @@ inline G4double G4eplusAnnihilation::AtRestGetPhysicalInteractionLength( //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... -inline std::vector* G4eplusAnnihilation::SecondariesPostStep( +inline +std::vector* G4eplusAnnihilation::SecondariesPostStep( G4VEmModel* model, const G4MaterialCutsCouple* couple, const G4DynamicParticle* dp) diff --git a/source/processes/electromagnetic/standard/include/G4eplusAnnihilation52.hh b/source/processes/electromagnetic/standard/include/G4eplusAnnihilation52.hh index 8ccc41500d..b4f5b99835 100644 --- a/source/processes/electromagnetic/standard/include/G4eplusAnnihilation52.hh +++ b/source/processes/electromagnetic/standard/include/G4eplusAnnihilation52.hh @@ -25,7 +25,7 @@ // // // $Id: G4eplusAnnihilation52.hh,v 1.2 2006/06/29 19:52:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/source/processes/electromagnetic/standard/include/G4hIonisation.hh b/source/processes/electromagnetic/standard/include/G4hIonisation.hh index 3a328a207e..f37309d452 100644 --- a/source/processes/electromagnetic/standard/include/G4hIonisation.hh +++ b/source/processes/electromagnetic/standard/include/G4hIonisation.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4hIonisation.hh,v 1.34 2006/06/29 19:52:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/standard/include/G4hIonisation52.hh b/source/processes/electromagnetic/standard/include/G4hIonisation52.hh index 3b3235b16a..96b0acd0a5 100644 --- a/source/processes/electromagnetic/standard/include/G4hIonisation52.hh +++ b/source/processes/electromagnetic/standard/include/G4hIonisation52.hh @@ -25,7 +25,7 @@ // // // $Id: G4hIonisation52.hh,v 1.4 2006/06/29 19:52:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // --------------- G4hIonisation52 physics process ------------------------------- // by Laszlo Urban, 30 May 1997 diff --git a/source/processes/electromagnetic/standard/include/G4hIonisation52.icc b/source/processes/electromagnetic/standard/include/G4hIonisation52.icc index 77a2a601bb..1f330e9dea 100644 --- a/source/processes/electromagnetic/standard/include/G4hIonisation52.icc +++ b/source/processes/electromagnetic/standard/include/G4hIonisation52.icc @@ -25,7 +25,7 @@ // // // $Id: G4hIonisation52.icc,v 1.2 2006/06/29 19:52:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //------------------ G4hIonisation52 physics process ----------------------------- diff --git a/source/processes/electromagnetic/standard/include/G4hMultipleScattering.hh b/source/processes/electromagnetic/standard/include/G4hMultipleScattering.hh new file mode 100644 index 0000000000..8d8309c04d --- /dev/null +++ b/source/processes/electromagnetic/standard/include/G4hMultipleScattering.hh @@ -0,0 +1,128 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4hMultipleScattering.hh,v 1.1 2006/10/26 11:04:38 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ----------------------------------------------------------------------------- +// +// GEANT4 Class header file +// +// File name: G4hMultipleScattering +// +// Author: Laszlo Urban +// +// Creation date: 24.10.2006 cloned from G4MultipleScattering +// +// Modifications: +// +// +//------------------------------------------------------------------------------ + +// class description +// +// The class simulates the multiple scattering for any kind +// of charged particle. +// +// class description - end + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#ifndef G4hMultipleScattering_h +#define G4hMultipleScattering_h 1 + +#include "G4VMultipleScattering.hh" + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +class G4UrbanMscModel; + +class G4hMultipleScattering : public G4VMultipleScattering + +{ +public: // with description + + G4hMultipleScattering(const G4String& processName="msc"); + + virtual ~G4hMultipleScattering(); + + // returns true for charged particles, false otherwise + G4bool IsApplicable (const G4ParticleDefinition& p); + + // Print few lines of informations about the process: validity range, + void PrintInfo(); + + // set boolean flag steppingAlgorithm + // ( true/false : standard or 7.1 style process) + void MscStepLimitation(G4bool algorithm, G4double factor = -1.); + + // geom. step length distribution should be sampled or not + void Setsamplez(G4bool value) { samplez = value;}; + + // to reduce the energy/step dependence + void Setdtrl(G4double value) { dtrl = value;}; + + // 'soften' step limitation above lambdalimit + void SetLambdalimit(G4double value) { lambdalimit = value;}; + + // Steplimit = facrange*max(range,lambda) + void SetFacrange(G4double val) { facrange=val;}; + + // connected with step size reduction due to geometry + void SetFacgeom(G4double val) { facgeom=val;}; + + // set msc parameter skin + // if skin <= 0 --> no single scattering at boundary + void SetSkin(G4double val) { skin=val;}; + +protected: + + // This function initialise models + void InitialiseProcess(const G4ParticleDefinition*); + +private: // data members + + G4UrbanMscModel* mscUrban; + + G4double lowKineticEnergy; + G4double highKineticEnergy; + G4int totBins; + + G4double lambdalimit; + G4double facrange; + G4double facgeom; + G4double skin; + G4double dtrl; + + G4bool steppingAlgorithm; + G4bool samplez; + G4bool isInitialized; + +}; + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#endif diff --git a/source/processes/electromagnetic/standard/include/G4ionIonisation.hh b/source/processes/electromagnetic/standard/include/G4ionIonisation.hh index 5f5316ba8c..df0da02117 100644 --- a/source/processes/electromagnetic/standard/include/G4ionIonisation.hh +++ b/source/processes/electromagnetic/standard/include/G4ionIonisation.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4ionIonisation.hh,v 1.41 2006/06/29 19:52:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/standard/src/G4ASTARStopping.cc b/source/processes/electromagnetic/standard/src/G4ASTARStopping.cc index 02854ba628..0553a5da6b 100644 --- a/source/processes/electromagnetic/standard/src/G4ASTARStopping.cc +++ b/source/processes/electromagnetic/standard/src/G4ASTARStopping.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4ASTARStopping.cc,v 1.6 2006/06/29 19:52:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ //--------------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/standard/src/G4BetheBlochModel.cc b/source/processes/electromagnetic/standard/src/G4BetheBlochModel.cc index d0d0c3d2df..3e3a82b4e9 100644 --- a/source/processes/electromagnetic/standard/src/G4BetheBlochModel.cc +++ b/source/processes/electromagnetic/standard/src/G4BetheBlochModel.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4BetheBlochModel.cc,v 1.11 2006/06/29 19:52:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4BetheBlochModel.cc,v 1.12 2006/08/29 20:21:34 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // @@ -270,7 +270,21 @@ vector* G4BetheBlochModel::SampleSecondaries( sqrt(deltaKinEnergy * (deltaKinEnergy + 2.0*electron_mass_c2)); G4double cost = deltaKinEnergy * (totEnergy + electron_mass_c2) / (deltaMomentum * totMomentum); - G4double sint = sqrt(1.0 - cost*cost); + if(cost > 1.0) { + G4cout << "### G4BetheBlochModel WARNING: cost= " + << cost << " > 1 for " + << dp->GetDefinition()->GetParticleName() + << " Ekin(MeV)= " << kineticEnergy + << " p(MeV/c)= " << totMomentum + << " delEkin(MeV)= " << deltaKinEnergy + << " delMom(MeV/c)= " << deltaMomentum + << " tmin(MeV)= " << minKinEnergy + << " tmax(MeV)= " << maxKinEnergy + << " dir= " << dp->GetMomentumDirection() + << G4endl; + cost = 1.0; + } + G4double sint = sqrt((1.0 - cost)*(1.0 + cost)); G4double phi = twopi * G4UniformRand() ; diff --git a/source/processes/electromagnetic/standard/src/G4BetheHeitlerModel.cc b/source/processes/electromagnetic/standard/src/G4BetheHeitlerModel.cc index 4c8dd69fd7..cb973e882f 100644 --- a/source/processes/electromagnetic/standard/src/G4BetheHeitlerModel.cc +++ b/source/processes/electromagnetic/standard/src/G4BetheHeitlerModel.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4BetheHeitlerModel.cc,v 1.9 2006/06/29 19:52:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/standard/src/G4BohrFluctuations.cc b/source/processes/electromagnetic/standard/src/G4BohrFluctuations.cc index 14d71117a6..0b63e3cc97 100644 --- a/source/processes/electromagnetic/standard/src/G4BohrFluctuations.cc +++ b/source/processes/electromagnetic/standard/src/G4BohrFluctuations.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4BohrFluctuations.cc,v 1.4 2006/06/29 19:52:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/standard/src/G4BraggIonModel.cc b/source/processes/electromagnetic/standard/src/G4BraggIonModel.cc index 38a77e4580..8e7e69caa2 100644 --- a/source/processes/electromagnetic/standard/src/G4BraggIonModel.cc +++ b/source/processes/electromagnetic/standard/src/G4BraggIonModel.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4BraggIonModel.cc,v 1.14 2006/06/29 19:52:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4BraggIonModel.cc,v 1.15 2006/10/23 18:57:19 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // @@ -42,6 +42,7 @@ // 29-11-05 Do not use G4Alpha class (V.Ivantchenko) // 15-02-06 ComputeCrossSectionPerElectron, ComputeCrossSectionPerAtom (mma) // 25-04-06 Add stopping data from ASTAR (V.Ivanchenko) +// 23-10-06 Reduce lowestKinEnergy to 0.25 keV (V.Ivanchenko) // // Class Description: @@ -75,9 +76,9 @@ G4BraggIonModel::G4BraggIonModel(const G4ParticleDefinition* p, if(p) SetParticle(p); highKinEnergy = 2.0*MeV; lowKinEnergy = 0.0*MeV; - lowestKinEnergy = 1.0*keV; HeMass = 3.727417*GeV; rateMassHe2p = HeMass/proton_mass_c2; + lowestKinEnergy = 1.0*keV/rateMassHe2p; massFactor = 1000.*amu_c2/HeMass; theZieglerFactor = eV*cm2*1.0e-15; theElectron = G4Electron::Electron(); @@ -582,7 +583,7 @@ G4double G4BraggIonModel::HeEffChargeSquare(G4double z, static G4double c[6] = {0.2865, 0.1266, -0.001429, 0.02402,-0.01135, 0.001475}; - G4double e = log( max( 1.0, kinEnergyHeInMeV*massFactor)) ; + G4double e = std::max(0.0,std::log(kinEnergyHeInMeV*massFactor)); G4double x = c[0] ; G4double y = 1.0 ; for (G4int i=1; i<6; i++) { diff --git a/source/processes/electromagnetic/standard/src/G4BraggModel.cc b/source/processes/electromagnetic/standard/src/G4BraggModel.cc index ad52cf9fb1..9932cdc0bc 100644 --- a/source/processes/electromagnetic/standard/src/G4BraggModel.cc +++ b/source/processes/electromagnetic/standard/src/G4BraggModel.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4BraggModel.cc,v 1.14 2006/06/29 19:52:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/standard/src/G4ComptonScattering.cc b/source/processes/electromagnetic/standard/src/G4ComptonScattering.cc index 62f9be4402..06ecddcf88 100644 --- a/source/processes/electromagnetic/standard/src/G4ComptonScattering.cc +++ b/source/processes/electromagnetic/standard/src/G4ComptonScattering.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4ComptonScattering.cc,v 1.25 2006/06/29 19:52:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ComptonScattering.cc,v 1.27 2006/09/14 10:27:19 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // //------------ G4ComptonScattering physics process ----------------------------- @@ -53,8 +53,12 @@ // 26-05-04, cross section parametrization improved for low energy : // Egamma <~ 15 keV (Laszlo) // 08-11-04, Remove Store/Retrieve tables (V.Ivanchenko) -// 09-03-05 Migrate to model interface and inherit from G4VEmProcess (V.Ivanchenko) +// 09-03-05 Migrate to model interface +// and inherit from G4VEmProcess (V.Ivanchenko) // 04-05-05, Make class to be default (V.Ivanchenko) +// 09-09-06, modify SetModel(G4VEmModel*) (mma) +// 12-09-06, move SetModel(G4VEmModel*) in G4VEmProcess (mma) +// // ----------------------------------------------------------------------------- #include "G4ComptonScattering.hh" @@ -67,9 +71,7 @@ using namespace std; G4ComptonScattering::G4ComptonScattering(const G4String& processName, G4ProcessType type):G4VEmProcess (processName, type), - isInitialised(false), - selectedModel(0), - mType(0) + isInitialised(false) { SetLambdaBinning(90); SetMinKinEnergy(0.1*keV); @@ -91,10 +93,10 @@ void G4ComptonScattering::InitialiseProcess(const G4ParticleDefinition*) SetSecondaryParticle(G4Electron::Electron()); G4double emin = MinKinEnergy(); G4double emax = MaxKinEnergy(); - if(0 == mType) selectedModel = new G4KleinNishinaCompton(); - selectedModel->SetLowEnergyLimit(emin); - selectedModel->SetHighEnergyLimit(emax); - AddEmModel(1, selectedModel); + if(!Model()) SetModel(new G4KleinNishinaCompton); + Model()->SetLowEnergyLimit(emin); + Model()->SetHighEnergyLimit(emax); + AddEmModel(1, Model()); } } @@ -102,17 +104,11 @@ void G4ComptonScattering::InitialiseProcess(const G4ParticleDefinition*) void G4ComptonScattering::PrintInfo() { - G4cout << " Total cross sections has a good parametrisation" - << " from 10 KeV to (100/Z) GeV" - << "\n Sampling according " << selectedModel->GetName() << " model" - << G4endl; + G4cout + << " Total cross sections has a good parametrisation" + << " from 10 KeV to (100/Z) GeV" + << "\n Sampling according " << Model()->GetName() << " model" + << G4endl; } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void G4ComptonScattering::SetModel(const G4String& s) -{ - if(s == "Klein-Nishina") mType = 0; -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/source/processes/electromagnetic/standard/src/G4ComptonScattering52.cc b/source/processes/electromagnetic/standard/src/G4ComptonScattering52.cc index 74c85af7dc..cdb582da19 100644 --- a/source/processes/electromagnetic/standard/src/G4ComptonScattering52.cc +++ b/source/processes/electromagnetic/standard/src/G4ComptonScattering52.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4ComptonScattering52.cc,v 1.2 2006/06/29 19:52:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ComptonScattering52.cc,v 1.3 2006/10/16 15:26:49 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // //------------ G4ComptonScattering52 physics process ----------------------------- @@ -477,6 +477,8 @@ void G4ComptonScattering52::PrintInfoDefinition() << G4BestUnit(LowestEnergyLimit,"Energy") << " to " << G4BestUnit(HighestEnergyLimit,"Energy") << " in " << NumbBinTable << " bins. \n"; + G4cout << " WARNING: This process is obsolete and will be soon removed" + << G4endl; } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/source/processes/electromagnetic/standard/src/G4CoulombScattering.cc b/source/processes/electromagnetic/standard/src/G4CoulombScattering.cc index a0ba92d32c..36dc225a2e 100644 --- a/source/processes/electromagnetic/standard/src/G4CoulombScattering.cc +++ b/source/processes/electromagnetic/standard/src/G4CoulombScattering.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4CoulombScattering.cc,v 1.2 2006/06/29 19:52:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4CoulombScattering.cc,v 1.7 2006/10/19 09:44:27 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // @@ -38,6 +38,8 @@ // Creation date: 22.08.2004 // // Modifications: +// 01.08.06 V.Ivanchenko add choice between G4eCoulombScatteringModel and +// G4CoulombScatteringModel // // @@ -55,11 +57,13 @@ using namespace std; G4CoulombScattering::G4CoulombScattering(const G4String& name) - : G4VEmProcess(name),thetaMin(0.5),thetaMax(pi),q2Max(DBL_MAX),isInitialised(false) + : G4VEmProcess(name),thetaMin(0.0),thetaMax(pi),q2Max(DBL_MAX), + isInitialised(false) { SetLambdaBinning(80); SetMinKinEnergy(1.0*keV); SetMaxKinEnergy(100.0*GeV); + buildTableFlag = true; } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... @@ -74,17 +78,27 @@ void G4CoulombScattering::InitialiseProcess(const G4ParticleDefinition*) if(!isInitialised) { isInitialised = true; // SetVerboseLevel(3); - SetBuildTableFlag(true); + // SetBuildTableFlag(buildTableFlag); + SetBuildTableFlag(false); SetStartFromNullFlag(false); + SetIntegral(true); SetLambdaFactor(0.8); SetSecondaryParticle(0); G4double emin = MinKinEnergy(); G4double emax = MaxKinEnergy(); - G4CoulombScatteringModel* model = - new G4CoulombScatteringModel(thetaMin,thetaMax,true,q2Max); - model->SetLowEnergyLimit(emin); - model->SetHighEnergyLimit(emax); - AddEmModel(1, model); + if(GetProcessName() == "eCoulombScat") { + G4eCoulombScatteringModel* model = + new G4eCoulombScatteringModel(thetaMin,thetaMax,buildTableFlag,q2Max); + model->SetLowEnergyLimit(emin); + model->SetHighEnergyLimit(emax); + AddEmModel(1, model); + } else { + G4CoulombScatteringModel* model = + new G4CoulombScatteringModel(thetaMin,thetaMax,buildTableFlag,q2Max); + model->SetLowEnergyLimit(emin); + model->SetHighEnergyLimit(emax); + AddEmModel(1, model); + } } } @@ -93,7 +107,7 @@ void G4CoulombScattering::InitialiseProcess(const G4ParticleDefinition*) void G4CoulombScattering::PrintInfo() { G4cout << " Coulomb scattering with ThetaMin(degree)= " << thetaMin/degree - << "; ThetaMax(degree)= " << thetaMin/degree + << "; ThetaMax(degree)= " << thetaMax/degree << "; q2Max(GeV^2)= " << q2Max/(GeV*GeV) << G4endl; } diff --git a/source/processes/electromagnetic/standard/src/G4CoulombScatteringModel.cc b/source/processes/electromagnetic/standard/src/G4CoulombScatteringModel.cc index f30c6327e1..bacca13071 100644 --- a/source/processes/electromagnetic/standard/src/G4CoulombScatteringModel.cc +++ b/source/processes/electromagnetic/standard/src/G4CoulombScatteringModel.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4CoulombScatteringModel.cc,v 1.2 2006/06/29 19:52:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4CoulombScatteringModel.cc,v 1.7 2006/10/19 09:44:27 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // @@ -38,6 +38,10 @@ // Creation date: 22.08.2005 // // Modifications: +// 01.08.06 V.Ivanchenko extend upper limit of table to TeV and review the +// logic of building - only elements from G4ElementTable +// 08.08.06 V.Ivanchenko build internal table in ekin scale, introduce faclim +// 19.10.06 V.Ivanchenko use inheritance from G4eCoulombScatteringModel // // Class Description: // @@ -48,8 +52,6 @@ #include "G4CoulombScatteringModel.hh" #include "Randomize.hh" -#include "G4DataVector.hh" -#include "G4PhysicsLogVector.hh" #include "G4ParticleChangeForGamma.hh" #include "G4NistManager.hh" #include "G4ParticleTable.hh" @@ -63,22 +65,8 @@ using namespace std; G4CoulombScatteringModel::G4CoulombScatteringModel( G4double thetaMin, G4double thetaMax, G4bool build, G4double tlim, const G4String& nam) - : G4VEmModel(nam), - theCrossSectionTable(0), - cosThetaMin(cos(thetaMin)), - cosThetaMax(cos(thetaMax)), - lowMomentum(keV), - highMomentum(MeV), - q2Limit(tlim), - nbins(12), - nmax(100), - buildTable(build), - isInitialised(false) + : G4eCoulombScatteringModel(thetaMin,thetaMax,build,tlim,nam) { - G4double p0 = hbarc/(Bohr_radius*0.885); - a0 = 0.25*p0*p0; - p0 = electron_mass_c2*classic_electr_radius; - coeff = twopi*p0*p0; theMatManager = G4NistManager::Instance(); theParticleTable = G4ParticleTable::GetParticleTable(); theProton = G4Proton::Proton(); @@ -87,85 +75,42 @@ G4CoulombScatteringModel::G4CoulombScatteringModel( //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... G4CoulombScatteringModel::~G4CoulombScatteringModel() -{ - if(theCrossSectionTable) { - theCrossSectionTable->clearAndDestroy(); - delete theCrossSectionTable; - } -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... - -void G4CoulombScatteringModel::Initialise(const G4ParticleDefinition* p, - const G4DataVector&) -{ - if(isInitialised) return; - isInitialised = true; - - if(pParticleChange) - fParticleChange = reinterpret_cast(pParticleChange); - else - fParticleChange = new G4ParticleChangeForGamma(); - - if(!buildTable || p->GetParticleName() == "GenericIon") return; - - // Compute cross section multiplied by Ptot^2*beta^2 - G4double mass = p->GetPDGMass(); - G4double mass2 = mass*mass; - - theCrossSectionTable = new G4PhysicsTable(nmax); - G4PhysicsLogVector* ptrVector; - G4double mom2, value; - G4double pmin = lowMomentum*lowMomentum; - G4double pmax = highMomentum*highMomentum; - nbins = G4int(log10(pmax/pmin)/2.0) + 1; - - for(G4int j=1; jGetLowEdgeEnergy( i ) ; - value = CalculateCrossSectionPerAtom(p, mom2, j); - value *= mom2*mom2/(mom2 + mass2); - ptrVector->PutValue( i, value ); - } - - theCrossSectionTable->insert(ptrVector); - } -} +{} //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... G4double G4CoulombScatteringModel::CalculateCrossSectionPerAtom( const G4ParticleDefinition* p, - G4double mom2, + G4double kinEnergy, G4double Z) { G4double cross= 0.0; G4int iz = G4int(Z); G4double m = p->GetPDGMass(); + G4double mom2 = kinEnergy*(kinEnergy + 2.0*m); G4double mass2= m*m; - G4double q = p->GetPDGCharge()/eplus; G4double m1 = theMatManager->GetAtomicMassAmu(iz)*amu_c2; - G4double etot = sqrt(mom2 + mass2) + m1; + G4double etot = kinEnergy + m + m1; G4double ptot = sqrt(mom2); G4double bet = ptot/etot; G4double gam = 1.0/sqrt((1.0 - bet)*(1.0 + bet)); - G4double mom = gam*(ptot - bet*etot); - G4double momentum2 = mom*mom; - G4double costm = std::max(cosThetaMax, 1.0 - q2Limit/2.0*momentum2); + G4double momCM = gam*(ptot - bet*etot); + G4double momCM2 = momCM*momCM; + G4double costm = std::max(cosThetaMax, 1.0 - 0.5*q2Limit/momCM2); if(1 == iz && p == theProton) costm = std::max(0.0, costm); // Cross section in CM system if(costm < cosThetaMin) { - G4double invbeta2 = 1.0 + mass2/momentum2; - G4double a = 2.0*pow(Z,0.666666667)*a0* - (1.13 + 3.76*invbeta2*Z*Z*fine_structure_const*fine_structure_const)/momentum2 + 1.0; - G4double f = q * Z * m1 /(m + m1); - cross = coeff*f*f*(cosThetaMin - costm)/((a - cosThetaMin)*(a - costm)); + G4double q = p->GetPDGCharge()/eplus; + G4double q2 = q*q; + G4double invbeta2 = 1.0 + mass2/momCM2; + G4double A = ScreeningParameter(Z, q2, momCM2, invbeta2); + G4double a = 2.0*A + 1.0; + G4double f = q * m1 /(m + m1); + cross = coeff*f*f*Z*(Z + 1.0)*invbeta2*(cosThetaMin - costm)/ + ((a - cosThetaMin)*(a - costm)*momCM2); } - //G4cout << "p= " << mom << " Z= " << Z << " a= " << a + //G4cout << "p= " << mom << " momCM= " << momCM << " Z= " << Z << " A= " << A //<< " cross= " << cross << " m1(GeV)= " << m1/GeV <= ni) { - G4cout << "G4CoulombScatteringModel::SelectIsotope WARNING: abandance vector for" + G4cout << "G4CoulombScatteringModel::SelectIsotope WARNING: " + << "abandance vector for" << elm->GetName() << " is not normalised to unit" << G4endl; } else { N = G4double(elm->GetIsotope(idx)->GetN()); @@ -206,7 +152,8 @@ std::vector* G4CoulombScatteringModel::SampleSecondaries( const G4Material* aMaterial = couple->GetMaterial(); const G4ParticleDefinition* p = dp->GetDefinition(); - const G4Element* elm = SelectRandomAtom(aMaterial, p, dp->GetKineticEnergy()); + const G4Element* elm = + SelectRandomAtom(aMaterial, p, dp->GetKineticEnergy()); G4double Z = elm->GetZ(); G4double N = SelectIsotope(elm); G4int iz = G4int(Z); @@ -214,45 +161,52 @@ std::vector* G4CoulombScatteringModel::SampleSecondaries( G4double m2 = theParticleTable->GetIonTable()->GetNucleusMass(iz, in); G4double m1 = dp->GetMass(); + G4double q = p->GetPDGCharge()/eplus; + G4double q2 = q*q; + // Transformation to CM system G4LorentzVector lv1 = dp->Get4Momentum(); + G4ThreeVector dir = dp->GetMomentumDirection(); G4LorentzVector lv2(0.0,0.0,0.0,m2); G4LorentzVector lv = lv1 + lv2; G4ThreeVector bst = lv.boostVector(); lv1.boost(-bst); lv2.boost(-bst); G4ThreeVector p1 = lv1.vect(); - G4double momentum2 = p1.mag2(); - G4double invbeta2 = 1.0 + m1*m1/momentum2; + G4double momCM2 = p1.mag2(); + G4double invbeta2 = 1.0 + m1*m1/momCM2; + G4double A = ScreeningParameter(Z, q2, momCM2, invbeta2); + G4double a = 2.0*A + 1.0; - G4double a = 2.*pow(Z,0.666666667)*a0* - (1.13 + 3.76*invbeta2*Z*Z*fine_structure_const*fine_structure_const)/momentum2 + 1.0; - - G4double costm = std::max(cosThetaMax, 1.0 - q2Limit/2.0*momentum2); + G4double costm = std::max(cosThetaMax, 1.0 - 0.5*q2Limit/momCM2); if(1 == iz && p == theProton) costm = std::max(0.0, costm); if(costm > cosThetaMin) return fvect; - G4double cost = a - (a - cosThetaMin)*(a - costm)/ - (a - cosThetaMin + G4UniformRand()*(cosThetaMin - costm)); - if(std::abs(cost) > 1.) { - G4cout << "G4CoulombScatteringModel::SampleSecondaries WARNING cost= " << cost << G4endl; - if(cost < -1.) cost = -1.0; - else cost = 1.0; + G4double x = G4UniformRand(); + G4double y = (a + 1.0 - cosThetaMin)/(cosThetaMin - costm); + G4double st2 = 0.5*(y*(1.0 - costm) - a*x)/(y + x); + if(st2 < 0.0 || st2 > 1.0) { + G4cout << "G4CoulombScatteringModel::SampleSecondaries WARNING st2= " + << st2 << G4endl; + st2 = 0.0; } - G4double sint = sqrt((1.0 + cost)*(1.0 - cost)); + + G4double tet = 2.0*asin(sqrt(st2)); + G4double cost= cos(tet); + G4double sint= sin(tet); G4double phi = twopi * G4UniformRand(); G4ThreeVector v1(cos(phi)*sint,sin(phi)*sint,cost); - G4double p1tot = sqrt(momentum2); - v1.rotateUz(p1); + G4double p1tot = sqrt(momCM2); + // v1.rotateUz(p1); G4LorentzVector lfv1(v1.x()*p1tot,v1.y()*p1tot,v1.z(),lv1.e()); - G4LorentzVector lfv2 = lv1 + lv2 - lfv1; - lfv1.boost(bst); - lfv2.boost(bst); - fParticleChange->ProposeMomentumDirection(lfv1.vect().unit()); + G4LorentzVector lfv2 = lv - lfv1; + + G4ThreeVector newdir = lfv1.vect().unit(); + fParticleChange->ProposeMomentumDirection(newdir); G4double ekin = lfv1.e() - m1; if(ekin < 0.0) ekin = 0.0; fParticleChange->SetProposedKineticEnergy(ekin); @@ -263,7 +217,9 @@ std::vector* G4CoulombScatteringModel::SampleSecondaries( G4ParticleDefinition* ion = theParticleTable->GetIon(iz, in, 0.0); G4DynamicParticle* newdp = new G4DynamicParticle(ion, lfv2); fvect->push_back(newdp); - } + } else if(ekin > 0.0) { + fParticleChange->ProposeLocalEnergyDeposit(ekin); + } return fvect; } diff --git a/source/processes/electromagnetic/standard/src/G4GammaConversion.cc b/source/processes/electromagnetic/standard/src/G4GammaConversion.cc index 75ddbc5e68..ea673ec6db 100644 --- a/source/processes/electromagnetic/standard/src/G4GammaConversion.cc +++ b/source/processes/electromagnetic/standard/src/G4GammaConversion.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4GammaConversion.cc,v 1.25 2006/06/29 19:52:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4GammaConversion.cc,v 1.27 2006/09/14 10:27:19 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // //------------------ G4GammaConversion physics process ------------------------- @@ -59,8 +59,11 @@ // 11-01-02 ComputeCrossSection: correction of extrapolation below EnergyLimit // 21-03-02 DoIt: correction of the e+e- angular distribution (bug 363) mma // 08-11-04 Remove of Store/Retrieve tables (V.Ivantchenko) -// 19-04-05 Migrate to model interface and inherit from G4VEmProcess (V.Ivanchenko) +// 19-04-05 Migrate to model interface and inherit +// from G4VEmProcess (V.Ivanchenko) // 04-05-05, Make class to be default (V.Ivanchenko) +// 09-08-06, add SetModel(G4VEmModel*) (mma) +// 12-09-06, move SetModel(G4VEmModel*) in G4VEmProcess (mma) // ----------------------------------------------------------------------------- #include "G4GammaConversion.hh" @@ -91,16 +94,15 @@ void G4GammaConversion::InitialiseProcess(const G4ParticleDefinition*) { if(!isInitialised) { isInitialised = true; - // SetVerboseLevel(1); SetBuildTableFlag(true); SetSecondaryParticle(G4Electron::Electron()); G4double emin = max(MinKinEnergy(), 2.0*electron_mass_c2); SetMinKinEnergy(emin); G4double emax = MaxKinEnergy(); - G4VEmModel* model = new G4BetheHeitlerModel(); - model->SetLowEnergyLimit(emin); - model->SetHighEnergyLimit(emax); - AddEmModel(1, model); + if(!Model()) SetModel(new G4BetheHeitlerModel); + Model()->SetLowEnergyLimit(emin); + Model()->SetHighEnergyLimit(emax); + AddEmModel(1, Model()); } } @@ -108,10 +110,12 @@ void G4GammaConversion::InitialiseProcess(const G4ParticleDefinition*) void G4GammaConversion::PrintInfo() { - G4cout << " Total cross sections has a good parametrisation" - << " from 1.5 MeV to 100 GeV for all Z;" - << "\n sampling secondary e+e- according to the Bethe-Heitler model" - << G4endl; + G4cout + << " Total cross sections has a good parametrisation" + << " from 1.5 MeV to 100 GeV for all Z;" + << "\n sampling secondary e+e- according " + << Model()->GetName() << " model" + << G4endl; } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/source/processes/electromagnetic/standard/src/G4GammaConversion52.cc b/source/processes/electromagnetic/standard/src/G4GammaConversion52.cc index 1681dfb956..1d1e6977bd 100644 --- a/source/processes/electromagnetic/standard/src/G4GammaConversion52.cc +++ b/source/processes/electromagnetic/standard/src/G4GammaConversion52.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4GammaConversion52.cc,v 1.3 2006/06/29 19:52:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4GammaConversion52.cc,v 1.4 2006/10/16 15:26:49 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //------------------ G4GammaConversion52 physics process ------------------------- // by Michel Maire, 24 May 1996 @@ -583,6 +583,8 @@ void G4GammaConversion52::PrintInfoDefinition() << G4BestUnit(LowestEnergyLimit, "Energy") << " to " << G4BestUnit(HighestEnergyLimit,"Energy") << " in " << NumbBinTable << " bins. \n"; + G4cout << " WARNING: This process is obsolete and will be soon removed" + << G4endl; } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/source/processes/electromagnetic/standard/src/G4InitXscPAI.cc b/source/processes/electromagnetic/standard/src/G4InitXscPAI.cc index 4eaca90037..7cf20d7cc2 100644 --- a/source/processes/electromagnetic/standard/src/G4InitXscPAI.cc +++ b/source/processes/electromagnetic/standard/src/G4InitXscPAI.cc @@ -25,7 +25,7 @@ // // // $Id: G4InitXscPAI.cc,v 1.9 2006/06/29 19:53:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4InitXscPAI.cc -- class implementation file diff --git a/source/processes/electromagnetic/standard/src/G4IonFluctuations.cc b/source/processes/electromagnetic/standard/src/G4IonFluctuations.cc index bb5e934475..d609f0162f 100644 --- a/source/processes/electromagnetic/standard/src/G4IonFluctuations.cc +++ b/source/processes/electromagnetic/standard/src/G4IonFluctuations.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4IonFluctuations.cc,v 1.3 2006/06/29 19:53:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/standard/src/G4KleinNishinaCompton.cc b/source/processes/electromagnetic/standard/src/G4KleinNishinaCompton.cc index 71aa0b6b31..aecda2de08 100644 --- a/source/processes/electromagnetic/standard/src/G4KleinNishinaCompton.cc +++ b/source/processes/electromagnetic/standard/src/G4KleinNishinaCompton.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4KleinNishinaCompton.cc,v 1.8 2006/06/29 19:53:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/standard/src/G4MollerBhabhaModel.cc b/source/processes/electromagnetic/standard/src/G4MollerBhabhaModel.cc index 750b6a9960..1bdba26b35 100644 --- a/source/processes/electromagnetic/standard/src/G4MollerBhabhaModel.cc +++ b/source/processes/electromagnetic/standard/src/G4MollerBhabhaModel.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4MollerBhabhaModel.cc,v 1.26 2006/06/29 19:53:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4MollerBhabhaModel.cc,v 1.28 2006/08/28 17:44:36 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // @@ -74,12 +74,12 @@ G4MollerBhabhaModel::G4MollerBhabhaModel(const G4ParticleDefinition* p, const G4String& nam) : G4VEmModel(nam), particle(0), + isElectron(true), twoln10(2.0*log(10.0)), - lowLimit(0.2*keV), - isElectron(true) + lowLimit(0.2*keV) { - if(p) SetParticle(p); theElectron = G4Electron::Electron(); + if(p) SetParticle(p); } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/source/processes/electromagnetic/standard/src/G4MscModel71.cc b/source/processes/electromagnetic/standard/src/G4MscModel71.cc index ef28a58d6e..9c514f2c91 100644 --- a/source/processes/electromagnetic/standard/src/G4MscModel71.cc +++ b/source/processes/electromagnetic/standard/src/G4MscModel71.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4MscModel71.cc,v 1.4 2006/06/29 19:53:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/standard/src/G4MultipleScattering.cc b/source/processes/electromagnetic/standard/src/G4MultipleScattering.cc index 257322e85c..2d54811108 100644 --- a/source/processes/electromagnetic/standard/src/G4MultipleScattering.cc +++ b/source/processes/electromagnetic/standard/src/G4MultipleScattering.cc @@ -23,10 +23,19 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4MultipleScattering.cc,v 1.53 2006/06/29 19:53:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4MultipleScattering.cc,v 1.58 2006/11/23 10:07:42 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ----------------------------------------------------------------------------- +// +// GEANT4 Class file +// +// File name: G4MultipleScattering +// +// Author: Laszlo Urban +// +// Creation date: March 2001 +// // 16/05/01 value of cparm changed , L.Urban // 18/05/01 V.Ivanchenko Clean up against Linux ANSI compilation // 07/08/01 new methods Store/Retrieve PhysicsTable (mma) @@ -97,10 +106,18 @@ // 19-01-07 tlimitmin = facrange*50*micrometer, i.e. it depends on the // value of facrange (L.Urban) // 16-02-06 value of factail changed, samplez = true (L.Urban) -// 07-03-06 Create G4UrbanMscModel and move there step limit calculation (V.Ivanchenko) +// 07-03-06 Create G4UrbanMscModel and move there step limit calculation (VI) // 10-05-06 SetMscStepLimitation at initialisation (V.Ivantchenko) // 11-05-06 values of data members tkinlimit, factail have been // changed (L.Urban) +// 13-10-06 data member factail removed, new data member skin +// together with set function, data member tkinlimit +// changed to lambdalimit (L.Urban) +// 20-10-06 default value of skin = 0 (no single scattering), +// single scattering for skin > 0, +// there is no z sampling by default (L.Urban) +// 23-10-06 skin = 1 by default (L.Urban) +// 23-11-06 skin = 1 by default for e+-, 0 for other particles (VI) // // ----------------------------------------------------------------------------- // @@ -125,12 +142,15 @@ G4MultipleScattering::G4MultipleScattering(const G4String& processName) facrange = 0.02; dtrl = 0.05; - tkinlimit = 1.*MeV; - facgeom = 3.5; - factail = 0.85; + lambdalimit = 1.*mm; + facgeom = 2.5; + // there is no single scattering for this skin <= 0 + // to have single scattering at boundary + // skin should be > 0 ! + skin = 0.0; steppingAlgorithm = true; - samplez = true ; + samplez = false ; isInitialized = false; SetBinning(totBins); @@ -174,16 +194,17 @@ void G4MultipleScattering::InitialiseProcess(const G4ParticleDefinition* p) return; } + G4String part_name = p->GetParticleName(); + if(part_name == "e-" || part_name == "e+") skin = 1.0; + if (p->GetParticleType() == "nucleus") { - // steppingAlgorithm = false; SetLateralDisplasmentFlag(false); SetBuildLambdaTable(false); } else { SetBuildLambdaTable(true); } - // compute Tlimit for particle - mscUrban = new G4UrbanMscModel(facrange,dtrl,tkinlimit, - facgeom,factail, + mscUrban = new G4UrbanMscModel(facrange,dtrl,lambdalimit, + facgeom,skin, samplez,steppingAlgorithm); mscUrban->SetLateralDisplasmentFlag(LateralDisplasmentFlag()); mscUrban->SetLowEnergyLimit(lowKineticEnergy); diff --git a/source/processes/electromagnetic/standard/src/G4MultipleScattering52.cc b/source/processes/electromagnetic/standard/src/G4MultipleScattering52.cc index c5ee2c8d63..17398aed5b 100644 --- a/source/processes/electromagnetic/standard/src/G4MultipleScattering52.cc +++ b/source/processes/electromagnetic/standard/src/G4MultipleScattering52.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4MultipleScattering52.cc,v 1.4 2006/06/29 19:53:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4MultipleScattering52.cc,v 1.5 2006/10/16 15:26:49 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ----------------------------------------------------------------------------- // 16/05/01 value of cparm changed , L.Urban @@ -948,6 +948,8 @@ void G4MultipleScattering52::PrintInfoDefinition() << G4BestUnit(LowestKineticEnergy ,"Energy") << " to " << G4BestUnit(HighestKineticEnergy,"Energy") << " in " << TotBin << " bins. \n"; + G4cout << " WARNING: This process is obsolete and will be soon removed" + << G4endl; } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/source/processes/electromagnetic/standard/src/G4MultipleScattering71.cc b/source/processes/electromagnetic/standard/src/G4MultipleScattering71.cc index 4517ef5ab6..edf2e75201 100644 --- a/source/processes/electromagnetic/standard/src/G4MultipleScattering71.cc +++ b/source/processes/electromagnetic/standard/src/G4MultipleScattering71.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4MultipleScattering71.cc,v 1.3 2006/06/29 19:53:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4MultipleScattering71.cc,v 1.4 2006/10/16 15:26:49 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ----------------------------------------------------------------------------- // 16/05/01 value of cparm changed , L.Urban @@ -184,6 +184,9 @@ void G4MultipleScattering71::PrintInfo() << facrange << G4endl; } + G4cout << " WARNING: This process is obsolete and will be soon removed" + << G4endl; + } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/source/processes/electromagnetic/standard/src/G4PAIModel.cc b/source/processes/electromagnetic/standard/src/G4PAIModel.cc index 69413d800e..d569c7c929 100644 --- a/source/processes/electromagnetic/standard/src/G4PAIModel.cc +++ b/source/processes/electromagnetic/standard/src/G4PAIModel.cc @@ -62,7 +62,9 @@ using namespace std; G4PAIModel::G4PAIModel(const G4ParticleDefinition* p, const G4String& nam) : G4VEmModel(nam),G4VEmFluctuationModel(nam), - fVerbose(0), + fVerbose(0), + fLowestGamma(1.005), + fHighestGamma(10000.), fTotBin(200), fMeanNumber(20), fParticle(0), @@ -73,11 +75,16 @@ G4PAIModel::G4PAIModel(const G4ParticleDefinition* p, const G4String& nam) fTaulim(8.4146e-3) { if(p) SetParticle(p); - fLowestKineticEnergy = LowEnergyLimit(); - fHighestKineticEnergy = HighEnergyLimit(); - fProtonEnergyVector = new G4PhysicsLogVector(fLowestKineticEnergy, - fHighestKineticEnergy, - fTotBin); + + // fLowestKineticEnergy = LowEnergyLimit(); + // fHighestKineticEnergy = HighEnergyLimit(); + + fLowestKineticEnergy = fMass*fLowestGamma; + fHighestKineticEnergy = fMass*fHighestGamma; + + fParticleEnergyVector = new G4PhysicsLogVector(fLowestKineticEnergy, + fHighestKineticEnergy, + fTotBin ); fPAItransferTable = 0; fPAIdEdxTable = 0; fSandiaPhotoAbsCof = 0; @@ -90,7 +97,7 @@ G4PAIModel::G4PAIModel(const G4ParticleDefinition* p, const G4String& nam) G4PAIModel::~G4PAIModel() { - if(fProtonEnergyVector) delete fProtonEnergyVector; + if(fParticleEnergyVector) delete fParticleEnergyVector; if(fdEdxVector) delete fdEdxVector ; if ( fLambdaVector) delete fLambdaVector; if ( fdNdxCutVector) delete fdNdxCutVector; @@ -167,7 +174,7 @@ void G4PAIModel::Initialise(const G4ParticleDefinition* p, fMatIndex = iMatGlob; ComputeSandiaPhotoAbsCof(); - BuildPAIonisationTable(); + BuildPAIonisationTable(p); fPAIxscBank.push_back(fPAItransferTable); fPAIdEdxBank.push_back(fPAIdEdxTable); @@ -233,7 +240,7 @@ void G4PAIModel::ComputeSandiaPhotoAbsCof() // ********* void -G4PAIModel::BuildPAIonisationTable() +G4PAIModel::BuildPAIonisationTable(const G4ParticleDefinition* p) { G4double LowEdgeEnergy , ionloss ; G4double massRatio, tau, Tmax, Tmin, Tkin, deltaLow, gamma, bg2 ; @@ -263,14 +270,28 @@ G4PAIModel::BuildPAIonisationTable() for (G4int i = 0 ; i < fTotBin ; i++) //The loop for the kinetic energy { - LowEdgeEnergy = fProtonEnergyVector->GetLowEdgeEnergy(i) ; - tau = LowEdgeEnergy/proton_mass_c2 ; + LowEdgeEnergy = fParticleEnergyVector->GetLowEdgeEnergy(i) ; + tau = LowEdgeEnergy/fMass ; // if(tau < 0.01) tau = 0.01 ; gamma = tau +1. ; // G4cout<<"gamma = "<GetParticleName() == "e-") + { + Tmax = 0.5*LowEdgeEnergy; + } + else if(p->GetParticleName() == "e+") + { + Tmax = LowEdgeEnergy; // Unclear?? + } + else + { + massRatio = electron_mass_c2/fMass ; + Tmax = 2.*electron_mass_c2*bg2/(1. + 2.*gamma*massRatio+massRatio*massRatio); + } + + // G4cout<<"proton Tkin = "<GetPDGMass(); + G4double massRatio = fMass/p->GetPDGMass(); G4double scaledTkin = kineticEnergy*massRatio; G4double charge = p->GetPDGCharge(); G4double charge2 = charge*charge, dEdx; @@ -487,7 +508,7 @@ G4double G4PAIModel::ComputeDEDX(const G4MaterialCutsCouple* matCC, fdEdxVector = fdEdxTable[jMat]; for(iTkin = 0 ; iTkin < fTotBin ; iTkin++) { - if(scaledTkin < fProtonEnergyVector->GetLowEdgeEnergy(iTkin)) break ; + if(scaledTkin < fParticleEnergyVector->GetLowEdgeEnergy(iTkin)) break ; } iPlace = iTkin - 1; if(iPlace < 0) iPlace = 0; @@ -508,7 +529,7 @@ G4double G4PAIModel::CrossSection( const G4MaterialCutsCouple* matCC, G4int iTkin,iPlace; size_t jMat; G4double tmax = min(MaxSecondaryEnergy(p, kineticEnergy), maxEnergy); - G4double massRatio = proton_mass_c2/p->GetPDGMass(); + G4double massRatio = fMass/p->GetPDGMass(); G4double scaledTkin = kineticEnergy*massRatio; G4double charge = p->GetPDGCharge(); G4double charge2 = charge*charge, cross, cross1, cross2; @@ -523,7 +544,7 @@ G4double G4PAIModel::CrossSection( const G4MaterialCutsCouple* matCC, for(iTkin = 0 ; iTkin < fTotBin ; iTkin++) { - if(scaledTkin < fProtonEnergyVector->GetLowEdgeEnergy(iTkin)) break ; + if(scaledTkin < fParticleEnergyVector->GetLowEdgeEnergy(iTkin)) break ; } iPlace = iTkin - 1; if(iPlace < 0) iPlace = 0; @@ -573,7 +594,7 @@ G4PAIModel::SampleSecondaries( const G4MaterialCutsCouple* matCC, G4double particleMass = dp->GetMass(); G4double kineticEnergy = dp->GetKineticEnergy(); - G4double massRatio = proton_mass_c2/particleMass; + G4double massRatio = fMass/particleMass; G4double scaledTkin = kineticEnergy*massRatio; G4double totalEnergy = kineticEnergy + particleMass; G4double pSquare = kineticEnergy*(totalEnergy+particleMass); @@ -586,6 +607,7 @@ G4PAIModel::SampleSecondaries( const G4MaterialCutsCouple* matCC, { G4cout<<"Tkin of secondary e- <= 0."<GetDefinition()->GetParticleName() == "e-" || + dp->GetDefinition()->GetParticleName() == "e+") ) deltaTkin = 0.5*kineticEnergy; G4double deltaTotalMomentum = sqrt(deltaTkin*(deltaTkin + 2. * electron_mass_c2 )); G4double totalMomentum = sqrt(pSquare); @@ -650,7 +673,7 @@ G4PAIModel::GetPostStepTransfer( G4double scaledTkin ) for(iTkin=0;iTkinGetLowEdgeEnergy(iTkin)) break ; + if(scaledTkin < fParticleEnergyVector->GetLowEdgeEnergy(iTkin)) break ; } iPlace = iTkin - 1 ; // G4cout<<"from search, iPlace = "<GetLowEdgeEnergy(iTkin - 1) ; - E2 = fProtonEnergyVector->GetLowEdgeEnergy(iTkin) ; + E1 = fParticleEnergyVector->GetLowEdgeEnergy(iTkin - 1) ; + E2 = fParticleEnergyVector->GetLowEdgeEnergy(iTkin) ; W = 1.0/(E2 - E1) ; W1 = (E2 - scaledTkin)*W ; W2 = (scaledTkin - E1)*W ; @@ -782,16 +805,17 @@ G4double G4PAIModel::SampleFluctuations( const G4Material* material, G4double position, E1, E2, W1, W2, W, dNdxCut1, dNdxCut2, meanNumber; G4bool numb = true; G4double Tkin = aParticle->GetKineticEnergy() ; - G4double MassRatio = proton_mass_c2/aParticle->GetDefinition()->GetPDGMass() ; + G4double MassRatio = fMass/aParticle->GetDefinition()->GetPDGMass() ; G4double charge = aParticle->GetDefinition()->GetPDGCharge() ; charge2 = charge*charge ; G4double TkinScaled = Tkin*MassRatio ; for(iTkin=0;iTkinGetLowEdgeEnergy(iTkin)) break ; + if(TkinScaled < fParticleEnergyVector->GetLowEdgeEnergy(iTkin)) break ; } iPlace = iTkin - 1 ; + if(iPlace < 0) iPlace = 0; // G4cout<<"from search, iPlace = "<SetLowEnergyLimit(MinKinEnergy()); - model->SetHighEnergyLimit(MaxKinEnergy()); - AddEmModel(1, model); + if(!Model()) SetModel(new G4PEEffectModel); + Model()->SetLowEnergyLimit(MinKinEnergy()); + Model()->SetHighEnergyLimit(MaxKinEnergy()); + AddEmModel(1, Model()); } } @@ -103,8 +105,10 @@ void G4PhotoElectricEffect::InitialiseProcess(const G4ParticleDefinition*) void G4PhotoElectricEffect::PrintInfo() { - G4cout << " Total cross sections from Sandia parametrisation. " - << G4endl; + G4cout + << " Total cross sections from Sandia parametrisation. " + << "\n Sampling according " << Model()->GetName() << " model" + << G4endl; } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/source/processes/electromagnetic/standard/src/G4PhotoElectricEffect52.cc b/source/processes/electromagnetic/standard/src/G4PhotoElectricEffect52.cc index fc9077b57b..3cc82b3173 100644 --- a/source/processes/electromagnetic/standard/src/G4PhotoElectricEffect52.cc +++ b/source/processes/electromagnetic/standard/src/G4PhotoElectricEffect52.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4PhotoElectricEffect52.cc,v 1.2 2006/06/29 19:53:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4PhotoElectricEffect52.cc,v 1.3 2006/10/16 15:26:49 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -282,6 +282,8 @@ void G4PhotoElectricEffect52::PrintInfoDefinition() G4String comments = "Total cross sections from Sandia parametrisation. "; G4cout << G4endl << GetProcessName() << ": " << comments << G4endl; + G4cout << " WARNING: This process is obsolete and will be soon removed" + << G4endl; } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/source/processes/electromagnetic/standard/src/G4PolarizedComptonScattering.cc b/source/processes/electromagnetic/standard/src/G4PolarizedComptonScattering.cc index fd7125cfbd..0563fc5a37 100644 --- a/source/processes/electromagnetic/standard/src/G4PolarizedComptonScattering.cc +++ b/source/processes/electromagnetic/standard/src/G4PolarizedComptonScattering.cc @@ -25,7 +25,7 @@ // // // $Id: G4PolarizedComptonScattering.cc,v 1.16 2006/06/29 19:53:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //---------- G4PolarizedComptonScattering physics process ---------------------- diff --git a/source/processes/electromagnetic/standard/src/G4UniversalFluctuation.cc b/source/processes/electromagnetic/standard/src/G4UniversalFluctuation.cc index e2fcf256e1..d81765d07a 100644 --- a/source/processes/electromagnetic/standard/src/G4UniversalFluctuation.cc +++ b/source/processes/electromagnetic/standard/src/G4UniversalFluctuation.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4UniversalFluctuation.cc,v 1.8 2006/06/29 19:53:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/standard/src/G4UrbanMscModel.cc b/source/processes/electromagnetic/standard/src/G4UrbanMscModel.cc index e1c2f3d66e..28333c8cbd 100644 --- a/source/processes/electromagnetic/standard/src/G4UrbanMscModel.cc +++ b/source/processes/electromagnetic/standard/src/G4UrbanMscModel.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4UrbanMscModel.cc,v 1.15 2006/06/29 19:53:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4UrbanMscModel.cc,v 1.26 2006/12/04 05:53:24 urban Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // @@ -90,6 +90,30 @@ // c_highland 13.6*MeV ---> 13.26*MeV, // corr_highland 0.555 ---> 0.54, // value of data member geommin changed (5 nm -> 1 nm) (L.Urban) +// 13-10-06 data member factail removed, data member tkinlimit changed +// to lambdalimit, +// new data members tgeom,tnow,skin,skindepth,Zeff,geomlimit +// G4double GeomLimit(const G4Track& track) changed to +// void GeomLimit(const G4Track& track) +// - important changes in ComputeTruePathLengthLimit: +// possibility to have very small step(s) with single scattering +// before boundary crossing (with skin > 0) +// - changes in SampleCosineTheta : +// single scattering if step <= stepmin, parameter theta0 +// slightly modified, tail modified (L.Urban) +// 20-10-06 parameter theta0 now computed in the (public) +// function ComputeTheta0, +// single scattering modified allowing not small +// angles as well (L.Urban) +// 23-10-06 correction in SampleSecondaries, now safety update +// computed in a simpler/faster way (L.Urban) +// 06-11-06 corrections in ComputeTruePathLengthLimit, results are +// more stable in calorimeters (L.Urban) +// 07-11-06 fix in GeomPathLength and SampleCosineTheta (L.Urban) +// 15-11-06 bugfix in SampleCosineTheta (L.Urban) +// 20-11-06 bugfix in single scattering part of SampleCosineTheta, +// single scattering just before boundary crossing now (L.Urban) +// 04-12-06 fix in ComputeTruePathLengthLimit (L.Urban) // // Class Description: @@ -112,21 +136,23 @@ #include "G4TransportationManager.hh" #include "G4Navigator.hh" +#include "G4Poisson.hh" + //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... using namespace std; G4UrbanMscModel::G4UrbanMscModel(G4double m_facrange, G4double m_dtrl, - G4double m_tkinlimit, - G4double m_facgeom, G4double m_factail, + G4double m_lambdalimit, + G4double m_facgeom,G4double m_skin, G4bool m_samplez, G4bool m_stepAlg, const G4String& nam) : G4VEmModel(nam), dtrl(m_dtrl), - factail(m_factail), - Tkinlimit(m_tkinlimit), + lambdalimit(m_lambdalimit), facrange(m_facrange), facgeom(m_facgeom), + skin(m_skin), samplez(m_samplez), steppingAlgorithm(m_stepAlg), isInitialized(false) @@ -136,26 +162,34 @@ G4UrbanMscModel::G4UrbanMscModel(G4double m_facrange, G4double m_dtrl, taulim = 1.e-6; currentTau = taulim; stepmin = 1.e-6*mm; + skindepth = (skin-1)*stepmin; + skindepth1 = skindepth+stepmin; currentRange = 0. ; - frscaling2 = 0.1; + frscaling2 = 0.25; frscaling1 = 1.-frscaling2; tlimit = 1.e10*mm; - tlimitmin = 5.e-6*mm; - tlimitminfix = 5.e-6*mm; + tlimitmin = 10.e-6*mm; + tlimitminfix = 10.e-6*mm; + tnow = 10.e-6*mm; nstepmax = 25.; + tgeom = 1.e50*mm; geombig = 1.e50*mm; - geommin = 1.e-6*mm; - presafety = 0.*mm; - facsafety = 0.20; + geommin = 1.e-3*mm; + geomlimit = geombig; + presafety = 0.*mm; + facsafety = 0.25; + Zeff = 1.; particle = 0; theManager = G4LossTableManager::Instance(); - + inside = false; } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... G4UrbanMscModel::~G4UrbanMscModel() -{} +{ + delete safetyHelper; +} //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -173,6 +207,8 @@ void G4UrbanMscModel::Initialise(const G4ParticleDefinition* p, navigator = G4TransportationManager::GetTransportationManager() ->GetNavigatorForTracking(); + + safetyHelper= new G4SafetyHelper(); } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -416,7 +452,6 @@ G4double G4UrbanMscModel::ComputeCrossSectionPerAtom( else if(AtomicNumber > Z2) sigma = AtomicNumber*AtomicNumber*c2/(Z2*Z2); } - // G4cout << "e= " << KineticEnergy << " sigma= " << sigma << G4endl; return sigma; } @@ -437,10 +472,12 @@ G4double G4UrbanMscModel::ComputeTruePathLengthLimit( currentKinEnergy = dp->GetKineticEnergy(); currentRange = theManager->GetRangeFromRestricteDEDX(particle,currentKinEnergy,couple); - currentRadLength = couple->GetMaterial()->GetRadlen(); lambda0 = GetLambda(currentKinEnergy); tPathLength = currentMinimalStep; + if(tPathLength > currentRange) + tPathLength = currentRange; + G4StepPoint* sp = track.GetStep()->GetPreStepPoint(); presafety = sp->GetSafety(); G4StepStatus stepStatus = sp->GetStepStatus(); @@ -450,59 +487,112 @@ G4double G4UrbanMscModel::ComputeTruePathLengthLimit( // if (steppingAlgorithm) { + if((stepNumber > 1) && inside) + return tPathLength; + + //compute geomlimit and presafety + GeomLimit(track); + if((stepStatus == fGeomBoundary) || (stepNumber == 1)) { - //define tlimitmin here (it depends on lambda!) - tlimitmin = lambda0/nstepmax; - if(tlimitmin < tlimitminfix) tlimitmin = tlimitminfix; + if((stepNumber == 1) && (currentRange < presafety)) + { + stepmin = 1.e-6*mm; + inside = true; + return tPathLength; + } + else + inside = false; - // not so strong step restriction above Tlimit + // facrange scaling in lambda + // not so strong step restriction above llimit G4double facr = facrange; - if(currentKinEnergy > Tlimit) - facr *= frscaling1+frscaling2*currentKinEnergy/Tlimit; + if(lambda0 > llimit) + facr *= frscaling1+frscaling2*lambda0/llimit; // constraint from the physics if (currentRange > lambda0) tlimit = facr*currentRange; else tlimit = facr*lambda0; + // constraint from the geometry (if tlimit above is too big) + tgeom = geombig; + if(geomlimit > geommin) + { + if(stepStatus == fGeomBoundary) + tgeom = geomlimit/facgeom; + else + tgeom = 2.*geomlimit/facgeom; + } + + //define stepmin here (it depends on lambda!) + //rough estimation of lambda_elastic/lambda_transport + G4double rat = currentKinEnergy/MeV ; + rat = 1.e-3/(rat*(10.+rat)) ; + //stepmin ~ lambda_elastic + stepmin = rat*lambda0; + skindepth = (skin-1.)*stepmin; + skindepth1 = skindepth+stepmin; + if(stepmin > tgeom) stepmin = tgeom; + + //define tlimitmin + tlimitmin = lambda0/nstepmax; + if(tlimitmin < stepmin) tlimitmin = 1.01*stepmin; + if(tlimitmin < tlimitminfix) tlimitmin = tlimitminfix; + //lower limit for tlimit if(tlimit < tlimitmin) tlimit = tlimitmin; - G4double geomlimit = GeomLimit(track); - // constraint from the geometry (if tlimit above is too big) - if(geomlimit > geommin) - { - if(stepStatus == fGeomBoundary) - { - if(tlimit > geomlimit/facgeom) - tlimit = geomlimit/facgeom; - } - else - { - if(tlimit > 2.*geomlimit/facgeom) - tlimit = 2.*geomlimit/facgeom; - } - } - } - if(stepNumber == 1) - { - // range <= presafety ---> particle is not able to leave volume - if(currentRange <= presafety) - return currentMinimalStep; + //check against geometry limit + if(tlimit > tgeom) tlimit = tgeom; //if track starts far from boundaries increase tlimit! - if(tlimit < facsafety*presafety) + if(tlimit < facsafety*presafety) tlimit = facsafety*presafety ; - } - // range <= presafety ---> particle is not able to leave volume - if(currentRange <= presafety) - return currentMinimalStep; - if(tPathLength > tlimit) tPathLength = tlimit; + // "randomize" tlimit + tlimit *= 0.5+G4UniformRand(); + } + + if(currentRange < presafety) + { + inside = true; + return tPathLength; + } + + // shortcut + if((tPathLength < tlimit) && + (tPathLength < presafety)) + return tPathLength; + + //if track far from boundaries increase tPathLength + tnow = tlimit; + if(tlimit < facsafety*presafety) + tnow = facsafety*presafety ; + + // step reduction near to boundary + if(skindepth >= 0.) + { + if(geomlimit > skindepth) + { + if(tnow > geomlimit-skindepth) + tnow = geomlimit-skindepth; + } + else + { + if(tnow > stepmin) + tnow = stepmin; + } + } + + if(tnow < stepmin) + tnow = stepmin; + + if(tPathLength > tnow) + tPathLength = tnow ; + } - + // version similar to 7.1 (needed for some experiments) - // else { if(stepNumber == 1) @@ -522,9 +612,9 @@ G4double G4UrbanMscModel::ComputeTruePathLengthLimit( //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -G4double G4UrbanMscModel::GeomLimit(const G4Track& track) +void G4UrbanMscModel::GeomLimit(const G4Track& track) { - G4double geomlimit = geombig; + geomlimit = geombig; // no geomlimit for the World volume if((track.GetVolume() != 0) && @@ -538,11 +628,7 @@ G4double G4UrbanMscModel::GeomLimit(const G4Track& track) track.GetMomentumDirection(), cstep, presafety); - - if(geomlimit < geommin) geomlimit = geommin; } - - return geomlimit; } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -550,7 +636,6 @@ G4double G4UrbanMscModel::GeomLimit(const G4Track& track) G4double G4UrbanMscModel::ComputeGeomPathLength(G4double) { // do the true -> geom transformation - const G4double ztmax = 0.99, onethird = 1./3. ; lambdaeff = lambda0; par1 = -1. ; @@ -565,7 +650,7 @@ G4double G4UrbanMscModel::ComputeGeomPathLength(G4double) G4double tau = tPathLength/lambda0 ; - if ((tau <= tausmall) || (tPathLength < stepmin)) { + if ((tau <= tausmall) || (tPathLength <= stepmin)) { geomLength = tPathLength; if(geomLength > lambda0) geomLength = lambda0; return geomLength; @@ -574,12 +659,15 @@ G4double G4UrbanMscModel::ComputeGeomPathLength(G4double) G4double zmean = tPathLength; if (tPathLength < currentRange*dtrl) { zmean = lambda0*(1.-exp(-tau)); - if(tau < taulim) zmean = tPathLength*(1.-0.5*tPathLength/lambda0) ; + if(tau < taulim) zmean = tPathLength*(1.-0.5*tau) ; } else if(currentKinEnergy < mass) { par1 = 1./currentRange ; par2 = 1./(par1*lambda0) ; par3 = 1.+par2 ; - zmean = (1.-exp(par3*log(1.-tPathLength/currentRange)))/(par1*par3) ; + if(tPathLength < currentRange) + zmean = (1.-exp(par3*log(1.-tPathLength/currentRange)))/(par1*par3) ; + else + zmean = 1./(par1*par3) ; } else { G4double T1 = theManager->GetEnergy(particle,currentRange-tPathLength,couple); G4double lambda1 = GetLambda(T1); @@ -590,32 +678,37 @@ G4double G4UrbanMscModel::ComputeGeomPathLength(G4double) zmean = (1.-exp(par3*log(lambda1/lambda0)))/(par1*par3) ; } - // sample z zPathLength = zmean ; - G4double zt = zmean/tPathLength ; - if (samplez && tPathLength >= stepmin && zt < ztmax) + // sample z + if(samplez) { - G4double u,cz1; - if(zt >= onethird) + const G4double ztmax = 0.99, onethird = 1./3. ; + G4double zt = zmean/tPathLength ; + + if (tPathLength > stepmin && zt < ztmax) { - G4double cz = 0.5*(3.*zt-1.)/(1.-zt) ; - cz1 = 1.+cz ; - G4double u0 = cz/cz1 ; - G4double grej ; - do { - u = exp(log(G4UniformRand())/cz1) ; - grej = exp(cz*log(u/u0))*(1.-u)/(1.-u0) ; - } while (grej < G4UniformRand()) ; + G4double u,cz1; + if(zt >= onethird) + { + G4double cz = 0.5*(3.*zt-1.)/(1.-zt) ; + cz1 = 1.+cz ; + G4double u0 = cz/cz1 ; + G4double grej ; + do { + u = exp(log(G4UniformRand())/cz1) ; + grej = exp(cz*log(u/u0))*(1.-u)/(1.-u0) ; + } while (grej < G4UniformRand()) ; + } + else + { + cz1 = 1./zt-1.; + u = 1.-exp(log(G4UniformRand())/cz1) ; + } + zPathLength = tPathLength*u ; } - else - { - cz1 = 1./zt-1.; - u = 1.-exp(log(G4UniformRand())/cz1) ; - } - zPathLength = tPathLength*u ; } - // G4cout << zPathLength << G4endl; + geomLength = zPathLength; if(geomLength > lambda0) geomLength = lambda0; @@ -626,14 +719,14 @@ G4double G4UrbanMscModel::ComputeGeomPathLength(G4double) G4double G4UrbanMscModel::ComputeTrueStepLength(G4double geomStepLength) { - // msc stop the step + // step defined other than transportation if(geomStepLength == geomLength && tPathLength <= currentRange) return tPathLength; // recalculation G4double trueLength = geomStepLength; zPathLength = geomStepLength; - if((geomStepLength > lambda0*tausmall) && (geomStepLength >= stepmin)) + if((geomStepLength > lambda0*tausmall) && (geomStepLength > stepmin)) { if(par1 < 0.) trueLength = -lambda0*log(1.-geomStepLength/lambda0) ; @@ -654,6 +747,32 @@ G4double G4UrbanMscModel::ComputeTrueStepLength(G4double geomStepLength) //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +G4double G4UrbanMscModel::ComputeTheta0(G4double trueStepLength, + G4double KineticEnergy) +{ + // for all particles take the width of the central part + // from a parametrization similar to the Highland formula + // ( Highland formula: Particle Physics Booklet, July 2002, eq. 26.10) + const G4double c_highland = 13.6*MeV ; + G4double betacp = sqrt(currentKinEnergy*(currentKinEnergy+2.*mass)* + KineticEnergy*(KineticEnergy+2.*mass)/ + ((currentKinEnergy+mass)*(KineticEnergy+mass))); + G4double y = trueStepLength/currentRadLength; + G4double theta0 = c_highland*charge*sqrt(y)/betacp; + y = log(y); + theta0 *= sqrt(1.+y*(0.105+0.0035*y)); + + //correction for small Zeff (based on high energy + // proton scattering data) + // see G.Shen at al. Phys.Rev.D20(1979) p.1584 + theta0 *= 1.-0.24/(Zeff*(Zeff+1.)); + + return theta0; + +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + std::vector* G4UrbanMscModel::SampleSecondaries( const G4MaterialCutsCouple*, const G4DynamicParticle* dynParticle, @@ -661,7 +780,7 @@ std::vector* G4UrbanMscModel::SampleSecondaries( G4double safety) { G4double kineticEnergy = dynParticle->GetKineticEnergy(); - if(kineticEnergy <= 0.0) return 0; + if((kineticEnergy <= 0.0) || (truestep <= 0.)) return 0; G4double cth = SampleCosineTheta(truestep,kineticEnergy); G4double sth = sqrt((1.0 - cth)*(1.0 + cth)); @@ -674,14 +793,6 @@ std::vector* G4UrbanMscModel::SampleSecondaries( newDirection.rotateUz(oldDirection); fParticleChange->ProposeMomentumDirection(newDirection); - /* - const G4ParticleDefinition* pd = dynParticle->GetDefinition(); - G4cout << "G4UrbanMscModel: Sample secondary; E(MeV)= " << kineticEnergy/MeV - << " MeV; step(mm)= " << truestep/mm - << ", safety(mm)= " << safety/mm << " " << pd->GetParticleName() - << G4endl; - */ - if (latDisplasment) { G4double r = SampleDisplacement(); @@ -716,23 +827,23 @@ std::vector* G4UrbanMscModel::SampleSecondaries( { // ******* we do not have track info at this level *********** // ******* so navigator is called at boundary too ************ - navigator->LocateGlobalPointWithinVolume(Position); - const G4double cstep = safety ; - G4double newsafety = safety; - phi = navigator->ComputeStep(Position,latDirection, - cstep,newsafety); + G4double newsafety= -100.; // = safety; + // newsafety= navigator->ComputeSafety(Position); + newsafety= safetyHelper->ComputeSafety(Position); + safety= newsafety; if(r < newsafety) fac = 1.; else fac = newsafety/r ; } - + if(fac > 0.) { // compute new endpoint of the Step G4ThreeVector newPosition = Position+fac*r*latDirection; - navigator->LocateGlobalPointWithinVolume(newPosition); + // navigator->LocateGlobalPointWithinVolume(newPosition); + safetyHelper->ReLocateWithinVolume(newPosition); fParticleChange->ProposePosition(newPosition); } @@ -749,19 +860,55 @@ G4double G4UrbanMscModel::SampleCosineTheta(G4double trueStepLength, G4double cth = 1. ; G4double tau = trueStepLength/lambda0 ; - if(trueStepLength >= currentRange*dtrl) - if(par1*trueStepLength < 1.) - tau = -par2*log(1.-par1*trueStepLength) ; - else - tau = taubig ; + Zeff = couple->GetMaterial()->GetTotNbOfElectPerVolume()/ + couple->GetMaterial()->GetTotNbOfAtomsPerVolume() ; - currentTau = tau ; - lambdaeff = trueStepLength/currentTau; - - if(trueStepLength < stepmin) - cth = exp(-currentTau) ; + if((trueStepLength <= stepmin) && (skin > 0.) && + (geomlimit <= skindepth1)) + { + //no scattering, single or plural scattering + // just before boundary crossing only (for skin > 0) + G4double mean = trueStepLength/stepmin ; + cth = 1.; + G4int n = G4Poisson(mean); + if(n > 0) + { + G4double tm = KineticEnergy/mass; + // ascr - screening parameter, factor 0.025 comes from + // requirement of 'smooth' transition msc -> single scattering + G4double ascr = 0.025*exp(log(Zeff)/3.)/(137.*sqrt(tm*(tm+2.))); + G4double ascr1 = 1.+0.5*ascr*ascr; + G4double bp1=ascr1+1.; + G4double bm1=ascr1-1.; + // single scattering from screened Rutherford x-section + G4double ct,st,phi; + G4double sx=0.,sy=0.,sz=0.; + for(G4int i=1; i<=n; i++) + { + ct = ascr1-bp1*bm1/(2.*G4UniformRand()+bm1); + if(ct < -1.) ct = -1.; + if(ct > 1.) ct = 1.; + st = sqrt(1.-ct*ct); + phi = twopi*G4UniformRand(); + sx += st*cos(phi); + sy += st*sin(phi); + sz += ct; + } + cth = sz/sqrt(sx*sx+sy*sy+sz*sz); + } + } else { + if(trueStepLength >= currentRange*dtrl) + if(par1*trueStepLength < 1.) + tau = -par2*log(1.-par1*trueStepLength) ; + else + tau = taubig ; + + currentTau = tau ; + lambdaeff = trueStepLength/currentTau; + currentRadLength = couple->GetMaterial()->GetRadlen(); + if (tau >= taubig) cth = -1.+2.*G4UniformRand(); else if (tau >= tausmall) { @@ -769,20 +916,9 @@ G4double G4UrbanMscModel::SampleCosineTheta(G4double trueStepLength, G4double prob = 0., qprob = 1. ; G4double a = 1., ea = 0., eaa = 1.; G4double xmean1 = 1., xmean2 = 0.; + G4double xsi = 3.; - // 3 model functions ( normal case)............................ - // for all particles take the width of the central part - // from a parametrization similar to the Highland formula - // ( Highland formula: Particle Physics Booklet, July 2002, eq. 26.10) - // here : theta0 = 13.6*MeV*Q*(t/X0)**0.555/(beta*cp) - const G4double xsi = 3., c_highland = 13.26*MeV ; - G4double betacp = sqrt(currentKinEnergy*(currentKinEnergy+2.*mass)* - KineticEnergy*(KineticEnergy+2.*mass)/ - ((currentKinEnergy+mass)*(KineticEnergy+mass))); - G4double tailpar = c_highland/betacp ; - const G4double corr_highland=0.54; - G4double theta0 = tailpar*charge*exp(corr_highland* - log(trueStepLength/currentRadLength)) ; + G4double theta0 = ComputeTheta0(trueStepLength,KineticEnergy); if(theta0 > taulim) a = 0.5/(1.-cos(theta0)) ; else a = 1.0/(theta0*theta0) ; @@ -793,8 +929,7 @@ G4double G4UrbanMscModel::SampleCosineTheta(G4double trueStepLength, G4double c1 = c-1.; G4double x0 = 1.-xsi/a ; - // x0 < ~cos(30 deg) - if(x0 < 0.866) + if(x0 < 0.) { // 1 model function b = exp(tau); @@ -805,8 +940,12 @@ G4double G4UrbanMscModel::SampleCosineTheta(G4double trueStepLength, } else { - c = xsi-factail*currentRadLength/(lambda0*tailpar*tailpar) ; - if(c <= 2.) c = 2.+taulim ; + //empirical tail parameter + // based some exp. data + c = 2.40-0.027*exp(2.*log(Zeff)/3.); + + if(c == 2.) c = 2.+taulim ; + if(c <= 1.) c = 1.+taulim ; c1 = c-1.; ea = exp(-xsi) ; @@ -824,7 +963,7 @@ G4double G4UrbanMscModel::SampleCosineTheta(G4double trueStepLength, G4double f1x0 = a*ea/eaa ; G4double f2x0 = c1*eb1*ebx/(eb1-ebx)/exp(c*log(bx)) ; - + // from continuity at x=x0 prob = f2x0/(f1x0+f2x0) ; @@ -907,8 +1046,3 @@ G4double G4UrbanMscModel::LatCorrelation() } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - - - - - diff --git a/source/processes/electromagnetic/standard/src/G4VeEnergyLoss.cc b/source/processes/electromagnetic/standard/src/G4VeEnergyLoss.cc index 4449fcc44b..222387011f 100644 --- a/source/processes/electromagnetic/standard/src/G4VeEnergyLoss.cc +++ b/source/processes/electromagnetic/standard/src/G4VeEnergyLoss.cc @@ -25,7 +25,7 @@ // // // $Id: G4VeEnergyLoss.cc,v 1.35 2006/06/29 19:53:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ----------------------------------------------------------------------------- diff --git a/source/processes/electromagnetic/standard/src/G4VhEnergyLoss.cc b/source/processes/electromagnetic/standard/src/G4VhEnergyLoss.cc index ce164c6c87..059b5ef250 100644 --- a/source/processes/electromagnetic/standard/src/G4VhEnergyLoss.cc +++ b/source/processes/electromagnetic/standard/src/G4VhEnergyLoss.cc @@ -25,7 +25,7 @@ // // // $Id: G4VhEnergyLoss.cc,v 1.49 2006/06/29 19:53:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ----------------------------------------------------------------------------- diff --git a/source/processes/electromagnetic/standard/src/G4WaterStopping.cc b/source/processes/electromagnetic/standard/src/G4WaterStopping.cc index 104f8575f8..d8c6e80983 100644 --- a/source/processes/electromagnetic/standard/src/G4WaterStopping.cc +++ b/source/processes/electromagnetic/standard/src/G4WaterStopping.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4WaterStopping.cc,v 1.2 2006/06/29 19:53:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ //--------------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/standard/src/G4eBremsstrahlung.cc b/source/processes/electromagnetic/standard/src/G4eBremsstrahlung.cc index ac0c3d3987..61109c43f2 100644 --- a/source/processes/electromagnetic/standard/src/G4eBremsstrahlung.cc +++ b/source/processes/electromagnetic/standard/src/G4eBremsstrahlung.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4eBremsstrahlung.cc,v 1.44 2006/06/29 19:53:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/standard/src/G4eBremsstrahlung52.cc b/source/processes/electromagnetic/standard/src/G4eBremsstrahlung52.cc index 771d407606..97995b35d7 100644 --- a/source/processes/electromagnetic/standard/src/G4eBremsstrahlung52.cc +++ b/source/processes/electromagnetic/standard/src/G4eBremsstrahlung52.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4eBremsstrahlung52.cc,v 1.6 2006/06/29 19:53:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4eBremsstrahlung52.cc,v 1.7 2006/10/16 15:26:50 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------ G4eBremsstrahlung52 physics process -------- @@ -1035,6 +1035,8 @@ void G4eBremsstrahlung52::PrintInfoDefinition() << G4BestUnit(LowerBoundLambda,"Energy") << " to " << G4BestUnit(UpperBoundLambda,"Energy") << " in " << NbinLambda << " bins. \n"; + G4cout << " WARNING: This process is obsolete and will be soon removed" + << G4endl; } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/source/processes/electromagnetic/standard/src/G4eBremsstrahlungModel.cc b/source/processes/electromagnetic/standard/src/G4eBremsstrahlungModel.cc index e4d5b9b614..8053aede59 100644 --- a/source/processes/electromagnetic/standard/src/G4eBremsstrahlungModel.cc +++ b/source/processes/electromagnetic/standard/src/G4eBremsstrahlungModel.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4eBremsstrahlungModel.cc,v 1.33 2006/06/29 19:53:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4eBremsstrahlungModel.cc,v 1.35 2006/08/29 14:00:25 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // @@ -81,13 +81,13 @@ G4eBremsstrahlungModel::G4eBremsstrahlungModel(const G4ParticleDefinition* p, const G4String& nam) : G4VEmModel(nam), particle(0), + minThreshold(1.0*keV), + isElectron(true), highKinEnergy(100.*TeV), lowKinEnergy(1.0*keV), - minThreshold(1.0*keV), probsup(1.0), MigdalConstant(classic_electr_radius*electron_Compton_length*electron_Compton_length/pi), LPMconstant(fine_structure_const*electron_mass_c2*electron_mass_c2/(8.*pi*hbarc)), - isElectron(true), theLPMflag(true) { if(p) SetParticle(p); @@ -868,24 +868,35 @@ std::vector* G4eBremsstrahlungModel::SampleSecondaries( //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... const G4Element* G4eBremsstrahlungModel::SelectRandomAtom( - const G4MaterialCutsCouple* couple) const + const G4MaterialCutsCouple* couple) { // select randomly 1 element within the material const G4Material* material = couple->GetMaterial(); G4int nElements = material->GetNumberOfElements(); const G4ElementVector* theElementVector = material->GetElementVector(); - if(1 == nElements) return (*theElementVector)[0]; - G4DataVector* dv = partialSumSigma[couple->GetIndex()]; - G4double rval = G4UniformRand()*((*dv)[nElements-1]); - for (G4int i=0; iGetName() - << G4endl; - return 0; + const G4Element* elm = 0; + + if(1 < nElements) { + + G4DataVector* dv = partialSumSigma[couple->GetIndex()]; + G4double rval = G4UniformRand()*((*dv)[nElements-1]); + + for (G4int i=0; iGetName() + << G4endl; + elm = (*theElementVector)[0]; + } + } else elm = (*theElementVector)[0]; + + SetCurrentElement(elm); + return elm; } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/source/processes/electromagnetic/standard/src/G4eCoulombScatteringModel.cc b/source/processes/electromagnetic/standard/src/G4eCoulombScatteringModel.cc index 9338a66ed2..fb47a9acd0 100644 --- a/source/processes/electromagnetic/standard/src/G4eCoulombScatteringModel.cc +++ b/source/processes/electromagnetic/standard/src/G4eCoulombScatteringModel.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4eCoulombScatteringModel.cc,v 1.2 2006/06/29 19:53:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4eCoulombScatteringModel.cc,v 1.10 2006/10/26 17:36:17 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // @@ -38,6 +38,10 @@ // Creation date: 22.08.2005 // // Modifications: +// 01.08.06 V.Ivanchenko extend upper limit of table to TeV and review the +// logic of building - only elements from G4ElementTable +// 08.08.06 V.Ivanchenko build internal table in ekin scale, introduce faclim +// 19.08.06 V.Ivanchenko add inline function ScreeningParameter // // Class Description: // @@ -49,6 +53,7 @@ #include "G4eCoulombScatteringModel.hh" #include "Randomize.hh" #include "G4DataVector.hh" +#include "G4ElementTable.hh" #include "G4PhysicsLogVector.hh" #include "G4ParticleChangeForGamma.hh" @@ -60,20 +65,21 @@ G4eCoulombScatteringModel::G4eCoulombScatteringModel( G4double thetaMin, G4double thetaMax, G4bool build, G4double tlim, const G4String& nam) : G4VEmModel(nam), - theCrossSectionTable(0), cosThetaMin(cos(thetaMin)), cosThetaMax(cos(thetaMax)), - lowMomentum(keV), - highMomentum(MeV), q2Limit(tlim), + theCrossSectionTable(0), + lowKEnergy(keV), + highKEnergy(TeV), + alpha2(fine_structure_const*fine_structure_const), + faclim(100.0), nbins(12), nmax(100), buildTable(build), isInitialised(false) { - G4double p0 = hbarc/(Bohr_radius*0.885); - a0 = 0.25*p0*p0; - p0 = electron_mass_c2*classic_electr_radius; + a0 = alpha2*electron_mass_c2*electron_mass_c2/(0.885*0.885); + G4double p0 = electron_mass_c2*classic_electr_radius; coeff = twopi*p0*p0; } @@ -90,38 +96,38 @@ G4eCoulombScatteringModel::~G4eCoulombScatteringModel() //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... void G4eCoulombScatteringModel::Initialise(const G4ParticleDefinition* p, - const G4DataVector&) + const G4DataVector&) { if(isInitialised) return; isInitialised = true; if(pParticleChange) - fParticleChange = reinterpret_cast(pParticleChange); + fParticleChange = + reinterpret_cast(pParticleChange); else fParticleChange = new G4ParticleChangeForGamma(); if(!buildTable || p->GetParticleName() == "GenericIon") return; // Compute cross section multiplied by Ptot^2*beta^2 - G4double mass = p->GetPDGMass(); - G4double mass2 = mass*mass; - - theCrossSectionTable = new G4PhysicsTable(nmax); + theCrossSectionTable = new G4PhysicsTable(); G4PhysicsLogVector* ptrVector; - G4double mom2, value; - G4double pmin = lowMomentum*lowMomentum; - G4double pmax = highMomentum*highMomentum; - nbins = G4int(log10(pmax/pmin)/2.0) + 1; + G4double e, value; + nbins = 2*G4int(log10(highKEnergy/lowKEnergy)); - for(G4int j=1; jGetZ(); + index[G4int(Z)] = j; for(G4int i=0; i<=nbins; i++) { - mom2 = ptrVector->GetLowEdgeEnergy( i ) ; - value = CalculateCrossSectionPerAtom(p, mom2, j); - value *= mom2*mom2/(mom2 + mass2); - ptrVector->PutValue( i, value ); + e = ptrVector->GetLowEdgeEnergy( i ) ; + value = CalculateCrossSectionPerAtom(p, e, Z); + ptrVector->PutValue( i, log(value) ); } theCrossSectionTable->insert(ptrVector); @@ -132,22 +138,39 @@ void G4eCoulombScatteringModel::Initialise(const G4ParticleDefinition* p, G4double G4eCoulombScatteringModel::CalculateCrossSectionPerAtom( const G4ParticleDefinition* p, - G4double momentum2, + G4double kinEnergy, G4double Z) { G4double cross = 0.0; G4double m = p->GetPDGMass(); - G4double q = p->GetPDGCharge()/eplus; - G4double mass2 = m*m; - G4double costm = std::max(cosThetaMax, 1.0 - q2Limit/2.0*momentum2); + G4double tkin = std::max(keV, kinEnergy); + G4double mom2 = tkin*(tkin + 2.0*m); + G4double costm = std::max(cosThetaMax, 1.0 - 0.5*q2Limit/mom2); if(costm < cosThetaMin) { - G4double invbeta2 = 1.0 + mass2/momentum2; - G4double a = 2.0*pow(Z,0.666666667)*a0* - (1.13 + 3.76*invbeta2*Z*Z*fine_structure_const*fine_structure_const)/momentum2 + 1.0; - cross = coeff*q*q*Z*Z*(cosThetaMin - costm)/((a - cosThetaMin)*(a - costm)); + G4double q = p->GetPDGCharge()/eplus; + G4double q2 = q*q; + G4double invbeta2 = 1.0 + m*m/mom2; + G4double A = ScreeningParameter(Z, q2, mom2, invbeta2); + G4double a = 2.0*A + 1.0; + cross = coeff*Z*(Z + 1.0)*q2*invbeta2*(cosThetaMin - costm)/ + ((a - cosThetaMin)*(a - costm)*mom2); + /* + if(Z == 13 || Z == 79) { + G4cout << "## e= " << kinEnergy << " beta= " << sqrt (1.0/invbeta2) + <<" Z= " << Z + << " sig(bn)= " << cross/barn + << " cosMax= " << costm + << " cosMin= " << cosThetaMin + << G4endl; + G4double atommass = 27.0; + if(Z == 79) atommass = 197.0; + G4double u0 = 1.e+6*atommass*cm2/(cross*Avogadro); + G4double u1 = 0.5*u0/( A* ( (1.0 + A)*log(1.0 + 1.0/A) -1.0 ) ); + G4cout << " l0= " << u0 << " l1= " << u1 + << " A= " << A << G4endl; + } + */ } - //G4cout << "p= " << sqrt(momentum2) << " Z= " << Z << " a= " << a - //<< " cross= " << cross << " " <* G4eCoulombScatteringModel::SampleSecondaries( G4double mass = dp->GetMass(); G4double kinEnergy = dp->GetKineticEnergy(); - G4double momentum2 = kinEnergy*(kinEnergy + 2.0*mass); - G4double invbeta2 = (kinEnergy + mass)*(kinEnergy + mass)/momentum2; + G4double mom2 = kinEnergy*(kinEnergy + 2.0*mass); const G4Element* elm = SelectRandomAtom(aMaterial, p, kinEnergy); G4double Z = elm->GetZ(); + G4double q = p->GetPDGCharge()/eplus; + G4double q2 = q*q; - G4double a = 2.*pow(Z,0.666666667)*a0* - (1.13 + 3.76*invbeta2*Z*Z*fine_structure_const*fine_structure_const)/momentum2 + 1.0; - G4double costm = std::max(cosThetaMax, 1.0 - q2Limit/2.0*momentum2); - if(costm > cosThetaMin) return 0; + G4double invbeta2 = 1.0 + mass*mass/mom2; + G4double a = 2.*ScreeningParameter(Z, q2, mom2, invbeta2); - G4double cost = a - (a - cosThetaMin)*(a - costm)/ - (a - cosThetaMin + G4UniformRand()*(cosThetaMin - costm)); - if(std::abs(cost) > 1.) { - G4cout << "G4eCoulombScatteringModel::SampleSecondaries WARNING cost= " << cost << G4endl; - if(cost < -1.) cost = -1.0; - else cost = 1.0; + G4double costm = std::max(cosThetaMax, 1.0 - 0.5*q2Limit/mom2); + if(costm >= cosThetaMin) return 0; + + G4double x = G4UniformRand(); + G4double y = (a + 1.0 - cosThetaMin)/(cosThetaMin - costm); + G4double st2 = 0.5*(y*(1.0 - costm) - a*x)/(y + x); + if(st2 < 0.0 || st2 > 1.0) { + G4cout << "G4eCoulombScatteringModel::SampleSecondaries WARNING st2= " + << st2 << G4endl; + st2 = 0.0; } - G4double sint = sqrt((1.0 + cost)*(1.0 - cost)); + + G4double tet = 2.0*asin(sqrt(st2)); + G4double cost= cos(tet); + G4double sint= sin(tet); G4double phi = twopi * G4UniformRand(); @@ -190,7 +219,7 @@ std::vector* G4eCoulombScatteringModel::SampleSecondaries( G4ThreeVector newDirection(cos(phi)*sint,sin(phi)*sint,cost); newDirection.rotateUz(direction); - fParticleChange->ProposeMomentumDirection(direction); + fParticleChange->ProposeMomentumDirection(newDirection); return 0; } diff --git a/source/processes/electromagnetic/standard/src/G4eIonisation.cc b/source/processes/electromagnetic/standard/src/G4eIonisation.cc index c803194941..fc421dc183 100644 --- a/source/processes/electromagnetic/standard/src/G4eIonisation.cc +++ b/source/processes/electromagnetic/standard/src/G4eIonisation.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4eIonisation.cc,v 1.50 2006/06/29 19:53:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/standard/src/G4eIonisation52.cc b/source/processes/electromagnetic/standard/src/G4eIonisation52.cc index d95298a455..85e59655ea 100644 --- a/source/processes/electromagnetic/standard/src/G4eIonisation52.cc +++ b/source/processes/electromagnetic/standard/src/G4eIonisation52.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4eIonisation52.cc,v 1.5 2006/06/29 19:53:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4eIonisation52.cc,v 1.6 2006/10/16 15:26:50 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------- G4eIonisation52 physics process -------------------------------- // by Laszlo Urban, 20 March 1997 @@ -531,6 +531,8 @@ void G4eIonisation52::PrintInfoDefinition() << "\n Step function: finalRange(mm)= " << finalRange << ", dRoverRange= " << dRoverRange << G4endl; + G4cout << " WARNING: This process is obsolete and will be soon removed" + << G4endl; } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/source/processes/electromagnetic/standard/src/G4eeToTwoGammaModel.cc b/source/processes/electromagnetic/standard/src/G4eeToTwoGammaModel.cc index 0cd50e1f65..5bbb0ec44a 100644 --- a/source/processes/electromagnetic/standard/src/G4eeToTwoGammaModel.cc +++ b/source/processes/electromagnetic/standard/src/G4eeToTwoGammaModel.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4eeToTwoGammaModel.cc,v 1.10 2006/06/29 19:53:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4eeToTwoGammaModel.cc,v 1.12 2006/10/20 08:59:50 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // @@ -38,9 +38,11 @@ // Creation date: 02.08.2004 // // Modifications: -// 08-04-05 Major optimisation of internal interfaces (V.Ivantchenko) -// 18-04-05 Compute CrossSectionPerVolume (V.Ivantchenko) +// 08-04-05 Major optimisation of internal interfaces (V.Ivanchenko) +// 18-04-05 Compute CrossSectionPerVolume (V.Ivanchenko) // 06-02-06 ComputeCrossSectionPerElectron, ComputeCrossSectionPerAtom (mma) +// 29-06-06 Fix problem for zero energy incident positron (V.Ivanchenko) +// 20-10-06 Add theGamma as a member (V.Ivanchenko) // // // Class Description: @@ -82,6 +84,7 @@ G4eeToTwoGammaModel::G4eeToTwoGammaModel(const G4ParticleDefinition*, : G4VEmModel(nam), pi_rcl2(pi*classic_electr_radius*classic_electr_radius) { + theGamma = G4Gamma::Gamma(); } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... @@ -151,66 +154,96 @@ vector* G4eeToTwoGammaModel::SampleSecondaries( G4double, G4double) { - G4double PositKinEnergy = dp->GetKineticEnergy(); - G4ThreeVector PositDirection = dp->GetMomentumDirection(); - - G4double tau = PositKinEnergy/electron_mass_c2; - G4double gam = tau + 1.0; - G4double tau2 = tau + 2.0; - G4double sqgrate = sqrt(tau/tau2)*0.5; - G4double sqg2m1 = sqrt(tau*tau2); - - // limits of the energy sampling - G4double epsilmin = 0.5 - sqgrate; - G4double epsilmax = 0.5 + sqgrate; - G4double epsilqot = epsilmax/epsilmin; - - // - // sample the energy rate of the created gammas - // - G4double epsil, greject; - - do { - epsil = epsilmin*pow(epsilqot,G4UniformRand()); - greject = 1. - epsil + (2.*gam*epsil-1.)/(epsil*tau2*tau2); - } while( greject < G4UniformRand() ); - - // - // scattered Gamma angles. ( Z - axis along the parent positron) - // - - G4double cost = (epsil*tau2-1.)/(epsil*sqg2m1); - G4double sint = sqrt((1.+cost)*(1.-cost)); - G4double phi = twopi * G4UniformRand(); - - G4double dirx = sint*cos(phi) , diry = sint*sin(phi) , dirz = cost; - - // - // kinematic of the created pair - // - - G4double TotalAvailableEnergy = PositKinEnergy + 2.0*electron_mass_c2; - G4double Phot1Energy = epsil*TotalAvailableEnergy; - vector* vdp = new vector; + G4double PositKinEnergy = dp->GetKineticEnergy(); - G4ThreeVector Phot1Direction (dirx, diry, dirz); - Phot1Direction.rotateUz(PositDirection); - G4DynamicParticle* aParticle1 = new G4DynamicParticle (G4Gamma::Gamma(), - Phot1Direction, Phot1Energy); - vdp->push_back(aParticle1); + // Case at rest + if(PositKinEnergy == 0.0) { + G4double cost = 2.*G4UniformRand()-1.; + G4double sint = sqrt((1. - cost)*(1. + cost)); + G4double phi = twopi * G4UniformRand(); + G4ThreeVector dir (sint*cos(phi), sint*sin(phi), cost); + G4DynamicParticle* aGamma1 = new G4DynamicParticle(theGamma, + dir, electron_mass_c2); + G4DynamicParticle* aGamma2 = new G4DynamicParticle(theGamma, + -dir, electron_mass_c2); + vdp->push_back(aGamma1); + vdp->push_back(aGamma2); - G4double Phot2Energy =(1.-epsil)*TotalAvailableEnergy; - G4double Eratio= Phot1Energy/Phot2Energy; - G4double PositP= sqrt(PositKinEnergy*(PositKinEnergy+2.*electron_mass_c2)); - G4ThreeVector Phot2Direction (-dirx*Eratio, -diry*Eratio, - (PositP-dirz*Phot1Energy)/Phot2Energy); - Phot2Direction.unit(); - Phot2Direction.rotateUz(PositDirection); - // create G4DynamicParticle object for the particle2 - G4DynamicParticle* aParticle2= new G4DynamicParticle (G4Gamma::Gamma(), - Phot2Direction, Phot2Energy); - vdp->push_back(aParticle2); + } else { + + G4ThreeVector PositDirection = dp->GetMomentumDirection(); + + G4double tau = PositKinEnergy/electron_mass_c2; + G4double gam = tau + 1.0; + G4double tau2 = tau + 2.0; + G4double sqgrate = sqrt(tau/tau2)*0.5; + G4double sqg2m1 = sqrt(tau*tau2); + + // limits of the energy sampling + G4double epsilmin = 0.5 - sqgrate; + G4double epsilmax = 0.5 + sqgrate; + G4double epsilqot = epsilmax/epsilmin; + + // + // sample the energy rate of the created gammas + // + G4double epsil, greject; + + do { + epsil = epsilmin*pow(epsilqot,G4UniformRand()); + greject = 1. - epsil + (2.*gam*epsil-1.)/(epsil*tau2*tau2); + } while( greject < G4UniformRand() ); + + // + // scattered Gamma angles. ( Z - axis along the parent positron) + // + + G4double cost = (epsil*tau2-1.)/(epsil*sqg2m1); + if(std::abs(cost) > 1.0) { + G4cout << "### G4eeToTwoGammaModel WARNING cost= " << cost + << " positron Ekin(MeV)= " << PositKinEnergy + << " gamma epsil= " << epsil + << G4endl; + if(cost > 1.0) cost = 1.0; + else cost = -1.0; + } + G4double sint = sqrt((1.+cost)*(1.-cost)); + G4double phi = twopi * G4UniformRand(); + + G4double dirx = sint*cos(phi) , diry = sint*sin(phi) , dirz = cost; + + // + // kinematic of the created pair + // + + G4double TotalAvailableEnergy = PositKinEnergy + 2.0*electron_mass_c2; + G4double Phot1Energy = epsil*TotalAvailableEnergy; + + G4ThreeVector Phot1Direction (dirx, diry, dirz); + Phot1Direction.rotateUz(PositDirection); + G4DynamicParticle* aGamma1 = + new G4DynamicParticle (theGamma,Phot1Direction, Phot1Energy); + vdp->push_back(aGamma1); + + G4double Phot2Energy =(1.-epsil)*TotalAvailableEnergy; + G4double PositP= sqrt(PositKinEnergy*(PositKinEnergy+2.*electron_mass_c2)); + G4ThreeVector dir = PositDirection*PositP - Phot1Direction*Phot1Energy; + G4ThreeVector Phot2Direction = dir.unit(); + + // create G4DynamicParticle object for the particle2 + G4DynamicParticle* aGamma2= + new G4DynamicParticle (theGamma,Phot2Direction, Phot2Energy); + vdp->push_back(aGamma2); + /* + G4cout << "Annihilation in fly: e0= " << PositKinEnergy + << " m= " << electron_mass_c2 + << " e1= " << Phot1Energy + << " e2= " << Phot2Energy << " dir= " << dir + << " -> " << Phot1Direction << " " + << Phot2Direction << G4endl; + */ + } return vdp; } diff --git a/source/processes/electromagnetic/standard/src/G4eplusAnnihilation.cc b/source/processes/electromagnetic/standard/src/G4eplusAnnihilation.cc index aea1bd3fc8..457134cb1c 100644 --- a/source/processes/electromagnetic/standard/src/G4eplusAnnihilation.cc +++ b/source/processes/electromagnetic/standard/src/G4eplusAnnihilation.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4eplusAnnihilation.cc,v 1.24 2006/06/29 19:53:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4eplusAnnihilation.cc,v 1.26 2006/09/14 10:27:19 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // @@ -43,6 +43,8 @@ // 03-05-05 suppress Integral option (mma) // 04-05-05 Make class to be default (V.Ivanchenko) // 25-01-06 remove cut dependance in AtRestDoIt (mma) +// 09-08-06 add SetModel(G4VEmModel*) (mma) +// 12-09-06, move SetModel(G4VEmModel*) in G4VEmProcess (mma) // // @@ -77,7 +79,6 @@ void G4eplusAnnihilation::InitialiseProcess(const G4ParticleDefinition*) { if(!isInitialised) { isInitialised = true; - // SetVerboseLevel(3); SetBuildTableFlag(true); SetStartFromNullFlag(false); SetSecondaryParticle(G4Gamma::Gamma()); @@ -86,10 +87,10 @@ void G4eplusAnnihilation::InitialiseProcess(const G4ParticleDefinition*) SetLambdaBinning(120); SetMinKinEnergy(emin); SetMaxKinEnergy(emax); - G4VEmModel* em = new G4eeToTwoGammaModel(); - em->SetLowEnergyLimit(emin); - em->SetHighEnergyLimit(emax); - AddEmModel(1, em); + if(!Model()) SetModel(new G4eeToTwoGammaModel); + Model()->SetLowEnergyLimit(emin); + Model()->SetHighEnergyLimit(emax); + AddEmModel(1, Model()); } } @@ -97,9 +98,10 @@ void G4eplusAnnihilation::InitialiseProcess(const G4ParticleDefinition*) void G4eplusAnnihilation::PrintInfo() { - G4cout << " Heilter model of formula of annihilation into 2 photons" - << G4endl; -} + G4cout + << " Sampling according " << Model()->GetName() << " model" + << G4endl; +} //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/source/processes/electromagnetic/standard/src/G4eplusAnnihilation52.cc b/source/processes/electromagnetic/standard/src/G4eplusAnnihilation52.cc index 4be7359dfc..9424d6713a 100644 --- a/source/processes/electromagnetic/standard/src/G4eplusAnnihilation52.cc +++ b/source/processes/electromagnetic/standard/src/G4eplusAnnihilation52.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4eplusAnnihilation52.cc,v 1.2 2006/06/29 19:53:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4eplusAnnihilation52.cc,v 1.3 2006/10/16 15:26:50 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... @@ -298,7 +298,8 @@ G4VParticleChange* G4eplusAnnihilation52::PostStepDoIt(const G4Track& aTrack, // Do not make anything if particle is stopped, the Annihilation52 then // should be performed by the AtRestDoIt! - if (aTrack.GetTrackStatus() == fStopButAlive) return &aParticleChange; + if (aTrack.GetTrackStatus() == fStopButAlive || PositKinEnergy == 0.0) + return &aParticleChange; G4double gamam1 = PositKinEnergy/electron_mass_c2; G4double gama = gamam1+1. , gamap1 = gamam1+2.; @@ -493,6 +494,8 @@ void G4eplusAnnihilation52::PrintInfoDefinition() << G4BestUnit(LowestEnergyLimit ,"Energy") << " to " << G4BestUnit(HighestEnergyLimit,"Energy") << " in " << NumbBinTable << " bins. \n"; + G4cout << " WARNING: This process is obsolete and will be soon removed" + << G4endl; } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/source/processes/electromagnetic/standard/src/G4hIonisation.cc b/source/processes/electromagnetic/standard/src/G4hIonisation.cc index 1e3bc40556..75620052a8 100644 --- a/source/processes/electromagnetic/standard/src/G4hIonisation.cc +++ b/source/processes/electromagnetic/standard/src/G4hIonisation.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4hIonisation.cc,v 1.65 2006/06/29 19:54:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/standard/src/G4hIonisation52.cc b/source/processes/electromagnetic/standard/src/G4hIonisation52.cc index 208dc8092f..5e9a1aac54 100644 --- a/source/processes/electromagnetic/standard/src/G4hIonisation52.cc +++ b/source/processes/electromagnetic/standard/src/G4hIonisation52.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4hIonisation52.cc,v 1.5 2006/06/29 19:54:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4hIonisation52.cc,v 1.6 2006/10/16 15:26:50 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //---------------- G4hIonisation52 physics process ------------------------------- // by Laszlo Urban, 30 May 1997 @@ -616,6 +616,8 @@ void G4hIonisation52::PrintInfoDefinition() << "\n Step function: finalRange(mm)= " << finalRange << ", dRoverRange= " << dRoverRange << G4endl; + G4cout << " WARNING: This process is obsolete and will be soon removed" + << G4endl; } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/source/processes/electromagnetic/standard/src/G4hMultipleScattering.cc b/source/processes/electromagnetic/standard/src/G4hMultipleScattering.cc new file mode 100644 index 0000000000..c590ba3d11 --- /dev/null +++ b/source/processes/electromagnetic/standard/src/G4hMultipleScattering.cc @@ -0,0 +1,143 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4hMultipleScattering.cc,v 1.1 2006/10/26 11:04:39 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ----------------------------------------------------------------------------- +// +// GEANT4 Class file +// +// File name: G4hMultipleScattering +// +// Author: Laszlo Urban +// +// Creation date: 24.10.2006 cloned from G4MultipleScattering +// +// Modified: +// +// ----------------------------------------------------------------------------- +// +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#include "G4hMultipleScattering.hh" +#include "G4UrbanMscModel.hh" +#include "G4TransportationManager.hh" +#include "G4Navigator.hh" + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +using namespace std; + +G4hMultipleScattering::G4hMultipleScattering(const G4String& processName) + : G4VMultipleScattering(processName) +{ + lowKineticEnergy = 0.1*keV; + highKineticEnergy = 100.*TeV; + totBins = 120; + + facrange = 0.2; + dtrl = 0.05; + lambdalimit = 1.*mm; + facgeom = 0.5; + // there is no single scattering for this skin <= 0 + // to have single scattering at boundary + // skin should be > 0 ! + skin = 0.; + + steppingAlgorithm = false; + samplez = false ; + isInitialized = false; + + SetBinning(totBins); + SetMinKinEnergy(lowKineticEnergy); + SetMaxKinEnergy(highKineticEnergy); + + SetLateralDisplasmentFlag(true); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +G4hMultipleScattering::~G4hMultipleScattering() +{} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +G4bool G4hMultipleScattering::IsApplicable (const G4ParticleDefinition& p) +{ + return (p.GetPDGCharge() != 0.0 && !p.IsShortLived()); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void G4hMultipleScattering::MscStepLimitation(G4bool algorithm, G4double factor) +{ + steppingAlgorithm = algorithm; + if (factor > 0.) SetFacrange(factor); + else { if (algorithm) SetFacrange(0.02); else SetFacrange(0.2);} + + if(verboseLevel > 1) + G4cout << "Stepping algorithm is set to " << steppingAlgorithm + << " with facrange = " << facrange << G4endl; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void G4hMultipleScattering::InitialiseProcess(const G4ParticleDefinition* p) +{ + if(isInitialized) { + mscUrban->SetMscStepLimitation(steppingAlgorithm, facrange); + return; + } + + if (p->GetParticleType() == "nucleus") { + SetLateralDisplasmentFlag(false); + SetBuildLambdaTable(false); + } else { + SetBuildLambdaTable(true); + } + mscUrban = new G4UrbanMscModel(facrange,dtrl,lambdalimit, + facgeom,skin, + samplez,steppingAlgorithm); + mscUrban->SetLateralDisplasmentFlag(LateralDisplasmentFlag()); + mscUrban->SetLowEnergyLimit(lowKineticEnergy); + mscUrban->SetHighEnergyLimit(highKineticEnergy); + AddEmModel(1,mscUrban); + isInitialized = true; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void G4hMultipleScattering::PrintInfo() +{ + G4cout << " Boundary/stepping algorithm is active with facrange= " + << facrange + << " Step limitation " << steppingAlgorithm + << G4endl; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + diff --git a/source/processes/electromagnetic/standard/src/G4ionIonisation.cc b/source/processes/electromagnetic/standard/src/G4ionIonisation.cc index 243cda94f7..8adb4eba9e 100644 --- a/source/processes/electromagnetic/standard/src/G4ionIonisation.cc +++ b/source/processes/electromagnetic/standard/src/G4ionIonisation.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4ionIonisation.cc,v 1.37 2006/06/29 19:54:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/utils/History b/source/processes/electromagnetic/utils/History index aa17b52576..309bfe95be 100644 --- a/source/processes/electromagnetic/utils/History +++ b/source/processes/electromagnetic/utils/History @@ -1,4 +1,4 @@ -$Id: History,v 1.253 2006/06/07 17:09:59 vnivanch Exp $ +$Id: History,v 1.261 2006/11/10 18:34:57 vnivanch Exp $ ------------------------------------------------------------------- ========================================================= @@ -17,6 +17,31 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +10 November 06: V.Ivant (emutils-V08-01-06) +- G4EnergyLossMessenger - add commands binsDEDX, binsLambda + +23 October 06: V.Ivant (emutils-V08-01-05) +- G4LossTableManger - add method GetEnergyLossProcess +- G4EmCalculator - 10 keV - 1 keV energy to access lowEnergy ionisation + +29 Septenber 06: V.Ivant (emutils-V08-01-04) +- G4EmCalculator add computation of smoothing factor for dedx of hadrons/ions + +13 September 06: mma (emutils-V08-01-03) +- G4VEmProcess: add function SetModel( G4VEmModel* ) + +29 August 06: V.Ivant (emutils-V08-01-02) +- G4VEmModel add member currentElement and protected Get/Set methods + +15 June 06: V.Ivant (emutils-V08-01-01) +- G4VEnergyLossProcess - make protected LambdaPhysicsVector method +- G4ionEffectiveCharge - add protection for NULL pointer to material + +05 July 06: V.Ivant (emutils-V08-01-00) +- G4LossTableManager - do not clear loss table map to avoid crash for + activate/desactivate regime with ion gun, + propagate 'RandomStep' flag to processes + 07 June 06: V.Ivant (emutils-V08-00-20) - G4VEnergyLossProcess - Do not change particle momentum AlongStep diff --git a/source/processes/electromagnetic/utils/include/G4DummyModel.hh b/source/processes/electromagnetic/utils/include/G4DummyModel.hh index f92a8fc5c0..2e8d7b13fe 100644 --- a/source/processes/electromagnetic/utils/include/G4DummyModel.hh +++ b/source/processes/electromagnetic/utils/include/G4DummyModel.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4DummyModel.hh,v 1.2 2006/06/29 19:54:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/utils/include/G4EmCalculator.hh b/source/processes/electromagnetic/utils/include/G4EmCalculator.hh index b93c15f8f2..b89b63c511 100644 --- a/source/processes/electromagnetic/utils/include/G4EmCalculator.hh +++ b/source/processes/electromagnetic/utils/include/G4EmCalculator.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4EmCalculator.hh,v 1.16 2006/06/29 19:54:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4EmCalculator.hh,v 1.17 2006/09/29 10:13:48 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------------- @@ -43,6 +43,7 @@ // 11.01.2006 Add GetCSDARange (V.Ivanchenko) // 26.01.2006 Rename GetRange -> GetRangeFromRestricteDEDX (V.Ivanchenko) // 22.03.2006 Add ComputeElectronicDEDX and ComputeTotalDEDX (V.Ivanchenko) +// 29.09.2006 Add member loweModel (V.Ivanchenko) // // Class Description: // @@ -225,6 +226,7 @@ private: const G4ParticleDefinition* baseParticle; const G4PhysicsTable* currentLambda; G4VEmModel* currentModel; + G4VEmModel* loweModel; G4VEnergyLossProcess* currentProcess; const G4ParticleDefinition* theGenericIon; diff --git a/source/processes/electromagnetic/utils/include/G4EmCorrections.hh b/source/processes/electromagnetic/utils/include/G4EmCorrections.hh index fe30909541..8009209b94 100644 --- a/source/processes/electromagnetic/utils/include/G4EmCorrections.hh +++ b/source/processes/electromagnetic/utils/include/G4EmCorrections.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4EmCorrections.hh,v 1.8 2006/06/29 19:54:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/utils/include/G4EmModelManager.hh b/source/processes/electromagnetic/utils/include/G4EmModelManager.hh index c3500b94c9..6b7e6e209d 100644 --- a/source/processes/electromagnetic/utils/include/G4EmModelManager.hh +++ b/source/processes/electromagnetic/utils/include/G4EmModelManager.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4EmModelManager.hh,v 1.19 2006/06/29 19:54:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/utils/include/G4EmMultiModel.hh b/source/processes/electromagnetic/utils/include/G4EmMultiModel.hh index 8dc278b4a8..3b4639e093 100644 --- a/source/processes/electromagnetic/utils/include/G4EmMultiModel.hh +++ b/source/processes/electromagnetic/utils/include/G4EmMultiModel.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4EmMultiModel.hh,v 1.5 2006/06/29 19:54:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/utils/include/G4EmProcessOptions.hh b/source/processes/electromagnetic/utils/include/G4EmProcessOptions.hh index 3119f50e2f..9f0fd5a635 100644 --- a/source/processes/electromagnetic/utils/include/G4EmProcessOptions.hh +++ b/source/processes/electromagnetic/utils/include/G4EmProcessOptions.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4EmProcessOptions.hh,v 1.9 2006/06/29 19:54:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------------- diff --git a/source/processes/electromagnetic/utils/include/G4EmTableType.hh b/source/processes/electromagnetic/utils/include/G4EmTableType.hh index 3f7daccb4e..1298b062d1 100644 --- a/source/processes/electromagnetic/utils/include/G4EmTableType.hh +++ b/source/processes/electromagnetic/utils/include/G4EmTableType.hh @@ -25,7 +25,7 @@ // // // $Id: G4EmTableType.hh,v 1.2 2006/06/29 19:54:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/utils/include/G4EnergyLossMessenger.hh b/source/processes/electromagnetic/utils/include/G4EnergyLossMessenger.hh index 0ba20bb892..9e9af07b86 100644 --- a/source/processes/electromagnetic/utils/include/G4EnergyLossMessenger.hh +++ b/source/processes/electromagnetic/utils/include/G4EnergyLossMessenger.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4EnergyLossMessenger.hh,v 1.13 2006/06/29 19:54:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4EnergyLossMessenger.hh,v 1.14 2006/11/10 18:34:57 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // @@ -40,6 +40,7 @@ // Modifications: // 10-01-06 SetStepLimits -> SetStepFunction (V.Ivantchenko) // 10-05-06 Add command MscStepLimit (V.Ivantchenko) +// 10-11-06 Add command binsDEDX (V.Ivantchenko) // // ------------------------------------------------------------------- // @@ -101,6 +102,8 @@ private: G4UIcmdWithABool* rangeCmd; G4UIcmdWithABool* lpmCmd; G4UIcmdWithAnInteger* verCmd; + G4UIcmdWithAnInteger* dedxCmd; + G4UIcmdWithAnInteger* lbCmd; }; #endif diff --git a/source/processes/electromagnetic/utils/include/G4EnergyLossTables.hh b/source/processes/electromagnetic/utils/include/G4EnergyLossTables.hh index 6948fa96ff..fa11d9f1e0 100644 --- a/source/processes/electromagnetic/utils/include/G4EnergyLossTables.hh +++ b/source/processes/electromagnetic/utils/include/G4EnergyLossTables.hh @@ -25,7 +25,7 @@ // // // $Id: G4EnergyLossTables.hh,v 1.19 2006/06/29 19:54:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // $Id: // diff --git a/source/processes/electromagnetic/utils/include/G4LossTableBuilder.hh b/source/processes/electromagnetic/utils/include/G4LossTableBuilder.hh index 06e5c0bdb7..4b8cde8f7d 100644 --- a/source/processes/electromagnetic/utils/include/G4LossTableBuilder.hh +++ b/source/processes/electromagnetic/utils/include/G4LossTableBuilder.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4LossTableBuilder.hh,v 1.7 2006/06/29 19:54:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------------- diff --git a/source/processes/electromagnetic/utils/include/G4LossTableManager.hh b/source/processes/electromagnetic/utils/include/G4LossTableManager.hh index ef30903c9d..bcea4bab96 100644 --- a/source/processes/electromagnetic/utils/include/G4LossTableManager.hh +++ b/source/processes/electromagnetic/utils/include/G4LossTableManager.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4LossTableManager.hh,v 1.41 2006/06/29 19:54:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4LossTableManager.hh,v 1.43 2006/10/23 19:05:47 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------------- @@ -210,6 +210,8 @@ public: G4double BremsstrahlungTh() const; + G4VEnergyLossProcess* GetEnergyLossProcess(const G4ParticleDefinition *aParticle); + const std::vector& GetEnergyLossProcessVector(); const std::vector& GetEmProcessVector(); @@ -300,16 +302,7 @@ inline G4double G4LossTableManager::GetDEDX( G4double kineticEnergy, const G4MaterialCutsCouple *couple) { - if(aParticle != currentParticle) { - currentParticle = aParticle; - std::map >::const_iterator pos; - if ((pos = loss_map.find(aParticle)) != loss_map.end()) { - currentLoss = (*pos).second; - } else { - currentLoss = 0; - // ParticleHaveNoLoss(aParticle); - } - } + if(aParticle != currentParticle) GetEnergyLossProcess(aParticle); G4double x; if(currentLoss) x = currentLoss->GetDEDX(kineticEnergy, couple); else x = G4EnergyLossTables::GetDEDX( @@ -324,16 +317,7 @@ inline G4double G4LossTableManager::GetSubDEDX( G4double kineticEnergy, const G4MaterialCutsCouple *couple) { - if(aParticle != currentParticle) { - currentParticle = aParticle; - std::map >::const_iterator pos; - if ((pos = loss_map.find(aParticle)) != loss_map.end()) { - currentLoss = (*pos).second; - } else { - currentLoss = 0; - // ParticleHaveNoLoss(aParticle); - } - } + if(aParticle != currentParticle) GetEnergyLossProcess(aParticle); G4double x = 0.0; if(currentLoss) x = currentLoss->GetDEDXForSubsec(kineticEnergy, couple); return x; @@ -346,15 +330,7 @@ inline G4double G4LossTableManager::GetCSDARange( G4double kineticEnergy, const G4MaterialCutsCouple *couple) { - if(aParticle != currentParticle) { - currentParticle = aParticle; - std::map >::const_iterator pos; - if ((pos = loss_map.find(currentParticle)) != loss_map.end()) { - currentLoss = (*pos).second; - } else { - currentLoss = 0; - } - } + if(aParticle != currentParticle) GetEnergyLossProcess(aParticle); G4double x = DBL_MAX; if(currentLoss) x = currentLoss->GetCSDARange(kineticEnergy, couple); return x; @@ -367,22 +343,11 @@ inline G4double G4LossTableManager::GetRangeFromRestricteDEDX( G4double kineticEnergy, const G4MaterialCutsCouple *couple) { - if(aParticle != currentParticle) { - currentParticle = aParticle; - std::map >::const_iterator pos; - if ((pos = loss_map.find(currentParticle)) != loss_map.end()) { - currentLoss = (*pos).second; - } else { - currentLoss = 0; -// ParticleHaveNoLoss(aParticle); - } - } + if(aParticle != currentParticle) GetEnergyLossProcess(aParticle); G4double x; - if(currentLoss) { - x = currentLoss->GetRangeForLoss(kineticEnergy, couple); - } else { + if(currentLoss) x = currentLoss->GetRangeForLoss(kineticEnergy, couple); + else x = G4EnergyLossTables::GetRange(currentParticle,kineticEnergy,couple,false); - } return x; } @@ -393,22 +358,11 @@ inline G4double G4LossTableManager::GetRange( G4double kineticEnergy, const G4MaterialCutsCouple *couple) { - if(aParticle != currentParticle) { - currentParticle = aParticle; - std::map >::const_iterator pos; - if ((pos = loss_map.find(currentParticle)) != loss_map.end()) { - currentLoss = (*pos).second; - } else { - currentLoss = 0; -// ParticleHaveNoLoss(aParticle); - } - } + if(aParticle != currentParticle) GetEnergyLossProcess(aParticle); G4double x; - if(currentLoss) { - x = currentLoss->GetRange(kineticEnergy, couple); - } else { + if(currentLoss) x = currentLoss->GetRange(kineticEnergy, couple); + else x = G4EnergyLossTables::GetRange(currentParticle,kineticEnergy,couple,false); - } return x; } @@ -419,16 +373,7 @@ inline G4double G4LossTableManager::GetEnergy( G4double range, const G4MaterialCutsCouple *couple) { - if(aParticle != currentParticle) { - currentParticle = aParticle; - std::map >::const_iterator pos; - if ((pos = loss_map.find(aParticle)) != loss_map.end()) { - currentLoss = (*pos).second; - } else { - currentLoss = 0; - // ParticleHaveNoLoss(aParticle); - } - } + if(aParticle != currentParticle) GetEnergyLossProcess(aParticle); G4double x; if(currentLoss) x = currentLoss->GetKineticEnergy(range, couple); else x = G4EnergyLossTables::GetPreciseEnergyFromRange( @@ -458,5 +403,23 @@ inline G4double G4LossTableManager::GetDEDXDispersion( //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +inline G4VEnergyLossProcess* G4LossTableManager::GetEnergyLossProcess( + const G4ParticleDefinition *aParticle) +{ + if(aParticle != currentParticle) { + currentParticle = aParticle; + std::map >::const_iterator pos; + if ((pos = loss_map.find(aParticle)) != loss_map.end()) { + currentLoss = (*pos).second; + } else { + currentLoss = 0; + // ParticleHaveNoLoss(aParticle); + } + } + return currentLoss; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + #endif diff --git a/source/processes/electromagnetic/utils/include/G4VEmFluctuationModel.hh b/source/processes/electromagnetic/utils/include/G4VEmFluctuationModel.hh index d20664d1b5..765eb5d4c8 100644 --- a/source/processes/electromagnetic/utils/include/G4VEmFluctuationModel.hh +++ b/source/processes/electromagnetic/utils/include/G4VEmFluctuationModel.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4VEmFluctuationModel.hh,v 1.10 2006/06/29 19:54:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/utils/include/G4VEmModel.hh b/source/processes/electromagnetic/utils/include/G4VEmModel.hh index 90e1401a84..15a417c8d5 100644 --- a/source/processes/electromagnetic/utils/include/G4VEmModel.hh +++ b/source/processes/electromagnetic/utils/include/G4VEmModel.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4VEmModel.hh,v 1.42 2006/06/29 19:54:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VEmModel.hh,v 1.45 2006/08/29 19:18:54 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // @@ -58,6 +58,7 @@ // 02-02-06 ComputeCrossSectionPerAtom: default value A=0. (mma) // 06-02-06 add method ComputeMeanFreePath() (mma) // 07-03-06 Optimize msc methods (V.Ivanchenko) +// 29-06-06 Add member currentElement and Get/Set methods (V.Ivanchenko) // // Class Description: // @@ -172,7 +173,7 @@ public: protected: virtual G4double MaxSecondaryEnergy(const G4ParticleDefinition*, - G4double kineticEnergy); + G4double kineticEnergy); //------------------------------------------------------------------------ // Generic methods common to all models @@ -202,6 +203,12 @@ public: const G4String& GetName() const; +protected: + + const G4Element* GetCurrentElement() const; + + void SetCurrentElement(const G4Element*); + private: // hide assignment operator @@ -214,7 +221,8 @@ private: G4VEmFluctuationModel* fluc; - const G4String name; + const G4String name; + const G4Element* currentElement; protected: @@ -327,16 +335,33 @@ inline const G4Element* G4VEmModel::SelectRandomAtom( G4double tmax) { const G4ElementVector* theElementVector = material->GetElementVector(); - const G4Element* elm = (*theElementVector)[0]; + currentElement = (*theElementVector)[0]; G4int nelm = material->GetNumberOfElements() - 1; if (nelm > 0) { G4double x = G4UniformRand()* CrossSectionPerVolume(material,pd,kinEnergy,tcut,tmax); - G4int i = -1; - do {i++;} while (x > xsec[i] && i < nelm); - elm = (*theElementVector)[i]; + for(G4int i=0; iGetA() in ComputeCrossSectionPerAtom // 22.03.2006 Add ComputeElectronicDEDX and ComputeTotalDEDX (V.Ivanchenko) // 13.05.2006 Add Corrections for ion stopping (V.Ivanchenko) +// 29.09.2006 Uncomment computation of smoothing factor (V.Ivanchenko) +// 27.10.2006 Change test energy to access lowEnergy model from +// 10 keV to 1 keV (V. Ivanchenko) // // Class Description: // @@ -90,6 +93,8 @@ G4EmCalculator::G4EmCalculator() currentParticle = 0; baseParticle = 0; currentLambda = 0; + currentModel = 0; + loweModel = 0; chargeSquare = 1.0; massRatio = 1.0; currentParticleName= ""; @@ -395,7 +400,6 @@ G4double G4EmCalculator::ComputeDEDX(G4double kinEnergy, } if(UpdateParticle(p, kinEnergy)) { if(FindEmModel(p, processName, kinEnergy)) { - // G4cout << "currentModel= " << currentModel << G4endl; G4double escaled = kinEnergy*massRatio; if(baseParticle) { res = currentModel->ComputeDEDXPerVolume( @@ -424,37 +428,34 @@ G4double G4EmCalculator::ComputeDEDX(G4double kinEnergy, << G4endl; } - /* + // emulate boundary region for different parameterisations G4double eth = currentModel->LowEnergyLimit(); - if(eth > 0.05*MeV && eth < 10.*MeV && escaled > eth) { + // G4cout << "massRatio= " << massRatio << " eth= " << eth << G4endl; + if(eth > 0.05*MeV && eth < 10.*MeV && escaled > eth && + loweModel != currentModel && loweModel) { + G4double res0 = 0.0; G4double res1 = 0.0; if(baseParticle) { res1 = currentModel->ComputeDEDXPerVolume(mat, baseParticle, eth, cut) * chargeSquare; + res0 = loweModel->ComputeDEDXPerVolume(mat, baseParticle, eth, cut) + * chargeSquare; } else { res1 = currentModel->ComputeDEDXPerVolume(mat, p, eth, cut); + res0 = loweModel->ComputeDEDXPerVolume(mat, p, eth, cut); } if(verbose > 1) G4cout << "At boundary energy(MeV)= " << eth/MeV << " DEDX(MeV/mm)= " << res1*mm/MeV << G4endl; if(isIon) res1 += corr->HighOrderCorrections(p,mat,eth/massRatio); - G4double res0 = res1; - if(FindEmModel(p, processName, eth-1.0*keV)) { - if(baseParticle) { - res0 = currentModel->ComputeDEDXPerVolume( - mat, baseParticle, eth, cut) * chargeSquare; - } else { - res0 = currentModel->ComputeDEDXPerVolume(mat, p, eth, cut); - } - } //G4cout << "eth= " << eth << " escaled= " << escaled // << " res0= " << res0 << " res1= " // << res1 << " q2= " << chargeSquare << G4endl; res *= (1.0 + (res0/res1 - 1.0)*eth/escaled); } - */ + if(verbose > 0) { G4cout << "E(MeV)= " << kinEnergy/MeV << " DEDX(MeV/mm)= " << res*mm/MeV @@ -906,6 +907,7 @@ G4bool G4EmCalculator::FindEmModel(const G4ParticleDefinition* p, // Search for the process currentName = processName; currentModel = 0; + loweModel = 0; size_t idx = 0; G4LossTableManager* lManager = G4LossTableManager::Instance(); const std::vector vel = @@ -922,12 +924,14 @@ G4bool G4EmCalculator::FindEmModel(const G4ParticleDefinition* p, // G4cout << "i= " << i << " bp= " << bp << G4endl; if(!bp) { currentModel = (vel[i])->SelectModelForMaterial(scaledEnergy, idx); + loweModel = (vel[i])->SelectModelForMaterial(keV, idx); isApplicable = true; break; } else { for(G4int j=0; jParticle() == bp) { currentModel = (vel[j])->SelectModelForMaterial(scaledEnergy, idx); + loweModel = (vel[j])->SelectModelForMaterial(keV, idx); isApplicable = true; break; } @@ -943,6 +947,7 @@ G4bool G4EmCalculator::FindEmModel(const G4ParticleDefinition* p, (vem[i])->Particle() == part) { currentModel = (vem[i])->SelectModelForMaterial(kinEnergy, idx); + loweModel = (vem[i])->SelectModelForMaterial(keV, idx); isApplicable = true; break; } @@ -957,6 +962,7 @@ G4bool G4EmCalculator::FindEmModel(const G4ParticleDefinition* p, (vmsc[i])->Particle() == part) { currentModel = (vmsc[i])->SelectModelForMaterial(kinEnergy, idx); + loweModel = (vmsc[i])->SelectModelForMaterial(keV, idx); isApplicable = true; break; } diff --git a/source/processes/electromagnetic/utils/src/G4EmCorrections.cc b/source/processes/electromagnetic/utils/src/G4EmCorrections.cc index eededbad0a..b8690a8508 100644 --- a/source/processes/electromagnetic/utils/src/G4EmCorrections.cc +++ b/source/processes/electromagnetic/utils/src/G4EmCorrections.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4EmCorrections.cc,v 1.20 2006/06/29 19:54:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/utils/src/G4EmModelManager.cc b/source/processes/electromagnetic/utils/src/G4EmModelManager.cc index 0e33da7486..1eee16162d 100644 --- a/source/processes/electromagnetic/utils/src/G4EmModelManager.cc +++ b/source/processes/electromagnetic/utils/src/G4EmModelManager.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4EmModelManager.cc,v 1.36 2006/06/29 19:55:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/utils/src/G4EmMultiModel.cc b/source/processes/electromagnetic/utils/src/G4EmMultiModel.cc index 2ebeefe9ad..c38f91e191 100644 --- a/source/processes/electromagnetic/utils/src/G4EmMultiModel.cc +++ b/source/processes/electromagnetic/utils/src/G4EmMultiModel.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4EmMultiModel.cc,v 1.5 2006/06/29 19:55:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/utils/src/G4EmProcessOptions.cc b/source/processes/electromagnetic/utils/src/G4EmProcessOptions.cc index 080ac873ac..e8b42c5609 100644 --- a/source/processes/electromagnetic/utils/src/G4EmProcessOptions.cc +++ b/source/processes/electromagnetic/utils/src/G4EmProcessOptions.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4EmProcessOptions.cc,v 1.18 2006/06/29 19:55:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/utils/src/G4EnergyLossMessenger.cc b/source/processes/electromagnetic/utils/src/G4EnergyLossMessenger.cc index 00af122b21..fc6ae6e304 100644 --- a/source/processes/electromagnetic/utils/src/G4EnergyLossMessenger.cc +++ b/source/processes/electromagnetic/utils/src/G4EnergyLossMessenger.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4EnergyLossMessenger.cc,v 1.20 2006/06/29 19:55:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4EnergyLossMessenger.cc,v 1.21 2006/11/10 18:34:57 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // @@ -38,9 +38,10 @@ // Creation date: 22-06-2000 // // Modifications: -// 10-01-06 SetStepLimits -> SetStepFunction (V.Ivantchenko) -// 10-01-06 PreciseRange -> CSDARange (V.Ivantchenko) -// 10-05-06 Add command MscStepLimit (V.Ivantchenko) +// 10-01-06 SetStepLimits -> SetStepFunction (V.Ivanchenko) +// 10-01-06 PreciseRange -> CSDARange (V.Ivanchenko) +// 10-05-06 Add command MscStepLimit (V.Ivanchenko) +// 10-10-06 Ann DEDXBinning command (V.Ivanchenko) // // ------------------------------------------------------------------- // @@ -59,6 +60,7 @@ #include "G4UIcmdWithABool.hh" #include "G4UIcmdWithAnInteger.hh" #include "G4UIcmdWithADoubleAndUnit.hh" +#include "G4EmProcessOptions.hh" #include @@ -147,10 +149,24 @@ G4EnergyLossMessenger::G4EnergyLossMessenger() lpmCmd->SetDefaultValue(true); lpmCmd->AvailableForStates(G4State_PreInit,G4State_Idle); + dedxCmd = new G4UIcmdWithAnInteger("/process/eLoss/binsDEDX",this); + dedxCmd->SetGuidance("Set number of bins for DEDX tables."); + dedxCmd->SetParameterName("binsDEDX",true); + // dedxCmd->SetParameterRange("binsDEDX>59"); + dedxCmd->SetDefaultValue(120); + dedxCmd->AvailableForStates(G4State_PreInit); + + lbCmd = new G4UIcmdWithAnInteger("/process/eLoss/binsLambda",this); + lbCmd->SetGuidance("Set number of bins for Lambda tables."); + lbCmd->SetParameterName("binsL",true); + // lbCmd->SetParameterRange("binsL>59"); + lbCmd->SetDefaultValue(120); + lbCmd->AvailableForStates(G4State_PreInit); + verCmd = new G4UIcmdWithAnInteger("/process/eLoss/verbose",this); verCmd->SetGuidance("Set verbose level for EM physics."); verCmd->SetParameterName("verb",true); - verCmd->SetDefaultValue(true); + verCmd->SetDefaultValue(1); verCmd->AvailableForStates(G4State_PreInit,G4State_Idle); mscCmd = new G4UIcommand("/process/eLoss/MscStepLimit",this); @@ -186,6 +202,8 @@ G4EnergyLossMessenger::~G4EnergyLossMessenger() delete lpmCmd; delete verCmd; delete mscCmd; + delete dedxCmd; + delete lbCmd; } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... @@ -254,7 +272,13 @@ void G4EnergyLossMessenger::SetNewValue(G4UIcommand* command,G4String newValue) if (command == verCmd) { lossTables->SetVerbose(verCmd->GetNewIntValue(newValue)); } - + G4EmProcessOptions opt; + if (command == dedxCmd) { + opt.SetDEDXBinning(verCmd->GetNewIntValue(newValue)); + } + if (command == lbCmd) { + opt.SetDEDXBinning(verCmd->GetNewIntValue(newValue)); + } } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... diff --git a/source/processes/electromagnetic/utils/src/G4EnergyLossTables.cc b/source/processes/electromagnetic/utils/src/G4EnergyLossTables.cc index a502a81d8e..3f6ed296ca 100644 --- a/source/processes/electromagnetic/utils/src/G4EnergyLossTables.cc +++ b/source/processes/electromagnetic/utils/src/G4EnergyLossTables.cc @@ -25,7 +25,7 @@ // // // $Id: G4EnergyLossTables.cc,v 1.33 2006/06/29 19:55:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // first version created by P.Urban , 06/04/1998 diff --git a/source/processes/electromagnetic/utils/src/G4LossTableBuilder.cc b/source/processes/electromagnetic/utils/src/G4LossTableBuilder.cc index 02bf46df39..3ab22ffc53 100644 --- a/source/processes/electromagnetic/utils/src/G4LossTableBuilder.cc +++ b/source/processes/electromagnetic/utils/src/G4LossTableBuilder.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4LossTableBuilder.cc,v 1.20 2006/06/29 19:55:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/utils/src/G4LossTableManager.cc b/source/processes/electromagnetic/utils/src/G4LossTableManager.cc index 59bdf85906..ca54948677 100644 --- a/source/processes/electromagnetic/utils/src/G4LossTableManager.cc +++ b/source/processes/electromagnetic/utils/src/G4LossTableManager.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4LossTableManager.cc,v 1.72.2.1 2006/06/29 19:55:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4LossTableManager.cc,v 1.75 2006/12/13 15:44:42 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // @@ -64,6 +64,7 @@ // 23-03-06 Set flag isIonisation (VI) // 10-05-06 Add methods SetMscStepLimitation, FacRange and MscFlag (VI) // 22-05-06 Add methods Set/Get bremsTh (VI) +// 05-06-06 Do not clear loss_table map between runs (VI) // // Class Description: // @@ -197,6 +198,7 @@ void G4LossTableManager::Register(G4VEnergyLossProcess* p) all_tables_are_built = false; if(!lossFluctuationFlag) p->SetLossFluctuations(false); if(subCutoffFlag) p->ActivateSubCutoff(true); + if(rndmStepFlag) p->SetRandomStep(true); if(stepFunctionActive) p->SetStepFunction(maxRangeVariation, maxFinalStep); if(integralActive) p->SetIntegral(integral); if(minEnergyActive) p->SetMinKinEnergy(minKinEnergy); @@ -320,7 +322,7 @@ void G4LossTableManager::EnergyLossProcessIsInitialised( } } - if(!all_tables_are_built) loss_map.clear(); + // if(!all_tables_are_built) loss_map.clear(); currentParticle = 0; SetParameters(p); @@ -617,8 +619,13 @@ void G4LossTableManager::SetMinSubRange(G4double val) //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... -void G4LossTableManager::SetRandomStep(G4bool) -{} +void G4LossTableManager::SetRandomStep(G4bool val) +{ + rndmStepFlag = val; + for(G4int i=0; iSetRandomStep(val); + } +} //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... diff --git a/source/processes/electromagnetic/utils/src/G4VEmFluctuationModel.cc b/source/processes/electromagnetic/utils/src/G4VEmFluctuationModel.cc index 126b228762..1e43e52e59 100644 --- a/source/processes/electromagnetic/utils/src/G4VEmFluctuationModel.cc +++ b/source/processes/electromagnetic/utils/src/G4VEmFluctuationModel.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4VEmFluctuationModel.cc,v 1.2 2006/06/29 19:55:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/utils/src/G4VEmModel.cc b/source/processes/electromagnetic/utils/src/G4VEmModel.cc index f64b484fa2..3a0b92d985 100644 --- a/source/processes/electromagnetic/utils/src/G4VEmModel.cc +++ b/source/processes/electromagnetic/utils/src/G4VEmModel.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4VEmModel.cc,v 1.6 2006/06/29 19:55:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/utils/src/G4VEmProcess.cc b/source/processes/electromagnetic/utils/src/G4VEmProcess.cc index 904ab12d23..4d39c8f413 100644 --- a/source/processes/electromagnetic/utils/src/G4VEmProcess.cc +++ b/source/processes/electromagnetic/utils/src/G4VEmProcess.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4VEmProcess.cc,v 1.35 2006/06/29 19:55:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VEmProcess.cc,v 1.36 2006/09/13 10:34:32 maire Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // @@ -48,7 +48,7 @@ // 25-07-05 Add protection: integral mode only for charged particles (VI) // 04-09-05 default lambdaFactor 0.8 (V.Ivanchenko) // 11-01-06 add A to parameters of ComputeCrossSectionPerAtom (VI) -// +// 12-09-06 add SetModel() (mma) // // Class Description: // @@ -80,6 +80,7 @@ G4VEmProcess::G4VEmProcess(const G4String& name, G4ProcessType type): G4VDiscreteProcess(name, type), + selectedModel(0), theLambdaTable(0), theEnergyOfCrossSectionMax(0), theCrossSectionMax(0), @@ -241,6 +242,20 @@ void G4VEmProcess::SetSecondaryParticle(const G4ParticleDefinition* p) //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... +void G4VEmProcess::SetModel(G4VEmModel* model) +{ + selectedModel = model; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +G4VEmModel* G4VEmProcess::Model() +{ + return selectedModel; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + void G4VEmProcess::AddEmModel(G4int order, G4VEmModel* p, const G4Region* region) { diff --git a/source/processes/electromagnetic/utils/src/G4VEnergyLoss.cc b/source/processes/electromagnetic/utils/src/G4VEnergyLoss.cc index 46cfc119f5..5521ab6f8f 100644 --- a/source/processes/electromagnetic/utils/src/G4VEnergyLoss.cc +++ b/source/processes/electromagnetic/utils/src/G4VEnergyLoss.cc @@ -25,7 +25,7 @@ // // // $Id: G4VEnergyLoss.cc,v 1.46 2006/06/29 19:55:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------- diff --git a/source/processes/electromagnetic/utils/src/G4VEnergyLossProcess.cc b/source/processes/electromagnetic/utils/src/G4VEnergyLossProcess.cc index 5aeec41ee8..042a79b5b5 100644 --- a/source/processes/electromagnetic/utils/src/G4VEnergyLossProcess.cc +++ b/source/processes/electromagnetic/utils/src/G4VEnergyLossProcess.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4VEnergyLossProcess.cc,v 1.90 2006/06/29 19:55:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/utils/src/G4VMultipleScattering.cc b/source/processes/electromagnetic/utils/src/G4VMultipleScattering.cc index 334814af26..3c6992b24e 100644 --- a/source/processes/electromagnetic/utils/src/G4VMultipleScattering.cc +++ b/source/processes/electromagnetic/utils/src/G4VMultipleScattering.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4VMultipleScattering.cc,v 1.39 2006/06/29 19:55:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // diff --git a/source/processes/electromagnetic/utils/src/G4ionEffectiveCharge.cc b/source/processes/electromagnetic/utils/src/G4ionEffectiveCharge.cc index 10876ea190..a2227eac18 100644 --- a/source/processes/electromagnetic/utils/src/G4ionEffectiveCharge.cc +++ b/source/processes/electromagnetic/utils/src/G4ionEffectiveCharge.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4ionEffectiveCharge.cc,v 1.13 2006/06/29 19:55:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ionEffectiveCharge.cc,v 1.14 2006/08/15 16:21:39 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------------- // @@ -42,6 +42,7 @@ // 25.01.2005 Add protection - min Charge 0.1 eplus (V.Ivanchenko) // 28.04.2006 Set upper energy limit to 50 MeV (V.Ivanchenko) // 23.05.2006 Set upper energy limit to Z*10 MeV (V.Ivanchenko) +// 15.08.2006 Add protection for not defined material (V.Ivanchenko) // // ------------------------------------------------------------------- @@ -89,7 +90,7 @@ G4double G4ionEffectiveCharge::EffectiveCharge(const G4ParticleDefinition* p, // Vol.1, Pergamon Press, 1985 // Fast ions or hadrons G4double reducedEnergy = kineticEnergy * proton_mass_c2/mass ; - if( reducedEnergy > Zi*energyHighLimit || Zi < 1.5 ) return charge; + if( reducedEnergy > Zi*energyHighLimit || Zi < 1.5 || !material) return charge; static G4double vFermi[92] = { 1.0309, 0.15976, 0.59782, 1.0781, 1.0486, 1.0, 1.058, 0.93942, 0.74562, 0.3424, diff --git a/source/processes/electromagnetic/xrays/include/G4Cerenkov.hh b/source/processes/electromagnetic/xrays/include/G4Cerenkov.hh index ba5dcd67eb..dbe0d62495 100644 --- a/source/processes/electromagnetic/xrays/include/G4Cerenkov.hh +++ b/source/processes/electromagnetic/xrays/include/G4Cerenkov.hh @@ -25,7 +25,7 @@ // // // $Id: G4Cerenkov.hh,v 1.8 2006/06/29 19:55:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //////////////////////////////////////////////////////////////////////// diff --git a/source/processes/electromagnetic/xrays/include/G4ForwardXrayTR.hh b/source/processes/electromagnetic/xrays/include/G4ForwardXrayTR.hh index 827aba2d45..e0a7394370 100644 --- a/source/processes/electromagnetic/xrays/include/G4ForwardXrayTR.hh +++ b/source/processes/electromagnetic/xrays/include/G4ForwardXrayTR.hh @@ -25,7 +25,7 @@ // // // $Id: G4ForwardXrayTR.hh,v 1.14 2006/06/29 19:55:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4ForwardXrayTR -- header file // diff --git a/source/processes/electromagnetic/xrays/include/G4GammaXTRadiator.hh b/source/processes/electromagnetic/xrays/include/G4GammaXTRadiator.hh index 7c8b569010..daf46c3a74 100644 --- a/source/processes/electromagnetic/xrays/include/G4GammaXTRadiator.hh +++ b/source/processes/electromagnetic/xrays/include/G4GammaXTRadiator.hh @@ -25,7 +25,7 @@ // // // $Id: G4GammaXTRadiator.hh,v 1.4 2006/06/29 19:55:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // /////////////////////////////////////////////////////////////////////////// diff --git a/source/processes/electromagnetic/xrays/include/G4RegularXTRadiator.hh b/source/processes/electromagnetic/xrays/include/G4RegularXTRadiator.hh index 70c2d1933e..5e0ce9f05d 100644 --- a/source/processes/electromagnetic/xrays/include/G4RegularXTRadiator.hh +++ b/source/processes/electromagnetic/xrays/include/G4RegularXTRadiator.hh @@ -25,7 +25,7 @@ // // // $Id: G4RegularXTRadiator.hh,v 1.3 2006/06/29 19:55:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // /////////////////////////////////////////////////////////////////////////// diff --git a/source/processes/electromagnetic/xrays/include/G4Scintillation.hh b/source/processes/electromagnetic/xrays/include/G4Scintillation.hh index 80a8222963..1ebb724031 100644 --- a/source/processes/electromagnetic/xrays/include/G4Scintillation.hh +++ b/source/processes/electromagnetic/xrays/include/G4Scintillation.hh @@ -25,7 +25,7 @@ // // // $Id: G4Scintillation.hh,v 1.13 2006/06/29 19:55:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //////////////////////////////////////////////////////////////////////// diff --git a/source/processes/electromagnetic/xrays/include/G4StrawTubeXTRadiator.hh b/source/processes/electromagnetic/xrays/include/G4StrawTubeXTRadiator.hh index ca1d8e2b8c..65de9fd4be 100644 --- a/source/processes/electromagnetic/xrays/include/G4StrawTubeXTRadiator.hh +++ b/source/processes/electromagnetic/xrays/include/G4StrawTubeXTRadiator.hh @@ -25,7 +25,7 @@ // // // $Id: G4StrawTubeXTRadiator.hh,v 1.2 2006/06/29 19:55:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // /////////////////////////////////////////////////////////////////////////// diff --git a/source/processes/electromagnetic/xrays/include/G4SynchrotronRadiation.hh b/source/processes/electromagnetic/xrays/include/G4SynchrotronRadiation.hh index f69ad8b93b..86aca66f42 100644 --- a/source/processes/electromagnetic/xrays/include/G4SynchrotronRadiation.hh +++ b/source/processes/electromagnetic/xrays/include/G4SynchrotronRadiation.hh @@ -25,7 +25,7 @@ // // // $Id: G4SynchrotronRadiation.hh,v 1.4 2006/06/29 19:55:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------ // GEANT 4 class header file diff --git a/source/processes/electromagnetic/xrays/include/G4SynchrotronRadiationInMat.hh b/source/processes/electromagnetic/xrays/include/G4SynchrotronRadiationInMat.hh index 2141b0a143..9f5559e4fb 100644 --- a/source/processes/electromagnetic/xrays/include/G4SynchrotronRadiationInMat.hh +++ b/source/processes/electromagnetic/xrays/include/G4SynchrotronRadiationInMat.hh @@ -25,7 +25,7 @@ // // // $Id: G4SynchrotronRadiationInMat.hh,v 1.2 2006/06/29 19:55:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------ // GEANT 4 class header file diff --git a/source/processes/electromagnetic/xrays/include/G4TransitionRadiation.hh b/source/processes/electromagnetic/xrays/include/G4TransitionRadiation.hh index e8072977a8..36a89b79b8 100644 --- a/source/processes/electromagnetic/xrays/include/G4TransitionRadiation.hh +++ b/source/processes/electromagnetic/xrays/include/G4TransitionRadiation.hh @@ -25,7 +25,7 @@ // // // $Id: G4TransitionRadiation.hh,v 1.9 2006/06/29 19:55:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4TransitionRadiation -- header file // diff --git a/source/processes/electromagnetic/xrays/include/G4TransparentRegXTRadiator.hh b/source/processes/electromagnetic/xrays/include/G4TransparentRegXTRadiator.hh index a206f3d5d6..956973a428 100644 --- a/source/processes/electromagnetic/xrays/include/G4TransparentRegXTRadiator.hh +++ b/source/processes/electromagnetic/xrays/include/G4TransparentRegXTRadiator.hh @@ -25,7 +25,7 @@ // // // $Id: G4TransparentRegXTRadiator.hh,v 1.2 2006/06/29 19:55:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // /////////////////////////////////////////////////////////////////////////// diff --git a/source/processes/electromagnetic/xrays/include/G4VTRModel.hh b/source/processes/electromagnetic/xrays/include/G4VTRModel.hh index 0415b81583..45f8e3ea3c 100644 --- a/source/processes/electromagnetic/xrays/include/G4VTRModel.hh +++ b/source/processes/electromagnetic/xrays/include/G4VTRModel.hh @@ -25,7 +25,7 @@ // // // $Id: G4VTRModel.hh,v 1.3 2006/06/29 19:55:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VTRModel -- header file // diff --git a/source/processes/electromagnetic/xrays/include/G4VTransitionRadiation.hh b/source/processes/electromagnetic/xrays/include/G4VTransitionRadiation.hh index 00d9cf654f..c704a83515 100644 --- a/source/processes/electromagnetic/xrays/include/G4VTransitionRadiation.hh +++ b/source/processes/electromagnetic/xrays/include/G4VTransitionRadiation.hh @@ -25,7 +25,7 @@ // // // $Id: G4VTransitionRadiation.hh,v 1.3 2006/06/29 19:55:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VTransitionRadiation -- header file // diff --git a/source/processes/electromagnetic/xrays/include/G4VXTRenergyLoss.hh b/source/processes/electromagnetic/xrays/include/G4VXTRenergyLoss.hh index c16c5424a8..d110689dfa 100644 --- a/source/processes/electromagnetic/xrays/include/G4VXTRenergyLoss.hh +++ b/source/processes/electromagnetic/xrays/include/G4VXTRenergyLoss.hh @@ -25,7 +25,7 @@ // // // $Id: G4VXTRenergyLoss.hh,v 1.18 2006/06/29 19:55:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // /////////////////////////////////////////////////////////////////////////// diff --git a/source/processes/electromagnetic/xrays/src/G4Cerenkov.cc b/source/processes/electromagnetic/xrays/src/G4Cerenkov.cc index abb6731efa..f5f1295c9b 100644 --- a/source/processes/electromagnetic/xrays/src/G4Cerenkov.cc +++ b/source/processes/electromagnetic/xrays/src/G4Cerenkov.cc @@ -25,7 +25,7 @@ // // // $Id: G4Cerenkov.cc,v 1.21 2006/06/29 19:56:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //////////////////////////////////////////////////////////////////////// // Cerenkov Radiation Class Implementation diff --git a/source/processes/electromagnetic/xrays/src/G4ForwardXrayTR.cc b/source/processes/electromagnetic/xrays/src/G4ForwardXrayTR.cc index 6078234d0e..1852045e14 100644 --- a/source/processes/electromagnetic/xrays/src/G4ForwardXrayTR.cc +++ b/source/processes/electromagnetic/xrays/src/G4ForwardXrayTR.cc @@ -25,7 +25,7 @@ // // // $Id: G4ForwardXrayTR.cc,v 1.13 2006/06/29 19:56:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4ForwardXrayTR class -- implementation file diff --git a/source/processes/electromagnetic/xrays/src/G4GammaXTRadiator.cc b/source/processes/electromagnetic/xrays/src/G4GammaXTRadiator.cc index 3dc6ee40c3..8626b669b4 100644 --- a/source/processes/electromagnetic/xrays/src/G4GammaXTRadiator.cc +++ b/source/processes/electromagnetic/xrays/src/G4GammaXTRadiator.cc @@ -25,7 +25,7 @@ // // // $Id: G4GammaXTRadiator.cc,v 1.5 2006/06/29 19:56:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include diff --git a/source/processes/electromagnetic/xrays/src/G4RegularXTRadiator.cc b/source/processes/electromagnetic/xrays/src/G4RegularXTRadiator.cc index 9407670535..41db98bf50 100644 --- a/source/processes/electromagnetic/xrays/src/G4RegularXTRadiator.cc +++ b/source/processes/electromagnetic/xrays/src/G4RegularXTRadiator.cc @@ -25,7 +25,7 @@ // // // $Id: G4RegularXTRadiator.cc,v 1.9 2006/06/29 19:56:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include diff --git a/source/processes/electromagnetic/xrays/src/G4Scintillation.cc b/source/processes/electromagnetic/xrays/src/G4Scintillation.cc index 7558b7f64a..f7536bfcb6 100644 --- a/source/processes/electromagnetic/xrays/src/G4Scintillation.cc +++ b/source/processes/electromagnetic/xrays/src/G4Scintillation.cc @@ -25,7 +25,7 @@ // // // $Id: G4Scintillation.cc,v 1.26 2006/06/29 19:56:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //////////////////////////////////////////////////////////////////////// // Scintillation Light Class Implementation diff --git a/source/processes/electromagnetic/xrays/src/G4StrawTubeXTRadiator.cc b/source/processes/electromagnetic/xrays/src/G4StrawTubeXTRadiator.cc index 0828cca57e..b87a4c82d2 100644 --- a/source/processes/electromagnetic/xrays/src/G4StrawTubeXTRadiator.cc +++ b/source/processes/electromagnetic/xrays/src/G4StrawTubeXTRadiator.cc @@ -25,7 +25,7 @@ // // // $Id: G4StrawTubeXTRadiator.cc,v 1.4 2006/06/29 19:56:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include diff --git a/source/processes/electromagnetic/xrays/src/G4SynchrotronRadiation.cc b/source/processes/electromagnetic/xrays/src/G4SynchrotronRadiation.cc index a4718585e0..149b6b8872 100644 --- a/source/processes/electromagnetic/xrays/src/G4SynchrotronRadiation.cc +++ b/source/processes/electromagnetic/xrays/src/G4SynchrotronRadiation.cc @@ -25,7 +25,7 @@ // // // $Id: G4SynchrotronRadiation.cc,v 1.5 2006/06/29 19:56:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------- // GEANT 4 class implementation file diff --git a/source/processes/electromagnetic/xrays/src/G4SynchrotronRadiationInMat.cc b/source/processes/electromagnetic/xrays/src/G4SynchrotronRadiationInMat.cc index 098fa7fcc5..0d90681616 100644 --- a/source/processes/electromagnetic/xrays/src/G4SynchrotronRadiationInMat.cc +++ b/source/processes/electromagnetic/xrays/src/G4SynchrotronRadiationInMat.cc @@ -25,7 +25,7 @@ // // // $Id: G4SynchrotronRadiationInMat.cc,v 1.2 2006/06/29 19:56:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------- // GEANT 4 class implementation file diff --git a/source/processes/electromagnetic/xrays/src/G4TransitionRadiation.cc b/source/processes/electromagnetic/xrays/src/G4TransitionRadiation.cc index 5a27758890..50d1c09ff9 100644 --- a/source/processes/electromagnetic/xrays/src/G4TransitionRadiation.cc +++ b/source/processes/electromagnetic/xrays/src/G4TransitionRadiation.cc @@ -25,7 +25,7 @@ // // // $Id: G4TransitionRadiation.cc,v 1.7 2006/06/29 19:56:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4TransitionRadiation class -- implementation file diff --git a/source/processes/electromagnetic/xrays/src/G4TransparentRegXTRadiator.cc b/source/processes/electromagnetic/xrays/src/G4TransparentRegXTRadiator.cc index 076ca444b7..4e267ab0b8 100644 --- a/source/processes/electromagnetic/xrays/src/G4TransparentRegXTRadiator.cc +++ b/source/processes/electromagnetic/xrays/src/G4TransparentRegXTRadiator.cc @@ -25,7 +25,7 @@ // // // $Id: G4TransparentRegXTRadiator.cc,v 1.10 2006/06/29 19:56:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include diff --git a/source/processes/electromagnetic/xrays/src/G4VTransitionRadiation.cc b/source/processes/electromagnetic/xrays/src/G4VTransitionRadiation.cc index 1f35112865..44ff519ff5 100644 --- a/source/processes/electromagnetic/xrays/src/G4VTransitionRadiation.cc +++ b/source/processes/electromagnetic/xrays/src/G4VTransitionRadiation.cc @@ -25,7 +25,7 @@ // // // $Id: G4VTransitionRadiation.cc,v 1.5 2006/06/29 19:56:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VTransitionRadiation class -- implementation file diff --git a/source/processes/electromagnetic/xrays/src/G4VXTRenergyLoss.cc b/source/processes/electromagnetic/xrays/src/G4VXTRenergyLoss.cc index b58c10d5f9..018e6a3ac1 100644 --- a/source/processes/electromagnetic/xrays/src/G4VXTRenergyLoss.cc +++ b/source/processes/electromagnetic/xrays/src/G4VXTRenergyLoss.cc @@ -25,7 +25,7 @@ // // // $Id: G4VXTRenergyLoss.cc,v 1.34 2006/06/29 19:56:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // History: // 2001-2002 R&D by V.Grichine diff --git a/source/processes/hadronic/cross_sections/GNUmakefile b/source/processes/hadronic/cross_sections/GNUmakefile index b9029f7825..cd92dabe4b 100644 --- a/source/processes/hadronic/cross_sections/GNUmakefile +++ b/source/processes/hadronic/cross_sections/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.5 2004/05/27 11:08:05 flei Exp $ +# $Id: GNUmakefile,v 1.6 2006/07/20 12:48:28 grichine Exp $ # ---------------------------------------------------------------- # GNUmakefile for hadronic management library. G.Folger 10-Dec-97 # ---------------------------------------------------------------- @@ -24,6 +24,7 @@ CPPFLAGS += -I$(G4BASE)/global/management/include \ -I$(G4BASE)/particles/hadrons/barions/include \ -I$(G4BASE)/particles/hadrons/ions/include \ -I$(G4BASE)/processes/management/include \ + -I$(G4BASE)/processes/hadronic/models/management/include/ \ -I$(G4BASE)/processes/hadronic/util/include \ -I$(G4BASE)/processes/hadronic/models/util/include \ -I$(G4BASE)/materials/include diff --git a/source/processes/hadronic/cross_sections/History b/source/processes/hadronic/cross_sections/History new file mode 100644 index 0000000000..6f02d57df8 --- /dev/null +++ b/source/processes/hadronic/cross_sections/History @@ -0,0 +1,78 @@ +------------------------------------------------------------------- + + ========================================================== + Geant4 - an Object-Oriented Toolkit for Physics Simulation + ========================================================== + + History file for hadronic/cross_sections directory + -------------------------------------------------- + +This file should be used to summarize modifications introduced in the +code and to keep track of all tags. + + --------------------------------------------------------------- + * Please list in reverse chronological order (last date on top) + --------------------------------------------------------------- + +16 Nov 2006 D.W. for Vladimir Grichine (hadr-cross-V08-01-08) +------------------------------------------------------------- +- G4GlauberGribovCrossSection: extend applicability down to 0.3 GeV for + protons and neutrons (not 100 MeV as in hadr-cross-V08-01-06) + +- Dennis Wright: add missing methods + G4double + GetHadronNucleaonXsc(const G4DynamicParticle*,G4double At,G4double Zt); + G4double + GetHadronNucleaonXscNS(const G4DynamicParticle*,const G4Element*); + G4double + GetHadronNucleaonXscNS(const G4DynamicParticle*,G4double At,G4double Zt); + to get code to compile + +- initialize hpXsc, hnXsc to 0 + +15 Nov 2006 Tatsumi Koi (hadr-cross-V08-01-07) +---------------------------------------------------------------------- +- include/G4IonsShenCrossSection.hh +- src/G4IonsShenCrossSection.cc +: extend range of validity to 1TeV/n, using + constant cross section above 10GeV/n. + +13 Nov 2006 Dennis Wright for Vladimir Grichine (hadr-cross-V08-01-06) +---------------------------------------------------------------------- +- G4GlauberGribovCrossSection.cc: extend range of validity for protons + down to 100 MeV + +3 Oct 2006 Gunter Folger (hadr-cross-V08-01-04) +--------------------------------------------------- +- G4ProtonInelasticCrossSection: extend range of validity to 1TeV, using + constant cross section above 20GeV. + +2 Oct 2006 Vladimir Grichine (hadr-cross-V08-01-03) +--------------------------------------------------- + +- G4GlauberGribovCrossSection::GetCrossSection() : fix bug in inelastic +cross section. Bug was discovered in the paper from which the cross +was derived. + +31 Aug 2006 Vladimir Ivanchenko (hadr-cross-V08-01-02) +------------------------------------------------------ +- new wrapper cross section classes G4UInelasticCrossSection and + G4UElasticCrossSection which combine cross sections from different + data sets +- new G4UPiNuclearCrossSection providing another implementation + of elastic and inelastic cross sections from Barashenkov + + +17, 21 Aug 2006 Gunter Folger (same tag as 31 Aug above) +-------------------------------------------------------- +- added two missing Ca inelastic pi- entries, changed formatting +- changed scaling of cross sections for elements not tabulated from scaling + in Z^(2/3) to A^0.75 + + +11 Aug 2006 Dennis Wright (hadr-cross-V08-01-00) +------------------------------------------------ +- new cross section class G4GlauberGribovCrossSection for proton, pion, + kaon, (and maybe gamma and neutron) total and elastic cross sections + introduced by V. Grichine. Effective energies: > 3 GeV. + diff --git a/source/processes/hadronic/cross_sections/include/G4ElectroNuclearCrossSection.hh b/source/processes/hadronic/cross_sections/include/G4ElectroNuclearCrossSection.hh index 3c046692d1..0d57ffaa2f 100644 --- a/source/processes/hadronic/cross_sections/include/G4ElectroNuclearCrossSection.hh +++ b/source/processes/hadronic/cross_sections/include/G4ElectroNuclearCrossSection.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // GEANT4 physics class: G4ElectroNuclearCrossSection -- header file diff --git a/source/processes/hadronic/cross_sections/include/G4GlauberGribovCrossSection.hh b/source/processes/hadronic/cross_sections/include/G4GlauberGribovCrossSection.hh new file mode 100644 index 0000000000..4fee7b87c6 --- /dev/null +++ b/source/processes/hadronic/cross_sections/include/G4GlauberGribovCrossSection.hh @@ -0,0 +1,135 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Calculation of the total, elastic and inelastic cross-sections +// based on parametrisations of (proton, pion, kaon, photon) nucleon +// cross-sections and the hadron-nucleous cross-section model in +// the framework of Glauber-Gribov approach +// +// +// +// +// +// 17.07.06 V. Grichine - first implementation +// +// + +#ifndef G4GlauberGribovCrossSection_h +#define G4GlauberGribovCrossSection_h + +#include "globals.hh" +#include "G4Proton.hh" +#include "G4Nucleus.hh" + +#include "G4VCrossSectionDataSet.hh" + +class G4ParticleDefinition; + +class G4GlauberGribovCrossSection : public G4VCrossSectionDataSet +{ +public: + + G4GlauberGribovCrossSection (); + virtual ~G4GlauberGribovCrossSection (); + + virtual + G4bool IsApplicable(const G4DynamicParticle* aDP, const G4Element*); + + virtual + G4double GetCrossSection(const G4DynamicParticle*, + const G4Element*, G4double aTemperature); + + virtual + void BuildPhysicsTable(const G4ParticleDefinition&) + {} + + virtual + void DumpPhysicsTable(const G4ParticleDefinition&) + {G4cout << "G4GlauberGribovCrossSection: uses Glauber-Gribov formula"<GetDefinition()==G4Proton::Proton()) && - ( aPart->GetKineticEnergy()<20*GeV) ) result = true; + ( aPart->GetKineticEnergy()<1*TeV) ) result = true; if(aEle->GetZ()<3) result = false; return result; } diff --git a/examples/extended/medical/GammaTherapy/include/DecaysBuilder.hh b/source/processes/hadronic/cross_sections/include/G4UElasticCrossSection.hh similarity index 66% rename from examples/extended/medical/GammaTherapy/include/DecaysBuilder.hh rename to source/processes/hadronic/cross_sections/include/G4UElasticCrossSection.hh index 751e9c59e7..a8e3edd932 100644 --- a/examples/extended/medical/GammaTherapy/include/DecaysBuilder.hh +++ b/source/processes/hadronic/cross_sections/include/G4UElasticCrossSection.hh @@ -23,52 +23,58 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// Calculation of hadron elastic cross-sections using selected set of +// original componetns +// +// 12.08.06 V.Ivanchenko - first implementation // -// $Id: DecaysBuilder.hh,v 1.2 2006/06/29 17:25:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ // -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#ifndef DecaysBuilder_h -#define DecaysBuilder_h 1 +#ifndef G4UElasticCrossSection_h +#define G4UElasticCrossSection_h -#include "G4VPhysicsConstructor.hh" #include "globals.hh" +#include "G4VCrossSectionDataSet.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -class DecaysBuilder : public G4VPhysicsConstructor +class G4ParticleDefinition; +class G4GlauberGribovCrossSection; +class G4HadronCrossSections; +class G4UPiNuclearCrossSection; + +class G4UElasticCrossSection : public G4VCrossSectionDataSet { public: - DecaysBuilder(const G4String& name = "decays"); - virtual ~DecaysBuilder(); -public: - // This method is dummy for physics - virtual void ConstructParticle(); + G4UElasticCrossSection (); - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); + virtual ~G4UElasticCrossSection (); + + virtual + G4bool IsApplicable(const G4DynamicParticle*, const G4Element*); + + virtual + G4double GetCrossSection(const G4DynamicParticle*, + const G4Element*, G4double aTemperature); + + virtual + void BuildPhysicsTable(const G4ParticleDefinition&); + + virtual + void DumpPhysicsTable(const G4ParticleDefinition&); private: - // hide assignment operator - DecaysBuilder & operator=(const DecaysBuilder &right); - DecaysBuilder(const DecaysBuilder&); + G4int idx; + + G4GlauberGribovCrossSection* fGlauber; + G4HadronCrossSections* fGheisha; + G4UPiNuclearCrossSection* fUPi; -}; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +}; + #endif - - - - - - - - diff --git a/examples/extended/medical/GammaTherapy/include/G4EmQEDBuilder.hh b/source/processes/hadronic/cross_sections/include/G4UInelasticCrossSection.hh similarity index 61% rename from examples/extended/medical/GammaTherapy/include/G4EmQEDBuilder.hh rename to source/processes/hadronic/cross_sections/include/G4UInelasticCrossSection.hh index ef48b47808..037c6c2b24 100644 --- a/examples/extended/medical/GammaTherapy/include/G4EmQEDBuilder.hh +++ b/source/processes/hadronic/cross_sections/include/G4UInelasticCrossSection.hh @@ -23,45 +23,62 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// Calculation of hadron elastic cross-sections using selected set of +// original componetns +// +// 12.08.06 V.Ivanchenko - first implementation // -// $Id: G4EmQEDBuilder.hh,v 1.2 2006/06/29 17:26:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ // -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#ifndef G4EmQEDBuilder_h -#define G4EmQEDBuilder_h 1 +#ifndef G4UInelasticCrossSection_h +#define G4UInelasticCrossSection_h -#include "G4VPhysicsConstructor.hh" #include "globals.hh" +#include "G4VCrossSectionDataSet.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -class G4EmQEDBuilder : public G4VPhysicsConstructor +class G4ParticleDefinition; +class G4GlauberGribovCrossSection; +class G4ProtonInelasticCrossSection; +class G4NeutronInelasticCrossSection; +class G4UPiNuclearCrossSection; +class G4HadronCrossSections; +class G4ParticleDefinition; + +class G4UInelasticCrossSection : public G4VCrossSectionDataSet { public: - G4EmQEDBuilder(const G4String& name = "EM_stan_QED"); - virtual ~G4EmQEDBuilder(); -public: - // This method is dummy for physics - virtual void ConstructParticle(); + G4UInelasticCrossSection (const G4ParticleDefinition*); - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); + virtual ~G4UInelasticCrossSection (); + + virtual + G4bool IsApplicable(const G4DynamicParticle*, const G4Element*); + + virtual + G4double GetCrossSection(const G4DynamicParticle*, + const G4Element*, G4double aTemperature); + + virtual + void BuildPhysicsTable(const G4ParticleDefinition&); + + virtual + void DumpPhysicsTable(const G4ParticleDefinition&); private: - // hide assignment operator - G4EmQEDBuilder & operator=(const G4EmQEDBuilder &right); - G4EmQEDBuilder(const G4EmQEDBuilder&); + G4int idx; -}; + G4GlauberGribovCrossSection* fGlauber; + G4ProtonInelasticCrossSection* fGhadProton; + G4NeutronInelasticCrossSection* fGhadNeutron; + G4UPiNuclearCrossSection* fUPi; + G4HadronCrossSections* fGheisha; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#endif +}; +#endif diff --git a/source/processes/hadronic/cross_sections/include/G4UPiNuclearCrossSection.hh b/source/processes/hadronic/cross_sections/include/G4UPiNuclearCrossSection.hh new file mode 100644 index 0000000000..15406de232 --- /dev/null +++ b/source/processes/hadronic/cross_sections/include/G4UPiNuclearCrossSection.hh @@ -0,0 +1,110 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Calculation of the total, elastic and inelastic cross-sections +// based on Barashenkov parametrisations of pion data +// +// 16.08.06 V.Ivanchenko - first implementation +// + + +#ifndef G4UPiNuclearCrossSection_h +#define G4UPiNuclearCrossSection_h + +#include "G4VCrossSectionDataSet.hh" +#include "G4DynamicParticle.hh" +#include "G4DataVector.hh" +#include "globals.hh" +#include + +class G4PhysicsTable; + +class G4UPiNuclearCrossSection : public G4VCrossSectionDataSet +{ +public: + + G4UPiNuclearCrossSection(); + + virtual ~G4UPiNuclearCrossSection(); + + G4bool IsApplicable(const G4DynamicParticle* aParticle, + const G4Element* anElement); + + G4double GetCrossSection(const G4DynamicParticle* aParticle, + const G4Element* anElement, G4double); + + G4double GetElasticCrossSection(const G4DynamicParticle* aParticle, + const G4Element* anElement); + + G4double GetInelasticCrossSection(const G4DynamicParticle* aParticle, + const G4Element* anElement); + + void BuildPhysicsTable(const G4ParticleDefinition&); + + void DumpPhysicsTable(const G4ParticleDefinition&); + +private: + + void Initialise(); + + void AddDataSet(const G4String& p, const G4double* tot, + const G4double* in, const G4double* e, G4int n); + + G4double Interpolate(G4double Z, G4double A, G4double ekin, + G4PhysicsTable*); + + G4int NZ; + std::vector theZ; + G4DataVector theA; + G4PhysicsTable* piPlusElastic; + G4PhysicsTable* piPlusInelastic; + G4PhysicsTable* piMinusElastic; + G4PhysicsTable* piMinusInelastic; + + G4double aPower; + G4double elow; + G4double elowest; + + const G4ParticleDefinition* piPlus; + const G4ParticleDefinition* piMinus; +}; + +inline G4bool G4UPiNuclearCrossSection::IsApplicable( + const G4DynamicParticle* part, + const G4Element* elm) +{ + return ((part->GetDefinition() == piMinus || + part->GetDefinition() == piPlus) && + elm->GetZ() > 1.5); +} + +inline G4double G4UPiNuclearCrossSection::GetCrossSection( + const G4DynamicParticle* dp, + const G4Element* elm, G4double) +{ + return GetInelasticCrossSection(dp, elm); +} + +#endif diff --git a/source/processes/hadronic/cross_sections/src/G4ElectroNuclearCrossSection.cc b/source/processes/hadronic/cross_sections/src/G4ElectroNuclearCrossSection.cc index 8c0ebd6313..9b9c8772ed 100644 --- a/source/processes/hadronic/cross_sections/src/G4ElectroNuclearCrossSection.cc +++ b/source/processes/hadronic/cross_sections/src/G4ElectroNuclearCrossSection.cc @@ -25,7 +25,7 @@ // // // $Id: G4ElectroNuclearCrossSection.cc,v 1.25 2006/06/29 19:57:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Physics class: G4ElectroNuclearCrossSection for gamma+A cross sections diff --git a/source/processes/hadronic/cross_sections/src/G4GlauberGribovCrossSection.cc b/source/processes/hadronic/cross_sections/src/G4GlauberGribovCrossSection.cc new file mode 100644 index 0000000000..cbb520ee5b --- /dev/null +++ b/source/processes/hadronic/cross_sections/src/G4GlauberGribovCrossSection.cc @@ -0,0 +1,777 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// 17.07.06 V. Grichine - first implementation + + + +#include "G4GlauberGribovCrossSection.hh" + +#include "G4ParticleTable.hh" +#include "G4IonTable.hh" +#include "G4ParticleDefinition.hh" + +////////////////////////////////////////////////////////////////////////////////////// +// +// + + +G4GlauberGribovCrossSection::G4GlauberGribovCrossSection() +: fUpperLimit( 10000 * GeV ), + fLowerLimit( 3 * GeV ), + fRadiusConst( 1.08*fermi ) // 1.1, 1.3 ? +{ + theGamma = G4Gamma::Gamma(); + theProton = G4Proton::Proton(); + theNeutron = G4Neutron::Neutron(); + theAProton = G4AntiProton::AntiProton(); + theANeutron = G4AntiNeutron::AntiNeutron(); + thePiPlus = G4PionPlus::PionPlus(); + thePiMinus = G4PionMinus::PionMinus(); + thePiZero = G4PionZero::PionZero(); + theKPlus = G4KaonPlus::KaonPlus(); + theKMinus = G4KaonMinus::KaonMinus(); + theK0S = G4KaonZeroShort::KaonZeroShort(); + theK0L = G4KaonZeroLong::KaonZeroLong(); + theL = G4Lambda::Lambda(); + theAntiL = G4AntiLambda::AntiLambda(); + theSPlus = G4SigmaPlus::SigmaPlus(); + theASPlus = G4AntiSigmaPlus::AntiSigmaPlus(); + theSMinus = G4SigmaMinus::SigmaMinus(); + theASMinus = G4AntiSigmaMinus::AntiSigmaMinus(); + theS0 = G4SigmaZero::SigmaZero(); + theAS0 = G4AntiSigmaZero::AntiSigmaZero(); + theXiMinus = G4XiMinus::XiMinus(); + theXi0 = G4XiZero::XiZero(); + theAXiMinus = G4AntiXiMinus::AntiXiMinus(); + theAXi0 = G4AntiXiZero::AntiXiZero(); + theOmega = G4OmegaMinus::OmegaMinus(); + theAOmega = G4AntiOmegaMinus::AntiOmegaMinus(); + theD = G4Deuteron::Deuteron(); + theT = G4Triton::Triton(); + theA = G4Alpha::Alpha(); + theHe3 = G4He3::He3(); +} + +/////////////////////////////////////////////////////////////////////////////////////// +// +// + +G4GlauberGribovCrossSection::~G4GlauberGribovCrossSection() +{ +} + + +//////////////////////////////////////////////////////////////////////////////////////// +// +// + + +G4bool +G4GlauberGribovCrossSection::IsApplicable(const G4DynamicParticle* aDP, const G4Element* anElement) +{ + G4bool applicable = false; + // G4int baryonNumber = aDP->GetDefinition()->GetBaryonNumber(); + G4double kineticEnergy = aDP->GetKineticEnergy(); + + const G4ParticleDefinition* theParticle = aDP->GetDefinition(); + + if ( ( kineticEnergy >= fLowerLimit && + anElement->GetZ() > 1. && // >= He + ( theParticle == theAProton || + theParticle == theGamma || + theParticle == thePiPlus || + theParticle == thePiMinus || + theParticle == theKPlus || + theParticle == theKMinus || + theParticle == theSMinus) ) || + + ( kineticEnergy >= 0.1*fLowerLimit && + anElement->GetZ() > 1. && // >= He + ( theParticle == theProton || + theParticle == theNeutron ) ) ) applicable = true; + return applicable; +} + + +//////////////////////////////////////////////////////////////////////////////////////// +// +// Calculates total and inelastic Xsc, derives elastic as total - inelastic accordong to +// Glauber model with Gribov correction calculated in the dipole approximation on +// light cone. Gaussian density helps to calculate rest integrals of the model. +// [1] B.Z. Kopeliovich, nucl-th/0306044 + + + +G4double G4GlauberGribovCrossSection:: +GetCrossSection(const G4DynamicParticle* aParticle, const G4Element* anElement, G4double ) +{ + G4double xsection, sigma, cofInelastic, cofTotal, nucleusSquare, ratio; + G4double R = GetNucleusRadius(aParticle, anElement); + + + + const G4ParticleDefinition* theParticle = aParticle->GetDefinition(); + + if(theParticle == theProton || theParticle == theNeutron) + { + sigma = GetHadronNucleaonXscNS(aParticle, anElement); + cofInelastic = 2.4; + cofTotal = 2.0; + } + else + { + sigma = GetHadronNucleaonXscPDG(aParticle, anElement); + cofInelastic = 2.2; + cofTotal = 2.0; + } + nucleusSquare = cofTotal*pi*R*R; // basically 2piRR + ratio = sigma/nucleusSquare; + + xsection = nucleusSquare*std::log( 1. + ratio ); + + fTotalXsc = xsection; + + /* + fElasticXsc = 0.5*( xsection - nucleusSquare*ratio/(1.+ratio) ); + + if (fElasticXsc < 0.) fElasticXsc = 0.; + + fInelasticXsc = fTotalXsc - fElasticXsc; + + if (fInelasticXsc < 0.) fInelasticXsc = 0.; + */ + + fInelasticXsc = nucleusSquare*std::log( 1. + cofInelastic*ratio )/cofInelastic; + fElasticXsc = fTotalXsc - fInelasticXsc; + if (fElasticXsc < 0.) fElasticXsc = 0.; + + return xsection; +} + +///////////////////////////////////////////////////////////////////////////////////// +// +// Returns hadron-nucleon Xsc according to differnt parametrisations: +// [2] E. Levin, hep-ph/9710546 +// [3] U. Dersch, et al, hep-ex/9910052 +// [4] M.J. Longo, et al, Phys.Rev.Lett. 33 (1974) 725 + +G4double +G4GlauberGribovCrossSection::GetHadronNucleaonXsc(const G4DynamicParticle* aParticle, + const G4Element* anElement ) +{ + G4double At = anElement->GetN(); // number of nucleons + G4double Zt = anElement->GetZ(); // number of protons + + + return GetHadronNucleaonXsc( aParticle, At, Zt ); +} + + + + +///////////////////////////////////////////////////////////////////////////////////// +// +// Returns hadron-nucleon Xsc according to differnt parametrisations: +// [2] E. Levin, hep-ph/9710546 +// [3] U. Dersch, et al, hep-ex/9910052 +// [4] M.J. Longo, et al, Phys.Rev.Lett. 33 (1974) 725 + +G4double +G4GlauberGribovCrossSection::GetHadronNucleaonXsc(const G4DynamicParticle* aParticle, + G4double At, G4double Zt ) +{ + G4double xsection; + + + G4double targ_mass = G4ParticleTable::GetParticleTable()-> + GetIonTable()->GetIonMass( G4int(Zt+0.5) , G4int(At+0.5) ); + + targ_mass = 0.939*GeV; // ~mean neutron and proton ??? + + G4double proj_mass = aParticle->GetMass(); + G4double proj_momentum = aParticle->GetMomentum().mag(); + G4double sMand = CalcMandelstamS ( proj_mass , targ_mass , proj_momentum ); + + sMand /= GeV*GeV; // in GeV for parametrisation + proj_momentum /= GeV; + + const G4ParticleDefinition* theParticle = aParticle->GetDefinition(); + + + if(theParticle == theGamma) + { + xsection = At*(0.0677*std::pow(sMand,0.0808) + 0.129*std::pow(sMand,-0.4525)); + } + else if(theParticle == theNeutron) // as proton ??? + { + xsection = At*(21.70*std::pow(sMand,0.0808) + 56.08*std::pow(sMand,-0.4525)); + } + else if(theParticle == theProton) + { + xsection = At*(21.70*std::pow(sMand,0.0808) + 56.08*std::pow(sMand,-0.4525)); + // xsection = At*( 49.51*std::pow(sMand,-0.097) + 0.314*std::log(sMand)*std::log(sMand) ); + // xsection = At*( 38.4 + 0.85*std::abs(std::pow(log(sMand),1.47)) ); + } + else if(theParticle == theAProton) + { + xsection = At*( 21.70*std::pow(sMand,0.0808) + 98.39*std::pow(sMand,-0.4525)); + } + else if(theParticle == thePiPlus) + { + xsection = At*(13.63*std::pow(sMand,0.0808) + 27.56*std::pow(sMand,-0.4525)); + } + else if(theParticle == thePiMinus) + { + // xsection = At*( 55.2*std::pow(sMand,-0.255) + 0.346*std::log(sMand)*std::log(sMand) ); + xsection = At*(13.63*std::pow(sMand,0.0808) + 36.02*std::pow(sMand,-0.4525)); + } + else if(theParticle == theKPlus) + { + xsection = At*(11.82*std::pow(sMand,0.0808) + 8.15*std::pow(sMand,-0.4525)); + } + else if(theParticle == theKMinus) + { + xsection = At*(11.82*std::pow(sMand,0.0808) + 26.36*std::pow(sMand,-0.4525)); + } + else // as proton ??? + { + xsection = At*(21.70*std::pow(sMand,0.0808) + 56.08*std::pow(sMand,-0.4525)); + } + xsection *= millibarn; + return xsection; +} + + +///////////////////////////////////////////////////////////////////////////////////// +// +// Returns hadron-nucleon Xsc according to PDG parametrisation (2005): +// http://pdg.lbl.gov/2006/reviews/hadronicrpp.pdf + +G4double +G4GlauberGribovCrossSection::GetHadronNucleaonXscPDG(const G4DynamicParticle* aParticle, + const G4Element* anElement ) +{ + G4double At = anElement->GetN(); // number of nucleons + G4double Zt = anElement->GetZ(); // number of protons + + + return GetHadronNucleaonXscPDG( aParticle, At, Zt ); +} + + + + +///////////////////////////////////////////////////////////////////////////////////// +// +// Returns hadron-nucleon Xsc according to PDG parametrisation (2005): +// http://pdg.lbl.gov/2006/reviews/hadronicrpp.pdf +// At = number of nucleons, Zt = number of protons + +G4double +G4GlauberGribovCrossSection::GetHadronNucleaonXscPDG(const G4DynamicParticle* aParticle, + G4double At, G4double Zt ) +{ + G4double xsection; + + G4double Nt = At-Zt; // number of neutrons + if (Nt < 0.) Nt = 0.; + + + G4double targ_mass = G4ParticleTable::GetParticleTable()-> + GetIonTable()->GetIonMass( G4int(Zt+0.5) , G4int(At+0.5) ); + + targ_mass = 0.939*GeV; // ~mean neutron and proton ??? + + G4double proj_mass = aParticle->GetMass(); + G4double proj_momentum = aParticle->GetMomentum().mag(); + + G4double sMand = CalcMandelstamS ( proj_mass , targ_mass , proj_momentum ); + + sMand /= GeV*GeV; // in GeV for parametrisation + + // General PDG fit constants + + G4double s0 = 5.38*5.38; // in Gev^2 + G4double eta1 = 0.458; + G4double eta2 = 0.458; + G4double B = 0.308; + + + const G4ParticleDefinition* theParticle = aParticle->GetDefinition(); + + + if(theParticle == theNeutron) // proton-neutron fit + { + xsection = Zt*( 35.80 + B*std::pow(std::log(sMand/s0),2.) + + 40.15*std::pow(sMand,-eta1) - 30.*std::pow(sMand,-eta2)); + xsection += Nt*( 35.45 + B*std::pow(std::log(sMand/s0),2.) + + 42.53*std::pow(sMand,-eta1) - 33.34*std::pow(sMand,-eta2)); // pp for nn + } + else if(theParticle == theProton) + { + + xsection = Zt*( 35.45 + B*std::pow(std::log(sMand/s0),2.) + + 42.53*std::pow(sMand,-eta1) - 33.34*std::pow(sMand,-eta2)); + + xsection += Nt*( 35.80 + B*std::pow(std::log(sMand/s0),2.) + + 40.15*std::pow(sMand,-eta1) - 30.*std::pow(sMand,-eta2)); + } + else if(theParticle == theAProton) + { + xsection = Zt*( 35.45 + B*std::pow(std::log(sMand/s0),2.) + + 42.53*std::pow(sMand,-eta1) + 33.34*std::pow(sMand,-eta2)); + + xsection += Nt*( 35.80 + B*std::pow(std::log(sMand/s0),2.) + + 40.15*std::pow(sMand,-eta1) + 30.*std::pow(sMand,-eta2)); + } + else if(theParticle == thePiPlus) + { + xsection = At*( 20.86 + B*std::pow(std::log(sMand/s0),2.) + + 19.24*std::pow(sMand,-eta1) - 6.03*std::pow(sMand,-eta2)); + } + else if(theParticle == thePiMinus) + { + xsection = At*( 20.86 + B*std::pow(std::log(sMand/s0),2.) + + 19.24*std::pow(sMand,-eta1) + 6.03*std::pow(sMand,-eta2)); + } + else if(theParticle == theKPlus) + { + xsection = Zt*( 17.91 + B*std::pow(std::log(sMand/s0),2.) + + 7.14*std::pow(sMand,-eta1) - 13.45*std::pow(sMand,-eta2)); + + xsection += Nt*( 17.87 + B*std::pow(std::log(sMand/s0),2.) + + 5.17*std::pow(sMand,-eta1) - 7.23*std::pow(sMand,-eta2)); + } + else if(theParticle == theKMinus) + { + xsection = Zt*( 17.91 + B*std::pow(std::log(sMand/s0),2.) + + 7.14*std::pow(sMand,-eta1) + 13.45*std::pow(sMand,-eta2)); + + xsection += Nt*( 17.87 + B*std::pow(std::log(sMand/s0),2.) + + 5.17*std::pow(sMand,-eta1) + 7.23*std::pow(sMand,-eta2)); + } + else if(theParticle == theSMinus) + { + xsection = At*( 35.20 + B*std::pow(std::log(sMand/s0),2.) + - 199.*std::pow(sMand,-eta1) + 264.*std::pow(sMand,-eta2)); + } + else if(theParticle == theGamma) // modify later on + { + xsection = At*( 0.0 + B*std::pow(std::log(sMand/s0),2.) + + 0.032*std::pow(sMand,-eta1) - 0.0*std::pow(sMand,-eta2)); + + } + else // as proton ??? + { + xsection = Zt*( 35.45 + B*std::pow(std::log(sMand/s0),2.) + + 42.53*std::pow(sMand,-eta1) - 33.34*std::pow(sMand,-eta2)); + + xsection += Nt*( 35.80 + B*std::pow(std::log(sMand/s0),2.) + + 40.15*std::pow(sMand,-eta1) - 30.*std::pow(sMand,-eta2)); + } + xsection *= millibarn; // parametrised in mb + return xsection; +} +///////////////////////////////////////////////////////////////////////////////////// +// +// Returns hadron-nucleon cross-section based on N. Starkov parametrisation of +// data from mainly http://wwwppds.ihep.su:8001/c5-6A.html database + +G4double +G4GlauberGribovCrossSection::GetHadronNucleaonXscNS(const G4DynamicParticle* aParticle, + const G4Element* anElement ) +{ + G4double At = anElement->GetN(); // number of nucleons + G4double Zt = anElement->GetZ(); // number of protons + + + return GetHadronNucleaonXscNS( aParticle, At, Zt ); +} + + + + +///////////////////////////////////////////////////////////////////////////////////// +// +// Returns hadron-nucleon cross-section based on N. Starkov parametrisation of +// data from mainly http://wwwppds.ihep.su:8001/c5-6A.html database + +G4double +G4GlauberGribovCrossSection::GetHadronNucleaonXscNS(const G4DynamicParticle* aParticle, + G4double At, G4double Zt ) +{ + G4double xsection, Delta, A0, B0; + G4double hpXsc(0); + G4double hnXsc(0); + + G4double Nt = At-Zt; // number of neutrons + if (Nt < 0.) Nt = 0.; + + + G4double targ_mass = G4ParticleTable::GetParticleTable()-> + GetIonTable()->GetIonMass( G4int(Zt+0.5) , G4int(At+0.5) ); + + targ_mass = 0.939*GeV; // ~mean neutron and proton ??? + + G4double proj_mass = aParticle->GetMass(); + G4double proj_energy = aParticle->GetTotalEnergy(); + G4double proj_momentum = aParticle->GetMomentum().mag(); + + G4double sMand = CalcMandelstamS ( proj_mass , targ_mass , proj_momentum ); + + sMand /= GeV*GeV; // in GeV for parametrisation + proj_momentum /= GeV; + proj_energy /= GeV; + proj_mass /= GeV; + + // General PDG fit constants + + G4double s0 = 5.38*5.38; // in Gev^2 + G4double eta1 = 0.458; + G4double eta2 = 0.458; + G4double B = 0.308; + + + const G4ParticleDefinition* theParticle = aParticle->GetDefinition(); + + + if(theParticle == theNeutron) + { + if( proj_momentum >= 10.) + // if( proj_momentum >= 2.) + { + Delta = 1.; + + if( proj_energy < 40. ) Delta = 0.916+0.0021*proj_energy; + + if(proj_momentum >= 10.) + { + B0 = 7.5; + A0 = 100. - B0*std::log(3.0e7); + + xsection = A0 + B0*std::log(proj_energy) - 11 + + 103*std::pow(2*0.93827*proj_energy + proj_mass*proj_mass+ + 0.93827*0.93827,-0.165); // mb + } + xsection *= Zt + Nt; + } + else + { + // nn to be pp + + if( proj_momentum < 10. ) + { + hnXsc = 39.0+ + 75*(proj_momentum - 1.2)/(std::pow(proj_momentum,3.0) + 0.15); + } + if( proj_momentum < 1.05 ) + { + hnXsc = 23 + 40*(std::log(proj_momentum/0.73))* + (std::log(proj_momentum/0.73)); + } + if( proj_momentum < 0.73 ) + { + hnXsc = 23 + 50*( std::pow( std::log(0.73/proj_momentum), 3.5 ) ); + } + // pn to be np + + if( proj_momentum < 10. ) + { + hpXsc = 33.3+ + 20.8*(std::pow(proj_momentum,2.0)-1.35)/ + (std::pow(proj_momentum,2.50)+0.95); + } + + if( proj_momentum < 1.4 ) + { + hpXsc = 33+30*std::pow(std::log(proj_momentum/0.95),2.0); + } + + if( proj_momentum < 0.8 ) + { + hpXsc = 33+30*std::pow(std::log(proj_momentum/1.3),4.0); + } + xsection = hpXsc*Zt + hnXsc*Nt; + } + } + else if(theParticle == theProton) + { + if( proj_momentum >= 10.) + // if( proj_momentum >= 2.) + { + Delta = 1.; + + if( proj_energy < 40. ) Delta = 0.916+0.0021*proj_energy; + + if(proj_momentum >= 10.) + { + B0 = 7.5; + A0 = 100. - B0*std::log(3.0e7); + + xsection = A0 + B0*std::log(proj_energy) - 11 + + 103*std::pow(2*0.93827*proj_energy + proj_mass*proj_mass+ + 0.93827*0.93827,-0.165); // mb + } + xsection *= Zt + Nt; + } + else + { + // pp + + if( proj_momentum < 10. ) + { + hpXsc = 39.0+ + 75*(proj_momentum - 1.2)/(std::pow(proj_momentum,3.0) + 0.15); + } + if( proj_momentum < 1.05 ) + { + hpXsc = 23 + 40*(std::log(proj_momentum/0.73))* + (std::log(proj_momentum/0.73)); + } + if( proj_momentum < 0.73 ) + { + hpXsc = 23 + 50*( std::pow( std::log(0.73/proj_momentum), 3.5 ) ); + } + // pn to be np + + if( proj_momentum < 10. ) + { + hnXsc = 33.3+ + 20.8*(std::pow(proj_momentum,2.0)-1.35)/ + (std::pow(proj_momentum,2.50)+0.95); + } + + if( proj_momentum < 1.4 ) + { + hnXsc = 33+30*std::pow(std::log(proj_momentum/0.95),2.0); + } + + if( proj_momentum < 0.8 ) + { + hnXsc = 33+30*std::pow(std::log(proj_momentum/1.3),4.0); + } + xsection = hpXsc*Zt + hnXsc*Nt; + // xsection = hpXsc*(Zt + Nt); + // xsection = hnXsc*(Zt + Nt); + } + // xsection *= 0.95; + } + else if(theParticle == theAProton) + { + xsection = Zt*( 35.45 + B*std::pow(std::log(sMand/s0),2.) + + 42.53*std::pow(sMand,-eta1) + 33.34*std::pow(sMand,-eta2)); + + xsection += Nt*( 35.80 + B*std::pow(std::log(sMand/s0),2.) + + 40.15*std::pow(sMand,-eta1) + 30.*std::pow(sMand,-eta2)); + } + else if(theParticle == thePiPlus) + { + xsection = At*( 20.86 + B*std::pow(std::log(sMand/s0),2.) + + 19.24*std::pow(sMand,-eta1) - 6.03*std::pow(sMand,-eta2)); + } + else if(theParticle == thePiMinus) + { + xsection = At*( 20.86 + B*std::pow(std::log(sMand/s0),2.) + + 19.24*std::pow(sMand,-eta1) + 6.03*std::pow(sMand,-eta2)); + } + else if(theParticle == theKPlus) + { + xsection = Zt*( 17.91 + B*std::pow(std::log(sMand/s0),2.) + + 7.14*std::pow(sMand,-eta1) - 13.45*std::pow(sMand,-eta2)); + + xsection += Nt*( 17.87 + B*std::pow(std::log(sMand/s0),2.) + + 5.17*std::pow(sMand,-eta1) - 7.23*std::pow(sMand,-eta2)); + } + else if(theParticle == theKMinus) + { + xsection = Zt*( 17.91 + B*std::pow(std::log(sMand/s0),2.) + + 7.14*std::pow(sMand,-eta1) + 13.45*std::pow(sMand,-eta2)); + + xsection += Nt*( 17.87 + B*std::pow(std::log(sMand/s0),2.) + + 5.17*std::pow(sMand,-eta1) + 7.23*std::pow(sMand,-eta2)); + } + else if(theParticle == theSMinus) + { + xsection = At*( 35.20 + B*std::pow(std::log(sMand/s0),2.) + - 199.*std::pow(sMand,-eta1) + 264.*std::pow(sMand,-eta2)); + } + else if(theParticle == theGamma) // modify later on + { + xsection = At*( 0.0 + B*std::pow(std::log(sMand/s0),2.) + + 0.032*std::pow(sMand,-eta1) - 0.0*std::pow(sMand,-eta2)); + + } + else // as proton ??? + { + xsection = Zt*( 35.45 + B*std::pow(std::log(sMand/s0),2.) + + 42.53*std::pow(sMand,-eta1) - 33.34*std::pow(sMand,-eta2)); + + xsection += Nt*( 35.80 + B*std::pow(std::log(sMand/s0),2.) + + 40.15*std::pow(sMand,-eta1) - 30.*std::pow(sMand,-eta2)); + } + xsection *= millibarn; // parametrised in mb + return xsection; +} + +//////////////////////////////////////////////////////////////////////////////////// +// +// + +G4double +G4GlauberGribovCrossSection::GetNucleusRadius( const G4DynamicParticle* , + const G4Element* anElement) +{ + G4double At = anElement->GetN(); + G4double oneThird = 1.0/3.0; + G4double cubicrAt = std::pow (At, oneThird); + + + G4double R; // = fRadiusConst*cubicrAt; + /* + G4double tmp = std::pow( cubicrAt-1., 3.); + tmp += At; + tmp *= 0.5; + + if (At > 20.) // 20. + { + R = fRadiusConst*std::pow (tmp, oneThird); + } + else + { + R = fRadiusConst*cubicrAt; + } + */ + + R = fRadiusConst*cubicrAt; + + G4double meanA = 21.; + + G4double tauA1 = 40.; + G4double tauA2 = 10.; + G4double tauA3 = 5.; + + G4double a1 = 0.85; + G4double b1 = 1. - a1; + + G4double b2 = 0.3; + G4double b3 = 4.; + + if (At > 20.) // 20. + { + R *= ( a1 + b1*std::exp( -(At - meanA)/tauA1) ); + } + else if (At > 3.5) + { + R *= ( 1.0 + b2*( 1. - std::exp( (At - meanA)/tauA2) ) ); + } + else + { + R *= ( 1.0 + b3*( 1. - std::exp( (At - meanA)/tauA3) ) ); + } + + return R; +} +//////////////////////////////////////////////////////////////////////////////////// +// +// + +G4double +G4GlauberGribovCrossSection::GetNucleusRadius(G4double At) +{ + G4double oneThird = 1.0/3.0; + G4double cubicrAt = std::pow (At, oneThird); + + + G4double R; // = fRadiusConst*cubicrAt; + + /* + G4double tmp = std::pow( cubicrAt-1., 3.); + tmp += At; + tmp *= 0.5; + + if (At > 20.) + { + R = fRadiusConst*std::pow (tmp, oneThird); + } + else + { + R = fRadiusConst*cubicrAt; + } + */ + + R = fRadiusConst*cubicrAt; + + G4double meanA = 20.; + G4double tauA = 20.; + + if (At > 20.) // 20. + { + R *= ( 0.8 + 0.2*std::exp( -(At - meanA)/tauA) ); + } + else + { + R *= ( 1.0 + 0.1*( 1. - std::exp( (At - meanA)/tauA) ) ); + } + + return R; +} + +//////////////////////////////////////////////////////////////////////////////////// +// +// + +G4double G4GlauberGribovCrossSection::CalculateEcmValue( const G4double mp , + const G4double mt , + const G4double Plab ) +{ + G4double Elab = std::sqrt ( mp * mp + Plab * Plab ); + G4double Ecm = std::sqrt ( mp * mp + mt * mt + 2 * Elab * mt ); + // G4double Pcm = Plab * mt / Ecm; + // G4double KEcm = std::sqrt ( Pcm * Pcm + mp * mp ) - mp; + + return Ecm ; // KEcm; +} + + +//////////////////////////////////////////////////////////////////////////////////// +// +// + +G4double G4GlauberGribovCrossSection::CalcMandelstamS( const G4double mp , + const G4double mt , + const G4double Plab ) +{ + G4double Elab = std::sqrt ( mp * mp + Plab * Plab ); + G4double sMand = mp*mp + mt*mt + 2*Elab*mt ; + + return sMand; +} + + +// +// +/////////////////////////////////////////////////////////////////////////////////////// diff --git a/source/processes/hadronic/cross_sections/src/G4HadronCaptureDataSet.cc b/source/processes/hadronic/cross_sections/src/G4HadronCaptureDataSet.cc index 5252d1db97..167df80ad8 100644 --- a/source/processes/hadronic/cross_sections/src/G4HadronCaptureDataSet.cc +++ b/source/processes/hadronic/cross_sections/src/G4HadronCaptureDataSet.cc @@ -25,7 +25,7 @@ // // // $Id: G4HadronCaptureDataSet.cc,v 1.8 2006/06/29 19:57:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Physics class: HadronCaptureDataSet for cross sections diff --git a/source/processes/hadronic/cross_sections/src/G4HadronCrossSections.cc b/source/processes/hadronic/cross_sections/src/G4HadronCrossSections.cc index 08f891c349..3193be5494 100644 --- a/source/processes/hadronic/cross_sections/src/G4HadronCrossSections.cc +++ b/source/processes/hadronic/cross_sections/src/G4HadronCrossSections.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Hadron Physics class G4HadronCrossSections diff --git a/source/processes/hadronic/cross_sections/src/G4HadronElasticDataSet.cc b/source/processes/hadronic/cross_sections/src/G4HadronElasticDataSet.cc index 11a730dcd8..ee8c726685 100644 --- a/source/processes/hadronic/cross_sections/src/G4HadronElasticDataSet.cc +++ b/source/processes/hadronic/cross_sections/src/G4HadronElasticDataSet.cc @@ -25,7 +25,7 @@ // // // $Id: G4HadronElasticDataSet.cc,v 1.8 2006/06/29 19:57:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Physics class: HadronElasticDataSet for cross sections diff --git a/source/processes/hadronic/cross_sections/src/G4HadronFissionDataSet.cc b/source/processes/hadronic/cross_sections/src/G4HadronFissionDataSet.cc index 6e84e09eb0..5e43e5309b 100644 --- a/source/processes/hadronic/cross_sections/src/G4HadronFissionDataSet.cc +++ b/source/processes/hadronic/cross_sections/src/G4HadronFissionDataSet.cc @@ -25,7 +25,7 @@ // // // $Id: G4HadronFissionDataSet.cc,v 1.8 2006/06/29 19:57:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Physics class: HadronFissionDataSet for cross sections diff --git a/source/processes/hadronic/cross_sections/src/G4HadronInelasticDataSet.cc b/source/processes/hadronic/cross_sections/src/G4HadronInelasticDataSet.cc index 6e5fe80701..c8a331d729 100644 --- a/source/processes/hadronic/cross_sections/src/G4HadronInelasticDataSet.cc +++ b/source/processes/hadronic/cross_sections/src/G4HadronInelasticDataSet.cc @@ -25,7 +25,7 @@ // // // $Id: G4HadronInelasticDataSet.cc,v 1.8 2006/06/29 19:57:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Physics class: HadronInelasticDataSet for cross sections diff --git a/source/processes/hadronic/cross_sections/src/G4IonsShenCrossSection.cc b/source/processes/hadronic/cross_sections/src/G4IonsShenCrossSection.cc index 8421009044..69eacfa0b7 100644 --- a/source/processes/hadronic/cross_sections/src/G4IonsShenCrossSection.cc +++ b/source/processes/hadronic/cross_sections/src/G4IonsShenCrossSection.cc @@ -25,6 +25,7 @@ // // 18-Sep-2003 First version is written by T. Koi // 12-Nov-2003 Add energy check at lower side T. Koi +// 15-Nov-2006 Above 10GeV/n Cross Section become constant T. Koi (SLAC/SCCS) #include "G4IonsShenCrossSection.hh" #include "G4ParticleTable.hh" @@ -39,6 +40,7 @@ GetCrossSection(const G4DynamicParticle* aParticle, const G4Element* anElement, G4int Ap = aParticle->GetDefinition()->GetBaryonNumber(); G4int Zp = int ( aParticle->GetDefinition()->GetPDGCharge() / eplus + 0.5 ); G4double ke_per_N = aParticle->GetKineticEnergy() / Ap; + if ( ke_per_N > 10*GeV ) ke_per_N = 10*GeV; // Apply energy check, if less than lower limit then 0 value is returned if ( ke_per_N < lowerLimit ) diff --git a/source/processes/hadronic/cross_sections/src/G4PhotoNuclearCrossSection.cc b/source/processes/hadronic/cross_sections/src/G4PhotoNuclearCrossSection.cc index f757f4832e..959273c2a1 100644 --- a/source/processes/hadronic/cross_sections/src/G4PhotoNuclearCrossSection.cc +++ b/source/processes/hadronic/cross_sections/src/G4PhotoNuclearCrossSection.cc @@ -25,7 +25,7 @@ // // // The lust update: M.V. Kossov, CERN/ITEP(Moscow) 17-June-02 -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Physics class: G4PhotoNuclearCrossSection for gamma+A cross sections diff --git a/source/processes/hadronic/cross_sections/src/G4PiData.cc b/source/processes/hadronic/cross_sections/src/G4PiData.cc index 0cf0624e09..92291fdd73 100644 --- a/source/processes/hadronic/cross_sections/src/G4PiData.cc +++ b/source/processes/hadronic/cross_sections/src/G4PiData.cc @@ -23,7 +23,7 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- // by J.P Wellisch, Sun Sep 15 2002. diff --git a/source/processes/hadronic/cross_sections/src/G4PiNuclearCrossSection.cc b/source/processes/hadronic/cross_sections/src/G4PiNuclearCrossSection.cc index bbb6f97d52..6fe01f34db 100644 --- a/source/processes/hadronic/cross_sections/src/G4PiNuclearCrossSection.cc +++ b/source/processes/hadronic/cross_sections/src/G4PiNuclearCrossSection.cc @@ -29,45 +29,50 @@ #include "G4ping.hh" // by J.P Wellisch, Sun Sep 15 2002. + // corrected G.Folger 17-8-2006: inel. Ca pim was missing two number, + formatting + // updated G.Folger 21-8-2006: Change scaling of cross section for elements not tabulated from scaling in Z^(2/3) to A^0.75 + // Implements P2-90-158; - const G4double G4PiNuclearCrossSection::e1[38] = {0.02, 0.04, 0.06, 0.08, 0.1, 0.12, 0.13, 0.14, 0.15, 0.16, 0.17, 0.18, 0.19, 0.2, 0.22, 0.24, 0.26, 0.28, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.9, 1, 2, 3, 5, 10, 20, 50, 100, 500, 1000}; - const G4double G4PiNuclearCrossSection::he_t[38] = {40, 70, 108, 152, 208, 276, 300, 320, 329, 333, 332, 328, 322, 310, 288, 260, 240, 216, 196, 144, 125, 112, 108.5, 109, 110.5, 117, 123, 128.5, 135, 110, 96, 87, 85, 83.5, 83.5, 83.5, 83.5, 83.5}; - const G4double G4PiNuclearCrossSection::he_in[38] = {18, 38, 62, 98, 136, 176, 190, 200, 209, 212, 212, 208, 204, 196, 176, 164, 150, 134, 124, 97.5, 90, 85, 82.5, 83.5, 86.5, 93, 97.5, 100, 102, 83, 77, 75, 74, 72.5, 72.5, 72.5, 72.5, 72.5}; - const G4double G4PiNuclearCrossSection::be_m_t[38] = {150, 210, 294, 396, 520, 600, 623, 635, 642, 640, 630, 615, 600, 576, 540, 504, 470, 435, 400, 340, 294, 258, 236, 230, 233, 244, 257, 270, 276, 250, 230, 215, 205, 194, 188, 186, 186, 186}; - const G4double G4PiNuclearCrossSection::be_m_in[38] = {90, 126, 177, 240, 320, 380, 400, 410, 414, 410, 400, 387, 371, 360, 333, 312, 285, 260, 237, 216, 198, 187, 182, 180, 182, 187, 193, 203, 207, 179, 172, 165, 159, 155, 144, 144, 144, 144}; - const G4double G4PiNuclearCrossSection::be_p_t[24] = {96, 150, 222, 320, 430, 514, 545, 565, 574, 574, 564, 552, 535, 522, 490, 462, 432, 398, 367, 314, 276, 248, 232, 230}; - const G4double G4PiNuclearCrossSection::be_p_in[24] = {60, 95, 142, 194, 262, 319, 345, 361, 364, 364, 354, 350, 330, 319, 298, 280, 258, 237, 216, 200, 189, 183, 182, 180}; - const G4double G4PiNuclearCrossSection::e2[39] = {0.02, 0.04, 0.06, 0.08, 0.1, 0.11, 0.12, 0.13, 0.14, 0.15, 0.16, 0.17, 0.18, 0.2, 0.22, 0.24, 0.26, 0.28, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.575, 0.6, 0.7, 0.8, 0.9, 1, 2, 3, 5, 10, 20, 50, 100, 500, 1000}; - const G4double G4PiNuclearCrossSection::c_m_t[39] = {204, 260, 366, 517, 630, 673, 694, 704, 710, 711, 706, 694, 676, 648, 616, 584, 548, 518, 489, 426, 376, 342, 323, 310, 312, 313, 319, 333, 342, 348, 310, 290, 268, 250, 245, 237, 234, 234, 234}; - const G4double G4PiNuclearCrossSection::c_m_in[39] = {128, 160, 224, 315, 388, 416, 430, 438, 444, 445, 440, 432, 416, 400, 380, 354, 320, 304, 288, 264, 246, 240, 233, 232, 233, 234, 238, 246, 252, 256, 220, 210, 198, 187, 183, 176, 174, 174, 174}; + const G4double G4PiNuclearCrossSection::e1[38] = {.02, .04, .06, .08, .1, .12, .13, .14, .15, .16, .17, .18, .19, .20, .22, .24, .26, .28, .30, .35, .40, .45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.9, 1, 2, 3, 5, 10, 20, 50, 100, 500, 1000}; + const G4double G4PiNuclearCrossSection::he_t[38] = { 40, 70, 108, 152, 208, 276, 300, 320, 329, 333, 332, 328, 322, 310, 288, 260, 240, 216, 196, 144, 125, 112,108.5, 109, 110.5, 117, 123,128.5, 135, 110, 96, 87, 85, 83.5, 83.5, 83.5, 83.5, 83.5}; + const G4double G4PiNuclearCrossSection::he_in[38] = { 18, 38, 62, 98, 136, 176, 190, 200, 209, 212, 212, 208, 204, 196, 176, 164, 150, 134, 124,97.5, 90, 85, 82.5, 83.5, 86.5, 93, 97.5, 100, 102, 83, 77, 75, 74, 72.5, 72.5, 72.5, 72.5, 72.5}; + const G4double G4PiNuclearCrossSection::be_m_t[38] = {150, 210, 294, 396, 520, 600, 623, 635, 642, 640, 630, 615, 600, 576, 540, 504, 470, 435, 400, 340, 294, 258, 236, 230, 233, 244, 257, 270, 276, 250, 230, 215, 205, 194, 188, 186, 186, 186}; + const G4double G4PiNuclearCrossSection::be_m_in[38] ={ 90, 126, 177, 240, 320, 380, 400, 410, 414, 410, 400, 387, 371, 360, 333, 312, 285, 260, 237, 216, 198, 187, 182, 180, 182, 187, 193, 203, 207, 179, 172, 165, 159, 155, 144, 144, 144, 144}; + const G4double G4PiNuclearCrossSection::be_p_t[24] = { 96, 150, 222, 320, 430, 514, 545, 565, 574, 574, 564, 552, 535, 522, 490, 462, 432, 398, 367, 314, 276, 248, 232, 230}; + const G4double G4PiNuclearCrossSection::be_p_in[24] ={ 60, 95, 142, 194, 262, 319, 345, 361, 364, 364, 354, 350, 330, 319, 298, 280, 258, 237, 216, 200, 189, 183, 182, 180}; + + const G4double G4PiNuclearCrossSection::e2[39] = {.02, .04, .06, .08, 0.1, .11, .12, .13, .14, .15, .16, .17, .18, 0.2, .22, .24, .26, .28, 0.3, .35, 0.4, .45, 0.5, .55, .575, 0.6, 0.7, 0.8, 0.9, 1, 2, 3, 5, 10, 20, 50, 100, 500, 1000}; + const G4double G4PiNuclearCrossSection::c_m_t[39] = {204, 260, 366, 517, 630, 673, 694, 704, 710, 711, 706, 694, 676, 648, 616, 584, 548, 518, 489, 426, 376, 342, 323, 310, 312, 313, 319, 333, 342, 348, 310, 290, 268, 250, 245, 237, 234, 234, 234}; + const G4double G4PiNuclearCrossSection::c_m_in[39] ={128, 160, 224, 315, 388, 416, 430, 438, 444, 445, 440, 432, 416, 400, 380, 354, 320, 304, 288, 264, 246, 240, 233, 232, 233, 234, 238, 246, 252, 256, 220, 210, 198, 187, 183, 176, 174, 174, 174}; const G4double G4PiNuclearCrossSection::c_p_t[24] = {140, 192, 294, 428, 594, 642, 662, 687, 685, 688, 684, 672, 656, 630, 598, 567, 533, 504, 474, 416, 369, 336, 319, 310}; - const G4double G4PiNuclearCrossSection::c_p_in[24] = {94, 132, 184, 260, 370, 398, 408, 420, 426, 428, 424, 416, 400, 386, 366, 340, 308, 294, 280, 257, 241, 236, 231, 232}; - const G4double G4PiNuclearCrossSection::n_m_t[39] = {246, 308, 424, 590, 729, 776, 800, 821, 822, 817, 800, 778, 768, 728, 690, 654, 615, 584, 556, 480, 430, 393, 373, 367, 368, 370, 375, 388, 390, 397, 364, 337, 310, 291, 275, 268, 268, 268, 268}; - const G4double G4PiNuclearCrossSection::n_m_in[39] = {155, 188, 256, 360, 456, 492, 512, 526, 526, 520, 504, 491, 475, 450, 425, 396, 376, 360, 340, 300, 282, 270, 265, 265, 266, 268, 273, 280, 288, 288, 256, 237, 226, 218, 208, 202, 202, 202, 202}; - const G4double G4PiNuclearCrossSection::n_p_t[27] = {150, 212, 328, 500, 680, 735, 762, 781, 782, 779, 770, 748, 740, 706, 672, 633, 600, 569, 541, 467, 419, 385, 368, 364, 366, 368, 375}; - const G4double G4PiNuclearCrossSection::n_p_in[27] = {90, 140, 208, 300, 426, 467, 490, 504, 504, 500, 484, 474, 460, 437, 413, 381, 365, 350, 330, 292, 276, 267, 263, 264, 265, 267, 273}; - const G4double G4PiNuclearCrossSection::e3[31] = {0.02, 0.04, 0.06, 0.08, 0.1, 0.12, 0.14, 0.16, 0.18, 0.2, 0.22, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.6, 0.7, 0.8, 0.9, 1, 2, 3, 5, 10, 20, 50, 100, 500, 1000}; - const G4double G4PiNuclearCrossSection::o_m_t[31] = {280, 360, 500, 685, 812, 861, 870, 865, 835, 800, 755, 700, 600, 537, 493, 468, 441, 436, 443, 449, 460, 463, 432, 385, 350, 325, 312, 307, 303, 303, 303}; - const G4double G4PiNuclearCrossSection::o_m_in[31] = {190, 207, 300, 420, 500, 540, 550, 542, 520, 490, 460, 423, 360, 339, 321, 314, 312, 314, 319, 324, 328, 330, 300, 275, 250, 240, 229, 225, 222, 222, 222}; - const G4double G4PiNuclearCrossSection::o_p_t[20] = {170, 240, 390, 570, 740, 818, 830, 822, 800, 765, 725, 675, 585, 525, 483, 458, 444, 447, 453, 449}; - const G4double G4PiNuclearCrossSection::o_p_in[20] = {100, 145, 240, 340, 470, 518, 530, 522, 505, 477, 448, 412, 350, 330, 316, 310, 308, 311, 317, 324}; - const G4double G4PiNuclearCrossSection::na_m_t[31] = {450, 545, 705, 910, 1020, 1075, 1087, 1080, 1042, 987, 943, 885, 790, 700, 650, 610, 585, 575, 585, 595, 600, 610, 556, 524, 494, 458, 445, 429, 427, 427, 427}; - const G4double G4PiNuclearCrossSection::na_m_in[31] = {275, 315, 413, 545, 620, 660, 670, 662, 630, 593, 570, 520, 465, 420, 410, 395, 390, 400, 410, 418, 420, 422, 372, 348, 330, 320, 310, 294, 292, 292, 292}; - const G4double G4PiNuclearCrossSection::na_p_t[22] = {210, 320, 530, 795, 960, 1035, 1050, 1040, 1007, 957, 918, 865, 773, 685, 636, 598, 575, 565, 578, 590, 598, 610}; - const G4double G4PiNuclearCrossSection::na_p_in[22] = {115, 210, 340, 495, 585, 630, 645, 637, 605, 572, 550, 505, 455, 410, 401, 388, 383, 393, 405, 414, 418, 422}; + const G4double G4PiNuclearCrossSection::c_p_in[24] ={ 94, 132, 184, 260, 370, 398, 408, 420, 426, 428, 424, 416, 400, 386, 366, 340, 308, 294, 280, 257, 241, 236, 231, 232}; + const G4double G4PiNuclearCrossSection::n_m_t[39] = {246, 308, 424, 590, 729, 776, 800, 821, 822, 817, 800, 778, 768, 728, 690, 654, 615, 584, 556, 480, 430, 393, 373, 367, 368, 370, 375, 388, 390, 397, 364, 337, 310, 291, 275, 268, 268, 268, 268}; + const G4double G4PiNuclearCrossSection::n_m_in[39] ={155, 188, 256, 360, 456, 492, 512, 526, 526, 520, 504, 491, 475, 450, 425, 396, 376, 360, 340, 300, 282, 270, 265, 265, 266, 268, 273, 280, 288, 288, 256, 237, 226, 218, 208, 202, 202, 202, 202}; + const G4double G4PiNuclearCrossSection::n_p_t[27] = {150, 212, 328, 500, 680, 735, 762, 781, 782, 779, 770, 748, 740, 706, 672, 633, 600, 569, 541, 467, 419, 385, 368, 364, 366, 368, 375}; + const G4double G4PiNuclearCrossSection::n_p_in[27] ={ 90, 140, 208, 300, 426, 467, 490, 504, 504, 500, 484, 474, 460, 437, 413, 381, 365, 350, 330, 292, 276, 267, 263, 264, 265, 267, 273}; - const G4double G4PiNuclearCrossSection::e3_1[31] = {.02, .04, .06, .08, .1, .12, .14, .16, .18, .2, .22, .25, .3, .35, .4, .45, .5, .6, .7, .8, .9, 1., 2., 3., 5., 10., 20., 50., 100., 500., 1000.}; - const G4double G4PiNuclearCrossSection::al_m_t[31] = {532, 637, 832, 1057, 1207, 1230, 1210, 1174, 1133, 1095, 1038, 970, 890, 807, 750, 710, 675, 665, 670, 673, 678, 682, 618, 574, 546, 520, 507, 495, 488, 488, 488}; - const G4double G4PiNuclearCrossSection::al_m_in[31] = {300, 360, 495, 665, 750, 765, 750, 730, 700, 660, 615, 570, 520, 490, 470, 450, 448, 450, 450, 452, 456, 460, 408, 392, 376, 356, 347, 338, 332, 332, 332}; - const G4double G4PiNuclearCrossSection::al_p_t[21] = {225, 350, 616, 945, 1122, 1175, 1157, 1128, 1088, 1045, 988, 935, 870, 787, 730, 690, 660, 652, 660, 668, 678}; - const G4double G4PiNuclearCrossSection::al_p_in[21] = {120, 238, 390, 610, 712, 735, 720, 703, 655, 635, 590, 550, 505, 475, 455, 438, 440, 445, 445, 450, 456}; - const G4double G4PiNuclearCrossSection::ca_m_t[31] = {800, 980, 1240, 1460, 1570, 1600, 1580, 1535, 1475, 1425, 1375, 1295, 1200, 1083, 1000, 948, 915, 895, 900, 908, 915, 922, 856, 795, 740, 705, 682, 660, 660, 660, 660}; - const G4double G4PiNuclearCrossSection::ca_m_in[31] = {470, 550, 620, 860, 955, 960, 920, 860, 820, 780, 740, 665, 637, 615, 600, 590, 600, 608, 610, 615, 550, 525, 510, 488, 470, 450, 450, 450, 450}; - const G4double G4PiNuclearCrossSection::ca_p_t[23] = {275, 445, 790, 1195, 1440, 1485, 1475, 1435, 1385, 1335, 1295, 1245, 1160, 1050, 970, 923, 895, 877, 887, 897, 904, 913, 855}; - const G4double G4PiNuclearCrossSection::ca_p_in[23] = {160, 315, 500, 745, 870, 905, 900, 860, 810, 770, 740, 710, 640, 617, 595, 585, 575, 575, 590, 600, 602, 608, 510}; // last number is 500 in org, changed to make things smooth. + const G4double G4PiNuclearCrossSection::e3[31] = {.02, .04, .06, .08, 0.1, .12, .14, .16, 0.18, 0.2, .22, .25, 0.3, .35, 0.4, .45, 0.5, 0.6, 0.7, 0.8, 0.9, 1, 2, 3, 5, 10, 20, 50, 100, 500, 1000}; + const G4double G4PiNuclearCrossSection::o_m_t[31] = {280, 360, 500, 685, 812, 861, 870, 865, 835, 800, 755, 700, 600, 537, 493, 468, 441, 436, 443, 449, 460, 463, 432, 385, 350, 325, 312, 307, 303, 303, 303}; + const G4double G4PiNuclearCrossSection::o_m_in[31] = {190, 207, 300, 420, 500, 540, 550, 542, 520, 490, 460, 423, 360, 339, 321, 314, 312, 314, 319, 324, 328, 330, 300, 275, 250, 240, 229, 225, 222, 222, 222}; + const G4double G4PiNuclearCrossSection::o_p_t[20] = {170, 240, 390, 570, 740, 818, 830, 822, 800, 765, 725, 675, 585, 525, 483, 458, 444, 447, 453, 449}; + const G4double G4PiNuclearCrossSection::o_p_in[20] = {100, 145, 240, 340, 470, 518, 530, 522, 505, 477, 448, 412, 350, 330, 316, 310, 308, 311, 317, 324}; + const G4double G4PiNuclearCrossSection::na_m_t[31] = {450, 545, 705, 910, 1020, 1075, 1087, 1080, 1042, 987, 943, 885, 790, 700, 650, 610, 585, 575, 585, 595, 600, 610, 556, 524, 494, 458, 445, 429, 427, 427, 427}; + const G4double G4PiNuclearCrossSection::na_m_in[31] ={275, 315, 413, 545, 620, 660, 670, 662, 630, 593, 570, 520, 465, 420, 410, 395, 390, 400, 410, 418, 420, 422, 372, 348, 330, 320, 310, 294, 292, 292, 292}; + const G4double G4PiNuclearCrossSection::na_p_t[22] = {210, 320, 530, 795, 960, 1035, 1050, 1040, 1007, 957, 918, 865, 773, 685, 636, 598, 575, 565, 578, 590, 598, 610}; + const G4double G4PiNuclearCrossSection::na_p_in[22] ={115, 210, 340, 495, 585, 630, 645, 637, 605, 572, 550, 505, 455, 410, 401, 388, 383, 393, 405, 414, 418, 422}; - const G4double G4PiNuclearCrossSection::e4[32] = {0.02, 0.04, 0.06, 0.08, 0.1, 0.12, 0.14, 0.16, 0.18, 0.2, 0.22, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.9, 1, 2, 3, 5, 10, 20, 50, 100, 500, 1000}; + const G4double G4PiNuclearCrossSection::e3_1[31] = { 0.02, .04, .06, .08, .1, .12, .14, .16, .18, .2, .22, .25, .3, .35, .4, .45, .5, .6, .7, .8, .9, 1., 2., 3., 5., 10., 20., 50., 100.,500.,1000.}; + const G4double G4PiNuclearCrossSection::al_m_t[31] = { 532, 637, 832, 1057, 1207, 1230, 1210, 1174, 1133, 1095, 1038, 970, 890, 807, 750, 710, 675, 665, 670, 673, 678, 682, 618, 574, 546, 520, 507, 495, 488, 488, 488}; + const G4double G4PiNuclearCrossSection::al_m_in[31] = {300, 360, 495, 665, 750, 765, 750, 730, 700, 660, 615, 570, 520, 490, 470, 450, 448, 450, 450, 452, 456, 460, 408, 392, 376, 356, 347, 338, 332, 332, 332}; + const G4double G4PiNuclearCrossSection::al_p_t[21] = { 225, 350, 616, 945, 1122, 1175, 1157, 1128, 1088, 1045, 988, 935, 870, 787, 730, 690, 660, 652, 660, 668, 678}; + const G4double G4PiNuclearCrossSection::al_p_in[21] = {120, 238, 390, 610, 712, 735, 720, 703, 655, 635, 590, 550, 505, 475, 455, 438, 440, 445, 445, 450, 456}; + const G4double G4PiNuclearCrossSection::ca_m_t[31] = { 800, 980, 1240, 1460, 1570, 1600, 1580, 1535, 1475, 1425, 1375, 1295, 1200, 1083, 1000, 948, 915, 895, 900, 908, 915, 922, 856, 795, 740, 705, 682, 660, 660, 660, 660}; + const G4double G4PiNuclearCrossSection::ca_m_in[31] = {470, 550, 620, 860, 955, 980, 960, 920, 860, 820, 780, 740, 665, 637, 615, 600, 590, 590, 600, 608, 610, 615, 550, 525, 510, 488, 470, 450, 450, 450, 450}; + const G4double G4PiNuclearCrossSection::ca_p_t[23] = { 275, 445, 790, 1195, 1440, 1485, 1475, 1435, 1385, 1335, 1295, 1245, 1160, 1050, 970, 923, 895, 877, 887, 897, 904, 913, 855}; + const G4double G4PiNuclearCrossSection::ca_p_in[23] = {160, 315, 500, 745, 870, 905, 900, 860, 810, 770, 740, 710, 640, 617, 595, 585, 575, 575, 590, 600, 602, 608, 510}; // last number is 500 in org, changed to make things smooth. + + const G4double G4PiNuclearCrossSection::e4[32] = {0.02, 0.04, 0.06, 0.08, 0.1, 0.12, 0.14, 0.16, 0.18, 0.2, 0.22, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.9, 1, 2, 3, 5, 10, 20, 50, 100, 500, 1000}; const G4double G4PiNuclearCrossSection::fe_m_t[32] = {1175, 1363, 1670, 1950, 2050, 2040, 1975, 1886, 1834, 1773, 1720, 1635, 1474, 1380, 1269, 1225, 1182, 1162, 1159, 1162, 1178, 1190, 1197, 1102, 1135, 975, 945, 925, 905, 905, 905, 905}; const G4double G4PiNuclearCrossSection::fe_m_in[32] = {625, 725, 910, 1180, 1275, 1250, 1200, 1150, 1100, 1040, 995, 925, 825, 810, 780, 760, 745, 740, 740, 740, 750, 760, 765, 690, 660, 635, 615, 600, 585, 585, 585, 585}; const G4double G4PiNuclearCrossSection::fe_p_t[25] = {330, 575, 1010, 1500, 1837, 1875, 1820, 1751, 1691, 1636, 1690, 1450, 1396, 1305, 1219, 1190, 1148, 1138, 1134, 1144, 1163, 1175, 1183, 1198, 1135}; @@ -77,17 +82,17 @@ const G4double G4PiNuclearCrossSection::cu_p_t[25] = {355, 605, 1120, 1630, 1940, 2010, 2010, 1980, 1925, 1895, 1830, 1730, 1585, 1490, 1400, 1340, 1290, 1290, 1290, 1310, 1330, 1345, 1350, 1240, 1185}; const G4double G4PiNuclearCrossSection::cu_p_in[25] = {230, 425, 780, 1025, 1155, 1190, 1190, 1180, 1125, 1100, 1050, 1000, 900, 870, 835, 815, 810, 812, 815, 825, 840, 850, 855, 780, 735}; - const G4double G4PiNuclearCrossSection::e5[34] = {0.02, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.1, 0.12, 0.14, 0.16, 0.18, 0.2, 0.22, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.6, 0.7, 0.8, 0.9, 1, 2, 3, 5, 10, 20, 50, 100, 500, 1000}; + const G4double G4PiNuclearCrossSection::e5[34] = {0.02, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.1, 0.12, 0.14, 0.16, 0.18, 0.2, 0.22, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.6, 0.7, 0.8, 0.9, 1, 2, 3, 5, 10, 20, 50, 100, 500, 1000}; const G4double G4PiNuclearCrossSection::mo_m_t[34] = {2430, 2610, 2710, 2790, 2880, 2940, 2965, 2970, 2970, 2920, 2840, 2720, 2570, 2500, 2365, 2200, 2050, 1926, 1825, 1768, 1749, 1750, 1778, 1789, 1808, 1690, 1645, 1530, 1492, 1450, 1425, 1425, 1425, 1425}; - const G4double G4PiNuclearCrossSection::mo_m_in[34] = {925, 1125, 1250, 1375, 1500, 1600, 1680, 1750, 1770, 1730, 1660, 1580, 1500, 1450, 1330, 1250, 1190, 1140, 1100, 1075, 1075, 1070, 1088, 1095, 1110, 1035, 1005, 940, 917, 880, 860, 860, 860, 860}; + const G4double G4PiNuclearCrossSection::mo_m_in[34] = {925, 1125, 1250, 1375, 1500, 1600, 1680, 1750, 1770, 1730, 1660, 1580, 1500, 1450, 1330, 1250, 1190, 1140, 1100, 1075, 1075, 1070, 1088, 1095, 1110, 1035, 1005, 940, 917, 880, 860, 860, 860, 860}; const G4double G4PiNuclearCrossSection::mo_p_t[27] = {410, 730, 1110, 1530, 1920, 2200, 2385, 2520, 2600, 2630, 2575, 2470, 2320, 2285, 2185, 2053, 1945, 1852, 1776, 1719, 1710, 1716, 1746, 1759, 1778, 1675, 1645}; const G4double G4PiNuclearCrossSection::mo_p_in[27] = {270, 540, 825, 975, 1140, 1285, 1400, 1480, 1555, 1580, 1525, 1470, 1360, 1340, 1255, 1160, 1120, 1085, 1060, 1045, 1045, 1045, 1065, 1075, 1090, 1025, 1005}; const G4double G4PiNuclearCrossSection::cd_m_t[34] = {3060, 3125, 3170, 3220, 3255, 3280, 3290, 3260, 3270, 3200, 3120, 3080, 3090, 2920, 2810, 2640, 2362, 2230, 2115, 2050, 2020, 2025, 2040, 2070, 2100, 1900, 1795, 1740, 1675, 1645, 1625, 1620, 1620, 1620}; - const G4double G4PiNuclearCrossSection::cd_m_in[34]= {1025, 1275, 1440, 1625, 1740, 1800, 1880, 1920, 1980, 1920, 1850, 1810, 1720, 1650, 1560, 1450, 1330, 1290, 1245, 1210, 1200, 1200, 1205, 1205, 1230, 1130, 1085, 1060, 1000, 985, 975, 970, 970, 970}; + const G4double G4PiNuclearCrossSection::cd_m_in[34]= {1025, 1275, 1440, 1625, 1740, 1800, 1880, 1920, 1980, 1920, 1850, 1810, 1720, 1650, 1560, 1450, 1330, 1290, 1245, 1210, 1200, 1200, 1205, 1205, 1230, 1130, 1085, 1060, 1000, 985, 975, 970, 970, 970}; const G4double G4PiNuclearCrossSection::cd_p_t[28] = {455, 780, 1170, 1700, 2120, 2400, 2600, 2720, 2820, 2840, 2800, 2760, 2720, 2640, 2560, 2450, 2252, 2130, 2035, 1985, 1970, 1975, 2005, 2035, 2070, 1880, 1795, 1740}; const G4double G4PiNuclearCrossSection::cd_p_in[28] = {310, 580, 880, 1060, 1270, 1400, 1530, 1610, 1660, 1680, 1640, 1600, 1560, 1500, 1430, 1330, 1280, 1230, 1200, 1180, 1170, 1175, 1180, 1180, 1210, 1120, 1085, 1060}; - const G4double G4PiNuclearCrossSection::e6[35] = {0.02, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.1, 0.12, 0.14, 0.16, 0.18, 0.2, 0.22, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.9, 1, 2, 3, 5, 10, 20, 50, 100, 500, 1000}; + const G4double G4PiNuclearCrossSection::e6[35] = {0.02, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.1, 0.12, 0.14, 0.16, 0.18, 0.2, 0.22, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.9, 1, 2, 3, 5, 10, 20, 50, 100, 500, 1000}; const G4double G4PiNuclearCrossSection::sn_m_t[35] = {3000, 3180, 3250, 3300, 3300, 3410, 3470, 3450, 3410, 3350, 3280, 3200, 3120, 3050, 2900, 2630, 2500, 2325, 2190, 2100, 2060, 2055, 2055, 2055, 2067, 2085, 2000, 1900, 1835, 1770, 1720, 1700, 1695, 1695, 1695}; const G4double G4PiNuclearCrossSection::sn_m_in[35] = {1050, 1350, 1520, 1650, 1800, 1980, 2070, 2120, 2090, 2050, 1980, 1920, 1830, 1770, 1670, 1500, 1435, 1350, 1300, 1230, 1220, 1235, 1235, 1235, 1237, 1240, 1160, 1120, 1090, 1065, 1040, 1020, 1015, 1015, 1015}; const G4double G4PiNuclearCrossSection::sn_p_t[29] = { 465, 800, 1200, 1760, 2170, 2480, 2730, 2885, 2970, 2980, 2970, 2890, 2840, 2790, 2620, 2450, 2335, 2205, 2080, 2020, 2010, 1990, 1990, 2015, 2030, 2045, 1980, 1890, 1835}; @@ -97,7 +102,7 @@ const G4double G4PiNuclearCrossSection::w_p_t[30] = { 480, 900, 1500, 2350, 3020, 3420, 3650, 3775, 3875, 3830, 3750, 3700, 3630, 3550, 3550, 3290, 3070, 2890, 2840, 2730, 2725, 2720, 2770, 2805, 2828, 2865, 2770, 2640, 2570, 2490}; const G4double G4PiNuclearCrossSection::w_p_in[30] = { 325, 680, 990, 1500, 1850, 2150, 2250, 2300, 2350, 2330, 2280, 2230, 2200, 2120, 2130, 1900, 1780, 1670, 1635, 1600, 1602, 1605, 1610, 1615, 1630, 1660, 1620, 1550, 1530, 1460}; - const G4double G4PiNuclearCrossSection::e7[35] = {0.02, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.1, 0.12, 0.14, 0.16, 0.18, 0.2, 0.22, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.9, 1, 2, 3, 5, 10, 20, 50, 100, 500, 1000}; + const G4double G4PiNuclearCrossSection::e7[35] = {0.02, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.1, 0.12, 0.14, 0.16, 0.18, 0.2, 0.22, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.9, 1, 2, 3, 5, 10, 20, 50, 100, 500, 1000}; const G4double G4PiNuclearCrossSection::pb_m_t[35] = {5890, 5700, 5610, 5580, 5550, 5480, 5400, 5300, 5100, 4930, 4750, 4600, 4400, 4280, 4170, 3915, 3650, 3470, 3260, 3150, 3120, 3070, 3085, 3100, 3120, 3160, 3070, 2930, 2820, 2750, 2710, 2655, 2640, 2640, 2640}; const G4double G4PiNuclearCrossSection::pb_m_in[35] = {1575, 2025, 2300, 2575, 2850, 3000, 3115, 3180, 3080, 2940, 2800, 2670, 2550, 2450, 2370, 2220, 2110, 2000, 1920, 1880, 1850, 1800, 1805, 1810, 1820, 1840, 1800, 1720, 1640, 1620, 1570, 1530, 1530, 1530, 1530}; const G4double G4PiNuclearCrossSection::pb_p_t[30] = { 515, 940, 1500, 2400, 3270, 3750, 4050, 4140, 4260, 4200, 4080, 3990, 3990, 3810, 3730, 3520, 3370, 3186, 3110, 3010, 2990, 2985, 3005, 3020, 3040, 3080, 3020, 2905, 2790, 2750}; @@ -232,6 +237,7 @@ { if(theZ[it]==Z) { + // at high energies, when no data for pi+, use pi- std::vector * theData = &thePimData; if(thePipData[it]->AppliesTo(kineticEnergy)) { @@ -273,11 +279,36 @@ G4double G4PiNuclearCrossSection:: Interpolate(G4int Z1, G4int Z2, G4int Z, G4double x1, G4double x2) + { +// Nucleon numbers obtained from G4NistManager G4 8.0 + static const G4double A[92]= + {1.0001, 4.0000, 6.9241, 9.0000, 10.801, 12.011, 14.004, 16.004, 19.000, 20.188, + 23.000, 24.320, 27.000, 28.109, 31.000, 32.094, 35.484, 39.985, 39.135, 40.116, + 45.000, 47.918, 50.998, 52.055, 55.000, 55.910, 59.000, 58.760, 63.617, 65.468, + 69.798, 72.691, 75.000, 79.042, 79.986, 83.887, 85.557, 87.710, 89.000, 91.318, + 93.000, 96.025, 98.000, 101.16, 103.00, 106.51, 107.96, 112.51, 114.91, 118.81, + 121.86, 127.70, 127.00, 131.39, 133.00, 137.42, 139.00, 140.21, 141.00, 144.32, + 145.00, 150.45, 152.04, 157.33, 159.00, 162.57, 165.00, 167.32, 169.00, 173.10, + 175.03, 178.54, 181.00, 183.89, 186.25, 190.27, 192.25, 195.11, 197.00, 200.63, + 204.41, 207.24, 209.00, 209.00, 210.00, 222.00, 223.00, 226.00, 227.00, 232.00, + 231.00, 237.98}; + + static G4bool NeedInit=true; + static G4double A75[92]; + if ( NeedInit ) { - G4double result = 0; - G4double r1 = x1/std::pow(G4double(Z1), 2./3.)*std::pow(G4double(Z), 2./3.); - G4double r2 = x2/std::pow(G4double(Z2), 2./3.)*std::pow(G4double(Z), 2./3.); - result = (r1+r2)/2.; - return result; + for (G4int i=0; i<92; ++i) + { + A75[i]=std::pow(A[i],0.75); + } + NeedInit=false; } +// for tabulated data, cross section scales with A^.75 + G4double r1 = x1 / A75[Z1-1] * A75[Z-1]; + G4double r2 = x2 / A75[Z2-1] * A75[Z-1]; + G4double result=0.5*(r1+r2); +// G4cout << "x1/2, z1/2 z" < 19.9*GeV ) + { // constant cross section above ~20GeV. + return GetCrossSection(19.8*GeV,atomicNumber,nOfProtons); + } G4double nOfNeutrons = atomicNumber-nOfProtons; kineticEnergy /=GeV; G4double a = atomicNumber; diff --git a/examples/extended/medical/GammaTherapy/src/G4EmHadronBuilder71.cc b/source/processes/hadronic/cross_sections/src/G4UElasticCrossSection.cc similarity index 56% rename from examples/extended/medical/GammaTherapy/src/G4EmHadronBuilder71.cc rename to source/processes/hadronic/cross_sections/src/G4UElasticCrossSection.cc index b6d2bcce3c..8b622b5ebb 100644 --- a/examples/extended/medical/GammaTherapy/src/G4EmHadronBuilder71.cc +++ b/source/processes/hadronic/cross_sections/src/G4UElasticCrossSection.cc @@ -24,86 +24,88 @@ // ******************************************************************** // // -// $Id: G4EmHadronBuilder71.cc,v 1.2 2006/06/29 17:27:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -//--------------------------------------------------------------------------- -// -// ClassName: G4EmHadronBuilder71 -// -// Author: V.Ivanchenko 03.10.2005 -// -// Modified: -// -//---------------------------------------------------------------------------- +// 12.08.06 V.Ivanchenko - first implementation // // -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#include "G4EmHadronBuilder71.hh" + +#include "G4UElasticCrossSection.hh" + +#include "G4ParticleTable.hh" +#include "G4GlauberGribovCrossSection.hh" +#include "G4UPiNuclearCrossSection.hh" +#include "G4HadronCrossSections.hh" #include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" - -#include "G4MultipleScattering71.hh" - -#include "G4hIonisation.hh" -#include "G4ionIonisation.hh" - -#include "G4Electron.hh" -#include "G4Proton.hh" -#include "G4GenericIon.hh" +#include "G4Element.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -G4EmHadronBuilder71::G4EmHadronBuilder71(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -G4EmHadronBuilder71::~G4EmHadronBuilder71() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void G4EmHadronBuilder71::ConstructParticle() +G4UElasticCrossSection::G4UElasticCrossSection() { - G4Electron::Electron(); - G4Proton::Proton(); - G4GenericIon::GenericIon(); + fGlauber = new G4GlauberGribovCrossSection(); + fUPi = new G4UPiNuclearCrossSection(); + fGheisha = new G4HadronCrossSections(); } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -void G4EmHadronBuilder71::ConstructProcess() +G4UElasticCrossSection::~G4UElasticCrossSection() { - // Add standard EM Processes - theParticleIterator->reset(); + delete fGlauber; + delete fGheisha; + delete fUPi; +} - while( (*theParticleIterator)() ){ - G4ParticleDefinition* particle = theParticleIterator->value(); +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - if(particle->GetPDGMass() > 110.*MeV) { - G4ProcessManager* pmanager = particle->GetProcessManager(); - G4String particleName = particle->GetParticleName(); - - if (particleName == "GenericIon" || - particleName == "alpha" || - particleName == "He3") { - - pmanager->AddProcess(new G4MultipleScattering71, -1, 1, 1); - pmanager->AddProcess(new G4ionIonisation, -1, 2, 2); - - } else if (!particle->IsShortLived() && - particle->GetPDGCharge() != 0.0 ) { - - pmanager->AddProcess(new G4MultipleScattering71, -1, 1, 1); - pmanager->AddProcess(new G4hIonisation, -1, 2, 2); - } - } +G4bool G4UElasticCrossSection::IsApplicable(const G4DynamicParticle* dp, + const G4Element* elm) +{ + G4bool res = false; + idx = 0; + if(fGlauber->IsApplicable(dp,elm)) { + res = true; + idx = 1; + } else if(fUPi->IsApplicable(dp,elm)) { + res = true; + idx = 2; + } else if(fGheisha->IsApplicable(dp,elm)) { + res = true; + idx = 3; } + return res; } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +G4double G4UElasticCrossSection::GetCrossSection(const G4DynamicParticle* dp, + const G4Element* elm, + G4double temp) +{ + G4double cross = 0.0; + if(idx == 1) { + cross = fGlauber->GetCrossSection(dp,elm,temp); + cross = fGlauber->GetElasticGlauberGribovXsc(); + } + else if(idx == 2) cross = fUPi->GetElasticCrossSection(dp,elm); + else if(idx == 3) cross = fGheisha->GetElasticCrossSection(dp,elm); + + return cross; +} + + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void G4UElasticCrossSection::BuildPhysicsTable(const G4ParticleDefinition&) +{} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void G4UElasticCrossSection::DumpPhysicsTable(const G4ParticleDefinition&) +{ + G4cout << "G4UElasticCrossSection: uses Glauber-Gribov formula"<IsApplicable(dp,elm)) { + res = true; + idx = 1; + } else if(fGhadProton && fGhadProton->IsApplicable(dp,elm)) { + res = true; + idx = 2; + } else if(fGhadNeutron && fGhadNeutron->IsApplicable(dp,elm)) { + res = true; + idx = 3; + } else if(fUPi && fUPi->IsApplicable(dp,elm)) { + res = true; + idx = 4; + } else if(fGheisha->IsApplicable(dp,elm)) { + res = true; + idx = 5; + } + if(verboseLevel > 1) + G4cout << "G4UInelasticCrossSection::IsApplicable idx= " << idx << " for " + << dp->GetDefinition()->GetParticleName() + << " Ekin(GeV)= " << dp->GetKineticEnergy() + << G4endl; + return res; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +G4double G4UInelasticCrossSection::GetCrossSection(const G4DynamicParticle* dp, + const G4Element* elm, + G4double temp) +{ + G4double cross = 0.0; + if(idx == 1) { + cross = fGlauber->GetCrossSection(dp,elm,temp); + cross = fGlauber->GetInelasticGlauberGribovXsc(); + } + else if(idx == 2) cross = fGhadProton->GetCrossSection(dp,elm,temp); + else if(idx == 3) cross = fGhadNeutron->GetCrossSection(dp,elm,temp); + else if(idx == 4) cross = fUPi->GetInelasticCrossSection(dp,elm); + else if(idx == 5) cross = fGheisha->GetInelasticCrossSection(dp,elm); + + if(verboseLevel > 1) + G4cout << "G4UInelasticCrossSection::GetCrossSection: idx= " << idx << " for " + << dp->GetDefinition()->GetParticleName() + << " Ekin(GeV)= " << dp->GetKineticEnergy() + << " in " << elm->GetName() + << G4endl; + + return cross; +} + + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void G4UInelasticCrossSection::BuildPhysicsTable(const G4ParticleDefinition&) +{} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void G4UInelasticCrossSection::DumpPhysicsTable(const G4ParticleDefinition&) +{ + G4cout << "G4UInelasticCrossSection: uses Glauber-Gribov formula"<clearAndDestroy(); + piPlusInelastic ->clearAndDestroy(); + piMinusElastic ->clearAndDestroy(); + piMinusInelastic->clearAndDestroy(); +} + +G4double G4UPiNuclearCrossSection::GetElasticCrossSection( + const G4DynamicParticle* dp, const G4Element* elm) +{ + G4double cross = 0.0; + G4PhysicsTable* table = 0; + const G4ParticleDefinition* part = dp->GetDefinition(); + if(part == piPlus) table = piPlusElastic; + else if(part == piMinus) table = piMinusElastic; + if(table) + cross = Interpolate(elm->GetZ(),elm->GetA(), + dp->GetKineticEnergy(),table); + return cross; +} + +G4double G4UPiNuclearCrossSection::GetInelasticCrossSection( + const G4DynamicParticle* dp, const G4Element* elm) +{ + G4double cross = 0.0; + G4double fact = 1.0; + G4double ekin = dp->GetKineticEnergy(); + G4PhysicsTable* table = 0; + const G4ParticleDefinition* part = dp->GetDefinition(); + + // Coulomb barier + if(part == piPlus) { + if(ekin > elowest) { + table = piPlusInelastic; + if(ekin < elow) { + fact = ekin/elow; + ekin = elow; + } + } + } else if(part == piMinus) { + table = piMinusInelastic; + if(ekin < elow) ekin = elow; + } + if(table) + cross = fact*Interpolate(elm->GetZ(), elm->GetA(), ekin, table); + return cross; +} + +G4double G4UPiNuclearCrossSection::Interpolate( + G4double Z, G4double A, G4double ekin, G4PhysicsTable* table) +{ + G4bool b; + G4int idx; + G4int iz = G4int(Z + 0.5); + for(idx=0; idx= iz) break;} + + G4double x = (((*table)[idx])->GetValue(ekin, b)); + + // Interpolation between Z + if(iz < theZ[idx]) { + G4double x2 = x; + G4double x1 = x; + if(idx == 0) { + idx++; + x2 = (((*table)[idx])->GetValue(ekin, b)); + } else { + x1 = (((*table)[idx-1])->GetValue(ekin, b)); + } + G4double A1 = theA[idx-1]; + G4double A2 = theA[idx]; + G4double w1 = A - A1; + G4double w2 = A2 - A; + G4double y1 = x1*std::pow(A/A1,aPower); + G4double y2 = x2*std::pow(A/A2,aPower); + x = (w1*y1 + w2*y2)/(w1 + w2); + } + return std::exp(x); +} + +void G4UPiNuclearCrossSection::AddDataSet(const G4String& p, + const G4double* tot, + const G4double* in, + const G4double* e, + G4int n) +{ + G4LPhysicsFreeVector* pvin = new G4LPhysicsFreeVector(n,e[0]*GeV,e[n-1]*GeV); + G4LPhysicsFreeVector* pvel = new G4LPhysicsFreeVector(n,e[0]*GeV,e[n-1]*GeV); + for(G4int i=0; iPutValues(i,e[i]*GeV,std::log(in[i]*millibarn)); + pvel->PutValues(i,e[i]*GeV,std::log((tot[i]-in[i])*millibarn)); + } + if(p == "pi+") { + piPlusInelastic->push_back(pvin); + piPlusElastic->push_back(pvel); + } else { + piMinusInelastic->push_back(pvin); + piMinusElastic->push_back(pvel); + } +} + +void G4UPiNuclearCrossSection::BuildPhysicsTable(const G4ParticleDefinition&) +{} + +void G4UPiNuclearCrossSection::DumpPhysicsTable(const G4ParticleDefinition& p) +{ + if(&p == piPlus) { + G4cout << "### G4UPiNuclearCrossSection Elastic data for pi+" << G4endl; + G4cout << *piPlusElastic << G4endl; + G4cout << "### G4UPiNuclearCrossSection Inelastic data for pi+" << G4endl; + G4cout << *piPlusInelastic << G4endl; + } else if(&p == piMinus) { + G4cout << "### G4UPiNuclearCrossSection Elastic data for pi-" << G4endl; + G4cout << *piMinusElastic << G4endl; + G4cout << "### G4UPiNuclearCrossSection Inelastic data for pi-" << G4endl; + G4cout << *piMinusInelastic << G4endl; + } +} + +void G4UPiNuclearCrossSection::Initialise() +{ + piPlus = G4PionPlus::PionPlus(); + piMinus = G4PionMinus::PionMinus(); + aPower = 0.75; + elow = 20.0*MeV; + elowest = MeV; + + const G4int n = 16; + const G4int iz[n] = {2,4,6,7,8,11,13,20,26,29,42,48,50,74,82,92}; + NZ = n; + + G4NistManager* nist = G4NistManager::Instance(); + for(G4int i=0; iGetAtomicMassAmu(iz[i])); + } + + piPlusElastic = new G4PhysicsTable(); + piPlusInelastic = new G4PhysicsTable(); + piMinusElastic = new G4PhysicsTable(); + piMinusInelastic = new G4PhysicsTable(); + + const G4double e1[38] = {0.02, 0.04, 0.06, 0.08, 0.1, 0.12, 0.13, 0.14, 0.15, 0.16, 0.17, 0.18, 0.19, 0.2, 0.22, 0.24, 0.26, 0.28, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.9, 1, 2, 3, 5, 10, 20, 50, 100, 500, 1000}; + const G4double he_t[38] = {40, 70, 108, 152, 208, 276, 300, 320, 329, 333, 332, 328, 322, 310, 288, 260, 240, 216, 196, 144, 125, 112, 108.5, 109, 110.5, 117, 123, 128.5, 135, 110, 96, 87, 85, 83.5, 83.5, 83.5, 83.5, 83.5}; + const G4double he_in[38] = {18, 38, 62, 98, 136, 176, 190, 200, 209, 212, 212, 208, 204, 196, 176, 164, 150, 134, 124, 97.5, 90, 85, 82.5, 83.5, 86.5, 93, 97.5, 100, 102, 83, 77, 75, 74, 72.5, 72.5, 72.5, 72.5, 72.5}; + const G4double be_m_t[38] = {150, 210, 294, 396, 520, 600, 623, 635, 642, 640, 630, 615, 600, 576, 540, 504, 470, 435, 400, 340, 294, 258, 236, 230, 233, 244, 257, 270, 276, 250, 230, 215, 205, 194, 188, 186, 186, 186}; + const G4double be_m_in[38] = {90, 126, 177, 240, 320, 380, 400, 410, 414, 410, 400, 387, 371, 360, 333, 312, 285, 260, 237, 216, 198, 187, 182, 180, 182, 187, 193, 203, 207, 179, 172, 165, 159, 155, 144, 144, 144, 144}; + const G4double be_p_t[24] = {96, 150, 222, 320, 430, 514, 545, 565, 574, 574, 564, 552, 535, 522, 490, 462, 432, 398, 367, 314, 276, 248, 232, 230}; + const G4double be_p_in[24] = {60, 95, 142, 194, 262, 319, 345, 361, 364, 364, 354, 350, 330, 319, 298, 280, 258, 237, 216, 200, 189, 183, 182, 180}; + const G4double e2[39] = {0.02, 0.04, 0.06, 0.08, 0.1, 0.11, 0.12, 0.13, 0.14, 0.15, 0.16, 0.17, 0.18, 0.2, 0.22, 0.24, 0.26, 0.28, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.575, 0.6, 0.7, 0.8, 0.9, 1, 2, 3, 5, 10, 20, 50, 100, 500, 1000}; + const G4double c_m_t[39] = {204, 260, 366, 517, 630, 673, 694, 704, 710, 711, 706, 694, 676, 648, 616, 584, 548, 518, 489, 426, 376, 342, 323, 310, 312, 313, 319, 333, 342, 348, 310, 290, 268, 250, 245, 237, 234, 234, 234}; + const G4double c_m_in[39] = {128, 160, 224, 315, 388, 416, 430, 438, 444, 445, 440, 432, 416, 400, 380, 354, 320, 304, 288, 264, 246, 240, 233, 232, 233, 234, 238, 246, 252, 256, 220, 210, 198, 187, 183, 176, 174, 174, 174}; + const G4double c_p_t[24] = {140, 192, 294, 428, 594, 642, 662, 687, 685, 688, 684, 672, 656, 630, 598, 567, 533, 504, 474, 416, 369, 336, 319, 310}; + const G4double c_p_in[24] = {94, 132, 184, 260, 370, 398, 408, 420, 426, 428, 424, 416, 400, 386, 366, 340, 308, 294, 280, 257, 241, 236, 231, 232}; + const G4double n_m_t[39] = {246, 308, 424, 590, 729, 776, 800, 821, 822, 817, 800, 778, 768, 728, 690, 654, 615, 584, 556, 480, 430, 393, 373, 367, 368, 370, 375, 388, 390, 397, 364, 337, 310, 291, 275, 268, 268, 268, 268}; + const G4double n_m_in[39] = {155, 188, 256, 360, 456, 492, 512, 526, 526, 520, 504, 491, 475, 450, 425, 396, 376, 360, 340, 300, 282, 270, 265, 265, 266, 268, 273, 280, 288, 288, 256, 237, 226, 218, 208, 202, 202, 202, 202}; + const G4double n_p_t[27] = {150, 212, 328, 500, 680, 735, 762, 781, 782, 779, 770, 748, 740, 706, 672, 633, 600, 569, 541, 467, 419, 385, 368, 364, 366, 368, 375}; + const G4double n_p_in[27] = {90, 140, 208, 300, 426, 467, 490, 504, 504, 500, 484, 474, 460, 437, 413, 381, 365, 350, 330, 292, 276, 267, 263, 264, 265, 267, 273}; + const G4double e3[31] = {0.02, 0.04, 0.06, 0.08, 0.1, 0.12, 0.14, 0.16, 0.18, 0.2, 0.22, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.6, 0.7, 0.8, 0.9, 1, 2, 3, 5, 10, 20, 50, 100, 500, 1000}; + const G4double o_m_t[31] = {280, 360, 500, 685, 812, 861, 870, 865, 835, 800, 755, 700, 600, 537, 493, 468, 441, 436, 443, 449, 460, 463, 432, 385, 350, 325, 312, 307, 303, 303, 303}; + const G4double o_m_in[31] = {190, 207, 300, 420, 500, 540, 550, 542, 520, 490, 460, 423, 360, 339, 321, 314, 312, 314, 319, 324, 328, 330, 300, 275, 250, 240, 229, 225, 222, 222, 222}; + const G4double o_p_t[20] = {170, 240, 390, 570, 740, 818, 830, 822, 800, 765, 725, 675, 585, 525, 483, 458, 444, 447, 453, 449}; + const G4double o_p_in[20] = {100, 145, 240, 340, 470, 518, 530, 522, 505, 477, 448, 412, 350, 330, 316, 310, 308, 311, 317, 324}; + const G4double na_m_t[31] = {450, 545, 705, 910, 1020, 1075, 1087, 1080, 1042, 987, 943, 885, 790, 700, 650, 610, 585, 575, 585, 595, 600, 610, 556, 524, 494, 458, 445, 429, 427, 427, 427}; + const G4double na_m_in[31] = {275, 315, 413, 545, 620, 660, 670, 662, 630, 593, 570, 520, 465, 420, 410, 395, 390, 400, 410, 418, 420, 422, 372, 348, 330, 320, 310, 294, 292, 292, 292}; + const G4double na_p_t[22] = {210, 320, 530, 795, 960, 1035, 1050, 1040, 1007, 957, 918, 865, 773, 685, 636, 598, 575, 565, 578, 590, 598, 610}; + const G4double na_p_in[22] = {115, 210, 340, 495, 585, 630, 645, 637, 605, 572, 550, 505, 455, 410, 401, 388, 383, 393, 405, 414, 418, 422}; + + const G4double e3_1[31] = {.02, .04, .06, .08, .1, .12, .14, .16, .18, .2, .22, .25, .3, .35, .4, .45, .5, .6, .7, .8, .9, 1., 2., 3., 5., 10., 20., 50., 100., 500., 1000.}; + const G4double al_m_t[31] = {532, 637, 832, 1057, 1207, 1230, 1210, 1174, 1133, 1095, 1038, 970, 890, 807, 750, 710, 675, 665, 670, 673, 678, 682, 618, 574, 546, 520, 507, 495, 488, 488, 488}; + const G4double al_m_in[31] = {300, 360, 495, 665, 750, 765, 750, 730, 700, 660, 615, 570, 520, 490, 470, 450, 448, 450, 450, 452, 456, 460, 408, 392, 376, 356, 347, 338, 332, 332, 332}; + const G4double al_p_t[21] = {225, 350, 616, 945, 1122, 1175, 1157, 1128, 1088, 1045, 988, 935, 870, 787, 730, 690, 660, 652, 660, 668, 678}; + const G4double al_p_in[21] = {120, 238, 390, 610, 712, 735, 720, 703, 655, 635, 590, 550, 505, 475, 455, 438, 440, 445, 445, 450, 456}; + const G4double ca_m_t[31] = {800, 980, 1240, 1460, 1570, 1600, 1580, 1535, 1475, 1425, 1375, 1295, 1200, 1083, 1000, 948, 915, 895, 900, 908, 915, 922, 856, 795, 740, 705, 682, 660, 660, 660, 660}; + const G4double ca_m_in[31] = {470, 550, 620, 860, 955, 960, 920, 860, 820, 780, 740, 665, 637, 615, 600, 590, 600, 608, 610, 615, 550, 525, 510, 488, 470, 450, 450, 450, 450}; + const G4double ca_p_t[23] = {275, 445, 790, 1195, 1440, 1485, 1475, 1435, 1385, 1335, 1295, 1245, 1160, 1050, 970, 923, 895, 877, 887, 897, 904, 913, 855}; + const G4double ca_p_in[23] = {160, 315, 500, 745, 870, 905, 900, 860, 810, 770, 740, 710, 640, 617, 595, 585, 575, 575, 590, 600, 602, 608, 510}; // last number is 500 in org, changed to make things smooth. + + const G4double e4[32] = {0.02, 0.04, 0.06, 0.08, 0.1, 0.12, 0.14, 0.16, 0.18, 0.2, 0.22, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.9, 1, 2, 3, 5, 10, 20, 50, 100, 500, 1000}; + const G4double fe_m_t[32] = {1175, 1363, 1670, 1950, 2050, 2040, 1975, 1886, 1834, 1773, 1720, 1635, 1474, 1380, 1269, 1225, 1182, 1162, 1159, 1162, 1178, 1190, 1197, 1102, 1135, 975, 945, 925, 905, 905, 905, 905}; + const G4double fe_m_in[32] = {625, 725, 910, 1180, 1275, 1250, 1200, 1150, 1100, 1040, 995, 925, 825, 810, 780, 760, 745, 740, 740, 740, 750, 760, 765, 690, 660, 635, 615, 600, 585, 585, 585, 585}; + const G4double fe_p_t[25] = {330, 575, 1010, 1500, 1837, 1875, 1820, 1751, 1691, 1636, 1690, 1450, 1396, 1305, 1219, 1190, 1148, 1138, 1134, 1144, 1163, 1175, 1183, 1198, 1135}; + const G4double fe_p_in[25] = {210, 410, 707, 1010, 1125, 1150, 1100, 1070, 1010, 960, 920, 776, 780, 760, 750, 740, 720, 725, 725, 730, 740, 750, 755, 690, 660}; + const G4double cu_m_t[32] = {1400, 1600, 1875, 2088, 2200, 2220, 2175, 2125, 2075, 2012, 1950, 1855, 1670, 1530, 1430, 1370, 1315, 1315, 1315, 1330, 1345, 1360, 1365, 1250, 1185, 1128, 1070, 1035, 1010, 1010, 1010, 1010}; + const G4double cu_m_in[32] = {725, 840, 1020, 1200, 1295, 1300, 1267, 1240, 1213, 1175, 1125, 1042, 950, 900, 860, 840, 830, 832, 835, 840, 850, 860, 865, 785, 735, 705, 680, 650, 630, 630, 630, 630}; + const G4double cu_p_t[25] = {355, 605, 1120, 1630, 1940, 2010, 2010, 1980, 1925, 1895, 1830, 1730, 1585, 1490, 1400, 1340, 1290, 1290, 1290, 1310, 1330, 1345, 1350, 1240, 1185}; + const G4double cu_p_in[25] = {230, 425, 780, 1025, 1155, 1190, 1190, 1180, 1125, 1100, 1050, 1000, 900, 870, 835, 815, 810, 812, 815, 825, 840, 850, 855, 780, 735}; + + const G4double e5[34] = {0.02, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.1, 0.12, 0.14, 0.16, 0.18, 0.2, 0.22, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.6, 0.7, 0.8, 0.9, 1, 2, 3, 5, 10, 20, 50, 100, 500, 1000}; + const G4double mo_m_t[34] = {2430, 2610, 2710, 2790, 2880, 2940, 2965, 2970, 2970, 2920, 2840, 2720, 2570, 2500, 2365, 2200, 2050, 1926, 1825, 1768, 1749, 1750, 1778, 1789, 1808, 1690, 1645, 1530, 1492, 1450, 1425, 1425, 1425, 1425}; + const G4double mo_m_in[34] = {925, 1125, 1250, 1375, 1500, 1600, 1680, 1750, 1770, 1730, 1660, 1580, 1500, 1450, 1330, 1250, 1190, 1140, 1100, 1075, 1075, 1070, 1088, 1095, 1110, 1035, 1005, 940, 917, 880, 860, 860, 860, 860}; + const G4double mo_p_t[27] = {410, 730, 1110, 1530, 1920, 2200, 2385, 2520, 2600, 2630, 2575, 2470, 2320, 2285, 2185, 2053, 1945, 1852, 1776, 1719, 1710, 1716, 1746, 1759, 1778, 1675, 1645}; + const G4double mo_p_in[27] = {270, 540, 825, 975, 1140, 1285, 1400, 1480, 1555, 1580, 1525, 1470, 1360, 1340, 1255, 1160, 1120, 1085, 1060, 1045, 1045, 1045, 1065, 1075, 1090, 1025, 1005}; + const G4double cd_m_t[34] = {3060, 3125, 3170, 3220, 3255, 3280, 3290, 3260, 3270, 3200, 3120, 3080, 3090, 2920, 2810, 2640, 2362, 2230, 2115, 2050, 2020, 2025, 2040, 2070, 2100, 1900, 1795, 1740, 1675, 1645, 1625, 1620, 1620, 1620}; + const G4double cd_m_in[34]= {1025, 1275, 1440, 1625, 1740, 1800, 1880, 1920, 1980, 1920, 1850, 1810, 1720, 1650, 1560, 1450, 1330, 1290, 1245, 1210, 1200, 1200, 1205, 1205, 1230, 1130, 1085, 1060, 1000, 985, 975, 970, 970, 970}; + const G4double cd_p_t[28] = {455, 780, 1170, 1700, 2120, 2400, 2600, 2720, 2820, 2840, 2800, 2760, 2720, 2640, 2560, 2450, 2252, 2130, 2035, 1985, 1970, 1975, 2005, 2035, 2070, 1880, 1795, 1740}; + const G4double cd_p_in[28] = {310, 580, 880, 1060, 1270, 1400, 1530, 1610, 1660, 1680, 1640, 1600, 1560, 1500, 1430, 1330, 1280, 1230, 1200, 1180, 1170, 1175, 1180, 1180, 1210, 1120, 1085, 1060}; + + const G4double e6[35] = {0.02, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.1, 0.12, 0.14, 0.16, 0.18, 0.2, 0.22, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.9, 1, 2, 3, 5, 10, 20, 50, 100, 500, 1000}; + const G4double sn_m_t[35] = {3000, 3180, 3250, 3300, 3300, 3410, 3470, 3450, 3410, 3350, 3280, 3200, 3120, 3050, 2900, 2630, 2500, 2325, 2190, 2100, 2060, 2055, 2055, 2055, 2067, 2085, 2000, 1900, 1835, 1770, 1720, 1700, 1695, 1695, 1695}; + const G4double sn_m_in[35] = {1050, 1350, 1520, 1650, 1800, 1980, 2070, 2120, 2090, 2050, 1980, 1920, 1830, 1770, 1670, 1500, 1435, 1350, 1300, 1230, 1220, 1235, 1235, 1235, 1237, 1240, 1160, 1120, 1090, 1065, 1040, 1020, 1015, 1015, 1015}; + const G4double sn_p_t[29] = { 465, 800, 1200, 1760, 2170, 2480, 2730, 2885, 2970, 2980, 2970, 2890, 2840, 2790, 2620, 2450, 2335, 2205, 2080, 2020, 2010, 1990, 1990, 2015, 2030, 2045, 1980, 1890, 1835}; + const G4double sn_p_in[29] = { 315, 590, 880, 1220, 1460, 1580, 1700, 1770, 1810, 1810, 1800, 1730, 1680, 1630, 1530, 1400, 1335, 1270, 1210, 1180, 1190, 1190, 1190, 1205, 1210, 1210, 1150, 1115, 1090}; + const G4double w_m_t[35] = {5200, 5115, 5025, 4975, 4900, 4850, 4780, 4725, 4600, 4490, 4355, 4255, 4125, 4040, 3830, 3580, 3330, 3110, 2955, 2860, 2852, 2845, 2885, 2900, 2915, 2940, 2800, 2660, 2570, 2490, 2460, 2425, 2420, 2420, 2420}; + const G4double w_m_in[35] = {1450, 1850, 2100, 2350, 2550, 2700, 2825, 2900, 2850, 2750, 2630, 2525, 2400, 2300, 2200, 2070, 1880, 1770, 1715, 1680, 1680, 1680, 1685, 1690, 1700, 1720, 1635, 1560, 1530, 1460, 1440, 1410, 1410, 1410, 1410}; + const G4double w_p_t[30] = { 480, 900, 1500, 2350, 3020, 3420, 3650, 3775, 3875, 3830, 3750, 3700, 3630, 3550, 3550, 3290, 3070, 2890, 2840, 2730, 2725, 2720, 2770, 2805, 2828, 2865, 2770, 2640, 2570, 2490}; + const G4double w_p_in[30] = { 325, 680, 990, 1500, 1850, 2150, 2250, 2300, 2350, 2330, 2280, 2230, 2200, 2120, 2130, 1900, 1780, 1670, 1635, 1600, 1602, 1605, 1610, 1615, 1630, 1660, 1620, 1550, 1530, 1460}; + + const G4double e7[35] = {0.02, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.1, 0.12, 0.14, 0.16, 0.18, 0.2, 0.22, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.9, 1, 2, 3, 5, 10, 20, 50, 100, 500, 1000}; + const G4double pb_m_t[35] = {5890, 5700, 5610, 5580, 5550, 5480, 5400, 5300, 5100, 4930, 4750, 4600, 4400, 4280, 4170, 3915, 3650, 3470, 3260, 3150, 3120, 3070, 3085, 3100, 3120, 3160, 3070, 2930, 2820, 2750, 2710, 2655, 2640, 2640, 2640}; + const G4double pb_m_in[35] = {1575, 2025, 2300, 2575, 2850, 3000, 3115, 3180, 3080, 2940, 2800, 2670, 2550, 2450, 2370, 2220, 2110, 2000, 1920, 1880, 1850, 1800, 1805, 1810, 1820, 1840, 1800, 1720, 1640, 1620, 1570, 1530, 1530, 1530, 1530}; + const G4double pb_p_t[30] = { 515, 940, 1500, 2400, 3270, 3750, 4050, 4140, 4260, 4200, 4080, 3990, 3990, 3810, 3730, 3520, 3370, 3186, 3110, 3010, 2990, 2985, 3005, 3020, 3040, 3080, 3020, 2905, 2790, 2750}; + const G4double pb_p_in[30] = { 348, 707, 1040, 1650, 2100, 2400, 2580, 2640, 2650, 2520, 2410, 2300, 2250, 2190, 2130, 2000, 1930, 1870, 1830, 1790, 1770, 1765, 1775, 1780, 1790, 1800, 1775, 1710, 1620, 1620}; + const G4double u_m_t[35] = {7080, 6830, 6650, 6530, 6400, 6280, 6100, 5840, 5660, 5520, 5330, 5160, 4990, 4810, 4630, 4323, 4130, 3870, 3700, 3550, 3490, 3465, 3467, 3475, 3495, 3515, 3440, 3360, 3150, 3040, 2985, 2955, 2940, 2940, 2940}; + const G4double u_m_in[35] = {1740, 2220, 2500, 2820, 3080, 3300, 3420, 3500, 3420, 3330, 3200, 3060, 2940, 2850, 2710, 2470, 2380, 2250, 2160, 2080, 2040, 2045, 2047, 2050, 2055, 2060, 2010, 1980, 1830, 1780, 1735, 1710, 1700, 1700, 1700}; + const G4double u_p_t[30] = { 485, 960, 1580, 2700, 3550, 4050, 4320, 4420, 4620, 4660, 4580, 4470, 4350, 4295, 4187, 3938, 3755, 3573, 3450, 3342, 3310, 3295, 3310, 3330, 3375, 3405, 3350, 3338, 3135, 3040}; + const G4double u_p_in[30] = { 334, 720, 1020, 1560, 2100, 2300, 2550, 2700, 2880, 2880, 2760, 2660, 2550, 2510, 2430, 2270, 2130, 2060, 2000, 1970, 1950, 1950, 1960, 1960, 1970, 1980, 1950, 1978, 1830, 1780}; + + AddDataSet("pi-",he_t, he_in, e1, 38); + AddDataSet("pi+",he_t, he_in, e1, 38); + AddDataSet("pi-",be_m_t, be_m_in, e1, 38); + AddDataSet("pi+",be_p_t, be_p_in, e1, 24); + AddDataSet("pi-",c_m_t, c_m_in, e2, 39); + AddDataSet("pi+",c_p_t, c_p_in, e2, 24); + AddDataSet("pi-",n_m_t, n_m_in, e2, 39); + AddDataSet("pi+",n_p_t, n_p_in, e2, 27); + AddDataSet("pi-",o_m_t, o_m_in, e3, 31); + AddDataSet("pi+",o_p_t, o_p_in, e3, 20); + AddDataSet("pi-",na_m_t, na_m_in, e3, 31); + AddDataSet("pi+",na_p_t, na_p_in, e3, 22); + AddDataSet("pi-",al_m_t, al_m_in, e3_1, 31); + AddDataSet("pi+",al_p_t, al_p_in, e3_1, 21); + AddDataSet("pi-",ca_m_t, ca_m_in, e3_1, 31); + AddDataSet("pi+",ca_p_t, ca_p_in, e3_1, 23); + AddDataSet("pi-",fe_m_t, fe_m_in, e4, 32); + AddDataSet("pi+",fe_p_t, fe_p_in, e4, 25); + AddDataSet("pi-",cu_m_t, cu_m_in, e4, 32); + AddDataSet("pi+",cu_p_t, cu_p_in, e4, 25); + AddDataSet("pi-",mo_m_t, mo_m_in, e5, 34); + AddDataSet("pi+",mo_p_t, mo_p_in, e5, 27); + AddDataSet("pi-",cd_m_t, cd_m_in, e5, 34); + AddDataSet("pi+",cd_p_t, cd_p_in, e5, 28); + AddDataSet("pi-",sn_m_t, sn_m_in, e6, 35); + AddDataSet("pi+",sn_p_t, sn_p_in, e6, 29); + AddDataSet("pi-",w_m_t, w_m_in, e6, 35); + AddDataSet("pi+",w_p_t, w_p_in, e6, 30); + AddDataSet("pi-",pb_m_t, pb_m_in, e7, 35); + AddDataSet("pi+",pb_p_t, pb_p_in, e7, 30); + AddDataSet("pi-",u_m_t, u_m_in, e7, 35); + AddDataSet("pi+",u_p_t, u_p_in, e7, 30); +} + + diff --git a/source/processes/hadronic/management/History b/source/processes/hadronic/management/History index 2dedf46a08..9c733527b9 100644 --- a/source/processes/hadronic/management/History +++ b/source/processes/hadronic/management/History @@ -14,6 +14,11 @@ code and to keep track of all tags. * Please list in reverse chronological order (last date on top) --------------------------------------------------------------- +20 Oct 2006 Dennis Wright (hadr-man-V08-01-00) +---------------------------------------------- +- G4HadronicProcess.hh, .cc: + remove unused method GetDistanceToBoundary() + 13 Mar 2006 Dennis Wright (hadr-man-V08-00-03) ---------------------------------------------- - G4HadronicProcess::ChooseAandZ() : throw fatal exception if diff --git a/source/processes/hadronic/management/include/G4EnergyRangeManager.hh b/source/processes/hadronic/management/include/G4EnergyRangeManager.hh index c769d74670..1b88556018 100644 --- a/source/processes/hadronic/management/include/G4EnergyRangeManager.hh +++ b/source/processes/hadronic/management/include/G4EnergyRangeManager.hh @@ -25,7 +25,7 @@ // // // $Id: G4EnergyRangeManager.hh,v 1.9 2006/06/29 19:58:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Energy Range Manager // original by H.P. Wellisch diff --git a/source/processes/hadronic/management/include/G4HadLeadBias.hh b/source/processes/hadronic/management/include/G4HadLeadBias.hh index e84a99c79e..5a5b5e32f2 100644 --- a/source/processes/hadronic/management/include/G4HadLeadBias.hh +++ b/source/processes/hadronic/management/include/G4HadLeadBias.hh @@ -23,7 +23,7 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- #ifndef G4HadLeadBias_h diff --git a/source/processes/hadronic/management/include/G4HadronicProcess.hh b/source/processes/hadronic/management/include/G4HadronicProcess.hh index 9d9401a13b..6e4de4446f 100644 --- a/source/processes/hadronic/management/include/G4HadronicProcess.hh +++ b/source/processes/hadronic/management/include/G4HadronicProcess.hh @@ -201,7 +201,6 @@ class G4ParticleChange; -G4VProcess::theNumberOfInteractionLengthLeft; } - G4double GetDistanceToBoundary(const G4Track & aT); void FillTotalResult(G4HadFinalState * aR, const G4Track & aT); diff --git a/source/processes/hadronic/management/include/G4VLeadingParticleBiasing.hh b/source/processes/hadronic/management/include/G4VLeadingParticleBiasing.hh index 288a3688b4..64468840b9 100644 --- a/source/processes/hadronic/management/include/G4VLeadingParticleBiasing.hh +++ b/source/processes/hadronic/management/include/G4VLeadingParticleBiasing.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4VLeadingParticleBiasing.hh,v 1.6 2006/06/29 19:58:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------------- #ifndef G4VLeadingParticleBiasing_h diff --git a/source/processes/hadronic/management/src/G4EnergyRangeManager.cc b/source/processes/hadronic/management/src/G4EnergyRangeManager.cc index 4d9d43df28..a9b28deb24 100644 --- a/source/processes/hadronic/management/src/G4EnergyRangeManager.cc +++ b/source/processes/hadronic/management/src/G4EnergyRangeManager.cc @@ -25,7 +25,7 @@ // // // $Id: G4EnergyRangeManager.cc,v 1.15 2006/06/29 19:58:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Energy Range Manager // original by H.P. Wellisch diff --git a/source/processes/hadronic/management/src/G4HadronicProcess.cc b/source/processes/hadronic/management/src/G4HadronicProcess.cc index 1e6c8e39aa..94f65218f4 100644 --- a/source/processes/hadronic/management/src/G4HadronicProcess.cc +++ b/source/processes/hadronic/management/src/G4HadronicProcess.cc @@ -184,18 +184,6 @@ GetMeanFreePath(const G4Track &aTrack, G4double, G4ForceCondition *) return DBL_MAX; } -G4double G4HadronicProcess::GetDistanceToBoundary(const G4Track & aT) -{ - G4TransportationManager * aTM = - G4TransportationManager::GetTransportationManager(); - G4Navigator * aN = aTM->GetNavigatorForTracking(); - G4ThreeVector pGlobalPoint = aT.GetStep()->GetPreStepPoint()->GetPosition(); - G4ThreeVector pDirection = aT.GetMomentumDirection(); - G4double dummy(0); - G4double result = aN->ComputeStep(pGlobalPoint, pDirection, DBL_MAX, dummy); - aN->LocateGlobalPointAndSetup(pGlobalPoint); - return result; -} G4Element * G4HadronicProcess::ChooseAandZ( const G4DynamicParticle *aParticle, const G4Material *aMaterial ) diff --git a/source/processes/hadronic/models/binary_cascade/include/G4BinaryCascade.hh b/source/processes/hadronic/models/binary_cascade/include/G4BinaryCascade.hh index 4b14b5996e..430d8b4e33 100644 --- a/source/processes/hadronic/models/binary_cascade/include/G4BinaryCascade.hh +++ b/source/processes/hadronic/models/binary_cascade/include/G4BinaryCascade.hh @@ -137,6 +137,7 @@ private: G4BCDecay * theDecay; G4VFieldPropagation * thePropagator; G4double theCurrentTime; + G4double theBCminP; G4double theCutOnP; G4double theCutOnPAbsorb; G4LorentzVector theInitial4Mom; diff --git a/source/processes/hadronic/models/binary_cascade/src/G4BinaryCascade.cc b/source/processes/hadronic/models/binary_cascade/src/G4BinaryCascade.cc index 011436be1a..09343f5d13 100644 --- a/source/processes/hadronic/models/binary_cascade/src/G4BinaryCascade.cc +++ b/source/processes/hadronic/models/binary_cascade/src/G4BinaryCascade.cc @@ -97,7 +97,8 @@ G4BinaryCascade::G4BinaryCascade() : G4VIntraNuclearTransportModel() theImR.push_back(new G4MesonAbsorption); thePropagator = new G4RKPropagation; theCurrentTime = 0.; - theCutOnP = 90*MeV; + theBCminP = 45*MeV; + theCutOnP = 90*MeV; theCutOnPAbsorb= 0*MeV; // G4ExcitationHandler * theExcitationHandler = new G4ExcitationHandler; @@ -145,7 +146,7 @@ G4HadFinalState * G4BinaryCascade::ApplyYourself(const G4HadProjectile & aTrack, eventcounter++; if(getenv("BCDEBUG") ) G4cerr << " ######### Binary Cascade Reaction number starts ######### "<ApplyYourself(aTrack, aNucleus); } @@ -314,7 +315,7 @@ G4ReactionProductVector * G4BinaryCascade::Propagate( thePropagator->Init(the3DNucleus); // if called stand alone, build theTargetList and find first collisions - + theCutOnP=90*MeV; if(nucleus->GetMass()>30) theCutOnP = 70*MeV; if(nucleus->GetMass()>60) theCutOnP = 50*MeV; if(nucleus->GetMass()>120) theCutOnP = 45*MeV; @@ -969,6 +970,8 @@ G4bool G4BinaryCascade::ApplyCollision(G4CollisionInitialState * collision) G4double newEnergy2= newEnergy*newEnergy; if ( newEnergy2 < mass2 ) { + ClearAndDestroy(products); + if (target_collection.size() == 0 ) FindDecayCollision(primary); // for decay, sample new decay delete products; return false; } diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/GNUmakefile b/source/processes/hadronic/models/chiral_inv_phase_space/body/GNUmakefile index f9d504134b..d09d705d70 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/GNUmakefile +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/GNUmakefile @@ -24,6 +24,7 @@ CPPFLAGS += -I$(G4BASE)/global/management/include \ -I$(G4BASE)/particles/management/include \ -I$(G4BASE)/particles/leptons/include \ -I$(G4BASE)/particles/bosons/include \ + -I$(G4BASE)/particles/shortlived/include \ -I$(G4BASE)/particles/hadrons/mesons/include \ -I$(G4BASE)/particles/hadrons/barions/include \ -I$(G4BASE)/particles/hadrons/ions/include \ diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4Chips.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4Chips.hh index 8609838c20..2bfb372e2c 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4Chips.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4Chips.hh @@ -25,7 +25,7 @@ // // // $Id: G4Chips.hh,v 1.19 2006/06/29 20:05:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4Chips ---------------- // by Mikhail Kossov, September 1999. diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QBesIKJY.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QBesIKJY.hh index 3d4421e2d4..3739946ad5 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QBesIKJY.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QBesIKJY.hh @@ -25,7 +25,7 @@ // // // $Id: G4QBesIKJY.hh,v 1.2 2006/06/29 20:05:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QBesIKJY ---------------- // by Mikhail Kossov, Sept 2000. diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QCHIPSWorld.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QCHIPSWorld.hh index ad34670557..bfbdf88584 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QCHIPSWorld.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QCHIPSWorld.hh @@ -25,7 +25,7 @@ // // // $Id: G4QCHIPSWorld.hh,v 1.25 2006/06/29 20:05:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QCHIPSWorld ---------------- // by Mikhail Kossov, Sept 1999. diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QCandidate.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QCandidate.hh index cb8f862b52..c3034ac349 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QCandidate.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QCandidate.hh @@ -25,7 +25,7 @@ // // // $Id: G4QCandidate.hh,v 1.28 2006/06/29 20:05:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QCandidate ---------------- // by Mikhail Kossov, Sept 1999. diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QCandidateVector.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QCandidateVector.hh index 0f969043b2..de3b37e9de 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QCandidateVector.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QCandidateVector.hh @@ -25,7 +25,7 @@ // // // $Id: G4QCandidateVector.hh,v 1.21 2006/06/29 20:06:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QCandidateVector ---------------- // by Mikhail Kossov, Sept 1999. diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QChipolino.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QChipolino.hh index 3066a1b6c6..dffe9f2cf4 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QChipolino.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QChipolino.hh @@ -25,7 +25,7 @@ // // // $Id: G4QChipolino.hh,v 1.23 2006/06/29 20:06:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QChipolino ---------------- // by Mikhail Kossov, Sept 1999. diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QContent.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QContent.hh index c7e6de08e2..00d8116f42 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QContent.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QContent.hh @@ -25,7 +25,7 @@ // // // $Id: G4QContent.hh,v 1.28 2006/06/29 20:06:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QContent ---------------- // by Mikhail Kossov, Sept 1999. diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QDecayChan.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QDecayChan.hh index 19c4c1395b..3dbd2766e7 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QDecayChan.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QDecayChan.hh @@ -25,7 +25,7 @@ // // // $Id: G4QDecayChan.hh,v 1.23 2006/06/29 20:06:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QDecayChan ---------------- // by Mikhail Kossov, Sept 1999. diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QDecayChanVector.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QDecayChanVector.hh index 2ac994142e..064917bce3 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QDecayChanVector.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QDecayChanVector.hh @@ -25,7 +25,7 @@ // // // $Id: G4QDecayChanVector.hh,v 1.19 2006/06/29 20:06:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QCandidateVector ---------------- // by Mikhail Kossov, Sept 1999. diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QEnvironment.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QEnvironment.hh index 4dda940792..14fb19b5ed 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QEnvironment.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QEnvironment.hh @@ -25,7 +25,7 @@ // // // $Id: G4QEnvironment.hh,v 1.27 2006/06/29 20:06:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QEnvironment ---------------- // by Mikhail Kossov, August 2000. diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QException.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QException.hh index a5b57be9c3..9969b86aa2 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QException.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QException.hh @@ -25,7 +25,7 @@ // // // $Id: G4QException.hh,v 1.10 2006/06/29 20:06:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QException ---------------- // by Mikhail Kossov, November 2003. diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QFragmentation.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QFragmentation.hh new file mode 100644 index 0000000000..14b67fce42 --- /dev/null +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QFragmentation.hh @@ -0,0 +1,137 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4QFragmentation.hh,v 1.2 2006/12/12 11:02:22 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ----------------------------------------------------------------------------- +// GEANT 4 class header file +// +// History: +// Created by Mikhail Kossov, October 2006 +// CHIPS QGS fragmentation class +// For comparison mirror member functions are taken from G4 classes: +// G4QGSParticipants +// G4QGSModels +// G4ExcitedStringDecay +// ----------------------------------------------------------------------------- +// +#ifndef G4QFragmentation_h +#define G4QFragmentation_h 1 + +#include "globals.hh" +#include "G4QNucleus.hh" +#include "Randomize.hh" +#include "G4QHadronVector.hh" +#include "G4ShortLivedConstructor.hh" +#include "G4QInteractionVector.hh" +#include "G4QPomeron.hh" +#include "G4QPartonPairVector.hh" +#include "G4QStringVector.hh" + +class G4QFragmentation +{ + public: + G4QFragmentation(); + G4QFragmentation(const G4QFragmentation &right); + const G4QFragmentation& operator=(const G4QFragmentation &right); + virtual ~G4QFragmentation(); + + int operator==(const G4QFragmentation &right) const; + int operator!=(const G4QFragmentation &right) const; + + G4QHadronVector* Scatter(const G4QNucleus& theNucleus, const G4QHadron& thePrimary); + + void InitModel(const G4QNucleus& Nucleus, const G4QHadron& Projectile); + + void Init(G4double theZ, G4double theA) + { + if(!theNucleus) theNucleus = new G4QNucleus(G4int(theZ),G4int(theA-theZ+.0001)); + theNucleus->InitByPDG(90000000+G4int(theZ)*1000+G4int(theA-theZ+.0001)); + } + + void SetNucleus(G4QNucleus* aNucleus) {theNucleus=aNucleus;} + G4QNucleus* GetWoundedNucleus() const {return theNucleus;} + G4bool ExciteDiffParticipants(G4QHadron* aPartner, G4QHadron* bPartner) const; + G4bool ExciteSingDiffParticipants(G4QHadron* aPartner, G4QHadron* bPartner) const; + + G4QString* BuildString(G4QPartonPair* aPair) + {return new G4QString(aPair->GetParton1(),aPair->GetParton2(), aPair->GetDirection());} + + G4QStringVector* GetStrings(); + G4QHadronVector* FragmentStrings(const G4QStringVector* theStrings); + void DoLorentzBoost(G4ThreeVector aBoost) + { + if(theNucleus) theNucleus->DoLorentzBoost(aBoost); + theBoost = aBoost; + } + + G4QPartonPair* GetNextPartonPair(); + void BuildInteractions(const G4QHadron& thePrimary); + void StartPartonPairLoop() {;} // @@ (? M.K.) Function which is doing nothing + + // Static functions + static void SetParameters(G4int nCM, G4double thresh, G4double QGSMth, G4double radNuc, + G4double SigPt, G4double extraM, G4double minM); + protected: + G4QHadron* SelectInteractions(const G4QHadron &thePrimary); + void SplitHadrons() + {for(unsigned i=0; iSplitHadrons();} + void PerformSoftCollisions(); + void PerformDiffractiveCollisions(); + G4bool IsSingleDiffractive() + {G4bool result=false; if(G4UniformRand()<1.) result=true; return result;} + G4bool EnergyAndMomentumCorrector(G4QHadronVector* Output, G4LorentzVector& TotaMom); + G4double ChooseX(G4double Xmin, G4double Xmax) const; + G4ThreeVector GaussianPt(G4double widthSquare, G4double maxPtSquare) const; + + private: + // static model parameters + static G4int nCutMax; + static G4double ThersholdParameter; + static G4double QGSMThershold; + static G4double theNucleonRadius; + // Parameters of diffractional fragmentation + static G4double widthOfPtSquare; // width^2 of pt for string excitation + static G4double minExtraMass; // minimum excitation mass + static G4double minmass; // mean pion transverse mass; used for Xmin + + // Body + G4QInteractionVector theInteractions; + G4QHadronVector theTargets; + G4QPartonPairVector thePartonPairs; + + G4int ModelMode; + G4ThreeVector theBoost; // init as zero 3-vector (@@ M.K.) + G4QNucleus* theNucleus; // init as zero (0) + G4ThreeVector theCurrentVelocity; // init as zero 3-vector (@@ M.K.) + + enum {SOFT, DIFFRACTIVE}; +}; + +#endif + + diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QHadron.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QHadron.hh index 5381284ee8..10440bfbca 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QHadron.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QHadron.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4QHadron.hh,v 1.31 2006/06/29 20:06:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4QHadron.hh,v 1.34 2006/11/20 16:29:11 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QHadron ---------------- // by Mikhail Kossov, Sept 1999. @@ -40,6 +40,8 @@ #include "G4LorentzVector.hh" #include "Randomize.hh" #include "G4QParticle.hh" +#include "G4QPartonVector.hh" +#include class G4QHadron { @@ -57,6 +59,7 @@ public: G4QHadron(G4QParticle* pPart, G4double maxM); // Constructor for Res with RANDOM mass G4QHadron(const G4QHadron& right); // Copy constructor by object G4QHadron(const G4QHadron* right); // Copy constructor by pointer + G4QHadron(const G4QHadron* right, G4int ColC, G4ThreeVector Pos, G4LorentzVector Mom); virtual ~G4QHadron(); // Destructor // Operators const G4QHadron& operator=(const G4QHadron& right); @@ -66,6 +69,7 @@ public: G4int GetPDGCode() const; // Get PDG code of the Hadron G4int GetQCode() const; // Get Q code of the Hadron G4QPDGCode GetQPDG() const; // Get QPDG of the Hadron + G4double GetSpin() const{return .5*(GetPDGCode()%10-1);} G4LorentzVector Get4Momentum() const; // Get 4-mom of the Hadron G4QContent GetQC() const; // Get private quark content G4double GetMass() const; // Get a mass of the Hadron @@ -75,13 +79,31 @@ public: G4int GetCharge() const; // Get Charge of the Hadron G4int GetStrangeness() const; // Get Strangeness of the Hadron G4int GetBaryonNumber() const; // Get Baryon Number of the Hadron + const G4ThreeVector& GetPosition() const; // Get hadron coordinates + G4int GetSoftCollisionCount(); // Get QGS Counter of collisions + G4bool IsSplit() {return isSplit;} // Check that hadron has been split + G4double GetBindingEnergy() {return bindE;}// Returns binding E in NucMatter + G4double GetFormationTime() {return formTime;} // Returns formation time + // Modifiers void SetQPDG(const G4QPDGCode& QPDG); // Set QPDG of the Hadron void Set4Momentum(const G4LorentzVector& aMom); // Set 4-mom of the Hadron void SetQC(const G4QContent& newQC); // Set new private quark content void SetNFragments(const G4int& nf); // Set a#of Fragments of this Hadron - void NegPDGCode(); + void NegPDGCode(); // Change a sign of the PDG code void MakeAntiHadron(); // Make AntiHadron of this Hadron + void SetPosition(const G4ThreeVector& aPosition); // Set coordinates of hadron position + void IncrementCollisionCount(G4int aCount); // Increnment counter of collisions + void SetCollisionCount(G4int aCount); // Set counter of QGSM collisions + void Splitting() {isSplit = true;} // Put Up a flag that splitting is done + void SplitUp(); // Make QGSM String Splitting of Hadron + G4QParton* GetNextParton(); // Next Parton in a string + G4QParton* GetNextAntiParton(); // Next Anti-Parton in a string + void SetBindingEnergy(G4double aBindE){bindE=aBindE;}// Set Binding E in Nuclear Matter + void Boost(const G4LorentzVector& theBoost); // Boosts hadron's 4-Momentum using 4M + void Boost(const G4ThreeVector& B){theMomentum.boost(B);} // Boosts 4-Momentum using v/c + void SetFormationTime(G4double fT){formTime=fT;} // Defines formationTime for the Hadron + // General G4double RandomizeMass(G4QParticle* pPart, G4double maxM); // Randomize a mass value G4bool TestRealNeutral(); @@ -91,18 +113,45 @@ public: G4bool RelDecayIn2(G4LorentzVector& f4Mom, G4LorentzVector& s4Mom, G4LorentzVector& dir, G4double maxCost = 1., G4double minCost = -1.); G4bool DecayIn3(G4LorentzVector& f4Mom, G4LorentzVector& s4Mom, G4LorentzVector& t4Mom); + void Init3D(); // Initializes 3D nucleus with (Pos,4M)nucleons private: // Private methods void DefineQC(G4int PDGCode); + G4QParton* BuildSeaQuark(G4bool isAntiQuark, G4int aPDGCode); + G4double SampleX(G4double anXmin, G4int nSea, G4int theTotalSea, G4double aBeta); + void GetValenceQuarkFlavors(G4QParton* &Part1,G4QParton* &Part2); + G4ThreeVector GaussianPt(G4double widthSquare, G4double maxPtSquare); + G4bool SplitMeson(G4int PDGcode, G4int* aEnd, G4int* bEnd); + G4bool SplitBaryon(G4int PDGcode, G4int* aEnd, G4int* bEnd); -private: - G4QPDGCode theQPDG; // Instance of QPDG for the Hadron - G4LorentzVector theMomentum; // The 4-mom of Hadron - G4QContent valQ; // QC (@@ for Quasmon and Chipolino?) - G4int nFragm; // 0 - stable, N - decayed in N part's +private: + // Static Parameters of QGSM Splitting + static G4double alpha; // changing rapidity distribution for all + static G4double beta; // changing rapidity distribution for projectile region + static G4double theMinPz; // Can be from 14 to 140 MeV + static G4double StrangeSuppress; // ? M.K. + static G4double sigmaPt; // Can be 0 + static G4double widthOfPtSquare; // ? M.K. + static G4double minTransverseMass;// ? M.K. + // Body + G4QPDGCode theQPDG; // Instance of QPDG for the Hadron + G4LorentzVector theMomentum; // The 4-mom of Hadron + G4QContent valQ; // QC (@@ for Quasmon and Chipolino?) + G4int nFragm; // 0 - stable, N - decayed in N part's + // Body of Splitable Hadron and Nuclear Nucleon + G4ThreeVector thePosition; // Coordinates of Hadron position + G4int theCollisionCount; // ? + G4bool isSplit; // Flag, that splitting was done + G4bool Direction; // FALSE=target, TRUE=projectile + std::deque Color; // container for quarks & anti-diquarks + std::deque AntiColor; // container for anti-quarks & diquarks + G4double bindE; // Binding energy in nuclear matter + G4double formTime; // Formation time for the hadron }; +typedef std::pair G4QHadronPair; + inline G4bool G4QHadron::operator==(const G4QHadron &rhs) const {return this==&rhs;} inline G4bool G4QHadron::operator!=(const G4QHadron &rhs) const {return this!=&rhs;} @@ -119,84 +168,34 @@ inline G4double G4QHadron::GetMass2() const {return theMomentum.m inline G4int G4QHadron::GetCharge() const {return valQ.GetCharge();} inline G4int G4QHadron::GetStrangeness() const {return valQ.GetStrangeness();} inline G4int G4QHadron::GetBaryonNumber() const {return valQ.GetBaryonNumber();} +inline const G4ThreeVector& G4QHadron::GetPosition() const {return thePosition;} +inline G4int G4QHadron::GetSoftCollisionCount() {return theCollisionCount;} inline void G4QHadron::MakeAntiHadron() {if(TestRealNeutral()) NegPDGCode();} -inline void G4QHadron::SetQPDG(const G4QPDGCode& newQPDG) -{ - theQPDG = newQPDG; - G4int PDG= newQPDG.GetPDGCode(); - G4int Q = newQPDG.GetQCode(); - //G4cout<<"G4QHadron::SetQPDG is called with PDGCode="< +#include "G4QHadron.hh" +#include "G4QParton.hh" + +class G4QHadronBuilder +{ +public: + G4QHadronBuilder(); + G4QHadron* Build(G4QParton* black, G4QParton* white); + G4QHadron* BuildLowSpin(G4QParton* black, G4QParton* white); + G4QHadron* BuildHighSpin(G4QParton* black, G4QParton* white); +private: + enum Spin {SpinZero=1, SpinHalf=2, SpinOne=3, SpinThreeHalf=4}; + G4QHadron* Meson(G4QParton* black, G4QParton* white, Spin spin); + G4QHadron* Baryon(G4QParton* black,G4QParton* white, Spin spin); + // Body + G4double mesonSpinMix; + G4double baryonSpinMix; + std::vector scalarMesonMixings; + std::vector vectorMesonMixings; +}; + +// G4QHcreate type is an interface to Build/BuildLowSpin/BuildHighSpin member functions +typedef G4QHadron* (G4QHadronBuilder::*G4QHcreate) (G4QParton*,G4QParton*); +#endif diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QHadronVector.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QHadronVector.hh index d9ed29c2f1..42785c6cc0 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QHadronVector.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QHadronVector.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4QHadronVector.hh,v 1.20 2006/06/29 20:06:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4QHadronVector.hh,v 1.22 2006/11/16 11:36:09 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QCandidateVector ---------------- // by Mikhail Kossov, Sept 1999. @@ -34,6 +34,17 @@ #ifndef G4QHadronVector_h #define G4QHadronVector_h 1 +// +// $Id: G4QHadronVector.hh,v 1.22 2006/11/16 11:36:09 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ------------------------------------------------------------ +// GEANT 4 class implementation file +// +// ---------------- G4QParton ---------------- +// by Mikhail Kossov, Oct 1999. +// class for QHadronVector (string) used by CHIPS Models +// ------------------------------------------------------------ #include "G4QHadron.hh" #include diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QInteraction.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QInteraction.hh new file mode 100644 index 0000000000..6a7f34a3a6 --- /dev/null +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QInteraction.hh @@ -0,0 +1,81 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4QInteraction.hh,v 1.2 2006/12/12 11:02:22 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// + +#ifndef G4QInteraction_h +#define G4QInteraction_h 1 + +// ------------------------------------------------------------------- +// GEANT 4 class header file +// +// ---------------- G4QInteraction---------------- +// Created by Mikhail Kossov Oct,2006 +// class for a storing colliding particles in PartonString Models +// For comparison mirror member functions are taken from G4 class: +// G4InteractionContent +// ------------------------------------------------------------------- + +#include "globals.hh" +#include "G4QHadron.hh" + +class G4QInteraction +{ +public: + G4QInteraction(G4QHadron* aPrimaryParticipant); + ~G4QInteraction(); + int operator==(const G4QInteraction &right) const {return this==&right;} + int operator!=(const G4QInteraction &right) const {return this!=&right;} + G4QHadron* GetProjectile() const {return theProjectile;} + G4QHadron* GetTarget() const {return theTarget;} + G4int GetNumberOfSoftCollisions() {return theNumberOfSoft;} + G4int GetNumberOfHardCollisions() {return theNumberOfHard;} + G4int GetNumberOfDiffractiveCollisions() {return theNumberOfDiffractive;} + void SetTarget(G4QHadron *aTarget) {theTarget = aTarget;} + void SetProjectile(G4QHadron *aProjectile) {theProjectile = aProjectile;} + void SetNumberOfSoftCollisions(G4int nofSoft) {theNumberOfSoft = nofSoft;} + void SetNumberOfHardCollisions(G4int nofHard) {theNumberOfHard = nofHard;} + void SetNumberOfDiffractiveCollisions(G4int nofDiff) {theNumberOfDiffractive = nofDiff;} + void SplitHadrons() + {if(theProjectile)theProjectile->SplitUp(); if(theTarget)theTarget->SplitUp();} +public: + G4QInteraction(){} + G4QInteraction(const G4QInteraction &right); + const G4QInteraction & operator=(const G4QInteraction &right); +private: + // Body + G4QHadron* theProjectile; + G4QHadron* theTarget; + G4int theNumberOfHard; + G4int theNumberOfSoft; + G4int theNumberOfDiffractive; +}; + +#endif + + diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QInteractionVector.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QInteractionVector.hh new file mode 100644 index 0000000000..57c0f205b6 --- /dev/null +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QInteractionVector.hh @@ -0,0 +1,56 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4QInteractionVector.hh,v 1.1 2006/10/30 10:40:34 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ---------------- G4QCandidateVector ---------------- +// by Mikhail Kossov, Sept 1999. +// Type defenition for a Vector of Interactions - output of CHIPS model +// --------------------------------------------------------------- + +#ifndef G4QInteractionVector_h +#define G4QInteractionVector_h 1 + +// +// $Id: G4QInteractionVector.hh,v 1.1 2006/10/30 10:40:34 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ------------------------------------------------------------------ +// GEANT 4 class implementation file +// +// ---------------- G4QInteractionVector---------------- +// Created by Mikhail Kossov Oct, 2006 +// class for a storing colliding particles in PartonString Models +// ------------------------------------------------------------------- + +#include "G4QInteraction.hh" +#include + +typedef std::vector G4QInteractionVector; +struct DeleteQInteraction { void operator()(G4QInteraction* aQI){delete aQI;}}; + +#endif diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QIsotope.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QIsotope.hh index 64a0ef326c..512d665fc5 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QIsotope.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QIsotope.hh @@ -25,7 +25,7 @@ // // // $Id: G4QIsotope.hh,v 1.5 2006/06/29 20:06:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ---------------- G4QIsotope header ---------------- diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QNucleus.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QNucleus.hh index 5cce56f7bd..53b065acd9 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QNucleus.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QNucleus.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4QNucleus.hh,v 1.29 2006/06/29 20:06:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4QNucleus.hh,v 1.31 2006/10/27 16:47:34 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QNucleus ---------------- // by Mikhail Kossov, Sept 1999. @@ -36,6 +36,10 @@ #define G4QNucleus_h 1 #include "G4QCandidateVector.hh" +#include "G4QHadronVector.hh" +#include +#include +#include "globals.hh" class G4QNucleus : public G4QHadron { @@ -45,32 +49,51 @@ public: G4QNucleus(G4LorentzVector p, G4int nucPDG); // Full PDG-Constructor G4QNucleus(G4QContent nucQC); // At Rest QuarkCont-Constructor G4QNucleus(G4QContent nucQC, G4LorentzVector p); // Full QuarkCont-Constructor - G4QNucleus(G4int z, G4int n, G4int s); // At Rest ZNS-Constructor + G4QNucleus(G4int z, G4int n, G4int s=0); // At Rest ZNS-Constructor G4QNucleus(G4int z, G4int n, G4int s, G4LorentzVector p);// Full ZNS-Constructor G4QNucleus(const G4QNucleus& right); // Copy Constructor by value G4QNucleus(G4QNucleus* right); // Copy Constructor by pointer ~G4QNucleus(); // Public Destructor // Overloaded Operators const G4QNucleus& operator=(const G4QNucleus& right); - G4bool operator==(const G4QNucleus &right) const; - G4bool operator!=(const G4QNucleus &right) const; + G4bool operator==(const G4QNucleus &right) const {return this==&right;} + G4bool operator!=(const G4QNucleus &right) const {return this!=&right;} // Specific Selectors - G4int GetPDG() const; // Get a PDG Code of the nucleus - G4int GetZ() const; // Get a#of protons - G4int GetN() const; // Get a#of neutrons - G4int GetS() const; // Get a#of lambdas - G4int GetA() const; // Get A of the nucleus - G4int GetDZ() const; // Get a#of protons in dense region - G4int GetDN() const; // Get a#of neutrons in dense region - G4int GetDS() const; // Get a#of lambdas in dense region - G4int GetDA() const; // Get A of the dense part of nucleus - G4int GetMaxClust() const; // Get Max BarNum of Clusters - G4double GetProbability(G4int bn=0) const; // probab. for the cluster with BarN - G4double GetMZNS() const; // Get GS mass of Nucleus(not H || Q) - G4double GetGSMass() const; // Get GS mass of Nucleus(not Hadron) - G4QContent GetQCZNS() const; // Get ZNS quark content of Nucleus - G4int GetNDefMesonC(); // max#of predefined meson candidates - G4int GetNDefBaryonC(); // max#of predefined baryon candidates + G4int GetPDG() const {return 90000000+1000*(1000*S+Z)+N;}// PDG Code of Nucleus + G4int GetZ() const {return Z;} // Get a#of protons + G4int GetN() const {return N;} // Get a#of neutrons + G4int GetS() const {return S;} // Get a#of lambdas + G4int GetA() const {return Z+N+S;} // Get A of the nucleus + G4int GetDZ() const {return dZ;} // Get a#of protons in dense region + G4int GetDN() const {return dN;} // Get a#of neutrons in dense region + G4int GetDS() const {return dS;} // Get a#of lambdas in dense region + G4int GetDA() const {return dZ+dN+dS;} // Get A of the dense part of nucleus + G4int GetMaxClust() const {return maxClust;} // Get Max BarNum of Clusters + G4double GetProbability(G4int bn=0) const {return probVect[bn];} // clust(BarN)probabil + G4double GetMZNS() const {return GetQPDG().GetNuclMass(Z,N,S);} // not H or Q + G4double GetGSMass() const {return GetQPDG().GetMass();}//Nucleus GSMass (not Hadron) + G4QContent GetQCZNS() const // Get ZNS quark content of Nucleus + { + if(S>=0) return G4QContent(Z+N+N+S,Z+Z+N+S,S,0,0,0); + else return G4QContent(Z+N+N+S,Z+Z+N+S,0,0,0,-S); + } + G4int GetNDefMesonC() const{return nDefMesonC;}; // max#of predefed mesonCandidates + G4int GetNDefBaryonC()const{return nDefBaryonC;};// max#of predefed baryonCandidates + std::pair RefetchImpactXandY() const {return theImpactParameter;} + G4double GetDensity(const G4ThreeVector&aPos) {return rho0*GetRelativeDensity(aPos);} + G4double GetRelativeDensity(const G4ThreeVector& aPosition); // Densyty/rho0 + G4double GetRadius(const G4double maxRelativeDenisty=0.5); // Radius of %ofDensity + G4double GetOuterRadius(); // Get radius of the most far nucleon + G4double GetDeriv(const G4ThreeVector& point); // Derivitive of density + G4double GetFermiMomentum(G4double density); // Returns modul of FermyMomentum(dens) + G4ThreeVector Get3DFermiMomentum(G4double density, G4double maxMom=-1.) + { + if(maxMom<0) maxMom=GetFermiMomentum(density); + return maxMom*RandomUnitSphere(); + } + G4QHadron* GetNextNucleon() + {return (currentNucleon>=0&¤tNucleon* GetBThickness() const {return Tb;} // T(b) function, step .1 fm // Specific Modifiers G4bool EvaporateBaryon(G4QHadron* h1,G4QHadron* h2); // Evaporate Baryon from Nucleus @@ -78,14 +101,16 @@ public: G4int HadrToNucPDG(G4int hPDG); // Converts hadronic PDGCode to nuclear G4int NucToHadrPDG(G4int nPDG); // Converts nuclear PDGCode to hadronic G4bool Split2Baryons(); // Is it possible to split two baryons? + void ActivateBThickness(); // Calculate T(b) for nucleus (db=.1fm) void InitByPDG(G4int newPDG); // Init existing nucleus by new PDG - void InitByQC(G4QContent newQC); // Init existing nucleus by new QCont + void InitByQC(G4QContent newQC) // Init existing nucleus by new QCont + {G4int PDG=G4QPDGCode(newQC).GetPDGCode(); InitByPDG(PDG);} void IncProbability(G4int bn); // Add one cluster to probability void Increase(G4int PDG, G4LorentzVector LV = G4LorentzVector(0.,0.,0.,0.)); void Increase(G4QContent QC, G4LorentzVector LV = G4LorentzVector(0.,0.,0.,0.)); void Reduce(G4int PDG); // Reduce Nucleus by PDG fragment - void CalculateMass(); // Recalculate (calculate) the mass - void SetMaxClust(G4int maxC); // Set Max BarNum of Clusters + void CalculateMass() {Set4Momentum(G4LorentzVector(0.,0.,0.,GetGSMass()));} + void SetMaxClust(G4int maxC){maxClust=maxC;}// Set Max BarNum of Clusters void InitCandidateVector(G4QCandidateVector& theQCandidates, G4int nM=45, G4int nB=72, G4int nC=117); void PrepareCandidates(G4QCandidateVector& theQCandidates, G4bool piF=false, G4bool @@ -94,21 +119,39 @@ public: G4QNucleus operator+=(const G4QNucleus& rhs); // Add a cluster to the nucleus G4QNucleus operator-=(const G4QNucleus& rhs); // Subtract a cluster from a nucleus G4QNucleus operator*=(const G4int& rhs); // Multiplication of the Nucleus + G4bool StartLoop(); // returns size of theNucleons (cN=0) + G4bool ReduceSum(G4ThreeVector* momentum, G4double*); // Reduce momentum nonconservation + void DoLorentzBoost(const G4LorentzVector& theBoost); // Boost nucleons by 4-vector + void DoLorentzBoost(const G4ThreeVector& theBeta);// Boost nucleons by v/c + void DoLorentzContraction(const G4LorentzVector&B){DoLorentzContraction(B.vect()/B.e());} + void DoLorentzContraction(const G4ThreeVector& theBeta); // Lorentz Contraction by v/c + void DoTranslation(const G4ThreeVector& theShift); // Used only in GHAD-TFT + // Static functions - static void SetParameters(G4double fN=0.,G4double fD=0., G4double cP=1., G4double mR=1.); + static void SetParameters(G4double fN=.1,G4double fD=.05, G4double cP=4., G4double mR=1., + G4double nD=.8*fermi); + // Specific General Functions + G4ThreeVector RandomUnitSphere(); // Randomize position inside UnitSphere G4int RandomizeBinom(G4double p,G4int N); // Randomize according to Binomial Law - G4double CoulombBarrier(const G4double& cZ, const G4double& cA, G4double dZ=0., - G4double dA=0.); - G4double BindingEnergy(const G4double& cZ, const G4double& cA, G4double dZ=0., + G4double CoulombBarrier(const G4double& cZ=1, const G4double& cA=1, G4double dZ=0., + G4double dA=0.); // CoulombBarrier in MeV + G4double FissionCoulombBarrier(const G4double& cZ, const G4double& cA, G4double dZ=0., + G4double dA=0.); // Fission CoulombBarrier in MeV + G4double BindingEnergy(const G4double& cZ=0, const G4double& cA=0, G4double dZ=0., G4double dA=0.); G4double CoulBarPenProb(const G4double& CB, const G4double& E, const G4int& C, const G4int& B); - + std::pair ChooseImpactXandY(G4double maxImpact); // Randomize bbar + void ChooseNucleons(); // Initializes 3D Nucleons + void ChoosePositions(); // Initializes positions of 3D nucleons + void ChooseFermiMomenta(); // Initializes FermyMoms of 3D nucleons + void InitDensity(); // Initializes density distribution + void Init3D(); // automatically starts the LOOP private: // Specific Encapsulated Functions - void SetZNSQC(G4int z, G4int n, G4int s); // Set QC, using Z,N,S - G4QNucleus GetThis() const; // @@ Check for memory leak + void SetZNSQC(G4int z, G4int n, G4int s); // Set QC, using Z,N,S + G4QNucleus GetThis() const {return G4QNucleus(Z,N,S);} // @@ Check for memory leak // Body private: @@ -116,167 +159,32 @@ private: static const G4int nDefMesonC =45; static const G4int nDefBaryonC=72; // - static G4double freeNuc; // probability of the quasi-free baryon on surface - static G4double freeDib; // probability of the quasi-free dibaryon on surface - static G4double clustProb; // clusterization probability in dense region - static G4double mediRatio; // relative vacuum hadronization probability + static G4double freeNuc; // probability of the quasi-free baryon on surface + static G4double freeDib; // probability of the quasi-free dibaryon on surface + static G4double clustProb; // clusterization probability in dense region + static G4double mediRatio; // relative vacuum hadronization probability + static G4double nucleonDistance;// Distance between nucleons (0.8 fm) // The basic - G4int Z; // Z of the Nucleus - G4int N; // N of the Nucleus - G4int S; // S of the Nucleus + G4int Z; // Z of the Nucleus + G4int N; // N of the Nucleus + G4int S; // S of the Nucleus // The secondaries - G4int dZ; // Z of the dense region of the nucleus - G4int dN; // N of the dense region of the nucleus - G4int dS; // S of the dense region of the nucleus - G4int maxClust; // Baryon Number of the last calculated cluster - G4double probVect[256]; // Cluster probability ("a#of issues" can be real) Vector + G4int dZ; // Z of the dense region of the nucleus + G4int dN; // N of the dense region of the nucleus + G4int dS; // S of the dense region of the nucleus + G4int maxClust; // Baryon Number of the last calculated cluster + G4double probVect[256]; // Cluster probability ("a#of issues" can be real) Vector + // 3D + std::pair theImpactParameter; // 2D impact parameter vector bbar + G4QHadronVector theNucleons; // Vector of nucleons of which Nucleus consists of + G4int currentNucleon; // Current nucleon for the NextNucleon (? M.K.) + G4double rho0; // Normalazation density + G4double radius; // Nuclear radius + std::vector* Tb; // T(b) function with step .1 fm (@@ make .1 a parameter) }; std::ostream& operator<<(std::ostream& lhs, G4QNucleus& rhs); std::ostream& operator<<(std::ostream& lhs, const G4QNucleus& rhs); -inline G4bool G4QNucleus::operator==(const G4QNucleus &right) const {return this==&right;} -inline G4bool G4QNucleus::operator!=(const G4QNucleus &right) const {return this!=&right;} - -inline G4int G4QNucleus::GetPDG()const {return 90000000+1000*(1000*S+Z)+N;} -inline G4int G4QNucleus::GetZ() const {return Z;} -inline G4int G4QNucleus::GetN() const {return N;} -inline G4int G4QNucleus::GetS() const {return S;} -inline G4int G4QNucleus::GetA() const {return Z+N+S;} -inline G4int G4QNucleus::GetDZ() const {return dZ;} -inline G4int G4QNucleus::GetDN() const {return dN;} -inline G4int G4QNucleus::GetDS() const {return dS;} -inline G4int G4QNucleus::GetDA() const {return dZ+dN+dS;} -inline G4int G4QNucleus::GetMaxClust() const {return maxClust;} -inline G4double G4QNucleus::GetProbability(G4int bn) const {return probVect[bn];} -inline G4int G4QNucleus::GetNDefMesonC() {return nDefMesonC;} // max#of meson candidates -inline G4int G4QNucleus::GetNDefBaryonC(){return nDefBaryonC;}//max#of baryon candidates -// Init existing nucleus by new Quark Content -inline void G4QNucleus::InitByQC(G4QContent newQC) -{// ============================================= - G4int PDG=G4QPDGCode(newQC).GetPDGCode(); - InitByPDG(PDG); -} - -inline G4double G4QNucleus::GetMZNS() const {return GetQPDG().GetNuclMass(Z,N,S);} -inline G4double G4QNucleus::GetGSMass() const {return GetQPDG().GetMass();} -inline G4QContent G4QNucleus::GetQCZNS() const -{ - if(S>=0) return G4QContent(Z+N+N+S,Z+Z+N+S,S,0,0,0); - else return G4QContent(Z+N+N+S,Z+Z+N+S,0,0,0,-S); -} -inline void G4QNucleus::SetMaxClust(G4int maxC) {maxClust=maxC;} -inline void G4QNucleus::CalculateMass() - {Set4Momentum(G4LorentzVector(0.,0.,0.,GetGSMass()));} -// Add Cluster -inline G4QNucleus G4QNucleus::operator+=(const G4QNucleus& rhs) -// ======================================================= -{ - Z+=rhs.Z; - N+=rhs.N; - S+=rhs.S; - dZ+=rhs.dZ; - dN+=rhs.dN; - dS+=rhs.dS; - // Atributes of aHadron - G4int newPDG= GetPDGCode() + rhs.GetPDGCode() - 90000000; - SetQPDG (newPDG); - G4QContent newQC = GetQC() + rhs.GetQC(); - SetQC (newQC); - G4LorentzVector newLV = Get4Momentum() + rhs.Get4Momentum(); - Set4Momentum (newLV); - return *this; -} - -// Subtract Cluster -inline G4QNucleus G4QNucleus::operator-=(const G4QNucleus& rhs) -// ======================================================= -{ - Z-=rhs.Z; - N-=rhs.N; - S-=rhs.S; - dZ-=rhs.dZ; - dN-=rhs.dN; - dS-=rhs.dS; - // Atributes of aHadron - G4int newPDG= GetPDGCode() - rhs.GetPDGCode() + 90000000; - SetQPDG (newPDG); - G4QContent newQC = GetQC() - rhs.GetQC(); - SetQC (newQC); - G4LorentzVector newLV = Get4Momentum() - rhs.Get4Momentum(); - Set4Momentum (newLV); - return *this; -} - -// Multiply Nucleus by integer value -inline G4QNucleus G4QNucleus::operator*=(const G4int& rhs) -// =================================================== -{ - Z*=rhs; - N*=rhs; - S*=rhs; - dZ*=rhs; - dN*=rhs; - dS*=rhs; - // Atributes of aHadron - G4int newPDG= rhs*(GetPDGCode() - 90000000) + 90000000; - SetQPDG (newPDG); - G4QContent newQC = rhs*GetQC(); - SetQC (newQC); - G4LorentzVector newLV = rhs*Get4Momentum(); - Set4Momentum (newLV); - return *this; -} - -// Converts hadronic PDG Code to nuclear PDG Code -inline G4int G4QNucleus::HadrToNucPDG(G4int hPDG) -// ========================================== -{ - G4int nPDG=hPDG; - if (hPDG==2212) nPDG=90001000; // p - else if(hPDG==2112) nPDG=90000001; // n - else if(hPDG==3122||hPDG==3212) nPDG=91000000; // Lambda - else if(hPDG== 211) nPDG=90000999; // pi+ - else if(hPDG==-211) nPDG=89999001; // pi- - else if(hPDG== 213) nPDG=89001000; // K0 (anti-strange) - else if(hPDG== 213) nPDG=89000001; // K+ (anti-strange) - else if(hPDG==-213) nPDG=90999000; // anti-K0 (strange) - else if(hPDG==-213) nPDG=90999999; // K- (strange) - else if(hPDG==1114) nPDG=90001999; // Delta- - else if(hPDG==2224) nPDG=89999002; // Delta++ - else if(hPDG==3112) nPDG=91000999; // Sigma- - else if(hPDG==3222) nPDG=90999001; // Sigma+ - else if(hPDG==3312) nPDG=91999999; // Ksi- - else if(hPDG==3322) nPDG=91999000; // Ksi0 - else if(hPDG==3334) nPDG=92998999; // Omega- - return nPDG; -} - -// Converts nuclear PDG Code to hadronic PDG Code -inline G4int G4QNucleus::NucToHadrPDG(G4int nPDG) -// ========================================== -{ - G4int hPDG=nPDG; - if (nPDG==90001000) hPDG=2212; // p - else if(nPDG==90000001) hPDG=2112; // n - else if(nPDG==91000000) hPDG=3122; // Lambda - else if(nPDG==90000999) hPDG= 211; // pi+ - else if(nPDG==89999001) hPDG=-211; // pi- - else if(nPDG==89001000) hPDG= 213; // K0 (anti-strange) - else if(nPDG==89000001) hPDG= 213; // K+ (anti-strange) - else if(nPDG==90999000) hPDG=-213; // anti-K0 (strange) - else if(nPDG==90999999) hPDG=-213; // K- (strange) - else if(nPDG==90001999) hPDG=1114; // Delta- - else if(nPDG==89999002) hPDG=2224; // Delta++ - else if(nPDG==91000999) hPDG=3112; // Sigma- - else if(nPDG==90999001) hPDG=3222; // Sigma+ - else if(nPDG==91999999) hPDG=3312; // Ksi- - else if(nPDG==91999000) hPDG=3322; // Ksi0 - else if(nPDG==92998999) hPDG=3334; // Omega- - return hPDG; -} - -// Private member functions -inline G4QNucleus G4QNucleus::GetThis()const{return G4QNucleus(Z,N,S);} #endif diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPDGCode.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPDGCode.hh index 68aa91a3b6..37014c08c1 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPDGCode.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPDGCode.hh @@ -25,7 +25,7 @@ // // // $Id: G4QPDGCode.hh,v 1.26 2006/06/29 20:06:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QPDGCode ---------------- // by Mikhail Kossov, Sept 1999. diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPDGCodeVector.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPDGCodeVector.hh index 6027bd417f..824e83ce2c 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPDGCodeVector.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPDGCodeVector.hh @@ -25,7 +25,7 @@ // // // $Id: G4QPDGCodeVector.hh,v 1.19 2006/06/29 20:06:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QCandidateVector ---------------- // by Mikhail Kossov, Sept 1999. diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPDGToG4Particle.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPDGToG4Particle.hh index b302ca9d51..6c138e3e5c 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPDGToG4Particle.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPDGToG4Particle.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4QPDGToG4Particle.hh,v 1.4 2006/06/29 20:06:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QPDGToG4Particle header ---------------- // by Mikhail Kossov, December 2003. diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParentCluster.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParentCluster.hh index 9feba0a5c1..96e227ece4 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParentCluster.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParentCluster.hh @@ -25,7 +25,7 @@ // // // $Id: G4QParentCluster.hh,v 1.23 2006/06/29 20:06:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QParentCluster ---------------- // by Mikhail Kossov, Sept 1999. diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParentClusterVector.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParentClusterVector.hh index b40bfdfcc9..c372c7aedb 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParentClusterVector.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParentClusterVector.hh @@ -25,7 +25,7 @@ // // // $Id: G4QParentClusterVector.hh,v 1.18 2006/06/29 20:06:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QCandidateVector ---------------- // by Mikhail Kossov, Sept 1999. diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParticle.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParticle.hh index 7f1fe91107..a5635bfd77 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParticle.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParticle.hh @@ -25,7 +25,7 @@ // // // $Id: G4QParticle.hh,v 1.24 2006/06/29 20:06:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QParticle ---------------- // by Mikhail Kossov, Sept 1999. diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParticleVector.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParticleVector.hh index df8b1bb396..1c1087ec59 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParticleVector.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParticleVector.hh @@ -25,7 +25,7 @@ // // // $Id: G4QParticleVector.hh,v 1.19 2006/06/29 20:06:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QCandidateVector ---------------- // by Mikhail Kossov, Sept 1999. diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParton.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParton.hh new file mode 100644 index 0000000000..b5b8ae7855 --- /dev/null +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParton.hh @@ -0,0 +1,110 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// + +#ifndef G4QParton_h +#define G4QParton_h 1 + +// $Id: G4QParton.hh,v 1.2 2006/12/12 11:02:22 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ------------------------------------------------------------ +// GEANT 4 class header file +// +// ---------------- G4QParton ---------------- +// by Mikhail Kosov, October 2006 +// class for Quark-Parton for quark-level models +// For comparison mirror member functions are taken from G4 class: +// G4Parton +// ----------------------------------------------------------------- + +#include "globals.hh" +#include "G4ThreeVector.hh" +#include "G4LorentzVector.hh" +#include +#include "G4ParticleTable.hh" +#include "Randomize.hh" + +class G4QParton +{ + public: + // Constructors + G4QParton() + { + // CHIPS is working only with u, d, and s quarks (SU(3)xSU(3)) (no gluons! M.K.) + // Random Flavor/Colour/Spin definition for default constructor (with .3 s-suppresion) + PDGencoding=(G4int)(2.3*G4UniformRand())+1; //@@ What about antiquarks? (M.K.) + theDefinition=G4ParticleTable::GetParticleTable()->FindParticle(PDGencoding); + // random colour (1,2,3)=(R,G,B) for quarks and (-1,-2,-3)=(aR,aG,aB) for anti-quarks + theColour = (G4int)(3*G4UniformRand())+1; + if(theColour>3) theColour = 3; + theIsoSpinZ = theDefinition->GetPDGIsospin3(); + theSpinZ = (G4int)(2*G4UniformRand()) - 0.5; + } + G4QParton(G4int PDGencoding); // Collor/Spin are still random + G4QParton(const G4QParton &right); + G4QParton(const G4QParton* right); + + // Destructor + ~G4QParton(); + + // Operators + const G4QParton& operator=(const G4QParton &right); + G4int operator==(const G4QParton &right) const {return this==&right;} + G4int operator!=(const G4QParton &right) const {return this!=&right;} + + // Modifiers + void DefineMomentumInZ(G4double aLightConeMomentum, G4bool aDirection); + void SetColour(G4int aColour) {theColour = aColour;} + void SetX(G4double anX) {theX = anX;} + void Set4Momentum(const G4LorentzVector& aMomentum) {theMomentum=aMomentum;} + void SetPosition(const G4ThreeVector& aPosition) {thePosition=aPosition;} + void SetIsoSpinZ(G4double anIsoSpinZ) {theIsoSpinZ = anIsoSpinZ;} + void SetSpinZ(G4double aSpinZ) {theSpinZ = aSpinZ;} + + // Selectors + G4int GetPDGCode() const {return PDGencoding;} + G4ParticleDefinition* GetDefinition() {return theDefinition;} + const G4ThreeVector& GetPosition()const {return thePosition;} + const G4LorentzVector& Get4Momentum() const {return theMomentum;} + G4double GetX() {return theX;} + G4int GetColour() {return theColour;} + G4double GetSpinZ() {return theSpinZ;} + G4double GetIsoSpinZ() {return theIsoSpinZ;} + G4double GetMass() {return theDefinition->GetPDGMass();} + G4String GetParticleSubType() {return theDefinition->GetParticleSubType();} + private: + // Body + G4int PDGencoding; + G4ParticleDefinition* theDefinition; + G4LorentzVector theMomentum; + G4ThreeVector thePosition; + G4int theColour; + G4double theIsoSpinZ; + G4double theSpinZ; + G4double theX; +}; + +#endif diff --git a/examples/extended/electromagnetic/TestEm9/include/PhysListIonBinaryCascade.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPartonPair.hh similarity index 51% rename from examples/extended/electromagnetic/TestEm9/include/PhysListIonBinaryCascade.hh rename to source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPartonPair.hh index d79eeb621d..49c3926b9b 100644 --- a/examples/extended/electromagnetic/TestEm9/include/PhysListIonBinaryCascade.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPartonPair.hh @@ -23,58 +23,58 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: PhysListIonBinaryCascade.hh,v 1.4 2006/06/29 17:02:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +#ifndef G4QPartonPair_h +#define G4QPartonPair_h 1 +// +// $Id: G4QPartonPair.hh,v 1.1 2006/10/30 10:40:34 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------ -// GEANT 4 class header file -// Class Description: -// This class is an derived class of G4VPhysicsConstructor -// It is provide PhysicsList for Binary Cascade for -// protons and neutrons with the energy E<3 GeV -// -// ------------------------------------------------------------ -// History -// Created: 18.11.03 V.Ivanchenko -// -// Modified: +// GEANT 4 class implementation file // +// ---------------- G4QParton ---------------- +// by Mikhail Kossov, Oct 2006. +// class for PartonPair (hadron) used by Parton String Models // ------------------------------------------------------------ // -#ifndef PhysListIonBinaryCascade_h -#define PhysListIonBinaryCascade_h 1 - -#include "G4VPhysicsConstructor.hh" #include "globals.hh" -#include "G4DeuteronInelasticProcess.hh" -#include "G4TritonInelasticProcess.hh" -#include "G4AlphaInelasticProcess.hh" +#include "G4ThreeVector.hh" +#include "G4LorentzVector.hh" +#include "G4QParton.hh" -class G4HadronInelasticProcess; - -class PhysListIonBinaryCascade : public G4VPhysicsConstructor +class G4QPartonPair { - public: - PhysListIonBinaryCascade(const G4String& name = "binary_ion"); - virtual ~PhysListIonBinaryCascade(); - - public: - // This method will be invoked in the Construct() method. - // each particle type will be instantiated - void ConstructParticle() {}; - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - void ConstructProcess(); - - private: - - G4DeuteronInelasticProcess theIPdeuteron; - G4TritonInelasticProcess theIPtriton; - G4AlphaInelasticProcess theIPalpha; - G4HadronInelasticProcess* theIPGenericIon; - + public: + enum { DIFFRACTIVE = 1, SOFT = 2, HARD = 3}; + enum { PROJECTILE = 1, TARGET = -1}; + public: + G4QPartonPair(G4QParton* P1, G4QParton* P2, G4int Type=0, G4int Direction=0); + ~G4QPartonPair(); + G4int operator==(const G4QPartonPair &right) const + { + return (CollisionType == right.CollisionType && *Parton1 == *right.Parton1 && + *Parton2 == *right.Parton2) ? 1: 0; + } + G4int operator!=(const G4QPartonPair &right) const + { + return (CollisionType == right.CollisionType && *Parton1 == *right.Parton1 && + *Parton2 == *right.Parton2) ? 0: 1; + } + // Modifiers + void SetPartons(G4QParton* P1, G4QParton* P2) {Parton1=P1; Parton2=P2;} + void SetCollisionType(G4int Type) {CollisionType = Type;} + // Selectors + G4int GetCollisionType() {return CollisionType;} + G4QParton* GetParton1() {return Parton1;} + G4QParton* GetParton2() {return Parton2;} + G4int GetDirection() {return Direction;} + + private: + // Body + G4QParton* Parton1; + G4QParton* Parton2; + G4int CollisionType; + G4int Direction; }; #endif diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPartonPairVector.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPartonPairVector.hh new file mode 100644 index 0000000000..4244d93070 --- /dev/null +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPartonPairVector.hh @@ -0,0 +1,44 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4QPartonPairVector.hh,v 1.1 2006/11/16 11:36:09 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ---------------- G4QCandidateVector ---------------- +// by Mikhail Kossov, October 2006. +// Type defenition for a Vector of PartonPairs of CHIPS model +// --------------------------------------------------------------- + +#ifndef G4QPartonPairVector_h +#define G4QPartonPairVector_h 1 + +#include "G4QPartonPair.hh" +#include + +typedef std::vector G4QPartonPairVector; +struct DeleteQPartonPair { void operator()(G4QPartonPair* aQPP){delete aQPP;}}; + +#endif diff --git a/examples/novice/N05/include/ExN05MaxTimeCuts.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPartonVector.hh similarity index 65% rename from examples/novice/N05/include/ExN05MaxTimeCuts.hh rename to source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPartonVector.hh index a3029515cf..526fab0ba0 100644 --- a/examples/novice/N05/include/ExN05MaxTimeCuts.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPartonVector.hh @@ -24,48 +24,32 @@ // ******************************************************************** // // -// $Id: ExN05MaxTimeCuts.hh,v 1.6 2006/06/29 17:52:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4QPartonVector.hh,v 1.1 2006/10/30 10:40:34 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // -// -// ------------------------------------------------------------ -// GEANT 4 class header file +// ---------------- G4QCandidateVector ---------------- +// by Mikhail Kossov, Oct 2006. +// Type defenition for a Vector of Partons - output of CHIPS model +// --------------------------------------------------------------- + +#ifndef G4QPartonVector_h +#define G4QPartonVector_h 1 +// +// $Id: G4QPartonVector.hh,v 1.1 2006/10/30 10:40:34 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------ -// 14 Aug. 1998 H.Kurashige +// GEANT 4 class implementation file +// +// ---------------- G4QParton ---------------- +// by Mikhail Kossov, Oct 2006. +// class for PartonVector (string) used by Parton String Models // ------------------------------------------------------------ -#ifndef ExN05MaxTimeCuts_h -#define ExN05MaxTimeCuts_h 1 +#include "G4QParton.hh" +#include -#include "G4ios.hh" -#include "globals.hh" -#include "ExN05SpecialCuts.hh" - - -class ExN05MaxTimeCuts : public ExN05SpecialCuts -{ - public: - - ExN05MaxTimeCuts(const G4String& processName ="ExN05MaxTimeCuts" ); - - virtual ~ExN05MaxTimeCuts(); - - // PostStep GPIL - virtual G4double PostStepGetPhysicalInteractionLength( - const G4Track& track, - G4double previousStepSize, - G4ForceCondition* condition - ); - - - private: - - // hide assignment operator as private - ExN05MaxTimeCuts(ExN05MaxTimeCuts&); - ExN05MaxTimeCuts& operator=(const ExN05MaxTimeCuts& right); - -}; +typedef std::vector G4QPartonVector; +struct DeleteQParton { void operator()(G4QParton* aQP){delete aQP;}}; #endif - diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPomeron.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPomeron.hh new file mode 100644 index 0000000000..e992677f65 --- /dev/null +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPomeron.hh @@ -0,0 +1,116 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +#ifndef G4QPomeron_h +#define G4QPomeron_h 1 +// +// $Id: G4QPomeron.hh,v 1.2 2006/12/12 11:02:22 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ------------------------------------------------------------ +// GEANT 4 class implementation file +// +// ---------------- G4QPomeron ---------------- +// by Mikhail Kossov Oct, 2006 +// class for a Pomeron used by Parton String Models +// For comparison mirror member functions are taken from G4 class: +// G4PomeronCrossSection +// ------------------------------------------------------------ + +#include "globals.hh" + +class G4QPomeron +{ + public: + G4QPomeron(G4int PDGCode = 211); + ~G4QPomeron(){;} + void Pomeron_S(G4double apomeron_S) {pomeron_S = apomeron_S;} + void Pomeron_Gamma(G4double apomeron_Gamma) {pomeron_Gamma = apomeron_Gamma;} + void Pomeron_C(G4double apomeron_C) {pomeron_C = apomeron_C;} + void Pomeron_Rsquare(G4double apomeron_Rsquare) {pomeron_Rsquare = apomeron_Rsquare;} + void Pomeron_Alpha(G4double apomeron_Alpha) {pomeron_Alpha = apomeron_Alpha;} + void Pomeron_Alphaprime(G4double apom_Alphaprime){pomeron_Alphaprime = apom_Alphaprime;} + void Pomeron_Gamma_Hard(G4double apom_Gamma_Hard){pomeron_Gamma_Hard = apom_Gamma_Hard;} + void Pomeron_Alpha_Hard(G4double apom_Alpha_Hard){pomeron_Alpha_Hard = apom_Alpha_Hard;} + G4double GetTotalCrossSection(const G4double s) {return SigP(s) * Expand(Z(s)/2);} + G4double GetDiffractiveCrossSection(const G4double s) + {return SigP(s)/pomeron_C*(Expand(Z(s)/2)-Expand(Z(s)));} + G4double GetElasticCrossSection(const G4double s) + {return (pomeron_C-1)*GetElasticCrossSection(s);} + G4double GetInelasticCrossSection(const G4double s) + {return GetTotalCrossSection(s)-GetElasticCrossSection(s);} + G4double GetTotalProbability(const G4double s, const G4double imp2) + {return 2*(1-std::exp(-Eikonal(s,imp2)))/pomeron_C*(1-std::exp(-Eikonal(s,imp2)));} + G4double GetDiffractiveProbability(const G4double s, const G4double imp2) + {return (pomeron_C-1.)/pomeron_C*(GetTotalProbability(s,imp2) - + GetNondiffractiveProbability(s,imp2));} + G4double GetNondiffractiveProbability(const G4double s, const G4double imp2) + {return (1.-std::exp(-2*Eikonal(s,imp2)))/pomeron_C;} + G4double GetElasticProbability(const G4double s, const G4double imp2) + {return GetTotalProbability(s,imp2)-GetInelasticProbability(s,imp2);} + G4double GetInelasticProbability(const G4double s, const G4double imp2) + {return GetNondiffractiveProbability(s,imp2)+GetDiffractiveProbability(s,imp2);} + G4double GetCutPomeronProbability(const G4double s,const G4double ip2, const G4int nPom); + void SetGamma(const G4double agam) {pomeron_Gamma=agam/GeV/GeV;} // @@ Temporary + G4double SoftEikonal(G4double s, G4double imp2) + {return Zsoft(s)/2*std::exp(-imp2/LambdaSoft(s)/hbarc_squared/4);} + G4double HardEikonal(G4double s, G4double imp2) + {return Zhard(s)/2*std::exp(-imp2/LambdaHard(s)/hbarc_squared/4);} + private: + G4double PowerSoft(const G4double s) + {return pomeron_Gamma*std::pow(s/pomeron_S, pomeron_Alpha-1.);} + G4double PowerHard(const G4double s) + {return pomeron_Gamma_Hard*std::pow(s/pomeron_S, pomeron_Alpha_Hard-1.);} + G4double LambdaSoft(const G4double s) + {return pomeron_Rsquare+pomeron_Alphaprime*std::log(s/pomeron_S);} + G4double LambdaHard(const G4double){return pomeron_Rsquare;} // @@ ? M.K. + G4double Zsoft(const G4double s) {return 2*pomeron_C*PowerSoft(s)/LambdaSoft(s);} + G4double Zhard(const G4double s) {return 2*pomeron_C*PowerHard(s)/LambdaHard(s);} + + void InitForNucleon(); + void InitForPion(); + void InitForKaon(); + void InitForGamma(); + + G4double Expand(G4double z); + G4double Z(const G4double Scms) {return 2*pomeron_C*Power(s)/Lambda(Scms);} + G4double SigP(const G4double Scms) {return 8*pi*hbarc_squared*Power(Scms);} + G4double Power(const G4double Scms) + {return pomeron_Gamma*std::pow(Scms/pomeron_S,pomeron_Alpha-1);} + G4double Lambda(const G4double s) + {return pomeron_Rsquare+pomeron_Alphaprime*std::log(s/pomeron_S);} + G4double Eikonal(const G4double s, const G4double imp2) + {return std::exp(-imp2/(4*Lambda(s)*hbarc_squared))*Z(s)/2;} + // Body + G4double pomeron_S; + G4double pomeron_Gamma; + G4double pomeron_C; + G4double pomeron_Rsquare; + G4double pomeron_Alpha; + G4double pomeron_Alphaprime; + G4double pomeron_Gamma_Hard; + G4double pomeron_Alpha_Hard; +}; +#endif diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QSplitter.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QSplitter.hh index 168e859749..a86f1a7d70 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QSplitter.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QSplitter.hh @@ -25,7 +25,7 @@ // // // $Id: G4QSplitter.hh,v 1.2 2006/06/29 20:06:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QSplitter ---------------- // by Mikhail Kossov, Avgust 2005. diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QString.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QString.hh new file mode 100644 index 0000000000..d4b6a8d6eb --- /dev/null +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QString.hh @@ -0,0 +1,174 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// +// $Id: G4QString.hh,v 1.2 2006/12/12 11:02:22 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ + +#ifndef G4QString_h +#define G4QString_h 1 + +// ------------------------------------------------------------ +// GEANT 4 class header file +// +// ---------------- G4QString ---------------- +// by Mikhail Kosov, October 2006. +// class for an excited string used by Parton String Models +// For comparison mirror member functions are taken from G4 classes: +// G4FragmentingString +// G4ExcitedStringDecay +// +// ------------------------------------------------------------ + +#include "G4ios.hh" +#include "globals.hh" +#include "G4ThreeVector.hh" +#include "G4LorentzVector.hh" +#include "G4LorentzRotation.hh" +#include "G4QHadronVector.hh" +#include "G4QHadronBuilder.hh" +#include "G4QPartonPair.hh" +#include "G4QPartonVector.hh" +#include + +class G4QString +{ + public: + + enum {PROJECTILE = 1, TARGET = -1}; // The same as in quark-pair (@@ ? M.K.) + + G4QString(); // formal creation of the string with future excitation + G4QString(G4QParton* Color,G4QParton* Gluon, G4QParton* AntiColor, G4int Dir=PROJECTILE); + G4QString(G4QParton* Col,G4QParton* AntiCol, G4int Dir=PROJECTILE); + G4QString(const G4QString &right); + + ~G4QString(); + + // Selectors + G4int operator==(const G4QString &right) const {return this == &right;} + G4int operator!=(const G4QString &right) const {return this != &right;} + const G4ThreeVector& GetPosition() const {return thePosition;} + const G4QPartonVector* GetPartonList() const {return &thePartons;} + G4QParton* GetGluon() const {return thePartons[1];} + G4QParton* GetGluon(G4int GluonPos) const {return thePartons[1 + GluonPos];} + G4QParton* GetLeftParton() const {return *thePartons.begin();} + G4QParton* GetRightParton() const {return *(thePartons.end()-1);} + G4bool IsItKinkyString() const {return (thePartons.size() > 2);} + G4int GetDirection() const {return theDirection;} + G4bool IsExcited() const {return true;} // Can be absolete? @@ M.K. + G4LorentzVector Get4Momentum() const; + //G4QHadron* GetAsQHadron(); //@@ Create a QHadron, corresponding to not excited string + G4QParton* GetColorParton() const; + G4QParton* GetAntiColorParton() const; + G4QParton* GetStableParton() const{ return theStableParton;} // stable at the moment + G4QParton* GetDecayParton() const{return theDecayParton;}// now involved in fragmentation + G4int GetDecayDirection() const; + G4bool FourQuarkString() const; // Checks that the string is qq-(qq)bar string + G4bool DecayIsQuark() const {return theDecayParton->GetParticleSubType()=="quark";} + G4bool StableIsQuark() const {return theStableParton->GetParticleSubType()=="quark";} + G4ThreeVector StablePt(); // Get Pt of the stable quark + G4ThreeVector DecayPt(); // Get Pt of the decaying quark + G4double LightConePlus(){return Pplus;} + G4double LightConeMinus() {return Pminus;} + G4double LightConeDecay(); + G4LorentzVector GetFragmentation4Mom() const; //!! Instead of Get$Momentum in FragmString + G4double Mass2() const {return Pplus*Pminus-(Ptleft+Ptright).mag2();} + G4double Mass() const{return std::sqrt(Mass2());} + G4bool StopFragmentation() {return FragmentationMass(&G4QHadronBuilder::BuildHighSpin) + + MassCut > GetFragmentation4Mom().mag();} + G4bool IsFragmentable() {return FragmentationMass() + MassCut < Mass();} + G4ThreeVector SampleQuarkPt(); + G4bool SplitLast(G4QString* string, G4QHadronVector* LeftHV, G4QHadronVector* RightHV); + + void Sample4Momentum(G4LorentzVector* Mom, G4double M, G4LorentzVector* aMom, + G4double aM, G4double InitialMass); + // Modifiers + void SetPosition(const G4ThreeVector& aPosition) {thePosition= aPosition;} + void SetDirection(G4int dir) {theDirection=dir;} + void LorentzRotate(const G4LorentzRotation& rotation); + void InsertParton(G4QParton* aParton, const G4QParton* addafter = NULL); + void Boost(G4ThreeVector& Velocity); + G4LorentzRotation TransformToCenterOfMass(); + G4LorentzRotation TransformToAlignedCms(); + void DiffString(G4QHadron* aHadron, G4bool isProjectile); + void ExciteString(G4QParton* Col,G4QParton* AntiCol, G4int Dir); + G4QHadronVector* FragmentString(G4bool QL); // Fragment String using QGSM=true/LUND=false + G4QString* CPExcited(); // Creates a string, using only CMS end-partons of the string + G4QHadronVector* LightFragmentationTest(); + G4double FragmentationMass(G4QHcreate build=0, G4QHadronPair* pdefs=0); + void CalculateHadronTimePosition(G4double theInitialStringMass, G4QHadronVector*); + void SetLeftPartonStable(); + void SetRightPartonStable(); + void UpdateString(G4QParton* decay, const G4LorentzVector* mom); + G4QString(G4QParton* newdecay, const G4LorentzVector* momentum); + G4QHadron* Splitup(G4bool QL); // Split Hadron & update the string, QGSM:true,Lund:false + G4LorentzVector* SplitEandP(G4QHadron* pHadron, G4bool QL); // QGSM:QL=true,Lund:QL=false + G4QParton* CreateParton(G4int PDGcode) {return new G4QParton(PDGcode);} + G4QPartonPair CreatePartonPair(G4int NeedParticle, G4bool AllowDiquarks=true); + G4QHadron* QuarkSplitup(G4QParton* decay, G4QParton* &created); + G4QHadron* DiQuarkSplitup(G4QParton* decay, G4QParton* &created); + G4int SampleQuarkFlavor() {return (1+G4int(G4UniformRand()/StrangeSuppress));} // ? M.K. + + // Static functions + static void SetParameters(G4double mCut, G4double clustM, G4double sigQT, G4double DQSup, + G4double DQBU, G4double smPar, G4double SSup, G4double SigPt, G4int SLmax, G4int CLmax); + + private: + // Private functions + G4ThreeVector GaussianPt(G4double widthSquare, G4double maxPtSquare) const; + G4double GetLundLightConeZ(G4double zmin, G4double zmax, G4int PartonEncoding, + G4QHadron* pHadron, G4double Px, G4double Py); + G4double GetQGSMLightConeZ(G4double zmin, G4double zmax, G4int PartonEncoding, + G4QHadron* pHadron, G4double Px, G4double Py); + + // Static parameters + // Parameters of Longitudinal String Fragmentation + static G4double MassCut; // minimum mass cut for the string + static G4double ClusterMass; // minimum cluster mass for the fragmentation + static G4double SigmaQT; // quark transverse momentum distribution parameter + static G4double DiquarkSuppress; // is Diquark suppression parameter + static G4double DiquarkBreakProb; // is Diquark breaking probability + static G4double SmoothParam; // QGS model parameter + static G4double StrangeSuppress; // Strangeness suppression parameter + static G4double widthOfPtSquare; // width^2 of pt for string excitation + static G4int StringLoopInterrupt; // String fragmentation LOOP limit + static G4int ClusterLoopInterrupt; // Cluster fragmentation LOOP limit + + // Body + G4int theDirection; // must be 1 or -1 (PROJECTILE or TARGET) + G4ThreeVector thePosition; // Defined by the first quark position + G4QPartonVector thePartons; // would like initial capacity for 3 Partons (? M.K.) + G4QHadronBuilder* hadronizer;// Hadronizer of hodrons out of partons + G4ThreeVector Ptleft,Ptright;// Pt (px,py) for partons (pz ignored!) + G4double Pplus, Pminus; // p-, p+ of string, Plus is assigned to Left! + G4QParton* theStableParton; // Parton on the stable side of the string + G4QParton* theDecayParton; // Parton on the decaying part of the string + enum DecaySide {None, Left, Right}; // @@ To have two @@ Leav : 1=Left + DecaySide decaying; // @@ it's too much @@ only : 0=Unknown + G4int SideOfDecay; // @@ of a good thing @@ one! : -1=Right +}; + +#endif diff --git a/examples/extended/analysis/A01/include/A01TrackingAction.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QStringVector.hh similarity index 77% rename from examples/extended/analysis/A01/include/A01TrackingAction.hh rename to source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QStringVector.hh index 3585e22551..ed9d646afa 100644 --- a/examples/extended/analysis/A01/include/A01TrackingAction.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QStringVector.hh @@ -23,22 +23,22 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: A01TrackingAction.hh,v 1.4 2006/06/29 16:31:39 gunter Exp $ -// -------------------------------------------------------------- // +// $Id: G4QStringVector.hh,v 1.1 2006/10/30 10:40:35 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ---------------- G4QStringVector ---------------- +// by Mikhail Kossov, October 2006. +// Type definition for a Vector of QStrings - output of CHIPS model +// ---------------------------------------------------------------- -#ifndef A01TrackingAction_h -#define A01TrackingAction_h 1 +#ifndef G4QStringVector_h +#define G4QStringVector_h 1 -#include "G4UserTrackingAction.hh" +#include "G4QString.hh" +#include -class A01TrackingAction : public G4UserTrackingAction -{ - public: - A01TrackingAction(); - virtual ~A01TrackingAction(); - - virtual void PreUserTrackingAction(const G4Track*); -}; +typedef std::vector G4QStringVector; +struct DeleteQString{ void operator()(G4QString *aQS){delete aQS;} }; #endif diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4Quasmon.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4Quasmon.hh index 6a7d4ddebd..0b38b8b673 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4Quasmon.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4Quasmon.hh @@ -25,7 +25,7 @@ // // // $Id: G4Quasmon.hh,v 1.38 2006/06/29 20:06:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4Quasmon ---------------- // by Mikhail Kossov, July 1999. diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QuasmonString.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QuasmonString.hh index d0bf731aee..ed24d35cb0 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QuasmonString.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QuasmonString.hh @@ -25,7 +25,7 @@ // // // $Id: G4QuasmonString.hh,v 1.4 2006/06/29 20:06:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QuasmonString ---------------- // by Mikhail Kossov, October 2004. diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QuasmonVector.hh b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QuasmonVector.hh index 2d7b17b920..c4cce21b2d 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QuasmonVector.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QuasmonVector.hh @@ -25,7 +25,7 @@ // // // $Id: G4QuasmonVector.hh,v 1.19 2006/06/29 20:06:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QuasmonVector ---------------- // by Mikhail Kossov, Sept 1999. diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QBesIKJY.cc b/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QBesIKJY.cc index c37410d0d9..23503e22c3 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QBesIKJY.cc +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QBesIKJY.cc @@ -25,7 +25,7 @@ // // // $Id: G4QBesIKJY.cc,v 1.2 2006/06/29 20:06:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QBesIKJY ---------------- // by Mikhail Kossov, Sept 1999. diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QCHIPSWorld.cc b/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QCHIPSWorld.cc index 1394cdcb09..69b240f7c8 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QCHIPSWorld.cc +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QCHIPSWorld.cc @@ -25,7 +25,7 @@ // // // $Id: G4QCHIPSWorld.cc,v 1.32 2006/06/29 20:06:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QCHIPSWorld ---------------- // by Mikhail Kossov, Sept 1999. diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QCandidate.cc b/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QCandidate.cc index cd5c987abf..04adfcdcb2 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QCandidate.cc +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QCandidate.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4QCandidate.cc,v 1.33 2006/06/29 20:06:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4QCandidate.cc,v 1.34 2006/11/27 10:44:53 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QCandidate ---------------- // by Mikhail Kossov, Sept 1999. @@ -135,28 +135,30 @@ G4QCandidate::~G4QCandidate() // Assignment operator const G4QCandidate& G4QCandidate::operator=(const G4QCandidate &right) { - Set4Momentum (right.Get4Momentum()); - SetQPDG (right.GetQPDG()); - SetQC (right.GetQC()); - SetNFragments (right.GetNFragments()); - possible = right.possible; - parPossible = right.parPossible; - kMin = right.kMin; - denseProbability = right.denseProbability; - preProbability = right.preProbability; - relativeProbability = right.relativeProbability; - integralProbability = right.integralProbability; - secondRelProbability= right.secondRelProbability; - secondIntProbability= right.secondIntProbability; - EBMass = right.EBMass; - NBMass = right.NBMass; - // thePClusters (Vector) - G4int nParCl = right.thePClusters.size(); - if(nParCl) for(G4int ip=0; ip"Vacuum" { G4int hPDG = curHadr->GetPDGCode();// A PDG Code of the projQHadron - if(!hPDG||hPDG==10) // Check for the validity of the QHadron (@@ 10 OK?) + //if(!hPDG||hPDG==10) // Check for the validity of the QHadron (@@ 10 OK?) + if(!hPDG) // Check for the validity of the QHadron { - G4cerr<<"---Warning---G4QEnvironment::Constructor: wrong PDG("<GetQCode(); // One more check for valid of the QHadron if(hQ<0) { - G4cerr<<"---Warning---G4QEnv::Constructor:Q<0, PDG=("<GetQC()<Get4Momentum()<GetQC()<Get4Momentum()<H="<"<solAnCut || shMOM<120.) && abs(shPDG)>99) // Absorb mesons ^ ^ + //if((dir.dot(shDIR)>solAnCut||shMOM<120.) && abs(shPDG)>99) // Absorb mesons ^ ^ + if(dir.dot(shDIR)>solAnCut && abs(shPDG)>99) // Absorb mesons ^ ^ { +#ifdef pdebug + G4cout<<"G4QE::CQ:>H="<"< Case of "Energy Flux approach" ^ ^ { G4QContent shQC = curHadr->GetQC();// QuarkContent of the Current Hadron ^ ^ @@ -3788,18 +3812,43 @@ void G4QEnvironment::EvaporateResidual(G4QHadron* qH, G4bool corFlag) theQHadrons.push_back(qH); // (delete equivalent) return; } - else if(thePDG==90000001&&totMass"<"<142.) // @@ to avoid more precise calculations + { + if(thePDG==90001000) // D+ -> n + pi+ + { + gsM=mNeut; + thePDG=90000001; + decPDG=211; + decM=mPi; + } + else if(thePDG==90000001) // D+ -> n + pi+ + { + gsM=mProt; + thePDG=90001000; + decPDG=-211; + decM=mPi; + } + else + { + decPDG=111; + decM=mPi0; + } + } G4LorentzVector h4Mom(0.,0.,0.,gsM); // GSMass must be updated in previous while-LOOP - G4LorentzVector g4Mom(0.,0.,0.,0.); + G4LorentzVector g4Mom(0.,0.,0.,decM); if(!G4QHadron(q4M).DecayIn2(h4Mom, g4Mom)) { G4cerr<<"***G4QEnv::EvaRes:h="<tM="<tM="<"<2020.) //=> IsoDB + { + // @@ Pi0 can be taken into account ! + G4int n1PDG = 2212; + G4int n2PDG = 2112; + G4int piPDG = -211; + G4double n1M = mProt; + G4double n2M = mNeut; + if (thePDG==90002000) piPDG = 211; // pp -> np + pi- + else if(thePDG==90000002) piPDG = -211; // nn -> np + pi- + else // np -> 50%(nnpi+) 50%(pppi-) + { + if(G4UniformRand()>.5) + { + n1PDG=2112; + n1M=mNeut; + piPDG = 211; + } + else + { + n2PDG=2212; + n2M=mProt; + piPDG = -211; + } + } + if(totMass>mPi+n1M+n2M) + { + G4LorentzVector n14M(0.,0.,0.,n1M); + G4LorentzVector n24M(0.,0.,0.,n2M); + G4LorentzVector pi4M(0.,0.,0.,mPi); + if(!G4QHadron(q4M).DecayIn3(n14M,n24M,pi4M)) + { + G4cerr<<"***G4QEnv::HadQEnv:IsoDN, tM="< N1="<2) EvaporateResidual(rHadron); // Continue evaporation (@@ Self-call) else if(rB==2) // => "Dibaryon" case needs decay @@ DecayDibaryon { - G4double rGSM = rHadron->GetQPDG().GetMass();// Ground State mass of the dibaryon + G4double rGSM = rHadron->GetQPDG().GetMass(); // Ground State mass of the dibaryon #ifdef debug G4cout<<"G4QE::EvaRes:ResidDibM="< M="< "Dibaryon Decay" case (del.equivalent) } else if(rB==5) DecayAlphaBar(rHadron); // "Alpha+Baryon Decay" case (del.equival.) else if(rPDG==90004002) DecayAlphaDiN(rHadron);//Decay alph+2p (alph+2n is stable) else if(rPDG==90004004) DecayAlphaAlpha(rHadron);// "Alpha+Alpha Decay" case(delEq) - else theQHadrons.push_back(rHadron); // Fill ResidNucl=Baryon to OutputHadronVector - if(2>3) // @@ This can be skipped @@ ! @@ + else theQHadrons.push_back(rHadron); // Fill ResidNucl=Baryon to OutputHadronVector + if(2>3) // @@ This can be skipped @@ ! @@ { G4Quasmon* quasH = new G4Quasmon(qH->GetQC(),qH->Get4Momentum()); theEnvironment=G4QNucleus(90000000,G4LorentzVector(0.,0.,0.,0.)); @@ -4967,7 +5133,7 @@ G4QHadronVector* G4QEnvironment::FSInteraction() static const G4double mK0mP = mK0+mProt; static const G4double mK0mN = mK0+mNeut; static const G4QNucleus vacuum(90000000); - static const G4double eps=0.003; + static const G4double eps=0.005; ///////////////static const G4double third=1./3.; ///////////////static const G4double nPDG=90000001; G4int envA=theEnvironment.GetBaryonNumber(); @@ -5170,7 +5336,9 @@ G4QHadronVector* G4QEnvironment::FSInteraction() if(ipo+1SetQPDG(theLast->GetQPDG());// theCurHadron is substituted by the LastHadr + G4QPDGCode lQP=theLast->GetQPDG(); // The QPDG of the last + if(lQP.GetPDGCode()!=10) theCurr->SetQPDG(lQP); //CurHadr instead of LastHadr + else theCurr->SetQC(theLast->GetQC());// CurHadrPDG instead of LastHadrPDG theCurr->Set4Momentum(theLast->Get4Momentum()); // ... continue substitution } theQHadrons.pop_back(); // pointer to theLastHadron is excluded from OUTPUT @@ -5338,7 +5506,9 @@ G4QHadronVector* G4QEnvironment::FSInteraction() if(ipo+1SetQPDG(theLast->GetQPDG()); // CurHadrPDG instead of LastHadrPDG + G4QPDGCode lQP=theLast->GetQPDG(); // The QPDG of the last + if(lQP.GetPDGCode()!=10) theCurr->SetQPDG(lQP); //CurHadr instead of LastHadr + else theCurr->SetQC(theLast->GetQC());// CurHadrPDG instead of LastHadrPDG theCurr->Set4Momentum(theLast->Get4Momentum()); // ... 4Momentum substitution } //ELSE: it's already theLast -> no swap theQHadrons.pop_back(); //exclude LastHadronPointer from OUTPUT @@ -5402,7 +5572,9 @@ G4QHadronVector* G4QEnvironment::FSInteraction() if(ipo+1SetQPDG(theLast->GetQPDG()); // CurHadrPDG instead of theLastHadrPDG + G4QPDGCode lQP=theLast->GetQPDG(); // The QPDG of the last + if(lQP.GetPDGCode()!=10) theCurr->SetQPDG(lQP); //CurHadr instead of LastHadr + else theCurr->SetQC(theLast->GetQC());// CurHadrPDG instead of LastHadrPDG theCurr->Set4Momentum(theLast->Get4Momentum()); // ... 4Momentum substitution } theQHadrons.pop_back(); // exclude theLastHadron pointer from the OUTPUT @@ -5582,11 +5754,12 @@ G4QHadronVector* G4QEnvironment::FSInteraction() G4int nhd1=theQHadrons.size()-1; theLast = theQHadrons[nhd1];// Pointer to theLastHadron (ipoGet4Momentum(); - G4QPDGCode lQPDG=theLast->GetQPDG(); + G4QPDGCode lQP=theLast->GetQPDG(); // The QPDG of the last + if(lQP.GetPDGCode()!=10) theCurr->SetQPDG(lQP); //CurHadr instead of LastHadr + else theCurr->SetQC(theLast->GetQC());// CurHadrPDG instead of LastHadrPDG #ifdef pdebug - G4cerr<<"---Warning---G4QE::FSI:l#"<GetQPDG(); G4LorentzVector h4m= curHadr->Get4Momentum(); curHadr->Set4Momentum(theLast->Get4Momentum()); - curHadr->SetQPDG(theLast->GetQPDG()); + G4QPDGCode lQP=theLast->GetQPDG(); // The QPDG of the last + if(lQP.GetPDGCode()!=10) curHadr->SetQPDG(lQP); //CurHadr instead of LastHadr + else curHadr->SetQC(theLast->GetQC());// CurHadrPDG instead of LastHadrPDG theLast->Set4Momentum(h4m); theLast->SetQPDG(hQPDG); } @@ -6734,7 +6916,9 @@ G4QHadronVector* G4QEnvironment::FSInteraction() { G4QPDGCode hQPDG = curHadr->GetQPDG(); curHadr->Set4Momentum(l4M); - curHadr->SetQPDG(thePrev->GetQPDG()); + G4QPDGCode lQP=thePrev->GetQPDG(); // The QPDG of the previous + if(lQP.GetPDGCode()!=10) curHadr->SetQPDG(lQP); //CurHadr instead of PrevHadr + else curHadr->SetQC(thePrev->GetQC());// CurHadrPDG instead of PrevHadrPDG thePrev->Set4Momentum(h4M); thePrev->SetQPDG(hQPDG); } @@ -6897,7 +7081,9 @@ G4QHadronVector* G4QEnvironment::FSInteraction() G4QHadron* theCurr = theQHadrons[maxB]; // Pointer to the Current Hadron G4QHadron* theLast = theQHadrons[nHadr-1];// Pointer to the Last Hadron G4QHadron* curHadr = new G4QHadron(theCurr);//Remember theCurrentHadron to put on top - theCurr->SetQPDG(theLast->GetQPDG()); // theCurHadr is substituted by theLastHadr + G4QPDGCode lQP=theLast->GetQPDG(); // The QPDG of the last + if(lQP.GetPDGCode()!=10) theCurr->SetQPDG(lQP); //CurHadr instead of PrevHadr + else theCurr->SetQC(theLast->GetQC()); // CurHadrPDG instead of LastHadrPDG theCurr->Set4Momentum(theLast->Get4Momentum()); // ... continue substitution theQHadrons.pop_back(); // Rnt to theLastHadron is excluded from HV delete theLast;//*!!When kill,DON'T forget to delete the last QHadron as an inst. !!* @@ -6929,14 +7115,15 @@ G4QHadronVector* G4QEnvironment::FSInteraction() } if(nLast>gp) { - G4QPDGCode theLQPDG=theLast->GetQPDG(); - theCurr->SetQPDG(theLQPDG); // theCurHad is substituted by theLastHad + G4QPDGCode lQP=theLast->GetQPDG(); // The QPDG of the last + if(lQP.GetPDGCode()!=10) theCurr->SetQPDG(lQP); //CurHadr instead of PrevHadr + else theCurr->SetQC(theLast->GetQC()); // CurHadrPDG instead of LastHadrPDG theCurr->Set4Momentum(theLast->Get4Momentum()); // ... continue substitution theQHadrons.pop_back(); // Pnt to theLastHadr.is excluded from HV delete theLast;//*!|When kill,DON'T forget to delete theLastQHadron as an inst!!* nHadr=theQHadrons.size(); #ifdef pdebug - G4cout<<"G4QE::FSI:RepBy lPDG="< Improve it"< add decay in 3) + if(nSP) nL+=nSP; + else nL+=nSM; } if(nSP) { @@ -10800,7 +11004,9 @@ G4bool G4QEnvironment::CheckGroundState(G4Quasmon* quasm, G4bool corFlag) else DecayMultyBaryon(tcH); // Decay Multibaryon G4QHadron* theLast = theQHadrons[theQHadrons.size()-1]; curHadr->Set4Momentum(theLast->Get4Momentum());//4-Mom of CurHadr - curHadr->SetQPDG(theLast->GetQPDG()); // QPDG of the Current Hadr + G4QPDGCode lQP=theLast->GetQPDG(); + if(lQP.GetPDGCode()!=10) curHadr->SetQPDG(lQP); + else curHadr->SetQC(theLast->GetQC()); theQHadrons.pop_back(); // theLastQHadron is excluded from OUTPUT delete theLast;//*!!When kill, delete theLastQHadr asAnInstance!* } diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QException.cc b/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QException.cc index a207761575..849fcd0802 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QException.cc +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QException.cc @@ -25,7 +25,7 @@ // // // $Id: G4QException.cc,v 1.9 2006/06/29 20:06:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QException ---------------- // by Mikhail Kossov, November 2003. diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QFragmentation.cc b/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QFragmentation.cc new file mode 100644 index 0000000000..8fe8fac5a4 --- /dev/null +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QFragmentation.cc @@ -0,0 +1,799 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4QFragmentation.cc,v 1.2 2006/12/12 11:02:22 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ----------------------------------------------------------------------------- +// GEANT 4 class header file +// +// History: +// Created by Mikhail Kossov, October 2006 +// CHIPS QGS fragmentation class +// For comparison mirror member functions are taken from G4 classes: +// G4QGSParticipants +// G4QGSModels +// G4ExcitedStringDecay +// ----------------------------------------------------------------------------- +// + +//#define debug +//#define pdebug +//#define ppdebug + +#include "globals.hh" +#include "G4QFragmentation.hh" +#include "G4LorentzVector.hh" +#include + +// Promoting model parameters from local variables class properties @@(? M.K.) + +// Definition of static parameters +G4int G4QFragmentation::nCutMax=7; +G4double G4QFragmentation::ThersholdParameter=450.*MeV; +G4double G4QFragmentation::QGSMThershold=3.*GeV; +G4double G4QFragmentation::theNucleonRadius=1.5*fermi; + // Parameters of diffractional fragmentation +G4double G4QFragmentation::widthOfPtSquare=-0.72*GeV*GeV; // pt -width2 forStringExcitation +G4double G4QFragmentation::minExtraMass=250.*MeV;// minimum excitation mass +G4double G4QFragmentation::minmass=250.*MeV; // mean pion transverse mass for Xmin + +G4QFragmentation::G4QFragmentation() : theNucleus(0) +{ + // Construct Shortlived particles (needed after the 2006 Particles revolution) + G4ShortLivedConstructor ShortLived; + ShortLived.ConstructParticle(); +} + +G4QFragmentation::~G4QFragmentation() {if(theNucleus) delete theNucleus;} + +G4QHadronVector* G4QFragmentation::Scatter(const G4QNucleus &aNucleus, + const G4QHadron &aPrimary) +{ + G4QStringVector* strings=0; + + G4QHadron thePrimary = aPrimary; + + G4LorentzRotation toZ; + G4LorentzVector Ptmp=thePrimary.Get4Momentum(); + toZ.rotateZ(-1*Ptmp.phi()); + toZ.rotateY(-1*Ptmp.theta()); + thePrimary.Set4Momentum(toZ*Ptmp); + G4LorentzRotation toLab(toZ.inverse()); + + G4int attempts = 0, maxAttempts=20; + while(!strings) + { + if (attempts++ > maxAttempts ) + { + G4cerr<<"***G4QFragmentation::Scatter: "< max=" + < try to increase maxAttempts"<size(); astring++) + { + // rotate string to lab frame, models have it aligned to z + stringEnergy += (*strings)[astring]->GetLeftParton()->Get4Momentum().t(); + stringEnergy += (*strings)[astring]->GetRightParton()->Get4Momentum().t(); + (*strings)[astring]->LorentzRotate(toLab); + } +#ifdef debug + G4cout<<"G4QFragmentation::Scatter: Total string energy = "<begin(), strings->end(), DeleteQString() ); + delete strings; + + return theResult; +} + +void G4QFragmentation::InitModel(const G4QNucleus& aNucleus,const G4QHadron& aProjectile) +{ + static const G4double mProt = G4Proton::Proton()->GetPDGMass(); // Mass of proton + Init(aNucleus.GetN(),aNucleus.GetZ()); + theCurrentVelocity.setX(0); + theCurrentVelocity.setY(0); + // @@ "target Nucleon" == "Proton at rest" (M.K. ?) + G4double nCons = 1; // 1 or baryon number of the projectile + G4int projAbsB=std::abs(aProjectile.GetBaryonNumber()); // Baryon/anti-baryon + if(projAbsB>1) nCons = projAbsB; + G4LorentzVector proj4M = aProjectile.Get4Momentum(); + G4double pz_per_projectile = proj4M.pz()/nCons; + G4double e_per_projectile = proj4M.e()/nCons+mProt; // @@ Add mass of TargetProtonAtRest + //G4double e_per_projectile = aProjectile.Get4Momentum()*aProjectile.Get4Momentum(); + //e_per_projectile += proj4M.vect()*proj4M.vect(); + //e_per_projectile /=nCons*nCons; + //e_per_projectile = std::sqrt(e_per_projectile); + //e_per_projectile += G4Proton::Proton()->GetPDGMass();//@@Add mass of TargetProtonAtRest + G4double vz = pz_per_projectile/e_per_projectile; +#ifdef debug + G4cout<<"G4QFragmentation::Init: Projectile4M="<DoLorentzBoost(theCurrentVelocity); +} + +G4QStringVector* G4QFragmentation::GetStrings() +{ + G4QPartonPair* aPair; + G4QStringVector* theStrings = new G4QStringVector; + G4QString* aString=0; + while((aPair = GetNextPartonPair())) // @@ At present no difference in stringBuild ? M.K. + { + if (aPair->GetCollisionType() == G4QPartonPair::DIFFRACTIVE) + { + aString = BuildString(aPair); // @@ ? +#ifdef debug + G4cout<<"G4QFragmentation::GetStrings:DifString4M="<Get4Momentum()< sqrt(s)=" + < s) // thus only diffractive in cascade! + { +#ifdef debug + G4cout<<"G4QFragmentation::SelectInteractions: ThrM="< sqrt(s)=" + < only Diffraction is possible"< theImpactParameter; + theImpactParameter = theNucleus->ChooseImpactXandY(outerRadius+theNucleonRadius); + G4double impactX = theImpactParameter.first; + G4double impactY = theImpactParameter.second; + + // loop over nuclei to find collissions HPW + theNucleus->StartLoop(); + G4int nucleonCount = 0; // debug + //G4QFragmentation_NPart = 0; // ? M.K. + while( (pNucleon = theNucleus->GetNextNucleon()) ) + { + if(totalCuts>1.5*eKin) break; + nucleonCount++; // debug + // Needs to be moved to Probability class @@@ + G4double s = (aPrimaryMomentum + pNucleon->Get4Momentum()).mag2(); + G4double Distance2 = sqr(impactX - pNucleon->GetPosition().x()) + + sqr(impactY - pNucleon->GetPosition().y()); + G4double Probability = theProbability.GetInelasticProbability(s, Distance2); + // test for inelastic collision + G4double rndNumber = G4UniformRand(); + // ModelMode = DIFFRACTIVE; + if (Probability > rndNumber) + { +#ifdef debug + G4cout<<"G4QFragmentation::SelectInteractions: p="<IsExcited() ) + { + generatedHadrons=(*theStrings)[astring]->FragmentString(true);// Fragment QGSM String + } + else + { + //generatedHadrons = new G4QHadronVector; + //generatedHadrons->push_back((*theStrings)[astring]->GetAsQHadron()); //@@ NotImplem + } + if (!generatedHadrons) + { + G4cerr<<"G4QFragmentation::FragmentStrings: No Hadrons produced" << G4endl; + continue; + } + G4LorentzVector KTsum1(0.,0.,0.,0.); + for(unsigned aTrack=0; aTracksize(); aTrack++) + { + theResult->push_back((*generatedHadrons)[aTrack]); + KTsum1+= (*generatedHadrons)[aTrack]->Get4Momentum(); + } + + if(std::abs((KTsum1.e()-(*theStrings)[astring]->Get4Momentum().e())/KTsum1.e()) + > perMillion) NeedEnergyCorrector=true; + // clean up + delete generatedHadrons; + } +#ifdef debug + G4cout<<"G4QFragmentation::FragmentStrings: String4mom="<empty()) return TRUE; + G4LorentzVector SumMom; + G4double SumMass = 0; + G4double TotalCollisionMass = TotalCollisionMom.m(); + if( !(TotalCollisionMass<1) && !(TotalCollisionMass>-1) ) + { + G4cerr<<"***G4QFragmentation::EnergyAndMomentumCorrect:M="<size(); cHadron++) + { + SumMom += Output->operator[](cHadron)->Get4Momentum(); + if( !(SumMom<1) && !(SumMom>-1) ) + { + G4cerr<<"***G4QFragmentation::EnergyAndMomentumCorrector: SumMom="<GetMass(); + if(!(SumMass<1) && !(SumMass>-1)) + { + G4cerr<<"***G4QFragmentation::EnergyAndMomentumCorrector: SumMass="<size() < 2) return FALSE; + if (SumMass > TotalCollisionMass) return FALSE; + SumMass = SumMom.m2(); + if (SumMass < 0) return FALSE; + SumMass = std::sqrt(SumMass); + // Compute c.m.s. hadron velocity and boost KTV to hadron c.m.s. + G4ThreeVector Beta = -SumMom.boostVector(); + G4int nOut=Output->size(); + if(nOut) for(G4int o=0; oBoost(Beta); + // Scale total c.m.s. hadron energy (hadron system mass). + // It should be equal interaction mass + G4double Scale = 1; + G4int cAttempt = 0; + G4double Sum = 0; + G4bool success = false; + for(cAttempt = 0; cAttempt < nAttemptScale; cAttempt++) + { + Sum = 0; + for(cHadron = 0; cHadron < Output->size(); cHadron++) + { + G4LorentzVector HadronMom = Output->operator[](cHadron)->Get4Momentum(); + HadronMom.setVect(Scale*HadronMom.vect()); + G4double E = std::sqrt(HadronMom.vect().mag2() + sqr((*Output)[cHadron]->GetMass())); + HadronMom.setE(E); + Output->operator[](cHadron)->Set4Momentum(HadronMom); + Sum += E; + } + Scale = TotalCollisionMass/Sum; + if (Scale - 1 <= ErrLimit) + { + success = true; + break; + } +#ifdef debug + G4cout<<"G4QFragmentation::EnergyAndMomentumCorrector: Scale-1="<size(); + if(nOut) for(G4int o=0; oBoost(Beta); + return TRUE; +} + +// Excite double diffractive string +G4bool G4QFragmentation::ExciteDiffParticipants(G4QHadron* projectile, + G4QHadron* target) const +{ + G4LorentzVector Pprojectile=projectile->Get4Momentum(); + G4double Mprojectile=projectile->GetMass() + minExtraMass; + G4double Mprojectile2=Mprojectile*Mprojectile; + G4LorentzVector Ptarget=target->Get4Momentum(); + G4double Mtarget=target->GetMass() + minExtraMass; + G4double Mtarget2=Mtarget*Mtarget; +#ifdef debug + G4cout<<"G4QFragm::ExciteDiffPartici:Ep="<GetMass2()*(1.-perCent); // Isn't it too big reduction? M.K. + } + else + { +#ifdef debug + G4cout<<"---1/2---G4QFragmentation::ExSingDiffParticipants: Target is fixed"<GetMass2()*(1.-perCent); // @@ Isn't it too big reduction? M.K. + } + // @@ From this point it repeats the Diffractional excitation (? Use flag ?) + // Transform momenta to cms and then rotate parallel to z axis; + G4LorentzVector Psum=Pprojectile+Ptarget; + G4LorentzRotation toCms(-Psum.boostVector()); // Boost Rotation to CMS + G4LorentzVector Ptmp=toCms*Pprojectile; + if(Ptmp.pz()<=0.) // "String" moving backwards in CMS, abort collision !! ? M.K. + { +#ifdef debug + G4cout<<"G4QFragment::ExciteSingDiffParticipants: *1* abort Collision!! *1*"< using namespace std; -G4QHadron::G4QHadron() : - theQPDG(0),theMomentum(0.,0.,0.,0.),valQ(0,0,0,0,0,0),nFragm(0) -{} +G4double G4QHadron::alpha = -0.5; // changing rapidity distribution for all +G4double G4QHadron::beta = 2.5; // changing rapidity distribution for projectile region +G4double G4QHadron::theMinPz = 70.*MeV; // Can be from 14 to 140 MeV +G4double G4QHadron::StrangeSuppress = 0.48; // ? M.K. +G4double G4QHadron::sigmaPt = 1.7*GeV; // Can be 0 +G4double G4QHadron::widthOfPtSquare = 0.01*GeV*GeV; // ? M.K. +G4double G4QHadron::minTransverseMass = 1.*keV; // ? M.K. -G4QHadron::G4QHadron(G4LorentzVector p) : - theQPDG(0),theMomentum(p),valQ(0,0,0,0,0,0),nFragm(0) -{} +G4QHadron::G4QHadron() : theQPDG(0),theMomentum(0.,0.,0.,0.),valQ(0,0,0,0,0,0),nFragm(0), + thePosition(0.,0.,0.),theCollisionCount(0),isSplit(false),Direction(true),bindE(0.), + formTime(0.) {} + +G4QHadron::G4QHadron(G4LorentzVector p) : theQPDG(0),theMomentum(p),valQ(0,0,0,0,0,0), + nFragm(0),thePosition(0.,0.,0.),theCollisionCount(0),isSplit(false),Direction(true), + bindE(0.),formTime(0.) {} // For Chipolino or Quasmon doesn't make any sense -G4QHadron::G4QHadron(G4int PDGCode, G4LorentzVector p) : - theQPDG(PDGCode),theMomentum(p),nFragm(0) +G4QHadron::G4QHadron(G4int PDGCode, G4LorentzVector p) : theQPDG(PDGCode),theMomentum(p), + nFragm(0),thePosition(0.,0.,0.),theCollisionCount(0),isSplit(false),Direction(true), + bindE(0.),formTime(0.) { #ifdef debug G4cout<<"G4QHadron must be created with PDG="<fM="< 1.) maxCost= 1.; if(minCost<-1.) minCost=-1.; if(maxCost<-1.) maxCost=-1.; if(minCost> 1.) minCost= 1.; - if (fabs(iM-fM-sM)<.001) + if(iM-fM-sM<.00000001) { G4double fR=fM/iM; G4double sR=sM/iM; @@ -219,7 +340,7 @@ G4bool G4QHadron::RelDecayIn2(G4LorentzVector& f4Mom, G4LorentzVector& s4Mom, G4double p2 = (d2*d2/4.-fM2*sM2)/iM2; // Decay momentum(^2) in CMS of Quasmon if(p2<0.) { -#ifdef debug +#ifdef ppdebug G4cout<<"**G4QH:RDIn2:p2="<1.) ct=1.; + if(ct<-1.) ct=-1.; + } G4ThreeVector pVect=(ps*sin(phi))*vz+(ps*cos(phi))*vy+p*ct*vx; -#ifdef debug +#ifdef ppdebug G4cout<<"G4QH::RelDIn2:ct="<0.01) + pt=GaussianPt(widthOfPtSquare, maxAvailMomentum2); + //G4cout<<"DSU 1.1 - "<GetDefinition()->GetParticleName() + // << " - Type: " << aParton->GetDefinition()->GetParticleType() + // << " - Spin-3: " << aParton->GetSpinZ() + // << " - Colour: " << aParton->GetColour() << G4endl; + + // save colour a spin-3 for anti-quark + G4int firstPartonColour = aParton->GetColour(); + G4double firstPartonSpinZ = aParton->GetSpinZ(); + + SumPx += aParton->Get4Momentum().px(); + SumPy += aParton->Get4Momentum().py(); + Color.push_back(aParton); + + // create anti-quark + aParton = BuildSeaQuark(true, aPDGCode); + aParton->SetSpinZ(-firstPartonSpinZ); + aParton->SetColour(-firstPartonColour); + + // G4cout << "Parton 2: " + // << " PDGcode: " << -aPDGCode + // << " - Name: " << aParton->GetDefinition()->GetParticleName() + // << " - Type: " << aParton->GetDefinition()->GetParticleType() + // << " - Spin-3: " << aParton->GetSpinZ() + // << " - Colour: " << aParton->GetColour() << G4endl; + // G4cerr << "------------" << G4endl; + + SumPx += aParton->Get4Momentum().px(); + SumPy += aParton->Get4Momentum().py(); + AntiColor.push_back(aParton); + } + // Valence quark + G4QParton* pColorParton = 0; + G4QParton* pAntiColorParton = 0; + GetValenceQuarkFlavors(pColorParton, pAntiColorParton); + G4int ColorEncoding = pColorParton->GetPDGCode(); + G4int AntiColorEncoding = pAntiColorParton->GetPDGCode(); + + pts = sigmaPt*std::sqrt(-std::log(G4UniformRand())); + phi = twopi*G4UniformRand(); + G4double Px = pts*std::cos(phi); + G4double Py = pts*std::sin(phi); + SumPx += Px; + SumPy += Py; + + if (ColorEncoding < 0) // use particle definition + { + G4LorentzVector ColorMom(-SumPx, -SumPy, 0, 0); + pColorParton->Set4Momentum(ColorMom); + G4LorentzVector AntiColorMom(Px, Py, 0, 0); + pAntiColorParton->Set4Momentum(AntiColorMom); + } + else + { + G4LorentzVector ColorMom(Px, Py, 0, 0); + pColorParton->Set4Momentum(ColorMom); + G4LorentzVector AntiColorMom(-SumPx, -SumPy, 0, 0); + pAntiColorParton->Set4Momentum(AntiColorMom); + } + Color.push_back(pColorParton); + AntiColor.push_back(pAntiColorParton); + + // Sample X + G4int nAttempt = 0; + G4double SumX = 0; + G4double aBeta = beta; + G4double ColorX, AntiColorX; + G4double HPWtest = 0; + G4int aPDG=std::abs(GetPDGCode()); + if (aPDG ==211 || aPDG == 22 || aPDG == 111) aBeta = 1.; + else if (aPDG == 321) aBeta = 0.; + else G4cout<<"-Warning-G4QHadron::SplitUp: wrong PDG="< 1.|| 1. - ColorX <= Xmin); + Color.back()->SetX(SumX = ColorX);// this is the valenz quark. + for(G4int aPair = 0; aPair < nSeaPair; aPair++) + { + NumberOfUnsampledSeaQuarks--; + ColorX = SampleX(Xmin, NumberOfUnsampledSeaQuarks, 2*nSeaPair, aBeta); + Color[aPair]->SetX(ColorX); + SumX += ColorX; + NumberOfUnsampledSeaQuarks--; + AntiColorX = SampleX(Xmin, NumberOfUnsampledSeaQuarks, 2*nSeaPair, aBeta); + AntiColor[aPair]->SetX(AntiColorX); // the 'sea' partons + SumX += AntiColorX; + if (1. - SumX <= Xmin) break; + } + } while (1. - SumX <= Xmin); + (*(AntiColor.end()-1))->SetX(1. - SumX); // the di-quark takes the rest, then go to momentum + // and here is the bug ;-) @@@@@@@@@@@@@ + if(getenv("debug_QGSMSplitableHadron") )G4cout << "particle energy at split = "<SetPosition(GetPosition()); + G4ThreeVector aPtVector = GaussianPt(sigmaPt, DBL_MAX); + G4LorentzVector a4Momentum(aPtVector, 0); + result->Set4Momentum(a4Momentum); + return result; +} // End of BuildSeaQuark + +G4double G4QHadron::SampleX(G4double anXmin, G4int nSea, G4int totalSea, G4double aBeta) +{ + G4double result; + G4double x1, x2; + G4double ymax = 0; + for(G4int ii=0; ii<100; ii++) // @@ 100 is hardwired ? M.K. + { + G4double y = std::pow(1./G4double(ii), alpha); + y*=std::pow(std::pow(1.-anXmin-totalSea*anXmin,alpha+1)-std::pow(anXmin,alpha+1),nSea); + y*=std::pow(1.-anXmin-totalSea*anXmin, aBeta+1) - std::pow(anXmin, aBeta+1); + if(y>ymax) ymax = y; + } + G4double y; + G4double xMax=1.-(totalSea+1.)*anXmin; + if(anXmin > xMax) + { + G4cerr<<"***G4QHadron::SampleX: anXmin="< xMax="<y); + result = x1; + return result; +} // End of SampleX +void G4QHadron::GetValenceQuarkFlavors(G4QParton* &Parton1, G4QParton* &Parton2) +{ + // Note! convention aEnd = q or (qq)bar and bEnd = qbar or qq. + G4int aEnd=0; + G4int bEnd=0; + G4int HadronEncoding = GetPDGCode(); + if(!(GetBaryonNumber())) SplitMeson(HadronEncoding,&aEnd,&bEnd); + else SplitBaryon(HadronEncoding, &aEnd, &bEnd); + + Parton1 = new G4QParton(aEnd); + Parton1->SetPosition(GetPosition()); + +// G4cerr << "G4QGSMSplitableHadron::GetValenceQuarkFlavors()" << G4endl; +// G4cerr << "Parton 1: " +// << " PDGcode: " << aEnd +// << " - Name: " << Parton1->GetDefinition()->GetParticleName() +// << " - Type: " << Parton1->GetDefinition()->GetParticleType() +// << " - Spin-3: " << Parton1->GetSpinZ() +// << " - Colour: " << Parton1->GetColour() << G4endl; + + Parton2 = new G4QParton(bEnd); + Parton2->SetPosition(GetPosition()); + +// G4cerr << "Parton 2: " +// << " PDGcode: " << bEnd +// << " - Name: " << Parton2->GetDefinition()->GetParticleName() +// << " - Type: " << Parton2->GetDefinition()->GetParticleType() +// << " - Spin-3: " << Parton2->GetSpinZ() +// << " - Colour: " << Parton2->GetColour() << G4endl; +// G4cerr << "... now checking for color and spin conservation - yielding: " << G4endl; + + // colour of parton 1 choosen at random by G4QParton(aEnd) + // colour of parton 2 is the opposite: + + Parton2->SetColour(-(Parton1->GetColour())); + + // isospin-3 of both partons is handled by G4Parton(PDGCode) + + // spin-3 of parton 1 and 2 choosen at random by G4QParton(aEnd) + // spin-3 of parton 2 may be constrained by spin of original particle: + + if ( std::abs(Parton1->GetSpinZ() + Parton2->GetSpinZ()) > GetSpin()) + { + Parton2->SetSpinZ(-(Parton2->GetSpinZ())); + } + +// G4cerr << "Parton 2: " +// << " PDGcode: " << bEnd +// << " - Name: " << Parton2->GetDefinition()->GetParticleName() +// << " - Type: " << Parton2->GetDefinition()->GetParticleType() +// << " - Spin-3: " << Parton2->GetSpinZ() +// << " - Colour: " << Parton2->GetColour() << G4endl; +// G4cerr << "------------" << G4endl; + +} // End of GetValenceQuarkFlavors + +G4bool G4QHadron::SplitMeson(G4int PDGcode, G4int* aEnd, G4int* bEnd) +{ + G4bool result = true; + G4int absPDGcode = std::abs(PDGcode); + if (absPDGcode >= 1000) return false; + if(absPDGcode == 22) + { + G4int it=1; + if(G4UniformRand()<.5) it++; + *aEnd = it; + *bEnd = -it; + } + else + { + G4int heavy = absPDGcode/100; + G4int light = (absPDGcode%100)/10; + G4int anti = 1 - 2*(std::max(heavy, light)%2); + if (PDGcode < 0 ) anti = -anti; + heavy *= anti; + light *= -anti; + if ( anti < 0) G4SwapObj(&heavy, &light); + *aEnd = heavy; + *bEnd = light; + } + return result; +} + +G4bool G4QHadron::SplitBaryon(G4int PDGcode, G4int* quark, G4int* diQuark) +{ + static const G4double r2=.5; + static const G4double r3=1./3.; + static const G4double d3=2./3.; + static const G4double r4=1./4.; + static const G4double r6=1./6.; + static const G4double r12=1./12.; + // + std::pair qdq[5]; + G4double prb[5]; + G4int nc=0; + G4int aPDGcode=std::abs(PDGcode); + if(aPDGcode==2212) // ==> Proton + { + nc=3; + qdq[0]=make_pair(2203, 1); prb[0]=r3; // uu_1, d + qdq[1]=make_pair(2103, 2); prb[1]=r6; // ud_1, u + qdq[2]=make_pair(2101, 2); prb[2]=r2; // ud_0, u + } + else if(aPDGcode==2112) // ==> Neutron + { + nc=3; + qdq[0]=make_pair(2103, 1); prb[0]=r6; // ud_1, d + qdq[1]=make_pair(2101, 1); prb[1]=r2; // ud_0, d + qdq[2]=make_pair(1103, 2); prb[2]=r3; // dd_1, u + } + else if(aPDGcode%10<3) // ==> Spin 1/2 Hyperons + { + if(aPDGcode==3122) + { + nc=5; + qdq[0]=make_pair(2103, 3); prb[0]=r3; // ud_1, s + qdq[1]=make_pair(3203, 1); prb[1]=r4; // su_1, d + qdq[2]=make_pair(3201, 1); prb[2]=r12; // su_0, d + qdq[3]=make_pair(3103, 2); prb[3]=r4; // sd_1, u + qdq[4]=make_pair(3101, 2); prb[4]=r12; // sd_0, u + } + else if(aPDGcode==3222) + { + nc=3; + qdq[0]=make_pair(2203, 3); prb[0]=r3; + qdq[1]=make_pair(3203, 2); prb[1]=r6; + qdq[2]=make_pair(3201, 2); prb[2]=r2; + } + else if(aPDGcode==3212) + { + nc=5; + qdq[0]=make_pair(2103, 3); prb[0]=r3; + qdq[1]=make_pair(3203, 1); prb[1]=r12; + qdq[2]=make_pair(3201, 1); prb[2]=r4; + qdq[3]=make_pair(3103, 2); prb[3]=r12; + qdq[4]=make_pair(3101, 2); prb[4]=r4; + } + else if(aPDGcode==3112) + { + nc=3; + qdq[0]=make_pair(1103, 3); prb[0]=r3; + qdq[1]=make_pair(3103, 1); prb[1]=r6; + qdq[2]=make_pair(3101, 1); prb[2]=r2; + } + else if(aPDGcode==3312) + { + nc=3; + qdq[0]=make_pair(3103, 3); prb[0]=r6; + qdq[1]=make_pair(3101, 3); prb[1]=r2; + qdq[2]=make_pair(3303, 1); prb[2]=r3; + } + else if(aPDGcode==3322) + { + nc=3; + qdq[0]=make_pair(3203, 3); prb[0]=r6; + qdq[1]=make_pair(3201, 3); prb[1]=r2; + qdq[2]=make_pair(3303, 2); prb[2]=r3; + } + else return false; + } + else // ==> Spin 3/2 Baryons (Spin>3/2 is ERROR) + { + if(aPDGcode==3334) + { + nc=1; + qdq[0]=make_pair(3303, 3); prb[0]=1.; + } + else if(aPDGcode==2224) + { + nc=1; + qdq[0]=make_pair(2203, 2); prb[0]=1.; + } + else if(aPDGcode==2214) + { + nc=2; + qdq[0]=make_pair(2203, 1); prb[0]=r3; + qdq[1]=make_pair(2103, 2); prb[1]=d3; + } + else if(aPDGcode==2114) + { + nc=2; + qdq[0]=make_pair(2103, 1); prb[0]=d3; + qdq[1]=make_pair(2103, 2); prb[1]=r3; + } + else if(aPDGcode==1114) + { + nc=1; + qdq[0]=make_pair(1103, 1); prb[0]=1.; + } + else if(aPDGcode==3224) + { + nc=2; + qdq[0]=make_pair(2203, 3); prb[0]=r3; + qdq[1]=make_pair(3203, 2); prb[1]=d3; + } + else if(aPDGcode==3214) + { + nc=3; + qdq[0]=make_pair(2103, 3); prb[0]=r3; + qdq[1]=make_pair(3203, 1); prb[1]=r3; + qdq[2]=make_pair(3103, 2); prb[2]=r3; + } + else if(aPDGcode==3114) + { + nc=2; + qdq[0]=make_pair(1103, 3); prb[0]=r3; + qdq[1]=make_pair(3103, 1); prb[1]=d3; + } + else if(aPDGcode==3324) + { + nc=2; + qdq[0]=make_pair(3203, 3); prb[0]=r3; + qdq[1]=make_pair(3303, 2); prb[1]=d3; + } + else if(aPDGcode==3314) + { + nc=2; + qdq[0]=make_pair(3103, 3); prb[0]=d3; + qdq[1]=make_pair(3303, 1); prb[1]=r3; + } + else return false; + } + G4double random = G4UniformRand(); + G4double sum = 0.; + for(G4int i=0; irandom) + { + if(PDGcode>0) + { + *diQuark= qdq[i].first; + *quark = qdq[i].second; + } + else + { + *diQuark= -qdq[i].first; + *quark = -qdq[i].second; + } + break; + } + } + return true; +} + +G4ThreeVector G4QHadron::GaussianPt(G4double widthSquare, G4double maxPtSquare) +{ + G4double R=0.; + while((R = -widthSquare*std::log(G4UniformRand())) > maxPtSquare); + R = std::sqrt(R); + G4double phi = twopi*G4UniformRand(); + return G4ThreeVector(R*std::cos(phi), R*std::sin(phi), 0.); +} diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QHadronBuilder.cc b/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QHadronBuilder.cc new file mode 100644 index 0000000000..999103a0e8 --- /dev/null +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QHadronBuilder.cc @@ -0,0 +1,217 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4QHadronBuilder.cc,v 1.2 2006/12/12 11:02:22 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ----------------------------------------------------------------------------- +// GEANT4 class implementation file +// +// Created by Mikhail Kosov, October 2006 +// Simple algorithm making a hadron out of two partons +// For comparison mirror member functions are taken from G4 class: +// G4HadronBuilder +// ----------------------------------------------------------------------------- + +//#define debug + +#include "G4QHadronBuilder.hh" +#include "Randomize.hh" +#include "G4ParticleTable.hh" + +G4QHadronBuilder::G4QHadronBuilder() +{ + mesonSpinMix = 0.5; // probability to create vector meson + baryonSpinMix= 0.5; // probability to create 3/2 baryon + scalarMesonMixings.resize(6); + scalarMesonMixings[0] = 0.5; + scalarMesonMixings[1] = 0.25; + scalarMesonMixings[2] = 0.5; + scalarMesonMixings[3] = 0.25; + scalarMesonMixings[4] = 1.0; + scalarMesonMixings[5] = 0.5; + vectorMesonMixings.resize(6); + vectorMesonMixings[0] = 0.5; + vectorMesonMixings[1] = 0.0; + vectorMesonMixings[2] = 0.5; + vectorMesonMixings[3] = 0.0; + vectorMesonMixings[4] = 1.0; + vectorMesonMixings[5] = 1.0; +} + +G4QHadron* G4QHadronBuilder::Build(G4QParton* black, G4QParton* white) +{ + if(black->GetParticleSubType()=="di_quark" || white->GetParticleSubType()=="di_quark") + { + // Baryon consists of quark and at least one di-quark + Spin spin = (G4UniformRand() < baryonSpinMix) ? SpinHalf : SpinThreeHalf; + return Baryon(black,white,spin); + } + else + { + // Meson consists of quark and abnti-quark + Spin spin = (G4UniformRand() < mesonSpinMix) ? SpinZero : SpinOne; + return Meson(black,white,spin); + } +} + +G4QHadron* G4QHadronBuilder::BuildLowSpin(G4QParton* black, G4QParton* white) +{ + if(black->GetParticleSubType() == "quark" && white->GetParticleSubType() == "quark") + return Meson(black,white, SpinZero); + // returns a SpinThreeHalf Baryon if all quarks are the same + else return Baryon(black,white, SpinHalf); +} + +G4QHadron* G4QHadronBuilder::BuildHighSpin(G4QParton* black, G4QParton* white) +{ + if(black->GetParticleSubType() == "quark" && white->GetParticleSubType() == "quark") + return Meson(black,white, SpinOne); + else return Baryon(black,white,SpinThreeHalf); +} + +G4QHadron* G4QHadronBuilder::Meson(G4QParton* black, G4QParton* white, Spin theSpin) +{ +#ifdef debug + // Verify Input Charge + G4double charge = black->GetPDGCharge() + white->GetPDGCharge(); + if (std::abs(charge)>2 || std::abs(3*(charge-G4int(charge*1.001))) > perCent) + G4cerr<<"-Warning-G4QHadronBuilder::Meson: invalid TotalCharge="<GetPDGCharge() + white->GetPDGCharge() - Meson->GetCharge()) > .001) + G4cout<<"-Warning-G4QHadronBuilder::Meson:wrongCharge, q1="<GetPDGCharge()<<"(" + <->GetParticleName()<<"), q2="<GetPDGCharge()<<"(" + <->GetParticleName()<<"), qM="<GetCharge()<<"/"<GetPDGCharge() + white->GetPDGCharge(); + if(std::abs(charge) > 2 || std::abs(3*(charge - G4int(charge*1.001))) > perCent ) + G4cerr<<"-Warning-G4QHadronBuilder::Baryon: invalid TotalCharge="< kfle && kfle > kflf) + { + // Spin J=1/2 and all three quarks different + // Two states exist: (uds -> lambda or sigma0) + // - lambda: s(ud)0 s : 3122; ie. reverse the two lighter quarks + // - sigma0: s(ud)1 s : 3212 + if(diquarkSpin == 1 ) + { + if ( kfla == kfld) kfll = 1; // heaviest quark in diquark + else kfll = G4int(0.25 + G4UniformRand()); + } + if(diquarkSpin==3 && kfla!=kfld) kfll = G4int(0.75+G4UniformRand()); + } + G4int PDGEncoding=0; + if (kfll == 1) PDGEncoding = 1000 * kfld + 100 * kflf + 10 * kfle + theSpin; + else PDGEncoding = 1000 * kfld + 100 * kfle + 10 * kflf + theSpin; + if (id1 < 0) PDGEncoding = -PDGEncoding; + G4QHadron* Baryon= new G4QHadron(PDGEncoding); +#ifdef debug + if(std::abs(black->GetPDGCharge() + white->GetPDGCharge()- Baryon->GetCharge()) > .001) + G4cout<<"-Warning-G4QHadronBuilder::Baryon:wrongCharge,dq="<GetPDGCharge()<<"(" + <->GetParticleName()<<"), q="<GetPDGCharge()<<"(" + <->GetParticleName()<<"), qB="<GetCharge()<<"/"<push_back(make_pair(8,1.)); natEl.push_back(a7); vector >*a8=new vector >; - a8->push_back(make_pair(6,.9976)); - a8->push_back(make_pair(8,.9996)); - a8->push_back(make_pair(7,1.)); + a8->push_back(make_pair(8,.9976)); + a8->push_back(make_pair(10,.9996)); + a8->push_back(make_pair(9,1.)); natEl.push_back(a8); vector >*a9=new vector >; a9->push_back(make_pair(10,1.)); @@ -966,9 +967,9 @@ G4int G4QIsotope::RandomizeNeutrons(G4int i) { if(i==8) // O { - if (rnd<.9976) N=6; - else if(rnd<.9996) N=8; - else N=7; + if (rnd<.9976) N=8; + else if(rnd<.9996) N=10; + else N=9; } else // Ne (10) { @@ -1855,7 +1856,7 @@ G4double G4QIsotope::GetMeanCrossSection(G4int Z, G4int index) { vector*>* ab; vector*>* cs; -#ifdef debug +#ifdef ppdebug G4cout<<"G4QIsotope::GetMeanCrossSection is called"< Natural Abundancies for Isotopes of the Element { +#ifdef ppdebug + G4cout<<"G4QIsotope::GetMeanCrossSection: Nat Abundance, Z="< UserDefinedAbundancies for Isotopes of theElement { +#ifdef ppdebug + G4cout<<"G4QIsotope::GetMeanCrossSection: Art Abund, Z="<second; } G4int nis=ab->size(); - G4double last=0.; + //G4double last=0.; if(!nis) { G4cerr<<"--Worning--G4QIsotope::GetMeanCS:(-3) Empty Z="<second; - G4double abunda=cur-last; - last=cur; - sum+=abunda * (*cs)[j]->second; + //G4double abunda=cur-last; + //last=cur; +#ifdef ppdebug + G4cout<<"G4QIsot::GetMeanCS:j="<second<second; + sum+=cur * (*cs)[j]->second; } return sum; } diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QNucleus.cc b/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QNucleus.cc index 6a64f1c8b3..9630964460 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QNucleus.cc +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QNucleus.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4QNucleus.cc,v 1.54 2006/06/29 20:07:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4QNucleus.cc,v 1.61 2006/11/27 10:44:54 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QNucleus ---------------- // by Mikhail Kossov, Sept 1999. @@ -39,12 +39,23 @@ //#define ppdebug #include "G4QNucleus.hh" +#include "Randomize.hh" +#include #include +#include //#include using namespace std; -G4QNucleus::G4QNucleus() : G4QHadron(),Z(0),N(0),S(0),maxClust(0) +// Static parameters definition +G4double G4QNucleus::freeNuc=0.1; // probability to find quasiFreeBaryon on Surface +G4double G4QNucleus::freeDib=.05; // probability to find quasiFreeDiBaryon on Surface +G4double G4QNucleus::clustProb=4.; // clusterization probability in dense region +G4double G4QNucleus::mediRatio=1.; // relative vacuum hadronization probability +G4double G4QNucleus::nucleonDistance=.8*fermi; // Distance between nucleons (0.8 fm) + +G4QNucleus::G4QNucleus() : G4QHadron(),Z(0),N(0),S(0),maxClust(0),currentNucleon(-1) { + Tb = new std::vector; probVect[0]=mediRatio; #ifdef pardeb G4cout<<"G4QNucleus::Constructor:(1) N="<(cZ); G4int cN=static_cast(cA-cZ); @@ -3105,3 +3149,504 @@ G4double G4QNucleus::CoulBarPenProb(const G4double& CB, const G4double& E, if(sR>=1.) return 0.; return 1.-sR*sR*sR; } // End of "CoulBarPenProb" + +// Randomize 2D-vector b = 2D impact parameter +pair G4QNucleus::ChooseImpactXandY(G4double maxImpact) +{ + G4double x=1.; + G4double y=1.; + do + { + x = G4UniformRand(); + x = x+x-1.; + y = G4UniformRand(); + y = y+y-1.; + } + while(x*x+y*y > 1.); + theImpactParameter.first = x*maxImpact; + theImpactParameter.second = y*maxImpact; + return theImpactParameter; +} // End of "ChooseImpactXandY" + +// Initializes 3D Nucleons in the nucleus using random sequence +void G4QNucleus::ChooseNucleons() +{ + G4int protons =0; + G4int nucleons=0; + G4int myA=GetA(); + while (nucleons < myA) + { + if(protonsnucDist2; // If false break the LOOP (M.K.) + if(!freeplace) break; // M.K. acceleration + } + // protons must at least have binding energy of CoulombBarrier (@@ ? M.K.), so + // assuming Fermi Energy corresponds to Potential, we must place protons such + // that the Fermi Energy > CoulombBarrier (?) + if(freeplace && theNucleons[i]->GetPDGCode() == 2212) // Free Space Protons + { + G4double pFermi=GetFermiMomentum(GetDensity(aPos)); + G4double eFermi= sqrt(pFermi*pFermi+mProt2)-mProt; // Kinetic energy + if (eFermi <= CoulombBarrier()) freeplace=false; + } + if(freeplace) + { + places[i]=aPos; + ++i; + } + } + } + ReduceSum(places,placeM); // Reduce center of mass shift (equalWeight) + for(i=0; iSetPosition(places[i]); + delete [] places; + delete [] placeM; +#ifdef debug + G4cout << "G4QNucleus::ChoosePositions: A="<0 && maxRelDens <= 1. ) ? sqrt(-radius*log(maxRelDens)) : DBL_MAX; + // Wood-Saxon density distribution + return (maxRelDens>0 && maxRelDens <= 1. ) ? + (radius + deld*log((1.-maxRelDens+exp(-radius/deld))/maxRelDens)) : DBL_MAX; +} // End of GetRadius + +// Calculates Densyty/rho0 +G4double G4QNucleus::GetRelativeDensity(const G4ThreeVector& aPosition) +{ + static const G4double deld=0.545*fermi; // Surface thickness + if(radius==0.) InitDensity(); + if(GetA()<17)return exp(-aPosition.mag2()/radius);// Gaussian distribution + // Wood-Saxon density distribution + return 1./(1.+exp((aPosition.mag()-radius)/deld)); +} // End of GetRelativeDensity + +// Calculates modul of Fermy Momentum depending on density +G4double G4QNucleus::GetFermiMomentum(G4double density) +{ + static const G4double third=1./3.; + static const G4double constofpmax=hbarc*pow(3.*pi2,third); + return constofpmax * pow(density*GetA(),third); +} // End of GetFermiMomentum + +// Calculates 3D Fermy Momentuma for 3D nucleons in 3D nucleus +void G4QNucleus::ChooseFermiMomenta() +{ + static const G4double mProt= G4QPDGCode(2212).GetMass(); // Mass of proton + static const G4double mProt2= mProt*mProt; + static const G4double mNeut= G4QPDGCode(2112).GetMass(); // Mass of neutron + G4int i=0; + G4double density=0; + G4int myA=GetA(); + G4ThreeVector* momentum = new G4ThreeVector[myA]; + G4double* fermiM = new G4double[myA]; + for(i=0; iGetPosition());// density around nucleon i + G4double ferm = GetFermiMomentum(density); // module of momentun for nucleon i + fermiM[i] = ferm; // module of momentun for nucleon i + G4ThreeVector mom=ferm*RandomUnitSphere(); // 3-vector for nucleon mpomentum + if(theNucleons[i]->GetPDGCode() == 2212) // the nucleon is proton + { + G4double eMax = sqrt(ferm*ferm+mProt2)-CoulombBarrier(); + if(eMax>mProt) + { + G4double pmax2= eMax*eMax - mProt2; + fermiM[i] = sqrt(pmax2); // modify proton momentum + while(mom.mag2() > pmax2) mom=Get3DFermiMomentum(density, fermiM[i]); + } + else + { + G4cerr<<"G4QNucleus: difficulty finding proton momentum -> mom=0"<GetPDGCode() == 2212) mN=mProt; + G4double energy = mN - BindingEnergy()/myA; + G4LorentzVector tempV(momentum[i],energy); + theNucleons[i]->Set4Momentum(tempV); + } + delete [] momentum; + delete [] fermiM; +} // End of ChooseFermiMomenta + +// Reduce momentum nonconservation (reenterable attempts +G4bool G4QNucleus::ReduceSum(G4ThreeVector* momentum, G4double* pFermiM) +{ + G4int myA=GetA(); + if(myA<2) // Can not reduce only one nucleon + { + G4cout<<"-W-G4QNucleus::ReduceSum: *Failed* A="<maxV) // Better maximum is found + { + maxV=pfi; // Find the maximum Fermi Momentum + maxI=i; // Index of maximum Fermi Momentum + } + } + minV*=0.01; // Value to estimate residual (@@par) + if(sum.mag()mT) + { + Tb->push_back(T); // Fill the thickness vector starting with b=0 + b+=db; // increment impact parameter + G4double E=B*std::exp(-D*b*b); // b-dependent factor + T=C*E/(1.+E); // T(b) in fm^-2 + } +} // End of "ActivateBThickness" + +// Randomize position inside 3D UnitRadius Sphere +G4ThreeVector G4QNucleus::RandomUnitSphere() +{ // ================== + G4double x=G4UniformRand(), y=G4UniformRand(), z=G4UniformRand(); + G4double r2= x*x+y*y+z*z; + while(r2>1.) + { + x = G4UniformRand(); y = G4UniformRand(); z = G4UniformRand(); + r2=x*x+y*y+z*z; + } + return G4ThreeVector(x, y, z); +} // End of RandomUnitSphere + +// Add Cluster +G4QNucleus G4QNucleus::operator+=(const G4QNucleus& rhs) +//==================================================== +{ + Z+=rhs.Z; + N+=rhs.N; + S+=rhs.S; + dZ+=rhs.dZ; + dN+=rhs.dN; + dS+=rhs.dS; + // Atributes of aHadron + G4int newPDG= GetPDGCode() + rhs.GetPDGCode() - 90000000; + SetQPDG (newPDG); + G4QContent newQC = GetQC() + rhs.GetQC(); + SetQC (newQC); + G4LorentzVector newLV = Get4Momentum() + rhs.Get4Momentum(); + Set4Momentum (newLV); + return *this; +} + +// Subtract Cluster +G4QNucleus G4QNucleus::operator-=(const G4QNucleus& rhs) +//====================================================== +{ + Z-=rhs.Z; + N-=rhs.N; + S-=rhs.S; + dZ-=rhs.dZ; + dN-=rhs.dN; + dS-=rhs.dS; + // Atributes of aHadron + G4int newPDG= GetPDGCode() - rhs.GetPDGCode() + 90000000; + SetQPDG (newPDG); + G4QContent newQC = GetQC() - rhs.GetQC(); + SetQC (newQC); + G4LorentzVector newLV = Get4Momentum() - rhs.Get4Momentum(); + Set4Momentum (newLV); + return *this; +} + +// Multiply Nucleus by integer value +G4QNucleus G4QNucleus::operator*=(const G4int& rhs) +//================================================= +{ + Z*=rhs; + N*=rhs; + S*=rhs; + dZ*=rhs; + dN*=rhs; + dS*=rhs; + // Atributes of aHadron + G4int newPDG= rhs*(GetPDGCode() - 90000000) + 90000000; + SetQPDG (newPDG); + G4QContent newQC = rhs*GetQC(); + SetQC (newQC); + G4LorentzVector newLV = rhs*Get4Momentum(); + Set4Momentum (newLV); + return *this; +} + +// Converts hadronic PDG Code to nuclear PDG Code +G4int G4QNucleus::HadrToNucPDG(G4int hPDG) +//======================================== +{ + G4int nPDG=hPDG; + if (hPDG==2212) nPDG=90001000; // p + else if(hPDG==2112) nPDG=90000001; // n + else if(hPDG==3122||hPDG==3212) nPDG=91000000; // Lambda + else if(hPDG== 211) nPDG=90000999; // pi+ + else if(hPDG==-211) nPDG=89999001; // pi- + else if(hPDG== 213) nPDG=89001000; // K0 (anti-strange) + else if(hPDG== 213) nPDG=89000001; // K+ (anti-strange) + else if(hPDG==-213) nPDG=90999000; // anti-K0 (strange) + else if(hPDG==-213) nPDG=90999999; // K- (strange) + else if(hPDG==1114) nPDG=90001999; // Delta- + else if(hPDG==2224) nPDG=89999002; // Delta++ + else if(hPDG==3112) nPDG=91000999; // Sigma- + else if(hPDG==3222) nPDG=90999001; // Sigma+ + else if(hPDG==3312) nPDG=91999999; // Ksi- + else if(hPDG==3322) nPDG=91999000; // Ksi0 + else if(hPDG==3334) nPDG=92998999; // Omega- + return nPDG; +} + +// Converts nuclear PDG Code to hadronic PDG Code +G4int G4QNucleus::NucToHadrPDG(G4int nPDG) +//======================================== +{ + G4int hPDG=nPDG; + if (nPDG==90001000) hPDG=2212; // p + else if(nPDG==90000001) hPDG=2112; // n + else if(nPDG==91000000) hPDG=3122; // Lambda + else if(nPDG==90000999) hPDG= 211; // pi+ + else if(nPDG==89999001) hPDG=-211; // pi- + else if(nPDG==89001000) hPDG= 213; // K0 (anti-strange) + else if(nPDG==89000001) hPDG= 213; // K+ (anti-strange) + else if(nPDG==90999000) hPDG=-213; // anti-K0 (strange) + else if(nPDG==90999999) hPDG=-213; // K- (strange) + else if(nPDG==90001999) hPDG=1114; // Delta- + else if(nPDG==89999002) hPDG=2224; // Delta++ + else if(nPDG==91000999) hPDG=3112; // Sigma- + else if(nPDG==90999001) hPDG=3222; // Sigma+ + else if(nPDG==91999999) hPDG=3312; // Ksi- + else if(nPDG==91999000) hPDG=3322; // Ksi0 + else if(nPDG==92998999) hPDG=3334; // Omega- + return hPDG; +} diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPDGCode.cc b/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPDGCode.cc index 8d69d04f7d..f7d2bd9514 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPDGCode.cc +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPDGCode.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4QPDGCode.cc,v 1.52 2006/06/29 20:07:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4QPDGCode.cc,v 1.53 2006/11/27 10:44:55 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QPDGCode ---------------- // by Mikhail Kossov, Sept 1999. @@ -89,9 +89,11 @@ G4QPDGCode::G4QPDGCode(G4QPDGCode* rhs) const G4QPDGCode& G4QPDGCode::operator=(const G4QPDGCode& rhs) { - thePDGCode =rhs.thePDGCode; - theQCode =rhs.theQCode; - + if(this != &rhs) // Beware of self assignment + { + thePDGCode =rhs.thePDGCode; + theQCode =rhs.theQCode; + } return *this; } diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPDGToG4Particle.cc b/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPDGToG4Particle.cc index 3665d951a9..b5a0bfad94 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPDGToG4Particle.cc +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPDGToG4Particle.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4QPDGToG4Particle.cc,v 1.5 2006/06/29 20:07:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QG4ToG4Particle singletone class ------------------ // by Mikhail Kossov, December 2003. diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QParentCluster.cc b/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QParentCluster.cc index b613b286b5..bec595d382 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QParentCluster.cc +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QParentCluster.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4QParentCluster.cc,v 1.24 2006/06/29 20:07:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4QParentCluster.cc,v 1.25 2006/11/27 10:44:55 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QParentCluster ---------------- // by Mikhail Kossov, Sept 1999. @@ -72,17 +72,19 @@ G4QParentCluster::G4QParentCluster(G4QParentCluster* rhs) const G4QParentCluster& G4QParentCluster::operator=(const G4QParentCluster& rhs) { - thePDGCode = rhs.thePDGCode; - theProbability = rhs.theProbability; - nQPart2 = rhs.nQPart2; - transQC = rhs.transQC; - lowLimit = rhs.lowLimit; - highLimit = rhs.highLimit; - theEnvBoundedMass = rhs.theEnvBoundedMass; - theEnvBindingEnergy = rhs.theEnvBindingEnergy; - theNucBoundedMass = rhs.theNucBoundedMass; - theNucBindingEnergy = rhs.theNucBindingEnergy; - + if(this != &rhs) // Beware of self assignment + { + thePDGCode = rhs.thePDGCode; + theProbability = rhs.theProbability; + nQPart2 = rhs.nQPart2; + transQC = rhs.transQC; + lowLimit = rhs.lowLimit; + highLimit = rhs.highLimit; + theEnvBoundedMass = rhs.theEnvBoundedMass; + theEnvBindingEnergy = rhs.theEnvBindingEnergy; + theNucBoundedMass = rhs.theNucBoundedMass; + theNucBindingEnergy = rhs.theNucBindingEnergy; + } return *this; } diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QParticle.cc b/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QParticle.cc index 60902df9a9..24e56e956a 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QParticle.cc +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QParticle.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4QParticle.cc,v 1.32 2006/06/29 20:07:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4QParticle.cc,v 1.33 2006/11/27 10:44:55 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QParticle ---------------- // by Mikhail Kossov, Sept 1999. @@ -103,17 +103,22 @@ G4QParticle::~G4QParticle() // Assignment operator const G4QParticle& G4QParticle::operator=(const G4QParticle &right) { - aQPDG = right.aQPDG; - //aDecay (Vector) - G4int nD = right.aDecay.size(); - if(nD) for(G4int id=0; idFindParticle(PDGencoding); + G4int aPDG=std::abs(PDGcode); + //___________quarks__ 2 possible codes for gluons _ Condition for di-quarks + if(!aPDG || (aPDG>3 && PDGcode!=9 && PDGcode!=21 && (aPDG>3303||aPDG<1103||aPDG%100>3)) + || theDefinition==0) + { + G4cerr<<"***G4QParton::Constructor: wrong quark/diquark PDG="<GetParticleType(); + if(name == "quarks") + { + if(PDGcode>0) theColour = RGB; + else theColour =-RGB; + } + // colour by random in (-1,-2,-3)=(Rbar,Gbar,Bbar)=(GB,RB,RG) for di-quarks and + // in (1,2,3)=(R,G,B)=(GB,RB,RG) for anti-di-quarks: + else if(name == "diquarks") + { + if(PDGcode>0) theColour =-RGB; + else theColour = RGB; + } + // colour by random in (-11,-12,-13,-21,...,-33)=(RRbar,RGbar,RBbar,...,BBbar) for gluons + else if(name == "gluons") theColour = -(RGB*10 + (G4int)(3*G4UniformRand())+1); + else + { + G4cerr<<"***G4QParton::Constructor: not quark/diquark/gluon = " + <GetParticleType()<GetPDGIsospin3(); + // isospin-z choosen at random from PDG-encoded isospin for gluons (should be zero): + else + { + G4int thisPDGiIsospin=theDefinition->GetPDGiIsospin(); + if (thisPDGiIsospin == 0) theIsoSpinZ = 0; + //@@ ? M.K. + else theIsoSpinZ = ((G4int)((thisPDGiIsospin+1)*G4UniformRand()))-thisPDGiIsospin*0.5; + } + // + // spin-z choosen at random from PDG-encoded spin: + // + G4int thisPDGiSpin=theDefinition->GetPDGiSpin(); + if(thisPDGiSpin == 0) theSpinZ = 0; + else theSpinZ = (G4int)((thisPDGiSpin+1)*G4UniformRand())-thisPDGiSpin*0.5;; +} + +G4QParton::G4QParton(const G4QParton &right) +{ + PDGencoding = right.PDGencoding; + theMomentum = right.theMomentum; + thePosition = right.thePosition; + theX = right.theX; + theDefinition = right.theDefinition; + theColour = right.theColour; + theIsoSpinZ = right.theIsoSpinZ; + theSpinZ = right.theSpinZ; +} + +G4QParton::G4QParton(const G4QParton* right) +{ + PDGencoding = right->PDGencoding; + theMomentum = right->theMomentum; + thePosition = right->thePosition; + theX = right->theX; + theDefinition = right->theDefinition; + theColour = right->theColour; + theIsoSpinZ = right->theIsoSpinZ; + theSpinZ = right->theSpinZ; +} + +const G4QParton& G4QParton::operator=(const G4QParton &right) +{ + if(this != &right) // Beware of self assignment + { + PDGencoding=right.GetPDGCode(); + theMomentum=right.Get4Momentum(); + thePosition=right.GetPosition(); + theX = right.theX; + theDefinition = right.theDefinition; + theColour = right.theColour; + theIsoSpinZ = right.theIsoSpinZ; + theSpinZ = right.theSpinZ; + } + return *this; +} + +G4QParton::~G4QParton() +{ +// cout << "G4QParton::~G4QParton(): this = "<1) for(G4int i=2; i<= nPom; i++) f*=i; // Calculate factorial + G4double e=Eikonal(s,imp2); e+=e; // Doubled Eikonal + return std::exp(-e)*std::pow(e,nPom)/pomeron_C/f; +} + +void G4QPomeron::InitForNucleon() +{ + // pomeron_S= 3.0*GeV*GeV; + pomeron_S= 2.7*GeV*GeV; + // pomeron_Gamma= 2.16/GeV/GeV; // ? M.K. + // pomeron_Gamma= 3.96/GeV/GeV; // ? M.K. + pomeron_Gamma = (2.6+3.96)/GeV/GeV; // ? M.K. + pomeron_C = 1.4; + pomeron_Rsquare = 3.56/GeV/GeV; + /////pomeron_Alpha= 0.9808; // This is very strange M.K. (was in GHAD QGSM) + // If pomeron_Gamma_Hard!=0 to fit total pp XS use pomeron_Gamma_Soft=2.35/GeV/GeV ? M.K. +} + +void G4QPomeron::InitForPion() +{ + pomeron_S = 1.5*GeV*GeV; + //pomeron_Gamma = 1.46/GeV/GeV; // ? M.K. + pomeron_Gamma = 2.17/GeV/GeV; // ? M.K. + pomeron_C = 1.6; + pomeron_Rsquare = 2.36/GeV/GeV; +} + +void G4QPomeron::InitForKaon() +{ + pomeron_S = 2.3*GeV*GeV; + //pomeron_Gamma = 1.31/GeV/GeV; // ? M.K. + pomeron_Gamma = 1.92/GeV/GeV; // ? M.K. + pomeron_C = 1.8; + pomeron_Rsquare = 1.96/GeV/GeV; +} + +void G4QPomeron::InitForGamma() +{ + pomeron_S = 1.7*GeV*GeV; + //pomeron_Gamma = 1.42/GeV/GeV; // ? M.K. + pomeron_Gamma = 2.07/GeV/GeV; // ? M.K. + pomeron_C = 1.7; + pomeron_Rsquare = 2.16/GeV/GeV; +} + +G4double G4QPomeron::Expand(G4double z) +{ + + G4double sum=1.; + G4double current=1.; + for(G4int j=2; j<21; j++) + { + current *= -z*(j-1)/j/j; + sum+=current; + } + return sum; +} + + + + + + + + + + + diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QSplitter.cc b/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QSplitter.cc index b88c65095f..b59f45a090 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QSplitter.cc +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QSplitter.cc @@ -27,8 +27,8 @@ //34567890123456789012345678901234567890123456789012345678901234567890123456789012345678901 // // -// $Id: G4QSplitter.cc,v 1.3 2006/06/29 20:07:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4QSplitter.cc,v 1.6 2006/11/27 10:44:55 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QSplitter ---------------- // by Mikhail Kossov, August 2005. @@ -134,7 +134,7 @@ G4QSplitter::G4QSplitter(G4QHadron projHadron, const G4bool projEnvFlag, G4LorentzVector pq4Mom(0.,0.,0.,0.); // Prototype of LV of quark of progectile G4double rPMass=0.; // Prototype of the residProjMass (Meson case) G4bool FreeFraF=false; // Prototype of the free exchange Flag - if(G4UniformRand()2) // ---> Baryon case (clusters are not implem.) { @@ -569,29 +569,34 @@ G4QSplitter::G4QSplitter(const G4QSplitter &right) const G4QSplitter& G4QSplitter::operator=(const G4QSplitter &right) {// ======================================================================== - // theQuasmons (Vector) - G4int nQ = right.theQuasmons.size(); - if(nQ) for(G4int iq=0; iqGetQC()<Get4Momentum()<GetQC()<Get4Momentum()< +// Static parameters definition +G4double G4QString::MassCut=350.*MeV; // minimum mass cut for the string +G4double G4QString::ClusterMass=150.*MeV; // minimum cluster mass for fragmentation +G4double G4QString::SigmaQT=0.5*GeV; // quarkTransverseMomentum distribution parameter +G4double G4QString::DiquarkSuppress=0.1; // is Diquark suppression parameter +G4double G4QString::DiquarkBreakProb=0.1; // is Diquark breaking probability +G4double G4QString::SmoothParam=0.9; // QGS model parameter +G4double G4QString::StrangeSuppress=0.435;// Strangeness suppression (u:d:s=1:1:0.3 ?M.K.) +G4double G4QString::widthOfPtSquare=-0.72*GeV*GeV; // pt -width2 forStringExcitation +G4int G4QString::StringLoopInterrupt=999; // String fragmentation LOOP limit +G4int G4QString::ClusterLoopInterrupt=500;// Cluster fragmentation LOOP limit + +G4QString::G4QString() : theDirection(0),thePosition(G4ThreeVector(0.,0.,0.)), + hadronizer(new G4QHadronBuilder){} + +G4QString::G4QString(G4QParton* Color, G4QParton* AntiColor, G4int Direction) : + hadronizer(new G4QHadronBuilder) +{ + ExciteString(Color, AntiColor, Direction); +} + +G4QString::G4QString(G4QParton* QCol,G4QParton* Gluon,G4QParton* QAntiCol,G4int Direction): + theDirection(Direction),thePosition(QCol->GetPosition()),hadronizer(new G4QHadronBuilder) +{ + thePartons.push_back(QCol); + thePartons.push_back(Gluon); + thePartons.push_back(QAntiCol); +} + +G4QString::G4QString(const G4QString &right) : theDirection(right.GetDirection()), +thePosition(right.GetPosition()), hadronizer(new G4QHadronBuilder){} + +G4QString::~G4QString() + {if(thePartons.size())std::for_each(thePartons.begin(),thePartons.end(),DeleteQParton());} + +G4LorentzVector G4QString::Get4Momentum() const +{ + G4LorentzVector momentum(0.,0.,0.,0.); + for(unsigned i=0; iGet4Momentum(); + return momentum; +} + +void G4QString::LorentzRotate(const G4LorentzRotation & rotation) +{ + for(unsigned i=0; iSet4Momentum(rotation*thePartons[i]->Get4Momentum()); +} + +void G4QString::InsertParton(G4QParton* aParton, const G4QParton* addafter) +{ + G4QPartonVector::iterator insert_index; // Begin by default (? M.K.) + + if(addafter != NULL) + { + insert_index=std::find(thePartons.begin(), thePartons.end(), addafter); + if (insert_index == thePartons.end()) // No object addafter in thePartons + { + G4cerr<<"***G4QString::InsertParton: Address Parton is not found"<Set4Momentum(toCms*thePartons[i]->Get4Momentum()); + return toCms; +} + +G4LorentzRotation G4QString::TransformToAlignedCms() +{ + G4LorentzVector momentum=Get4Momentum(); + G4LorentzRotation toAlignedCms(-1*momentum.boostVector()); + momentum= toAlignedCms* thePartons[0]->Get4Momentum(); + toAlignedCms.rotateZ(-1*momentum.phi()); + toAlignedCms.rotateY(-1*momentum.theta()); + for(unsigned index=0; indexGet4Momentum(); + thePartons[index]->Set4Momentum(momentum); + } + return toAlignedCms; +} + +void G4QString::Boost(G4ThreeVector& Velocity) +{ + for(unsigned cParton=0; cPartonGet4Momentum(); + Mom.boost(Velocity); + thePartons[cParton]->Set4Momentum(Mom); + } +} + +G4QParton* G4QString::GetColorParton(void) const +{ + G4QParton* start = *(thePartons.begin()); + G4QParton* end = *(thePartons.end()-1); + G4int Encoding = start->GetPDGCode(); + if (Encoding<-1000 || (Encoding < 1000 && Encoding > 0)) return start; + return end; +} + +G4QParton* G4QString::GetAntiColorParton(void) const +{ + G4QParton* start = *(thePartons.begin()); + G4QParton* end = *(thePartons.end()-1); + G4int Encoding = start->GetPDGCode(); + if (Encoding < -1000 || (Encoding < 1000 && Encoding > 0)) return end; + return start; +} + +// Fill parameters +void G4QString::SetParameters(G4double mCut,G4double clustM, G4double sigQT,G4double DQSup, + G4double DQBU, G4double smPar, G4double SSup, G4double SigPt, G4int SLmax, G4int CLmax) +{// ============================================================================= + MassCut = mCut; // minimum mass cut for the string + ClusterMass = clustM; // minimum cluster mass for the fragmentation + SigmaQT = sigQT; // quark transverse momentum distribution parameter + DiquarkSuppress = DQSup; // is Diquark suppression parameter + DiquarkBreakProb= DQBU; // is Diquark breaking probability + SmoothParam = smPar; // QGS model parameter + StrangeSuppress = SSup; // Strangeness suppression parameter + widthOfPtSquare = -2*SigPt*SigPt; // width^2 of pt for string excitation + StringLoopInterrupt = SLmax; // String fragmentation LOOP limit + ClusterLoopInterrupt= CLmax; // Cluster fragmentation LOOP limit +} + +// Pt distribution @@ one can use 1/(1+A*Pt^2)^B +G4ThreeVector G4QString::GaussianPt(G4double widthSquare, G4double maxPtSquare) const +{ + G4double pt2; do{pt2=widthSquare*std::log(G4UniformRand());} while (pt2>maxPtSquare); + pt2=std::sqrt(pt2); + G4double phi=G4UniformRand()*twopi; + return G4ThreeVector(pt2*std::cos(phi),pt2*std::sin(phi),0.); +} // End of GaussianPt + +// Diffractively excite the string +void G4QString::DiffString(G4QHadron* hadron, G4bool isProjectile) +{ + hadron->SplitUp(); + G4QParton* start = hadron->GetNextParton(); + if( start==NULL) + { + G4cerr<<"***G4QString::DiffString: No start parton found, nothing is done"<GetNextParton(); + if( end==NULL) + { + G4cerr<<"***G4QString::DiffString: No end parton found, nothing is done"<GetPosition()); + // momenta of string ends + G4double ptSquared= hadron->Get4Momentum().perp2(); + G4double hmins=hadron->Get4Momentum().minus(); + G4double hplus=hadron->Get4Momentum().plus(); + G4double transMassSquared=hplus*hmins; + G4double maxMomentum = std::sqrt(transMassSquared) - std::sqrt(ptSquared); + G4double maxAvailMomentumSquared = maxMomentum * maxMomentum; + G4ThreeVector pt=GaussianPt(widthOfPtSquare,maxAvailMomentumSquared); + G4LorentzVector Pstart(G4LorentzVector(pt,0.)); + G4LorentzVector Pend(hadron->Get4Momentum().px(), hadron->Get4Momentum().py(), 0.); + Pend-=Pstart; + G4double tm1=hmins+(Pend.perp2()-Pstart.perp2())/hplus; + G4double tm2=std::sqrt( std::max(0., tm1*tm1-4*Pend.perp2()*hmins/hplus ) ); + G4int Sign= isProjectile ? TARGET : PROJECTILE; + G4double endMinus = 0.5 * (tm1 + Sign*tm2); + G4double startMinus= hmins - endMinus; + G4double startPlus = Pstart.perp2() / startMinus; + G4double endPlus = hplus - startPlus; + Pstart.setPz(0.5*(startPlus - startMinus)); + Pstart.setE (0.5*(startPlus + startMinus)); + Pend.setPz (0.5*(endPlus - endMinus)); + Pend.setE (0.5*(endPlus + endMinus)); + start->Set4Momentum(Pstart); + end->Set4Momentum(Pend); +#ifdef debug + G4cout<<"G4QString::DiffString: StartQ="<GetPDGCode()<Get4Momentum()<<"(" + <Get4Momentum().mag()<<"), EndQ="<GetPDGCode()<Get4Momentum() + <<"("<Get4Momentum().mag()<<"), sumOfEnds="<yf); + } + else // Di-quarks (@@ Crazy codes are not checked) + { + if (absCode==3101||absCode==3103||absCode==3201||absCode==3203) d2=alft-ala-ala+arho; + else if(absCode==1103||absCode==2101||absCode==2203||absCode==2103) d2=alft-an-an+arho; + else d2=alft-aksi-aksi+arho; + do + { + z = zmin + G4UniformRand()*(zmax - zmin); + yf = std::pow(1.-z, d2); + } + while (G4UniformRand()>yf); + } + return z; +} // End of GetQGSMLightConeZ + +// Diffractively excite the string +G4QHadronVector* G4QString::FragmentString(G4bool QL) +{ + // Can no longer modify Parameters for Fragmentation. + // PastInitPhase=true; // Now static + + // check if string has enough mass to fragment... + G4QHadronVector* LeftVector=LightFragmentationTest(); + if(LeftVector) return LeftVector; + + LeftVector = new G4QHadronVector; + G4QHadronVector* RightVector = new G4QHadronVector; + + // this should work but it's only a semi deep copy. + // %GF G4ExcitedString theStringInCMS(theString); + G4QString* theStringInCMS=CPExcited(); // must be deleted + G4LorentzRotation toCms=theStringInCMS->TransformToAlignedCms(); + G4bool success=false; + G4bool inner_sucess=true; + G4int attempt=0; + while (!success && attempt++size()) + { + std::for_each(LeftVector->begin(), LeftVector->end(), DeleteQHadron()); + LeftVector->clear(); + } + if(RightVector->size()) + { + std::for_each(RightVector->begin(), RightVector->end(), DeleteQHadron()); + RightVector->clear(); + } + inner_sucess=true; // set false on failure.. + while (!StopFragmentation()) + { // Split current string into hadron + new string + G4QString* newString=0; // used as output from SplitUp... + G4QHadron* Hadron=Splitup(QL); + if(Hadron && IsFragmentable()) + { + if(currentString->GetDecayDirection()>0) LeftVector->push_back(Hadron); + else RightVector->push_back(Hadron); + delete currentString; + currentString=newString; + } + else + { + // abandon ... start from the beginning + if (newString) delete newString; + if (Hadron) delete Hadron; + inner_sucess=false; + break; + } + } + // Split current string into 2 final Hadrons + if( inner_sucess && SplitLast(currentString, LeftVector, RightVector) ) success=true; + delete currentString; + } + delete theStringInCMS; + if (!success) + { + if(RightVector->size()) + { + std::for_each(RightVector->begin(), RightVector->end(), DeleteQHadron()); + RightVector->clear(); + } + delete RightVector; + if(LeftVector->size()) + { + std::for_each(LeftVector->begin(), LeftVector->end(), DeleteQHadron()); + LeftVector->clear(); + } + return LeftVector; + } + // Join Left and Right Vectors into LeftVector in correct order. + while(!RightVector->empty()) + { + LeftVector->push_back(RightVector->back()); + RightVector->erase(RightVector->end()-1); + } + delete RightVector; + CalculateHadronTimePosition(Get4Momentum().mag(), LeftVector); + G4LorentzRotation toObserverFrame(toCms.inverse()); + for(unsigned C1 = 0; C1 < LeftVector->size(); C1++) + { + G4QHadron* Hadron = (*LeftVector)[C1]; + G4LorentzVector Momentum = Hadron->Get4Momentum(); + Momentum = toObserverFrame*Momentum; + Hadron->Set4Momentum(Momentum); + G4LorentzVector Coordinate(Hadron->GetPosition(), Hadron->GetFormationTime()); + Momentum = toObserverFrame*Coordinate; + Hadron->SetFormationTime(Momentum.e()); + Hadron->SetPosition(GetPosition()+Momentum.vect()); + } + return LeftVector; +} // End of FragmentLundString + +// Creates a string, using only the end-partons of the string +G4QString* G4QString::CPExcited() +{ + G4QParton* Left = new G4QParton(GetLeftParton()); + G4QParton* Right= new G4QParton(GetRightParton()); + return new G4QString(Left,Right,GetDirection()); +} // End of CPExcited + +// Simple decay of the string +G4QHadronVector* G4QString::LightFragmentationTest() +{ + static const G4double MassCut = 0.35*GeV; + // Check string decay threshold + + G4QHadronVector* result=0; // return 0 when string exceeds the mass cut + + G4QHadronPair hadrons((G4QHadron*)0, (G4QHadron*)0); // pair of hadrons + if(sqr(FragmentationMass(0,&hadrons)+MassCut)GetMass2()) ); + result->push_back(new G4QHadron(hadrons.first, 0, GetPosition(), Mom)); + } + else + { + //... string was qq--qqbar type: Build two stable hadrons, + G4LorentzVector Mom1, Mom2; + Sample4Momentum(&Mom1, hadrons.first->GetMass(), &Mom2, hadrons.second->GetMass(), + Get4Momentum().mag()); + result->push_back(new G4QHadron(hadrons.first, 0, GetPosition(), Mom1)); + result->push_back(new G4QHadron(hadrons.second,0, GetPosition(), Mom2)); + G4ThreeVector Velocity = Get4Momentum().boostVector(); + G4int L=result->size(); if(L) for(G4int i=0; iBoost(Velocity); + } + return result; +} // End of LightFragmentationTest + +// Calculate Fragmentation Mass (if pdefs # 0, returns two hadrons) +G4double G4QString::FragmentationMass(G4QHcreate build, G4QHadronPair* pdefs) +{ + G4double mass; + // Example how to use an interface to different member functions + if(build==0) build=&G4QHadronBuilder::BuildLowSpin; // @@ Build S Hadrons? + G4QHadron* Hadron1 = 0; // @@ Not initialized + G4QHadron* Hadron2 = 0; + if(!FourQuarkString() ) + { + // spin 0 meson or spin 1/2 barion will be built + Hadron1 = (hadronizer->*build)(GetLeftParton(), GetRightParton()); + mass = Hadron1->GetMass(); + } + else + { + // string is qq--qqbar: Build two stable hadrons, with extra uubar or ddbar quark pair + G4int iflc = (G4UniformRand() < 0.5)? 1 : 2; + if (GetLeftParton()->GetPDGCode() < 0) iflc = -iflc; + //... theSpin = 4; spin 3/2 baryons will be built + Hadron1 = (hadronizer->*build)(GetLeftParton(),CreateParton(iflc)); + Hadron2 = (hadronizer->*build)(GetRightParton(),CreateParton(-iflc)); + mass = Hadron1->GetMass() + Hadron2->GetMass(); + } + if(pdefs) // need to return hadrons as well.... + { + pdefs->first = Hadron1; + pdefs->second = Hadron2; + } + return mass; +} // End of FragmentationMass + + // Checks that the string is qq-(qq)bar string +G4bool G4QString::FourQuarkString() const +{ + return GetLeftParton()->GetParticleSubType() == "di_quark" + && GetRightParton()->GetParticleSubType()== "di_quark"; +} // End of FourQuarkString + +void G4QString::CalculateHadronTimePosition(G4double StringMass, G4QHadronVector* Hadrons) +{ + // `yo-yo` formation time + static const G4double kappa = 1.0 * GeV/fermi; + static const G4double dkappa = kappa+kappa; + for(unsigned c1 = 0; c1 < Hadrons->size(); c1++) + { + G4double SumPz = 0; + G4double SumE = 0; + for(unsigned c2 = 0; c2 < c1; c2++) + { + G4LorentzVector hc2M=(*Hadrons)[c2]->Get4Momentum(); + SumPz += hc2M.pz(); + SumE += hc2M.e(); + } + G4QHadron* hc1=(*Hadrons)[c1]; + G4LorentzVector hc1M=hc1->Get4Momentum(); + G4double HadronE = hc1M.e(); + G4double HadronPz= hc1M.pz(); + hc1->SetFormationTime((StringMass-SumPz-SumPz+HadronE-HadronPz)/dkappa); + hc1->SetPosition(G4ThreeVector(0,0,(StringMass-SumE-SumE-HadronE+HadronPz)/dkappa)); + } +} // End of CalculateHadronTimePosition + +void G4QString::SetLeftPartonStable() +{ + theStableParton=GetLeftParton(); + theDecayParton=GetRightParton(); + decaying=Right; +} + +void G4QString::SetRightPartonStable() +{ + theStableParton=GetRightParton(); + theDecayParton=GetLeftParton(); + decaying=Left; +} + +G4int G4QString::GetDecayDirection() const +{ + if (decaying == Left ) return +1; + else if (decaying == Right) return -1; + else + { + G4cerr<<"***G4QString::GetDecayDirection: wrong DecayDirection="<Set4Momentum(*HadronMomentum); + UpdateString(newStringEnd, HadronMomentum); + delete HadronMomentum; + } + return Hadron; +} // End of Splitup + +void G4QString::UpdateString(G4QParton* decay, const G4LorentzVector* mom) +{ + decaying=None; + if(decaying == Left) + { + G4QParton* theFirst = thePartons[0]; + delete theFirst; + theFirst = decay; + Ptleft -= mom->vect(); + Ptleft.setZ(0.); + } + else if (decaying == Right) + { + G4QParton* theLast = thePartons[thePartons.size()-1]; + delete theLast; + theLast = decay; + Ptright -= mom->vect(); + Ptright.setZ(0.); + } + else + { + G4cerr<<"***G4QString::UpdateString: wrong oldDecay="<e() + mom->pz(); + Pminus -= mom->e() - mom->pz(); +} // End of UpdateString + +// QL=true for QGSM and QL=false for Lund fragmentation +G4LorentzVector* G4QString::SplitEandP(G4QHadron* pHadron, G4bool QL) +{ + G4double HadronMass = pHadron->GetMass(); + // calculate and assign hadron transverse momentum component HadronPx andHadronPy + G4ThreeVector HadronPt = SampleQuarkPt() + DecayPt(); + HadronPt.setZ(0.); + //... sample z to define hadron longitudinal momentum and energy + //... but first check the available phase space + G4double DecayQuarkMass2 = sqr(GetDecayParton()->GetMass()); // Mass of quark? M.K. + G4double HadronMass2T = HadronMass*HadronMass + HadronPt.mag2(); + if (DecayQuarkMass2 + HadronMass2T >= SmoothParam*Mass2() ) return 0; // restart! + //... then compute allowed z region z_min <= z <= z_max + G4double zMin = HadronMass2T/Mass2(); + G4double zMax = 1. - DecayQuarkMass2/Mass2(); + if (zMin >= zMax) return 0; // have to start all over! + G4double z=0; + if(QL) z = GetQGSMLightConeZ(zMin, zMax, GetDecayParton()->GetPDGCode(), pHadron, + HadronPt.x(), HadronPt.y()); + else z = GetLundLightConeZ(zMin, zMax, GetDecayParton()->GetPDGCode(), pHadron, + HadronPt.x(), HadronPt.y()); + //... now compute hadron longitudinal momentum and energy + // longitudinal hadron momentum component HadronPz + G4double zl= z*LightConeDecay(); + G4double HadronE = (zl + HadronMass2T/zl)/2; + HadronPt.setZ( GetDecayDirection() * (zl - HadronE) ); + G4LorentzVector* a4Momentum= new G4LorentzVector(HadronPt,HadronE); + + return a4Momentum; +} + +G4ThreeVector G4QString::SampleQuarkPt() +{ + G4double Pt = SigmaQT * std::sqrt( -std::log(G4UniformRand())); + G4double phi = twopi*G4UniformRand(); + return G4ThreeVector(Pt * std::cos(phi),Pt * std::sin(phi),0); +} + +void G4QString::Sample4Momentum(G4LorentzVector* Mom, G4double Mass, + G4LorentzVector* AntiMom, G4double AntiMass, G4double InitialMass) +{ + G4double m2 = Mass*Mass; + G4double am2= AntiMass*AntiMass; + G4double dub=InitialMass*InitialMass - m2 - am2; + G4double r_val = dub - 4*m2*am2; + G4double Pabs = (r_val > 0.) ? std::sqrt(r_val)/(InitialMass*InitialMass) : 0; + //... sample unit vector + G4double r = G4UniformRand(); // @@ G4RandomDirection() + G4double pz = 1. - r - r; // cos(theta) + G4double st = std::sqrt(1. - pz * pz) * Pabs; + G4double phi= twopi*G4UniformRand(); + G4double px = st*std::cos(phi); + G4double py = st*std::sin(phi); + pz *= Pabs; + G4double p2=Pabs*Pabs; + Mom->setPx(px); Mom->setPy(py); Mom->setPz(pz); + Mom->setE(std::sqrt(p2 + Mass*Mass)); + AntiMom->setPx(-px); AntiMom->setPy(-py); AntiMom->setPz(-pz); + AntiMom->setE (std::sqrt(Pabs*Pabs + AntiMass*AntiMass)); +} // End of Sample4Momentum + +G4bool G4QString::SplitLast(G4QString* string, G4QHadronVector* LeftVector, + G4QHadronVector* RightVector) +{ + //... perform last cluster decay + G4ThreeVector ClusterVel =string->Get4Momentum().boostVector(); + G4double ResidualMass =string->Mass(); + G4double ClusterMassCut = ClusterMass; + G4int cClusterInterrupt = 0; + G4QHadron* LeftHadron; + G4QHadron* RightHadron; + do + { + if(cClusterInterrupt++ >= ClusterLoopInterrupt) return false; + G4QParton* quark = 0; + string->SetLeftPartonStable(); // to query quark contents.. + if(string->DecayIsQuark() && string->StableIsQuark()) // There're quarks on clusterEnds + LeftHadron= QuarkSplitup(string->GetLeftParton(), quark); + else + { + //... there is a Diquark on cluster ends + G4int IsParticle; + if(string->StableIsQuark())IsParticle=(string->GetLeftParton()->GetPDGCode()>0)?-1:1; + else IsParticle=(string->GetLeftParton()->GetPDGCode()>0)?1:-1; + G4QPartonPair QuarkPair = CreatePartonPair(IsParticle,false); // no diquarks wanted + quark = QuarkPair.GetParton2(); + LeftHadron=hadronizer->Build(QuarkPair.GetParton1(), string->GetLeftParton()); + } + RightHadron = hadronizer->Build(string->GetRightParton(), quark); + //... repeat procedure, if mass of cluster is too low to produce hadrons + //... ClusterMassCut = 0.15*GeV model parameter + if ( quark->GetParticleSubType()== "quark" ) ClusterMassCut = 0.; + else ClusterMassCut = ClusterMass; + } while(ResidualMass <= LeftHadron->GetMass() + RightHadron->GetMass() + ClusterMassCut); + //... compute hadron momenta and energies + G4LorentzVector LeftMom, RightMom; + G4ThreeVector Pos; + Sample4Momentum(&LeftMom,LeftHadron->GetMass(),&RightMom,RightHadron->GetMass(), + ResidualMass); + LeftMom.boost(ClusterVel); + RightMom.boost(ClusterVel); + LeftVector->push_back(new G4QHadron(LeftHadron, 0, Pos, LeftMom)); + RightVector->push_back(new G4QHadron(RightHadron, 0, Pos, RightMom)); + + return true; +} // End of SplitLast + +G4QHadron* G4QString::QuarkSplitup(G4QParton* decay, G4QParton *&created) +{ + G4int IsParticle=(decay->GetPDGCode()>0) ? -1 : +1; // if we have a quark, we need antiquark (or diquark) + G4QPartonPair QuarkPair = CreatePartonPair(IsParticle); + created = QuarkPair.GetParton2(); + return hadronizer->Build(QuarkPair.GetParton1(), decay); +} // End of QuarkSplitup + +// +G4QHadron* G4QString::DiQuarkSplitup(G4QParton* decay, G4QParton* &created) +{ + //... can Diquark break or not? + if (G4UniformRand() < DiquarkBreakProb ) + { + //... Diquark break + G4int stableQuarkEncoding = decay->GetPDGCode()/1000; + G4int decayQuarkEncoding = (decay->GetPDGCode()/100)%10; + if (G4UniformRand() < 0.5) + { + G4int Swap = stableQuarkEncoding; + stableQuarkEncoding = decayQuarkEncoding; + decayQuarkEncoding = Swap; + } + G4int IsParticle=(decayQuarkEncoding>0) ? -1 : +1; + // if we have a quark, we need antiquark) + G4QPartonPair QuarkPair = CreatePartonPair(IsParticle,false); // no diquarks wanted + //... Build new Diquark + G4int QuarkEncoding=QuarkPair.GetParton2()->GetPDGCode(); + G4int i10 = std::max(std::abs(QuarkEncoding), std::abs(stableQuarkEncoding)); + G4int i20 = std::min(std::abs(QuarkEncoding), std::abs(stableQuarkEncoding)); + G4int spin = (i10 != i20 && G4UniformRand() <= 0.5)? 1 : 3; + G4int NewDecayEncoding = -1*IsParticle*(i10 * 1000 + i20 * 100 + spin); + created = CreateParton(NewDecayEncoding); + G4QParton* decayQuark=CreateParton(decayQuarkEncoding); + return hadronizer->Build(QuarkPair.GetParton1(), decayQuark); + } + else + { + //... Diquark does not break + G4int IsParticle=(decay->GetPDGCode()>0) ? +1 : -1; + // if we have a diquark, we need quark) + G4QPartonPair QuarkPair = CreatePartonPair(IsParticle,false); // no diquarks wanted + created = QuarkPair.GetParton2(); + return hadronizer->Build(QuarkPair.GetParton1(), decay); + } +} // End of DiQuarkSplitup + +G4QPartonPair G4QString::CreatePartonPair(G4int NeedParticle, G4bool AllowDiquarks) +{ + // NeedParticle = {+1 for Particle, -1 for AntiParticle} + if(AllowDiquarks && G4UniformRand() < DiquarkSuppress) + { + // Create a Diquark - AntiDiquark pair , first in pair is anti to IsParticle + G4int q1 = SampleQuarkFlavor(); + G4int q2 = SampleQuarkFlavor(); + G4int spin = (q1 != q2 && G4UniformRand() <= 0.5)? 1 : 3; + // Convention: quark with higher PDG number is first + G4int PDGcode = (std::max(q1,q2) * 1000 + std::min(q1,q2) * 100 + spin) * NeedParticle; + return G4QPartonPair(CreateParton(-PDGcode),CreateParton(PDGcode)); + } + else + { + // Create a Quark - AntiQuark pair, first in pair IsParticle + G4int PDGcode=SampleQuarkFlavor()*NeedParticle; + return G4QPartonPair(CreateParton(PDGcode),CreateParton(-PDGcode)); + } +} // End of CreatePartonPair diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4Quasmon.cc b/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4Quasmon.cc index 34407cfbb5..f22c4d5cbd 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4Quasmon.cc +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4Quasmon.cc @@ -27,8 +27,8 @@ //34567890123456789012345678901234567890123456789012345678901234567890123456789012345678901 // // -// $Id: G4Quasmon.cc,v 1.87 2006/06/29 20:07:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Quasmon.cc,v 1.90 2006/11/27 10:44:55 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4Quasmon ---------------- // by Mikhail Kossov, July 1999. @@ -178,32 +178,40 @@ void G4Quasmon::SetEtaSup(G4double etaetap) {EtaEtaprime=etaetap;} const G4Quasmon& G4Quasmon::operator=(const G4Quasmon& right) { //========================================================= - q4Mom = right.q4Mom; - valQ = right.valQ; - //theEnvironment = right.theEnvironment; - status = right.status; - //theQHadrons (Vector) - G4int nQH = right.theQHadrons.size(); - if(nQH) for(G4int ih=0; ihE=" - <MakeAntiHadron(); sHadr->MakeAntiHadron(); } - G4LorentzVector f4Mom = fHadr->Get4Momentum(); // Get First Hadron 4Mom (mass) - G4LorentzVector s4Mom = sHadr->Get4Momentum(); // Get Second Hadron 4Mom (mass) - if(!qH->DecayIn2(f4Mom,s4Mom)) // Error in DecayIn2 + G4LorentzVector f4Mom = fHadr->Get4Momentum(); // Get First Hadron 4Mom (mass) + G4LorentzVector s4Mom = sHadr->Get4Momentum(); // Get Second Hadron 4Mom (mass) + if(!qH->DecayIn2(f4Mom,s4Mom)) // Error in DecayIn2 { - delete fHadr; // Delete "new fHadr" - delete sHadr; // Delete "new sHadr" - G4cerr<<"---Warning---G4Q::DecayQHadron:in2,PDGC="<GetMass()<<")->"<push_back(qH); // Fill as it is (del.equiv.) + theFragments->push_back(qH); // Fill as it is (del.equiv.) return theFragments; } else { //qH->SetNFragments(2); - //theFragments.push_back(qH); // Fill with NFr=2 (del.equiv.) + //theFragments.push_back(qH); // Fill with NFr=2 (del.equiv.) // Instead - delete qH; // Delete it (without History) + delete qH; // Delete it (without History) // fHadr->Set4Momentum(f4Mom); // Put the randomized 4Mom to 1-st Hadron G4QHadronVector* theTmpQHV=DecayQHadron(fHadr); // Try to decay diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QuasmonString.cc b/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QuasmonString.cc index 8c23db3a4e..89593c903a 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QuasmonString.cc +++ b/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QuasmonString.cc @@ -27,8 +27,8 @@ //34567890123456789012345678901234567890123456789012345678901234567890123456789012345678901 // // -// $Id: G4QuasmonString.cc,v 1.6 2006/06/29 20:07:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4QuasmonString.cc,v 1.7 2006/11/27 10:44:55 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QuasmonString ---------------- // by Mikhail Kossov, August 2000. @@ -576,29 +576,34 @@ G4QuasmonString::G4QuasmonString(const G4QuasmonString &right) const G4QuasmonString& G4QuasmonString::operator=(const G4QuasmonString &right) {// ======================================================================== - // theQuasmons (Vector) - G4int nQ = right.theQuasmons.size(); - if(nQ) for(G4int iq=0; iqGetQC()<Get4Momentum()<GetQC()<Get4Momentum()<Quasmons->Hadrons scenario of the quark-gluon string fragmentation +// --> CHIPS is a SU(3) event generator, so it does not include reactions with the +// heavy (c,b,t), which can be simulated only by the SU(6) QUIPS (QUark Invariant +// Phase Space) model which is an expantion of the CHIPS.-December 2003.M.Kossov.- +// ------------------------------------------------------------------------------- +// Algorithms: the interactions in CHIPS are described by the quark exchange (QE) process. +// The first step is the low energy quark exchange. If as a result of the QE one or +// both secondary hadrons are below the pi0 threshold (roughly) they are pushed to the +// Ground State (GS) value(s). The excited (above the pi0 production threshold) hadronic +// state is considered as a Quasmon, which is filled in the G4QuasmonVector of the +// G4QuasmonString class. On the second step all G4Quasmons are decayed by the +// G4Quasmon class and fiill the G4QHadronVector output. If the exchange quark is too far +// in the rapidity space (a parameter of the G4QuasmonString class) from any of the quarks +// of the other hadron it creates a string with the nearest in the rapidity space quark. +// This string is converted into a Quasmon. This forces the coalescence of the residuals +// in the another Quasmon, while the possibility exist to create more residual Quasmons +// instead of one - one per each target-quark+projectile-antiquark(diquark) pair. This +// possibility is tuned by the Drell-Yan pair production process. If the target (or +// pojectile) are nuclei, then the Quasmons are created not only in vacuum, where they +// can be fragmented by the G4Quasmon class, but in nuclear matter of the residual target +// (or projectile). If the Quasmons are crated in nuclear matter, they are fragmented by +// the G4QEnvironment class with the subsequent Quark Exchange nuclear fragmentation. +// This is the planned scenario.- December 2004.Mikhail Kossov.- +// -------------------------------------------------------------------------------- +// **************************************************************************************** +// ********* This HEADER is temporary moved from the photolepton_hadron directory ********* +// ******* DO NOT MAKE ANY CHANGE! With time it'll move back to photolepton...(M.K.) ****** +// **************************************************************************************** + +#ifndef G4QAtomicElectronScattering_hh +#define G4QAtomicElectronScattering_hh + +// GEANT4 Headers +#include "globals.hh" +#include "G4ios.hh" +#include "Randomize.hh" +#include "G4VDiscreteProcess.hh" +#include "G4Track.hh" +#include "G4Step.hh" +#include "G4ParticleTypes.hh" +#include "G4VParticleChange.hh" +#include "G4ParticleDefinition.hh" +#include "G4DynamicParticle.hh" +#include "G4NucleiPropertiesTable.hh" +#include "G4ThreeVector.hh" +#include "G4LorentzVector.hh" + +// CHIPS Headers +#include "G4QEnvironment.hh" +#include "G4VQCrossSection.hh" +#include "G4QIsotope.hh" +#include "G4QElectronNuclearCrossSection.hh" +#include "G4QPhotonNuclearCrossSection.hh" +#include "G4QMuonNuclearCrossSection.hh" +#include "G4QTauNuclearCrossSection.hh" +#include "G4QuasmonString.hh" +#include "G4QPDGToG4Particle.hh" +// is included in G4QIsotope.hh +//#include + +class G4QAtomicElectronScattering : public G4VDiscreteProcess +{ +public: + + // Constructor + G4QAtomicElectronScattering(const G4String& processName ="CHIPSNuclearCollision"); + + // Destructor + ~G4QAtomicElectronScattering(); + + G4bool IsApplicable(const G4ParticleDefinition& particle); + + G4double GetMeanFreePath(const G4Track& aTrack, G4double previousStepSize, + G4ForceCondition* condition); + // It returns the MeanFreePath of the process for the current track : + // (energy, material) + // The previousStepSize and G4ForceCondition* are not used. + // This function overloads a virtual function of the base class. + // It is invoked by the ProcessManager of the Particle. + + + G4VParticleChange* PostStepDoIt(const G4Track& aTrack, const G4Step& aStep); + // It computes the final state of the process (at end of step), + // returned as a ParticleChange object. + // This function overloads a virtual function of the base class. + // It is invoked by the ProcessManager of the Particle. + + + G4LorentzVector GetEnegryMomentumConservation(); + + G4int GetNumberOfNeutronsInTarget(); + + // Static functions + static void SetManual(); + static void SetStandard(); + static void SetParameters(G4double temper=180., G4double ssin2g=.1, G4double etaetap=.3, + G4double fN=0., G4double fD=0., G4double cP=1., G4double mR=1., + G4int npCHIPSWorld=234, G4double solAn=.5, G4bool efFlag=false, + G4double piTh=141.4,G4double mpi2=20000.,G4double dinum=1880.); + +private: + + // Hide assignment operator as private + G4QAtomicElectronScattering& operator=(const G4QAtomicElectronScattering &right); + + // Copy constructor + G4QAtomicElectronScattering(const G4QAtomicElectronScattering&); + + // BODY + // Static Parameters + static G4bool manualFlag; // If false then standard parameters are used + static G4int nPartCWorld; // The#of particles for hadronization (limit of A of fragm.) + // -> Parameters of the G4Quasmon class: + static G4double Temperature; // Quasmon Temperature + static G4double SSin2Gluons; // Percent of ssbar sea in a constituen gluon + static G4double EtaEtaprime; // Part of eta-prime in all etas + // -> Parameters of the G4QNucleus class: + static G4double freeNuc; // probability of the quasi-free baryon on surface + static G4double freeDib; // probability of the quasi-free dibaryon on surface + static G4double clustProb; // clusterization probability in dense region + static G4double mediRatio; // relative vacuum hadronization probability + // -> Parameters of the G4QEnvironment class: + static G4bool EnergyFlux; // Flag for Energy Flux use instead of Multy Quasmon + static G4double SolidAngle; // Part of Solid Angle to capture secondaries(@@A-dep) + static G4double PiPrThresh; // Pion Production Threshold for gammas + static G4double M2ShiftVir; // Shift for M2=-Q2=m_pi^2 of the virtual gamma + static G4double DiNuclMass; // Double Nucleon Mass for virtual normalization + // + // Working parameters + G4VQCrossSection* theCS; + G4LorentzVector EnMomConservation; // Residual of Energy/Momentum Cons. + G4int nOfNeutrons; // #of neutrons in the target nucleus + + // Modifires for the reaction + G4double Time; // Time shift of the capture reaction + G4double EnergyDeposition; // Energy deposited in the reaction +}; +#endif + diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QCaptureAtRest.hh b/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QCaptureAtRest.hh index 74296f4e2b..8c57b6c31d 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QCaptureAtRest.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QCaptureAtRest.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4QCaptureAtRest.hh,v 1.2 2006/06/29 20:08:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QCaptureAtRest header ---------------- // by Mikhail Kossov, December 2003. diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QCollision.hh b/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QCollision.hh index 366fe44356..f10f3d6eb7 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QCollision.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QCollision.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4QCollision.hh,v 1.6 2006/06/29 20:08:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4QCollision.hh,v 1.7 2006/10/30 10:33:36 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QCollision header ---------------- // by Mikhail Kossov, December 2003. @@ -127,9 +127,15 @@ public: // This function overloads a virtual function of the base class. // It is invoked by the ProcessManager of the Particle. + // Fake void functions + void SetPhysicsTableBining(G4double, G4double, G4int) {;} + void BuildPhysicsTable(const G4ParticleDefinition&) {;} + void PrintInfoDefinition() {;} + // Internal Energy-Momentum Residual G4LorentzVector GetEnegryMomentumConservation(); + // Number of neutrons in the target nucleus (primary) G4int GetNumberOfNeutronsInTarget(); // Static functions --------------------------------------------------------------------- diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QElastic.hh b/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QElastic.hh index e5f9d27ad6..66401a38b3 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QElastic.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QElastic.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4QElastic.hh,v 1.2 2006/06/29 20:08:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------- G4QElastic header ---------------- // by Mikhail Kossov, December 2003. diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QElasticCrossSection.hh b/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QElasticCrossSection.hh index 2fbfa9c1cc..69b98caf83 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QElasticCrossSection.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QElasticCrossSection.hh @@ -24,12 +24,12 @@ // ******************************************************************** // // -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // GEANT4 physics class: G4QElasticCrossSection -- header file // M.V. Kossov, ITEP(Moscow), 24-OCT-01 -// The last update: M.V. Kossov, CERN/ITEP (Moscow) 25-Sept-03 +// The last update: M.V. Kossov, CERN/ITEP (Moscow) 15-Oct-2006 // #ifndef G4QElasticCrossSection_h @@ -61,10 +61,15 @@ public: static G4VQCrossSection* GetPointer(); // Gives a pointer to this singletone + // At present momentum (pMom) must be in GeV (@@ Units) + virtual G4double GetCrossSection(G4bool fCS, G4double pMom, G4int tgZ, G4int tgN, + G4int pPDG=0); + G4double CalculateCrossSection(G4bool CS, G4int F, G4int I, G4int pPDG, G4int Z, G4int N, G4double pP); - G4double GetExchangeT(G4int tZ, G4int tN, G4int pPDG); // Randomizes -t=Q2 + G4double GetExchangeT(G4int tZ, G4int tN, G4int pPDG); // Randomizes -t=Q2 (in IU=MeV^2) + G4double GetHMaxT(); // Currrent Max(-t=Q2)/2. (in IU=MeV^2) private: G4double GetPTables(G4double lpP, G4double lPm, G4int PDG, G4int tZ, G4int tN); // newLP @@ -82,15 +87,23 @@ private: // ---- Local (for particular pP, pPDG, tZ, tN) ----- static G4bool onlyCS; // flag to calculate only CS (not S1/B1,S2/B2,S3/B3) static G4double lastSIG; // Last calculated cross section - static G4double lastLP; // Last log(mom_of_the_incident_hadron) + static G4double lastLP; // Last log(mom_of_the_incident_hadron in GeV) static G4double lastTM; // Last t_maximum - static G4double theSS; // The Last squared slope of first difruction - static G4double theS1; // The Last mantissa of first difruction - static G4double theB1; // The Last slope of first difruction - static G4double theS2; // The Last mantissa of second difruction - static G4double theB2; // The Last slope of second difruction - static G4double theS3; // The Last mantissa of third difruction - static G4double theB3; // The Last slope of third difruction + static G4int lastN; // The last N of calculated nucleus + static G4int lastZ; // The last Z of calculated nucleus + static G4double lastP; // Last used in the cross section Momentum + static G4double lastTH; // Last value of the Momentum Threshold + static G4double lastCS; // Last value of the Cross Section + static G4int lastI; // The last position in the DAMDB + static G4double theSS; // The Last squared slope of first diffruction + static G4double theS1; // The Last mantissa of first diffruction + static G4double theB1; // The Last slope of first diffruction + static G4double theS2; // The Last mantissa of second diffruction + static G4double theB2; // The Last slope of second diffruction + static G4double theS3; // The Last mantissa of third diffruction + static G4double theB3; // The Last slope of third diffruction + static G4double theS4; // The Last mantissa of 4-th diffruction + static G4double theB4; // The Last slope of 4-th diffruction // ---- Global (AMBD of P-dependent tables for pPDG,tZ,tN) ----- static G4int lastPDG; // Last PDG code of the projectile static G4int lastTZ; // Last atomic number of the target @@ -105,5 +118,7 @@ private: static G4double* lastB2T; // E-dep of the slope of theSecond difruction static G4double* lastS3T; // E-dep of mantissa of the third difruction static G4double* lastB3T; // E-dep of the slope of the third difruction + static G4double* lastS4T; // E-dep of mantissa of the 4-th difruction + static G4double* lastB4T; // E-dep of the slope of the 4-th difruction }; #endif diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QElectronNuclearCrossSection.hh b/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QElectronNuclearCrossSection.hh index 6937645e75..a309b8a26d 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QElectronNuclearCrossSection.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QElectronNuclearCrossSection.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // GEANT4 physics class: G4QElectronNuclearCrossSection -- header file @@ -61,6 +61,10 @@ public: G4double ThresholdEnergy(G4int Z, G4int N, G4int PDG=11); + // At present momentum (pMom) must be in GeV (@@ Units) + virtual G4double GetCrossSection(G4bool fCS, G4double pMom, G4int tgZ, G4int tgN, + G4int pPDG=0); + G4double CalculateCrossSection(G4bool CS, G4int F, G4int I, G4int PDG, G4int Z, G4int N, G4double Momentum); @@ -93,6 +97,13 @@ private: static G4double* lastJ1; // Pointer to the last array of the J1 function static G4double* lastJ2; // Pointer to the last array of the J2 function static G4double* lastJ3; // Pointer to the last array of the J3 function + static G4int lastPDG; // The last projectile PDG + static G4int lastN; // The last N of calculated nucleus + static G4int lastZ; // The last Z of calculated nucleus + static G4double lastP; // Last used in the cross section Momentum + static G4double lastTH; // Last value of the Momentum Threshold + static G4double lastCS; // Last value of the Cross Section + static G4int lastI; // The last position in the DAMDB }; inline G4double G4QElectronNuclearCrossSection::DFun(G4double x)//PhotoNucCSParametrization diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QGluonString.hh b/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QGluonString.hh new file mode 100644 index 0000000000..746e73e2dd --- /dev/null +++ b/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QGluonString.hh @@ -0,0 +1,161 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4QGluonString.hh,v 1.1 2006/10/30 10:33:38 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ---------------- G4QGluonString header ---------------- +// by Mikhail Kossov, October 2006. +// Header of G4QGluonString (N,pi,K,aN,Hyperons,aHyp) of CHIPS Simulation Branch +// ------------------------------------------------------------------------------- +// -->> At present (17.10.2006) started only with proton-nuclear reactions <<-- +// ------------------------------------------------------------------------------- +// This is a QGS CHIPS class for the Hadron-Nuclear Inelastic Interaction Prosesses +// ------------------------------------------------------------------------------- +// This class follows the structure of the G4QCollision class and its content can be +// eventually moved to G4QCollision class. At present the alternative realisation of +// the hadronic inelastic process (G4QGluonString) is kept for comparison with other +// G4QCollision algorithms. It can be attached as an inelastic process to all hadrons +// -------------------------------------------------------------------------------- +// **************************************************************************************** +// ***** This HEADER is a property of the CHIPS hadronic package in Geant4 (M. Kosov) ***** +// *********** DO NOT MAKE ANY CHANGE without approval of Mikhail.Kossov@cern.ch ********** +// **************************************************************************************** + +#ifndef G4QGluonString_hh +#define G4QGluonString_hh + +// GEANT4 Headers +#include "globals.hh" +#include "G4ios.hh" +#include "Randomize.hh" +#include "G4VDiscreteProcess.hh" +#include "G4Track.hh" +#include "G4Step.hh" +#include "G4ParticleTypes.hh" +#include "G4VParticleChange.hh" +#include "G4ParticleDefinition.hh" +#include "G4DynamicParticle.hh" +#include "G4NucleiPropertiesTable.hh" +#include "G4ThreeVector.hh" +#include "G4LorentzVector.hh" + +// CHIPS Headers +#include "G4QEnvironment.hh" +#include "G4VQCrossSection.hh" +#include "G4QIsotope.hh" +#include "G4QProtonNuclearCrossSection.hh" +#include "G4QPDGToG4Particle.hh" +#include + +class G4QGluonString : public G4VDiscreteProcess +{ +public: + + // Constructor + G4QGluonString(const G4String& processName ="CHIPS_QGS_Inelastic"); + + // Destructor + ~G4QGluonString(); + + G4bool IsApplicable(const G4ParticleDefinition& particle); + + G4double GetMeanFreePath(const G4Track& aTrack, G4double previousStepSize, + G4ForceCondition* condition); + // It returns the MeanFreePath of the process for the current track : + // (energy, material) + // The previousStepSize and G4ForceCondition* are not used. + // This function overloads a virtual function of the base class. + // It is invoked by the ProcessManager of the Particle. + + G4VParticleChange* PostStepDoIt(const G4Track& aTrack, const G4Step& aStep); + // It computes the final state of the process (at end of step), + // returned as a ParticleChange object. + // This function overloads a virtual function of the base class. + // It is invoked by the ProcessManager of the Particle. + + // Fake void functions + void SetPhysicsTableBining(G4double, G4double, G4int) {;} + void BuildPhysicsTable(const G4ParticleDefinition&) {;} + void PrintInfoDefinition() {;} + + // Internal Energy-Momentum Residual + G4LorentzVector GetEnegryMomentumConservation(); + + // Number of neutrons in the target nucleus (primary) + G4int GetNumberOfNeutronsInTarget(); + + // Static functions --------------------------------------------------------------------- + static void SetManual(); + static void SetStandard(); + static void SetParameters(G4double temper=180., G4double ssin2g=.1, G4double etaetap=.3, + G4double fN=0., G4double fD=0., G4double cP=1., G4double mR=1., + G4int npCHIPSWorld=234, G4double solAn=.5, G4bool efFlag=false, + G4double piTh=141.4,G4double mpi2=20000.,G4double dinum=1880.); + //--- End of static member functions ---------------------------------------------------- + +private: + + // Hide assignment operator as private + G4QGluonString& operator=(const G4QGluonString &right); + + // Copy constructor + G4QGluonString(const G4QGluonString&); + + // BODY + // Static Parameters -------------------------------------------------------------------- + static G4bool manualFlag; // If false then standard parameters are used + static G4int nPartCWorld; // The#of particles for hadronization (limit of A of fragm.) + // -> Parameters of the G4Quasmon class: + static G4double Temperature; // Quasmon Temperature + static G4double SSin2Gluons; // Percent of ssbar sea in a constituen gluon + static G4double EtaEtaprime; // Part of eta-prime in all etas + // -> Parameters of the G4QNucleus class: + static G4double freeNuc; // probability of the quasi-free baryon on surface + static G4double freeDib; // probability of the quasi-free dibaryon on surface + static G4double clustProb; // clusterization probability in dense region + static G4double mediRatio; // relative vacuum hadronization probability + // -> Parameters of the G4QEnvironment class: + static G4bool EnergyFlux; // Flag for Energy Flux use instead of Multy Quasmon + static G4double SolidAngle; // Part of Solid Angle to capture secondaries(@@A-dep) + static G4double PiPrThresh; // Pion Production Threshold for gammas + static G4double M2ShiftVir; // Shift for M2=-Q2=m_pi^2 of the virtual gamma + static G4double DiNuclMass; // Double Nucleon Mass for virtual normalization + //--------------------------------- End of static parameters --------------------------- + // Working parameters + G4VQCrossSection* theCS; + G4LorentzVector EnMomConservation; // Residual of Energy/Momentum Cons. + G4int nOfNeutrons; // #of neutrons in the target nucleus + + // Modifires for the reaction + G4double Time; // Time shift of the capture reaction + G4double EnergyDeposition; // Energy deposited in the reaction + static std::vector ElementZ; // Z of the element(i) in theLastCalc + static std::vector ElProbInMat; // SumProbabilityElements in Material + static std::vector *> ElIsoN; // N of isotope(j) of Element(i) + static std::vector *> IsoProbInEl;// SumProbabIsotopes in Element i +}; +#endif + diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QMuonNuclearCrossSection.hh b/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QMuonNuclearCrossSection.hh index f132623398..fe4df4dd5e 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QMuonNuclearCrossSection.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QMuonNuclearCrossSection.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4QMuonNuclearCrossSection.hh,v 1.4 2006/06/29 20:08:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4QMuonNuclearCrossSection.hh,v 1.5 2006/12/01 10:57:46 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // GEANT4 physics class: G4QMuonNuclearCrossSection -- header file @@ -65,6 +65,10 @@ public: G4double ThresholdEnergy(G4int Z, G4int N, G4int PDG=13); + // At present momentum (pMom) must be in GeV (@@ Units) + virtual G4double GetCrossSection(G4bool fCS, G4double pMom, G4int tgZ, G4int tgN, + G4int pPDG=0); + G4double CalculateCrossSection(G4bool CS, G4int F, G4int I, G4int PDG, G4int Z, G4int N, G4double Momentum); @@ -97,6 +101,13 @@ private: static G4double* lastJ1; // Pointer to the last array of the J1 function static G4double* lastJ2; // Pointer to the last array of the J2 function static G4double* lastJ3; // Pointer to the last array of the J3 function + static G4int lastPDG; // The last projectile PDG + static G4int lastN; // The last N of calculated nucleus + static G4int lastZ; // The last Z of calculated nucleus + static G4double lastP; // Last used in the cross section Momentum + static G4double lastTH; // Last value of the Momentum Threshold + static G4double lastCS; // Last value of the Cross Section + static G4int lastI; // The last position in the DAMDB }; inline G4double G4QMuonNuclearCrossSection::DFun(G4double x)// Parametrization of PhotNucCS diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QNuMuNuclearCrossSection.hh b/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QNuMuNuclearCrossSection.hh index 87d1e2891b..3e679a2fa9 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QNuMuNuclearCrossSection.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QNuMuNuclearCrossSection.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4QNuMuNuclearCrossSection.hh,v 1.5 2006/06/29 20:08:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4QNuMuNuclearCrossSection.hh,v 1.6 2006/12/01 10:57:46 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // GEANT4 physics class: G4QNuMuNuclearCrossSection -- header file @@ -62,6 +62,10 @@ public: G4double ThresholdEnergy(G4int Z, G4int N, G4int PDG=14); + // At present momentum (pMom) must be in GeV (@@ Units) + virtual G4double GetCrossSection(G4bool fCS, G4double pMom, G4int tgZ, G4int tgN, + G4int pPDG=0); + G4double CalculateCrossSection(G4bool CS, G4int F, G4int I, G4int PDG, G4int Z, G4int N, G4double Momentum); @@ -94,6 +98,13 @@ private: static G4double* lastEN; // Pointer to the last array of the energy axis static G4double* lastTX; // Pointer to the last array of the total CS function static G4double* lastQE; // Pointer to the last array of the QE CS function + static G4int lastPDG; // The last projectile PDG + static G4int lastN; // The last N of calculated nucleus + static G4int lastZ; // The last Z of calculated nucleus + static G4double lastP; // Last used in the cross section Momentum + static G4double lastTH; // Last value of the Momentum Threshold + static G4double lastCS; // Last value of the Cross Section + static G4int lastI; // The last position in the DAMDB }; #endif diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QPhotonNuclearCrossSection.hh b/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QPhotonNuclearCrossSection.hh index 1ce716107b..d5bf318101 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QPhotonNuclearCrossSection.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QPhotonNuclearCrossSection.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // GEANT4 physics class: G4QPhotonNuclearCrossSection -- header file @@ -57,8 +57,12 @@ public: static G4VQCrossSection* GetPointer(); // Gives a pointer to this singletone - G4double CalculateCrossSection(G4bool CS, G4int F, G4int I, G4int PDG, G4int Z, - G4int N, G4double Momentum); + // At present momentum (pMom) must be in GeV (@@ Units) + virtual G4double GetCrossSection(G4bool fCS, G4double pMom, G4int tgZ, G4int tgN, + G4int pPDG=0); + + G4double CalculateCrossSection(G4bool CS, G4int F, G4int I, G4int PDG, G4int Z, G4int N, + G4double Momentum); G4double ThresholdEnergy(G4int Z, G4int N, G4int PDG=22); @@ -73,6 +77,13 @@ private: static G4double* lastHEN; // Pointer to the last array of HEn cross sections static G4double lastE; // Last used in the cross section Energy static G4double lastSP; // Last value of the ShadowingPomeron (A-dependent) + static G4int lastPDG; // The last projectile PDG + static G4int lastN; // The last N of calculated nucleus + static G4int lastZ; // The last Z of calculated nucleus + static G4double lastP; // Last used in the cross section Momentum + static G4double lastTH; // Last value of the Momentum Threshold + static G4double lastCS; // Last value of the Cross Section + static G4int lastI; // The last position in the DAMDB }; #endif diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QProtonNuclearCrossSection.hh b/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QProtonNuclearCrossSection.hh index 973435ff02..c5bb744e5b 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QProtonNuclearCrossSection.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QProtonNuclearCrossSection.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // GEANT4 physics class: G4QProtonNuclearCrossSection -- header file @@ -57,6 +57,10 @@ public: static G4VQCrossSection* GetPointer(); // Gives a pointer to this singletone + // At present momentum (pMom) must be in GeV (@@ Units) + virtual G4double GetCrossSection(G4bool fCS, G4double pMom, G4int tgZ, G4int tgN, + G4int pPDG=0); + G4double CalculateCrossSection(G4bool CS, G4int F, G4int I, G4int PDG, G4int Z, G4int N, G4double Momentum); @@ -70,6 +74,13 @@ private: static G4double* lastHEN; // Pointer to the last array of HighEnergy cross sections static G4double lastE; // Last used in the cross section Energy static G4double lastSP; // Last value of the ShadowingPomeron (A-dependent) + static G4int lastPDG; // The last projectile PDG + static G4int lastN; // The last N of calculated nucleus + static G4int lastZ; // The last Z of calculated nucleus + static G4double lastP; // Last used in the cross section Momentum + static G4double lastTH; // Last value of the Momentum Threshold + static G4double lastCS; // Last value of the Cross Section + static G4int lastI; // The last position in the DAMDB }; #endif diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QStringChipsParticleLevelInterface.hh b/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QStringChipsParticleLevelInterface.hh new file mode 100644 index 0000000000..addca2cfec --- /dev/null +++ b/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QStringChipsParticleLevelInterface.hh @@ -0,0 +1,57 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +#ifndef G4QStringChipsParticleLevelInterface_h +#define G4QStringChipsParticleLevelInterface_h + +#include "G4VIntraNuclearTransportModel.hh" +#include "G4ChiralInvariantPhaseSpace.hh" + +class G4QStringChipsParticleLevelInterface : public G4VIntraNuclearTransportModel +{ + public: + G4QStringChipsParticleLevelInterface(); + virtual G4HadFinalState* ApplyYourself(const G4HadProjectile& aTrack, + G4Nucleus& theNucleus); + + virtual G4ReactionProductVector* Propagate(G4KineticTrackVector* theSecondaries, + G4V3DNucleus* theNucleus); + private: + + G4ChiralInvariantPhaseSpace theModel; + G4double theEnergyLossPerFermi; + + G4double theInnerCoreDensityCut; + + G4double fractionOfSingleQuasiFreeNucleons; + G4double fractionOfPairedQuasiFreeNucleons; + G4double clusteringCoefficient; + G4double temperature; + G4double halfTheStrangenessOfSee; + G4double etaToEtaPrime; + G4double fusionToExchange; + G4int nop; +}; +#endif diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QTauNuclearCrossSection.hh b/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QTauNuclearCrossSection.hh index ed47a701ab..16f25f4d88 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QTauNuclearCrossSection.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QTauNuclearCrossSection.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4QTauNuclearCrossSection.hh,v 1.4 2006/06/29 20:08:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4QTauNuclearCrossSection.hh,v 1.5 2006/12/01 10:57:46 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // GEANT4 physics class: G4QTauNuclearCrossSection -- header file @@ -65,6 +65,10 @@ public: G4double ThresholdEnergy(G4int Z, G4int N, G4int PDG=15); + // At present momentum (pMom) must be in GeV (@@ Units) + virtual G4double GetCrossSection(G4bool fCS, G4double pMom, G4int tgZ, G4int tgN, + G4int pPDG=0); + G4double CalculateCrossSection(G4bool CS, G4int F, G4int I, G4int PDG, G4int Z, G4int N, G4double Momentum); @@ -97,6 +101,13 @@ private: static G4double* lastJ1; // Pointer to the last array of the J1 function static G4double* lastJ2; // Pointer to the last array of the J2 function static G4double* lastJ3; // Pointer to the last array of the J3 function + static G4int lastPDG; // The last projectile PDG + static G4int lastN; // The last N of calculated nucleus + static G4int lastZ; // The last Z of calculated nucleus + static G4double lastP; // Last used in the cross section Momentum + static G4double lastTH; // Last value of the Momentum Threshold + static G4double lastCS; // Last value of the Cross Section + static G4int lastI; // The last position in the DAMDB }; inline G4double G4QTauNuclearCrossSection::DFun(G4double x)// Parametrization of PhotNucCS diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4StringChipsParticleLevelInterface.hh b/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4StringChipsParticleLevelInterface.hh index d5b880e64d..5c546a024d 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4StringChipsParticleLevelInterface.hh +++ b/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4StringChipsParticleLevelInterface.hh @@ -29,6 +29,9 @@ #include "G4VIntraNuclearTransportModel.hh" #include "G4ChiralInvariantPhaseSpace.hh" +// Open this if you wish histogramming of the impact parameter issue +//#define hdebug_SCPLI + class G4StringChipsParticleLevelInterface : public G4VIntraNuclearTransportModel { public: @@ -53,5 +56,44 @@ class G4StringChipsParticleLevelInterface : public G4VIntraNuclearTransportModel G4double etaToEtaPrime; G4double fusionToExchange; G4int nop; + +#ifdef hdebug_SCPLI + //Static variables for histogramming + static const G4int nbh; + static G4double bhmax; + static G4double bhdb; + static G4double ehmax; + static G4double ehde; + static G4double toth; + static G4int bover; + static G4int eover; + static G4int* bhis; + static G4int* ehis; + public: + //Static functions + static void Reset() + { + bhdb=bhmax/nbh; + ehde=bhmax/nbh; + toth=0.; + bover=0; + eover=0; + for(G4int i=0; i colPDG;// Vector of the projectile PDG code + static std::vector colN; // Vector of N for calculated nuclei (isotops) + static std::vector colZ; // Vector of Z for calculated nuclei (isotops) + static std::vector colP; // Vector of last momenta for the reaction + static std::vector colTH; // Vector of energy thresholds for the reaction + static std::vector colCS; // Vector of last cross sections for the reaction + // ***---*** End of the mandatory Static Definitions of the Associative Memory ***---*** + G4double pEn=pMom; +#ifdef pdebug + G4cout<<"G4QAMNCS::GetCS:>> f="< CS=0"< New (inDB) Calculated CS="<lastTH) // Correct the threshold + { +#ifdef pdebug + G4cout<<"G4QAMNCS::GetCS: New T="< Threshold="< Threshold="< CS=0 + } + else if(std::fabs(lastP/pMom-1.)0) G4cout << GetProcessName() << " process is created "<< G4endl; + + G4QCHIPSWorld::Get()->GetParticles(nPartCWorld); // Create CHIPS World with 234 particles + G4QNucleus::SetParameters(freeNuc,freeDib,clustProb,mediRatio); // Clusterization param's + G4Quasmon::SetParameters(Temperature,SSin2Gluons,EtaEtaprime); // Hadronic parameters + G4QEnvironment::SetParameters(SolidAngle); // SolAngle of pbar-A secondary mesons capture + //@@ Initialize here the G4QuasmonString parameters +} + +G4bool G4QAtomicElectronScattering::manualFlag=false; // If false:use standard parameters +G4double G4QAtomicElectronScattering::Temperature=180.; // Critical Temperature (High Ener) +G4double G4QAtomicElectronScattering::SSin2Gluons=0.3; // Supression of s-quarks (to u&d) +G4double G4QAtomicElectronScattering::EtaEtaprime=0.3; // Supression of eta(gg->qq/3g->qq) +G4double G4QAtomicElectronScattering::freeNuc=0.5; // % of free nucleons on a surface +G4double G4QAtomicElectronScattering::freeDib=0.05; // % of free diBaryons on a surface +G4double G4QAtomicElectronScattering::clustProb=5.; // Nuclear clusterization parameter +G4double G4QAtomicElectronScattering::mediRatio=10.; // medium/vacuum hadronizationRatio +G4int G4QAtomicElectronScattering::nPartCWorld=152; // #of particles in the CHIPS World +G4double G4QAtomicElectronScattering::SolidAngle=0.5; // A part of Solid Angle to capture +G4bool G4QAtomicElectronScattering::EnergyFlux=false; // Flag to use EnergyFlux or MultyQ +G4double G4QAtomicElectronScattering::PiPrThresh=141.4; // PiProductionThreshold for gammas +G4double G4QAtomicElectronScattering::M2ShiftVir=20000.;// M2=-Q2=m_pi^2 shift of virtGamma +G4double G4QAtomicElectronScattering::DiNuclMass=1880.; // Double Nucleon Mass for VirtNorm + +void G4QAtomicElectronScattering::SetManual() {manualFlag=true;} +void G4QAtomicElectronScattering::SetStandard() {manualFlag=false;} + +// Fill the private parameters +void G4QAtomicElectronScattering::SetParameters(G4double temper, G4double ssin2g, G4double etaetap, + G4double fN, G4double fD, G4double cP, G4double mR, + G4int nParCW, G4double solAn, G4bool efFlag, + G4double piThresh, G4double mpisq, G4double dinum) +{// ============================================================================= + Temperature=temper; + SSin2Gluons=ssin2g; + EtaEtaprime=etaetap; + freeNuc=fN; + freeDib=fD; + clustProb=cP; + mediRatio=mR; + nPartCWorld = nParCW; + EnergyFlux=efFlag; + SolidAngle=solAn; + PiPrThresh=piThresh; + M2ShiftVir=mpisq; + DiNuclMass=dinum; + G4QCHIPSWorld::Get()->GetParticles(nPartCWorld); // Create CHIPS World with 234 particles + G4QNucleus::SetParameters(freeNuc,freeDib,clustProb,mediRatio); // Clusterization param's + G4Quasmon::SetParameters(Temperature,SSin2Gluons,EtaEtaprime); // Hadronic parameters + G4QEnvironment::SetParameters(SolidAngle); // SolAngle of pbar-A secondary mesons capture +} + +// Destructor + +G4QAtomicElectronScattering::~G4QAtomicElectronScattering() {} + + +G4LorentzVector G4QAtomicElectronScattering::GetEnegryMomentumConservation() +{ + return EnMomConservation; +} + +G4int G4QAtomicElectronScattering::GetNumberOfNeutronsInTarget() +{ + return nOfNeutrons; +} + +G4double G4QAtomicElectronScattering::GetMeanFreePath(const G4Track& aTrack, + G4double,G4ForceCondition* Fc) +{ + *Fc = NotForced; + const G4DynamicParticle* incidentParticle = aTrack.GetDynamicParticle(); + G4ParticleDefinition* incidentParticleDefinition=incidentParticle->GetDefinition(); + if( !IsApplicable(*incidentParticleDefinition)) + G4cout<<"-Wa-G4QAtElScat::GetMeanFreePath called for not implemented particle"<GetTotalMomentum(); // 3-momentum of the Particle + const G4Material* material = aTrack.GetMaterial(); // Get the current material + const G4double* NOfNucPerVolume = material->GetVecNbOfAtomsPerVolume(); + const G4ElementVector* theElementVector = material->GetElementVector(); + G4int nE=material->GetNumberOfElements(); +#ifdef debug + G4cout<<"G4QAtomElectScattering::GetMeanFreePath:"<((*theElementVector)[i]->GetZ()); // Z of the Element + std::vector*>* cs= Isotopes->GetCSVector(Z); // Pointer to CS + G4int nIs=cs->size(); // A#Of Isotopes in the Element + if(nIs) for(G4int j=0; j* curIs=(*cs)[j]; // A pointer, which is used twice + G4int N=curIs->first; // #ofNeuterons in the isotope + curIs->second = CSmanager->GetCrossSection(true,Momentum,Z,N,13); // CS calculation + } // End of temporary initialization of the cross sections in the G4QIsotope singeltone + sigma+=Isotopes->GetMeanCrossSection(Z)*NOfNucPerVolume[i]; // SUM(MeanCS*NOFNperV) + } // End of LOOP over Elements + + // Check that cross section is not zero and return the mean free path + if(sigma > 0.) return 1./sigma; // Mean path [distance] + return DBL_MAX; +} + + +G4bool G4QAtomicElectronScattering::IsApplicable(const G4ParticleDefinition& particle) +{ + if (particle == *( G4MuonPlus::MuonPlus() )) return true; + else if (particle == *( G4MuonMinus::MuonMinus() )) return true; + else if (particle == *( G4TauPlus::TauPlus() )) return true; + else if (particle == *( G4TauMinus::TauMinus() )) return true; + else if (particle == *( G4Electron::Electron() )) return true; + else if (particle == *( G4Positron::Positron() )) return true; + else if (particle == *( G4Gamma::Gamma() )) return true; + else if (particle == *( G4Proton::Proton() )) return true; + //else if (particle == *( G4Neutron::Neutron() )) return true; + //else if (particle == *( G4PionMinus::PionMinus() )) return true; + //else if (particle == *( G4PionPlus::PionPlus() )) return true; + //else if (particle == *( G4KaonPlus::KaonPlus() )) return true; + //else if (particle == *( G4KaonMinus::KaonMinus() )) return true; + //else if (particle == *( G4KaonZeroLong::KaonZeroLong() )) return true; + //else if (particle == *(G4KaonZeroShort::KaonZeroShort())) return true; + //else if (particle == *( G4Lambda::Lambda() )) return true; + //else if (particle == *( G4SigmaPlus::SigmaPlus() )) return true; + //else if (particle == *( G4SigmaMinus::SigmaMinus() )) return true; + //else if (particle == *( G4SigmaZero::SigmaZero() )) return true; + //else if (particle == *( G4XiMinus::XiMinus() )) return true; + //else if (particle == *( G4XiZero::XiZero() )) return true; + //else if (particle == *( G4OmegaMinus::OmegaMinus() )) return true; + //else if (particle == *( G4AntiNeutron::AntiNeutron() )) return true; + //else if (particle == *( G4AntiProton::AntiProton() )) return true; +#ifdef debug + G4cout<<"***G4QAtomElScattering::IsApplicable: PDG="<GetPDGMass(); // muon mass + static const G4double mu2=mu*mu; // squared muon mass + //static const G4double dpi=M_PI+M_PI; // 2*pi (for Phi distr.) ***changed to twopi*** + static const G4double mNeut= G4QPDGCode(2112).GetMass(); + static const G4double mProt= G4QPDGCode(2212).GetMass(); + static const G4double dM=mProt+mNeut; // doubled nucleon mass + //static const G4double mPi0 = G4QPDGCode(111).GetMass(); + //static const G4double mDeut= G4QPDGCode(2112).GetNuclMass(1,1,0); + //static const G4double mPi = G4QPDGCode(211).GetMass(); + //static const G4double mMu = G4QPDGCode(13).GetMass(); + //static const G4double mTau = G4QPDGCode(15).GetMass(); + //static const G4double mEl = G4QPDGCode(11).GetMass(); + // + const G4DynamicParticle* projHadron = track.GetDynamicParticle(); + const G4ParticleDefinition* particle=projHadron->GetDefinition(); + G4LorentzVector proj4M=projHadron->Get4Momentum(); + G4double momentum = projHadron->GetTotalMomentum(); // 3-momentum of the Particle + G4double Momentum=proj4M.rho(); + if(std::fabs(Momentum-momentum)>.001) G4cerr<<"G4QAtElScat::PSDI P="<GetElementVector(); + G4int i=0; + G4double sum=0.; + G4int nE=material->GetNumberOfElements(); +#ifdef debug + G4cout<<"G4QAtomElectronScat::PostStepDoIt: "<GetPDGEncoding(); + G4cout<<"G4QAtomElScat::PostStepRestDoIt: projPDG="< sumfra; + for(i=0; iGetFractionVector()[i]; + sum+=frac; + sumfra.push_back(sum); // remember the summation steps + } + G4double rnd = sum*G4UniformRand(); + for(i=0; i(pElement->GetZ()); + if(Z<=0) + { + G4cerr<<"-Warning-G4QAtomicElectronScattering::PostStepDoIt: Element's Z="<GetIsotopeVector(); + if(isoVector) isoSize=isoVector->size(); // Get real size of the isotopeVector if exists +#ifdef debug + G4cout<<"G4QAtomicElectronScattering::PostStepDoIt: isovectorLength="<GetLastIndex(Z); + if(!curInd) // The new artificial element must be defined + { + std::vector*>* newAbund = + new std::vector*>; + G4double* abuVector=pElement->GetRelativeAbundanceVector(); + for(G4int j=0; jGetIsotope(j)->GetN()-Z; + if(pElement->GetIsotope(j)->GetZ()!=Z) G4cerr<<"*G4QCaptureAtRest::AtRestDoIt: Z=" + <GetIsotope(j)->GetZ()<<"#"<* pr= new std::pair(N,abund); +#ifdef debug + G4cout<<"G4QAtomElScat::PostStepDoIt:pair#="<leptE="<GetExchangeQ2(photonEnergy);// Q2(t) of EqivExchangePart + G4double W=photonEnergy-photonQ2/dM;// HadronicEnergyFlow (W-energy) for virtual photon + if(W<0.) + { + //Do Nothing Action insead of the reaction + G4cout<<"G4QAtomElScat::PostStepDoIt:(lN) negative equivalent energy W="<GetCrossSection(true,photonEnergy, Z, N);// Integrated CS + G4double sigK =thePhotonData->GetCrossSection(true, W, Z, N); // Real CrosSect + G4double rndFraction = CSmanager->GetVirtualFactor(photonEnergy, photonQ2); + if(sigNu*G4UniformRand()>sigK*rndFraction) + { + //Do NothingToDo Action insead of the reaction + G4cout<<"G4QAtomElectScat::PostStepDoIt: probability correction - DoNothing"<0) aParticleChange.ProposeEnergy(finE) ; + else + { + aParticleChange.ProposeEnergy(0.) ; + aParticleChange.ProposeTrackStatus(fStopAndKill); + } + // Scatter the muon + G4double EEm=iniE*finE-mu2; // Just an intermediate value to avoid "2*" + G4double iniP=std::sqrt(iniE*iniE-mu2); // Initial momentum of the electron + G4double finP=std::sqrt(finE*finE-mu2); // Final momentum of the electron + G4double cost=(EEm+EEm-photonQ2)/iniP/finP; // cos(theta) for the electron scattering + if(cost>1.) cost=1.; // To avoid the accuracy of calculation problem + //else if(cost>1.001) // @@ error report can be done, but not necessary + if(cost<-1.) cost=-1.; // To avoid the accuracy of calculation problem + //else if(cost<-1.001) // @@ error report can be done, but not necessary + // --- Example from electromagnetic physics -- + //G4ThreeVector newMuonDirection(dirx,diry,dirz); + //newMuonDirection.rotateUz(dir); + //aParticleChange.ProposeMomentumDirection(newMuonDirection1) ; + // The scattering in respect to the derection of the incident muon is made impicitly: + G4ThreeVector ort=dir.orthogonal(); // Not normed orthogonal vector (!) (to dir) + G4ThreeVector ortx = ort.unit(); // First unit vector orthogonal to the direction + G4ThreeVector orty = dir.cross(ortx);// Second unit vector orthoganal to the direction + G4double sint=std::sqrt(1.-cost*cost); // Perpendicular component + G4double phi=twopi*G4UniformRand(); // phi of scattered electron + G4double sinx=sint*std::sin(phi); // x-component + G4double siny=sint*std::cos(phi); // y-component + G4ThreeVector findir=cost*dir+sinx*ortx+siny*orty; + aParticleChange.ProposeMomentumDirection(findir); // new direction for the muon + const G4ThreeVector photon3M=iniP*dir-finP*findir; + projPDG=22; + proj4M=G4LorentzVector(photon3M,photon3M.mag()); + } + G4int targPDG=90000000+Z*1000+N; // PDG Code of the target nucleus + G4QPDGCode targQPDG(targPDG); + G4double tM=targQPDG.GetMass(); + EnMomConservation=proj4M+G4LorentzVector(0.,0.,0.,tM); // Total 4-mom of the reaction + G4QHadronVector* output=new G4QHadronVector; // Prototype of the output G4QHadronVector + // @@@@@@@@@@@@@@ Temporary for the testing purposes --- Begin + //G4bool elF=false; // Flag of the ellastic scattering is "false" by default + //G4double eWei=1.; + // @@@@@@@@@@@@@@ Temporary for the testing purposes --- End +#ifdef debug + G4cout<<"G4QAtomElScat::PostStepDoIt: projPDG="< DELETED --+ | + delete pH; // --------<-------+---+ +#ifdef debug + G4double mp=G4QPDGCode(projPDG).GetMass(); // Mass of the projectile particle | + G4cout<<"G4QAtomElectScat::PostStepDoIt: pPDG="<>G4QAtomElScat::PostStepDoIt:elF="<size(); // A#of hadrons in the output + aParticleChange.SetNumberOfSecondaries(tNH); + // Now add nuclear fragments +#ifdef debug + G4cout<<"G4QAtomElectronScat::PostStepDoIt: "<size(); // Real length of the output @@ Temporary + if(tNH==1) tNH=0; // @@ Temporary + if(tNH==2&&2!=nOut) G4cout<<"--Warning--G4QAtomElScat::PostStepDoIt: 2 # "< work for Hisaya @@ + // The decau process for hypernuclei must be developed in GEANT4 (change CHIPS body) + G4QHadron* hadr=output->operator[](i); // Pointer to the output hadron + G4int PDGCode = hadr->GetPDGCode(); + G4int nFrag = hadr->GetNFragments(); +#ifdef pdebug + G4cout<<"G4QAtomElectScat::AtRestDoIt: H#"<GetDefinition(); if( !IsApplicable(*incidentParticleDefinition)) G4cout<<"-W-G4QCollision::GetMeanFreePath called for not implemented particle"<GetTotalMomentum(); // 3-momentum of the Particle +#ifdef debug + G4cout<<"G4QCollis::GetMeanFreePath: BeforeGetMaterial"<GetVecNbOfAtomsPerVolume(); const G4ElementVector* theElementVector = material->GetElementVector(); @@ -219,7 +232,7 @@ G4double G4QCollision::GetMeanFreePath(const G4Track& aTrack,G4double,G4ForceCon #endif if(isoSize) // The Element has non-trivial abumdance set { - indEl=pElement->GetIndex(); // Index of the non-trivial element + indEl=pElement->GetIndex()+1; // Index of the non-trivial element if(!Isotopes->IsDefined(Z,indEl)) // This index is not defined for this Z: define { std::vector*>* newAbund = @@ -233,7 +246,7 @@ G4double G4QCollision::GetMeanFreePath(const G4Track& aTrack,G4double,G4ForceCon G4double abund=abuVector[j]; std::pair* pr= new std::pair(N,abund); #ifdef debug - G4cout<<"G4QCollision::PostStepDoIt:pair#="<GetDefinition(); #ifdef debug @@ -461,7 +483,7 @@ G4VParticleChange* G4QCollision::PostStepDoIt(const G4Track& track, const G4Step std::vector* IsN = ElIsoN[i]; // Vector of "#of neutrons" in the isotope El[i] G4int nofIsot=SPI->size(); // #of isotopes in the element i #ifdef debug - G4cout<<"G4QCollis::PosStDoIt:n="<GetExchangeEnergy(); // Energy of EqivExchangePart + if( kinEnergy < photonEnergy || photonEnergy < 0.) { //Do Nothing Action insead of the reaction G4cerr<<"G4QCollision::PSDoIt: photE="<leptE="<GetExchangeQ2(photonEnergy);// Q2(t) of EqivExchangePart @@ -539,60 +589,129 @@ G4VParticleChange* G4QCollision::PostStepDoIt(const G4Track& track, const G4Step if(W<0.) { //Do Nothing Action insead of the reaction +#ifdef debug G4cout << "G4QCollision::PostStepDoIt:(lN) negative equivalent energy W="<GetCrossSection(true,photonEnergy,Z,N);// IntegratedCrSec - G4double sigK =thePhotonData->GetCrossSection(true, W, Z, N); // Real CrossSect. + G4double sigNu=thePhotonData->GetCrossSection(true,photonEnergy,Z,N,22);//Integrated XS + G4double sigK =thePhotonData->GetCrossSection(true, W, Z, N, 22); // Real XS G4double rndFraction = CSmanager->GetVirtualFactor(photonEnergy, photonQ2); if(sigNu*G4UniformRand()>sigK*rndFraction) { //Do NothingToDo Action insead of the reaction +#ifdef debug G4cout << "G4QCollision::PostStepDoIt: probability correction - DoNothing"<0) aParticleChange.ProposeEnergy(finE) ; - else + G4double iniE=kinEnergy+ml; // Initial total energy of the lepton + G4double finE=iniE-photonEnergy; // Final total energy of the lepton + aParticleChange.ProposeEnergy(finE-ml); + if(finE<=ml) // Secondary lepton (e/mu/tau) at rest disappears { aParticleChange.ProposeEnergy(0.) ; - aParticleChange.ProposeTrackStatus(fStopAndKill); + if(aProjPDG== 11) aParticleChange.ProposeTrackStatus(fStopAndKill); + else aParticleChange.ProposeTrackStatus(fStopButAlive); + aParticleChange.ProposeMomentumDirection(dir); } - // Scatter the muon - G4double EEm=iniE*finE-mu2; // Just an intermediate value to avoid "2*" - G4double iniP=std::sqrt(iniE*iniE-mu2); // Initial momentum of the electron - G4double finP=std::sqrt(finE*finE-mu2); // Final momentum of the electron - G4double cost=(EEm+EEm-photonQ2)/iniP/finP; // cos(theta) for the electron scattering + else aParticleChange.ProposeTrackStatus(fAlive); + G4double iniP=std::sqrt(iniE*iniE-ml2); // Initial momentum of the electron + G4double finP=std::sqrt(finE*finE-ml2); // Final momentum of the electron + G4double cost=(iniE*finE-ml2-photonQ2/2)/iniP/finP; // cos(scat_ang_of_lepton) +#ifdef pdebug + G4cout<<"G4QCollision::PostStDoIt: Q2="< DELETED -->---+ + try // | + { // | + delete leadhs; // | + G4QNucleus vac(90000000); // | + leadhs=pan->Fragment(vac,1); // DELETED after it is copied to output vector | + } // | + catch (G4QException& error) // | + { // | + G4cerr<<"***G4QCollision::PostStepDoIt: G4Quasmon Exception is catched"<GetQEL_ExchangeQ2(); // OK, im MeV^2 - G4double ds=s+s; // dpubled s + G4double ds=s+s; // doubled s G4double sqs=std::sqrt(s); // M_cm G4double pi=(s-mIN*mIN)/(sqs+sqs); // initial momentum in CMS G4double dpi=pi+pi; // doubled initial momentum in CMS @@ -731,7 +852,10 @@ G4VParticleChange* G4QCollision::PostStepDoIt(const G4Track& track, const G4Step aParticleChange.ProposeTrackStatus(fStopAndKill); // the initial neutrino is killed } EnMomConservation=proj4M+G4LorentzVector(0.,0.,0.,tM); // Total 4-mom of the reaction - G4QHadronVector* output=new G4QHadronVector; // Prototype of the output G4QHadronVector + if(absMom) EnMomConservation+=lead4M; // Add E/M of leading System +#ifdef debug + G4cout<<"G4QCollision::PostStDoIt:before St="<push_back(scatHadron); } + G4int qNH=leadhs->size(); + if(absMom) + { + if(qNH) for(G4int iq=0; iqpush_back(loh); + } + delete leadhs; + } // ------------- From here the secondaries are filled ------------------------- G4int tNH = output->size(); // A#of hadrons in the output aParticleChange.SetNumberOfSecondaries(tNH); // Now add nuclear fragments #ifdef debug G4cout<<"G4QCollision::PostStepDoIt: "< work for Hisaya @@ // The decau process for hypernuclei must be developed in GEANT4 (change CHIPS body) - G4QHadron* hadr=output->operator[](i); // Pointer to the output hadron + G4QHadron* hadr=(*output)[i]; // Pointer to the output hadron G4int PDGCode = hadr->GetPDGCode(); G4int nFrag = hadr->GetNFragments(); #ifdef pdebug @@ -883,7 +1020,9 @@ G4VParticleChange* G4QCollision::PostStepDoIt(const G4Track& track, const G4Step } if(!theDefinition) { +#ifdef debug G4cout<<"---Warning---G4QCollision::PostStepDoIt: drop PDG="<GetTotalMomentum(); // 3-momentum of the Particle +#ifdef debug + G4double KinEn = incidentParticle->GetKineticEnergy(); + G4cout<<"G4QElastic::GetMeanFreePath: kinE="<GetVecNbOfAtomsPerVolume(); const G4ElementVector* theElementVector = material->GetElementVector(); @@ -85,19 +91,12 @@ G4double G4QElastic::GetMeanFreePath(const G4Track& aTrack,G4double Q,G4ForceCon #ifdef debug G4cout<<"G4QElastic::GetMeanFreePath:"<(pElement->GetZ()); // Z of the Element ElementZ.push_back(Z); // Remember Z of the Element G4int isoSize=0; // The default for the isoVectorLength is 0 - G4int indEl=0; // Index of non-trivial element or 0(default) + G4int indEl=0; // Index of non-natural element or 0(default) G4IsotopeVector* isoVector=pElement->GetIsotopeVector(); // Get the predefined IsoVect if(isoVector) isoSize=isoVector->size();// Get size of the existing isotopeVector #ifdef debug G4cout<<"G4QElastic::GetMeanFreePath: isovectorLength="<GetIndex(); // Index of the non-trivial element + indEl=pElement->GetIndex()+1; // Index of the non-trivial element is an order +#ifdef debug + G4cout<<"G4QEl::GetMFP: iE="<,#isot="<="<GetMeanCrossSection(Z,indEl)<<", AddToSigma=" + <GetMeanCrossSection(Z,indEl)*NOfNucPerVolume[i]<GetCrossSection(false, Momentum, Z, N, projPDG);// Rec.CrossSect #ifdef debug G4cout<<"G4QElast::PSDI:pPDG="<0. || xSec<0. || xSec==0); + else G4cout<<"******G4QElast::PSDI:xSec="< Do Nothing { - G4cerr<<"*Warning*G4QElastic::PSDoIt: Zero cross-section"<GetHMaxT() + <<",Ek="<1. || cost<-1. || !(cost>-1. || cost<1.)) { - if(cost>1.000001 || cost<-1.000001) G4cout<<"*Warning*G4QElastic::PostStepDoIt: cos=" - <GetHMaxT()<1.) cost=1.; else if(cost<-1.) cost=-1.; } @@ -423,17 +473,22 @@ G4VParticleChange* G4QElastic::PostStepDoIt(const G4Track& track, const G4Step& if(!G4QHadron(tot4M).RelDecayIn2(scat4M, reco4M, dir4M, cost, cost)) { G4cerr<<"G4QElastic::PSD:t4M="<FindIon(Z,aA,0,Z); if(!theDefinition)G4cout<<"*Warning*G4QElastic::PostStepDoIt:drop PDG="<anyPar)(D) +const G4int G4QElasticCrossSection::nPoints=100;//#of points in the AMDB tables(>anyPar)(D) const G4int G4QElasticCrossSection::nLast=nPoints-1; // the Last element in the table (D) -G4double G4QElasticCrossSection::lPMin=-3.; // Min tabulated logarithmic Momentum (D) -G4double G4QElasticCrossSection::lPMax= 9.; // Max tabulated logarithmic Momentum (D) +G4double G4QElasticCrossSection::lPMin=-4.; // Min tabulated logarithmic Momentum (D) +G4double G4QElasticCrossSection::lPMax= 8.; // Max tabulated logarithmic Momentum (D) G4double G4QElasticCrossSection::dlnP=(lPMax-lPMin)/nLast;// Log step in the table (D) G4bool G4QElasticCrossSection::onlyCS=true;// Flag to calculate only CS (not Si/Bi) (L) G4double G4QElasticCrossSection::lastSIG=0.; // Last calculated cross section (L) @@ -60,7 +61,8 @@ G4double G4QElasticCrossSection::theS2=0.; // The Last mantissa of second dif G4double G4QElasticCrossSection::theB2=0.; // The Last slope of second difruction (L) G4double G4QElasticCrossSection::theS3=0.; // The Last mantissa of third difruction (L) G4double G4QElasticCrossSection::theB3=0.; // The Last slope of third difruction (L) -G4int G4QElasticCrossSection::lastPDG=0; // Last PDG code of the projectile +G4double G4QElasticCrossSection::theS4=0.; // The Last mantissa of 4-th difruction (L) +G4double G4QElasticCrossSection::theB4=0.; // The Last slope of 4-th difruction (L) G4int G4QElasticCrossSection::lastTZ=0; // Last atomic number of the target G4int G4QElasticCrossSection::lastTN=0; // Last number of neutrons of the target G4double G4QElasticCrossSection::lastPIN=0.; // Last initialized max momentum @@ -73,6 +75,15 @@ G4double* G4QElasticCrossSection::lastS2T=0; // E-dep of mantissa of the second G4double* G4QElasticCrossSection::lastB2T=0; // E-dep of the slope of theSecond difruction G4double* G4QElasticCrossSection::lastS3T=0; // E-dep of mantissa of the third difruction G4double* G4QElasticCrossSection::lastB3T=0; // E-dep of the slope of the third difruction +G4double* G4QElasticCrossSection::lastS4T=0; // E-dep of mantissa of the 4-th difruction +G4double* G4QElasticCrossSection::lastB4T=0; // E-dep of the slope of the 4-th difruction +G4int G4QElasticCrossSection::lastPDG=0; // The last PDG code of the projectile +G4int G4QElasticCrossSection::lastN=0; // The last N of calculated nucleus +G4int G4QElasticCrossSection::lastZ=0; // The last Z of calculated nucleus +G4double G4QElasticCrossSection::lastP=0.; // Last used in cross section Momentum +G4double G4QElasticCrossSection::lastTH=0.; // Last threshold momentum +G4double G4QElasticCrossSection::lastCS=0.; // Last value of the Cross Section +G4int G4QElasticCrossSection::lastI=0; // The last position in the DAMDB // Returns Pointer to the G4VQCrossSection class G4VQCrossSection* G4QElasticCrossSection::GetPointer() @@ -81,6 +92,178 @@ G4VQCrossSection* G4QElasticCrossSection::GetPointer() return &theCrossSection; } +// The main member function giving the collision cross section (P is in IU, CS is in mb) +// Make pMom in independent units ! (Now it is MeV) +G4double G4QElasticCrossSection::GetCrossSection(G4bool fCS, G4double pMom, G4int tgZ, + G4int tgN, G4int pPDG) +{ + static G4int j; // A#0f records found in DB for this projectile + static std::vector colPDG;// Vector of the projectile PDG code + static std::vector colN; // Vector of N for calculated nuclei (isotops) + static std::vector colZ; // Vector of Z for calculated nuclei (isotops) + static std::vector colP; // Vector of last momenta for the reaction + static std::vector colTH; // Vector of energy thresholds for the reaction + static std::vector colCS; // Vector of last cross sections for the reaction + // ***---*** End of the mandatory Static Definitions of the Associative Memory ***---*** + G4double pEn=pMom; + onlyCS=fCS; +#ifdef pdebug + G4cout<<"G4QElCS::GetCS:>>> f="< CS=0"< New (inDB) Calculated CS="<lastTH) // Correct the threshold + { +#ifdef pdebug + G4cout<<"G4QElCS::GetCS: New T="< Threshold="< Threshold="< CS=0 + } + else if(std::fabs(lastP/pMom-1.)6 & A<7 + if(a<6.5) + { + // a11 + // a13 + G4double a28=a16*a12; + // a31 + // a40 + // The main pre-exponent (pel_sg) + lastPAR[ 9]=4000*a; // p1 + lastPAR[10]=1.2e7*a8+380*a16*a; // p2 + lastPAR[11]=.7/(1.+4.e-12*a16); // p3 + lastPAR[12]=2.5/a8/(a4+1.e-16*a32); // p4 + lastPAR[13]=.28*a; // p5 + lastPAR[14]=1.2*a2+2.3; // p6 + lastPAR[15]=3.8/a; // p7 + // The main slope (pel_sl) + lastPAR[16]=.01/(1.+.0024*a5); // p1 + lastPAR[17]=.2*a; // p2 + lastPAR[18]=9.e-7/(1.+.035*a5); // p3 + lastPAR[19]=(42.+2.7e-11*a16)/(1.+.14*a); // p4 + // The main quadratic (pel_sh) + lastPAR[20]=2.25*a3; // p1 + lastPAR[21]=18.; // p2 + lastPAR[22]=2.4e-3*a8/(1.+2.6e-4*a7); // p3 + lastPAR[23]=3.5e-36*a32*a8/(1.+5.e-15*a32/a); // p4 + // The 1st max pre-exponent (pel_qq) + lastPAR[24]=8.e4/(a8+2.5e12/a16); // p1 + lastPAR[25]=8.e7/(a12+1.e-27*a28*a28); // p2 + lastPAR[26]=.0011*a3; // p3 + // The 1st max slope (pel_qs) + lastPAR[27]=10.+4.e-8*a12*a; // p1 + lastPAR[28]=.114; // p2 + lastPAR[29]=.003; // p3 + lastPAR[30]=2.e-23; // p4 + // The effective pre-exponent (pel_ss) + lastPAR[31]=1./(1.+.0001*a8); // p1 + lastPAR[32]=1.5e-4/(1.+5.e-6*a12); // p2 + lastPAR[33]=.03; // p3 + // The effective slope (pel_sb) + lastPAR[34]=a/2; // p1 + lastPAR[35]=2.e-7*a4; // p2 + lastPAR[36]=4.; // p3 + lastPAR[37]=64./a3; // p4 + // The gloria pre-exponent (pel_us) + lastPAR[38]=1.05e8*std::exp(.32*asa); // p1 + lastPAR[39]=19.5*std::exp(.45*asa); // p2 + lastPAR[40]=7.e3+2.4e6/a5; // p3 + lastPAR[41]=2.5e5*std::exp(.085*a3); // p4 + lastPAR[42]=2.5*a; // p5 + // The gloria slope (pel_ub) + lastPAR[43]=920.+.03*a8*a3; // p1 + lastPAR[44]=93.+.0023*a12; // p2 +#ifdef pdebug + G4cout<<"G4QElCS::CalcCS:la "< n+p=n+p { @@ -449,8 +794,18 @@ G4double G4QElasticCrossSection::GetExchangeT(G4int tgZ, G4int tgN, G4int PDG) G4double I12=I1+I2; //G4double rand=(I12+I3)*G4UniformRand(); G4double rand=I12*G4UniformRand(); - if (rand1.) ran=1.; + q2=-std::log(1.-ran)/theB1; // t-chan + } + else + { + G4double ran=R2*G4UniformRand(); + if(ran>1.) ran=1.; + q2=lastTM+std::log(1.-ran)/theB2; // u-chan (ChEx) + } } else if(PDG==2212 && tgZ==1 && tgN==0) // ===> p+p=p+p { @@ -484,66 +839,122 @@ G4double G4QElasticCrossSection::GetExchangeT(G4int tgZ, G4int tgN, G4int PDG) G4double I3=R3*theS3; G4double I12=I1+I2; G4double rand=(I12+I3)*G4UniformRand(); - if (rand1.) ran=1.; + q2=-std::log(1.-ran)/theB1; + } + else if(rand1.) ran=1.; + q2=-std::log(1.-ran); + if(q2<0.) q2=0.; + q2=std::pow(q2,third)/theB2; + } + else + { + G4double ran=R3*G4UniformRand(); + if(ran>1.) ran=1.; + q2=-std::log(1.-ran)/theB3; + } } - else if((PDG==2212 || PDG==2112) && (tgZ==1 && tgN==1 || tgZ==2 && tgN==2)) + else if(PDG==2212 || PDG==2112) { + G4double a=tgZ+tgN; #ifdef tdebug - G4cout<<"G4QElasticCS::GetExchangeT: TM="<-1.||q2<1.)) G4cout<<"*NAN*G4QElasticCrossSect::GetExT: -t="<lastTM)G4cout<<"*Warning*G4QElasticCrossSect::GetExT:-t="<"<92) + { + G4cout<<"*Warning*G4QElasticCS::GetTabValue: (1-92) No isotopes for Z="< pp(identical,symmetric 90deg) { - G4double tMid=std::sqrt(pP*pP+mProt2)*mProt-mProt2; // CMS 90deg value of -t=Q2 (GeV^2) + G4double tMid=std::sqrt(pP2+mProt2)*mProt-mProt2; // CMS 90deg value of -t=Q2 (GeV^2) return tMid+tMid; } - else if(PDG==2112 && tgZ==1&&tgN==0) + else if(PDG==2112 && tgZ) // ---> nA { - G4double pP2=pP*pP; - G4double sM=(mProt+mProt)*std::sqrt(pP*pP+mNeut2)+mNeut2+mProt2; // Mondelstam s - return 4*mProt2*pP2/sM; + G4double mt=mProt; // Target mass in GeV + if(tgN||tgZ>1) mt=G4QPDGCode(90000000+tgZ*1000+tgN).GetMass()*.001; // Target mass GeV + G4double dmt=mt+mt; + G4double s=dmt*std::sqrt(pP2+mNeut2)+mNeut2+mt*mt; // Mondelstam s (in GeV^2) + return dmt*dmt*pP2/s; } - else if((PDG==2212 || PDG==2112) && tgZ==1&&tgN==1) // n/p+He4 + else if(PDG==2212 && tgZ) // ---> pA { - G4double pP2=pP*pP; - G4double sM=(mDeut+mDeut)*std::sqrt(pP*pP+mProt2)+mProt2+mDeut2; // Mondelstam s - return 4*mDeut2*pP2/sM; - } - else if((PDG==2212 || PDG==2112) && tgZ==2&&tgN==2) // n/p+He4 - { - G4double pP2=pP*pP; - G4double mNuc=G4QPDGCode(2112).GetNuclMass(tgZ,tgN,0)*.001; // MeV to GeV - G4double mNuc2=mNuc*mNuc; - G4double sM=(mNuc+mNuc)*std::sqrt(pP*pP+mProt2)+mProt2+mNuc2; // Mondelstam s - return 4*mNuc2*pP2/sM; + G4double mt=G4QPDGCode(90000000+tgZ*1000+tgN).GetMass()*.001; // Target mass in GeV + G4double dmt=mt+mt; + G4double s=dmt*std::sqrt(pP2+mProt2)+mProt2+mt*mt; // Mondelstam s + return dmt*dmt*pP2/s; } else { G4cout<<"*Error*G4QElasticCrossSection::GetQ2max: PDG="<0"< colPDG;// Vector of the projectile PDG code + static std::vector colN; // Vector of N for calculated nuclei (isotops) + static std::vector colZ; // Vector of Z for calculated nuclei (isotops) + static std::vector colP; // Vector of last momenta for the reaction + static std::vector colTH; // Vector of energy thresholds for the reaction + static std::vector colCS; // Vector of last cross sections for the reaction + // ***---*** End of the mandatory Static Definitions of the Associative Memory ***---*** + G4double pEn=std::sqrt(pMom*pMom+mel2)-mel; // ==> electron/positron kinEnergy +#ifdef pdebug + G4cout<<"G4QENCS::GetCS:>>> f="< CS=0"< New (inDB) Calculated CS="<lastTH) // Correct the threshold + { +#ifdef pdebug + G4cout<<"G4QENCS::GetCS: New T="< Threshold="< Threshold="< CS=0 + } + else if(std::fabs(lastP/pMom-1.)m+(m^2+2lm)/2M // CHIPS - Direct GEANT //G4double mT= G4QPDGCode(111).GetNuclMass(Z,N,0); G4double mT= 0.; @@ -181,8 +360,8 @@ G4double G4QElectronNuclearCrossSection::CalculateCrossSection(G4bool CS, G4int lastF = GetFunctions(A,lastJ1,lastJ2,lastJ3);//newZeroPos and J-functions filling lastH = alop*A*(1.-.072*std::log(A)); // like lastSP of G4PhotonuclearCrossSection #ifdef pdebug - G4cout<<"==>G4QElNCS::CalcCS:lJ1="<G4QElNCS::CalcCS: pJ1="<G4QElectronNuclearCS::CalcCrossSect:LOGfit b="<(a+.499); // Make the round integer of the atomic number + G4int iA=static_cast(a+.499); // Make the round integer of the atomic number G4double ai=iA; if(a!=ai) a=ai; for(G4int i=0; i get from Tab + if(std::fabs(a-A[i])<.5) // if A coincides with the basic A, get from Tab { for(G4int k=0; k G4QGluonString::ElementZ; // Z of the element(i) in theLastCalc +std::vector G4QGluonString::ElProbInMat; // SumProbabilityElements in Material +std::vector*> G4QGluonString::ElIsoN; // N of isotope(j) of Element(i) +std::vector*>G4QGluonString::IsoProbInEl;//SumProbabIsotopeInElementI + +G4QGluonString::G4QGluonString(const G4String& processName):G4VDiscreteProcess(processName) +{ +#ifdef debug + G4cout<<"G4QGluonString::Constructor is called"<0) G4cout<GetParticles(nPartCWorld); // Create CHIPS World with 234 particles + G4QNucleus::SetParameters(freeNuc,freeDib,clustProb,mediRatio); // Clusterization param's + G4Quasmon::SetParameters(Temperature,SSin2Gluons,EtaEtaprime); // Hadronic parameters + G4QEnvironment::SetParameters(SolidAngle); // SolAngle of pbar-A secondary mesons capture + //@@ Initialize here other parameters +} + +G4bool G4QGluonString::manualFlag=false; // If false then standard parameters are used +G4double G4QGluonString::Temperature=180.; // Critical Temperature (sensitive at High En) +G4double G4QGluonString::SSin2Gluons=0.3; // Supression of s-quarks (in respect to u&d) +G4double G4QGluonString::EtaEtaprime=0.3; // Supression of eta mesons (gg->qq/3g->qq) +G4double G4QGluonString::freeNuc=0.5; // Percentage of free nucleons on the surface +G4double G4QGluonString::freeDib=0.05; // Percentage of free diBaryons on the surface +G4double G4QGluonString::clustProb=5.; // Nuclear clusterization parameter +G4double G4QGluonString::mediRatio=10.; // medium/vacuum hadronization ratio +G4int G4QGluonString::nPartCWorld=152; // The#of particles initialized in CHIPS World +G4double G4QGluonString::SolidAngle=0.5; // Part of Solid Angle to capture (@@A-dep.) +G4bool G4QGluonString::EnergyFlux=false; // Flag for Energy Flux use (not MultyQuasmon) +G4double G4QGluonString::PiPrThresh=141.4; // Pion Production Threshold for gammas +G4double G4QGluonString::M2ShiftVir=20000.;// Shift for M2=-Q2=m_pi^2 of the virtualGamma +G4double G4QGluonString::DiNuclMass=1880.; // DoubleNucleon Mass for VirtualNormalization + +void G4QGluonString::SetManual() {manualFlag=true;} +void G4QGluonString::SetStandard() {manualFlag=false;} + +// Fill the private parameters +void G4QGluonString::SetParameters(G4double temper, G4double ssin2g, G4double etaetap, + G4double fN, G4double fD, G4double cP, G4double mR, + G4int nParCW, G4double solAn, G4bool efFlag, + G4double piThresh, G4double mpisq, G4double dinum) +{// ============================================================================= + Temperature=temper; + SSin2Gluons=ssin2g; + EtaEtaprime=etaetap; + freeNuc=fN; + freeDib=fD; + clustProb=cP; + mediRatio=mR; + nPartCWorld = nParCW; + EnergyFlux=efFlag; + SolidAngle=solAn; + PiPrThresh=piThresh; + M2ShiftVir=mpisq; + DiNuclMass=dinum; + G4QCHIPSWorld::Get()->GetParticles(nPartCWorld); // Create CHIPS World with 234 particles + G4QNucleus::SetParameters(freeNuc,freeDib,clustProb,mediRatio); // Clusterization param's + G4Quasmon::SetParameters(Temperature,SSin2Gluons,EtaEtaprime); // Hadronic parameters + G4QEnvironment::SetParameters(SolidAngle); // SolAngle of pbar-A secondary mesons capture +} + +// Destructor + +G4QGluonString::~G4QGluonString() {} + +// Internal E/P conservation 4-Mom & the selected number of neutrons in the Element + +G4LorentzVector G4QGluonString::GetEnegryMomentumConservation() +{ + return EnMomConservation; +} + +G4int G4QGluonString::GetNumberOfNeutronsInTarget() +{ + return nOfNeutrons; +} + +// output of the function must be in units of length! L=1/sig_V,sig_V=SUM(n(j,i)*sig(j,i)), +// where n(i,j) is a number of nuclei of the isotop j of the element i in V=1(lengtUnit^3) +// ********** All CHIPS cross sections are calculated in the surface units ************ +G4double G4QGluonString::GetMeanFreePath(const G4Track& aTrack, + G4double, G4ForceCondition* Fc) +{ +#ifdef debug + G4cout<<"G4QGluonString::GetMeanFreePath: Called Fc="<<*Fc<GetDefinition(); + if( !IsApplicable(*incidentParticleDefinition)) + G4cout<<"-W-G4QGluonString::GetMeanFreePath called for NotImplementedParticle"<GetTotalMomentum(); // 3-momentum of the Particle +#ifdef debug + G4cout<<"G4QCollis::GetMeanFreePath: BeforeGetMaterial"<GetVecNbOfAtomsPerVolume(); + const G4ElementVector* theElementVector = material->GetElementVector(); + G4int nE=material->GetNumberOfElements(); +#ifdef debug + G4cout<<"G4QGluonString::GetMeanFreePath:"<* SPI=IsoProbInEl[ip]; // Pointer to the SPI vector + SPI->clear(); + delete SPI; + std::vector* IsN=ElIsoN[ip]; // Pointer to the N vector + IsN->clear(); + delete IsN; + } + ElProbInMat.clear(); // Clean up the SumProb's of Elements (SPE) + ElementZ.clear(); // Clear the body vector for Z of Elements + IsoProbInEl.clear(); // Clear the body vector for SPI + ElIsoN.clear(); // Clear the body vector for N of Isotopes + for(G4int i=0; i(pElement->GetZ()); // Z of the Element + ElementZ.push_back(Z); // Remember Z of the Element + G4int isoSize=0; // The default for the isoVectorLength is 0 + G4int indEl=0; // Index of non-trivial element or 0(default) + G4IsotopeVector* isoVector=pElement->GetIsotopeVector(); // Get the predefined IsoVect + if(isoVector) isoSize=isoVector->size();// Get size of the existing isotopeVector +#ifdef debug + G4cout<<"G4QGluonString::GetMeanFreePath: isovectorLength="<GetIndex(); // Index of the non-trivial element + if(!Isotopes->IsDefined(Z,indEl)) // This index is not defined for this Z: define + { + std::vector*>* newAbund = + new std::vector*>; + G4double* abuVector=pElement->GetRelativeAbundanceVector(); + for(G4int j=0; jGetIsotope(j)->GetN()-Z; // N means A=N+Z ! + if(pElement->GetIsotope(j)->GetZ()!=Z)G4cerr<<"G4QCaptureAtRest::GetMeanFreePath" + <<": Z="<GetIsotope(j)->GetZ()<<"#"<* pr= new std::pair(N,abund); +#ifdef debug + G4cout<<"G4QGluonString::GetMeanFreePath:p#"<push_back(pr); + } +#ifdef debug + G4cout<<"G4QGluonString::PostStepDoIt:pairVectorLength="<size()<InitElement(Z,indEl,newAbund); // definition of the newInd + for(G4int k=0; k*>* cs= Isotopes->GetCSVector(Z,indEl);//CSPointer + std::vector* SPI = new std::vector; // Pointer to the SPI vector + IsoProbInEl.push_back(SPI); + std::vector* IsN = new std::vector; // Pointer to the N vector + ElIsoN.push_back(IsN); + G4int nIs=cs->size(); // A#Of Isotopes in the Element + G4double susi=0.; // sum of CS over isotopes + if(nIs) for(G4int j=0; j* curIs=(*cs)[j]; // A pointer, which is used twice + G4int N=curIs->first; // #of Neuterons in the isotope j of El i + IsN->push_back(N); // Remember Min N for the Element + G4double CSI=CSmanager->GetCrossSection(true,Momentum,Z,N,pPDG);//CS(j,i) for isotope +#ifdef debug + G4cout<<"GQC::GMF:X="<second = CSI; // Remenber the calculated cross-section + susi+=CSI; // Make a sum per isotopes + SPI->push_back(susi); // Remember summed cross-section + } // End of temporary initialization of the cross sections in the G4QIsotope singeltone + sigma+=Isotopes->GetMeanCrossSection(Z,indEl)*NOfNucPerVolume[i];//SUM(MeanCS*NOfNperV) + ElProbInMat.push_back(sigma); + } // End of LOOP over Elements +#ifdef debug + G4cout<<"G4QCol::GetMeanFrPa: S="< 0.) return 1./sigma; // Mean path [distance] + return DBL_MAX; // If Sigma=0, return max value for PATH +} + +// Check applicability of the process +G4bool G4QGluonString::IsApplicable(const G4ParticleDefinition& particle) +{ + if (particle == *( G4Proton::Proton() )) return true; + //else if (particle == *( G4Neutron::Neutron() )) return true; + //else if (particle == *( G4PionMinus::PionMinus() )) return true; + //else if (particle == *( G4PionPlus::PionPlus() )) return true; + //else if (particle == *( G4KaonPlus::KaonPlus() )) return true; + //else if (particle == *( G4KaonMinus::KaonMinus() )) return true; + //else if (particle == *( G4KaonZeroLong::KaonZeroLong() )) return true; + //else if (particle == *( G4KaonZeroShort::KaonZeroShort() )) return true; + //else if (particle == *( G4Lambda::Lambda() )) return true; + //else if (particle == *( G4SigmaPlus::SigmaPlus() )) return true; + //else if (particle == *( G4SigmaMinus::SigmaMinus() )) return true; + //else if (particle == *( G4SigmaZero::SigmaZero() )) return true; + //else if (particle == *( G4XiMinus::XiMinus() )) return true; + //else if (particle == *( G4XiZero::XiZero() )) return true; + //else if (particle == *( G4OmegaMinus::OmegaMinus() )) return true; + //else if (particle == *( G4AntiNeutron::AntiNeutron() )) return true; + //else if (particle == *( G4AntiProton::AntiProton() )) return true; + //else if (particle == *( G4AntiLambda::AntiLambda() )) return true; + //else if (particle == *( G4AntiSigmaPlus::AntiSigmaPlus() )) return true; + //else if (particle == *(G4AntiSigmaMinus::AntiSigmaMinus())) return true; + //else if (particle == *( G4AntiSigmaZero::AntiSigmaZero() )) return true; + //else if (particle == *( G4AntiXiMinus::AntiXiMinus() )) return true; + //else if (particle == *( G4AntiXiZero::AntiXiZero() )) return true; + //else if (particle == *(G4AntiOmegaMinus::AntiOmegaMinus())) return true; + else G4cerr<<"***G4QGluonString::IsApplicable: PDG?="<GetDefinition(); +#ifdef debug + G4cout<<"G4QGluonString::PostStepDoIt: Before the GetMeanFreePath is called"<0 +#ifdef debug + G4cout<<"G4QGluonString::PostStepDoIt: After the GetMeanFreePath is called"<Get4Momentum(); + G4double momentum = projHadron->GetTotalMomentum(); // 3-momentum of the Particle + G4double Momentum=proj4M.rho(); + if(std::fabs(Momentum-momentum)>.001) + G4cerr<<"G4QGluonString::PostStepDoIt: P="<GetElementVector(); + G4int nE=material->GetNumberOfElements(); +#ifdef debug + G4cout<<"G4QGluonString::PostStepDoIt: "<GetPDGEncoding(); + G4cout<<"G4QGluonString::PostStepDoIt: projPDG="<size(); // #of isotopes in the element i +#ifdef debug + G4cout<<"G4QCollis::PosStDoIt:n="<1) + { + G4double rndI=(*SPI)[nofIsot-1]*G4UniformRand(); // Randomize the isotop of the Element + for(j=0; j work for Hisaya @@ + // The decau process for hypernuclei must be developed in GEANT4 (change CHIPS body) + G4QHadron* hadr=(*output)[i]; // Pointer to the output hadron + G4int PDGCode = hadr->GetPDGCode(); + G4int nFrag = hadr->GetNFragments(); +#ifdef pdebug + G4cout<<"G4QGluonString::AtRestDoIt: H#"<>> f="< CS=0"< New (inDB) Calculated CS="<lastTH) // Correct the threshold + { +#ifdef pdebug + G4cout<<"G4QMNCS::GetCS: New T="< Threshold="< Threshold="< CS=0 + } + else if(std::fabs(lastP/pMom-1.)m+(m^2+2lm)/2M,l=m_mu // CHIPS - Direct GEANT //G4double mT= G4QPDGCode(111).GetNuclMass(Z,N,0); G4double mT= 0.; @@ -2447,7 +2626,7 @@ G4double G4QMuonNuclearCrossSection::GetExchangeEnergy() #endif if(risYj && j colPDG;// Vector of the projectile PDG code + static std::vector colN; // Vector of N for calculated nuclei (isotops) + static std::vector colZ; // Vector of Z for calculated nuclei (isotops) + static std::vector colP; // Vector of last momenta for the reaction + static std::vector colTH; // Vector of energy thresholds for the reaction + static std::vector colCS; // Vector of last cross sections for the reaction + // ***---*** End of the mandatory Static Definitions of the Associative Memory ***---*** + G4double pEn=pMom; +#ifdef pdebug + G4cout<<"G4QNMNCS::GetCS:>> f="< CS=0"< New (inDB) Calculated CS="<lastTH) // Correct the threshold + { +#ifdef pdebug + G4cout<<"G4QNMNCS::GetCS: New T="< Threshold="< Threshold="< CS=0 + } + else if(std::fabs(lastP/pMom-1.) colPDG;// Vector of the projectile PDG code + static std::vector colN; // Vector of N for calculated nuclei (isotops) + static std::vector colZ; // Vector of Z for calculated nuclei (isotops) + static std::vector colP; // Vector of last momenta for the reaction + static std::vector colTH; // Vector of energy thresholds for the reaction + static std::vector colCS; // Vector of last cross sections for the reaction + // ***---*** End of the mandatory Static Definitions of the Associative Memory ***---*** + G4double pEn=pMom; +#ifdef pdebug + G4cout<<"G4QPhCS::GetCS:>>> f="< CS=0"< New (inDB) Calculated CS="<lastTH) // Correct the threshold + { +#ifdef pdebug + G4cout<<"G4QPhCS::GetCS: New T="< Threshold="< Threshold="< CS=0 + } + else if(std::fabs(lastP/pMom-1.) colPDG;// Vector of the projectile PDG code + static std::vector colN; // Vector of N for calculated nuclei (isotops) + static std::vector colZ; // Vector of Z for calculated nuclei (isotops) + static std::vector colP; // Vector of last momenta for the reaction + static std::vector colTH; // Vector of energy thresholds for the reaction + static std::vector colCS; // Vector of last cross sections for the reaction + // ***---*** End of the mandatory Static Definitions of the Associative Memory ***---*** + G4double pEn=pMom; +#ifdef pdebug + G4cout<<"G4QPrCS::GetCS:>>> f="< CS=0"< New (inDB) Calculated CS="<lastTH) // Correct the threshold + { +#ifdef pdebug + G4cout<<"G4QPrCS::GetCS: New T="< Threshold="< Threshold="< CS=0 + } + else if(std::fabs(lastP/pMom-1.) +#include +#include +#include "G4KineticTrackVector.hh" +#include "G4Nucleon.hh" +#include "G4Proton.hh" +#include "G4Neutron.hh" +#include "G4LorentzRotation.hh" +#include "G4HadronicException.hh" +// #define CHIPSdebug +// #define CHIPSdebug_1 + +G4QStringChipsParticleLevelInterface::G4QStringChipsParticleLevelInterface() +{ +#ifdef debug + G4cout<<"G4QStringChipsParticleLevelInterface::Constructor is called"<> theEnergyLossPerFermi; + theEnergyLossPerFermi *= GeV; + G4cout << "Please enter nop"<> nop; + G4cout << "Please enter the fractionOfSingleQuasiFreeNucleons"<> fractionOfSingleQuasiFreeNucleons; + G4cout << "Please enter the fractionOfPairedQuasiFreeNucleons"<> fractionOfPairedQuasiFreeNucleons; + G4cout << "Please enter the clusteringCoefficient"<> clusteringCoefficient; + G4cout << "Please enter the temperature"<> temperature; + G4cout << "Please enter halfTheStrangenessOfSee"<> halfTheStrangenessOfSee; + G4cout << "Please enter the etaToEtaPrime"<> etaToEtaPrime; + G4cout << "Please enter the fusionToExchange"<> fusionToExchange; + G4cout << "Please enter cut-off for calculating the nuclear radius in percent"<> theInnerCoreDensityCut; + } +} + +G4HadFinalState* G4QStringChipsParticleLevelInterface:: +ApplyYourself(const G4HadProjectile& aTrack, G4Nucleus& theNucleus) +{ +#ifdef debug + G4cout<<"G4QStringChipsParticleLevelInterface::ApplyYourself is called"<GetPDGMass(); + static const G4double mNeut=G4Neutron::Neutron()->GetPDGMass(); + static const G4double mLamb=G4Lambda::Lambda()->GetPDGMass(); +#ifdef debug + G4cout<<"G4QStringChipsParticleLevelInterface::Propagate is called"<size() == 1) + { + G4ReactionProductVector* theFastResult = new G4ReactionProductVector; + G4ReactionProduct* theFastSec; + theFastSec = new G4ReactionProduct((*theSecondaries)[0]->GetDefinition()); + G4LorentzVector current4Mom = (*theSecondaries)[0]->Get4Momentum(); + theFastSec->SetTotalEnergy(current4Mom.t()); + theFastSec->SetMomentum(current4Mom.vect()); + theFastResult->push_back(theFastSec); + return theFastResult; + //throw G4HadronicException(__FILE__,__LINE__, + // "G4QStringChipsParticleLevelInterface: Only one particle from String models!"); + } + + // target properties needed in constructor of quasmon, and for boosting to + // target rest frame + // remove all nucleons already involved in STRING interaction, to make the ResidualTarget + theNucleus->StartLoop(); + G4Nucleon * aNucleon; + G4int resA = 0; + G4int resZ = 0; + G4ThreeVector hitMomentum(0,0,0); + G4double hitMass = 0; + unsigned int hitCount = 0; + while((aNucleon = theNucleus->GetNextNucleon())) + { + if(!aNucleon->AreYouHit()) + { + resA++; // Collect A of the ResidNuc + resZ+=G4int (aNucleon->GetDefinition()->GetPDGCharge()); // Collect Z of the ResidNuc + } + else + { + hitMomentum += aNucleon->GetMomentum().vect(); // Sum 3-mom of StringHadr's + hitMass += aNucleon->GetMomentum().m(); // Sum masses of StringHadrs + hitCount ++; // Calculate STRING hadrons + } + } + G4int targetPDGCode = 90000000 + 1000*resZ + (resA-resZ); // PDG of theResidualNucleus + G4double targetMass = theNucleus->GetMass(); // Its mass + targetMass -= hitMass; // subtract masses of knocked out nucleons (binding?! M.K.) E/M + G4double targetEnergy = std::sqrt(hitMomentum.mag2()+targetMass*targetMass); + // !! @@ Target should be at rest: hitMomentum=(0,0,0) @@ !! M.K. (go to this system) + G4LorentzVector targ4Mom(-1.*hitMomentum, targetEnergy); + + // Calculate the mean energy lost + std::pair theImpact = theNucleus->RefetchImpactXandY(); + G4double impactX = theImpact.first; + G4double impactY = theImpact.second; + G4double inpactPar2 = impactX*impactX + impactY*impactY; + + G4double radius2 = theNucleus->GetNuclearRadius(theInnerCoreDensityCut*perCent); + radius2 *= radius2; + G4double pathlength = 0.; +#ifdef pdebug + G4cout<<"G4QStringChipsParticleLevelInterface::Propagate: r="<operator[](secondary)->GetDefinition()->GetPDGCharge()<<" " + << theSecondaries->operator[](secondary)->GetDefinition()->GetPDGEncoding()<<" " + << a4Mom <Get4Momentum().rapidity()<GetDefinition()->GetPDGCharge()<<" " + << (*current).second->GetDefinition()->GetPDGEncoding()<<" " + << (*current).second->Get4Momentum() <Get4Momentum()<<" "<GetPDGCode()<GetDefinition(); + secondaries = NULL; + if(pdef->GetPDGWidth() > 0 && pdef->GetPDGLifeTime() < 5E-17*s ) + { + secondaries = aResult->Decay(); // @@ Uses standard Decay, which is now wrong! + } + if ( secondaries == NULL ) + { + theSec = new G4ReactionProduct(aResult->GetDefinition()); + G4LorentzVector current4Mom = aResult->Get4Momentum(); + current4Mom.boost(targ4Mom.boostVector()); + theSec->SetTotalEnergy(current4Mom.t()); + theSec->SetMomentum(current4Mom.vect()); +#ifdef pdebug + G4cout<<"G4QStringChipsParticleLevelInterface::Propagate: *OUT* QGS stable PDG=" + <GetDefinition()->GetPDGEncoding()<<",4M="<push_back(theSec); + } + else + { + for (unsigned int aSecondary=0; aSecondarysize(); aSecondary++) + { + theSec=new G4ReactionProduct(secondaries->operator[](aSecondary)->GetDefinition()); + G4LorentzVector current4Mom = secondaries->operator[](aSecondary)->Get4Momentum(); + current4Mom.boost(targ4Mom.boostVector()); + theSec->SetTotalEnergy(current4Mom.t()); + theSec->SetMomentum(current4Mom.vect()); +#ifdef pdebug + G4cout<<"G4QStringChipsParticleLevelInterface::Propagate: *OUT* QGS decay PDG=" + <operator[](aSecondary)->GetDefinition()->GetPDGEncoding() + <<",4M="<push_back(theSec); + } + std::for_each(secondaries->begin(), secondaries->end(), DeleteKineticTrack()); + delete secondaries; + } + } + std::for_each(theSecondaries->begin(), theSecondaries->end(), DeleteKineticTrack()); + delete theSecondaries; + + // now add the quasmon output + G4int maxParticle=output->size(); +#ifdef CHIPSdebug + G4cout << "Number of particles from string"<size()<GetPDGCharge()<<" " + << theDefinition->GetPDGEncoding()<<" " + << output->operator[](particle)->Get4Momentum() <operator[](particle); + } + delete output; + +#ifdef CHIPSdebug + G4cout << "Number of particles"<size()< colPDG;// Vector of the projectile PDG code + static std::vector colN; // Vector of N for calculated nuclei (isotops) + static std::vector colZ; // Vector of Z for calculated nuclei (isotops) + static std::vector colP; // Vector of last momenta for the reaction + static std::vector colTH; // Vector of energy thresholds for the reaction + static std::vector colCS; // Vector of last cross sections for the reaction + // ***---*** End of the mandatory Static Definitions of the Associative Memory ***---*** + G4double pEn=std::sqrt(pMom*pMom+mtu2)-mtu; // ==> tau-/tau+ kinEnergy +#ifdef pdebug + G4cout<<"G4QTNCS::GetCS:>>> f="< CS=0"< New (inDB) Calculated CS="<lastTH) // Correct the threshold + { +#ifdef pdebug + G4cout<<"G4QTNCS::GetCS: New T="< Threshold="< Threshold="< CS=0 + } + else if(std::fabs(lastP/pMom-1.)m+(m^2+2lm)/2M // CHIPS - Direct GEANT //G4double mT= G4QPDGCode(111).GetNuclMass(Z,N,0); G4double mT= 0.; diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4StringChipsParticleLevelInterface.cc b/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4StringChipsParticleLevelInterface.cc index be6a11213d..4f4ee547ff 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4StringChipsParticleLevelInterface.cc +++ b/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4StringChipsParticleLevelInterface.cc @@ -25,7 +25,9 @@ // //#define debug +//#define trapdebug //#define pdebug +//#define ppdebug #include "G4StringChipsParticleLevelInterface.hh" #include "globals.hh" @@ -41,21 +43,38 @@ // #define CHIPSdebug // #define CHIPSdebug_1 +#ifdef hdebug_SCPLI +const G4int G4StringChipsParticleLevelInterface::nbh=200; +G4double G4StringChipsParticleLevelInterface::bhmax=20.; +G4double G4StringChipsParticleLevelInterface::ehmax=20.; +G4double G4StringChipsParticleLevelInterface::bhdb=0.; +G4double G4StringChipsParticleLevelInterface::ehde=0.; +G4double G4StringChipsParticleLevelInterface::toth=0.; +G4int G4StringChipsParticleLevelInterface::bover=0; +G4int G4StringChipsParticleLevelInterface::eover=0; +G4int* G4StringChipsParticleLevelInterface::bhis = + new G4int[G4StringChipsParticleLevelInterface::nbh]; +G4int* G4StringChipsParticleLevelInterface::ehis = + new G4int[G4StringChipsParticleLevelInterface::nbh]; +#endif + G4StringChipsParticleLevelInterface::G4StringChipsParticleLevelInterface() { #ifdef debug G4cout<<"G4StringChipsParticleLevelInterface::Constructor is called"<GetPDGMass(); static const G4double mNeut=G4Neutron::Neutron()->GetPDGMass(); static const G4double mLamb=G4Lambda::Lambda()->GetPDGMass(); + static const G4double mKChg=G4KaonPlus::KaonPlus()->GetPDGMass(); + static const G4double mKZer=G4KaonZero::KaonZero()->GetPDGMass(); + static const G4double mPiCh=G4PionMinus::PionMinus()->GetPDGMass(); + static const G4int pcl=4; // clusterization parameter for Energy Flow + static const G4QContent ProtQC(1,2,0,0,0,0); + static const G4QContent NeutQC(2,1,0,0,0,0); + static const G4QContent LambQC(1,1,1,0,0,0); + static const G4QContent KPlsQC(0,1,0,0,0,1); + static const G4QContent KMinQC(0,0,1,0,1,0); + static const G4QContent AKZrQC(1,0,0,0,0,1); + static const G4QContent KZerQC(1,0,0,0,0,1); + static const G4QContent PiMiQC(1,0,0,0,1,0); + static const G4QContent PiPlQC(0,1,0,1,0,0); #ifdef debug G4cout<<"G4StringChipsParticleLevelInterface::Propagate is called"<GetNuclearRadius(theInnerCoreDensityCut*perCent); + //G4double radius2 = theNucleus->GetNuclearRadius(theInnerCoreDensityCut*perCent); radius2 *= radius2; G4double pathlength = 0.; -#ifdef pdebug +#ifdef ppdebug G4cout<<"G4StringChipsParticleLevelInterface::Propagate: r="<0 collection ---------- + G4QContent EnFlowQC(0,0,0,0,0,0); + G4LorentzVector EnFlow4M(0.,0.,0.,0.); + //G4bool empty=true; + G4int barys=0; + G4int stras=0; + G4int chars=0; + for(G4int hp = theContents.size()-1; hp>=0; hp--) { - G4QHadron* aHadron = new G4QHadron(theContents[hp], *(theMomenta[hp]) ); + G4QContent curQC=theContents[hp]; + G4int baryn = curQC.GetBaryonNumber(); + G4int stran = curQC.GetStrangeness(); + G4int charg = curQC.GetCharge(); + EnFlowQC += curQC; // Keep collecting energy flow + EnFlow4M += *(theMomenta[hp]); + barys += baryn; // Collected baryon number + stras += stran; // Collected strangeness + chars += charg; // Collected charge + //empty = false; + } + if(barys>pcl) // Split in two or more parts (to survive!) + { + G4int nprt=(barys-1)/pcl+1; // Number of parts (pcl=4: 2:5-8,3:9-12...) + G4int curb=barys; + while (nprt>0) + { + nprt--; // One part is going to be created + G4int brnm=pcl; // Baryon number of splitting part + curb-=brnm; // The residual baryon number + G4double prtM=0.; // The resulting GS mass of the part + G4double resM=0.; // The resulting GS mass of the residual + G4QContent prtQC(0,0,0,0,0,0); // The resulting Quark Content of the part + G4int strm=0; // Max strangeness per part (stras=0) + if(stras>0) strm=(stras-1)/nprt+1; // Max strangeness per part (stras>0) + else if(stras<0) strm=(stras+1)/nprt-1; // Max strangeness per part (stras<0) + G4int chgm=0; // Max charge per part (chars=0) + if(stras>0) chgm=(chars-1)/nprt+1; // Max strangeness per part (chars>0) + else if(stras<0) chgm=(chars+1)/nprt-1; // Max strangeness per part (chars<0) + // ---> calculate proposed separated part + //@@ Convert it to a CHIPS function (Which class? G4QH::Conctruct?) + if(!strm) // --> The total strangness = 0 (n/p/pi-) + { + if(chgm<0) // (n/pi-) + { + prtM=(-chgm)*mPiCh+brnm*mNeut; + prtQC=(-chgm)*PiMiQC+brnm*NeutQC; + } + else // (n/p) + { + prtM=chgm*mProt+(brnm-chgm)*mNeut; + prtQC=chgm*ProtQC+(brnm-chgm)*NeutQC; + } + } + else if(strm>=brnm) // ---> BigPositiveStrangeness(L/Pi+/K0/K-) + { + G4int stmb=strm-brnm; + if(chgm<0) // (L/K-/K0) + { + prtM=(-chgm)*mKChg+brnm*mLamb+std::abs(stmb+chgm)*mKZer; + prtQC=(-chgm)*KMinQC+brnm*LambQC; + if(stmb>-chgm) prtQC+=(stmb+chgm)*KZerQC; + else if(stmb<-chgm) prtQC+=(-stmb-chgm)*AKZrQC; + } + else // (L/K0/pi+) + { + prtM=chgm*mPiCh+(strm-brnm)*mKZer+brnm*mLamb; + prtQC=chgm*PiPlQC+(strm-brnm)*KZerQC+brnm*LambQC; + } + } + else if(strm>0) // ---> PositiveStrangeness=bmst) // (L/p/Pi+) + { + prtM=(chgm-bmst)*mPiCh+strm*mLamb+bmst*mProt; + prtQC=(chgm-bmst)*PiPlQC+strm*LambQC+bmst*ProtQC; + } + else // ch NegativeStrangeness (N/K+/aK0/Pi-) + { + G4int bmst=brnm-strm; + if(chgm>=bmst) // (K+/p/Pi+) + { + prtM=(-strm)*mKChg+brnm*mProt+(chgm-bmst)*mPiCh; + prtQC=(-strm)*KPlsQC+brnm*ProtQC+(chgm-bmst)*PiPlQC; + } + else if(chgm>=-strm) // (K+/p/n) + { + prtM=(-strm)*mKChg+chgm*mProt+(brnm-chgm)*mNeut; + prtQC=(-strm)*KPlsQC+chgm*ProtQC+(brnm-chgm)*NeutQC; + } + else if(chgm>=0) // (K+/aK0/n) + { + prtM=chgm*mKChg+(-chgm-strm)*mKZer+brnm*mNeut; + prtQC=chgm*KPlsQC+(-chgm-strm)*AKZrQC+brnm*NeutQC; + } + else // ch<0 (aK0/n/Pi-) + { + prtM=(-strm)*mKChg+(-chgm)*mPiCh+brnm*mNeut; + prtQC=(-strm)*KPlsQC+(-chgm)*PiMiQC+brnm*NeutQC; + } + } + EnFlowQC-=prtQC; + chgm=chars-chgm; // Just to keep the same notation + strm=stras-strm; + brnm=curb; + if(!strm) // --> The total strangness = 0 (n/p/pi-) + { + if(chgm<0) resM=(-chgm)*mPiCh+brnm*mNeut; + else resM=chgm*mProt+(brnm-chgm)*mNeut; + } + else if(strm>=brnm) // ---> BigPositiveStrangeness(L/Pi+/K0/K-) + { + G4int stmb=strm-brnm; + if(chgm<0) resM=(-chgm)*mKChg+brnm*mLamb+std::abs(stmb+chgm)*mKZer; + else resM=chgm*mPiCh+(strm-brnm)*mKZer+brnm*mLamb; + } + else if(strm>0) // ---> PositiveStrangeness=bmst) resM=(chgm-bmst)*mPiCh+strm*mLamb+bmst*mProt; + else resM=chgm*mProt+strm*mLamb+(bmst-chgm)*mNeut; + } + else // ---> NegativeStrangeness (N/K+/aK0/Pi-) + { + G4int bmst=brnm-strm; + if (chgm>=bmst) resM=(-strm)*mKChg+brnm*mProt+(chgm-bmst)*mPiCh; + else if(chgm>=-strm) resM=(-strm)*mKChg+chgm*mProt+(brnm-chgm)*mNeut; + else if(chgm>=0) resM=chgm*mKChg+(-chgm-strm)*mKZer+brnm*mNeut; + else resM=(-strm)*mKChg+(-chgm)*mPiCh+brnm*mNeut; + } + G4LorentzVector prt4M=(prtM/(prtM+resM))*EnFlow4M; + EnFlow4M-=prt4M; + EnFlowQC-=prtQC; + G4QHadron* aHadron = new G4QHadron(prtQC, prt4M); + projHV.push_back(aHadron); + if(nprt==1) + { + G4QHadron* fHadron = new G4QHadron(EnFlowQC, EnFlow4M); + projHV.push_back(fHadron); + nprt=0; + } +#ifdef debug + G4cout<<"G4StringChipsParticleLevelInterface::Propagate: nprt="<0 collection ---------- too forward + //G4QContent EnFlowQC(0,0,0,0,0,0); + //G4LorentzVector EnFlow4M(0.,0.,0.,0.); + //G4bool empty=true; + //G4int barys=0; + //for(G4int hp = theContents.size()-1; hp>=0; hp--) + //{ + // G4QContent curQC=theContents[hp]; + // G4int baryn = curQC.GetBaryonNumber(); + // if(baryn>0 && barys>0 && !empty) // New baryon and b-positive collection -> fill + // { + // G4QHadron* aHadron = new G4QHadron(EnFlowQC, EnFlow4M); + // projHV.push_back(aHadron); + // EnFlowQC = G4QContent(0,0,0,0,0,0); + // EnFlow4M = G4LorentzVector(0.,0.,0.,0.); + // barys=0; + // empty=true; + // } + // EnFlowQC += curQC; // Keep collecting energy flow + // EnFlow4M += *(theMomenta[hp]); + // barys += baryn; + // empty = false; + //} + //if(!empty) + //{ + // G4QHadron* aHadron = new G4QHadron(EnFlowQC, EnFlow4M); + // projHV.push_back(aHadron); + //} + // End of Energy Flow One Quasmon for each ---------------------------- } else // Never come here (!?) { @@ -459,42 +697,84 @@ Propagate(G4KineticTrackVector* theSecondaries, G4V3DNucleus* theNucleus) G4KineticTrack* aResult = (*current).second; G4ParticleDefinition* pdef=aResult->GetDefinition(); secondaries = NULL; - if(pdef->GetPDGWidth() > 0 && pdef->GetPDGLifeTime() < 5E-17*s ) + //if(pdef->GetPDGWidth() > 0 && pdef->GetPDGLifeTime() < 5E-17*s ) // HPW version + if ( pdef->IsShortLived() ) { - secondaries = aResult->Decay(); // @@ Uses standard Decay, which is now wrong! + secondaries = aResult->Decay(); + for (unsigned int aSecondary=0; aSecondarysize(); aSecondary++) + { + G4KineticTrack* bResult=secondaries->operator[](aSecondary); + G4ParticleDefinition* sdef=bResult->GetDefinition(); + if ( sdef->IsShortLived() ) + { + secsec = bResult->Decay(); + for (unsigned int bSecondary=0; bSecondarysize(); bSecondary++) + { + G4KineticTrack* cResult=secsec->operator[](bSecondary); + G4ParticleDefinition* cdef=cResult->GetDefinition(); + theSec = new G4ReactionProduct(cdef); + G4LorentzVector cur4Mom = cResult->Get4Momentum(); + cur4Mom.boost(targ4Mom.boostVector()); + theSec->SetTotalEnergy(cur4Mom.t()); + theSec->SetMomentum(cur4Mom.vect()); +#ifdef trapdebug + if(cdef->GetPDGEncoding()==113) G4cout + <<"G4StringChipsParticleLevelInterface::Propagate: *Rho0* QGS dec2 PDG=" + <GetPDGEncoding()<<",4M="<GetPDGCharge()<<" " diff --git a/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4VQCrossSection.cc b/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4VQCrossSection.cc index e1fa986752..94612002d8 100644 --- a/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4VQCrossSection.cc +++ b/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4VQCrossSection.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VQCrossSection.cc,v 1.10 2006/06/29 20:08:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VQCrossSection.cc,v 1.13 2006/12/09 14:33:35 mkossov Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // CHIPS virtual class: G4VQCrossSection for the collision cross sections @@ -48,215 +48,11 @@ #include "G4VQCrossSection.hh" // Initialization of the -G4int G4VQCrossSection::lastPDG=0; // The last PDG code of the projectile -G4int G4VQCrossSection::lastN=0; // The last N of calculated nucleus -G4int G4VQCrossSection::lastZ=0; // The last Z of calculated nucleus -G4double G4VQCrossSection::lastTH=0.; // Last threshold momentum -G4double G4VQCrossSection::lastCS=0.;// Last value of the Cross Section -G4double G4VQCrossSection::lastP=0.; // Last used in cross section TheMomentum -//G4int G4VQCrossSection::lastN1=0; // Last used in cross section TheNumOfBin1 -//G4int G4VQCrossSection::lastF1=0; // Last used in cross section TheFirstBin1 -//G4int G4VQCrossSection::lastL1=0; // Last used in cross section TheLastBin1 -//G4int G4VQCrossSection::lastN2=0; // Last used in cross section TheNumOfBin1 -//G4int G4VQCrossSection::lastF2=0; // Last used in cross section TheFirstBin1 -//G4int G4VQCrossSection::lastL2=0; // Last used in cross section TheLastBin1 -//G4double G4VQCrossSection::lastBP=0.; // Last value of the Boundary Momentum -//G4double G4VQCrossSection::lastMP=0.; // Last value of the Maximum Momentum - -G4int G4VQCrossSection::lastI=0; // The last position in the DAMDB -G4double G4VQCrossSection::tolerance=.001; // The last position in the DAMDB - -// Set the new tolerance (abs(p_old/p_new-1) colPDG;// Vector of the projectile PDG code - static std::vector colN; // Vector of N for calculated nuclei (isotops) - static std::vector colZ; // Vector of Z for calculated nuclei (isotops) - static std::vector colP; // Vector of last momenta for the reaction - static std::vector colTH; // Vector of energy thresholds for the reaction - static std::vector colCS; // Vector of last cross sections for the reaction - // ***---*** End of the mandatory Static Definitions of the Associative Memory ***---*** - G4double pEn=pMom; - G4int apPDG=std::abs(pPDG); - // @@ if the threshold exists for other particles, then p->T must be genergal (p=0->T=o) - if (apPDG==11) pEn=std::sqrt(pMom*pMom+mel2)-mel; // ==> electron/positron kinEnergy - else if(apPDG==13) pEn=std::sqrt(pMom*pMom+mmu2)-mmu; // ==> mu-/mu+ kinEnergy - else if(apPDG==15) pEn=std::sqrt(pMom*pMom+mtu2)-mtu; // ==> tau-/tau+ kinEnergy -#ifdef pdebug - G4cout<<"G4VQCS::GetCS:>>>> f="< CS=0"< New (inDB) Calculated CS="<lastTH) // Correct the threshold - { -#ifdef pdebug - G4cout<<"G4VQCS::GetCS: New T="< Threshold="< Threshold="< CS=0 - } - else if(std::fabs(lastP/pMom-1.)238 (N.Starkov) + +26 Sept 2006 - V.Ivanchenko (hadr-cohe-V08-01-04) +------------------------------------------------- + Introduce extra protection - below lowestEnergy (10-6 eV) not active + +10 August 2006 - V.Ivanchenko (hadr-cohe-V08-01-03) +--------------------------------------------------- + Introduce NaN check inside G4HadronElastic, G4ChargeExchange, + and G4UHadronElasticProcess; + +24 July 2006 - V.Ivanchenko (hadr-cohe-V08-01-02) +----------------------------------------------- + Remove HP data from G4UHadronElasticProcess (it is set in physics lists) + Add low energy threshold for QElastic 20 MeV inside G4HadronElastic + +13 July 2006 - V.Ivanchenko (hadr-cohe-V08-01-01) +----------------------------------------------- + Fix bug: remove 1 keV limit from G4UHadronElasticProcess + +07 July 2006 - V.Ivanchenko (hadr-cohe-V08-01-00) +----------------------------------------------- + Fix bug: the rotation of final state need to be done in PostStep of + the process, not on the model level (V.Ivanchenko) + 21 June 2006 - V.Ivanchenko (hadr-cohe-V08-00-09) ----------------------------------------------- Fix - remove nan values n scattering on deuteron (V.Ivanchenko) diff --git a/source/processes/hadronic/models/coherent_elastic/include/G4ChargeExchange.hh b/source/processes/hadronic/models/coherent_elastic/include/G4ChargeExchange.hh index 3e7379f7f0..cbe8934a4d 100644 --- a/source/processes/hadronic/models/coherent_elastic/include/G4ChargeExchange.hh +++ b/source/processes/hadronic/models/coherent_elastic/include/G4ChargeExchange.hh @@ -24,14 +24,15 @@ // ******************************************************************** // // -// $Id: G4ChargeExchange.hh,v 1.2 2006/06/29 20:08:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ChargeExchange.hh,v 1.3 2006/08/02 10:55:54 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Model: Charge and strangness exchange based on G4LightMedia model // 28 May 2006 V.Ivanchenko // // Modified: +// 25-Jul-06 V.Ivanchenko add 19 MeV low energy, below which S-wave is sampled // // @@ -58,7 +59,6 @@ public: G4ChargeExchange(G4HadronElastic* hel = 0, G4double elim = 100.*keV, - G4double plow = 200.*MeV, G4double ehigh= GeV); virtual ~G4ChargeExchange(); @@ -67,7 +67,7 @@ public: const G4HadProjectile & aTrack, G4Nucleus & targetNucleus); - void SetMomentumLow(G4double value); + void SetKinEnergyLow(G4double value); void SetKinEnergyHigh(G4double value); @@ -108,14 +108,14 @@ private: G4ParticleDefinition* theA; G4ParticleDefinition* theHe3; - G4double ekinlim; // in MeV - G4double plablow; // in MeV/c - G4double ekinhigh; // in MeV/c + G4double ekinlim; + G4double ekinlow; + G4double ekinhigh; }; -inline void G4ChargeExchange::SetMomentumLow(G4double value) +inline void G4ChargeExchange::SetKinEnergyLow(G4double value) { - plablow = value; + ekinlow = value; } inline void G4ChargeExchange::SetKinEnergyHigh(G4double value) diff --git a/source/processes/hadronic/models/coherent_elastic/include/G4ChargeExchangeProcess.hh b/source/processes/hadronic/models/coherent_elastic/include/G4ChargeExchangeProcess.hh index ef425042fd..bfbfbb42b2 100644 --- a/source/processes/hadronic/models/coherent_elastic/include/G4ChargeExchangeProcess.hh +++ b/source/processes/hadronic/models/coherent_elastic/include/G4ChargeExchangeProcess.hh @@ -25,7 +25,7 @@ // // // $Id: G4ChargeExchangeProcess.hh,v 1.2 2006/06/29 20:08:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Geant4 Hadron Elastic Charge Exchange Process -- header file diff --git a/source/processes/hadronic/models/coherent_elastic/include/G4DiffElasticHadrNucleus.hh b/source/processes/hadronic/models/coherent_elastic/include/G4DiffElasticHadrNucleus.hh deleted file mode 100644 index b149b1f30a..0000000000 --- a/source/processes/hadronic/models/coherent_elastic/include/G4DiffElasticHadrNucleus.hh +++ /dev/null @@ -1,298 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: G4DiffElasticHadrNucleus.hh,v 1.15 2006/06/29 20:08:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// - -// High energy hadron-nucleus elastic scattering -// Kinetic energy T > 1 GeV -// N. Starkov 2003. -// -// Modifications: -// 14.11.05 The HE elastic scattering on proton is added (N.Starkov) -// 30.05.06 New version, which not uses elastic data (N.Starkov) -// 30.05.06 cleanup (V.Ivanchenko) -// - -#ifndef G4DiffElasticHadrNucleus_h -#define G4DiffElasticHadrNucleus_h 1 - -#include "G4Nucleus.hh" -#include "G4DynamicParticle.hh" -#include "G4HadronValues.hh" -#include "G4IntegrHadrNucleus.hh" - -// ############################################### -class NucleusParameters -{ - -public: - - NucleusParameters() {;} - virtual ~NucleusParameters(){;} - - NucleusParameters & operator= (const NucleusParameters &t) - { - if(this!=&t) - { - R1 = t.R1; - R2 = t.R2; - Aeff = t.Aeff; - Pnucl = t.Pnucl; - } - return *this; - } - - void GetNucleusParameters(G4int AtWeight); - - G4double R1, R2, Aeff, Pnucl; -}; - -// ################################################ -class G4DiffElasticHadrNucleus: public //G4HadronValues - G4IntegrHadrNucleus -{ - -public: - G4DiffElasticHadrNucleus() : // G4HadronValues(), - G4IntegrHadrNucleus() - { - Factors(); - Binom(); - r0 = 1.1; // The WS's parameters - r01 = 1.16; - rAmax = 2.5; - NpointsB = 500; - FmToGeV = 5.068; - Fm2ToGeV2= FmToGeV*FmToGeV; - } - - virtual ~G4DiffElasticHadrNucleus() {;} - - G4double HadrNuclDifferCrSec( - const G4DynamicParticle * aHadron, - G4Nucleus * aNucleus, - G4double Q2); - - G4double HadrNuclDifferCrSecT( - const G4DynamicParticle * aHadron, - G4Nucleus * aNucleus, - G4double Q2, - G4int Kind); - - G4double Thickness(G4int A, G4double b); - - void GetIntegrandB(G4int Anucleus); - - G4double GetIntegrandS(G4int Anucleus, G4double b, G4int Kind); - - void GetNucleusParameters(G4Nucleus * aNucleus); - - G4double HadronProtonDiffCrSec(G4double Q2); - - void GetKinematics(const G4DynamicParticle * aHadron); - - void GetParametersHP(const G4DynamicParticle * aHadron); - - G4double LineInterpol(G4double p0, G4double p1, - G4double c0, G4double c1, - G4double p); -// ==================================================== - G4double MyJ0(G4double x) - { - G4double x1, x2, x3, x4, x5, x6, x7, f0, th0, res; - - x2 = x*x/9.0; - - if(std::fabs(x)<=3.0) - { - x3 = x2*x2; - x4 = x3*x2; - x5 = x4*x2; - x6 = x5*x2; - x7 = x6*x2; - res = 1.0-2.2499997*x2+1.2656208*x3- - 0.3163866*x4+0.0444479*x5- - 0.0039444*x6+0.0002100*x7; - } - else - { - x1 = x/3.0; - x3 = x2*x1; - x4 = x3*x1; - x5 = x4*x1; - x6 = x5*x1; - f0 = 0.7978456 -0.00000077/x- - 0.00552740/x2-0.00009512/x3+ - 0.00137237/x4-0.00072805/x5+ - 0.00014476/x6; - th0 = x-0.78539816 -0.04166397/x1- - 0.00003954/x2+0.00262573/x3- - 0.00054125/x4-0.00029333/x5+ - 0.00013558/x6; - res = f0*std::cos(th0)/std::sqrt(x); - } - return res; - } -// +++++++++++++++++++++++++++++++++++++++++++++ - G4double MyI0(G4double x) - { - G4double p1=1.0, p2=3.5156229, p3=3.0899424, - p4=1.2067492, p5=0.2659732, p6=3.360768e-2, - p7=4.5813e-3; - G4double q1=0.39894228, q2=1.328592e-2, q3=2.25319e-3, - q4=-1.57565e-3, q5=9.16281e-3, q6=-2.057706e-2, - q7=2.635537e-2, q8=-1.647633e-2, q9=3.922377e-3; - - G4double k1=3.75, ax=std::fabs(x), y=0.0, result=0.0; - - if(ax0) && (N>M) && M>0) - { - J = J*(N-M+1)/M; - Fact1 = J; - } - SetBinom[N][M] = Fact1; -// G4cout<<" N M "<1) & (N>=M)) - Fact1 = Factorials[N]/Factorials[M]/Factorials[N-M]; - return Fact1; - } -// +++++++++++++++++++++++++++++++++++++++++++++++++++ - G4double Factorial(G4int N) - { - G4double Res=1; - - if(N == 0) return Res; - - if(N < 100) for(G4int M = 1; M<=N; M++) Res = Res*M; - - if(N >= 100) Res = 2.50662827* - std::exp(static_cast(-N-1))* - std::pow(static_cast(N+1),N+0.5)* - (1.+1./12./(N+1)+1./288./(N+1)/(N+1)- - 139./51840./(N+1)/(N+1)/(N+1)- - 571./2488320./(N+1)/(N+1)/(N+1)/(N+1)); - return Res; - } -// +++++++++++++++++++++++++++++++++++++++++++++++++++ - void Factors() - { - G4int ii, ll, mm; - G4double Sum1, Fac1, Fac3, Sum3; - - Factorials[0] = 1; - - for( ii = 1; ii<140; ii++) - { - Factorials[ii] = Factorial(ii); - if(ii >= 100) Mnoj[ii] = 3.03; // there is the saturation - else - { - Sum1 = 0; - Fac1 = 1; - for( ll = 0; ll<=ii; ll++) - { - Fac1 = binom(ii,ll); - Fac3 = 1; - Sum3 = 1; - for( mm = 1; mm<=ii-ll; mm++) - { - Fac3 = binom(ii-ll,mm); - Sum3 = Sum3 + 1/Fac3; - } // mm - Sum1 = Sum1 + Sum3/Fac1; - } // ll - Mnoj[ii] = Sum1; - } // else - } // ii - Mnoj[0] = 1; - } // Factors -// -------------------------------------------------------- - -public: - - G4double Fm2ToGeV2, FmToGeV; - - G4double SigTot, Slope, ReOnIm, HdrE, ConstU, Q2; - G4double ProtonM, HadronM, HadronE, Sh, PM2, HM2; - - G4double EcmP, EcmH, Kcm, CosCM, SqrtS, MaxT, FmaxT, DsigDt; - G4double Slope1, Slope2, Coeff1, Coeff2, IntConst, MaxTR; - G4double Slope0, Coeff0; - G4int NumbPointsB, NumbPointsT, HadrCode; - G4String HadronName; - - G4double Mnoj[250], Factorials[250]; - G4double ReIntegrand[1000], ImIntegrand[1000], Thick[1000]; - G4double rAfm, rAGeV, stepB, MomentumCMN, MomentumH; - - G4double R1, R2, Pnucl, Aeff, AIm, ARe, Dem, DIm, InCoh, InCohI; - G4double r0, r01, rAmax; - G4double BoundaryP[7], BoundaryTL[7], BoundaryTG[7]; - G4int NpointsB, HadrCodes[7], Intern; - G4double SetBinom[240][240]; -}; - -#endif diff --git a/source/processes/hadronic/models/coherent_elastic/include/G4ElasticHadrNucleusHE.hh b/source/processes/hadronic/models/coherent_elastic/include/G4ElasticHadrNucleusHE.hh index 2807fa1372..601b790d07 100644 --- a/source/processes/hadronic/models/coherent_elastic/include/G4ElasticHadrNucleusHE.hh +++ b/source/processes/hadronic/models/coherent_elastic/include/G4ElasticHadrNucleusHE.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4ElasticHadrNucleusHE.hh,v 1.25 2006/06/29 20:09:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ElasticHadrNucleusHE.hh,v 1.33 2006/12/13 15:45:22 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4ElasticHadrNucleusHe.hh @@ -33,10 +33,10 @@ // The hadron kinetic energy T > 1 GeV // N. Starkov 2003. // -// Modifications: // 19.05.04 Variant for G4 6.1: The 'ApplyYourself' was changed -// 14.11.05 The HE elastic scattering on proton is added (N.Starkov) -// 30.05.06 Version without use of elastic data (N.Starkov) +// 19.11.05 The HE elastic scattering on proton is added (N.Starkov) +// 16.11.06 General redesign (N.Starkov) +// 23.11.06 General cleanup, ONQ0=3 (V.Ivanchenko) // #ifndef G4ElasticHadrNucleusHE_h @@ -46,182 +46,72 @@ #include "globals.hh" #include "G4ParticleDefinition.hh" -#include "G4Ions.hh" -#include "G4ParticleTable.hh" -#include "G4NucleiProperties.hh" #include "G4ParticleChange.hh" -#include "G4Track.hh" -#include "Randomize.hh" #include "G4Nucleus.hh" -#include "G4IonTable.hh" -#include "G4DiffElasticHadrNucleus.hh" -#include "G4IntegrHadrNucleus.hh" #include "G4HadronicInteraction.hh" -#define ONQ2 150 // The number of steps on Q2 -#define ONE 5 // The number of steps on E -#define AreaNumb 6 // The number of order steps on E -#define ONQ2XE ONQ2*ONE // The dimension of a distr. func. array -#define MaxN 10 // The atomic number where the calculation - // on the formula is changed on the integral - // one +static const G4int ONQ0 = 3; // The initial number of steps on Q2 +static const G4int ONQ2 = 150; // The total number of steps on Q2 +static const G4int NENERGY = 30; +static const G4int NQTABLE = NENERGY*ONQ2; class ElasticData { public: - G4String hadrName; - G4int nuclAtomicNumber; - G4double TableE[ONE*AreaNumb]; + ElasticData(const G4ParticleDefinition* h, + G4int AtomWeight); + + ~ElasticData(){;} + + void GetNucleusParameters(G4int Nucleus); + const G4ParticleDefinition* Hadron() {return hadr;} + + // ============================================ + void fillQ2limit(); + + const G4ParticleDefinition* hadr; + G4int AtomicWeight; + G4int dnkE[NENERGY]; G4double TableQ2[ONQ2]; - G4double TableFQ2[ONQ2]; - G4double TableCrossSec[ONQ2XE*AreaNumb]; - G4double CurrentT; - G4int CurrentN, Nstep; - G4double RandMax, theMaxQ2; - G4double Weight, dQ2; - G4double theR1, R2, Pnucl, Aeff; - NucleusParameters NucPar; - - ElasticData() {;} - - ElasticData(G4String HadrName, G4int AtomWeight); - - virtual ~ElasticData(){;} - - ElasticData (const ElasticData &t) - { - G4int k; - - hadrName = t.hadrName; - nuclAtomicNumber = t.nuclAtomicNumber; - - for(k = 0; k SetOfElasticData; - ElasticData ElD; - NucleusParameters NucPar; - - G4IonTable * MyIonTable; - G4DiffElasticHadrNucleus aDiffElHadNcls; - -// G4HadFinalState FinState; + // G4String HadronName; + G4double R1, R2, Pnucl, Aeff; + G4double Energy[NENERGY]; +// +++++++++++++++++++++++++++++++++++++++++++++++++++ + std::vector SetOfElasticData; G4int Nstep, // The number of steps on Q2 iKindWork, // @@ -251,17 +162,40 @@ public: iPoE; // The number of steps on E G4int iTypeWork, CurrentN; G4double aNucleon; -// ,* pTableCrSec, // The array of distr. func. -// // at all energies -// * pTableE; // The array of E values - G4double iQ2[ONQ2], // The array of Q2 values - pTableCrSec[ONQ2XE*AreaNumb], - pTableE[ONE*AreaNumb], - iIntgr[ONQ2], // The array of distr. func. - // at one energy - Factorials1[250]; // The array for factorials - G4double dEbeg1, dEend1, dQ2, maxQ2, RandMax; -}; // The end of the class description -// ###################################################### -#endif + G4double dEbeg1, dEend1, dQ2, maxQ2; + G4double SetBinom[240][240]; + +// ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + void Binom() + { + G4int N, M; + G4double Fact1, J; + + for(N=0; N<240; N++) + { + J = 1; + for(M=0; M<=N; M++) + { + Fact1 = 1; + if ((N>0) && (N>M) && M>0) + { + J = J*(N-M+1)/M; + Fact1 = J; + } + SetBinom[N][M] = Fact1; + } + } + return; + } + + void GetHadronValues(const G4ParticleDefinition * aHadron, + G4double TotMom); + + G4double HadrTot, HadrSlope, HadrReIm, DDSect2, DDSect3, MomentumCM; + + G4double Q2res; + +}; // The end of the class description + +#endif diff --git a/source/processes/hadronic/models/coherent_elastic/include/G4HadronElastic.hh b/source/processes/hadronic/models/coherent_elastic/include/G4HadronElastic.hh index 35b4fb18aa..834b5dfb5f 100644 --- a/source/processes/hadronic/models/coherent_elastic/include/G4HadronElastic.hh +++ b/source/processes/hadronic/models/coherent_elastic/include/G4HadronElastic.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4HadronElastic.hh,v 1.11 2006/06/29 20:09:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4HadronElastic.hh,v 1.21 2006/11/21 19:38:53 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Model: Low energy elastic scattering with 4-momentum balance @@ -35,6 +35,11 @@ // Modified: // 14-Dec-05 V.Ivanchenko rename the class // 13-Apr-06 V.Ivanchenko move to coherent_elastic +// 25-Jul-06 V.Ivanchenko add 19 MeV low energy, below which S-wave is sampled +// 20-Oct-06 V.Ivanchenko default ekinhigh = GeV (use HE model) +// 16-Nov-06 V.Ivanchenko remove definition +// 16-Nov-06 V.Ivanchenko default ekinhigh = 0.4*GeV +// 16-Nov-06 V.Ivanchenko cleanup and rename Set methods and variables // // // Class Description @@ -66,9 +71,7 @@ class G4HadronElastic : public G4HadronicInteraction { public: - G4HadronElastic(G4double elim = 100.*keV, - G4double plow = 20.*MeV, - G4double ehigh= DBL_MAX); + G4HadronElastic(G4double e1=0.0,G4double e2=0.0, G4double e3=0.0); virtual ~G4HadronElastic(); @@ -79,9 +82,15 @@ public: G4ElasticHadrNucleusHE* GetHElastic(); - void SetMomentumLow(G4double value); + void SetPlabLowLimit(G4double value); - void SetKinEnergyHigh(G4double value); + void SetHEModelLowLimit(G4double value); + + void SetQModelLowLimit(G4double value); + + void SetLowestEnergyLimit(G4double value); + + void SetRecoilKinEnergyLimit(G4double value); G4double SampleT(G4double p, G4double m1, G4double m2, G4double A); @@ -103,24 +112,43 @@ private: G4VQCrossSection* qCManager; G4ElasticHadrNucleusHE* hElastic; - const G4ParticleDefinition* theProton; - const G4ParticleDefinition* theNeutron; - const G4ParticleDefinition* theDeuteron; - const G4ParticleDefinition* theAlpha; + G4ParticleDefinition* theProton; + G4ParticleDefinition* theNeutron; + G4ParticleDefinition* theDeuteron; + G4ParticleDefinition* theAlpha; + const G4ParticleDefinition* thePionPlus; + const G4ParticleDefinition* thePionMinus; - G4double ekinlim; // in MeV - G4double plablow; // in MeV/c - G4double ekinhigh; // in MeV/c + G4double lowEnergyRecoilLimit; + G4double lowEnergyLimitHE; + G4double lowEnergyLimitQ; + G4double lowestEnergyLimit; + G4double plabLowLimit; }; -inline void G4HadronElastic::SetMomentumLow(G4double value) +inline void G4HadronElastic::SetRecoilKinEnergyLimit(G4double value) { - plablow = value; + lowEnergyRecoilLimit = value; } -inline void G4HadronElastic::SetKinEnergyHigh(G4double value) +inline void G4HadronElastic::SetPlabLowLimit(G4double value) { - ekinhigh = value; + plabLowLimit = value; +} + +inline void G4HadronElastic::SetHEModelLowLimit(G4double value) +{ + lowEnergyLimitHE = value; +} + +inline void G4HadronElastic::SetQModelLowLimit(G4double value) +{ + lowEnergyLimitQ = value; +} + +inline void G4HadronElastic::SetLowestEnergyLimit(G4double value) +{ + lowestEnergyLimit = value; } #endif diff --git a/source/processes/hadronic/models/coherent_elastic/include/G4UHadronElasticProcess.hh b/source/processes/hadronic/models/coherent_elastic/include/G4UHadronElasticProcess.hh index 549de27af4..654e0c7594 100644 --- a/source/processes/hadronic/models/coherent_elastic/include/G4UHadronElasticProcess.hh +++ b/source/processes/hadronic/models/coherent_elastic/include/G4UHadronElasticProcess.hh @@ -24,14 +24,15 @@ // ******************************************************************** // // -// $Id: G4UHadronElasticProcess.hh,v 1.5 2006/06/29 20:09:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4UHadronElasticProcess.hh,v 1.10 2006/11/16 20:09:13 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Geant4 Hadron Elastic Scattering Process -- header file // // Created 21 April 2006 V.Ivanchenko // // Modified: +// 26.09.06 V.Ivanchenko add lowestEnergy // // Class Description @@ -54,7 +55,8 @@ class G4UHadronElasticProcess : public G4HadronicProcess { public: - G4UHadronElasticProcess(const G4String& procName = "hElastic", G4bool fl = true); + G4UHadronElasticProcess(const G4String& procName = "hElastic", + G4double elow = 19.*MeV); virtual ~G4UHadronElasticProcess(); @@ -67,10 +69,11 @@ public: virtual void DumpPhysicsTable(const G4ParticleDefinition& aParticleType); - virtual G4double GetMeanFreePath(const G4Track&, G4double, G4ForceCondition*); + virtual G4double GetMeanFreePath(const G4Track&, G4double, + G4ForceCondition*); - virtual G4double GetMicroscopicCrossSection(const G4DynamicParticle* aParticle, - const G4Element* anElement, + virtual G4double GetMicroscopicCrossSection(const G4DynamicParticle*, + const G4Element*, G4double aTemp); void SetQElasticCrossSection(G4VQCrossSection*); @@ -86,12 +89,12 @@ private: G4Nucleus targetNucleus; G4double xsec[40]; - G4double xsecH[2]; + G4double xsecH[4]; G4double cross; G4double thEnergy; + G4double lowestEnergy; G4int pPDG; - G4bool flagHP; G4bool first; }; diff --git a/source/processes/hadronic/models/coherent_elastic/src/G4ChargeExchange.cc b/source/processes/hadronic/models/coherent_elastic/src/G4ChargeExchange.cc index 9b004de845..0babb86cfb 100644 --- a/source/processes/hadronic/models/coherent_elastic/src/G4ChargeExchange.cc +++ b/source/processes/hadronic/models/coherent_elastic/src/G4ChargeExchange.cc @@ -24,14 +24,16 @@ // ******************************************************************** // // -// $Id: G4ChargeExchange.cc,v 1.3 2006/06/29 20:09:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ChargeExchange.cc,v 1.7 2006/10/20 15:22:24 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Model: Charge and strangness exchange based on G4LightMedia model // 28 May 2006 V.Ivanchenko // // Modified: +// 07-Jun-06 V.Ivanchenko fix problem of rotation of final state +// 25-Jul-06 V.Ivanchenko add 19 MeV low energy, below which S-wave is sampled // #include "G4ChargeExchange.hh" @@ -46,20 +48,21 @@ G4ChargeExchange::G4ChargeExchange(G4HadronElastic* hel, G4double elim, - G4double plow, G4double ehigh) + G4double ehigh) : G4HadronicInteraction(), fElastic(hel), native(false), ekinlim(elim), - plablow(plow), ekinhigh(ehigh) { SetMinEnergy( 0.0*GeV ); - SetMaxEnergy( DBL_MAX ); + SetMaxEnergy( 100.*TeV ); + ekinlow = 19.0*MeV; + verboseLevel= 0; if(!fElastic) { native = true; - fElastic = new G4HadronElastic(elim, plow, ehigh); + fElastic = new G4HadronElastic(); } qCManager = fElastic->GetCS(); hElastic = fElastic->GetHElastic(); @@ -105,16 +108,22 @@ G4HadFinalState* G4ChargeExchange::ApplyYourself( { theParticleChange.Clear(); const G4HadProjectile* aParticle = &aTrack; + G4double ekin = aParticle->GetKineticEnergy(); + G4double aTarget = targetNucleus.GetN(); G4double zTarget = targetNucleus.GetZ(); - theParticleChange.SetEnergyChange(aTrack.GetKineticEnergy()); - theParticleChange.SetMomentumChange(aTrack.Get4Momentum().vect().unit()); + G4int Z = static_cast(zTarget); G4int A = static_cast(aTarget); - if(A < 3) return &theParticleChange; + + if(ekin == 0.0 || A < 3) { + theParticleChange.SetEnergyChange(ekin); + theParticleChange.SetMomentumChange(aTrack.Get4Momentum().vect().unit()); + return &theParticleChange; + } G4double plab = aParticle->GetTotalMomentum(); - G4double ekin = aParticle->GetKineticEnergy(); + if (verboseLevel > 1) G4cout << "G4ChargeExchange::DoIt: Incident particle plab=" << plab/GeV << " GeV/c " @@ -253,7 +262,7 @@ G4HadFinalState* G4ChargeExchange::ApplyYourself( G4ThreeVector p1 = lv1.vect(); G4double e1 = 0.5*etot*(1.0 + (m21*m21 - m11*m11)/(etot*etot)); - G4double e2 = etot - e1; + // G4double e2 = etot - e1; G4double ptot = std::sqrt(e1*e1 - m11*m11); G4double tmax = 4.0*ptot*ptot; @@ -261,14 +270,12 @@ G4HadFinalState* G4ChargeExchange::ApplyYourself( // Choose generator G4ElasticGenerator gtype = fLElastic; - if ((theParticle == theProton || theParticle == theNeutron) && Z <= 2) { + if ((theParticle == theProton || theParticle == theNeutron) && + Z <= 2 && ekin >= ekinlow) { gtype = fQElastic; - if(Z == 1 && N == 2) N = 1; - else if (Z == 2 && N == 1) N = 2; - } else if(ekin >= ekinhigh) { - gtype = fHElastic; - } else if(plab <= plablow) { - gtype = fSWave; + } else { + if(ekin >= ekinlow) gtype = fSWave; + else if(ekin >= ekinhigh) gtype = fHElastic; } // Sample t @@ -277,14 +284,41 @@ G4HadFinalState* G4ChargeExchange::ApplyYourself( G4cout << "G4ChargeExchange: Z= " << Z << " N= " << N << " pdg= " << projPDG << " mom(GeV)= " << plab/GeV << " " << qCManager << G4endl; + if(Z == 1 && N == 2) N = 1; + else if (Z == 2 && N == 1) N = 2; G4double cs = qCManager->GetCrossSection(false,plab,Z,N,projPDG); if(cs > 0.0) t = qCManager->GetExchangeT(Z,N,projPDG); else gtype = fSWave; } - if(gtype == fSWave) t = G4UniformRand()*tmax; - else if(gtype == fHElastic) t = hElastic->SampleT(theParticle,plab,Z,A); - else if(gtype == fLElastic) t = GeV*GeV*fElastic->SampleT(ptot,m1,m2,aTarget); + if(gtype == fHElastic) { + t = hElastic->SampleT(theParticle,plab,Z,A); + if(t > tmax) gtype = fSWave; + } + + if(gtype == fLElastic) { + t = GeV*GeV*fElastic->SampleT(ptot,m1,m2,aTarget); + if(t > tmax) gtype = fSWave; + } + + // NaN finder + if(!(t < 0.0 || t >= 0.0)) { + if (verboseLevel > -1) { + G4cout << "G4ChargeExchange:WARNING: Z= " << Z << " N= " + << N << " pdg= " << projPDG + << " mom(GeV)= " << plab/GeV + << " the model type " << gtype; + if(gtype == fQElastic) G4cout << " CHIPS "; + else if(gtype == fLElastic) G4cout << " LElastic "; + else if(gtype == fHElastic) G4cout << " HElastic "; + G4cout << " t= " << t + << " S-wave will be sampled" + << G4endl; + } + gtype = fSWave; + } + + if(gtype == fSWave) t = G4UniformRand()*tmax; if(verboseLevel>1) G4cout <<"type= " << gtype <<" t= " << t << " tmax= " << tmax @@ -300,11 +334,9 @@ G4HadFinalState* G4ChargeExchange::ApplyYourself( G4cout << "cos(t)=" << cost << " std::sin(t)=" << sint << G4endl; G4ThreeVector v1(sint*std::cos(phi),sint*std::sin(phi),cost); - p1 = p1.unit(); - v1.rotateUz(p1); v1 *= ptot; G4LorentzVector nlv1(v1.x(),v1.y(),v1.z(),e1); - G4LorentzVector nlv0(-v1.x(),-v1.y(),-v1.z(),e2); + G4LorentzVector nlv0 = lv0 + lv1 - nlv1; nlv0.boost(bst); nlv1.boost(bst); diff --git a/source/processes/hadronic/models/coherent_elastic/src/G4ChargeExchangeProcess.cc b/source/processes/hadronic/models/coherent_elastic/src/G4ChargeExchangeProcess.cc index 23a07fa2b9..3b64a8e938 100644 --- a/source/processes/hadronic/models/coherent_elastic/src/G4ChargeExchangeProcess.cc +++ b/source/processes/hadronic/models/coherent_elastic/src/G4ChargeExchangeProcess.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4ChargeExchangeProcess.cc,v 1.4 2006/06/29 20:09:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ChargeExchangeProcess.cc,v 1.7 2006/08/10 15:44:28 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Geant4 Hadron Elastic Scattering Process -- header file @@ -34,6 +34,8 @@ // // Modified: // 24-Apr-06 V.Ivanchenko add neutron scattering on hydrogen from CHIPS +// 07-Jun-06 V.Ivanchenko fix problem of rotation of final state +// 25-Jul-06 V.Ivanchenko add 19 MeV low energy for CHIPS // // @@ -55,7 +57,7 @@ G4ChargeExchangeProcess::G4ChargeExchangeProcess(const G4String& procName) : G4HadronicProcess(procName), first(true) { - thEnergy = 1.*keV; + thEnergy = 19.*MeV; verboseLevel= 1; qCManager = 0; AddDataSet(new G4HadronElasticDataSet); @@ -187,7 +189,8 @@ G4double G4ChargeExchangeProcess::GetMicroscopicCrossSection( if(iz == 1) return x; // CHIPS cross sections G4double momentum = dp->GetTotalMomentum(); - if(iz <= -2 && (theParticle == theProton || theParticle == theNeutron)) { + if(iz == 2 && dp->GetKineticEnergy() > thEnergy && + (theParticle == theProton || theParticle == theNeutron)) { G4double momentum = dp->GetTotalMomentum(); if(verboseLevel>1) G4cout << "G4ChargeExchangeProcess compute CHIPS CS for Z= 2, N=2 " @@ -201,6 +204,20 @@ G4double G4ChargeExchangeProcess::GetMicroscopicCrossSection( << G4endl; x = store->GetCrossSection(dp, elm, temp); } + + // NaN finder + if(!(x < 0.0 || x >= 0.0)) { + if (verboseLevel > -1) { + G4cout << "G4ChargeExchangeProcess WARNING: Z= " << iz + << " pdg= " << pPDG + << " mom(GeV)= " << dp->GetTotalMomentum()/GeV + << " cross= " << x + << " set to zero" + << G4endl; + } + x = 0.0; + } + if(verboseLevel>1) G4cout << "G4ChargeExchangeProcess cross(mb)= " << x/millibarn << " E(MeV)= " << dp->GetKineticEnergy() @@ -277,6 +294,7 @@ G4VParticleChange* G4ChargeExchangeProcess::PostStepDoIt( aParticleChange.Initialize(track); G4HadFinalState* result = hadi->ApplyYourself(thePro, targetNucleus); + G4ThreeVector indir = track.GetMomentumDirection(); G4int nsec = result->GetNumberOfSecondaries(); if(verboseLevel>1) @@ -293,6 +311,11 @@ G4VParticleChange* G4ChargeExchangeProcess::PostStepDoIt( aParticleChange.SetNumberOfSecondaries(nsec); for(G4int j=0; jGetSecondary(j)->GetParticle(); + G4ThreeVector pdir = p->GetMomentumDirection(); + // G4cout << "recoil " << pdir << G4endl; + pdir = pdir.rotateUz(indir); + // G4cout << "recoil rotated " << pdir << G4endl; + p->SetMomentumDirection(pdir); aParticleChange.AddSecondary(p); } } diff --git a/source/processes/hadronic/models/coherent_elastic/src/G4DiffElasticHadrNucleus.cc b/source/processes/hadronic/models/coherent_elastic/src/G4DiffElasticHadrNucleus.cc deleted file mode 100644 index abc86faabb..0000000000 --- a/source/processes/hadronic/models/coherent_elastic/src/G4DiffElasticHadrNucleus.cc +++ /dev/null @@ -1,1016 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: G4DiffElasticHadrNucleus.cc,v 1.23 2006/06/29 20:09:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// Geant4 class G4DiffElasticHadrNucleus -// -// High energy hadron-nucleus elastic scattering -// Kinetic energy T > 1 GeV -// N. Starkov 2003. -// -// 14.11.05 The HE elastic scattering on proton is added (N.Starkov) -// 30.05.06 New version, which not uses elastic data (N.Starkov) -// 30.05.06 cleanup (int -> G4int) (V.Ivanchenko) -// - -#include "globals.hh" -#include "G4DiffElasticHadrNucleus.hh" - -// ########################################################## -void NucleusParameters::GetNucleusParameters(G4int Nucleus) - { - - if(Nucleus == 208) - { -// R1 = 20.73; R2 = 15.74. - R1 = 4.1408*std::pow(static_cast(Nucleus),0.3018); - R2 = 3.806*std::pow(Nucleus-10.068,0.2685); - Pnucl = 0.9; - Aeff = 1.1; - R1 = 19.5; - R2 = 15.74; - Pnucl = 0.4; - Aeff = 0.7; - } - - else if(Nucleus == 90) - { - R1 = 16.50; - R2 = 11.62; - Pnucl = 0.4; - Aeff = 0.9; - R1 = 16.5; - R2 = 11.62; - Pnucl = 0.4; - Aeff = 0.7; - } - - else if(Nucleus == 58) - { - R1 = 15.0; - R2 = 9.9; - Pnucl = 0.45; - Aeff = 0.85; - } - else if(Nucleus == 16) - { - R1 = 10.50; - R2 = 5.5; - Pnucl = 0.7; - Aeff = 0.98; -// R1 = 11.3; -// R2 = 2.5; -// Pnucl = 0.75; -// Aeff = 0.9; - } - else - { - if(Nucleus == 28) - R1 = 4.25*std::pow(static_cast(Nucleus-1),0.309); - else - R1 = 4.45*std::pow(static_cast(Nucleus-1),0.309); - R2 = 2.3*std::pow(static_cast(Nucleus),0.36); - Pnucl = 0.176+0.00167*Nucleus+ - 8.69E-6*Nucleus*Nucleus; - Aeff = 0.9; - } - - if(Nucleus == 9) - { - R1 = 9.0; - R2 = 7.0; - Pnucl = 0.190; - Aeff = 0.9; - } -/* - if(Nucleus == 12) - { - R1 = 9.336; - R2 = 5.63; - Pnucl = 0.197; - Aeff = 01.0; - } -*/ -/* - if(Nucleus == 11) - { - R1 = 10.8; - R2 = 7.5; - Pnucl = 0.85; - Aeff = 1.2; - } -*/ - if(Nucleus == 4) - { - R1 = 5.5; - R2 = 3.7; - Pnucl = 0.4; - Aeff = 0.87; - } - -// G4cout<<" Nucl.Par. "<GetN(); - -// G4cout<<" Nucl.Par. "<(Nucleus),0.3018); - R2 = 3.806*std::pow(Nucleus-10.068,0.2685); - Pnucl = 0.9; - Aeff = 1.1; - R1 = 19.5; - R2 = 15.74; - Pnucl = 0.4; - Aeff = 0.7; - } - - else if(Nucleus == 90) - { - R1 = 16.50; - R2 = 11.62; - Pnucl = 0.4; - Aeff = 0.9; - R1 = 16.5; - R2 = 11.62; - Pnucl = 0.4; - Aeff = 0.7; - } - - else if(Nucleus == 58) - { - R1 = 15.0; - R2 = 9.9; - Pnucl = 0.45; - Aeff = 0.85; - } - else if(Nucleus == 16) - { - R1 = 10.50; - R2 = 5.5; - Pnucl = 0.7; - Aeff = 0.98; -// R1 = 11.3; -// R2 = 2.5; -// Pnucl = 0.75; -// Aeff = 0.9; - } - else - { - R1 = 4.45*std::pow(static_cast(Nucleus-1),0.309); - if(Nucleus == 28) - R1 = 4.25*std::pow(static_cast(Nucleus-1),0.309); - R2 = 2.3*std::pow(static_cast(Nucleus),0.36); - Pnucl = 0.176+0.00167*Nucleus+ - 8.69E-6*Nucleus*Nucleus; - Aeff = 0.9; - } - - if(Nucleus == 9) - { - R1 = 9.0; - R2 = 7.0; - Pnucl = 0.190; - Aeff = 0.9; - } -/* - if(Nucleus == 12) - { - R1 = 9.336; - R2 = 5.63; - Pnucl = 0.197; - Aeff = 01.0; - } -*/ -/* - if(Nucleus == 11) - { - R1 = 10.8; - R2 = 7.5; - Pnucl = 0.85; - Aeff = 1.2; - } -*/ - if(Nucleus == 4) - { - R1 = 5.5; - R2 = 3.7; - Pnucl = 0.4; - Aeff = 0.87; - } - -// G4cout<<" Nucl.Par. "<GetTotalEnergy()/GeV; // GeV - G4double MassH = aHadron->GetMass()/GeV; - - G4int Nucleus = (G4int)aNucleus->GetN(); - - if(Nucleus==2 || Nucleus == 3) - G4Exception(" This model does not work for nuclei with A=3 0r A= 4"); - - if(Nucleus>238) - G4Exception(" This nucleus is very heavy for this model !!!"); - - if(energy-MassH < 1.0) - G4Exception(" The hadron kinetic energy is low for this model (< 1 GeV"); - - G4HadronValues::GetHadronValues(aHadron); - GetTotalCrossSection(aHadron, aNucleus); - - GetNucleusParameters(aNucleus); - - G4double theQ2 = aQ2/GeV/GeV; // GeV - - G4double MassN = - aNucleus->AtomicMass(aNucleus->GetN(),aNucleus->GetZ())/GeV; - G4double S = 2*MassN*energy+MassN*MassN+MassH*MassH; - G4double ecmH = (S-MassN*MassN+MassH*MassH)/2/std::sqrt(S); - G4double momentumCMN = std::sqrt(ecmH*ecmH-MassH*MassH); - - G4double MbToB = 2.568; // from mb to GeV^-2 - G4double Pi1 = pi; - G4double Stot = HadrTot*MbToB; //In GeV-2 - G4double Bhad = HadrSlope; //In GeV-2 - G4double Asq = 1+HadrReIm*HadrReIm; - G4double Rho2 = std::sqrt(Asq); - G4double Pnuclp = 0.001; - Pnuclp = Pnucl; - G4double R12 = R1*R1; - G4double R22 = R2*R2; - G4double R12B = R12+2*Bhad; - G4double R22B = R22+2*Bhad; -// G4double R12Bp = R12+20; -// G4double R22Bp = R22+20; -// G4double R13Bp = R12*R1/R12Bp; -// G4double R23Bp = R22*R2/R22Bp; - G4double R12Ap = R12+20; - G4double R22Ap = R22+20; - G4double R13Ap = R12*R1/R12Ap; - G4double R23Ap = R22*R2/R22Ap*Pnuclp; -// G4double R23App = R22*R2/R22Ap*Pnuclp; - G4double R23dR13 = R23Ap/R13Ap; - G4double R12Apd = 2/R12Ap; - G4double R22Apd = 2/R22Ap; - G4double R12ApdR22Ap = 0.5*(R12Apd+R22Apd); - - G4double DDSec1p = (DDSect2+DDSect3*std::log(1.06*2*energy/R1/4)); - G4double DDSec2p = (DDSect2+DDSect3*std::log(1.06*2*energy/ - std::sqrt((R12+R22)/2)/4)); - G4double DDSec3p = (DDSect2+DDSect3*std::log(1.06*2*energy/R2/4)); - - G4double Norm = (R12*R1-Pnucl*R22*R2)*Aeff; - G4double Normp = (R12*R1-Pnuclp*R22*R2)*Aeff; - G4double R13 = R12*R1/R12B; - G4double R23 = Pnucl*R22*R2/R22B; - G4double Unucl = Stot/2/Pi1/Norm*R13; - G4double UnuclScr = Stot/2/Pi1/Normp*R13Ap; - G4double SinFi = HadrReIm/Rho2; - G4double FiH = std::asin(SinFi); - G4double N = -1; - G4double N2 = R23/R13; - - G4double ImElasticAmpl0 = 0; - G4double ReElasticAmpl0 = 0; - - G4double exp1; - G4double N4; - G4double Prod1, Tot1=0, medTot, DTot1, DmedTot; - G4int i; - - for( i=1; i<=Nucleus; i++) - { - N = -N*Unucl*(Nucleus-i+1)/i*Rho2; - N4 = 1; - Prod1 = std::exp(-theQ2/i*R12B/4)/i*R12B; - medTot = R12B/i; - - for(G4int l=1; l<=i; l++) - { - exp1 = l/R22B+(i-l)/R12B; - N4 = -N4*(i-l+1)/l*N2; - Prod1 = Prod1+N4/exp1*std::exp(-theQ2/exp1/4); - medTot = medTot+N4/exp1; - } // end l - - ReElasticAmpl0 = ReElasticAmpl0+Prod1*N*std::sin(FiH*i); - ImElasticAmpl0 = ImElasticAmpl0+Prod1*N*std::cos(FiH*i); - Tot1 = Tot1+medTot*N*std::cos(FiH*i); - if(std::fabs(Prod1*N/ImElasticAmpl0) < 0.000001) break; - } // i - - ImElasticAmpl0 = ImElasticAmpl0*Pi1/2.568; // The amplitude in mB - ReElasticAmpl0 = ReElasticAmpl0*Pi1/2.568; // The amplitude in mB - Tot1 = Tot1*Pi1*2.0/2.568; - - G4double N1p = 1; - G4double Din1 = 0.5*(R13Ap*R13Ap*std::exp(-theQ2/8*R12Ap)/2*R12Ap/2*DDSec1p- - 2*R23Ap*R13Ap/2/R12ApdR22Ap*std::exp(-theQ2/4/R12ApdR22Ap)*DDSec2p+ - R23Ap*R23Ap/2*R22Ap/2*std::exp(-theQ2/8*R22Ap)*DDSec3p); // at i=0 - - DTot1 = 0.5*(R13Ap*R13Ap/2*R12Ap/2*DDSec1p- - 2*R23Ap*R13Ap/2/R12ApdR22Ap*DDSec2p+ - R23Ap*R23Ap/2*R22Ap/2*DDSec3p); // at i=0 - -///// if(Nucleus>95 && HadrEnergy>1000) {Din1=0; goto tam;} - - G4double exp1p; - G4double exp2p; - G4double exp3p; - G4double N2p; - G4double Din2, BinCoeff; - - BinCoeff = 1; - - for( i = 1; i<= Nucleus-2; i++) - { - N1p = -N1p*UnuclScr*(Nucleus-i-1)/i*Rho2; - N2p = 1; - Din2 = 0; - DmedTot = 0; - for(G4int l = 0; l<=i; l++) - { - if(l == 0) BinCoeff = 1; - else if(l !=0 ) BinCoeff = BinCoeff*(i-l+1)/l; - - exp1 = l/R22B+(i-l)/R12B; - exp1p = exp1+R12Apd; - exp2p = exp1+R12ApdR22Ap; - exp3p = exp1+R22Apd; - - Din2 = Din2 + N2p*BinCoeff* - (R13Ap*R13Ap/2/exp1p*std::exp(-theQ2/4/exp1p)*DDSec1p- - 2*R13Ap*R23Ap/2/exp2p*std::exp(-theQ2/4/exp2p)*DDSec2p+ - R23Ap*R23Ap/2/exp3p*std::exp(-theQ2/4/exp3p)*DDSec3p); - - DmedTot = DmedTot + N2p*BinCoeff* - (R13Ap*R13Ap/2/exp1p*DDSec1p- - 2*R13Ap*R23Ap/2/exp2p*DDSec2p+ - R23Ap*R23Ap/2/exp3p*DDSec3p); - - N2p = -N2p*R23dR13; - } // l - - Din1 = Din1+Din2*N1p*Mnoj[i]/(i+2)/(i+1)*std::cos(FiH*i); - DTot1 = DTot1+DmedTot*N1p*Mnoj[i]/(i+2)/(i+1)*std::cos(FiH*i); - - if(std::fabs(Din2*N1p/Din1) < 0.000001) break; - } // i - - Din1 = -1*Din1*Nucleus*(Nucleus-1) - /2/Pi1/Normp/2/Pi1/Normp*16*Pi1*Pi1; - - DTot1 = 1*DTot1*Nucleus*(Nucleus-1) - /2/Pi1/Normp/2/Pi1/Normp*16*Pi1*Pi1; - -/// Din1 *= 0; -// ---------------- dSigma/dOmegaCM, mb/Ster ----------------- - -// tam: - G4double Corr0=Tot00/Tot1/1.0; // Corr1=DTot00/DTot1/1.0; - - ImElasticAmpl0 *= Corr0; -// Din1 *= Corr1; - - G4double DiffCrSec2 = (ReElasticAmpl0*ReElasticAmpl0+ - (ImElasticAmpl0+Din1)* - (ImElasticAmpl0+Din1))* - 2.568/4/Pi1/Pi1 - *momentumCMN*momentumCMN; - - AIm = ImElasticAmpl0; - ARe = ReElasticAmpl0; - DIm = Din1; - - return DiffCrSec2; // dSig/dOmegaCM, mb/Ster - } // function -// ############################################## - G4double G4DiffElasticHadrNucleus:: - Thickness(G4int A, G4double b) - { - G4double An=A, Dn, Ct, Tn, Bn, En, A1, A2; - G4int kk; - G4double dr, r, WSo, WS, SumZ=0, SumN; - - dr = rAmax*rAfm/(NpointsB-1); - - G4double Norm = 3.0/4.0/3.1416/rAfm/rAfm/rAfm/ - (1+0.53*0.53*3.14*3.14/rAfm/rAfm); - -// Norm = 1/(SqrtPi*Rlight*Rlight*Rlight*3.1416)/ -// (1+1.5*alpha*Rlight*Rlight); - - A1 = 2.0*A*dr*Norm; - A2 = 4.0*3.1416*dr*Norm; - - SumN = 0.0; - for(kk=0; kk 320) continue; - - ExpS = std::exp(-(ValS*ValS+ImpactPar*ImpactPar)/2.0/HadrSlope); - I0bs = MyI0(FunS); - - FunS = ValS*ExpS*I0bs*Thick[iInt]; - Integ += FunS; - } - return Integ*stepB; - } -// ############################################# - void G4DiffElasticHadrNucleus:: - GetIntegrandB(G4int Anucleus) - { - G4double ValB; - G4int iInt; - G4double expB, IntegS, InExp; - G4double Sigm=HadrTot/2/HadrSlope*MbToGeV2; - - for(iInt=0; iIntGetTotalEnergy()/GeV; // GeV - G4int Nucleus = (G4int)aNucleus->GetN(); - G4double MassH = aHadron->GetMass()/GeV; - - if(Nucleus==2 || Nucleus==3) - G4Exception(" This nucleus is very light for this model !!!"); - - if(Nucleus>238) - G4Exception(" This nucleus is very heavy for this model !!!"); - - if(energy-MassH < 1.0) - G4Exception(" The hadron energy is very low for this model !!!"); - - G4HadronValues::GetHadronValues(aHadron); - - G4double theQ2 = aQ2/GeV/GeV; // GeV - - G4int kk; - G4double ValB; - G4double ReIntSumm=0.0, ImIntSumm=0.0; - G4double Mnojit = 0.0; - - if(Kind == 0) - { - switch(Nucleus) - { - case(208) : r0 = 1.125; - r01 = 1.16*0.0; - break; - case(90) : r0 = 1.12; - r01 = 1.16*0.0; - break; - case(58) : r0 = 1.09; - r01 = 1.16*0.0; - break; - case(48) : r0 = 1.07; - r01 = 1.16*0.0; - break; - - case(40) : r0 = 1.15; - r01 = 1.16*0.0; - break; - case(28) : r0 = 0.93; - r01 = 1.16*0.0; - break; - case(16) : r0 = 0.92; - r01 = 1.16*0.0; - break; - case(12) : r0 = 0.8; - r01 = 1.16*0.0; - break; - case(64) : r0 = 1.1; - r01 = 1.16*0.0; - break; - default : Re = std::pow(static_cast(Nucleus), 0.3333); - r0 = 1.16*(1.0-1.16/Re/Re); - } - - Mnojit = stepB/8.* - std::pow(HadrTot*2.568,2)* - (1+std::pow(HadrReIm,2))/2.56; - - - rAfm = r0*std::pow(static_cast(Nucleus), 0.3333)* - (1-r01/std::pow(static_cast(Nucleus),0.666)); - rAGeV = rAfm*std::sqrt(25.68); - stepB = rAmax*rAGeV/(NpointsB-1); - - GetIntegrandB(Nucleus); - InCohI = 0.0; - } - - G4double Simps = 4; - - for(kk=0; kk3) Simps = 2; - } - - InCoh = InCohI* -// 2.0*3.1416*stepB -// /16/3.1416*std::pow(HadrTot*2.568,2)* -// (1+std::pow(HadrReIm,2))/2.568* - std::exp(-HadrSlope*theQ2)/3.; - - G4double MassN = - aNucleus->AtomicMass(aNucleus->GetN(),aNucleus->GetZ())/GeV; - G4double S = 2*MassN*energy+MassN*MassN+MassH*MassH; - G4double ecmH = (S-MassN*MassN+MassH*MassH)/2/std::sqrt(S); - G4double momentumCMN = std::sqrt(ecmH*ecmH-MassH*MassH); - - G4double Section = (ReIntSumm*ReIntSumm+ImIntSumm*ImIntSumm) - /twopi*2.568*momentumCMN*momentumCMN*stepB*stepB/3.; - -// Section = (ReIntSumm*ReIntSumm+ImIntSumm*ImIntSumm) -// /2.0/Pi1*2.568*MomentumCMN*MomentumCMN; - - return Section; -} -// ===================================================== - void G4DiffElasticHadrNucleus:: - GetKinematics(const G4DynamicParticle * aHadron) - { - HadronName = aHadron->GetDefinition()->GetParticleName(); - - GetHadronValues(aHadron); - - SigTot = HadrTot; - ReOnIm = HadrReIm; - - if(Slope==0) Slope = HadrSlope; - - IntConst = (1-Coeff1)/Slope; - - ProtonM = proton_mass_c2/GeV; - HadronE = aHadron->GetTotalEnergy()/GeV; // GeV - HdrE = HadronE; - MomentumH = aHadron->GetTotalMomentum()/GeV; // GeV - HadronM = aHadron->GetMass()/GeV; // GeV - - PM2 = ProtonM*ProtonM; - HM2 = HadronM*HadronM; - Sh = 2.0*ProtonM*HadronE+PM2+HM2; // GeV - SqrtS = std::sqrt(Sh); - ConstU = 2*PM2+2*HM2-Sh; - - EcmH = (Sh+HM2-PM2)/2/SqrtS; - EcmP = (Sh-HM2+PM2)/2/SqrtS; - - Kcm = std::sqrt(EcmH*EcmH-HM2); - MaxT = 4*Kcm*Kcm; - - BoundaryP[0]=9.0; BoundaryTG[0]=5.0;BoundaryTL[0]=MaxT/2.0; - BoundaryP[1]=20.0;BoundaryTG[1]=1.5;BoundaryTL[1]=MaxT; - BoundaryP[2]=4.0; BoundaryTG[2]=1.0;BoundaryTL[2]=1.5; - BoundaryP[3]=4.0; BoundaryTG[3]=3.0;BoundaryTL[3]=MaxT; - BoundaryP[4]=4.0; BoundaryTG[4]=3.0;BoundaryTL[4]=MaxT; - BoundaryP[5]=5.0; BoundaryTG[5]=2.0;BoundaryTL[5]=MaxT; - BoundaryP[6]=4.0; BoundaryTG[6]=1.5;BoundaryTL[6]=3.0; - - HadrCodes[0] = 2212; HadrCodes[1] = 2112; - HadrCodes[2] = -2212; HadrCodes[3] = 211; - HadrCodes[4] = -211; HadrCodes[5] = 321; - HadrCodes[6] = -321; - - HadrCode = aHadron->GetDefinition()->GetPDGEncoding(); - - G4int NumberH=0; - - while(HadrCode!=HadrCodes[NumberH]) NumberH++; - - if(MomentumHGetDefinition()->GetPDGEncoding(); - HadrP = aHadron->GetTotalMomentum()/GeV; - - switch(HadrCode) - { - case 2212 : - case 3122 : - case 3222 : - case 3112 : - case 3212 : - case 3312 : - case 3322 : - case 3334 : - { - G4double EnP[6]={1.5,3.0,5.0,9.0,14.0,19.0}; - G4double C0P[6]={0.15,0.02,0.06,0.08,0.0003,0.0002}; - G4double C1P[6]={0.05,0.02,0.03,0.025,0.0,0.0}; - G4double B0P[6]={1.5,2.5,3.0,4.5,1.4,1.25}; - G4double B1P[6]={5.0,1.0,3.5,4.0,4.8,4.8}; - - if(BoundaryP[0]EnP[iStep]) iStep++; - - Coeff0 = LineInterpol(EnP[iStep], EnP[iStep-1], - C0P[iStep], C0P[iStep-1], - HadrP); - - Coeff1 = LineInterpol(EnP[iStep], EnP[iStep-1], - C1P[iStep], C1P[iStep-1], - HadrP); - - Slope0 = LineInterpol(EnP[iStep], EnP[iStep-1], - B0P[iStep], B0P[iStep-1], - HadrP); - - Slope1 = LineInterpol(EnP[iStep], EnP[iStep-1], - B1P[iStep], B1P[iStep-1], - HadrP); - } // else - } break; // case 2212 - - case 2112 : - case -2112 : - { - G4double EnN[5]={1.5,5.0,10.0,14.0,20.0}; - G4double C0N[5]={0.0,0.0,0.02,0.02,0.01}; - G4double C1N[5]={0.06,0.008,0.0015,0.001,0.0003}; - G4double B0N[5]={1.5,2.5,3.8,3.8,3.5}; - G4double B1N[5]={1.5,2.2,3.6,4.5,4.8}; - - if(BoundaryP[1]EnN[iStep]) iStep++; - - Coeff0 = LineInterpol(EnN[iStep], EnN[iStep-1], - C0N[iStep], C0N[iStep-1], - HadrP); - - Coeff1 = LineInterpol(EnN[iStep], EnN[iStep-1], - C1N[iStep], C1N[iStep-1], - HadrP); - - Slope0 = LineInterpol(EnN[iStep], EnN[iStep-1], - B0N[iStep], B0N[iStep-1], - HadrP); - - Slope1 = LineInterpol(EnN[iStep], EnN[iStep-1], - B1N[iStep], B1N[iStep-1], - HadrP); - Coeff2 = 0.8/HadrP/HadrP; - Slope2 = 5; - } // else - } break; // case 2112 - - case -2212 : - case -3122 : - case -3222 : - case -3112 : - case -3212 : - case -3312 : - case -3322 : - case -3334 : - { - G4double EnP[2]={1.5,4.0}; - G4double C0P[2]={0.001,0.0005}; - G4double C1P[2]={0.003,0.001}; - G4double B0P[2]={2.5,4.5}; - G4double B1P[2]={1.0,4.0}; - - if(BoundaryP[2]EnP[iStep]) iStep++; - - Coeff0 = LineInterpol(EnP[iStep], EnP[iStep-1], - C0P[iStep], C0P[iStep-1], - HadrP); - - Coeff1 = LineInterpol(EnP[iStep], EnP[iStep-1], - C1P[iStep], C1P[iStep-1], - HadrP); - - Slope0 = LineInterpol(EnP[iStep], EnP[iStep-1], - B0P[iStep], B0P[iStep-1], - HadrP); - - Slope1 = LineInterpol(EnP[iStep], EnP[iStep-1], - B1P[iStep], B1P[iStep-1], - HadrP); - } // else - - Coeff2=0.0; - Slope2=5.0; - } break; // case -2212 - - case 211 : - { - G4double EnPP[4]={1.0,2.0,3.0,4.0}; - G4double C0PP[4]={0.0,0.0,0.0,0.0}; - G4double C1PP[4]={0.15,0.08,0.02,0.01}; - G4double B0PP[4]={1.5,2.8,3.8,3.8}; - G4double B1PP[4]={0.8,1.6,3.6,4.6}; - - if(BoundaryP[3]EnPP[iStep]) iStep++; - - Coeff0 = LineInterpol(EnPP[iStep], EnPP[iStep-1], - C0PP[iStep], C0PP[iStep-1], - HadrP); - - Coeff1 = LineInterpol(EnPP[iStep], EnPP[iStep-1], - C1PP[iStep], C1PP[iStep-1], - HadrP); - - Slope0 = LineInterpol(EnPP[iStep], EnPP[iStep-1], - B0PP[iStep], B0PP[iStep-1], - HadrP); - - Slope1 = LineInterpol(EnPP[iStep], EnPP[iStep-1], - B1PP[iStep], B1PP[iStep-1], - HadrP); - Coeff2 = 0.02/HadrP; - Slope2 = 5; - } // else - } break; // case 211 - - case -211 : - { - G4double EnPP[4]={1.0,2.0,3.0,4.0}; - G4double C0PP[4]={0.0,0.0,0.0,0.0}; - G4double C1PP[4]={0.15,0.08,0.02,0.01}; - G4double B0PP[4]={1.5,2.8,3.8,3.8}; - G4double B1PP[4]={0.8,1.6,3.6,4.6}; - - if(BoundaryP[4]EnPP[iStep]) iStep++; - - Coeff0 = LineInterpol(EnPP[iStep], EnPP[iStep-1], - C0PP[iStep], C0PP[iStep-1], - HadrP); - - Coeff1 = LineInterpol(EnPP[iStep], EnPP[iStep-1], - C1PP[iStep], C1PP[iStep-1], - HadrP); - - Slope0 = LineInterpol(EnPP[iStep], EnPP[iStep-1], - B0PP[iStep], B0PP[iStep-1], - HadrP); - - Slope1 = LineInterpol(EnPP[iStep], EnPP[iStep-1], - B1PP[iStep], B1PP[iStep-1], - HadrP); - Coeff2 = 0.02/HadrP; - Slope2 = 5; - } // else - } break; // case -211 - - case 321 : - { - G4double EnK[4]={1.4,2.33,3.0,5.0}; - G4double C0K[4]={0.0,0.0,0.0,0.0}; - G4double C1K[4]={0.01,0.007,0.005,0.003}; - G4double B0K[4]={1.5,2.0,3.8,3.8}; - G4double B1K[4]={1.6,1.6,1.6,1.6}; - - if(BoundaryP[5]EnK[iStep]) iStep++; - - Coeff0 = LineInterpol(EnK[iStep], EnK[iStep-1], - C0K[iStep], C0K[iStep-1], - HadrP); - - Coeff1 = LineInterpol(EnK[iStep], EnK[iStep-1], - C1K[iStep], C1K[iStep-1], - HadrP); - - Slope0 = LineInterpol(EnK[iStep], EnK[iStep-1], - B0K[iStep], B0K[iStep-1], - HadrP); - - Slope1 = LineInterpol(EnK[iStep], EnK[iStep-1], - B1K[iStep], B1K[iStep-1], - HadrP); - Coeff2 = 0.34/HadrP/HadrP/HadrP; - Slope2 = 5; - } // else - } break; // case 321 - - case -321 : - { - G4double EnKM[2]={1.4,4.0}; - G4double C0KM[2]={0.006,0.002}; - G4double C1KM[2]={0.00,0.00}; - G4double B0KM[2]={2.5,3.5}; - G4double B1KM[2]={1.6,1.6}; - - if(BoundaryP[6]EnKM[iStep]) iStep++; - - Coeff0 = LineInterpol(EnKM[iStep], EnKM[iStep-1], - C0KM[iStep], C0KM[iStep-1], - HadrP); - - Coeff1 = LineInterpol(EnKM[iStep], EnKM[iStep-1], - C1KM[iStep], C1KM[iStep-1], - HadrP); - - Slope0 = LineInterpol(EnKM[iStep], EnKM[iStep-1], - B0KM[iStep], B0KM[iStep-1], - HadrP); - - Slope1 = LineInterpol(EnKM[iStep], EnKM[iStep-1], - B1KM[iStep], B1KM[iStep-1], - HadrP); - Coeff2 = 0.01/HadrP/HadrP/HadrP; - Slope2 = 5; - } // else - } break; // case -321 - } - } -// ++++++++++++++++++++++++++++++++++++++++ - G4double G4DiffElasticHadrNucleus:: - LineInterpol(G4double p1, G4double p2, - G4double c1, G4double c2, - G4double p) - { - G4double c; - - c = c1+(p-p1)/(p2-p1)*(c2-c1); - return c; - } -// ++++++++++++++++++++++++++++++++++++++++ -/* End of file */ diff --git a/source/processes/hadronic/models/coherent_elastic/src/G4ElasticHadrNucleusHE.cc b/source/processes/hadronic/models/coherent_elastic/src/G4ElasticHadrNucleusHE.cc index 5210e9878f..2a2f245b11 100644 --- a/source/processes/hadronic/models/coherent_elastic/src/G4ElasticHadrNucleusHE.cc +++ b/source/processes/hadronic/models/coherent_elastic/src/G4ElasticHadrNucleusHE.cc @@ -24,482 +24,169 @@ // ******************************************************************** // // -// $Id: G4ElasticHadrNucleusHE.cc,v 1.33 2006/06/29 20:09:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -//G4ElasticHadrNucleusHE.cc +// $Id: G4ElasticHadrNucleusHE.cc,v 1.56 2006/12/13 15:45:24 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // -// G4ElasticHadrNucleusHE class -// // The generator of high energy hadron-nucleus elastic scattering // The hadron kinetic energy T > 1 GeV // N. Starkov 2003. - -// Modifications: +// // 19.05.04 Variant for G4 6.1: The 'ApplyYourself' was changed -// 14.11.05 The HE elastic scattering on proton is added (N.Starkov) -// 23.11.05 int -> G4int, fabs -> abs (V.Ivanchenko) -// 09.05.06 N.Starkov propose new method SampleT (V.Ivanchenko) -// 30.05.06 Variant without use of elastic data files (N.Starkov) +// 19.11.05 The HE elastic scattering on proton is added (N.Starkov) +// 16.11.06 The low energy boundary is shifted to T = 400 MeV (N.Starkov) +// 23.11.06 General cleanup, ONQ0=3, use pointer instead of particle name (VI) // #include "G4ElasticHadrNucleusHE.hh" #include "Randomize.hh" -#include -#include -#include #include "G4ios.hh" -#include "G4ParticleTable.hh" +#include "G4ParticleTable.hh" +#include "G4IonTable.hh" using namespace std; + // ############################################################ -ElasticData:: ElasticData(G4String HadrName, G4int AtomWeight) - { -// G4Nucleus *pNucleus, InterNucleus; - G4int ii, kk; - G4double Expo=1, Kinetic[5] = {1.0, 1.5, 2.5, 4.0, 6.0}; +ElasticData:: ElasticData(const G4ParticleDefinition* p, + G4int A) +{ + hadr = p; + massGeV = p->GetPDGMass()/GeV; + AtomicWeight = A; -// InterNucleus.SetParameters(AtomWeight, AtomWeight/2); -// pNucleus = &InterNucleus; - hadrName = HadrName; - nuclAtomicNumber = AtomWeight; + GetNucleusParameters(A); + fillQ2limit(); - NucPar.GetNucleusParameters(AtomWeight); + for(G4int kk=0; kk TableE[ii]) break; - return ii; - } + TableQ2[0] = 1.0e-8; + for(G4int ii=1; ii(aHadron1); - - G4String sNameHdr = aHadron->GetParticleName(); - G4int iNnucl = (int) aNucleus->GetN(); - G4double Energies[5]; // = {1.95, 2.0, 4.0, 6.0, 10.0}; - G4double Kinetic[5] = {1.0, 1.5, 2.5, 4.0, 6.0}; - - if(iNnucl==1) return; - - if(iNnucl==2 || iNnucl==3) - G4Exception(" This nucleus is very light for this model !!!"); - - if(iNnucl>238) - G4Exception(" This nucleus is very heavy for this model !!!"); - - - G4DynamicParticle * innerHadron = new G4DynamicParticle(); - innerHadron->SetDefinition(aHadron); - - G4ThreeVector inVector(0.,0.,0.); - - G4double mHadr = aHadron->GetPDGMass(); // MeV - G4double curE, curP; - - for(ii=0; iiSetDefinition(aHadron); - - G4double dPower=1000.0; - - G4cout<SetMomentum(inVector); -// ------ The creating of the distribution function array ------ - CreationArray(innerHadron, aNucleus); - - for( kk = 0; kkGetParticleName(); - G4int iNnucl = (int) aNucleus->GetN(); - - if(iNnucl==2 || iNnucl==3) - G4Exception(" This nucleus is very light for this model !!!"); - - if(iNnucl>238) - G4Exception(" This nucleus is very heavy for this model !!!"); - - G4String sPath; - - if(getenv("G4ELASTICDATA")) - { - sPath = getenv("G4ELASTICDATA"); - sPath = sPath+"/Elastic/"; - } - else sPath = "./Elastic/"; - - std::ostringstream sNameFile; - sNameFile<> iPoE; - - G4double dPower; - - for(ik=0; ik> ElD.TableE[kk+ik*iPoE]; - - for(ii=0; ii> ElD.TableCrossSec[kk*ONQ2+ii+ik*ONQ2XE]; - } // ii - } // ik - - TestFile.close(); - - SetOfElasticData.push_back(ElD); - - if(getenv("HEElastic_debug")) - { - G4cout<<" The array for elastic scattering of "<GetN(); - G4String hadrName = aParticle->GetDefinition()->GetParticleName(); - - G4ParticleDefinition * PartDef = aParticle->GetDefinition(); - - size_t SizeData = SetOfElasticData.size(); - - G4int NumberOfRecord = -1; - - if( SizeData!= 0) + size_t SizeData = SetOfElasticData.size(); + if( SizeData != 0) { for(size_t kk = 0; kk= 0) - ElD = SetOfElasticData[NumberOfRecord]; - else - { - G4int TestFile = ReadOfData(PartDef, aNucleus); - SizeData = SetOfElasticData.size(); - NumberOfRecord = SizeData-1; - - if(TestFile < 0) - { - G4cout<<" File for elastic scattering of hadron \"" - <SetDefinition(const_cast(p)); - dHadron->SetMomentum(HadrMomentum); - - if(A > 1) - { - G4Nucleus InterNucleus; - ElasticData ElD; - - InterNucleus.SetParameters(A, Z); - if(GetHadronNucleusData(dHadron, &InterNucleus, ElD)) - aQ2 = RandomElastic1(dHadron, & ElD); - } - else aQ2 = HadronProtonQ2(dHadron); - - return aQ2; } // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ G4double G4ElasticHadrNucleusHE::SampleT( const G4ParticleDefinition * p, - G4double pTotLabMomentum, - G4int, G4int A) + G4double inLabMom, + G4int, G4int N) { - G4double aQ2 = 0.0; + G4double pTotLabMomentum = inLabMom/GeV; // (GeV/c) + G4double Q2; - G4DynamicParticle * dHadron = &aHad; + G4int Amass=N; G4ThreeVector HadrMomentum(0.0, 0.0, pTotLabMomentum); - G4ParticleDefinition* pd = const_cast(p); - dHadron->SetDefinition(pd); - dHadron->SetMomentum(HadrMomentum); - - if(A > 1) - { - G4String hName = p->GetParticleName(); - G4int Step = 1; - ElasticData * ElD = 0; + + HadrCode = p->GetPDGEncoding(); + + if(Amass>1) + { + G4int Step = 0; +// .................................. + ElasticData * ElD1 = 0; + + // G4String hadrName = p->GetParticleName(); + + size_t SizeData = SetOfElasticData.size(); G4int NumberOfRecord = -1; - G4int SizeData = SetOfElasticData.size(); - if( SizeData!= 0) + if(verboselevel == 1) + G4cout<<" SampleT: SizeData "<AtomicWeight == Amass && ElD1->Hadron() == p) { NumberOfRecord = kk; + Step = 1; break; } - - if(NumberOfRecord >= 0) - ElD = &SetOfElasticData[NumberOfRecord]; } - } - if(!ElD) + } // if SizeData!=0 +// ........................................... + if(SizeData == 0 || NumberOfRecord == -1) { - ElasticData ElD2(hName, A); - SetOfElasticData.push_back(ElD2); - G4int n = SetOfElasticData.size(); - ElD = &SetOfElasticData[n-1]; - } - - if(ElD) aQ2 = HadronNucleusQ2_2(dHadron, A, Step, ElD); + ElD1 = new ElasticData(p, Amass); + SetOfElasticData.push_back(ElD1); + Step = 0; + if(verboselevel == 1) + G4cout<<" SampleT: SizeData "<R1; + R2 = ElD1->R2; + Aeff = ElD1->Aeff; + Pnucl = ElD1->Pnucl; + + G4double Ran = G4UniformRand(); + + Q2 = HadronNucleusQ2_2(p, Amass, pTotLabMomentum, + Ran, Step, ElD1); } // if Amass - else aQ2 = HadronProtonQ2(dHadron); + else Q2 = HadronProtonQ2(p, pTotLabMomentum); + + if(verboselevel == 1) + G4cout<<" SampleT: Q2 "<(aHadron.GetDefinition()); G4ThreeVector hadrMomentum = aHadron.Get4Momentum().vect(); @@ -526,21 +213,23 @@ G4HadFinalState * G4ElasticHadrNucleusHE::ApplyYourself( else if(nZ == 1 && nA == 3) secNuclDef = G4Triton::Triton(); else if(nZ == 2 && nA == 3) secNuclDef = G4He3::He3(); else if(nZ == 2 && nA == 4) secNuclDef = G4Alpha::Alpha(); - else secNuclDef = G4ParticleTable::GetParticleTable()->FindIon(nZ,nA,0,nZ); - + else secNuclDef = G4ParticleTable:: + GetParticleTable()->FindIon(nZ,nA,0,nZ); // ---------------------------------------------------- -// ----------------_ Randomization of Q2 as dSig/dt -------------- + G4double ranQ2; - G4double ranQ2 = SampleT(hadrDef,dParticle->GetTotalMomentum(),nZ,nA); + ranQ2 = SampleT(hadrDef, dParticle->GetTotalMomentum(), nZ, nA); -// ---------------- Hadron kinematics ---------------- + Q2res = ranQ2; +// ---------------- Hadron kinematics ---------------- G4double m1 = hadrDef->GetPDGMass(); G4double m2 = secNuclDef->GetPDGMass(); G4LorentzVector lv1 = dParticle->Get4Momentum(); G4LorentzVector lv0(0.0,0.0,0.0,m2); - // G4cout << "lv0= " << lv0 << " lv1= " << lv1 << " m1= " - // << m1 << " ranQ2= " << ranQ2<Get4Momentum(); + G4LorentzVector lv0test(0.0,0.0,0.0,m2); + G4LorentzVector lv = lv0 + lv1; G4ThreeVector bst = lv.boostVector(); lv1.boost(-bst); @@ -555,205 +244,237 @@ G4HadFinalState * G4ElasticHadrNucleusHE::ApplyYourself( if(std::abs(cost) > 1.0) cost = 2.0*G4UniformRand() - 1.0; G4double sint = std::sqrt((1.0-cost)*(1.0+cost)); - // G4cout << "Entering elastic scattering 3"< 1) - G4cout << "cos(t)=" << cost << " std::sin(t)=" << sint << G4endl; - G4ThreeVector v1(sint*std::cos(phi),sint*std::sin(phi),cost); p1 = p1.unit(); v1.rotateUz(p1); v1 *= ptot; - G4LorentzVector nlv1(v1.x(),v1.y(),v1.z(),std::sqrt(ptot*ptot + m1*m1)); + G4LorentzVector nlv1(v1.x(),v1.y(),v1.z(), + std::sqrt(ptot*ptot + m1*m1)); G4LorentzVector nlv0 = lv0 + lv1 - nlv1; nlv0.boost(bst); - nlv1.boost(bst); + nlv1.boost(bst); + + + lv1 = nlv1-lv1test; + lv0 = nlv0-lv0test; + + Q2res = -lv0.m2(); G4double eFinal = nlv1.e() - m1; - if (verboseLevel > 1) - G4cout << " P0= "<< nlv0 << " P1= " - << nlv1<<" m= " << m1 << " ekin0= " << eFinal - << " ekin1= " << nlv0.e() - m2 - <GetParticleName() - << " p(GeV/c)= " << dParticle->GetTotalMomentum()/GeV - << " on " << secNuclDef->GetParticleName() - << G4endl; + + if(eFinal < 0.0) + { + G4cout << "G4HadronElastic(Apply) WARNING ekin= " << eFinal + << " after scattering of " + << hadrDef->GetParticleName() + << " p(GeV/c)= " << dParticle->GetTotalMomentum()/GeV + << " on " << secNuclDef->GetParticleName() + << G4endl; eFinal = 0.0; } theParticleChange.SetMomentumChange(nlv1.vect().unit()); theParticleChange.SetEnergyChange(eFinal); - + G4DynamicParticle * aSec = new G4DynamicParticle(secNuclDef, nlv0); theParticleChange.AddSecondary(aSec); + if(verboselevel == 1) + G4cout<GetDefinition()->GetParticleName(); - G4double Energy = dHadron->GetTotalEnergy(); + // G4String hadrName = aHadron->GetParticleName(); + G4double hadrMass = aHadron->GetPDGMass()*0.001; - NumbOnE = pElD->GetNumberE(Energy); + G4double ekin = std::sqrt(hadrMass*hadrMass+LabMom*LabMom)-hadrMass; + NumbOnE = G4int(log(ekin/emin)/deltae + 0.5); + if(NumbOnE < 0) NumbOnE = 0; + else if(NumbOnE >= NENERGY) NumbOnE = NENERGY - 1; + + nucN = AWeight; dNumbQ2 = pElD->TableQ2; - if(pElD->TableCrossSec[NumbOnE*ONQ2+2]<0.00001) Step=0; - if(Step==0) - { - G4HadronValues::GetHadronValues(dHadron); - NucPar = pElD->NucPar; - aQ2 = pElD->theMaxQ2; + G4int index = NumbOnE*ONQ2; - Weight = GetLightFq2(nucN, aQ2, Step1, &pElD->NucPar); + G4double Weight = 1.0; + G4double rmax = 1.0; + G4int idx1 = 1; + G4int idx2 = ONQ2; - iIntgr[0] = 0; - pElD->TableCrossSec[NumbOnE*ONQ2] = 0; -// ------------------------------------------ - for(ii=1; iiTableQ2[ii]; + G4int length = pElD->dnkE[NumbOnE]; - Buf = GetLightFq2(nucN, aQ2, Step1, &pElD->NucPar); - pElD->TableCrossSec[NumbOnE*ONQ2+ii] = Buf/Weight; - RandMax = Buf/Weight; + // Build first part of the vector + if(length == 0) { + + G4double T = Energy[NumbOnE]; + G4double M = pElD->massGeV; + G4double P = sqrt(T*(T + 2.*M)); + GetHadronValues(aHadron, P); + Q2 = pElD->maxQ2; + Weight = GetLightFq2(AWeight, Q2, 0); - } // for ii - CurrentN = 3; + if(verboselevel == 1) + G4cout<<" HadrNucleusQ2_2: Weight "<dnkE[NumbOnE] = ONQ0; + + } else { + rmax = pElD->TableCrossSec[index+length-1]; + idx2 = length; + } + + dNumbFQ2 = &pElD->TableCrossSec[index]; + + // No more vector needed + if(rmax >= Rand) { + + for(kk = 1; kkTableCrossSec[index+kk]) break; } - dNumbFQ2 = &pElD->TableCrossSec[NumbOnE*ONQ2]; + iNumbQ2 = kk; + if(iNumbQ2 >= idx2) iNumbQ2 = idx2 - 1; - if(RandMax > Rand) - { - kk = 0; - while(Rand>pElD->TableCrossSec[NumbOnE*ONQ2+kk]) kk++; - iNumbQ2 = kk; - aQ2 = GetQ2_2(iNumbQ2, dNumbQ2, dNumbFQ2, Rand); - return aQ2; - } - else - { - Step = 1; - for(ii=CurrentN; iimassGeV; + G4double P = sqrt(T*(T + 2.*M)); + GetHadronValues(aHadron, P); + Q2 = pElD->maxQ2; + Weight = GetLightFq2(AWeight, Q2, 0); + } + // Stop building when find out the node + for(ii=idx1; iiTableQ2[ii]; + Buf = GetLightFq2(AWeight, Q2, 0)/Weight; + pElD->TableCrossSec[index+ii] = Buf; + // if(verboselevel == 1) + // G4cout<<" HadrNucleusQ2_2: ii= " << ii << " Q2= " + // <dnkE[NumbOnE] = ii+1; + break; + } + } // for ii - aQ2 = pElD->TableQ2[ii]; //(ii-0)*dQ2; - Buf = GetLightFq2(nucN, aQ2, Step, &pElD->NucPar); - pElD->TableCrossSec[NumbOnE*ONQ2+ii] = Buf/Weight; - if(Buf/Weight>Rand) - { - iNumbQ2 = ii; - aQ2 = GetQ2_2(iNumbQ2, dNumbQ2, dNumbFQ2, Rand); - CurrentN = ii; - RandMax = Buf/Weight; - break; - // return Q2; - } // if Rand - } // for ii - } // else - return aQ2; -} // function + iNumbQ2 = ii; + if(iNumbQ2 >= ONQ2) iNumbQ2 = ONQ2 - 1; + } + Q2 = GetQ2_2(iNumbQ2, dNumbQ2, dNumbFQ2, Rand); + + if(verboselevel == 1) + G4cout<<" HadrNucleusQ2_2(2): Q2= "< 208 ? 1.0e-7 : 1.0e-6; + G4double Stot = HadrTot*MbToGeV2; // Gev^-2 G4double Bhad = HadrSlope; // GeV^-2 G4double Asq = 1+HadrReIm*HadrReIm; G4double Rho2 = std::sqrt(Asq); - - G4double R12 = HP->R1*HP->R1; - G4double R22 = HP->R2*HP->R2; + // G4cout << "Stot= " << Stot << " Bhad= " << Bhad << " Asq= " << Asq << G4endl; + G4double R12 = R1*R1; + G4double R22 = R2*R2; G4double R12B = R12+2*Bhad; G4double R22B = R22+2*Bhad; /// G4double R12Bp = R12+20; @@ -768,16 +489,17 @@ G4double G4ElasticHadrNucleusHE:: /// G4double R12Apd = 2/R12Ap; /// G4double R22Apd = 2/R22Ap; - G4double Norm = R12*HP->R1-HP->Pnucl*R22*HP->R2; //*HP->Aeff; + G4double Norm = (R12*R1-Pnucl*R22*R2); //*HP->Aeff; /// G4double NormP = R12*R1-PnuclP*R22*R2; - G4double R13 = R12*HP->R1/R12B; - G4double R23 = HP->Pnucl*R22*HP->R2/R22B; - G4double Unucl = Stot/2/MyPi/Norm*R13; -//// G4double Unclprod = Stot/2/Pi1/NormP*R13Ap; + G4double R13 = R12*R1/R12B; + G4double R23 = Pnucl*R22*R2/R22B; + G4double Unucl = Stot/twopi/Norm*R13; +//// G4double Unclprod = Stot/2/pi/NormP*R13Ap; G4double FiH = std::asin(HadrReIm/Rho2); G4double NN2 = R23/R13; G4double dddd; + /// G4double DDSec1p = (DDSect2+ /// DDSect3*std::log(1.06*2*Ehad/R1/4)); @@ -792,13 +514,6 @@ G4double G4ElasticHadrNucleusHE:: // iIntgr[0] = 0; -// G4int ii; - -// for(ii=0; ii iIntgr[kk]) kk ++; - - if(kk == 1 ) kk = 2; - - G4double F1 = iIntgr[kk-2]; - G4double F2 = iIntgr[kk-1]; - G4double F3 = iIntgr[kk]; - G4double F12 = F1*F1; - G4double F22 = F2*F2; - G4double F32 = F3*F3; - G4double X1 = iQ2[kk-2]; // MeV^2 - G4double X2 = iQ2[kk-1]; - G4double X3 = iQ2[kk]; - G4double D0 = F12*F2+F1*F32+F3*F22-F32*F2-F22*F1-F12*F3; - - if(D0 == 0) - ranQ2 = (iQ2[kk-1]+(ranUni-iIntgr[kk-1])* - (iQ2[kk]-iQ2[kk-1]) - /(iIntgr[kk]-iIntgr[kk-1])); - else - { - G4double DA = X1*F2+X3*F1+X2*F3-X3*F2-X1*F3-X2*F1; - G4double DB = X2*F12+X1*F32+X3*F22-X2*F32-X3*F12-X1*F22; - G4double DC = X3*F2*F12+X2*F1*F32+X1*F3*F22 - -X1*F2*F32-X2*F3*F12-X3*F1*F22; - ranQ2 = (DA*ranUni*ranUni+DB*ranUni+DC)/D0; - } - return ranQ2; // MeV^2 - } -// +++++++++ The randomization of two dimensoinal array ++++++++ - G4double G4ElasticHadrNucleusHE::RandomElastic1( - const G4DynamicParticle * aHadron, - const ElasticData * ElD) - { - G4double forQ2[3]; - G4double curE = aHadron->GetTotalEnergy(); // in MeV - G4double X1; - G4double X2; - G4double X3; - G4double Y1; - G4double Y2; - G4double Y3; - G4int iiE = 0; - G4int k[3]; - - while(curE > ElD->TableE[iiE] ) iiE++; - - G4double ranQ2; - G4double ranUni = G4UniformRand(); - - G4int kk; - - for(G4int mm=0; mm<3; mm++) - { - kk = 0; - - while( ranUni > - ElD->TableCrossSec[iiE*ONQ2+mm*ONQ2+kk-ONQ2]) - { - kk ++; - k[mm]=kk; - } // while - -// if(kk == 1 ) kk = 2; - X1 = ElD->TableCrossSec[iiE*ONQ2+mm*ONQ2+kk-ONQ2-1]; - X2 = ElD->TableCrossSec[iiE*ONQ2+mm*ONQ2+kk-ONQ2]; - X3 = ElD->TableCrossSec[iiE*ONQ2+mm*ONQ2+kk-ONQ2+1]; - Y1 = ElD->TableQ2[kk-1]; // MeV^2 - Y2 = ElD->TableQ2[kk]; - Y3 = ElD->TableQ2[kk+1]; - - forQ2[mm] = InterPol(X1, X2, X3, Y1, Y2, Y3, ranUni); - } // mm - - X1 = ElD->TableE[iiE-1]; - X2 = ElD->TableE[iiE]; - X3 = ElD->TableE[iiE+1]; - Y1 = forQ2[0]; // MeV^2 - Y2 = forQ2[1]; - Y3 = forQ2[2]; - - ranQ2 = InterPol(X1, X2, X3, Y1, Y2, Y3, curE); - - return ranQ2; // MeV^2 - } -// ++++++++++++ The filling of the one-dimensional array +++++++++++++ -void G4ElasticHadrNucleusHE::CreationArray( - const G4DynamicParticle * aHadron, - G4Nucleus * aNucleus) - { - GetNucleusParameters(aNucleus); - - // Nstep = ONQ2; - // theMaxQ2 = GetQ2limit(theR1); // Mev^2 - - if(aNucleus->GetN() > MaxN ) - ArrayForHeavy( aHadron, aNucleus); - else - ArrayForLight( aHadron, aNucleus); - } -// +++++++++++++ The method for heavy nucleus ++++++++++++++++ -void G4ElasticHadrNucleusHE::ArrayForHeavy( - const G4DynamicParticle * aHadron, - G4Nucleus * aNucleus) - { - GetNucleusParameters(aNucleus); - -////// G4double aNuc = aNucleus->GetN(); - G4double intgrS=0., intgStep; - G4int ii, Kind=0; - - iIntgr[0] = 0; - - for( ii=0; ii 3 ) aSimp = 2; - else aSimp = 4; -// if(ll == 0) aSimp = 4; - Kind = 1; - } // ll - intgStep = curSum*ddQ2/3; -// -------------------------------------------------------------------- - iIntgr[ii+1] = iIntgr[ii]+intgStep; - intgrS = intgrS + intgStep; - } // ii -// ------------------- The normalization ---------------- - for( ii=0; iiGetN(); - G4int Nucleus = (G4int) aNuc; - - GetNucleusParameters(aNucleus); - - // theMaxQ2 = GetQ2limit(theR1)/GeV/GeV; // GeV^2 -// ---------------- The preparing of probability function ------------ - - G4double MbToB = 2.568; // from mb to GeV^-2 - G4double Pi1 = pi; - G4double Stot = HadrTot*MbToB; // Gev^-2 - G4double Bhad = HadrSlope; // GeV^-2 - G4double Asq = 1+HadrReIm*HadrReIm; - G4double Rho2 = std::sqrt(Asq); - - G4double R12 = R1*R1; - G4double R22 = R2*R2; - G4double R12B = R12+2*Bhad; - G4double R22B = R22+2*Bhad; -/// G4double R12Bp = R12+20; -/// G4double R22Bp = R22+20; -/// G4double R13Bp = R12*R1/R12Bp; -/// G4double R23Bp = R22*R2/R22Bp; -/// G4double R12Ap = R12+20; -/// G4double R22Ap = R22+20; -/// G4double R13Ap = R12*R1/R12Ap; -/// G4double R23Ap = R22*R2/R22Ap*PnuclP; -/// G4double R23dR13 = R23Ap/R13Ap; -/// G4double R12Apd = 2/R12Ap; -/// G4double R22Apd = 2/R22Ap; - - G4double Norm = R12*R1-Pnucl*R22*R2; -/// G4double NormP = R12*R1-PnuclP*R22*R2; - G4double R13 = R12*R1/R12B; - G4double R23 = Pnucl*R22*R2/R22B; - G4double Unucl = Stot/2/Pi1/Norm*R13; -//// G4double Unclprod = Stot/2/Pi1/NormP*R13Ap; - G4double FiH = std::asin(HadrReIm/Rho2); - G4double NN2 = R23/R13; - -/// G4double DDSec1p = (DDSect2+ -/// DDSect3*std::log(1.06*2*Ehad/R1/4)); - -/// G4double DDSec2p = (DDSect2+ -/// DDSect3*std::log(1.06*2*Ehad/ -// std::sqrt((R12+R22)/2)/4)); - -/// G4double DDSec3p = (DDSect2+ -/// DDSect3*std::log(1.06*2*Ehad/R2/4)); - -/// G4double R12ApdR22Ap = 0.5*(R12Apd+R22Apd); - - iIntgr[0] = 0; - - G4int ii; - - for(ii=0; iiGetPDGMass()/GeV; + HadronE = std::sqrt(MomentumH*MomentumH + HadronM*HadronM); + + HdrE = HadronE; + + PM2 = ProtonM*ProtonM; + HM2 = HadronM*HadronM; + Sh = 2.0*ProtonM*HadronE+PM2+HM2; // GeV + SqrtS = std::sqrt(Sh); + ConstU = 2*PM2+2*HM2-Sh; + + EcmH = (Sh+HM2-PM2)/2/SqrtS; + EcmP = (Sh-HM2+PM2)/2/SqrtS; + + Kcm = sqrt(EcmH*EcmH-HM2); + MaxT = 4*Kcm*Kcm; + + BoundaryP[0]=9.0; BoundaryTG[0]=5.0;BoundaryTL[0]=MaxT/2.0; + BoundaryP[1]=20.0;BoundaryTG[1]=1.5;BoundaryTL[1]=MaxT; + BoundaryP[2]=5.0; BoundaryTG[2]=1.0;BoundaryTL[2]=1.5; + BoundaryP[3]=8.0; BoundaryTG[3]=3.0;BoundaryTL[3]=MaxT; + BoundaryP[4]=7.0; BoundaryTG[4]=3.0;BoundaryTL[4]=MaxT; + BoundaryP[5]=5.0; BoundaryTG[5]=2.0;BoundaryTL[5]=MaxT; + BoundaryP[6]=5.0; BoundaryTG[6]=1.5;BoundaryTL[6]=3.0; + + HadrCodes[0] = 2212; HadrCodes[1] = 2112; + HadrCodes[2] = -2212; HadrCodes[3] = 211; + HadrCodes[4] = -211; HadrCodes[5] = 321; + HadrCodes[6] = -321; + + HadrCode = aHadron->GetPDGEncoding(); + + G4int NumberH=0; + + while(HadrCode!=HadrCodes[NumberH]) NumberH++; + + if(MomentumHGetPDGEncoding(); + + switch(HadrCode) + { + case 2212 : + case 3122 : + case 3222 : + case 3112 : + case 3212 : + case 3312 : + case 3322 : + case 3334 : + { + G4double EnP[6]={1.5,3.0,5.0,9.0,14.0,19.0}; + G4double C0P[6]={0.15,0.02,0.06,0.08,0.0003,0.0002}; + G4double C1P[6]={0.05,0.02,0.03,0.025,0.0,0.0}; + G4double B0P[6]={1.5,2.5,3.0,4.5,1.4,1.25}; + G4double B1P[6]={5.0,1.0,3.5,4.0,4.8,4.8}; + + if(BoundaryP[0]EnP[iStep]) iStep++; + + Coeff0 = LineInterpol(EnP[iStep], EnP[iStep-1], + C0P[iStep], C0P[iStep-1], + HadrP); + + Coeff1 = LineInterpol(EnP[iStep], EnP[iStep-1], + C1P[iStep], C1P[iStep-1], + HadrP); + + Slope0 = LineInterpol(EnP[iStep], EnP[iStep-1], + B0P[iStep], B0P[iStep-1], + HadrP); + + Slope1 = LineInterpol(EnP[iStep], EnP[iStep-1], + B1P[iStep], B1P[iStep-1], + HadrP); + } // else + Coeff2 = 0; + Slope2 = 5; + } break; // case 2212 + case 2112 : + case -2112 : + { + G4double EnN[5]={1.5,5.0,10.0,14.0,20.0}; + G4double C0N[5]={0.0,0.0,0.02,0.02,0.01}; + G4double C1N[5]={0.06,0.008,0.0015,0.001,0.0003}; + G4double B0N[5]={1.5,2.5,3.8,3.8,3.5}; + G4double B1N[5]={1.5,2.2,3.6,4.5,4.8}; + + if(BoundaryP[1]EnN[iStep]) iStep++; + + Coeff0 = LineInterpol(EnN[iStep], EnN[iStep-1], + C0N[iStep], C0N[iStep-1], + HadrP); + + Coeff1 = LineInterpol(EnN[iStep], EnN[iStep-1], + C1N[iStep], C1N[iStep-1], + HadrP); + + Slope0 = LineInterpol(EnN[iStep], EnN[iStep-1], + B0N[iStep], B0N[iStep-1], + HadrP); + + Slope1 = LineInterpol(EnN[iStep], EnN[iStep-1], + B1N[iStep], B1N[iStep-1], + HadrP); + Coeff2 = 0.8/HadrP/HadrP; + Slope2 = 5; + } // else + } break; // case 2112 + + case -2212 : + case -3122 : + case -3222 : + case -3112 : + case -3212 : + case -3312 : + case -3322 : + case -3334 : + { + G4double EnP[2]={1.5,4.0}; + G4double C0P[2]={0.001,0.0005}; + G4double C1P[2]={0.003,0.001}; + G4double B0P[2]={2.5,4.5}; + G4double B1P[2]={1.0,4.0}; + if(BoundaryP[2]EnP[iStep]) iStep++; + + Coeff0 = LineInterpol(EnP[iStep], EnP[iStep-1], + C0P[iStep], C0P[iStep-1], + HadrP); + + Coeff1 = LineInterpol(EnP[iStep], EnP[iStep-1], + C1P[iStep], C1P[iStep-1], + HadrP); + + Slope0 = LineInterpol(EnP[iStep], EnP[iStep-1], + B0P[iStep], B0P[iStep-1], + HadrP); + + Slope1 = LineInterpol(EnP[iStep], EnP[iStep-1], + B1P[iStep], B1P[iStep-1], + HadrP); + } // else + + Coeff2=0.0; + Slope2=5.0; + } break; // case -2212 + + case 211 : + { + G4double EnPP[4]={1.0,2.0,3.0,4.0}; + G4double C0PP[4]={0.0,0.0,0.0,0.0}; + G4double C1PP[4]={0.15,0.08,0.02,0.01}; + G4double B0PP[4]={1.5,2.8,3.8,3.8}; + G4double B1PP[4]={0.8,1.6,3.6,4.6}; + + if(BoundaryP[3]EnPP[iStep]) iStep++; + + Coeff0 = LineInterpol(EnPP[iStep], EnPP[iStep-1], + C0PP[iStep], C0PP[iStep-1], + HadrP); + + Coeff1 = LineInterpol(EnPP[iStep], EnPP[iStep-1], + C1PP[iStep], C1PP[iStep-1], + HadrP); + + Slope0 = LineInterpol(EnPP[iStep], EnPP[iStep-1], + B0PP[iStep], B0PP[iStep-1], + HadrP); + + Slope1 = LineInterpol(EnPP[iStep], EnPP[iStep-1], + B1PP[iStep], B1PP[iStep-1], + HadrP); + Coeff2 = 0.02/HadrP; + Slope2 = 5; + } // else + } break; // case 211 + + case -211 : + { + G4double EnPP[4]={1.0,2.0,3.0,4.0}; + G4double C0PP[4]={0.0,0.0,0.0,0.0}; +// G4double C1PP[4]={0.15,0.08,0.02,0.01}; +// G4double B0PP[4]={1.5,2.8,3.8,3.8}; + G4double B1PP[4]={0.8,1.6,3.6,4.6}; + + if(BoundaryP[4]EnPP[iStep]) iStep++; + + Coeff0 = LineInterpol(EnPP[iStep], EnPP[iStep-1], + C0PP[iStep], C0PP[iStep-1], + HadrP); + Slope1 = LineInterpol(EnPP[iStep], EnPP[iStep-1], + B1PP[iStep], B1PP[iStep-1], + HadrP); + Coeff2 = 0.02/HadrP; + Slope2 = 5; + } // else + } break; // case -211 + + case 321 : + { + G4double EnK[4]={1.4,2.33,3.0,5.0}; + G4double C0K[4]={0.0,0.0,0.0,0.0}; + G4double C1K[4]={0.01,0.007,0.005,0.003}; + G4double B0K[4]={1.5,2.0,3.8,3.8}; + G4double B1K[4]={1.6,1.6,1.6,1.6}; + + if(BoundaryP[5]EnK[iStep]) iStep++; + + Coeff0 = LineInterpol(EnK[iStep], EnK[iStep-1], + C0K[iStep], C0K[iStep-1], + HadrP); + + Coeff1 = LineInterpol(EnK[iStep], EnK[iStep-1], + C1K[iStep], C1K[iStep-1], + HadrP); + + Slope0 = LineInterpol(EnK[iStep], EnK[iStep-1], + B0K[iStep], B0K[iStep-1], + HadrP); + + Slope1 = LineInterpol(EnK[iStep], EnK[iStep-1], + B1K[iStep], B1K[iStep-1], + HadrP); + Coeff2 = 0.34/HadrP/HadrP/HadrP; + Slope2 = 5; + } // else + } break; // case 321 + case -321 : + { + G4double EnKM[2]={1.4,4.0}; + G4double C0KM[2]={0.006,0.002}; + G4double C1KM[2]={0.00,0.00}; + G4double B0KM[2]={2.5,3.5}; + G4double B1KM[2]={1.6,1.6}; + + if(BoundaryP[6]EnKM[iStep]) iStep++; + + Coeff0 = LineInterpol(EnKM[iStep], EnKM[iStep-1], + C0KM[iStep], C0KM[iStep-1], + HadrP); + + Coeff1 = LineInterpol(EnKM[iStep], EnKM[iStep-1], + C1KM[iStep], C1KM[iStep-1], + HadrP); + + Slope0 = LineInterpol(EnKM[iStep], EnKM[iStep-1], + B0KM[iStep], B0KM[iStep-1], + HadrP); + + Slope1 = LineInterpol(EnKM[iStep], EnKM[iStep-1], + B1KM[iStep], B1KM[iStep-1], + HadrP); + Coeff2 = 0.01/HadrP/HadrP/HadrP; + Slope2 = 5; + } // else + } break; // case -321 + } + } +// ++++++++++++++++++++++++++++++++++++++++ +G4double G4ElasticHadrNucleusHE:: + LineInterpol(G4double p1, G4double p2, + G4double c1, G4double c2, + G4double p) + { + G4double c; + + c = c1+(p-p1)/(p2-p1)*(c2-c1); + return c; + } +// ============================================================ +G4float G4ElasticHadrNucleusHE::GetFt(G4double Q2) + { + G4float Fdistr, SqrQ2 = std::sqrt(Q2); Fdistr = (1-Coeff1-Coeff0/*-0.0*Coeff2*std::exp(ConstU)*/) - /Slope*(1-std::exp(-Slope*aQ2)) + /Slope*(1-std::exp(-Slope*Q2)) - +Coeff0*(1-std::exp(-Slope0*aQ2)) + +Coeff0*(1-std::exp(-Slope0*Q2)) +Coeff2/Slope2*std::exp(Slope2*ConstU)* - (std::exp(Slope2*aQ2)-1) + (std::exp(Slope2*Q2)-1) +2*Coeff1/Slope1*(1/Slope1-(1/Slope1+SqrQ2)* std::exp(-Slope1*SqrQ2)) ; + return Fdistr; } // +++++++++++++++++++++++++++++++++++++++ - G4float G4ElasticHadrNucleusHE::GetDistrFun(G4double aQ2) +G4float G4ElasticHadrNucleusHE::GetDistrFun(G4double Q2) { G4float Fq2; - Fq2 = GetFt(aQ2); + Fq2 = GetFt(Q2); + + if(verboselevel == 1) + G4cout<<" GetDistrFun: Fq2 "<(Nucleus),0.3018); +// R2 = 3.806*std::pow(Nucleus-10.068,0.2685); + Pnucl = 0.9; + Aeff = 1.1; + R1 = 19.5; + R1 = 20.5; // 26.09.06 + R2 = 15.74; + Pnucl = 0.4; + Aeff = 0.7; + } + + else if(Nucleus == 90) + { + + R1 = 16.5; + R2 = 11.62; + Pnucl = 0.4; + Aeff = 0.9; + Aeff = 0.7; + R1 = R1*1.1; + } + + else if(Nucleus == 58) + { + R1 = 15.0; + R2 = 9.9; + Pnucl = 0.45; + Aeff = 0.85; + R1 = R1*1.05; + } + else if(Nucleus == 16) + { + R1 = 10.50; + R2 = 5.5; + Pnucl = 0.7; + Aeff = 0.98; +// R1 = 11.3; +// R2 = 2.5; +// Pnucl = 0.75; +// Aeff = 0.9; + } + + else if(Nucleus == 9) + { + R1 = 9.0; + R2 = 7.0; + Pnucl = 0.190; + Aeff = 0.9; + } + + if(Nucleus == 4) + { + R1 = 5.5; + R1 = 6.0; // 26.09.06 + R2 = 3.7; + Pnucl = 0.4; + Aeff = 0.87; + } + + else + { + R1 = 4.45*std::pow(static_cast(Nucleus-1),0.309); + +// if(Nucleus == 28) +// R1 = 4.25*std::pow(static_cast(Nucleus-1),0.309); + + R2 = 2.3*std::pow(static_cast(Nucleus),0.36); + Pnucl = 0.176+0.00167*Nucleus+ + 8.69E-6*Nucleus*Nucleus; + Aeff = 0.9; + R1 = R1*0.90; + } + +/* + if(Nucleus == 12) + { + R1 = 9.336; + R2 = 5.63; + Pnucl = 0.197; + Aeff = 01.0; + } +*/ +/* + if(Nucleus == 11) + { + R1 = 10.8; + R2 = 7.5; + Pnucl = 0.85; + Aeff = 1.2; + } +*/ + +// G4cout<<" Nucl.Par. "<GetPDGEncoding(); + + if( iHadrCode == 2212 || + iHadrCode == 2112 || + iHadrCode == 3122 || + iHadrCode == 3222 || + iHadrCode == 3112 || + iHadrCode == 3212 || + iHadrCode == 3312 || + iHadrCode == 3322 || + iHadrCode == 3334 ) iHadron = 0; + + else if( + iHadrCode == -2212 || + iHadrCode == -2112 || + iHadrCode == -3122 || + iHadrCode == -3222 || + iHadrCode == -3112 || + iHadrCode == -3212 || + iHadrCode == -3312 || + iHadrCode == -3322 || + iHadrCode == -3334 ) iHadron = 1; + + else if( iHadrCode == 211) iHadron = 2; + else if( iHadrCode == -211) iHadron = 3; + + else if( iHadrCode == 321 || + iHadrCode == 130 || + iHadrCode == 310 || + iHadrCode == 311) iHadron = 4; + + else if( iHadrCode == -321 || + iHadrCode == -130 || + iHadrCode == -310 || + iHadrCode == -311) iHadron = 5; + + else + { + G4cout<<" ElasticHE: For the hadron " + << aHadron->GetParticleName() + <<" other method must be used."<GetPDGMass()/GeV; // In GeV + G4double mHadr2 = mHadr*mHadr; + + G4double HadrEnergy = sqrt(mHadr2+HadrMoment*HadrMoment); + + G4double sHadr = 2*HadrEnergy*protM+protM2+mHadr2; + G4double sqrS = std::sqrt(sHadr); + G4double Ecm = (sHadr-mHadr2+protM2)/2/sqrS; + MomentumCM = std::sqrt(Ecm*Ecm-protM2); + + if(HadrEnergy-mHadr<0.4) + { + G4cout<<"ElasticHE(GetHadronValues): The energy T = " + <<(HadrEnergy-mHadr) + <<" GeV is very low for this method! T = 0.400 GeV is set." + <10) + { + B0 = 7.5; + A0 = 100-B0*17.2167; // log(3.0e7) + +// HadrTot = A0+B0*std::log(HadrEnergy) -8 +// +81*std::pow(HadrEnergy,-0.175); // mb + + TotP = TotN = A0+B0*logE-11 + +103*std::pow(sHadr,-0.165); // mb + } +// ================== neutron ================ + else if(HadrMoment <= 10 && HadrMoment >1.4 /*iHadrCode == 2112*/) + { +// HadrTot + + TotN = 33.3+ + 15.2*(HadrMoment*HadrMoment-1.35)/ + (std::pow(HadrMoment,2.37)+0.95); + } + + else if(HadrMoment <= 1.4 && HadrMoment > 0.8 /*iHadrCode == 2112*/) + { +// HadrTot = 33+25.5*std::pow(std::log(HadrMoment/0.95),2.0); + + TotN = 33+25.5*(logE+0.0513)*(logE+0.0513); // -log(0.95) + } + + else if(HadrMoment <= 0.8 /*&& iHadrCode == 2112*/) + { +// HadrTot = 33+30*std::pow(std::log(HadrMoment/1.3),4.0); + + A0 = (logE-0.2634)*(logE-0.2634); // log(1.3) + TotN = 33+30*A0*A0; + } +// ================= proton =============== + if(HadrMoment <= 10 && HadrMoment>1.05 /*iHadrCode == 2212*/) + { +// HadrTot + + TotP = 39.0+ + 75*(HadrMoment-1.2)/(HadrMoment*HadrMoment*HadrMoment+0.15); + } + + else if(HadrMoment <= 1.05 && HadrMoment > 0.7 /*iHadrCode == 2212*/) + { + A0 = logE+0.3147; +// HadrTot + + TotP = 23+40*A0*A0; + } + + else if(HadrMoment <= 0.7 /*&& iHadrCode == 2212*/) + { +// HadrTot = 23+50*std::pow(std::log(0.73/HadrMoment),3.5); + + TotP = 23+50*std::pow(std::log(0.73/HadrMoment),3.5); + } + + HadrTot = (TotP+TotN)/2; + +// ============================================ + HadrSlope = 6.44+0.88*std::log(sHadr)-1; // GeV-2 + if(HadrMoment<2) HadrSlope = 1.5; + + if(HadrMoment>1.2) + HadrReIm = 0.13*std::log(sHadr/350)* + std::pow(sHadr,-0.18); + + else if(HadrMoment <= 1.2 && HadrMoment > 0.6) + { + HadrReIm = -0.0- + 75.5*(std::pow(HadrMoment,0.25)-0.95)/ + (std::pow(3*HadrMoment,2.2)+1); + } + + else if(HadrMoment <= 0.6) + { + A0 = 9*HadrMoment*HadrMoment; + HadrReIm = -0.0+ + 15.5*HadrMoment/(A0*3*HadrMoment+2); + } + + DDSect2 = 11; //mb*GeV-2 + DDSect3 = 3; //mb*GeV-2 +// ================== lambda ================== + if( iHadrCode == 3122) + { + HadrTot *= 0.88; + HadrSlope *=0.85; + } +// ================== sigma + ================== + if( iHadrCode == 3222) + { + HadrTot *=0.81; + HadrSlope *=0.85; + } +// ================== sigma 0,- ================== + if(iHadrCode == 3112 || iHadrCode == 3212 ) + { + HadrTot *=0.88; + HadrSlope *=0.85; + } +// =================== xi ================= + if( iHadrCode == 3312 || iHadrCode == 3322 ) + { + HadrTot *=0.77; + HadrSlope *=0.75; + } +// ================= omega ================= + if( iHadrCode == 3334) + { + HadrTot *=0.78; + HadrSlope *=0.7; + } + + break; +// &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& + case 1: // antiproton + + sqrS = std::sqrt(sHadr); + HadrTot = 5.2+5.2*std::log(HadrEnergy) + +123.2*std::pow(HadrEnergy,-0.5); // mb + HadrSlope = 8.32+0.57*std::log(sHadr); //GeV-2 + + if(HadrEnergy<1000) + HadrReIm =0.06*(sqrS-2.236)*(sqrS-14.14)* + std::pow(sHadr,-0.8); + else + HadrReIm = 0.6*std::log(sHadr/350)*std::pow(sHadr,-0.25); + + DDSect2 = 11; //mb*GeV-2 + DDSect3 = 3; //mb*GeV-2 +// ================== lambda ================== + if( iHadrCode == -3122) + { + HadrTot *= 0.88; + HadrSlope *=0.85; + } +// ================== sigma + ================== + if( iHadrCode == -3222) + { + HadrTot *=0.81; + HadrSlope *=0.85; + } +// ================== sigma 0,- ================== + if(iHadrCode == -3112 || iHadrCode == -3212 ) + { + HadrTot *=0.88; + HadrSlope *=0.85; + } +// =================== xi ================= + if( iHadrCode == -3312 || iHadrCode == -3322 ) + { + HadrTot *=0.77; + HadrSlope *=0.75; + } +// ================= omega ================= + if( iHadrCode == -3334) + { + HadrTot *=0.78; + HadrSlope *=0.7; + } + + break; +// ------------------------------------------- + case 2: // pi plus, pi minus + case 3: + + if(HadrMoment>3.5) +// HadrTot + TotP = 10.6+2.*logE+ + 25*std::pow(HadrEnergy,-0.43); // mb +// ========================================= + else if(HadrMoment <= 3.5 && HadrMoment >1.15) + { + G4double Ex1 = 3.2* + std::exp(-(HadrMoment-2.55)*(HadrMoment-2.55)/0.55/0.55); + + G4double Ex2 = 12* + std::exp(-(HadrMoment-1.47)*(HadrMoment-1.47)/0.225/0.225); + + TotP = Ex1+Ex2+27.5; + } +// ========================================= + else if(HadrMoment <= 1.15) + { +// G4double Ex4 = 88*(std::log(HadrMoment/0.75))* +// (std::log(HadrMoment/0.75)); + + TotP = 88*(logE+0.2877)*(logE+0.2877)+14.0; + +// G4cout<<"HadrValue: Pi+ Mom Kin Tot Ex3 "< 3.0 ) + TotN = 10.6+2*std::log(HadrEnergy)+ + 30*std::pow(HadrEnergy,-0.43); // mb + + else if(HadrMoment <= 3.0 && HadrMoment > 1.3) + TotN = 36.1+0.079-4.313*logE+ + 3*std::exp(-(HadrMoment-2.1)*(HadrMoment-2.1)/0.4/0.4)+ + 1.5*std::exp(-(HadrMoment-1.4)*(HadrMoment-1.4)/0.12/0.12); + + else if(HadrMoment <= 1.3 && HadrMoment > 0.65) + TotN = 36.1+ + 10*std::exp(-(HadrMoment-0.72)*(HadrMoment-0.72)/0.06/0.06)+ + 24*std::exp(-(HadrMoment-1.015)*(HadrMoment-1.015)/0.075/0.075); + + else if(HadrMoment <= 0.65 && HadrMoment > 0.37) + { + TotN = 26+110*(std::log(HadrMoment/0.48))* + (std::log(HadrMoment/0.48)); + } + + else ///(HadrMoment<0.37) + TotN = 28.0+ + 40*std::exp(-(HadrMoment-0.29)*(HadrMoment-0.29)/0.07/0.07); + + HadrTot = (TotP+TotN)/2; + + HadrSlope = 7.28+0.245*std::log(sHadr); // GeV-2 + HadrReIm = 0.2*std::log(sHadr/100)*std::pow(sHadr,-0.15); + + DDSect2 = 4.6; //mb*GeV-2 + DDSect3 = 1.33; //mb*GeV-2 + + break; +// &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& + case 4: // K plus + + HadrTot = 10.6+1.8*std::log(HadrEnergy)+ + 9.0*std::pow(HadrEnergy,-0.55); // mb + if(HadrEnergy>100) HadrSlope = 15.0; + else +// HadrSlope = 5.28+1.76*std::log(sHadr)- + HadrSlope = 1.0+1.76*std::log(sHadr)- + 2.84*std::pow(sHadr,-0.5); // GeV-2 + HadrReIm = 0.4*(sHadr-20)*(sHadr-150)* + std::pow(sHadr+50,-2.1); + DDSect2 = 3.5; //mb*GeV-2 + DDSect3 = 1.03; //mb*GeV-2 + break; +// &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& + case 5: // K minus + + HadrTot = 10+1.8*std::log(HadrEnergy) + +25*std::pow(HadrEnergy,-0.5); // mb + HadrSlope = 6.98+0.127*std::log(sHadr); // GeV-2 +// if(HadrEnergy<8) HadrReIm = 0.7; +// else + HadrReIm = 0.4*(sHadr-20)*(sHadr-20)* + std::pow(sHadr+50,-2.1); + DDSect2 = 3.5; //mb*GeV-2 + DDSect3 = 1.03; //mb*GeV-2 + break; + } // switch + } +// ========================================================= /* End of file */ diff --git a/source/processes/hadronic/models/coherent_elastic/src/G4HadronElastic.cc b/source/processes/hadronic/models/coherent_elastic/src/G4HadronElastic.cc index fd2ff6c60f..5b89617806 100644 --- a/source/processes/hadronic/models/coherent_elastic/src/G4HadronElastic.cc +++ b/source/processes/hadronic/models/coherent_elastic/src/G4HadronElastic.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4HadronElastic.cc,v 1.19 2006/06/29 20:09:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4HadronElastic.cc,v 1.39 2006/11/23 14:51:30 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Physics model class G4HadronElastic (derived from G4LElastic) @@ -48,6 +48,13 @@ // charge exchange; remove limitation on incident momentum; // add s-wave regim below some momentum // 24-Apr-06 V.Ivanchenko add neutron scattering on hydrogen from CHIPS +// 07-Jun-06 V.Ivanchenko fix problem of rotation +// 25-Jul-06 V.Ivanchenko add 19 MeV low energy, below which S-wave is sampled +// 02-Aug-06 V.Ivanchenko introduce energy cut on the aria of S-wave for pions +// 24-Aug-06 V.Ivanchenko switch on G4ElasticHadrNucleusHE +// 31-Aug-06 V.Ivanchenko do not sample sacttering for particles with kinetic +// energy below 10 keV +// 16-Nov-06 V.Ivanchenko Simplify logic of choosing of the model for sampling // #include "G4HadronElastic.hh" @@ -62,16 +69,22 @@ #include "G4Neutron.hh" #include "G4Deuteron.hh" #include "G4Alpha.hh" +#include "G4PionPlus.hh" +#include "G4PionMinus.hh" -G4HadronElastic::G4HadronElastic(G4double elim, G4double plow, G4double ehigh) +G4HadronElastic::G4HadronElastic(G4double, G4double, G4double) : G4HadronicInteraction() { SetMinEnergy( 0.0*GeV ); - SetMaxEnergy( DBL_MAX ); + SetMaxEnergy( 100.*TeV ); verboseLevel= 0; - plablow = plow; - ekinhigh = ehigh; - ekinlim = elim; + lowEnergyRecoilLimit = 100.*keV; + lowEnergyLimitQ = 19.0*MeV; + lowEnergyLimitHE = 0.4*GeV; + lowEnergyLimitHE = DBL_MAX; + lowestEnergyLimit= 10.0*keV; + plabLowLimit = 20.0*MeV; + qCManager = G4QElasticCrossSection::GetPointer(); hElastic = new G4ElasticHadrNucleusHE(); @@ -79,6 +92,8 @@ G4HadronElastic::G4HadronElastic(G4double elim, G4double plow, G4double ehigh) theNeutron = G4Neutron::Neutron(); theDeuteron = G4Deuteron::Deuteron(); theAlpha = G4Alpha::Alpha(); + thePionPlus = G4PionPlus::PionPlus(); + thePionMinus= G4PionMinus::PionMinus(); } G4HadronElastic::~G4HadronElastic() @@ -100,14 +115,19 @@ G4HadFinalState* G4HadronElastic::ApplyYourself( const G4HadProjectile& aTrack, G4Nucleus& targetNucleus) { theParticleChange.Clear(); + const G4HadProjectile* aParticle = &aTrack; + G4double ekin = aParticle->GetKineticEnergy(); + if(ekin <= lowestEnergyLimit) { + theParticleChange.SetEnergyChange(ekin); + theParticleChange.SetMomentumChange(aTrack.Get4Momentum().vect().unit()); + return &theParticleChange; + } + G4double aTarget = targetNucleus.GetN(); G4double zTarget = targetNucleus.GetZ(); - // Elastic scattering off Hydrogen - G4double plab = aParticle->GetTotalMomentum(); - G4double ekin = aParticle->GetKineticEnergy(); if (verboseLevel >1) G4cout << "G4HadronElastic::DoIt: Incident particle plab=" << plab/GeV << " GeV/c " @@ -130,21 +150,21 @@ G4HadFinalState* G4HadronElastic::ApplyYourself( G4ParticleDefinition * theDef = 0; - if(Z == 1 && A == 1) theDef = G4Proton::Proton(); - else if (Z == 1 && A == 2) theDef = G4Deuteron::Deuteron(); + if(Z == 1 && A == 1) theDef = theProton; + else if (Z == 1 && A == 2) theDef = theDeuteron; else if (Z == 1 && A == 3) theDef = G4Triton::Triton(); else if (Z == 2 && A == 3) theDef = G4He3::He3(); - else if (Z == 2 && A == 4) theDef = G4Alpha::Alpha(); + else if (Z == 2 && A == 4) theDef = theAlpha; else theDef = G4ParticleTable::GetParticleTable()->FindIon(Z,A,0,Z); G4double m2 = theDef->GetPDGMass(); G4LorentzVector lv1 = aParticle->Get4Momentum(); - G4LorentzVector lv0(0.0,0.0,0.0,m2); - - G4LorentzVector lv = lv0 + lv1; + G4LorentzVector lv(0.0,0.0,0.0,m2); + lv += lv1; + G4ThreeVector bst = lv.boostVector(); lv1.boost(-bst); - lv0.boost(-bst); + G4ThreeVector p1 = lv1.vect(); G4double ptot = p1.mag(); G4double tmax = 4.0*ptot*ptot; @@ -152,24 +172,31 @@ G4HadFinalState* G4HadronElastic::ApplyYourself( // Choose generator G4ElasticGenerator gtype = fLElastic; - if ((theParticle == theProton || theParticle == theNeutron) && Z == 1 - && N == 0) { - gtype = fQElastic; - } else if(ekin >= ekinhigh) { - gtype = fHElastic; - } else if(plab <= plablow) { - gtype = fSWave; - } + // Q-elastic for p,n scattering on H and He + if ((theParticle == theProton || theParticle == theNeutron) + && Z <= 2 && ekin >= lowEnergyLimitQ) + gtype = fQElastic; + + // HE-elastic for energetic projectiles + else if(ekin >= lowEnergyLimitHE && A < 238) + gtype = fHElastic; + // S-wave for very low energy + else if(plab < plabLowLimit) gtype = fSWave; + + // // Sample t + // if(gtype == fQElastic) { if (verboseLevel >1) G4cout << "G4HadronElastic: Z= " << Z << " N= " << N << " pdg= " << projPDG << " mom(GeV)= " << plab/GeV << " " << qCManager << G4endl; + if(Z == 1 && N == 2) N = 1; + else if(Z == 2 && N == 1) N = 2; G4double cs = qCManager->GetCrossSection(false,plab,Z,N,projPDG); if(cs > 0.0) t = qCManager->GetExchangeT(Z,N,projPDG); - else gtype = fSWave; + else gtype = fLElastic; } if(gtype == fLElastic) { @@ -182,6 +209,22 @@ G4HadFinalState* G4HadronElastic::ApplyYourself( if(t > tmax) gtype = fSWave; } + // NaN finder + if(!(t < 0.0 || t >= 0.0)) { + if (verboseLevel > 0) { + G4cout << "G4HadronElastic:WARNING: Z= " << Z << " N= " + << N << " pdg= " << projPDG + << " mom(GeV)= " << plab/GeV + << " the model type " << gtype; + if(gtype == fQElastic) G4cout << " CHIPS "; + else if(gtype == fLElastic) G4cout << " LElastic "; + else if(gtype == fHElastic) G4cout << " HElastic "; + G4cout << " S-wave will be sampled" + << G4endl; + } + gtype = fSWave; + } + if(gtype == fSWave) t = G4UniformRand()*tmax; if(verboseLevel>1) @@ -198,20 +241,16 @@ G4HadFinalState* G4HadronElastic::ApplyYourself( G4cout << "cos(t)=" << cost << " std::sin(t)=" << sint << G4endl; G4ThreeVector v1(sint*std::cos(phi),sint*std::sin(phi),cost); - p1 = p1.unit(); - v1.rotateUz(p1); v1 *= ptot; G4LorentzVector nlv1(v1.x(),v1.y(),v1.z(),std::sqrt(ptot*ptot + m1*m1)); - G4LorentzVector nlv0 = lv0 + lv1 - nlv1; - nlv0.boost(bst); nlv1.boost(bst); G4double eFinal = nlv1.e() - m1; if (verboseLevel > 1) - G4cout << " P0= "<< nlv0 << " P1= " - << nlv1<<" m= " << m1 << " ekin0= " << eFinal - << " ekin1= " << nlv0.e() - m2 + G4cout << "Scattered: " + << nlv1<<" m= " << m1 << " ekin(MeV)= " << eFinal + << " Proj: 4-mom " << lv1 <GetParticleName() << G4endl; eFinal = 0.0; + nlv1.setE(m1); } theParticleChange.SetMomentumChange(nlv1.vect().unit()); theParticleChange.SetEnergyChange(eFinal); + G4LorentzVector nlv0 = lv - nlv1; G4double erec = nlv0.e() - m2; - if(erec > ekinlim) { + if (verboseLevel > 1) + G4cout << "Recoil: " + << nlv0<<" m= " << m2 << " ekin(MeV)= " << erec + < lowEnergyRecoilLimit) { G4DynamicParticle * aSec = new G4DynamicParticle(theDef, nlv0); theParticleChange.AddSecondary(aSec); } else { + if(erec < 0.0) erec = 0.0; theParticleChange.SetLocalEnergyDeposit(erec); } diff --git a/source/processes/hadronic/models/coherent_elastic/src/G4HadronValues.cc b/source/processes/hadronic/models/coherent_elastic/src/G4HadronValues.cc deleted file mode 100644 index f3b7d8542d..0000000000 --- a/source/processes/hadronic/models/coherent_elastic/src/G4HadronValues.cc +++ /dev/null @@ -1,239 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// $Id: G4HadronValues.cc,v 1.16 2006/06/29 20:09:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// - -// -// G4HadronValues class -// -// -// Kinematic and dynamic values -// N. Starkov 2003. -// -// Modifications: -// 14.11.05 Use PDG code instead of static particle pointers (N.Starkov) -// 23.11.05 cleanup (V.Ivanchenko) -// - -#include "globals.hh" -#include "G4HadronValues.hh" - -G4HadronValues::G4HadronValues() -{} - -G4HadronValues::~G4HadronValues() -{} - -void -G4HadronValues::GetHadronValues(const G4DynamicParticle* aHadron) - { - G4int iHadron(-1), iHadrCode; - iHadrCode = aHadron->GetDefinition()->GetPDGEncoding(); - -// G4cout<<" Code "<GetDefinition()->GetParticleName() - << G4endl; - G4Exception(" There is not method for this hadron "); - } - - G4double mHadr = aHadron->GetMass()/1000.; // In GeV - G4double HadrEnergy = aHadron->GetTotalEnergy()/1000.; // In GeV - G4double HadrMoment = aHadron->GetTotalMomentum()/1000.; // In GeV - G4double sHadr = 2*HadrEnergy*0.938+0.938*0.938+mHadr*mHadr; - G4double sqrS = std::sqrt(sHadr); - G4double Ecm = (sHadr-mHadr*mHadr+0.938*.938)/2/sqrS; - MomentumCM = std::sqrt(Ecm*Ecm-0.938*0.938); - - if(HadrEnergy-mHadr<1.0) - { - G4cout<1000) HadrReIm=0.15; - - if( iHadrCode == 3122 || iHadrCode == 3222 || - iHadrCode == 3112 || iHadrCode == 3212 ) - { - HadrTot *=0.80; - HadrSlope *=0.85; - } - - if( iHadrCode == 3312 || iHadrCode == 3322 ) - { - HadrTot *=0.70; - HadrSlope *=0.75; - } - - if( iHadrCode == 3334) - { - HadrTot *=0.60; - HadrSlope *=0.65; - } - - break; - - case 1: // antiproton - - sqrS = std::sqrt(sHadr); - HadrTot = 5.2+5.2*std::log(HadrEnergy) - +123.2*std::pow(HadrEnergy,-0.5); // mb - HadrSlope = 8.32+0.57*std::log(sHadr); //GeV-2 - if(HadrEnergy<1000) - HadrReIm =0.06*(sqrS-2.236)*(sqrS-14.14)*std::pow(sHadr,-0.8); - else - HadrReIm = 0.6*std::log(sHadr/350)*std::pow(sHadr,-0.25); - - DDSect2 = 11; //mb*GeV-2 - DDSect3 = 3; //mb*GeV-2 - -// if(HadrEnergy>1000) HadrReIm=0.15; - - if( iHadrCode == -3122 || iHadrCode == -3222 || - iHadrCode == -3112 || iHadrCode == -3212 ) - { - HadrTot *=0.75; - HadrSlope *=0.85; - } - - if( iHadrCode == -3312 || iHadrCode == -3322 ) - { - HadrTot *=0.65; - HadrSlope *=0.75; - } - - if( iHadrCode == -3334) - { - HadrTot *=0.55; - HadrSlope *=0.65; - } - - break; - - case 2: // pi plus - - if(HadrMoment>2.0) - HadrTot = 10.6+2.*std::log(HadrEnergy)+ - 25*std::pow(HadrEnergy,-0.43); // mb - else HadrTot = 40-50*(HadrMoment-1.5)*(HadrMoment-1.7); - HadrSlope = 7.28+0.245*std::log(sHadr); //GeV-2 - HadrReIm = 0.2*std::log(sHadr/100)*std::pow(sHadr,-0.15); - DDSect2 = 4.6; //mb*GeV-2 - DDSect3 = 1.33; //mb*GeV-2 - break; - - case 3: // pi minus - - HadrTot = 10.6+2*std::log(HadrEnergy)+ - 30*std::pow(HadrEnergy,-0.43); // mb - - if(HadrMoment<1.399) - HadrTot = HadrTot+21.0/0.4*(1.4-HadrMoment); - - HadrSlope = 7.28+0.245*std::log(sHadr); // GeV-2 - HadrReIm = 0.2*std::log(sHadr/100)*std::pow(sHadr,-0.15); - DDSect2 = 4.6; //mb*GeV-2 - DDSect3 = 1.33; //mb*GeV-2 - break; - - case 4: // K plus - - HadrTot = 10.6+1.8*std::log(HadrEnergy)+ - 9.0*std::pow(HadrEnergy,-0.55); // mb - if(HadrEnergy>100) HadrSlope = 15.0; - else -// HadrSlope = 5.28+1.76*std::log(sHadr)- - HadrSlope = 1.0+1.76*std::log(sHadr)- - 2.84*std::pow(sHadr,-0.5); // GeV-2 - HadrReIm = 0.4*(sHadr-20)*(sHadr-150)*std::pow(sHadr+50,-2.1); - DDSect2 = 3.5; //mb*GeV-2 - DDSect3 = 1.03; //mb*GeV-2 - break; - - case 5: // K minus - - HadrTot = 10+1.8*std::log(HadrEnergy) - +25*std::pow(HadrEnergy,-0.5); // mb - HadrSlope = 6.98+0.127*std::log(sHadr); // GeV-2 -// if(HadrEnergy<8) HadrReIm = 0.7; -// else - HadrReIm = 0.4*(sHadr-20)*(sHadr-20)*std::pow(sHadr+50,-2.1); - DDSect2 = 3.5; //mb*GeV-2 - DDSect3 = 1.03; //mb*GeV-2 - break; - } - } - -/* end of file */ diff --git a/source/processes/hadronic/models/coherent_elastic/src/G4IntegrHadrNucleus.cc b/source/processes/hadronic/models/coherent_elastic/src/G4IntegrHadrNucleus.cc deleted file mode 100644 index 4bf124988e..0000000000 --- a/source/processes/hadronic/models/coherent_elastic/src/G4IntegrHadrNucleus.cc +++ /dev/null @@ -1,226 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: G4IntegrHadrNucleus.cc,v 1.14 2006/06/29 20:09:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ -// -// IntegrHadrNucleus.cc - -#include "globals.hh" -#include "G4IntegrHadrNucleus.hh" - -// +++++++++++++++++++++++++++++++++++++++++++++++++++++ - void G4IntegrHadrNucleus:: - GetIntegralCrSec(G4Nucleus * aNucleus) - { - G4int i, l; - G4double N, N1, N2, N3, N4, Delta, Inel1; - G4double Tot0, Inel0, Prod0, Prod1, - ak, Delt, Delt2, Delt3; - G4double Rnucl, R0, Stot, Bhad, Asq, MbToB, Pi1; - G4double Dtot, Dprod, Rnuc2, RB, R2B, bk, bd; - - G4int Anucleus = (int) aNucleus->GetN(); - - if(Anucleus==2 || Anucleus==3) - G4Exception(" This nucleus is very light for this model !!!"); - - if(Anucleus>238) - G4Exception(" This nucleus is very heavy for this model !!!"); - - MbToB = 2.568; - Pi1 = 3.1416; - - Stot = HadrTot*MbToB; //{In GeV-2} - Bhad = HadrSlope; //{In GeV-2} - Asq = 1+HadrReIm*HadrReIm; - - R0 = std::sqrt(0.99); //{ This is fermi} - - if (Anucleus >10) R0 = std::sqrt(0.84); - if (Anucleus >20) R0 = std::sqrt((35.34+0.5*Anucleus) - /(40.97+Anucleus)); - if (Anucleus == 16) R0 = std::sqrt(0.75); - if (Anucleus == 58) R0 = std::sqrt(0.6); -// R0 = std::sqrt(0.64); - - Rnucl = R0*std::pow(static_cast(Anucleus),0.3333); //{In Fermi } - - if(Anucleus == 4) Rnucl = 1.2; - - Rnuc2 = Rnucl*Rnucl*MbToB*10; //{ In GeV-2} - RB = Rnuc2+Bhad; - R2B = RB+Bhad; - Delta = Stot/R2B/2/Pi1; - Delt = Delta*Asq*0.5; - Delt2 = Delta*2; - Delt3 = Stot/RB/Bhad/16/Pi1*Asq*R2B; - - Tot0 = 0; - Inel0 = 0; - Inel1=0; - N = N1 = -1/Delta; - N3 = -1/Delt2; - Prod0 = 0; - - for (i=1; i<= Anucleus; i++) - - { - N = -N*Delta*(Anucleus-i+1)/i; - N1 = -N1*Delta*(2*Anucleus-i+1)/i; - N3 = -N3*Delt2*(Anucleus-i+1)/i; - Tot0 = Tot0+N/i; - Inel0 = Inel0+N1/i; - N2 = 1; - N4 = 1; - Inel1 = 0; - Prod1 = 0; - - for (l=0; l<= i; l++) - - { -// Inel1 = Inel1+N2/(i+l); - Prod1 = Prod1+N4*RB/(i*RB+l*Bhad); -// N2 = -N2*Delt*(i-l)/(l+1); - N4 = -N4*Delt3*(i-l)/(l+1); - } // l - -// Inel2 = Inel2+Inel1*N3; - Prod0 = Prod0+Prod1*N3; - if(std::fabs(N1/i/Inel0) < 0.0001) break; - } // i - - Tot0 = Tot0*HadrTot; - Inel0 = Inel0*HadrTot*0.5; -// Inel2 = Inel2*HadrTot; - Prod0 = Prod0*HadrTot; - Tot00 = Tot0; - - ak = (Rnuc2*2*Pi1/Stot); - G4double DDSect1 = (DDSect2+DDSect3*std::log(1.06*2*HadrEnergy - /Rnucl/std::sqrt(25.68)/4)); - - Dtot = 8*Pi1*ak/HadrTot*(1-(1+Anucleus/ak) - *std::exp(-Anucleus/ak))*DDSect1/MbToB; - DTot00 = Dtot; - - bk = (1-1/ak)/Stot/(1-1/ak/4); - - bd = bk*bk*DDSect1*(1-(1+Anucleus/ak*(1-1/ak/4))* - std::exp(-Anucleus/ak*(1-1/4/ak)))*Rnuc2; - - Dprod = bd*4*Pi1*Pi1*MbToB; - - TotalCrSec = Tot0-Dtot; - InelCrSec = Inel0-Dprod; -// InelCrSec1 = Inel2; - ProdCrSec = Prod0-Dprod; - ElasticCrSec = TotalCrSec-InelCrSec; - QuasyElasticCrSec = InelCrSec-ProdCrSec; - } - -// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - G4double - G4IntegrHadrNucleus::GetElasticCrossSection( - const G4DynamicParticle * aHadron, - G4Nucleus * aNucleus) - - { - HadrEnergy = aHadron->GetTotalEnergy()/1000; - G4double MassH = aHadron->GetMass()/1000; - if(HadrEnergy-MassH < 1.0) - G4Exception(" The hadron energy is very low for this model !!!"); - - G4HadronValues::GetHadronValues(aHadron); - GetIntegralCrSec(aNucleus); - return(ElasticCrSec); - } - -// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - G4double - G4IntegrHadrNucleus::GetTotalCrossSection( - const G4DynamicParticle * aHadron, - G4Nucleus * aNucleus) - { - HadrEnergy = aHadron->GetTotalEnergy()/1000; - G4double MassH = aHadron->GetMass()/1000; - if(HadrEnergy-MassH < 1.0) - G4Exception(" The hadron energy is very low for this model !!!"); - - G4HadronValues::GetHadronValues(aHadron); - GetIntegralCrSec(aNucleus); - return(TotalCrSec); - } - -// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - G4double - G4IntegrHadrNucleus::GetInelasticCrossSection( - const G4DynamicParticle * aHadron, - G4Nucleus * aNucleus) - { - HadrEnergy = aHadron->GetTotalEnergy()/1000; - G4double MassH = aHadron->GetMass()/1000; - if(HadrEnergy-MassH < 1.0) - G4Exception(" The hadron energy is very low for this model !!!"); - - G4HadronValues::GetHadronValues(aHadron); - GetIntegralCrSec(aNucleus); - return(InelCrSec); - } - -// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - G4double - G4IntegrHadrNucleus::GetProductionCrossSection( - const G4DynamicParticle * aHadron, - G4Nucleus * aNucleus) - { - HadrEnergy = aHadron->GetTotalEnergy()/1000; - G4double MassH = aHadron->GetMass()/1000; - if(HadrEnergy-MassH < 1.0) - G4Exception(" The hadron energy is very low for this model !!!"); - - G4HadronValues::GetHadronValues(aHadron); - GetIntegralCrSec(aNucleus); - return(ProdCrSec); - } - -// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - G4double - G4IntegrHadrNucleus::GetQuasyElasticCrossSection( - const G4DynamicParticle * aHadron, - G4Nucleus * aNucleus) - { - HadrEnergy = aHadron->GetTotalEnergy()/1000; - G4double MassH = aHadron->GetMass()/1000; - if(HadrEnergy-MassH < 1.0) - G4Exception(" The hadron energy is very low for this model !!!"); - - G4HadronValues::GetHadronValues(aHadron); - GetIntegralCrSec(aNucleus); - return(QuasyElasticCrSec); - } - -/* end of file */ diff --git a/source/processes/hadronic/models/coherent_elastic/src/G4LEpp.cc b/source/processes/hadronic/models/coherent_elastic/src/G4LEpp.cc index 31ff20975d..ddd9d04603 100644 --- a/source/processes/hadronic/models/coherent_elastic/src/G4LEpp.cc +++ b/source/processes/hadronic/models/coherent_elastic/src/G4LEpp.cc @@ -87,7 +87,8 @@ G4LEpp::ApplyYourself(const G4HadProjectile& aTrack, G4Nucleus& targetNucleus) G4double ek = aParticle->GetKineticEnergy(); G4ThreeVector theInitial = aParticle->Get4Momentum().vect(); - if (verboseLevel > 1) { +// if (verboseLevel > 1) + { G4double E = aParticle->GetTotalEnergy(); G4double E0 = aParticle->GetDefinition()->GetPDGMass(); G4double Q = aParticle->GetDefinition()->GetPDGCharge(); diff --git a/source/processes/hadronic/models/coherent_elastic/src/G4UHadronElasticProcess.cc b/source/processes/hadronic/models/coherent_elastic/src/G4UHadronElasticProcess.cc index ae01693537..4d29d6c0b5 100644 --- a/source/processes/hadronic/models/coherent_elastic/src/G4UHadronElasticProcess.cc +++ b/source/processes/hadronic/models/coherent_elastic/src/G4UHadronElasticProcess.cc @@ -23,15 +23,19 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4UHadronElasticProcess.cc,v 1.15 2006/06/29 20:09:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4UHadronElasticProcess.cc,v 1.28 2006/11/16 20:09:13 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Geant4 Hadron Elastic Scattering Process -- header file // // Created 21 April 2006 V.Ivanchenko // // Modified: -// 24-Apr-06 V.Ivanchenko add neutron scattering on hydrogen from CHIPS +// 24.04.06 V.Ivanchenko add neutron scattering on hydrogen from CHIPS +// 07.06.06 V.Ivanchenko fix problem of rotation of final state +// 25.07.06 V.Ivanchenko add 19 MeV low energy for CHIPS +// 26.09.06 V.Ivanchenko add lowestEnergy +// 20.10.06 V.Ivanchenko initialise lowestEnergy=0 for neitrals, eV for charged // // @@ -47,18 +51,17 @@ #include "G4IsotopeVector.hh" #include "G4Neutron.hh" #include "G4Proton.hh" -#include "G4NeutronHPElasticData.hh" #include "G4HadronElastic.hh" -G4UHadronElasticProcess::G4UHadronElasticProcess(const G4String& pName, G4bool fl) - : G4HadronicProcess(pName), flagHP(fl), first(true) +G4UHadronElasticProcess::G4UHadronElasticProcess(const G4String& pName, G4double) + : G4HadronicProcess(pName), lowestEnergy(0.0), first(true) { AddDataSet(new G4HadronElasticDataSet); - theProton = G4Proton::Proton(); - theNeutron = G4Neutron::Neutron(); - thEnergy = 1.*keV; + theProton = G4Proton::Proton(); + theNeutron = G4Neutron::Neutron(); + thEnergy = 19.0*MeV; verboseLevel= 1; - qCManager = 0; + qCManager = 0; } G4UHadronElasticProcess::~G4UHadronElasticProcess() @@ -78,15 +81,22 @@ BuildPhysicsTable(const G4ParticleDefinition& aParticleType) if(!qCManager) qCManager = G4QElasticCrossSection::GetPointer(); theParticle = &aParticleType; pPDG = theParticle->GetPDGEncoding(); - if(theParticle == theNeutron && flagHP) - AddDataSet(new G4NeutronHPElasticData()); store = G4HadronicProcess::GetCrossSectionDataStore(); + + // defined lowest threshold for the projectile + if(theParticle->GetPDGCharge() != 0.0) lowestEnergy = eV; - if(verboseLevel>1) + if(verboseLevel>1 || + (verboseLevel==1 && theParticle == theNeutron)) { + G4cout << G4endl; G4cout << "G4UHadronElasticProcess for " - << theParticle->GetParticleName() - << G4endl; + << theParticle->GetParticleName() + << " PDGcode= " << pPDG + << " Elow(MeV)= " << thEnergy/MeV + << " Elowest(eV)= " << lowestEnergy/eV + << G4endl; + } } store->BuildPhysicsTable(aParticleType); } @@ -97,20 +107,16 @@ G4double G4UHadronElasticProcess::GetMeanFreePath(const G4Track& track, { *cond = NotForced; const G4DynamicParticle* dp = track.GetDynamicParticle(); - const G4Material* material = track.GetMaterial(); cross = 0.0; G4double x = DBL_MAX; - // The process is effective only above the threshold - if(dp->GetKineticEnergy() < thEnergy) return x; - // Compute cross sesctions + const G4Material* material = track.GetMaterial(); const G4ElementVector* theElementVector = material->GetElementVector(); const G4double* theAtomNumDensityVector = material->GetVecNbOfAtomsPerVolume(); G4double temp = material->GetTemperature(); - G4int nelm = material->GetNumberOfElements(); - xsecH[0] = 0.0; - xsecH[1] = 0.0; + G4int nelm = material->GetNumberOfElements(); + if(verboseLevel>1) G4cout << "G4UHadronElasticProcess get mfp for " << theParticle->GetParticleName() @@ -143,44 +149,45 @@ G4double G4UHadronElasticProcess::GetMicroscopicCrossSection( // gives the microscopic cross section in GEANT4 internal units G4int iz = G4int(elm->GetZ()); G4double x = 0.0; + // CHIPS cross sections - if(iz <= 2 && (theParticle == theProton || theParticle == theNeutron)) { + if(iz <= 2 && dp->GetKineticEnergy() > thEnergy && + (theParticle == theProton || theParticle == theNeutron)) { + G4double momentum = dp->GetTotalMomentum(); - if(iz == 1) { - G4IsotopeVector* isv = elm->GetIsotopeVector(); - G4int ni = 0; - if(isv) ni = isv->size(); - if(ni > 0) { - G4double* ab = elm->GetRelativeAbundanceVector(); - x = 0.0; - for(G4int j=0; jGetIsotope(j)->GetN() - 1; - if(N == 0 || N == 1) { - if(verboseLevel>1) - G4cout << "G4UHadronElasticProcess compute CHIPS CS for Z= 1, N= " - << N << " pdg= " << pPDG - << " mom(GeV)= " << momentum/GeV - << " " << qCManager << G4endl; - G4double y = ab[j]* - qCManager->GetCrossSection(false,momentum,1,N,pPDG); - xsecH[N] += y; - x += y; - } + G4IsotopeVector* isv = elm->GetIsotopeVector(); + G4int ni = 0; + if(isv) ni = isv->size(); + if(ni > 0) { + G4double* ab = elm->GetRelativeAbundanceVector(); + x = 0.0; + for(G4int j=0; jGetIsotope(j)->GetN() - iz; + if(iz == 1) { + if(N > 1) N = 1; + } else { + N = 2; } - } else { if(verboseLevel>1) - G4cout << "G4UHadronElasticProcess compute CHIPS CS for Z= 1, N= 0" - << " pdg= " << pPDG - << " mom(GeV)= " << momentum/GeV << " " << qCManager << G4endl; - x = qCManager->GetCrossSection(false,momentum,1,0,pPDG); - xsecH[0] = x; + G4cout << "G4UHadronElasticProcess compute CHIPS CS for Z= " << iz + << " N= " << N << " pdg= " << pPDG + << " mom(GeV)= " << momentum/GeV + << " " << qCManager << G4endl; + G4double y = ab[j]*qCManager->GetCrossSection(false,momentum,iz,N,pPDG); + x += y; + xsecH[j] = x; } } else { + G4int N = 0; + if(iz == 2) N = 2; if(verboseLevel>1) - G4cout << "G4UHadronElasticProcess compute CHIPS CS for Z= 2, N=2 " + G4cout << "G4UHadronElasticProcess compute CHIPS CS for Z= " << iz + << " N= " << N + << " pdg= " << pPDG << G4endl; - x = qCManager->GetCrossSection(false,momentum,2,2,pPDG); + x = qCManager->GetCrossSection(false,momentum,iz,N,pPDG); } + // GHAD cross section } else { if(verboseLevel>1) G4cout << "G4UHadronElasticProcess compute GHAD CS for element " @@ -188,6 +195,19 @@ G4double G4UHadronElasticProcess::GetMicroscopicCrossSection( << G4endl; x = store->GetCrossSection(dp, elm, temp); } + // NaN finder + if(!(x < 0.0 || x >= 0.0)) { + if (verboseLevel > 1) { + G4cout << "G4UHadronElasticProcess:WARNING: Z= " << iz + << " pdg= " << pPDG + << " mom(GeV)= " << dp->GetTotalMomentum()/GeV + << " cross= " << x + << " set to zero" + << G4endl; + } + x = 0.0; + } + if(verboseLevel>1) G4cout << "G4UHadronElasticProcess cross(mb)= " << x/millibarn << " E(MeV)= " << dp->GetKineticEnergy() @@ -204,10 +224,14 @@ G4VParticleChange* G4UHadronElasticProcess::PostStepDoIt( { G4ForceCondition cn; aParticleChange.Initialize(track); - G4double mfp = GetMeanFreePath(track, 0.0, &cn); - if(mfp == DBL_MAX) return G4VDiscreteProcess::PostStepDoIt(track,step); - G4double kineticEnergy = track.GetKineticEnergy(); + if(kineticEnergy <= lowestEnergy) + return G4VDiscreteProcess::PostStepDoIt(track,step); + + G4double mfp = GetMeanFreePath(track, 0.0, &cn); + if(mfp == DBL_MAX) + return G4VDiscreteProcess::PostStepDoIt(track,step); + G4Material* material = track.GetMaterial(); // Select element @@ -230,26 +254,33 @@ G4VParticleChange* G4UHadronElasticProcess::PostStepDoIt( if(isv) ni = isv->size(); if(ni == 1) { A = G4double(elm->GetIsotope(0)->GetN()); + } else if(ni == 0) { + A = elm->GetN(); } else if(ni > 1) { - if(iz == 1 && theParticle == theProton) { - A = 1.; - if(G4UniformRand()*(xsecH[0] + xsec[1]) > xsec[0]) A = 2.; + + G4int j = -1; + ni--; + // Special treatment of hydrogen and helium for CHIPS + if(iz <= 2 && (theParticle == theProton || theParticle == theNeutron)) { + G4double x = G4UniformRand()*xsecH[ni]; + do {j++;} while (x > xsecH[j] && j < ni); + + // Abandance vector } else { G4double* ab = elm->GetRelativeAbundanceVector(); G4double y = G4UniformRand(); - G4int j = -1; - ni--; do { j++; y -= ab[j]; } while (y > 0.0 && j < ni); - A = G4double(elm->GetIsotope(j)->GetN()); } - } + A = G4double(elm->GetIsotope(j)->GetN()); + } G4HadronicInteraction* hadi = ChooseHadronicInteraction( kineticEnergy, material, elm); // Initialize the hadronic projectile from the track + // G4cout << "track " << track.GetDynamicParticle()->Get4Momentum()<1) G4cout << "G4UHadronElasticProcess::PostStepDoIt for " @@ -260,18 +291,26 @@ G4VParticleChange* G4UHadronElasticProcess::PostStepDoIt( aParticleChange.Initialize(track); G4HadFinalState* result = hadi->ApplyYourself(thePro, targetNucleus); + G4ThreeVector indir = track.GetMomentumDirection(); + G4ThreeVector outdir = (result->GetMomentumChange()).rotateUz(indir); if(verboseLevel>1) G4cout << "Efin= " << result->GetEnergyChange() << " de= " << result->GetLocalEnergyDeposit() << " nsec= " << result->GetNumberOfSecondaries() + << " dir= " << outdir << G4endl; aParticleChange.ProposeEnergy(result->GetEnergyChange()); - aParticleChange.ProposeMomentumDirection(result->GetMomentumChange()); + aParticleChange.ProposeMomentumDirection(outdir); if(result->GetNumberOfSecondaries() > 0) { aParticleChange.SetNumberOfSecondaries(1); G4DynamicParticle* p = result->GetSecondary(0)->GetParticle(); + G4ThreeVector pdir = p->GetMomentumDirection(); + // G4cout << "recoil " << pdir << G4endl; + pdir = pdir.rotateUz(indir); + // G4cout << "recoil rotated " << pdir << G4endl; + p->SetMomentumDirection(pdir); aParticleChange.AddSecondary(p); } else { aParticleChange.SetNumberOfSecondaries(0); @@ -319,3 +358,4 @@ DumpPhysicsTable(const G4ParticleDefinition& aParticleType) { store->DumpPhysicsTable(aParticleType); } + diff --git a/source/processes/hadronic/models/de_excitation/History b/source/processes/hadronic/models/de_excitation/History index 116beb3c50..cc621c6c13 100644 --- a/source/processes/hadronic/models/de_excitation/History +++ b/source/processes/hadronic/models/de_excitation/History @@ -14,6 +14,16 @@ code and to keep track of all tags. * Please list in reverse chronological order (last date on top) --------------------------------------------------------------- +19 Aug 2006 Dennis Wright (hadr-deex-V08-01-00) +----------------------------------------------- +- multifragmentation + G4VStatMFMacroCluster.hh : removed meaningless const qualifier from + methods GetInvLevelDensity, GetZARatio and GetSize + +- handler + G4ExcitationHandler.hh : removed meaningless const qualifier from + mehtods GetMaxZ, GetMaxA and GetMinE + 20 Apr 2006 Dennis Wright (hadr-deex-V08-00-03) ----------------------------------------------- - photon_evaporation diff --git a/source/processes/hadronic/models/de_excitation/evaporation/include/G4AlphaEvaporationChannel.hh b/source/processes/hadronic/models/de_excitation/evaporation/include/G4AlphaEvaporationChannel.hh index 8526ab3951..987535b513 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/include/G4AlphaEvaporationChannel.hh +++ b/source/processes/hadronic/models/de_excitation/evaporation/include/G4AlphaEvaporationChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4AlphaEvaporationChannel.hh,v 1.3 2006/06/29 20:09:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov. 1999) diff --git a/source/processes/hadronic/models/de_excitation/evaporation/include/G4AlphaEvaporationProbability.hh b/source/processes/hadronic/models/de_excitation/evaporation/include/G4AlphaEvaporationProbability.hh index 120b680723..d4d6af9779 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/include/G4AlphaEvaporationProbability.hh +++ b/source/processes/hadronic/models/de_excitation/evaporation/include/G4AlphaEvaporationProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4AlphaEvaporationProbability.hh,v 1.3 2006/06/29 20:09:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/evaporation/include/G4DeuteronEvaporationChannel.hh b/source/processes/hadronic/models/de_excitation/evaporation/include/G4DeuteronEvaporationChannel.hh index 59186c9e4c..319267c79f 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/include/G4DeuteronEvaporationChannel.hh +++ b/source/processes/hadronic/models/de_excitation/evaporation/include/G4DeuteronEvaporationChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4DeuteronEvaporationChannel.hh,v 1.3 2006/06/29 20:09:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov. 1999) diff --git a/source/processes/hadronic/models/de_excitation/evaporation/include/G4DeuteronEvaporationProbability.hh b/source/processes/hadronic/models/de_excitation/evaporation/include/G4DeuteronEvaporationProbability.hh index 889f0f2c7d..6543550047 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/include/G4DeuteronEvaporationProbability.hh +++ b/source/processes/hadronic/models/de_excitation/evaporation/include/G4DeuteronEvaporationProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4DeuteronEvaporationProbability.hh,v 1.3 2006/06/29 20:09:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/evaporation/include/G4Evaporation.hh b/source/processes/hadronic/models/de_excitation/evaporation/include/G4Evaporation.hh index 659b2c8bf9..a379ed71ab 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/include/G4Evaporation.hh +++ b/source/processes/hadronic/models/de_excitation/evaporation/include/G4Evaporation.hh @@ -25,7 +25,7 @@ // // // $Id: G4Evaporation.hh,v 1.3 2006/06/29 20:09:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/evaporation/include/G4EvaporationChannel.hh b/source/processes/hadronic/models/de_excitation/evaporation/include/G4EvaporationChannel.hh index 3f38a11c9e..0c9d2dfc8f 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/include/G4EvaporationChannel.hh +++ b/source/processes/hadronic/models/de_excitation/evaporation/include/G4EvaporationChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4EvaporationChannel.hh,v 1.3 2006/06/29 20:09:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Oct 1998) diff --git a/source/processes/hadronic/models/de_excitation/evaporation/include/G4EvaporationFactory.hh b/source/processes/hadronic/models/de_excitation/evaporation/include/G4EvaporationFactory.hh index 4e81cfdb1e..72fba07770 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/include/G4EvaporationFactory.hh +++ b/source/processes/hadronic/models/de_excitation/evaporation/include/G4EvaporationFactory.hh @@ -25,7 +25,7 @@ // // // $Id: G4EvaporationFactory.hh,v 1.3 2006/06/29 20:09:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/evaporation/include/G4EvaporationProbability.hh b/source/processes/hadronic/models/de_excitation/evaporation/include/G4EvaporationProbability.hh index fb460a2b0d..dbddfdd277 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/include/G4EvaporationProbability.hh +++ b/source/processes/hadronic/models/de_excitation/evaporation/include/G4EvaporationProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4EvaporationProbability.hh,v 1.3 2006/06/29 20:09:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Oct 1998) diff --git a/source/processes/hadronic/models/de_excitation/evaporation/include/G4He3EvaporationChannel.hh b/source/processes/hadronic/models/de_excitation/evaporation/include/G4He3EvaporationChannel.hh index 9da1b80fc4..6fd11daf4a 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/include/G4He3EvaporationChannel.hh +++ b/source/processes/hadronic/models/de_excitation/evaporation/include/G4He3EvaporationChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4He3EvaporationChannel.hh,v 1.3 2006/06/29 20:09:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov. 1999) diff --git a/source/processes/hadronic/models/de_excitation/evaporation/include/G4He3EvaporationProbability.hh b/source/processes/hadronic/models/de_excitation/evaporation/include/G4He3EvaporationProbability.hh index 3aa1483048..9eeacce4a2 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/include/G4He3EvaporationProbability.hh +++ b/source/processes/hadronic/models/de_excitation/evaporation/include/G4He3EvaporationProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4He3EvaporationProbability.hh,v 1.3 2006/06/29 20:10:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/evaporation/include/G4NeutronEvaporationChannel.hh b/source/processes/hadronic/models/de_excitation/evaporation/include/G4NeutronEvaporationChannel.hh index a8b72c3106..c474cbe4cb 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/include/G4NeutronEvaporationChannel.hh +++ b/source/processes/hadronic/models/de_excitation/evaporation/include/G4NeutronEvaporationChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronEvaporationChannel.hh,v 1.3 2006/06/29 20:10:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov. 1999) diff --git a/source/processes/hadronic/models/de_excitation/evaporation/include/G4NeutronEvaporationProbability.hh b/source/processes/hadronic/models/de_excitation/evaporation/include/G4NeutronEvaporationProbability.hh index 960033a030..0384160f3e 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/include/G4NeutronEvaporationProbability.hh +++ b/source/processes/hadronic/models/de_excitation/evaporation/include/G4NeutronEvaporationProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronEvaporationProbability.hh,v 1.4 2006/06/29 20:10:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/evaporation/include/G4ProtonEvaporationChannel.hh b/source/processes/hadronic/models/de_excitation/evaporation/include/G4ProtonEvaporationChannel.hh index dcbcf5cb1c..8686dfe2c9 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/include/G4ProtonEvaporationChannel.hh +++ b/source/processes/hadronic/models/de_excitation/evaporation/include/G4ProtonEvaporationChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4ProtonEvaporationChannel.hh,v 1.3 2006/06/29 20:10:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov. 1999) diff --git a/source/processes/hadronic/models/de_excitation/evaporation/include/G4ProtonEvaporationProbability.hh b/source/processes/hadronic/models/de_excitation/evaporation/include/G4ProtonEvaporationProbability.hh index 58bc10e141..3709473cf4 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/include/G4ProtonEvaporationProbability.hh +++ b/source/processes/hadronic/models/de_excitation/evaporation/include/G4ProtonEvaporationProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4ProtonEvaporationProbability.hh,v 1.3 2006/06/29 20:10:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/evaporation/include/G4TritonEvaporationChannel.hh b/source/processes/hadronic/models/de_excitation/evaporation/include/G4TritonEvaporationChannel.hh index 8113cf437d..b947e682b6 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/include/G4TritonEvaporationChannel.hh +++ b/source/processes/hadronic/models/de_excitation/evaporation/include/G4TritonEvaporationChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4TritonEvaporationChannel.hh,v 1.3 2006/06/29 20:10:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov. 1999) diff --git a/source/processes/hadronic/models/de_excitation/evaporation/include/G4TritonEvaporationProbability.hh b/source/processes/hadronic/models/de_excitation/evaporation/include/G4TritonEvaporationProbability.hh index 47e2168ad8..aff5f3b693 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/include/G4TritonEvaporationProbability.hh +++ b/source/processes/hadronic/models/de_excitation/evaporation/include/G4TritonEvaporationProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4TritonEvaporationProbability.hh,v 1.3 2006/06/29 20:10:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/evaporation/include/G4VEvaporation.hh b/source/processes/hadronic/models/de_excitation/evaporation/include/G4VEvaporation.hh index 3cb19762ee..0cea97c448 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/include/G4VEvaporation.hh +++ b/source/processes/hadronic/models/de_excitation/evaporation/include/G4VEvaporation.hh @@ -25,7 +25,7 @@ // // // $Id: G4VEvaporation.hh,v 1.3 2006/06/29 20:10:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Oct 1998) written from G4Evaporation.hh (May 1998) diff --git a/source/processes/hadronic/models/de_excitation/evaporation/src/G4AlphaEvaporationChannel.cc b/source/processes/hadronic/models/de_excitation/evaporation/src/G4AlphaEvaporationChannel.cc index 4316a62326..7d1fb6e04f 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/src/G4AlphaEvaporationChannel.cc +++ b/source/processes/hadronic/models/de_excitation/evaporation/src/G4AlphaEvaporationChannel.cc @@ -25,7 +25,7 @@ // // // $Id: G4AlphaEvaporationChannel.cc,v 1.4 2006/06/29 20:10:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov. 1999) diff --git a/source/processes/hadronic/models/de_excitation/evaporation/src/G4AlphaEvaporationProbability.cc b/source/processes/hadronic/models/de_excitation/evaporation/src/G4AlphaEvaporationProbability.cc index 356816de0b..921d52c0ed 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/src/G4AlphaEvaporationProbability.cc +++ b/source/processes/hadronic/models/de_excitation/evaporation/src/G4AlphaEvaporationProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4AlphaEvaporationProbability.cc,v 1.4 2006/06/29 20:10:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/evaporation/src/G4DeuteronEvaporationChannel.cc b/source/processes/hadronic/models/de_excitation/evaporation/src/G4DeuteronEvaporationChannel.cc index 85cfa384d6..e24707a343 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/src/G4DeuteronEvaporationChannel.cc +++ b/source/processes/hadronic/models/de_excitation/evaporation/src/G4DeuteronEvaporationChannel.cc @@ -25,7 +25,7 @@ // // // $Id: G4DeuteronEvaporationChannel.cc,v 1.4 2006/06/29 20:10:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov. 1999) diff --git a/source/processes/hadronic/models/de_excitation/evaporation/src/G4DeuteronEvaporationProbability.cc b/source/processes/hadronic/models/de_excitation/evaporation/src/G4DeuteronEvaporationProbability.cc index 480339f800..8e17fc6b4a 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/src/G4DeuteronEvaporationProbability.cc +++ b/source/processes/hadronic/models/de_excitation/evaporation/src/G4DeuteronEvaporationProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4DeuteronEvaporationProbability.cc,v 1.4 2006/06/29 20:10:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/evaporation/src/G4Evaporation.cc b/source/processes/hadronic/models/de_excitation/evaporation/src/G4Evaporation.cc index 6c840ce302..eb60b4b11a 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/src/G4Evaporation.cc +++ b/source/processes/hadronic/models/de_excitation/evaporation/src/G4Evaporation.cc @@ -25,7 +25,7 @@ // // // $Id: G4Evaporation.cc,v 1.6 2006/06/29 20:10:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Oct 1998) diff --git a/source/processes/hadronic/models/de_excitation/evaporation/src/G4EvaporationChannel.cc b/source/processes/hadronic/models/de_excitation/evaporation/src/G4EvaporationChannel.cc index 2274e6118a..8dab2acb5b 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/src/G4EvaporationChannel.cc +++ b/source/processes/hadronic/models/de_excitation/evaporation/src/G4EvaporationChannel.cc @@ -25,7 +25,7 @@ // // // $Id: G4EvaporationChannel.cc,v 1.5 2006/06/29 20:10:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Oct 1998) diff --git a/source/processes/hadronic/models/de_excitation/evaporation/src/G4EvaporationFactory.cc b/source/processes/hadronic/models/de_excitation/evaporation/src/G4EvaporationFactory.cc index 5ccf4ef8d1..38023a197a 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/src/G4EvaporationFactory.cc +++ b/source/processes/hadronic/models/de_excitation/evaporation/src/G4EvaporationFactory.cc @@ -25,7 +25,7 @@ // // // $Id: G4EvaporationFactory.cc,v 1.4 2006/06/29 20:10:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/evaporation/src/G4EvaporationProbability.cc b/source/processes/hadronic/models/de_excitation/evaporation/src/G4EvaporationProbability.cc index a1551bd79e..9d004f883c 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/src/G4EvaporationProbability.cc +++ b/source/processes/hadronic/models/de_excitation/evaporation/src/G4EvaporationProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4EvaporationProbability.cc,v 1.5 2006/06/29 20:10:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Oct 1998) diff --git a/source/processes/hadronic/models/de_excitation/evaporation/src/G4He3EvaporationChannel.cc b/source/processes/hadronic/models/de_excitation/evaporation/src/G4He3EvaporationChannel.cc index 70df949bc5..7c80d4ad7d 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/src/G4He3EvaporationChannel.cc +++ b/source/processes/hadronic/models/de_excitation/evaporation/src/G4He3EvaporationChannel.cc @@ -25,7 +25,7 @@ // // // $Id: G4He3EvaporationChannel.cc,v 1.4 2006/06/29 20:10:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov. 1999) diff --git a/source/processes/hadronic/models/de_excitation/evaporation/src/G4He3EvaporationProbability.cc b/source/processes/hadronic/models/de_excitation/evaporation/src/G4He3EvaporationProbability.cc index 64c3262857..494b559994 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/src/G4He3EvaporationProbability.cc +++ b/source/processes/hadronic/models/de_excitation/evaporation/src/G4He3EvaporationProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4He3EvaporationProbability.cc,v 1.4 2006/06/29 20:10:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/evaporation/src/G4NeutronEvaporationChannel.cc b/source/processes/hadronic/models/de_excitation/evaporation/src/G4NeutronEvaporationChannel.cc index 2676dbfaf6..e89540757c 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/src/G4NeutronEvaporationChannel.cc +++ b/source/processes/hadronic/models/de_excitation/evaporation/src/G4NeutronEvaporationChannel.cc @@ -25,7 +25,7 @@ // // // $Id: G4NeutronEvaporationChannel.cc,v 1.4 2006/06/29 20:10:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov. 1999) diff --git a/source/processes/hadronic/models/de_excitation/evaporation/src/G4NeutronEvaporationProbability.cc b/source/processes/hadronic/models/de_excitation/evaporation/src/G4NeutronEvaporationProbability.cc index acde343ac1..df3102366a 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/src/G4NeutronEvaporationProbability.cc +++ b/source/processes/hadronic/models/de_excitation/evaporation/src/G4NeutronEvaporationProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4NeutronEvaporationProbability.cc,v 1.4 2006/06/29 20:10:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/evaporation/src/G4ProtonEvaporationChannel.cc b/source/processes/hadronic/models/de_excitation/evaporation/src/G4ProtonEvaporationChannel.cc index 45682ebb3a..db5bfb5373 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/src/G4ProtonEvaporationChannel.cc +++ b/source/processes/hadronic/models/de_excitation/evaporation/src/G4ProtonEvaporationChannel.cc @@ -25,7 +25,7 @@ // // // $Id: G4ProtonEvaporationChannel.cc,v 1.4 2006/06/29 20:10:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov. 1999) diff --git a/source/processes/hadronic/models/de_excitation/evaporation/src/G4ProtonEvaporationProbability.cc b/source/processes/hadronic/models/de_excitation/evaporation/src/G4ProtonEvaporationProbability.cc index d27bb8f9fd..f1d1faf97b 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/src/G4ProtonEvaporationProbability.cc +++ b/source/processes/hadronic/models/de_excitation/evaporation/src/G4ProtonEvaporationProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4ProtonEvaporationProbability.cc,v 1.4 2006/06/29 20:10:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/evaporation/src/G4TritonEvaporationChannel.cc b/source/processes/hadronic/models/de_excitation/evaporation/src/G4TritonEvaporationChannel.cc index 1ec8e02cb4..8d0abe1029 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/src/G4TritonEvaporationChannel.cc +++ b/source/processes/hadronic/models/de_excitation/evaporation/src/G4TritonEvaporationChannel.cc @@ -25,7 +25,7 @@ // // // $Id: G4TritonEvaporationChannel.cc,v 1.4 2006/06/29 20:10:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov. 1999) diff --git a/source/processes/hadronic/models/de_excitation/evaporation/src/G4TritonEvaporationProbability.cc b/source/processes/hadronic/models/de_excitation/evaporation/src/G4TritonEvaporationProbability.cc index e615df3c16..7ead3da551 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/src/G4TritonEvaporationProbability.cc +++ b/source/processes/hadronic/models/de_excitation/evaporation/src/G4TritonEvaporationProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4TritonEvaporationProbability.cc,v 1.4 2006/06/29 20:10:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/evaporation/src/G4VEvaporation.cc b/source/processes/hadronic/models/de_excitation/evaporation/src/G4VEvaporation.cc index 6598b36314..6559c0eea7 100644 --- a/source/processes/hadronic/models/de_excitation/evaporation/src/G4VEvaporation.cc +++ b/source/processes/hadronic/models/de_excitation/evaporation/src/G4VEvaporation.cc @@ -25,7 +25,7 @@ // // // $Id: G4VEvaporation.cc,v 1.5 2006/06/29 20:10:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Oct 1998) writen from G4Evaporation.cc (May 1998) diff --git a/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4B9FermiFragment.hh b/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4B9FermiFragment.hh index 28b5901ccf..92348b051f 100644 --- a/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4B9FermiFragment.hh +++ b/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4B9FermiFragment.hh @@ -25,7 +25,7 @@ // // // $Id: G4B9FermiFragment.hh,v 1.3 2006/06/29 20:10:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1998) diff --git a/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4Be8FermiFragment.hh b/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4Be8FermiFragment.hh index 2a29fbd844..90944e7768 100644 --- a/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4Be8FermiFragment.hh +++ b/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4Be8FermiFragment.hh @@ -25,7 +25,7 @@ // // // $Id: G4Be8FermiFragment.hh,v 1.3 2006/06/29 20:10:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1998) diff --git a/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4FermiBreakUp.hh b/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4FermiBreakUp.hh index 8da924e714..eafae4c28b 100644 --- a/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4FermiBreakUp.hh +++ b/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4FermiBreakUp.hh @@ -25,7 +25,7 @@ // // // $Id: G4FermiBreakUp.hh,v 1.3 2006/06/29 20:11:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1998) diff --git a/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4FermiConfiguration.hh b/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4FermiConfiguration.hh index ff2362ce2c..4732cdce5a 100644 --- a/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4FermiConfiguration.hh +++ b/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4FermiConfiguration.hh @@ -25,7 +25,7 @@ // // // $Id: G4FermiConfiguration.hh,v 1.4 2006/06/29 20:11:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1998) diff --git a/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4FermiConfigurationList.hh b/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4FermiConfigurationList.hh index 20f2c9074b..f31fdaf0eb 100644 --- a/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4FermiConfigurationList.hh +++ b/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4FermiConfigurationList.hh @@ -25,7 +25,7 @@ // // // $Id: G4FermiConfigurationList.hh,v 1.5 2006/06/29 20:12:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1998) diff --git a/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4He5FermiFragment.hh b/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4He5FermiFragment.hh index a21cc21859..d7340fcfb6 100644 --- a/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4He5FermiFragment.hh +++ b/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4He5FermiFragment.hh @@ -25,7 +25,7 @@ // // // $Id: G4He5FermiFragment.hh,v 1.3 2006/06/29 20:12:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1998) diff --git a/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4Li5FermiFragment.hh b/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4Li5FermiFragment.hh index 27f0fec8d5..afb6d9b577 100644 --- a/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4Li5FermiFragment.hh +++ b/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4Li5FermiFragment.hh @@ -25,7 +25,7 @@ // // // $Id: G4Li5FermiFragment.hh,v 1.3 2006/06/29 20:12:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1998) diff --git a/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4StableFermiFragment.hh b/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4StableFermiFragment.hh index a256bffabd..7007d0be2f 100644 --- a/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4StableFermiFragment.hh +++ b/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4StableFermiFragment.hh @@ -25,7 +25,7 @@ // // // $Id: G4StableFermiFragment.hh,v 1.3 2006/06/29 20:12:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1998) diff --git a/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4UnstableFermiFragment.hh b/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4UnstableFermiFragment.hh index 9c3993205f..78388f548d 100644 --- a/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4UnstableFermiFragment.hh +++ b/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4UnstableFermiFragment.hh @@ -25,7 +25,7 @@ // // // $Id: G4UnstableFermiFragment.hh,v 1.3 2006/06/29 20:12:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1998) diff --git a/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4VFermiBreakUp.hh b/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4VFermiBreakUp.hh index 95dcfe092c..dd5c07f3b6 100644 --- a/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4VFermiBreakUp.hh +++ b/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4VFermiBreakUp.hh @@ -25,7 +25,7 @@ // // // $Id: G4VFermiBreakUp.hh,v 1.3 2006/06/29 20:12:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1998) diff --git a/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4VFermiFragment.hh b/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4VFermiFragment.hh index e5f71096eb..0424a3aaae 100644 --- a/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4VFermiFragment.hh +++ b/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4VFermiFragment.hh @@ -25,7 +25,7 @@ // // // $Id: G4VFermiFragment.hh,v 1.3 2006/06/29 20:12:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1998) diff --git a/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4B9FermiFragment.cc b/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4B9FermiFragment.cc index 7a9cb51ff8..b443296700 100644 --- a/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4B9FermiFragment.cc +++ b/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4B9FermiFragment.cc @@ -25,7 +25,7 @@ // // // $Id: G4B9FermiFragment.cc,v 1.7 2006/06/29 20:12:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1998) diff --git a/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4Be8FermiFragment.cc b/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4Be8FermiFragment.cc index 35a97baa17..28f34997ee 100644 --- a/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4Be8FermiFragment.cc +++ b/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4Be8FermiFragment.cc @@ -25,7 +25,7 @@ // // // $Id: G4Be8FermiFragment.cc,v 1.7 2006/06/29 20:12:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1998) diff --git a/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4FermiConfiguration.cc b/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4FermiConfiguration.cc index 032a7a61cc..e4ef83e6c0 100644 --- a/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4FermiConfiguration.cc +++ b/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4FermiConfiguration.cc @@ -25,7 +25,7 @@ // // // $Id: G4FermiConfiguration.cc,v 1.9 2006/06/29 20:12:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1998) diff --git a/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4He5FermiFragment.cc b/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4He5FermiFragment.cc index 1198ce0b0f..ab6ab5c97f 100644 --- a/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4He5FermiFragment.cc +++ b/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4He5FermiFragment.cc @@ -25,7 +25,7 @@ // // // $Id: G4He5FermiFragment.cc,v 1.7 2006/06/29 20:13:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1998) diff --git a/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4Li5FermiFragment.cc b/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4Li5FermiFragment.cc index f592fa3dcc..4d1862c07e 100644 --- a/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4Li5FermiFragment.cc +++ b/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4Li5FermiFragment.cc @@ -25,7 +25,7 @@ // // // $Id: G4Li5FermiFragment.cc,v 1.7 2006/06/29 20:13:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1998) diff --git a/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4StableFermiFragment.cc b/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4StableFermiFragment.cc index 1f858c11fd..2b74734352 100644 --- a/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4StableFermiFragment.cc +++ b/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4StableFermiFragment.cc @@ -25,7 +25,7 @@ // // // $Id: G4StableFermiFragment.cc,v 1.5 2006/06/29 20:13:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1998) diff --git a/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4UnstableFermiFragment.cc b/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4UnstableFermiFragment.cc index f44945e8b8..87b23fdcb8 100644 --- a/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4UnstableFermiFragment.cc +++ b/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4UnstableFermiFragment.cc @@ -25,7 +25,7 @@ // // // $Id: G4UnstableFermiFragment.cc,v 1.8 2006/06/29 20:13:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1998) diff --git a/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4VFermiBreakUp.cc b/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4VFermiBreakUp.cc index 467e97a979..e78c038e78 100644 --- a/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4VFermiBreakUp.cc +++ b/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4VFermiBreakUp.cc @@ -25,7 +25,7 @@ // // // $Id: G4VFermiBreakUp.cc,v 1.5 2006/06/29 20:13:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1998) diff --git a/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4VFermiFragment.cc b/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4VFermiFragment.cc index f6444ae74e..94bfa2bcab 100644 --- a/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4VFermiFragment.cc +++ b/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4VFermiFragment.cc @@ -25,7 +25,7 @@ // // // $Id: G4VFermiFragment.cc,v 1.5 2006/06/29 20:13:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1998) diff --git a/source/processes/hadronic/models/de_excitation/fission/include/G4CompetitiveFission.hh b/source/processes/hadronic/models/de_excitation/fission/include/G4CompetitiveFission.hh index 3c02af56bf..83613e8d43 100644 --- a/source/processes/hadronic/models/de_excitation/fission/include/G4CompetitiveFission.hh +++ b/source/processes/hadronic/models/de_excitation/fission/include/G4CompetitiveFission.hh @@ -25,7 +25,7 @@ // // // $Id: G4CompetitiveFission.hh,v 1.3 2006/06/29 20:13:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Oct 1998) diff --git a/source/processes/hadronic/models/de_excitation/fission/include/G4FissionBarrier.hh b/source/processes/hadronic/models/de_excitation/fission/include/G4FissionBarrier.hh index 6435f41900..7a97cce0f1 100644 --- a/source/processes/hadronic/models/de_excitation/fission/include/G4FissionBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/fission/include/G4FissionBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4FissionBarrier.hh,v 1.3 2006/06/29 20:13:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Oct 1998) diff --git a/source/processes/hadronic/models/de_excitation/fission/include/G4FissionLevelDensityParameter.hh b/source/processes/hadronic/models/de_excitation/fission/include/G4FissionLevelDensityParameter.hh index 52b07a87ff..aecaf06302 100644 --- a/source/processes/hadronic/models/de_excitation/fission/include/G4FissionLevelDensityParameter.hh +++ b/source/processes/hadronic/models/de_excitation/fission/include/G4FissionLevelDensityParameter.hh @@ -25,7 +25,7 @@ // // // $Id: G4FissionLevelDensityParameter.hh,v 1.3 2006/06/29 20:13:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Oct 1998) diff --git a/source/processes/hadronic/models/de_excitation/fission/include/G4FissionParameters.hh b/source/processes/hadronic/models/de_excitation/fission/include/G4FissionParameters.hh index 577aa1d84f..adc498760c 100644 --- a/source/processes/hadronic/models/de_excitation/fission/include/G4FissionParameters.hh +++ b/source/processes/hadronic/models/de_excitation/fission/include/G4FissionParameters.hh @@ -25,7 +25,7 @@ // // // $Id: G4FissionParameters.hh,v 1.3 2006/06/29 20:13:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Oct 1998) diff --git a/source/processes/hadronic/models/de_excitation/fission/include/G4FissionProbability.hh b/source/processes/hadronic/models/de_excitation/fission/include/G4FissionProbability.hh index f706a0ad83..68c31fee57 100644 --- a/source/processes/hadronic/models/de_excitation/fission/include/G4FissionProbability.hh +++ b/source/processes/hadronic/models/de_excitation/fission/include/G4FissionProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4FissionProbability.hh,v 1.3 2006/06/29 20:13:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Oct 1998) diff --git a/source/processes/hadronic/models/de_excitation/fission/include/G4VFissionBarrier.hh b/source/processes/hadronic/models/de_excitation/fission/include/G4VFissionBarrier.hh index 8ae2197972..ffc4b92c47 100644 --- a/source/processes/hadronic/models/de_excitation/fission/include/G4VFissionBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/fission/include/G4VFissionBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4VFissionBarrier.hh,v 1.4 2006/06/29 20:13:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Oct 1998) diff --git a/source/processes/hadronic/models/de_excitation/fission/src/G4CompetitiveFission.cc b/source/processes/hadronic/models/de_excitation/fission/src/G4CompetitiveFission.cc index 960e604aaa..f8547e2013 100644 --- a/source/processes/hadronic/models/de_excitation/fission/src/G4CompetitiveFission.cc +++ b/source/processes/hadronic/models/de_excitation/fission/src/G4CompetitiveFission.cc @@ -25,7 +25,7 @@ // // // $Id: G4CompetitiveFission.cc,v 1.5 2006/06/29 20:13:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Oct 1998) diff --git a/source/processes/hadronic/models/de_excitation/fission/src/G4FissionBarrier.cc b/source/processes/hadronic/models/de_excitation/fission/src/G4FissionBarrier.cc index 19c649c449..aec5b86b92 100644 --- a/source/processes/hadronic/models/de_excitation/fission/src/G4FissionBarrier.cc +++ b/source/processes/hadronic/models/de_excitation/fission/src/G4FissionBarrier.cc @@ -25,7 +25,7 @@ // // // $Id: G4FissionBarrier.cc,v 1.5 2006/06/29 20:13:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Oct 1998) diff --git a/source/processes/hadronic/models/de_excitation/fission/src/G4FissionLevelDensityParameter.cc b/source/processes/hadronic/models/de_excitation/fission/src/G4FissionLevelDensityParameter.cc index 0d713c8b0e..362994a0b5 100644 --- a/source/processes/hadronic/models/de_excitation/fission/src/G4FissionLevelDensityParameter.cc +++ b/source/processes/hadronic/models/de_excitation/fission/src/G4FissionLevelDensityParameter.cc @@ -25,7 +25,7 @@ // // // $Id: G4FissionLevelDensityParameter.cc,v 1.4 2006/06/29 20:13:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Oct 1998) diff --git a/source/processes/hadronic/models/de_excitation/fission/src/G4FissionParameters.cc b/source/processes/hadronic/models/de_excitation/fission/src/G4FissionParameters.cc index 9f325c194a..9311098c65 100644 --- a/source/processes/hadronic/models/de_excitation/fission/src/G4FissionParameters.cc +++ b/source/processes/hadronic/models/de_excitation/fission/src/G4FissionParameters.cc @@ -25,7 +25,7 @@ // // // $Id: G4FissionParameters.cc,v 1.5 2006/06/29 20:13:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Oct 1998) diff --git a/source/processes/hadronic/models/de_excitation/fission/src/G4FissionProbability.cc b/source/processes/hadronic/models/de_excitation/fission/src/G4FissionProbability.cc index fd42111b42..020eea66e3 100644 --- a/source/processes/hadronic/models/de_excitation/fission/src/G4FissionProbability.cc +++ b/source/processes/hadronic/models/de_excitation/fission/src/G4FissionProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4FissionProbability.cc,v 1.7 2006/06/29 20:13:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Oct 1998) diff --git a/source/processes/hadronic/models/de_excitation/fission/src/G4VFissionBarrier.cc b/source/processes/hadronic/models/de_excitation/fission/src/G4VFissionBarrier.cc index 69aac15f80..4c464c53e8 100644 --- a/source/processes/hadronic/models/de_excitation/fission/src/G4VFissionBarrier.cc +++ b/source/processes/hadronic/models/de_excitation/fission/src/G4VFissionBarrier.cc @@ -25,7 +25,7 @@ // // // $Id: G4VFissionBarrier.cc,v 1.4 2006/06/29 20:13:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Oct 1998) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4AlphaGEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4AlphaGEMChannel.hh index 2315ff3e57..e4567a0250 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4AlphaGEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4AlphaGEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4AlphaGEMChannel.hh,v 1.3 2006/06/29 20:13:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4AlphaGEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4AlphaGEMProbability.hh index 640107452c..c92ffc435c 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4AlphaGEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4AlphaGEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4AlphaGEMProbability.hh,v 1.3 2006/06/29 20:13:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B10GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B10GEMChannel.hh index 8912d1e852..6251e6bd92 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B10GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B10GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4B10GEMChannel.hh,v 1.3 2006/06/29 20:13:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B10GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B10GEMCoulombBarrier.hh index ea4f9869c8..ce202c66e9 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B10GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B10GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4B10GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:13:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B10GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B10GEMProbability.hh index dabc90012f..1feaffefa0 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B10GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B10GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4B10GEMProbability.hh,v 1.3 2006/06/29 20:13:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B11GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B11GEMChannel.hh index 5ba5e13105..9f38b1be4c 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B11GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B11GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4B11GEMChannel.hh,v 1.3 2006/06/29 20:13:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B11GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B11GEMCoulombBarrier.hh index eb3466ec3a..387b7a5d79 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B11GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B11GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4B11GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:13:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B11GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B11GEMProbability.hh index 9d78aef1e1..28c71111a3 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B11GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B11GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4B11GEMProbability.hh,v 1.3 2006/06/29 20:14:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B12GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B12GEMChannel.hh index 8e7161bf12..2ebc22e407 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B12GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B12GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4B12GEMChannel.hh,v 1.3 2006/06/29 20:14:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B12GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B12GEMCoulombBarrier.hh index d766b4fb5f..2949ef4309 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B12GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B12GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4B12GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:14:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B12GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B12GEMProbability.hh index 4baac9493c..7f686f4da1 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B12GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B12GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4B12GEMProbability.hh,v 1.3 2006/06/29 20:14:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B13GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B13GEMChannel.hh index 039f4909f5..2fcf7e6993 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B13GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B13GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4B13GEMChannel.hh,v 1.3 2006/06/29 20:14:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B13GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B13GEMCoulombBarrier.hh index fd29eda907..1071f75dac 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B13GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B13GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4B13GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:14:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B13GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B13GEMProbability.hh index dd51db4b9f..975458d9c5 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B13GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B13GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4B13GEMProbability.hh,v 1.3 2006/06/29 20:14:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B8GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B8GEMChannel.hh index 8794ef22f7..da85d73bc4 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B8GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B8GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4B8GEMChannel.hh,v 1.3 2006/06/29 20:14:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B8GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B8GEMCoulombBarrier.hh index 428e8653e1..976383fbda 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B8GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B8GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4B8GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:14:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B8GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B8GEMProbability.hh index b81bf506bf..5bf215891f 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B8GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B8GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4B8GEMProbability.hh,v 1.3 2006/06/29 20:14:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be10GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be10GEMChannel.hh index 9a918ef7fc..ff78f4da0f 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be10GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be10GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4Be10GEMChannel.hh,v 1.3 2006/06/29 20:14:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be10GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be10GEMCoulombBarrier.hh index 180c90bbd6..4fc7998da6 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be10GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be10GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4Be10GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:14:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be10GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be10GEMProbability.hh index 85813493d7..a2dde61cdb 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be10GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be10GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4Be10GEMProbability.hh,v 1.3 2006/06/29 20:14:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be11GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be11GEMChannel.hh index 677dbc5213..7a37dba6f5 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be11GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be11GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4Be11GEMChannel.hh,v 1.3 2006/06/29 20:14:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be11GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be11GEMCoulombBarrier.hh index 447c05d183..c3f2f4f0fe 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be11GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be11GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4Be11GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:14:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be11GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be11GEMProbability.hh index e24c2ba873..34d57e6395 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be11GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be11GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4Be11GEMProbability.hh,v 1.3 2006/06/29 20:14:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be12GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be12GEMChannel.hh index 22c3933ad9..ea37c7374f 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be12GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be12GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4Be12GEMChannel.hh,v 1.3 2006/06/29 20:14:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be12GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be12GEMCoulombBarrier.hh index 9568becbb6..99c7e71c17 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be12GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be12GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4Be12GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:14:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be12GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be12GEMProbability.hh index f5734c58a2..1dd6574a1f 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be12GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be12GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4Be12GEMProbability.hh,v 1.3 2006/06/29 20:14:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be7GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be7GEMChannel.hh index ec7162237b..5789f89671 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be7GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be7GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4Be7GEMChannel.hh,v 1.3 2006/06/29 20:14:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be7GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be7GEMCoulombBarrier.hh index 9554237d78..6a9cb889c6 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be7GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be7GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4Be7GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:14:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be7GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be7GEMProbability.hh index 9d0e512c99..50671b6754 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be7GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be7GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4Be7GEMProbability.hh,v 1.3 2006/06/29 20:14:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be9GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be9GEMChannel.hh index 98b9a8abed..78a28657de 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be9GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be9GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4Be9GEMChannel.hh,v 1.3 2006/06/29 20:14:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be9GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be9GEMCoulombBarrier.hh index ae72536fb5..8941eac601 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be9GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be9GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4Be9GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:14:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be9GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be9GEMProbability.hh index 55fe7ef97a..9ebc1e3f6f 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be9GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be9GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4Be9GEMProbability.hh,v 1.3 2006/06/29 20:14:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C10GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C10GEMChannel.hh index 82f657c493..0878e36dd5 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C10GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C10GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4C10GEMChannel.hh,v 1.3 2006/06/29 20:14:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C10GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C10GEMCoulombBarrier.hh index da752fe394..28ccd339c3 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C10GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C10GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4C10GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:14:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C10GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C10GEMProbability.hh index f0162b3d0c..522523d15e 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C10GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C10GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4C10GEMProbability.hh,v 1.3 2006/06/29 20:14:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C11GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C11GEMChannel.hh index fecac8694b..fa7d198dff 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C11GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C11GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4C11GEMChannel.hh,v 1.3 2006/06/29 20:14:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C11GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C11GEMCoulombBarrier.hh index b1a8b70f49..16064ccda9 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C11GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C11GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4C11GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:14:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C11GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C11GEMProbability.hh index b650de6c65..07e61a9c1c 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C11GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C11GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4C11GEMProbability.hh,v 1.3 2006/06/29 20:15:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C12GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C12GEMChannel.hh index 508d32e388..44d046ce30 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C12GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C12GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4C12GEMChannel.hh,v 1.3 2006/06/29 20:15:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C12GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C12GEMCoulombBarrier.hh index 2bf423c8f9..e766292777 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C12GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C12GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4C12GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:15:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C12GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C12GEMProbability.hh index 841e44a566..89991849ef 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C12GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C12GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4C12GEMProbability.hh,v 1.3 2006/06/29 20:15:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C13GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C13GEMChannel.hh index b4796c79b7..6df2773c59 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C13GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C13GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4C13GEMChannel.hh,v 1.3 2006/06/29 20:15:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C13GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C13GEMCoulombBarrier.hh index 78fc407d4f..c382f78bfc 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C13GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C13GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4C13GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:15:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C13GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C13GEMProbability.hh index bf09117080..63428e92b7 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C13GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C13GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4C13GEMProbability.hh,v 1.3 2006/06/29 20:15:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C14GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C14GEMChannel.hh index f6369aa055..97c2dfa1e9 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C14GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C14GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4C14GEMChannel.hh,v 1.3 2006/06/29 20:15:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C14GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C14GEMCoulombBarrier.hh index ccdd26bcff..eade036989 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C14GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C14GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4C14GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:15:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C14GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C14GEMProbability.hh index bfc102f22a..223a8a84a8 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C14GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C14GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4C14GEMProbability.hh,v 1.3 2006/06/29 20:15:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C15GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C15GEMChannel.hh index 0487d5a440..44b9db4d02 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C15GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C15GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4C15GEMChannel.hh,v 1.3 2006/06/29 20:15:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C15GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C15GEMCoulombBarrier.hh index 4b8c01b311..d4f8d6c61f 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C15GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C15GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4C15GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:15:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C15GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C15GEMProbability.hh index 11dba410c8..b841c46c04 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C15GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C15GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4C15GEMProbability.hh,v 1.3 2006/06/29 20:15:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C16GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C16GEMChannel.hh index e606d9dc32..b5cd84ba9a 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C16GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C16GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4C16GEMChannel.hh,v 1.3 2006/06/29 20:15:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C16GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C16GEMCoulombBarrier.hh index 83f5a1196a..6b74d5b880 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C16GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C16GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4C16GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:15:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C16GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C16GEMProbability.hh index 6ddc5447f8..3124275662 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C16GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C16GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4C16GEMProbability.hh,v 1.3 2006/06/29 20:15:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4DeuteronGEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4DeuteronGEMChannel.hh index e5af27ba2e..494ffb7af0 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4DeuteronGEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4DeuteronGEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4DeuteronGEMChannel.hh,v 1.3 2006/06/29 20:15:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4DeuteronGEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4DeuteronGEMProbability.hh index 982a180c44..7d2d4b6dc4 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4DeuteronGEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4DeuteronGEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4DeuteronGEMProbability.hh,v 1.3 2006/06/29 20:15:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4EvaporationGEMFactory.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4EvaporationGEMFactory.hh index 54bc169b4e..a20df9d34e 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4EvaporationGEMFactory.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4EvaporationGEMFactory.hh @@ -25,7 +25,7 @@ // // // $Id: G4EvaporationGEMFactory.hh,v 1.5 2006/06/29 20:15:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F17GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F17GEMChannel.hh index ca044df985..e9f2140854 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F17GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F17GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4F17GEMChannel.hh,v 1.3 2006/06/29 20:15:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F17GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F17GEMCoulombBarrier.hh index f59c834ce9..f09c7f96a9 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F17GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F17GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4F17GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:15:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F17GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F17GEMProbability.hh index 1452937730..647912d24b 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F17GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F17GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4F17GEMProbability.hh,v 1.3 2006/06/29 20:15:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F18GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F18GEMChannel.hh index 50c806912c..7ee8480eda 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F18GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F18GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4F18GEMChannel.hh,v 1.3 2006/06/29 20:15:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F18GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F18GEMCoulombBarrier.hh index f40b4ebd1b..6cab32c29a 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F18GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F18GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4F18GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:15:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F18GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F18GEMProbability.hh index 5bfabbc72b..8f8a8aed27 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F18GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F18GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4F18GEMProbability.hh,v 1.3 2006/06/29 20:15:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F19GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F19GEMChannel.hh index 0e07b7e613..68d718b9ec 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F19GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F19GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4F19GEMChannel.hh,v 1.3 2006/06/29 20:15:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F19GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F19GEMCoulombBarrier.hh index 93cfc50a1d..6c8b86e309 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F19GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F19GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4F19GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:15:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F19GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F19GEMProbability.hh index e0da729b5c..ff0e58df51 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F19GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F19GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4F19GEMProbability.hh,v 1.3 2006/06/29 20:15:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F20GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F20GEMChannel.hh index 3dc36ab6e0..e4f6b4862e 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F20GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F20GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4F20GEMChannel.hh,v 1.3 2006/06/29 20:15:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F20GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F20GEMCoulombBarrier.hh index 05f538fe9d..8f77e0d00c 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F20GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F20GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4F20GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:15:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F20GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F20GEMProbability.hh index 6e1fbd62d9..29c279fc6b 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F20GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F20GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4F20GEMProbability.hh,v 1.3 2006/06/29 20:16:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F21GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F21GEMChannel.hh index 889cdbbbac..c8dbf67757 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F21GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F21GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4F21GEMChannel.hh,v 1.3 2006/06/29 20:16:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F21GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F21GEMCoulombBarrier.hh index 8fd306d9c0..3f5ac770fe 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F21GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F21GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4F21GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:16:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F21GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F21GEMProbability.hh index 321f661d64..05703c73ef 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F21GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F21GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4F21GEMProbability.hh,v 1.3 2006/06/29 20:16:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4GEMChannel.hh index 08b3389db2..b545040035 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4GEMChannel.hh,v 1.4 2006/06/29 20:16:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Oct 1998) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4GEMCoulombBarrierHE.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4GEMCoulombBarrierHE.hh index 2d14ec08cc..76a9dafdc9 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4GEMCoulombBarrierHE.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4GEMCoulombBarrierHE.hh @@ -25,7 +25,7 @@ // // // $Id: G4GEMCoulombBarrierHE.hh,v 1.3 2006/06/29 20:16:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He3GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He3GEMChannel.hh index 01eaf52723..a753027ce4 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He3GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He3GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4He3GEMChannel.hh,v 1.3 2006/06/29 20:16:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He3GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He3GEMProbability.hh index 8fda1cecb9..c9ed3e4573 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He3GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He3GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4He3GEMProbability.hh,v 1.3 2006/06/29 20:16:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He6GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He6GEMChannel.hh index 3b8ccfa3b2..c30c08233e 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He6GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He6GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4He6GEMChannel.hh,v 1.3 2006/06/29 20:16:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He6GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He6GEMCoulombBarrier.hh index cfb4e7434d..25e20193ee 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He6GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He6GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4He6GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:16:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He6GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He6GEMProbability.hh index 79000dece9..8cffd4785a 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He6GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He6GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4He6GEMProbability.hh,v 1.3 2006/06/29 20:16:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He8GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He8GEMChannel.hh index 34f2c2e52d..e986528ce3 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He8GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He8GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4He8GEMChannel.hh,v 1.3 2006/06/29 20:16:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He8GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He8GEMCoulombBarrier.hh index fbc9d70263..5c9f735c4c 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He8GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He8GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4He8GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:16:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He8GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He8GEMProbability.hh index 19c5049a41..867a81c14d 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He8GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He8GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4He8GEMProbability.hh,v 1.3 2006/06/29 20:16:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li6GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li6GEMChannel.hh index d76f8fd0c7..92614d0eaa 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li6GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li6GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4Li6GEMChannel.hh,v 1.3 2006/06/29 20:16:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li6GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li6GEMCoulombBarrier.hh index 3846a5a6e9..1757712c87 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li6GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li6GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4Li6GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:16:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li6GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li6GEMProbability.hh index 2abdc9f032..003b5b92ec 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li6GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li6GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4Li6GEMProbability.hh,v 1.3 2006/06/29 20:16:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li7GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li7GEMChannel.hh index 0a94bfee5f..293b0272af 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li7GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li7GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4Li7GEMChannel.hh,v 1.3 2006/06/29 20:16:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li7GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li7GEMCoulombBarrier.hh index 2e78d4677a..662c83d09e 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li7GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li7GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4Li7GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:16:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li7GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li7GEMProbability.hh index b7cd034e39..812f2f6442 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li7GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li7GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4Li7GEMProbability.hh,v 1.3 2006/06/29 20:16:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li8GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li8GEMChannel.hh index bc9fb16f00..dc9e1d1610 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li8GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li8GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4Li8GEMChannel.hh,v 1.3 2006/06/29 20:16:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li8GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li8GEMCoulombBarrier.hh index 8b77d5c242..7692f570ae 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li8GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li8GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4Li8GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:16:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li8GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li8GEMProbability.hh index d12dedb9c2..055cdad213 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li8GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li8GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4Li8GEMProbability.hh,v 1.3 2006/06/29 20:16:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li9GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li9GEMChannel.hh index ca21cd9f94..7ba5ce9d78 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li9GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li9GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4Li9GEMChannel.hh,v 1.3 2006/06/29 20:16:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li9GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li9GEMCoulombBarrier.hh index 3d3ed506fd..e826d7b3d8 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li9GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li9GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4Li9GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:16:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li9GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li9GEMProbability.hh index 5d1562d186..708cabc25d 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li9GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li9GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4Li9GEMProbability.hh,v 1.3 2006/06/29 20:16:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg22GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg22GEMChannel.hh index 613af29de2..7fad7473a7 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg22GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg22GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4Mg22GEMChannel.hh,v 1.3 2006/06/29 20:16:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg22GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg22GEMCoulombBarrier.hh index 99670f7621..773d353ccc 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg22GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg22GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4Mg22GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:16:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg22GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg22GEMProbability.hh index 044712d701..c59f781ede 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg22GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg22GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4Mg22GEMProbability.hh,v 1.3 2006/06/29 20:16:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg23GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg23GEMChannel.hh index beae40a1ed..16f4ac5475 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg23GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg23GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4Mg23GEMChannel.hh,v 1.3 2006/06/29 20:17:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg23GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg23GEMCoulombBarrier.hh index b41423153e..401f328e94 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg23GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg23GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4Mg23GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:17:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg23GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg23GEMProbability.hh index 875ccd5e3c..36ddf02360 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg23GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg23GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4Mg23GEMProbability.hh,v 1.3 2006/06/29 20:17:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg24GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg24GEMChannel.hh index 6b85fee5cb..647dfb6dba 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg24GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg24GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4Mg24GEMChannel.hh,v 1.3 2006/06/29 20:17:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg24GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg24GEMCoulombBarrier.hh index c5d95520a5..eb82c6985a 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg24GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg24GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4Mg24GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:17:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg24GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg24GEMProbability.hh index ceec611b38..f3b3244bd6 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg24GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg24GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4Mg24GEMProbability.hh,v 1.3 2006/06/29 20:17:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg25GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg25GEMChannel.hh index 6f5b075be8..899f0c35bf 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg25GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg25GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4Mg25GEMChannel.hh,v 1.3 2006/06/29 20:17:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg25GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg25GEMCoulombBarrier.hh index 20add1a8e4..91ff620c17 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg25GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg25GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4Mg25GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:17:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg25GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg25GEMProbability.hh index 69a37aef57..96425b5930 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg25GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg25GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4Mg25GEMProbability.hh,v 1.3 2006/06/29 20:17:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg26GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg26GEMChannel.hh index 3666dc8599..4acb9966fe 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg26GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg26GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4Mg26GEMChannel.hh,v 1.3 2006/06/29 20:17:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg26GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg26GEMCoulombBarrier.hh index c557cf4db8..d33fa74ffb 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg26GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg26GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4Mg26GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:17:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg26GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg26GEMProbability.hh index ccee757308..b7e0c9ea7b 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg26GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg26GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4Mg26GEMProbability.hh,v 1.3 2006/06/29 20:17:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg27GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg27GEMChannel.hh index e8101f14d2..0b237a9e0f 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg27GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg27GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4Mg27GEMChannel.hh,v 1.3 2006/06/29 20:17:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg27GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg27GEMCoulombBarrier.hh index 7b61a00d1e..2461e6c6b0 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg27GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg27GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4Mg27GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:17:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg27GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg27GEMProbability.hh index 3af169d24a..cc6cf2d99f 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg27GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg27GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4Mg27GEMProbability.hh,v 1.3 2006/06/29 20:17:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg28GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg28GEMChannel.hh index 8e8a053d7e..e49f7e55d4 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg28GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg28GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4Mg28GEMChannel.hh,v 1.3 2006/06/29 20:17:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg28GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg28GEMCoulombBarrier.hh index 710921d7e9..9130d46e24 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg28GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg28GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4Mg28GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:17:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg28GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg28GEMProbability.hh index 28c436c765..12259e9c16 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg28GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg28GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4Mg28GEMProbability.hh,v 1.3 2006/06/29 20:17:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N12GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N12GEMChannel.hh index 9eae8e4f9b..ebe695ae58 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N12GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N12GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4N12GEMChannel.hh,v 1.3 2006/06/29 20:17:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N12GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N12GEMCoulombBarrier.hh index f19b0142e6..9577f78478 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N12GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N12GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4N12GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:17:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N12GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N12GEMProbability.hh index b136c8a890..a5ff24bbf4 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N12GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N12GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4N12GEMProbability.hh,v 1.3 2006/06/29 20:17:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N13GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N13GEMChannel.hh index 8f16b2c6b7..0899dafe4f 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N13GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N13GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4N13GEMChannel.hh,v 1.3 2006/06/29 20:17:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N13GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N13GEMCoulombBarrier.hh index 4a44aae113..5a5bdc9809 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N13GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N13GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4N13GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:17:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N13GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N13GEMProbability.hh index 6b7e36f4bb..4f42c13aac 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N13GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N13GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4N13GEMProbability.hh,v 1.3 2006/06/29 20:17:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N14GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N14GEMChannel.hh index 5819e7476b..02a0ce3a42 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N14GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N14GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4N14GEMChannel.hh,v 1.3 2006/06/29 20:17:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N14GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N14GEMCoulombBarrier.hh index d75478b5ed..3c1708c971 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N14GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N14GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4N14GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:17:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N14GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N14GEMProbability.hh index d0d80c4062..daf8562974 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N14GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N14GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4N14GEMProbability.hh,v 1.3 2006/06/29 20:17:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N15GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N15GEMChannel.hh index c03d90604f..99b0b45778 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N15GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N15GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4N15GEMChannel.hh,v 1.3 2006/06/29 20:17:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N15GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N15GEMCoulombBarrier.hh index 5f7d6900e9..22484662dd 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N15GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N15GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4N15GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:17:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N15GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N15GEMProbability.hh index 43974c8eb3..11619d3e84 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N15GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N15GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4N15GEMProbability.hh,v 1.3 2006/06/29 20:17:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N16GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N16GEMChannel.hh index 1dcdda3ce1..9cc69d0451 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N16GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N16GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4N16GEMChannel.hh,v 1.3 2006/06/29 20:18:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N16GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N16GEMCoulombBarrier.hh index aa1e26ccfe..446adfd969 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N16GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N16GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4N16GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:18:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N16GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N16GEMProbability.hh index 6630c772f6..72ff996c0a 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N16GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N16GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4N16GEMProbability.hh,v 1.3 2006/06/29 20:18:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N17GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N17GEMChannel.hh index 2777cce13d..94ef0ed7ca 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N17GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N17GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4N17GEMChannel.hh,v 1.3 2006/06/29 20:18:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N17GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N17GEMCoulombBarrier.hh index 30fed99f4a..b66b674287 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N17GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N17GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4N17GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:18:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N17GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N17GEMProbability.hh index b70f4ec42a..296f2d26c3 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N17GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N17GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4N17GEMProbability.hh,v 1.3 2006/06/29 20:18:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na21GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na21GEMChannel.hh index 54d71aebc8..688c6cbca6 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na21GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na21GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4Na21GEMChannel.hh,v 1.3 2006/06/29 20:18:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na21GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na21GEMCoulombBarrier.hh index fcacbca6f6..4bc71dfbac 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na21GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na21GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4Na21GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:18:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na21GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na21GEMProbability.hh index dc8da673d8..5e58be110c 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na21GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na21GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4Na21GEMProbability.hh,v 1.3 2006/06/29 20:18:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na22GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na22GEMChannel.hh index 8c796c4a26..8da0ee04af 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na22GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na22GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4Na22GEMChannel.hh,v 1.3 2006/06/29 20:18:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na22GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na22GEMCoulombBarrier.hh index 63a18b9772..c6dfbba37f 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na22GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na22GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4Na22GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:18:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na22GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na22GEMProbability.hh index 3fd1dbe316..9c967f3954 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na22GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na22GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4Na22GEMProbability.hh,v 1.3 2006/06/29 20:18:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na23GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na23GEMChannel.hh index 03f9486f9f..3c494f0b89 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na23GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na23GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4Na23GEMChannel.hh,v 1.3 2006/06/29 20:18:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na23GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na23GEMCoulombBarrier.hh index 94cd6b8b82..d65ee99597 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na23GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na23GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4Na23GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:18:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na23GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na23GEMProbability.hh index bf33fee4a2..c033a503f4 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na23GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na23GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4Na23GEMProbability.hh,v 1.3 2006/06/29 20:18:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na24GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na24GEMChannel.hh index cd814f26cb..4429f2603d 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na24GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na24GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4Na24GEMChannel.hh,v 1.3 2006/06/29 20:18:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na24GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na24GEMCoulombBarrier.hh index a3c1ea1af1..bed1498f8b 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na24GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na24GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4Na24GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:18:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na24GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na24GEMProbability.hh index 6a8d1ceae7..697fdc7451 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na24GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na24GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4Na24GEMProbability.hh,v 1.3 2006/06/29 20:18:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na25GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na25GEMChannel.hh index df3dfda8d0..5a33dc6498 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na25GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na25GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4Na25GEMChannel.hh,v 1.3 2006/06/29 20:18:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na25GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na25GEMCoulombBarrier.hh index 7219e7a4c3..015e93af8f 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na25GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na25GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4Na25GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:18:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na25GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na25GEMProbability.hh index a14bb20f27..8b3d88d747 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na25GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na25GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4Na25GEMProbability.hh,v 1.3 2006/06/29 20:18:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne18GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne18GEMChannel.hh index d3999e300b..99fb5bcc10 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne18GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne18GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4Ne18GEMChannel.hh,v 1.3 2006/06/29 20:18:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne18GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne18GEMCoulombBarrier.hh index 67a4857b79..da1e905360 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne18GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne18GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4Ne18GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:18:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne18GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne18GEMProbability.hh index 4235cc0a5a..c4530732ee 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne18GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne18GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4Ne18GEMProbability.hh,v 1.3 2006/06/29 20:18:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne19GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne19GEMChannel.hh index cb00635c31..391ecd2bd7 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne19GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne19GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4Ne19GEMChannel.hh,v 1.3 2006/06/29 20:18:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne19GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne19GEMCoulombBarrier.hh index 6628311afc..bcc4f6fb8c 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne19GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne19GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4Ne19GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:18:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne19GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne19GEMProbability.hh index 84de6323a5..6281d6938e 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne19GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne19GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4Ne19GEMProbability.hh,v 1.3 2006/06/29 20:18:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne20GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne20GEMChannel.hh index 1508e762a8..1ce504f1c1 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne20GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne20GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4Ne20GEMChannel.hh,v 1.3 2006/06/29 20:18:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne20GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne20GEMCoulombBarrier.hh index cbc7b7c29b..c45c9dc19c 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne20GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne20GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4Ne20GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:18:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne20GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne20GEMProbability.hh index cc430f5a97..ac7c88d545 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne20GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne20GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4Ne20GEMProbability.hh,v 1.3 2006/06/29 20:18:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne21GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne21GEMChannel.hh index aa97722d13..e55f9fbaaa 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne21GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne21GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4Ne21GEMChannel.hh,v 1.3 2006/06/29 20:19:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne21GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne21GEMCoulombBarrier.hh index 8ab2d1a43c..c1385360fa 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne21GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne21GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4Ne21GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:19:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne21GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne21GEMProbability.hh index 1ae7663769..be5cad1ebd 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne21GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne21GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4Ne21GEMProbability.hh,v 1.3 2006/06/29 20:19:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne22GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne22GEMChannel.hh index ec5a1117a2..23fbb1f47c 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne22GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne22GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4Ne22GEMChannel.hh,v 1.3 2006/06/29 20:19:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne22GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne22GEMCoulombBarrier.hh index b06ef2f8f0..917c2b7eaf 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne22GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne22GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4Ne22GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:19:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne22GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne22GEMProbability.hh index 3e9a8c55de..8be6a5b2fb 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne22GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne22GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4Ne22GEMProbability.hh,v 1.3 2006/06/29 20:19:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne23GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne23GEMChannel.hh index 49d0d531e3..b1551a594c 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne23GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne23GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4Ne23GEMChannel.hh,v 1.3 2006/06/29 20:19:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne23GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne23GEMCoulombBarrier.hh index bdc0c8ee84..29e9419771 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne23GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne23GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4Ne23GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:19:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne23GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne23GEMProbability.hh index 7564dae02f..c7341e440e 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne23GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne23GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4Ne23GEMProbability.hh,v 1.3 2006/06/29 20:19:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne24GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne24GEMChannel.hh index ce66f21c46..fdd870a56e 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne24GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne24GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4Ne24GEMChannel.hh,v 1.3 2006/06/29 20:19:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne24GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne24GEMCoulombBarrier.hh index 74679d442e..050800657a 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne24GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne24GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4Ne24GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:19:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne24GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne24GEMProbability.hh index ff005a70f6..1597c2410f 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne24GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne24GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4Ne24GEMProbability.hh,v 1.3 2006/06/29 20:19:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4NeutronGEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4NeutronGEMChannel.hh index 19d6d9941b..5314ead5ed 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4NeutronGEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4NeutronGEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronGEMChannel.hh,v 1.3 2006/06/29 20:19:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4NeutronGEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4NeutronGEMProbability.hh index bc1c726169..7efb20ec50 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4NeutronGEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4NeutronGEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronGEMProbability.hh,v 1.4 2006/06/29 20:19:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O14GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O14GEMChannel.hh index 0b48712b18..9f5cde1816 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O14GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O14GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4O14GEMChannel.hh,v 1.3 2006/06/29 20:19:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O14GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O14GEMCoulombBarrier.hh index 6dbe78091c..a588b11a63 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O14GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O14GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4O14GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:19:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O14GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O14GEMProbability.hh index b383f61cc0..fcf7d7bbe9 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O14GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O14GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4O14GEMProbability.hh,v 1.3 2006/06/29 20:19:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O15GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O15GEMChannel.hh index 754182ba8c..53eeef0879 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O15GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O15GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4O15GEMChannel.hh,v 1.3 2006/06/29 20:19:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O15GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O15GEMCoulombBarrier.hh index 6dfa623a9f..50a1b20535 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O15GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O15GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4O15GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:19:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O15GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O15GEMProbability.hh index 384f6d6b83..79c700ed0a 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O15GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O15GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4O15GEMProbability.hh,v 1.3 2006/06/29 20:19:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O16GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O16GEMChannel.hh index e4fbeee544..12aa0f7ae7 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O16GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O16GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4O16GEMChannel.hh,v 1.3 2006/06/29 20:19:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O16GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O16GEMCoulombBarrier.hh index f2151095b1..5c6bd55422 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O16GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O16GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4O16GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:19:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O16GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O16GEMProbability.hh index f321f3ec12..29058a7455 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O16GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O16GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4O16GEMProbability.hh,v 1.3 2006/06/29 20:19:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O17GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O17GEMChannel.hh index 55c21a1e7b..b5ed396a3d 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O17GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O17GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4O17GEMChannel.hh,v 1.3 2006/06/29 20:19:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O17GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O17GEMCoulombBarrier.hh index 05031f6132..3458e0758e 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O17GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O17GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4O17GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:19:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O17GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O17GEMProbability.hh index a8a810a4a2..01e1348933 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O17GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O17GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4O17GEMProbability.hh,v 1.3 2006/06/29 20:19:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O18GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O18GEMChannel.hh index aa65996aa8..f2ec92120a 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O18GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O18GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4O18GEMChannel.hh,v 1.3 2006/06/29 20:19:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O18GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O18GEMCoulombBarrier.hh index 525e9c0df2..c8f006cc42 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O18GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O18GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4O18GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:19:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O18GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O18GEMProbability.hh index 0a17d12c51..6fe86c7d8e 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O18GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O18GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4O18GEMProbability.hh,v 1.3 2006/06/29 20:19:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O19GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O19GEMChannel.hh index 62f81a6f4f..1792a211e4 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O19GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O19GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4O19GEMChannel.hh,v 1.3 2006/06/29 20:19:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O19GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O19GEMCoulombBarrier.hh index c8e661a9df..5b07dfdce1 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O19GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O19GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4O19GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:20:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O19GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O19GEMProbability.hh index ee7a546ae8..e79cb0336e 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O19GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O19GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4O19GEMProbability.hh,v 1.3 2006/06/29 20:20:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O20GEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O20GEMChannel.hh index 6d145297bd..c193997532 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O20GEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O20GEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4O20GEMChannel.hh,v 1.3 2006/06/29 20:20:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O20GEMCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O20GEMCoulombBarrier.hh index 6b8ec861bd..f5a1986274 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O20GEMCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O20GEMCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4O20GEMCoulombBarrier.hh,v 1.3 2006/06/29 20:20:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O20GEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O20GEMProbability.hh index cd1a619245..25a82c87a5 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O20GEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O20GEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4O20GEMProbability.hh,v 1.3 2006/06/29 20:20:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4ProtonGEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4ProtonGEMChannel.hh index 4cde099873..36599afc3b 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4ProtonGEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4ProtonGEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4ProtonGEMChannel.hh,v 1.3 2006/06/29 20:20:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4ProtonGEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4ProtonGEMProbability.hh index 9db22b1ee2..10625790ae 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4ProtonGEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4ProtonGEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4ProtonGEMProbability.hh,v 1.3 2006/06/29 20:20:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4TritonGEMChannel.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4TritonGEMChannel.hh index 83abfcd73d..64ce39121c 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4TritonGEMChannel.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4TritonGEMChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4TritonGEMChannel.hh,v 1.3 2006/06/29 20:20:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept. 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4TritonGEMProbability.hh b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4TritonGEMProbability.hh index 49bd03679d..522e4f8e17 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4TritonGEMProbability.hh +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4TritonGEMProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4TritonGEMProbability.hh,v 1.3 2006/06/29 20:20:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4AlphaGEMChannel.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4AlphaGEMChannel.cc index 0e7933c38c..b0bef1b2f0 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4AlphaGEMChannel.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4AlphaGEMChannel.cc @@ -25,7 +25,7 @@ // // // $Id: G4AlphaGEMChannel.cc,v 1.4 2006/06/29 20:20:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov. 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4AlphaGEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4AlphaGEMProbability.cc index 3dee1676ce..60f4cb4c2e 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4AlphaGEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4AlphaGEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4AlphaGEMProbability.cc,v 1.4 2006/06/29 20:20:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B10GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B10GEMProbability.cc index 5aa5c8ac03..2f14a34014 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B10GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B10GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4B10GEMProbability.cc,v 1.5 2006/06/29 20:20:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B11GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B11GEMProbability.cc index 7d2b7e67e0..65702ab9b1 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B11GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B11GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4B11GEMProbability.cc,v 1.5 2006/06/29 20:20:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B12GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B12GEMProbability.cc index c79331a077..d0c02e5416 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B12GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B12GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4B12GEMProbability.cc,v 1.5 2006/06/29 20:20:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B13GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B13GEMProbability.cc index 14f4ba3d16..6caf0d9bd4 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B13GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B13GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4B13GEMProbability.cc,v 1.4 2006/06/29 20:20:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B8GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B8GEMProbability.cc index 5e1f289853..05ab354282 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B8GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B8GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4B8GEMProbability.cc,v 1.5 2006/06/29 20:21:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be10GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be10GEMProbability.cc index 8faf786c8f..79f2ac44ca 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be10GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be10GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4Be10GEMProbability.cc,v 1.5 2006/06/29 20:21:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be11GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be11GEMProbability.cc index d7866ebee1..1406408e6f 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be11GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be11GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4Be11GEMProbability.cc,v 1.5 2006/06/29 20:21:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be12GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be12GEMProbability.cc index 0269b248f7..3222a1fa83 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be12GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be12GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4Be12GEMProbability.cc,v 1.4 2006/06/29 20:21:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be7GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be7GEMProbability.cc index 0e646db8c2..c734446b11 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be7GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be7GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4Be7GEMProbability.cc,v 1.5 2006/06/29 20:21:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be9GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be9GEMProbability.cc index 0437a67537..3e19352575 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be9GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be9GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4Be9GEMProbability.cc,v 1.5 2006/06/29 20:21:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C10GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C10GEMProbability.cc index 4102b40b2f..695dfd50df 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C10GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C10GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4C10GEMProbability.cc,v 1.5 2006/06/29 20:21:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C11GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C11GEMProbability.cc index 79ea2503e8..e5d0da8a10 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C11GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C11GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4C11GEMProbability.cc,v 1.5 2006/06/29 20:21:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C12GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C12GEMProbability.cc index 6e7133dd33..4e558da0db 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C12GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C12GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4C12GEMProbability.cc,v 1.5 2006/06/29 20:21:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C13GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C13GEMProbability.cc index e09e472d53..dbcfc60356 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C13GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C13GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4C13GEMProbability.cc,v 1.5 2006/06/29 20:21:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C14GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C14GEMProbability.cc index b807244bb3..bbcfc9c2ec 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C14GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C14GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4C14GEMProbability.cc,v 1.5 2006/06/29 20:21:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C15GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C15GEMProbability.cc index 96697d78df..e6a5beb378 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C15GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C15GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4C15GEMProbability.cc,v 1.5 2006/06/29 20:21:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C16GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C16GEMProbability.cc index c9303388f1..2b730956de 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C16GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C16GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4C16GEMProbability.cc,v 1.4 2006/06/29 20:21:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4DeuteronGEMChannel.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4DeuteronGEMChannel.cc index 2f014c178c..56927e62fc 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4DeuteronGEMChannel.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4DeuteronGEMChannel.cc @@ -25,7 +25,7 @@ // // // $Id: G4DeuteronGEMChannel.cc,v 1.4 2006/06/29 20:21:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov. 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4DeuteronGEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4DeuteronGEMProbability.cc index 594bda43a1..6f6a7b5558 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4DeuteronGEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4DeuteronGEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4DeuteronGEMProbability.cc,v 1.4 2006/06/29 20:21:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4EvaporationGEMFactory.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4EvaporationGEMFactory.cc index 5473fe0baa..b499823514 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4EvaporationGEMFactory.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4EvaporationGEMFactory.cc @@ -25,7 +25,7 @@ // // // $Id: G4EvaporationGEMFactory.cc,v 1.7 2006/06/29 20:21:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F17GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F17GEMProbability.cc index 1f038835e9..d34ab2336e 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F17GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F17GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4F17GEMProbability.cc,v 1.5 2006/06/29 20:21:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F18GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F18GEMProbability.cc index 2e5a109ecd..eec0b8e129 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F18GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F18GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4F18GEMProbability.cc,v 1.5 2006/06/29 20:21:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F19GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F19GEMProbability.cc index 3723f53f2e..e3491b8b87 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F19GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F19GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4F19GEMProbability.cc,v 1.5 2006/06/29 20:22:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F20GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F20GEMProbability.cc index 88d64337f3..e768a9751a 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F20GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F20GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4F20GEMProbability.cc,v 1.5 2006/06/29 20:22:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F21GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F21GEMProbability.cc index e34c8f1902..624122e8cf 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F21GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F21GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4F21GEMProbability.cc,v 1.4 2006/06/29 20:22:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4GEMChannel.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4GEMChannel.cc index e9619edca4..a552f2825e 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4GEMChannel.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4GEMChannel.cc @@ -25,7 +25,7 @@ // // // $Id: G4GEMChannel.cc,v 1.5 2006/06/29 20:22:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Oct 1998) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4GEMCoulombBarrierHE.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4GEMCoulombBarrierHE.cc index 438fcb1989..e28f3dcb95 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4GEMCoulombBarrierHE.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4GEMCoulombBarrierHE.cc @@ -25,7 +25,7 @@ // // // $Id: G4GEMCoulombBarrierHE.cc,v 1.6 2006/06/29 20:22:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4He3GEMChannel.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4He3GEMChannel.cc index cd4c49cdc1..c299e6bd26 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4He3GEMChannel.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4He3GEMChannel.cc @@ -25,7 +25,7 @@ // // // $Id: G4He3GEMChannel.cc,v 1.4 2006/06/29 20:22:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov. 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4He3GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4He3GEMProbability.cc index e65f06d918..0b2379918d 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4He3GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4He3GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4He3GEMProbability.cc,v 1.4 2006/06/29 20:22:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4He6GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4He6GEMProbability.cc index 3b5de0d962..0ba1b2f51a 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4He6GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4He6GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4He6GEMProbability.cc,v 1.5 2006/06/29 20:22:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4He8GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4He8GEMProbability.cc index 84ecf3a987..7817f5b7f0 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4He8GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4He8GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4He8GEMProbability.cc,v 1.4 2006/06/29 20:22:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Li6GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Li6GEMProbability.cc index a07153c6dd..231e263ddb 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Li6GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Li6GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4Li6GEMProbability.cc,v 1.5 2006/06/29 20:22:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Li7GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Li7GEMProbability.cc index cd874e5a2b..702f3b2a5d 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Li7GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Li7GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4Li7GEMProbability.cc,v 1.5 2006/06/29 20:22:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Li8GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Li8GEMProbability.cc index fc03dca0ba..a60d7f970a 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Li8GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Li8GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4Li8GEMProbability.cc,v 1.5 2006/06/29 20:22:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Li9GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Li9GEMProbability.cc index 3adb0f15d7..2d0ecc77a6 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Li9GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Li9GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4Li9GEMProbability.cc,v 1.5 2006/06/29 20:22:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg22GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg22GEMProbability.cc index 8456f98b35..06e8dbcc3e 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg22GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg22GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4Mg22GEMProbability.cc,v 1.4 2006/06/29 20:22:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg23GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg23GEMProbability.cc index 5c638a08c6..a7c5a795a4 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg23GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg23GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4Mg23GEMProbability.cc,v 1.4 2006/06/29 20:22:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg24GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg24GEMProbability.cc index 894ab8308f..cae6c06078 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg24GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg24GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4Mg24GEMProbability.cc,v 1.5 2006/06/29 20:22:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg25GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg25GEMProbability.cc index 4db0b6d46d..67f27fc156 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg25GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg25GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4Mg25GEMProbability.cc,v 1.5 2006/06/29 20:22:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg26GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg26GEMProbability.cc index f76bf02884..d790c4d554 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg26GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg26GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4Mg26GEMProbability.cc,v 1.4 2006/06/29 20:22:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg27GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg27GEMProbability.cc index 5cd8813609..6181536298 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg27GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg27GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4Mg27GEMProbability.cc,v 1.4 2006/06/29 20:22:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg28GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg28GEMProbability.cc index 08813a9ea2..e8e3b4eeaa 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg28GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg28GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4Mg28GEMProbability.cc,v 1.4 2006/06/29 20:22:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N12GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N12GEMProbability.cc index f76952a474..25a41be778 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N12GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N12GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4N12GEMProbability.cc,v 1.5 2006/06/29 20:22:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N13GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N13GEMProbability.cc index 92e30d4a7d..ce2c7c9cf8 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N13GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N13GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4N13GEMProbability.cc,v 1.5 2006/06/29 20:22:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N14GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N14GEMProbability.cc index 279e789f08..84522a0d8e 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N14GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N14GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4N14GEMProbability.cc,v 1.5 2006/06/29 20:22:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N15GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N15GEMProbability.cc index 55bf433533..cc4d0ea9a5 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N15GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N15GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4N15GEMProbability.cc,v 1.5 2006/06/29 20:22:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N16GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N16GEMProbability.cc index 9f5c09caf9..486ac029a7 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N16GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N16GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4N16GEMProbability.cc,v 1.5 2006/06/29 20:22:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N17GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N17GEMProbability.cc index 9bd203e565..76027a61c7 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N17GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N17GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4N17GEMProbability.cc,v 1.4 2006/06/29 20:22:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na21GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na21GEMProbability.cc index b546e20ac6..2f9eb60032 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na21GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na21GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4Na21GEMProbability.cc,v 1.5 2006/06/29 20:22:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na22GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na22GEMProbability.cc index f24a47aa84..2ce63daea7 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na22GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na22GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4Na22GEMProbability.cc,v 1.5 2006/06/29 20:22:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na23GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na23GEMProbability.cc index 8fb6fba71b..9264f613b2 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na23GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na23GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4Na23GEMProbability.cc,v 1.5 2006/06/29 20:22:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na24GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na24GEMProbability.cc index 1c40af0256..a318bdf6fa 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na24GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na24GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4Na24GEMProbability.cc,v 1.4 2006/06/29 20:23:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na25GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na25GEMProbability.cc index 7a04e80dda..37c2cc5765 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na25GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na25GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4Na25GEMProbability.cc,v 1.4 2006/06/29 20:23:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne18GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne18GEMProbability.cc index 6ee787914e..12cd304ce1 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne18GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne18GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4Ne18GEMProbability.cc,v 1.5 2006/06/29 20:23:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne19GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne19GEMProbability.cc index 96b4afc408..8a3d15e1b3 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne19GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne19GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4Ne19GEMProbability.cc,v 1.5 2006/06/29 20:23:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne20GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne20GEMProbability.cc index fc08dbe1da..099c106498 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne20GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne20GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4Ne20GEMProbability.cc,v 1.5 2006/06/29 20:23:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne21GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne21GEMProbability.cc index b50bdb496e..4274fa6aa4 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne21GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne21GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4Ne21GEMProbability.cc,v 1.5 2006/06/29 20:23:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne22GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne22GEMProbability.cc index 581504ac74..9eed5af3b1 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne22GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne22GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4Ne22GEMProbability.cc,v 1.4 2006/06/29 20:23:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne23GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne23GEMProbability.cc index 75aaae1a50..3054b09c4b 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne23GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne23GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4Ne23GEMProbability.cc,v 1.4 2006/06/29 20:23:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne24GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne24GEMProbability.cc index 3b4276b6f7..0072377c29 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne24GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne24GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4Ne24GEMProbability.cc,v 1.4 2006/06/29 20:23:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4NeutronGEMChannel.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4NeutronGEMChannel.cc index 867622e24a..f61cee0337 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4NeutronGEMChannel.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4NeutronGEMChannel.cc @@ -25,7 +25,7 @@ // // // $Id: G4NeutronGEMChannel.cc,v 1.4 2006/06/29 20:23:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov. 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4NeutronGEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4NeutronGEMProbability.cc index e87f9e74b1..7f0242c7a8 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4NeutronGEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4NeutronGEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4NeutronGEMProbability.cc,v 1.4 2006/06/29 20:23:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O14GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O14GEMProbability.cc index ce6356a1f3..d189ef734f 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O14GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O14GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4O14GEMProbability.cc,v 1.5 2006/06/29 20:23:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O15GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O15GEMProbability.cc index 7c58f060c4..eedfcb62b9 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O15GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O15GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4O15GEMProbability.cc,v 1.5 2006/06/29 20:23:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O16GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O16GEMProbability.cc index 41ab20dcb2..a1514cc526 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O16GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O16GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4O16GEMProbability.cc,v 1.5 2006/06/29 20:23:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O17GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O17GEMProbability.cc index 18751d76ba..5b1c1f9199 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O17GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O17GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4O17GEMProbability.cc,v 1.5 2006/06/29 20:23:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O18GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O18GEMProbability.cc index 4c5cc66c2f..095cd98267 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O18GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O18GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4O18GEMProbability.cc,v 1.5 2006/06/29 20:23:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O19GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O19GEMProbability.cc index d2905d025d..aa6fa772c7 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O19GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O19GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4O19GEMProbability.cc,v 1.5 2006/06/29 20:23:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O20GEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O20GEMProbability.cc index 0ccf488627..a60887f40d 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O20GEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O20GEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4O20GEMProbability.cc,v 1.4 2006/06/29 20:23:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4ProtonGEMChannel.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4ProtonGEMChannel.cc index 9179317bef..64467aff61 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4ProtonGEMChannel.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4ProtonGEMChannel.cc @@ -25,7 +25,7 @@ // // // $Id: G4ProtonGEMChannel.cc,v 1.4 2006/06/29 20:23:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov. 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4ProtonGEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4ProtonGEMProbability.cc index 5161955a16..4ff9e24d27 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4ProtonGEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4ProtonGEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4ProtonGEMProbability.cc,v 1.4 2006/06/29 20:23:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Sept 2001) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4TritonGEMChannel.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4TritonGEMChannel.cc index e9f8a028cf..39401bc04a 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4TritonGEMChannel.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4TritonGEMChannel.cc @@ -25,7 +25,7 @@ // // // $Id: G4TritonGEMChannel.cc,v 1.4 2006/06/29 20:23:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov. 1999) diff --git a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4TritonGEMProbability.cc b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4TritonGEMProbability.cc index 350dcd6abe..a5d8614e2a 100644 --- a/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4TritonGEMProbability.cc +++ b/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4TritonGEMProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4TritonGEMProbability.cc,v 1.4 2006/06/29 20:23:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/handler/include/G4ExcitationHandler.hh b/source/processes/hadronic/models/de_excitation/handler/include/G4ExcitationHandler.hh index ec4451b064..661e56c698 100644 --- a/source/processes/hadronic/models/de_excitation/handler/include/G4ExcitationHandler.hh +++ b/source/processes/hadronic/models/de_excitation/handler/include/G4ExcitationHandler.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4ExcitationHandler.hh,v 1.6 2006/06/29 20:23:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ExcitationHandler.hh,v 1.7 2006/08/19 19:55:59 dennis Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (May 1998) @@ -102,10 +102,9 @@ private: const G4VPhotonEvaporation * GetPhotonEvaporation() const; - const G4int GetMaxZ() const; - const G4int GetMaxA() const; - const G4double GetMinE() const; - + G4int GetMaxZ() const; + G4int GetMaxA() const; + G4double GetMinE() const; #ifdef debug void CheckConservation(const G4Fragment & aFragment, @@ -216,17 +215,17 @@ inline void G4ExcitationHandler::SetMinEForMultiFrag(G4double anE) minEForMultiFrag = anE; } -inline const G4int G4ExcitationHandler::GetMaxZ() const +inline G4int G4ExcitationHandler::GetMaxZ() const { return maxZForFermiBreakUp; } -inline const G4int G4ExcitationHandler::GetMaxA() const +inline G4int G4ExcitationHandler::GetMaxA() const { return maxAForFermiBreakUp; } -inline const G4double G4ExcitationHandler::GetMinE() const +inline G4double G4ExcitationHandler::GetMinE() const { return minEForMultiFrag; } diff --git a/source/processes/hadronic/models/de_excitation/management/include/G4VEvaporationChannel.hh b/source/processes/hadronic/models/de_excitation/management/include/G4VEvaporationChannel.hh index 876e9dc273..d1eac46c99 100644 --- a/source/processes/hadronic/models/de_excitation/management/include/G4VEvaporationChannel.hh +++ b/source/processes/hadronic/models/de_excitation/management/include/G4VEvaporationChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4VEvaporationChannel.hh,v 1.3 2006/06/29 20:23:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Oct 1998) diff --git a/source/processes/hadronic/models/de_excitation/management/include/G4VEvaporationFactory.hh b/source/processes/hadronic/models/de_excitation/management/include/G4VEvaporationFactory.hh index 5f8e9ca163..a336c647b2 100644 --- a/source/processes/hadronic/models/de_excitation/management/include/G4VEvaporationFactory.hh +++ b/source/processes/hadronic/models/de_excitation/management/include/G4VEvaporationFactory.hh @@ -25,7 +25,7 @@ // // // $Id: G4VEvaporationFactory.hh,v 1.3 2006/06/29 20:23:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/management/src/G4VEvaporationChannel.cc b/source/processes/hadronic/models/de_excitation/management/src/G4VEvaporationChannel.cc index c30a145161..03a6ce45ae 100644 --- a/source/processes/hadronic/models/de_excitation/management/src/G4VEvaporationChannel.cc +++ b/source/processes/hadronic/models/de_excitation/management/src/G4VEvaporationChannel.cc @@ -25,7 +25,7 @@ // // // $Id: G4VEvaporationChannel.cc,v 1.5 2006/06/29 20:23:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Oct 1998) diff --git a/source/processes/hadronic/models/de_excitation/management/src/G4VEvaporationFactory.cc b/source/processes/hadronic/models/de_excitation/management/src/G4VEvaporationFactory.cc index 174db78235..e3e527e185 100644 --- a/source/processes/hadronic/models/de_excitation/management/src/G4VEvaporationFactory.cc +++ b/source/processes/hadronic/models/de_excitation/management/src/G4VEvaporationFactory.cc @@ -25,7 +25,7 @@ // // // $Id: G4VEvaporationFactory.cc,v 1.5 2006/06/29 20:23:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4Solver.hh b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4Solver.hh index 4bdbb9ddc6..db2ac88996 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4Solver.hh +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4Solver.hh @@ -25,7 +25,7 @@ // // // $Id: G4Solver.hh,v 1.4 2006/06/29 20:23:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMF.hh b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMF.hh index a08125a4b5..cc1fa4d15b 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMF.hh +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMF.hh @@ -25,7 +25,7 @@ // // // $Id: G4StatMF.hh,v 1.3 2006/06/29 20:24:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFChannel.hh b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFChannel.hh index 8a0a338d5c..4464806f23 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFChannel.hh +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4StatMFChannel.hh,v 1.3 2006/06/29 20:24:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFFragment.hh b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFFragment.hh index 0a6510304e..c33cb261dd 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFFragment.hh +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFFragment.hh @@ -25,7 +25,7 @@ // // // $Id: G4StatMFFragment.hh,v 1.3 2006/06/29 20:24:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroBiNucleon.hh b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroBiNucleon.hh index 741d57e17f..cd08dcc13f 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroBiNucleon.hh +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroBiNucleon.hh @@ -25,7 +25,7 @@ // // // $Id: G4StatMFMacroBiNucleon.hh,v 1.3 2006/06/29 20:24:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroChemicalPotential.hh b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroChemicalPotential.hh index b4cabae181..5a475e021c 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroChemicalPotential.hh +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroChemicalPotential.hh @@ -25,7 +25,7 @@ // // // $Id: G4StatMFMacroChemicalPotential.hh,v 1.3 2006/06/29 20:24:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroMultiNucleon.hh b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroMultiNucleon.hh index a6123a2228..e821db8085 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroMultiNucleon.hh +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroMultiNucleon.hh @@ -25,7 +25,7 @@ // // // $Id: G4StatMFMacroMultiNucleon.hh,v 1.3 2006/06/29 20:24:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroMultiplicity.hh b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroMultiplicity.hh index 59eb618c3b..1a9cc06089 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroMultiplicity.hh +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroMultiplicity.hh @@ -25,7 +25,7 @@ // // // $Id: G4StatMFMacroMultiplicity.hh,v 1.3 2006/06/29 20:24:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroNucleon.hh b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroNucleon.hh index ffb9586e23..16e456627d 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroNucleon.hh +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroNucleon.hh @@ -25,7 +25,7 @@ // // // $Id: G4StatMFMacroNucleon.hh,v 1.3 2006/06/29 20:24:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroTemperature.hh b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroTemperature.hh index 75da8d65cf..56d867d2b0 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroTemperature.hh +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroTemperature.hh @@ -25,7 +25,7 @@ // // // $Id: G4StatMFMacroTemperature.hh,v 1.3 2006/06/29 20:24:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroTetraNucleon.hh b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroTetraNucleon.hh index 57c4f00656..7efd402c67 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroTetraNucleon.hh +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroTetraNucleon.hh @@ -25,7 +25,7 @@ // // // $Id: G4StatMFMacroTetraNucleon.hh,v 1.3 2006/06/29 20:24:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroTriNucleon.hh b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroTriNucleon.hh index edfead1140..e8ea939c0d 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroTriNucleon.hh +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroTriNucleon.hh @@ -25,7 +25,7 @@ // // // $Id: G4StatMFMacroTriNucleon.hh,v 1.3 2006/06/29 20:24:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMicroCanonical.hh b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMicroCanonical.hh index 7ffffe034e..94eb6a21b7 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMicroCanonical.hh +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMicroCanonical.hh @@ -25,7 +25,7 @@ // // // $Id: G4StatMFMicroCanonical.hh,v 1.3 2006/06/29 20:24:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMicroManager.hh b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMicroManager.hh index 5d64255e7c..8c84055dbc 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMicroManager.hh +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMicroManager.hh @@ -25,7 +25,7 @@ // // // $Id: G4StatMFMicroManager.hh,v 1.3 2006/06/29 20:24:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMicroPartition.hh b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMicroPartition.hh index db350547bb..1d593f0966 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMicroPartition.hh +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMicroPartition.hh @@ -25,7 +25,7 @@ // // // $Id: G4StatMFMicroPartition.hh,v 1.3 2006/06/29 20:24:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFParameters.hh b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFParameters.hh index 87fa66bb97..3816336c90 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFParameters.hh +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFParameters.hh @@ -25,7 +25,7 @@ // // // $Id: G4StatMFParameters.hh,v 1.3 2006/06/29 20:24:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4VMultiFragmentation.hh b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4VMultiFragmentation.hh index a3beb57b43..ecec28072b 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4VMultiFragmentation.hh +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4VMultiFragmentation.hh @@ -25,7 +25,7 @@ // // // $Id: G4VMultiFragmentation.hh,v 1.3 2006/06/29 20:24:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4VStatMFEnsemble.hh b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4VStatMFEnsemble.hh index 5f6f795991..35c84a35aa 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4VStatMFEnsemble.hh +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4VStatMFEnsemble.hh @@ -25,7 +25,7 @@ // // // $Id: G4VStatMFEnsemble.hh,v 1.3 2006/06/29 20:24:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4VStatMFMacroCluster.hh b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4VStatMFMacroCluster.hh index 33a084ce76..1871a82a04 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4VStatMFMacroCluster.hh +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4VStatMFMacroCluster.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VStatMFMacroCluster.hh,v 1.4 2006/06/29 20:24:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VStatMFMacroCluster.hh,v 1.5 2006/08/19 19:55:09 dennis Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara @@ -112,15 +112,13 @@ protected: // ************************************************************************* public: - const G4double GetInvLevelDensity(void) const + G4double GetInvLevelDensity(void) const { return _InvLevelDensity; } - - void SetZARatio(const G4double value) { theZARatio = value; } - const G4double GetZARatio(void) const + G4double GetZARatio(void) const { return theZARatio; } @@ -131,7 +129,7 @@ public: _InvLevelDensity = CalcInvLevelDensity(); } - const G4double GetSize(void) const + G4double GetSize(void) const { return theA; } diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4Solver.cc b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4Solver.cc index 805fc012ad..71685a1637 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4Solver.cc +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4Solver.cc @@ -25,7 +25,7 @@ // // // $Id: G4Solver.cc,v 1.3 2006/06/29 20:24:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMF.cc b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMF.cc index f32d083713..0fb50330c3 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMF.cc +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMF.cc @@ -25,7 +25,7 @@ // // // $Id: G4StatMF.cc,v 1.5 2006/06/29 20:24:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFChannel.cc b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFChannel.cc index 481183c627..7679aa0df9 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFChannel.cc +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFChannel.cc @@ -25,7 +25,7 @@ // // // $Id: G4StatMFChannel.cc,v 1.6 2006/06/29 20:24:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFFragment.cc b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFFragment.cc index 4ee6a297cf..6a0b7b74ef 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFFragment.cc +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFFragment.cc @@ -25,7 +25,7 @@ // // // $Id: G4StatMFFragment.cc,v 1.6 2006/06/29 20:24:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroBiNucleon.cc b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroBiNucleon.cc index 34d78e45d0..7d1c78a770 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroBiNucleon.cc +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroBiNucleon.cc @@ -25,7 +25,7 @@ // // // $Id: G4StatMFMacroBiNucleon.cc,v 1.5 2006/06/29 20:24:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroCanonical.cc b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroCanonical.cc index 54b722dbb5..353694b203 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroCanonical.cc +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroCanonical.cc @@ -25,7 +25,7 @@ // // // $Id: G4StatMFMacroCanonical.cc,v 1.6 2006/06/29 20:24:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by V. Lara // -------------------------------------------------------------------- diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroChemicalPotential.cc b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroChemicalPotential.cc index f8ac65bba4..e572261a2f 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroChemicalPotential.cc +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroChemicalPotential.cc @@ -25,7 +25,7 @@ // // // $Id: G4StatMFMacroChemicalPotential.cc,v 1.5 2006/06/29 20:24:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroMultiNucleon.cc b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroMultiNucleon.cc index baacac4512..d5fe40deef 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroMultiNucleon.cc +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroMultiNucleon.cc @@ -25,7 +25,7 @@ // // // $Id: G4StatMFMacroMultiNucleon.cc,v 1.5 2006/06/29 20:25:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroMultiplicity.cc b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroMultiplicity.cc index 3726c332b7..cf2cec5ebd 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroMultiplicity.cc +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroMultiplicity.cc @@ -25,7 +25,7 @@ // // // $Id: G4StatMFMacroMultiplicity.cc,v 1.5 2006/06/29 20:25:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroNucleon.cc b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroNucleon.cc index c6cb55c8fc..896a687163 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroNucleon.cc +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroNucleon.cc @@ -25,7 +25,7 @@ // // // $Id: G4StatMFMacroNucleon.cc,v 1.5 2006/06/29 20:25:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroTemperature.cc b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroTemperature.cc index 3a781e95fe..b508e2945c 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroTemperature.cc +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroTemperature.cc @@ -25,7 +25,7 @@ // // // $Id: G4StatMFMacroTemperature.cc,v 1.5 2006/06/29 20:25:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroTetraNucleon.cc b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroTetraNucleon.cc index 0137566765..de715d0dae 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroTetraNucleon.cc +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroTetraNucleon.cc @@ -25,7 +25,7 @@ // // // $Id: G4StatMFMacroTetraNucleon.cc,v 1.5 2006/06/29 20:25:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroTriNucleon.cc b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroTriNucleon.cc index d5fc3546af..12172cc83e 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroTriNucleon.cc +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroTriNucleon.cc @@ -25,7 +25,7 @@ // // // $Id: G4StatMFMacroTriNucleon.cc,v 1.5 2006/06/29 20:25:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMicroCanonical.cc b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMicroCanonical.cc index d3b4bf13ef..6e497f9808 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMicroCanonical.cc +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMicroCanonical.cc @@ -25,7 +25,7 @@ // // // $Id: G4StatMFMicroCanonical.cc,v 1.6 2006/06/29 20:25:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMicroManager.cc b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMicroManager.cc index e0b0576f84..30cee01ec1 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMicroManager.cc +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMicroManager.cc @@ -25,7 +25,7 @@ // // // $Id: G4StatMFMicroManager.cc,v 1.5 2006/06/29 20:25:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMicroPartition.cc b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMicroPartition.cc index 680b92fa08..d6b0d4fffb 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMicroPartition.cc +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMicroPartition.cc @@ -25,7 +25,7 @@ // // // $Id: G4StatMFMicroPartition.cc,v 1.7 2006/06/29 20:25:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by V. Lara // -------------------------------------------------------------------- diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFParameters.cc b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFParameters.cc index 5b325d7d0f..cbe697bce7 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFParameters.cc +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFParameters.cc @@ -25,7 +25,7 @@ // // // $Id: G4StatMFParameters.cc,v 1.4 2006/06/29 20:25:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4VMultiFragmentation.cc b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4VMultiFragmentation.cc index fa7eac5873..f61b353758 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4VMultiFragmentation.cc +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4VMultiFragmentation.cc @@ -25,7 +25,7 @@ // // // $Id: G4VMultiFragmentation.cc,v 1.5 2006/06/29 20:25:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1998) diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4VStatMFEnsemble.cc b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4VStatMFEnsemble.cc index ab06ee1f06..fa714031db 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4VStatMFEnsemble.cc +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4VStatMFEnsemble.cc @@ -25,7 +25,7 @@ // // // $Id: G4VStatMFEnsemble.cc,v 1.5 2006/06/29 20:25:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4VStatMFMacroCluster.cc b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4VStatMFMacroCluster.cc index d68e859351..1ffb196f2e 100644 --- a/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4VStatMFMacroCluster.cc +++ b/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4VStatMFMacroCluster.cc @@ -25,7 +25,7 @@ // // // $Id: G4VStatMFMacroCluster.cc,v 1.4 2006/06/29 20:25:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/util/include/G4AlphaCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/util/include/G4AlphaCoulombBarrier.hh index efc8a53800..2cb18965ad 100644 --- a/source/processes/hadronic/models/de_excitation/util/include/G4AlphaCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/util/include/G4AlphaCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4AlphaCoulombBarrier.hh,v 1.3 2006/06/29 20:27:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/util/include/G4CameronGilbertPairingCorrections.hh b/source/processes/hadronic/models/de_excitation/util/include/G4CameronGilbertPairingCorrections.hh index 11648dcfb7..a08a72bb75 100644 --- a/source/processes/hadronic/models/de_excitation/util/include/G4CameronGilbertPairingCorrections.hh +++ b/source/processes/hadronic/models/de_excitation/util/include/G4CameronGilbertPairingCorrections.hh @@ -25,7 +25,7 @@ // // // $Id: G4CameronGilbertPairingCorrections.hh,v 1.3 2006/06/29 20:27:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/util/include/G4CameronGilbertShellCorrections.hh b/source/processes/hadronic/models/de_excitation/util/include/G4CameronGilbertShellCorrections.hh index 547241a942..76bf95757a 100644 --- a/source/processes/hadronic/models/de_excitation/util/include/G4CameronGilbertShellCorrections.hh +++ b/source/processes/hadronic/models/de_excitation/util/include/G4CameronGilbertShellCorrections.hh @@ -25,7 +25,7 @@ // // // $Id: G4CameronGilbertShellCorrections.hh,v 1.3 2006/06/29 20:27:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/util/include/G4CameronShellPlusPairingCorrections.hh b/source/processes/hadronic/models/de_excitation/util/include/G4CameronShellPlusPairingCorrections.hh index 746593bb8c..97a233fa48 100644 --- a/source/processes/hadronic/models/de_excitation/util/include/G4CameronShellPlusPairingCorrections.hh +++ b/source/processes/hadronic/models/de_excitation/util/include/G4CameronShellPlusPairingCorrections.hh @@ -25,7 +25,7 @@ // // // $Id: G4CameronShellPlusPairingCorrections.hh,v 1.3 2006/06/29 20:27:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/util/include/G4CameronTruranHilfPairingCorrections.hh b/source/processes/hadronic/models/de_excitation/util/include/G4CameronTruranHilfPairingCorrections.hh index 0c58cde1c4..46c9312b3c 100644 --- a/source/processes/hadronic/models/de_excitation/util/include/G4CameronTruranHilfPairingCorrections.hh +++ b/source/processes/hadronic/models/de_excitation/util/include/G4CameronTruranHilfPairingCorrections.hh @@ -25,7 +25,7 @@ // // // $Id: G4CameronTruranHilfPairingCorrections.hh,v 1.3 2006/06/29 20:27:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/util/include/G4CameronTruranHilfShellCorrections.hh b/source/processes/hadronic/models/de_excitation/util/include/G4CameronTruranHilfShellCorrections.hh index 1c08f4757e..eabb8203b4 100644 --- a/source/processes/hadronic/models/de_excitation/util/include/G4CameronTruranHilfShellCorrections.hh +++ b/source/processes/hadronic/models/de_excitation/util/include/G4CameronTruranHilfShellCorrections.hh @@ -25,7 +25,7 @@ // // // $Id: G4CameronTruranHilfShellCorrections.hh,v 1.3 2006/06/29 20:27:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/util/include/G4ConstantLevelDensityParameter.hh b/source/processes/hadronic/models/de_excitation/util/include/G4ConstantLevelDensityParameter.hh index 9f5651b0ce..25566305b5 100644 --- a/source/processes/hadronic/models/de_excitation/util/include/G4ConstantLevelDensityParameter.hh +++ b/source/processes/hadronic/models/de_excitation/util/include/G4ConstantLevelDensityParameter.hh @@ -25,7 +25,7 @@ // // // $Id: G4ConstantLevelDensityParameter.hh,v 1.3 2006/06/29 20:27:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations (photon evaporation) // by C. Dallapiccola (Nov 1998) diff --git a/source/processes/hadronic/models/de_excitation/util/include/G4CookPairingCorrections.hh b/source/processes/hadronic/models/de_excitation/util/include/G4CookPairingCorrections.hh index 2eb0724126..7ae07e7f90 100644 --- a/source/processes/hadronic/models/de_excitation/util/include/G4CookPairingCorrections.hh +++ b/source/processes/hadronic/models/de_excitation/util/include/G4CookPairingCorrections.hh @@ -25,7 +25,7 @@ // // // $Id: G4CookPairingCorrections.hh,v 1.3 2006/06/29 20:27:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/util/include/G4CookShellCorrections.hh b/source/processes/hadronic/models/de_excitation/util/include/G4CookShellCorrections.hh index 42c91f9319..a470c9cf13 100644 --- a/source/processes/hadronic/models/de_excitation/util/include/G4CookShellCorrections.hh +++ b/source/processes/hadronic/models/de_excitation/util/include/G4CookShellCorrections.hh @@ -25,7 +25,7 @@ // // // $Id: G4CookShellCorrections.hh,v 1.3 2006/06/29 20:27:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/util/include/G4CoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/util/include/G4CoulombBarrier.hh index dd4acfc9c5..8953f1e556 100644 --- a/source/processes/hadronic/models/de_excitation/util/include/G4CoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/util/include/G4CoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4CoulombBarrier.hh,v 1.4 2006/06/29 20:27:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/util/include/G4DeuteronCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/util/include/G4DeuteronCoulombBarrier.hh index c02466902d..aa2be978d0 100644 --- a/source/processes/hadronic/models/de_excitation/util/include/G4DeuteronCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/util/include/G4DeuteronCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4DeuteronCoulombBarrier.hh,v 1.3 2006/06/29 20:27:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/util/include/G4EvaporationLevelDensityParameter.hh b/source/processes/hadronic/models/de_excitation/util/include/G4EvaporationLevelDensityParameter.hh index 22c26604af..60d64f7ab6 100644 --- a/source/processes/hadronic/models/de_excitation/util/include/G4EvaporationLevelDensityParameter.hh +++ b/source/processes/hadronic/models/de_excitation/util/include/G4EvaporationLevelDensityParameter.hh @@ -25,7 +25,7 @@ // // // $Id: G4EvaporationLevelDensityParameter.hh,v 1.3 2006/06/29 20:27:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Oct 1998) diff --git a/source/processes/hadronic/models/de_excitation/util/include/G4He3CoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/util/include/G4He3CoulombBarrier.hh index 03d184b2eb..78989dfc93 100644 --- a/source/processes/hadronic/models/de_excitation/util/include/G4He3CoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/util/include/G4He3CoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4He3CoulombBarrier.hh,v 1.3 2006/06/29 20:27:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/util/include/G4NeutronCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/util/include/G4NeutronCoulombBarrier.hh index 843d6620a8..6e74f37375 100644 --- a/source/processes/hadronic/models/de_excitation/util/include/G4NeutronCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/util/include/G4NeutronCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronCoulombBarrier.hh,v 1.3 2006/06/29 20:27:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/util/include/G4PairingCorrection.hh b/source/processes/hadronic/models/de_excitation/util/include/G4PairingCorrection.hh index 80cb9f28f0..114e1738d7 100644 --- a/source/processes/hadronic/models/de_excitation/util/include/G4PairingCorrection.hh +++ b/source/processes/hadronic/models/de_excitation/util/include/G4PairingCorrection.hh @@ -25,7 +25,7 @@ // // // $Id: G4PairingCorrection.hh,v 1.4 2006/06/29 20:27:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/util/include/G4ProtonCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/util/include/G4ProtonCoulombBarrier.hh index 6f16f80e36..b6d4f86d72 100644 --- a/source/processes/hadronic/models/de_excitation/util/include/G4ProtonCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/util/include/G4ProtonCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4ProtonCoulombBarrier.hh,v 1.3 2006/06/29 20:27:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/util/include/G4ShellCorrection.hh b/source/processes/hadronic/models/de_excitation/util/include/G4ShellCorrection.hh index ec289fbd70..2e51ec9350 100644 --- a/source/processes/hadronic/models/de_excitation/util/include/G4ShellCorrection.hh +++ b/source/processes/hadronic/models/de_excitation/util/include/G4ShellCorrection.hh @@ -25,7 +25,7 @@ // // // $Id: G4ShellCorrection.hh,v 1.3 2006/06/29 20:27:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/util/include/G4TritonCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/util/include/G4TritonCoulombBarrier.hh index 3b59e41f14..2d7dc773c2 100644 --- a/source/processes/hadronic/models/de_excitation/util/include/G4TritonCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/util/include/G4TritonCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4TritonCoulombBarrier.hh,v 1.3 2006/06/29 20:27:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/util/include/G4VCoulombBarrier.hh b/source/processes/hadronic/models/de_excitation/util/include/G4VCoulombBarrier.hh index 41ab664ac4..b54d85305d 100644 --- a/source/processes/hadronic/models/de_excitation/util/include/G4VCoulombBarrier.hh +++ b/source/processes/hadronic/models/de_excitation/util/include/G4VCoulombBarrier.hh @@ -25,7 +25,7 @@ // // // $Id: G4VCoulombBarrier.hh,v 1.3 2006/06/29 20:27:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Nov 1999) diff --git a/source/processes/hadronic/models/de_excitation/util/include/G4VEmissionProbability.hh b/source/processes/hadronic/models/de_excitation/util/include/G4VEmissionProbability.hh index 92b0b2e511..ee6191c389 100644 --- a/source/processes/hadronic/models/de_excitation/util/include/G4VEmissionProbability.hh +++ b/source/processes/hadronic/models/de_excitation/util/include/G4VEmissionProbability.hh @@ -25,7 +25,7 @@ // // // $Id: G4VEmissionProbability.hh,v 1.3 2006/06/29 20:27:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Oct 1998) diff --git a/source/processes/hadronic/models/de_excitation/util/include/G4VLevelDensityParameter.hh b/source/processes/hadronic/models/de_excitation/util/include/G4VLevelDensityParameter.hh index e073eb3510..36f2a2cbc8 100644 --- a/source/processes/hadronic/models/de_excitation/util/include/G4VLevelDensityParameter.hh +++ b/source/processes/hadronic/models/de_excitation/util/include/G4VLevelDensityParameter.hh @@ -25,7 +25,7 @@ // // // $Id: G4VLevelDensityParameter.hh,v 1.4 2006/06/29 20:28:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Oct 1998) diff --git a/source/processes/hadronic/models/de_excitation/util/src/G4AlphaCoulombBarrier.cc b/source/processes/hadronic/models/de_excitation/util/src/G4AlphaCoulombBarrier.cc index 29d5ec8e4c..cd55858206 100644 --- a/source/processes/hadronic/models/de_excitation/util/src/G4AlphaCoulombBarrier.cc +++ b/source/processes/hadronic/models/de_excitation/util/src/G4AlphaCoulombBarrier.cc @@ -25,7 +25,7 @@ // // // $Id: G4AlphaCoulombBarrier.cc,v 1.4 2006/06/29 20:28:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/util/src/G4CameronGilbertPairingCorrections.cc b/source/processes/hadronic/models/de_excitation/util/src/G4CameronGilbertPairingCorrections.cc index 7dde22e418..16292dfca2 100644 --- a/source/processes/hadronic/models/de_excitation/util/src/G4CameronGilbertPairingCorrections.cc +++ b/source/processes/hadronic/models/de_excitation/util/src/G4CameronGilbertPairingCorrections.cc @@ -25,7 +25,7 @@ // // // $Id: G4CameronGilbertPairingCorrections.cc,v 1.3 2006/06/29 20:28:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/util/src/G4CameronGilbertShellCorrections.cc b/source/processes/hadronic/models/de_excitation/util/src/G4CameronGilbertShellCorrections.cc index f25d3f838d..f99ca3693b 100644 --- a/source/processes/hadronic/models/de_excitation/util/src/G4CameronGilbertShellCorrections.cc +++ b/source/processes/hadronic/models/de_excitation/util/src/G4CameronGilbertShellCorrections.cc @@ -25,7 +25,7 @@ // // // $Id: G4CameronGilbertShellCorrections.cc,v 1.3 2006/06/29 20:28:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/util/src/G4CameronShellPlusPairingCorrections.cc b/source/processes/hadronic/models/de_excitation/util/src/G4CameronShellPlusPairingCorrections.cc index 58e52a9b7b..2cd87c9f8b 100644 --- a/source/processes/hadronic/models/de_excitation/util/src/G4CameronShellPlusPairingCorrections.cc +++ b/source/processes/hadronic/models/de_excitation/util/src/G4CameronShellPlusPairingCorrections.cc @@ -25,7 +25,7 @@ // // // $Id: G4CameronShellPlusPairingCorrections.cc,v 1.3 2006/06/29 20:28:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/util/src/G4CameronTruranHilfPairingCorrections.cc b/source/processes/hadronic/models/de_excitation/util/src/G4CameronTruranHilfPairingCorrections.cc index 33d571b736..e6fe6bb9b4 100644 --- a/source/processes/hadronic/models/de_excitation/util/src/G4CameronTruranHilfPairingCorrections.cc +++ b/source/processes/hadronic/models/de_excitation/util/src/G4CameronTruranHilfPairingCorrections.cc @@ -25,7 +25,7 @@ // // // $Id: G4CameronTruranHilfPairingCorrections.cc,v 1.3 2006/06/29 20:28:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/util/src/G4CameronTruranHilfShellCorrections.cc b/source/processes/hadronic/models/de_excitation/util/src/G4CameronTruranHilfShellCorrections.cc index 1cf6d19aa8..55f2a6fb94 100644 --- a/source/processes/hadronic/models/de_excitation/util/src/G4CameronTruranHilfShellCorrections.cc +++ b/source/processes/hadronic/models/de_excitation/util/src/G4CameronTruranHilfShellCorrections.cc @@ -25,7 +25,7 @@ // // // $Id: G4CameronTruranHilfShellCorrections.cc,v 1.3 2006/06/29 20:28:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/util/src/G4CookPairingCorrections.cc b/source/processes/hadronic/models/de_excitation/util/src/G4CookPairingCorrections.cc index e1fc53a2c0..ba4c86d11e 100644 --- a/source/processes/hadronic/models/de_excitation/util/src/G4CookPairingCorrections.cc +++ b/source/processes/hadronic/models/de_excitation/util/src/G4CookPairingCorrections.cc @@ -25,7 +25,7 @@ // // // $Id: G4CookPairingCorrections.cc,v 1.3 2006/06/29 20:28:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/util/src/G4CookShellCorrections.cc b/source/processes/hadronic/models/de_excitation/util/src/G4CookShellCorrections.cc index f5bd1b8c62..c1fcdc7096 100644 --- a/source/processes/hadronic/models/de_excitation/util/src/G4CookShellCorrections.cc +++ b/source/processes/hadronic/models/de_excitation/util/src/G4CookShellCorrections.cc @@ -25,7 +25,7 @@ // // // $Id: G4CookShellCorrections.cc,v 1.3 2006/06/29 20:28:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/util/src/G4CoulombBarrier.cc b/source/processes/hadronic/models/de_excitation/util/src/G4CoulombBarrier.cc index dee988f957..2d5f40ea9f 100644 --- a/source/processes/hadronic/models/de_excitation/util/src/G4CoulombBarrier.cc +++ b/source/processes/hadronic/models/de_excitation/util/src/G4CoulombBarrier.cc @@ -25,7 +25,7 @@ // // // $Id: G4CoulombBarrier.cc,v 1.6 2006/06/29 20:28:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/util/src/G4DeuteronCoulombBarrier.cc b/source/processes/hadronic/models/de_excitation/util/src/G4DeuteronCoulombBarrier.cc index 7be7b35d95..87e54d4f53 100644 --- a/source/processes/hadronic/models/de_excitation/util/src/G4DeuteronCoulombBarrier.cc +++ b/source/processes/hadronic/models/de_excitation/util/src/G4DeuteronCoulombBarrier.cc @@ -25,7 +25,7 @@ // // // $Id: G4DeuteronCoulombBarrier.cc,v 1.4 2006/06/29 20:28:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/util/src/G4EvaporationLevelDensityParameter.cc b/source/processes/hadronic/models/de_excitation/util/src/G4EvaporationLevelDensityParameter.cc index 7c64444029..b034753d0a 100644 --- a/source/processes/hadronic/models/de_excitation/util/src/G4EvaporationLevelDensityParameter.cc +++ b/source/processes/hadronic/models/de_excitation/util/src/G4EvaporationLevelDensityParameter.cc @@ -25,7 +25,7 @@ // // // $Id: G4EvaporationLevelDensityParameter.cc,v 1.5 2006/06/29 20:28:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Oct 1998) diff --git a/source/processes/hadronic/models/de_excitation/util/src/G4He3CoulombBarrier.cc b/source/processes/hadronic/models/de_excitation/util/src/G4He3CoulombBarrier.cc index f5be96ef26..b516132b42 100644 --- a/source/processes/hadronic/models/de_excitation/util/src/G4He3CoulombBarrier.cc +++ b/source/processes/hadronic/models/de_excitation/util/src/G4He3CoulombBarrier.cc @@ -25,7 +25,7 @@ // // // $Id: G4He3CoulombBarrier.cc,v 1.4 2006/06/29 20:28:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/util/src/G4NeutronCoulombBarrier.cc b/source/processes/hadronic/models/de_excitation/util/src/G4NeutronCoulombBarrier.cc index d5cb86fb7f..cc79934b3b 100644 --- a/source/processes/hadronic/models/de_excitation/util/src/G4NeutronCoulombBarrier.cc +++ b/source/processes/hadronic/models/de_excitation/util/src/G4NeutronCoulombBarrier.cc @@ -25,7 +25,7 @@ // // // $Id: G4NeutronCoulombBarrier.cc,v 1.4 2006/06/29 20:28:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/util/src/G4PairingCorrection.cc b/source/processes/hadronic/models/de_excitation/util/src/G4PairingCorrection.cc index 15adf70d47..56a285597c 100644 --- a/source/processes/hadronic/models/de_excitation/util/src/G4PairingCorrection.cc +++ b/source/processes/hadronic/models/de_excitation/util/src/G4PairingCorrection.cc @@ -25,7 +25,7 @@ // // // $Id: G4PairingCorrection.cc,v 1.3 2006/06/29 20:28:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/util/src/G4ProtonCoulombBarrier.cc b/source/processes/hadronic/models/de_excitation/util/src/G4ProtonCoulombBarrier.cc index ac272ef381..2736fdfb0a 100644 --- a/source/processes/hadronic/models/de_excitation/util/src/G4ProtonCoulombBarrier.cc +++ b/source/processes/hadronic/models/de_excitation/util/src/G4ProtonCoulombBarrier.cc @@ -25,7 +25,7 @@ // // // $Id: G4ProtonCoulombBarrier.cc,v 1.4 2006/06/29 20:28:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/util/src/G4ShellCorrection.cc b/source/processes/hadronic/models/de_excitation/util/src/G4ShellCorrection.cc index e688e44e15..b4b2cc67af 100644 --- a/source/processes/hadronic/models/de_excitation/util/src/G4ShellCorrection.cc +++ b/source/processes/hadronic/models/de_excitation/util/src/G4ShellCorrection.cc @@ -25,7 +25,7 @@ // // // $Id: G4ShellCorrection.cc,v 1.3 2006/06/29 20:28:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara diff --git a/source/processes/hadronic/models/de_excitation/util/src/G4TritonCoulombBarrier.cc b/source/processes/hadronic/models/de_excitation/util/src/G4TritonCoulombBarrier.cc index a258989aa7..83252628dd 100644 --- a/source/processes/hadronic/models/de_excitation/util/src/G4TritonCoulombBarrier.cc +++ b/source/processes/hadronic/models/de_excitation/util/src/G4TritonCoulombBarrier.cc @@ -25,7 +25,7 @@ // // // $Id: G4TritonCoulombBarrier.cc,v 1.4 2006/06/29 20:28:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/util/src/G4VCoulombBarrier.cc b/source/processes/hadronic/models/de_excitation/util/src/G4VCoulombBarrier.cc index 59b2c3fb5f..195706fe4c 100644 --- a/source/processes/hadronic/models/de_excitation/util/src/G4VCoulombBarrier.cc +++ b/source/processes/hadronic/models/de_excitation/util/src/G4VCoulombBarrier.cc @@ -25,7 +25,7 @@ // // // $Id: G4VCoulombBarrier.cc,v 1.5 2006/06/29 20:28:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Dec 1999) diff --git a/source/processes/hadronic/models/de_excitation/util/src/G4VEmissionProbability.cc b/source/processes/hadronic/models/de_excitation/util/src/G4VEmissionProbability.cc index b551b9e218..b20936b863 100644 --- a/source/processes/hadronic/models/de_excitation/util/src/G4VEmissionProbability.cc +++ b/source/processes/hadronic/models/de_excitation/util/src/G4VEmissionProbability.cc @@ -25,7 +25,7 @@ // // // $Id: G4VEmissionProbability.cc,v 1.5 2006/06/29 20:28:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Oct 1998) diff --git a/source/processes/hadronic/models/de_excitation/util/src/G4VLevelDensityParameter.cc b/source/processes/hadronic/models/de_excitation/util/src/G4VLevelDensityParameter.cc index 770468829b..025282d91c 100644 --- a/source/processes/hadronic/models/de_excitation/util/src/G4VLevelDensityParameter.cc +++ b/source/processes/hadronic/models/de_excitation/util/src/G4VLevelDensityParameter.cc @@ -25,7 +25,7 @@ // // // $Id: G4VLevelDensityParameter.cc,v 1.4 2006/06/29 20:28:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear De-excitations // by V. Lara (Oct 1998) diff --git a/source/processes/hadronic/models/high_energy/History b/source/processes/hadronic/models/high_energy/History new file mode 100644 index 0000000000..4db0faa884 --- /dev/null +++ b/source/processes/hadronic/models/high_energy/History @@ -0,0 +1,26 @@ +------------------------------------------------------------------- + + ========================================================== + Geant4 - an Object-Oriented Toolkit for Physics Simulation + ========================================================== + + History file for High Energy Parameterized Models + ------------------------------------------------- + +This file should be used to summarize modifications introduced in the +code and to keep track of all tags. + + --------------------------------------------------------------- + * Please list in reverse chronological order (last date on top) + --------------------------------------------------------------- + +22 November 2006 - Dennis Wright (hadr-hep-V08-01-00) +----------------------------------------------------- + G4HEVector::G4HEVector(): + change + strangeness=aParticle->GetDefinition()->GetQuarkContent(2); + to + strangeness=aParticle->GetDefinition()->GetQuarkContent(3); + + In this case, ordering starts from 1, not 0 + diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiKaonZeroInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiKaonZeroInelastic.hh index ea8a3837b5..2dd29f749f 100644 --- a/source/processes/hadronic/models/high_energy/include/G4HEAntiKaonZeroInelastic.hh +++ b/source/processes/hadronic/models/high_energy/include/G4HEAntiKaonZeroInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4HEAntiKaonZeroInelastic.hh,v 1.13 2006/06/29 20:28:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha High Energy model class -- header file diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiLambdaInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiLambdaInelastic.hh index 8a6f9e8565..54b2c8a749 100644 --- a/source/processes/hadronic/models/high_energy/include/G4HEAntiLambdaInelastic.hh +++ b/source/processes/hadronic/models/high_energy/include/G4HEAntiLambdaInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4HEAntiLambdaInelastic.hh,v 1.13 2006/06/29 20:28:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha High Energy model class -- header file diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiNeutronInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiNeutronInelastic.hh index dfdd497207..324ae1da4f 100644 --- a/source/processes/hadronic/models/high_energy/include/G4HEAntiNeutronInelastic.hh +++ b/source/processes/hadronic/models/high_energy/include/G4HEAntiNeutronInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4HEAntiNeutronInelastic.hh,v 1.13 2006/06/29 20:28:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha High Energy model class -- header file diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiOmegaMinusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiOmegaMinusInelastic.hh index 698066f232..19a3af3b97 100644 --- a/source/processes/hadronic/models/high_energy/include/G4HEAntiOmegaMinusInelastic.hh +++ b/source/processes/hadronic/models/high_energy/include/G4HEAntiOmegaMinusInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4HEAntiOmegaMinusInelastic.hh,v 1.13 2006/06/29 20:28:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha High Energy model class -- header file diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiProtonInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiProtonInelastic.hh index e21a85e397..87fc1ce9c9 100644 --- a/source/processes/hadronic/models/high_energy/include/G4HEAntiProtonInelastic.hh +++ b/source/processes/hadronic/models/high_energy/include/G4HEAntiProtonInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4HEAntiProtonInelastic.hh,v 1.14 2006/06/29 20:28:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha High Energy model class -- header file diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaMinusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaMinusInelastic.hh index 0a74f2cda7..777e9db2eb 100644 --- a/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaMinusInelastic.hh +++ b/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaMinusInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4HEAntiSigmaMinusInelastic.hh,v 1.13 2006/06/29 20:28:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha High Energy model class -- header file diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaPlusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaPlusInelastic.hh index f918d4fa67..c0378d4509 100644 --- a/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaPlusInelastic.hh +++ b/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaPlusInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4HEAntiSigmaPlusInelastic.hh,v 1.13 2006/06/29 20:29:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha High Energy model class -- header file diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaZeroInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaZeroInelastic.hh index bcc66a4904..66999b18a4 100644 --- a/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaZeroInelastic.hh +++ b/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaZeroInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4HEAntiSigmaZeroInelastic.hh,v 1.13 2006/06/29 20:29:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha High Energy model class -- header file diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiXiMinusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiXiMinusInelastic.hh index da743c41bd..9a08aa38c2 100644 --- a/source/processes/hadronic/models/high_energy/include/G4HEAntiXiMinusInelastic.hh +++ b/source/processes/hadronic/models/high_energy/include/G4HEAntiXiMinusInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4HEAntiXiMinusInelastic.hh,v 1.13 2006/06/29 20:29:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha High Energy model class -- header file diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiXiZeroInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiXiZeroInelastic.hh index 3a9d645c48..71a5fec90d 100644 --- a/source/processes/hadronic/models/high_energy/include/G4HEAntiXiZeroInelastic.hh +++ b/source/processes/hadronic/models/high_energy/include/G4HEAntiXiZeroInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4HEAntiXiZeroInelastic.hh,v 1.13 2006/06/29 20:29:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha High Energy model class -- header file diff --git a/source/processes/hadronic/models/high_energy/include/G4HEInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEInelastic.hh index 0e26384275..9d3dc3361b 100644 --- a/source/processes/hadronic/models/high_energy/include/G4HEInelastic.hh +++ b/source/processes/hadronic/models/high_energy/include/G4HEInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4HEInelastic.hh,v 1.13 2006/06/29 20:29:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha High Energy (GHE) model class -- header file diff --git a/source/processes/hadronic/models/high_energy/include/G4HEKaonMinusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEKaonMinusInelastic.hh index 9b7863d58f..9a94e5a4fb 100644 --- a/source/processes/hadronic/models/high_energy/include/G4HEKaonMinusInelastic.hh +++ b/source/processes/hadronic/models/high_energy/include/G4HEKaonMinusInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4HEKaonMinusInelastic.hh,v 1.13 2006/06/29 20:29:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha High Energy model class -- header file diff --git a/source/processes/hadronic/models/high_energy/include/G4HEKaonPlusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEKaonPlusInelastic.hh index 04cb1b70bb..a0a411bd7d 100644 --- a/source/processes/hadronic/models/high_energy/include/G4HEKaonPlusInelastic.hh +++ b/source/processes/hadronic/models/high_energy/include/G4HEKaonPlusInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4HEKaonPlusInelastic.hh,v 1.13 2006/06/29 20:29:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha High Energy model class -- header file diff --git a/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroInelastic.hh index 370eb35da9..671fdcf680 100644 --- a/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroInelastic.hh +++ b/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4HEKaonZeroInelastic.hh,v 1.12 2006/06/29 20:29:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha High Energy model class -- header file diff --git a/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroLongInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroLongInelastic.hh index 62704d2c15..56d0d41beb 100644 --- a/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroLongInelastic.hh +++ b/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroLongInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4HEKaonZeroLongInelastic.hh,v 1.13 2006/06/29 20:29:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha High Energy model class -- header file diff --git a/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroShortInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroShortInelastic.hh index b1390ab323..2924245906 100644 --- a/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroShortInelastic.hh +++ b/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroShortInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4HEKaonZeroShortInelastic.hh,v 1.13 2006/06/29 20:29:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha High Energy model class -- header file diff --git a/source/processes/hadronic/models/high_energy/include/G4HELambdaInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HELambdaInelastic.hh index e2041a1175..6f4b124b42 100644 --- a/source/processes/hadronic/models/high_energy/include/G4HELambdaInelastic.hh +++ b/source/processes/hadronic/models/high_energy/include/G4HELambdaInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4HELambdaInelastic.hh,v 1.13 2006/06/29 20:29:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha High Energy model class -- header file diff --git a/source/processes/hadronic/models/high_energy/include/G4HENeutronInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HENeutronInelastic.hh index 8f0a37d071..97e9e66c5d 100644 --- a/source/processes/hadronic/models/high_energy/include/G4HENeutronInelastic.hh +++ b/source/processes/hadronic/models/high_energy/include/G4HENeutronInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4HENeutronInelastic.hh,v 1.14 2006/06/29 20:29:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha High Energy model class -- header file diff --git a/source/processes/hadronic/models/high_energy/include/G4HEOmegaMinusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEOmegaMinusInelastic.hh index d3b4c2895d..66b46d9d9b 100644 --- a/source/processes/hadronic/models/high_energy/include/G4HEOmegaMinusInelastic.hh +++ b/source/processes/hadronic/models/high_energy/include/G4HEOmegaMinusInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4HEOmegaMinusInelastic.hh,v 1.13 2006/06/29 20:29:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha High Energy model class -- header file diff --git a/source/processes/hadronic/models/high_energy/include/G4HEPionMinusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEPionMinusInelastic.hh index 1019e03912..5d3a823616 100644 --- a/source/processes/hadronic/models/high_energy/include/G4HEPionMinusInelastic.hh +++ b/source/processes/hadronic/models/high_energy/include/G4HEPionMinusInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4HEPionMinusInelastic.hh,v 1.14 2006/06/29 20:29:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha High Energy model class -- header file diff --git a/source/processes/hadronic/models/high_energy/include/G4HEPionPlusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEPionPlusInelastic.hh index 7129e454e1..e1705a6417 100644 --- a/source/processes/hadronic/models/high_energy/include/G4HEPionPlusInelastic.hh +++ b/source/processes/hadronic/models/high_energy/include/G4HEPionPlusInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4HEPionPlusInelastic.hh,v 1.14 2006/06/29 20:29:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha High Energy model class -- header file diff --git a/source/processes/hadronic/models/high_energy/include/G4HEPlot.hh b/source/processes/hadronic/models/high_energy/include/G4HEPlot.hh index ea53946e59..7f27394aa8 100644 --- a/source/processes/hadronic/models/high_energy/include/G4HEPlot.hh +++ b/source/processes/hadronic/models/high_energy/include/G4HEPlot.hh @@ -25,7 +25,7 @@ // // // $Id: G4HEPlot.hh,v 1.9 2006/06/29 20:29:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha friend class G4HEPlot -- header file diff --git a/source/processes/hadronic/models/high_energy/include/G4HEProtonInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEProtonInelastic.hh index 3469f48f4a..90ae521bca 100644 --- a/source/processes/hadronic/models/high_energy/include/G4HEProtonInelastic.hh +++ b/source/processes/hadronic/models/high_energy/include/G4HEProtonInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4HEProtonInelastic.hh,v 1.14 2006/06/29 20:29:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha High Energy model class -- header file diff --git a/source/processes/hadronic/models/high_energy/include/G4HESigmaMinusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HESigmaMinusInelastic.hh index 97b439c414..e1c83ff6eb 100644 --- a/source/processes/hadronic/models/high_energy/include/G4HESigmaMinusInelastic.hh +++ b/source/processes/hadronic/models/high_energy/include/G4HESigmaMinusInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4HESigmaMinusInelastic.hh,v 1.13 2006/06/29 20:29:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha High Energy model class -- header file diff --git a/source/processes/hadronic/models/high_energy/include/G4HESigmaPlusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HESigmaPlusInelastic.hh index d5c74f8a54..1e4a3fec25 100644 --- a/source/processes/hadronic/models/high_energy/include/G4HESigmaPlusInelastic.hh +++ b/source/processes/hadronic/models/high_energy/include/G4HESigmaPlusInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4HESigmaPlusInelastic.hh,v 1.13 2006/06/29 20:29:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha High Energy model class -- header file diff --git a/source/processes/hadronic/models/high_energy/include/G4HESigmaZeroInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HESigmaZeroInelastic.hh index 5145965647..3c71ea4d33 100644 --- a/source/processes/hadronic/models/high_energy/include/G4HESigmaZeroInelastic.hh +++ b/source/processes/hadronic/models/high_energy/include/G4HESigmaZeroInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4HESigmaZeroInelastic.hh,v 1.13 2006/06/29 20:29:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha High Energy model class -- header file diff --git a/source/processes/hadronic/models/high_energy/include/G4HEVector.hh b/source/processes/hadronic/models/high_energy/include/G4HEVector.hh index 4b2355a2c4..25a8aed2bd 100644 --- a/source/processes/hadronic/models/high_energy/include/G4HEVector.hh +++ b/source/processes/hadronic/models/high_energy/include/G4HEVector.hh @@ -25,7 +25,7 @@ // // // $Id: G4HEVector.hh,v 1.12 2006/06/29 20:29:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha friend class G4KinematicParticle -- header file diff --git a/source/processes/hadronic/models/high_energy/include/G4HEXiMinusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEXiMinusInelastic.hh index babaac74a7..9493c6a1ce 100644 --- a/source/processes/hadronic/models/high_energy/include/G4HEXiMinusInelastic.hh +++ b/source/processes/hadronic/models/high_energy/include/G4HEXiMinusInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4HEXiMinusInelastic.hh,v 1.13 2006/06/29 20:29:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha High Energy model class -- header file diff --git a/source/processes/hadronic/models/high_energy/include/G4HEXiZeroInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEXiZeroInelastic.hh index e1008a8231..92f97f00b2 100644 --- a/source/processes/hadronic/models/high_energy/include/G4HEXiZeroInelastic.hh +++ b/source/processes/hadronic/models/high_energy/include/G4HEXiZeroInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4HEXiZeroInelastic.hh,v 1.13 2006/06/29 20:29:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha High Energy model class -- header file diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiKaonZeroInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiKaonZeroInelastic.cc index 962bf25d53..7818c69e75 100644 --- a/source/processes/hadronic/models/high_energy/src/G4HEAntiKaonZeroInelastic.cc +++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiKaonZeroInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4HEAntiKaonZeroInelastic.cc,v 1.14 2006/06/29 20:29:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiLambdaInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiLambdaInelastic.cc index 21d78f95a6..180750ce14 100644 --- a/source/processes/hadronic/models/high_energy/src/G4HEAntiLambdaInelastic.cc +++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiLambdaInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4HEAntiLambdaInelastic.cc,v 1.14 2006/06/29 20:29:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiNeutronInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiNeutronInelastic.cc index 5f626cff69..3a1ddd84b2 100644 --- a/source/processes/hadronic/models/high_energy/src/G4HEAntiNeutronInelastic.cc +++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiNeutronInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4HEAntiNeutronInelastic.cc,v 1.14 2006/06/29 20:29:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiOmegaMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiOmegaMinusInelastic.cc index bdd8064c5d..4d695cf6c4 100644 --- a/source/processes/hadronic/models/high_energy/src/G4HEAntiOmegaMinusInelastic.cc +++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiOmegaMinusInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4HEAntiOmegaMinusInelastic.cc,v 1.14 2006/06/29 20:30:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiProtonInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiProtonInelastic.cc index 8c614e69c1..5b75a39ae5 100644 --- a/source/processes/hadronic/models/high_energy/src/G4HEAntiProtonInelastic.cc +++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiProtonInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4HEAntiProtonInelastic.cc,v 1.13 2006/06/29 20:30:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaMinusInelastic.cc index c152ec8206..6a8cc200e6 100644 --- a/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaMinusInelastic.cc +++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaMinusInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4HEAntiSigmaMinusInelastic.cc,v 1.14 2006/06/29 20:30:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaPlusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaPlusInelastic.cc index 94ab1c3614..cc8122cc54 100644 --- a/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaPlusInelastic.cc +++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaPlusInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4HEAntiSigmaPlusInelastic.cc,v 1.14 2006/06/29 20:30:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaZeroInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaZeroInelastic.cc index b94d80924f..4361a0b759 100644 --- a/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaZeroInelastic.cc +++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaZeroInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4HEAntiSigmaZeroInelastic.cc,v 1.10 2006/06/29 20:30:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiXiMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiXiMinusInelastic.cc index f3029978af..455df7f71b 100644 --- a/source/processes/hadronic/models/high_energy/src/G4HEAntiXiMinusInelastic.cc +++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiXiMinusInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4HEAntiXiMinusInelastic.cc,v 1.14 2006/06/29 20:30:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiXiZeroInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiXiZeroInelastic.cc index 29a3d3c156..be6ce11e95 100644 --- a/source/processes/hadronic/models/high_energy/src/G4HEAntiXiZeroInelastic.cc +++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiXiZeroInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4HEAntiXiZeroInelastic.cc,v 1.14 2006/06/29 20:30:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/processes/hadronic/models/high_energy/src/G4HEKaonMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEKaonMinusInelastic.cc index 3311229511..d5241a4de2 100644 --- a/source/processes/hadronic/models/high_energy/src/G4HEKaonMinusInelastic.cc +++ b/source/processes/hadronic/models/high_energy/src/G4HEKaonMinusInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4HEKaonMinusInelastic.cc,v 1.13 2006/06/29 20:30:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/processes/hadronic/models/high_energy/src/G4HEKaonPlusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEKaonPlusInelastic.cc index 60698432e2..272ac67444 100644 --- a/source/processes/hadronic/models/high_energy/src/G4HEKaonPlusInelastic.cc +++ b/source/processes/hadronic/models/high_energy/src/G4HEKaonPlusInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4HEKaonPlusInelastic.cc,v 1.13 2006/06/29 20:30:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroInelastic.cc index 3914ee478d..e820a5a4fa 100644 --- a/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroInelastic.cc +++ b/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4HEKaonZeroInelastic.cc,v 1.14 2006/06/29 20:30:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroLongInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroLongInelastic.cc index 4ab033869a..942e723b2f 100644 --- a/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroLongInelastic.cc +++ b/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroLongInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4HEKaonZeroLongInelastic.cc,v 1.10 2006/06/29 20:30:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroShortInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroShortInelastic.cc index c6667dddaf..7f32e89a52 100644 --- a/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroShortInelastic.cc +++ b/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroShortInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4HEKaonZeroShortInelastic.cc,v 1.10 2006/06/29 20:30:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/processes/hadronic/models/high_energy/src/G4HELambdaInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HELambdaInelastic.cc index 45cdb4d328..a24a241b25 100644 --- a/source/processes/hadronic/models/high_energy/src/G4HELambdaInelastic.cc +++ b/source/processes/hadronic/models/high_energy/src/G4HELambdaInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4HELambdaInelastic.cc,v 1.14 2006/06/29 20:30:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/processes/hadronic/models/high_energy/src/G4HENeutronInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HENeutronInelastic.cc index 683029cc38..d62b313435 100644 --- a/source/processes/hadronic/models/high_energy/src/G4HENeutronInelastic.cc +++ b/source/processes/hadronic/models/high_energy/src/G4HENeutronInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4HENeutronInelastic.cc,v 1.14 2006/06/29 20:30:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/processes/hadronic/models/high_energy/src/G4HEOmegaMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEOmegaMinusInelastic.cc index ece88933f3..09a9dcaf1e 100644 --- a/source/processes/hadronic/models/high_energy/src/G4HEOmegaMinusInelastic.cc +++ b/source/processes/hadronic/models/high_energy/src/G4HEOmegaMinusInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4HEOmegaMinusInelastic.cc,v 1.14 2006/06/29 20:30:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/processes/hadronic/models/high_energy/src/G4HEPionMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEPionMinusInelastic.cc index d6b4a64d6b..0a05cf489a 100644 --- a/source/processes/hadronic/models/high_energy/src/G4HEPionMinusInelastic.cc +++ b/source/processes/hadronic/models/high_energy/src/G4HEPionMinusInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4HEPionMinusInelastic.cc,v 1.13 2006/06/29 20:30:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/processes/hadronic/models/high_energy/src/G4HEPionPlusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEPionPlusInelastic.cc index bacfa6e775..f56cc5f8f8 100644 --- a/source/processes/hadronic/models/high_energy/src/G4HEPionPlusInelastic.cc +++ b/source/processes/hadronic/models/high_energy/src/G4HEPionPlusInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4HEPionPlusInelastic.cc,v 1.14 2006/06/29 20:30:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/processes/hadronic/models/high_energy/src/G4HEPlot.cc b/source/processes/hadronic/models/high_energy/src/G4HEPlot.cc index b1910bd99b..8ac557d806 100644 --- a/source/processes/hadronic/models/high_energy/src/G4HEPlot.cc +++ b/source/processes/hadronic/models/high_energy/src/G4HEPlot.cc @@ -25,7 +25,7 @@ // // // $Id: G4HEPlot.cc,v 1.11 2006/06/29 20:30:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/processes/hadronic/models/high_energy/src/G4HEProtonInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEProtonInelastic.cc index 3f3f4c3376..620b2c1806 100644 --- a/source/processes/hadronic/models/high_energy/src/G4HEProtonInelastic.cc +++ b/source/processes/hadronic/models/high_energy/src/G4HEProtonInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4HEProtonInelastic.cc,v 1.13 2006/06/29 20:30:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/processes/hadronic/models/high_energy/src/G4HESigmaMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HESigmaMinusInelastic.cc index bf0365e377..49213a0010 100644 --- a/source/processes/hadronic/models/high_energy/src/G4HESigmaMinusInelastic.cc +++ b/source/processes/hadronic/models/high_energy/src/G4HESigmaMinusInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4HESigmaMinusInelastic.cc,v 1.14 2006/06/29 20:30:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/processes/hadronic/models/high_energy/src/G4HESigmaPlusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HESigmaPlusInelastic.cc index 38c74b4ade..c612a9d08f 100644 --- a/source/processes/hadronic/models/high_energy/src/G4HESigmaPlusInelastic.cc +++ b/source/processes/hadronic/models/high_energy/src/G4HESigmaPlusInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4HESigmaPlusInelastic.cc,v 1.14 2006/06/29 20:30:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/processes/hadronic/models/high_energy/src/G4HESigmaZeroInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HESigmaZeroInelastic.cc index 2a67396b46..55e3e5af95 100644 --- a/source/processes/hadronic/models/high_energy/src/G4HESigmaZeroInelastic.cc +++ b/source/processes/hadronic/models/high_energy/src/G4HESigmaZeroInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4HESigmaZeroInelastic.cc,v 1.11 2006/06/29 20:30:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/processes/hadronic/models/high_energy/src/G4HEVector.cc b/source/processes/hadronic/models/high_energy/src/G4HEVector.cc index 1facaeb7d8..22af3c87f2 100644 --- a/source/processes/hadronic/models/high_energy/src/G4HEVector.cc +++ b/source/processes/hadronic/models/high_energy/src/G4HEVector.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4HEVector.cc,v 1.19 2006/06/29 20:30:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4HEVector.cc,v 1.20 2006/11/22 23:52:32 dennis Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // @@ -58,7 +58,7 @@ G4HEVector::G4HEVector(const G4HadProjectile * aParticle) baryon = aParticle->GetDefinition()->GetBaryonNumber(); particleName = getParticleName(code, baryon); particleType = aParticle->GetDefinition()->GetParticleType(); - strangeness = aParticle->GetDefinition()->GetQuarkContent(2); + strangeness = aParticle->GetDefinition()->GetQuarkContent(3); } G4double G4HEVector::Amax(G4double a, G4double b) diff --git a/source/processes/hadronic/models/high_energy/src/G4HEXiMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEXiMinusInelastic.cc index 4fe6adad95..18979d50c3 100644 --- a/source/processes/hadronic/models/high_energy/src/G4HEXiMinusInelastic.cc +++ b/source/processes/hadronic/models/high_energy/src/G4HEXiMinusInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4HEXiMinusInelastic.cc,v 1.14 2006/06/29 20:30:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/processes/hadronic/models/high_energy/src/G4HEXiZeroInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEXiZeroInelastic.cc index 142bd99588..25c9fed80e 100644 --- a/source/processes/hadronic/models/high_energy/src/G4HEXiZeroInelastic.cc +++ b/source/processes/hadronic/models/high_energy/src/G4HEXiZeroInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4HEXiZeroInelastic.cc,v 1.14 2006/06/29 20:30:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/processes/hadronic/models/im_r_matrix/include/G4CollisionInitialState.hh b/source/processes/hadronic/models/im_r_matrix/include/G4CollisionInitialState.hh index 3afc62dbab..1958034033 100644 --- a/source/processes/hadronic/models/im_r_matrix/include/G4CollisionInitialState.hh +++ b/source/processes/hadronic/models/im_r_matrix/include/G4CollisionInitialState.hh @@ -25,7 +25,7 @@ // // // $Id: G4CollisionInitialState.hh,v 1.4.4.2 2006/06/29 20:31:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // $Id: G4CollisionInitialState.hh,v 1.0 1998/06/30 // ----------------------------------------------------------------------------- diff --git a/source/processes/hadronic/models/im_r_matrix/include/G4ListOfCollisions.hh b/source/processes/hadronic/models/im_r_matrix/include/G4ListOfCollisions.hh index 8125d892d7..4414ca4ec3 100644 --- a/source/processes/hadronic/models/im_r_matrix/include/G4ListOfCollisions.hh +++ b/source/processes/hadronic/models/im_r_matrix/include/G4ListOfCollisions.hh @@ -25,7 +25,7 @@ // // // $Id: G4ListOfCollisions.hh,v 1.1.4.2 2006/06/29 20:35:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // $Id: G4ListOfCollisions.hh,v 1.0 1998/06/30 // ----------------------------------------------------------------------------- diff --git a/source/processes/hadronic/models/im_r_matrix/include/G4VCrossSectionSource.hh b/source/processes/hadronic/models/im_r_matrix/include/G4VCrossSectionSource.hh index ca81ff8073..60092e0fa7 100644 --- a/source/processes/hadronic/models/im_r_matrix/include/G4VCrossSectionSource.hh +++ b/source/processes/hadronic/models/im_r_matrix/include/G4VCrossSectionSource.hh @@ -72,16 +72,16 @@ protected: const G4KineticTrack& trk2) const; // Parameterisation - const G4double FcrossX(G4double e, G4double e0, G4double sigma, - G4double eParam, G4double power) const; + G4double FcrossX(G4double e, G4double e0, G4double sigma, + G4double eParam, G4double power) const; G4String FindKeyParticle(const G4KineticTrack& trk1,const G4KineticTrack& trk2) const; // Transverse pion mass - const G4double GetTransversePionMass() const; + G4double GetTransversePionMass() const; // Min string mass - const G4double GetMinStringMass() const; + G4double GetMinStringMass() const; private: diff --git a/source/processes/hadronic/models/im_r_matrix/include/G4XAnnihilationChannel.hh b/source/processes/hadronic/models/im_r_matrix/include/G4XAnnihilationChannel.hh index a50a38282c..f822019623 100644 --- a/source/processes/hadronic/models/im_r_matrix/include/G4XAnnihilationChannel.hh +++ b/source/processes/hadronic/models/im_r_matrix/include/G4XAnnihilationChannel.hh @@ -75,17 +75,17 @@ private: G4XAnnihilationChannel(const G4XAnnihilationChannel &right); const G4XAnnihilationChannel& operator=(const G4XAnnihilationChannel &right); - const G4double Branch(const G4KineticTrack& trk1, - const G4KineticTrack& trk2) const; + G4double Branch(const G4KineticTrack& trk1, + const G4KineticTrack& trk2) const; - const G4double VariableWidth(const G4KineticTrack& trk1, - const G4KineticTrack& trk2) const; + G4double VariableWidth(const G4KineticTrack& trk1, + const G4KineticTrack& trk2) const; - const G4double VariablePartialWidth(const G4KineticTrack& trk1, - const G4KineticTrack& trk2) const; + G4double VariablePartialWidth(const G4KineticTrack& trk1, + const G4KineticTrack& trk2) const; - const G4double NormalizedClebsch(const G4KineticTrack& trk1, - const G4KineticTrack& trk2) const; + G4double NormalizedClebsch(const G4KineticTrack& trk1, + const G4KineticTrack& trk2) const; G4double lowLimit; G4double highLimit; diff --git a/source/processes/hadronic/models/im_r_matrix/src/G4VCrossSectionSource.cc b/source/processes/hadronic/models/im_r_matrix/src/G4VCrossSectionSource.cc index 76a196cb1a..0a03cccdfd 100644 --- a/source/processes/hadronic/models/im_r_matrix/src/G4VCrossSectionSource.cc +++ b/source/processes/hadronic/models/im_r_matrix/src/G4VCrossSectionSource.cc @@ -23,7 +23,7 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4VCrossSectionSource.cc,v 1.4 2006/06/29 20:41:51 gunter Exp $ // +// $Id: G4VCrossSectionSource.cc,v 1.5 2006/08/19 21:50:47 dennis Exp $ // // #include "globals.hh" @@ -170,8 +170,8 @@ const G4ParticleDefinition* G4VCrossSectionSource::FindLightParticle(const G4Kin } -const G4double G4VCrossSectionSource::FcrossX(G4double e, G4double e0, G4double sigma, - G4double eParam, G4double power) const +G4double G4VCrossSectionSource::FcrossX(G4double e, G4double e0, + G4double sigma, G4double eParam, G4double power) const { G4double result = 0.; @@ -184,7 +184,7 @@ const G4double G4VCrossSectionSource::FcrossX(G4double e, G4double e0, G4double return result; } -const G4double G4VCrossSectionSource::GetTransversePionMass() const +G4double G4VCrossSectionSource::GetTransversePionMass() const { // Parameter from UrQMD const G4double transversePionMass = 0.3 * GeV; @@ -192,7 +192,7 @@ const G4double G4VCrossSectionSource::GetTransversePionMass() const } -const G4double G4VCrossSectionSource::GetMinStringMass() const +G4double G4VCrossSectionSource::GetMinStringMass() const { // Parameter from UrQMD const G4double minStringMass = 0.52 * GeV; diff --git a/source/processes/hadronic/models/im_r_matrix/src/G4XAnnihilationChannel.cc b/source/processes/hadronic/models/im_r_matrix/src/G4XAnnihilationChannel.cc index 4a4e937d1e..cd67fd3248 100644 --- a/source/processes/hadronic/models/im_r_matrix/src/G4XAnnihilationChannel.cc +++ b/source/processes/hadronic/models/im_r_matrix/src/G4XAnnihilationChannel.cc @@ -141,16 +141,16 @@ G4bool G4XAnnihilationChannel::IsValid(G4double e) const } -const G4double G4XAnnihilationChannel::Branch(const G4KineticTrack& trk1, - const G4KineticTrack& trk2) const +G4double G4XAnnihilationChannel::Branch(const G4KineticTrack& trk1, + const G4KineticTrack& trk2) const { G4double w=VariableWidth(trk1,trk2); if(w==0) return 0; return VariablePartialWidth(trk1,trk2) / VariableWidth(trk1,trk2); } -const G4double G4XAnnihilationChannel::VariableWidth(const G4KineticTrack& trk1, - const G4KineticTrack& trk2) const +G4double G4XAnnihilationChannel::VariableWidth(const G4KineticTrack& trk1, + const G4KineticTrack& trk2) const { // actual production width of resonance, depending on available energy. @@ -165,8 +165,8 @@ const G4double G4XAnnihilationChannel::VariableWidth(const G4KineticTrack& trk1, } -const G4double G4XAnnihilationChannel::VariablePartialWidth(const G4KineticTrack& trk1, - const G4KineticTrack& trk2) const +G4double G4XAnnihilationChannel::VariablePartialWidth(const G4KineticTrack& trk1, + const G4KineticTrack& trk2) const { // Calculate mass dependent partial width of resonance, // based on UrQMD tabulations @@ -188,8 +188,8 @@ const G4double G4XAnnihilationChannel::VariablePartialWidth(const G4KineticTrack } -const G4double G4XAnnihilationChannel::NormalizedClebsch(const G4KineticTrack& trk1, - const G4KineticTrack& trk2) const +G4double G4XAnnihilationChannel::NormalizedClebsch(const G4KineticTrack& trk1, + const G4KineticTrack& trk2) const { G4double cleb = 0.; G4ParticleDefinition* def1 = trk1.GetDefinition(); diff --git a/source/processes/hadronic/models/leading_particle/include/G4Mars5GeV.hh b/source/processes/hadronic/models/leading_particle/include/G4Mars5GeV.hh index cc89c9fd1a..d70e938bf4 100644 --- a/source/processes/hadronic/models/leading_particle/include/G4Mars5GeV.hh +++ b/source/processes/hadronic/models/leading_particle/include/G4Mars5GeV.hh @@ -25,7 +25,7 @@ // // // $Id: G4Mars5GeV.hh,v 1.5 2006/06/29 20:43:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/processes/hadronic/models/leading_particle/src/G4Mars5GeV.cc b/source/processes/hadronic/models/leading_particle/src/G4Mars5GeV.cc index c3449412ea..cd5f5b113b 100644 --- a/source/processes/hadronic/models/leading_particle/src/G4Mars5GeV.cc +++ b/source/processes/hadronic/models/leading_particle/src/G4Mars5GeV.cc @@ -25,7 +25,7 @@ // // // $Id: G4Mars5GeV.cc,v 1.14 2006/06/29 20:43:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/processes/hadronic/models/low_energy/include/G4LCapture.hh b/source/processes/hadronic/models/low_energy/include/G4LCapture.hh index 7736f46f9c..9610033b7a 100644 --- a/source/processes/hadronic/models/low_energy/include/G4LCapture.hh +++ b/source/processes/hadronic/models/low_energy/include/G4LCapture.hh @@ -25,7 +25,7 @@ // // // $Id: G4LCapture.hh,v 1.11 2006/06/29 20:43:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Low energy model: neutron capture -- header file diff --git a/source/processes/hadronic/models/low_energy/include/G4LEAlphaInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEAlphaInelastic.hh index 7ab2d9a383..a671fa6423 100644 --- a/source/processes/hadronic/models/low_energy/include/G4LEAlphaInelastic.hh +++ b/source/processes/hadronic/models/low_energy/include/G4LEAlphaInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4LEAlphaInelastic.hh,v 1.9 2006/06/29 20:43:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Low Energy Alpha Inelastic Process // J.L. Chuma, TRIUMF, 21-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/include/G4LEAntiKaonZeroInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEAntiKaonZeroInelastic.hh index 68d64e16af..c5dc48dd17 100644 --- a/source/processes/hadronic/models/low_energy/include/G4LEAntiKaonZeroInelastic.hh +++ b/source/processes/hadronic/models/low_energy/include/G4LEAntiKaonZeroInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4LEAntiKaonZeroInelastic.hh,v 1.6 2006/06/29 20:43:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Low Energy KaonZeroL Inelastic Process // J.L. Chuma, TRIUMF, 12-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/include/G4LEAntiLambdaInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEAntiLambdaInelastic.hh index 79d79c9664..0cd216904b 100644 --- a/source/processes/hadronic/models/low_energy/include/G4LEAntiLambdaInelastic.hh +++ b/source/processes/hadronic/models/low_energy/include/G4LEAntiLambdaInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4LEAntiLambdaInelastic.hh,v 1.10 2006/06/29 20:43:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Low Energy AntiLambda Inelastic Process // J.L. Chuma, TRIUMF, 19-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/include/G4LEAntiNeutronInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEAntiNeutronInelastic.hh index 55cb5da9e7..70f8774ff1 100644 --- a/source/processes/hadronic/models/low_energy/include/G4LEAntiNeutronInelastic.hh +++ b/source/processes/hadronic/models/low_energy/include/G4LEAntiNeutronInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4LEAntiNeutronInelastic.hh,v 1.10 2006/06/29 20:43:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Low Energy AntiNeutron Inelastic Process // J.L. Chuma, TRIUMF, 19-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/include/G4LEAntiOmegaMinusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEAntiOmegaMinusInelastic.hh index c36e6ee43b..d5a6a2fc47 100644 --- a/source/processes/hadronic/models/low_energy/include/G4LEAntiOmegaMinusInelastic.hh +++ b/source/processes/hadronic/models/low_energy/include/G4LEAntiOmegaMinusInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4LEAntiOmegaMinusInelastic.hh,v 1.10 2006/06/29 20:43:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Low Energy AntiOmegaMinus Inelastic Process // J.L. Chuma, TRIUMF, 19-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/include/G4LEAntiProtonInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEAntiProtonInelastic.hh index 9f1a813356..6ab3a4d50d 100644 --- a/source/processes/hadronic/models/low_energy/include/G4LEAntiProtonInelastic.hh +++ b/source/processes/hadronic/models/low_energy/include/G4LEAntiProtonInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4LEAntiProtonInelastic.hh,v 1.10 2006/06/29 20:43:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Low Energy AntiProton Inelastic Process // J.L. Chuma, TRIUMF, 19-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/include/G4LEAntiSigmaMinusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEAntiSigmaMinusInelastic.hh index 7d89201921..3cce887313 100644 --- a/source/processes/hadronic/models/low_energy/include/G4LEAntiSigmaMinusInelastic.hh +++ b/source/processes/hadronic/models/low_energy/include/G4LEAntiSigmaMinusInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4LEAntiSigmaMinusInelastic.hh,v 1.10 2006/06/29 20:43:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Low Energy AntiSigmaMinus Inelastic Process // J.L. Chuma, TRIUMF, 19-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/include/G4LEAntiSigmaPlusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEAntiSigmaPlusInelastic.hh index 3edba054d1..e422e8c43a 100644 --- a/source/processes/hadronic/models/low_energy/include/G4LEAntiSigmaPlusInelastic.hh +++ b/source/processes/hadronic/models/low_energy/include/G4LEAntiSigmaPlusInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4LEAntiSigmaPlusInelastic.hh,v 1.10 2006/06/29 20:43:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Low Energy AntiSigmaPlus Inelastic Process // J.L. Chuma, TRIUMF, 19-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/include/G4LEAntiXiMinusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEAntiXiMinusInelastic.hh index 02b768f61b..658662b9b5 100644 --- a/source/processes/hadronic/models/low_energy/include/G4LEAntiXiMinusInelastic.hh +++ b/source/processes/hadronic/models/low_energy/include/G4LEAntiXiMinusInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4LEAntiXiMinusInelastic.hh,v 1.10 2006/06/29 20:43:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Low Energy AntiXiMinus Inelastic Process // J.L. Chuma, TRIUMF, 19-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/include/G4LEAntiXiZeroInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEAntiXiZeroInelastic.hh index 3b45eff652..38d79afb32 100644 --- a/source/processes/hadronic/models/low_energy/include/G4LEAntiXiZeroInelastic.hh +++ b/source/processes/hadronic/models/low_energy/include/G4LEAntiXiZeroInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4LEAntiXiZeroInelastic.hh,v 1.10 2006/06/29 20:43:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Low Energy AntiXiZero Inelastic Process // J.L. Chuma, TRIUMF, 19-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/include/G4LEDeuteronInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEDeuteronInelastic.hh index d89b4a95d5..a2a177b3b2 100644 --- a/source/processes/hadronic/models/low_energy/include/G4LEDeuteronInelastic.hh +++ b/source/processes/hadronic/models/low_energy/include/G4LEDeuteronInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4LEDeuteronInelastic.hh,v 1.9 2006/06/29 20:43:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Low Energy Deuteron Inelastic Process // J.L. Chuma, TRIUMF, 25-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/include/G4LEKaonMinusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEKaonMinusInelastic.hh index 5132d3a57a..27cf36547f 100644 --- a/source/processes/hadronic/models/low_energy/include/G4LEKaonMinusInelastic.hh +++ b/source/processes/hadronic/models/low_energy/include/G4LEKaonMinusInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4LEKaonMinusInelastic.hh,v 1.10 2006/06/29 20:43:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Low Energy KaonMinus Inelastic Process // J.L. Chuma, TRIUMF, 12-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/include/G4LEKaonPlusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEKaonPlusInelastic.hh index 7e7b69ad11..27b4fb4207 100644 --- a/source/processes/hadronic/models/low_energy/include/G4LEKaonPlusInelastic.hh +++ b/source/processes/hadronic/models/low_energy/include/G4LEKaonPlusInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4LEKaonPlusInelastic.hh,v 1.10 2006/06/29 20:43:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Low Energy KaonPlus Inelastic Process // J.L. Chuma, TRIUMF, 12-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroInelastic.hh index 98cb5366a1..8fb311cde5 100644 --- a/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroInelastic.hh +++ b/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4LEKaonZeroInelastic.hh,v 1.6 2006/06/29 20:43:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Low Energy KaonZeroS Inelastic Process // J.L. Chuma, TRIUMF, 12-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroLInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroLInelastic.hh index 0e237ab1c2..a8d40985cd 100644 --- a/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroLInelastic.hh +++ b/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroLInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4LEKaonZeroLInelastic.hh,v 1.11 2006/06/29 20:43:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha High Energy model class -- header file diff --git a/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroSInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroSInelastic.hh index 9157a35161..499ba7a12e 100644 --- a/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroSInelastic.hh +++ b/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroSInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4LEKaonZeroSInelastic.hh,v 1.11 2006/06/29 20:43:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Gheisha High Energy model class -- header file diff --git a/source/processes/hadronic/models/low_energy/include/G4LELambdaInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LELambdaInelastic.hh index 8cd74cb8c0..a8d2a7be30 100644 --- a/source/processes/hadronic/models/low_energy/include/G4LELambdaInelastic.hh +++ b/source/processes/hadronic/models/low_energy/include/G4LELambdaInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4LELambdaInelastic.hh,v 1.10 2006/06/29 20:44:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Low Energy Lambda Inelastic Process // J.L. Chuma, TRIUMF, 18-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/include/G4LEOmegaMinusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEOmegaMinusInelastic.hh index b82d765da6..572ed85f1e 100644 --- a/source/processes/hadronic/models/low_energy/include/G4LEOmegaMinusInelastic.hh +++ b/source/processes/hadronic/models/low_energy/include/G4LEOmegaMinusInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4LEOmegaMinusInelastic.hh,v 1.10 2006/06/29 20:44:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Low Energy OmegaMinus Inelastic Process // J.L. Chuma, TRIUMF, 19-Nov-1996 diff --git a/source/processes/hadronic/models/low_energy/include/G4LEPionMinusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEPionMinusInelastic.hh index 37048c9577..355d7434a9 100644 --- a/source/processes/hadronic/models/low_energy/include/G4LEPionMinusInelastic.hh +++ b/source/processes/hadronic/models/low_energy/include/G4LEPionMinusInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4LEPionMinusInelastic.hh,v 1.11 2006/06/29 20:44:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Low Energy PionMinus Inelastic Process // original by J.L. Chuma, TRIUMF, 03-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/include/G4LEPionPlusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEPionPlusInelastic.hh index 0bf2b3c481..5ca51a05de 100644 --- a/source/processes/hadronic/models/low_energy/include/G4LEPionPlusInelastic.hh +++ b/source/processes/hadronic/models/low_energy/include/G4LEPionPlusInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4LEPionPlusInelastic.hh,v 1.11 2006/06/29 20:44:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Low Energy PionPlus Inelastic Process // J.L. Chuma, TRIUMF, 19-Nov-1996 diff --git a/source/processes/hadronic/models/low_energy/include/G4LEProtonInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEProtonInelastic.hh index 3450fb25df..c7adf24c47 100644 --- a/source/processes/hadronic/models/low_energy/include/G4LEProtonInelastic.hh +++ b/source/processes/hadronic/models/low_energy/include/G4LEProtonInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4LEProtonInelastic.hh,v 1.11 2006/06/29 20:44:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Low Energy Proton Inelastic Process // original by H.P. Wellisch diff --git a/source/processes/hadronic/models/low_energy/include/G4LESigmaMinusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LESigmaMinusInelastic.hh index 79653b275d..eb5ae65205 100644 --- a/source/processes/hadronic/models/low_energy/include/G4LESigmaMinusInelastic.hh +++ b/source/processes/hadronic/models/low_energy/include/G4LESigmaMinusInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4LESigmaMinusInelastic.hh,v 1.10 2006/06/29 20:44:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Low Energy SigmaMinus Inelastic Process // original by J.L. Chuma, TRIUMF, 03-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/include/G4LESigmaPlusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LESigmaPlusInelastic.hh index c16a316ad1..c36ea6f04a 100644 --- a/source/processes/hadronic/models/low_energy/include/G4LESigmaPlusInelastic.hh +++ b/source/processes/hadronic/models/low_energy/include/G4LESigmaPlusInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4LESigmaPlusInelastic.hh,v 1.10 2006/06/29 20:44:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Low Energy SigmaPlus Inelastic Process // original by J.L. Chuma, TRIUMF, 03-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/include/G4LETritonInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LETritonInelastic.hh index e9bef0b7a2..93d00caa04 100644 --- a/source/processes/hadronic/models/low_energy/include/G4LETritonInelastic.hh +++ b/source/processes/hadronic/models/low_energy/include/G4LETritonInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4LETritonInelastic.hh,v 1.9 2006/06/29 20:44:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Low Energy Triton Inelastic Process // J.L. Chuma, TRIUMF, 25-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/include/G4LEXiMinusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEXiMinusInelastic.hh index ce9ac381f4..4077891054 100644 --- a/source/processes/hadronic/models/low_energy/include/G4LEXiMinusInelastic.hh +++ b/source/processes/hadronic/models/low_energy/include/G4LEXiMinusInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4LEXiMinusInelastic.hh,v 1.10 2006/06/29 20:44:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Low Energy XiMinus Inelastic Process // original by J.L. Chuma, TRIUMF, 03-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/include/G4LEXiZeroInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEXiZeroInelastic.hh index ecbda13d04..ec8d3e90f2 100644 --- a/source/processes/hadronic/models/low_energy/include/G4LEXiZeroInelastic.hh +++ b/source/processes/hadronic/models/low_energy/include/G4LEXiZeroInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4LEXiZeroInelastic.hh,v 1.10 2006/06/29 20:44:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Low Energy XiZero Inelastic Process // original by J.L. Chuma, TRIUMF, 03-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/include/G4LElastic.hh b/source/processes/hadronic/models/low_energy/include/G4LElastic.hh index 70eecd05f3..67224e21b9 100644 --- a/source/processes/hadronic/models/low_energy/include/G4LElastic.hh +++ b/source/processes/hadronic/models/low_energy/include/G4LElastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4LElastic.hh,v 1.11 2006/06/29 20:44:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Model: Low energy elastic scattering -- header file diff --git a/source/processes/hadronic/models/low_energy/include/G4LFission.hh b/source/processes/hadronic/models/low_energy/include/G4LFission.hh index cada321724..0ce9686946 100644 --- a/source/processes/hadronic/models/low_energy/include/G4LFission.hh +++ b/source/processes/hadronic/models/low_energy/include/G4LFission.hh @@ -25,7 +25,7 @@ // // // $Id: G4LFission.hh,v 1.11 2006/06/29 20:44:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Low-energy Model: Fission -- header file diff --git a/source/processes/hadronic/models/low_energy/src/G4LCapture.cc b/source/processes/hadronic/models/low_energy/src/G4LCapture.cc index a9294fca69..36c4b57d75 100644 --- a/source/processes/hadronic/models/low_energy/src/G4LCapture.cc +++ b/source/processes/hadronic/models/low_energy/src/G4LCapture.cc @@ -25,7 +25,7 @@ // // // $Id: G4LCapture.cc,v 1.13 2006/06/29 20:44:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Model: Low-energy Neutron Capture diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiKaonZeroInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiKaonZeroInelastic.cc index 661c8c5126..a97906863f 100644 --- a/source/processes/hadronic/models/low_energy/src/G4LEAntiKaonZeroInelastic.cc +++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiKaonZeroInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4LEAntiKaonZeroInelastic.cc,v 1.10 2006/06/29 20:44:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Low Energy KaonZeroLong Inelastic Process // J.L. Chuma, TRIUMF, 11-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiLambdaInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiLambdaInelastic.cc index 263adaf6b2..9065eba1cb 100644 --- a/source/processes/hadronic/models/low_energy/src/G4LEAntiLambdaInelastic.cc +++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiLambdaInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4LEAntiLambdaInelastic.cc,v 1.11 2006/06/29 20:44:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: AntiLambda Inelastic Process // J.L. Chuma, TRIUMF, 19-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiNeutronInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiNeutronInelastic.cc index 8e12c80efd..816bc6c20a 100644 --- a/source/processes/hadronic/models/low_energy/src/G4LEAntiNeutronInelastic.cc +++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiNeutronInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4LEAntiNeutronInelastic.cc,v 1.14 2006/06/29 20:44:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: AntiNeutron Inelastic Process // J.L. Chuma, TRIUMF, 18-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiOmegaMinusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiOmegaMinusInelastic.cc index e9832b22d4..12cb2c17ca 100644 --- a/source/processes/hadronic/models/low_energy/src/G4LEAntiOmegaMinusInelastic.cc +++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiOmegaMinusInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4LEAntiOmegaMinusInelastic.cc,v 1.12 2006/06/29 20:44:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: AntiOmegaMinus Inelastic Process // J.L. Chuma, TRIUMF, 20-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiProtonInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiProtonInelastic.cc index c13272c615..ece712a4dc 100644 --- a/source/processes/hadronic/models/low_energy/src/G4LEAntiProtonInelastic.cc +++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiProtonInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4LEAntiProtonInelastic.cc,v 1.14 2006/06/29 20:44:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: AntiProton Inelastic Process // J.L. Chuma, TRIUMF, 13-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaMinusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaMinusInelastic.cc index a0f8df9bb9..140ebb913f 100644 --- a/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaMinusInelastic.cc +++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaMinusInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4LEAntiSigmaMinusInelastic.cc,v 1.11 2006/06/29 20:44:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: AntiSigmaMinus Inelastic Process // J.L. Chuma, TRIUMF, 19-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaPlusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaPlusInelastic.cc index 00e1750422..9620774d1e 100644 --- a/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaPlusInelastic.cc +++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaPlusInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4LEAntiSigmaPlusInelastic.cc,v 1.11 2006/06/29 20:44:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: AntiSigmaPlus Inelastic Process // J.L. Chuma, TRIUMF, 19-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiXiMinusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiXiMinusInelastic.cc index 6bfd0d79ec..09f4a97b44 100644 --- a/source/processes/hadronic/models/low_energy/src/G4LEAntiXiMinusInelastic.cc +++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiXiMinusInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4LEAntiXiMinusInelastic.cc,v 1.11 2006/06/29 20:44:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: AntiXiMinus Inelastic Process // J.L. Chuma, TRIUMF, 20-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiXiZeroInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiXiZeroInelastic.cc index 3ddceb2c77..2a55995f77 100644 --- a/source/processes/hadronic/models/low_energy/src/G4LEAntiXiZeroInelastic.cc +++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiXiZeroInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4LEAntiXiZeroInelastic.cc,v 1.11 2006/06/29 20:44:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: AntiXiZero Inelastic Process // J.L. Chuma, TRIUMF, 20-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/src/G4LEKaonMinusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEKaonMinusInelastic.cc index 85abcba765..8b40f4de76 100644 --- a/source/processes/hadronic/models/low_energy/src/G4LEKaonMinusInelastic.cc +++ b/source/processes/hadronic/models/low_energy/src/G4LEKaonMinusInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4LEKaonMinusInelastic.cc,v 1.15 2006/06/29 20:44:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Low Energy KaonMinus Inelastic Process // J.L. Chuma, TRIUMF, 12-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/src/G4LEKaonPlusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEKaonPlusInelastic.cc index 32baed5a4f..584270226c 100644 --- a/source/processes/hadronic/models/low_energy/src/G4LEKaonPlusInelastic.cc +++ b/source/processes/hadronic/models/low_energy/src/G4LEKaonPlusInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4LEKaonPlusInelastic.cc,v 1.13 2006/06/29 20:45:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Low Energy KaonPlus Inelastic Process // J.L. Chuma, TRIUMF, 05-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroInelastic.cc index 2540d9aa8f..4c7a40dd59 100644 --- a/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroInelastic.cc +++ b/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4LEKaonZeroInelastic.cc,v 1.9 2006/06/29 20:45:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Low Energy KaonZeroShort Inelastic Process // J.L. Chuma, TRIUMF, 11-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/src/G4LELambdaInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LELambdaInelastic.cc index 051dbbf7a6..27d9d3a0b2 100644 --- a/source/processes/hadronic/models/low_energy/src/G4LELambdaInelastic.cc +++ b/source/processes/hadronic/models/low_energy/src/G4LELambdaInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4LELambdaInelastic.cc,v 1.11 2006/06/29 20:45:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Lambda Inelastic Process // J.L. Chuma, TRIUMF, 18-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/src/G4LEOmegaMinusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEOmegaMinusInelastic.cc index 376287a7c4..4ac32f62f3 100644 --- a/source/processes/hadronic/models/low_energy/src/G4LEOmegaMinusInelastic.cc +++ b/source/processes/hadronic/models/low_energy/src/G4LEOmegaMinusInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4LEOmegaMinusInelastic.cc,v 1.12 2006/06/29 20:45:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: OmegaMinus Inelastic Process // J.L. Chuma, TRIUMF, 20-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/src/G4LEPionPlusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEPionPlusInelastic.cc index a75f7658bb..7da4295926 100644 --- a/source/processes/hadronic/models/low_energy/src/G4LEPionPlusInelastic.cc +++ b/source/processes/hadronic/models/low_energy/src/G4LEPionPlusInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4LEPionPlusInelastic.cc,v 1.14 2006/06/29 20:45:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: PionPlus Inelastic Process // J.L. Chuma, TRIUMF, 19-Nov-1996 diff --git a/source/processes/hadronic/models/low_energy/src/G4LESigmaMinusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LESigmaMinusInelastic.cc index 8cdb7bff65..b2e1e51b50 100644 --- a/source/processes/hadronic/models/low_energy/src/G4LESigmaMinusInelastic.cc +++ b/source/processes/hadronic/models/low_energy/src/G4LESigmaMinusInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4LESigmaMinusInelastic.cc,v 1.11 2006/06/29 20:45:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: SigmaMinus Inelastic Process // J.L. Chuma, TRIUMF, 19-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/src/G4LESigmaPlusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LESigmaPlusInelastic.cc index 7d60c2cf41..3eb95ab9fd 100644 --- a/source/processes/hadronic/models/low_energy/src/G4LESigmaPlusInelastic.cc +++ b/source/processes/hadronic/models/low_energy/src/G4LESigmaPlusInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4LESigmaPlusInelastic.cc,v 1.11 2006/06/29 20:45:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: SigmaPlus Inelastic Process // J.L. Chuma, TRIUMF, 19-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/src/G4LEXiMinusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEXiMinusInelastic.cc index 7e51481095..112e1867cf 100644 --- a/source/processes/hadronic/models/low_energy/src/G4LEXiMinusInelastic.cc +++ b/source/processes/hadronic/models/low_energy/src/G4LEXiMinusInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4LEXiMinusInelastic.cc,v 1.11 2006/06/29 20:45:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: XiMinus Inelastic Process // J.L. Chuma, TRIUMF, 20-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/src/G4LEXiZeroInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEXiZeroInelastic.cc index dc3a56e48c..cc67a42010 100644 --- a/source/processes/hadronic/models/low_energy/src/G4LEXiZeroInelastic.cc +++ b/source/processes/hadronic/models/low_energy/src/G4LEXiZeroInelastic.cc @@ -25,7 +25,7 @@ // // // $Id: G4LEXiZeroInelastic.cc,v 1.11 2006/06/29 20:45:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: XiZero Inelastic Process // J.L. Chuma, TRIUMF, 20-Feb-1997 diff --git a/source/processes/hadronic/models/low_energy/src/G4LFission.cc b/source/processes/hadronic/models/low_energy/src/G4LFission.cc index 51a746a682..d2084ae5ef 100644 --- a/source/processes/hadronic/models/low_energy/src/G4LFission.cc +++ b/source/processes/hadronic/models/low_energy/src/G4LFission.cc @@ -25,7 +25,7 @@ // // // $Id: G4LFission.cc,v 1.13 2006/06/29 20:45:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4 Model: Low Energy Fission diff --git a/source/processes/hadronic/models/management/include/G4HadronicInteraction.hh b/source/processes/hadronic/models/management/include/G4HadronicInteraction.hh index 7a5fba6ea0..12a11957d3 100644 --- a/source/processes/hadronic/models/management/include/G4HadronicInteraction.hh +++ b/source/processes/hadronic/models/management/include/G4HadronicInteraction.hh @@ -25,7 +25,7 @@ // // // $Id: G4HadronicInteraction.hh,v 1.7 2006/06/29 20:45:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Interaction abstract base class // This class is the base class for the model classes. diff --git a/source/processes/hadronic/models/management/include/G4InelasticInteraction.hh b/source/processes/hadronic/models/management/include/G4InelasticInteraction.hh index 02e87c201b..2e027fd934 100644 --- a/source/processes/hadronic/models/management/include/G4InelasticInteraction.hh +++ b/source/processes/hadronic/models/management/include/G4InelasticInteraction.hh @@ -25,7 +25,7 @@ // // // $Id: G4InelasticInteraction.hh,v 1.4 2006/06/29 20:45:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Inelastic Interaction // This class is an abstract base class, since the pure virtual diff --git a/source/processes/hadronic/models/management/include/G4V3DNucleus.hh b/source/processes/hadronic/models/management/include/G4V3DNucleus.hh index 55458d261f..5892381016 100644 --- a/source/processes/hadronic/models/management/include/G4V3DNucleus.hh +++ b/source/processes/hadronic/models/management/include/G4V3DNucleus.hh @@ -25,7 +25,7 @@ // // // $Id: G4V3DNucleus.hh,v 1.5 2006/06/29 20:45:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4V3DNucleus_h #define G4V3DNucleus_h 1 diff --git a/source/processes/hadronic/models/management/include/G4VHighEnergyGenerator.hh b/source/processes/hadronic/models/management/include/G4VHighEnergyGenerator.hh index 74e8850e6d..95cb382128 100644 --- a/source/processes/hadronic/models/management/include/G4VHighEnergyGenerator.hh +++ b/source/processes/hadronic/models/management/include/G4VHighEnergyGenerator.hh @@ -25,7 +25,7 @@ // // // $Id: G4VHighEnergyGenerator.hh,v 1.4 2006/06/29 20:45:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VHighEnergyGenerator_h #define G4VHighEnergyGenerator_h 1 diff --git a/source/processes/hadronic/models/management/include/G4VIntraNuclearTransportModel.hh b/source/processes/hadronic/models/management/include/G4VIntraNuclearTransportModel.hh index d50a234467..60a010daf1 100644 --- a/source/processes/hadronic/models/management/include/G4VIntraNuclearTransportModel.hh +++ b/source/processes/hadronic/models/management/include/G4VIntraNuclearTransportModel.hh @@ -25,7 +25,7 @@ // // // $Id: G4VIntraNuclearTransportModel.hh,v 1.3 2006/06/29 20:45:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // $Id: G4IntraNuclearTransportMode.hh,v 1.0 1998/06/30 // ----------------------------------------------------------------------------- diff --git a/source/processes/hadronic/models/management/include/G4VKineticNucleon.hh b/source/processes/hadronic/models/management/include/G4VKineticNucleon.hh index 297229c72f..0b16c33ed5 100644 --- a/source/processes/hadronic/models/management/include/G4VKineticNucleon.hh +++ b/source/processes/hadronic/models/management/include/G4VKineticNucleon.hh @@ -25,7 +25,7 @@ // // // $Id: G4VKineticNucleon.hh,v 1.4 2006/06/29 20:45:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VKineticNucleon_h #define G4VKineticNucleon_h 1 diff --git a/source/processes/hadronic/models/management/include/G4VNuclearDensity.hh b/source/processes/hadronic/models/management/include/G4VNuclearDensity.hh index 0aa0bedaf5..2d60e443dc 100644 --- a/source/processes/hadronic/models/management/include/G4VNuclearDensity.hh +++ b/source/processes/hadronic/models/management/include/G4VNuclearDensity.hh @@ -25,7 +25,7 @@ // // // $Id: G4VNuclearDensity.hh,v 1.4 2006/06/29 20:45:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VNuclearDensity_h #define G4VNuclearDensity_h 1 diff --git a/source/processes/hadronic/models/management/include/G4VPreCompoundModel.hh b/source/processes/hadronic/models/management/include/G4VPreCompoundModel.hh index 8b46253e32..bbab07dcef 100644 --- a/source/processes/hadronic/models/management/include/G4VPreCompoundModel.hh +++ b/source/processes/hadronic/models/management/include/G4VPreCompoundModel.hh @@ -25,7 +25,7 @@ // // // $Id: G4VPreCompoundModel.hh,v 1.4 2006/06/29 20:45:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VPreCompoundModel_h diff --git a/source/processes/hadronic/models/management/src/G4V3DNucleus.cc b/source/processes/hadronic/models/management/src/G4V3DNucleus.cc index 5003ff1be6..df1825fd94 100644 --- a/source/processes/hadronic/models/management/src/G4V3DNucleus.cc +++ b/source/processes/hadronic/models/management/src/G4V3DNucleus.cc @@ -25,7 +25,7 @@ // // // $Id: G4V3DNucleus.cc,v 1.5 2006/06/29 20:45:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4V3DNucleus.hh" #include "G4HadronicException.hh" diff --git a/source/processes/hadronic/models/management/src/G4VHighEnergyGenerator.cc b/source/processes/hadronic/models/management/src/G4VHighEnergyGenerator.cc index c5ec3b5bbd..e1c11eb353 100644 --- a/source/processes/hadronic/models/management/src/G4VHighEnergyGenerator.cc +++ b/source/processes/hadronic/models/management/src/G4VHighEnergyGenerator.cc @@ -25,7 +25,7 @@ // // // $Id: G4VHighEnergyGenerator.cc,v 1.5 2006/06/29 20:46:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VHighEnergyGenerator #include "G4VHighEnergyGenerator.hh" diff --git a/source/processes/hadronic/models/management/src/G4VIntraNuclearTransportModel.cc b/source/processes/hadronic/models/management/src/G4VIntraNuclearTransportModel.cc index 877b24a49a..30e070fe66 100644 --- a/source/processes/hadronic/models/management/src/G4VIntraNuclearTransportModel.cc +++ b/source/processes/hadronic/models/management/src/G4VIntraNuclearTransportModel.cc @@ -25,7 +25,7 @@ // // // $Id: G4VIntraNuclearTransportModel.cc,v 1.4 2006/06/29 20:46:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // $Id: G4VIntraNuclearTransportModel.cc,v 1.0 1998/06/30 // ----------------------------------------------------------------------------- diff --git a/source/processes/hadronic/models/management/src/G4VKineticNucleon.cc b/source/processes/hadronic/models/management/src/G4VKineticNucleon.cc index e0cbfdfd6b..2609835bff 100644 --- a/source/processes/hadronic/models/management/src/G4VKineticNucleon.cc +++ b/source/processes/hadronic/models/management/src/G4VKineticNucleon.cc @@ -25,7 +25,7 @@ // // // $Id: G4VKineticNucleon.cc,v 1.3 2006/06/29 20:46:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4VKineticNucleon.hh" diff --git a/source/processes/hadronic/models/management/src/G4VNuclearDensity.cc b/source/processes/hadronic/models/management/src/G4VNuclearDensity.cc index 51b874ee5b..03e44a1b56 100644 --- a/source/processes/hadronic/models/management/src/G4VNuclearDensity.cc +++ b/source/processes/hadronic/models/management/src/G4VNuclearDensity.cc @@ -25,7 +25,7 @@ // // // $Id: G4VNuclearDensity.cc,v 1.3 2006/06/29 20:46:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4VNuclearDensity.hh" diff --git a/source/processes/hadronic/models/management/src/G4VPreCompoundModel.cc b/source/processes/hadronic/models/management/src/G4VPreCompoundModel.cc index bf71a02cc2..edd8971a22 100644 --- a/source/processes/hadronic/models/management/src/G4VPreCompoundModel.cc +++ b/source/processes/hadronic/models/management/src/G4VPreCompoundModel.cc @@ -25,7 +25,7 @@ // // // $Id: G4VPreCompoundModel.cc,v 1.5 2006/06/29 20:46:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4VPreCompoundModel.hh" diff --git a/source/processes/hadronic/models/neutron_hp/History b/source/processes/hadronic/models/neutron_hp/History index 753ab427a4..8ff70335f5 100644 --- a/source/processes/hadronic/models/neutron_hp/History +++ b/source/processes/hadronic/models/neutron_hp/History @@ -14,6 +14,26 @@ code and to keep track of all tags. * Please list in reverse chronological order (last date on top) --------------------------------------------------------------- +15 November 2006 Tatsumi Koi (hadr-hpn-V08-00-04) +--------------------------------------------------------------- +- G4NeutronHPElasticFS.hh , cc : add new type final state generator +- G4NeutronHPFission.cc : Bug Report[857] +- 4NeutronHPElasticFS.cc : buf fix +- new cross secton data set and models below 4eV based on + Thermal neutron scattering files from the evaluated nuclear data files + ENDF/B-VI, Release2 + New files + G4NeutronHPThermalScatteringNames.hh , cc + G4NeutronHPThermalScattering.hh , cc + G4NeutronHPThermalScatteringData.hh , cc +- new cross secton data set based on JENDL HE files 20MeV - 3GeV + New files + G4NeutronHPJENDLHEData.hh , .cc + G4NeutronHPJENDLHEElasticData.hh , .cc + G4NeutronHPJENDLHEInelasticData.hh , .cc + + + 02 June 2006 Dennis Wright for Tatsumi Koi (hadr-hpn-V08-00-03) --------------------------------------------------------------- - retag of hard-hpn-v08-00-03 with History info added diff --git a/source/processes/hadronic/models/neutron_hp/include/G4InterpolationIterator.hh b/source/processes/hadronic/models/neutron_hp/include/G4InterpolationIterator.hh index f283e91d97..460d30b50e 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4InterpolationIterator.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4InterpolationIterator.hh @@ -25,7 +25,7 @@ // // // $Id: G4InterpolationIterator.hh,v 1.9 2006/06/29 20:46:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4InterpolationIterator_h #define G4InterpolationIterator_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4InterpolationManager.hh b/source/processes/hadronic/models/neutron_hp/include/G4InterpolationManager.hh index 93a5ff8d9b..9ccc66cd87 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4InterpolationManager.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4InterpolationManager.hh @@ -25,7 +25,7 @@ // // // $Id: G4InterpolationManager.hh,v 1.12 2006/06/29 20:46:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4InterpolationManager_h #define G4InterpolationManager_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4InterpolationScheme.hh b/source/processes/hadronic/models/neutron_hp/include/G4InterpolationScheme.hh index a83dd98b88..e7e87900f8 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4InterpolationScheme.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4InterpolationScheme.hh @@ -25,7 +25,7 @@ // // // $Id: G4InterpolationScheme.hh,v 1.8 2006/06/29 20:46:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4InterpolationScheme_h #define G4InterpolationScheme_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2AInelasticFS.hh index bc0d70c57a..cde399f6ed 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2AInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2AInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHP2AInelasticFS.hh,v 1.9 2006/06/29 20:46:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHP2AInelasticFS_h #define G4NeutronHP2AInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2N2AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2N2AInelasticFS.hh index be1e9f8144..f254706458 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2N2AInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2N2AInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHP2N2AInelasticFS.hh,v 1.9 2006/06/29 20:46:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHP2N2AInelasticFS_h #define G4NeutronHP2N2AInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NAInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NAInelasticFS.hh index 284a1f1b63..d048325415 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NAInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NAInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHP2NAInelasticFS.hh,v 1.9 2006/06/29 20:46:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHP2NAInelasticFS_h #define G4NeutronHP2NAInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NDInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NDInelasticFS.hh index 09944ebc4d..42998de12d 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NDInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NDInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHP2NDInelasticFS.hh,v 1.9 2006/06/29 20:46:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHP2NDInelasticFS_h #define G4NeutronHP2NDInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NInelasticFS.hh index a3d458d3fc..9dd640aad8 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHP2NInelasticFS.hh,v 1.9 2006/06/29 20:46:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHP2NInelasticFS_h #define G4NeutronHP2NInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NPInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NPInelasticFS.hh index 981db297ef..df4dfd33b6 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NPInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NPInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHP2NPInelasticFS.hh,v 1.9 2006/06/29 20:46:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHP2NPInelasticFS_h #define G4NeutronHP2NPInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2PInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2PInelasticFS.hh index 20457d7a07..4d584dc7cc 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2PInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2PInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHP2PInelasticFS.hh,v 1.9 2006/06/29 20:46:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHP2PInelasticFS_h #define G4NeutronHP2PInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3AInelasticFS.hh index 68d253800e..b9136c1136 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3AInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3AInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHP3AInelasticFS.hh,v 1.9 2006/06/29 20:46:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHP3AInelasticFS_h #define G4NeutronHP3AInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NAInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NAInelasticFS.hh index b167b4ffa7..fe8458951b 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NAInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NAInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHP3NAInelasticFS.hh,v 1.9 2006/06/29 20:46:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHP3NAInelasticFS_h #define G4NeutronHP3NAInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NInelasticFS.hh index ab70c8a6f3..91888493f9 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHP3NInelasticFS.hh,v 1.9 2006/06/29 20:46:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHP3NInelasticFS_h #define G4NeutronHP3NInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NPInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NPInelasticFS.hh index 37e7da0cb0..6a7b02311f 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NPInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NPInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHP3NPInelasticFS.hh,v 1.9 2006/06/29 20:46:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHP3NPInelasticFS_h #define G4NeutronHP3NPInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP4NInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP4NInelasticFS.hh index 17859bad0b..4ee56e900b 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP4NInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP4NInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHP4NInelasticFS.hh,v 1.9 2006/06/29 20:46:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHP4NInelasticFS_h #define G4NeutronHP4NInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAInelasticFS.hh index 77130925c3..95c65c7084 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPAInelasticFS.hh,v 1.9 2006/06/29 20:46:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPAInelasticFS_h #define G4NeutronHPAInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngular.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngular.hh index e0fccdee42..2ebfe1e54b 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngular.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngular.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPAngular.hh,v 1.10 2006/06/29 20:46:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPAngular_h #define G4NeutronHPAngular_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngularP.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngularP.hh index 604b1a6a06..63f6862d74 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngularP.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngularP.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPAngularP.hh,v 1.10 2006/06/29 20:46:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPAngularP_h #define G4NeutronHPAngularP_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPArbitaryTab.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPArbitaryTab.hh index 71df98d5f8..3a8def86ae 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPArbitaryTab.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPArbitaryTab.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPArbitaryTab.hh,v 1.11 2006/06/29 20:46:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPArbitaryTab_h #define G4NeutronHPArbitaryTab_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCapture.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCapture.hh index 82e98c8d9a..1b0ec27fd0 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCapture.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCapture.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPCapture.hh,v 1.10 2006/06/29 20:46:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Very Low Energy Neutron X-Sections // original by H.P. Wellisch, TRIUMF, 14-Feb-97 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCaptureData.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCaptureData.hh index d3ca8890ba..0f17a442b3 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCaptureData.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCaptureData.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPCaptureData.hh,v 1.9 2006/06/29 20:46:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPCaptureData_h #define G4NeutronHPCaptureData_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCaptureFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCaptureFS.hh index 8f5db16a4a..e13998ea5b 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCaptureFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCaptureFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPCaptureFS.hh,v 1.11 2006/06/29 20:46:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPCaptureFS_h #define G4NeutronHPCaptureFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPChannel.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPChannel.hh index 81deecd18b..0479591614 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPChannel.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPChannel.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPChannel.hh,v 1.12 2006/06/29 20:46:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Very Low Energy Neutron X-Sections // original by H.P. Wellisch, TRIUMF, 14-Feb-97 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPChannelList.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPChannelList.hh index 0071996622..1064206126 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPChannelList.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPChannelList.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPChannelList.hh,v 1.10 2006/06/29 20:46:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Very Low Energy Neutron X-Sections // original by H.P. Wellisch, TRIUMF, 14-Feb-97 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContAngularPar.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContAngularPar.hh index 5607ee5072..7e7221835b 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContAngularPar.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContAngularPar.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPContAngularPar.hh,v 1.11 2006/06/29 20:47:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPContAngularPar_h #define G4NeutronHPContAngularPar_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContEnergyAngular.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContEnergyAngular.hh index 338661d37c..741686baf2 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContEnergyAngular.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContEnergyAngular.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPContEnergyAngular.hh,v 1.10 2006/06/29 20:47:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPContEnergyAngular_h #define G4NeutronHPContEnergyAngular_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPD2AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPD2AInelasticFS.hh index 6d5ba74472..56116a6cf7 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPD2AInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPD2AInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPD2AInelasticFS.hh,v 1.9 2006/06/29 20:47:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPD2AInelasticFS_h #define G4NeutronHPD2AInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDAInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDAInelasticFS.hh index 35188ae436..b51737c21c 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDAInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDAInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPDAInelasticFS.hh,v 1.9 2006/06/29 20:47:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPDAInelasticFS_h #define G4NeutronHPDAInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDInelasticFS.hh index 8864165ed3..ba75d1e028 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPDInelasticFS.hh,v 1.9 2006/06/29 20:47:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPDInelasticFS_h #define G4NeutronHPDInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPData.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPData.hh index bd5897bc5b..1144bd34b6 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPData.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPData.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPData.hh,v 1.9 2006/06/29 20:47:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Very Low Energy Neutron X-Sections // original by H.P. Wellisch, TRIUMF, 14-Feb-97 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDataPoint.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDataPoint.hh index c7193dbd0b..3ad1d28e37 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDataPoint.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDataPoint.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPDataPoint.hh,v 1.8 2006/06/29 20:47:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPDataPoint_h #define G4NeutronHPDataPoint_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDeExGammas.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDeExGammas.hh index 9621465f4f..33ca932f1e 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDeExGammas.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDeExGammas.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPDeExGammas.hh,v 1.12 2006/06/29 20:47:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPDeExGammas_h #define G4NeutronHPDeExGammas_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDiscreteTwoBody.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDiscreteTwoBody.hh index 4487ae05ed..84177bd505 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDiscreteTwoBody.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDiscreteTwoBody.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPDiscreteTwoBody.hh,v 1.10 2006/06/29 20:47:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPDiscreteTwoBody_h #define G4NeutronHPDiscreteTwoBody_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElastic.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElastic.hh index a57ad8c13d..81eda8f64d 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElastic.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPElastic.hh,v 1.10 2006/06/29 20:47:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: High Precision low E neutron tracking // original by H.P. Wellisch, TRIUMF, 14-Feb-97 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElasticData.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElasticData.hh index 296dbf8143..c698b03053 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElasticData.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElasticData.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPElasticData.hh,v 1.9 2006/06/29 20:47:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPElasticData_h #define G4NeutronHPElasticData_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElasticFS.hh index 7644371aba..9845db2b59 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElasticFS.hh @@ -24,8 +24,11 @@ // ******************************************************************** // // -// $Id: G4NeutronHPElasticFS.hh,v 1.9 2006/06/29 20:47:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4NeutronHPElasticFS.hh,v 1.11 2006/12/13 15:45:28 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// 25-08-06 New Final State type (refFlag==3 , Legendre (Low Energy) + Probability (High Energy) ) +// is added by T. KOI // #ifndef G4NeutronHPElasticFS_h #define G4NeutronHPElasticFS_h 1 @@ -65,6 +68,8 @@ class G4NeutronHPElasticFS : public G4NeutronHPFinalState private: G4int repFlag; // Legendre coeff(1), or probability array(2), or isotropic(0). + // add 3: for Legendre (Low Energy) + Probability (High Energy) + G4double tE_of_repFlag3; // transition energy in case of repFlag 3: G4double targetMass; // in neutronmass units. G4int frameFlag; // CMS or Lab system. diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElementData.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElementData.hh index f7a76b09f3..869c142354 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElementData.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElementData.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPElementData.hh,v 1.9 2006/06/29 20:47:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Very Low Energy Neutron X-Sections // original by H.P. Wellisch, TRIUMF, 14-Feb-97 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnAngCorrelation.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnAngCorrelation.hh index f213d6ec12..44f5d7a5d8 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnAngCorrelation.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnAngCorrelation.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPEnAngCorrelation.hh,v 1.10 2006/06/29 20:47:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPEnAngCorrelation_h #define G4NeutronHPEnAngCorrelation_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnergyDistribution.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnergyDistribution.hh index 1d66a98b8c..11317c63e1 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnergyDistribution.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnergyDistribution.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPEnergyDistribution.hh,v 1.10 2006/06/29 20:47:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPEnergyDistribution_h #define G4NeutronHPEnergyDistribution_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEvapSpectrum.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEvapSpectrum.hh index 609e8f2b89..dd974fcf63 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEvapSpectrum.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEvapSpectrum.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPEvapSpectrum.hh,v 1.10 2006/06/29 20:47:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPEvapSpectrum_h #define G4NeutronHPEvapSpectrum_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFCFissionFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFCFissionFS.hh index 60cbc278e5..d530aa189a 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFCFissionFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFCFissionFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPFCFissionFS.hh,v 1.10 2006/06/29 20:47:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPFCFissionFS_h #define G4NeutronHPFCFissionFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFSFissionFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFSFissionFS.hh index f7601d1268..ee24f376f8 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFSFissionFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFSFissionFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPFSFissionFS.hh,v 1.10 2006/06/29 20:47:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPFSFissionFS_h #define G4NeutronHPFSFissionFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFastLegendre.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFastLegendre.hh index ab1ed2bb81..f859239942 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFastLegendre.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFastLegendre.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPFastLegendre.hh,v 1.11 2006/06/29 20:47:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPFastLegendre_h #define G4NeutronHPFastLegendre_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPField.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPField.hh index f6e9b0021b..06ebce6ebc 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPField.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPField.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPField.hh,v 1.8 2006/06/29 20:47:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPField_h #define G4NeutronHPField_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFieldPoint.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFieldPoint.hh index 25835fb96f..001313eb86 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFieldPoint.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFieldPoint.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPFieldPoint.hh,v 1.8 2006/06/29 20:47:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPFieldPoint_h #define G4NeutronHPFieldPoint_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFinalState.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFinalState.hh index d371e441ec..ae6388062a 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFinalState.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFinalState.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPFinalState.hh,v 1.12 2006/06/29 20:47:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPFinalState_h #define G4NeutronHPFinalState_h diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFission.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFission.hh index f05c62db83..7d4281a214 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFission.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFission.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPFission.hh,v 1.10 2006/06/29 20:47:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: High Precision low E neutron tracking // original by H.P. Wellisch, TRIUMF, 14-Feb-97 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionBaseFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionBaseFS.hh index c0740d6cea..effbf2d177 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionBaseFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionBaseFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPFissionBaseFS.hh,v 1.12 2006/06/29 20:47:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPFissionBaseFS_h #define G4NeutronHPFissionBaseFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionData.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionData.hh index 315298035e..c89d5188d6 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionData.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionData.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPFissionData.hh,v 1.9 2006/06/29 20:47:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPFissionData_h #define G4NeutronHPFissionData_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionERelease.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionERelease.hh index ea3949cbf8..fd8f1481b0 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionERelease.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionERelease.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPFissionERelease.hh,v 1.10 2006/06/29 20:47:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPFissionERelease_h #define G4NeutronHPFissionERelease_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionFS.hh index 8307c11e23..3869afd876 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPFissionFS.hh,v 1.9 2006/06/29 20:47:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPFissionFS_h #define G4NeutronHPFissionFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionSpectrum.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionSpectrum.hh index 5e8758d3f7..82414e52b2 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionSpectrum.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionSpectrum.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPFissionSpectrum.hh,v 1.11 2006/06/29 20:47:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPFissionSpectrum_h #define G4NeutronHPFissionSpectrum_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPGamma.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPGamma.hh index 803de06ce1..f1195459ab 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPGamma.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPGamma.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPGamma.hh,v 1.13 2006/06/29 20:47:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPGamma_h #define G4NeutronHPGamma_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPHe3InelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPHe3InelasticFS.hh index 7c4bb17bef..dff017c323 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPHe3InelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPHe3InelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPHe3InelasticFS.hh,v 1.9 2006/06/29 20:48:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPHe3InelasticFS_h #define G4NeutronHPHe3InelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelastic.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelastic.hh index b7309cf6f4..0eb8b9a22c 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelastic.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelastic.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPInelastic.hh,v 1.9 2006/06/29 20:48:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: High Precision low E neutron tracking // original by H.P. Wellisch, TRIUMF, 14-Feb-97 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticBaseFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticBaseFS.hh index 52d4d29c3b..e51a7321af 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticBaseFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticBaseFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPInelasticBaseFS.hh,v 1.11 2006/06/29 20:48:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPInelasticBaseFS_h #define G4NeutronHPInelasticBaseFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticCompFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticCompFS.hh index 912a446cd6..1308dbc94c 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticCompFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticCompFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPInelasticCompFS.hh,v 1.12 2006/06/29 20:48:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPInelasticCompFS_h #define G4NeutronHPInelasticCompFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticData.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticData.hh index 9e9c3253ed..9f1f84b2af 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticData.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticData.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPInelasticData.hh,v 1.9 2006/06/29 20:48:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPInelasticData_h #define G4NeutronHPInelasticData_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInterpolator.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInterpolator.hh index f492e9e7dd..573c9625f6 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInterpolator.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInterpolator.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPInterpolator.hh,v 1.19 2006/06/29 20:48:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPInterpolator_h #define G4NeutronHPInterpolator_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsoData.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsoData.hh index fe4d1ee001..e5ab41019c 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsoData.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsoData.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPIsoData.hh,v 1.15 2006/06/29 20:48:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPIsoData_h #define G4NeutronHPIsoData_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsotropic.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsotropic.hh index 0792932fb8..3f356214b4 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsotropic.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsotropic.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPIsotropic.hh,v 1.10 2006/06/29 20:48:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPIsotropic_h #define G4NeutronHPIsotropic_h 1 diff --git a/source/processes/hadronic/models/coherent_elastic/include/G4IntegrHadrNucleus.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPJENDLHEData.hh similarity index 54% rename from source/processes/hadronic/models/coherent_elastic/include/G4IntegrHadrNucleus.hh rename to source/processes/hadronic/models/neutron_hp/include/G4NeutronHPJENDLHEData.hh index a36b2188ce..e06f66e195 100644 --- a/source/processes/hadronic/models/coherent_elastic/include/G4IntegrHadrNucleus.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPJENDLHEData.hh @@ -23,59 +23,57 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// G4IntegrHadrNucleus.hh +#ifndef G4NeutronHPJENDLHEData_h +#define G4NeutronHPJENDLHEData_h 1 -#ifndef G4IntegrHadrNucleus_h -#define G4IntegrHadrNucleus_h 1 +// Class Description +// Cross-section data set for a high precision (based on JENDL_HE evaluated data +// libraries) description of elastic scattering 20 MeV ~ 3 GeV; +// Class Description - End -#include "globals.hh" +// 15-Nov-06 First Implementation is done by T. Koi (SLAC/SCCS) + +#include "G4VCrossSectionDataSet.hh" #include "G4DynamicParticle.hh" -#include "G4Nucleus.hh" -#include "G4HadronValues.hh" - - class G4IntegrHadrNucleus : public G4HadronValues - { +#include "G4Neutron.hh" +#include "G4Element.hh" +#include "G4ParticleDefinition.hh" +#include "G4PhysicsVector.hh" +#include +class G4NeutronHPJENDLHEData : public G4VCrossSectionDataSet +{ public: + + G4NeutronHPJENDLHEData(); + G4NeutronHPJENDLHEData( G4String , G4ParticleDefinition* ); - G4IntegrHadrNucleus() : G4HadronValues() {;} - ~G4IntegrHadrNucleus() {;} + + ~G4NeutronHPJENDLHEData(); + + G4bool IsApplicable(const G4DynamicParticle*, const G4Element*); - G4double GetElasticCrossSection( - const G4DynamicParticle * aHadron, - G4Nucleus * aNucleus); + G4double GetCrossSection(const G4DynamicParticle*, const G4Element*, G4double aT); - G4double GetTotalCrossSection( - const G4DynamicParticle * aHadron, - G4Nucleus * aNucleus); + void BuildPhysicsTable(const G4ParticleDefinition&); - G4double GetProductionCrossSection( - const G4DynamicParticle * aHadron, - G4Nucleus * aNucleus); + void DumpPhysicsTable(const G4ParticleDefinition&); + + private: + + std::vector< G4bool > vElement; + std::map< G4int , std::map< G4int , G4PhysicsVector* >* > mIsotope; - G4double GetInelasticCrossSection( - const G4DynamicParticle * aHadron, - G4Nucleus * aNucleus); + G4bool isThisInMap ( G4int , G4int ); + G4bool isThisNewIsotope ( G4int z , G4int a ) { return !( isThisInMap( z , a ) ); }; + G4PhysicsVector* readAFile ( std::fstream* ); + void registAPhysicsVector ( G4int , G4int , G4PhysicsVector* ); + G4double getXSfromThisIsotope ( G4int , G4int , G4double ); - G4double GetQuasyElasticCrossSection( - const G4DynamicParticle * aHadron, - G4Nucleus * aNucleus); - - private: - - void GetIntegralCrSec(G4Nucleus * aNucleus); - - G4double TotalCrSec, InelCrSec, ProdCrSec, ElasticCrSec, - QuasyElasticCrSec, HadrEnergy; - -// protected: - public: - G4double Tot00, DTot00; - - }; + G4String reactionName; + G4String particleName; +}; #endif - - diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04EventAction.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPJENDLHEElasticData.hh similarity index 77% rename from examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04EventAction.hh rename to source/processes/hadronic/models/neutron_hp/include/G4NeutronHPJENDLHEElasticData.hh index 3294eae275..dd4dce653b 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04EventAction.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPJENDLHEElasticData.hh @@ -23,29 +23,22 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +#ifndef G4NeutronHPJENDLHEElasticData_h +#define G4NeutronHPJENDLHEElasticData_h 1 -#ifndef ExN04EventAction_h -#define ExN04EventAction_h 1 +// Class Description +// Cross-section data set for a high precision (based on JENDL_HE evaluated data +// libraries) description of elastic scattering 20 MeV ~ 3 GeV; +// Class Description - End -#include "G4UserEventAction.hh" -#include "globals.hh" +// 15-Nov-06 First Implementation is done by T. Koi (SLAC/SCCS) -class ExN04EventAction : public G4UserEventAction +#include "G4NeutronHPJENDLHEData.hh" + +class G4NeutronHPJENDLHEElasticData : public G4NeutronHPJENDLHEData { - public: - ExN04EventAction(); - ~ExN04EventAction(); - - public: - void BeginOfEventAction(const G4Event*); - void EndOfEventAction(const G4Event*); - - private: - G4int trackerCollID; - G4int calorimeterCollID; - G4int muonCollID; + public: + G4NeutronHPJENDLHEElasticData(); }; #endif - - diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPJENDLHEInelasticData.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPJENDLHEInelasticData.hh new file mode 100644 index 0000000000..d81d796d18 --- /dev/null +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPJENDLHEInelasticData.hh @@ -0,0 +1,44 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +#ifndef G4NeutronHPJENDLHEInelasticData_h +#define G4NeutronHPJENDLHEInelasticData_h 1 + +// Class Description +// Cross-section data set for a high precision (based on JENDL_HE evaluated data +// libraries) description of elastic scattering 20 MeV ~ 3 GeV; +// Class Description - End + +// 15-Nov-06 First Implementation is done by T. Koi (SLAC/SCCS) + +#include "G4NeutronHPJENDLHEData.hh" + +class G4NeutronHPJENDLHEInelasticData : public G4NeutronHPJENDLHEData +{ + public: + G4NeutronHPJENDLHEInelasticData(); +}; + +#endif diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPKallbachMannSyst.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPKallbachMannSyst.hh index 84e6231c48..28992afc79 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPKallbachMannSyst.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPKallbachMannSyst.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPKallbachMannSyst.hh,v 1.8 2006/06/29 20:48:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPKallbachMannSyst_h #define G4NeutronHPKallbachMannSyst_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLCFissionFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLCFissionFS.hh index 0957c3774a..2d4d2ec009 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLCFissionFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLCFissionFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPLCFissionFS.hh,v 1.10 2006/06/29 20:48:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPLCFissionFS_h #define G4NeutronHPLCFissionFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLabAngularEnergy.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLabAngularEnergy.hh index 4616f69930..b6a558b85f 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLabAngularEnergy.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLabAngularEnergy.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPLabAngularEnergy.hh,v 1.10 2006/06/29 20:48:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPLabAngularEnergy_h #define G4NeutronHPLabAngularEnergy_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreStore.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreStore.hh index 877a4eedc2..0b48c340bf 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreStore.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreStore.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPLegendreStore.hh,v 1.11 2006/06/29 20:48:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPLegendreStore_h #define G4NeutronHPLegendreStore_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreTable.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreTable.hh index 5ede47bb29..33f3ad418e 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreTable.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreTable.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPLegendreTable.hh,v 1.11 2006/06/29 20:48:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPLegendreTable_h #define G4NeutronHPLegendreTable_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLevel.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLevel.hh index dcc0cb5f33..83012db768 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLevel.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLevel.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPLevel.hh,v 1.10 2006/06/29 20:48:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPLevel_h #define G4NeutronHPLevel_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPMadlandNixSpectrum.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPMadlandNixSpectrum.hh index 9ca9cd05a5..908e00b5c8 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPMadlandNixSpectrum.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPMadlandNixSpectrum.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPMadlandNixSpectrum.hh,v 1.12 2006/06/29 20:48:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPMadlandNixSpectrum_h #define G4NeutronHPMadlandNixSpectrum_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2AInelasticFS.hh index 227e29be06..5dc3cfc2f5 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2AInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2AInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPN2AInelasticFS.hh,v 1.9 2006/06/29 20:48:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPN2AInelasticFS_h #define G4NeutronHPN2AInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2PInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2PInelasticFS.hh index 2859deb9b1..3bdd498f51 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2PInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2PInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPN2PInelasticFS.hh,v 1.9 2006/06/29 20:48:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPN2PInelasticFS_h #define G4NeutronHPN2PInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN3AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN3AInelasticFS.hh index d34a407b42..dc1266878f 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN3AInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN3AInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPN3AInelasticFS.hh,v 1.9 2006/06/29 20:48:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPN3AInelasticFS_h #define G4NeutronHPN3AInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNAInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNAInelasticFS.hh index c3c372c4fd..d56552bdf0 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNAInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNAInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPNAInelasticFS.hh,v 1.9 2006/06/29 20:48:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPNAInelasticFS_h #define G4NeutronHPNAInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNBodyPhaseSpace.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNBodyPhaseSpace.hh index ef569eaad9..659d788711 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNBodyPhaseSpace.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNBodyPhaseSpace.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPNBodyPhaseSpace.hh,v 1.12 2006/06/29 20:48:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPNBodyPhaseSpace_h #define G4NeutronHPNBodyPhaseSpace_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPND2AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPND2AInelasticFS.hh index 3e85256b40..ec7840c5b3 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPND2AInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPND2AInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPND2AInelasticFS.hh,v 1.9 2006/06/29 20:48:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPND2AInelasticFS_h #define G4NeutronHPND2AInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNDInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNDInelasticFS.hh index ad6a194572..90240c986f 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNDInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNDInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPNDInelasticFS.hh,v 1.9 2006/06/29 20:48:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPNDInelasticFS_h #define G4NeutronHPNDInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNHe3InelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNHe3InelasticFS.hh index 701d275c66..bd18ff30b3 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNHe3InelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNHe3InelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPNHe3InelasticFS.hh,v 1.9 2006/06/29 20:48:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPNHe3InelasticFS_h #define G4NeutronHPNHe3InelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNInelasticFS.hh index f364b58ce8..2478871972 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPNInelasticFS.hh,v 1.9 2006/06/29 20:48:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPNInelasticFS_h #define G4NeutronHPNInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNPAInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNPAInelasticFS.hh index 4b1d0cb680..7b74737c75 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNPAInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNPAInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPNPAInelasticFS.hh,v 1.9 2006/06/29 20:48:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPNPAInelasticFS_h #define G4NeutronHPNPAInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNPInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNPInelasticFS.hh index d5dc42043a..f2b449bb12 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNPInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNPInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPNPInelasticFS.hh,v 1.9 2006/06/29 20:48:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPNPInelasticFS_h #define G4NeutronHPNPInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNT2AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNT2AInelasticFS.hh index 67d954ed73..bb9da1ffda 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNT2AInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNT2AInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPNT2AInelasticFS.hh,v 1.9 2006/06/29 20:48:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPNT2AInelasticFS_h #define G4NeutronHPNT2AInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNTInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNTInelasticFS.hh index 6210504719..175d647945 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNTInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNTInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPNTInelasticFS.hh,v 1.9 2006/06/29 20:48:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPNTInelasticFS_h #define G4NeutronHPNTInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNXInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNXInelasticFS.hh index dcd82b4d24..a0d9d44d7e 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNXInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNXInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPNXInelasticFS.hh,v 1.9 2006/06/29 20:49:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPNXInelasticFS_h #define G4NeutronHPNXInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNames.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNames.hh index 90864a81de..e90020ec8d 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNames.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNames.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPNames.hh,v 1.15 2006/06/29 20:49:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPNames_h #define G4NeutronHPNames_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNeutronYield.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNeutronYield.hh index 8be36c44c2..021640897b 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNeutronYield.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNeutronYield.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPNeutronYield.hh,v 1.10 2006/06/29 20:49:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPNeutronYield_h #define G4NeutronHPNeutronYield_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPAInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPAInelasticFS.hh index 8bbb2f6d69..17fde69690 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPAInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPAInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPPAInelasticFS.hh,v 1.9 2006/06/29 20:49:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPPAInelasticFS_h #define G4NeutronHPPAInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPDInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPDInelasticFS.hh index a50e29bacb..2ac1afd32f 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPDInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPDInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPPDInelasticFS.hh,v 1.9 2006/06/29 20:49:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPPDInelasticFS_h #define G4NeutronHPPDInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPInelasticFS.hh index 4d5319050d..df128948e6 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPPInelasticFS.hh,v 1.9 2006/06/29 20:49:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPPInelasticFS_h #define G4NeutronHPPInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPTInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPTInelasticFS.hh index 8d78471367..c42a813eaa 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPTInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPTInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPPTInelasticFS.hh,v 1.9 2006/06/29 20:49:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPPTInelasticFS_h #define G4NeutronHPPTInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPartial.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPartial.hh index 6f24aa0be6..4dc0c41d3e 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPartial.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPartial.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPPartial.hh,v 1.11 2006/06/29 20:49:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPPartial_h #define G4NeutronHPPartial_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonDist.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonDist.hh index 1c648cd903..d979c25f45 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonDist.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonDist.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPPhotonDist.hh,v 1.10 2006/06/29 20:49:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Very Low Energy Neutron X-Sections // original by H.P. Wellisch, TRIUMF, 14-Feb-97 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonXSection.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonXSection.hh index cf3aa77904..89314275f3 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonXSection.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonXSection.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPPhotonXSection.hh,v 1.10 2006/06/29 20:49:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPPhotonXSection_h #define G4NeutronHPPhotonXSection_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPolynomExpansion.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPolynomExpansion.hh index 56b4052b0d..d858a96de2 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPolynomExpansion.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPolynomExpansion.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPPolynomExpansion.hh,v 1.10 2006/06/29 20:49:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPPolynomExpansion_h #define G4NeutronHPPolynomExpansion_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPProduct.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPProduct.hh index fc15eb6b28..bb59419548 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPProduct.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPProduct.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPProduct.hh,v 1.11 2006/06/29 20:49:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPProduct_h #define G4NeutronHPProduct_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSCFissionFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSCFissionFS.hh index 9c7583cf5c..f473deb167 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSCFissionFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSCFissionFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPSCFissionFS.hh,v 1.10 2006/06/29 20:49:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPSCFissionFS_h #define G4NeutronHPSCFissionFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSimpleEvapSpectrum.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSimpleEvapSpectrum.hh index 41db58f0a6..28a14a1d38 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSimpleEvapSpectrum.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSimpleEvapSpectrum.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPSimpleEvapSpectrum.hh,v 1.11 2006/06/29 20:49:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPSimpleEvapSpectrum_h #define G4NeutronHPSimpleEvapSpectrum_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPT2AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPT2AInelasticFS.hh index d0a98ee733..2c85d282b4 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPT2AInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPT2AInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPT2AInelasticFS.hh,v 1.9 2006/06/29 20:49:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPT2AInelasticFS_h #define G4NeutronHPT2AInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPTCFissionFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPTCFissionFS.hh index 6fce95fe80..314d1091d6 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPTCFissionFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPTCFissionFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPTCFissionFS.hh,v 1.10 2006/06/29 20:49:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPTCFissionFS_h #define G4NeutronHPTCFissionFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPTInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPTInelasticFS.hh index c14c227ae4..8605673aee 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPTInelasticFS.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPTInelasticFS.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPTInelasticFS.hh,v 1.9 2006/06/29 20:49:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPTInelasticFS_h #define G4NeutronHPTInelasticFS_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPThermalScattering.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPThermalScattering.hh new file mode 100644 index 0000000000..f36fff085e --- /dev/null +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPThermalScattering.hh @@ -0,0 +1,121 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +#ifndef G4NeutronHPThermalScattering_h +#define G4NeutronHPThermalScattering_h 1 + +// Thermal Neutron Scattering +// Koi, Tatsumi (SLAC/SCCS) +// +// Class Description +// Final State Generators for a high precision (based on evaluated data +// libraries) description of themal neutron scattering below 4 eV; +// Based on Thermal neutron scattering files +// from the evaluated nuclear data files ENDF/B-VI, Release2 +// To be used in your physics list in case you need this physics. +// In this case you want to register an object of this class with +// the corresponding process. +// Class Description - End + +#include "globals.hh" +#include "G4NeutronHPThermalScatteringNames.hh" +#include "G4NeutronHPThermalScatteringData.hh" +#include "G4NeutronHPElastic.hh" +#include "G4HadronicInteraction.hh" + +struct E_isoAng +{ + G4double energy; + G4int n; + std::vector < G4double > isoAngle; +}; + +struct E_P_E_isoAng +{ + G4double energy; + G4int n; + std::vector < G4double > prob; + std::vector < E_isoAng* > vE_isoAngle; + G4double sum_of_probXdEs; // should be close to 1 +}; + +class G4NeutronHPThermalScattering : public G4HadronicInteraction +{ + public: + + G4NeutronHPThermalScattering(); + + ~G4NeutronHPThermalScattering(); + + G4HadFinalState * ApplyYourself(const G4HadProjectile& aTrack, G4Nucleus& aTargetNucleus); + + //G4int GetNiso() {return theElastic[0].GetNiso();} + + private: + + G4NeutronHPThermalScatteringNames names; + + // Coherent Elastic + // ElementID temp BraggE cumulativeP + std::map < G4int , std::map < G4double , std::vector < std::pair< G4double , G4double >* >* >* > coherentFSs; + std::map < G4double , std::vector < std::pair< G4double , G4double >* >* >* readACoherentFSDATA( G4String ); + + // Incoherent Elastic + // ElementID temp aFS for this temp (and this element) + std::map < G4int , std::map < G4double , std::vector < E_isoAng* >* >* > incoherentFSs; + std::map < G4double , std::vector < E_isoAng* >* >* readAnIncoherentFSDATA( G4String ); + E_isoAng* readAnE_isoAng ( std::ifstream* ); + + // Inelastic + // ElementID temp aFS for this temp (and this element) + std::map < G4int , std::map < G4double , std::vector < E_P_E_isoAng* >* >* > inelasticFSs; + std::map < G4double , std::vector < E_P_E_isoAng* >* >* readAnInelasticFSDATA( G4String ); + E_P_E_isoAng* readAnE_P_E_isoAng ( std::ifstream* ); + + + G4NeutronHPThermalScatteringData* theXSection; + G4double * xSec; + G4String dirName; + G4int numEle; + + + + G4NeutronHPElastic* theHPElastic; + + G4double getMu ( E_isoAng* ); + + std::pair< G4double , G4double > find_LH ( G4double , std::vector* ); + G4double get_linear_interpolated ( G4double , std::pair < G4double , G4double > , std::pair < G4double , G4double > ); + + E_isoAng create_E_isoAng_from_energy( G4double , std::vector< E_isoAng* >* ); + + G4double get_secondary_energy_from_E_P_E_isoAng ( G4double , E_P_E_isoAng* ); + + std::pair< G4double , E_isoAng > create_sE_and_EPM_from_pE_and_vE_P_E_isoAng ( G4double , G4double , std::vector < E_P_E_isoAng* >* ); + + +}; + +#endif diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPThermalScatteringData.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPThermalScatteringData.hh new file mode 100644 index 0000000000..ac34cba906 --- /dev/null +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPThermalScatteringData.hh @@ -0,0 +1,97 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +#ifndef G4NeutronHPThermalScatteringData_h +#define G4NeutronHPThermalScatteringData_h 1 + +// Thermal Neutron Scattering +// Koi, Tatsumi (SCCS/SLAC) +// +// Class Description +// Cross Sections for a high precision (based on evaluated data +// libraries) description of themal neutron scattering below 4 eV; +// Based on Thermal neutron scattering files +// from the evaluated nuclear data files ENDF/B-VI, Release2 +// To be used in your physics list in case you need this physics. +// In this case you want to register an object of this class with +// the corresponding process. +// Class Description - End + +// 15-Nov-06 First implementation is done by T. Koi (SLAC/SCCS) + +#include "G4NeutronHPThermalScatteringNames.hh" +#include "G4NeutronHPVector.hh" +#include "G4VCrossSectionDataSet.hh" +#include "G4DynamicParticle.hh" +#include "G4Element.hh" +#include "G4ParticleDefinition.hh" +//#include "G4PhysicsTable.hh" + +#include +#include + +class G4NeutronHPThermalScatteringData : public G4VCrossSectionDataSet +{ + public: + + G4NeutronHPThermalScatteringData(); + + ~G4NeutronHPThermalScatteringData(); + + G4bool IsApplicable(const G4DynamicParticle*, const G4Element*); + + G4double GetCrossSection(const G4DynamicParticle*, const G4Element*, G4double aT); + G4double GetInelasticCrossSection(const G4DynamicParticle*, const G4Element*, G4double aT); + G4double GetCoherentCrossSection(const G4DynamicParticle*, const G4Element*, G4double aT); + G4double GetIncoherentCrossSection(const G4DynamicParticle*, const G4Element*, G4double aT); + + void BuildPhysicsTable(const G4ParticleDefinition&); + + void DumpPhysicsTable(const G4ParticleDefinition&); + + private: + + G4double GetX ( const G4DynamicParticle* , G4double aT , std::map< G4double , G4NeutronHPVector* >* ); + + G4double emax; + + +// element temp x section from E + std::map< G4int , std::map< G4double , G4NeutronHPVector* >* > coherent; + std::map< G4int , std::map< G4double , G4NeutronHPVector* >* > incoherent; + std::map< G4int , std::map< G4double , G4NeutronHPVector* >* > inelastic; + + std::map< G4double , G4NeutronHPVector* >* readData ( G4String ); + + std::vector < G4int > indexOfThermalElement; + G4NeutronHPThermalScatteringNames* names; +// G4Element NDL name +// std::map< G4String , G4String > names; + +// G4PhysicsTable * theCrossSections; + +}; + +#endif diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPThermalScatteringNames.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPThermalScatteringNames.hh new file mode 100644 index 0000000000..c8df4d357e --- /dev/null +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPThermalScatteringNames.hh @@ -0,0 +1,64 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +#ifndef G4NeutronHPThermalScatteringNames_h +#define G4NeutronHPThermalScatteringNames_h 1 + +// Class Description +// Name list of Elements for a high precision (based on evaluated data +// libraries) description of themal neutron scattering below 4 eV; +// Based on Thermal neutron scattering files +// from the evaluated nuclear data files ENDF/B-VI, Release2 +// To be used in your physics list in case you need this physics. +// In this case you want to register an object of this class with +// the corresponding process. +// Class Description - End + +// 15-Nov-06 First implementation is done by T. Koi (SLAC/SCCS) + +#include "globals.hh" +#include + +class G4NeutronHPThermalScatteringNames +{ + public: + + G4NeutronHPThermalScatteringNames(); + + ~G4NeutronHPThermalScatteringNames(); + + G4bool IsThisThermalElement ( G4String ); + size_t GetSize() { return names.size(); }; + G4String GetTS_NDL_Name( G4String nameG4Element ) { return names.find ( nameG4Element )->second; }; + //G4String GetTS_G4E_Name( G4int i ) { return names[i]->first; }; + + private: + +// G4Element NDL name + std::map< G4String , G4String > names; + +}; + +#endif diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPWattSpectrum.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPWattSpectrum.hh index 0faedf2851..9a64577953 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPWattSpectrum.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPWattSpectrum.hh @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPWattSpectrum.hh,v 1.11 2006/06/29 20:49:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4NeutronHPWattSpectrum_h #define G4NeutronHPWattSpectrum_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEDis.hh b/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEDis.hh index 5e902a3268..1e86a40032 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEDis.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEDis.hh @@ -25,7 +25,7 @@ // // // $Id: G4VNeutronHPEDis.hh,v 1.10 2006/06/29 20:50:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VNeutronHPEDis_h #define G4VNeutronHPEDis_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEnergyAngular.hh b/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEnergyAngular.hh index 5b36725af7..1938d6b032 100644 --- a/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEnergyAngular.hh +++ b/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEnergyAngular.hh @@ -25,7 +25,7 @@ // // // $Id: G4VNeutronHPEnergyAngular.hh,v 1.10 2006/06/29 20:50:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VNeutronHPEnergyAngular_h #define G4VNeutronHPEnergyAngular_h 1 diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElasticFS.cc index c0f2cf868e..3ef8281257 100644 --- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElasticFS.cc +++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElasticFS.cc @@ -27,6 +27,9 @@ // J.P. Wellisch, Nov-1996 // A prototype of the low energy neutron transport model. // +// 25-08-06 New Final State type (refFlag==3 , Legendre (Low Energy) + Probability (High Energy) ) +// is added by T. KOI +// #include "G4NeutronHPElasticFS.hh" #include "G4ReactionProduct.hh" #include "G4Nucleus.hh" @@ -105,6 +108,61 @@ } } } + else if ( repFlag==3 ) + { + G4int nEnergy_Legendre; + theData >> nEnergy_Legendre; + theCoefficients = new G4NeutronHPLegendreStore( nEnergy_Legendre ); + theCoefficients->InitInterpolation( theData ); + G4double temp, energy; + G4int tempdep, nLegendre; + G4int i, ii; + for ( i = 0 ; i < nEnergy_Legendre ; i++ ) + { + theData >> temp >> energy >> tempdep >> nLegendre; + energy *=eV; + theCoefficients->Init( i , energy , nLegendre ); + theCoefficients->SetTemperature( i , temp ); + G4double coeff = 0; + for ( ii = 0 ; ii < nLegendre ; ii++ ) + { + // load legendre coefficients. + theData >> coeff; + theCoefficients->SetCoeff(i, ii+1, coeff); // @@@HPW@@@ + } + } + + tE_of_repFlag3 = energy; + + G4int nEnergy_Prob; + theData >> nEnergy_Prob; + theProbArray = new G4NeutronHPPartial( nEnergy_Prob , nEnergy_Prob ); + theProbArray->InitInterpolation( theData ); + G4int nPoints; + for ( G4int i=0 ; i < nEnergy_Prob ; i++ ) + { + theData >> temp >> energy >> tempdep >> nPoints; + + energy *= eV; + +// consistensy check + if ( i == 0 ) + if ( energy != tE_of_repFlag3 ) + G4cout << "Warning Trangition Energy of repFlag3 is not consistent." << G4endl; + + theProbArray->InitInterpolation( i , theData ); + theProbArray->SetT( i , temp ); + theProbArray->SetX( i , energy ); + G4double prob, costh; + for( G4int ii = 0 ; ii < nPoints ; ii++ ) + { + // fill probability arrays. + theData >> costh >> prob; + theProbArray->SetX( i , ii , costh ); + theProbArray->SetY( i , ii , prob ); + } + } + } else if (repFlag==0) { theData >> frameFlag; @@ -169,6 +227,17 @@ { cosTh = theProbArray->Sample(eKinetic); } + else if (repFlag==3) + { + if ( eKinetic <= tE_of_repFlag3 ) + { + cosTh = theCoefficients->SampleElastic(eKinetic); + } + else + { + cosTh = theProbArray->Sample(eKinetic); + } + } else if (repFlag==0) { cosTh = 2.*G4UniformRand()-1.; diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElementData.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElementData.cc index d12d19a2b0..261685cb1c 100644 --- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElementData.cc +++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElementData.cc @@ -27,6 +27,8 @@ // J.P. Wellisch, Nov-1996 // A prototype of the low energy neutron transport model. // +// 02-08-06 Modified Harmonise to reslove cross section trouble at high-end. T. KOI +// #include "G4NeutronHPElementData.hh" G4NeutronHPElementData::G4NeutronHPElementData() @@ -173,7 +175,11 @@ // G4cout << "Harmonise 4: "<< p <<" "<GetVectorLength()<<" "<GetVectorLength()) { - theMerge->SetData(m++, passive->GetEnergy(p), passive->GetXsec(p)); + // Modified by T. KOI + //theMerge->SetData(m++, passive->GetEnergy(p), passive->GetXsec(p)); + G4double x = passive->GetEnergy(p); + G4double y = std::max(0., active->GetXsec(x)); + theMerge->SetData(m++, x, passive->GetXsec(p)+y); p++; } // G4cout <<"Harmonise 5: "<< theMerge->GetVectorLength() << " " << m << G4endl; diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFission.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFission.cc index 587867eb24..6dc3fbd340 100644 --- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFission.cc +++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFission.cc @@ -27,6 +27,8 @@ // J.P. Wellisch, Nov-1996 // A prototype of the low energy neutron transport model. // +// 08-08-06 delete unnecessary and harmed declaration; Bug Report[857] +// #include "G4NeutronHPFission.hh" G4NeutronHPFission::G4NeutronHPFission() @@ -66,7 +68,7 @@ { xSec = new G4double[n]; G4double sum=0; - G4int i, index; + G4int i; const G4double * NumAtomsPerVolume = theMaterial->GetVecNbOfAtomsPerVolume(); G4double rWeight; G4NeutronHPThermalBoost aThermalE; diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelastic.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelastic.cc index b163407442..de77677572 100644 --- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelastic.cc +++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelastic.cc @@ -33,7 +33,7 @@ // and all its terms. // // $Id: G4NeutronHPInelastic.cc,v 1.20 2006/06/29 20:52:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4NeutronHPInelastic.hh" diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPJENDLHEData.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPJENDLHEData.cc new file mode 100644 index 0000000000..014f20d6e9 --- /dev/null +++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPJENDLHEData.cc @@ -0,0 +1,390 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Class Description +// Cross-section data set for a high precision (based on JENDL_HE evaluated data +// libraries) description of elastic scattering 20 MeV ~ 3 GeV; +// Class Description - End + +// 15-Nov-06 First Implementation is done by T. Koi (SLAC/SCCS) + +#include "G4NeutronHPJENDLHEData.hh" +#include "G4LPhysicsFreeVector.hh" +#include "G4ElementTable.hh" +#include "G4NeutronHPData.hh" + +G4bool G4NeutronHPJENDLHEData::IsApplicable(const G4DynamicParticle*aP, const G4Element* anE) +{ + + G4bool result = true; + G4double eKin = aP->GetKineticEnergy(); + //if(eKin>20*MeV||aP->GetDefinition()!=G4Neutron::Neutron()) result = false; + if ( eKin < 20*MeV || 3*GeV < eKin || aP->GetDefinition()!=G4Neutron::Neutron() ) + { + result = false; + } +// Element Check + else if ( !(vElement[ anE->GetIndex() ]) ) result = false; + + return result; + +} + + + +G4NeutronHPJENDLHEData::G4NeutronHPJENDLHEData() +{ + ; +} + + + +G4NeutronHPJENDLHEData::G4NeutronHPJENDLHEData( G4String reaction , G4ParticleDefinition* pd ) +{ + reactionName = reaction; + BuildPhysicsTable( *pd ); +} + + + +G4NeutronHPJENDLHEData::~G4NeutronHPJENDLHEData() +{ + ; + //delete theCrossSections; +} + + + +void G4NeutronHPJENDLHEData::BuildPhysicsTable( const G4ParticleDefinition& aP ) +{ + +// if ( &aP != G4Neutron::Neutron() ) +// throw G4HadronicException(__FILE__, __LINE__, "Attempt to use NeutronHP data for particles other than neutrons!!!"); + particleName = aP.GetParticleName(); + + G4String baseName = getenv( "NeutronHPCrossSections" ); + G4String dirName = baseName+"/JENDL_HE/"+particleName+"/"+reactionName ; + G4String aFSType = "/CrossSection/"; + G4NeutronHPNames theNames; + + G4String filename; + +// Create JENDL_HE data +// Create map element or isotope + + size_t numberOfElements = G4Element::GetNumberOfElements(); + //theCrossSections = new G4PhysicsTable( numberOfElements ); + + // make a PhysicsVector for each element + + static const G4ElementTable *theElementTable = G4Element::GetElementTable(); + vElement.clear(); + vElement.resize( numberOfElements ); + for ( size_t i = 0; i < numberOfElements; ++i ) + { + + G4Element* theElement = (*theElementTable)[i]; + vElement[i] = false; + + // isotope + G4int nIso = (*theElementTable)[i]->GetNumberOfIsotopes(); + G4int Z = static_cast ((*theElementTable)[i]->GetZ()); + if ( nIso!=0 ) + { + G4bool found_at_least_one = false; + for ( G4int i1 = 0; i1 < nIso; i1++ ) + { + G4int A = theElement->GetIsotope(i1)->GetN(); + + if ( isThisNewIsotope( Z , A ) ) + { + + std::stringstream ss; + ss << dirName << aFSType << Z << "_" << A << "_" << theNames.GetName( Z-1 ); + filename = ss.str(); + std::fstream file; + file.open ( filename , std::fstream::in ); + G4int dummy; + file >> dummy; + if ( file.good() ) + { + + //G4cout << "Found file for Z=" << Z << ", A=" << A << ", as " << filename << G4endl; + found_at_least_one = true; + + // read the file + G4PhysicsVector* aPhysVec = readAFile ( &file ); + + //Regist + + registAPhysicsVector( Z , A , aPhysVec ); + + } + else + { + //G4cout << "No file for "<< reactionType << " Z=" << Z << ", A=" << A << G4endl; + } + + file.close(); + + } + else + { + found_at_least_one = TRUE; + } + } + + if ( found_at_least_one ) vElement[i] = true; + + } + else + { + G4StableIsotopes theStableOnes; + G4int first = theStableOnes.GetFirstIsotope( Z ); + G4bool found_at_least_one = FALSE; + for ( G4int i1 = 0; i1 < theStableOnes.GetNumberOfIsotopes( static_cast(theElement->GetZ() ) ); i1++) + { + G4int A = theStableOnes.GetIsotopeNucleonCount( first+i1 ); + + if ( isThisNewIsotope( Z , A ) ) + { + + std::stringstream ss; + ss << dirName << aFSType << Z << "_" << A << "_" << theNames.GetName( Z-1 ); + filename = ss.str(); + + std::fstream file; + file.open ( filename , std::fstream::in ); + G4int dummy; + file >> dummy; + if ( file.good() ) + { + //G4cout << "Found file for Z=" << Z << ", A=" << A << ", as " << filename << G4endl; + found_at_least_one = TRUE; + //Read the file + + G4PhysicsVector* aPhysVec = readAFile ( &file ); + + //Regist the PhysicsVector + registAPhysicsVector( Z , A , aPhysVec ); + + } + else + { + //G4cout << "No file for "<< reactionType << " Z=" << Z << ", A=" << A << G4endl; + } + + file.close(); + } + else + { + found_at_least_one = TRUE; + } + } + + if ( found_at_least_one ) vElement[i] = true; + + } + + } + +} + + + +void G4NeutronHPJENDLHEData::DumpPhysicsTable(const G4ParticleDefinition& aP) +{ + if(&aP!=G4Neutron::Neutron()) + throw G4HadronicException(__FILE__, __LINE__, "Attempt to use NeutronHP data for particles other than neutrons!!!"); +// G4cout << "G4NeutronHPJENDLHEData::DumpPhysicsTable still to be implemented"<20MeV + // Thus + // Not take account of Doppler broadening + // also + // Not take account of Target thermal motions + + G4double result = 0; + + G4double ek = aP->GetKineticEnergy(); + + G4int nIso = anE->GetNumberOfIsotopes(); + G4int Z = static_cast ( anE->GetZ() ); + if ( nIso!=0 ) + { + for ( G4int i1 = 0; i1 < nIso; i1++ ) + { + + G4int A = anE->GetIsotope(i1)->GetN(); + G4double frac = anE->GetRelativeAbundanceVector()[ i1 ]; // This case do NOT request "*perCent". + + result += frac * getXSfromThisIsotope( Z , A , ek ); + //G4cout << reactionType << " XS in barn " << Z << " " << A << " " << frac << " " << getXSfromThisIsotope( Z , A , ek )/barn << G4endl; + + } + } + else + { + + G4StableIsotopes theStableOnes; + G4int first = theStableOnes.GetFirstIsotope( Z ); + for ( G4int i1 = 0; i1 < theStableOnes.GetNumberOfIsotopes( static_cast(anE->GetZ() ) ); i1++) + { + + G4int A = theStableOnes.GetIsotopeNucleonCount( first+i1 ); + G4double frac = theStableOnes.GetAbundance( first+i1 )*perCent; // This case request "*perCent". + + result += frac * getXSfromThisIsotope( Z , A , ek ); + //G4cout << reactionType << " XS in barn " << Z << " " << A << " " << frac << " " << getXSfromThisIsotope( Z , A , ek )/barn << G4endl; + + } + } + return result; + +} + + + +G4PhysicsVector* G4NeutronHPJENDLHEData::readAFile ( std::fstream* file ) +{ + + G4int dummy; + G4int len; + *file >> dummy; + *file >> len; + + std::vector< G4double > v_e; + std::vector< G4double > v_xs; + + for ( G4int i = 0 ; i < len ; i++ ) + { + G4double e; + G4double xs; + + *file >> e; + *file >> xs; + // data are written in eV and barn. + v_e.push_back( e*eV ); + v_xs.push_back( xs*barn ); + } + + G4LPhysicsFreeVector* aPhysVec = new G4LPhysicsFreeVector( static_cast< size_t >( len ) , v_e.front() , v_e.back() ); + + for ( G4int i = 0 ; i < len ; i++ ) + { + aPhysVec->PutValues( static_cast< size_t >( i ) , v_e[ i ] , v_xs[ i ] ); + } + + return aPhysVec; +} + + + +G4bool G4NeutronHPJENDLHEData::isThisInMap( G4int z , G4int a ) +{ + if ( mIsotope.find ( z ) == mIsotope.end() ) return false; + if ( mIsotope.find ( z ) -> second->find ( a ) == mIsotope.find ( z ) -> second->end() ) return false; + return true; +} + + + +void G4NeutronHPJENDLHEData::registAPhysicsVector( G4int Z , G4int A , G4PhysicsVector* aPhysVec ) +{ + + std::pair< G4int , G4PhysicsVector* > aPair = std::pair < G4int , G4PhysicsVector* > ( A , aPhysVec ); + + std::map < G4int , std::map< G4int , G4PhysicsVector* >* >::iterator itm; + itm = mIsotope.find ( Z ); + if ( itm != mIsotope.end() ) + { + itm->second->insert ( aPair ); + } + else + { + std::map< G4int , G4PhysicsVector* >* aMap = new std::map< G4int , G4PhysicsVector* >; + aMap->insert ( aPair ); + mIsotope.insert( std::pair< G4int , std::map< G4int , G4PhysicsVector* >* > ( Z , aMap ) ); + } + +} + + + +G4double G4NeutronHPJENDLHEData::getXSfromThisIsotope( G4int Z , G4int A , G4double ek ) +{ + + G4double aXSection = 0.0; + G4bool outOfRange; + + G4PhysicsVector* aPhysVec; + if ( mIsotope.find ( Z )->second->find ( A ) != mIsotope.find ( Z )->second->end() ) + { + + aPhysVec = mIsotope.find ( Z )->second->find ( A )->second; + aXSection = aPhysVec->GetValue( ek , outOfRange ); + + } + else + { + + //Select closest one in the same Z + std::map < G4int , G4PhysicsVector* >::iterator it; + G4int delta0 = 99; // no mean for 99 + for ( it = mIsotope.find ( Z )->second->begin() ; it != mIsotope.find ( Z )->second->end() ; it++ ) + { + G4int delta = std::abs( A - it->first ); + if ( delta < delta0 ) delta0 = delta; + } + + // Randomize of selection larger or smaller than A + if ( G4UniformRand() < 0.5 ) delta0 *= -1; + G4int A1 = A + delta0; + if ( mIsotope.find ( Z )->second->find ( A1 ) != mIsotope.find ( Z )->second->end() ) + { + aPhysVec = mIsotope.find ( Z )->second->find ( A1 )->second; + } + else + { + A1 = A - delta0; + aPhysVec = mIsotope.find ( Z )->second->find ( A1 )->second; + } + + aXSection = aPhysVec->GetValue( ek , outOfRange ); + // X^(2/3) factor + aXSection *= std::pow ( 1.0*A/ A1 , 2.0 / 3.0 ); + + } + + return aXSection; +} diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04Field.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPJENDLHEElasticData.cc similarity index 78% rename from examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04Field.cc rename to source/processes/hadronic/models/neutron_hp/src/G4NeutronHPJENDLHEElasticData.cc index 811225d8a7..c0b9af40f0 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04Field.cc +++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPJENDLHEElasticData.cc @@ -23,26 +23,18 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// Class Description +// Cross-section data set for a high precision (based on JENDL_HE evaluated data +// libraries) description of elastic scattering 20 MeV ~ 3 GeV; +// Class Description - End -#include "ExN04Field.hh" +// 15-Nov-06 First Implementation is done by T. Koi (SLAC/SCCS) -ExN04Field::ExN04Field() +#include "G4NeutronHPJENDLHEElasticData.hh" +#include "G4Neutron.hh" + +G4NeutronHPJENDLHEElasticData::G4NeutronHPJENDLHEElasticData() +:G4NeutronHPJENDLHEData( "Elastic" , G4Neutron::Neutron() ) { - Bz = 3.0*tesla; - rmax_sq = sqr(50.*cm); - zmax = 100.*cm; + ; } - -ExN04Field::~ExN04Field() -{;} - -void ExN04Field::GetFieldValue(const double Point[3],double *Bfield) const -{ - Bfield[0] = 0.; - Bfield[1] = 0.; - if(std::abs(Point[2])GetParentID()==0) - { fpTrackingManager->SetStoreTrajectory(true); } - else - { fpTrackingManager->SetStoreTrajectory(false); } + ; } - - diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNBodyPhaseSpace.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNBodyPhaseSpace.cc index 0cd29e9ad6..199c1df5ab 100644 --- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNBodyPhaseSpace.cc +++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNBodyPhaseSpace.cc @@ -25,7 +25,7 @@ // // // $Id: G4NeutronHPNBodyPhaseSpace.cc,v 1.13 2006/06/29 20:53:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4NeutronHPNBodyPhaseSpace.hh" #include "G4Gamma.hh" diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPThermalScattering.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPThermalScattering.cc new file mode 100644 index 0000000000..e8cf72793c --- /dev/null +++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPThermalScattering.cc @@ -0,0 +1,838 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Thermal Neutron Scattering +// Koi, Tatsumi (SLAC/SCCS) +// +// Class Description +// Final State Generators for a high precision (based on evaluated data +// libraries) description of themal neutron scattering below 4 eV; +// Based on Thermal neutron scattering files +// from the evaluated nuclear data files ENDF/B-VI, Release2 +// To be used in your physics list in case you need this physics. +// In this case you want to register an object of this class with +// the corresponding process. +// Class Description - End + +#include "G4NeutronHPThermalScattering.hh" +#include "G4Neutron.hh" +#include "G4ElementTable.hh" + + + +G4NeutronHPThermalScattering::G4NeutronHPThermalScattering() +{ + + theHPElastic = new G4NeutronHPElastic(); + + SetMinEnergy( 0.*eV ); + SetMaxEnergy( 4*eV ); + theXSection = new G4NeutronHPThermalScatteringData(); + theXSection->BuildPhysicsTable( *(G4Neutron::Neutron()) ); + +// Check Elements + std::vector< G4int > indexOfThermalElement; + static const G4ElementTable* theElementTable = G4Element::GetElementTable(); + size_t numberOfElements = G4Element::GetNumberOfElements(); + for ( size_t i = 0 ; i < numberOfElements ; i++ ) + { + if ( names.IsThisThermalElement ( (*theElementTable)[i]->GetName() ) ) + { + indexOfThermalElement.push_back( i ); + } + } + + + G4String dirName; + if ( !getenv("NeutronHPCrossSections") ) + throw G4HadronicException(__FILE__, __LINE__, "Please setenv NeutronHPCrossSections to point to the neutron cross-section files."); + dirName = getenv("NeutronHPCrossSections"); + + +// Read data +// Element (id) -> FS Type -> read file + for ( size_t i = 0 ; i < indexOfThermalElement.size() ; i++ ) + { + //G4cout << "G4NeutronHPThermalScattering " << (*theElementTable)[i]->GetName() << G4endl; + G4String tsndlName = names.GetTS_NDL_Name ( (*theElementTable)[ indexOfThermalElement[ i ] ]->GetName() ); + //G4cout << "G4NeutronHPThermalScattering " << tsndlName << std::endl; + + // coherent elastic + G4String fsName = "/ThermalScattering/Coherent/FS/"; + G4String fileName = dirName + fsName + tsndlName; + coherentFSs.insert ( std::pair < G4int , std::map < G4double , std::vector < std::pair< G4double , G4double >* >* >* > ( indexOfThermalElement[ i ] , readACoherentFSDATA( fileName ) ) ); + + // incoherent elastic + fsName = "/ThermalScattering/Incoherent/FS/"; + fileName = dirName + fsName + tsndlName; + incoherentFSs.insert ( std::pair < G4int , std::map < G4double , std::vector < E_isoAng* >* >* > ( indexOfThermalElement[ i ] , readAnIncoherentFSDATA( fileName ) ) ); + + // inelastic + fsName = "/ThermalScattering/Inelastic/FS/"; + fileName = dirName + fsName + tsndlName; + inelasticFSs.insert ( std::pair < G4int , std::map < G4double , std::vector < E_P_E_isoAng* >* >* > ( indexOfThermalElement[ i ] , readAnInelasticFSDATA( fileName ) ) ); + } + +} + + + +G4NeutronHPThermalScattering::~G4NeutronHPThermalScattering() +{ + ; +} + + + +std::map < G4double , std::vector < std::pair< G4double , G4double >* >* >* G4NeutronHPThermalScattering::readACoherentFSDATA( G4String name ) +{ + + std::map < G4double , std::vector < std::pair< G4double , G4double >* >* >* aCoherentFSDATA = new std::map < G4double , std::vector < std::pair< G4double , G4double >* >* >; + + std::ifstream theChannel( name.c_str() ); + + std::vector< G4double > vBraggE; + + G4int dummy; + while ( theChannel >> dummy ) // MF + { + theChannel >> dummy; // MT + G4double temp; + theChannel >> temp; + std::vector < std::pair< G4double , G4double >* >* anBragE_P = new std::vector < std::pair< G4double , G4double >* >; + + G4int n; + theChannel >> n; + for ( G4int i = 0 ; i < n ; i++ ) + { + G4double Ei; + G4double Pi; + if ( aCoherentFSDATA->size() == 0 ) + { + theChannel >> Ei; + vBraggE.push_back( Ei ); + } + else + { + Ei = vBraggE[ i ]; + } + theChannel >> Pi; + anBragE_P->push_back ( new std::pair < G4double , G4double > ( Ei , Pi ) ); + //G4cout << "Coherent Elastic " << Ei << " " << Pi << G4endl; + } + aCoherentFSDATA->insert ( std::pair < G4double , std::vector < std::pair< G4double , G4double >* >* > ( temp , anBragE_P ) ); + } + + return aCoherentFSDATA; +} + + + +std::map < G4double , std::vector < E_P_E_isoAng* >* >* G4NeutronHPThermalScattering::readAnInelasticFSDATA ( G4String name ) +{ + std::map < G4double , std::vector < E_P_E_isoAng* >* >* anT_E_P_E_isoAng = new std::map < G4double , std::vector < E_P_E_isoAng* >* >; + + std::ifstream theChannel( name.c_str() ); + + G4int dummy; + while ( theChannel >> dummy ) // MF + { + theChannel >> dummy; // MT + G4double temp; + theChannel >> temp; + std::vector < E_P_E_isoAng* >* vE_P_E_isoAng = new std::vector < E_P_E_isoAng* >; + G4int n; + theChannel >> n; + for ( G4int i = 0 ; i < n ; i++ ) + { + vE_P_E_isoAng->push_back ( readAnE_P_E_isoAng ( &theChannel ) ); + } + anT_E_P_E_isoAng->insert ( std::pair < G4double , std::vector < E_P_E_isoAng* >* > ( temp , vE_P_E_isoAng ) ); + } + theChannel.close(); + + return anT_E_P_E_isoAng; +} + + + +E_P_E_isoAng* G4NeutronHPThermalScattering::readAnE_P_E_isoAng( std::ifstream* file ) +{ + E_P_E_isoAng* aData = new E_P_E_isoAng; + + G4double dummy; + G4double energy; + G4int nep , nl; + *file >> dummy; + *file >> energy; + aData->energy = energy*eV; + *file >> dummy; + *file >> dummy; + *file >> nep; + *file >> nl; + aData->n = nep/nl; + for ( G4int i = 0 ; i < aData->n ; i++ ) + { + G4double prob; + E_isoAng* anE_isoAng = new E_isoAng; + aData->vE_isoAngle.push_back( anE_isoAng ); + *file >> energy; + anE_isoAng->energy = energy*eV; + anE_isoAng->n = nl - 2; + anE_isoAng->isoAngle.resize( anE_isoAng->n ); + *file >> prob; + aData->prob.push_back( prob ); + //G4cout << "G4NeutronHPThermalScattering inelastic " << energy/eV << " " << i << " " << prob << " " << aData->prob[ i ] << G4endl; + for ( G4int j = 0 ; j < anE_isoAng->n ; j++ ) + { + G4double x; + *file >> x; + anE_isoAng->isoAngle[j] = x ; + //G4cout << "G4NeutronHPThermalScattering inelastic " << x << anE_isoAng->isoAngle[j] << G4endl; + } + } + + // Calcuate sum_of_provXdEs + G4double total = 0; + for ( G4int i = 0 ; i < aData->n - 1 ; i++ ) + { + G4double E_L = aData->vE_isoAngle[i]->energy/eV; + G4double E_H = aData->vE_isoAngle[i+1]->energy/eV; + G4double dE = E_H - E_L; + total += ( ( aData->prob[i] ) * dE ); + } + aData->sum_of_probXdEs = total; + + return aData; +} + + + +std::map < G4double , std::vector < E_isoAng* >* >* G4NeutronHPThermalScattering::readAnIncoherentFSDATA ( G4String name ) +{ + std::map < G4double , std::vector < E_isoAng* >* >* T_E = new std::map < G4double , std::vector < E_isoAng* >* >; + + std::ifstream theChannel( name.c_str() ); + + G4int dummy; + while ( theChannel >> dummy ) // MF + { + theChannel >> dummy; // MT + G4double temp; + theChannel >> temp; + std::vector < E_isoAng* >* vE_isoAng = new std::vector < E_isoAng* >; + G4int n; + theChannel >> n; + for ( G4int i = 0 ; i < n ; i++ ) + vE_isoAng->push_back ( readAnE_isoAng( &theChannel ) ); + T_E->insert ( std::pair < G4double , std::vector < E_isoAng* >* > ( temp , vE_isoAng ) ); + } + theChannel.close(); + + return T_E; +} + + + +E_isoAng* G4NeutronHPThermalScattering::readAnE_isoAng( std::ifstream* file ) +{ + E_isoAng* aData = new E_isoAng; + + G4double dummy; + G4double energy; + G4int n; + *file >> dummy; + *file >> energy; + *file >> dummy; + *file >> dummy; + *file >> n; + *file >> dummy; + aData->energy = energy*eV; + aData->n = n-2; + aData->isoAngle.resize( n ); + + *file >> dummy; + *file >> dummy; + for ( G4int i = 0 ; i < aData->n ; i++ ) + *file >> aData->isoAngle[i]; + + return aData; +} + + + +G4HadFinalState* G4NeutronHPThermalScattering::ApplyYourself(const G4HadProjectile& aTrack, G4Nucleus& aNucleus ) +{ + +// Select Element > Reaction > + + const G4Material * theMaterial = aTrack.GetMaterial(); + G4double aTemp = theMaterial->GetTemperature(); + G4int n = theMaterial->GetNumberOfElements(); + static const G4ElementTable* theElementTable = G4Element::GetElementTable(); + + G4bool findThermalElement = false; + G4int ielement; + for ( G4int i = 0; i < n ; i++ ) + { + G4int index = theMaterial->GetElement(i)->GetIndex(); + if ( aNucleus.GetZ() == (*theElementTable)[index]->GetZ() && ( names.IsThisThermalElement ( (*theElementTable)[index]->GetName() ) ) ) + { + ielement = index; + findThermalElement = true; + break; + } + } + + + if ( findThermalElement == true ) + { + +// Select Reaction (Inelastic, coherent, incoherent) + + G4ParticleDefinition* pd = const_cast< G4ParticleDefinition* >( aTrack.GetDefinition() ); + G4DynamicParticle* dp = new G4DynamicParticle ( pd , aTrack.Get4Momentum() ); + G4double total = theXSection->GetCrossSection( dp , (*theElementTable)[ ielement ] , aTemp ); + G4double inelastic = theXSection->GetInelasticCrossSection( dp , (*theElementTable)[ ielement ] , aTemp ); + + G4double random = G4UniformRand(); + if ( random <= inelastic/total ) + { + // Inelastic + + // T_L and T_H + std::map < G4double , std::vector< E_P_E_isoAng* >* >::iterator it; + std::vector v_temp; + v_temp.clear(); + for ( it = inelasticFSs.find( ielement )->second->begin() ; it != inelasticFSs.find( ielement )->second->end() ; it++ ) + { + v_temp.push_back( it->first ); + } + +// T_L T_H + std::pair < G4double , G4double > tempLH = find_LH ( aTemp , &v_temp ); +// +// For T_L aNEP_EPM_TL and T_H aNEP_EPM_TH +// + std::vector< E_P_E_isoAng* >* vNEP_EPM_TL = NULL; + std::vector< E_P_E_isoAng* >* vNEP_EPM_TH = NULL; + + if ( tempLH.first != 0.0 && tempLH.second != 0.0 ) + { + vNEP_EPM_TL = inelasticFSs.find( ielement )->second->find ( tempLH.first/kelvin )->second; + vNEP_EPM_TH = inelasticFSs.find( ielement )->second->find ( tempLH.second/kelvin )->second; + } + else if ( tempLH.first == 0.0 ) + { + std::map < G4double , std::vector< E_P_E_isoAng* >* >::iterator itm; + itm = inelasticFSs.find( ielement )->second->begin(); + vNEP_EPM_TL = itm->second; + itm++; + vNEP_EPM_TH = itm->second; + } + else if ( tempLH.second == 0.0 ) + { + std::map < G4double , std::vector< E_P_E_isoAng* >* >::iterator itm; + itm = inelasticFSs.find( ielement )->second->end(); + itm--; + vNEP_EPM_TH = itm->second; + itm--; + vNEP_EPM_TL = itm->second; + } + +// + + G4double rand_for_sE = G4UniformRand(); + + std::pair< G4double , E_isoAng > TL = create_sE_and_EPM_from_pE_and_vE_P_E_isoAng ( rand_for_sE , aTrack.GetKineticEnergy() , vNEP_EPM_TL ); + std::pair< G4double , E_isoAng > TH = create_sE_and_EPM_from_pE_and_vE_P_E_isoAng ( rand_for_sE , aTrack.GetKineticEnergy() , vNEP_EPM_TH ); + + G4double sE; + sE = get_linear_interpolated ( aTemp , std::pair < G4double , G4double > ( tempLH.first , TL.first ) , std::pair < G4double , G4double > ( tempLH.second , TH.first ) ); + E_isoAng anE_isoAng; + if ( TL.second.n == TH.second.n ) + { + anE_isoAng.energy = sE; + anE_isoAng.n = TL.second.n; + for ( G4int i=0 ; i < anE_isoAng.n ; i++ ) + { + G4double angle; + angle = get_linear_interpolated ( aTemp , std::pair< G4double , G4double > ( tempLH.first , TL.second.isoAngle[ i ] ) , std::pair< G4double , G4double > ( tempLH.second , TH.second.isoAngle[ i ] ) ); + anE_isoAng.isoAngle.push_back( angle ); + } + } + else + { + std::cout << "Do not Suuport yet." << std::endl; + } + + //set + theParticleChange.SetEnergyChange( sE ); + G4double mu = getMu( &anE_isoAng ); + theParticleChange.SetMomentumChange( 0.0 , std::sqrt ( 1 - mu*mu ) , mu ); + + } + else if ( random <= ( inelastic + theXSection->GetCoherentCrossSection( dp , (*theElementTable)[ ielement ] , aTemp ) ) / total ) + { + // Coherent Elastic + + G4double E = aTrack.GetKineticEnergy(); + + // T_L and T_H + std::map < G4double , std::vector< std::pair< G4double , G4double >* >* >::iterator it; + std::vector v_temp; + v_temp.clear(); + for ( it = coherentFSs.find( ielement )->second->begin() ; it != coherentFSs.find( ielement )->second->end() ; it++ ) + { + v_temp.push_back( it->first ); + } + +// T_L T_H + std::pair < G4double , G4double > tempLH = find_LH ( aTemp , &v_temp ); +// +// +// For T_L anEPM_TL and T_H anEPM_TH +// + std::vector< std::pair< G4double , G4double >* >* pvE_p_TL = NULL; + std::vector< std::pair< G4double , G4double >* >* pvE_p_TH = NULL; + + if ( tempLH.first != 0.0 && tempLH.second != 0.0 ) + { + pvE_p_TL = coherentFSs.find( ielement )->second->find ( tempLH.first/kelvin )->second; + pvE_p_TH = coherentFSs.find( ielement )->second->find ( tempLH.first/kelvin )->second; + } + else if ( tempLH.first == 0.0 ) + { + pvE_p_TL = coherentFSs.find( ielement )->second->find ( v_temp[ 0 ] )->second; + pvE_p_TH = coherentFSs.find( ielement )->second->find ( v_temp[ 1 ] )->second; + } + else if ( tempLH.second == 0.0 ) + { + pvE_p_TL = coherentFSs.find( ielement )->second->find ( v_temp.back() )->second; + std::vector< G4double >::iterator itv; + itv = v_temp.end(); + itv--; + itv--; + pvE_p_TL = coherentFSs.find( ielement )->second->find ( *itv )->second; + } + + + std::vector< G4double > vE_T; + std::vector< G4double > vp_T; + + G4int n1 = pvE_p_TL->size(); + //G4int n2 = pvE_p_TH->size(); + + for ( G4int i=1 ; i < n1 ; i++ ) + { + if ( (*pvE_p_TL)[i]->first != (*pvE_p_TH)[i]->first ) abort(); + vE_T.push_back ( (*pvE_p_TL)[i]->first ); + vp_T.push_back ( get_linear_interpolated ( aTemp , std::pair< G4double , G4double > ( tempLH.first , (*pvE_p_TL)[i]->second ) , std::pair< G4double , G4double > ( tempLH.second , (*pvE_p_TL)[i]->second ) ) ); + } + + G4int j = 0; + for ( G4int i = 1 ; i < n ; i++ ) + { + if ( E/eV < vE_T[ i ] ) + { + j = i-1; + break; + } + } + + G4double rand_for_mu = G4UniformRand(); + + G4int k = 0; + for ( G4int i = 1 ; i < j ; i++ ) + { + G4double Pi = vp_T[ i ] / vp_T[ j ]; + if ( rand_for_mu < Pi ) + { + k = i-1; + break; + } + } + + G4double Ei = vE_T[ j ]; + + G4double mu = 1 - 2 * Ei / (E/eV) ; + + theParticleChange.SetEnergyChange( E ); + theParticleChange.SetMomentumChange( 0.0 , std::sqrt ( 1 - mu*mu ) , mu ); + + + } + else + { + // InCoherent Elastic + + // T_L and T_H + std::map < G4double , std::vector < E_isoAng* >* >::iterator it; + std::vector v_temp; + v_temp.clear(); + for ( it = incoherentFSs.find( ielement )->second->begin() ; it != incoherentFSs.find( ielement )->second->end() ; it++ ) + { + v_temp.push_back( it->first ); + } + +// T_L T_H + std::pair < G4double , G4double > tempLH = find_LH ( aTemp , &v_temp ); + +// +// For T_L anEPM_TL and T_H anEPM_TH +// + + E_isoAng anEPM_TL_E; + E_isoAng anEPM_TH_E; + + if ( tempLH.first != 0.0 && tempLH.second != 0.0 ) + { + anEPM_TL_E = create_E_isoAng_from_energy ( aTrack.GetKineticEnergy() , incoherentFSs.find( ielement )->second->find ( tempLH.first/kelvin )->second ); + anEPM_TH_E = create_E_isoAng_from_energy ( aTrack.GetKineticEnergy() , incoherentFSs.find( ielement )->second->find ( tempLH.second/kelvin )->second ); + } + else if ( tempLH.first == 0.0 ) + { + anEPM_TL_E = create_E_isoAng_from_energy ( aTrack.GetKineticEnergy() , incoherentFSs.find( ielement )->second->find ( v_temp[ 0 ] )->second ); + anEPM_TH_E = create_E_isoAng_from_energy ( aTrack.GetKineticEnergy() , incoherentFSs.find( ielement )->second->find ( v_temp[ 1 ] )->second ); + } + else if ( tempLH.second == 0.0 ) + { + anEPM_TH_E = create_E_isoAng_from_energy ( aTrack.GetKineticEnergy() , incoherentFSs.find( ielement )->second->find ( v_temp.back() )->second ); + std::vector< G4double >::iterator itv; + itv = v_temp.end(); + itv--; + itv--; + anEPM_TL_E = create_E_isoAng_from_energy ( aTrack.GetKineticEnergy() , incoherentFSs.find( ielement )->second->find ( *itv )->second ); + } + + // E_isoAng for aTemp and aTrack.GetKineticEnergy() + E_isoAng anEPM_T_E; + + if ( anEPM_TL_E.n == anEPM_TH_E.n ) + { + anEPM_T_E.n = anEPM_TL_E.n; + for ( G4int i=0 ; i < anEPM_TL_E.n ; i++ ) + { + G4double angle; + angle = get_linear_interpolated ( aTemp , std::pair< G4double , G4double > ( tempLH.first , anEPM_TL_E.isoAngle[ i ] ) , std::pair< G4double , G4double > ( tempLH.second , anEPM_TH_E.isoAngle[ i ] ) ); + anEPM_T_E.isoAngle.push_back( angle ); + } + } + else + { + std::cout << "Do not Suuport yet." << std::endl; + } + + // Decide mu + G4double mu = getMu ( &anEPM_T_E ); + + // Set Final State + theParticleChange.SetEnergyChange( aTrack.GetKineticEnergy() ); // No energy change in Elastic + theParticleChange.SetMomentumChange( 0.0 , std::sqrt ( 1 - mu*mu ) , mu ); + + } + delete dp; + + return &theParticleChange; + + } + else + { + // Not thermal element + // Neutron HP will handle + return theHPElastic -> ApplyYourself( aTrack, aNucleus ); + } + +} + + + +G4double G4NeutronHPThermalScattering::getMu( E_isoAng* anEPM ) +{ + + G4double random = G4UniformRand(); + G4double result = 0.0; + + G4int in = int ( random * ( (*anEPM).n ) ); + + if ( in != 0 ) + { + G4double mu_l = (*anEPM).isoAngle[ in-1 ]; + G4double mu_h = (*anEPM).isoAngle[ in ]; + result = ( mu_h - mu_l ) * ( random * ( (*anEPM).n ) - in ) + mu_l; + } + else + { + G4double x = random * (*anEPM).n; + G4double D = ( (*anEPM).isoAngle[ 0 ] - ( -1 ) ) + ( 1 - (*anEPM).isoAngle[ (*anEPM).n - 1 ] ); + G4double ratio = ( (*anEPM).isoAngle[ 0 ] - ( -1 ) ) / D; + if ( x <= ratio ) + { + G4double mu_l = -1; + G4double mu_h = (*anEPM).isoAngle[ 0 ]; + result = ( mu_h - mu_l ) * x + mu_l; + } + else + { + G4double mu_l = (*anEPM).isoAngle[ (*anEPM).n - 1 ]; + G4double mu_h = 1; + result = ( mu_h - mu_l ) * x + mu_l; + } + } + return result; +} + + + +std::pair < G4double , G4double > G4NeutronHPThermalScattering::find_LH ( G4double x , std::vector< G4double >* aVector ) +{ + G4double L = 0.0; + G4double H = 0.0; + std::vector< G4double >::iterator it; + for ( it = aVector->begin() ; it != aVector->end() ; it++ ) + { + if ( x <= *it ) + { + H = *it; + if ( it != aVector->begin() ) + { + it--; + L = *it; + } + else + { + L = 0.0; + } + break; + } + } + if ( H == 0.0 ) + L = aVector->back(); + + return std::pair < G4double , G4double > ( L , H ); +} + + + +G4double G4NeutronHPThermalScattering::get_linear_interpolated ( G4double x , std::pair< G4double , G4double > Low , std::pair< G4double , G4double > High ) +{ + G4double y=0.0; + if ( High.first - Low.first != 0 ) + y = ( High.second - Low.second ) / ( High.first - Low.first ) * ( x - Low.first ) + Low.second; + else + std::cout << "G4NeutronHPThermalScattering liner interpolation err!!" << std::endl; + + return y; +} + + + +E_isoAng G4NeutronHPThermalScattering::create_E_isoAng_from_energy ( G4double energy , std::vector< E_isoAng* >* vEPM ) +{ + E_isoAng anEPM_T_E; + + std::vector< E_isoAng* >::iterator iv; + + std::vector< G4double > v_e; + v_e.clear(); + for ( iv = vEPM->begin() ; iv != vEPM->end() ; iv++ ) + v_e.push_back ( (*iv)->energy ); + + std::pair < G4double , G4double > energyLH = find_LH ( energy , &v_e ); + //std::cout << " " << energy/eV << " " << energyLH.first/eV << " " << energyLH.second/eV << std::endl; + + E_isoAng* panEPM_T_EL=NULL; + E_isoAng* panEPM_T_EH=NULL; + + if ( energyLH.first != 0.0 && energyLH.second != 0.0 ) + { + for ( iv = vEPM->begin() ; iv != vEPM->end() ; iv++ ) + { + if ( energyLH.first == (*iv)->energy ) + break; + } + panEPM_T_EL = *iv; + iv++; + panEPM_T_EH = *iv; + } + else if ( energyLH.first == 0.0 ) + { + panEPM_T_EL = (*vEPM)[0]; + panEPM_T_EH = (*vEPM)[1]; + } + else if ( energyLH.second == 0.0 ) + { + panEPM_T_EH = (*vEPM).back(); + iv = vEPM->end(); + iv--; + iv--; + panEPM_T_EL = *iv; + } + + if ( panEPM_T_EL->n == panEPM_T_EH->n ) + { + anEPM_T_E.energy = energy; + anEPM_T_E.n = panEPM_T_EL->n; + + for ( G4int i=0 ; i < panEPM_T_EL->n ; i++ ) + { + G4double angle; + angle = get_linear_interpolated ( energy , std::pair< G4double , G4double > ( energyLH.first , panEPM_T_EL->isoAngle[ i ] ) , std::pair< G4double , G4double > ( energyLH.second , panEPM_T_EH->isoAngle[ i ] ) ); + anEPM_T_E.isoAngle.push_back( angle ); + } + } + else + { + G4cout << "G4NeutronHPThermalScattering Do not Suuport yet." << G4endl; + } + + + return anEPM_T_E; +} + + + +G4double G4NeutronHPThermalScattering::get_secondary_energy_from_E_P_E_isoAng ( G4double random , E_P_E_isoAng* anE_P_E_isoAng ) +{ + + G4double secondary_energy = 0.0; + + G4int n = anE_P_E_isoAng->n; + G4double sum_p = 0.0; // sum_p_H + G4double sum_p_L = 0.0; + + G4double total=0.0; + +/* + delete for speed up + for ( G4int i = 0 ; i < n-1 ; i++ ) + { + G4double E_L = anE_P_E_isoAng->vE_isoAngle[i]->energy/eV; + G4double E_H = anE_P_E_isoAng->vE_isoAngle[i+1]->energy/eV; + G4double dE = E_H - E_L; + total += ( ( anE_P_E_isoAng->prob[i] ) * dE ); + } + + if ( std::abs( total - anE_P_E_isoAng->sum_of_probXdEs ) > 1.0e-14 ) std::cout << total - anE_P_E_isoAng->sum_of_probXdEs << std::endl; +*/ + total = anE_P_E_isoAng->sum_of_probXdEs; + + for ( G4int i = 0 ; i < n-1 ; i++ ) + { + G4double E_L = anE_P_E_isoAng->vE_isoAngle[i]->energy/eV; + G4double E_H = anE_P_E_isoAng->vE_isoAngle[i+1]->energy/eV; + G4double dE = E_H - E_L; + sum_p += ( ( anE_P_E_isoAng->prob[i] ) * dE ); + + if ( random <= sum_p/total ) + { + secondary_energy = get_linear_interpolated ( random , std::pair < G4double , G4double > ( sum_p_L/total , E_L ) , std::pair < G4double , G4double > ( sum_p/total , E_H ) ); + secondary_energy = secondary_energy*eV; //need eV + break; + } + sum_p_L = sum_p; + } + + return secondary_energy; +} + + + +std::pair< G4double , E_isoAng > G4NeutronHPThermalScattering::create_sE_and_EPM_from_pE_and_vE_P_E_isoAng ( G4double rand_for_sE , G4double pE , std::vector < E_P_E_isoAng* >* vNEP_EPM ) +{ + + std::map< G4double , G4int > map_energy; + map_energy.clear(); + std::vector< G4double > v_energy; + v_energy.clear(); + std::vector< E_P_E_isoAng* >::iterator itv; + G4int i = 0; + for ( itv = vNEP_EPM->begin(); itv != vNEP_EPM->end(); itv++ ) + { + v_energy.push_back( (*itv)->energy ); + map_energy.insert( std::pair < G4double , G4int > ( (*itv)->energy , i ) ); + i++; + } + + std::pair < G4double , G4double > energyLH = find_LH ( pE , &v_energy ); + + E_P_E_isoAng* pE_P_E_isoAng_EL = NULL; + E_P_E_isoAng* pE_P_E_isoAng_EH = NULL; + + if ( energyLH.first != 0.0 && energyLH.second != 0.0 ) + { + pE_P_E_isoAng_EL = (*vNEP_EPM)[ map_energy.find ( energyLH.first )->second ]; + pE_P_E_isoAng_EH = (*vNEP_EPM)[ map_energy.find ( energyLH.second )->second ]; + } + else if ( energyLH.first == 0.0 ) + { + pE_P_E_isoAng_EL = (*vNEP_EPM)[ 0 ]; + pE_P_E_isoAng_EH = (*vNEP_EPM)[ 1 ]; + } + if ( energyLH.second == 0.0 ) + { + pE_P_E_isoAng_EH = (*vNEP_EPM).back(); + itv = vNEP_EPM->end(); + itv--; + itv--; + pE_P_E_isoAng_EL = *itv; + } + + + G4double sE; + G4double sE_L; + G4double sE_H; + + + sE_L = get_secondary_energy_from_E_P_E_isoAng ( rand_for_sE , pE_P_E_isoAng_EL ); + sE_H = get_secondary_energy_from_E_P_E_isoAng ( rand_for_sE , pE_P_E_isoAng_EH ); + + sE = get_linear_interpolated ( pE , std::pair < G4double , G4double > ( energyLH.first , sE_L ) , std::pair < G4double , G4double > ( energyLH.second , sE_H ) ); + + + E_isoAng E_isoAng_L = create_E_isoAng_from_energy ( sE , &(pE_P_E_isoAng_EL->vE_isoAngle) ); + E_isoAng E_isoAng_H = create_E_isoAng_from_energy ( sE , &(pE_P_E_isoAng_EH->vE_isoAngle) ); + + E_isoAng anE_isoAng; + if ( E_isoAng_L.n == E_isoAng_H.n ) + { + anE_isoAng.n = E_isoAng_L.n; + for ( G4int i=0 ; i < anE_isoAng.n ; i++ ) + { + G4double angle; + angle = get_linear_interpolated ( sE , std::pair< G4double , G4double > ( sE_L , E_isoAng_L.isoAngle[ i ] ) , std::pair< G4double , G4double > ( sE_H , E_isoAng_H.isoAngle[ i ] ) ); + anE_isoAng.isoAngle.push_back( angle ); + } + } + else + { + std::cout << "Do not Suuport yet." << std::endl; + } + + + + return std::pair< G4double , E_isoAng >( sE , anE_isoAng); +} + diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPThermalScatteringData.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPThermalScatteringData.cc new file mode 100644 index 0000000000..f9835b9c58 --- /dev/null +++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPThermalScatteringData.cc @@ -0,0 +1,285 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// Thermal Neutron Scattering +// Koi, Tatsumi (SCCS/SLAC) +// +// Class Description +// Cross Sections for a high precision (based on evaluated data +// libraries) description of themal neutron scattering below 4 eV; +// Based on Thermal neutron scattering files +// from the evaluated nuclear data files ENDF/B-VI, Release2 +// To be used in your physics list in case you need this physics. +// In this case you want to register an object of this class with +// the corresponding process. +// Class Description - End + +// 15-Nov-06 First implementation is done by T. Koi (SLAC/SCCS) + +#include "G4NeutronHPThermalScatteringData.hh" +#include "G4Neutron.hh" +#include "G4ElementTable.hh" +//#include "G4NeutronHPData.hh" + + + +G4NeutronHPThermalScatteringData::G4NeutronHPThermalScatteringData() +{ +// Upper limit of neutron energy + emax = 4*eV; + + indexOfThermalElement.clear(); + + names = new G4NeutronHPThermalScatteringNames(); + + BuildPhysicsTable( *G4Neutron::Neutron() ); +} + + + +G4NeutronHPThermalScatteringData::~G4NeutronHPThermalScatteringData() +{ + delete names; +} + + + +G4bool G4NeutronHPThermalScatteringData::IsApplicable( const G4DynamicParticle* aP , const G4Element* anEle ) +{ + G4bool result = false; + + G4double eKin = aP->GetKineticEnergy(); + // Check energy + if ( eKin < emax ) + { + // Check Particle Species + if ( aP->GetDefinition() == G4Neutron::Neutron() ) + { + // anEle is one of Thermal elements + G4int ie = (G4int) anEle->GetIndex(); + std::vector < G4int >::iterator it; + for ( it = indexOfThermalElement.begin() ; it != indexOfThermalElement.end() ; it++ ) + { + if ( ie == *it ) return true; + } + } + } + +/* + if ( names->IsThisThermalElement ( anEle->GetName() ) ) + { + // Check energy and projectile species + G4double eKin = aP->GetKineticEnergy(); + if ( eKin < emax && aP->GetDefinition() == G4Neutron::Neutron() ) result = true; + } +*/ + return result; +} + + +void G4NeutronHPThermalScatteringData::BuildPhysicsTable(const G4ParticleDefinition& aP) +{ + + if ( &aP != G4Neutron::Neutron() ) + throw G4HadronicException(__FILE__, __LINE__, "Attempt to use NeutronHP data for particles other than neutrons!!!"); + + indexOfThermalElement.clear(); + + static const G4ElementTable* theElementTable = G4Element::GetElementTable(); + size_t numberOfElements = G4Element::GetNumberOfElements(); + size_t numberOfThermalElements = 0; + for ( size_t i = 0 ; i < numberOfElements ; i++ ) + { + if ( names->IsThisThermalElement ( (*theElementTable)[i]->GetName() ) ) + { + indexOfThermalElement.push_back( i ); + numberOfThermalElements++; + } + } + + // Read Cross Section Data files + + G4String dirName; + if ( !getenv( "NeutronHPCrossSections" ) ) + throw G4HadronicException(__FILE__, __LINE__, "Please setenv NeutronHPCrossSections to point to the neutron cross-section files."); + G4String baseName = getenv( "NeutronHPCrossSections" ); + + dirName = baseName + "/ThermalScattering"; + + G4String ndl_filename; + G4String name; + + for ( size_t i = 0 ; i < numberOfThermalElements ; i++ ) + { + ndl_filename = names->GetTS_NDL_Name( (*theElementTable)[ indexOfThermalElement[ i ] ]->GetName() ); + + // Coherent + name = dirName + "/Coherent/CrossSection/" + ndl_filename; + std::map< G4double , G4NeutronHPVector* >* coh_amapTemp_EnergyCross = readData( name ); + coherent.insert ( std::pair < G4int , std::map< G4double , G4NeutronHPVector* >* > ( indexOfThermalElement[ i ] , coh_amapTemp_EnergyCross ) ); + + // Incoherent + name = dirName + "/Incoherent/CrossSection/" + ndl_filename; + std::map< G4double , G4NeutronHPVector* >* incoh_amapTemp_EnergyCross = readData( name ); + incoherent.insert ( std::pair < G4int , std::map< G4double , G4NeutronHPVector* >* > ( indexOfThermalElement[ i ] , incoh_amapTemp_EnergyCross ) ); + + // Inelastic + name = dirName + "/Inelastic/CrossSection/" + ndl_filename; + std::map< G4double , G4NeutronHPVector* >* inela_amapTemp_EnergyCross = readData( name ); + inelastic.insert ( std::pair < G4int , std::map< G4double , G4NeutronHPVector* >* > ( indexOfThermalElement[ i ] , inela_amapTemp_EnergyCross ) ); + } + +} + + + +std::map< G4double , G4NeutronHPVector* >* G4NeutronHPThermalScatteringData::readData ( G4String name ) +{ + + std::map< G4double , G4NeutronHPVector* >* aData = new std::map< G4double , G4NeutronHPVector* >; + + std::ifstream theChannel( name.c_str() ); + + //G4cout << "G4NeutronHPThermalScatteringData " << name << G4endl; + + G4int dummy; + while ( theChannel >> dummy ) // MF + { + theChannel >> dummy; // MT + G4double temp; + theChannel >> temp; + G4NeutronHPVector* anEnergyCross = new G4NeutronHPVector; + G4int nData; + theChannel >> nData; + anEnergyCross->Init ( theChannel , nData , eV , barn ); + aData->insert ( std::pair < G4double , G4NeutronHPVector* > ( temp , anEnergyCross ) ); + } + theChannel.close(); + + return aData; + +} + + + +void G4NeutronHPThermalScatteringData::DumpPhysicsTable( const G4ParticleDefinition& aP ) +{ + if( &aP != G4Neutron::Neutron() ) + throw G4HadronicException(__FILE__, __LINE__, "Attempt to use NeutronHP data for particles other than neutrons!!!"); +// G4cout << "G4NeutronHPThermalScatteringData::DumpPhysicsTable still to be implemented"<GetIndex(); + + G4double Xcoh = GetX ( aP , aT , coherent.find(iele)->second ); + G4double Xincoh = GetX ( aP , aT , incoherent.find(iele)->second ); + G4double Xinela = GetX ( aP , aT , inelastic.find(iele)->second ); + + result = Xcoh + Xincoh + Xinela; + + //G4cout << "G4NeutronHPThermalScatteringData::GetCrossSection Tot= " << result/barn << " Coherent= " << Xcoh/barn << " Incoherent= " << Xincoh/barn << " Inelastic= " << Xinela/barn << G4endl; + + return result; +} + + + +G4double G4NeutronHPThermalScatteringData::GetInelasticCrossSection( const G4DynamicParticle* aP , const G4Element*anE , G4double aT ) +{ + G4double result = 0; + G4int iele = anE->GetIndex(); + result = GetX ( aP , aT , inelastic.find(iele)->second ); + return result; +} + + + +G4double G4NeutronHPThermalScatteringData::GetCoherentCrossSection( const G4DynamicParticle* aP , const G4Element*anE , G4double aT ) +{ + G4double result = 0; + G4int iele = anE->GetIndex(); + result = GetX ( aP , aT , coherent.find(iele)->second ); + return result; +} + + + +G4double G4NeutronHPThermalScatteringData::GetIncoherentCrossSection( const G4DynamicParticle* aP , const G4Element*anE , G4double aT ) +{ + G4double result = 0; + G4int iele = anE->GetIndex(); + result = GetX ( aP , aT , incoherent.find(iele)->second ); + return result; +} + + + + +G4double G4NeutronHPThermalScatteringData::GetX ( const G4DynamicParticle* aP, G4double aT , std::map < G4double , G4NeutronHPVector* >* amapTemp_EnergyCross ) +{ + G4double result = 0; + if ( amapTemp_EnergyCross->size() == 0 ) return result; + + std::map< G4double , G4NeutronHPVector* >::iterator it; + for ( it = amapTemp_EnergyCross->begin() ; it != amapTemp_EnergyCross->end() ; it++ ) + { + if ( aT < it->first ) break; + } + if ( it == amapTemp_EnergyCross->begin() ) it++; // lower than first + else if ( it == amapTemp_EnergyCross->end() ) it--; // upper than last + + G4double eKinetic = aP->GetKineticEnergy(); + + G4double TH = it->first; + G4double XH = it->second->GetXsec ( eKinetic ); + + //G4cout << "G4NeutronHPThermalScatteringData::GetX TH " << TH << " E " << eKinetic << " XH " << XH << G4endl; + + it--; + G4double TL = it->first; + G4double XL = it->second->GetXsec ( eKinetic ); + + //G4cout << "G4NeutronHPThermalScatteringData::GetX TL " << TL << " E " << eKinetic << " XL " << XL << G4endl; + + if ( TH == TL ) + throw G4HadronicException(__FILE__, __LINE__, "Thermal Scattering Data Error!"); + + G4double T = aT; + G4double X = ( XH - XL ) / ( TH - TL ) * ( T - TL ) + XL; + result = X; + + return result; +} diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04TrackerHit.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPThermalScatteringNames.cc similarity index 57% rename from examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04TrackerHit.cc rename to source/processes/hadronic/models/neutron_hp/src/G4NeutronHPThermalScatteringNames.cc index 90b9e89201..420b8f96e0 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/src/ExN04TrackerHit.cc +++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPThermalScatteringNames.cc @@ -23,57 +23,44 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// Class Description +// Name list of Elements for a high precision (based on evaluated data +// libraries) description of themal neutron scattering below 4 eV; +// Based on Thermal neutron scattering files +// from the evaluated nuclear data files ENDF/B-VI, Release2 +// To be used in your physics list in case you need this physics. +// In this case you want to register an object of this class with +// the corresponding process. +// Class Description - End -#include "ExN04TrackerHit.hh" -#include "G4VVisManager.hh" -#include "G4Circle.hh" -#include "G4Colour.hh" -#include "G4VisAttributes.hh" +// 15-Nov-06 First implementation is done by T. Koi (SLAC/SCCS) + +#include "G4NeutronHPThermalScatteringNames.hh" +#include "G4Neutron.hh" +#include "G4ElementTable.hh" +//#include "G4NeutronHPData.hh" -G4Allocator ExN04TrackerHitAllocator; -ExN04TrackerHit::ExN04TrackerHit() -{;} - -ExN04TrackerHit::~ExN04TrackerHit() -{;} - -ExN04TrackerHit::ExN04TrackerHit(const ExN04TrackerHit &right) - : G4VHit() +G4NeutronHPThermalScatteringNames::G4NeutronHPThermalScatteringNames() { - edep = right.edep; - pos = right.pos; + names.insert ( std::pair < G4String , G4String > ( "TS_H_of_Water" , "h_water" ) ); + names.insert ( std::pair < G4String , G4String > ( "TS_H_of_Polyethylene" , "h_polyethylene" ) ); + names.insert ( std::pair < G4String , G4String > ( "TS_C_of_Graphite" , "graphite" ) ); } -const ExN04TrackerHit& ExN04TrackerHit::operator=(const ExN04TrackerHit &right) + + +G4NeutronHPThermalScatteringNames::~G4NeutronHPThermalScatteringNames() { - edep = right.edep; - pos = right.pos; - return *this; +; } -G4int ExN04TrackerHit::operator==(const ExN04TrackerHit &right) const + + +G4bool G4NeutronHPThermalScatteringNames::IsThisThermalElement( G4String aname) { - return (this==&right) ? 1 : 0; + G4bool result = false; + if ( names.find ( aname ) != names.end() ) result = true; + return result; } - -void ExN04TrackerHit::Draw() -{ - G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance(); - if(pVVisManager) - { - G4Circle circle(pos); - circle.SetScreenSize(0.04); - circle.SetFillStyle(G4Circle::filled); - G4Colour colour(1.,0.,0.); - G4VisAttributes attribs(colour); - circle.SetVisAttributes(attribs); - pVVisManager->Draw(circle); - } -} - -void ExN04TrackerHit::Print() -{;} - - diff --git a/source/processes/hadronic/models/parton_string/diffraction/include/G4DiffractiveSplitableHadron.hh b/source/processes/hadronic/models/parton_string/diffraction/include/G4DiffractiveSplitableHadron.hh index 8b86d4b25f..afe6b0fa27 100644 --- a/source/processes/hadronic/models/parton_string/diffraction/include/G4DiffractiveSplitableHadron.hh +++ b/source/processes/hadronic/models/parton_string/diffraction/include/G4DiffractiveSplitableHadron.hh @@ -25,7 +25,7 @@ // // // $Id: G4DiffractiveSplitableHadron.hh,v 1.4 2006/06/29 20:54:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4DiffractiveSplitableHadron_h diff --git a/source/processes/hadronic/models/parton_string/diffraction/include/G4FTFModel.hh b/source/processes/hadronic/models/parton_string/diffraction/include/G4FTFModel.hh index ca1e46d80b..8b50d078e6 100644 --- a/source/processes/hadronic/models/parton_string/diffraction/include/G4FTFModel.hh +++ b/source/processes/hadronic/models/parton_string/diffraction/include/G4FTFModel.hh @@ -25,7 +25,7 @@ // // // $Id: G4FTFModel.hh,v 1.4 2006/06/29 20:54:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Class Description // Final state production code for hadron inelastic scattering above 20 GeV diff --git a/source/processes/hadronic/models/parton_string/diffraction/include/G4FTFParticipants.hh b/source/processes/hadronic/models/parton_string/diffraction/include/G4FTFParticipants.hh index 2a6d8cbc0c..333e4034dc 100644 --- a/source/processes/hadronic/models/parton_string/diffraction/include/G4FTFParticipants.hh +++ b/source/processes/hadronic/models/parton_string/diffraction/include/G4FTFParticipants.hh @@ -25,7 +25,7 @@ // // // $Id: G4FTFParticipants.hh,v 1.4 2006/06/29 20:54:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4FTFParticipants_h diff --git a/source/processes/hadronic/models/parton_string/diffraction/src/G4DiffractiveSplitableHadron.cc b/source/processes/hadronic/models/parton_string/diffraction/src/G4DiffractiveSplitableHadron.cc index b52f830c88..c634a13342 100644 --- a/source/processes/hadronic/models/parton_string/diffraction/src/G4DiffractiveSplitableHadron.cc +++ b/source/processes/hadronic/models/parton_string/diffraction/src/G4DiffractiveSplitableHadron.cc @@ -25,7 +25,7 @@ // // // $Id: G4DiffractiveSplitableHadron.cc,v 1.6 2006/06/29 20:54:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------ diff --git a/source/processes/hadronic/models/parton_string/diffraction/src/G4FTFModel.cc b/source/processes/hadronic/models/parton_string/diffraction/src/G4FTFModel.cc index 62ef09a30e..c5d0e9c100 100644 --- a/source/processes/hadronic/models/parton_string/diffraction/src/G4FTFModel.cc +++ b/source/processes/hadronic/models/parton_string/diffraction/src/G4FTFModel.cc @@ -25,7 +25,7 @@ // // // $Id: G4FTFModel.cc,v 1.6 2006/06/29 20:54:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------ diff --git a/source/processes/hadronic/models/parton_string/diffraction/src/G4FTFParticipants.cc b/source/processes/hadronic/models/parton_string/diffraction/src/G4FTFParticipants.cc index f215c193f0..c852723df5 100644 --- a/source/processes/hadronic/models/parton_string/diffraction/src/G4FTFParticipants.cc +++ b/source/processes/hadronic/models/parton_string/diffraction/src/G4FTFParticipants.cc @@ -25,7 +25,7 @@ // // // $Id: G4FTFParticipants.cc,v 1.6 2006/06/29 20:54:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------ // GEANT 4 class implementation file diff --git a/source/processes/hadronic/models/parton_string/hadronization/include/G4ExcitedStringDecay.hh b/source/processes/hadronic/models/parton_string/hadronization/include/G4ExcitedStringDecay.hh index 0370bccf07..c7861a5a06 100644 --- a/source/processes/hadronic/models/parton_string/hadronization/include/G4ExcitedStringDecay.hh +++ b/source/processes/hadronic/models/parton_string/hadronization/include/G4ExcitedStringDecay.hh @@ -25,7 +25,7 @@ // // // $Id: G4ExcitedStringDecay.hh,v 1.5 2006/06/29 20:54:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4ExcitedStringDecay_h #define G4ExcitedStringDecay_h 1 diff --git a/source/processes/hadronic/models/parton_string/hadronization/include/G4FragmentingString.hh b/source/processes/hadronic/models/parton_string/hadronization/include/G4FragmentingString.hh index 9d5df21bb8..9b3d3c167b 100644 --- a/source/processes/hadronic/models/parton_string/hadronization/include/G4FragmentingString.hh +++ b/source/processes/hadronic/models/parton_string/hadronization/include/G4FragmentingString.hh @@ -25,7 +25,7 @@ // // // $Id: G4FragmentingString.hh,v 1.3 2006/06/29 20:54:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4FragmentingString_h diff --git a/source/processes/hadronic/models/parton_string/hadronization/include/G4HadronBuilder.hh b/source/processes/hadronic/models/parton_string/hadronization/include/G4HadronBuilder.hh index 6f52536d09..e1fa9668d4 100644 --- a/source/processes/hadronic/models/parton_string/hadronization/include/G4HadronBuilder.hh +++ b/source/processes/hadronic/models/parton_string/hadronization/include/G4HadronBuilder.hh @@ -25,7 +25,7 @@ // // // $Id: G4HadronBuilder.hh,v 1.3 2006/06/29 20:54:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ----------------------------------------------------------------------------- // GEANT 4 class header file diff --git a/source/processes/hadronic/models/parton_string/hadronization/include/G4LundStringFragmentation.hh b/source/processes/hadronic/models/parton_string/hadronization/include/G4LundStringFragmentation.hh index f24586f0c4..579adabc97 100644 --- a/source/processes/hadronic/models/parton_string/hadronization/include/G4LundStringFragmentation.hh +++ b/source/processes/hadronic/models/parton_string/hadronization/include/G4LundStringFragmentation.hh @@ -25,7 +25,7 @@ // // // $Id: G4LundStringFragmentation.hh,v 1.3 2006/06/29 20:54:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ Maxim Komogorov +// GEANT4 tag $Name: geant4-08-02 $ Maxim Komogorov // // ----------------------------------------------------------------------------- // GEANT 4 class implementation file diff --git a/source/processes/hadronic/models/parton_string/hadronization/include/G4QGSMFragmentation.hh b/source/processes/hadronic/models/parton_string/hadronization/include/G4QGSMFragmentation.hh index 21393d4dea..8480fb6e87 100644 --- a/source/processes/hadronic/models/parton_string/hadronization/include/G4QGSMFragmentation.hh +++ b/source/processes/hadronic/models/parton_string/hadronization/include/G4QGSMFragmentation.hh @@ -25,7 +25,7 @@ // // // $Id: G4QGSMFragmentation.hh,v 1.3 2006/06/29 20:54:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ----------------------------------------------------------------------------- // GEANT 4 class implementation file diff --git a/source/processes/hadronic/models/parton_string/hadronization/include/G4VKinkyStringDecay.hh b/source/processes/hadronic/models/parton_string/hadronization/include/G4VKinkyStringDecay.hh index 1aec0be1ed..8a1eaea695 100644 --- a/source/processes/hadronic/models/parton_string/hadronization/include/G4VKinkyStringDecay.hh +++ b/source/processes/hadronic/models/parton_string/hadronization/include/G4VKinkyStringDecay.hh @@ -25,7 +25,7 @@ // // // $Id: G4VKinkyStringDecay.hh,v 1.3 2006/06/29 20:54:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // Maxim Komogorov // // ----------------------------------------------------------------------------- diff --git a/source/processes/hadronic/models/parton_string/hadronization/include/G4VLongitudinalStringDecay.hh b/source/processes/hadronic/models/parton_string/hadronization/include/G4VLongitudinalStringDecay.hh index d849c599bf..ac21db90f5 100644 --- a/source/processes/hadronic/models/parton_string/hadronization/include/G4VLongitudinalStringDecay.hh +++ b/source/processes/hadronic/models/parton_string/hadronization/include/G4VLongitudinalStringDecay.hh @@ -25,7 +25,7 @@ // // // $Id: G4VLongitudinalStringDecay.hh,v 1.3 2006/06/29 20:54:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // Maxim Komogorov // // ----------------------------------------------------------------------------- diff --git a/source/processes/hadronic/models/parton_string/hadronization/src/G4HadronBuilder.cc b/source/processes/hadronic/models/parton_string/hadronization/src/G4HadronBuilder.cc index 1424790397..0b51e3bc2a 100644 --- a/source/processes/hadronic/models/parton_string/hadronization/src/G4HadronBuilder.cc +++ b/source/processes/hadronic/models/parton_string/hadronization/src/G4HadronBuilder.cc @@ -25,7 +25,7 @@ // // // $Id: G4HadronBuilder.cc,v 1.6 2006/06/29 20:55:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ----------------------------------------------------------------------------- // GEANT 4 class implementation file diff --git a/source/processes/hadronic/models/parton_string/hadronization/src/G4LundStringFragmentation.cc b/source/processes/hadronic/models/parton_string/hadronization/src/G4LundStringFragmentation.cc index 1b57e9ea79..68993deef3 100644 --- a/source/processes/hadronic/models/parton_string/hadronization/src/G4LundStringFragmentation.cc +++ b/source/processes/hadronic/models/parton_string/hadronization/src/G4LundStringFragmentation.cc @@ -25,7 +25,7 @@ // // // $Id: G4LundStringFragmentation.cc,v 1.5 2006/06/29 20:55:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ----------------------------------------------------------------------------- // GEANT 4 class implementation file diff --git a/source/processes/hadronic/models/parton_string/hadronization/src/G4QGSMFragmentation.cc b/source/processes/hadronic/models/parton_string/hadronization/src/G4QGSMFragmentation.cc index 1a9c1049b1..07d4e7996e 100644 --- a/source/processes/hadronic/models/parton_string/hadronization/src/G4QGSMFragmentation.cc +++ b/source/processes/hadronic/models/parton_string/hadronization/src/G4QGSMFragmentation.cc @@ -25,7 +25,7 @@ // // // $Id: G4QGSMFragmentation.cc,v 1.5 2006/06/29 20:55:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ----------------------------------------------------------------------------- // GEANT 4 class implementation file diff --git a/source/processes/hadronic/models/parton_string/hadronization/src/G4VKinkyStringDecay.cc b/source/processes/hadronic/models/parton_string/hadronization/src/G4VKinkyStringDecay.cc index ee3b78f4db..4217252383 100644 --- a/source/processes/hadronic/models/parton_string/hadronization/src/G4VKinkyStringDecay.cc +++ b/source/processes/hadronic/models/parton_string/hadronization/src/G4VKinkyStringDecay.cc @@ -25,7 +25,7 @@ // // // $Id: G4VKinkyStringDecay.cc,v 1.3 2006/06/29 20:55:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // Maxim Komogorov // // ----------------------------------------------------------------------------- diff --git a/source/processes/hadronic/models/parton_string/hadronization/src/G4VLongitudinalStringDecay.cc b/source/processes/hadronic/models/parton_string/hadronization/src/G4VLongitudinalStringDecay.cc index 24458565f7..9e58bc13a6 100644 --- a/source/processes/hadronic/models/parton_string/hadronization/src/G4VLongitudinalStringDecay.cc +++ b/source/processes/hadronic/models/parton_string/hadronization/src/G4VLongitudinalStringDecay.cc @@ -25,7 +25,7 @@ // // // $Id: G4VLongitudinalStringDecay.cc,v 1.5 2006/06/29 20:55:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ----------------------------------------------------------------------------- // GEANT 4 class implementation file diff --git a/source/processes/hadronic/models/parton_string/management/include/G4EventGenerator.hh b/source/processes/hadronic/models/parton_string/management/include/G4EventGenerator.hh index d6cc8895eb..03f67b2ecd 100644 --- a/source/processes/hadronic/models/parton_string/management/include/G4EventGenerator.hh +++ b/source/processes/hadronic/models/parton_string/management/include/G4EventGenerator.hh @@ -25,7 +25,7 @@ // // // $Id: G4EventGenerator.hh,v 1.3 2006/06/29 20:55:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4EventGenerator_h #define G4EventGenerator_h 1 diff --git a/source/processes/hadronic/models/parton_string/management/include/G4InteractionCode.hh b/source/processes/hadronic/models/parton_string/management/include/G4InteractionCode.hh index fbcce2affa..301c31d781 100644 --- a/source/processes/hadronic/models/parton_string/management/include/G4InteractionCode.hh +++ b/source/processes/hadronic/models/parton_string/management/include/G4InteractionCode.hh @@ -25,7 +25,7 @@ // // // $Id: G4InteractionCode.hh,v 1.3 2006/06/29 20:55:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4InteractionCode_h #define G4InteractionCode_h 1 diff --git a/source/processes/hadronic/models/parton_string/management/include/G4InteractionContent.hh b/source/processes/hadronic/models/parton_string/management/include/G4InteractionContent.hh index da7c595bcc..5321660dee 100644 --- a/source/processes/hadronic/models/parton_string/management/include/G4InteractionContent.hh +++ b/source/processes/hadronic/models/parton_string/management/include/G4InteractionContent.hh @@ -25,7 +25,7 @@ // // // $Id: G4InteractionContent.hh,v 1.3 2006/06/29 20:55:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4InteractionContent_h diff --git a/source/processes/hadronic/models/parton_string/management/include/G4PomeronCrossSection.hh b/source/processes/hadronic/models/parton_string/management/include/G4PomeronCrossSection.hh index b32e977ba1..1f263d381f 100644 --- a/source/processes/hadronic/models/parton_string/management/include/G4PomeronCrossSection.hh +++ b/source/processes/hadronic/models/parton_string/management/include/G4PomeronCrossSection.hh @@ -27,7 +27,7 @@ #define G4PomeronCrossSection_h 1 // // $Id: G4PomeronCrossSection.hh,v 1.3 2006/06/29 20:55:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4Proton.hh" #include "G4Neutron.hh" diff --git a/source/processes/hadronic/models/parton_string/management/include/G4StringModel.hh b/source/processes/hadronic/models/parton_string/management/include/G4StringModel.hh index 49764dce03..a6413aa08e 100644 --- a/source/processes/hadronic/models/parton_string/management/include/G4StringModel.hh +++ b/source/processes/hadronic/models/parton_string/management/include/G4StringModel.hh @@ -25,7 +25,7 @@ // // // $Id: G4StringModel.hh,v 1.3 2006/06/29 20:55:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4StringModel_h #define G4StringModel_h 1 diff --git a/source/processes/hadronic/models/parton_string/management/include/G4VParticipants.hh b/source/processes/hadronic/models/parton_string/management/include/G4VParticipants.hh index 0dfb5c1ba3..be6845927f 100644 --- a/source/processes/hadronic/models/parton_string/management/include/G4VParticipants.hh +++ b/source/processes/hadronic/models/parton_string/management/include/G4VParticipants.hh @@ -25,7 +25,7 @@ // // // $Id: G4VParticipants.hh,v 1.3 2006/06/29 20:55:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VParticipants_h diff --git a/source/processes/hadronic/models/parton_string/management/include/G4VPartonStringModel.hh b/source/processes/hadronic/models/parton_string/management/include/G4VPartonStringModel.hh index aaa177e4b2..f87883102e 100644 --- a/source/processes/hadronic/models/parton_string/management/include/G4VPartonStringModel.hh +++ b/source/processes/hadronic/models/parton_string/management/include/G4VPartonStringModel.hh @@ -25,7 +25,7 @@ // // // $Id: G4VPartonStringModel.hh,v 1.3 2006/06/29 20:55:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VPartonStringModel_h #define G4VPartonStringModel_h 1 diff --git a/source/processes/hadronic/models/parton_string/management/include/G4VSplitableHadron.hh b/source/processes/hadronic/models/parton_string/management/include/G4VSplitableHadron.hh index bbcca67388..e184277f15 100644 --- a/source/processes/hadronic/models/parton_string/management/include/G4VSplitableHadron.hh +++ b/source/processes/hadronic/models/parton_string/management/include/G4VSplitableHadron.hh @@ -25,7 +25,7 @@ // // // $Id: G4VSplitableHadron.hh,v 1.3 2006/06/29 20:55:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VSplitableHadron_h diff --git a/source/processes/hadronic/models/parton_string/management/include/G4VStringFragmentation.hh b/source/processes/hadronic/models/parton_string/management/include/G4VStringFragmentation.hh index 1bb22711c3..047264cc07 100644 --- a/source/processes/hadronic/models/parton_string/management/include/G4VStringFragmentation.hh +++ b/source/processes/hadronic/models/parton_string/management/include/G4VStringFragmentation.hh @@ -25,7 +25,7 @@ // // // $Id: G4VStringFragmentation.hh,v 1.3 2006/06/29 20:55:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VStringFragmentation_h #define G4VStringFragmentation_h 1 diff --git a/source/processes/hadronic/models/parton_string/management/include/G4VertexCode.hh b/source/processes/hadronic/models/parton_string/management/include/G4VertexCode.hh index 7bee91e280..8ed5839b5c 100644 --- a/source/processes/hadronic/models/parton_string/management/include/G4VertexCode.hh +++ b/source/processes/hadronic/models/parton_string/management/include/G4VertexCode.hh @@ -25,7 +25,7 @@ // // // $Id: G4VertexCode.hh,v 1.3 2006/06/29 20:55:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VertexCode_h #define G4VertexCode_h 1 diff --git a/source/processes/hadronic/models/parton_string/management/src/G4EventGenerator.cc b/source/processes/hadronic/models/parton_string/management/src/G4EventGenerator.cc index e3c795519b..25125d9965 100644 --- a/source/processes/hadronic/models/parton_string/management/src/G4EventGenerator.cc +++ b/source/processes/hadronic/models/parton_string/management/src/G4EventGenerator.cc @@ -25,7 +25,7 @@ // // // $Id: G4EventGenerator.cc,v 1.4 2006/06/29 20:55:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4EventGenerator #include "G4EventGenerator.hh" diff --git a/source/processes/hadronic/models/parton_string/management/src/G4InteractionContent.cc b/source/processes/hadronic/models/parton_string/management/src/G4InteractionContent.cc index 124b202f98..b63ebef010 100644 --- a/source/processes/hadronic/models/parton_string/management/src/G4InteractionContent.cc +++ b/source/processes/hadronic/models/parton_string/management/src/G4InteractionContent.cc @@ -25,7 +25,7 @@ // // // $Id: G4InteractionContent.cc,v 1.4 2006/06/29 20:55:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------ // GEANT 4 class implementation file diff --git a/source/processes/hadronic/models/parton_string/management/src/G4PomeronCrossSection.cc b/source/processes/hadronic/models/parton_string/management/src/G4PomeronCrossSection.cc index 912e05032b..ae82ade305 100644 --- a/source/processes/hadronic/models/parton_string/management/src/G4PomeronCrossSection.cc +++ b/source/processes/hadronic/models/parton_string/management/src/G4PomeronCrossSection.cc @@ -25,7 +25,7 @@ // // // $Id: G4PomeronCrossSection.cc,v 1.4 2006/06/29 20:55:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4PomeronCrossSection.hh" diff --git a/source/processes/hadronic/models/parton_string/management/src/G4StringModel.cc b/source/processes/hadronic/models/parton_string/management/src/G4StringModel.cc index 5362407789..92b9e763ec 100644 --- a/source/processes/hadronic/models/parton_string/management/src/G4StringModel.cc +++ b/source/processes/hadronic/models/parton_string/management/src/G4StringModel.cc @@ -25,7 +25,7 @@ // // // $Id: G4StringModel.cc,v 1.4 2006/06/29 20:55:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4StringModel #include "G4StringModel.hh" diff --git a/source/processes/hadronic/models/parton_string/management/src/G4VParticipants.cc b/source/processes/hadronic/models/parton_string/management/src/G4VParticipants.cc index b96bf99368..0cd9855c43 100644 --- a/source/processes/hadronic/models/parton_string/management/src/G4VParticipants.cc +++ b/source/processes/hadronic/models/parton_string/management/src/G4VParticipants.cc @@ -25,7 +25,7 @@ // // // $Id: G4VParticipants.cc,v 1.3 2006/06/29 20:55:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------ // GEANT 4 class implementation file diff --git a/source/processes/hadronic/models/parton_string/management/src/G4VPartonStringModel.cc b/source/processes/hadronic/models/parton_string/management/src/G4VPartonStringModel.cc index e1526ca1a6..192560cd5c 100644 --- a/source/processes/hadronic/models/parton_string/management/src/G4VPartonStringModel.cc +++ b/source/processes/hadronic/models/parton_string/management/src/G4VPartonStringModel.cc @@ -25,7 +25,7 @@ // // // $Id: G4VPartonStringModel.cc,v 1.4 2006/06/29 20:55:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //// ------------------------------------------------------------ // GEANT 4 class implementation file diff --git a/source/processes/hadronic/models/parton_string/management/src/G4VSplitableHadron.cc b/source/processes/hadronic/models/parton_string/management/src/G4VSplitableHadron.cc index 37185d2d25..bd2c9f6627 100644 --- a/source/processes/hadronic/models/parton_string/management/src/G4VSplitableHadron.cc +++ b/source/processes/hadronic/models/parton_string/management/src/G4VSplitableHadron.cc @@ -25,7 +25,7 @@ // // // $Id: G4VSplitableHadron.cc,v 1.4 2006/06/29 20:55:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------ diff --git a/source/processes/hadronic/models/parton_string/management/src/G4VStringFragmentation.cc b/source/processes/hadronic/models/parton_string/management/src/G4VStringFragmentation.cc index fd803d87c9..a64520d82f 100644 --- a/source/processes/hadronic/models/parton_string/management/src/G4VStringFragmentation.cc +++ b/source/processes/hadronic/models/parton_string/management/src/G4VStringFragmentation.cc @@ -25,7 +25,7 @@ // // // $Id: G4VStringFragmentation.cc,v 1.4 2006/06/29 20:55:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VStringFragmentation #include "G4VStringFragmentation.hh" diff --git a/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/History b/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/History index d79a53b00e..ee86b4bf8c 100644 --- a/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/History +++ b/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/History @@ -1,4 +1,4 @@ -$Id: History,v 1.2 2005/11/30 11:40:58 gcosmo Exp $ +$Id: History,v 1.3 2006/11/04 22:21:09 dennis Exp $ ------------------------------------------------------------------- ========================================================== @@ -15,6 +15,12 @@ code and to keep track of all tags. * Please list in reverse chronological order (last date on top) --------------------------------------------------------------- + 4 Nov 2006 Dennis Wright for V. Ivantchenko (hadr-munuclear-V08-01-00) +----------------------------------------------------------------------- +- G4MuNuclearInteraction::ComputeMicroscopicCrossSection: prevent NaN + by checking that upper energy limit is not less than lower limit. + + 30 Nov 2005 Gabriele Cosmo (hadr-munuclear-V07-01-00) ---------------------------------------------------- - Trivial fix in G4MuonNucleusInteractionModel and diff --git a/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/include/G4MuNuclearInteraction.hh b/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/include/G4MuNuclearInteraction.hh index 3d93ff6523..33c7cd7e31 100644 --- a/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/include/G4MuNuclearInteraction.hh +++ b/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/include/G4MuNuclearInteraction.hh @@ -25,7 +25,7 @@ // // // $Id: G4MuNuclearInteraction.hh,v 1.4 2006/06/29 20:57:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // $Id: // ------------------------------------------------------------ diff --git a/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/include/G4MuNuclearInteraction.icc b/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/include/G4MuNuclearInteraction.icc index fb740bbb96..29468cee4a 100644 --- a/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/include/G4MuNuclearInteraction.icc +++ b/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/include/G4MuNuclearInteraction.icc @@ -25,7 +25,7 @@ // // // $Id: G4MuNuclearInteraction.icc,v 1.3 2006/06/29 20:57:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // $Id: // --------------------------------------------------------------- diff --git a/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src/G4MuNuclearInteraction.cc b/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src/G4MuNuclearInteraction.cc index d0587d71dd..ba1de9fbf8 100644 --- a/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src/G4MuNuclearInteraction.cc +++ b/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src/G4MuNuclearInteraction.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4MuNuclearInteraction.cc,v 1.6 2006/06/29 20:57:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4MuNuclearInteraction.cc,v 1.7 2006/11/04 02:15:05 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // $Id: // -------------------------------------------------------------- @@ -215,6 +215,7 @@ G4double G4MuNuclearInteraction::ComputeMicroscopicCrossSection( epmin = CutFixed ; epmax = KineticEnergy + Mass - 0.5*proton_mass_c2 ; + if (epmax <= epmin ) return CrossSection; // NaN bug correction aaa = std::log(epmin) ; bbb = std::log(epmax) ; diff --git a/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src/G4MuonNucleusInteractionModel.cc b/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src/G4MuonNucleusInteractionModel.cc index 3344036a95..207a2637ed 100644 --- a/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src/G4MuonNucleusInteractionModel.cc +++ b/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src/G4MuonNucleusInteractionModel.cc @@ -25,7 +25,7 @@ // // // $Id: G4MuonNucleusInteractionModel.cc,v 1.6 2006/06/29 20:57:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------- // G4MuonNucleusInteractionModel.cc diff --git a/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src/G4ParametrizedHadronicVertex.cc b/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src/G4ParametrizedHadronicVertex.cc index 2c9de15b82..01798475ba 100644 --- a/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src/G4ParametrizedHadronicVertex.cc +++ b/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src/G4ParametrizedHadronicVertex.cc @@ -25,7 +25,7 @@ // // // $Id: G4ParametrizedHadronicVertex.cc,v 1.6 2006/06/29 20:57:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------- #include "G4ParametrizedHadronicVertex.hh" diff --git a/source/processes/hadronic/models/pre_equilibrium/History b/source/processes/hadronic/models/pre_equilibrium/History new file mode 100644 index 0000000000..1ed8134330 --- /dev/null +++ b/source/processes/hadronic/models/pre_equilibrium/History @@ -0,0 +1,24 @@ +------------------------------------------------------------------- + + ========================================================== + Geant4 - an Object-Oriented Toolkit for Physics Simulation + ========================================================== + + History file for hadronic/models/de_excitation + ---------------------------------------------- + +This file should be used to summarize modifications introduced in the +code and to keep track of all tags. + + --------------------------------------------------------------- + * Please list in reverse chronological order (last date on top) + --------------------------------------------------------------- + +19 Aug 2006 Dennis Wright (hadr-pre-V08-01-00) +---------------------------------------------- +- exciton_model + G4VPreCompoundFragment.hh, .icc : remove meaningless const from + methods GetA, GetZ, GetRestA, GetRestZ, GetCoulombBarrier, GetBindingEnergy, + GetMaximalKineticEnergy, GetEnergyThreshold, GetEmissionProbability, + GetNuclearMass, GetRestNuclearMass and GetReducedMass + diff --git a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4LowEIonFragmentation.hh b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4LowEIonFragmentation.hh index ba156a6766..ec5ca4deba 100644 --- a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4LowEIonFragmentation.hh +++ b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4LowEIonFragmentation.hh @@ -25,7 +25,7 @@ // // // $Id: G4LowEIonFragmentation.hh,v 1.3 2006/06/29 20:58:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by H.P. Wellisch diff --git a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundAlpha.hh b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundAlpha.hh index c125e0b3a5..2258b13e2a 100644 --- a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundAlpha.hh +++ b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundAlpha.hh @@ -25,7 +25,7 @@ // // // $Id: G4PreCompoundAlpha.hh,v 1.3 2006/06/29 20:58:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by V. Lara diff --git a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundDeuteron.hh b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundDeuteron.hh index 198f69a009..012b65fefb 100644 --- a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundDeuteron.hh +++ b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundDeuteron.hh @@ -25,7 +25,7 @@ // // // $Id: G4PreCompoundDeuteron.hh,v 1.3 2006/06/29 20:58:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by V. Lara diff --git a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundEmission.hh b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundEmission.hh index d490b11127..aa5033babb 100644 --- a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundEmission.hh +++ b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundEmission.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4PreCompoundEmission.hh,v 1.3 2006/06/29 20:58:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear Preequilibrium // by V. Lara diff --git a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundFragmentVector.hh b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundFragmentVector.hh index 646211b8d5..32f6c107da 100644 --- a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundFragmentVector.hh +++ b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundFragmentVector.hh @@ -25,7 +25,7 @@ // // // $Id: G4PreCompoundFragmentVector.hh,v 1.3 2006/06/29 20:58:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear Preequilibrium // by V. Lara diff --git a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundFragmentVector.icc b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundFragmentVector.icc index 6d34b91368..c727c941cf 100644 --- a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundFragmentVector.icc +++ b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundFragmentVector.icc @@ -25,7 +25,7 @@ // // // $Id: G4PreCompoundFragmentVector.icc,v 1.3 2006/06/29 20:58:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear Preequilibrium // by V. Lara diff --git a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundHe3.hh b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundHe3.hh index 85b69b7e25..8d6d6a2c10 100644 --- a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundHe3.hh +++ b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundHe3.hh @@ -25,7 +25,7 @@ // // // $Id: G4PreCompoundHe3.hh,v 1.3 2006/06/29 20:58:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by V. Lara diff --git a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundModel.hh b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundModel.hh index 1bdc059564..d873863bbd 100644 --- a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundModel.hh +++ b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundModel.hh @@ -25,7 +25,7 @@ // // // $Id: G4PreCompoundModel.hh,v 1.3 2006/06/29 20:58:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by V. Lara diff --git a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundNeutron.hh b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundNeutron.hh index 265c7bc6de..2384e801b2 100644 --- a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundNeutron.hh +++ b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundNeutron.hh @@ -25,7 +25,7 @@ // // // $Id: G4PreCompoundNeutron.hh,v 1.4 2006/06/29 20:58:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by V. Lara diff --git a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundParameters.hh b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundParameters.hh index 1038cf558b..2db794b6e6 100644 --- a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundParameters.hh +++ b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundParameters.hh @@ -25,7 +25,7 @@ // // // $Id: G4PreCompoundParameters.hh,v 1.3 2006/06/29 20:58:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by V. Lara diff --git a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundProton.hh b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundProton.hh index 28500723ab..fa29054e5b 100644 --- a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundProton.hh +++ b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundProton.hh @@ -25,7 +25,7 @@ // // // $Id: G4PreCompoundProton.hh,v 1.3 2006/06/29 20:58:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by V. Lara diff --git a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundTransitions.hh b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundTransitions.hh index d4a43e314d..86195a132f 100644 --- a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundTransitions.hh +++ b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundTransitions.hh @@ -25,7 +25,7 @@ // // // $Id: G4PreCompoundTransitions.hh,v 1.3 2006/06/29 20:58:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by V. Lara diff --git a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundTriton.hh b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundTriton.hh index d5d6123e69..ab16fb544f 100644 --- a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundTriton.hh +++ b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundTriton.hh @@ -25,7 +25,7 @@ // // // $Id: G4PreCompoundTriton.hh,v 1.3 2006/06/29 20:58:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by V. Lara diff --git a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4VPreCompoundFragment.hh b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4VPreCompoundFragment.hh index d20b64ced0..25337997c7 100644 --- a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4VPreCompoundFragment.hh +++ b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4VPreCompoundFragment.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VPreCompoundFragment.hh,v 1.3 2006/06/29 20:58:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VPreCompoundFragment.hh,v 1.4 2006/08/20 01:07:28 dennis Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // by V. Lara @@ -96,29 +96,29 @@ public: virtual G4double GetKineticEnergy(const G4Fragment & aFragment) = 0; public: - inline const G4double GetA() const; + inline G4double GetA() const; - inline const G4double GetZ() const; + inline G4double GetZ() const; - inline const G4double GetRestA() const; + inline G4double GetRestA() const; - inline const G4double GetRestZ() const; + inline G4double GetRestZ() const; - inline const G4double GetCoulombBarrier() const; + inline G4double GetCoulombBarrier() const; - inline const G4double GetBindingEnergy() const; + inline G4double GetBindingEnergy() const; - inline const G4double GetMaximalKineticEnergy() const; + inline G4double GetMaximalKineticEnergy() const; - inline const G4double GetEnergyThreshold() const; + inline G4double GetEnergyThreshold() const; - inline const G4double GetEmissionProbability() const; + inline G4double GetEmissionProbability() const; - inline const G4double GetNuclearMass() const; + inline G4double GetNuclearMass() const; - inline const G4double GetRestNuclearMass() const; + inline G4double GetRestNuclearMass() const; - inline const G4double GetReducedMass() const; + inline G4double GetReducedMass() const; inline const G4LorentzVector GetMomentum() const; diff --git a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4VPreCompoundFragment.icc b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4VPreCompoundFragment.icc index a37a526088..9b4dce36aa 100644 --- a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4VPreCompoundFragment.icc +++ b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4VPreCompoundFragment.icc @@ -24,96 +24,84 @@ // ******************************************************************** // // -// $Id: G4VPreCompoundFragment.icc,v 1.3 2006/06/29 20:58:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VPreCompoundFragment.icc,v 1.4 2006/08/20 01:07:40 dennis Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // by V. Lara -inline const G4double G4VPreCompoundFragment:: -GetA() const +inline G4double G4VPreCompoundFragment::GetA() const { return theA; } -inline const G4double G4VPreCompoundFragment:: -GetZ() const +inline G4double G4VPreCompoundFragment::GetZ() const { return theZ; } -inline const G4double G4VPreCompoundFragment:: -GetRestA() const +inline G4double G4VPreCompoundFragment::GetRestA() const { return theRestNucleusA; } -inline const G4double G4VPreCompoundFragment:: -GetRestZ() const +inline G4double G4VPreCompoundFragment::GetRestZ() const { return theRestNucleusZ; } -inline const G4double G4VPreCompoundFragment:: -GetCoulombBarrier() const +inline G4double G4VPreCompoundFragment::GetCoulombBarrier() const { return theCoulombBarrier; } -inline const G4double G4VPreCompoundFragment:: -GetBindingEnergy() const +inline G4double G4VPreCompoundFragment::GetBindingEnergy() const { return theBindingEnergy; } -inline const G4double G4VPreCompoundFragment:: -GetMaximalKineticEnergy() const +inline G4double G4VPreCompoundFragment::GetMaximalKineticEnergy() const { return theMaximalKineticEnergy; } -inline const G4double G4VPreCompoundFragment:: -GetEnergyThreshold() const +inline G4double G4VPreCompoundFragment::GetEnergyThreshold() const { return theMaximalKineticEnergy - theCoulombBarrier; } -inline const G4double G4VPreCompoundFragment:: -GetEmissionProbability() const +inline G4double G4VPreCompoundFragment::GetEmissionProbability() const { return theEmissionProbability; } -inline const G4double G4VPreCompoundFragment:: -GetNuclearMass(void) const +inline G4double G4VPreCompoundFragment::GetNuclearMass(void) const { return G4ParticleTable::GetParticleTable()-> GetIonTable()->GetIonMass(static_cast(theZ),static_cast(theA)); } - -inline const G4double G4VPreCompoundFragment:: -GetRestNuclearMass() const +inline G4double G4VPreCompoundFragment::GetRestNuclearMass() const { return G4ParticleTable::GetParticleTable()->GetIonTable()-> GetIonMass(static_cast(theRestNucleusZ),static_cast(theRestNucleusA)); } - -inline const G4double G4VPreCompoundFragment:: -GetReducedMass() const +inline G4double G4VPreCompoundFragment::GetReducedMass() const { return GetRestNuclearMass()*GetNuclearMass()/ (GetNuclearMass()+GetRestNuclearMass()); } + inline const G4LorentzVector G4VPreCompoundFragment:: GetMomentum() const { return theMomentum; } + inline void G4VPreCompoundFragment:: SetMomentum(const G4LorentzVector & value) diff --git a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4VPreCompoundIon.hh b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4VPreCompoundIon.hh index 7ef6093425..a543aba106 100644 --- a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4VPreCompoundIon.hh +++ b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4VPreCompoundIon.hh @@ -25,7 +25,7 @@ // // // $Id: G4VPreCompoundIon.hh,v 1.3 2006/06/29 20:58:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by V. Lara diff --git a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4VPreCompoundNucleon.hh b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4VPreCompoundNucleon.hh index 8aa4b681ba..65c3a3a631 100644 --- a/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4VPreCompoundNucleon.hh +++ b/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4VPreCompoundNucleon.hh @@ -25,7 +25,7 @@ // // // $Id: G4VPreCompoundNucleon.hh,v 1.3 2006/06/29 20:58:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by V. Lara diff --git a/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundFragmentVector.cc b/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundFragmentVector.cc index b29512fbef..6194e5dbea 100644 --- a/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundFragmentVector.cc +++ b/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundFragmentVector.cc @@ -25,7 +25,7 @@ // // // $Id: G4PreCompoundFragmentVector.cc,v 1.5 2006/06/29 20:59:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Hadronic Process: Nuclear Preequilibrium // by V. Lara diff --git a/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundModel.cc b/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundModel.cc index 4f2a1055d0..b3b255dc9f 100644 --- a/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundModel.cc +++ b/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundModel.cc @@ -25,7 +25,7 @@ // // // $Id: G4PreCompoundModel.cc,v 1.8 2006/06/29 20:59:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by V. Lara diff --git a/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundParameters.cc b/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundParameters.cc index 7e7abc7b8c..f528bda211 100644 --- a/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundParameters.cc +++ b/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundParameters.cc @@ -25,7 +25,7 @@ // // // $Id: G4PreCompoundParameters.cc,v 1.3 2006/06/29 20:59:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by V. Lara diff --git a/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundTransitions.cc b/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundTransitions.cc index 022ddc5d40..df135470e2 100644 --- a/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundTransitions.cc +++ b/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundTransitions.cc @@ -25,7 +25,7 @@ // // // $Id: G4PreCompoundTransitions.cc,v 1.8 2006/06/29 20:59:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by V. Lara diff --git a/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4VPreCompoundFragment.cc b/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4VPreCompoundFragment.cc index 1fa4cb282a..b178832037 100644 --- a/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4VPreCompoundFragment.cc +++ b/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4VPreCompoundFragment.cc @@ -25,7 +25,7 @@ // // // $Id: G4VPreCompoundFragment.cc,v 1.3 2006/06/29 20:59:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by V. Lara diff --git a/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4VPreCompoundIon.cc b/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4VPreCompoundIon.cc index c12a779eec..5744b9e4b1 100644 --- a/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4VPreCompoundIon.cc +++ b/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4VPreCompoundIon.cc @@ -25,7 +25,7 @@ // // // $Id: G4VPreCompoundIon.cc,v 1.4 2006/06/29 20:59:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by V. Lara diff --git a/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4VPreCompoundNucleon.cc b/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4VPreCompoundNucleon.cc index aba9aaf3af..aed6b85df9 100644 --- a/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4VPreCompoundNucleon.cc +++ b/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4VPreCompoundNucleon.cc @@ -25,7 +25,7 @@ // // // $Id: G4VPreCompoundNucleon.cc,v 1.4 2006/06/29 20:59:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // by V. Lara diff --git a/source/processes/hadronic/models/radioactive_decay/History b/source/processes/hadronic/models/radioactive_decay/History index b9940ca2a4..db9beaf5db 100644 --- a/source/processes/hadronic/models/radioactive_decay/History +++ b/source/processes/hadronic/models/radioactive_decay/History @@ -13,6 +13,13 @@ track of all tags. ---------------------------------------------------------- * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +10 November 2006 Fan Lei (radioactive_decay-V08-01-01) +- G4NuclearDecayChannel.cc: added the capability of handling decay emission of proton or neutron +for decays of He5 (alpha+n) and Li5 (alpha+p). bug#852 + +5 July 2006 Dennis Wright (radioactive_decay-V08-01-00) +- G4NuclearDecayChannel::BetaDecayIt() : another check for negative sqrt + argument in daughtermomentum[1]. 29 May 2006 Dennis Wright (radioactive_decay-V08-00-03) (tagging change by Fan Lei on 17 Feb 2006) diff --git a/source/processes/hadronic/models/radioactive_decay/src/G4NuclearDecayChannel.cc b/source/processes/hadronic/models/radioactive_decay/src/G4NuclearDecayChannel.cc index bd49875903..6eebe57526 100644 --- a/source/processes/hadronic/models/radioactive_decay/src/G4NuclearDecayChannel.cc +++ b/source/processes/hadronic/models/radioactive_decay/src/G4NuclearDecayChannel.cc @@ -201,64 +201,16 @@ void G4NuclearDecayChannel::FillDaughterNucleus (G4int index, G4int A, G4int Z, // daughterA = A; daughterZ = Z; - G4IonTable *theIonTable = (G4IonTable*)(G4ParticleTable::GetParticleTable()->GetIonTable()); - // daughterNucleus = theIonTable->GetIon(daughterZ, daughterA, 0.0*keV); - // - // - // Determine the excitation state corresponds to an actual level in the - // photo-evaporation data. Flag an error if the difference is too large. - // - /* - if (theDaughterExcitation > 0.0) { - G4NuclearLevelManager * levelManager = G4NuclearLevelStore::GetInstance()->GetManager(daughterZ, daughterA); - if ( levelManager->NumberOfLevels() ) { - const G4NuclearLevel* level = levelManager->NearestLevel (theDaughterExcitation); - - daughterExcitation = level->Energy(); - - if (std::abs(daughterExcitation-theDaughterExcitation)>levelTolerance){ -#ifdef G4VERBOSE - if (GetVerboseLevel()>1){ - G4cout <<"In G4NuclearDecayChannel::FillDaughterNucleus" <HalfLife() <= 1000. || index == 0) { - daughterNucleus = theIonTable->GetIon(daughterZ, daughterA, 0.0*keV); - } - else{ - daughterNucleus = theIonTable->GetIon(daughterZ, daughterA, daughterExcitation); - daughterExcitation = 0.0; - } - } - else{ -#ifdef G4VERBOSE - if (GetVerboseLevel()>0){ - G4cout << "Error in G4NuclearDecayChannel::FillDaughterNucleus" <GetIon(daughterZ, daughterA, 0.0*keV); - daughterExcitation = theDaughterExcitation; - } + if (Z == 1 && A == 1) { + daughterNucleus = G4Proton::Definition(); + } else if (Z == 0 && A == 1) { + daughterNucleus = G4Neutron::Definition(); + } else { + G4IonTable *theIonTable = + (G4IonTable*)(G4ParticleTable::GetParticleTable()->GetIonTable()); + daughterNucleus = theIonTable->GetIon(daughterZ, daughterA, theDaughterExcitation*MeV); } - else { - daughterExcitation = 0.0; - daughterNucleus = theIonTable->GetIon(daughterZ, daughterA, 0.0*keV); - } - */ - daughterNucleus = theIonTable->GetIon(daughterZ, daughterA, theDaughterExcitation*MeV); daughterExcitation = theDaughterExcitation; - SetDaughter(index, daughterNucleus); } @@ -649,8 +601,10 @@ G4DecayProducts *G4NuclearDecayChannel::BetaDecayIt() // the recoil neuleus daughterenergy[1] = Q-daughterenergy[0]-daughterenergy[2]; - daughtermomentum[1] = std::sqrt(daughterenergy[1]*daughterenergy[1] + - 2.0*daughterenergy[1] * daughtermass[1]); + G4double recoilmomentumsquared = daughterenergy[1]*daughterenergy[1] + + 2.0*daughterenergy[1] * daughtermass[1]; + if (recoilmomentumsquared < 0.0) recoilmomentumsquared = 0.0; + daughtermomentum[1] = std::sqrt(recoilmomentumsquared); // output message if (GetVerboseLevel()>1) { diff --git a/source/processes/hadronic/models/theo_high_energy/include/G4TheoFSGenerator.hh b/source/processes/hadronic/models/theo_high_energy/include/G4TheoFSGenerator.hh index 4f21855f2f..d853ea2a0d 100644 --- a/source/processes/hadronic/models/theo_high_energy/include/G4TheoFSGenerator.hh +++ b/source/processes/hadronic/models/theo_high_energy/include/G4TheoFSGenerator.hh @@ -25,7 +25,7 @@ // // // $Id: G4TheoFSGenerator.hh,v 1.3 2006/06/29 21:00:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Class Description diff --git a/source/processes/hadronic/models/theo_high_energy/src/G4TheoFSGenerator.cc b/source/processes/hadronic/models/theo_high_energy/src/G4TheoFSGenerator.cc index 56aa84c8d9..90bdacc50a 100644 --- a/source/processes/hadronic/models/theo_high_energy/src/G4TheoFSGenerator.cc +++ b/source/processes/hadronic/models/theo_high_energy/src/G4TheoFSGenerator.cc @@ -25,7 +25,7 @@ // // // $Id: G4TheoFSGenerator.cc,v 1.5 2006/06/29 21:00:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4TheoFSGenerator #include "G4DynamicParticle.hh" diff --git a/source/processes/hadronic/models/util/History b/source/processes/hadronic/models/util/History index b646f064f2..8fc670907b 100644 --- a/source/processes/hadronic/models/util/History +++ b/source/processes/hadronic/models/util/History @@ -14,6 +14,22 @@ code and to keep track of all tags. * Please list in reverse chronological order (last date on top) --------------------------------------------------------------- + +5 Oct 2006 Gunter Folger (hadr-mod-util-V08-01-01) +------------------------------------------------- +- G4Fancy3DNucleus:ChoosePositions(): Correctly use std::vector. + This should fix bug 887 on WIN32/VC8 + +5 Oct 2006 Gunter Folger (hadr-mod-util-V08-01-00) +------------------------------------------------- +- Reduce warning output from G4Fragment on negative excitation energy; + a max. of 10 warnings is printed now. + +19 Aug 2006 Dennis Wright (hadr-modutl-V08-01-00) +------------------------------------------------- +- G4Fancy3DNucleus.cc : remove meaningless const in G4Fancy3DNucleusHelper + methods size() and index() + 30 Nov 2005 Gabriele Cosmo (hadr-modutl-V07-01-01) -------------------------------------------------- - Trivial fix in G4Fancy3DNucleus for support of CLHEP-2.0.X series. diff --git a/source/processes/hadronic/models/util/src/G4Fancy3DNucleus.cc b/source/processes/hadronic/models/util/src/G4Fancy3DNucleus.cc index a52d924e93..5f73c08706 100644 --- a/source/processes/hadronic/models/util/src/G4Fancy3DNucleus.cc +++ b/source/processes/hadronic/models/util/src/G4Fancy3DNucleus.cc @@ -288,9 +288,10 @@ void G4Fancy3DNucleus::ChoosePositions() if (G4UniformRand() < density) { freeplace= true; - for( int j=0; j::iterator iplace; + for( iplace=places.begin(); iplace!=places.end() && freeplace;++iplace) { - delta = places[j] - aPos; + delta = *iplace - aPos; freeplace= delta.mag2() > nd2; } @@ -310,7 +311,7 @@ void G4Fancy3DNucleus::ChoosePositions() if ( freeplace ) { theNucleons[i].SetPosition(aPos); - places[i]=aPos; + places.push_back(aPos); ++i; } } @@ -397,11 +398,11 @@ void G4Fancy3DNucleus::ChooseFermiMomenta() { return Vector; } - const G4double size() const + G4double size() const { return Size; } - const G4int index() const + G4int index() const { return anInt; } diff --git a/source/processes/hadronic/models/util/src/G4Fragment.cc b/source/processes/hadronic/models/util/src/G4Fragment.cc index 9fa287301d..1565887a5e 100644 --- a/source/processes/hadronic/models/util/src/G4Fragment.cc +++ b/source/processes/hadronic/models/util/src/G4Fragment.cc @@ -201,6 +201,7 @@ std::ostream& operator << (std::ostream &out, const G4Fragment &theFragment) G4double G4Fragment::CalculateExcitationEnergy(const G4LorentzVector value) const { + static G4int errCount(0); G4double theMaxGroundStateMass = theZ*G4Proton::Proton()->GetPDGMass()+ (theA-theZ)*G4Neutron::Neutron()->GetPDGMass(); G4double U = value.m() - std::min(theMaxGroundStateMass, GetGroundStateMass()); @@ -209,8 +210,15 @@ G4double G4Fragment::CalculateExcitationEnergy(const G4LorentzVector value) cons U = 0.0; else { - G4cerr << "G4Fragment::G4Fragment Excitation Energy =" + if ( errCount < 10 ) + { + G4cerr << "G4Fragment::CalculateExcitationEnergy(): Excitation Energy =" <= X[N-1]) Yuser = Y[N-1]; + else { + G4int i; + for (i=1; i X[N-1]) Yuser = Y[N-1]; - - else { - for (i = 1; i < N - 1; i++){ - if(Xuser < X[i]) {break;} - } - - Yuser = X[i] - X[i-1]; - if(Yuser != 0.0){ - Yuser = Y[i-1] + (Y[i] - Y[i-1]) * (Xuser - X[i-1]) / Yuser; - } - } - return Yuser; -} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... - -G4ThreeVector G4MuMinusCaptureCascade::GetRandomVec() -{ - // - // generate uniform vector - // - - G4double cosTheta = 2.0 * G4UniformRand() - 1.0; - G4double sinTheta = std::sqrt(1.0 - cosTheta*cosTheta); - G4double Phi = twopi * G4UniformRand(); - G4double dirx = sinTheta * std::cos(Phi); - G4double diry = sinTheta * std::sin(Phi); - G4double dirz = cosTheta; - - return G4ThreeVector(dirx, diry, dirz); -} //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... void G4MuMinusCaptureCascade::AddNewParticle(G4ParticleDefinition* aParticle, - G4ThreeVector Momentum, + G4ThreeVector& Momentum, G4double mass, G4int* nParticle, G4GHEKinematicsVector* Cascade) { - // Store particle in the HEK vector and increment counter - - Cascade[*nParticle].SetZero(); - Cascade[*nParticle].SetMass( mass ); - Cascade[*nParticle].SetMomentumAndUpdate(Momentum.x(), Momentum.y(), Momentum.z()); - Cascade[*nParticle].SetParticleDef( aParticle ); - (*nParticle)++; + Cascade[*nParticle].SetZero(); + Cascade[*nParticle].SetMass( mass ); + Cascade[*nParticle].SetMomentumAndUpdate(Momentum.x(), Momentum.y(), Momentum.z()); + Cascade[*nParticle].SetParticleDef( aParticle ); + (*nParticle)++; - return; + return; } - //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... G4int G4MuMinusCaptureCascade::DoCascade(const G4double Z, const G4double massA, - G4GHEKinematicsVector* Cascade) + G4GHEKinematicsVector* Cascade) { // Inicialization - cascade start from 14th level // N.C.Mukhopadhyay Phy. Rep. 30 (1977) 1. @@ -206,14 +164,14 @@ G4int G4MuMinusCaptureCascade::DoCascade(const G4double Z, const G4double massA, // Case of photon cascade, probabilities from // C.S.Wu and L.Wilets, Ann. Rev. Nuclear Sci. 19 (1969) 527. - G4double var = (10.0 + G4double(nLevel - 1) ) * G4UniformRand(); - G4int iLevel = nLevel - 1 ; - if(var > 10.0) iLevel -= G4int(var-10.0) + 1; - if( iLevel < 0 ) iLevel = 0; - DeltaE = EnergyLevel[iLevel] - EnergyLevel[nLevel]; - nLevel = iLevel; - moment = DeltaE * GetRandomVec(); - AddNewParticle(theGamma, moment, 0.0, &nPart, Cascade); + G4double var = (10.0 + G4double(nLevel - 1) ) * G4UniformRand(); + G4int iLevel = nLevel - 1 ; + if(var > 10.0) iLevel -= G4int(var-10.0) + 1; + if( iLevel < 0 ) iLevel = 0; + DeltaE = EnergyLevel[iLevel] - EnergyLevel[nLevel]; + nLevel = iLevel; + moment = DeltaE * GetRandomVec(); + AddNewParticle(theGamma, moment, 0.0, &nPart, Cascade); } } while( nLevel > 0 ); @@ -223,57 +181,62 @@ G4int G4MuMinusCaptureCascade::DoCascade(const G4double Z, const G4double massA, //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... -void G4MuMinusCaptureCascade::DoBoundMuonMinusDecay(G4double Z, G4double /* massA*/, +void G4MuMinusCaptureCascade::DoBoundMuonMinusDecay(G4double Z, G4int* nCascade, G4GHEKinematicsVector* Cascade) { // Simulation on Decay of mu- on a K-shell of the muonic atom - - G4double Energy, x; G4double xmax = ( 1.0 + Emass*Emass/ (MuMass*MuMass) ); G4double KEnergy = GetKShellEnergy(Z); + /* + G4cout << "G4MuMinusCaptureCascade::DoBoundMuonMinusDecay" + << " XMAX= " << xmax + << " Ebound= " << KEnergy + << G4endl; + */ + G4double pmu = std::sqrt(KEnergy*(KEnergy + 2.0*MuMass)); + G4double emu = KEnergy + MuMass; + G4ThreeVector moment = GetRandomVec(); + G4LorentzVector MU(pmu*moment,emu); + G4ThreeVector bst = MU.boostVector(); + G4double Eelect, Pelect, x, ecm; + G4LorentzVector EL, NN; // Calculate electron energy do { do { x = xmax*G4UniformRand(); - } while (G4UniformRand() < (3.0 - 2.0*x)*x*x ); - Energy = x*MuMass*0.5 - Emass - KEnergy; - } while (Energy < 0.0); - - // - // generate uniform vector - // - G4double ptot = std::sqrt(Energy * (Energy + 2.0*Emass)); - G4ThreeVector moment = ptot * GetRandomVec(); + } while (G4UniformRand() > (3.0 - 2.0*x)*x*x ); + Eelect = x*MuMass*0.5; + Pelect = std::sqrt( Eelect*Eelect - Emass*Emass ); + EL = G4LorentzVector(Pelect*moment,Eelect); + EL.boost(bst); + Eelect = EL.e() - Emass - KEnergy; + // + // Calculate rest frame parameters of 2 neutrinos + // + NN = MU - EL; + ecm = NN.mag2(); + } while (Eelect < 0.0 || ecm < 0.0); + // + // Create electron + // + moment = std::sqrt(Eelect * (Eelect + 2.0*Emass))*EL.vect().unit(); AddNewParticle(theElectron, moment, Emass, nCascade, Cascade); - - // Calculate rest frame parameters of 2 neutrinos - G4double E = MuMass*( 1.0 - x*0.5 ); - G4double P = std::sqrt( MuMass*MuMass*x*x*0.25 - Emass*Emass ); - - if(P >= E) {P = E;} - G4double ecm = 0.5 * std::sqrt( E*E - P*P ); - - // - // generate uniform vector - // - - moment *= -P / (ptot * E); - G4ThreeVector p1 = ecm * GetRandomVec(); - + // // Create Neutrinos + // + ecm = 0.5*std::sqrt(ecm); + bst = NN.boostVector(); + G4ThreeVector p1 = ecm * GetRandomVec(); G4LorentzVector N1 = G4LorentzVector(p1,ecm); - N1.boost(moment); - - - AddNewParticle(G4AntiNeutrinoE::AntiNeutrinoE(),G4ThreeVector(N1.vect()),0.0,nCascade,Cascade); - - G4LorentzVector N2 = G4LorentzVector(-p1,ecm); - N2.boost(moment); - - AddNewParticle(G4NeutrinoMu::NeutrinoMu(),G4ThreeVector(N2.vect()),0.0,nCascade,Cascade); + N1.boost(bst); + G4ThreeVector p1lab = N1.vect(); + AddNewParticle(G4AntiNeutrinoE::AntiNeutrinoE(),p1lab,0.0,nCascade,Cascade); + NN -= N1; + G4ThreeVector p2lab = NN.vect(); + AddNewParticle(G4NeutrinoMu::NeutrinoMu(),p2lab,0.0,nCascade,Cascade); return; } diff --git a/source/processes/hadronic/stopping/src/G4MuonMinusCaptureAtRest.cc b/source/processes/hadronic/stopping/src/G4MuonMinusCaptureAtRest.cc index 8f66f48193..cdb7aabb0d 100644 --- a/source/processes/hadronic/stopping/src/G4MuonMinusCaptureAtRest.cc +++ b/source/processes/hadronic/stopping/src/G4MuonMinusCaptureAtRest.cc @@ -23,6 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// $Id: G4MuonMinusCaptureAtRest.cc,v 1.39 2006/12/01 14:18:26 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------ // GEANT 4 class file @@ -37,19 +39,15 @@ // // Modifications: // 18/08/2000 V.Ivanchenko Update description +// 12/12/2003 H.P.Wellisch Completly rewrite mu-nuclear part // 17/05/2006 V.Ivanchenko Cleanup +// 15/11/2006 V.Ivanchenko Review and rewrite all kinematics // //----------------------------------------------------------------------------- #include "G4MuonMinusCaptureAtRest.hh" #include "G4DynamicParticle.hh" -//#include "G4ParticleTypes.hh" #include "Randomize.hh" -//#include -#include -//#include -//#include -//#include #include "G4He3.hh" #include "G4NeutrinoMu.hh" #include "G4Fragment.hh" @@ -57,16 +55,21 @@ #include "G4Proton.hh" #include "G4PionPlus.hh" #include "G4MuonMinus.hh" +#include "G4GHEKinematicsVector.hh" + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... G4MuonMinusCaptureAtRest::G4MuonMinusCaptureAtRest(const G4String& processName, G4ProcessType aType ) : G4VRestProcess (processName, aType), nCascade(0), targetZ(0),targetA(0) { - Cascade = new G4GHEKinematicsVector [17]; - pSelector = new G4StopElementSelector(); + Cascade = new G4GHEKinematicsVector [17]; + pSelector = new G4StopElementSelector(); pEMCascade = new G4MuMinusCaptureCascade(); } +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + G4MuonMinusCaptureAtRest::~G4MuonMinusCaptureAtRest() { delete [] Cascade; @@ -74,34 +77,37 @@ G4MuonMinusCaptureAtRest::~G4MuonMinusCaptureAtRest() delete pEMCascade; } -G4bool G4MuonMinusCaptureAtRest:: -IsApplicable(const G4ParticleDefinition& particle) -{ - return ( &particle == G4MuonMinus::MuonMinus() ); +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... +G4bool G4MuonMinusCaptureAtRest::IsApplicable(const G4ParticleDefinition& p) +{ + return ( &p == G4MuonMinus::MuonMinus() ); } -// -// Handles MuonMinuss at rest; a MuonMinus can either create secondaries or -// do nothing (in which case it should be sent back to decay-handling -// section -// -G4VParticleChange* G4MuonMinusCaptureAtRest:: -AtRestDoIt(const G4Track& track,const G4Step&) +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +G4VParticleChange* G4MuonMinusCaptureAtRest::AtRestDoIt(const G4Track& track, + const G4Step&) { + // + // Handles MuonMinuss at rest; a MuonMinus can either create secondaries or + // do nothing (in which case it should be sent back to decay-handling + // section + // aParticleChange.Initialize(track); // select element and get Z,A. G4Element* aEle = pSelector->GetElement(track.GetMaterial()); - targetZ = aEle->GetZ(); - targetA = aEle->GetN(); + targetZ = G4lrint(aEle->GetZ())+perCent; // protect against effective numbers, esp. A. + targetA = G4lrint(aEle->GetN())+perCent; // perCent protects for G4int getting targetA-1. + G4IsotopeVector* isv = aEle->GetIsotopeVector(); G4int ni = 0; if(isv) ni = isv->size(); if(ni == 1) { targetA = G4double(aEle->GetIsotope(0)->GetN()); - } else if(ni > 0) { + } else if(ni > 1) { G4double* ab = aEle->GetRelativeAbundanceVector(); G4double y = G4UniformRand(); G4int j = -1; @@ -114,7 +120,7 @@ AtRestDoIt(const G4Track& track,const G4Step&) } // Do the electromagnetic cascade of the muon in the nuclear field. - nCascade = 0; + nCascade = 0; targetMass = G4NucleiProperties::GetNuclearMass(targetA, targetZ); nCascade = pEMCascade->DoCascade(targetZ, targetMass, Cascade); @@ -130,28 +136,28 @@ AtRestDoIt(const G4Track& track,const G4Step&) G4ReactionProductVector * captureResult = 0; G4int nEmSecondaries = nCascade; G4int nSecondaries = nCascade; - + /* + G4cout << "lambda= " << lambda << " lambdac= " << lambdac + << " nem= " << nEmSecondaries << G4endl; + */ if( G4UniformRand()*lambda > lambdac) - { - pEMCascade->DoBoundMuonMinusDecay(targetZ, targetMass, &nEmSecondaries, Cascade); - } + pEMCascade->DoBoundMuonMinusDecay(targetZ, &nEmSecondaries, Cascade); else - { captureResult = DoMuCapture(); - } - + // fill the final state if(captureResult) nSecondaries += captureResult->size(); else nSecondaries = nEmSecondaries; + //G4cout << " nsec= " << nSecondaries << " nem= " << nEmSecondaries << G4endl; + aParticleChange.SetNumberOfSecondaries( nSecondaries ); G4double globalTime = track.GetGlobalTime(); G4ThreeVector position = track.GetPosition(); // Store nuclear cascade - if(captureResult) - { - for ( size_t isec = 0; isec < captureResult->size(); isec++ ) - { + if(captureResult) { + G4int n = captureResult->size(); + for ( G4int isec = 0; isec < n; isec++ ) { G4ReactionProduct* aParticle = captureResult->operator[](isec); G4DynamicParticle * aNewParticle = new G4DynamicParticle(); aNewParticle->SetDefinition( aParticle->GetDefinition() ); @@ -159,11 +165,11 @@ AtRestDoIt(const G4Track& track,const G4Step&) aNewParticle->SetMomentum(itV.vect()); G4double localtime = globalTime + tDelay + aParticle->GetTOF(); G4Track* aNewTrack = new G4Track( aNewParticle, localtime, position); - aNewTrack->SetTouchableHandle(track.GetTouchableHandle()); + aNewTrack->SetTouchableHandle(track.GetTouchableHandle()); aParticleChange.AddSecondary( aNewTrack ); } } - + // Store electromagnetic cascade if(nEmSecondaries > 0) { @@ -178,7 +184,7 @@ AtRestDoIt(const G4Track& track,const G4Step&) aNewParticle->SetMomentum( Cascade[isec].GetMomentum() ); G4Track* aNewTrack = new G4Track( aNewParticle, localtime, position ); - aNewTrack->SetTouchableHandle(track.GetTouchableHandle()); + aNewTrack->SetTouchableHandle(track.GetTouchableHandle()); aParticleChange.AddSecondary( aNewTrack ); } } @@ -190,82 +196,88 @@ AtRestDoIt(const G4Track& track,const G4Step&) return &aParticleChange; } -G4ReactionProductVector * G4MuonMinusCaptureAtRest::DoMuCapture() +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... + +G4ReactionProductVector* G4MuonMinusCaptureAtRest::DoMuCapture() { - static G4double zeff[100] = { - 1.,1.98,2.95,3.89,4.8,5.72,6.61,7.49,8.32,9.12,9.95,10.69,11.48,12.22, - 12.91,13.64,14.24,14.89,15.53,16.15,16.75,17.38,18.04,18.49, - 19.06,19.59,20.1,20.66,21.12,21.61,22.02,22.43,22.84,23.24, - 23.65,24.06,24.47,24.85,25.23,25.61,25.99,26.37,26.69,27., - 27.32,27.63,27.95,28.2,28.42,28.64,28.79,29.03,29.27,29.51, - 29.75,29.99,30.2,30.36,30.53,30.69,30.85,31.01,31.18,31.34, - 31.48,31.62,31.76,31.9,32.05,32.19,32.33,32.47,32.61,32.76, - 32.94,33.11,33.29,33.46,33.64,33.81,34.21,34.18,34.,34.1, - 34.21,34.31,34.42,34.52,34.63,34.73,34.84,34.94,35.04,35.15, - 35.25,35.36,35.46,35.57,35.67,35.78 }; - - // Get the muon 4-vector - // G4cout << "G4MuonMinusCaptureAtRest::DoMuCapture called " << G4endl; - G4int idxx = G4lrint(targetZ)-1; - if(idxx>99) idxx=99; - G4double q = zeff[idxx]; - G4double zeff2 = q*q; G4double mumass = G4MuonMinus::MuonMinus()->GetPDGMass(); - G4double muonBindingEnergy = 0.5*zeff2*mumass*fine_structure_const*fine_structure_const; + G4double muBindingEnergy = pEMCascade->GetKShellEnergy(targetZ); + /* + G4cout << "G4MuonMinusCaptureAtRest::DoMuCapture called Emu= " + << muBindingEnergy << G4endl; + */ // Energy on K-shell - G4double muEnergy = mumass + muonBindingEnergy; - G4double availableEnergy = targetMass + mumass - muonBindingEnergy; - - G4double cost = 2.*G4UniformRand() - 1.0; - G4double sint = std::sqrt((1.0 - cost)*(1.0 + cost)); - G4double phi = twopi*G4UniformRand(); - G4ThreeVector aMu3Mom(sint*std::cos(phi),sint*std::sin(phi),cost); - G4double pmu = std::sqrt(muEnergy*muEnergy + mumass*mumass); - G4LorentzVector aMuMom(muEnergy,aMu3Mom*pmu); - - G4double residualMass = G4NucleiProperties::GetNuclearMass(targetA, targetZ - 1.0); + G4double muEnergy = mumass + muBindingEnergy; + G4double muMom = std::sqrt(muBindingEnergy*(muBindingEnergy + 2.0*mumass)); + G4double availableEnergy = targetMass + mumass - muBindingEnergy; + G4LorentzVector momInitial(0.0,0.0,0.0,availableEnergy); G4LorentzVector momResidual; - G4ReactionProductVector * aPreResult; + + G4ThreeVector vmu = muMom*pEMCascade->GetRandomVec(); + G4LorentzVector aMuMom(vmu, muEnergy); + + G4double residualMass = + G4NucleiProperties::GetNuclearMass(targetA, targetZ - 1.0); + + G4ReactionProductVector* aPreResult = 0; G4ReactionProduct* aNu = new G4ReactionProduct(); aNu->SetDefinition( G4NeutrinoMu::NeutrinoMu() ); // proton as a target - if(targetA < 1.5) { + if(targetZ < 2.5) { - G4double Ecms = mumass + proton_mass_c2 - muonBindingEnergy; - G4double Enu = 0.5*(Ecms - neutron_mass_c2*neutron_mass_c2/Ecms); + if(targetA > 1.5) { + if(targetZ == 1.0 && targetA == 2.0) { + availableEnergy -= neutron_mass_c2; + } else if(targetZ == 1.0 && targetA == 3.0) { + availableEnergy -= 2.0*neutron_mass_c2; + } else if(targetZ == 2.0) { + G4ParticleDefinition* pd = 0; + if(targetA == 3.0) pd = G4Deuteron::Deuteron(); + if(targetA == 4.0) pd = G4Triton::Triton(); + else + pd = G4ParticleTable::GetParticleTable()->FindIon(1,G4int(targetA)-1,0,1); + + // G4cout << "Extra " << pd->GetParticleName() << G4endl; + availableEnergy -= pd->GetPDGMass(); + } + } + // + // Computation in assumption of CM collision of mu and nucleaon + // + G4double Enu = 0.5*(availableEnergy - + neutron_mass_c2*neutron_mass_c2/availableEnergy); // make the nu, and transform to lab; - G4double cost = 2.*G4UniformRand() - 1.0; - G4double sint = std::sqrt((1.0 - cost)*(1.0 + cost)); - G4double phi = twopi*G4UniformRand(); - G4ThreeVector nu3Mom(sint*std::cos(phi),sint*std::sin(phi),cost); - nu3Mom *= Enu; - - aPreResult = new G4ReactionProductVector(); + G4ThreeVector nu3Mom = Enu*pEMCascade->GetRandomVec(); G4ReactionProduct* aN = new G4ReactionProduct(); aN->SetDefinition( G4Neutron::Neutron() ); - aN->SetTotalEnergy( Ecms - Enu ); + aN->SetTotalEnergy( availableEnergy - Enu ); aN->SetMomentum( -nu3Mom ); aNu->SetTotalEnergy( Enu ); aNu->SetMomentum( nu3Mom ); + aPreResult = new G4ReactionProductVector(); + aPreResult->push_back(aN ); - aPreResult->push_back(aNu); + aPreResult->push_back(aNu); + if(verboseLevel > 1) - G4cout << "G4MuonMinusCaptureAtRest::DoMuCapture on H " - <<" EkinN(MeV)= " << (Ecms - Enu - neutron_mass_c2)/GeV - <<" Enu(MeV)= "<GetTotalEnergy()/MeV<begin(); ires!=aPreResult->end(); ires++) - { + G4double eBal = availableEnergy - aNu->GetTotalEnergy(); + for(ires=aPreResult->begin(); ires!=aPreResult->end(); ires++) { G4LorentzVector itV((*ires)->GetTotalEnergy(), (*ires)->GetMomentum()); itV.boost(fromBreit); (*ires)->SetTotalEnergy(itV.t()); (*ires)->SetMomentum(itV.vect()); eBal -= itV.t(); } + // // fill neutrino into result + // aPreResult->push_back(aNu); - eBal -= aNu->GetTotalEnergy(); + if(verboseLevel > 1) - G4cout << "G4MuonMinusCaptureAtRest::DoMuCapture: Nsec= " + G4cout << "DoMuCapture: Nsec= " << aPreResult->size() << " Ebalance(MeV)= " << eBal/MeV - << " Eex(MeV)= " << eEx/MeV - <<" E0(GeV)= " < #include "G4Material.hh" -//#include "G4MaterialTable.hh" -//#include "G4MuonMinus.hh" -//#include //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... @@ -138,7 +134,7 @@ G4double G4StopElementSelector::GetMuonCaptureRate(G4double Z, G4double A) // Initialized data // static std::vector zeff(100); - static G4double zeff[100] = { + static G4double zeff[100] = { 1.,1.98,2.95,3.89,4.8,5.72,6.61,7.49,8.32,9.12,9.95,10.69,11.48,12.22, 12.91,13.64,14.24,14.89,15.53,16.15,16.75,17.38,18.04,18.49, 19.06,19.59,20.1,20.66,21.12,21.61,22.02,22.43,22.84,23.24, @@ -154,7 +150,6 @@ G4double G4StopElementSelector::GetMuonCaptureRate(G4double Z, G4double A) // Atomizdat, 1978. (Experimental capture velocities) const size_t ListZE = 65; - // static std::vector ListZExp[ListZE] = { static G4int ListZExp[ListZE] = { 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 22, 23, @@ -163,7 +158,7 @@ G4double G4StopElementSelector::GetMuonCaptureRate(G4double Z, G4double A) 50, 51, 52, 53, 55, 56, 57, 58, 59, 60, 62, 64, 65, 67, 72, 73, 74, 80, 81, 82, 83, 90, 92, 93}; - // static std::vector ListCaptureVel[ListZE] = { + static G4double ListCaptureVel[ListZE] = { 0.0057, 0.010, 0.0258, 0.0371, 0.0644, 0.0974, 0.144, 0.250, 0.386, 0.479, diff --git a/source/processes/hadronic/util/History b/source/processes/hadronic/util/History index d30be4112d..80a93eb407 100644 --- a/source/processes/hadronic/util/History +++ b/source/processes/hadronic/util/History @@ -14,6 +14,18 @@ code and to keep track of all tags. * Please list in reverse chronological order (last date on top) --------------------------------------------------------------- +11 December 2006 Dennis Wright (hadr-util-V08-01-01) +---------------------------------------------------- +- G4ReactionDynamics::AddBlackTrackParticles + protect variables local_npnb, local_ndta from divide by zero + +24 November 2006 Dennis Wright (hadr-util-V08-01-00) +---------------------------------------------------- +- G4HadronicWhiteBoard: + replace GHAD message with + "Geant4 Hadronic Reaction Information" and use + G4Exception to kill run. + 15 May 2006 Dennis Wright (hadr-util-V08-00-05) ----------------------------------------------- - G4Nucleus: diff --git a/source/processes/hadronic/util/include/G4HadronicWhiteBoard.hh b/source/processes/hadronic/util/include/G4HadronicWhiteBoard.hh index 06583f467c..aee340ec76 100644 --- a/source/processes/hadronic/util/include/G4HadronicWhiteBoard.hh +++ b/source/processes/hadronic/util/include/G4HadronicWhiteBoard.hh @@ -30,6 +30,7 @@ #include "G4Nucleus.hh" #include "G4ParticleDefinition.hh" + class G4HadronicWhiteBoard { public: @@ -41,6 +42,7 @@ class G4HadronicWhiteBoard void SetTargetNucleus(const G4Nucleus & aTarget); + const G4HadProjectile * GetProjectile(); const G4Nucleus & GetTargetNucleus(); G4ParticleDefinition * GetPDef(); @@ -51,7 +53,7 @@ class G4HadronicWhiteBoard G4double GetPz(); G4double GetA(); G4double GetZ(); - + void Dump(); @@ -68,6 +70,7 @@ class G4HadronicWhiteBoard G4Nucleus theTarget; G4double theA; G4double theZ; + }; #endif diff --git a/source/processes/hadronic/util/src/G4HadronicWhiteBoard.cc b/source/processes/hadronic/util/src/G4HadronicWhiteBoard.cc index 5afac661cb..baeca171b7 100644 --- a/source/processes/hadronic/util/src/G4HadronicWhiteBoard.cc +++ b/source/processes/hadronic/util/src/G4HadronicWhiteBoard.cc @@ -25,6 +25,7 @@ // #include "G4HadronicWhiteBoard.hh" + G4HadronicWhiteBoard & G4HadronicWhiteBoard::Instance() { static G4HadronicWhiteBoard theInstance; @@ -42,7 +43,6 @@ G4HadronicWhiteBoard & G4HadronicWhiteBoard::Instance() G4double G4HadronicWhiteBoard::GetA(){return theA;} G4double G4HadronicWhiteBoard::GetZ(){return theZ;} - void G4HadronicWhiteBoard::SetProjectile(const G4HadProjectile & aProjectile) { theProjectile = const_cast(& aProjectile); @@ -61,15 +61,21 @@ G4HadronicWhiteBoard & G4HadronicWhiteBoard::Instance() theZ = theTarget.GetZ(); } + void G4HadronicWhiteBoard::Dump() { std::cerr << std::endl; - std::cerr << "GHAD_GHAD_GHAD_GHAD_GHAD_GHAD_GHAD_GHAD_GHAD_GHAD_GHAD_GHAD_GHAD_GHAD"< StartTracking() in G4FSMP StartTracking(G4Track*) was introduced in param-V07-01-02 diff --git a/source/processes/parameterisation/include/G4FastSimulationManager.hh b/source/processes/parameterisation/include/G4FastSimulationManager.hh index 4377ed4ec5..9117531c9a 100644 --- a/source/processes/parameterisation/include/G4FastSimulationManager.hh +++ b/source/processes/parameterisation/include/G4FastSimulationManager.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4FastSimulationManager.hh,v 1.11 2006/06/29 21:09:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4FastSimulationManager.hh,v 1.12 2006/11/03 17:26:04 mverderi Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- @@ -143,44 +143,25 @@ public: // without description G4VFastSimulationModel* GetFastSimulationModel(const G4String& modelName, const G4VFastSimulationModel* previousFound, bool &foundPrevious) const; - + + const std::vector& GetFastSimulationModelList() const + {return ModelList;} - - // ------------------------------------------------- - // Methods to add/remove GhostPlacements to/from the - // GhostPlacements List. - // ------------------------------------------------- - // - G4Transform3D* AddGhostPlacement(G4RotationMatrix*, - const G4ThreeVector&); - // Flag that the envelope is a ghost volume giving its global - // placement, where the rotation matrix and the translatation - // vector of 3D transformation describe the placement relative - // to the world coordinates. - - G4Transform3D* AddGhostPlacement(G4Transform3D*); - // The same but using a G4Transform3D. - - G4bool RemoveGhostPlacement(const G4Transform3D*); - // Removes a Ghost placement. - // - //---------------------------------------------- - // Interface methods for the G4GlobalFastSimulationManager - //---------------------------------------------- - // Parallel geometry placements - - G4bool InsertGhostHereIfNecessary(G4VPhysicalVolume* , - const G4ParticleDefinition&); - - // + // ------------------------------------------------------------- + // Deprecated ghost methods, to be dropped @ next major release: + // ------------------------------------------------------------- + G4Transform3D* AddGhostPlacement(G4RotationMatrix*, const G4ThreeVector&); + G4Transform3D* AddGhostPlacement(G4Transform3D*); + G4bool RemoveGhostPlacement(const G4Transform3D*); + G4bool InsertGhostHereIfNecessary(G4VPhysicalVolume*, const G4ParticleDefinition&); //---------------------------------------------- // Interface methods for the // G4FastSimulationManagerProcess process. //---------------------------------------------- // Trigger G4bool PostStepGetFastSimulationManagerTrigger(const G4Track &, - const G4Navigator* a = 0); + const G4Navigator* a = 0); // DoIt G4VParticleChange* InvokePostStepDoIt(); @@ -199,10 +180,12 @@ private: G4VFastSimulationModel* fTriggedFastSimulationModel; G4FastSimulationVector ModelList; G4FastSimulationVector fInactivatedModels; - G4FastSimulationVector GhostPlacements; G4ParticleDefinition* fLastCrossedParticle; G4FastSimulationVector fApplicableModelList; + + // -- *** depracating, to be dropped @ next major release: + G4FastSimulationVector GhostPlacements; }; inline void diff --git a/source/processes/parameterisation/include/G4FastSimulationManagerProcess.hh b/source/processes/parameterisation/include/G4FastSimulationManagerProcess.hh index fe2b45f214..e18a58d00c 100644 --- a/source/processes/parameterisation/include/G4FastSimulationManagerProcess.hh +++ b/source/processes/parameterisation/include/G4FastSimulationManagerProcess.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4FastSimulationManagerProcess.hh,v 1.12 2006/06/29 21:09:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4FastSimulationManagerProcess.hh,v 1.13 2006/11/03 17:26:04 mverderi Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/processes/parameterisation/include/G4FastSimulationManagerProcess81.hh b/source/processes/parameterisation/include/G4FastSimulationManagerProcess81.hh new file mode 100644 index 0000000000..647443484d --- /dev/null +++ b/source/processes/parameterisation/include/G4FastSimulationManagerProcess81.hh @@ -0,0 +1,161 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4FastSimulationManagerProcess81.hh,v 1.1 2006/11/10 13:23:07 mverderi Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// +//--------------------------------------------------------------- +// +// G4FastSimulationManagerProcess81.hh +// +// Description: +// The process that triggers parameterised simulations if any. +// +// History: +// Feb 98: Parallel geometry sensitivity. MoraDeFreitas. +// Oct 97: "Fast" replaces "Parameterisation" in class/method names. +// (release B.00 for parameterisation). MoraDeFreitas. +// Aug 97: First implementation. Verderi && MoraDeFreitas. +// Apr 98: modified for new particle change. H.Kurashige +// Oct 06: Move to parallel geometry scheme. M. Verderi +// Nov 06: name xxx81 is given for this release. "81" will be +// removed @ next maj. rel. so that this process becomes +// the standard one. +// +//--------------------------------------------------------------- + + +#ifndef G4FastSimulationManagerProcess81_hh +#define G4FastSimulationManagerProcess81_hh + +#include "globals.hh" +#include "G4VProcess.hh" +#include "G4FastSimulationManager.hh" +#include "G4Step.hh" +#include "G4Navigator.hh" +#include "G4VPhysicalVolume.hh" +#include "G4VParticleChange.hh" + + +// --------------------------------------------------------------------- +// +// G4FastSimulationManagerProcess81 class +// +// --------------------------------------------------------------------- + + +// Class Description: +// -- G4VProcess providing the interface between the tracking and the fast simulation. +// + +class G4FastSimulationManagerProcess81 : public G4VProcess +{ +public: + + // ------------------------- + // Constructor/Destructor: + // ------------------------- + // -- Constructor for parameterisation in mass geometry + G4FastSimulationManagerProcess81(const G4String& processName = "G4FastSimulationManagerProcess81", + G4ProcessType theType = fParameterisation); + + // -- Contructors for parameterisation attached a parallel geometry. + // -- Can also be used for the mass geometry, providing world volume name. + // -- World volume specified by name or pointer. + G4FastSimulationManagerProcess81(const G4String& processName, + const G4String& worldVolumeName, + G4ProcessType theType = fParameterisation); + G4FastSimulationManagerProcess81(const G4String& processName, + G4VPhysicalVolume* worldVolume, + G4ProcessType theType = fParameterisation); + + virtual ~G4FastSimulationManagerProcess81(); + + // ----------------------- + // User access methods: + // ----------------------- + // -- const G4VPhysicalVolume* GetWorldVolume() const {return fWorldVolume;} + G4VPhysicalVolume* GetWorldVolume() const {return fWorldVolume;} + + // -- Set new world volume to the process + void SetWorldVolume(G4String ); + void SetWorldVolume(G4VPhysicalVolume*); + + + // -------------------------------------------------------------- + // Process interface + // -------------------------------------------------------------- + + // -- Start/End tracking: + void StartTracking(G4Track*); + void EndTracking(); + + // -- PostStep methods: + G4double PostStepGetPhysicalInteractionLength(const G4Track& track, + G4double previousStepSize, + G4ForceCondition* condition); + + G4VParticleChange* PostStepDoIt(const G4Track&, const G4Step& ); + + + + + + + // -- AtRest methods (still there after many years of no use...): + G4double AtRestGetPhysicalInteractionLength(const G4Track&, + G4ForceCondition*); + + G4VParticleChange* AtRestDoIt(const G4Track&, const G4Step&); + + + // -- unused: + G4double AlongStepGetPhysicalInteractionLength(const G4Track&, G4double, G4double, G4double&, G4GPILSelection*) {return 0.0;} + G4VParticleChange* AlongStepDoIt(const G4Track& , const G4Step&) {return 0;} + + + // -- debug: + void Verbose() const; + + + // ******* private ******* + +private: + //-- would be better to my taste to have "const G4VPhysicalVolume* fWorldVolume;", but clashes at compilation + G4VPhysicalVolume* fWorldVolume; + + G4bool fIsTrackingTime; + G4bool fIsFirstStep; + G4Navigator* fNavigator; + G4int fNavigatorIndex; + + + G4FastSimulationManager* fFastSimulationManager; + G4bool fFastSimulationTrigger; +}; + +#endif diff --git a/source/processes/parameterisation/include/G4FastSimulationMessenger.hh b/source/processes/parameterisation/include/G4FastSimulationMessenger.hh index 393cec9fbf..21c79abaf0 100644 --- a/source/processes/parameterisation/include/G4FastSimulationMessenger.hh +++ b/source/processes/parameterisation/include/G4FastSimulationMessenger.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4FastSimulationMessenger.hh,v 1.5 2006/06/29 21:09:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4FastSimulationMessenger.hh,v 1.6 2006/11/03 17:26:04 mverderi Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // GEANT 4 class header file @@ -64,12 +64,13 @@ private: G4GlobalFastSimulationManager* fGlobalFastSimulationManager; //commands - G4UIdirectory *fFSDirectory; - G4UIcmdWithAString *fListEnvelopesCmd; - G4UIcmdWithAString *fListModelsCmd; - G4UIcmdWithAString *fListIsApplicableCmd; - G4UIcmdWithAString *fActivateModel; - G4UIcmdWithAString *fInActivateModel; + G4UIdirectory* fFSDirectory; + G4UIcmdWithoutParameter* fShowSetupCmd; + G4UIcmdWithAString* fListEnvelopesCmd; + G4UIcmdWithAString* fListModelsCmd; + G4UIcmdWithAString* fListIsApplicableCmd; + G4UIcmdWithAString* fActivateModel; + G4UIcmdWithAString* fInActivateModel; }; #endif diff --git a/source/processes/parameterisation/include/G4FastStep.hh b/source/processes/parameterisation/include/G4FastStep.hh index 762d924095..01774621c5 100644 --- a/source/processes/parameterisation/include/G4FastStep.hh +++ b/source/processes/parameterisation/include/G4FastStep.hh @@ -25,7 +25,7 @@ // // // $Id: G4FastStep.hh,v 1.8 2006/06/29 21:09:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/processes/parameterisation/include/G4FastStep.icc b/source/processes/parameterisation/include/G4FastStep.icc index a38ec66a33..97259e642b 100644 --- a/source/processes/parameterisation/include/G4FastStep.icc +++ b/source/processes/parameterisation/include/G4FastStep.icc @@ -25,7 +25,7 @@ // // // $Id: G4FastStep.icc,v 1.5 2006/06/29 21:09:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // $id: G4ParticleChange.icc,v 1.6 1998/04/14 02:25:54 kurasige Exp $ diff --git a/source/processes/parameterisation/include/G4FastTrack.hh b/source/processes/parameterisation/include/G4FastTrack.hh index ee68395edd..5beb9219c5 100644 --- a/source/processes/parameterisation/include/G4FastTrack.hh +++ b/source/processes/parameterisation/include/G4FastTrack.hh @@ -25,7 +25,7 @@ // // // $Id: G4FastTrack.hh,v 1.7 2006/06/29 21:09:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // $Id: //--------------------------------------------------------------- diff --git a/source/processes/parameterisation/include/G4FlavoredParallelWorld.hh b/source/processes/parameterisation/include/G4FlavoredParallelWorld.hh index 1d9074189b..d54376d2c5 100644 --- a/source/processes/parameterisation/include/G4FlavoredParallelWorld.hh +++ b/source/processes/parameterisation/include/G4FlavoredParallelWorld.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4FlavoredParallelWorld.hh,v 1.6 2006/06/29 21:09:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4FlavoredParallelWorld.hh,v 1.7 2006/11/03 17:26:04 mverderi Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- @@ -49,7 +49,7 @@ #include "G4VFlavoredParallelWorld.hh" class G4ParticleDefinition; -class G4VPhysicalVolume; +#include "G4VPhysicalVolume.hh" class G4FlavoredParallelWorld : public G4VFlavoredParallelWorld { diff --git a/source/processes/parameterisation/include/G4GFSManager81.hh b/source/processes/parameterisation/include/G4GFSManager81.hh new file mode 100644 index 0000000000..6ffa3ae211 --- /dev/null +++ b/source/processes/parameterisation/include/G4GFSManager81.hh @@ -0,0 +1,73 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4GFSManager81.hh,v 1.1 2006/11/10 13:23:07 mverderi Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// +//--------------------------------------------------------------- +// +// G4GFSManager81.hh +// +// Description: +// Gathers code to be dropped @ next major release +// +// History: +// November 06: Marc Verderi +// +//--------------------------------------------------------------- + +#ifndef G4GFSManager81_hh +#define G4GFSManager81_hh + +#include "globals.hh" +#include "G4FastSimulationVector.hh" +#include "G4FlavoredParallelWorld.hh" +#include "G4StateManager.hh" + +class G4GFSManager; + +class G4GFSManager81 { +public: + + ~G4GFSManager81(); + + void FastSimulationNeedsToBeClosed(); + +public: + void CloseFastSimulation(); + G4VFlavoredParallelWorld* GetFlavoredWorldForThis(G4ParticleDefinition *); + G4bool Notify(G4ApplicationState requestedState); + + G4GFSManager81(); + +private: + G4bool fClosed; + G4FastSimulationVector NeededFlavoredWorlds; + G4VPhysicalVolume* GiveMeAWorldVolumeClone(); +}; + +#endif diff --git a/source/processes/parameterisation/include/G4GlobalFastSimulationManager.hh b/source/processes/parameterisation/include/G4GlobalFastSimulationManager.hh index 2daab1847b..d8515b2a5f 100644 --- a/source/processes/parameterisation/include/G4GlobalFastSimulationManager.hh +++ b/source/processes/parameterisation/include/G4GlobalFastSimulationManager.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4GlobalFastSimulationManager.hh,v 1.10 2006/06/29 21:09:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4GlobalFastSimulationManager.hh,v 1.12 2006/11/10 13:23:07 mverderi Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- @@ -53,18 +53,19 @@ #include "G4VGlobalFastSimulationManager.hh" #include "G4FastSimulationManager.hh" -#include "G4FastSimulationManagerProcess.hh" +#include "G4FastSimulationManagerProcess81.hh" #include "G4StateManager.hh" #include "G4VStateDependent.hh" #include "G4FlavoredParallelWorld.hh" +class G4FastSimulationMessenger; + enum listType { NAMES_ONLY, MODELS, ISAPPLICABLE }; -class G4FastSimulationMessenger; // Class Description: // This a singleton class which provides the management of the G4FastSimulationManager @@ -84,9 +85,17 @@ class G4FastSimulationMessenger; // geometries. // +// -- *** to be dropped @ next major release: >>> +#include "G4GFSManager81.hh" +// -- <<<. + class G4GlobalFastSimulationManager : public G4VStateDependent, public G4VGlobalFastSimulationManager { + // -- *** to be dropped @ next major release: >>> + friend class G4GFSManager81; + // -- <<<. + public: // With description static G4GlobalFastSimulationManager* GetGlobalFastSimulationManager(); @@ -123,12 +132,19 @@ public: // Without description // Destructor ~G4GlobalFastSimulationManager(); - // G4FastSimulationManager's management : + // + // G4FastSimulationManager(Process)'s management, no intended for + // general use. // // Methods for a G4FastSimulationManager to register itself // - void AddFastSimulationManager(G4FastSimulationManager*); + void AddFastSimulationManager(G4FastSimulationManager*); void RemoveFastSimulationManager(G4FastSimulationManager*); + // + // G4FastSimulationManagerProcess bookeeping: + // + void AddFSMP(G4FastSimulationManagerProcess81*); + void RemoveFSMP(G4FastSimulationManagerProcess81*); // Flag that the Parameterisation must be closed. @@ -136,19 +152,20 @@ public: // Without description public: // With description - void CloseFastSimulation(); - // Build the parallel worlds when you are using ghost volumes. In this case the Parameterisation - // MUST be closed BEFORE closing the geometry. It's enough to call this method just before - // closing the geometry. - // + void ShowSetup(); + // Show the fast simulation setup : world(s), region(s), model(s) and links between them. + // Requires the geometry to be closed. + public: // Without description - // print/control commands - void ListEnvelopes(const G4String& aName = "all", - listType aListType = NAMES_ONLY); - void ListEnvelopes(const G4ParticleDefinition*); + void CloseFastSimulation(); + // deprecated + + void ListEnvelopes(const G4String& aName = "all", + listType aListType = NAMES_ONLY); + void ListEnvelopes(const G4ParticleDefinition* ); - void ActivateFastSimulationModel(const G4String&); + void ActivateFastSimulationModel(const G4String&); void InActivateFastSimulationModel(const G4String&); // G4FastSimulationProcess interface @@ -161,6 +178,9 @@ private: // Private construtor insures singleton class G4GlobalFastSimulationManager(); + // recursive display of regions, models, etc... + void DisplayRegion(G4Region* motherRegion, G4int depth, std::vector& particles) const; + // The single instance. static G4GlobalFastSimulationManager* fGlobalFastSimulationManager; @@ -170,14 +190,12 @@ private: // List of G4FastSimulationManagers G4FastSimulationVector ManagedManagers; - // fClosed flags if the NeededFlavoredWorlds List was Build. - G4bool fClosed; + // Instantiated fast simulation processes: + G4FastSimulationVector fFSMPVector; - // List of needed ParallelWorlds after close - G4FastSimulationVector NeededFlavoredWorlds; - - // Internal fonction to Build world volume clones. - G4VPhysicalVolume* GiveMeAWorldVolumeClone(); + + // -- *** to be dropped @ next major release: >>> + G4GFSManager81* _deprecated; }; #endif diff --git a/source/processes/parameterisation/include/G4VFastSimulationModel.hh b/source/processes/parameterisation/include/G4VFastSimulationModel.hh index dde8b59a49..b8471db1dd 100644 --- a/source/processes/parameterisation/include/G4VFastSimulationModel.hh +++ b/source/processes/parameterisation/include/G4VFastSimulationModel.hh @@ -25,7 +25,7 @@ // // // $Id: G4VFastSimulationModel.hh,v 1.7 2006/06/29 21:09:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/processes/parameterisation/src/G4FastSimulationManager.cc b/source/processes/parameterisation/src/G4FastSimulationManager.cc index 1ae72389aa..75e0d2e4e1 100644 --- a/source/processes/parameterisation/src/G4FastSimulationManager.cc +++ b/source/processes/parameterisation/src/G4FastSimulationManager.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4FastSimulationManager.cc,v 1.11 2006/06/29 21:09:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4FastSimulationManager.cc,v 1.12 2006/11/03 17:26:04 mverderi Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------- // @@ -42,6 +42,7 @@ #include "G4FastSimulationManager.hh" #include "G4GlobalFastSimulationManager.hh" #include "G4PVPlacement.hh" +#include "G4TransportationManager.hh" // -------------------------------------------------- // Constructor with envelope and IsUnique flag : @@ -154,6 +155,7 @@ G4FastSimulationManager::GetFastSimulationModel(const G4String& modelName, return model; } +// ***************************************** TO BE DROPPED ********************************************** >>>> BEGINNING //---------------------------------------- // Methods to add/remove GhostPlacements @@ -226,6 +228,7 @@ InsertGhostHereIfNecessary(G4VPhysicalVolume* theClone, return false; } +// ***************************************** TO BE DROPPED **************************************** <<<< END // //------------------------------------- @@ -369,7 +372,10 @@ void G4FastSimulationManager::ListTitle() const { G4cout << fFastTrack.GetEnvelope()->GetName(); - if(GhostPlacements.size()!=0) G4cout << " (ghost)"; + // if(GhostPlacements.size()!=0) G4cout << " (ghost)"; + if (fFastTrack.GetEnvelope()->GetWorldPhysical() == G4TransportationManager::GetTransportationManager()->GetNavigatorForTracking()->GetWorldVolume()) G4cout << " (mass geom.)"; + else G4cout << " (// geom.)"; + } void @@ -379,7 +385,7 @@ G4FastSimulationManager::ListModels() const G4cout << "Current Models for the "; ListTitle(); - G4cout << " Envelope:\n"; + G4cout << " envelope:\n"; for (iModel=0; iModelGetName() << "\n"; diff --git a/source/processes/parameterisation/src/G4FastSimulationManagerProcess.cc b/source/processes/parameterisation/src/G4FastSimulationManagerProcess.cc index 9cfbe8fcd5..3149485897 100644 --- a/source/processes/parameterisation/src/G4FastSimulationManagerProcess.cc +++ b/source/processes/parameterisation/src/G4FastSimulationManagerProcess.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4FastSimulationManagerProcess.cc,v 1.13 2006/06/29 21:09:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4FastSimulationManagerProcess.cc,v 1.14 2006/11/03 17:26:04 mverderi Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- @@ -148,6 +148,7 @@ G4FastSimulationManagerProcess::PostStepGetPhysicalInteractionLength( fOutOfGhostWorld = true; } } + if (fGhostWorld == 0) fStartTracking = false; // -- case ghost world below // ------------------------------------------------------- // diff --git a/source/processes/parameterisation/src/G4FastSimulationManagerProcess81.cc b/source/processes/parameterisation/src/G4FastSimulationManagerProcess81.cc new file mode 100644 index 0000000000..31ccd8db59 --- /dev/null +++ b/source/processes/parameterisation/src/G4FastSimulationManagerProcess81.cc @@ -0,0 +1,314 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4FastSimulationManagerProcess81.cc,v 1.1 2006/11/10 13:23:07 mverderi Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// +//--------------------------------------------------------------- +// +// G4FastSimulationProcess.cc +// +// Description: +// The process that triggers the parameterised simulations, +// if any. +// +// History: +// August 97: First implementation. Verderi && MoraDeFreitas. +// October 06: move to parallel geometry scheme, M. Verderi +//--------------------------------------------------------------- + +#include "G4ios.hh" +#include "G4FastSimulationManagerProcess81.hh" +#include "G4GlobalFastSimulationManager.hh" +#include "G4TransportationManager.hh" +#include "G4PathFinder.hh" +#include "G4ParticleChange.hh" + +#define PARANOIA + +G4FastSimulationManagerProcess81:: +G4FastSimulationManagerProcess81(const G4String& processName, + G4ProcessType theType) : + G4VProcess(processName,theType), + fWorldVolume(0), + fIsTrackingTime(false), + fNavigator(0), + fNavigatorIndex(-1), + fFastSimulationManager(0), + fFastSimulationTrigger(false) +{ + SetWorldVolume(G4TransportationManager::GetTransportationManager()->GetNavigatorForTracking()->GetWorldVolume()->GetName()); + if (verboseLevel>0) G4cout << "G4FastSimulationManagerProcess81 `" << GetProcessName() + << "' is created, and will message geometry with world volume `" + << fWorldVolume->GetName() << "'." << G4endl; + + G4GlobalFastSimulationManager::GetGlobalFastSimulationManager()->AddFSMP(this); +} + + +G4FastSimulationManagerProcess81:: +G4FastSimulationManagerProcess81(const G4String& processName, + const G4String& worldVolumeName, + G4ProcessType theType) : + G4VProcess(processName,theType), + fWorldVolume(0), + fIsTrackingTime(false), + fNavigator(0), + fNavigatorIndex(-1), + fFastSimulationManager(0), + fFastSimulationTrigger(false) +{ + SetWorldVolume(worldVolumeName); + if (verboseLevel>0) G4cout << "G4FastSimulationManagerProcess81 `" << GetProcessName() + << "' is created, and will message geometry with world volume `" + << fWorldVolume->GetName() << "'." << G4endl; + + G4GlobalFastSimulationManager::GetGlobalFastSimulationManager()->AddFSMP(this); +} + + +G4FastSimulationManagerProcess81:: +G4FastSimulationManagerProcess81(const G4String& processName, + G4VPhysicalVolume* worldVolume, + G4ProcessType theType) : + G4VProcess(processName,theType), + fWorldVolume(0), + fIsTrackingTime(false), + fNavigator(0), + fNavigatorIndex(-1), + fFastSimulationManager(0), + fFastSimulationTrigger(false) +{ + SetWorldVolume(worldVolume); + if (verboseLevel>0) G4cout << "G4FastSimulationManagerProcess81 `" << GetProcessName() + << "' is created, and will message geometry with world volume `" + << fWorldVolume->GetName() << "'." << G4endl; + + G4GlobalFastSimulationManager::GetGlobalFastSimulationManager()->AddFSMP(this); +} + + +G4FastSimulationManagerProcess81::~G4FastSimulationManagerProcess81() +{ + G4GlobalFastSimulationManager::GetGlobalFastSimulationManager()->RemoveFSMP(this); +} + + +// ----------------------- +// User access methods: +// ----------------------- +void +G4FastSimulationManagerProcess81:: +SetWorldVolume(G4String newWorldName) +{ + if (fIsTrackingTime) + G4cout << "!!! G4FastSimulationManagerProcess81 `" << GetProcessName() + << "': changing world volume at tracking time is not allowed for now. Call ignored !!!" << G4endl; + else + { + G4VPhysicalVolume* newWorld = G4TransportationManager::GetTransportationManager()->IsWorldExisting(newWorldName); + G4String tellWhatIsWrong; + tellWhatIsWrong = "Volume newWorldName = `"; tellWhatIsWrong += newWorldName; tellWhatIsWrong += "' is not a parallel world nor the mass world volume."; + if (newWorld == 0) G4Exception("G4FastSimulationManagerProcess81::SetWorldVolume(const G4String&, G4bool verbose)", + "InvalidWorld", + FatalException, + tellWhatIsWrong); + if (verboseLevel>0) + if (fWorldVolume) G4cout << "G4FastSimulationManagerProcess81 `" << GetProcessName() + << "': changing world volume from '" << fWorldVolume->GetName() + << "' to `" << newWorld << "'." << G4endl; + else G4cout << "G4FastSimulationManagerProcess81 `" << GetProcessName() + << "': setting world volume from to `"<< newWorld->GetName() << "'." << G4endl; + fWorldVolume = newWorld; + } + +} + + +void +G4FastSimulationManagerProcess81:: +SetWorldVolume(G4VPhysicalVolume* newWorld) +{ + if (newWorld) SetWorldVolume(newWorld->GetName()); + else G4cout << "!!! G4FastSimulationManagerProcess81::SetWorldVolume(const G4VPhysicalVolume* newWorld) : null pointer passed. !!! Continuing at your own risks..." << G4endl; +} + + +// -------------------- +// Start/End tracking: +// -------------------- +void +G4FastSimulationManagerProcess81:: +StartTracking(G4Track*) +{ + fIsTrackingTime = true; + fIsFirstStep = true; + + // -- fetch the navigator (and its index) and activate it: + G4TransportationManager* transportationManager = G4TransportationManager::GetTransportationManager(); + fNavigator = transportationManager->GetNavigator(fWorldVolume); + if (fNavigator != transportationManager->GetNavigatorForTracking()) + fNavigatorIndex = transportationManager->ActivateNavigator(fNavigator); + else + fNavigatorIndex = 0; +} + + +void +G4FastSimulationManagerProcess81:: +EndTracking() +{ + fIsTrackingTime = false; +} + + +// ------------------------------------------ +// PostStepGetPhysicalInteractionLength(): +// ------------------------------------------ +G4double +G4FastSimulationManagerProcess81:: +PostStepGetPhysicalInteractionLength(const G4Track& track, + G4double, + G4ForceCondition* condition) +{ +#ifdef PARANOIA + if ( fNavigator->GetWorldVolume() != fWorldVolume ) G4Exception("!!! ??? INCONSISTENT NAVIGATORS/WORLD VOLUMES ??? !!!"); +#endif + // -- Get current volume, and check for presence of fast simulation manager. + // -- For the case of the navigator for tracking (fNavigatorIndex == 0) + // -- we use the track volume. This allows the code to be valid for both + // -- cases where the PathFinder is used (G4CoupledTranportation) or not + // -- (G4Transportation). + const G4VPhysicalVolume* currentVolume(0); + if (fNavigatorIndex == 0) currentVolume = track.GetVolume(); + else currentVolume = G4PathFinder::GetInstance()->GetLocatedVolume(fNavigatorIndex); + if ( currentVolume ) + { + fFastSimulationManager = currentVolume->GetLogicalVolume()->GetFastSimulationManager(); + if( fFastSimulationManager ) + { + // Ask for trigger: + fFastSimulationTrigger = fFastSimulationManager->PostStepGetFastSimulationManagerTrigger(track, fNavigator); + if( fFastSimulationTrigger ) + { + // Take control over stepping: + *condition = ExclusivelyForced; + return 0.0; + } + } + } + + // -- no fast simulation occuring there: + *condition = NotForced; + return DBL_MAX; +} + +//------------------------------------ +// PostStepDoIt() +//------------------------------------ +G4VParticleChange* +G4FastSimulationManagerProcess81:: +PostStepDoIt(const G4Track&, + const G4Step&) +{ + G4VParticleChange* finalState = fFastSimulationManager->InvokePostStepDoIt(); + + // If the particle is still alive, suspend it to force physics re-initialisation: + if (finalState->GetTrackStatus() != fStopAndKill) finalState->ProposeTrackStatus(fSuspend); + + return finalState; +} + + +//-------------------------------------------- +// At Rest parameterisation: +//-------------------------------------------- +// AtRestGetPhysiscalInteractionLength: +//-------------------------------------------- +G4double +G4FastSimulationManagerProcess81:: +AtRestGetPhysicalInteractionLength(const G4Track& track, + G4ForceCondition* condition) +{ + const G4VPhysicalVolume* currentVolume(0); + if (fNavigatorIndex == 0) currentVolume = track.GetVolume(); + else currentVolume = G4PathFinder::GetInstance()->GetLocatedVolume(fNavigatorIndex); + fFastSimulationManager = currentVolume->GetLogicalVolume()->GetFastSimulationManager(); + if( fFastSimulationManager ) + { + // Ask for trigger: + fFastSimulationTrigger = fFastSimulationManager->AtRestGetFastSimulationManagerTrigger(track, fNavigator); + if( fFastSimulationTrigger ) + { + // Dirty trick to take control over stepping. Does anyone will ever use that ? + *condition = NotForced; + return -1.0; + } + } + + // -- no fast simulation occuring there: + *condition = NotForced; + return DBL_MAX; + +} + +//----------------------------------------------- +// AtRestDoIt: +//----------------------------------------------- +G4VParticleChange* G4FastSimulationManagerProcess81::AtRestDoIt(const G4Track&, const G4Step&) +{ + return fFastSimulationManager->InvokeAtRestDoIt(); +} + + +void G4FastSimulationManagerProcess81::Verbose() const +{ + /* G4cout << " >>>>> Trigger Status : "; + switch(fFastSimulationManager->GetTriggerStatus()) + { + case NoModel: + G4cout << "NoModel" << G4endl; + break; + case OnBoundaryButLeaving: + G4cout << "OnBoundaryButLeaving" << G4endl; + break; + case OneModelTrigger: + G4cout << "OneModelTrigger" << G4endl; + break; + case NoModelTrigger: + G4cout << "NoModelTrigger" << G4endl; + break; + case Undefined: + G4cout << "Undefined" << G4endl; + break; + default: + G4cout << " Bizarre..." << G4endl; + break; + }*/ +} + + diff --git a/source/processes/parameterisation/src/G4FastSimulationMessenger.cc b/source/processes/parameterisation/src/G4FastSimulationMessenger.cc index 74d01205fe..e8dcf8048d 100644 --- a/source/processes/parameterisation/src/G4FastSimulationMessenger.cc +++ b/source/processes/parameterisation/src/G4FastSimulationMessenger.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4FastSimulationMessenger.cc,v 1.6 2006/06/29 21:09:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4FastSimulationMessenger.cc,v 1.7 2006/11/03 17:26:04 mverderi Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4FastSimulationMessenger.hh" @@ -42,6 +42,11 @@ G4FastSimulationMessenger(G4GlobalFastSimulationManager* theGFSM) fFSDirectory = new G4UIdirectory("/param/"); fFSDirectory->SetGuidance("Fast Simulation print/control commands."); + fShowSetupCmd = + new G4UIcmdWithoutParameter("/param/showSetup", this); + fShowSetupCmd->SetGuidance("Show fast simulation setup"); + fShowSetupCmd->AvailableForStates(G4State_GeomClosed); + fListEnvelopesCmd = new G4UIcmdWithAString("/param/listEnvelopes", this); fListEnvelopesCmd->SetParameterName("ParticleName",true); @@ -78,6 +83,8 @@ G4FastSimulationMessenger(G4GlobalFastSimulationManager* theGFSM) G4FastSimulationMessenger::~G4FastSimulationMessenger() { + delete fShowSetupCmd; + fShowSetupCmd = 0; delete fListIsApplicableCmd; fListIsApplicableCmd = 0; delete fActivateModel; @@ -94,6 +101,8 @@ G4FastSimulationMessenger::~G4FastSimulationMessenger() void G4FastSimulationMessenger::SetNewValue(G4UIcommand * command,G4String newValue) { + if (command == fShowSetupCmd) + fGlobalFastSimulationManager->ShowSetup(); if( command == fListEnvelopesCmd) if(newValue == "all") fGlobalFastSimulationManager->ListEnvelopes(); diff --git a/source/processes/parameterisation/src/G4FastStep.cc b/source/processes/parameterisation/src/G4FastStep.cc index ab2a2cff15..ba2ffc5b1c 100644 --- a/source/processes/parameterisation/src/G4FastStep.cc +++ b/source/processes/parameterisation/src/G4FastStep.cc @@ -25,7 +25,7 @@ // // // $Id: G4FastStep.cc,v 1.16 2006/06/29 21:09:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------- // diff --git a/source/processes/parameterisation/src/G4FastTrack.cc b/source/processes/parameterisation/src/G4FastTrack.cc index b688fd8195..56fced51a6 100644 --- a/source/processes/parameterisation/src/G4FastTrack.cc +++ b/source/processes/parameterisation/src/G4FastTrack.cc @@ -25,7 +25,7 @@ // // // $Id: G4FastTrack.cc,v 1.10 2006/06/29 21:09:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------- // diff --git a/source/processes/parameterisation/src/G4GFSManager81.cc b/source/processes/parameterisation/src/G4GFSManager81.cc new file mode 100644 index 0000000000..35267dccd1 --- /dev/null +++ b/source/processes/parameterisation/src/G4GFSManager81.cc @@ -0,0 +1,167 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4GFSManager81.cc,v 1.1 2006/11/10 13:23:07 mverderi Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// +//--------------------------------------------------------------- +// +// G4GFSManager81.cc +// +// Description: +// Gathers code to be dropped at the next major release +// +// History: +// November 2006 +// +//--------------------------------------------------------------- + +#include "G4GFSManager81.hh" +#include "G4ParticleTable.hh" +#include "G4ParticleDefinition.hh" +#include "G4Material.hh" +#include "G4ThreeVector.hh" +#include "G4PVPlacement.hh" +#include "G4TransportationManager.hh" +#include "G4FastSimulationMessenger.hh" + +#include "G4GlobalFastSimulationManager.hh" + +G4GFSManager81::G4GFSManager81() +{ + // It starts closed. + fClosed=true; +} + +void G4GFSManager81::FastSimulationNeedsToBeClosed() +{ + fClosed=false; +} + +void G4GFSManager81::CloseFastSimulation() +{ + if(fClosed) return; + + G4ParticleTable* theParticleTable; + + // Reset the NeededFlavoredWorlds List + NeededFlavoredWorlds.clearAndDestroy(); + + // We'll look for models for all particle types + theParticleTable=G4ParticleTable::GetParticleTable(); + + // Creates the first world volume clone. + G4VPhysicalVolume* aClone = GiveMeAWorldVolumeClone(); + + G4cout << "Closing Fast-Simulation ..." << G4endl; + + for (G4int iParticle=0; + iParticleentries(); iParticle++) { + G4bool Needed = false; + G4GlobalFastSimulationManager* global = G4GlobalFastSimulationManager::GetGlobalFastSimulationManager(); + for (size_t ifsm=0; ifsm< global->ManagedManagers.size(); ifsm++) + Needed = Needed || global->ManagedManagers[ifsm]-> + InsertGhostHereIfNecessary(aClone, + *(theParticleTable-> + GetParticle(iParticle))); + // if some FSM inserted a ghost, keep this clone. + if(Needed) + { + G4Region* aWorldGhostRegion = new G4Region("Ghost world region for " + theParticleTable->GetParticle(iParticle)->GetParticleName()); + aWorldGhostRegion->AddRootLogicalVolume(aClone->GetLogicalVolume()); + NeededFlavoredWorlds.push_back(new G4FlavoredParallelWorld(theParticleTable->GetParticle(iParticle), aClone)); + // and prepare a new one. + aClone=GiveMeAWorldVolumeClone(); + } + } + + fClosed=true; +} + +G4VFlavoredParallelWorld* +G4GFSManager81:: +GetFlavoredWorldForThis(G4ParticleDefinition* particle) +{ + for (size_t ipw=0; ipwGetTheParticleType()==particle) + return NeededFlavoredWorlds[ipw]; + return 0; +} + + +G4VPhysicalVolume* +G4GFSManager81::GiveMeAWorldVolumeClone() +{ + G4VPhysicalVolume* theParallelWorldPhysical; + + G4TransportationManager *transportationManager= + G4TransportationManager::GetTransportationManager(); + + G4VSolid *parallelWorldSolid=transportationManager-> + GetNavigatorForTracking()->GetWorldVolume()-> + GetLogicalVolume()->GetSolid(); + + G4Material *parallelWorldMaterial=transportationManager-> + GetNavigatorForTracking()->GetWorldVolume()-> + GetLogicalVolume()->GetMaterial(); + + G4LogicalVolume *parallelWorldLog = + new G4LogicalVolume(parallelWorldSolid, + parallelWorldMaterial, + "ParallelWorldLogical", + 0, 0, 0); + + theParallelWorldPhysical= new G4PVPlacement(0,G4ThreeVector(), + "ParallelWorldPhysical", + parallelWorldLog, + 0,false,0); + + return theParallelWorldPhysical; +} + + +G4bool +G4GFSManager81::Notify(G4ApplicationState requestedState) +{ + G4StateManager * stateManager = G4StateManager::GetStateManager(); + if((stateManager->GetPreviousState()==G4State_Idle) && + (requestedState==G4State_GeomClosed) && (!fClosed) ) + { + G4cerr + << "ERROR - G4GFSManager81::Notify()" << G4endl + << " 1) you are using ghost volumes;" << G4endl + << " 2) In this case the G4GFSManager81" << G4endl + << " MUST be closed BEFORE closing the geometry;" << G4endl + << " 3) To do this put in your code the call to" << G4endl + << " GetGlobalFastSimulationManager()->CloseFastSimulation();" + << G4endl + << " just before closing the geometry." << G4endl; + G4Exception("G4GFSManager81::Notify()", "InvalidState", + FatalException, "Fast simulation must be closed."); + } + return true; +} diff --git a/source/processes/parameterisation/src/G4GlobalFastSimulationManager.cc b/source/processes/parameterisation/src/G4GlobalFastSimulationManager.cc index fbf392877a..19a8104561 100644 --- a/source/processes/parameterisation/src/G4GlobalFastSimulationManager.cc +++ b/source/processes/parameterisation/src/G4GlobalFastSimulationManager.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4GlobalFastSimulationManager.cc,v 1.16 2006/06/29 21:09:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4GlobalFastSimulationManager.cc,v 1.19 2006/11/10 15:27:17 mverderi Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- @@ -54,6 +54,14 @@ #include "G4PVPlacement.hh" #include "G4TransportationManager.hh" #include "G4FastSimulationMessenger.hh" +#include "G4RegionStore.hh" +#include "G4ProcessVector.hh" +#include "G4ProcessManager.hh" +#include "G4PhysicalVolumeStore.hh" + +// -- *** to be dropped @ next major release: >>>> +#include "G4GFSManager81.hh" +// -- <<<<<<<< G4GlobalFastSimulationManager* G4GlobalFastSimulationManager::fGlobalFastSimulationManager = 0; @@ -66,6 +74,7 @@ G4GlobalFastSimulationManager::GetGlobalFastSimulationManager() { fGlobalFastSimulationManager = new G4GlobalFastSimulationManager; SetConcreteInstance(fGlobalFastSimulationManager); + } return fGlobalFastSimulationManager; } @@ -73,10 +82,11 @@ G4GlobalFastSimulationManager::GetGlobalFastSimulationManager() G4GlobalFastSimulationManager::G4GlobalFastSimulationManager() { - // It starts closed. - fClosed=true; // Initialises the G4FastSimulationMessenger fTheFastSimulationMessenger=new G4FastSimulationMessenger(this); + + // -- *** to be dropped @ next major release ***: + _deprecated = new G4GFSManager81(); } G4GlobalFastSimulationManager::~G4GlobalFastSimulationManager() @@ -87,7 +97,7 @@ G4GlobalFastSimulationManager::~G4GlobalFastSimulationManager() void G4GlobalFastSimulationManager::FastSimulationNeedsToBeClosed() { - fClosed=false; + _deprecated->FastSimulationNeedsToBeClosed(); } void G4GlobalFastSimulationManager:: @@ -102,54 +112,34 @@ RemoveFastSimulationManager(G4FastSimulationManager* fsmanager) ManagedManagers.remove(fsmanager); } +void G4GlobalFastSimulationManager:: +AddFSMP(G4FastSimulationManagerProcess81* fp) +{ + fFSMPVector.push_back(fp); +} + +void G4GlobalFastSimulationManager:: +RemoveFSMP(G4FastSimulationManagerProcess81* fp) +{ + fFSMPVector.remove(fp); +} void G4GlobalFastSimulationManager::CloseFastSimulation() { - if(fClosed) return; - - G4ParticleTable* theParticleTable; - - // Reset the NeededFlavoredWorlds List - NeededFlavoredWorlds.clearAndDestroy(); - - // We'll look for models for all particle types - theParticleTable=G4ParticleTable::GetParticleTable(); - - // Creates the first world volume clone. - G4VPhysicalVolume* aClone = GiveMeAWorldVolumeClone(); - - G4cout << "Closing Fast-Simulation ..." << G4endl; - - for (G4int iParticle=0; - iParticleentries(); iParticle++) { - G4bool Needed = false; - for (size_t ifsm=0; ifsm - InsertGhostHereIfNecessary(aClone, - *(theParticleTable-> - GetParticle(iParticle))); - // if some FSM inserted a ghost, keep this clone. - if(Needed) - { - G4Region* aWorldGhostRegion = new G4Region("Ghost world region for " + theParticleTable->GetParticle(iParticle)->GetParticleName()); - aWorldGhostRegion->AddRootLogicalVolume(aClone->GetLogicalVolume()); - NeededFlavoredWorlds.push_back(new G4FlavoredParallelWorld(theParticleTable->GetParticle(iParticle), aClone)); - // and prepare a new one. - aClone=GiveMeAWorldVolumeClone(); - } - } - - fClosed=true; + static int count(0); + if (count++ < 5) + G4cout << "G4GlobalFastSimulationManager::CloseFastSimulation() : DEPRECATING, will be dropped @ next major release" << G4endl; + _deprecated->CloseFastSimulation(); } G4VFlavoredParallelWorld* G4GlobalFastSimulationManager:: -GetFlavoredWorldForThis(G4ParticleDefinition* particle) +GetFlavoredWorldForThis(G4ParticleDefinition* definition) { - for (size_t ipw=0; ipwGetTheParticleType()==particle) - return NeededFlavoredWorlds[ipw]; - return 0; + static int count(0); + if (count++ < 5) + G4cout << "G4GlobalFastSimulationManager::GetFlavoredWorldForThis(...): DEPRECATING, will be dropped @ next major release" << G4endl; + return _deprecated->GetFlavoredWorldForThis(definition); } void @@ -182,37 +172,143 @@ InActivateFastSimulationModel(const G4String& aName) G4cout << G4endl; } +void +G4GlobalFastSimulationManager::ShowSetup() +{ + std::vector worldDone; + G4VPhysicalVolume* world; + G4RegionStore* regions = G4RegionStore::GetInstance(); + // ---------------------------------------------------- + // -- loop on regions to get the list of world volumes: + // ---------------------------------------------------- + G4cout << "\nFast simulation setup:" << G4endl; + for (size_t i=0; isize(); i++) + { + world = (*regions)[i]->GetWorldPhysical(); + G4bool newWorld = true; + for (size_t ii=0; iiGetLogicalVolume()->GetRegion(); + // -- preambule: print physical volume and region names... + if (world == G4TransportationManager::GetTransportationManager()->GetNavigatorForTracking()->GetWorldVolume()) + G4cout << "\n * Mass Geometry with "; + else + G4cout << "\n * Parallel Geometry with "; + G4cout << "world volume: `" << world->GetName() << "' [region : `" << worldRegion->GetName() << "']" << G4endl; + // -- ... and print G4FSMP(s) attached to this world volume: + G4bool findG4FSMP(false); + // -- show to what particles this G4FSMP is attached to: + std::vector particlesKnown; + for (size_t ip=0; ipGetWorldVolume() == world) + { + G4cout << " o G4FastSimulationProcess: '" << fFSMPVector[ip]->GetProcessName() << "'" << G4endl; + G4cout << " Attached to:"; + G4ParticleTable* particles = G4ParticleTable::GetParticleTable(); + for (G4int iParticle=0; iParticleentries(); iParticle++) + { + G4ParticleDefinition* particle = particles->GetParticle(iParticle); + G4ProcessVector* processes = particle->GetProcessManager()->GetProcessList(); + if (processes->contains(fFSMPVector[ip])) {G4cout << " " << particle->GetParticleName(); findG4FSMP = true; particlesKnown.push_back(particle);} + } + G4cout << G4endl; + } + if (!findG4FSMP) G4cout << " o G4FastSimulationProcess: (none)" << G4endl; + // -- now display the regions in this world volume, with mother<->daughter link shown by indentation: + G4cout << " o Region(s) and model(s) setup:" << G4endl; + DisplayRegion(worldRegion, 1, particlesKnown); + } + } +} + + +void +G4GlobalFastSimulationManager:: +DisplayRegion(G4Region* region, G4int depth, std::vector& particlesKnown) const +{ + G4String indent = " "; + for (G4int I=0; IGetName() <<"'" << G4endl; + G4FastSimulationManager* fastSimManager = region->GetFastSimulationManager(); + if (fastSimManager) + { + indent += " "; + G4cout << indent << "Model(s):" << G4endl; + indent += " "; + for (size_t im=0; imGetFastSimulationModelList().size(); im++) + { + G4cout << indent << "`" << (fastSimManager->GetFastSimulationModelList())[im]->GetName() << "'"; + G4cout << " ; applicable to:"; + G4ParticleTable* particles = G4ParticleTable::GetParticleTable(); + for (G4int iParticle=0; iParticleentries(); iParticle++) + { + if ((fastSimManager->GetFastSimulationModelList())[im]->IsApplicable(*(particles->GetParticle(iParticle)))) + { + G4cout << " " << particles->GetParticle(iParticle)->GetParticleName(); + G4bool known(false); + for (size_t l=0; lGetParticle(iParticle)) {known = true; break;} + if (!known) G4cout << "[!!]"; + } + } + G4cout << G4endl; + } + } + + // -- all that to check mothership of "region" + G4PhysicalVolumeStore* physVolStore = G4PhysicalVolumeStore::GetInstance(); + for (size_t ip=0; ipsize(); ip++) + { + G4VPhysicalVolume* physVol = (*physVolStore)[ip]; + if (physVol->GetLogicalVolume()->IsRootRegion()) + if (physVol->GetMotherLogical()) + { + G4Region* thisVolMotherRegion = physVol->GetMotherLogical()->GetRegion(); + if (thisVolMotherRegion == region) + DisplayRegion(physVol->GetLogicalVolume()->GetRegion(), depth+1, particlesKnown); + } + } +} + + + void G4GlobalFastSimulationManager::ListEnvelopes(const G4String& aName, - listType theType) + listType theType) { - if(theType == ISAPPLICABLE) { - for (size_t ifsm=0; ifsmListModels(aName); - return; - } - - if(aName == "all") { - G4int titled = 0; - for (size_t ifsm=0; ifsmListTitle(); - G4cout << G4endl; - } - else ManagedManagers[ifsm]->ListModels(); + if (theType == ISAPPLICABLE) + { + for (size_t ifsm=0; ifsmListModels(aName); + return; + } + + if(aName == "all") + { + G4int titled = 0; + for (size_t ifsm=0; ifsmListTitle(); + G4cout << G4endl; + } + else ManagedManagers[ifsm]->ListModels(); + } + } + else + { + for (size_t ifsm=0; ifsm GetEnvelope()->GetName()) + { + ManagedManagers[ifsm]->ListModels(); + break; + } } - } - else { - for (size_t ifsm=0; ifsm - GetEnvelope()->GetName()){ - ManagedManagers[ifsm]->ListModels(); - break; - } - } } void @@ -222,56 +318,13 @@ G4GlobalFastSimulationManager::ListEnvelopes(const G4ParticleDefinition* aPD) ManagedManagers[ifsm]->ListModels(aPD); } -G4VPhysicalVolume* -G4GlobalFastSimulationManager::GiveMeAWorldVolumeClone() -{ - G4VPhysicalVolume* theParallelWorldPhysical; - - G4TransportationManager *transportationManager= - G4TransportationManager::GetTransportationManager(); - - G4VSolid *parallelWorldSolid=transportationManager-> - GetNavigatorForTracking()->GetWorldVolume()-> - GetLogicalVolume()->GetSolid(); - - G4Material *parallelWorldMaterial=transportationManager-> - GetNavigatorForTracking()->GetWorldVolume()-> - GetLogicalVolume()->GetMaterial(); - - G4LogicalVolume *parallelWorldLog = - new G4LogicalVolume(parallelWorldSolid, - parallelWorldMaterial, - "ParallelWorldLogical", - 0, 0, 0); - - theParallelWorldPhysical= new G4PVPlacement(0,G4ThreeVector(), - "ParallelWorldPhysical", - parallelWorldLog, - 0,false,0); - - return theParallelWorldPhysical; -} - G4bool G4GlobalFastSimulationManager::Notify(G4ApplicationState requestedState) { - G4StateManager * stateManager = G4StateManager::GetStateManager(); - if((stateManager->GetPreviousState()==G4State_Idle) && - (requestedState==G4State_GeomClosed) && (!fClosed) ) - { - G4cerr - << "ERROR - G4GlobalFastSimulationManager::Notify()" << G4endl - << " 1) you are using ghost volumes;" << G4endl - << " 2) In this case the G4GlobalFastSimulationManager" << G4endl - << " MUST be closed BEFORE closing the geometry;" << G4endl - << " 3) To do this put in your code the call to" << G4endl - << " GetGlobalFastSimulationManager()->CloseFastSimulation();" - << G4endl - << " just before closing the geometry." << G4endl; - G4Exception("G4GlobalFastSimulationManager::Notify()", "InvalidState", - FatalException, "Fast simulation must be closed."); - } - return true; + static int count(0); + if (count++ < 5) + G4cout << "G4GlobalFastSimulationManager::Notify() : DEPRECATING, will be dropped @ next major release" << G4endl; + return _deprecated->Notify(requestedState); } G4VFastSimulationModel* diff --git a/source/processes/parameterisation/src/G4VFastSimulationModel.cc b/source/processes/parameterisation/src/G4VFastSimulationModel.cc index c444aa6c2f..4af4f617bc 100644 --- a/source/processes/parameterisation/src/G4VFastSimulationModel.cc +++ b/source/processes/parameterisation/src/G4VFastSimulationModel.cc @@ -25,7 +25,7 @@ // // // $Id: G4VFastSimulationModel.cc,v 1.6 2006/06/29 21:09:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------- // diff --git a/source/processes/scoring/GNUmakefile b/source/processes/scoring/GNUmakefile new file mode 100644 index 0000000000..2392b7154c --- /dev/null +++ b/source/processes/scoring/GNUmakefile @@ -0,0 +1,34 @@ +# $Id: GNUmakefile,v 1.3 2006/11/28 16:47:59 ahoward Exp $ +# ------------------------------------------------------------ +# GNUmakefile for scoring process library. +# ------------------------------------------------------------ + +name := G4scoring + +ifndef G4INSTALL + G4INSTALL = ../../.. +endif + +include $(G4INSTALL)/config/architecture.gmk + +CPPFLAGS += \ + -I$(G4BASE)/global/management/include \ + -I$(G4BASE)/global/HEPRandom/include \ + -I$(G4BASE)/global/HEPGeometry/include \ + -I$(G4BASE)/geometry/management/include \ + -I$(G4BASE)/geometry/volumes/include \ + -I$(G4BASE)/geometry/navigation/include \ + -I$(G4BASE)/geometry/magneticfield/include \ + -I$(G4BASE)/geometry/biasing/include \ + -I$(G4BASE)/track/include \ + -I$(G4BASE)/processes/management/include \ + -I$(G4BASE)/processes/electromagnetic/utils/include \ + -I$(G4BASE)/processes/cuts/include \ + -I$(G4BASE)/particles/management/include \ + -I$(G4BASE)/materials/include \ + -I$(G4BASE)/intercoms/include \ + -I$(G4BASE)/digits_hits/detector/include \ + -I$(G4BASE)/digits_hits/hits/include \ + -I$(G4BASE)/processes/transportation/include + +include $(G4INSTALL)/config/common.gmk diff --git a/source/processes/scoring/History b/source/processes/scoring/History new file mode 100644 index 0000000000..e22a810a0d --- /dev/null +++ b/source/processes/scoring/History @@ -0,0 +1,60 @@ +$Id: History,v 1.10 2006/11/28 17:36:21 ahoward Exp $ +------------------------------------------------------------------- + + ========================================================= + Geant4 - an Object-Oriented Toolkit for Simulation in HEP + ========================================================= + + Category History file + --------------------- +This file should be used by G4 developers and category coordinators +to briefly summarize all major modifications introduced in the code +and keep track of all category-tags. +It DOES NOT substitute the CVS log-message one should put at every +committal in the CVS repository ! + + ---------------------------------------------------------- + * Reverse chronological order (last date on top), please * + ---------------------------------------------------------- + +November 28th A.Howard (procscore-V08-01-04) +- updated history file + +November 28th A.Howard (procscore-V08-01-03) +- removed duplicated base classes which can be found in processes/transportation + +November 20th A.Howard (procscore-V08-01-02) +- updated history file + +November 20th A.Howard (procscore-V08-01-01) +- added biasing and related scoring classes, 1st implementation to new parallel + implementation +- two examples B01_para and B02_para - translated from B01 and B02 + +November 13th M.Asai (procscore-V08-01-00) +- Corresponds to the change of G4PathFinder::ComputeStep. + +November 8th M.Asai +- Use the new G4VUserPhysicsList::AddTransportation() which + automatically replace G4Transporation with G4CoupledTransportation + if a parallel world is defined. + +November 6th J.Allison +- test1: + o Made top world volumes invisible. + o Improved vis.mac. + +November 3rd J.Allison +- test1: Simple vis.mac to illustrate visualisation of parallel worlds. + Execute with just two parameters, for example: + ParaTest para disp + +November 2nd J.Allison +- test1: + o Replaced A01VisManager by G4VisExecutive. + o Introduced vis.mac. + +July 6th, 2006 M.Asai +- Directory processes/scoring created +- History file Created + diff --git a/source/processes/scoring/include/G4GCellFinder.hh b/source/processes/scoring/include/G4GCellFinder.hh new file mode 100644 index 0000000000..e551aa3c1b --- /dev/null +++ b/source/processes/scoring/include/G4GCellFinder.hh @@ -0,0 +1,73 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4GCellFinder.hh,v 1.1 2006/11/20 10:02:05 ahoward Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ---------------------------------------------------------------------- +// Class G4ParallelGCellFinder +// +// Class description: +// +// Finds a G4GeometryCell in the mass geometry. + +// Author: Michael Dressel (Michael.Dressel@cern.ch) +// ---------------------------------------------------------------------- +#ifndef G4GCellFinder_hh +#define G4GCellFinder_hh G4GCellFinder_hh + +class G4Navigator; +class G4TransportationManager; +class G4PathFinder; +class G4VTouchable; +class G4VPhysicalVolume; + + +#include "G4Types.hh" +#include "G4VGCellFinder.hh" + +class G4GCellFinder : public G4VGCellFinder +{ + +public: // with description + + // G4GCellFinder(G4VPhysicalVolume &worldvolume); + G4GCellFinder(); + virtual ~G4GCellFinder(); + + virtual G4GeometryCell + GetPreGeometryCell(const G4Step &aStep) const; + virtual G4GeometryCell + GetPostGeometryCell(const G4Step &aStep) const; + +private: + +// G4Navigator* fGhostNavigator; +// G4TouchableHandle fGhostTouchable; + +}; + +#endif diff --git a/source/processes/scoring/include/G4GeometrySampler.hh b/source/processes/scoring/include/G4GeometrySampler.hh new file mode 100644 index 0000000000..896bfb2925 --- /dev/null +++ b/source/processes/scoring/include/G4GeometrySampler.hh @@ -0,0 +1,107 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4GeometrySampler.hh,v 1.1 2006/11/20 10:02:05 ahoward Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ---------------------------------------------------------------------- +// Class G4GeometrySampler +// +// Class description: +// This class inherits from G4VSampler. It is used for scoring and +// importance sampling in the tracking (mass) geometry. +// See also the description in G4VSampler.hh. + +// Author: Michael Dressel (Michael.Dressel@cern.ch) +// ---------------------------------------------------------------------- +#ifndef G4GeometrySampler_hh +#define G4GeometrySampler_hh G4GeometrySampler_hh + +#include "G4Types.hh" +#include "G4String.hh" +#include "G4VSampler.hh" +#include "G4VSamplerConfigurator.hh" + +class G4ImportanceConfigurator; +class G4WeightWindowConfigurator; +class G4ScoreConfigurator; +class G4NewWeightCutOffConfigurator; +class G4VGCellFinder; + +class G4GeometrySampler : public G4VSampler +{ + +public: // with description + + explicit G4GeometrySampler(G4VPhysicalVolume *worldvolume, const G4String &particlename); + virtual ~G4GeometrySampler(); + + virtual void PrepareScoring(G4VScorer *Scorer); + virtual void PrepareImportanceSampling(G4VIStore *istore, + const G4VImportanceAlgorithm + *ialg); + virtual void PrepareWeightRoulett(G4double wsurvive, + G4double wlimit, + G4double isource); + + virtual void PrepareWeightWindow(G4VWeightWindowStore *wwstore, + G4VWeightWindowAlgorithm *wwAlg, + G4PlaceOfAction placeOfAction); + + virtual void Configure(); + + virtual void ClearSampling(); + virtual G4bool IsConfigured() const; + + void SetParallel(G4bool paraflag); + void SetParticle(const G4String &particlename); + +private: + + G4GeometrySampler(const G4GeometrySampler &); + G4GeometrySampler & + operator=(const G4GeometrySampler &); + +private: + + G4String fParticleName; + G4VPhysicalVolume* fWorld; + G4ImportanceConfigurator *fImportanceConfigurator; + G4ScoreConfigurator *fScoreConfigurator; + G4VGCellFinder *fGCellFinder; + G4NewWeightCutOffConfigurator *fNewWeightCutOffConfigurator; + G4VIStore *fIStore; + G4WeightWindowConfigurator *fWeightWindowConfigurator; + G4VWeightWindowStore *fWWStore; + G4bool fIsConfigured; + G4Configurators fConfigurators; + + G4bool paraflag; + +}; + +#endif + diff --git a/source/processes/scoring/include/G4ImportanceConfigurator.hh b/source/processes/scoring/include/G4ImportanceConfigurator.hh new file mode 100644 index 0000000000..04dcaea72a --- /dev/null +++ b/source/processes/scoring/include/G4ImportanceConfigurator.hh @@ -0,0 +1,87 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4ImportanceConfigurator.hh,v 1.1 2006/11/20 10:02:05 ahoward Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ---------------------------------------------------------------------- +// Class G4ImportanceConfigurator +// +// Class description: +// This class builds and places the G4ImportanceProcess. +// If the object is deleted the process is removed from the +// process list. + +// Author: Michael Dressel (Michael.Dressel@cern.ch) +// ---------------------------------------------------------------------- + +#ifndef G4ImportanceConfigurator_hh +#define G4ImportanceConfigurator_hh G4ImportanceConfigurator_hh + +#include "G4Types.hh" +#include "G4NewProcessPlacer.hh" +#include "G4VSamplerConfigurator.hh" + +class G4ImportanceProcess; +class G4VImportanceAlgorithm; +class G4VIStore; +class G4VPhysicalVolume; + +class G4ImportanceConfigurator : public G4VSamplerConfigurator +{ + +public: // with description + + G4ImportanceConfigurator(G4VPhysicalVolume* worldvolume, + const G4String &particlename, + G4VIStore &istore, + const G4VImportanceAlgorithm *ialg, + G4bool paraflag); + + virtual ~G4ImportanceConfigurator(); + virtual void Configure(G4VSamplerConfigurator *preConf); + virtual const G4VTrackTerminator *GetTrackTerminator() const; + +private: + + G4ImportanceConfigurator(const G4ImportanceConfigurator &); + G4ImportanceConfigurator & + operator=(const G4ImportanceConfigurator &); + + G4VPhysicalVolume* fWorld; + G4NewProcessPlacer fPlacer; + G4VIStore &fIStore; + G4bool fDeleteIalg; + const G4VImportanceAlgorithm *fIalgorithm; + G4ImportanceProcess *fImportanceProcess; + + + G4bool paraflag; + +}; + + +#endif diff --git a/source/processes/scoring/include/G4ImportanceProcess.hh b/source/processes/scoring/include/G4ImportanceProcess.hh new file mode 100644 index 0000000000..d2b4609c98 --- /dev/null +++ b/source/processes/scoring/include/G4ImportanceProcess.hh @@ -0,0 +1,164 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4ImportanceProcess.hh,v 1.1 2006/11/20 10:02:05 ahoward Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ---------------------------------------------------------------------- +// Class G4ImportanceProcess +// +// Class description: +// +// Used internally by importance sampling in the "mass" geometry. +// This process is a forced post step process. I will apply +// importance sampling if the particle crosses a boundary in the +// "mass" geometry. + +// Author: Michael Dressel (Michael.Dressel@cern.ch) +// ---------------------------------------------------------------------- +#ifndef G4ImportanceProcess_hh +#define G4ImportanceProcess_hh G4ImportanceProcess_hh + +#include "G4VProcess.hh" +#include "G4VTrackTerminator.hh" + +class G4SamplingPostStepAction; +class G4VImportanceAlgorithm; +class G4VIStore; + +class G4Step; +class G4Navigator; +class G4TransportationManager; +class G4PathFinder; +class G4VTouchable; + +#include "G4FieldTrack.hh" +#include "G4TouchableHandle.hh" + + +class G4ImportanceProcess : public G4VProcess, public G4VTrackTerminator +{ + +public: // with description + + G4ImportanceProcess(const G4VImportanceAlgorithm &aImportanceAlgorithm, + const G4VIStore &aIstore, + const G4VTrackTerminator *TrackTerminator, + const G4String &aName = "ImportanceProcess", G4bool para = false); + // creates a G4ParticleChange + + virtual ~G4ImportanceProcess(); + // delete the G4ParticleChange + + + //-------------------------------------------------------------- + // Set Paralle World + //-------------------------------------------------------------- + + void SetParallelWorld(G4String parallelWorldName); + void SetParallelWorld(G4VPhysicalVolume* parallelWorld); + + //-------------------------------------------------------------- + // Process interface + //-------------------------------------------------------------- + + void StartTracking(G4Track*); + + + virtual G4double + PostStepGetPhysicalInteractionLength(const G4Track& aTrack, + G4double previousStepSize, + G4ForceCondition* condition); + // make process beeing forced + virtual G4VParticleChange *PostStepDoIt(const G4Track&, const G4Step&); + // manage the importance sampling in the "mass" geometry + + virtual void KillTrack() const; + // used in case no scoring process follows that does the killing + + virtual const G4String &GetName() const; + + +public: // without description + + // no operation in AtRestDoIt and AlongStepDoIt + + virtual G4double + AlongStepGetPhysicalInteractionLength(const G4Track&, + G4double , + G4double , + G4double& , + G4GPILSelection*); + virtual G4double + AtRestGetPhysicalInteractionLength(const G4Track& , + G4ForceCondition*); + + virtual G4VParticleChange* + AtRestDoIt(const G4Track&, const G4Step&); + + + virtual G4VParticleChange* + AlongStepDoIt(const G4Track&, const G4Step&); + +private: + + G4ImportanceProcess(const G4ImportanceProcess &); + G4ImportanceProcess &operator=(const G4ImportanceProcess &); + +private: + + void CopyStep(const G4Step & step); + + G4Step * fGhostStep; + G4StepPoint * fGhostPreStepPoint; + G4StepPoint * fGhostPostStepPoint; + + G4ParticleChange *fParticleChange; + const G4VImportanceAlgorithm &fImportanceAlgorithm; + const G4VIStore &fIStore; + G4SamplingPostStepAction *fPostStepAction; + + G4TransportationManager* fTransportationManager; + G4PathFinder* fPathFinder; + + // ------------------------------- + // Navigation in the Ghost World: + // ------------------------------- + G4String fGhostWorldName; + G4VPhysicalVolume* fGhostWorld; + G4Navigator* fGhostNavigator; + G4int fNavigatorID; + G4TouchableHandle fOldGhostTouchable; + G4TouchableHandle fNewGhostTouchable; + G4FieldTrack fFieldTrack; + G4double fGhostSafety; + G4bool fOnBoundary; + + G4bool paraflag; + +}; + +#endif diff --git a/source/processes/scoring/include/G4NewProcessPlacer.hh b/source/processes/scoring/include/G4NewProcessPlacer.hh new file mode 100644 index 0000000000..9d96e6fd92 --- /dev/null +++ b/source/processes/scoring/include/G4NewProcessPlacer.hh @@ -0,0 +1,94 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4NewProcessPlacer.hh,v 1.1 2006/11/20 10:02:05 ahoward Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ---------------------------------------------------------------------- +// Class G4NewProcessPlacer +// +// Class description: +// +// Used internally by importance sampling and scoring. +// See G4VProcessPlacer. + +// Author: Michael Dressel (Michael.Dressel@cern.ch) +// ---------------------------------------------------------------------- +#ifndef G4NewProcessPlacer_hh +#define G4NewProcessPlacer_hh G4NewProcessPlacer_hh + +#include "G4Types.hh" +#include "G4String.hh" +#include "G4VProcessPlacer.hh" + +class G4ProcessManager; +class G4ProcessVector; + +class G4NewProcessPlacer : public G4VProcessPlacer +{ + +public: // with description + + explicit G4NewProcessPlacer(const G4String &particlename); + // create a process placer for a particle type + + virtual ~G4NewProcessPlacer(); + + virtual void AddProcessAsLastDoIt(G4VProcess *process); + // place a post step do it process such that the + // PostStepDoIt function is called last + // THE ORDER CHANGES BY SUBSEQUENT CALLS + + virtual void AddProcessAsSecondDoIt(G4VProcess *process); + // place a post step do it process such that the + // PostStepDoIt function is called second + // THE ORDER CHANGES BY SUBSEQUENT CALLS + + virtual void RemoveProcess(G4VProcess *process); + // removes a given process + + enum SecondOrLast + { + eSecond = 1, + eLast = 0 + }; + +private: + + G4ProcessManager *GetProcessManager(); + void AddProcessAs(G4VProcess *process, SecondOrLast); + + void PrintProcVec(G4ProcessVector* processVec); + void PrintPostStepGPILVec(); + void PrintPostStepDoItVec(); + +private: + + G4String fParticleName; + +}; + +#endif diff --git a/source/processes/scoring/include/G4NewWeightCutOffConfigurator.hh b/source/processes/scoring/include/G4NewWeightCutOffConfigurator.hh new file mode 100644 index 0000000000..d246713f0b --- /dev/null +++ b/source/processes/scoring/include/G4NewWeightCutOffConfigurator.hh @@ -0,0 +1,84 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4NewWeightCutOffConfigurator.hh,v 1.1 2006/11/20 10:02:05 ahoward Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ---------------------------------------------------------------------- +// Class G4NewWeightCutOffConfigurator +// +// Class description: +// This class builds and places the G4NewWeightCutOffProcess. +// If the object is deleted the process is removed from the +// process list. + +// Author: Michael Dressel (Michael.Dressel@cern.ch) +// ---------------------------------------------------------------------- +#ifndef G4NewWeightCutOffConfigurator_hh +#define G4NewWeightCutOffConfigurator_hh G4NewWeightCutOffConfigurator_hh + +#include "G4Types.hh" +#include "G4VSamplerConfigurator.hh" +#include "G4NewProcessPlacer.hh" + +class G4NewWeightCutOffProcess; +class G4VGCellFinder; +class G4VIStore; +class G4VPhysicalVolume; + +class G4NewWeightCutOffConfigurator : public G4VSamplerConfigurator +{ + +public: // with description + + G4NewWeightCutOffConfigurator(G4VPhysicalVolume* worldvolume, + const G4String &particlename, + G4double wsurvival, + G4double wlimit, + G4double isource, + G4VIStore *istore, + const G4VGCellFinder &aGCellFinder,G4bool paraflag); + + virtual ~G4NewWeightCutOffConfigurator(); + virtual void Configure(G4VSamplerConfigurator *preConf); + virtual const G4VTrackTerminator *GetTrackTerminator() const ; + +private: + + G4NewWeightCutOffConfigurator(const G4NewWeightCutOffConfigurator&); + G4NewWeightCutOffConfigurator & + operator=(const G4NewWeightCutOffConfigurator&); + G4VPhysicalVolume* fWorld; + G4NewProcessPlacer fPlacer; + G4NewWeightCutOffProcess *fNewWeightCutOffProcess; + G4bool fPlaced; + + + G4bool paraflag; + +}; + +#endif diff --git a/source/processes/scoring/include/G4NewWeightCutOffProcess.hh b/source/processes/scoring/include/G4NewWeightCutOffProcess.hh new file mode 100644 index 0000000000..e714bd0c57 --- /dev/null +++ b/source/processes/scoring/include/G4NewWeightCutOffProcess.hh @@ -0,0 +1,159 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4NewWeightCutOffProcess.hh,v 1.1 2006/11/20 10:02:05 ahoward Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ---------------------------------------------------------------------- +// Class G4NewWeightCutOffProcess +// +// Class description: +// +// Process for biasing particle-change cutoff. + +// Author: Michael Dressel (Michael.Dressel@cern.ch) +// ---------------------------------------------------------------------- +#ifndef G4NewWeightCutOffProcess_hh +#define G4NewWeightCutOffProcess_hh G4NewWeightCutOffProcess_hh + +#include "G4VProcess.hh" +#include "G4VTrackTerminator.hh" +#include "G4GeometryCell.hh" + +class G4VGCellFinder; +class G4VIStore; + +class G4Step; +class G4Navigator; +class G4TransportationManager; +class G4PathFinder; +class G4VTouchable; + +#include "G4FieldTrack.hh" +#include "G4TouchableHandle.hh" + + + +class G4NewWeightCutOffProcess : public G4VProcess +{ + +public: // with description + + G4NewWeightCutOffProcess(G4double wsurvival, + G4double wlimit, + G4double isource, + G4VIStore *istore, + const G4VGCellFinder &aGCellFinder, + const G4String &aName = "NewWeightCutOffProcess", G4bool para = false); + // create a G4ParticleChange + + virtual ~G4NewWeightCutOffProcess(); + // delete the G4ParticleChange + + + //-------------------------------------------------------------- + // Set Paralle World + //-------------------------------------------------------------- + + void SetParallelWorld(G4String parallelWorldName); + void SetParallelWorld(G4VPhysicalVolume* parallelWorld); + + //-------------------------------------------------------------- + // Process interface + //-------------------------------------------------------------- + + void StartTracking(G4Track*); + + virtual G4double + PostStepGetPhysicalInteractionLength(const G4Track& aTrack, + G4double previousStepSize, + G4ForceCondition* condition); + // make the process beeing forced + + virtual G4VParticleChange * PostStepDoIt(const G4Track&, + const G4Step&); + + + const G4String &GetName() const; + +public: // without description + + // no operation in AtRestDoIt and AlongStepDoIt + + virtual G4double + AlongStepGetPhysicalInteractionLength(const G4Track&, + G4double , + G4double , + G4double& , + G4GPILSelection*); + + virtual G4double + AtRestGetPhysicalInteractionLength(const G4Track& , + G4ForceCondition*); + + virtual G4VParticleChange* AtRestDoIt(const G4Track&, const G4Step&); + virtual G4VParticleChange* AlongStepDoIt(const G4Track&, const G4Step&); + +private: + + void CopyStep(const G4Step & step); + + G4Step * fGhostStep; + G4StepPoint * fGhostPreStepPoint; + G4StepPoint * fGhostPostStepPoint; + + G4NewWeightCutOffProcess(const G4NewWeightCutOffProcess &); + G4NewWeightCutOffProcess &operator=(const G4NewWeightCutOffProcess &); + + G4ParticleChange *fParticleChange; + G4double fWeightSurvival; + G4double fWeightLimit; + G4double fSourceImportance; + G4VIStore *fIStore; + const G4VGCellFinder &fGCellFinder; + + + G4TransportationManager* fTransportationManager; + G4PathFinder* fPathFinder; + + // ------------------------------- + // Navigation in the Ghost World: + // ------------------------------- + G4String fGhostWorldName; + G4VPhysicalVolume* fGhostWorld; + G4Navigator* fGhostNavigator; + G4int fNavigatorID; + G4TouchableHandle fOldGhostTouchable; + G4TouchableHandle fNewGhostTouchable; + G4FieldTrack fFieldTrack; + G4double fGhostSafety; + G4bool fOnBoundary; + + G4bool paraflag; + +}; + +#endif diff --git a/source/processes/scoring/include/G4ParallelWorldScoringProcess.hh b/source/processes/scoring/include/G4ParallelWorldScoringProcess.hh new file mode 100644 index 0000000000..831e44b1db --- /dev/null +++ b/source/processes/scoring/include/G4ParallelWorldScoringProcess.hh @@ -0,0 +1,171 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4ParallelWorldScoringProcess.hh,v 1.2 2006/11/13 18:36:02 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// +//--------------------------------------------------------------- +// +// G4ParallelWorldScoringProcess.hh +// +// Description: +// This procss takes a parallel world and limits a step +// on the boundaries of volumes in the parallel world. +// It invokes sensitive detectors assigned in the parallel +// world. +// +//--------------------------------------------------------------- + + +#ifndef G4ParallelWorldScoringProcess_h +#define G4ParallelWorldScoringProcess_h 1 + +#include "globals.hh" +class G4Step; +class G4Navigator; +class G4TransportationManager; +class G4PathFinder; +class G4VTouchable; +class G4VPhysicalVolume; +class G4ParticleChange; +#include "G4VProcess.hh" +#include "G4FieldTrack.hh" +#include "G4TouchableHandle.hh" + +//------------------------------------------ +// +// G4ParallelWorldScoringProcess class +// +//------------------------------------------ + + +// Class Description: + +class G4ParallelWorldScoringProcess : public G4VProcess +{ +public: // with description + + //------------------------ + // Constructor/Destructor + //------------------------ + + G4ParallelWorldScoringProcess(const G4String& processName = "ParaWorldScore", + G4ProcessType theType = fParameterisation); + virtual ~G4ParallelWorldScoringProcess(); + + //-------------------------------------------------------------- + // Set Paralle World + //-------------------------------------------------------------- + + void SetParallelWorld(G4String parallelWorldName); + void SetParallelWorld(G4VPhysicalVolume* parallelWorld); + + //-------------------------------------------------------------- + // Process interface + //-------------------------------------------------------------- + + void StartTracking(G4Track*); + + //------------------------------------------------------------------------ + // GetPhysicalInteractionLength() and DoIt() methods for AtRest + //------------------------------------------------------------------------ + + G4double AtRestGetPhysicalInteractionLength( + const G4Track& , + G4ForceCondition* + ); + + G4VParticleChange* AtRestDoIt( + const G4Track& , + const G4Step& + ); + + //------------------------------------------------------------------------ + // GetPhysicalInteractionLength() and DoIt() methods for AlongStep + //------------------------------------------------------------------------ + + G4double AlongStepGetPhysicalInteractionLength( + const G4Track&, + G4double , + G4double , + G4double&, + G4GPILSelection* + ); + + G4VParticleChange* AlongStepDoIt( + const G4Track& , + const G4Step& + ); + + //----------------------------------------------------------------------- + // GetPhysicalInteractionLength() and DoIt() methods for PostStep + //----------------------------------------------------------------------- + + G4double PostStepGetPhysicalInteractionLength(const G4Track& track, + G4double previousStepSize, + G4ForceCondition* condition); + + G4VParticleChange* PostStepDoIt(const G4Track& ,const G4Step& ); + +private: + void CopyStep(const G4Step & step); + + G4Step * fGhostStep; + G4StepPoint * fGhostPreStepPoint; + G4StepPoint * fGhostPostStepPoint; + + G4VParticleChange aDummyParticleChange; + G4ParticleChange xParticleChange; + + G4TransportationManager* fTransportationManager; + G4PathFinder* fPathFinder; + + // ------------------------------- + // Navigation in the Ghost World: + // ------------------------------- + G4String fGhostWorldName; + G4VPhysicalVolume* fGhostWorld; + G4Navigator* fGhostNavigator; + G4int fNavigatorID; + G4TouchableHandle fOldGhostTouchable; + G4TouchableHandle fNewGhostTouchable; + G4FieldTrack fFieldTrack; + G4double fGhostSafety; + G4bool fOnBoundary; + + // ****************************************************** + // ****************************************************** + // + // For TESTS: + // + // ****************************************************** + // ****************************************************** +public: + void Verbose(const G4Step&) const; +}; + +#endif diff --git a/source/processes/scoring/include/G4PlaceOfAction.hh b/source/processes/scoring/include/G4PlaceOfAction.hh new file mode 100644 index 0000000000..7eddfc7308 --- /dev/null +++ b/source/processes/scoring/include/G4PlaceOfAction.hh @@ -0,0 +1,49 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4PlaceOfAction.hh,v 1.1 2006/11/20 10:02:06 ahoward Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ---------------------------------------------------------------------- +// Class G4PlaceOfAction +// +// Class description: +// This is an enum to specify when weight window sampling shoul be +// applied: onBoundary, onCollision, onBoundaryAndCollision. + +// Author: Michael Dressel (Michael.Dressel@cern.ch) +// ---------------------------------------------------------------------- +#ifndef G4PlaceOfAction_hh +#define G4PlaceOfAction_hh G4PlaceOfAction_hh + +enum G4PlaceOfAction +{ + onBoundary = 1, + onCollision = 2, + onBoundaryAndCollision = 3 +}; + +#endif diff --git a/source/processes/scoring/include/G4ScoreConfigurator.hh b/source/processes/scoring/include/G4ScoreConfigurator.hh new file mode 100644 index 0000000000..8ba417d1bb --- /dev/null +++ b/source/processes/scoring/include/G4ScoreConfigurator.hh @@ -0,0 +1,86 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4ScoreConfigurator.hh,v 1.1 2006/11/20 10:02:06 ahoward Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ---------------------------------------------------------------------- +// Class G4ScoreConfigurator +// +// Class description: +// This class builds and places the G4ScoreProcess. +// If the object is deleted the process is removed from the +// process list. + +// Author: Michael Dressel (Michael.Dressel@cern.ch) +// ---------------------------------------------------------------------- + +#ifndef G4ScoreConfigurator_hh +#define G4ScoreConfigurator_hh G4ScoreConfigurator_hh + +#include "G4Types.hh" +#include "G4NewProcessPlacer.hh" + +#include "G4VSamplerConfigurator.hh" + +class G4VScorer; +class G4VTrackTerminator; +class G4ScoreProcess; + +class G4VPhysicalVolume; + +class G4ScoreConfigurator : public G4VSamplerConfigurator +{ + +public: // with description + + G4ScoreConfigurator(G4VPhysicalVolume* worldvolume, + const G4String &particlename, + G4VScorer &scorer, + G4bool paraflag); + + virtual ~G4ScoreConfigurator(); + + virtual void Configure(G4VSamplerConfigurator *preConf); + virtual const G4VTrackTerminator *GetTrackTerminator() const; + +private: + + G4ScoreConfigurator(const G4ScoreConfigurator&); + G4ScoreConfigurator &operator=(const G4ScoreConfigurator&); + + G4VPhysicalVolume* fWorld; + G4NewProcessPlacer fPlacer; + G4VScorer &fScorer; + G4ScoreProcess *fScoreProcess; + + + G4bool paraflag; + +}; + + +#endif diff --git a/source/processes/scoring/include/G4ScoreProcess.hh b/source/processes/scoring/include/G4ScoreProcess.hh new file mode 100644 index 0000000000..611e413aad --- /dev/null +++ b/source/processes/scoring/include/G4ScoreProcess.hh @@ -0,0 +1,164 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4ScoreProcess.hh,v 1.1 2006/11/20 10:02:06 ahoward Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ---------------------------------------------------------------------- +// Class G4ScoreProcess +// +// Class description: +// +// Used internally by scoring in the "mass" world. +// This is a forced post step process messaging a "scorer" +// derived from G4VScorer. + +// Author: Michael Dressel (Michael.Dressel@cern.ch) +// ---------------------------------------------------------------------- +#ifndef G4ScoreProcess_hh +#define G4ScoreProcess_hh G4ScoreProcess_hh + +#include "G4VProcess.hh" +#include "G4VTrackTerminator.hh" + +class G4VScorer; + +class G4Step; +class G4Navigator; +class G4TransportationManager; +class G4PathFinder; +class G4VTouchable; + +#include "G4FieldTrack.hh" +#include "G4TouchableHandle.hh" + + +class G4ScoreProcess : public G4VProcess, public G4VTrackTerminator +{ + +public: // with description + + explicit G4ScoreProcess(G4VScorer &aScorer, + const G4String &aName = "ScoreProcess", G4bool para = false); + // take reference to scorer and coppy particle name and + // create a G4ParticleChange + + virtual ~G4ScoreProcess(); + // delete the G4ParticleChange + + + //-------------------------------------------------------------- + // Set Paralle World + //-------------------------------------------------------------- + + void SetParallelWorld(G4String parallelWorldName); + void SetParallelWorld(G4VPhysicalVolume* parallelWorld); + + //-------------------------------------------------------------- + // Process interface + //-------------------------------------------------------------- + + void StartTracking(G4Track*); + + + + virtual G4double + PostStepGetPhysicalInteractionLength(const G4Track& aTrack, + G4double previousStepSize, + G4ForceCondition* condition); + // make processed being forced + + virtual G4VParticleChange * PostStepDoIt(const G4Track&, const G4Step&); + // message "scorer" with G4Step and a G4GeometryCellStep from the "mass" + // geometry + + virtual void KillTrack() const; + + // to be called by the importance process if the track should + // be killed after scoring + virtual const G4String &GetName() const ; + +public: // without description + + // no operation in AtRestDoIt and AlongStepDoIt + + virtual G4double + AlongStepGetPhysicalInteractionLength(const G4Track&, + G4double , + G4double , + G4double& , + G4GPILSelection*); + + virtual G4double + AtRestGetPhysicalInteractionLength(const G4Track&, + G4ForceCondition*); + + virtual G4VParticleChange* AtRestDoIt(const G4Track&, + const G4Step&); + virtual G4VParticleChange* AlongStepDoIt(const G4Track&, + const G4Step&); + +private: + + G4ScoreProcess(const G4ScoreProcess &); + G4ScoreProcess &operator=(const G4ScoreProcess &); + +private: + + void CopyStep(const G4Step & step); + + G4Step * fGhostStep; + G4StepPoint * fGhostPreStepPoint; + G4StepPoint * fGhostPostStepPoint; + + G4ParticleChange *fParticleChange; + + G4VScorer &fScorer; + mutable G4bool fKillTrack; + + + G4TransportationManager* fTransportationManager; + G4PathFinder* fPathFinder; + + // ------------------------------- + // Navigation in the Ghost World: + // ------------------------------- + G4String fGhostWorldName; + G4VPhysicalVolume* fGhostWorld; + G4Navigator* fGhostNavigator; + G4int fNavigatorID; + G4TouchableHandle fOldGhostTouchable; + G4TouchableHandle fNewGhostTouchable; + G4FieldTrack fFieldTrack; + G4double fGhostSafety; + G4bool fOnBoundary; + + G4bool paraflag; + + +}; + +#endif diff --git a/source/processes/scoring/include/G4TrackTerminator.hh b/source/processes/scoring/include/G4TrackTerminator.hh new file mode 100644 index 0000000000..6487ee875f --- /dev/null +++ b/source/processes/scoring/include/G4TrackTerminator.hh @@ -0,0 +1,70 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4TrackTerminator.hh,v 1.1 2006/11/20 10:02:06 ahoward Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ---------------------------------------------------------------------- +// Class G4TrackTerminator +// +// Class description: +// +// This is an interface for an object which can be called to kill a track. +// The type it provides is needed in case importance biasing and scoring +// is done at the same time. +// For navigation in the parallel geometry which is done by the importance +// biasing process (it derives from G4ParallelTransport), importance +// biasing has to be done before scoring (to score the correct volume). +// But since scoring would not be called if the importance biasing kills +// a track, it only tells a G4TrackTerminator to kill the track. +// The scoring process implements the interface G4TrackTerminator +// and is now able to kill the track after it has performed the scoring. + +// Author: Michael Dressel (Michael.Dressel@cern.ch) +// ---------------------------------------------------------------------- +#ifndef G4TrackTerminator_hh +#define G4TrackTerminator_hh G4TrackTerminator_hh + +#include "G4Types.hh" + +class G4TrackTerminator +{ + +public: // without description + + G4TrackTerminator() + : fKillTrack(false) {} + ~G4TrackTerminator(); + + void SetKillTrack(){fKillTrack = true;} + G4bool GetKillTrack() const {return fKillTrack;} + +private: + + G4bool fKillTrack; +}; + +#endif diff --git a/source/processes/scoring/include/G4VProcessPlacer.hh b/source/processes/scoring/include/G4VProcessPlacer.hh new file mode 100644 index 0000000000..c92035ba4f --- /dev/null +++ b/source/processes/scoring/include/G4VProcessPlacer.hh @@ -0,0 +1,70 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4VProcessPlacer.hh,v 1.1 2006/11/20 10:02:06 ahoward Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ---------------------------------------------------------------------- +// Class G4VProcessPlacer +// +// Class description: +// +// Used internally by importance sampling and scoring to place +// processes as second or last PostStepDoIt processes. + +// Author: Michael Dressel (Michael.Dressel@cern.ch) +// ---------------------------------------------------------------------- +#ifndef G4VProcessPlacer_hh +#define G4VProcessPlacer_hh G4VProcessPlacer_hh + +#include "G4Types.hh" + +class G4VProcess; + +class G4VProcessPlacer +{ + +public: // with description + + G4VProcessPlacer(); + virtual ~G4VProcessPlacer(); + + virtual void AddProcessAsLastDoIt(G4VProcess *process) = 0; + // place a post step do it process such that the + // PostStepDoIt function is called last + // THE ORDER CHANGES BY SUBSEQUENT CALLS + + virtual void AddProcessAsSecondDoIt(G4VProcess *process) = 0; + // place a post step do it process such that the + // PostStepDoIt function is called second + // THE ORDER CHANGES BY SUBSEQUENT CALLS + + virtual void RemoveProcess(G4VProcess *process) = 0; + // removes a given process + +}; + +#endif diff --git a/source/processes/scoring/include/G4WeightWindowConfigurator.hh b/source/processes/scoring/include/G4WeightWindowConfigurator.hh new file mode 100644 index 0000000000..cf9149b7ac --- /dev/null +++ b/source/processes/scoring/include/G4WeightWindowConfigurator.hh @@ -0,0 +1,87 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4WeightWindowConfigurator.hh,v 1.1 2006/11/20 10:02:07 ahoward Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ---------------------------------------------------------------------- +// Class G4WeightWindowConfigurator +// +// Class description: +// Configuration of weight window processes. + +// Author: Michael Dressel (Michael.Dressel@cern.ch) +// ---------------------------------------------------------------------- + +#ifndef G4WeightWindowConfigurator_hh +#define G4WeightWindowConfigurator_hh G4WeightWindowConfigurator_hh + +#include "G4Types.hh" +#include "G4NewProcessPlacer.hh" +#include "G4VSamplerConfigurator.hh" +#include "G4PlaceOfAction.hh" + +class G4VWeightWindowStore; +class G4VWeightWindowAlgorithm; +class G4WeightWindowProcess; +class G4VPhysicalVolume; + +class G4WeightWindowConfigurator : public G4VSamplerConfigurator +{ + +public: // with description + + G4WeightWindowConfigurator(G4VPhysicalVolume* worldvolume, + const G4String &particlename, + G4VWeightWindowStore &wwstore, + const G4VWeightWindowAlgorithm *wwAlg, + G4PlaceOfAction placeOfAction, + G4bool paraflag); + + virtual ~G4WeightWindowConfigurator(); + virtual void Configure(G4VSamplerConfigurator *preConf); + virtual const G4VTrackTerminator *GetTrackTerminator() const; + +private: + + G4WeightWindowConfigurator(const G4WeightWindowConfigurator &); + G4WeightWindowConfigurator & + operator=(const G4WeightWindowConfigurator &); + + G4VPhysicalVolume* fWorld; + G4NewProcessPlacer fPlacer; + G4VWeightWindowStore &fWeightWindowStore; + G4bool fDeleteWWalg; + const G4VWeightWindowAlgorithm *fWWalgorithm; + G4WeightWindowProcess *fWeightWindowProcess; + G4PlaceOfAction fPlaceOfAction; + + + G4bool paraflag; + +}; + +#endif diff --git a/source/processes/scoring/include/G4WeightWindowProcess.hh b/source/processes/scoring/include/G4WeightWindowProcess.hh new file mode 100644 index 0000000000..72c7f3aba4 --- /dev/null +++ b/source/processes/scoring/include/G4WeightWindowProcess.hh @@ -0,0 +1,170 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4WeightWindowProcess.hh,v 1.1 2006/11/20 10:02:07 ahoward Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ---------------------------------------------------------------------- +// Class G4MassWeioghtWindowProcess +// +// Class description: +// +// Used internally by weight window technique in the "mass" geometry. +// This process is a forced post step process. It will apply +// weight window biasing on boundaries, collisions +// or both according to the G4PlaceOfAction argument. + +// Author: Michael Dressel (Michael.Dressel@cern.ch) +// ---------------------------------------------------------------------- +#ifndef G4MassWeioghtWindowProcess_hh +#define G4MassWeioghtWindowProcess_hh G4MassWeioghtWindowProcess_hh + +#include "G4VProcess.hh" +#include "G4VTrackTerminator.hh" +#include "G4PlaceOfAction.hh" + +class G4SamplingPostStepAction; +class G4VWeightWindowAlgorithm; +class G4VWeightWindowStore; + +class G4Step; +class G4Navigator; +class G4TransportationManager; +class G4PathFinder; +class G4VTouchable; + +#include "G4FieldTrack.hh" +#include "G4TouchableHandle.hh" + + +class G4WeightWindowProcess : public G4VProcess, public G4VTrackTerminator +{ + +public: // with description + + G4WeightWindowProcess(const G4VWeightWindowAlgorithm & + aWeightWindowAlgorithm, + const G4VWeightWindowStore &aWWStore, + const G4VTrackTerminator *TrackTerminator, + G4PlaceOfAction placeOfAction, + const G4String &aName = + "WeightWindowProcess", G4bool para = false); + // creates a G4ParticleChange + + virtual ~G4WeightWindowProcess(); + // delete the G4ParticleChange + + + //-------------------------------------------------------------- + // Set Paralle World + //-------------------------------------------------------------- + + void SetParallelWorld(G4String parallelWorldName); + void SetParallelWorld(G4VPhysicalVolume* parallelWorld); + + //-------------------------------------------------------------- + // Process interface + //-------------------------------------------------------------- + + void StartTracking(G4Track*); + + + + virtual G4double + PostStepGetPhysicalInteractionLength(const G4Track& aTrack, + G4double previousStepSize, + G4ForceCondition* condition); + // make process beeing forced + virtual G4VParticleChange *PostStepDoIt(const G4Track&, const G4Step&); + // aply weight window sampling + + virtual void KillTrack() const; + // used in case no scoring process follows that does the killing + + virtual const G4String &GetName() const; + + +public: // without description + + // no operation in AtRestDoIt and AlongStepDoIt + + virtual G4double + AlongStepGetPhysicalInteractionLength(const G4Track&, + G4double , + G4double , + G4double& , + G4GPILSelection*); + virtual G4double + AtRestGetPhysicalInteractionLength(const G4Track& , + G4ForceCondition*); + + virtual G4VParticleChange* + AtRestDoIt(const G4Track&, const G4Step&); + + + virtual G4VParticleChange* + AlongStepDoIt(const G4Track&, const G4Step&); + +private: + + G4WeightWindowProcess(const G4WeightWindowProcess &); + G4WeightWindowProcess &operator=(const G4WeightWindowProcess &); + +private: + + void CopyStep(const G4Step & step); + + G4Step * fGhostStep; + G4StepPoint * fGhostPreStepPoint; + G4StepPoint * fGhostPostStepPoint; + + G4ParticleChange *fParticleChange; + const G4VWeightWindowAlgorithm &fWeightWindowAlgorithm; + const G4VWeightWindowStore &fWeightWindowStore; + G4SamplingPostStepAction *fPostStepAction; + G4PlaceOfAction fPlaceOfAction; + + G4TransportationManager* fTransportationManager; + G4PathFinder* fPathFinder; + + // ------------------------------- + // Navigation in the Ghost World: + // ------------------------------- + G4String fGhostWorldName; + G4VPhysicalVolume* fGhostWorld; + G4Navigator* fGhostNavigator; + G4int fNavigatorID; + G4TouchableHandle fOldGhostTouchable; + G4TouchableHandle fNewGhostTouchable; + G4FieldTrack fFieldTrack; + G4double fGhostSafety; + G4bool fOnBoundary; + + G4bool paraflag; + +}; + +#endif diff --git a/source/processes/scoring/src/G4GCellFinder.cc b/source/processes/scoring/src/G4GCellFinder.cc new file mode 100644 index 0000000000..b701e0af6b --- /dev/null +++ b/source/processes/scoring/src/G4GCellFinder.cc @@ -0,0 +1,67 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4GCellFinder.cc,v 1.1 2006/11/20 10:02:15 ahoward Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ---------------------------------------------------------------------- +// GEANT 4 class source file +// +// G4GCellFinder.cc +// +// ---------------------------------------------------------------------- + +#include "G4GCellFinder.hh" +#include "G4TouchableHandle.hh" +#include "G4Step.hh" + + +G4GCellFinder::G4GCellFinder() +{ + +} + +G4GCellFinder::~G4GCellFinder() +{ +} + +G4GeometryCell +G4GCellFinder::GetPreGeometryCell(const G4Step &aStep) const +{ + const G4TouchableHandle& th = + aStep.GetPreStepPoint()->GetTouchableHandle(); + G4GeometryCell g(*th->GetVolume(), th->GetReplicaNumber()); + return g; +} + +G4GeometryCell +G4GCellFinder::GetPostGeometryCell(const G4Step &aStep) const +{ + const G4TouchableHandle& th = + aStep.GetPostStepPoint()->GetTouchableHandle(); + G4GeometryCell g(*th->GetVolume(), th->GetReplicaNumber()); + return g; +} diff --git a/source/processes/scoring/src/G4GeometrySampler.cc b/source/processes/scoring/src/G4GeometrySampler.cc new file mode 100644 index 0000000000..3e7245f4db --- /dev/null +++ b/source/processes/scoring/src/G4GeometrySampler.cc @@ -0,0 +1,263 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4GeometrySampler.cc,v 1.1 2006/11/20 10:02:16 ahoward Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ---------------------------------------------------------------------- +// GEANT 4 class source file +// +// G4GeometrySampler.cc +// +// ---------------------------------------------------------------------- + +#include "G4GeometrySampler.hh" + +#include "G4VIStore.hh" +#include "G4WeightWindowStore.hh" +#include "G4VScorer.hh" + +#include "G4VPhysicalVolume.hh" +#include "G4ScoreConfigurator.hh" +#include "G4ImportanceConfigurator.hh" +#include "G4WeightWindowConfigurator.hh" +#include "G4NewWeightCutOffConfigurator.hh" +#include "G4GCellFinder.hh" + + G4GeometrySampler:: + G4GeometrySampler(G4VPhysicalVolume *parallelworld, const G4String &particlename) + : fParticleName(particlename), + fWorld(parallelworld), + fImportanceConfigurator(0), + fScoreConfigurator(0), + fGCellFinder(0), + fNewWeightCutOffConfigurator(0), + fIStore(0), + fWeightWindowConfigurator(0), + fWWStore(0), + fIsConfigured(false) +{ + paraflag = false; +} + +G4GeometrySampler::~G4GeometrySampler() +{ + ClearSampling(); +} + +void G4GeometrySampler::ClearSampling() +{ + if (fImportanceConfigurator) + { + delete fImportanceConfigurator; + fImportanceConfigurator = 0; + } + if (fWeightWindowConfigurator) + { + delete fWeightWindowConfigurator; + fWeightWindowConfigurator = 0; + } + if (fScoreConfigurator) + { + delete fScoreConfigurator; + fScoreConfigurator = 0; + } + if (fNewWeightCutOffConfigurator) + { + delete fNewWeightCutOffConfigurator; + fNewWeightCutOffConfigurator = 0; + } + if (fGCellFinder) + { + delete fGCellFinder; + fGCellFinder = 0; + } + fIStore = 0; + fConfigurators.clear(); + fIsConfigured = false; +} + +G4bool G4GeometrySampler::IsConfigured() const +{ + G4bool isconf = false; + if (fIsConfigured) + { + G4cout << "WARNING - G4GeometrySampler::IsConfigured()" + << " Some initalization exists, use ClearSampling()" + << " before a new initialization !" << G4endl; + isconf = true; + } + return isconf; +} + +void G4GeometrySampler::PrepareScoring(G4VScorer *scorer) +{ + G4cout << " preparing scoring configurator " << G4endl; + G4cout << G4endl; + G4cout << G4endl; + G4cout << G4endl; + G4cout << " new fWorld Name: " << fWorld->GetName() << G4endl; + G4cout << G4endl; + G4cout << G4endl; + G4cout << G4endl; + fScoreConfigurator = new G4ScoreConfigurator(fWorld, fParticleName, *scorer, paraflag); + G4cout << " configured scoring " << G4endl; + if (!fScoreConfigurator) + { + G4Exception("G4GeometrySampler::PrepareScoring()", + "FatalError", FatalException, + "Failed allocation of G4ScoreConfigurator !"); + } +} + +void +G4GeometrySampler::PrepareImportanceSampling(G4VIStore *istore, + const G4VImportanceAlgorithm *ialg) +{ + G4cout << " preparing importance sampling " << G4endl; + fIStore = istore; + G4cout << " creating istore " << G4endl; + + fImportanceConfigurator = + new G4ImportanceConfigurator(fWorld, fParticleName, *fIStore, ialg, paraflag); + + G4cout << " creating importance configurator " << G4endl; + + if (!fImportanceConfigurator) + { + G4Exception("G4GeometrySampler::PrepareImportanceSampling()", + "FatalError", FatalException, + "Failed allocation of G4ImportanceConfigurator !"); + } +} + +void +G4GeometrySampler::PrepareWeightRoulett(G4double wsurvive, + G4double wlimit, + G4double isource) +{ + // fGCellFinder = new G4GCellFinder(fWorld); + G4cout << " preparing weight roulette" << G4endl; + fGCellFinder = new G4GCellFinder(); + if (!fGCellFinder) + { + G4Exception("G4GeometrySampler::PrepareWeightRoulett()", + "FatalError", FatalException, + "Failed allocation of G4GCellFinder !"); + } + + fNewWeightCutOffConfigurator = + new G4NewWeightCutOffConfigurator(fWorld, fParticleName, + wsurvive, + wlimit, + isource, + fIStore, + *fGCellFinder, paraflag); + if (!fNewWeightCutOffConfigurator) + { + G4Exception("G4GeometrySampler::PrepareWeightRoulett()", + "FatalError", FatalException, + "Failed allocation of G4NewWeightCutOffConfigurator !"); + } +} + +void +G4GeometrySampler::PrepareWeightWindow(G4VWeightWindowStore *wwstore, + G4VWeightWindowAlgorithm *wwAlg, + G4PlaceOfAction placeOfAction) +{ + + G4cout << " preparing weight window" << G4endl; + + fWWStore = wwstore; + + fWeightWindowConfigurator = + new G4WeightWindowConfigurator(fWorld, fParticleName, + *fWWStore, + wwAlg, + placeOfAction, paraflag); +} + +void G4GeometrySampler::Configure() +{ + G4cout << " entering configure " << G4endl; + if (!IsConfigured()) + { + fIsConfigured = true; + + if (fScoreConfigurator) + { + G4cout << " score configurator push_back " << G4endl; + fConfigurators.push_back(fScoreConfigurator); + G4cout << " pushed " << G4endl; + } + if (fImportanceConfigurator) + { + G4cout << " importance configurator push_back " << G4endl; + fConfigurators.push_back(fImportanceConfigurator); + G4cout << " pushed " << G4endl; + } + if (fWeightWindowConfigurator) + { + G4cout << " weight window configurator push_back " << G4endl; + fConfigurators.push_back(fWeightWindowConfigurator); + G4cout << " pushed " << G4endl; + } + + G4cout << " vsampler configurator loop " << G4endl; + G4VSamplerConfigurator *preConf = 0; + G4int i = 0; + for (G4Configurators::iterator it = fConfigurators.begin(); + it != fConfigurators.end(); it++) + { + i++; + G4cout << " looping " << i << G4endl; + G4VSamplerConfigurator *currConf =*it; + G4cout << " sampler configurator " << G4endl; + currConf->Configure(preConf); + G4cout << " configure preconf " << G4endl; + preConf = *it; + } + if (fNewWeightCutOffConfigurator) + { + G4cout << " NEW weight window configure " << G4endl; + fNewWeightCutOffConfigurator->Configure(0); + G4cout << " configured " << G4endl; + } + } + return; +} + +void G4GeometrySampler::SetParallel(G4bool para) +{ + paraflag = para; +} + +void G4GeometrySampler::SetParticle(const G4String &particlename) +{ + fParticleName = particlename; +} + diff --git a/source/processes/scoring/src/G4ImportanceConfigurator.cc b/source/processes/scoring/src/G4ImportanceConfigurator.cc new file mode 100644 index 0000000000..47eeeafd3a --- /dev/null +++ b/source/processes/scoring/src/G4ImportanceConfigurator.cc @@ -0,0 +1,102 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4ImportanceConfigurator.cc,v 1.1 2006/11/20 10:02:16 ahoward Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ---------------------------------------------------------------------- +// Class G4ImportanceConfigurator +// +// Author: Michael Dressel (Michael.Dressel@cern.ch) +// ---------------------------------------------------------------------- + +#include "G4ImportanceConfigurator.hh" + +#include "G4ImportanceProcess.hh" +#include "G4NewProcessPlacer.hh" +#include "G4ImportanceAlgorithm.hh" + +G4ImportanceConfigurator:: +G4ImportanceConfigurator(G4VPhysicalVolume* worldvolume, + const G4String &particlename, + G4VIStore &istore, + const G4VImportanceAlgorithm *ialg, G4bool para) + : fWorld(worldvolume), + fPlacer(particlename), + fIStore(istore), + fDeleteIalg( ( ! ialg) ), + fIalgorithm(( (fDeleteIalg) ? + new G4ImportanceAlgorithm : ialg)), + fImportanceProcess(0), + paraflag(para) +{ +} + +G4ImportanceConfigurator::~G4ImportanceConfigurator() +{ + if (fImportanceProcess) + { + fPlacer.RemoveProcess(fImportanceProcess); + delete fImportanceProcess; + } + if (fDeleteIalg) + { + delete fIalgorithm; + } +} + +void +G4ImportanceConfigurator::Configure(G4VSamplerConfigurator *preConf) +{ + G4cout << " entering importance configure, paraflag " << paraflag << G4endl; + const G4VTrackTerminator *terminator = 0; + if (preConf) + { + terminator = preConf->GetTrackTerminator(); + }; + + G4cout << " creating importance process, paraflag is: " << paraflag << G4endl; + fImportanceProcess = + new G4ImportanceProcess(*fIalgorithm, + fIStore, + terminator,"ImportanceProcess",paraflag); + if (!fImportanceProcess) + { + G4Exception("G4ImportanceConfigurator::Configure()", + "FatalError", FatalException, + "Failed allocation of G4ImportanceProcess !"); + } + + if(paraflag) fImportanceProcess->SetParallelWorld(fWorld); + + fPlacer.AddProcessAsSecondDoIt(fImportanceProcess); +} + +const G4VTrackTerminator *G4ImportanceConfigurator:: +GetTrackTerminator() const +{ + return fImportanceProcess; +} diff --git a/source/processes/scoring/src/G4ImportanceProcess.cc b/source/processes/scoring/src/G4ImportanceProcess.cc new file mode 100644 index 0000000000..d390855f24 --- /dev/null +++ b/source/processes/scoring/src/G4ImportanceProcess.cc @@ -0,0 +1,471 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4ImportanceProcess.cc,v 1.1 2006/11/20 10:02:16 ahoward Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ---------------------------------------------------------------------- +// GEANT 4 class source file +// +// G4ImportanceProcess.cc +// +// ---------------------------------------------------------------------- + +#include "G4ImportanceProcess.hh" +#include "G4VImportanceAlgorithm.hh" +#include "G4GeometryCell.hh" +#include "G4SamplingPostStepAction.hh" +#include "G4VTrackTerminator.hh" +#include "G4VIStore.hh" + +#include "G4Step.hh" +#include "G4Navigator.hh" +#include "G4VTouchable.hh" +#include "G4VPhysicalVolume.hh" +#include "G4ParticleChange.hh" +#include "G4PathFinder.hh" +#include "G4TransportationManager.hh" +#include "G4StepPoint.hh" +#include "G4FieldTrackUpdator.hh" + + +G4ImportanceProcess:: +G4ImportanceProcess(const G4VImportanceAlgorithm &aImportanceAlgorithm, + const G4VIStore &aIstore, + const G4VTrackTerminator *TrackTerminator, + const G4String &aName, G4bool para) + : G4VProcess(aName), + fParticleChange(new G4ParticleChange), + fImportanceAlgorithm(aImportanceAlgorithm), + fIStore(aIstore), + fPostStepAction(0), + fGhostNavigator(0), fNavigatorID(-1), fFieldTrack('0'), + paraflag(para) + +{ + if (TrackTerminator) + { + fPostStepAction = new G4SamplingPostStepAction(*TrackTerminator); + } + else + { + fPostStepAction = new G4SamplingPostStepAction(*this); + } + if (!fParticleChange) + { + G4Exception("G4ImportanceProcess::G4ImportanceProcess()", + "FatalError", FatalException, + "Failed allocation of G4ParticleChange !"); + } + G4VProcess::pParticleChange = fParticleChange; + + + fGhostStep = new G4Step(); + fGhostPreStepPoint = fGhostStep->GetPreStepPoint(); + fGhostPostStepPoint = fGhostStep->GetPostStepPoint(); + + fTransportationManager = G4TransportationManager::GetTransportationManager(); + fPathFinder = G4PathFinder::GetInstance(); + + if (verboseLevel>0) + { + G4cout << GetProcessName() << " is created " << G4endl; + } + + G4cout << " importance process paraflag is: " << paraflag << G4endl; + +} + +G4ImportanceProcess::~G4ImportanceProcess() +{ + + delete fPostStepAction; + delete fParticleChange; + delete fGhostStep; + +} + + + +//------------------------------------------------------ +// +// SetParallelWorld +// +//------------------------------------------------------ +void G4ImportanceProcess:: +SetParallelWorld(G4String parallelWorldName) +{ +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Get pointers of the parallel world and its navigator +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + fGhostWorldName = parallelWorldName; + fGhostWorld = fTransportationManager->GetParallelWorld(fGhostWorldName); + fGhostNavigator = fTransportationManager->GetNavigator(fGhostWorld); +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +} + +void G4ImportanceProcess:: +SetParallelWorld(G4VPhysicalVolume* parallelWorld) +{ +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Get pointer of navigator +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + fGhostWorldName = parallelWorld->GetName(); + fGhostWorld = parallelWorld; + fGhostNavigator = fTransportationManager->GetNavigator(fGhostWorld); +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +} + +//------------------------------------------------------ +// +// StartTracking +// +//------------------------------------------------------ +void G4ImportanceProcess::StartTracking(G4Track* trk) +{ +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Activate navigator and get the navigator ID +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// G4cout << " G4ParallelWorldScoringProcess::StartTracking" << G4endl; + + if(paraflag) { + if(fGhostNavigator) + { fNavigatorID = fTransportationManager->ActivateNavigator(fGhostNavigator); } + else + { + G4Exception("G4ImportanceProcess::StartTracking", + "ProcParaWorld000",FatalException, + "G4ImportanceProcess is used for tracking without having a parallel world assigned"); + } +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +// G4cout << "G4ParallelWorldScoringProcess::StartTracking <<<<<<<<<<<<<<<<<< " << G4endl; +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Let PathFinder initialize +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + fPathFinder->PrepareNewTrack(trk->GetPosition(),trk->GetMomentumDirection()); +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Setup initial touchables for the first step +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + fOldGhostTouchable = fPathFinder->CreateTouchableHandle(fNavigatorID); + fGhostPreStepPoint->SetTouchableHandle(fOldGhostTouchable); + fNewGhostTouchable = fOldGhostTouchable; + fGhostPostStepPoint->SetTouchableHandle(fNewGhostTouchable); + + // Initialize + fGhostSafety = -1.; + fOnBoundary = false; + } + +} + + +G4double G4ImportanceProcess:: +PostStepGetPhysicalInteractionLength(const G4Track& , + G4double , + G4ForceCondition* condition) +{ +// *condition = Forced; +// return kInfinity; + +// *condition = StronglyForced; + *condition = Forced; + return DBL_MAX; +} + +G4VParticleChange * +G4ImportanceProcess::PostStepDoIt(const G4Track &aTrack, + const G4Step &aStep) +{ + fParticleChange->Initialize(aTrack); + + if(paraflag) { + fOldGhostTouchable = fGhostPostStepPoint->GetTouchableHandle(); + //xbug? fOnBoundary = false; + CopyStep(aStep); + + if(fOnBoundary) + { +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Locate the point and get new touchable +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + //?? fPathFinder->Locate(step.GetPostStepPoint()->GetPosition(), + //?? step.GetPostStepPoint()->GetMomentumDirection()); + fNewGhostTouchable = fPathFinder->CreateTouchableHandle(fNavigatorID); + //AH G4cout << " on boundary " << G4endl; +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + } + else + { + // Do I need this ?????????????????????????????????????????????????????????? + // fGhostNavigator->LocateGlobalPointWithinVolume(track.GetPosition()); + // ????????????????????????????????????????????????????????????????????????? + + // fPathFinder->ReLocate(track.GetPosition()); + + // reuse the touchable + fNewGhostTouchable = fOldGhostTouchable; + //AH G4cout << " NOT on boundary " << G4endl; + } + + fGhostPreStepPoint->SetTouchableHandle(fOldGhostTouchable); + fGhostPostStepPoint->SetTouchableHandle(fNewGhostTouchable); + +// if ( (aStep.GetPostStepPoint()->GetStepStatus() == fGeomBoundary) +// && (aStep.GetStepLength() > kCarTolerance) ) +// { +// if (aTrack.GetTrackStatus()==fStopAndKill) +// { +// G4cout << "WARNING - G4ImportanceProcess::PostStepDoIt()" +// << " StopAndKill track." << G4endl; +// } + +// G4StepPoint *prepoint = aStep.GetPreStepPoint(); +// G4StepPoint *postpoint = aStep.GetPostStepPoint(); +// G4GeometryCell prekey(*(prepoint->GetPhysicalVolume()), +// prepoint->GetTouchable()->GetReplicaNumber()); +// G4GeometryCell postkey(*(postpoint->GetPhysicalVolume()), +// postpoint->GetTouchable()->GetReplicaNumber()); + + + if ( (fGhostPostStepPoint->GetStepStatus() == fGeomBoundary) + && (aStep.GetStepLength() > kCarTolerance) ) + { + if (aTrack.GetTrackStatus()==fStopAndKill) + { + G4cout << "WARNING - G4ImportanceProcess::PostStepDoIt()" + << " StopAndKill track. on boundary" << G4endl; + } + + G4GeometryCell prekey(*(fGhostPreStepPoint->GetPhysicalVolume()), + fGhostPreStepPoint->GetTouchable()->GetReplicaNumber()); + G4GeometryCell postkey(*(fGhostPostStepPoint->GetPhysicalVolume()), + fGhostPostStepPoint->GetTouchable()->GetReplicaNumber()); + + //AH + /* + G4cout << G4endl; + G4cout << G4endl; + G4cout << " inside parallel importance process " << aTrack.GetCurrentStepNumber() << G4endl; + G4cout << G4endl; + G4cout << G4endl; + G4cout << " prekey: " << fGhostPreStepPoint->GetPhysicalVolume()->GetName() << " replica:" + << fGhostPreStepPoint->GetTouchable()->GetReplicaNumber() << G4endl; + G4cout << " prekey ISTORE: " << fIStore.GetImportance(prekey) << G4endl; + G4cout << " postkey: " << G4endl; + G4cout << " postkey ISTORE: " << fIStore.GetImportance(postkey) << G4endl; + */ + //AH + G4Nsplit_Weight nw = fImportanceAlgorithm. + Calculate(fIStore.GetImportance(prekey), + fIStore.GetImportance(postkey), + aTrack.GetWeight()); + //AH + /* + G4cout << " prekey weight: " << fIStore.GetImportance(prekey) + << " postkey weight: " << fIStore.GetImportance(postkey) + << " split weight: " << nw << G4endl; + G4cout << " before poststepaction " << G4endl; + */ + //AH + fPostStepAction->DoIt(aTrack, fParticleChange, nw); + //AH G4cout << " after post step do it " << G4endl; + } + } else { + if ( (aStep.GetPostStepPoint()->GetStepStatus() == fGeomBoundary) + && (aStep.GetStepLength() > kCarTolerance) ) + { + //AH G4cout << " inside non-parallel importance process " << G4endl; + if (aTrack.GetTrackStatus()==fStopAndKill) + { + G4cout << "WARNING - G4ImportanceProcess::PostStepDoIt()" + << " StopAndKill track. on boundary non-parallel" << G4endl; + } + + G4StepPoint *prepoint = aStep.GetPreStepPoint(); + G4StepPoint *postpoint = aStep.GetPostStepPoint(); + + G4GeometryCell prekey(*(prepoint->GetPhysicalVolume()), + prepoint->GetTouchable()->GetReplicaNumber()); + G4GeometryCell postkey(*(postpoint->GetPhysicalVolume()), + postpoint->GetTouchable()->GetReplicaNumber()); + + G4Nsplit_Weight nw = fImportanceAlgorithm. + Calculate(fIStore.GetImportance(prekey), + fIStore.GetImportance(postkey), + aTrack.GetWeight()); + //AH + /* + G4cout << " prekey weight: " << fIStore.GetImportance(prekey) + << " postkey weight: " << fIStore.GetImportance(postkey) + << " split weight: " << nw << G4endl; + G4cout << " before poststepaction 2 " << G4endl; + */ + //AH + fPostStepAction->DoIt(aTrack, fParticleChange, nw); + //AH G4cout << " after poststepaction 2 " << G4endl; + } + } + return fParticleChange; +} + +void G4ImportanceProcess::KillTrack() const +{ + fParticleChange->ProposeTrackStatus(fStopAndKill); +} + +const G4String &G4ImportanceProcess::GetName() const +{ + return theProcessName; +} + +G4double G4ImportanceProcess:: +AlongStepGetPhysicalInteractionLength( + const G4Track& track, G4double previousStepSize, G4double currentMinimumStep, + G4double& proposedSafety, G4GPILSelection* selection) +{ + + //AH G4cout << " along step physical interaction length " << G4endl; + + if(paraflag) { + static G4FieldTrack endTrack('0'); + static ELimited eLimited; + + *selection = NotCandidateForSelection; + G4double returnedStep = DBL_MAX; + + if (previousStepSize > 0.) + { fGhostSafety -= previousStepSize; } + // else + // { fGhostSafety = -1.; } + if (fGhostSafety < 0.) fGhostSafety = 0.0; + + // ------------------------------------------ + // Determination of the proposed STEP LENGTH: + // ------------------------------------------ + if (currentMinimumStep <= fGhostSafety && currentMinimumStep > 0.) + { + // I have no chance to limit + returnedStep = currentMinimumStep; + fOnBoundary = false; + proposedSafety = fGhostSafety - currentMinimumStep; + //AH G4cout << " step not limited, why? " << G4endl; + } + else // (currentMinimumStep > fGhostSafety: I may limit the Step) + { + G4FieldTrackUpdator::Update(&fFieldTrack,&track); + //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + // ComputeStep + //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + returnedStep + = fPathFinder->ComputeStep(fFieldTrack,currentMinimumStep,fNavigatorID, + track.GetCurrentStepNumber(),fGhostSafety,eLimited, + endTrack,track.GetVolume()); + //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + if(eLimited == kDoNot) + { + //AH G4cout << " computestep came back with not-boundary " << G4endl; + // Track is not on the boundary + fOnBoundary = false; + fGhostSafety = fGhostNavigator->ComputeSafety(endTrack.GetPosition()); + } + else + { + // Track is on the boundary + //AH G4cout << " FOUND A BOUNDARY ! " << track.GetCurrentStepNumber() << G4endl; + fOnBoundary = true; + // proposedSafety = fGhostSafety; + } + proposedSafety = fGhostSafety; + if(eLimited == kUnique || eLimited == kSharedOther) { + *selection = CandidateForSelection; + }else if (eLimited == kSharedTransport) { + returnedStep *= (1.0 + 1.0e-9); + // Expand to disable its selection in Step Manager comparison + } + + } + + // ---------------------------------------------- + // Returns the fGhostSafety as the proposedSafety + // The SteppingManager will take care of keeping + // the smallest one. + // ---------------------------------------------- + return returnedStep; + + } else { + + return DBL_MAX; + + } + +} + +G4double G4ImportanceProcess:: +AtRestGetPhysicalInteractionLength(const G4Track& , + G4ForceCondition*) +{ + return -1.0; +} + +G4VParticleChange* G4ImportanceProcess:: +AtRestDoIt(const G4Track&, const G4Step&) +{ + return 0; +} + +G4VParticleChange* G4ImportanceProcess:: +AlongStepDoIt(const G4Track& aTrack, const G4Step& ) +{ + // Dummy ParticleChange ie: does nothing + // Expecting G4Transportation to move the track + //AH G4cout << " along step do it " << G4endl; + pParticleChange->Initialize(aTrack); + return pParticleChange; + // return 0; +} + +void G4ImportanceProcess::CopyStep(const G4Step & step) +{ + fGhostStep->SetTrack(step.GetTrack()); + fGhostStep->SetStepLength(step.GetStepLength()); + fGhostStep->SetTotalEnergyDeposit(step.GetTotalEnergyDeposit()); + fGhostStep->SetControlFlag(step.GetControlFlag()); + + *fGhostPreStepPoint = *(step.GetPreStepPoint()); + *fGhostPostStepPoint = *(step.GetPostStepPoint()); + +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Set StepStatus for ghost world +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + if(fOnBoundary) + { fGhostPostStepPoint->SetStepStatus(fGeomBoundary); } + else if(fGhostPostStepPoint->GetStepStatus()==fGeomBoundary) + { fGhostPostStepPoint->SetStepStatus(fPostStepDoItProc); } +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +} diff --git a/source/processes/scoring/src/G4NewProcessPlacer.cc b/source/processes/scoring/src/G4NewProcessPlacer.cc new file mode 100644 index 0000000000..b0250f9a3f --- /dev/null +++ b/source/processes/scoring/src/G4NewProcessPlacer.cc @@ -0,0 +1,207 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4NewProcessPlacer.cc,v 1.1 2006/11/20 10:02:16 ahoward Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ---------------------------------------------------------------------- +// GEANT 4 class source file +// +// G4NewProcessPlacer.cc +// +// ---------------------------------------------------------------------- + +#include "G4NewProcessPlacer.hh" +#include "G4ProcessManager.hh" +#include "G4VProcess.hh" +#include "G4ParticleTable.hh" + +G4NewProcessPlacer::G4NewProcessPlacer(const G4String &particlename) + : fParticleName(particlename) +{ +} + +G4NewProcessPlacer::~G4NewProcessPlacer() +{ +} + +void G4NewProcessPlacer::RemoveProcess(G4VProcess *process) +{ + G4cout << "=== G4NewProcessPlacer::RemoveProcess: for: " << fParticleName + << G4endl; + G4cout << " ProcessName: " << process->GetProcessName() + << ", will be removed!" << G4endl; + + G4cout << " The initial Vectors: " << G4endl; + PrintPostStepGPILVec(); + PrintPostStepDoItVec(); + + GetProcessManager()->RemoveProcess(process); + + G4cout << " The final Vectors: " << G4endl; + PrintPostStepGPILVec(); + PrintPostStepDoItVec(); + + G4cout << "================================================" << G4endl; + +} + +void G4NewProcessPlacer::AddProcessAs(G4VProcess *process, SecondOrLast sol) +{ + G4cout << " ProcessName: " << process->GetProcessName() << G4endl; + G4cout << "The initial Vectors: " << G4endl; + PrintPostStepGPILVec(); + PrintPostStepDoItVec(); + + if (sol == eLast) + { + GetProcessManager()->AddProcess(process, ordInActive, ordInActive, ordLast); + } + else if (sol == eSecond) + { + // get transportation process + G4VProcess *transportation = + (* (GetProcessManager()->GetProcessList()))[0]; + + if (!transportation) + { + G4Exception(" G4NewProcessPlacer:: could not get process id=0"); + } + if (transportation->GetProcessName() != "Transportation" && transportation->GetProcessName() != "CoupledTransportation") + { + // G4cout << " GOT HERE CoupledTransportation" << G4endl; + G4cout << transportation->GetProcessName() << G4endl; + G4Exception(" G4NewProcessPlacer:: process id=0 is not Transportation"); + } + + // place the given proces as first for the moment + GetProcessManager()->AddProcess(process); + GetProcessManager()->SetProcessOrderingToFirst(process, + idxPostStep); + // xx test + // if(process->GetProcessName() == "ImportanceProcess") + GetProcessManager()->SetProcessOrdering(process, + idxAlongStep, 1); + // place transportation first again + GetProcessManager()->SetProcessOrderingToFirst(transportation, + idxPostStep); + } + + // for verification inly + G4cout << "The final Vectors: " << G4endl; + PrintPostStepGPILVec(); + PrintPostStepDoItVec(); + + G4cout << "================================================" << G4endl; +} + +void G4NewProcessPlacer::AddProcessAsSecondDoIt(G4VProcess *process) +{ + G4cout << "=== G4NewProcessPlacer::AddProcessAsSecondDoIt: for: " + << fParticleName << G4endl; + AddProcessAs(process, eSecond); +} + +void G4NewProcessPlacer::AddProcessAsLastDoIt(G4VProcess *process) +{ + G4cout << "=== G4NewProcessPlacer::AddProcessAsLastDoIt: for: " + << fParticleName << G4endl; + AddProcessAs(process, eLast); +} + +G4ProcessManager *G4NewProcessPlacer::GetProcessManager() +{ + // get particle iterator to add processes --------------------- + G4ParticleTable* theParticleTable = 0; + G4ParticleTable::G4PTblDicIterator* theParticleIterator = 0; + theParticleTable = G4ParticleTable::GetParticleTable(); + theParticleIterator = theParticleTable->GetIterator(); + // ------------------------------------------------------- + G4ProcessManager *processmanager = 0; + // find process manager --------------------------- + theParticleIterator->reset(); + while( (*theParticleIterator)() ) + { + G4ParticleDefinition* particle = theParticleIterator->value(); + if (particle->GetParticleName() == fParticleName) + { + processmanager = particle->GetProcessManager(); + break; + } + } + // --------------------------------------------------------- + if (!processmanager) + { + G4Exception("G4NewProcessPlacer::GetProcessManager()", "InvalidSetup", + FatalException, "NULL pointer to Process Manager !"); + } + return processmanager; +} + +void G4NewProcessPlacer::PrintPostStepGPILVec() +{ + G4cout << "GPIL Vector: " << G4endl; + G4ProcessVector* processGPILVec = + GetProcessManager()->GetPostStepProcessVector(typeGPIL); + PrintProcVec(processGPILVec); +} + +void G4NewProcessPlacer::PrintPostStepDoItVec() +{ + G4cout << "DoIt Vector: " << G4endl; + G4ProcessVector* processDoItVec = + GetProcessManager()->GetPostStepProcessVector(typeDoIt); + PrintProcVec(processDoItVec); +} + + +void G4NewProcessPlacer::PrintProcVec(G4ProcessVector* processVec) +{ + if (!processVec) + { + G4Exception("G4NewProcessPlacer::G4NewProcessPlacer()", "InvalidArgument", + FatalException, "NULL pointer to process-vector !"); + } + G4int len = processVec->length(); + if (len==0) + { + G4Exception("G4NewProcessPlacer::G4NewProcessPlacer()", "InvalidSetup", + FatalException, "Length of process-vector is zero !"); + } + for (int pi=0; piGetProcessName() << G4endl; + } + else + { + G4cout << " " << "no process found for position: " << pi + << ", in vector of length: " << len << G4endl; + } + } +} diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/hepmcEx02-clhep.cc b/source/processes/scoring/src/G4NewWeightCutOffConfigurator.cc similarity index 50% rename from examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/hepmcEx02-clhep.cc rename to source/processes/scoring/src/G4NewWeightCutOffConfigurator.cc index cfc0cf62c3..ba661f77ae 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/hepmcEx02-clhep.cc +++ b/source/processes/scoring/src/G4NewWeightCutOffConfigurator.cc @@ -24,82 +24,63 @@ // ******************************************************************** // // -// $Id: hepmcEx02-clhep.cc,v 1.3 2006/06/29 17:12:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4NewWeightCutOffConfigurator.cc,v 1.1 2006/11/20 10:02:16 ahoward Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // -// -// -------------------------------------------------------------- -// GEANT 4 - example of HepMC-interface +// ---------------------------------------------------------------------- +// Class G4NewWeightCutOffConfigurator // -// -------------------------------------------------------------- -// Comments -// -// -// -------------------------------------------------------------- +// Author: Michael Dressel (Michael.Dressel@cern.ch) +// ---------------------------------------------------------------------- -#include "G4RunManager.hh" -#include "G4UImanager.hh" -#include "G4UIterminal.hh" -#include "G4UItcsh.hh" +#include "G4NewWeightCutOffConfigurator.hh" +#include "G4NewWeightCutOffProcess.hh" -#include "H02DetectorConstruction.hh" -#include "H02PhysicsList.hh" -#include "H02PrimaryGeneratorAction.hh" -#include "H02EventAction.hh" -#include "H02SteppingAction.hh" - -#ifdef G4VIS_USE -#include "G4VisExecutive.hh" -#endif - -int main(int argc, char** argv) +G4NewWeightCutOffConfigurator:: +G4NewWeightCutOffConfigurator(G4VPhysicalVolume* worldvolume, + const G4String &particlename, + G4double wsurvival, + G4double wlimit, + G4double isource, + G4VIStore *istore, + const G4VGCellFinder &aGCellfinder, G4bool para) + : fWorld(worldvolume), + fPlacer(particlename), + fPlaced(false), + paraflag(para) { - G4RunManager* runManager= new G4RunManager; - - runManager-> SetUserInitialization(new H02DetectorConstruction); - runManager-> SetUserInitialization(new H02PhysicsList); - - runManager-> Initialize(); - - runManager-> SetUserAction(new H02PrimaryGeneratorAction); - runManager-> SetUserAction(new H02EventAction); - runManager-> SetUserAction(new H02SteppingAction); - -#ifdef G4VIS_USE - // initialize visualization package - G4VisManager* visManager= new G4VisExecutive; - visManager-> Initialize(); - G4cout << G4endl; -#endif - - if(argc==1) { - // G4UIterminal is a (dumb) terminal. - -#ifdef QERAUOY - G4UItcsh* tcsh= new - G4UItcsh("hepmcEx02(%s)[%/]:"); - G4UIterminal* session= new G4UIterminal(tcsh); - tcsh-> SetLsColor(RED, GREEN); -#else - G4UItcsh* tcsh= new G4UItcsh("hepmcEx01(%s)[%/]:"); - G4UIterminal* session= new G4UIterminal(tcsh); -#endif - session->SessionStart(); - delete session; - - } else { - G4UImanager* UImanager= G4UImanager::GetUIpointer(); - G4String command= "/control/execute "; - G4String fileName= argv[1]; - UImanager-> ApplyCommand(command+fileName); + fNewWeightCutOffProcess = + new G4NewWeightCutOffProcess(wsurvival,wlimit,isource,istore,aGCellfinder,"NewWeightCutOffProcess",paraflag); + if (!fNewWeightCutOffProcess) + { + G4Exception("G4NewWeightCutOffConfigurator::G4NewWeightCutOffConfigurator()", + "FatalError", FatalException, + "Failed to allocate G4NewWeightCutOffProcess !"); } +} -#ifdef G4VIS_USE - delete visManager; -#endif +G4NewWeightCutOffConfigurator::~G4NewWeightCutOffConfigurator() +{ + if (fPlaced) + { + fPlacer.RemoveProcess(fNewWeightCutOffProcess); + delete fNewWeightCutOffProcess; + } +} - delete runManager; +void G4NewWeightCutOffConfigurator::Configure(G4VSamplerConfigurator *) +{ + G4cout << " entering new weight window configure " << G4endl; + if(paraflag) fNewWeightCutOffProcess->SetParallelWorld(fWorld); + + fPlacer.AddProcessAsLastDoIt(fNewWeightCutOffProcess); + fPlaced = true; +} + +const G4VTrackTerminator +*G4NewWeightCutOffConfigurator::GetTrackTerminator() const +{ return 0; } diff --git a/source/processes/scoring/src/G4NewWeightCutOffProcess.cc b/source/processes/scoring/src/G4NewWeightCutOffProcess.cc new file mode 100644 index 0000000000..657e6a9afa --- /dev/null +++ b/source/processes/scoring/src/G4NewWeightCutOffProcess.cc @@ -0,0 +1,378 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4NewWeightCutOffProcess.cc,v 1.1 2006/11/20 10:02:17 ahoward Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ---------------------------------------------------------------------- +// GEANT 4 class source file +// +// G4NewWeightCutOffProcess.cc +// +// ---------------------------------------------------------------------- + +#include "G4NewWeightCutOffProcess.hh" +#include "G4VScorer.hh" +#include "G4GeometryCellStep.hh" +#include "G4GCellFinder.hh" +#include "G4TouchableHandle.hh" +#include "G4VIStore.hh" + +#include "G4Step.hh" +#include "G4Navigator.hh" +#include "G4VTouchable.hh" +#include "G4VPhysicalVolume.hh" +#include "G4ParticleChange.hh" +#include "G4PathFinder.hh" +#include "G4TransportationManager.hh" +#include "G4StepPoint.hh" +#include "G4FieldTrackUpdator.hh" + + +G4NewWeightCutOffProcess:: +G4NewWeightCutOffProcess(G4double wsurvival, + G4double wlimit, + G4double isource, + G4VIStore *istore, + const G4VGCellFinder &aGCellFinder, + const G4String &aName, G4bool para) + : G4VProcess(aName), + fParticleChange(new G4ParticleChange), + fWeightSurvival(wsurvival), + fWeightLimit(wlimit), + fSourceImportance(isource), + fIStore(istore), + fGCellFinder(aGCellFinder), + fGhostNavigator(0), fNavigatorID(-1), fFieldTrack('0') +{ + if (!fParticleChange) + { + G4Exception("G4NewWeightCutOffProcess::G4NewWeightCutOffProcess()", + "FatalError", FatalException, + "Failed to allocate G4ParticleChange !"); + } + + G4VProcess::pParticleChange = fParticleChange; + + fGhostStep = new G4Step(); + fGhostPreStepPoint = fGhostStep->GetPreStepPoint(); + fGhostPostStepPoint = fGhostStep->GetPostStepPoint(); + + fTransportationManager = G4TransportationManager::GetTransportationManager(); + fPathFinder = G4PathFinder::GetInstance(); + + if (verboseLevel>0) + { + G4cout << GetProcessName() << " is created " << G4endl; + } + + paraflag = para; + +} + +G4NewWeightCutOffProcess::~G4NewWeightCutOffProcess() +{ + delete fParticleChange; + delete fGhostStep; +} + + +//------------------------------------------------------ +// +// SetParallelWorld +// +//------------------------------------------------------ +void G4NewWeightCutOffProcess:: +SetParallelWorld(G4String parallelWorldName) +{ +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Get pointers of the parallel world and its navigator +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + fGhostWorldName = parallelWorldName; + fGhostWorld = fTransportationManager->GetParallelWorld(fGhostWorldName); + fGhostNavigator = fTransportationManager->GetNavigator(fGhostWorld); +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +} + +void G4NewWeightCutOffProcess:: +SetParallelWorld(G4VPhysicalVolume* parallelWorld) +{ +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Get pointer of navigator +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + fGhostWorldName = parallelWorld->GetName(); + fGhostWorld = parallelWorld; + fGhostNavigator = fTransportationManager->GetNavigator(fGhostWorld); +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +} + +//------------------------------------------------------ +// +// StartTracking +// +//------------------------------------------------------ +void G4NewWeightCutOffProcess::StartTracking(G4Track* trk) +{ +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Activate navigator and get the navigator ID +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// G4cout << " G4ParallelWorldScoringProcess::StartTracking" << G4endl; + + if(paraflag) { + if(fGhostNavigator) + { fNavigatorID = fTransportationManager->ActivateNavigator(fGhostNavigator); } + else + { + G4Exception("G4NewWeightCutOffProcess::StartTracking", + "ProcParaWorld000",FatalException, + "G4NewWeightCutOffProcess is used for tracking without having a parallel world assigned"); + } +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +// G4cout << "G4ParallelWorldScoringProcess::StartTracking <<<<<<<<<<<<<<<<<< " << G4endl; +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Let PathFinder initialize +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + fPathFinder->PrepareNewTrack(trk->GetPosition(),trk->GetMomentumDirection()); +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Setup initial touchables for the first step +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + fOldGhostTouchable = fPathFinder->CreateTouchableHandle(fNavigatorID); + fGhostPreStepPoint->SetTouchableHandle(fOldGhostTouchable); + fNewGhostTouchable = fOldGhostTouchable; + fGhostPostStepPoint->SetTouchableHandle(fNewGhostTouchable); + + // Initialize + fGhostSafety = -1.; + fOnBoundary = false; + } +} + + +G4double G4NewWeightCutOffProcess:: +PostStepGetPhysicalInteractionLength(const G4Track &, + G4double, G4ForceCondition* condition) +{ +// *condition = Forced; +// return kInfinity; + +// *condition = StronglyForced; + *condition = Forced; + return DBL_MAX; +} + +G4VParticleChange * +G4NewWeightCutOffProcess::PostStepDoIt(const G4Track& aTrack, + const G4Step &aStep) +{ + fParticleChange->Initialize(aTrack); + + if(paraflag) { + fOldGhostTouchable = fGhostPostStepPoint->GetTouchableHandle(); + //xbug? fOnBoundary = false; + CopyStep(aStep); + + if(fOnBoundary) + { +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Locate the point and get new touchable +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + //?? fPathFinder->Locate(step.GetPostStepPoint()->GetPosition(), + //?? step.GetPostStepPoint()->GetMomentumDirection()); + fNewGhostTouchable = fPathFinder->CreateTouchableHandle(fNavigatorID); +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + } + else + { + // Do I need this ?????????????????????????????????????????????????????????? + // fGhostNavigator->LocateGlobalPointWithinVolume(track.GetPosition()); + // ????????????????????????????????????????????????????????????????????????? + + // fPathFinder->ReLocate(track.GetPosition()); + + // reuse the touchable + fNewGhostTouchable = fOldGhostTouchable; + } + + fGhostPreStepPoint->SetTouchableHandle(fOldGhostTouchable); + fGhostPostStepPoint->SetTouchableHandle(fNewGhostTouchable); + + } + + G4GeometryCell postCell = fGCellFinder.GetPostGeometryCell(aStep); + // G4GeometryCell postCell = fGCellFinder.GetPostGeometryCell(fGhostStep); + G4double R = fSourceImportance; + if (fIStore) + { + G4double i = fIStore->GetImportance(postCell); + if (i>0) + { + R/=i; + } + } + G4double w = aTrack.GetWeight(); + if (wProposeTrackStatus(fStopAndKill); + } + else + { + fParticleChange->ProposeWeight(ws); + } + } + return fParticleChange; +} + +const G4String &G4NewWeightCutOffProcess::GetName() const +{ + return theProcessName; +} + +G4double G4NewWeightCutOffProcess:: +AlongStepGetPhysicalInteractionLength( + const G4Track& track, G4double previousStepSize, G4double currentMinimumStep, + G4double& proposedSafety, G4GPILSelection* selection) +{ + if(paraflag) { + static G4FieldTrack endTrack('0'); + static ELimited eLimited; + + *selection = NotCandidateForSelection; + G4double returnedStep = DBL_MAX; + + if (previousStepSize > 0.) + { fGhostSafety -= previousStepSize; } + // else + // { fGhostSafety = -1.; } + if (fGhostSafety < 0.) fGhostSafety = 0.0; + + // ------------------------------------------ + // Determination of the proposed STEP LENGTH: + // ------------------------------------------ + if (currentMinimumStep <= fGhostSafety && currentMinimumStep > 0.) + { + // I have no chance to limit + returnedStep = currentMinimumStep; + fOnBoundary = false; + proposedSafety = fGhostSafety - currentMinimumStep; + } + else // (currentMinimumStep > fGhostSafety: I may limit the Step) + { + G4FieldTrackUpdator::Update(&fFieldTrack,&track); + //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + // ComputeStep + //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + returnedStep + = fPathFinder->ComputeStep(fFieldTrack,currentMinimumStep,fNavigatorID, + track.GetCurrentStepNumber(),fGhostSafety,eLimited, + endTrack,track.GetVolume()); + //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + if(eLimited == kDoNot) + { + // Track is not on the boundary + fOnBoundary = false; + fGhostSafety = fGhostNavigator->ComputeSafety(endTrack.GetPosition()); + } + else + { + // Track is on the boundary + fOnBoundary = true; + proposedSafety = fGhostSafety; + } + //xbug? proposedSafety = fGhostSafety; + if(eLimited == kUnique || eLimited == kSharedOther) { + *selection = CandidateForSelection; + }else if (eLimited == kSharedTransport) { + returnedStep *= (1.0 + 1.0e-9); + // Expand to disable its selection in Step Manager comparison + } + + } + + // ---------------------------------------------- + // Returns the fGhostSafety as the proposedSafety + // The SteppingManager will take care of keeping + // the smallest one. + // ---------------------------------------------- + return returnedStep; + + } else { + return DBL_MAX; + //not sensible! return -1.0; + } + +} + + +G4double G4NewWeightCutOffProcess:: +AtRestGetPhysicalInteractionLength(const G4Track& , + G4ForceCondition*) +{ + return -1.0; +} + +G4VParticleChange* +G4NewWeightCutOffProcess::AtRestDoIt(const G4Track&, const G4Step&) +{ + return 0; +} + +G4VParticleChange* +G4NewWeightCutOffProcess::AlongStepDoIt(const G4Track& track, const G4Step&) +{ + // Dummy ParticleChange ie: does nothing + // Expecting G4Transportation to move the track + pParticleChange->Initialize(track); + return pParticleChange; + + // return 0; +} + +void G4NewWeightCutOffProcess::CopyStep(const G4Step & step) +{ + fGhostStep->SetTrack(step.GetTrack()); + fGhostStep->SetStepLength(step.GetStepLength()); + fGhostStep->SetTotalEnergyDeposit(step.GetTotalEnergyDeposit()); + fGhostStep->SetControlFlag(step.GetControlFlag()); + + *fGhostPreStepPoint = *(step.GetPreStepPoint()); + *fGhostPostStepPoint = *(step.GetPostStepPoint()); + +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Set StepStatus for ghost world +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + if(fOnBoundary) + { fGhostPostStepPoint->SetStepStatus(fGeomBoundary); } + else if(fGhostPostStepPoint->GetStepStatus()==fGeomBoundary) + { fGhostPostStepPoint->SetStepStatus(fPostStepDoItProc); } +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +} diff --git a/source/processes/scoring/src/G4ParallelWorldScoringProcess.cc b/source/processes/scoring/src/G4ParallelWorldScoringProcess.cc new file mode 100644 index 0000000000..6f57dda283 --- /dev/null +++ b/source/processes/scoring/src/G4ParallelWorldScoringProcess.cc @@ -0,0 +1,449 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4ParallelWorldScoringProcess.cc,v 1.5 2006/11/13 20:16:53 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// + +#include "G4ios.hh" +#include "G4ParallelWorldScoringProcess.hh" +#include "G4Step.hh" +#include "G4Navigator.hh" +#include "G4VTouchable.hh" +#include "G4VPhysicalVolume.hh" +#include "G4ParticleChange.hh" +#include "G4PathFinder.hh" +#include "G4TransportationManager.hh" +#include "G4ParticleChange.hh" +#include "G4StepPoint.hh" +#include "G4FieldTrackUpdator.hh" + +#include "G4SDManager.hh" +#include "G4VSensitiveDetector.hh" + +//-------------------------------- +// Constructor with name and type: +//-------------------------------- +G4ParallelWorldScoringProcess:: +G4ParallelWorldScoringProcess(const G4String& processName,G4ProcessType theType) +:G4VProcess(processName,theType), fGhostNavigator(0), fNavigatorID(-1), fFieldTrack('0') +{ + pParticleChange = &aDummyParticleChange; + + fGhostStep = new G4Step(); + fGhostPreStepPoint = fGhostStep->GetPreStepPoint(); + fGhostPostStepPoint = fGhostStep->GetPostStepPoint(); + + fTransportationManager = G4TransportationManager::GetTransportationManager(); + fPathFinder = G4PathFinder::GetInstance(); + + if (verboseLevel>0) + { + G4cout << GetProcessName() << " is created " << G4endl; + } +} + +// ----------- +// Destructor: +// ----------- +G4ParallelWorldScoringProcess::~G4ParallelWorldScoringProcess() +{ + delete fGhostStep; +} + +//------------------------------------------------------ +// +// SetParallelWorld +// +//------------------------------------------------------ +void G4ParallelWorldScoringProcess:: +SetParallelWorld(G4String parallelWorldName) +{ +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Get pointers of the parallel world and its navigator +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + fGhostWorldName = parallelWorldName; + fGhostWorld = fTransportationManager->GetParallelWorld(fGhostWorldName); + fGhostNavigator = fTransportationManager->GetNavigator(fGhostWorld); +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +} + +void G4ParallelWorldScoringProcess:: +SetParallelWorld(G4VPhysicalVolume* parallelWorld) +{ +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Get pointer of navigator +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + fGhostWorldName = parallelWorld->GetName(); + fGhostWorld = parallelWorld; + fGhostNavigator = fTransportationManager->GetNavigator(fGhostWorld); +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +} + +//------------------------------------------------------ +// +// StartTracking +// +//------------------------------------------------------ +void G4ParallelWorldScoringProcess::StartTracking(G4Track* trk) +{ +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Activate navigator and get the navigator ID +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// G4cout << " G4ParallelWorldScoringProcess::StartTracking" << G4endl; + if(fGhostNavigator) + { fNavigatorID = fTransportationManager->ActivateNavigator(fGhostNavigator); } + else + { + G4Exception("G4ParallelWorldScoringProcess::StartTracking", + "ProcParaWorld000",FatalException, + "G4ParallelWorldScoringProcess is used for tracking without having a parallel world assigned"); + } +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +// G4cout << "G4ParallelWorldScoringProcess::StartTracking <<<<<<<<<<<<<<<<<< " << G4endl; +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Let PathFinder initialize +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + fPathFinder->PrepareNewTrack(trk->GetPosition(),trk->GetMomentumDirection()); +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Setup initial touchables for the first step +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + fOldGhostTouchable = fPathFinder->CreateTouchableHandle(fNavigatorID); + fGhostPreStepPoint->SetTouchableHandle(fOldGhostTouchable); + fNewGhostTouchable = fOldGhostTouchable; + fGhostPostStepPoint->SetTouchableHandle(fNewGhostTouchable); + + // Initialize + fGhostSafety = -1.; + fOnBoundary = false; +} + +//---------------------------------------------------------- +// +// AtRestGetPhysicalInteractionLength() +// +//---------------------------------------------------------- +G4double +G4ParallelWorldScoringProcess::AtRestGetPhysicalInteractionLength( + const G4Track& /*track*/, + G4ForceCondition* condition) +{ + *condition = Forced; + return DBL_MAX; +} + +//------------------------------------ +// +// AtRestDoIt() +// +//------------------------------------ +G4VParticleChange* G4ParallelWorldScoringProcess::AtRestDoIt( + const G4Track& track, + const G4Step& step) +{ + fOldGhostTouchable = fGhostPostStepPoint->GetTouchableHandle(); + G4VSensitiveDetector* aSD = 0; + if(fOldGhostTouchable->GetVolume()) + { aSD = fOldGhostTouchable->GetVolume()->GetLogicalVolume()->GetSensitiveDetector(); } + fOnBoundary = false; + CopyStep(step); + fGhostPreStepPoint->SetSensitiveDetector(aSD); + + fNewGhostTouchable = fOldGhostTouchable; + + fGhostPreStepPoint->SetTouchableHandle(fOldGhostTouchable); + fGhostPostStepPoint->SetTouchableHandle(fNewGhostTouchable); + if(fNewGhostTouchable->GetVolume()) + { + fGhostPostStepPoint->SetSensitiveDetector( + fNewGhostTouchable->GetVolume()->GetLogicalVolume()->GetSensitiveDetector()); + } + else + { fGhostPostStepPoint->SetSensitiveDetector(0); } + + if (verboseLevel>1) Verbose(step); + + G4VSensitiveDetector* sd = fGhostPreStepPoint->GetSensitiveDetector(); + if(sd) + { + sd->Hit(fGhostStep); + } + + pParticleChange->Initialize(track); + return pParticleChange; +} + +//---------------------------------------------------------- +// +// PostStepGetPhysicalInteractionLength() +// +//---------------------------------------------------------- +G4double +G4ParallelWorldScoringProcess::PostStepGetPhysicalInteractionLength( + const G4Track& /*track*/, + G4double /*previousStepSize*/, + G4ForceCondition* condition) +{ + // I must be invoked anyway to score the hit. + *condition = StronglyForced; + return DBL_MAX; +} + +//------------------------------------ +// +// PostStepDoIt() +// +//------------------------------------ +G4VParticleChange* G4ParallelWorldScoringProcess::PostStepDoIt( + const G4Track& track, + const G4Step& step) +{ + fOldGhostTouchable = fGhostPostStepPoint->GetTouchableHandle(); + G4VSensitiveDetector* aSD = 0; + if(fOldGhostTouchable->GetVolume()) + { aSD = fOldGhostTouchable->GetVolume()->GetLogicalVolume()->GetSensitiveDetector(); } + CopyStep(step); + fGhostPreStepPoint->SetSensitiveDetector(aSD); + + // fPathFinder->Locate( track.GetPosition(), + // track.GetMomentumDirection(), + // true); + + // fPathFinder->Locate(step.GetPostStepPoint()->GetPosition(), + // step.GetPostStepPoint()->GetMomentumDirection()); + + if(fOnBoundary) + { +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Locate the point and get new touchable +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + //?? fPathFinder->Locate(step.GetPostStepPoint()->GetPosition(), + //?? step.GetPostStepPoint()->GetMomentumDirection()); + fNewGhostTouchable = fPathFinder->CreateTouchableHandle(fNavigatorID); +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + } + else + { +// Do I need this ?????????????????????????????????????????????????????????? +// fGhostNavigator->LocateGlobalPointWithinVolume(track.GetPosition()); +// ????????????????????????????????????????????????????????????????????????? + + // fPathFinder->ReLocate(track.GetPosition()); + + // reuse the touchable + fNewGhostTouchable = fOldGhostTouchable; + } + + fGhostPreStepPoint->SetTouchableHandle(fOldGhostTouchable); + fGhostPostStepPoint->SetTouchableHandle(fNewGhostTouchable); + + if(fNewGhostTouchable->GetVolume()) + { + fGhostPostStepPoint->SetSensitiveDetector( + fNewGhostTouchable->GetVolume()->GetLogicalVolume()->GetSensitiveDetector()); + } + else + { fGhostPostStepPoint->SetSensitiveDetector(0); } + + if (verboseLevel>1) Verbose(step); + + G4VSensitiveDetector* sd = fGhostPreStepPoint->GetSensitiveDetector(); + if(sd) + { + sd->Hit(fGhostStep); + } + + pParticleChange->Initialize(track); // Does not change the track properties + return pParticleChange; +} + + +//--------------------------------------- +// +// AlongStepGetPhysicalInteractionLength +// +//--------------------------------------- +G4double G4ParallelWorldScoringProcess::AlongStepGetPhysicalInteractionLength( + const G4Track& track, G4double previousStepSize, G4double currentMinimumStep, + G4double& proposedSafety, G4GPILSelection* selection) +{ + static G4FieldTrack endTrack('0'); + static ELimited eLimited; + + *selection = NotCandidateForSelection; + G4double returnedStep = DBL_MAX; + + if (previousStepSize > 0.) + { fGhostSafety -= previousStepSize; } +// else +// { fGhostSafety = -1.; } + if (fGhostSafety < 0.) fGhostSafety = 0.0; + + // ------------------------------------------ + // Determination of the proposed STEP LENGTH: + // ------------------------------------------ + if (currentMinimumStep <= fGhostSafety && currentMinimumStep > 0.) + { + // I have no chance to limit + returnedStep = currentMinimumStep; + fOnBoundary = false; + proposedSafety = fGhostSafety - currentMinimumStep; + } + else // (currentMinimumStep > fGhostSafety: I may limit the Step) + { + G4FieldTrackUpdator::Update(&fFieldTrack,&track); +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// ComputeStep +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + returnedStep + = fPathFinder->ComputeStep(fFieldTrack,currentMinimumStep,fNavigatorID, + track.GetCurrentStepNumber(),fGhostSafety,eLimited, + endTrack,track.GetVolume()); +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + if(eLimited == kDoNot) + { + // Track is not on the boundary + fOnBoundary = false; + fGhostSafety = fGhostNavigator->ComputeSafety(endTrack.GetPosition()); + } + else + { + // Track is on the boundary + fOnBoundary = true; + // proposedSafety = fGhostSafety; + } + proposedSafety = fGhostSafety; + if(eLimited == kUnique || eLimited == kSharedOther) { + *selection = CandidateForSelection; + }else if (eLimited == kSharedTransport) { + returnedStep *= (1.0 + 1.0e-9); + // Expand to disable its selection in Step Manager comparison + } + } + + // ---------------------------------------------- + // Returns the fGhostSafety as the proposedSafety + // The SteppingManager will take care of keeping + // the smallest one. + // ---------------------------------------------- + return returnedStep; +} + +G4VParticleChange* G4ParallelWorldScoringProcess::AlongStepDoIt( + const G4Track& track, const G4Step& ) +{ + // Dummy ParticleChange ie: does nothing + // Expecting G4Transportation to move the track + pParticleChange->Initialize(track); + return pParticleChange; +} + + +void G4ParallelWorldScoringProcess::CopyStep(const G4Step & step) +{ + fGhostStep->SetTrack(step.GetTrack()); + fGhostStep->SetStepLength(step.GetStepLength()); + fGhostStep->SetTotalEnergyDeposit(step.GetTotalEnergyDeposit()); + fGhostStep->SetControlFlag(step.GetControlFlag()); + + *fGhostPreStepPoint = *(step.GetPreStepPoint()); + *fGhostPostStepPoint = *(step.GetPostStepPoint()); + +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Set StepStatus for ghost world +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + if(fOnBoundary) + { fGhostPostStepPoint->SetStepStatus(fGeomBoundary); } + else if(fGhostPostStepPoint->GetStepStatus()==fGeomBoundary) + { fGhostPostStepPoint->SetStepStatus(fPostStepDoItProc); } +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +} + +void G4ParallelWorldScoringProcess::Verbose(const G4Step& step) const +{ + G4cout << "In mass geometry ------------------------------------------------" << G4endl; + G4cout << " StepLength : " << step.GetStepLength()/mm << " TotalEnergyDeposit : " + << step.GetTotalEnergyDeposit()/MeV << G4endl; + G4cout << " PreStepPoint : " + << step.GetPreStepPoint()->GetPhysicalVolume()->GetName() << " - "; + if(step.GetPreStepPoint()->GetProcessDefinedStep()) + { G4cout << step.GetPreStepPoint()->GetProcessDefinedStep()->GetProcessName(); } + else + { G4cout << "NoProcessAssigned"; } + G4cout << G4endl; + G4cout << " " << step.GetPreStepPoint()->GetPosition() << G4endl; + G4cout << " PostStepPoint : "; + if(step.GetPostStepPoint()->GetPhysicalVolume()) + { G4cout << step.GetPostStepPoint()->GetPhysicalVolume()->GetName(); } + else + { G4cout << "OutOfWorld"; } + G4cout << " - "; + if(step.GetPostStepPoint()->GetProcessDefinedStep()) + { G4cout << step.GetPostStepPoint()->GetProcessDefinedStep()->GetProcessName(); } + else + { G4cout << "NoProcessAssigned"; } + G4cout << G4endl; + G4cout << " " << step.GetPostStepPoint()->GetPosition() << G4endl; + + G4cout << "In ghost geometry ------------------------------------------------" << G4endl; + G4cout << " StepLength : " << fGhostStep->GetStepLength()/mm + << " TotalEnergyDeposit : " + << fGhostStep->GetTotalEnergyDeposit()/MeV << G4endl; + G4cout << " PreStepPoint : " + << fGhostStep->GetPreStepPoint()->GetPhysicalVolume()->GetName() << " [" + << fGhostStep->GetPreStepPoint()->GetTouchable()->GetReplicaNumber() + << " ]" << " - "; + if(fGhostStep->GetPreStepPoint()->GetProcessDefinedStep()) + { G4cout << fGhostStep->GetPreStepPoint()->GetProcessDefinedStep()->GetProcessName(); } + else + { G4cout << "NoProcessAssigned"; } + G4cout << G4endl; + G4cout << " " << fGhostStep->GetPreStepPoint()->GetPosition() << G4endl; + G4cout << " PostStepPoint : "; + if(fGhostStep->GetPostStepPoint()->GetPhysicalVolume()) + { + G4cout << fGhostStep->GetPostStepPoint()->GetPhysicalVolume()->GetName() << " [" + << fGhostStep->GetPostStepPoint()->GetTouchable()->GetReplicaNumber() + << " ]"; + } + else + { G4cout << "OutOfWorld"; } + G4cout << " - "; + if(fGhostStep->GetPostStepPoint()->GetProcessDefinedStep()) + { G4cout << fGhostStep->GetPostStepPoint()->GetProcessDefinedStep()->GetProcessName(); } + else + { G4cout << "NoProcessAssigned"; } + G4cout << G4endl; + G4cout << " " << fGhostStep->GetPostStepPoint()->GetPosition() << " == " + << fGhostStep->GetTrack()->GetMomentumDirection() + << G4endl; + +} + diff --git a/source/processes/scoring/src/G4ScoreConfigurator.cc b/source/processes/scoring/src/G4ScoreConfigurator.cc new file mode 100644 index 0000000000..29a288107a --- /dev/null +++ b/source/processes/scoring/src/G4ScoreConfigurator.cc @@ -0,0 +1,84 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4ScoreConfigurator.cc,v 1.1 2006/11/20 10:02:17 ahoward Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ---------------------------------------------------------------------- +// Class G4ScoreConfigurator +// +// Author: Michael Dressel (Michael.Dressel@cern.ch) +// ---------------------------------------------------------------------- + +#include "G4ScoreConfigurator.hh" +#include "G4VScorer.hh" +#include "G4VTrackTerminator.hh" +#include "G4ScoreProcess.hh" + +G4ScoreConfigurator:: +G4ScoreConfigurator(G4VPhysicalVolume* worldvolume, const G4String &particlename, + G4VScorer &scorer, G4bool para) + : fWorld(worldvolume), + fPlacer(particlename), + fScorer(scorer), + fScoreProcess(0) +{ + paraflag = para; +} + +G4ScoreConfigurator::~G4ScoreConfigurator() +{ + if (fScoreProcess) + { + fPlacer.RemoveProcess(fScoreProcess); + delete fScoreProcess; + } +} + +const G4VTrackTerminator * +G4ScoreConfigurator::GetTrackTerminator() const +{ + return fScoreProcess; +} + +void G4ScoreConfigurator::Configure(G4VSamplerConfigurator *) +{ + G4cout << " entering scoring configure " << G4endl; + fScoreProcess = new G4ScoreProcess(fScorer,"ScoringProcess",paraflag); + G4cout << " creating score process " << G4endl; + if (!fScoreProcess) + { + G4Exception("G4ScoreConfigurator::Configure()", + "FatalError", FatalException, + "Failed allocation of G4ScoreProcess !"); + } + + G4cout << " setting parallel world " << G4endl; + if(paraflag) fScoreProcess->SetParallelWorld(fWorld); + G4cout << " set " << G4endl; + + fPlacer.AddProcessAsSecondDoIt(fScoreProcess); +} diff --git a/source/processes/scoring/src/G4ScoreProcess.cc b/source/processes/scoring/src/G4ScoreProcess.cc new file mode 100644 index 0000000000..a02d037df4 --- /dev/null +++ b/source/processes/scoring/src/G4ScoreProcess.cc @@ -0,0 +1,413 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4ScoreProcess.cc,v 1.1 2006/11/20 10:02:18 ahoward Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ---------------------------------------------------------------------- +// GEANT 4 class source file +// +// G4ScoreProcess.cc +// +// ---------------------------------------------------------------------- + +#include "G4ScoreProcess.hh" +#include "G4VScorer.hh" + +#include "G4GeometryCellStep.hh" + +#include "G4Step.hh" +#include "G4Navigator.hh" +#include "G4VTouchable.hh" +#include "G4VPhysicalVolume.hh" +#include "G4ParticleChange.hh" +#include "G4PathFinder.hh" +#include "G4TransportationManager.hh" +#include "G4StepPoint.hh" +#include "G4FieldTrackUpdator.hh" + + +G4ScoreProcess::G4ScoreProcess(G4VScorer &aScorer, + const G4String &aName, G4bool para) + : G4VProcess(aName), + fParticleChange(new G4ParticleChange), + fScorer(aScorer), + fKillTrack(false), + fGhostNavigator(0), fNavigatorID(-1), fFieldTrack('0') +{ + + if (!fParticleChange) + { + G4Exception("G4ScoreProcess::G4ScoreProcess()", "Fatal Error", + FatalException, "Failed to allocate G4ParticleChange !"); + } + G4VProcess::pParticleChange = fParticleChange; + + fGhostStep = new G4Step(); + fGhostPreStepPoint = fGhostStep->GetPreStepPoint(); + fGhostPostStepPoint = fGhostStep->GetPostStepPoint(); + + fTransportationManager = G4TransportationManager::GetTransportationManager(); + fPathFinder = G4PathFinder::GetInstance(); + + if (verboseLevel>0) + { + G4cout << GetProcessName() << " is created " << G4endl; + } + + paraflag = para; + + +} + +G4ScoreProcess::~G4ScoreProcess() +{ + delete fParticleChange; + delete fGhostStep; +} + + + +//------------------------------------------------------ +// +// SetParallelWorld +// +//------------------------------------------------------ +void G4ScoreProcess:: +SetParallelWorld(G4String parallelWorldName) +{ +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Get pointers of the parallel world and its navigator +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + fGhostWorldName = parallelWorldName; + fGhostWorld = fTransportationManager->GetParallelWorld(fGhostWorldName); + fGhostNavigator = fTransportationManager->GetNavigator(fGhostWorld); +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +} + +void G4ScoreProcess:: +SetParallelWorld(G4VPhysicalVolume* parallelWorld) +{ +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Get pointer of navigator +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + G4cout << " Getting Name: " << G4endl; + fGhostWorldName = parallelWorld->GetName(); + G4cout << " Get Name :" << fGhostWorldName << G4endl; + fGhostWorld = parallelWorld; + fGhostNavigator = fTransportationManager->GetNavigator(fGhostWorld); +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +} + + +//------------------------------------------------------ +// +// StartTracking +// +//------------------------------------------------------ +void G4ScoreProcess::StartTracking(G4Track* trk) +{ +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Activate navigator and get the navigator ID +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// G4cout << " G4ParallelWorldScoringProcess::StartTracking" << G4endl; + + if(paraflag) { + if(fGhostNavigator) + { fNavigatorID = fTransportationManager->ActivateNavigator(fGhostNavigator); } + else + { + G4Exception("G4ScoreProcess::StartTracking", + "ProcParaWorld000",FatalException, + "G4ScoreProcess is used for tracking without having a parallel world assigned"); + } +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +// G4cout << "G4ParallelWorldScoringProcess::StartTracking <<<<<<<<<<<<<<<<<< " << G4endl; +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Let PathFinder initialize +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + fPathFinder->PrepareNewTrack(trk->GetPosition(),trk->GetMomentumDirection()); +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Setup initial touchables for the first step +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + fOldGhostTouchable = fPathFinder->CreateTouchableHandle(fNavigatorID); + fGhostPreStepPoint->SetTouchableHandle(fOldGhostTouchable); + fNewGhostTouchable = fOldGhostTouchable; + fGhostPostStepPoint->SetTouchableHandle(fNewGhostTouchable); + + // Initialize + fGhostSafety = -1.; + fOnBoundary = false; + + } +} + + + +G4double G4ScoreProcess:: +PostStepGetPhysicalInteractionLength(const G4Track&, + G4double , + G4ForceCondition* condition) +{ +// *condition = Forced; +// return kInfinity; + +// *condition = StronglyForced; + *condition = Forced; + return DBL_MAX; +} + +G4VParticleChange * +G4ScoreProcess::PostStepDoIt(const G4Track& aTrack, const G4Step &aStep) +{ + + //AH G4cout << " inside scoring post-step, track: " << aTrack.GetTrackID() << " step: " << aTrack.GetCurrentStepNumber() << G4endl; + //AH G4cout << " and fOnBoundary " << fOnBoundary << G4endl; + fParticleChange->Initialize(aTrack); + + if(paraflag) { + fOldGhostTouchable = fGhostPostStepPoint->GetTouchableHandle(); + //xbug? fOnBoundary = false; + CopyStep(aStep); + if(fOnBoundary) + { +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Locate the point and get new touchable +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + //?? fPathFinder->Locate(step.GetPostStepPoint()->GetPosition(), + //?? step.GetPostStepPoint()->GetMomentumDirection()); + //AH G4cout << " GOT HERE? inside post step " << G4endl; + fNewGhostTouchable = fPathFinder->CreateTouchableHandle(fNavigatorID); +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + } + else + { + // Do I need this ?????????????????????????????????????????????????????????? + // fGhostNavigator->LocateGlobalPointWithinVolume(track.GetPosition()); + // ????????????????????????????????????????????????????????????????????????? + + // fPathFinder->ReLocate(track.GetPosition()); + + // reuse the touchable + fNewGhostTouchable = fOldGhostTouchable; + } + + fGhostPreStepPoint->SetTouchableHandle(fOldGhostTouchable); + fGhostPostStepPoint->SetTouchableHandle(fNewGhostTouchable); + } + + + // G4StepPoint *prepoint = aStep.GetPreStepPoint(); + // G4StepPoint *postpoint = aStep.GetPostStepPoint(); + + // G4GeometryCell prekey(*(prepoint->GetPhysicalVolume()), + // prepoint->GetTouchable()->GetReplicaNumber()); + // G4GeometryCell postkey(*(postpoint->GetPhysicalVolume()), +// postpoint->GetTouchable()->GetReplicaNumber()); + + if(paraflag) { + if (fGhostStep->GetStepLength() > kCarTolerance) + { + G4GeometryCell prekey(*(fGhostPreStepPoint->GetPhysicalVolume()), + fGhostPreStepPoint->GetTouchable()->GetReplicaNumber()); + G4GeometryCell postkey(*(fGhostPostStepPoint->GetPhysicalVolume()), + fGhostPostStepPoint->GetTouchable()->GetReplicaNumber()); + G4GeometryCellStep pstep(prekey, postkey); + pstep.SetCrossBoundary(false); + //xxtest pstep.SetCrossBoundary(true); + + if (prekey != postkey) + { + pstep.SetCrossBoundary(true); + } + fScorer.Score(aStep, pstep); + } else { + if (aStep.GetStepLength() > kCarTolerance) + { + G4StepPoint *prepoint = aStep.GetPreStepPoint(); + G4StepPoint *postpoint = aStep.GetPostStepPoint(); + + G4GeometryCell prekey(*(prepoint->GetPhysicalVolume()), + prepoint->GetTouchable()->GetReplicaNumber()); + G4GeometryCell postkey(*(postpoint->GetPhysicalVolume()), + postpoint->GetTouchable()->GetReplicaNumber()); + G4GeometryCellStep pstep(prekey, postkey); + pstep.SetCrossBoundary(false); + + if (prekey != postkey) + { + pstep.SetCrossBoundary(true); + } + fScorer.Score(aStep, pstep); + } + } + } + + if (fKillTrack) + { + //AH G4cout << " score process is killing track - why? " << G4endl; + fKillTrack = false; + fParticleChange->ProposeTrackStatus(fStopAndKill); + } + + return fParticleChange; + // return G4VProcess::pParticleChange; +} + +const G4String &G4ScoreProcess::GetName() const +{ + return theProcessName; +} + + +G4double G4ScoreProcess:: +AlongStepGetPhysicalInteractionLength( + const G4Track& track, G4double previousStepSize, G4double currentMinimumStep, + G4double& proposedSafety, G4GPILSelection* selection) +{ + //AH G4cout << " inside scoring along-step GPIL, track : " << track.GetTrackID() << " step#: " << track.GetCurrentStepNumber() << G4endl; + if(paraflag) { + static G4FieldTrack endTrack('0'); + static ELimited eLimited; + + *selection = NotCandidateForSelection; + G4double returnedStep = DBL_MAX; + + if (previousStepSize > 0.) + { fGhostSafety -= previousStepSize; } + // else + // { fGhostSafety = -1.; } + if (fGhostSafety < 0.) fGhostSafety = 0.0; + + // ------------------------------------------ + // Determination of the proposed STEP LENGTH: + // ------------------------------------------ + if (currentMinimumStep <= fGhostSafety && currentMinimumStep > 0.) + { + // I have no chance to limit + returnedStep = currentMinimumStep; + fOnBoundary = false; + proposedSafety = fGhostSafety - currentMinimumStep; + } + else // (currentMinimumStep > fGhostSafety: I may limit the Step) + { + G4FieldTrackUpdator::Update(&fFieldTrack,&track); + //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + // ComputeStep + //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + returnedStep + = fPathFinder->ComputeStep(fFieldTrack,currentMinimumStep,fNavigatorID, + track.GetCurrentStepNumber(),fGhostSafety,eLimited, + endTrack,track.GetVolume()); + //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + if(eLimited == kDoNot) + { + // Track is not on the boundary + fOnBoundary = false; + fGhostSafety = fGhostNavigator->ComputeSafety(endTrack.GetPosition()); + } + else + { + // Track is on the boundary + //AH G4cout << " GOT HERE " << G4endl; + fOnBoundary = true; + proposedSafety = fGhostSafety; + } + //xbug? proposedSafety = fGhostSafety; + if(eLimited == kUnique || eLimited == kSharedOther) { + *selection = CandidateForSelection; + }else if (eLimited == kSharedTransport) { + returnedStep *= (1.0 + 1.0e-9); + // Expand to disable its selection in Step Manager comparison + } + + } + + // ---------------------------------------------- + // Returns the fGhostSafety as the proposedSafety + // The SteppingManager will take care of keeping + // the smallest one. + // ---------------------------------------------- + return returnedStep; + + } else { + return DBL_MAX; + // not sensible! return -1.0; + } + +} + +G4double G4ScoreProcess:: +AtRestGetPhysicalInteractionLength(const G4Track&, + G4ForceCondition*) +{ + return -1.0; +} + +G4VParticleChange* G4ScoreProcess::AtRestDoIt(const G4Track&, + const G4Step&) +{ + return 0; +} + +G4VParticleChange* G4ScoreProcess::AlongStepDoIt(const G4Track& track, + const G4Step&) +{ + // Dummy ParticleChange ie: does nothing + // Expecting G4Transportation to move the track + pParticleChange->Initialize(track); + return pParticleChange; + + // return 0; +} + +void G4ScoreProcess::KillTrack() const +{ + fKillTrack = true; +} + +void G4ScoreProcess::CopyStep(const G4Step & step) +{ + fGhostStep->SetTrack(step.GetTrack()); + fGhostStep->SetStepLength(step.GetStepLength()); + fGhostStep->SetTotalEnergyDeposit(step.GetTotalEnergyDeposit()); + fGhostStep->SetControlFlag(step.GetControlFlag()); + + *fGhostPreStepPoint = *(step.GetPreStepPoint()); + *fGhostPostStepPoint = *(step.GetPostStepPoint()); + +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Set StepStatus for ghost world +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + if(fOnBoundary) + { fGhostPostStepPoint->SetStepStatus(fGeomBoundary); } + else if(fGhostPostStepPoint->GetStepStatus()==fGeomBoundary) + { fGhostPostStepPoint->SetStepStatus(fPostStepDoItProc); } +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +} diff --git a/source/processes/scoring/src/G4WeightWindowConfigurator.cc b/source/processes/scoring/src/G4WeightWindowConfigurator.cc new file mode 100644 index 0000000000..6785285d30 --- /dev/null +++ b/source/processes/scoring/src/G4WeightWindowConfigurator.cc @@ -0,0 +1,97 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4WeightWindowConfigurator.cc,v 1.1 2006/11/20 10:02:19 ahoward Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ---------------------------------------------------------------------- +// Class G4WeightWindowConfigurator +// +// Author: Michael Dressel (Michael.Dressel@cern.ch) +// ---------------------------------------------------------------------- + +#include "G4WeightWindowConfigurator.hh" +#include "G4WeightWindowAlgorithm.hh" +#include "G4WeightWindowProcess.hh" + +G4WeightWindowConfigurator:: +G4WeightWindowConfigurator(G4VPhysicalVolume* worldvolume, + const G4String &particlename, + G4VWeightWindowStore &wwstore, + const G4VWeightWindowAlgorithm *wwAlg, + G4PlaceOfAction placeOfAction, G4bool para) + : fWorld(worldvolume), + fPlacer(particlename), + fWeightWindowStore(wwstore), + fDeleteWWalg( ( ! wwAlg) ), + fWWalgorithm(( (fDeleteWWalg) ? + new G4WeightWindowAlgorithm(5,3,5) : wwAlg)), + fWeightWindowProcess(0), + fPlaceOfAction(placeOfAction) +{ + paraflag = para; +} + +G4WeightWindowConfigurator::~G4WeightWindowConfigurator() +{ + if (fWeightWindowProcess) + { + fPlacer.RemoveProcess(fWeightWindowProcess); + delete fWeightWindowProcess; + } + if (fDeleteWWalg) + { + delete fWWalgorithm; + } +} + +void +G4WeightWindowConfigurator::Configure(G4VSamplerConfigurator *preConf) +{ + G4cout << " entering weight window configure " << G4endl; + const G4VTrackTerminator *terminator = 0; + if (preConf) + { + terminator = preConf->GetTrackTerminator(); + }; + + fWeightWindowProcess = + new G4WeightWindowProcess(*fWWalgorithm, + fWeightWindowStore, + terminator, + fPlaceOfAction,"WeightWindowProcess",paraflag); + + if(paraflag) fWeightWindowProcess->SetParallelWorld(fWorld); + + fPlacer.AddProcessAsSecondDoIt(fWeightWindowProcess); +} + +const G4VTrackTerminator * +G4WeightWindowConfigurator::GetTrackTerminator() const +{ + return fWeightWindowProcess; +} + diff --git a/source/processes/scoring/src/G4WeightWindowProcess.cc b/source/processes/scoring/src/G4WeightWindowProcess.cc new file mode 100644 index 0000000000..33b3503f83 --- /dev/null +++ b/source/processes/scoring/src/G4WeightWindowProcess.cc @@ -0,0 +1,417 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4WeightWindowProcess.cc,v 1.1 2006/11/20 10:02:19 ahoward Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// ---------------------------------------------------------------------- +// GEANT 4 class source file +// +// G4WeightWindowProcess.cc +// +// ---------------------------------------------------------------------- + +#include "G4WeightWindowProcess.hh" +#include "G4VWeightWindowAlgorithm.hh" +#include "G4GeometryCell.hh" +#include "G4SamplingPostStepAction.hh" +#include "G4VTrackTerminator.hh" +#include "G4PlaceOfAction.hh" +#include "G4VWeightWindowStore.hh" + +#include "G4Step.hh" +#include "G4Navigator.hh" +#include "G4VTouchable.hh" +#include "G4VPhysicalVolume.hh" +#include "G4ParticleChange.hh" +#include "G4PathFinder.hh" +#include "G4TransportationManager.hh" +#include "G4StepPoint.hh" +#include "G4FieldTrackUpdator.hh" + + +G4WeightWindowProcess::G4WeightWindowProcess( + const G4VWeightWindowAlgorithm &aWeightWindowAlgorithm, + const G4VWeightWindowStore &aWWStore, + const G4VTrackTerminator *TrackTerminator, + G4PlaceOfAction placeOfAction, + const G4String &aName, G4bool para) + : G4VProcess(aName), + fParticleChange(new G4ParticleChange), + fWeightWindowAlgorithm(aWeightWindowAlgorithm), + fWeightWindowStore(aWWStore), + fPostStepAction(0), + fPlaceOfAction(placeOfAction), + fGhostNavigator(0), fNavigatorID(-1), fFieldTrack('0') +{ + if (TrackTerminator) + { + fPostStepAction = new G4SamplingPostStepAction(*TrackTerminator); + } + else + { + fPostStepAction = new G4SamplingPostStepAction(*this); + } + if (!fParticleChange) + { + G4Exception("G4WeightWindowProcess::G4WeightWindowProcess()", + "FatalError", FatalException, + "Failed allocation of G4ParticleChange !"); + } + G4VProcess::pParticleChange = fParticleChange; + + fGhostStep = new G4Step(); + fGhostPreStepPoint = fGhostStep->GetPreStepPoint(); + fGhostPostStepPoint = fGhostStep->GetPostStepPoint(); + + fTransportationManager = G4TransportationManager::GetTransportationManager(); + fPathFinder = G4PathFinder::GetInstance(); + + if (verboseLevel>0) + { + G4cout << GetProcessName() << " is created " << G4endl; + } + + paraflag = para; + +} + +G4WeightWindowProcess::~G4WeightWindowProcess() +{ + + delete fPostStepAction; + delete fParticleChange; + delete fGhostStep; + +} + + +//------------------------------------------------------ +// +// SetParallelWorld +// +//------------------------------------------------------ +void G4WeightWindowProcess:: +SetParallelWorld(G4String parallelWorldName) +{ +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Get pointers of the parallel world and its navigator +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + fGhostWorldName = parallelWorldName; + fGhostWorld = fTransportationManager->GetParallelWorld(fGhostWorldName); + fGhostNavigator = fTransportationManager->GetNavigator(fGhostWorld); +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +} + +void G4WeightWindowProcess:: +SetParallelWorld(G4VPhysicalVolume* parallelWorld) +{ +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Get pointer of navigator +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + fGhostWorldName = parallelWorld->GetName(); + fGhostWorld = parallelWorld; + fGhostNavigator = fTransportationManager->GetNavigator(fGhostWorld); +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +} + +//------------------------------------------------------ +// +// StartTracking +// +//------------------------------------------------------ +void G4WeightWindowProcess::StartTracking(G4Track* trk) +{ +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Activate navigator and get the navigator ID +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// G4cout << " G4ParallelWorldScoringProcess::StartTracking" << G4endl; + + if(paraflag) { + if(fGhostNavigator) + { fNavigatorID = fTransportationManager->ActivateNavigator(fGhostNavigator); } + else + { + G4Exception("G4WeightWindowProcess::StartTracking", + "ProcParaWorld000",FatalException, + "G4WeightWindowProcess is used for tracking without having a parallel world assigned"); + } +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +// G4cout << "G4ParallelWorldScoringProcess::StartTracking <<<<<<<<<<<<<<<<<< " << G4endl; +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Let PathFinder initialize +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + fPathFinder->PrepareNewTrack(trk->GetPosition(),trk->GetMomentumDirection()); +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Setup initial touchables for the first step +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + fOldGhostTouchable = fPathFinder->CreateTouchableHandle(fNavigatorID); + fGhostPreStepPoint->SetTouchableHandle(fOldGhostTouchable); + fNewGhostTouchable = fOldGhostTouchable; + fGhostPostStepPoint->SetTouchableHandle(fNewGhostTouchable); + + // Initialize + fGhostSafety = -1.; + fOnBoundary = false; + } +} + + +G4double G4WeightWindowProcess:: +PostStepGetPhysicalInteractionLength(const G4Track& , + G4double , + G4ForceCondition* condition) +{ +// *condition = Forced; +// return kInfinity; + +// *condition = StronglyForced; + *condition = Forced; + return DBL_MAX; +} + +G4VParticleChange * +G4WeightWindowProcess::PostStepDoIt(const G4Track &aTrack, + const G4Step &aStep) +{ + + fParticleChange->Initialize(aTrack); + + if(paraflag) { + fOldGhostTouchable = fGhostPostStepPoint->GetTouchableHandle(); + //xbug? fOnBoundary = false; + CopyStep(aStep); + + if(fOnBoundary) + { +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Locate the point and get new touchable +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + //?? fPathFinder->Locate(step.GetPostStepPoint()->GetPosition(), + //?? step.GetPostStepPoint()->GetMomentumDirection()); + fNewGhostTouchable = fPathFinder->CreateTouchableHandle(fNavigatorID); +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + } + else + { + // Do I need this ?????????????????????????????????????????????????????????? + // fGhostNavigator->LocateGlobalPointWithinVolume(track.GetPosition()); + // ????????????????????????????????????????????????????????????????????????? + + // fPathFinder->ReLocate(track.GetPosition()); + + // reuse the touchable + fNewGhostTouchable = fOldGhostTouchable; + } + + fGhostPreStepPoint->SetTouchableHandle(fOldGhostTouchable); + fGhostPostStepPoint->SetTouchableHandle(fNewGhostTouchable); + + } + + if (aStep.GetStepLength() > kCarTolerance) + { +// if ( ( fPlaceOfAction == onBoundaryAndCollision) +// || ( (fPlaceOfAction == onBoundary) && +// (aStep.GetPostStepPoint()->GetStepStatus() == fGeomBoundary) ) +// || ( (fPlaceOfAction == onCollision) && +// (aStep.GetPostStepPoint()->GetStepStatus() != fGeomBoundary) ) ) + if(paraflag) { + if ( ( fPlaceOfAction == onBoundaryAndCollision) + || ( (fPlaceOfAction == onBoundary) && + (fGhostPostStepPoint->GetStepStatus() == fGeomBoundary) ) + || ( (fPlaceOfAction == onCollision) && + (fGhostPostStepPoint->GetStepStatus() != fGeomBoundary) ) ) + { + +// G4StepPoint *postpoint = aStep.GetPostStepPoint(); + +// G4GeometryCell postCell(*(postpoint->GetPhysicalVolume()), +// postpoint->GetTouchable()->GetReplicaNumber()); + + G4GeometryCell postCell(*(fGhostPostStepPoint->GetPhysicalVolume()), + fGhostPostStepPoint->GetTouchable()->GetReplicaNumber()); + G4Nsplit_Weight nw = + fWeightWindowAlgorithm.Calculate(aTrack.GetWeight(), + fWeightWindowStore.GetLowerWeitgh(postCell, + aTrack.GetKineticEnergy())); + fPostStepAction->DoIt(aTrack, fParticleChange, nw); + } + } else { + if ( ( fPlaceOfAction == onBoundaryAndCollision) + || ( (fPlaceOfAction == onBoundary) && + (aStep.GetPostStepPoint()->GetStepStatus() == fGeomBoundary) ) + || ( (fPlaceOfAction == onCollision) && + (aStep.GetPostStepPoint()->GetStepStatus() != fGeomBoundary) ) ) + { + + G4StepPoint *postpoint = aStep.GetPostStepPoint(); + + G4GeometryCell postCell(*(postpoint->GetPhysicalVolume()), + postpoint->GetTouchable()->GetReplicaNumber()); + + G4Nsplit_Weight nw = + fWeightWindowAlgorithm.Calculate(aTrack.GetWeight(), + fWeightWindowStore.GetLowerWeitgh(postCell, + aTrack.GetKineticEnergy())); + fPostStepAction->DoIt(aTrack, fParticleChange, nw); + } + } + } + return fParticleChange; +} + +void G4WeightWindowProcess::KillTrack() const +{ + fParticleChange->ProposeTrackStatus(fStopAndKill); +} + +const G4String &G4WeightWindowProcess::GetName() const +{ + return G4VProcess::GetProcessName(); +} + +G4double G4WeightWindowProcess:: +AlongStepGetPhysicalInteractionLength( + const G4Track& track, G4double previousStepSize, G4double currentMinimumStep, + G4double& proposedSafety, G4GPILSelection* selection) +{ + if(paraflag) { + static G4FieldTrack endTrack('0'); + static ELimited eLimited; + + *selection = NotCandidateForSelection; + G4double returnedStep = DBL_MAX; + + if (previousStepSize > 0.) + { fGhostSafety -= previousStepSize; } + // else + // { fGhostSafety = -1.; } + if (fGhostSafety < 0.) fGhostSafety = 0.0; + + // ------------------------------------------ + // Determination of the proposed STEP LENGTH: + // ------------------------------------------ + if (currentMinimumStep <= fGhostSafety && currentMinimumStep > 0.) + { + // I have no chance to limit + returnedStep = currentMinimumStep; + fOnBoundary = false; + proposedSafety = fGhostSafety - currentMinimumStep; + } + else // (currentMinimumStep > fGhostSafety: I may limit the Step) + { + G4FieldTrackUpdator::Update(&fFieldTrack,&track); + //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + // ComputeStep + //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + returnedStep + = fPathFinder->ComputeStep(fFieldTrack,currentMinimumStep,fNavigatorID, + track.GetCurrentStepNumber(),fGhostSafety,eLimited, + endTrack,track.GetVolume()); + //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + if(eLimited == kDoNot) + { + // Track is not on the boundary + fOnBoundary = false; + fGhostSafety = fGhostNavigator->ComputeSafety(endTrack.GetPosition()); + } + else + { + // Track is on the boundary + fOnBoundary = true; + proposedSafety = fGhostSafety; + } + //xbug? proposedSafety = fGhostSafety; + if(eLimited == kUnique || eLimited == kSharedOther) { + *selection = CandidateForSelection; + }else if (eLimited == kSharedTransport) { + returnedStep *= (1.0 + 1.0e-9); + // Expand to disable its selection in Step Manager comparison + } + + } + + // ---------------------------------------------- + // Returns the fGhostSafety as the proposedSafety + // The SteppingManager will take care of keeping + // the smallest one. + // ---------------------------------------------- + return returnedStep; + + } else { + return DBL_MAX; + // not sensible - time goes backwards! return -1.0; + } + +} + +G4double G4WeightWindowProcess:: +AtRestGetPhysicalInteractionLength(const G4Track& , + G4ForceCondition*) +{ + return -1.0; +} + +G4VParticleChange* G4WeightWindowProcess:: +AtRestDoIt(const G4Track&, const G4Step&) +{ + return 0; +} + +G4VParticleChange* G4WeightWindowProcess:: +AlongStepDoIt(const G4Track& track, const G4Step&) +{ + // Dummy ParticleChange ie: does nothing + // Expecting G4Transportation to move the track + pParticleChange->Initialize(track); + return pParticleChange; + + // return 0; +} + +void G4WeightWindowProcess::CopyStep(const G4Step & step) +{ + fGhostStep->SetTrack(step.GetTrack()); + fGhostStep->SetStepLength(step.GetStepLength()); + fGhostStep->SetTotalEnergyDeposit(step.GetTotalEnergyDeposit()); + fGhostStep->SetControlFlag(step.GetControlFlag()); + + *fGhostPreStepPoint = *(step.GetPreStepPoint()); + *fGhostPostStepPoint = *(step.GetPostStepPoint()); + +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Set StepStatus for ghost world +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + if(fOnBoundary) + { fGhostPostStepPoint->SetStepStatus(fGeomBoundary); } + else if(fGhostPostStepPoint->GetStepStatus()==fGeomBoundary) + { fGhostPostStepPoint->SetStepStatus(fPostStepDoItProc); } +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +} diff --git a/source/processes/transportation/GNUmakefile b/source/processes/transportation/GNUmakefile index e90892f39c..d87cfbb06b 100644 --- a/source/processes/transportation/GNUmakefile +++ b/source/processes/transportation/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.8 2003/10/03 15:47:37 gcosmo Exp $ +# $Id: GNUmakefile,v 1.10 2006/07/06 15:31:13 asaim Exp $ # ------------------------------------------------------------ # GNUmakefile for transportation library. G.Folger 10-Dec-97. # ------------------------------------------------------------ diff --git a/source/processes/transportation/History b/source/processes/transportation/History index a5288b0397..ea76a603d1 100644 --- a/source/processes/transportation/History +++ b/source/processes/transportation/History @@ -1,4 +1,4 @@ -$Id: History,v 1.103 2006/02/06 16:18:49 japost Exp $ +$Id: History,v 1.110 2006/11/22 18:52:01 japost Exp $ ------------------------------------------------------------------- ========================================================= @@ -17,6 +17,40 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +November 22nd, 2006, J.Apostolakis transport-V08-01-04 +--------------------------------- +- Add new classes G4NeutronKiller and G4NeutronKillerMessenger + (created by V. Ivantchenko) + +November 22nd, 2006, J.Apostolakis transport-V08-01-03 +--------------------------------- +- G4CoupledTransportation + AlongStepGPIL now returns an estimate for the safety for all geometries + to make up for the fact that some other processes only have PostStep GPILs + which cannot currently influence safety. +**** Fix / Workaround for deficiency of others **** + +November 14th, 2006, J.Apostolakis transport-V08-01-02 +--------------------------------- +- Synchronise to the HEAD. Reinstated disclaimer in most files. + +November 13th, 2006, J.Apostolakis transport-V08-01-01 +--------------------------------- +- Updated G4CoupledTransportation to use new signature of + G4PathFinder::ComputeStep that added new argument + at the end: currentVolume. + +October 17th, 2006, J.Apostolakis transport-V08-01-ref03-02 +--------------------------------- +- Protected printing under 'verbose' conditions + +June 2nd, 2006, J.Apostolakis transport-V08-00-02 +----------------------------- +- Added new class G4CoupledTransportation, + a revised version of Transportation, + for use in 'coupled' parallel navigation in different geometries +- Includes non-revisions for migration to sstream (Nov 2005) + Feb. 6th, 2006, J.Apostolakis/P.MoraDeFreitas transport-V08-00-01 ---------------------------------------------- - Corrected problem with suspended tracks - PR# 802 diff --git a/source/processes/transportation/include/G4CoupledTransportation.hh b/source/processes/transportation/include/G4CoupledTransportation.hh new file mode 100644 index 0000000000..89756ba578 --- /dev/null +++ b/source/processes/transportation/include/G4CoupledTransportation.hh @@ -0,0 +1,204 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4CoupledTransportation.hh,v 1.4 2006/11/14 09:12:59 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// +// ------------------------------------------------------------ +// GEANT 4 include file implementation +// ------------------------------------------------------------ +// +// Class description: +// +// G4CoupledTransportation is an optional process to transport +// a particle, in case of coupled navigation in parallel geometries +// i.e. the geometrical propagation will be done +// encountering the geometrical volumes of the detectors and +// those of parallel geometries (eg for biasing, scoring, fast simulation) +// It is tasked with updating the "safety" to reflect the geometrical +// distance to the nearest volume, and the time of flight of the particle. + +// ======================================================================= +// Created: 17 May 2006, J. Apostolakis +// ======================================================================= +#ifndef G4CoupledTransportation_hh +#define G4CoupledTransportation_hh 1 + +#include "G4VProcess.hh" + +#include "G4FieldManager.hh" + +#include "G4Navigator.hh" +#include "G4TransportationManager.hh" +#include "G4PropagatorInField.hh" +#include "G4PathFinder.hh" + +#include "G4Track.hh" +#include "G4Step.hh" +#include "G4ParticleChangeForTransport.hh" + +class G4CoupledTransportation : public G4VProcess +{ + // Concrete class that does the geometrical transport + + public: // with description + + G4CoupledTransportation( G4int verbosityLevel= 0); + ~G4CoupledTransportation(); + + G4double AlongStepGetPhysicalInteractionLength( + const G4Track& track, + G4double previousStepSize, + G4double currentMinimumStep, + G4double& currentSafety, + G4GPILSelection* selection + ); + + G4VParticleChange* AlongStepDoIt( + const G4Track& track, + const G4Step& stepData + ); + + G4VParticleChange* PostStepDoIt( + const G4Track& track, + const G4Step& stepData + ); + // Responsible for the relocation. + + G4double PostStepGetPhysicalInteractionLength( + const G4Track& , + G4double previousStepSize, + G4ForceCondition* pForceCond + ); + // Forces the PostStepDoIt action to be called, + // but does not limit the step. + + G4PropagatorInField* GetPropagatorInField(); + void SetPropagatorInField( G4PropagatorInField* pFieldPropagator); + // Access/set the assistant class that Propagate in a Field. + + inline void SetVerboseLevel( G4int verboseLevel ); + inline G4int GetVerboseLevel() const; + // Level of warnings regarding eg energy conservation + // in field integration. + + inline G4double GetThresholdWarningEnergy() const; + inline G4double GetThresholdImportantEnergy() const; + inline G4int GetThresholdTrials() const; + + inline void SetThresholdWarningEnergy( G4double newEnWarn ); + inline void SetThresholdImportantEnergy( G4double newEnImp ); + inline void SetThresholdTrials(G4int newMaxTrials ); + + // Get/Set parameters for killing loopers: + // Above 'important' energy a 'looping' particle in field will + // *NOT* be abandoned, except after fThresholdTrials attempts. + // Below Warning energy, no verbosity for looping particles is issued + + inline G4double GetMaxEnergyKilled() const; + inline G4double GetSumEnergyKilled() const; + inline void ResetKilledStatistics( G4int report = 1); + // Statistics for tracks killed (currently due to looping in field) + + public: // without description + + void StartTracking(G4Track* aTrack); + + G4double AtRestGetPhysicalInteractionLength( + const G4Track& , + G4ForceCondition* + ) { return -1.0; }; + // No operation in AtRestDoIt. + + G4VParticleChange* AtRestDoIt( + const G4Track& , + const G4Step& + ) {return 0;}; + // No operation in AtRestDoIt. + + protected: + + G4bool DoesGlobalFieldExist(); + // Checks whether a field exists for the "global" field manager. + + void ReportInexactEnergy(G4double startEnergy, G4double endEnergy); + // Issue warning + + private: + + G4Navigator* fMassNavigator; + // The navigator for the 'mass' geometry (the real one, that physics occurs in) + G4PathFinder* fPathFinder; + G4int fNavigatorId; + // The PathFinder used to transport the particle + + G4PropagatorInField* fFieldPropagator; + // Still required in order to find/set the fieldmanager + + G4bool fStartedNewTrack; // True for first step or restarted tracking + // until first step's AlongStepGPIL + + G4ThreeVector fTransportEndPosition; + G4ThreeVector fTransportEndMomentumDir; + G4double fTransportEndKineticEnergy; + G4ThreeVector fTransportEndSpin; + G4bool fMomentumChanged; + G4bool fEnergyChanged; + // The particle's state after this Step, Store for DoIt + + G4bool fEndGlobalTimeComputed; + G4double fCandidateEndGlobalTime; + + G4bool fParticleIsLooping; + + G4ThreeVector fPreviousSftOrigin; + G4double fPreviousSafety; + + G4TouchableHandle fCurrentTouchableHandle; + + // G4bool fFieldExists; + // Whether a magnetic field exists ... + // A data member for this is problematic: it is useful only if it + // can be initialised and updated -- and a scheme is not yet possible. + + G4bool fGeometryLimitedStep; + // Flag to determine whether a boundary was reached. + + G4ParticleChangeForTransport fParticleChange; + // New ParticleChange + + G4double endpointDistance; + + // Verbosity + G4int fVerboseLevel; + // Verbosity level for warnings + // eg about energy non-conservation in magnetic field. +}; + +#include "G4CoupledTransportation.icc" + +#endif diff --git a/source/processes/transportation/include/G4CoupledTransportation.icc b/source/processes/transportation/include/G4CoupledTransportation.icc new file mode 100644 index 0000000000..2c52b332ad --- /dev/null +++ b/source/processes/transportation/include/G4CoupledTransportation.icc @@ -0,0 +1,129 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4CoupledTransportation.icc,v 1.2 2006/11/14 09:12:59 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// + +// +// +// Inline function implementation. +// +// ======================================================================= +// Created: 9 June 1998, J. Apostolakis +// ======================================================================= +// + +inline void +G4CoupledTransportation::SetPropagatorInField( G4PropagatorInField* pFieldPropagator) +{ + fFieldPropagator= pFieldPropagator; +} + +inline G4PropagatorInField* G4CoupledTransportation::GetPropagatorInField() +{ + return fFieldPropagator; +} + +inline G4bool G4CoupledTransportation::DoesGlobalFieldExist() +{ + G4TransportationManager* transportMgr; + transportMgr= G4TransportationManager::GetTransportationManager(); + + // fFieldExists= transportMgr->GetFieldManager()->DoesFieldExist(); + // return fFieldExists; + return transportMgr->GetFieldManager()->DoesFieldExist(); +} + +inline void G4CoupledTransportation::SetVerboseLevel( G4int verboseLev ) +{ + fVerboseLevel= verboseLev; +} + +inline G4int G4CoupledTransportation::GetVerboseLevel( ) const +{ + return fVerboseLevel; +} + +#if 0 +inline G4double G4CoupledTransportation::GetThresholdWarningEnergy() const +{ + return fThreshold_Warning_Energy; +} + +inline G4double G4CoupledTransportation::GetThresholdImportantEnergy() const +{ + return fThreshold_Important_Energy; +} + +inline G4int G4CoupledTransportation::GetThresholdTrials() const +{ + return fThresholdTrials; +} + +inline void G4CoupledTransportation::SetThresholdWarningEnergy( G4double newEnWarn ) +{ + fThreshold_Warning_Energy= newEnWarn; +} + +inline void G4CoupledTransportation::SetThresholdImportantEnergy( G4double newEnImp ) +{ + fThreshold_Important_Energy = newEnImp; +} + +inline void G4CoupledTransportation::SetThresholdTrials(G4int newMaxTrials ) +{ + fThresholdTrials = newMaxTrials; +} + // Get/Set parameters for killing loopers: + // Above 'important' energy a 'looping' particle in field will + // *NOT* be abandoned, except after fThresholdTrials attempts. + // Below Warning energy, no verbosity for looping particles is issued + +inline G4double G4CoupledTransportation::GetMaxEnergyKilled() const +{ + return fMaxEnergyKilled; +} + +inline G4double G4CoupledTransportation::GetSumEnergyKilled() const +{ + return fSumEnergyKilled; +} + +inline void G4CoupledTransportation::ResetKilledStatistics(G4int report) +{ + if( report ) { + G4cout << " G4CoupledTransportation: Statistics for looping particles " << G4endl; + G4cout << " Sum of energy of loopers killed: " << fSumEnergyKilled << G4endl; + G4cout << " Max energy of loopers killed: " << fMaxEnergyKilled << G4endl; + } + + fSumEnergyKilled= 0; + fMaxEnergyKilled= -1.0*GeV; +} + // Statistics for tracks killed (currently due to looping in field) +#endif + diff --git a/source/processes/transportation/include/G4MImportanceConfigurator.hh b/source/processes/transportation/include/G4MImportanceConfigurator.hh index 567083567c..0ad1677bfb 100644 --- a/source/processes/transportation/include/G4MImportanceConfigurator.hh +++ b/source/processes/transportation/include/G4MImportanceConfigurator.hh @@ -25,7 +25,7 @@ // // // $Id: G4MImportanceConfigurator.hh,v 1.6 2006/06/29 21:09:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4MImportanceConfigurator diff --git a/source/processes/transportation/include/G4MScoreConfigurator.hh b/source/processes/transportation/include/G4MScoreConfigurator.hh index 7bd9830c3f..be1d7c522f 100644 --- a/source/processes/transportation/include/G4MScoreConfigurator.hh +++ b/source/processes/transportation/include/G4MScoreConfigurator.hh @@ -25,7 +25,7 @@ // // // $Id: G4MScoreConfigurator.hh,v 1.6 2006/06/29 21:09:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4MScoreConfigurator diff --git a/source/processes/transportation/include/G4MScoreProcess.hh b/source/processes/transportation/include/G4MScoreProcess.hh index 26e090a2a0..8e47e10f17 100644 --- a/source/processes/transportation/include/G4MScoreProcess.hh +++ b/source/processes/transportation/include/G4MScoreProcess.hh @@ -25,7 +25,7 @@ // // // $Id: G4MScoreProcess.hh,v 1.9 2006/06/29 21:09:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4MScoreProcess diff --git a/source/processes/transportation/include/G4MWeightWindowConfigurator.hh b/source/processes/transportation/include/G4MWeightWindowConfigurator.hh index fcca7a29b7..0d8f2db01f 100644 --- a/source/processes/transportation/include/G4MWeightWindowConfigurator.hh +++ b/source/processes/transportation/include/G4MWeightWindowConfigurator.hh @@ -25,7 +25,7 @@ // // // $Id: G4MWeightWindowConfigurator.hh,v 1.6 2006/06/29 21:09:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4MWeightWindowConfigurator diff --git a/source/processes/transportation/include/G4MassGCellFinder.hh b/source/processes/transportation/include/G4MassGCellFinder.hh index 9b440cb163..1dfa7d04c6 100644 --- a/source/processes/transportation/include/G4MassGCellFinder.hh +++ b/source/processes/transportation/include/G4MassGCellFinder.hh @@ -25,7 +25,7 @@ // // // $Id: G4MassGCellFinder.hh,v 1.3 2006/06/29 21:09:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4ParallelGCellFinder diff --git a/source/processes/transportation/include/G4MassGeometrySampler.hh b/source/processes/transportation/include/G4MassGeometrySampler.hh index 528aa1f00c..b7f3b4ede8 100644 --- a/source/processes/transportation/include/G4MassGeometrySampler.hh +++ b/source/processes/transportation/include/G4MassGeometrySampler.hh @@ -25,7 +25,7 @@ // // // $Id: G4MassGeometrySampler.hh,v 1.7 2006/06/29 21:09:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4MassGeometrySampler diff --git a/source/processes/transportation/include/G4MassImportanceProcess.hh b/source/processes/transportation/include/G4MassImportanceProcess.hh index abd02b9e25..2d1abe84b4 100644 --- a/source/processes/transportation/include/G4MassImportanceProcess.hh +++ b/source/processes/transportation/include/G4MassImportanceProcess.hh @@ -25,7 +25,7 @@ // // // $Id: G4MassImportanceProcess.hh,v 1.10 2006/06/29 21:09:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4MassImportanceProcess diff --git a/source/processes/transportation/include/G4MassWeightWindowProcess.hh b/source/processes/transportation/include/G4MassWeightWindowProcess.hh index 258f80669d..a184bc519c 100644 --- a/source/processes/transportation/include/G4MassWeightWindowProcess.hh +++ b/source/processes/transportation/include/G4MassWeightWindowProcess.hh @@ -25,7 +25,7 @@ // // // $Id: G4MassWeightWindowProcess.hh,v 1.5 2006/06/29 21:09:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4MassWeioghtWindowProcess diff --git a/source/processes/transportation/include/G4NeutronKiller.hh b/source/processes/transportation/include/G4NeutronKiller.hh new file mode 100644 index 0000000000..152f82987b --- /dev/null +++ b/source/processes/transportation/include/G4NeutronKiller.hh @@ -0,0 +1,141 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4NeutronKiller.hh,v 1.1 2006/11/17 15:53:04 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +//--------------------------------------------------------------------------- +// +// ClassName: G4NeutronKiller +// +// Description: The process to kill neutrons to save CPU +// +// Author: V.Ivanchenko 26/09/00 for HARP software +// +//---------------------------------------------------------------------------- +// +// Class description: +// +// G4NeutronKiller allows to remove unwanted neutrons from simulation in +// order to improve CPU performance. There are two parameters: +// +// 1) low energy threshold for neutron kinetic energy (default 0) +// 2) time limit for neutron track (default DBL_MAX) +// +// These parameters can be changed via Set methods or by UI commands: +// /physics_engine/neutron/energyCut +// /physics_engine/neutron/timeLimit +// +// If a neutron track is killed no energy deposition is added to the step +// + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#ifndef NeutronKiller_h +#define NeutronKiller_h 1 + +#include "globals.hh" +#include "G4VDiscreteProcess.hh" +#include "G4ParticleDefinition.hh" +#include "G4Step.hh" +#include "G4Track.hh" + +class G4NeutronKillerMessenger; + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +class G4NeutronKiller : public G4VDiscreteProcess +{ +public: + + G4NeutronKiller(const G4String& processName = "nKiller", + G4ProcessType aType = fNotDefined); + + virtual ~G4NeutronKiller(); + + G4bool IsApplicable(const G4ParticleDefinition&); + + void SetTimeLimit(G4double); + + void SetKinEnergyLimit(G4double); + + G4double PostStepGetPhysicalInteractionLength( const G4Track& track, + G4double previousStepSize, + G4ForceCondition* condition); + + G4VParticleChange* PostStepDoIt(const G4Track&, const G4Step&); + + G4double GetMeanFreePath(const G4Track&, G4double,G4ForceCondition*); + +private: + + // hide assignment operator as private + G4NeutronKiller(const G4NeutronKiller&); + G4NeutronKiller& operator = (const G4NeutronKiller &right); + + G4double kinEnergyThreshold; + G4double timeThreshold; + + G4NeutronKillerMessenger* pMess; +}; + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +inline G4double G4NeutronKiller::PostStepGetPhysicalInteractionLength( + const G4Track& aTrack, + G4double, G4ForceCondition* condition) +{ + // condition is set to "Not Forced" + *condition = NotForced; + + G4double limit = DBL_MAX; + if(aTrack.GetGlobalTime() > timeThreshold || + aTrack.GetKineticEnergy() < kinEnergyThreshold) limit = 0.0; + return limit; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +inline G4double G4NeutronKiller::GetMeanFreePath(const G4Track&,G4double, + G4ForceCondition*) +{ + return DBL_MAX; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +inline G4VParticleChange* G4NeutronKiller::PostStepDoIt(const G4Track& aTrack, + const G4Step&) +{ + pParticleChange->Initialize(aTrack); + pParticleChange->ProposeTrackStatus(fStopAndKill); + return pParticleChange; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +#endif + diff --git a/examples/extended/medical/GammaTherapy/include/G4EmHadronBuilder71.hh b/source/processes/transportation/include/G4NeutronKillerMessenger.hh similarity index 65% rename from examples/extended/medical/GammaTherapy/include/G4EmHadronBuilder71.hh rename to source/processes/transportation/include/G4NeutronKillerMessenger.hh index 75e44d4de9..5228addf06 100644 --- a/examples/extended/medical/GammaTherapy/include/G4EmHadronBuilder71.hh +++ b/source/processes/transportation/include/G4NeutronKillerMessenger.hh @@ -23,45 +23,56 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// $Id: G4NeutronKillerMessenger.hh,v 1.1 2006/11/17 15:53:04 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // -// $Id: G4EmHadronBuilder71.hh,v 1.2 2006/06/29 17:26:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +//--------------------------------------------------------------------------- +// +// ClassName: G4NeutronKillerMessenger +// +// Description: Messenger class +// +// Author: V.Ivanchenko 26/09/00 for HARP software +// +//---------------------------------------------------------------------------- // //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#ifndef G4EmHadronBuilder71_h -#define G4EmHadronBuilder71_h 1 +#ifndef G4NeutronKillerMessenger_h +#define G4NeutronKillerMessenger_h 1 -#include "G4VPhysicsConstructor.hh" #include "globals.hh" +#include "G4UImessenger.hh" + +class G4NeutronKiller; +class G4UIdirectory; +class G4UIcmdWithADoubleAndUnit; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -class G4EmHadronBuilder71 : public G4VPhysicsConstructor +class G4NeutronKillerMessenger: public G4UImessenger { public: - G4EmHadronBuilder71(const G4String& name = "EM_stand_had"); - virtual ~G4EmHadronBuilder71(); - -public: - // This method is dummy for physics - virtual void ConstructParticle(); - - // This method will be invoked in the Construct() method. - // each physics process will be instantiated and - // registered to the process manager of each particle type - virtual void ConstructProcess(); + G4NeutronKillerMessenger(G4NeutronKiller*); + virtual ~G4NeutronKillerMessenger(); + + void SetNewValue(G4UIcommand*, G4String); + private: - // hide assignment operator - G4EmHadronBuilder71 & operator=(const G4EmHadronBuilder71 &right); - G4EmHadronBuilder71(const G4EmHadronBuilder71&); + // hide assignment operator as private + G4NeutronKillerMessenger(const G4NeutronKillerMessenger&); + G4NeutronKillerMessenger& operator = (const G4NeutronKillerMessenger &right); + G4NeutronKiller* killer; + + G4UIdirectory* dir; + G4UIcmdWithADoubleAndUnit* eCmd; + G4UIcmdWithADoubleAndUnit* tCmd; }; //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... #endif - diff --git a/source/processes/transportation/include/G4PImportanceConfigurator.hh b/source/processes/transportation/include/G4PImportanceConfigurator.hh index 34002d5415..e1bb736887 100644 --- a/source/processes/transportation/include/G4PImportanceConfigurator.hh +++ b/source/processes/transportation/include/G4PImportanceConfigurator.hh @@ -25,7 +25,7 @@ // // // $Id: G4PImportanceConfigurator.hh,v 1.6 2006/06/29 21:10:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4PImportanceConfigurator diff --git a/source/processes/transportation/include/G4PScoreConfigurator.hh b/source/processes/transportation/include/G4PScoreConfigurator.hh index 00b25ba9be..bd35da429a 100644 --- a/source/processes/transportation/include/G4PScoreConfigurator.hh +++ b/source/processes/transportation/include/G4PScoreConfigurator.hh @@ -25,7 +25,7 @@ // // // $Id: G4PScoreConfigurator.hh,v 1.6 2006/06/29 21:10:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4PScoreConfigurator diff --git a/source/processes/transportation/include/G4PScoreProcess.hh b/source/processes/transportation/include/G4PScoreProcess.hh index d10a564329..71c37e2a26 100644 --- a/source/processes/transportation/include/G4PScoreProcess.hh +++ b/source/processes/transportation/include/G4PScoreProcess.hh @@ -25,7 +25,7 @@ // // // $Id: G4PScoreProcess.hh,v 1.9 2006/06/29 21:10:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4PIScoreProcess diff --git a/source/processes/transportation/include/G4PWeightWindowConfigurator.hh b/source/processes/transportation/include/G4PWeightWindowConfigurator.hh index e827e70291..0c2ed47b57 100644 --- a/source/processes/transportation/include/G4PWeightWindowConfigurator.hh +++ b/source/processes/transportation/include/G4PWeightWindowConfigurator.hh @@ -25,7 +25,7 @@ // // // $Id: G4PWeightWindowConfigurator.hh,v 1.5 2006/06/29 21:10:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4PWeightWindowConfigurator diff --git a/source/processes/transportation/include/G4ParallelGCellFinder.hh b/source/processes/transportation/include/G4ParallelGCellFinder.hh index cf6cfce866..076a3a712f 100644 --- a/source/processes/transportation/include/G4ParallelGCellFinder.hh +++ b/source/processes/transportation/include/G4ParallelGCellFinder.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParallelGCellFinder.hh,v 1.3 2006/06/29 21:10:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4ParallelGCellFinder diff --git a/source/processes/transportation/include/G4ParallelGeometrySampler.hh b/source/processes/transportation/include/G4ParallelGeometrySampler.hh index af2a61c97a..2208ef204f 100644 --- a/source/processes/transportation/include/G4ParallelGeometrySampler.hh +++ b/source/processes/transportation/include/G4ParallelGeometrySampler.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParallelGeometrySampler.hh,v 1.8 2006/06/29 21:10:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4ParallelGeometrySampler diff --git a/source/processes/transportation/include/G4ParallelImportanceProcess.hh b/source/processes/transportation/include/G4ParallelImportanceProcess.hh index 7890119684..bd93dfe014 100644 --- a/source/processes/transportation/include/G4ParallelImportanceProcess.hh +++ b/source/processes/transportation/include/G4ParallelImportanceProcess.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParallelImportanceProcess.hh,v 1.12 2006/06/29 21:10:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4ParallelImportanceProcess diff --git a/source/processes/transportation/include/G4ParallelTransport.hh b/source/processes/transportation/include/G4ParallelTransport.hh index f49e02bcc2..6c57d4ebe0 100644 --- a/source/processes/transportation/include/G4ParallelTransport.hh +++ b/source/processes/transportation/include/G4ParallelTransport.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParallelTransport.hh,v 1.10 2006/06/29 21:10:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4ParallelTransport diff --git a/source/processes/transportation/include/G4ParallelTransportConfigurator.hh b/source/processes/transportation/include/G4ParallelTransportConfigurator.hh index d400c802a4..150d5d126c 100644 --- a/source/processes/transportation/include/G4ParallelTransportConfigurator.hh +++ b/source/processes/transportation/include/G4ParallelTransportConfigurator.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParallelTransportConfigurator.hh,v 1.5 2006/06/29 21:10:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4ParallelTransportConfigurator diff --git a/source/processes/transportation/include/G4ParallelWWnTransportProcess.hh b/source/processes/transportation/include/G4ParallelWWnTransportProcess.hh index d725c4b9cc..95604e243b 100644 --- a/source/processes/transportation/include/G4ParallelWWnTransportProcess.hh +++ b/source/processes/transportation/include/G4ParallelWWnTransportProcess.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParallelWWnTransportProcess.hh,v 1.5 2006/06/29 21:10:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4ParallelWWnTransportProcess diff --git a/source/processes/transportation/include/G4ParallelWeightWindowProcess.hh b/source/processes/transportation/include/G4ParallelWeightWindowProcess.hh index 63a6ca0e93..563f654bbf 100644 --- a/source/processes/transportation/include/G4ParallelWeightWindowProcess.hh +++ b/source/processes/transportation/include/G4ParallelWeightWindowProcess.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParallelWeightWindowProcess.hh,v 1.10 2006/06/29 21:10:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4ParallelWeightWindowProcess diff --git a/source/processes/transportation/include/G4PlaceOfAction.hh b/source/processes/transportation/include/G4PlaceOfAction.hh index 628f457786..dd6ca17036 100644 --- a/source/processes/transportation/include/G4PlaceOfAction.hh +++ b/source/processes/transportation/include/G4PlaceOfAction.hh @@ -25,7 +25,7 @@ // // // $Id: G4PlaceOfAction.hh,v 1.4 2006/06/29 21:10:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4PlaceOfAction diff --git a/source/processes/transportation/include/G4ProcessPlacer.hh b/source/processes/transportation/include/G4ProcessPlacer.hh index 09e54ea690..03bbf2cc5d 100644 --- a/source/processes/transportation/include/G4ProcessPlacer.hh +++ b/source/processes/transportation/include/G4ProcessPlacer.hh @@ -25,7 +25,7 @@ // // // $Id: G4ProcessPlacer.hh,v 1.8 2006/06/29 21:10:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4ProcessPlacer diff --git a/source/processes/transportation/include/G4SamplingPostStepAction.hh b/source/processes/transportation/include/G4SamplingPostStepAction.hh index 2bba6212e1..00bf16af54 100644 --- a/source/processes/transportation/include/G4SamplingPostStepAction.hh +++ b/source/processes/transportation/include/G4SamplingPostStepAction.hh @@ -25,7 +25,7 @@ // // // $Id: G4SamplingPostStepAction.hh,v 1.2 2006/06/29 21:10:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4SamplingPostStepAction diff --git a/source/processes/transportation/include/G4StepLimiter.hh b/source/processes/transportation/include/G4StepLimiter.hh index 6ecd561910..5b686eae10 100644 --- a/source/processes/transportation/include/G4StepLimiter.hh +++ b/source/processes/transportation/include/G4StepLimiter.hh @@ -25,7 +25,7 @@ // // // $Id: G4StepLimiter.hh,v 1.3 2006/06/29 21:10:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class description // diff --git a/source/processes/transportation/include/G4TrackTerminator.hh b/source/processes/transportation/include/G4TrackTerminator.hh index 2a0a6c17ef..8ae23936ef 100644 --- a/source/processes/transportation/include/G4TrackTerminator.hh +++ b/source/processes/transportation/include/G4TrackTerminator.hh @@ -25,7 +25,7 @@ // // // $Id: G4TrackTerminator.hh,v 1.3 2006/06/29 21:10:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4TrackTerminator diff --git a/source/processes/transportation/include/G4Transportation.hh b/source/processes/transportation/include/G4Transportation.hh index 889a965ee6..7adf31cda8 100644 --- a/source/processes/transportation/include/G4Transportation.hh +++ b/source/processes/transportation/include/G4Transportation.hh @@ -25,7 +25,7 @@ // // // $Id: G4Transportation.hh,v 1.12 2006/06/29 21:10:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/processes/transportation/include/G4Transportation.icc b/source/processes/transportation/include/G4Transportation.icc index 4677fbd06a..9645f9709d 100644 --- a/source/processes/transportation/include/G4Transportation.icc +++ b/source/processes/transportation/include/G4Transportation.icc @@ -25,7 +25,7 @@ // // // $Id: G4Transportation.icc,v 1.9 2006/06/29 21:10:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/processes/transportation/include/G4UserSpecialCuts.hh b/source/processes/transportation/include/G4UserSpecialCuts.hh index c8ab1b95b7..6f6c8bb921 100644 --- a/source/processes/transportation/include/G4UserSpecialCuts.hh +++ b/source/processes/transportation/include/G4UserSpecialCuts.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4UserSpecialCuts.hh,v 1.10 2006/06/29 21:10:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class description // diff --git a/source/processes/transportation/include/G4VProcessPlacer.hh b/source/processes/transportation/include/G4VProcessPlacer.hh index db0b486601..dc7324cd8c 100644 --- a/source/processes/transportation/include/G4VProcessPlacer.hh +++ b/source/processes/transportation/include/G4VProcessPlacer.hh @@ -25,7 +25,7 @@ // // // $Id: G4VProcessPlacer.hh,v 1.9 2006/06/29 21:10:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4VProcessPlacer diff --git a/source/processes/transportation/include/G4VSampler.hh b/source/processes/transportation/include/G4VSampler.hh index 956c5f7c45..07a75a038f 100644 --- a/source/processes/transportation/include/G4VSampler.hh +++ b/source/processes/transportation/include/G4VSampler.hh @@ -25,7 +25,7 @@ // // // $Id: G4VSampler.hh,v 1.10 2006/06/29 21:10:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4VSampler diff --git a/source/processes/transportation/include/G4VSamplerConfigurator.hh b/source/processes/transportation/include/G4VSamplerConfigurator.hh index 145b2d6026..ba47ccda53 100644 --- a/source/processes/transportation/include/G4VSamplerConfigurator.hh +++ b/source/processes/transportation/include/G4VSamplerConfigurator.hh @@ -25,7 +25,7 @@ // // // $Id: G4VSamplerConfigurator.hh,v 1.7 2006/06/29 21:10:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4VSamplerConfigurator diff --git a/source/processes/transportation/include/G4VTrackTerminator.hh b/source/processes/transportation/include/G4VTrackTerminator.hh index bad31a529d..eb7c97b260 100644 --- a/source/processes/transportation/include/G4VTrackTerminator.hh +++ b/source/processes/transportation/include/G4VTrackTerminator.hh @@ -25,7 +25,7 @@ // // // $Id: G4VTrackTerminator.hh,v 1.6 2006/06/29 21:10:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4VTrackTerminator diff --git a/source/processes/transportation/include/G4WeightCutOffConfigurator.hh b/source/processes/transportation/include/G4WeightCutOffConfigurator.hh index fd2ab8fc9c..4c10a2c863 100644 --- a/source/processes/transportation/include/G4WeightCutOffConfigurator.hh +++ b/source/processes/transportation/include/G4WeightCutOffConfigurator.hh @@ -25,7 +25,7 @@ // // // $Id: G4WeightCutOffConfigurator.hh,v 1.5 2006/06/29 21:10:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4WeightCutOffConfigurator diff --git a/source/processes/transportation/include/G4WeightCutOffProcess.hh b/source/processes/transportation/include/G4WeightCutOffProcess.hh index 875bd66df8..af96e836eb 100644 --- a/source/processes/transportation/include/G4WeightCutOffProcess.hh +++ b/source/processes/transportation/include/G4WeightCutOffProcess.hh @@ -25,7 +25,7 @@ // // // $Id: G4WeightCutOffProcess.hh,v 1.4 2006/06/29 21:10:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4WeightCutOffProcess diff --git a/source/processes/transportation/src/G4CoupledTransportation.cc b/source/processes/transportation/src/G4CoupledTransportation.cc new file mode 100644 index 0000000000..1cdbe0212b --- /dev/null +++ b/source/processes/transportation/src/G4CoupledTransportation.cc @@ -0,0 +1,772 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4CoupledTransportation.cc,v 1.12 2006/11/22 18:41:44 japost Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// ------------------------------------------------------------ +// GEANT 4 class implementation +// ======================================================================= +// Modified: +// +// Created: 13 May 2006, J. Apostolakis, based on G4Transportation +// ======================================================================= + +#include "G4CoupledTransportation.hh" +#include "G4ProductionCutsTable.hh" +#include "G4ParticleTable.hh" +#include "G4ChordFinder.hh" +class G4VSensitiveDetector; + +////////////////////////////////////////////////////////////////////////// +// +// Constructor + +G4CoupledTransportation::G4CoupledTransportation( G4int verboseLevel ) + : G4VProcess( G4String("CoupledTransportation"), fTransportation ), + fParticleIsLooping( false ), + fPreviousSftOrigin (0.,0.,0.), + fPreviousSafety ( 0.0 ), +#ifdef LOOPERS + fThreshold_Warning_Energy( 100 * MeV ), + fThreshold_Important_Energy( 250 * MeV ), + fThresholdTrials( 10 ), + fUnimportant_Energy( 1 * MeV ), + fNoLooperTrials(0), + fSumEnergyKilled( 0.0 ), fMaxEnergyKilled( 0.0 ), +#endif + fVerboseLevel(verboseLevel) // ( verboseLevel ? verboseLevel : 2 ) +{ + G4TransportationManager* transportMgr ; + + transportMgr = G4TransportationManager::GetTransportationManager() ; + + fMassNavigator = transportMgr->GetNavigatorForTracking() ; + fFieldPropagator = transportMgr->GetPropagatorInField() ; + // fGlobalFieldMgr = transportMgr->GetFieldManager() ; + fNavigatorId= transportMgr->ActivateNavigator( fMassNavigator ); + if( fVerboseLevel > 0 ){ + G4cout << " G4CoupledTransportation constructor: ----- " << G4endl; + G4cout << " Verbose level is " << fVerboseLevel << G4endl; + G4cout << " Navigator Id obtained in G4CoupledTransportation constructor " + << fNavigatorId << G4endl; + } + fPathFinder= G4PathFinder::GetInstance(); + + fCurrentTouchableHandle = G4TouchableHandle( 0 ); // new G4TouchableHistory(); + + fStartedNewTrack= true; + + // fEndGlobalTimeComputed = false; + // fCandidateEndGlobalTime = 0; +} + +////////////////////////////////////////////////////////////////////////// + +G4CoupledTransportation::~G4CoupledTransportation() +{ + // fCurrentTouchableHandle is a data member - no deletion required + +} + +////////////////////////////////////////////////////////////////////////// +// +// Responsibilities: +// Find whether the geometry limits the Step, and to what length +// Calculate the new value of the safety and return it. +// Store the final time, position and momentum. + +G4double G4CoupledTransportation:: +AlongStepGetPhysicalInteractionLength( const G4Track& track, + G4double, // previousStepSize + G4double currentMinimumStep, + G4double& proposedSafetyForStart, + G4GPILSelection* selection ) +{ + G4double geometryStepLength; + G4double startMassSafety= 0.0; // estimated safety for start point (mass geometry) + G4double startFullSafety= 0.0; // estimated safety for start point (all geometries) + G4double safetyProposal= -1.0; // local copy of proposal + + G4ThreeVector EndUnitMomentum ; + G4double lengthAlongCurve=0.0 ; + + fParticleIsLooping = false ; + + // Initial actions moved to StartTrack() + // -------------------------------------- + // Note: in case another process changes touchable handle + // it will be necessary to add here (for all steps) + // fCurrentTouchableHandle = aTrack->GetTouchableHandle(); + + // GPILSelection is set to defaule value of CandidateForSelection + // It is a return value + // + *selection = CandidateForSelection ; + + // Get initial Energy/Momentum of the track + // + const G4DynamicParticle* pParticle = track.GetDynamicParticle() ; + const G4ParticleDefinition* pParticleDef = pParticle->GetDefinition() ; + G4ThreeVector startMomentumDir = pParticle->GetMomentumDirection() ; + G4ThreeVector startPosition = track.GetPosition() ; + G4VPhysicalVolume* currentVolume= track.GetVolume(); + + if( fVerboseLevel > 1 ) { + G4cout << "G4CoupledTransportation::AlongStepGPIL> called in volume " + << currentVolume->GetName() << G4endl; + } + // G4double theTime = track.GetGlobalTime() ; + + if( fStartedNewTrack || track.GetCurrentStepNumber()==1 ) { + // fPathFinder->Locate( startPosition, startMomentumDir ); // -- out from G480 + fCurrentTouchableHandle = track.GetTouchableHandle(); // out G480 ?? + } + fStartedNewTrack= false; + + // The Step Point safety can be limited by other geometries and/or the + // assumptions of any process - it's not always the geometrical safety. + // We calculate the starting point's isotropic safety here. + // + G4ThreeVector OriginShift = startPosition - fPreviousSftOrigin ; + G4double MagSqShift = OriginShift.mag2() ; + startMassSafety = 0.0; + startFullSafety= 0.0; + if( MagSqShift < sqr(fPreviousSafety) ) { + startMassSafety = fPreviousSafety - std::sqrt(MagSqShift) ; + + // Only compute full safety if massSafety > 0. Else it remains 0 + startFullSafety = fPathFinder->ComputeSafety( startPosition ); + } + + // Is the particle charged ? + // + G4double particleCharge = pParticle->GetCharge() ; + + // fEndGlobalTimeComputed = false ; + + // There is no need to locate the current volume. It is Done elsewhere: + // On track construction + // By the tracking, after all AlongStepDoIts, in "Relocation" + // Check whether the particle have an (EM) field force exerting upon it + // + G4FieldManager* fieldMgr=0; + if( (particleCharge != 0.0) ) // || (magneticMoment != 0.0 ) ) + { + fieldMgr= fFieldPropagator->FindAndSetFieldManager( currentVolume ); + if (fieldMgr != 0) { + // Message the field Manager, to configure it for this track + fieldMgr->ConfigureForTrack( &track ); + } + // the PathFinder will recognise whether the field exerts force + } + G4double momentumMagnitude = pParticle->GetTotalMomentum() ; + G4double restMass = pParticleDef->GetPDGMass() ; + + fFieldPropagator->SetChargeMomentumMass( particleCharge, // in e+ units + momentumMagnitude, // in Mev/c + restMass ) ; + + + G4ThreeVector spin = track.GetPolarization() ; + G4FieldTrack theFieldTrack = G4FieldTrack( startPosition, + track.GetMomentumDirection(), + 0.0, + track.GetKineticEnergy(), + restMass, + 0.0, // UNUSED: track.GetVelocity(), + track.GetGlobalTime(), // Lab. + track.GetProperTime(), // Part. + &spin ) ; + theFieldTrack.SetChargeAndMoments( particleCharge ); // EM moments -- future extension + + G4int stepNo= track.GetCurrentStepNumber(); + + ELimited limitedStep; + G4FieldTrack endTrackState('a'); // Default values + + fGeometryLimitedStep = false ; // default + if( currentMinimumStep > 0 ) { + G4double newMassSafety= 0.0; // temp. for recalculation + + // Do the Transport in the field (non recti-linear) + // + lengthAlongCurve = fPathFinder->ComputeStep( theFieldTrack, + currentMinimumStep, + fNavigatorId, + stepNo, + newMassSafety, + limitedStep, + endTrackState, + currentVolume ) ; + // G4cout << " PathFinder ComputeStep returns " << lengthAlongCurve << G4endl; + + if( limitedStep == kUnique || limitedStep == kSharedTransport ) { + fGeometryLimitedStep = true ; + } + if( lengthAlongCurve < currentMinimumStep){ + geometryStepLength = lengthAlongCurve ; + // Old code: fGeometryLimitedStep = true ; + } else { + geometryStepLength = currentMinimumStep ; + } + + // Momentum: Magnitude and direction can be changed too now ... + // + fMomentumChanged = true ; + fTransportEndMomentumDir = endTrackState.GetMomentumDir() ; + + // Remember last safety origin & value. + fPreviousSftOrigin = startPosition ; + fPreviousSafety = newMassSafety ; + + if( fVerboseLevel > 1 ){ + G4cout << "G4CoupledTransport:CompStep> " + << " called the pathfinder for a new step at " << startPosition + << " and obtained step = " << lengthAlongCurve << G4endl; + G4cout << " New safety (preStep) = " << newMassSafety + << " versus precalculated = " << startMassSafety << G4endl; + } + + // Store as best estimate value + startMassSafety = newMassSafety ; + + // Get the End-Position and End-Momentum (Dir-ection) + fTransportEndPosition = endTrackState.GetPosition() ; + fTransportEndKineticEnergy = endTrackState.GetKineticEnergy() ; + } else { + geometryStepLength = lengthAlongCurve= 0.0 ; + fMomentumChanged = false ; + // fGeometryLimitedStep = false ; // --- ??? + fTransportEndMomentumDir = track.GetMomentumDirection(); + fTransportEndKineticEnergy = track.GetKineticEnergy(); + + // If the step length requested is 0, and we are on a boundary + // then a boundary will also limit the step. + if( startMassSafety == 0.0 ) fGeometryLimitedStep = true ; + // TODO: Add explicit logical status for being at a boundary + } + // G4FieldTrack aTrackState(endTrackState); + + if( fVerboseLevel > 1 ){ + G4cout << " G4CT::CS End Position = " << fTransportEndPosition << G4endl; + G4cout << " G4CT::CS End Direction = " << fTransportEndMomentumDir << G4endl; + } + +#if 0 + if( fFieldPropagator->GetCurrentFieldManager()->DoesFieldChangeEnergy() ) + { + // If the field can change energy, then the time must be integrated + // - so this should have been updated + // + fCandidateEndGlobalTime = endTrackState.GetLabTimeOfFlight(); + fEndGlobalTimeComputed = true; + + // was ( fCandidateEndGlobalTime != track.GetGlobalTime() ); + // a cleaner way is to have FieldTrack knowing whether time is updated. + } + else +#endif + { + // The energy should be unchanged by field transport, + // - so the time changed will be calculated elsewhere + // + fEndGlobalTimeComputed = false; + + // Check that the integration preserved the energy + // - and if not correct this! + G4double startEnergy= track.GetKineticEnergy(); + G4double endEnergy= fTransportEndKineticEnergy; + + static G4int no_inexact_steps=0; // , no_large_ediff; + G4double absEdiff = std::fabs(startEnergy- endEnergy); + if( absEdiff > perMillion * endEnergy ) { + no_inexact_steps++; + // Possible statistics keeping here ... + } + if( (fVerboseLevel > 1) && ( absEdiff > perThousand * endEnergy) ) + { + ReportInexactEnergy(startEnergy, endEnergy); + + } // end of if (fVerboseLevel) + + // Correct the energy for fields that conserve it + // This - hides the integration error + // - but gives a better physical answer + fTransportEndKineticEnergy= track.GetKineticEnergy(); + } + + endpointDistance = (fTransportEndPosition - startPosition).mag() ; + // fParticleIsLooping = fFieldPropagator->IsParticleLooping() ; + + fTransportEndSpin = endTrackState.GetSpin(); + + // Calculate the safety + safetyProposal= startFullSafety; // used to be startMassSafety + // Changed to accomodate processes that cannot update the safety -- JA 22 Nov 06 + + // Update safety for the end-point, if becomes negative at the end-point. + // To-Try: No safety update if at a boundary + if( startFullSafety < endpointDistance ) // && !fGeometryLimitedStep ) + { + G4double endFullSafety = + fPathFinder->ComputeSafety( fTransportEndPosition); + // Expected mission -- only mass geometry's safety + // fMassNavigator->ComputeSafety( fTransportEndPosition) ; + // Yet discrete processes only have poststep -- and this cannot + // currently revise the safety + // ==> so we use the all-geometry safety as a precaution + + G4double endMassSafety= fMassNavigator->ComputeSafety( fTransportEndPosition) ; + fPreviousSafety = endMassSafety ; + fPreviousSftOrigin = fTransportEndPosition ; + + // The convention (Stepping Manager's) is safety from the start point + // + safetyProposal = endFullSafety + endpointDistance; + // --> was endMassSafety + // #undef G4DEBUG_TRANSPORT + // #define G4DEBUG_TRANSPORT 1 + +#ifdef G4DEBUG_TRANSPORT + int prec= G4cout.precision(12) ; + G4cout << "***CoupledTransportation::AlongStepGPIL ** " << G4endl ; + G4cout << " Revised Safety at endpoint " << fTransportEndPosition + << " give safety values: Mass= " << endMassSafety + << " All= " << endFullSafety << G4endl ; + G4cout << " Adding endpoint distance " << endpointDistance + << " to obtain pseudo-safety= " << safetyProposal << G4endl ; + G4cout.precision(prec); + } + else{ + int prec= G4cout.precision(12) ; + G4cout << "***CoupledTransportation::AlongStepGPIL ** " << G4endl ; + G4cout << " Quick Safety estimate at endpoint " << fTransportEndPosition + << " gives safety endpoint value = " << startFullSafety - endpointDistance + << " using start-point value " << startFullSafety + << " and endpointDistance " << endpointDistance << G4endl; + G4cout.precision(prec); +#endif + } + + proposedSafetyForStart= safetyProposal; + fParticleChange.ProposeTrueStepLength(geometryStepLength) ; + + return geometryStepLength ; +} + +////////////////////////////////////////////////////////////////////////// + +G4VParticleChange* G4CoupledTransportation::AlongStepDoIt( const G4Track& track, + const G4Step& stepData ) +{ + static G4int noCalls=0; + static const G4ParticleDefinition* fOpticalPhoton = + G4ParticleTable::GetParticleTable()->FindParticle("opticalphoton"); + + noCalls++; + + fParticleChange.Initialize(track) ; + // sets all its members to the value of corresponding members in G4Track + + // Code specific for Transport + // + fParticleChange.ProposePosition(fTransportEndPosition) ; + // G4cout << " G4CoupledTransportation::AlongStepDoIt" + // << " proposes position = " << fTransportEndPosition + // << " and end momentum direction = " << fTransportEndMomentumDir << G4endl; + fParticleChange.ProposeMomentumDirection(fTransportEndMomentumDir) ; + fParticleChange.ProposeEnergy(fTransportEndKineticEnergy) ; + fParticleChange.SetMomentumChanged(fMomentumChanged) ; + + fParticleChange.ProposePolarization(fTransportEndSpin); + + G4double deltaTime = 0.0 ; + + // Calculate Lab Time of Flight (ONLY if field Equations used it!) + // G4double endTime = fCandidateEndGlobalTime; + // G4double delta_time = endTime - startTime; + + G4double startTime = track.GetGlobalTime() ; + + if (!fEndGlobalTimeComputed) + { + G4double finalInverseVel= DBL_MAX, initialInverseVel=DBL_MAX; + + // The time was not integrated .. make the best estimate possible + // + G4double finalVelocity = track.GetVelocity() ; + if( finalVelocity > 0.0 ) { finalInverseVel= 1.0 / finalVelocity; } + G4double initialVelocity = stepData.GetPreStepPoint()->GetVelocity() ; + if( initialVelocity > 0.0 ) { initialInverseVel= 1.0 / initialVelocity; } + G4double stepLength = track.GetStepLength() ; + + const G4DynamicParticle* fpDynamicParticle = track.GetDynamicParticle(); + if (fpDynamicParticle->GetDefinition()== fOpticalPhoton) + { + // A photon is in the medium of the final point + // during the step, so Peter says it has the final velocity. + deltaTime = stepLength * finalInverseVel ; + // G4cout << " dt = s * initV " << " s = " << stepLength + // << " finalV= " << finalInverseVel << G4endl; + } + else if (finalVelocity > 0.0) + { + // deltaTime = stepLength/finalVelocity ; + G4double meanInverseVelocity = 0.5 * ( initialInverseVel + finalInverseVel ); + deltaTime = stepLength * meanInverseVelocity ; + // G4cout << " dt = s * mean(1/v) , with " << " s = " << stepLength + // << " mean(1/v)= " << meanInverseVelocity << G4endl; + } + else + { + deltaTime = stepLength * initialInverseVel ; + // G4cout << " dt = s * initV " << " s = " << stepLength + // << " initV= " << initialInverseVel << G4endl; + } // Could do with better estimate for final step (finalVelocity = 0) ? + + fCandidateEndGlobalTime = startTime + deltaTime ; + + // G4cout << " Calculated global time from start = " << startTime << " and " + // << " delta time = " << deltaTime << G4endl; + } + else + { + deltaTime = fCandidateEndGlobalTime - startTime ; + // G4cout << " Calculated global time from candidate end time = " + // << fCandidateEndGlobalTime << " and start time = " << startTime << G4endl; + } + + // G4cout << " G4CoupledTransportation::AlongStepDoIt " + // << " flag whether computed time = " << fEndGlobalTimeComputed << " and " + // << " is proposes end time " << fCandidateEndGlobalTime << G4endl; + fParticleChange.ProposeGlobalTime( fCandidateEndGlobalTime ) ; + + // Now Correct by Lorentz factor to get "proper" deltaTime + + G4double restMass = track.GetDynamicParticle()->GetMass() ; + G4double deltaProperTime = deltaTime*( restMass/track.GetTotalEnergy() ) ; + + fParticleChange.ProposeProperTime(track.GetProperTime() + deltaProperTime) ; + //fParticleChange. ProposeTrueStepLength( track.GetStepLength() ) ; + +#if 0 + // If the particle is caught looping or is stuck (in very difficult + // boundaries) in a magnetic field (doing many steps) + // THEN this kills it ... + // + if ( fParticleIsLooping ) + { + G4double endEnergy= fTransportEndKineticEnergy; + +if( (endEnergy < fThreshold_Important_Energy) + || (fNoLooperTrials >= fThresholdTrials ) ){ + // Kill the looping particle + // + fParticleChange.ProposeTrackStatus( fStopAndKill ) ; + + // 'Bare' statistics + fSumEnergyKilled += endEnergy; + if( endEnergy > fMaxEnergyKilled) { fMaxEnergyKilled= endEnergy; } + +#ifdef G4VERBOSE + if( (fVerboseLevel > 1) || + ( endEnergy > fThreshold_Warning_Energy ) ) { + G4cout << " G4CoupledTransportation is killing track that is looping or stuck " + << G4endl + << " This track has " << track.GetKineticEnergy() / MeV + << " MeV energy." << G4endl; + } +#endif + fNoLooperTrials=0; + } else{ + fNoLooperTrials ++; + } + }else{ fNoLooperTrials=0; } +#endif + + // Another (sometimes better way) is to use a user-limit maximum Step size + // to alleviate this problem .. + + // Add smooth curved trajectories to particle-change + // + // fParticleChange.SetPointerToVectorOfAuxiliaryPoints + // (fFieldPropagator->GimmeTrajectoryVectorAndForgetIt() ); + + return &fParticleChange ; +} + +////////////////////////////////////////////////////////////////////////// +// +// This ensures that the PostStep action is always called, +// so that it can do the relocation if it is needed. +// + +G4double G4CoupledTransportation:: +PostStepGetPhysicalInteractionLength( const G4Track&, + G4double, // previousStepSize + G4ForceCondition* pForceCond ) +{ + // Must act as PostStep action -- to relocate particle + *pForceCond = Forced ; + return DBL_MAX ; +} + +static +void ReportMove( G4ThreeVector OldVector, G4ThreeVector NewVector, G4String& Quantity ) +{ + G4ThreeVector moveVec = ( NewVector - OldVector ); + + G4cerr << G4endl + << "**************************************************************" << G4endl; + G4cerr << "Endpoint has moved between value expected from TransportEndPosition " + << " and value from Track in PostStepDoIt. " << G4endl + << "Change of " << Quantity << " is " << moveVec.mag() / mm << " mm long, " + << " and its vector is " << (1.0/mm) * moveVec << " mm " << G4endl + << "Endpoint of ComputeStep was " << OldVector + << " and current position to locate is " << NewVector << G4endl; +} + +///////////////////////////////////////////////////////////////////////////// + +G4VParticleChange* G4CoupledTransportation::PostStepDoIt( const G4Track& track, + const G4Step& ) +{ + G4TouchableHandle retCurrentTouchable ; // The one to return + + // Initialize ParticleChange (by setting all its members equal + // to corresponding members in G4Track) + // fParticleChange.Initialize(track) ; // To initialise TouchableChange + + fParticleChange.ProposeTrackStatus(track.GetTrackStatus()) ; + + // Check that the end position and direction are preserved + // since call to AlongStepDoIt + if( (fTransportEndPosition - track.GetPosition()).mag2() >= 1.0e-16 ){ + static G4String EndLabelString("End of Step Position"); + ReportMove( track.GetPosition(), fTransportEndPosition, EndLabelString ); + G4cerr << " Problem in G4CoupledTransportation::PostStepDoIt " << G4endl; + } + + // If the Step was determined by the volume boundary, relocate the particle + // The pathFinder will know that the geometry limited the step (!?) + + if( fVerboseLevel > 0 ){ + G4cout << " Calling PathFinder::Locate() from " + << " G4CoupledTransportation::PostStepDoIt " << G4endl; + } + fPathFinder->Locate( track.GetPosition(), + track.GetMomentumDirection(), + true); + + if(fGeometryLimitedStep) + { + // fCurrentTouchable will now become the previous touchable, + // and what was the previous will be freed. + // (Needed because the preStepPoint can point to the previous touchable) + if( fVerboseLevel > 0 ) + G4cout << "G4CoupledTransportation::PostStepDoIt --- fNavigatorId = " + << fNavigatorId << G4endl; + + fCurrentTouchableHandle= + fPathFinder->CreateTouchableHandle( fNavigatorId ); + + // Check whether the particle is out of the world volume + // If so it has exited and must be killed. + // + if( fVerboseLevel > 1 ){ + G4VPhysicalVolume* vol= fCurrentTouchableHandle->GetVolume(); + G4cout << "CHECK !!!!!!!!!!! fCurrentTouchableHandle->GetVolume() = " << vol; + if( vol ) { G4cout << "Name=" << vol->GetName(); } + G4cout << G4endl; + } + if( fCurrentTouchableHandle->GetVolume() == 0 ) + { + fParticleChange.ProposeTrackStatus( fStopAndKill ) ; + } + retCurrentTouchable = fCurrentTouchableHandle ; + fParticleChange.SetTouchableHandle( fCurrentTouchableHandle ) ; + } + else // fGeometryLimitedStep is false + { + if( fVerboseLevel > 1 ){ + G4cout << "G4CoupledTransportation::PostStepDoIt -- fGeometryLimitedStep = false !!" + << G4endl; + } + // This serves only to move the Navigator's location + // + // fLinearNavigator->LocateGlobalPointWithinVolume( track.GetPosition() ) ; + + // Keep the value of the track's current Touchable is retained, + // and use it to overwrite the (unset) one in particle change. + // In general this is fCurrentTouchable, + // - yet could it be different at the start of a step ? + // + fParticleChange.SetTouchableHandle( track.GetTouchableHandle() ) ; + retCurrentTouchable = track.GetTouchableHandle() ; + } // endif ( fGeometryLimitedStep ) + + const G4VPhysicalVolume* pNewVol = retCurrentTouchable->GetVolume() ; + const G4Material* pNewMaterial = 0 ; + const G4VSensitiveDetector* pNewSensitiveDetector = 0 ; + + if( pNewVol != 0 ) + { + pNewMaterial= pNewVol->GetLogicalVolume()->GetMaterial(); + pNewSensitiveDetector= pNewVol->GetLogicalVolume()->GetSensitiveDetector(); + } + + // ( const_cast pNewMaterial ) ; + // ( const_cast pNewSensitiveDetector) ; + + fParticleChange.SetMaterialInTouchable( (G4Material *) pNewMaterial ) ; + fParticleChange.SetSensitiveDetectorInTouchable( (G4VSensitiveDetector *) pNewSensitiveDetector ) ; + // "temporarily" until Get/Set Material of ParticleChange, + // and StepPoint can be made const. + + const G4MaterialCutsCouple* pNewMaterialCutsCouple = 0; + if( pNewVol != 0 ) + { + pNewMaterialCutsCouple=pNewVol->GetLogicalVolume()->GetMaterialCutsCouple(); + if( pNewMaterialCutsCouple!=0 + && pNewMaterialCutsCouple->GetMaterial()!=pNewMaterial ) + { + // for parametrized volume + // + pNewMaterialCutsCouple = + G4ProductionCutsTable::GetProductionCutsTable() + ->GetMaterialCutsCouple(pNewMaterial, + pNewMaterialCutsCouple->GetProductionCuts()); + } + } + fParticleChange.SetMaterialCutsCoupleInTouchable( pNewMaterialCutsCouple ); + + // Must always set the touchable in ParticleChange, whether relocated or not + fParticleChange.SetTouchableHandle(retCurrentTouchable) ; + + return &fParticleChange ; +} + +// New method takes over the responsibility to reset the state of +// G4CoupledTransportation object: +// - at the start of a new track, and +// - on the resumption of a suspended track. + +void +G4CoupledTransportation::StartTracking(G4Track* aTrack) +{ + + static G4TransportationManager* transportMgr= + G4TransportationManager::GetTransportationManager(); + + // G4VProcess::StartTracking(aTrack); + + // The 'initialising' actions + // once taken in AlongStepGPIL -- if ( track.GetCurrentStepNumber()==1 ) + + fStartedNewTrack= true; + + fMassNavigator = transportMgr->GetNavigatorForTracking() ; + fNavigatorId= transportMgr->ActivateNavigator( fMassNavigator ); // Confirm it! + + if( fVerboseLevel > 1 ){ + G4cout << " Navigator Id obtained in StartTracking " << fNavigatorId << G4endl; + } + G4ThreeVector position = aTrack->GetPosition(); + G4ThreeVector direction = aTrack->GetMomentumDirection(); // G48 + + // if( fVerboseLevel > 1 ){ + // G4cout << " Calling PathFinder::PrepareNewTrack from " + // << " G4CoupledTransportation::StartTracking -- which calls Locate()" << G4endl; + // } + fPathFinder->PrepareNewTrack( position, direction); + // This implies a call to fPathFinder->Locate( position, direction ); + + // reset safety value and center + // + fPreviousSafety = 0.0 ; + fPreviousSftOrigin = G4ThreeVector(0.,0.,0.) ; + +#if LOOPERS // For now dont check loopers + // reset looping counter -- for motion in field // Needed in 8.x - G480 + if( aTrack->GetCurrentStepNumber()==1 ) { + fNoLooperTrials= 0; + } +#endif + + // ChordFinder reset internal state + // + if( DoesGlobalFieldExist() ) { + G4ChordFinder* chordF= fFieldPropagator->GetChordFinder(); + if( chordF ) chordF->ResetStepEstimate(); + } + + if( fVerboseLevel > 1 ){ + G4cout << " Returning touchable handle " << fCurrentTouchableHandle << G4endl; + } + + // Update the current touchable handle (from the track's) + // + fCurrentTouchableHandle = aTrack->GetTouchableHandle(); // G480 +} + +void +G4CoupledTransportation:: +ReportInexactEnergy(G4double startEnergy, G4double endEnergy) +{ + static G4int no_warnings= 0, warnModulo=1, moduloFactor= 10, no_large_ediff= 0; + + if( std::fabs(startEnergy- endEnergy) > perThousand * endEnergy ) + { + no_large_ediff ++; + if( (no_large_ediff% warnModulo) == 0 ) + { + no_warnings++; + G4cout << "WARNING - G4CoupledTransportation::AlongStepGetPIL() " + << " Energy change in Step is above 1^-3 relative value. " << G4endl + << " Relative change in 'tracking' step = " + << std::setw(15) << (endEnergy-startEnergy)/startEnergy << G4endl + << " Starting E= " << std::setw(12) << startEnergy / MeV << " MeV " << G4endl + << " Ending E= " << std::setw(12) << endEnergy / MeV << " MeV " << G4endl; + G4cout << " Energy has been corrected -- however, review" + << " field propagation parameters for accuracy." << G4endl; + if( (fVerboseLevel > 2 ) || (no_warnings<4) || (no_large_ediff == warnModulo * moduloFactor) ){ + G4cout << " These include EpsilonStepMax(/Min) in G4FieldManager " + << " which determine fractional error per step for integrated quantities. " << G4endl + << " Note also the influence of the permitted number of integration steps." + << G4endl; + } + G4cerr << "ERROR - G4CoupledTransportation::AlongStepGetPIL()" << G4endl + << " Bad 'endpoint'. Energy change detected" + << " and corrected. " + << " Has occurred already " + << no_large_ediff << " times." << G4endl; + if( no_large_ediff == warnModulo * moduloFactor ) + { + warnModulo *= moduloFactor; + } + } + } +} diff --git a/source/processes/transportation/src/G4MImportanceConfigurator.cc b/source/processes/transportation/src/G4MImportanceConfigurator.cc index a606eac17e..6f776f5ff2 100644 --- a/source/processes/transportation/src/G4MImportanceConfigurator.cc +++ b/source/processes/transportation/src/G4MImportanceConfigurator.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4MImportanceConfigurator.cc,v 1.5.2.1 2006/06/29 21:10:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4MImportanceConfigurator.cc,v 1.7 2006/11/13 16:13:50 japost Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4MImportanceConfigurator diff --git a/source/processes/transportation/src/G4MScoreConfigurator.cc b/source/processes/transportation/src/G4MScoreConfigurator.cc index 916f425a6e..4c567dd819 100644 --- a/source/processes/transportation/src/G4MScoreConfigurator.cc +++ b/source/processes/transportation/src/G4MScoreConfigurator.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4MScoreConfigurator.cc,v 1.7.2.1 2006/06/29 21:10:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4MScoreConfigurator.cc,v 1.9 2006/11/13 16:17:16 japost Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4MScoreConfigurator diff --git a/source/processes/transportation/src/G4MScoreProcess.cc b/source/processes/transportation/src/G4MScoreProcess.cc index e71662d442..6f0e5d2c1f 100644 --- a/source/processes/transportation/src/G4MScoreProcess.cc +++ b/source/processes/transportation/src/G4MScoreProcess.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4MScoreProcess.cc,v 1.12.2.1 2006/06/29 21:10:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4MScoreProcess.cc,v 1.14 2006/11/13 16:19:14 japost Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/processes/transportation/src/G4MWeightWindowConfigurator.cc b/source/processes/transportation/src/G4MWeightWindowConfigurator.cc index 09376ef4a3..9c20465be9 100644 --- a/source/processes/transportation/src/G4MWeightWindowConfigurator.cc +++ b/source/processes/transportation/src/G4MWeightWindowConfigurator.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4MWeightWindowConfigurator.cc,v 1.4.2.1 2006/06/29 21:10:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4MWeightWindowConfigurator.cc,v 1.6 2006/11/14 09:11:18 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4MWeightWindowConfigurator diff --git a/source/processes/transportation/src/G4MassGCellFinder.cc b/source/processes/transportation/src/G4MassGCellFinder.cc index 196dddeb3c..7b6d64ccd7 100644 --- a/source/processes/transportation/src/G4MassGCellFinder.cc +++ b/source/processes/transportation/src/G4MassGCellFinder.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4MassGCellFinder.cc,v 1.3.2.1 2006/06/29 21:10:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4MassGCellFinder.cc,v 1.5 2006/11/14 09:11:18 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/processes/transportation/src/G4MassGeometrySampler.cc b/source/processes/transportation/src/G4MassGeometrySampler.cc index a14b1c92eb..654ed6509d 100644 --- a/source/processes/transportation/src/G4MassGeometrySampler.cc +++ b/source/processes/transportation/src/G4MassGeometrySampler.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4MassGeometrySampler.cc,v 1.11.2.1 2006/06/29 21:11:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4MassGeometrySampler.cc,v 1.13 2006/11/14 09:11:18 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/processes/transportation/src/G4MassImportanceProcess.cc b/source/processes/transportation/src/G4MassImportanceProcess.cc index 934d42d7b3..5200eccb74 100644 --- a/source/processes/transportation/src/G4MassImportanceProcess.cc +++ b/source/processes/transportation/src/G4MassImportanceProcess.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4MassImportanceProcess.cc,v 1.17.2.1 2006/06/29 21:11:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4MassImportanceProcess.cc,v 1.19 2006/11/14 09:11:18 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/processes/transportation/src/G4MassWeightWindowProcess.cc b/source/processes/transportation/src/G4MassWeightWindowProcess.cc index 9f0923b7ee..7d5a955b53 100644 --- a/source/processes/transportation/src/G4MassWeightWindowProcess.cc +++ b/source/processes/transportation/src/G4MassWeightWindowProcess.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4MassWeightWindowProcess.cc,v 1.5.2.1 2006/06/29 21:11:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4MassWeightWindowProcess.cc,v 1.7 2006/11/14 09:11:18 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/examples/extended/medical/GammaTherapy/src/DecaysBuilder.cc b/source/processes/transportation/src/G4NeutronKiller.cc similarity index 66% rename from examples/extended/medical/GammaTherapy/src/DecaysBuilder.cc rename to source/processes/transportation/src/G4NeutronKiller.cc index 2a6294d7d5..73af8e8e59 100644 --- a/examples/extended/medical/GammaTherapy/src/DecaysBuilder.cc +++ b/source/processes/transportation/src/G4NeutronKiller.cc @@ -23,70 +23,69 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// -// $Id: DecaysBuilder.cc,v 1.2 2006/06/29 17:26:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4NeutronKiller.cc,v 1.1 2006/11/17 15:53:04 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // -// ClassName: DecayBuilder +// ClassName: G4NeutronKiller // -// Author: V.Ivanchenko 03.05.2004 +// Description: The process to kill particles to save CPU // -// Modified: +// Author: V.Ivanchenko 26/09/00 for HARP software // //---------------------------------------------------------------------------- // -// //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#include "DecaysBuilder.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" -#include "G4Decay.hh" +#include "G4NeutronKiller.hh" +#include "G4NeutronKillerMessenger.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -DecaysBuilder::DecaysBuilder(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -DecaysBuilder::~DecaysBuilder() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void DecaysBuilder::ConstructParticle() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void DecaysBuilder::ConstructProcess() +G4NeutronKiller::G4NeutronKiller(const G4String& processName, G4ProcessType aType) + : G4VDiscreteProcess(processName, aType) { - // Add Decay Process - - G4Decay* fDecayProcess = new G4Decay(); - - theParticleIterator->reset(); - while( (*theParticleIterator)() ){ - G4ParticleDefinition* particle = theParticleIterator->value(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - - if (fDecayProcess->IsApplicable(*particle)) { - - // pmanager ->AddProcess(fDecayProcess); - - // set ordering for PostStepDoIt and AtRestDoIt - //pmanager ->SetProcessOrdering(fDecayProcess, idxPostStep); - //pmanager ->SetProcessOrdering(fDecayProcess, idxAtRest); - pmanager->AddProcess(fDecayProcess, 1,-1, 5); - - } - } + kinEnergyThreshold = 0.0; + timeThreshold = DBL_MAX; + pMess = new G4NeutronKillerMessenger(this); } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +G4NeutronKiller::~G4NeutronKiller() +{ + delete pMess; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +G4bool G4NeutronKiller::IsApplicable(const G4ParticleDefinition& particle) +{ + return (particle.GetParticleName() == "neutron"); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void G4NeutronKiller::SetTimeLimit(G4double val) +{ + timeThreshold = val; + if(verboseLevel > 0) + G4cout << "### G4NeutronKiller: timeLimit(ns) = " + << timeThreshold/ns << G4endl; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + +void G4NeutronKiller::SetKinEnergyLimit(G4double val) +{ + kinEnergyThreshold = val; + if(verboseLevel > 0) + G4cout << "### G4NeutronKiller: Tracking cut E(MeV) = " + << kinEnergyThreshold/MeV << G4endl; +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... + + diff --git a/examples/extended/medical/GammaTherapy/src/G4EmHadronBuilder52.cc b/source/processes/transportation/src/G4NeutronKillerMessenger.cc similarity index 59% rename from examples/extended/medical/GammaTherapy/src/G4EmHadronBuilder52.cc rename to source/processes/transportation/src/G4NeutronKillerMessenger.cc index abb3d5ca93..ec199aea6a 100644 --- a/examples/extended/medical/GammaTherapy/src/G4EmHadronBuilder52.cc +++ b/source/processes/transportation/src/G4NeutronKillerMessenger.cc @@ -23,85 +23,67 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// -// $Id: G4EmHadronBuilder52.cc,v 1.2 2006/06/29 17:27:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4NeutronKillerMessenger.cc,v 1.1 2006/11/17 15:53:04 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------------------- // -// ClassName: G4EmHadronBuilder52 +// ClassName: G4NeutronKillerMessenger // -// Author: V.Ivanchenko 03.05.2004 +// Description: Messenger class // -// Modified: +// Author: V.Ivanchenko 26/09/00 for HARP software // //---------------------------------------------------------------------------- // -// //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -#include "G4EmHadronBuilder52.hh" -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" - -#include "G4MultipleScattering52.hh" - -#include "G4hIonisation52.hh" - -#include "G4Electron.hh" -#include "G4Proton.hh" -#include "G4GenericIon.hh" +#include "G4NeutronKillerMessenger.hh" +#include "G4UIcmdWithADoubleAndUnit.hh" +#include "G4UIdirectory.hh" +#include "G4NeutronKiller.hh" //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -G4EmHadronBuilder52::G4EmHadronBuilder52(const G4String& name) - : G4VPhysicsConstructor(name) -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -G4EmHadronBuilder52::~G4EmHadronBuilder52() -{} - -//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... - -void G4EmHadronBuilder52::ConstructParticle() +G4NeutronKillerMessenger::G4NeutronKillerMessenger(G4NeutronKiller* p) + :killer(p) { - G4Electron::Electron(); - G4Proton::Proton(); - G4GenericIon::GenericIon(); + + dir = new G4UIdirectory("/physics_engine/neutron/"); + dir->SetGuidance("control on neutrons"); + + eCmd = new G4UIcmdWithADoubleAndUnit("/physics_engine/neutron/energyLimit",this); + eCmd->SetGuidance("Set tracking cut - min energy of a particle."); + eCmd->SetParameterName("energyLimit",false); + eCmd->SetUnitCategory("Energy"); + eCmd->AvailableForStates(G4State_PreInit,G4State_Idle); + + tCmd = new G4UIcmdWithADoubleAndUnit("/physics_engine/neutron/timeLimit",this); + tCmd->SetGuidance("Set time limit."); + tCmd->SetParameterName("timeLimit",false); + tCmd->SetUnitCategory("Time"); + tCmd->AvailableForStates(G4State_PreInit,G4State_Idle); } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -void G4EmHadronBuilder52::ConstructProcess() +G4NeutronKillerMessenger::~G4NeutronKillerMessenger() { - // Add standard EM Processes - theParticleIterator->reset(); - - while( (*theParticleIterator)() ){ - G4ParticleDefinition* particle = theParticleIterator->value(); - - if(particle->GetPDGMass() > 110.*MeV) { - G4ProcessManager* pmanager = particle->GetProcessManager(); - G4String particleName = particle->GetParticleName(); - - - if (particleName == "GenericIon") { - - pmanager->AddProcess(new G4hIonisation52, -1, 1, 1); - - } else if ((!particle->IsShortLived()) && - (particle->GetPDGCharge() != 0.0) && - (particle->GetParticleName() != "chargedgeantino")) { - - pmanager->AddProcess(new G4MultipleScattering52,-1,1,1); - pmanager->AddProcess(new G4hIonisation52, -1,2,2); - } - } - } + delete eCmd; + delete tCmd; + delete dir; } //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... +void G4NeutronKillerMessenger::SetNewValue(G4UIcommand* command, G4String val) +{ + if (command == eCmd) + killer->SetKinEnergyLimit(eCmd->GetNewDoubleValue(val)); + + if (command == tCmd) + killer->SetTimeLimit(tCmd->GetNewDoubleValue(val)); +} + +//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... diff --git a/source/processes/transportation/src/G4PImportanceConfigurator.cc b/source/processes/transportation/src/G4PImportanceConfigurator.cc index bbf52d69f2..e49a79eb4b 100644 --- a/source/processes/transportation/src/G4PImportanceConfigurator.cc +++ b/source/processes/transportation/src/G4PImportanceConfigurator.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4PImportanceConfigurator.cc,v 1.6.2.1 2006/06/29 21:11:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4PImportanceConfigurator.cc,v 1.8 2006/11/14 09:11:18 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4PImportanceConfigurator diff --git a/source/processes/transportation/src/G4PScoreConfigurator.cc b/source/processes/transportation/src/G4PScoreConfigurator.cc index d65122a7f0..b61589cdb2 100644 --- a/source/processes/transportation/src/G4PScoreConfigurator.cc +++ b/source/processes/transportation/src/G4PScoreConfigurator.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4PScoreConfigurator.cc,v 1.7.2.1 2006/06/29 21:12:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4PScoreConfigurator.cc,v 1.9 2006/11/14 09:11:18 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4PScoreConfigurator diff --git a/source/processes/transportation/src/G4PScoreProcess.cc b/source/processes/transportation/src/G4PScoreProcess.cc index 4af5e6530c..1707d78558 100644 --- a/source/processes/transportation/src/G4PScoreProcess.cc +++ b/source/processes/transportation/src/G4PScoreProcess.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4PScoreProcess.cc,v 1.9.2.1 2006/06/29 21:12:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4PScoreProcess.cc,v 1.11 2006/11/14 09:11:18 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/processes/transportation/src/G4PWeightWindowConfigurator.cc b/source/processes/transportation/src/G4PWeightWindowConfigurator.cc index 7fb62392ad..5e0b4f5ea2 100644 --- a/source/processes/transportation/src/G4PWeightWindowConfigurator.cc +++ b/source/processes/transportation/src/G4PWeightWindowConfigurator.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4PWeightWindowConfigurator.cc,v 1.4.2.1 2006/06/29 21:12:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4PWeightWindowConfigurator.cc,v 1.6 2006/11/14 09:11:18 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4PWeightWindowConfigurator diff --git a/source/processes/transportation/src/G4ParallelGCellFinder.cc b/source/processes/transportation/src/G4ParallelGCellFinder.cc index 68f6ecfda4..a77b5e8ad2 100644 --- a/source/processes/transportation/src/G4ParallelGCellFinder.cc +++ b/source/processes/transportation/src/G4ParallelGCellFinder.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4ParallelGCellFinder.cc,v 1.3.2.1 2006/06/29 21:12:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ParallelGCellFinder.cc,v 1.5 2006/11/14 09:11:18 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/processes/transportation/src/G4ParallelGeometrySampler.cc b/source/processes/transportation/src/G4ParallelGeometrySampler.cc index 0e858d9a62..bc81bd771e 100644 --- a/source/processes/transportation/src/G4ParallelGeometrySampler.cc +++ b/source/processes/transportation/src/G4ParallelGeometrySampler.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4ParallelGeometrySampler.cc,v 1.10.2.1 2006/06/29 21:12:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ParallelGeometrySampler.cc,v 1.12 2006/11/14 09:11:18 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/processes/transportation/src/G4ParallelImportanceProcess.cc b/source/processes/transportation/src/G4ParallelImportanceProcess.cc index 35c6912c2f..990a96830f 100644 --- a/source/processes/transportation/src/G4ParallelImportanceProcess.cc +++ b/source/processes/transportation/src/G4ParallelImportanceProcess.cc @@ -25,7 +25,7 @@ // // // $Id: G4ParallelImportanceProcess.cc,v 1.19 2006/06/29 21:12:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/processes/transportation/src/G4ParallelTransport.cc b/source/processes/transportation/src/G4ParallelTransport.cc index 3d5bf3a846..4c06924caa 100644 --- a/source/processes/transportation/src/G4ParallelTransport.cc +++ b/source/processes/transportation/src/G4ParallelTransport.cc @@ -25,7 +25,7 @@ // // // $Id: G4ParallelTransport.cc,v 1.15 2006/06/29 21:12:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/processes/transportation/src/G4ParallelTransportConfigurator.cc b/source/processes/transportation/src/G4ParallelTransportConfigurator.cc index 47204c51f4..391cbccb48 100644 --- a/source/processes/transportation/src/G4ParallelTransportConfigurator.cc +++ b/source/processes/transportation/src/G4ParallelTransportConfigurator.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4ParallelTransportConfigurator.cc,v 1.5.2.1 2006/06/29 21:12:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ParallelTransportConfigurator.cc,v 1.7 2006/11/14 09:11:18 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4ParallelTransportConfigurator diff --git a/source/processes/transportation/src/G4ParallelWWnTransportProcess.cc b/source/processes/transportation/src/G4ParallelWWnTransportProcess.cc index 6eb93e973b..5c402a08d7 100644 --- a/source/processes/transportation/src/G4ParallelWWnTransportProcess.cc +++ b/source/processes/transportation/src/G4ParallelWWnTransportProcess.cc @@ -25,7 +25,7 @@ // // // $Id: G4ParallelWWnTransportProcess.cc,v 1.6 2006/06/29 21:12:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/processes/transportation/src/G4ParallelWeightWindowProcess.cc b/source/processes/transportation/src/G4ParallelWeightWindowProcess.cc index d6f21604a1..80e347d5c2 100644 --- a/source/processes/transportation/src/G4ParallelWeightWindowProcess.cc +++ b/source/processes/transportation/src/G4ParallelWeightWindowProcess.cc @@ -25,7 +25,7 @@ // // // $Id: G4ParallelWeightWindowProcess.cc,v 1.13 2006/06/29 21:12:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/processes/transportation/src/G4ProcessPlacer.cc b/source/processes/transportation/src/G4ProcessPlacer.cc index ca0868683d..a386a24eb5 100644 --- a/source/processes/transportation/src/G4ProcessPlacer.cc +++ b/source/processes/transportation/src/G4ProcessPlacer.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4ProcessPlacer.cc,v 1.14.2.1 2006/06/29 21:12:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ProcessPlacer.cc,v 1.16 2006/11/14 09:11:18 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/processes/transportation/src/G4SamplingPostStepAction.cc b/source/processes/transportation/src/G4SamplingPostStepAction.cc index 7942bc9da1..55afd41eaf 100644 --- a/source/processes/transportation/src/G4SamplingPostStepAction.cc +++ b/source/processes/transportation/src/G4SamplingPostStepAction.cc @@ -25,7 +25,7 @@ // // // $Id: G4SamplingPostStepAction.cc,v 1.4 2006/06/29 21:12:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/processes/transportation/src/G4StepLimiter.cc b/source/processes/transportation/src/G4StepLimiter.cc index 084ab4c8f6..6ecfe8b814 100644 --- a/source/processes/transportation/src/G4StepLimiter.cc +++ b/source/processes/transportation/src/G4StepLimiter.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4StepLimiter.cc,v 1.1.2.1 2006/06/29 21:12:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4StepLimiter.cc,v 1.3 2006/11/14 09:11:18 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------- // History diff --git a/source/processes/transportation/src/G4Transportation.cc b/source/processes/transportation/src/G4Transportation.cc index 6ff6d46315..35325848c2 100644 --- a/source/processes/transportation/src/G4Transportation.cc +++ b/source/processes/transportation/src/G4Transportation.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Transportation.cc,v 1.55.2.1 2006/06/29 21:12:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Transportation.cc,v 1.60 2006/11/22 18:47:02 japost Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ------------------------------------------------------------ // GEANT 4 include file implementation @@ -95,8 +95,17 @@ G4Transportation::G4Transportation( G4int verboseLevel ) // is constructed. // Instead later the method DoesGlobalFieldExist() is called - fCurrentTouchableHandle = new G4TouchableHistory(); - + // Small memory leak from this new + // fCurrentTouchableHandle = new G4TouchableHistory(); + // Fixes: + // 1) static G4TouchableHistory sfNullTouchableHistory = new G4TouchableHistory(); + // fCurrentTouchableHandle = new G4TouchableHandle( sfNullTouchableHistory ); + // 2) set it to (G4TouchableHistory*) 0 + // fCurrentTouchableHandle = new G4TouchableHandle( (G4TouchableHistory*) 0 ); + // 3) Below: + static G4TouchableHandle nullTouchableHandle; // Points to (G4VTouchable*) 0 + fCurrentTouchableHandle = nullTouchableHandle; + fEndGlobalTimeComputed = false; fCandidateEndGlobalTime = 0; } @@ -105,6 +114,15 @@ G4Transportation::G4Transportation( G4int verboseLevel ) G4Transportation::~G4Transportation() { + + // --- Alternative code to delete 'junk data' in touchable handle + // ** Corresponds to the case that the constructor has + // fCurrentTouchableHandle = new G4TouchableHistory(); + // ** Likely incorrect - as at the end of the simulation + // the handle no longer holds the original 'null' history + // G4VTouchable* pTouchable= fCurrentTouchableHandle(); // Incorrect + // delete pTouchable; // Incorrect + if( (fVerboseLevel > 0) && (fSumEnergyKilled > 0.0 ) ){ G4cout << " G4Transportation: Statistics for looping particles " << G4endl; G4cout << " Sum of energy of loopers killed: " << fSumEnergyKilled << G4endl; @@ -188,6 +206,9 @@ AlongStepGetPhysicalInteractionLength( const G4Track& track, } } + // G4cout << " G4Transport: field exerts force= " << fieldExertsForce + // << " fieldMgr= " << fieldMgr << G4endl; + // Choose the calculation of the transportation: Field or not // if( !fieldExertsForce ) @@ -351,18 +372,24 @@ AlongStepGetPhysicalInteractionLength( const G4Track& track, if( (no_large_ediff% warnModulo) == 0 ) { no_warnings++; - G4cout << "WARNING - G4Transportation::AlongStepGetPIL()" << G4endl - << " Energy changed in Step, more than 1/1000: " << G4endl - << " Start= " << startEnergy << G4endl - << " End= " << endEnergy << G4endl - << " Relative change= " - << (startEnergy-endEnergy)/startEnergy << G4endl; + G4cout << "WARNING - G4Transportation::AlongStepGetPIL() " + << " Energy change in Step is above 1^-3 relative value. " << G4endl + << " Relative change in 'tracking' step = " + << std::setw(15) << (endEnergy-startEnergy)/startEnergy << G4endl + << " Starting E= " << std::setw(12) << startEnergy / MeV << " MeV " << G4endl + << " Ending E= " << std::setw(12) << endEnergy / MeV << " MeV " << G4endl; G4cout << " Energy has been corrected -- however, review" - << " field propagation parameters for accuracy." << G4endl; + << " field propagation parameters for accuracy." << G4endl; + if( (fVerboseLevel > 2 ) || (no_warnings<4) || (no_large_ediff == warnModulo * moduloFactor) ){ + G4cout << " These include EpsilonStepMax(/Min) in G4FieldManager " + << " which determine fractional error per step for integrated quantities. " << G4endl + << " Note also the influence of the permitted number of integration steps." + << G4endl; + } G4cerr << "ERROR - G4Transportation::AlongStepGetPIL()" << G4endl << " Bad 'endpoint'. Energy change detected" - << " and corrected," << G4endl - << " occurred already " + << " and corrected. " + << " Has occurred already " << no_large_ediff << " times." << G4endl; if( no_large_ediff == warnModulo * moduloFactor ) { @@ -431,6 +458,12 @@ AlongStepGetPhysicalInteractionLength( const G4Track& track, G4VParticleChange* G4Transportation::AlongStepDoIt( const G4Track& track, const G4Step& stepData ) { + static G4int noCalls=0; + static const G4ParticleDefinition* fOpticalPhoton = + G4ParticleTable::GetParticleTable()->FindParticle("opticalphoton"); + + noCalls++; + fParticleChange.Initialize(track) ; // Code for specific process @@ -458,8 +491,6 @@ G4VParticleChange* G4Transportation::AlongStepDoIt( const G4Track& track, G4double initialVelocity = stepData.GetPreStepPoint()->GetVelocity() ; G4double stepLength = track.GetStepLength() ; - static const G4ParticleDefinition* fOpticalPhoton = - G4ParticleTable::GetParticleTable()->FindParticle("opticalphoton"); const G4DynamicParticle* fpDynamicParticle = track.GetDynamicParticle(); if (fpDynamicParticle->GetDefinition()== fOpticalPhoton) { @@ -521,12 +552,23 @@ G4VParticleChange* G4Transportation::AlongStepDoIt( const G4Track& track, << G4endl << " This track has " << track.GetKineticEnergy() / MeV << " MeV energy." << G4endl; + G4cout << " Number of trials = " << fNoLooperTrials + << " No of calls to AlongStepDoIt = " << noCalls + << G4endl; } #endif fNoLooperTrials=0; } else{ fNoLooperTrials ++; +#ifdef G4VERBOSE + if( (fVerboseLevel > 2) ){ + G4cout << " Transportation::AlongStepDoIt(): Particle looping - " + << " Number of trials = " << fNoLooperTrials + << " No of calls to = " << noCalls + << G4endl; + } +#endif } }else{ fNoLooperTrials=0; @@ -599,88 +641,6 @@ G4VParticleChange* G4Transportation::PostStepDoIt( const G4Track& track, } else // fGeometryLimitedStep is false { -#ifdef G4DEBUG_POSTSTEP_TRANSPORT - - // Although the location is changed, we know that the physical - // volume remains constant. - // In order to help in checking the user geometry - // we perform a full-relocation and check its result - // *except* if we have made a very small step from a boundary - // (i.e. remaining inside the tolerance) - - G4bool startAtSurface_And_MoveEpsilon ; - startAtSurface_And_MoveEpsilon = - (stepData.GetPreStepPoint()->GetSafety() == 0.0) && - (stepData.GetStepLength() < kCarTolerance ) ; - - if( startAtSurface_And_MoveEpsilon ) - { - fLinearNavigator-> - LocateGlobalPointAndUpdateTouchableHandle( track.GetPosition(), - track.GetMomentumDirection(), - fCurrentTouchableHandle, - true ); - if( fCurrentTouchableHandle->GetVolume() != track.GetVolume() ) - { - G4cerr << " ERROR: A relocation within safety has" - << " caused a volume change! " << G4endl ; - G4cerr << " The old volume is called " - << track.GetVolume()->GetName() << G4endl ; - G4cerr << " The new volume is called " ; - - if ( fCurrentTouchableHandle->GetVolume() != 0 ) - { - G4cerr << fCurrentTouchableHandle->GetVolume()->GetName() - << G4endl ; - } - else - { - G4cerr << "Out of World" << G4endl ; - } - G4cerr.precision(7) ; - G4cerr << " The position is " << track.GetPosition() << G4endl ; - - // Let us relocate again, for debuging - // - fLinearNavigator-> - LocateGlobalPointAndUpdateTouchableHandle(track.GetPosition(), - track.GetMomentumDirection(), - fCurrentTouchableHandle, - true ) ; - G4cerr << " The newer volume is called " ; - - if ( fCurrentTouchableHandle->GetVolume() != 0 ) - { - G4cerr << fCurrentTouchableHandle->GetVolume()->GetName() - << G4endl ; - } - else - { - G4cerr << "Out of World" << G4endl ; - } - } - - assert( fCurrentTouchableHandle->GetVolume()->GetName() == - track.GetVolume()->GetName() ) ; - - retCurrentTouchable = fCurrentTouchableHandle ; - fParticleChange.SetTouchableHandle( fCurrentTouchableHandle ) ; - - } - else - { - retCurrentTouchable = track.GetTouchableHandle() ; - fParticleChange.SetTouchableHandle( track.GetTouchableHandle() ) ; - } - - // This must be done in the above if ( AtSur ) fails - // We also do it for if (true) in order to get debug/opt to - // behave as exactly the same way as possible. - // - fLinearNavigator->LocateGlobalPointWithinVolume( track.GetPosition() ) ; - -#else // ie #ifndef G4DEBUG_POSTSTEP_TRANSPORT does a quick relocation - // This serves only to move the Navigator's location // fLinearNavigator->LocateGlobalPointWithinVolume( track.GetPosition() ) ; @@ -688,13 +648,10 @@ G4VParticleChange* G4Transportation::PostStepDoIt( const G4Track& track, // The value of the track's current Touchable is retained. // (and it must be correct because we must use it below to // overwrite the (unset) one in particle change) - // Although in general this is fCurrentTouchable, at the start of - // a step it could be different ... ?? + // It must be fCurrentTouchable too ?? // fParticleChange.SetTouchableHandle( track.GetTouchableHandle() ) ; retCurrentTouchable = track.GetTouchableHandle() ; - -#endif } // endif ( fGeometryLimitedStep ) const G4VPhysicalVolume* pNewVol = retCurrentTouchable->GetVolume() ; diff --git a/source/processes/transportation/src/G4UserSpecialCuts.cc b/source/processes/transportation/src/G4UserSpecialCuts.cc index 0fe237e54c..c4e509c632 100644 --- a/source/processes/transportation/src/G4UserSpecialCuts.cc +++ b/source/processes/transportation/src/G4UserSpecialCuts.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4UserSpecialCuts.cc,v 1.14.2.1 2006/06/29 21:12:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4UserSpecialCuts.cc,v 1.16 2006/11/14 09:11:18 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // -------------------------------------------------------------- // History diff --git a/source/processes/transportation/src/G4VProcessPlacer.cc b/source/processes/transportation/src/G4VProcessPlacer.cc index 7ac0789882..d80314f087 100644 --- a/source/processes/transportation/src/G4VProcessPlacer.cc +++ b/source/processes/transportation/src/G4VProcessPlacer.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VProcessPlacer.cc,v 1.2.2.1 2006/06/29 21:12:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VProcessPlacer.cc,v 1.4 2006/11/14 09:11:18 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/processes/transportation/src/G4VSampler.cc b/source/processes/transportation/src/G4VSampler.cc index f887f70760..2c23270508 100644 --- a/source/processes/transportation/src/G4VSampler.cc +++ b/source/processes/transportation/src/G4VSampler.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VSampler.cc,v 1.2.2.1 2006/06/29 21:12:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VSampler.cc,v 1.4 2006/10/16 18:19:53 japost Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/processes/transportation/src/G4VSamplerConfigurator.cc b/source/processes/transportation/src/G4VSamplerConfigurator.cc index 0cdd3cdb89..a0937169a0 100644 --- a/source/processes/transportation/src/G4VSamplerConfigurator.cc +++ b/source/processes/transportation/src/G4VSamplerConfigurator.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VSamplerConfigurator.cc,v 1.2.2.1 2006/06/29 21:12:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VSamplerConfigurator.cc,v 1.4 2006/11/14 09:11:18 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/processes/transportation/src/G4VTrackTerminator.cc b/source/processes/transportation/src/G4VTrackTerminator.cc index 3fdfca80d5..f3fa063a31 100644 --- a/source/processes/transportation/src/G4VTrackTerminator.cc +++ b/source/processes/transportation/src/G4VTrackTerminator.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VTrackTerminator.cc,v 1.3.2.1 2006/06/29 21:12:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VTrackTerminator.cc,v 1.5 2006/11/14 09:11:18 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/processes/transportation/src/G4WeightCutOffConfigurator.cc b/source/processes/transportation/src/G4WeightCutOffConfigurator.cc index 476f549104..0efcb08c00 100644 --- a/source/processes/transportation/src/G4WeightCutOffConfigurator.cc +++ b/source/processes/transportation/src/G4WeightCutOffConfigurator.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4WeightCutOffConfigurator.cc,v 1.5.2.1 2006/06/29 21:12:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4WeightCutOffConfigurator.cc,v 1.7 2006/11/14 09:11:18 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // Class G4WeightCutOffConfigurator diff --git a/source/processes/transportation/src/G4WeightCutOffProcess.cc b/source/processes/transportation/src/G4WeightCutOffProcess.cc index ef0002c4f5..1d95b3b8c3 100644 --- a/source/processes/transportation/src/G4WeightCutOffProcess.cc +++ b/source/processes/transportation/src/G4WeightCutOffProcess.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4WeightCutOffProcess.cc,v 1.7.2.1 2006/06/29 21:12:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4WeightCutOffProcess.cc,v 1.9 2006/11/14 09:11:18 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // ---------------------------------------------------------------------- // GEANT 4 class source file diff --git a/source/readout/include/G4DCtable.hh b/source/readout/include/G4DCtable.hh index 90d911dd78..733109f21e 100644 --- a/source/readout/include/G4DCtable.hh +++ b/source/readout/include/G4DCtable.hh @@ -25,7 +25,7 @@ // // // $Id: G4DCtable.hh,v 1.9 2006/06/29 21:12:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4DCtable_H diff --git a/source/readout/include/G4DMmessenger.hh b/source/readout/include/G4DMmessenger.hh index a9167ab155..e0cf0ea571 100644 --- a/source/readout/include/G4DMmessenger.hh +++ b/source/readout/include/G4DMmessenger.hh @@ -25,7 +25,7 @@ // // // $Id: G4DMmessenger.hh,v 1.5 2006/06/29 21:12:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4DMmessenger_h diff --git a/source/readout/include/G4DigiManager.hh b/source/readout/include/G4DigiManager.hh index 0393f295cd..609a23c516 100644 --- a/source/readout/include/G4DigiManager.hh +++ b/source/readout/include/G4DigiManager.hh @@ -25,7 +25,7 @@ // // // $Id: G4DigiManager.hh,v 1.8 2006/06/29 21:12:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4DigiManager_h diff --git a/source/readout/include/G4VDigitizerModule.hh b/source/readout/include/G4VDigitizerModule.hh index 1677e8f641..2585769b36 100644 --- a/source/readout/include/G4VDigitizerModule.hh +++ b/source/readout/include/G4VDigitizerModule.hh @@ -25,7 +25,7 @@ // // // $Id: G4VDigitizerModule.hh,v 1.8 2006/06/29 21:12:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VDigitizerModule_H diff --git a/source/readout/src/G4DCtable.cc b/source/readout/src/G4DCtable.cc index 67b318332a..8c96a8b3dd 100644 --- a/source/readout/src/G4DCtable.cc +++ b/source/readout/src/G4DCtable.cc @@ -25,7 +25,7 @@ // // // $Id: G4DCtable.cc,v 1.9 2006/06/29 21:13:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4DCtable.hh" diff --git a/source/readout/src/G4DMmessenger.cc b/source/readout/src/G4DMmessenger.cc index d9d828cc2e..c9e71e46c0 100644 --- a/source/readout/src/G4DMmessenger.cc +++ b/source/readout/src/G4DMmessenger.cc @@ -25,7 +25,7 @@ // // // $Id: G4DMmessenger.cc,v 1.4 2006/06/29 21:13:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // --------------------------------------------------------------------- diff --git a/source/readout/src/G4DigiManager.cc b/source/readout/src/G4DigiManager.cc index 6ea5b82bd3..9ad1e4f22e 100644 --- a/source/readout/src/G4DigiManager.cc +++ b/source/readout/src/G4DigiManager.cc @@ -25,7 +25,7 @@ // // // $Id: G4DigiManager.cc,v 1.7 2006/06/29 21:13:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4DigiManager.hh" diff --git a/source/readout/src/G4VDigitizerModule.cc b/source/readout/src/G4VDigitizerModule.cc index 71096375c1..bfdebd990b 100644 --- a/source/readout/src/G4VDigitizerModule.cc +++ b/source/readout/src/G4VDigitizerModule.cc @@ -25,7 +25,7 @@ // // // $Id: G4VDigitizerModule.cc,v 1.4 2006/06/29 21:13:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4VDigitizerModule.hh" diff --git a/source/run/GNUmakefile b/source/run/GNUmakefile index e3173a13a8..58876c95e7 100644 --- a/source/run/GNUmakefile +++ b/source/run/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.13 2006/05/11 01:22:12 asaim Exp $ +# $Id: GNUmakefile,v 1.14 2006/11/15 12:19:26 gcosmo Exp $ # ---------------------------------------------------------- # GNUmakefile for run library. Gabriele Cosmo, 3/4/1997. # ---------------------------------------------------------- @@ -17,6 +17,10 @@ GLOBLIBS += libG4intercoms.lib libG4global.lib include $(G4INSTALL)/config/architecture.gmk +ifdef G4FPE_DEBUG + CPPFLAGS += -DG4FPE_DEBUG +endif + CPPFLAGS += -DG4RUN_ALLOC_EXPORT CPPFLAGS += \ -I$(G4BASE)/global/management/include \ diff --git a/source/run/History b/source/run/History index 45d8264a0f..11c16ac261 100644 --- a/source/run/History +++ b/source/run/History @@ -1,4 +1,4 @@ -$Id: History,v 1.144 2006/05/16 21:57:14 asaim Exp $ +$Id: History,v 1.154 2006/12/01 17:10:21 gcosmo Exp $ ------------------------------------------------------------------- ========================================================= @@ -17,6 +17,46 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +December 1st, 2006, Makoto Asai (run-V08-01-06) +- Fixed memory leak at initialisation in G4MatScanMessenger. +- Modified CheckRegions() method not to use inefficient and obsolete + SetWorld() method in G4RegionStore. Set world volumes to regions directly + and more efficiently by retrieving the list of worlds from + G4TransportationManager. + +November 30th, 2006, Gabriele Cosmo (run-V08-01-05) +- In destructor of G4RunManagerKernel, allow for proper deletion of + default region and deallocation of units from the G4UnitsTable. +- Synchronised files with HEAD. +- Coworks with tags: "global-V08-01-07" and "geommng-V08-01-08". + +November 20th, 2006, Makoto Asai (run-V08-01-04) +- Re-tagged with correct files. + +November 17th, 2006, Makoto Asai (run-V08-01-03) +- Update History file to include all the developments made in cvs branch. + +November 15th, 2006, Gabriele Cosmo (run-V08-01-02) +- Added call to the FPE handler in constructor of G4RunManagerKernel. + The call is activated if the flag G4FPE_DEBUG is set in the environment + at compilation. Allows for catching of NaNs in applications for debug. +- Updated GNUmakefile accordingly. +- Coworks with tag "global-V08-01-05". + +November 14th, 2006, Gabriele Cosmo (run-V08-01-01) +- Bringing in changes from branch tag (run-V08-01-ref04-03). + - Added mechanism for detecting presence of parallel word registered + and allow switching of transportation in G4VUserPhysicsList. + - G4Run object is now kept until the begining of the next run, so that + the user can have an access to the valid G4Run pointer during the + Idle state after the run. + - Events can be kept un-deleted, stored in G4Run, and persist until + the deletion of G4Run objects. + +June 9th, 2006, Makoto Asai (run-V08-01-00) +- Introducing G4VUserParallelWorld class and related changes in G4RunManager + and G4VUserDetectorConstruction classes. + May 16th, 2006, Makoto Asai (run-V08-00-03) - Add a command in G4MatScanMessenger. diff --git a/source/run/include/G4ExceptionHandler.hh b/source/run/include/G4ExceptionHandler.hh index 53bf9642e6..e6b0cce3b7 100644 --- a/source/run/include/G4ExceptionHandler.hh +++ b/source/run/include/G4ExceptionHandler.hh @@ -25,7 +25,7 @@ // // // $Id: G4ExceptionHandler.hh,v 1.2 2006/06/29 21:13:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/run/include/G4MSSteppingAction.hh b/source/run/include/G4MSSteppingAction.hh index 0b10aa3d54..4a8a71ad03 100644 --- a/source/run/include/G4MSSteppingAction.hh +++ b/source/run/include/G4MSSteppingAction.hh @@ -25,7 +25,7 @@ // // // $Id: G4MSSteppingAction.hh,v 1.2 2006/06/29 21:13:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/run/include/G4MatScanMessenger.hh b/source/run/include/G4MatScanMessenger.hh index 963aa6fe53..e30160dede 100644 --- a/source/run/include/G4MatScanMessenger.hh +++ b/source/run/include/G4MatScanMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: G4MatScanMessenger.hh,v 1.3 2006/06/29 21:13:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/run/include/G4MaterialScanner.hh b/source/run/include/G4MaterialScanner.hh index 6cb4a94b7f..7f12b41f90 100644 --- a/source/run/include/G4MaterialScanner.hh +++ b/source/run/include/G4MaterialScanner.hh @@ -25,7 +25,7 @@ // // // $Id: G4MaterialScanner.hh,v 1.2 2006/06/29 21:13:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/run/include/G4Run.hh b/source/run/include/G4Run.hh index 489edbfee7..60c77964cd 100644 --- a/source/run/include/G4Run.hh +++ b/source/run/include/G4Run.hh @@ -24,15 +24,15 @@ // ******************************************************************** // // -// $Id: G4Run.hh,v 1.13 2006/06/29 21:13:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Run.hh,v 1.14 2006/11/23 00:06:46 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4Run_h #define G4Run_h 1 #include "globals.hh" - +#include class G4Event; class G4HCtable; class G4DCtable; @@ -57,6 +57,7 @@ class G4Run G4HCtable* HCtable; G4DCtable* DCtable; G4String randomNumberStatus; + std::vector* eventVector; public: // with description virtual void RecordEvent(const G4Event*); @@ -94,6 +95,19 @@ class G4Run { DCtable = DCtbl; } inline void SetRandomNumberStatus(G4String& st) { randomNumberStatus = st; } + + public: // with description + void StoreEvent(G4Event* evt); + // Store a G4Event object until this run object is deleted. + // Given the potential large memory size of G4Event and its datamember + // objects stored in G4Event, the user must be careful and responsible for + // not to store too many G4Event objects. This method is invoked by G4RunManager + // if the user invokes G4EventManager::KeepTheCurrentEvent() or + // /event/keepCurrentEvent UI command while the particular event is in process + // (typically in EndOfEventAction). + inline const std::vector* GetEventVector() const + { return eventVector; } + // Return the event vector }; diff --git a/source/run/include/G4RunManager.hh b/source/run/include/G4RunManager.hh index 54c7086b69..dce35e05c1 100644 --- a/source/run/include/G4RunManager.hh +++ b/source/run/include/G4RunManager.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4RunManager.hh,v 1.42 2006/06/29 21:13:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4RunManager.hh,v 1.43 2006/11/23 00:06:46 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // @@ -251,6 +251,8 @@ class G4RunManager G4VPhysicalVolume* currentWorld; + G4int nParallelWorlds; + public: virtual void rndmSaveThisRun(); virtual void rndmSaveThisEvent(); diff --git a/source/run/include/G4RunManagerKernel.hh b/source/run/include/G4RunManagerKernel.hh index 7d5b2f8c11..3413062216 100644 --- a/source/run/include/G4RunManagerKernel.hh +++ b/source/run/include/G4RunManagerKernel.hh @@ -25,7 +25,7 @@ // // // $Id: G4RunManagerKernel.hh,v 1.7 2006/06/29 21:13:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/run/include/G4RunMessenger.hh b/source/run/include/G4RunMessenger.hh index fd8bfcdd24..055ea00749 100644 --- a/source/run/include/G4RunMessenger.hh +++ b/source/run/include/G4RunMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: G4RunMessenger.hh,v 1.14 2006/06/29 21:13:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // GEANT 4 class header file diff --git a/source/run/include/G4UserPhysicsListMessenger.hh b/source/run/include/G4UserPhysicsListMessenger.hh index 1286a93cff..288cac275b 100644 --- a/source/run/include/G4UserPhysicsListMessenger.hh +++ b/source/run/include/G4UserPhysicsListMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: G4UserPhysicsListMessenger.hh,v 1.16 2006/06/29 21:13:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/run/include/G4UserRunAction.hh b/source/run/include/G4UserRunAction.hh index 6c4bc6099d..065458f60a 100644 --- a/source/run/include/G4UserRunAction.hh +++ b/source/run/include/G4UserRunAction.hh @@ -25,7 +25,7 @@ // // // $Id: G4UserRunAction.hh,v 1.8 2006/06/29 21:13:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4UserRunAction_h diff --git a/source/run/include/G4VModularPhysicsList.hh b/source/run/include/G4VModularPhysicsList.hh index c8055e14cd..8e57216f97 100644 --- a/source/run/include/G4VModularPhysicsList.hh +++ b/source/run/include/G4VModularPhysicsList.hh @@ -25,7 +25,7 @@ // // // $Id: G4VModularPhysicsList.hh,v 1.7 2006/06/29 21:13:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/run/include/G4VPersistencyManager.hh b/source/run/include/G4VPersistencyManager.hh index 854cd18e79..ad42364b0c 100644 --- a/source/run/include/G4VPersistencyManager.hh +++ b/source/run/include/G4VPersistencyManager.hh @@ -25,7 +25,7 @@ // // // $Id: G4VPersistencyManager.hh,v 1.5 2006/06/29 21:13:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VPersistencyManager_h diff --git a/source/run/include/G4VPhysicsConstructor.hh b/source/run/include/G4VPhysicsConstructor.hh index db2aebb99f..8ff7d8b6d2 100644 --- a/source/run/include/G4VPhysicsConstructor.hh +++ b/source/run/include/G4VPhysicsConstructor.hh @@ -25,7 +25,7 @@ // // // $Id: G4VPhysicsConstructor.hh,v 1.4 2006/06/29 21:13:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/run/include/G4VUserDetectorConstruction.hh b/source/run/include/G4VUserDetectorConstruction.hh index a4b17f1d3e..4776cf8b2c 100644 --- a/source/run/include/G4VUserDetectorConstruction.hh +++ b/source/run/include/G4VUserDetectorConstruction.hh @@ -24,14 +24,18 @@ // ******************************************************************** // // -// $Id: G4VUserDetectorConstruction.hh,v 1.4.12.1 2006/06/29 21:13:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VUserDetectorConstruction.hh,v 1.8 2006/12/13 15:49:30 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VUserDetectorConstruction_h #define G4VUserDetectorConstruction_h 1 class G4VPhysicalVolume; +class G4VUserParallelWorld; + +#include +#include "globals.hh" // class description: // @@ -50,6 +54,15 @@ class G4VUserDetectorConstruction public: virtual G4VPhysicalVolume* Construct() = 0; + + public: + void RegisterParallelWorld(G4VUserParallelWorld*); + + public: + G4int ConstructParallelGeometries(); + + private: + std::vector parallelWorld; }; #endif diff --git a/source/run/include/G4VUserParallelWorld.hh b/source/run/include/G4VUserParallelWorld.hh new file mode 100644 index 0000000000..f04278f97b --- /dev/null +++ b/source/run/include/G4VUserParallelWorld.hh @@ -0,0 +1,68 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4VUserParallelWorld.hh,v 1.2 2006/12/13 15:49:32 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// + +#ifndef G4VUserParallelWorld_h +#define G4VUserParallelWorld_h 1 + +class G4VPhysicalVolume; + +#include "globals.hh" + +// class description: +// +// This is the abstract base class of the user's parallel world. +// The user MUST NOT create the worls volume, but should get it from GetWorld() +// protected method, and fill inside as the Construct() method. +// The constructor must take a unique name of the parallel world, which is used +// for the name of the world physical volume of this parallel world. +// + +class G4VUserParallelWorld +{ + public: + G4VUserParallelWorld(G4String worldName); + virtual ~G4VUserParallelWorld(); + + public: + virtual void Construct() = 0; + + protected: + G4String fWorldName; + + protected: + G4VPhysicalVolume* GetWorld(); + + public: + inline G4String GetName() { return fWorldName; } + +}; + +#endif + diff --git a/source/run/include/G4VUserPhysicsList.hh b/source/run/include/G4VUserPhysicsList.hh index ef5c1a811c..0d72ea14c7 100644 --- a/source/run/include/G4VUserPhysicsList.hh +++ b/source/run/include/G4VUserPhysicsList.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VUserPhysicsList.hh,v 1.30 2006/06/29 21:13:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VUserPhysicsList.hh,v 1.31 2006/11/23 00:06:48 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ @@ -295,6 +295,13 @@ class G4VUserPhysicsList private: enum { FixedStringLengthForStore = 32 }; + private: + G4bool useCoupledTransportation; + + public: + inline void UseCoupledTransportation(G4bool vl=true) + { useCoupledTransportation = vl; } + //////////////////////////////////////////////////////////////////////////// // Following method is for backward compatibility and removed soon //////////////////////////////////////////////////////////////////////////// diff --git a/source/run/include/G4VUserPrimaryGeneratorAction.hh b/source/run/include/G4VUserPrimaryGeneratorAction.hh index fa3aafe2bf..501a89bd9d 100644 --- a/source/run/include/G4VUserPrimaryGeneratorAction.hh +++ b/source/run/include/G4VUserPrimaryGeneratorAction.hh @@ -25,7 +25,7 @@ // // // $Id: G4VUserPrimaryGeneratorAction.hh,v 1.5 2006/06/29 21:13:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VUserPrimaryGeneratorAction_h diff --git a/source/run/src/G4ExceptionHandler.cc b/source/run/src/G4ExceptionHandler.cc index 9ed67597b6..deba6bf804 100644 --- a/source/run/src/G4ExceptionHandler.cc +++ b/source/run/src/G4ExceptionHandler.cc @@ -25,7 +25,7 @@ // // // $Id: G4ExceptionHandler.cc,v 1.4 2006/06/29 21:13:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/run/src/G4MSSteppingAction.cc b/source/run/src/G4MSSteppingAction.cc index f51a8db131..cdcdebae10 100644 --- a/source/run/src/G4MSSteppingAction.cc +++ b/source/run/src/G4MSSteppingAction.cc @@ -25,7 +25,7 @@ // // // $Id: G4MSSteppingAction.cc,v 1.2 2006/06/29 21:13:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // diff --git a/source/run/src/G4MatScanMessenger.cc b/source/run/src/G4MatScanMessenger.cc index f3861a06ba..09f363747c 100644 --- a/source/run/src/G4MatScanMessenger.cc +++ b/source/run/src/G4MatScanMessenger.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4MatScanMessenger.cc,v 1.4 2006/06/29 21:13:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4MatScanMessenger.cc,v 1.5 2006/12/01 02:00:55 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // @@ -142,6 +142,7 @@ G4MatScanMessenger::~G4MatScanMessenger() delete thetaCmd; delete phiCmd; delete singleCmd; + delete single2Cmd; delete eyePosCmd; delete regSenseCmd; delete regionCmd; diff --git a/source/run/src/G4MaterialScanner.cc b/source/run/src/G4MaterialScanner.cc index 82348771bc..813a25c0ca 100644 --- a/source/run/src/G4MaterialScanner.cc +++ b/source/run/src/G4MaterialScanner.cc @@ -25,7 +25,7 @@ // // // $Id: G4MaterialScanner.cc,v 1.3 2006/06/29 21:13:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // diff --git a/source/run/src/G4Run.cc b/source/run/src/G4Run.cc index d93b9de09c..9c1dce6617 100644 --- a/source/run/src/G4Run.cc +++ b/source/run/src/G4Run.cc @@ -24,19 +24,28 @@ // ******************************************************************** // // -// $Id: G4Run.cc,v 1.10 2006/06/29 21:13:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Run.cc,v 1.11 2006/11/23 00:06:49 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4Run.hh" +#include "G4Event.hh" G4Run::G4Run() :runID(0),numberOfEvent(0),numberOfEventToBeProcessed(0),HCtable(0),DCtable(0) -{;} +{ eventVector = new std::vector; } G4Run::~G4Run() -{;} +{ + std::vector::iterator itr = eventVector->begin(); + for(;itr!=eventVector->end();itr++) + { delete *itr; } + delete eventVector; +} void G4Run::RecordEvent(const G4Event*) { numberOfEvent++; } +void G4Run::StoreEvent(G4Event* evt) +{ eventVector->push_back(evt); } + diff --git a/source/run/src/G4RunManager.cc b/source/run/src/G4RunManager.cc index 5967f19ddf..b26f292fa0 100644 --- a/source/run/src/G4RunManager.cc +++ b/source/run/src/G4RunManager.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4RunManager.cc,v 1.90.2.1 2006/06/29 21:13:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4RunManager.cc,v 1.93 2006/12/13 15:49:34 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // @@ -71,7 +71,8 @@ G4RunManager::G4RunManager() runAborted(false),initializedAtLeastOnce(false), geometryToBeOptimized(true),runIDCounter(0),verboseLevel(0),DCtable(0), currentRun(0),currentEvent(0),n_perviousEventsToBeStored(0), - numberOfEventToBeProcessed(0),storeRandomNumberStatus(false),currentWorld(0) + numberOfEventToBeProcessed(0),storeRandomNumberStatus(false),currentWorld(0), + nParallelWorlds(0) { if(fRunManager) { G4Exception("G4RunManager constructed twice."); } @@ -94,6 +95,7 @@ G4RunManager::G4RunManager() G4RunManager::~G4RunManager() { + if(currentRun) delete currentRun; delete timer; delete runMessenger; G4ParticleTable::GetParticleTable()->DeleteMessenger(); @@ -173,8 +175,9 @@ G4bool G4RunManager::ConfirmBeamOnCondition() void G4RunManager::RunInitialization() { if(!(kernel->RunInitialization())) return; - + if(currentRun) delete currentRun; currentRun = 0; + if(userRunAction) currentRun = userRunAction->GenerateRun(); if(!currentRun) currentRun = new G4Run(); @@ -196,12 +199,6 @@ void G4RunManager::RunInitialization() HepRandom::saveEngineStatus(fileN); } - for(size_t itr=0;itrsize();itr++) - { delete (*previousEvents)[itr]; } - previousEvents->clear(); - for(G4int i_prev=0;i_prevpush_back((G4Event*)0); } - if(userRunAction) userRunAction->BeginOfRunAction(currentRun); runAborted = false; @@ -284,15 +281,18 @@ void G4RunManager::AnalyzeEvent(G4Event* anEvent) void G4RunManager::RunTermination() { for(size_t itr=0;itrsize();itr++) - { delete (*previousEvents)[itr]; } + { + G4Event* prevEv = (*previousEvents)[itr]; + if((prevEv) && !(prevEv->ToBeKept())) delete prevEv; + } previousEvents->clear(); + for(G4int i_prev=0;i_prevpush_back((G4Event*)0); } if(userRunAction) userRunAction->EndOfRunAction(currentRun); G4VPersistencyManager* fPersM = G4VPersistencyManager::GetPersistencyManager(); if(fPersM) fPersM->Store(currentRun); - delete currentRun; - currentRun = 0; runIDCounter++; kernel->RunTermination(); @@ -300,6 +300,7 @@ void G4RunManager::RunTermination() void G4RunManager::StackPreviousEvent(G4Event* anEvent) { + if(anEvent->ToBeKept()) currentRun->StoreEvent(anEvent); G4Event* evt; if(n_perviousEventsToBeStored==0) { evt = anEvent; } @@ -309,7 +310,7 @@ void G4RunManager::StackPreviousEvent(G4Event* anEvent) evt = previousEvents->back(); previousEvents->pop_back(); } - delete evt; + if(!(evt->ToBeKept())) delete evt; } void G4RunManager::Initialize() @@ -338,7 +339,7 @@ void G4RunManager::InitializeGeometry() if(verboseLevel>1) G4cout << "userDetector->Construct() start." << G4endl; kernel->DefineWorldVolume(userDetector->Construct(),false); - //////////////////////////////////////////////userDetector->ConstructParallelGeometries(); + nParallelWorlds = userDetector->ConstructParallelGeometries(); geometryInitialized = true; } @@ -347,6 +348,7 @@ void G4RunManager::InitializePhysics() if(physicsList) { if(verboseLevel>1) G4cout << "physicsList->Construct() start." << G4endl; + if(nParallelWorlds>0) physicsList->UseCoupledTransportation(); kernel->InitializePhysics(); } else @@ -401,7 +403,7 @@ void G4RunManager::DefineWorldVolume(G4VPhysicalVolume* worldVol, void G4RunManager::rndmSaveThisRun() { G4int runNumber = runIDCounter; - if(currentRun == 0) runNumber--; //state Idle; decrease runNumber + /////////////if(currentRun == 0) runNumber--; //state Idle; decrease runNumber if(!storeRandomNumberStatus || runNumber < 0) { G4cerr << "Warning from G4RunManager::rndmSaveThisRun():" << " there is no currentRun or its RandomEngineStatus is not available." diff --git a/source/run/src/G4RunManagerKernel.cc b/source/run/src/G4RunManagerKernel.cc index e35fa6b89a..1a9330562f 100644 --- a/source/run/src/G4RunManagerKernel.cc +++ b/source/run/src/G4RunManagerKernel.cc @@ -24,13 +24,15 @@ // ******************************************************************** // // -// $Id: G4RunManagerKernel.cc,v 1.34 2006/06/29 21:13:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4RunManagerKernel.cc,v 1.37 2006/12/01 01:23:35 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // #include "G4RunManagerKernel.hh" +#include + #include "G4StateManager.hh" #include "G4ApplicationState.hh" #include "G4ExceptionHandler.hh" @@ -51,7 +53,10 @@ #include "G4UnitsTable.hh" #include "G4Version.hh" #include "G4ios.hh" -#include + +#ifdef G4FPE_DEBUG + #include "G4FPEDetection.hh" +#endif G4RunManagerKernel* G4RunManagerKernel::fRunManagerKernel = 0; @@ -64,6 +69,10 @@ G4RunManagerKernel::G4RunManagerKernel() geometryNeedsToBeClosed(true),geometryToBeOptimized(true), physicsNeedsToBeReBuilt(true),verboseLevel(0) { +#ifdef G4FPE_DEBUG + InvalidOperationDetection(); +#endif + defaultExceptionHandler = new G4ExceptionHandler(); if(fRunManagerKernel) { @@ -119,11 +128,15 @@ G4RunManagerKernel::~G4RunManagerKernel() } delete eventManager; if(verboseLevel>1) G4cout << "EventManager deleted." << G4endl; + delete defaultRegion; + if(verboseLevel>1) G4cout << "Default detector region deleted." << G4endl; G4UImanager* pUImanager = G4UImanager::GetUIpointer(); { if(pUImanager) delete pUImanager; if(verboseLevel>1) G4cout << "UImanager deleted." << G4endl; } + G4UnitDefinition::ClearUnitsTable(); + if(verboseLevel>1) G4cout << "Units table cleared." << G4endl; delete pStateManager; if(verboseLevel>1) G4cout << "StateManager deleted." << G4endl; delete defaultExceptionHandler; @@ -191,8 +204,7 @@ void G4RunManagerKernel::DefineWorldVolume(G4VPhysicalVolume* worldVol, // Set the world volume, notify the Navigator and reset its state G4TransportationManager::GetTransportationManager() - ->GetNavigatorForTracking() - ->SetWorldVolume(currentWorld); + ->SetWorldForTracking(currentWorld); if(topologyIsChanged) geometryNeedsToBeClosed = true; // Notify the VisManager as well @@ -351,12 +363,26 @@ void G4RunManagerKernel::BuildPhysicsTables() void G4RunManagerKernel::CheckRegions() { - G4RegionStore::GetInstance()->SetWorldVolume(); - + G4TransportationManager* transM = G4TransportationManager::GetTransportationManager(); + size_t nWorlds = transM->GetNoWorlds(); + std::vector::iterator wItr; for(size_t i=0;isize();i++) { G4Region* region = (*(G4RegionStore::GetInstance()))[i]; + + //Let each region have a pointer to the world volume where it belongs to. + //G4Region::SetWorld() checks if the region belongs to the given world and set it + //only if it does. Thus, here we go through all the registered world volumes. + wItr = transM->GetWorldsIterator(); + for(size_t iw=0;iwSetWorld(*wItr); + wItr++; + } + + //Now check for the regions which belongs to the tracking world if(region->GetWorldPhysical()!=currentWorld) continue; + G4ProductionCuts* cuts = region->GetProductionCuts(); if(!cuts) { diff --git a/source/run/src/G4RunMessenger.cc b/source/run/src/G4RunMessenger.cc index 4b1215d14b..a186f14506 100644 --- a/source/run/src/G4RunMessenger.cc +++ b/source/run/src/G4RunMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: G4RunMessenger.cc,v 1.23 2006/06/29 21:13:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4RunMessenger.hh" diff --git a/source/run/src/G4UserPhysicsListMessenger.cc b/source/run/src/G4UserPhysicsListMessenger.cc index 68fd1e656c..256c8a20df 100644 --- a/source/run/src/G4UserPhysicsListMessenger.cc +++ b/source/run/src/G4UserPhysicsListMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: G4UserPhysicsListMessenger.cc,v 1.26 2006/06/29 21:13:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/run/src/G4UserRunAction.cc b/source/run/src/G4UserRunAction.cc index 703e609e65..37f973e87c 100644 --- a/source/run/src/G4UserRunAction.cc +++ b/source/run/src/G4UserRunAction.cc @@ -25,7 +25,7 @@ // // // $Id: G4UserRunAction.cc,v 1.8 2006/06/29 21:13:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4UserRunAction.hh" diff --git a/source/run/src/G4VModularPhysicsList.cc b/source/run/src/G4VModularPhysicsList.cc index 38828874a4..2849af2659 100644 --- a/source/run/src/G4VModularPhysicsList.cc +++ b/source/run/src/G4VModularPhysicsList.cc @@ -25,7 +25,7 @@ // // // $Id: G4VModularPhysicsList.cc,v 1.3 2006/06/29 21:14:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/run/src/G4VPersistencyManager.cc b/source/run/src/G4VPersistencyManager.cc index 405ffefa2a..1e48f9da16 100644 --- a/source/run/src/G4VPersistencyManager.cc +++ b/source/run/src/G4VPersistencyManager.cc @@ -25,7 +25,7 @@ // // // $Id: G4VPersistencyManager.cc,v 1.5 2006/06/29 21:14:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4VPersistencyManager.hh" diff --git a/source/run/src/G4VUserDetectorConstruction.cc b/source/run/src/G4VUserDetectorConstruction.cc index d26a05f66b..824f66ff2b 100644 --- a/source/run/src/G4VUserDetectorConstruction.cc +++ b/source/run/src/G4VUserDetectorConstruction.cc @@ -24,12 +24,13 @@ // ******************************************************************** // // -// $Id: G4VUserDetectorConstruction.cc,v 1.3.12.1 2006/06/29 21:14:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VUserDetectorConstruction.cc,v 1.7 2006/12/13 15:49:36 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4VUserDetectorConstruction.hh" #include "G4VPhysicalVolume.hh" +#include "G4VUserParallelWorld.hh" G4VUserDetectorConstruction::G4VUserDetectorConstruction() {;} @@ -37,3 +38,32 @@ G4VUserDetectorConstruction::G4VUserDetectorConstruction() G4VUserDetectorConstruction::~G4VUserDetectorConstruction() {;} +void G4VUserDetectorConstruction::RegisterParallelWorld(G4VUserParallelWorld* aPW) +{ + std::vector::iterator pwItr; + for(pwItr=parallelWorld.begin();pwItr!=parallelWorld.end();pwItr++) + { + if((*pwItr)->GetName()==aPW->GetName()) + { + G4String eM = "A parallel world <"; + eM += aPW->GetName(); + eM += "> is already registered to the user detector construction."; + G4Exception("G4VUserDetectorConstruction::RegisterParallelWorld", + "RunUDet000",FatalErrorInArgument,eM); + } + } + parallelWorld.push_back(aPW); +} + +G4int G4VUserDetectorConstruction::ConstructParallelGeometries() +{ + G4int nP = 0; + std::vector::iterator pwItr; + for(pwItr=parallelWorld.begin();pwItr!=parallelWorld.end();pwItr++) + { + (*pwItr)->Construct(); + nP++; + } + return nP; +} + diff --git a/source/visualization/modeling/include/G4TrajectoriesModel.icc b/source/run/src/G4VUserParallelWorld.cc similarity index 74% rename from source/visualization/modeling/include/G4TrajectoriesModel.icc rename to source/run/src/G4VUserParallelWorld.cc index 558579883b..152d0cb98d 100644 --- a/source/visualization/modeling/include/G4TrajectoriesModel.icc +++ b/source/run/src/G4VUserParallelWorld.cc @@ -24,13 +24,28 @@ // ******************************************************************** // // -// $Id: G4TrajectoriesModel.icc,v 1.7 2006/06/29 21:31:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VUserParallelWorld.cc,v 1.2 2006/12/13 15:49:38 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// -inline G4String G4TrajectoriesModel::GetCurrentTag () const { - return fGlobalTag; +#include "G4VUserParallelWorld.hh" + +#include "G4TransportationManager.hh" +#include "G4VPhysicalVolume.hh" + +G4VUserParallelWorld::G4VUserParallelWorld(G4String worldName) +{ fWorldName = worldName; } + +G4VUserParallelWorld::~G4VUserParallelWorld() +{ ; } + +G4VPhysicalVolume* G4VUserParallelWorld::GetWorld() +{ + G4VPhysicalVolume* pWorld + = G4TransportationManager::GetTransportationManager() + ->GetParallelWorld(fWorldName); + pWorld->SetName(fWorldName); + return pWorld; } -inline G4String G4TrajectoriesModel::GetCurrentDescription () const { - return fGlobalDescription; -} + diff --git a/source/run/src/G4VUserPhysicsList.cc b/source/run/src/G4VUserPhysicsList.cc index 52780e6ee0..b5422df31b 100644 --- a/source/run/src/G4VUserPhysicsList.cc +++ b/source/run/src/G4VUserPhysicsList.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VUserPhysicsList.cc,v 1.53 2006/06/29 21:14:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VUserPhysicsList.cc,v 1.55 2006/12/13 15:49:40 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ @@ -72,7 +72,8 @@ G4VUserPhysicsList::G4VUserPhysicsList() fIsCheckedForRetrievePhysicsTable(false), fIsRestoredCutValues(false), directoryPhysicsTable("."), - fDisplayThreshold(0) + fDisplayThreshold(0), + useCoupledTransportation(false) { // default cut value (1.0mm) defaultCutValue = 1.0*mm; @@ -218,9 +219,25 @@ void G4VUserPhysicsList::RemoveProcessManager() //////////////////////////////////////////////////////// #include "G4Transportation.hh" +#include "G4CoupledTransportation.hh" + void G4VUserPhysicsList::AddTransportation() { - G4Transportation* theTransportationProcess= new G4Transportation(); + G4VProcess* theTransportationProcess; + + if(!useCoupledTransportation) + { theTransportationProcess= new G4Transportation(); } + else + { + G4int verboseLevelTransport = 0; + theTransportationProcess= new G4CoupledTransportation(verboseLevelTransport); + G4cout << G4endl; + G4cout << " ********************************************************************* " << G4endl; + G4cout << " ** Now using G4CoupledTransportation in place of G4Transportation ** " << G4endl; + G4cout << " ********************************************************************* " + << G4endl; + G4cout << G4endl; + } #ifdef G4VERBOSE if (verboseLevel >2){ @@ -541,7 +558,7 @@ G4bool G4VUserPhysicsList::StorePhysicsTable(const G4String& directory) G4String dir = directory; if (dir.isNull()) dir = directoryPhysicsTable; else directoryPhysicsTable = dir; - + // store CutsTable info if (!fCutsTable->StoreCutsTable(dir, ascii)) { G4Exception("G4VUserPhysicsList::StorePhysicsTable","Faile to store ", @@ -677,5 +694,3 @@ void G4VUserPhysicsList::DumpCutValues(G4ParticleDefinition* ) G4cerr << " This dummy method implementation will be removed soon." << G4endl; DumpCutValuesTable(); } - - diff --git a/source/run/src/G4VUserPrimaryGeneratorAction.cc b/source/run/src/G4VUserPrimaryGeneratorAction.cc index 1f4e5a7088..89e298e20e 100644 --- a/source/run/src/G4VUserPrimaryGeneratorAction.cc +++ b/source/run/src/G4VUserPrimaryGeneratorAction.cc @@ -25,7 +25,7 @@ // // // $Id: G4VUserPrimaryGeneratorAction.cc,v 1.5 2006/06/29 21:14:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4VUserPrimaryGeneratorAction.hh" diff --git a/source/track/GNUmakefile b/source/track/GNUmakefile index d42cadd1da..275f95e921 100644 --- a/source/track/GNUmakefile +++ b/source/track/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.5 2004/06/11 14:28:12 gcosmo Exp $ +# $Id: GNUmakefile,v 1.6 2006/04/28 13:45:48 asaim Exp $ # ---------------------------------------------------------- # GNUmakefile for track library. Gabriele Cosmo, 3/4/1997. # ---------------------------------------------------------- @@ -23,6 +23,7 @@ CPPFLAGS += \ -I$(G4BASE)/intercoms/include \ -I$(G4BASE)/particles/management/include \ -I$(G4BASE)/materials/include \ + -I$(G4BASE)/geometry/magneticfield/include \ -I$(G4BASE)/geometry/management/include include $(G4INSTALL)/config/common.gmk diff --git a/source/track/History b/source/track/History index 9953866988..624ecf4698 100644 --- a/source/track/History +++ b/source/track/History @@ -1,4 +1,4 @@ -$Id: History,v 1.86 2006/06/07 17:18:11 vnivanch Exp $ +$Id: History,v 1.93 2006/11/03 17:48:31 japost Exp $ ------------------------------------------------------------------- ========================================================= @@ -16,6 +16,31 @@ committal in the CVS repository ! ---------------------------------------------------------- * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +Nov 3, 06 J.Apostolakis (track-V08-01-04) +- New methods first/lastStepInVolume flag in G4Step, G4VParticleChange by Hisaya +- Revised UpdateStepForPostStep by John Apostolakis + +Oct 31, 06 G.Cosmo (track-V08-01-03) +- Made operator=() inline. + +Aug 29, 06 H.Kurashige (track-V08-01-02) +- Add methods for setting polarization and modifying weight + for G4ParticleChangeFoeGamma and G4ParticleChangeForLoss + (V.Ivanchenko) + +July 17, 06 M.Asai (track-V08-01-01) +- Re-tagged for G4Step and G4TrackVector only. + +June 09, 06 M.Asai (track-V08-01-00) +- tagged for G4FieldTrackUpdator, G4Step and G4TrackVector. + +June 09, 06 T.Sasaki +- G4Step now has secondary vector +- G4TrackVector was moved from tracking category + +June 09, 06 M.Asai +- Introducing G4FieldTrackUpdator class. +- GNUmakefile now includes geometry/magneticfield June 07, 06 V.Ivanchenko (track-V08-00-03) - G4ParticleChangeForLoss - remove momentum change AlongStep diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04TrackerSD.hh b/source/track/include/G4FieldTrackUpdator.hh similarity index 72% rename from examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04TrackerSD.hh rename to source/track/include/G4FieldTrackUpdator.hh index ecad52025b..dbf952e274 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx01-clhep/include/ExN04TrackerSD.hh +++ b/source/track/include/G4FieldTrackUpdator.hh @@ -23,38 +23,48 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// +// $Id: G4FieldTrackUpdator.hh,v 1.2 2006/12/13 15:49:43 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// M. Asai - first implementation Apr/28/2006 +// +//--------------------------------------------------------------- +// +// G4FieldTrackUpdator.hh +// +//--------------------------------------------------------------- -#ifndef ExN04TrackerSD_h -#define ExN04TrackerSD_h 1 +#ifndef G4FieldTrackUpdator_h +#define G4FieldTrackUpdator_h 1 -#include "G4VSensitiveDetector.hh" -#include "ExN04TrackerHit.hh" -class G4Step; -class G4HCofThisEvent; -class G4TouchableHistory; +class G4FieldTrack; +class G4Track; -class ExN04TrackerSD : public G4VSensitiveDetector +class G4FieldTrackUpdator { + private: + G4FieldTrackUpdator() {;} + ~G4FieldTrackUpdator() {;} - public: - ExN04TrackerSD(G4String name); - ~ExN04TrackerSD(); - - void Initialize(G4HCofThisEvent*HCE); - G4bool ProcessHits(G4Step*aStep,G4TouchableHistory*ROhist); - void EndOfEvent(G4HCofThisEvent*HCE); - void clear(); - void DrawAll(); - void PrintAll(); - - private: - ExN04TrackerHitsCollection *trackerCollection; - - public: + public: + static G4FieldTrack* CreateFieldTrack(const G4Track*); + static void Update(G4FieldTrack*,const G4Track*); }; - - - #endif + + + + + + + + + + + + + + diff --git a/source/track/include/G4ForceCondition.hh b/source/track/include/G4ForceCondition.hh index 8a315bc7f8..f83bdf0426 100644 --- a/source/track/include/G4ForceCondition.hh +++ b/source/track/include/G4ForceCondition.hh @@ -25,7 +25,7 @@ // // // $Id: G4ForceCondition.hh,v 1.5 2006/06/29 21:14:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/track/include/G4GPILSelection.hh b/source/track/include/G4GPILSelection.hh index 6157392487..1758d99e08 100644 --- a/source/track/include/G4GPILSelection.hh +++ b/source/track/include/G4GPILSelection.hh @@ -25,7 +25,7 @@ // // // $Id: G4GPILSelection.hh,v 1.4 2006/06/29 21:14:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/track/include/G4ParticleChange.hh b/source/track/include/G4ParticleChange.hh index 08597b6e4c..cd55a9f9eb 100644 --- a/source/track/include/G4ParticleChange.hh +++ b/source/track/include/G4ParticleChange.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParticleChange.hh,v 1.12 2006/06/29 21:14:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/track/include/G4ParticleChange.icc b/source/track/include/G4ParticleChange.icc index 24cf20531d..db6c43e35c 100644 --- a/source/track/include/G4ParticleChange.icc +++ b/source/track/include/G4ParticleChange.icc @@ -25,7 +25,7 @@ // // // $Id: G4ParticleChange.icc,v 1.13 2006/06/29 21:14:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // inline diff --git a/source/track/include/G4ParticleChangeForDecay.hh b/source/track/include/G4ParticleChangeForDecay.hh index 620db817ed..840b5fa80a 100644 --- a/source/track/include/G4ParticleChangeForDecay.hh +++ b/source/track/include/G4ParticleChangeForDecay.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParticleChangeForDecay.hh,v 1.9 2006/06/29 21:14:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/track/include/G4ParticleChangeForGamma.hh b/source/track/include/G4ParticleChangeForGamma.hh index 4586f0e10a..fc95045cfc 100644 --- a/source/track/include/G4ParticleChangeForGamma.hh +++ b/source/track/include/G4ParticleChangeForGamma.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4ParticleChangeForGamma.hh,v 1.5 2006/06/29 21:14:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ParticleChangeForGamma.hh,v 1.8 2006/08/28 16:10:06 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ @@ -38,6 +38,9 @@ // Modified: // 30.05.05 : add UpdateStepForAtRest (V.Ivanchenko) // 04.12.05 : apply UpdateStepForPostStep in any case (mma) +// 26.08.06 : Add->Set polarization; +// add const method to access track; +// add weight modification (V.Ivanchenko) // // ------------------------------------------------------------ // @@ -90,6 +93,8 @@ public: void ProposePolarization(const G4ThreeVector& dir); void ProposePolarization(G4double Px, G4double Py, G4double Pz); + const G4Track* GetCurrentTrack() const; + virtual void DumpInfo() const; // for Debug @@ -112,7 +117,7 @@ private: // The final momentum direction of the current particle. G4ThreeVector proposedPolarization; - // The final momentum direction of the current particle. + // The final polarization of the current particle. }; // ------------------------------------------------------------ @@ -147,6 +152,11 @@ inline proposedMomentumDirection.setZ(Pz); } +inline const G4Track* G4ParticleChangeForGamma::GetCurrentTrack() const +{ + return currentTrack; +} + inline const G4ThreeVector& G4ParticleChangeForGamma::GetProposedPolarization() const { @@ -187,6 +197,8 @@ inline G4Step* G4ParticleChangeForGamma::UpdateStepForAtRest(G4Step* pStep) { pStep->AddTotalEnergyDeposit( theLocalEnergyDeposit ); pStep->SetStepLength( 0.0 ); + if (!fSetParentWeightByProcess) + pStep->GetPostStepPoint()->SetWeight( theParentWeight ); return pStep; } @@ -195,12 +207,13 @@ inline G4Step* G4ParticleChangeForGamma::UpdateStepForPostStep(G4Step* pStep) G4StepPoint* pPostStepPoint = pStep->GetPostStepPoint(); pPostStepPoint->SetKineticEnergy( proposedKinEnergy ); pPostStepPoint->SetMomentumDirection( proposedMomentumDirection ); - pPostStepPoint->AddPolarization( proposedPolarization ); + pPostStepPoint->SetPolarization( proposedPolarization ); // update weight // this feature is commented out, it should be overwritten in case // if energy loss processes will use biasing - // pPostStepPoint->SetWeight( theProposedWeight ); + if (!fSetParentWeightByProcess) + pPostStepPoint->SetWeight( theParentWeight ); pStep->AddTotalEnergyDeposit( theLocalEnergyDeposit ); return pStep; diff --git a/source/track/include/G4ParticleChangeForLoss.hh b/source/track/include/G4ParticleChangeForLoss.hh index a730027b2d..5ef0cbe90a 100644 --- a/source/track/include/G4ParticleChangeForLoss.hh +++ b/source/track/include/G4ParticleChangeForLoss.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4ParticleChangeForLoss.hh,v 1.18 2006/06/29 21:14:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ParticleChangeForLoss.hh,v 1.19 2006/08/28 16:10:06 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ @@ -41,6 +41,7 @@ // 30.01.06 V.Ivanchenko add ProposedMomentumDirection for AlongStep // and ProposeWeight for PostStep // 07.06.06 V.Ivanchenko RemoveProposedMomentumDirection from AlongStep +// 28.08.06 V.Ivanchenko Add access to current track and polarizaion // // ------------------------------------------------------------ // @@ -100,6 +101,12 @@ public: void ProposeMomentumDirection(const G4ThreeVector& Pfinal); // Get/Propose the MomentumDirection vector: it is the final momentum direction. + const G4ThreeVector& GetProposedPolarization() const; + void ProposePolarization(const G4ThreeVector& dir); + void ProposePolarization(G4double Px, G4double Py, G4double Pz); + + const G4Track* GetCurrentTrack() const; + virtual void DumpInfo() const; // for Debug @@ -123,6 +130,9 @@ private: G4ThreeVector proposedMomentumDirection; // The final momentum direction of the current particle. + + G4ThreeVector proposedPolarization; + // The final polarization of the current particle. }; // ------------------------------------------------------------ @@ -189,6 +199,31 @@ inline proposedMomentumDirection.setZ(Pz); } +inline const G4Track* G4ParticleChangeForLoss::GetCurrentTrack() const +{ + return currentTrack; +} + +inline + const G4ThreeVector& G4ParticleChangeForLoss::GetProposedPolarization() const +{ + return proposedPolarization; +} + +inline + void G4ParticleChangeForLoss::ProposePolarization(const G4ThreeVector& dir) +{ + proposedPolarization = dir; +} + +inline + void G4ParticleChangeForLoss::ProposePolarization(G4double Px, G4double Py, G4double Pz) +{ + proposedPolarization.setX(Px); + proposedPolarization.setY(Py); + proposedPolarization.setZ(Pz); +} + inline void G4ParticleChangeForLoss::InitializeForAlongStep(const G4Track& track) { theStatusChange = track.GetTrackStatus(); @@ -208,6 +243,7 @@ inline void G4ParticleChangeForLoss::InitializeForPostStep(const G4Track& track) proposedKinEnergy = track.GetKineticEnergy(); currentCharge = track.GetDynamicParticle()->GetCharge(); proposedMomentumDirection = track.GetMomentumDirection(); + proposedPolarization = track.GetPolarization(); currentTrack = &track; } @@ -235,7 +271,8 @@ inline G4Step* G4ParticleChangeForLoss::UpdateStepForAlongStep(G4Step* pStep) // update weight // this feature is commented out, it should be overwritten in case // if energy loss processes will use biasing - // G4double newWeight = theParentWeight/(pPreStepPoint->GetWeight())*(pPostStepPoint->GetWeight()); + // G4double newWeight = theParentWeight*(pPostStepPoint->GetWeight()) + // /(pPreStepPoint->GetWeight()); // pPostStepPoint->SetWeight( newWeight ); pStep->AddTotalEnergyDeposit( theLocalEnergyDeposit ); return pStep; @@ -247,10 +284,11 @@ inline G4Step* G4ParticleChangeForLoss::UpdateStepForPostStep(G4Step* pStep) pPostStepPoint->SetCharge( currentCharge ); pPostStepPoint->SetMomentumDirection( proposedMomentumDirection ); pPostStepPoint->SetKineticEnergy( proposedKinEnergy ); - // update weight - // this feature is commented out, it should be overwritten in case - // if energy loss processes will use biasing - pPostStepPoint->SetWeight( theParentWeight ); + pPostStepPoint->SetPolarization( proposedPolarization ); + // update weight if process cannot do that + if (!fSetParentWeightByProcess) + pPostStepPoint->SetWeight( theParentWeight ); + pStep->AddTotalEnergyDeposit( theLocalEnergyDeposit ); return pStep; } diff --git a/source/track/include/G4ParticleChangeForMSC.icc b/source/track/include/G4ParticleChangeForMSC.icc index dd7b4ac267..d73c5d09db 100644 --- a/source/track/include/G4ParticleChangeForMSC.icc +++ b/source/track/include/G4ParticleChangeForMSC.icc @@ -25,7 +25,7 @@ // // // $Id: G4ParticleChangeForMSC.icc,v 1.7 2006/06/29 21:14:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/track/include/G4ParticleChangeForRadDecay.hh b/source/track/include/G4ParticleChangeForRadDecay.hh index c389aa2859..0bd39ba135 100644 --- a/source/track/include/G4ParticleChangeForRadDecay.hh +++ b/source/track/include/G4ParticleChangeForRadDecay.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParticleChangeForRadDecay.hh,v 1.7 2006/06/29 21:14:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/track/include/G4ParticleChangeForTransport.hh b/source/track/include/G4ParticleChangeForTransport.hh index 6c665919da..7ab160a8ad 100644 --- a/source/track/include/G4ParticleChangeForTransport.hh +++ b/source/track/include/G4ParticleChangeForTransport.hh @@ -25,7 +25,7 @@ // // // $Id: G4ParticleChangeForTransport.hh,v 1.16 2006/06/29 21:14:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/track/include/G4ParticleChangeForTransport.icc b/source/track/include/G4ParticleChangeForTransport.icc index fc784076ba..48e9cd4dae 100644 --- a/source/track/include/G4ParticleChangeForTransport.icc +++ b/source/track/include/G4ParticleChangeForTransport.icc @@ -25,7 +25,7 @@ // // // $Id: G4ParticleChangeForTransport.icc,v 1.13 2006/06/29 21:14:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // inline diff --git a/source/track/include/G4Step.hh b/source/track/include/G4Step.hh index 3eb01cd758..80aa6622c1 100644 --- a/source/track/include/G4Step.hh +++ b/source/track/include/G4Step.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Step.hh,v 1.12.2.1 2006/06/29 21:14:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Step.hh,v 1.16 2006/10/30 09:50:13 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- @@ -70,7 +70,7 @@ #include "G4StepStatus.hh" // Include from 'track' class G4Polyline; // Forward declaration. class G4Track; // Forward declaration. - +#include "G4TrackVector.hh" // Include from 'tracking' //////////// class G4Step @@ -123,6 +123,15 @@ class G4Step void ResetTotalEnergyDeposit(); + // Get/Set/Clear flag for initial/last step + G4bool IsFirstStepInVolume() const; + G4bool IsLastStepInVolume() const; + + void SetFirstStepFlag(); + void ClearFirstStepFlag(); + void SetLastStepFlag(); + void ClearLastStepFlag(); + // Other member functions void InitializeStep( G4Track* aValue ); // initiaize contents of G4Step @@ -159,6 +168,19 @@ class G4Step G4SteppingControl fpSteppingControlFlag; // A flag to control SteppingManager behavier from process + // flag for initial/last step + G4bool fFirstStepInVolume; + G4bool fLastStepInVolume; + +// Secondary buckets +public: + G4TrackVector* GetSecondary() const; + G4TrackVector* GetfSecondary(); + G4TrackVector* NewSecondaryVector(); + void DeleteSecondaryVector(); + void SetSecondary( G4TrackVector* value); +private: + G4TrackVector* fSecondary; // Prototyping implementation of smooth representation of curved // trajectories. (jacek 30/10/2002) diff --git a/source/track/include/G4Step.icc b/source/track/include/G4Step.icc index f7dc7a5625..23a0978353 100644 --- a/source/track/include/G4Step.icc +++ b/source/track/include/G4Step.icc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Step.icc,v 1.11.2.1 2006/06/29 21:14:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Step.icc,v 1.15 2006/10/30 09:50:13 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- @@ -228,15 +228,51 @@ inline fpPostStepPoint->SetVelocity(fpTrack->GetVelocity()); } +inline G4TrackVector* G4Step::GetfSecondary() { + return fSecondary; + } +inline G4TrackVector* G4Step::GetSecondary() const { + return fSecondary; + } +inline void G4Step::SetSecondary(G4TrackVector* value) { + fSecondary=value; + } +inline G4TrackVector* G4Step::NewSecondaryVector() { + fSecondary=new G4TrackVector(); + return fSecondary; + } +inline void G4Step::DeleteSecondaryVector() { + delete fSecondary; + } + +inline G4bool G4Step::IsFirstStepInVolume() const +{ + return fFirstStepInVolume; +} + +inline G4bool G4Step::IsLastStepInVolume() const +{ + return fLastStepInVolume; +} + inline void G4Step::SetFirstStepFlag() +{ + fFirstStepInVolume = true; +} + + inline void G4Step::ClearFirstStepFlag() +{ + fFirstStepInVolume = false; +} - - - - - - - - + inline void G4Step::SetLastStepFlag() +{ + fLastStepInVolume = true; +} + + inline void G4Step::ClearLastStepFlag() +{ + fLastStepInVolume = false; +} diff --git a/source/track/include/G4StepPoint.hh b/source/track/include/G4StepPoint.hh index fc54325d6e..8bd023c3b6 100644 --- a/source/track/include/G4StepPoint.hh +++ b/source/track/include/G4StepPoint.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4StepPoint.hh,v 1.16 2006/06/29 21:14:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4StepPoint.hh,v 1.17 2006/10/31 10:01:43 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- @@ -75,103 +75,103 @@ class G4StepPoint // Constructor/Destructor G4StepPoint(); - ~G4StepPoint(){}; + ~G4StepPoint(){} //-------- public: // with description // Get/Set functions - const G4ThreeVector& GetPosition() const; - void SetPosition(const G4ThreeVector& aValue); - void AddPosition(const G4ThreeVector& aValue); + inline const G4ThreeVector& GetPosition() const; + inline void SetPosition(const G4ThreeVector& aValue); + inline void AddPosition(const G4ThreeVector& aValue); - G4double GetLocalTime() const; - void SetLocalTime(const G4double aValue); - void AddLocalTime(const G4double aValue); + inline G4double GetLocalTime() const; + inline void SetLocalTime(const G4double aValue); + inline void AddLocalTime(const G4double aValue); // Time since the track is created. - G4double GetGlobalTime() const; - void SetGlobalTime(const G4double aValue); - void AddGlobalTime(const G4double aValue); + inline G4double GetGlobalTime() const; + inline void SetGlobalTime(const G4double aValue); + inline void AddGlobalTime(const G4double aValue); // Time since the event in which the track belongs is created. - G4double GetProperTime() const; - void SetProperTime(const G4double aValue); - void AddProperTime(const G4double aValue); + inline G4double GetProperTime() const; + inline void SetProperTime(const G4double aValue); + inline void AddProperTime(const G4double aValue); // Proper time of the particle. - const G4ThreeVector& GetMomentumDirection() const; - void SetMomentumDirection(const G4ThreeVector& aValue); - void AddMomentumDirection(const G4ThreeVector& aValue); + inline const G4ThreeVector& GetMomentumDirection() const; + inline void SetMomentumDirection(const G4ThreeVector& aValue); + inline void AddMomentumDirection(const G4ThreeVector& aValue); // Direction of momentum (should be an unit vector) - G4ThreeVector GetMomentum() const; + inline G4ThreeVector GetMomentum() const; // Total momentum of the track - G4double GetTotalEnergy() const; + inline G4double GetTotalEnergy() const; // Total energy of the track - G4double GetKineticEnergy() const; - void SetKineticEnergy(const G4double aValue); - void AddKineticEnergy(const G4double aValue); + inline G4double GetKineticEnergy() const; + inline void SetKineticEnergy(const G4double aValue); + inline void AddKineticEnergy(const G4double aValue); // Kinetic Energy of the track - G4double GetVelocity() const; - void SetVelocity(G4double v); + inline G4double GetVelocity() const; + inline void SetVelocity(G4double v); // - G4double GetBeta() const; + inline G4double GetBeta() const; // Velocity of the track in unit of c(light velocity) - G4double GetGamma() const; + inline G4double GetGamma() const; // Gamma factor (1/sqrt[1-beta*beta]) of the track - G4VPhysicalVolume* GetPhysicalVolume() const; + inline G4VPhysicalVolume* GetPhysicalVolume() const; - const G4VTouchable* GetTouchable() const; - const G4TouchableHandle& GetTouchableHandle() const; - void SetTouchableHandle(const G4TouchableHandle& apValue); + inline const G4VTouchable* GetTouchable() const; + inline const G4TouchableHandle& GetTouchableHandle() const; + inline void SetTouchableHandle(const G4TouchableHandle& apValue); - G4Material* GetMaterial() const; - void SetMaterial(G4Material*); + inline G4Material* GetMaterial() const; + inline void SetMaterial(G4Material*); - const G4MaterialCutsCouple* GetMaterialCutsCouple() const; - void SetMaterialCutsCouple(const G4MaterialCutsCouple*); + inline const G4MaterialCutsCouple* GetMaterialCutsCouple() const; + inline void SetMaterialCutsCouple(const G4MaterialCutsCouple*); - G4VSensitiveDetector* GetSensitiveDetector() const; - void SetSensitiveDetector(G4VSensitiveDetector*); + inline G4VSensitiveDetector* GetSensitiveDetector() const; + inline void SetSensitiveDetector(G4VSensitiveDetector*); - G4double GetSafety() const; - void SetSafety(const G4double aValue); + inline G4double GetSafety() const; + inline void SetSafety(const G4double aValue); - const G4ThreeVector& GetPolarization() const; - void SetPolarization(const G4ThreeVector& aValue); - void AddPolarization(const G4ThreeVector& aValue); + inline const G4ThreeVector& GetPolarization() const; + inline void SetPolarization(const G4ThreeVector& aValue); + inline void AddPolarization(const G4ThreeVector& aValue); - G4StepStatus GetStepStatus() const; - void SetStepStatus(const G4StepStatus aValue); + inline G4StepStatus GetStepStatus() const; + inline void SetStepStatus(const G4StepStatus aValue); - const G4VProcess* GetProcessDefinedStep() const; + inline const G4VProcess* GetProcessDefinedStep() const; // If the pointer is 0, this means the Step is defined // by the user defined limit in the current volume. - void SetProcessDefinedStep(G4VProcess* aValue); + inline void SetProcessDefinedStep(G4VProcess* aValue); - G4double GetMass() const; - void SetMass(G4double value); + inline G4double GetMass() const; + inline void SetMass(G4double value); - G4double GetCharge() const; - void SetCharge(G4double value); + inline G4double GetCharge() const; + inline void SetCharge(G4double value); - void SetWeight(G4double aValue); - G4double GetWeight() const; + inline void SetWeight(G4double aValue); + inline G4double GetWeight() const; public: - // copy constructor and assignment operaor as protected + // copy constructor and assignment operator as protected G4StepPoint(const G4StepPoint &right); - G4StepPoint & operator=(const G4StepPoint &right); + inline G4StepPoint & operator=(const G4StepPoint &right); @@ -213,5 +213,5 @@ class G4StepPoint }; #include "G4StepPoint.icc" -#endif +#endif diff --git a/source/track/include/G4StepPoint.icc b/source/track/include/G4StepPoint.icc index 36d60c53fc..dab1276493 100644 --- a/source/track/include/G4StepPoint.icc +++ b/source/track/include/G4StepPoint.icc @@ -24,10 +24,36 @@ // ******************************************************************** // // -// $Id: G4StepPoint.icc,v 1.11 2006/06/29 21:14:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4StepPoint.icc,v 1.12 2006/10/31 10:01:43 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // + + inline G4StepPoint & G4StepPoint::operator=(const G4StepPoint &right) + { + if (this != &right) { + fPosition = right.fPosition; + fGlobalTime = right.fGlobalTime; + fLocalTime = right.fLocalTime; + fProperTime = right.fProperTime; + fMomentumDirection = right.fMomentumDirection; + fKineticEnergy = right.fKineticEnergy; + fpTouchable = right.fpTouchable; + fpMaterial = right.fpMaterial; + fpMaterialCutsCouple = right.fpMaterialCutsCouple; + fpSensitiveDetector = right.fpSensitiveDetector; + fSafety = right.fSafety; + fPolarization = right.fPolarization; + fStepStatus = right.fStepStatus; + fpProcessDefinedStep = right.fpProcessDefinedStep; + fMass = right.fMass; + fCharge = right.fCharge; + fWeight = right.fWeight; + fVelocity = right.fVelocity; + } + return *this; + } + inline const G4ThreeVector& G4StepPoint::GetPosition() const { return fPosition; } inline void G4StepPoint::SetPosition(const G4ThreeVector& aValue) diff --git a/source/track/include/G4StepStatus.hh b/source/track/include/G4StepStatus.hh index 51e3175aa2..95a7e46e5b 100644 --- a/source/track/include/G4StepStatus.hh +++ b/source/track/include/G4StepStatus.hh @@ -25,7 +25,7 @@ // // // $Id: G4StepStatus.hh,v 1.4 2006/06/29 21:14:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/track/include/G4SteppingControl.hh b/source/track/include/G4SteppingControl.hh index d878e4872d..6fded56758 100644 --- a/source/track/include/G4SteppingControl.hh +++ b/source/track/include/G4SteppingControl.hh @@ -25,7 +25,7 @@ // // // $Id: G4SteppingControl.hh,v 1.4 2006/06/29 21:14:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/track/include/G4Track.hh b/source/track/include/G4Track.hh index 2eff9c904f..364f25c205 100644 --- a/source/track/include/G4Track.hh +++ b/source/track/include/G4Track.hh @@ -25,7 +25,7 @@ // // // $Id: G4Track.hh,v 1.18 2006/06/29 21:14:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/track/include/G4Track.icc b/source/track/include/G4Track.icc index 080ac5320d..d8baa8b321 100644 --- a/source/track/include/G4Track.icc +++ b/source/track/include/G4Track.icc @@ -25,7 +25,7 @@ // // // $Id: G4Track.icc,v 1.14 2006/06/29 21:14:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //----------------------------------------------------------------- // Definitions of inline functions diff --git a/source/track/include/G4TrackFastVector.hh b/source/track/include/G4TrackFastVector.hh index e9f0e33795..4bead6fad2 100644 --- a/source/track/include/G4TrackFastVector.hh +++ b/source/track/include/G4TrackFastVector.hh @@ -25,7 +25,7 @@ // // // $Id: G4TrackFastVector.hh,v 1.5 2006/06/29 21:14:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ diff --git a/source/track/include/G4TrackStatus.hh b/source/track/include/G4TrackStatus.hh index 9893dfa8e0..c9dfc79aee 100644 --- a/source/track/include/G4TrackStatus.hh +++ b/source/track/include/G4TrackStatus.hh @@ -25,7 +25,7 @@ // // // $Id: G4TrackStatus.hh,v 1.4 2006/06/29 21:14:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/tracking/include/G4TrackVector.hh b/source/track/include/G4TrackVector.hh similarity index 93% rename from source/tracking/include/G4TrackVector.hh rename to source/track/include/G4TrackVector.hh index 8b9bc77435..8104d30661 100644 --- a/source/tracking/include/G4TrackVector.hh +++ b/source/track/include/G4TrackVector.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4TrackVector.hh,v 1.11.2.1 2006/06/29 21:15:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4TrackVector.hh,v 1.2 2006/07/17 13:48:28 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------- // @@ -46,7 +46,8 @@ #define G4TrackVector_h 1 #include -#include "G4Track.hh" // Include form 'tracking' +//#include "G4Track.hh" // Include form 'tracking' +class G4Track; /////////////////////////////////////////////////// typedef std::vector G4TrackVector; diff --git a/source/track/include/G4VParticleChange.hh b/source/track/include/G4VParticleChange.hh index 396ee794aa..67c2e93c0f 100644 --- a/source/track/include/G4VParticleChange.hh +++ b/source/track/include/G4VParticleChange.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VParticleChange.hh,v 1.14 2006/06/29 21:14:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VParticleChange.hh,v 1.15 2006/10/30 09:50:13 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // ------------------------------------------------------------ @@ -71,6 +71,8 @@ // add check secondaries 11 June, 03 H.Kurashige // add new methods of ProposeXXX 08 May, 04 H.Kurashige // remove obsolete methods of SetXXX 19 Sep, 04 H.Kurashige +// add flag for first/last step in volume 30 Oct. 2006 H.Kurashige +// #ifndef G4VParticleChange_h #define G4VParticleChange_h 1 @@ -134,6 +136,7 @@ class G4VParticleChange void InitializeStatusChange(const G4Track&); void InitializeSecondaries(const G4Track&); + void InitializeStepInVolumeFlags(const G4Track&); // ------------------------------------------------------ public: // with description @@ -158,6 +161,12 @@ class G4VParticleChange void ProposeSteppingControl(G4SteppingControl StepControlFlag); // Set/Propose a flag to control stepping manager behavier // ------------------------------------------------------ + + //---- the following methods are for managements of initial/last step + G4bool GetFirstStepInVolume() const; + G4bool GetLastStepInVolume() const; + void ProposeFirstStepInVolume(G4bool flag); + void ProposeLastStepInVolume(G4bool flag); //---- the following methods are for managements of secondaries -- void Clear(); @@ -236,6 +245,12 @@ class G4VParticleChange G4double theTrueStepLength; // The value of "True" Step Length + + // flag for initial/last step + G4bool theFirstStepInVolume; + G4bool theLastStepInVolume; + + G4int verboseLevel; // The Verbose level diff --git a/source/track/include/G4VParticleChange.icc b/source/track/include/G4VParticleChange.icc index 85ea899a25..08596e364a 100644 --- a/source/track/include/G4VParticleChange.icc +++ b/source/track/include/G4VParticleChange.icc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VParticleChange.icc,v 1.13 2006/06/29 21:14:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VParticleChange.icc,v 1.15 2006/11/03 17:46:08 japost Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // remove obsolete methods of SetXXX 19 Sep, 04 H.Kurashige //---------------------------------------------------------------- @@ -38,6 +38,12 @@ inline G4Step* G4VParticleChange::UpdateStepInfo(G4Step* pStep) pStep->SetStepLength( theTrueStepLength ); pStep->AddTotalEnergyDeposit( theLocalEnergyDeposit ); pStep->SetControlFlag( theSteppingControlFlag ); + + if (theFirstStepInVolume) {pStep->SetFirstStepFlag();} + else {pStep->ClearFirstStepFlag();} + if (theLastStepInVolume) {pStep->SetLastStepFlag();} + else {pStep->ClearLastStepFlag();} + return pStep; } @@ -108,6 +114,30 @@ void G4VParticleChange::ProposeSteppingControl(G4SteppingControl StepControlFlag theSteppingControlFlag = StepControlFlag; } +inline +G4bool G4VParticleChange::GetFirstStepInVolume() const +{ + return theFirstStepInVolume; +} + +inline +G4bool G4VParticleChange::GetLastStepInVolume() const +{ + return theLastStepInVolume; +} + +inline +void G4VParticleChange::ProposeFirstStepInVolume(G4bool flag) +{ + theFirstStepInVolume = flag; +} + +inline +void G4VParticleChange::ProposeLastStepInVolume(G4bool flag) +{ + theLastStepInVolume = flag; +} + //---------------------------------------------------------------- // Set/Get inline functions // @@ -177,6 +207,8 @@ inline void G4VParticleChange::Clear() { theNumberOfSecondaries = 0; + theFirstStepInVolume = false; + theLastStepInVolume = false; } //---------------------------------------------------------------- @@ -204,6 +236,16 @@ inline void G4VParticleChange::InitializeTrueStepLength(const G4Track& track) // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! } +//---------------------------------------------------------------- +// methods for initialize +inline +void G4VParticleChange::InitializeStepInVolumeFlags(const G4Track& track) +{ + const G4Step* aStep = track.GetStep(); + theFirstStepInVolume = aStep-> IsFirstStepInVolume(); + theLastStepInVolume = aStep-> IsLastStepInVolume(); +} + inline void G4VParticleChange::InitializeSecondaries(const G4Track&) { // clear secondaries @@ -259,6 +301,7 @@ inline void G4VParticleChange::Initialize(const G4Track& track) InitializeTrueStepLength(track); InitializeSecondaries(track); InitializeParentWeight(track); + InitializeStepInVolumeFlags(track); } inline diff --git a/source/track/include/G4VUserTrackInformation.hh b/source/track/include/G4VUserTrackInformation.hh index e770f1b776..928e511114 100644 --- a/source/track/include/G4VUserTrackInformation.hh +++ b/source/track/include/G4VUserTrackInformation.hh @@ -25,7 +25,7 @@ // // // $Id: G4VUserTrackInformation.hh,v 1.6 2006/06/29 21:14:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/examples/extended/parallel/ParN04/src/ExN04GeneralPhysics.cc b/source/track/src/G4FieldTrackUpdator.cc similarity index 56% rename from examples/extended/parallel/ParN04/src/ExN04GeneralPhysics.cc rename to source/track/src/G4FieldTrackUpdator.cc index e3310fd5b2..89484d9332 100644 --- a/examples/extended/parallel/ParN04/src/ExN04GeneralPhysics.cc +++ b/source/track/src/G4FieldTrackUpdator.cc @@ -24,53 +24,54 @@ // ******************************************************************** // // -// $Id: ExN04GeneralPhysics.cc,v 1.3 2006/06/29 17:37:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4FieldTrackUpdator.cc,v 1.2 2006/12/13 15:49:45 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // -// - -#include "ExN04GeneralPhysics.hh" +// M. Asai - first implementation Apr/28/2006 +// +//--------------------------------------------------------------- +// +// G4FieldTrackUpdator.cc +// +//--------------------------------------------------------------- #include "globals.hh" -#include "G4ios.hh" -#include +#include "G4FieldTrackUpdator.hh" +#include "G4ThreeVector.hh" +#include "G4Track.hh" +#include "G4DynamicParticle.hh" +#include "G4TrackStatus.hh" +#include "G4FieldTrack.hh" -ExN04GeneralPhysics::ExN04GeneralPhysics(const G4String& name) - : G4VPhysicsConstructor(name) +G4FieldTrack* G4FieldTrackUpdator::CreateFieldTrack(const G4Track* trk) { + G4FieldTrack* ftrk = new G4FieldTrack( + trk->GetPosition(), + trk->GetGlobalTime(), + trk->GetMomentumDirection(), + trk->GetKineticEnergy(), + trk->GetDynamicParticle()->GetMass(), + trk->GetDynamicParticle()->GetCharge(), + trk->GetDynamicParticle()->GetPolarization(), + 0.0 // magnetic dipole moment to be implemented + ); + return ftrk; } -ExN04GeneralPhysics::~ExN04GeneralPhysics() +void G4FieldTrackUpdator::Update(G4FieldTrack* ftrk,const G4Track* trk) { -} - -#include "G4ParticleDefinition.hh" -#include "G4ProcessManager.hh" -// Bosons -#include "G4ChargedGeantino.hh" -#include "G4Geantino.hh" - -void ExN04GeneralPhysics::ConstructParticle() -{ - // pseudo-particles - G4Geantino::GeantinoDefinition(); - G4ChargedGeantino::ChargedGeantinoDefinition(); -} - -void ExN04GeneralPhysics::ConstructProcess() -{ - // Add Decay Process - theParticleIterator->reset(); - while( (*theParticleIterator)() ){ - G4ParticleDefinition* particle = theParticleIterator->value(); - G4ProcessManager* pmanager = particle->GetProcessManager(); - if (fDecayProcess.IsApplicable(*particle)) { - pmanager ->AddProcess(&fDecayProcess); - // set ordering for PostStepDoIt and AtRestDoIt - pmanager ->SetProcessOrdering(&fDecayProcess, idxPostStep); - pmanager ->SetProcessOrdering(&fDecayProcess, idxAtRest); - } - } + ftrk->UpdateState( + trk->GetPosition(), + trk->GetGlobalTime(), + trk->GetMomentumDirection(), + trk->GetKineticEnergy() + ); + ftrk->SetChargeAndMoments( + trk->GetDynamicParticle()->GetCharge() + ); + ftrk->SetSpin( + trk->GetDynamicParticle()->GetPolarization() + ); } diff --git a/source/track/src/G4ParticleChange.cc b/source/track/src/G4ParticleChange.cc index 4a122830c5..350de41681 100644 --- a/source/track/src/G4ParticleChange.cc +++ b/source/track/src/G4ParticleChange.cc @@ -25,7 +25,7 @@ // // // $Id: G4ParticleChange.cc,v 1.28 2006/06/29 21:15:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/track/src/G4ParticleChangeForDecay.cc b/source/track/src/G4ParticleChangeForDecay.cc index 5034e6d658..bea83f2d27 100644 --- a/source/track/src/G4ParticleChangeForDecay.cc +++ b/source/track/src/G4ParticleChangeForDecay.cc @@ -25,7 +25,7 @@ // // // $Id: G4ParticleChangeForDecay.cc,v 1.11 2006/06/29 21:15:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/track/src/G4ParticleChangeForGamma.cc b/source/track/src/G4ParticleChangeForGamma.cc index 4507527ef4..de76b919d4 100644 --- a/source/track/src/G4ParticleChangeForGamma.cc +++ b/source/track/src/G4ParticleChangeForGamma.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4ParticleChangeForGamma.cc,v 1.2 2006/06/29 21:15:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ParticleChangeForGamma.cc,v 1.3 2006/08/28 16:10:29 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- @@ -35,7 +35,8 @@ // 15 April 2005 V.Ivanchenko for gamma EM processes // -------------------------------------------------------------- // -// Modified: +// Modified:: +// 28.08.06 V.Ivanchenko Add access to current track and polarizaion // // ------------------------------------------------------------ // @@ -68,39 +69,37 @@ G4ParticleChangeForGamma::~G4ParticleChangeForGamma() G4ParticleChangeForGamma::G4ParticleChangeForGamma( const G4ParticleChangeForGamma &right): G4VParticleChange(right) { - if (verboseLevel>1) { + if (verboseLevel>1) G4cout << "G4ParticleChangeForGamma:: copy constructor is called " << G4endl; - } - currentTrack = right.currentTrack; - proposedKinEnergy = right.proposedKinEnergy; - //theProposedWeight = right.theProposedWeight; - proposedMomentumDirection = right.proposedMomentumDirection; - proposedPolarization = right.proposedPolarization; + + currentTrack = right.currentTrack; + proposedKinEnergy = right.proposedKinEnergy; + proposedMomentumDirection = right.proposedMomentumDirection; + proposedPolarization = right.proposedPolarization; } // assignment operator G4ParticleChangeForGamma & G4ParticleChangeForGamma::operator=( - const G4ParticleChangeForGamma &right) + const G4ParticleChangeForGamma &right) { - if (verboseLevel>1) { + if (verboseLevel>1) G4cout << "G4ParticleChangeForGamma:: assignment operator is called " << G4endl; - } - if (this != &right) - { - theListOfSecondaries = right.theListOfSecondaries; - theSizeOftheListOfSecondaries = right.theSizeOftheListOfSecondaries; - theNumberOfSecondaries = right.theNumberOfSecondaries; - theStatusChange = right.theStatusChange; - theLocalEnergyDeposit = right.theLocalEnergyDeposit; - theSteppingControlFlag = right.theSteppingControlFlag; + + if (this != &right) { + theListOfSecondaries = right.theListOfSecondaries; + theSizeOftheListOfSecondaries = right.theSizeOftheListOfSecondaries; + theNumberOfSecondaries = right.theNumberOfSecondaries; + theStatusChange = right.theStatusChange; + theLocalEnergyDeposit = right.theLocalEnergyDeposit; + theSteppingControlFlag = right.theSteppingControlFlag; + theParentWeight = right.theParentWeight; - currentTrack = right.currentTrack; - proposedKinEnergy = right.proposedKinEnergy; - //theProposedWeight = right.theProposedWeight; - proposedMomentumDirection = right.proposedMomentumDirection; - proposedPolarization = right.proposedPolarization; - } - return *this; + currentTrack = right.currentTrack; + proposedKinEnergy = right.proposedKinEnergy; + proposedMomentumDirection = right.proposedMomentumDirection; + proposedPolarization = right.proposedPolarization; + } + return *this; } //---------------------------------------------------------------- diff --git a/source/track/src/G4ParticleChangeForLoss.cc b/source/track/src/G4ParticleChangeForLoss.cc index 20a74ec804..dfb0609b85 100644 --- a/source/track/src/G4ParticleChangeForLoss.cc +++ b/source/track/src/G4ParticleChangeForLoss.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4ParticleChangeForLoss.cc,v 1.15 2006/06/29 21:15:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ParticleChangeForLoss.cc,v 1.16 2006/08/28 16:10:29 vnivanch Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- @@ -38,6 +38,7 @@ // Modified: // 16.01.04 V.Ivanchenko update for model variant of energy loss // 15.04.05 V.Ivanchenko inline update methods +// 28.08.06 V.Ivanchenko Add access to current track and polarizaion // // ------------------------------------------------------------ // @@ -76,7 +77,6 @@ G4ParticleChangeForLoss::G4ParticleChangeForLoss( currentTrack = right.currentTrack; proposedKinEnergy = right.proposedKinEnergy; currentCharge = right.currentCharge; - //theProposedWeight = right.theProposedWeight; proposedMomentumDirection = right.proposedMomentumDirection; } @@ -94,11 +94,11 @@ G4ParticleChangeForLoss & G4ParticleChangeForLoss::operator=( theStatusChange = right.theStatusChange; theLocalEnergyDeposit = right.theLocalEnergyDeposit; theSteppingControlFlag = right.theSteppingControlFlag; + theParentWeight = right.theParentWeight; currentTrack = right.currentTrack; proposedKinEnergy = right.proposedKinEnergy; currentCharge = right.currentCharge; - //theProposedWeight = right.theProposedWeight; proposedMomentumDirection = right.proposedMomentumDirection; } return *this; diff --git a/source/track/src/G4ParticleChangeForMSC.cc b/source/track/src/G4ParticleChangeForMSC.cc index cc8e217e27..8996df8f71 100644 --- a/source/track/src/G4ParticleChangeForMSC.cc +++ b/source/track/src/G4ParticleChangeForMSC.cc @@ -25,7 +25,7 @@ // // // $Id: G4ParticleChangeForMSC.cc,v 1.13 2006/06/29 21:15:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/track/src/G4ParticleChangeForTransport.cc b/source/track/src/G4ParticleChangeForTransport.cc index 4558ab2c53..90781c9d48 100644 --- a/source/track/src/G4ParticleChangeForTransport.cc +++ b/source/track/src/G4ParticleChangeForTransport.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4ParticleChangeForTransport.cc,v 1.18 2006/06/29 21:15:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ParticleChangeForTransport.cc,v 1.19 2006/11/03 17:45:04 japost Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- @@ -198,7 +198,7 @@ G4Step* G4ParticleChangeForTransport::UpdateStepForPostStep(G4Step* pStep) { // A physics process always calculates the final state of the particle - // Change volume if any kinetic energy remanes + // Change volume only if some kinetic energy remains G4StepPoint* pPostStepPoint = pStep->GetPostStepPoint(); if(pPostStepPoint->GetKineticEnergy() > 0.0) { @@ -210,6 +210,11 @@ G4Step* G4ParticleChangeForTransport::UpdateStepForPostStep(G4Step* pStep) pPostStepPoint->SetMaterialCutsCouple( theMaterialCutsCoupleChange ); pPostStepPoint->SetSensitiveDetector( theSensitiveDetectorChange ); } + if( this->GetLastStepInVolume() ){ + pStep->SetLastStepFlag(); + }else{ + pStep->ClearLastStepFlag(); + } // It used to call base class's method // - but this would copy uninitialised data members // return G4ParticleChange::UpdateStepForPostStep(pStep); diff --git a/source/track/src/G4Step.cc b/source/track/src/G4Step.cc index 1c3c616da8..164fef6bed 100644 --- a/source/track/src/G4Step.cc +++ b/source/track/src/G4Step.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Step.cc,v 1.6 2006/06/29 21:15:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Step.cc,v 1.7 2006/10/30 09:50:13 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- @@ -56,6 +56,9 @@ G4Step::G4Step() { fpPreStepPoint = new G4StepPoint(); fpPostStepPoint = new G4StepPoint(); + + fFirstStepInVolume =false; + fLastStepInVolume = false; } ///////////////// diff --git a/source/track/src/G4StepPoint.cc b/source/track/src/G4StepPoint.cc index 10a51e1963..1e65dc2033 100644 --- a/source/track/src/G4StepPoint.cc +++ b/source/track/src/G4StepPoint.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4StepPoint.cc,v 1.11 2006/06/29 21:15:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4StepPoint.cc,v 1.12 2006/10/31 10:01:43 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- @@ -76,31 +76,3 @@ G4StepPoint::G4StepPoint(const G4StepPoint &right): fCharge(right.fCharge), fWeight(right.fWeight) {} - - -////////////////////////// -G4StepPoint & G4StepPoint::operator=(const G4StepPoint &right) -////////////////////////// -{ - if (this != &right) { - fPosition = right.fPosition; - fGlobalTime = right.fGlobalTime; - fLocalTime = right.fLocalTime; - fProperTime = right.fProperTime; - fMomentumDirection = right.fMomentumDirection; - fKineticEnergy = right.fKineticEnergy; - fpTouchable = right.fpTouchable; - fpMaterial = right.fpMaterial; - fpMaterialCutsCouple = right.fpMaterialCutsCouple; - fpSensitiveDetector = right.fpSensitiveDetector; - fSafety = right.fSafety; - fPolarization = right.fPolarization; - fStepStatus = right.fStepStatus; - fpProcessDefinedStep = right.fpProcessDefinedStep; - fMass = right.fMass; - fCharge = right.fCharge; - fWeight = right.fWeight; - fVelocity = right.fVelocity; - } - return *this; -} diff --git a/source/track/src/G4Track.cc b/source/track/src/G4Track.cc index 65690cac54..81d21dac86 100644 --- a/source/track/src/G4Track.cc +++ b/source/track/src/G4Track.cc @@ -25,7 +25,7 @@ // // // $Id: G4Track.cc,v 1.29 2006/06/29 21:15:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/track/src/G4VParticleChange.cc b/source/track/src/G4VParticleChange.cc index 56106e92ed..108dba8171 100644 --- a/source/track/src/G4VParticleChange.cc +++ b/source/track/src/G4VParticleChange.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VParticleChange.cc,v 1.18 2006/06/29 21:15:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VParticleChange.cc,v 1.19 2006/10/30 09:50:13 kurasige Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- @@ -51,6 +51,8 @@ G4VParticleChange::G4VParticleChange(): theStatusChange(fAlive), theSteppingControlFlag(NormalCondition), theLocalEnergyDeposit(0.0), + theFirstStepInVolume(false), + theLastStepInVolume(false), verboseLevel(1), theParentWeight(1.0), fSetSecondaryWeightByProcess(false), @@ -87,6 +89,8 @@ G4VParticleChange::G4VParticleChange(const G4VParticleChange &right): theStatusChange(fAlive), theSteppingControlFlag(NormalCondition), theLocalEnergyDeposit(0.0), + theFirstStepInVolume(false), + theLastStepInVolume(false), verboseLevel(1), theParentWeight(1.0), fSetSecondaryWeightByProcess(false) @@ -105,6 +109,9 @@ G4VParticleChange::G4VParticleChange(const G4VParticleChange &right): theLocalEnergyDeposit = right.theLocalEnergyDeposit; theSteppingControlFlag = right.theSteppingControlFlag; fSetParentWeightByProcess = right.fSetParentWeightByProcess; + + theFirstStepInVolume = right.theFirstStepInVolume; + theLastStepInVolume = right.theLastStepInVolume; } @@ -125,6 +132,9 @@ G4VParticleChange & G4VParticleChange::operator=(const G4VParticleChange &right) theLocalEnergyDeposit = right.theLocalEnergyDeposit; theSteppingControlFlag = right.theSteppingControlFlag; fSetParentWeightByProcess = right.fSetParentWeightByProcess; + + theFirstStepInVolume = right.theFirstStepInVolume; + theLastStepInVolume = right.theLastStepInVolume; } return *this; } @@ -192,10 +202,15 @@ void G4VParticleChange::DumpInfo() const G4cout << " True Path Length (mm) : " << std::setw(20) << theTrueStepLength/mm << G4endl; - G4cout << " Stepping Control : " + G4cout << " Stepping Control : " << std::setw(20) << theSteppingControlFlag << G4endl; - G4cout << G4endl; + if (theFirstStepInVolume) { + G4cout << " First Step In the voulme : " << G4endl; + } + if (theLastStepInVolume) { + G4cout << " Last Step In the voulme : " << G4endl; + } } G4bool G4VParticleChange::CheckIt(const G4Track& ) diff --git a/source/track/src/G4VUserTrackInformation.cc b/source/track/src/G4VUserTrackInformation.cc index 6212663b01..3caa2b08fb 100644 --- a/source/track/src/G4VUserTrackInformation.cc +++ b/source/track/src/G4VUserTrackInformation.cc @@ -25,7 +25,7 @@ // // // $Id: G4VUserTrackInformation.cc,v 1.2 2006/06/29 21:15:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // -------------------------------------------------------------- diff --git a/source/tracking/History b/source/tracking/History index b93f8713ec..4e42c35ebd 100644 --- a/source/tracking/History +++ b/source/tracking/History @@ -1,5 +1,5 @@ -$Id: History,v 1.105 2006/06/15 15:42:45 gcosmo Exp $ -$Name: geant4-08-01 $ +$Id: History,v 1.117 2006/11/14 11:12:55 tsasaki Exp $ +$Name: geant4-08-02 $ ------------------------------------------------------------------- ========================================================= @@ -18,6 +18,45 @@ committal in the CVS repository ! * Reverse chronological order (last date on top), please * ---------------------------------------------------------- +13 November 2006 T.Sasaki (tracking-V08-01-06) +- Removed G4VSteppingVerbose::TrackBanner() and add new methed + G4TrackingManager::TrackBanner() for the fix. + +04 November 2006 M.Asai +- Added new method G4VSteppingVerbose::TrackBanner() and moved the + hard-coded verbosity in G4TrackingManager to this method. Also + modified G4SteppingManager to invoke this new method. + +3rd November 2006 J.Allison (tracking-V08-01-05) +- Augmented /tracking/storeTrajectory. Now takes integer parameter: + 0 : Don't Store trajectories. + !=0 : Store trajectories. + 1 : Choose G4Trajectory as default. + 2 : Choose G4SmoothTrajectory as default. + 3 : Choose G4RichTrajectory as default. + +16 October 2006 J.Allison +- All trajectories: + o Protect points container pointer in destructor. + o Make G4AttDef descriptions more concise. +- G4RichTrajectory: + o Bug fix: Create G4AttValues for user-defined creator process. +- G4VTrajectory: Improved ShowTrajectory. + +27 September 2006 M.Asai (tracking-V08-01-04) +- Fix in G4SteppingManager for the treatment of trajectory update +- According fixes in the trajectory classes. + +14 August 2006 M.Asai (tracking-V08-01-03) +- Fix "double-deletion" in the destructor of G4SteppingManager. + +13 July 2006 T.sasaki (tracking-V08-01-02) +- Fix on G4StepingVerbose for ForceConditions + +09 June 2006 T. Sasaki +- Secondary vector is now owned by G4Step and G4TrackVector class has + been moved in the track category + 15 June 2006 G. Cosmo (tracking-V08-00-04) - Fixed implementation of static methods in G4VSteppingVerbose to be NOT inline. Required also to allow DLL working on Windows ! diff --git a/source/tracking/include/G4RichTrajectory.hh b/source/tracking/include/G4RichTrajectory.hh index fa7274b74b..3506f34ca7 100644 --- a/source/tracking/include/G4RichTrajectory.hh +++ b/source/tracking/include/G4RichTrajectory.hh @@ -25,7 +25,7 @@ // // // $Id: G4RichTrajectory.hh,v 1.4 2006/06/29 21:15:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------- // diff --git a/source/tracking/include/G4RichTrajectoryPoint.hh b/source/tracking/include/G4RichTrajectoryPoint.hh index dcc1e5020c..ddc8f9afdd 100644 --- a/source/tracking/include/G4RichTrajectoryPoint.hh +++ b/source/tracking/include/G4RichTrajectoryPoint.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4RichTrajectoryPoint.hh,v 1.4 2006/06/29 21:15:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4RichTrajectoryPoint.hh,v 1.5 2006/09/27 20:42:52 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------- // @@ -37,8 +37,10 @@ // 1) Position (end of step). // The extended information, only publicly accessible through AttValues, // includes: -// 2) Total energy deposit. -// 3) Procees defining end of step. +// 2) Auxiliary points, as in G4SmoothTrajectory. +// 3) Total energy deposit. +// 4) Procees defining end of step. +// 5) Global time (from start of event) at pre- amd post-step. // // Contact: // Questions and comments to this code should be sent to @@ -56,6 +58,9 @@ #include "G4TrajectoryPoint.hh" +#include "G4ThreeVector.hh" +#include + class G4Track; class G4Step; class G4VProcess; @@ -67,16 +72,20 @@ public: // without description // Constructor/Destructor G4RichTrajectoryPoint(); - G4RichTrajectoryPoint(const G4Track*); - G4RichTrajectoryPoint(const G4Step*); + G4RichTrajectoryPoint(const G4Track*); // For first point. + G4RichTrajectoryPoint(const G4Step*); // For subsequent points. G4RichTrajectoryPoint(const G4RichTrajectoryPoint &right); virtual ~G4RichTrajectoryPoint(); + // Get/Set functions + const std::vector* GetAuxiliaryPoints() const + { return fpAuxiliaryPointVector; } + // Operators inline void *operator new(size_t); inline void operator delete(void *aRichTrajectoryPoint); inline int operator==(const G4RichTrajectoryPoint& right) const - { return (this==&right); }; + { return (this==&right); } // Get methods for HepRep style attributes virtual const std::map* GetAttDefs() const; @@ -85,8 +94,11 @@ public: // without description private: // Extended member data + std::vector* fpAuxiliaryPointVector; G4double fTotEDep; const G4VProcess* fpProcess; + G4double fPreStepPointGlobalTime; + G4double fPostStepPointGlobalTime; }; #if defined G4TRACKING_ALLOC_EXPORT diff --git a/source/tracking/include/G4SmoothTrajectory.hh b/source/tracking/include/G4SmoothTrajectory.hh index 40e00f1b5d..2891afdd94 100644 --- a/source/tracking/include/G4SmoothTrajectory.hh +++ b/source/tracking/include/G4SmoothTrajectory.hh @@ -25,7 +25,7 @@ // // // $Id: G4SmoothTrajectory.hh,v 1.11 2006/06/29 21:15:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------- // diff --git a/source/tracking/include/G4SmoothTrajectoryPoint.hh b/source/tracking/include/G4SmoothTrajectoryPoint.hh index 3c41031d1a..011134bf4e 100644 --- a/source/tracking/include/G4SmoothTrajectoryPoint.hh +++ b/source/tracking/include/G4SmoothTrajectoryPoint.hh @@ -25,7 +25,7 @@ // // // $Id: G4SmoothTrajectoryPoint.hh,v 1.13 2006/06/29 21:15:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------- // diff --git a/source/tracking/include/G4SteppingManager.hh b/source/tracking/include/G4SteppingManager.hh index 28c555b4c1..b08cac4311 100644 --- a/source/tracking/include/G4SteppingManager.hh +++ b/source/tracking/include/G4SteppingManager.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4SteppingManager.hh,v 1.27.2.1 2006/06/29 21:15:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4SteppingManager.hh,v 1.29 2006/12/13 15:49:47 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------- // @@ -343,7 +343,7 @@ public: //without description } inline G4TrackVector* G4SteppingManager::GetfSecondary(){ - return fSecondary; + return fStep->GetfSecondary(); } inline G4Step* G4SteppingManager::GetfStep(){ return fStep; @@ -457,7 +457,7 @@ public: //without description } inline G4TrackVector* G4SteppingManager::GetSecondary() const { - return fSecondary; + return fStep->GetSecondary(); } inline void G4SteppingManager::SetNavigator(G4Navigator* value){ diff --git a/source/tracking/include/G4SteppingVerbose.hh b/source/tracking/include/G4SteppingVerbose.hh index 25c04d7d32..fa40319d32 100644 --- a/source/tracking/include/G4SteppingVerbose.hh +++ b/source/tracking/include/G4SteppingVerbose.hh @@ -25,7 +25,7 @@ // // // $Id: G4SteppingVerbose.hh,v 1.12 2006/06/29 21:15:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------- // diff --git a/source/tracking/include/G4TrackingManager.hh b/source/tracking/include/G4TrackingManager.hh index 8dd3f39e48..449bfe6bfc 100644 --- a/source/tracking/include/G4TrackingManager.hh +++ b/source/tracking/include/G4TrackingManager.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4TrackingManager.hh,v 1.18 2006/06/29 21:15:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4TrackingManager.hh,v 1.21 2006/11/14 10:58:47 tsasaki Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------- // @@ -90,8 +90,8 @@ public: // without description G4Track* GetTrack() const; - G4bool GetStoreTrajectory() const; - void SetStoreTrajectory(G4bool value); + G4int GetStoreTrajectory() const; + void SetStoreTrajectory(G4int value); G4SteppingManager* GetSteppingManager() const; @@ -133,22 +133,19 @@ public: // without description private: //--------- -// Member functions - - void Verbose(G4String select); - // Output messages according to the current value of the - // Verbose level. - // Member data G4Track* fpTrack; G4SteppingManager* fpSteppingManager; G4UserTrackingAction* fpUserTrackingAction; G4VTrajectory* fpTrajectory; - G4bool StoreTrajectory; + G4int StoreTrajectory; G4int verboseLevel; G4TrackingMessenger* messenger; G4bool EventIsAborted; +// verbose + void TrackBanner(); + }; @@ -162,11 +159,11 @@ public: // without description return fpTrack; } - inline G4bool G4TrackingManager::GetStoreTrajectory() const { + inline G4int G4TrackingManager::GetStoreTrajectory() const { return StoreTrajectory; } - inline void G4TrackingManager::SetStoreTrajectory(G4bool value){ + inline void G4TrackingManager::SetStoreTrajectory(G4int value){ StoreTrajectory = value; } diff --git a/source/tracking/include/G4TrackingMessenger.hh b/source/tracking/include/G4TrackingMessenger.hh index 80b6d21f6b..130e26cda7 100644 --- a/source/tracking/include/G4TrackingMessenger.hh +++ b/source/tracking/include/G4TrackingMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: G4TrackingMessenger.hh,v 1.10 2006/06/29 21:15:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------- // diff --git a/source/tracking/include/G4Trajectory.hh b/source/tracking/include/G4Trajectory.hh index 9ed3de445b..89b33b8e34 100644 --- a/source/tracking/include/G4Trajectory.hh +++ b/source/tracking/include/G4Trajectory.hh @@ -25,7 +25,7 @@ // // // $Id: G4Trajectory.hh,v 1.24 2006/06/29 21:15:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------- // diff --git a/source/tracking/include/G4TrajectoryPoint.hh b/source/tracking/include/G4TrajectoryPoint.hh index 676b001b67..2a83a6ff22 100644 --- a/source/tracking/include/G4TrajectoryPoint.hh +++ b/source/tracking/include/G4TrajectoryPoint.hh @@ -25,7 +25,7 @@ // // // $Id: G4TrajectoryPoint.hh,v 1.17 2006/06/29 21:15:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------- // diff --git a/source/tracking/include/G4UserSteppingAction.hh b/source/tracking/include/G4UserSteppingAction.hh index 7d576253f1..732854bf12 100644 --- a/source/tracking/include/G4UserSteppingAction.hh +++ b/source/tracking/include/G4UserSteppingAction.hh @@ -25,7 +25,7 @@ // // // $Id: G4UserSteppingAction.hh,v 1.12 2006/06/29 21:15:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------- // diff --git a/source/tracking/include/G4UserTrackingAction.hh b/source/tracking/include/G4UserTrackingAction.hh index bd08027a92..6b845814b9 100644 --- a/source/tracking/include/G4UserTrackingAction.hh +++ b/source/tracking/include/G4UserTrackingAction.hh @@ -25,7 +25,7 @@ // // // $Id: G4UserTrackingAction.hh,v 1.11 2006/06/29 21:15:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //--------------------------------------------------------------- diff --git a/source/tracking/include/G4VSteppingVerbose.hh b/source/tracking/include/G4VSteppingVerbose.hh index 4b2c02ad75..7069eff25c 100644 --- a/source/tracking/include/G4VSteppingVerbose.hh +++ b/source/tracking/include/G4VSteppingVerbose.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VSteppingVerbose.hh,v 1.22 2006/06/29 21:15:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VSteppingVerbose.hh,v 1.24 2006/11/14 10:58:47 tsasaki Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------- // diff --git a/source/tracking/include/G4VTrajectory.hh b/source/tracking/include/G4VTrajectory.hh index 087b1f7ae4..368c10313a 100644 --- a/source/tracking/include/G4VTrajectory.hh +++ b/source/tracking/include/G4VTrajectory.hh @@ -25,7 +25,7 @@ // // // $Id: G4VTrajectory.hh,v 1.17 2006/06/29 21:15:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------- // diff --git a/source/tracking/include/G4VTrajectoryPoint.hh b/source/tracking/include/G4VTrajectoryPoint.hh index 0f68f8d41d..97b0071417 100644 --- a/source/tracking/include/G4VTrajectoryPoint.hh +++ b/source/tracking/include/G4VTrajectoryPoint.hh @@ -25,7 +25,7 @@ // // // $Id: G4VTrajectoryPoint.hh,v 1.15 2006/06/29 21:15:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------- // diff --git a/source/tracking/src/G4RichTrajectory.cc b/source/tracking/src/G4RichTrajectory.cc index caca069e01..56263c258f 100644 --- a/source/tracking/src/G4RichTrajectory.cc +++ b/source/tracking/src/G4RichTrajectory.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4RichTrajectory.cc,v 1.4 2006/06/29 21:15:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4RichTrajectory.cc,v 1.6 2006/10/16 13:43:43 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // --------------------------------------------------------------- // @@ -57,7 +57,12 @@ G4Allocator aRichTrajectoryAllocator; -G4RichTrajectory::G4RichTrajectory() {} +G4RichTrajectory::G4RichTrajectory(): + fpRichPointsContainer(0), + fpInitialVolume(0), + fpInitialNextVolume(0), + fpCreatorProcess(0) +{} G4RichTrajectory::G4RichTrajectory(const G4Track* aTrack): G4Trajectory(aTrack) // Note: this initialises the base class data @@ -94,14 +99,15 @@ G4RichTrajectory::G4RichTrajectory(G4RichTrajectory & right): G4RichTrajectory::~G4RichTrajectory() { - // fpRichPointsContainer->clearAndDestroy(); - size_t i; - for(i=0;isize();i++){ - delete (*fpRichPointsContainer)[i]; + if (fpRichPointsContainer) { + // fpRichPointsContainer->clearAndDestroy(); + size_t i; + for(i=0;isize();i++){ + delete (*fpRichPointsContainer)[i]; + } + fpRichPointsContainer->clear(); + delete fpRichPointsContainer; } - fpRichPointsContainer->clear(); - - delete fpRichPointsContainer; } void G4RichTrajectory::AppendStep(const G4Step* aStep) @@ -133,25 +139,26 @@ const std::map* G4RichTrajectory::GetAttDefs() const = G4AttDefStore::GetInstance("G4RichTrajectory",isNew); if (isNew) { + // Get att defs from base class... *store = *(G4Trajectory::GetAttDefs()); G4String ID; ID = "IVN"; (*store)[ID] = G4AttDef(ID,"Initial Volume Name", - "Bookkeeping","","G4String"); + "Physics","","G4String"); ID = "INVN"; (*store)[ID] = G4AttDef(ID,"Initial Next Volume Name", - "Bookkeeping","","G4String"); + "Physics","","G4String"); ID = "CPN"; (*store)[ID] = G4AttDef(ID,"Creator Process Name", - "Bookkeeping","","G4String"); + "Physics","","G4String"); ID = "CPTN"; (*store)[ID] = G4AttDef(ID,"Creator Process Type Name", - "Bookkeeping","","G4String"); + "Physics","","G4String"); } @@ -160,6 +167,7 @@ const std::map* G4RichTrajectory::GetAttDefs() const std::vector* G4RichTrajectory::CreateAttValues() const { + // Create base class att values... std::vector* values = G4Trajectory::CreateAttValues(); values->push_back(G4AttValue("IVN",fpInitialVolume->GetName(),"")); @@ -170,6 +178,9 @@ std::vector* G4RichTrajectory::CreateAttValues() const values->push_back(G4AttValue("CPN",fpCreatorProcess->GetProcessName(),"")); G4ProcessType type = fpCreatorProcess->GetProcessType(); values->push_back(G4AttValue("CPTN",G4VProcess::GetProcessTypeName(type),"")); + } else { + values->push_back(G4AttValue("CPN","User Defined","")); + values->push_back(G4AttValue("CPTN","User","")); } #ifdef G4ATTDEBUG diff --git a/source/tracking/src/G4RichTrajectoryPoint.cc b/source/tracking/src/G4RichTrajectoryPoint.cc index 551c449a37..c583cc5097 100644 --- a/source/tracking/src/G4RichTrajectoryPoint.cc +++ b/source/tracking/src/G4RichTrajectoryPoint.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4RichTrajectoryPoint.cc,v 1.2 2006/06/29 21:15:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4RichTrajectoryPoint.cc,v 1.3 2006/09/27 20:42:52 asaim Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // --------------------------------------------------------------- @@ -63,29 +63,82 @@ G4Allocator aRichTrajectoryPointAllocator; G4RichTrajectoryPoint::G4RichTrajectoryPoint(): + fpAuxiliaryPointVector(0), fTotEDep(0.), - fpProcess(0) + fpProcess(0), + fPreStepPointGlobalTime(0), + fPostStepPointGlobalTime(0) {} G4RichTrajectoryPoint::G4RichTrajectoryPoint(const G4Track* aTrack): G4TrajectoryPoint(aTrack->GetPosition()), + fpAuxiliaryPointVector(0), fTotEDep(0.), - fpProcess(0) + fpProcess(0), + fPreStepPointGlobalTime(aTrack->GetGlobalTime()), + fPostStepPointGlobalTime(aTrack->GetGlobalTime()) {} G4RichTrajectoryPoint::G4RichTrajectoryPoint(const G4Step* aStep): G4TrajectoryPoint(aStep->GetPostStepPoint()->GetPosition()), - fTotEDep(aStep->GetTotalEnergyDeposit()), - fpProcess(aStep->GetPostStepPoint()->GetProcessDefinedStep()) -{} + fpAuxiliaryPointVector(aStep->GetPointerToVectorOfAuxiliaryPoints()), + fTotEDep(aStep->GetTotalEnergyDeposit()) +{ + G4StepPoint* preStepPoint = aStep->GetPreStepPoint(); + G4StepPoint* postStepPoint = aStep->GetPostStepPoint(); + fpProcess = postStepPoint->GetProcessDefinedStep(); + fPreStepPointGlobalTime = preStepPoint->GetGlobalTime(); + fPostStepPointGlobalTime = postStepPoint->GetGlobalTime(); + + /* + G4cout << "fpAuxiliaryPointVector " + << (void*) fpAuxiliaryPointVector; + G4cout << ": "; + if (fpAuxiliaryPointVector) { + G4cout << "size: " << fpAuxiliaryPointVector->size(); + for (size_t i = 0; i < fpAuxiliaryPointVector->size(); ++i) + G4cout << "\n " << (*fpAuxiliaryPointVector)[i]; + } else { + G4cout << "non-existent"; + } + G4cout << G4endl; + + static const G4Step* lastStep = 0; + if (aStep && aStep == lastStep) { + G4cout << "********* aStep is same as last" << G4endl; + } + lastStep = aStep; + + static std::vector* lastAuxiliaryPointVector = 0; + if (fpAuxiliaryPointVector && + fpAuxiliaryPointVector == lastAuxiliaryPointVector) { + G4cout << "********* fpAuxiliaryPointVector is same as last" << G4endl; + } + lastAuxiliaryPointVector = fpAuxiliaryPointVector; + */ +} G4RichTrajectoryPoint::G4RichTrajectoryPoint (const G4RichTrajectoryPoint &right): - G4TrajectoryPoint(right) + G4TrajectoryPoint(right), + fpAuxiliaryPointVector(right.fpAuxiliaryPointVector), + fTotEDep(right.fTotEDep), + fpProcess(right.fpProcess), + fPreStepPointGlobalTime(right.fPreStepPointGlobalTime), + fPostStepPointGlobalTime(right.fPostStepPointGlobalTime) {} G4RichTrajectoryPoint::~G4RichTrajectoryPoint() -{} +{ + if(fpAuxiliaryPointVector) { + /* + G4cout << "Deleting fpAuxiliaryPointVector at " + << (void*) fpAuxiliaryPointVector + << G4endl; + */ + delete fpAuxiliaryPointVector; + } +} const std::map* G4RichTrajectoryPoint::GetAttDefs() const @@ -94,27 +147,47 @@ G4RichTrajectoryPoint::GetAttDefs() const std::map* store = G4AttDefStore::GetInstance("G4RichTrajectoryPoint",isNew); if (isNew) { + + // Copy base class att defs... *store = *(G4TrajectoryPoint::GetAttDefs()); G4String ID; + ID = "Aux"; + (*store)[ID] = G4AttDef(ID, "Auxiliary Point Position", + "Physics","G4BestUnit","G4ThreeVector"); ID = "TED"; (*store)[ID] = G4AttDef(ID,"Total Energy Deposit", "Physics","G4BestUnit","G4double"); ID = "PDS"; (*store)[ID] = G4AttDef(ID,"Process Defined Step", - "Bookkeeping","","G4String"); + "Physics","","G4String"); ID = "PTDS"; (*store)[ID] = G4AttDef(ID,"Process Type Defined Step", - "Bookkeeping","","G4String"); + "Physics","","G4String"); + ID = "PreT"; + (*store)[ID] = G4AttDef(ID,"Pre-step-point global time", + "Physics","G4BestUnit","G4double"); + ID = "PostT"; + (*store)[ID] = G4AttDef(ID,"Post-step-point global time", + "Physics","G4BestUnit","G4double"); } return store; } std::vector* G4RichTrajectoryPoint::CreateAttValues() const { + // Create base class att values... std::vector* values = G4TrajectoryPoint::CreateAttValues(); + if (fpAuxiliaryPointVector) { + std::vector::iterator iAux; + for (iAux = fpAuxiliaryPointVector->begin(); + iAux != fpAuxiliaryPointVector->end(); ++iAux) { + values->push_back(G4AttValue("Aux",G4BestUnit(*iAux,"Length"),"")); + } + } + values->push_back(G4AttValue("TED",G4BestUnit(fTotEDep,"Energy"),"")); if (fpProcess) { @@ -130,6 +203,12 @@ std::vector* G4RichTrajectoryPoint::CreateAttValues() const values->push_back(G4AttValue("PTDS","User","")); } + values->push_back + (G4AttValue("PreT",G4BestUnit(fPreStepPointGlobalTime,"Time"),"")); + + values->push_back + (G4AttValue("PostT",G4BestUnit(fPostStepPointGlobalTime,"Time"),"")); + #ifdef G4ATTDEBUG G4cout << G4AttCheck(values,GetAttDefs()); #endif diff --git a/source/tracking/src/G4SmoothTrajectory.cc b/source/tracking/src/G4SmoothTrajectory.cc index c6c666110c..0fb8add005 100644 --- a/source/tracking/src/G4SmoothTrajectory.cc +++ b/source/tracking/src/G4SmoothTrajectory.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4SmoothTrajectory.cc,v 1.16 2006/06/29 21:15:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4SmoothTrajectory.cc,v 1.18 2006/10/16 13:37:17 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // --------------------------------------------------------------- @@ -99,14 +99,15 @@ G4SmoothTrajectory::G4SmoothTrajectory(G4SmoothTrajectory & right):G4VTrajectory G4SmoothTrajectory::~G4SmoothTrajectory() { - // positionRecord->clearAndDestroy(); - size_t i; - for(i=0;isize();i++){ - delete (*positionRecord)[i]; + if (positionRecord) { + // positionRecord->clearAndDestroy(); + size_t i; + for(i=0;isize();i++){ + delete (*positionRecord)[i]; + } + positionRecord->clear(); + delete positionRecord; } - positionRecord->clear(); - - delete positionRecord; } void G4SmoothTrajectory::ShowTrajectory(std::ostream& os) const @@ -131,19 +132,19 @@ const std::map* G4SmoothTrajectory::GetAttDefs() const if (isNew) { G4String ID("ID"); - (*store)[ID] = G4AttDef(ID,"Track ID","Bookkeeping","","G4int"); + (*store)[ID] = G4AttDef(ID,"Track ID","Physics","","G4int"); G4String PID("PID"); - (*store)[PID] = G4AttDef(PID,"Parent ID","Bookkeeping","","G4int"); + (*store)[PID] = G4AttDef(PID,"Parent ID","Physics","","G4int"); G4String PN("PN"); - (*store)[PN] = G4AttDef(PN,"Particle Name","Bookkeeping","","G4String"); + (*store)[PN] = G4AttDef(PN,"Particle Name","Physics","","G4String"); G4String Ch("Ch"); (*store)[Ch] = G4AttDef(Ch,"Charge","Physics","e+","G4double"); G4String PDG("PDG"); - (*store)[PDG] = G4AttDef(PDG,"PDG Encoding","Bookkeeping","","G4int"); + (*store)[PDG] = G4AttDef(PDG,"PDG Encoding","Physics","","G4int"); G4String IMom("IMom"); (*store)[IMom] = G4AttDef(IMom, "Momentum of track at start of trajectory", @@ -155,7 +156,7 @@ const std::map* G4SmoothTrajectory::GetAttDefs() const "Physics","G4BestUnit","G4double"); G4String NTP("NTP"); - (*store)[NTP] = G4AttDef(NTP,"No. of points","Bookkeeping","","G4int"); + (*store)[NTP] = G4AttDef(NTP,"No. of points","Physics","","G4int"); } return store; diff --git a/source/tracking/src/G4SmoothTrajectoryPoint.cc b/source/tracking/src/G4SmoothTrajectoryPoint.cc index 8984fc37ac..63460746af 100644 --- a/source/tracking/src/G4SmoothTrajectoryPoint.cc +++ b/source/tracking/src/G4SmoothTrajectoryPoint.cc @@ -25,7 +25,7 @@ // // // $Id: G4SmoothTrajectoryPoint.cc,v 1.15 2006/06/29 21:16:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // --------------------------------------------------------------- diff --git a/source/tracking/src/G4SteppingManager.cc b/source/tracking/src/G4SteppingManager.cc index 893c295a8d..da2419e118 100644 --- a/source/tracking/src/G4SteppingManager.cc +++ b/source/tracking/src/G4SteppingManager.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4SteppingManager.cc,v 1.37.2.1 2006/06/29 21:16:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4SteppingManager.cc,v 1.44 2006/12/13 15:49:49 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------- // @@ -59,8 +59,8 @@ G4SteppingManager::G4SteppingManager() { // Construct simple 'has-a' related objects - fSecondary = new G4TrackVector(); fStep = new G4Step(); + fSecondary = fStep->NewSecondaryVector(); fPreStepPoint = fStep->GetPreStepPoint(); fPostStepPoint = fStep->GetPostStepPoint(); #ifdef G4VERBOSE @@ -99,7 +99,8 @@ G4SteppingManager::~G4SteppingManager() { // Destruct simple 'has-a' objects - delete fSecondary; + fStep->DeleteSecondaryVector(); +/////////////////////////// delete fSecondary; delete fStep; delete fSelectedAtRestDoItVector; delete fSelectedAlongStepDoItVector; @@ -146,6 +147,9 @@ G4StepStatus G4SteppingManager::Stepping() //JA Set the volume before it is used (in DefineStepLength() for User Limit) fCurrentVolume = fStep->GetPreStepPoint()->GetPhysicalVolume(); +// Reset the step's auxiliary points vector pointer + fStep->SetPointerToVectorOfAuxiliaryPoints(0); + //----------------- // AtRest Processes //----------------- @@ -218,6 +222,7 @@ G4StepStatus G4SteppingManager::Stepping() fPreviousStepSize = fStep->GetStepLength(); #ifdef G4VERBOSE // !!!!! Verbose + if(verboseLevel>0) fVerbose->StepInfo(); #endif // Send G4Step information to Hit/Dig if the volume is sensitive diff --git a/source/tracking/src/G4SteppingManager2.cc b/source/tracking/src/G4SteppingManager2.cc index b39762281f..3d98a24184 100644 --- a/source/tracking/src/G4SteppingManager2.cc +++ b/source/tracking/src/G4SteppingManager2.cc @@ -25,7 +25,7 @@ // // // $Id: G4SteppingManager2.cc,v 1.29 2006/06/29 21:16:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------- // diff --git a/source/tracking/src/G4SteppingVerbose.cc b/source/tracking/src/G4SteppingVerbose.cc index 7750c8fe19..42d09f9378 100644 --- a/source/tracking/src/G4SteppingVerbose.cc +++ b/source/tracking/src/G4SteppingVerbose.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4SteppingVerbose.cc,v 1.21 2006/06/29 21:16:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4SteppingVerbose.cc,v 1.23 2006/07/14 14:13:57 tsasaki Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------- // @@ -371,6 +371,9 @@ void G4SteppingVerbose::DPSLPostStep() if(fCondition==ExclusivelyForced){ G4cout << "ExclusivelyForced)" << G4endl; } + else if(fCondition==StronglyForced){ + G4cout << "StronglyForced)" << G4endl; + } else if(fCondition==Conditionally){ G4cout << "Conditionally)" << G4endl; } diff --git a/source/tracking/src/G4TrackingManager.cc b/source/tracking/src/G4TrackingManager.cc index c016ae3af0..6b43591022 100644 --- a/source/tracking/src/G4TrackingManager.cc +++ b/source/tracking/src/G4TrackingManager.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4TrackingManager.cc,v 1.19 2006/06/29 21:16:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4TrackingManager.cc,v 1.22 2006/11/14 10:58:47 tsasaki Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------- // @@ -40,13 +40,16 @@ #include "G4TrackingManager.hh" #include "G4Trajectory.hh" +#include "G4SmoothTrajectory.hh" +#include "G4RichTrajectory.hh" #include "G4ios.hh" +class G4VSteppingVerbose; ////////////////////////////////////// G4TrackingManager::G4TrackingManager() ////////////////////////////////////// : fpUserTrackingAction(NULL), fpTrajectory(NULL), - StoreTrajectory(false), verboseLevel(0), EventIsAborted(false) + StoreTrajectory(0), verboseLevel(0), EventIsAborted(false) { fpSteppingManager = new G4SteppingManager(); messenger = new G4TrackingMessenger(this); @@ -80,12 +83,9 @@ void G4TrackingManager::ProcessOneTrack(G4Track* apValueG4Track) delete (*GimmeSecondaries())[itr]; } GimmeSecondaries()->clear(); + + if(verboseLevel>0 && (G4VSteppingVerbose::GetSilent()!=1) ) TrackBanner(); -#ifdef G4VERBOSE - // !!!!! Verbose - if(verboseLevel>0) Verbose("ProcessOneTrack"); -#endif - // Give SteppingManger the pointer to the track which will be tracked fpSteppingManager->SetInitialStep(fpTrack); @@ -97,7 +97,13 @@ void G4TrackingManager::ProcessOneTrack(G4Track* apValueG4Track) #ifdef G4_STORE_TRAJECTORY // Construct a trajectory if it is requested if(StoreTrajectory&&(!fpTrajectory)) { - fpTrajectory = new G4Trajectory(fpTrack); // default trajectory concrete class object + // default trajectory concrete class object + switch (StoreTrajectory) { + default: + case 1: fpTrajectory = new G4Trajectory(fpTrack); break; + case 2: fpTrajectory = new G4SmoothTrajectory(fpTrack); break; + case 3: fpTrajectory = new G4RichTrajectory(fpTrack); break; + } } #endif @@ -160,41 +166,24 @@ void G4TrackingManager::EventAborted() EventIsAborted = true; } -//************************************************************************ -// -// Private Member Functions -// -//************************************************************************ - -//////////////////////////////////////////////// -void G4TrackingManager::Verbose(G4String select) -//////////////////////////////////////////////// +void G4TrackingManager::TrackBanner() { - - // !!!!! Verbose - if( select == "ProcessOneTrack" ){ -#ifdef G4VERBOSE - if(verboseLevel >= 1) { G4cout << G4endl; G4cout << "*******************************************************" << "**************************************************" << G4endl; - G4cout << "* G4Track Information: " - << " Particle = " << fpTrack->GetDefinition()->GetParticleName() - << "," - << " Track ID = " << fpTrack->GetTrackID() - << "," - << " Parent ID = " << fpTrack->GetParentID() + G4cout << "* G4Track Information: " + << " Particle = " << fpTrack->GetDefinition()->GetParticleName() + << "," + << " Track ID = " << fpTrack->GetTrackID() + << "," + << " Parent ID = " << fpTrack->GetParentID() << G4endl; G4cout << "*******************************************************" << "**************************************************" << G4endl; G4cout << G4endl; - - } -#endif - } } @@ -203,5 +192,3 @@ void G4TrackingManager::Verbose(G4String select) - - diff --git a/source/tracking/src/G4TrackingMessenger.cc b/source/tracking/src/G4TrackingMessenger.cc index cca262913c..400de632ca 100644 --- a/source/tracking/src/G4TrackingMessenger.cc +++ b/source/tracking/src/G4TrackingMessenger.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4TrackingMessenger.cc,v 1.14 2006/06/29 21:16:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4TrackingMessenger.cc,v 1.15 2006/11/03 11:13:38 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------- // @@ -73,11 +73,14 @@ G4TrackingMessenger::G4TrackingMessenger(G4TrackingManager * trMan) StoreTrajectoryCmd = new G4UIcmdWithAnInteger("/tracking/storeTrajectory",this); StoreTrajectoryCmd->SetGuidance("Store trajectories or not."); - StoreTrajectoryCmd->SetGuidance(" 1 : Store trajectories."); StoreTrajectoryCmd->SetGuidance(" 0 : Don't Store trajectories."); + StoreTrajectoryCmd->SetGuidance(" !=0 : Store trajectories."); + StoreTrajectoryCmd->SetGuidance(" 1 : Choose G4Trajectory as default."); + StoreTrajectoryCmd->SetGuidance(" 2 : Choose G4SmoothTrajectory as default."); + StoreTrajectoryCmd->SetGuidance(" 3 : Choose G4RichTrajectory as default."); StoreTrajectoryCmd->SetParameterName("Store",true); StoreTrajectoryCmd->SetDefaultValue(0); - StoreTrajectoryCmd->SetRange("Store >=0 && Store <= 1"); + StoreTrajectoryCmd->SetRange("Store >=0 && Store <= 3"); VerboseCmd = new G4UIcmdWithAnInteger("/tracking/verbose",this); @@ -130,7 +133,7 @@ void G4TrackingMessenger::SetNewValue(G4UIcommand * command,G4String newValues) } if( command == StoreTrajectoryCmd ){ - trackingManager->SetStoreTrajectory(StoreTrajectoryCmd->ConvertToBool(newValues)); + trackingManager->SetStoreTrajectory(StoreTrajectoryCmd->ConvertToInt(newValues)); } } @@ -143,9 +146,7 @@ G4String G4TrackingMessenger::GetCurrentValue(G4UIcommand * command) return VerboseCmd->ConvertToString(trackingManager->GetVerboseLevel()); } else if( command == StoreTrajectoryCmd ){ - G4String ll = "0"; - if(trackingManager->GetStoreTrajectory()) ll = "1"; - return ll; + return StoreTrajectoryCmd->ConvertToString(trackingManager->GetStoreTrajectory()); } return G4String('\0'); } diff --git a/source/tracking/src/G4Trajectory.cc b/source/tracking/src/G4Trajectory.cc index bab747e99d..38031b9616 100644 --- a/source/tracking/src/G4Trajectory.cc +++ b/source/tracking/src/G4Trajectory.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Trajectory.cc,v 1.30 2006/06/29 21:16:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Trajectory.cc,v 1.32 2006/10/16 13:39:35 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // --------------------------------------------------------------- // @@ -94,14 +94,15 @@ G4Trajectory::G4Trajectory(G4Trajectory & right):G4VTrajectory() G4Trajectory::~G4Trajectory() { - // positionRecord->clearAndDestroy(); - size_t i; - for(i=0;isize();i++){ - delete (*positionRecord)[i]; + if (positionRecord) { + // positionRecord->clearAndDestroy(); + size_t i; + for(i=0;isize();i++){ + delete (*positionRecord)[i]; + } + positionRecord->clear(); + delete positionRecord; } - positionRecord->clear(); - - delete positionRecord; } void G4Trajectory::ShowTrajectory(std::ostream& os) const @@ -126,31 +127,31 @@ const std::map* G4Trajectory::GetAttDefs() const if (isNew) { G4String ID("ID"); - (*store)[ID] = G4AttDef(ID,"Track ID","Bookkeeping","","G4int"); + (*store)[ID] = G4AttDef(ID,"Track ID","Physics","","G4int"); G4String PID("PID"); - (*store)[PID] = G4AttDef(PID,"Parent ID","Bookkeeping","","G4int"); + (*store)[PID] = G4AttDef(PID,"Parent ID","Physics","","G4int"); G4String PN("PN"); - (*store)[PN] = G4AttDef(PN,"Particle Name","Bookkeeping","","G4String"); + (*store)[PN] = G4AttDef(PN,"Particle Name","Physics","","G4String"); G4String Ch("Ch"); (*store)[Ch] = G4AttDef(Ch,"Charge","Physics","e+","G4double"); G4String PDG("PDG"); - (*store)[PDG] = G4AttDef(PDG,"PDG Encoding","Bookkeeping","","G4int"); + (*store)[PDG] = G4AttDef(PDG,"PDG Encoding","Physics","","G4int"); G4String IMom("IMom"); - (*store)[IMom] = G4AttDef(IMom, "Momentum of track at start of trajectory", + (*store)[IMom] = G4AttDef(IMom, "Momentum at start of trajectory", "Physics","G4BestUnit","G4ThreeVector"); G4String IMag("IMag"); (*store)[IMag] = - G4AttDef(IMag, "Magnitude of momentum of track at start of trajectory", + G4AttDef(IMag, "Magnitude of momentum at start of trajectory", "Physics","G4BestUnit","G4double"); G4String NTP("NTP"); - (*store)[NTP] = G4AttDef(NTP,"No. of points","Bookkeeping","","G4int"); + (*store)[NTP] = G4AttDef(NTP,"No. of points","Physics","","G4int"); } return store; diff --git a/source/tracking/src/G4TrajectoryPoint.cc b/source/tracking/src/G4TrajectoryPoint.cc index bea75e3aeb..701cfac3bc 100644 --- a/source/tracking/src/G4TrajectoryPoint.cc +++ b/source/tracking/src/G4TrajectoryPoint.cc @@ -25,7 +25,7 @@ // // // $Id: G4TrajectoryPoint.cc,v 1.19 2006/06/29 21:16:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // --------------------------------------------------------------- // diff --git a/source/tracking/src/G4UserSteppingAction.cc b/source/tracking/src/G4UserSteppingAction.cc index 3c41775689..09d65f8424 100644 --- a/source/tracking/src/G4UserSteppingAction.cc +++ b/source/tracking/src/G4UserSteppingAction.cc @@ -25,7 +25,7 @@ // // // $Id: G4UserSteppingAction.cc,v 1.10 2006/06/29 21:16:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // --------------------------------------------------------------- // diff --git a/source/tracking/src/G4UserTrackingAction.cc b/source/tracking/src/G4UserTrackingAction.cc index 2f4bf2fefb..e6d26199bb 100644 --- a/source/tracking/src/G4UserTrackingAction.cc +++ b/source/tracking/src/G4UserTrackingAction.cc @@ -25,7 +25,7 @@ // // // $Id: G4UserTrackingAction.cc,v 1.10 2006/06/29 21:16:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // --------------------------------------------------------------- // diff --git a/source/tracking/src/G4VSteppingVerbose.cc b/source/tracking/src/G4VSteppingVerbose.cc index 5940d9ea5c..1c492905a7 100644 --- a/source/tracking/src/G4VSteppingVerbose.cc +++ b/source/tracking/src/G4VSteppingVerbose.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VSteppingVerbose.cc,v 1.16 2006/06/29 21:16:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VSteppingVerbose.cc,v 1.18 2006/11/14 10:58:47 tsasaki Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------- // @@ -44,6 +44,8 @@ #include "G4VSteppingVerbose.hh" #include "G4SteppingManager.hh" +#include "G4Track.hh" +#include "G4ParticleDefinition.hh" G4VSteppingVerbose* G4VSteppingVerbose::fInstance = 0; G4int G4VSteppingVerbose::Silent = 0; diff --git a/source/tracking/src/G4VTrajectory.cc b/source/tracking/src/G4VTrajectory.cc index 7f20a79019..f4434230e5 100644 --- a/source/tracking/src/G4VTrajectory.cc +++ b/source/tracking/src/G4VTrajectory.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VTrajectory.cc,v 1.11 2006/06/29 21:16:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VTrajectory.cc,v 1.12 2006/10/16 13:45:01 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // --------------------------------------------------------------- // @@ -80,8 +80,9 @@ void G4VTrajectory::ShowTrajectory(std::ostream& os) const iAttVal != attValues->end(); ++iAttVal) { std::map::const_iterator iAttDef = attDefs->find(iAttVal->GetName()); - os << "\n " << iAttDef->second.GetDesc() << ": " - << iAttVal->GetValue(); + os << "\n " << iAttDef->second.GetDesc() + << " (" << iAttVal->GetName() + << "): " << iAttVal->GetValue(); } delete attValues; // AttValues must be deleted after use. @@ -105,8 +106,9 @@ void G4VTrajectory::ShowTrajectory(std::ostream& os) const iAttVal != attValues->end(); ++iAttVal) { std::map::const_iterator iAttDef = attDefs->find(iAttVal->GetName()); - os << "\n " << iAttDef->second.GetDesc() << ": " - << iAttVal->GetValue(); + os << "\n " << iAttDef->second.GetDesc() + << " (" << iAttVal->GetName() + << "): " << iAttVal->GetValue(); } delete attValues; // AttValues must be deleted after use. diff --git a/source/tracking/src/G4VTrajectoryPoint.cc b/source/tracking/src/G4VTrajectoryPoint.cc index 9426c2a8ab..c3a53e0574 100644 --- a/source/tracking/src/G4VTrajectoryPoint.cc +++ b/source/tracking/src/G4VTrajectoryPoint.cc @@ -25,7 +25,7 @@ // // // $Id: G4VTrajectoryPoint.cc,v 1.4 2006/06/29 21:16:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //--------------------------------------------------------------- // diff --git a/source/visualization/FukuiRenderer/History b/source/visualization/FukuiRenderer/History index 5df1ed25de..0caf49c133 100644 --- a/source/visualization/FukuiRenderer/History +++ b/source/visualization/FukuiRenderer/History @@ -1,4 +1,4 @@ -$Id: History,v 1.25 2006/06/12 08:24:09 allison Exp $ +$Id: History,v 1.26 2006/07/10 15:32:27 allison Exp $ ------------------------------------------------------------------- ========================================================= @@ -20,6 +20,10 @@ committal in the CVS repository ! History file for visualization/FukuiRenderer sub-category --------------------------------------------------------- +10th July 2006 John Allison (DAWN-V08-01-00) +- G4FRSceneFunc.icc: G4FRSCENEHANDLER::SendNdiv respects forced line + segments per circle. + 12th June 2006 John Allison (DAWN-V08-00-04) - Fixed rewind problem: o G4FRofstream.hh: Removed rewind (badly implemented). diff --git a/source/visualization/FukuiRenderer/include/G4DAWNFILE.hh b/source/visualization/FukuiRenderer/include/G4DAWNFILE.hh index cacc9be5a1..3b19de74d9 100644 --- a/source/visualization/FukuiRenderer/include/G4DAWNFILE.hh +++ b/source/visualization/FukuiRenderer/include/G4DAWNFILE.hh @@ -25,7 +25,7 @@ // // // $Id: G4DAWNFILE.hh,v 1.9 2006/06/29 21:16:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Satoshi TANAKA // DAWNFILE driver factory. diff --git a/source/visualization/FukuiRenderer/include/G4DAWNFILESceneHandler.hh b/source/visualization/FukuiRenderer/include/G4DAWNFILESceneHandler.hh index b25abf1052..ae9d9bf562 100644 --- a/source/visualization/FukuiRenderer/include/G4DAWNFILESceneHandler.hh +++ b/source/visualization/FukuiRenderer/include/G4DAWNFILESceneHandler.hh @@ -25,7 +25,7 @@ // // // $Id: G4DAWNFILESceneHandler.hh,v 1.16 2006/06/29 21:16:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Satoshi TANAKA diff --git a/source/visualization/FukuiRenderer/include/G4DAWNFILEViewer.hh b/source/visualization/FukuiRenderer/include/G4DAWNFILEViewer.hh index e939d788f3..6ff53a7585 100644 --- a/source/visualization/FukuiRenderer/include/G4DAWNFILEViewer.hh +++ b/source/visualization/FukuiRenderer/include/G4DAWNFILEViewer.hh @@ -25,7 +25,7 @@ // // // $Id: G4DAWNFILEViewer.hh,v 1.10 2006/06/29 21:16:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Satoshi TANAKA // DAWNFILE viewer - opens window, hard copy, etc. diff --git a/source/visualization/FukuiRenderer/include/G4FRClientServer.hh b/source/visualization/FukuiRenderer/include/G4FRClientServer.hh index f316bf8fc0..2eda1a51c7 100644 --- a/source/visualization/FukuiRenderer/include/G4FRClientServer.hh +++ b/source/visualization/FukuiRenderer/include/G4FRClientServer.hh @@ -25,7 +25,7 @@ // // // $Id: G4FRClientServer.hh,v 1.7 2006/06/29 21:16:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Satoshi TANAKA, Wed Jul 3 14:13:52 JST 1996 //////////////////////////////// diff --git a/source/visualization/FukuiRenderer/include/G4FRConst.hh b/source/visualization/FukuiRenderer/include/G4FRConst.hh index c4d6f02755..836b5bc1db 100644 --- a/source/visualization/FukuiRenderer/include/G4FRConst.hh +++ b/source/visualization/FukuiRenderer/include/G4FRConst.hh @@ -25,7 +25,7 @@ // // // $Id: G4FRConst.hh,v 1.7 2006/06/29 21:16:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Satoshi TANAKA, Tue Jul 2 15:30:49 JST 1996 /////////////////////////////////// diff --git a/source/visualization/FukuiRenderer/include/G4FRFeatures.hh b/source/visualization/FukuiRenderer/include/G4FRFeatures.hh index fd948eda6b..6dd8509888 100644 --- a/source/visualization/FukuiRenderer/include/G4FRFeatures.hh +++ b/source/visualization/FukuiRenderer/include/G4FRFeatures.hh @@ -25,7 +25,7 @@ // // // $Id: G4FRFeatures.hh,v 1.6 2006/06/29 21:16:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #if !defined G4_FR_FEATURES_HH #define G4_FR_FEATURES_HH diff --git a/source/visualization/FukuiRenderer/include/G4FRSceneFunc.icc b/source/visualization/FukuiRenderer/include/G4FRSceneFunc.icc index 6a0caecdea..6d0b37ee8b 100644 --- a/source/visualization/FukuiRenderer/include/G4FRSceneFunc.icc +++ b/source/visualization/FukuiRenderer/include/G4FRSceneFunc.icc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4FRSceneFunc.icc,v 1.14 2006/06/29 21:16:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4FRSceneFunc.icc,v 1.15 2006/07/10 15:31:45 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4PhysicalVolumeModel.hh" @@ -342,7 +342,9 @@ void G4FRSCENEHANDLER::SendNdiv ( void ) //----- number used for dividing a curved surface, Ndiv // if ( GetModel() ) { ?? Why test for model. Can be zero. JA ?? - num_division = fpViewer->GetViewParameters().GetNoOfSides(); + const G4VisAttributes* pVisAttribs = + fpViewer -> GetApplicableVisAttributes (fpVisAttribs); + num_division = GetNoOfSides(pVisAttribs); // } else { #if defined DEBUG_FR_SCENE G4cerr << "WARNING: GetNoOfSides() failed. " ; diff --git a/source/visualization/FukuiRenderer/include/G4FRofstream.hh b/source/visualization/FukuiRenderer/include/G4FRofstream.hh index 14a9c54115..f187b3403c 100644 --- a/source/visualization/FukuiRenderer/include/G4FRofstream.hh +++ b/source/visualization/FukuiRenderer/include/G4FRofstream.hh @@ -25,7 +25,7 @@ // // // $Id: G4FRofstream.hh,v 1.9 2006/06/29 21:16:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include diff --git a/source/visualization/FukuiRenderer/include/G4FukuiRenderer.hh b/source/visualization/FukuiRenderer/include/G4FukuiRenderer.hh index 17eb0a979e..dec53e3628 100644 --- a/source/visualization/FukuiRenderer/include/G4FukuiRenderer.hh +++ b/source/visualization/FukuiRenderer/include/G4FukuiRenderer.hh @@ -25,7 +25,7 @@ // // // $Id: G4FukuiRenderer.hh,v 1.8 2006/06/29 21:16:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Satoshi TANAKA diff --git a/source/visualization/FukuiRenderer/include/G4FukuiRendererSceneHandler.hh b/source/visualization/FukuiRenderer/include/G4FukuiRendererSceneHandler.hh index 3a706c2ef7..afdca5505f 100644 --- a/source/visualization/FukuiRenderer/include/G4FukuiRendererSceneHandler.hh +++ b/source/visualization/FukuiRenderer/include/G4FukuiRendererSceneHandler.hh @@ -25,7 +25,7 @@ // // // $Id: G4FukuiRendererSceneHandler.hh,v 1.15 2006/06/29 21:16:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Satoshi TANAKA, Fri Jun 28 11:19:19 JST 1996 diff --git a/source/visualization/FukuiRenderer/include/G4FukuiRendererViewer.hh b/source/visualization/FukuiRenderer/include/G4FukuiRendererViewer.hh index 14f0b43495..2a625b1564 100644 --- a/source/visualization/FukuiRenderer/include/G4FukuiRendererViewer.hh +++ b/source/visualization/FukuiRenderer/include/G4FukuiRendererViewer.hh @@ -25,7 +25,7 @@ // // // $Id: G4FukuiRendererViewer.hh,v 1.8 2006/06/29 21:16:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Satoshi TANAKA, Fri Jun 28 12:10:14 JST 1996 diff --git a/source/visualization/FukuiRenderer/src/G4DAWNFILE.cc b/source/visualization/FukuiRenderer/src/G4DAWNFILE.cc index d9a6f0b51f..0689d67b3a 100644 --- a/source/visualization/FukuiRenderer/src/G4DAWNFILE.cc +++ b/source/visualization/FukuiRenderer/src/G4DAWNFILE.cc @@ -25,7 +25,7 @@ // // // $Id: G4DAWNFILE.cc,v 1.11 2006/06/29 21:16:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Satoshi TANAKA // DAWNFILE factory. diff --git a/source/visualization/FukuiRenderer/src/G4DAWNFILESceneHandler.cc b/source/visualization/FukuiRenderer/src/G4DAWNFILESceneHandler.cc index b0ff521537..51d21088fe 100644 --- a/source/visualization/FukuiRenderer/src/G4DAWNFILESceneHandler.cc +++ b/source/visualization/FukuiRenderer/src/G4DAWNFILESceneHandler.cc @@ -25,7 +25,7 @@ // // // $Id: G4DAWNFILESceneHandler.cc,v 1.18 2006/06/29 21:16:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Satoshi TANAKA // DAWNFILE scene. diff --git a/source/visualization/FukuiRenderer/src/G4DAWNFILEViewer.cc b/source/visualization/FukuiRenderer/src/G4DAWNFILEViewer.cc index 63cbf66008..872591286e 100644 --- a/source/visualization/FukuiRenderer/src/G4DAWNFILEViewer.cc +++ b/source/visualization/FukuiRenderer/src/G4DAWNFILEViewer.cc @@ -25,7 +25,7 @@ // // // $Id: G4DAWNFILEViewer.cc,v 1.20 2006/06/29 21:16:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Satoshi TANAKA // DAWNFILE view - opens window, hard copy, etc. diff --git a/source/visualization/FukuiRenderer/src/G4FRClientServer.cc b/source/visualization/FukuiRenderer/src/G4FRClientServer.cc index 8c078851d8..4afac13404 100644 --- a/source/visualization/FukuiRenderer/src/G4FRClientServer.cc +++ b/source/visualization/FukuiRenderer/src/G4FRClientServer.cc @@ -25,7 +25,7 @@ // // // $Id: G4FRClientServer.cc,v 1.6 2006/06/29 21:16:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Satoshi TANAKA, Wed Jul 3 14:14:29 JST 1996 //////////////////////////////// diff --git a/source/visualization/FukuiRenderer/src/G4FukuiRenderer.cc b/source/visualization/FukuiRenderer/src/G4FukuiRenderer.cc index 464e84981e..8c094fd07f 100644 --- a/source/visualization/FukuiRenderer/src/G4FukuiRenderer.cc +++ b/source/visualization/FukuiRenderer/src/G4FukuiRenderer.cc @@ -25,7 +25,7 @@ // // // $Id: G4FukuiRenderer.cc,v 1.9 2006/06/29 21:16:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Satoshi TANAKA diff --git a/source/visualization/FukuiRenderer/src/G4FukuiRendererSceneHandler.cc b/source/visualization/FukuiRenderer/src/G4FukuiRendererSceneHandler.cc index c306fcc89c..5dfbdd4a38 100644 --- a/source/visualization/FukuiRenderer/src/G4FukuiRendererSceneHandler.cc +++ b/source/visualization/FukuiRenderer/src/G4FukuiRendererSceneHandler.cc @@ -25,7 +25,7 @@ // // // $Id: G4FukuiRendererSceneHandler.cc,v 1.14 2006/06/29 21:17:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Satoshi TANAKA, Fri Jun 28 11:34:24 JST 1996 diff --git a/source/visualization/FukuiRenderer/src/G4FukuiRendererViewer.cc b/source/visualization/FukuiRenderer/src/G4FukuiRendererViewer.cc index 123df8e24d..c3f2c38d71 100644 --- a/source/visualization/FukuiRenderer/src/G4FukuiRendererViewer.cc +++ b/source/visualization/FukuiRenderer/src/G4FukuiRendererViewer.cc @@ -25,7 +25,7 @@ // // // $Id: G4FukuiRendererViewer.cc,v 1.11 2006/06/29 21:17:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Satoshi TANAKA, Fri Jun 28 12:09:11 JST 1996 diff --git a/source/visualization/HepRep/History b/source/visualization/HepRep/History index 9958d90dc4..e2b68098b8 100644 --- a/source/visualization/HepRep/History +++ b/source/visualization/HepRep/History @@ -1,4 +1,4 @@ -.$Id: History,v 1.117 2006/06/05 07:58:10 perl Exp $ +.$Id: History,v 1.125 2006/11/16 21:08:41 perl Exp $ ------------------------------------------------------------------- ========================================================= @@ -20,6 +20,26 @@ committal in the CVS repository ! History file for visualization/HepRep sub-category -------------------------------------------------- +16 November 2006 Joseph Perl (vis-HepRep-V08-01-04) +- Omit Pos and Aux attributes for hits. +- Protect against null Region (as in parallel geometries). + +14 November 2006 Joseph Perl (vis-HepRep-V08-01-03) +- Improve handling of Trajectory Points. + +13 November 2006 Joseph Perl (vis-HepRep-V08-01-02) +- Corrected handling of Hits that come via AddSolids. + +5 November 2006 John Allison (vis-HepRep-V08-01-01) +- Protected against zero material pointer. +- Corrected material pointer - pick up from PVModel instead of logical volume + so that it is correct for parameterised volumes. + +1 November 2006 John Allison (vis-HepRep-V08-01-00) +- G4HepRepFileSceneHandler.cc: + o Exploit G4PhysicalVolumeModel::G4PhysicalVolumeNodeID::GetNonCulledDepth(). + (Saves some lines of code.) + 4 June 2006 Joseph Perl (vis-HepRep-V08-00-04) - G4HepRepFileSceneHandler: Bring trajectory points under control of filtering. - G4HepRepFileSceneHandler: Correct direction of G4Cons and G4Tubs. diff --git a/source/visualization/HepRep/include/G4HepRep.hh b/source/visualization/HepRep/include/G4HepRep.hh index deece6923e..2f5af957e6 100644 --- a/source/visualization/HepRep/include/G4HepRep.hh +++ b/source/visualization/HepRep/include/G4HepRep.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4HepRep.hh,v 1.17 2006/06/29 21:17:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // /** diff --git a/source/visualization/HepRep/include/G4HepRepFile.hh b/source/visualization/HepRep/include/G4HepRepFile.hh index 1ad800903e..f35e4a33ff 100644 --- a/source/visualization/HepRep/include/G4HepRepFile.hh +++ b/source/visualization/HepRep/include/G4HepRepFile.hh @@ -25,7 +25,7 @@ // // // $Id: G4HepRepFile.hh,v 1.8 2006/06/29 21:17:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 5th April 2001 diff --git a/source/visualization/HepRep/include/G4HepRepFileSceneHandler.hh b/source/visualization/HepRep/include/G4HepRepFileSceneHandler.hh index d207542cfc..ee9a0664c0 100644 --- a/source/visualization/HepRep/include/G4HepRepFileSceneHandler.hh +++ b/source/visualization/HepRep/include/G4HepRepFileSceneHandler.hh @@ -25,7 +25,7 @@ // // // $Id: G4HepRepFileSceneHandler.hh,v 1.29 2006/06/29 21:17:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Joseph Perl 27th January 2002 diff --git a/source/visualization/HepRep/include/G4HepRepFileViewer.hh b/source/visualization/HepRep/include/G4HepRepFileViewer.hh index 6353237759..c3b084b335 100644 --- a/source/visualization/HepRep/include/G4HepRepFileViewer.hh +++ b/source/visualization/HepRep/include/G4HepRepFileViewer.hh @@ -25,7 +25,7 @@ // // // $Id: G4HepRepFileViewer.hh,v 1.9 2006/06/29 21:17:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 5th April 2001 diff --git a/source/visualization/HepRep/include/G4HepRepMessenger.hh b/source/visualization/HepRep/include/G4HepRepMessenger.hh index 189f817176..99ac3d1388 100644 --- a/source/visualization/HepRep/include/G4HepRepMessenger.hh +++ b/source/visualization/HepRep/include/G4HepRepMessenger.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4HepRepMessenger.hh,v 1.7 2006/06/29 21:17:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // #ifndef G4HepRepMessenger_HH diff --git a/source/visualization/HepRep/include/G4HepRepSceneHandler.hh b/source/visualization/HepRep/include/G4HepRepSceneHandler.hh index 494fb07a21..49e680efc3 100644 --- a/source/visualization/HepRep/include/G4HepRepSceneHandler.hh +++ b/source/visualization/HepRep/include/G4HepRepSceneHandler.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4HepRepSceneHandler.hh,v 1.41 2006/06/29 21:17:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4HepRepSceneHandler.hh,v 1.42 2006/11/06 09:22:26 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // /** @@ -164,7 +164,7 @@ class G4HepRepSceneHandler: public G4VSceneHandler { HEPREP::HepRep* getHepRep(); HEPREP::HepRep* getHepRepGeometry(); HEPREP::HepRepInstanceTree* getGeometryInstanceTree(); - HEPREP::HepRepInstance* getGeometryInstance(G4LogicalVolume* volume, int depth); + HEPREP::HepRepInstance* getGeometryInstance(G4LogicalVolume* volume, G4Material* material, int depth); HEPREP::HepRepInstance* getGeometryInstance(G4String volumeName, int depth); HEPREP::HepRepInstance* getGeometryRootInstance(); HEPREP::HepRepTypeTree* getGeometryTypeTree(); diff --git a/source/visualization/HepRep/include/G4HepRepViewer.hh b/source/visualization/HepRep/include/G4HepRepViewer.hh index f1ca5ffedb..8179f4a88f 100644 --- a/source/visualization/HepRep/include/G4HepRepViewer.hh +++ b/source/visualization/HepRep/include/G4HepRepViewer.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4HepRepViewer.hh,v 1.18 2006/06/29 21:17:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // /** diff --git a/source/visualization/HepRep/src/G4HepRep.cc b/source/visualization/HepRep/src/G4HepRep.cc index 7c989f1a3d..130a807db0 100644 --- a/source/visualization/HepRep/src/G4HepRep.cc +++ b/source/visualization/HepRep/src/G4HepRep.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4HepRep.cc,v 1.22 2006/06/29 21:17:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // /** diff --git a/source/visualization/HepRep/src/G4HepRepFile.cc b/source/visualization/HepRep/src/G4HepRepFile.cc index cd876ce13e..13aae5b890 100644 --- a/source/visualization/HepRep/src/G4HepRepFile.cc +++ b/source/visualization/HepRep/src/G4HepRepFile.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4HepRepFile.cc,v 1.10 2006/06/29 21:17:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Joseph Perl 1 October 2001 diff --git a/source/visualization/HepRep/src/G4HepRepFileSceneHandler.cc b/source/visualization/HepRep/src/G4HepRepFileSceneHandler.cc index fec88ed152..abf17b53cf 100644 --- a/source/visualization/HepRep/src/G4HepRepFileSceneHandler.cc +++ b/source/visualization/HepRep/src/G4HepRepFileSceneHandler.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4HepRepFileSceneHandler.cc,v 1.56 2006/06/29 21:17:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4HepRepFileSceneHandler.cc,v 1.64 2006/11/16 21:06:11 perl Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Joseph Perl 27th January 2002 @@ -98,7 +98,6 @@ G4VSceneHandler(system, fSceneIdCount++, name) haveVisible = false; drawingTraj = false; doneInitTraj = false; - drawTrajPts = false; drawingHit = false; doneInitHit = false; } @@ -170,6 +169,12 @@ void G4HepRepFileSceneHandler::AddSolid(const G4Box& box) { PrintThings(); #endif + if (drawingTraj) + return; + + if (drawingHit) + InitHit(); + haveVisible = false; AddHepRepInstance("Prism", NULL); @@ -226,6 +231,13 @@ void G4HepRepFileSceneHandler::AddSolid(const G4Cons& cons) { if (cons.GetDeltaPhiAngle() < twopi) { G4VSceneHandler::AddSolid(cons); // Invoke default action. } else { + + if (drawingTraj) + return; + + if (drawingHit) + InitHit(); + haveVisible = false; AddHepRepInstance("Cylinder", NULL); @@ -270,6 +282,13 @@ void G4HepRepFileSceneHandler::AddSolid(const G4Tubs& tubs) { if (tubs.GetDeltaPhiAngle() < twopi) { G4VSceneHandler::AddSolid(tubs); // Invoke default action. } else { + + if (drawingTraj) + return; + + if (drawingHit) + InitHit(); + haveVisible = false; AddHepRepInstance("Cylinder", NULL); @@ -310,6 +329,12 @@ void G4HepRepFileSceneHandler::AddSolid(const G4Trd& trd) { PrintThings(); #endif + if (drawingTraj) + return; + + if (drawingHit) + InitHit(); + haveVisible = false; AddHepRepInstance("Prism", NULL); @@ -558,8 +583,18 @@ void G4HepRepFileSceneHandler::AddCompound (const G4VTrajectory& traj) { strcmp(category,"Association")!=0 && strcmp(category,"PickAction")!=0) category = "Physics"; - hepRepXMLWriter->addAttDef(iAttVal->GetName(), iAttDef->second.GetDesc(), - category, iAttDef->second.GetExtra()); + // Do not write out the Aux or Pos attribute. Aux does not conform to the HepRep rule + // that each object can have only one instance of a given AttValue. + // Both of these attributes are redundant to actual position information of the point. + // New Wired can just tell the user the point position itself. + if (strcmp(iAttVal->GetName(),"Aux-X")!=0 && + strcmp(iAttVal->GetName(),"Aux-Y")!=0 && + strcmp(iAttVal->GetName(),"Aux-Z")!=0 && + strcmp(iAttVal->GetName(),"Pos-X")!=0 && + strcmp(iAttVal->GetName(),"Pos-Y")!=0 && + strcmp(iAttVal->GetName(),"Pos-Z")!=0) + hepRepXMLWriter->addAttDef(iAttVal->GetName(), iAttDef->second.GetDesc(), + category, iAttDef->second.GetExtra()); } } } @@ -584,11 +619,11 @@ void G4HepRepFileSceneHandler::AddCompound (const G4VTrajectory& traj) { // factors including i_mode, trajContext and filtering). drawingTraj = true; doneInitTraj = false; - drawTrajPts = false; G4VSceneHandler::AddCompound(traj); drawingTraj = false; - if (drawTrajPts) { + // Draw step points. + if (drawingMode!=0 || trajContext->GetDrawStepPts()) { if (!doneInitTraj) InitTrajectory(); // Create Trajectory Points as a subType of Trajectories. @@ -596,21 +631,49 @@ void G4HepRepFileSceneHandler::AddCompound (const G4VTrajectory& traj) { // This allows the user to tell that points don't exist (admittedly odd) rather // than that they were omitted by the drawing mode. previousName = hepRepXMLWriter->prevTypeName[2]; - hepRepXMLWriter->addType("Trajectory Points",2); + hepRepXMLWriter->addType("Trajectory Step Points",2); + + float redness; + float greenness; + float blueness; + G4int markSize; + G4bool visible; + G4bool square; + if (drawingMode==0) { + G4Colour colour = trajContext->GetStepPtsColour(); + redness = colour.GetRed(); + greenness = colour.GetGreen(); + blueness = colour.GetBlue(); + markSize = (G4int) trajContext->GetStepPtsSize(); + visible = (G4int) trajContext->GetStepPtsVisible(); + square = (trajContext->GetStepPtsType()==G4Polymarker::squares); + } else { + redness = 1.; + greenness = 1.; + blueness = 1.; + markSize = std::abs(drawingMode/1000); + visible = true; + square = false; + } + + // Avoiding drawing anything black on black. + if (redness==0. && greenness==0. && blueness==0.) { + redness = 1.; + greenness = 1.; + blueness = 1.; + } // Specify attributes common to all trajectory points. - if (strcmp("Trajectory Points",previousName)!=0) { + if (strcmp("Trajectory Step Points",previousName)!=0) { hepRepXMLWriter->addAttValue("DrawAs","Point"); - - G4int markSize; - if (drawingMode==0) - markSize = (G4int) trajContext->GetStepPtsSize(); - else - markSize = std::abs(drawingMode/1000); + hepRepXMLWriter->addAttValue("MarkColor", redness, greenness, blueness); hepRepXMLWriter->addAttValue("MarkSize",markSize); - hepRepXMLWriter->addAttValue("Layer",110); - hepRepXMLWriter->addAttValue("Visibility","True"); + hepRepXMLWriter->addAttValue("Visibility",visible); + if (square) + hepRepXMLWriter->addAttValue("MarkName","square"); + else + hepRepXMLWriter->addAttValue("MarkName","dot"); } // Loop over all points on this trajectory. @@ -642,7 +705,17 @@ void G4HepRepFileSceneHandler::AddCompound (const G4VTrajectory& traj) { std::vector::iterator iAttVal; for (iAttVal = pointAttValues->begin(); iAttVal != pointAttValues->end(); ++iAttVal) - hepRepXMLWriter->addAttValue(iAttVal->GetName(), iAttVal->GetValue()); + // Do not write out the Aux or Pos attribute. Aux does not conform to the HepRep rule + // that each object can have only one instance of a given AttValue. + // Both of these attributes are redundant to actual position information of the point. + // New Wired can just tell the user the point position itself. + if (strcmp(iAttVal->GetName(),"Aux-X")!=0 && + strcmp(iAttVal->GetName(),"Aux-Y")!=0 && + strcmp(iAttVal->GetName(),"Aux-Z")!=0 && + strcmp(iAttVal->GetName(),"Pos-X")!=0 && + strcmp(iAttVal->GetName(),"Pos-Y")!=0 && + strcmp(iAttVal->GetName(),"Pos-Z")!=0) + hepRepXMLWriter->addAttValue(iAttVal->GetName(), iAttVal->GetValue()); delete pointAttValues; } delete rawPointAttValues; @@ -658,6 +731,124 @@ void G4HepRepFileSceneHandler::AddCompound (const G4VTrajectory& traj) { hepRepXMLWriter->addPoint(vertex.x(), vertex.y(), vertex.z()); } } + + // Draw Auxiliary Points + if (drawingMode!=0 || trajContext->GetDrawAuxPts()) { + if (!doneInitTraj) + InitTrajectory(); + // Create Trajectory Points as a subType of Trajectories. + // Note that we should create this heprep type even if there are no actual points. + // This allows the user to tell that points don't exist (admittedly odd) rather + // than that they were omitted by the drawing mode. + previousName = hepRepXMLWriter->prevTypeName[2]; + hepRepXMLWriter->addType("Trajectory Auxiliary Points",2); + + float redness; + float greenness; + float blueness; + G4int markSize; + G4bool visible; + G4bool square; + if (drawingMode==0) { + G4Colour colour = trajContext->GetAuxPtsColour(); + redness = colour.GetRed(); + greenness = colour.GetGreen(); + blueness = colour.GetBlue(); + markSize = (G4int) trajContext->GetAuxPtsSize(); + visible = (G4int) trajContext->GetAuxPtsVisible(); + square = (trajContext->GetAuxPtsType()==G4Polymarker::squares); + } else { + redness = 1.; + greenness = 1.; + blueness = 1.; + markSize = std::abs(drawingMode/1000); + visible = true; + square = false; + } + + // Avoiding drawing anything black on black. + if (redness==0. && greenness==0. && blueness==0.) { + redness = 1.; + greenness = 1.; + blueness = 1.; + } + + // Specify attributes common to all trajectory points. + if (strcmp("Trajectory Auxiliary Points",previousName)!=0) { + hepRepXMLWriter->addAttValue("DrawAs","Point"); + hepRepXMLWriter->addAttValue("MarkColor", redness, greenness, blueness); + hepRepXMLWriter->addAttValue("MarkSize",markSize); + hepRepXMLWriter->addAttValue("Layer",110); + hepRepXMLWriter->addAttValue("Visibility",visible); + if (square) + hepRepXMLWriter->addAttValue("MarkName","Square"); + else + hepRepXMLWriter->addAttValue("MarkName","Dot"); + } + + // Loop over all points on this trajectory. + for (i = 0; i < traj.GetPointEntries(); i++) { + G4VTrajectoryPoint* aTrajectoryPoint = traj.GetPoint(i); + + // Each point is a separate instance of the type Trajectory Points. + hepRepXMLWriter->addInstance(); + + // Pointers to hold trajectory point attribute values and definitions. + std::vector* rawPointAttValues = aTrajectoryPoint->CreateAttValues(); + std::vector* pointAttValues = + new std::vector; + std::map* pointAttDefs = + new std::map; + + // Get trajectory point attributes and definitions in standard HepRep style + // (uniform units, 3Vectors decomposed). + if (rawPointAttValues) { + G4bool error = G4AttCheck(rawPointAttValues, + aTrajectoryPoint->GetAttDefs()).Standard(pointAttValues,pointAttDefs); + if (error) { + G4cout << "G4HepRepFileSceneHandler::AddCompound(traj):" + "\nERROR found during conversion to standard point attributes." << G4endl; + } + + // Write out point attribute values. + if (pointAttValues) { + std::vector::iterator iAttVal; + for (iAttVal = pointAttValues->begin(); + iAttVal != pointAttValues->end(); ++iAttVal) + // Do not write out the Aux or Pos attribute. Aux does not conform to the HepRep rule + // that each object can have only one instance of a given AttValue. + // Both of these attributes are redundant to actual position information of the point. + // New Wired can just tell the user the point position itself. + if (strcmp(iAttVal->GetName(),"Aux-X")!=0 && + strcmp(iAttVal->GetName(),"Aux-Y")!=0 && + strcmp(iAttVal->GetName(),"Aux-Z")!=0 && + strcmp(iAttVal->GetName(),"Pos-X")!=0 && + strcmp(iAttVal->GetName(),"Pos-Y")!=0 && + strcmp(iAttVal->GetName(),"Pos-Z")!=0) + hepRepXMLWriter->addAttValue(iAttVal->GetName(), iAttVal->GetValue()); + delete pointAttValues; + } + delete rawPointAttValues; + } + + // Clean up point attributes. + if (pointAttDefs) + delete pointAttDefs; + + // Each trajectory point is made of a single primitive, a point. + G4Point3D vertex = aTrajectoryPoint->GetPosition(); + + // Loop over auxiliary points associated with this Trajectory Point. + const std::vector* auxiliaries = aTrajectoryPoint->GetAuxiliaryPoints(); + if (0 != auxiliaries) { + for (size_t iAux=0; iAuxsize(); ++iAux) { + const G4ThreeVector auxPos((*auxiliaries)[iAux]); + hepRepXMLWriter->addPrimitive(); + hepRepXMLWriter->addPoint(auxPos.x(), auxPos.y(), auxPos.z()); + } + } + } + } } @@ -827,6 +1018,7 @@ void G4HepRepFileSceneHandler::AddPrimitive(const G4Polyline& polyline) { if (drawingTraj) InitTrajectory(); + if (drawingHit) InitHit(); @@ -867,10 +1059,8 @@ void G4HepRepFileSceneHandler::AddPrimitive (const G4Polymarker& line) { if (sizeType==world) size = 4.; - if (drawingTraj) { - drawTrajPts = true; + if (drawingTraj) return; - } if (drawingHit) InitHit(); @@ -971,10 +1161,8 @@ void G4HepRepFileSceneHandler::AddPrimitive(const G4Circle& circle) { if (sizeType==world) size = 4.; - if (drawingTraj) { - drawTrajPts = true; + if (drawingTraj) return; - } if (drawingHit) InitHit(); @@ -1017,10 +1205,8 @@ void G4HepRepFileSceneHandler::AddPrimitive(const G4Square& square) { if (sizeType==world) size = 4.; - if (drawingTraj) { - drawTrajPts = true; + if (drawingTraj) return; - } if (drawingHit) InitHit(); @@ -1051,10 +1237,8 @@ void G4HepRepFileSceneHandler::AddPrimitive(const G4Polyhedron& polyhedron) { if(polyhedron.GetNoFacets()==0)return; - if (drawingTraj) { - drawTrajPts = true; + if (drawingTraj) return; - } if (drawingHit) InitHit(); @@ -1111,8 +1295,7 @@ void G4HepRepFileSceneHandler::AddHepRepInstance(const char* primName, G4VPhysicalVolume* pCurrentPV = 0; G4LogicalVolume* pCurrentLV = 0; G4int currentDepth = 0; - G4PhysicalVolumeModel* pPVModel = - dynamic_cast(fpModel); + G4PhysicalVolumeModel* pPVModel = dynamic_cast(fpModel); if (pPVModel) { pCurrentPV = pPVModel->GetCurrentPV(); pCurrentLV = pPVModel->GetCurrentLV(); @@ -1224,20 +1407,7 @@ void G4HepRepFileSceneHandler::AddHepRepInstance(const char* primName, G4int drawnMotherDepth = 0; if (ri != drawnPVPath.rend()) { // This volume has a mother. - G4VPhysicalVolume* drawnMotherPV = ri->GetPhysicalVolume(); - // Find this mother's depth by examining prevTypeNames. - if (currentDepth>1) { - drawnMotherDepth = currentDepth-1; - while (strcmp(hepRepXMLWriter->prevTypeName[drawnMotherDepth],drawnMotherPV->GetName())!=0) { - //G4cout << "Didn't find mother at depth:" << drawnMotherDepth << ", that depth had:" << - //hepRepXMLWriter->prevTypeName[drawnMotherDepth] << G4endl; - drawnMotherDepth--; - if (drawnMotherDepth==0) { - //G4cout << "Got to drawnMotherDepth of zero. Giving up." << G4endl; - break; - } - } - } + drawnMotherDepth = ri->GetNonCulledDepth(); } else { // This volume has no mother. Must be a top level volume. //G4cout << "Mother must be very top" << G4endl; @@ -1264,14 +1434,21 @@ void G4HepRepFileSceneHandler::AddHepRepInstance(const char* primName, // Additional attributes. hepRepXMLWriter->addAttValue("Layer",hepRepXMLWriter->typeDepth); hepRepXMLWriter->addAttValue("LVol", pCurrentLV->GetName()); - hepRepXMLWriter->addAttValue("Region", pCurrentLV->GetRegion()->GetName()); + G4Region* region = pCurrentLV->GetRegion(); + G4String regionName = region? region->GetName(): G4String("No region"); + hepRepXMLWriter->addAttValue("Region", regionName); hepRepXMLWriter->addAttValue("RootRegion", pCurrentLV->IsRootRegion()); hepRepXMLWriter->addAttValue("Solid", pCurrentLV->GetSolid()->GetName()); hepRepXMLWriter->addAttValue("EType", pCurrentLV->GetSolid()->GetEntityType()); - hepRepXMLWriter->addAttValue("Material", pCurrentLV->GetMaterial()->GetName()); - hepRepXMLWriter->addAttValue("Density", pCurrentLV->GetMaterial()->GetDensity()*m3/kg); - hepRepXMLWriter->addAttValue("State", pCurrentLV->GetMaterial()->GetState()); - hepRepXMLWriter->addAttValue("Radlen", pCurrentLV->GetMaterial()->GetRadlen()/m); + G4Material * material = pPVModel->GetCurrentMaterial(); + G4String matName = material? material->GetName(): G4String("No material"); + hepRepXMLWriter->addAttValue("Material", matName); + G4double matDensity = material? material->GetDensity(): 0.; + hepRepXMLWriter->addAttValue("Density", matDensity*m3/kg); + G4State matState = material? material->GetState(): kStateUndefined; + hepRepXMLWriter->addAttValue("State", matState); + G4double matRadlen = material? material->GetRadlen(): 0.; + hepRepXMLWriter->addAttValue("Radlen", matRadlen/m); } hepRepXMLWriter->addAttValue("DrawAs",primName); diff --git a/source/visualization/HepRep/src/G4HepRepFileViewer.cc b/source/visualization/HepRep/src/G4HepRepFileViewer.cc index c65673364c..89859dc861 100644 --- a/source/visualization/HepRep/src/G4HepRepFileViewer.cc +++ b/source/visualization/HepRep/src/G4HepRepFileViewer.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4HepRepFileViewer.cc,v 1.15 2006/06/29 21:17:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4HepRepFileViewer.hh" diff --git a/source/visualization/HepRep/src/G4HepRepMessenger.cc b/source/visualization/HepRep/src/G4HepRepMessenger.cc index 31d91269ca..caa89d59f9 100644 --- a/source/visualization/HepRep/src/G4HepRepMessenger.cc +++ b/source/visualization/HepRep/src/G4HepRepMessenger.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4HepRepMessenger.cc,v 1.10 2006/06/29 21:17:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4HepRepMessenger.hh" diff --git a/source/visualization/HepRep/src/G4HepRepSceneHandler.cc b/source/visualization/HepRep/src/G4HepRepSceneHandler.cc index 4aa29c666a..19b4b15604 100644 --- a/source/visualization/HepRep/src/G4HepRepSceneHandler.cc +++ b/source/visualization/HepRep/src/G4HepRepSceneHandler.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4HepRepSceneHandler.cc,v 1.97 2006/06/29 21:17:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4HepRepSceneHandler.cc,v 1.100 2006/11/16 12:17:54 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // /** @@ -561,6 +561,7 @@ void G4HepRepSceneHandler::AddSolid(const G4Cons& cons) { G4LogicalVolume* pCurrentLV = pPVModel->GetCurrentLV(); G4int currentDepth = pPVModel->GetCurrentDepth(); + G4Material* pCurrentMaterial = pPVModel->GetCurrentMaterial(); G4Point3D vertex1(G4Point3D( 0., 0., cons.GetZHalfLength())); G4Point3D vertex2(G4Point3D( 0., 0.,-cons.GetZHalfLength())); @@ -568,7 +569,7 @@ void G4HepRepSceneHandler::AddSolid(const G4Cons& cons) { vertex1 = (transform) * vertex1; vertex2 = (transform) * vertex2; - HepRepInstance* instance = getGeometryInstance(pCurrentLV, currentDepth); + HepRepInstance* instance = getGeometryInstance(pCurrentLV, pCurrentMaterial, currentDepth); setAttribute(instance, "DrawAs", G4String("Cylinder")); setVisibility(instance, cons); @@ -622,6 +623,7 @@ void G4HepRepSceneHandler::AddSolid(const G4Tubs& tubs) { G4LogicalVolume* pCurrentLV = pPVModel->GetCurrentLV(); G4int currentDepth = pPVModel->GetCurrentDepth(); + G4Material* pCurrentMaterial = pPVModel->GetCurrentMaterial(); G4Point3D vertex1(G4Point3D( 0., 0., tubs.GetZHalfLength())); G4Point3D vertex2(G4Point3D( 0., 0.,-tubs.GetZHalfLength())); @@ -629,7 +631,7 @@ void G4HepRepSceneHandler::AddSolid(const G4Tubs& tubs) { vertex1 = (transform) * vertex1; vertex2 = (transform) * vertex2; - HepRepInstance* instance = getGeometryInstance(pCurrentLV, currentDepth); + HepRepInstance* instance = getGeometryInstance(pCurrentLV, pCurrentMaterial, currentDepth); setAttribute(instance, "DrawAs", G4String("Cylinder")); setVisibility(instance, tubs); @@ -1384,7 +1386,8 @@ HepRepInstance* G4HepRepSceneHandler::getGeometryOrEventInstance(HepRepType* typ dynamic_cast(fpModel); G4LogicalVolume* pCurrentLV = pPVModel->GetCurrentLV(); G4int currentDepth = pPVModel->GetCurrentDepth(); - return getGeometryInstance(pCurrentLV, currentDepth); + G4Material* pCurrentMaterial = pPVModel->GetCurrentMaterial(); + return getGeometryInstance(pCurrentLV, pCurrentMaterial, currentDepth); } } @@ -1425,19 +1428,25 @@ HepRepInstance* G4HepRepSceneHandler::getGeometryRootInstance() { return _geometryRootInstance; } -HepRepInstance* G4HepRepSceneHandler::getGeometryInstance(G4LogicalVolume* volume, int depth) { +HepRepInstance* G4HepRepSceneHandler::getGeometryInstance(G4LogicalVolume* volume, G4Material* material, int depth) { HepRepInstance* instance = getGeometryInstance(volume->GetName(), depth); setAttribute(instance, "LVol", volume->GetName()); - setAttribute(instance, "Region", volume->GetRegion()->GetName()); + G4Region* region = volume->GetRegion(); + G4String regionName = region? region->GetName(): G4String("No region"); + setAttribute(instance, "Region", regionName); setAttribute(instance, "RootRegion", volume->IsRootRegion()); setAttribute(instance, "Solid", volume->GetSolid()->GetName()); setAttribute(instance, "EType", volume->GetSolid()->GetEntityType()); - setAttribute(instance, "Material", volume->GetMaterial()->GetName()); - setAttribute(instance, "Density", volume->GetMaterial()->GetDensity()); - setAttribute(instance, "Radlen", volume->GetMaterial()->GetRadlen()); + G4String matName = material? material->GetName(): G4String("No material"); + setAttribute(instance, "Material", matName ); + G4double matDensity = material? material->GetDensity(): 0.; + setAttribute(instance, "Density", matDensity); + G4double matRadlen = material? material->GetRadlen(): 0.; + setAttribute(instance, "Radlen", matRadlen); - G4String state = materialState[volume->GetMaterial()->GetState()]; + G4State matState = material? material->GetState(): kStateUndefined; + G4String state = materialState[matState]; setAttribute(instance, "State", state); return instance; diff --git a/source/visualization/HepRep/src/G4HepRepViewer.cc b/source/visualization/HepRep/src/G4HepRepViewer.cc index 8cf170b066..d9ce665d0d 100644 --- a/source/visualization/HepRep/src/G4HepRepViewer.cc +++ b/source/visualization/HepRep/src/G4HepRepViewer.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4HepRepViewer.cc,v 1.26 2006/06/29 21:17:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // /** diff --git a/source/visualization/History b/source/visualization/History index d846540729..83d3473a26 100644 --- a/source/visualization/History +++ b/source/visualization/History @@ -1,4 +1,4 @@ -$Id: History,v 1.361 2006/06/12 08:35:10 allison Exp $ +$Id: History,v 1.398 2006/11/26 22:07:44 allison Exp $ ------------------------------------------------------------------- ========================================================= @@ -24,6 +24,229 @@ committal in the CVS repository ! History file for visualization category --------------------------------------- +25th November 2006 John Allison (vis-V08-01-17) +- visman-V08-01-15: Follow change of behaviour of G4StateManager and + minor message corrections. + +22nd November 2006 John Allison (vis-V08-01-16) +- visman-V08-01-14: Fixed /vis/reviewKeptEvents for "stored" viewers. + +21st November 2006 John Allison (vis-V08-01-15) +- visman-V08-01-13: + o Fixed double drawing of event. + o Restored old verbosity and printing interface (for obsolete user vis + managers). + o Fixed compiler warnings. +- opengl-V08-01-09: Fixed compiler warnings. + +17th November 2006 Joseph Perl (vis-V08-01-14) +- vis-HepRep-V08-01-04: + o Omit Pos and Aux attributes for hits. + o Protect against null Region (as in parallel geometries). +- raytracer-V08-01-02 + o Deprecate /vis/rayTracer/backgroundColour. + +16th November 2006 John Allison +- modeling-V08-01-15: More protection for parallel worlds. +- visman-V08-01-12: + o /vis/scene/notifyHandlers: Refreshes only auto-refresh viewers. + (Warning of scene change issued for other viewers.) + +15th November 2006 John Allison (vis-V08-01-13) +- visman-V08-01-11: First implementation of /vis/reviewKeptEvents. + +14th November 2006 Joseph Perl +- vis-HepRep-V08-01-03: Improve handling of Trajectory Points. + +14th November 2006 John Allison (vis-V08-01-12) +- modeling-V08-01-14: Merged modeling-V08-01-13-branch onto main branch: + o Added G4Event pointer to modeling parameters. +- visman-V08-01-10: Merged visman-V08-01-08-branch onto main branch: + o Visualisation of parallel worlds. + o Event refreshing (events are re-drawn on change or refresh of viewer). +- raytracer-V08-01-01: Merged raytracer-V08-01-00-branch onto main branch: + o Followed change to G4Scene. +- vistest-V08-01-05: Added G4EllipticalCone. + +13 November 2006 Joseph Perl +- vis-HepRep-V08-01-02: Corrected handling of Hits that come via AddSolids. + +5th November 2006 John Allison (vis-V08-01-11) +- modeling-V08-01-13: Further, hopefully, complete, protection against + zero materials pointer. +- vis-HepRep-V08-01-01, openinventor-V08-01-04, vistree-V08-01-02, + visXXX-V08-01-06: Protected against zero material pointer. +- visman-V08-01-09: Tidy warning messages. + +3rd November 2006 John Allison +- modeling-V08-01-12: Protected against zero material pointer. + +----------------------------------------------- +3rd November 2006 John Allison (vis-V08-01-10) +- Needs greps-V08-01-10 for bug fix in G4Visible. +- Needs tracking-V08-01-05 for new storeTrajectory command. +- Committed tracking-V08-01-05. Now required by vis. + o Augmented /tracking/storeTrajectory. Now takes integer parameter: + 0 : Don't Store trajectories. + !=0 : Store trajectories. + 1 : Choose G4Trajectory as default. + 2 : Choose G4SmoothTrajectory as default. + 3 : Choose G4RichTrajectory as default. + o All trajectories: + ~ Protect points container pointer in destructor. + ~ Make G4AttDef descriptions more concise. + o G4RichTrajectory: + ~ Bug fix: Create G4AttValues for user-defined creator process. + o G4VTrajectory: Improved ShowTrajectory. +- visman-V08-01-08: Activated /vis/scene/add/trajectories with "rich" and + "smooth". Needs tracking-V08-01-05. +- modeling-V08-01-11: Improved protections. +- vistest-V08-01-04: Removed MyTrackingAction (use storeTrajectory instead.) + +2nd November 2006 John Allison +- modeling-V08-01-10: G4HitsModel: Added GetCurrentHit. +- openinventor-V08-01-03: Extended picking to hits. + +------------------------------------------------------------------------- +1st November 2006 John Allison (vis-V08-01-09; co-works greps-V08-01-09) +- modeling-V08-01-09: Minor rationalisation. +- visman-V08-01-07: + o /vis/scene/add/trajectories: Allow string parameters "rich" and "smooth". + (Not yet activated - awaiting tags in tracking.) +- openinventor-V08-01-02: + o Follow changes to greps-V08-01-09: G4AttCheck/Holder rationalisation. +- vis-HepRep-V08-01-00: Minor rationalisation. +- opengl-V08-01-08: Replace /vis/oglx/set/printEPS by /vis/oglx/printEPS. +- vistree-V08-01-01: ASCIITree: Added printing of material name. +- vistest-V08-01-03: Added G4Polycone and some G4Atts to an event action box. + +26th October 2006 John Allison +- openinventor-V08-01-01: + o Print G4AttValues of solids and trajectories on picking. +- modeling-V08-01-08: Cosmetics. + +------------------------------------------------------------------------- +24th October 2006 John Allison (vis-V08-01-08; co-works greps-V08-01-08) +- opengl-V08-01-07: + o Calculate light front horizon properly. + o Improve refresh behaviour for /vis/opengl commands. +- visXXX-V08-01-04; co-works greps-V08-01-08: + o Follow change to G4VisAttributes in greps-V08-01-08. + +------------------------------------------------- +19th September 2006 John Allison (vis-V08-01-07) +- modeling-V08-01-07: + o G4ModelingParameters: Added ExplodeCentre + o Fix for Mac XCode 2.0 problem. +- visman-V08-01-06: + o G4ViewParameters: Added ExplodeCentre. + o Bug fix in /vis/geometry/set/colour. +- opengl-V08-01-06: Improved display-by-time feature. + +--------------------------------------------------------------------------- +15th September 2006 John Allison (vis-V08-01-06 - coworks greps-V08-01-04) +- modeling-V08-01-06 + o Implemented explode factor(radial move) feature for top level drawn + volumes. John Allison + o Add attribute based trajectory drawing & filtering, and attribute + based hit filtering. Jane Tinsley +- visman-V08-01-05 + o Added /vis/viewer/clone and /vis/viewer/set/explodeFactor. John Allison + o Add attribute based trajectory drawing & filtering, and attribute + based hit filtering. Jane Tinsley + +13th September 2006 John Allison +- visXXX-V08-01-03: Improved G4Att printing and checking. + +4th September 2006 John Allison +- visman-V08-01-04: Added commands for cutaways. +- opengl-V08-01-05: Implemented cutaways. + +---------------------------------------------- +30th August 2006 John Allison (vis-V08-01-05) +- modeling-V08-01-05: + o Implemented code for augmented /vis/scene/add/volume (subtraction + *and* intersection of clipping volume). + o Equipped for generic sectioning (DCUT) and cutaways. + o Improved DrawWithTime. +- visman-V08-01-03: + o Added /vis/viewer/set/globalLineWidthScale. + o Augmented /vis/scene/add/volume to include intersection of clipping volume. + o Added G4VSceneHandler::CreateSection/CutawayPolyhedron to exploit generic + sectioning (DCUT) and cutaways. Currently not activated due to + instabilities in BooleanProcessor. +- opengl-V08-01-04: + o Implemented line width. + o Switched off back face culling when clipping so that the inside of + volumes can be seen. + o Added position and colour to /vis/ogl/set/displayHeadTime. + o Added /vis/ogl/set/displayLightFront. + +29th August 2006 John Allison +- openinventor-V08-01-00: Kernel visit rationalisation. +- visXXX-V08-01-02: Minor tidying. + +------------------------------------------------------------------------- +26th August 2006 John Allison (vis-V08-01-04 - requires greps-V08-01-03) +- modeling-V08-01-04: + o Fixed compilation warning. + o Follow G4VFilter const change. + +16th August 2006 John Allison +- modeling-V08-01-03: Improved robustness of time slicing. + +---------------------------------------------- +16th August 2006 John Allison (vis-V08-01-03) +- opengl-V08-01-03: + o Fixed Solaris compilation problem. + o Added /vis/ogl/set/fade and displayHeadTime. + +----------------------------------------------- +14th August 2006 John Allison (vis-V08-01-02) +- modeling-V08-01-02: Added trajectory time slicing. +- visman-V08-01-02: Friendship extended to new OpenGL messengers. +- opengl-V08-01-02: + o Implemented display-by-time. + o Added /vis/ogl/set/startTime and endTime. +- raytracer-V08-01-00: Improved robustness under vis manager control. +- vistest-V08-01-02: Added MyTrackingAction - uses G4RichTrajectory. + +17th July 2006 John Allison +- opengl-V08-01-01: Added /vis/oglx/set/printEPS. + +--------------------------------------------- +10th July 2006 John Allison (vis-V08-01-01) +- Co-works with greps-V08-01-01. +- modeling-V08-01-01: + o Rationalised G4VModel and G4ModelingParameters. + o G4PhysicalVolumeModel: + ^ Removed Establish/DecommissionSpecials to conform with + greps-V08-01-01. + ^ Rationalised G4Atts: Added GetAttDefs/CreateAttValues. +- visman-V08-01-01: + o Removed Establish/DecommissionSpecials to conform with greps-V08-01-01. + o Respect rationalised G4ModelingParameters. + o Added GetNoOfSides that respects forced line segments per circle. +- G4VisCommandsScene.cc: Spelling correction. +- DAWN-V08-01-00: Respects forced line segments per circle. +- visXXX-V08-01-01: Gets solid's G4Atts created by G4PhysicalVolumeModel. +- vistest-V08-01-01: SetForceLineSegmentsPerCircle(100) for G4Sphere. + +-------------------------------------------------------------------- +3rd July 2006 John Allison (vis-V08-01-00 - needs greps-V08-01-00) +- modeling-V08-01-00: Added G4Atts for solids. (Needs greps-V08-01-00.) +- visman-V08-01-00: + o /vis/scene/transientsAction: Added max number of events parameter. + o Added /vis/viewer/clearTransients. + o Improved /vis/list. + o (Commented out) code for event copying. +- opengl-V08-01-00: + o Eliminated redundant variable, doublebuffer. + o Implemented FinishView in all viewers. +- vistree-V08-01-00: ASCIITree: Layout improvement. +- visXXX-V08-01-00: General tidy and improvement to XXXFile. +- vistest-V08-01-00: Protect against zero run manager pointer. + --------------------------------------------- 12th June 2006 John Allison (vis-V08-00-13) - DAWN-V08-00-04: Fixed rewind and file closure on exit. diff --git a/source/visualization/OpenGL/History b/source/visualization/OpenGL/History index 5d8206f54e..43ea4bdc84 100644 --- a/source/visualization/OpenGL/History +++ b/source/visualization/OpenGL/History @@ -1,4 +1,4 @@ -$Id: History,v 1.69 2006/05/31 02:25:23 perl Exp $ +$Id: History,v 1.82 2006/11/21 16:24:58 allison Exp $ ------------------------------------------------------------------- ========================================================= @@ -20,6 +20,74 @@ committal in the CVS repository ! History file for visualization/OpenGL ------------------------------------- +21st November 2006 John Allison (opengl-V08-01-09) +- Fixed compiler warnings. + +1st November 2006 John Allison (opengl-V08-01-08) +- Replace /vis/oglx/set/printEPS by /vis/oglx/printEPS. The new command + actually initiates a print, rather than set a flag for printing. + +24th October 2006 John Allison (opengl-V08-01-07) +- G4OpenGLStoredViewer.cc: Calculate light front horizon properly. +- G4OpenGLViewerMessenger.cc: Make refresh depend on auto-refresh. + +19th September 2006 John Allison (opengl-V08-01-06) +- Added time origin for light front. +- Added /vis/ogl/set/transparency. +- G4OpenGLStoredViewer.cc: Bug fix in time range acceptance. + +4th September 2006 John Allison (opengl-V08-01-05) +- Implement cutaways. +- Immediate mode: G4OpenGLImmediateSceneHandler.cc: Flush all + primitives (see detector being drawn). +- /vis/oglx/set/printEPS: change parameter default to true. + +30th August 2006 John Allison (opengl-V08-01-04) +- G4OpenGLSceneHandler: + o Implemented line width. + o Switched off back face culling when clipping so that the inside of + volumes can be seen. + o Added CreateSection/CutawayPolyhedron to exploit generic + sectioning (DCUT) and cutaways. Currently not activated due to + instabilities in BooleanProcessor. Local sectioning still active + but broken (at least on Mac) due to apparent change in effect of + clipping planes (polyhedron edges not reconstructed). + o Rationalised calculation of marker size. +- G4OpenGLStoredSceneHandler: + o Fixed bug due to recursive calls of AddPrimitive (polymarkers -> markers). + o Pick up time range from G4VisAttributes. +- G4OpenGLViewer(Messenger): + o Added position and colour to /vis/ogl/set/displayHeadTime. + o Added /vis/ogl/set/displayLightFront. +- G4OpenGLStoredViewer.cc: + o Rationalised CompareForKernelVisit. (Local sectioning still active.) + o Added position and colour to DisplayHeadTime. + o Added DisplayLightFront. + +16th August 2006 John Allison (opengl-V08-01-03) +- Corrected Solaris compilation error. +- Added /vis/ogl/set/fade and displayHeadTime. + +14th August 2006 John Allison (opengl-V08-01-02) +- Needs visman-V08-01-02. +- G4OpenGLStored: Implemented display-by-time. Only available in + stored mode at present. Only implemented for circle, square, + polyline and polymarker at present, enough for currently available + trajectory models. Time is communicated via G4AttValues. +- Added G4OpenGLViewerMessenger. +- Added /vis/ogl/set/startTime and endTime of displayed objects. +- All factories: Instantiated G4OpenGLViewerMessenger. +- G4OpenGLViewer: Added fStart/EndTime. +- G4OpenGLXViewer.cc: Graceful recovery from unexpected tokens in + spewPrimitiveEPS and spewSortedFeedback. + +17th July John Allison (opengl-V08-01-01) +- Added /vis/oglx/set/printEPS (prints eps file on every update). + +3rd July 2006 John Allison (opengl-V08-01-00) +- Elimination of redundant variable doublebuffer and implementation of + FinishView in all viewers. + 30th May 2006 Joseph Perl (opengl-V08-00-08) - G4OpenGLImmediateWin32Viewer: Removed tests on doublebuffer since that variable seems to have random behavior and should be assumed false for diff --git a/source/visualization/OpenGL/include/G4OpenGL.hh b/source/visualization/OpenGL/include/G4OpenGL.hh index c21e1eb0f9..26c9a082ed 100644 --- a/source/visualization/OpenGL/include/G4OpenGL.hh +++ b/source/visualization/OpenGL/include/G4OpenGL.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4OpenGL.hh,v 1.4 2006/06/29 21:17:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G.Barrand. diff --git a/source/visualization/OpenGL/include/G4OpenGLFontBaseStore.hh b/source/visualization/OpenGL/include/G4OpenGLFontBaseStore.hh index efb79b9d99..6607af6c11 100644 --- a/source/visualization/OpenGL/include/G4OpenGLFontBaseStore.hh +++ b/source/visualization/OpenGL/include/G4OpenGLFontBaseStore.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4OpenGLFontBaseStore.hh,v 1.3 2006/06/29 21:17:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // J.Allison Apr 2005. diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateSceneHandler.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateSceneHandler.hh index 233f5b7d5e..4be2d1b851 100644 --- a/source/visualization/OpenGL/include/G4OpenGLImmediateSceneHandler.hh +++ b/source/visualization/OpenGL/include/G4OpenGLImmediateSceneHandler.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenGLImmediateSceneHandler.hh,v 1.10 2006/06/29 21:17:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenGLImmediateSceneHandler.hh,v 1.11 2006/08/16 10:34:36 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 10th February 1997 @@ -48,6 +48,7 @@ class G4OpenGLImmediate; class G4OpenGLImmediateSceneHandler: public G4OpenGLSceneHandler { public: + G4OpenGLImmediateSceneHandler (G4VGraphicsSystem& system, const G4String& name); virtual ~G4OpenGLImmediateSceneHandler (); void BeginPrimitives (const G4Transform3D& objectTransformation); @@ -56,10 +57,33 @@ public: void EndPrimitives2D (); void BeginModeling (); void EndModeling (); + void AddPrimitive (const G4Polyline&); + void AddPrimitive (const G4Circle&); + void AddPrimitive (const G4Square&); + // Explicitly invoke base class methods to avoid warnings about + // hiding of base class methods... + void AddPrimitive (const G4Text& text) { + G4OpenGLSceneHandler::AddPrimitive (text); + } + void AddPrimitive (const G4Polyhedron& polyhedron) { + G4OpenGLSceneHandler::AddPrimitive (polyhedron); + } + void AddPrimitive (const G4NURBS& nurbs) { + G4OpenGLSceneHandler::AddPrimitive (nurbs); + } + void AddPrimitive(const G4Polymarker& polymarker) { + G4OpenGLSceneHandler::AddPrimitive (polymarker); + } + void AddPrimitive (const G4Scale& scale) { + G4OpenGLSceneHandler::AddPrimitive (scale); + } void ClearTransientStore (); -private: +protected: + void RequestPrimitives (const G4VSolid& solid); + void AddPrimitivePreamble(const G4Visible& visible); + static G4int fSceneIdCount; // static counter for OpenGLImmediate scenes. }; diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateViewer.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateViewer.hh index c3a9fdfdd5..08028613ce 100644 --- a/source/visualization/OpenGL/include/G4OpenGLImmediateViewer.hh +++ b/source/visualization/OpenGL/include/G4OpenGLImmediateViewer.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenGLImmediateViewer.hh,v 1.8 2006/06/29 21:17:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenGLImmediateViewer.hh,v 1.9 2006/09/04 12:07:59 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 7th February 1997 @@ -52,6 +52,7 @@ class G4OpenGLImmediateViewer: virtual public G4OpenGLViewer { public: G4OpenGLImmediateViewer (G4OpenGLImmediateSceneHandler& scene); + void ProcessView (); }; #endif diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateWin32.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateWin32.hh index f90352d394..ca47fe8e71 100644 --- a/source/visualization/OpenGL/include/G4OpenGLImmediateWin32.hh +++ b/source/visualization/OpenGL/include/G4OpenGLImmediateWin32.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLImmediateWin32.hh,v 1.7 2006/06/29 21:17:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // OpenGLImmediateWin32 graphics system factory. diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateWin32Viewer.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateWin32Viewer.hh index 30992423bf..604d0e6419 100644 --- a/source/visualization/OpenGL/include/G4OpenGLImmediateWin32Viewer.hh +++ b/source/visualization/OpenGL/include/G4OpenGLImmediateWin32Viewer.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLImmediateWin32Viewer.hh,v 1.9 2006/06/29 21:17:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Class G4OpenGLImmediateWin32Viewer : a class derived from diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateX.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateX.hh index 9c9f859e23..bfa2d744ad 100644 --- a/source/visualization/OpenGL/include/G4OpenGLImmediateX.hh +++ b/source/visualization/OpenGL/include/G4OpenGLImmediateX.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLImmediateX.hh,v 1.7 2006/06/29 21:17:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 10th February 1997 diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateXViewer.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateXViewer.hh index 02966fa5e7..24113b5a46 100644 --- a/source/visualization/OpenGL/include/G4OpenGLImmediateXViewer.hh +++ b/source/visualization/OpenGL/include/G4OpenGLImmediateXViewer.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenGLImmediateXViewer.hh,v 1.8 2006/06/29 21:17:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenGLImmediateXViewer.hh,v 1.9 2006/07/03 16:38:13 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 7th February 1997 @@ -54,6 +54,7 @@ public: virtual ~G4OpenGLImmediateXViewer (); void Initialise (); void DrawView (); + void FinishView (); }; #endif diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateXm.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateXm.hh index 6f558c0d54..1a3209fe73 100644 --- a/source/visualization/OpenGL/include/G4OpenGLImmediateXm.hh +++ b/source/visualization/OpenGL/include/G4OpenGLImmediateXm.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLImmediateXm.hh,v 1.7 2006/06/29 21:17:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 10th February 1997 diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateXmViewer.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateXmViewer.hh index 87b33badff..2ba2eeabf4 100644 --- a/source/visualization/OpenGL/include/G4OpenGLImmediateXmViewer.hh +++ b/source/visualization/OpenGL/include/G4OpenGLImmediateXmViewer.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenGLImmediateXmViewer.hh,v 1.8 2006/06/29 21:17:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenGLImmediateXmViewer.hh,v 1.9 2006/07/03 16:38:13 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 10th February 1997 @@ -54,6 +54,7 @@ public: virtual ~G4OpenGLImmediateXmViewer (); void Initialise (); void DrawView (); + void FinishView (); }; diff --git a/source/visualization/OpenGL/include/G4OpenGLSceneHandler.hh b/source/visualization/OpenGL/include/G4OpenGLSceneHandler.hh index 48f0aa007f..4300119b4b 100644 --- a/source/visualization/OpenGL/include/G4OpenGLSceneHandler.hh +++ b/source/visualization/OpenGL/include/G4OpenGLSceneHandler.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenGLSceneHandler.hh,v 1.19 2006/06/29 21:17:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenGLSceneHandler.hh,v 1.20 2006/08/30 11:37:34 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 27th March 1996 @@ -79,12 +79,17 @@ public: void AddCompound (const G4VHit&); protected: + G4OpenGLSceneHandler (G4VGraphicsSystem& system, G4int id, const G4String& name = ""); virtual ~G4OpenGLSceneHandler (); + const G4Polyhedron* CreateSectionPolyhedron (); + const G4Polyhedron* CreateCutawayPolyhedron (); + private: + void AddCircleSquare (const G4VMarker&, G4int nSides); /************************************************** Not needed - but see note on future development in .cc. diff --git a/source/visualization/OpenGL/include/G4OpenGLSceneHandler.icc b/source/visualization/OpenGL/include/G4OpenGLSceneHandler.icc index 1b7f4eb7a2..67ceeec977 100644 --- a/source/visualization/OpenGL/include/G4OpenGLSceneHandler.icc +++ b/source/visualization/OpenGL/include/G4OpenGLSceneHandler.icc @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLSceneHandler.icc,v 1.7 2006/06/29 21:17:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 20th January 1998 diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh b/source/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh index 190792c247..86731e67a5 100644 --- a/source/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh +++ b/source/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenGLStoredSceneHandler.hh,v 1.18 2006/06/29 21:18:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenGLStoredSceneHandler.hh,v 1.21 2006/08/30 11:43:57 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 10th February 1997 @@ -48,8 +48,11 @@ class G4OpenGLStored; class G4OpenGLStoredSceneHandler: public G4OpenGLSceneHandler { - + + friend class G4OpenGLStoredViewer; // ..allows access to P/TODLs. + public: + G4OpenGLStoredSceneHandler (G4VGraphicsSystem& system, const G4String& name = ""); virtual ~G4OpenGLStoredSceneHandler (); void BeginPrimitives (const G4Transform3D& objectTransformation); @@ -58,24 +61,59 @@ public: void EndPrimitives2D (); void BeginModeling (); void EndModeling (); -private: - friend class G4OpenGLStoredViewer; - // ..allows access to P/TODLs. + void AddPrimitive (const G4Polyline&); + void AddPrimitive (const G4Circle&); + void AddPrimitive (const G4Square&); + void AddPrimitive (const G4Polymarker& polymarker); + // Explicitly invoke base class methods to avoid warnings about + // hiding of base class methods... + void AddPrimitive (const G4Text& text) { + G4OpenGLSceneHandler::AddPrimitive (text); + } + void AddPrimitive (const G4Polyhedron& polyhedron) { + G4OpenGLSceneHandler::AddPrimitive (polyhedron); + } + void AddPrimitive (const G4NURBS& nurbs) { + G4OpenGLSceneHandler::AddPrimitive (nurbs); + } + void AddPrimitive (const G4Scale& scale) { + G4OpenGLSceneHandler::AddPrimitive (scale); + } void ClearStore (); void ClearTransientStore (); + +protected: + void RequestPrimitives (const G4VSolid& solid); + void AddPrimitivePreamble(const G4Visible& visible); + void AddPrimitivePostamble(); + static G4int fSceneIdCount; // static counter for OpenGLStored scenes. G4int fDisplayListId; // Workspace. G4bool fMemoryForDisplayLists; // avoid memory overflow + G4int fAddPrimitivePreambleNestingDepth; // PODL = Persistent Object Display List. - GLint fTopPODL; // List which calls the other PODLs. - std::vector fPODLList; - std::vector fPODLTransformList; + GLint fTopPODL; // List which calls the other PODLs. + struct PO { + PO(G4int id, const G4Transform3D& tr = G4Transform3D()): + fDisplayListId(id), fTransform(tr) {} + G4int fDisplayListId; + G4Transform3D fTransform; + }; + std::vector fPOList; - // TODL = Transient Object Display List. - std::vector fTODLList; - std::vector fTODLTransformList; + // TO = Transparent Object. + struct TO { + TO(G4int id, const G4Transform3D& tr = G4Transform3D()): + fDisplayListId(id), fTransform(tr), + fStartTime(-DBL_MAX), fEndTime(DBL_MAX) {} + G4int fDisplayListId; + G4Transform3D fTransform; + G4double fStartTime, fEndTime; // Time range (e.g., for trajectory steps). + G4Colour fColour; + }; + std::vector fTOList; // Stop-gap solution of structure re-use. // A proper implementation would use geometry hierarchy. diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredViewer.hh b/source/visualization/OpenGL/include/G4OpenGLStoredViewer.hh index 12b14c6796..9c9ff82c7f 100644 --- a/source/visualization/OpenGL/include/G4OpenGLStoredViewer.hh +++ b/source/visualization/OpenGL/include/G4OpenGLStoredViewer.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLStoredViewer.hh,v 1.9 2006/06/29 21:18:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 7th February 1997 diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredWin32.hh b/source/visualization/OpenGL/include/G4OpenGLStoredWin32.hh index e7411af90a..0fcea3a527 100644 --- a/source/visualization/OpenGL/include/G4OpenGLStoredWin32.hh +++ b/source/visualization/OpenGL/include/G4OpenGLStoredWin32.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLStoredWin32.hh,v 1.7 2006/06/29 21:18:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // OpenGLStoredWin32 graphics system factory. diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredWin32Viewer.hh b/source/visualization/OpenGL/include/G4OpenGLStoredWin32Viewer.hh index e9083d4b64..f79d6f2f09 100644 --- a/source/visualization/OpenGL/include/G4OpenGLStoredWin32Viewer.hh +++ b/source/visualization/OpenGL/include/G4OpenGLStoredWin32Viewer.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLStoredWin32Viewer.hh,v 1.7 2006/06/29 21:18:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Class G4OpenGLStoredWin32Viewer : a class derived from diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredX.hh b/source/visualization/OpenGL/include/G4OpenGLStoredX.hh index edef0280c0..a73b4f1bfc 100644 --- a/source/visualization/OpenGL/include/G4OpenGLStoredX.hh +++ b/source/visualization/OpenGL/include/G4OpenGLStoredX.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLStoredX.hh,v 1.7 2006/06/29 21:18:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 10th February 1997 diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredXViewer.hh b/source/visualization/OpenGL/include/G4OpenGLStoredXViewer.hh index 6f59edc187..8cc054e260 100644 --- a/source/visualization/OpenGL/include/G4OpenGLStoredXViewer.hh +++ b/source/visualization/OpenGL/include/G4OpenGLStoredXViewer.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenGLStoredXViewer.hh,v 1.6 2006/06/29 21:18:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenGLStoredXViewer.hh,v 1.7 2006/07/03 16:38:13 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 7th February 1997 @@ -51,6 +51,7 @@ public: virtual ~G4OpenGLStoredXViewer (); void Initialise (); void DrawView (); + void FinishView (); }; #endif diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredXm.hh b/source/visualization/OpenGL/include/G4OpenGLStoredXm.hh index 51e36d3567..c2f3dd2178 100644 --- a/source/visualization/OpenGL/include/G4OpenGLStoredXm.hh +++ b/source/visualization/OpenGL/include/G4OpenGLStoredXm.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLStoredXm.hh,v 1.6 2006/06/29 21:18:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 10th February 1997 diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredXmViewer.hh b/source/visualization/OpenGL/include/G4OpenGLStoredXmViewer.hh index d75a9296e7..070bddf32b 100644 --- a/source/visualization/OpenGL/include/G4OpenGLStoredXmViewer.hh +++ b/source/visualization/OpenGL/include/G4OpenGLStoredXmViewer.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenGLStoredXmViewer.hh,v 1.6 2006/06/29 21:18:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenGLStoredXmViewer.hh,v 1.7 2006/07/03 16:38:13 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 10th February 1997 @@ -51,6 +51,7 @@ public: virtual ~G4OpenGLStoredXmViewer (); void Initialise (); void DrawView (); + void FinishView (); }; diff --git a/source/visualization/OpenGL/include/G4OpenGLTransform3D.hh b/source/visualization/OpenGL/include/G4OpenGLTransform3D.hh index dea4cb7327..c18c2876d1 100644 --- a/source/visualization/OpenGL/include/G4OpenGLTransform3D.hh +++ b/source/visualization/OpenGL/include/G4OpenGLTransform3D.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLTransform3D.hh,v 1.7 2006/06/29 21:18:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 24th October 1996 diff --git a/source/visualization/OpenGL/include/G4OpenGLViewer.hh b/source/visualization/OpenGL/include/G4OpenGLViewer.hh index bf7d7c18ac..b8ec473ce0 100644 --- a/source/visualization/OpenGL/include/G4OpenGLViewer.hh +++ b/source/visualization/OpenGL/include/G4OpenGLViewer.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenGLViewer.hh,v 1.13 2006/06/29 21:18:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenGLViewer.hh,v 1.18 2006/09/19 16:13:15 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 27th March 1996 @@ -46,6 +46,7 @@ class G4OpenGLViewer: virtual public G4VViewer { friend class G4OpenGLSceneHandler; friend class G4OpenGLImmediateSceneHandler; friend class G4OpenGLStoredSceneHandler; + friend class G4OpenGLViewerMessenger; public: void ClearView (); @@ -62,15 +63,22 @@ protected: void InitializeGLView (); virtual void CreateFontLists () {} G4Colour background; //the OpenGL clear colour - G4bool doublebuffer, //are we using a double buffered visual? + G4bool transparency_enabled, //is alpha blending enabled? antialiasing_enabled, //is antialiasing enabled? haloing_enabled; //is haloing enabled for wireframe? + G4double fStartTime, fEndTime; // Time range (e.g., for trajectory steps). + G4double fFadeFactor; // 0: no fade; 1: maximum fade with time within range. + G4bool fDisplayHeadTime; // Display head time (fEndTime) in 2D text. + G4double fDisplayHeadTimeX, fDisplayHeadTimeY; // 2D screen coords. + G4double fDisplayHeadTimeSize; // Screen size. + G4double fDisplayHeadTimeRed, fDisplayHeadTimeGreen, fDisplayHeadTimeBlue; + G4bool fDisplayLightFront;// Display light front at head time originating at + G4double fDisplayLightFrontX, fDisplayLightFrontY, fDisplayLightFrontZ, + fDisplayLightFrontT; + G4double fDisplayLightFrontRed, fDisplayLightFrontGreen, fDisplayLightFrontBlue; }; -class G4OpenGLImmediateSceneHandler; -class G4OpenGLStoredSceneHandler; - #endif #endif diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02PrimaryGeneratorMessenger.hh b/source/visualization/OpenGL/include/G4OpenGLViewerMessenger.hh similarity index 67% rename from examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02PrimaryGeneratorMessenger.hh rename to source/visualization/OpenGL/include/G4OpenGLViewerMessenger.hh index 719fe7aea3..c7e6657fcf 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02PrimaryGeneratorMessenger.hh +++ b/source/visualization/OpenGL/include/G4OpenGLViewerMessenger.hh @@ -23,40 +23,39 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// ==================================================================== // -// H02PrimaryGeneratorMessenger.hh -// $Id: H02PrimaryGeneratorMessenger.hh,v 1.3 2006/06/29 17:13:21 gunter Exp $ -// -// ==================================================================== -#ifndef H02_PRIMARY_GENERATOR_MESSENGER_H -#define H02_PRIMARY_GENERATOR_MESSENGER_H +// $Id: G4OpenGLViewerMessenger.hh,v 1.4 2006/09/19 16:14:21 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ + +#ifndef G4OPENGLVIEWERMESSENGER_HH +#define G4OPENGLVIEWERMESSENGER_HH -#include "globals.hh" #include "G4UImessenger.hh" -class H02PrimaryGeneratorAction; +#include "G4String.hh" + class G4UIdirectory; class G4UIcommand; -class G4UIcmdWithoutParameter; +class G4UIcmdWithADouble; class G4UIcmdWithABool; -class G4UIcmdWithAnInteger; -class G4UIcmdWithAString; - -class H02PrimaryGeneratorMessenger : public G4UImessenger { -private: - H02PrimaryGeneratorAction* primaryAction; - - G4UIdirectory* dir; - G4UIcmdWithAString* select; +class G4OpenGLViewerMessenger: public G4UImessenger { public: - H02PrimaryGeneratorMessenger(H02PrimaryGeneratorAction* genaction); - ~H02PrimaryGeneratorMessenger(); - - void SetNewValue(G4UIcommand* command, G4String newValues); - G4String GetCurrentValue(G4UIcommand* command); + static G4OpenGLViewerMessenger* GetInstance(); // Singleton constructor. + ~G4OpenGLViewerMessenger(); + void SetNewValue (G4UIcommand*, G4String); + +private: + G4OpenGLViewerMessenger(); // Private constructor. + static G4OpenGLViewerMessenger* fpInstance; + G4UIdirectory* fpDirectory; + G4UIdirectory* fpDirectorySet; + G4UIcommand* fpCommandDisplayHeadTime; + G4UIcommand* fpCommandDisplayLightFront; + G4UIcommand* fpCommandEndTime; + G4UIcmdWithADouble* fpCommandFade; + G4UIcommand* fpCommandStartTime; + G4UIcmdWithABool* fpCommandTransparency; }; - #endif diff --git a/source/visualization/OpenGL/include/G4OpenGLWin32Viewer.hh b/source/visualization/OpenGL/include/G4OpenGLWin32Viewer.hh index 2aa050b195..c336f6767c 100644 --- a/source/visualization/OpenGL/include/G4OpenGLWin32Viewer.hh +++ b/source/visualization/OpenGL/include/G4OpenGLWin32Viewer.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLWin32Viewer.hh,v 1.13 2006/06/29 21:18:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4OpenGLWin32Viewer : Class to provide WindowsNT specific diff --git a/source/visualization/OpenGL/include/G4OpenGLXViewer.hh b/source/visualization/OpenGL/include/G4OpenGLXViewer.hh index 1ae0debd26..9c6a05afe9 100644 --- a/source/visualization/OpenGL/include/G4OpenGLXViewer.hh +++ b/source/visualization/OpenGL/include/G4OpenGLXViewer.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenGLXViewer.hh,v 1.23 2006/06/29 21:18:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenGLXViewer.hh,v 1.26 2006/11/01 11:22:27 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 7th February 1997 @@ -51,12 +51,13 @@ class G4OpenGLSceneHandler; class G4OpenGLXViewer: virtual public G4OpenGLViewer { + friend class G4OpenGLXViewerMessenger; + public: G4OpenGLXViewer (G4OpenGLSceneHandler& scene); virtual ~G4OpenGLXViewer (); void SetView (); void ShowView (); - void FinishView (); void print(); protected: @@ -89,7 +90,7 @@ protected: int inColour, unsigned int width, unsigned int height); - GLXContext create_GL_print_context (XVisualInfo*& pvi, G4bool& db); + GLXContext create_GL_print_context (XVisualInfo*& pvi); XWindowAttributes xwa; Display *dpy; diff --git a/source/visualization/OpenGL/include/G4OpenGLXViewerMessenger.hh b/source/visualization/OpenGL/include/G4OpenGLXViewerMessenger.hh new file mode 100644 index 0000000000..dfb5271167 --- /dev/null +++ b/source/visualization/OpenGL/include/G4OpenGLXViewerMessenger.hh @@ -0,0 +1,58 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4OpenGLXViewerMessenger.hh,v 1.2 2006/11/01 11:22:26 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ + +#ifdef G4VIS_BUILD_OPENGLX_DRIVER + +#ifndef G4OPENGLXVIEWERMESSENGER_HH +#define G4OPENGLXVIEWERMESSENGER_HH + +#include "G4UImessenger.hh" + +#include "G4String.hh" + +class G4OpenGLXViewer; +class G4UIdirectory; +class G4UIcmdWithoutParameter; + +class G4OpenGLXViewerMessenger: public G4UImessenger { +public: + static G4OpenGLXViewerMessenger* GetInstance(); // Singleton constructor. + ~G4OpenGLXViewerMessenger(); + void SetNewValue (G4UIcommand*, G4String); + +private: + G4OpenGLXViewerMessenger(); // Private constructor. + static G4OpenGLXViewerMessenger* fpInstance; + G4UIdirectory* fpDirectory; + G4UIcmdWithoutParameter* fpCommandPrintEPS; +}; + +#endif + +#endif diff --git a/source/visualization/OpenGL/include/G4OpenGLXmBox.hh b/source/visualization/OpenGL/include/G4OpenGLXmBox.hh index f7393c34cf..f11b5f2243 100644 --- a/source/visualization/OpenGL/include/G4OpenGLXmBox.hh +++ b/source/visualization/OpenGL/include/G4OpenGLXmBox.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmBox.hh,v 1.7 2006/06/29 21:18:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //Box container class diff --git a/source/visualization/OpenGL/include/G4OpenGLXmFourArrowButtons.hh b/source/visualization/OpenGL/include/G4OpenGLXmFourArrowButtons.hh index a581123d69..8de7216c0e 100644 --- a/source/visualization/OpenGL/include/G4OpenGLXmFourArrowButtons.hh +++ b/source/visualization/OpenGL/include/G4OpenGLXmFourArrowButtons.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmFourArrowButtons.hh,v 1.6 2006/06/29 21:18:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //Four arrow buttons class. Inherits from G4OpenGLXmVWidgetComponent diff --git a/source/visualization/OpenGL/include/G4OpenGLXmFramedBox.hh b/source/visualization/OpenGL/include/G4OpenGLXmFramedBox.hh index 6895b43401..5a493ee3d8 100644 --- a/source/visualization/OpenGL/include/G4OpenGLXmFramedBox.hh +++ b/source/visualization/OpenGL/include/G4OpenGLXmFramedBox.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmFramedBox.hh,v 1.7 2006/06/29 21:18:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //Framed box container class diff --git a/source/visualization/OpenGL/include/G4OpenGLXmPushButton.hh b/source/visualization/OpenGL/include/G4OpenGLXmPushButton.hh index f232cb6a24..08fc4d55c8 100644 --- a/source/visualization/OpenGL/include/G4OpenGLXmPushButton.hh +++ b/source/visualization/OpenGL/include/G4OpenGLXmPushButton.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmPushButton.hh,v 1.7 2006/06/29 21:18:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //Push button class. Inherits from G4OpenGLXmVWidgetComponent diff --git a/source/visualization/OpenGL/include/G4OpenGLXmRadioButton.hh b/source/visualization/OpenGL/include/G4OpenGLXmRadioButton.hh index 6efba78ffa..04d5f1cab7 100644 --- a/source/visualization/OpenGL/include/G4OpenGLXmRadioButton.hh +++ b/source/visualization/OpenGL/include/G4OpenGLXmRadioButton.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmRadioButton.hh,v 1.7 2006/06/29 21:18:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //Radio button class. Inherits from G4OpenGLXmVWidgetComponent diff --git a/source/visualization/OpenGL/include/G4OpenGLXmResources.hh b/source/visualization/OpenGL/include/G4OpenGLXmResources.hh index 1c87a264c6..031feb9b19 100644 --- a/source/visualization/OpenGL/include/G4OpenGLXmResources.hh +++ b/source/visualization/OpenGL/include/G4OpenGLXmResources.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmResources.hh,v 1.5 2006/06/29 21:18:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Default resources file for GEANT4 OpenGL Motif windows. diff --git a/source/visualization/OpenGL/include/G4OpenGLXmSeparator.hh b/source/visualization/OpenGL/include/G4OpenGLXmSeparator.hh index 426ec3218d..ff26ac88c3 100644 --- a/source/visualization/OpenGL/include/G4OpenGLXmSeparator.hh +++ b/source/visualization/OpenGL/include/G4OpenGLXmSeparator.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmSeparator.hh,v 1.6 2006/06/29 21:18:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //Separator class. Inherits from G4OpenGLXmVWidgetComponent diff --git a/source/visualization/OpenGL/include/G4OpenGLXmSliderBar.hh b/source/visualization/OpenGL/include/G4OpenGLXmSliderBar.hh index 5bc6eb5985..c45a962d11 100644 --- a/source/visualization/OpenGL/include/G4OpenGLXmSliderBar.hh +++ b/source/visualization/OpenGL/include/G4OpenGLXmSliderBar.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmSliderBar.hh,v 1.7 2006/06/29 21:18:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //Slider bar class. Inherits from G4OpenGLXmVWidgetComponent diff --git a/source/visualization/OpenGL/include/G4OpenGLXmTextField.hh b/source/visualization/OpenGL/include/G4OpenGLXmTextField.hh index 8a2c7bf274..2117212e80 100644 --- a/source/visualization/OpenGL/include/G4OpenGLXmTextField.hh +++ b/source/visualization/OpenGL/include/G4OpenGLXmTextField.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmTextField.hh,v 1.7 2006/06/29 21:18:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //Text field class. Inherits from G4OpenGLXmVWidgetComponent diff --git a/source/visualization/OpenGL/include/G4OpenGLXmTopLevelShell.hh b/source/visualization/OpenGL/include/G4OpenGLXmTopLevelShell.hh index 1b3869cbd8..6a959d58fd 100644 --- a/source/visualization/OpenGL/include/G4OpenGLXmTopLevelShell.hh +++ b/source/visualization/OpenGL/include/G4OpenGLXmTopLevelShell.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmTopLevelShell.hh,v 1.6 2006/06/29 21:18:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //Top level shell class diff --git a/source/visualization/OpenGL/include/G4OpenGLXmVWidgetComponent.hh b/source/visualization/OpenGL/include/G4OpenGLXmVWidgetComponent.hh index 85643ea97a..6df4425847 100644 --- a/source/visualization/OpenGL/include/G4OpenGLXmVWidgetComponent.hh +++ b/source/visualization/OpenGL/include/G4OpenGLXmVWidgetComponent.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmVWidgetComponent.hh,v 1.6 2006/06/29 21:18:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //Base class for all Motif component widgets diff --git a/source/visualization/OpenGL/include/G4OpenGLXmVWidgetContainer.hh b/source/visualization/OpenGL/include/G4OpenGLXmVWidgetContainer.hh index 5d9a6286c6..ea6bacc786 100644 --- a/source/visualization/OpenGL/include/G4OpenGLXmVWidgetContainer.hh +++ b/source/visualization/OpenGL/include/G4OpenGLXmVWidgetContainer.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmVWidgetContainer.hh,v 1.6 2006/06/29 21:18:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //Base class for all Motif container widgets diff --git a/source/visualization/OpenGL/include/G4OpenGLXmVWidgetObject.hh b/source/visualization/OpenGL/include/G4OpenGLXmVWidgetObject.hh index 72490a6361..4708e7a5d9 100644 --- a/source/visualization/OpenGL/include/G4OpenGLXmVWidgetObject.hh +++ b/source/visualization/OpenGL/include/G4OpenGLXmVWidgetObject.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmVWidgetObject.hh,v 1.6 2006/06/29 21:18:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //Virtual base class for all Motif widgets. diff --git a/source/visualization/OpenGL/include/G4OpenGLXmVWidgetShell.hh b/source/visualization/OpenGL/include/G4OpenGLXmVWidgetShell.hh index 0ba92f237f..a18066968f 100644 --- a/source/visualization/OpenGL/include/G4OpenGLXmVWidgetShell.hh +++ b/source/visualization/OpenGL/include/G4OpenGLXmVWidgetShell.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmVWidgetShell.hh,v 1.6 2006/06/29 21:18:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // //Base class for all Motif window widgets (shells) diff --git a/source/visualization/OpenGL/include/G4OpenGLXmViewer.hh b/source/visualization/OpenGL/include/G4OpenGLXmViewer.hh index dc0e550279..f55957c114 100644 --- a/source/visualization/OpenGL/include/G4OpenGLXmViewer.hh +++ b/source/visualization/OpenGL/include/G4OpenGLXmViewer.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmViewer.hh,v 1.10 2006/06/29 21:18:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 10th February 1997 diff --git a/source/visualization/OpenGL/include/G4OpenGLXmViewerMessenger.hh b/source/visualization/OpenGL/include/G4OpenGLXmViewerMessenger.hh index 25e5f80ec7..efb09b701b 100644 --- a/source/visualization/OpenGL/include/G4OpenGLXmViewerMessenger.hh +++ b/source/visualization/OpenGL/include/G4OpenGLXmViewerMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmViewerMessenger.hh,v 1.4 2006/06/29 21:18:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifdef G4VIS_BUILD_OPENGLXM_DRIVER diff --git a/source/visualization/OpenGL/src/G4OpenGLFontBaseStore.cc b/source/visualization/OpenGL/src/G4OpenGLFontBaseStore.cc index 974b6a904d..c673f4fe9b 100644 --- a/source/visualization/OpenGL/src/G4OpenGLFontBaseStore.cc +++ b/source/visualization/OpenGL/src/G4OpenGLFontBaseStore.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLFontBaseStore.cc,v 1.3 2006/06/29 21:18:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4OpenGLFontBaseStore.hh" diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateSceneHandler.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateSceneHandler.cc index 1ce6733df5..32b782e068 100644 --- a/source/visualization/OpenGL/src/G4OpenGLImmediateSceneHandler.cc +++ b/source/visualization/OpenGL/src/G4OpenGLImmediateSceneHandler.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenGLImmediateSceneHandler.cc,v 1.22 2006/06/29 21:18:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenGLImmediateSceneHandler.cc,v 1.24 2006/09/04 12:03:25 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 10th February 1997 @@ -42,13 +42,12 @@ #define CENTERLINE_CLPP /* CenterLine C++ workaround: */ // Also seems to be required for HP's CC and AIX xlC, at least. -#include "G4OpenGLSceneHandler.hh" -#include "G4OpenGLViewer.hh" -#include "G4OpenGLTransform3D.hh" - #include "G4OpenGLImmediateSceneHandler.hh" -#include "G4LogicalVolume.hh" +#include "G4OpenGLTransform3D.hh" +#include "G4Polyline.hh" +#include "G4Circle.hh" +#include "G4Square.hh" G4OpenGLImmediateSceneHandler::G4OpenGLImmediateSceneHandler (G4VGraphicsSystem& system, const G4String& name): @@ -60,6 +59,30 @@ G4OpenGLImmediateSceneHandler::~G4OpenGLImmediateSceneHandler () #include +void G4OpenGLImmediateSceneHandler::AddPrimitivePreamble(const G4Visible& visible) +{ + const G4Colour& c = GetColour (visible); + glColor3d (c.GetRed (), c.GetGreen (), c.GetBlue ()); +} + +void G4OpenGLImmediateSceneHandler::AddPrimitive (const G4Polyline& polyline) +{ + AddPrimitivePreamble(polyline); + G4OpenGLSceneHandler::AddPrimitive(polyline); +} + +void G4OpenGLImmediateSceneHandler::AddPrimitive (const G4Circle& circle) +{ + AddPrimitivePreamble(circle); + G4OpenGLSceneHandler::AddPrimitive(circle); +} + +void G4OpenGLImmediateSceneHandler::AddPrimitive (const G4Square& square) +{ + AddPrimitivePreamble(square); + G4OpenGLSceneHandler::AddPrimitive(square); +} + void G4OpenGLImmediateSceneHandler::BeginPrimitives (const G4Transform3D& objectTransformation) { G4VSceneHandler::BeginPrimitives (objectTransformation); @@ -79,11 +102,13 @@ void G4OpenGLImmediateSceneHandler::BeginPrimitives glMultMatrixd (oglt.GetGLMatrix ()); } -void G4OpenGLImmediateSceneHandler::EndPrimitives () { +void G4OpenGLImmediateSceneHandler::EndPrimitives () +{ glPopMatrix(); - if (fReadyForTransients) { - glFlush (); - } + + // See all primitives immediately... + glFlush (); + G4VSceneHandler::EndPrimitives (); } @@ -110,9 +135,8 @@ void G4OpenGLImmediateSceneHandler::EndPrimitives2D() glMatrixMode (GL_MODELVIEW); glPopMatrix(); - if (fReadyForTransients) { - glFlush (); - } + // See all primitives immediately... + glFlush (); G4VSceneHandler::EndPrimitives2D (); } diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateViewer.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateViewer.cc index 13be3cf65e..651cfedc1a 100644 --- a/source/visualization/OpenGL/src/G4OpenGLImmediateViewer.cc +++ b/source/visualization/OpenGL/src/G4OpenGLImmediateViewer.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenGLImmediateViewer.cc,v 1.7 2006/06/29 21:19:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenGLImmediateViewer.cc,v 1.8 2006/09/04 12:07:59 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 7th February 1997 @@ -42,4 +42,29 @@ G4VViewer (scene, -1), G4OpenGLViewer (scene) {} +void G4OpenGLImmediateViewer::ProcessView () +{ + const G4Planes& cutaways = fVP.GetCutawayPlanes(); + G4bool cutawayUnion = fVP.IsCutaway() && + fVP.GetCutawayMode() == G4ViewParameters::cutawayUnion; + size_t nPasses = cutawayUnion? cutaways.size(): 1; + for (size_t i = 0; i < nPasses; ++i) { + + if (cutawayUnion) { + double a[4]; + a[0] = cutaways[i].a(); + a[1] = cutaways[i].b(); + a[2] = cutaways[i].c(); + a[3] = cutaways[i].d(); + glClipPlane (GL_CLIP_PLANE2, a); + glEnable (GL_CLIP_PLANE2); + } + + NeedKernelVisit (); // Always need to visit G4 kernel. + G4VViewer::ProcessView (); + + if (cutawayUnion) glDisable (GL_CLIP_PLANE2); + } +} + #endif diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateWin32.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateWin32.cc index 85b50876fc..8d60da1762 100644 --- a/source/visualization/OpenGL/src/G4OpenGLImmediateWin32.cc +++ b/source/visualization/OpenGL/src/G4OpenGLImmediateWin32.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenGLImmediateWin32.cc,v 1.10 2006/06/29 21:19:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenGLImmediateWin32.cc,v 1.11 2006/08/14 12:07:19 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // OpenGLImmediateWin32 graphics system factory. @@ -38,12 +38,16 @@ #include "G4OpenGLViewer.hh" #include "G4OpenGLImmediateWin32.hh" #include "G4OpenGLImmediateWin32Viewer.hh" +#include "G4OpenGLViewerMessenger.hh" G4OpenGLImmediateWin32::G4OpenGLImmediateWin32 (): G4VGraphicsSystem ("OpenGLImmediateWin32", "OGLIWin32", G4VisFeaturesOfOpenGLIWin32 (), - G4VGraphicsSystem::threeD) {} + G4VGraphicsSystem::threeD) +{ + G4OpenGLViewerMessenger::GetInstance(); +} G4VSceneHandler* G4OpenGLImmediateWin32::CreateSceneHandler (const G4String& name) { diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateWin32Viewer.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateWin32Viewer.cc index ab4f7bf45b..b7c1ef9564 100644 --- a/source/visualization/OpenGL/src/G4OpenGLImmediateWin32Viewer.cc +++ b/source/visualization/OpenGL/src/G4OpenGLImmediateWin32Viewer.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenGLImmediateWin32Viewer.cc,v 1.15 2006/06/29 21:19:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenGLImmediateWin32Viewer.cc,v 1.16 2006/07/03 16:38:13 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Class G4OpenGLImmediateWin32Viewer : a class derived from G4OpenGLWin32Viewer and @@ -58,7 +58,6 @@ void G4OpenGLImmediateWin32Viewer::Initialise () { // If a double buffer context has been forced upon us, ignore the // back buffer for this OpenGLImmediate view. - doublebuffer = false; glDrawBuffer (GL_FRONT); // clear the buffers and window. @@ -73,7 +72,6 @@ void G4OpenGLImmediateWin32Viewer::DrawView () { // If a double buffer context has been forced upon us, ignore the // back buffer for this OpenGLImmediate view. - doublebuffer = false; glDrawBuffer (GL_FRONT); G4ViewParameters::DrawingStyle style = GetViewParameters().GetDrawingStyle(); diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateX.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateX.cc index 19cfefafa9..83b96d7a5e 100644 --- a/source/visualization/OpenGL/src/G4OpenGLImmediateX.cc +++ b/source/visualization/OpenGL/src/G4OpenGLImmediateX.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenGLImmediateX.cc,v 1.10 2006/06/29 21:19:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenGLImmediateX.cc,v 1.12 2006/08/14 12:07:19 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 27th March 1996 @@ -39,12 +39,18 @@ #include "G4OpenGLViewer.hh" #include "G4OpenGLImmediateX.hh" #include "G4OpenGLImmediateXViewer.hh" +#include "G4OpenGLViewerMessenger.hh" +#include "G4OpenGLXViewerMessenger.hh" G4OpenGLImmediateX::G4OpenGLImmediateX (): G4VGraphicsSystem ("OpenGLImmediateX", "OGLIX", G4VisFeaturesOfOpenGLIX (), - G4VGraphicsSystem::threeD) {} + G4VGraphicsSystem::threeD) +{ + G4OpenGLViewerMessenger::GetInstance(); + G4OpenGLXViewerMessenger::GetInstance(); +} G4OpenGLImmediateX::~G4OpenGLImmediateX () {} diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateXViewer.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateXViewer.cc index ba9bb70dd1..fb22eab7d4 100644 --- a/source/visualization/OpenGL/src/G4OpenGLImmediateXViewer.cc +++ b/source/visualization/OpenGL/src/G4OpenGLImmediateXViewer.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenGLImmediateXViewer.cc,v 1.15 2006/06/29 21:19:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenGLImmediateXViewer.cc,v 1.16 2006/07/03 16:38:13 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 7th February 1997 @@ -71,23 +71,9 @@ void G4OpenGLImmediateXViewer::Initialise () { ClearView (); FinishView (); - //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - //The following code was in the constructor and found not to work for - //the reasons below. It was moved to DrawView(), but has now been moved - //to Initialise(). - //The following code is useless in its current position, as the - //G4OpenGLXmViewer constructor gets called *after* it, and hence sets - //doublebuffer to true or false there, after our little test to correct - //it in the case of a double buffer being got for an immediate view. - //Hence, code moved to DrawView. - //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - // If a double buffer context has been forced upon us, ignore the // back buffer for this OpenGLImmediate view. - if (doublebuffer) { - doublebuffer = false; - glDrawBuffer (GL_FRONT); - } + glDrawBuffer (GL_FRONT); glDepthFunc (GL_LEQUAL); glDepthMask (GL_TRUE); @@ -119,4 +105,10 @@ void G4OpenGLImmediateXViewer::DrawView () { } +void G4OpenGLImmediateXViewer::FinishView () { + glXWaitGL (); //Wait for effects of all previous OpenGL commands to + //be propogated before progressing. + glFlush (); +} + #endif diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateXm.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateXm.cc index 0036b05f4a..d6e65edd41 100644 --- a/source/visualization/OpenGL/src/G4OpenGLImmediateXm.cc +++ b/source/visualization/OpenGL/src/G4OpenGLImmediateXm.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenGLImmediateXm.cc,v 1.12 2006/06/29 21:19:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenGLImmediateXm.cc,v 1.13 2006/08/14 12:07:19 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 10th February 1997 @@ -39,6 +39,7 @@ #include "G4OpenGLViewer.hh" #include "G4OpenGLImmediateXm.hh" #include "G4OpenGLImmediateXmViewer.hh" +#include "G4OpenGLViewerMessenger.hh" #include "G4OpenGLXmViewerMessenger.hh" G4OpenGLImmediateXm::G4OpenGLImmediateXm (): @@ -47,6 +48,7 @@ G4OpenGLImmediateXm::G4OpenGLImmediateXm (): G4VisFeaturesOfOpenGLIXm (), G4VGraphicsSystem::threeD) { + G4OpenGLViewerMessenger::GetInstance(); G4OpenGLXmViewerMessenger::GetInstance(); } diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateXmViewer.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateXmViewer.cc index 864ffd30cc..c5f1f2e937 100644 --- a/source/visualization/OpenGL/src/G4OpenGLImmediateXmViewer.cc +++ b/source/visualization/OpenGL/src/G4OpenGLImmediateXmViewer.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenGLImmediateXmViewer.cc,v 1.16 2006/06/29 21:19:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenGLImmediateXmViewer.cc,v 1.17 2006/07/03 16:38:13 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 10th February 1997 @@ -80,23 +80,9 @@ void G4OpenGLImmediateXmViewer::Initialise () { glEnable (GL_BLEND); glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - //The following code was in the constructor and found not to work for - //the reasons below. It was moved to DrawView(), but has now been moved - //to Initialise(). - //The following code is useless in its current position, as the - //G4OpenGLXmViewer constructor gets called *after* it, and hence sets - //doublebuffer to true or false there, after our little test to correct - //it in the case of a double buffer being got for an immediate view. - //Hence, code moved to DrawView. - //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - // If a double buffer context has been forced upon us, ignore the // back buffer for this OpenGLImmediate view. - if (doublebuffer) { - doublebuffer = false; - glDrawBuffer (GL_FRONT); - } + glDrawBuffer (GL_FRONT); } void G4OpenGLImmediateXmViewer::DrawView () { @@ -125,4 +111,10 @@ void G4OpenGLImmediateXmViewer::DrawView () { } +void G4OpenGLImmediateXmViewer::FinishView () { + glXWaitGL (); //Wait for effects of all previous OpenGL commands to + //be propogated before progressing. + glFlush (); +} + #endif diff --git a/source/visualization/OpenGL/src/G4OpenGLSceneHandler.cc b/source/visualization/OpenGL/src/G4OpenGLSceneHandler.cc index af6a583887..d639a2e0aa 100644 --- a/source/visualization/OpenGL/src/G4OpenGLSceneHandler.cc +++ b/source/visualization/OpenGL/src/G4OpenGLSceneHandler.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenGLSceneHandler.cc,v 1.43 2006/06/29 21:19:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenGLSceneHandler.cc,v 1.45 2006/08/30 11:37:34 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 27th March 1996 @@ -61,6 +61,8 @@ #include "G4VPhysicalVolume.hh" #include "G4LogicalVolume.hh" #include "G4VSolid.hh" +#include "G4Scene.hh" +#include "G4VisExtent.hh" G4OpenGLSceneHandler::G4OpenGLSceneHandler (G4VGraphicsSystem& system, G4int id, @@ -92,13 +94,32 @@ const GLubyte G4OpenGLSceneHandler::fStippleMaskHashed [128] = { 0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55 }; +const G4Polyhedron* G4OpenGLSceneHandler::CreateSectionPolyhedron () +{ + // Clipping done in G4OpenGLViewer::SetView. + return 0; + + // But...OpenGL no longer seems to reconstruct clipped edges, so, + // when the BooleanProcessor is up to it, abandon this and use + // generic clipping in G4VSceneHandler::CreateSectionPolyhedron... + // return G4VSceneHandler::CreateSectionPolyhedron(); +} + +const G4Polyhedron* G4OpenGLSceneHandler::CreateCutawayPolyhedron () +{ + // Cutaway done in G4OpenGLViewer::SetView. + return 0; + + // But...if not, when the BooleanProcessor is up to it... + // return G4VSceneHandler::CreateCutawayPolyhedron(); +} + void G4OpenGLSceneHandler::AddPrimitive (const G4Polyline& line) { G4int nPoints = line.size (); if (nPoints <= 0) return; - const G4Colour& c = GetColour (line); - glColor3d (c.GetRed (), c.GetGreen (), c.GetBlue ()); + // Note: colour treated in sub-class. if (fpViewer -> GetViewParameters ().IsMarkerNotHidden ()) glDisable (GL_DEPTH_TEST); @@ -106,6 +127,9 @@ void G4OpenGLSceneHandler::AddPrimitive (const G4Polyline& line) glDisable (GL_LIGHTING); + G4double lineWidth = GetLineWidth(line); + glLineWidth(lineWidth); + glBegin (GL_LINE_STRIP); for (G4int iPoint = 0; iPoint < nPoints; iPoint++) { G4double x, y, z; @@ -172,15 +196,17 @@ void G4OpenGLSceneHandler::AddCircleSquare (const G4VMarker& marker, G4int nSides) { - const G4Colour& c = GetColour (marker); - glColor3d (c.GetRed (), c.GetGreen (), c.GetBlue ()); - + // Note: colour treated in sub-class. + if (fpViewer -> GetViewParameters ().IsMarkerNotHidden ()) glDisable (GL_DEPTH_TEST); else {glEnable (GL_DEPTH_TEST); glDepthFunc (GL_LESS);} glDisable (GL_LIGHTING); + G4double lineWidth = GetLineWidth(marker); + glLineWidth(lineWidth); + G4VMarker::FillStyle style = marker.GetFillStyle(); switch (style) { @@ -216,18 +242,15 @@ void G4OpenGLSceneHandler::AddCircleSquare // A few useful quantities... G4Point3D centre = marker.GetPosition(); - G4bool userSpecified = (marker.GetWorldSize() || marker.GetScreenSize()); - const G4VMarker& def = fpViewer -> GetViewParameters().GetDefaultMarker(); const G4Vector3D& viewpointDirection = fpViewer -> GetViewParameters().GetViewpointDirection(); const G4Vector3D& up = fpViewer->GetViewParameters().GetUpVector(); - G4double scale = fpViewer -> GetViewParameters().GetGlobalMarkerScale(); - G4double size = scale * - userSpecified ? marker.GetWorldSize() : def.GetWorldSize(); + MarkerSizeType sizeType; + G4double size = GetMarkerSize(marker, sizeType); // Find "size" of marker in world space (but see note below)... G4double worldSize; - if (size) { // Size specified in world coordinates. + if (sizeType == world) { // Size specified in world coordinates. worldSize = size; } else { // Size specified in screen (window) coordinates. @@ -253,9 +276,7 @@ void G4OpenGLSceneHandler::AddCircleSquare &winDx, &winDy, &winDz); G4double winWorldRatio = std::sqrt(std::pow(winx - winDx, 2) + std::pow(winy - winDy, 2)); - G4double winSize = scale * - userSpecified ? marker.GetScreenSize() : def.GetScreenSize(); - worldSize = winSize / winWorldRatio; + worldSize = size / winWorldRatio; } // Draw... @@ -360,7 +381,7 @@ void G4OpenGLSceneHandler::DrawXYPolygon G4double phi; G4int i; glBegin (GL_POLYGON); - for (i = 0, phi = -dPhi / 2.; i < nSides; i++, phi += dPhi) { + for (i = 0, phi = 0.; i < nSides; i++, phi += dPhi) { G4Vector3D r = start; r.rotate(phi, viewpointDirection); G4Vector3D p = centre + r; glVertex3d (p.x(), p.y(), p.z()); @@ -399,11 +420,16 @@ void G4OpenGLSceneHandler::AddPrimitive (const G4Polyhedron& polyhedron) { materialColour [3] = 1.; } + G4double lineWidth = GetLineWidth(polyhedron); + glLineWidth(lineWidth); + GLfloat clear_colour[4]; glGetFloatv (GL_COLOR_CLEAR_VALUE, clear_colour); G4bool isAuxEdgeVisible = GetAuxEdgeVisible (pVA); + G4bool clipping = pViewer->fVP.IsSection() || pViewer->fVP.IsCutaway(); + switch (drawing_style) { case (G4ViewParameters::hlhsr): // Set up as for hidden line removal but paint polygon faces later... @@ -421,9 +447,14 @@ void G4OpenGLSceneHandler::AddPrimitive (const G4Polyhedron& polyhedron) { glPolygonMode (GL_FRONT_AND_BACK, GL_LINE); } else { // Opaque... - glEnable (GL_CULL_FACE); - glCullFace (GL_BACK); - glPolygonMode (GL_FRONT, GL_LINE); + if (clipping) { + glDisable (GL_CULL_FACE); + glPolygonMode (GL_FRONT_AND_BACK, GL_LINE); + } else { + glEnable (GL_CULL_FACE); + glCullFace (GL_BACK); + glPolygonMode (GL_FRONT, GL_LINE); + } } glDisable (GL_LIGHTING); glColor3d (c.GetRed (), c.GetGreen (), c.GetBlue ()); @@ -440,9 +471,14 @@ void G4OpenGLSceneHandler::AddPrimitive (const G4Polyhedron& polyhedron) { } else { // Opaque... glDepthMask (1); // Make depth buffer writable (default). - glEnable (GL_CULL_FACE); - glCullFace (GL_BACK); - glPolygonMode (GL_FRONT, GL_FILL); + if (clipping) { + glDisable (GL_CULL_FACE); + glPolygonMode (GL_FRONT_AND_BACK, GL_FILL); + } else { + glEnable (GL_CULL_FACE); + glCullFace (GL_BACK); + glPolygonMode (GL_FRONT, GL_FILL); + } glMaterialfv (GL_FRONT, GL_AMBIENT_AND_DIFFUSE, materialColour); } glEnable (GL_LIGHTING); @@ -547,9 +583,14 @@ void G4OpenGLSceneHandler::AddPrimitive (const G4Polyhedron& polyhedron) { } else { // Opaque... glDepthMask (1); // Make depth buffer writable (default). - glEnable (GL_CULL_FACE); - glCullFace (GL_BACK); - glPolygonMode (GL_FRONT, GL_FILL); + if (clipping) { + glDisable (GL_CULL_FACE); + glPolygonMode (GL_FRONT_AND_BACK, GL_FILL); + } else { + glEnable (GL_CULL_FACE); + glCullFace (GL_BACK); + glPolygonMode (GL_FRONT, GL_FILL); + } } GLfloat* painting_colour; if (drawing_style == G4ViewParameters::hlr) { @@ -596,9 +637,14 @@ void G4OpenGLSceneHandler::AddPrimitive (const G4Polyhedron& polyhedron) { glPolygonMode (GL_FRONT_AND_BACK, GL_LINE); } else { // Opaque... - glEnable (GL_CULL_FACE); - glCullFace (GL_BACK); - glPolygonMode (GL_FRONT, GL_LINE); + if (clipping) { + glDisable (GL_CULL_FACE); + glPolygonMode (GL_FRONT_AND_BACK, GL_LINE); + } else { + glEnable (GL_CULL_FACE); + glCullFace (GL_BACK); + glPolygonMode (GL_FRONT, GL_LINE); + } } glDisable (GL_LIGHTING); glColor3d (c.GetRed (), c.GetGreen (), c.GetBlue ()); diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc b/source/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc index 837d4e7aac..42b8b44753 100644 --- a/source/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc +++ b/source/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenGLStoredSceneHandler.cc,v 1.28 2006/06/29 21:19:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenGLStoredSceneHandler.cc,v 1.31 2006/08/30 11:43:57 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 10th February 1997 @@ -45,18 +45,91 @@ #include "G4PhysicalVolumeModel.hh" #include "G4VPhysicalVolume.hh" -#include "G4LogicalVolume.hh" +#include "G4Polyline.hh" +#include "G4Polymarker.hh" +#include "G4Circle.hh" +#include "G4Square.hh" G4OpenGLStoredSceneHandler::G4OpenGLStoredSceneHandler (G4VGraphicsSystem& system, const G4String& name): G4OpenGLSceneHandler (system, fSceneIdCount++, name), fMemoryForDisplayLists (true), +fAddPrimitivePreambleNestingDepth (0), fTopPODL (0) {} G4OpenGLStoredSceneHandler::~G4OpenGLStoredSceneHandler () {} +void G4OpenGLStoredSceneHandler::AddPrimitivePreamble(const G4Visible& visible) +{ + // Track nesting depth to avoid recursive calls, for example, from a + // G4Polymarker that invokes a G4Circle... + fAddPrimitivePreambleNestingDepth++; + if (fAddPrimitivePreambleNestingDepth > 1) return; + + const G4Colour& c = GetColour (visible); + + if (fMemoryForDisplayLists && fReadyForTransients) { + + TO& to = fTOList.back(); // Transient object information. + + // Get vis attributes - pick up defaults if none. + const G4VisAttributes* pVA = + fpViewer->GetApplicableVisAttributes(visible.GetVisAttributes()); + + // Get time information from vis attributes. + to.fStartTime = pVA->GetStartTime(); + to.fEndTime = pVA->GetEndTime(); + + // Keep colour out of (already started) display list so that it + // can be applied independently. + glEndList(); + glDeleteLists(fDisplayListId, 1); + to.fColour = c; + glColor3d (c.GetRed (), c.GetGreen (), c.GetBlue ()); + glNewList (fDisplayListId, GL_COMPILE_AND_EXECUTE); + + } else { + + // Make sure colour is set in other cases. + glColor3d (c.GetRed (), c.GetGreen (), c.GetBlue ()); + } +} + +void G4OpenGLStoredSceneHandler::AddPrimitivePostamble() +{ + fAddPrimitivePreambleNestingDepth--; +} + +void G4OpenGLStoredSceneHandler::AddPrimitive (const G4Polyline& polyline) +{ + AddPrimitivePreamble(polyline); + G4OpenGLSceneHandler::AddPrimitive(polyline); + AddPrimitivePostamble(); +} + +void G4OpenGLStoredSceneHandler::AddPrimitive (const G4Circle& circle) +{ + AddPrimitivePreamble(circle); + G4OpenGLSceneHandler::AddPrimitive(circle); + AddPrimitivePostamble(); +} + +void G4OpenGLStoredSceneHandler::AddPrimitive (const G4Square& square) +{ + AddPrimitivePreamble(square); + G4OpenGLSceneHandler::AddPrimitive(square); + AddPrimitivePostamble(); +} + +void G4OpenGLStoredSceneHandler::AddPrimitive (const G4Polymarker& polymarker) +{ + AddPrimitivePreamble(polymarker); + G4OpenGLSceneHandler::AddPrimitive(polymarker); + AddPrimitivePostamble(); +} + void G4OpenGLStoredSceneHandler::BeginPrimitives (const G4Transform3D& objectTransformation) { @@ -74,8 +147,8 @@ void G4OpenGLStoredSceneHandler::BeginPrimitives } if (fMemoryForDisplayLists) { if (fReadyForTransients) { - fTODLList.push_back (fDisplayListId); - fTODLTransformList.push_back (objectTransformation); + TO to(fDisplayListId, objectTransformation); + fTOList.push_back(to); glDrawBuffer (GL_FRONT); glPushMatrix(); G4OpenGLTransform3D oglt (objectTransformation); @@ -83,8 +156,7 @@ void G4OpenGLStoredSceneHandler::BeginPrimitives glNewList (fDisplayListId, GL_COMPILE_AND_EXECUTE); } else { - fPODLList.push_back (fDisplayListId); - fPODLTransformList.push_back (objectTransformation); + fPOList.push_back(PO(fDisplayListId, objectTransformation)); glNewList (fDisplayListId, GL_COMPILE); } } else { @@ -123,14 +195,12 @@ void G4OpenGLStoredSceneHandler::BeginPrimitives2D() } if (fMemoryForDisplayLists) { if (fReadyForTransients) { - fTODLList.push_back (fDisplayListId); - fTODLTransformList.push_back (G4Transform3D()); // Identity (ignored). + fTOList.push_back(TO(fDisplayListId)); glDrawBuffer (GL_FRONT); glNewList (fDisplayListId, GL_COMPILE_AND_EXECUTE); } else { - fPODLList.push_back (fDisplayListId); - fPODLTransformList.push_back (G4Transform3D()); // Identity (ignored). + fPOList.push_back(PO(fDisplayListId)); glNewList (fDisplayListId, GL_COMPILE); } } else { @@ -185,11 +255,11 @@ void G4OpenGLStoredSceneHandler::EndModeling () { } else { glNewList (fTopPODL, GL_COMPILE_AND_EXECUTE); { - for (size_t i = 0; i < fPODLList.size (); i++) { + for (size_t i = 0; i < fPOList.size (); i++) { glPushMatrix(); - G4OpenGLTransform3D oglt (fPODLTransformList [i]); + G4OpenGLTransform3D oglt (fPOList[i].fTransform); glMultMatrixd (oglt.GetGLMatrix ()); - glCallList (fPODLList[i]); + glCallList (fPOList[i].fDisplayListId); glPopMatrix(); } } @@ -208,55 +278,30 @@ void G4OpenGLStoredSceneHandler::ClearStore () { G4VSceneHandler::ClearStore (); // Sets need kernel visit, etc. - size_t i; - // Delete OpenGL permanent display lists. - for (i = 0; i < fPODLList.size (); i++) { - if (fPODLList [i]) { - glDeleteLists (fPODLList [i], 1); - } else { - G4cerr << "Warning : NULL display List in fPODLList." << G4endl; - } - } - + for (size_t i = 0; i < fPOList.size (); i++) + glDeleteLists (fPOList[i].fDisplayListId, 1); if (fTopPODL) glDeleteLists (fTopPODL, 1); fTopPODL = 0; // Clear other lists, dictionary, etc. - fPODLList.clear (); - fPODLTransformList.clear (); + fPOList.clear (); fSolidMap.clear (); // ...and clear transient store... - for (i = 0; i < fTODLList.size (); i++) { - if (fTODLList [i]) { - glDeleteLists (fTODLList [i], 1); - } else { - G4cerr << "Warning : NULL display List in fTODLList." << G4endl; - } - } - fTODLList.clear (); - fTODLTransformList.clear (); + for (size_t i = 0; i < fTOList.size (); i++) + glDeleteLists(fTOList[i].fDisplayListId, 1); + fTOList.clear (); } void G4OpenGLStoredSceneHandler::ClearTransientStore () { G4VSceneHandler::ClearTransientStore (); - size_t i; - - // Delete OpenGL transient display lists. - for (i = 0; i < fTODLList.size (); i++) { - if (fTODLList [i]) { - glDeleteLists (fTODLList [i], 1); - } else { - G4cerr << "Warning : NULL display List in fTODLList." << G4endl; - } - } - - // Clear other lists, dictionary, etc. - fTODLList.clear (); - fTODLTransformList.clear (); + // Delete OpenGL transient display lists and Transient Objects themselves. + for (size_t i = 0; i < fTOList.size (); i++) + glDeleteLists(fTOList[i].fDisplayListId, 1); + fTOList.clear (); // Make sure screen corresponds to graphical database... if (fpViewer) { @@ -329,8 +374,7 @@ void G4OpenGLStoredSceneHandler::RequestPrimitives (const G4VSolid& solid) // ...and if the solid has already been rendered... (fSolidMap.find (pSolid) != fSolidMap.end ())) { fDisplayListId = fSolidMap [pSolid]; - fPODLList.push_back (fDisplayListId); - fPODLTransformList.push_back (*fpObjectTransformation); + fPOList.push_back(PO(fDisplayListId,*fpObjectTransformation)); } else { G4VSceneHandler::RequestPrimitives (solid); diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredViewer.cc b/source/visualization/OpenGL/src/G4OpenGLStoredViewer.cc index 4791d7595d..d9141b0351 100644 --- a/source/visualization/OpenGL/src/G4OpenGLStoredViewer.cc +++ b/source/visualization/OpenGL/src/G4OpenGLStoredViewer.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenGLStoredViewer.cc,v 1.14 2006/06/29 21:19:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenGLStoredViewer.cc,v 1.20 2006/10/24 06:23:18 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 7th February 1997 @@ -37,9 +37,11 @@ #include "G4OpenGLStoredViewer.hh" -#include "G4ios.hh" - #include "G4OpenGLStoredSceneHandler.hh" +#include "G4Text.hh" +#include "G4Circle.hh" +#include "G4UnitsTable.hh" +#include "G4Scene.hh" G4OpenGLStoredViewer::G4OpenGLStoredViewer (G4OpenGLStoredSceneHandler& sceneHandler): @@ -69,19 +71,22 @@ G4bool G4OpenGLStoredViewer::CompareForKernelVisit(G4ViewParameters& lastVP) { if ( (lastVP.GetDrawingStyle () != fVP.GetDrawingStyle ()) || + (lastVP.IsAuxEdgeVisible () != fVP.IsAuxEdgeVisible ()) || (lastVP.GetRepStyle () != fVP.GetRepStyle ()) || (lastVP.IsCulling () != fVP.IsCulling ()) || (lastVP.IsCullingInvisible () != fVP.IsCullingInvisible ()) || (lastVP.IsDensityCulling () != fVP.IsDensityCulling ()) || (lastVP.IsCullingCovered () != fVP.IsCullingCovered ()) || (lastVP.IsSection () != fVP.IsSection ()) || - // No need to visit kernel if section plane changes. + // Section (DCUT) implemented locally. But still need to visit + // kernel if status changes so that back plane culling can be + // switched. (lastVP.IsCutaway () != fVP.IsCutaway ()) || - (lastVP.GetCutawayPlanes ().size () != - fVP.GetCutawayPlanes ().size ()) || - // No need to visit kernel if cutaway planes change. + // Cutaways implemented locally. But still need to visit kernel + // if status changes so that back plane culling can be switched. (lastVP.IsExplode () != fVP.IsExplode ()) || (lastVP.GetNoOfSides () != fVP.GetNoOfSides ()) || + (lastVP.IsMarkerNotHidden () != fVP.IsMarkerNotHidden ()) || (lastVP.GetBackgroundColour ()!= fVP.GetBackgroundColour ()) ) { return true; @@ -91,6 +96,26 @@ G4bool G4OpenGLStoredViewer::CompareForKernelVisit(G4ViewParameters& lastVP) { (lastVP.GetVisibleDensity () != fVP.GetVisibleDensity ())) return true; + /************************************************************** + Section (DCUT) implemented locally. No need to visit kernel if + section plane itself changes. + if (lastVP.IsSection () && + (lastVP.GetSectionPlane () != fVP.GetSectionPlane ())) + return true; + ***************************************************************/ + + /************************************************************** + Cutaways implemented locally. No need to visit kernel if cutaway + planes themselves change. + if (lastVP.IsCutaway ()) { + if (lastVP.GetCutawayPlanes ().size () != + fVP.GetCutawayPlanes ().size ()) return true; + for (size_t i = 0; i < lastVP.GetCutawayPlanes().size(); ++i) + if (lastVP.GetCutawayPlanes()[i] != fVP.GetCutawayPlanes()[i]) + return true; + } + ***************************************************************/ + if (lastVP.IsExplode () && (lastVP.GetExplodeFactor () != fVP.GetExplodeFactor ())) return true; @@ -99,18 +124,121 @@ G4bool G4OpenGLStoredViewer::CompareForKernelVisit(G4ViewParameters& lastVP) { } void G4OpenGLStoredViewer::DrawDisplayLists () { - - if (fG4OpenGLStoredSceneHandler.fTopPODL) - glCallList (fG4OpenGLStoredSceneHandler.fTopPODL); - - G4int nTODLs = fG4OpenGLStoredSceneHandler.fTODLList.size (); - for (int i = 0; i < nTODLs; i++) { + + const G4Planes& cutaways = fVP.GetCutawayPlanes(); + G4bool cutawayUnion = fVP.IsCutaway() && + fVP.GetCutawayMode() == G4ViewParameters::cutawayUnion; + size_t nPasses = cutawayUnion? cutaways.size(): 1; + for (size_t i = 0; i < nPasses; ++i) { + + if (cutawayUnion) { + double a[4]; + a[0] = cutaways[i].a(); + a[1] = cutaways[i].b(); + a[2] = cutaways[i].c(); + a[3] = cutaways[i].d(); + glClipPlane (GL_CLIP_PLANE2, a); + glEnable (GL_CLIP_PLANE2); + } + + if (fG4OpenGLStoredSceneHandler.fTopPODL) + glCallList (fG4OpenGLStoredSceneHandler.fTopPODL); + + for (size_t i = 0; i < fG4OpenGLStoredSceneHandler.fTOList.size(); ++i) { + G4OpenGLStoredSceneHandler::TO& to = + fG4OpenGLStoredSceneHandler.fTOList[i]; + if (to.fEndTime >= fStartTime && to.fStartTime <= fEndTime) { + glPushMatrix(); + G4OpenGLTransform3D oglt (to.fTransform); + glMultMatrixd (oglt.GetGLMatrix ()); + G4Colour& c = to.fColour; + G4double bsf = 1.; // Brightness scaling factor. + if (fFadeFactor > 0. && to.fEndTime < fEndTime) + bsf = 1. - fFadeFactor * + ((fEndTime - to.fEndTime) / (fEndTime - fStartTime)); + glColor3d(bsf * c.GetRed (), bsf * c.GetGreen (), bsf * c.GetBlue ()); + glCallList (to.fDisplayListId); + glPopMatrix(); + } + } + + if (cutawayUnion) glDisable (GL_CLIP_PLANE2); + } + + // Display time at "head" of time range, which is fEndTime... + if (fDisplayHeadTime && fEndTime < DBL_MAX) { + glMatrixMode (GL_PROJECTION); glPushMatrix(); - G4OpenGLTransform3D oglt - (fG4OpenGLStoredSceneHandler.fTODLTransformList [i]); - glMultMatrixd (oglt.GetGLMatrix ()); - glCallList (fG4OpenGLStoredSceneHandler.fTODLList[i]); + glLoadIdentity(); + glOrtho (-1., 1., -1., 1., -DBL_MAX, DBL_MAX); + glMatrixMode (GL_MODELVIEW); + glPushMatrix(); + glLoadIdentity(); + G4Text headTimeText(G4BestUnit(fEndTime,"Time"), + G4Point3D(fDisplayHeadTimeX, fDisplayHeadTimeY, 0.)); + headTimeText.SetScreenSize(fDisplayHeadTimeSize); + G4VisAttributes visAtts (G4Colour + (fDisplayHeadTimeRed, + fDisplayHeadTimeGreen, + fDisplayHeadTimeBlue)); + headTimeText.SetVisAttributes(&visAtts); + fG4OpenGLStoredSceneHandler.AddPrimitive(headTimeText); + glMatrixMode (GL_PROJECTION); glPopMatrix(); + glMatrixMode (GL_MODELVIEW); + glPopMatrix(); + } + + // Display light front... + if (fDisplayLightFront && fEndTime < DBL_MAX) { + G4double lightFrontRadius = (fEndTime - fDisplayLightFrontT) * c_light; + if (lightFrontRadius > 0.) { + G4Point3D lightFrontCentre(fDisplayLightFrontX, fDisplayLightFrontY, fDisplayLightFrontZ); + G4Point3D circleCentre = lightFrontCentre; + G4double circleRadius = lightFrontRadius; + if (fVP.GetFieldHalfAngle() > 0.) { + // Perspective view. Find horizon centre and radius... + G4Point3D targetPoint = fSceneHandler.GetScene()->GetStandardTargetPoint() + + fVP.GetCurrentTargetPoint(); + G4double sceneRadius = fSceneHandler.GetScene()->GetExtent().GetExtentRadius(); + if(sceneRadius <= 0.) sceneRadius = 1.; + G4double cameraDistance = fVP.GetCameraDistance(sceneRadius); + G4Point3D cameraPosition = targetPoint + cameraDistance * fVP.GetViewpointDirection().unit(); + G4Vector3D lightFrontToCameraDirection = cameraPosition - lightFrontCentre; + G4double lightFrontCentreDistance = lightFrontToCameraDirection.mag(); + /* + G4cout << "cameraPosition: " << cameraPosition + << ", lightFrontCentre: " << lightFrontCentre + << ", lightFrontRadius: " << lightFrontRadius + << ", lightFrontCentreDistance: " << lightFrontCentreDistance + << ", dot: " << lightFrontToCameraDirection * fVP.GetViewpointDirection() + << G4endl; + */ + if (lightFrontToCameraDirection * fVP.GetViewpointDirection() > 0. && lightFrontRadius < lightFrontCentreDistance) { + // Light front in front of camera... + G4double sineHorizonAngle = lightFrontRadius / lightFrontCentreDistance; + circleCentre = lightFrontCentre + (lightFrontRadius * sineHorizonAngle) * lightFrontToCameraDirection.unit(); + circleRadius = lightFrontRadius * std::sqrt(1. - std::pow(sineHorizonAngle, 2)); + /* + G4cout << "sineHorizonAngle: " << sineHorizonAngle + << ", circleCentre: " << circleCentre + << ", circleRadius: " << circleRadius + << G4endl; + */ + } else { + circleRadius = -1.; + } + } + if (circleRadius > 0.) { + G4Circle lightFront(circleCentre); + lightFront.SetWorldRadius(circleRadius); + glColor3d(fDisplayLightFrontRed, + fDisplayLightFrontGreen, + fDisplayLightFrontBlue); + static_cast(fSceneHandler). + G4OpenGLSceneHandler::AddPrimitive(lightFront); + } + } } } diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredWin32.cc b/source/visualization/OpenGL/src/G4OpenGLStoredWin32.cc index 1939d24416..3c1162cc41 100644 --- a/source/visualization/OpenGL/src/G4OpenGLStoredWin32.cc +++ b/source/visualization/OpenGL/src/G4OpenGLStoredWin32.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenGLStoredWin32.cc,v 1.13 2006/06/29 21:19:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenGLStoredWin32.cc,v 1.14 2006/08/14 12:07:19 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // OpenGLStoredWin32 graphics system factory. @@ -39,12 +39,16 @@ #include "G4OpenGLViewer.hh" #include "G4OpenGLStoredWin32.hh" #include "G4OpenGLStoredWin32Viewer.hh" +#include "G4OpenGLViewerMessenger.hh" G4OpenGLStoredWin32::G4OpenGLStoredWin32 (): G4VGraphicsSystem ("OpenGLStoredWin32", "OGLSWin32", G4VisFeaturesOfOpenGLSWin32 (), - G4VGraphicsSystem::threeD) {} + G4VGraphicsSystem::threeD) +{ + G4OpenGLViewerMessenger::GetInstance(); +} G4VSceneHandler* G4OpenGLStoredWin32::CreateSceneHandler (const G4String& name) { diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredWin32Viewer.cc b/source/visualization/OpenGL/src/G4OpenGLStoredWin32Viewer.cc index f54d22129f..bb2b38955e 100644 --- a/source/visualization/OpenGL/src/G4OpenGLStoredWin32Viewer.cc +++ b/source/visualization/OpenGL/src/G4OpenGLStoredWin32Viewer.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenGLStoredWin32Viewer.cc,v 1.17 2006/06/29 21:19:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenGLStoredWin32Viewer.cc,v 1.18 2006/09/04 12:07:59 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Class G4OpenGLStoredWin32Viewer : a class derived from G4OpenGLWin32Viewer and @@ -100,6 +100,15 @@ void G4OpenGLStoredWin32Viewer::DrawView () { if (!kernelVisitWasNeeded) { DrawDisplayLists (); FinishView (); + } else { + // However, union cutaways are implemented in DrawDisplayLists, so make + // an extra pass... + if (fVP.IsCutaway() && + fVP.GetCutawayMode() == G4ViewParameters::cutawayUnion) { + ClearView(); + DrawDisplayLists (); + FinishView (); + } } } } diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredX.cc b/source/visualization/OpenGL/src/G4OpenGLStoredX.cc index 80ee99a844..89628955c5 100644 --- a/source/visualization/OpenGL/src/G4OpenGLStoredX.cc +++ b/source/visualization/OpenGL/src/G4OpenGLStoredX.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenGLStoredX.cc,v 1.11 2006/06/29 21:19:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenGLStoredX.cc,v 1.13 2006/08/14 12:07:19 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 10th February 1997 @@ -40,12 +40,18 @@ #include "G4OpenGLViewer.hh" #include "G4OpenGLStoredX.hh" #include "G4OpenGLStoredXViewer.hh" +#include "G4OpenGLViewerMessenger.hh" +#include "G4OpenGLXViewerMessenger.hh" G4OpenGLStoredX::G4OpenGLStoredX (): G4VGraphicsSystem ("OpenGLStoredX", "OGLSX", G4VisFeaturesOfOpenGLSX (), - G4VGraphicsSystem::threeD) {} + G4VGraphicsSystem::threeD) +{ + G4OpenGLViewerMessenger::GetInstance(); + G4OpenGLXViewerMessenger::GetInstance(); +} G4OpenGLStoredX::~G4OpenGLStoredX () {} diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredXViewer.cc b/source/visualization/OpenGL/src/G4OpenGLStoredXViewer.cc index 331e6f046a..a8c979b826 100644 --- a/source/visualization/OpenGL/src/G4OpenGLStoredXViewer.cc +++ b/source/visualization/OpenGL/src/G4OpenGLStoredXViewer.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenGLStoredXViewer.cc,v 1.19 2006/06/29 21:19:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenGLStoredXViewer.cc,v 1.21 2006/09/04 12:07:59 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 7th February 1997 @@ -109,8 +109,23 @@ void G4OpenGLStoredXViewer::DrawView () { if (!kernelVisitWasNeeded) { DrawDisplayLists (); FinishView (); + } else { + // However, union cutaways are implemented in DrawDisplayLists, so make + // an extra pass... + if (fVP.IsCutaway() && + fVP.GetCutawayMode() == G4ViewParameters::cutawayUnion) { + ClearView(); + DrawDisplayLists (); + FinishView (); + } } } } +void G4OpenGLStoredXViewer::FinishView () { + glXWaitGL (); //Wait for effects of all previous OpenGL commands to + //be propogated before progressing. + glXSwapBuffers (dpy, win); +} + #endif diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredXm.cc b/source/visualization/OpenGL/src/G4OpenGLStoredXm.cc index 7238c371e8..1762f74427 100644 --- a/source/visualization/OpenGL/src/G4OpenGLStoredXm.cc +++ b/source/visualization/OpenGL/src/G4OpenGLStoredXm.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenGLStoredXm.cc,v 1.10 2006/06/29 21:19:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenGLStoredXm.cc,v 1.11 2006/08/14 12:07:19 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 10th February 1997 @@ -39,6 +39,7 @@ #include "G4OpenGLViewer.hh" #include "G4OpenGLStoredXm.hh" #include "G4OpenGLStoredXmViewer.hh" +#include "G4OpenGLViewerMessenger.hh" #include "G4OpenGLXmViewerMessenger.hh" G4OpenGLStoredXm::G4OpenGLStoredXm (): @@ -47,6 +48,7 @@ G4OpenGLStoredXm::G4OpenGLStoredXm (): G4VisFeaturesOfOpenGLSXm (), G4VGraphicsSystem::threeD) { + G4OpenGLViewerMessenger::GetInstance(); G4OpenGLXmViewerMessenger::GetInstance(); } diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredXmViewer.cc b/source/visualization/OpenGL/src/G4OpenGLStoredXmViewer.cc index 026fa2fd2f..1fbd051033 100644 --- a/source/visualization/OpenGL/src/G4OpenGLStoredXmViewer.cc +++ b/source/visualization/OpenGL/src/G4OpenGLStoredXmViewer.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenGLStoredXmViewer.cc,v 1.19 2006/06/29 21:19:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenGLStoredXmViewer.cc,v 1.21 2006/09/04 12:07:59 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 10th February 1997 @@ -76,6 +76,8 @@ void G4OpenGLStoredXmViewer::Initialise () { glEnable (GL_BLEND); glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + + glDrawBuffer (GL_BACK); } void G4OpenGLStoredXmViewer::DrawView () { @@ -112,8 +114,23 @@ void G4OpenGLStoredXmViewer::DrawView () { if (!kernelVisitWasNeeded) { DrawDisplayLists (); FinishView (); + } else { + // However, union cutaways are implemented in DrawDisplayLists, so make + // an extra pass... + if (fVP.IsCutaway() && + fVP.GetCutawayMode() == G4ViewParameters::cutawayUnion) { + ClearView(); + DrawDisplayLists (); + FinishView (); + } } } } +void G4OpenGLStoredXmViewer::FinishView () { + glXWaitGL (); //Wait for effects of all previous OpenGL commands to + //be propogated before progressing. + glXSwapBuffers (dpy, win); +} + #endif diff --git a/source/visualization/OpenGL/src/G4OpenGLTransform3D.cc b/source/visualization/OpenGL/src/G4OpenGLTransform3D.cc index 23190e4b7d..c6d6f88899 100644 --- a/source/visualization/OpenGL/src/G4OpenGLTransform3D.cc +++ b/source/visualization/OpenGL/src/G4OpenGLTransform3D.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLTransform3D.cc,v 1.8 2006/06/29 21:19:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 24th October 1996 diff --git a/source/visualization/OpenGL/src/G4OpenGLViewer.cc b/source/visualization/OpenGL/src/G4OpenGLViewer.cc index f630334b60..40512f6e46 100644 --- a/source/visualization/OpenGL/src/G4OpenGLViewer.cc +++ b/source/visualization/OpenGL/src/G4OpenGLViewer.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenGLViewer.cc,v 1.24 2006/06/29 21:19:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenGLViewer.cc,v 1.29 2006/09/19 16:13:15 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 27th March 1996 @@ -51,7 +51,25 @@ G4VViewer (scene, -1), background (G4Colour(0.,0.,0.)), transparency_enabled (true), antialiasing_enabled (false), -haloing_enabled (false) +haloing_enabled (false), +fStartTime(-DBL_MAX), +fEndTime(DBL_MAX), +fFadeFactor(0.), +fDisplayHeadTime(false), +fDisplayHeadTimeX(-0.9), +fDisplayHeadTimeY(-0.9), +fDisplayHeadTimeSize(24.), +fDisplayHeadTimeRed(0.), +fDisplayHeadTimeGreen(1.), +fDisplayHeadTimeBlue(1.), +fDisplayLightFront(false), +fDisplayLightFrontX(0.), +fDisplayLightFrontY(0.), +fDisplayLightFrontZ(0.), +fDisplayLightFrontT(0.), +fDisplayLightFrontRed(0.), +fDisplayLightFrontGreen(1.), +fDisplayLightFrontBlue(0.) { // Make changes to view parameters for OpenGL... fVP.SetAutoRefresh(true); @@ -159,7 +177,11 @@ void G4OpenGLViewer::SetView () { // Light position is "true" light direction, so must come after gluLookAt. glLightfv (GL_LIGHT0, GL_POSITION, lightPosition); - // Clip planes. + // OpenGL no longer seems to reconstruct clipped edges, so, when the + // BooleanProcessor is up to it, abandon this and use generic + // clipping in G4OpenGLSceneHandler::CreateSectionPolyhedron. Also, + // force kernel visit on change of clipping plane in + // G4OpenGLStoredViewer::CompareForKernelVisit. if (fVP.IsSection () ) { // pair of back to back clip planes. const G4Plane3D& s = fVP.GetSectionPlane (); double sArray[4]; @@ -175,12 +197,45 @@ void G4OpenGLViewer::SetView () { sArray[3] = -s.d() + radius * 1.e-05; glClipPlane (GL_CLIP_PLANE1, sArray); glEnable (GL_CLIP_PLANE1); - } - else { + } else { glDisable (GL_CLIP_PLANE0); glDisable (GL_CLIP_PLANE1); } + const G4Planes& cutaways = fVP.GetCutawayPlanes(); + size_t nPlanes = cutaways.size(); + if (fVP.IsCutaway() && + fVP.GetCutawayMode() == G4ViewParameters::cutawayIntersection && + nPlanes > 0) { + double a[4]; + a[0] = cutaways[0].a(); + a[1] = cutaways[0].b(); + a[2] = cutaways[0].c(); + a[3] = cutaways[0].d(); + glClipPlane (GL_CLIP_PLANE2, a); + glEnable (GL_CLIP_PLANE2); + if (nPlanes > 1) { + a[0] = cutaways[1].a(); + a[1] = cutaways[1].b(); + a[2] = cutaways[1].c(); + a[3] = cutaways[1].d(); + glClipPlane (GL_CLIP_PLANE3, a); + glEnable (GL_CLIP_PLANE3); + } + if (nPlanes > 2) { + a[0] = cutaways[2].a(); + a[1] = cutaways[2].b(); + a[2] = cutaways[2].c(); + a[3] = cutaways[2].d(); + glClipPlane (GL_CLIP_PLANE4, a); + glEnable (GL_CLIP_PLANE4); + } + } else { + glDisable (GL_CLIP_PLANE2); + glDisable (GL_CLIP_PLANE3); + glDisable (GL_CLIP_PLANE4); + } + // Background. background = fVP.GetBackgroundColour (); diff --git a/source/visualization/OpenGL/src/G4OpenGLViewerMessenger.cc b/source/visualization/OpenGL/src/G4OpenGLViewerMessenger.cc new file mode 100644 index 0000000000..4d489413e1 --- /dev/null +++ b/source/visualization/OpenGL/src/G4OpenGLViewerMessenger.cc @@ -0,0 +1,330 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4OpenGLViewerMessenger.cc,v 1.5 2006/10/24 06:20:42 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ + +#include "G4OpenGLViewerMessenger.hh" + +#include "G4OpenGLViewer.hh" +#include "G4OpenGLStoredViewer.hh" +#include "G4UImanager.hh" +#include "G4UIcommand.hh" +#include "G4UIdirectory.hh" +#include "G4UIcmdWithADouble.hh" +#include "G4UIcmdWithABool.hh" +#include "G4VisManager.hh" +#include + +G4OpenGLViewerMessenger* +G4OpenGLViewerMessenger::fpInstance = 0; + +G4OpenGLViewerMessenger* +G4OpenGLViewerMessenger::GetInstance() +{ + if (!fpInstance) fpInstance = new G4OpenGLViewerMessenger; + return fpInstance; +} + +G4OpenGLViewerMessenger::G4OpenGLViewerMessenger() +{ + G4bool omitable; + + fpDirectory = new G4UIdirectory("/vis/ogl/"); + fpDirectory->SetGuidance("G4OpenGLViewer commands."); + + fpDirectorySet = new G4UIdirectory ("/vis/ogl/set/"); + fpDirectorySet->SetGuidance("G4OpenGLViewer set commands."); + + G4UIparameter* parameter; + + fpCommandDisplayHeadTime = + new G4UIcommand("/vis/ogl/set/displayHeadTime", this); + fpCommandDisplayHeadTime->SetGuidance + ("Display head time of range in 2D text."); + parameter = new G4UIparameter ("displayHeadTime", 'b', omitable = false); + parameter->SetDefaultValue(false); + fpCommandDisplayHeadTime->SetParameter(parameter); + parameter = new G4UIparameter ("screenX", 'd', omitable = true); + parameter->SetGuidance("-1 < screenX < 1"); + parameter->SetParameterRange("screenX >= -1. && screenX <= 1."); + parameter->SetDefaultValue(-0.9); + fpCommandDisplayHeadTime->SetParameter(parameter); + parameter = new G4UIparameter ("screenY", 'd', omitable = true); + parameter->SetGuidance("-1 < screenY < 1"); + parameter->SetParameterRange("screenY >= -1. && screenY <= 1."); + parameter->SetDefaultValue(-0.9); + fpCommandDisplayHeadTime->SetParameter(parameter); + parameter = new G4UIparameter ("screenSize", 'd', omitable = true); + parameter->SetDefaultValue(24.); + fpCommandDisplayHeadTime->SetParameter(parameter); + parameter = new G4UIparameter ("red", 'd', omitable = true); + parameter->SetParameterRange("red >= 0. && red <= 1."); + parameter->SetDefaultValue(0.); + fpCommandDisplayHeadTime->SetParameter(parameter); + parameter = new G4UIparameter ("green", 'd', omitable = true); + parameter->SetParameterRange("green >= 0. && green <= 1."); + parameter->SetDefaultValue(1.); + fpCommandDisplayHeadTime->SetParameter(parameter); + parameter = new G4UIparameter ("blue", 'd', omitable = true); + parameter->SetParameterRange("blue >= 0. && blue <= 1."); + parameter->SetDefaultValue(1.); + fpCommandDisplayHeadTime->SetParameter(parameter); + + fpCommandDisplayLightFront = + new G4UIcommand("/vis/ogl/set/displayLightFront", this); + fpCommandDisplayLightFront->SetGuidance + ("Display the light front at head time."); + fpCommandDisplayLightFront->SetGuidance + ("Tip: The trajectories can appear of jump ahead of the light front" + "\nbecause their time range overlaps the viewer's time range. To" + "\naverage out this discrete time effect, advance the light front by" + "\nhalf the trajectories interval. E.g., if the trajectory time slice" + "\ninterval is 0.01 ns:" + "\n /vis/ogl/set/displayLightFront true -90 0 0 mm -0.005 ns" + "\nTo prevent them beating the light front at all:" + "\n /vis/ogl/set/displayLightFront true -90 0 0 mm -0.01 ns"); + parameter = new G4UIparameter ("displayLightFront", 'b', omitable = false); + parameter->SetDefaultValue(false); + fpCommandDisplayLightFront->SetParameter(parameter); + parameter = new G4UIparameter ("originX", 'd', omitable = true); + parameter->SetDefaultValue(0.); + fpCommandDisplayLightFront->SetParameter(parameter); + parameter = new G4UIparameter ("originY", 'd', omitable = true); + parameter->SetDefaultValue(0.); + fpCommandDisplayLightFront->SetParameter(parameter); + parameter = new G4UIparameter ("originZ", 'd', omitable = true); + parameter->SetDefaultValue(0.); + fpCommandDisplayLightFront->SetParameter(parameter); + parameter = new G4UIparameter ("space_unit", 's', omitable = true); + parameter->SetDefaultValue("m"); + fpCommandDisplayLightFront->SetParameter(parameter); + parameter = new G4UIparameter ("originT", 'd', omitable = true); + parameter->SetDefaultValue(0.); + fpCommandDisplayLightFront->SetParameter(parameter); + parameter = new G4UIparameter ("time_unit", 's', omitable = true); + parameter->SetDefaultValue("s"); + fpCommandDisplayLightFront->SetParameter(parameter); + parameter = new G4UIparameter ("red", 'd', omitable = true); + parameter->SetParameterRange("red >= 0. && red <= 1."); + parameter->SetDefaultValue(0.); + fpCommandDisplayLightFront->SetParameter(parameter); + parameter = new G4UIparameter ("green", 'd', omitable = true); + parameter->SetParameterRange("green >= 0. && green <= 1."); + parameter->SetDefaultValue(1.); + fpCommandDisplayLightFront->SetParameter(parameter); + parameter = new G4UIparameter ("blue", 'd', omitable = true); + parameter->SetParameterRange("blue >= 0. && blue <= 1."); + parameter->SetDefaultValue(0.); + fpCommandDisplayLightFront->SetParameter(parameter); + + fpCommandEndTime = + new G4UIcommand("/vis/ogl/set/endTime", this); + fpCommandEndTime->SetGuidance("Set end and range of track time."); + parameter = new G4UIparameter ("end-time", 'd', omitable = false); + parameter->SetDefaultValue(DBL_MAX); + fpCommandEndTime->SetParameter(parameter); + parameter = new G4UIparameter ("end-time-unit", 's', omitable = false); + parameter->SetDefaultValue("ns"); + fpCommandEndTime->SetParameter(parameter); + parameter = new G4UIparameter ("time-range", 'd', omitable = true); + parameter->SetDefaultValue(-1.); + fpCommandEndTime->SetParameter(parameter); + parameter = new G4UIparameter ("time-range-unit", 's', omitable = true); + parameter->SetDefaultValue("ns"); + fpCommandEndTime->SetParameter(parameter); + + fpCommandFade = new G4UIcmdWithADouble("/vis/ogl/set/fade", this); + fpCommandFade->SetGuidance + ("0: no fade; 1: maximum fade with time within range."); + fpCommandFade->SetParameterName("fadefactor", omitable = false); + fpCommandFade->SetRange("fadefactor>=0.&&fadefactor<=1."); + fpCommandFade->SetDefaultValue(0.); + + fpCommandStartTime = + new G4UIcommand("/vis/ogl/set/startTime", this); + fpCommandStartTime->SetGuidance("Set start and range of track time."); + parameter = new G4UIparameter ("start-time", 'd', omitable = false); + parameter->SetDefaultValue(-DBL_MAX); + fpCommandStartTime->SetParameter(parameter); + parameter = new G4UIparameter ("start-time-unit", 's', omitable = false); + parameter->SetDefaultValue("ns"); + fpCommandStartTime->SetParameter(parameter); + parameter = new G4UIparameter ("time-range", 'd', omitable = true); + parameter->SetDefaultValue(-1.); + fpCommandStartTime->SetParameter(parameter); + parameter = new G4UIparameter ("time-range-unit", 's', omitable = true); + parameter->SetDefaultValue("ns"); + fpCommandStartTime->SetParameter(parameter); + + fpCommandTransparency = + new G4UIcmdWithABool("/vis/ogl/set/transparency", this); + fpCommandTransparency->SetGuidance + ("True/false to enable/disable rendering of transparent objects."); + fpCommandTransparency->SetParameterName + ("transparency-enabled", omitable = true); + fpCommandTransparency->SetDefaultValue(true); +} + +G4OpenGLViewerMessenger::~G4OpenGLViewerMessenger () +{ + delete fpCommandTransparency; + delete fpCommandStartTime; + delete fpCommandFade; + delete fpCommandEndTime; + delete fpCommandDisplayLightFront; + delete fpCommandDisplayHeadTime; + delete fpDirectorySet; + delete fpDirectory; +} + +void G4OpenGLViewerMessenger::SetNewValue +(G4UIcommand* command, G4String newValue) +{ + G4VisManager* pVisManager = G4VisManager::GetInstance(); + + G4VViewer* pVViewer = pVisManager->GetCurrentViewer(); + + if (!pVViewer) { + G4cout << + "G4OpenGLViewerMessenger::SetNewValue: No current viewer." + "\n \"/vis/open\", or similar, to get one." + << G4endl; + return; + } + + G4OpenGLViewer* pOGLViewer = dynamic_cast(pVViewer); + + if (!pOGLViewer) { + G4cout << + "G4OpenGLViewerMessenger::SetNewValue: Current viewer is not of type" + "\n OGL. Use \"/vis/viewer/select\" or \"/vis/open\"." + << G4endl; + return; + } + + G4OpenGLStoredViewer* pViewer = + dynamic_cast(pVViewer); + + if (!pViewer) { + G4cout << + "G4OpenGLViewerMessenger::SetNewValue: Current viewer is not of type OGLS." + "\n The time slice viewing feature is only implemented for OGL Stored" + "\n viewers at present. Use \"/vis/viewer/select\" or \"/vis/open\"." + << G4endl; + return; + } + + if (command == fpCommandDisplayHeadTime) + { + G4String display; + G4double screenX, screenY, screenSize, red, green, blue; + std::istringstream iss(newValue); + iss >> display >> screenX >> screenY + >> screenSize >> red >> green >> blue; + pViewer->fDisplayHeadTime = command->ConvertToBool(display); + pViewer->fDisplayHeadTimeX = screenX; + pViewer->fDisplayHeadTimeY = screenY; + pViewer->fDisplayHeadTimeSize = screenSize; + pViewer->fDisplayHeadTimeRed = red; + pViewer->fDisplayHeadTimeGreen = green; + pViewer->fDisplayHeadTimeBlue = blue; + } + + if (command == fpCommandDisplayLightFront) + { + G4String display, originX, originY, originZ, unitS, originT, unitT; + G4double red, green, blue; + std::istringstream iss(newValue); + iss >> display + >> originX >> originY >> originZ >> unitS + >> originT >> unitT + >> red >> green >> blue; + pViewer->fDisplayLightFront = command->ConvertToBool(display); + pViewer->fDisplayLightFrontX = + command->ConvertToDimensionedDouble(G4String(originX + ' ' + unitS)); + pViewer->fDisplayLightFrontY = + command->ConvertToDimensionedDouble(G4String(originY + ' ' + unitS)); + pViewer->fDisplayLightFrontZ = + command->ConvertToDimensionedDouble(G4String(originZ + ' ' + unitS)); + pViewer->fDisplayLightFrontT = + command->ConvertToDimensionedDouble(G4String(originT + ' ' + unitT)); + pViewer->fDisplayLightFrontRed = red; + pViewer->fDisplayLightFrontGreen = green; + pViewer->fDisplayLightFrontBlue = blue; + } + + if (command == fpCommandEndTime) + { + G4String end_time_string, end_time_unit, + time_range_string, time_range_unit; + std::istringstream iss(newValue); + iss >> end_time_string >> end_time_unit + >> time_range_string >> time_range_unit; + pViewer->fEndTime = command->ConvertToDimensionedDouble + (G4String(end_time_string + ' ' + end_time_unit)); + G4double timeRange = command->ConvertToDimensionedDouble + (G4String(time_range_string + ' ' + time_range_unit)); + if (timeRange > 0.) { + pViewer->fStartTime = pViewer->fEndTime - timeRange; + } + if (pViewer->fVP.IsAutoRefresh()) + G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/refresh"); + } + + if (command == fpCommandFade) + { + pViewer->fFadeFactor = command->ConvertToDouble(newValue); + if (pViewer->fVP.IsAutoRefresh()) + G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/refresh"); + } + + if (command == fpCommandStartTime) + { + G4String start_time_string, start_time_unit, + time_range_string, time_range_unit; + std::istringstream iss(newValue); + iss >> start_time_string >> start_time_unit + >> time_range_string >> time_range_unit; + pViewer->fStartTime = command->ConvertToDimensionedDouble + (G4String(start_time_string + ' ' + start_time_unit)); + G4double timeRange = command->ConvertToDimensionedDouble + (G4String(time_range_string + ' ' + time_range_unit)); + if (timeRange > 0.) { + pViewer->fEndTime = pViewer->fStartTime + timeRange; + } + if (pViewer->fVP.IsAutoRefresh()) + G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/refresh"); + } + + if (command == fpCommandTransparency) + { + pViewer->transparency_enabled = command->ConvertToBool(newValue); + if (pViewer->fVP.IsAutoRefresh()) + G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/refresh"); + } + +} diff --git a/source/visualization/OpenGL/src/G4OpenGLWin32Viewer.cc b/source/visualization/OpenGL/src/G4OpenGLWin32Viewer.cc index eca450211d..43228ac52c 100644 --- a/source/visualization/OpenGL/src/G4OpenGLWin32Viewer.cc +++ b/source/visualization/OpenGL/src/G4OpenGLWin32Viewer.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLWin32Viewer.cc,v 1.17 2006/06/29 21:19:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // G4OpenGLWin32Viewer : Class to provide WindowsNT specific diff --git a/source/visualization/OpenGL/src/G4OpenGLXViewer.cc b/source/visualization/OpenGL/src/G4OpenGLXViewer.cc index bdebcc2bb4..89d6a016bc 100644 --- a/source/visualization/OpenGL/src/G4OpenGLXViewer.cc +++ b/source/visualization/OpenGL/src/G4OpenGLXViewer.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenGLXViewer.cc,v 1.30 2006/06/29 21:19:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenGLXViewer.cc,v 1.34 2006/11/01 11:22:26 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 7th February 1997 @@ -122,19 +122,10 @@ void G4OpenGLXViewer::SetView () { void G4OpenGLXViewer::ShowView () { glXWaitGL (); //Wait for effects of all previous OpenGL commands to - //be propogated before progressing. + //be propagated before progressing. glFlush (); } -void G4OpenGLXViewer::FinishView () { - glXWaitGL (); //Wait for effects of all previous OpenGL commands to - //be propogated before progressing. - if (doublebuffer == true) { - glXSwapBuffers (dpy, win); - } - else glFlush (); -} - void G4OpenGLXViewer::GetXConnection () { // get a connection. dpy = XOpenDisplay (0); @@ -395,7 +386,6 @@ vi_stored (0) if (vi_single_buffer) { vi_immediate = vi_single_buffer; attributeList = snglBuf_RGBA; - doublebuffer = false; } if (!vi_immediate){ @@ -403,7 +393,6 @@ vi_stored (0) if (vi_double_buffer) { vi_immediate = vi_double_buffer; attributeList = dblBuf_RGBA; - doublebuffer = true; } } @@ -412,7 +401,6 @@ vi_stored (0) if (vi_double_buffer) { vi_stored = vi_double_buffer; attributeList = dblBuf_RGBA; - doublebuffer = true; } if (!vi_immediate || !vi_stored) { @@ -472,14 +460,10 @@ void G4OpenGLXViewer::print() { } else { XVisualInfo* pvi; - G4bool new_db; - G4bool last_db; - GLXContext pcx = create_GL_print_context(pvi, new_db); + GLXContext pcx = create_GL_print_context(pvi); GLXContext tmp_cx; tmp_cx = cx; cx=pcx; - last_db=doublebuffer; - doublebuffer=new_db; Pixmap pmap = XCreatePixmap (dpy, XRootWindow (dpy, pvi->screen), @@ -509,7 +493,6 @@ void G4OpenGLXViewer::print() { win=tmp_win; cx=tmp_cx; - doublebuffer=last_db; glXMakeCurrent (dpy, glxpmap, @@ -807,12 +790,18 @@ G4float* G4OpenGLXViewer::spewPrimitiveEPS (FILE* file, GLfloat* loc) { break; default: /* XXX Left as an excersie to the reader. */ - std::ostringstream oss; - oss << "Incomplete implementation. Unexpected token (" << token << ")."; - G4Exception("G4OpenGLXViewer::spewPrimitiveEPS", - "Writing_eps_file_01", - FatalException, - oss.str().c_str()); + static G4bool spewPrimitiveEPSWarned = false; + if (!spewPrimitiveEPSWarned) { + std::ostringstream oss; + oss << + "Incomplete implementation. Unexpected token (" << token << ")." + "\n (Seems to be caused by text.)"; + G4Exception("G4OpenGLXViewer::spewPrimitiveEPS", + "Unexpected token", + JustWarning, + oss.str().c_str()); + spewPrimitiveEPSWarned = true; + } } return loc; } @@ -875,12 +864,19 @@ void G4OpenGLXViewer::spewSortedFeedback(FILE * file, GLint size, GLfloat * buff break; default: /* XXX Left as an excersie to the reader. */ - std::ostringstream oss; - oss << "Incomplete implementation. Unexpected token (" << token << ")."; - G4Exception("G4OpenGLXViewer::spewPrimitiveEPS", - "Writing_eps_file_02", - FatalException, - oss.str().c_str()); + static G4bool spewSortedFeedbackWarned = false; + if (!spewSortedFeedbackWarned) { + std::ostringstream oss; + oss << + "Incomplete implementation. Unexpected token (" << token << ")." + "\n (Seems to be caused by text.)"; + G4Exception("G4OpenGLXViewer::spewSortedFeedback", + "Unexpected token", + JustWarning, + oss.str().c_str()); + spewSortedFeedbackWarned = true; + } + nprimitives++; } } @@ -948,21 +944,16 @@ void G4OpenGLXViewer::spewSortedFeedback(FILE * file, GLint size, GLfloat * buff free(prims); } -GLXContext G4OpenGLXViewer::create_GL_print_context(XVisualInfo*& pvi, G4bool& db) { +GLXContext G4OpenGLXViewer::create_GL_print_context(XVisualInfo*& pvi) { pvi = glXChooseVisual (dpy, XDefaultScreen (dpy), snglBuf_RGBA); - if (pvi) { - db=false; - } else { + if (!pvi) { pvi = glXChooseVisual (dpy, XDefaultScreen (dpy), dblBuf_RGBA); - if (!pvi) { - db=true; - } } return glXCreateContext (dpy, diff --git a/source/visualization/OpenGL/src/G4OpenGLXViewerMessenger.cc b/source/visualization/OpenGL/src/G4OpenGLXViewerMessenger.cc new file mode 100644 index 0000000000..589f57b9d2 --- /dev/null +++ b/source/visualization/OpenGL/src/G4OpenGLXViewerMessenger.cc @@ -0,0 +1,115 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// +// $Id: G4OpenGLXViewerMessenger.cc,v 1.5 2006/11/21 16:24:00 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ + +#ifdef G4VIS_BUILD_OPENGLX_DRIVER + +#include "G4OpenGLXViewerMessenger.hh" + +#include "G4OpenGLXViewer.hh" + +#include "G4UImanager.hh" +#include "G4UIcommand.hh" +#include "G4UIdirectory.hh" +#include "G4UIcmdWithoutParameter.hh" +#include "G4UIcmdWithABool.hh" +#include "G4VisManager.hh" +#include + +G4OpenGLXViewerMessenger* G4OpenGLXViewerMessenger::fpInstance = 0; + +G4OpenGLXViewerMessenger* G4OpenGLXViewerMessenger::GetInstance() +{ + if (!fpInstance) fpInstance = new G4OpenGLXViewerMessenger; + return fpInstance; +} + +G4OpenGLXViewerMessenger::G4OpenGLXViewerMessenger() +{ + fpDirectory = new G4UIdirectory("/vis/oglx/"); + fpDirectory->SetGuidance("G4OpenGLXViewer commands."); + + fpCommandPrintEPS = + new G4UIcmdWithoutParameter("/vis/oglx/printEPS", this); + fpCommandPrintEPS->SetGuidance("Print Encapsulated PostScript file."); + fpCommandPrintEPS->SetGuidance + ("Generates files with names G4OpenGL_n.eps, where n is a sequence" + "\nnumber, starting at 0."); +} + +G4OpenGLXViewerMessenger::~G4OpenGLXViewerMessenger () +{ + delete fpCommandPrintEPS; + delete fpDirectory; +} + +void G4OpenGLXViewerMessenger::SetNewValue +(G4UIcommand* command, G4String) +{ + G4VisManager* pVisManager = G4VisManager::GetInstance(); + + G4VViewer* pVViewer = pVisManager->GetCurrentViewer(); + + if (!pVViewer) { + G4cout << + "G4OpenGLXViewerMessenger::SetNewValue: No current viewer." + "\n \"/vis/open\", or similar, to get one." + << G4endl; + return; + } + + G4OpenGLXViewer* pViewer = dynamic_cast(pVViewer); + + if (!pViewer) { + G4cout << + "G4OpenGLXViewerMessenger::SetNewValue: Current viewer is not of type" + "\n OGL*X*. This feature currently only available on X Windows." + << G4endl; + return; + } + + if (command == fpCommandPrintEPS) + { + // Keep copy of print_string to preserve Xm behaviour... + char* tmp_string = new char[50]; + strcpy (tmp_string, pViewer->print_string); + // Make new print string... + static G4int file_count = 0; + std::ostringstream oss; + oss << "G4OpenGL_" << file_count++ << ".eps"; + strcpy (pViewer->print_string, oss.str().c_str()); + // Print eps file... + pViewer->print(); + // Restore print_string for Xm... + strcpy (pViewer->print_string, tmp_string); + delete tmp_string; + } + +} + +#endif diff --git a/source/visualization/OpenGL/src/G4OpenGLXmBox.cc b/source/visualization/OpenGL/src/G4OpenGLXmBox.cc index d2d50a649a..8f18031a0a 100644 --- a/source/visualization/OpenGL/src/G4OpenGLXmBox.cc +++ b/source/visualization/OpenGL/src/G4OpenGLXmBox.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmBox.cc,v 1.6 2006/06/29 21:19:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //Box container class diff --git a/source/visualization/OpenGL/src/G4OpenGLXmConvenienceRoutines.cc b/source/visualization/OpenGL/src/G4OpenGLXmConvenienceRoutines.cc index 6efeda8130..3c81cd7bff 100644 --- a/source/visualization/OpenGL/src/G4OpenGLXmConvenienceRoutines.cc +++ b/source/visualization/OpenGL/src/G4OpenGLXmConvenienceRoutines.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmConvenienceRoutines.cc,v 1.11 2006/06/29 21:19:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 16th April 1997 diff --git a/source/visualization/OpenGL/src/G4OpenGLXmFourArrowButtons.cc b/source/visualization/OpenGL/src/G4OpenGLXmFourArrowButtons.cc index b772dcc8d3..2aecb7a651 100644 --- a/source/visualization/OpenGL/src/G4OpenGLXmFourArrowButtons.cc +++ b/source/visualization/OpenGL/src/G4OpenGLXmFourArrowButtons.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmFourArrowButtons.cc,v 1.5 2006/06/29 21:19:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //Four arrow buttons class. Inherits from G4OpenGLXmVWidgetComponent diff --git a/source/visualization/OpenGL/src/G4OpenGLXmFramedBox.cc b/source/visualization/OpenGL/src/G4OpenGLXmFramedBox.cc index 5617c33a6a..08f0510b1b 100644 --- a/source/visualization/OpenGL/src/G4OpenGLXmFramedBox.cc +++ b/source/visualization/OpenGL/src/G4OpenGLXmFramedBox.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmFramedBox.cc,v 1.6 2006/06/29 21:19:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //Framed box container class diff --git a/source/visualization/OpenGL/src/G4OpenGLXmMainMenubarCallbacks.cc b/source/visualization/OpenGL/src/G4OpenGLXmMainMenubarCallbacks.cc index 6c202222fa..59214e05e1 100644 --- a/source/visualization/OpenGL/src/G4OpenGLXmMainMenubarCallbacks.cc +++ b/source/visualization/OpenGL/src/G4OpenGLXmMainMenubarCallbacks.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmMainMenubarCallbacks.cc,v 1.13 2006/06/29 21:19:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 16th April 1997 diff --git a/source/visualization/OpenGL/src/G4OpenGLXmPanningCallbacks.cc b/source/visualization/OpenGL/src/G4OpenGLXmPanningCallbacks.cc index b79748b4e6..4adc1fd497 100644 --- a/source/visualization/OpenGL/src/G4OpenGLXmPanningCallbacks.cc +++ b/source/visualization/OpenGL/src/G4OpenGLXmPanningCallbacks.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmPanningCallbacks.cc,v 1.8 2006/06/29 21:19:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 16th April 1997 diff --git a/source/visualization/OpenGL/src/G4OpenGLXmPushButton.cc b/source/visualization/OpenGL/src/G4OpenGLXmPushButton.cc index 0c27386ac0..63fd4995c4 100644 --- a/source/visualization/OpenGL/src/G4OpenGLXmPushButton.cc +++ b/source/visualization/OpenGL/src/G4OpenGLXmPushButton.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmPushButton.cc,v 1.6 2006/06/29 21:19:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //Push button class. Inherits from G4OpenGLXmVWidgetComponent diff --git a/source/visualization/OpenGL/src/G4OpenGLXmRadioButton.cc b/source/visualization/OpenGL/src/G4OpenGLXmRadioButton.cc index 3536c8e0b4..dad74c616e 100644 --- a/source/visualization/OpenGL/src/G4OpenGLXmRadioButton.cc +++ b/source/visualization/OpenGL/src/G4OpenGLXmRadioButton.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmRadioButton.cc,v 1.6 2006/06/29 21:19:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //Radio button class. Inherits from G4OpenGLXmVWidgetComponent diff --git a/source/visualization/OpenGL/src/G4OpenGLXmRotationCallbacks.cc b/source/visualization/OpenGL/src/G4OpenGLXmRotationCallbacks.cc index f3d2859312..bb8a94de5e 100644 --- a/source/visualization/OpenGL/src/G4OpenGLXmRotationCallbacks.cc +++ b/source/visualization/OpenGL/src/G4OpenGLXmRotationCallbacks.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmRotationCallbacks.cc,v 1.14 2006/06/29 21:19:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 16th April 1997 diff --git a/source/visualization/OpenGL/src/G4OpenGLXmSeparator.cc b/source/visualization/OpenGL/src/G4OpenGLXmSeparator.cc index e63cf42c77..156e67c699 100644 --- a/source/visualization/OpenGL/src/G4OpenGLXmSeparator.cc +++ b/source/visualization/OpenGL/src/G4OpenGLXmSeparator.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmSeparator.cc,v 1.5 2006/06/29 21:19:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //Separator class. Inherits from G4OpenGLXmVWidgetComponent diff --git a/source/visualization/OpenGL/src/G4OpenGLXmSliderBar.cc b/source/visualization/OpenGL/src/G4OpenGLXmSliderBar.cc index 072d18bb91..6ba8b8433c 100644 --- a/source/visualization/OpenGL/src/G4OpenGLXmSliderBar.cc +++ b/source/visualization/OpenGL/src/G4OpenGLXmSliderBar.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmSliderBar.cc,v 1.7 2006/06/29 21:20:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //Slider bar class. Inherits from G4OpenGLXmVWidgetComponent diff --git a/source/visualization/OpenGL/src/G4OpenGLXmStyleCallbacks.cc b/source/visualization/OpenGL/src/G4OpenGLXmStyleCallbacks.cc index ffa65175ba..bef12a6679 100644 --- a/source/visualization/OpenGL/src/G4OpenGLXmStyleCallbacks.cc +++ b/source/visualization/OpenGL/src/G4OpenGLXmStyleCallbacks.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmStyleCallbacks.cc,v 1.14 2006/06/29 21:20:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 16th April 1997 diff --git a/source/visualization/OpenGL/src/G4OpenGLXmTextField.cc b/source/visualization/OpenGL/src/G4OpenGLXmTextField.cc index 4bf5751219..893867ae36 100644 --- a/source/visualization/OpenGL/src/G4OpenGLXmTextField.cc +++ b/source/visualization/OpenGL/src/G4OpenGLXmTextField.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmTextField.cc,v 1.7 2006/06/29 21:20:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //Text field class. Inherits from G4OpenGLXmVWidgetComponent diff --git a/source/visualization/OpenGL/src/G4OpenGLXmTopLevelShell.cc b/source/visualization/OpenGL/src/G4OpenGLXmTopLevelShell.cc index 590aa4ccd9..1e8afdc8ad 100644 --- a/source/visualization/OpenGL/src/G4OpenGLXmTopLevelShell.cc +++ b/source/visualization/OpenGL/src/G4OpenGLXmTopLevelShell.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmTopLevelShell.cc,v 1.5 2006/06/29 21:20:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //Top level shell class diff --git a/source/visualization/OpenGL/src/G4OpenGLXmVWidgetComponent.cc b/source/visualization/OpenGL/src/G4OpenGLXmVWidgetComponent.cc index 949257a5e7..41650592d8 100644 --- a/source/visualization/OpenGL/src/G4OpenGLXmVWidgetComponent.cc +++ b/source/visualization/OpenGL/src/G4OpenGLXmVWidgetComponent.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmVWidgetComponent.cc,v 1.5 2006/06/29 21:20:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //Base class for all Motif component widgets diff --git a/source/visualization/OpenGL/src/G4OpenGLXmVWidgetContainer.cc b/source/visualization/OpenGL/src/G4OpenGLXmVWidgetContainer.cc index feb9504ede..d95ac84ee2 100644 --- a/source/visualization/OpenGL/src/G4OpenGLXmVWidgetContainer.cc +++ b/source/visualization/OpenGL/src/G4OpenGLXmVWidgetContainer.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmVWidgetContainer.cc,v 1.5 2006/06/29 21:20:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //Base class for all Motif container widgets diff --git a/source/visualization/OpenGL/src/G4OpenGLXmVWidgetObject.cc b/source/visualization/OpenGL/src/G4OpenGLXmVWidgetObject.cc index 0c0eae7f93..2a68dae8a5 100644 --- a/source/visualization/OpenGL/src/G4OpenGLXmVWidgetObject.cc +++ b/source/visualization/OpenGL/src/G4OpenGLXmVWidgetObject.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmVWidgetObject.cc,v 1.5 2006/06/29 21:20:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //Virtual base class for all Motif widgets. diff --git a/source/visualization/OpenGL/src/G4OpenGLXmVWidgetShell.cc b/source/visualization/OpenGL/src/G4OpenGLXmVWidgetShell.cc index c18e6399ba..18ff71e775 100644 --- a/source/visualization/OpenGL/src/G4OpenGLXmVWidgetShell.cc +++ b/source/visualization/OpenGL/src/G4OpenGLXmVWidgetShell.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmVWidgetShell.cc,v 1.5 2006/06/29 21:20:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // //Base class for all Motif shell widgets diff --git a/source/visualization/OpenGL/src/G4OpenGLXmViewer.cc b/source/visualization/OpenGL/src/G4OpenGLXmViewer.cc index a4a4282c5d..0d7703fcfc 100644 --- a/source/visualization/OpenGL/src/G4OpenGLXmViewer.cc +++ b/source/visualization/OpenGL/src/G4OpenGLXmViewer.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmViewer.cc,v 1.23 2006/06/29 21:20:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 10th February 1997 diff --git a/source/visualization/OpenGL/src/G4OpenGLXmViewerMessenger.cc b/source/visualization/OpenGL/src/G4OpenGLXmViewerMessenger.cc index 21a0491983..e3166e0121 100644 --- a/source/visualization/OpenGL/src/G4OpenGLXmViewerMessenger.cc +++ b/source/visualization/OpenGL/src/G4OpenGLXmViewerMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmViewerMessenger.cc,v 1.4 2006/06/29 21:20:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifdef G4VIS_BUILD_OPENGLXM_DRIVER diff --git a/source/visualization/OpenGL/src/G4OpenGLXmWindowHandlingCallbacks.cc b/source/visualization/OpenGL/src/G4OpenGLXmWindowHandlingCallbacks.cc index c6b977e5a8..9cc27c628c 100644 --- a/source/visualization/OpenGL/src/G4OpenGLXmWindowHandlingCallbacks.cc +++ b/source/visualization/OpenGL/src/G4OpenGLXmWindowHandlingCallbacks.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpenGLXmWindowHandlingCallbacks.cc,v 1.6 2006/06/29 21:20:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 16th June 1997 diff --git a/source/visualization/OpenInventor/GNUmakefile b/source/visualization/OpenInventor/GNUmakefile index 3876b0fb4a..017476bb02 100644 --- a/source/visualization/OpenInventor/GNUmakefile +++ b/source/visualization/OpenInventor/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.6 2004/06/03 11:40:13 gcosmo Exp $ +# $Id: GNUmakefile,v 1.8 2006/11/02 12:02:23 allison Exp $ name := G4OpenInventor @@ -29,6 +29,8 @@ CPPFLAGS += -I$(G4BASE)/interfaces/common/include CPPFLAGS += -I$(G4BASE)/intercoms/include CPPFLAGS += -I$(G4BASE)/materials/include CPPFLAGS += -I$(G4BASE)/global/HEPRandom/include +CPPFLAGS += -I$(G4BASE)/tracking/include +CPPFLAGS += -I$(G4BASE)/digits_hits/hits/include include $(G4INSTALL)/config/common.gmk diff --git a/source/visualization/OpenInventor/History b/source/visualization/OpenInventor/History index a1db5b8c86..e48c645e6c 100644 --- a/source/visualization/OpenInventor/History +++ b/source/visualization/OpenInventor/History @@ -1,4 +1,4 @@ -$Id: History,v 1.85 2006/06/05 08:10:53 perl Exp $ +$Id: History,v 1.90 2006/11/05 20:49:09 allison Exp $ ------------------------------------------------------------------- ========================================================= @@ -19,6 +19,31 @@ committal in the CVS repository ! History file for visualization/OpenInventor ------------------------------------------- + +5th November 2006 John Allison (openinventor-V08-01-04) +- Protected against zero material pointer. + +2nd November 2006 John Allison (openinventor-V08-01-03) +- Rationalised G4Att loading and extended picking to hits. + +1st November 2006 John Allison (openinventor-V08-01-02) +- Follow changes to greps-V08-01-09: G4AttCheck/Holder rationalisation. + +26th October 2006 John Allison (openinventor-V08-01-01) +- Added SoG4LineSet, SoG4MarkerSet and SoG4Polyhedron - classes extended to + include G4Atts (G4AttValues and G4AttDefs) for picking. +- G4OpenInventorSceneHandler.cc: Load lines, markers and polyhedron objects + with G4Atts. +- G4OpenInventorViewer.cc: print G4Atts on picking. + +29th August 2006 John Allison (openinventor-V08-01-00) +- G4OpenInventorViewer::CompareForKernelVisit: Rationalisation. This + assumes use of generic clipping (sectioning, slicing, DCUT, + cutaway). If a decision is made to implement locally, this will + need changing. See G4OpenGLViewer::SetView, + G4OpenGLStoredViewer.cc::CompareForKernelVisit and + G4OpenGLStoredSceneHander::CreateSection/CutawayPolyhedron. + 4th June 2006 Joseph Perl (openinventor-V08-00-05) - This tag includes all the changes below. diff --git a/source/visualization/OpenInventor/include/G4OpenInventor.hh b/source/visualization/OpenInventor/include/G4OpenInventor.hh index bff8b015dc..35047db366 100644 --- a/source/visualization/OpenInventor/include/G4OpenInventor.hh +++ b/source/visualization/OpenInventor/include/G4OpenInventor.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenInventor.hh,v 1.9 2006/06/29 21:20:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Guy Barrand 26 Mar 1998. // OpenInventor graphics system factory. diff --git a/source/visualization/OpenInventor/include/G4OpenInventorSceneHandler.hh b/source/visualization/OpenInventor/include/G4OpenInventorSceneHandler.hh index 9615f81be1..781d2272c9 100644 --- a/source/visualization/OpenInventor/include/G4OpenInventorSceneHandler.hh +++ b/source/visualization/OpenInventor/include/G4OpenInventorSceneHandler.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenInventorSceneHandler.hh,v 1.30 2006/06/29 21:20:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenInventorSceneHandler.hh,v 1.31 2006/11/02 12:01:20 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // J Kallenbach 27th Aug 1996 @@ -47,6 +47,7 @@ class G4OpenInventor; class SoSeparator; class Geant4_SoStyleCache; +class G4AttHolder; // Base class for various OpenInventorScene classes. class G4OpenInventorSceneHandler: public G4VSceneHandler { @@ -84,6 +85,7 @@ public: private: + void LoadAtts(const G4Visible&, G4AttHolder*); static G4int fSceneIdCount; // static counter for OpenInventor scenes. enum G4OIMarker {G4OICircle, G4OISquare}; void AddCircleSquare (G4OIMarker markerType, const G4VMarker&); diff --git a/source/visualization/OpenInventor/include/G4OpenInventorTransform3D.hh b/source/visualization/OpenInventor/include/G4OpenInventorTransform3D.hh index 1412db6204..8847707f9f 100644 --- a/source/visualization/OpenInventor/include/G4OpenInventorTransform3D.hh +++ b/source/visualization/OpenInventor/include/G4OpenInventorTransform3D.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenInventorTransform3D.hh,v 1.7 2006/06/29 21:20:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // jck 17 Dec 1996 diff --git a/source/visualization/OpenInventor/include/G4OpenInventorWin.hh b/source/visualization/OpenInventor/include/G4OpenInventorWin.hh index 201b59139c..e969f8769d 100644 --- a/source/visualization/OpenInventor/include/G4OpenInventorWin.hh +++ b/source/visualization/OpenInventor/include/G4OpenInventorWin.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenInventorWin.hh,v 1.3 2006/06/29 21:20:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // OpenInventor graphics system factory. diff --git a/source/visualization/OpenInventor/include/G4OpenInventorWin32.hh b/source/visualization/OpenInventor/include/G4OpenInventorWin32.hh index 0062c57c68..323cf9811d 100644 --- a/source/visualization/OpenInventor/include/G4OpenInventorWin32.hh +++ b/source/visualization/OpenInventor/include/G4OpenInventorWin32.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenInventorWin32.hh,v 1.7 2006/06/29 21:20:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // OpenInventor graphics system factory. diff --git a/source/visualization/OpenInventor/include/G4OpenInventorWinViewer.hh b/source/visualization/OpenInventor/include/G4OpenInventorWinViewer.hh index 86051d763a..b8471a5b86 100644 --- a/source/visualization/OpenInventor/include/G4OpenInventorWinViewer.hh +++ b/source/visualization/OpenInventor/include/G4OpenInventorWinViewer.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenInventorWinViewer.hh,v 1.9 2006/06/29 21:20:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Jeff Kallenbach 01 Aug 1996 diff --git a/source/visualization/OpenInventor/include/G4OpenInventorX.hh b/source/visualization/OpenInventor/include/G4OpenInventorX.hh index e48a42e028..7305555124 100644 --- a/source/visualization/OpenInventor/include/G4OpenInventorX.hh +++ b/source/visualization/OpenInventor/include/G4OpenInventorX.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenInventorX.hh,v 1.7 2006/06/29 21:20:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 27th March 1996 diff --git a/source/visualization/OpenInventor/include/G4OpenInventorXt.hh b/source/visualization/OpenInventor/include/G4OpenInventorXt.hh index 2fa23f3b59..461540cebb 100644 --- a/source/visualization/OpenInventor/include/G4OpenInventorXt.hh +++ b/source/visualization/OpenInventor/include/G4OpenInventorXt.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenInventorXt.hh,v 1.3 2006/06/29 21:20:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Andrew Walkden 27th March 1996 diff --git a/source/visualization/OpenInventor/include/G4OpenInventorXtViewer.hh b/source/visualization/OpenInventor/include/G4OpenInventorXtViewer.hh index e69f7d297c..3f6429ecda 100644 --- a/source/visualization/OpenInventor/include/G4OpenInventorXtViewer.hh +++ b/source/visualization/OpenInventor/include/G4OpenInventorXtViewer.hh @@ -25,7 +25,7 @@ // // // $Id: G4OpenInventorXtViewer.hh,v 1.14 2006/06/29 21:20:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Jeff Kallenbach 01 Aug 1996 diff --git a/source/visualization/OpenInventor/include/HEPVis/SbMath.h b/source/visualization/OpenInventor/include/HEPVis/SbMath.h index 20cd4542f6..70f49cb924 100644 --- a/source/visualization/OpenInventor/include/HEPVis/SbMath.h +++ b/source/visualization/OpenInventor/include/HEPVis/SbMath.h @@ -25,7 +25,7 @@ // // // $Id: SbMath.h,v 1.4 2006/06/29 21:20:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef HEPVis_SbMath_h #define HEPVis_SbMath_h diff --git a/source/visualization/OpenInventor/include/HEPVis/nodekits/SoDetectorTreeKit.h b/source/visualization/OpenInventor/include/HEPVis/nodekits/SoDetectorTreeKit.h index 4d2bca98eb..f1d9534945 100644 --- a/source/visualization/OpenInventor/include/HEPVis/nodekits/SoDetectorTreeKit.h +++ b/source/visualization/OpenInventor/include/HEPVis/nodekits/SoDetectorTreeKit.h @@ -25,7 +25,7 @@ // // // $Id: SoDetectorTreeKit.h,v 1.5 2006/06/29 21:21:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // /*-----------------------------HEPVis----------------------------------------*/ /* */ diff --git a/source/visualization/OpenInventor/include/HEPVis/nodes/SoBox.h b/source/visualization/OpenInventor/include/HEPVis/nodes/SoBox.h index 1388506080..5b36ac5e60 100644 --- a/source/visualization/OpenInventor/include/HEPVis/nodes/SoBox.h +++ b/source/visualization/OpenInventor/include/HEPVis/nodes/SoBox.h @@ -25,7 +25,7 @@ // // // $Id: SoBox.h,v 1.3 2006/06/29 21:21:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // /*-----------------------------Hepvis----------------------------------------*/ /* */ diff --git a/source/visualization/OpenInventor/include/HEPVis/nodes/SoCons.h b/source/visualization/OpenInventor/include/HEPVis/nodes/SoCons.h index 4a09156898..1ec9e64bb9 100644 --- a/source/visualization/OpenInventor/include/HEPVis/nodes/SoCons.h +++ b/source/visualization/OpenInventor/include/HEPVis/nodes/SoCons.h @@ -25,7 +25,7 @@ // // // $Id: SoCons.h,v 1.3 2006/06/29 21:21:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // /*-----------------------------Hepvis----------------------------------------*/ /* */ diff --git a/source/visualization/OpenInventor/include/HEPVis/nodes/SoTrap.h b/source/visualization/OpenInventor/include/HEPVis/nodes/SoTrap.h index f4fd2c8581..510456a566 100644 --- a/source/visualization/OpenInventor/include/HEPVis/nodes/SoTrap.h +++ b/source/visualization/OpenInventor/include/HEPVis/nodes/SoTrap.h @@ -25,7 +25,7 @@ // // // $Id: SoTrap.h,v 1.4 2006/06/29 21:22:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // /*-----------------------------Hepvis----------------------------------------*/ /* */ diff --git a/source/visualization/OpenInventor/include/HEPVis/nodes/SoTrd.h b/source/visualization/OpenInventor/include/HEPVis/nodes/SoTrd.h index 644dde7a67..0970bd18e0 100644 --- a/source/visualization/OpenInventor/include/HEPVis/nodes/SoTrd.h +++ b/source/visualization/OpenInventor/include/HEPVis/nodes/SoTrd.h @@ -25,7 +25,7 @@ // // // $Id: SoTrd.h,v 1.3 2006/06/29 21:22:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // /*-----------------------------Hepvis----------------------------------------*/ /* */ diff --git a/source/visualization/OpenInventor/include/HEPVis/nodes/SoTubs.h b/source/visualization/OpenInventor/include/HEPVis/nodes/SoTubs.h index 712a9cb4a0..c9cf3bc717 100644 --- a/source/visualization/OpenInventor/include/HEPVis/nodes/SoTubs.h +++ b/source/visualization/OpenInventor/include/HEPVis/nodes/SoTubs.h @@ -25,7 +25,7 @@ // // // $Id: SoTubs.h,v 1.3 2006/06/29 21:22:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // /*-----------------------------Hepvis----------------------------------------*/ /* */ diff --git a/source/visualization/modeling/include/G4AxesModel.icc b/source/visualization/OpenInventor/include/SoG4LineSet.h similarity index 81% rename from source/visualization/modeling/include/G4AxesModel.icc rename to source/visualization/OpenInventor/include/SoG4LineSet.h index 61be83c623..1cc48e7f99 100644 --- a/source/visualization/modeling/include/G4AxesModel.icc +++ b/source/visualization/OpenInventor/include/SoG4LineSet.h @@ -23,14 +23,19 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// $Id: SoG4LineSet.h,v 1.2 2006/12/13 15:49:51 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // -// $Id: G4AxesModel.icc,v 1.4 2006/06/29 21:30:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// John Allison 26th October 2006 +// Extended SoLineSet to include G4Atts. -inline G4String G4AxesModel::GetCurrentTag () const { - return fGlobalTag; -} +#ifndef SoG4LineSet_h +#define SoG4LineSet_h -inline G4String G4AxesModel::GetCurrentDescription () const { - return fGlobalDescription; -} +// Inheritance : +#include +#include "G4AttHolder.hh" + +class SoG4LineSet: public SoLineSet, public G4AttHolder {}; + +#endif //SoG4LineSet_h diff --git a/source/visualization/modeling/include/G4HitsModel.icc b/source/visualization/OpenInventor/include/SoG4MarkerSet.h similarity index 80% rename from source/visualization/modeling/include/G4HitsModel.icc rename to source/visualization/OpenInventor/include/SoG4MarkerSet.h index e252d84836..81e30b70e9 100644 --- a/source/visualization/modeling/include/G4HitsModel.icc +++ b/source/visualization/OpenInventor/include/SoG4MarkerSet.h @@ -23,14 +23,19 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// $Id: SoG4MarkerSet.h,v 1.2 2006/12/13 15:49:53 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // -// $Id: G4HitsModel.icc,v 1.7 2006/06/29 21:30:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// John Allison 26th October 2006 +// Extended SoMarkerSet to include G4Atts. -inline G4String G4HitsModel::GetCurrentTag () const { - return fGlobalTag; -} +#ifndef SoG4MarkerSet_h +#define SoG4MarkerSet_h -inline G4String G4HitsModel::GetCurrentDescription () const { - return fGlobalDescription; -} +// Inheritance : +#include +#include "G4AttHolder.hh" + +class SoG4MarkerSet: public SoMarkerSet, public G4AttHolder {}; + +#endif //SoG4MarkerSet_h diff --git a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02SteppingAction.hh b/source/visualization/OpenInventor/include/SoG4Polyhedron.h similarity index 75% rename from examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02SteppingAction.hh rename to source/visualization/OpenInventor/include/SoG4Polyhedron.h index 10ad7c756a..a052b10a09 100644 --- a/examples/extended/eventgenerator/HepMC/HepMCEx02-clhep/include/H02SteppingAction.hh +++ b/source/visualization/OpenInventor/include/SoG4Polyhedron.h @@ -23,23 +23,26 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// ==================================================================== // -// H02SteppingAction.hh -// $Id: H02SteppingAction.hh,v 1.3 2006/06/29 17:13:31 gunter Exp $ +// $Id: SoG4Polyhedron.h,v 1.2 2006/12/13 15:49:56 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // -// ==================================================================== -#ifndef H02_STEPPING_ACTION_H -#define H02_STEPPING_ACTION_H +// John Allison 26th October 2006 +// Extended Geant4_SoPolyhedron to include G4Atts. -#include "G4UserSteppingAction.hh" +#ifndef SoG4Polyhedron_h +#define SoG4Polyhedron_h -class H02SteppingAction : public G4UserSteppingAction { -public: - H02SteppingAction(); - virtual ~H02SteppingAction(); - - virtual void UserSteppingAction(const G4Step* astep); +// Inheritance : +#include +#include "G4AttHolder.hh" + +class G4Polyhedron; + +class SoG4Polyhedron: public Geant4_SoPolyhedron, public G4AttHolder { + public: + SoG4Polyhedron(const G4Polyhedron& polyhedron): + Geant4_SoPolyhedron(polyhedron){} }; -#endif +#endif //SoG4Polyhedron_h diff --git a/source/visualization/OpenInventor/src/G4OpenInventor.cc b/source/visualization/OpenInventor/src/G4OpenInventor.cc index 86f268a28a..68162e1ffe 100644 --- a/source/visualization/OpenInventor/src/G4OpenInventor.cc +++ b/source/visualization/OpenInventor/src/G4OpenInventor.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpenInventor.cc,v 1.20 2006/06/29 21:22:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifdef G4VIS_BUILD_OI_DRIVER diff --git a/source/visualization/OpenInventor/src/G4OpenInventorSceneHandler.cc b/source/visualization/OpenInventor/src/G4OpenInventorSceneHandler.cc index c5e6921991..4879dba750 100644 --- a/source/visualization/OpenInventor/src/G4OpenInventorSceneHandler.cc +++ b/source/visualization/OpenInventor/src/G4OpenInventorSceneHandler.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4OpenInventorSceneHandler.cc,v 1.46 2006/06/29 21:22:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4OpenInventorSceneHandler.cc,v 1.50 2006/11/05 20:48:57 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Jeff Kallenbach 01 Aug 1996 @@ -72,7 +72,9 @@ typedef HEPVis_SoMarkerSet SoMarkerSet; #include "HEPVis/nodekits/SoDetectorTreeKit.h" #include "HEPVis/misc/SoStyleCache.h" -#include "Geant4_SoPolyhedron.h" +#include "SoG4Polyhedron.h" +#include "SoG4LineSet.h" +#include "SoG4MarkerSet.h" #include "G4Scene.hh" #include "G4NURBS.hh" @@ -94,6 +96,11 @@ typedef HEPVis_SoMarkerSet SoMarkerSet; #include "G4Trap.hh" #include "G4Trd.hh" #include "G4PhysicalVolumeModel.hh" +#include "G4TrajectoriesModel.hh" +#include "G4VTrajectory.hh" +#include "G4VTrajectoryPoint.hh" +#include "G4HitsModel.hh" +#include "G4VHit.hh" #include "G4ModelingParameters.hh" #include "G4VPhysicalVolume.hh" #include "G4LogicalVolume.hh" @@ -181,6 +188,56 @@ void G4OpenInventorSceneHandler::BeginPrimitives } } +void G4OpenInventorSceneHandler::LoadAtts +(const G4Visible& visible, + G4AttHolder* holder) +{ + // Load G4Atts from G4VisAttributes, if any... + const std::map* vaDefs = + visible.GetVisAttributes()->GetAttDefs(); + if (vaDefs) { + holder->AddAtts(visible.GetVisAttributes()->CreateAttValues(), vaDefs); + } + + G4PhysicalVolumeModel* pPVModel = + dynamic_cast(fpModel); + if (pPVModel) { + // Load G4Atts from G4PhysicalVolumeModel... + const std::map* defs = pPVModel->GetAttDefs(); + if (defs) { + holder->AddAtts(pPVModel->CreateCurrentAttValues(), defs); + } + } + + G4TrajectoriesModel* trajModel = dynamic_cast(fpModel); + if (trajModel) { + // Load G4Atts from trajectory... + const G4VTrajectory* traj = trajModel->GetCurrentTrajectory(); + const std::map* defs = traj->GetAttDefs(); + if (defs) { + holder->AddAtts(traj->CreateAttValues(), defs); + } + G4int nPoints = traj->GetPointEntries(); + for (G4int i = 0; i < nPoints; ++i) { + G4VTrajectoryPoint* trajPoint = traj->GetPoint(i); + const std::map* defs = trajPoint->GetAttDefs(); + if (defs) { + holder->AddAtts(trajPoint->CreateAttValues(), defs); + } + } + } + + G4HitsModel* hitsModel = dynamic_cast(fpModel); + if (hitsModel) { + // Load G4Atts from hit... + const G4VHit* hit = hitsModel->GetCurrentHit(); + const std::map* defs = hit->GetAttDefs(); + if (defs) { + holder->AddAtts(hit->CreateAttValues(), defs); + } + } +} + // // Method for handling G4Polyline objects (from tracking). // @@ -220,12 +277,17 @@ void G4OpenInventorSceneHandler::AddPrimitive (const G4Polyline& line) { SoDrawStyle* drawStyle = fStyleCache->getLineStyle(); fCurrentSeparator->addChild(drawStyle); - SoLineSet *pLine = new SoLineSet; + SoG4LineSet *pLine = new SoG4LineSet; + + // Loads G4Atts for picking... + LoadAtts(line, pLine); + #ifdef INVENTOR2_0 pLine->numVertices.setValues(0,1,(const long *)&nPoints); #else pLine->numVertices.setValues(0,1,&nPoints); #endif + fCurrentSeparator->addChild(pLine); delete [] pCoords; @@ -269,9 +331,12 @@ void G4OpenInventorSceneHandler::AddPrimitive (const G4Polymarker& polymarker) { break; } - SoMarkerSet* markerSet = new SoMarkerSet; + SoG4MarkerSet* markerSet = new SoG4MarkerSet; markerSet->numPoints = pointn; + // Loads G4Atts for picking... + LoadAtts(polymarker, markerSet); + G4VMarker::FillStyle style = polymarker.GetFillStyle(); switch (polymarker.GetMarkerType()) { default: @@ -448,9 +513,13 @@ void G4OpenInventorSceneHandler::AddCircleSquare SoCoordinate3* coordinate3 = new SoCoordinate3; coordinate3->point.setValues(0,1,points); fCurrentSeparator->addChild(coordinate3); - SoMarkerSet* markerSet = new SoMarkerSet; + + SoG4MarkerSet* markerSet = new SoG4MarkerSet; markerSet->numPoints = 1; + // Loads G4Atts for picking... + LoadAtts(marker, markerSet); + G4VMarker::FillStyle style = marker.GetFillStyle(); switch (markerType) { case G4OICircle: @@ -507,11 +576,17 @@ void G4OpenInventorSceneHandler::AddCircleSquare void G4OpenInventorSceneHandler::AddPrimitive (const G4Polyhedron& polyhedron) { if (polyhedron.GetNoFacets() == 0) return; - Geant4_SoPolyhedron* soPolyhedron = new Geant4_SoPolyhedron(polyhedron); + SoG4Polyhedron* soPolyhedron = new SoG4Polyhedron(polyhedron); + + // Loads G4Atts for picking... + LoadAtts(polyhedron, soPolyhedron); + SbString name = "Non-geometry"; G4PhysicalVolumeModel* pPVModel = dynamic_cast(fpModel); - if (pPVModel) name = pPVModel->GetCurrentLV()->GetName().c_str(); + if (pPVModel) { + name = pPVModel->GetCurrentLV()->GetName().c_str(); + } SbName sbName(name); soPolyhedron->setName(sbName); soPolyhedron->solid.setValue(fModelingSolid); @@ -658,6 +733,7 @@ void G4OpenInventorSceneHandler::GeneratePrerequisites() G4VPhysicalVolume* pCurrentPV = pPVModel->GetCurrentPV(); G4LogicalVolume* pCurrentLV = pPVModel->GetCurrentLV(); //G4Material* pCurrentMaterial = pPVModel->GetCurrentMaterial(); + // Note: pCurrentMaterial may be zero (parallel world). // The simplest algorithm, used by the Open Inventor Driver // developers, is to rely on the fact the G4PhysicalVolumeModel diff --git a/source/visualization/OpenInventor/src/G4OpenInventorTransform3D.cc b/source/visualization/OpenInventor/src/G4OpenInventorTransform3D.cc index 96ca5dfce9..0e368dd369 100644 --- a/source/visualization/OpenInventor/src/G4OpenInventorTransform3D.cc +++ b/source/visualization/OpenInventor/src/G4OpenInventorTransform3D.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpenInventorTransform3D.cc,v 1.8 2006/06/29 21:22:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // jck 17 Dec 1996 diff --git a/source/visualization/OpenInventor/src/G4OpenInventorViewer.cc b/source/visualization/OpenInventor/src/G4OpenInventorViewer.cc index 6863d2aed9..7874c27b9c 100644 --- a/source/visualization/OpenInventor/src/G4OpenInventorViewer.cc +++ b/source/visualization/OpenInventor/src/G4OpenInventorViewer.cc @@ -23,6 +23,9 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // +// $Id: G4OpenInventorViewer.cc,v 1.57 2006/11/01 11:06:07 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ + #ifdef G4VIS_BUILD_OI_DRIVER // this : @@ -46,6 +49,10 @@ #include "G4VInteractorManager.hh" #include "G4Scene.hh" #include "Geant4_SoPolyhedron.h" +#include "G4AttValue.hh" +#include "G4AttDef.hh" +#include "G4AttCheck.hh" +#include "G4AttHolder.hh" G4OpenInventorViewer::G4OpenInventorViewer( G4OpenInventorSceneHandler& sceneHandler @@ -151,19 +158,23 @@ G4bool G4OpenInventorViewer::CompareForKernelVisit(G4ViewParameters& vp) { if ( (vp.GetDrawingStyle () != fVP.GetDrawingStyle ()) || + (vp.IsAuxEdgeVisible () != fVP.IsAuxEdgeVisible ()) || (vp.GetRepStyle () != fVP.GetRepStyle ()) || (vp.IsCulling () != fVP.IsCulling ()) || (vp.IsCullingInvisible () != fVP.IsCullingInvisible ()) || (vp.IsDensityCulling () != fVP.IsDensityCulling ()) || (vp.IsCullingCovered () != fVP.IsCullingCovered ()) || (vp.IsSection () != fVP.IsSection ()) || - // No need to visit kernel if section plane changes. (vp.IsCutaway () != fVP.IsCutaway ()) || - (vp.GetCutawayPlanes ().size () != - fVP.GetCutawayPlanes ().size ()) || - // No need to visit kernel if cutaway planes change. + // This assumes use of generic clipping (sectioning, slicing, + // DCUT, cutaway). If a decision is made to implement locally, + // this will need changing. See G4OpenGLViewer::SetView, + // G4OpenGLStoredViewer.cc::CompareForKernelVisit and + // G4OpenGLStoredSceneHander::CreateSection/CutawayPolyhedron. (vp.IsExplode () != fVP.IsExplode ()) || - (vp.GetNoOfSides () != fVP.GetNoOfSides ()) + (vp.GetNoOfSides () != fVP.GetNoOfSides ()) || + (vp.IsMarkerNotHidden () != fVP.IsMarkerNotHidden ()) || + (vp.GetBackgroundColour ()!= fVP.GetBackgroundColour ()) ) { return true;; } @@ -171,6 +182,18 @@ G4bool G4OpenInventorViewer::CompareForKernelVisit(G4ViewParameters& vp) { (vp.GetVisibleDensity () != fVP.GetVisibleDensity ())) return true; + if (vp.IsSection () && + (vp.GetSectionPlane () != fVP.GetSectionPlane ())) + return true; + + if (vp.IsCutaway ()) { + if (vp.GetCutawayPlanes ().size () != + fVP.GetCutawayPlanes ().size ()) return true; + for (size_t i = 0; i < vp.GetCutawayPlanes().size(); ++i) + if (vp.GetCutawayPlanes()[i] != fVP.GetCutawayPlanes()[i]) + return true; + } + if (vp.IsExplode () && (vp.GetExplodeFactor () != fVP.GetExplodeFactor ())) return true; @@ -385,13 +408,22 @@ void G4OpenInventorViewer::SelectionCB( { G4OpenInventorViewer* This = (G4OpenInventorViewer*)aThis; SoNode* node = ((SoFullPath*)aPath)->getTail(); - G4String name((char*)node->getName().getString()); - G4String cls((char*)node->getTypeId().getName().getString()); - G4cout << "SoNode : " << node - << " SoType : " << cls - << " name : " << name - << G4endl; -/*FIXME : to explore + G4AttHolder* attHolder = dynamic_cast(node); + if(attHolder && attHolder->GetAttDefs().size()) { + for (size_t i = 0; i < attHolder->GetAttDefs().size(); ++i) { + G4cout << G4AttCheck(attHolder->GetAttValues()[i], + attHolder->GetAttDefs()[i]); + } + } else { + G4String name((char*)node->getName().getString()); + G4String cls((char*)node->getTypeId().getName().getString()); + G4cout << "SoNode : " << node + << " SoType : " << cls + << " name : " << name + << G4endl; + G4cout << "No attributes attached." << G4endl; + } + /*FIXME : to explore (need different button - this is used for picking. if(node->isOfType(Geant4_SoPolyhedron::getClassTypeId())) { Geant4_SoPolyhedron* polyhedron = (Geant4_SoPolyhedron*)node; if(polyhedron->solid.getValue()==FALSE) diff --git a/source/visualization/OpenInventor/src/G4OpenInventorWin.cc b/source/visualization/OpenInventor/src/G4OpenInventorWin.cc index 8b6c8da540..f8b4453d4e 100644 --- a/source/visualization/OpenInventor/src/G4OpenInventorWin.cc +++ b/source/visualization/OpenInventor/src/G4OpenInventorWin.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpenInventorWin.cc,v 1.6 2006/06/29 21:22:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // OpenInventor graphics system factory. diff --git a/source/visualization/OpenInventor/src/G4OpenInventorWinViewer.cc b/source/visualization/OpenInventor/src/G4OpenInventorWinViewer.cc index 013c7b7f22..5369a69a8a 100644 --- a/source/visualization/OpenInventor/src/G4OpenInventorWinViewer.cc +++ b/source/visualization/OpenInventor/src/G4OpenInventorWinViewer.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpenInventorWinViewer.cc,v 1.25 2006/06/29 21:22:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // /* * jck : 05 Feb 1997 : Initial Implementation diff --git a/source/visualization/OpenInventor/src/G4OpenInventorXt.cc b/source/visualization/OpenInventor/src/G4OpenInventorXt.cc index 93728c5aaf..4dc93c4bfb 100644 --- a/source/visualization/OpenInventor/src/G4OpenInventorXt.cc +++ b/source/visualization/OpenInventor/src/G4OpenInventorXt.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpenInventorXt.cc,v 1.4 2006/06/29 21:22:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Jeff Kallenbach 01 Aug 1996 diff --git a/source/visualization/OpenInventor/src/G4OpenInventorXtViewer.cc b/source/visualization/OpenInventor/src/G4OpenInventorXtViewer.cc index 389e2cc974..c554aa729b 100644 --- a/source/visualization/OpenInventor/src/G4OpenInventorXtViewer.cc +++ b/source/visualization/OpenInventor/src/G4OpenInventorXtViewer.cc @@ -25,7 +25,7 @@ // // // $Id: G4OpenInventorXtViewer.cc,v 1.24 2006/06/29 21:22:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // /* * jck 05 Feb 1997 - Initial Implementation diff --git a/source/visualization/OpenInventor/src/SoBox.cc b/source/visualization/OpenInventor/src/SoBox.cc index 8074c8f26d..57b39a3692 100644 --- a/source/visualization/OpenInventor/src/SoBox.cc +++ b/source/visualization/OpenInventor/src/SoBox.cc @@ -26,7 +26,7 @@ // // // $Id: SoBox.cc,v 1.8 2006/06/29 21:22:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // /*----------------------------HEPVis----------------------------------------*/ /* */ diff --git a/source/visualization/OpenInventor/src/SoCons.cc b/source/visualization/OpenInventor/src/SoCons.cc index be3fd1ae96..4956eab7a0 100644 --- a/source/visualization/OpenInventor/src/SoCons.cc +++ b/source/visualization/OpenInventor/src/SoCons.cc @@ -26,7 +26,7 @@ // // // $Id: SoCons.cc,v 1.8 2006/06/29 21:22:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // /*-----------------------------HEPVis---------------------------------------*/ /* */ diff --git a/source/visualization/OpenInventor/src/SoDetectorTreeKit.cc b/source/visualization/OpenInventor/src/SoDetectorTreeKit.cc index 5ecbbfd1e5..924d1c00fc 100644 --- a/source/visualization/OpenInventor/src/SoDetectorTreeKit.cc +++ b/source/visualization/OpenInventor/src/SoDetectorTreeKit.cc @@ -26,7 +26,7 @@ // // // $Id: SoDetectorTreeKit.cc,v 1.13 2006/06/29 21:22:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // /*-----------------------------HEPVis----------------------------------------*/ /* */ diff --git a/source/visualization/OpenInventor/src/SoTrap.cc b/source/visualization/OpenInventor/src/SoTrap.cc index 5d42b09572..34fe4794bd 100644 --- a/source/visualization/OpenInventor/src/SoTrap.cc +++ b/source/visualization/OpenInventor/src/SoTrap.cc @@ -26,7 +26,7 @@ // // // $Id: SoTrap.cc,v 1.8 2006/06/29 21:23:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // /*-----------------------------HEPVis----------------------------------------*/ /* */ diff --git a/source/visualization/OpenInventor/src/SoTrd.cc b/source/visualization/OpenInventor/src/SoTrd.cc index 495bccdf02..ca759df8fa 100644 --- a/source/visualization/OpenInventor/src/SoTrd.cc +++ b/source/visualization/OpenInventor/src/SoTrd.cc @@ -26,7 +26,7 @@ // // // $Id: SoTrd.cc,v 1.8 2006/06/29 21:23:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // /*-----------------------------HEPVis---------------------------------------*/ /* */ diff --git a/source/visualization/OpenInventor/src/SoTubs.cc b/source/visualization/OpenInventor/src/SoTubs.cc index 00261915f3..92d10f4300 100644 --- a/source/visualization/OpenInventor/src/SoTubs.cc +++ b/source/visualization/OpenInventor/src/SoTubs.cc @@ -26,7 +26,7 @@ // // // $Id: SoTubs.cc,v 1.8 2006/06/29 21:23:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // /*-----------------------------HEPVis---------------------------------------*/ /* */ diff --git a/source/visualization/RayTracer/History b/source/visualization/RayTracer/History index 4517eeefe3..f5129568c2 100644 --- a/source/visualization/RayTracer/History +++ b/source/visualization/RayTracer/History @@ -1,4 +1,4 @@ -$Id: History,v 1.46 2006/05/12 12:43:43 allison Exp $ +$Id: History,v 1.49 2006/11/17 21:34:12 perl Exp $ ------------------------------------------------------------------- ========================================================= @@ -24,6 +24,21 @@ committal in the CVS repository ! History file for Ray Tracer category --------------------------------------- +17th November 2006 Joseph Perl (raytracer-V08-01-02) +- Deprecate /vis/rayTracer/backgroundColour. +- Hasn't worked for some time anyway. +- Users are instead referred to /vis/viewer/set/background. + +14th November 2006 John Allison (raytracer-V08-01-01) +- Merged raytracer-V08-01-00-branch onto main branch. + +11th November 2006 John Allison (raytracer-V08-01-00-00) +- Followed change to G4Scene. + +14th August 2006 John Allison (raytracer-V08-01-00) +- G4RayTracerSceneHandler.cc: Added world to dummy scene to improve + robustness when under control of vis manager. + 12th May 2006 John Allison (raytracer-V08-00-04) - SetRecomputeTransients(false). diff --git a/source/visualization/RayTracer/include/G4RTJpeg.hh b/source/visualization/RayTracer/include/G4RTJpeg.hh index 5bee835a3b..3155b07859 100644 --- a/source/visualization/RayTracer/include/G4RTJpeg.hh +++ b/source/visualization/RayTracer/include/G4RTJpeg.hh @@ -25,7 +25,7 @@ // // // $Id: G4RTJpeg.hh,v 1.6 2006/06/29 21:23:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/visualization/RayTracer/include/G4RTJpegCoder.hh b/source/visualization/RayTracer/include/G4RTJpegCoder.hh index 85924d3f31..1d320fc7ab 100644 --- a/source/visualization/RayTracer/include/G4RTJpegCoder.hh +++ b/source/visualization/RayTracer/include/G4RTJpegCoder.hh @@ -25,7 +25,7 @@ // // // $Id: G4RTJpegCoder.hh,v 1.6 2006/06/29 21:23:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/visualization/RayTracer/include/G4RTJpegCoderTables.hh b/source/visualization/RayTracer/include/G4RTJpegCoderTables.hh index b0c93345f1..160807956b 100644 --- a/source/visualization/RayTracer/include/G4RTJpegCoderTables.hh +++ b/source/visualization/RayTracer/include/G4RTJpegCoderTables.hh @@ -25,7 +25,7 @@ // // // $Id: G4RTJpegCoderTables.hh,v 1.6 2006/06/29 21:23:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // class description: diff --git a/source/visualization/RayTracer/include/G4RTJpegMaker.hh b/source/visualization/RayTracer/include/G4RTJpegMaker.hh index 18a0c30249..00f2c9b94b 100644 --- a/source/visualization/RayTracer/include/G4RTJpegMaker.hh +++ b/source/visualization/RayTracer/include/G4RTJpegMaker.hh @@ -25,7 +25,7 @@ // // // $Id: G4RTJpegMaker.hh,v 1.6 2006/06/29 21:23:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/visualization/RayTracer/include/G4RTMessenger.hh b/source/visualization/RayTracer/include/G4RTMessenger.hh index 3850576bb2..eb0b865b5b 100644 --- a/source/visualization/RayTracer/include/G4RTMessenger.hh +++ b/source/visualization/RayTracer/include/G4RTMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: G4RTMessenger.hh,v 1.7 2006/06/29 21:23:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/visualization/RayTracer/include/G4RTOutBitStream.hh b/source/visualization/RayTracer/include/G4RTOutBitStream.hh index bc88d6e2e2..4f531ca31d 100644 --- a/source/visualization/RayTracer/include/G4RTOutBitStream.hh +++ b/source/visualization/RayTracer/include/G4RTOutBitStream.hh @@ -25,7 +25,7 @@ // // // $Id: G4RTOutBitStream.hh,v 1.7 2006/06/29 21:23:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/visualization/RayTracer/include/G4RTSimpleScanner.hh b/source/visualization/RayTracer/include/G4RTSimpleScanner.hh index 7f86cc4521..eca2759946 100644 --- a/source/visualization/RayTracer/include/G4RTSimpleScanner.hh +++ b/source/visualization/RayTracer/include/G4RTSimpleScanner.hh @@ -25,7 +25,7 @@ // // // $Id: G4RTSimpleScanner.hh,v 1.3 2006/06/29 21:23:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/visualization/RayTracer/include/G4RTSteppingAction.hh b/source/visualization/RayTracer/include/G4RTSteppingAction.hh index 8f18817bda..d7297297f3 100644 --- a/source/visualization/RayTracer/include/G4RTSteppingAction.hh +++ b/source/visualization/RayTracer/include/G4RTSteppingAction.hh @@ -25,7 +25,7 @@ // // // $Id: G4RTSteppingAction.hh,v 1.5 2006/06/29 21:23:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/visualization/RayTracer/include/G4RTTrackingAction.hh b/source/visualization/RayTracer/include/G4RTTrackingAction.hh index 66143a02d2..2bc1fae372 100644 --- a/source/visualization/RayTracer/include/G4RTTrackingAction.hh +++ b/source/visualization/RayTracer/include/G4RTTrackingAction.hh @@ -25,7 +25,7 @@ // // // $Id: G4RTTrackingAction.hh,v 1.6 2006/06/29 21:23:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/visualization/RayTracer/include/G4RTXScanner.hh b/source/visualization/RayTracer/include/G4RTXScanner.hh index 50a4d125de..077b19dbc3 100644 --- a/source/visualization/RayTracer/include/G4RTXScanner.hh +++ b/source/visualization/RayTracer/include/G4RTXScanner.hh @@ -25,7 +25,7 @@ // // // $Id: G4RTXScanner.hh,v 1.4 2006/06/29 21:23:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/visualization/RayTracer/include/G4RayTracer.hh b/source/visualization/RayTracer/include/G4RayTracer.hh index b44ba4ce27..41c9be564e 100644 --- a/source/visualization/RayTracer/include/G4RayTracer.hh +++ b/source/visualization/RayTracer/include/G4RayTracer.hh @@ -25,7 +25,7 @@ // // // $Id: G4RayTracer.hh,v 1.11 2006/06/29 21:23:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/visualization/RayTracer/include/G4RayTracerFeatures.hh b/source/visualization/RayTracer/include/G4RayTracerFeatures.hh index cbfab9140d..5b6140e535 100644 --- a/source/visualization/RayTracer/include/G4RayTracerFeatures.hh +++ b/source/visualization/RayTracer/include/G4RayTracerFeatures.hh @@ -25,7 +25,7 @@ // // // $Id: G4RayTracerFeatures.hh,v 1.4 2006/06/29 21:23:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/visualization/RayTracer/include/G4RayTracerSceneHandler.hh b/source/visualization/RayTracer/include/G4RayTracerSceneHandler.hh index b9b2167771..d5702af01f 100644 --- a/source/visualization/RayTracer/include/G4RayTracerSceneHandler.hh +++ b/source/visualization/RayTracer/include/G4RayTracerSceneHandler.hh @@ -25,7 +25,7 @@ // // // $Id: G4RayTracerSceneHandler.hh,v 1.11 2006/06/29 21:23:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // John Allison 17th March 2000 diff --git a/source/visualization/RayTracer/include/G4RayTracerViewer.hh b/source/visualization/RayTracer/include/G4RayTracerViewer.hh index 0b8bfabb35..94c37b2a50 100644 --- a/source/visualization/RayTracer/include/G4RayTracerViewer.hh +++ b/source/visualization/RayTracer/include/G4RayTracerViewer.hh @@ -25,7 +25,7 @@ // // // $Id: G4RayTracerViewer.hh,v 1.7 2006/06/29 21:23:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // John Allison 17th March 2000 diff --git a/source/visualization/RayTracer/include/G4RayTracerX.hh b/source/visualization/RayTracer/include/G4RayTracerX.hh index 5812feeae1..ab6f7492fd 100644 --- a/source/visualization/RayTracer/include/G4RayTracerX.hh +++ b/source/visualization/RayTracer/include/G4RayTracerX.hh @@ -25,7 +25,7 @@ // // // $Id: G4RayTracerX.hh,v 1.4 2006/06/29 21:23:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 11th September 2003 diff --git a/source/visualization/RayTracer/include/G4RayTracerXViewer.hh b/source/visualization/RayTracer/include/G4RayTracerXViewer.hh index 5450a8c0cc..0633059287 100644 --- a/source/visualization/RayTracer/include/G4RayTracerXViewer.hh +++ b/source/visualization/RayTracer/include/G4RayTracerXViewer.hh @@ -25,7 +25,7 @@ // // // $Id: G4RayTracerXViewer.hh,v 1.3 2006/06/29 21:23:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // John Allison 17th March 2000 diff --git a/source/visualization/RayTracer/include/G4RayTrajectory.hh b/source/visualization/RayTracer/include/G4RayTrajectory.hh index b9b54792f5..5359483d58 100644 --- a/source/visualization/RayTracer/include/G4RayTrajectory.hh +++ b/source/visualization/RayTracer/include/G4RayTrajectory.hh @@ -25,7 +25,7 @@ // // // $Id: G4RayTrajectory.hh,v 1.15 2006/06/29 21:23:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/visualization/RayTracer/include/G4RayTrajectoryPoint.hh b/source/visualization/RayTracer/include/G4RayTrajectoryPoint.hh index 5cd4ecef26..dbb46203e8 100644 --- a/source/visualization/RayTracer/include/G4RayTrajectoryPoint.hh +++ b/source/visualization/RayTracer/include/G4RayTrajectoryPoint.hh @@ -25,7 +25,7 @@ // // // $Id: G4RayTrajectoryPoint.hh,v 1.9 2006/06/29 21:23:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/visualization/RayTracer/include/G4TheRayTracer.hh b/source/visualization/RayTracer/include/G4TheRayTracer.hh index d4aa14f628..2547fd7590 100644 --- a/source/visualization/RayTracer/include/G4TheRayTracer.hh +++ b/source/visualization/RayTracer/include/G4TheRayTracer.hh @@ -25,7 +25,7 @@ // // // $Id: G4TheRayTracer.hh,v 1.3 2006/06/29 21:23:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/visualization/RayTracer/include/G4VFigureFileMaker.hh b/source/visualization/RayTracer/include/G4VFigureFileMaker.hh index f77ccf315a..ba7671285b 100644 --- a/source/visualization/RayTracer/include/G4VFigureFileMaker.hh +++ b/source/visualization/RayTracer/include/G4VFigureFileMaker.hh @@ -25,7 +25,7 @@ // // // $Id: G4VFigureFileMaker.hh,v 1.5 2006/06/29 21:23:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/visualization/RayTracer/include/G4VRTScanner.hh b/source/visualization/RayTracer/include/G4VRTScanner.hh index e4b857634d..202bf4cf4c 100644 --- a/source/visualization/RayTracer/include/G4VRTScanner.hh +++ b/source/visualization/RayTracer/include/G4VRTScanner.hh @@ -25,7 +25,7 @@ // // // $Id: G4VRTScanner.hh,v 1.5 2006/06/29 21:23:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/visualization/RayTracer/src/G4RTJpegCoder.cc b/source/visualization/RayTracer/src/G4RTJpegCoder.cc index 903fd87a0f..1ed07cccdb 100644 --- a/source/visualization/RayTracer/src/G4RTJpegCoder.cc +++ b/source/visualization/RayTracer/src/G4RTJpegCoder.cc @@ -25,7 +25,7 @@ // // // $Id: G4RTJpegCoder.cc,v 1.6 2006/06/29 21:23:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // diff --git a/source/visualization/RayTracer/src/G4RTJpegMaker.cc b/source/visualization/RayTracer/src/G4RTJpegMaker.cc index 821ff63a24..b75ac48a53 100644 --- a/source/visualization/RayTracer/src/G4RTJpegMaker.cc +++ b/source/visualization/RayTracer/src/G4RTJpegMaker.cc @@ -25,7 +25,7 @@ // // // $Id: G4RTJpegMaker.cc,v 1.10 2006/06/29 21:23:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // diff --git a/source/visualization/RayTracer/src/G4RTMessenger.cc b/source/visualization/RayTracer/src/G4RTMessenger.cc index 8d7679b28f..b933119569 100644 --- a/source/visualization/RayTracer/src/G4RTMessenger.cc +++ b/source/visualization/RayTracer/src/G4RTMessenger.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4RTMessenger.cc,v 1.9 2006/06/29 21:23:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4RTMessenger.cc,v 1.10 2006/11/17 21:34:12 perl Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // @@ -133,7 +133,7 @@ G4RTMessenger::G4RTMessenger(G4TheRayTracer* p1,G4RTSteppingAction* p2) transCmd->SetDefaultValue(false); bkgColCmd = new G4UIcmdWith3Vector("/vis/rayTracer/backgroundColour",this); - bkgColCmd->SetGuidance("Set background colour: red green blue: range 0.->1."); bkgColCmd->SetGuidance("E.g: /vis/rayTracer/backgroundColour 0 0 0"); + bkgColCmd->SetGuidance("Command has been deprecated. Use /vis/viewer/set/background instead."); bkgColCmd->SetParameterName("red","green","blue",true); bkgColCmd->SetDefaultValue(G4ThreeVector(1.,1.,1.)); } @@ -227,7 +227,11 @@ void G4RTMessenger::SetNewValue(G4UIcommand * command,G4String newValue) else if(command==distCmd) { theTracer->SetDistortion(distCmd->GetNewBoolValue(newValue)); } else if(command==bkgColCmd) - { theTracer->SetBackgroundColour(bkgColCmd->GetNew3VectorValue(newValue)); } + { + G4cout << "WARNING: /vis/rayTracer/backgroundColour has been deprecated." + "\n Use \"/vis/viewer/set/background\" instead." + << G4endl; + } else if(command==transCmd) { theSteppingAction->SetIgnoreTransparency(transCmd->GetNewBoolValue(newValue)); } else if(command==fileCmd) diff --git a/source/visualization/RayTracer/src/G4RTOutBitStream.cc b/source/visualization/RayTracer/src/G4RTOutBitStream.cc index dd45f8d8e0..314b13733e 100644 --- a/source/visualization/RayTracer/src/G4RTOutBitStream.cc +++ b/source/visualization/RayTracer/src/G4RTOutBitStream.cc @@ -25,7 +25,7 @@ // // // $Id: G4RTOutBitStream.cc,v 1.5 2006/06/29 21:24:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // diff --git a/source/visualization/RayTracer/src/G4RTSimpleScanner.cc b/source/visualization/RayTracer/src/G4RTSimpleScanner.cc index 67cbd5d4b6..97409b82a3 100644 --- a/source/visualization/RayTracer/src/G4RTSimpleScanner.cc +++ b/source/visualization/RayTracer/src/G4RTSimpleScanner.cc @@ -25,7 +25,7 @@ // // // $Id: G4RTSimpleScanner.cc,v 1.3 2006/06/29 21:24:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/visualization/RayTracer/src/G4RTSteppingAction.cc b/source/visualization/RayTracer/src/G4RTSteppingAction.cc index 4e291118d7..1ea8356186 100644 --- a/source/visualization/RayTracer/src/G4RTSteppingAction.cc +++ b/source/visualization/RayTracer/src/G4RTSteppingAction.cc @@ -25,7 +25,7 @@ // // // $Id: G4RTSteppingAction.cc,v 1.7 2006/06/29 21:24:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // diff --git a/source/visualization/RayTracer/src/G4RTTrackingAction.cc b/source/visualization/RayTracer/src/G4RTTrackingAction.cc index 88cce02ffb..54e7b76bf1 100644 --- a/source/visualization/RayTracer/src/G4RTTrackingAction.cc +++ b/source/visualization/RayTracer/src/G4RTTrackingAction.cc @@ -25,7 +25,7 @@ // // // $Id: G4RTTrackingAction.cc,v 1.5 2006/06/29 21:24:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // diff --git a/source/visualization/RayTracer/src/G4RTXScanner.cc b/source/visualization/RayTracer/src/G4RTXScanner.cc index 31a38407fa..ff68c74d44 100644 --- a/source/visualization/RayTracer/src/G4RTXScanner.cc +++ b/source/visualization/RayTracer/src/G4RTXScanner.cc @@ -25,7 +25,7 @@ // // // $Id: G4RTXScanner.cc,v 1.4 2006/06/29 21:24:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/visualization/RayTracer/src/G4RayTracer.cc b/source/visualization/RayTracer/src/G4RayTracer.cc index be4981239a..e48709c183 100644 --- a/source/visualization/RayTracer/src/G4RayTracer.cc +++ b/source/visualization/RayTracer/src/G4RayTracer.cc @@ -25,7 +25,7 @@ // // // $Id: G4RayTracer.cc,v 1.21 2006/06/29 21:24:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4RayTracer.hh" #include "G4RayTracerFeatures.hh" diff --git a/source/visualization/RayTracer/src/G4RayTracerSceneHandler.cc b/source/visualization/RayTracer/src/G4RayTracerSceneHandler.cc index 6207d78d54..81bdf3f7c0 100644 --- a/source/visualization/RayTracer/src/G4RayTracerSceneHandler.cc +++ b/source/visualization/RayTracer/src/G4RayTracerSceneHandler.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4RayTracerSceneHandler.cc,v 1.8 2006/06/29 21:24:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4RayTracerSceneHandler.cc,v 1.10 2006/11/14 14:46:37 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4RayTracerSceneHandler.hh" #include "G4VisManager.hh" @@ -45,10 +45,11 @@ G4RayTracerSceneHandler::G4RayTracerSceneHandler(G4VGraphicsSystem& system, if (!pScene) { // Create new scene like /vis/scene/create... fpScene = new G4Scene("dummy-ray-tracer-scene"); + // Add dummy run-duration model to avoid world being added and + // notifyHandler being invoked... + fpScene->AddWorldIfEmpty(); // Avoid code triggered at end of events... fpScene->SetRefreshAtEndOfEvent(false); - // Avoid re-computing transients. - fpScene->SetRecomputeTransients(false); // Add to vis manager list; ownership thereby passes to vis manager... visManager->SetSceneList().push_back(fpScene); // ...and make current... diff --git a/source/visualization/RayTracer/src/G4RayTracerViewer.cc b/source/visualization/RayTracer/src/G4RayTracerViewer.cc index 7a112d8b1d..994f8f930c 100644 --- a/source/visualization/RayTracer/src/G4RayTracerViewer.cc +++ b/source/visualization/RayTracer/src/G4RayTracerViewer.cc @@ -25,7 +25,7 @@ // // // $Id: G4RayTracerViewer.cc,v 1.16 2006/06/29 21:24:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4RayTracerViewer.hh" diff --git a/source/visualization/RayTracer/src/G4RayTracerX.cc b/source/visualization/RayTracer/src/G4RayTracerX.cc index aaf99fdc0b..55387a72e3 100644 --- a/source/visualization/RayTracer/src/G4RayTracerX.cc +++ b/source/visualization/RayTracer/src/G4RayTracerX.cc @@ -25,7 +25,7 @@ // // // $Id: G4RayTracerX.cc,v 1.5 2006/06/29 21:24:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // diff --git a/source/visualization/RayTracer/src/G4RayTracerXViewer.cc b/source/visualization/RayTracer/src/G4RayTracerXViewer.cc index 09ace6c241..6f541feadd 100644 --- a/source/visualization/RayTracer/src/G4RayTracerXViewer.cc +++ b/source/visualization/RayTracer/src/G4RayTracerXViewer.cc @@ -25,7 +25,7 @@ // // // $Id: G4RayTracerXViewer.cc,v 1.5 2006/06/29 21:24:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #ifdef G4VIS_BUILD_RAYTRACERX_DRIVER diff --git a/source/visualization/RayTracer/src/G4RayTrajectory.cc b/source/visualization/RayTracer/src/G4RayTrajectory.cc index 4ee217d4b5..36fb5b0622 100644 --- a/source/visualization/RayTracer/src/G4RayTrajectory.cc +++ b/source/visualization/RayTracer/src/G4RayTrajectory.cc @@ -25,7 +25,7 @@ // // // $Id: G4RayTrajectory.cc,v 1.15 2006/06/29 21:24:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // diff --git a/source/visualization/RayTracer/src/G4RayTrajectoryPoint.cc b/source/visualization/RayTracer/src/G4RayTrajectoryPoint.cc index 0cdd358f36..a87e6e713a 100644 --- a/source/visualization/RayTracer/src/G4RayTrajectoryPoint.cc +++ b/source/visualization/RayTracer/src/G4RayTrajectoryPoint.cc @@ -25,7 +25,7 @@ // // // $Id: G4RayTrajectoryPoint.cc,v 1.6 2006/06/29 21:24:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // diff --git a/source/visualization/RayTracer/src/G4TheRayTracer.cc b/source/visualization/RayTracer/src/G4TheRayTracer.cc index b50f364161..755b153ff0 100644 --- a/source/visualization/RayTracer/src/G4TheRayTracer.cc +++ b/source/visualization/RayTracer/src/G4TheRayTracer.cc @@ -25,7 +25,7 @@ // // // $Id: G4TheRayTracer.cc,v 1.3 2006/06/29 21:24:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // diff --git a/source/visualization/Tree/GNUmakefile b/source/visualization/Tree/GNUmakefile index f28de06b9a..0caa67553c 100644 --- a/source/visualization/Tree/GNUmakefile +++ b/source/visualization/Tree/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.5 2005/02/15 14:50:36 johna Exp $ +# $Id: GNUmakefile,v 1.6 2006/11/05 20:45:45 allison Exp $ name := G4Tree @@ -24,6 +24,7 @@ CPPFLAGS += -I$(G4BASE)/global/HEPGeometry/include CPPFLAGS += -I$(G4BASE)/graphics_reps/include CPPFLAGS += -I$(G4BASE)/intercoms/include CPPFLAGS += -I$(G4BASE)/geometry/management/include +CPPFLAGS += -I$(G4BASE)/geometry/navigation/include CPPFLAGS += -I$(G4BASE)/geometry/volumes/include CPPFLAGS += -I$(G4BASE)/geometry/solids/CSG/include CPPFLAGS += -I$(G4BASE)/geometry/solids/specific/include diff --git a/source/visualization/Tree/History b/source/visualization/Tree/History index cd86bad33d..c4af78da36 100644 --- a/source/visualization/Tree/History +++ b/source/visualization/Tree/History @@ -1,4 +1,4 @@ -$Id: History,v 1.24 2006/05/04 15:05:33 allison Exp $ +$Id: History,v 1.27 2006/11/05 20:46:32 allison Exp $ ------------------------------------------------------------------- ========================================================= @@ -24,6 +24,15 @@ committal in the CVS repository ! History file for visualization/Tree sub-category ------------------------------------------------ +5th November 2006 John Allison (vistree-V08-01-02) +- Protected against zero material pointer. + +1st November 2006 John Allison (vistree-V08-01-01) +- G4ASCIITreeSceneHandler.cc: Added printing of material name. + +3rd July 2006 John Allison (vistree-V08-01-00) +- G4ASCIITreeSceneHandler.cc: Layout improvement. + 4th May 2006 John Allison (vistree-V08-00-04) - Improved protection for null models and parameters. diff --git a/source/visualization/Tree/include/G4ASCIITree.hh b/source/visualization/Tree/include/G4ASCIITree.hh index 383ac2b9e6..3a38d66a5e 100644 --- a/source/visualization/Tree/include/G4ASCIITree.hh +++ b/source/visualization/Tree/include/G4ASCIITree.hh @@ -25,7 +25,7 @@ // // // $Id: G4ASCIITree.hh,v 1.7 2006/06/29 21:24:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 5th April 2001 diff --git a/source/visualization/Tree/include/G4ASCIITreeMessenger.hh b/source/visualization/Tree/include/G4ASCIITreeMessenger.hh index 16f07ee5b6..a6e7cbb638 100644 --- a/source/visualization/Tree/include/G4ASCIITreeMessenger.hh +++ b/source/visualization/Tree/include/G4ASCIITreeMessenger.hh @@ -25,7 +25,7 @@ // // // $Id: G4ASCIITreeMessenger.hh,v 1.7 2006/06/29 21:24:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 5th April 2001 diff --git a/source/visualization/Tree/include/G4ASCIITreeSceneHandler.hh b/source/visualization/Tree/include/G4ASCIITreeSceneHandler.hh index 166e6a7c53..0306e3da18 100644 --- a/source/visualization/Tree/include/G4ASCIITreeSceneHandler.hh +++ b/source/visualization/Tree/include/G4ASCIITreeSceneHandler.hh @@ -25,7 +25,7 @@ // // // $Id: G4ASCIITreeSceneHandler.hh,v 1.16 2006/06/29 21:24:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 5th April 2001 diff --git a/source/visualization/Tree/include/G4ASCIITreeViewer.hh b/source/visualization/Tree/include/G4ASCIITreeViewer.hh index 82ae1545cf..9c809d532b 100644 --- a/source/visualization/Tree/include/G4ASCIITreeViewer.hh +++ b/source/visualization/Tree/include/G4ASCIITreeViewer.hh @@ -25,7 +25,7 @@ // // // $Id: G4ASCIITreeViewer.hh,v 1.5 2006/06/29 21:24:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 5th April 2001 diff --git a/source/visualization/Tree/include/G4VTree.hh b/source/visualization/Tree/include/G4VTree.hh index ed03a86f4e..1473125256 100644 --- a/source/visualization/Tree/include/G4VTree.hh +++ b/source/visualization/Tree/include/G4VTree.hh @@ -25,7 +25,7 @@ // // // $Id: G4VTree.hh,v 1.5 2006/06/29 21:24:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 5th April 2001 diff --git a/source/visualization/Tree/include/G4VTreeSceneHandler.hh b/source/visualization/Tree/include/G4VTreeSceneHandler.hh index 64daf7103a..c212bb7c2e 100644 --- a/source/visualization/Tree/include/G4VTreeSceneHandler.hh +++ b/source/visualization/Tree/include/G4VTreeSceneHandler.hh @@ -25,7 +25,7 @@ // // // $Id: G4VTreeSceneHandler.hh,v 1.18 2006/06/29 21:24:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 5th April 2001 diff --git a/source/visualization/Tree/include/G4VTreeSceneHandler.icc b/source/visualization/Tree/include/G4VTreeSceneHandler.icc index d2084cc895..12a9bfbbc6 100644 --- a/source/visualization/Tree/include/G4VTreeSceneHandler.icc +++ b/source/visualization/Tree/include/G4VTreeSceneHandler.icc @@ -25,7 +25,7 @@ // // // $Id: G4VTreeSceneHandler.icc,v 1.8 2006/06/29 21:24:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 18th May 2000 diff --git a/source/visualization/Tree/include/G4VTreeViewer.hh b/source/visualization/Tree/include/G4VTreeViewer.hh index 6a2553be43..c4856f761c 100644 --- a/source/visualization/Tree/include/G4VTreeViewer.hh +++ b/source/visualization/Tree/include/G4VTreeViewer.hh @@ -25,7 +25,7 @@ // // // $Id: G4VTreeViewer.hh,v 1.5 2006/06/29 21:24:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 5th April 2001 diff --git a/source/visualization/Tree/src/G4ASCIITree.cc b/source/visualization/Tree/src/G4ASCIITree.cc index a4f4d46ccd..c55365e246 100644 --- a/source/visualization/Tree/src/G4ASCIITree.cc +++ b/source/visualization/Tree/src/G4ASCIITree.cc @@ -25,7 +25,7 @@ // // // $Id: G4ASCIITree.cc,v 1.10 2006/06/29 21:24:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 5th April 2001 diff --git a/source/visualization/Tree/src/G4ASCIITreeMessenger.cc b/source/visualization/Tree/src/G4ASCIITreeMessenger.cc index c97f4d4bab..33105290b1 100644 --- a/source/visualization/Tree/src/G4ASCIITreeMessenger.cc +++ b/source/visualization/Tree/src/G4ASCIITreeMessenger.cc @@ -25,7 +25,7 @@ // // // $Id: G4ASCIITreeMessenger.cc,v 1.16 2006/06/29 21:24:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 5th April 2001 diff --git a/source/visualization/Tree/src/G4ASCIITreeSceneHandler.cc b/source/visualization/Tree/src/G4ASCIITreeSceneHandler.cc index 25bccef4fb..62d4c1a644 100644 --- a/source/visualization/Tree/src/G4ASCIITreeSceneHandler.cc +++ b/source/visualization/Tree/src/G4ASCIITreeSceneHandler.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4ASCIITreeSceneHandler.cc,v 1.29 2006/06/29 21:24:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ASCIITreeSceneHandler.cc,v 1.32 2006/11/05 20:44:28 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 5th April 2001 @@ -49,6 +49,7 @@ #include "G4PhysicalVolumeMassScene.hh" #include "G4VSensitiveDetector.hh" #include "G4VReadOutGeometry.hh" +#include "G4TransportationManager.hh" G4ASCIITreeSceneHandler::G4ASCIITreeSceneHandler (G4VGraphicsSystem& system, @@ -123,33 +124,38 @@ void G4ASCIITreeSceneHandler::EndModeling () { G4PhysicalVolumeModel* pvModel = dynamic_cast(*i); if (pvModel) { - const G4ModelingParameters* tempMP = pvModel->GetModelingParameters(); - G4ModelingParameters mp; // Default - no culling. - pvModel->SetModelingParameters (&mp); - G4PhysicalVolumeMassScene massScene(pvModel); - pvModel->DescribeYourselfTo (massScene); - G4double volume = massScene.GetVolume(); - G4double mass = massScene.GetMass(); + if (pvModel->GetTopPhysicalVolume() == + G4TransportationManager::GetTransportationManager() + ->GetNavigatorForTracking()->GetWorldVolume()) { + const G4ModelingParameters* tempMP = + pvModel->GetModelingParameters(); + G4ModelingParameters mp; // Default - no culling. + pvModel->SetModelingParameters (&mp); + G4PhysicalVolumeMassScene massScene(pvModel); + pvModel->DescribeYourselfTo (massScene); + G4double volume = massScene.GetVolume(); + G4double mass = massScene.GetMass(); - G4cout << "Overall volume of \"" - << pvModel->GetTopPhysicalVolume()->GetName() - << "\":" - << pvModel->GetTopPhysicalVolume()->GetCopyNo() - << ", is " - << G4BestUnit (volume, "Volume") - << " and the daughter-included mass"; - G4int requestedDepth = pvModel->GetRequestedDepth(); - if (requestedDepth == G4PhysicalVolumeModel::UNLIMITED) { - G4cout << " to unlimited depth"; - } else { - G4cout << ", ignoring daughters at depth " - << requestedDepth - << " and below,"; + G4cout << "Overall volume of \"" + << pvModel->GetTopPhysicalVolume()->GetName() + << "\":" + << pvModel->GetTopPhysicalVolume()->GetCopyNo() + << ", is " + << G4BestUnit (volume, "Volume") + << " and the daughter-included mass"; + G4int requestedDepth = pvModel->GetRequestedDepth(); + if (requestedDepth == G4PhysicalVolumeModel::UNLIMITED) { + G4cout << " to unlimited depth"; + } else { + G4cout << ", ignoring daughters at depth " + << requestedDepth + << " and below,"; + } + G4cout << " is " << G4BestUnit (mass, "Mass") + << G4endl; + + pvModel->SetModelingParameters (tempMP); } - G4cout << " is " << G4BestUnit (mass, "Mass") - << G4endl; - - pvModel->SetModelingParameters (tempMP); } } } @@ -181,7 +187,7 @@ void G4ASCIITreeSceneHandler::RequestPrimitives(const G4VSolid& solid) { typedef G4PhysicalVolumeModel::G4PhysicalVolumeNodeID PVNodeID; typedef std::vector PVPath; const PVPath& drawnPVPath = pPVModel->GetDrawnPVPath(); - G4int currentDepth = pPVModel->GetCurrentDepth(); + //G4int currentDepth = pPVModel->GetCurrentDepth(); G4VPhysicalVolume* pCurrentPV = pPVModel->GetCurrentPV(); G4LogicalVolume* pCurrentLV = pPVModel->GetCurrentLV(); G4Material* pCurrentMaterial = pPVModel->GetCurrentMaterial(); @@ -207,8 +213,10 @@ void G4ASCIITreeSceneHandler::RequestPrimitives(const G4VSolid& solid) { thisID->GetPhysicalVolume()->GetLogicalVolume()) { // For each one previously found (if more than one, they must // have different mothers)... + // To avoid compilation errors on VC++ .Net 7.1... // Previously: // PVNodeID previousMotherID = ++(i->rbegin()); + // (Should that have been: PVNodeID::const_iterator previousMotherID?) // Replace // previousMotherID == i->rend() // by @@ -239,7 +247,7 @@ void G4ASCIITreeSceneHandler::RequestPrimitives(const G4VSolid& solid) { // Print indented text... if (pCurrentPV) { - for (G4int i = 0; i < currentDepth; i++ ) *fpOutFile << " "; + for (size_t i = 0; i < drawnPVPath.size(); i++ ) *fpOutFile << " "; *fpOutFile << "\"" << pCurrentPV->GetName() << "\":" << pCurrentPV->GetCopyNo(); @@ -303,24 +311,32 @@ void G4ASCIITreeSceneHandler::RequestPrimitives(const G4VSolid& solid) { if (detail >= 3) { *fpOutFile << ", " << G4BestUnit(((G4VSolid&)solid).GetCubicVolume(),"Volume") - << ", " - << G4BestUnit(pCurrentMaterial->GetDensity(), "Volumic Mass"); + << ", "; + if (pCurrentMaterial) { + *fpOutFile + << G4BestUnit(pCurrentMaterial->GetDensity(), "Volumic Mass") + << " (" << pCurrentMaterial->GetName() << ")"; + } else { + *fpOutFile << "(No material)"; + } } if (detail >= 5) { - G4Material* pMaterial = const_cast(pCurrentMaterial); - // ...and find daughter-subtracted mass... - G4double daughter_subtracted_mass = pCurrentLV->GetMass - (pCurrentPV->IsParameterised(), // Force if parametrised. - false, // Do not propagate - calculate for this volume minus - // volume of daughters. - pMaterial); - G4double daughter_subtracted_volume = - daughter_subtracted_mass / pCurrentMaterial->GetDensity(); - *fpOutFile << ", " - << G4BestUnit(daughter_subtracted_volume,"Volume") - << ", " - << G4BestUnit(daughter_subtracted_mass,"Mass"); + if (pCurrentMaterial) { + G4Material* pMaterial = const_cast(pCurrentMaterial); + // ...and find daughter-subtracted mass... + G4double daughter_subtracted_mass = pCurrentLV->GetMass + (pCurrentPV->IsParameterised(), // Force if parametrised. + false, // Do not propagate - calculate for this volume minus + // volume of daughters. + pMaterial); + G4double daughter_subtracted_volume = + daughter_subtracted_mass / pCurrentMaterial->GetDensity(); + *fpOutFile << ", " + << G4BestUnit(daughter_subtracted_volume,"Volume") + << ", " + << G4BestUnit(daughter_subtracted_mass,"Mass"); + } } if (fLVSet.find(pCurrentLV) == fLVSet.end()) { diff --git a/source/visualization/Tree/src/G4ASCIITreeViewer.cc b/source/visualization/Tree/src/G4ASCIITreeViewer.cc index 30dc417fbc..fbda15e7bb 100644 --- a/source/visualization/Tree/src/G4ASCIITreeViewer.cc +++ b/source/visualization/Tree/src/G4ASCIITreeViewer.cc @@ -25,7 +25,7 @@ // // // $Id: G4ASCIITreeViewer.cc,v 1.8 2006/06/29 21:24:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4ASCIITreeViewer.hh" diff --git a/source/visualization/Tree/src/G4VTree.cc b/source/visualization/Tree/src/G4VTree.cc index 30f53c023e..511cf4d2bb 100644 --- a/source/visualization/Tree/src/G4VTree.cc +++ b/source/visualization/Tree/src/G4VTree.cc @@ -25,7 +25,7 @@ // // // $Id: G4VTree.cc,v 1.5 2006/06/29 21:25:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 5th April 2001 diff --git a/source/visualization/Tree/src/G4VTreeSceneHandler.cc b/source/visualization/Tree/src/G4VTreeSceneHandler.cc index 764ab6bb94..5be6059263 100644 --- a/source/visualization/Tree/src/G4VTreeSceneHandler.cc +++ b/source/visualization/Tree/src/G4VTreeSceneHandler.cc @@ -25,7 +25,7 @@ // // // $Id: G4VTreeSceneHandler.cc,v 1.14 2006/06/29 21:25:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 5th April 2001 diff --git a/source/visualization/Tree/src/G4VTreeViewer.cc b/source/visualization/Tree/src/G4VTreeViewer.cc index a92ba0fa3b..ad7e9ad1fa 100644 --- a/source/visualization/Tree/src/G4VTreeViewer.cc +++ b/source/visualization/Tree/src/G4VTreeViewer.cc @@ -25,7 +25,7 @@ // // // $Id: G4VTreeViewer.cc,v 1.7 2006/06/29 21:25:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4VTreeViewer.hh" diff --git a/source/visualization/VRML/g4vrmlview/g4mini.java b/source/visualization/VRML/g4vrmlview/g4mini.java index fddf70931d..75b1940492 100644 --- a/source/visualization/VRML/g4vrmlview/g4mini.java +++ b/source/visualization/VRML/g4vrmlview/g4mini.java @@ -25,7 +25,7 @@ // // // $Id: g4mini.java,v 1.4 2006/06/29 21:25:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // import java.io.*; import java.net.*; diff --git a/source/visualization/VRML/g4vrmlview/g4vrmlview.java b/source/visualization/VRML/g4vrmlview/g4vrmlview.java index e907f2095b..05fdbdda70 100644 --- a/source/visualization/VRML/g4vrmlview/g4vrmlview.java +++ b/source/visualization/VRML/g4vrmlview/g4vrmlview.java @@ -25,7 +25,7 @@ // // // $Id: g4vrmlview.java,v 1.4 2006/06/29 21:25:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // import java.io.*; import java.net.*; diff --git a/source/visualization/VRML/include/FRClient.h b/source/visualization/VRML/include/FRClient.h index d5f73d5981..b454b1d433 100644 --- a/source/visualization/VRML/include/FRClient.h +++ b/source/visualization/VRML/include/FRClient.h @@ -25,7 +25,7 @@ // // // $Id: FRClient.h,v 1.6 2006/06/29 21:25:19 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // FRClient.h // FukuiRenderer Client diff --git a/source/visualization/VRML/include/G4FRClient.hh b/source/visualization/VRML/include/G4FRClient.hh index 99290a02c5..1f62c3a679 100644 --- a/source/visualization/VRML/include/G4FRClient.hh +++ b/source/visualization/VRML/include/G4FRClient.hh @@ -25,7 +25,7 @@ // // // $Id: G4FRClient.hh,v 1.8 2006/06/29 21:25:21 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4FRClient.hh // Yasuhide Sawada and Satoshi Tanaka diff --git a/source/visualization/VRML/include/G4VRML1.hh b/source/visualization/VRML/include/G4VRML1.hh index bd4b55634f..5b759d1f9d 100644 --- a/source/visualization/VRML/include/G4VRML1.hh +++ b/source/visualization/VRML/include/G4VRML1.hh @@ -25,7 +25,7 @@ // // // $Id: G4VRML1.hh,v 1.10 2006/06/29 21:25:23 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VRML1.hh // Yasuhide Sawada and Satoshi Tanaka diff --git a/source/visualization/VRML/include/G4VRML1File.hh b/source/visualization/VRML/include/G4VRML1File.hh index a76efa581d..e4af3c1a73 100644 --- a/source/visualization/VRML/include/G4VRML1File.hh +++ b/source/visualization/VRML/include/G4VRML1File.hh @@ -25,7 +25,7 @@ // // // $Id: G4VRML1File.hh,v 1.10 2006/06/29 21:25:25 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VRML1File.hh // Satoshi Tanaka & Yasuhide Sawada diff --git a/source/visualization/VRML/include/G4VRML1FileSceneHandler.hh b/source/visualization/VRML/include/G4VRML1FileSceneHandler.hh index 8bd0efde9c..25b929d037 100644 --- a/source/visualization/VRML/include/G4VRML1FileSceneHandler.hh +++ b/source/visualization/VRML/include/G4VRML1FileSceneHandler.hh @@ -25,7 +25,7 @@ // // // $Id: G4VRML1FileSceneHandler.hh,v 1.17 2006/06/29 21:25:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VRML1FileSceneHandler.hh // Satoshi Tanaka & Yasuhide Sawada diff --git a/source/visualization/VRML/include/G4VRML1FileViewer.hh b/source/visualization/VRML/include/G4VRML1FileViewer.hh index 7cdce9a92b..7020209818 100644 --- a/source/visualization/VRML/include/G4VRML1FileViewer.hh +++ b/source/visualization/VRML/include/G4VRML1FileViewer.hh @@ -25,7 +25,7 @@ // // // $Id: G4VRML1FileViewer.hh,v 1.8 2006/06/29 21:25:29 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VRML1FileViewer.hh // Satoshi Tanaka and Yasuhide Sawada diff --git a/source/visualization/VRML/include/G4VRML1SceneHandler.hh b/source/visualization/VRML/include/G4VRML1SceneHandler.hh index bd624da4cf..96c39ab084 100644 --- a/source/visualization/VRML/include/G4VRML1SceneHandler.hh +++ b/source/visualization/VRML/include/G4VRML1SceneHandler.hh @@ -25,7 +25,7 @@ // // // $Id: G4VRML1SceneHandler.hh,v 1.14 2006/06/29 21:25:31 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VRML1SceneHandler.hh // Yasuhide Sawada & Satoshi Tanaka diff --git a/source/visualization/VRML/include/G4VRML1Viewer.hh b/source/visualization/VRML/include/G4VRML1Viewer.hh index 58556732bb..d7fd1d14aa 100644 --- a/source/visualization/VRML/include/G4VRML1Viewer.hh +++ b/source/visualization/VRML/include/G4VRML1Viewer.hh @@ -25,7 +25,7 @@ // // // $Id: G4VRML1Viewer.hh,v 1.8 2006/06/29 21:25:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VRML1Viewer.hh // Satoshi Tanaka & Yasuhide Sawada diff --git a/source/visualization/VRML/include/G4VRML2.hh b/source/visualization/VRML/include/G4VRML2.hh index ea9beb294f..d339bbe8df 100644 --- a/source/visualization/VRML/include/G4VRML2.hh +++ b/source/visualization/VRML/include/G4VRML2.hh @@ -25,7 +25,7 @@ // // // $Id: G4VRML2.hh,v 1.10 2006/06/29 21:25:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VRML2.hh // Satoshi Tanaka and Yasuhide Sawada diff --git a/source/visualization/VRML/include/G4VRML2File.hh b/source/visualization/VRML/include/G4VRML2File.hh index 4189ba4cf3..3c683794bf 100644 --- a/source/visualization/VRML/include/G4VRML2File.hh +++ b/source/visualization/VRML/include/G4VRML2File.hh @@ -25,7 +25,7 @@ // // // $Id: G4VRML2File.hh,v 1.11 2006/06/29 21:25:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VRML2File.hh // Satoshi Tanaka & Yasuhide Sawada diff --git a/source/visualization/VRML/include/G4VRML2FileSceneHandler.hh b/source/visualization/VRML/include/G4VRML2FileSceneHandler.hh index 8af5e9b277..42e98544a8 100644 --- a/source/visualization/VRML/include/G4VRML2FileSceneHandler.hh +++ b/source/visualization/VRML/include/G4VRML2FileSceneHandler.hh @@ -25,7 +25,7 @@ // // // $Id: G4VRML2FileSceneHandler.hh,v 1.16 2006/06/29 21:25:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VRML2FileSceneHandler.hh // Satoshi Tanaka & Yasuhide Sawada diff --git a/source/visualization/VRML/include/G4VRML2FileViewer.hh b/source/visualization/VRML/include/G4VRML2FileViewer.hh index 4d1e9591cf..9f61b96b30 100644 --- a/source/visualization/VRML/include/G4VRML2FileViewer.hh +++ b/source/visualization/VRML/include/G4VRML2FileViewer.hh @@ -25,7 +25,7 @@ // // // $Id: G4VRML2FileViewer.hh,v 1.10 2006/06/29 21:25:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VRML2FileViewer.hh // Satoshi Tanaka and Yasuhide Sawada diff --git a/source/visualization/VRML/include/G4VRML2SceneHandler.hh b/source/visualization/VRML/include/G4VRML2SceneHandler.hh index 850868fadf..5baad99abf 100644 --- a/source/visualization/VRML/include/G4VRML2SceneHandler.hh +++ b/source/visualization/VRML/include/G4VRML2SceneHandler.hh @@ -25,7 +25,7 @@ // // // $Id: G4VRML2SceneHandler.hh,v 1.13 2006/06/29 21:25:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VRML2SceneHandler.hh // Satoshi Tanaka & Yasuhide Sawada diff --git a/source/visualization/VRML/include/G4VRML2Viewer.hh b/source/visualization/VRML/include/G4VRML2Viewer.hh index cb1d1b6154..066350dd70 100644 --- a/source/visualization/VRML/include/G4VRML2Viewer.hh +++ b/source/visualization/VRML/include/G4VRML2Viewer.hh @@ -25,7 +25,7 @@ // // // $Id: G4VRML2Viewer.hh,v 1.8 2006/06/29 21:25:45 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VRML2Viewer.hh // Satoshi Tanaka & Yasuhide Sawada diff --git a/source/visualization/VRML/include/G4VRMLNetConfig.hh b/source/visualization/VRML/include/G4VRMLNetConfig.hh index 5d57b141d3..eb7ffb69a4 100644 --- a/source/visualization/VRML/include/G4VRMLNetConfig.hh +++ b/source/visualization/VRML/include/G4VRMLNetConfig.hh @@ -25,7 +25,7 @@ // // // $Id: G4VRMLNetConfig.hh,v 1.7 2006/06/29 21:25:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VRMLNetConfig.hh // Satoshi Tanaka diff --git a/source/visualization/VRML/src/FRClient.cc b/source/visualization/VRML/src/FRClient.cc index 0ccbd487a3..68500a48cd 100644 --- a/source/visualization/VRML/src/FRClient.cc +++ b/source/visualization/VRML/src/FRClient.cc @@ -25,7 +25,7 @@ // // // $Id: FRClient.cc,v 1.7 2006/06/29 21:25:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // FRClient.cc // FukuiRenderer Client diff --git a/source/visualization/VRML/src/G4FRClient.cc b/source/visualization/VRML/src/G4FRClient.cc index 96c9eaf157..c658acd244 100644 --- a/source/visualization/VRML/src/G4FRClient.cc +++ b/source/visualization/VRML/src/G4FRClient.cc @@ -25,7 +25,7 @@ // // // $Id: G4FRClient.cc,v 1.8 2006/06/29 21:25:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4FRClient.cc // Yasuhide Sawada & Satoshi Tanaka diff --git a/source/visualization/VRML/src/G4VRML1.cc b/source/visualization/VRML/src/G4VRML1.cc index 9d157d4288..727214046f 100644 --- a/source/visualization/VRML/src/G4VRML1.cc +++ b/source/visualization/VRML/src/G4VRML1.cc @@ -25,7 +25,7 @@ // // // $Id: G4VRML1.cc,v 1.10 2006/06/29 21:25:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VRML1.cc // Yasuhide Sawada & Satoshi Tanaka diff --git a/source/visualization/VRML/src/G4VRML1File.cc b/source/visualization/VRML/src/G4VRML1File.cc index 1a99a24be4..a9cbe682f2 100644 --- a/source/visualization/VRML/src/G4VRML1File.cc +++ b/source/visualization/VRML/src/G4VRML1File.cc @@ -25,7 +25,7 @@ // // // $Id: G4VRML1File.cc,v 1.10 2006/06/29 21:25:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VRML1File.cc // Satoshi Tanaka & Yasuhide Sawada diff --git a/source/visualization/VRML/src/G4VRML1FileSceneHandler.cc b/source/visualization/VRML/src/G4VRML1FileSceneHandler.cc index c9e62bc47e..673bfabde8 100644 --- a/source/visualization/VRML/src/G4VRML1FileSceneHandler.cc +++ b/source/visualization/VRML/src/G4VRML1FileSceneHandler.cc @@ -25,7 +25,7 @@ // // // $Id: G4VRML1FileSceneHandler.cc,v 1.12 2006/06/29 21:25:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VRML1FileSceneHandler.cc // Satoshi Tanaka & Yasuhide Sawada diff --git a/source/visualization/VRML/src/G4VRML1FileViewer.cc b/source/visualization/VRML/src/G4VRML1FileViewer.cc index 1df96c2102..157488cfa6 100644 --- a/source/visualization/VRML/src/G4VRML1FileViewer.cc +++ b/source/visualization/VRML/src/G4VRML1FileViewer.cc @@ -25,7 +25,7 @@ // // // $Id: G4VRML1FileViewer.cc,v 1.11 2006/06/29 21:25:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VRMLView.cc // Satoshi Tanaka & Yasuhide Sawada diff --git a/source/visualization/VRML/src/G4VRML1SceneHandler.cc b/source/visualization/VRML/src/G4VRML1SceneHandler.cc index 9af26b58eb..39ca9eedea 100644 --- a/source/visualization/VRML/src/G4VRML1SceneHandler.cc +++ b/source/visualization/VRML/src/G4VRML1SceneHandler.cc @@ -25,7 +25,7 @@ // // // $Id: G4VRML1SceneHandler.cc,v 1.10 2006/06/29 21:26:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VRML1SceneHandler.cc // Yasuhide Sawada and Satoshi Tanaka diff --git a/source/visualization/VRML/src/G4VRML1SceneHandlerFunc.icc b/source/visualization/VRML/src/G4VRML1SceneHandlerFunc.icc index 939747a8f2..0e9388e21f 100644 --- a/source/visualization/VRML/src/G4VRML1SceneHandlerFunc.icc +++ b/source/visualization/VRML/src/G4VRML1SceneHandlerFunc.icc @@ -25,7 +25,7 @@ // // // $Id: G4VRML1SceneHandlerFunc.icc,v 1.16 2006/06/29 21:26:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VRML1SceneHandlerFunc.icc // Satoshi Tanaka & Yasuhide Sawada diff --git a/source/visualization/VRML/src/G4VRML1Viewer.cc b/source/visualization/VRML/src/G4VRML1Viewer.cc index c71978107c..908ec64b29 100644 --- a/source/visualization/VRML/src/G4VRML1Viewer.cc +++ b/source/visualization/VRML/src/G4VRML1Viewer.cc @@ -25,7 +25,7 @@ // // // $Id: G4VRML1Viewer.cc,v 1.8 2006/06/29 21:26:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VRMLView.cc // Yasuhide Sawada & Satoshi Tanaka diff --git a/source/visualization/VRML/src/G4VRML2.cc b/source/visualization/VRML/src/G4VRML2.cc index feb0ac947a..d14cea4e17 100644 --- a/source/visualization/VRML/src/G4VRML2.cc +++ b/source/visualization/VRML/src/G4VRML2.cc @@ -25,7 +25,7 @@ // // // $Id: G4VRML2.cc,v 1.10 2006/06/29 21:26:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VRML2.cc // Satoshi Tanaka & Yasuhide Sawada diff --git a/source/visualization/VRML/src/G4VRML2File.cc b/source/visualization/VRML/src/G4VRML2File.cc index 27082dc96c..66446d726c 100644 --- a/source/visualization/VRML/src/G4VRML2File.cc +++ b/source/visualization/VRML/src/G4VRML2File.cc @@ -25,7 +25,7 @@ // // // $Id: G4VRML2File.cc,v 1.10 2006/06/29 21:26:09 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VRML2File.cc // Satoshi Tanaka & Yasuhide Sawada diff --git a/source/visualization/VRML/src/G4VRML2FileSceneHandler.cc b/source/visualization/VRML/src/G4VRML2FileSceneHandler.cc index cb5968eb00..823c7b258e 100644 --- a/source/visualization/VRML/src/G4VRML2FileSceneHandler.cc +++ b/source/visualization/VRML/src/G4VRML2FileSceneHandler.cc @@ -25,7 +25,7 @@ // // // $Id: G4VRML2FileSceneHandler.cc,v 1.14 2006/06/29 21:26:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VRML2FileSceneHandler.cc // Satoshi Tanaka & Yasuhide Sawada diff --git a/source/visualization/VRML/src/G4VRML2FileViewer.cc b/source/visualization/VRML/src/G4VRML2FileViewer.cc index c079f5503d..87a26d56f4 100644 --- a/source/visualization/VRML/src/G4VRML2FileViewer.cc +++ b/source/visualization/VRML/src/G4VRML2FileViewer.cc @@ -25,7 +25,7 @@ // // // $Id: G4VRML2FileViewer.cc,v 1.13 2006/06/29 21:26:13 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VRML2FileViewer.cc // Satoshi Tanaka & Yasuhide Sawada diff --git a/source/visualization/VRML/src/G4VRML2SceneHandler.cc b/source/visualization/VRML/src/G4VRML2SceneHandler.cc index 0bcbd25d4b..38c11b1cda 100644 --- a/source/visualization/VRML/src/G4VRML2SceneHandler.cc +++ b/source/visualization/VRML/src/G4VRML2SceneHandler.cc @@ -25,7 +25,7 @@ // // // $Id: G4VRML2SceneHandler.cc,v 1.12 2006/06/29 21:26:15 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VRML2SceneHandler.cc // Satoshi Tanaka & Yasuhide Sawada diff --git a/source/visualization/VRML/src/G4VRML2SceneHandlerFunc.icc b/source/visualization/VRML/src/G4VRML2SceneHandlerFunc.icc index 0d63f5b51f..032e85b70c 100644 --- a/source/visualization/VRML/src/G4VRML2SceneHandlerFunc.icc +++ b/source/visualization/VRML/src/G4VRML2SceneHandlerFunc.icc @@ -25,7 +25,7 @@ // // // $Id: G4VRML2SceneHandlerFunc.icc,v 1.20 2006/06/29 21:26:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VRML2SceneHandlerFunc.icc // Satoshi Tanaka & Yasuhide Sawada diff --git a/source/visualization/VRML/src/G4VRML2Viewer.cc b/source/visualization/VRML/src/G4VRML2Viewer.cc index 64fd3c7f7c..5ad0dd200f 100644 --- a/source/visualization/VRML/src/G4VRML2Viewer.cc +++ b/source/visualization/VRML/src/G4VRML2Viewer.cc @@ -25,7 +25,7 @@ // // // $Id: G4VRML2Viewer.cc,v 1.12 2006/06/29 21:26:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // G4VRML2Viewer.cc // Satoshi Tanaka & Yasuhide Sawada diff --git a/source/visualization/XXX/History b/source/visualization/XXX/History index 32cb112570..4f131162e0 100644 --- a/source/visualization/XXX/History +++ b/source/visualization/XXX/History @@ -1,4 +1,4 @@ -$Id: History,v 1.20 2006/05/04 15:09:14 allison Exp $ +$Id: History,v 1.27 2006/11/05 20:41:55 allison Exp $ ------------------------------------------------------------------- ========================================================= @@ -20,6 +20,30 @@ committal in the CVS repository ! History file for visualization/XXX sub-category (a template graphics system) --------------------------------------------------------------------------- +5th November 2006 John Allison (visXXX-V08-01-06) +- Protect against zero materials pointer. + +26th October 2006 John Allison (visXXX-V08-01-05) +- Improved print out. +- Followed modeling-V08-01-08. + +24th October 2006 John Allison (visXXX-V08-01-04; co-works greps-V08-01-08) +- G4XXXStoredSceneHandler.cc: Followed change to G4VisAttributes in + greps-V08-01-08 (change GetAttValues to CreateAttValues). + +13th September 2006 John Allison (visXXX-V08-01-03) +- G4XXXStoredSceneHandler.cc: Improved G4Att printing and checking. + +29th August 2006 John Allison (visXXX-V08-01-02) +- G4XXXSG/StoredViewer::CompareForKernelVisit: Minor tidying. + +10th July 2006 John Allison (visXXX-V08-01-01) +- G4XXXStoredSceneHandler.cc: Gets solid's G4Atts created by + G4PhysicalVolumeModel. + +3rd July 2006 John Allison (visXXX-V08-01-00) +- General tidy and improvement to XXXFile. + 4th May 2006 John Allison (visXXX-V08-00-04) - Improved protection for null models and parameters. diff --git a/source/visualization/XXX/include/G4XXX.hh b/source/visualization/XXX/include/G4XXX.hh index 2b185b4764..422a65d673 100644 --- a/source/visualization/XXX/include/G4XXX.hh +++ b/source/visualization/XXX/include/G4XXX.hh @@ -25,7 +25,7 @@ // // // $Id: G4XXX.hh,v 1.5 2006/06/29 21:26:37 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 5th April 2001 diff --git a/source/visualization/XXX/include/G4XXXFile.hh b/source/visualization/XXX/include/G4XXXFile.hh index 09a0f4e1c2..ea389f31ba 100644 --- a/source/visualization/XXX/include/G4XXXFile.hh +++ b/source/visualization/XXX/include/G4XXXFile.hh @@ -25,7 +25,7 @@ // // // $Id: G4XXXFile.hh,v 1.2 2006/06/29 21:26:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 7th March 2006 diff --git a/source/visualization/XXX/include/G4XXXFileSceneHandler.hh b/source/visualization/XXX/include/G4XXXFileSceneHandler.hh index fb5e0d4cf8..31b5a19538 100644 --- a/source/visualization/XXX/include/G4XXXFileSceneHandler.hh +++ b/source/visualization/XXX/include/G4XXXFileSceneHandler.hh @@ -25,7 +25,7 @@ // // // $Id: G4XXXFileSceneHandler.hh,v 1.3 2006/06/29 21:26:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 7th March 2006 diff --git a/source/visualization/XXX/include/G4XXXFileViewer.hh b/source/visualization/XXX/include/G4XXXFileViewer.hh index 3f4753e430..c0f156b638 100644 --- a/source/visualization/XXX/include/G4XXXFileViewer.hh +++ b/source/visualization/XXX/include/G4XXXFileViewer.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4XXXFileViewer.hh,v 1.2 2006/06/29 21:26:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4XXXFileViewer.hh,v 1.3 2006/07/03 16:52:48 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 7th March 2006 @@ -52,16 +52,12 @@ public: // filenames -- see FukuiRenderer or HepRepFile. class FileWriter { public: - FileWriter(const G4String& fileName): fFileName(fileName), fOpen(false) {} + FileWriter(): fOpen(false) {} G4bool IsOpen() {return fOpen;} - void WriteItem(const G4String& item) - { - if (!fOpen) {fFile.open(fFileName); fOpen = true;} - if (fFile.good()) fFile << item << std::endl; - else G4cout << "G4XXXFileViewer::FileWriter::WriteItem: ERROR" << G4endl; - } - void Close() {if (fOpen) {fFile.close(); fOpen = false;}} - void Rewind() {if (fOpen) fFile.seekp(0, std::ios::beg);} + void WriteItem(const G4String& item); + void Close(); + // Implement rewind as close and re-open... + void Rewind() {if (fOpen) {fFile.close(); fFile.open(fFileName.c_str());}} private: G4String fFileName; G4bool fOpen; diff --git a/source/visualization/XXX/include/G4XXXSG.hh b/source/visualization/XXX/include/G4XXXSG.hh index a4fc525116..dd6ce2ba59 100644 --- a/source/visualization/XXX/include/G4XXXSG.hh +++ b/source/visualization/XXX/include/G4XXXSG.hh @@ -25,7 +25,7 @@ // // // $Id: G4XXXSG.hh,v 1.2 2006/06/29 21:26:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 10th March 2005 diff --git a/source/visualization/XXX/include/G4XXXSGSceneHandler.hh b/source/visualization/XXX/include/G4XXXSGSceneHandler.hh index 5f287fb7ec..fafe089a85 100644 --- a/source/visualization/XXX/include/G4XXXSGSceneHandler.hh +++ b/source/visualization/XXX/include/G4XXXSGSceneHandler.hh @@ -25,7 +25,7 @@ // // // $Id: G4XXXSGSceneHandler.hh,v 1.3 2006/06/29 21:26:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 10th March 2006 diff --git a/source/visualization/XXX/include/G4XXXSGViewer.hh b/source/visualization/XXX/include/G4XXXSGViewer.hh index e0429ac59f..1a1a18e5a3 100644 --- a/source/visualization/XXX/include/G4XXXSGViewer.hh +++ b/source/visualization/XXX/include/G4XXXSGViewer.hh @@ -25,7 +25,7 @@ // // // $Id: G4XXXSGViewer.hh,v 1.2 2006/06/29 21:26:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 10th March 2006 diff --git a/source/visualization/XXX/include/G4XXXSceneHandler.hh b/source/visualization/XXX/include/G4XXXSceneHandler.hh index 02cc7ced84..2411faf7d7 100644 --- a/source/visualization/XXX/include/G4XXXSceneHandler.hh +++ b/source/visualization/XXX/include/G4XXXSceneHandler.hh @@ -25,7 +25,7 @@ // // // $Id: G4XXXSceneHandler.hh,v 1.21 2006/06/29 21:27:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 5th April 2001 diff --git a/source/visualization/XXX/include/G4XXXStored.hh b/source/visualization/XXX/include/G4XXXStored.hh index 538825f0b0..5d9fe428c5 100644 --- a/source/visualization/XXX/include/G4XXXStored.hh +++ b/source/visualization/XXX/include/G4XXXStored.hh @@ -25,7 +25,7 @@ // // // $Id: G4XXXStored.hh,v 1.2 2006/06/29 21:27:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 7th March 2006 diff --git a/source/visualization/XXX/include/G4XXXStoredSceneHandler.hh b/source/visualization/XXX/include/G4XXXStoredSceneHandler.hh index f09c2f36fd..9578ea0964 100644 --- a/source/visualization/XXX/include/G4XXXStoredSceneHandler.hh +++ b/source/visualization/XXX/include/G4XXXStoredSceneHandler.hh @@ -25,7 +25,7 @@ // // // $Id: G4XXXStoredSceneHandler.hh,v 1.3 2006/06/29 21:27:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 7th March 2006 diff --git a/source/visualization/XXX/include/G4XXXStoredViewer.hh b/source/visualization/XXX/include/G4XXXStoredViewer.hh index 0747969bf5..de6e0d7729 100644 --- a/source/visualization/XXX/include/G4XXXStoredViewer.hh +++ b/source/visualization/XXX/include/G4XXXStoredViewer.hh @@ -25,7 +25,7 @@ // // // $Id: G4XXXStoredViewer.hh,v 1.2 2006/06/29 21:27:17 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 7th March 2006 diff --git a/source/visualization/XXX/include/G4XXXViewer.hh b/source/visualization/XXX/include/G4XXXViewer.hh index cb8fc276ba..08283b7a84 100644 --- a/source/visualization/XXX/include/G4XXXViewer.hh +++ b/source/visualization/XXX/include/G4XXXViewer.hh @@ -25,7 +25,7 @@ // // // $Id: G4XXXViewer.hh,v 1.8 2006/06/29 21:27:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 5th April 2001 diff --git a/source/visualization/XXX/src/G4XXX.cc b/source/visualization/XXX/src/G4XXX.cc index 5fb6238577..32d44d6412 100644 --- a/source/visualization/XXX/src/G4XXX.cc +++ b/source/visualization/XXX/src/G4XXX.cc @@ -25,7 +25,7 @@ // // // $Id: G4XXX.cc,v 1.6 2006/06/29 21:27:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 5th April 2001 diff --git a/source/visualization/XXX/src/G4XXXFile.cc b/source/visualization/XXX/src/G4XXXFile.cc index e8b063b2b5..98aae7781f 100644 --- a/source/visualization/XXX/src/G4XXXFile.cc +++ b/source/visualization/XXX/src/G4XXXFile.cc @@ -25,7 +25,7 @@ // // // $Id: G4XXXFile.cc,v 1.2 2006/06/29 21:27:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 7th March 2006 diff --git a/source/visualization/XXX/src/G4XXXFileSceneHandler.cc b/source/visualization/XXX/src/G4XXXFileSceneHandler.cc index 19fb05a2f3..81afb3499c 100644 --- a/source/visualization/XXX/src/G4XXXFileSceneHandler.cc +++ b/source/visualization/XXX/src/G4XXXFileSceneHandler.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4XXXFileSceneHandler.cc,v 1.4 2006/06/29 21:27:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4XXXFileSceneHandler.cc,v 1.5 2006/07/03 16:52:49 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 7th March 2006 @@ -44,10 +44,6 @@ #include "G4Circle.hh" #include "G4Square.hh" #include "G4Polyhedron.hh" -#include "G4NURBS.hh" -#include "G4VTrajectory.hh" -#include "G4AttDef.hh" -#include "G4AttValue.hh" #include "G4UnitsTable.hh" #include diff --git a/source/visualization/XXX/src/G4XXXFileViewer.cc b/source/visualization/XXX/src/G4XXXFileViewer.cc index 66ee42466f..b21e87d990 100644 --- a/source/visualization/XXX/src/G4XXXFileViewer.cc +++ b/source/visualization/XXX/src/G4XXXFileViewer.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4XXXFileViewer.cc,v 1.2 2006/06/29 21:27:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4XXXFileViewer.cc,v 1.3 2006/07/03 16:52:49 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 7th March 2006 @@ -36,14 +36,50 @@ #include "G4VSceneHandler.hh" #include "G4XXXFileSceneHandler.hh" +#include + +void G4XXXFileViewer::FileWriter::Close() +{ + if (fOpen) { + G4cout << "Closing file " << fFileName << G4endl; + fFile.close(); + fOpen = false; + } +} + +void G4XXXFileViewer::FileWriter::WriteItem(const G4String& item) +{ + if (!fOpen) + { + std::ifstream ifs; + std::ostringstream oss; + G4int i = 0; + do { + oss.str(""); + oss << "g4_" << i << ".XXXFile"; + ifs.open(oss.str().c_str()); + if (!ifs) break; // Doesn't exist, so can open a new file. + else ifs.close(); + ++i; + } while(true); + fFileName = oss.str(); + G4cout << "Opening file " << fFileName << G4endl; + fFile.open(fFileName.c_str()); + fOpen = true; + } + if (fFile.good()) fFile << item << std::endl; + else G4cout << "G4XXXFileViewer::FileWriter::WriteItem: ERROR" << G4endl; +} G4XXXFileViewer::G4XXXFileViewer (G4VSceneHandler& sceneHandler, const G4String& name): - G4VViewer(sceneHandler, sceneHandler.IncrementViewCount(), name), - fFileWriter(name + ".out") + G4VViewer(sceneHandler, sceneHandler.IncrementViewCount(), name) {} -G4XXXFileViewer::~G4XXXFileViewer() {} +G4XXXFileViewer::~G4XXXFileViewer() +{ + fFileWriter.Close(); +} void G4XXXFileViewer::SetView() { #ifdef G4XXXFileDEBUG diff --git a/source/visualization/XXX/src/G4XXXSG.cc b/source/visualization/XXX/src/G4XXXSG.cc index eeb9a0d0c0..16ef06b23d 100644 --- a/source/visualization/XXX/src/G4XXXSG.cc +++ b/source/visualization/XXX/src/G4XXXSG.cc @@ -25,7 +25,7 @@ // // // $Id: G4XXXSG.cc,v 1.2 2006/06/29 21:27:33 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 10th March 2005 diff --git a/source/visualization/XXX/src/G4XXXSGSceneHandler.cc b/source/visualization/XXX/src/G4XXXSGSceneHandler.cc index 59f13638d3..8579ef5e90 100644 --- a/source/visualization/XXX/src/G4XXXSGSceneHandler.cc +++ b/source/visualization/XXX/src/G4XXXSGSceneHandler.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4XXXSGSceneHandler.cc,v 1.3 2006/06/29 21:27:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4XXXSGSceneHandler.cc,v 1.6 2006/11/05 20:41:36 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 10th March 2006 @@ -46,10 +46,6 @@ #include "G4Circle.hh" #include "G4Square.hh" #include "G4Polyhedron.hh" -#include "G4NURBS.hh" -#include "G4VTrajectory.hh" -#include "G4AttDef.hh" -#include "G4AttValue.hh" #include "G4UnitsTable.hh" #include @@ -61,9 +57,9 @@ G4XXXSGSceneHandler::G4XXXSGSceneHandler(G4VGraphicsSystem& system, const G4String& name): G4VSceneHandler(system, fSceneIdCount++, name) { - fRoot = fSceneGraph.setRoot("root"); - fPermanentsRoot = fRoot.push_back("permanentsRoot"); - fTransientsRoot = fRoot.push_back("transientsRoot"); + fRoot = fSceneGraph.setRoot("\nroot\n"); + fPermanentsRoot = fRoot.push_back("\npermanentsRoot\n"); + fTransientsRoot = fRoot.push_back("\ntransientsRoot\n"); } G4XXXSGSceneHandler::~G4XXXSGSceneHandler() {} @@ -117,6 +113,7 @@ void G4XXXSGSceneHandler::CreateCurrentItem(const G4String& header) { //G4VPhysicalVolume* pCurrentPV = pPVModel->GetCurrentPV(); G4LogicalVolume* pCurrentLV = pPVModel->GetCurrentLV(); //G4Material* pCurrentMaterial = pPVModel->GetCurrentMaterial(); + // Note: pCurrentMaterial may be zero (parallel world). // The simplest algorithm, used by the Open Inventor Driver // developers, is to rely on the fact the G4PhysicalVolumeModel diff --git a/source/visualization/XXX/src/G4XXXSGViewer.cc b/source/visualization/XXX/src/G4XXXSGViewer.cc index 8bde63a934..b37cd645d3 100644 --- a/source/visualization/XXX/src/G4XXXSGViewer.cc +++ b/source/visualization/XXX/src/G4XXXSGViewer.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4XXXSGViewer.cc,v 1.3 2006/06/29 21:27:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4XXXSGViewer.cc,v 1.4 2006/08/29 16:11:25 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 10th March 2006 @@ -121,19 +121,17 @@ G4bool G4XXXSGViewer::CompareForKernelVisit(G4ViewParameters& lastVP) // Typical comparison. Taken from OpenGL. if ( (lastVP.GetDrawingStyle () != fVP.GetDrawingStyle ()) || + (lastVP.IsAuxEdgeVisible () != fVP.IsAuxEdgeVisible ()) || (lastVP.GetRepStyle () != fVP.GetRepStyle ()) || (lastVP.IsCulling () != fVP.IsCulling ()) || (lastVP.IsCullingInvisible () != fVP.IsCullingInvisible ()) || (lastVP.IsDensityCulling () != fVP.IsDensityCulling ()) || (lastVP.IsCullingCovered () != fVP.IsCullingCovered ()) || - (lastVP.IsSection () != fVP.IsSection ()) || // No need to visit kernel if section plane changes. - (lastVP.IsCutaway () != fVP.IsCutaway ()) || - (lastVP.GetCutawayPlanes ().size () != - fVP.GetCutawayPlanes ().size ()) || // No need to visit kernel if cutaway planes change. (lastVP.IsExplode () != fVP.IsExplode ()) || (lastVP.GetNoOfSides () != fVP.GetNoOfSides ()) || + (lastVP.IsMarkerNotHidden () != fVP.IsMarkerNotHidden ()) || (lastVP.GetBackgroundColour ()!= fVP.GetBackgroundColour ()) ) { return true; diff --git a/source/visualization/XXX/src/G4XXXSceneHandler.cc b/source/visualization/XXX/src/G4XXXSceneHandler.cc index 00e89f8efe..a3e9cedeb5 100644 --- a/source/visualization/XXX/src/G4XXXSceneHandler.cc +++ b/source/visualization/XXX/src/G4XXXSceneHandler.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4XXXSceneHandler.cc,v 1.31 2006/06/29 21:27:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4XXXSceneHandler.cc,v 1.32 2006/07/03 16:52:49 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 5th April 2001 @@ -42,12 +42,6 @@ #include "G4Circle.hh" #include "G4Square.hh" #include "G4Polyhedron.hh" -/* -#include "G4NURBS.hh" -#include "G4VTrajectory.hh" -#include "G4AttDef.hh" -#include "G4AttValue.hh" -*/ #include "G4UnitsTable.hh" G4int G4XXXSceneHandler::fSceneIdCount = 0; diff --git a/source/visualization/XXX/src/G4XXXStored.cc b/source/visualization/XXX/src/G4XXXStored.cc index 31496e1127..e3cf663621 100644 --- a/source/visualization/XXX/src/G4XXXStored.cc +++ b/source/visualization/XXX/src/G4XXXStored.cc @@ -25,7 +25,7 @@ // // // $Id: G4XXXStored.cc,v 1.2 2006/06/29 21:27:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 7th March 2006 diff --git a/source/visualization/XXX/src/G4XXXStoredSceneHandler.cc b/source/visualization/XXX/src/G4XXXStoredSceneHandler.cc index 1f941182ed..7f9c6a5c1d 100644 --- a/source/visualization/XXX/src/G4XXXStoredSceneHandler.cc +++ b/source/visualization/XXX/src/G4XXXStoredSceneHandler.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4XXXStoredSceneHandler.cc,v 1.4 2006/06/29 21:27:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4XXXStoredSceneHandler.cc,v 1.9 2006/10/26 11:30:10 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 7th March 2006 @@ -44,11 +44,10 @@ #include "G4Circle.hh" #include "G4Square.hh" #include "G4Polyhedron.hh" -#include "G4NURBS.hh" -#include "G4VTrajectory.hh" +#include "G4UnitsTable.hh" #include "G4AttDef.hh" #include "G4AttValue.hh" -#include "G4UnitsTable.hh" +#include "G4AttCheck.hh" #include @@ -93,9 +92,59 @@ void G4XXXStoredSceneHandler::PrintThings() { void G4XXXStoredSceneHandler::PreAddSolid (const G4Transform3D& objectTransformation, const G4VisAttributes& visAttribs) -{ +{ G4VSceneHandler::PreAddSolid(objectTransformation, visAttribs); + // Get user G4Atts... + const std::map* userAttDefs = visAttribs.GetAttDefs(); + if (userAttDefs) { +#ifdef G4XXXStoredDEBUG + const std::vector* userAttValues = + visAttribs.CreateAttValues(); + G4cout << "\nProvided G4Atts:\n" + << G4AttCheck(userAttValues, userAttDefs); + // Extra checks... + G4AttCheck attCheck(userAttValues, userAttDefs); + if (attCheck.Check()) G4cout << "Error" << G4endl; + else { + std::vector standardValues; + std::map standardDefinitions; + attCheck.Standard(&standardValues, &standardDefinitions); + G4cout << "\nStandard G4Atts:\n" + << G4AttCheck(&standardValues, &standardDefinitions); + } + // End of extra checks. + delete userAttValues; // (Must be deleted after use.) +#endif + } + + // Get solid's G4Atts created by G4PhysicalVolumeModel... + G4PhysicalVolumeModel* pPVModel = + dynamic_cast(fpModel); + if (pPVModel) { + const std::map* solidAttDefs = pPVModel->GetAttDefs(); + if (solidAttDefs) { +#ifdef G4XXXStoredDEBUG + std::vector* solidAttValues = + pPVModel->CreateCurrentAttValues(); + G4cout << "\nProvided G4Atts:\n" + << G4AttCheck(solidAttValues, solidAttDefs); + // Extra checks... + G4AttCheck attCheck(solidAttValues,solidAttDefs); + if (attCheck.Check()) G4cout << "Error" << G4endl; + else { + std::vector standardValues; + std::map standardDefinitions; + attCheck.Standard(&standardValues, &standardDefinitions); + G4cout << "\nStandard G4Atts:\n" + << G4AttCheck(&standardValues, &standardDefinitions); + } + // End of extra checks. + delete solidAttValues; // (Must be deleted after use.) +#endif + } + } + // Create a place for current solid... fCurrentItem = fStore.insert(fStore.end(), G4String("\nPreAddSolid:\n")); if (fReadyForTransients) { diff --git a/source/visualization/XXX/src/G4XXXStoredViewer.cc b/source/visualization/XXX/src/G4XXXStoredViewer.cc index 6a213395cb..28f6809027 100644 --- a/source/visualization/XXX/src/G4XXXStoredViewer.cc +++ b/source/visualization/XXX/src/G4XXXStoredViewer.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4XXXStoredViewer.cc,v 1.4 2006/06/29 21:27:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4XXXStoredViewer.cc,v 1.5 2006/08/29 16:11:25 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 7th March 2006 @@ -117,19 +117,17 @@ G4bool G4XXXStoredViewer::CompareForKernelVisit(G4ViewParameters& lastVP) // Typical comparison. Taken from OpenGL. if ( (lastVP.GetDrawingStyle () != fVP.GetDrawingStyle ()) || + (lastVP.IsAuxEdgeVisible () != fVP.IsAuxEdgeVisible ()) || (lastVP.GetRepStyle () != fVP.GetRepStyle ()) || (lastVP.IsCulling () != fVP.IsCulling ()) || (lastVP.IsCullingInvisible () != fVP.IsCullingInvisible ()) || (lastVP.IsDensityCulling () != fVP.IsDensityCulling ()) || (lastVP.IsCullingCovered () != fVP.IsCullingCovered ()) || - (lastVP.IsSection () != fVP.IsSection ()) || // No need to visit kernel if section plane changes. - (lastVP.IsCutaway () != fVP.IsCutaway ()) || - (lastVP.GetCutawayPlanes ().size () != - fVP.GetCutawayPlanes ().size ()) || // No need to visit kernel if cutaway planes change. (lastVP.IsExplode () != fVP.IsExplode ()) || (lastVP.GetNoOfSides () != fVP.GetNoOfSides ()) || + (lastVP.IsMarkerNotHidden () != fVP.IsMarkerNotHidden ()) || (lastVP.GetBackgroundColour ()!= fVP.GetBackgroundColour ()) ) { return true; diff --git a/source/visualization/XXX/src/G4XXXViewer.cc b/source/visualization/XXX/src/G4XXXViewer.cc index 6f62356166..998faa8c36 100644 --- a/source/visualization/XXX/src/G4XXXViewer.cc +++ b/source/visualization/XXX/src/G4XXXViewer.cc @@ -25,7 +25,7 @@ // // // $Id: G4XXXViewer.cc,v 1.9 2006/06/29 21:27:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 5th April 2001 diff --git a/source/visualization/management/GNUmakefile b/source/visualization/management/GNUmakefile index dd04a2e081..fbde2ccc40 100644 --- a/source/visualization/management/GNUmakefile +++ b/source/visualization/management/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.14 2006/04/28 10:15:56 allison Exp $ +# $Id: GNUmakefile,v 1.15 2006/11/01 10:56:04 allison Exp $ # ------------------------------------------------------------- # GNUmakefile for visualization library. John Allison, 5/7/95. @@ -30,6 +30,7 @@ CPPFLAGS += -I$(G4BASE)/geometry/solids/Boolean/include CPPFLAGS += -I$(G4BASE)/geometry/management/include CPPFLAGS += -I$(G4BASE)/geometry/volumes/include CPPFLAGS += -I$(G4BASE)/geometry/navigation/include +CPPFLAGS += -I$(G4BASE)/geometry/magneticfield/include CPPFLAGS += -I$(G4BASE)/intercoms/include CPPFLAGS += -I$(G4BASE)/tracking/include CPPFLAGS += -I$(G4BASE)/digits_hits/hits/include diff --git a/source/visualization/management/History b/source/visualization/management/History index b7e3c3f00f..c7b492ef25 100644 --- a/source/visualization/management/History +++ b/source/visualization/management/History @@ -1,4 +1,5 @@ -$Id: History,v 1.62 2006/06/08 20:02:39 allison Exp $ +$Id: History,v 1.90 2006/12/12 11:51:13 gcosmo Exp $ + ------------------------------------------------------------------- ========================================================= @@ -25,6 +26,177 @@ committal in the CVS repository ! History file for visualization management sub-category ------------------------------------------------------ +12th December 2006 Gabriele Cosmo (visman-V08-01-16) +- Commented command "vis/scene/add/eventID" forcing event ID to scene in + G4VisCommandsCompound.cc. + +25th November 2006 John Allison (visman-V08-01-15) +- G4VisCommandsSceneAdd.cc: Follow change of behaviour of G4StateManager. + Supresses eventID message when state == G4State_EventProc unless last event. +- G4VisCommands.cc: /vis/reviewKeptEvents: + o An improvement in the information printed. + o Temporarily set endOfEventAction refresh so that eventID for each event. +- G4VisCommandsScene.cc: /vis/scene/endOfEventAction: + o Restrict warning message so that the warning about the number of + kept events only happens for "accumulate". Improve printing. +- G4VisCommandsViewer.cc: Spelling correction in warning message. +- G4VisManager.cc: Correct for 0 requested kept events. +- G4Scene.cc: Initialise no. of kept events to 0. + +22nd November 2006 John Allison (visman-V08-01-14) +- Fixed /vis/reviewKeptEvents for "stored" viewers. + +21st November 2006 John Allison (visman-V08-01-13) +- Fixed double drawing of event. +- Restored old verbosity and printing interface (for obsolete user vis + managers). + +16th November 2006 John Allison (visman-V08-01-12) +- /vis/scene/notifyHandlers: Refreshes only auto-refresh viewers. + Warning of scene change issued for other viewers. + +15th November 2006 John Allison (visman-V08-01-11) +- First implementation of /vis/reviewKeptEvents. + +14th November 2006 John Allison (visman-V08-01-10) +- Merged visman-V08-01-08-branch onto main branch. + +14th November 2006 John Allison (visman-V08-01-08-08) +- Partial implementation of /vis/reviewKeptEvents. + +14th November 2006 John Allison (visman-V08-01-08-07) +- Minor improvements: + o G4VisManager: Removed event count (not used). + o G4VSceneHandler: Inhibited drawing when vis disabled. + o Various /vis/scene commands: Added update statement so that + handlers are notified after change of scene. Forces rebuild and + refresh of all viewers using current scene. + +12th November 2006 John Allison (visman-V08-01-08-06) +- Further iteration of event refreshing: + o G4VisManager: + ~ Introduced DrawEvent private method for vis manager and G4VSceneHandler. + ~ Removed unused methods from previous attempts. + o G4VSceneHandler: Used vis manager DrawEvent. + o /vis/scene/add/eventID: improved so it picks up event ids of refreshed + events. + +11th November 2006 John Allison (visman-V08-01-08-05) +- Removed /vis/scene/transientsAction. Now event keeping by the vis + manager is automatic if there is a valid scene. If the user issues + "/vis/scene/endOfEventAction accumulate []", events are kept up + to a maximum N in number (N<0 means unlimited, the default value is + 100). Otherwise just the last event is kept. +- Tidied up. + +9th November 2006 John Allison (visman-V08-01-08-04) +- G4VisManager: Removed data memebers associated with previous attempts + at event refreshing. +- G4VSceneHandler.cc: Removed previous attempts at event refreshing. +- /vis/drawVolume and /vis/scene/add/volume: Improved guidance for parallel + worlds. +- /vis/viewer/select: Ensure refresh for auto-refreshing viewers. +- /vis/viewer/set/autoRefresh: Inhibit refresh for auto-refreshing viewers. + +8th November 2006 John Allison (visman-V08-01-08-03) +- First attempt at using event keeping to refresh views. + +6th November 2006 John Allison (visman-V08-01-08-02) +- Merged visman-V08-01-09. + +6th November 2006 John Allison (visman-V08-01-09) +- /vis/drawVolume and /vis/specify: Suppress all but first warning about + needing to refresh for viewers that are not auto refresh. +- G4VScenehandler.cc: Remove warning about emepty scene. (Subsequent action + is to add a world, if empty - reasonable behaviour.) + +5th November 2006 John Allison (visman-V08-01-08-01) +- G4VisCommandsSceneAdd.cc: Improved implementation of parallel worlds. Gets + material world = *(transportationManager->GetWorldsIterator()) in all cases + following fixes run-V08-01-ref04-01 and geomnav-V08-01-ref04-01. + +3rd November 2006 John Allison (visman-V08-01-08-00) +- On visman-V08-01-08-branch. +- G4VisCommandsSceneAdd.cc: First implementation of parallel worlds + visualisation: /vis/scene/add/volume worlds +- G4VisCommandsCompound.cc: Minor re-ordering of commands in /vis/drawVolume + to avoid warning messages about empty scene. + +3rd November 2006 John Allison (visman-V08-01-08 with tracking-V08-01-05) +- Activated /vis/scene/add/trajectories with "rich" and "smooth" - see below. + Needs tracking-V08-01-05. + +1st November 2006 John Allison (visman-V08-01-07) +- /vis/scene/add/trajectories: + o Allow string parameters "rich" and "smooth". Not yet activated + (awaiting tags in tracking). + o Deprecate use of integer parameter (i_mode). +- GNUmakefile: Add geometry/magneticfield/include (for new + /vis/scene/add/trajectories command above). +- G4VisManager.cc: Remove unnecessary comment line. + +---------------------------------------------------- +19th September 2006 John Allison (visman-V08-01-06) +- G4ViewParameters: Added ExplodeCentre. +- G4VisCommandsGeometrySet.cc: Bug fix in /vis/geometry/set/colour. + +---------------------------------------------------- +13th September 2006 John Allison (visman-V08-01-05) +- G4ViewParameters: Improved setting and access to explode factor. +- G4VisCommandsViewer: Added /vis/viewer/clone. +- G4VisCommandsViewerSet: Added /vis/viewer/set/explodeFactor. +- G4VisManager.cc: Registered /vis/viewer/clone. +- G4VSceneHandler.cc: Pass explode factor to modeling parameters. + +12th September 2006 Jane Tinslay +- Add attribute based trajectory drawing & filtering, and attribute based + hit filtering + +--------------------------------------------------- +4th September 2006 John Allison (visman-V08-01-04) +- G4ViewParameters: Added CutawayMode and ChangeCutawayPlane. +- Added /vis/viewer/addCutawayPlane, changeCutawayPlane, clearCutawayPlanes + and /vis/viewer/set/cutawayMode. + +30th August 2006 John Allison (visman-V08-01-03 - needs modeling-V08-01-05) +- Added /vis/viewer/set/globalLineWidthScale. +- Augmented /vis/scene/add/volume to include intersection of clipping volume + (only box -box *box at present). +- G4VSceneHandler: + o Added GetLineWidth to take account of GlobalLineWidthScale. + o Added CreateSection/CutawayPolyhedron to exploit generic sectioning + (DCUT) and cutaways. Currently not activated due to instabilities in + BooleanProcessor. +- G4ViewParameters: + o Added GlobalLineWidthScale. + o Removed IsViewGeom/Hits/Digis (functionality available in G4Scene). + +14th August 2006 John Allison (visman-V08-01-02) +- G4VisManager.hh: Added some OpenGL friends. +- G4VisCommandsCompound.cc: /vis/drawVolume: re-ordered "attach" + before "add/volume". Catches non-existing handlers better. Overall + effect of compound command unchanged. +- G4VSceneHandler.cc: Added (commented out) code for "event refreshing". + +10th July 2006 John Allison (visman-V08-01-01) +- Co-works with greps-V08-01-01. +- G4VSceneHandler: + o Removed Establish/DecommissionSpecials. + o Respect rationalised G4ModelingParameters. + o Added GetNoOfSides that respects forced line segments per circle. +- G4VisCommandsScene.cc: Spelling correction. + +3rd July 2006 John Allison (visman-V08-01-00) +- /vis/scene/transientsAction: Added max number of events parameter. +- Added /vis/viewer/clearTransients. +- Improved /vis/list. +- G4VisManager.hh/icc: Added data members and acces for event copying. +- G4VisManager.cc: + o Verbosity control of model printing. + o (Commented out) code for event copying. + - G4VSceneHandler.cc: + o (Commented out) code for event copying. + 8th June 2006 John Allison (visman-V08-00-23) - Fixed bug in /vis/scene/endOfRunAction introduced in visman-V08-00-14 that made it ineffective. diff --git a/source/visualization/management/include/G4GraphicsSystemList.hh b/source/visualization/management/include/G4GraphicsSystemList.hh index c44c4eff78..8fc5093e91 100644 --- a/source/visualization/management/include/G4GraphicsSystemList.hh +++ b/source/visualization/management/include/G4GraphicsSystemList.hh @@ -25,7 +25,7 @@ // // // $Id: G4GraphicsSystemList.hh,v 1.9 2006/06/29 21:27:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 2nd April 1996 diff --git a/source/visualization/management/include/G4Scene.hh b/source/visualization/management/include/G4Scene.hh index 6ec5fa32cc..7f6098886c 100644 --- a/source/visualization/management/include/G4Scene.hh +++ b/source/visualization/management/include/G4Scene.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Scene.hh,v 1.17 2006/06/29 21:27:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Scene.hh,v 1.18 2006/11/14 14:59:54 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Scene John Allison 19th July 1996. @@ -90,16 +90,18 @@ public: // With description // "transient" objects, such as hits, at end of event. Otherwise // they will be accumulated. + G4int GetMaxNumberOfKeptEvents() const; + // If RefreshAtEndOfEvent is false, events of the current run are + // kept up to this maximum number. A negative value means all + // events of current run are kept. The events are available for + // viewing at the end of run, but are deleted just before the start + // of the next run. + G4bool GetRefreshAtEndOfRun () const; // If true, the visualization manager will request viewer to refresh // "transient" objects, such as hits, at end of run. Otherwise // they will be accumulated. - G4bool GetRecomputeTransients () const; - // If true, the visualization manager will attempt to re-run events - // in order to reconstruct trajectories, etc., when the viewer - // requests a scene traversal. - ////////////////////////////////////////////// // Add and Set functions... @@ -133,16 +135,18 @@ public: // With description // refresh "transient" objects, such as hits, at end of event. // Otherwise they will be accumulated. + void SetMaxNumberOfKeptEvents(G4int); + // If RefreshAtEndOfEvent is false, events of the current run are + // kept up to this maximum number. A negative value means all + // events of current run are kept. The events are available for + // viewing at the end of run, but are deleted just before the start + // of the next run. + void SetRefreshAtEndOfRun(G4bool); // If set true, the visualization manager will request viewer to // refresh "transient" objects, such as hits, at end of run. // Otherwise they will be accumulated. - void SetRecomputeTransients(G4bool); - // If set true, the visualization manager will attempt to re-run - // events in order to reconstruct trajectories, etc., when the - // viewer requests a scene traversal. - ////////////////////////////////////////////// // Other functions... @@ -157,7 +161,7 @@ private: G4Point3D fStandardTargetPoint; G4bool fRefreshAtEndOfEvent; G4bool fRefreshAtEndOfRun; - G4bool fRecomputeTransients; + G4int fMaxNumberOfKeptEvents; }; #include "G4Scene.icc" diff --git a/source/visualization/management/include/G4Scene.icc b/source/visualization/management/include/G4Scene.icc index fc009f4a9e..87488c6559 100644 --- a/source/visualization/management/include/G4Scene.icc +++ b/source/visualization/management/include/G4Scene.icc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Scene.icc,v 1.13 2006/06/29 21:27:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Scene.icc,v 1.14 2006/11/14 14:59:54 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Scene data John Allison 19th July 1996. @@ -64,12 +64,12 @@ inline G4bool G4Scene::GetRefreshAtEndOfEvent () const { return fRefreshAtEndOfEvent; } -inline G4bool G4Scene::GetRefreshAtEndOfRun () const { - return fRefreshAtEndOfRun; +inline G4int G4Scene::GetMaxNumberOfKeptEvents() const { + return fMaxNumberOfKeptEvents; } -inline G4bool G4Scene::GetRecomputeTransients () const { - return fRecomputeTransients; +inline G4bool G4Scene::GetRefreshAtEndOfRun () const { + return fRefreshAtEndOfRun; } inline std::vector& G4Scene::SetRunDurationModelList () @@ -86,10 +86,10 @@ inline void G4Scene::SetRefreshAtEndOfEvent(G4bool refresh) { fRefreshAtEndOfEvent = refresh; } +inline void G4Scene::SetMaxNumberOfKeptEvents(G4int max) { + fMaxNumberOfKeptEvents = max; +} + inline void G4Scene::SetRefreshAtEndOfRun(G4bool refresh) { fRefreshAtEndOfRun = refresh; } - -inline void G4Scene::SetRecomputeTransients(G4bool recompute) { - fRecomputeTransients = recompute; -} diff --git a/source/visualization/management/include/G4SceneHandlerList.hh b/source/visualization/management/include/G4SceneHandlerList.hh index 7262a92e02..a598b9935b 100644 --- a/source/visualization/management/include/G4SceneHandlerList.hh +++ b/source/visualization/management/include/G4SceneHandlerList.hh @@ -25,7 +25,7 @@ // // // $Id: G4SceneHandlerList.hh,v 1.8 2006/06/29 21:28:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison May 1996 diff --git a/source/visualization/management/include/G4SceneList.hh b/source/visualization/management/include/G4SceneList.hh index f04b5ed6a3..1c0e7881f7 100644 --- a/source/visualization/management/include/G4SceneList.hh +++ b/source/visualization/management/include/G4SceneList.hh @@ -25,7 +25,7 @@ // // // $Id: G4SceneList.hh,v 1.10 2006/06/29 21:28:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 9th August 1998 diff --git a/source/visualization/management/include/G4VGraphicsSystem.hh b/source/visualization/management/include/G4VGraphicsSystem.hh index 69cbc44f10..667ab170b4 100644 --- a/source/visualization/management/include/G4VGraphicsSystem.hh +++ b/source/visualization/management/include/G4VGraphicsSystem.hh @@ -25,7 +25,7 @@ // // // $Id: G4VGraphicsSystem.hh,v 1.11 2006/06/29 21:28:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 27th March 1996 diff --git a/source/visualization/management/include/G4VGraphicsSystem.icc b/source/visualization/management/include/G4VGraphicsSystem.icc index db0d3bcf73..b912e8182c 100644 --- a/source/visualization/management/include/G4VGraphicsSystem.icc +++ b/source/visualization/management/include/G4VGraphicsSystem.icc @@ -25,7 +25,7 @@ // // // $Id: G4VGraphicsSystem.icc,v 1.7 2006/06/29 21:28:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 27th March 1996 diff --git a/source/visualization/management/include/G4VSceneHandler.hh b/source/visualization/management/include/G4VSceneHandler.hh index f92126486d..7472b222ed 100644 --- a/source/visualization/management/include/G4VSceneHandler.hh +++ b/source/visualization/management/include/G4VSceneHandler.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VSceneHandler.hh,v 1.33 2006/06/29 21:28:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VSceneHandler.hh,v 1.37 2006/11/15 19:25:31 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 19th July 1996. @@ -57,6 +57,7 @@ class G4VGraphicsSystem; class G4LogicalVolume; class G4VPhysicalVolume; class G4Material; +class G4Event; class G4VSceneHandler: public G4VGraphicsScene { @@ -190,14 +191,6 @@ public: // With description virtual void AddPrimitive (const G4Polyhedron&) = 0; virtual void AddPrimitive (const G4NURBS&) = 0; - /////////////////////////////////////////////////////////////// - // Other inherited functions. - - virtual void EstablishSpecials (G4PhysicalVolumeModel&); - // Used to establish any special relationships between scene handler and this - // particular type of model - non-pure, i.e., no requirement to - // implement. See G4PhysicalVolumeModel.hh for details. - ////////////////////////////////////////////////////////////// // Access functions. const G4String& GetName () const; @@ -223,17 +216,25 @@ public: // With description void SetTransientsDrawnThisEvent (G4bool); void SetTransientsDrawnThisRun (G4bool); // Maintained by vis manager. + void SetEvent (const G4Event*); + // If non-zero, this event is used in ProcessScene. Otherwise, the + // current event, or last event(s) are used. The user must + // SetEvent(0) when finished. ////////////////////////////////////////////////////////////// // Public utility functions. const G4Colour& GetColour (const G4Visible&); const G4Colour& GetColor (const G4Visible&); - // The above return colour of G4Visible object, or default global colour. + // Returns colour of G4Visible object, or default global colour. const G4Colour& GetTextColour (const G4Text&); const G4Colour& GetTextColor (const G4Text&); - // The above return colour of G4Text object, or default text colour. + // Returns colour of G4Text object, or default text colour. + + G4double GetLineWidth(const G4Visible& visible); + // Returns line width of G4Visible object, or default line width. + // Multiplies by GlobalLineWidthScale. G4ViewParameters::DrawingStyle GetDrawingStyle (const G4VisAttributes*); // Returns drawing style from current view parameters, unless the user @@ -241,14 +242,19 @@ public: // With description // current view parameter. G4bool GetAuxEdgeVisible (const G4VisAttributes*); - // Returns auxiliary edge visiblility from current view parameters, + // Returns auxiliary edge visibility from current view parameters, // unless the user has forced through the vis attributes, thereby // over-riding the current view parameter. + G4int GetNoOfSides(const G4VisAttributes* pVisAttribs); + // Returns no. of sides (lines segments per circle) from current + // view parameters, unless the user has forced through the vis + // attributes, thereby over-riding the current view parameter. + G4double GetMarkerSize (const G4VMarker&, MarkerSizeType&); // Returns applicable marker size (diameter) and type (in second // argument). Uses global default marker if marker sizes are not - // set. + // set. Multiplies by GlobalMarkerScale. G4double GetMarkerDiameter (const G4VMarker&, MarkerSizeType&); // Alias for GetMarkerSize. @@ -262,6 +268,10 @@ public: // With description // maintains its own Scene Data and View Parameters, which must be // converted, when needed, to Modeling Parameters. + void DrawEvent(const G4Event*); + // Checks scene's end-of-event model list and draws trajectories, + // hits, etc. + ////////////////////////////////////////////////////////////// // Administration functions. @@ -295,6 +305,15 @@ protected: virtual void RequestPrimitives (const G4VSolid& solid); + ////////////////////////////////////////////////////////////// + // Other internal routines... + + virtual const G4Polyhedron* CreateSectionPolyhedron (); + virtual const G4Polyhedron* CreateCutawayPolyhedron (); + // Generic clipping using the BooleanProcessor in graphics_reps is + // implemented in this class. Subclasses that implement their own + // clipping should provide an override that returns zero. + ////////////////////////////////////////////////////////////// // Data members @@ -318,10 +337,7 @@ protected: // object transformation. G4int fNestingDepth; // For Begin/EndPrimitives. const G4VisAttributes* fpVisAttribs; // Working vis attributes. - G4int fCurrentDepth; // Current depth of geom. hierarchy. - G4VPhysicalVolume* fpCurrentPV; // Current physical volume. - G4LogicalVolume* fpCurrentLV; // Current logical volume. - G4Material* fpCurrentMaterial; // Current material. + const G4Event* fRequestedEvent; // If non-zero, use this event. const G4Transform3D fIdentityTransformation; private: diff --git a/source/visualization/management/include/G4VSceneHandler.icc b/source/visualization/management/include/G4VSceneHandler.icc index 86d01f77f3..fae69ae690 100644 --- a/source/visualization/management/include/G4VSceneHandler.icc +++ b/source/visualization/management/include/G4VSceneHandler.icc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VSceneHandler.icc,v 1.17 2006/06/29 21:28:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VSceneHandler.icc,v 1.18 2006/11/15 19:25:31 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 19th July 1996. @@ -123,6 +123,9 @@ inline void G4VSceneHandler::SetTransientsDrawnThisRun (G4bool drawn) { fTransientsDrawnThisRun = drawn; } +inline void G4VSceneHandler::SetEvent (const G4Event* event) { + fRequestedEvent = event; +} inline const G4Colour& G4VSceneHandler::GetColor (const G4Visible& visible) { return GetColour (visible); } diff --git a/source/visualization/management/include/G4VUserVisAction.hh b/source/visualization/management/include/G4VUserVisAction.hh index f713a78b58..df8db79f00 100644 --- a/source/visualization/management/include/G4VUserVisAction.hh +++ b/source/visualization/management/include/G4VUserVisAction.hh @@ -25,7 +25,7 @@ // // // $Id: G4VUserVisAction.hh,v 1.8 2006/06/29 21:28:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/visualization/management/include/G4VViewer.hh b/source/visualization/management/include/G4VViewer.hh index 3f5168fb69..b26f9f3ffb 100644 --- a/source/visualization/management/include/G4VViewer.hh +++ b/source/visualization/management/include/G4VViewer.hh @@ -25,7 +25,7 @@ // // // $Id: G4VViewer.hh,v 1.18 2006/06/29 21:28:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 27th March 1996 diff --git a/source/visualization/management/include/G4VViewer.icc b/source/visualization/management/include/G4VViewer.icc index 9900e5e419..5166239eb7 100644 --- a/source/visualization/management/include/G4VViewer.icc +++ b/source/visualization/management/include/G4VViewer.icc @@ -25,7 +25,7 @@ // // // $Id: G4VViewer.icc,v 1.11 2006/06/29 21:28:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 30th December 1996 diff --git a/source/visualization/management/include/G4VVisCommand.hh b/source/visualization/management/include/G4VVisCommand.hh index 8a0ea5250f..c48edbc48a 100644 --- a/source/visualization/management/include/G4VVisCommand.hh +++ b/source/visualization/management/include/G4VVisCommand.hh @@ -25,7 +25,7 @@ // // // $Id: G4VVisCommand.hh,v 1.18 2006/06/29 21:28:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // Base class for visualization commands - John Allison 9th August 1998 // It is really a messenger - we have one command per messenger. diff --git a/source/visualization/management/include/G4VVisCommand.icc b/source/visualization/management/include/G4VVisCommand.icc index 1cdf7f4ab7..3ab938206f 100644 --- a/source/visualization/management/include/G4VVisCommand.icc +++ b/source/visualization/management/include/G4VVisCommand.icc @@ -25,7 +25,7 @@ // // // $Id: G4VVisCommand.icc,v 1.5 2006/06/29 21:28:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // Base class for visualization commands - John Allison 9th August 1998 // It is really a messenger - we have one command per messenger. diff --git a/source/visualization/management/include/G4ViewParameters.hh b/source/visualization/management/include/G4ViewParameters.hh index 42622b8545..e1259896d8 100644 --- a/source/visualization/management/include/G4ViewParameters.hh +++ b/source/visualization/management/include/G4ViewParameters.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4ViewParameters.hh,v 1.21 2006/06/29 21:28:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ViewParameters.hh,v 1.25 2006/09/19 16:02:31 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 19th July 1996 @@ -100,6 +100,11 @@ public: // With description nurbs // Use G4NURBS. }; + enum CutawayMode { + cutawayUnion, // Union (addition) of result of each cutaway plane. + cutawayIntersection // Intersection (multiplication) " . + }; + friend std::ostream& operator << (std::ostream&, const DrawingStyle&); @@ -125,9 +130,11 @@ public: // With description G4bool IsSection () const; const G4Plane3D& GetSectionPlane () const; G4bool IsCutaway () const; + CutawayMode GetCutawayMode () const; const G4Planes& GetCutawayPlanes () const; G4bool IsExplode () const; G4double GetExplodeFactor () const; + const G4Point3D& GetExplodeCentre () const; G4int GetNoOfSides () const; const G4Vector3D& GetViewpointDirection () const; const G4Vector3D& GetUpVector () const; @@ -140,13 +147,11 @@ public: // With description const G4Vector3D& GetLightpointDirection () const; // Relative... G4Vector3D& GetActualLightpointDirection (); // Actual... // ... depending on GetLightsMoveWithCamera. - G4bool IsViewGeom () const; - G4bool IsViewHits () const; - G4bool IsViewDigis () const; const G4VisAttributes* GetDefaultVisAttributes () const; const G4VisAttributes* GetDefaultTextVisAttributes () const; const G4VMarker& GetDefaultMarker () const; G4double GetGlobalMarkerScale () const; + G4double GetGlobalLineWidthScale () const; G4bool IsMarkerNotHidden () const; G4int GetWindowSizeHintX () const; G4int GetWindowSizeHintY () const; @@ -179,10 +184,13 @@ public: // With description void SetCullingCovered (G4bool); void SetSectionPlane (const G4Plane3D& sectionPlane); void UnsetSectionPlane (); + void SetCutawayMode (CutawayMode); void AddCutawayPlane (const G4Plane3D& cutawayPlane); + void ChangeCutawayPlane (size_t index, const G4Plane3D& cutawayPlane); void ClearCutawayPlanes (); void SetExplodeFactor (G4double explodeFactor); void UnsetExplodeFactor (); + void SetExplodeCentre (const G4Point3D& explodeCentre); G4int SetNoOfSides (G4int nSides); // Returns actual number set. void SetViewpointDirection (const G4Vector3D& viewpointDirection); // Calls the following to get lightpoint direction right too. @@ -201,16 +209,11 @@ public: // With description void SetLightsMoveWithCamera (G4bool moves); void SetPan (G4double right, G4double up); void IncrementPan (G4double right, G4double up); - void SetViewGeom (); - void UnsetViewGeom (); - void SetViewHits (); - void UnsetViewHits (); - void SetViewDigis (); - void UnsetViewDigis (); void SetDefaultVisAttributes (const G4VisAttributes&); void SetDefaultTextVisAttributes (const G4VisAttributes&); void SetDefaultMarker (const G4VMarker& defaultMarker); void SetGlobalMarkerScale (G4double globalMarkerScale); + void SetGlobalLineWidthScale (G4double globalLineWidthScale); void SetMarkerHidden (); void SetMarkerNotHidden (); void SetWindowSizeHint (G4int xHint, G4int yHint); @@ -232,10 +235,10 @@ private: G4bool fCullCovered; // Cull daughters covered by opaque mothers. G4bool fSection; // Section drawing requested (DCUT in GEANT3). G4Plane3D fSectionPlane; // Cut plane for section drawing (DCUT). - G4bool fCutaway; // Cutaway flag. + CutawayMode fCutawayMode; // Cutaway mode. G4Planes fCutawayPlanes; // Set of planes used for cutaway. - G4bool fExplode; // Explode flag. - G4double fExplodeFactor; + G4double fExplodeFactor; // Explode along radius by this factor... + G4Point3D fExplodeCentre; // ...about this centre. G4int fNoOfSides; // ...if polygon approximates circle. G4Vector3D fViewpointDirection; G4Vector3D fUpVector; // Up vector. (Warning: MUST NOT be parallel @@ -249,13 +252,11 @@ private: G4Vector3D fRelativeLightpointDirection; // i.e., rel. to object or camera accoding to G4bool fLightsMoveWithCamera. G4Vector3D fActualLightpointDirection; - G4bool fViewGeom; // View geometry objects. - G4bool fViewHits; // View hits, if any. - G4bool fViewDigis; // View digis, if any. G4VisAttributes fDefaultVisAttributes; G4VisAttributes fDefaultTextVisAttributes; G4VMarker fDefaultMarker; G4double fGlobalMarkerScale; + G4double fGlobalLineWidthScale; G4bool fMarkerNotHidden; // True if transients are to be drawn and not hidden by // hidden-line-hidden-surface removal algorithms, e.g., z-buffer diff --git a/source/visualization/management/include/G4ViewParameters.icc b/source/visualization/management/include/G4ViewParameters.icc index 582a194dee..684c1b9ba0 100644 --- a/source/visualization/management/include/G4ViewParameters.icc +++ b/source/visualization/management/include/G4ViewParameters.icc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4ViewParameters.icc,v 1.11 2006/06/29 21:28:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ViewParameters.icc,v 1.15 2006/09/19 16:02:31 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 20th October 1996 @@ -73,21 +73,28 @@ inline const G4Plane3D& G4ViewParameters::GetSectionPlane () const { } inline G4bool G4ViewParameters::IsCutaway () const { - return fCutaway; + return fCutawayPlanes.size() > 0; } +inline G4ViewParameters::CutawayMode G4ViewParameters::GetCutawayMode () const +{ return fCutawayMode;} + inline const G4Planes& G4ViewParameters::GetCutawayPlanes () const { return fCutawayPlanes; } inline G4bool G4ViewParameters::IsExplode () const { - return fExplode; + return fExplodeFactor > 1.; } inline G4double G4ViewParameters::GetExplodeFactor () const { return fExplodeFactor; } +inline const G4Point3D& G4ViewParameters::GetExplodeCentre () const { + return fExplodeCentre; +} + inline G4int G4ViewParameters::GetNoOfSides () const { return fNoOfSides; } @@ -128,18 +135,6 @@ inline G4bool G4ViewParameters::GetLightsMoveWithCamera () const { return fLightsMoveWithCamera; } -inline G4bool G4ViewParameters::IsViewGeom () const { - return fViewGeom; -} - -inline G4bool G4ViewParameters::IsViewHits () const { - return fViewHits; -} - -inline G4bool G4ViewParameters::IsViewDigis () const { - return fViewDigis; -} - inline const G4VisAttributes* G4ViewParameters::GetDefaultVisAttributes () const { return &fDefaultVisAttributes; @@ -158,6 +153,10 @@ inline G4double G4ViewParameters::GetGlobalMarkerScale () const { return fGlobalMarkerScale; } +inline G4double G4ViewParameters::GetGlobalLineWidthScale () const { + return fGlobalLineWidthScale; +} + inline G4bool G4ViewParameters::IsMarkerNotHidden () const { return fMarkerNotHidden; } @@ -221,20 +220,33 @@ inline void G4ViewParameters::UnsetSectionPlane () { fSection = false; } +inline void G4ViewParameters::SetCutawayMode +(G4ViewParameters::CutawayMode cutawayMode) { + fCutawayMode = cutawayMode; +} + +inline void G4ViewParameters::ClearCutawayPlanes () { + fCutawayPlanes.clear (); +} + inline void G4ViewParameters::SetViewpointDirection (const G4Vector3D& viewpointDirection) { SetViewAndLights (viewpointDirection); } inline void G4ViewParameters::SetExplodeFactor (G4double explodeFactor) { - fExplode = true; fExplodeFactor = explodeFactor; + if (fExplodeFactor < 1.) fExplodeFactor = 1.; } inline void G4ViewParameters::UnsetExplodeFactor () { - fExplode = false; + fExplodeFactor = 1.; } +inline void G4ViewParameters::SetExplodeCentre +(const G4Point3D& explodeCentre) { + fExplodeCentre = explodeCentre; +} inline void G4ViewParameters::SetUpVector (const G4Vector3D& upVector) { fUpVector = upVector; } @@ -273,30 +285,6 @@ inline void G4ViewParameters::SetLightsMoveWithCamera (G4bool moves) { fLightsMoveWithCamera = moves; } -inline void G4ViewParameters::SetViewGeom () { - fViewGeom = true; -} - -inline void G4ViewParameters::UnsetViewGeom () { - fViewGeom = false; -} - -inline void G4ViewParameters::SetViewHits () { - fViewHits = true; -} - -inline void G4ViewParameters::UnsetViewHits () { - fViewHits = false; -} - -inline void G4ViewParameters::SetViewDigis () { - fViewDigis = true; -} - -inline void G4ViewParameters::UnsetViewDigis () { - fViewDigis = false; -} - inline void G4ViewParameters::SetDefaultVisAttributes (const G4VisAttributes& defaultVisAttributes) { fDefaultVisAttributes = defaultVisAttributes; @@ -317,6 +305,11 @@ G4ViewParameters::SetGlobalMarkerScale (G4double globalMarkerScale) { fGlobalMarkerScale = globalMarkerScale; } +inline void +G4ViewParameters::SetGlobalLineWidthScale (G4double globalLineWidthScale) { + fGlobalLineWidthScale = globalLineWidthScale; +} + inline void G4ViewParameters::SetMarkerHidden () { fMarkerNotHidden = false; } diff --git a/source/visualization/management/include/G4ViewerList.hh b/source/visualization/management/include/G4ViewerList.hh index 13e3214e85..ae832f8860 100644 --- a/source/visualization/management/include/G4ViewerList.hh +++ b/source/visualization/management/include/G4ViewerList.hh @@ -25,7 +25,7 @@ // // // $Id: G4ViewerList.hh,v 1.8 2006/06/29 21:28:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison May 1996 diff --git a/source/visualization/management/include/G4VisCommandModelCreate.hh b/source/visualization/management/include/G4VisCommandModelCreate.hh index 0befce5fd9..eac9855654 100644 --- a/source/visualization/management/include/G4VisCommandModelCreate.hh +++ b/source/visualization/management/include/G4VisCommandModelCreate.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4VisCommandModelCreate.hh,v 1.3 2006/06/29 21:28:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Jane Tinslay, John Allison, Joseph Perl October 2005 // diff --git a/source/visualization/management/include/G4VisCommands.hh b/source/visualization/management/include/G4VisCommands.hh index 7e05fe37e3..8c1077fcea 100644 --- a/source/visualization/management/include/G4VisCommands.hh +++ b/source/visualization/management/include/G4VisCommands.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VisCommands.hh,v 1.5 2006/06/29 21:28:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VisCommands.hh,v 1.6 2006/11/14 14:59:54 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // /vis/ top level commands - John Allison 5th February 2001 @@ -63,6 +63,18 @@ private: G4UIcmdWithAString* fpCommand; }; +class G4VisCommandReviewKeptEvents: public G4VVisCommand { +public: + G4VisCommandReviewKeptEvents (); + virtual ~G4VisCommandReviewKeptEvents (); + G4String GetCurrentValue (G4UIcommand* command); + void SetNewValue (G4UIcommand* command, G4String newValue); +private: + G4VisCommandReviewKeptEvents (const G4VisCommandReviewKeptEvents&); + G4VisCommandReviewKeptEvents& operator = (const G4VisCommandReviewKeptEvents&); + G4UIcmdWithAString* fpCommand; +}; + class G4VisCommandVerbose: public G4VVisCommand { public: G4VisCommandVerbose (); diff --git a/source/visualization/management/include/G4VisCommandsCompound.hh b/source/visualization/management/include/G4VisCommandsCompound.hh index 3fbfa4bdc6..c2476f1ec0 100644 --- a/source/visualization/management/include/G4VisCommandsCompound.hh +++ b/source/visualization/management/include/G4VisCommandsCompound.hh @@ -25,7 +25,7 @@ // // // $Id: G4VisCommandsCompound.hh,v 1.9 2006/06/29 21:28:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // Compound /vis/ commands - John Allison 15th May 2000 diff --git a/source/visualization/management/include/G4VisCommandsGeometry.hh b/source/visualization/management/include/G4VisCommandsGeometry.hh index 4f82e8eb17..2be5b087a1 100644 --- a/source/visualization/management/include/G4VisCommandsGeometry.hh +++ b/source/visualization/management/include/G4VisCommandsGeometry.hh @@ -25,7 +25,7 @@ // // // $Id: G4VisCommandsGeometry.hh,v 1.3 2006/06/29 21:28:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // /vis/geometry commands - John Allison 31st January 2006 diff --git a/source/visualization/management/include/G4VisCommandsGeometrySet.hh b/source/visualization/management/include/G4VisCommandsGeometrySet.hh index 3eb08ff319..1b798e48c4 100644 --- a/source/visualization/management/include/G4VisCommandsGeometrySet.hh +++ b/source/visualization/management/include/G4VisCommandsGeometrySet.hh @@ -25,7 +25,7 @@ // // // $Id: G4VisCommandsGeometrySet.hh,v 1.2 2006/06/29 21:28:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // /vis/geometry commands - John Allison 31st January 2006 diff --git a/source/visualization/management/include/G4VisCommandsListManager.hh b/source/visualization/management/include/G4VisCommandsListManager.hh index 1d60c4add3..005abc4113 100644 --- a/source/visualization/management/include/G4VisCommandsListManager.hh +++ b/source/visualization/management/include/G4VisCommandsListManager.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4VisCommandsListManager.hh,v 1.3 2006/06/29 21:28:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Jane Tinslay, John Allison, Joseph Perl October 2005 // diff --git a/source/visualization/management/include/G4VisCommandsScene.hh b/source/visualization/management/include/G4VisCommandsScene.hh index 01b6c76608..67cc8fe9ed 100644 --- a/source/visualization/management/include/G4VisCommandsScene.hh +++ b/source/visualization/management/include/G4VisCommandsScene.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VisCommandsScene.hh,v 1.17 2006/06/29 21:28:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VisCommandsScene.hh,v 1.19 2006/11/14 14:59:54 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // /vis/scene commands - John Allison 9th August 1998 @@ -73,7 +73,7 @@ private: G4VisCommandSceneEndOfEventAction (const G4VisCommandSceneEndOfEventAction&); G4VisCommandSceneEndOfEventAction& operator = (const G4VisCommandSceneEndOfEventAction&); - G4UIcmdWithAString* fpCommand; + G4UIcommand* fpCommand; }; class G4VisCommandSceneEndOfRunAction: public G4VVisCommandScene { @@ -126,17 +126,4 @@ private: G4UIcmdWithAString* fpCommand; }; -class G4VisCommandSceneTransientsAction: public G4VVisCommandScene { -public: - G4VisCommandSceneTransientsAction (); - virtual ~G4VisCommandSceneTransientsAction (); - G4String GetCurrentValue (G4UIcommand* command); - void SetNewValue (G4UIcommand* command, G4String newValue); -private: - G4VisCommandSceneTransientsAction (const G4VisCommandSceneTransientsAction&); - G4VisCommandSceneTransientsAction& operator = - (const G4VisCommandSceneTransientsAction&); - G4UIcmdWithAString* fpCommand; -}; - #endif diff --git a/source/visualization/management/include/G4VisCommandsSceneAdd.hh b/source/visualization/management/include/G4VisCommandsSceneAdd.hh index df4f21773d..7041bb2745 100644 --- a/source/visualization/management/include/G4VisCommandsSceneAdd.hh +++ b/source/visualization/management/include/G4VisCommandsSceneAdd.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VisCommandsSceneAdd.hh,v 1.16 2006/06/29 21:28:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VisCommandsSceneAdd.hh,v 1.17 2006/11/01 10:50:28 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // /vis/scene commands - John Allison 9th August 1998 @@ -35,7 +35,7 @@ #include "G4VisCommandsScene.hh" class G4UIcmdWithoutParameter; -class G4UIcmdWithAnInteger; +class G4UIcmdWithAString; #include "G4Transform3D.hh" #include "G4VisAttributes.hh" @@ -166,7 +166,7 @@ private: G4VisCommandSceneAddTrajectories (const G4VisCommandSceneAddTrajectories&); G4VisCommandSceneAddTrajectories& operator = (const G4VisCommandSceneAddTrajectories&); - G4UIcmdWithAnInteger* fpCommand; + G4UIcmdWithAString* fpCommand; }; class G4VisCommandSceneAddUserAction: public G4VVisCommandScene { diff --git a/source/visualization/management/include/G4VisCommandsSceneHandler.hh b/source/visualization/management/include/G4VisCommandsSceneHandler.hh index 43b33b277d..8502dd584a 100644 --- a/source/visualization/management/include/G4VisCommandsSceneHandler.hh +++ b/source/visualization/management/include/G4VisCommandsSceneHandler.hh @@ -25,7 +25,7 @@ // // // $Id: G4VisCommandsSceneHandler.hh,v 1.8 2006/06/29 21:28:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // /vis/sceneHandler commands - John Allison 10th October 1998 diff --git a/source/visualization/management/include/G4VisCommandsViewer.hh b/source/visualization/management/include/G4VisCommandsViewer.hh index 5ce36a76be..64c7cb274b 100644 --- a/source/visualization/management/include/G4VisCommandsViewer.hh +++ b/source/visualization/management/include/G4VisCommandsViewer.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VisCommandsViewer.hh,v 1.20 2006/06/29 21:28:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VisCommandsViewer.hh,v 1.23 2006/09/13 13:17:29 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // /vis/viewer commands - John Allison 25th October 1998 @@ -37,6 +37,7 @@ class G4VViewer; class G4ViewParameters; class G4UIcommand; +class G4UIcmdWithoutParameter; class G4UIcmdWithAString; class G4UIcmdWithADouble; class G4UIcmdWithADoubleAndUnit; @@ -53,6 +54,30 @@ private: G4VVisCommandViewer& operator = (const G4VVisCommandViewer&); }; +class G4VisCommandViewerAddCutawayPlane: public G4VVisCommandViewer { +public: + G4VisCommandViewerAddCutawayPlane (); + virtual ~G4VisCommandViewerAddCutawayPlane (); + G4String GetCurrentValue (G4UIcommand* command); + void SetNewValue (G4UIcommand* command, G4String newValue); +private: + G4VisCommandViewerAddCutawayPlane (const G4VisCommandViewerAddCutawayPlane&); + G4VisCommandViewerAddCutawayPlane& operator = (const G4VisCommandViewerAddCutawayPlane&); + G4UIcommand* fpCommand; +}; + +class G4VisCommandViewerChangeCutawayPlane: public G4VVisCommandViewer { +public: + G4VisCommandViewerChangeCutawayPlane (); + virtual ~G4VisCommandViewerChangeCutawayPlane (); + G4String GetCurrentValue (G4UIcommand* command); + void SetNewValue (G4UIcommand* command, G4String newValue); +private: + G4VisCommandViewerChangeCutawayPlane (const G4VisCommandViewerChangeCutawayPlane&); + G4VisCommandViewerChangeCutawayPlane& operator = (const G4VisCommandViewerChangeCutawayPlane&); + G4UIcommand* fpCommand; +}; + class G4VisCommandViewerClear: public G4VVisCommandViewer { public: G4VisCommandViewerClear (); @@ -65,6 +90,44 @@ private: G4UIcmdWithAString* fpCommand; }; +class G4VisCommandViewerClearCutawayPlanes: public G4VVisCommandViewer { +public: + G4VisCommandViewerClearCutawayPlanes (); + virtual ~G4VisCommandViewerClearCutawayPlanes (); + G4String GetCurrentValue (G4UIcommand* command); + void SetNewValue (G4UIcommand* command, G4String newValue); +private: + G4VisCommandViewerClearCutawayPlanes (const G4VisCommandViewerClearCutawayPlanes&); + G4VisCommandViewerClearCutawayPlanes& operator = (const G4VisCommandViewerClearCutawayPlanes&); + G4UIcmdWithoutParameter* fpCommand; +}; + +class G4VisCommandViewerClearTransients: public G4VVisCommandViewer { +public: + G4VisCommandViewerClearTransients (); + virtual ~G4VisCommandViewerClearTransients (); + G4String GetCurrentValue (G4UIcommand* command); + void SetNewValue (G4UIcommand* command, G4String newValue); +private: + G4VisCommandViewerClearTransients (const G4VisCommandViewerClearTransients&); + G4VisCommandViewerClearTransients& operator = + (const G4VisCommandViewerClearTransients&); + G4UIcmdWithAString* fpCommand; +}; + +class G4VisCommandViewerClone: public G4VVisCommandViewer { +public: + G4VisCommandViewerClone (); + virtual ~G4VisCommandViewerClone (); + G4String GetCurrentValue (G4UIcommand* command); + void SetNewValue (G4UIcommand* command, G4String newValue); +private: + G4VisCommandViewerClone (const G4VisCommandViewerClone&); + G4VisCommandViewerClone& operator = + (const G4VisCommandViewerClone&); + G4UIcommand* fpCommand; +}; + class G4VisCommandViewerCreate: public G4VVisCommandViewer { public: G4VisCommandViewerCreate (); diff --git a/source/visualization/management/include/G4VisCommandsViewerSet.hh b/source/visualization/management/include/G4VisCommandsViewerSet.hh index d65682fedd..4907b74b8c 100644 --- a/source/visualization/management/include/G4VisCommandsViewerSet.hh +++ b/source/visualization/management/include/G4VisCommandsViewerSet.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VisCommandsViewerSet.hh,v 1.17 2006/06/29 21:28:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VisCommandsViewerSet.hh,v 1.21 2006/09/19 16:03:14 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // /vis/viewer/set commands - John Allison 16th May 2000 @@ -56,8 +56,11 @@ private: G4UIcmdWithABool* fpCommandAuxEdge; G4UIcommand* fpCommandBackground; G4UIcommand* fpCommandCulling; + G4UIcmdWithAString* fpCommandCutawayMode; G4UIcmdWithABool* fpCommandEdge; + G4UIcommand* fpCommandExplodeFactor; G4UIcmdWithADouble* fpCommandGlobalMarkerScale; + G4UIcmdWithADouble* fpCommandGlobalLineWidthScale; G4UIcmdWithABool* fpCommandHiddenEdge; G4UIcmdWithABool* fpCommandHiddenMarker; G4UIcmdWithAnInteger* fpCommandLineSegments; diff --git a/source/visualization/management/include/G4VisExecutive.hh b/source/visualization/management/include/G4VisExecutive.hh index 41444e44ad..963e06d8f8 100644 --- a/source/visualization/management/include/G4VisExecutive.hh +++ b/source/visualization/management/include/G4VisExecutive.hh @@ -25,7 +25,7 @@ // // // $Id: G4VisExecutive.hh,v 1.6 2006/06/29 21:28:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 2nd February 2005 (based on MyVisManager, 24th January 1998). diff --git a/source/visualization/management/include/G4VisExecutive.icc b/source/visualization/management/include/G4VisExecutive.icc index 3d576388e0..d0a5f4f468 100644 --- a/source/visualization/management/include/G4VisExecutive.icc +++ b/source/visualization/management/include/G4VisExecutive.icc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VisExecutive.icc,v 1.13 2006/06/29 21:28:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VisExecutive.icc,v 1.14 2006/09/12 18:55:45 tinslay Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 24th January 1998. @@ -42,6 +42,7 @@ #include "G4HepRep.hh" #include "G4HepRepFile.hh" #include "G4RayTracer.hh" +#include "G4HitFilterFactories.hh" #include "G4TrajectoryFilterFactories.hh" #include "G4TrajectoryModelFactories.hh" #include "G4VRML1File.hh" @@ -147,11 +148,16 @@ G4VisExecutive::RegisterModelFactories() RegisterModelFactory(new G4TrajectoryDrawByChargeFactory()); RegisterModelFactory(new G4TrajectoryDrawByParticleIDFactory()); RegisterModelFactory(new G4TrajectoryDrawByOriginVolumeFactory()); + RegisterModelFactory(new G4TrajectoryDrawByAttributeFactory()); // Trajectory filter models RegisterModelFactory(new G4TrajectoryChargeFilterFactory()); RegisterModelFactory(new G4TrajectoryParticleFilterFactory()); RegisterModelFactory(new G4TrajectoryOriginVolumeFilterFactory()); + RegisterModelFactory(new G4TrajectoryAttributeFilterFactory()); + + // Hit filter models + RegisterModelFactory(new G4HitAttributeFilterFactory()); } #endif diff --git a/source/visualization/management/include/G4VisFeaturesOfDAWNFILE.hh b/source/visualization/management/include/G4VisFeaturesOfDAWNFILE.hh index f96c382d85..a0120ab7d0 100644 --- a/source/visualization/management/include/G4VisFeaturesOfDAWNFILE.hh +++ b/source/visualization/management/include/G4VisFeaturesOfDAWNFILE.hh @@ -25,7 +25,7 @@ // // // $Id: G4VisFeaturesOfDAWNFILE.hh,v 1.5 2006/06/29 21:28:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #ifndef G4VISFEATURESOFDAWNFILE_HH #define G4VISFEATURESOFDAWNFILE_HH diff --git a/source/visualization/management/include/G4VisFeaturesOfFukuiRenderer.hh b/source/visualization/management/include/G4VisFeaturesOfFukuiRenderer.hh index 533f22a396..d23cffc735 100644 --- a/source/visualization/management/include/G4VisFeaturesOfFukuiRenderer.hh +++ b/source/visualization/management/include/G4VisFeaturesOfFukuiRenderer.hh @@ -25,7 +25,7 @@ // // // $Id: G4VisFeaturesOfFukuiRenderer.hh,v 1.5 2006/06/29 21:28:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/visualization/management/include/G4VisFeaturesOfOpenGL.hh b/source/visualization/management/include/G4VisFeaturesOfOpenGL.hh index c429500d0d..cc6b26377b 100644 --- a/source/visualization/management/include/G4VisFeaturesOfOpenGL.hh +++ b/source/visualization/management/include/G4VisFeaturesOfOpenGL.hh @@ -25,7 +25,7 @@ // // // $Id: G4VisFeaturesOfOpenGL.hh,v 1.5 2006/06/29 21:28:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/visualization/management/include/G4VisFeaturesOfOpenInventor.hh b/source/visualization/management/include/G4VisFeaturesOfOpenInventor.hh index f6a726a4d2..7c1000ae30 100644 --- a/source/visualization/management/include/G4VisFeaturesOfOpenInventor.hh +++ b/source/visualization/management/include/G4VisFeaturesOfOpenInventor.hh @@ -25,7 +25,7 @@ // // // $Id: G4VisFeaturesOfOpenInventor.hh,v 1.5 2006/06/29 21:29:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/visualization/management/include/G4VisFilterManager.hh b/source/visualization/management/include/G4VisFilterManager.hh index 0295b55a5f..33803d3a8f 100644 --- a/source/visualization/management/include/G4VisFilterManager.hh +++ b/source/visualization/management/include/G4VisFilterManager.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4VisFilterManager.hh,v 1.4 2006/06/29 21:29:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Filter manager. Manages filter models, factories, messengers, // command placement, filter mode etc diff --git a/source/visualization/management/include/G4VisListManager.hh b/source/visualization/management/include/G4VisListManager.hh index 16dd8225fa..94e0ed55f6 100644 --- a/source/visualization/management/include/G4VisListManager.hh +++ b/source/visualization/management/include/G4VisListManager.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4VisListManager.hh,v 1.8 2006/06/29 21:29:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Jane Tinslay, John Allison, Joseph Perl October 2005 // diff --git a/source/visualization/management/include/G4VisManager.hh b/source/visualization/management/include/G4VisManager.hh index 0b4b653fe6..6ebe3ad5a8 100644 --- a/source/visualization/management/include/G4VisManager.hh +++ b/source/visualization/management/include/G4VisManager.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VisManager.hh,v 1.59 2006/06/29 21:29:06 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VisManager.hh,v 1.65 2006/11/21 14:23:20 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // @@ -105,11 +105,13 @@ template class G4VFilter; template class G4VisFilterManager; template class G4VisModelManager; template class G4VModelFactory; +class G4Event; namespace { // Useful typedef's typedef G4VModelFactory G4TrajDrawModelFactory; typedef G4VModelFactory< G4VFilter > G4TrajFilterFactory; + typedef G4VModelFactory< G4VFilter > G4HitFilterFactory; } class G4VisManager: public G4VVisManager { @@ -126,6 +128,9 @@ class G4VisManager: public G4VVisManager { friend class G4RayTrajectory; friend class G4RayTracerSceneHandler; friend class G4RTMessenger; + friend class G4OpenGLStoredSceneHandler; + friend class G4OpenGLViewerMessenger; + friend class G4OpenGLXViewerMessenger; friend class G4OpenGLXmViewerMessenger; friend class G4XXXSceneHandler; friend class G4HepRepFileSceneHandler; @@ -203,6 +208,12 @@ public: // With description void RegisterModel(G4VFilter* filter); // Register trajectory filter model. Assumes ownership of model. + void RegisterModelFactory(G4HitFilterFactory* factory); + // Register trajectory hit model factory. Assumes ownership of factory. + + void RegisterModel(G4VFilter* filter); + // Register trajectory hit model. Assumes ownership of model. + void SelectTrajectoryModel(const G4String& model); // Set default trajectory model. Useful for use in compiled code @@ -274,6 +285,7 @@ public: // With description // Draw the trajectory. G4bool FilterTrajectory(const G4VTrajectory&); + G4bool FilterHit(const G4VHit&); //////////////////////////////////////////////////////////////////////// // Administration routines. @@ -331,7 +343,6 @@ public: // With description // it contains more information. (The size information in // GetXGeometryString and GetWindowSizeHint is guaranteed to be // identical.) - G4int GetEventCount () const; const G4String& GetBeginOfLastRunRandomStatus () const; const G4String& GetBeginOfLastEventRandomStatus () const; G4int GetLastRunID () const; @@ -352,9 +363,8 @@ public: // With description void SetVerboseLevel (Verbosity); void SetWindowSizeHint (G4int xHint, G4int yHint); void SetXGeometryString (const G4String&); - void SetReprocessing (G4bool); - void SetReprocessingLastEvent (G4bool); - + void SetEventRefreshing (G4bool); + void ResetTransientsDrawnFlags (); ///////////////////////////////////////////////////////////////////// // Utility functions. @@ -390,8 +400,18 @@ protected: // Sub-class must register desired models void RegisterMessengers (); // Command messengers. + + const G4int fVerbose; + // fVerbose is kept for backwards compatibility for some user + // examples. (It is used in the derived user vis managers to print + // available graphics systems.) It is initialised to 1 in the + // constructor and cannot be changed. + void PrintAvailableGraphicsSystems () const; - void PrintAvailableModels () const; + +private: + + void PrintAvailableModels (Verbosity) const; void PrintInvalidPointers () const; G4bool IsValidView (); // True if view is valid. Prints messages and sanitises various data. @@ -399,7 +419,7 @@ protected: // Clears transient store of current scene handler if it is marked // for clearing. Assumes view is valid. - static G4VisManager* fpInstance; // Pointer to single instance. + static G4VisManager* fpInstance; // Pointer to single instance. G4bool fInitialised; G4VUserVisAction* fpUserVisAction; // User vis action callback. G4VisExtent fUserVisActionExtent; @@ -411,28 +431,17 @@ protected: G4SceneList fSceneList; G4SceneHandlerList fAvailableSceneHandlers; Verbosity fVerbosity; - const G4int fVerbose; - // fVerbose is kept for backwards compatibility for some user - // examples. (It is used in the derived user vis managers to print - // available graphics systems.) It is initialised to 1 in the - // constructor and cannot be changed. std::vector fMessengerList; std::vector fDirectoryList; G4VisStateDependent* fpStateDependent; // Friend state dependent class. G4int fWindowSizeHintX, fWindowSizeHintY; // For viewer... G4String fXGeometryString; // ...construction. G4TrajectoriesModel dummyTrajectoriesModel; // For passing drawing mode. - G4int fEventCount; - G4String fBeginOfLastRunRandomStatus; - G4String fBeginOfLastEventRandomStatus; - G4bool fReprocessing; - G4bool fReprocessingLastEvent; - G4int fLastRunID; - G4int fLastEventID; + G4bool fEventRefreshing; G4bool fTransientsDrawnThisRun; G4bool fTransientsDrawnThisEvent; - -private: + G4bool fEventKeepingSuspended; + G4bool fKeptLastEvent; // Trajectory draw model manager G4VisModelManager* fpTrajDrawModelMgr; @@ -440,6 +449,9 @@ private: // Trajectory filter model manager G4VisFilterManager* fpTrajFilterMgr; + // Hit filter model manager + G4VisFilterManager* fpHitFilterMgr; + }; #include "G4VisManager.icc" diff --git a/source/visualization/management/include/G4VisManager.icc b/source/visualization/management/include/G4VisManager.icc index 8dadb43a0e..6724c9eb8f 100644 --- a/source/visualization/management/include/G4VisManager.icc +++ b/source/visualization/management/include/G4VisManager.icc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VisManager.icc,v 1.17 2006/06/29 21:29:08 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VisManager.icc,v 1.19 2006/11/14 14:59:55 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // GEANT4 Visualization Manager - John Allison 02/Jan/1996. @@ -81,22 +81,6 @@ inline const G4String& G4VisManager::GetXGeometryString () const { return fXGeometryString; } -inline G4int G4VisManager::GetEventCount() const { - return fEventCount; -} - -inline const G4String& G4VisManager::GetBeginOfLastRunRandomStatus() const { - return fBeginOfLastRunRandomStatus; -} - -inline const G4String& G4VisManager::GetBeginOfLastEventRandomStatus() const { - return fBeginOfLastEventRandomStatus; -} - -inline G4int G4VisManager::GetLastRunID() const { - return fLastRunID; -} - inline G4bool G4VisManager::GetTransientsDrawnThisEvent() const { return fTransientsDrawnThisEvent; } @@ -129,16 +113,11 @@ inline void G4VisManager::SetXGeometryString (const G4String& geomString) { fXGeometryString = geomString; } -inline void G4VisManager::SetReprocessing (G4bool reprocessing) { - fReprocessing = reprocessing; -} - -inline void G4VisManager::SetReprocessingLastEvent (G4bool reprocessing) { - fReprocessingLastEvent = reprocessing; +inline void G4VisManager::SetEventRefreshing (G4bool eventRefreshing) { + fEventRefreshing = eventRefreshing; } inline void G4VisManager::RegisterMessenger(G4UImessenger* msgr) { fMessengerList.push_back(msgr); } - diff --git a/source/visualization/management/include/G4VisModelManager.hh b/source/visualization/management/include/G4VisModelManager.hh index e668d6928e..cd46bfc58e 100644 --- a/source/visualization/management/include/G4VisModelManager.hh +++ b/source/visualization/management/include/G4VisModelManager.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4VisModelManager.hh,v 1.4 2006/06/29 21:29:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Generic model manager. Manages models, associated // factories, messengers, command placement etc diff --git a/source/visualization/management/include/G4VisStateDependent.hh b/source/visualization/management/include/G4VisStateDependent.hh index 0a11da82d2..6cd21964e6 100644 --- a/source/visualization/management/include/G4VisStateDependent.hh +++ b/source/visualization/management/include/G4VisStateDependent.hh @@ -25,7 +25,7 @@ // // // $Id: G4VisStateDependent.hh,v 1.5 2006/06/29 21:29:12 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // A "state dependent" service class for G4VisManager. // John Allison 29th November 1999 diff --git a/source/visualization/management/src/G4GraphicsSystemList.cc b/source/visualization/management/src/G4GraphicsSystemList.cc index a093897ce5..3c154e1df3 100644 --- a/source/visualization/management/src/G4GraphicsSystemList.cc +++ b/source/visualization/management/src/G4GraphicsSystemList.cc @@ -25,7 +25,7 @@ // // // $Id: G4GraphicsSystemList.cc,v 1.4 2006/06/29 21:29:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4GraphicsSystemList.hh" diff --git a/source/visualization/management/src/G4Scene.cc b/source/visualization/management/src/G4Scene.cc index 0a4af6bfa2..376e696b56 100644 --- a/source/visualization/management/src/G4Scene.cc +++ b/source/visualization/management/src/G4Scene.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4Scene.cc,v 1.21 2006/06/29 21:29:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4Scene.cc,v 1.23 2006/11/26 15:51:12 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Scene data John Allison 19th July 1996. @@ -42,7 +42,7 @@ G4Scene::G4Scene (const G4String& name): fName (name), fRefreshAtEndOfEvent(true), fRefreshAtEndOfRun(true), - fRecomputeTransients(false) + fMaxNumberOfKeptEvents(0) {} // Note all other data members have default initial values. G4Scene::~G4Scene () {} @@ -165,20 +165,19 @@ std::ostream& operator << (std::ostream& os, const G4Scene& s) { os << "\n Standard target point: " << s.fStandardTargetPoint; os << "\n End of event action set to \""; - if (s.fRefreshAtEndOfEvent) os << "refresh"; - else os << "accumulate"; - os << "\""; + if (s.fRefreshAtEndOfEvent) os << "refresh\""; + else { + os << "accumulate (maximum number of kept events: "; + if (s.fMaxNumberOfKeptEvents >= 0) os << s.fMaxNumberOfKeptEvents; + else os << "unlimited"; + os << ")"; + } os << "\n End of run action set to \""; if (s.fRefreshAtEndOfRun) os << "refresh"; else os << "accumulate"; os << "\""; - os << "\n Transients action set to \""; - if (s.fRecomputeTransients) os << "rerun"; - else os << "none"; - os << "\""; - return os; } @@ -190,7 +189,7 @@ G4bool G4Scene::operator != (const G4Scene& s) const { !(fStandardTargetPoint == s.fStandardTargetPoint) || fRefreshAtEndOfEvent != s.fRefreshAtEndOfEvent || fRefreshAtEndOfRun != s.fRefreshAtEndOfRun || - fRecomputeTransients != s.fRecomputeTransients + fMaxNumberOfKeptEvents != s.fMaxNumberOfKeptEvents ) return true; for (size_t i = 0; i < fRunDurationModelList.size (); i++) { diff --git a/source/visualization/management/src/G4SceneHandlerList.cc b/source/visualization/management/src/G4SceneHandlerList.cc index 2fb5186d9b..23c91cfcd4 100644 --- a/source/visualization/management/src/G4SceneHandlerList.cc +++ b/source/visualization/management/src/G4SceneHandlerList.cc @@ -25,7 +25,7 @@ // // // $Id: G4SceneHandlerList.cc,v 1.4 2006/06/29 21:29:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4SceneHandlerList.hh" diff --git a/source/visualization/management/src/G4SceneList.cc b/source/visualization/management/src/G4SceneList.cc index 55b987b68d..765ab4bd1c 100644 --- a/source/visualization/management/src/G4SceneList.cc +++ b/source/visualization/management/src/G4SceneList.cc @@ -25,7 +25,7 @@ // // // $Id: G4SceneList.cc,v 1.6 2006/06/29 21:29:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4SceneList.hh" diff --git a/source/visualization/management/src/G4VGraphicsSystem.cc b/source/visualization/management/src/G4VGraphicsSystem.cc index d9c5134f6d..c07dc3a34c 100644 --- a/source/visualization/management/src/G4VGraphicsSystem.cc +++ b/source/visualization/management/src/G4VGraphicsSystem.cc @@ -25,7 +25,7 @@ // // // $Id: G4VGraphicsSystem.cc,v 1.11 2006/06/29 21:29:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 27th March 1996 diff --git a/source/visualization/management/src/G4VSceneHandler.cc b/source/visualization/management/src/G4VSceneHandler.cc index 0dea9773fd..04528331ba 100644 --- a/source/visualization/management/src/G4VSceneHandler.cc +++ b/source/visualization/management/src/G4VSceneHandler.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VSceneHandler.cc,v 1.66 2006/06/29 21:29:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VSceneHandler.cc,v 1.77 2006/11/21 14:23:53 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 19th July 1996 @@ -74,6 +74,8 @@ #include "Randomize.hh" #include "G4StateManager.hh" #include "G4RunManager.hh" +#include "G4Run.hh" +#include "G4Transform3D.hh" G4VSceneHandler::G4VSceneHandler (G4VGraphicsSystem& system, G4int id, const G4String& name): fSystem (system), @@ -93,9 +95,7 @@ G4VSceneHandler::G4VSceneHandler (G4VGraphicsSystem& system, G4int id, const G4S fpObjectTransformation (0), fNestingDepth (0), fpVisAttribs (0), - fCurrentDepth (0), - fpCurrentPV (0), - fpCurrentLV (0) + fRequestedEvent (0) { G4VisManager* pVMan = G4VisManager::GetInstance (); fpScene = pVMan -> GetCurrentScene (); @@ -266,13 +266,6 @@ void G4VSceneHandler::AddViewerToList (G4VViewer* pViewer) { fViewerList.push_back (pViewer); } -void G4VSceneHandler::EstablishSpecials (G4PhysicalVolumeModel& pvModel) { - pvModel.DefinePointersToWorkingSpace (&fCurrentDepth, - &fpCurrentPV, - &fpCurrentLV, - &fpCurrentMaterial); -} - void G4VSceneHandler::AddPrimitive (const G4Scale& scale) { const G4double margin(0.01); @@ -401,9 +394,9 @@ void G4VSceneHandler::AddPrimitive (const G4Polymarker& polymarker) { case G4Polymarker::squares: { for (size_t iPoint = 0; iPoint < polymarker.size (); iPoint++) { - G4Square Square (polymarker); - Square.SetPosition (polymarker[iPoint]); - AddPrimitive (Square); + G4Square square (polymarker); + square.SetPosition (polymarker[iPoint]); + AddPrimitive (square); } } break; @@ -427,12 +420,14 @@ void G4VSceneHandler::RequestPrimitives (const G4VSolid& solid) { BeginPrimitives (*fpObjectTransformation); G4NURBS* pNURBS = 0; G4Polyhedron* pPolyhedron = 0; + const G4VisAttributes* pVisAttribs = + fpViewer -> GetApplicableVisAttributes (fpVisAttribs); switch (fpViewer -> GetViewParameters () . GetRepStyle ()) { case G4ViewParameters::nurbs: pNURBS = solid.CreateNURBS (); if (pNURBS) { pNURBS -> SetVisAttributes - (fpViewer -> GetApplicableVisAttributes (fpVisAttribs)); + (fpViewer -> GetApplicableVisAttributes (pVisAttribs)); AddPrimitive (*pNURBS); delete pNURBS; break; @@ -451,13 +446,11 @@ void G4VSceneHandler::RequestPrimitives (const G4VSolid& solid) { // Dropping through to polyhedron... case G4ViewParameters::polyhedron: default: - G4Polyhedron::SetNumberOfRotationSteps - (fpViewer -> GetViewParameters () . GetNoOfSides ()); + G4Polyhedron::SetNumberOfRotationSteps (GetNoOfSides (pVisAttribs)); pPolyhedron = solid.GetPolyhedron (); G4Polyhedron::ResetNumberOfRotationSteps (); if (pPolyhedron) { - pPolyhedron -> SetVisAttributes - (fpViewer -> GetApplicableVisAttributes (fpVisAttribs)); + pPolyhedron -> SetVisAttributes (pVisAttribs); AddPrimitive (*pPolyhedron); } else { @@ -480,6 +473,12 @@ void G4VSceneHandler::ProcessScene (G4VViewer&) { if (!fpScene) return; + G4VisManager* visManager = G4VisManager::GetInstance(); + + if (!visManager->GetConcreteInstance()) return; + + G4VisManager::Verbosity verbosity = visManager->GetVerbosity(); + fReadyForTransients = false; // Clear stored scene, if any, i.e., display lists, scene graphs. @@ -492,9 +491,6 @@ void G4VSceneHandler::ProcessScene (G4VViewer&) { G4bool tmpMarkForClearingTransientStore = fMarkForClearingTransientStore; fMarkForClearingTransientStore = false; - G4VisManager* visManager = G4VisManager::GetInstance(); - G4VisManager::Verbosity verbosity = visManager->GetVerbosity(); - // Traverse geometry tree and send drawing primitives to window(s). const std::vector& runDurationModelList = @@ -539,102 +535,89 @@ void G4VSceneHandler::ProcessScene (G4VViewer&) { delete pMP; EndModeling (); - } else { - G4VisManager::Verbosity verbosity = - G4VisManager::GetInstance()->GetVerbosity(); - if (verbosity >= G4VisManager::warnings) { - G4cout << - "WARNING: G4VSceneHandler::ProcessScene: No run-duration models in" - "\n scene. \"World\" will be added if you attempt to draw a view" - << G4endl; - } } fpViewer->FinishView(); // Flush streams and/or swap buffers. fReadyForTransients = true; - // Now (re-)do transients (trajectories, hits, user drawing, etc.)... - if (fpScene->GetRecomputeTransients()) { // ...if requested... + // Refresh event from end-of-event model list. Allow only in Idle state... + G4StateManager* stateManager = G4StateManager::GetStateManager(); + G4ApplicationState state = stateManager->GetCurrentState(); + if (state == G4State_Idle) { + + visManager->SetEventRefreshing(true); + + if (fRequestedEvent) { + DrawEvent(fRequestedEvent); - // Allowed only in idle state... - G4StateManager* stateManager = G4StateManager::GetStateManager(); - G4ApplicationState currentState = stateManager->GetCurrentState(); - if(currentState != G4State_Idle) { - if (verbosity >= G4VisManager::warnings) { - G4cout << - "Cannot re-compute transients during existing run." - "\n Trajectories, etc., will be lost." - << G4endl; - } } else { - // Uses run manager via UImanager->ApplyCommand("/run/beamOn") so - // only makes sense if a run manager exists. More than that - the - // random number status strings are created by G4RunManager, so they - // are null if a G4RunManager does not exist... - G4RunManager* runManager = G4RunManager::GetRunManager(); - if (runManager) { - if (visManager->GetEventCount()) { // Must have had some prior event(s)... - if (fpScene->GetRefreshAtEndOfEvent()) { - // Check if transients have been drawn. Note: Use the flag in - // the vis manager, which is set *after* a pass triggered by - // ClearTransientStoreIfMarked. Avoids early processing. - if (visManager->GetTransientsDrawnThisEvent()) { - // Change "warnings" to "confirmations" if this settles!!!!!!!!!! - if (verbosity >= G4VisManager::warnings) { - G4cout << - "Recomputing transients generated by previous event..." - "\n \"/vis/scene/transientsAction none\" to suppress." - << G4endl; + G4RunManager* runManager = G4RunManager::GetRunManager(); + const G4Run* run = runManager->GetCurrentRun(); + const std::vector* events = + run? run->GetEventVector(): 0; + size_t nKeptEvents = 0; + if (events) nKeptEvents = events->size(); + if (runManager) { + if (fpScene->GetRefreshAtEndOfEvent()) { + + if (verbosity >= G4VisManager::confirmations) { + G4cout << "Refreshing event..." << G4endl; } - std::istringstream - iss(visManager->GetBeginOfLastEventRandomStatus()); - CLHEP::HepRandom::restoreFullState(iss); - visManager->SetReprocessing(true); - visManager->SetReprocessingLastEvent(true); - G4int runID = visManager->GetLastRunID(); - runManager->SetRunIDCounter(runID); - runManager->BeamOn(1); - } - } else { - if (!fpScene->GetRefreshAtEndOfRun()) { - if (verbosity >= G4VisManager::warnings) { - G4cout << - "WARNING: Cannot refresh trajectories, etc., accumulated over more" - "\n than one runs. Refreshing just the last run..." - << G4endl; + const G4Event* event = 0; + if (events && events->size()) event = events->back(); + if (event) DrawEvent(event); + + } else { // Accumulating events. + + if (verbosity >= G4VisManager::confirmations) { + G4cout << "Refreshing events in run..." << G4endl; } - } - // Check if transients have been drawn. Note: Use the flag in - // the vis manager, which is set *after* a pass triggered by - // ClearTransientStoreIfMarked. Avoids early processing. - if (visManager->GetTransientsDrawnThisRun()) { - // Change "warnings" to "confirmations" if this settles!!!!!!!!!! - if (verbosity >= G4VisManager::warnings) { - G4cout << - "Recomputing transients generated by previous run..." - "\n \"/vis/scene/transientsAction none\" to suppress." - << G4endl; + for (size_t i = 0; i < nKeptEvents; ++i) { + const G4Event* event = (*events)[i]; + if (event) DrawEvent(event); + } + + if (!fpScene->GetRefreshAtEndOfRun()) { + if (verbosity >= G4VisManager::warnings) { + G4cout << + "WARNING: Cannot refresh events accumulated over more" + "\n than one runs. Refreshed just the last run..." + << G4endl; + } } - std::istringstream iss(visManager->GetBeginOfLastRunRandomStatus()); - CLHEP::HepRandom::restoreFullState(iss); - G4int nEvents = visManager->GetEventCount(); - visManager->SetReprocessing(true); - G4int runID = visManager->GetLastRunID(); - runManager->SetRunIDCounter(runID); - runManager->BeamOn(nEvents); } } } - } - } + visManager->SetEventRefreshing(false); } fMarkForClearingTransientStore = tmpMarkForClearingTransientStore; } -G4ModelingParameters* G4VSceneHandler::CreateModelingParameters () { +void G4VSceneHandler::DrawEvent(const G4Event* event) +{ + const std::vector& EOEModelList = + fpScene -> GetEndOfEventModelList (); + size_t nModels = EOEModelList.size(); + if (nModels) { + G4ModelingParameters* pMP = CreateModelingParameters(); + pMP->SetEvent(event); + for (size_t i = 0; i < nModels; i++) { + G4VModel* pModel = EOEModelList [i]; + pModel -> SetModelingParameters(pMP); + SetModel (pModel); + pModel -> DescribeYourselfTo (*this); + pModel -> SetModelingParameters(0); + } + delete pMP; + SetModel (0); + } +} + +G4ModelingParameters* G4VSceneHandler::CreateModelingParameters () +{ // Create modeling parameters from View Parameters... const G4ViewParameters& vp = fpViewer -> GetViewParameters (); @@ -657,21 +640,6 @@ G4ModelingParameters* G4VSceneHandler::CreateModelingParameters () { break; } - // Convert rep styles... - G4ModelingParameters::RepStyle modelRepStyle = - G4ModelingParameters::wireframe; - if (vp.GetDrawingStyle () != G4ViewParameters::wireframe) { - switch (vp.GetRepStyle ()) { - default: - case G4ViewParameters::polyhedron: - modelRepStyle = G4ModelingParameters::polyhedron; - break; - case G4ViewParameters::nurbs: - modelRepStyle = G4ModelingParameters::nurbs; - break; - } - } - // Decide if covered daughters are really to be culled... G4bool reallyCullCovered = vp.IsCullingCovered() // Culling daughters depends also on... @@ -682,25 +650,67 @@ G4ModelingParameters* G4VSceneHandler::CreateModelingParameters () { G4ModelingParameters* pModelingParams = new G4ModelingParameters (vp.GetDefaultVisAttributes (), modelDrawingStyle, - modelRepStyle, vp.IsCulling (), vp.IsCullingInvisible (), vp.IsDensityCulling (), vp.GetVisibleDensity (), reallyCullCovered, - vp.GetNoOfSides (), - vp.IsViewGeom (), - vp.IsViewHits (), - vp.IsViewDigis () + vp.GetNoOfSides () ); + pModelingParams->SetWarning + (G4VisManager::GetInstance()->GetVerbosity() >= G4VisManager::warnings); + + pModelingParams->SetExplodeFactor(vp.GetExplodeFactor()); + pModelingParams->SetExplodeCentre(vp.GetExplodeCentre()); + + pModelingParams->SetSectionPolyhedron(CreateSectionPolyhedron()); + pModelingParams->SetCutawayPolyhedron(CreateCutawayPolyhedron()); + // The polyhedron objects are deleted in the modeling parameters destructor. + return pModelingParams; } +const G4Polyhedron* G4VSceneHandler::CreateSectionPolyhedron() +{ + /* Disable for now. Boolean processor not up to it. + const G4ViewParameters& vp = fpViewer->GetViewParameters(); + if (vp.IsSection () ) { + G4double radius = fpScene->GetExtent().GetExtentRadius(); + G4double safe = radius + fpScene->GetExtent().GetExtentCentre().mag(); + G4Box sectionBox("clipper", + safe, safe, 1.e-5 * radius); // Thin in z-plane. + G4Polyhedron* sectioner = sectionBox.CreatePolyhedron(); + const G4Plane3D& s = vp.GetSectionPlane (); + G4double a = s.a(); + G4double b = s.b(); + G4double c = s.c(); + G4double d = s.d(); + G4Transform3D transform = G4TranslateZ3D(-d); + const G4Normal3D normal(a,b,c); + if (normal != G4Normal3D(0,0,1)) { + const G4double angle = std::acos(normal.dot(G4Normal3D(0,0,1))); + const G4Vector3D axis = G4Normal3D(0,0,1).cross(normal); + transform = G4Rotate3D(angle, axis) * transform; + } + sectioner->Transform(transform); + return sectioner; + } else { + return 0; + } + */ + return 0; +} + +const G4Polyhedron* G4VSceneHandler::CreateCutawayPolyhedron() +{ + return 0; +} + const G4Colour& G4VSceneHandler::GetColour (const G4Visible& visible) { // Colour is determined by the applicable vis attributes. const G4Colour& colour = fpViewer -> - GetApplicableVisAttributes (visible.GetVisAttributes ()) -> GetColour (); + GetApplicableVisAttributes (visible.GetVisAttributes ()) -> GetColour (); return colour; } @@ -713,6 +723,16 @@ const G4Colour& G4VSceneHandler::GetTextColour (const G4Text& text) { return colour; } +G4double G4VSceneHandler::GetLineWidth(const G4Visible& visible) +{ + G4double lineWidth = fpViewer-> + GetApplicableVisAttributes(visible.GetVisAttributes())->GetLineWidth(); + if (lineWidth < 1.) lineWidth = 1.; + lineWidth *= fpViewer -> GetViewParameters().GetGlobalLineWidthScale(); + if (lineWidth < 1.) lineWidth = 1.; + return lineWidth; +} + G4ViewParameters::DrawingStyle G4VSceneHandler::GetDrawingStyle (const G4VisAttributes* pVisAttribs) { // Drawing style is normally determined by the view parameters, but @@ -759,8 +779,10 @@ G4bool G4VSceneHandler::GetAuxEdgeVisible (const G4VisAttributes* pVisAttribs) { return isAuxEdgeVisible; } -G4double G4VSceneHandler::GetMarkerSize (const G4VMarker& marker, - G4VSceneHandler::MarkerSizeType& markerSizeType) { +G4double G4VSceneHandler::GetMarkerSize +(const G4VMarker& marker, + G4VSceneHandler::MarkerSizeType& markerSizeType) +{ G4bool userSpecified = marker.GetWorldSize() || marker.GetScreenSize(); const G4VMarker& defaultMarker = fpViewer -> GetViewParameters().GetDefaultMarker(); @@ -776,11 +798,31 @@ G4double G4VSceneHandler::GetMarkerSize (const G4VMarker& marker, // Draw in screen coordinates. markerSizeType = screen; } - if (size <= 0.) size = 1.; + if (size <= 1.) size = 1.; size *= fpViewer -> GetViewParameters().GetGlobalMarkerScale(); + if (size <= 1.) size = 1.; return size; } +G4int G4VSceneHandler::GetNoOfSides(const G4VisAttributes* pVisAttribs) +{ + // No. of sides (lines segments per circle) is normally determined + // by the view parameters, but it can be overriddden by the + // ForceLineSegmentsPerCircle in the vis attributes. + G4int lineSegmentsPerCircle = fpViewer->GetViewParameters().GetNoOfSides(); + if (pVisAttribs->GetForcedLineSegmentsPerCircle() > 0) + lineSegmentsPerCircle = pVisAttribs->GetForcedLineSegmentsPerCircle(); + const G4int nSegmentsMin = 12; + if (lineSegmentsPerCircle < nSegmentsMin) { + lineSegmentsPerCircle = nSegmentsMin; + G4cout << + "G4VSceneHandler::GetNoOfSides: attempt to set the" + "\nnumber of line segements per circle < " << nSegmentsMin + << "; forced to " << lineSegmentsPerCircle << G4endl; + } + return lineSegmentsPerCircle; +} + std::ostream& operator << (std::ostream& os, const G4VSceneHandler& s) { os << "Scene handler " << s.fName << " has " diff --git a/source/visualization/management/src/G4VViewer.cc b/source/visualization/management/src/G4VViewer.cc index 67e39f3078..f921e5c50b 100644 --- a/source/visualization/management/src/G4VViewer.cc +++ b/source/visualization/management/src/G4VViewer.cc @@ -25,7 +25,7 @@ // // // $Id: G4VViewer.cc,v 1.23 2006/06/29 21:29:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 27th March 1996 diff --git a/source/visualization/management/src/G4VVisCommand.cc b/source/visualization/management/src/G4VVisCommand.cc index a9f2f1d986..7a3d789d0b 100644 --- a/source/visualization/management/src/G4VVisCommand.cc +++ b/source/visualization/management/src/G4VVisCommand.cc @@ -25,7 +25,7 @@ // // // $Id: G4VVisCommand.cc,v 1.18 2006/06/29 21:29:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // Base class for visualization commands - John Allison 9th August 1998 // It is really a messenger - we have one command per messenger. diff --git a/source/visualization/management/src/G4ViewParameters.cc b/source/visualization/management/src/G4ViewParameters.cc index 49e7d30d94..3190cf64fc 100644 --- a/source/visualization/management/src/G4ViewParameters.cc +++ b/source/visualization/management/src/G4ViewParameters.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4ViewParameters.cc,v 1.24 2006/06/29 21:29:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ViewParameters.cc,v 1.28 2006/09/19 16:02:31 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 19th July 1996 @@ -48,9 +48,8 @@ G4ViewParameters::G4ViewParameters (): fCullCovered (false), fSection (false), fSectionPlane (), - fCutaway (false), + fCutawayMode (cutawayUnion), fCutawayPlanes (), - fExplode (false), fExplodeFactor (1.), fNoOfSides (24), fViewpointDirection (G4Vector3D (0., 0., 1.)), // On z-axis. @@ -63,13 +62,11 @@ G4ViewParameters::G4ViewParameters (): fLightsMoveWithCamera (false), fRelativeLightpointDirection (G4Vector3D (1., 1., 1.)), fActualLightpointDirection (G4Vector3D (1., 1., 1.)), - fViewGeom (true), - fViewHits (true), - fViewDigis (true), fDefaultVisAttributes (), fDefaultTextVisAttributes (G4Colour (0., 0., 1.)), fDefaultMarker (), fGlobalMarkerScale (1.), + fGlobalLineWidthScale (1.), fMarkerNotHidden (true), fWindowSizeHintX (600), fWindowSizeHintY (600), @@ -143,7 +140,6 @@ G4double G4ViewParameters::GetFrontHalfHeight (G4double nearDistance, // Useful quantities - end snippet. void G4ViewParameters::AddCutawayPlane (const G4Plane3D& cutawayPlane) { - fCutaway = true; if (fCutawayPlanes.size () < 3 ) { fCutawayPlanes.push_back (cutawayPlane); } @@ -154,9 +150,15 @@ void G4ViewParameters::AddCutawayPlane (const G4Plane3D& cutawayPlane) { } } -void G4ViewParameters::ClearCutawayPlanes () { - fCutaway = false; - fCutawayPlanes.clear (); +void G4ViewParameters::ChangeCutawayPlane +(size_t index, const G4Plane3D& cutawayPlane) { + if (index >= fCutawayPlanes.size()) { + G4cout << + "ERROR: G4ViewParameters::ChangeCutawayPlane:" + "\n Plane " << index << " does not exist." << G4endl; + } else { + fCutawayPlanes[index] = cutawayPlane; + } } void G4ViewParameters::SetVisibleDensity (G4double visibleDensity) { @@ -251,8 +253,6 @@ void G4ViewParameters::PrintDifferences (const G4ViewParameters& v) const { (fVisibleDensity != v.fVisibleDensity) || (fCullCovered != v.fCullCovered) || (fSection != v.fSection) || - (fCutaway != v.fCutaway) || - (fExplode != v.fExplode) || (fNoOfSides != v.fNoOfSides) || (fUpVector != v.fUpVector) || (fFieldHalfAngle != v.fFieldHalfAngle) || @@ -262,13 +262,11 @@ void G4ViewParameters::PrintDifferences (const G4ViewParameters& v) const { (fDolly != v.fDolly) || (fRelativeLightpointDirection != v.fRelativeLightpointDirection) || (fLightsMoveWithCamera != v.fLightsMoveWithCamera) || - (fViewGeom != v.fViewGeom) || - (fViewHits != v.fViewHits) || - (fViewDigis != v.fViewDigis) || (fDefaultVisAttributes != v.fDefaultVisAttributes) || (fDefaultTextVisAttributes != v.fDefaultTextVisAttributes) || (fDefaultMarker != v.fDefaultMarker) || (fGlobalMarkerScale != v.fGlobalMarkerScale) || + (fGlobalLineWidthScale != v.fGlobalLineWidthScale) || (fMarkerNotHidden != v.fMarkerNotHidden) || (fWindowSizeHintX != v.fWindowSizeHintX) || (fWindowSizeHintY != v.fWindowSizeHintY) || @@ -282,7 +280,7 @@ void G4ViewParameters::PrintDifferences (const G4ViewParameters& v) const { G4cout << "Difference in section planes batch." << G4endl; } - if (fCutaway) { + if (IsCutaway()) { if (fCutawayPlanes.size () != v.fCutawayPlanes.size ()) { G4cout << "Difference in no of cutaway planes." << G4endl; } @@ -294,9 +292,11 @@ void G4ViewParameters::PrintDifferences (const G4ViewParameters& v) const { } } - if (fExplode) { + if (IsExplode()) { if (fExplodeFactor != v.fExplodeFactor) G4cout << "Difference in explode factor." << G4endl; + if (fExplodeCentre != v.fExplodeCentre) + G4cout << "Difference in explode centre." << G4endl; } } @@ -357,20 +357,18 @@ std::ostream& operator << (std::ostream& os, const G4ViewParameters& v) { if (v.fSection) os << "true, section/cut plane: " << v.fSectionPlane; else os << "false"; - os << "\n Cutaway flag: "; - if (v.fCutaway) { - os << "true, cutaway planes: "; + if (v.IsCutaway()) { + os << "\n Cutaway planes: "; for (size_t i = 0; i < v.fCutawayPlanes.size (); i++) { os << ' ' << v.fCutawayPlanes[i]; } } else { - os << "false"; + os << "\n No cutaway planes"; } - os << "\n Explode flag: "; - if (v.fExplode) os << "true, explode factor: " << v.fExplodeFactor; - else os << "false"; + os << "\n Explode factor: " << v.fExplodeFactor + << " about centre: " << v.fExplodeCentre; os << "\n No. of sides used in circle polygon approximation: " << v.fNoOfSides; @@ -416,18 +414,6 @@ std::ostream& operator << (std::ostream& os, const G4ViewParameters& v) { os << "\n Far distance: " << farDistance; os << "\n Front half height: " << right; - os << "\n View geometry: "; - if (v.fViewGeom) os << "true"; - else os << "false"; - - os << "\n View hits : "; - if (v.fViewHits) os << "true"; - else os << "false"; - - os << "\n View digits : "; - if (v.fViewDigis) os << "true"; - else os << "false"; - os << "\n Default VisAttributes:\n " << v.fDefaultVisAttributes; os << "\n Default TextVisAttributes:\n " << v.fDefaultTextVisAttributes; @@ -436,6 +422,8 @@ std::ostream& operator << (std::ostream& os, const G4ViewParameters& v) { os << "\n Global marker scale: " << v.fGlobalMarkerScale; + os << "\n Global lineWidth scale: " << v.fGlobalLineWidthScale; + os << "\n Marker "; if (v.fMarkerNotHidden) os << "not "; os << "hidden by surfaces."; @@ -470,8 +458,8 @@ G4bool G4ViewParameters::operator != (const G4ViewParameters& v) const { (fDensityCulling != v.fDensityCulling) || (fCullCovered != v.fCullCovered) || (fSection != v.fSection) || - (fCutaway != v.fCutaway) || - (fExplode != v.fExplode) || + (IsCutaway() != v.IsCutaway()) || + (IsExplode() != v.IsExplode()) || (fNoOfSides != v.fNoOfSides) || (fUpVector != v.fUpVector) || (fFieldHalfAngle != v.fFieldHalfAngle) || @@ -481,13 +469,11 @@ G4bool G4ViewParameters::operator != (const G4ViewParameters& v) const { (fDolly != v.fDolly) || (fRelativeLightpointDirection != v.fRelativeLightpointDirection) || (fLightsMoveWithCamera != v.fLightsMoveWithCamera) || - (fViewGeom != v.fViewGeom) || - (fViewHits != v.fViewHits) || - (fViewDigis != v.fViewDigis) || (fDefaultVisAttributes != v.fDefaultVisAttributes) || (fDefaultTextVisAttributes != v.fDefaultTextVisAttributes) || (fDefaultMarker != v.fDefaultMarker) || (fGlobalMarkerScale != v.fGlobalMarkerScale) || + (fGlobalLineWidthScale != v.fGlobalLineWidthScale) || (fMarkerNotHidden != v.fMarkerNotHidden) || (fWindowSizeHintX != v.fWindowSizeHintX) || (fWindowSizeHintY != v.fWindowSizeHintY) || @@ -502,7 +488,7 @@ G4bool G4ViewParameters::operator != (const G4ViewParameters& v) const { if (fSection && (!(fSectionPlane == v.fSectionPlane))) return true; - if (fCutaway) { + if (IsCutaway()) { if (fCutawayPlanes.size () != v.fCutawayPlanes.size ()) return true; else { @@ -512,8 +498,9 @@ G4bool G4ViewParameters::operator != (const G4ViewParameters& v) const { } } - if (fExplode && - (fExplodeFactor != v.fExplodeFactor)) return true; + if (IsExplode() && + (fExplodeFactor != v.fExplodeFactor) || + (fExplodeCentre != v.fExplodeCentre)) return true; return false; } diff --git a/source/visualization/management/src/G4ViewerList.cc b/source/visualization/management/src/G4ViewerList.cc index ff854d767a..e8a60718ec 100644 --- a/source/visualization/management/src/G4ViewerList.cc +++ b/source/visualization/management/src/G4ViewerList.cc @@ -25,7 +25,7 @@ // // // $Id: G4ViewerList.cc,v 1.4 2006/06/29 21:29:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4ViewerList.hh" diff --git a/source/visualization/management/src/G4VisCommands.cc b/source/visualization/management/src/G4VisCommands.cc index 33c35cd66c..b770b702f3 100644 --- a/source/visualization/management/src/G4VisCommands.cc +++ b/source/visualization/management/src/G4VisCommands.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VisCommands.cc,v 1.14 2006/06/29 21:29:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VisCommands.cc,v 1.20 2006/11/26 15:49:10 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // /vis/ top level commands - John Allison 5th February 2001 @@ -36,6 +36,9 @@ #include "G4UIcmdWithABool.hh" #include "G4UIcmdWithAString.hh" #include "G4UIcmdWithoutParameter.hh" +#include "G4RunManager.hh" +#include "G4Run.hh" +#include "G4UIsession.hh" ////////////// /vis/enable /////////////////////////////////////// @@ -95,15 +98,155 @@ G4String G4VisCommandList::GetCurrentValue (G4UIcommand*) void G4VisCommandList::SetNewValue (G4UIcommand*, G4String newValue) { G4String& verbosityString = newValue; - //G4VisManager::Verbosity verbosity = - // fpVisManager->GetVerbosityValue(verbosityString); + G4VisManager::Verbosity verbosity = + fpVisManager->GetVerbosityValue(verbosityString); fpVisManager->PrintAvailableGraphicsSystems(); G4cout << G4endl; - fpVisManager->PrintAvailableModels(); + fpVisManager->PrintAvailableModels(verbosity); G4cout << G4endl; G4UImanager* UImanager = G4UImanager::GetUIpointer(); UImanager->ApplyCommand(G4String("/vis/viewer/list ! ") + verbosityString); + if (verbosity < G4VisManager::parameters) + G4cout << + "\nTo get more information, \"/vis/list all all\" or use individual commands" + "\n such as (use \"ls\" or \"help\"):" + "\n /vis/viewer/list" + "\n /vis/modeling/trajectories/list" + "\n /vis/filtering/trajectories/list" + << G4endl; +} + +////////////// /vis/reviewKeptEvents /////////////////////////////////////// + +G4VisCommandReviewKeptEvents::G4VisCommandReviewKeptEvents () +{ + G4bool omitable; + + fpCommand = new G4UIcmdWithAString("/vis/reviewKeptEvents", this); + fpCommand -> SetGuidance("Review kept events."); + fpCommand -> SetGuidance + ("If a macro file is specified, it is executed for each event."); + fpCommand -> SetGuidance + ("If a macro file is not specified, each event is drawn to the current" + "\nviewer. After each event, the session is paused. The user may issue" + "\nany allowed command. Then enter \"continue\" to continue to the next" + "\nevent."); + fpCommand -> SetParameterName("macro-file-name", omitable=true); + fpCommand -> SetDefaultValue(""); +} + +G4VisCommandReviewKeptEvents::~G4VisCommandReviewKeptEvents () +{ + delete fpCommand; +} + +G4String G4VisCommandReviewKeptEvents::GetCurrentValue (G4UIcommand*) +{ + return ""; +} + +void G4VisCommandReviewKeptEvents::SetNewValue (G4UIcommand*, G4String newValue) +{ + G4String& macroFileName = newValue; + G4VisManager::Verbosity verbosity = fpVisManager->GetVerbosity(); + + G4RunManager* runManager = G4RunManager::GetRunManager(); + const G4Run* run = runManager? runManager->GetCurrentRun(): 0; + const std::vector* events = run? run->GetEventVector(): 0; + size_t nKeptEvents = events? events->size(): 0; + + if (!nKeptEvents) { + if (verbosity >= G4VisManager::errors) { + G4cout << + "ERROR: G4VisCommandReviewKeptEvents::SetNewValue: No kept events," + "\n or kept events not accessible." + << G4endl; + } + return; + } + + G4VViewer* viewer = fpVisManager->GetCurrentViewer(); + if (!viewer) { + if (verbosity >= G4VisManager::errors) { + G4cout << + "ERROR: No current viewer - \"/vis/viewer/list\" to see possibilities." + << G4endl; + } + return; + } + + G4Scene* pScene = fpVisManager->GetCurrentScene(); + if (!pScene) { + if (verbosity >= G4VisManager::errors) { + G4cout << "ERROR: No current scene. Please create one." << G4endl; + } + return; + } + + G4VSceneHandler* sceneHandler = fpVisManager->GetCurrentSceneHandler(); + + G4UImanager* UImanager = G4UImanager::GetUIpointer(); + G4int keepVerbose = UImanager->GetVerboseLevel(); + G4int newVerbose(0); + if (keepVerbose >= 2 || verbosity >= G4VisManager::confirmations) + newVerbose = 2; + UImanager->SetVerboseLevel(newVerbose); + + // Event by event refreshing... + G4bool currentRefreshAtEndOfEvent = pScene->GetRefreshAtEndOfEvent(); + pScene->SetRefreshAtEndOfEvent(true); + if (macroFileName.empty()) { + + // Draw to viewer and pause session... + for (size_t i = 0; i < nKeptEvents; ++i) { + const G4Event* event = (*events)[i]; + if (verbosity >= G4VisManager::warnings) { + G4cout << "Drawing event : " << event->GetEventID() << + ". At EndOfEvent, enter any command, then \"continue\"..." + << G4endl; + } + sceneHandler->SetEvent(event); + UImanager->ApplyCommand("/vis/viewer/rebuild"); + /* The above command forces a rebuild of the scene, including + the detector. This is fine for "immediate" viewers - a + refresh requires a rebuild anyway. But for "stored mode" + viewers, you could, in principle, avoid a rebuild of the + detector with something like the following: + sceneHandler->ClearTransientStore(); + viewer->DrawView(); + sceneHandler->DrawEvent(event); + but this causes mayhem for "immediate" viewers because + ClearTransientStore issues a DrawView and some curious sort + of recursion takes place. For "stored" viewers, the event + gets drawn but not the eventID, so something odd is happening + there too. This needs further investigation - enhanced + features or a complete re-think. + */ + if (!viewer->GetViewParameters().IsAutoRefresh()) + UImanager->ApplyCommand("/vis/viewer/flush"); + G4UIsession* session = UImanager->GetSession(); + session->PauseSessionStart("EndOfEvent"); + sceneHandler->SetEvent(0); + } + + } else { + + // Execute macro file... + for (size_t i = 0; i < nKeptEvents; ++i) { + const G4Event* event = (*events)[i]; + if (verbosity >= G4VisManager::warnings) { + G4cout << "Drawing event : " << event->GetEventID() + << " with macro file \"" << macroFileName << G4endl; + } + sceneHandler->SetEvent(event); + UImanager->ApplyCommand("/control/execute " + macroFileName); + sceneHandler->SetEvent(0); + } + } + pScene->SetRefreshAtEndOfEvent(currentRefreshAtEndOfEvent); + + UImanager->SetVerboseLevel(keepVerbose); } ////////////// /vis/verbose /////////////////////////////////////// diff --git a/source/visualization/management/src/G4VisCommandsCompound.cc b/source/visualization/management/src/G4VisCommandsCompound.cc index 497ec19815..b8ca542a2c 100644 --- a/source/visualization/management/src/G4VisCommandsCompound.cc +++ b/source/visualization/management/src/G4VisCommandsCompound.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VisCommandsCompound.cc,v 1.31 2006/06/29 21:29:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VisCommandsCompound.cc,v 1.35 2006/12/12 11:48:13 gcosmo Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // Compound /vis/ commands - John Allison 15th May 2000 @@ -173,9 +173,17 @@ G4VisCommandDrawVolume::G4VisCommandDrawVolume() { G4bool omitable; fpCommand = new G4UIcmdWithAString("/vis/drawVolume", this); fpCommand->SetGuidance - ("Creates a scene consisting of this physical volume and asks the" - "\n current viewer to draw it."); - fpCommand->SetGuidance("The scene becomes current."); + ("Creates a scene containing this physical volume and asks the" + "\ncurrent viewer to draw it. The scene becomes current."); + fpCommand -> SetGuidance + ("If physical-volume-name is \"world\" (the default), the main geometry" + "\ntree (material world) is drawn. If \"worlds\", all worlds - material" + "\nworld and parallel worlds, if any - are drawn. Otherwise a search of" + "\nall worlds is made, taking the first matching occurence only. To see" + "\na representation of the geometry hierarchy of the worlds, try" + "\n\"/vis/drawTree [worlds]\" or one of the driver/browser combinations" + "\nthat have the required functionality, e.g., HepRepFile/XML with the" + "\nWIRED3/4 browser."); fpCommand->SetParameterName("physical-volume-name", omitable = true); fpCommand->SetDefaultValue("world"); } @@ -193,14 +201,17 @@ void G4VisCommandDrawVolume::SetNewValue(G4UIcommand*, G4String newValue) { newVerbose = 2; UImanager->SetVerboseLevel(newVerbose); UImanager->ApplyCommand("/vis/scene/create"); +// UImanager->ApplyCommand("/vis/scene/add/eventID"); UImanager->ApplyCommand(G4String("/vis/scene/add/volume " + newValue)); UImanager->ApplyCommand("/vis/sceneHandler/attach"); UImanager->SetVerboseLevel(keepVerbose); - if (verbosity >= G4VisManager::warnings) { + static G4bool warned = false; + if (verbosity >= G4VisManager::warnings && !warned) { G4cout << "WARNING: For systems which are not \"auto-refresh\" you will need to" "\n issue \"/vis/viewer/refresh\" or \"/vis/viewer/flush\"." << G4endl; + warned = true; } } @@ -309,10 +320,12 @@ void G4VisCommandSpecify::SetNewValue(G4UIcommand*, G4String newValue) { UImanager->ApplyCommand(G4String("/vis/scene/add/logicalVolume " + newValue)); UImanager->ApplyCommand("/vis/sceneHandler/attach"); UImanager->SetVerboseLevel(keepVerbose); - if (verbosity >= G4VisManager::warnings) { + static G4bool warned = false; + if (verbosity >= G4VisManager::warnings && !warned) { G4cout << "WARNING: For systems which are not \"auto-refresh\" you will need to" "\n issue \"/vis/viewer/refresh\" or \"/vis/viewer/flush\"." << G4endl; + warned = true; } } diff --git a/source/visualization/management/src/G4VisCommandsGeometry.cc b/source/visualization/management/src/G4VisCommandsGeometry.cc index 5457902505..1a3ed23014 100644 --- a/source/visualization/management/src/G4VisCommandsGeometry.cc +++ b/source/visualization/management/src/G4VisCommandsGeometry.cc @@ -25,7 +25,7 @@ // // // $Id: G4VisCommandsGeometry.cc,v 1.3 2006/06/29 21:29:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // /vis/geometry commands - John Allison 31st January 2006 diff --git a/source/visualization/management/src/G4VisCommandsGeometrySet.cc b/source/visualization/management/src/G4VisCommandsGeometrySet.cc index 97940ac758..2376e3930e 100644 --- a/source/visualization/management/src/G4VisCommandsGeometrySet.cc +++ b/source/visualization/management/src/G4VisCommandsGeometrySet.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VisCommandsGeometrySet.cc,v 1.5 2006/06/29 21:29:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VisCommandsGeometrySet.cc,v 1.6 2006/09/19 16:05:13 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // /vis/geometry commands - John Allison 31st January 2006 @@ -150,12 +150,12 @@ void G4VisCommandGeometrySetColour::SetNewValue G4double green, blue, opacity; std::istringstream iss(newValue); iss >> name >> requestedDepth >> redOrString >> green >> blue >> opacity; - G4Colour colour; // Default white and opaque. + G4Colour colour(1,1,1,1); // Default white and opaque. const size_t iPos0 = 0; if (std::isalpha(redOrString[iPos0])) { G4Colour::GetColour(redOrString, colour); // Remains if not found. } else { - colour = G4Colour(G4UIcommand::ConvertTo3Vector(newValue)); + colour = G4Colour(G4UIcommand::ConvertToDouble(redOrString), green, blue); } colour = G4Colour (colour.GetRed(), colour.GetGreen(), colour.GetBlue(), opacity); diff --git a/source/visualization/management/src/G4VisCommandsScene.cc b/source/visualization/management/src/G4VisCommandsScene.cc index 79da88a67d..cb59c02b9c 100644 --- a/source/visualization/management/src/G4VisCommandsScene.cc +++ b/source/visualization/management/src/G4VisCommandsScene.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VisCommandsScene.cc,v 1.54 2006/06/29 21:29:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VisCommandsScene.cc,v 1.65 2006/11/26 19:37:54 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // /vis/scene commands - John Allison 9th August 1998 @@ -98,6 +98,7 @@ void G4VisCommandSceneCreate::SetNewValue (G4UIcommand*, G4String newValue) { if (iScene < nScenes) { if (verbosity >= G4VisManager::warnings) { G4cout << "WARNING: Scene \"" << newName << "\" already exists." + << "\n New scene not created." << G4endl; } } else { @@ -117,7 +118,7 @@ void G4VisCommandSceneCreate::SetNewValue (G4UIcommand*, G4String newValue) { G4VisCommandSceneEndOfEventAction::G4VisCommandSceneEndOfEventAction () { G4bool omitable; - fpCommand = new G4UIcmdWithAString ("/vis/scene/endOfEventAction", this); + fpCommand = new G4UIcommand ("/vis/scene/endOfEventAction", this); fpCommand -> SetGuidance ("Accumulate or refresh the viewer for each new event."); fpCommand -> SetGuidance @@ -125,10 +126,16 @@ G4VisCommandSceneEndOfEventAction::G4VisCommandSceneEndOfEventAction () { fpCommand -> SetGuidance ("\"refresh\": viewer shows them at end of event or, for direct-screen" "\n viewers, refreshes the screen just before drawing the next event."); - fpCommand -> SetGuidance ("The detector remains or is redrawn."); - fpCommand -> SetParameterName ("action", omitable = true); - fpCommand -> SetCandidates ("accumulate refresh"); - fpCommand -> SetDefaultValue ("refresh"); + G4UIparameter* parameter; + parameter = new G4UIparameter ("action", 's', omitable = true); + parameter -> SetParameterCandidates ("accumulate refresh"); + parameter -> SetDefaultValue ("refresh"); + fpCommand -> SetParameter (parameter); + parameter = new G4UIparameter ("maxNumber", 'i', omitable = true); + parameter -> SetDefaultValue (100); + parameter -> SetGuidance + ("Maximum number of events kept. Unlimited if negative."); + fpCommand -> SetParameter (parameter); } G4VisCommandSceneEndOfEventAction::~G4VisCommandSceneEndOfEventAction () { @@ -145,8 +152,9 @@ void G4VisCommandSceneEndOfEventAction::SetNewValue (G4UIcommand*, G4VisManager::Verbosity verbosity = fpVisManager->GetVerbosity(); G4String action; + G4int maxNumberOfKeptEvents; std::istringstream is (newValue); - is >> action; + is >> action >> maxNumberOfKeptEvents; G4Scene* pScene = fpVisManager->GetCurrentScene(); if (!pScene) { @@ -166,10 +174,20 @@ void G4VisCommandSceneEndOfEventAction::SetNewValue (G4UIcommand*, if (action == "accumulate") { pScene->SetRefreshAtEndOfEvent(false); + pScene->SetMaxNumberOfKeptEvents(maxNumberOfKeptEvents); } else if (action == "refresh") { - pScene->SetRefreshAtEndOfEvent(true); - pSceneHandler->SetMarkForClearingTransientStore(true); + if (!pScene->GetRefreshAtEndOfRun()) { + if (verbosity >= G4VisManager::errors) { + G4cout << + "ERROR: Cannot refresh events unless runs refresh too." + "\n Use \"/vis/scene/endOfRun refresh\"." + << G4endl; + } + } else { + pScene->SetRefreshAtEndOfEvent(true); + pSceneHandler->SetMarkForClearingTransientStore(true); + } } else { if (verbosity >= G4VisManager::errors) { @@ -180,12 +198,34 @@ void G4VisCommandSceneEndOfEventAction::SetNewValue (G4UIcommand*, return; } + // Change of transients behaviour, so... + fpVisManager->ResetTransientsDrawnFlags(); + if (verbosity >= G4VisManager::confirmations) { - G4cout << "End of event action set to \""; - if (pScene->GetRefreshAtEndOfEvent()) G4cout << "refresh"; - else G4cout << "accumulate"; - G4cout << "\"" << G4endl; + G4cout << "End of event action set to "; + if (pScene->GetRefreshAtEndOfEvent()) G4cout << "\"refresh\"."; + else { + G4cout << "\"accumulate\"." + "\n Maximum number of events to be kept: " + << maxNumberOfKeptEvents + << " (unlimited if negative)." + "\n This may be changed with, e.g., " + "\"/vis/scene/endOfEventAction accumulate 100\"." + << G4endl; + } } + if (!pScene->GetRefreshAtEndOfEvent() && + maxNumberOfKeptEvents != 0 && + verbosity >= G4VisManager::warnings) { + G4cout << "WARNING: The vis manager will keep "; + if (maxNumberOfKeptEvents < 0) G4cout << "an unlimited number of"; + else G4cout << "up to " << maxNumberOfKeptEvents; + G4cout << " events."; + if (maxNumberOfKeptEvents > 1 || maxNumberOfKeptEvents < 0) + G4cout << "\n This may use a lot of memory."; + G4cout << G4endl; + } + UpdateVisManagerScene (pScene->GetName()); } ////////////// /vis/scene/endOfRunAction //////////////////////////// @@ -266,12 +306,16 @@ void G4VisCommandSceneEndOfRunAction::SetNewValue (G4UIcommand*, return; } + // Change of transients behaviour, so... + fpVisManager->ResetTransientsDrawnFlags(); + if (verbosity >= G4VisManager::confirmations) { G4cout << "End of run action set to \""; if (pScene->GetRefreshAtEndOfRun()) G4cout << "refresh"; else G4cout << "accumulate"; G4cout << "\"" << G4endl; } + UpdateVisManagerScene (pScene->GetName()); } ////////////// /vis/scene/list /////////////////////////////////////// @@ -459,25 +503,41 @@ void G4VisCommandSceneNotifyHandlers::SetNewValue (G4UIcommand*, const G4int nViewers = viewerList.size (); for (G4int iV = 0; iV < nViewers; iV++) { G4VViewer* aViewer = viewerList [iV]; - aSceneHandler -> SetCurrentViewer (aViewer); - // Ensure consistency of vis manager... - fpVisManager -> SetCurrentViewer(aViewer); - fpVisManager -> SetCurrentSceneHandler(aSceneHandler); - fpVisManager -> SetCurrentScene(aScene); - // Re-draw, forcing rebuild of graphics database, if any... - aViewer -> NeedKernelVisit(); - aViewer -> SetView (); - aViewer -> ClearView (); - aViewer -> DrawView (); - if (flush) aViewer -> ShowView (); - if (verbosity >= G4VisManager::confirmations) { - G4cout << "Viewer \"" << aViewer -> GetName () - << "\" of scene handler \"" << aSceneHandler -> GetName () - << "\"\n "; - if (flush) G4cout << "flushed"; - else G4cout << "refreshed"; - G4cout << " at request of scene \"" << sceneName - << "\"." << G4endl; + if (aViewer->GetViewParameters().IsAutoRefresh()) { + aSceneHandler -> SetCurrentViewer (aViewer); + // Ensure consistency of vis manager... + fpVisManager -> SetCurrentViewer(aViewer); + fpVisManager -> SetCurrentSceneHandler(aSceneHandler); + fpVisManager -> SetCurrentScene(aScene); + // Re-draw, forcing rebuild of graphics database, if any... + aViewer -> NeedKernelVisit(); + aViewer -> SetView (); + aViewer -> ClearView (); + aViewer -> DrawView (); + if (flush) aViewer -> ShowView (); + if (verbosity >= G4VisManager::confirmations) { + G4cout << "Viewer \"" << aViewer -> GetName () + << "\" of scene handler \"" << aSceneHandler -> GetName () + << "\"\n "; + if (flush) G4cout << "flushed"; + else G4cout << "refreshed"; + G4cout << " at request of scene \"" << sceneName + << "\"." << G4endl; + } + } else { + if (verbosity >= G4VisManager::warnings) { + G4cout << "WARNING: The scene, \"" + << sceneName + << "\", of viewer \"" + << aViewer -> GetName () + << "\"\n of scene handler \"" + << aSceneHandler -> GetName () + << "\" has changed. To see effect," + << "\n \"/vis/viewer/select " + << aViewer -> GetShortName () + << "\" and \"/vis/viewer/rebuild\"." + << G4endl; + } } } } @@ -559,76 +619,4 @@ void G4VisCommandSceneSelect::SetNewValue (G4UIcommand*, G4String newValue) { << "\" selected." << G4endl; } UpdateVisManagerScene (selectName); - -} - -////////////// /vis/scene/transientsAction //////////////////////////// - -G4VisCommandSceneTransientsAction::G4VisCommandSceneTransientsAction () { - G4bool omitable; - fpCommand = new G4UIcmdWithAString ("/vis/scene/transientsAction", this); - fpCommand -> SetGuidance - ("Rerun events to get transienst (trajectories, etc.), when needed."); - fpCommand -> SetGuidance - ("Note: ineffective in absence of instantiated run manager."); - fpCommand -> SetParameterName ("action", omitable = true); - fpCommand -> SetCandidates ("rerun none"); - fpCommand -> SetDefaultValue ("rerun"); - -} - -G4VisCommandSceneTransientsAction::~G4VisCommandSceneTransientsAction () { - delete fpCommand; -} - -G4String G4VisCommandSceneTransientsAction::GetCurrentValue(G4UIcommand*) { - return ""; -} - -void G4VisCommandSceneTransientsAction::SetNewValue (G4UIcommand*, - G4String newValue) { - - G4VisManager::Verbosity verbosity = fpVisManager->GetVerbosity(); - - G4String action; - std::istringstream is (newValue); - is >> action; - - G4Scene* pScene = fpVisManager->GetCurrentScene(); - if (!pScene) { - if (verbosity >= G4VisManager::errors) { - G4cout << "ERROR: No current scene. Please create one." << G4endl; - } - return; - } - - G4VSceneHandler* pSceneHandler = fpVisManager->GetCurrentSceneHandler(); - if (!pSceneHandler) { - if (verbosity >= G4VisManager::errors) { - G4cout << "ERROR: No current sceneHandler. Please create one." << G4endl; - } - return; - } - - if (action == "rerun") { - pScene->SetRecomputeTransients(true); - } - else if (action == "none") { - pScene->SetRecomputeTransients(false); - } - else { - if (verbosity >= G4VisManager::errors) { - G4cout << - "ERROR: unrecognised parameter \"" << action << "\"." - << G4endl; - } - return; - } - - if (verbosity >= G4VisManager::confirmations) { - G4cout << "Transients action set to \""; - if (pScene->GetRecomputeTransients()) G4cout << "rerun"; - else G4cout << "none"; - G4cout << "\"" << G4endl; - } } diff --git a/source/visualization/management/src/G4VisCommandsSceneAdd.cc b/source/visualization/management/src/G4VisCommandsSceneAdd.cc index 20c26de522..a69477e294 100644 --- a/source/visualization/management/src/G4VisCommandsSceneAdd.cc +++ b/source/visualization/management/src/G4VisCommandsSceneAdd.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VisCommandsSceneAdd.cc,v 1.65 2006/06/29 21:29:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VisCommandsSceneAdd.cc,v 1.72 2006/11/25 15:37:31 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // /vis/scene commands - John Allison 9th August 1998 #include "G4VisCommandsSceneAdd.hh" @@ -54,12 +54,17 @@ #include "G4UImanager.hh" #include "G4UIcommand.hh" #include "G4UIcmdWithAString.hh" -#include "G4UIcmdWithAnInteger.hh" #include "G4UIcmdWithoutParameter.hh" #include "G4Tokenizer.hh" #include "G4RunManager.hh" +#include "G4StateManager.hh" #include "G4Run.hh" #include "G4Event.hh" +#include "G4IdentityTrajectoryFilter.hh" +#include "G4TransportationManager.hh" +#include "G4PropagatorInField.hh" +#include "G4RichTrajectory.hh" +#include "G4AttDef.hh" #include "G4ios.hh" #include @@ -215,36 +220,49 @@ void G4VisCommandSceneAddEventID::SetNewValue (G4UIcommand*, G4String newValue) } } else G4VisCommandsSceneAddUnsuccessful(verbosity); + UpdateVisManagerScene (currentSceneName); } void G4VisCommandSceneAddEventID::EventID::operator() (G4VGraphicsScene& sceneHandler, const G4Transform3D&) { + const G4Run* currentRun = 0; G4RunManager* runManager = G4RunManager::GetRunManager(); - if (runManager) { - const G4Run* currentRun = runManager->GetCurrentRun(); - const G4Event* currentEvent = runManager->GetCurrentEvent(); - if (currentRun && currentEvent) { - G4int runID = currentRun->GetRunID(); - G4int eventID = currentEvent->GetEventID(); - std::ostringstream oss; - if (fpVisManager->GetCurrentScene()->GetRefreshAtEndOfEvent()) { - oss << "Run " << runID << " Event " << eventID; + if (runManager) currentRun = runManager->GetCurrentRun(); + + G4VModel* model = fpVisManager->GetCurrentSceneHandler()->GetModel(); + const G4ModelingParameters* mp = model->GetModelingParameters(); + const G4Event* currentEvent = mp->GetEvent(); + + if (currentRun && currentEvent) { + G4int runID = currentRun->GetRunID(); + G4int eventID = currentEvent->GetEventID(); + std::ostringstream oss; + if (fpVisManager->GetCurrentScene()->GetRefreshAtEndOfEvent()) { + oss << "Run " << runID << " Event " << eventID; + } else { + G4int nEvents = 0; + G4StateManager* stateManager = G4StateManager::GetStateManager(); + G4ApplicationState state = stateManager->GetCurrentState(); + if (state == G4State_EventProc) { + nEvents = currentRun->GetNumberOfEventToBeProcessed(); } else { - G4int nEvents = currentRun->GetNumberOfEventToBeProcessed(); - if (eventID < nEvents - 1) return; // Not last event. - else { - oss << "Run " << runID << " (" << nEvents << " accumulated events)"; - } + const std::vector* events = + currentRun? currentRun->GetEventVector(): 0; + if (events) nEvents = events->size(); + } + if (eventID < nEvents - 1) return; // Not last event. + else { + oss << "Run " << runID << " (" << nEvents << " accumulated events)"; } - G4Text text(oss.str(), G4Point3D(fX, fY, 0.)); - text.SetScreenSize(fSize); - G4VisAttributes textAtts(G4Colour(0.,1.,1)); - text.SetVisAttributes(textAtts); - sceneHandler.BeginPrimitives2D(); - sceneHandler.AddPrimitive(text); - sceneHandler.EndPrimitives2D(); } + G4Text text(oss.str(), G4Point3D(fX, fY, 0.)); + text.SetScreenSize(fSize); + G4VisAttributes textAtts(G4Colour(0.,1.,1)); + text.SetVisAttributes(textAtts); + sceneHandler.BeginPrimitives2D(); + sceneHandler.AddPrimitive(text); + sceneHandler.EndPrimitives2D(); } } @@ -404,6 +422,7 @@ void G4VisCommandSceneAddHits::SetNewValue (G4UIcommand*, G4String) { } } else G4VisCommandsSceneAddUnsuccessful(verbosity); + UpdateVisManagerScene (currentSceneName); } ////////////// /vis/scene/add/logicalVolume ////////////////////////////////// @@ -503,7 +522,6 @@ void G4VisCommandSceneAddLogicalVolume::SetNewValue (G4UIcommand*, << "\n (and also, if necessary, /vis/viewer/flush)" << G4endl; } - return; } G4VModel* model = new G4LogicalVolumeModel @@ -526,7 +544,11 @@ void G4VisCommandSceneAddLogicalVolume::SetNewValue (G4UIcommand*, << G4endl; } } - else G4VisCommandsSceneAddUnsuccessful(verbosity); + else { + G4VisCommandsSceneAddUnsuccessful(verbosity); + return; + } + UpdateVisManagerScene (currentSceneName); } @@ -1215,23 +1237,33 @@ void G4VisCommandSceneAddText::SetNewValue (G4UIcommand*, G4String newValue) { G4VisCommandSceneAddTrajectories::G4VisCommandSceneAddTrajectories () { G4bool omitable; - fpCommand = new G4UIcmdWithAnInteger + fpCommand = new G4UIcmdWithAString ("/vis/scene/add/trajectories", this); fpCommand -> SetGuidance ("Adds trajectories to current scene."); fpCommand -> SetGuidance - ("Causes trajectories, if any, to be drawn at the end of processiing an" - "\nevent. The drawing mode is an integer that is passed to the" - "\nDrawTrajectory method. The default implementation in G4VTrajectory," - "\nif drawing-mode >= 0, draws the trajectory as a polyline (blue for" - "\npositive, red for negative, green for neutral) and, if" - "\ndrawing-mode != 0, draws markers of screen size" - "\nstd::abs(drawing-mode)/1000 pixels at each step and auxiliary point," - "\nif any. So drawing-mode = 5000 is a good choice." - "\nEnable storing with \"/tracking/storeTrajectory 1\"." + ("Causes trajectories, if any, to be drawn at the end of processing an" + "\nevent. Switches on trajectory storing and sets the" + "\ndefault trajectory type."); + fpCommand -> SetGuidance + ("The command line parameter list determines the default trajectory type." + "\nIf it contains the string \"smooth\", auxiliary inter-step points will" + "\nbe inserted to improve the smoothness of the drawing of a curved" + "\ntrajectory." + "\nIf it contains the string \"rich\", significant extra information will" + "\nbe stored in the trajectory (G4RichTrajectory) amenable to modeling" + "\nand filtering with \"/vis/modeling/trajectories/create/drawByAttribute\"" + "\nand \"/vis/filtering/trajectories/create/attributeFilter\" commands." + "\nIt may contain both strings in any order."); + fpCommand -> SetGuidance + ("\nTo switch off trajectory storing: \"/tracking/storeTrajectory 0\"." "\nSee also \"/vis/scene/endOfEventAction\"."); - fpCommand -> SetParameterName ("drawing-mode", omitable = true); - fpCommand -> SetDefaultValue (0); + fpCommand -> SetGuidance + ("Note: This only sets the default. Independently of the result of this" + "\ncommand, a user may instantiate a trajectory that overrides this default" + "\nin PreUserTrackingAction."); + fpCommand -> SetParameterName ("default-trajectory-type", omitable = true); + fpCommand -> SetDefaultValue (""); } G4VisCommandSceneAddTrajectories::~G4VisCommandSceneAddTrajectories () { @@ -1256,34 +1288,85 @@ void G4VisCommandSceneAddTrajectories::SetNewValue (G4UIcommand*, return; } - G4int drawingMode; - std::istringstream is (newValue); - is >> drawingMode; - G4TrajectoriesModel* model = new G4TrajectoriesModel(drawingMode); - const G4String& currentSceneName = pScene -> GetName (); - pScene -> AddEndOfEventModel (model, warn); + G4bool smooth = false, rich = false; + if (newValue.find("smooth") != std::string::npos) smooth = true; + if (newValue.find("rich") != std::string::npos) rich = true; G4UImanager* UImanager = G4UImanager::GetUIpointer(); G4int keepVerbose = UImanager->GetVerboseLevel(); - G4int newVerbose = 0; - if (keepVerbose >= 2 || - fpVisManager->GetVerbosity() >= G4VisManager::confirmations) - newVerbose = 2; + G4int newVerbose = 2; UImanager->SetVerboseLevel(newVerbose); - UImanager->ApplyCommand("/tracking/storeTrajectory 1"); + G4PropagatorInField* propagatorInField = + G4TransportationManager::GetTransportationManager()-> + GetPropagatorInField(); + propagatorInField->SetTrajectoryFilter(0); // Switch off smooth trajectories. + static G4IdentityTrajectoryFilter auxiliaryPointsFilter; + G4String defaultTrajectoryType; + G4int i_mode = 0; + if (smooth && rich) { + UImanager->ApplyCommand("/tracking/storeTrajectory 3"); + propagatorInField->SetTrajectoryFilter(&auxiliaryPointsFilter); + defaultTrajectoryType = "G4RichTrajectory configured for smooth steps"; + } else if (smooth) { + UImanager->ApplyCommand("/tracking/storeTrajectory 2"); + propagatorInField->SetTrajectoryFilter(&auxiliaryPointsFilter); + defaultTrajectoryType = "G4SmoothTrajectory"; + } else if (rich) { + UImanager->ApplyCommand("/tracking/storeTrajectory 3"); + defaultTrajectoryType = "G4RichTrajectory"; + } else { + if (!newValue.empty()) { + std::istringstream iss(newValue); + iss >> i_mode; + if (iss) { + if (verbosity >= G4VisManager::warnings) { + G4cout << "WARNING: Integer parameter " << i_mode << " found." + "\n DEPRECATED - will be removed at next major release." + "\n Use \"/vis/modeling/trajectories\" commands." + << G4endl; + } + } else { + if (verbosity >= G4VisManager::errors) { + G4cout << "ERROR: Unrecognised parameter \"" << newValue << "\"" + "\n No action taken." + << G4endl; + } + return; + } + } + UImanager->ApplyCommand("/tracking/storeTrajectory 1"); + defaultTrajectoryType = "G4Trajectory"; + } UImanager->SetVerboseLevel(keepVerbose); + if (rich) { + if (verbosity >= G4VisManager::warnings) { + G4cout << + "Attributes available for modeling and filtering with" + "\n\"/vis/modeling/trajectories/create/drawByAttribute\" and" + "\n\"/vis/filtering/trajectories/create/attributeFilter\" commands:\n" + << G4RichTrajectory().GetAttDefs(); + } + } + + G4TrajectoriesModel* model = new G4TrajectoriesModel(i_mode); + const G4String& currentSceneName = pScene -> GetName (); + pScene -> AddEndOfEventModel (model, warn); + if (verbosity >= G4VisManager::confirmations) { - G4cout << "Trajectories will be drawn with mode " - << drawingMode - << " in scene \"" + G4cout << "Default trajectory type " << defaultTrajectoryType + << "\n will be used to store trajectories for scene \"" << currentSceneName << "\"." << G4endl; } + if (verbosity >= G4VisManager::warnings) { - G4cout << "WARNING: \"/tracking/storeTrajectory 1\" has been executed." + G4cout << + "WARNING: Trajectory storing has been requested. This action may be" + "\n reversed with \"/tracking/storeTrajectory 0\"." << G4endl; } + UpdateVisManagerScene (currentSceneName); } ////////////// /vis/scene/add/userAction /////////////////////////////////// @@ -1390,6 +1473,7 @@ void G4VisCommandSceneAddUserAction::SetNewValue (G4UIcommand*, } G4cout << G4endl; } + UpdateVisManagerScene (currentSceneName); } ////////////// /vis/scene/add/volume /////////////////////////////////////// @@ -1401,17 +1485,27 @@ G4VisCommandSceneAddVolume::G4VisCommandSceneAddVolume () { ("Adds a physical volume to current scene, with optional clipping volume."); fpCommand -> SetGuidance ("If physical-volume-name is \"world\" (the default), the top of the" - "\ntracking tree is used (GetNavigatorForTracking()->GetWorldVolume())." - "\nOtherwise a search of the tracking tree is made, taking the first" + "\nmain geometry tree (material world) is added. If \"worlds\", the" + "\ntop of all worlds - material world and parallel worlds, if any - are" + "\nadded. Otherwise a search of all worlds is made, taking the first" "\nmatching occurence only. To see a representation of the geometry" - "\nhierarchy of the tracking tree, try \"/vis/drawTree\" or one of the" + "\nhierarchy of the worlds, try \"/vis/drawTree [worlds]\" or one of the" "\ndriver/browser combinations that have the required functionality," "\ne.g., HepRepFile/XML with the WIRED3/4 browser."); fpCommand -> SetGuidance ("If clip-volume-type is specified, the subsequent parameters are used to" "\nto define a clipping volume. For example," - "\n\"vis/scene/add/volume ! ! ! box km 0 1 0 1 0 1\" will draw the world" + "\n\"vis/scene/add/volume ! ! ! -box km 0 1 0 1 0 1\" will draw the world" "\nwith the positive octant cut away."); + fpCommand -> SetGuidance + ("If clip-volume-type is prepended with '-', the clip-volume is subtracted" + "\n(cutaway). (This is the default if there is no prepended character.)" + "\nIf '*' is prepended, the intersection of the physical-volume and the" + "\nclip-volume is made. (You can make a section/DCUT with a thin box, for" + "\nexample)."); + fpCommand -> SetGuidance + ("For \"box\", the parameters are xmin,xmax,ymin,ymax,zmin,zmax." + "\nOnly \"box\" is programmed at present."); G4UIparameter* parameter; parameter = new G4UIparameter ("physical-volume-name", 's', omitable = true); parameter -> SetDefaultValue ("world"); @@ -1427,12 +1521,9 @@ G4VisCommandSceneAddVolume::G4VisCommandSceneAddVolume () { parameter -> SetDefaultValue (G4Scene::UNLIMITED); fpCommand -> SetParameter (parameter); parameter = new G4UIparameter ("clip-volume-type", 's', omitable = true); - parameter -> SetParameterCandidates("none box"); + parameter -> SetParameterCandidates("none box -box *box"); parameter -> SetDefaultValue ("none"); - parameter -> SetGuidance - ("For \"box\", the parameters are xmin,xmax,ymin,ymax,zmin,zmax." - // "\n Only \"box\" is programmed at present."); No '\n' for GAG (temp). - " Only \"box\" is programmed at present."); + parameter -> SetGuidance("[-|*]type. See general guidance."); fpCommand -> SetParameter (parameter); parameter = new G4UIparameter ("parameter-unit", 's', omitable = true); parameter -> SetDefaultValue ("m"); @@ -1486,16 +1577,54 @@ void G4VisCommandSceneAddVolume::SetNewValue (G4UIcommand*, is >> name >> copyNo >> requestedDepthOfDescent >> clipVolumeType >> parameterUnit >> param1 >> param2 >> param3 >> param4 >> param5 >> param6; + G4PhysicalVolumeModel::ClippingMode clippingMode = + G4PhysicalVolumeModel::subtraction; // Default subtraction mode. + if (clipVolumeType[size_t(0)] == '-') { + clipVolumeType = clipVolumeType.substr(1); // Remove first character. + } else if (clipVolumeType[size_t(0)] == '*') { + clippingMode = G4PhysicalVolumeModel::intersection; + clipVolumeType = clipVolumeType.substr(1); + } G4double unit = G4UIcommand::ValueOf(parameterUnit); param1 *= unit; param2 *= unit; param3 *= unit; param4 *= unit; param5 *= unit; param6 *= unit; - G4VPhysicalVolume* world = - G4TransportationManager::GetTransportationManager () - -> GetNavigatorForTracking () -> GetWorldVolume (); - G4PhysicalVolumeModel* model = 0; - G4VPhysicalVolume* foundVolume = 0; - G4int foundDepth = 0; + G4TransportationManager* transportationManager = + G4TransportationManager::GetTransportationManager (); + + size_t nWorlds = transportationManager->GetNoWorlds(); + if (nWorlds > 1) { // Parallel worlds in operation... + if (verbosity >= G4VisManager::warnings) { + static G4bool warned = false; + if (!warned && name != "worlds") { + G4cout << + "WARNING: Parallel worlds in operation. To visualise, specify" + "\n \"worlds\" or the parallel world volume or sub-volume name" + "\n and control visibility with /vis/geometry." + << G4endl; + std::vector::iterator iterWorld = + transportationManager->GetWorldsIterator(); + for (size_t i = 0; i < nWorlds; ++i, ++iterWorld) { + G4cout << " World " << i << ": " << (*iterWorld)->GetName() + << G4endl; + warned = true; + } + } + } + } + + G4VPhysicalVolume* world = *(transportationManager->GetWorldsIterator()); + + if (!world) { + if (verbosity >= G4VisManager::errors) { + G4cout << + "ERROR: G4VisCommandSceneAddVolume::SetNewValue:" + "\n No world. Maybe the geometry has not yet been defined." + "\n Try \"/run/initialize\"" + << G4endl; + } + return; + } const std::vector& rdModelList = pScene -> GetRunDurationModelList(); std::vector::const_iterator i; @@ -1520,49 +1649,73 @@ void G4VisCommandSceneAddVolume::SetNewValue (G4UIcommand*, << "\n (and also, if necessary, /vis/viewer/flush)" << G4endl; } + return; } + std::vector models; + std::vector foundVolumes; + G4VPhysicalVolume* foundWorld = 0; + std::vector foundDepths; + std::vector transformations; + if (name == "world") { - if (world) { - model = new G4PhysicalVolumeModel (world, - requestedDepthOfDescent); - foundVolume = world; - } - else { - if (verbosity >= G4VisManager::errors) { + + models.push_back + (new G4PhysicalVolumeModel (world, requestedDepthOfDescent)); + foundVolumes.push_back(world); + foundDepths.push_back(0); + transformations.push_back(G4Transform3D()); + + } else if (name == "worlds") { + + size_t nWorlds = transportationManager->GetNoWorlds(); + if (nWorlds == 0) { + if (verbosity >= G4VisManager::warnings) { G4cout << - "ERROR: G4VisCommandSceneAddVolume::SetNewValue:" - "\n No world. Maybe the geometry has not yet been defined." - "\n Try \"/run/initialize\"" + "WARNING: G4VisCommandSceneAddVolume::SetNewValue:" + "\n Parallel worlds requested but none exist." + "\n Just adding material world." << G4endl; } - return; } - } - else { - - // Create search scene, model and modeling parameters with - // long-enough life... - G4PhysicalVolumeModel searchModel (world); // Default - unlimited depth. - G4ModelingParameters mp; // Default - no culling. - searchModel.SetModelingParameters (&mp); - G4PhysicalVolumeSearchScene searchScene (&searchModel, name, copyNo); - - // Initiate search... - searchModel.DescribeYourselfTo (searchScene); - - // OK, what have we got...? - foundVolume = searchScene.GetFoundVolume (); - foundDepth = searchScene.GetFoundDepth (); - const G4Transform3D& - transformation = searchScene.GetFoundTransformation (); - - if (foundVolume) { - model = new G4PhysicalVolumeModel (foundVolume, - requestedDepthOfDescent, - transformation); + std::vector::iterator iterWorld = + transportationManager->GetWorldsIterator(); + for (size_t i = 0; i < nWorlds; ++i, ++iterWorld) { + models.push_back + (new G4PhysicalVolumeModel (*iterWorld, requestedDepthOfDescent)); + foundVolumes.push_back(*iterWorld); + foundDepths.push_back(0); + transformations.push_back(G4Transform3D()); } - else { + + } else { // Search all worlds... + + size_t nWorlds = transportationManager->GetNoWorlds(); + std::vector::iterator iterWorld = + transportationManager->GetWorldsIterator(); + for (size_t i = 0; i < nWorlds; ++i, ++iterWorld) { + G4PhysicalVolumeModel searchModel (*iterWorld); // Unlimited depth. + G4ModelingParameters mp; // Default - no culling. + searchModel.SetModelingParameters (&mp); + G4PhysicalVolumeSearchScene searchScene (&searchModel, name, copyNo); + searchModel.DescribeYourselfTo (searchScene); // Initiate search. + G4VPhysicalVolume* foundVolume = searchScene.GetFoundVolume (); + if (foundVolume) { + foundWorld = *iterWorld; + foundVolumes.push_back(foundVolume); + foundDepths.push_back(searchScene.GetFoundDepth()); + transformations.push_back(searchScene.GetFoundTransformation()); + break; + } + } + + if (foundVolumes.size()) { + for (size_t i = 0; i < foundVolumes.size(); ++i) { + models.push_back + (new G4PhysicalVolumeModel + (foundVolumes[i], requestedDepthOfDescent, transformations[i])); + } + } else { if (verbosity >= G4VisManager::errors) { G4cout << "ERROR: Volume \"" << name << "\""; if (copyNo >= 0) { @@ -1582,34 +1735,49 @@ void G4VisCommandSceneAddVolume::SetNewValue (G4UIcommand*, const G4double y0 = (param4 + param3) / 2.; const G4double z0 = (param6 + param5) / 2.; G4Box clippingBox("_clipping_box",dX,dY,dZ); - G4Polyhedron* clippingPolyhedron = new G4PolyhedronBox(dX,dY,dZ); - // Created on the heap and left there. + G4Polyhedron* clippingPolyhedron = + new G4PolyhedronBox(dX,dY,dZ); // The model deletes. clippingPolyhedron->Transform(G4Translate3D(x0,y0,z0)); - model->SetClippingPolyhedron(clippingPolyhedron); + for (size_t i = 0; i < foundVolumes.size(); ++i) { + models[i]->SetClippingPolyhedron(clippingPolyhedron); + models[i]->SetClippingMode(clippingMode); + } } // If any other shape consider NumberOfRotationSides!!!!!!!!!!! const G4String& currentSceneName = pScene -> GetName (); - G4bool successful = pScene -> AddRunDurationModel (model, warn); - if (successful) { - if (verbosity >= G4VisManager::confirmations) { - G4cout << "First occurrence of \"" - << foundVolume -> GetName () - << "\""; - if (copyNo >= 0) { - G4cout << ", copy no. " << copyNo << ","; + G4bool failure = true; + for (size_t i = 0; i < foundVolumes.size(); ++i) { + G4bool successful = pScene -> AddRunDurationModel (models[i], warn); + if (successful) { + failure = false; + if (verbosity >= G4VisManager::confirmations) { + G4cout << "First occurrence of \"" + << foundVolumes[i] -> GetName () + << "\""; + if (copyNo >= 0) { + G4cout << ", copy no. " << copyNo << ","; + } + G4cout << "\n found "; + if (foundWorld) + G4cout << "in world \"" << foundWorld->GetName() << "\" "; + G4cout << "at depth " << foundDepths[i] + << ",\n with a requested depth of further descent of "; + if (requestedDepthOfDescent < 0) { + G4cout << "<0 (unlimited)"; + } + else { + G4cout << requestedDepthOfDescent; + } + G4cout << ",\n has been added to scene \"" << currentSceneName << "\"." + << G4endl; } - G4cout << " found at depth " << foundDepth - << ",\n with a requested depth of further descent of "; - if (requestedDepthOfDescent < 0) { - G4cout << "<0 (unlimited)"; - } - else { - G4cout << requestedDepthOfDescent; - } - G4cout << ",\n has been added to scene \"" << currentSceneName << "\"." - << G4endl; } } - else G4VisCommandsSceneAddUnsuccessful(verbosity); + + if (failure) { + G4VisCommandsSceneAddUnsuccessful(verbosity); + return; + } + UpdateVisManagerScene (currentSceneName); } diff --git a/source/visualization/management/src/G4VisCommandsSceneHandler.cc b/source/visualization/management/src/G4VisCommandsSceneHandler.cc index bcade2b565..d2948a0f1c 100644 --- a/source/visualization/management/src/G4VisCommandsSceneHandler.cc +++ b/source/visualization/management/src/G4VisCommandsSceneHandler.cc @@ -25,7 +25,7 @@ // // // $Id: G4VisCommandsSceneHandler.cc,v 1.32 2006/06/29 21:29:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // /vis/sceneHandler commands - John Allison 10th October 1998 diff --git a/source/visualization/management/src/G4VisCommandsViewer.cc b/source/visualization/management/src/G4VisCommandsViewer.cc index f65496969e..debb20242b 100644 --- a/source/visualization/management/src/G4VisCommandsViewer.cc +++ b/source/visualization/management/src/G4VisCommandsViewer.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VisCommandsViewer.cc,v 1.60 2006/06/29 21:29:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VisCommandsViewer.cc,v 1.66 2006/11/25 15:38:03 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // /vis/viewer commands - John Allison 25th October 1998 @@ -36,6 +36,7 @@ #include "G4VisCommandsScene.hh" #include "G4UImanager.hh" #include "G4UIcommand.hh" +#include "G4UIcmdWithoutParameter.hh" #include "G4UIcmdWithAString.hh" #include "G4UIcmdWithADouble.hh" #include "G4UIcmdWithADoubleAndUnit.hh" @@ -65,6 +66,170 @@ void G4VVisCommandViewer::SetViewParameters } } +////////////// /vis/viewer/addCutawayPlane /////////////////////////////////////// + +G4VisCommandViewerAddCutawayPlane::G4VisCommandViewerAddCutawayPlane () { + G4bool omitable; + fpCommand = new G4UIcommand ("/vis/viewer/addCutawayPlane", this); + fpCommand -> SetGuidance + ("Add cutaway plane A*x + B*y + C*z + D = 0 to current viewer."); + G4UIparameter* parameter; + parameter = new G4UIparameter("x",'d',omitable = true); + parameter -> SetDefaultValue (0); + parameter -> SetGuidance ("Coordinate of point on the plane."); + fpCommand->SetParameter(parameter); + parameter = new G4UIparameter("y",'d',omitable = true); + parameter -> SetDefaultValue (0); + parameter -> SetGuidance ("Coordinate of point on the plane."); + fpCommand->SetParameter(parameter); + parameter = new G4UIparameter("z",'d',omitable = true); + parameter -> SetDefaultValue (0); + parameter -> SetGuidance ("Coordinate of point on the plane."); + fpCommand->SetParameter(parameter); + parameter = new G4UIparameter("unit",'s',omitable = true); + parameter -> SetDefaultValue ("m"); + parameter -> SetGuidance ("Unit of point on the plane."); + fpCommand->SetParameter(parameter); + parameter = new G4UIparameter("nx",'d',omitable = true); + parameter -> SetDefaultValue (1); + parameter -> SetGuidance ("Component of plane normal."); + fpCommand->SetParameter(parameter); + parameter = new G4UIparameter("ny",'d',omitable = true); + parameter -> SetDefaultValue (0); + parameter -> SetGuidance ("Component of plane normal."); + fpCommand->SetParameter(parameter); + parameter = new G4UIparameter("nz",'d',omitable = true); + parameter -> SetDefaultValue (0); + parameter -> SetGuidance ("Component of plane normal."); + fpCommand->SetParameter(parameter); +} + +G4VisCommandViewerAddCutawayPlane::~G4VisCommandViewerAddCutawayPlane () { + delete fpCommand; +} + +G4String G4VisCommandViewerAddCutawayPlane::GetCurrentValue (G4UIcommand*) { + return ""; +} + +void G4VisCommandViewerAddCutawayPlane::SetNewValue (G4UIcommand*, G4String newValue) { + + G4VisManager::Verbosity verbosity = fpVisManager->GetVerbosity(); + + G4VViewer* viewer = fpVisManager -> GetCurrentViewer (); + if (!viewer) { + if (verbosity >= G4VisManager::errors) { + G4cout << + "ERROR: No current viewer - \"/vis/viewer/list\" to see possibilities." + << G4endl; + } + return; + } + + G4double x, y, z, nx, ny, nz; + G4String unit; + std::istringstream is (newValue); + is >> x >> y >> z >> unit >> nx >> ny >> nz; + G4double F = G4UIcommand::ValueOf(unit); + x *= F; y *= F; z *= F; + + G4ViewParameters vp = viewer->GetViewParameters(); + vp.AddCutawayPlane(G4Plane3D(G4Normal3D(nx,ny,nz), G4Point3D(x,y,z))); + if (verbosity >= G4VisManager::confirmations) { + G4cout << "Cutaway planes for viewer \"" << viewer->GetName() << "\" now:"; + const G4Planes& cutaways = vp.GetCutawayPlanes(); + for (size_t i = 0; i < cutaways.size(); ++i) + G4cout << "\n " << i << ": " << cutaways[i]; + G4cout << G4endl; + } + + SetViewParameters(viewer, vp); +} + +////////////// /vis/viewer/changeCutawayPlane /////////////////////////////////////// + +G4VisCommandViewerChangeCutawayPlane::G4VisCommandViewerChangeCutawayPlane () { + G4bool omitable; + fpCommand = new G4UIcommand ("/vis/viewer/changeCutawayPlane", this); + fpCommand -> SetGuidance("Change cutaway plane."); + G4UIparameter* parameter; + parameter = new G4UIparameter("index",'i',omitable = false); + parameter -> SetGuidance ("Index of plane: 0, 1, 2."); + fpCommand->SetParameter(parameter); + parameter = new G4UIparameter("x",'d',omitable = true); + parameter -> SetDefaultValue (0); + parameter -> SetGuidance ("Coordinate of point on the plane."); + fpCommand->SetParameter(parameter); + parameter = new G4UIparameter("y",'d',omitable = true); + parameter -> SetDefaultValue (0); + parameter -> SetGuidance ("Coordinate of point on the plane."); + fpCommand->SetParameter(parameter); + parameter = new G4UIparameter("z",'d',omitable = true); + parameter -> SetDefaultValue (0); + parameter -> SetGuidance ("Coordinate of point on the plane."); + fpCommand->SetParameter(parameter); + parameter = new G4UIparameter("unit",'s',omitable = true); + parameter -> SetDefaultValue ("m"); + parameter -> SetGuidance ("Unit of point on the plane."); + fpCommand->SetParameter(parameter); + parameter = new G4UIparameter("nx",'d',omitable = true); + parameter -> SetDefaultValue (1); + parameter -> SetGuidance ("Component of plane normal."); + fpCommand->SetParameter(parameter); + parameter = new G4UIparameter("ny",'d',omitable = true); + parameter -> SetDefaultValue (0); + parameter -> SetGuidance ("Component of plane normal."); + fpCommand->SetParameter(parameter); + parameter = new G4UIparameter("nz",'d',omitable = true); + parameter -> SetDefaultValue (0); + parameter -> SetGuidance ("Component of plane normal."); + fpCommand->SetParameter(parameter); +} + +G4VisCommandViewerChangeCutawayPlane::~G4VisCommandViewerChangeCutawayPlane () { + delete fpCommand; +} + +G4String G4VisCommandViewerChangeCutawayPlane::GetCurrentValue (G4UIcommand*) { + return ""; +} + +void G4VisCommandViewerChangeCutawayPlane::SetNewValue (G4UIcommand*, G4String newValue) { + + G4VisManager::Verbosity verbosity = fpVisManager->GetVerbosity(); + + G4VViewer* viewer = fpVisManager -> GetCurrentViewer (); + if (!viewer) { + if (verbosity >= G4VisManager::errors) { + G4cout << + "ERROR: No current viewer - \"/vis/viewer/list\" to see possibilities." + << G4endl; + } + return; + } + + size_t index; + G4double x, y, z, nx, ny, nz; + G4String unit; + std::istringstream is (newValue); + is >> index >> x >> y >> z >> unit >> nx >> ny >> nz; + G4double F = G4UIcommand::ValueOf(unit); + x *= F; y *= F; z *= F; + + G4ViewParameters vp = viewer->GetViewParameters(); + vp.ChangeCutawayPlane(index, + G4Plane3D(G4Normal3D(nx,ny,nz), G4Point3D(x,y,z))); + if (verbosity >= G4VisManager::confirmations) { + G4cout << "Cutaway planes for viewer \"" << viewer->GetName() << "\" now:"; + const G4Planes& cutaways = vp.GetCutawayPlanes(); + for (size_t i = 0; i < cutaways.size(); ++i) + G4cout << "\n " << i << ": " << cutaways[i]; + G4cout << G4endl; + } + + SetViewParameters(viewer, vp); +} + ////////////// /vis/viewer/clear /////////////////////////////////////// G4VisCommandViewerClear::G4VisCommandViewerClear () { @@ -85,7 +250,7 @@ G4VisCommandViewerClear::~G4VisCommandViewerClear () { G4String G4VisCommandViewerClear::GetCurrentValue (G4UIcommand*) { G4VViewer* viewer = fpVisManager -> GetCurrentViewer (); - return viewer ? viewer -> GetName () : G4String("none"); + return viewer ? viewer -> GetName () : G4String("none"); } void G4VisCommandViewerClear::SetNewValue (G4UIcommand*, G4String newValue) { @@ -111,6 +276,215 @@ void G4VisCommandViewerClear::SetNewValue (G4UIcommand*, G4String newValue) { } +////////////// /vis/viewer/clearCutawayPlanes /////////////////////////////////////// + +G4VisCommandViewerClearCutawayPlanes::G4VisCommandViewerClearCutawayPlanes () { + fpCommand = new G4UIcmdWithoutParameter + ("/vis/viewer/clearCutawayPlanes", this); + fpCommand -> SetGuidance ("Clear cutaway planes of current viewer."); +} + +G4VisCommandViewerClearCutawayPlanes::~G4VisCommandViewerClearCutawayPlanes () { + delete fpCommand; +} + +G4String G4VisCommandViewerClearCutawayPlanes::GetCurrentValue (G4UIcommand*) { + return ""; +} + +void G4VisCommandViewerClearCutawayPlanes::SetNewValue (G4UIcommand*, G4String) { + + G4VisManager::Verbosity verbosity = fpVisManager->GetVerbosity(); + + G4VViewer* viewer = fpVisManager -> GetCurrentViewer (); + if (!viewer) { + if (verbosity >= G4VisManager::errors) { + G4cout << + "ERROR: No current viewer - \"/vis/viewer/list\" to see possibilities." + << G4endl; + } + return; + } + + G4ViewParameters vp = viewer->GetViewParameters(); + vp.ClearCutawayPlanes(); + if (verbosity >= G4VisManager::confirmations) { + G4cout << "Cutaway planes for viewer \"" << viewer->GetName() + << "\" now cleared." << G4endl; + } + + SetViewParameters(viewer, vp); +} + +////////////// /vis/viewer/clearTransients ////////////////////////// + +G4VisCommandViewerClearTransients::G4VisCommandViewerClearTransients () { + G4bool omitable, currentAsDefault; + fpCommand = new G4UIcmdWithAString ("/vis/viewer/clearTransients", this); + fpCommand -> SetGuidance ("Clears transients from viewer."); + fpCommand -> SetGuidance + ("By default, operates on current viewer. Specified viewer becomes current." + "\n\"/vis/viewer/list\" to see possible viewer names."); + fpCommand -> SetParameterName ("viewer-name", + omitable = true, + currentAsDefault = true); +} + +G4VisCommandViewerClearTransients::~G4VisCommandViewerClearTransients () { + delete fpCommand; +} + +G4String G4VisCommandViewerClearTransients::GetCurrentValue (G4UIcommand*) { + G4VViewer* viewer = fpVisManager -> GetCurrentViewer (); + return viewer ? viewer -> GetName () : G4String("none"); +} + +void G4VisCommandViewerClearTransients::SetNewValue (G4UIcommand*, G4String newValue) { + + G4VisManager::Verbosity verbosity = fpVisManager->GetVerbosity(); + + G4String& clearName = newValue; + G4VViewer* viewer = fpVisManager -> GetViewer (clearName); + if (!viewer) { + if (verbosity >= G4VisManager::errors) { + G4cout << "ERROR: Viewer \"" << clearName + << "\" not found - \"/vis/viewer/list\" to see possibilities." + << G4endl; + } + return; + } + + G4VSceneHandler* sceneHandler = viewer->GetSceneHandler(); + sceneHandler->SetMarkForClearingTransientStore(false); + fpVisManager->ResetTransientsDrawnFlags(); + sceneHandler->ClearTransientStore(); + if (verbosity >= G4VisManager::confirmations) { + G4cout << "Viewer \"" << clearName << "\" cleared of transients." + << G4endl; + } + +} + +////////////// /vis/viewer/clone /////////////////////////////////////// + +G4VisCommandViewerClone::G4VisCommandViewerClone () { + G4bool omitable; + fpCommand = new G4UIcommand ("/vis/viewer/clone", this); + fpCommand -> SetGuidance ("Clones viewer."); + fpCommand -> SetGuidance + ("By default, clones current viewer. Clone becomes current." + "\nClone name, if not provided, is derived from the original name." + "\n\"/vis/viewer/list\" to see possible viewer names."); + G4UIparameter* parameter; + parameter = new G4UIparameter ("original-viewer-name", 's', omitable = true); + parameter -> SetCurrentAsDefault (true); + fpCommand -> SetParameter (parameter); + parameter = new G4UIparameter ("clone-name", 's', omitable = true); + parameter -> SetDefaultValue ("none"); + fpCommand -> SetParameter (parameter); +} + +G4VisCommandViewerClone::~G4VisCommandViewerClone () { + delete fpCommand; +} + +G4String G4VisCommandViewerClone::GetCurrentValue (G4UIcommand*) { + G4VViewer* viewer = fpVisManager -> GetCurrentViewer (); + G4String originalName = viewer ? viewer -> GetName () : G4String("none"); + return "\"" + originalName + "\""; +} + +void G4VisCommandViewerClone::SetNewValue (G4UIcommand*, G4String newValue) { + + G4VisManager::Verbosity verbosity = fpVisManager->GetVerbosity(); + + G4String originalName, cloneName; + std::istringstream is (newValue); + + // Need to handle the possibility that the names contain embedded + // blanks within quotation marks... + char c; + while (is.get(c) && c == ' '); + if (c == '"') { + while (is.get(c) && c != '"') originalName += c; + } + else { + originalName += c; + while (is.get(c) && c != ' ') originalName += c; + } + originalName = originalName.strip (G4String::both, ' '); + originalName = originalName.strip (G4String::both, '"'); + + G4VViewer* originalViewer = fpVisManager -> GetViewer (originalName); + if (!originalViewer) { + if (verbosity >= G4VisManager::errors) { + G4cout << "ERROR: Viewer \"" << originalName + << "\" not found - \"/vis/viewer/list\" to see possibilities." + << G4endl; + } + return; + } + originalName = originalViewer->GetName(); // Ensures long name. + + while (is.get(c) && c == ' '); + if (c == '"') { + while (is.get(c) && c != '"') cloneName += c; + } + else { + cloneName += c; + while (is.get(c) && c != ' ') cloneName += c; + } + cloneName = cloneName.strip (G4String::both, ' '); + cloneName = cloneName.strip (G4String::both, '"'); + + if (cloneName == "none") { + G4int subID = 0; + do { + cloneName = originalName; + std::ostringstream oss; + oss << '-' << subID++; + G4String::size_type lastDashPosition, nextSpacePosition; + if ((lastDashPosition = cloneName.rfind('-')) != G4String::npos && + (nextSpacePosition = cloneName.find(" ", lastDashPosition)) != + G4String::npos) { + cloneName.insert(nextSpacePosition, oss.str()); + } else { + cloneName.insert(cloneName.find(' '), oss.str()); + } + } while (fpVisManager -> GetViewer (cloneName)); + } + + if (fpVisManager -> GetViewer (cloneName)) { + if (verbosity >= G4VisManager::errors) { + G4cout << "ERROR: Putative clone viewer \"" << cloneName + << "\" already exists." + << G4endl; + } + return; + } + + G4String windowSizeHint = + originalViewer->GetViewParameters().GetXGeometryString(); + + G4UImanager* UImanager = G4UImanager::GetUIpointer(); + G4int keepVerbose = UImanager->GetVerboseLevel(); + G4int newVerbose(0); + if (keepVerbose >= 2 || + fpVisManager->GetVerbosity() >= G4VisManager::confirmations) + newVerbose = 2; + UImanager->SetVerboseLevel(newVerbose); + UImanager->ApplyCommand(G4String("/vis/viewer/select " + originalName)); + UImanager->ApplyCommand + (G4String("/vis/viewer/create ! \"" + cloneName + "\" " + windowSizeHint)); + UImanager->ApplyCommand(G4String("/vis/viewer/set/all " + originalName)); + UImanager->SetVerboseLevel(keepVerbose); + + if (verbosity >= G4VisManager::confirmations) { + G4cout << "Viewer \"" << originalName << "\" cloned." << G4endl; + G4cout << "Clone \"" << cloneName << "\" now current." << G4endl; + } +} + ////////////// /vis/viewer/create /////////////////////////////////////// G4VisCommandViewerCreate::G4VisCommandViewerCreate (): fId (0) { @@ -768,7 +1142,7 @@ void G4VisCommandViewerRefresh::SetNewValue (G4UIcommand*, G4String newValue) { G4cout << "WARNING: SceneHandler \"" << sceneHandler->GetName() << "\", to which viewer \"" << refreshName << "\"" << "\n is attached, has no scene - \"/vis/scene/create\" and" - "\"/vis/sceneHandler/attach\"" + " \"/vis/sceneHandler/attach\"" "\n (or use compound command \"/vis/drawVolume\")." << G4endl; } @@ -976,6 +1350,7 @@ void G4VisCommandViewerSelect::SetNewValue (G4UIcommand*, G4String newValue) { fpVisManager -> SetCurrentViewer (viewer); // Prints confirmation. + SetViewParameters(viewer, viewer->GetViewParameters()); } ////////////// /vis/viewer/update /////////////////////////////////////// @@ -1041,7 +1416,7 @@ void G4VisCommandViewerUpdate::SetNewValue (G4UIcommand*, G4String newValue) { G4cout << "WARNING: SceneHandler \"" << sceneHandler->GetName() << "\", to which viewer \"" << updateName << "\"" << "\n is attached, has no scene - \"/vis/scene/create\" and" - "\"/vis/sceneHandler/attach\"" + " \"/vis/sceneHandler/attach\"" "\n (or use compound command \"/vis/drawVolume\")." << G4endl; } diff --git a/source/visualization/management/src/G4VisCommandsViewerSet.cc b/source/visualization/management/src/G4VisCommandsViewerSet.cc index 48381c7633..edf7610a9a 100644 --- a/source/visualization/management/src/G4VisCommandsViewerSet.cc +++ b/source/visualization/management/src/G4VisCommandsViewerSet.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VisCommandsViewerSet.cc,v 1.41 2006/06/29 21:29:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VisCommandsViewerSet.cc,v 1.47 2006/11/14 14:59:55 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // /vis/viewer/set commands - John Allison 16th May 2000 @@ -133,18 +133,59 @@ G4VisCommandsViewerSet::G4VisCommandsViewerSet (): parameter->SetDefaultValue("g/cm3"); fpCommandCulling->SetParameter(parameter); + fpCommandCutawayMode = + new G4UIcmdWithAString ("/vis/viewer/set/cutawayMode", this); + fpCommandCutawayMode->SetGuidance + ("Sets cutaway mode - add (union) or multiply (intersection)."); + fpCommandCutawayMode->SetParameterName ("cutaway-mode",omitable = false); + fpCommandCutawayMode->SetCandidates ("add union multiply intersection"); + fpCommandCutawayMode->SetDefaultValue("union"); + fpCommandEdge = new G4UIcmdWithABool("/vis/viewer/set/edge",this); fpCommandEdge->SetGuidance ("Edges become visible/invisible in surface mode."); fpCommandEdge->SetParameterName("edge",omitable = true); fpCommandEdge->SetDefaultValue(true); + fpCommandExplodeFactor = new G4UIcommand + ("/vis/viewer/set/explodeFactor", this); + fpCommandExplodeFactor->SetGuidance + ("Moves top-level drawn volumes by this factor from this centre."); + parameter = new G4UIparameter("explodeFactor", 'd', omitable=true); + parameter->SetParameterRange("explodeFactor>=1."); + parameter->SetDefaultValue(1.); + fpCommandExplodeFactor->SetParameter(parameter); + parameter = new G4UIparameter("x",'d',omitable = true); + parameter->SetDefaultValue (0); + parameter->SetGuidance ("Coordinate of explode centre."); + fpCommandExplodeFactor->SetParameter(parameter); + parameter = new G4UIparameter("y",'d',omitable = true); + parameter->SetDefaultValue (0); + parameter->SetGuidance ("Coordinate of explode centre."); + fpCommandExplodeFactor->SetParameter(parameter); + parameter = new G4UIparameter("z",'d',omitable = true); + parameter->SetDefaultValue (0); + parameter->SetGuidance ("Coordinate of explode centre."); + fpCommandExplodeFactor->SetParameter(parameter); + parameter = new G4UIparameter("unit",'s',omitable = true); + parameter->SetDefaultValue ("m"); + parameter->SetGuidance ("Unit of explode centre."); + fpCommandExplodeFactor->SetParameter(parameter); + + fpCommandGlobalLineWidthScale = new G4UIcmdWithADouble + ("/vis/viewer/set/globalLineWidthScale", this); + fpCommandGlobalLineWidthScale->SetGuidance + ("Multiplies line widths by this factor."); + fpCommandGlobalLineWidthScale-> + SetParameterName("scale-factor", omitable=true); + fpCommandGlobalLineWidthScale->SetDefaultValue(1.); + fpCommandGlobalMarkerScale = new G4UIcmdWithADouble ("/vis/viewer/set/globalMarkerScale", this); - fpCommandGlobalMarkerScale -> SetGuidance + fpCommandGlobalMarkerScale->SetGuidance ("Multiplies marker sizes by this factor."); - fpCommandGlobalMarkerScale -> SetParameterName("scale-factorr", - omitable=true); + fpCommandGlobalMarkerScale-> + SetParameterName("scale-factor", omitable=true); fpCommandGlobalMarkerScale->SetDefaultValue(1.); fpCommandHiddenEdge = @@ -243,7 +284,7 @@ G4VisCommandsViewerSet::G4VisCommandsViewerSet (): parameter -> SetGuidance ("Coordinate of point on the plane."); fpCommandSectionPlane->SetParameter(parameter); parameter = new G4UIparameter("unit",'s',omitable = true); - parameter -> SetDefaultValue ("cm"); + parameter -> SetDefaultValue ("m"); parameter -> SetGuidance ("Unit of point on the plane."); fpCommandSectionPlane->SetParameter(parameter); parameter = new G4UIparameter("nx",'d',omitable = true); @@ -335,7 +376,10 @@ G4VisCommandsViewerSet::~G4VisCommandsViewerSet() { delete fpCommandAutoRefresh; delete fpCommandBackground; delete fpCommandCulling; + delete fpCommandCutawayMode; delete fpCommandEdge; + delete fpCommandExplodeFactor; + delete fpCommandGlobalLineWidthScale; delete fpCommandGlobalMarkerScale; delete fpCommandHiddenEdge; delete fpCommandHiddenMarker; @@ -415,6 +459,8 @@ void G4VisCommandsViewerSet::SetNewValue G4cout << "be automatically refreshed after a change of view parameters." << G4endl; } + currentViewer->SetViewParameters(vp); + return; // I.e., avoid a refresh for this command. } else if (command == fpCommandAuxEdge) { @@ -476,7 +522,7 @@ void G4VisCommandsViewerSet::SetNewValue "\n will be culled, i.e., not drawn, if this flag is true." "\n Note: this is only effective in surface drawing style," "\n and then only if the volumes are visible and opaque, and then" - "\n only if no sections or cutways are in operation." + "\n only if no sections or cutaways are in operation." << G4endl; } } @@ -521,6 +567,22 @@ void G4VisCommandsViewerSet::SetNewValue } } + else if (command == fpCommandCutawayMode) { + if (newValue == "add" || newValue == "union") + vp.SetCutawayMode(G4ViewParameters::cutawayUnion); + if (newValue == "multiply" || newValue == "intersection") + vp.SetCutawayMode(G4ViewParameters::cutawayIntersection); + + if (verbosity >= G4VisManager::confirmations) { + G4cout << "Cutaway mode set to "; + if (vp.GetCutawayMode() == G4ViewParameters::cutawayUnion) + G4cout << "cutawayUnion"; + if (vp.GetCutawayMode() == G4ViewParameters::cutawayIntersection) + G4cout << "cutawayIntersection"; + G4cout << G4endl; + } + } + else if (command == fpCommandEdge) { G4ViewParameters::DrawingStyle existingStyle = vp.GetDrawingStyle(); if (G4UIcommand::ConvertToBool(newValue)) { @@ -556,6 +618,31 @@ void G4VisCommandsViewerSet::SetNewValue } } + else if (command == fpCommandExplodeFactor) { + G4double explodeFactor, x, y, z; + G4String unitString; + std::istringstream is (newValue); + is >> explodeFactor >> x >> y >> z >> unitString; + G4double unit = G4UIcommand::ValueOf(unitString); + vp.SetExplodeFactor(explodeFactor); + vp.SetExplodeCentre(G4Point3D(x * unit, y * unit, z * unit)); + if (verbosity >= G4VisManager::confirmations) { + G4cout << "Explode factor changed to " << vp.GetExplodeFactor() + << " from centre " << vp.GetExplodeCentre() + << G4endl; + } + } + + else if (command == fpCommandGlobalLineWidthScale) { + G4double globalLineWidthScale + = fpCommandGlobalLineWidthScale->GetNewDoubleValue(newValue); + vp.SetGlobalLineWidthScale(globalLineWidthScale); + if (verbosity >= G4VisManager::confirmations) { + G4cout << "Global Line Width Scale changed to " + << vp.GetGlobalLineWidthScale() << G4endl; + } + } + else if (command == fpCommandGlobalMarkerScale) { G4double globalMarkerScale = fpCommandGlobalMarkerScale->GetNewDoubleValue(newValue); @@ -716,11 +803,13 @@ void G4VisCommandsViewerSet::SetNewValue is >> choice >> x >> y >> z >> unit >> nx >> ny >> nz; G4int iSelector = -1; - if (choice.compareTo("off",G4String::ignoreCase) == 0) iSelector = 0; - if (choice.compareTo("on",G4String::ignoreCase) == 0) iSelector = 1; + if (choice.compareTo("off",G4String::ignoreCase) == 0 || + !G4UIcommand::ConvertToBool(choice)) iSelector = 0; + if (choice.compareTo("on",G4String::ignoreCase) == 0 || + G4UIcommand::ConvertToBool(choice)) iSelector = 1; if (iSelector < 0) { if (verbosity >= G4VisManager::errors) { - G4cout << "Choice not recognised (on/off)." << G4endl; + G4cout << "Choice not recognised (on/true or off/false)." << G4endl; G4cout << "Section drawing is currently: "; if (vp.IsSection ()) G4cout << "on"; else G4cout << "off"; @@ -731,24 +820,18 @@ void G4VisCommandsViewerSet::SetNewValue return; } - G4double F; + G4double F = 1.; switch (iSelector) { + default: case 0: vp.UnsetSectionPlane(); break; case 1: F = G4UIcommand::ValueOf(unit); x *= F; y *= F; z *= F; - vp.SetSectionPlane(G4Plane3D(G4Normal3D(nx,ny,nz), - G4Point3D(x,y,z))); + vp.SetSectionPlane(G4Plane3D(G4Normal3D(nx,ny,nz), G4Point3D(x,y,z))); vp.SetViewpointDirection(G4Normal3D(nx,ny,nz)); break; - default: - if (verbosity >= G4VisManager::errors) { - G4cout << "ERROR: Choice not recognised (on/off)." - << G4endl; - } - break; } if (verbosity >= G4VisManager::confirmations) { diff --git a/source/visualization/management/src/G4VisFeaturesOfDAWNFILE.cc b/source/visualization/management/src/G4VisFeaturesOfDAWNFILE.cc index 7baaf3bfaf..16f83f28a5 100644 --- a/source/visualization/management/src/G4VisFeaturesOfDAWNFILE.cc +++ b/source/visualization/management/src/G4VisFeaturesOfDAWNFILE.cc @@ -25,7 +25,7 @@ // // // $Id: G4VisFeaturesOfDAWNFILE.cc,v 1.6 2006/06/29 21:29:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // #include "G4VisFeaturesOfDAWNFILE.hh" diff --git a/source/visualization/management/src/G4VisFeaturesOfFukuiRenderer.cc b/source/visualization/management/src/G4VisFeaturesOfFukuiRenderer.cc index db4b63eeec..d29aa697d8 100644 --- a/source/visualization/management/src/G4VisFeaturesOfFukuiRenderer.cc +++ b/source/visualization/management/src/G4VisFeaturesOfFukuiRenderer.cc @@ -25,7 +25,7 @@ // // // $Id: G4VisFeaturesOfFukuiRenderer.cc,v 1.5 2006/06/29 21:29:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/visualization/management/src/G4VisFeaturesOfOpenGL.cc b/source/visualization/management/src/G4VisFeaturesOfOpenGL.cc index dca360b456..e60ac4d054 100644 --- a/source/visualization/management/src/G4VisFeaturesOfOpenGL.cc +++ b/source/visualization/management/src/G4VisFeaturesOfOpenGL.cc @@ -25,7 +25,7 @@ // // // $Id: G4VisFeaturesOfOpenGL.cc,v 1.5 2006/06/29 21:29:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/visualization/management/src/G4VisFeaturesOfOpenInventor.cc b/source/visualization/management/src/G4VisFeaturesOfOpenInventor.cc index 69aa4060b0..0b03ee3bb4 100644 --- a/source/visualization/management/src/G4VisFeaturesOfOpenInventor.cc +++ b/source/visualization/management/src/G4VisFeaturesOfOpenInventor.cc @@ -25,7 +25,7 @@ // // // $Id: G4VisFeaturesOfOpenInventor.cc,v 1.5 2006/06/29 21:29:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // diff --git a/source/visualization/management/src/G4VisManager.cc b/source/visualization/management/src/G4VisManager.cc index 4831ede0b5..c7ee6a72c9 100644 --- a/source/visualization/management/src/G4VisManager.cc +++ b/source/visualization/management/src/G4VisManager.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4VisManager.cc,v 1.98 2006/06/29 21:30:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VisManager.cc,v 1.109 2006/11/26 15:43:51 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // GEANT4 Visualization Manager - John Allison 02/Jan/1996. @@ -73,12 +73,12 @@ #include "G4RunManager.hh" #include "G4Run.hh" #include "G4Event.hh" - #include G4VisManager* G4VisManager::fpInstance = 0; G4VisManager::G4VisManager (): + fVerbose (1), fInitialised (false), fpUserVisAction (0), fpGraphicsSystem (0), @@ -86,19 +86,17 @@ G4VisManager::G4VisManager (): fpSceneHandler (0), fpViewer (0), fVerbosity (warnings), - fVerbose (1), fpStateDependent (0), - fEventCount (0), - fReprocessing (false), - fReprocessingLastEvent (false), - fLastRunID (0), - fLastEventID (0), + fEventRefreshing (false), fTransientsDrawnThisRun (false), - fTransientsDrawnThisEvent (false) + fTransientsDrawnThisEvent (false), + fEventKeepingSuspended (false), + fKeptLastEvent (false) // All other objects use default constructors. { fpTrajDrawModelMgr = new G4VisModelManager("/vis/modeling/trajectories"); fpTrajFilterMgr = new G4VisFilterManager("/vis/filtering/trajectories"); + fpHitFilterMgr = new G4VisFilterManager("/vis/filtering/hits"); VerbosityGuidanceStrings.push_back ("Simple graded message scheme - digit or string (1st character defines):"); @@ -185,6 +183,7 @@ G4VisManager::~G4VisManager () { delete fpTrajDrawModelMgr; delete fpTrajFilterMgr; + delete fpHitFilterMgr; } G4VisManager* G4VisManager::GetInstance () { @@ -263,6 +262,12 @@ void G4VisManager::Initialise () { directory = new G4UIdirectory ("/vis/filtering/trajectories/create/"); directory -> SetGuidance ("Create trajectory filters and messengers."); fDirectoryList.push_back (directory); + directory = new G4UIdirectory ("/vis/filtering/hits/"); + directory -> SetGuidance ("Hit filtering commands."); + fDirectoryList.push_back (directory); + directory = new G4UIdirectory ("/vis/filtering/hits/create/"); + directory -> SetGuidance ("Create hit filters and messengers."); + fDirectoryList.push_back (directory); RegisterMessengers (); @@ -276,7 +281,7 @@ void G4VisManager::Initialise () { G4cout << "\nYou have successfully registered the following model factories." << G4endl; - PrintAvailableModels (); + PrintAvailableModels (fVerbosity); G4cout << G4endl; } @@ -400,6 +405,17 @@ G4VisManager::RegisterModelFactory(G4TrajFilterFactory* factory) fpTrajFilterMgr->Register(factory); } +void G4VisManager::RegisterModel(G4VFilter* model) +{ + fpHitFilterMgr->Register(model); +} + +void +G4VisManager::RegisterModelFactory(G4HitFilterFactory* factory) +{ + fpHitFilterMgr->Register(factory); +} + void G4VisManager::SelectTrajectoryModel(const G4String& model) { fpTrajDrawModelMgr->SetCurrent(model); @@ -706,6 +722,11 @@ G4bool G4VisManager::FilterTrajectory(const G4VTrajectory& trajectory) return fpTrajFilterMgr->Accept(trajectory); } +G4bool G4VisManager::FilterHit(const G4VHit& hit) +{ + return fpHitFilterMgr->Accept(hit); +} + void G4VisManager::DispatchToModel(const G4VTrajectory& trajectory, G4int i_mode) { G4bool visible(true); @@ -749,10 +770,7 @@ void G4VisManager::SetCurrentScene (G4Scene* pScene) { if (pScene != fpScene) { // A change of scene. Therefore reset transients drawn flags. All // memory of previous transient proceessing thereby erased... - fTransientsDrawnThisRun = false; - if (fpSceneHandler) fpSceneHandler->SetTransientsDrawnThisRun(false); - fTransientsDrawnThisEvent = false; - if (fpSceneHandler) fpSceneHandler->SetTransientsDrawnThisEvent(false); + ResetTransientsDrawnFlags(); } fpScene = pScene; } @@ -873,11 +891,14 @@ void G4VisManager::RegisterMessengers () { G4UIcommand* directory; - // Top level commands... + // Top level basic commands... RegisterMessenger(new G4VisCommandEnable); RegisterMessenger(new G4VisCommandList); RegisterMessenger(new G4VisCommandVerbose); + // Other top level commands... + RegisterMessenger(new G4VisCommandReviewKeptEvents); + // Compound commands... RegisterMessenger(new G4VisCommandDrawTree); RegisterMessenger(new G4VisCommandDrawView); @@ -912,7 +933,6 @@ void G4VisManager::RegisterMessengers () { RegisterMessenger(new G4VisCommandSceneList); RegisterMessenger(new G4VisCommandSceneNotifyHandlers); RegisterMessenger(new G4VisCommandSceneSelect); - RegisterMessenger(new G4VisCommandSceneTransientsAction); directory = new G4UIdirectory ("/vis/scene/add/"); directory -> SetGuidance ("Add model to current scene."); @@ -940,7 +960,12 @@ void G4VisManager::RegisterMessengers () { directory = new G4UIdirectory ("/vis/viewer/"); directory -> SetGuidance ("Operations on Geant4 viewers."); fDirectoryList.push_back (directory); + RegisterMessenger(new G4VisCommandViewerAddCutawayPlane); + RegisterMessenger(new G4VisCommandViewerChangeCutawayPlane); RegisterMessenger(new G4VisCommandViewerClear); + RegisterMessenger(new G4VisCommandViewerClearCutawayPlanes); + RegisterMessenger(new G4VisCommandViewerClearTransients); + RegisterMessenger(new G4VisCommandViewerClone); RegisterMessenger(new G4VisCommandViewerCreate); RegisterMessenger(new G4VisCommandViewerDolly); RegisterMessenger(new G4VisCommandViewerFlush); @@ -965,11 +990,17 @@ void G4VisManager::RegisterMessengers () { RegisterMessenger(new G4VisCommandListManagerSelect< G4VisModelManager > (fpTrajDrawModelMgr, fpTrajDrawModelMgr->Placement())); - // Filter manager commands + // Trajectory filter manager commands RegisterMessenger(new G4VisCommandListManagerList< G4VisFilterManager > (fpTrajFilterMgr, fpTrajFilterMgr->Placement())); RegisterMessenger(new G4VisCommandManagerMode< G4VisFilterManager > (fpTrajFilterMgr, fpTrajFilterMgr->Placement())); + + // Hit filter manager commands + RegisterMessenger(new G4VisCommandListManagerList< G4VisFilterManager > + (fpHitFilterMgr, fpHitFilterMgr->Placement())); + RegisterMessenger(new G4VisCommandManagerMode< G4VisFilterManager > + (fpHitFilterMgr, fpHitFilterMgr->Placement())); } void G4VisManager::PrintAvailableGraphicsSystems () const { @@ -990,11 +1021,59 @@ void G4VisManager::PrintAvailableGraphicsSystems () const { G4cout << G4endl; } -void G4VisManager::PrintAvailableModels () const +void G4VisManager::PrintAvailableModels (Verbosity verbosity) const { - fpTrajDrawModelMgr->Print(G4cout); + { + //fpTrajDrawModelMgr->Print(G4cout); + G4cout << "Registered model factories:" << G4endl; + const std::vector*>& factoryList = + fpTrajDrawModelMgr->FactoryList(); + if (factoryList.empty()) G4cout << " None" << G4endl; + else { + std::vector*>::const_iterator i; + for (i = factoryList.begin(); i != factoryList.end(); ++i) + (*i)->Print(G4cout); + } + const G4VisListManager* listManager = + fpTrajDrawModelMgr->ListManager(); + const std::map& modelMap = + listManager->Map(); + if (!modelMap.empty()) { + G4cout << "\nRegistered models:" << G4endl; + std::map::const_iterator i; + for (i = modelMap.begin(); i != modelMap.end(); ++i) { + G4cout << " " << i->second->Name(); + if (i->second == listManager->Current()) G4cout << " (Current)"; + G4cout << G4endl; + if (verbosity >= parameters) i->second->Print(G4cout); + } + } + } + G4cout << G4endl; - fpTrajFilterMgr->Print(G4cout); + + { + //fpTrajFilterMgr->Print(G4cout); + G4cout << "Registered filter factories:" << G4endl; + const std::vector >*>& + factoryList = fpTrajFilterMgr->FactoryList(); + if (factoryList.empty()) G4cout << " None" << G4endl; + else { + std::vector >*>::const_iterator i; + for (i = factoryList.begin(); i != factoryList.end(); ++i) + (*i)->Print(G4cout); + } + const std::vector*>& + filterList = fpTrajFilterMgr->FilterList(); + if (!filterList.empty()) { + G4cout << "\nRegistered filters:" << G4endl; + std::vector*>::const_iterator i; + for (i = filterList.begin(); i != filterList.end(); ++i) { + G4cout << " " << (*i)->GetName() << G4endl; + if (verbosity >= parameters) (*i)->PrintAll(G4cout); + } + } + } } void G4VisManager::PrintInvalidPointers () const { @@ -1022,166 +1101,18 @@ void G4VisManager::PrintInvalidPointers () const { } } -/************* Event copy stuff ******************************* -#include "G4PrimaryVertex.hh" -#include "G4PrimaryParticle.hh" - -G4String fLastEventRandomStatus; -G4Event* fLastEvent; -std::vector fEventsRandomStatus; -std::vector fEvents; - -G4PrimaryParticle* CopyParticles(G4PrimaryParticle* pp) -{ - G4PrimaryParticle* newPP = 0; - G4PrimaryParticle* previousPP = 0; - while (pp) { - G4PrimaryParticle* tmpPP = new G4PrimaryParticle(*pp); - tmpPP->ClearNextParticlePointer(); - G4PrimaryParticle* daughters = pp->GetDaughter(); - G4PrimaryParticle* newDaughters = CopyParticles(daughters); - tmpPP->SetDaughter(newDaughters); - if (!newPP) newPP = tmpPP; - else previousPP->SetNext(tmpPP); - previousPP = tmpPP; - pp = pp->GetNext(); - } - // Set user info = 0??? - return newPP; -} - -// Not needed? -void DeleteParticles(G4PrimaryParticle* pp) -{ - while (pp) { - G4PrimaryParticle* daughters = pp->GetDaughter(); - DeleteParticles(daughters); - G4PrimaryParticle* oldPP = pp; - pp = pp->GetNext(); - delete oldPP; - } -} - -G4PrimaryVertex* CopyVertices(G4PrimaryVertex* pv) -{ - G4PrimaryVertex* newPV = 0; - G4PrimaryVertex* previousPV = 0; - while (pv) { - G4PrimaryVertex* tmpPV = new G4PrimaryVertex(*pv); - tmpPV->ClearNextVertexPointer(); - G4PrimaryParticle* primaryParticle = pv->GetPrimary(); - G4PrimaryParticle* newPrimaryParticle = CopyParticles(primaryParticle); - tmpPV->SetPrimary(newPrimaryParticle); - if (!newPV) newPV = tmpPV; - else previousPV->SetNext(tmpPV); - previousPV = tmpPV; - pv = pv->GetNext(); - } - // Set user info = 0??? - return newPV; -} - -// Not needed? -void DeleteVertices(G4PrimaryVertex* pv) -{ - while (pv) { - G4PrimaryParticle* primaryParticle = pv->GetPrimary(); - DeleteParticles(primaryParticle); - G4PrimaryVertex* oldPV = pv; - pv = pv->GetNext(); - delete oldPV; - } -} - -G4Event* CreateDeepCopy(const G4Event* event) -{ - G4Event* newEvent = new G4Event(*event); - G4PrimaryVertex* primaryVertex = event->GetPrimaryVertex(); - G4PrimaryVertex* newPrimaryVertex = CopyVertices(primaryVertex); - newEvent->AddPrimaryVertex(newPrimaryVertex); - // Set user info = 0??? - return newEvent; -} - -// Not needed? -void DeleteEvent(G4Event* event) -{ - if (event) { - G4PrimaryVertex* primaryVertex = event->GetPrimaryVertex(); - DeleteVertices(primaryVertex); - delete event; - } -} -************ Event copy stuff ***********************************/ - void G4VisManager::BeginOfRun () { //G4cout << "G4VisManager::BeginOfRun" << G4endl; - fEventCount = 0; + fKeptLastEvent = false; + fEventKeepingSuspended = false; fTransientsDrawnThisRun = false; if (fpSceneHandler) fpSceneHandler->SetTransientsDrawnThisRun(false); -/************* Event copy stuff ******************************* - if (!fReprocessing) { - fEventsRandomStatus.clear(); - std::vector::iterator i; - //for (i = fEvents.begin(); i != fEvents.end(); ++i) DeleteEvent(*i); - for (i = fEvents.begin(); i != fEvents.end(); ++i) delete *i; - fEvents.clear(); - } -************ Event copy stuff ***********************************/ } void G4VisManager::BeginOfEvent () { //G4cout << "G4VisManager::BeginOfEvent" << G4endl; - G4RunManager* runManager = G4RunManager::GetRunManager(); - if (runManager) { - if (!fEventCount) { // First event. Do run stuff here because, - // curiously, currentRun is still zero in - // BeginOfRun. - fBeginOfLastRunRandomStatus = - runManager->GetRandomNumberStatusForThisRun(); - /************************************************* - std::ostringstream oss; - CLHEP::HepRandom::saveFullState(oss); - fBeginOfLastRunRandomStatus = oss.str(); - ************************************************/ - const G4Run* currentRun = runManager->GetCurrentRun(); - if (currentRun) fLastRunID = currentRun->GetRunID(); - else fLastRunID++; - } - fBeginOfLastEventRandomStatus = - runManager->GetRandomNumberStatusForThisEvent(); - /************************************************* - std::ostringstream oss; - CLHEP::HepRandom::saveFullState(oss); - fBeginOfLastEventRandomStatus = oss.str(); - ************************************************/ - G4Event* currentEvent = - G4EventManager::GetEventManager()->GetNonconstCurrentEvent(); - if (currentEvent) { - if (fReprocessingLastEvent) currentEvent->SetEventID(fLastEventID); - else fLastEventID = currentEvent->GetEventID(); - } - - /************* Event copy stuff ******************************* - // If not triggered by transient re-computation in - // G4VSceneHandler::ProcessScene (and re-computation requested)... - if (!fReprocessing && fpScene && fpScene->GetRecomputeTransients()) { - const G4Event* event = - G4EventManager::GetEventManager()->GetConstCurrentEvent(); - std::ostringstream oss; - CLHEP::HepRandom::saveFullState(oss); - fLastEventRandomStatus = oss.str(); - fLastEvent = CreateDeepCopy(event); - if (!fpScene->GetRefreshAtEndOfEvent()) { - fEventsRandomStatus.push_back(fLastEventRandomStatus); - fEvents.push_back(fLastEvent); - } - } - ************ Event copy stuff ***********************************/ - - } fTransientsDrawnThisEvent = false; if (fpSceneHandler) fpSceneHandler->SetTransientsDrawnThisEvent(false); } @@ -1189,41 +1120,66 @@ void G4VisManager::BeginOfEvent () void G4VisManager::EndOfEvent () { //G4cout << "G4VisManager::EndOfEvent" << G4endl; - ++fEventCount; // Don't call IsValidView unless there is a scene handler. This // avoids WARNING message at end of event and run when the user has // not instantiated a scene handler, e.g., in batch mode. - if (GetConcreteInstance() && fpSceneHandler && IsValidView()) { - const std::vector& EOEModelList = - fpScene -> GetEndOfEventModelList (); - size_t nModels = EOEModelList.size(); - if (nModels) { - ClearTransientStoreIfMarked(); - for (size_t i = 0; i < nModels; i++) { - G4VModel* pModel = EOEModelList [i]; - fpSceneHandler -> SetModel (pModel); - pModel -> DescribeYourselfTo (*fpSceneHandler); + G4bool valid = GetConcreteInstance() && fpSceneHandler && IsValidView(); + if (!valid) return; + + G4RunManager* runManager = G4RunManager::GetRunManager(); + const G4Run* currentRun = runManager->GetCurrentRun(); + + const G4Event* currentEvent = + G4EventManager::GetEventManager()->GetConstCurrentEvent(); + if (!currentEvent) return; + + ClearTransientStoreIfMarked(); + fpSceneHandler->DrawEvent(currentEvent); + + G4int nEventsToBeProcessed = 0; + G4int nKeptEvents = 0; + G4int eventID = -2; // (If no run manager, triggers ShowView as normal.) + if (currentRun) { + nEventsToBeProcessed = currentRun->GetNumberOfEventToBeProcessed(); + eventID = currentEvent->GetEventID(); + const std::vector* events = + currentRun->GetEventVector(); + if (events) nKeptEvents = events->size(); + } + + if (fpScene->GetRefreshAtEndOfEvent()) { + + // Unless last event (in which case wait end of run)... + if (eventID < nEventsToBeProcessed - 1) { + fpViewer->ShowView(); + fpSceneHandler->SetMarkForClearingTransientStore(true); + } else { // Last event... + // Keep, but only if user has not kept any... + if (!nKeptEvents) { + G4EventManager::GetEventManager()->KeepTheCurrentEvent(); + fKeptLastEvent = true; } - fpSceneHandler -> SetModel (0); } - if (fpScene->GetRefreshAtEndOfEvent()) { - G4int nEvents = 0; - G4int eventID = -2; // (If no run manager, triggers ShowView as normal.) - G4RunManager* runManager = G4RunManager::GetRunManager(); - if (runManager) { - const G4Run* currentRun = runManager->GetCurrentRun(); - const G4Event* currentEvent = runManager->GetCurrentEvent(); - if (currentRun && currentEvent) { - nEvents = currentRun->GetNumberOfEventToBeProcessed(); - eventID = currentEvent->GetEventID(); + + } else { // Accumulating events... + + G4int maxNumberOfKeptEvents = fpScene->GetMaxNumberOfKeptEvents(); + if (maxNumberOfKeptEvents > 0 && nKeptEvents >= maxNumberOfKeptEvents) { + fEventKeepingSuspended = true; + static G4bool warned = false; + if (!warned) { + if (fVerbosity >= warnings) { + G4cout << + "WARNING: G4VisManager::EndOfEvent: Event keeping suspended." + "\n The number of events exceeds the maximum that may be kept, " + << maxNumberOfKeptEvents << '.' + << G4endl; } + warned = true; } - // Unless last event (in which case wait end of run)... - if (eventID < nEvents - 1) { - fpViewer->ShowView(); - fpSceneHandler->SetMarkForClearingTransientStore(true); - } + } else if (maxNumberOfKeptEvents != 0) { + G4EventManager::GetEventManager()->KeepTheCurrentEvent(); } } } @@ -1231,19 +1187,63 @@ void G4VisManager::EndOfEvent () void G4VisManager::EndOfRun () { //G4cout << "G4VisManager::EndOfRun" << G4endl; + // Don't call IsValidView unless there is a scene handler. This // avoids WARNING message at end of event and run when the user has // not instantiated a scene handler, e.g., in batch mode. - if (GetConcreteInstance() && fpSceneHandler && IsValidView()) { + G4bool valid = GetConcreteInstance() && fpSceneHandler && IsValidView(); + if (valid) { if (!fpSceneHandler->GetMarkForClearingTransientStore()) { if (fpScene->GetRefreshAtEndOfRun()) { fpViewer->ShowView(); fpSceneHandler->SetMarkForClearingTransientStore(true); } } + + if (fEventKeepingSuspended && fVerbosity >= warnings) { + G4cout << + "WARNING: G4VisManager::EndOfRun: Event keeping was suspended." + "\n The number of events in the run exceeded the maximum to be kept, " + << fpScene->GetMaxNumberOfKeptEvents() << '.' << + "\n The number of events to be kept can be changed with" + "\n \"/vis/scene/endOfEventAction accumulate \", where N is the" + "\n maximum number you wish to allow. N < 0 means \"unlimited\"." + << G4endl; + } + } + fEventRefreshing = false; + + G4RunManager* runManager = G4RunManager::GetRunManager(); + const G4Run* currentRun = runManager->GetCurrentRun(); + + G4int nKeptEvents = 0; + const std::vector* events = + currentRun? currentRun->GetEventVector(): 0; + if (events) nKeptEvents = events->size(); + + if (nKeptEvents && !fKeptLastEvent) { + if (!valid && fVerbosity >= warnings) G4cout << "WARNING: "; + if (fVerbosity >= warnings) { + G4cout << nKeptEvents; + if (nKeptEvents == 1) G4cout << " event has"; + else G4cout << " events have"; + G4cout << " been kept for refreshing and/or reviewing." << G4endl; + } + static G4bool warned = false; + if (!valid && fVerbosity >= warnings && !warned) { + G4cout << + " Only useful if before starting the run:" + "\n a) trajectories are stored (\"/tracking/storeTrajectory N\"), or" + "\n b) the Draw method of any hits is implemented." + "\n To view trajectories and hits:" + "\n open a viewer, draw a volume, \"/vis/scene/add/trajectories\"" + "\n \"/vis/scene/add/hits\" and, possibly, \"/vis/viewer/flush\"." + "\n To see all events: \"vis/scene/endOfEventAction accumulate\"." + "\n To see events individually: \"/vis/reviewKeptEvents\"." + << G4endl; + warned = true; + } } - fReprocessing = false; - fReprocessingLastEvent = false; } void G4VisManager::ClearTransientStoreIfMarked(){ @@ -1255,11 +1255,23 @@ void G4VisManager::ClearTransientStoreIfMarked(){ // Record if transients drawn. These local flags are only set // *after* ClearTransientStore. In the code in G4VSceneHandler // triggered by ClearTransientStore, use these flags so that - // transient reprocessing is not done too early. + // event refreshing is not done too early. fTransientsDrawnThisEvent = fpSceneHandler->GetTransientsDrawnThisEvent(); fTransientsDrawnThisRun = fpSceneHandler->GetTransientsDrawnThisRun(); } +void G4VisManager::ResetTransientsDrawnFlags() +{ + fTransientsDrawnThisRun = false; + fTransientsDrawnThisEvent = false; + G4SceneHandlerListConstIterator i; + for (i = fAvailableSceneHandlers.begin(); + i != fAvailableSceneHandlers.end(); ++i) { + (*i)->SetTransientsDrawnThisEvent(false); + (*i)->SetTransientsDrawnThisRun(false); + } +} + G4String G4VisManager::ViewerShortName (const G4String& viewerName) const { G4String viewerShortName (viewerName); viewerShortName = viewerShortName (0, viewerShortName.find (' ')); diff --git a/source/visualization/management/src/G4VisStateDependent.cc b/source/visualization/management/src/G4VisStateDependent.cc index 43fd8da4c9..5eb6d77da9 100644 --- a/source/visualization/management/src/G4VisStateDependent.cc +++ b/source/visualization/management/src/G4VisStateDependent.cc @@ -25,7 +25,7 @@ // // // $Id: G4VisStateDependent.cc,v 1.6 2006/06/29 21:30:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ #include "G4VisStateDependent.hh" diff --git a/source/visualization/modeling/History b/source/visualization/modeling/History index daaa66ed8c..567dd937cc 100644 --- a/source/visualization/modeling/History +++ b/source/visualization/modeling/History @@ -1,4 +1,4 @@ -$Id: History,v 1.73 2006/06/07 22:14:04 allison Exp $ +$Id: History,v 1.96 2006/11/16 12:12:49 allison Exp $ ------------------------------------------------------------------- ========================================================= @@ -20,6 +20,121 @@ committal in the CVS repository ! History file for visualization/modeling --------------------------------------- +16th November 2006 John Allison (modeling-V08-01-15) +- Added protection for parallel worlds (zero region pointer). + +14th November 2006 John Allison (modeling-V08-01-14) +- Merged modeling-V08-01-13-branch onto main branch. + +8th November 2006 John Allison (modeling-V08-01-13-00) +- On modeling-V08-01-13-branch. +- Added G4Event pointer to modeling parameters. +- G4TrajectoriesModel and G4HitsModel: use the above (G4VSceneHandler + supplies). + +5th November 2006 John Allison (modeling-V08-01-13) +- Further, hopefully, complete, protection against zero materials pointer. + +3rd November 2006 John Allison (modeling-V08-01-12) +- G4PhysicalVolumeModel.cc: Protected against zero material pointer. + +3rd November 2006 John Allison (modeling-V08-01-11) +- G4Trajectories/HitsModel.cc: Protected against zero pointers from + collections. + +2nd November 2006 John Allison (modeling-V08-01-10) +- G4HitsModel: Added GetCurrentHit. + +1st November 2006 John Allison (modeling-V08-01-09) +- G4VModel: Removed warning messages from the virtual functions + GetCurrentDescription and GetCurrentTag so that there is no longer + a message if the concrete class does not implement. The implementation + in G4VModel, which is used by default, is simply to return the global + description and tag. +- Removed GetCurrentDescription and GetCurrentTag from models for which the + concept of "current" makes no sense or is not used: + G4AxesModel, G4HitsModel, G4LogicalVolumeModel, G4ScaleModel, G4TextModel. +- G4ModelCommandsT: Minor corrections to guidance. + +26th October 2006 John Allison (modeling-V08-01-08) +- G4PhysicalVolumeModel: Changed CreateAttValues to CreateCurrentAttValues. +- G4TrajectoriesModel: Added GetCurrentTrajectory. + +------------------------------------------------------ +19th September 2006 John Allison (modeling-V08-01-07) +- G4ModelingParameters: Added ExplodeCentre +- G4PhysicalVolumeModel.cc: Programmed ExplodeCentre. + +17th September 2006 Jane Tinslay +- Shift an assert from G4AttributeFilterT to G4AttFilterUtils - was + causing problems with XCode 2.0 + +------------------------------------------------------ +15th September 2006 John Allison (modeling-V08-01-06) +- G4PhysicalVolumeModel.ccChanged "Bookkeeping" to "Physics + +14th September 2006 Jane Tinslay +- Fixes for sun + +13th September 2006 John Allison +- G4ModelingParameters: Improved setting and access to explode factor. +- G4PhysicalVolumeModel.cc: + o Implemented explode factor(radial move) feature for top level drawn + volumes. +- G4TrajectoriesModel.cc: Improved debug checking and printing of G4Atts. +- G4ModelCommandUtils.hh, G4ModelCommandsT.hh: + o Re-instate setTimeSliceInterval command. + +12th September 2006 Jane Tinslay +- Add attribute based trajectory drawing & filtering, and attribute based + hit filtering + +--------------------------------------------------- +27th August 2006 John Allison (modeling-V08-01-05) +- G4ModelingParameters: Added warning flag and section/cutaway polyhedron. +- G4PhysicalVolumeModel: + o Acts on warning flag from G4ModelingParameters. + o Added enum ClippingMode {subtraction, intersection}; + o Equipped for generic sectioning (DCUT) and cutaways. +- G4TrajectoryDrawerUtils::DrawWithTime: + o Made use of G4VisAttributes time range. + o Tidied. + +26th August 2006 John Allison (modeling-V08-01-04 - requires greps-V08-01-03) +- G4TrajectoryDrawerUtils.cc: Fixed compilation warning. + +25th August 2006 Jane Tinslay +- Follow G4VFilter const change (requires greps-V08-01-03). + +16th August 2006 John Allison (modeling-V08-01-03) +- G4TrajectoryDrawerUtils.cc: Improved robustness of time slicing. +- G4ModelCommandsT.hh: In class G4ModelCmdSetTimeSliceInterval: + cmd->SetUnitCategory("Time"). +- G4TrajectoriesModel.cc: Improved debug statement. + +14th August 2006 John Allison (modeling-V08-01-02) +- G4ModelApplyCommandsT.hh: Added G4ModelCmdApplyDoubleAndUnit. +- G4ModelCommandsT.hh: Added G4ModelCmdSetTimeSliceInterval. +- G4VisTrajContext: Added TimeSliceInterval. +- G4TrajectoryModelFactories: Instantiated G4ModelCmdSetTimeSliceInterval. +- G4TrajectoryDrawerUtils.cc: Added time slicing. + +10th July 2006 John Allison (modeling-V08-01-01) +- Co-works with greps-V08-01-01. +- G4VModel: Removed GetG4PhysicalVolumeModel. +- G4ModelingParameters: + o Removed RepStyle, ViewGeom, ViewHits and ViewDigis (not used). + o Reduced number of constructors. +- G4PhysicalVolumeModel: + o Removed Establish/DecommissionSpecials to conform with greps-V08-01-01. + o Rationalised G4Atts: Added GetAttDefs/CreateAttValues. + +3rd July 2006 John Allison (modeling-V08-01-00) +- Needs greps-V08-01-00. +- G4PhysicalVolumeModel::G4PhysicalVolumeNodeID: Added GetNonCulledDepth. +- G4PhysicalVolumeModel.cc: Also added G4Atts for solids. +- G4TrajectoriesModel.cc: Added debug code. + 7th June 2006 John Allison (modeling-V08-00-14) - G4PhysicalVolumeModel.cc: Added protection for zero vis atts. diff --git a/source/visualization/modeling/include/G4AttFilterUtils.hh b/source/visualization/modeling/include/G4AttFilterUtils.hh new file mode 100644 index 0000000000..8321711a82 --- /dev/null +++ b/source/visualization/modeling/include/G4AttFilterUtils.hh @@ -0,0 +1,52 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4AttFilterUtils.hh,v 1.2 2006/12/13 15:49:58 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// Visualisation attribute filter utility functions. +// +// Jane Tinslay, September 2006 +// +#ifndef G4ATTFILTERUTILS_HH +#define G4ATTFILTERUTILS_HH + +class G4AttDef; +class G4TypeKey; +class G4VAttValueFilter; +template class G4CreatorFactoryT; + +namespace G4AttFilterUtils { + + typedef G4CreatorFactoryT G4AttValueFilterFactory; + + // G4AttValue filter factory + G4AttValueFilterFactory* GetAttValueFilterFactory(); + + // Create new G4AttValue filter + G4VAttValueFilter* GetNewFilter(const G4AttDef& def); +} + +#endif diff --git a/source/visualization/modeling/include/G4AttValueFilterT.hh b/source/visualization/modeling/include/G4AttValueFilterT.hh new file mode 100644 index 0000000000..d74f4bda2f --- /dev/null +++ b/source/visualization/modeling/include/G4AttValueFilterT.hh @@ -0,0 +1,220 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4AttValueFilterT.hh,v 1.3 2006/12/13 15:50:00 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// Templated class for G4AttValue filters. +// +// Jane Tinslay, September 2006 +// +#ifndef G4ATTVALUEFILTERT_HH +#define G4ATTVALUEFILTERT_HH + +#include "G4VAttValueFilter.hh" +#include "G4ConversionFatalError.hh" +#include "G4ConversionUtils.hh" + +namespace { + + // Helper classes + template + class IsEqual{ + public: + IsEqual(const T& value): fValue(value) {}; + bool operator()(const std::pair& myPair) const + { + return myPair.second == fValue; + } + private: + T fValue; + }; + + template + class InInterval{ + public: + InInterval(const T& value): fValue(value) {}; + bool operator()(const std::pair >& myPair) const + { + T min = myPair.second.first; + T max = myPair.second.second; + return ((fValue > min || fValue == min) && (fValue < max)); + } + private: + T fValue; + }; + +} + +template +class G4AttValueFilterT : public ConversionErrorPolicy, public G4VAttValueFilter { +public: + + // Constructor + G4AttValueFilterT(); + + // Destructor + virtual ~G4AttValueFilterT(); + + // Filter methods + G4bool Accept(const G4AttValue& attVal) const; + G4bool GetValidElement(const G4AttValue& input, G4String& interval) const; + + // Print configuration + virtual void PrintAll(std::ostream& ostr) const; + + // Reset + virtual void Reset(); + + void LoadIntervalElement(const G4String& input); + void LoadSingleValueElement(const G4String& input); + +private: + + typedef std::pair Pair; + typedef typename std::map IntervalMap; + typedef std::map SingleValueMap; + + + // Data members + IntervalMap fIntervalMap; + SingleValueMap fSingleValueMap; + +}; + +template +G4AttValueFilterT::G4AttValueFilterT() {} + +template +G4AttValueFilterT::~G4AttValueFilterT() {} + +template +G4bool +G4AttValueFilterT::GetValidElement(const G4AttValue& attValue, G4String& element) const +{ + T value; + + G4String input = attValue.GetValue(); + if (!G4ConversionUtils::Convert(input, value)) ConversionErrorPolicy::ReportError(input, "Invalid format. Was the input data formatted correctly ?"); + + typename SingleValueMap::const_iterator iterValues = + std::find_if(fSingleValueMap.begin(), fSingleValueMap.end(), IsEqual(value)); + + if (iterValues != fSingleValueMap.end()) { + element = iterValues->first; + return true; + } + + typename IntervalMap::const_iterator iterIntervals = + std::find_if(fIntervalMap.begin(), fIntervalMap.end(), InInterval(value)); + + if (iterIntervals != fIntervalMap.end()) { + element = iterIntervals->first; + return true; + } + + return false; +} + +template +G4bool +G4AttValueFilterT::Accept(const G4AttValue& attValue) const +{ + T value; + + G4String input = attValue.GetValue(); + if (!G4ConversionUtils::Convert(input, value)) ConversionErrorPolicy::ReportError(input, "Invalid format. Was the input data formatted correctly ?"); + + typename SingleValueMap::const_iterator iterValues = + std::find_if(fSingleValueMap.begin(), fSingleValueMap.end(), IsEqual(value)); + + if (iterValues != fSingleValueMap.end()) return true; + + typename IntervalMap::const_iterator iterIntervals = + std::find_if(fIntervalMap.begin(), fIntervalMap.end(), InInterval(value)); + + if (iterIntervals != fIntervalMap.end()) return true; + + return false; +} + +template +void +G4AttValueFilterT::LoadIntervalElement(const G4String& input) +{ + T min; + T max; + + if (!G4ConversionUtils::Convert(input, min, max)) ConversionErrorPolicy::ReportError(input, "Invalid format. Was the input data formatted correctly ?"); + + std::pair myPair(min, max); + fIntervalMap[input] = myPair; +} + +template +void +G4AttValueFilterT::LoadSingleValueElement(const G4String& input) +{ + T output; + + if (!G4ConversionUtils::Convert(input, output)) ConversionErrorPolicy::ReportError(input, "Invalid format. Was the input data formatted correctly ?"); + + fSingleValueMap[input] = output; +} + +template +void +G4AttValueFilterT::PrintAll(std::ostream& ostr) const +{ + ostr<<"Printing data for filter: "<second.first<<" : "<second.second<second< +void +G4AttValueFilterT::Reset() +{ + fIntervalMap.clear(); + fSingleValueMap.clear(); +} + +#endif diff --git a/source/visualization/modeling/include/G4AttributeFilterT.hh b/source/visualization/modeling/include/G4AttributeFilterT.hh new file mode 100644 index 0000000000..ccac9fe34b --- /dev/null +++ b/source/visualization/modeling/include/G4AttributeFilterT.hh @@ -0,0 +1,229 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4AttributeFilterT.hh,v 1.6 2006/12/13 15:50:02 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// Generic attribute filter. +// +// Jane Tinslay, May 2006 +// +#ifndef G4ATTRIBUTEFILTERT_HH +#define G4ATTRIBUTEFILTERT_HH + +#include "G4AttDef.hh" +#include "G4AttFilterUtils.hh" +#include "G4AttUtils.hh" +#include "G4AttValue.hh" +#include "G4SmartFilter.hh" +#include "G4VAttValueFilter.hh" +#include +#include + +template +class G4AttributeFilterT : public G4SmartFilter { + +public: + + // Construct with filter name + G4AttributeFilterT(const G4String& name = "Unspecified"); + + // Destructor + virtual ~G4AttributeFilterT(); + + // Evaluate + virtual bool Evaluate(const T&) const; + + // Print configuration + virtual void Print(std::ostream& ostr) const; + + // Clear filter + virtual void Clear(); + + // Configuration functions + void Set(const G4String& name); + void AddInterval(const G4String&); + void AddValue(const G4String&); + +private: + + enum Config {Interval, SingleValue}; + + typedef std::pair Pair; + typedef std::vector ConfigVect; + + // Data members + G4String fAttName; + ConfigVect fConfigVect; + + // Caching + mutable G4bool fFirst; + mutable G4bool fWarnedMissingAttribute; + mutable G4VAttValueFilter* filter; + +}; + +template +G4AttributeFilterT::G4AttributeFilterT(const G4String& name) + :G4SmartFilter(name) + ,fAttName("") + ,fFirst(true) + ,fWarnedMissingAttribute(false) + ,filter(0) +{} + +template +G4AttributeFilterT::~G4AttributeFilterT() +{ + delete filter; +} + +template +G4bool +G4AttributeFilterT::Evaluate(const T& object) const +{ + // Return false if attribute name has not been set. Just print one warning. + if (fAttName.isNull()) { + + if (!fWarnedMissingAttribute) { + std::ostringstream o; + o<<"Null attribute name"; + G4Exception("G4AttributeFilterT::Evaluate", "NullAttributeName", JustWarning, o.str().c_str()); + + fWarnedMissingAttribute = true; + } + + return false; + } + + if (fFirst) { + + fFirst = false; + + // Get attribute definition + G4AttDef attDef; + + // Expect definition to exist + if (!G4AttUtils::ExtractAttDef(object, fAttName, attDef)) { + std::ostringstream o; + o <<"Unable to extract attribute definition named "<second == G4AttributeFilterT::Interval) {filter->LoadIntervalElement(iter->first);} + else if (iter->second == G4AttributeFilterT::SingleValue) {filter->LoadSingleValueElement(iter->first);} + iter++; + } + } + + // Get attribute value + G4AttValue attVal; + + // Expect value to exist + if (!G4AttUtils::ExtractAttValue(object, fAttName, attVal)) { + std::ostringstream o; + o <<"Unable to extract attribute value named "<::GetVerbose()) { + G4cout<<"G4AttributeFilterT processing attribute named "<Accept(attVal)); +} + +template +void +G4AttributeFilterT::Clear() +{ + fConfigVect.clear(); + if (0 != filter) filter->Reset(); +} + +template +void +G4AttributeFilterT::Print(std::ostream& ostr) const +{ + ostr<<"Printing data for G4Attribute filter named: "<::Name()<PrintAll(ostr); +} + +template +void +G4AttributeFilterT::Set(const G4String& name) +{ + fAttName = name; +} + +template +void +G4AttributeFilterT::AddInterval(const G4String& interval) +{ + std::pair myPair(interval, G4AttributeFilterT::Interval); + + typename ConfigVect::iterator iter = std::find(fConfigVect.begin(), fConfigVect.end(), myPair); + + if (iter != fConfigVect.end()) { + std::ostringstream o; + o <<"Interval "<< interval <<" already exists"< +void +G4AttributeFilterT::AddValue(const G4String& value) +{ + std::pair myPair(value, G4AttributeFilterT::SingleValue); + + typename ConfigVect::iterator iter = std::find(fConfigVect.begin(), fConfigVect.end(), myPair); + + if (iter != fConfigVect.end()) { + std::ostringstream o; + o <<"Single value "<< value <<" already exists"< > { + +public: // With description + + typedef std::vector Messengers; + typedef std::pair< G4VFilter *, Messengers > ModelAndMessengers; + + G4HitAttributeFilterFactory(); + + virtual ~G4HitAttributeFilterFactory(); + + ModelAndMessengers Create(const G4String& placement, const G4String& name); + +}; + +#endif + diff --git a/source/visualization/modeling/include/G4HitsModel.hh b/source/visualization/modeling/include/G4HitsModel.hh index 4e6bf0707b..f43f875bd4 100644 --- a/source/visualization/modeling/include/G4HitsModel.hh +++ b/source/visualization/modeling/include/G4HitsModel.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4HitsModel.hh,v 1.8 2006/06/29 21:30:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4HitsModel.hh,v 1.10 2006/11/02 11:57:31 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 26th August 1998. @@ -43,6 +43,8 @@ #include "G4VModel.hh" +class G4VHit; + class G4HitsModel: public G4VModel { public: // With description @@ -54,14 +56,12 @@ public: // With description virtual void DescribeYourselfTo (G4VGraphicsScene&); // The main task of a model is to describe itself to the graphics scene. - virtual G4String GetCurrentDescription () const; - // A description which depends on the current state of the model. + const G4VHit* GetCurrentHit() const + {return fpCurrentHit;} - virtual G4String GetCurrentTag () const; - // A tag which depends on the current state of the model. +private: + const G4VHit* fpCurrentHit; }; -#include "G4HitsModel.icc" - #endif diff --git a/source/visualization/modeling/include/G4LogicalVolumeModel.hh b/source/visualization/modeling/include/G4LogicalVolumeModel.hh index 0617d6f1f1..b9c4b74557 100644 --- a/source/visualization/modeling/include/G4LogicalVolumeModel.hh +++ b/source/visualization/modeling/include/G4LogicalVolumeModel.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4LogicalVolumeModel.hh,v 1.8 2006/06/29 21:30:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4LogicalVolumeModel.hh,v 1.9 2006/11/01 10:28:42 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 26th July 1999. @@ -66,9 +66,6 @@ public: // With description void DescribeYourselfTo (G4VGraphicsScene&); - G4String GetCurrentDescription () const; - // A description which depends on the current state of the model. - protected: // This called from G4PhysicalVolumeModel::DescribeAndDescend by the diff --git a/source/visualization/modeling/include/G4ModelApplyCommandsT.hh b/source/visualization/modeling/include/G4ModelApplyCommandsT.hh index 21caa4b27a..4e5bf21b0e 100644 --- a/source/visualization/modeling/include/G4ModelApplyCommandsT.hh +++ b/source/visualization/modeling/include/G4ModelApplyCommandsT.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4ModelApplyCommandsT.hh,v 1.3 2006/06/29 21:30:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ModelApplyCommandsT.hh,v 1.5 2006/09/11 21:22:02 tinslay Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Abstract model messenges. Derived classes should implement // the "Apply" method @@ -38,6 +38,7 @@ #include "G4String.hh" #include "G4UIcmdWithABool.hh" #include "G4UIcmdWithADouble.hh" +#include "G4UIcmdWithADoubleAndUnit.hh" #include "G4UIcmdWithAnInteger.hh" #include "G4UIcmdWithAString.hh" #include "G4UIcommand.hh" @@ -75,7 +76,7 @@ private: template G4ModelCmdApplyStringColour::G4ModelCmdApplyStringColour(M* model, const G4String& placement, const G4String& cmdName) - :G4VModelCommand(model) + :G4VModelCommand(model, placement) { //Set variable colour through a string G4String dir = placement+"/"+model->Name()+"/"+cmdName; @@ -182,7 +183,7 @@ private: template G4ModelCmdApplyColour::G4ModelCmdApplyColour(M* model, const G4String& placement, const G4String& cmdName) - :G4VModelCommand(model) + :G4VModelCommand(model, placement) { //Set colour through a string G4String dir = placement+"/"+model->Name()+"/"+cmdName; @@ -281,7 +282,7 @@ private: template G4ModelCmdApplyBool::G4ModelCmdApplyBool(M* model, const G4String& placement, const G4String& cmdName) - :G4VModelCommand(model) + :G4VModelCommand(model, placement) { G4String dir = placement+"/"+model->Name()+"/"+cmdName; fpCmd = new G4UIcmdWithABool(dir, this); @@ -329,7 +330,7 @@ private: template G4ModelCmdApplyNull::G4ModelCmdApplyNull(M* model, const G4String& placement, const G4String& cmdName) - :G4VModelCommand(model) + :G4VModelCommand(model, placement) { G4String dir = placement+"/"+model->Name()+"/"+cmdName; fpCmd = new G4UIcommand(dir, this); @@ -375,7 +376,7 @@ private: template G4ModelCmdApplyDouble::G4ModelCmdApplyDouble(M* model, const G4String& placement, const G4String& cmdName) - :G4VModelCommand(model) + :G4VModelCommand(model, placement) { G4String dir = placement+"/"+model->Name()+"/"+cmdName; @@ -395,6 +396,54 @@ void G4ModelCmdApplyDouble::SetNewValue(G4UIcommand*, G4String newValue) Apply(fpCmd->GetNewDoubleValue(newValue)); } +/////////////////////////////////////////////////////////////////////////// +//ApplyDoubleAndUnit command +template +class G4ModelCmdApplyDoubleAndUnit : public G4VModelCommand { + +public: // With description + + G4ModelCmdApplyDoubleAndUnit(M* model, const G4String& placement, const G4String& cmdName); + + virtual ~G4ModelCmdApplyDoubleAndUnit(); + + void SetNewValue(G4UIcommand* command, G4String newValue); + +protected: + + // Implement in derived class + virtual void Apply(const G4double&) = 0; + + G4UIcmdWithADoubleAndUnit* Command() {return fpCmd;} + +private: + + G4UIcmdWithADoubleAndUnit* fpCmd; + +}; + +template +G4ModelCmdApplyDoubleAndUnit::G4ModelCmdApplyDoubleAndUnit(M* model, const G4String& placement, const G4String& cmdName) + :G4VModelCommand(model, placement) +{ + G4String dir = placement+"/"+model->Name()+"/"+cmdName; + + fpCmd = new G4UIcmdWithADoubleAndUnit(dir, this); + fpCmd->SetParameterName("DoubleAndUnit", false); +} + +template +G4ModelCmdApplyDoubleAndUnit::~G4ModelCmdApplyDoubleAndUnit() +{ + delete fpCmd; +} + +template +void G4ModelCmdApplyDoubleAndUnit::SetNewValue(G4UIcommand*, G4String newValue) +{ + Apply(fpCmd->GetNewDoubleValue(newValue)); +} + /////////////////////////////////////////////////////////////////////////// // ApplyInteger command template @@ -422,7 +471,7 @@ private: template G4ModelCmdApplyInteger::G4ModelCmdApplyInteger(M* model, const G4String& placement, const G4String& cmdName) - :G4VModelCommand(model) + :G4VModelCommand(model, placement) { G4String dir = placement+"/"+model->Name()+"/"+cmdName; @@ -470,7 +519,7 @@ private: template G4ModelCmdApplyString::G4ModelCmdApplyString(M* model, const G4String& placement, const G4String& cmdName) - :G4VModelCommand(model) + :G4VModelCommand(model, placement) { G4String dir = placement+"/"+model->Name()+"/"+cmdName; diff --git a/source/visualization/modeling/include/G4ModelColourMap.hh b/source/visualization/modeling/include/G4ModelColourMap.hh index 6b45e69c05..fd78d2db2b 100644 --- a/source/visualization/modeling/include/G4ModelColourMap.hh +++ b/source/visualization/modeling/include/G4ModelColourMap.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4ModelColourMap.hh,v 1.2 2006/06/29 21:30:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Generic variable->G4Colour map, where "variable" is the template // parameter. diff --git a/source/visualization/modeling/include/G4ModelCommandUtils.hh b/source/visualization/modeling/include/G4ModelCommandUtils.hh new file mode 100644 index 0000000000..729bbf1869 --- /dev/null +++ b/source/visualization/modeling/include/G4ModelCommandUtils.hh @@ -0,0 +1,69 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4ModelCommandUtils.hh,v 1.2 2006/09/13 12:54:31 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// Jane Tinslay September 2006 +// +// Command utilities +// +#ifndef G4MODELCOMMANDUTILS_HH +#define G4MODELCOMMANDUTILS_HH + +#include "G4String.hh" +#include "G4ModelCommandsT.hh" +#include "G4UImessenger.hh" +#include "G4VisTrajContext.hh" + +namespace G4ModelCommandUtils { + + void AddContextMsgrs(G4VisTrajContext* context, std::vector& messengers, + const G4String& placement) + { + messengers.push_back(new G4ModelCmdCreateContextDir(context, placement)); + messengers.push_back(new G4ModelCmdSetDrawLine(context, placement)); + messengers.push_back(new G4ModelCmdSetLineVisible(context, placement)); + messengers.push_back(new G4ModelCmdSetLineColour(context, placement)); + + messengers.push_back(new G4ModelCmdSetDrawStepPts(context, placement)); + messengers.push_back(new G4ModelCmdSetStepPtsVisible(context, placement)); + messengers.push_back(new G4ModelCmdSetStepPtsColour(context, placement)); + messengers.push_back(new G4ModelCmdSetStepPtsSize(context, placement)); + messengers.push_back(new G4ModelCmdSetStepPtsType(context, placement)); + messengers.push_back(new G4ModelCmdSetStepPtsFillStyle(context, placement)); + + messengers.push_back(new G4ModelCmdSetDrawAuxPts(context, placement)); + messengers.push_back(new G4ModelCmdSetAuxPtsVisible(context, placement)); + messengers.push_back(new G4ModelCmdSetAuxPtsColour(context, placement)); + messengers.push_back(new G4ModelCmdSetAuxPtsSize(context, placement)); + messengers.push_back(new G4ModelCmdSetAuxPtsType(context, placement)); + messengers.push_back(new G4ModelCmdSetAuxPtsFillStyle(context, placement)); + + messengers.push_back(new G4ModelCmdSetTimeSliceInterval(context, placement)); + } +} + +#endif diff --git a/source/visualization/modeling/include/G4ModelCommandsT.hh b/source/visualization/modeling/include/G4ModelCommandsT.hh index e19141b395..0865d8f1de 100644 --- a/source/visualization/modeling/include/G4ModelCommandsT.hh +++ b/source/visualization/modeling/include/G4ModelCommandsT.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4ModelCommandsT.hh,v 1.7 2006/06/29 21:30:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ModelCommandsT.hh,v 1.12 2006/11/01 10:34:03 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Generic model messenges. // @@ -45,8 +45,9 @@ class G4ModelCmdSetStringColour : public G4ModelCmdApplyStringColour { public: // With description - G4ModelCmdSetStringColour(M* model, const G4String& placement) - :G4ModelCmdApplyStringColour(model, placement, "set") {} + G4ModelCmdSetStringColour(M* model, const G4String& placement, + const G4String& cmdName="set") + :G4ModelCmdApplyStringColour(model, placement, cmdName) {} virtual ~G4ModelCmdSetStringColour() {} @@ -65,8 +66,9 @@ class G4ModelCmdSetDefaultColour : public G4ModelCmdApplyColour { public: // With description - G4ModelCmdSetDefaultColour(M* model, const G4String& placement) - :G4ModelCmdApplyColour(model, placement, "setDefault") {} + G4ModelCmdSetDefaultColour(M* model, const G4String& placement, + const G4String& cmdName="setDefault") + :G4ModelCmdApplyColour(model, placement, cmdName) {} virtual ~G4ModelCmdSetDefaultColour() {} @@ -85,8 +87,9 @@ class G4ModelCmdAddString : public G4ModelCmdApplyString { public: // With description - G4ModelCmdAddString(M* model, const G4String& placement) - :G4ModelCmdApplyString(model, placement, "add") + G4ModelCmdAddString(M* model, const G4String& placement, + const G4String& cmdName="add") + :G4ModelCmdApplyString(model, placement, cmdName) { G4ModelCmdApplyString::Command()->SetGuidance("Add command"); } @@ -108,8 +111,9 @@ class G4ModelCmdAddInt : public G4ModelCmdApplyInteger { public: // With description - G4ModelCmdAddInt(M* model, const G4String& placement) - :G4ModelCmdApplyInteger(model, placement, "add") + G4ModelCmdAddInt(M* model, const G4String& placement, + const G4String& cmdName="add") + :G4ModelCmdApplyInteger(model, placement, cmdName) { G4ModelCmdApplyInteger::Command()->SetGuidance("Add command"); } @@ -131,8 +135,9 @@ class G4ModelCmdInvert : public G4ModelCmdApplyBool { public: // With description - G4ModelCmdInvert(M* model, const G4String& placement) - :G4ModelCmdApplyBool(model, placement, "invert") + G4ModelCmdInvert(M* model, const G4String& placement, + const G4String& cmdName="invert") + :G4ModelCmdApplyBool(model, placement, cmdName) { G4ModelCmdApplyBool::Command()->SetGuidance("Invert command"); } @@ -154,8 +159,9 @@ class G4ModelCmdActive : public G4ModelCmdApplyBool { public: // With description - G4ModelCmdActive(M* model, const G4String& placement) - :G4ModelCmdApplyBool(model, placement, "active") + G4ModelCmdActive(M* model, const G4String& placement, + const G4String& cmdName="active") + :G4ModelCmdApplyBool(model, placement, cmdName) { G4ModelCmdApplyBool::Command()->SetGuidance("Active command"); } @@ -177,8 +183,9 @@ class G4ModelCmdVerbose : public G4ModelCmdApplyBool { public: // With description - G4ModelCmdVerbose(M* model, const G4String& placement) - :G4ModelCmdApplyBool(model, placement, "verbose") + G4ModelCmdVerbose(M* model, const G4String& placement, + const G4String& cmdName="verbose") + :G4ModelCmdApplyBool(model, placement, cmdName) { G4ModelCmdApplyBool::Command()->SetGuidance("Verbose command"); } @@ -200,8 +207,9 @@ class G4ModelCmdReset : public G4ModelCmdApplyNull { public: // With description - G4ModelCmdReset(M* model, const G4String& placement) - :G4ModelCmdApplyNull(model, placement, "reset") + G4ModelCmdReset(M* model, const G4String& placement, + const G4String& cmdName="reset") + :G4ModelCmdApplyNull(model, placement, cmdName) { G4ModelCmdApplyNull::Command()->SetGuidance("Reset command"); } @@ -223,9 +231,10 @@ class G4ModelCmdSetAuxPtsColour : public G4ModelCmdApplyColour { public: - G4ModelCmdSetAuxPtsColour(M* model, const G4String& placement) - :G4ModelCmdApplyColour(model, placement, "setAuxPtsColour") {} - + G4ModelCmdSetAuxPtsColour(M* model, const G4String& placement, + const G4String& cmdName="setAuxPtsColour") + :G4ModelCmdApplyColour(model, placement, cmdName) {} + protected: void Apply(const G4Colour& colour) { @@ -241,9 +250,10 @@ class G4ModelCmdSetStepPtsColour : public G4ModelCmdApplyColour { public: - G4ModelCmdSetStepPtsColour(M* model, const G4String& placement) - :G4ModelCmdApplyColour(model, placement, "setStepPtsColour") {} - + G4ModelCmdSetStepPtsColour(M* model, const G4String& placement, + const G4String& cmdName="setStepPtsColour") + :G4ModelCmdApplyColour(model, placement, cmdName) {} + protected: void Apply(const G4Colour& colour) { @@ -259,8 +269,9 @@ class G4ModelCmdSetDrawLine : public G4ModelCmdApplyBool { public: - G4ModelCmdSetDrawLine(M* model, const G4String& placement) - :G4ModelCmdApplyBool(model, placement, "setDrawLine") + G4ModelCmdSetDrawLine(M* model, const G4String& placement, + const G4String& cmdName="setDrawLine") + :G4ModelCmdApplyBool(model, placement, cmdName) { G4ModelCmdApplyBool::Command()->SetGuidance("Set draw line command"); } @@ -280,8 +291,9 @@ class G4ModelCmdSetLineVisible : public G4ModelCmdApplyBool { public: - G4ModelCmdSetLineVisible(M* model, const G4String& placement) - :G4ModelCmdApplyBool(model, placement, "setLineVisible") + G4ModelCmdSetLineVisible(M* model, const G4String& placement, + const G4String& cmdName="setLineVisible") + :G4ModelCmdApplyBool(model, placement, cmdName) { G4ModelCmdApplyBool::Command()->SetGuidance("Set line visibility command"); } @@ -301,8 +313,9 @@ class G4ModelCmdSetDrawAuxPts : public G4ModelCmdApplyBool { public: - G4ModelCmdSetDrawAuxPts(M* model, const G4String& placement) - :G4ModelCmdApplyBool(model, placement, "setDrawAuxPts") + G4ModelCmdSetDrawAuxPts(M* model, const G4String& placement, + const G4String& cmdName="setDrawAuxPts") + :G4ModelCmdApplyBool(model, placement, cmdName) { G4ModelCmdApplyBool::Command()->SetGuidance("Set draw auxiliary points command"); } @@ -322,8 +335,9 @@ class G4ModelCmdSetAuxPtsVisible : public G4ModelCmdApplyBool { public: - G4ModelCmdSetAuxPtsVisible(M* model, const G4String& placement) - :G4ModelCmdApplyBool(model, placement, "setAuxPtsVisible") + G4ModelCmdSetAuxPtsVisible(M* model, const G4String& placement, + const G4String& cmdName="setAuxPtsVisible") + :G4ModelCmdApplyBool(model, placement, cmdName) { G4ModelCmdApplyBool::Command()->SetGuidance("Set auxiliary points visibility command"); } @@ -343,8 +357,9 @@ class G4ModelCmdSetDrawStepPts : public G4ModelCmdApplyBool { public: - G4ModelCmdSetDrawStepPts(M* model, const G4String& placement) - :G4ModelCmdApplyBool(model, placement, "setDrawStepPts") + G4ModelCmdSetDrawStepPts(M* model, const G4String& placement, + const G4String& cmdName="setDrawStepPts") + :G4ModelCmdApplyBool(model, placement, cmdName) { G4ModelCmdApplyBool::Command()->SetGuidance("Set draw step points command"); } @@ -364,10 +379,11 @@ class G4ModelCmdSetStepPtsVisible : public G4ModelCmdApplyBool { public: - G4ModelCmdSetStepPtsVisible(M* model, const G4String& placement) - :G4ModelCmdApplyBool(model, placement, "setStepPtsVisible") + G4ModelCmdSetStepPtsVisible(M* model, const G4String& placement, + const G4String& cmdName="setStepPtsVisible") + :G4ModelCmdApplyBool(model, placement, cmdName) { - G4ModelCmdApplyBool::Command()->SetGuidance("Set step points colour command"); + G4ModelCmdApplyBool::Command()->SetGuidance("Set step points visible command"); } protected: @@ -385,8 +401,9 @@ class G4ModelCmdSetAuxPtsSize : public G4ModelCmdApplyDouble { public: - G4ModelCmdSetAuxPtsSize(M* model, const G4String& placement) - :G4ModelCmdApplyDouble(model, placement, "setAuxPtsSize") + G4ModelCmdSetAuxPtsSize(M* model, const G4String& placement, + const G4String& cmdName="setAuxPtsSize") + :G4ModelCmdApplyDouble(model, placement, cmdName) { G4ModelCmdApplyDouble::Command()->SetGuidance("Set auxiliary points size command"); } @@ -406,10 +423,11 @@ class G4ModelCmdSetStepPtsSize : public G4ModelCmdApplyDouble { public: - G4ModelCmdSetStepPtsSize(M* model, const G4String& placement) - :G4ModelCmdApplyDouble(model, placement, "setStepPtsSize") + G4ModelCmdSetStepPtsSize(M* model, const G4String& placement, + const G4String& cmdName="setStepPtsSize") + :G4ModelCmdApplyDouble(model, placement, cmdName) { - G4ModelCmdApplyDouble::Command()->SetGuidance("Set step points colour command"); + G4ModelCmdApplyDouble::Command()->SetGuidance("Set step points size command"); } protected: @@ -427,8 +445,9 @@ class G4ModelCmdSetStepPtsType : public G4ModelCmdApplyString { public: - G4ModelCmdSetStepPtsType(M* model, const G4String& placement) - :G4ModelCmdApplyString(model, placement, "setStepPtsType") + G4ModelCmdSetStepPtsType(M* model, const G4String& placement, + const G4String& cmdName="setStepPtsType") + :G4ModelCmdApplyString(model, placement, cmdName) { G4UIcmdWithAString* cmd = G4ModelCmdApplyString::Command(); cmd->SetGuidance("Set step points type."); @@ -463,8 +482,9 @@ class G4ModelCmdSetAuxPtsType : public G4ModelCmdApplyString { public: - G4ModelCmdSetAuxPtsType(M* model, const G4String& placement) - :G4ModelCmdApplyString(model, placement, "setAuxPtsType") + G4ModelCmdSetAuxPtsType(M* model, const G4String& placement, + const G4String& cmdName="setAuxPtsType") + :G4ModelCmdApplyString(model, placement, cmdName) { G4UIcmdWithAString* cmd = G4ModelCmdApplyString::Command(); @@ -501,8 +521,9 @@ class G4ModelCmdSetStepPtsFillStyle : public G4ModelCmdApplyString { public: - G4ModelCmdSetStepPtsFillStyle(M* model, const G4String& placement) - :G4ModelCmdApplyString(model, placement, "setStepPtsFillStyle") + G4ModelCmdSetStepPtsFillStyle(M* model, const G4String& placement, + const G4String& cmdName="setStepPtsFillStyle") + :G4ModelCmdApplyString(model, placement, cmdName) { G4UIcmdWithAString* cmd = G4ModelCmdApplyString::Command(); cmd->SetGuidance("Set step fill style type."); @@ -537,8 +558,9 @@ class G4ModelCmdSetAuxPtsFillStyle : public G4ModelCmdApplyString { public: - G4ModelCmdSetAuxPtsFillStyle(M* model, const G4String& placement) - :G4ModelCmdApplyString(model, placement, "setAuxPtsFillStyle") + G4ModelCmdSetAuxPtsFillStyle(M* model, const G4String& placement, + const G4String& cmdName="setAuxPtsFillStyle") + :G4ModelCmdApplyString(model, placement, cmdName) { G4UIcmdWithAString* cmd = G4ModelCmdApplyString::Command(); cmd->SetGuidance("Set auxiliary fill style."); @@ -573,8 +595,9 @@ class G4ModelCmdSetLineColour : public G4ModelCmdApplyColour { public: - G4ModelCmdSetLineColour(M* model, const G4String& placement) - :G4ModelCmdApplyColour(model, placement, "setLineColour") {} + G4ModelCmdSetLineColour(M* model, const G4String& placement, + const G4String& cmdName="""setLineColour") + :G4ModelCmdApplyColour(model, placement, cmdName){} protected: @@ -584,6 +607,31 @@ protected: }; +//////////////////////////////////////////////////////////////////////// +// Set time slice interval command +template +class G4ModelCmdSetTimeSliceInterval : public G4ModelCmdApplyDoubleAndUnit { + +public: + + G4ModelCmdSetTimeSliceInterval(M* model, const G4String& placement, + const G4String& cmdName = "setTimeSliceInterval") + :G4ModelCmdApplyDoubleAndUnit(model, placement, cmdName) + { + G4UIcmdWithADoubleAndUnit* cmd = G4ModelCmdApplyDoubleAndUnit::Command(); + cmd->SetGuidance + ("Set time slice interval. Give unit, e.g., \"0.1 ns\""); + cmd->SetUnitCategory("Time"); + } + +protected: + + void Apply(const G4double& myDouble) { + G4VModelCommand::Model()->SetTimeSliceInterval(myDouble); + } + +}; + //////////////////////////////////////////////////////////////////////// // Create context directory command template @@ -591,7 +639,8 @@ class G4ModelCmdCreateContextDir : public G4UImessenger { public: - G4ModelCmdCreateContextDir(M* model, const G4String& placement) { + G4ModelCmdCreateContextDir(M* model, const G4String& placement) + { G4String title = placement+"/"+model->Name()+"/"; cmd = new G4UIdirectory(title); @@ -607,5 +656,102 @@ protected: G4UIdirectory* cmd; }; -#endif +//////////////////////////////////////////////////////////////////////// +// Draw command +template +class G4ModelCmdDraw : public G4ModelCmdApplyBool { + +public: // With description + + G4ModelCmdDraw(M* model, const G4String& placement, + const G4String& cmdName="draw") + :G4ModelCmdApplyBool(model, placement, cmdName) + { + G4ModelCmdApplyBool::Command()->SetGuidance("Draw command"); + } + + virtual ~G4ModelCmdDraw() {} + +protected: + + virtual void Apply(const G4bool& newValue) { + if (newValue) G4VModelCommand::Model()->Draw(); + } + +}; + +//////////////////////////////////////////////////////////////////////// +// Set interval +template +class G4ModelCmdAddInterval : public G4ModelCmdApplyString { + +public: // With description + + G4ModelCmdAddInterval(M* model, const G4String& placement, + const G4String& cmdName="addInterval") + :G4ModelCmdApplyString(model, placement, cmdName) + { + G4UIcmdWithAString* cmd = G4ModelCmdApplyString::Command(); + cmd->SetGuidance("Set interval."); + } + + virtual ~G4ModelCmdAddInterval() {} + +protected: + + virtual void Apply(const G4String& param) { + G4VModelCommand::Model()->AddInterval(param); + + } +}; + +//////////////////////////////////////////////////////////////////////// +// Set value +template +class G4ModelCmdAddValue : public G4ModelCmdApplyString { + +public: // With description + + G4ModelCmdAddValue(M* model, const G4String& placement, + const G4String& cmdName="addValue") + :G4ModelCmdApplyString(model, placement, cmdName) + { + G4UIcmdWithAString* cmd = G4ModelCmdApplyString::Command(); + cmd->SetGuidance("Set value."); + } + + virtual ~G4ModelCmdAddValue() {} +protected: + + virtual void Apply(const G4String& param) { + G4VModelCommand::Model()->AddValue(param); + + } +}; + +//////////////////////////////////////////////////////////////////////// +// Set string command +template +class G4ModelCmdSetString : public G4ModelCmdApplyString { + +public: // With description + + G4ModelCmdSetString(M* model, const G4String& placement, + const G4String& cmdName="set") + :G4ModelCmdApplyString(model, placement, cmdName) + { + G4ModelCmdApplyString::Command()->SetGuidance("Set command"); + } + + virtual ~G4ModelCmdSetString() {} + +protected: + + virtual void Apply(const G4String& newValue) { + G4VModelCommand::Model()->Set(newValue); + } + +}; + +#endif diff --git a/source/visualization/modeling/include/G4ModelCompoundCommandsT.hh b/source/visualization/modeling/include/G4ModelCompoundCommandsT.hh new file mode 100644 index 0000000000..c44d321e90 --- /dev/null +++ b/source/visualization/modeling/include/G4ModelCompoundCommandsT.hh @@ -0,0 +1,141 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4ModelCompoundCommandsT.hh,v 1.1 2006/09/11 21:52:18 tinslay Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// Jane Tinslay September 2006 +// +// Compound model commands. +// +#ifndef G4MODELCOMPOUNDCOMMANDST_HH +#define G4MODELCOMPOUNDCOMMANDST_HH + +#include "G4ModelApplyCommandsT.hh" +#include "G4ModelCommandUtils.hh" +#include "G4ModelCommandsT.hh" +#include "G4String.hh" + +//////////////////////////////////////////////////////////////////////// +// Set interval context +template +class G4ModelCmdAddIntervalContext: public G4ModelCmdApplyString { + +public: // With description + + G4ModelCmdAddIntervalContext(M* model, const G4String& placement, + const G4String& cmdName="addInterval") + :G4ModelCmdApplyString(model, placement, cmdName) + { + G4UIcmdWithAString* cmd = G4ModelCmdApplyString::Command(); + cmd->SetGuidance("Add interval."); + } + + virtual ~G4ModelCmdAddIntervalContext() { + std::vector::iterator iter = fMessengers.begin(); + + while (iter != fMessengers.end()) { + delete *iter; + iter++; + } + } + +protected: + + virtual void Apply(const G4String& param) { + G4String myString(param); + + G4String name; + std::istringstream is(param); + + is >> name; + + myString.erase(0, name.size()); + + G4String dir = G4VModelCommand::Placement()+"/"+G4VModelCommand::Model()->Name(); + + G4VisTrajContext* context = new G4VisTrajContext(name); + + G4ModelCommandUtils::AddContextMsgrs(context, fMessengers, dir); + G4VModelCommand::Model()->AddIntervalContext(myString, context); + } + +private: + + std::vector fMessengers; + +}; + +//////////////////////////////////////////////////////////////////////// +// Set value context +template +class G4ModelCmdAddValueContext: public G4ModelCmdApplyString { + +public: // With description + + G4ModelCmdAddValueContext(M* model, const G4String& placement, + const G4String& cmdName="addValue") + :G4ModelCmdApplyString(model, placement, cmdName) + { + G4UIcmdWithAString* cmd = G4ModelCmdApplyString::Command(); + cmd->SetGuidance("Add value."); + } + + virtual ~G4ModelCmdAddValueContext() { + std::vector::iterator iter = fMessengers.begin(); + + while (iter != fMessengers.end()) { + delete *iter; + iter++; + } + } + +protected: + + virtual void Apply(const G4String& param) { + G4String myString(param); + + G4String name; + std::istringstream is(param); + + is >> name; + + myString.erase(0, name.size()); + + G4String dir = G4VModelCommand::Placement()+"/"+G4VModelCommand::Model()->Name(); + + G4VisTrajContext* context = new G4VisTrajContext(name); + + G4ModelCommandUtils::AddContextMsgrs(context, fMessengers, dir); + G4VModelCommand::Model()->AddValueContext(myString, context); + } + +private: + + std::vector fMessengers; + +}; + +#endif diff --git a/source/visualization/modeling/include/G4ModelingParameters.hh b/source/visualization/modeling/include/G4ModelingParameters.hh index c7af745889..9d94a5a297 100644 --- a/source/visualization/modeling/include/G4ModelingParameters.hh +++ b/source/visualization/modeling/include/G4ModelingParameters.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4ModelingParameters.hh,v 1.12 2006/06/29 21:30:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ModelingParameters.hh,v 1.17 2006/11/14 14:42:08 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 31st December 1997. @@ -43,6 +43,8 @@ class G4LogicalVolume; class G4VPhysicalVolume; class G4VisAttributes; +class G4Polyhedron; +class G4Event; class G4ModelingParameters { @@ -58,67 +60,17 @@ public: // With description }; // Currently requested drawing style. - enum RepStyle { - wireframe, // Use G4Wireframe. - polyhedron, // Use G4Polyhedron. - nurbs // Use G4NURBS. - }; - // RepStyle is used to determine which graphics_reps classes to use, - // if required. - G4ModelingParameters (); G4ModelingParameters (const G4VisAttributes* pDefaultVisAttributes, - DrawingStyle drawingStyle, - RepStyle repStyle, + DrawingStyle drawingStyle, G4bool isCulling, G4bool isCullingInvisible, G4bool isDensityCulling, G4double visibleDensity, G4bool isCullingCovered, G4int noOfSides); - // noOfSides is suggested no. of sides per circle in case a - // polygonal representation is produced. - - G4ModelingParameters (const G4VisAttributes* pDefaultVisAttributes, - DrawingStyle drawingStyle, - RepStyle repStyle, - G4bool isCulling, - G4bool isCullingInvisible, - G4bool isDensityCulling, - G4double visibleDensity, - G4bool isCullingCovered, - G4int noOfSides, - G4bool isViewGeom, - G4bool isViewHits, - G4bool isViewDigis); - // noOfSides is suggested no. of sides per circle in case a - // polygonal representation is produced. - - G4ModelingParameters (const G4VisAttributes* pDefaultVisAttributes, - RepStyle repStyle, - G4bool isCulling, - G4bool isCullingInvisible, - G4bool isDensityCulling, - G4double visibleDensity, - G4bool isCullingCovered, - G4int noOfSides); - // noOfSides is suggested no. of sides per circle in case a - // polygonal representation is produced. - - G4ModelingParameters (const G4VisAttributes* pDefaultVisAttributes, - RepStyle repStyle, - G4bool isCulling, - G4bool isCullingInvisible, - G4bool isDensityCulling, - G4double visibleDensity, - G4bool isCullingCovered, - G4int noOfSides, - G4bool isViewGeom, - G4bool isViewHits, - G4bool isViewDigis); - // noOfSides is suggested no. of sides per circle in case a - // polygonal representation is produced. + // Culling and clipping policy for G4PhysicalVolumeModel. ~G4ModelingParameters (); @@ -127,55 +79,55 @@ public: // With description G4bool operator != (const G4ModelingParameters&) const; // Get and Is functions... + G4bool IsWarning () const; const G4VisAttributes* GetDefaultVisAttributes () const; DrawingStyle GetDrawingStyle () const; - RepStyle GetRepStyle () const; G4bool IsCulling () const; G4bool IsCullingInvisible () const; G4bool IsDensityCulling () const; G4double GetVisibleDensity () const; G4bool IsCullingCovered () const; + G4bool IsExplode () const; + G4double GetExplodeFactor () const; + const G4Point3D& GetExplodeCentre () const; G4int GetNoOfSides () const; - G4bool IsViewGeom () const; - G4bool IsViewHits () const; - G4bool IsViewDigis () const; + const G4Polyhedron* GetSectionPolyhedron () const; + const G4Polyhedron* GetCutawayPolyhedron () const; + const G4Event* GetEvent () const; // Set functions... + void SetWarning (G4bool); void SetDefaultVisAttributes (const G4VisAttributes* pDefaultVisAttributes); void SetDrawingStyle (DrawingStyle); - void SetRepStyle (RepStyle); void SetCulling (G4bool); void SetCullingInvisible (G4bool); void SetDensityCulling (G4bool); void SetVisibleDensity (G4double); void SetCullingCovered (G4bool); + void SetExplodeFactor (G4double explodeFactor); + void SetExplodeCentre (const G4Point3D& explodeCentre); G4int SetNoOfSides (G4int); // Returns actual number set. - void SetViewGeom (); - void UnsetViewGeom (); - void SetViewHits (); - void UnsetViewHits (); - void SetViewDigis (); - void UnsetViewDigis (); - - // Other functions... - void PrintDifferences (const G4ModelingParameters& that) const; + void SetSectionPolyhedron (const G4Polyhedron* pSectionPolyhedron); + void SetCutawayPolyhedron (const G4Polyhedron* pCutawayPolyhedron); + void SetEvent (const G4Event* pEvent); private: // Data members... + G4bool fWarning; // Print warnings if true. const G4VisAttributes* fpDefaultVisAttributes; DrawingStyle fDrawingStyle; // Drawing style. - RepStyle fRepStyle; // Representation style. G4bool fCulling; // Culling requested. G4bool fCullInvisible; // Cull (don't Draw) invisible objects. G4bool fDensityCulling; // Density culling requested. If so... G4double fVisibleDensity; // ...density lower than this not drawn. G4bool fCullCovered; // Cull daughters covered by opaque mothers. + G4double fExplodeFactor; // Explode along radius by this factor... + G4Point3D fExplodeCentre; // ...about this centre. G4int fNoOfSides; // ...if polygon approximates circle. - G4bool fViewGeom; // View geometry objects. - G4bool fViewHits; // View hits, if any. - G4bool fViewDigis; // View digis, if any. - + const G4Polyhedron* fpSectionPolyhedron; // For generic section (DCUT). + const G4Polyhedron* fpCutawayPolyhedron; // For generic cutaways. + const G4Event* fpEvent; // Event being processed. }; #include "G4ModelingParameters.icc" diff --git a/source/visualization/modeling/include/G4ModelingParameters.icc b/source/visualization/modeling/include/G4ModelingParameters.icc index f095bd58b9..15865848d1 100644 --- a/source/visualization/modeling/include/G4ModelingParameters.icc +++ b/source/visualization/modeling/include/G4ModelingParameters.icc @@ -24,13 +24,17 @@ // ******************************************************************** // // -// $Id: G4ModelingParameters.icc,v 1.6 2006/06/29 21:30:28 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ModelingParameters.icc,v 1.11 2006/11/14 14:42:08 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 31st December 1997. // Parameters associated with the modeling of GEANT4 objects. +inline G4bool G4ModelingParameters::IsWarning () const { + return fWarning; +} + inline const G4VisAttributes* G4ModelingParameters::GetDefaultVisAttributes () const { return fpDefaultVisAttributes; @@ -41,11 +45,6 @@ G4ModelingParameters::GetDrawingStyle () const { return fDrawingStyle; } -inline G4ModelingParameters::RepStyle -G4ModelingParameters::GetRepStyle () const { - return fRepStyle; -} - inline G4bool G4ModelingParameters::IsCulling () const { return fCulling; } @@ -66,20 +65,33 @@ inline G4bool G4ModelingParameters::IsCullingCovered () const { return fCullCovered; } +inline G4bool G4ModelingParameters::IsExplode () const { + return fExplodeFactor > 1.; +} + +inline G4double G4ModelingParameters::GetExplodeFactor () const { + return fExplodeFactor; +} + +inline const G4Point3D& G4ModelingParameters::GetExplodeCentre () const { + return fExplodeCentre; +} + inline G4int G4ModelingParameters::GetNoOfSides () const { return fNoOfSides; } -inline G4bool G4ModelingParameters::IsViewGeom () const { - return fViewGeom; -} +inline const G4Polyhedron* G4ModelingParameters::GetSectionPolyhedron () const +{return fpSectionPolyhedron;} -inline G4bool G4ModelingParameters::IsViewHits () const { - return fViewHits; -} +inline const G4Polyhedron* G4ModelingParameters::GetCutawayPolyhedron () const +{return fpCutawayPolyhedron;} -inline G4bool G4ModelingParameters::IsViewDigis () const { - return fViewDigis; +inline const G4Event* G4ModelingParameters::GetEvent () const +{return fpEvent;} + +inline void G4ModelingParameters::SetWarning (G4bool value) { + fWarning = value; } inline void G4ModelingParameters::SetDefaultVisAttributes @@ -93,11 +105,6 @@ G4ModelingParameters::SetDrawingStyle fDrawingStyle = style; } -inline void -G4ModelingParameters::SetRepStyle (G4ModelingParameters::RepStyle style) { - fRepStyle = style; -} - inline void G4ModelingParameters::SetCulling (G4bool value) { fCulling = value; } @@ -114,26 +121,25 @@ inline void G4ModelingParameters::SetCullingCovered (G4bool value) { fCullCovered = value; } -inline void G4ModelingParameters::SetViewGeom () { - fViewGeom = true; +inline void G4ModelingParameters::SetExplodeFactor (G4double explodeFactor) { + fExplodeFactor = explodeFactor; } -inline void G4ModelingParameters::UnsetViewGeom () { - fViewGeom = false; +inline void G4ModelingParameters::SetExplodeCentre +(const G4Point3D& explodeCentre) { + fExplodeCentre = explodeCentre; } -inline void G4ModelingParameters::SetViewHits () { - fViewHits = true; +inline void G4ModelingParameters::SetSectionPolyhedron +(const G4Polyhedron* pSectionPolyhedron) { + fpSectionPolyhedron = pSectionPolyhedron; } -inline void G4ModelingParameters::UnsetViewHits () { - fViewHits = false; +inline void G4ModelingParameters::SetCutawayPolyhedron +(const G4Polyhedron* pCutawayPolyhedron) { + fpCutawayPolyhedron = pCutawayPolyhedron; } -inline void G4ModelingParameters::SetViewDigis () { - fViewDigis = true; -} - -inline void G4ModelingParameters::UnsetViewDigis () { - fViewDigis = false; +inline void G4ModelingParameters::SetEvent(const G4Event* pEvent) { + fpEvent = pEvent; } diff --git a/source/visualization/modeling/include/G4NullModel.hh b/source/visualization/modeling/include/G4NullModel.hh index 30da70d919..ad64a248e3 100644 --- a/source/visualization/modeling/include/G4NullModel.hh +++ b/source/visualization/modeling/include/G4NullModel.hh @@ -25,7 +25,7 @@ // // // $Id: G4NullModel.hh,v 1.7 2006/06/29 21:30:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 4th April 1998. diff --git a/source/visualization/modeling/include/G4PhysicalVolumeMassScene.hh b/source/visualization/modeling/include/G4PhysicalVolumeMassScene.hh index 77c3a3e1c8..7bd6af7b69 100644 --- a/source/visualization/modeling/include/G4PhysicalVolumeMassScene.hh +++ b/source/visualization/modeling/include/G4PhysicalVolumeMassScene.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4PhysicalVolumeMassScene.hh,v 1.7 2006/06/29 21:30:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4PhysicalVolumeMassScene.hh,v 1.8 2006/11/05 20:38:09 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 12th September 2004 @@ -36,6 +36,9 @@ // up to the depth specified in the G4PhysicalVolumeModel. Culling is // ignored so that all volumes are seen. // +// Do not use this for a "parallel world" for which materials are not +// defined. Use only for the material world. +// // The calculation is quite tricky, since it involves subtracting the // mass of that part of the mother that is occupied by each daughter and // then adding the mass of the daughter, and so on down the heirarchy. diff --git a/source/visualization/modeling/include/G4PhysicalVolumeModel.hh b/source/visualization/modeling/include/G4PhysicalVolumeModel.hh index 35e10c37c1..d250c1ab5c 100644 --- a/source/visualization/modeling/include/G4PhysicalVolumeModel.hh +++ b/source/visualization/modeling/include/G4PhysicalVolumeModel.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4PhysicalVolumeModel.hh,v 1.28 2006/06/29 21:30:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4PhysicalVolumeModel.hh,v 1.32 2006/10/26 11:05:42 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 31st December 1997. @@ -50,8 +50,10 @@ #include "G4VModel.hh" #include "G4Transform3D.hh" +#include "G4Plane3D.hh" #include #include +#include class G4VPhysicalVolume; class G4LogicalVolume; @@ -59,6 +61,8 @@ class G4VSolid; class G4Material; class G4VisAttributes; class G4Polyhedron; +class G4AttDef; +class G4AttValue; class G4PhysicalVolumeModel: public G4VModel { @@ -66,17 +70,21 @@ public: // With description enum {UNLIMITED = -1}; + enum ClippingMode {subtraction, intersection}; + class G4PhysicalVolumeNodeID { public: - G4PhysicalVolumeNodeID(G4VPhysicalVolume* pPV = 0, G4int iCopyNo = 0): - fpPV(pPV), fCopyNo(iCopyNo) {} + G4PhysicalVolumeNodeID + (G4VPhysicalVolume* pPV = 0, G4int iCopyNo = 0, G4int depth = 0): + fpPV(pPV), fCopyNo(iCopyNo), fNonCulledDepth(depth) {} G4VPhysicalVolume* GetPhysicalVolume() const {return fpPV;} G4int GetCopyNo() const {return fCopyNo;} + G4int GetNonCulledDepth() const {return fNonCulledDepth;} G4bool operator< (const G4PhysicalVolumeNodeID& right) const; - G4bool operator== (const G4PhysicalVolumeNodeID& right) const; private: G4VPhysicalVolume* fpPV; G4int fCopyNo; + G4int fNonCulledDepth; }; // Nested class for identifying physical volume nodes. @@ -92,16 +100,7 @@ public: // With description void DescribeYourselfTo (G4VGraphicsScene&); // The main task of a model is to describe itself to the graphics scene // handler (a object which inherits G4VSceneHandler, which inherits - // G4VGraphicsScene). It can also provide special information - // through pointers to working space in the scene handler. These - // pointers must be set up (if required by the scene handler) in the - // scene handler's implementaion of EstablishSpecials - // (G4PhysicalVolumeModel&) which is called from here. To do this, - // the scene handler should call DefinePointersToWorkingSpace - see - // below. DecommissionSpecials (G4PhysicalVolumeModel&) is also - // called from here. To see how this works, look at the - // implementation of this function and - // G4VSceneHandler::Establish/DecommissionSpecials. + // G4VGraphicsScene). G4String GetCurrentDescription () const; // A description which depends on the current state of the model. @@ -109,17 +108,11 @@ public: // With description G4String GetCurrentTag () const; // A tag which depends on the current state of the model. - const G4PhysicalVolumeModel* GetG4PhysicalVolumeModel () const - {return this;} - - G4PhysicalVolumeModel* GetG4PhysicalVolumeModel () - {return this;} - G4VPhysicalVolume* GetTopPhysicalVolume () const {return fpTopPV;} G4int GetRequestedDepth () const {return fRequestedDepth;} - const G4Polyhedron* GetClippingVolume () const + const G4Polyhedron* GetClippingPolyhedron () const {return fpClippingPolyhedron;} G4int GetCurrentDepth() const {return fCurrentDepth;} @@ -147,6 +140,19 @@ public: // With description // and there will already be a node in place on which to hang the // current volume. + const std::map* GetAttDefs() const; + // Attribute definitions for current solid. + + std::vector* CreateCurrentAttValues() const; + // Attribute values for current solid. Each must refer to an + // attribute definition in the above map; its name is the key. The + // user must test the validity of this pointer (it must be non-zero + // and conform to the G4AttDefs, which may be checked with + // G4AttCheck) and delete the list after use. See + // G4XXXStoredSceneHandler::PreAddSolid for how to access and + // G4VTrajectory::ShowTrajectory for an example of the use of + // G4Atts. + void SetRequestedDepth (G4int requestedDepth) { fRequestedDepth = requestedDepth; } @@ -155,19 +161,13 @@ public: // With description fpClippingPolyhedron = pClippingPolyhedron; } + void SetClippingMode (ClippingMode mode) { + fClippingMode = mode; + } + G4bool Validate (G4bool warn); // Validate, but allow internal changes (hence non-const function). - void DefinePointersToWorkingSpace - (G4int* pCurrentDepth = 0, - G4VPhysicalVolume** ppCurrentPV = 0, - G4LogicalVolume** ppCurrentLV = 0, - G4Material** ppCurrentMaterial = 0, - std::vector* pDrawnPVPath = 0); - // For use (optional) by the scene handler if it needs to know about - // the current information maintained through these pointers. For - // description of pointers, see below. - void CurtailDescent() {fCurtailDescent = true;} protected: @@ -206,17 +206,9 @@ protected: G4LogicalVolume* fpCurrentLV; // Current logical volume. G4Material* fpCurrentMaterial; // Current material. std::vector fDrawnPVPath; - G4bool fCurtailDescent; // Can be set to curtail descent. + G4bool fCurtailDescent;// Can be set to curtail descent. const G4Polyhedron*fpClippingPolyhedron; - - //////////////////////////////////////////////////////////// - // Pointers to working space in scene handler, if required. - - G4int* fpCurrentDepth; // Current depth of geom. hierarchy. - G4VPhysicalVolume** fppCurrentPV; // Current physical volume. - G4LogicalVolume** fppCurrentLV; // Current logical volume. - G4Material** fppCurrentMaterial; // Current material. - std::vector* fpDrawnPVPath; + ClippingMode fClippingMode; private: diff --git a/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.hh b/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.hh index 86da53cff8..f8345b6cd6 100644 --- a/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.hh +++ b/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.hh @@ -25,7 +25,7 @@ // // // $Id: G4PhysicalVolumeSearchScene.hh,v 1.17 2006/06/29 21:30:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 10th August 1998. diff --git a/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.icc b/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.icc index 95d4fea37e..e01ce05ec4 100644 --- a/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.icc +++ b/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.icc @@ -25,7 +25,7 @@ // // // $Id: G4PhysicalVolumeSearchScene.icc,v 1.6 2006/06/29 21:30:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 10th August 1998. diff --git a/source/visualization/modeling/include/G4ScaleModel.hh b/source/visualization/modeling/include/G4ScaleModel.hh index e26ad7dc01..09d0702b53 100644 --- a/source/visualization/modeling/include/G4ScaleModel.hh +++ b/source/visualization/modeling/include/G4ScaleModel.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4ScaleModel.hh,v 1.3 2006/06/29 21:31:10 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ScaleModel.hh,v 1.4 2006/11/01 10:28:42 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 21st July 2001. @@ -55,12 +55,6 @@ public: // With description virtual void DescribeYourselfTo (G4VGraphicsScene&); // The main task of a model is to describe itself to the graphics scene. - virtual G4String GetCurrentDescription () const; - // A description which depends on the current state of the model. - - virtual G4String GetCurrentTag () const; - // A tag which depends on the current state of the model. - private: // Private copy contructor and assignment to forbid use... @@ -70,6 +64,4 @@ private: G4Scale fScale; }; -#include "G4ScaleModel.icc" - #endif diff --git a/source/visualization/modeling/include/G4ScaleModel.icc b/source/visualization/modeling/include/G4ScaleModel.icc deleted file mode 100644 index fc6f0e1c2b..0000000000 --- a/source/visualization/modeling/include/G4ScaleModel.icc +++ /dev/null @@ -1,36 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: G4ScaleModel.icc,v 1.3 2006/06/29 21:31:35 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ - -inline G4String G4ScaleModel::GetCurrentTag () const { - return fGlobalTag; -} - -inline G4String G4ScaleModel::GetCurrentDescription () const { - return fGlobalDescription; -} diff --git a/source/visualization/modeling/include/G4TextModel.hh b/source/visualization/modeling/include/G4TextModel.hh index 141f985c8c..d9ec4c0a8f 100644 --- a/source/visualization/modeling/include/G4TextModel.hh +++ b/source/visualization/modeling/include/G4TextModel.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4TextModel.hh,v 1.6 2006/06/29 21:31:39 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4TextModel.hh,v 1.7 2006/11/01 10:28:42 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 3rd April 2001 @@ -55,12 +55,6 @@ public: // With description virtual void DescribeYourselfTo (G4VGraphicsScene&); // The main task of a model is to describe itself to the graphics scene. - virtual G4String GetCurrentDescription () const; - // A description which depends on the current state of the model. - - virtual G4String GetCurrentTag () const; - // A tag which depends on the current state of the model. - private: // Private copy contructor and assignment to forbid use... @@ -71,6 +65,4 @@ private: }; -#include "G4TextModel.icc" - #endif diff --git a/source/visualization/modeling/include/G4TextModel.icc b/source/visualization/modeling/include/G4TextModel.icc deleted file mode 100644 index fb123c24b9..0000000000 --- a/source/visualization/modeling/include/G4TextModel.icc +++ /dev/null @@ -1,36 +0,0 @@ -// -// ******************************************************************** -// * License and Disclaimer * -// * * -// * The Geant4 software is copyright of the Copyright Holders of * -// * the Geant4 Collaboration. It is provided under the terms and * -// * conditions of the Geant4 Software License, included in the file * -// * LICENSE and available at http://cern.ch/geant4/license . These * -// * include a list of copyright holders. * -// * * -// * Neither the authors of this software system, nor their employing * -// * institutes,nor the agencies providing financial support for this * -// * work make any representation or warranty, express or implied, * -// * regarding this software system or assume any liability for its * -// * use. Please see the license in the file LICENSE and URL above * -// * for the full disclaimer and the limitation of liability. * -// * * -// * This code implementation is the result of the scientific and * -// * technical work of the GEANT4 collaboration. * -// * By using, copying, modifying or distributing the software (or * -// * any work based on the software) you agree to acknowledge its * -// * use in resulting scientific publications, and indicate your * -// * acceptance of all terms of the Geant4 Software license. * -// ******************************************************************** -// -// -// $Id: G4TextModel.icc,v 1.4 2006/06/29 21:31:41 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ - -inline G4String G4TextModel::GetCurrentTag () const { - return fGlobalTag; -} - -inline G4String G4TextModel::GetCurrentDescription () const { - return fGlobalDescription; -} diff --git a/source/visualization/modeling/include/G4TrajectoriesModel.hh b/source/visualization/modeling/include/G4TrajectoriesModel.hh index b64447c642..eaef56e200 100644 --- a/source/visualization/modeling/include/G4TrajectoriesModel.hh +++ b/source/visualization/modeling/include/G4TrajectoriesModel.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4TrajectoriesModel.hh,v 1.9 2006/06/29 21:31:43 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4TrajectoriesModel.hh,v 1.10 2006/10/26 11:10:23 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 26th August 1998. @@ -43,6 +43,8 @@ #include "G4VModel.hh" +class G4VTrajectory; + class G4TrajectoriesModel: public G4VModel { public: // With description @@ -54,21 +56,17 @@ public: // With description virtual void DescribeYourselfTo (G4VGraphicsScene&); // The main task of a model is to describe itself to the graphics scene. - virtual G4String GetCurrentDescription () const; - // A description which depends on the current state of the model. - - virtual G4String GetCurrentTag () const; - // A tag which depends on the current state of the model. - G4int GetDrawingMode() const { return fDrawingMode;} void SetDrawingMode(G4int drawingMode) {fDrawingMode = drawingMode;} + const G4VTrajectory* GetCurrentTrajectory() const + {return fpCurrentTrajectory;} + private: G4int fDrawingMode; + const G4VTrajectory* fpCurrentTrajectory; }; -#include "G4TrajectoriesModel.icc" - #endif diff --git a/source/visualization/modeling/include/G4TrajectoryChargeFilter.hh b/source/visualization/modeling/include/G4TrajectoryChargeFilter.hh index 6f25ff8923..66dbfa6982 100644 --- a/source/visualization/modeling/include/G4TrajectoryChargeFilter.hh +++ b/source/visualization/modeling/include/G4TrajectoryChargeFilter.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4TrajectoryChargeFilter.hh,v 1.2 2006/06/29 21:31:47 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4TrajectoryChargeFilter.hh,v 1.3 2006/08/25 19:44:14 tinslay Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Filter trajectories according to charge. Only registered // charges will pass the filter. @@ -48,7 +48,7 @@ public: // With description virtual ~G4TrajectoryChargeFilter(); // Evaluate this trajectory - virtual bool Evaluate(const G4VTrajectory&); + virtual bool Evaluate(const G4VTrajectory&) const; // Print configuration virtual void Print(std::ostream& ostr) const; diff --git a/source/visualization/modeling/include/G4TrajectoryDrawByAttribute.hh b/source/visualization/modeling/include/G4TrajectoryDrawByAttribute.hh new file mode 100644 index 0000000000..65294fe995 --- /dev/null +++ b/source/visualization/modeling/include/G4TrajectoryDrawByAttribute.hh @@ -0,0 +1,83 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4TrajectoryDrawByAttribute.hh,v 1.1 2006/09/11 21:52:18 tinslay Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// Jane Tinslay September 2006 +// +// Draw trajectories according to attribute. +// +#ifndef G4TRAJECTORYDRAWBYATTRIBUTE_HH +#define G4TRAJECTORYDRAWBYATTRIBUTE_HH + +#include "globals.hh" +#include "G4VTrajectoryModel.hh" +#include + +class G4VAttValueFilter; +class G4VisTrajContext; + +class G4TrajectoryDrawByAttribute : public G4VTrajectoryModel { + +public: + + // Constructor + G4TrajectoryDrawByAttribute(const G4String& name = "Unspecified", G4VisTrajContext* context=0); + + // Destructor + virtual ~G4TrajectoryDrawByAttribute(); + + // Draw the trajectory with optional i_mode parameter + virtual void Draw(const G4VTrajectory& trajectory, const G4int& i_mode = 0, + const G4bool& visible = true) const; + + // Print configuration + virtual void Print(std::ostream& ostr) const; + + // Configuration methods + void Set(const G4String& attribute); + void AddIntervalContext(const G4String& name, G4VisTrajContext* context); + void AddValueContext(const G4String& name, G4VisTrajContext* context); + +private: + + enum Config {Interval, SingleValue}; + + typedef std::pair Pair; + typedef std::map ContextMap; + + // Data members + G4String fAttName; + ContextMap fContextMap; + + // Caching + mutable G4bool fFirst; + mutable G4bool fWarnedMissingAttribute; + mutable G4VAttValueFilter* filter; + +}; + +#endif diff --git a/source/visualization/modeling/include/G4TrajectoryDrawByCharge.hh b/source/visualization/modeling/include/G4TrajectoryDrawByCharge.hh index d097963b9e..e2cf83ed4c 100644 --- a/source/visualization/modeling/include/G4TrajectoryDrawByCharge.hh +++ b/source/visualization/modeling/include/G4TrajectoryDrawByCharge.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4TrajectoryDrawByCharge.hh,v 1.7 2006/06/29 21:31:49 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Jane Tinslay, John Allison, Joseph Perl November 2005 // diff --git a/source/visualization/modeling/include/G4TrajectoryDrawByOriginVolume.hh b/source/visualization/modeling/include/G4TrajectoryDrawByOriginVolume.hh index f93ba551f2..b1f9dc8f38 100644 --- a/source/visualization/modeling/include/G4TrajectoryDrawByOriginVolume.hh +++ b/source/visualization/modeling/include/G4TrajectoryDrawByOriginVolume.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4TrajectoryDrawByOriginVolume.hh,v 1.4 2006/06/29 21:31:51 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Class Description: // Trajectory model which colours a trajectory according to diff --git a/source/visualization/modeling/include/G4TrajectoryDrawByParticleID.hh b/source/visualization/modeling/include/G4TrajectoryDrawByParticleID.hh index ec1d0fc78c..080a7c0189 100644 --- a/source/visualization/modeling/include/G4TrajectoryDrawByParticleID.hh +++ b/source/visualization/modeling/include/G4TrajectoryDrawByParticleID.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4TrajectoryDrawByParticleID.hh,v 1.7 2006/06/29 21:31:53 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Jane Tinslay, John Allison, Joseph Perl November 2005 // diff --git a/source/visualization/modeling/include/G4TrajectoryDrawerUtils.hh b/source/visualization/modeling/include/G4TrajectoryDrawerUtils.hh index 51859906aa..d96323172d 100644 --- a/source/visualization/modeling/include/G4TrajectoryDrawerUtils.hh +++ b/source/visualization/modeling/include/G4TrajectoryDrawerUtils.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4TrajectoryDrawerUtils.hh,v 1.6 2006/06/29 21:31:55 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Jane Tinslay, John Allison, Joseph Perl November 2005 // diff --git a/source/visualization/modeling/include/G4TrajectoryFilterFactories.hh b/source/visualization/modeling/include/G4TrajectoryFilterFactories.hh index 8ec3ebafbf..6404964b36 100644 --- a/source/visualization/modeling/include/G4TrajectoryFilterFactories.hh +++ b/source/visualization/modeling/include/G4TrajectoryFilterFactories.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -/// $Id: G4TrajectoryFilterFactories.hh,v 1.3 2006/06/29 21:31:57 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +/// $Id: G4TrajectoryFilterFactories.hh,v 1.4 2006/09/12 18:53:03 tinslay Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Trajectory filter model factories creating filters @@ -39,6 +39,22 @@ #include "G4VModelFactory.hh" #include "G4VTrajectory.hh" +// Attribute filter +class G4TrajectoryAttributeFilterFactory : public G4VModelFactory< G4VFilter > { + +public: // With description + + typedef std::vector Messengers; + typedef std::pair< G4VFilter *, Messengers > ModelAndMessengers; + + G4TrajectoryAttributeFilterFactory(); + + virtual ~G4TrajectoryAttributeFilterFactory(); + + ModelAndMessengers Create(const G4String& placement, const G4String& name); + +}; + // Charge filter class G4TrajectoryChargeFilterFactory : public G4VModelFactory< G4VFilter > { diff --git a/source/visualization/modeling/include/G4TrajectoryGenericDrawer.hh b/source/visualization/modeling/include/G4TrajectoryGenericDrawer.hh index 1f810bc110..c26471f381 100644 --- a/source/visualization/modeling/include/G4TrajectoryGenericDrawer.hh +++ b/source/visualization/modeling/include/G4TrajectoryGenericDrawer.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4TrajectoryGenericDrawer.hh,v 1.2 2006/06/29 21:31:59 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Jane Tinslay, John Allison, Joseph Perl November 2005 // diff --git a/source/visualization/modeling/include/G4TrajectoryModelFactories.hh b/source/visualization/modeling/include/G4TrajectoryModelFactories.hh index aa328eb66d..e0e3d2f7ec 100644 --- a/source/visualization/modeling/include/G4TrajectoryModelFactories.hh +++ b/source/visualization/modeling/include/G4TrajectoryModelFactories.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4TrajectoryModelFactories.hh,v 1.5 2006/06/29 21:32:01 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4TrajectoryModelFactories.hh,v 1.6 2006/09/12 18:53:03 tinslay Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Jane Tinslay, John Allison, Joseph Perl October 2005 // @@ -44,6 +44,18 @@ namespace { typedef std::pair ModelAndMessengers; } +class G4TrajectoryDrawByAttributeFactory : public G4VModelFactory { + +public: // With description + + G4TrajectoryDrawByAttributeFactory(); + + virtual ~G4TrajectoryDrawByAttributeFactory(); + + ModelAndMessengers Create(const G4String& placement, const G4String& name); + +}; + class G4TrajectoryDrawByChargeFactory : public G4VModelFactory { public: // With description diff --git a/source/visualization/modeling/include/G4TrajectoryOriginVolumeFilter.hh b/source/visualization/modeling/include/G4TrajectoryOriginVolumeFilter.hh index 6689ebf04b..be306bd4d4 100644 --- a/source/visualization/modeling/include/G4TrajectoryOriginVolumeFilter.hh +++ b/source/visualization/modeling/include/G4TrajectoryOriginVolumeFilter.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4TrajectoryOriginVolumeFilter.hh,v 1.2 2006/06/29 21:32:03 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4TrajectoryOriginVolumeFilter.hh,v 1.3 2006/08/25 19:44:14 tinslay Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Filter trajectories according to volume name. Only registered // volumes will pass the filter. @@ -48,7 +48,7 @@ public: // With description virtual ~G4TrajectoryOriginVolumeFilter(); // Evaluate this trajectory - virtual bool Evaluate(const G4VTrajectory&); + virtual bool Evaluate(const G4VTrajectory&) const; // Print configuration virtual void Print(std::ostream& ostr) const; diff --git a/source/visualization/modeling/include/G4TrajectoryParticleFilter.hh b/source/visualization/modeling/include/G4TrajectoryParticleFilter.hh index 0b6d303400..54901f51fa 100644 --- a/source/visualization/modeling/include/G4TrajectoryParticleFilter.hh +++ b/source/visualization/modeling/include/G4TrajectoryParticleFilter.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4TrajectoryParticleFilter.hh,v 1.2 2006/06/29 21:32:05 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4TrajectoryParticleFilter.hh,v 1.3 2006/08/25 19:44:14 tinslay Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Filter trajectories according to particle type. Only registered // particle types will pass the filter. @@ -48,7 +48,7 @@ public: // With description virtual ~G4TrajectoryParticleFilter(); // Evaluate this trajectory - virtual bool Evaluate(const G4VTrajectory&); + virtual bool Evaluate(const G4VTrajectory&) const; // Print configuration virtual void Print(std::ostream& ostr) const; diff --git a/source/visualization/modeling/include/G4VAttValueFilter.hh b/source/visualization/modeling/include/G4VAttValueFilter.hh new file mode 100644 index 0000000000..b0b47912b3 --- /dev/null +++ b/source/visualization/modeling/include/G4VAttValueFilter.hh @@ -0,0 +1,69 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4VAttValueFilter.hh,v 1.2 2006/12/13 15:50:04 gunter Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// Abstract base class for G4AttValue filters +// +// Jane Tinslay, September 2006 +// +#ifndef G4VATTVALUEFILTER_HH +#define G4VATTVALUEFILTER_HH + +#include "globals.hh" +#include "G4String.hh" +#include "G4VFilter.hh" + +class G4AttValue; + +class G4VAttValueFilter : public G4VFilter { + +public: + + // Constructor + G4VAttValueFilter(const G4String& name = "G4AttValueFilter") + :G4VFilter(name){} + + // Destructor + virtual ~G4VAttValueFilter() {} + + // Filter methods + virtual G4bool Accept(const G4AttValue&) const = 0; + virtual G4bool GetValidElement(const G4AttValue&, G4String&) const = 0; + + // Print configuration + virtual void PrintAll(std::ostream& ostr) const = 0; + + // Reset + virtual void Reset() = 0; + + // Load filter data + virtual void LoadIntervalElement(const G4String&) = 0; + virtual void LoadSingleValueElement(const G4String&) = 0; + +}; + +#endif diff --git a/source/visualization/modeling/include/G4VModel.hh b/source/visualization/modeling/include/G4VModel.hh index 167c68fe45..1ff587b2ce 100644 --- a/source/visualization/modeling/include/G4VModel.hh +++ b/source/visualization/modeling/include/G4VModel.hh @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VModel.hh,v 1.18 2006/06/29 21:32:07 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VModel.hh,v 1.19 2006/07/10 16:09:30 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 31st December 1997. @@ -88,10 +88,6 @@ public: // With description // world. It is the responsibility of the model to apply this // transformation before passing items to the graphics scene. - virtual const G4PhysicalVolumeModel* GetG4PhysicalVolumeModel () const; - virtual G4PhysicalVolumeModel* GetG4PhysicalVolumeModel (); - // Returns 0 unless implemented by derived class. - // Set methods for above... void SetModelingParameters (const G4ModelingParameters*); void SetExtent (const G4VisExtent&); diff --git a/source/visualization/modeling/include/G4VModel.icc b/source/visualization/modeling/include/G4VModel.icc index 3f1e23578a..c3abe9f136 100644 --- a/source/visualization/modeling/include/G4VModel.icc +++ b/source/visualization/modeling/include/G4VModel.icc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VModel.icc,v 1.11 2006/06/29 21:32:11 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VModel.icc,v 1.12 2006/07/10 16:09:30 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 31st December 1997. @@ -51,15 +51,6 @@ inline const G4Transform3D& G4VModel::GetTransformation () const { return fTransform; } -inline const G4PhysicalVolumeModel* - G4VModel::GetG4PhysicalVolumeModel () const { - return 0; -} - -inline G4PhysicalVolumeModel* G4VModel::GetG4PhysicalVolumeModel () { - return 0; -} - inline void G4VModel::SetModelingParameters (const G4ModelingParameters* pMP) { fpMP = pMP; } diff --git a/source/visualization/modeling/include/G4VModelCommand.hh b/source/visualization/modeling/include/G4VModelCommand.hh index b67a45a815..ec75ab4871 100644 --- a/source/visualization/modeling/include/G4VModelCommand.hh +++ b/source/visualization/modeling/include/G4VModelCommand.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4VModelCommand.hh,v 1.3 2006/06/29 21:32:27 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VModelCommand.hh,v 1.4 2006/09/11 21:22:02 tinslay Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Jane Tinslay, John Allison, Joseph Perl November 2005 // @@ -45,29 +45,34 @@ class G4UIcommand; template class G4VModelCommand : public G4UImessenger { -public: // With description +public: - G4VModelCommand(T* model); - // Input model + // Constructor + G4VModelCommand(T* model, const G4String& placement=""); + // Destructor virtual ~G4VModelCommand(); + // Methods G4String GetCurrentValue(G4UIcommand* command); + G4String Placement(); protected: - T* Model(); // Access to model + T* Model(); private: + // Data members T* fpModel; - + G4String fPlacement; }; template -G4VModelCommand::G4VModelCommand(T* model) +G4VModelCommand::G4VModelCommand(T* model, const G4String& placement) :fpModel(model) + ,fPlacement(placement) {} template @@ -87,6 +92,13 @@ G4VModelCommand::Model() return fpModel; } +template +G4String +G4VModelCommand::Placement() +{ + return fPlacement; +} + #endif diff --git a/source/visualization/modeling/include/G4VModelFactory.hh b/source/visualization/modeling/include/G4VModelFactory.hh index 77fbde25e4..83b01f7405 100644 --- a/source/visualization/modeling/include/G4VModelFactory.hh +++ b/source/visualization/modeling/include/G4VModelFactory.hh @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4VModelFactory.hh,v 1.6 2006/06/29 21:32:30 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Jane Tinslay, John Allison, Joseph Perl October 2005 // diff --git a/source/visualization/modeling/include/G4VTrajectoryModel.hh b/source/visualization/modeling/include/G4VTrajectoryModel.hh index 368417f20c..8e4ff71d98 100644 --- a/source/visualization/modeling/include/G4VTrajectoryModel.hh +++ b/source/visualization/modeling/include/G4VTrajectoryModel.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4VTrajectoryModel.hh,v 1.6 2006/06/29 21:32:32 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VTrajectoryModel.hh,v 1.7 2006/08/14 11:43:34 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Jane Tinslay, John Allison, Joseph Perl October 2005 // @@ -53,7 +53,7 @@ public: virtual ~G4VTrajectoryModel(); // Draw method - virtual void Draw(const G4VTrajectory& model, const G4int& i_mode = 0, + virtual void Draw(const G4VTrajectory& trajectory, const G4int& i_mode = 0, const G4bool& visible = true) const = 0; // Print configuration diff --git a/source/visualization/modeling/include/G4VisTrajContext.hh b/source/visualization/modeling/include/G4VisTrajContext.hh index 40b9e5516b..7d59a0e33d 100644 --- a/source/visualization/modeling/include/G4VisTrajContext.hh +++ b/source/visualization/modeling/include/G4VisTrajContext.hh @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4VisTrajContext.hh,v 1.2 2006/06/29 21:32:34 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VisTrajContext.hh,v 1.3 2006/08/14 11:47:53 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Jane Tinslay May 2006 // @@ -99,6 +99,9 @@ public: void SetStepPtsVisible(const G4bool& visible); G4bool GetStepPtsVisible() const; + void SetTimeSliceInterval(const G4double& interval); + G4double GetTimeSliceInterval() const; + private: // Data members @@ -125,6 +128,9 @@ private: G4Colour fStepPtsColour; G4bool fStepPtsVisible; + // Time slicing + G4double fTimeSliceInterval; + }; #include "G4VisTrajContext.icc" diff --git a/source/visualization/modeling/include/G4VisTrajContext.icc b/source/visualization/modeling/include/G4VisTrajContext.icc index 8c6817abcb..72d26a902f 100644 --- a/source/visualization/modeling/include/G4VisTrajContext.icc +++ b/source/visualization/modeling/include/G4VisTrajContext.icc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4VisTrajContext.icc,v 1.2 2006/06/29 21:32:36 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VisTrajContext.icc,v 1.3 2006/08/14 11:47:53 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Jane Tinslay May 2006 // @@ -88,6 +88,11 @@ inline G4Colour G4VisTrajContext::GetStepPtsColour() const {return fStepPtsColou inline void G4VisTrajContext::SetStepPtsVisible(const G4bool& visible) {fStepPtsVisible = visible;} inline G4bool G4VisTrajContext::GetStepPtsVisible() const {return fStepPtsVisible;} +inline void G4VisTrajContext::SetTimeSliceInterval(const G4double& interval) {fTimeSliceInterval = interval;} +inline G4double G4VisTrajContext::GetTimeSliceInterval() const {return fTimeSliceInterval;} + +#include "G4UnitsTable.hh" + inline void G4VisTrajContext::Print(std::ostream& ostr) const { ostr<<"Name: "< + +namespace G4AttFilterUtils { + + namespace { + template + G4VAttValueFilter* newFilter() { + return new G4AttValueFilterT; + } + } + + // Create new G4AttValue filter factory + G4AttValueFilterFactory* GetAttValueFilterFactory() { + static G4AttValueFilterFactory* factory = new G4AttValueFilterFactory; + static G4bool init(false); + + if (!init) { + // Register typekey<->creator pairs + factory->Register(G4TypeKeyT(), newFilter); + factory->Register(G4TypeKeyT(), newFilter); + factory->Register(G4TypeKeyT(), newFilter); + factory->Register(G4TypeKeyT(), newFilter); + factory->Register(G4TypeKeyT(), newFilter); + factory->Register(G4TypeKeyT(), newFilter); + factory->Register(G4TypeKeyT(), newFilter); + init = true; + } + + return factory; + } + + G4VAttValueFilter* GetNewFilter(const G4AttDef& def) { + + G4TypeKey myKey = def.GetTypeKey(); + + // Get correct type key if original G4AttDef's being used + if (!myKey.IsValid()) { + myKey = G4AttUtils::GetKey(def); + } + + // Should be valid now + assert(myKey.IsValid()); + + G4AttValueFilterFactory* factory = GetAttValueFilterFactory(); + + G4VAttValueFilter* filter = factory->Create(myKey); + assert (0 != filter); + + return filter; + } + +} diff --git a/source/visualization/modeling/src/G4AxesModel.cc b/source/visualization/modeling/src/G4AxesModel.cc index 863272c18b..d0408db15c 100644 --- a/source/visualization/modeling/src/G4AxesModel.cc +++ b/source/visualization/modeling/src/G4AxesModel.cc @@ -25,7 +25,7 @@ // // // $Id: G4AxesModel.cc,v 1.6 2006/06/29 21:32:38 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 3rd April 2001 diff --git a/source/visualization/modeling/src/G4BoundingSphereScene.cc b/source/visualization/modeling/src/G4BoundingSphereScene.cc index c25e5d0009..146aae384a 100644 --- a/source/visualization/modeling/src/G4BoundingSphereScene.cc +++ b/source/visualization/modeling/src/G4BoundingSphereScene.cc @@ -25,7 +25,7 @@ // // // $Id: G4BoundingSphereScene.cc,v 1.11 2006/06/29 21:32:40 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 7th June 1997 diff --git a/source/visualization/modeling/src/G4FlavoredParallelWorldModel.cc b/source/visualization/modeling/src/G4FlavoredParallelWorldModel.cc index 50734d439d..8b91adf04e 100644 --- a/source/visualization/modeling/src/G4FlavoredParallelWorldModel.cc +++ b/source/visualization/modeling/src/G4FlavoredParallelWorldModel.cc @@ -25,7 +25,7 @@ // // // $Id: G4FlavoredParallelWorldModel.cc,v 1.7 2006/06/29 21:32:42 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // P. Mora de Freitas et M.Verderi - 19 June 1998. // Model for flavored parallel world volumes. diff --git a/source/visualization/modeling/src/G4HitFilterFactories.cc b/source/visualization/modeling/src/G4HitFilterFactories.cc new file mode 100644 index 0000000000..6d9ec7bb61 --- /dev/null +++ b/source/visualization/modeling/src/G4HitFilterFactories.cc @@ -0,0 +1,66 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +/// $Id: G4HitFilterFactories.cc,v 1.1 2006/09/12 18:53:03 tinslay Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// +// Trajectory filter model factories creating filters +// and associated messengers. +// +// Jane Tinslay March 2006 +// +#include "G4ModelCommandsT.hh" +#include "G4HitFilterFactories.hh" +#include "G4AttributeFilterT.hh" + +// Attribute filter +G4HitAttributeFilterFactory::G4HitAttributeFilterFactory() + :G4VModelFactory< G4VFilter >("attributeFilter") +{} + +G4HitAttributeFilterFactory::~G4HitAttributeFilterFactory() {} + +G4HitAttributeFilterFactory::ModelAndMessengers +G4HitAttributeFilterFactory::Create(const G4String& placement, const G4String& name) +{ + typedef G4AttributeFilterT G4HitAttributeFilter; + // Create model + G4HitAttributeFilter* model = new G4HitAttributeFilter(name); + + // Create associated messengers + Messengers messengers; + + messengers.push_back(new G4ModelCmdSetString(model, placement, "setAttribute")); + messengers.push_back(new G4ModelCmdInvert(model, placement)); + messengers.push_back(new G4ModelCmdActive(model, placement)); + messengers.push_back(new G4ModelCmdVerbose(model, placement)); + messengers.push_back(new G4ModelCmdReset(model, placement)); + messengers.push_back(new G4ModelCmdAddInterval(model, placement, "addInterval")); + messengers.push_back(new G4ModelCmdAddValue(model, placement, "addValue")); + + return ModelAndMessengers(model, messengers); +} + diff --git a/source/visualization/modeling/src/G4HitsModel.cc b/source/visualization/modeling/src/G4HitsModel.cc index aecf21edd7..eea7b03861 100644 --- a/source/visualization/modeling/src/G4HitsModel.cc +++ b/source/visualization/modeling/src/G4HitsModel.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4HitsModel.cc,v 1.15 2006/06/29 21:32:44 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4HitsModel.cc,v 1.18 2006/11/14 14:42:08 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 26th August 1998. @@ -33,20 +33,22 @@ #include "G4HitsModel.hh" +#include "G4ModelingParameters.hh" #include "G4VGraphicsScene.hh" -#include "G4EventManager.hh" #include "G4Event.hh" G4HitsModel::~G4HitsModel () {} -G4HitsModel::G4HitsModel () { +G4HitsModel::G4HitsModel (): + fpCurrentHit(0) +{ fGlobalTag = "G4HitsModel for all hits."; fGlobalDescription = fGlobalTag; } -void G4HitsModel::DescribeYourselfTo (G4VGraphicsScene& sceneHandler) { - const G4Event* event = - G4EventManager::GetEventManager()->GetConstCurrentEvent(); +void G4HitsModel::DescribeYourselfTo (G4VGraphicsScene& sceneHandler) +{ + const G4Event* event = fpMP->GetEvent(); if (event) { G4HCofThisEvent* HCE = event -> GetHCofThisEvent (); if (HCE) { @@ -55,8 +57,8 @@ void G4HitsModel::DescribeYourselfTo (G4VGraphicsScene& sceneHandler) { G4VHitsCollection* HC = HCE -> GetHC (iHC); if (HC) { for(size_t iHit = 0; iHit < HC->GetSize(); ++iHit) { - G4VHit* hit = HC -> GetHit (iHit); - sceneHandler.AddCompound (*hit); + fpCurrentHit = HC -> GetHit (iHit); + if (fpCurrentHit) sceneHandler.AddCompound (*fpCurrentHit); } } } diff --git a/source/visualization/modeling/src/G4LogicalVolumeModel.cc b/source/visualization/modeling/src/G4LogicalVolumeModel.cc index 56a110535d..63a8d7e67d 100644 --- a/source/visualization/modeling/src/G4LogicalVolumeModel.cc +++ b/source/visualization/modeling/src/G4LogicalVolumeModel.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4LogicalVolumeModel.cc,v 1.13 2006/06/29 21:32:46 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4LogicalVolumeModel.cc,v 1.14 2006/11/01 10:28:42 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 26th July 1999. @@ -79,10 +79,6 @@ G4LogicalVolumeModel::G4LogicalVolumeModel G4LogicalVolumeModel::~G4LogicalVolumeModel () {} -G4String G4LogicalVolumeModel::GetCurrentDescription () const { - return "G4LogicalVolumeModel " + GetCurrentTag (); -} - void G4LogicalVolumeModel::DescribeYourselfTo (G4VGraphicsScene& sceneHandler) { diff --git a/source/visualization/modeling/src/G4ModelingParameters.cc b/source/visualization/modeling/src/G4ModelingParameters.cc index 6f3b08fba4..3f8430b7af 100644 --- a/source/visualization/modeling/src/G4ModelingParameters.cc +++ b/source/visualization/modeling/src/G4ModelingParameters.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4ModelingParameters.cc,v 1.10 2006/06/29 21:32:48 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4ModelingParameters.cc,v 1.15 2006/11/14 14:42:08 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 31st December 1997. @@ -36,77 +36,27 @@ #include "G4ios.hh" #include "G4VisAttributes.hh" #include "G4ExceptionSeverity.hh" +#include "G4Polyhedron.hh" G4ModelingParameters::G4ModelingParameters (): + fWarning (true), fpDefaultVisAttributes (0), fDrawingStyle (wf), - fRepStyle (polyhedron), fCulling (false), fCullInvisible (false), fDensityCulling (false), fVisibleDensity (0.01 * g / cm3), fCullCovered (false), + fExplodeFactor (1.), fNoOfSides (24), - fViewGeom (true), - fViewHits (true), - fViewDigis (true) + fpSectionPolyhedron (0), + fpCutawayPolyhedron (0), + fpEvent (0) {} G4ModelingParameters::G4ModelingParameters (const G4VisAttributes* pDefaultVisAttributes, - G4ModelingParameters::RepStyle repStyle, - G4bool isCulling, - G4bool isCullingInvisible, - G4bool isDensityCulling, - G4double visibleDensity, - G4bool isCullingCovered, - G4int noOfSides - ): - fpDefaultVisAttributes (pDefaultVisAttributes), - fDrawingStyle (wf), - fRepStyle (repStyle), - fCulling (isCulling), - fCullInvisible (isCullingInvisible), - fDensityCulling (isDensityCulling), - fVisibleDensity (visibleDensity), - fCullCovered (isCullingCovered), - fNoOfSides (noOfSides), - fViewGeom (true), - fViewHits (true), - fViewDigis (true) -{} - -G4ModelingParameters::G4ModelingParameters -(const G4VisAttributes* pDefaultVisAttributes, - G4ModelingParameters::RepStyle repStyle, - G4bool isCulling, - G4bool isCullingInvisible, - G4bool isDensityCulling, - G4double visibleDensity, - G4bool isCullingCovered, - G4int noOfSides, - G4bool isViewGeom, - G4bool isViewHits, - G4bool isViewDigis - ): - fpDefaultVisAttributes (pDefaultVisAttributes), - fDrawingStyle (wf), - fRepStyle (repStyle), - fCulling (isCulling), - fCullInvisible (isCullingInvisible), - fDensityCulling (isDensityCulling), - fVisibleDensity (visibleDensity), - fCullCovered (isCullingCovered), - fNoOfSides (noOfSides), - fViewGeom (isViewGeom), - fViewHits (isViewHits), - fViewDigis (isViewDigis) -{} - -G4ModelingParameters::G4ModelingParameters -(const G4VisAttributes* pDefaultVisAttributes, - G4ModelingParameters::DrawingStyle drawingStyle, - G4ModelingParameters::RepStyle repStyle, + G4ModelingParameters::DrawingStyle drawingStyle, G4bool isCulling, G4bool isCullingInvisible, G4bool isDensityCulling, @@ -114,58 +64,35 @@ G4ModelingParameters::G4ModelingParameters G4bool isCullingCovered, G4int noOfSides ): + fWarning (true), fpDefaultVisAttributes (pDefaultVisAttributes), fDrawingStyle (drawingStyle), - fRepStyle (repStyle), fCulling (isCulling), fCullInvisible (isCullingInvisible), fDensityCulling (isDensityCulling), fVisibleDensity (visibleDensity), fCullCovered (isCullingCovered), + fExplodeFactor (1.), fNoOfSides (noOfSides), - fViewGeom (true), - fViewHits (true), - fViewDigis (true) + fpSectionPolyhedron (0), + fpCutawayPolyhedron (0), + fpEvent (0) {} -G4ModelingParameters::G4ModelingParameters -(const G4VisAttributes* pDefaultVisAttributes, - G4ModelingParameters::DrawingStyle drawingStyle, - G4ModelingParameters::RepStyle repStyle, - G4bool isCulling, - G4bool isCullingInvisible, - G4bool isDensityCulling, - G4double visibleDensity, - G4bool isCullingCovered, - G4int noOfSides, - G4bool isViewGeom, - G4bool isViewHits, - G4bool isViewDigis - ): - fpDefaultVisAttributes (pDefaultVisAttributes), - fDrawingStyle (drawingStyle), - fRepStyle (repStyle), - fCulling (isCulling), - fCullInvisible (isCullingInvisible), - fDensityCulling (isDensityCulling), - fVisibleDensity (visibleDensity), - fCullCovered (isCullingCovered), - fNoOfSides (noOfSides), - fViewGeom (isViewGeom), - fViewHits (isViewHits), - fViewDigis (isViewDigis) -{} - -G4ModelingParameters::~G4ModelingParameters () {} +G4ModelingParameters::~G4ModelingParameters () +{ + delete fpSectionPolyhedron; + delete fpCutawayPolyhedron; +} void G4ModelingParameters::SetVisibleDensity (G4double visibleDensity) { const G4double reasonableMaximum = 10.0 * g / cm3; - if (visibleDensity < 0) { + if (visibleDensity < 0 && fWarning) { G4cout << "G4ModelingParameters::SetVisibleDensity: attempt to set negative " "density - ignored." << G4endl; } else { - if (fVisibleDensity > reasonableMaximum) { + if (fVisibleDensity > reasonableMaximum && fWarning) { G4cout << "G4ModelingParameters::SetVisibleDensity: density > " << reasonableMaximum << " g / cm3 - did you mean this?" @@ -179,35 +106,21 @@ G4int G4ModelingParameters::SetNoOfSides (G4int nSides) { const G4int nSidesMin = 12; if (nSides < nSidesMin) { nSides = nSidesMin; - G4cout << "G4ModelingParameters::SetNoOfSides: attempt to set the" - "\nnumber of sides per circle < " << nSidesMin - << "; forced to" << nSides << G4endl; + if (fWarning) + G4cout << "G4ModelingParameters::SetNoOfSides: attempt to set the" + "\nnumber of sides per circle < " << nSidesMin + << "; forced to" << nSides << G4endl; } fNoOfSides = nSides; return fNoOfSides; } -void G4ModelingParameters::PrintDifferences -(const G4ModelingParameters& that) const { - - if ( - (fpDefaultVisAttributes != that.fpDefaultVisAttributes) || - (fDrawingStyle != that.fDrawingStyle) || - (fRepStyle != that.fRepStyle) || - (fCulling != that.fCulling) || - (fCullInvisible != that.fCullInvisible) || - (fDensityCulling != that.fDensityCulling) || - (fVisibleDensity != that.fVisibleDensity) || - (fCullCovered != that.fCullCovered) || - (fNoOfSides != that.fNoOfSides) || - (fViewGeom != that.fViewGeom) || - (fViewHits != that.fViewHits) || - (fViewDigis != that.fViewDigis)) - G4cout << "Difference in 1st batch." << G4endl; -} - -std::ostream& operator << (std::ostream& os, const G4ModelingParameters& mp) { - os << "Modeling parameters and options:"; +std::ostream& operator << (std::ostream& os, const G4ModelingParameters& mp) +{ + os << "Modeling parameters (warning "; + if (mp.fWarning) os << "true"; + else os << "false"; + os << "):"; const G4VisAttributes* va = mp.fpDefaultVisAttributes; os << "\n Default vis. attributes: "; @@ -227,17 +140,6 @@ std::ostream& operator << (std::ostream& os, const G4ModelingParameters& mp) { default: os << "unrecognised"; break; } - os << "\n Representation style for graphics reps, if needed: "; - switch (mp.fRepStyle) { - case G4ModelingParameters::wireframe: - os << "wireframe"; break; - case G4ModelingParameters::polyhedron: - os << "polyhedron"; break; - case G4ModelingParameters::nurbs: - os << "nurbs"; break; - default: os << "unrecognised"; break; - } - os << "\n Culling: "; if (mp.fCulling) os << "on"; else os << "off"; @@ -257,20 +159,21 @@ std::ostream& operator << (std::ostream& os, const G4ModelingParameters& mp) { if (mp.fCullCovered) os << "on"; else os << "off"; + os << "\n Explode factor: " << mp.fExplodeFactor + << " about centre: " << mp.fExplodeCentre; + os << "\n No. of sides used in circle polygon approximation: " << mp.fNoOfSides; - os << "\n View geometry: "; - if (mp.fViewGeom) os << "true"; - else os << "false"; + os << "\n Section (DCUT) polyhedron pointer: "; + if (!mp.fpSectionPolyhedron) os << "non-"; + os << "null"; - os << "\n View hits : "; - if (mp.fViewHits) os << "true"; - else os << "false"; + os << "\n Cutaway (DCUT) polyhedron pointer: "; + if (!mp.fpCutawayPolyhedron) os << "non-"; + os << "null"; - os << "\n View digits : "; - if (mp.fViewDigis) os << "true"; - else os << "false"; + os << "\n Event pointer: " << mp.fpEvent; return os; } @@ -279,17 +182,19 @@ G4bool G4ModelingParameters::operator != (const G4ModelingParameters& mp) const { if ( + (fWarning != mp.fWarning) || (*fpDefaultVisAttributes != *mp.fpDefaultVisAttributes) || - (fDrawingStyle != mp.fDrawingStyle) || - (fRepStyle != mp.fRepStyle) || (fCulling != mp.fCulling) || (fCullInvisible != mp.fCullInvisible) || (fDensityCulling != mp.fDensityCulling) || (fCullCovered != mp.fCullCovered) || + (fExplodeFactor != mp.fExplodeFactor) || + (fExplodeCentre != mp.fExplodeCentre) || (fNoOfSides != mp.fNoOfSides) || - (fViewGeom != mp.fViewGeom) || - (fViewHits != mp.fViewHits) || - (fViewDigis != mp.fViewDigis)) + (fpSectionPolyhedron != mp.fpSectionPolyhedron) || + (fpCutawayPolyhedron != mp.fpCutawayPolyhedron) || + (fpEvent != mp.fpEvent) + ) return true; if (fDensityCulling && diff --git a/source/visualization/modeling/src/G4NullModel.cc b/source/visualization/modeling/src/G4NullModel.cc index 964c825ddb..7a3d4ba12e 100644 --- a/source/visualization/modeling/src/G4NullModel.cc +++ b/source/visualization/modeling/src/G4NullModel.cc @@ -25,7 +25,7 @@ // // // $Id: G4NullModel.cc,v 1.9 2006/06/29 21:32:50 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 4th April 1998. diff --git a/source/visualization/modeling/src/G4PhysicalVolumeMassScene.cc b/source/visualization/modeling/src/G4PhysicalVolumeMassScene.cc index 08646687dc..0c2708743d 100644 --- a/source/visualization/modeling/src/G4PhysicalVolumeMassScene.cc +++ b/source/visualization/modeling/src/G4PhysicalVolumeMassScene.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4PhysicalVolumeMassScene.cc,v 1.6 2006/06/29 21:32:52 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4PhysicalVolumeMassScene.cc,v 1.7 2006/11/06 09:24:13 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 10th August 1998. @@ -82,18 +82,7 @@ void G4PhysicalVolumeMassScene::AccrueMass (const G4VSolid& solid) G4double currentDensity = pCurrentMaterial->GetDensity(); /* Using G4Polyhedron... (gives slightly different answers on Tubs, e.g.). G4Polyhedron* pPolyhedron = solid.GetPolyhedron(); - if (pPolyhedron) { - G4Material* pMaterial; - G4VPVParameterisation* pP = pCurrentPV->GetParameterisation(); - if (pP) { - pMaterial = pP -> ComputeMaterial (fPVPCount++, pCurrentPV); - } else { - pMaterial = pCurrentLV->GetMaterial(); - } - assert(pMaterial == pCurrentMaterial); - currentVolume = pPolyhedron->GetVolume(); - currentDensity = pMaterial->GetDensity(); - } else { + if (!pPolyhedron) { G4cout << "G4PhysicalVolumeMassScene::AccrueMass: WARNING:" "\n No G4Polyhedron for" << solid.GetEntityType() << diff --git a/source/visualization/modeling/src/G4PhysicalVolumeModel.cc b/source/visualization/modeling/src/G4PhysicalVolumeModel.cc index 2e45b2f91e..864b993b76 100644 --- a/source/visualization/modeling/src/G4PhysicalVolumeModel.cc +++ b/source/visualization/modeling/src/G4PhysicalVolumeModel.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4PhysicalVolumeModel.cc,v 1.47 2006/06/29 21:32:54 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4PhysicalVolumeModel.cc,v 1.57 2006/11/16 12:11:30 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 31st December 1997. @@ -45,6 +45,10 @@ #include "G4PhysicalVolumeSearchScene.hh" #include "G4TransportationManager.hh" #include "G4Polyhedron.hh" +#include "G4AttDefStore.hh" +#include "G4AttDef.hh" +#include "G4AttValue.hh" +#include "G4UnitsTable.hh" #include @@ -52,23 +56,22 @@ G4bool G4PhysicalVolumeModel::G4PhysicalVolumeNodeID::operator< (const G4PhysicalVolumeModel::G4PhysicalVolumeNodeID& right) const { if (fpPV < right.fpPV) return true; - if (fpPV == right.fpPV) return fCopyNo < right.fCopyNo; + if (fpPV == right.fpPV) { + if (fCopyNo < right.fCopyNo) return true; + if (fCopyNo == right.fCopyNo) + return fNonCulledDepth < right.fNonCulledDepth; + } return false; } -G4bool G4PhysicalVolumeModel::G4PhysicalVolumeNodeID::operator== - (const G4PhysicalVolumeModel::G4PhysicalVolumeNodeID& right) const -{ - return fpPV == right.fpPV && fCopyNo == right.fCopyNo; -} - std::ostream& operator<< (std::ostream& os, const G4PhysicalVolumeModel::G4PhysicalVolumeNodeID node) { G4VPhysicalVolume* pPV = node.GetPhysicalVolume(); if (pPV) { - os << pPV->GetName() << ':' - << node.GetCopyNo(); + os << pPV->GetName() + << ':' << node.GetCopyNo() + << '[' << node.GetNonCulledDepth() << ']'; } else { os << "Null node"; } @@ -93,11 +96,7 @@ G4PhysicalVolumeModel::G4PhysicalVolumeModel fpCurrentMaterial (0), fCurtailDescent (false), fpClippingPolyhedron (0), - fpCurrentDepth (0), - fppCurrentPV (0), - fppCurrentLV (0), - fppCurrentMaterial (0), - fpDrawnPVPath (0) + fClippingMode (subtraction) { std::ostringstream o; o << fpTopPV -> GetCopyNo (); @@ -107,7 +106,10 @@ G4PhysicalVolumeModel::G4PhysicalVolumeModel CalculateExtent (); } -G4PhysicalVolumeModel::~G4PhysicalVolumeModel () {} +G4PhysicalVolumeModel::~G4PhysicalVolumeModel () +{ + delete fpClippingPolyhedron; +} void G4PhysicalVolumeModel::CalculateExtent () { @@ -121,16 +123,13 @@ void G4PhysicalVolumeModel::CalculateExtent () const G4ModelingParameters* tempMP = fpMP; G4ModelingParameters mParams (0, // No default vis attributes needed. - G4ModelingParameters::wireframe, + G4ModelingParameters::wf, // wireframe (not relevant for this). true, // Global culling. true, // Cull invisible volumes. false, // Density culling. 0., // Density (not relevant if density culling false). true, // Cull daughters of opaque mothers. - 24, // No of sides (not relevant for this operation). - true, // View geometry. - false, // View hits - not relevant for physical volume model. - false); // View digis - not relevant for physical volume model. + 24); // No of sides (not relevant for this operation). fpMP = &mParams; DescribeYourselfTo (bsScene); G4double radius = bsScene.GetRadius(); @@ -157,13 +156,8 @@ void G4PhysicalVolumeModel::DescribeYourselfTo if (!fpMP) G4Exception ("G4PhysicalVolumeModel::DescribeYourselfTo: No modeling parameters."); - sceneHandler.EstablishSpecials (*this); - // See .hh file for explanation of this mechanism. - // For safety... fCurrentDepth = 0; - // ...and in working space in scene handler, if required... - if (fpCurrentDepth) *fpCurrentDepth = 0; G4Transform3D startingTransformation = fTransform; @@ -179,21 +173,6 @@ void G4PhysicalVolumeModel::DescribeYourselfTo fpCurrentLV = 0; fpCurrentMaterial = 0; fDrawnPVPath.clear(); - // ...and in working space in scene handler, if required... - if (fpCurrentDepth) *fpCurrentDepth = 0; - if (fppCurrentPV) *fppCurrentPV = 0; - if (fppCurrentLV) *fppCurrentLV = 0; - if (fppCurrentMaterial) *fppCurrentMaterial = 0; - if (fpDrawnPVPath) fpDrawnPVPath->clear(); - - sceneHandler.DecommissionSpecials (*this); - - // Clear pointers to working space. - fpCurrentDepth = 0; - fppCurrentPV = 0; - fppCurrentLV = 0; - fppCurrentMaterial = 0; - fpDrawnPVPath = 0; } G4String G4PhysicalVolumeModel::GetCurrentTag () const @@ -213,20 +192,6 @@ G4String G4PhysicalVolumeModel::GetCurrentDescription () const return "G4PhysicalVolumeModel " + GetCurrentTag (); } -void G4PhysicalVolumeModel::DefinePointersToWorkingSpace -(G4int* pCurrentDepth, - G4VPhysicalVolume** ppCurrentPV, - G4LogicalVolume** ppCurrentLV, - G4Material** ppCurrentMaterial, - std::vector* pDrawnPVPath) -{ - fpCurrentDepth = pCurrentDepth; - fppCurrentPV = ppCurrentPV; - fppCurrentLV = ppCurrentLV; - fppCurrentMaterial = ppCurrentMaterial; - fpDrawnPVPath = pDrawnPVPath; -} - void G4PhysicalVolumeModel::VisitGeometryAndGetVisReps (G4VPhysicalVolume* pVPV, G4int requestedDepth, @@ -325,14 +290,15 @@ void G4PhysicalVolumeModel::VisitGeometryAndGetVisReps ((G4Tubs*)pSol)->SetInnerRadius(width*n+offset); ((G4Tubs*)pSol)->SetOuterRadius(width*(n+1)+offset); } else { - G4cout << - "G4PhysicalVolumeModel::VisitGeometryAndGetVisReps: WARNING:" - "\n built-in replicated volumes replicated in radius for " - << pSol->GetEntityType() << - "-type\n solids (your solid \"" - << pSol->GetName() << - "\") are not visualisable." - << G4endl; + if (fpMP->IsWarning()) + G4cout << + "G4PhysicalVolumeModel::VisitGeometryAndGetVisReps: WARNING:" + "\n built-in replicated volumes replicated in radius for " + << pSol->GetEntityType() << + "-type\n solids (your solid \"" + << pSol->GetName() << + "\") are not visualisable." + << G4endl; visualisable = false; } break; @@ -377,11 +343,6 @@ void G4PhysicalVolumeModel::DescribeAndDescend fpCurrentPV = pVPV; fpCurrentLV = pLV; fpCurrentMaterial = pMaterial; - // ...and store in scene handler's working space, if required... - if (fpCurrentDepth) *fpCurrentDepth = fCurrentDepth; - if (fppCurrentPV) *fppCurrentPV = pVPV; - if (fppCurrentLV) *fppCurrentLV = pLV; - if (fppCurrentMaterial) *fppCurrentMaterial = pMaterial; const G4RotationMatrix objectRotation = pVPV -> GetObjectRotationValue (); const G4ThreeVector& translation = pVPV -> GetTranslation (); @@ -433,15 +394,17 @@ void G4PhysicalVolumeModel::DescribeAndDescend visAttsCreated = true; } + // From here, can assume pVisAttribs is a valid pointer. + G4bool thisToBeDrawn = true; // There are various reasons why this volume // might not be drawn... G4bool culling = fpMP->IsCulling(); G4bool cullingInvisible = fpMP->IsCullingInvisible(); - G4bool markedVisible = pVisAttribs? pVisAttribs->IsVisible(): true; + G4bool markedVisible = pVisAttribs->IsVisible(); G4bool cullingLowDensity = fpMP->IsDensityCulling(); - G4double density = pMaterial->GetDensity(); + G4double density = pMaterial? pMaterial->GetDensity(): 0; G4double densityCut = fpMP -> GetVisibleDensity (); // 1) Global culling is on.... @@ -460,14 +423,29 @@ void G4PhysicalVolumeModel::DescribeAndDescend if (thisToBeDrawn) { - // Update path of physical volumes, if required... + // Update path of drawn physical volumes... G4int copyNo = fpCurrentPV->GetCopyNo(); - fDrawnPVPath.push_back(G4PhysicalVolumeNodeID(fpCurrentPV,copyNo)); - if (fpDrawnPVPath) { - fpDrawnPVPath->push_back(G4PhysicalVolumeNodeID(fpCurrentPV,copyNo)); + fDrawnPVPath.push_back + (G4PhysicalVolumeNodeID(fpCurrentPV,copyNo,fCurrentDepth)); + + if (fpMP->IsExplode() && fDrawnPVPath.size() == 1) { + // For top-level drawn volumes, explode along radius... + G4Transform3D centering = G4Translate3D(fpMP->GetExplodeCentre()); + G4Transform3D centred = centering.inverse() * theNewAT; + G4Scale3D scale; + G4Rotate3D rotation; + G4Translate3D translation; + centred.getDecomposition(scale, rotation, translation); + G4double explodeFactor = fpMP->GetExplodeFactor(); + G4Translate3D newTranslation = + G4Translate3D(explodeFactor * translation.dx(), + explodeFactor * translation.dy(), + explodeFactor * translation.dz()); + theNewAT = centering * newTranslation * rotation * scale; } DescribeSolid (theNewAT, pSol, pVisAttribs, sceneHandler); + } // Make decision to draw daughters, if any. There are various @@ -487,8 +465,7 @@ void G4PhysicalVolumeModel::DescribeAndDescend else { G4bool culling = fpMP->IsCulling(); G4bool cullingInvisible = fpMP->IsCullingInvisible(); - G4bool daughtersInvisible = - pVisAttribs? pVisAttribs->IsDaughtersInvisible(): false; + G4bool daughtersInvisible = pVisAttribs->IsDaughtersInvisible(); // Culling of covered daughters request. This is computed in // G4VSceneHandler::CreateModelingParameters() depending on view // parameters... @@ -496,15 +473,14 @@ void G4PhysicalVolumeModel::DescribeAndDescend G4bool surfaceDrawing = fpMP->GetDrawingStyle() == G4ModelingParameters::hsr || fpMP->GetDrawingStyle() == G4ModelingParameters::hlhsr; - if (pVisAttribs && pVisAttribs->IsForceDrawingStyle()) { + if (pVisAttribs->IsForceDrawingStyle()) { switch (pVisAttribs->GetForcedDrawingStyle()) { default: case G4VisAttributes::wireframe: surfaceDrawing = false; break; case G4VisAttributes::solid: surfaceDrawing = true; break; } } - G4bool opaque = - pVisAttribs? pVisAttribs->GetColour().GetAlpha() >= 1.: false; + G4bool opaque = pVisAttribs->GetColour().GetAlpha() >= 1.; // 4) Global culling is on.... if (culling) { // 5) ..and culling of invisible volumes is on... @@ -543,12 +519,9 @@ void G4PhysicalVolumeModel::DescribeAndDescend // Reset for normal descending of next volume at this level... fCurtailDescent = false; - // Pop item from path of physical volumes... + // Pop item from path of drawn physical volumes... if (thisToBeDrawn) { fDrawnPVPath.pop_back(); - if (fpDrawnPVPath) { - fpDrawnPVPath->pop_back(); - } } } @@ -559,39 +532,90 @@ void G4PhysicalVolumeModel::DescribeSolid G4VGraphicsScene& sceneHandler) { sceneHandler.PreAddSolid (theAT, *pVisAttribs); - if (fpClippingPolyhedron) // Clip and force polyhedral representation... - { - G4Polyhedron clipper(*fpClippingPolyhedron); // Local copy. - clipper.Transform(theAT.inverse()); - G4Polyhedron::SetNumberOfRotationSteps (fpMP->GetNoOfSides()); - G4Polyhedron* pClippee = pSol->GetPolyhedron(); - G4Polyhedron::ResetNumberOfRotationSteps (); - if (pClippee) // Solid can provide. - { - G4Polyhedron clipped(pClippee->subtract(clipper)); - if(clipped.IsErrorBooleanProcess()) - { - G4cout << - "WARNING: G4PhysicalVolumeModel::DescribeSolid: polyhedron for solid\n \"" - << pSol->GetName() << - "\" skipped due to error during Boolean processing." - << G4endl; - } - else - { - clipped.SetVisAttributes(pVisAttribs); - sceneHandler.BeginPrimitives(theAT); - sceneHandler.AddPrimitive(clipped); - sceneHandler.EndPrimitives(); - } + const G4Polyhedron* pSectionPolyhedron = fpMP->GetSectionPolyhedron(); + const G4Polyhedron* pCutawayPolyhedron = fpMP->GetCutawayPolyhedron(); + + if (!fpClippingPolyhedron && !pSectionPolyhedron && !pCutawayPolyhedron) { + + pSol -> DescribeYourselfTo (sceneHandler); // Standard treatment. + + } else { + + // Clipping, etc., performed by Boolean operations on polyhedron objects. + + // First, get polyhedron for current solid... + G4Polyhedron::SetNumberOfRotationSteps (fpMP->GetNoOfSides()); + G4Polyhedron* pOriginal = pSol->GetPolyhedron(); + G4Polyhedron::ResetNumberOfRotationSteps (); + if (!pOriginal) { + if (fpMP->IsWarning()) + G4cout << + "WARNING: G4PhysicalVolumeModel::DescribeSolid: solid\n \"" + << pSol->GetName() << + "\" has no polyhedron. Cannot by clipped." + << G4endl; + pSol -> DescribeYourselfTo (sceneHandler); // Standard treatment. + } else { + + G4Polyhedron resultant = *pOriginal; + + if (fpClippingPolyhedron) { + G4Polyhedron clipper = *fpClippingPolyhedron; // Local copy. + clipper.Transform(theAT.inverse()); + switch (fClippingMode) { + default: + case subtraction: resultant = resultant.subtract(clipper); break; + case intersection: resultant = resultant.intersect(clipper); break; } + if(resultant.IsErrorBooleanProcess()) { + if (fpMP->IsWarning()) + G4cout << + "WARNING: G4PhysicalVolumeModel::DescribeSolid: clipped polyhedron for" + "\n solid \"" << pSol->GetName() << + "\" not defined due to error during Boolean processing." + << G4endl; + // Nevertheless, keep resultant. + } + } + + if (pSectionPolyhedron) { + G4Polyhedron sectioner = *pSectionPolyhedron; // Local copy. + sectioner.Transform(theAT.inverse()); + resultant = resultant.intersect(sectioner); + if(resultant.IsErrorBooleanProcess()) { + if (fpMP->IsWarning()) + G4cout << + "WARNING: G4PhysicalVolumeModel::DescribeSolid: sectioned polyhedron for" + "\n solid \"" << pSol->GetName() << + "\" not defined due to error during Boolean processing." + << G4endl; + // Nevertheless, keep resultant. + } + } + + if (pCutawayPolyhedron) { + G4Polyhedron cutter = *pCutawayPolyhedron; // Local copy. + cutter.Transform(theAT.inverse()); + resultant = resultant.subtract(cutter); + if(resultant.IsErrorBooleanProcess()) { + if (fpMP->IsWarning()) + G4cout << + "WARNING: G4PhysicalVolumeModel::DescribeSolid: cutaway polyhedron for" + "\n solid \"" << pSol->GetName() << + "\" not defined due to error during Boolean processing." + << G4endl; + // Nevertheless, keep resultant. + } + } + + // Finally, force polyhedron drawing... + resultant.SetVisAttributes(pVisAttribs); + sceneHandler.BeginPrimitives(theAT); + sceneHandler.AddPrimitive(resultant); + sceneHandler.EndPrimitives(); } - else // Standard treatment... - { - pSol -> DescribeYourselfTo (sceneHandler); - - } + } sceneHandler.PostAddSolid (); } @@ -636,3 +660,63 @@ G4bool G4PhysicalVolumeModel::Validate (G4bool warn) return false; } } + +const std::map* G4PhysicalVolumeModel::GetAttDefs() const +{ + G4bool isNew; + std::map* store + = G4AttDefStore::GetInstance("G4PhysicalVolumeModel", isNew); + if (isNew) { + (*store)["PVol"] = + G4AttDef("PVol","Physical Volume","Physics","","G4String"); + (*store)["Copy"] = + G4AttDef("Copy","Physical Volume Copy No.","Physics","","G4int"); + (*store)["LVol"] = + G4AttDef("LVol","Logical Volume","Physics","","G4String"); + (*store)["Region"] = + G4AttDef("Region","Cuts Region","Physics","","G4String"); + (*store)["RootRegion"] = + G4AttDef("RootRegion","Root Region (0/1 = false/true)","Physics","","G4bool"); + (*store)["Solid"] = + G4AttDef("Solid","Solid Name","Physics","","G4String"); + (*store)["EType"] = + G4AttDef("EType","Entity Type","Physics","","G4String"); + (*store)["Material"] = + G4AttDef("Material","Material Name","Physics","","G4String"); + (*store)["Density"] = + G4AttDef("Density","Material Density","Physics","G4BestUnit","G4double"); + (*store)["State"] = + G4AttDef("State","Material State (enum undefined,solid,liquid,gas)","Physics","","G4String"); + (*store)["Radlen"] = + G4AttDef("Radlen","Material Radiation Length","Physics","G4BestUnit","G4double"); + } + return store; +} + +std::vector* G4PhysicalVolumeModel::CreateCurrentAttValues() const +{ + std::vector* values = new std::vector; + std::ostringstream oss; + values->push_back(G4AttValue("PVol", fpCurrentPV->GetName(),"")); + oss << fpCurrentPV->GetCopyNo(); + values->push_back(G4AttValue("Copy", oss.str(),"")); + values->push_back(G4AttValue("LVol", fpCurrentLV->GetName(),"")); + G4Region* region = fpCurrentLV->GetRegion(); + G4String regionName = region? region->GetName(): G4String("No region"); + values->push_back(G4AttValue("Region", regionName,"")); + oss.str(""); oss << fpCurrentLV->IsRootRegion(); + values->push_back(G4AttValue("RootRegion", oss.str(),"")); + G4VSolid* pSol = fpCurrentLV->GetSolid(); + values->push_back(G4AttValue("Solid", pSol->GetName(),"")); + values->push_back(G4AttValue("EType", pSol->GetEntityType(),"")); + G4String matName = fpCurrentMaterial? fpCurrentMaterial->GetName(): G4String("No material"); + values->push_back(G4AttValue("Material", matName,"")); + G4double matDensity = fpCurrentMaterial? fpCurrentMaterial->GetDensity(): 0.; + values->push_back(G4AttValue("Density", G4BestUnit(matDensity,"Volumic Mass"),"")); + G4State matState = fpCurrentMaterial? fpCurrentMaterial->GetState(): kStateUndefined; + oss.str(""); oss << matState; + values->push_back(G4AttValue("State", oss.str(),"")); + G4double matRadlen = fpCurrentMaterial? fpCurrentMaterial->GetRadlen(): 0.; + values->push_back(G4AttValue("Radlen", G4BestUnit(matRadlen,"Length"),"")); + return values; +} diff --git a/source/visualization/modeling/src/G4PhysicalVolumeSearchScene.cc b/source/visualization/modeling/src/G4PhysicalVolumeSearchScene.cc index 775d179958..cabd7face9 100644 --- a/source/visualization/modeling/src/G4PhysicalVolumeSearchScene.cc +++ b/source/visualization/modeling/src/G4PhysicalVolumeSearchScene.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4PhysicalVolumeSearchScene.cc,v 1.12 2006/06/29 21:32:56 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4PhysicalVolumeSearchScene.cc,v 1.13 2006/11/05 20:38:08 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 10th August 1998. @@ -59,6 +59,7 @@ void G4PhysicalVolumeSearchScene::FindVolume (const G4VSolid&) { G4VPhysicalVolume* pCurrentPV = fpPVModel->GetCurrentPV(); G4LogicalVolume* pCurrentLV = fpPVModel->GetCurrentLV(); //G4Material* pCurrentMaterial = fpPVModel->GetCurrentMaterial(); + // Note: pCurrentMaterial may be zero (parallel world). /************************************************** G4cout << "Required volume: \"" << fRequiredPhysicalVolumeName diff --git a/source/visualization/modeling/src/G4ScaleModel.cc b/source/visualization/modeling/src/G4ScaleModel.cc index bffaf1277f..f73c694fa9 100644 --- a/source/visualization/modeling/src/G4ScaleModel.cc +++ b/source/visualization/modeling/src/G4ScaleModel.cc @@ -25,7 +25,7 @@ // // // $Id: G4ScaleModel.cc,v 1.4 2006/06/29 21:32:58 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 21st July 2001. diff --git a/source/visualization/modeling/src/G4TextModel.cc b/source/visualization/modeling/src/G4TextModel.cc index fe8b018253..20a4d2de0b 100644 --- a/source/visualization/modeling/src/G4TextModel.cc +++ b/source/visualization/modeling/src/G4TextModel.cc @@ -25,7 +25,7 @@ // // // $Id: G4TextModel.cc,v 1.7 2006/06/29 21:33:00 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 3rd April 2001 diff --git a/source/visualization/modeling/src/G4TrajectoriesModel.cc b/source/visualization/modeling/src/G4TrajectoriesModel.cc index 59eabba0e9..73f23645d3 100644 --- a/source/visualization/modeling/src/G4TrajectoriesModel.cc +++ b/source/visualization/modeling/src/G4TrajectoriesModel.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4TrajectoriesModel.cc,v 1.18 2006/06/29 21:33:02 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4TrajectoriesModel.cc,v 1.24 2006/11/14 14:42:08 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 26th August 1998. @@ -33,27 +33,76 @@ #include "G4TrajectoriesModel.hh" +#include "G4ModelingParameters.hh" #include "G4VGraphicsScene.hh" -#include "G4EventManager.hh" #include "G4Event.hh" - -G4TrajectoriesModel::~G4TrajectoriesModel () {} +#include "G4AttValue.hh" +#include "G4AttDef.hh" +#include "G4AttCheck.hh" G4TrajectoriesModel::G4TrajectoriesModel (G4int drawingMode): -fDrawingMode(drawingMode) { +fDrawingMode(drawingMode), fpCurrentTrajectory(0) { fGlobalTag = "G4TrajectoriesModel for all trajectories."; fGlobalDescription = fGlobalTag; } +G4TrajectoriesModel::~G4TrajectoriesModel () {} + +void G4TrajectoriesModelDebugG4AttValues(const G4VTrajectory*); + void G4TrajectoriesModel::DescribeYourselfTo (G4VGraphicsScene& sceneHandler) { - const G4Event* event = - G4EventManager::GetEventManager()->GetConstCurrentEvent(); + const G4Event* event = fpMP->GetEvent(); if (event) { G4TrajectoryContainer* TC = event -> GetTrajectoryContainer (); if (TC) { for (G4int iT = 0; iT < TC->entries(); iT++) { - sceneHandler.AddCompound (*((*TC) [iT])); + fpCurrentTrajectory = (*TC) [iT]; + // Debug trajectory: + // fpCurrentTrajectory->ShowTrajectory(); G4cout << G4endl; + // Debug G4AttValues: + // G4TrajectoriesModelDebugG4AttValues(fpCurrentTrajectory); + if (fpCurrentTrajectory) + sceneHandler.AddCompound (*fpCurrentTrajectory); } } } } + +// Debug material... + +#include "G4VTrajectoryPoint.hh" + +void G4TrajectoriesModelDebugG4AttValues(const G4VTrajectory* pTraj) +{ + std::vector* attValues = pTraj->CreateAttValues(); + if (attValues) { + G4AttCheck attCheck(attValues, pTraj->GetAttDefs()); + G4cout << "\nProvided G4Atts:\n" << attCheck; + if (attCheck.Check()) G4cout << "Error" << G4endl; + else { + std::vector standardValues; + std::map standardDefinitions; + attCheck.Standard(&standardValues, &standardDefinitions); + G4cout << "\nStandard G4Atts:\n" + << G4AttCheck(&standardValues, &standardDefinitions); + } + delete attValues; + } + for (G4int i = 0; i < pTraj->GetPointEntries(); i++) { + G4VTrajectoryPoint* aPoint = pTraj->GetPoint(i); + std::vector* attValues = aPoint->CreateAttValues(); + if (attValues) { + G4AttCheck attCheck(attValues, aPoint->GetAttDefs()); + G4cout << "\nProvided G4Atts:\n" << attCheck; + if (attCheck.Check()) G4cout << "Error" << G4endl; + else { + std::vector standardValues; + std::map standardDefinitions; + attCheck.Standard(&standardValues, &standardDefinitions); + G4cout << "\nStandard G4Atts:\n" + << G4AttCheck(&standardValues, &standardDefinitions); + } + delete attValues; + } + } +} diff --git a/source/visualization/modeling/src/G4TrajectoryChargeFilter.cc b/source/visualization/modeling/src/G4TrajectoryChargeFilter.cc index 81f4418693..51b770a880 100644 --- a/source/visualization/modeling/src/G4TrajectoryChargeFilter.cc +++ b/source/visualization/modeling/src/G4TrajectoryChargeFilter.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4TrajectoryChargeFilter.cc,v 1.3 2006/06/29 21:33:04 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4TrajectoryChargeFilter.cc,v 1.4 2006/08/25 19:44:14 tinslay Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Filter trajectories according to charge. Only registered // charges will pass the filter. @@ -41,7 +41,7 @@ G4TrajectoryChargeFilter::G4TrajectoryChargeFilter(const G4String& name) G4TrajectoryChargeFilter::~G4TrajectoryChargeFilter() {} bool -G4TrajectoryChargeFilter::Evaluate(const G4VTrajectory& traj) +G4TrajectoryChargeFilter::Evaluate(const G4VTrajectory& traj) const { G4double charge = traj.GetCharge(); diff --git a/source/visualization/modeling/src/G4TrajectoryDrawByAttribute.cc b/source/visualization/modeling/src/G4TrajectoryDrawByAttribute.cc new file mode 100644 index 0000000000..cf0a60bc0d --- /dev/null +++ b/source/visualization/modeling/src/G4TrajectoryDrawByAttribute.cc @@ -0,0 +1,225 @@ +// +// ******************************************************************** +// * License and Disclaimer * +// * * +// * The Geant4 software is copyright of the Copyright Holders of * +// * the Geant4 Collaboration. It is provided under the terms and * +// * conditions of the Geant4 Software License, included in the file * +// * LICENSE and available at http://cern.ch/geant4/license . These * +// * include a list of copyright holders. * +// * * +// * Neither the authors of this software system, nor their employing * +// * institutes,nor the agencies providing financial support for this * +// * work make any representation or warranty, express or implied, * +// * regarding this software system or assume any liability for its * +// * use. Please see the license in the file LICENSE and URL above * +// * for the full disclaimer and the limitation of liability. * +// * * +// * This code implementation is the result of the scientific and * +// * technical work of the GEANT4 collaboration. * +// * By using, copying, modifying or distributing the software (or * +// * any work based on the software) you agree to acknowledge its * +// * use in resulting scientific publications, and indicate your * +// * acceptance of all terms of the Geant4 Software license. * +// ******************************************************************** +// +// $Id: G4TrajectoryDrawByAttribute.cc,v 1.3 2006/09/14 15:41:42 tinslay Exp $ +// GEANT4 tag $Name: geant4-08-02 $ +// +// Jane Tinslay August 2006 +// +#include "G4TrajectoryDrawByAttribute.hh" +#include "G4AttDef.hh" +#include "G4AttFilterUtils.hh" +#include "G4AttUtils.hh" +#include "G4AttValue.hh" +#include "G4TrajectoryDrawerUtils.hh" +#include "G4VAttValueFilter.hh" +#include "G4VisTrajContext.hh" +#include "G4VTrajectory.hh" +#include +#include + +G4TrajectoryDrawByAttribute::G4TrajectoryDrawByAttribute(const G4String& name, G4VisTrajContext* context) + :G4VTrajectoryModel(name, context) + ,fAttName("") + ,fFirst(true) + ,fWarnedMissingAttribute(false) + ,filter(0) +{} + +G4TrajectoryDrawByAttribute::~G4TrajectoryDrawByAttribute() +{ + ContextMap::iterator iter = fContextMap.begin(); + + while (iter != fContextMap.end()) { + delete iter->second; + iter++; + } + + delete filter; +} + +void +G4TrajectoryDrawByAttribute::Draw(const G4VTrajectory& object, const G4int&, + const G4bool& visible) const +{ + // Return if attribute name has not been set. Just print one warning + if (fAttName.isNull()) { + + if (!fWarnedMissingAttribute) { + std::ostringstream o; + o<<"Null attribute name"; + G4Exception("G4TrajectoryDrawByAttribute::Draw", "NullAttributeName", JustWarning, o.str().c_str()); + + fWarnedMissingAttribute = true; + } + + return; + } + + // Basically cache data loaded filter for efficiency + if (fFirst) { + + fFirst = false; + + // Get attribute definition + G4AttDef attDef; + + // Expect definition to exist + if (!G4AttUtils::ExtractAttDef(object, fAttName, attDef)) { + std::ostringstream o; + o <<"Unable to extract attribute definition named "<first.second == G4TrajectoryDrawByAttribute::Interval) { + filter->LoadIntervalElement(iter->first.first); + } + else if (iter->first.second == G4TrajectoryDrawByAttribute::SingleValue) { + filter->LoadSingleValueElement(iter->first.first); + } + iter++; + } + } + + // Get attribute value + G4AttValue attVal; + + // Expect value to exist + if (!G4AttUtils::ExtractAttValue(object, fAttName, attVal)) { + std::ostringstream o; + o <<"Unable to extract attribute value named "<GetValidElement(attVal, key)) { + + // Extract context corresponding to valid key. + // Single value match should have overriden interval match. + ContextMap::const_iterator iter = fContextMap.begin(); + + G4bool gotContext(false); + + while (!gotContext && (iter != fContextMap.end())) { + if (iter->first.first == key) { + myContext = *(iter->second); + gotContext = true; + } + iter++; + } + + assert (gotContext); + } + + myContext.SetVisible(visible); + + if (GetVerbose()) { + G4cout<<"G4TrajectoryDrawByAttribute drawer named "<Context map dump:"<first.first<<":"<second->Print(ostr); + + iter++; + } +} + +void +G4TrajectoryDrawByAttribute::Set(const G4String& name) +{ + fAttName = name; +} + +void +G4TrajectoryDrawByAttribute::AddIntervalContext(const G4String& name, G4VisTrajContext* context) +{ + // Takes ownership of context + std::pair myPair(name, G4TrajectoryDrawByAttribute::Interval); + + ContextMap::iterator iter = fContextMap.find(myPair); + + if (iter != fContextMap.end()) { + std::ostringstream o; + o <<"Interval "<< name <<" already exists"< myPair(name, G4TrajectoryDrawByAttribute::SingleValue); + + ContextMap::iterator iter = fContextMap.find(myPair); + + if (iter != fContextMap.end()) { + std::ostringstream o; + o <<"Single value "<< name <<" already exists"<& trajectoryLineTimes, + std::vector& auxiliaryPointTimes, + std::vector& stepPointTimes) { + // It is important check that the sizes of times vectors produced + // by this function matches those of points vectors from + // GetPoints. If not, assume that the time information is + // invalid. + + G4ThreeVector lastTrajectoryPointPosition; + for (G4int i=0; i* trajectoryPointAttValues = + aTrajectoryPoint->CreateAttValues(); + if (!trajectoryPointAttValues) { + G4cout << "G4TrajectoryDrawerUtils::GetTimes: no att values." + << G4endl; + return; + } else { + G4bool foundPreTime = false, foundPostTime = false; + for (std::vector::iterator i = + trajectoryPointAttValues->begin(); + i != trajectoryPointAttValues->end(); ++i) { + if (i->GetName() == "PreT") { + trajectoryPointPreTime = + G4UIcommand::ConvertToDimensionedDouble(i->GetValue()); + foundPreTime = true; + } + if (i->GetName() == "PostT") { + trajectoryPointPostTime = + G4UIcommand::ConvertToDimensionedDouble(i->GetValue()); + foundPostTime = true; + } + } + if (!foundPreTime || !foundPostTime) { + static G4bool warnedTimesNotFound = false; + if (!warnedTimesNotFound) { + G4cout << + "WARNING: G4TrajectoryDrawerUtils::GetTimes: times not found." + << G4endl; + warnedTimesNotFound = true; + } + return; + } + } + + const G4ThreeVector& trajectoryPointPosition = + aTrajectoryPoint->GetPosition(); + + const std::vector* auxiliaries + = aTrajectoryPoint->GetAuxiliaryPoints(); + + if (0 != auxiliaries) { + for (size_t iAux=0; iAuxsize(); ++iAux) { + // Interpolate time for auxiliary points... + const G4ThreeVector pos((*auxiliaries)[iAux]); + G4double s1 = (pos - lastTrajectoryPointPosition).mag(); + G4double s2 = (trajectoryPointPosition - pos).mag(); + G4double t = trajectoryPointPreTime + + (trajectoryPointPostTime - trajectoryPointPreTime) * + (s1 / (s1 + s2)); + trajectoryLineTimes.push_back(t); + auxiliaryPointTimes.push_back(t); + } + } + + trajectoryLineTimes.push_back(trajectoryPointPostTime); + stepPointTimes.push_back(trajectoryPointPostTime); + + lastTrajectoryPointPosition = trajectoryPointPosition; + } + } + + static void SliceLine(G4double timeIncrement, + G4Polyline& trajectoryLine, + std::vector& trajectoryLineTimes) + { + // Assumes valid arguments from GetPoints and GetTimes. + + G4Polyline newTrajectoryLine; + std::vector newTrajectoryLineTimes; + + newTrajectoryLine.push_back(trajectoryLine[0]); + newTrajectoryLineTimes.push_back(trajectoryLineTimes[0]); + size_t lineSize = trajectoryLine.size(); + if (lineSize > 1) { + for (size_t i = 1; i < trajectoryLine.size(); ++i) { + G4double deltaT = trajectoryLineTimes[i] - trajectoryLineTimes[i - 1]; + if (deltaT > 0.) { + G4double practicalTimeIncrement = + std::max(timeIncrement, deltaT / 100.); + for (G4double t = + (int(trajectoryLineTimes[i - 1]/practicalTimeIncrement) + 1) * + practicalTimeIncrement; + t <= trajectoryLineTimes[i]; + t += practicalTimeIncrement) { + G4ThreeVector pos = trajectoryLine[i - 1] + + (trajectoryLine[i] - trajectoryLine[i - 1]) * + ((t - trajectoryLineTimes[i - 1]) / deltaT); + newTrajectoryLine.push_back(pos); + newTrajectoryLineTimes.push_back(t); + } + } + newTrajectoryLine.push_back(trajectoryLine[i]); + newTrajectoryLineTimes.push_back(trajectoryLineTimes[i]); + } + } + + trajectoryLine = newTrajectoryLine; + trajectoryLineTimes = newTrajectoryLineTimes; + } + + static void DrawWithoutTime(const G4VisTrajContext& myContext, + G4Polyline& trajectoryLine, + G4Polymarker& auxiliaryPoints, + G4Polymarker& stepPoints) + { + // Draw without time slice information + G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance(); if (0 == pVVisManager) return; + if (myContext.GetDrawLine()) { + G4VisAttributes trajectoryLineAttribs(myContext.GetLineColour()); + trajectoryLineAttribs.SetVisibility(myContext.GetLineVisible()); + trajectoryLine.SetVisAttributes(&trajectoryLineAttribs); + + pVVisManager->Draw(trajectoryLine); + } + + if (myContext.GetDrawAuxPts() && (auxiliaryPoints.size() > 0)) { + auxiliaryPoints.SetMarkerType(myContext.GetAuxPtsType()); + auxiliaryPoints.SetScreenSize(myContext.GetAuxPtsSize()); + auxiliaryPoints.SetFillStyle(myContext.GetAuxPtsFillStyle()); + + G4VisAttributes auxiliaryPointsAttribs(myContext.GetAuxPtsColour()); + auxiliaryPointsAttribs.SetVisibility(myContext.GetAuxPtsVisible()); + auxiliaryPoints.SetVisAttributes(&auxiliaryPointsAttribs); + + pVVisManager->Draw(auxiliaryPoints); + } + + if (myContext.GetDrawStepPts() && (stepPoints.size() > 0)) { + stepPoints.SetMarkerType(myContext.GetStepPtsType()); + stepPoints.SetScreenSize(myContext.GetStepPtsSize()); + stepPoints.SetFillStyle(myContext.GetStepPtsFillStyle()); + + G4VisAttributes stepPointsAttribs(myContext.GetStepPtsColour()); + stepPointsAttribs.SetVisibility(myContext.GetStepPtsVisible()); + stepPoints.SetVisAttributes(&stepPointsAttribs); + + pVVisManager->Draw(stepPoints); + } + } + + static void DrawWithTime(const G4VisTrajContext& myContext, + G4Polyline& trajectoryLine, + G4Polymarker& auxiliaryPoints, + G4Polymarker& stepPoints, + std::vector& trajectoryLineTimes, + std::vector& auxiliaryPointTimes, + std::vector& stepPointTimes) + { + // Draw with time slice information + + G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance(); + if (0 == pVVisManager) return; + + if (myContext.GetDrawLine()) { + G4VisAttributes trajectoryLineAttribs(myContext.GetLineColour()); + trajectoryLineAttribs.SetVisibility(myContext.GetLineVisible()); + + for (size_t i = 1; i < trajectoryLine.size(); ++i ) { + G4Polyline slice; + slice.push_back(trajectoryLine[i -1]); + slice.push_back(trajectoryLine[i]); + trajectoryLineAttribs.SetStartTime(trajectoryLineTimes[i - 1]); + trajectoryLineAttribs.SetEndTime(trajectoryLineTimes[i]); + slice.SetVisAttributes(&trajectoryLineAttribs); + pVVisManager->Draw(slice); + } + } + + if (myContext.GetDrawAuxPts() && (auxiliaryPoints.size() > 0)) { + G4VisAttributes auxiliaryPointsAttribs(myContext.GetAuxPtsColour()); + auxiliaryPointsAttribs.SetVisibility(myContext.GetAuxPtsVisible()); + + for (size_t i = 0; i < auxiliaryPoints.size(); ++i ) { + G4Polymarker point; + point.push_back(auxiliaryPoints[i]); + point.SetMarkerType(myContext.GetAuxPtsType()); + point.SetScreenSize(myContext.GetAuxPtsSize()); + point.SetFillStyle(myContext.GetAuxPtsFillStyle()); + auxiliaryPointsAttribs.SetStartTime(auxiliaryPointTimes[i]); + auxiliaryPointsAttribs.SetEndTime(auxiliaryPointTimes[i]); + point.SetVisAttributes(&auxiliaryPointsAttribs); + pVVisManager->Draw(point); + } + } + + if (myContext.GetDrawStepPts() && (stepPoints.size() > 0)) { + G4VisAttributes stepPointsAttribs(myContext.GetStepPtsColour()); + stepPointsAttribs.SetVisibility(myContext.GetStepPtsVisible()); + + for (size_t i = 0; i < stepPoints.size(); ++i ) { + G4Polymarker point; + point.push_back(stepPoints[i]); + point.SetMarkerType(myContext.GetStepPtsType()); + point.SetScreenSize(myContext.GetStepPtsSize()); + point.SetFillStyle(myContext.GetStepPtsFillStyle()); + stepPointsAttribs.SetStartTime(stepPointTimes[i]); + stepPointsAttribs.SetEndTime(stepPointTimes[i]); + point.SetVisAttributes(&stepPointsAttribs); + pVVisManager->Draw(point); + } + } + } + + void DrawLineAndPoints(const G4VTrajectory& traj, const G4VisTrajContext& context, const G4int& i_mode) + { // Extra copy while i_mode is still around G4VisTrajContext myContext(context); @@ -150,36 +372,36 @@ namespace G4TrajectoryDrawerUtils { GetPoints(traj, trajectoryLine, auxiliaryPoints, stepPoints); - if (myContext.GetDrawLine()) { - G4VisAttributes trajectoryLineAttribs(myContext.GetLineColour()); - trajectoryLineAttribs.SetVisibility(myContext.GetLineVisible()); - trajectoryLine.SetVisAttributes(&trajectoryLineAttribs); - - pVVisManager->Draw(trajectoryLine); - } - - if (myContext.GetDrawAuxPts() && (auxiliaryPoints.size() > 0)) { - auxiliaryPoints.SetMarkerType(myContext.GetAuxPtsType()); - auxiliaryPoints.SetScreenSize(myContext.GetAuxPtsSize()); - auxiliaryPoints.SetFillStyle(myContext.GetAuxPtsFillStyle()); - - G4VisAttributes auxiliaryPointsAttribs(myContext.GetAuxPtsColour()); - auxiliaryPointsAttribs.SetVisibility(myContext.GetAuxPtsVisible()); - auxiliaryPoints.SetVisAttributes(&auxiliaryPointsAttribs); - - pVVisManager->Draw(auxiliaryPoints); - } - - if (myContext.GetDrawStepPts() && (stepPoints.size() > 0)) { - stepPoints.SetMarkerType(myContext.GetStepPtsType()); - stepPoints.SetScreenSize(myContext.GetStepPtsSize()); - stepPoints.SetFillStyle(myContext.GetStepPtsFillStyle()); - - G4VisAttributes stepPointsAttribs(myContext.GetStepPtsColour()); - stepPointsAttribs.SetVisibility(myContext.GetStepPtsVisible()); - stepPoints.SetVisAttributes(&stepPointsAttribs); - - pVVisManager->Draw(stepPoints); + if (myContext.GetTimeSliceInterval()) { + + // Get corresponding track time information, if any + std::vector trajectoryLineTimes; + std::vector stepPointTimes; + std::vector auxiliaryPointTimes; + + GetTimes(traj, trajectoryLineTimes, auxiliaryPointTimes, stepPointTimes); + + // Check validity + if (trajectoryLineTimes.size() != trajectoryLine.size() || + stepPointTimes.size() != stepPoints.size() || + auxiliaryPointTimes.size() != auxiliaryPoints.size()) { + + // Revert to drawing without time information... + DrawWithoutTime(myContext, trajectoryLine, auxiliaryPoints, stepPoints); + } else { + + SliceLine(myContext.GetTimeSliceInterval(), + trajectoryLine, trajectoryLineTimes); + + DrawWithTime(myContext, + trajectoryLine, auxiliaryPoints, stepPoints, + trajectoryLineTimes, auxiliaryPointTimes, stepPointTimes); + } + + } else { + + DrawWithoutTime(myContext, trajectoryLine, auxiliaryPoints, stepPoints); + } } } diff --git a/source/visualization/modeling/src/G4TrajectoryFilterFactories.cc b/source/visualization/modeling/src/G4TrajectoryFilterFactories.cc index baee3b4a3c..bbc6de7645 100644 --- a/source/visualization/modeling/src/G4TrajectoryFilterFactories.cc +++ b/source/visualization/modeling/src/G4TrajectoryFilterFactories.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -/// $Id: G4TrajectoryFilterFactories.cc,v 1.4 2006/06/29 21:33:14 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +/// $Id: G4TrajectoryFilterFactories.cc,v 1.5 2006/09/12 18:53:03 tinslay Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // Trajectory filter model factories creating filters @@ -32,12 +32,41 @@ // // Jane Tinslay March 2006 // +#include "G4AttributeFilterT.hh" #include "G4ModelCommandsT.hh" #include "G4TrajectoryFilterFactories.hh" #include "G4TrajectoryChargeFilter.hh" #include "G4TrajectoryParticleFilter.hh" #include "G4TrajectoryOriginVolumeFilter.hh" +// Attribute filter +G4TrajectoryAttributeFilterFactory::G4TrajectoryAttributeFilterFactory() + :G4VModelFactory< G4VFilter >("attributeFilter") +{} + +G4TrajectoryAttributeFilterFactory::~G4TrajectoryAttributeFilterFactory() {} + +G4TrajectoryAttributeFilterFactory::ModelAndMessengers +G4TrajectoryAttributeFilterFactory::Create(const G4String& placement, const G4String& name) +{ + typedef G4AttributeFilterT G4TrajectoryAttributeFilter; + // Create model + G4TrajectoryAttributeFilter* model = new G4TrajectoryAttributeFilter(name); + + // Create associated messengers + Messengers messengers; + + messengers.push_back(new G4ModelCmdSetString(model, placement, "setAttribute")); + messengers.push_back(new G4ModelCmdInvert(model, placement)); + messengers.push_back(new G4ModelCmdActive(model, placement)); + messengers.push_back(new G4ModelCmdVerbose(model, placement)); + messengers.push_back(new G4ModelCmdReset(model, placement)); + messengers.push_back(new G4ModelCmdAddInterval(model, placement, "addInterval")); + messengers.push_back(new G4ModelCmdAddValue(model, placement, "addValue")); + + return ModelAndMessengers(model, messengers); +} + // Charge filter G4TrajectoryChargeFilterFactory::G4TrajectoryChargeFilterFactory() :G4VModelFactory< G4VFilter >("chargeFilter") diff --git a/source/visualization/modeling/src/G4TrajectoryGenericDrawer.cc b/source/visualization/modeling/src/G4TrajectoryGenericDrawer.cc index 0125544aae..4bba31d007 100644 --- a/source/visualization/modeling/src/G4TrajectoryGenericDrawer.cc +++ b/source/visualization/modeling/src/G4TrajectoryGenericDrawer.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4TrajectoryGenericDrawer.cc,v 1.2 2006/06/29 21:33:16 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Jane Tinslay May 2006 // diff --git a/source/visualization/modeling/src/G4TrajectoryModelFactories.cc b/source/visualization/modeling/src/G4TrajectoryModelFactories.cc index 55f3756db4..b31a70da5e 100644 --- a/source/visualization/modeling/src/G4TrajectoryModelFactories.cc +++ b/source/visualization/modeling/src/G4TrajectoryModelFactories.cc @@ -23,12 +23,15 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4TrajectoryModelFactories.cc,v 1.5 2006/06/29 21:33:18 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4TrajectoryModelFactories.cc,v 1.7 2006/09/12 18:53:03 tinslay Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Jane Tinslay, John Allison, Joseph Perl October 2005 +#include "G4ModelCompoundCommandsT.hh" #include "G4ModelCommandsT.hh" +#include "G4ModelCommandUtils.hh" +#include "G4TrajectoryDrawByAttribute.hh" #include "G4TrajectoryDrawByCharge.hh" #include "G4TrajectoryDrawByOriginVolume.hh" #include "G4TrajectoryDrawByParticleID.hh" @@ -36,30 +39,32 @@ #include "G4TrajectoryModelFactories.hh" #include "G4VisTrajContext.hh" -namespace { - - void AddContextMsgrs(G4VisTrajContext* context, std::vector& messengers, - const G4String& placement) - { - messengers.push_back(new G4ModelCmdCreateContextDir(context, placement)); - messengers.push_back(new G4ModelCmdSetDrawLine(context, placement)); - messengers.push_back(new G4ModelCmdSetLineVisible(context, placement)); - messengers.push_back(new G4ModelCmdSetLineColour(context, placement)); - - messengers.push_back(new G4ModelCmdSetDrawStepPts(context, placement)); - messengers.push_back(new G4ModelCmdSetStepPtsVisible(context, placement)); - messengers.push_back(new G4ModelCmdSetStepPtsColour(context, placement)); - messengers.push_back(new G4ModelCmdSetStepPtsSize(context, placement)); - messengers.push_back(new G4ModelCmdSetStepPtsType(context, placement)); - messengers.push_back(new G4ModelCmdSetStepPtsFillStyle(context, placement)); +// Draw by attribute +G4TrajectoryDrawByAttributeFactory::G4TrajectoryDrawByAttributeFactory() + :G4VModelFactory("drawByAttribute") +{} - messengers.push_back(new G4ModelCmdSetDrawAuxPts(context, placement)); - messengers.push_back(new G4ModelCmdSetAuxPtsVisible(context, placement)); - messengers.push_back(new G4ModelCmdSetAuxPtsColour(context, placement)); - messengers.push_back(new G4ModelCmdSetAuxPtsSize(context, placement)); - messengers.push_back(new G4ModelCmdSetAuxPtsType(context, placement)); - messengers.push_back(new G4ModelCmdSetAuxPtsFillStyle(context, placement)); - } +G4TrajectoryDrawByAttributeFactory::~G4TrajectoryDrawByAttributeFactory() {} + +ModelAndMessengers +G4TrajectoryDrawByAttributeFactory::Create(const G4String& placement, const G4String& name) +{ + Messengers messengers; + + // Create default context and model + G4VisTrajContext* context = new G4VisTrajContext("default"); + + G4TrajectoryDrawByAttribute* model = new G4TrajectoryDrawByAttribute(name, context); + + // Create messengers for default context configuration + G4ModelCommandUtils::AddContextMsgrs(context, messengers, placement+"/"+name); + + messengers.push_back(new G4ModelCmdVerbose(model, placement)); + messengers.push_back(new G4ModelCmdSetString(model, placement, "setAttribute")); + messengers.push_back(new G4ModelCmdAddIntervalContext(model, placement, "addInterval")); + messengers.push_back(new G4ModelCmdAddValueContext(model, placement, "addValue")); + + return ModelAndMessengers(model, messengers); } G4TrajectoryGenericDrawerFactory::G4TrajectoryGenericDrawerFactory() @@ -78,7 +83,7 @@ G4TrajectoryGenericDrawerFactory::Create(const G4String& placement, const G4Stri G4TrajectoryGenericDrawer* model = new G4TrajectoryGenericDrawer(name, context); // Create messengers for default context configuration - AddContextMsgrs(context, messengers, placement+"/"+name); + G4ModelCommandUtils::AddContextMsgrs(context, messengers, placement+"/"+name); // Verbose command messengers.push_back(new G4ModelCmdVerbose(model, placement)); @@ -103,7 +108,7 @@ G4TrajectoryDrawByChargeFactory::Create(const G4String& placement, const G4Strin G4TrajectoryDrawByCharge* model = new G4TrajectoryDrawByCharge(name, context); // Create messengers for default context configuration - AddContextMsgrs(context, messengers, placement+"/"+name); + G4ModelCommandUtils::AddContextMsgrs(context, messengers, placement+"/"+name); // Create messengers for drawer messengers.push_back(new G4ModelCmdSetStringColour(model, placement)); @@ -129,7 +134,7 @@ G4TrajectoryDrawByParticleIDFactory::Create(const G4String& placement, const G4S G4TrajectoryDrawByParticleID* model = new G4TrajectoryDrawByParticleID(name, context); // Create messengers for default context configuration - AddContextMsgrs(context, messengers, placement+"/"+name); + G4ModelCommandUtils::AddContextMsgrs(context, messengers, placement+"/"+name); // Create messengers for drawer messengers.push_back(new G4ModelCmdSetStringColour(model, placement)); @@ -156,7 +161,7 @@ G4TrajectoryDrawByOriginVolumeFactory::Create(const G4String& placement, const G G4TrajectoryDrawByOriginVolume* model = new G4TrajectoryDrawByOriginVolume(name, context); // Create messengers for default context configuration - AddContextMsgrs(context, messengers, placement+"/"+name); + G4ModelCommandUtils::AddContextMsgrs(context, messengers, placement+"/"+name); // Create messengers for drawer messengers.push_back(new G4ModelCmdSetStringColour(model, placement)); diff --git a/source/visualization/modeling/src/G4TrajectoryOriginVolumeFilter.cc b/source/visualization/modeling/src/G4TrajectoryOriginVolumeFilter.cc index 759c44efb1..88e89bac7f 100644 --- a/source/visualization/modeling/src/G4TrajectoryOriginVolumeFilter.cc +++ b/source/visualization/modeling/src/G4TrajectoryOriginVolumeFilter.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4TrajectoryOriginVolumeFilter.cc,v 1.2 2006/06/29 21:33:20 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4TrajectoryOriginVolumeFilter.cc,v 1.3 2006/08/25 19:44:14 tinslay Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Filter trajectories according to volume name. Only registered // volumes will pass the filter. @@ -42,7 +42,7 @@ G4TrajectoryOriginVolumeFilter::G4TrajectoryOriginVolumeFilter(const G4String& n G4TrajectoryOriginVolumeFilter::~G4TrajectoryOriginVolumeFilter() {} bool -G4TrajectoryOriginVolumeFilter::Evaluate(const G4VTrajectory& traj) +G4TrajectoryOriginVolumeFilter::Evaluate(const G4VTrajectory& traj) const { G4Navigator* navigator = G4TransportationManager::GetTransportationManager()->GetNavigatorForTracking(); diff --git a/source/visualization/modeling/src/G4TrajectoryParticleFilter.cc b/source/visualization/modeling/src/G4TrajectoryParticleFilter.cc index 1c2da0cc04..eabedef275 100644 --- a/source/visualization/modeling/src/G4TrajectoryParticleFilter.cc +++ b/source/visualization/modeling/src/G4TrajectoryParticleFilter.cc @@ -23,8 +23,8 @@ // * acceptance of all terms of the Geant4 Software license. * // ******************************************************************** // -// $Id: G4TrajectoryParticleFilter.cc,v 1.2 2006/06/29 21:33:22 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4TrajectoryParticleFilter.cc,v 1.3 2006/08/25 19:44:14 tinslay Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // Filter trajectories according to particle type. Only registered // particle types will pass the filter. @@ -40,7 +40,7 @@ G4TrajectoryParticleFilter::G4TrajectoryParticleFilter(const G4String& name) G4TrajectoryParticleFilter::~G4TrajectoryParticleFilter() {} bool -G4TrajectoryParticleFilter::Evaluate(const G4VTrajectory& traj) +G4TrajectoryParticleFilter::Evaluate(const G4VTrajectory& traj) const { G4String particle = traj.GetParticleName(); diff --git a/source/visualization/modeling/src/G4VModel.cc b/source/visualization/modeling/src/G4VModel.cc index 37c66e73e9..d012aa77a9 100644 --- a/source/visualization/modeling/src/G4VModel.cc +++ b/source/visualization/modeling/src/G4VModel.cc @@ -24,8 +24,8 @@ // ******************************************************************** // // -// $Id: G4VModel.cc,v 1.13 2006/06/29 21:33:24 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// $Id: G4VModel.cc,v 1.14 2006/11/01 10:33:00 allison Exp $ +// GEANT4 tag $Name: geant4-08-02 $ // // // John Allison 31st December 1997. @@ -47,15 +47,13 @@ G4VModel::G4VModel (const G4Transform3D& modelTransformation, G4VModel::~G4VModel () {} G4String G4VModel::GetCurrentTag () const { - return G4String - ("WARNING: GetCurrentTag() not implemented by concrete class." - "\n Global tag: " + fGlobalTag); + // Override in concrete class if concept of "current" is meaningful. + return fGlobalTag; } G4String G4VModel::GetCurrentDescription () const { - return G4String - ("WARNING: GetCurrentDescription() not implemented by concrete class." - "\n Global description: " + fGlobalDescription); + // Override in concrete class if concept of "current" is meaningful. + return fGlobalDescription; } G4bool G4VModel::Validate (G4bool) { diff --git a/source/visualization/modeling/src/G4VTrajectoryModel.cc b/source/visualization/modeling/src/G4VTrajectoryModel.cc index 29b5e5638b..ec307dd548 100644 --- a/source/visualization/modeling/src/G4VTrajectoryModel.cc +++ b/source/visualization/modeling/src/G4VTrajectoryModel.cc @@ -24,7 +24,7 @@ // ******************************************************************** // // $Id: G4VTrajectoryModel.cc,v 1.3 2006/06/29 21:33:26 gunter Exp $ -// GEANT4 tag $Name: geant4-08-01 $ +// GEANT4 tag $Name: geant4-08-02 $ // // Jane Tinslay May 2006 // diff --git a/source/visualization/modeling/src/G4VisTrajContext.cc b/source/visualization/modeling/src/G4VisTrajContext.cc index 1eb69ccf98..22425f8a25 100644 --- a/source/visualization/modeling/src/G4VisTrajContext.cc +++ b/source/visualization/modeling/src/G4VisTrajContext.cc @@ -43,6 +43,7 @@ G4VisTrajContext::G4VisTrajContext(const G4String& name) ,fStepPtsFillStyle(G4VMarker::filled) ,fStepPtsColour(G4Colour::Yellow()) ,fStepPtsVisible(true) + ,fTimeSliceInterval(0.) {} // Destructor